From 41032137ac438b9e2d4c28c11097ef9bccf8439e Mon Sep 17 00:00:00 2001
From: fanquake <fanquake@gmail.com>
Date: Tue, 5 Mar 2024 16:53:40 +0000
Subject: [PATCH 001/656] Merge bitcoin/bitcoin#29541: test: remove file-wide
 interpreter.cpp ubsan suppression

217c0ce552a5d519b5cc702aba0c82514a1c449e test: remove file-wide interpreter.cpp ubsan suppression (fanquake)

Pull request description:

ACKs for top commit:
  Sjors:
    utACK 217c0ce552a5d519b5cc702aba0c82514a1c449e
  hebasto:
    ACK 217c0ce552a5d519b5cc702aba0c82514a1c449e.
  dergoegge:
    ACK 217c0ce552a5d519b5cc702aba0c82514a1c449e

Tree-SHA512: ae0c2ff4531fdb7b0296709f66b71d4065fe3f32cbd39a44e45934a975b5cf6cf01c2f136f110753efee8e301636f7700278aed1d995b463fc025c07d586a8fa
---
 test/sanitizer_suppressions/ubsan | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/sanitizer_suppressions/ubsan b/test/sanitizer_suppressions/ubsan
index 0058d775746c..79507945434f 100644
--- a/test/sanitizer_suppressions/ubsan
+++ b/test/sanitizer_suppressions/ubsan
@@ -51,7 +51,7 @@ unsigned-integer-overflow:hash.cpp
 unsigned-integer-overflow:policy/fees.cpp
 unsigned-integer-overflow:prevector.h
 unsigned-integer-overflow:pubkey.h
-unsigned-integer-overflow:script/interpreter.cpp
+unsigned-integer-overflow:EvalScript
 unsigned-integer-overflow:txmempool.cpp
 unsigned-integer-overflow:util/strencodings.cpp
 unsigned-integer-overflow:xoroshiro128plusplus.h

From cfb21656c9a3026f07e234f5b5f1643b3c1fabcb Mon Sep 17 00:00:00 2001
From: fanquake <fanquake@gmail.com>
Date: Fri, 20 Oct 2023 14:22:15 +0100
Subject: [PATCH 002/656] Merge bitcoin/bitcoin#28569: log: Don't log cache
 rebalancing in absense of a snapshot chainstate

ec84f999f1408b7f1ff4498f78c33b34c30e934c log: Don't log cache rebalancing in absense of a snapshot chainstate (Fabian Jahr)

Pull request description:

  I have noticed that this log now is always printed, even if there is no snapshot chainstate present or even was present. I think this is confusing to users that have never even thought about using assumeutxo since in that case the rebalancing is just ensuring the normal environment with one chainstate. So I suggest we don't log in absence of a snapshot chainstate. We could also think about rewording the message instead but I think this is simpler.

ACKs for top commit:
  stickies-v:
    utACK ec84f999f1408b7f1ff4498f78c33b34c30e934c
  glozow:
    concept ACK ec84f999f1408b7f1ff4498f78c33b34c30e934c, don't have opinions other than removing confusing log
  theStack:
    utACK ec84f999f1408b7f1ff4498f78c33b34c30e934c

Tree-SHA512: 30bbfc648e7c788106f78d52e47a3aa1e1874f65d13743643dc50bcf7f450d8330711ff9fdeac361722542da6051533153829c6d49033227ed315e111afc899f
---
 src/validation.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/validation.cpp b/src/validation.cpp
index 9a87546266d2..47f22053b226 100644
--- a/src/validation.cpp
+++ b/src/validation.cpp
@@ -5931,8 +5931,8 @@ void ChainstateManager::MaybeRebalanceCaches()
 {
     AssertLockHeld(::cs_main);
     if (m_ibd_chainstate && !m_snapshot_chainstate) {
-        LogPrintf("[snapshot] allocating all cache to the IBD chainstate\n");
-        // Allocate everything to the IBD chainstate.
+        // Allocate everything to the IBD chainstate. This will always happen
+        // when we are not using a snapshot
         m_ibd_chainstate->ResizeCoinsCaches(m_total_coinstip_cache, m_total_coinsdb_cache);
     }
     else if (m_snapshot_chainstate && !m_ibd_chainstate) {

From d18beae7479dca386269c7bbe2f02cb2e515c50e Mon Sep 17 00:00:00 2001
From: PastaBot <156604295+DashCoreAutoGuix@users.noreply.github.com>
Date: Tue, 30 Sep 2025 09:33:02 -0500
Subject: [PATCH 003/656] Merge bitcoin/bitcoin#29414: doc: Update translation
 process guide

Co-authored-by: fanquake <fanquake@gmail.com>
Co-authored-by: pasta <pasta@pastas-Mac-Studio.local>
---
 doc/translation_process.md | 18 +-----------------
 1 file changed, 1 insertion(+), 17 deletions(-)

diff --git a/doc/translation_process.md b/doc/translation_process.md
index 529dada5fe32..894bf6c2c61f 100644
--- a/doc/translation_process.md
+++ b/doc/translation_process.md
@@ -45,23 +45,7 @@ Visit the [Transifex Signup](https://app.transifex.com/signup/) page to create a
 You can find the Dash translation project at <https://explore.transifex.com/dash/dash/>.
 
 ### Installing the Transifex client command-line tool
-The client is used to fetch updated translations. If you are having problems, or need more details, see <https://developers.transifex.com/docs/cli>.
-
-**For Linux and Mac**
-
-`pip install transifex-client`
-
-Setup your Transifex client config as follows. Please *ignore the token field*.
-
-```ini
-nano ~/.transifexrc
-
-[https://www.transifex.com]
-hostname = https://www.transifex.com
-password = PASSWORD
-token =
-username = USERNAME
-```
+The client is used to fetch updated translations. Please check installation instructions and any other details at <https://developers.transifex.com/docs/cli>.
 
 **For Windows**
 

From ad4c544000471a49c968c0d0bf6eb8173e912595 Mon Sep 17 00:00:00 2001
From: fanquake <fanquake@gmail.com>
Date: Tue, 18 Apr 2023 09:07:33 +0100
Subject: [PATCH 004/656] Merge bitcoin/bitcoin#27477: test: add regression
 tests for #27468 (invalid URI segfaults)

6a77d290da589bd5620585def5bfc019e242e189 test: add regression tests for #27468 (invalid URI segfaults) (Sebastian Falbesoner)

Pull request description:

  Prior to PR #27468 (commit 11422cc5720c8d73a87600de8fe8abb156db80dc) all call-sites of `GetQueryParameter(...)` in the REST module could trigger a crash. Add missing test cases for all possible code-paths as a regression test, as a foundation for possible follow-up fixes (which aim to resolve this issue in a more general and robust way).

ACKs for top commit:
  stickies-v:
    ACK 6a77d290da589bd5620585def5bfc019e242e189
  vasild:
    ACK 6a77d290da589bd5620585def5bfc019e242e189

Tree-SHA512: b5dd22d7d448f92236575ea950287259795a957a3f8e364682510c7c1ede5f9d67e7daccc5146c8d0817bcb71742d49273801574bd2bb96e44a9ae5a006ac2a7
---
 test/functional/interface_rest.py | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/test/functional/interface_rest.py b/test/functional/interface_rest.py
index 5f63718c4bba..a85c8f16a345 100755
--- a/test/functional/interface_rest.py
+++ b/test/functional/interface_rest.py
@@ -281,6 +281,11 @@ def run_test(self):
         assert_equal(len(json_obj), 1)  # ensure that there is one header in the json response
         assert_equal(json_obj[0]['hash'], bb_hash)  # request/response hash should be the same
 
+        # Check invalid uri (% symbol at the end of the request)
+        for invalid_uri in [f"/headers/{bb_hash}%", f"/blockfilterheaders/basic/{bb_hash}%", "/mempool/contents.json?%"]:
+            resp = self.test_rest_request(invalid_uri, ret_type=RetType.OBJ, status=400)
+            assert_equal(resp.read().decode('utf-8').rstrip(), "URI parsing failed, it likely contained RFC 3986 invalid characters")
+
         # Compare with normal RPC block response
         rpc_block_json = self.nodes[0].getblock(bb_hash)
         for key in ['hash', 'confirmations', 'height', 'version', 'merkleroot', 'time', 'nonce', 'bits', 'difficulty', 'chainwork', 'previousblockhash']:

From 9e9ee3554b341fab7e19a859524a443b8bc5aac8 Mon Sep 17 00:00:00 2001
From: Kittywhiskers Van Gogh <63189531+kwvg@users.noreply.github.com>
Date: Tue, 30 Sep 2025 18:56:01 +0000
Subject: [PATCH 005/656] stats: move implementation to source file, define
 interface

Also add some basic docs for RawSender and privatize functions
---
 src/bench/checkblock.cpp       |  6 ++-
 src/init.cpp                   |  2 +-
 src/stats/client.cpp           | 99 +++++++++++++++++++---------------
 src/stats/client.h             | 49 ++++++-----------
 src/stats/rawsender.h          | 12 +++++
 src/test/util/setup_common.cpp |  2 +-
 6 files changed, 90 insertions(+), 80 deletions(-)

diff --git a/src/bench/checkblock.cpp b/src/bench/checkblock.cpp
index b4ff0ee3373f..5e987bcefc66 100644
--- a/src/bench/checkblock.cpp
+++ b/src/bench/checkblock.cpp
@@ -11,6 +11,8 @@
 #include <streams.h>
 #include <validation.h>
 
+#include <memory>
+
 // These are the two major time-sinks which happen after we have fully received
 // a block off the wire, but before we can relay the block on to peers using
 // compact block relay.
@@ -38,8 +40,8 @@ static void DeserializeAndCheckBlockTest(benchmark::Bench& bench)
     ArgsManager bench_args;
     const auto chainParams = CreateChainParams(bench_args, CBaseChainParams::MAIN);
     // CheckBlock calls g_stats_client internally, we aren't using a testing setup
-    // so we need to do this manually.
-    ::g_stats_client = InitStatsClient(bench_args);
+    // so we need to do this manually. We can use the stub interface for this.
+    ::g_stats_client = std::make_unique<StatsdClient>();
 
     bench.unit("block").run([&] {
         CBlock block; // Note that CBlock caches its checked state, so we need to recreate it here
diff --git a/src/init.cpp b/src/init.cpp
index d9d2cbde48ec..2fc3606de8d7 100644
--- a/src/init.cpp
+++ b/src/init.cpp
@@ -1587,7 +1587,7 @@ bool AppInitMain(NodeContext& node, interfaces::BlockAndHeaderTipInfo* tip_info)
     // We need to initialize g_stats_client early as currently, g_stats_client is called
     // regardless of whether transmitting stats are desirable or not and if
     // g_stats_client isn't present when that attempt is made, the client will crash.
-    ::g_stats_client = InitStatsClient(args);
+    ::g_stats_client = StatsdClient::make(args);
 
     {
 
diff --git a/src/stats/client.cpp b/src/stats/client.cpp
index 7eb3c962c7dd..b473e17100dc 100644
--- a/src/stats/client.cpp
+++ b/src/stats/client.cpp
@@ -7,9 +7,12 @@
 #include <stats/client.h>
 
 #include <logging.h>
+#include <random.h>
 #include <stats/rawsender.h>
+#include <sync.h>
 #include <util/system.h>
 
+#include <algorithm>
 #include <cmath>
 #include <random>
 
@@ -27,11 +30,53 @@ static constexpr char STATSD_METRIC_COUNT[]{"c"};
 static constexpr char STATSD_METRIC_GAUGE[]{"g"};
 /** Characters used to denote Statsd message type as timing */
 static constexpr char STATSD_METRIC_TIMING[]{"ms"};
+
+class StatsdClientImpl final : public StatsdClient
+{
+public:
+    explicit StatsdClientImpl(const std::string& host, uint16_t port, uint64_t batch_size, uint64_t interval_ms,
+                              const std::string& prefix, const std::string& suffix);
+    ~StatsdClientImpl() = default;
+
+public:
+    bool dec(const std::string& key, float sample_rate) override { return count(key, -1, sample_rate); }
+    bool inc(const std::string& key, float sample_rate) override { return count(key, 1, sample_rate); }
+    bool count(const std::string& key, int64_t delta, float sample_rate) override { return _send(key, delta, STATSD_METRIC_COUNT, sample_rate); }
+    bool gauge(const std::string& key, int64_t value, float sample_rate) override { return _send(key, value, STATSD_METRIC_GAUGE, sample_rate); }
+    bool gaugeDouble(const std::string& key, double value, float sample_rate) override { return _send(key, value, STATSD_METRIC_GAUGE, sample_rate); }
+    bool timing(const std::string& key, uint64_t ms, float sample_rate) override { return _send(key, ms, STATSD_METRIC_TIMING, sample_rate); }
+
+    bool send(const std::string& key, double value, const std::string& type, float sample_rate) override { return _send(key, value, type, sample_rate); }
+    bool send(const std::string& key, int32_t value, const std::string& type, float sample_rate) override { return _send(key, value, type, sample_rate); }
+    bool send(const std::string& key, int64_t value, const std::string& type, float sample_rate) override { return _send(key, value, type, sample_rate); }
+    bool send(const std::string& key, uint32_t value, const std::string& type, float sample_rate) override { return _send(key, value, type, sample_rate); }
+    bool send(const std::string& key, uint64_t value, const std::string& type, float sample_rate) override { return _send(key, value, type, sample_rate); }
+
+    bool active() const override { return m_sender != nullptr; }
+
+private:
+    template <typename T1>
+    inline bool _send(const std::string& key, T1 value, const std::string& type, float sample_rate);
+
+private:
+    /* Mutex to protect PRNG */
+    mutable Mutex cs;
+    /* PRNG used to dice-roll messages that are 0 < f < 1 */
+    mutable FastRandomContext insecure_rand GUARDED_BY(cs);
+
+    /* Broadcasts messages crafted by StatsdClient */
+    std::unique_ptr<RawSender> m_sender{nullptr};
+
+    /* Phrase prepended to keys */
+    const std::string m_prefix{};
+    /* Phrase appended to keys */
+    const std::string m_suffix{};
+};
 } // anonymous namespace
 
 std::unique_ptr<StatsdClient> g_stats_client;
 
-std::unique_ptr<StatsdClient> InitStatsClient(const ArgsManager& args)
+std::unique_ptr<StatsdClient> StatsdClient::make(const ArgsManager& args)
 {
     auto sanitize_string = [](std::string string) {
         // Remove key delimiters from the front and back as they're added back in
@@ -43,16 +88,18 @@ std::unique_ptr<StatsdClient> InitStatsClient(const ArgsManager& args)
         return string;
     };
 
-    return std::make_unique<StatsdClient>(args.GetArg("-statshost", DEFAULT_STATSD_HOST),
-                                          args.GetIntArg("-statsport", DEFAULT_STATSD_PORT),
-                                          args.GetIntArg("-statsbatchsize", DEFAULT_STATSD_BATCH_SIZE),
-                                          args.GetIntArg("-statsduration", DEFAULT_STATSD_DURATION),
-                                          sanitize_string(args.GetArg("-statsprefix", DEFAULT_STATSD_PREFIX)),
-                                          sanitize_string(args.GetArg("-statssuffix", DEFAULT_STATSD_SUFFIX)));
+    return std::make_unique<StatsdClientImpl>(
+        args.GetArg("-statshost", DEFAULT_STATSD_HOST),
+        args.GetIntArg("-statsport", DEFAULT_STATSD_PORT),
+        args.GetIntArg("-statsbatchsize", DEFAULT_STATSD_BATCH_SIZE),
+        args.GetIntArg("-statsduration", DEFAULT_STATSD_DURATION),
+        sanitize_string(args.GetArg("-statsprefix", DEFAULT_STATSD_PREFIX)),
+        sanitize_string(args.GetArg("-statssuffix", DEFAULT_STATSD_SUFFIX))
+    );
 }
 
-StatsdClient::StatsdClient(const std::string& host, uint16_t port, uint64_t batch_size, uint64_t interval_ms,
-                           const std::string& prefix, const std::string& suffix) :
+StatsdClientImpl::StatsdClientImpl(const std::string& host, uint16_t port, uint64_t batch_size, uint64_t interval_ms,
+                                   const std::string& prefix, const std::string& suffix) :
     m_prefix{[prefix]() { return !prefix.empty() ? prefix + STATSD_NS_DELIMITER : prefix; }()},
     m_suffix{[suffix]() { return !suffix.empty() ? STATSD_NS_DELIMITER + suffix : suffix; }()}
 {
@@ -74,34 +121,8 @@ StatsdClient::StatsdClient(const std::string& host, uint16_t port, uint64_t batc
     LogPrintf("StatsdClient initialized to transmit stats to %s:%d\n", host, port);
 }
 
-StatsdClient::~StatsdClient() {}
-
-bool StatsdClient::dec(const std::string& key, float sample_rate) { return count(key, -1, sample_rate); }
-
-bool StatsdClient::inc(const std::string& key, float sample_rate) { return count(key, 1, sample_rate); }
-
-bool StatsdClient::count(const std::string& key, int64_t delta, float sample_rate)
-{
-    return send(key, delta, STATSD_METRIC_COUNT, sample_rate);
-}
-
-bool StatsdClient::gauge(const std::string& key, int64_t value, float sample_rate)
-{
-    return send(key, value, STATSD_METRIC_GAUGE, sample_rate);
-}
-
-bool StatsdClient::gaugeDouble(const std::string& key, double value, float sample_rate)
-{
-    return send(key, value, STATSD_METRIC_GAUGE, sample_rate);
-}
-
-bool StatsdClient::timing(const std::string& key, uint64_t ms, float sample_rate)
-{
-    return send(key, ms, STATSD_METRIC_TIMING, sample_rate);
-}
-
 template <typename T1>
-bool StatsdClient::send(const std::string& key, T1 value, const std::string& type, float sample_rate)
+inline bool StatsdClientImpl::_send(const std::string& key, T1 value, const std::string& type, float sample_rate)
 {
     static_assert(std::is_arithmetic<T1>::value, "Must specialize to an arithmetic type");
 
@@ -132,9 +153,3 @@ bool StatsdClient::send(const std::string& key, T1 value, const std::string& typ
 
     return true;
 }
-
-template bool StatsdClient::send(const std::string& key, double value, const std::string& type, float sample_rate);
-template bool StatsdClient::send(const std::string& key, int32_t value, const std::string& type, float sample_rate);
-template bool StatsdClient::send(const std::string& key, int64_t value, const std::string& type, float sample_rate);
-template bool StatsdClient::send(const std::string& key, uint32_t value, const std::string& type, float sample_rate);
-template bool StatsdClient::send(const std::string& key, uint64_t value, const std::string& type, float sample_rate);
diff --git a/src/stats/client.h b/src/stats/client.h
index e5e8fe7c9a98..7cd819c4dfcd 100644
--- a/src/stats/client.h
+++ b/src/stats/client.h
@@ -7,14 +7,11 @@
 #ifndef BITCOIN_STATS_CLIENT_H
 #define BITCOIN_STATS_CLIENT_H
 
-#include <random.h>
-#include <sync.h>
-
+#include <cstdint>
 #include <memory>
 #include <string>
 
 class ArgsManager;
-class RawSender;
 
 /** Default port used to connect to a Statsd server */
 static constexpr uint16_t DEFAULT_STATSD_PORT{8125};
@@ -39,44 +36,28 @@ static constexpr int MAX_STATSD_PERIOD{60 * 60};
 class StatsdClient
 {
 public:
-    explicit StatsdClient(const std::string& host, uint16_t port, uint64_t batch_size, uint64_t interval_ms,
-                          const std::string& prefix, const std::string& suffix);
-    ~StatsdClient();
+    static std::unique_ptr<StatsdClient> make(const ArgsManager& args);
+    virtual ~StatsdClient() = default;
 
-public:
     /* Statsd-defined APIs */
-    bool dec(const std::string& key, float sample_rate = 1.f);
-    bool inc(const std::string& key, float sample_rate = 1.f);
-    bool count(const std::string& key, int64_t delta, float sample_rate = 1.f);
-    bool gauge(const std::string& key, int64_t value, float sample_rate = 1.f);
-    bool gaugeDouble(const std::string& key, double value, float sample_rate = 1.f);
-    bool timing(const std::string& key, uint64_t ms, float sample_rate = 1.f);
+    virtual bool dec(const std::string& key, float sample_rate = 1.f) { return false; }
+    virtual bool inc(const std::string& key, float sample_rate = 1.f) { return false; }
+    virtual bool count(const std::string& key, int64_t delta, float sample_rate = 1.f) { return false; }
+    virtual bool gauge(const std::string& key, int64_t value, float sample_rate = 1.f) { return false; }
+    virtual bool gaugeDouble(const std::string& key, double value, float sample_rate = 1.f) { return false; }
+    virtual bool timing(const std::string& key, uint64_t ms, float sample_rate = 1.f) { return false; }
 
     /* Statsd-compatible APIs */
-    template <typename T1>
-    bool send(const std::string& key, T1 value, const std::string& type, float sample_rate = 1.f);
+    virtual bool send(const std::string& key, double value, const std::string& type, float sample_rate = 1.f) { return false; }
+    virtual bool send(const std::string& key, int32_t value, const std::string& type, float sample_rate = 1.f) { return false; }
+    virtual bool send(const std::string& key, int64_t value, const std::string& type, float sample_rate = 1.f) { return false; }
+    virtual bool send(const std::string& key, uint32_t value, const std::string& type, float sample_rate = 1.f) { return false; }
+    virtual bool send(const std::string& key, uint64_t value, const std::string& type, float sample_rate = 1.f) { return false; }
 
     /* Check if a StatsdClient instance is ready to send messages */
-    bool active() const { return m_sender != nullptr; }
-
-private:
-    /* Mutex to protect PRNG */
-    mutable Mutex cs;
-    /* PRNG used to dice-roll messages that are 0 < f < 1 */
-    mutable FastRandomContext insecure_rand GUARDED_BY(cs);
-
-    /* Broadcasts messages crafted by StatsdClient */
-    std::unique_ptr<RawSender> m_sender{nullptr};
-
-    /* Phrase prepended to keys */
-    const std::string m_prefix{""};
-    /* Phrase appended to keys */
-    const std::string m_suffix{""};
+    virtual bool active() const { return false; }
 };
 
-/** Parses arguments and constructs a StatsdClient instance */
-std::unique_ptr<StatsdClient> InitStatsClient(const ArgsManager& args);
-
 /** Global smart pointer containing StatsdClient instance */
 extern std::unique_ptr<StatsdClient> g_stats_client;
 
diff --git a/src/stats/rawsender.h b/src/stats/rawsender.h
index 65941f80dc5a..c6cdc0882018 100644
--- a/src/stats/rawsender.h
+++ b/src/stats/rawsender.h
@@ -63,14 +63,26 @@ class RawSender
     RawSender& operator=(const RawSender&) = delete;
     RawSender(RawSender&&) = delete;
 
+    //! Request a message to be sent based on configuration (queueing, batching)
     std::optional<std::string> Send(const RawMessage& msg) EXCLUSIVE_LOCKS_REQUIRED(!cs);
+
+private:
+    //! Send a message directly using ::send{,to}()
     std::optional<std::string> SendDirectly(const RawMessage& msg);
 
+    //! Get target server address as string
     std::string ToStringHostPort() const;
 
+    //! Add message to queue
     void QueueAdd(const RawMessage& msg) EXCLUSIVE_LOCKS_REQUIRED(!cs);
+
+    //! Send all messages in queue of RawSender entity and flush it
     void QueueFlush() EXCLUSIVE_LOCKS_REQUIRED(!cs);
+
+    //! Send all messages in given queue and flush it
     void QueueFlush(std::deque<RawMessage>& queue);
+
+    //! Worker thread function if queueing is requested
     void QueueThreadMain() EXCLUSIVE_LOCKS_REQUIRED(!cs);
 
 private:
diff --git a/src/test/util/setup_common.cpp b/src/test/util/setup_common.cpp
index 423abe4860d3..9f99263e82a8 100644
--- a/src/test/util/setup_common.cpp
+++ b/src/test/util/setup_common.cpp
@@ -188,7 +188,7 @@ BasicTestingSetup::BasicTestingSetup(const std::string& chainName, const std::ve
     SetupNetworking();
     InitSignatureCache();
     InitScriptExecutionCache();
-    ::g_stats_client = InitStatsClient(*m_node.args);
+    ::g_stats_client = StatsdClient::make(*m_node.args);
     m_node.chain = interfaces::MakeChain(m_node);
 
     m_node.netgroupman = std::make_unique<NetGroupManager>(/*asmap=*/std::vector<bool>());

From 1508f4a82810d4dcb267e74f4e7abba7f1a99265 Mon Sep 17 00:00:00 2001
From: Kittywhiskers Van Gogh <63189531+kwvg@users.noreply.github.com>
Date: Mon, 1 Sep 2025 03:30:04 +0000
Subject: [PATCH 006/656] stats: use string_view for fixed values

---
 src/stats/client.cpp | 28 ++++++++++++++--------------
 src/stats/client.h   | 23 ++++++++++++-----------
 2 files changed, 26 insertions(+), 25 deletions(-)

diff --git a/src/stats/client.cpp b/src/stats/client.cpp
index b473e17100dc..c5664606ea1d 100644
--- a/src/stats/client.cpp
+++ b/src/stats/client.cpp
@@ -39,24 +39,24 @@ class StatsdClientImpl final : public StatsdClient
     ~StatsdClientImpl() = default;
 
 public:
-    bool dec(const std::string& key, float sample_rate) override { return count(key, -1, sample_rate); }
-    bool inc(const std::string& key, float sample_rate) override { return count(key, 1, sample_rate); }
-    bool count(const std::string& key, int64_t delta, float sample_rate) override { return _send(key, delta, STATSD_METRIC_COUNT, sample_rate); }
-    bool gauge(const std::string& key, int64_t value, float sample_rate) override { return _send(key, value, STATSD_METRIC_GAUGE, sample_rate); }
-    bool gaugeDouble(const std::string& key, double value, float sample_rate) override { return _send(key, value, STATSD_METRIC_GAUGE, sample_rate); }
-    bool timing(const std::string& key, uint64_t ms, float sample_rate) override { return _send(key, ms, STATSD_METRIC_TIMING, sample_rate); }
-
-    bool send(const std::string& key, double value, const std::string& type, float sample_rate) override { return _send(key, value, type, sample_rate); }
-    bool send(const std::string& key, int32_t value, const std::string& type, float sample_rate) override { return _send(key, value, type, sample_rate); }
-    bool send(const std::string& key, int64_t value, const std::string& type, float sample_rate) override { return _send(key, value, type, sample_rate); }
-    bool send(const std::string& key, uint32_t value, const std::string& type, float sample_rate) override { return _send(key, value, type, sample_rate); }
-    bool send(const std::string& key, uint64_t value, const std::string& type, float sample_rate) override { return _send(key, value, type, sample_rate); }
+    bool dec(std::string_view key, float sample_rate) override { return count(key, -1, sample_rate); }
+    bool inc(std::string_view key, float sample_rate) override { return count(key, 1, sample_rate); }
+    bool count(std::string_view key, int64_t delta, float sample_rate) override { return _send(key, delta, STATSD_METRIC_COUNT, sample_rate); }
+    bool gauge(std::string_view key, int64_t value, float sample_rate) override { return _send(key, value, STATSD_METRIC_GAUGE, sample_rate); }
+    bool gaugeDouble(std::string_view key, double value, float sample_rate) override { return _send(key, value, STATSD_METRIC_GAUGE, sample_rate); }
+    bool timing(std::string_view key, uint64_t ms, float sample_rate) override { return _send(key, ms, STATSD_METRIC_TIMING, sample_rate); }
+
+    bool send(std::string_view key, double value, std::string_view type, float sample_rate) override { return _send(key, value, type, sample_rate); }
+    bool send(std::string_view key, int32_t value, std::string_view type, float sample_rate) override { return _send(key, value, type, sample_rate); }
+    bool send(std::string_view key, int64_t value, std::string_view type, float sample_rate) override { return _send(key, value, type, sample_rate); }
+    bool send(std::string_view key, uint32_t value, std::string_view type, float sample_rate) override { return _send(key, value, type, sample_rate); }
+    bool send(std::string_view key, uint64_t value, std::string_view type, float sample_rate) override { return _send(key, value, type, sample_rate); }
 
     bool active() const override { return m_sender != nullptr; }
 
 private:
     template <typename T1>
-    inline bool _send(const std::string& key, T1 value, const std::string& type, float sample_rate);
+    inline bool _send(std::string_view key, T1 value, std::string_view type, float sample_rate);
 
 private:
     /* Mutex to protect PRNG */
@@ -122,7 +122,7 @@ StatsdClientImpl::StatsdClientImpl(const std::string& host, uint16_t port, uint6
 }
 
 template <typename T1>
-inline bool StatsdClientImpl::_send(const std::string& key, T1 value, const std::string& type, float sample_rate)
+inline bool StatsdClientImpl::_send(std::string_view key, T1 value, std::string_view type, float sample_rate)
 {
     static_assert(std::is_arithmetic<T1>::value, "Must specialize to an arithmetic type");
 
diff --git a/src/stats/client.h b/src/stats/client.h
index 7cd819c4dfcd..b7b4440b6baf 100644
--- a/src/stats/client.h
+++ b/src/stats/client.h
@@ -10,6 +10,7 @@
 #include <cstdint>
 #include <memory>
 #include <string>
+#include <string_view>
 
 class ArgsManager;
 
@@ -40,19 +41,19 @@ class StatsdClient
     virtual ~StatsdClient() = default;
 
     /* Statsd-defined APIs */
-    virtual bool dec(const std::string& key, float sample_rate = 1.f) { return false; }
-    virtual bool inc(const std::string& key, float sample_rate = 1.f) { return false; }
-    virtual bool count(const std::string& key, int64_t delta, float sample_rate = 1.f) { return false; }
-    virtual bool gauge(const std::string& key, int64_t value, float sample_rate = 1.f) { return false; }
-    virtual bool gaugeDouble(const std::string& key, double value, float sample_rate = 1.f) { return false; }
-    virtual bool timing(const std::string& key, uint64_t ms, float sample_rate = 1.f) { return false; }
+    virtual bool dec(std::string_view key, float sample_rate = 1.f) { return false; }
+    virtual bool inc(std::string_view key, float sample_rate = 1.f) { return false; }
+    virtual bool count(std::string_view key, int64_t delta, float sample_rate = 1.f) { return false; }
+    virtual bool gauge(std::string_view key, int64_t value, float sample_rate = 1.f) { return false; }
+    virtual bool gaugeDouble(std::string_view key, double value, float sample_rate = 1.f) { return false; }
+    virtual bool timing(std::string_view key, uint64_t ms, float sample_rate = 1.f) { return false; }
 
     /* Statsd-compatible APIs */
-    virtual bool send(const std::string& key, double value, const std::string& type, float sample_rate = 1.f) { return false; }
-    virtual bool send(const std::string& key, int32_t value, const std::string& type, float sample_rate = 1.f) { return false; }
-    virtual bool send(const std::string& key, int64_t value, const std::string& type, float sample_rate = 1.f) { return false; }
-    virtual bool send(const std::string& key, uint32_t value, const std::string& type, float sample_rate = 1.f) { return false; }
-    virtual bool send(const std::string& key, uint64_t value, const std::string& type, float sample_rate = 1.f) { return false; }
+    virtual bool send(std::string_view key, double value, std::string_view type, float sample_rate = 1.f) { return false; }
+    virtual bool send(std::string_view key, int32_t value, std::string_view type, float sample_rate = 1.f) { return false; }
+    virtual bool send(std::string_view key, int64_t value, std::string_view type, float sample_rate = 1.f) { return false; }
+    virtual bool send(std::string_view key, uint32_t value, std::string_view type, float sample_rate = 1.f) { return false; }
+    virtual bool send(std::string_view key, uint64_t value, std::string_view type, float sample_rate = 1.f) { return false; }
 
     /* Check if a StatsdClient instance is ready to send messages */
     virtual bool active() const { return false; }

From 8d7e74fb8f1e86b568e91ce5f7a3780e7b2b61dc Mon Sep 17 00:00:00 2001
From: Kittywhiskers Van Gogh <63189531+kwvg@users.noreply.github.com>
Date: Tue, 30 Sep 2025 18:38:25 +0000
Subject: [PATCH 007/656] stats: bubble errors up, halt init if stats client
 reports errors

Also we should initialize the Statsd client *after* setting
g_socket_events_mode or risk a crash when we try to establish a
connection later.
---
 src/init.cpp                   | 16 ++++++++----
 src/stats/client.cpp           | 46 ++++++++++++++++++----------------
 src/stats/client.h             |  4 ++-
 src/stats/rawsender.cpp        | 12 ++++-----
 src/stats/rawsender.h          |  5 ++--
 src/test/util/setup_common.cpp |  8 +++++-
 6 files changed, 54 insertions(+), 37 deletions(-)

diff --git a/src/init.cpp b/src/init.cpp
index 2fc3606de8d7..7411cd5b4168 100644
--- a/src/init.cpp
+++ b/src/init.cpp
@@ -1584,11 +1584,6 @@ bool AppInitMain(NodeContext& node, interfaces::BlockAndHeaderTipInfo* tip_info)
     fDiscover = args.GetBoolArg("-discover", true);
     const bool ignores_incoming_txs{args.GetBoolArg("-blocksonly", DEFAULT_BLOCKSONLY)};
 
-    // We need to initialize g_stats_client early as currently, g_stats_client is called
-    // regardless of whether transmitting stats are desirable or not and if
-    // g_stats_client isn't present when that attempt is made, the client will crash.
-    ::g_stats_client = StatsdClient::make(args);
-
     {
 
         // Read asmap file if configured
@@ -1631,6 +1626,17 @@ bool AppInitMain(NodeContext& node, interfaces::BlockAndHeaderTipInfo* tip_info)
         return InitError(strprintf(_("Invalid -socketevents ('%s') specified. Only these modes are supported: %s"), sem_str, GetSupportedSocketEventsStr()));
     }
 
+    // We need to initialize g_stats_client early as currently, g_stats_client is called
+    // regardless of whether transmitting stats are desirable or not and if
+    // g_stats_client isn't present when that attempt is made, the client will crash.
+    {
+        auto stats_client = StatsdClient::make(args);
+        if (!stats_client) {
+            return InitError(_("Cannot init Statsd client") + Untranslated(" (") + util::ErrorString(stats_client) + Untranslated(")"));
+        }
+        ::g_stats_client = std::move(*stats_client);
+    }
+
     assert(!node.banman);
     node.banman = std::make_unique<BanMan>(gArgs.GetDataDirNet() / "banlist", &uiInterface, args.GetIntArg("-bantime", DEFAULT_MISBEHAVING_BANTIME));
     assert(!node.connman);
diff --git a/src/stats/client.cpp b/src/stats/client.cpp
index c5664606ea1d..d46f24064a47 100644
--- a/src/stats/client.cpp
+++ b/src/stats/client.cpp
@@ -10,7 +10,9 @@
 #include <random.h>
 #include <stats/rawsender.h>
 #include <sync.h>
+#include <util/check.h>
 #include <util/system.h>
+#include <util/translation.h>
 
 #include <algorithm>
 #include <cmath>
@@ -35,7 +37,7 @@ class StatsdClientImpl final : public StatsdClient
 {
 public:
     explicit StatsdClientImpl(const std::string& host, uint16_t port, uint64_t batch_size, uint64_t interval_ms,
-                              const std::string& prefix, const std::string& suffix);
+                              const std::string& prefix, const std::string& suffix, std::optional<bilingual_str>& error);
     ~StatsdClientImpl() = default;
 
 public:
@@ -76,8 +78,14 @@ class StatsdClientImpl final : public StatsdClient
 
 std::unique_ptr<StatsdClient> g_stats_client;
 
-std::unique_ptr<StatsdClient> StatsdClient::make(const ArgsManager& args)
+util::Result<std::unique_ptr<StatsdClient>> StatsdClient::make(const ArgsManager& args)
 {
+    const auto host = args.GetArg("-statshost", DEFAULT_STATSD_HOST);
+    if (host.empty()) {
+        LogPrintf("Transmitting stats are disabled, will not init Statsd client\n");
+        return std::make_unique<StatsdClient>();
+    }
+
     auto sanitize_string = [](std::string string) {
         // Remove key delimiters from the front and back as they're added back in
         // the constructor
@@ -88,32 +96,30 @@ std::unique_ptr<StatsdClient> StatsdClient::make(const ArgsManager& args)
         return string;
     };
 
-    return std::make_unique<StatsdClientImpl>(
-        args.GetArg("-statshost", DEFAULT_STATSD_HOST),
-        args.GetIntArg("-statsport", DEFAULT_STATSD_PORT),
+    std::optional<bilingual_str> error_opt;
+    auto statsd_ptr = std::make_unique<StatsdClientImpl>(
+        host, args.GetIntArg("-statsport", DEFAULT_STATSD_PORT),
         args.GetIntArg("-statsbatchsize", DEFAULT_STATSD_BATCH_SIZE),
         args.GetIntArg("-statsduration", DEFAULT_STATSD_DURATION),
         sanitize_string(args.GetArg("-statsprefix", DEFAULT_STATSD_PREFIX)),
-        sanitize_string(args.GetArg("-statssuffix", DEFAULT_STATSD_SUFFIX))
-    );
+        sanitize_string(args.GetArg("-statssuffix", DEFAULT_STATSD_SUFFIX)), error_opt);
+    if (error_opt.has_value()) {
+        statsd_ptr.reset();
+        return util::Error{error_opt.value()};
+    }
+    return {std::move(statsd_ptr)};
 }
 
 StatsdClientImpl::StatsdClientImpl(const std::string& host, uint16_t port, uint64_t batch_size, uint64_t interval_ms,
-                                   const std::string& prefix, const std::string& suffix) :
+                                   const std::string& prefix, const std::string& suffix,
+                                   std::optional<bilingual_str>& error) :
     m_prefix{[prefix]() { return !prefix.empty() ? prefix + STATSD_NS_DELIMITER : prefix; }()},
     m_suffix{[suffix]() { return !suffix.empty() ? STATSD_NS_DELIMITER + suffix : suffix; }()}
 {
-    if (host.empty()) {
-        LogPrintf("Transmitting stats are disabled, will not init StatsdClient\n");
-        return;
-    }
-
-    std::optional<std::string> error_opt;
     m_sender = std::make_unique<RawSender>(host, port,
                                            std::make_pair(batch_size, static_cast<uint8_t>(STATSD_MSG_DELIMITER)),
-                                           interval_ms, error_opt);
-    if (error_opt.has_value()) {
-        LogPrintf("ERROR: %s, cannot initialize StatsdClient.\n", error_opt.value());
+                                           interval_ms, error);
+    if (error.has_value()) {
         m_sender.reset();
         return;
     }
@@ -126,10 +132,6 @@ inline bool StatsdClientImpl::_send(std::string_view key, T1 value, std::string_
 {
     static_assert(std::is_arithmetic<T1>::value, "Must specialize to an arithmetic type");
 
-    if (!m_sender) {
-        return false;
-    }
-
     // Determine if we should send the message at all but claim that we did even if we don't
     sample_rate = std::clamp(sample_rate, 0.f, 1.f);
     bool always_send = std::fabs(sample_rate - 1.f) < EPSILON;
@@ -146,7 +148,7 @@ inline bool StatsdClientImpl::_send(std::string_view key, T1 value, std::string_
     }
 
     // Send it and report an error if we encounter one
-    if (auto error_opt = m_sender->Send(msg); error_opt.has_value()) {
+    if (auto error_opt = Assert(m_sender)->Send(msg); error_opt.has_value()) {
         LogPrintf("ERROR: %s.\n", error_opt.value());
         return false;
     }
diff --git a/src/stats/client.h b/src/stats/client.h
index b7b4440b6baf..b9484f8f5cb9 100644
--- a/src/stats/client.h
+++ b/src/stats/client.h
@@ -7,6 +7,8 @@
 #ifndef BITCOIN_STATS_CLIENT_H
 #define BITCOIN_STATS_CLIENT_H
 
+#include <util/result.h>
+
 #include <cstdint>
 #include <memory>
 #include <string>
@@ -37,7 +39,7 @@ static constexpr int MAX_STATSD_PERIOD{60 * 60};
 class StatsdClient
 {
 public:
-    static std::unique_ptr<StatsdClient> make(const ArgsManager& args);
+    static util::Result<std::unique_ptr<StatsdClient>> make(const ArgsManager& args);
     virtual ~StatsdClient() = default;
 
     /* Statsd-defined APIs */
diff --git a/src/stats/rawsender.cpp b/src/stats/rawsender.cpp
index 8b56875f2fab..3f72e2207d10 100644
--- a/src/stats/rawsender.cpp
+++ b/src/stats/rawsender.cpp
@@ -12,34 +12,34 @@
 #include <util/thread.h>
 
 RawSender::RawSender(const std::string& host, uint16_t port, std::pair<uint64_t, uint8_t> batching_opts,
-                     uint64_t interval_ms, std::optional<std::string>& error) :
+                     uint64_t interval_ms, std::optional<bilingual_str>& error) :
     m_host{host},
     m_port{port},
     m_batching_opts{batching_opts},
     m_interval_ms{interval_ms}
 {
     if (host.empty()) {
-        error = "No host specified";
+        error = _("No host specified");
         return;
     }
 
     if (auto netaddr = LookupHost(m_host, /*fAllowLookup=*/true); netaddr.has_value()) {
         if (!netaddr->IsIPv4()) {
-            error = strprintf("Host %s on unsupported network", m_host);
+            error = strprintf(_("Host %s on unsupported network"), m_host);
             return;
         }
         if (!CService(*netaddr, port).GetSockAddr(reinterpret_cast<struct sockaddr*>(&m_server.first), &m_server.second)) {
-            error = strprintf("Cannot get socket address for %s", m_host);
+            error = strprintf(_("Cannot get socket address for %s"), m_host);
             return;
         }
     } else {
-        error = strprintf("Unable to lookup host %s", m_host);
+        error = strprintf(_("Unable to lookup host %s"), m_host);
         return;
     }
 
     SOCKET hSocket = ::socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP);
     if (hSocket == INVALID_SOCKET) {
-        error = strprintf("Cannot create socket (socket() returned error %s)", NetworkErrorString(WSAGetLastError()));
+        error = strprintf(_("Cannot create socket (socket() returned error %s)"), NetworkErrorString(WSAGetLastError()));
         return;
     }
     m_sock = std::make_unique<Sock>(hSocket);
diff --git a/src/stats/rawsender.h b/src/stats/rawsender.h
index c6cdc0882018..911e5d9a05a3 100644
--- a/src/stats/rawsender.h
+++ b/src/stats/rawsender.h
@@ -9,6 +9,7 @@
 #include <compat/compat.h>
 #include <sync.h>
 #include <util/threadinterrupt.h>
+#include <util/translation.h>
 
 #include <deque>
 #include <memory>
@@ -55,8 +56,8 @@ struct RawMessage : public std::vector<uint8_t>
 class RawSender
 {
 public:
-    RawSender(const std::string& host, uint16_t port, std::pair<uint64_t, uint8_t> batching_opts,
-              uint64_t interval_ms, std::optional<std::string>& error);
+    RawSender(const std::string& host, uint16_t port, std::pair<uint64_t, uint8_t> batching_opts, uint64_t interval_ms,
+              std::optional<bilingual_str>& error);
     ~RawSender();
 
     RawSender(const RawSender&) = delete;
diff --git a/src/test/util/setup_common.cpp b/src/test/util/setup_common.cpp
index 9f99263e82a8..7942e3c2a57f 100644
--- a/src/test/util/setup_common.cpp
+++ b/src/test/util/setup_common.cpp
@@ -188,7 +188,6 @@ BasicTestingSetup::BasicTestingSetup(const std::string& chainName, const std::ve
     SetupNetworking();
     InitSignatureCache();
     InitScriptExecutionCache();
-    ::g_stats_client = StatsdClient::make(*m_node.args);
     m_node.chain = interfaces::MakeChain(m_node);
 
     m_node.netgroupman = std::make_unique<NetGroupManager>(/*asmap=*/std::vector<bool>());
@@ -203,6 +202,13 @@ BasicTestingSetup::BasicTestingSetup(const std::string& chainName, const std::ve
             strprintf("Invalid -socketevents ('%s') specified. Only these modes are supported: %s",
                       sem_str, GetSupportedSocketEventsStr()));
     }
+    {
+        auto stats_client = StatsdClient::make(*m_node.args);
+        if (!stats_client) {
+            throw std::runtime_error{strprintf("Cannot init Statsd client (%s)", util::ErrorString(stats_client).original)};
+        }
+        ::g_stats_client = std::move(*stats_client);
+    }
 
     m_node.connman = std::make_unique<ConnmanTestMsg>(0x1337, 0x1337, *m_node.addrman, *m_node.netgroupman); // Deterministic randomness for tests.
 

From fced9f66c7d37adfc85e75057cff1ae67aa0752c Mon Sep 17 00:00:00 2001
From: Kittywhiskers Van Gogh <63189531+kwvg@users.noreply.github.com>
Date: Tue, 30 Sep 2025 18:56:24 +0000
Subject: [PATCH 008/656] stats: add stricter validation for arguments

---
 src/stats/client.cpp | 21 ++++++++++++++++++---
 1 file changed, 18 insertions(+), 3 deletions(-)

diff --git a/src/stats/client.cpp b/src/stats/client.cpp
index d46f24064a47..2af9b5111f76 100644
--- a/src/stats/client.cpp
+++ b/src/stats/client.cpp
@@ -16,6 +16,7 @@
 
 #include <algorithm>
 #include <cmath>
+#include <limits>
 #include <random>
 
 namespace {
@@ -86,6 +87,22 @@ util::Result<std::unique_ptr<StatsdClient>> StatsdClient::make(const ArgsManager
         return std::make_unique<StatsdClient>();
     }
 
+    const int64_t batch_size = args.GetIntArg("-statsbatchsize", DEFAULT_STATSD_BATCH_SIZE);
+    if (batch_size < 0) {
+        return util::Error{_("-statsbatchsize cannot be configured with a negative value.")};
+    }
+
+    const int64_t interval_ms = args.GetIntArg("-statsduration", DEFAULT_STATSD_DURATION);
+    if (interval_ms < 0) {
+        return util::Error{_("-statsduration cannot be configured with a negative value.")};
+    }
+
+    const int64_t port = args.GetIntArg("-statsport", DEFAULT_STATSD_PORT);
+    if (port < 1 || port > std::numeric_limits<uint16_t>::max()) {
+        return util::Error{strprintf(_("Port must be between %d and %d, supplied %d"), 1,
+                                       std::numeric_limits<uint16_t>::max(), port)};
+    }
+
     auto sanitize_string = [](std::string string) {
         // Remove key delimiters from the front and back as they're added back in
         // the constructor
@@ -98,9 +115,7 @@ util::Result<std::unique_ptr<StatsdClient>> StatsdClient::make(const ArgsManager
 
     std::optional<bilingual_str> error_opt;
     auto statsd_ptr = std::make_unique<StatsdClientImpl>(
-        host, args.GetIntArg("-statsport", DEFAULT_STATSD_PORT),
-        args.GetIntArg("-statsbatchsize", DEFAULT_STATSD_BATCH_SIZE),
-        args.GetIntArg("-statsduration", DEFAULT_STATSD_DURATION),
+        host, port, batch_size, interval_ms,
         sanitize_string(args.GetArg("-statsprefix", DEFAULT_STATSD_PREFIX)),
         sanitize_string(args.GetArg("-statssuffix", DEFAULT_STATSD_SUFFIX)), error_opt);
     if (error_opt.has_value()) {

From 131d536f27997a3218c60b007301516f76a800e4 Mon Sep 17 00:00:00 2001
From: Kittywhiskers Van Gogh <63189531+kwvg@users.noreply.github.com>
Date: Fri, 5 Sep 2025 10:28:18 +0000
Subject: [PATCH 009/656] stats: use `bilingual_str` for RawSender error
 messages

---
 src/stats/client.cpp    | 2 +-
 src/stats/rawsender.cpp | 8 ++++----
 src/stats/rawsender.h   | 4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/stats/client.cpp b/src/stats/client.cpp
index 2af9b5111f76..5e2f61ae5c28 100644
--- a/src/stats/client.cpp
+++ b/src/stats/client.cpp
@@ -164,7 +164,7 @@ inline bool StatsdClientImpl::_send(std::string_view key, T1 value, std::string_
 
     // Send it and report an error if we encounter one
     if (auto error_opt = Assert(m_sender)->Send(msg); error_opt.has_value()) {
-        LogPrintf("ERROR: %s.\n", error_opt.value());
+        LogPrintf("ERROR: %s.\n", error_opt->original);
         return false;
     }
 
diff --git a/src/stats/rawsender.cpp b/src/stats/rawsender.cpp
index 3f72e2207d10..f849682d70c0 100644
--- a/src/stats/rawsender.cpp
+++ b/src/stats/rawsender.cpp
@@ -68,7 +68,7 @@ RawSender::~RawSender()
               m_host, m_port, m_successes, m_failures);
 }
 
-std::optional<std::string> RawSender::Send(const RawMessage& msg)
+std::optional<bilingual_str> RawSender::Send(const RawMessage& msg)
 {
     // If there is a thread, append to queue
     if (m_thread.joinable()) {
@@ -79,11 +79,11 @@ std::optional<std::string> RawSender::Send(const RawMessage& msg)
     return SendDirectly(msg);
 }
 
-std::optional<std::string> RawSender::SendDirectly(const RawMessage& msg)
+std::optional<bilingual_str> RawSender::SendDirectly(const RawMessage& msg)
 {
     if (!m_sock) {
         m_failures++;
-        return "Socket not initialized, cannot send message";
+        return _("Socket not initialized, cannot send message");
     }
 
     if (::sendto(m_sock->Get(), reinterpret_cast<const char*>(msg.data()),
@@ -94,7 +94,7 @@ std::optional<std::string> RawSender::SendDirectly(const RawMessage& msg)
 #endif // WIN32
                  /*flags=*/0, reinterpret_cast<struct sockaddr*>(&m_server.first), m_server.second) == SOCKET_ERROR) {
         m_failures++;
-        return strprintf("Unable to send message to %s (sendto() returned error %s)", this->ToStringHostPort(),
+        return strprintf(_("Unable to send message to %s (::sendto() returned error %s)"), this->ToStringHostPort(),
                          NetworkErrorString(WSAGetLastError()));
     }
 
diff --git a/src/stats/rawsender.h b/src/stats/rawsender.h
index 911e5d9a05a3..fc78ff650772 100644
--- a/src/stats/rawsender.h
+++ b/src/stats/rawsender.h
@@ -65,11 +65,11 @@ class RawSender
     RawSender(RawSender&&) = delete;
 
     //! Request a message to be sent based on configuration (queueing, batching)
-    std::optional<std::string> Send(const RawMessage& msg) EXCLUSIVE_LOCKS_REQUIRED(!cs);
+    std::optional<bilingual_str> Send(const RawMessage& msg) EXCLUSIVE_LOCKS_REQUIRED(!cs);
 
 private:
     //! Send a message directly using ::send{,to}()
-    std::optional<std::string> SendDirectly(const RawMessage& msg);
+    std::optional<bilingual_str> SendDirectly(const RawMessage& msg);
 
     //! Get target server address as string
     std::string ToStringHostPort() const;

From 3640071485312397cd36326ce8c4a5b9734b08fe Mon Sep 17 00:00:00 2001
From: Kittywhiskers Van Gogh <63189531+kwvg@users.noreply.github.com>
Date: Wed, 16 Oct 2024 20:10:37 +0000
Subject: [PATCH 010/656] stats: extend connection support to IPv6

---
 src/stats/rawsender.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/stats/rawsender.cpp b/src/stats/rawsender.cpp
index f849682d70c0..74647eed131e 100644
--- a/src/stats/rawsender.cpp
+++ b/src/stats/rawsender.cpp
@@ -24,7 +24,7 @@ RawSender::RawSender(const std::string& host, uint16_t port, std::pair<uint64_t,
     }
 
     if (auto netaddr = LookupHost(m_host, /*fAllowLookup=*/true); netaddr.has_value()) {
-        if (!netaddr->IsIPv4()) {
+        if (!netaddr->IsIPv4() && !netaddr->IsIPv6()) {
             error = strprintf(_("Host %s on unsupported network"), m_host);
             return;
         }
@@ -37,7 +37,7 @@ RawSender::RawSender(const std::string& host, uint16_t port, std::pair<uint64_t,
         return;
     }
 
-    SOCKET hSocket = ::socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP);
+    SOCKET hSocket = ::socket(reinterpret_cast<struct sockaddr*>(&m_server.first)->sa_family, SOCK_DGRAM, IPPROTO_UDP);
     if (hSocket == INVALID_SOCKET) {
         error = strprintf(_("Cannot create socket (socket() returned error %s)"), NetworkErrorString(WSAGetLastError()));
         return;

From 592aa0408327ae4050f768750225d5922223e3af Mon Sep 17 00:00:00 2001
From: Kittywhiskers Van Gogh <63189531+kwvg@users.noreply.github.com>
Date: Tue, 9 Sep 2025 15:58:51 +0000
Subject: [PATCH 011/656] stats: add support for URLs in `statshost`, deprecate
 `statsport`

---
 src/init.cpp         |  2 +-
 src/stats/client.cpp | 60 ++++++++++++++++++++++++++++++++++++++++----
 src/stats/client.h   |  2 --
 3 files changed, 56 insertions(+), 8 deletions(-)

diff --git a/src/init.cpp b/src/init.cpp
index 7411cd5b4168..25b2ca72090c 100644
--- a/src/init.cpp
+++ b/src/init.cpp
@@ -783,7 +783,7 @@ void SetupServerArgs(ArgsManager& argsman)
     argsman.AddArg("-statsbatchsize=<bytes>", strprintf("Specify the size of each batch of stats messages (default: %d)", DEFAULT_STATSD_BATCH_SIZE), ArgsManager::ALLOW_ANY, OptionsCategory::STATSD);
     argsman.AddArg("-statsduration=<ms>", strprintf("Specify the number of milliseconds between stats messages (default: %d)", DEFAULT_STATSD_DURATION), ArgsManager::ALLOW_ANY, OptionsCategory::STATSD);
     argsman.AddArg("-statshost=<ip>", strprintf("Specify statsd host (default: %s)", DEFAULT_STATSD_HOST), ArgsManager::ALLOW_ANY, OptionsCategory::STATSD);
-    argsman.AddArg("-statsport=<port>", strprintf("Specify statsd port (default: %u)", DEFAULT_STATSD_PORT), ArgsManager::ALLOW_ANY, OptionsCategory::STATSD);
+    hidden_args.emplace_back("-statsport");
     argsman.AddArg("-statsperiod=<seconds>", strprintf("Specify the number of seconds between periodic measurements (default: %d)", DEFAULT_STATSD_PERIOD), ArgsManager::ALLOW_ANY, OptionsCategory::STATSD);
     argsman.AddArg("-statsprefix=<string>", strprintf("Specify an optional string prepended to every stats key (default: %s)", DEFAULT_STATSD_PREFIX), ArgsManager::ALLOW_ANY, OptionsCategory::STATSD);
     argsman.AddArg("-statssuffix=<string>", strprintf("Specify an optional string appended to every stats key (default: %s)", DEFAULT_STATSD_SUFFIX), ArgsManager::ALLOW_ANY, OptionsCategory::STATSD);
diff --git a/src/stats/client.cpp b/src/stats/client.cpp
index 5e2f61ae5c28..d0e3a938e1e1 100644
--- a/src/stats/client.cpp
+++ b/src/stats/client.cpp
@@ -11,6 +11,7 @@
 #include <stats/rawsender.h>
 #include <sync.h>
 #include <util/check.h>
+#include <util/strencodings.h>
 #include <util/system.h>
 #include <util/translation.h>
 
@@ -22,6 +23,11 @@
 namespace {
 /** Threshold below which a value is considered effectively zero */
 static constexpr float EPSILON{0.0001f};
+/** Delimiter segmenting scheme from the rest of the URL */
+static constexpr std::string_view URL_SCHEME_DELIMITER{"://"};
+
+/** Default port used to connect to a Statsd server */
+static constexpr uint16_t DEFAULT_STATSD_PORT{8125};
 
 /** Delimiter segmenting two fully formed Statsd messages */
 static constexpr char STATSD_MSG_DELIMITER{'\n'};
@@ -81,7 +87,7 @@ std::unique_ptr<StatsdClient> g_stats_client;
 
 util::Result<std::unique_ptr<StatsdClient>> StatsdClient::make(const ArgsManager& args)
 {
-    const auto host = args.GetArg("-statshost", DEFAULT_STATSD_HOST);
+    auto host = args.GetArg("-statshost", DEFAULT_STATSD_HOST);
     if (host.empty()) {
         LogPrintf("Transmitting stats are disabled, will not init Statsd client\n");
         return std::make_unique<StatsdClient>();
@@ -97,10 +103,54 @@ util::Result<std::unique_ptr<StatsdClient>> StatsdClient::make(const ArgsManager
         return util::Error{_("-statsduration cannot be configured with a negative value.")};
     }
 
-    const int64_t port = args.GetIntArg("-statsport", DEFAULT_STATSD_PORT);
-    if (port < 1 || port > std::numeric_limits<uint16_t>::max()) {
-        return util::Error{strprintf(_("Port must be between %d and %d, supplied %d"), 1,
-                                       std::numeric_limits<uint16_t>::max(), port)};
+    auto port_arg = args.GetIntArg("-statsport", DEFAULT_STATSD_PORT);
+    if (args.IsArgSet("-statsport")) {
+        // Port range validation if -statsport is specified.
+        if (port_arg < 1 || port_arg > std::numeric_limits<uint16_t>::max()) {
+            return util::Error{strprintf(_("Port must be between %d and %d, supplied %d"), 1,
+                                         std::numeric_limits<uint16_t>::max(), port_arg)};
+        }
+    }
+    uint16_t port = static_cast<uint16_t>(port_arg);
+
+    // Could be a URL, try to parse it.
+    const size_t scheme_idx{host.find(URL_SCHEME_DELIMITER)};
+    if (scheme_idx != std::string::npos) {
+        // Parse the scheme and trim it out of the URL if we succeed
+        if (scheme_idx == 0) {
+            return util::Error{_("No text before the scheme delimiter, malformed URL")};
+        }
+        std::string scheme{ToLower(host.substr(/*pos=*/0, scheme_idx))};
+        if (scheme != "udp") {
+            return util::Error{_("Unsupported URL scheme, must begin with udp://")};
+        }
+        host = host.substr(scheme_idx + URL_SCHEME_DELIMITER.length());
+
+        // Strip trailing slashes and parse the port
+        const size_t colon_idx{host.rfind(':')};
+        if (colon_idx != std::string::npos) {
+            // Remove all forward slashes found after the port delimiter (colon)
+            host = std::string(
+                host.begin(), host.end() - [&colon_idx, &host]() {
+                    const size_t slash_idx{host.find('/', /*pos=*/colon_idx + 1)};
+                    return slash_idx != std::string::npos ? host.length() - slash_idx : 0;
+                }());
+            uint16_t port_url{0};
+            SplitHostPort(host, port_url, host);
+            if (port_url != 0) {
+                if (args.IsArgSet("-statsport")) {
+                    LogPrintf("%s: Supplied URL with port, ignoring -statsport\n", __func__);
+                }
+                port = port_url;
+            }
+        } else {
+            // There was no port specified, remove everything after the first forward slash
+            host = host.substr(/*pos=*/0, host.find("/"));
+        }
+
+        if (host.empty()) {
+            return util::Error{_("No host specified, malformed URL")};
+        }
     }
 
     auto sanitize_string = [](std::string string) {
diff --git a/src/stats/client.h b/src/stats/client.h
index b9484f8f5cb9..dad20111d9c7 100644
--- a/src/stats/client.h
+++ b/src/stats/client.h
@@ -16,8 +16,6 @@
 
 class ArgsManager;
 
-/** Default port used to connect to a Statsd server */
-static constexpr uint16_t DEFAULT_STATSD_PORT{8125};
 /** Default host assumed to be running a Statsd server */
 static const std::string DEFAULT_STATSD_HOST{""};
 /** Default prefix prepended to Statsd message keys */

From b50c7f211e16778169fedc35cfe8b97906fd061a Mon Sep 17 00:00:00 2001
From: Kittywhiskers Van Gogh <63189531+kwvg@users.noreply.github.com>
Date: Tue, 30 Sep 2025 10:37:03 +0000
Subject: [PATCH 012/656] stats: add functional test for statsd reporting

---
 test/functional/feature_stats.py | 141 +++++++++++++++++++++++++++++++
 test/functional/test_runner.py   |   1 +
 2 files changed, 142 insertions(+)
 create mode 100755 test/functional/feature_stats.py

diff --git a/test/functional/feature_stats.py b/test/functional/feature_stats.py
new file mode 100755
index 000000000000..64b4674b102c
--- /dev/null
+++ b/test/functional/feature_stats.py
@@ -0,0 +1,141 @@
+#!/usr/bin/env python3
+# Copyright (c) 2025 The Dash Core developers
+# Distributed under the MIT software license, see the accompanying
+# file COPYING or http://www.opensource.org/licenses/mit-license.php.
+
+"""Test stats reporting"""
+
+import queue
+import socket
+import time
+import threading
+
+from test_framework.netutil import test_ipv6_local
+from test_framework.test_framework import BitcoinTestFramework
+from queue import Queue
+
+ONION_ADDR = "pg6mmjiyjmcrsslvykfwnntlaru7p5svn6y2ymmju6nubxndf4pscryd.onion"
+
+class StatsServer:
+    def __init__(self, host: str, port: int):
+        self.running = False
+        self.thread = None
+        self.queue: Queue[str] = Queue()
+
+        addr_info = socket.getaddrinfo(host, port, socket.AF_UNSPEC, socket.SOCK_DGRAM)
+        self.af = addr_info[0][0]
+        self.addr = (host, port)
+
+        self.s = socket.socket(self.af, socket.SOCK_DGRAM)
+        self.s.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1)
+        self.s.bind(self.addr)
+        self.s.settimeout(0.1)
+
+    def run(self):
+        while self.running:
+            try:
+                data, _ = self.s.recvfrom(4096)
+                messages = data.decode('utf-8').strip().split('\n')
+                for msg in messages:
+                    if msg:
+                        self.queue.put(msg)
+            except socket.timeout:
+                continue
+            except Exception as e:
+                if self.running:
+                    raise AssertionError("Unexpected exception raised: " + type(e).__name__)
+
+    def start(self):
+        assert not self.running
+        self.running = True
+        self.thread = threading.Thread(target=self.run)
+        self.thread.daemon = True
+        self.thread.start()
+
+    def stop(self):
+        self.running = False
+        if self.thread:
+            self.thread.join(timeout=2)
+        self.s.close()
+
+    def assert_msg_received(self, expected_msg: str, timeout: int = 30):
+        deadline = time.time() + timeout
+        while time.time() < deadline:
+            try:
+                msg = self.queue.get(timeout=5)
+                if expected_msg in msg:
+                    return
+            except queue.Empty:
+                continue
+        raise AssertionError(f"Did not receive message containing '{expected_msg}' within {timeout} seconds")
+
+
+class StatsTest(BitcoinTestFramework):
+    def set_test_params(self):
+        self.num_nodes = 1
+
+    def run_test(self):
+        self.log.info("Test invalid command line options")
+        self.test_invalid_command_line_options()
+
+        self.log.info("Test command line behavior")
+        self.test_command_behavior()
+
+        self.log.info("Check that server can receive stats client messages")
+        self.have_ipv6 = test_ipv6_local()
+        self.test_conn('127.0.0.1')
+        if self.have_ipv6:
+            self.test_conn('::1')
+        else:
+            self.log.warning("Testing without local IPv6 support")
+
+    def test_invalid_command_line_options(self):
+        self.stop_node(0)
+        self.nodes[0].assert_start_raises_init_error(
+            expected_msg='Error: Cannot init Statsd client (Port must be between 1 and 65535, supplied 65536)',
+            extra_args=['-statshost=127.0.0.1', '-statsport=65536'],
+        )
+        self.nodes[0].assert_start_raises_init_error(
+            expected_msg='Error: Cannot init Statsd client (No text before the scheme delimiter, malformed URL)',
+            extra_args=['-statshost=://127.0.0.1'],
+        )
+        self.nodes[0].assert_start_raises_init_error(
+            expected_msg='Error: Cannot init Statsd client (Unsupported URL scheme, must begin with udp://)',
+            extra_args=['-statshost=http://127.0.0.1'],
+        )
+        self.nodes[0].assert_start_raises_init_error(
+            expected_msg='Error: Cannot init Statsd client (No host specified, malformed URL)',
+            extra_args=['-statshost=udp://'],
+        )
+        self.nodes[0].assert_start_raises_init_error(
+            expected_msg=f'Error: Cannot init Statsd client (Host {ONION_ADDR} on unsupported network)',
+            extra_args=[f'-statshost=udp://{ONION_ADDR}'],
+        )
+
+    def test_command_behavior(self):
+        with self.nodes[0].assert_debug_log(expected_msgs=['Transmitting stats are disabled, will not init Statsd client']):
+            self.restart_node(0, extra_args=[])
+        # The port specified in the URL supercedes -statsport
+        with self.nodes[0].assert_debug_log(expected_msgs=[
+            'Supplied URL with port, ignoring -statsport',
+            'StatsdClient initialized to transmit stats to 127.0.0.1:8126',
+            'Started threaded RawSender sending messages to 127.0.0.1:8126'
+        ]):
+            self.restart_node(0, extra_args=['-debug=net', '-statshost=udp://127.0.0.1:8126', '-statsport=8125'])
+        # Not specifying the port in the URL or -statsport will select the default port. Also, validate -statsduration behavior.
+        with self.nodes[0].assert_debug_log(expected_msgs=[
+            'Send interval is zero, not starting RawSender queueing thread',
+            'StatsdClient initialized to transmit stats to 127.0.0.1:8125',
+            'Started RawSender sending messages to 127.0.0.1:8125'
+        ]):
+            self.restart_node(0, extra_args=['-debug=net', '-statshost=udp://127.0.0.1', '-statsduration=0'])
+
+    def test_conn(self, host: str):
+        server = StatsServer(host, 8125)
+        server.start()
+        self.restart_node(0, extra_args=[f'-statshost=udp://{host}', '-statsbatchsize=0', '-statsduration=0'])
+        server.assert_msg_received("CheckBlock_us")
+        server.stop()
+
+if __name__ == '__main__':
+    StatsTest().main()
diff --git a/test/functional/test_runner.py b/test/functional/test_runner.py
index 2c1a8597f535..02f1fde0f6b6 100755
--- a/test/functional/test_runner.py
+++ b/test/functional/test_runner.py
@@ -308,6 +308,7 @@
     'mining_basic.py',
     'rpc_named_arguments.py',
     'feature_startupnotify.py',
+    'feature_stats.py',
     'wallet_simulaterawtx.py --legacy-wallet',
     'wallet_simulaterawtx.py --descriptors',
     'wallet_listsinceblock.py --legacy-wallet',

From e607836a2058fc6a5944578c3e73fbd7fd7e161a Mon Sep 17 00:00:00 2001
From: Kittywhiskers Van Gogh <63189531+kwvg@users.noreply.github.com>
Date: Tue, 30 Sep 2025 07:54:10 +0000
Subject: [PATCH 013/656] docs: add release notes

---
 doc/release-notes-6837.md | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)
 create mode 100644 doc/release-notes-6837.md

diff --git a/doc/release-notes-6837.md b/doc/release-notes-6837.md
new file mode 100644
index 000000000000..757baeeb86d0
--- /dev/null
+++ b/doc/release-notes-6837.md
@@ -0,0 +1,17 @@
+Statistics
+----------
+
+- IPv6 hosts are now supported by the StatsD client.
+
+- `-statshost` now accepts URLs to allow specifying the protocol, host and port in one argument.
+
+- Specifying invalid values will no longer result in silent disablement of the StatsD client and will now cause errors
+  at startup.
+
+### Deprecations
+
+- `-statsport` has been deprecated and ports are now specified using the new URL syntax supported by `-statshost`.
+  `-statsport` will be removed in a future release.
+
+  - If both `-statsport` and `-statshost` with a URL specifying a port is supplied, the `-statsport` value will be
+    ignored.

From 733ccd3646d885b2b627c0c205699177d2630073 Mon Sep 17 00:00:00 2001
From: MarcoFalke <falke.marco@gmail.com>
Date: Tue, 23 Feb 2021 16:41:43 +0100
Subject: [PATCH 014/656] contrib: make gen_key_io_test_vectors deterministic

Also, remove instructions which are redundant with the README
---
 contrib/testgen/README.md                  |  2 +-
 contrib/testgen/gen_key_io_test_vectors.py | 18 +++++++++---------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/contrib/testgen/README.md b/contrib/testgen/README.md
index 1efe07d483a0..fd3f9e660a2c 100644
--- a/contrib/testgen/README.md
+++ b/contrib/testgen/README.md
@@ -2,7 +2,7 @@
 
 Utilities to generate test vectors for the data-driven Dash tests.
 
-Usage:
+To use inside a scripted-diff (or just execute directly):
 
     ./gen_key_io_test_vectors.py valid 50 > ../../src/test/data/key_io_valid.json
     ./gen_key_io_test_vectors.py invalid 50 > ../../src/test/data/key_io_invalid.json
diff --git a/contrib/testgen/gen_key_io_test_vectors.py b/contrib/testgen/gen_key_io_test_vectors.py
index ba045ec1c505..40c89e85f712 100755
--- a/contrib/testgen/gen_key_io_test_vectors.py
+++ b/contrib/testgen/gen_key_io_test_vectors.py
@@ -4,10 +4,6 @@
 # file COPYING or http://www.opensource.org/licenses/mit-license.php.
 '''
 Generate valid and invalid base58 address and private key test vectors.
-
-Usage:
-    ./gen_key_io_test_vectors.py valid 50 > ../../src/test/data/key_io_valid.json
-    ./gen_key_io_test_vectors.py invalid 50 > ../../src/test/data/key_io_invalid.json
 '''
 
 from itertools import islice
@@ -76,7 +72,7 @@ def is_valid(v):
 def gen_valid_base58_vector(template):
     '''Generate valid base58 vector'''
     prefix = bytearray(template[0])
-    payload = bytearray(os.urandom(template[1]))
+    payload = rand_bytes(size=template[1])
     suffix = bytearray(template[2])
     dst_prefix = bytearray(template[4])
     dst_suffix = bytearray(template[5])
@@ -108,17 +104,17 @@ def gen_invalid_base58_vector(template):
     corrupt_suffix = randbool(0.2)
 
     if corrupt_prefix:
-        prefix = os.urandom(1)
+        prefix = rand_bytes(size=1)
     else:
         prefix = bytearray(template[0])
 
     if randomize_payload_size:
-        payload = os.urandom(max(int(random.expovariate(0.5)), 50))
+        payload = rand_bytes(size=max(int(random.expovariate(0.5)), 50))
     else:
-        payload = os.urandom(template[1])
+        payload = rand_bytes(size=template[1])
 
     if corrupt_suffix:
-        suffix = os.urandom(len(template[2]))
+        suffix = rand_bytes(size=len(template[2]))
     else:
         suffix = bytearray(template[2])
 
@@ -137,6 +133,9 @@ def randbool(p = 0.5):
     '''Return True with P(p)'''
     return random.random() < p
 
+def rand_bytes(*, size):
+    return bytearray(random.getrandbits(8) for _ in range(size))
+
 def gen_invalid_vectors():
     '''Generate invalid test vectors'''
     # start with some manual edge-cases
@@ -153,6 +152,7 @@ def gen_invalid_vectors():
 if __name__ == '__main__':
     import json
     iters = {'valid':gen_valid_vectors, 'invalid':gen_invalid_vectors}
+    random.seed(42)
     try:
         uiter = iters[sys.argv[1]]
     except IndexError:

From 957380c38b2c33adeab0eac36518445be7400e76 Mon Sep 17 00:00:00 2001
From: MarcoFalke <falke.marco@gmail.com>
Date: Tue, 23 Feb 2021 16:40:42 +0100
Subject: [PATCH 015/656] scripted-diff: Regenerate key_io data
 deterministically

-BEGIN VERIFY SCRIPT-
 ./contrib/testgen/gen_key_io_test_vectors.py valid 50 > ./src/test/data/key_io_valid.json
 ./contrib/testgen/gen_key_io_test_vectors.py invalid 50 > ./src/test/data/key_io_invalid.json
-END VERIFY SCRIPT-
---
 src/test/data/key_io_invalid.json |  96 +++----
 src/test/data/key_io_valid.json   | 459 ++++++++++++++----------------
 2 files changed, 260 insertions(+), 295 deletions(-)

diff --git a/src/test/data/key_io_invalid.json b/src/test/data/key_io_invalid.json
index 500f11cf8ba2..75ca69ea23cb 100644
--- a/src/test/data/key_io_invalid.json
+++ b/src/test/data/key_io_invalid.json
@@ -6,147 +6,147 @@
         "x"
     ],
     [
-        "8212abd8rrzcJmBG9n7VmSpaMfPRXhyHkQtNXFAMPCUqQTF9Kmsk5VF3b81x1qt9tRsQ2REKQ6j"
+        "UJpnDUZhux15KckwqW1u8wratRydW8RgSfV7of9kh6S1EedTgkqawKx77AciK8x6iHVLd7jwizd"
     ],
     [
-        "5CPYCiRk7LjiYQc45GQTgqNjYw5tWeCZd1NWvevf6SQfJvDm9vK"
+        "72JVw2AafMBFLZ3d6T6ymErSg5s7xAFAKgMgMLLiNXCPkLm4JDjvwhc1kjmApkcVNbqoMp2Hg2v"
     ],
     [
-        "2UB8YkLAsoJWEsw6daxKvo5W4NVjLSB8Bsko6UCWMrLnoFKgETXdKa2XcvoWdjeeLbKqRcaWwGvq"
+        "s3YeU8Q2CU2NBzkKBgya6VA39EtN9zZLi5fscPmY7iqPL2VmFXHxn8QaeYoQXF5AyzC17C1VLo3"
     ],
     [
-        "9sW9vnbLHfdcqhU2n5bLAFUksSgCiMBVmdn6Pae3iTYo49aSqZeS"
+        "7if6g2nYRkgh46JNa8iaoUYPzrbxMQhd2FNp2kVb6QLtofd76Yf"
     ],
     [
-        "2FeLT8g7q25cvVmUjQnXvTt7rpWDtRjq2oi9F9zj3rLWxNKSoKcPLob6TEB2RAeumauRzj5Em5uL"
+        "3bxKf3oSh6kRKf83AhAiED6Sp85wHo3SKXnV1igNhXXW2Y23tz2e"
     ],
     [
-        "7Vbg3REusN6tagLwHkz4P71VZtp8oTTtETmaTFJfypdX4J7vBmp6CMzWpNV3RUdv7TST2nigUz2oU"
+        "6uuF4qfGt6sZ4TGRKs8MYmrvEarZ7xMd592mLDH1AxtWoQ8dNB2KSTAjnsFLwPzBGJQzWP6sMw9"
     ],
     [
-        "7obK6DhucEuvCinKLAUNYMPXNEFCHcErXa61wi2sMi66owinM4E8YD4rkgHVvxpv3ZGxFNXUyCA"
+        "2j8t4uU1uhfsSLe1Z2ozQpce9vdHUjxnu1N"
     ],
     [
-        "3FPe28dxJDhEmkAbGVgsT5XFpBwyM48FK4veyiQVgAKvQLTea2U"
+        "869cULb66zRdpGZQ5duEfKbFrxTpFDpHYUuPjTVZMAbS2q4DgCqyozDcS9MYTyn1oHCGmSyabRQ"
     ],
     [
-        "2ULU3PB7u3rxfUXKVb5mZ4ijXbj85LN99s7zess5XPZEX1DJvanHoY6dLvYnkLtQDWQ2qCq1GWSA"
+        "Pm6RGQxdC2MLeBHAiwZuevgCqpf1BXHV3mgrFyqkdHdGjSNCWj"
     ],
     [
-        "7VBmPmJMUFwYhgktivvqBZcPzqdKPy4S4RRTACdwTiV6wNpkpXEmp3tvDhzkqdyFhXdJ88Q5T9mka"
+        "cU3bonutoouxvZ1eFjeWZ9fx3m1iejyyNT5LZj7APGXdf7xrM8za"
     ],
     [
-        "2Zx1G5CMrEC4Y8EBVxvepmM1aiXv7CenqUR1dZBxC4PFUv9jAAm8TUxD4SKC2ArwKawA3Y4rhC2v"
+        "24MoumSS96TbYEz7zxLQUWM6XtptPk7EVKkm5dPeNmGdU13KCePZbDPCX83Jv2RDgF7dX1ECYkxCx"
     ],
     [
-        "yaWZmeqWr5Mea62ECoMPzVkXxHGDF6LtCfc"
+        "aXxpJ39neQAdsvQyWpfmBnchstSHhzuttM"
     ],
     [
-        "7VPs36WGcbdFsCBsMXExgBoMeme8T7eJ4g3UMqQrhrA2Lyys5vi3dgH43nbz1AV4YFz3ZRKLdFsnu"
+        "Cz22bHdzGqE9zmK5jGeTTnCLuoy8X5qRBw"
     ],
     [
-        "2DS5LTr3AgrTGoBD3nqXWDPtCMd98mkop4wxaVfRWwPFYvmpXP5hG5bKzVVzvsKzP89THiiRd3Pr"
+        "meYhqRj9dCsx9ZjobviAvWzzxKD4YtMzs2"
     ],
     [
-        "DeRXybcZve86XXanvmLG9XwFadEh8GjH2Y"
+        "XDMcG9HHawbsfN2AcNjPamQtPrCNZbX3HCWcy24fw6qbb45GU4QF"
     ],
     [
-        "7pejnWw1qHjCfAmzXoStxFZYMJ6hu1gixoJD8irtyrki5A9PHDWV798YMaH3teBadyatmdV2YvT"
+        "dqqMGb5EYH3zsKxxrgDLAgQySTbC1amEoThMeEypQ9D8252JiRVr"
     ],
     [
-        "4Yi2yBokcAj6acLZhiNwmmA1DSzuKnz8vfJ1FHE2yJLSTab6FUi"
+        "2UAEPV9iad8nM3vmhKM3Ca2WehF9A1EacV2K1U6mh5JGmZ4L8r7fePq2CDdLnhUUZp39r3GPz1NB"
     ],
     [
-        "2U65F6JTxDP2YJ5XV6FiYxpWMCjwCRbEN9ygEXZ3KkbLUMjSbvKbPyCMLf6ke9kMPg9CLQcJ7aN9"
+        "7VkmEHVsiwybAT47JRmPPj95iKww9aTZp3xBkQm6dBU8nv88YdpwmYqaLr17TML7uf1JgrPp1duC3"
     ],
     [
-        "7UgNNEAfdinxDG38ByGmVwbRJp7b4q8BEznm2GXbSJFVSTyS3jiByNLU8ckDprYkqvi5bcf61SUkw"
+        "SmBouAyTuApTNPEMcndUrzmk6zPtccPiGs"
     ],
     [
-        "6wzMif8TRzrnyQYAbRZShWcZo3dqKYkBVpi2JR15DFMCLzxAkVTUpsuwdTUWnkx9j1kGDyukh1Go"
+        "tMYxSXg3m78N1fzNNYkT73ncYFCyag4yQB"
     ],
     [
-        "6YKZfgYJSh9ivzFX1oNqTiiWwhCGrZbnDCigU6N5oyiBeVUKio5ww3Zu4N6K6NHsqaR8djSh9dLfX"
+        "2Fod12JmMounu8JvcPRU7vcQoTmkWGa382qVr9cUrL5vPokBgU2o8buPaNfyukRqESXLJ58f7BjV"
     ],
     [
-        "92sWK7QesAPWS12srisHmc9q8Fz8Z5ERJcAaVwkjVKENJmL45bBM"
+        "6Yrq4S5f6WPJwZefp2FUB7YK3mebXuWBax5joYHbaWw8NyJXnG5esmKL2yA41yDJDJmG45TZDPWc2"
     ],
     [
-        "2Ua8heeYCTTsr5qgi7vorTpDAWVRGRAJKZ7"
+        "AiPTzbcd3AWc2cxTLFvJ2Sac5NHA48zVtJ5gFJCun6rZHgipQHjp"
     ],
     [
-        "2A6BvvmZ86GG7TRwXyCaCvhiM5FsVFvs42x"
+        "yiLhQ2MjXvvJ77hDB9Yh94rNu6XF2tsQ9XY"
     ],
     [
-        "R5uiBq2rzVGhxDsq3MeGU3QKeZz8wLywaB"
+        "h252Gub658y8BeTRXJoSgxbiYPHjgAxL4H"
     ],
     [
-        "279AcBMDWxh5hnfEm5kptwnfn7rEWschhdxkEzLYzEj2K3wSHfEaqV2moec6wP5w3jVy5cFhoVXk"
+        "6v7e2HwCqmNQdcdXcedxAaB5EhFcmHfd8NmVgz485uYNZeMUGzKqWXgRissqxAWFK2Grv2hj1Sx"
     ],
     [
-        "7VMRsPVwoj7vZATKQGj2yVEX55f2qNKDxNiw7YNJv1zjfFFzyWR1WS67tefp7fV1MpXrUhNh86e8Y"
+        "4fJuZhkcDMRe6frBw8arVJZDXvW41DQBPJncf2GFGFU16qryC164"
     ],
     [
-        "2V95nNKY2YtDuxyQ6K4unrkKQTmhRpVcUiXdYKxfJSrQG22tHmNojaXc5gUy1ZY6cAByCBMZZsas"
+        "41edLVs3QGta83S4Sk7Qer45eBZAEqpTzJ2YsKJyX9tMj1KLxak"
     ],
     [
-        "2D79xmaAZxTf2fMRsTGgkNfMrUErj5CqXNY"
+        "cNonA1fNAJ4CZpeYi4fCvW42ZXbVGuZiFSksy8kbYm6LgzxGicsY"
     ],
     [
-        "7nwQ595A7nXdySFQ2pHx71xJsVLhJAeoj68MSSDHhPMxhBQDynYa5KDXEfhW8jZdZeAkraFMy7b"
+        "fbHnS1rzoSTiteGiAGEz4tym48S4kKfVcGpr2FEMPuyeHFZ6TSz4qJgqxHSVmQVTpEznUX6Xmz9"
     ],
     [
-        "7rLMRn8VSmsGV1QUfZf5xro5gejEST4fuXpokKSvqPPX8wmMabe"
+        "2o6ucMbiG78JSuasuD1dzkAMNZNoV7pgn1"
     ],
     [
-        "J3JtSQiZ46yXNEXpuzjmA7R366BBKMD7id5PZ7cX3V5K5DcP3M9L"
+        "cxG8jxnDiR5QDFSEuaiYvjgS3sShzi2nfC"
     ],
     [
-        "21WFTGZEpLyGHqVmb7a5skPDN5oD7ocR7r6t2osiqDQf6Xa84mkh3odE1cbZ2ocTFMZbHSrLXyJr"
+        "cW8exV1kXUQxrWrkW1LTXYPK8Vj8UyXxtfHLDACz5VFe6Wwy8a7E"
     ],
     [
-        "7oShSMyZqoK69tWvUEwLBGWHzZFvuVV5SESa4rBe3TmNzfJXBJBP528XMMMiQxoX7fSAzhF2bYL"
+        "2UQ3i886Z21xg8pzahrG3zq8DdQnoKzSGMczG8qoL48yaxcnD7ob4M3Sxpwq4JykSedRp1MMzgmB"
     ],
     [
-        "KqarYQ2A4jimBefL5i1SRpbz8xn3y3P2UX1tafCgf48LXTDrKCcf"
+        "UDPa5QS2J1xquuB4TD3TPTdULaxdDqy8hcdkXwgCmNqgSZYxPYCvvbzfVkz3nRamnvBTzfJizmC"
     ],
     [
-        "gSzq4StFrs2i8gTZ84pw9x68aPQ3XFe5b3oK669aSd68yfFmxH"
+        "2KrxFisUvAk88XK4y8SAQxNeHQdjjLeLaYK"
     ],
     [
-        "7UdhV95GSa6CY2XjVYfrqrwwyCScmeksu6TCqcpRSeeMbEmDydSMB4E2CCHFZ4gLoXXB7z1iWsGws"
+        "2EpLmnuvdXBWJR5JdiCrEp4N5AcwVQ4Ckfc"
     ],
     [
-        "2msvzdVt86YVXqkWQBJG136u11REi8cXpn1"
+        "4qn18vELFKKBU44YJTvYgYKkrDUvfc5SJeq1BDFttQLcZCpMzTzf"
     ],
     [
-        "ryMiy7TSV4LfnJWeXdvT9sZgiLj6ebNg2ac6eLdSAE1N66u1SHwASam7njVBMLYuzr8ntySNoUT"
+        "XDKnECKqQUp17zwQTErBzGtXYq9uPG9ybqfJjLVJZZh37VHZc3rC"
     ],
     [
-        "6YnxQpwLv2PWVRw8cf5JVm1HmLP3UrQyyUMufDLzuYRg1vbut9he27XAzmLp7m4WxTz7vsriEwQcX"
+        "92c7ZpyM2KQBK8N2k1otwpGj98Ex7S8jEAnzB5hfXhBWJLFBkwc"
     ],
     [
-        "92g6icyL3H2XCqLiukqquX15fwBR5kFE744En5cd3X61cpANrjqY"
+        "7VtmMAqgjZbpSzWQLy6j1LseRhmmgtBF45c3PrMqme5TP2ak7twfPGwivrVEVALLNnXRUdu3QB13k"
     ],
     [
-        "2XCxe9EpeGVMkfZqFgtAKmU2GNBpwnmukDs"
+        "s3KqChhTvrQCUzbSEqbAMEVTdh84NdC1xHA8cvaXYEjohnV7xt4yNre8BMumXVeLXKTp49Sonh3"
     ],
     [
-        "6YdrW3VDyE96kBFvKghrZ6fkwVngGgJybFnrFHXfexSorcQPxzbHLqNWTSMZHkrdmeQ2ZsLCnFhe3"
+        "ibJ6v1xJscnjqdAdqqJco864ff4W31Jh91"
     ],
     [
-        "PsfkAxuhDQKQCwvuwfiVo1vdcYc4fLLr7oZ98XrMyp7SAsLAyQorF"
+        "sAyhi4v9VWr6JxTofdk8FhUUw88BmEbTsMvspzxQ6BN1mExDpWPZi9cF9RGgdFzsMDkFPfnykiCk"
     ],
     [
-        "2k2HeazZ1apwsF3VQHHCbooreJ2anjumTTU"
+        "2bqgYSiSL7bCzXWk98UBUrRiCALgRyUWRWk"
     ],
     [
-        "724Fw3TFoSoXsZK77FC8NfrgN2scVC8pq7SntoNgCY3oosmEZHJLcrZVKiFagFm5TLcbfuhKm8ewM"
+        "2UDoz44DrDa2uqVdVQEFKEhuM9AvpFSE3N8iNhc5V5bQ4ezAMdZfNoEGZKVSs7uNs8JLQX96xzDm"
     ],
     [
-        "7VrbcSqCJndcp187BT68T5eLXF3TQaH7vN57nAhNhbCyUjtvuX6rtDJYNLmXhPTSrE5dkWqifSsRG"
+        "eXDPBkXCpUQA4ZRfduqyDDtcHnoGSaC1d2BN3B6dWREUaqusqnG4"
     ],
     [
-        "8SHxzARcUKM6NdLyM4JDSMoSkA99SgZ3zP85JAEaiipxnUXuMBtV7dtx6cN1wP5df4bQ8G6MsMv"
+        "29LjxDzmddtZy3odqFeu4DTFhF7ALC9hY2Vu8yPD5DzCrBMB4rbDq5b7Vh26thgfXzMXRsPtZhit"
     ]
 ]
diff --git a/src/test/data/key_io_valid.json b/src/test/data/key_io_valid.json
index 852e2006f3cf..d83bb2adaeee 100644
--- a/src/test/data/key_io_valid.json
+++ b/src/test/data/key_io_valid.json
@@ -1,461 +1,426 @@
 [
     [
-        "XtLoNJ2NpPbxYsFYFHewTy6QJQCcvziDAx",
-        "76a914c1a7e32962dee960126497b3df1fd4072c93f50388ac",
+        "XqZHYpoksmbEPtWstAEki3o8pJ8ZsPfXpK",
+        "76a914a31c06bd463e3923bc1aadbde48b16976c08071788ac",
         {
-            "isPrivkey": false,
-            "chain": "main"
+            "chain": "main",
+            "isPrivkey": false
         }
     ],
     [
-        "7iRPy8FEHBzbChrktsG85YbDZ3SuiCxsNq",
-        "a914afa615ddffcfc364f952956c251bce5042e821bf87",
+        "7XShCrc5u9rZZv7j18WqbUMZMxp8k1Hq4z",
+        "a914373b819a068f32b7a6b38b6b38729647cfde01c287",
         {
-            "isPrivkey": false,
-            "chain": "main"
+            "chain": "main",
+            "isPrivkey": false
         }
     ],
     [
-        "yjPCQXXeWJLFQWM6kF6dKRczZbNkSWVtrj",
-        "76a914fd00802f8b61ccf0c1bb1c7969c832673ed546a988ac",
+        "yf7WoPrbJCGhLLtpeBe7tteKEKwpvZ1w97",
+        "76a914ce28b26c57472737f5c3561a1761185bd8589a4388ac",
         {
-            "isPrivkey": false,
-            "chain": "test"
+            "chain": "test",
+            "isPrivkey": false
         }
     ],
     [
-        "yjPCQXXeWJLFQWM6kF6dKRczZbNkSWVtrj",
-        "76a914fd00802f8b61ccf0c1bb1c7969c832673ed546a988ac",
+        "8yCvxUt2TYKEQb5Ak6n9DYiCx22xfa3Lio",
+        "a914ce0bba75891ff9ec60148d4bd4a09ee2dc5c933187",
         {
-            "isPrivkey": false,
-            "chain": "regtest"
+            "chain": "test",
+            "isPrivkey": false
         }
     ],
     [
-        "8yDrsN8yRfbG678S5eVntDtAHdnuQKmCDx",
-        "a914ce38bb4d79dd633ba5fbc0ea1e3b85a637acdf5987",
+        "ycjYu5VF3amLVDTSSA4E5sJjGjRpRof3np",
+        "76a914b4110ba93ac54afc14da3bdd19614774a2d55d2988ac",
         {
-            "isPrivkey": false,
-            "chain": "test"
+            "chain": "regtest",
+            "isPrivkey": false
         }
     ],
     [
-        "7rJYzFcK4nNu4oEFUZL9heG4u4XNvoXdkiCaddtQZ8oT4wMxPta",
-        "6333e256bb02f09b3bb233c17c5e86562cc39571ac2eba07a92d99d1f6faeeac",
+        "8o2MHyL9pMd9NFiy3xPJKFq99YTyyLv7KT",
+        "a9145e5a35ab44b3efaea5129ba22b88ba3e2976614587",
         {
-            "isCompressed": false,
-            "isPrivkey": true,
-            "chain": "main"
-        }
-    ],
-    [
-        "XGCaeDGqsxPK93JHP3kJ41MEAobFu42PXkASRLXBkCx3bKBkrGMn",
-        "9296962c50327a60f78a11b6f017ea3b22182892fba9c976a765c5b014f25802",
-        {
-            "isCompressed": true,
-            "isPrivkey": true,
-            "chain": "main"
-        }
-    ],
-    [
-        "9213qJab2HNEpMpYNBa7wHGFKKbkDn24jpANDs2huN3yi4J11ko",
-        "36cb93b9ab1bdabf7fb9f2c04f1b9cc879933530ae7842398eef5a63a56800c2",
-        {
-            "isCompressed": false,
-            "isPrivkey": true,
-            "chain": "test"
+            "chain": "regtest",
+            "isPrivkey": false
         }
     ],
     [
-        "9213qJab2HNEpMpYNBa7wHGFKKbkDn24jpANDs2huN3yi4J11ko",
-        "36cb93b9ab1bdabf7fb9f2c04f1b9cc879933530ae7842398eef5a63a56800c2",
+        "7sUh9RiHaovsNoNToDz3gfSzbETZBodKCY8ZkLtxbDdcEueuNdd",
+        "fdeca3b08e38af53d7c4c60e3ad208ce5066441036e9f191e0b75036a77f65e2",
         {
+            "chain": "main",
             "isCompressed": false,
-            "isPrivkey": true,
-            "chain": "regtest"
+            "isPrivkey": true
         }
     ],
     [
-        "cNddBPFJ6PbCX2BJVR6up2p8PjtFyUy7zpbkAgRGhMmrPbCe8Fvf",
-        "1f5750a1f5703e8b1a273964c7b7fce1871cc7a43f303ec7d33ac724fdb59eca",
+        "XK9kG3y8JeDgSNrXdomWiCiBMs7D2eNJSrux1rx7GuGLWpMxEH3w",
+        "eaa4752443233fbe8f8943bf956de595665c38ffff23827e17c10cdc1c27a028",
         {
+            "chain": "main",
             "isCompressed": true,
-            "isPrivkey": true,
-            "chain": "test"
+            "isPrivkey": true
         }
     ],
     [
-        "cNddBPFJ6PbCX2BJVR6up2p8PjtFyUy7zpbkAgRGhMmrPbCe8Fvf",
-        "1f5750a1f5703e8b1a273964c7b7fce1871cc7a43f303ec7d33ac724fdb59eca",
+        "938BPMAhPitw3MZW9V5UBFVtKwJRkzJGkQuS4EsGiczaHH7Xed6",
+        "caae6c9810626198ff778740f88ddcf102aeb81daee289c044c4a4571c4b6f28",
         {
-            "isCompressed": true,
-            "isPrivkey": true,
-            "chain": "regtest"
+            "chain": "test",
+            "isCompressed": false,
+            "isPrivkey": true
         }
     ],
     [
-        "XigZoHdsPg8qHTxUwyZFttzp8ocSUwLKv9",
-        "76a91457b39f318f3cd120e08a5f710850c03c22c213fc88ac",
+        "cRUCRTHRBX9rA9CXDvVEmuPMyRfWNvg8gpMiFiN77wNTJetkFari",
+        "7400f4b8e0b843f880c32d81e91bdea04cd7a3819b32275fc3298af4c7ec87eb",
         {
-            "isPrivkey": false,
-            "chain": "main"
+            "chain": "test",
+            "isCompressed": true,
+            "isPrivkey": true
         }
     ],
     [
-        "7qX4wLps8eQEc8vVNxodyowpJtM8NQjt4s",
-        "a914fd81935b46055357fd1d2af1ca12ef055f9b0cc087",
+        "91bBTjMFB54xidVH6xxBVydzqMM6tGjao5FdAFv2JFDWFidQghY",
+        "0099527d041ced5ce0fcd4ce4e3d0e3de091f21415bb7cd011fac288c42020a8",
         {
-            "isPrivkey": false,
-            "chain": "main"
+            "chain": "regtest",
+            "isCompressed": false,
+            "isPrivkey": true
         }
     ],
     [
-        "yT9LnoTWwW8BZfMsaBzb2MeYPW9rJXrjcn",
-        "76a9144adfa9d287098715d3d8be30157a83c14f3f01e988ac",
+        "cRfkYU8Qb7KSKUi6qxdVAV2rvb5uXge1wrqdkvESmAinnFKHh6ML",
+        "79f28c2a4387df9b6cf636ed8ac1bab033b64f66feaba65f70e684731e3f3910",
         {
-            "isPrivkey": false,
-            "chain": "test"
+            "chain": "regtest",
+            "isCompressed": true,
+            "isPrivkey": true
         }
     ],
     [
-        "8kPTvJRz23wKti61gMrsi2vJgs7q27A1gm",
-        "a91441701951c4acaf87123358d268e84c066b05478287",
+        "XiXge21yt5xErdLNt1V29yJX2g29Xag9VM",
+        "76a9145605968d3a96380112b5a10f3a11e708dc54128388ac",
         {
-            "isPrivkey": false,
-            "chain": "test"
+            "chain": "main",
+            "isPrivkey": false
         }
     ],
     [
-        "7rdDu7XRm5WLKmPaX62vqVLaQmPtYT18tbk2i7fY6eRnYBrsrJZ",
-        "8d98e24f45c472b2a04390fa80acc09ce2ce7d1ce041489fe5d9e8d89bdf6b2d",
+        "7XuP9xVGyvkCAfW84QJkGfbiR7dX9TYaPH",
+        "a9143c47ab7c368a21b9efe19293793ec879ce68301887",
         {
-            "isCompressed": false,
-            "isPrivkey": true,
-            "chain": "main"
+            "chain": "main",
+            "isPrivkey": false
         }
     ],
     [
-        "XHNgkfosQamJ6M4bptMJPAMpqdeRj5mh3DWRy7fmhYcBRhHez15H",
-        "b59fcc3195c2d5e3ccb19956b0d513154cff959ec3acf9bb6004670d728fee56",
+        "yNZpqbukFJzBUJSca4Q1Ny2YD8qwkBp874",
+        "76a91418a86e5a6c6977ddba0daca7fba5190f67ba56cc88ac",
         {
-            "isCompressed": true,
-            "isPrivkey": true,
-            "chain": "main"
+            "chain": "test",
+            "isPrivkey": false
         }
     ],
     [
-        "93WCLruvEegkBVYc74utyt8xvt4TxunX1kHryCQtc3RCJ724Uuq",
-        "fcac2955e7b3e3c28a1e069b177089574defb34741e9079a977e760fb36cdec6",
+        "8zVH1QmXBYLvJTainJqF2tBVbhfj3G3oAj",
+        "a914dc1b3f31308972236c2e47763fdfec1371cedcdb87",
         {
-            "isCompressed": false,
-            "isPrivkey": true,
-            "chain": "test"
+            "chain": "test",
+            "isPrivkey": false
         }
     ],
     [
-        "cQqbUpKkaBKG1TAyXFh6xGKEfQMZChtu6Tv1NsZMHHwTXja6QnWv",
-        "612c8e6ef60e6d036e4cde5882e55978c84b08825a246098f1e8bf1e068f43a4",
+        "yZ6DTXL9jL6JnasgbBwqudiLbjHnNpMfw2",
+        "76a9148c190ca6ff8ad603f817edc0d93c2a687c7b36dd88ac",
         {
-            "isCompressed": true,
-            "isPrivkey": true,
-            "chain": "test"
+            "chain": "regtest",
+            "isPrivkey": false
         }
     ],
     [
-        "XkMbn4X26GbXrb5U8t1dP2miqvwJCqk6XD",
-        "76a9146a0d9f3c2bcbf03ceba283fe3feeaf8eb92f7acc88ac",
+        "8ooZRudHQeoPpTHJN9qf8uWLJqhQ5MhtE7",
+        "a91466e70f2a6100fc6343edc8c874496cb2f5bbfec887",
         {
-            "isPrivkey": false,
-            "chain": "main"
+            "chain": "regtest",
+            "isPrivkey": false
         }
     ],
     [
-        "7bNrQPXbcGnbe3K2dUnQD9bXawugSgX8cX",
-        "a9146262063c2a4a0a638062aaff356d79c35600a82187",
+        "7rdh84TGTA8dhKgRmWHHVS8n7EYC6XU727w7RFCNBcHyu4Q3qKU",
+        "8ea9b77c27304b37f70e94bc8a0fbf500e0c957a80ebda87280ef58214d92f11",
         {
-            "isPrivkey": false,
-            "chain": "main"
-        }
-    ],
-    [
-        "yXU6wzQ9mU8VmSppe4BLTJ6wuCgeAddPkG",
-        "76a9147a4c83f2194c3d4b8d2557659807e31fe549e1f388ac",
-        {
-            "isPrivkey": false,
-            "chain": "test"
+            "chain": "main",
+            "isCompressed": false,
+            "isPrivkey": true
         }
     ],
     [
-        "8kvSTstYGkxogEXxJ3ALCD4bwMSnVV2uR8",
-        "a914474bc756e41243d2864aa4aae4e962edb3b4b51487",
+        "XGPEaEBfRr58YRbgaryi6knXMNevQ3kNm9GrefU5X1TbgSDgY52A",
+        "9811acdc3c671ef1e3913f94980a9e146ba895908550ef4234abb7503d436521",
         {
-            "isPrivkey": false,
-            "chain": "test"
+            "chain": "main",
+            "isCompressed": true,
+            "isPrivkey": true
         }
     ],
     [
-        "7s4u8NofVVzDz4uz3FELHRSLccn9G6AaTpnkEUeRCHmmaFeysZE",
-        "c7e604df1cca9e700fd023b42495902d1c8eca2642df42543451b3124d9c7279",
+        "92tWd3HBeCrToLZ8pkWRUqsoKNmYZgNN4NfWCzg1kzC5jGjN8Ma",
+        "aba54c7550edc0ef1202759fff90ff19128936814321ee59e111e13e5e482870",
         {
+            "chain": "test",
             "isCompressed": false,
-            "isPrivkey": true,
-            "chain": "main"
+            "isPrivkey": true
         }
     ],
     [
-        "XEPuZVWCUjRFeoW9hKg4DB9QsZhqojT9uqFt3Mu2UVc61GkRwWdH",
-        "5cbd7421d9fbe6b3bc5b684da2054091da8a64b2a3ad25ab7960d452fd05b3ff",
+        "cUjojhwLQ7yhysRQJmvFGXBB4C3ubsob4GAB2S8RLN7WMnybQKLz",
+        "d58bb44d9cfbfccea78702aad18d4ceea91af0e022431de31bbe8d2745489a35",
         {
+            "chain": "test",
             "isCompressed": true,
-            "isPrivkey": true,
-            "chain": "main"
+            "isPrivkey": true
         }
     ],
     [
-        "92bAGbFfnYyk78iHJ7PdhV7TsJe2scVFpQ3BjWkrcfBEFBQGefV",
-        "843f9361a729052d69193c9f47b09383416881f68188bd1139fee97bc6ec7d92",
+        "92yfMV3G9QXZQE4qnpaqHEbUFJtZptQF2JXqFR1zSMPKtTd6ahi",
+        "b75734afa2da43817d40e7e8d80d17a26cd4460b0055c521a3fa4329bd718db4",
         {
+            "chain": "regtest",
             "isCompressed": false,
-            "isPrivkey": true,
-            "chain": "test"
+            "isPrivkey": true
         }
     ],
     [
-        "cRFHttGojDviBmDokZys6C2RHYrtwiyyWtcQmT7gWSeRbFQY4e49",
-        "6d5d556d5843e6c550b83f4a33be4dd3bdd5d143c07052a0cdf1f1b351d9cd2f",
+        "cRFfmkhkhaqN8bxNqnr4GPTV25WRk2tXLtsqbd3B7CPkbmA4QDgt",
+        "6d8f021c13f1e2b0e7268b09d55e958d256e200a4e5de6eecbf8dc0ae65b35ae",
         {
+            "chain": "regtest",
             "isCompressed": true,
-            "isPrivkey": true,
-            "chain": "test"
+            "isPrivkey": true
         }
     ],
     [
-        "XdsK6sSz3L4zLJCdyPRukR6AR2LythNSqi",
-        "76a91422e34cda0ba9e2affb620720ae8a7797567da63988ac",
+        "XgVUBJHMpE4QhFXkhhQbgJK84ASDya7GrU",
+        "76a9143faa1a5ac78fe2df68f99ebf27ecee3cdd29f9cc88ac",
         {
-            "isPrivkey": false,
-            "chain": "main"
+            "chain": "main",
+            "isPrivkey": false
         }
     ],
     [
-        "7bofzFHNeodW6iJGv6bzkejVHDE12DPXm1",
-        "a9146713ba75a430dc678a402012a8fdc40fcf3c2ba587",
+        "7mJ7bHEhHRdLZeETB6aQ1v5ABRitMzRoL8",
+        "a914cf2de169062dbcec55c8ee69cdabddbccf3f442887",
         {
-            "isPrivkey": false,
-            "chain": "main"
+            "chain": "main",
+            "isPrivkey": false
         }
     ],
     [
-        "ybtBPfTFkCUWFBzGmGnDQgyfWB5N74LBwC",
-        "76a914aabab5cd40c1cc70d254e8616bf75edc2eaf4bc188ac",
+        "yehwEL9J7DfHgNQwBVpgLXrdaxGDZTYirT",
+        "76a914c9b31b61df09db783833d1eb75594ed2cbdf3a3988ac",
         {
-            "isPrivkey": false,
-            "chain": "test"
+            "chain": "test",
+            "isPrivkey": false
         }
     ],
     [
-        "8oDjDp3wqAdWLEuT4LXPo7N8ZHWoJLdMU8",
-        "a9146081170c074531062628484693ed4e97b396367087",
+        "8f2fFU41QNkD3WSoSz8pvgeDpeREhBQxmG",
+        "a91406a831665447dd11f7c54759a48266adfbd7895487",
         {
-            "isPrivkey": false,
-            "chain": "test"
+            "chain": "test",
+            "isPrivkey": false
         }
     ],
     [
-        "7r5ffXenTyRA9rXf3Mgji4fh33AFYuMm8eSaKpRMnimgQV1Z4KV",
-        "45f22c0ff5e0f588f710377c9c940ca11bfa920a2b5cc5ff4b6f115e8d2bc2d1",
+        "yiCbYijPuRo177xtLMeNqGMaVu5wZjpfTC",
+        "76a914f0071de0f8422d94f6fb43091b986f58bac9506f88ac",
         {
-            "isCompressed": false,
-            "isPrivkey": true,
-            "chain": "main"
+            "chain": "regtest",
+            "isPrivkey": false
         }
     ],
     [
-        "XGYzT6mPs7L9z9S6Ryn8og8excfLtH7J5easZjDWH2kWfRBmoAgR",
-        "9d16918481c74120a5b60b684ac94a08ee341f1788575548b8c45098a88a9c29",
+        "8teDju3BzB973H5P2Zt5iJ3K7b5rcjXsrP",
+        "a9149bfb821d62e69330410bb56f0085ecce89afb8f087",
         {
-            "isCompressed": true,
-            "isPrivkey": true,
-            "chain": "main"
-        }
-    ],
-    [
-        "92xFEve1Z9N8Z641KQQS7ByCSb8kGjsDzw6fAmjHN1LZGKQXyMq",
-        "b4204389cef18bbe2b353623cbf93e8678fbc92a475b664ae98ed594e6cf0856",
-        {
-            "isCompressed": false,
-            "isPrivkey": true,
-            "chain": "test"
+            "chain": "regtest",
+            "isPrivkey": false
         }
     ],
     [
-        "92xFEve1Z9N8Z641KQQS7ByCSb8kGjsDzw6fAmjHN1LZGKQXyMq",
-        "b4204389cef18bbe2b353623cbf93e8678fbc92a475b664ae98ed594e6cf0856",
+        "7rzRZkXmWGVMxQXyG1RsRHfE1xMS2SgFvxWrU5WqrgAvG9gswQo",
+        "bdbcab325d6e11f2aaeb549f50a9d91fb8e64c814faa685367b24b8d20316baa",
         {
+            "chain": "main",
             "isCompressed": false,
-            "isPrivkey": true,
-            "chain": "regtest"
+            "isPrivkey": true
         }
     ],
     [
-        "cSs1wg2Lm9AvQp8diEdfTp4kaaYpLm6GzFD3sxtCLkU2SJiD4qqk",
-        "9d948bbecb677f6fcba65d78964252e5892a491351ce1b6d0a69c5678de330fe",
+        "XKLuKLJsbgxuod724Lj16mjUNnNnuvE1vwrgsaKC3GFw2oEET7eZ",
+        "f061adbfe72c9d914d678cd5004d49356ec9949ba752777171ac368279cbe6f5",
         {
+            "chain": "main",
             "isCompressed": true,
-            "isPrivkey": true,
-            "chain": "test"
+            "isPrivkey": true
         }
     ],
     [
-        "XjmoGTCeDNDCGY6A4ed6d3VBdJmdsj17EJ",
-        "76a91463a911fcd13311d90188b372b6f8ab7a853ef05288ac",
+        "938eJS88jdcby5LGUmkAbiGEtf9aQxHK61CU722DCTFbcmkQMo1",
+        "cbbc2ba8154883a9a29e5517d1f3c03cac4f39ce3225060b3efb799cd9c41274",
         {
-            "isPrivkey": false,
-            "chain": "main"
+            "chain": "test",
+            "isCompressed": false,
+            "isPrivkey": true
         }
     ],
     [
-        "7gtFVBDLHVg4AVBJpneR9fNr9SyEZKaeic",
-        "a9149ec9fc088ce0a02386c787227e699e50256edbae87",
+        "cRAUNG3GXFQhK7uHdzdowk8a49oCE3b7jjqTajbxo8hmM3Brn4Ud",
+        "6ae2a19331b7b2627e663e25a7b001e4c0dcc5e21bc76c382dcdf5b284760c8e",
         {
-            "isPrivkey": false,
-            "chain": "main"
+            "chain": "test",
+            "isCompressed": true,
+            "isPrivkey": true
         }
     ],
     [
-        "yd3pNG9y4V2R3wkjfzH5kvx3ULab6y6wf6",
-        "76a914b785720a94fd55e6f1c738fc465918bdd428046488ac",
+        "9254r4ogv44ojZ22dV1CjERwNrSnfk7v4CLZQxKNSAc1v9QvLg8",
+        "3fead91f7422cd76aa87fc8f9851f3c1e4719cd0b8e4816dd4e88c72e528bedc",
         {
-            "isPrivkey": false,
-            "chain": "test"
+            "chain": "regtest",
+            "isCompressed": false,
+            "isPrivkey": true
         }
     ],
     [
-        "8f3s8CPyf3fWEzsRo63SRzeJYVkVtqUHC4",
-        "a91406e2857a0b00f890ff8d8a5cd43efebbdf48214c87",
+        "cRenV6gPhnsKsxCpB3ea6S921FKkZjRXsMQ4RtmENqaH9h3rZ1sP",
+        "797342c03fd7a346c4c7857ca03d467013b6493c455551e48a1423263b62b127",
         {
-            "isPrivkey": false,
-            "chain": "test"
+            "chain": "regtest",
+            "isCompressed": true,
+            "isPrivkey": true
         }
     ],
     [
-        "7rz61M9gL9gtoZWJBbF2m34ajNfAaPmJrRyCBxuSn6D2VFETrfE",
-        "bcf8a68ca0454f7a356a9c3e30d8f25ae30d9218a58861bea11b4ccfbdce83fa",
+        "Xs7iEDx8nMwJHdiQnwvCnLBTP2sjmDGTJA",
+        "76a914b436106a68548a776a0f34d56b63e7c595f2b20588ac",
         {
-            "isCompressed": false,
-            "isPrivkey": true,
-            "chain": "main"
+            "chain": "main",
+            "isPrivkey": false
         }
     ],
     [
-        "XJ6a2G4a1ieDujR12rZy5T3tcRmNj5AfBmEw7jJrrT7XxBbjcWc5",
-        "cb2bbfe7aba4c95555da06409432cae7fd3a7ff59471c0e33744c27d49729340",
+        "7nTHC71wyAMc1rGdokAJ5wCm8KWLdaQKnR",
+        "a914dbe1c393617a01f15a4cc063dae4f4d56b89bfbc87",
         {
-            "isCompressed": true,
-            "isPrivkey": true,
-            "chain": "main"
+            "chain": "main",
+            "isPrivkey": false
         }
     ],
     [
-        "91czfGPDq43RjAAcMFJh8kRqiEA5apW3R1S5xYY44EgUyNUFAPn",
-        "04b7a1a49323625e107fa24634de2d41ddb693320fb3aabfd471b6ccc2120af2",
+        "yZ4dt5Nte6HU3dYuSrsu5Dfmuxec2hciDn",
+        "76a9148bcc9ae5387c38456f7c076356abadcc67b92ad788ac",
         {
-            "isCompressed": false,
-            "isPrivkey": true,
-            "chain": "test"
+            "chain": "test",
+            "isPrivkey": false
         }
     ],
     [
-        "cULWxgtMoehad4qqafyxrd5nEgtriXbFwQNc9MYFFWj16yagKxfB",
-        "c9909a0cf712be81d4f88526658f1fb46333439fd2ec2e58ceb9f469ee69b303",
+        "8qMXnvtgD7KQuW9bSWBLND7tPjSWaPEaNd",
+        "a91477eb20fb9f8806e8649790a90615a46d22dd762e87",
         {
-            "isCompressed": true,
-            "isPrivkey": true,
-            "chain": "test"
+            "chain": "test",
+            "isPrivkey": false
         }
     ],
     [
-        "XuuUgm1e17hRV9pUKDzf1Xf6pBA35XaNsJ",
-        "76a914d2ce252de1e1dd9d1205a9672b274f488d943c9288ac",
+        "yMSGUgRUN8cvqLawxWkrWpmcvp2uJFcsyG",
+        "76a9140c42615336745356c2e16147c0f3d46b40d5147888ac",
         {
-            "isPrivkey": false,
-            "chain": "main"
+            "chain": "regtest",
+            "isPrivkey": false
         }
     ],
     [
-        "7gG3an3hmKQasE36RWzhfhnpy5y6M5zZaP",
-        "a91497f112c9c50ac814a953202f485eedfd2cf856b587",
+        "8erZsDLXAvEFj3B4ojXDykVBsQGC5NnCnU",
+        "a91404bf8a0dfff35939a611c7f5a60ac107f33f33d687",
         {
-            "isPrivkey": false,
-            "chain": "main"
+            "chain": "regtest",
+            "isPrivkey": false
         }
     ],
     [
-        "ya2zvp6VqHwHuNzRYfVKScpFwAEaiVfwrb",
-        "76a914967577dd6bb09cd009d81be910b37ead7ad31e1a88ac",
+        "7qbLb2DVyHjuAUNRhCx825iHyprzsKDNxXfsfLyLKM8QtGQ6p2E",
+        "059f273d2079ab1d90f23777b341c45e2a9b9bf6bfb71dc7d129f64f1b9406ed",
         {
-            "isPrivkey": false,
-            "chain": "test"
+            "chain": "main",
+            "isCompressed": false,
+            "isPrivkey": true
         }
     ],
     [
-        "8qYkoymbuRbcZPfSVw98jQG9Te3333o25Q",
-        "a9147a0a9245e83625c635c9b1db175338d2e22e197687",
+        "XDxKV8WhErqzqxiTREFvXZk6R7ABfTUEsz7rZuGBGWEAWHhjpjEX",
+        "4f93ade8f56065f1b7321397b0d4a03e1ab2c54dd9af99ce1ecbfb90c80a5888",
         {
-            "isPrivkey": false,
-            "chain": "test"
+            "chain": "main",
+            "isCompressed": true,
+            "isPrivkey": true
         }
     ],
     [
-        "7rLo1znMUU7gZQy66JvrHkvozumpxWVDqcVvENUnKDyoGG7G7Fv",
-        "684b0d908dfa54a9a9ea86f0b95b8a570ffe6c705b21c98f8753f0e152234cc7",
+        "92RDKbNmQjwjVNkNx1nDSRoef8DF6r8yF9joBTVmoPh25JCjSdc",
+        "6da95e1181a55703d96bd27d1b6ef55ca2e4d475b5276f2dbb85f7a6459dceeb",
         {
+            "chain": "test",
             "isCompressed": false,
-            "isPrivkey": true,
-            "chain": "main"
+            "isPrivkey": true
         }
     ],
     [
-        "XKWfDoYj2WAHFohAkN1usLZ7qp7pTDJrSZZq6mygDwcYfXufZUcW",
-        "f566a26ae4e40f6dc430c8b554fa9f9a9dcb2241c5d6e91bd6974b8efbd13604",
+        "cSCX3hnVyzkF5pugTwkVBP2pffX7aMSiJK3RotHtHDFYKfskaBwq",
+        "89c67b776fd3bb974452da3ed4ef1647e1733ec076919cab6156077ed9532e7c",
         {
+            "chain": "test",
             "isCompressed": true,
-            "isPrivkey": true,
-            "chain": "main"
+            "isPrivkey": true
         }
     ],
     [
-        "924PDowxE6eFweoqHp1wJbPhmmtw4wQWLNXf9PSgGUpRS2Qb45S",
-        "3e5db91a1ddfc8ddd7b70c1f42dd17956a134da974a69ac49b86ec6dff40c6c1",
+        "91zradAfFyagfLH8xeJczprPqWRudgoyecx9PuEa5JgzWr3CxoL",
+        "365acc425747e198b3e1468e0284f230153db8687d8ec23db079a5b67d72ca04",
         {
+            "chain": "regtest",
             "isCompressed": false,
-            "isPrivkey": true,
-            "chain": "test"
+            "isPrivkey": true
         }
     ],
     [
-        "cNACCSjtqhYrLCdoFjfPUULdhPjhsA5GfgoqZHomWCUCpM9FMeJj",
-        "113acbdd52394bce786759896bc0c856bb8250f73dbc534dbc4abb7e9ff67307",
+        "cNMyu2o6XzZ9ekzi5YTUZ3EXtTUHSqrcKYg6DeyPibiKb8v4kGsa",
+        "174b3867b13e4ea9945e798d87586cffbe8c545ab374454e403b1eb831501ebe",
         {
+            "chain": "regtest",
             "isCompressed": true,
-            "isPrivkey": true,
-            "chain": "test"
+            "isPrivkey": true
         }
     ],
     [
-        "XetExvaUvtrzqUaMgXBzxa4ZZsebdzGxha",
-        "76a9142e0863783ae131b41bcac197738de589881a59c988ac",
+        "XoGGRaieFVcqKme6mNNTWaXuLFvs6DkwbT",
+        "76a91489f3c3b02f3137bd7b46b996fac2869848fb19d588ac",
         {
-            "isPrivkey": false,
-            "chain": "main"
+            "chain": "main",
+            "isPrivkey": false
         }
     ],
     [
-        "7mkzXHgVaVqFF8bvKVpRrL6LeS6tLPBHw8",
-        "a914d44335f13c8d26c9ba5106b2d4f179ed5a65028687",
+        "7WuHz4wne6YhnjEucc9mdDtWrd5u6NGhz5",
+        "a914314b3a5c2d4d03b58820460bf90d8d4ab2f120a387",
         {
-            "isPrivkey": false,
-            "chain": "main"
+            "chain": "main",
+            "isPrivkey": false
         }
     ]
 ]

From 3739540a2ba89c62bf15952c9baf3ad887a30ca6 Mon Sep 17 00:00:00 2001
From: pasta <pasta@dashboost.org>
Date: Tue, 30 Sep 2025 16:03:09 -0500
Subject: [PATCH 016/656] coinjoin/server: validate DSQUEUE denomination;
 remove redundant timestamp screens; rely on IsTimeOutOfBounds(); tests: add
 denom and timestamp coverage

---
 src/coinjoin/server.cpp           |  7 ++++++
 src/test/coinjoin_queue_tests.cpp | 42 +++++++++++++++++++++++++++++++
 2 files changed, 49 insertions(+)

diff --git a/src/coinjoin/server.cpp b/src/coinjoin/server.cpp
index 23c8f5e09a86..70c5b4772109 100644
--- a/src/coinjoin/server.cpp
+++ b/src/coinjoin/server.cpp
@@ -117,6 +117,13 @@ MessageProcessingResult CCoinJoinServer::ProcessDSQUEUE(NodeId from, CDataStream
     MessageProcessingResult ret{};
     ret.m_to_erase = CInv{MSG_DSQ, dsq.GetHash()};
 
+    // Validate denomination first
+    if (!CoinJoin::IsValidDenomination(dsq.nDenom)) {
+        LogPrint(BCLog::COINJOIN, "DSQUEUE -- invalid denomination %d from peer %d\n", dsq.nDenom, from);
+        ret.m_error = MisbehavingError{10};
+        return ret;
+    }
+
     if (dsq.masternodeOutpoint.IsNull() && dsq.m_protxHash.IsNull()) {
         ret.m_error = MisbehavingError{100};
         return ret;
diff --git a/src/test/coinjoin_queue_tests.cpp b/src/test/coinjoin_queue_tests.cpp
index 1f7cfa44d3b9..55323a5a37ad 100644
--- a/src/test/coinjoin_queue_tests.cpp
+++ b/src/test/coinjoin_queue_tests.cpp
@@ -53,4 +53,46 @@ BOOST_AUTO_TEST_CASE(queue_hashes_and_equality)
     BOOST_CHECK(a.GetSignatureHash() == b.GetSignatureHash());
 }
 
+BOOST_AUTO_TEST_CASE(queue_denomination_validation)
+{
+    // Test that valid denominations pass
+    int validDenom = CoinJoin::AmountToDenomination(CoinJoin::GetSmallestDenomination());
+    BOOST_CHECK(CoinJoin::IsValidDenomination(validDenom));
+
+    // Test that invalid denominations fail
+    BOOST_CHECK(!CoinJoin::IsValidDenomination(0));     // Zero
+    BOOST_CHECK(!CoinJoin::IsValidDenomination(-1));    // Negative
+    BOOST_CHECK(!CoinJoin::IsValidDenomination(999));   // Invalid value
+}
+
+BOOST_AUTO_TEST_CASE(queue_timestamp_validation)
+{
+    CCoinJoinQueue q;
+    q.nDenom = CoinJoin::AmountToDenomination(CoinJoin::GetSmallestDenomination());
+    q.masternodeOutpoint = COutPoint(uint256S("cc"), 3);
+    q.m_protxHash = uint256::ONE;
+
+    int64_t current_time = GetAdjustedTime();
+
+    // Test valid timestamp (current time)
+    q.nTime = current_time;
+    BOOST_CHECK(!q.IsTimeOutOfBounds(current_time));
+
+    // Test timestamp slightly in future (within COINJOIN_QUEUE_TIMEOUT = 30)
+    q.nTime = current_time + 15; // 15 seconds in future
+    BOOST_CHECK(!q.IsTimeOutOfBounds(current_time));
+
+    // Test timestamp slightly in past (within COINJOIN_QUEUE_TIMEOUT = 30)
+    q.nTime = current_time - 15; // 15 seconds ago
+    BOOST_CHECK(!q.IsTimeOutOfBounds(current_time));
+
+    // Test timestamp too far in future (outside COINJOIN_QUEUE_TIMEOUT = 30)
+    q.nTime = current_time + 60; // 60 seconds in future
+    BOOST_CHECK(q.IsTimeOutOfBounds(current_time));
+
+    // Test timestamp too far in past (outside COINJOIN_QUEUE_TIMEOUT = 30)
+    q.nTime = current_time - 60; // 60 seconds ago
+    BOOST_CHECK(q.IsTimeOutOfBounds(current_time));
+}
+
 BOOST_AUTO_TEST_SUITE_END()

From cc2f4756116b2133246d71a8c19acfe6a669a331 Mon Sep 17 00:00:00 2001
From: pasta <pasta@dashboost.org>
Date: Tue, 30 Sep 2025 17:50:12 -0500
Subject: [PATCH 017/656] fix: correct thread pool sizing logic in LLMQ and BLS
 workers

The previous logic using std::max(std::min(1, workerCount), 4) always
resulted in 4 threads regardless of hardware_concurrency().

This was because:
- std::min(1, workerCount) always returns 1 (when workerCount >= 1)
- std::max(1, 4) always returns 4

Changed to std::clamp(workerCount, 1, 4) which properly clamps the
worker count between 1 and 4 threads based on CPU count.

Fixes undersizing on low-end hardware and potential oversizing issues.
---
 src/bls/bls_worker.cpp | 2 +-
 src/llmq/quorums.cpp   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/bls/bls_worker.cpp b/src/bls/bls_worker.cpp
index 8041d14fc511..1a65899be450 100644
--- a/src/bls/bls_worker.cpp
+++ b/src/bls/bls_worker.cpp
@@ -59,7 +59,7 @@ CBLSWorker::~CBLSWorker()
 void CBLSWorker::Start()
 {
     int workerCount = std::thread::hardware_concurrency() / 2;
-    workerCount = std::max(std::min(1, workerCount), 4);
+    workerCount = std::clamp(workerCount, 1, 4);
     workerPool.resize(workerCount);
     RenameThreadPool(workerPool, "bls-work");
 }
diff --git a/src/llmq/quorums.cpp b/src/llmq/quorums.cpp
index 7368914b287b..196967cab358 100644
--- a/src/llmq/quorums.cpp
+++ b/src/llmq/quorums.cpp
@@ -234,7 +234,7 @@ CQuorumManager::~CQuorumManager() { Stop(); }
 void CQuorumManager::Start()
 {
     int workerCount = std::thread::hardware_concurrency() / 2;
-    workerCount = std::max(std::min(1, workerCount), 4);
+    workerCount = std::clamp(workerCount, 1, 4);
     workerPool.resize(workerCount);
     RenameThreadPool(workerPool, "q-mngr");
 }

From 41e4324a103f889ce724aaafe9b28612cd48cc0c Mon Sep 17 00:00:00 2001
From: pasta <pasta@dashboost.org>
Date: Tue, 30 Sep 2025 18:24:02 -0500
Subject: [PATCH 018/656] masternode: replace RecursiveMutex with Mutex in meta
 store/info and add thread-safety annotations (LOCKS_EXCLUDED); avoid
 re-entrant locking

---
 src/masternode/meta.cpp | 14 +++++++-------
 src/masternode/meta.h   | 24 ++++++++++++------------
 2 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/src/masternode/meta.cpp b/src/masternode/meta.cpp
index adb2aaa30259..783615c1b222 100644
--- a/src/masternode/meta.cpp
+++ b/src/masternode/meta.cpp
@@ -66,7 +66,7 @@ void CMasternodeMetaInfo::RemoveGovernanceObject(const uint256& nGovernanceObjec
     mapGovernanceObjectsVotedOn.erase(nGovernanceObjectHash);
 }
 
-CMasternodeMetaInfoPtr CMasternodeMetaMan::GetMetaInfo(const uint256& proTxHash, bool fCreate)
+CMasternodeMetaInfoPtr CMasternodeMetaMan::GetMetaInfo(const uint256& proTxHash, bool fCreate) LOCKS_EXCLUDED(cs)
 {
     LOCK(cs);
     auto it = metaInfos.find(proTxHash);
@@ -115,7 +115,7 @@ bool CMasternodeMetaMan::AddGovernanceVote(const uint256& proTxHash, const uint2
     return true;
 }
 
-void CMasternodeMetaMan::RemoveGovernanceObject(const uint256& nGovernanceObjectHash)
+void CMasternodeMetaMan::RemoveGovernanceObject(const uint256& nGovernanceObjectHash) LOCKS_EXCLUDED(cs)
 {
     LOCK(cs);
     for(const auto& p : metaInfos) {
@@ -123,20 +123,20 @@ void CMasternodeMetaMan::RemoveGovernanceObject(const uint256& nGovernanceObject
     }
 }
 
-std::vector<uint256> CMasternodeMetaMan::GetAndClearDirtyGovernanceObjectHashes()
+std::vector<uint256> CMasternodeMetaMan::GetAndClearDirtyGovernanceObjectHashes() LOCKS_EXCLUDED(cs)
 {
     std::vector<uint256> vecTmp;
     WITH_LOCK(cs, vecTmp.swap(vecDirtyGovernanceObjectHashes));
     return vecTmp;
 }
 
-bool CMasternodeMetaMan::AlreadyHavePlatformBan(const uint256& inv_hash) const
+bool CMasternodeMetaMan::AlreadyHavePlatformBan(const uint256& inv_hash) const LOCKS_EXCLUDED(cs)
 {
     LOCK(cs);
     return m_seen_platform_bans.exists(inv_hash);
 }
 
-std::optional<PlatformBanMessage> CMasternodeMetaMan::GetPlatformBan(const uint256& inv_hash) const
+std::optional<PlatformBanMessage> CMasternodeMetaMan::GetPlatformBan(const uint256& inv_hash) const LOCKS_EXCLUDED(cs)
 {
     LOCK(cs);
     PlatformBanMessage ret;
@@ -147,13 +147,13 @@ std::optional<PlatformBanMessage> CMasternodeMetaMan::GetPlatformBan(const uint2
     return ret;
 }
 
-void CMasternodeMetaMan::RememberPlatformBan(const uint256& inv_hash, PlatformBanMessage&& msg)
+void CMasternodeMetaMan::RememberPlatformBan(const uint256& inv_hash, PlatformBanMessage&& msg) LOCKS_EXCLUDED(cs)
 {
     LOCK(cs);
     m_seen_platform_bans.insert(inv_hash, std::move(msg));
 }
 
-std::string MasternodeMetaStore::ToString() const
+std::string MasternodeMetaStore::ToString() const LOCKS_EXCLUDED(cs)
 {
     LOCK(cs);
     return strprintf("Masternodes: meta infos object count: %d, nDsqCount: %d", metaInfos.size(), nDsqCount);
diff --git a/src/masternode/meta.h b/src/masternode/meta.h
index e06a10cceed9..39e4902cf446 100644
--- a/src/masternode/meta.h
+++ b/src/masternode/meta.h
@@ -35,7 +35,7 @@ class CMasternodeMetaInfo
     friend class CMasternodeMetaMan;
 
 private:
-    mutable RecursiveMutex cs;
+    mutable Mutex cs;
 
     uint256 proTxHash GUARDED_BY(cs);
 
@@ -127,14 +127,14 @@ class MasternodeMetaStore
 protected:
     static const std::string SERIALIZATION_VERSION_STRING;
 
-    mutable RecursiveMutex cs;
+    mutable Mutex cs;
     std::map<uint256, CMasternodeMetaInfoPtr> metaInfos GUARDED_BY(cs);
     // keep track of dsq count to prevent masternodes from gaming coinjoin queue
     std::atomic<int64_t> nDsqCount{0};
 
 public:
     template<typename Stream>
-    void Serialize(Stream &s) const
+    void Serialize(Stream &s) const LOCKS_EXCLUDED(cs)
     {
         LOCK(cs);
         std::vector<CMasternodeMetaInfo> tmpMetaInfo;
@@ -145,7 +145,7 @@ class MasternodeMetaStore
     }
 
     template<typename Stream>
-    void Unserialize(Stream &s)
+    void Unserialize(Stream &s) LOCKS_EXCLUDED(cs)
     {
         Clear();
 
@@ -163,14 +163,14 @@ class MasternodeMetaStore
         }
     }
 
-    void Clear()
+    void Clear() LOCKS_EXCLUDED(cs)
     {
         LOCK(cs);
 
         metaInfos.clear();
     }
 
-    std::string ToString() const;
+    std::string ToString() const LOCKS_EXCLUDED(cs);
 };
 
 /**
@@ -233,7 +233,7 @@ class CMasternodeMetaMan : public MasternodeMetaStore
 
     bool IsValid() const { return is_valid; }
 
-    CMasternodeMetaInfoPtr GetMetaInfo(const uint256& proTxHash, bool fCreate = true);
+    CMasternodeMetaInfoPtr GetMetaInfo(const uint256& proTxHash, bool fCreate = true) LOCKS_EXCLUDED(cs);
 
     int64_t GetDsqCount() const { return nDsqCount; }
     int64_t GetDsqThreshold(const uint256& proTxHash, int nMnCount);
@@ -242,13 +242,13 @@ class CMasternodeMetaMan : public MasternodeMetaStore
     void DisallowMixing(const uint256& proTxHash);
 
     bool AddGovernanceVote(const uint256& proTxHash, const uint256& nGovernanceObjectHash);
-    void RemoveGovernanceObject(const uint256& nGovernanceObjectHash);
+    void RemoveGovernanceObject(const uint256& nGovernanceObjectHash) LOCKS_EXCLUDED(cs);
 
-    std::vector<uint256> GetAndClearDirtyGovernanceObjectHashes();
+    std::vector<uint256> GetAndClearDirtyGovernanceObjectHashes() LOCKS_EXCLUDED(cs);
 
-    bool AlreadyHavePlatformBan(const uint256& inv_hash) const;
-    std::optional<PlatformBanMessage> GetPlatformBan(const uint256& inv_hash) const;
-    void RememberPlatformBan(const uint256& inv_hash, PlatformBanMessage&& msg);
+    bool AlreadyHavePlatformBan(const uint256& inv_hash) const LOCKS_EXCLUDED(cs);
+    std::optional<PlatformBanMessage> GetPlatformBan(const uint256& inv_hash) const LOCKS_EXCLUDED(cs);
+    void RememberPlatformBan(const uint256& inv_hash, PlatformBanMessage&& msg) LOCKS_EXCLUDED(cs);
 };
 
 #endif // BITCOIN_MASTERNODE_META_H

From 01f74a2b0e08a03db8f382e65c1b6e8e0940ae4d Mon Sep 17 00:00:00 2001
From: UdjinM6 <UdjinM6@users.noreply.github.com>
Date: Wed, 1 Oct 2025 19:32:33 +0300
Subject: [PATCH 019/656] fix: close "review transaction" span tag

---
 src/qt/sendcoinsdialog.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/qt/sendcoinsdialog.cpp b/src/qt/sendcoinsdialog.cpp
index 8e5253b61ff2..bc5011db329e 100644
--- a/src/qt/sendcoinsdialog.cpp
+++ b/src/qt/sendcoinsdialog.cpp
@@ -383,6 +383,7 @@ bool SendCoinsDialog::send(const QList<SendCoinsRecipient>& recipients, QString&
         /*: Text to prompt a user to review the details of the transaction they are attempting to send. */
         question_string.append(tr("Please, review your transaction."));
     }
+    question_string.append("</span>");
     question_string.append("<br /><br />");
     question_string.append(formatted_short.join("<br />"));
     question_string.append("<br />");

From 41fca83575d748e9880216268170dca413996d9c Mon Sep 17 00:00:00 2001
From: MarcoFalke <falke.marco@gmail.com>
Date: Thu, 24 Mar 2022 19:56:24 +0100
Subject: [PATCH 020/656] Merge bitcoin/bitcoin#24653: test: use `MiniWallet`
 in `test/functional/interface_zmq`

bc90b8d86916d43867762a391633664676550bd8 [move only] remove `is_wallet_compiled` checks (josibake)
0bfbf7fb2488753d795ffc1c63a8977e4fe4a3bc test: use MiniWallet in `interfaces_zmq` (josibake)

Pull request description:

  While working on #24584 , `interface_zmq` started failing due to coin selection not running deterministically. The test doesn't actually need the wallet, so this PR migrates it to use MiniWallet

  _Note for reviewers:_ the second commit moves large chunks of code out of an if block, so it may be helpful to review with something that ignores whitespace, e.g `git diff -w master`

ACKs for top commit:
  vincenzopalazzo:
    ACK https://github.com/bitcoin/bitcoin/pull/24653/commits/bc90b8d86916d43867762a391633664676550bd8

Tree-SHA512: c618e23d00635d72dafdef28e68cbc88b9cc2030d4898fc5b7eac926fd621684c1958c075ed167192716b18308da5a0c1f1393396e31b99d0d3bde78b78fefc5
---
 test/functional/interface_zmq.py             | 249 +++++++++----------
 test/functional/test_framework/blocktools.py |   5 +-
 2 files changed, 121 insertions(+), 133 deletions(-)

diff --git a/test/functional/interface_zmq.py b/test/functional/interface_zmq.py
index f467982d0233..002efe3070a8 100755
--- a/test/functional/interface_zmq.py
+++ b/test/functional/interface_zmq.py
@@ -13,7 +13,6 @@
 from test_framework.messages import (
     dashhash,
     hash256,
-    tx_from_hex,
 )
 from test_framework.util import (
     assert_equal,
@@ -21,6 +20,10 @@
     p2p_port,
 )
 from test_framework.netutil import test_ipv6_local, test_unix_socket
+
+from test_framework.wallet import (
+    MiniWallet,
+)
 from time import sleep
 
 # Test may be skipped and not have zmq installed
@@ -100,8 +103,6 @@ class ZMQTest (BitcoinTestFramework):
     def set_test_params(self):
         self.num_nodes = 2
         self.disable_mocktime = True
-        if self.is_wallet_compiled():
-            self.requires_wallet = True
         # This test isn't testing txn relay/timing, so set whitelist on the
         # peers for instant txn relay. This speeds up the test run time 2-3x.
         self.extra_args = [["-whitelist=noban@127.0.0.1"]] * self.num_nodes
@@ -114,6 +115,7 @@ def skip_test_if_missing_module(self):
         self.skip_if_no_bdb()
 
     def run_test(self):
+        self.wallet = MiniWallet(self.nodes[0])
         self.ctx = zmq.Context()
         try:
             self.test_basic()
@@ -223,28 +225,28 @@ def test_basic(self, unix = False):
             assert_equal([txid.hex()], self.nodes[1].getblock(hash)["tx"])
 
 
-        if self.is_wallet_compiled():
-            self.log.info("Wait for tx from second node")
-            payment_txid = self.nodes[1].sendtoaddress(self.nodes[0].getnewaddress(), 1.0)
-            self.sync_all()
+        self.wallet.rescan_utxos()
+        self.log.info("Wait for tx from second node")
+        payment_tx = self.wallet.send_self_transfer(from_node=self.nodes[1])
+        payment_txid = payment_tx['txid']
+        self.sync_all()
+        # Should receive the broadcasted txid.
+        txid = hashtx.receive()
+        assert_equal(payment_txid, txid.hex())
 
-            # Should receive the broadcasted txid.
-            txid = hashtx.receive()
-            assert_equal(payment_txid, txid.hex())
+        # TODO: Add "R" sequence testing, potentially using txes replaced with
+        #       islocked txes
 
-            # TODO: Add "R" sequence testing, potentially using txes replaced with
-            #       islocked txes
+        # Should receive the broadcasted raw transaction.
+        hex = rawtx.receive()
+        assert_equal(payment_txid, hash256_reversed(hex).hex())
 
-            # Should receive the broadcasted raw transaction.
-            hex = rawtx.receive()
-            assert_equal(payment_txid, hash256_reversed(hex).hex())
-
-            # Mining the block with this tx should result in second notification
-            # after coinbase tx notification
-            self.generatetoaddress(self.nodes[0], 1, ADDRESS_BCRT1_UNSPENDABLE)
-            hashtx.receive()
-            txid = hashtx.receive()
-            assert_equal(payment_txid, txid.hex())
+        # Mining the block with this tx should result in second notification
+        # after coinbase tx notification
+        self.generatetoaddress(self.nodes[0], 1, ADDRESS_BCRT1_UNSPENDABLE)
+        hashtx.receive()
+        txid = hashtx.receive()
+        assert_equal(payment_txid, txid.hex())
 
 
         self.log.info("Test the getzmqnotifications RPC")
@@ -261,9 +263,6 @@ def test_basic(self, unix = False):
 
 
     def test_reorg(self):
-        if not self.is_wallet_compiled():
-            self.log.info("Skipping reorg test because wallet is disabled")
-            return
 
         address = f"tcp://127.0.0.1:{self.zmq_port_base}"
 
@@ -274,7 +273,7 @@ def test_reorg(self):
         self.disconnect_nodes(0, 1)
 
         # Generate 1 block in nodes[0] with 1 mempool tx and receive all notifications
-        payment_txid = self.nodes[0].sendtoaddress(self.nodes[0].getnewaddress(), 1.0)
+        payment_txid = self.wallet.send_self_transfer(from_node=self.nodes[0])['txid']
         disconnect_block = self.generatetoaddress(self.nodes[0], 1, ADDRESS_BCRT1_UNSPENDABLE, sync_fun=self.no_op)[0]
         disconnect_cb = self.nodes[0].getblock(disconnect_block)["tx"][0]
         assert_equal(self.nodes[0].getbestblockhash(), hashblock.receive().hex())
@@ -343,113 +342,105 @@ def test_sequence(self):
         assert_equal((self.nodes[1].getblockhash(block_count-1), "C", None), seq.receive_sequence())
         assert_equal((self.nodes[1].getblockhash(block_count), "C", None), seq.receive_sequence())
 
-        # Rest of test requires wallet functionality
-        if self.is_wallet_compiled():
-            self.log.info("Wait for tx from second node")
-            payment_txid = self.nodes[1].sendtoaddress(address=self.nodes[0].getnewaddress(), amount=5.0)
-            self.sync_all()
-            self.log.info("Testing sequence notifications with mempool sequence values")
-
-            # Should receive the broadcasted txid.
-            assert_equal((payment_txid, "A", seq_num), seq.receive_sequence())
-            seq_num += 1
-
-            # Doesn't get published when mined, make a block and tx to "flush" the possibility
-            # though the mempool sequence number does go up by the number of transactions
-            # removed from the mempool by the block mining it.
-            mempool_size = len(self.nodes[0].getrawmempool())
-            c_block = self.generatetoaddress(self.nodes[0], 1, ADDRESS_BCRT1_UNSPENDABLE)[0]
-            # Make sure the number of mined transactions matches the number of txs out of mempool
-            mempool_size_delta = mempool_size - len(self.nodes[0].getrawmempool())
-            assert_equal(len(self.nodes[0].getblock(c_block)["tx"])-1, mempool_size_delta)
-            seq_num += mempool_size_delta
-            payment_txid_2 = self.nodes[1].sendtoaddress(self.nodes[0].getnewaddress(), 1.0)
-            self.sync_all()
-            assert_equal((c_block, "C", None), seq.receive_sequence())
-            assert_equal((payment_txid_2, "A", seq_num), seq.receive_sequence())
-            seq_num += 1
-
-            # Spot check getrawmempool results that they only show up when asked for
-            assert type(self.nodes[0].getrawmempool()) is list
-            assert type(self.nodes[0].getrawmempool(mempool_sequence=False)) is list
-            assert "mempool_sequence" not in self.nodes[0].getrawmempool(verbose=True)
-            assert_raises_rpc_error(-8, "Verbose results cannot contain mempool sequence values.", self.nodes[0].getrawmempool, True, True)
-            assert_equal(self.nodes[0].getrawmempool(mempool_sequence=True)["mempool_sequence"], seq_num)
-
-            self.log.info("Testing reorg notifications")
-            # Manually invalidate the last block to test mempool re-entry
-            # N.B. This part could be made more lenient in exact ordering
-            # since it greatly depends on inner-workings of blocks/mempool
-            # during "deep" re-orgs. Probably should "re-construct"
-            # blockchain/mempool state from notifications instead.
-            block_count = self.nodes[0].getblockcount()
-            best_hash = self.nodes[0].getbestblockhash()
-            self.nodes[0].invalidateblock(best_hash)
-            sleep(2)  # Bit of room to make sure transaction things happened
-
-            # Make sure getrawmempool mempool_sequence results aren't "queued" but immediately reflective
-            # of the time they were gathered.
-            assert self.nodes[0].getrawmempool(mempool_sequence=True)["mempool_sequence"] > seq_num
-
-            assert_equal((best_hash, "D", None), seq.receive_sequence())
-            assert_equal((payment_txid, "A", seq_num), seq.receive_sequence())
-            seq_num += 1
-
-            # Other things may happen but aren't wallet-deterministic so we don't test for them currently
-            self.nodes[0].reconsiderblock(best_hash)
-            self.generatetoaddress(self.nodes[1], 1, ADDRESS_BCRT1_UNSPENDABLE)
-
-            self.log.info("Evict mempool transaction by block conflict")
-            orig_txid = self.nodes[0].sendtoaddress(address=self.nodes[0].getnewaddress(), amount=1.0)
-
-            # More to be simply mined
-            more_tx = []
-            for _ in range(5):
-                more_tx.append(self.nodes[0].sendtoaddress(self.nodes[0].getnewaddress(), 0.1))
-
-            raw_tx = self.nodes[0].getrawtransaction(orig_txid)
-            # Mine the tx
-            block = create_block(int(self.nodes[0].getbestblockhash(), 16), create_coinbase(self.nodes[0].getblockcount()+1))
-            tx = tx_from_hex(raw_tx)
-            block.vtx.append(tx)
-            for txid in more_tx:
-                tx = tx_from_hex(self.nodes[0].getrawtransaction(txid))
-                block.vtx.append(tx)
-            block.hashMerkleRoot = block.calc_merkle_root()
-            block.solve()
-            assert_equal(self.nodes[0].submitblock(block.serialize().hex()), None)
-            tip = self.nodes[0].getbestblockhash()
-            assert_equal(int(tip, 16), block.sha256)
-            orig_txid_2 = self.nodes[0].sendtoaddress(address=self.nodes[0].getnewaddress(), amount=1.0)
-
-            # Flush old notifications until evicted tx original entry
+        self.log.info("Wait for tx from second node")
+        payment_tx = self.wallet.send_self_transfer(from_node=self.nodes[1])
+        payment_txid = payment_tx['txid']
+        self.sync_all()
+        self.log.info("Testing sequence notifications with mempool sequence values")
+
+        # Should receive the broadcasted txid.
+        assert_equal((payment_txid, "A", seq_num), seq.receive_sequence())
+        seq_num += 1
+
+        # Doesn't get published when mined, make a block and tx to "flush" the possibility
+        # though the mempool sequence number does go up by the number of transactions
+        # removed from the mempool by the block mining it.
+        mempool_size = len(self.nodes[0].getrawmempool())
+        c_block = self.generatetoaddress(self.nodes[0], 1, ADDRESS_BCRT1_UNSPENDABLE)[0]
+        # Make sure the number of mined transactions matches the number of txs out of mempool
+        mempool_size_delta = mempool_size - len(self.nodes[0].getrawmempool())
+        assert_equal(len(self.nodes[0].getblock(c_block)["tx"])-1, mempool_size_delta)
+        seq_num += mempool_size_delta
+        payment_txid_2 = self.wallet.send_self_transfer(from_node=self.nodes[1])['txid']
+        self.sync_all()
+        assert_equal((c_block, "C", None), seq.receive_sequence())
+        assert_equal((payment_txid_2, "A", seq_num), seq.receive_sequence())
+        seq_num += 1
+
+        # Spot check getrawmempool results that they only show up when asked for
+        assert type(self.nodes[0].getrawmempool()) is list
+        assert type(self.nodes[0].getrawmempool(mempool_sequence=False)) is list
+        assert "mempool_sequence" not in self.nodes[0].getrawmempool(verbose=True)
+        assert_raises_rpc_error(-8, "Verbose results cannot contain mempool sequence values.", self.nodes[0].getrawmempool, True, True)
+        assert_equal(self.nodes[0].getrawmempool(mempool_sequence=True)["mempool_sequence"], seq_num)
+
+        self.log.info("Testing reorg notifications")
+        # Manually invalidate the last block to test mempool re-entry
+        # N.B. This part could be made more lenient in exact ordering
+        # since it greatly depends on inner-workings of blocks/mempool
+        # during "deep" re-orgs. Probably should "re-construct"
+        # blockchain/mempool state from notifications instead.
+        block_count = self.nodes[0].getblockcount()
+        best_hash = self.nodes[0].getbestblockhash()
+        self.nodes[0].invalidateblock(best_hash)
+        sleep(2)  # Bit of room to make sure transaction things happened
+
+        # Make sure getrawmempool mempool_sequence results aren't "queued" but immediately reflective
+        # of the time they were gathered.
+        assert self.nodes[0].getrawmempool(mempool_sequence=True)["mempool_sequence"] > seq_num
+
+        assert_equal((best_hash, "D", None), seq.receive_sequence())
+        assert_equal((payment_txid, "A", seq_num), seq.receive_sequence())
+        seq_num += 1
+
+        # Other things may happen but aren't wallet-deterministic so we don't test for them currently
+        self.nodes[0].reconsiderblock(best_hash)
+        self.generatetoaddress(self.nodes[1], 1, ADDRESS_BCRT1_UNSPENDABLE)
+
+        self.log.info("Evict mempool transaction by block conflict")
+        orig_tx = self.wallet.send_self_transfer(from_node=self.nodes[0])
+        orig_txid = orig_tx['txid']
+
+        # More to be simply mined
+        more_tx = []
+        for _ in range(5):
+            more_tx.append(self.wallet.send_self_transfer(from_node=self.nodes[0]))
+
+        # Mine the tx
+        txs_to_add = [orig_tx['hex']] + [tx['hex'] for tx in more_tx]
+        block = create_block(int(self.nodes[0].getbestblockhash(), 16), create_coinbase(self.nodes[0].getblockcount()+1), txlist=txs_to_add)
+        block.hashMerkleRoot = block.calc_merkle_root()
+        block.solve()
+        assert_equal(self.nodes[0].submitblock(block.serialize().hex()), None)
+        tip = self.nodes[0].getbestblockhash()
+        assert_equal(int(tip, 16), block.sha256)
+        orig_txid_2 = self.wallet.send_self_transfer(from_node=self.nodes[0])['txid']
+
+        # Flush old notifications until evicted tx original entry
+        (hash_str, label, mempool_seq) = seq.receive_sequence()
+        while hash_str != orig_txid:
             (hash_str, label, mempool_seq) = seq.receive_sequence()
-            while hash_str != orig_txid:
-                (hash_str, label, mempool_seq) = seq.receive_sequence()
-            mempool_seq += 1
-
-            # Added original tx
-            assert_equal(label, "A")
-            # More transactions to be simply mined
-            for i in range(len(more_tx)):
-                assert_equal((more_tx[i], "A", mempool_seq), seq.receive_sequence())
-                mempool_seq += 1
+        mempool_seq += 1
 
+        # Added original tx
+        assert_equal(label, "A")
+        # More transactions to be simply mined
+        for i in range(len(more_tx)):
+            assert_equal((more_tx[i]['txid'], "A", mempool_seq), seq.receive_sequence())
             mempool_seq += 1
-            assert_equal((tip, "C", None), seq.receive_sequence())
-            mempool_seq += len(more_tx)
-            # Last tx
-            assert_equal((orig_txid_2, "A", mempool_seq), seq.receive_sequence())
-            mempool_seq += 1
-            self.generatetoaddress(self.nodes[0], 1, ADDRESS_BCRT1_UNSPENDABLE)
+
+        mempool_seq += 1
+        assert_equal((tip, "C", None), seq.receive_sequence())
+        mempool_seq += len(more_tx)
+        # Last tx
+        assert_equal((orig_txid_2, "A", mempool_seq), seq.receive_sequence())
+        mempool_seq += 1
+        self.generatetoaddress(self.nodes[0], 1, ADDRESS_BCRT1_UNSPENDABLE)
 
     def test_mempool_sync(self):
         """
         Use sequence notification plus getrawmempool sequence results to "sync mempool"
         """
-        if not self.is_wallet_compiled():
-            self.log.info("Skipping mempool sync test")
-            return
 
         self.log.info("Testing 'mempool sync' usage of sequence notifier")
         [seq] = self.setup_zmq_test([("sequence", f"tcp://127.0.0.1:{self.zmq_port_base}")])
@@ -460,10 +451,10 @@ def test_mempool_sync(self):
 
         # Some transactions have been happening but we aren't consuming zmq notifications yet
         # or we lost a ZMQ message somehow and want to start over
-        txids = []
+        txs = []
         num_txs = 5
         for _ in range(num_txs):
-            txids.append(self.nodes[1].sendtoaddress(address=self.nodes[0].getnewaddress(), amount=1.0))
+            txs.append(self.wallet.send_self_transfer(from_node=self.nodes[1]))
         self.sync_all()
 
         # 1) Consume backlog until we get a mempool sequence number
@@ -488,10 +479,10 @@ def test_mempool_sync(self):
 
         # Things continue to happen in the "interim" while waiting for snapshot results
         for _ in range(num_txs):
-            txids.append(self.nodes[0].sendtoaddress(address=self.nodes[0].getnewaddress(), amount=0.1))
+            txs.append(self.wallet.send_self_transfer(from_node=self.nodes[0])['txid'])
         self.sync_all()
         self.generatetoaddress(self.nodes[0], 1, ADDRESS_BCRT1_UNSPENDABLE)
-        final_txid = self.nodes[0].sendtoaddress(address=self.nodes[0].getnewaddress(), amount=0.1)
+        final_txid = self.wallet.send_self_transfer(from_node=self.nodes[0])['txid']
 
         # 3) Consume ZMQ backlog until we get to "now" for the mempool snapshot
         while True:
diff --git a/test/functional/test_framework/blocktools.py b/test/functional/test_framework/blocktools.py
index 31f4df13f1cd..d451ab17359a 100644
--- a/test/functional/test_framework/blocktools.py
+++ b/test/functional/test_framework/blocktools.py
@@ -5,7 +5,6 @@
 """Utilities for manipulating blocks and transactions."""
 
 from decimal import Decimal
-import io
 import struct
 import time
 import unittest
@@ -66,9 +65,7 @@ def create_block(hashprev=None, coinbase=None, ntime=None, *, version=None, tmpl
     if txlist:
         for tx in txlist:
             if not hasattr(tx, 'calc_sha256'):
-                txo = CTransaction()
-                txo.deserialize(io.BytesIO(tx))
-                tx = txo
+                tx = tx_from_hex(tx)
             block.vtx.append(tx)
     block.hashMerkleRoot = block.calc_merkle_root()
     block.calc_sha256()

From 4e18b94772fd6c225207cc4f2d6656f15f9a4dde Mon Sep 17 00:00:00 2001
From: MarcoFalke <falke.marco@gmail.com>
Date: Fri, 25 Mar 2022 11:31:23 +0100
Subject: [PATCH 021/656] Merge bitcoin/bitcoin#24667: ci: Compile fuzz binary
 in periodic task

fa6e47d85be42b3065ad530257e5d4c23afcade3 ci: Compile fuzz binary in periodic task (MarcoFalke)

Pull request description:

  There is one task that is re-run periodically by CI about once a week for all pull request to detect silent merge conflict before merge.

  It would be nice if this task also checked for silent merge conflict in the fuzz binary.

ACKs for top commit:
  fanquake:
    ACK fa6e47d85be42b3065ad530257e5d4c23afcade3 green CI
  vincenzopalazzo:
    ACK https://github.com/bitcoin/bitcoin/pull/24667/commits/fa6e47d85be42b3065ad530257e5d4c23afcade3

Tree-SHA512: fd5b02dc72af7a4ba973919d62c3aad11569f86a93622e2e56330ea9d379f1f015dfd5cb7efbf00718b306103028bc10c7e935579c2337fb506bd7fe3e145e1c
---
 ci/test/00_setup_env_native_qt5.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ci/test/00_setup_env_native_qt5.sh b/ci/test/00_setup_env_native_qt5.sh
index 78aeef1f0aec..a455569645a7 100755
--- a/ci/test/00_setup_env_native_qt5.sh
+++ b/ci/test/00_setup_env_native_qt5.sh
@@ -15,4 +15,4 @@ 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 BITCOIN_CONFIG="--enable-zmq --with-libs=no --enable-reduce-exports --disable-fuzz-binary LDFLAGS=-static-libstdc++ --with-boost-process"
+export BITCOIN_CONFIG="--enable-zmq --with-libs=no --enable-reduce-exports LDFLAGS=-static-libstdc++ --with-boost-process"

From 8fe133360a50e5b9793dba900112fc559270eb3d Mon Sep 17 00:00:00 2001
From: MarcoFalke <falke.marco@gmail.com>
Date: Fri, 25 Mar 2022 16:52:55 +0100
Subject: [PATCH 022/656] Merge bitcoin/bitcoin#24670: test: move-only: Move
 all generate* tests to a single file

0000ff0d6b2442706a588fd906ebf1adf8ff8226 test: move-only: Move all generate* tests to a single file (MarcoFalke)

Pull request description:

  Seems a bit overkill to spread tests for the `generate*` methods over several files. Combining them into a single file has also a nice side-effect of requiring less node (re)starts, which are expensive in valgrind.

ACKs for top commit:
  glozow:
    utACK 0000ff0d6b2442706a588fd906ebf1adf8ff8226

Tree-SHA512: 8269eb05649a871011bbfbd1838d0f7d1dac4a35b3b198fc43fe85131fda8a53803b75da78cbf422eabf086006dee4421e622fbe706f6781a3848b989024001b
---
 test/functional/rpc_generate.py      | 83 ++++++++++++++++++++++++-
 test/functional/rpc_generateblock.py | 91 ----------------------------
 test/functional/test_runner.py       |  1 -
 test/functional/wallet_disable.py    |  6 +-
 4 files changed, 83 insertions(+), 98 deletions(-)
 delete mode 100755 test/functional/rpc_generateblock.py

diff --git a/test/functional/rpc_generate.py b/test/functional/rpc_generate.py
index 47d7814da37a..77a0388f3876 100755
--- a/test/functional/rpc_generate.py
+++ b/test/functional/rpc_generate.py
@@ -2,9 +2,10 @@
 # Copyright (c) 2020-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.
-"""Test generate RPC."""
+"""Test generate* RPCs."""
 
 from test_framework.test_framework import BitcoinTestFramework
+from test_framework.wallet import MiniWallet
 from test_framework.util import (
     assert_equal,
     assert_raises_rpc_error,
@@ -16,6 +17,86 @@ def set_test_params(self):
         self.num_nodes = 1
 
     def run_test(self):
+        self.test_generatetoaddress()
+        self.test_generate()
+        self.test_generateblock()
+
+    def test_generatetoaddress(self):
+        self.generatetoaddress(self.nodes[0], 1, 'ycwedq2f3sz2Yf9JqZsBCQPxp18WU3Hp4J')
+        assert_raises_rpc_error(-5, "Invalid address", self.generatetoaddress, self.nodes[0], 1, '3J98t1WpEZ73CNmQviecrnyiWrnqRhWNLy')
+
+    def test_generateblock(self):
+        node = self.nodes[0]
+        miniwallet = MiniWallet(node)
+        miniwallet.rescan_utxos()
+
+        self.log.info('Generate an empty block to address')
+        address = miniwallet.get_address()
+        hash = self.generateblock(node, output=address, transactions=[])['hash']
+        block = node.getblock(blockhash=hash, verbose=2)
+        assert_equal(len(block['tx']), 1)
+        assert_equal(block['tx'][0]['vout'][0]['scriptPubKey']['address'], address)
+
+        self.log.info('Generate an empty block to a descriptor')
+        hash = self.generateblock(node, 'addr(' + address + ')', [])['hash']
+        block = node.getblock(blockhash=hash, verbosity=2)
+        assert_equal(len(block['tx']), 1)
+        assert_equal(block['tx'][0]['vout'][0]['scriptPubKey']['address'], address)
+
+        self.log.info('Generate an empty block to a combo descriptor with compressed pubkey')
+        combo_key = '0279be667ef9dcbbac55a06295ce870b07029bfcdb2dce28d959f2815b16f81798'
+        combo_address = 'yWziQMcwmKjRdzi7eWjwiQX8EjWcd6dSg6'
+        hash = self.generateblock(node, 'combo(' + combo_key + ')', [])['hash']
+        block = node.getblock(hash, 2)
+        assert_equal(len(block['tx']), 1)
+        assert_equal(block['tx'][0]['vout'][0]['scriptPubKey']['address'], combo_address)
+
+        # Generate some extra mempool transactions to verify they don't get mined
+        for _ in range(10):
+            miniwallet.send_self_transfer(from_node=node)
+
+        self.log.info('Generate block with txid')
+        txid = miniwallet.send_self_transfer(from_node=node)['txid']
+        hash = self.generateblock(node, address, [txid])['hash']
+        block = node.getblock(hash, 1)
+        assert_equal(len(block['tx']), 2)
+        assert_equal(block['tx'][1], txid)
+
+        self.log.info('Generate block with raw tx')
+        rawtx = miniwallet.create_self_transfer()['hex']
+        hash = self.generateblock(node, address, [rawtx])['hash']
+
+        block = node.getblock(hash, 1)
+        assert_equal(len(block['tx']), 2)
+        txid = block['tx'][1]
+        assert_equal(node.getrawtransaction(txid=txid, verbose=False, blockhash=hash), rawtx)
+
+        self.log.info('Fail to generate block with out of order txs')
+        txid1 = miniwallet.send_self_transfer(from_node=node)['txid']
+        utxo1 = miniwallet.get_utxo(txid=txid1)
+        rawtx2 = miniwallet.create_self_transfer(utxo_to_spend=utxo1)['hex']
+        assert_raises_rpc_error(-25, 'TestBlockValidity failed: bad-txns-inputs-missingorspent', self.generateblock, node, address, [rawtx2, txid1])
+
+        self.log.info('Fail to generate block with txid not in mempool')
+        missing_txid = '0000000000000000000000000000000000000000000000000000000000000000'
+        assert_raises_rpc_error(-5, 'Transaction ' + missing_txid + ' not in mempool.', self.generateblock, node, address, [missing_txid])
+
+        self.log.info('Fail to generate block with invalid raw tx')
+        invalid_raw_tx = '0000'
+        assert_raises_rpc_error(-22, 'Transaction decode failed for ' + invalid_raw_tx, self.generateblock, node, address, [invalid_raw_tx])
+
+        self.log.info('Fail to generate block with invalid address/descriptor')
+        assert_raises_rpc_error(-5, 'Invalid address or descriptor', self.generateblock, node, '1234', [])
+
+        self.log.info('Fail to generate block with a ranged descriptor')
+        ranged_descriptor = 'pkh(tpubD6NzVbkrYhZ4XgiXtGrdW5XDAPFCL9h7we1vwNCpn8tGbBcgfVYjXyhWo4E1xkh56hjod1RhGjxbaTLV3X4FyWuejifB9jusQ46QzG87VKp/0/*)'
+        assert_raises_rpc_error(-8, 'Ranged descriptor not accepted. Maybe pass through deriveaddresses first?', self.generateblock, node, ranged_descriptor, [])
+
+        self.log.info('Fail to generate block with a descriptor missing a private key')
+        child_descriptor = 'pkh(tpubD6NzVbkrYhZ4XgiXtGrdW5XDAPFCL9h7we1vwNCpn8tGbBcgfVYjXyhWo4E1xkh56hjod1RhGjxbaTLV3X4FyWuejifB9jusQ46QzG87VKp/0\'/0)'
+        assert_raises_rpc_error(-5, 'Cannot derive script without private keys', self.generateblock, node, child_descriptor, [])
+
+    def test_generate(self):
         message = (
             "generate\n\n"
             "has been replaced by the -generate "
diff --git a/test/functional/rpc_generateblock.py b/test/functional/rpc_generateblock.py
deleted file mode 100755
index 9fce143990e1..000000000000
--- a/test/functional/rpc_generateblock.py
+++ /dev/null
@@ -1,91 +0,0 @@
-#!/usr/bin/env python3
-# Copyright (c) 2020 The Bitcoin Core developers
-# Distributed under the MIT software license, see the accompanying
-# file COPYING or http://www.opensource.org/licenses/mit-license.php.
-'''Test generateblock rpc.
-'''
-
-from test_framework.test_framework import BitcoinTestFramework
-from test_framework.wallet import MiniWallet
-from test_framework.util import (
-    assert_equal,
-    assert_raises_rpc_error,
-)
-
-class GenerateBlockTest(BitcoinTestFramework):
-    def set_test_params(self):
-        self.num_nodes = 1
-
-    def run_test(self):
-        node = self.nodes[0]
-        miniwallet = MiniWallet(node)
-        miniwallet.rescan_utxos()
-
-        self.log.info('Generate an empty block to address')
-        address = miniwallet.get_address()
-        hash = self.generateblock(node, address, [])['hash']
-        block = node.getblock(hash, 2)
-        assert_equal(len(block['tx']), 1)
-        assert_equal(block['tx'][0]['vout'][0]['scriptPubKey']['address'], address)
-
-        self.log.info('Generate an empty block to a descriptor')
-        hash = self.generateblock(node, 'addr(' + address + ')', [])['hash']
-        block = node.getblock(hash, 2)
-        assert_equal(len(block['tx']), 1)
-        assert_equal(block['tx'][0]['vout'][0]['scriptPubKey']['address'], address)
-
-        self.log.info('Generate an empty block to a combo descriptor with compressed pubkey')
-        combo_key = '0279be667ef9dcbbac55a06295ce870b07029bfcdb2dce28d959f2815b16f81798'
-        combo_address = 'yWziQMcwmKjRdzi7eWjwiQX8EjWcd6dSg6'
-        hash = self.generateblock(node, 'combo(' + combo_key + ')', [])['hash']
-        block = node.getblock(hash, 2)
-        assert_equal(len(block['tx']), 1)
-        assert_equal(block['tx'][0]['vout'][0]['scriptPubKey']['address'], combo_address)
-
-        # Generate some extra mempool transactions to verify they don't get mined
-        for _ in range(10):
-            miniwallet.send_self_transfer(from_node=node)
-
-        self.log.info('Generate block with txid')
-        txid = miniwallet.send_self_transfer(from_node=node)['txid']
-        hash = self.generateblock(node, address, [txid])['hash']
-        block = node.getblock(hash, 1)
-        assert_equal(len(block['tx']), 2)
-        assert_equal(block['tx'][1], txid)
-
-        self.log.info('Generate block with raw tx')
-        rawtx = miniwallet.create_self_transfer()['hex']
-        hash = self.generateblock(node, address, [rawtx])['hash']
-
-        block = node.getblock(hash, 1)
-        assert_equal(len(block['tx']), 2)
-        txid = block['tx'][1]
-        assert_equal(node.getrawtransaction(txid=txid, verbose=False, blockhash=hash), rawtx)
-
-        self.log.info('Fail to generate block with out of order txs')
-        txid1 = miniwallet.send_self_transfer(from_node=node)['txid']
-        utxo1 = miniwallet.get_utxo(txid=txid1)
-        rawtx2 = miniwallet.create_self_transfer(utxo_to_spend=utxo1)['hex']
-        assert_raises_rpc_error(-25, 'TestBlockValidity failed: bad-txns-inputs-missingorspent', self.generateblock, node, address, [rawtx2, txid1])
-
-        self.log.info('Fail to generate block with txid not in mempool')
-        missing_txid = '0000000000000000000000000000000000000000000000000000000000000000'
-        assert_raises_rpc_error(-5, 'Transaction ' + missing_txid + ' not in mempool.', self.generateblock, node, address, [missing_txid])
-
-        self.log.info('Fail to generate block with invalid raw tx')
-        invalid_raw_tx = '0000'
-        assert_raises_rpc_error(-22, 'Transaction decode failed for ' + invalid_raw_tx, self.generateblock, node, address, [invalid_raw_tx])
-
-        self.log.info('Fail to generate block with invalid address/descriptor')
-        assert_raises_rpc_error(-5, 'Invalid address or descriptor', self.generateblock, node, '1234', [])
-
-        self.log.info('Fail to generate block with a ranged descriptor')
-        ranged_descriptor = 'pkh(tpubD6NzVbkrYhZ4XgiXtGrdW5XDAPFCL9h7we1vwNCpn8tGbBcgfVYjXyhWo4E1xkh56hjod1RhGjxbaTLV3X4FyWuejifB9jusQ46QzG87VKp/0/*)'
-        assert_raises_rpc_error(-8, 'Ranged descriptor not accepted. Maybe pass through deriveaddresses first?', self.generateblock, node, ranged_descriptor, [])
-
-        self.log.info('Fail to generate block with a descriptor missing a private key')
-        child_descriptor = 'pkh(tpubD6NzVbkrYhZ4XgiXtGrdW5XDAPFCL9h7we1vwNCpn8tGbBcgfVYjXyhWo4E1xkh56hjod1RhGjxbaTLV3X4FyWuejifB9jusQ46QzG87VKp/0\'/0)'
-        assert_raises_rpc_error(-5, 'Cannot derive script without private keys', self.generateblock, node, child_descriptor, [])
-
-if __name__ == '__main__':
-    GenerateBlockTest().main()
diff --git a/test/functional/test_runner.py b/test/functional/test_runner.py
index 2c1a8597f535..f3ba40f9b8cb 100755
--- a/test/functional/test_runner.py
+++ b/test/functional/test_runner.py
@@ -287,7 +287,6 @@
     'p2p_net_deadlock.py --v2transport',
     'wallet_signmessagewithaddress.py',
     'rpc_signmessagewithprivkey.py',
-    'rpc_generateblock.py',
     'rpc_generate.py',
     'wallet_balance.py --legacy-wallet',
     'wallet_balance.py --descriptors',
diff --git a/test/functional/wallet_disable.py b/test/functional/wallet_disable.py
index de8cd0af0b24..05b1b53d7105 100755
--- a/test/functional/wallet_disable.py
+++ b/test/functional/wallet_disable.py
@@ -26,10 +26,6 @@ def run_test (self):
         x = self.nodes[0].validateaddress('ycwedq2f3sz2Yf9JqZsBCQPxp18WU3Hp4J')
         assert x['isvalid'] == True
 
-        # Checking mining to an address without a wallet. Generating to a valid address should succeed
-        # but generating to an invalid address will fail.
-        self.generatetoaddress(self.nodes[0], 1, 'ycwedq2f3sz2Yf9JqZsBCQPxp18WU3Hp4J')
-        assert_raises_rpc_error(-5, "Invalid address", self.generatetoaddress, self.nodes[0], 1, '7TSBtVu959hGEGPKyHjJz9k55RpWrPffXz')
 
 if __name__ == '__main__':
-    DisableWalletTest ().main ()
+    DisableWalletTest().main()

From 65db76fefd6b116781aff556996c63b32c81778b Mon Sep 17 00:00:00 2001
From: MarcoFalke <falke.marco@gmail.com>
Date: Mon, 28 Mar 2022 08:53:29 +0200
Subject: [PATCH 023/656] Merge bitcoin/bitcoin#24656: refactor: Move mempool
 RPCs to rpc/mempool

fac5a51c47fba21678fb35805e40d00fe7c891a0 Move mempool RPCs to rpc/mempool (MarcoFalke)
fa0f666dd7b55a5a0250c5e35d2c3dfd565463b7 style: Add static keyword where possible in rpc/mempool (MarcoFalke)

Pull request description:

  This moves the remaining mempool RPCs to `rpc/mempool`. Previously all mempool RPCs from the `blockchain` category have been moved. This patch moves the ones from the `rawtransactions` category.

  In the future, as a follow-up to this refactoring patch, it could be considered whether a new `mempool` category should be introduced.

  Beside a clearer code organization, this pull request should also reduce the compile time and space of the `rawtransactions.cpp` file.

ACKs for top commit:
  promag:
    Code review ACK fac5a51c47fba21678fb35805e40d00fe7c891a0.

Tree-SHA512: 5578b894b68d0595869a9b03ed8dceebe3366f73dec5f090ccc36ff4002b1bc4d58af77546c2d71537c1be03694d9a28c4b1bfbb3569560997879293c5c0301e
---
 src/rpc/mempool.cpp        | 230 +++++++++++++++++++++++++++++++++++--
 src/rpc/rawtransaction.cpp | 210 ---------------------------------
 2 files changed, 222 insertions(+), 218 deletions(-)

diff --git a/src/rpc/mempool.cpp b/src/rpc/mempool.cpp
index ab527f39f824..165ea861df88 100644
--- a/src/rpc/mempool.cpp
+++ b/src/rpc/mempool.cpp
@@ -14,14 +14,225 @@
 #include <rpc/util.h>
 #include <txmempool.h>
 #include <univalue.h>
+#include <util/moneystr.h>
 #include <validation.h>
 
 #include <instantsend/instantsend.h>
 #include <llmq/context.h>
 
+using node::DEFAULT_MAX_RAW_TX_FEE_RATE;
 using node::NodeContext;
 
-static std::vector<RPCResult> MempoolEntryDescription() { return {
+RPCHelpMan sendrawtransaction()
+{
+    return RPCHelpMan{"sendrawtransaction",
+        "\nSubmit a raw transaction (serialized, hex-encoded) to local node and network.\n"
+        "\nThe transaction will be sent unconditionally to all peers, so using sendrawtransaction\n"
+        "for manual rebroadcast may degrade privacy by leaking the transaction's origin, as\n"
+        "nodes will normally not rebroadcast non-wallet transactions already in their mempool.\n"
+        "\nA specific exception, RPC_TRANSACTION_ALREADY_IN_CHAIN, may throw if the transaction cannot be added to the mempool.\n"
+        "\nRelated RPCs: createrawtransaction, signrawtransactionwithkey\n",
+        {
+            {"hexstring", RPCArg::Type::STR_HEX, RPCArg::Optional::NO, "The hex string of the raw transaction"},
+            {"maxfeerate", RPCArg::Type::AMOUNT, RPCArg::Default{FormatMoney(DEFAULT_MAX_RAW_TX_FEE_RATE.GetFeePerK())},
+             "Reject transactions whose fee rate is higher than the specified value, expressed in " + CURRENCY_UNIT +
+                 "/kB.\nSet to 0 to accept any fee rate.\n"},
+            {"instantsend", RPCArg::Type::BOOL, RPCArg::Optional::OMITTED, "Deprecated and ignored"},
+            {"bypasslimits", RPCArg::Type::BOOL, RPCArg::Default{false}, "Bypass transaction policy limits"},
+        },
+        RPCResult{
+            RPCResult::Type::STR_HEX, "", "The transaction hash in hex"
+        },
+        RPCExamples{
+            "\nCreate a transaction\n"
+            + HelpExampleCli("createrawtransaction", "\"[{\\\"txid\\\" : \\\"mytxid\\\",\\\"vout\\\":0}]\" \"{\\\"myaddress\\\":0.01}\"") +
+            "Sign the transaction, and get back the hex\n"
+            + HelpExampleCli("signrawtransactionwithwallet", "\"myhex\"") +
+            "\nSend the transaction (signed hex)\n"
+            + HelpExampleCli("sendrawtransaction", "\"signedhex\"") +
+            "\nAs a JSON-RPC call\n"
+            + HelpExampleRpc("sendrawtransaction", "\"signedhex\"")
+                },
+        [&](const RPCHelpMan& self, const JSONRPCRequest& request) -> UniValue
+        {
+            RPCTypeCheck(request.params, {
+                UniValue::VSTR,
+                UniValueType(), // VNUM or VSTR, checked inside AmountFromValue()
+                UniValue::VBOOL
+            });
+
+            CMutableTransaction mtx;
+            if (!DecodeHexTx(mtx, request.params[0].get_str())) {
+                throw JSONRPCError(RPC_DESERIALIZATION_ERROR, "TX decode failed. Make sure the tx has at least one input.");
+            }
+            CTransactionRef tx(MakeTransactionRef(std::move(mtx)));
+
+            const CFeeRate max_raw_tx_fee_rate = request.params[1].isNull() ?
+                                                     DEFAULT_MAX_RAW_TX_FEE_RATE :
+                                                     CFeeRate(AmountFromValue(request.params[1]));
+
+            int64_t virtual_size = GetVirtualTransactionSize(*tx);
+            CAmount max_raw_tx_fee = max_raw_tx_fee_rate.GetFee(virtual_size);
+
+            bool bypass_limits = false;
+            if (!request.params[3].isNull()) bypass_limits = request.params[3].get_bool();
+            bilingual_str err_string;
+            AssertLockNotHeld(cs_main);
+            NodeContext& node = EnsureAnyNodeContext(request.context);
+            const TransactionError err = BroadcastTransaction(node, tx, err_string, max_raw_tx_fee, /*relay=*/true, /*wait_callback=*/true, bypass_limits);
+            if (TransactionError::OK != err) {
+                throw JSONRPCTransactionError(err, err_string.original);
+            }
+
+            return tx->GetHash().GetHex();
+        },
+    };
+}
+
+static RPCHelpMan testmempoolaccept()
+{
+    return RPCHelpMan{"testmempoolaccept",
+        "\nReturns result of mempool acceptance tests indicating if raw transaction (serialized, hex-encoded) would be accepted by mempool.\n"
+        "\nIf multiple transactions are passed in, parents must come before children and package policies apply: the transactions cannot conflict with any mempool transactions or each other.\n"
+        "\nIf one transaction fails, other transactions may not be fully validated (the 'allowed' key will be blank).\n"
+        "\nThe maximum number of transactions allowed is " + ToString(MAX_PACKAGE_COUNT) + ".\n"
+        "\nThis checks if transactions violate the consensus or policy rules.\n"
+        "\nSee sendrawtransaction call.\n",
+        {
+            {"rawtxs", RPCArg::Type::ARR, RPCArg::Optional::NO, "An array of hex strings of raw transactions.",
+                {
+                    {"rawtx", RPCArg::Type::STR_HEX, RPCArg::Optional::OMITTED, ""},
+                },
+            },
+            {"maxfeerate", RPCArg::Type::AMOUNT, RPCArg::Default{FormatMoney(DEFAULT_MAX_RAW_TX_FEE_RATE.GetFeePerK())},
+             "Reject transactions whose fee rate is higher than the specified value, expressed in " + CURRENCY_UNIT + "/kB\n"},
+        },
+        RPCResult{
+            RPCResult::Type::ARR, "", "The result of the mempool acceptance test for each raw transaction in the input array.\n"
+                                      "Returns results for each transaction in the same order they were passed in.\n"
+                                      "Transactions that cannot be fully validated due to failures in other transactions will not contain an 'allowed' result.\n",
+            {
+                {RPCResult::Type::OBJ, "", "",
+                {
+                    {RPCResult::Type::STR_HEX, "txid", "The transaction hash in hex"},
+                    {RPCResult::Type::STR, "package-error", /*optional=*/true, "Package validation error, if any (only possible if rawtxs had more than 1 transaction)."},
+                    {RPCResult::Type::BOOL, "allowed", /*optional=*/true, "Whether this tx would be accepted to the mempool and pass client-specified maxfeerate. "
+                                                       "If not present, the tx was not fully validated due to a failure in another tx in the list."},
+                    {RPCResult::Type::NUM, "vsize", /*optional=*/true, "Transaction size."},
+                    {RPCResult::Type::OBJ, "fees", /*optional=*/true, "Transaction fees (only present if 'allowed' is true)",
+                    {
+                        {RPCResult::Type::STR_AMOUNT, "base", "transaction fee in " + CURRENCY_UNIT},
+                    }},
+                    {RPCResult::Type::STR, "reject-reason", /*optional=*/true, "Rejection string (only present when 'allowed' is false)"},
+                }},
+            }
+        },
+        RPCExamples{
+            "\nCreate a transaction\n"
+            + HelpExampleCli("createrawtransaction", "\"[{\\\"txid\\\" : \\\"mytxid\\\",\\\"vout\\\":0}]\" \"{\\\"myaddress\\\":0.01}\"") +
+            "Sign the transaction, and get back the hex\n"
+            + HelpExampleCli("signrawtransactionwithwallet", "\"myhex\"") +
+            "\nTest acceptance of the transaction (signed hex)\n"
+            + HelpExampleCli("testmempoolaccept", R"('["signedhex"]')") +
+            "\nAs a JSON-RPC call\n"
+            + HelpExampleRpc("testmempoolaccept", "[\"signedhex\"]")
+                },
+        [&](const RPCHelpMan& self, const JSONRPCRequest& request) -> UniValue
+        {
+            RPCTypeCheck(request.params, {
+                UniValue::VARR,
+                UniValueType(), // VNUM or VSTR, checked inside AmountFromValue()
+            });
+            const UniValue raw_transactions = request.params[0].get_array();
+            if (raw_transactions.size() < 1 || raw_transactions.size() > MAX_PACKAGE_COUNT) {
+                throw JSONRPCError(RPC_INVALID_PARAMETER,
+                                   "Array must contain between 1 and " + ToString(MAX_PACKAGE_COUNT) + " transactions.");
+            }
+
+            const CFeeRate max_raw_tx_fee_rate = request.params[1].isNull() ?
+                                                     DEFAULT_MAX_RAW_TX_FEE_RATE :
+                                                     CFeeRate(AmountFromValue(request.params[1]));
+
+            std::vector<CTransactionRef> txns;
+            txns.reserve(raw_transactions.size());
+            for (const auto& rawtx : raw_transactions.getValues()) {
+                CMutableTransaction mtx;
+                if (!DecodeHexTx(mtx, rawtx.get_str())) {
+                    throw JSONRPCError(RPC_DESERIALIZATION_ERROR,
+                                       "TX decode failed: " + rawtx.get_str() + " Make sure the tx has at least one input.");
+                }
+                txns.emplace_back(MakeTransactionRef(std::move(mtx)));
+            }
+
+            NodeContext& node = EnsureAnyNodeContext(request.context);
+            CTxMemPool& mempool = EnsureMemPool(node);
+            ChainstateManager& chainman = EnsureChainman(node);
+            CChainState& chainstate = chainman.ActiveChainstate();
+            const PackageMempoolAcceptResult package_result = [&] {
+                LOCK(::cs_main);
+                if (txns.size() > 1) return ProcessNewPackage(chainstate, mempool, txns, /*test_accept=*/true);
+                return PackageMempoolAcceptResult(txns[0]->GetHash(),
+                       chainman.ProcessTransaction(txns[0], /*test_accept=*/true));
+            }();
+
+            UniValue rpc_result(UniValue::VARR);
+            // We will check transaction fees while we iterate through txns in order. If any transaction fee
+            // exceeds maxfeerate, we will leave the rest of the validation results blank, because it
+            // doesn't make sense to return a validation result for a transaction if its ancestor(s) would
+            // not be submitted.
+            bool exit_early{false};
+            for (const auto& tx : txns) {
+                UniValue result_inner(UniValue::VOBJ);
+                result_inner.pushKV("txid", tx->GetHash().GetHex());
+                if (package_result.m_state.GetResult() == PackageValidationResult::PCKG_POLICY) {
+                    result_inner.pushKV("package-error", package_result.m_state.GetRejectReason());
+                }
+                auto it = package_result.m_tx_results.find(tx->GetHash());
+                if (exit_early || it == package_result.m_tx_results.end()) {
+                    // Validation unfinished. Just return the txid.
+                    rpc_result.push_back(result_inner);
+                    continue;
+                }
+                const auto& tx_result = it->second;
+                // Package testmempoolaccept doesn't allow transactions to already be in the mempool.
+                CHECK_NONFATAL(tx_result.m_result_type != MempoolAcceptResult::ResultType::MEMPOOL_ENTRY);
+                if (tx_result.m_result_type == MempoolAcceptResult::ResultType::VALID) {
+                    const CAmount fee = tx_result.m_base_fees.value();
+                    // Check that fee does not exceed maximum fee
+                    const int64_t virtual_size = tx_result.m_vsize.value();
+                    const CAmount max_raw_tx_fee = max_raw_tx_fee_rate.GetFee(virtual_size);
+                    if (max_raw_tx_fee && fee > max_raw_tx_fee) {
+                        result_inner.pushKV("allowed", false);
+                        result_inner.pushKV("reject-reason", "max-fee-exceeded");
+                        exit_early = true;
+                    } else {
+                        // Only return the fee and vsize if the transaction would pass ATMP.
+                        // These can be used to calculate the feerate.
+                        result_inner.pushKV("allowed", true);
+                        result_inner.pushKV("vsize", virtual_size);
+                        UniValue fees(UniValue::VOBJ);
+                        fees.pushKV("base", ValueFromAmount(fee));
+                        result_inner.pushKV("fees", fees);
+                    }
+                } else {
+                    result_inner.pushKV("allowed", false);
+                    const TxValidationState state = tx_result.m_state;
+                    if (state.GetResult() == TxValidationResult::TX_MISSING_INPUTS) {
+                        result_inner.pushKV("reject-reason", "missing-inputs");
+                    } else {
+                        result_inner.pushKV("reject-reason", state.GetRejectReason());
+                    }
+                }
+                rpc_result.push_back(result_inner);
+            }
+            return rpc_result;
+        },
+    };
+}
+
+static std::vector<RPCResult> MempoolEntryDescription()
+{
+    return {
     RPCResult{RPCResult::Type::NUM, "vsize", "virtual transaction size. This can be different from actual serialized size for high-sigop transactions."},
     RPCResult{RPCResult::Type::STR_AMOUNT, "fee", /*optional=*/true,
               "transaction fee, denominated in " + CURRENCY_UNIT + " (DEPRECATED, returned only if config option -deprecatedrpc=fees is passed)"},
@@ -53,7 +264,8 @@ static std::vector<RPCResult> MempoolEntryDescription() { return {
         {RPCResult{RPCResult::Type::STR_HEX, "transactionid", "child transaction id"}}},
     RPCResult{RPCResult::Type::BOOL, "instantsend", "True if this transaction was locked via InstantSend"},
     RPCResult{RPCResult::Type::BOOL, "unbroadcast", "Whether this transaction is currently unbroadcast (initial broadcast not yet acknowledged by any peers)"}
-};}
+    };
+}
 
 static void entryToJSON(const CTxMemPool& pool, UniValue& info, const CTxMemPoolEntry& e, const llmq::CInstantSendManager* isman) EXCLUSIVE_LOCKS_REQUIRED(pool.cs)
 {
@@ -155,7 +367,7 @@ UniValue MempoolToJSON(const CTxMemPool& pool, const llmq::CInstantSendManager*
     }
 }
 
-RPCHelpMan getrawmempool()
+static RPCHelpMan getrawmempool()
 {
     return RPCHelpMan{"getrawmempool",
         "\nReturns all transaction ids in memory pool as a json array of string transaction ids.\n"
@@ -209,7 +421,7 @@ RPCHelpMan getrawmempool()
     };
 }
 
-RPCHelpMan getmempoolancestors()
+static RPCHelpMan getmempoolancestors()
 {
     return RPCHelpMan{"getmempoolancestors",
         "\nIf txid is in the mempool, returns all in-mempool ancestors.\n",
@@ -276,7 +488,7 @@ RPCHelpMan getmempoolancestors()
     };
 }
 
-RPCHelpMan getmempooldescendants()
+static RPCHelpMan getmempooldescendants()
 {
     return RPCHelpMan{"getmempooldescendants",
         "\nIf txid is in the mempool, returns all in-mempool descendants.\n",
@@ -344,7 +556,7 @@ RPCHelpMan getmempooldescendants()
     };
 }
 
-RPCHelpMan getmempoolentry()
+static RPCHelpMan getmempoolentry()
 {
     return RPCHelpMan{"getmempoolentry",
         "\nReturns mempool data for given transaction\n",
@@ -400,7 +612,7 @@ UniValue MempoolInfoToJSON(const CTxMemPool& pool, const llmq::CInstantSendManag
     return ret;
 }
 
-RPCHelpMan getmempoolinfo()
+static RPCHelpMan getmempoolinfo()
 {
     return RPCHelpMan{"getmempoolinfo",
         "\nReturns details on the active state of the TX memory pool.\n",
@@ -433,7 +645,7 @@ RPCHelpMan getmempoolinfo()
     };
 }
 
-RPCHelpMan savemempool()
+static RPCHelpMan savemempool()
 {
     return RPCHelpMan{"savemempool",
         "\nDumps the mempool to disk. It will fail until the previous dump is fully loaded.\n",
@@ -473,6 +685,8 @@ void RegisterMempoolRPCCommands(CRPCTable& t)
     static const CRPCCommand commands[]{
         // category     actor (function)
         // --------     ----------------
+        {"rawtransactions", &sendrawtransaction},
+        {"rawtransactions", &testmempoolaccept},
         {"blockchain", &getmempoolancestors},
         {"blockchain", &getmempooldescendants},
         {"blockchain", &getmempoolentry},
diff --git a/src/rpc/rawtransaction.cpp b/src/rpc/rawtransaction.cpp
index 151e48a162e9..48869e1f27df 100644
--- a/src/rpc/rawtransaction.cpp
+++ b/src/rpc/rawtransaction.cpp
@@ -40,7 +40,6 @@
 #include <uint256.h>
 #include <util/bip32.h>
 #include <util/check.h>
-#include <util/moneystr.h>
 #include <util/strencodings.h>
 #include <util/string.h>
 #include <util/translation.h>
@@ -62,7 +61,6 @@
 #include <univalue.h>
 
 using node::AnalyzePSBT;
-using node::DEFAULT_MAX_RAW_TX_FEE_RATE;
 using node::GetTransaction;
 using node::NodeContext;
 using node::PSBTAnalysis;
@@ -1006,212 +1004,6 @@ static RPCHelpMan signrawtransactionwithkey()
     };
 }
 
-RPCHelpMan sendrawtransaction()
-{
-    return RPCHelpMan{"sendrawtransaction",                "\nSubmit a raw transaction (serialized, hex-encoded) to local node and network.\n"
-                "\nThe transaction will be sent unconditionally to all peers, so using sendrawtransaction\n"
-                "for manual rebroadcast may degrade privacy by leaking the transaction's origin, as\n"
-                "nodes will normally not rebroadcast non-wallet transactions already in their mempool.\n"
-                "\nA specific exception, RPC_TRANSACTION_ALREADY_IN_CHAIN, may throw if the transaction cannot be added to the mempool.\n"
-                "\nRelated RPCs: createrawtransaction, signrawtransactionwithkey\n",
-                {
-                    {"hexstring", RPCArg::Type::STR_HEX, RPCArg::Optional::NO, "The hex string of the raw transaction"},
-                    {"maxfeerate", RPCArg::Type::AMOUNT, RPCArg::Default{FormatMoney(DEFAULT_MAX_RAW_TX_FEE_RATE.GetFeePerK())},
-                        "Reject transactions whose fee rate is higher than the specified value, expressed in " + CURRENCY_UNIT +
-                            "/kB.\nSet to 0 to accept any fee rate.\n"},
-                    {"instantsend", RPCArg::Type::BOOL, RPCArg::Optional::OMITTED, "Deprecated and ignored"},
-                    {"bypasslimits", RPCArg::Type::BOOL, RPCArg::Default{false}, "Bypass transaction policy limits"},
-                },
-                RPCResult{
-                    RPCResult::Type::STR_HEX, "", "The transaction hash in hex"
-                },
-                RPCExamples{
-            "\nCreate a transaction\n"
-            + HelpExampleCli("createrawtransaction", "\"[{\\\"txid\\\" : \\\"mytxid\\\",\\\"vout\\\":0}]\" \"{\\\"myaddress\\\":0.01}\"") +
-            "Sign the transaction, and get back the hex\n"
-            + HelpExampleCli("signrawtransactionwithwallet", "\"myhex\"") +
-            "\nSend the transaction (signed hex)\n"
-            + HelpExampleCli("sendrawtransaction", "\"signedhex\"") +
-            "\nAs a JSON-RPC call\n"
-            + HelpExampleRpc("sendrawtransaction", "\"signedhex\"")
-                },
-        [&](const RPCHelpMan& self, const JSONRPCRequest& request) -> UniValue
-{
-    RPCTypeCheck(request.params, {
-        UniValue::VSTR,
-        UniValueType(), // VNUM or VSTR, checked inside AmountFromValue()
-        UniValue::VBOOL
-    });
-
-    CMutableTransaction mtx;
-    if (!DecodeHexTx(mtx, request.params[0].get_str())) {
-        throw JSONRPCError(RPC_DESERIALIZATION_ERROR, "TX decode failed. Make sure the tx has at least one input.");
-    }
-    CTransactionRef tx(MakeTransactionRef(std::move(mtx)));
-
-    const CFeeRate max_raw_tx_fee_rate = request.params[1].isNull() ?
-                                             DEFAULT_MAX_RAW_TX_FEE_RATE :
-                                             CFeeRate(AmountFromValue(request.params[1]));
-
-    int64_t virtual_size = GetVirtualTransactionSize(*tx);
-    CAmount max_raw_tx_fee = max_raw_tx_fee_rate.GetFee(virtual_size);
-
-    bool bypass_limits = false;
-    if (!request.params[3].isNull()) bypass_limits = request.params[3].get_bool();
-    bilingual_str err_string;
-    AssertLockNotHeld(cs_main);
-    NodeContext& node = EnsureAnyNodeContext(request.context);
-    const TransactionError err = BroadcastTransaction(node, tx, err_string, max_raw_tx_fee, /*relay=*/true, /*wait_callback=*/true, bypass_limits);
-    if (TransactionError::OK != err) {
-        throw JSONRPCTransactionError(err, err_string.original);
-    }
-
-    return tx->GetHash().GetHex();
-},
-    };
-}
-
-static RPCHelpMan testmempoolaccept()
-{
-    return RPCHelpMan{"testmempoolaccept",
-                "\nReturns result of mempool acceptance tests indicating if raw transaction (serialized, hex-encoded) would be accepted by mempool.\n"
-                "\nIf multiple transactions are passed in, parents must come before children and package policies apply: the transactions cannot conflict with any mempool transactions or each other.\n"
-                "\nIf one transaction fails, other transactions may not be fully validated (the 'allowed' key will be blank).\n"
-                "\nThe maximum number of transactions allowed is " + ToString(MAX_PACKAGE_COUNT) + ".\n"
-                "\nThis checks if transactions violate the consensus or policy rules.\n"
-                "\nSee sendrawtransaction call.\n",
-                {
-                    {"rawtxs", RPCArg::Type::ARR, RPCArg::Optional::NO, "An array of hex strings of raw transactions.",
-                        {
-                            {"rawtx", RPCArg::Type::STR_HEX, RPCArg::Optional::OMITTED, ""},
-                        },
-                        },
-                    {"maxfeerate", RPCArg::Type::AMOUNT, RPCArg::Default{FormatMoney(DEFAULT_MAX_RAW_TX_FEE_RATE.GetFeePerK())},
-                     "Reject transactions whose fee rate is higher than the specified value, expressed in " + CURRENCY_UNIT + "/kB\n"},
-                },
-                RPCResult{
-                    RPCResult::Type::ARR, "", "The result of the mempool acceptance test for each raw transaction in the input array.\n"
-                        "Returns results for each transaction in the same order they were passed in.\n"
-                        "Transactions that cannot be fully validated due to failures in other transactions will not contain an 'allowed' result.\n",
-                    {
-                        {RPCResult::Type::OBJ, "", "",
-                        {
-                            {RPCResult::Type::STR_HEX, "txid", "The transaction hash in hex"},
-                            {RPCResult::Type::STR, "package-error", /*optional=*/true, "Package validation error, if any (only possible if rawtxs had more than 1 transaction)."},
-                            {RPCResult::Type::BOOL, "allowed", /*optional=*/true, "Whether this tx would be accepted to the mempool and pass client-specified maxfeerate. "
-                                                               "If not present, the tx was not fully validated due to a failure in another tx in the list."},
-                            {RPCResult::Type::NUM, "vsize", /*optional=*/true, "Transaction size."},
-                            {RPCResult::Type::OBJ, "fees", /*optional=*/true, "Transaction fees (only present if 'allowed' is true)",
-                            {
-                                {RPCResult::Type::STR_AMOUNT, "base", "transaction fee in " + CURRENCY_UNIT},
-                            }},
-                            {RPCResult::Type::STR, "reject-reason", /*optional=*/true, "Rejection string (only present when 'allowed' is false)"},
-                        }},
-                    }
-                },
-                RPCExamples{
-            "\nCreate a transaction\n"
-            + HelpExampleCli("createrawtransaction", "\"[{\\\"txid\\\" : \\\"mytxid\\\",\\\"vout\\\":0}]\" \"{\\\"myaddress\\\":0.01}\"") +
-            "Sign the transaction, and get back the hex\n"
-            + HelpExampleCli("signrawtransactionwithwallet", "\"myhex\"") +
-            "\nTest acceptance of the transaction (signed hex)\n"
-            + HelpExampleCli("testmempoolaccept", R"('["signedhex"]')") +
-            "\nAs a JSON-RPC call\n"
-            + HelpExampleRpc("testmempoolaccept", "[\"signedhex\"]")
-                },
-        [&](const RPCHelpMan& self, const JSONRPCRequest& request) -> UniValue
-{
-    RPCTypeCheck(request.params, {
-        UniValue::VARR,
-        UniValueType(), // VNUM or VSTR, checked inside AmountFromValue()
-    });
-    const UniValue raw_transactions = request.params[0].get_array();
-    if (raw_transactions.size() < 1 || raw_transactions.size() > MAX_PACKAGE_COUNT) {
-        throw JSONRPCError(RPC_INVALID_PARAMETER,
-                           "Array must contain between 1 and " + ToString(MAX_PACKAGE_COUNT) + " transactions.");
-    }
-
-    const CFeeRate max_raw_tx_fee_rate = request.params[1].isNull() ?
-                                             DEFAULT_MAX_RAW_TX_FEE_RATE :
-                                             CFeeRate(AmountFromValue(request.params[1]));
-
-    std::vector<CTransactionRef> txns;
-    txns.reserve(raw_transactions.size());
-    for (const auto& rawtx : raw_transactions.getValues()) {
-        CMutableTransaction mtx;
-        if (!DecodeHexTx(mtx, rawtx.get_str())) {
-            throw JSONRPCError(RPC_DESERIALIZATION_ERROR,
-                               "TX decode failed: " + rawtx.get_str() + " Make sure the tx has at least one input.");
-        }
-        txns.emplace_back(MakeTransactionRef(std::move(mtx)));
-    }
-
-    NodeContext& node = EnsureAnyNodeContext(request.context);
-    CTxMemPool& mempool = EnsureMemPool(node);
-    ChainstateManager& chainman = EnsureChainman(node);
-    CChainState& chainstate = chainman.ActiveChainstate();
-    const PackageMempoolAcceptResult package_result = [&] {
-        LOCK(::cs_main);
-        if (txns.size() > 1) return ProcessNewPackage(chainstate, mempool, txns, /*test_accept=*/true);
-        return PackageMempoolAcceptResult(txns[0]->GetHash(),
-               chainman.ProcessTransaction(txns[0], /*test_accept=*/true));
-    }();
-
-    UniValue rpc_result(UniValue::VARR);
-    // We will check transaction fees while we iterate through txns in order. If any transaction fee
-    // exceeds maxfeerate, we will leave the rest of the validation results blank, because it
-    // doesn't make sense to return a validation result for a transaction if its ancestor(s) would
-    // not be submitted.
-    bool exit_early{false};
-    for (const auto& tx : txns) {
-        UniValue result_inner(UniValue::VOBJ);
-        result_inner.pushKV("txid", tx->GetHash().GetHex());
-        if (package_result.m_state.GetResult() == PackageValidationResult::PCKG_POLICY) {
-            result_inner.pushKV("package-error", package_result.m_state.GetRejectReason());
-        }
-        auto it = package_result.m_tx_results.find(tx->GetHash());
-        if (exit_early || it == package_result.m_tx_results.end()) {
-            // Validation unfinished. Just return the txid.
-            rpc_result.push_back(result_inner);
-            continue;
-        }
-        const auto& tx_result = it->second;
-        // Package testmempoolaccept doesn't allow transactions to already be in the mempool.
-        CHECK_NONFATAL(tx_result.m_result_type != MempoolAcceptResult::ResultType::MEMPOOL_ENTRY);
-        if (tx_result.m_result_type == MempoolAcceptResult::ResultType::VALID) {
-            const CAmount fee = tx_result.m_base_fees.value();
-            // Check that fee does not exceed maximum fee
-            const int64_t virtual_size = tx_result.m_vsize.value();
-            const CAmount max_raw_tx_fee = max_raw_tx_fee_rate.GetFee(virtual_size);
-            if (max_raw_tx_fee && fee > max_raw_tx_fee) {
-                result_inner.pushKV("allowed", false);
-                result_inner.pushKV("reject-reason", "max-fee-exceeded");
-                exit_early = true;
-            } else {
-                // Only return the fee and vsize if the transaction would pass ATMP.
-                // These can be used to calculate the feerate.
-                result_inner.pushKV("allowed", true);
-                result_inner.pushKV("vsize", virtual_size);
-                UniValue fees(UniValue::VOBJ);
-                fees.pushKV("base", ValueFromAmount(fee));
-                result_inner.pushKV("fees", fees);
-            }
-        } else {
-            result_inner.pushKV("allowed", false);
-            const TxValidationState state = tx_result.m_state;
-            if (state.GetResult() == TxValidationResult::TX_MISSING_INPUTS) {
-                result_inner.pushKV("reject-reason", "missing-inputs");
-            } else {
-                result_inner.pushKV("reject-reason", state.GetRejectReason());
-            }
-        }
-        rpc_result.push_back(result_inner);
-    }
-    return rpc_result;
-},
-    };
-}
-
 static RPCHelpMan decodepsbt()
 {
     return RPCHelpMan{
@@ -2118,10 +1910,8 @@ static const CRPCCommand commands[] =
     { "rawtransactions",     &createrawtransaction,       },
     { "rawtransactions",     &decoderawtransaction,       },
     { "rawtransactions",     &decodescript,               },
-    { "rawtransactions",     &sendrawtransaction,         },
     { "rawtransactions",     &combinerawtransaction,      },
     { "rawtransactions",     &signrawtransactionwithkey,  },
-    { "rawtransactions",     &testmempoolaccept,          },
     { "rawtransactions",     &decodepsbt,                 },
     { "rawtransactions",     &combinepsbt,                },
     { "rawtransactions",     &finalizepsbt,               },

From f8effcfa892675b8c95a015b7da95278c25dfdd8 Mon Sep 17 00:00:00 2001
From: fanquake <fanquake@gmail.com>
Date: Mon, 28 Mar 2022 11:50:36 +0100
Subject: [PATCH 024/656] Merge bitcoin/bitcoin#24691: Fix getpeerinfo doc

faac877ffd38c3d8515c9e7b585546434f91b741 doc: Fix getpeerinfo doc (MarcoFalke)

Pull request description:

  * Replace `node` with `peer`
  * Remove unused `\n`
  * Mark optional fields optional. See commit 9344697e57bd23d955df493d0581193ca1dc7cca, found by #23083

ACKs for top commit:
  fanquake:
    ACK faac877ffd38c3d8515c9e7b585546434f91b741

Tree-SHA512: ae4d52a0dcf8e132d9084e632d65fa835b1e7d0ed5c3d45a360570414d1e20bc7fb6500ff9be94b784af1dec5badcd1304153b1a4a59a6c484a87d8afd88b8bd
---
 src/rpc/net.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/rpc/net.cpp b/src/rpc/net.cpp
index 866c5c858c76..e77eeba6cb8d 100644
--- a/src/rpc/net.cpp
+++ b/src/rpc/net.cpp
@@ -99,7 +99,7 @@ static RPCHelpMan getpeerinfo()
 {
     return RPCHelpMan{
         "getpeerinfo",
-        "\nReturns data about each connected network node as a json array of objects.\n",
+        "Returns data about each connected network peer as a json array of objects.",
         {},
         RPCResult{
             RPCResult::Type::ARR, "", "",
@@ -124,7 +124,7 @@ static RPCHelpMan getpeerinfo()
                     {RPCResult::Type::STR_HEX, "verified_pubkey_hash", "Only present when the peer is a masternode and successfully "
                                                                         "authenticated via MNAUTH. In this case, this field contains the "
                                                                         "hash of the masternode's operator public key"},
-                    {RPCResult::Type::BOOL, "relaytxes", "Whether peer has asked us to relay transactions to it"},
+                    {RPCResult::Type::BOOL, "relaytxes", /*optional=*/true, "Whether peer has asked us to relay transactions to it"},
                     {RPCResult::Type::NUM_TIME, "lastsend", "The " + UNIX_EPOCH_TIME + " of the last send"},
                     {RPCResult::Type::NUM_TIME, "lastrecv", "The " + UNIX_EPOCH_TIME + " of the last receive"},
                     {RPCResult::Type::NUM_TIME, "last_transaction", "The " + UNIX_EPOCH_TIME + " of the last valid transaction received from this peer"},

From 732abd061941d81cec010d2a604c2e4b2a4748d6 Mon Sep 17 00:00:00 2001
From: laanwj <126646+laanwj@users.noreply.github.com>
Date: Wed, 30 Mar 2022 13:41:45 +0200
Subject: [PATCH 025/656] Merge bitcoin/bitcoin#24374: contrib: refactor:
 simplify linearize scripts

254a63e097def1bf7e157c72ea9e4fff1eeb7a28 contrib: refactor: replace `hex_switchEndian` in linearize scripts (Sebastian Falbesoner)
3f863cfff1ec902454d64f82b12eb09bdb1eee04 contrib: refactor: simplify block header string routine in linearize-data.py (Sebastian Falbesoner)

Pull request description:

  This PR simplifies the linearization scripts `linearize-data.py` and `linearize-hashes.py` by replacing overly complicated cruft (block header hash string calculation, hex string reverse) with means of the Python3 standard library.

ACKs for top commit:
  laanwj:
    Code review ACK 254a63e097def1bf7e157c72ea9e4fff1eeb7a28

Tree-SHA512: 4a0e20e63bd11f23a190480b22dbc2f2a3070e2a4f3a01b8797f99bb5fc830185e91e6712c8ae97562f9a24a98aa4f19d52f02a3f5fcbe4c578ee88a41382d1d
---
 contrib/linearize/linearize-data.py   | 38 +++------------------------
 contrib/linearize/linearize-hashes.py |  7 +----
 2 files changed, 4 insertions(+), 41 deletions(-)

diff --git a/contrib/linearize/linearize-data.py b/contrib/linearize/linearize-data.py
index 04721f4ccd52..6f2b5eb2ba5b 100755
--- a/contrib/linearize/linearize-data.py
+++ b/contrib/linearize/linearize-data.py
@@ -20,41 +20,9 @@
 
 settings = {}
 
-def hex_switchEndian(s):
-    """ Switches the endianness of a hex string (in pairs of hex chars) """
-    pairList = [s[i:i+2].encode() for i in range(0, len(s), 2)]
-    return b''.join(pairList[::-1]).decode()
-
-def uint32(x):
-    return x & 0xffffffff
-
-def bytereverse(x):
-    return uint32(( ((x) << 24) | (((x) << 8) & 0x00ff0000) |
-               (((x) >> 8) & 0x0000ff00) | ((x) >> 24) ))
-
-def bufreverse(in_buf):
-    out_words = []
-    for i in range(0, len(in_buf), 4):
-        word = struct.unpack('@I', in_buf[i:i+4])[0]
-        out_words.append(struct.pack('@I', bytereverse(word)))
-    return b''.join(out_words)
-
-def wordreverse(in_buf):
-    out_words = []
-    for i in range(0, len(in_buf), 4):
-        out_words.append(in_buf[i:i+4])
-    out_words.reverse()
-    return b''.join(out_words)
-
-def calc_hdr_hash(blk_hdr):
-    return dash_hash.getPoWHash(blk_hdr)
-
 def calc_hash_str(blk_hdr):
-    hash = calc_hdr_hash(blk_hdr)
-    hash = bufreverse(hash)
-    hash = wordreverse(hash)
-    hash_str = hash.hex()
-    return hash_str
+    blk_hdr_hash = dash_hash.getPoWHash(blk_hdr)
+    return blk_hdr_hash[::-1].hex()
 
 def get_blk_dt(blk_hdr):
     members = struct.unpack("<I", blk_hdr[68:68+4])
@@ -70,7 +38,7 @@ def get_block_hashes(settings):
     for line in f:
         line = line.rstrip()
         if settings['rev_hash_bytes'] == 'true':
-            line = hex_switchEndian(line)
+            line = bytes.fromhex(line)[::-1].hex()
         blkindex.append(line)
 
     print("Read " + str(len(blkindex)) + " hashes")
diff --git a/contrib/linearize/linearize-hashes.py b/contrib/linearize/linearize-hashes.py
index 6e694ba5447e..373eafc76b41 100755
--- a/contrib/linearize/linearize-hashes.py
+++ b/contrib/linearize/linearize-hashes.py
@@ -17,11 +17,6 @@
 
 settings = {}
 
-def hex_switchEndian(s):
-    """ Switches the endianness of a hex string (in pairs of hex chars) """
-    pairList = [s[i:i+2].encode() for i in range(0, len(s), 2)]
-    return b''.join(pairList[::-1]).decode()
-
 class BitcoinRPC:
     def __init__(self, host, port, username, password):
         authpair = "%s:%s" % (username, password)
@@ -85,7 +80,7 @@ def get_block_hashes(settings, max_blocks_per_call=10000):
                 sys.exit(1)
             assert(resp_obj['id'] == x) # assume replies are in-sequence
             if settings['rev_hash_bytes'] == 'true':
-                resp_obj['result'] = hex_switchEndian(resp_obj['result'])
+                resp_obj['result'] = bytes.fromhex(resp_obj['result'])[::-1].hex()
             print(resp_obj['result'])
 
         height += num_blocks

From 7396f2d61da3b9e63a573f9752407c4e92fc527c Mon Sep 17 00:00:00 2001
From: fanquake <fanquake@gmail.com>
Date: Sat, 2 Apr 2022 09:43:14 +0100
Subject: [PATCH 026/656] Merge bitcoin/bitcoin#24594: doc: update
 release-process.md

ac45a43d894a50ada785c658c261446d6b881224 doc: update release-process.md (gruve-p)

Pull request description:

ACKs for top commit:
  achow101:
    ACK ac45a43d894a50ada785c658c261446d6b881224

Tree-SHA512: eb49310e5645fcab47c6a268221b688d0ae4ffb1cc6d66fc097da1feb61aa894fb00065c20cd2413b775b598f8c955d48240608107776e4f1016703d52a81212
---
 doc/release-process.md | 50 +++++++++++++++++++++---------------------
 1 file changed, 25 insertions(+), 25 deletions(-)

diff --git a/doc/release-process.md b/doc/release-process.md
index aca1c12e52da..e1f9cb5f4ed7 100644
--- a/doc/release-process.md
+++ b/doc/release-process.md
@@ -83,7 +83,7 @@ against other `guix-attest` signatures.
 git -C ./guix.sigs pull
 ```
 
-### Create the macOS SDK tarball: (first time, or when SDK version changes)
+### Create the macOS SDK tarball (first time, or when SDK version changes)
 
 _Note: this step can be skipped if [our CI](https://github.com/dashpay/dash/blob/master/ci/test/00_setup_env.sh#L64) still uses bitcoin's SDK package (see SDK_URL)_
 
@@ -91,7 +91,7 @@ Create the macOS SDK tarball, see the [macOS build
 instructions](build-osx.md#deterministic-macos-app-notes) for
 details.
 
-### Build and attest to build outputs:
+### Build and attest to build outputs
 
 Follow the relevant Guix README.md sections:
 - [Building](/contrib/guix/README.md#building)
@@ -99,16 +99,12 @@ Follow the relevant Guix README.md sections:
 
 _Note: we ship releases for only some supported HOSTs so consider providing limited `HOSTS` variable or run `./contrib/containers/guix/scripts/guix-start` instead of `./contrib/guix/guix-build` when building binaries for quicker builds that exclude the supported but not shipped HOSTs_
 
-### Verify other builders' signatures to your own. (Optional)
+### Verify other builders' signatures to your own (optional)
 
-Add other builders keys to your gpg keyring, and/or refresh keys: See `../dash/contrib/builder-keys/README.md`.
-
-Follow the relevant Guix README.md sections:
+- [Add other builders keys to your gpg keyring, and/or refresh keys](/contrib/builder-keys/README.md)
 - [Verifying build output attestations](/contrib/guix/README.md#verifying-build-output-attestations)
 
-### Next steps:
-
-Commit your signature to `guix.sigs`:
+### Commit your non codesigned signature to guix.sigs
 
 ```sh
 pushd guix.sigs
@@ -118,24 +114,22 @@ git push  # Assuming you can push to the guix.sigs tree
 popd
 ```
 
-Codesigner only: Create Windows/macOS detached signatures:
-- Only one person handles codesigning. Everyone else should skip to the next step.
-- Only once the Windows/macOS builds each have 3 matching signatures may they be signed with their respective release keys.
+## Codesigning
 
-Codesigner only: Sign the macOS binary:
+### macOS codesigner only: Create detached macOS signatures (assuming [signapple](https://github.com/achow101/signapple/) is installed and up to date with master branch)
 
 * Transfer `dashcore-osx-unsigned.tar.gz` to macOS for signing
 * Extract and sign:
 
     ```sh
     tar xf dashcore-osx-unsigned.tar.gz
-    ./detached-sig-create.sh -s "Key ID" -o runtime
+    ./detached-sig-create.sh /path/to/codesign.p12 -o runtime
     ```
 
 * Enter the keychain password and authorize the signature
-* Move `signature-osx.tar.gz` back to the guix-build host
+* `signature-osx.tar.gz` will be created
 
-Codesigner only: Sign the windows binaries:
+### Windows codesigner only: Create detached Windows signatures
 
 * Extract and sign:
 
@@ -147,10 +141,11 @@ Codesigner only: Sign the windows binaries:
 * Enter the passphrase for the key when prompted
 * `signature-win.tar.gz` will be created
 
-Code-signer only: It is advised to test that the code signature attaches properly prior to tagging by performing the `guix-codesign` step.
-However if this is done, once the release has been tagged in the bitcoin-detached-sigs repo, the `guix-codesign` step must be performed again in order for the guix attestation to be valid when compared against the attestations of non-codesigner builds.
+### Windows and macOS codesigners only: test code signatures
+It is advised to test that the code signature attaches properly prior to tagging by performing the `guix-codesign` step.
+However if this is done, once the release has been tagged in the dash-detached-sigs repo, the `guix-codesign` step must be performed again in order for the guix attestation to be valid when compared against the attestations of non-codesigner builds.
 
-Codesigner only: Commit the detached codesign payloads:
+### Windows and macOS codesigners only: Commit the detached codesign payloads
 
 ```sh
 pushd ~/dashcore-detached-sigs
@@ -165,15 +160,20 @@ git push
 popd
 ```
 
-Non-codesigners: wait for Windows/macOS detached signatures:
+### Non-codesigners: wait for Windows and macOS detached signatures
 
-- Once the Windows/macOS builds each have 3 matching signatures, they will be signed with their respective release keys.
+- Once the Windows and macOS builds each have 3 matching signatures, they will be signed with their respective release keys.
 - Detached signatures will then be committed to the [dash-detached-sigs](https://github.com/dashpay/dash-detached-sigs) repository, which can be combined with the unsigned apps to create signed binaries.
 
-Create (and optionally verify) the codesigned outputs:
-- [Codesigning](/contrib/guix/README.md#codesigning)
+### Create the codesigned build outputs
+- [Codesigning build outputs](/contrib/guix/README.md#codesigning-build-outputs)
+
+### Verify other builders' signatures to your own (optional)
+
+- [Add other builders keys to your gpg keyring, and/or refresh keys](/contrib/builder-keys/README.md)
+- [Verifying build output attestations](/contrib/guix/README.md#verifying-build-output-attestations)
 
-Commit your signature for the signed macOS/Windows binaries:
+### Commit your codesigned signature to guix.sigs (for the signed macOS/Windows binaries)
 
 ```sh
 pushd ./guix.sigs
@@ -183,7 +183,7 @@ git push  # Assuming you can push to the guix.sigs tree
 popd
 ```
 
-### After 3 or more people have guix-built and their results match:
+## After 3 or more people have guix-built and their results match
 
 * [ ] Combine the `all.SHA256SUMS.asc` file from all signers into `SHA256SUMS.asc`:
     ```sh

From 0ff6e93124c9f84af4496baaa835a454c9bb5826 Mon Sep 17 00:00:00 2001
From: MarcoFalke <falke.marco@gmail.com>
Date: Tue, 5 Apr 2022 09:10:58 +0200
Subject: [PATCH 027/656] Merge bitcoin/bitcoin#24583: doc: Add template for
 empty release notes

fa4943e8df2e1048a5030f1d93776ca2b9da7b8a doc: Add template for empty release notes (MarcoFalke)

Pull request description:

  * Move release process notes from the release notes to the release process documentation
  * Clarify that wallet RPC or Settings related release notes snippets should not be duplicated. I think it should be sufficient to only mention them in the wallet section and leave them out from the general RPC section.
  * Create an empty template to ensure the release notes can be cleared with a single `cp` command. Also, this ensures that the "no duplication" note isn't deleted again. (We used to have it in at least the 22.0 and 21.0 release notes: https://github.com/bitcoin/bitcoin/blob/master/doc/release-notes/release-notes-0.21.0.md#updated-settings , but it was lost in the 23.0 notes)

ACKs for top commit:
  laanwj:
    ACK fa4943e8df2e1048a5030f1d93776ca2b9da7b8a

Tree-SHA512: 808e100ee1e371f7746a479ddfb237c6895935cffefc0e49033505492a03288013d5c20386af30f2a7dca8ad0c0628bdb6673dcb5cc4fcf4d0183b0ec65ce941
---
 doc/release-notes-empty-template.md | 100 ++++++++++++++++++++++++++++
 doc/release-process.md              |   2 +-
 2 files changed, 101 insertions(+), 1 deletion(-)
 create mode 100644 doc/release-notes-empty-template.md

diff --git a/doc/release-notes-empty-template.md b/doc/release-notes-empty-template.md
new file mode 100644
index 000000000000..9a2d1a30c38b
--- /dev/null
+++ b/doc/release-notes-empty-template.md
@@ -0,0 +1,100 @@
+*The release notes draft is a temporary file that can be added to by anyone. See
+[/doc/developer-notes.md#release-notes](/doc/developer-notes.md#release-notes)
+for the process.*
+
+# Dash Core version *version*
+===============================
+
+This is a new minor version release, bringing various bugfixes and performance improvements.
+This release is **optional** for all nodes, although recommended.
+
+Please report bugs using the issue tracker at GitHub:
+
+  <https://github.com/dashpay/dash/issues>
+
+
+# Upgrading and downgrading
+
+## How to Upgrade
+
+If you are running an older version, shut it down. Wait until it has completely
+shut down (which might take a few minutes in some cases), then run the
+installer (on Windows) or just copy over `/Applications/Dash-Qt` (on Mac) or
+`dashd`/`dash-qt` (on Linux).
+
+## Downgrade warning
+
+### Downgrade to a version < *version*
+
+Downgrading to a version older than *version* may not be supported, and will
+likely require a reindex.
+
+# Release Notes
+
+Notable changes
+===============
+
+P2P and network changes
+-----------------------
+
+Updated RPCs
+------------
+
+
+Changes to wallet related RPCs can be found in the Wallet section below.
+
+New RPCs
+--------
+
+Build System
+------------
+
+Updated settings
+----------------
+
+
+Changes to GUI or wallet related settings can be found in the GUI or Wallet section below.
+
+New settings
+------------
+
+Tools and Utilities
+-------------------
+
+Wallet
+------
+
+GUI changes
+-----------
+
+Low-level changes
+=================
+
+RPC
+---
+
+Tests
+-----
+
+See detailed [set of changes][set-of-changes].
+
+# Credits
+
+Thanks to everyone who directly contributed to this release:
+
+-
+-
+-
+
+As well as everyone that submitted issues, reviewed pull requests and helped
+debug the release candidates.
+
+# Older releases
+
+These releases are considered obsolete. Old release notes can be found here:
+
+-
+-
+-
+
+[set-of-changes]: https://github.com/dashpay/dash/compare/*version*...dashpay:*version*
diff --git a/doc/release-process.md b/doc/release-process.md
index e1f9cb5f4ed7..f4fd46e8443d 100644
--- a/doc/release-process.md
+++ b/doc/release-process.md
@@ -9,7 +9,7 @@ Before every minor and major release:
 * [ ] Review ["Needs backport" labels](https://github.com/dashpay/dash/labels?q=backport).
 * [ ] Update DIPs with any changes introduced by this release (see [this pull request](https://github.com/dashpay/dips/pull/142) for an example)
 * [ ] Update version in `configure.ac` (don't forget to set `CLIENT_VERSION_IS_RELEASE` to `true`)
-* [ ] Write release notes (see below)
+* [ ] Write release notes (see below). To clear the release notes: `cp doc/release-notes-empty-template.md doc/release-notes.md`
 * [ ] Update `src/chainparams.cpp` `nMinimumChainWork` with information from the `getblockchaininfo` rpc.
 * [ ] Update `src/chainparams.cpp` `defaultAssumeValid` with information from the `getblockhash` rpc.
   - The selected value must not be orphaned so it may be useful to set the value two blocks back from the tip.

From 6855957a782e0393f7025bc29b4f7d9a5f875811 Mon Sep 17 00:00:00 2001
From: laanwj <126646+laanwj@users.noreply.github.com>
Date: Tue, 5 Apr 2022 15:40:51 +0200
Subject: [PATCH 028/656] Merge bitcoin/bitcoin#24710: Add concrete steps in
 doc/cjdns.md to easily find a friend

6a02355ae9e830ea40b5408acc564e9eb1da1378 Add and improve informational links in doc/cjdns.md (Jon Atack)
19538dd41ecd9f593ad56f1f5f3a2cb45ad2b4ef Add concrete steps in doc/cjdns.md to easily find a friend (Jon Atack)

Pull request description:

  and improve the informational links.  CJDNS functions with a friend-of-a-friend topology and a key hurdle to getting started is to find a public peer and set up an outbound connection to it. This update makes doing it much easier for people getting started.

  Credit to Vasil Dimov for an [IRC suggestion in October 2021](https://www.erisian.com.au/bitcoin-core-dev/log-2021-10-04.html#l-469) and to stickies-v for IRC discussions this week and the [testing guide](https://github.com/bitcoin-core/bitcoin-devwiki/wiki/23.0-Release-Candidate-Testing-Guide) that led me to redo these steps, provide feedback at https://github.com/bitcoin/bitcoin/issues/24706 and refine the added documentation here.

ACKs for top commit:
  dunxen:
    ACK 6a02355
  stickies-v:
    re-ACK [6a02355](https://github.com/bitcoin/bitcoin/commit/6a02355ae9e830ea40b5408acc564e9eb1da1378) even though I wasn't opposed to the "friend" terminology since it's the language CJDNS seems to use to denominate the peers you connect to directly in general. Not worth bikeshedding over though.
  lsilva01:
    Strong ACK 6a02355

Tree-SHA512: b2fa2a200a6a55a709486f7ed2d3830cabffbbffa61a0d211fcb666a918b5754d4e99a58c32909fe58540598066e6ff67bf2fa2fcd56b1b5dcff3c2162f6d962
---
 doc/cjdns.md | 35 ++++++++++++++++++++++++++++-------
 1 file changed, 28 insertions(+), 7 deletions(-)

diff --git a/doc/cjdns.md b/doc/cjdns.md
index df2228194ae9..5d44871fafac 100644
--- a/doc/cjdns.md
+++ b/doc/cjdns.md
@@ -10,7 +10,8 @@ CJDNS is like a distributed, shared VPN with multiple entry points where every
 participant can reach any other participant. All participants use addresses from
 the `fc00::/8` network (reserved IPv6 range). Installation and configuration is
 done outside of Dash Core, similarly to a VPN (either in the host/OS or on
-the network router).
+the network router). See https://github.com/cjdelisle/cjdns#readme and
+https://github.com/hyperboria/docs#hyperboriadocs for more information.
 
 Compared to IPv4/IPv6, CJDNS provides end-to-end encryption and protects nodes
 from traffic analysis and filtering.
@@ -23,17 +24,37 @@ somewhat centralized. I2P connections have a source address and I2P is slow.
 CJDNS is fast but does not hide the sender and the recipient from intermediate
 routers.
 
-## Installing CJDNS and connecting to the network
+## Installing CJDNS and finding a peer to connect to the network
 
 To install and set up CJDNS, follow the instructions at
-https://github.com/cjdelisle/cjdns#cjdns.
+https://github.com/cjdelisle/cjdns#how-to-install-cjdns.
 
-Don't skip steps
+You need to initiate an outbound connection to a peer on the CJDNS network
+before it will work with your Dash Core node. This is described in steps
 ["2. Find a friend"](https://github.com/cjdelisle/cjdns#2-find-a-friend) and
 ["3. Connect your node to your friend's
-node"](https://github.com/cjdelisle/cjdns#3-connect-your-node-to-your-friends-node).
-You need to be connected to the CJDNS network before it will work with your
-Dash Core node.
+node"](https://github.com/cjdelisle/cjdns#3-connect-your-node-to-your-friends-node)
+in the CJDNS documentation.
+
+One quick way to accomplish these two steps is to query for available public
+peers on [Hyperboria](https://github.com/hyperboria) by running the following:
+
+```
+git clone https://github.com/hyperboria/peers hyperboria-peers
+cd hyperboria-peers
+./testAvailable.py
+```
+
+For each peer, the `./testAvailable.py` script prints the filename of the peer's
+credentials followed by the ping result.
+
+Choose one or several peers, copy their credentials from their respective files,
+paste them into the relevant IPv4 or IPv6 "connectTo" JSON object in the
+`cjdroute.conf` file you created in step ["1. Generate a new configuration
+file"](https://github.com/cjdelisle/cjdns#1-generate-a-new-configuration-file),
+and save the file.
+
+## Launching CJDNS
 
 Typically, CJDNS might be launched from its directory with
 `sudo ./cjdroute < cjdroute.conf` and it sheds permissions after setting up the

From c62bea41659b56d365a8e8ea7040af141aba0aa0 Mon Sep 17 00:00:00 2001
From: Konstantin Akimov <knstqq@gmail.com>
Date: Tue, 26 Aug 2025 02:46:20 +0700
Subject: [PATCH 029/656] feat: create extra spk by default for mobile
 derivation path of CJ

---
 src/wallet/rpc/backup.cpp                 | 10 ++++++++++
 src/wallet/rpc/wallet.cpp                 |  2 +-
 src/wallet/scriptpubkeyman.cpp            |  6 +++---
 src/wallet/scriptpubkeyman.h              |  9 ++++++++-
 src/wallet/wallet.cpp                     |  7 ++++---
 test/functional/wallet_listdescriptors.py |  4 +++-
 test/functional/wallet_mnemonicbits.py    |  7 ++++---
 7 files changed, 33 insertions(+), 12 deletions(-)

diff --git a/src/wallet/rpc/backup.cpp b/src/wallet/rpc/backup.cpp
index 260b872c4c61..7c817361d6f3 100644
--- a/src/wallet/rpc/backup.cpp
+++ b/src/wallet/rpc/backup.cpp
@@ -4,6 +4,7 @@
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
 #include <chain.h>
+#include <chainparams.h>
 #include <clientversion.h>
 #include <core_io.h>
 #include <fs.h>
@@ -1976,6 +1977,7 @@ RPCHelpMan listdescriptors()
                     {RPCResult::Type::NUM, "timestamp", "The creation time of the descriptor"},
                     {RPCResult::Type::BOOL, "active", "Whether this descriptor is currently used to generate new addresses"},
                     {RPCResult::Type::BOOL, "internal", /*optional=*/true, "True if this descriptor is used to generate change addresses. False if this descriptor is used to generate receiving addresses; defined only for active descriptors"},
+                    {RPCResult::Type::BOOL, "coinjoin", /*optional=*/true, "True if this descriptor is used to generate CoinJoin addresses. False if this descriptor is used to generate receiving addresses; defined only for active descriptors"},
                     {RPCResult::Type::ARR_FIXED, "range", /*optional=*/true, "Defined only for ranged descriptors", {
                         {RPCResult::Type::NUM, "", "Range start inclusive"},
                         {RPCResult::Type::NUM, "", "Range end inclusive"},
@@ -2036,6 +2038,14 @@ RPCHelpMan listdescriptors()
         if (active && type != std::nullopt) {
             spk.pushKV("internal", wallet->GetScriptPubKeyMan(true) == desc_spk_man);
         }
+        if (type != std::nullopt) {
+            std::string match = strprintf("/9'/%s'/0'", Params().ExtCoinType());
+            bool is_cj = descriptor.size() > 5 && descriptor.find(match) != std::string::npos;
+            if (is_cj) {
+                spk.pushKV("internal", false);
+                spk.pushKV("coinjoin", is_cj);
+            }
+        }
         if (wallet_descriptor.descriptor->IsRange()) {
             UniValue range(UniValue::VARR);
             range.push_back(wallet_descriptor.range_start);
diff --git a/src/wallet/rpc/wallet.cpp b/src/wallet/rpc/wallet.cpp
index 61cdabfa70d3..d7fdae8cd609 100644
--- a/src/wallet/rpc/wallet.cpp
+++ b/src/wallet/rpc/wallet.cpp
@@ -168,7 +168,7 @@ static RPCHelpMan getwalletinfo()
                             {RPCResult::Type::NUM_TIME, "timefirstkey", "the " + UNIX_EPOCH_TIME + " of the oldest known key in the wallet"},
                             {RPCResult::Type::NUM_TIME, "keypoololdest", /*optional=*/true, "the " + UNIX_EPOCH_TIME + " of the oldest pre-generated key in the key pool. Legacy wallets only"},
                             {RPCResult::Type::NUM, "keypoolsize", "how many new keys are pre-generated (only counts external keys)"},
-                            {RPCResult::Type::NUM, "keypoolsize_hd_internal", /*optional=*/true, "how many new keys are pre-generated for internal use (used for change outputs, only appears if the wallet is using this feature, otherwise external keys are used)"},
+                            {RPCResult::Type::NUM, "keypoolsize_hd_internal", /*optional=*/ true, "how many new keys are pre-generated for internal use (used for change outputs and mobile coinjoin, only appears if the wallet is using this feature, otherwise external keys are used)"},
                             {RPCResult::Type::NUM, "keys_left", "how many new keys are left since last automatic backup"},
                             {RPCResult::Type::NUM_TIME, "unlocked_until", /*optional=*/true, "the " + UNIX_EPOCH_TIME + " until which the wallet is unlocked for transfers, or 0 if the wallet is locked (only present for passphrase-encrypted wallets)"},
                             {RPCResult::Type::STR_AMOUNT, "paytxfee", "the transaction fee configuration, set in " + CURRENCY_UNIT + "/kB"},
diff --git a/src/wallet/scriptpubkeyman.cpp b/src/wallet/scriptpubkeyman.cpp
index 3f685a30df7b..a7adf5708375 100644
--- a/src/wallet/scriptpubkeyman.cpp
+++ b/src/wallet/scriptpubkeyman.cpp
@@ -2074,7 +2074,7 @@ bool DescriptorScriptPubKeyMan::AddDescriptorKeyWithDB(WalletBatch& batch, const
     }
 }
 
-bool DescriptorScriptPubKeyMan::SetupDescriptorGeneration(const CExtKey& master_key, const SecureString& secure_mnemonic, const SecureString& secure_mnemonic_passphrase, bool internal)
+bool DescriptorScriptPubKeyMan::SetupDescriptorGeneration(const CExtKey& master_key, const SecureString& secure_mnemonic, const SecureString& secure_mnemonic_passphrase, InternalKey internal)
 {
     LOCK(cs_desc_man);
     assert(m_storage.IsWalletFlagSet(WALLET_FLAG_DESCRIPTORS));
@@ -2099,10 +2099,10 @@ bool DescriptorScriptPubKeyMan::SetupDescriptorGeneration(const CExtKey& master_
     std::string xpub = EncodeExtPubKey(master_key.Neuter());
 
     // Build descriptor string
-    std::string desc_prefix = strprintf("pkh(%s/44'/%d'", xpub, Params().ExtCoinType());
+    std::string desc_prefix = strprintf("pkh(%s/%d'/%d'", xpub, internal == InternalKey::CoinJoin ? 9 : 44, Params().ExtCoinType());
     std::string desc_suffix = "/*)";
 
-    std::string internal_path = internal ? "/1" : "/0";
+    std::string internal_path = (internal == InternalKey::Internal) ? "/1" : "/0";
     std::string desc_str = desc_prefix + "/0'" + internal_path + desc_suffix;
 
     // Make the descriptor
diff --git a/src/wallet/scriptpubkeyman.h b/src/wallet/scriptpubkeyman.h
index 12ff6590c8f9..273ddcf6fc8b 100644
--- a/src/wallet/scriptpubkeyman.h
+++ b/src/wallet/scriptpubkeyman.h
@@ -147,6 +147,13 @@ class CKeyPool
     }
 };
 
+enum class InternalKey
+{
+    External,
+    Internal,
+    CoinJoin,
+};
+
 /*
  * A class implementing ScriptPubKeyMan manages some (or all) scriptPubKeys used in a wallet.
  * It contains the scripts and keys related to the scriptPubKeys it manages.
@@ -575,7 +582,7 @@ class DescriptorScriptPubKeyMan : public ScriptPubKeyMan
     bool IsHDEnabled() const override;
 
     //! Setup descriptors based on the given CExtkey
-    bool SetupDescriptorGeneration(const CExtKey& master_key, const SecureString& secure_mnemonic, const SecureString& secure_mnemonic_passphrase, bool internal);
+    bool SetupDescriptorGeneration(const CExtKey& master_key, const SecureString& secure_mnemonic, const SecureString& secure_mnemonic_passphrase, InternalKey internal);
 
     bool HavePrivateKeys() const override;
 
diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp
index f5b38c98d579..469086122ada 100644
--- a/src/wallet/wallet.cpp
+++ b/src/wallet/wallet.cpp
@@ -3787,7 +3787,7 @@ void CWallet::SetupDescriptorScriptPubKeyMans(const SecureString& mnemonic_arg,
     CExtKey master_key;
     master_key.SetSeed(MakeByteSpan(seed_key));
 
-    for (bool internal : {false, true}) {
+    for (auto internal : {InternalKey::External, InternalKey::Internal, InternalKey::CoinJoin}) {
         { // OUTPUT_TYPE is only one: LEGACY
             auto spk_manager = std::unique_ptr<DescriptorScriptPubKeyMan>(new DescriptorScriptPubKeyMan(*this));
             if (IsCrypted()) {
@@ -3801,7 +3801,9 @@ void CWallet::SetupDescriptorScriptPubKeyMans(const SecureString& mnemonic_arg,
             spk_manager->SetupDescriptorGeneration(master_key, mnemonic, mnemonic_passphrase, internal);
             uint256 id = spk_manager->GetID();
             m_spk_managers[id] = std::move(spk_manager);
-            AddActiveScriptPubKeyMan(id, internal);
+            if (internal != InternalKey::CoinJoin) {
+                AddActiveScriptPubKeyMan(id, internal == InternalKey::Internal);
+            }
         }
     }
 }
@@ -3826,7 +3828,6 @@ void CWallet::LoadActiveScriptPubKeyMan(uint256 id, bool internal)
     auto& spk_mans_other = internal ? m_external_spk_managers : m_internal_spk_managers;
     auto spk_man = m_spk_managers.at(id).get();
     spk_mans = spk_man;
-
     if (spk_mans_other == spk_man) {
         spk_mans_other = nullptr;
     }
diff --git a/test/functional/wallet_listdescriptors.py b/test/functional/wallet_listdescriptors.py
index 28de6b2e313b..3c80745142ee 100755
--- a/test/functional/wallet_listdescriptors.py
+++ b/test/functional/wallet_listdescriptors.py
@@ -46,9 +46,11 @@ def run_test(self):
         node.createwallet(wallet_name='w3', descriptors=True)
         result = node.get_wallet_rpc('w3').listdescriptors()
         assert_equal("w3", result['wallet_name'])
-        assert_equal(2, len(result['descriptors']))
+        assert_equal(3, len(result['descriptors']))
         assert_equal(2, len([d for d in result['descriptors'] if d['active']]))
+        self.log.info(f"result: {result['descriptors']}")
         assert_equal(1, len([d for d in result['descriptors'] if d['internal']]))
+        assert_equal(1, len([d for d in result['descriptors'] if 'coinjoin' in d and d['coinjoin']]))
         for item in result['descriptors']:
             assert item['desc'] != ''
             assert item['next_index'] == 0
diff --git a/test/functional/wallet_mnemonicbits.py b/test/functional/wallet_mnemonicbits.py
index 6a9574f68327..744fee87b8c6 100755
--- a/test/functional/wallet_mnemonicbits.py
+++ b/test/functional/wallet_mnemonicbits.py
@@ -47,13 +47,14 @@ def run_test(self):
                 assert_equal(len(desc['mnemonic'].split()), 12)
                 mnemonic_count += 1
                 assert desc['mnemonic'] == mnemonic_pre
-                assert desc['active']
+                assert_equal(desc['active'], ("coinjoin" not in desc or not desc['coinjoin']))
+
             # there should 3 descriptors in total
             # One of them is inactive imported private key for coinbase. It has no mnemonic
             # Two other should be active and have mnemonic
-            assert_equal(mnemonic_count, 2)
+            assert_equal(mnemonic_count, 3)
             assert_equal(cb_count, 1)
-            assert_equal(len(descriptors), 3)
+            assert_equal(len(descriptors), 4)
         else:
             assert_equal(len(self.nodes[0].dumphdinfo()["mnemonic"].split()), 12)  # 12 words by default
             # legacy HD wallets could have only one chain

From dd3a40c21da3cb48ac900bf1c9b806ca4631fe61 Mon Sep 17 00:00:00 2001
From: Konstantin Akimov <knstqq@gmail.com>
Date: Fri, 5 Sep 2025 23:44:31 +0700
Subject: [PATCH 030/656] doc: adds release notes for CJ descriptor

---
 doc/release-notes-6835.md | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)
 create mode 100644 doc/release-notes-6835.md

diff --git a/doc/release-notes-6835.md b/doc/release-notes-6835.md
new file mode 100644
index 000000000000..294485a7570a
--- /dev/null
+++ b/doc/release-notes-6835.md
@@ -0,0 +1,21 @@
+Mobile CoinJoin Compatibility
+------------
+
+- Fixed an issue where CoinJoin funds mixed in Dash Android wallet were
+  invisible when importing the mnemonic into Dash Core. Descriptor Wallets now
+  include an additional default descriptor for mobile CoinJoin funds, ensuring
+  seamless wallet migration and complete fund visibility across different
+  Dash wallet implementations.
+
+- This is a breaking change that increases the default number of descriptors
+  from 2 to 3 on mainnet (internal, external, mobile CoinJoin) for newly created
+  descriptor wallets only - existing wallets are unaffected.
+
+
+Updated RPCs
+------------
+
+- The `listdescriptors` RPC now includes an optional coinjoin field to identify
+  CoinJoin descriptors.
+
+(#6835)

From fb47795e8568f40fe5ba19d4bf2af44f16b067e5 Mon Sep 17 00:00:00 2001
From: Konstantin Akimov <knstqq@gmail.com>
Date: Mon, 22 Sep 2025 15:07:28 +0700
Subject: [PATCH 031/656] refactor: use named consts for derivation purpose 9 &
 44

---
 src/wallet/hdchain.cpp         | 2 +-
 src/wallet/hdchain.h           | 6 ++++++
 src/wallet/scriptpubkeyman.cpp | 2 +-
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/wallet/hdchain.cpp b/src/wallet/hdchain.cpp
index cc7fc0f76924..5e1098876cbb 100644
--- a/src/wallet/hdchain.cpp
+++ b/src/wallet/hdchain.cpp
@@ -203,6 +203,6 @@ size_t CHDChain::CountAccounts()
 
 std::string CHDPubKey::GetKeyPath() const
 {
-    return strprintf("m/44'/%d'/%d'/%d/%d", Params().ExtCoinType(), nAccountIndex, nChangeIndex, extPubKey.nChild);
+    return strprintf("m/%d'/%d'/%d'/%d/%d", BIP32_PURPOSE_STANDARD, Params().ExtCoinType(), nAccountIndex, nChangeIndex, extPubKey.nChild);
 }
 } // namespace wallet
diff --git a/src/wallet/hdchain.h b/src/wallet/hdchain.h
index 28385e3d2fb9..3a1d21b36200 100644
--- a/src/wallet/hdchain.h
+++ b/src/wallet/hdchain.h
@@ -140,6 +140,12 @@ class CHDPubKey
 
     std::string GetKeyPath() const;
 };
+
+/** Purpose code used for DIP9 (feature derivation paths) */
+constexpr uint8_t BIP32_PURPOSE_FEATURE{9};
+/** Purpose code allotted to BIP 44 (standard derivation paths) */
+constexpr uint8_t BIP32_PURPOSE_STANDARD{44};
+
 } // namespace wallet
 
 #endif // BITCOIN_WALLET_HDCHAIN_H
diff --git a/src/wallet/scriptpubkeyman.cpp b/src/wallet/scriptpubkeyman.cpp
index a7adf5708375..28ecbbff3f68 100644
--- a/src/wallet/scriptpubkeyman.cpp
+++ b/src/wallet/scriptpubkeyman.cpp
@@ -2099,7 +2099,7 @@ bool DescriptorScriptPubKeyMan::SetupDescriptorGeneration(const CExtKey& master_
     std::string xpub = EncodeExtPubKey(master_key.Neuter());
 
     // Build descriptor string
-    std::string desc_prefix = strprintf("pkh(%s/%d'/%d'", xpub, internal == InternalKey::CoinJoin ? 9 : 44, Params().ExtCoinType());
+    std::string desc_prefix = strprintf("pkh(%s/%d'/%d'", xpub, internal == InternalKey::CoinJoin ? BIP32_PURPOSE_FEATURE : BIP32_PURPOSE_STANDARD, Params().ExtCoinType());
     std::string desc_suffix = "/*)";
 
     std::string internal_path = (internal == InternalKey::Internal) ? "/1" : "/0";

From 286b0074066808bb3ba7223bba0f390abbcb05a2 Mon Sep 17 00:00:00 2001
From: Konstantin Akimov <knstqq@gmail.com>
Date: Tue, 23 Sep 2025 21:31:52 +0700
Subject: [PATCH 032/656] refactor: drop useless check that string is longer
 than 5 chars

It's already checked by find()
---
 src/wallet/rpc/backup.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/wallet/rpc/backup.cpp b/src/wallet/rpc/backup.cpp
index 7c817361d6f3..e21da3ca8422 100644
--- a/src/wallet/rpc/backup.cpp
+++ b/src/wallet/rpc/backup.cpp
@@ -2039,8 +2039,8 @@ RPCHelpMan listdescriptors()
             spk.pushKV("internal", wallet->GetScriptPubKeyMan(true) == desc_spk_man);
         }
         if (type != std::nullopt) {
-            std::string match = strprintf("/9'/%s'/0'", Params().ExtCoinType());
-            bool is_cj = descriptor.size() > 5 && descriptor.find(match) != std::string::npos;
+            std::string match = strprintf("/%d'/%s'/0'", BIP32_PURPOSE_FEATURE, Params().ExtCoinType());
+            bool is_cj = descriptor.find(match) != std::string::npos;
             if (is_cj) {
                 spk.pushKV("internal", false);
                 spk.pushKV("coinjoin", is_cj);

From 859761cfcbb111de3091693d5cc48fface268ae8 Mon Sep 17 00:00:00 2001
From: Konstantin Akimov <knstqq@gmail.com>
Date: Thu, 25 Sep 2025 14:09:28 +0700
Subject: [PATCH 033/656] refactor: rename InternalKey to PathDerivationType

---
 src/wallet/scriptpubkeyman.cpp |  6 +++---
 src/wallet/scriptpubkeyman.h   | 10 +++++-----
 src/wallet/wallet.cpp          |  8 ++++----
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/wallet/scriptpubkeyman.cpp b/src/wallet/scriptpubkeyman.cpp
index 28ecbbff3f68..8922ac00ae3b 100644
--- a/src/wallet/scriptpubkeyman.cpp
+++ b/src/wallet/scriptpubkeyman.cpp
@@ -2074,7 +2074,7 @@ bool DescriptorScriptPubKeyMan::AddDescriptorKeyWithDB(WalletBatch& batch, const
     }
 }
 
-bool DescriptorScriptPubKeyMan::SetupDescriptorGeneration(const CExtKey& master_key, const SecureString& secure_mnemonic, const SecureString& secure_mnemonic_passphrase, InternalKey internal)
+bool DescriptorScriptPubKeyMan::SetupDescriptorGeneration(const CExtKey& master_key, const SecureString& secure_mnemonic, const SecureString& secure_mnemonic_passphrase, PathDerivationType type)
 {
     LOCK(cs_desc_man);
     assert(m_storage.IsWalletFlagSet(WALLET_FLAG_DESCRIPTORS));
@@ -2099,10 +2099,10 @@ bool DescriptorScriptPubKeyMan::SetupDescriptorGeneration(const CExtKey& master_
     std::string xpub = EncodeExtPubKey(master_key.Neuter());
 
     // Build descriptor string
-    std::string desc_prefix = strprintf("pkh(%s/%d'/%d'", xpub, internal == InternalKey::CoinJoin ? BIP32_PURPOSE_FEATURE : BIP32_PURPOSE_STANDARD, Params().ExtCoinType());
+    std::string desc_prefix = strprintf("pkh(%s/%d'/%d'", xpub, type == PathDerivationType::DIP0009_CoinJoin ? BIP32_PURPOSE_FEATURE : BIP32_PURPOSE_STANDARD, Params().ExtCoinType());
     std::string desc_suffix = "/*)";
 
-    std::string internal_path = (internal == InternalKey::Internal) ? "/1" : "/0";
+    std::string internal_path = (type == PathDerivationType::BIP44_Internal) ? "/1" : "/0";
     std::string desc_str = desc_prefix + "/0'" + internal_path + desc_suffix;
 
     // Make the descriptor
diff --git a/src/wallet/scriptpubkeyman.h b/src/wallet/scriptpubkeyman.h
index 273ddcf6fc8b..7f4ee75c413b 100644
--- a/src/wallet/scriptpubkeyman.h
+++ b/src/wallet/scriptpubkeyman.h
@@ -147,11 +147,11 @@ class CKeyPool
     }
 };
 
-enum class InternalKey
+enum class PathDerivationType
 {
-    External,
-    Internal,
-    CoinJoin,
+    BIP44_External,
+    BIP44_Internal,
+    DIP0009_CoinJoin,
 };
 
 /*
@@ -582,7 +582,7 @@ class DescriptorScriptPubKeyMan : public ScriptPubKeyMan
     bool IsHDEnabled() const override;
 
     //! Setup descriptors based on the given CExtkey
-    bool SetupDescriptorGeneration(const CExtKey& master_key, const SecureString& secure_mnemonic, const SecureString& secure_mnemonic_passphrase, InternalKey internal);
+    bool SetupDescriptorGeneration(const CExtKey& master_key, const SecureString& secure_mnemonic, const SecureString& secure_mnemonic_passphrase, PathDerivationType type);
 
     bool HavePrivateKeys() const override;
 
diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp
index 469086122ada..e9c09e8186e0 100644
--- a/src/wallet/wallet.cpp
+++ b/src/wallet/wallet.cpp
@@ -3787,7 +3787,7 @@ void CWallet::SetupDescriptorScriptPubKeyMans(const SecureString& mnemonic_arg,
     CExtKey master_key;
     master_key.SetSeed(MakeByteSpan(seed_key));
 
-    for (auto internal : {InternalKey::External, InternalKey::Internal, InternalKey::CoinJoin}) {
+    for (auto type : {PathDerivationType::BIP44_External, PathDerivationType::BIP44_Internal, PathDerivationType::DIP0009_CoinJoin}) {
         { // OUTPUT_TYPE is only one: LEGACY
             auto spk_manager = std::unique_ptr<DescriptorScriptPubKeyMan>(new DescriptorScriptPubKeyMan(*this));
             if (IsCrypted()) {
@@ -3798,11 +3798,11 @@ void CWallet::SetupDescriptorScriptPubKeyMans(const SecureString& mnemonic_arg,
                     throw std::runtime_error(std::string(__func__) + ": Could not encrypt new descriptors");
                 }
             }
-            spk_manager->SetupDescriptorGeneration(master_key, mnemonic, mnemonic_passphrase, internal);
+            spk_manager->SetupDescriptorGeneration(master_key, mnemonic, mnemonic_passphrase, type);
             uint256 id = spk_manager->GetID();
             m_spk_managers[id] = std::move(spk_manager);
-            if (internal != InternalKey::CoinJoin) {
-                AddActiveScriptPubKeyMan(id, internal == InternalKey::Internal);
+            if (type != PathDerivationType::DIP0009_CoinJoin) {
+                AddActiveScriptPubKeyMan(id, type == PathDerivationType::BIP44_Internal);
             }
         }
     }

From 32fd4611fe0a6ed16888c755834b2024ccd79474 Mon Sep 17 00:00:00 2001
From: Konstantin Akimov <knstqq@gmail.com>
Date: Thu, 25 Sep 2025 14:13:19 +0700
Subject: [PATCH 034/656] fmt: clang format

---
 src/wallet/hdchain.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/wallet/hdchain.cpp b/src/wallet/hdchain.cpp
index 5e1098876cbb..3f50b1415e45 100644
--- a/src/wallet/hdchain.cpp
+++ b/src/wallet/hdchain.cpp
@@ -203,6 +203,7 @@ size_t CHDChain::CountAccounts()
 
 std::string CHDPubKey::GetKeyPath() const
 {
-    return strprintf("m/%d'/%d'/%d'/%d/%d", BIP32_PURPOSE_STANDARD, Params().ExtCoinType(), nAccountIndex, nChangeIndex, extPubKey.nChild);
+    return strprintf("m/%d'/%d'/%d'/%d/%d", BIP32_PURPOSE_STANDARD, Params().ExtCoinType(), nAccountIndex, nChangeIndex,
+                     extPubKey.nChild);
 }
 } // namespace wallet

From c821702423c4b1f7bac54f1fba7fee66236ef8f8 Mon Sep 17 00:00:00 2001
From: Konstantin Akimov <knstqq@gmail.com>
Date: Tue, 30 Sep 2025 03:47:13 +0700
Subject: [PATCH 035/656] fix: derivation path for cj - add missing /4' (cj
 purpose)

---
 src/wallet/rpc/backup.cpp      | 2 +-
 src/wallet/scriptpubkeyman.cpp | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/wallet/rpc/backup.cpp b/src/wallet/rpc/backup.cpp
index e21da3ca8422..506053f0e57b 100644
--- a/src/wallet/rpc/backup.cpp
+++ b/src/wallet/rpc/backup.cpp
@@ -2039,7 +2039,7 @@ RPCHelpMan listdescriptors()
             spk.pushKV("internal", wallet->GetScriptPubKeyMan(true) == desc_spk_man);
         }
         if (type != std::nullopt) {
-            std::string match = strprintf("/%d'/%s'/0'", BIP32_PURPOSE_FEATURE, Params().ExtCoinType());
+            std::string match = strprintf("/%d'/%s'/4'/0'", BIP32_PURPOSE_FEATURE, Params().ExtCoinType());
             bool is_cj = descriptor.find(match) != std::string::npos;
             if (is_cj) {
                 spk.pushKV("internal", false);
diff --git a/src/wallet/scriptpubkeyman.cpp b/src/wallet/scriptpubkeyman.cpp
index 8922ac00ae3b..28c354dd6997 100644
--- a/src/wallet/scriptpubkeyman.cpp
+++ b/src/wallet/scriptpubkeyman.cpp
@@ -2100,8 +2100,10 @@ bool DescriptorScriptPubKeyMan::SetupDescriptorGeneration(const CExtKey& master_
 
     // Build descriptor string
     std::string desc_prefix = strprintf("pkh(%s/%d'/%d'", xpub, type == PathDerivationType::DIP0009_CoinJoin ? BIP32_PURPOSE_FEATURE : BIP32_PURPOSE_STANDARD, Params().ExtCoinType());
+    if (type == PathDerivationType::DIP0009_CoinJoin) {
+        desc_prefix += "/4'";
+    }
     std::string desc_suffix = "/*)";
-
     std::string internal_path = (type == PathDerivationType::BIP44_Internal) ? "/1" : "/0";
     std::string desc_str = desc_prefix + "/0'" + internal_path + desc_suffix;
 

From 8a49279541030356ebd7b1304977752b90b07eb2 Mon Sep 17 00:00:00 2001
From: Konstantin Akimov <knstqq@gmail.com>
Date: Tue, 30 Sep 2025 03:51:37 +0700
Subject: [PATCH 036/656] fix: rpc improvements for CJ derivation path

Co-authored-by: UdjinM6 <UdjinM6@users.noreply.github.com>
---
 src/wallet/rpc/backup.cpp | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/src/wallet/rpc/backup.cpp b/src/wallet/rpc/backup.cpp
index 506053f0e57b..7c4d192bfa0d 100644
--- a/src/wallet/rpc/backup.cpp
+++ b/src/wallet/rpc/backup.cpp
@@ -1977,7 +1977,7 @@ RPCHelpMan listdescriptors()
                     {RPCResult::Type::NUM, "timestamp", "The creation time of the descriptor"},
                     {RPCResult::Type::BOOL, "active", "Whether this descriptor is currently used to generate new addresses"},
                     {RPCResult::Type::BOOL, "internal", /*optional=*/true, "True if this descriptor is used to generate change addresses. False if this descriptor is used to generate receiving addresses; defined only for active descriptors"},
-                    {RPCResult::Type::BOOL, "coinjoin", /*optional=*/true, "True if this descriptor is used to generate CoinJoin addresses. False if this descriptor is used to generate receiving addresses; defined only for active descriptors"},
+                    {RPCResult::Type::BOOL, "coinjoin", /*optional=*/true, "True if this descriptor is used to generate CoinJoin addresses. False if this descriptor is used to generate receiving addresses."},
                     {RPCResult::Type::ARR_FIXED, "range", /*optional=*/true, "Defined only for ranged descriptors", {
                         {RPCResult::Type::NUM, "", "Range start inclusive"},
                         {RPCResult::Type::NUM, "", "Range end inclusive"},
@@ -2041,10 +2041,7 @@ RPCHelpMan listdescriptors()
         if (type != std::nullopt) {
             std::string match = strprintf("/%d'/%s'/4'/0'", BIP32_PURPOSE_FEATURE, Params().ExtCoinType());
             bool is_cj = descriptor.find(match) != std::string::npos;
-            if (is_cj) {
-                spk.pushKV("internal", false);
-                spk.pushKV("coinjoin", is_cj);
-            }
+            spk.pushKV("coinjoin", is_cj);
         }
         if (wallet_descriptor.descriptor->IsRange()) {
             UniValue range(UniValue::VARR);

From b957689d6edca231bdf398e4bb124687814da3d4 Mon Sep 17 00:00:00 2001
From: Konstantin Akimov <knstqq@gmail.com>
Date: Tue, 30 Sep 2025 13:47:00 +0700
Subject: [PATCH 037/656] fix: functional tests after RPC changes

---
 src/wallet/rpc/backup.cpp                 | 6 ++++--
 test/functional/wallet_listdescriptors.py | 2 +-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/wallet/rpc/backup.cpp b/src/wallet/rpc/backup.cpp
index 7c4d192bfa0d..1e3cf53c5293 100644
--- a/src/wallet/rpc/backup.cpp
+++ b/src/wallet/rpc/backup.cpp
@@ -1977,7 +1977,7 @@ RPCHelpMan listdescriptors()
                     {RPCResult::Type::NUM, "timestamp", "The creation time of the descriptor"},
                     {RPCResult::Type::BOOL, "active", "Whether this descriptor is currently used to generate new addresses"},
                     {RPCResult::Type::BOOL, "internal", /*optional=*/true, "True if this descriptor is used to generate change addresses. False if this descriptor is used to generate receiving addresses; defined only for active descriptors"},
-                    {RPCResult::Type::BOOL, "coinjoin", /*optional=*/true, "True if this descriptor is used to generate CoinJoin addresses. False if this descriptor is used to generate receiving addresses."},
+                    {RPCResult::Type::BOOL, "coinjoin", /*optional=*/true, "True if this descriptor is used to generate CoinJoin addresses; defined only if it is True."},
                     {RPCResult::Type::ARR_FIXED, "range", /*optional=*/true, "Defined only for ranged descriptors", {
                         {RPCResult::Type::NUM, "", "Range start inclusive"},
                         {RPCResult::Type::NUM, "", "Range end inclusive"},
@@ -2041,7 +2041,9 @@ RPCHelpMan listdescriptors()
         if (type != std::nullopt) {
             std::string match = strprintf("/%d'/%s'/4'/0'", BIP32_PURPOSE_FEATURE, Params().ExtCoinType());
             bool is_cj = descriptor.find(match) != std::string::npos;
-            spk.pushKV("coinjoin", is_cj);
+            if (is_cj) {
+                spk.pushKV("coinjoin", is_cj);
+            }
         }
         if (wallet_descriptor.descriptor->IsRange()) {
             UniValue range(UniValue::VARR);
diff --git a/test/functional/wallet_listdescriptors.py b/test/functional/wallet_listdescriptors.py
index 3c80745142ee..bd0c18d18e64 100755
--- a/test/functional/wallet_listdescriptors.py
+++ b/test/functional/wallet_listdescriptors.py
@@ -49,7 +49,7 @@ def run_test(self):
         assert_equal(3, len(result['descriptors']))
         assert_equal(2, len([d for d in result['descriptors'] if d['active']]))
         self.log.info(f"result: {result['descriptors']}")
-        assert_equal(1, len([d for d in result['descriptors'] if d['internal']]))
+        assert_equal(1, len([d for d in result['descriptors'] if 'internal' in d and d['internal']]))
         assert_equal(1, len([d for d in result['descriptors'] if 'coinjoin' in d and d['coinjoin']]))
         for item in result['descriptors']:
             assert item['desc'] != ''

From 5205b614afb0eb61255ee39381bcd39153265a65 Mon Sep 17 00:00:00 2001
From: UdjinM6 <UdjinM6@users.noreply.github.com>
Date: Wed, 1 Oct 2025 19:59:22 +0300
Subject: [PATCH 038/656] fix: wrap the whole text in a global span to control
 its styling properly

---
 src/qt/sendcoinsdialog.cpp | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/qt/sendcoinsdialog.cpp b/src/qt/sendcoinsdialog.cpp
index bc5011db329e..15b22a54d230 100644
--- a/src/qt/sendcoinsdialog.cpp
+++ b/src/qt/sendcoinsdialog.cpp
@@ -362,6 +362,9 @@ bool SendCoinsDialog::send(const QList<SendCoinsRecipient>& recipients, QString&
         formatted_short.erase(formatted_short.begin() + MAX_SEND_POPUP_ENTRIES, formatted_short.end());
     }
 
+    // Wrap the whole text in a global span to control its styling properly
+    question_string.append("<span style='font-weight:normal;'>");
+
     /*: Message displayed when attempting to create a transaction. Cautionary text to prompt the user to verify
         that the displayed transaction details represent the transaction the user intends to create. */
     question_string.append(tr("Do you want to create this transaction?"));
@@ -463,6 +466,9 @@ bool SendCoinsDialog::send(const QList<SendCoinsRecipient>& recipients, QString&
     question_string.append(QString("<br /><span style='font-size:10pt; font-weight:normal;'>(=%1)</span>")
         .arg(alternativeUnits.join(" " + tr("or") + " ")));
 
+    // Close the global span we opened at the very beginning
+    question_string.append("</span>");
+
     if (formatted.size() > 1) {
         informative_text = tr("To review recipient list click \"Show Details…\"");
         detailed_text = formatted.join("\n\n");

From 732ef96f02762b139c15ca95c5c34d67d8eb326a Mon Sep 17 00:00:00 2001
From: UdjinM6 <UdjinM6@users.noreply.github.com>
Date: Wed, 1 Oct 2025 20:01:18 +0300
Subject: [PATCH 039/656] fix: typo: B in PSBT is Blockchain in our codebase

---
 src/qt/sendcoinsdialog.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/qt/sendcoinsdialog.cpp b/src/qt/sendcoinsdialog.cpp
index 15b22a54d230..ee9deeacaea8 100644
--- a/src/qt/sendcoinsdialog.cpp
+++ b/src/qt/sendcoinsdialog.cpp
@@ -376,12 +376,12 @@ bool SendCoinsDialog::send(const QList<SendCoinsRecipient>& recipients, QString&
         /*: Text to inform a user attempting to create a transaction of their current options. At this stage,
             a user can only create a PSBT. This string is displayed when private keys are disabled and an external
             signer is not available. */
-        question_string.append(tr("Please, review your transaction proposal. This will produce a Partially Signed Bitcoin Transaction (PSBT) which you can save or copy and then sign with e.g. an offline %1 wallet, or a PSBT-compatible hardware wallet.").arg(PACKAGE_NAME));
+        question_string.append(tr("Please, review your transaction proposal. This will produce a Partially Signed Blockchain Transaction (PSBT) which you can save or copy and then sign with e.g. an offline %1 wallet, or a PSBT-compatible hardware wallet.").arg(PACKAGE_NAME));
     } else if (model->getOptionsModel()->getEnablePSBTControls()) {
         /*: Text to inform a user attempting to create a transaction of their current options. At this stage,
             a user can send their transaction or create a PSBT. This string is displayed when both private keys
             and PSBT controls are enabled. */
-        question_string.append(tr("Please, review your transaction. You can create and send this transaction or create a Partially Signed Bitcoin Transaction (PSBT), which you can save or copy and then sign with, e.g., an offline %1 wallet, or a PSBT-compatible hardware wallet.").arg(PACKAGE_NAME));
+        question_string.append(tr("Please, review your transaction. You can create and send this transaction or create a Partially Signed Blockchain Transaction (PSBT), which you can save or copy and then sign with, e.g., an offline %1 wallet, or a PSBT-compatible hardware wallet.").arg(PACKAGE_NAME));
     } else {
         /*: Text to prompt a user to review the details of the transaction they are attempting to send. */
         question_string.append(tr("Please, review your transaction."));

From 2f27744f966a84db10d31e09f5bec71f070031c6 Mon Sep 17 00:00:00 2001
From: UdjinM6 <UdjinM6@users.noreply.github.com>
Date: Wed, 1 Oct 2025 23:52:15 +0300
Subject: [PATCH 040/656] fix: typo: add missing whitespace

---
 src/qt/sendcoinsdialog.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/qt/sendcoinsdialog.cpp b/src/qt/sendcoinsdialog.cpp
index ee9deeacaea8..26ffc2309a3d 100644
--- a/src/qt/sendcoinsdialog.cpp
+++ b/src/qt/sendcoinsdialog.cpp
@@ -444,7 +444,7 @@ bool SendCoinsDialog::send(const QList<SendCoinsRecipient>& recipients, QString&
             question_string.append("<br />");
             question_string.append("<span style='" + GUIUtil::getThemedStyleQString(GUIUtil::ThemedStyle::TS_WARNING) + "'>");
             question_string.append(tr("Warning: Using %1 with %2 or more inputs can harm your privacy and is not recommended").arg(strCoinJoinName).arg(10));
-            question_string.append("<a style='" + GUIUtil::getThemedStyleQString(GUIUtil::ThemedStyle::TS_COMMAND) + "' href=\"https://docs.dash.org/en/stable/wallets/dashcore/coinjoin-instantsend.html#inputs\">");
+            question_string.append(" <a style='" + GUIUtil::getThemedStyleQString(GUIUtil::ThemedStyle::TS_COMMAND) + "' href=\"https://docs.dash.org/en/stable/wallets/dashcore/coinjoin-instantsend.html#inputs\">");
             question_string.append(tr("Click to learn more"));
             question_string.append("</a>");
             question_string.append("</span> ");

From ca4a36409c3a6416559ef75fdbeab14a6bd7d428 Mon Sep 17 00:00:00 2001
From: PastaBot <156604295+DashCoreAutoGuix@users.noreply.github.com>
Date: Tue, 30 Sep 2025 09:33:27 -0500
Subject: [PATCH 041/656] Merge bitcoin-core/gui#752: Modify command line help
 to show support for BIP21 URIs

Co-authored-by: Hernan Marino <hmarino@gmail.com>

fixup 752

Co-authored-by: UdjinM6 <UdjinM6@users.noreply.github.com>
---
 src/qt/utilitydialog.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/qt/utilitydialog.cpp b/src/qt/utilitydialog.cpp
index a57217e09e70..a6ae662d39c7 100644
--- a/src/qt/utilitydialog.cpp
+++ b/src/qt/utilitydialog.cpp
@@ -62,7 +62,8 @@ HelpMessageDialog::HelpMessageDialog(QWidget *parent, HelpMode helpMode) :
         ui->helpMessage->setVisible(false);
     } else if (helpMode == cmdline) {
         setWindowTitle(tr("Command-line options"));
-        QString header = "Usage:  dash-qt [command-line options]                     \n";
+        QString header = "Usage: dash-qt [command-line options] [URI]\n\n"
+                         "Optional URI is a Dash address in BIP21 URI format.\n";
         QTextCursor cursor(ui->helpMessage->document());
         cursor.insertText(version);
         cursor.insertBlock();

From a7cca6c3776fb5e3ccf2f52fcbeebc207662d932 Mon Sep 17 00:00:00 2001
From: PastaBot <156604295+DashCoreAutoGuix@users.noreply.github.com>
Date: Tue, 30 Sep 2025 09:33:49 -0500
Subject: [PATCH 042/656] Merge bitcoin-core/gui#553: Change address / amount
 error background

Co-authored-by: backport <backport@local>
Co-authored-by: Claude <noreply@anthropic.com>
---
 src/qt/guiutil.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/qt/guiutil.cpp b/src/qt/guiutil.cpp
index ae9f29e2cd4c..728d861fb5ba 100644
--- a/src/qt/guiutil.cpp
+++ b/src/qt/guiutil.cpp
@@ -175,7 +175,7 @@ static const std::map<ThemedColor, QColor> themedDarkColors = {
 };
 
 static const std::map<ThemedStyle, QString> themedStyles = {
-    { ThemedStyle::TS_INVALID, "background:#a84832;" },
+    { ThemedStyle::TS_INVALID, "border: 3px solid #a84832;" },
     { ThemedStyle::TS_ERROR, "color:#a84832;" },
     { ThemedStyle::TS_WARNING, "color:#999900;" },
     { ThemedStyle::TS_SUCCESS, "color:#5e8c41;" },
@@ -185,7 +185,7 @@ static const std::map<ThemedStyle, QString> themedStyles = {
 };
 
 static const std::map<ThemedStyle, QString> themedDarkStyles = {
-    { ThemedStyle::TS_INVALID, "background:#a84832;" },
+    { ThemedStyle::TS_INVALID, "border: 3px solid #a84832;" },
     { ThemedStyle::TS_ERROR, "color:#a84832;" },
     { ThemedStyle::TS_WARNING, "color:#999900;" },
     { ThemedStyle::TS_SUCCESS, "color:#5e8c41;" },

From 7d1e7d54f8d1ec2f2d62396127bd9710ef81784e Mon Sep 17 00:00:00 2001
From: PastaBot <156604295+DashCoreAutoGuix@users.noreply.github.com>
Date: Tue, 30 Sep 2025 09:35:20 -0500
Subject: [PATCH 043/656] Merge bitcoin/bitcoin#29304: fuzz: Exit and log
 stderr for parse_test_list errors

Co-authored-by: fanquake <fanquake@gmail.com>
Co-authored-by: pasta <pasta@pastas-Mac-Studio.local>
---
 test/fuzz/test_runner.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/fuzz/test_runner.py b/test/fuzz/test_runner.py
index 929eef9cf75d..add9145da517 100755
--- a/test/fuzz/test_runner.py
+++ b/test/fuzz/test_runner.py
@@ -334,8 +334,8 @@ def parse_test_list(*, fuzz_bin, source_dir):
             **get_fuzz_env(target="", source_dir=source_dir)
         },
         stdout=subprocess.PIPE,
-        stderr=subprocess.DEVNULL,
         universal_newlines=True,
+        check=True,
     ).stdout.splitlines()
     return test_list_all
 

From d96d2abec58e0aabc2b8aad83a22e73b58b82dbd Mon Sep 17 00:00:00 2001
From: PastaBot <156604295+DashCoreAutoGuix@users.noreply.github.com>
Date: Tue, 30 Sep 2025 09:36:13 -0500
Subject: [PATCH 044/656] Merge bitcoin/bitcoin#29186: ci, iwyu: Drop
 backported mappings

Co-authored-by: fanquake <fanquake@gmail.com>
---
 contrib/devtools/iwyu/bitcoin.core.imp | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/contrib/devtools/iwyu/bitcoin.core.imp b/contrib/devtools/iwyu/bitcoin.core.imp
index ce7786f58c24..1f31229e0a48 100644
--- a/contrib/devtools/iwyu/bitcoin.core.imp
+++ b/contrib/devtools/iwyu/bitcoin.core.imp
@@ -1,6 +1,3 @@
 # Fixups / upstreamed changes
 [
-  { include: [ "<bits/termios-c_lflag.h>", private, "<termios.h>", public ] },
-  { include: [ "<bits/termios-struct.h>", private, "<termios.h>", public ] },
-  { include: [ "<bits/termios-tcflow.h>", private, "<termios.h>", public ] },
 ]

From 58407bc1813856b277a3323a6c920c50fb7e6a40 Mon Sep 17 00:00:00 2001
From: Kittywhiskers Van Gogh <63189531+kwvg@users.noreply.github.com>
Date: Thu, 2 Oct 2025 17:12:37 +0000
Subject: [PATCH 045/656] evo: add `DomainPort` for validating and storing
 domain and port pair

---
 src/evo/netinfo.cpp            | 59 ++++++++++++++++++++++++++++
 src/evo/netinfo.h              | 71 +++++++++++++++++++++++++++++++++
 src/test/evo_netinfo_tests.cpp | 72 +++++++++++++++++++++++++++++++---
 3 files changed, 196 insertions(+), 6 deletions(-)

diff --git a/src/evo/netinfo.cpp b/src/evo/netinfo.cpp
index 2c4dc7ef712c..d9458edcc019 100644
--- a/src/evo/netinfo.cpp
+++ b/src/evo/netinfo.cpp
@@ -18,8 +18,16 @@ namespace {
 static std::unique_ptr<const CChainParams> g_main_params{nullptr};
 static std::once_flag g_main_params_flag;
 
+/** Maximum length of a label in a domain per RFC 1035 */
+static constexpr uint8_t DOMAIN_LABEL_MAX_LEN{63};
+/** Maximum possible length of a ASCII FQDN */
+static constexpr uint8_t DOMAIN_MAX_LEN{253};
+/** Minimum length of a FQDN */
+static constexpr uint8_t DOMAIN_MIN_LEN{3};
+
 static constexpr std::string_view SAFE_CHARS_IPV4{"1234567890."};
 static constexpr std::string_view SAFE_CHARS_IPV4_6{"abcdefABCDEF1234567890.:[]"};
+static constexpr std::string_view SAFE_CHARS_RFC1035{"abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789.-"};
 
 bool MatchCharsFilter(std::string_view input, std::string_view filter)
 {
@@ -42,6 +50,57 @@ UniValue ArrFromService(const CService& addr)
     return obj;
 }
 
+DomainPort::Status DomainPort::ValidateDomain(const std::string& addr)
+{
+    if (addr.length() > DOMAIN_MAX_LEN || addr.length() < DOMAIN_MIN_LEN) {
+        return DomainPort::Status::BadLen;
+    }
+    if (!MatchCharsFilter(addr, SAFE_CHARS_RFC1035)) {
+        return DomainPort::Status::BadChar;
+    }
+    if (addr.front() == '.' || addr.back() == '.') {
+        return DomainPort::Status::BadCharPos;
+    }
+    std::vector<std::string> labels{SplitString(addr, '.')};
+    if (labels.size() < 2) {
+        return DomainPort::Status::BadDotless;
+    }
+    for (const auto& label : labels) {
+        if (label.empty() || label.length() > DOMAIN_LABEL_MAX_LEN) {
+            return DomainPort::Status::BadLabelLen;
+        }
+        if (label.front() == '-' || label.back() == '-') {
+            return DomainPort::Status::BadLabelCharPos;
+        }
+    }
+    return DomainPort::Status::Success;
+}
+
+DomainPort::Status DomainPort::Set(const std::string& addr, const uint16_t port)
+{
+    if (port == 0) {
+        return DomainPort::Status::BadPort;
+    }
+    const auto ret{ValidateDomain(addr)};
+    if (ret == DomainPort::Status::Success) {
+        // Convert to lowercase to avoid duplication by changing case (domains are case-insensitive)
+        m_addr = ToLower(addr);
+        m_port = port;
+    }
+    return ret;
+}
+
+DomainPort::Status DomainPort::Validate() const
+{
+    if (m_addr.empty() || m_addr != ToLower(m_addr)) {
+        return DomainPort::Status::Malformed;
+    }
+    if (m_port == 0) {
+        return DomainPort::Status::BadPort;
+    }
+    return ValidateDomain(m_addr);
+}
+
 bool NetInfoEntry::operator==(const NetInfoEntry& rhs) const
 {
     if (m_type != rhs.m_type) return false;
diff --git a/src/evo/netinfo.h b/src/evo/netinfo.h
index 4f1cdb9f1717..22367dda556d 100644
--- a/src/evo/netinfo.h
+++ b/src/evo/netinfo.h
@@ -106,6 +106,77 @@ UniValue ArrFromService(const CService& addr);
 /** Equivalent to Params() if node is running on mainnet */
 const CChainParams& MainParams();
 
+class DomainPort
+{
+public:
+    enum class Status : uint8_t {
+        BadChar,
+        BadCharPos,
+        BadDotless,
+        BadLabelCharPos,
+        BadLabelLen,
+        BadLen,
+        BadPort,
+        Malformed,
+
+        Success
+    };
+
+    static constexpr std::string_view StatusToString(const DomainPort::Status code)
+    {
+        switch (code) {
+        case DomainPort::Status::BadChar:
+            return "invalid character";
+        case DomainPort::Status::BadCharPos:
+            return "bad domain character position";
+        case DomainPort::Status::BadDotless:
+            return "prohibited dotless";
+        case DomainPort::Status::BadLabelCharPos:
+            return "bad label character position";
+        case DomainPort::Status::BadLabelLen:
+            return "bad label length";
+        case DomainPort::Status::BadLen:
+            return "bad domain length";
+        case DomainPort::Status::BadPort:
+            return "bad port";
+        case DomainPort::Status::Malformed:
+            return "malformed";
+        case DomainPort::Status::Success:
+            return "success";
+        } // no default case, so the compiler can warn about missing cases
+        assert(false);
+    }
+
+private:
+    std::string m_addr{};
+    uint16_t m_port{0};
+
+private:
+    static DomainPort::Status ValidateDomain(const std::string& input);
+
+public:
+    DomainPort() = default;
+    ~DomainPort() = default;
+
+    bool operator<(const DomainPort& rhs) const { return std::tie(m_addr, m_port) < std::tie(rhs.m_addr, rhs.m_port); }
+    bool operator==(const DomainPort& rhs) const { return std::tie(m_addr, m_port) == std::tie(rhs.m_addr, rhs.m_port); }
+    bool operator!=(const DomainPort& rhs) const { return !(*this == rhs); }
+
+    SERIALIZE_METHODS(DomainPort, obj)
+    {
+        READWRITE(obj.m_addr);
+        READWRITE(Using<BigEndianFormatter<2>>(obj.m_port));
+    }
+
+    bool IsEmpty() const { return m_addr.empty() && m_port == 0; }
+    bool IsValid() const { return Validate() == DomainPort::Status::Success; }
+    DomainPort::Status Set(const std::string& addr, const uint16_t port);
+    DomainPort::Status Validate() const;
+    uint16_t GetPort() const { return m_port; }
+    std::string ToStringAddr() const { return m_addr; }
+    std::string ToStringAddrPort() const { return strprintf("%s:%d", m_addr, m_port); }
+};
+
 class NetInfoEntry
 {
 public:
diff --git a/src/test/evo_netinfo_tests.cpp b/src/test/evo_netinfo_tests.cpp
index 7c20deebf4e9..509042f22dd1 100644
--- a/src/test/evo_netinfo_tests.cpp
+++ b/src/test/evo_netinfo_tests.cpp
@@ -10,6 +10,7 @@
 #include <netbase.h>
 #include <streams.h>
 #include <util/pointer.h>
+#include <util/strencodings.h>
 
 #include <boost/test/unit_test.hpp>
 
@@ -21,7 +22,7 @@ struct TestEntry {
     NetInfoStatus expected_ret_ext;
 };
 
-static const std::vector<TestEntry> vals_main{
+static const std::vector<TestEntry> addr_vals_main{
     // Address and port specified
     {{NetInfoPurpose::CORE_P2P, "1.1.1.1:9999"}, NetInfoStatus::Success, NetInfoStatus::Success},
     // - Port should default to default P2P core with MnNetInfo
@@ -100,7 +101,7 @@ void TestExtNetInfo(const std::vector<TestEntry>& vals)
 
 BOOST_AUTO_TEST_CASE(mnnetinfo_rules_main)
 {
-    TestMnNetInfo(vals_main);
+    TestMnNetInfo(addr_vals_main);
 
     {
         // MnNetInfo only stores one value, overwriting prohibited
@@ -122,9 +123,9 @@ BOOST_AUTO_TEST_CASE(mnnetinfo_rules_main)
     }
 }
 
-BOOST_AUTO_TEST_CASE(extnetinfo_rules_main) { TestExtNetInfo(vals_main); }
+BOOST_AUTO_TEST_CASE(extnetinfo_rules_main) { TestExtNetInfo(addr_vals_main); }
 
-static const std::vector<TestEntry> vals_reg{
+static const std::vector<TestEntry> addr_vals_reg{
     // - MnNetInfo doesn't mind using port 0
     // - ExtNetInfo requires non-zero ports
     {{NetInfoPurpose::CORE_P2P, "1.1.1.1:0"}, NetInfoStatus::Success, NetInfoStatus::BadPort},
@@ -136,11 +137,11 @@ static const std::vector<TestEntry> vals_reg{
     {{NetInfoPurpose::CORE_P2P, "1.1.1.1:22"}, NetInfoStatus::Success, NetInfoStatus::BadPort},
 };
 
-BOOST_FIXTURE_TEST_CASE(mnnetinfo_rules_reg, RegTestingSetup) { TestMnNetInfo(vals_reg); }
+BOOST_FIXTURE_TEST_CASE(mnnetinfo_rules_reg, RegTestingSetup) { TestMnNetInfo(addr_vals_reg); }
 
 BOOST_FIXTURE_TEST_CASE(extnetinfo_rules_reg, RegTestingSetup)
 {
-    TestExtNetInfo(vals_reg);
+    TestExtNetInfo(addr_vals_reg);
 
     {
         // ExtNetInfo can store up to 4 entries per purpose code, check limit enforcement
@@ -364,4 +365,63 @@ BOOST_AUTO_TEST_CASE(interface_equality)
     BOOST_CHECK(!util::shared_ptr_equal(ptr_lhs, ptr_rhs) && util::shared_ptr_not_equal(ptr_lhs, ptr_rhs));
 }
 
+BOOST_AUTO_TEST_CASE(domainport_rules)
+{
+    static const std::vector<std::pair</*addr=*/std::string, /*retval=*/DomainPort::Status>> domain_vals{
+        // Domain name labels can be as small as one character long and remain valid
+        {"r.server-1.ab.cd", DomainPort::Status::Success},
+        // Domain names labels can trail with numbers or consist entirely of numbers due to RFC 1123
+        {"9998.9example7.ab", DomainPort::Status::Success},
+        // dotless domains prohibited
+        {"abcd", DomainPort::Status::BadDotless},
+        // no empty label (trailing delimiter)
+        {"abc.", DomainPort::Status::BadCharPos},
+        // no empty label (leading delimiter)
+        {".abc", DomainPort::Status::BadCharPos},
+        // no empty label (extra delimiters)
+        {"a..dot..b", DomainPort::Status::BadLabelLen},
+        // ' is not a valid character in domains
+        {"somebody's macbook pro.local", DomainPort::Status::BadChar},
+        // spaces are not a valid character in domains
+        {"somebodys macbook pro.local", DomainPort::Status::BadChar},
+        // trailing hyphens are not allowed
+        {"-a-.bc.de", DomainPort::Status::BadLabelCharPos},
+        // 2 (characters in domain) < 3 (minimum length)
+        {"ac", DomainPort::Status::BadLen},
+        // 278 (characters in domain) > 253 (maximum limit)
+        {"Loremipsumdolorsitametconsecteturadipiscingelitseddoeiusmodtempor"
+         "incididuntutlaboreetdoloremagnaaliquaUtenimadminimveniamquisnostrud"
+         "exercitationullamcolaborisnisiutaliquipexeacommodoconsequatDuisaute"
+         "iruredolorinreprehenderitinvoluptatevelitessecillumdoloreeufugiatnullapariat.ur", DomainPort::Status::BadLen},
+        // 64 (characters in label) > 63 (maximum limit)
+        {"loremipsumdolorsitametconsecteturadipiscingelitseddoeiusmodtempo.ri.nc", DomainPort::Status::BadLabelLen},
+    };
+
+    for (const auto& [addr, retval] : domain_vals) {
+        DomainPort domain;
+        BOOST_CHECK_EQUAL(domain.Set(addr, 9999), retval);
+        if (retval != DomainPort::Status::Success) {
+            BOOST_CHECK_EQUAL(domain.Validate(), DomainPort::Status::Malformed); // Empty values report as Malformed
+        } else {
+            BOOST_CHECK_EQUAL(domain.Validate(), DomainPort::Status::Success);
+        }
+    }
+
+    {
+        // DomainPort requires non-zero ports
+        DomainPort domain;
+        BOOST_CHECK_EQUAL(domain.Set("example.com", 0), DomainPort::Status::BadPort);
+        BOOST_CHECK_EQUAL(domain.Validate(), DomainPort::Status::Malformed);
+    }
+
+    {
+        // DomainPort stores the domain in lower-case
+        DomainPort lhs, rhs;
+        BOOST_CHECK_EQUAL(lhs.Set("example.com", 9999), DomainPort::Status::Success);
+        BOOST_CHECK_EQUAL(rhs.Set(ToUpper("example.com"), 9999), DomainPort::Status::Success);
+        BOOST_CHECK_EQUAL(lhs.ToStringAddr(), rhs.ToStringAddr());
+        BOOST_CHECK(lhs == rhs);
+    }
+}
+
 BOOST_AUTO_TEST_SUITE_END()

From 79cc52ca4d848d6c456c1b3dbc9b51c4a2fb4cb9 Mon Sep 17 00:00:00 2001
From: Kittywhiskers Van Gogh <63189531+kwvg@users.noreply.github.com>
Date: Sat, 9 Aug 2025 11:54:00 +0000
Subject: [PATCH 046/656] evo: allow storing `DomainPort` in `NetInfoEntry`

---
 src/evo/deterministicmns.cpp | 29 +++++++++++++++++++++++++++++
 src/evo/netinfo.cpp          | 29 +++++++++++++++++++++++++----
 src/evo/netinfo.h            | 25 ++++++++++++++++++++++---
 src/evo/specialtxman.cpp     |  9 +++++++++
 4 files changed, 85 insertions(+), 7 deletions(-)

diff --git a/src/evo/deterministicmns.cpp b/src/evo/deterministicmns.cpp
index ec00139807f6..1faff56d4e48 100644
--- a/src/evo/deterministicmns.cpp
+++ b/src/evo/deterministicmns.cpp
@@ -440,6 +440,12 @@ void CDeterministicMNList::AddMN(const CDeterministicMNCPtr& dmn, bool fBumpTota
                 throw std::runtime_error(strprintf("%s: Can't add a masternode %s with a duplicate address=%s", __func__,
                                                    dmn->proTxHash.ToString(), service_opt->ToStringAddrPort()));
             }
+        } else if (const auto domain_opt{entry.GetDomainPort()}) {
+            if (!AddUniqueProperty(*dmn, *domain_opt)) {
+                mnUniquePropertyMap = mnUniquePropertyMapSaved;
+                throw std::runtime_error(strprintf("%s: Can't add a masternode %s with a duplicate address=%s",
+                                                   __func__, dmn->proTxHash.ToString(), domain_opt->ToStringAddrPort()));
+            }
         } else {
             mnUniquePropertyMap = mnUniquePropertyMapSaved;
             throw std::runtime_error(
@@ -494,6 +500,10 @@ void CDeterministicMNList::UpdateMN(const CDeterministicMN& oldDmn, const std::s
                     if (!DeleteUniqueProperty(dmn, *service_opt)) {
                         return "internal error"; // This shouldn't be possible
                     }
+                } else if (const auto domain_opt{old_entry.GetDomainPort()}) {
+                    if (!DeleteUniqueProperty(dmn, *domain_opt)) {
+                        return "internal error"; // This shouldn't be possible
+                    }
                 } else {
                     return "invalid address";
                 }
@@ -503,6 +513,10 @@ void CDeterministicMNList::UpdateMN(const CDeterministicMN& oldDmn, const std::s
                     if (!AddUniqueProperty(dmn, *service_opt)) {
                         return strprintf("duplicate (%s)", service_opt->ToStringAddrPort());
                     }
+                } else if (const auto domain_opt{new_entry.GetDomainPort()}) {
+                    if (!AddUniqueProperty(dmn, *domain_opt)) {
+                        return strprintf("duplicate (%s)", domain_opt->ToStringAddrPort());
+                    }
                 } else {
                     return "invalid address";
                 }
@@ -583,6 +597,12 @@ void CDeterministicMNList::RemoveMN(const uint256& proTxHash)
                 throw std::runtime_error(strprintf("%s: Can't delete a masternode %s with an address=%s", __func__,
                                                    proTxHash.ToString(), service_opt->ToStringAddrPort()));
             }
+        } else if (const auto domain_opt{entry.GetDomainPort()}) {
+            if (!DeleteUniqueProperty(*dmn, *domain_opt)) {
+                mnUniquePropertyMap = mnUniquePropertyMapSaved;
+                throw std::runtime_error(strprintf("%s: Can't delete a masternode %s with an address=%s", __func__,
+                                                   proTxHash.ToString(), domain_opt->ToStringAddrPort()));
+            }
         } else {
             mnUniquePropertyMap = mnUniquePropertyMapSaved;
             throw std::runtime_error(strprintf("%s: Can't delete a masternode %s with invalid address", __func__,
@@ -1142,6 +1162,11 @@ bool CheckProRegTx(CDeterministicMNManager& dmnman, const CTransaction& tx, gsl:
                     mnList.GetUniquePropertyMN(*service_opt)->collateralOutpoint != collateralOutpoint) {
                     return state.Invalid(TxValidationResult::TX_BAD_SPECIAL, "bad-protx-dup-netinfo-entry");
                 }
+            } else if (const auto domain_opt{entry.GetDomainPort()}) {
+                if (mnList.HasUniqueProperty(*domain_opt) &&
+                    mnList.GetUniquePropertyMN(*domain_opt)->collateralOutpoint != collateralOutpoint) {
+                    return state.Invalid(TxValidationResult::TX_BAD_SPECIAL, "bad-protx-dup-netinfo-entry");
+                }
             } else {
                 return state.Invalid(TxValidationResult::TX_BAD_SPECIAL, "bad-protx-netinfo-entry");
             }
@@ -1224,6 +1249,10 @@ bool CheckProUpServTx(CDeterministicMNManager& dmnman, const CTransaction& tx, g
                 mnList.GetUniquePropertyMN(*service_opt)->proTxHash != opt_ptx->proTxHash) {
                 return state.Invalid(TxValidationResult::TX_BAD_SPECIAL, "bad-protx-dup-netinfo-entry");
             }
+        } else if (const auto domain_opt{entry.GetDomainPort()}) {
+            if (mnList.HasUniqueProperty(*domain_opt) && mnList.GetUniquePropertyMN(*domain_opt)->proTxHash != opt_ptx->proTxHash) {
+                return state.Invalid(TxValidationResult::TX_BAD_SPECIAL, "bad-protx-dup-netinfo-entry");
+            }
         } else {
             return state.Invalid(TxValidationResult::TX_BAD_SPECIAL, "bad-protx-netinfo-entry");
         }
diff --git a/src/evo/netinfo.cpp b/src/evo/netinfo.cpp
index d9458edcc019..b8b09c74ff4c 100644
--- a/src/evo/netinfo.cpp
+++ b/src/evo/netinfo.cpp
@@ -124,6 +124,10 @@ bool NetInfoEntry::operator<(const NetInfoEntry& rhs) const
             if constexpr (std::is_same_v<T1, T2>) {
                 // Both the same type, compare as usual
                 return lhs < rhs;
+            } else if constexpr ((std::is_same_v<T1, CService> || std::is_same_v<T1, DomainPort>) &&
+                                 (std::is_same_v<T2, CService> || std::is_same_v<T2, DomainPort>)) {
+                // Differing types but both implement ToStringAddrPort(), lexicographical compare strings
+                return lhs.ToStringAddrPort() < rhs.ToStringAddrPort();
             }
             // If lhs is monostate, it less than rhs; otherwise rhs is greater
             return std::is_same_v<T1, std::monostate>;
@@ -140,12 +144,21 @@ std::optional<CService> NetInfoEntry::GetAddrPort() const
     return std::nullopt;
 }
 
+std::optional<DomainPort> NetInfoEntry::GetDomainPort() const
+{
+    if (const auto* data_ptr{std::get_if<DomainPort>(&m_data)}; m_type == NetInfoType::Domain && data_ptr) {
+        ASSERT_IF_DEBUG(data_ptr->IsValid());
+        return *data_ptr;
+    }
+    return std::nullopt;
+}
+
 uint16_t NetInfoEntry::GetPort() const
 {
     return std::visit(
         [](auto&& input) -> uint16_t {
             using T1 = std::decay_t<decltype(input)>;
-            if constexpr (std::is_same_v<T1, CService>) {
+            if constexpr (std::is_same_v<T1, CService> || std::is_same_v<T1, DomainPort>) {
                 return input.GetPort();
             }
             return 0;
@@ -162,7 +175,8 @@ bool NetInfoEntry::IsTriviallyValid() const
     return std::visit(
         [this](auto&& input) -> bool {
             using T1 = std::decay_t<decltype(input)>;
-            static_assert(std::is_same_v<T1, std::monostate> || std::is_same_v<T1, CService>, "Unexpected type");
+            static_assert(std::is_same_v<T1, std::monostate> || std::is_same_v<T1, CService> || std::is_same_v<T1, DomainPort>,
+                          "Unexpected type");
             if constexpr (std::is_same_v<T1, std::monostate>) {
                 // Empty underlying data isn't a valid entry
                 return false;
@@ -171,6 +185,11 @@ bool NetInfoEntry::IsTriviallyValid() const
                 if (m_type != NetInfoType::Service) return false;
                 // Underlying data must meet surface-level validity checks for its type
                 if (!input.IsValid()) return false;
+            } else if constexpr (std::is_same_v<T1, DomainPort>) {
+                // Type code should be truthful as it decides what underlying type is used when (de)serializing
+                if (m_type != NetInfoType::Domain) return false;
+                // Underlying data should at least meet surface-level validity checks
+                if (!input.IsValid()) return false;
             }
             return true;
         },
@@ -184,6 +203,8 @@ std::string NetInfoEntry::ToString() const
             using T1 = std::decay_t<decltype(input)>;
             if constexpr (std::is_same_v<T1, CService>) {
                 return strprintf("CService(addr=%s, port=%u)", input.ToStringAddr(), input.GetPort());
+            } else if constexpr (std::is_same_v<T1, DomainPort>) {
+                return strprintf("DomainPort(addr=%s, port=%u)", input.ToStringAddr(), input.GetPort());
             }
             return "[invalid entry]";
         },
@@ -195,7 +216,7 @@ std::string NetInfoEntry::ToStringAddr() const
     return std::visit(
         [](auto&& input) -> std::string {
             using T1 = std::decay_t<decltype(input)>;
-            if constexpr (std::is_same_v<T1, CService>) {
+            if constexpr (std::is_same_v<T1, CService> || std::is_same_v<T1, DomainPort>) {
                 return input.ToStringAddr();
             }
             return "[invalid entry]";
@@ -208,7 +229,7 @@ std::string NetInfoEntry::ToStringAddrPort() const
     return std::visit(
         [](auto&& input) -> std::string {
             using T1 = std::decay_t<decltype(input)>;
-            if constexpr (std::is_same_v<T1, CService>) {
+            if constexpr (std::is_same_v<T1, CService> || std::is_same_v<T1, DomainPort>) {
                 return input.ToStringAddrPort();
             }
             return "[invalid entry]";
diff --git a/src/evo/netinfo.h b/src/evo/netinfo.h
index 22367dda556d..e377df6b001d 100644
--- a/src/evo/netinfo.h
+++ b/src/evo/netinfo.h
@@ -156,6 +156,9 @@ class DomainPort
 
 public:
     DomainPort() = default;
+    template <typename Stream>
+    DomainPort(deserialize_type, Stream& s) { s >> *this; }
+
     ~DomainPort() = default;
 
     bool operator<(const DomainPort& rhs) const { return std::tie(m_addr, m_port) < std::tie(rhs.m_addr, rhs.m_port); }
@@ -182,15 +185,22 @@ class NetInfoEntry
 public:
     enum NetInfoType : uint8_t {
         Service = 0x01,
+        Domain  = 0x02,
         Invalid = 0xff
     };
 
 private:
     uint8_t m_type{NetInfoType::Invalid};
-    std::variant<std::monostate, CService> m_data{std::monostate{}};
+    std::variant<std::monostate, CService, DomainPort> m_data{std::monostate{}};
 
 public:
     NetInfoEntry() = default;
+    NetInfoEntry(const DomainPort& domain)
+    {
+        if (!domain.IsValid()) return;
+        m_type = NetInfoType::Domain;
+        m_data = domain;
+    }
     NetInfoEntry(const CService& service)
     {
         if (!service.IsValid()) return;
@@ -213,6 +223,9 @@ class NetInfoEntry
         if (const auto* data_ptr{std::get_if<CService>(&m_data)};
             m_type == NetInfoType::Service && data_ptr && data_ptr->IsValid()) {
             s << m_type << *data_ptr;
+        } else if (const auto* data_ptr{std::get_if<DomainPort>(&m_data)};
+                   m_type == NetInfoType::Domain && data_ptr && data_ptr->IsValid()) {
+            s << m_type << *data_ptr;
         } else {
             s << NetInfoType::Invalid;
         }
@@ -224,12 +237,17 @@ class NetInfoEntry
         OverrideStream<Stream> s(&s_, /*nType=*/0, s_.GetVersion() | ADDRV2_FORMAT);
         s >> m_type;
         if (m_type == NetInfoType::Service) {
-            m_data = CService{};
             try {
-                CService& service{std::get<CService>(m_data)};
+                auto& service{m_data.emplace<CService>()};
                 s >> service;
                 if (!service.IsValid()) { Clear(); } // Invalid CService, mark as invalid
             } catch (const std::ios_base::failure&) { Clear(); } // Deser failed, mark as invalid
+        } else if (m_type == NetInfoType::Domain) {
+            try {
+                auto& domain{m_data.emplace<DomainPort>()};
+                s >> domain;
+                if (!domain.IsValid()) { Clear(); } // Invalid DomainPort, mark as invalid
+            } catch (const std::ios_base::failure&) { Clear(); } // Deser failed, mark as invalid
         } else { Clear(); } // Invalid type code, mark as invalid
     }
 
@@ -240,6 +258,7 @@ class NetInfoEntry
     }
 
     std::optional<CService> GetAddrPort() const;
+    std::optional<DomainPort> GetDomainPort() const;
     uint16_t GetPort() const;
     bool IsEmpty() const { return *this == NetInfoEntry{}; }
     bool IsTriviallyValid() const;
diff --git a/src/evo/specialtxman.cpp b/src/evo/specialtxman.cpp
index 9fcffe753299..e7fe59efff89 100644
--- a/src/evo/specialtxman.cpp
+++ b/src/evo/specialtxman.cpp
@@ -262,6 +262,10 @@ bool CSpecialTxProcessor::BuildNewListFromBlock(const CBlock& block, gsl::not_nu
                     if (newList.HasUniqueProperty(*service_opt)) {
                         return state.Invalid(BlockValidationResult::BLOCK_CONSENSUS, "bad-protx-dup-netinfo-entry");
                     }
+                } else if (const auto domain_opt{entry.GetDomainPort()}) {
+                    if (newList.HasUniqueProperty(*domain_opt)) {
+                        return state.Invalid(BlockValidationResult::BLOCK_CONSENSUS, "bad-protx-dup-netinfo-entry");
+                    }
                 } else {
                     return state.Invalid(BlockValidationResult::BLOCK_CONSENSUS, "bad-protx-netinfo-entry");
                 }
@@ -298,6 +302,11 @@ bool CSpecialTxProcessor::BuildNewListFromBlock(const CBlock& block, gsl::not_nu
                         newList.GetUniquePropertyMN(*service_opt)->proTxHash != opt_proTx->proTxHash) {
                         return state.Invalid(BlockValidationResult::BLOCK_CONSENSUS, "bad-protx-dup-netinfo-entry");
                     }
+                } else if (const auto domain_opt{entry.GetDomainPort()}) {
+                    if (newList.HasUniqueProperty(*domain_opt) &&
+                        newList.GetUniquePropertyMN(*domain_opt)->proTxHash != opt_proTx->proTxHash) {
+                        return state.Invalid(BlockValidationResult::BLOCK_CONSENSUS, "bad-protx-dup-netinfo-entry");
+                    }
                 } else {
                     return state.Invalid(BlockValidationResult::BLOCK_CONSENSUS, "bad-protx-netinfo-entry");
                 }

From f04b0d2dea123981179d02991ff039a2c1ec7ed2 Mon Sep 17 00:00:00 2001
From: Kittywhiskers Van Gogh <63189531+kwvg@users.noreply.github.com>
Date: Thu, 2 Oct 2025 18:44:47 +0000
Subject: [PATCH 047/656] evo: allow `ExtNetInfo` to accept `DomainPort` if
 `PLATFORM_HTTPS`

---
 src/evo/netinfo.cpp            | 83 +++++++++++++++++++++++++++++++++-
 src/evo/netinfo.h              |  1 +
 src/test/evo_netinfo_tests.cpp | 27 ++++++++++-
 3 files changed, 107 insertions(+), 4 deletions(-)

diff --git a/src/evo/netinfo.cpp b/src/evo/netinfo.cpp
index b8b09c74ff4c..17279d0448b9 100644
--- a/src/evo/netinfo.cpp
+++ b/src/evo/netinfo.cpp
@@ -25,14 +25,46 @@ static constexpr uint8_t DOMAIN_MAX_LEN{253};
 /** Minimum length of a FQDN */
 static constexpr uint8_t DOMAIN_MIN_LEN{3};
 
+static constexpr std::string_view SAFE_CHARS_ALPHA{"abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ"};
 static constexpr std::string_view SAFE_CHARS_IPV4{"1234567890."};
 static constexpr std::string_view SAFE_CHARS_IPV4_6{"abcdefABCDEF1234567890.:[]"};
 static constexpr std::string_view SAFE_CHARS_RFC1035{"abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789.-"};
+static constexpr std::array<std::string_view, 13> TLDS_BAD{
+    // ICANN resolution 2018.02.04.12
+    ".mail",
+    // Infrastructure TLD
+    ".arpa",
+    // RFC 6761
+    ".example", ".invalid", ".localhost", ".test",
+    // RFC 6762
+    ".local",
+    // RFC 6762, Appendix G
+    ".corp", ".home", ".internal", ".intranet", ".lan", ".private",
+};
 
 bool MatchCharsFilter(std::string_view input, std::string_view filter)
 {
     return std::all_of(input.begin(), input.end(), [&filter](char c) { return filter.find(c) != std::string_view::npos; });
 }
+
+bool MatchSuffix(const std::string& str, Span<const std::string_view> list)
+{
+    if (str.empty()) return false;
+    for (const auto& suffix : list) {
+        if (suffix.size() > str.size()) continue;
+        if (std::string_view{str}.ends_with(suffix)) return true;
+    }
+    return false;
+}
+
+bool IsAllowedPlatformHTTPPort(uint16_t port)
+{
+    switch (port) {
+    case 443:
+        return true;
+    }
+    return false;
+}
 } // anonymous namespace
 
 bool IsNodeOnMainnet() { return Params().NetworkIDString() == CBaseChainParams::MAIN; }
@@ -387,6 +419,10 @@ NetInfoStatus ExtNetInfo::ProcessCandidate(const NetInfoPurpose purpose, const N
     if (IsAddrPortDuplicate(candidate)) {
         return NetInfoStatus::Duplicate;
     }
+    if (candidate.GetDomainPort().has_value() && purpose != NetInfoPurpose::PLATFORM_HTTPS) {
+        // Domains only allowed for Platform HTTPS API
+        return NetInfoStatus::BadInput;
+    }
     if (auto it{m_data.find(purpose)}; it != m_data.end()) {
         // Existing entries list found, check limit
         auto& [_, entries] = *it;
@@ -426,6 +462,26 @@ NetInfoStatus ExtNetInfo::ValidateService(const CService& service)
     return NetInfoStatus::Success;
 }
 
+NetInfoStatus ExtNetInfo::ValidateDomainPort(const DomainPort& domain)
+{
+    if (!domain.IsValid()) {
+        return NetInfoStatus::BadInput;
+    }
+    const uint16_t domain_port{domain.GetPort()};
+    if (domain_port == 0 || (IsBadPort(domain_port) && !IsAllowedPlatformHTTPPort(domain_port))) {
+        return NetInfoStatus::BadPort;
+    }
+    const std::string& addr{domain.ToStringAddr()};
+    if (MatchSuffix(addr, TLDS_BAD)) {
+        return NetInfoStatus::BadInput;
+    }
+    if (const auto labels{SplitString(addr, '.')}; !MatchCharsFilter(labels.at(labels.size() - 1), SAFE_CHARS_ALPHA)) {
+        return NetInfoStatus::BadInput;
+    }
+
+    return NetInfoStatus::Success;
+}
+
 NetInfoStatus ExtNetInfo::AddEntry(const NetInfoPurpose purpose, const std::string& input)
 {
     if (!IsValidPurpose(purpose)) {
@@ -437,11 +493,25 @@ NetInfoStatus ExtNetInfo::AddEntry(const NetInfoPurpose purpose, const std::stri
     std::string addr;
     uint16_t port{0};
     SplitHostPort(input, port, addr);
-    // Contains invalid characters, unlikely to pass Lookup(), fast-fail
+
     if (!MatchCharsFilter(addr, SAFE_CHARS_IPV4_6)) {
-        return NetInfoStatus::BadInput;
+        if (!MatchCharsFilter(addr, SAFE_CHARS_RFC1035)) {
+            // Neither IP:port safe nor domain-safe, we can safely assume it's bad input
+            return NetInfoStatus::BadInput;
+        }
+
+        // Not IP:port safe but domain safe, treat as domain.
+        if (DomainPort domain; domain.Set(addr, port) == DomainPort::Status::Success) {
+            const auto ret{ValidateDomainPort(domain)};
+            if (ret == NetInfoStatus::Success) {
+                return ProcessCandidate(purpose, NetInfoEntry{domain});
+            }
+            return ret; /* ValidateDomainPort() failed */
+        }
+        return NetInfoStatus::BadInput; /* DomainPort::Set() failed */
     }
 
+    // IP:port safe, try to parse it as IP:port
     if (auto service_opt{Lookup(addr, /*portDefault=*/port, /*fAllowLookup=*/false)}) {
         const auto ret{ValidateService(*service_opt)};
         if (ret == NetInfoStatus::Success) {
@@ -516,6 +586,15 @@ NetInfoStatus ExtNetInfo::Validate() const
                     // Stores CService underneath but doesn't pass validation rules
                     return ret;
                 }
+            } else if (const auto domain_opt{entry.GetDomainPort()}) {
+                if (purpose != NetInfoPurpose::PLATFORM_HTTPS) {
+                    // Domains only allowed for Platform HTTPS API
+                    return NetInfoStatus::BadInput;
+                }
+                if (auto ret{ValidateDomainPort(*domain_opt)}; ret != NetInfoStatus::Success) {
+                    // Stores DomainPort underneath but doesn't pass validation rules
+                    return ret;
+                }
             } else {
                 // Doesn't store valid type underneath
                 return NetInfoStatus::Malformed;
diff --git a/src/evo/netinfo.h b/src/evo/netinfo.h
index e377df6b001d..3ea51992b79e 100644
--- a/src/evo/netinfo.h
+++ b/src/evo/netinfo.h
@@ -384,6 +384,7 @@ class ExtNetInfo final : public NetInfoInterface
 
     /** Validate CService candidate address against ruleset */
     static NetInfoStatus ValidateService(const CService& service);
+    static NetInfoStatus ValidateDomainPort(const DomainPort& domain);
 
 private:
     uint8_t m_version{CURRENT_VERSION};
diff --git a/src/test/evo_netinfo_tests.cpp b/src/test/evo_netinfo_tests.cpp
index 509042f22dd1..3d79556e048a 100644
--- a/src/test/evo_netinfo_tests.cpp
+++ b/src/test/evo_netinfo_tests.cpp
@@ -40,8 +40,12 @@ static const std::vector<TestEntry> addr_vals_main{
     // - Non-IPv4 addresses are prohibited in MnNetInfo
     // - Any valid BIP155 address is allowed in ExtNetInfo
     {{NetInfoPurpose::CORE_P2P, "[2606:4700:4700::1111]:9999"}, NetInfoStatus::BadInput, NetInfoStatus::Success},
-    // Domains are not allowed
+    // Domains are not allowed for Core P2P or Platform P2P
     {{NetInfoPurpose::CORE_P2P, "example.com:9999"}, NetInfoStatus::BadInput, NetInfoStatus::BadInput},
+    {{NetInfoPurpose::PLATFORM_P2P, "example.com:9999"}, NetInfoStatus::MaxLimit, NetInfoStatus::BadInput},
+    // - MnNetInfo doesn't allow storing anything except a Core P2P address
+    // - ExtNetInfo can store Platform HTTPS addresses *as domains*
+    {{NetInfoPurpose::PLATFORM_HTTPS, "example.com:9999"}, NetInfoStatus::MaxLimit, NetInfoStatus::Success},
     // Incorrect IPv4 address
     {{NetInfoPurpose::CORE_P2P, "1.1.1.256:9999"}, NetInfoStatus::BadInput, NetInfoStatus::BadInput},
     // Missing address
@@ -182,6 +186,21 @@ BOOST_FIXTURE_TEST_CASE(extnetinfo_rules_reg, RegTestingSetup)
         BOOST_CHECK(!netInfo.HasEntries(NetInfoPurpose::PLATFORM_HTTPS));
         ValidateGetEntries(netInfo.GetEntries(), /*expected_size=*/2);
     }
+
+    {
+        // ExtNetInfo has additional rules for domains
+        const std::vector<TestEntry> domain_vals{
+            // Port 80 (HTTP) is below the privileged ports threshold (1023), not allowed
+            {{NetInfoPurpose::PLATFORM_HTTPS, "example.com:80"}, NetInfoStatus::MaxLimit, NetInfoStatus::BadPort},
+            // Port 443 (HTTPS) is below the privileged ports threshold (1023) but still allowed
+            {{NetInfoPurpose::PLATFORM_HTTPS, "example.com:443"}, NetInfoStatus::MaxLimit, NetInfoStatus::Success},
+            // TLDs must be alphabetic to avoid ambiguation with IP addresses (per ICANN guidelines)
+            {{NetInfoPurpose::PLATFORM_HTTPS, "example.123:443"}, NetInfoStatus::MaxLimit, NetInfoStatus::BadInput},
+            // .local is a prohibited TLD
+            {{NetInfoPurpose::PLATFORM_HTTPS, "somebodys-macbook-pro.local:9998"}, NetInfoStatus::MaxLimit, NetInfoStatus::BadInput},
+        };
+        TestExtNetInfo(domain_vals);
+    }
 }
 
 BOOST_AUTO_TEST_CASE(netinfo_ser)
@@ -399,11 +418,15 @@ BOOST_AUTO_TEST_CASE(domainport_rules)
 
     for (const auto& [addr, retval] : domain_vals) {
         DomainPort domain;
-        BOOST_CHECK_EQUAL(domain.Set(addr, 9999), retval);
+        ExtNetInfo netInfo;
+        BOOST_CHECK_EQUAL(domain.Set(addr, 443), retval);
         if (retval != DomainPort::Status::Success) {
             BOOST_CHECK_EQUAL(domain.Validate(), DomainPort::Status::Malformed); // Empty values report as Malformed
+            BOOST_CHECK_EQUAL(netInfo.AddEntry(NetInfoPurpose::PLATFORM_HTTPS, domain.ToStringAddrPort()),
+                              NetInfoStatus::BadInput);
         } else {
             BOOST_CHECK_EQUAL(domain.Validate(), DomainPort::Status::Success);
+            BOOST_CHECK_EQUAL(netInfo.AddEntry(NetInfoPurpose::PLATFORM_HTTPS, domain.ToStringAddrPort()), NetInfoStatus::Success);
         }
     }
 

From 69a92427744b18fb1b57120741e78bc740a13124 Mon Sep 17 00:00:00 2001
From: Kittywhiskers Van Gogh <63189531+kwvg@users.noreply.github.com>
Date: Tue, 23 Sep 2025 15:00:41 +0000
Subject: [PATCH 048/656] evo: allow and recognize CJDNS addresses

---
 src/evo/netinfo.cpp            |  7 ++++---
 src/test/evo_netinfo_tests.cpp | 27 +++++++++++++++++++++++++++
 2 files changed, 31 insertions(+), 3 deletions(-)

diff --git a/src/evo/netinfo.cpp b/src/evo/netinfo.cpp
index 17279d0448b9..0e44affa85df 100644
--- a/src/evo/netinfo.cpp
+++ b/src/evo/netinfo.cpp
@@ -449,7 +449,7 @@ NetInfoStatus ExtNetInfo::ValidateService(const CService& service)
     if (!service.IsValid()) {
         return NetInfoStatus::BadAddress;
     }
-    if (!service.IsIPv4() && !service.IsIPv6()) {
+    if (!service.IsCJDNS() && !service.IsIPv4() && !service.IsIPv6()) {
         return NetInfoStatus::BadType;
     }
     if (Params().RequireRoutableExternalIP() && !service.IsRoutable()) {
@@ -513,9 +513,10 @@ NetInfoStatus ExtNetInfo::AddEntry(const NetInfoPurpose purpose, const std::stri
 
     // IP:port safe, try to parse it as IP:port
     if (auto service_opt{Lookup(addr, /*portDefault=*/port, /*fAllowLookup=*/false)}) {
-        const auto ret{ValidateService(*service_opt)};
+        const auto service{MaybeFlipIPv6toCJDNS(*service_opt)};
+        const auto ret{ValidateService(service)};
         if (ret == NetInfoStatus::Success) {
-            return ProcessCandidate(purpose, NetInfoEntry{*service_opt});
+            return ProcessCandidate(purpose, NetInfoEntry{service});
         }
         return ret; /* ValidateService() failed */
     }
diff --git a/src/test/evo_netinfo_tests.cpp b/src/test/evo_netinfo_tests.cpp
index 3d79556e048a..f334b83aa240 100644
--- a/src/test/evo_netinfo_tests.cpp
+++ b/src/test/evo_netinfo_tests.cpp
@@ -141,6 +141,14 @@ static const std::vector<TestEntry> addr_vals_reg{
     {{NetInfoPurpose::CORE_P2P, "1.1.1.1:22"}, NetInfoStatus::Success, NetInfoStatus::BadPort},
 };
 
+enum class ExpectedType : uint8_t {
+    CJDNS,
+};
+
+static const std::vector<std::tuple</*type=*/ExpectedType, /*input=*/std::string, /*expected_ret=*/NetInfoStatus>> privacy_addr_vals{
+    {ExpectedType::CJDNS, "[fc00:3344:5566:7788:9900:aabb:ccdd:eeff]:9998", NetInfoStatus::Success},
+};
+
 BOOST_FIXTURE_TEST_CASE(mnnetinfo_rules_reg, RegTestingSetup) { TestMnNetInfo(addr_vals_reg); }
 
 BOOST_FIXTURE_TEST_CASE(extnetinfo_rules_reg, RegTestingSetup)
@@ -201,6 +209,25 @@ BOOST_FIXTURE_TEST_CASE(extnetinfo_rules_reg, RegTestingSetup)
         };
         TestExtNetInfo(domain_vals);
     }
+
+    // Privacy network entry checks
+    for (const auto& [type, input, expected_ret] : privacy_addr_vals) {
+        const bool expected_success{expected_ret == NetInfoStatus::Success};
+
+        ExtNetInfo netInfo{};
+        BOOST_CHECK_EQUAL(netInfo.AddEntry(NetInfoPurpose::CORE_P2P, input), expected_ret);
+        ValidateGetEntries(netInfo.GetEntries(), /*expected_size=*/expected_success ? 1 : 0);
+        if (!expected_success) continue;
+
+        // Type registration check
+        const CService service{netInfo.GetEntries().at(0).GetAddrPort().value()};
+        BOOST_CHECK(service.IsValid());
+        switch (type) {
+        case ExpectedType::CJDNS:
+            BOOST_CHECK(service.IsCJDNS());
+            break;
+        } // no default case, so the compiler can warn about missing cases
+    }
 }
 
 BOOST_AUTO_TEST_CASE(netinfo_ser)

From 7b0de72e8e88cf5bee5c9c21eaa81af1c5f451c5 Mon Sep 17 00:00:00 2001
From: Kittywhiskers Van Gogh <63189531+kwvg@users.noreply.github.com>
Date: Sun, 10 Aug 2025 19:29:23 +0000
Subject: [PATCH 049/656] evo: recognize and store I2P and onion domains in
 `ExtNetInfo`

---
 src/evo/deterministicmns.h     | 12 +++++++++++-
 src/evo/netinfo.cpp            | 35 +++++++++++++++++++++++++++-------
 src/test/evo_netinfo_tests.cpp | 26 +++++++++++++++++++++++--
 3 files changed, 63 insertions(+), 10 deletions(-)

diff --git a/src/evo/deterministicmns.h b/src/evo/deterministicmns.h
index 12643e5f1f1a..0353c46634fc 100644
--- a/src/evo/deterministicmns.h
+++ b/src/evo/deterministicmns.h
@@ -442,7 +442,17 @@ class CDeterministicMNList
         DMNL_NO_TEMPLATE(NetInfoInterface);
         DMNL_NO_TEMPLATE(std::shared_ptr<NetInfoInterface>);
 #undef DMNL_NO_TEMPLATE
-        return ::SerializeHash(v);
+        int ser_version{PROTOCOL_VERSION};
+        if constexpr (std::is_same_v<std::decay_t<T>, CService>) {
+            // Special handling is required if we're using addresses that can only be (de)serialized using
+            // ADDRv2. Without this step, the address gets truncated, the hashmap gets contaminated with
+            // an invalid entry and subsequent attempts at registering ADDRv2 entries get blocked. We cannot
+            // apply this treatment ADDRv1 compatible addresses for backwards compatibility with the existing map.
+            if (!v.IsAddrV1Compatible()) {
+                ser_version |= ADDRV2_FORMAT;
+            }
+        }
+        return ::SerializeHash(v, /*nType=*/SER_GETHASH, /*nVersion=*/ser_version);
     }
     template <typename T>
     [[nodiscard]] bool AddUniqueProperty(const CDeterministicMN& dmn, const T& v)
diff --git a/src/evo/netinfo.cpp b/src/evo/netinfo.cpp
index 0e44affa85df..3a8a920d46eb 100644
--- a/src/evo/netinfo.cpp
+++ b/src/evo/netinfo.cpp
@@ -41,6 +41,7 @@ static constexpr std::array<std::string_view, 13> TLDS_BAD{
     // RFC 6762, Appendix G
     ".corp", ".home", ".internal", ".intranet", ".lan", ".private",
 };
+static constexpr std::array<std::string_view, 2> TLDS_PRIVACY{".i2p", ".onion"};
 
 bool MatchCharsFilter(std::string_view input, std::string_view filter)
 {
@@ -449,14 +450,22 @@ NetInfoStatus ExtNetInfo::ValidateService(const CService& service)
     if (!service.IsValid()) {
         return NetInfoStatus::BadAddress;
     }
-    if (!service.IsCJDNS() && !service.IsIPv4() && !service.IsIPv6()) {
+    if (!service.IsCJDNS() && !service.IsI2P() && !service.IsIPv4() && !service.IsIPv6() && !service.IsTor()) {
         return NetInfoStatus::BadType;
     }
     if (Params().RequireRoutableExternalIP() && !service.IsRoutable()) {
         return NetInfoStatus::NotRoutable;
     }
-    if (IsBadPort(service.GetPort()) || service.GetPort() == 0) {
-        return NetInfoStatus::BadPort;
+    const uint16_t service_port{service.GetPort()};
+    if (service.IsI2P()) {
+        if (service_port != I2P_SAM31_PORT) {
+            // I2P SAM 3.1 and earlier don't support arbitrary ports
+            return NetInfoStatus::BadPort;
+        }
+    } else {
+        if (service_port == 0 || IsBadPort(service_port)) {
+            return NetInfoStatus::BadPort;
+        }
     }
 
     return NetInfoStatus::Success;
@@ -472,7 +481,7 @@ NetInfoStatus ExtNetInfo::ValidateDomainPort(const DomainPort& domain)
         return NetInfoStatus::BadPort;
     }
     const std::string& addr{domain.ToStringAddr()};
-    if (MatchSuffix(addr, TLDS_BAD)) {
+    if (MatchSuffix(addr, TLDS_BAD) || MatchSuffix(addr, TLDS_PRIVACY)) {
         return NetInfoStatus::BadInput;
     }
     if (const auto labels{SplitString(addr, '.')}; !MatchCharsFilter(labels.at(labels.size() - 1), SAFE_CHARS_ALPHA)) {
@@ -500,15 +509,27 @@ NetInfoStatus ExtNetInfo::AddEntry(const NetInfoPurpose purpose, const std::stri
             return NetInfoStatus::BadInput;
         }
 
-        // Not IP:port safe but domain safe, treat as domain.
-        if (DomainPort domain; domain.Set(addr, port) == DomainPort::Status::Success) {
+        // Not IP:port safe but domain safe
+        if (MatchSuffix(addr, TLDS_PRIVACY)) {
+            // Special domain, try storing it as CService
+            CNetAddr netaddr;
+            if (netaddr.SetSpecial(addr)) {
+                const CService service{netaddr, port};
+                const auto ret{ValidateService(service)};
+                if (ret == NetInfoStatus::Success) {
+                    return ProcessCandidate(purpose, NetInfoEntry{service});
+                }
+                return ret; /* ValidateService() failed */
+            }
+        } else if (DomainPort domain; domain.Set(addr, port) == DomainPort::Status::Success) {
+            // Regular domain
             const auto ret{ValidateDomainPort(domain)};
             if (ret == NetInfoStatus::Success) {
                 return ProcessCandidate(purpose, NetInfoEntry{domain});
             }
             return ret; /* ValidateDomainPort() failed */
         }
-        return NetInfoStatus::BadInput; /* DomainPort::Set() failed */
+        return NetInfoStatus::BadInput; /* CNetAddr::SetSpecial() or DomainPort::Set() failed */
     }
 
     // IP:port safe, try to parse it as IP:port
diff --git a/src/test/evo_netinfo_tests.cpp b/src/test/evo_netinfo_tests.cpp
index f334b83aa240..a1df594c820b 100644
--- a/src/test/evo_netinfo_tests.cpp
+++ b/src/test/evo_netinfo_tests.cpp
@@ -40,12 +40,16 @@ static const std::vector<TestEntry> addr_vals_main{
     // - Non-IPv4 addresses are prohibited in MnNetInfo
     // - Any valid BIP155 address is allowed in ExtNetInfo
     {{NetInfoPurpose::CORE_P2P, "[2606:4700:4700::1111]:9999"}, NetInfoStatus::BadInput, NetInfoStatus::Success},
-    // Domains are not allowed for Core P2P or Platform P2P
+    // - MnNetInfo doesn't allow storing anything except a Core P2P address
+    // - Privacy network domains are allowed in ExtNetInfo but internet domains are not
     {{NetInfoPurpose::CORE_P2P, "example.com:9999"}, NetInfoStatus::BadInput, NetInfoStatus::BadInput},
+    {{NetInfoPurpose::CORE_P2P, "pg6mmjiyjmcrsslvykfwnntlaru7p5svn6y2ymmju6nubxndf4pscryd.onion:9999"}, NetInfoStatus::BadInput, NetInfoStatus::Success},
     {{NetInfoPurpose::PLATFORM_P2P, "example.com:9999"}, NetInfoStatus::MaxLimit, NetInfoStatus::BadInput},
+    {{NetInfoPurpose::PLATFORM_P2P, "pg6mmjiyjmcrsslvykfwnntlaru7p5svn6y2ymmju6nubxndf4pscryd.onion:9999"}, NetInfoStatus::MaxLimit, NetInfoStatus::Success},
     // - MnNetInfo doesn't allow storing anything except a Core P2P address
-    // - ExtNetInfo can store Platform HTTPS addresses *as domains*
+    // - ExtNetInfo can store Platform HTTPS addresses *as domains* alongside privacy network domains
     {{NetInfoPurpose::PLATFORM_HTTPS, "example.com:9999"}, NetInfoStatus::MaxLimit, NetInfoStatus::Success},
+    {{NetInfoPurpose::PLATFORM_HTTPS, "pg6mmjiyjmcrsslvykfwnntlaru7p5svn6y2ymmju6nubxndf4pscryd.onion:9999"}, NetInfoStatus::MaxLimit, NetInfoStatus::Success},
     // Incorrect IPv4 address
     {{NetInfoPurpose::CORE_P2P, "1.1.1.256:9999"}, NetInfoStatus::BadInput, NetInfoStatus::BadInput},
     // Missing address
@@ -143,10 +147,20 @@ static const std::vector<TestEntry> addr_vals_reg{
 
 enum class ExpectedType : uint8_t {
     CJDNS,
+    I2P,
+    Tor,
 };
 
 static const std::vector<std::tuple</*type=*/ExpectedType, /*input=*/std::string, /*expected_ret=*/NetInfoStatus>> privacy_addr_vals{
     {ExpectedType::CJDNS, "[fc00:3344:5566:7788:9900:aabb:ccdd:eeff]:9998", NetInfoStatus::Success},
+    // ExtNetInfo can store I2P addresses as long as it uses port 0
+    {ExpectedType::I2P, "udhdrtrcetjm5sxzskjyr5ztpeszydbh4dpl3pl4utgqqw2v4jna.b32.i2p:0", NetInfoStatus::Success},
+    // ExtNetInfo can store onion addresses
+    {ExpectedType::Tor, "pg6mmjiyjmcrsslvykfwnntlaru7p5svn6y2ymmju6nubxndf4pscryd.onion:9998", NetInfoStatus::Success},
+    // ExtNetInfo can store I2P addresses but non-zero ports are not allowed
+    {ExpectedType::I2P, "udhdrtrcetjm5sxzskjyr5ztpeszydbh4dpl3pl4utgqqw2v4jna.b32.i2p:9998", NetInfoStatus::BadPort},
+    // ExtNetInfo can store onion addresses but zero ports are not allowed
+    {ExpectedType::Tor, "pg6mmjiyjmcrsslvykfwnntlaru7p5svn6y2ymmju6nubxndf4pscryd.onion:0", NetInfoStatus::BadPort},
 };
 
 BOOST_FIXTURE_TEST_CASE(mnnetinfo_rules_reg, RegTestingSetup) { TestMnNetInfo(addr_vals_reg); }
@@ -206,6 +220,8 @@ BOOST_FIXTURE_TEST_CASE(extnetinfo_rules_reg, RegTestingSetup)
             {{NetInfoPurpose::PLATFORM_HTTPS, "example.123:443"}, NetInfoStatus::MaxLimit, NetInfoStatus::BadInput},
             // .local is a prohibited TLD
             {{NetInfoPurpose::PLATFORM_HTTPS, "somebodys-macbook-pro.local:9998"}, NetInfoStatus::MaxLimit, NetInfoStatus::BadInput},
+            // DomainPort isn't used for storing privacy network TLDs like .onion
+            {{NetInfoPurpose::PLATFORM_HTTPS, "pg6mmjiyjmcrsslvykfwnntlaru7p5svn6y2ymmju6nubxndf4pscryd:9998"}, NetInfoStatus::MaxLimit, NetInfoStatus::BadInput},
         };
         TestExtNetInfo(domain_vals);
     }
@@ -226,6 +242,12 @@ BOOST_FIXTURE_TEST_CASE(extnetinfo_rules_reg, RegTestingSetup)
         case ExpectedType::CJDNS:
             BOOST_CHECK(service.IsCJDNS());
             break;
+        case ExpectedType::I2P:
+            BOOST_CHECK(service.IsI2P());
+            break;
+        case ExpectedType::Tor:
+            BOOST_CHECK(service.IsTor());
+            break;
         } // no default case, so the compiler can warn about missing cases
     }
 }

From 2ba86f91c56ba69bf218c37fc9d2ae8fa9f8f80e Mon Sep 17 00:00:00 2001
From: Kittywhiskers Van Gogh <63189531+kwvg@users.noreply.github.com>
Date: Sun, 10 Aug 2025 13:09:42 +0000
Subject: [PATCH 050/656] test: use domains in functional test, add test for
 unique map checking

---
 test/functional/rpc_netinfo.py | 65 ++++++++++++++++++++++++++++++++++
 1 file changed, 65 insertions(+)

diff --git a/test/functional/rpc_netinfo.py b/test/functional/rpc_netinfo.py
index 5852fa4e40cc..8fb9cb2e6448 100755
--- a/test/functional/rpc_netinfo.py
+++ b/test/functional/rpc_netinfo.py
@@ -35,6 +35,21 @@
 PROTXVER_BASIC = 2
 PROTXVER_EXTADDR = 3
 
+# Sample domains
+DOMAINS_CLR = [
+    "server-1.example.com",
+    "server-2.example.com",
+]
+DOMAINS_TOR = [
+    "kpgvmscirrdqpekbqjsvw5teanhatztpp2gl6eee4zkowvwfxwenqaid.onion",
+    "pg6mmjiyjmcrsslvykfwnntlaru7p5svn6y2ymmju6nubxndf4pscryd.onion",
+]
+DOMAINS_I2P = [
+    "c4gfnttsuwqomiygupdqqqyy5y5emnk5c73hrfvatri67prd7vyq.b32.i2p",
+    "udhdrtrcetjm5sxzskjyr5ztpeszydbh4dpl3pl4utgqqw2v4jna.b32.i2p",
+    "ukeu3k5oycgaauneqgtnvselmt4yemvoilkln7jpvamvfx7dnkdq.b32.i2p",
+]
+
 class EvoNode:
     mn: MasternodeInfo
     node: TestNode
@@ -191,6 +206,12 @@ def run_test(self):
         self.test_empty_fields()
         self.log.info("Test output masternode address fields for consistency (post-fork)")
         self.test_shims()
+        # Need to destroy masternodes as the next test will be re-creating them
+        self.node_evo.destroy_mn(self)
+        self.node_two.destroy_mn(self)
+        self.reconnect_nodes()
+        self.log.info("Test unique properties map duplication checks")
+        self.test_uniqueness()
 
     def test_validation_common(self):
         # Arrays of addresses with invalid inputs get refused
@@ -326,6 +347,15 @@ def test_validation_extended(self):
             self.node_evo.register_mn(self, False, f"127.0.0.1:{self.node_evo.mn.nodePort}", DEFAULT_PORT_PLATFORM_P2P,
                                       [f"127.0.0.1:{DEFAULT_PORT_PLATFORM_HTTP}"])])[0]['allowed']
 
+        # coreP2PAddrs and platformP2PAddrs accept privacy network domains and platformHTTPSAddrs additionally supports internet domains
+        # Note: I2P entries cannot be differentiated by port, they must always use port 0
+        assert self.node_evo.node.testmempoolaccept([
+            self.node_evo.register_mn(self, False,
+                                      [f"127.0.0.1:{self.node_evo.mn.nodePort}", f"{DOMAINS_TOR[0]}:{self.node_evo.mn.nodePort}", f"{DOMAINS_I2P[0]}:0"],
+                                      [f"127.0.0.1:{DEFAULT_PORT_PLATFORM_P2P}", f"{DOMAINS_TOR[0]}:{DEFAULT_PORT_PLATFORM_P2P}", f"{DOMAINS_I2P[1]}:0"],
+                                      [f"127.0.0.1:{DEFAULT_PORT_PLATFORM_HTTP}", f"{DOMAINS_TOR[0]}:{DEFAULT_PORT_PLATFORM_HTTP}", f"{DOMAINS_I2P[2]}:0",
+                                       f"{DOMAINS_CLR[0]}:{DEFAULT_PORT_PLATFORM_HTTP}"] )])[0]['allowed']
+
         # Port numbers may not be wrapped in arrays, either as integers or strings
         self.node_evo.register_mn(self, False, f"127.0.0.1:{self.node_evo.mn.nodePort}", [DEFAULT_PORT_PLATFORM_P2P], DEFAULT_PORT_PLATFORM_HTTP,
                                   -8, "Invalid param for platformP2PAddrs[0], must be string")
@@ -511,5 +541,40 @@ def test_shims(self):
         self.node_evo.set_active_state(self, False)
         self.reconnect_nodes()
 
+    def test_uniqueness(self):
+        # Empty registrations are not registered as conflicts
+        self.node_evo.register_mn(self, True, "", "", "")
+        self.node_two.register_mn(self, True, "", "", "")
+
+        # Validate that the unique properties map correctly recognizes entries as duplicates
+        self.node_evo.update_mn(self, True,
+                                [f"127.0.0.1:{self.node_evo.mn.nodePort}", f"{DOMAINS_TOR[0]}:{self.node_evo.mn.nodePort}"],
+                                [f"127.0.0.1:{DEFAULT_PORT_PLATFORM_P2P}", f"{DOMAINS_I2P[0]}:0"],
+                                [f"127.0.0.1:{DEFAULT_PORT_PLATFORM_HTTP}", f"{DOMAINS_CLR[0]}:{DEFAULT_PORT_PLATFORM_HTTP}"])
+
+        def update_node_two(self, duplicate_addr = None, duplicate_tor = None, duplicate_i2p = None, duplicate_domain = None):
+            args = [
+                self, True,
+                [duplicate_addr or f"127.0.0.2:{self.node_two.mn.nodePort}", duplicate_tor or f"{DOMAINS_TOR[1]}:{self.node_two.mn.nodePort}"],
+                [f"127.0.0.2:{DEFAULT_PORT_PLATFORM_P2P}", duplicate_i2p or f"{DOMAINS_I2P[1]}:0"],
+                [f"127.0.0.2:{DEFAULT_PORT_PLATFORM_HTTP}", duplicate_domain or f"{DOMAINS_CLR[1]}:{DEFAULT_PORT_PLATFORM_HTTP}"]
+            ]
+            if duplicate_addr or duplicate_tor or duplicate_i2p or duplicate_domain:
+                args += [-1, "bad-protx-dup-netinfo-entry"]
+            self.node_two.update_mn(*args)
+
+        # Check for detection of duplicate IP:addr (CService)
+        update_node_two(self, duplicate_addr=f"127.0.0.1:{self.node_evo.mn.nodePort}")
+
+        # Check for detection of duplicate privacy addr (CService)
+        update_node_two(self, duplicate_tor=f"{DOMAINS_TOR[0]}:{self.node_evo.mn.nodePort}")
+        update_node_two(self, duplicate_i2p=f"{DOMAINS_I2P[0]}:0")
+
+        # Check for detection of duplicate internet addr (DomainPort)
+        update_node_two(self, duplicate_domain=f"{DOMAINS_CLR[0]}:{DEFAULT_PORT_PLATFORM_HTTP}")
+
+        # All non-duplicate entries should still succeed
+        update_node_two(self)
+
 if __name__ == "__main__":
     NetInfoTest().main()

From 739d9f1cd92f6be50998593f0c53bfaea7f583f8 Mon Sep 17 00:00:00 2001
From: pasta <pasta@dashboost.org>
Date: Thu, 2 Oct 2025 19:52:31 -0500
Subject: [PATCH 051/656] refactor: allow wallet to select fresh change address
 to prevent address reuse in coinjoin createdenoms

---
 src/coinjoin/util.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/coinjoin/util.cpp b/src/coinjoin/util.cpp
index dd4c27281217..1d6a503f71b3 100644
--- a/src/coinjoin/util.cpp
+++ b/src/coinjoin/util.cpp
@@ -125,8 +125,8 @@ CTransactionBuilder::CTransactionBuilder(CWallet& wallet, const CompactTallyItem
     coinControl.m_discard_feerate = ::GetDiscardRate(m_wallet);
     // Generate a feerate which will be used by calculations of this class and also by CWallet::CreateTransaction
     coinControl.m_feerate = std::max(GetRequiredFeeRate(m_wallet), m_wallet.m_pay_tx_fee);
-    // Change always goes back to origin
-    coinControl.destChange = tallyItemIn.txdest;
+    // Do not force change to go back to the origin address; let the wallet
+    // select a fresh change destination to avoid address reuse.
     // Only allow tallyItems inputs for tx creation
     coinControl.m_allow_other_inputs = false;
     // Create dummy tx to calculate the exact required fees upfront for accurate amount and fee calculations

From 6ca08f6846fa4ed920dbc39e07a74848bbd8da1e Mon Sep 17 00:00:00 2001
From: pasta <pasta@dashboost.org>
Date: Thu, 2 Oct 2025 21:30:14 -0500
Subject: [PATCH 052/656] docs: add release notes for CoinJoin change address
 improvement in wallet

---
 doc/release-notes-6870.md | 8 ++++++++
 1 file changed, 8 insertions(+)
 create mode 100644 doc/release-notes-6870.md

diff --git a/doc/release-notes-6870.md b/doc/release-notes-6870.md
new file mode 100644
index 000000000000..8d2fa9609e69
--- /dev/null
+++ b/doc/release-notes-6870.md
@@ -0,0 +1,8 @@
+Wallet
+------
+
+- CoinJoin denomination creation now uses a fresh change address instead of
+  reusing the source address. This avoids address/public key reuse and aligns
+  with wallet best practices. (#6870)
+
+

From d6e9d97da995c74b85597ef976df83857a6ca125 Mon Sep 17 00:00:00 2001
From: fanquake <fanquake@gmail.com>
Date: Fri, 21 Apr 2023 11:40:09 +0100
Subject: [PATCH 053/656] Merge bitcoin/bitcoin#27464: fuzz: re-enable
 prioritisetransaction & analyzepsbt RPC

faa7144d3cf41e6410d942a3c485982ee65b3c6e fuzz: re-enable prioritisetransaction & analyzepsbt RPC (MarcoFalke)

Pull request description:

  The linked issue seems fixed, so it should be fine to re-enable

ACKs for top commit:
  dergoegge:
    utACK faa7144d3cf41e6410d942a3c485982ee65b3c6e

Tree-SHA512: a681c726fceacc27ab5a03d455c7808d33f3cb11fe7d253d455526568af840b29f0c3c1d97c54785ef9277e7891a3aa742ac73ccd3cf115b7606eba50864aaa9
---
 src/test/fuzz/rpc.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/test/fuzz/rpc.cpp b/src/test/fuzz/rpc.cpp
index 892823dea067..c959523a1681 100644
--- a/src/test/fuzz/rpc.cpp
+++ b/src/test/fuzz/rpc.cpp
@@ -70,7 +70,6 @@ const std::vector<std::string> RPC_COMMANDS_NOT_SAFE_FOR_FUZZING{
     "addconnection",  // avoid DNS lookups
     "addnode",        // avoid DNS lookups
     "addpeeraddress", // avoid DNS lookups
-    "analyzepsbt",    // avoid signed integer overflow in CFeeRate::GetFee(unsigned long) (https://github.com/bitcoin/bitcoin/issues/20607)
     "dumptxoutset",   // avoid writing to disk
     "dumpwallet", // avoid writing to disk
     "echoipc",              // avoid assertion failure (Assertion `"EnsureAnyNodeContext(request.context).init" && check' failed.)
@@ -79,7 +78,6 @@ const std::vector<std::string> RPC_COMMANDS_NOT_SAFE_FOR_FUZZING{
     "gettxoutproof",        // avoid prohibitively slow execution
     "importwallet", // avoid reading from disk
     "loadwallet",   // avoid reading from disk
-    "prioritisetransaction", // avoid signed integer overflow in CTxMemPool::PrioritiseTransaction(uint256 const&, long const&) (https://github.com/bitcoin/bitcoin/issues/20626)
     "savemempool",           // disabled as a precautionary measure: may take a file path argument in the future
     "setban",                // avoid DNS lookups
     "stop",                  // avoid shutdown state
@@ -87,6 +85,7 @@ const std::vector<std::string> RPC_COMMANDS_NOT_SAFE_FOR_FUZZING{
 
 // RPC commands which are safe for fuzzing.
 const std::vector<std::string> RPC_COMMANDS_SAFE_FOR_FUZZING{
+    "analyzepsbt",
     "clearbanned",
     "combinepsbt",
     "combinerawtransaction",
@@ -138,6 +137,7 @@ const std::vector<std::string> RPC_COMMANDS_SAFE_FOR_FUZZING{
     "getrpcinfo",
     "gettxout",
     "gettxoutsetinfo",
+    "gettxspendingprevout",
     "help",
     "invalidateblock",
     "joinpsbts",
@@ -146,6 +146,7 @@ const std::vector<std::string> RPC_COMMANDS_SAFE_FOR_FUZZING{
     "mockscheduler",
     "ping",
     "preciousblock",
+    "prioritisetransaction",
     "pruneblockchain",
     "reconsiderblock",
     "scantxoutset",

From df3de12af424ed57c04d22be400de69852cab036 Mon Sep 17 00:00:00 2001
From: Andrew Chow <github@achow101.com>
Date: Tue, 21 Mar 2023 13:42:14 -0400
Subject: [PATCH 054/656] Merge bitcoin/bitcoin#27278: Log new headers

2c3a90f663a61ee147d785167a2902494d81d34d log: on new valid header (James O'Beirne)
e5ce8576349d404c466b2f4cab1ca7bf920904b2 log: net: new header over cmpctblock (James O'Beirne)

Pull request description:

  Alternate to #27276.

  Devs were [suprised to realize](https://twitter.com/jamesob/status/1637237917201383425) last night that we don't have definitive logging for when a given header was first received.

  This logs to the main stream when new headers are received outside of IBD, as well as when headers come in over cmpctblocks. The rationale of not hiding these under log categories is that they may be useful to have widely available when debugging strange network activity, and the marginal volume is modest.

ACKs for top commit:
  dergoegge:
    Code review ACK 2c3a90f663a61ee147d785167a2902494d81d34d
  achow101:
    ACK 2c3a90f663a61ee147d785167a2902494d81d34d
  Sjors:
    tACK 2c3a90f663a61ee147d785167a2902494d81d34d
  josibake:
    ACK https://github.com/bitcoin/bitcoin/pull/27278/commits/2c3a90f663a61ee147d785167a2902494d81d34d

Tree-SHA512: 49fdcbe07799c8adc24143d7e5054a0c93fef120d2e9d5fddbd3b119550d895e2985be6ac10dd1825ea23a6fa5479c1b76d5518c136fbd983fa76c0d39dc354f
---
 src/net_processing.cpp | 16 +++++++++++-----
 src/validation.cpp     | 18 +++++++++++++++++-
 2 files changed, 28 insertions(+), 6 deletions(-)

diff --git a/src/net_processing.cpp b/src/net_processing.cpp
index 3840ed5e5748..5605f533045e 100644
--- a/src/net_processing.cpp
+++ b/src/net_processing.cpp
@@ -4610,6 +4610,7 @@ void PeerManagerImpl::ProcessMessage(
         vRecv >> cmpctblock;
 
         bool received_new_header = false;
+        const auto blockhash = cmpctblock.header.GetHash();
 
         {
         LOCK(cs_main);
@@ -4623,7 +4624,7 @@ void PeerManagerImpl::ProcessMessage(
             return;
         }
 
-        if (!m_chainman.m_blockman.LookupBlockIndex(cmpctblock.header.GetHash())) {
+        if (!m_chainman.m_blockman.LookupBlockIndex(blockhash)) {
             received_new_header = true;
         }
         }
@@ -4637,6 +4638,11 @@ void PeerManagerImpl::ProcessMessage(
             }
         }
 
+        if (received_new_header) {
+            LogPrintfCategory(BCLog::NET, "Saw new cmpctblock header hash=%s peer=%d\n",
+                blockhash.ToString(), pfrom.GetId());
+        }
+
         // When we succeed in decoding a block's txids from a cmpctblock
         // message we typically jump to the BLOCKTXN handling code, with a
         // dummy (empty) BLOCKTXN message, to re-use the logic there in
@@ -4679,7 +4685,7 @@ void PeerManagerImpl::ProcessMessage(
                 // We requested this block for some reason, but our mempool will probably be useless
                 // so we just grab the block via normal getdata
                 std::vector<CInv> vInv(1);
-                vInv[0] = CInv(MSG_BLOCK, cmpctblock.header.GetHash());
+                vInv[0] = CInv(MSG_BLOCK, blockhash);
                 m_connman.PushMessage(&pfrom, msgMaker.Make(NetMsgType::GETDATA, vInv));
             }
             return;
@@ -4714,7 +4720,7 @@ void PeerManagerImpl::ProcessMessage(
                 } else if (status == READ_STATUS_FAILED) {
                     // Duplicate txindexes, the block is now in-flight, so just request it
                     std::vector<CInv> vInv(1);
-                    vInv[0] = CInv(MSG_BLOCK, cmpctblock.header.GetHash());
+                    vInv[0] = CInv(MSG_BLOCK, blockhash);
                     m_connman.PushMessage(&pfrom, msgMaker.Make(NetMsgType::GETDATA, vInv));
                     return;
                 }
@@ -4727,7 +4733,7 @@ void PeerManagerImpl::ProcessMessage(
                 if (req.indexes.empty()) {
                     // Dirty hack to jump to BLOCKTXN code (TODO: move message handling into their own functions)
                     BlockTransactions txn;
-                    txn.blockhash = cmpctblock.header.GetHash();
+                    txn.blockhash = blockhash;
                     blockTxnMsg << txn;
                     fProcessBLOCKTXN = true;
                 } else {
@@ -4757,7 +4763,7 @@ void PeerManagerImpl::ProcessMessage(
                 // We requested this block, but its far into the future, so our
                 // mempool will probably be useless - request the block normally
                 std::vector<CInv> vInv(1);
-                vInv[0] = CInv(MSG_BLOCK, cmpctblock.header.GetHash());
+                vInv[0] = CInv(MSG_BLOCK, blockhash);
                 m_connman.PushMessage(&pfrom, msgMaker.Make(NetMsgType::GETDATA, vInv));
                 return;
             } else {
diff --git a/src/validation.cpp b/src/validation.cpp
index 47f22053b226..ffc92634ad07 100644
--- a/src/validation.cpp
+++ b/src/validation.cpp
@@ -4217,9 +4217,25 @@ bool ChainstateManager::AcceptBlockHeader(const CBlockHeader& block, BlockValida
     if (ppindex)
         *ppindex = pindex;
 
+    // Since this is the earliest point at which we have determined that a
+    // header is both new and valid, log here.
+    //
+    // These messages are valuable for detecting potential selfish mining behavior;
+    // if multiple displacing headers are seen near simultaneously across many
+    // nodes in the network, this might be an indication of selfish mining. Having
+    // this log by default when not in IBD ensures broad availability of this data
+    // in case investigation is merited.
+    const auto msg = strprintf(
+        "Saw new header hash=%s height=%d", hash.ToString(), pindex->nHeight);
+
+    if (ActiveChainstate().IsInitialBlockDownload()) {
+        LogPrintLevel(BCLog::VALIDATION, BCLog::Level::Debug, "%s\n", msg);
+    } else {
+        LogPrintf("%s\n", msg);
+    }
+
     // Notify external listeners about accepted block header
     GetMainSignals().AcceptedBlockHeader(pindex);
-
     return true;
 }
 

From d4044d45c76e968b398b8339c35e1091426de30d Mon Sep 17 00:00:00 2001
From: pasta <pasta@dashboost.org>
Date: Fri, 3 Oct 2025 09:29:54 -0500
Subject: [PATCH 055/656] feat: introduce -coinjoinfreshchange option to
 enhance CoinJoin change address handling

Added a new command-line option `-coinjoinfreshchange` to allow users to control whether change from CoinJoin denomination creation is sent to a fresh change address or back to the source address. This change improves privacy by preventing address reuse. Updated relevant documentation and code to support this feature.
---
 doc/release-notes-6870.md | 7 ++++---
 src/coinjoin/options.cpp  | 8 ++++++++
 src/coinjoin/options.h    | 4 ++++
 src/coinjoin/util.cpp     | 9 +++++++--
 src/wallet/init.cpp       | 1 +
 5 files changed, 24 insertions(+), 5 deletions(-)

diff --git a/doc/release-notes-6870.md b/doc/release-notes-6870.md
index 8d2fa9609e69..c8225e49fefb 100644
--- a/doc/release-notes-6870.md
+++ b/doc/release-notes-6870.md
@@ -1,8 +1,9 @@
 Wallet
 ------
 
-- CoinJoin denomination creation now uses a fresh change address instead of
-  reusing the source address. This avoids address/public key reuse and aligns
-  with wallet best practices. (#6870)
+- Add `-coinjoinfreshchange` option to control change destination behavior
+  during CoinJoin denomination creation. By default (flag unset), change is
+  sent back to the source address (legacy behavior). When enabled, change is
+  sent to a fresh change address to avoid address/public key reuse. (#6870)
 
 
diff --git a/src/coinjoin/options.cpp b/src/coinjoin/options.cpp
index f6e3e133d0e1..6b5e0acf33d4 100644
--- a/src/coinjoin/options.cpp
+++ b/src/coinjoin/options.cpp
@@ -61,11 +61,18 @@ void CCoinJoinClientOptions::SetDenomsHardCap(int denoms_hardcap)
     options.nCoinJoinDenomsHardCap = denoms_hardcap;
 }
 
+void CCoinJoinClientOptions::SetFreshChange(bool fresh_change)
+{
+    CCoinJoinClientOptions& options = CCoinJoinClientOptions::Get();
+    options.fCoinJoinFreshChange = fresh_change;
+}
+
 void CCoinJoinClientOptions::Init()
 {
     assert(!CCoinJoinClientOptions::_instance);
     static CCoinJoinClientOptions instance;
     instance.fCoinJoinMultiSession = gArgs.GetBoolArg("-coinjoinmultisession", DEFAULT_COINJOIN_MULTISESSION);
+    instance.fCoinJoinFreshChange = gArgs.GetBoolArg("-coinjoinfreshchange", DEFAULT_COINJOIN_FRESHCHANGE);
     instance.nCoinJoinSessions = std::min(std::max((int)gArgs.GetIntArg("-coinjoinsessions", DEFAULT_COINJOIN_SESSIONS), MIN_COINJOIN_SESSIONS), MAX_COINJOIN_SESSIONS);
     instance.nCoinJoinRounds = std::min(std::max((int)gArgs.GetIntArg("-coinjoinrounds", DEFAULT_COINJOIN_ROUNDS), MIN_COINJOIN_ROUNDS), MAX_COINJOIN_ROUNDS);
     instance.nCoinJoinAmount = std::min(std::max((int)gArgs.GetIntArg("-coinjoinamount", DEFAULT_COINJOIN_AMOUNT), MIN_COINJOIN_AMOUNT), MAX_COINJOIN_AMOUNT);
@@ -85,4 +92,5 @@ void CCoinJoinClientOptions::GetJsonInfo(UniValue& obj)
     obj.pushKV("max_amount", options.nCoinJoinAmount.load());
     obj.pushKV("denoms_goal", options.nCoinJoinDenomsGoal.load());
     obj.pushKV("denoms_hardcap", options.nCoinJoinDenomsHardCap.load());
+    obj.pushKV("fresh_change", options.fCoinJoinFreshChange.load());
 }
diff --git a/src/coinjoin/options.h b/src/coinjoin/options.h
index b5e8c8a23f5a..809f192a0d50 100644
--- a/src/coinjoin/options.h
+++ b/src/coinjoin/options.h
@@ -31,6 +31,7 @@ static constexpr int DEFAULT_COINJOIN_DENOMS_HARDCAP = 300;
 
 static constexpr bool DEFAULT_COINJOIN_AUTOSTART = false;
 static constexpr bool DEFAULT_COINJOIN_MULTISESSION = false;
+static constexpr bool DEFAULT_COINJOIN_FRESHCHANGE = false;
 
 // How many new denom outputs to create before we consider the "goal" loop in CreateDenominated
 // a final one and start creating an actual tx. Same limit applies for the "hard cap" part of the algo.
@@ -60,6 +61,7 @@ class CCoinJoinClientOptions
     static int GetAmount() { return CCoinJoinClientOptions::Get().nCoinJoinAmount; }
     static int GetDenomsGoal() { return CCoinJoinClientOptions::Get().nCoinJoinDenomsGoal; }
     static int GetDenomsHardCap() { return CCoinJoinClientOptions::Get().nCoinJoinDenomsHardCap; }
+    static bool GetFreshChange() { return CCoinJoinClientOptions::Get().fCoinJoinFreshChange; }
 
     static void SetEnabled(bool fEnabled);
     static void SetMultiSessionEnabled(bool fEnabled);
@@ -68,6 +70,7 @@ class CCoinJoinClientOptions
     static void SetAmount(CAmount amount);
     static void SetDenomsGoal(int denoms_goal);
     static void SetDenomsHardCap(int denoms_hardcap);
+    static void SetFreshChange(bool fresh_change);
 
     static bool IsEnabled() { return CCoinJoinClientOptions::Get().fEnableCoinJoin; }
     static bool IsMultiSessionEnabled() { return CCoinJoinClientOptions::Get().fCoinJoinMultiSession; }
@@ -86,6 +89,7 @@ class CCoinJoinClientOptions
     std::atomic<int> nCoinJoinDenomsHardCap{DEFAULT_COINJOIN_DENOMS_HARDCAP};
     std::atomic<bool> fEnableCoinJoin{false};
     std::atomic<bool> fCoinJoinMultiSession{DEFAULT_COINJOIN_MULTISESSION};
+    std::atomic<bool> fCoinJoinFreshChange{DEFAULT_COINJOIN_FRESHCHANGE};
 
     CCoinJoinClientOptions() = default;
 
diff --git a/src/coinjoin/util.cpp b/src/coinjoin/util.cpp
index 1d6a503f71b3..2858cef6a694 100644
--- a/src/coinjoin/util.cpp
+++ b/src/coinjoin/util.cpp
@@ -4,6 +4,7 @@
 
 #include <coinjoin/util.h>
 #include <policy/fees.h>
+#include <coinjoin/options.h>
 #include <policy/policy.h>
 #include <util/translation.h>
 #include <wallet/fees.h>
@@ -125,8 +126,12 @@ CTransactionBuilder::CTransactionBuilder(CWallet& wallet, const CompactTallyItem
     coinControl.m_discard_feerate = ::GetDiscardRate(m_wallet);
     // Generate a feerate which will be used by calculations of this class and also by CWallet::CreateTransaction
     coinControl.m_feerate = std::max(GetRequiredFeeRate(m_wallet), m_wallet.m_pay_tx_fee);
-    // Do not force change to go back to the origin address; let the wallet
-    // select a fresh change destination to avoid address reuse.
+    // By default, keep legacy behavior: change goes back to the origin address.
+    // When -coinjoinfreshchange is enabled, let the wallet select a fresh
+    // change destination to avoid address reuse.
+    if (!CCoinJoinClientOptions::GetFreshChange()) {
+        coinControl.destChange = tallyItemIn.txdest;
+    }
     // Only allow tallyItems inputs for tx creation
     coinControl.m_allow_other_inputs = false;
     // Create dummy tx to calculate the exact required fees upfront for accurate amount and fee calculations
diff --git a/src/wallet/init.cpp b/src/wallet/init.cpp
index 4aa657beb8d3..780828f1a5d6 100644
--- a/src/wallet/init.cpp
+++ b/src/wallet/init.cpp
@@ -105,6 +105,7 @@ void WalletInit::AddWalletOptions(ArgsManager& argsman) const
     argsman.AddArg("-coinjoinmultisession", strprintf("Enable multiple CoinJoin mixing sessions per block, experimental (0-1, default: %u)", DEFAULT_COINJOIN_MULTISESSION), ArgsManager::ALLOW_ANY, OptionsCategory::WALLET_COINJOIN);
     argsman.AddArg("-coinjoinrounds=<n>", strprintf("Use N separate masternodes for each denominated input to mix funds (%u-%u, default: %u)", MIN_COINJOIN_ROUNDS, MAX_COINJOIN_ROUNDS, DEFAULT_COINJOIN_ROUNDS), ArgsManager::ALLOW_ANY, OptionsCategory::WALLET_COINJOIN);
     argsman.AddArg("-coinjoinsessions=<n>", strprintf("Use N separate masternodes in parallel to mix funds (%u-%u, default: %u)", MIN_COINJOIN_SESSIONS, MAX_COINJOIN_SESSIONS, DEFAULT_COINJOIN_SESSIONS), ArgsManager::ALLOW_ANY, OptionsCategory::WALLET_COINJOIN);
+    argsman.AddArg("-coinjoinfreshchange", strprintf("Send change from denomination creation to a fresh change address instead of the source address (0-1, default: %u)", DEFAULT_COINJOIN_FRESHCHANGE), ArgsManager::ALLOW_ANY, OptionsCategory::WALLET_COINJOIN);
 
 #ifdef USE_BDB
     argsman.AddArg("-dblogsize=<n>", strprintf("Flush wallet database activity from memory to disk log every <n> megabytes (default: %u)", DatabaseOptions().max_log_mb), ArgsManager::ALLOW_ANY | ArgsManager::DEBUG_ONLY, OptionsCategory::WALLET_DEBUG_TEST);

From 191c79c813fcfb278aedac10c44314b38598d2f7 Mon Sep 17 00:00:00 2001
From: pasta <pasta@dashboost.org>
Date: Fri, 3 Oct 2025 09:48:53 -0500
Subject: [PATCH 056/656] refactor: update thread-safety annotations to use
 EXCLUSIVE_LOCKS_REQUIRED for various methods in meta store and info

---
 src/masternode/meta.cpp | 14 +++++++-------
 src/masternode/meta.h   | 20 ++++++++++----------
 2 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/src/masternode/meta.cpp b/src/masternode/meta.cpp
index 783615c1b222..93dda0796f13 100644
--- a/src/masternode/meta.cpp
+++ b/src/masternode/meta.cpp
@@ -66,7 +66,7 @@ void CMasternodeMetaInfo::RemoveGovernanceObject(const uint256& nGovernanceObjec
     mapGovernanceObjectsVotedOn.erase(nGovernanceObjectHash);
 }
 
-CMasternodeMetaInfoPtr CMasternodeMetaMan::GetMetaInfo(const uint256& proTxHash, bool fCreate) LOCKS_EXCLUDED(cs)
+CMasternodeMetaInfoPtr CMasternodeMetaMan::GetMetaInfo(const uint256& proTxHash, bool fCreate) EXCLUSIVE_LOCKS_REQUIRED(!cs)
 {
     LOCK(cs);
     auto it = metaInfos.find(proTxHash);
@@ -115,7 +115,7 @@ bool CMasternodeMetaMan::AddGovernanceVote(const uint256& proTxHash, const uint2
     return true;
 }
 
-void CMasternodeMetaMan::RemoveGovernanceObject(const uint256& nGovernanceObjectHash) LOCKS_EXCLUDED(cs)
+void CMasternodeMetaMan::RemoveGovernanceObject(const uint256& nGovernanceObjectHash) EXCLUSIVE_LOCKS_REQUIRED(!cs)
 {
     LOCK(cs);
     for(const auto& p : metaInfos) {
@@ -123,20 +123,20 @@ void CMasternodeMetaMan::RemoveGovernanceObject(const uint256& nGovernanceObject
     }
 }
 
-std::vector<uint256> CMasternodeMetaMan::GetAndClearDirtyGovernanceObjectHashes() LOCKS_EXCLUDED(cs)
+std::vector<uint256> CMasternodeMetaMan::GetAndClearDirtyGovernanceObjectHashes() EXCLUSIVE_LOCKS_REQUIRED(!cs)
 {
     std::vector<uint256> vecTmp;
     WITH_LOCK(cs, vecTmp.swap(vecDirtyGovernanceObjectHashes));
     return vecTmp;
 }
 
-bool CMasternodeMetaMan::AlreadyHavePlatformBan(const uint256& inv_hash) const LOCKS_EXCLUDED(cs)
+bool CMasternodeMetaMan::AlreadyHavePlatformBan(const uint256& inv_hash) const EXCLUSIVE_LOCKS_REQUIRED(!cs)
 {
     LOCK(cs);
     return m_seen_platform_bans.exists(inv_hash);
 }
 
-std::optional<PlatformBanMessage> CMasternodeMetaMan::GetPlatformBan(const uint256& inv_hash) const LOCKS_EXCLUDED(cs)
+std::optional<PlatformBanMessage> CMasternodeMetaMan::GetPlatformBan(const uint256& inv_hash) const EXCLUSIVE_LOCKS_REQUIRED(!cs)
 {
     LOCK(cs);
     PlatformBanMessage ret;
@@ -147,13 +147,13 @@ std::optional<PlatformBanMessage> CMasternodeMetaMan::GetPlatformBan(const uint2
     return ret;
 }
 
-void CMasternodeMetaMan::RememberPlatformBan(const uint256& inv_hash, PlatformBanMessage&& msg) LOCKS_EXCLUDED(cs)
+void CMasternodeMetaMan::RememberPlatformBan(const uint256& inv_hash, PlatformBanMessage&& msg) EXCLUSIVE_LOCKS_REQUIRED(!cs)
 {
     LOCK(cs);
     m_seen_platform_bans.insert(inv_hash, std::move(msg));
 }
 
-std::string MasternodeMetaStore::ToString() const LOCKS_EXCLUDED(cs)
+std::string MasternodeMetaStore::ToString() const EXCLUSIVE_LOCKS_REQUIRED(!cs)
 {
     LOCK(cs);
     return strprintf("Masternodes: meta infos object count: %d, nDsqCount: %d", metaInfos.size(), nDsqCount);
diff --git a/src/masternode/meta.h b/src/masternode/meta.h
index 39e4902cf446..8d8df8d0df92 100644
--- a/src/masternode/meta.h
+++ b/src/masternode/meta.h
@@ -134,7 +134,7 @@ class MasternodeMetaStore
 
 public:
     template<typename Stream>
-    void Serialize(Stream &s) const LOCKS_EXCLUDED(cs)
+    void Serialize(Stream &s) const EXCLUSIVE_LOCKS_REQUIRED(!cs)
     {
         LOCK(cs);
         std::vector<CMasternodeMetaInfo> tmpMetaInfo;
@@ -145,7 +145,7 @@ class MasternodeMetaStore
     }
 
     template<typename Stream>
-    void Unserialize(Stream &s) LOCKS_EXCLUDED(cs)
+    void Unserialize(Stream &s) EXCLUSIVE_LOCKS_REQUIRED(!cs)
     {
         Clear();
 
@@ -163,14 +163,14 @@ class MasternodeMetaStore
         }
     }
 
-    void Clear() LOCKS_EXCLUDED(cs)
+    void Clear() EXCLUSIVE_LOCKS_REQUIRED(!cs)
     {
         LOCK(cs);
 
         metaInfos.clear();
     }
 
-    std::string ToString() const LOCKS_EXCLUDED(cs);
+    std::string ToString() const EXCLUSIVE_LOCKS_REQUIRED(!cs);
 };
 
 /**
@@ -233,7 +233,7 @@ class CMasternodeMetaMan : public MasternodeMetaStore
 
     bool IsValid() const { return is_valid; }
 
-    CMasternodeMetaInfoPtr GetMetaInfo(const uint256& proTxHash, bool fCreate = true) LOCKS_EXCLUDED(cs);
+    CMasternodeMetaInfoPtr GetMetaInfo(const uint256& proTxHash, bool fCreate = true) EXCLUSIVE_LOCKS_REQUIRED(!cs);
 
     int64_t GetDsqCount() const { return nDsqCount; }
     int64_t GetDsqThreshold(const uint256& proTxHash, int nMnCount);
@@ -242,13 +242,13 @@ class CMasternodeMetaMan : public MasternodeMetaStore
     void DisallowMixing(const uint256& proTxHash);
 
     bool AddGovernanceVote(const uint256& proTxHash, const uint256& nGovernanceObjectHash);
-    void RemoveGovernanceObject(const uint256& nGovernanceObjectHash) LOCKS_EXCLUDED(cs);
+    void RemoveGovernanceObject(const uint256& nGovernanceObjectHash) EXCLUSIVE_LOCKS_REQUIRED(!cs);
 
-    std::vector<uint256> GetAndClearDirtyGovernanceObjectHashes() LOCKS_EXCLUDED(cs);
+    std::vector<uint256> GetAndClearDirtyGovernanceObjectHashes() EXCLUSIVE_LOCKS_REQUIRED(!cs);
 
-    bool AlreadyHavePlatformBan(const uint256& inv_hash) const LOCKS_EXCLUDED(cs);
-    std::optional<PlatformBanMessage> GetPlatformBan(const uint256& inv_hash) const LOCKS_EXCLUDED(cs);
-    void RememberPlatformBan(const uint256& inv_hash, PlatformBanMessage&& msg) LOCKS_EXCLUDED(cs);
+    bool AlreadyHavePlatformBan(const uint256& inv_hash) const EXCLUSIVE_LOCKS_REQUIRED(!cs);
+    std::optional<PlatformBanMessage> GetPlatformBan(const uint256& inv_hash) const EXCLUSIVE_LOCKS_REQUIRED(!cs);
+    void RememberPlatformBan(const uint256& inv_hash, PlatformBanMessage&& msg) EXCLUSIVE_LOCKS_REQUIRED(!cs);
 };
 
 #endif // BITCOIN_MASTERNODE_META_H

From 4800e2fd9ec80baf74ee3bc0489dff82319001e0 Mon Sep 17 00:00:00 2001
From: pasta <pasta@dashboost.org>
Date: Sat, 4 Oct 2025 06:40:16 -0500
Subject: [PATCH 057/656] chore: run clang-format

---
 src/coinjoin/util.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/coinjoin/util.cpp b/src/coinjoin/util.cpp
index 2858cef6a694..1436cf728104 100644
--- a/src/coinjoin/util.cpp
+++ b/src/coinjoin/util.cpp
@@ -2,9 +2,9 @@
 // Distributed under the MIT/X11 software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
+#include <coinjoin/options.h>
 #include <coinjoin/util.h>
 #include <policy/fees.h>
-#include <coinjoin/options.h>
 #include <policy/policy.h>
 #include <util/translation.h>
 #include <wallet/fees.h>

From eb0e14c339656785034e7ee6ac20d2213be64a18 Mon Sep 17 00:00:00 2001
From: Konstantin Akimov <knstqq@gmail.com>
Date: Tue, 16 Sep 2025 00:57:05 +0700
Subject: [PATCH 058/656] refactor: rename hard-fork v23 to hard-fork v24

---
 src/chainparams.cpp                    | 64 +++++++++++++-------------
 src/consensus/params.h                 |  2 +-
 src/deploymentinfo.cpp                 |  2 +-
 src/evo/creditpool.cpp                 |  4 +-
 src/evo/creditpool.h                   |  2 +-
 src/evo/deterministicmns.cpp           | 12 ++---
 src/evo/providertx.cpp                 |  2 +-
 src/evo/specialtxman.cpp               |  6 +--
 src/rpc/blockchain.cpp                 |  2 +-
 test/functional/feature_asset_locks.py | 10 ++--
 test/functional/rpc_blockchain.py      |  4 +-
 11 files changed, 55 insertions(+), 55 deletions(-)

diff --git a/src/chainparams.cpp b/src/chainparams.cpp
index 31d47f4d4d12..48c69ce4a92e 100644
--- a/src/chainparams.cpp
+++ b/src/chainparams.cpp
@@ -209,14 +209,14 @@ class CMainParams : public CChainParams {
         consensus.vDeployments[Consensus::DEPLOYMENT_TESTDUMMY].nTimeout = Consensus::BIP9Deployment::NO_TIMEOUT;
         consensus.vDeployments[Consensus::DEPLOYMENT_TESTDUMMY].min_activation_height = 0; // No activation delay
 
-        consensus.vDeployments[Consensus::DEPLOYMENT_V23].bit = 12;
-        consensus.vDeployments[Consensus::DEPLOYMENT_V23].nStartTime = Consensus::BIP9Deployment::NEVER_ACTIVE; // TODO
-        consensus.vDeployments[Consensus::DEPLOYMENT_V23].nTimeout = Consensus::BIP9Deployment::NO_TIMEOUT; // TODO
-        consensus.vDeployments[Consensus::DEPLOYMENT_V23].nWindowSize = 4032;
-        consensus.vDeployments[Consensus::DEPLOYMENT_V23].nThresholdStart = 3226;     // 80% of 4032
-        consensus.vDeployments[Consensus::DEPLOYMENT_V23].nThresholdMin = 2420;       // 60% of 4032
-        consensus.vDeployments[Consensus::DEPLOYMENT_V23].nFalloffCoeff = 5;          // this corresponds to 10 periods
-        consensus.vDeployments[Consensus::DEPLOYMENT_V23].useEHF = true;
+        consensus.vDeployments[Consensus::DEPLOYMENT_V24].bit = 12;
+        consensus.vDeployments[Consensus::DEPLOYMENT_V24].nStartTime = Consensus::BIP9Deployment::NEVER_ACTIVE; // TODO
+        consensus.vDeployments[Consensus::DEPLOYMENT_V24].nTimeout = Consensus::BIP9Deployment::NO_TIMEOUT; // TODO
+        consensus.vDeployments[Consensus::DEPLOYMENT_V24].nWindowSize = 4032;
+        consensus.vDeployments[Consensus::DEPLOYMENT_V24].nThresholdStart = 3226;     // 80% of 4032
+        consensus.vDeployments[Consensus::DEPLOYMENT_V24].nThresholdMin = 2420;       // 60% of 4032
+        consensus.vDeployments[Consensus::DEPLOYMENT_V24].nFalloffCoeff = 5;          // this corresponds to 10 periods
+        consensus.vDeployments[Consensus::DEPLOYMENT_V24].useEHF = true;
 
         // The best chain should have at least this much work.
         consensus.nMinimumChainWork = uint256S("0x00000000000000000000000000000000000000000000aa587876325b0a1080c8"); // 2301632
@@ -407,14 +407,14 @@ class CTestNetParams : public CChainParams {
         consensus.vDeployments[Consensus::DEPLOYMENT_TESTDUMMY].nTimeout = Consensus::BIP9Deployment::NO_TIMEOUT;
         consensus.vDeployments[Consensus::DEPLOYMENT_TESTDUMMY].min_activation_height = 0; // No activation delay
 
-        consensus.vDeployments[Consensus::DEPLOYMENT_V23].bit = 12;
-        consensus.vDeployments[Consensus::DEPLOYMENT_V23].nStartTime = Consensus::BIP9Deployment::NEVER_ACTIVE; // TODO
-        consensus.vDeployments[Consensus::DEPLOYMENT_V23].nTimeout = Consensus::BIP9Deployment::NO_TIMEOUT;
-        consensus.vDeployments[Consensus::DEPLOYMENT_V23].nWindowSize = 100;
-        consensus.vDeployments[Consensus::DEPLOYMENT_V23].nThresholdStart = 80;       // 80% of 100
-        consensus.vDeployments[Consensus::DEPLOYMENT_V23].nThresholdMin = 60;         // 60% of 100
-        consensus.vDeployments[Consensus::DEPLOYMENT_V23].nFalloffCoeff = 5;          // this corresponds to 10 periods
-        consensus.vDeployments[Consensus::DEPLOYMENT_V23].useEHF = true;
+        consensus.vDeployments[Consensus::DEPLOYMENT_V24].bit = 12;
+        consensus.vDeployments[Consensus::DEPLOYMENT_V24].nStartTime = Consensus::BIP9Deployment::NEVER_ACTIVE; // TODO
+        consensus.vDeployments[Consensus::DEPLOYMENT_V24].nTimeout = Consensus::BIP9Deployment::NO_TIMEOUT;
+        consensus.vDeployments[Consensus::DEPLOYMENT_V24].nWindowSize = 100;
+        consensus.vDeployments[Consensus::DEPLOYMENT_V24].nThresholdStart = 80;       // 80% of 100
+        consensus.vDeployments[Consensus::DEPLOYMENT_V24].nThresholdMin = 60;         // 60% of 100
+        consensus.vDeployments[Consensus::DEPLOYMENT_V24].nFalloffCoeff = 5;          // this corresponds to 10 periods
+        consensus.vDeployments[Consensus::DEPLOYMENT_V24].useEHF = true;
 
         // The best chain should have at least this much work.
         consensus.nMinimumChainWork = uint256S("0x00000000000000000000000000000000000000000000000003472e1b8bd6a3b7"); // 1254997
@@ -580,14 +580,14 @@ class CDevNetParams : public CChainParams {
         consensus.vDeployments[Consensus::DEPLOYMENT_TESTDUMMY].nTimeout = Consensus::BIP9Deployment::NO_TIMEOUT;
         consensus.vDeployments[Consensus::DEPLOYMENT_TESTDUMMY].min_activation_height = 0; // No activation delay
 
-        consensus.vDeployments[Consensus::DEPLOYMENT_V23].bit = 12;
-        consensus.vDeployments[Consensus::DEPLOYMENT_V23].nStartTime = 1751328000;    // July 1, 2025
-        consensus.vDeployments[Consensus::DEPLOYMENT_V23].nTimeout = Consensus::BIP9Deployment::NO_TIMEOUT;
-        consensus.vDeployments[Consensus::DEPLOYMENT_V23].nWindowSize = 120;
-        consensus.vDeployments[Consensus::DEPLOYMENT_V23].nThresholdStart = 96;       // 80% of 120
-        consensus.vDeployments[Consensus::DEPLOYMENT_V23].nThresholdMin = 72;         // 60% of 120
-        consensus.vDeployments[Consensus::DEPLOYMENT_V23].nFalloffCoeff = 5;          // this corresponds to 10 periods
-        consensus.vDeployments[Consensus::DEPLOYMENT_V23].useEHF = true;
+        consensus.vDeployments[Consensus::DEPLOYMENT_V24].bit = 12;
+        consensus.vDeployments[Consensus::DEPLOYMENT_V24].nStartTime = 1751328000;    // July 1, 2025
+        consensus.vDeployments[Consensus::DEPLOYMENT_V24].nTimeout = Consensus::BIP9Deployment::NO_TIMEOUT;
+        consensus.vDeployments[Consensus::DEPLOYMENT_V24].nWindowSize = 120;
+        consensus.vDeployments[Consensus::DEPLOYMENT_V24].nThresholdStart = 96;       // 80% of 120
+        consensus.vDeployments[Consensus::DEPLOYMENT_V24].nThresholdMin = 72;         // 60% of 120
+        consensus.vDeployments[Consensus::DEPLOYMENT_V24].nFalloffCoeff = 5;          // this corresponds to 10 periods
+        consensus.vDeployments[Consensus::DEPLOYMENT_V24].useEHF = true;
 
         // The best chain should have at least this much work.
         consensus.nMinimumChainWork = uint256S("0x000000000000000000000000000000000000000000000000000000000000000");
@@ -817,14 +817,14 @@ class CRegTestParams : public CChainParams {
         consensus.vDeployments[Consensus::DEPLOYMENT_TESTDUMMY].nTimeout = Consensus::BIP9Deployment::NO_TIMEOUT;
         consensus.vDeployments[Consensus::DEPLOYMENT_TESTDUMMY].min_activation_height = 0; // No activation delay
 
-        consensus.vDeployments[Consensus::DEPLOYMENT_V23].bit = 12;
-        consensus.vDeployments[Consensus::DEPLOYMENT_V23].nStartTime = 0;
-        consensus.vDeployments[Consensus::DEPLOYMENT_V23].nTimeout = Consensus::BIP9Deployment::NO_TIMEOUT;
-        consensus.vDeployments[Consensus::DEPLOYMENT_V23].nWindowSize = 250;
-        consensus.vDeployments[Consensus::DEPLOYMENT_V23].nThresholdStart = 250 / 5 * 4;     // 80% of window size
-        consensus.vDeployments[Consensus::DEPLOYMENT_V23].nThresholdMin = 250 / 5 * 3;       // 60% of window size
-        consensus.vDeployments[Consensus::DEPLOYMENT_V23].nFalloffCoeff = 5;                 // this corresponds to 10 periods
-        consensus.vDeployments[Consensus::DEPLOYMENT_V23].useEHF = true;
+        consensus.vDeployments[Consensus::DEPLOYMENT_V24].bit = 12;
+        consensus.vDeployments[Consensus::DEPLOYMENT_V24].nStartTime = 0;
+        consensus.vDeployments[Consensus::DEPLOYMENT_V24].nTimeout = Consensus::BIP9Deployment::NO_TIMEOUT;
+        consensus.vDeployments[Consensus::DEPLOYMENT_V24].nWindowSize = 250;
+        consensus.vDeployments[Consensus::DEPLOYMENT_V24].nThresholdStart = 250 / 5 * 4;     // 80% of window size
+        consensus.vDeployments[Consensus::DEPLOYMENT_V24].nThresholdMin = 250 / 5 * 3;       // 60% of window size
+        consensus.vDeployments[Consensus::DEPLOYMENT_V24].nFalloffCoeff = 5;                 // this corresponds to 10 periods
+        consensus.vDeployments[Consensus::DEPLOYMENT_V24].useEHF = true;
 
         // The best chain should have at least this much work.
         consensus.nMinimumChainWork = uint256S("0x00");
diff --git a/src/consensus/params.h b/src/consensus/params.h
index c0457060f2aa..09cbd8c83fa5 100644
--- a/src/consensus/params.h
+++ b/src/consensus/params.h
@@ -40,7 +40,7 @@ constexpr bool ValidDeployment(BuriedDeployment dep) { return dep <= DEPLOYMENT_
 
 enum DeploymentPos : uint16_t {
     DEPLOYMENT_TESTDUMMY,
-    DEPLOYMENT_V23,         // Deployment of doubling withdrawal limit, extended addresses
+    DEPLOYMENT_V24,         // Deployment of doubling withdrawal limit, extended addresses
     // NOTE: Also add new deployments to VersionBitsDeploymentInfo in deploymentinfo.cpp
     MAX_VERSION_BITS_DEPLOYMENTS
 };
diff --git a/src/deploymentinfo.cpp b/src/deploymentinfo.cpp
index cc84c2777761..856403e32889 100644
--- a/src/deploymentinfo.cpp
+++ b/src/deploymentinfo.cpp
@@ -12,7 +12,7 @@ const struct VBDeploymentInfo VersionBitsDeploymentInfo[Consensus::MAX_VERSION_B
         /*.gbt_force =*/ true,
     },
     {
-        /*.name =*/"v23",
+        /*.name =*/"v24",
         /*.gbt_force =*/true,
     },
 };
diff --git a/src/evo/creditpool.cpp b/src/evo/creditpool.cpp
index 20ae214d32ff..2517af9567f1 100644
--- a/src/evo/creditpool.cpp
+++ b/src/evo/creditpool.cpp
@@ -189,8 +189,8 @@ CCreditPool CCreditPoolManager::ConstructCreditPool(const gsl::not_null<const CB
 
     CAmount currentLimit = blockData.credit_pool;
     const CAmount latelyUnlocked = prev.latelyUnlocked + blockData.unlocked - distantUnlocked;
-    if (DeploymentActiveAt(*block_index, Params().GetConsensus(), Consensus::DEPLOYMENT_V23)) {
-        currentLimit = std::max(CAmount(0), std::min(currentLimit, LimitAmountV23 - latelyUnlocked));
+    if (DeploymentActiveAt(*block_index, Params().GetConsensus(), Consensus::DEPLOYMENT_V24)) {
+        currentLimit = std::max(CAmount(0), std::min(currentLimit, LimitAmountV24 - latelyUnlocked));
     } else if (DeploymentActiveAt(*block_index, Params().GetConsensus(), Consensus::DEPLOYMENT_WITHDRAWALS)) {
         currentLimit = std::min(currentLimit, LimitAmountV22);
     } else {
diff --git a/src/evo/creditpool.h b/src/evo/creditpool.h
index a78ec8a70506..e337c00baea9 100644
--- a/src/evo/creditpool.h
+++ b/src/evo/creditpool.h
@@ -121,7 +121,7 @@ class CCreditPoolManager
     static constexpr CAmount LimitAmountLow = 100 * COIN;
     static constexpr CAmount LimitAmountHigh = 1000 * COIN;
     static constexpr CAmount LimitAmountV22 = 2000 * COIN;
-    static constexpr CAmount LimitAmountV23 = 4000 * COIN;
+    static constexpr CAmount LimitAmountV24 = 4000 * COIN;
 
     explicit CCreditPoolManager(CEvoDB& _evoDb);
 
diff --git a/src/evo/deterministicmns.cpp b/src/evo/deterministicmns.cpp
index ec00139807f6..aa9a68a4c8b2 100644
--- a/src/evo/deterministicmns.cpp
+++ b/src/evo/deterministicmns.cpp
@@ -1026,18 +1026,18 @@ static std::optional<ProTx> GetValidatedPayload(const CTransaction& tx, gsl::not
 
 /**
  * Validates potential changes to masternode state version by ProTx transaction version
- * @param[in]  pindexPrev    Previous block index to validate DEPLOYMENT_V23 activation
+ * @param[in]  pindexPrev    Previous block index to validate DEPLOYMENT_V24 activation
  * @param[in]  tx_type       Special transaction type
  * @param[in]  state_version Current masternode state version
  * @param[in]  tx_version    Proposed transaction version
  * @param[out] state         This may be set to an Error state if any error occurred processing them
- * @returns                  true if version change is valid or DEPLOYMENT_V23 is not active
+ * @returns                  true if version change is valid or DEPLOYMENT_V24 is not active
  */
 bool IsVersionChangeValid(gsl::not_null<const CBlockIndex*> pindexPrev, const uint16_t tx_type,
                           const uint16_t state_version, const uint16_t tx_version, TxValidationState& state)
 {
-    if (!DeploymentActiveAfter(pindexPrev, Params().GetConsensus(), Consensus::DEPLOYMENT_V23)) {
-        // New restrictions only apply after v23 deployment
+    if (!DeploymentActiveAfter(pindexPrev, Params().GetConsensus(), Consensus::DEPLOYMENT_V24)) {
+        // New restrictions only apply after v24 deployment
         return true;
     }
 
@@ -1067,10 +1067,10 @@ bool CheckProRegTx(CDeterministicMNManager& dmnman, const CTransaction& tx, gsl:
         return false;
     }
 
-    const bool is_v23_active{DeploymentActiveAfter(pindexPrev, Params().GetConsensus(), Consensus::DEPLOYMENT_V23)};
+    const bool is_v24_active{DeploymentActiveAfter(pindexPrev, Params().GetConsensus(), Consensus::DEPLOYMENT_V24)};
 
     // No longer allow legacy scheme masternode registration
-    if (is_v23_active && opt_ptx->nVersion < ProTxVersion::BasicBLS) {
+    if (is_v24_active && opt_ptx->nVersion < ProTxVersion::BasicBLS) {
         return state.Invalid(TxValidationResult::TX_CONSENSUS, "bad-protx-version-disallowed");
     }
 
diff --git a/src/evo/providertx.cpp b/src/evo/providertx.cpp
index 6702ede99223..99e046955bf2 100644
--- a/src/evo/providertx.cpp
+++ b/src/evo/providertx.cpp
@@ -23,7 +23,7 @@ template <typename T>
                                                   : DeploymentActiveAfter(pindexPrev, Params().GetConsensus(),
                                                                           Consensus::DEPLOYMENT_V19),
                                 is_extaddr_eligible ? DeploymentActiveAfter(pindexPrev, Params().GetConsensus(),
-                                                                            Consensus::DEPLOYMENT_V23)
+                                                                            Consensus::DEPLOYMENT_V24)
                                                     : false);
 }
 template uint16_t GetMaxFromDeployment<CProRegTx>(gsl::not_null<const CBlockIndex*> pindexPrev, std::optional<bool> is_basic_override);
diff --git a/src/evo/specialtxman.cpp b/src/evo/specialtxman.cpp
index 9fcffe753299..017ee8be6820 100644
--- a/src/evo/specialtxman.cpp
+++ b/src/evo/specialtxman.cpp
@@ -206,7 +206,7 @@ bool CSpecialTxProcessor::BuildNewListFromBlock(const CBlock& block, gsl::not_nu
     newList.DecreaseScores();
 
     const bool isMNRewardReallocation{DeploymentActiveAfter(pindexPrev, m_consensus_params, Consensus::DEPLOYMENT_MN_RR)};
-    const bool is_v23_deployed{DeploymentActiveAfter(pindexPrev, m_consensus_params, Consensus::DEPLOYMENT_V23)};
+    const bool is_v24_deployed{DeploymentActiveAfter(pindexPrev, m_consensus_params, Consensus::DEPLOYMENT_V24)};
 
     // we skip the coinbase
     for (int i = 1; i < (int)block.vtx.size(); i++) {
@@ -315,8 +315,8 @@ bool CSpecialTxProcessor::BuildNewListFromBlock(const CBlock& block, gsl::not_nu
             }
 
             auto newState = std::make_shared<CDeterministicMNState>(*dmn->pdmnState);
-            if (is_v23_deployed) {
-                // Extended addresses support in v23 means that the version can be updated
+            if (is_v24_deployed) {
+                // Extended addresses support in v24 means that the version can be updated
                 newState->nVersion = opt_proTx->nVersion;
             }
             newState->netInfo = opt_proTx->netInfo;
diff --git a/src/rpc/blockchain.cpp b/src/rpc/blockchain.cpp
index 89b4ae290df7..ab71b1767627 100644
--- a/src/rpc/blockchain.cpp
+++ b/src/rpc/blockchain.cpp
@@ -1561,7 +1561,7 @@ RPCHelpMan getblockchaininfo()
         SoftForkDescPushBack(&tip, softforks, consensusParams, deploy);
     }
     for (auto ehf_deploy : { /* sorted by activation block */
-                             Consensus::DEPLOYMENT_V23,
+                             Consensus::DEPLOYMENT_V24,
                              Consensus::DEPLOYMENT_TESTDUMMY }) {
         SoftForkDescPushBack(&tip, ehfSignals, softforks, consensusParams, ehf_deploy);
     }
diff --git a/test/functional/feature_asset_locks.py b/test/functional/feature_asset_locks.py
index 5a312167f2eb..d482d1061de4 100755
--- a/test/functional/feature_asset_locks.py
+++ b/test/functional/feature_asset_locks.py
@@ -266,7 +266,7 @@ def run_test(self):
         self.test_withdrawal_limits(node_wallet, node, pubkey)
         self.test_mn_rr(node_wallet, node, pubkey)
         self.test_withdrawals_fork(node_wallet, node, pubkey)
-        self.test_v23_fork(node_wallet, node, pubkey)
+        self.test_v24_fork(node_wallet, node, pubkey)
 
 
     def test_asset_locks(self, node_wallet, node, pubkey):
@@ -702,10 +702,10 @@ def test_withdrawals_fork(self, node_wallet, node, pubkey):
         self.generate(node, 1)
         self.ensure_tx_is_not_mined(txid_in_block)
 
-    def test_v23_fork(self, node_wallet, node, pubkey):
-        self.log.info("Testing asset unlock after 'v23' activation...")
-        self.activate_by_name('v23', 750)
-        self.log.info(f'post-v23 height: {node.getblockcount()} credit: {self.get_credit_pool_balance()}')
+    def test_v24_fork(self, node_wallet, node, pubkey):
+        self.log.info("Testing asset unlock after 'v24' activation...")
+        self.activate_by_name('v24', 750)
+        self.log.info(f'post-v24 height: {node.getblockcount()} credit: {self.get_credit_pool_balance()}')
 
         index = 601
         while index < 611:
diff --git a/test/functional/rpc_blockchain.py b/test/functional/rpc_blockchain.py
index d18c366d0476..6ffaaa75f0f9 100755
--- a/test/functional/rpc_blockchain.py
+++ b/test/functional/rpc_blockchain.py
@@ -216,12 +216,12 @@ def _test_getblockchaininfo(self):
             'v20': { 'type': 'buried', 'active': False, 'height': 412},
             'mn_rr': { 'type': 'buried', 'active': False, 'height': 413},
             'withdrawals': { 'type': 'buried', 'active': False, 'height': 600},
-            'v23': {
+            'v24': {
                 'type': 'bip9',
                 'bip9': {
                     'status': 'defined',
                     'start_time': 0,
-                    'timeout': 9223372036854775807,  # "v23" does not have a timeout so is set to the max int64 value
+                    'timeout': 9223372036854775807,  # "v24" does not have a timeout so is set to the max int64 value
                     'since': 0,
                     'min_activation_height': 0,
                     'ehf': True

From 73b757d98f7480ca9b212c88635727b00cfd493f Mon Sep 17 00:00:00 2001
From: UdjinM6 <UdjinM6@users.noreply.github.com>
Date: Thu, 2 Oct 2025 14:45:25 +0300
Subject: [PATCH 059/656] fix: a few missing v23 references

---
 doc/release-notes-6666.md      |  2 +-
 doc/release-notes-6729.md      |  2 +-
 src/evo/providertx.h           |  2 +-
 test/functional/rpc_netinfo.py | 16 ++++++++--------
 4 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/doc/release-notes-6666.md b/doc/release-notes-6666.md
index 2043e461c923..e9c3a61f5d38 100644
--- a/doc/release-notes-6666.md
+++ b/doc/release-notes-6666.md
@@ -3,7 +3,7 @@ Notable Changes
 
 * Dash Core has added support for the ability to register multiple addr:port pairs to a masternode and for specifying
   distinct addresses for platform P2P and platform HTTPS endpoints. The consensus and format changes needed to enable
-  this capability is referred to as "extended addresses" and is enabled by the deployment of the v23 fork, affecting
+  this capability is referred to as "extended addresses" and is enabled by the deployment of the v24 fork, affecting
   new masternode registrations and service updates to basic BLS masternodes.
   * Operators must upgrade from legacy BLS scheme to basic BLS scheme before utilizing extended address capabilities
 
diff --git a/doc/release-notes-6729.md b/doc/release-notes-6729.md
index da7a26fa50ad..15f7bccbcea2 100644
--- a/doc/release-notes-6729.md
+++ b/doc/release-notes-6729.md
@@ -1,7 +1,7 @@
 Notable Changes
 ---------------
 
-* Dash Core will no longer permit the registration of new legacy scheme masternodes after the deployment of the v23
+* Dash Core will no longer permit the registration of new legacy scheme masternodes after the deployment of the v24
   fork. Existing basic scheme masternodes will also be prohibited from downgrading to the legacy scheme after the
   deployment is active.
 
diff --git a/src/evo/providertx.h b/src/evo/providertx.h
index f2173b20e086..54c3be787fb6 100644
--- a/src/evo/providertx.h
+++ b/src/evo/providertx.h
@@ -37,7 +37,7 @@ enum : uint16_t {
         if (is_extended_addr) {
             // Requires *both* forks to be active to use extended addresses. is_basic_scheme_active could
             // be set to false due to RPC specialization, so we must evaluate is_extended_addr *last* to
-            // avoid accidentally upgrading a legacy BLS node to basic BLS due to v23 activation.
+            // avoid accidentally upgrading a legacy BLS node to basic BLS due to v24 activation.
             return ProTxVersion::ExtAddr;
         }
         return ProTxVersion::BasicBLS;
diff --git a/test/functional/rpc_netinfo.py b/test/functional/rpc_netinfo.py
index 5852fa4e40cc..99853ac97af4 100755
--- a/test/functional/rpc_netinfo.py
+++ b/test/functional/rpc_netinfo.py
@@ -22,8 +22,8 @@
 from random import randint
 from typing import List, Optional
 
-# Height at which BIP9 deployment DEPLOYMENT_V23 is activated
-V23_ACTIVATION_THRESHOLD = 100
+# Height at which BIP9 deployment DEPLOYMENT_V24 is activated
+V24_ACTIVATION_THRESHOLD = 100
 # See CMainParams in src/chainparams.cpp
 DEFAULT_PORT_MAINNET_CORE_P2P = 9999
 # See CRegTestParams in src/chainparams.cpp
@@ -137,18 +137,18 @@ class NetInfoTest(BitcoinTestFramework):
     def set_test_params(self):
         self.num_nodes = 2
         self.extra_args = [[
-            "-dip3params=2:2", f"-vbparams=v23:{self.mocktime}:999999999999:{V23_ACTIVATION_THRESHOLD}:10:8:6:5:0"
+            "-dip3params=2:2", f"-vbparams=v24:{self.mocktime}:999999999999:{V24_ACTIVATION_THRESHOLD}:10:8:6:5:0"
         ] for _ in range(self.num_nodes)]
 
     def skip_test_if_missing_module(self):
         self.skip_if_no_wallet()
 
-    def activate_v23(self):
+    def activate_v24(self):
         batch_size: int = 50
-        while not softfork_active(self.nodes[0], "v23"):
+        while not softfork_active(self.nodes[0], "v24"):
             self.bump_mocktime(batch_size)
             self.generate(self.nodes[0], batch_size, sync_fun=lambda: self.sync_blocks())
-        assert softfork_active(self.nodes[0], "v23")
+        assert softfork_active(self.nodes[0], "v24")
 
     def check_netinfo_fields(self, val, core_p2p_port: int, plat_https_port: Optional[int], plat_p2p_port: Optional[int]):
         assert_equal(val['core_p2p'][0], f"127.0.0.1:{core_p2p_port}")
@@ -182,8 +182,8 @@ def run_test(self):
         self.test_validation_legacy()
         self.log.info("Test output masternode address fields for consistency (pre-fork)")
         self.test_fields()
-        self.log.info("Mine blocks to activate DEPLOYMENT_V23")
-        self.activate_v23()
+        self.log.info("Mine blocks to activate DEPLOYMENT_V24")
+        self.activate_v24()
         self.log.info("Test input validation for masternode address fields (post-fork)")
         self.test_validation_common()
         self.test_validation_extended()

From 94839202bbbf83c6026a7a8467dea173d7847fd8 Mon Sep 17 00:00:00 2001
From: Konstantin Akimov <knstqq@gmail.com>
Date: Sun, 5 Oct 2025 03:03:03 +0700
Subject: [PATCH 060/656] fix: reference to repo dashcore-detached-sigs to
 dash-detached-sigs

---
 doc/release-process.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/release-process.md b/doc/release-process.md
index f4fd46e8443d..2390badea11f 100644
--- a/doc/release-process.md
+++ b/doc/release-process.md
@@ -148,7 +148,7 @@ However if this is done, once the release has been tagged in the dash-detached-s
 ### Windows and macOS codesigners only: Commit the detached codesign payloads
 
 ```sh
-pushd ~/dashcore-detached-sigs
+pushd ~/dash-detached-sigs
 # checkout the appropriate branch for this release series
 git checkout "v${VERSION}"
 rm -rf *

From a60cc1b3e09934335c3634d55102165162cf2e8a Mon Sep 17 00:00:00 2001
From: Konstantin Akimov <knstqq@gmail.com>
Date: Sun, 5 Oct 2025 03:12:24 +0700
Subject: [PATCH 061/656] fix: annotation for sendrawtransaction rpc (VBOOL for
 deprecated IS)

---
 src/rpc/mempool.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/rpc/mempool.cpp b/src/rpc/mempool.cpp
index 165ea861df88..75512672c6fa 100644
--- a/src/rpc/mempool.cpp
+++ b/src/rpc/mempool.cpp
@@ -58,7 +58,8 @@ RPCHelpMan sendrawtransaction()
             RPCTypeCheck(request.params, {
                 UniValue::VSTR,
                 UniValueType(), // VNUM or VSTR, checked inside AmountFromValue()
-                UniValue::VBOOL
+                UniValue::VBOOL,
+                UniValue::VBOOL,
             });
 
             CMutableTransaction mtx;

From 6883393afc960f1829fada37a7682046c6d699ed Mon Sep 17 00:00:00 2001
From: MacroFake <falke.marco@gmail.com>
Date: Fri, 6 May 2022 11:11:41 +0200
Subject: [PATCH 062/656] Merge bitcoin/bitcoin#19426: refactor: Change * to &
 in MutableTransactionSignatureCreator

fac6cfc50f65c610f2df9af3ec2efff5eade6661 refactor: Change * to & in MutableTransactionSignatureCreator (MarcoFalke)

Pull request description:

  The `MutableTransactionSignatureCreator` constructor takes in a pointer to a mutable transaction. This is problematic for several reasons:

  * It would be undefined behaviour to pass in a nullptr because for signature creation, the memory of the mutable transaction is accessed
  * No caller currently passes in a nullptr, so passing a reference as a pointer is confusing

  Fix all issues by replacing `*` with `&` in `MutableTransactionSignatureCreator`

ACKs for top commit:
  theStack:
    Code-review ACK fac6cfc50f65c610f2df9af3ec2efff5eade6661
  jonatack:
    ACK fac6cfc50f65c610f2df9af3ec2efff5eade6661

Tree-SHA512: d84296b030bd4fa2709e5adbfe43a5f8377d218957d844af69a819893252af671df7f00004f5ba601a0bd70f3c1c2e58c4f00e75684da663f28432bb5c89fb86
---
 src/bitcoin-tx.cpp            |  2 +-
 src/psbt.cpp                  |  4 ++--
 src/rpc/rawtransaction.cpp    |  2 +-
 src/script/sign.cpp           | 18 +++++++++---------
 src/script/sign.h             | 10 ++++++----
 src/test/fuzz/script_sign.cpp |  2 +-
 src/test/script_tests.cpp     |  2 +-
 7 files changed, 21 insertions(+), 19 deletions(-)

diff --git a/src/bitcoin-tx.cpp b/src/bitcoin-tx.cpp
index b97ec594abeb..9c9ccdae59dc 100644
--- a/src/bitcoin-tx.cpp
+++ b/src/bitcoin-tx.cpp
@@ -627,7 +627,7 @@ static void MutateTxSign(CMutableTransaction& tx, const std::string& flagStr)
         SignatureData sigdata = DataFromTransaction(mergedTx, i, coin.out);
         // Only sign SIGHASH_SINGLE if there's a corresponding output:
         if (!fHashSingle || (i < mergedTx.vout.size()))
-            ProduceSignature(keystore, MutableTransactionSignatureCreator(&mergedTx, i, amount, nHashType), prevPubKey, sigdata);
+            ProduceSignature(keystore, MutableTransactionSignatureCreator(mergedTx, i, amount, nHashType), prevPubKey, sigdata);
 
         UpdateInput(txin, sigdata);
     }
diff --git a/src/psbt.cpp b/src/psbt.cpp
index 90285c414ee8..bea409f2c281 100644
--- a/src/psbt.cpp
+++ b/src/psbt.cpp
@@ -205,7 +205,7 @@ void UpdatePSBTOutput(const SigningProvider& provider, PartiallySignedTransactio
     // Construct a would-be spend of this output, to update sigdata with.
     // Note that ProduceSignature is used to fill in metadata (not actual signatures),
     // so provider does not need to provide any private keys (it can be a HidingSigningProvider).
-    MutableTransactionSignatureCreator creator(&tx, /*input_idx=*/0, out.nValue, SIGHASH_ALL);
+    MutableTransactionSignatureCreator creator(tx, /*input_idx=*/0, out.nValue, SIGHASH_ALL);
     ProduceSignature(provider, creator, out.scriptPubKey, sigdata);
 
     // Put redeem_script, key paths, into PSBTOutput.
@@ -267,7 +267,7 @@ bool SignPSBTInput(const SigningProvider& provider, PartiallySignedTransaction&
     if (txdata == nullptr) {
         sig_complete = ProduceSignature(provider, DUMMY_SIGNATURE_CREATOR, utxo.scriptPubKey, sigdata);
     } else {
-        MutableTransactionSignatureCreator creator(&tx, index, utxo.nValue, txdata, sighash);
+        MutableTransactionSignatureCreator creator(tx, index, utxo.nValue, txdata, sighash);
         sig_complete = ProduceSignature(provider, creator, utxo.scriptPubKey, sigdata);
     }
 
diff --git a/src/rpc/rawtransaction.cpp b/src/rpc/rawtransaction.cpp
index 48869e1f27df..5cbef3d8793f 100644
--- a/src/rpc/rawtransaction.cpp
+++ b/src/rpc/rawtransaction.cpp
@@ -897,7 +897,7 @@ static RPCHelpMan combinerawtransaction()
                 sigdata.MergeSignatureData(DataFromTransaction(txv, i, coin.out));
             }
         }
-        ProduceSignature(DUMMY_SIGNING_PROVIDER, MutableTransactionSignatureCreator(&mergedTx, i, coin.out.nValue, 1), coin.out.scriptPubKey, sigdata);
+        ProduceSignature(DUMMY_SIGNING_PROVIDER, MutableTransactionSignatureCreator(mergedTx, i, coin.out.nValue, 1), coin.out.scriptPubKey, sigdata);
 
         UpdateInput(txin, sigdata);
     }
diff --git a/src/script/sign.cpp b/src/script/sign.cpp
index d58286fbabf7..65ae061466ad 100644
--- a/src/script/sign.cpp
+++ b/src/script/sign.cpp
@@ -17,16 +17,16 @@
 
 typedef std::vector<unsigned char> valtype;
 
-MutableTransactionSignatureCreator::MutableTransactionSignatureCreator(const CMutableTransaction* tx, unsigned int input_idx, const CAmount& amount, int hash_type)
-    : txTo{tx}, nIn{input_idx}, nHashType{hash_type}, amount{amount}, checker{txTo, nIn, amount, MissingDataBehavior::FAIL},
+MutableTransactionSignatureCreator::MutableTransactionSignatureCreator(const CMutableTransaction& tx, unsigned int input_idx, const CAmount& amount, int hash_type)
+    : m_txto{tx}, nIn{input_idx}, nHashType{hash_type}, amount{amount}, checker{&m_txto, nIn, amount, MissingDataBehavior::FAIL},
       m_txdata(nullptr)
 {
 }
 
-MutableTransactionSignatureCreator::MutableTransactionSignatureCreator(const CMutableTransaction* tx, unsigned int input_idx, const CAmount& amount, const PrecomputedTransactionData* txdata, int hash_type)
-    : txTo{tx}, nIn{input_idx}, nHashType{hash_type}, amount{amount},
-      checker{txdata ? MutableTransactionSignatureChecker{txTo, nIn, amount, *txdata, MissingDataBehavior::FAIL} :
-                       MutableTransactionSignatureChecker{txTo, nIn, amount, MissingDataBehavior::FAIL}},
+MutableTransactionSignatureCreator::MutableTransactionSignatureCreator(const CMutableTransaction& tx, unsigned int input_idx, const CAmount& amount, const PrecomputedTransactionData* txdata, int hash_type)
+    : m_txto{tx}, nIn{input_idx}, nHashType{hash_type}, amount{amount},
+      checker{txdata ? MutableTransactionSignatureChecker{&m_txto, nIn, amount, *txdata, MissingDataBehavior::FAIL} :
+                       MutableTransactionSignatureChecker{&m_txto, nIn, amount, MissingDataBehavior::FAIL}},
       m_txdata(txdata)
 {
 }
@@ -37,7 +37,7 @@ bool MutableTransactionSignatureCreator::CreateSig(const SigningProvider& provid
     if (!provider.GetKey(address, key))
         return false;
 
-    uint256 hash = SignatureHash(scriptCode, *txTo, nIn, nHashType, amount, sigversion, m_txdata);
+    uint256 hash = SignatureHash(scriptCode, m_txto, nIn, nHashType, amount, sigversion, m_txdata);
     if (!key.Sign(hash, vchSig))
         return false;
     vchSig.push_back((unsigned char)nHashType);
@@ -324,7 +324,7 @@ bool SignSignature(const SigningProvider &provider, const CScript& fromPubKey, C
 {
     assert(nIn < txTo.vin.size());
 
-    MutableTransactionSignatureCreator creator(&txTo, nIn, amount, nHashType);
+    MutableTransactionSignatureCreator creator(txTo, nIn, amount, nHashType);
 
     SignatureData sigdata;
     bool ret = ProduceSignature(provider, creator, fromPubKey, sigdata);
@@ -437,7 +437,7 @@ bool SignTransaction(CMutableTransaction& mtx, const SigningProvider* keystore,
         SignatureData sigdata = DataFromTransaction(mtx, i, coin->second.out);
         // Only sign SIGHASH_SINGLE if there's a corresponding output:
         if (!fHashSingle || (i < mtx.vout.size())) {
-            ProduceSignature(*keystore, MutableTransactionSignatureCreator(&mtx, i, amount, &txdata, nHashType), prevPubKey, sigdata);
+            ProduceSignature(*keystore, MutableTransactionSignatureCreator(mtx, i, amount, &txdata, nHashType), prevPubKey, sigdata);
         }
 
         UpdateInput(txin, sigdata);
diff --git a/src/script/sign.h b/src/script/sign.h
index e271c5742dc4..b449f9ee09e1 100644
--- a/src/script/sign.h
+++ b/src/script/sign.h
@@ -6,6 +6,7 @@
 #ifndef BITCOIN_SCRIPT_SIGN_H
 #define BITCOIN_SCRIPT_SIGN_H
 
+#include <attributes.h>
 #include <coins.h>
 #include <hash.h>
 #include <pubkey.h>
@@ -33,8 +34,9 @@ class BaseSignatureCreator {
 };
 
 /** A signature creator for transactions. */
-class MutableTransactionSignatureCreator : public BaseSignatureCreator {
-    const CMutableTransaction* txTo;
+class MutableTransactionSignatureCreator : public BaseSignatureCreator
+{
+    const CMutableTransaction& m_txto;
     unsigned int nIn;
     int nHashType;
     CAmount amount;
@@ -42,8 +44,8 @@ class MutableTransactionSignatureCreator : public BaseSignatureCreator {
     const PrecomputedTransactionData* m_txdata;
 
 public:
-    MutableTransactionSignatureCreator(const CMutableTransaction* txToIn, unsigned int input_idx, const CAmount& amountIn, int nHashTypeIn = SIGHASH_ALL);
-    MutableTransactionSignatureCreator(const CMutableTransaction* txToIn, unsigned int input_idx, const CAmount& amountIn, const PrecomputedTransactionData* txdata, int nHashTypeIn = SIGHASH_ALL);
+    MutableTransactionSignatureCreator(const CMutableTransaction& tx LIFETIMEBOUND, unsigned int input_idx, const CAmount& amountIn, int nHashTypeIn = SIGHASH_ALL);
+    MutableTransactionSignatureCreator(const CMutableTransaction& tx LIFETIMEBOUND, unsigned int input_idx, const CAmount& amountIn, const PrecomputedTransactionData* txdata, int nHashTypeIn = SIGHASH_ALL);
     const BaseSignatureChecker& Checker() const override { return checker; }
     bool CreateSig(const SigningProvider& provider, std::vector<unsigned char>& vchSig, const CKeyID& keyid, const CScript& scriptCode, SigVersion sigversion) const override;
 };
diff --git a/src/test/fuzz/script_sign.cpp b/src/test/fuzz/script_sign.cpp
index 182e799840b4..c7206e9ca160 100644
--- a/src/test/fuzz/script_sign.cpp
+++ b/src/test/fuzz/script_sign.cpp
@@ -110,7 +110,7 @@ FUZZ_TARGET(script_sign, .init = initialize_script_sign)
             }
             if (n_in < script_tx_to.vin.size()) {
                 (void)SignSignature(provider, ConsumeScript(fuzzed_data_provider), script_tx_to, n_in, ConsumeMoney(fuzzed_data_provider), fuzzed_data_provider.ConsumeIntegral<int>());
-                MutableTransactionSignatureCreator signature_creator{&tx_to, n_in, ConsumeMoney(fuzzed_data_provider), fuzzed_data_provider.ConsumeIntegral<int>()};
+                MutableTransactionSignatureCreator signature_creator{tx_to, n_in, ConsumeMoney(fuzzed_data_provider), fuzzed_data_provider.ConsumeIntegral<int>()};
                 std::vector<unsigned char> vch_sig;
                 CKeyID address;
                 if (fuzzed_data_provider.ConsumeBool()) {
diff --git a/src/test/script_tests.cpp b/src/test/script_tests.cpp
index 9407dc80d5de..043bb1b18d8d 100644
--- a/src/test/script_tests.cpp
+++ b/src/test/script_tests.cpp
@@ -1090,7 +1090,7 @@ SignatureData CombineSignatures(const CTxOut& txout, const CMutableTransaction&
     SignatureData data;
     data.MergeSignatureData(scriptSig1);
     data.MergeSignatureData(scriptSig2);
-    ProduceSignature(DUMMY_SIGNING_PROVIDER, MutableTransactionSignatureCreator(&tx, 0, txout.nValue), txout.scriptPubKey, data);
+    ProduceSignature(DUMMY_SIGNING_PROVIDER, MutableTransactionSignatureCreator(tx, 0, txout.nValue), txout.scriptPubKey, data);
     return data;
 }
 

From 3b0a0ea13e209b52617ee2606c383f6f0e957dec Mon Sep 17 00:00:00 2001
From: fanquake <fanquake@gmail.com>
Date: Mon, 9 May 2022 10:56:11 +0100
Subject: [PATCH 063/656] Merge bitcoin/bitcoin#25078: doc: Shorten explanation
 of "maintainers"

fa32ced49cf651b48e0a9cc165e45a27505a461f doc: Shorten explanation of "maintainers" (MacroFake)

Pull request description:

  GitHub has an extensive documentation about permissions ( https://docs.github.com/en/organizations/managing-access-to-your-organizations-repositories/repository-roles-for-an-organization#permissions-for-each-role ), so I don't think we should be trying to mirror them here.

  Specifically, this pull makes three changes:

  * Clarify that all "merge maintainers" can merge pull requests. Obviously, while GitHub users with the `Maintain` permission can not force push to protected branches, and GitHub users with the `Admin` permission can, I don't think this is worthy to mention in the contribution guidelines. During the whole time I was working on the project, I think this permission was only used once or twice, when I accidentally pushed an unsigned draft commit directly to `master`. See https://bitcoin-irc.chaincode.com/bitcoin-core-dev/2016-06-13#473584 . One could argue that there should be a list of maintainers in the doc. Though, as there is already a list of keys for verify-commits, this seems like unnecessary overhead.
  * Clarify that the release process is executed collectively by the developers. For example, release process code changes that are reproducible can be done by anyone without permission. Also, detached signatures are created by several people (see for example https://github.com/bitcoin-core/bitcoin-detached-sigs/commits/23.0), which (I believe) are also separate from the people that can push the binaries to the `bin` folder, which again are separate from the people who can release the snap/flatpak package.
  * Clarify that moderation is also done collectively by people with `Triage`, `Write`, `Maintain`, and `Admin` permission. I think it is fine to refer to everyone in that group as "maintainers", or at least don't clarify it further, as any attempt at that would start to duplicate GitHub docs.

ACKs for top commit:
  laanwj:
    ACK fa32ced49cf651b48e0a9cc165e45a27505a461f
  prusnak:
    Approach ACK fa32ced49cf651b48e0a9cc165e45a27505a461f
  fanquake:
    ACK fa32ced49cf651b48e0a9cc165e45a27505a461f

Tree-SHA512: ed87c2e538a32ff1611208a7262425160a4340a3112a1b2712d7e9a550fa191ddbebea0d8e45d3e578ead02d5ef17bddcaab3f6ee876f9018a5acbc65ffd0e1c
---
 CONTRIBUTING.md | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 4f14019e9658..25d0874c0af9 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -10,10 +10,9 @@ First, in terms of structure, there is no particular concept of "Dash Core
 developers" in the sense of privileged people. Open source often naturally
 revolves around a meritocracy where contributors earn trust from the developer
 community over time. Nevertheless, some hierarchy is necessary for practical
-purposes. As such, there are repository "maintainers" who are responsible for
-merging pull requests, as well as a "lead maintainer" who is responsible for the
-[release cycle](/doc/release-process.md) as well as overall merging, moderation
-and appointment of maintainers.
+purposes. As such, there are repository maintainers who are responsible for
+merging pull requests, the [release cycle](/doc/release-process.md), and
+moderation.
 
 Getting Started
 ---------------
@@ -272,7 +271,7 @@ projects such as libsecp256k1), and is not to be confused with overall Dash
 Network Protocol consensus changes.
 
 Whether a pull request is merged into Dash Core rests with the project merge
-maintainers and ultimately the project lead.
+maintainers.
 
 Maintainers will take into consideration if a patch is in line with the general
 principles of the project; meets the minimum standards for inclusion; and will

From 2f301f3b55a576788a4c713a5b838969ed4f1f54 Mon Sep 17 00:00:00 2001
From: fanquake <fanquake@gmail.com>
Date: Wed, 11 May 2022 07:19:37 +0100
Subject: [PATCH 064/656] Merge bitcoin/bitcoin#25090: doc: Explain Bitcoin
 Core instead of Bitcoin in README.md

BACKPORT NOTE
description is edited, no backported the exactly same.

faeb5b59a098578b3e8c552d35b5ba02b12af14d doc: Explain Bitcoin Core in README.md (MacroFake)

Pull request description:

  Currently the README doesn't explain what Bitcoin Core is. Fix that.

  Further reading / Inspired by:

  * https://github.com/bitcoin/bitcoin/pull/25012
  * https://github.com/bitcoin-core/bitcoincore.org/pull/783
  * https://github.com/bitcoin-core/bitcoincore.org/pull/784

ACKs for top commit:
  laanwj:
    re-ACK faeb5b59a098578b3e8c552d35b5ba02b12af14d
  brunoerg:
    ACK faeb5b59a098578b3e8c552d35b5ba02b12af14d
  1440000bytes:
    ACK https://github.com/bitcoin/bitcoin/pull/25090/commits/faeb5b59a098578b3e8c552d35b5ba02b12af14d
  w0xlt:
    ACK https://github.com/bitcoin/bitcoin/pull/25090/commits/faeb5b59a098578b3e8c552d35b5ba02b12af14d

Tree-SHA512: f9a9460853487a46ba0219d26cefa1fcf8d650deb3c2656737a54648016af0cdac58c5d4641a390be8c05f3e78185bd99801e239fcb87d410c4df31f61bc7016
---
 README.md | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/README.md b/README.md
index 11875daf7a11..edb28d9739c8 100644
--- a/README.md
+++ b/README.md
@@ -10,15 +10,19 @@ https://www.dash.org
 For an immediately usable, binary version of the Dash Core software, see
 https://www.dash.org/downloads/.
 
-Further information about Dash Core is available in [./doc/](/doc).
+Dash Core connects to the Dash peer-to-peer network to download and fully
+validate blocks and transactions. It also includes a wallet and graphical user
+interface, which can be optionally built.
+
+Further information about Dash Core is available in the [doc folder](/doc).
 
 What is Dash?
 -------------
 
-Dash is an experimental digital currency that enables instant, private
-payments to anyone, anywhere in the world. Dash uses peer-to-peer technology
-to operate with no central authority: managing transactions and issuing money
-are carried out collectively by the network. Dash Core is the name of the open
+Dash is a digital currency that enables instant, private payments to anyone,
+anywhere in the world. Dash uses peer-to-peer technology to operate with
+no central authority: managing transactions and issuing money are carried out
+collectively by the network. Dash Core is the name of the open
 source software which enables the use of this currency.
 
 

From 3437dfd1e8b924ffcd02b489b55e2b65d288f2c8 Mon Sep 17 00:00:00 2001
From: fanquake <fanquake@gmail.com>
Date: Mon, 16 May 2022 14:25:59 +0100
Subject: [PATCH 065/656] Merge bitcoin/bitcoin#25095: rpc: Fix
 implicit-integer-sign-change in gettxout

fa347a906685df1d44cafa3e6cc7fdd2ace68ff5 rpc: Fix implicit-integer-sign-change in gettxout (MacroFake)

Pull request description:

ACKs for top commit:
  theStack:
    Code-review ACK fa347a906685df1d44cafa3e6cc7fdd2ace68ff5

Tree-SHA512: 2a1128f714119b6b6cfeb20ee59c4f46404d5a83942253c73de64b0289a7d41e4437cf77d19b1cf623e2dd15fbaa1ec7acd03cc5d6dde41b3c7d06a082073ea1
---
 src/rpc/blockchain.cpp | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/rpc/blockchain.cpp b/src/rpc/blockchain.cpp
index 89b4ae290df7..e64a9cff211d 100644
--- a/src/rpc/blockchain.cpp
+++ b/src/rpc/blockchain.cpp
@@ -1298,8 +1298,7 @@ static RPCHelpMan gettxout()
     UniValue ret(UniValue::VOBJ);
 
     uint256 hash(ParseHashV(request.params[0], "txid"));
-    int n = request.params[1].getInt<int>();
-    COutPoint out(hash, n);
+    COutPoint out{hash, request.params[1].getInt<uint32_t>()};
     bool fMempool = true;
     if (!request.params[2].isNull())
         fMempool = request.params[2].get_bool();

From cfae1e6025b86e3da265fd38d35d56d67ec6e83d Mon Sep 17 00:00:00 2001
From: pasta <pasta@dashboost.org>
Date: Mon, 6 Oct 2025 09:59:20 -0400
Subject: [PATCH 066/656] refactor: update CoinJoin change address handling to
 respect wallet's avoid_reuse setting

Modified CoinJoin denomination creation to utilize the wallet's "avoid_reuse" setting. When enabled, change is sent to a fresh change address to prevent address reuse; otherwise, it defaults to the legacy behavior of returning change to the source address. Removed the now obsolete `-coinjoinfreshchange` option and updated relevant documentation.
---
 doc/release-notes-6870.md | 8 ++++----
 src/coinjoin/options.cpp  | 7 -------
 src/coinjoin/options.h    | 4 ----
 src/coinjoin/util.cpp     | 8 +++++---
 src/wallet/init.cpp       | 2 +-
 5 files changed, 10 insertions(+), 19 deletions(-)

diff --git a/doc/release-notes-6870.md b/doc/release-notes-6870.md
index c8225e49fefb..dd2eede82adc 100644
--- a/doc/release-notes-6870.md
+++ b/doc/release-notes-6870.md
@@ -1,9 +1,9 @@
 Wallet
 ------
 
-- Add `-coinjoinfreshchange` option to control change destination behavior
-  during CoinJoin denomination creation. By default (flag unset), change is
-  sent back to the source address (legacy behavior). When enabled, change is
-  sent to a fresh change address to avoid address/public key reuse. (#6870)
+- CoinJoin denomination creation now respects the wallet's "avoid_reuse"
+  setting. When the wallet has `avoid_reuse` enabled, change is sent to a
+  fresh change address to avoid address/public key reuse. Otherwise, change
+  goes back to the source address (legacy behavior). (#6870)
 
 
diff --git a/src/coinjoin/options.cpp b/src/coinjoin/options.cpp
index 6b5e0acf33d4..887848e62935 100644
--- a/src/coinjoin/options.cpp
+++ b/src/coinjoin/options.cpp
@@ -61,18 +61,12 @@ void CCoinJoinClientOptions::SetDenomsHardCap(int denoms_hardcap)
     options.nCoinJoinDenomsHardCap = denoms_hardcap;
 }
 
-void CCoinJoinClientOptions::SetFreshChange(bool fresh_change)
-{
-    CCoinJoinClientOptions& options = CCoinJoinClientOptions::Get();
-    options.fCoinJoinFreshChange = fresh_change;
-}
 
 void CCoinJoinClientOptions::Init()
 {
     assert(!CCoinJoinClientOptions::_instance);
     static CCoinJoinClientOptions instance;
     instance.fCoinJoinMultiSession = gArgs.GetBoolArg("-coinjoinmultisession", DEFAULT_COINJOIN_MULTISESSION);
-    instance.fCoinJoinFreshChange = gArgs.GetBoolArg("-coinjoinfreshchange", DEFAULT_COINJOIN_FRESHCHANGE);
     instance.nCoinJoinSessions = std::min(std::max((int)gArgs.GetIntArg("-coinjoinsessions", DEFAULT_COINJOIN_SESSIONS), MIN_COINJOIN_SESSIONS), MAX_COINJOIN_SESSIONS);
     instance.nCoinJoinRounds = std::min(std::max((int)gArgs.GetIntArg("-coinjoinrounds", DEFAULT_COINJOIN_ROUNDS), MIN_COINJOIN_ROUNDS), MAX_COINJOIN_ROUNDS);
     instance.nCoinJoinAmount = std::min(std::max((int)gArgs.GetIntArg("-coinjoinamount", DEFAULT_COINJOIN_AMOUNT), MIN_COINJOIN_AMOUNT), MAX_COINJOIN_AMOUNT);
@@ -92,5 +86,4 @@ void CCoinJoinClientOptions::GetJsonInfo(UniValue& obj)
     obj.pushKV("max_amount", options.nCoinJoinAmount.load());
     obj.pushKV("denoms_goal", options.nCoinJoinDenomsGoal.load());
     obj.pushKV("denoms_hardcap", options.nCoinJoinDenomsHardCap.load());
-    obj.pushKV("fresh_change", options.fCoinJoinFreshChange.load());
 }
diff --git a/src/coinjoin/options.h b/src/coinjoin/options.h
index 809f192a0d50..b5e8c8a23f5a 100644
--- a/src/coinjoin/options.h
+++ b/src/coinjoin/options.h
@@ -31,7 +31,6 @@ static constexpr int DEFAULT_COINJOIN_DENOMS_HARDCAP = 300;
 
 static constexpr bool DEFAULT_COINJOIN_AUTOSTART = false;
 static constexpr bool DEFAULT_COINJOIN_MULTISESSION = false;
-static constexpr bool DEFAULT_COINJOIN_FRESHCHANGE = false;
 
 // How many new denom outputs to create before we consider the "goal" loop in CreateDenominated
 // a final one and start creating an actual tx. Same limit applies for the "hard cap" part of the algo.
@@ -61,7 +60,6 @@ class CCoinJoinClientOptions
     static int GetAmount() { return CCoinJoinClientOptions::Get().nCoinJoinAmount; }
     static int GetDenomsGoal() { return CCoinJoinClientOptions::Get().nCoinJoinDenomsGoal; }
     static int GetDenomsHardCap() { return CCoinJoinClientOptions::Get().nCoinJoinDenomsHardCap; }
-    static bool GetFreshChange() { return CCoinJoinClientOptions::Get().fCoinJoinFreshChange; }
 
     static void SetEnabled(bool fEnabled);
     static void SetMultiSessionEnabled(bool fEnabled);
@@ -70,7 +68,6 @@ class CCoinJoinClientOptions
     static void SetAmount(CAmount amount);
     static void SetDenomsGoal(int denoms_goal);
     static void SetDenomsHardCap(int denoms_hardcap);
-    static void SetFreshChange(bool fresh_change);
 
     static bool IsEnabled() { return CCoinJoinClientOptions::Get().fEnableCoinJoin; }
     static bool IsMultiSessionEnabled() { return CCoinJoinClientOptions::Get().fCoinJoinMultiSession; }
@@ -89,7 +86,6 @@ class CCoinJoinClientOptions
     std::atomic<int> nCoinJoinDenomsHardCap{DEFAULT_COINJOIN_DENOMS_HARDCAP};
     std::atomic<bool> fEnableCoinJoin{false};
     std::atomic<bool> fCoinJoinMultiSession{DEFAULT_COINJOIN_MULTISESSION};
-    std::atomic<bool> fCoinJoinFreshChange{DEFAULT_COINJOIN_FRESHCHANGE};
 
     CCoinJoinClientOptions() = default;
 
diff --git a/src/coinjoin/util.cpp b/src/coinjoin/util.cpp
index 1436cf728104..808d3814b659 100644
--- a/src/coinjoin/util.cpp
+++ b/src/coinjoin/util.cpp
@@ -10,6 +10,7 @@
 #include <wallet/fees.h>
 #include <wallet/spend.h>
 #include <wallet/wallet.h>
+#include <wallet/walletutil.h>
 
 #include <numeric>
 
@@ -126,10 +127,11 @@ CTransactionBuilder::CTransactionBuilder(CWallet& wallet, const CompactTallyItem
     coinControl.m_discard_feerate = ::GetDiscardRate(m_wallet);
     // Generate a feerate which will be used by calculations of this class and also by CWallet::CreateTransaction
     coinControl.m_feerate = std::max(GetRequiredFeeRate(m_wallet), m_wallet.m_pay_tx_fee);
-    // By default, keep legacy behavior: change goes back to the origin address.
-    // When -coinjoinfreshchange is enabled, let the wallet select a fresh
+    // If wallet does not have the avoid-reuse feature enabled, keep legacy
+    // behavior: force change to go back to the origin address. When
+    // WALLET_FLAG_AVOID_REUSE is enabled, let the wallet select a fresh
     // change destination to avoid address reuse.
-    if (!CCoinJoinClientOptions::GetFreshChange()) {
+    if (!m_wallet.IsWalletFlagSet(wallet::WALLET_FLAG_AVOID_REUSE)) {
         coinControl.destChange = tallyItemIn.txdest;
     }
     // Only allow tallyItems inputs for tx creation
diff --git a/src/wallet/init.cpp b/src/wallet/init.cpp
index 780828f1a5d6..f2ba25db56f0 100644
--- a/src/wallet/init.cpp
+++ b/src/wallet/init.cpp
@@ -105,7 +105,7 @@ void WalletInit::AddWalletOptions(ArgsManager& argsman) const
     argsman.AddArg("-coinjoinmultisession", strprintf("Enable multiple CoinJoin mixing sessions per block, experimental (0-1, default: %u)", DEFAULT_COINJOIN_MULTISESSION), ArgsManager::ALLOW_ANY, OptionsCategory::WALLET_COINJOIN);
     argsman.AddArg("-coinjoinrounds=<n>", strprintf("Use N separate masternodes for each denominated input to mix funds (%u-%u, default: %u)", MIN_COINJOIN_ROUNDS, MAX_COINJOIN_ROUNDS, DEFAULT_COINJOIN_ROUNDS), ArgsManager::ALLOW_ANY, OptionsCategory::WALLET_COINJOIN);
     argsman.AddArg("-coinjoinsessions=<n>", strprintf("Use N separate masternodes in parallel to mix funds (%u-%u, default: %u)", MIN_COINJOIN_SESSIONS, MAX_COINJOIN_SESSIONS, DEFAULT_COINJOIN_SESSIONS), ArgsManager::ALLOW_ANY, OptionsCategory::WALLET_COINJOIN);
-    argsman.AddArg("-coinjoinfreshchange", strprintf("Send change from denomination creation to a fresh change address instead of the source address (0-1, default: %u)", DEFAULT_COINJOIN_FRESHCHANGE), ArgsManager::ALLOW_ANY, OptionsCategory::WALLET_COINJOIN);
+    
 
 #ifdef USE_BDB
     argsman.AddArg("-dblogsize=<n>", strprintf("Flush wallet database activity from memory to disk log every <n> megabytes (default: %u)", DatabaseOptions().max_log_mb), ArgsManager::ALLOW_ANY | ArgsManager::DEBUG_ONLY, OptionsCategory::WALLET_DEBUG_TEST);

From efc689ccda836eb6e4542f9972ebc09d7ca21ab1 Mon Sep 17 00:00:00 2001
From: PastaPastaPasta <6443210+PastaPastaPasta@users.noreply.github.com>
Date: Mon, 6 Oct 2025 13:02:49 -0400
Subject: [PATCH 067/656] Apply suggestions from code review

Co-authored-by: UdjinM6 <UdjinM6@users.noreply.github.com>
---
 src/coinjoin/options.cpp | 1 -
 src/coinjoin/util.cpp    | 1 -
 src/wallet/init.cpp      | 1 -
 3 files changed, 3 deletions(-)

diff --git a/src/coinjoin/options.cpp b/src/coinjoin/options.cpp
index 887848e62935..f6e3e133d0e1 100644
--- a/src/coinjoin/options.cpp
+++ b/src/coinjoin/options.cpp
@@ -61,7 +61,6 @@ void CCoinJoinClientOptions::SetDenomsHardCap(int denoms_hardcap)
     options.nCoinJoinDenomsHardCap = denoms_hardcap;
 }
 
-
 void CCoinJoinClientOptions::Init()
 {
     assert(!CCoinJoinClientOptions::_instance);
diff --git a/src/coinjoin/util.cpp b/src/coinjoin/util.cpp
index 808d3814b659..a494b8755d0d 100644
--- a/src/coinjoin/util.cpp
+++ b/src/coinjoin/util.cpp
@@ -2,7 +2,6 @@
 // Distributed under the MIT/X11 software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-#include <coinjoin/options.h>
 #include <coinjoin/util.h>
 #include <policy/fees.h>
 #include <policy/policy.h>
diff --git a/src/wallet/init.cpp b/src/wallet/init.cpp
index f2ba25db56f0..4aa657beb8d3 100644
--- a/src/wallet/init.cpp
+++ b/src/wallet/init.cpp
@@ -105,7 +105,6 @@ void WalletInit::AddWalletOptions(ArgsManager& argsman) const
     argsman.AddArg("-coinjoinmultisession", strprintf("Enable multiple CoinJoin mixing sessions per block, experimental (0-1, default: %u)", DEFAULT_COINJOIN_MULTISESSION), ArgsManager::ALLOW_ANY, OptionsCategory::WALLET_COINJOIN);
     argsman.AddArg("-coinjoinrounds=<n>", strprintf("Use N separate masternodes for each denominated input to mix funds (%u-%u, default: %u)", MIN_COINJOIN_ROUNDS, MAX_COINJOIN_ROUNDS, DEFAULT_COINJOIN_ROUNDS), ArgsManager::ALLOW_ANY, OptionsCategory::WALLET_COINJOIN);
     argsman.AddArg("-coinjoinsessions=<n>", strprintf("Use N separate masternodes in parallel to mix funds (%u-%u, default: %u)", MIN_COINJOIN_SESSIONS, MAX_COINJOIN_SESSIONS, DEFAULT_COINJOIN_SESSIONS), ArgsManager::ALLOW_ANY, OptionsCategory::WALLET_COINJOIN);
-    
 
 #ifdef USE_BDB
     argsman.AddArg("-dblogsize=<n>", strprintf("Flush wallet database activity from memory to disk log every <n> megabytes (default: %u)", DatabaseOptions().max_log_mb), ArgsManager::ALLOW_ANY | ArgsManager::DEBUG_ONLY, OptionsCategory::WALLET_DEBUG_TEST);

From 5d07b9c73a3f3f32dee86f5e104b9bc25ddfce0f Mon Sep 17 00:00:00 2001
From: Konstantin Akimov <knstqq@gmail.com>
Date: Sun, 5 Oct 2025 04:12:28 +0700
Subject: [PATCH 068/656] feat: rewrite lint-cppcheck-dash from bash to python

---
 test/lint/lint-cppcheck-dash.py | 147 ++++++++++++++++++++++++++++++++
 test/lint/lint-cppcheck-dash.sh | 108 -----------------------
 2 files changed, 147 insertions(+), 108 deletions(-)
 create mode 100755 test/lint/lint-cppcheck-dash.py
 delete mode 100755 test/lint/lint-cppcheck-dash.sh

diff --git a/test/lint/lint-cppcheck-dash.py b/test/lint/lint-cppcheck-dash.py
new file mode 100755
index 000000000000..798d1fb48e14
--- /dev/null
+++ b/test/lint/lint-cppcheck-dash.py
@@ -0,0 +1,147 @@
+#!/usr/bin/env python3
+#
+# Copyright (c) 2019 The Bitcoin Core developers
+# Copyright (c) 2025 The Dash Core developers
+# Distributed under the MIT software license, see the accompanying
+# file COPYING or http://www.opensource.org/licenses/mit-license.php.
+#
+# Run cppcheck for dash specific files
+
+import multiprocessing
+import os
+import re
+import subprocess
+import sys
+
+os.environ['LC_ALL'] = 'C'
+
+ENABLED_CHECKS = (
+    "Class '.*' has a constructor with 1 argument that is not explicit.",
+    "Struct '.*' has a constructor with 1 argument that is not explicit.",
+    "Function parameter '.*' should be passed by const reference.",
+    "Comparison of modulo result is predetermined",
+    "Local variable '.*' shadows outer argument",
+    "Redundant initialization for '.*'. The initialized value is overwritten before it is read.",
+    "Dereferencing '.*' after it is deallocated / released",
+    "The scope of the variable '.*' can be reduced.",
+    "Parameter '.*' can be declared with const",
+    "Variable '.*' can be declared with const",
+    "Variable '.*' is assigned a value that is never used.",
+    "Unused variable",
+    "The function '.*' overrides a function in a base class but is not marked with a 'override' specifier.",
+    # Enable to catch all warnings
+    # ".*",
+)
+
+IGNORED_WARNINGS = (
+    "src/bls/bls.h:.* Struct 'CBLSIdImplicit' has a constructor with 1 argument that is not explicit.",
+    "src/rpc/masternode.cpp:.*:21: warning: Consider using std::copy algorithm instead of a raw loop.",  # UniValue doesn't support std::copy
+    "src/cachemultimap.h:.*: warning: Variable 'mapIt' can be declared as reference to const",
+    "src/evo/simplifiedmns.cpp:.*:20: warning: Consider using std::copy algorithm instead of a raw loop.",
+    "src/llmq/commitment.cpp.* warning: Consider using std::all_of or std::none_of algorithm instead of a raw loop. [useStlAlgorithm]",
+    "src/rpc/.*cpp:.*: note: Function pointer used here.",
+    "src/masternode/sync.cpp:.*: warning: Variable 'pnode' can be declared as pointer to const [constVariableReference]",
+    "src/wallet/bip39.cpp.*: warning: The scope of the variable 'ssCurrentWord' can be reduced. [variableScope]",
+    "src/.*:.*: warning: Local variable '_' shadows outer function [shadowFunction]",
+
+    "src/stacktraces.cpp:.*: .*: Parameter 'info' can be declared as pointer to const",
+    "src/stacktraces.cpp:.*: note: You might need to cast the function pointer here",
+
+    "[note|warning]: Return value 'state.Invalid(.*)' is always false",
+    "note: Calling function 'Invalid' returns 0",
+    "note: Shadow variable",
+
+    # General catchall, for some reason any value named 'hash' is viewed as never used.
+    "Variable 'hash' is assigned a value that is never used.",
+
+    # The following can be useful to ignore when the catch all is used
+    # "Consider performing initialization in initialization list.",
+    "Consider using std::transform algorithm instead of a raw loop.",
+    "Consider using std::accumulate algorithm instead of a raw loop.",
+    "Consider using std::any_of algorithm instead of a raw loop.",
+    "Consider using std::copy_if algorithm instead of a raw loop.",
+    # "Consider using std::count_if algorithm instead of a raw loop.",
+    # "Consider using std::find_if algorithm instead of a raw loop.",
+    # "Member variable '.*' is not initialized in the constructor.",
+
+    "unusedFunction",
+    "unknownMacro",
+    "unusedStructMember",
+)
+
+def main():
+    warnings = []
+    exit_code = 0
+
+    try:
+        subprocess.check_output(['cppcheck', '--version'])
+    except FileNotFoundError:
+        print("Skipping cppcheck linting since cppcheck is not installed.")
+        sys.exit(0)
+
+    with open('test/util/data/non-backported.txt', 'r', encoding='utf-8') as f:
+        patterns = [line.strip() for line in f if line.strip()]
+
+    files_output = subprocess.check_output(['git', 'ls-files', '--'] + patterns, universal_newlines=True, encoding="utf8")
+    files = [f.strip() for f in files_output.splitlines() if f.strip()]
+
+    enabled_regexp = '|'.join(ENABLED_CHECKS)
+    ignored_regexp = '|'.join(IGNORED_WARNINGS)
+    files_regexp = '|'.join(re.escape(f) for f in files)
+
+    script_dir = os.path.dirname(os.path.abspath(__file__))
+    cache_dir = os.environ.get('CACHE_DIR')
+    if cache_dir:
+        cppcheck_dir = os.path.join(cache_dir, 'cppcheck')
+    else:
+        cppcheck_dir = os.path.join(script_dir, '.cppcheck')
+    os.makedirs(cppcheck_dir, exist_ok=True)
+
+    cppcheck_cmd = [
+        'cppcheck',
+        '--enable=all',
+        '--inline-suppr',
+        '--suppress=missingIncludeSystem',
+        f'--cppcheck-build-dir={cppcheck_dir}',
+        '-j', str(multiprocessing.cpu_count()),
+        '--language=c++',
+        '--std=c++20',
+        '--template=gcc',
+        '-D__cplusplus',
+        '-DENABLE_WALLET',
+        '-DCLIENT_VERSION_BUILD',
+        '-DCLIENT_VERSION_IS_RELEASE',
+        '-DCLIENT_VERSION_MAJOR',
+        '-DCLIENT_VERSION_MINOR',
+        '-DCOPYRIGHT_YEAR',
+        '-DDEBUG',
+        '-DUSE_EPOLL',
+        '-DCHAR_BIT=8',
+        '-I', 'src/',
+        '-q',
+    ] + files
+
+    dependencies_output = subprocess.run(
+        cppcheck_cmd,
+        stdout=subprocess.PIPE,
+        stderr=subprocess.STDOUT,
+        text=True,
+    )
+
+    unique_sorted_lines = sorted(set(dependencies_output.stdout.splitlines()))
+    for line in unique_sorted_lines:
+        if re.search(enabled_regexp, line) and not re.search(ignored_regexp, line) and re.search(files_regexp, line):
+            warnings.append(line)
+
+    if warnings:
+        print('\n'.join(warnings))
+        print()
+        print("Advice not applicable in this specific case? Add an exception by updating")
+        print(f"IGNORED_WARNINGS in {__file__}")
+        # Uncomment to enforce the linter / comment to run locally
+        exit_code = 1
+
+    sys.exit(exit_code)
+
+if __name__ == "__main__":
+    main()
diff --git a/test/lint/lint-cppcheck-dash.sh b/test/lint/lint-cppcheck-dash.sh
deleted file mode 100755
index c396142abff3..000000000000
--- a/test/lint/lint-cppcheck-dash.sh
+++ /dev/null
@@ -1,108 +0,0 @@
-#!/usr/bin/env bash
-#
-# Copyright (c) 2019 The Bitcoin Core developers
-# Distributed under the MIT software license, see the accompanying
-# file COPYING or http://www.opensource.org/licenses/mit-license.php.
-#
-
-export LC_ALL=C
-
-ENABLED_CHECKS=(
-    "Class '.*' has a constructor with 1 argument that is not explicit."
-    "Struct '.*' has a constructor with 1 argument that is not explicit."
-    "Function parameter '.*' should be passed by const reference."
-    "Comparison of modulo result is predetermined"
-    "Local variable '.*' shadows outer argument"
-    "Redundant initialization for '.*'. The initialized value is overwritten before it is read."
-    "Dereferencing '.*' after it is deallocated / released"
-    "The scope of the variable '.*' can be reduced."
-    "Parameter '.*' can be declared with const"
-    "Variable '.*' can be declared with const"
-    "Variable '.*' is assigned a value that is never used."
-    "Unused variable"
-    "The function '.*' overrides a function in a base class but is not marked with a 'override' specifier."
-# Enable to catch all warnings
-    ".*"
-)
-
-IGNORED_WARNINGS=(
-    "src/bls/bls.h:.* Struct 'CBLSIdImplicit' has a constructor with 1 argument that is not explicit."
-    "src/rpc/masternode.cpp:.*:21: warning: Consider using std::copy algorithm instead of a raw loop." # UniValue doesn't support std::copy
-    "src/cachemultimap.h:.*: warning: Variable 'mapIt' can be declared as reference to const"
-    "src/evo/simplifiedmns.cpp:.*:20: warning: Consider using std::copy algorithm instead of a raw loop."
-    "src/llmq/commitment.cpp.* warning: Consider using std::all_of or std::none_of algorithm instead of a raw loop. \[useStlAlgorithm\]"
-    "src/rpc/.*cpp:.*: note: Function pointer used here."
-    "src/masternode/sync.cpp:.*: warning: Variable 'pnode' can be declared as pointer to const \[constVariableReference\]"
-    "src/wallet/bip39.cpp.*: warning: The scope of the variable 'ssCurrentWord' can be reduced. \[variableScope\]"
-    "src/.*:.*: warning: Local variable '_' shadows outer function \[shadowFunction\]"
-
-    "src/stacktraces.cpp:.*: .*: Parameter 'info' can be declared as pointer to const"
-    "src/stacktraces.cpp:.*: note: You might need to cast the function pointer here"
-
-    "[note|warning]: Return value 'state.Invalid(.*)' is always false"
-    "note: Calling function 'Invalid' returns 0"
-    "note: Shadow variable"
-
-# General catchall, for some reason any value named 'hash' is viewed as never used.
-    "Variable 'hash' is assigned a value that is never used."
-
-# The following can be useful to ignore when the catch all is used
-#    "Consider performing initialization in initialization list."
-    "Consider using std::transform algorithm instead of a raw loop."
-    "Consider using std::accumulate algorithm instead of a raw loop."
-    "Consider using std::any_of algorithm instead of a raw loop."
-    "Consider using std::copy_if algorithm instead of a raw loop."
-#    "Consider using std::count_if algorithm instead of a raw loop."
-#    "Consider using std::find_if algorithm instead of a raw loop."
-#    "Member variable '.*' is not initialized in the constructor."
-
-    "unusedFunction"
-    "unknownMacro"
-    "unusedStructMember"
-)
-
-# We should attempt to update this with all dash specific code
-# shellcheck disable=SC2046
-FILES=$(git ls-files -- $(cat test/util/data/non-backported.txt))
-
-
-if ! command -v cppcheck > /dev/null; then
-    echo "Skipping cppcheck linting since cppcheck is not installed."
-    exit 0
-fi
-
-function join_array {
-    local IFS="$1"
-    shift
-    echo "$*"
-}
-
-ENABLED_CHECKS_REGEXP=$(join_array "|" "${ENABLED_CHECKS[@]}")
-IGNORED_WARNINGS_REGEXP=$(join_array "|" "${IGNORED_WARNINGS[@]}")
-FILES_REGEXP=$(join_array "|" "${FILES[@]}")
-SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
-# Check if CACHE_DIR is set and non-empty, otherwise use default .cppcheck/ directory
-if [[ -n "$CACHE_DIR" ]]; then
-    CPPCHECK_DIR=$CACHE_DIR/cppcheck/
-else
-    CPPCHECK_DIR=$SCRIPT_DIR/.cppcheck/
-fi
-if [ ! -d "$CPPCHECK_DIR" ]
-then
-    mkdir -p "$CPPCHECK_DIR"
-fi
-WARNINGS=$(echo "${FILES}" | \
-    xargs cppcheck --enable=all --inline-suppr --suppress=missingIncludeSystem --cppcheck-build-dir="$CPPCHECK_DIR" -j "$(getconf _NPROCESSORS_ONLN)" --language=c++ --std=c++20 --template=gcc -D__cplusplus -DENABLE_WALLET -DCLIENT_VERSION_BUILD -DCLIENT_VERSION_IS_RELEASE -DCLIENT_VERSION_MAJOR -DCLIENT_VERSION_MINOR -DCOPYRIGHT_YEAR -DDEBUG -DUSE_EPOLL -DCHAR_BIT=8 -I src/ -q 2>&1 | sort -u | \
-    grep -E "${ENABLED_CHECKS_REGEXP}" | \
-    grep -vE "${IGNORED_WARNINGS_REGEXP}" | \
-    grep -E "${FILES_REGEXP}")
-
-if [[ ${WARNINGS} != "" ]]; then
-    echo "${WARNINGS}"
-    echo
-    echo "Advice not applicable in this specific case? Add an exception by updating"
-    echo "IGNORED_WARNINGS in $0"
-    # Uncomment to enforce the linter / comment to run locally
-    exit 1
-fi
-exit 0

From 48a02e2d29e0fdfcd550dae777cb471b902e162e Mon Sep 17 00:00:00 2001
From: Konstantin Akimov <knstqq@gmail.com>
Date: Mon, 6 Oct 2025 14:30:38 +0700
Subject: [PATCH 069/656] refactor: add missing explicit for NetInfoEntry

---
 src/evo/netinfo.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/evo/netinfo.h b/src/evo/netinfo.h
index 3ea51992b79e..28d92364481b 100644
--- a/src/evo/netinfo.h
+++ b/src/evo/netinfo.h
@@ -195,13 +195,13 @@ class NetInfoEntry
 
 public:
     NetInfoEntry() = default;
-    NetInfoEntry(const DomainPort& domain)
+    explicit NetInfoEntry(const DomainPort& domain)
     {
         if (!domain.IsValid()) return;
         m_type = NetInfoType::Domain;
         m_data = domain;
     }
-    NetInfoEntry(const CService& service)
+    explicit NetInfoEntry(const CService& service)
     {
         if (!service.IsValid()) return;
         m_type = NetInfoType::Service;

From f95ba2091bc7822c6e4cd0f4014ddac739122a5e Mon Sep 17 00:00:00 2001
From: Konstantin Akimov <knstqq@gmail.com>
Date: Mon, 6 Oct 2025 14:31:05 +0700
Subject: [PATCH 070/656] refactor: reduce scope for `ki` variable, replace
 assigning to clear() for secure string

---
 src/wallet/bip39.cpp | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/wallet/bip39.cpp b/src/wallet/bip39.cpp
index 40d7fd0b70d9..39b4f244975c 100644
--- a/src/wallet/bip39.cpp
+++ b/src/wallet/bip39.cpp
@@ -96,12 +96,11 @@ bool CMnemonic::Check(const SecureString& mnemonic)
 
     SecureString ssCurrentWord;
     SecureVector bits(32 + 1);
-
-    uint32_t ki, nBitsCount{};
+    uint32_t nBitsCount{};
 
     for (size_t i = 0; i < mnemonic.size(); ++i)
     {
-        ssCurrentWord = "";
+        ssCurrentWord.resize(0); // we resize ssCurrentWord instead recreating to avoid new allocations
         while (i + ssCurrentWord.size() < mnemonic.size() && mnemonic[i + ssCurrentWord.size()] != ' ') {
             if (ssCurrentWord.size() >= 9) {
                 return false;
@@ -115,7 +114,7 @@ bool CMnemonic::Check(const SecureString& mnemonic)
                 return false;
             }
             if (ssCurrentWord == wordlist[nWordIndex]) { // word found on index nWordIndex
-                for (ki = 0; ki < 11; ki++) {
+                for (uint32_t ki = 0; ki < 11; ki++) {
                     if (nWordIndex & (1 << (10 - ki))) {
                         bits[nBitsCount / 8] |= 1 << (7 - (nBitsCount % 8));
                     }

From 8f70685abc671f97cc4bc61dee88b165e56e8d44 Mon Sep 17 00:00:00 2001
From: MacroFake <falke.marco@gmail.com>
Date: Tue, 7 Jun 2022 10:37:29 +0200
Subject: [PATCH 071/656] Merge bitcoin/bitcoin#25288: test: Reliably don't
 start itself (lint-all.py runs all tests twice)

BACKPORT NOTE:
only left-over changes has not been done previously is replacing a mask "lint-*" to "lint-*.py" and it's done

f26a496dfd0a7ce3833a10075027d7d5b0345e32 test: clean up all-lint.py (Martin Leitner-Ankerl)
64d72c4c8734b9dd45cb61cb2c2baf98766b0163 test: rename lint-all.py to all-lint.py (Martin Leitner-Ankerl)

Pull request description:

  When running `./test/lint/lint-all.py`, the script runs all tests but
  also calls itself because the comparison with `__file__` doesn't work.

  Comparing resolved paths gives reliable comparison, and lint-all.py doesn't call itself any more

ACKs for top commit:
  laanwj:
    Code review ACK f26a496dfd0a7ce3833a10075027d7d5b0345e32

Tree-SHA512: b44abdd685f7b48a6a9f48e96d97138b635c31c1c7ab543cb5636b5f49690ccd56fa6fec01ae7fcc16af01a613372ee77632f70c32059919b373aa8051953791
---
 test/lint/all-lint.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/lint/all-lint.py b/test/lint/all-lint.py
index 40274fcc41e4..e8d7299f2a1d 100755
--- a/test/lint/all-lint.py
+++ b/test/lint/all-lint.py
@@ -15,7 +15,7 @@
 
 exit_code = 0
 mod_path = Path(__file__).parent
-lints = glob(f"{mod_path}/lint-*")
+lints = glob(f"{mod_path}/lint-*.py")
 if which("parallel") and which("column"):
     logfile = "parallel_out.log"
     command = ["parallel", "--jobs", "100%", "--will-cite", "--joblog", logfile, ":::"] + lints

From a9218b1de78544b3f2d6dcb92a05b074ec91b1f7 Mon Sep 17 00:00:00 2001
From: Kittywhiskers Van Gogh <63189531+kwvg@users.noreply.github.com>
Date: Mon, 6 Oct 2025 21:00:58 +0000
Subject: [PATCH 072/656] rpc: introduce `GetJsonHelp()` to provide help text
 for Dash RPC objects

Currently, the most reliable source of RPC help text is the published
documentation. This is fine for releases as the whole set of changes
undergo evaluation but a problem for nightlies or documenting behavior
changes or deprecations in-source.
---
 src/evo/core_write.cpp     | 113 ++++++++++++++++++++++++++++++++++++-
 src/evo/providertx.h       |   9 ++-
 src/rpc/rawtransaction.cpp |  14 +++--
 3 files changed, 126 insertions(+), 10 deletions(-)

diff --git a/src/evo/core_write.cpp b/src/evo/core_write.cpp
index 574910214294..c8a85636a213 100644
--- a/src/evo/core_write.cpp
+++ b/src/evo/core_write.cpp
@@ -2,9 +2,6 @@
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-#include <core_io.h>
-#include <util/underlying.h>
-
 #include <evo/assetlocktx.h>
 #include <evo/cbtx.h>
 #include <evo/mnhftx.h>
@@ -15,8 +12,55 @@
 #include <llmq/commitment.h>
 #include <rpc/evo_util.h>
 
+#include <core_io.h>
+#include <rpc/util.h>
+#include <util/check.h>
+#include <util/underlying.h>
+
 #include <univalue.h>
 
+#include <map>
+#include <string>
+
+namespace {
+RPCResult GetRpcResult(const std::string& key, bool optional = false)
+{
+#define RESULT_MAP_ENTRY(type, name, desc) {name, {type, name, optional, desc}}
+    const std::map<std::string, RPCResult> result_map{{
+        {"addresses",
+            {RPCResult::Type::OBJ, "addresses", optional, "Network addresses of the masternode",
+        {
+            {RPCResult::Type::ARR, "core_p2p", /*optional=*/true, "Addresses used for protocol P2P",
+                {{RPCResult::Type::STR, "address", ""}}},
+            {RPCResult::Type::ARR, "platform_p2p", /*optional=*/true, "Addresses used for Platform P2P",
+                {{RPCResult::Type::STR, "address", ""}}},
+            {RPCResult::Type::ARR, "platform_https", /*optional=*/true, "Addresses used for Platform HTTPS API",
+                {{RPCResult::Type::STR, "address", ""}}},
+        }}},
+        RESULT_MAP_ENTRY(RPCResult::Type::STR_HEX, "inputsHash", "Hash of all the outpoints of the transaction inputs"),
+        RESULT_MAP_ENTRY(RPCResult::Type::STR, "operatorPayoutAddress", "Dash address used for operator reward payments"),
+        RESULT_MAP_ENTRY(RPCResult::Type::STR, "payoutAddress", "Dash address used for masternode reward payments"),
+        RESULT_MAP_ENTRY(RPCResult::Type::NUM, "platformHTTPPort", "(DEPRECATED) TCP port of Platform HTTP API"),
+        RESULT_MAP_ENTRY(RPCResult::Type::STR_HEX, "platformNodeID", "Node ID derived from P2P public key for Platform P2P"),
+        RESULT_MAP_ENTRY(RPCResult::Type::NUM, "platformP2PPort", "(DEPRECATED) TCP port of Platform P2P"),
+        RESULT_MAP_ENTRY(RPCResult::Type::STR_HEX, "proTxHash", "Hash of the masternode's initial ProRegTx"),
+        RESULT_MAP_ENTRY(RPCResult::Type::STR, "pubKeyOperator", "BLS public key used for operator signing"),
+        RESULT_MAP_ENTRY(RPCResult::Type::STR, "service", "(DEPRECATED) IP address and port of the masternode"),
+        RESULT_MAP_ENTRY(RPCResult::Type::NUM, "type", "Masternode type"),
+        RESULT_MAP_ENTRY(RPCResult::Type::NUM, "version", "Special transaction version"),
+        RESULT_MAP_ENTRY(RPCResult::Type::STR, "votingAddress", "Dash address used for voting"),
+    }};
+#undef  RESULT_MAP_ENTRY
+
+    if (const auto it = result_map.find(key); it != result_map.end()) {
+        return it->second;
+    }
+
+    throw NonFatalCheckError(strprintf("Requested invalid RPCResult for nonexistent key \"%s\"", key).c_str(),
+                             __FILE__, __LINE__, __func__);
+}
+} // anonymous namespace
+
 [[nodiscard]] UniValue CAssetLockPayload::ToJson() const
 {
     UniValue outputs(UniValue::VARR);
@@ -65,6 +109,28 @@
     return ret;
 }
 
+[[nodiscard]] RPCResult CProRegTx::GetJsonHelp(const std::string& key, bool optional)
+{
+    return {RPCResult::Type::OBJ, key, optional, key.empty() ? "" : "The masternode registration special transaction",
+    {
+        GetRpcResult("version"),
+        GetRpcResult("type"),
+        {RPCResult::Type::STR_HEX, "collateralHash", "Collateral transaction hash"},
+        {RPCResult::Type::NUM, "collateralIndex", "Collateral transaction output index"},
+        GetRpcResult("service"),
+        GetRpcResult("addresses"),
+        {RPCResult::Type::STR, "ownerAddress", "Dash address used for payee updates and proposal voting"},
+        GetRpcResult("votingAddress"),
+        GetRpcResult("payoutAddress", /*optional=*/true),
+        GetRpcResult("pubKeyOperator"),
+        {RPCResult::Type::NUM, "operatorReward", "Fraction in %% of reward shared with the operator between 0 and 10000"},
+        GetRpcResult("platformNodeID", /*optional=*/true),
+        GetRpcResult("platformP2PPort", /*optional=*/true),
+        GetRpcResult("platformHTTPPort", /*optional=*/true),
+        GetRpcResult("inputsHash"),
+    }};
+}
+
 [[nodiscard]] UniValue CProRegTx::ToJson() const
 {
     UniValue ret(UniValue::VOBJ);
@@ -90,6 +156,19 @@
     return ret;
 }
 
+[[nodiscard]] RPCResult CProUpRegTx::GetJsonHelp(const std::string& key, bool optional)
+{
+    return {RPCResult::Type::OBJ, key, optional, key.empty() ? "" : "The masternode update registrar special transaction",
+    {
+        GetRpcResult("version"),
+        GetRpcResult("proTxHash"),
+        GetRpcResult("votingAddress"),
+        GetRpcResult("payoutAddress", /*optional=*/true),
+        GetRpcResult("pubKeyOperator"),
+        GetRpcResult("inputsHash"),
+    }};
+}
+
 [[nodiscard]] UniValue CProUpRegTx::ToJson() const
 {
     UniValue ret(UniValue::VOBJ);
@@ -104,6 +183,17 @@
     return ret;
 }
 
+[[nodiscard]] RPCResult CProUpRevTx::GetJsonHelp(const std::string& key, bool optional)
+{
+    return {RPCResult::Type::OBJ, key, optional, key.empty() ? "" : "The masternode operator revocation special transaction",
+    {
+        GetRpcResult("version"),
+        GetRpcResult("proTxHash"),
+        {RPCResult::Type::NUM, "reason", "Reason for masternode service revocation"},
+        GetRpcResult("inputsHash", /*optional=*/true),
+    }};
+}
+
 [[nodiscard]] UniValue CProUpRevTx::ToJson() const
 {
     UniValue ret(UniValue::VOBJ);
@@ -114,6 +204,23 @@
     return ret;
 }
 
+[[nodiscard]] RPCResult CProUpServTx::GetJsonHelp(const std::string& key, bool optional)
+{
+    return {RPCResult::Type::OBJ, key, optional, key.empty() ? "" : "The masternode update service special transaction",
+    {
+        GetRpcResult("version"),
+        GetRpcResult("type"),
+        GetRpcResult("proTxHash"),
+        GetRpcResult("service"),
+        GetRpcResult("addresses"),
+        GetRpcResult("operatorPayoutAddress", /*optional=*/true),
+        GetRpcResult("platformNodeID", /*optional=*/true),
+        GetRpcResult("platformP2PPort", /*optional=*/true),
+        GetRpcResult("platformHTTPPort", /*optional=*/true),
+        GetRpcResult("inputsHash"),
+    }};
+}
+
 [[nodiscard]] UniValue CProUpServTx::ToJson() const
 {
     UniValue ret(UniValue::VOBJ);
diff --git a/src/evo/providertx.h b/src/evo/providertx.h
index f2173b20e086..b4a95dd820a6 100644
--- a/src/evo/providertx.h
+++ b/src/evo/providertx.h
@@ -6,22 +6,23 @@
 #define BITCOIN_EVO_PROVIDERTX_H
 
 #include <bls/bls.h>
+#include <evo/dmn_types.h>
 #include <evo/netinfo.h>
 #include <evo/specialtx.h>
 #include <primitives/transaction.h>
 
 #include <consensus/validation.h>
-#include <evo/dmn_types.h>
 #include <key_io.h>
 #include <netaddress.h>
 #include <pubkey.h>
-#include <univalue.h>
 #include <util/underlying.h>
 
+#include <univalue.h>
 #include <gsl/pointers.h>
 
 class CBlockIndex;
 class TxValidationState;
+struct RPCResult;
 
 namespace ProTxVersion {
 enum : uint16_t {
@@ -120,6 +121,7 @@ class CProRegTx
 
     std::string ToString() const;
 
+    [[nodiscard]] static RPCResult GetJsonHelp(const std::string& key, bool optional);
     [[nodiscard]] UniValue ToJson() const;
 
     bool IsTriviallyValid(gsl::not_null<const CBlockIndex*> pindexPrev, TxValidationState& state) const;
@@ -180,6 +182,7 @@ class CProUpServTx
 
     std::string ToString() const;
 
+    [[nodiscard]] static RPCResult GetJsonHelp(const std::string& key, bool optional);
     [[nodiscard]] UniValue ToJson() const;
 
     bool IsTriviallyValid(gsl::not_null<const CBlockIndex*> pindexPrev, TxValidationState& state) const;
@@ -226,6 +229,7 @@ class CProUpRegTx
 
     std::string ToString() const;
 
+    [[nodiscard]] static RPCResult GetJsonHelp(const std::string& key, bool optional);
     [[nodiscard]] UniValue ToJson() const;
 
     bool IsTriviallyValid(gsl::not_null<const CBlockIndex*> pindexPrev, TxValidationState& state) const;
@@ -275,6 +279,7 @@ class CProUpRevTx
 
     std::string ToString() const;
 
+    [[nodiscard]] static RPCResult GetJsonHelp(const std::string& key, bool optional);
     [[nodiscard]] UniValue ToJson() const;
 
     bool IsTriviallyValid(gsl::not_null<const CBlockIndex*> pindexPrev, TxValidationState& state) const;
diff --git a/src/rpc/rawtransaction.cpp b/src/rpc/rawtransaction.cpp
index 48869e1f27df..d0e61b5e8029 100644
--- a/src/rpc/rawtransaction.cpp
+++ b/src/rpc/rawtransaction.cpp
@@ -12,7 +12,6 @@
 #include <consensus/tx_verify.h>
 #include <consensus/validation.h>
 #include <core_io.h>
-#include <evo/creditpool.h>
 #include <index/txindex.h>
 #include <init.h>
 #include <key_io.h>
@@ -27,7 +26,6 @@
 #include <primitives/transaction.h>
 #include <psbt.h>
 #include <rpc/blockchain.h>
-#include <rpc/index_util.h>
 #include <rpc/rawtransaction_util.h>
 #include <rpc/server.h>
 #include <rpc/server_util.h>
@@ -46,17 +44,19 @@
 #include <util/vector.h>
 #include <validation.h>
 #include <validationinterface.h>
-#include <util/irange.h>
 
 #include <chainlock/chainlock.h>
 #include <evo/cbtx.h>
+#include <evo/providertx.h>
 #include <evo/specialtx.h>
-#include <instantsend/lock.h>
 #include <instantsend/instantsend.h>
+#include <instantsend/lock.h>
 #include <llmq/context.h>
+#include <rpc/index_util.h>
+#include <util/irange.h>
 
+#include <cstdint>
 #include <numeric>
-#include <stdint.h>
 
 #include <univalue.h>
 
@@ -168,6 +168,10 @@ static std::vector<RPCResult> DecodeTxDoc(const std::string& txid_field_doc)
         }},
         {RPCResult::Type::NUM, "extraPayloadSize", /*optional=*/true, "Size of DIP2 extra payload. Only present if it's a special TX"},
         {RPCResult::Type::STR_HEX, "extraPayload", /*optional=*/true, "Hex-encoded DIP2 extra payload data. Only present if it's a special TX"},
+        CProRegTx::GetJsonHelp(/*key=*/"proRegTx", /*optional=*/true),
+        CProUpServTx::GetJsonHelp(/*key=*/"proUpServTx", /*optional=*/true),
+        CProUpRegTx::GetJsonHelp(/*key=*/"proUpRegTx", /*optional=*/true),
+        CProUpRevTx::GetJsonHelp(/*key=*/"proUpRevTx", /*optional=*/true),
     };
 }
 

From 9de8c9cc8f95da96d532f01fd6498b4e64423055 Mon Sep 17 00:00:00 2001
From: Kittywhiskers Van Gogh <63189531+kwvg@users.noreply.github.com>
Date: Sat, 4 Oct 2025 13:41:31 +0000
Subject: [PATCH 073/656] trivial: add missing headers

Header resorting in the previous commit revealed some headers that were
transiently included were no longer available, this should resolve that.
---
 src/rpc/rawtransaction.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/rpc/rawtransaction.cpp b/src/rpc/rawtransaction.cpp
index d0e61b5e8029..25b96b60200c 100644
--- a/src/rpc/rawtransaction.cpp
+++ b/src/rpc/rawtransaction.cpp
@@ -46,7 +46,9 @@
 #include <validationinterface.h>
 
 #include <chainlock/chainlock.h>
+#include <evo/assetlocktx.h>
 #include <evo/cbtx.h>
+#include <evo/creditpool.h>
 #include <evo/providertx.h>
 #include <evo/specialtx.h>
 #include <instantsend/instantsend.h>

From 7219a293417f4d2738ef646811450d71a19fbb1e Mon Sep 17 00:00:00 2001
From: Kittywhiskers Van Gogh <63189531+kwvg@users.noreply.github.com>
Date: Mon, 6 Oct 2025 20:35:19 +0000
Subject: [PATCH 074/656] rpc: `GetJsonHelp()` defs for `CbTx`,
 `SimplifiedMNList`, final commitm.

---
 src/evo/cbtx.h             |  5 +++
 src/evo/core_write.cpp     | 76 ++++++++++++++++++++++++++++++++++++++
 src/evo/simplifiedmns.h    |  9 ++++-
 src/evo/smldiff.h          |  6 ++-
 src/llmq/commitment.h      | 15 ++++----
 src/rpc/blockchain.cpp     |  8 +---
 src/rpc/evo.cpp            |  2 +-
 src/rpc/rawtransaction.cpp |  3 ++
 8 files changed, 105 insertions(+), 19 deletions(-)

diff --git a/src/evo/cbtx.h b/src/evo/cbtx.h
index 482d880dd522..da6d92f802a8 100644
--- a/src/evo/cbtx.h
+++ b/src/evo/cbtx.h
@@ -6,16 +6,20 @@
 #define BITCOIN_EVO_CBTX_H
 
 #include <bls/bls.h>
+
 #include <primitives/transaction.h>
+
 #include <univalue.h>
 
 #include <optional>
+#include <string>
 
 class BlockValidationState;
 class CBlock;
 class CBlockIndex;
 class CDeterministicMNList;
 class TxValidationState;
+struct RPCResult;
 
 namespace llmq {
 class CQuorumBlockProcessor;
@@ -57,6 +61,7 @@ class CCbTx
 
     }
 
+    [[nodiscard]] static RPCResult GetJsonHelp(const std::string& key, bool optional);
     std::string ToString() const;
 
     [[nodiscard]] UniValue ToJson() const;
diff --git a/src/evo/core_write.cpp b/src/evo/core_write.cpp
index c8a85636a213..4d2d72af45a0 100644
--- a/src/evo/core_write.cpp
+++ b/src/evo/core_write.cpp
@@ -37,7 +37,10 @@ RPCResult GetRpcResult(const std::string& key, bool optional = false)
             {RPCResult::Type::ARR, "platform_https", /*optional=*/true, "Addresses used for Platform HTTPS API",
                 {{RPCResult::Type::STR, "address", ""}}},
         }}},
+        RESULT_MAP_ENTRY(RPCResult::Type::NUM, "height", "Block height"),
         RESULT_MAP_ENTRY(RPCResult::Type::STR_HEX, "inputsHash", "Hash of all the outpoints of the transaction inputs"),
+        RESULT_MAP_ENTRY(RPCResult::Type::STR_HEX, "merkleRootMNList", "Merkle root of the masternode list"),
+        RESULT_MAP_ENTRY(RPCResult::Type::STR_HEX, "merkleRootQuorums", "Merkle root of the quorum list"),
         RESULT_MAP_ENTRY(RPCResult::Type::STR, "operatorPayoutAddress", "Dash address used for operator reward payments"),
         RESULT_MAP_ENTRY(RPCResult::Type::STR, "payoutAddress", "Dash address used for masternode reward payments"),
         RESULT_MAP_ENTRY(RPCResult::Type::NUM, "platformHTTPPort", "(DEPRECATED) TCP port of Platform HTTP API"),
@@ -92,6 +95,20 @@ RPCResult GetRpcResult(const std::string& key, bool optional = false)
     return ret;
 }
 
+[[nodiscard]] RPCResult CCbTx::GetJsonHelp(const std::string& key, bool optional)
+{
+    return {RPCResult::Type::OBJ, key, optional, key.empty() ? "" : "The coinbase special transaction",
+    {
+        GetRpcResult("version"),
+        GetRpcResult("height"),
+        GetRpcResult("merkleRootMNList"),
+        GetRpcResult("merkleRootQuorums", /*optional=*/true),
+        {RPCResult::Type::NUM, "bestCLHeightDiff", /*optional=*/true, "Blocks between the current block and the last known block with a ChainLock"},
+        {RPCResult::Type::STR_HEX, "bestCLSignature", /*optional=*/true, "Best ChainLock signature known by the miner"},
+        {RPCResult::Type::NUM, "creditPoolBalance", /*optional=*/true, "Balance in the Platform credit pool"},
+    }};
+}
+
 [[nodiscard]] UniValue CCbTx::ToJson() const
 {
     UniValue ret(UniValue::VOBJ);
@@ -249,6 +266,16 @@ RPCResult GetRpcResult(const std::string& key, bool optional = false)
     return ret;
 }
 
+[[nodiscard]] RPCResult llmq::CFinalCommitmentTxPayload::GetJsonHelp(const std::string& key, bool optional)
+{
+    return {RPCResult::Type::OBJ, key, optional, key.empty() ? "" : "The quorum commitment special transaction",
+    {
+        GetRpcResult("version"),
+        GetRpcResult("height"),
+        // TODO: Add RPCResult for llmq::CFinalCommitment
+    }};
+}
+
 [[nodiscard]] UniValue llmq::CFinalCommitmentTxPayload::ToJson() const
 {
     UniValue ret(UniValue::VOBJ);
@@ -258,6 +285,26 @@ RPCResult GetRpcResult(const std::string& key, bool optional = false)
     return ret;
 }
 
+[[nodiscard]] RPCResult CSimplifiedMNListEntry::GetJsonHelp(const std::string& key, bool optional)
+{
+    return {RPCResult::Type::OBJ, key, optional, key.empty() ? "" : "The simplified masternode list entry",
+    {
+        {RPCResult::Type::NUM, "nVersion", "Version of the entry"},
+        {RPCResult::Type::NUM, "nType", "Masternode type"},
+        {RPCResult::Type::STR_HEX, "proRegTxHash", "Hash of the ProRegTx identifying the masternode"},
+        {RPCResult::Type::STR_HEX, "confirmedHash", "Hash of the block where the masternode was confirmed"},
+        GetRpcResult("service"),
+        GetRpcResult("addresses"),
+        GetRpcResult("pubKeyOperator"),
+        GetRpcResult("votingAddress"),
+        {RPCResult::Type::BOOL, "isValid", "Returns true if the masternode is not Proof-of-Service banned"},
+        GetRpcResult("platformHTTPPort", /*optional=*/true),
+        GetRpcResult("platformNodeID", /*optional=*/true),
+        GetRpcResult("payoutAddress", /*optional=*/true),
+        GetRpcResult("operatorPayoutAddress", /*optional=*/true),
+    }};
+}
+
 [[nodiscard]] UniValue CSimplifiedMNListEntry::ToJson(bool extended) const
 {
     UniValue obj(UniValue::VOBJ);
@@ -287,6 +334,35 @@ RPCResult GetRpcResult(const std::string& key, bool optional = false)
     return obj;
 }
 
+[[nodiscard]] RPCResult CSimplifiedMNListDiff::GetJsonHelp(const std::string& key, bool optional)
+{
+    return {RPCResult::Type::OBJ, key, optional, key.empty() ? "" : "The simplified masternode list diff",
+    {
+        {RPCResult::Type::NUM, "nVersion", "Version of the diff"},
+        {RPCResult::Type::STR_HEX, "baseBlockHash", "Hash of the base block"},
+        {RPCResult::Type::STR_HEX, "blockHash", "Hash of the ending block"},
+        {RPCResult::Type::STR_HEX, "cbTxMerkleTree", "Coinbase transaction merkle tree"},
+        {RPCResult::Type::STR_HEX, "cbTx", "Coinbase raw transaction"},
+        {RPCResult::Type::ARR, "deletedMNs", "ProRegTx hashes of deleted masternodes",
+            {{RPCResult::Type::STR_HEX, "hash", ""}}},
+        {RPCResult::Type::ARR, "mnList", "Masternode list details",
+            {CSimplifiedMNListEntry::GetJsonHelp(/*key=*/"", /*optional=*/false)}},
+        {RPCResult::Type::ARR, "deletedQuorums", "Deleted quorums",
+            {{RPCResult::Type::OBJ, "", "", {
+                {RPCResult::Type::NUM, "llmqType", "Quorum type"},
+                {RPCResult::Type::STR_HEX, "quorumHash", "Hash of the quorum"},
+        }}}},
+        {RPCResult::Type::ARR, "newQuorums", "New quorums"}, // TODO: Add definition for llmq::CFinalCommitment
+        GetRpcResult("merkleRootMNList", /*optional=*/true),
+        GetRpcResult("merkleRootQuorums", /*optional=*/true),
+        {RPCResult::Type::ARR, "quorumsCLSigs", "ChainLock signature details", {
+            {RPCResult::Type::OBJ, "", "", {
+                {RPCResult::Type::ARR, "<sig_hex>", "Array of quorum indices, keyed by BLS signature", {
+                    {RPCResult::Type::NUM, "", "Quorum index"}
+        }}}}}},
+    }};
+}
+
 [[nodiscard]] UniValue CSimplifiedMNListDiff::ToJson(bool extended) const
 {
     UniValue obj(UniValue::VOBJ);
diff --git a/src/evo/simplifiedmns.h b/src/evo/simplifiedmns.h
index 9153d0b025e1..cbc1e9434fe4 100644
--- a/src/evo/simplifiedmns.h
+++ b/src/evo/simplifiedmns.h
@@ -9,15 +9,19 @@
 #include <evo/dmn_types.h>
 #include <evo/netinfo.h>
 #include <evo/providertx.h>
-#include <gsl/pointers.h>
+#include <util/pointer.h>
+
 #include <merkleblock.h>
 #include <netaddress.h>
 #include <pubkey.h>
-#include <util/pointer.h>
+
+#include <gsl/pointers.h>
 
 #include <memory>
 #include <vector>
 
+struct RPCResult;
+
 class UniValue;
 
 class CSimplifiedMNListEntry
@@ -95,6 +99,7 @@ class CSimplifiedMNListEntry
 
     uint256 CalcHash() const;
 
+    [[nodiscard]] static RPCResult GetJsonHelp(const std::string& key, bool optional);
     std::string ToString() const;
     [[nodiscard]] UniValue ToJson(bool extended = false) const;
 };
diff --git a/src/evo/smldiff.h b/src/evo/smldiff.h
index 5296ddf4941d..0154403d840b 100644
--- a/src/evo/smldiff.h
+++ b/src/evo/smldiff.h
@@ -5,12 +5,12 @@
 #ifndef BITCOIN_EVO_SMLDIFF_H
 #define BITCOIN_EVO_SMLDIFF_H
 
-#include <evo/simplifiedmns.h>
-
 #include <bls/bls.h>
 #include <evo/dmn_types.h>
 #include <evo/netinfo.h>
 #include <evo/providertx.h>
+#include <evo/simplifiedmns.h>
+
 #include <merkleblock.h>
 #include <netaddress.h>
 #include <pubkey.h>
@@ -21,6 +21,7 @@ class CBlockIndex;
 class CDeterministicMNManager;
 class UniValue;
 class ChainstateManager;
+struct RPCResult;
 
 namespace llmq {
 class CFinalCommitment;
@@ -85,6 +86,7 @@ class CSimplifiedMNListDiff
                           const llmq::CQuorumBlockProcessor& quorum_block_processor);
     bool BuildQuorumChainlockInfo(const llmq::CQuorumManager& qman, const CBlockIndex* blockIndex);
 
+    [[nodiscard]] static RPCResult GetJsonHelp(const std::string& key, bool optional);
     [[nodiscard]] UniValue ToJson(bool extended = false) const;
 };
 
diff --git a/src/llmq/commitment.h b/src/llmq/commitment.h
index 46d663d55105..69b9507a5e81 100644
--- a/src/llmq/commitment.h
+++ b/src/llmq/commitment.h
@@ -5,15 +5,15 @@
 #ifndef BITCOIN_LLMQ_COMMITMENT_H
 #define BITCOIN_LLMQ_COMMITMENT_H
 
-#include <bls/bls.h>
-#include <llmq/params.h>
-#include <llmq/types.h>
-
 #include <primitives/transaction.h>
 #include <util/irange.h>
 #include <util/strencodings.h>
 #include <util/underlying.h>
 
+#include <bls/bls.h>
+#include <llmq/params.h>
+#include <llmq/types.h>
+
 #include <gsl/pointers.h>
 #include <univalue.h>
 
@@ -29,14 +29,14 @@ class ChainstateManager;
 class TxValidationState;
 template <typename T>
 class CCheckQueueControl;
+struct RPCResult;
 
-namespace llmq
-{
+namespace llmq {
 class CQuorumSnapshotManager;
-
 namespace utils {
 struct BlsCheck;
 } // namespace utils
+
 // This message is an aggregation of all received premature commitments and only valid if
 // enough (>=threshold) premature commitments were aggregated
 // This is mined on-chain as part of TRANSACTION_QUORUM_COMMITMENT
@@ -175,6 +175,7 @@ class CFinalCommitmentTxPayload
         READWRITE(obj.nVersion, obj.nHeight, obj.commitment);
     }
 
+    [[nodiscard]] static RPCResult GetJsonHelp(const std::string& key, bool optional);
     [[nodiscard]] UniValue ToJson() const;
 };
 
diff --git a/src/rpc/blockchain.cpp b/src/rpc/blockchain.cpp
index 89b4ae290df7..4ca4f63ef1a2 100644
--- a/src/rpc/blockchain.cpp
+++ b/src/rpc/blockchain.cpp
@@ -922,13 +922,7 @@ static RPCHelpMan getblock()
                                 {RPCResult::Type::NUM, "size", "The block size"},
                                 {RPCResult::Type::ARR, "tx", "The transaction ids",
                                     {{RPCResult::Type::STR_HEX, "", "The transaction id"}}},
-                                {RPCResult::Type::OBJ, "cbTx", "The coinbase special transaction",
-                                    {
-                                        {RPCResult::Type::NUM, "version", "The coinbase special transaction version"},
-                                        {RPCResult::Type::NUM, "height", "The block height"},
-                                        {RPCResult::Type::STR_HEX, "merkleRootMNList", "The merkle root of the masternode list"},
-                                        {RPCResult::Type::STR_HEX, "merkleRootQuorums", "The merkle root of the quorum list"},
-                                    }},
+                                CCbTx::GetJsonHelp(/*key=*/"cbTx", /*optional=*/true),
                             }},
                     RPCResult{"for verbosity = 2",
                         RPCResult::Type::OBJ, "", "",
diff --git a/src/rpc/evo.cpp b/src/rpc/evo.cpp
index cc7052b453c3..9907f19153f8 100644
--- a/src/rpc/evo.cpp
+++ b/src/rpc/evo.cpp
@@ -1586,7 +1586,7 @@ static RPCHelpMan protx_diff()
             {"block", RPCArg::Type::NUM, RPCArg::Optional::NO, "The ending block height."},
             {"extended", RPCArg::Type::BOOL, RPCArg::Optional::OMITTED, "Show additional fields."},
         },
-        RPCResults{},
+        CSimplifiedMNListDiff::GetJsonHelp(/*key=*/"", /*optional=*/false),
         RPCExamples{""},
         [&](const RPCHelpMan& self, const JSONRPCRequest& request) -> UniValue
 {
diff --git a/src/rpc/rawtransaction.cpp b/src/rpc/rawtransaction.cpp
index 25b96b60200c..81d031525939 100644
--- a/src/rpc/rawtransaction.cpp
+++ b/src/rpc/rawtransaction.cpp
@@ -53,6 +53,7 @@
 #include <evo/specialtx.h>
 #include <instantsend/instantsend.h>
 #include <instantsend/lock.h>
+#include <llmq/commitment.h>
 #include <llmq/context.h>
 #include <rpc/index_util.h>
 #include <util/irange.h>
@@ -174,6 +175,8 @@ static std::vector<RPCResult> DecodeTxDoc(const std::string& txid_field_doc)
         CProUpServTx::GetJsonHelp(/*key=*/"proUpServTx", /*optional=*/true),
         CProUpRegTx::GetJsonHelp(/*key=*/"proUpRegTx", /*optional=*/true),
         CProUpRevTx::GetJsonHelp(/*key=*/"proUpRevTx", /*optional=*/true),
+        CCbTx::GetJsonHelp(/*key=*/"cbTx", /*optional=*/true),
+        llmq::CFinalCommitmentTxPayload::GetJsonHelp(/*key=*/"qcTx", /*optional=*/true),
     };
 }
 

From 73da03e241f6412eed6dab575d70dd27e7bb3643 Mon Sep 17 00:00:00 2001
From: Kittywhiskers Van Gogh <63189531+kwvg@users.noreply.github.com>
Date: Sat, 4 Oct 2025 16:12:33 +0000
Subject: [PATCH 075/656] refactor: move LLMQ-specific `ToJson()` definitions
 to separate file

Keeping true to separation of concerns
---
 src/Makefile.am         |   1 +
 src/core_io.h           |  14 +++--
 src/evo/core_write.cpp  |  23 +-------
 src/llmq/commitment.h   |  18 +-----
 src/llmq/core_write.cpp | 127 ++++++++++++++++++++++++++++++++++++++++
 src/llmq/signing.cpp    |  13 ----
 src/llmq/signing.h      |   2 +-
 src/llmq/snapshot.cpp   |  61 -------------------
 8 files changed, 140 insertions(+), 119 deletions(-)
 create mode 100644 src/llmq/core_write.cpp

diff --git a/src/Makefile.am b/src/Makefile.am
index d6386416c7ef..9ad66b87a276 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -906,6 +906,7 @@ libbitcoin_common_a_SOURCES = \
   init/common.cpp \
   key.cpp \
   key_io.cpp \
+  llmq/core_write.cpp \
   merkleblock.cpp \
   net_types.cpp \
   netaddress.cpp \
diff --git a/src/core_io.h b/src/core_io.h
index 00cec54e27e7..d3f424d1363f 100644
--- a/src/core_io.h
+++ b/src/core_io.h
@@ -5,8 +5,8 @@
 #ifndef BITCOIN_CORE_IO_H
 #define BITCOIN_CORE_IO_H
 
-#include <consensus/amount.h>
 #include <attributes.h>
+#include <consensus/amount.h>
 
 #include <string>
 #include <vector>
@@ -15,12 +15,13 @@ class CBlock;
 class CBlockHeader;
 class CScript;
 class CTransaction;
-struct CMutableTransaction;
-class uint256;
-class UniValue;
 class CTxUndo;
-
+class uint256;
+struct CMutableTransaction;
 struct CSpentIndexTxInfo;
+struct RPCResult;
+
+class UniValue;
 
 /**
  * Verbose level for block's transaction
@@ -57,4 +58,7 @@ std::string SighashToStr(unsigned char sighash_type);
 void ScriptToUniv(const CScript& script, UniValue& out, bool include_hex = true, bool include_address = false);
 void TxToUniv(const CTransaction& tx, const uint256& block_hash, UniValue& entry, bool include_hex = true, int serialize_flags = 0, const CTxUndo* txundo = nullptr, TxVerbosity verbosity = TxVerbosity::SHOW_DETAILS, const CSpentIndexTxInfo* ptxSpentInfo = nullptr);
 
+// evo/core_write.cpp
+RPCResult GetRpcResult(const std::string& key, bool optional = false);
+
 #endif // BITCOIN_CORE_IO_H
diff --git a/src/evo/core_write.cpp b/src/evo/core_write.cpp
index 4d2d72af45a0..1cccced0fd9b 100644
--- a/src/evo/core_write.cpp
+++ b/src/evo/core_write.cpp
@@ -22,8 +22,7 @@
 #include <map>
 #include <string>
 
-namespace {
-RPCResult GetRpcResult(const std::string& key, bool optional = false)
+RPCResult GetRpcResult(const std::string& key, bool optional)
 {
 #define RESULT_MAP_ENTRY(type, name, desc) {name, {type, name, optional, desc}}
     const std::map<std::string, RPCResult> result_map{{
@@ -62,7 +61,6 @@ RPCResult GetRpcResult(const std::string& key, bool optional = false)
     throw NonFatalCheckError(strprintf("Requested invalid RPCResult for nonexistent key \"%s\"", key).c_str(),
                              __FILE__, __LINE__, __func__);
 }
-} // anonymous namespace
 
 [[nodiscard]] UniValue CAssetLockPayload::ToJson() const
 {
@@ -266,25 +264,6 @@ RPCResult GetRpcResult(const std::string& key, bool optional = false)
     return ret;
 }
 
-[[nodiscard]] RPCResult llmq::CFinalCommitmentTxPayload::GetJsonHelp(const std::string& key, bool optional)
-{
-    return {RPCResult::Type::OBJ, key, optional, key.empty() ? "" : "The quorum commitment special transaction",
-    {
-        GetRpcResult("version"),
-        GetRpcResult("height"),
-        // TODO: Add RPCResult for llmq::CFinalCommitment
-    }};
-}
-
-[[nodiscard]] UniValue llmq::CFinalCommitmentTxPayload::ToJson() const
-{
-    UniValue ret(UniValue::VOBJ);
-    ret.pushKV("version", nVersion);
-    ret.pushKV("height", nHeight);
-    ret.pushKV("commitment", commitment.ToJson());
-    return ret;
-}
-
 [[nodiscard]] RPCResult CSimplifiedMNListEntry::GetJsonHelp(const std::string& key, bool optional)
 {
     return {RPCResult::Type::OBJ, key, optional, key.empty() ? "" : "The simplified masternode list entry",
diff --git a/src/llmq/commitment.h b/src/llmq/commitment.h
index 69b9507a5e81..54b96c19bc96 100644
--- a/src/llmq/commitment.h
+++ b/src/llmq/commitment.h
@@ -130,23 +130,7 @@ class CFinalCommitment
         return true;
     }
 
-    [[nodiscard]] UniValue ToJson() const
-    {
-        UniValue obj(UniValue::VOBJ);
-        obj.pushKV("version", nVersion);
-        obj.pushKV("llmqType", ToUnderlying(llmqType));
-        obj.pushKV("quorumHash", quorumHash.ToString());
-        obj.pushKV("quorumIndex", quorumIndex);
-        obj.pushKV("signersCount", CountSigners());
-        obj.pushKV("signers", BitsVectorToHexStr(signers));
-        obj.pushKV("validMembersCount", CountValidMembers());
-        obj.pushKV("validMembers", BitsVectorToHexStr(validMembers));
-        obj.pushKV("quorumPublicKey", quorumPublicKey.ToString(nVersion == LEGACY_BLS_NON_INDEXED_QUORUM_VERSION || nVersion == LEGACY_BLS_INDEXED_QUORUM_VERSION));
-        obj.pushKV("quorumVvecHash", quorumVvecHash.ToString());
-        obj.pushKV("quorumSig", quorumSig.ToString(nVersion == LEGACY_BLS_NON_INDEXED_QUORUM_VERSION || nVersion == LEGACY_BLS_INDEXED_QUORUM_VERSION));
-        obj.pushKV("membersSig", membersSig.ToString(nVersion == LEGACY_BLS_NON_INDEXED_QUORUM_VERSION || nVersion == LEGACY_BLS_INDEXED_QUORUM_VERSION));
-        return obj;
-    }
+    [[nodiscard]] UniValue ToJson() const;
 
 private:
     static std::string BitsVectorToHexStr(const std::vector<bool>& vBits)
diff --git a/src/llmq/core_write.cpp b/src/llmq/core_write.cpp
new file mode 100644
index 000000000000..47b92e1d9daa
--- /dev/null
+++ b/src/llmq/core_write.cpp
@@ -0,0 +1,127 @@
+// Copyright (c) 2018-2025 The Dash Core developers
+// Distributed under the MIT software license, see the accompanying
+// file COPYING or http://www.opensource.org/licenses/mit-license.php.
+
+#include <llmq/commitment.h>
+#include <llmq/signing.h>
+#include <llmq/snapshot.h>
+
+#include <core_io.h>
+#include <rpc/util.h>
+
+#include <univalue.h>
+
+#include <map>
+#include <string>
+
+namespace llmq {
+[[nodiscard]] UniValue CFinalCommitment::ToJson() const
+{
+    UniValue obj(UniValue::VOBJ);
+    obj.pushKV("version", nVersion);
+    obj.pushKV("llmqType", ToUnderlying(llmqType));
+    obj.pushKV("quorumHash", quorumHash.ToString());
+    obj.pushKV("quorumIndex", quorumIndex);
+    obj.pushKV("signersCount", CountSigners());
+    obj.pushKV("signers", BitsVectorToHexStr(signers));
+    obj.pushKV("validMembersCount", CountValidMembers());
+    obj.pushKV("validMembers", BitsVectorToHexStr(validMembers));
+    obj.pushKV("quorumPublicKey", quorumPublicKey.ToString(nVersion == LEGACY_BLS_NON_INDEXED_QUORUM_VERSION || nVersion == LEGACY_BLS_INDEXED_QUORUM_VERSION));
+    obj.pushKV("quorumVvecHash", quorumVvecHash.ToString());
+    obj.pushKV("quorumSig", quorumSig.ToString(nVersion == LEGACY_BLS_NON_INDEXED_QUORUM_VERSION || nVersion == LEGACY_BLS_INDEXED_QUORUM_VERSION));
+    obj.pushKV("membersSig", membersSig.ToString(nVersion == LEGACY_BLS_NON_INDEXED_QUORUM_VERSION || nVersion == LEGACY_BLS_INDEXED_QUORUM_VERSION));
+    return obj;
+}
+
+[[nodiscard]] RPCResult CFinalCommitmentTxPayload::GetJsonHelp(const std::string& key, bool optional)
+{
+    return {RPCResult::Type::OBJ, key, optional, key.empty() ? "" : "The quorum commitment special transaction",
+    {
+        GetRpcResult("version"),
+        GetRpcResult("height"),
+        // TODO: Add RPCResult for llmq::CFinalCommitment
+    }};
+}
+
+[[nodiscard]] UniValue CFinalCommitmentTxPayload::ToJson() const
+{
+    UniValue ret(UniValue::VOBJ);
+    ret.pushKV("version", nVersion);
+    ret.pushKV("height", nHeight);
+    ret.pushKV("commitment", commitment.ToJson());
+    return ret;
+}
+
+[[nodiscard]] UniValue CQuorumRotationInfo::ToJson() const
+{
+    UniValue obj(UniValue::VOBJ);
+    obj.pushKV("extraShare", extraShare);
+
+    obj.pushKV("quorumSnapshotAtHMinusC", quorumSnapshotAtHMinusC.ToJson());
+    obj.pushKV("quorumSnapshotAtHMinus2C", quorumSnapshotAtHMinus2C.ToJson());
+    obj.pushKV("quorumSnapshotAtHMinus3C", quorumSnapshotAtHMinus3C.ToJson());
+
+    if (extraShare) {
+        obj.pushKV("quorumSnapshotAtHMinus4C", quorumSnapshotAtHMinus4C.ToJson());
+    }
+
+    obj.pushKV("mnListDiffTip", mnListDiffTip.ToJson());
+    obj.pushKV("mnListDiffH", mnListDiffH.ToJson());
+    obj.pushKV("mnListDiffAtHMinusC", mnListDiffAtHMinusC.ToJson());
+    obj.pushKV("mnListDiffAtHMinus2C", mnListDiffAtHMinus2C.ToJson());
+    obj.pushKV("mnListDiffAtHMinus3C", mnListDiffAtHMinus3C.ToJson());
+
+    if (extraShare) {
+        obj.pushKV("mnListDiffAtHMinus4C", mnListDiffAtHMinus4C.ToJson());
+    }
+    UniValue hqclists(UniValue::VARR);
+    for (const auto& qc : lastCommitmentPerIndex) {
+        hqclists.push_back(qc.ToJson());
+    }
+    obj.pushKV("lastCommitmentPerIndex", hqclists);
+
+    UniValue snapshotlist(UniValue::VARR);
+    for (const auto& snap : quorumSnapshotList) {
+        snapshotlist.push_back(snap.ToJson());
+    }
+    obj.pushKV("quorumSnapshotList", snapshotlist);
+
+    UniValue mnlistdifflist(UniValue::VARR);
+    for (const auto& mnlist : mnListDiffList) {
+        mnlistdifflist.push_back(mnlist.ToJson());
+    }
+    obj.pushKV("mnListDiffList", mnlistdifflist);
+    return obj;
+}
+
+[[nodiscard]] UniValue CQuorumSnapshot::ToJson() const
+{
+    UniValue obj(UniValue::VOBJ);
+    UniValue activeQ(UniValue::VARR);
+    for (const bool h : activeQuorumMembers) {
+        // cppcheck-suppress useStlAlgorithm
+        activeQ.push_back(h);
+    }
+    obj.pushKV("activeQuorumMembers", activeQ);
+    obj.pushKV("mnSkipListMode", mnSkipListMode);
+    UniValue skipList(UniValue::VARR);
+    for (const auto& h : mnSkipList) {
+        // cppcheck-suppress useStlAlgorithm
+        skipList.push_back(h);
+    }
+    obj.pushKV("mnSkipList", skipList);
+    return obj;
+}
+
+[[nodiscard]] UniValue CRecoveredSig::ToJson() const
+{
+    UniValue ret(UniValue::VOBJ);
+    ret.pushKV("llmqType", ToUnderlying(llmqType));
+    ret.pushKV("quorumHash", quorumHash.ToString());
+    ret.pushKV("id", id.ToString());
+    ret.pushKV("msgHash", msgHash.ToString());
+    ret.pushKV("sig", sig.Get().ToString());
+    ret.pushKV("hash", sig.Get().GetHash().ToString());
+    return ret;
+}
+} // namespace llmq
diff --git a/src/llmq/signing.cpp b/src/llmq/signing.cpp
index f66effa2d02d..55c0ab19db25 100644
--- a/src/llmq/signing.cpp
+++ b/src/llmq/signing.cpp
@@ -27,19 +27,6 @@
 
 namespace llmq
 {
-UniValue CRecoveredSig::ToJson() const
-{
-    UniValue ret(UniValue::VOBJ);
-    ret.pushKV("llmqType", ToUnderlying(llmqType));
-    ret.pushKV("quorumHash", quorumHash.ToString());
-    ret.pushKV("id", id.ToString());
-    ret.pushKV("msgHash", msgHash.ToString());
-    ret.pushKV("sig", sig.Get().ToString());
-    ret.pushKV("hash", sig.Get().GetHash().ToString());
-    return ret;
-}
-
-
 CRecoveredSigsDb::CRecoveredSigsDb(bool fMemory, bool fWipe) :
         db(std::make_unique<CDBWrapper>(fMemory ? "" : (gArgs.GetDataDirNet() / "llmq/recsigdb"), 8 << 20, fMemory, fWipe))
 {
diff --git a/src/llmq/signing.h b/src/llmq/signing.h
index b835079d5b19..1097240c590e 100644
--- a/src/llmq/signing.h
+++ b/src/llmq/signing.h
@@ -106,7 +106,7 @@ class CRecoveredSig : virtual public CSigBase
         return hash;
     }
 
-    UniValue ToJson() const;
+    [[nodiscard]] UniValue ToJson() const;
 };
 
 class CRecoveredSigsDb
diff --git a/src/llmq/snapshot.cpp b/src/llmq/snapshot.cpp
index 3544177dc575..3e6ccd6955b5 100644
--- a/src/llmq/snapshot.cpp
+++ b/src/llmq/snapshot.cpp
@@ -17,67 +17,6 @@ namespace llmq {
 
 static const std::string DB_QUORUM_SNAPSHOT = "llmq_S";
 
-UniValue CQuorumSnapshot::ToJson() const
-{
-    UniValue obj(UniValue::VOBJ);
-    UniValue activeQ(UniValue::VARR);
-    for (const bool h : activeQuorumMembers) {
-        // cppcheck-suppress useStlAlgorithm
-        activeQ.push_back(h);
-    }
-    obj.pushKV("activeQuorumMembers", activeQ);
-    obj.pushKV("mnSkipListMode", mnSkipListMode);
-    UniValue skipList(UniValue::VARR);
-    for (const auto& h : mnSkipList) {
-        // cppcheck-suppress useStlAlgorithm
-        skipList.push_back(h);
-    }
-    obj.pushKV("mnSkipList", skipList);
-    return obj;
-}
-
-UniValue CQuorumRotationInfo::ToJson() const
-{
-    UniValue obj(UniValue::VOBJ);
-    obj.pushKV("extraShare", extraShare);
-
-    obj.pushKV("quorumSnapshotAtHMinusC", quorumSnapshotAtHMinusC.ToJson());
-    obj.pushKV("quorumSnapshotAtHMinus2C", quorumSnapshotAtHMinus2C.ToJson());
-    obj.pushKV("quorumSnapshotAtHMinus3C", quorumSnapshotAtHMinus3C.ToJson());
-
-    if (extraShare) {
-        obj.pushKV("quorumSnapshotAtHMinus4C", quorumSnapshotAtHMinus4C.ToJson());
-    }
-
-    obj.pushKV("mnListDiffTip", mnListDiffTip.ToJson());
-    obj.pushKV("mnListDiffH", mnListDiffH.ToJson());
-    obj.pushKV("mnListDiffAtHMinusC", mnListDiffAtHMinusC.ToJson());
-    obj.pushKV("mnListDiffAtHMinus2C", mnListDiffAtHMinus2C.ToJson());
-    obj.pushKV("mnListDiffAtHMinus3C", mnListDiffAtHMinus3C.ToJson());
-
-    if (extraShare) {
-        obj.pushKV("mnListDiffAtHMinus4C", mnListDiffAtHMinus4C.ToJson());
-    }
-    UniValue hqclists(UniValue::VARR);
-    for (const auto& qc : lastCommitmentPerIndex) {
-        hqclists.push_back(qc.ToJson());
-    }
-    obj.pushKV("lastCommitmentPerIndex", hqclists);
-
-    UniValue snapshotlist(UniValue::VARR);
-    for (const auto& snap : quorumSnapshotList) {
-        snapshotlist.push_back(snap.ToJson());
-    }
-    obj.pushKV("quorumSnapshotList", snapshotlist);
-
-    UniValue mnlistdifflist(UniValue::VARR);
-    for (const auto& mnlist : mnListDiffList) {
-        mnlistdifflist.push_back(mnlist.ToJson());
-    }
-    obj.pushKV("mnListDiffList", mnlistdifflist);
-    return obj;
-}
-
 bool BuildQuorumRotationInfo(CDeterministicMNManager& dmnman, CQuorumSnapshotManager& qsnapman,
                              const ChainstateManager& chainman, const CQuorumManager& qman,
                              const CQuorumBlockProcessor& qblockman, const CGetQuorumRotationInfo& request,

From ddc698bd3df670d6245d80d2bac353e216e431ce Mon Sep 17 00:00:00 2001
From: Kittywhiskers Van Gogh <63189531+kwvg@users.noreply.github.com>
Date: Sun, 5 Oct 2025 12:08:56 +0000
Subject: [PATCH 076/656] refactor: move pending `evo/`-specific definitions to
 `core_write.cpp`

We exclude the following:
- `evo/netinfo.{cpp,h}` (already a part of `libbitcoin_common`)
  as it as an inheritance structure and the help text for it is
  relatively uncomplicated.
- `CDeterministicMN::ToJson() `and `CDeterministicMNStateDiff::ToJson()`
  as it relies on `g_txindex` that is part of `libbitcoin_node` so it
  cannot be part of `evo/core_write.cpp`.
---
 src/evo/core_write.cpp | 156 ++++++++++++++++++++++++++---------------
 src/evo/dmnstate.cpp   |  32 ---------
 src/evo/mnhftx.h       |   9 +--
 3 files changed, 100 insertions(+), 97 deletions(-)

diff --git a/src/evo/core_write.cpp b/src/evo/core_write.cpp
index 1cccced0fd9b..673ddf70e32b 100644
--- a/src/evo/core_write.cpp
+++ b/src/evo/core_write.cpp
@@ -4,6 +4,7 @@
 
 #include <evo/assetlocktx.h>
 #include <evo/cbtx.h>
+#include <evo/dmnstate.h>
 #include <evo/mnhftx.h>
 #include <evo/netinfo.h>
 #include <evo/providertx.h>
@@ -124,6 +125,38 @@ RPCResult GetRpcResult(const std::string& key, bool optional)
     return ret;
 }
 
+[[nodiscard]] UniValue CDeterministicMNState::ToJson(MnType nType) const
+{
+    UniValue obj(UniValue::VOBJ);
+    obj.pushKV("version", nVersion);
+    obj.pushKV("service", netInfo->GetPrimary().ToStringAddrPort());
+    obj.pushKV("addresses", GetNetInfoWithLegacyFields(*this, nType));
+    obj.pushKV("registeredHeight", nRegisteredHeight);
+    obj.pushKV("lastPaidHeight", nLastPaidHeight);
+    obj.pushKV("consecutivePayments", nConsecutivePayments);
+    obj.pushKV("PoSePenalty", nPoSePenalty);
+    obj.pushKV("PoSeRevivedHeight", nPoSeRevivedHeight);
+    obj.pushKV("PoSeBanHeight", nPoSeBanHeight);
+    obj.pushKV("revocationReason", nRevocationReason);
+    obj.pushKV("ownerAddress", EncodeDestination(PKHash(keyIDOwner)));
+    obj.pushKV("votingAddress", EncodeDestination(PKHash(keyIDVoting)));
+    if (nType == MnType::Evo) {
+        obj.pushKV("platformNodeID", platformNodeID.ToString());
+        obj.pushKV("platformP2PPort", GetPlatformPort</*is_p2p=*/true>(*this));
+        obj.pushKV("platformHTTPPort", GetPlatformPort</*is_p2p=*/false>(*this));
+    }
+
+    CTxDestination dest;
+    if (ExtractDestination(scriptPayout, dest)) {
+        obj.pushKV("payoutAddress", EncodeDestination(dest));
+    }
+    obj.pushKV("pubKeyOperator", pubKeyOperator.ToString());
+    if (ExtractDestination(scriptOperatorPayout, dest)) {
+        obj.pushKV("operatorPayoutAddress", EncodeDestination(dest));
+    }
+    return obj;
+}
+
 [[nodiscard]] RPCResult CProRegTx::GetJsonHelp(const std::string& key, bool optional)
 {
     return {RPCResult::Type::OBJ, key, optional, key.empty() ? "" : "The masternode registration special transaction",
@@ -256,63 +289,6 @@ RPCResult GetRpcResult(const std::string& key, bool optional)
     return ret;
 }
 
-[[nodiscard]] UniValue MNHFTxPayload::ToJson() const
-{
-    UniValue ret(UniValue::VOBJ);
-    ret.pushKV("version", nVersion);
-    ret.pushKV("signal", signal.ToJson());
-    return ret;
-}
-
-[[nodiscard]] RPCResult CSimplifiedMNListEntry::GetJsonHelp(const std::string& key, bool optional)
-{
-    return {RPCResult::Type::OBJ, key, optional, key.empty() ? "" : "The simplified masternode list entry",
-    {
-        {RPCResult::Type::NUM, "nVersion", "Version of the entry"},
-        {RPCResult::Type::NUM, "nType", "Masternode type"},
-        {RPCResult::Type::STR_HEX, "proRegTxHash", "Hash of the ProRegTx identifying the masternode"},
-        {RPCResult::Type::STR_HEX, "confirmedHash", "Hash of the block where the masternode was confirmed"},
-        GetRpcResult("service"),
-        GetRpcResult("addresses"),
-        GetRpcResult("pubKeyOperator"),
-        GetRpcResult("votingAddress"),
-        {RPCResult::Type::BOOL, "isValid", "Returns true if the masternode is not Proof-of-Service banned"},
-        GetRpcResult("platformHTTPPort", /*optional=*/true),
-        GetRpcResult("platformNodeID", /*optional=*/true),
-        GetRpcResult("payoutAddress", /*optional=*/true),
-        GetRpcResult("operatorPayoutAddress", /*optional=*/true),
-    }};
-}
-
-[[nodiscard]] UniValue CSimplifiedMNListEntry::ToJson(bool extended) const
-{
-    UniValue obj(UniValue::VOBJ);
-    obj.pushKV("nVersion", nVersion);
-    obj.pushKV("nType", ToUnderlying(nType));
-    obj.pushKV("proRegTxHash", proRegTxHash.ToString());
-    obj.pushKV("confirmedHash", confirmedHash.ToString());
-    obj.pushKV("service", netInfo->GetPrimary().ToStringAddrPort());
-    obj.pushKV("addresses", GetNetInfoWithLegacyFields(*this, nType));
-    obj.pushKV("pubKeyOperator", pubKeyOperator.ToString());
-    obj.pushKV("votingAddress", EncodeDestination(PKHash(keyIDVoting)));
-    obj.pushKV("isValid", isValid);
-    if (nType == MnType::Evo) {
-        obj.pushKV("platformHTTPPort", GetPlatformPort</*is_p2p=*/false>(*this));
-        obj.pushKV("platformNodeID", platformNodeID.ToString());
-    }
-
-    if (extended) {
-        CTxDestination dest;
-        if (ExtractDestination(scriptPayout, dest)) {
-            obj.pushKV("payoutAddress", EncodeDestination(dest));
-        }
-        if (ExtractDestination(scriptOperatorPayout, dest)) {
-            obj.pushKV("operatorPayoutAddress", EncodeDestination(dest));
-        }
-    }
-    return obj;
-}
-
 [[nodiscard]] RPCResult CSimplifiedMNListDiff::GetJsonHelp(const std::string& key, bool optional)
 {
     return {RPCResult::Type::OBJ, key, optional, key.empty() ? "" : "The simplified masternode list diff",
@@ -404,3 +380,69 @@ RPCResult GetRpcResult(const std::string& key, bool optional)
     obj.pushKV("quorumsCLSigs", quorumsCLSigsArr);
     return obj;
 }
+
+[[nodiscard]] RPCResult CSimplifiedMNListEntry::GetJsonHelp(const std::string& key, bool optional)
+{
+    return {RPCResult::Type::OBJ, key, optional, key.empty() ? "" : "The simplified masternode list entry",
+    {
+        {RPCResult::Type::NUM, "nVersion", "Version of the entry"},
+        {RPCResult::Type::NUM, "nType", "Masternode type"},
+        {RPCResult::Type::STR_HEX, "proRegTxHash", "Hash of the ProRegTx identifying the masternode"},
+        {RPCResult::Type::STR_HEX, "confirmedHash", "Hash of the block where the masternode was confirmed"},
+        GetRpcResult("service"),
+        GetRpcResult("addresses"),
+        GetRpcResult("pubKeyOperator"),
+        GetRpcResult("votingAddress"),
+        {RPCResult::Type::BOOL, "isValid", "Returns true if the masternode is not Proof-of-Service banned"},
+        GetRpcResult("platformHTTPPort", /*optional=*/true),
+        GetRpcResult("platformNodeID", /*optional=*/true),
+        GetRpcResult("payoutAddress", /*optional=*/true),
+        GetRpcResult("operatorPayoutAddress", /*optional=*/true),
+    }};
+}
+
+[[nodiscard]] UniValue CSimplifiedMNListEntry::ToJson(bool extended) const
+{
+    UniValue obj(UniValue::VOBJ);
+    obj.pushKV("nVersion", nVersion);
+    obj.pushKV("nType", ToUnderlying(nType));
+    obj.pushKV("proRegTxHash", proRegTxHash.ToString());
+    obj.pushKV("confirmedHash", confirmedHash.ToString());
+    obj.pushKV("service", netInfo->GetPrimary().ToStringAddrPort());
+    obj.pushKV("addresses", GetNetInfoWithLegacyFields(*this, nType));
+    obj.pushKV("pubKeyOperator", pubKeyOperator.ToString());
+    obj.pushKV("votingAddress", EncodeDestination(PKHash(keyIDVoting)));
+    obj.pushKV("isValid", isValid);
+    if (nType == MnType::Evo) {
+        obj.pushKV("platformHTTPPort", GetPlatformPort</*is_p2p=*/false>(*this));
+        obj.pushKV("platformNodeID", platformNodeID.ToString());
+    }
+
+    if (extended) {
+        CTxDestination dest;
+        if (ExtractDestination(scriptPayout, dest)) {
+            obj.pushKV("payoutAddress", EncodeDestination(dest));
+        }
+        if (ExtractDestination(scriptOperatorPayout, dest)) {
+            obj.pushKV("operatorPayoutAddress", EncodeDestination(dest));
+        }
+    }
+    return obj;
+}
+
+[[nodiscard]] UniValue MNHFTx::ToJson() const
+{
+    UniValue obj(UniValue::VOBJ);
+    obj.pushKV("versionBit", versionBit);
+    obj.pushKV("quorumHash", quorumHash.ToString());
+    obj.pushKV("sig", sig.ToString());
+    return obj;
+}
+
+[[nodiscard]] UniValue MNHFTxPayload::ToJson() const
+{
+    UniValue ret(UniValue::VOBJ);
+    ret.pushKV("version", nVersion);
+    ret.pushKV("signal", signal.ToJson());
+    return ret;
+}
diff --git a/src/evo/dmnstate.cpp b/src/evo/dmnstate.cpp
index c9d9a9e71948..54d463db3d13 100644
--- a/src/evo/dmnstate.cpp
+++ b/src/evo/dmnstate.cpp
@@ -32,38 +32,6 @@ std::string CDeterministicMNState::ToString() const
                      EncodeDestination(PKHash(keyIDVoting)), netInfo->ToString(), payoutAddress, operatorPayoutAddress);
 }
 
-UniValue CDeterministicMNState::ToJson(MnType nType) const
-{
-    UniValue obj(UniValue::VOBJ);
-    obj.pushKV("version", nVersion);
-    obj.pushKV("service", netInfo->GetPrimary().ToStringAddrPort());
-    obj.pushKV("addresses", GetNetInfoWithLegacyFields(*this, nType));
-    obj.pushKV("registeredHeight", nRegisteredHeight);
-    obj.pushKV("lastPaidHeight", nLastPaidHeight);
-    obj.pushKV("consecutivePayments", nConsecutivePayments);
-    obj.pushKV("PoSePenalty", nPoSePenalty);
-    obj.pushKV("PoSeRevivedHeight", nPoSeRevivedHeight);
-    obj.pushKV("PoSeBanHeight", nPoSeBanHeight);
-    obj.pushKV("revocationReason", nRevocationReason);
-    obj.pushKV("ownerAddress", EncodeDestination(PKHash(keyIDOwner)));
-    obj.pushKV("votingAddress", EncodeDestination(PKHash(keyIDVoting)));
-    if (nType == MnType::Evo) {
-        obj.pushKV("platformNodeID", platformNodeID.ToString());
-        obj.pushKV("platformP2PPort", GetPlatformPort</*is_p2p=*/true>(*this));
-        obj.pushKV("platformHTTPPort", GetPlatformPort</*is_p2p=*/false>(*this));
-    }
-
-    CTxDestination dest;
-    if (ExtractDestination(scriptPayout, dest)) {
-        obj.pushKV("payoutAddress", EncodeDestination(dest));
-    }
-    obj.pushKV("pubKeyOperator", pubKeyOperator.ToString());
-    if (ExtractDestination(scriptOperatorPayout, dest)) {
-        obj.pushKV("operatorPayoutAddress", EncodeDestination(dest));
-    }
-    return obj;
-}
-
 UniValue CDeterministicMNStateDiff::ToJson(MnType nType) const
 {
     UniValue obj(UniValue::VOBJ);
diff --git a/src/evo/mnhftx.h b/src/evo/mnhftx.h
index 8adda3655368..f3d995be652d 100644
--- a/src/evo/mnhftx.h
+++ b/src/evo/mnhftx.h
@@ -50,14 +50,7 @@ class MNHFTx
 
     std::string ToString() const;
 
-    [[nodiscard]] UniValue ToJson() const
-    {
-        UniValue obj(UniValue::VOBJ);
-        obj.pushKV("versionBit", versionBit);
-        obj.pushKV("quorumHash", quorumHash.ToString());
-        obj.pushKV("sig", sig.ToString());
-        return obj;
-    }
+    [[nodiscard]] UniValue ToJson() const;
 };
 
 class MNHFTxPayload

From ae4e05c14792cb90be1c2f7ea978d4eb131107e4 Mon Sep 17 00:00:00 2001
From: Kittywhiskers Van Gogh <63189531+kwvg@users.noreply.github.com>
Date: Mon, 6 Oct 2025 20:24:20 +0000
Subject: [PATCH 077/656] rpc: `GetJsonHelp()` defs for `MNHFTx`,
 `CAsset{Un,}lock`

---
 src/evo/assetlocktx.h      |  3 +++
 src/evo/core_write.cpp     | 52 +++++++++++++++++++++++++++++++++++++-
 src/evo/mnhftx.h           |  3 +++
 src/rpc/rawtransaction.cpp |  4 +++
 4 files changed, 61 insertions(+), 1 deletion(-)

diff --git a/src/evo/assetlocktx.h b/src/evo/assetlocktx.h
index 2fc44643fa8f..433dd098ee47 100644
--- a/src/evo/assetlocktx.h
+++ b/src/evo/assetlocktx.h
@@ -17,6 +17,7 @@
 class CBlockIndex;
 class CRangesSet;
 class TxValidationState;
+struct RPCResult;
 namespace llmq {
 class CQuorumManager;
 } // namespace llmq
@@ -51,6 +52,7 @@ class CAssetLockPayload
 
     std::string ToString() const;
 
+    [[nodiscard]] static RPCResult GetJsonHelp(const std::string& key, bool optional);
     [[nodiscard]] UniValue ToJson() const;
 
     // getters
@@ -108,6 +110,7 @@ class CAssetUnlockPayload
 
     std::string ToString() const;
 
+    [[nodiscard]] static RPCResult GetJsonHelp(const std::string& key, bool optional);
     [[nodiscard]] UniValue ToJson() const;
 
     bool VerifySig(const llmq::CQuorumManager& qman, const uint256& msgHash, gsl::not_null<const CBlockIndex*> pindexTip, TxValidationState& state) const;
diff --git a/src/evo/core_write.cpp b/src/evo/core_write.cpp
index 673ddf70e32b..1524d24a143f 100644
--- a/src/evo/core_write.cpp
+++ b/src/evo/core_write.cpp
@@ -48,6 +48,7 @@ RPCResult GetRpcResult(const std::string& key, bool optional)
         RESULT_MAP_ENTRY(RPCResult::Type::NUM, "platformP2PPort", "(DEPRECATED) TCP port of Platform P2P"),
         RESULT_MAP_ENTRY(RPCResult::Type::STR_HEX, "proTxHash", "Hash of the masternode's initial ProRegTx"),
         RESULT_MAP_ENTRY(RPCResult::Type::STR, "pubKeyOperator", "BLS public key used for operator signing"),
+        RESULT_MAP_ENTRY(RPCResult::Type::STR_HEX, "quorumHash", "Hash of the quorum"),
         RESULT_MAP_ENTRY(RPCResult::Type::STR, "service", "(DEPRECATED) IP address and port of the masternode"),
         RESULT_MAP_ENTRY(RPCResult::Type::NUM, "type", "Masternode type"),
         RESULT_MAP_ENTRY(RPCResult::Type::NUM, "version", "Special transaction version"),
@@ -63,6 +64,23 @@ RPCResult GetRpcResult(const std::string& key, bool optional)
                              __FILE__, __LINE__, __func__);
 }
 
+[[nodiscard]] RPCResult CAssetLockPayload::GetJsonHelp(const std::string& key, bool optional)
+{
+    return {RPCResult::Type::OBJ, key, optional, key.empty() ? "" : "The asset lock special transaction",
+    {
+        GetRpcResult("version"),
+        {RPCResult::Type::ARR, "creditOutputs", "", {
+            {RPCResult::Type::OBJ, "", "", {
+                {RPCResult::Type::NUM, "value", "The value in Dash"},
+                {RPCResult::Type::NUM, "valueSat", "The value in duffs"},
+                {RPCResult::Type::OBJ, "scriptPubKey", "", {
+                    {RPCResult::Type::STR, "asm", "The asm"},
+                    {RPCResult::Type::STR_HEX, "hex", "The hex"},
+                    {RPCResult::Type::STR, "type", "The type, eg 'pubkeyhash'"},
+        }}}}}}
+    }};
+}
+
 [[nodiscard]] UniValue CAssetLockPayload::ToJson() const
 {
     UniValue outputs(UniValue::VARR);
@@ -82,6 +100,19 @@ RPCResult GetRpcResult(const std::string& key, bool optional)
     return ret;
 }
 
+[[nodiscard]] RPCResult CAssetUnlockPayload::GetJsonHelp(const std::string& key, bool optional)
+{
+    return {RPCResult::Type::OBJ, key, optional, key.empty() ? "" : "The asset unlock special transaction",
+    {
+        GetRpcResult("version"),
+        {RPCResult::Type::NUM, "index", "Index of the transaction"},
+        {RPCResult::Type::NUM, "fee", "Transaction fee in duffs awarded to the miner"},
+        {RPCResult::Type::NUM, "requestedHeight", "Payment chain block height known by Platform when signing the withdrawal"},
+        GetRpcResult("quorumHash"),
+        {RPCResult::Type::STR_HEX, "quorumSig", "BLS signature by a quorum public key"},
+    }};
+}
+
 [[nodiscard]] UniValue CAssetUnlockPayload::ToJson() const
 {
     UniValue ret(UniValue::VOBJ);
@@ -305,7 +336,7 @@ RPCResult GetRpcResult(const std::string& key, bool optional)
         {RPCResult::Type::ARR, "deletedQuorums", "Deleted quorums",
             {{RPCResult::Type::OBJ, "", "", {
                 {RPCResult::Type::NUM, "llmqType", "Quorum type"},
-                {RPCResult::Type::STR_HEX, "quorumHash", "Hash of the quorum"},
+                GetRpcResult("quorumHash"),
         }}}},
         {RPCResult::Type::ARR, "newQuorums", "New quorums"}, // TODO: Add definition for llmq::CFinalCommitment
         GetRpcResult("merkleRootMNList", /*optional=*/true),
@@ -430,6 +461,16 @@ RPCResult GetRpcResult(const std::string& key, bool optional)
     return obj;
 }
 
+[[nodiscard]] RPCResult MNHFTx::GetJsonHelp(const std::string& key, bool optional)
+{
+    return {RPCResult::Type::OBJ, key, optional, key.empty() ? "" : "The masternode hard fork payload",
+    {
+        {RPCResult::Type::NUM, "versionBit", "Version bit associated with the hard fork"},
+        GetRpcResult("quorumHash"),
+        {RPCResult::Type::STR_HEX, "sig", "BLS signature by a quorum public key"},
+    }};
+}
+
 [[nodiscard]] UniValue MNHFTx::ToJson() const
 {
     UniValue obj(UniValue::VOBJ);
@@ -439,6 +480,15 @@ RPCResult GetRpcResult(const std::string& key, bool optional)
     return obj;
 }
 
+[[nodiscard]] RPCResult MNHFTxPayload::GetJsonHelp(const std::string& key, bool optional)
+{
+    return {RPCResult::Type::OBJ, key, optional, key.empty() ? "" : "The masternode hard fork signal special transaction",
+    {
+        GetRpcResult("version"),
+        MNHFTx::GetJsonHelp(/*key=*/"signal", /*optional=*/false),
+    }};
+}
+
 [[nodiscard]] UniValue MNHFTxPayload::ToJson() const
 {
     UniValue ret(UniValue::VOBJ);
diff --git a/src/evo/mnhftx.h b/src/evo/mnhftx.h
index f3d995be652d..855607b21698 100644
--- a/src/evo/mnhftx.h
+++ b/src/evo/mnhftx.h
@@ -26,6 +26,7 @@ class CEvoDB;
 class CTransaction;
 class ChainstateManager;
 class TxValidationState;
+struct RPCResult;
 namespace llmq {
 class CQuorumManager;
 }
@@ -50,6 +51,7 @@ class MNHFTx
 
     std::string ToString() const;
 
+    [[nodiscard]] static RPCResult GetJsonHelp(const std::string& key, bool optional);
     [[nodiscard]] UniValue ToJson() const;
 };
 
@@ -80,6 +82,7 @@ class MNHFTxPayload
 
     std::string ToString() const;
 
+    [[nodiscard]] static RPCResult GetJsonHelp(const std::string& key, bool optional);
     [[nodiscard]] UniValue ToJson() const;
 };
 
diff --git a/src/rpc/rawtransaction.cpp b/src/rpc/rawtransaction.cpp
index 81d031525939..77de92f39f67 100644
--- a/src/rpc/rawtransaction.cpp
+++ b/src/rpc/rawtransaction.cpp
@@ -49,6 +49,7 @@
 #include <evo/assetlocktx.h>
 #include <evo/cbtx.h>
 #include <evo/creditpool.h>
+#include <evo/mnhftx.h>
 #include <evo/providertx.h>
 #include <evo/specialtx.h>
 #include <instantsend/instantsend.h>
@@ -177,6 +178,9 @@ static std::vector<RPCResult> DecodeTxDoc(const std::string& txid_field_doc)
         CProUpRevTx::GetJsonHelp(/*key=*/"proUpRevTx", /*optional=*/true),
         CCbTx::GetJsonHelp(/*key=*/"cbTx", /*optional=*/true),
         llmq::CFinalCommitmentTxPayload::GetJsonHelp(/*key=*/"qcTx", /*optional=*/true),
+        MNHFTxPayload::GetJsonHelp(/*key=*/"mnhfTx", /*optional=*/true),
+        CAssetLockPayload::GetJsonHelp(/*key=*/"assetLockTx", /*optional=*/true),
+        CAssetUnlockPayload::GetJsonHelp(/*key=*/"assetUnlockTx", /*optional=*/true),
     };
 }
 

From 1be22261cc06dd46d3549c40c863615f5fa47ad7 Mon Sep 17 00:00:00 2001
From: Kittywhiskers Van Gogh <63189531+kwvg@users.noreply.github.com>
Date: Mon, 6 Oct 2025 15:52:22 +0000
Subject: [PATCH 078/656] rpc: `GetJsonHelp()` defs for
 `Quorum{Rotation,Snapshot}`,`RecoveredSig`

---
 src/evo/core_write.cpp  |  9 +++--
 src/llmq/commitment.h   |  1 +
 src/llmq/core_write.cpp | 75 ++++++++++++++++++++++++++++++++++++++++-
 src/llmq/signing.h      |  3 ++
 src/llmq/snapshot.h     |  4 +++
 src/rpc/quorums.cpp     |  5 +--
 6 files changed, 91 insertions(+), 6 deletions(-)

diff --git a/src/evo/core_write.cpp b/src/evo/core_write.cpp
index 1524d24a143f..63a988f2ec32 100644
--- a/src/evo/core_write.cpp
+++ b/src/evo/core_write.cpp
@@ -39,6 +39,7 @@ RPCResult GetRpcResult(const std::string& key, bool optional)
         }}},
         RESULT_MAP_ENTRY(RPCResult::Type::NUM, "height", "Block height"),
         RESULT_MAP_ENTRY(RPCResult::Type::STR_HEX, "inputsHash", "Hash of all the outpoints of the transaction inputs"),
+        RESULT_MAP_ENTRY(RPCResult::Type::NUM, "llmqType", "Quorum type"),
         RESULT_MAP_ENTRY(RPCResult::Type::STR_HEX, "merkleRootMNList", "Merkle root of the masternode list"),
         RESULT_MAP_ENTRY(RPCResult::Type::STR_HEX, "merkleRootQuorums", "Merkle root of the quorum list"),
         RESULT_MAP_ENTRY(RPCResult::Type::STR, "operatorPayoutAddress", "Dash address used for operator reward payments"),
@@ -49,6 +50,7 @@ RPCResult GetRpcResult(const std::string& key, bool optional)
         RESULT_MAP_ENTRY(RPCResult::Type::STR_HEX, "proTxHash", "Hash of the masternode's initial ProRegTx"),
         RESULT_MAP_ENTRY(RPCResult::Type::STR, "pubKeyOperator", "BLS public key used for operator signing"),
         RESULT_MAP_ENTRY(RPCResult::Type::STR_HEX, "quorumHash", "Hash of the quorum"),
+        RESULT_MAP_ENTRY(RPCResult::Type::STR_HEX, "quorumSig", "BLS recovered threshold signature of quorum"),
         RESULT_MAP_ENTRY(RPCResult::Type::STR, "service", "(DEPRECATED) IP address and port of the masternode"),
         RESULT_MAP_ENTRY(RPCResult::Type::NUM, "type", "Masternode type"),
         RESULT_MAP_ENTRY(RPCResult::Type::NUM, "version", "Special transaction version"),
@@ -109,7 +111,7 @@ RPCResult GetRpcResult(const std::string& key, bool optional)
         {RPCResult::Type::NUM, "fee", "Transaction fee in duffs awarded to the miner"},
         {RPCResult::Type::NUM, "requestedHeight", "Payment chain block height known by Platform when signing the withdrawal"},
         GetRpcResult("quorumHash"),
-        {RPCResult::Type::STR_HEX, "quorumSig", "BLS signature by a quorum public key"},
+        GetRpcResult("quorumSig"),
     }};
 }
 
@@ -335,10 +337,11 @@ RPCResult GetRpcResult(const std::string& key, bool optional)
             {CSimplifiedMNListEntry::GetJsonHelp(/*key=*/"", /*optional=*/false)}},
         {RPCResult::Type::ARR, "deletedQuorums", "Deleted quorums",
             {{RPCResult::Type::OBJ, "", "", {
-                {RPCResult::Type::NUM, "llmqType", "Quorum type"},
+                GetRpcResult("llmqType"),
                 GetRpcResult("quorumHash"),
         }}}},
-        {RPCResult::Type::ARR, "newQuorums", "New quorums"}, // TODO: Add definition for llmq::CFinalCommitment
+        {RPCResult::Type::ARR, "newQuorums", "New quorums",
+            {llmq::CFinalCommitment::GetJsonHelp(/*key=*/"", /*optional=*/false)}},
         GetRpcResult("merkleRootMNList", /*optional=*/true),
         GetRpcResult("merkleRootQuorums", /*optional=*/true),
         {RPCResult::Type::ARR, "quorumsCLSigs", "ChainLock signature details", {
diff --git a/src/llmq/commitment.h b/src/llmq/commitment.h
index 54b96c19bc96..60cf499d5a2a 100644
--- a/src/llmq/commitment.h
+++ b/src/llmq/commitment.h
@@ -130,6 +130,7 @@ class CFinalCommitment
         return true;
     }
 
+    [[nodiscard]] static RPCResult GetJsonHelp(const std::string& key, bool optional);
     [[nodiscard]] UniValue ToJson() const;
 
 private:
diff --git a/src/llmq/core_write.cpp b/src/llmq/core_write.cpp
index 47b92e1d9daa..8a8137ed7072 100644
--- a/src/llmq/core_write.cpp
+++ b/src/llmq/core_write.cpp
@@ -15,6 +15,25 @@
 #include <string>
 
 namespace llmq {
+[[nodiscard]] RPCResult CFinalCommitment::GetJsonHelp(const std::string& key, bool optional)
+{
+    return {RPCResult::Type::OBJ, key, optional, key.empty() ? "" : "The quorum commitment payload",
+    {
+        {RPCResult::Type::NUM, "version", "Quorum commitment payload version"},
+        GetRpcResult("llmqType"),
+        GetRpcResult("quorumHash"),
+        {RPCResult::Type::NUM, "quorumIndex", "Index of the quorum"},
+        {RPCResult::Type::NUM, "signersCount", "Number of signers for the quorum"},
+        {RPCResult::Type::STR_HEX, "signers", "Bitset representing the aggregated signers"},
+        {RPCResult::Type::NUM, "validMembersCount", "Number of valid members in the quorum"},
+        {RPCResult::Type::STR_HEX, "validMembers", "Bitset of valid members"},
+        {RPCResult::Type::STR_HEX, "quorumPublicKey", "BLS public key of the quorum"},
+        {RPCResult::Type::STR_HEX, "quorumVvecHash", "Hash of the quorum verification vector"},
+        GetRpcResult("quorumSig"),
+        {RPCResult::Type::STR_HEX, "membersSig", "BLS signature from all included commitments"},
+    }};
+}
+
 [[nodiscard]] UniValue CFinalCommitment::ToJson() const
 {
     UniValue obj(UniValue::VOBJ);
@@ -39,7 +58,7 @@ namespace llmq {
     {
         GetRpcResult("version"),
         GetRpcResult("height"),
-        // TODO: Add RPCResult for llmq::CFinalCommitment
+        CFinalCommitment::GetJsonHelp(/*key=*/"commitment", /*optional=*/false),
     }};
 }
 
@@ -52,6 +71,33 @@ namespace llmq {
     return ret;
 }
 
+[[nodiscard]] RPCResult CQuorumRotationInfo::GetJsonHelp(const std::string& key, bool optional)
+{
+    return {RPCResult::Type::OBJ, key, optional, key.empty() ? "" : "The quorum rotation",
+    {
+        {RPCResult::Type::BOOL, "extraShare", "Returns true if an extra share is returned"},
+        CQuorumSnapshot::GetJsonHelp(/*key=*/"quorumSnapshotAtHMinusC", /*optional=*/false),
+        CQuorumSnapshot::GetJsonHelp(/*key=*/"quorumSnapshotAtHMinus2C", /*optional=*/false),
+        CQuorumSnapshot::GetJsonHelp(/*key=*/"quorumSnapshotAtHMinus3C", /*optional=*/false),
+        CQuorumSnapshot::GetJsonHelp(/*key=*/"quorumSnapshotAtHMinus4C", /*optional=*/true),
+        CSimplifiedMNListDiff::GetJsonHelp(/*key=*/"mnListDiffTip", /*optional=*/false),
+        CSimplifiedMNListDiff::GetJsonHelp(/*key=*/"mnListDiffH", /*optional=*/false),
+        CSimplifiedMNListDiff::GetJsonHelp(/*key=*/"mnListDiffAtHMinusC", /*optional=*/false),
+        CSimplifiedMNListDiff::GetJsonHelp(/*key=*/"mnListDiffAtHMinus2C", /*optional=*/false),
+        CSimplifiedMNListDiff::GetJsonHelp(/*key=*/"mnListDiffAtHMinus3C", /*optional=*/false),
+        CSimplifiedMNListDiff::GetJsonHelp(/*key=*/"mnListDiffAtHMinus4C", /*optional=*/true),
+        {RPCResult::Type::ARR, "lastCommitmentPerIndex", "Most recent commitment for each quorumIndex", {
+            CFinalCommitment::GetJsonHelp(/*key=*/"", /*optional=*/false),
+        }},
+        {RPCResult::Type::ARR, "quorumSnapshotList", "Snapshots required to reconstruct the quorums built at h' in lastCommitmentPerIndex", {
+            CQuorumSnapshot::GetJsonHelp(/*key=*/"", /*optional=*/false),
+        }},
+        {RPCResult::Type::ARR, "mnListDiffList", "MnListDiffs required to calculate older quorums", {
+            CSimplifiedMNListDiff::GetJsonHelp(/*key=*/"", /*optional=*/false),
+        }},
+    }};
+}
+
 [[nodiscard]] UniValue CQuorumRotationInfo::ToJson() const
 {
     UniValue obj(UniValue::VOBJ);
@@ -94,6 +140,20 @@ namespace llmq {
     return obj;
 }
 
+[[nodiscard]] RPCResult CQuorumSnapshot::GetJsonHelp(const std::string& key, bool optional)
+{
+    return {RPCResult::Type::OBJ, key, optional, key.empty() ? "" : "The quorum snapshot",
+    {
+        {RPCResult::Type::ARR, "activeQuorumMembers", "Bitset of nodes already in quarters at the start of cycle", {
+            {RPCResult::Type::BOOL, "bit", ""}
+        }},
+        {RPCResult::Type::NUM, "mnSkipListMode", "Mode of the skip list"},
+        {RPCResult::Type::ARR, "mnSkipList", "Skiplist at height", {
+            {RPCResult::Type::NUM, "height", ""}
+        }},
+    }};
+}
+
 [[nodiscard]] UniValue CQuorumSnapshot::ToJson() const
 {
     UniValue obj(UniValue::VOBJ);
@@ -113,6 +173,19 @@ namespace llmq {
     return obj;
 }
 
+[[nodiscard]] RPCResult CRecoveredSig::GetJsonHelp(const std::string& key, bool optional)
+{
+    return {RPCResult::Type::OBJ, key, optional, key.empty() ? "" : "The recovered signature",
+    {
+        GetRpcResult("llmqType"),
+        GetRpcResult("quorumHash"),
+        {RPCResult::Type::NUM, "id", "Signing session ID"},
+        {RPCResult::Type::STR_HEX, "msgHash", "Hash of message"},
+        {RPCResult::Type::STR_HEX, "sig", "BLS signature recovered"},
+        {RPCResult::Type::STR_HEX, "hash", "Hash of the BLS signature recovered"},
+    }};
+}
+
 [[nodiscard]] UniValue CRecoveredSig::ToJson() const
 {
     UniValue ret(UniValue::VOBJ);
diff --git a/src/llmq/signing.h b/src/llmq/signing.h
index 1097240c590e..2425de093604 100644
--- a/src/llmq/signing.h
+++ b/src/llmq/signing.h
@@ -30,6 +30,8 @@ class CDBBatch;
 class CDBWrapper;
 class CInv;
 class PeerManager;
+struct RPCResult;
+
 class UniValue;
 
 namespace llmq {
@@ -106,6 +108,7 @@ class CRecoveredSig : virtual public CSigBase
         return hash;
     }
 
+    [[nodiscard]] static RPCResult GetJsonHelp(const std::string& key, bool optional);
     [[nodiscard]] UniValue ToJson() const;
 };
 
diff --git a/src/llmq/snapshot.h b/src/llmq/snapshot.h
index 2d161ed00faf..3b1035a37b12 100644
--- a/src/llmq/snapshot.h
+++ b/src/llmq/snapshot.h
@@ -19,6 +19,8 @@
 
 class CBlockIndex;
 class CEvoDB;
+struct RPCResult;
+
 class UniValue;
 
 namespace llmq {
@@ -82,6 +84,7 @@ class CQuorumSnapshot
         }
     }
 
+    [[nodiscard]] static RPCResult GetJsonHelp(const std::string& key, bool optional);
     [[nodiscard]] UniValue ToJson() const;
 };
 
@@ -198,6 +201,7 @@ class CQuorumRotationInfo
     CQuorumRotationInfo() = default;
     CQuorumRotationInfo(const CQuorumRotationInfo& dmn) {}
 
+    [[nodiscard]] static RPCResult GetJsonHelp(const std::string& key, bool optional);
     [[nodiscard]] UniValue ToJson() const;
 };
 
diff --git a/src/rpc/quorums.cpp b/src/rpc/quorums.cpp
index d4776d97e745..a9b3b88d3455 100644
--- a/src/rpc/quorums.cpp
+++ b/src/rpc/quorums.cpp
@@ -365,6 +365,7 @@ static RPCHelpMan quorum_dkgstatus()
         std::optional<std::vector<llmq::CFinalCommitment>> vfqc = llmq_ctx.quorum_block_processor->GetMineableCommitments(llmq_params, tipHeight);
         if (vfqc.has_value()) {
             for (const auto& fqc : vfqc.value()) {
+                // TODO: Use CFinalCommitment::GetJsonHelp() for fqc
                 minableCommitments.push_back(fqc.ToJson());
             }
         }
@@ -651,7 +652,7 @@ static RPCHelpMan quorum_getrecsig()
             {"id", RPCArg::Type::STR_HEX, RPCArg::Optional::NO, "Request id."},
             {"msgHash", RPCArg::Type::STR_HEX, RPCArg::Optional::NO, "Message hash."},
         },
-        RPCResults{},
+        llmq::CRecoveredSig::GetJsonHelp(/*key=*/"", /*optional=*/false),
         RPCExamples{""},
         [&](const RPCHelpMan& self, const JSONRPCRequest& request) -> UniValue
 {
@@ -847,7 +848,7 @@ static RPCHelpMan quorum_rotationinfo()
                 {"baseBlockHash", RPCArg::Type::STR_HEX, RPCArg::Optional::NO, "The block hash"},
             }},
         },
-        RPCResults{},
+        llmq::CQuorumRotationInfo::GetJsonHelp(/*key=*/"", /*optional=*/false),
         RPCExamples{""},
         [&](const RPCHelpMan& self, const JSONRPCRequest& request) -> UniValue
 {

From b7eb196545f6f4359bb3afe62f1b61d96f2c0a4e Mon Sep 17 00:00:00 2001
From: Kittywhiskers Van Gogh <63189531+kwvg@users.noreply.github.com>
Date: Mon, 6 Oct 2025 20:23:39 +0000
Subject: [PATCH 079/656] rpc: `GetJsonHelp()` defs for
 `DeterministicMN{,State{,{Diff}}}`

---
 src/evo/core_write.cpp     | 86 ++++++++++++++++++++++++++++++++++++--
 src/evo/deterministicmns.h |  6 ++-
 src/evo/dmnstate.h         | 15 +++----
 src/rpc/evo.cpp            |  2 +
 src/rpc/masternode.cpp     |  1 +
 5 files changed, 97 insertions(+), 13 deletions(-)

diff --git a/src/evo/core_write.cpp b/src/evo/core_write.cpp
index 63a988f2ec32..e7b9f3e852d5 100644
--- a/src/evo/core_write.cpp
+++ b/src/evo/core_write.cpp
@@ -4,6 +4,7 @@
 
 #include <evo/assetlocktx.h>
 #include <evo/cbtx.h>
+#include <evo/deterministicmns.h>
 #include <evo/dmnstate.h>
 #include <evo/mnhftx.h>
 #include <evo/netinfo.h>
@@ -37,20 +38,31 @@ RPCResult GetRpcResult(const std::string& key, bool optional)
             {RPCResult::Type::ARR, "platform_https", /*optional=*/true, "Addresses used for Platform HTTPS API",
                 {{RPCResult::Type::STR, "address", ""}}},
         }}},
+        RESULT_MAP_ENTRY(RPCResult::Type::STR_HEX, "collateralHash", "Collateral transaction hash"),
+        RESULT_MAP_ENTRY(RPCResult::Type::NUM, "collateralIndex", "Collateral transaction output index"),
+        RESULT_MAP_ENTRY(RPCResult::Type::NUM, "consecutivePayments", "Consecutive payments masternode has received in payment cycle"),
         RESULT_MAP_ENTRY(RPCResult::Type::NUM, "height", "Block height"),
         RESULT_MAP_ENTRY(RPCResult::Type::STR_HEX, "inputsHash", "Hash of all the outpoints of the transaction inputs"),
+        RESULT_MAP_ENTRY(RPCResult::Type::NUM, "lastPaidHeight", "Height masternode was last paid"),
         RESULT_MAP_ENTRY(RPCResult::Type::NUM, "llmqType", "Quorum type"),
         RESULT_MAP_ENTRY(RPCResult::Type::STR_HEX, "merkleRootMNList", "Merkle root of the masternode list"),
         RESULT_MAP_ENTRY(RPCResult::Type::STR_HEX, "merkleRootQuorums", "Merkle root of the quorum list"),
         RESULT_MAP_ENTRY(RPCResult::Type::STR, "operatorPayoutAddress", "Dash address used for operator reward payments"),
+        RESULT_MAP_ENTRY(RPCResult::Type::NUM, "operatorReward", "Fraction in %% of reward shared with the operator between 0 and 10000"),
+        RESULT_MAP_ENTRY(RPCResult::Type::STR, "ownerAddress", "Dash address used for payee updates and proposal voting"),
         RESULT_MAP_ENTRY(RPCResult::Type::STR, "payoutAddress", "Dash address used for masternode reward payments"),
         RESULT_MAP_ENTRY(RPCResult::Type::NUM, "platformHTTPPort", "(DEPRECATED) TCP port of Platform HTTP API"),
         RESULT_MAP_ENTRY(RPCResult::Type::STR_HEX, "platformNodeID", "Node ID derived from P2P public key for Platform P2P"),
         RESULT_MAP_ENTRY(RPCResult::Type::NUM, "platformP2PPort", "(DEPRECATED) TCP port of Platform P2P"),
+        RESULT_MAP_ENTRY(RPCResult::Type::NUM, "PoSeBanHeight", "Height masternode was banned for Proof of Service violations"),
+        RESULT_MAP_ENTRY(RPCResult::Type::NUM, "PoSePenalty", "Proof of Service penalty score"),
+        RESULT_MAP_ENTRY(RPCResult::Type::NUM, "PoSeRevivedHeight", "Height masternode recovered from Proof of Service violations"),
         RESULT_MAP_ENTRY(RPCResult::Type::STR_HEX, "proTxHash", "Hash of the masternode's initial ProRegTx"),
         RESULT_MAP_ENTRY(RPCResult::Type::STR, "pubKeyOperator", "BLS public key used for operator signing"),
         RESULT_MAP_ENTRY(RPCResult::Type::STR_HEX, "quorumHash", "Hash of the quorum"),
         RESULT_MAP_ENTRY(RPCResult::Type::STR_HEX, "quorumSig", "BLS recovered threshold signature of quorum"),
+        RESULT_MAP_ENTRY(RPCResult::Type::NUM, "registeredHeight", "Height masternode was registered"),
+        RESULT_MAP_ENTRY(RPCResult::Type::NUM, "revocationReason", "Reason for ProUpRegTx revocation"),
         RESULT_MAP_ENTRY(RPCResult::Type::STR, "service", "(DEPRECATED) IP address and port of the masternode"),
         RESULT_MAP_ENTRY(RPCResult::Type::NUM, "type", "Masternode type"),
         RESULT_MAP_ENTRY(RPCResult::Type::NUM, "version", "Special transaction version"),
@@ -158,6 +170,46 @@ RPCResult GetRpcResult(const std::string& key, bool optional)
     return ret;
 }
 
+// CDeterministicMN::ToJson() defined in evo/deterministicmns.cpp
+[[nodiscard]] RPCResult CDeterministicMN::GetJsonHelp(const std::string& key, bool optional)
+{
+    return {RPCResult::Type::OBJ, key, optional, key.empty() ? "" : "The masternode's details",
+    {
+        {RPCResult::Type::STR, "type", "Masternode type"},
+        GetRpcResult("proTxHash"),
+        GetRpcResult("collateralHash"),
+        GetRpcResult("collateralIndex"),
+        {RPCResult::Type::STR, "collateralAddress", /*optional=*/true, "Dash address used for collateral"},
+        GetRpcResult("operatorReward"),
+        CDeterministicMNState::GetJsonHelp(/*key=*/"state", /*optional=*/false),
+    }};
+}
+
+[[nodiscard]] RPCResult CDeterministicMNState::GetJsonHelp(const std::string& key, bool optional)
+{
+    return {RPCResult::Type::OBJ, key, optional, key.empty() ? "" : "The masternode state",
+    {
+        {RPCResult::Type::NUM, "version", "Version of the masternode state"},
+        GetRpcResult("service"),
+        GetRpcResult("addresses"),
+        GetRpcResult("registeredHeight"),
+        GetRpcResult("lastPaidHeight"),
+        GetRpcResult("consecutivePayments"),
+        GetRpcResult("PoSePenalty"),
+        GetRpcResult("PoSeRevivedHeight"),
+        GetRpcResult("PoSeBanHeight"),
+        GetRpcResult("revocationReason"),
+        GetRpcResult("ownerAddress"),
+        GetRpcResult("votingAddress"),
+        GetRpcResult("platformNodeID", /*optional=*/true),
+        GetRpcResult("platformP2PPort", /*optional=*/true),
+        GetRpcResult("platformHTTPPort", /*optional=*/true),
+        GetRpcResult("payoutAddress", /*optional=*/true),
+        GetRpcResult("pubKeyOperator"),
+        GetRpcResult("operatorPayoutAddress", /*optional=*/true),
+    }};
+}
+
 [[nodiscard]] UniValue CDeterministicMNState::ToJson(MnType nType) const
 {
     UniValue obj(UniValue::VOBJ);
@@ -190,21 +242,47 @@ RPCResult GetRpcResult(const std::string& key, bool optional)
     return obj;
 }
 
+// CDeterministicMNStateDiff::ToJson() defined in evo/dmnstate.cpp
+[[nodiscard]] RPCResult CDeterministicMNStateDiff::GetJsonHelp(const std::string& key, bool optional)
+{
+    return {RPCResult::Type::OBJ, key, optional, key.empty() ? "" : "The masternode state diff",
+    {
+        {RPCResult::Type::NUM, "version", "Version of the masternode state diff"},
+        GetRpcResult("service", /*optional=*/true),
+        GetRpcResult("registeredHeight", /*optional=*/true),
+        GetRpcResult("lastPaidHeight", /*optional=*/true),
+        GetRpcResult("consecutivePayments", /*optional=*/true),
+        GetRpcResult("PoSePenalty", /*optional=*/true),
+        GetRpcResult("PoSeRevivedHeight", /*optional=*/true),
+        GetRpcResult("PoSeBanHeight", /*optional=*/true),
+        GetRpcResult("revocationReason", /*optional=*/true),
+        GetRpcResult("ownerAddress", /*optional=*/true),
+        GetRpcResult("votingAddress", /*optional=*/true),
+        GetRpcResult("payoutAddress", /*optional=*/true),
+        GetRpcResult("operatorPayoutAddress", /*optional=*/true),
+        GetRpcResult("pubKeyOperator", /*optional=*/true),
+        GetRpcResult("platformNodeID", /*optional=*/true),
+        GetRpcResult("platformP2PPort", /*optional=*/true),
+        GetRpcResult("platformHTTPPort", /*optional=*/true),
+        GetRpcResult("addresses", /*optional=*/true),
+    }};
+}
+
 [[nodiscard]] RPCResult CProRegTx::GetJsonHelp(const std::string& key, bool optional)
 {
     return {RPCResult::Type::OBJ, key, optional, key.empty() ? "" : "The masternode registration special transaction",
     {
         GetRpcResult("version"),
         GetRpcResult("type"),
-        {RPCResult::Type::STR_HEX, "collateralHash", "Collateral transaction hash"},
-        {RPCResult::Type::NUM, "collateralIndex", "Collateral transaction output index"},
+        GetRpcResult("collateralHash"),
+        GetRpcResult("collateralIndex"),
         GetRpcResult("service"),
         GetRpcResult("addresses"),
-        {RPCResult::Type::STR, "ownerAddress", "Dash address used for payee updates and proposal voting"},
+        GetRpcResult("ownerAddress"),
         GetRpcResult("votingAddress"),
         GetRpcResult("payoutAddress", /*optional=*/true),
         GetRpcResult("pubKeyOperator"),
-        {RPCResult::Type::NUM, "operatorReward", "Fraction in %% of reward shared with the operator between 0 and 10000"},
+        GetRpcResult("operatorReward"),
         GetRpcResult("platformNodeID", /*optional=*/true),
         GetRpcResult("platformP2PPort", /*optional=*/true),
         GetRpcResult("platformHTTPPort", /*optional=*/true),
diff --git a/src/evo/deterministicmns.h b/src/evo/deterministicmns.h
index 12643e5f1f1a..6fdf3604e9c3 100644
--- a/src/evo/deterministicmns.h
+++ b/src/evo/deterministicmns.h
@@ -5,9 +5,8 @@
 #ifndef BITCOIN_EVO_DETERMINISTICMNS_H
 #define BITCOIN_EVO_DETERMINISTICMNS_H
 
-#include <evo/dmnstate.h>
-
 #include <evo/dmn_types.h>
+#include <evo/dmnstate.h>
 #include <evo/providertx.h>
 #include <evo/types.h>
 
@@ -36,6 +35,7 @@ class CSimplifiedMNList;
 class CSimplifiedMNListEntry;
 class CMasternodeMetaMan;
 class TxValidationState;
+struct RPCResult;
 
 extern RecursiveMutex cs_main;
 
@@ -86,6 +86,8 @@ class CDeterministicMN
 
     [[nodiscard]] CSimplifiedMNListEntry to_sml_entry() const;
     [[nodiscard]] std::string ToString() const;
+
+    [[nodiscard]] static RPCResult GetJsonHelp(const std::string& key, bool optional);
     [[nodiscard]] UniValue ToJson() const;
 };
 
diff --git a/src/evo/dmnstate.h b/src/evo/dmnstate.h
index d63460b2d931..7fa609465002 100644
--- a/src/evo/dmnstate.h
+++ b/src/evo/dmnstate.h
@@ -19,16 +19,15 @@
 #include <boost/hana/for_each.hpp>
 #include <boost/hana/tuple.hpp>
 
-class CProRegTx;
-class UniValue;
-
 class CDeterministicMNState;
-
-namespace llmq
-{
-    class CFinalCommitment;
+class CProRegTx;
+struct RPCResult;
+namespace llmq {
+class CFinalCommitment;
 } // namespace llmq
 
+class UniValue;
+
 class CDeterministicMNState
 {
 private:
@@ -150,6 +149,7 @@ class CDeterministicMNState
 
 public:
     std::string ToString() const;
+    [[nodiscard]] static RPCResult GetJsonHelp(const std::string& key, bool optional);
     [[nodiscard]] UniValue ToJson(MnType nType) const;
 };
 
@@ -243,6 +243,7 @@ class CDeterministicMNStateDiff
     template <typename Stream>
     CDeterministicMNStateDiff(deserialize_type, Stream& s) { s >> *this; }
 
+    [[nodiscard]] static RPCResult GetJsonHelp(const std::string& key, bool optional);
     [[nodiscard]] UniValue ToJson(MnType nType) const;
 
     SERIALIZE_METHODS(CDeterministicMNStateDiff, obj)
diff --git a/src/rpc/evo.cpp b/src/rpc/evo.cpp
index 9907f19153f8..3e0dcc641636 100644
--- a/src/rpc/evo.cpp
+++ b/src/rpc/evo.cpp
@@ -1679,6 +1679,7 @@ static RPCHelpMan protx_listdiff()
     for(const auto& mn : mnDiff.addedMNs) {
         jaddedMNs.push_back(mn->ToJson());
     }
+    // TODO: Use CDeterministicMN::GetJsonHelp() for mn
     ret.pushKV("addedMNs", jaddedMNs);
 
     UniValue jremovedMNs(UniValue::VARR);
@@ -1701,6 +1702,7 @@ static RPCHelpMan protx_listdiff()
         obj.pushKV(dmn->proTxHash.ToString(), stateDiff.ToJson(dmn->nType));
         jupdatedMNs.push_back(obj);
     }
+    // TODO: Use CDeterministicMNStateDiff::GetJsonHelp() for stateDiff
     ret.pushKV("updatedMNs", jupdatedMNs);
 
     return ret;
diff --git a/src/rpc/masternode.cpp b/src/rpc/masternode.cpp
index b87670e3766c..727b20e9ebf5 100644
--- a/src/rpc/masternode.cpp
+++ b/src/rpc/masternode.cpp
@@ -177,6 +177,7 @@ static RPCHelpMan masternode_status()
         mnObj.pushKV("type", std::string(GetMnType(dmn->nType).description));
         mnObj.pushKV("collateralHash", dmn->collateralOutpoint.hash.ToString());
         mnObj.pushKV("collateralIndex", dmn->collateralOutpoint.n);
+        // TODO: Use CDeterministicMNState::GetJsonHelp() for dmnState
         mnObj.pushKV("dmnState", dmn->pdmnState->ToJson(dmn->nType));
     }
     mnObj.pushKV("state", node.mn_activeman->GetStateString());

From f01930b975f61be2af5c1229df6766d714bdc329 Mon Sep 17 00:00:00 2001
From: Kittywhiskers Van Gogh <63189531+kwvg@users.noreply.github.com>
Date: Sun, 5 Oct 2025 12:55:46 +0000
Subject: [PATCH 080/656] chore: remove redundant `[[nodiscard]]` attributions
 in source file

---
 src/evo/core_write.cpp  | 52 ++++++++++++++++++++---------------------
 src/llmq/core_write.cpp | 20 ++++++++--------
 2 files changed, 36 insertions(+), 36 deletions(-)

diff --git a/src/evo/core_write.cpp b/src/evo/core_write.cpp
index e7b9f3e852d5..eef000b1b2be 100644
--- a/src/evo/core_write.cpp
+++ b/src/evo/core_write.cpp
@@ -78,7 +78,7 @@ RPCResult GetRpcResult(const std::string& key, bool optional)
                              __FILE__, __LINE__, __func__);
 }
 
-[[nodiscard]] RPCResult CAssetLockPayload::GetJsonHelp(const std::string& key, bool optional)
+RPCResult CAssetLockPayload::GetJsonHelp(const std::string& key, bool optional)
 {
     return {RPCResult::Type::OBJ, key, optional, key.empty() ? "" : "The asset lock special transaction",
     {
@@ -95,7 +95,7 @@ RPCResult GetRpcResult(const std::string& key, bool optional)
     }};
 }
 
-[[nodiscard]] UniValue CAssetLockPayload::ToJson() const
+UniValue CAssetLockPayload::ToJson() const
 {
     UniValue outputs(UniValue::VARR);
     for (const CTxOut& credit_output : creditOutputs) {
@@ -114,7 +114,7 @@ RPCResult GetRpcResult(const std::string& key, bool optional)
     return ret;
 }
 
-[[nodiscard]] RPCResult CAssetUnlockPayload::GetJsonHelp(const std::string& key, bool optional)
+RPCResult CAssetUnlockPayload::GetJsonHelp(const std::string& key, bool optional)
 {
     return {RPCResult::Type::OBJ, key, optional, key.empty() ? "" : "The asset unlock special transaction",
     {
@@ -127,7 +127,7 @@ RPCResult GetRpcResult(const std::string& key, bool optional)
     }};
 }
 
-[[nodiscard]] UniValue CAssetUnlockPayload::ToJson() const
+UniValue CAssetUnlockPayload::ToJson() const
 {
     UniValue ret(UniValue::VOBJ);
     ret.pushKV("version", nVersion);
@@ -139,7 +139,7 @@ RPCResult GetRpcResult(const std::string& key, bool optional)
     return ret;
 }
 
-[[nodiscard]] RPCResult CCbTx::GetJsonHelp(const std::string& key, bool optional)
+RPCResult CCbTx::GetJsonHelp(const std::string& key, bool optional)
 {
     return {RPCResult::Type::OBJ, key, optional, key.empty() ? "" : "The coinbase special transaction",
     {
@@ -153,7 +153,7 @@ RPCResult GetRpcResult(const std::string& key, bool optional)
     }};
 }
 
-[[nodiscard]] UniValue CCbTx::ToJson() const
+UniValue CCbTx::ToJson() const
 {
     UniValue ret(UniValue::VOBJ);
     ret.pushKV("version", ToUnderlying(nVersion));
@@ -171,7 +171,7 @@ RPCResult GetRpcResult(const std::string& key, bool optional)
 }
 
 // CDeterministicMN::ToJson() defined in evo/deterministicmns.cpp
-[[nodiscard]] RPCResult CDeterministicMN::GetJsonHelp(const std::string& key, bool optional)
+RPCResult CDeterministicMN::GetJsonHelp(const std::string& key, bool optional)
 {
     return {RPCResult::Type::OBJ, key, optional, key.empty() ? "" : "The masternode's details",
     {
@@ -185,7 +185,7 @@ RPCResult GetRpcResult(const std::string& key, bool optional)
     }};
 }
 
-[[nodiscard]] RPCResult CDeterministicMNState::GetJsonHelp(const std::string& key, bool optional)
+RPCResult CDeterministicMNState::GetJsonHelp(const std::string& key, bool optional)
 {
     return {RPCResult::Type::OBJ, key, optional, key.empty() ? "" : "The masternode state",
     {
@@ -210,7 +210,7 @@ RPCResult GetRpcResult(const std::string& key, bool optional)
     }};
 }
 
-[[nodiscard]] UniValue CDeterministicMNState::ToJson(MnType nType) const
+UniValue CDeterministicMNState::ToJson(MnType nType) const
 {
     UniValue obj(UniValue::VOBJ);
     obj.pushKV("version", nVersion);
@@ -243,7 +243,7 @@ RPCResult GetRpcResult(const std::string& key, bool optional)
 }
 
 // CDeterministicMNStateDiff::ToJson() defined in evo/dmnstate.cpp
-[[nodiscard]] RPCResult CDeterministicMNStateDiff::GetJsonHelp(const std::string& key, bool optional)
+RPCResult CDeterministicMNStateDiff::GetJsonHelp(const std::string& key, bool optional)
 {
     return {RPCResult::Type::OBJ, key, optional, key.empty() ? "" : "The masternode state diff",
     {
@@ -268,7 +268,7 @@ RPCResult GetRpcResult(const std::string& key, bool optional)
     }};
 }
 
-[[nodiscard]] RPCResult CProRegTx::GetJsonHelp(const std::string& key, bool optional)
+RPCResult CProRegTx::GetJsonHelp(const std::string& key, bool optional)
 {
     return {RPCResult::Type::OBJ, key, optional, key.empty() ? "" : "The masternode registration special transaction",
     {
@@ -290,7 +290,7 @@ RPCResult GetRpcResult(const std::string& key, bool optional)
     }};
 }
 
-[[nodiscard]] UniValue CProRegTx::ToJson() const
+UniValue CProRegTx::ToJson() const
 {
     UniValue ret(UniValue::VOBJ);
     ret.pushKV("version", nVersion);
@@ -315,7 +315,7 @@ RPCResult GetRpcResult(const std::string& key, bool optional)
     return ret;
 }
 
-[[nodiscard]] RPCResult CProUpRegTx::GetJsonHelp(const std::string& key, bool optional)
+RPCResult CProUpRegTx::GetJsonHelp(const std::string& key, bool optional)
 {
     return {RPCResult::Type::OBJ, key, optional, key.empty() ? "" : "The masternode update registrar special transaction",
     {
@@ -328,7 +328,7 @@ RPCResult GetRpcResult(const std::string& key, bool optional)
     }};
 }
 
-[[nodiscard]] UniValue CProUpRegTx::ToJson() const
+UniValue CProUpRegTx::ToJson() const
 {
     UniValue ret(UniValue::VOBJ);
     ret.pushKV("version", nVersion);
@@ -342,7 +342,7 @@ RPCResult GetRpcResult(const std::string& key, bool optional)
     return ret;
 }
 
-[[nodiscard]] RPCResult CProUpRevTx::GetJsonHelp(const std::string& key, bool optional)
+RPCResult CProUpRevTx::GetJsonHelp(const std::string& key, bool optional)
 {
     return {RPCResult::Type::OBJ, key, optional, key.empty() ? "" : "The masternode operator revocation special transaction",
     {
@@ -353,7 +353,7 @@ RPCResult GetRpcResult(const std::string& key, bool optional)
     }};
 }
 
-[[nodiscard]] UniValue CProUpRevTx::ToJson() const
+UniValue CProUpRevTx::ToJson() const
 {
     UniValue ret(UniValue::VOBJ);
     ret.pushKV("version", nVersion);
@@ -363,7 +363,7 @@ RPCResult GetRpcResult(const std::string& key, bool optional)
     return ret;
 }
 
-[[nodiscard]] RPCResult CProUpServTx::GetJsonHelp(const std::string& key, bool optional)
+RPCResult CProUpServTx::GetJsonHelp(const std::string& key, bool optional)
 {
     return {RPCResult::Type::OBJ, key, optional, key.empty() ? "" : "The masternode update service special transaction",
     {
@@ -380,7 +380,7 @@ RPCResult GetRpcResult(const std::string& key, bool optional)
     }};
 }
 
-[[nodiscard]] UniValue CProUpServTx::ToJson() const
+UniValue CProUpServTx::ToJson() const
 {
     UniValue ret(UniValue::VOBJ);
     ret.pushKV("version", nVersion);
@@ -400,7 +400,7 @@ RPCResult GetRpcResult(const std::string& key, bool optional)
     return ret;
 }
 
-[[nodiscard]] RPCResult CSimplifiedMNListDiff::GetJsonHelp(const std::string& key, bool optional)
+RPCResult CSimplifiedMNListDiff::GetJsonHelp(const std::string& key, bool optional)
 {
     return {RPCResult::Type::OBJ, key, optional, key.empty() ? "" : "The simplified masternode list diff",
     {
@@ -430,7 +430,7 @@ RPCResult GetRpcResult(const std::string& key, bool optional)
     }};
 }
 
-[[nodiscard]] UniValue CSimplifiedMNListDiff::ToJson(bool extended) const
+UniValue CSimplifiedMNListDiff::ToJson(bool extended) const
 {
     UniValue obj(UniValue::VOBJ);
 
@@ -493,7 +493,7 @@ RPCResult GetRpcResult(const std::string& key, bool optional)
     return obj;
 }
 
-[[nodiscard]] RPCResult CSimplifiedMNListEntry::GetJsonHelp(const std::string& key, bool optional)
+RPCResult CSimplifiedMNListEntry::GetJsonHelp(const std::string& key, bool optional)
 {
     return {RPCResult::Type::OBJ, key, optional, key.empty() ? "" : "The simplified masternode list entry",
     {
@@ -513,7 +513,7 @@ RPCResult GetRpcResult(const std::string& key, bool optional)
     }};
 }
 
-[[nodiscard]] UniValue CSimplifiedMNListEntry::ToJson(bool extended) const
+UniValue CSimplifiedMNListEntry::ToJson(bool extended) const
 {
     UniValue obj(UniValue::VOBJ);
     obj.pushKV("nVersion", nVersion);
@@ -542,7 +542,7 @@ RPCResult GetRpcResult(const std::string& key, bool optional)
     return obj;
 }
 
-[[nodiscard]] RPCResult MNHFTx::GetJsonHelp(const std::string& key, bool optional)
+RPCResult MNHFTx::GetJsonHelp(const std::string& key, bool optional)
 {
     return {RPCResult::Type::OBJ, key, optional, key.empty() ? "" : "The masternode hard fork payload",
     {
@@ -552,7 +552,7 @@ RPCResult GetRpcResult(const std::string& key, bool optional)
     }};
 }
 
-[[nodiscard]] UniValue MNHFTx::ToJson() const
+UniValue MNHFTx::ToJson() const
 {
     UniValue obj(UniValue::VOBJ);
     obj.pushKV("versionBit", versionBit);
@@ -561,7 +561,7 @@ RPCResult GetRpcResult(const std::string& key, bool optional)
     return obj;
 }
 
-[[nodiscard]] RPCResult MNHFTxPayload::GetJsonHelp(const std::string& key, bool optional)
+RPCResult MNHFTxPayload::GetJsonHelp(const std::string& key, bool optional)
 {
     return {RPCResult::Type::OBJ, key, optional, key.empty() ? "" : "The masternode hard fork signal special transaction",
     {
@@ -570,7 +570,7 @@ RPCResult GetRpcResult(const std::string& key, bool optional)
     }};
 }
 
-[[nodiscard]] UniValue MNHFTxPayload::ToJson() const
+UniValue MNHFTxPayload::ToJson() const
 {
     UniValue ret(UniValue::VOBJ);
     ret.pushKV("version", nVersion);
diff --git a/src/llmq/core_write.cpp b/src/llmq/core_write.cpp
index 8a8137ed7072..5ffe3c46f956 100644
--- a/src/llmq/core_write.cpp
+++ b/src/llmq/core_write.cpp
@@ -15,7 +15,7 @@
 #include <string>
 
 namespace llmq {
-[[nodiscard]] RPCResult CFinalCommitment::GetJsonHelp(const std::string& key, bool optional)
+RPCResult CFinalCommitment::GetJsonHelp(const std::string& key, bool optional)
 {
     return {RPCResult::Type::OBJ, key, optional, key.empty() ? "" : "The quorum commitment payload",
     {
@@ -34,7 +34,7 @@ namespace llmq {
     }};
 }
 
-[[nodiscard]] UniValue CFinalCommitment::ToJson() const
+UniValue CFinalCommitment::ToJson() const
 {
     UniValue obj(UniValue::VOBJ);
     obj.pushKV("version", nVersion);
@@ -52,7 +52,7 @@ namespace llmq {
     return obj;
 }
 
-[[nodiscard]] RPCResult CFinalCommitmentTxPayload::GetJsonHelp(const std::string& key, bool optional)
+RPCResult CFinalCommitmentTxPayload::GetJsonHelp(const std::string& key, bool optional)
 {
     return {RPCResult::Type::OBJ, key, optional, key.empty() ? "" : "The quorum commitment special transaction",
     {
@@ -62,7 +62,7 @@ namespace llmq {
     }};
 }
 
-[[nodiscard]] UniValue CFinalCommitmentTxPayload::ToJson() const
+UniValue CFinalCommitmentTxPayload::ToJson() const
 {
     UniValue ret(UniValue::VOBJ);
     ret.pushKV("version", nVersion);
@@ -71,7 +71,7 @@ namespace llmq {
     return ret;
 }
 
-[[nodiscard]] RPCResult CQuorumRotationInfo::GetJsonHelp(const std::string& key, bool optional)
+RPCResult CQuorumRotationInfo::GetJsonHelp(const std::string& key, bool optional)
 {
     return {RPCResult::Type::OBJ, key, optional, key.empty() ? "" : "The quorum rotation",
     {
@@ -98,7 +98,7 @@ namespace llmq {
     }};
 }
 
-[[nodiscard]] UniValue CQuorumRotationInfo::ToJson() const
+UniValue CQuorumRotationInfo::ToJson() const
 {
     UniValue obj(UniValue::VOBJ);
     obj.pushKV("extraShare", extraShare);
@@ -140,7 +140,7 @@ namespace llmq {
     return obj;
 }
 
-[[nodiscard]] RPCResult CQuorumSnapshot::GetJsonHelp(const std::string& key, bool optional)
+RPCResult CQuorumSnapshot::GetJsonHelp(const std::string& key, bool optional)
 {
     return {RPCResult::Type::OBJ, key, optional, key.empty() ? "" : "The quorum snapshot",
     {
@@ -154,7 +154,7 @@ namespace llmq {
     }};
 }
 
-[[nodiscard]] UniValue CQuorumSnapshot::ToJson() const
+UniValue CQuorumSnapshot::ToJson() const
 {
     UniValue obj(UniValue::VOBJ);
     UniValue activeQ(UniValue::VARR);
@@ -173,7 +173,7 @@ namespace llmq {
     return obj;
 }
 
-[[nodiscard]] RPCResult CRecoveredSig::GetJsonHelp(const std::string& key, bool optional)
+RPCResult CRecoveredSig::GetJsonHelp(const std::string& key, bool optional)
 {
     return {RPCResult::Type::OBJ, key, optional, key.empty() ? "" : "The recovered signature",
     {
@@ -186,7 +186,7 @@ namespace llmq {
     }};
 }
 
-[[nodiscard]] UniValue CRecoveredSig::ToJson() const
+UniValue CRecoveredSig::ToJson() const
 {
     UniValue ret(UniValue::VOBJ);
     ret.pushKV("llmqType", ToUnderlying(llmqType));

From 56514c767d6faa01d0076136a3d37bb5158f6125 Mon Sep 17 00:00:00 2001
From: Kittywhiskers Van Gogh <63189531+kwvg@users.noreply.github.com>
Date: Sun, 5 Oct 2025 15:08:43 +0000
Subject: [PATCH 081/656] chore: move RpcResult map outside `GetRpcResult()`

We are using it extensively and could do with some cleanup
---
 src/evo/core_write.cpp | 96 +++++++++++++++++++++---------------------
 1 file changed, 49 insertions(+), 47 deletions(-)

diff --git a/src/evo/core_write.cpp b/src/evo/core_write.cpp
index eef000b1b2be..4e83e8bc4630 100644
--- a/src/evo/core_write.cpp
+++ b/src/evo/core_write.cpp
@@ -24,56 +24,58 @@
 #include <map>
 #include <string>
 
+namespace {
+#define RESULT_MAP_ENTRY(name, type, desc) {name, {type, name, desc}}
+const std::map<std::string, RPCResult> RPCRESULT_MAP{{
+    {"addresses",
+        {RPCResult::Type::OBJ, "addresses", "Network addresses of the masternode",
+    {
+        {RPCResult::Type::ARR, "core_p2p", /*optional=*/true, "Addresses used for protocol P2P",
+            {{RPCResult::Type::STR, "address", ""}}},
+        {RPCResult::Type::ARR, "platform_p2p", /*optional=*/true, "Addresses used for Platform P2P",
+            {{RPCResult::Type::STR, "address", ""}}},
+        {RPCResult::Type::ARR, "platform_https", /*optional=*/true, "Addresses used for Platform HTTPS API",
+            {{RPCResult::Type::STR, "address", ""}}},
+    }}},
+    RESULT_MAP_ENTRY("collateralHash", RPCResult::Type::STR_HEX, "Collateral transaction hash"),
+    RESULT_MAP_ENTRY("collateralIndex", RPCResult::Type::NUM, "Collateral transaction output index"),
+    RESULT_MAP_ENTRY("consecutivePayments", RPCResult::Type::NUM, "Consecutive payments masternode has received in payment cycle"),
+    RESULT_MAP_ENTRY("height", RPCResult::Type::NUM, "Block height"),
+    RESULT_MAP_ENTRY("inputsHash", RPCResult::Type::STR_HEX, "Hash of all the outpoints of the transaction inputs"),
+    RESULT_MAP_ENTRY("lastPaidHeight", RPCResult::Type::NUM, "Height masternode was last paid"),
+    RESULT_MAP_ENTRY("llmqType", RPCResult::Type::NUM, "Quorum type"),
+    RESULT_MAP_ENTRY("merkleRootMNList", RPCResult::Type::STR_HEX, "Merkle root of the masternode list"),
+    RESULT_MAP_ENTRY("merkleRootQuorums", RPCResult::Type::STR_HEX, "Merkle root of the quorum list"),
+    RESULT_MAP_ENTRY("operatorPayoutAddress", RPCResult::Type::STR, "Dash address used for operator reward payments"),
+    RESULT_MAP_ENTRY("operatorReward", RPCResult::Type::NUM, "Fraction in %% of reward shared with the operator between 0 and 10000"),
+    RESULT_MAP_ENTRY("ownerAddress", RPCResult::Type::STR, "Dash address used for payee updates and proposal voting"),
+    RESULT_MAP_ENTRY("payoutAddress", RPCResult::Type::STR, "Dash address used for masternode reward payments"),
+    RESULT_MAP_ENTRY("platformHTTPPort", RPCResult::Type::NUM, "(DEPRECATED) TCP port of Platform HTTP API"),
+    RESULT_MAP_ENTRY("platformNodeID", RPCResult::Type::STR_HEX, "Node ID derived from P2P public key for Platform P2P"),
+    RESULT_MAP_ENTRY("platformP2PPort", RPCResult::Type::NUM, "(DEPRECATED) TCP port of Platform P2P"),
+    RESULT_MAP_ENTRY("PoSeBanHeight", RPCResult::Type::NUM, "Height masternode was banned for Proof of Service violations"),
+    RESULT_MAP_ENTRY("PoSePenalty", RPCResult::Type::NUM, "Proof of Service penalty score"),
+    RESULT_MAP_ENTRY("PoSeRevivedHeight", RPCResult::Type::NUM, "Height masternode recovered from Proof of Service violations"),
+    RESULT_MAP_ENTRY("proTxHash", RPCResult::Type::STR_HEX, "Hash of the masternode's initial ProRegTx"),
+    RESULT_MAP_ENTRY("pubKeyOperator", RPCResult::Type::STR, "BLS public key used for operator signing"),
+    RESULT_MAP_ENTRY("quorumHash", RPCResult::Type::STR_HEX, "Hash of the quorum"),
+    RESULT_MAP_ENTRY("quorumSig", RPCResult::Type::STR_HEX, "BLS recovered threshold signature of quorum"),
+    RESULT_MAP_ENTRY("registeredHeight", RPCResult::Type::NUM, "Height masternode was registered"),
+    RESULT_MAP_ENTRY("revocationReason", RPCResult::Type::NUM, "Reason for ProUpRegTx revocation"),
+    RESULT_MAP_ENTRY("service", RPCResult::Type::STR, "(DEPRECATED) IP address and port of the masternode"),
+    RESULT_MAP_ENTRY("type", RPCResult::Type::NUM, "Masternode type"),
+    RESULT_MAP_ENTRY("version", RPCResult::Type::NUM, "Special transaction version"),
+    RESULT_MAP_ENTRY("votingAddress", RPCResult::Type::STR, "Dash address used for voting"),
+}};
+#undef RESULT_MAP_ENTRY
+} // anonymous namespace
+
 RPCResult GetRpcResult(const std::string& key, bool optional)
 {
-#define RESULT_MAP_ENTRY(type, name, desc) {name, {type, name, optional, desc}}
-    const std::map<std::string, RPCResult> result_map{{
-        {"addresses",
-            {RPCResult::Type::OBJ, "addresses", optional, "Network addresses of the masternode",
-        {
-            {RPCResult::Type::ARR, "core_p2p", /*optional=*/true, "Addresses used for protocol P2P",
-                {{RPCResult::Type::STR, "address", ""}}},
-            {RPCResult::Type::ARR, "platform_p2p", /*optional=*/true, "Addresses used for Platform P2P",
-                {{RPCResult::Type::STR, "address", ""}}},
-            {RPCResult::Type::ARR, "platform_https", /*optional=*/true, "Addresses used for Platform HTTPS API",
-                {{RPCResult::Type::STR, "address", ""}}},
-        }}},
-        RESULT_MAP_ENTRY(RPCResult::Type::STR_HEX, "collateralHash", "Collateral transaction hash"),
-        RESULT_MAP_ENTRY(RPCResult::Type::NUM, "collateralIndex", "Collateral transaction output index"),
-        RESULT_MAP_ENTRY(RPCResult::Type::NUM, "consecutivePayments", "Consecutive payments masternode has received in payment cycle"),
-        RESULT_MAP_ENTRY(RPCResult::Type::NUM, "height", "Block height"),
-        RESULT_MAP_ENTRY(RPCResult::Type::STR_HEX, "inputsHash", "Hash of all the outpoints of the transaction inputs"),
-        RESULT_MAP_ENTRY(RPCResult::Type::NUM, "lastPaidHeight", "Height masternode was last paid"),
-        RESULT_MAP_ENTRY(RPCResult::Type::NUM, "llmqType", "Quorum type"),
-        RESULT_MAP_ENTRY(RPCResult::Type::STR_HEX, "merkleRootMNList", "Merkle root of the masternode list"),
-        RESULT_MAP_ENTRY(RPCResult::Type::STR_HEX, "merkleRootQuorums", "Merkle root of the quorum list"),
-        RESULT_MAP_ENTRY(RPCResult::Type::STR, "operatorPayoutAddress", "Dash address used for operator reward payments"),
-        RESULT_MAP_ENTRY(RPCResult::Type::NUM, "operatorReward", "Fraction in %% of reward shared with the operator between 0 and 10000"),
-        RESULT_MAP_ENTRY(RPCResult::Type::STR, "ownerAddress", "Dash address used for payee updates and proposal voting"),
-        RESULT_MAP_ENTRY(RPCResult::Type::STR, "payoutAddress", "Dash address used for masternode reward payments"),
-        RESULT_MAP_ENTRY(RPCResult::Type::NUM, "platformHTTPPort", "(DEPRECATED) TCP port of Platform HTTP API"),
-        RESULT_MAP_ENTRY(RPCResult::Type::STR_HEX, "platformNodeID", "Node ID derived from P2P public key for Platform P2P"),
-        RESULT_MAP_ENTRY(RPCResult::Type::NUM, "platformP2PPort", "(DEPRECATED) TCP port of Platform P2P"),
-        RESULT_MAP_ENTRY(RPCResult::Type::NUM, "PoSeBanHeight", "Height masternode was banned for Proof of Service violations"),
-        RESULT_MAP_ENTRY(RPCResult::Type::NUM, "PoSePenalty", "Proof of Service penalty score"),
-        RESULT_MAP_ENTRY(RPCResult::Type::NUM, "PoSeRevivedHeight", "Height masternode recovered from Proof of Service violations"),
-        RESULT_MAP_ENTRY(RPCResult::Type::STR_HEX, "proTxHash", "Hash of the masternode's initial ProRegTx"),
-        RESULT_MAP_ENTRY(RPCResult::Type::STR, "pubKeyOperator", "BLS public key used for operator signing"),
-        RESULT_MAP_ENTRY(RPCResult::Type::STR_HEX, "quorumHash", "Hash of the quorum"),
-        RESULT_MAP_ENTRY(RPCResult::Type::STR_HEX, "quorumSig", "BLS recovered threshold signature of quorum"),
-        RESULT_MAP_ENTRY(RPCResult::Type::NUM, "registeredHeight", "Height masternode was registered"),
-        RESULT_MAP_ENTRY(RPCResult::Type::NUM, "revocationReason", "Reason for ProUpRegTx revocation"),
-        RESULT_MAP_ENTRY(RPCResult::Type::STR, "service", "(DEPRECATED) IP address and port of the masternode"),
-        RESULT_MAP_ENTRY(RPCResult::Type::NUM, "type", "Masternode type"),
-        RESULT_MAP_ENTRY(RPCResult::Type::NUM, "version", "Special transaction version"),
-        RESULT_MAP_ENTRY(RPCResult::Type::STR, "votingAddress", "Dash address used for voting"),
-    }};
-#undef  RESULT_MAP_ENTRY
-
-    if (const auto it = result_map.find(key); it != result_map.end()) {
-        return it->second;
+    if (const auto it = RPCRESULT_MAP.find(key); it != RPCRESULT_MAP.end()) {
+        const auto& ret{it->second};
+        return RPCResult{ret.m_type, ret.m_key_name, optional, ret.m_description, ret.m_inner};
     }
-
     throw NonFatalCheckError(strprintf("Requested invalid RPCResult for nonexistent key \"%s\"", key).c_str(),
                              __FILE__, __LINE__, __func__);
 }

From ce7d354f2bf9ff50adee845162a4fc5291a03c6b Mon Sep 17 00:00:00 2001
From: laanwj <126646+laanwj@users.noreply.github.com>
Date: Tue, 26 Apr 2022 15:10:22 +0200
Subject: [PATCH 082/656] Merge bitcoin/bitcoin#24959: Remove not needed
 clang-format off comments

fa870e3d4ccd6dfd0a9a8f2c608721a7251114e2 Remove not needed clang-format off comments (MarcoFalke)

Pull request description:

  It seems odd to disable clang-format and force manual formatting when there is no need for it. So remove the clang-format comments and other unneeded comments.

  Can be reviewed with `--word-diff-regex=. --ignore-all-space`

  Looks like this was initially added in commit d9d79576f423cd9c5cef4547c7e3648dbb339460 to accommodate a linter that has since been removed and replaced by a functional test.

ACKs for top commit:
  laanwj:
    Code review ACK fa870e3d4ccd6dfd0a9a8f2c608721a7251114e2
  fanquake:
    ACK fa870e3d4ccd6dfd0a9a8f2c608721a7251114e2

Tree-SHA512: 0f8f97c12f5dbe517dd96c10b10ce1b8772d8daed33e6b41f73ea1040e89888cf3b8c0ad7b20319e366fe30c71e8b181c89098ae7f6a3deb8647e1b4731db815
---
 src/rpc/blockchain.cpp     |  76 +++++++++----------
 src/rpc/coinjoin.cpp       |  38 ++++------
 src/rpc/evo.cpp            |  71 ++++++++----------
 src/rpc/governance.cpp     |  49 +++++--------
 src/rpc/masternode.cpp     |  34 ++++-----
 src/rpc/mempool.cpp        |   2 -
 src/rpc/mining.cpp         |  30 +++-----
 src/rpc/net.cpp            |  45 +++++-------
 src/rpc/quorums.cpp        |  48 ++++++------
 src/rpc/rawtransaction.cpp |  46 ++++++------
 src/rpc/server.cpp         |  15 ++--
 src/rpc/txoutproof.cpp     |   2 -
 src/wallet/rpc/wallet.cpp  | 146 ++++++++++++++++++-------------------
 src/zmq/zmqrpc.cpp         |   6 +-
 14 files changed, 267 insertions(+), 341 deletions(-)

diff --git a/src/rpc/blockchain.cpp b/src/rpc/blockchain.cpp
index 35e4d54c1f25..92c0f1fa31ed 100644
--- a/src/rpc/blockchain.cpp
+++ b/src/rpc/blockchain.cpp
@@ -2759,48 +2759,40 @@ UniValue CreateUTXOSnapshot(
     return result;
 }
 
-
-void RegisterBlockchainRPCCommands(CRPCTable &t)
-{
-// clang-format off
-static const CRPCCommand commands[] =
-{ //  category              actor (function)
-  //  --------------------- ------------------------
-    { "blockchain",         &getblockchaininfo,                  },
-    { "blockchain",         &getchaintxstats,                    },
-    { "blockchain",         &getblockstats,                      },
-    { "blockchain",         &getbestblockhash,                   },
-    { "blockchain",         &getbestchainlock,                   },
-    { "blockchain",         &getblockcount,                      },
-    { "blockchain",         &getblock,                           },
-    { "blockchain",         &getblockfrompeer,                   },
-    { "blockchain",         &getblockhashes,                     },
-    { "blockchain",         &getblockhash,                       },
-    { "blockchain",         &getblockheader,                     },
-    { "blockchain",         &getblockheaders,                    },
-    { "blockchain",         &getmerkleblocks,                    },
-    { "blockchain",         &getchaintips,                       },
-    { "blockchain",         &getdifficulty,                      },
-    { "blockchain",         &getspecialtxes,                     },
-    { "blockchain",         &gettxout,                           },
-    { "blockchain",         &gettxoutsetinfo,                    },
-    { "blockchain",         &pruneblockchain,                    },
-    { "blockchain",         &verifychain,                        },
-
-    { "blockchain",         &preciousblock,                      },
-    { "blockchain",         &scantxoutset,                       },
-    { "blockchain",         &getblockfilter,                     },
-
-    /* Not shown in help */
-    { "hidden",              &invalidateblock,                   },
-    { "hidden",              &reconsiderblock,                   },
-    { "hidden",              &waitfornewblock,                   },
-    { "hidden",              &waitforblock,                      },
-    { "hidden",              &waitforblockheight,                },
-    { "hidden",              &syncwithvalidationinterfacequeue,  },
-    { "hidden",              &dumptxoutset,                      },
-};
-// clang-format on
+void RegisterBlockchainRPCCommands(CRPCTable& t)
+{
+    static const CRPCCommand commands[]{
+        {"blockchain", &getblockchaininfo},
+        {"blockchain", &getchaintxstats},
+        {"blockchain", &getblockstats},
+        {"blockchain", &getbestblockhash},
+        {"blockchain", &getbestchainlock},
+        {"blockchain", &getblockcount},
+        {"blockchain", &getblock},
+        {"blockchain", &getblockfrompeer},
+        {"blockchain", &getblockhashes},
+        {"blockchain", &getblockhash},
+        {"blockchain", &getblockheader},
+        {"blockchain", &getblockheaders},
+        {"blockchain", &getmerkleblocks},
+        {"blockchain", &getchaintips},
+        {"blockchain", &getdifficulty},
+        {"blockchain", &getspecialtxes},
+        {"blockchain", &gettxout},
+        {"blockchain", &gettxoutsetinfo},
+        {"blockchain", &pruneblockchain},
+        {"blockchain", &verifychain},
+        {"blockchain", &preciousblock},
+        {"blockchain", &scantxoutset},
+        {"blockchain", &getblockfilter},
+        {"hidden", &invalidateblock},
+        {"hidden", &reconsiderblock},
+        {"hidden", &waitfornewblock},
+        {"hidden", &waitforblock},
+        {"hidden", &waitforblockheight},
+        {"hidden", &syncwithvalidationinterfacequeue},
+        {"hidden", &dumptxoutset},
+    };
     for (const auto& c : commands) {
         t.appendCommand(c.name, &c);
     }
diff --git a/src/rpc/coinjoin.cpp b/src/rpc/coinjoin.cpp
index e0367734467a..ef578d726101 100644
--- a/src/rpc/coinjoin.cpp
+++ b/src/rpc/coinjoin.cpp
@@ -503,35 +503,27 @@ static RPCHelpMan getcoinjoininfo()
 #ifdef ENABLE_WALLET
 Span<const CRPCCommand> GetWalletCoinJoinRPCCommands()
 {
-// clang-format off
-static const CRPCCommand commands[] =
-{ //  category              actor (function)
-  //  --------------------- -----------------------
-    { "dash",                &coinjoin,               },
-    { "dash",                &coinjoin_reset,         },
-    { "dash",                &coinjoin_start,         },
-    { "dash",                &coinjoin_status,        },
-    { "dash",                &coinjoin_stop,          },
-    { "dash",                &coinjoinsalt,           },
-    { "dash",                &coinjoinsalt_generate,  },
-    { "dash",                &coinjoinsalt_get,       },
-    { "dash",                &coinjoinsalt_set,       },
-    { "dash",                &getcoinjoininfo,        },
-};
-// clang-format on
+    static const CRPCCommand commands[]{
+        {"dash", &coinjoin},
+        {"dash", &coinjoin_reset},
+        {"dash", &coinjoin_start},
+        {"dash", &coinjoin_status},
+        {"dash", &coinjoin_stop},
+        {"dash", &coinjoinsalt},
+        {"dash", &coinjoinsalt_generate},
+        {"dash", &coinjoinsalt_get},
+        {"dash", &coinjoinsalt_set},
+        {"dash", &getcoinjoininfo},
+    };
     return commands;
 }
 #endif // ENABLE_WALLET
 
 void RegisterCoinJoinRPCCommands(CRPCTable& t)
 {
-// clang-format off
-static const CRPCCommand commands_wallet[] =
-{ //  category               actor (function)
-  //  ---------------------  -----------------------
-    { "dash",                &getcoinjoininfo,        },
-};
-// clang-format on
+    static const CRPCCommand commands_wallet[]{
+        {"dash", &getcoinjoininfo},
+    };
     // If we aren't compiling with wallet support, we still need to register RPCs that are
     // capable of working without wallet support. We have to do this even if wallet support
     // is compiled in but is disabled at runtime because runtime disablement prohibits
diff --git a/src/rpc/evo.cpp b/src/rpc/evo.cpp
index 3e0dcc641636..81bf1ecd7814 100644
--- a/src/rpc/evo.cpp
+++ b/src/rpc/evo.cpp
@@ -1845,52 +1845,43 @@ static RPCHelpMan bls_help()
 #ifdef ENABLE_WALLET
 Span<const CRPCCommand> GetWalletEvoRPCCommands()
 {
-// clang-format off
-static const CRPCCommand commands[] =
-{ //  category              actor (function)
-  //  --------------------- -----------------------
-    { "evo",                &protx_list,                       },
-    { "evo",                &protx_info,                       },
-    { "evo",                &protx_register,                   },
-    { "evo",                &protx_register_evo,               },
-    { "evo",                &protx_register_fund,              },
-    { "evo",                &protx_register_fund_evo,          },
-    { "evo",                &protx_register_prepare,           },
-    { "evo",                &protx_register_prepare_evo,       },
-    { "evo",                &protx_update_service,             },
-    { "evo",                &protx_update_service_evo,         },
-    { "evo",                &protx_register_submit,            },
-    { "evo",                &protx_update_registrar,           },
-    { "evo",                &protx_revoke,                     },
-    { "hidden",             &protx_register_legacy,            },
-    { "hidden",             &protx_register_fund_legacy,       },
-    { "hidden",             &protx_register_prepare_legacy,    },
-    { "hidden",             &protx_update_registrar_legacy,    },
-};
-// clang-format on
+    static const CRPCCommand commands[]{
+        {"evo", &protx_list},
+        {"evo", &protx_info},
+        {"evo", &protx_register},
+        {"evo", &protx_register_evo},
+        {"evo", &protx_register_fund},
+        {"evo", &protx_register_fund_evo},
+        {"evo", &protx_register_prepare},
+        {"evo", &protx_register_prepare_evo},
+        {"evo", &protx_update_service},
+        {"evo", &protx_update_service_evo},
+        {"evo", &protx_register_submit},
+        {"evo", &protx_update_registrar},
+        {"evo", &protx_revoke},
+        {"hidden", &protx_register_legacy},
+        {"hidden", &protx_register_fund_legacy},
+        {"hidden", &protx_register_prepare_legacy},
+        {"hidden", &protx_update_registrar_legacy},
+    };
     return commands;
 }
 #endif // ENABLE_WALLET
 
 void RegisterEvoRPCCommands(CRPCTable& tableRPC)
 {
-// clang-format off
-static const CRPCCommand commands[] =
-{ //  category              actor (function)
-  //  --------------------- -----------------------
-    { "evo",                &bls_help,                         },
-    { "evo",                &bls_generate,                     },
-    { "evo",                &bls_fromsecret,                   },
-    { "evo",                &protx_help,                       },
-    { "evo",                &protx_diff,                       },
-    { "evo",                &protx_listdiff,                   },
-};
-static const CRPCCommand commands_wallet[] =
-{
-    { "evo",                &protx_list,                       },
-    { "evo",                &protx_info,                       },
-};
-// clang-format on
+    static const CRPCCommand commands[]{
+        {"evo", &bls_help},
+        {"evo", &bls_generate},
+        {"evo", &bls_fromsecret},
+        {"evo", &protx_help},
+        {"evo", &protx_diff},
+        {"evo", &protx_listdiff},
+    };
+    static const CRPCCommand commands_wallet[]{
+        {"evo", &protx_list},
+        {"evo", &protx_info},
+    };
     for (const auto& command : commands) {
         tableRPC.appendCommand(command.name, &command);
     }
diff --git a/src/rpc/governance.cpp b/src/rpc/governance.cpp
index ea66057b457c..abbffc93804a 100644
--- a/src/rpc/governance.cpp
+++ b/src/rpc/governance.cpp
@@ -1052,41 +1052,32 @@ static RPCHelpMan getsuperblockbudget()
 #ifdef ENABLE_WALLET
 Span<const CRPCCommand> GetWalletGovernanceRPCCommands()
 {
-// clang-format off
-static const CRPCCommand commands[] =
-{ //  category              actor (function)
-  //  --------------------- -----------------------
-    { "dash",               &gobject_prepare,           },
-    { "dash",               &gobject_list_prepared,     },
-    { "dash",               &gobject_vote_many,         },
-    { "dash",               &gobject_vote_alias,        },
-};
-// clang-format on
+    static const CRPCCommand commands[]{
+        {"dash", &gobject_prepare},
+        {"dash", &gobject_list_prepared},
+        {"dash", &gobject_vote_many},
+        {"dash", &gobject_vote_alias},
+    };
     return commands;
 }
 #endif // ENABLE_WALLET
 
 void RegisterGovernanceRPCCommands(CRPCTable &t)
 {
-// clang-format off
-static const CRPCCommand commands[] =
-{ //  category              actor (function)
-  //  --------------------- -----------------------
-    /* Dash features */
-    { "dash",               &getgovernanceinfo,         },
-    { "dash",               &getsuperblockbudget,       },
-    { "dash",               &gobject,                   },
-    { "dash",               &gobject_count,             },
-    { "dash",               &gobject_deserialize,       },
-    { "dash",               &gobject_check,             },
-    { "dash",               &gobject_submit,            },
-    { "dash",               &gobject_list,              },
-    { "dash",               &gobject_diff,              },
-    { "dash",               &gobject_get,               },
-    { "dash",               &gobject_getcurrentvotes,   },
-    { "dash",               &voteraw,                   },
-};
-// clang-format on
+    static const CRPCCommand commands[]{
+        {"dash", &getgovernanceinfo},
+        {"dash", &getsuperblockbudget},
+        {"dash", &gobject},
+        {"dash", &gobject_count},
+        {"dash", &gobject_deserialize},
+        {"dash", &gobject_check},
+        {"dash", &gobject_submit},
+        {"dash", &gobject_list},
+        {"dash", &gobject_diff},
+        {"dash", &gobject_get},
+        {"dash", &gobject_getcurrentvotes},
+        {"dash", &voteraw},
+    };
     for (const auto& command : commands) {
         t.appendCommand(command.name, &command);
     }
diff --git a/src/rpc/masternode.cpp b/src/rpc/masternode.cpp
index 727b20e9ebf5..d3fc88b11f97 100644
--- a/src/rpc/masternode.cpp
+++ b/src/rpc/masternode.cpp
@@ -679,33 +679,25 @@ static RPCHelpMan masternodelist_composite()
 #ifdef ENABLE_WALLET
 Span<const CRPCCommand> GetWalletMasternodeRPCCommands()
 {
-// clang-format off
-static const CRPCCommand commands[] =
-{ //  category              actor (function)
-  //  --------------------- -----------------------
-    { "dash",               &masternode_outputs,       },
-};
-// clang-format on
+    static const CRPCCommand commands[]{
+        {"dash", &masternode_outputs},
+    };
     return commands;
 }
 #endif // ENABLE_WALLET
 
 void RegisterMasternodeRPCCommands(CRPCTable &t)
 {
-// clang-format off
-static const CRPCCommand commands[] =
-{ //  category              actor (function)
-  //  --------------------- -----------------------
-    { "dash",               &masternode_help,          },
-    { "dash",               &masternodelist_composite, },
-    { "dash",               &masternodelist,           },
-    { "dash",               &masternode_connect,       },
-    { "dash",               &masternode_count,         },
-    { "dash",               &masternode_status,        },
-    { "dash",               &masternode_payments,      },
-    { "dash",               &masternode_winners,       },
-};
-// clang-format on
+    static const CRPCCommand commands[]{
+        {"dash", &masternode_help},
+        {"dash", &masternodelist_composite},
+        {"dash", &masternodelist},
+        {"dash", &masternode_connect},
+        {"dash", &masternode_count},
+        {"dash", &masternode_status},
+        {"dash", &masternode_payments},
+        {"dash", &masternode_winners},
+    };
     for (const auto& command : commands) {
         t.appendCommand(command.name, &command);
     }
diff --git a/src/rpc/mempool.cpp b/src/rpc/mempool.cpp
index 165ea861df88..929ac1037099 100644
--- a/src/rpc/mempool.cpp
+++ b/src/rpc/mempool.cpp
@@ -683,8 +683,6 @@ static RPCHelpMan savemempool()
 void RegisterMempoolRPCCommands(CRPCTable& t)
 {
     static const CRPCCommand commands[]{
-        // category     actor (function)
-        // --------     ----------------
         {"rawtransactions", &sendrawtransaction},
         {"rawtransactions", &testmempoolaccept},
         {"blockchain", &getmempoolancestors},
diff --git a/src/rpc/mining.cpp b/src/rpc/mining.cpp
index d055d17d7bfd..8755ae72b33f 100644
--- a/src/rpc/mining.cpp
+++ b/src/rpc/mining.cpp
@@ -1094,24 +1094,18 @@ static RPCHelpMan submitheader()
 
 void RegisterMiningRPCCommands(CRPCTable& t)
 {
-// clang-format off
-static const CRPCCommand commands[] =
-{ //  category               actor (function)
-  //  ---------------------  -----------------------
-    { "mining",              &getnetworkhashps,        },
-    { "mining",              &getmininginfo,           },
-    { "mining",              &prioritisetransaction,   },
-    { "mining",              &getblocktemplate,        },
-    { "mining",              &submitblock,             },
-    { "mining",              &submitheader,            },
-
-    { "hidden",              &generatetoaddress,       },
-    { "hidden",              &generatetodescriptor,    },
-    { "hidden",              &generateblock,           },
-
-    { "hidden",              &generate,                },
-};
-// clang-format on
+    static const CRPCCommand commands[]{
+        {"mining", &getnetworkhashps},
+        {"mining", &getmininginfo},
+        {"mining", &prioritisetransaction},
+        {"mining", &getblocktemplate},
+        {"mining", &submitblock},
+        {"mining", &submitheader},
+        {"hidden", &generatetoaddress},
+        {"hidden", &generatetodescriptor},
+        {"hidden", &generateblock},
+        {"hidden", &generate},
+    };
     for (const auto& c : commands) {
         t.appendCommand(c.name, &c);
     }
diff --git a/src/rpc/net.cpp b/src/rpc/net.cpp
index e77eeba6cb8d..fbd72f6c349d 100644
--- a/src/rpc/net.cpp
+++ b/src/rpc/net.cpp
@@ -1112,31 +1112,26 @@ static RPCHelpMan setmnthreadactive()
 
 void RegisterNetRPCCommands(CRPCTable &t)
 {
-// clang-format off
-static const CRPCCommand commands[] =
-{ //  category              actor
-  //  --------------------- -----------------------
-    { "network",             &getconnectioncount,      },
-    { "network",             &ping,                    },
-    { "network",             &getpeerinfo,             },
-    { "network",             &addnode,                 },
-    { "network",             &disconnectnode,          },
-    { "network",             &getaddednodeinfo,        },
-    { "network",             &getnettotals,            },
-    { "network",             &getnetworkinfo,          },
-    { "network",             &setban,                  },
-    { "network",             &listbanned,              },
-    { "network",             &clearbanned,             },
-    { "network",             &setnetworkactive,        },
-    { "network",             &getnodeaddresses,        },
-
-    { "hidden",              &cleardiscouraged,        },
-    { "hidden",              &addconnection,           },
-    { "hidden",              &addpeeraddress,          },
-    { "hidden",              &sendmsgtopeer            },
-    { "hidden",              &setmnthreadactive        },
-};
-// clang-format on
+    static const CRPCCommand commands[]{
+        {"network", &getconnectioncount},
+        {"network", &ping},
+        {"network", &getpeerinfo},
+        {"network", &addnode},
+        {"network", &disconnectnode},
+        {"network", &getaddednodeinfo},
+        {"network", &getnettotals},
+        {"network", &getnetworkinfo},
+        {"network", &setban},
+        {"network", &listbanned},
+        {"network", &clearbanned},
+        {"network", &setnetworkactive},
+        {"network", &getnodeaddresses},
+        {"hidden", &cleardiscouraged},
+        {"hidden", &addconnection},
+        {"hidden", &addpeeraddress},
+        {"hidden", &sendmsgtopeer},
+        {"hidden", &setmnthreadactive},
+    };
     for (const auto& c : commands) {
         t.appendCommand(c.name, &c);
     }
diff --git a/src/rpc/quorums.cpp b/src/rpc/quorums.cpp
index a9b3b88d3455..b12b738f9046 100644
--- a/src/rpc/quorums.cpp
+++ b/src/rpc/quorums.cpp
@@ -1155,32 +1155,28 @@ static RPCHelpMan submitchainlock()
 
 void RegisterQuorumsRPCCommands(CRPCTable &tableRPC)
 {
-// clang-format off
-static const CRPCCommand commands[] =
-{ //  category              actor (function)
-  //  --------------------- -----------------------
-    { "evo",                &quorum_help,            },
-    { "evo",                &quorum_list,            },
-    { "evo",                &quorum_list_extended,   },
-    { "evo",                &quorum_info,            },
-    { "evo",                &quorum_dkginfo,         },
-    { "evo",                &quorum_dkgstatus,       },
-    { "evo",                &quorum_memberof,        },
-    { "evo",                &quorum_sign,            },
-    { "evo",                &quorum_platformsign,    },
-    { "evo",                &quorum_verify,          },
-    { "evo",                &quorum_hasrecsig,       },
-    { "evo",                &quorum_getrecsig,       },
-    { "evo",                &quorum_isconflicting,   },
-    { "evo",                &quorum_selectquorum,    },
-    { "evo",                &quorum_dkgsimerror,     },
-    { "evo",                &quorum_getdata,         },
-    { "evo",                &quorum_rotationinfo,    },
-    { "evo",                &submitchainlock,        },
-    { "evo",                &verifychainlock,        },
-    { "evo",                &verifyislock,           },
-};
-// clang-format on
+    static const CRPCCommand commands[]{
+        {"evo", &quorum_help},
+        {"evo", &quorum_list},
+        {"evo", &quorum_list_extended},
+        {"evo", &quorum_info},
+        {"evo", &quorum_dkginfo},
+        {"evo", &quorum_dkgstatus},
+        {"evo", &quorum_memberof},
+        {"evo", &quorum_sign},
+        {"evo", &quorum_platformsign},
+        {"evo", &quorum_verify},
+        {"evo", &quorum_hasrecsig},
+        {"evo", &quorum_getrecsig},
+        {"evo", &quorum_isconflicting},
+        {"evo", &quorum_selectquorum},
+        {"evo", &quorum_dkgsimerror},
+        {"evo", &quorum_getdata},
+        {"evo", &quorum_rotationinfo},
+        {"evo", &submitchainlock},
+        {"evo", &verifychainlock},
+        {"evo", &verifyislock},
+    };
     for (const auto& command : commands) {
         tableRPC.appendCommand(command.name, &command);
     }
diff --git a/src/rpc/rawtransaction.cpp b/src/rpc/rawtransaction.cpp
index 77de92f39f67..379e56a39e50 100644
--- a/src/rpc/rawtransaction.cpp
+++ b/src/rpc/rawtransaction.cpp
@@ -1909,32 +1909,28 @@ static RPCHelpMan analyzepsbt()
     };
 }
 
-void RegisterRawTransactionRPCCommands(CRPCTable &t)
+void RegisterRawTransactionRPCCommands(CRPCTable& t)
 {
-// clang-format off
-static const CRPCCommand commands[] =
-{ //  category               actor (function)
-  //  ---------------------  -----------------------
-    { "rawtransactions",     &getassetunlockstatuses,     },
-    { "rawtransactions",     &getrawtransaction,          },
-    { "rawtransactions",     &getrawtransactionmulti,     },
-    { "rawtransactions",     &getislocks,                 },
-    { "rawtransactions",     &gettxchainlocks,            },
-    { "rawtransactions",     &createrawtransaction,       },
-    { "rawtransactions",     &decoderawtransaction,       },
-    { "rawtransactions",     &decodescript,               },
-    { "rawtransactions",     &combinerawtransaction,      },
-    { "rawtransactions",     &signrawtransactionwithkey,  },
-    { "rawtransactions",     &decodepsbt,                 },
-    { "rawtransactions",     &combinepsbt,                },
-    { "rawtransactions",     &finalizepsbt,               },
-    { "rawtransactions",     &createpsbt,                 },
-    { "rawtransactions",     &converttopsbt,              },
-    { "rawtransactions",     &utxoupdatepsbt,             },
-    { "rawtransactions",     &joinpsbts,                  },
-    { "rawtransactions",     &analyzepsbt,                },
-};
-// clang-format on
+    static const CRPCCommand commands[]{
+        {"rawtransactions", &getassetunlockstatuses},
+        {"rawtransactions", &getrawtransaction},
+        {"rawtransactions", &getrawtransactionmulti},
+        {"rawtransactions", &getislocks},
+        {"rawtransactions", &gettxchainlocks},
+        {"rawtransactions", &createrawtransaction},
+        {"rawtransactions", &decoderawtransaction},
+        {"rawtransactions", &decodescript},
+        {"rawtransactions", &combinerawtransaction},
+        {"rawtransactions", &signrawtransactionwithkey},
+        {"rawtransactions", &decodepsbt},
+        {"rawtransactions", &combinepsbt},
+        {"rawtransactions", &finalizepsbt},
+        {"rawtransactions", &createpsbt},
+        {"rawtransactions", &converttopsbt},
+        {"rawtransactions", &utxoupdatepsbt},
+        {"rawtransactions", &joinpsbts},
+        {"rawtransactions", &analyzepsbt},
+    };
     for (const auto& c : commands) {
         t.appendCommand(c.name, &c);
     }
diff --git a/src/rpc/server.cpp b/src/rpc/server.cpp
index 80e07ad9b1d5..55c79374acea 100644
--- a/src/rpc/server.cpp
+++ b/src/rpc/server.cpp
@@ -266,17 +266,14 @@ static RPCHelpMan getrpcinfo()
 }
     };
 }
-// clang-format off
-static const CRPCCommand vRPCCommands[] =
-{ //  category               actor (function)
-  //  ---------------------  -----------------------
+
+static const CRPCCommand vRPCCommands[]{
     /* Overall control/query calls */
-    { "control",             &getrpcinfo,             },
-    { "control",             &help,                   },
-    { "control",             &stop,                   },
-    { "control",             &uptime,                 },
+    {"control", &getrpcinfo},
+    {"control", &help},
+    {"control", &stop},
+    {"control", &uptime},
 };
-// clang-format on
 
 CRPCTable::CRPCTable()
 {
diff --git a/src/rpc/txoutproof.cpp b/src/rpc/txoutproof.cpp
index 45de1e39d2c0..168a47cb1a87 100644
--- a/src/rpc/txoutproof.cpp
+++ b/src/rpc/txoutproof.cpp
@@ -177,8 +177,6 @@ static RPCHelpMan verifytxoutproof()
 void RegisterTxoutProofRPCCommands(CRPCTable& t)
 {
     static const CRPCCommand commands[]{
-        // category     actor (function)
-        // --------     ----------------
         {"blockchain", &gettxoutproof},
         {"blockchain", &verifytxoutproof},
     };
diff --git a/src/wallet/rpc/wallet.cpp b/src/wallet/rpc/wallet.cpp
index d7fdae8cd609..b55a93fe5185 100644
--- a/src/wallet/rpc/wallet.cpp
+++ b/src/wallet/rpc/wallet.cpp
@@ -1153,81 +1153,77 @@ RPCHelpMan abortrescan();
 
 Span<const CRPCCommand> GetWalletRPCCommands()
 {
-// clang-format off
-static const CRPCCommand commands[] =
-{ //  category              actor (function)
-  //  ------------------    ------------------------
-    { "rawtransactions",    &fundrawtransaction,             },
-    { "wallet",             &abandontransaction,             },
-    { "wallet",             &abortrescan,                    },
-    { "wallet",             &addmultisigaddress,             },
-    { "wallet",             &backupwallet,                   },
-    { "wallet",             &createwallet,                   },
-    { "wallet",             &restorewallet,                  },
-    { "wallet",             &dumphdinfo,                     },
-    { "wallet",             &dumpprivkey,                    },
-    { "wallet",             &dumpwallet,                     },
-    { "wallet",             &encryptwallet,                  },
-    { "wallet",             &getaddressesbylabel,            },
-    { "wallet",             &getaddressinfo,                 },
-    { "wallet",             &getbalance,                     },
-    { "wallet",             &getnewaddress,                  },
-    { "wallet",             &getrawchangeaddress,            },
-    { "wallet",             &getreceivedbyaddress,           },
-    { "wallet",             &getreceivedbylabel,             },
-    { "wallet",             &gettransaction,                 },
-    { "wallet",             &getunconfirmedbalance,          },
-    { "wallet",             &getbalances,                    },
-    { "wallet",             &getwalletinfo,                  },
-    { "wallet",             &importaddress,                  },
-    { "wallet",             &importelectrumwallet,           },
-    { "wallet",             &importdescriptors,              },
-    { "wallet",             &importmulti,                    },
-    { "wallet",             &importprivkey,                  },
-    { "wallet",             &importprunedfunds,              },
-    { "wallet",             &importpubkey,                   },
-    { "wallet",             &importwallet,                   },
-    { "wallet",             &keypoolrefill,                  },
-    { "wallet",             &listaddressbalances,            },
-    { "wallet",             &listaddressgroupings,           },
-    { "wallet",             &listdescriptors,                },
-    { "wallet",             &listlabels,                     },
-    { "wallet",             &listlockunspent,                },
-    { "wallet",             &listreceivedbyaddress,          },
-    { "wallet",             &listreceivedbylabel,            },
-    { "wallet",             &listsinceblock,                 },
-    { "wallet",             &listtransactions,               },
-    { "wallet",             &listunspent,                    },
-    { "wallet",             &listwalletdir,                  },
-    { "wallet",             &listwallets,                    },
-    { "wallet",             &loadwallet,                     },
-    { "wallet",             &lockunspent,                    },
-    { "wallet",             &newkeypool,                     },
-    { "wallet",             &removeprunedfunds,              },
-    { "wallet",             &rescanblockchain,               },
-    { "wallet",             &send,                           },
-    { "wallet",             &sendmany,                       },
-    { "wallet",             &sendtoaddress,                  },
-    { "wallet",             &sethdseed,                      },
-    { "wallet",             &setcoinjoinrounds,              },
-    { "wallet",             &setcoinjoinamount,              },
-    { "wallet",             &setlabel,                       },
-    { "wallet",             &settxfee,                       },
-    { "wallet",             &setwalletflag,                  },
-    { "wallet",             &signmessage,                    },
-    { "wallet",             &signrawtransactionwithwallet,   },
-    { "wallet",             &simulaterawtransaction,         },
-    { "wallet",             &unloadwallet,                   },
-    { "wallet",             &upgradewallet,                  },
-    { "wallet",             &upgradetohd,                    },
-    { "wallet",             &walletlock,                     },
-    { "wallet",             &walletpassphrasechange,         },
-    { "wallet",             &walletpassphrase,               },
-    { "wallet",             &walletprocesspsbt,              },
-    { "wallet",             &walletcreatefundedpsbt,         },
-    { "wallet",             &wipewallettxes,                 },
-};
-// clang-format on
+    static const CRPCCommand commands[]{
+        {"rawtransactions", &fundrawtransaction},
+        {"wallet", &abandontransaction},
+        {"wallet", &abortrescan},
+        {"wallet", &addmultisigaddress},
+        {"wallet", &backupwallet},
+        {"wallet", &createwallet},
+        {"wallet", &restorewallet},
+        {"wallet", &dumphdinfo},
+        {"wallet", &dumpprivkey},
+        {"wallet", &dumpwallet},
+        {"wallet", &encryptwallet},
+        {"wallet", &getaddressesbylabel},
+        {"wallet", &getaddressinfo},
+        {"wallet", &getbalance},
+        {"wallet", &getnewaddress},
+        {"wallet", &getrawchangeaddress},
+        {"wallet", &getreceivedbyaddress},
+        {"wallet", &getreceivedbylabel},
+        {"wallet", &gettransaction},
+        {"wallet", &getunconfirmedbalance},
+        {"wallet", &getbalances},
+        {"wallet", &getwalletinfo},
+        {"wallet", &importaddress},
+        {"wallet", &importelectrumwallet},
+        {"wallet", &importdescriptors},
+        {"wallet", &importmulti},
+        {"wallet", &importprivkey},
+        {"wallet", &importprunedfunds},
+        {"wallet", &importpubkey},
+        {"wallet", &importwallet},
+        {"wallet", &keypoolrefill},
+        {"wallet", &listaddressbalances},
+        {"wallet", &listaddressgroupings},
+        {"wallet", &listdescriptors},
+        {"wallet", &listlabels},
+        {"wallet", &listlockunspent},
+        {"wallet", &listreceivedbyaddress},
+        {"wallet", &listreceivedbylabel},
+        {"wallet", &listsinceblock},
+        {"wallet", &listtransactions},
+        {"wallet", &listunspent},
+        {"wallet", &listwalletdir},
+        {"wallet", &listwallets},
+        {"wallet", &loadwallet},
+        {"wallet", &lockunspent},
+        {"wallet", &newkeypool},
+        {"wallet", &removeprunedfunds},
+        {"wallet", &rescanblockchain},
+        {"wallet", &send},
+        {"wallet", &sendmany},
+        {"wallet", &sendtoaddress},
+        {"wallet", &sethdseed},
+        {"wallet", &setcoinjoinrounds},
+        {"wallet", &setcoinjoinamount},
+        {"wallet", &setlabel},
+        {"wallet", &settxfee},
+        {"wallet", &setwalletflag},
+        {"wallet", &signmessage},
+        {"wallet", &signrawtransactionwithwallet},
+        {"wallet", &simulaterawtransaction},
+        {"wallet", &unloadwallet},
+        {"wallet", &upgradewallet},
+        {"wallet", &upgradetohd},
+        {"wallet", &walletlock},
+        {"wallet", &walletpassphrasechange},
+        {"wallet", &walletpassphrase},
+        {"wallet", &walletprocesspsbt},
+        {"wallet", &walletcreatefundedpsbt},
+        {"wallet", &wipewallettxes},
+    };
     return commands;
 }
 } // namespace wallet
diff --git a/src/zmq/zmqrpc.cpp b/src/zmq/zmqrpc.cpp
index 7aa933248a0b..7ae3cf0c1e65 100644
--- a/src/zmq/zmqrpc.cpp
+++ b/src/zmq/zmqrpc.cpp
@@ -51,10 +51,8 @@ static RPCHelpMan getzmqnotifications()
     };
 }
 
-const CRPCCommand commands[] =
-{ //  category           actor (function)
-  //  -----------------  -----------------------
-    { "zmq",             &getzmqnotifications,    },
+const CRPCCommand commands[]{
+    {"zmq", &getzmqnotifications},
 };
 
 } // anonymous namespace

From 674557538e1f5db60b480a5ab6fabe604d79b2a3 Mon Sep 17 00:00:00 2001
From: MacroFake <falke.marco@gmail.com>
Date: Mon, 23 May 2022 09:40:49 +0200
Subject: [PATCH 083/656] Merge bitcoin/bitcoin#25184: refactor: Remove defunct
 attributes.h includes

71a8dbe5da0ec2c17c448eb3303eb30615869813 refactor: Remove defunct attributes.h includes (Ben Woosley)

Pull request description:

  Since the removal of NODISCARD in 81d5af42f4dba5b68a597536cad7f61894dc22a3,
  the only attributes.h def is LIFETIMEBOUND, and it's included in many more
  places that it is used.

  This removes all includes which do not have an associated use of LIFETIMEBOUND,
  and adds it to the following files, due to their use of the same:
  * src/validationinterface.h
  * src/script/standard.h

  See also #20499.

Top commit has no ACKs.

Tree-SHA512: f3e10a5cda5ab78371b77b702f4a241ff69d490a16cc6059f1a4202b97c584accdbc951cc7b6120eae94bee3b9249e9117b45cf6ed1a5228ca23b5638fcf7b7b
---
 src/base58.h                | 1 -
 src/core_io.h               | 1 -
 src/init.cpp                | 1 -
 src/netaddress.h            | 1 -
 src/node/transaction.h      | 1 -
 src/psbt.h                  | 1 -
 src/script/standard.h       | 1 +
 src/test/fuzz/util.h        | 1 -
 src/util/moneystr.h         | 1 -
 src/util/strencodings.h     | 1 -
 src/util/system.h           | 1 -
 src/validationinterface.cpp | 1 +
 12 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/src/base58.h b/src/base58.h
index 9ba5af73e059..d2a8d5e3bc47 100644
--- a/src/base58.h
+++ b/src/base58.h
@@ -14,7 +14,6 @@
 #ifndef BITCOIN_BASE58_H
 #define BITCOIN_BASE58_H
 
-#include <attributes.h>
 #include <span.h>
 
 #include <string>
diff --git a/src/core_io.h b/src/core_io.h
index d3f424d1363f..8dd365f95518 100644
--- a/src/core_io.h
+++ b/src/core_io.h
@@ -5,7 +5,6 @@
 #ifndef BITCOIN_CORE_IO_H
 #define BITCOIN_CORE_IO_H
 
-#include <attributes.h>
 #include <consensus/amount.h>
 
 #include <string>
diff --git a/src/init.cpp b/src/init.cpp
index 25b2ca72090c..805d208e2c55 100644
--- a/src/init.cpp
+++ b/src/init.cpp
@@ -121,7 +121,6 @@
 #include <vector>
 
 #ifndef WIN32
-#include <attributes.h>
 #include <cerrno>
 #include <signal.h>
 #include <sys/stat.h>
diff --git a/src/netaddress.h b/src/netaddress.h
index 053b3369fc61..eb5a822a38a3 100644
--- a/src/netaddress.h
+++ b/src/netaddress.h
@@ -9,7 +9,6 @@
 #include <config/bitcoin-config.h>
 #endif
 
-#include <attributes.h>
 #include <compat/compat.h>
 #include <crypto/siphash.h>
 #include <prevector.h>
diff --git a/src/node/transaction.h b/src/node/transaction.h
index 3156e841e594..9617c1f99b92 100644
--- a/src/node/transaction.h
+++ b/src/node/transaction.h
@@ -5,7 +5,6 @@
 #ifndef BITCOIN_NODE_TRANSACTION_H
 #define BITCOIN_NODE_TRANSACTION_H
 
-#include <attributes.h>
 #include <policy/feerate.h>
 #include <primitives/transaction.h>
 #include <util/error.h>
diff --git a/src/psbt.h b/src/psbt.h
index d3d778d8952a..7069a58e61f0 100644
--- a/src/psbt.h
+++ b/src/psbt.h
@@ -5,7 +5,6 @@
 #ifndef BITCOIN_PSBT_H
 #define BITCOIN_PSBT_H
 
-#include <attributes.h>
 #include <node/transaction.h>
 #include <policy/feerate.h>
 #include <primitives/transaction.h>
diff --git a/src/script/standard.h b/src/script/standard.h
index 650b95fac890..1b047f1925ce 100644
--- a/src/script/standard.h
+++ b/src/script/standard.h
@@ -6,6 +6,7 @@
 #ifndef BITCOIN_SCRIPT_STANDARD_H
 #define BITCOIN_SCRIPT_STANDARD_H
 
+#include <pubkey.h>
 #include <script/interpreter.h>
 #include <uint256.h>
 #include <util/hash_type.h>
diff --git a/src/test/fuzz/util.h b/src/test/fuzz/util.h
index 0df12081c3a5..c3e5ff98519f 100644
--- a/src/test/fuzz/util.h
+++ b/src/test/fuzz/util.h
@@ -6,7 +6,6 @@
 #define BITCOIN_TEST_FUZZ_UTIL_H
 
 #include <arith_uint256.h>
-#include <attributes.h>
 #include <chainparamsbase.h>
 #include <coins.h>
 #include <compat/compat.h>
diff --git a/src/util/moneystr.h b/src/util/moneystr.h
index 8180604342f1..3d33bd7f995f 100644
--- a/src/util/moneystr.h
+++ b/src/util/moneystr.h
@@ -9,7 +9,6 @@
 #ifndef BITCOIN_UTIL_MONEYSTR_H
 #define BITCOIN_UTIL_MONEYSTR_H
 
-#include <attributes.h>
 #include <consensus/amount.h>
 
 #include <optional>
diff --git a/src/util/strencodings.h b/src/util/strencodings.h
index e6de59e3a1a5..322efe2b3142 100644
--- a/src/util/strencodings.h
+++ b/src/util/strencodings.h
@@ -9,7 +9,6 @@
 #ifndef BITCOIN_UTIL_STRENCODINGS_H
 #define BITCOIN_UTIL_STRENCODINGS_H
 
-#include <attributes.h>
 #include <span.h>
 #include <util/string.h>
 
diff --git a/src/util/system.h b/src/util/system.h
index 89e3c456573d..8837b7666d2b 100644
--- a/src/util/system.h
+++ b/src/util/system.h
@@ -15,7 +15,6 @@
 #include <config/bitcoin-config.h>
 #endif
 
-#include <attributes.h>
 #include <compat/assumptions.h>
 #include <compat/compat.h>
 #include <consensus/amount.h>
diff --git a/src/validationinterface.cpp b/src/validationinterface.cpp
index c0acb1a4ee4d..88668ea79bbe 100644
--- a/src/validationinterface.cpp
+++ b/src/validationinterface.cpp
@@ -5,6 +5,7 @@
 
 #include <validationinterface.h>
 
+#include <attributes.h>
 #include <chain.h>
 #include <consensus/validation.h>
 #include <logging.h>

From 950aedd48302588833a1fae8d078497e495f556d Mon Sep 17 00:00:00 2001
From: Konstantin Akimov <knstqq@gmail.com>
Date: Thu, 9 Oct 2025 03:12:34 +0700
Subject: [PATCH 084/656] fix: cppcheck warnings after removing attributes.h

    src/evo/netinfo.h:198:5: warning: Class 'NetInfoEntry' has a constructor with 1 argument that is not explicit. [noExplicitConstructor]
    src/evo/netinfo.h:204:5: warning: Class 'NetInfoEntry' has a constructor with 1 argument that is not explicit. [noExplicitConstructor]
    src/evo/netinfo.h:223:25: note: Shadowed declaration
    src/evo/netinfo.h:226:32: warning: Local variable 'data_ptr' shadows outer variable [shadowVariable]
    src/stacktraces.cpp:431:20: warning: Passing the result of c_str() to a function that takes std::string_view as argument no. 1 is slow and redundant. [stlcstrParam]

    Advice not applicable in this specific case? Add an exception by updating
    IGNORED_WARNINGS in /__w/dash/dash/test/lint/lint-cppcheck-dash.sh
---
 src/evo/netinfo.h   | 18 +++++++++---------
 src/stacktraces.cpp |  2 +-
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/evo/netinfo.h b/src/evo/netinfo.h
index 3ea51992b79e..0f33649de0fd 100644
--- a/src/evo/netinfo.h
+++ b/src/evo/netinfo.h
@@ -195,20 +195,20 @@ class NetInfoEntry
 
 public:
     NetInfoEntry() = default;
-    NetInfoEntry(const DomainPort& domain)
+    explicit NetInfoEntry(const DomainPort& domain)
     {
         if (!domain.IsValid()) return;
         m_type = NetInfoType::Domain;
         m_data = domain;
     }
-    NetInfoEntry(const CService& service)
+    explicit NetInfoEntry(const CService& service)
     {
         if (!service.IsValid()) return;
         m_type = NetInfoType::Service;
         m_data = service;
     }
     template <typename Stream>
-    NetInfoEntry(deserialize_type, Stream& s) { s >> *this; }
+    explicit NetInfoEntry(deserialize_type, Stream& s) { s >> *this; }
 
     ~NetInfoEntry() = default;
 
@@ -220,12 +220,12 @@ class NetInfoEntry
     void Serialize(Stream& s_) const
     {
         OverrideStream<Stream> s(&s_, /*nType=*/0, s_.GetVersion() | ADDRV2_FORMAT);
-        if (const auto* data_ptr{std::get_if<CService>(&m_data)};
-            m_type == NetInfoType::Service && data_ptr && data_ptr->IsValid()) {
-            s << m_type << *data_ptr;
-        } else if (const auto* data_ptr{std::get_if<DomainPort>(&m_data)};
-                   m_type == NetInfoType::Domain && data_ptr && data_ptr->IsValid()) {
-            s << m_type << *data_ptr;
+        if (const auto* data_ptr_service{std::get_if<CService>(&m_data)};
+            m_type == NetInfoType::Service && data_ptr_service && data_ptr_service->IsValid()) {
+            s << m_type << *data_ptr_service;
+        } else if (const auto* data_ptr_domain{std::get_if<DomainPort>(&m_data)};
+                   m_type == NetInfoType::Domain && data_ptr_domain && data_ptr_domain->IsValid()) {
+            s << m_type << *data_ptr_domain;
         } else {
             s << NetInfoType::Invalid;
         }
diff --git a/src/stacktraces.cpp b/src/stacktraces.cpp
index fb364df9fa45..85a0e15b3aae 100644
--- a/src/stacktraces.cpp
+++ b/src/stacktraces.cpp
@@ -428,7 +428,7 @@ std::string GetCrashInfoStrFromSerializedStr(const std::string& ciStr)
 {
     static uint64_t basePtr = GetBaseAddress();
 
-    auto opt_buf = DecodeBase32(ciStr.c_str());
+    auto opt_buf = DecodeBase32(ciStr);
     if (!opt_buf.has_value() || opt_buf->empty()) {
         return "Error while deserializing crash info";
     }

From b396f98ae263a9cdab7f1c55849919b186b9a77e Mon Sep 17 00:00:00 2001
From: Konstantin Akimov <knstqq@gmail.com>
Date: Thu, 9 Oct 2025 03:26:08 +0700
Subject: [PATCH 085/656] fix: compilation error with newer clang-20

`hana` still uses spaces before literal operator, while clang enforces C++23 requirement
    In file included from ./evo/dmnstate.h:19:
    In file included from DASH/depends/x86_64-pc-linux-gnu/include/boost/hana/for_each.hpp:15:
    In file included from DASH/depends/x86_64-pc-linux-gnu/include/boost/hana/concept/foldable.hpp:19:
    In file included from DASH/depends/x86_64-pc-linux-gnu/include/boost/hana/fold_left.hpp:20:
    In file included from DASH/depends/x86_64-pc-linux-gnu/include/boost/hana/unpack.hpp:16:
    In file included from DASH/depends/x86_64-pc-linux-gnu/include/boost/hana/at.hpp:16:
    In file included from DASH/depends/x86_64-pc-linux-gnu/include/boost/hana/concept/iterable.hpp:20:
    In file included from DASH/depends/x86_64-pc-linux-gnu/include/boost/hana/drop_front.hpp:20:
    In file included from DASH/depends/x86_64-pc-linux-gnu/include/boost/hana/integral_constant.hpp:13:
    DASH/depends/x86_64-pc-linux-gnu/include/boost/hana/bool.hpp:198:35: error: identifier '_c' preceded by whitespace in a literal operator declaration is deprecated [-Werror,-Wdeprecated-literal-operator]
      198 |         constexpr auto operator"" _c() {
          |                        ~~~~~~~~~~~^~
          |                        operator""_c
---
 configure.ac | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/configure.ac b/configure.ac
index e9b2ccc15bdb..e7cf3d2183dd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -453,6 +453,15 @@ if test "$enable_werror" = "yes"; then
   fi
   ERROR_CXXFLAGS=$CXXFLAG_WERROR
 
+  dnl -Wdeprecated-literal-operator cause problems with clang 20. Do not treat these warnings as errors.
+  dnl TODO: remove it once we update hana
+  AX_CHECK_COMPILE_FLAG([-Wdeprecated-literal-operator], [NOWARN_CXXFLAGS="$NOWARN_CXXFLAGS -Wno-error=deprecated-literal-operator"], [], [$CXXFLAG_WERROR], [AC_LANG_SOURCE([
+    #if !defined(__clang__) || defined(__INTEL_COMPILER)
+      #error Non-clang compiler detected, not setting flag
+    #endif
+    int main(void) { return 0; }
+  ])])
+
   dnl -Wattributes cause problems with some versions of GCC. Do not treat these warnings as errors.
   AX_CHECK_COMPILE_FLAG([-Wattributes], [NOWARN_CXXFLAGS="$NOWARN_CXXFLAGS -Wno-error=attributes"], [], [$CXXFLAG_WERROR], [AC_LANG_SOURCE([
     #if defined(__clang__) || defined(__INTEL_COMPILER) || !defined(__GNUC__)

From 826221b298519d8772e58402097328ee1bb2700c Mon Sep 17 00:00:00 2001
From: UdjinM6 <UdjinM6@users.noreply.github.com>
Date: Fri, 10 Oct 2025 19:11:28 +0300
Subject: [PATCH 086/656] revert: Revert "merge bitcoin-core/gui#835: Fix crash
 when closing wallet"

This reverts commit 20763f1101484fa1bbaa46c6aa9b3aa7766c11b2.
---
 src/qt/walletcontroller.cpp | 18 ++++++++----------
 src/qt/walletcontroller.h   |  3 ---
 2 files changed, 8 insertions(+), 13 deletions(-)

diff --git a/src/qt/walletcontroller.cpp b/src/qt/walletcontroller.cpp
index 935727806bc7..eacb3ffc4832 100644
--- a/src/qt/walletcontroller.cpp
+++ b/src/qt/walletcontroller.cpp
@@ -78,14 +78,6 @@ std::map<std::string, bool> WalletController::listWalletDir() const
     return wallets;
 }
 
-void WalletController::removeWallet(WalletModel* wallet_model)
-{
-    // Once the wallet is successfully removed from the node, the model will emit the 'WalletModel::unload' signal.
-    // This signal is already connected and will complete the removal of the view from the GUI.
-    // Look at 'WalletController::getOrCreateWallet' for the signal connection.
-    wallet_model->wallet().remove();
-}
-
 void WalletController::closeWallet(WalletModel* wallet_model, QWidget* parent)
 {
     QMessageBox box(parent);
@@ -96,7 +88,10 @@ void WalletController::closeWallet(WalletModel* wallet_model, QWidget* parent)
     box.setDefaultButton(QMessageBox::Yes);
     if (box.exec() != QMessageBox::Yes) return;
 
-    removeWallet(wallet_model);
+    // First remove wallet from node.
+    wallet_model->wallet().remove();
+    // Now release the model.
+    removeAndDeleteWallet(wallet_model);
 }
 
 void WalletController::closeAllWallets(QWidget* parent)
@@ -109,8 +104,11 @@ void WalletController::closeAllWallets(QWidget* parent)
 
     QMutexLocker locker(&m_mutex);
     for (WalletModel* wallet_model : m_wallets) {
-        removeWallet(wallet_model);
+        wallet_model->wallet().remove();
+        Q_EMIT walletRemoved(wallet_model);
+        delete wallet_model;
     }
+    m_wallets.clear();
 }
 
 WalletModel* WalletController::getOrCreateWallet(std::unique_ptr<interfaces::Wallet> wallet)
diff --git a/src/qt/walletcontroller.h b/src/qt/walletcontroller.h
index 0546c7f9ebd1..ccb7dbc62d51 100644
--- a/src/qt/walletcontroller.h
+++ b/src/qt/walletcontroller.h
@@ -79,9 +79,6 @@ class WalletController : public QObject
     std::unique_ptr<interfaces::Handler> m_handler_load_wallet;
 
     friend class WalletControllerActivity;
-
-    //! Starts the wallet closure procedure
-    void removeWallet(WalletModel* wallet_model);
 };
 
 class WalletControllerActivity : public QObject

From 6f194e3b9839117b1b23c7fbb9626ab6abeb7efa Mon Sep 17 00:00:00 2001
From: Konstantin Akimov <knstqq@gmail.com>
Date: Thu, 9 Oct 2025 20:28:06 +0700
Subject: [PATCH 087/656] refactor: merge mutexes cs_mapSporksCachedActive and
 cs_mapSporksCachedValues to cs_cache

Motivation: they are captured almost always together. Get one mutex is faster than get 2,
there are no performance benefits

Example of usage:

    WITH_LOCK(cs_mapSporksCachedActive, mapSporksCachedActive.erase(spork.nSporkID));
    WITH_LOCK(cs_mapSporksCachedValues, mapSporksCachedValues.erase(spork.nSporkID));
---
 src/spork.cpp | 21 +++++++++++++--------
 src/spork.h   | 10 +++++-----
 2 files changed, 18 insertions(+), 13 deletions(-)

diff --git a/src/spork.cpp b/src/spork.cpp
index 021ab690e139..0b66222d6911 100644
--- a/src/spork.cpp
+++ b/src/spork.cpp
@@ -31,7 +31,7 @@ std::optional<SporkValue> CSporkManager::SporkValueIfActive(SporkId nSporkID) co
     if (!mapSporksActive.count(nSporkID)) return std::nullopt;
 
     {
-        LOCK(cs_mapSporksCachedValues);
+        LOCK(cs_cache);
         if (auto it = mapSporksCachedValues.find(nSporkID); it != mapSporksCachedValues.end()) {
             return {it->second};
         }
@@ -45,7 +45,7 @@ std::optional<SporkValue> CSporkManager::SporkValueIfActive(SporkId nSporkID) co
             // nMinSporkKeys is always more than the half of the max spork keys number,
             // so there is only one such value and we can stop here
             {
-                LOCK(cs_mapSporksCachedValues);
+                LOCK(cs_cache);
                 mapSporksCachedValues[nSporkID] = spork.nValue;
             }
             return {spork.nValue};
@@ -184,8 +184,11 @@ MessageProcessingResult CSporkManager::ProcessSpork(NodeId from, CDataStream& vR
         mapSporksByHash[hash] = spork;
         mapSporksActive[spork.nSporkID][keyIDSigner] = spork;
         // Clear cached values on new spork being processed
-        WITH_LOCK(cs_mapSporksCachedActive, mapSporksCachedActive.erase(spork.nSporkID));
-        WITH_LOCK(cs_mapSporksCachedValues, mapSporksCachedValues.erase(spork.nSporkID));
+        {
+            LOCK(cs_cache);
+            mapSporksCachedActive.erase(spork.nSporkID);
+            mapSporksCachedValues.erase(spork.nSporkID);
+        }
     }
 
     ret.m_inventory.emplace_back(MSG_SPORK, hash);
@@ -226,8 +229,10 @@ bool CSporkManager::UpdateSpork(PeerManager& peerman, SporkId nSporkID, SporkVal
         mapSporksByHash[spork.GetHash()] = spork;
         mapSporksActive[nSporkID][*opt_keyIDSigner] = spork;
         // Clear cached values on new spork being processed
-        WITH_LOCK(cs_mapSporksCachedActive, mapSporksCachedActive.erase(spork.nSporkID));
-        WITH_LOCK(cs_mapSporksCachedValues, mapSporksCachedValues.erase(spork.nSporkID));
+
+        LOCK(cs_cache);
+        mapSporksCachedActive.erase(spork.nSporkID);
+        mapSporksCachedValues.erase(spork.nSporkID);
     }
 
     spork.Relay(peerman);
@@ -238,7 +243,7 @@ bool CSporkManager::IsSporkActive(SporkId nSporkID) const
 {
     // If nSporkID is cached, and the cached value is true, then return early true
     {
-        LOCK(cs_mapSporksCachedActive);
+        LOCK(cs_cache);
         if (auto it = mapSporksCachedActive.find(nSporkID); it != mapSporksCachedActive.end() && it->second) {
             return true;
         }
@@ -249,7 +254,7 @@ bool CSporkManager::IsSporkActive(SporkId nSporkID) const
     bool ret = nSporkValue < GetAdjustedTime();
     // Only cache true values
     if (ret) {
-        LOCK(cs_mapSporksCachedActive);
+        LOCK(cs_cache);
         mapSporksCachedActive[nSporkID] = ret;
     }
     return ret;
diff --git a/src/spork.h b/src/spork.h
index 6f348a50a93e..3841f3a04c1d 100644
--- a/src/spork.h
+++ b/src/spork.h
@@ -220,11 +220,11 @@ class CSporkManager : public SporkStore
     const std::unique_ptr<db_type> m_db;
     bool is_valid{false};
 
-    mutable Mutex cs_mapSporksCachedActive;
-    mutable std::unordered_map<const SporkId, bool> mapSporksCachedActive GUARDED_BY(cs_mapSporksCachedActive);
-
-    mutable Mutex cs_mapSporksCachedValues;
-    mutable std::unordered_map<SporkId, SporkValue> mapSporksCachedValues GUARDED_BY(cs_mapSporksCachedValues);
+    // TODO: drop mutex cs_cache completely so far as sporks are used on testnet only
+    // and simplify IsSporkActive to avoid any mutex for better mainnet performance
+    mutable Mutex cs_cache;
+    mutable std::unordered_map<const SporkId, bool> mapSporksCachedActive GUARDED_BY(cs_cache);
+    mutable std::unordered_map<SporkId, SporkValue> mapSporksCachedValues GUARDED_BY(cs_cache);
 
     std::set<CKeyID> setSporkPubKeyIDs GUARDED_BY(cs);
     int nMinSporkKeys GUARDED_BY(cs) {std::numeric_limits<int>::max()};

From badb221fe9ba9aea88ac7eef9a16d2adc7e7f225 Mon Sep 17 00:00:00 2001
From: Konstantin Akimov <knstqq@gmail.com>
Date: Thu, 9 Oct 2025 00:31:45 +0700
Subject: [PATCH 088/656] refactor: add missing thread safety annotations for
 dash specific code

---
 src/coinjoin/client.h         | 20 +++++------
 src/coinjoin/util.h           |  6 +++-
 src/evo/creditpool.h          |  9 ++---
 src/evo/deterministicmns.h    | 35 +++++++++++--------
 src/evo/mnhftx.h              | 15 ++++----
 src/governance/governance.cpp |  2 +-
 src/instantsend/instantsend.h |  9 ++---
 src/llmq/blockprocessor.h     | 33 +++++++++++-------
 src/llmq/debug.h              | 19 ++++++----
 src/llmq/dkgsession.h         | 15 ++++----
 src/llmq/dkgsessionhandler.h  | 35 +++++++++++--------
 src/llmq/dkgsessionmgr.h      | 11 ++++--
 src/llmq/quorums.h            | 53 +++++++++++++++++-----------
 src/llmq/signing.h            | 46 +++++++++++++++----------
 src/llmq/signing_shares.h     |  7 ++--
 src/net.h                     | 52 ++++++++++++++--------------
 src/net_processing.cpp        | 20 +++++------
 src/spork.h                   | 14 ++++----
 src/stats/client.cpp          | 65 ++++++++++++++++++++++++++++-------
 src/versionbits.h             |  2 +-
 20 files changed, 285 insertions(+), 183 deletions(-)

diff --git a/src/coinjoin/client.h b/src/coinjoin/client.h
index 79dccfc938dd..cba6903030b3 100644
--- a/src/coinjoin/client.h
+++ b/src/coinjoin/client.h
@@ -95,16 +95,16 @@ class CoinJoinWalletManager {
         }
     }
 
-    void Add(const std::shared_ptr<wallet::CWallet>& wallet);
-    void DoMaintenance(CConnman& connman);
+    void Add(const std::shared_ptr<wallet::CWallet>& wallet) EXCLUSIVE_LOCKS_REQUIRED(!cs_wallet_manager_map);
+    void DoMaintenance(CConnman& connman) EXCLUSIVE_LOCKS_REQUIRED(!cs_wallet_manager_map);
 
-    void Remove(const std::string& name);
-    void Flush(const std::string& name);
+    void Remove(const std::string& name) EXCLUSIVE_LOCKS_REQUIRED(!cs_wallet_manager_map);
+    void Flush(const std::string& name) EXCLUSIVE_LOCKS_REQUIRED(!cs_wallet_manager_map);
 
-    CCoinJoinClientManager* Get(const std::string& name) const;
+    CCoinJoinClientManager* Get(const std::string& name) const EXCLUSIVE_LOCKS_REQUIRED(!cs_wallet_manager_map);
 
     template <typename Callable>
-    void ForEachCJClientMan(Callable&& func)
+    void ForEachCJClientMan(Callable&& func) EXCLUSIVE_LOCKS_REQUIRED(!cs_wallet_manager_map)
     {
         LOCK(cs_wallet_manager_map);
         for (auto&& [_, clientman] : m_wallet_manager_map) {
@@ -113,7 +113,7 @@ class CoinJoinWalletManager {
     };
 
     template <typename Callable>
-    bool ForAnyCJClientMan(Callable&& func)
+    bool ForAnyCJClientMan(Callable&& func) EXCLUSIVE_LOCKS_REQUIRED(!cs_wallet_manager_map)
     {
         LOCK(cs_wallet_manager_map);
         return ranges::any_of(m_wallet_manager_map, [&](auto& pair) { return func(pair.second); });
@@ -251,9 +251,9 @@ class CCoinJoinClientQueueManager : public CCoinJoinBaseManager
         m_mn_sync(mn_sync),
         m_is_masternode{is_masternode} {};
 
-    [[nodiscard]] MessageProcessingResult ProcessMessage(NodeId from, CConnman& connman, PeerManager& peerman, std::string_view msg_type,
-                                                         CDataStream& vRecv)
-        EXCLUSIVE_LOCKS_REQUIRED(!cs_vecqueue);
+    [[nodiscard]] MessageProcessingResult ProcessMessage(NodeId from, CConnman& connman, PeerManager& peerman,
+                                                         std::string_view msg_type, CDataStream& vRecv)
+        EXCLUSIVE_LOCKS_REQUIRED(!cs_vecqueue, !cs_ProcessDSQueue);
     void DoMaintenance();
 };
 
diff --git a/src/coinjoin/util.h b/src/coinjoin/util.h
index ab0122d1bb64..8f1a26b4fc7e 100644
--- a/src/coinjoin/util.h
+++ b/src/coinjoin/util.h
@@ -117,7 +117,11 @@ class CTransactionBuilder
     /// Check if an amounts should be considered as dust
     bool IsDust(CAmount nAmount) const;
     /// Get the total number of added outputs
-    int CountOutputs() const { LOCK(cs_outputs); return vecOutputs.size(); }
+    int CountOutputs() const EXCLUSIVE_LOCKS_REQUIRED(!cs_outputs)
+    {
+        LOCK(cs_outputs);
+        return vecOutputs.size();
+    }
     /// Create and Commit the transaction to the wallet
     bool Commit(bilingual_str& strResult) EXCLUSIVE_LOCKS_REQUIRED(!cs_outputs);
     /// Convert to a string
diff --git a/src/evo/creditpool.h b/src/evo/creditpool.h
index e337c00baea9..5b2bb8cf43d7 100644
--- a/src/evo/creditpool.h
+++ b/src/evo/creditpool.h
@@ -132,14 +132,15 @@ class CCreditPoolManager
       * In case if block is invalid the function GetCreditPool throws an exception
       * it can happen if there limits of withdrawal (unlock) exceed
       */
-    CCreditPool GetCreditPool(const CBlockIndex* block, const Consensus::Params& consensusParams);
+    CCreditPool GetCreditPool(const CBlockIndex* block, const Consensus::Params& consensusParams)
+        EXCLUSIVE_LOCKS_REQUIRED(!cache_mutex);
 
 private:
-    std::optional<CCreditPool> GetFromCache(const CBlockIndex& block_index);
-    void AddToCache(const uint256& block_hash, int height, const CCreditPool& pool);
+    std::optional<CCreditPool> GetFromCache(const CBlockIndex& block_index) EXCLUSIVE_LOCKS_REQUIRED(!cache_mutex);
+    void AddToCache(const uint256& block_hash, int height, const CCreditPool& pool) EXCLUSIVE_LOCKS_REQUIRED(!cache_mutex);
 
     CCreditPool ConstructCreditPool(const gsl::not_null<const CBlockIndex*> block_index, CCreditPool prev,
-                                    const Consensus::Params& consensusParams);
+                                    const Consensus::Params& consensusParams) EXCLUSIVE_LOCKS_REQUIRED(!cache_mutex);
 };
 
 std::optional<CCreditPoolDiff> GetCreditPoolDiffForBlock(CCreditPoolManager& cpoolman, const node::BlockManager& blockman, const llmq::CQuorumManager& qman,
diff --git a/src/evo/deterministicmns.h b/src/evo/deterministicmns.h
index 1c5f53600a13..e195577a5e3e 100644
--- a/src/evo/deterministicmns.h
+++ b/src/evo/deterministicmns.h
@@ -162,7 +162,7 @@ class CDeterministicMNList
     mutable std::shared_ptr<const CSimplifiedMNList> m_cached_sml GUARDED_BY(m_cached_sml_mutex);
 
     // Private helper method to invalidate SML cache
-    void InvalidateSMLCache()
+    void InvalidateSMLCache() EXCLUSIVE_LOCKS_REQUIRED(!m_cached_sml_mutex)
     {
         LOCK(m_cached_sml_mutex);
         m_cached_sml = nullptr;
@@ -193,6 +193,7 @@ class CDeterministicMNList
 
     // Assignment operator
     CDeterministicMNList& operator=(const CDeterministicMNList& other)
+        EXCLUSIVE_LOCKS_REQUIRED(!m_cached_sml_mutex, !other.m_cached_sml_mutex)
     {
         if (this != &other) {
             blockHash = other.blockHash;
@@ -229,7 +230,7 @@ class CDeterministicMNList
     }
 
     template <typename Stream>
-    void Unserialize(Stream& s)
+    void Unserialize(Stream& s) EXCLUSIVE_LOCKS_REQUIRED(!m_cached_sml_mutex)
     {
         Clear();
 
@@ -240,7 +241,7 @@ class CDeterministicMNList
         }
     }
 
-    void Clear()
+    void Clear() EXCLUSIVE_LOCKS_REQUIRED(!m_cached_sml_mutex)
     {
         blockHash = uint256{};
         nHeight = -1;
@@ -372,7 +373,7 @@ class CDeterministicMNList
      * Calculates CSimplifiedMNList for current list and cache it
      * Thread safety: Uses internal mutex for thread-safe cache access
      */
-    gsl::not_null<std::shared_ptr<const CSimplifiedMNList>> to_sml() const;
+    gsl::not_null<std::shared_ptr<const CSimplifiedMNList>> to_sml() const EXCLUSIVE_LOCKS_REQUIRED(!m_cached_sml_mutex);
 
     /**
      * Calculates the maximum penalty which is allowed at the height of this MN list. It is dynamic and might change
@@ -393,14 +394,14 @@ class CDeterministicMNList
      * Penalty scores are only increased when the MN is not already banned, which means that after banning the penalty
      * might appear lower then the current max penalty, while the MN is still banned.
      */
-    void PoSePunish(const uint256& proTxHash, int penalty, bool debugLogs);
+    void PoSePunish(const uint256& proTxHash, int penalty, bool debugLogs) EXCLUSIVE_LOCKS_REQUIRED(!m_cached_sml_mutex);
 
-    void DecreaseScores();
+    void DecreaseScores() EXCLUSIVE_LOCKS_REQUIRED(!m_cached_sml_mutex);
     /**
      * Decrease penalty score of MN by 1.
      * Only allowed on non-banned MNs.
      */
-    void PoSeDecrease(const CDeterministicMN& dmn);
+    void PoSeDecrease(const CDeterministicMN& dmn) EXCLUSIVE_LOCKS_REQUIRED(!m_cached_sml_mutex);
 
     [[nodiscard]] CDeterministicMNListDiff BuildDiff(const CDeterministicMNList& to) const;
     /**
@@ -408,13 +409,17 @@ class CDeterministicMNList
      * It is more efficient than creating a copy due to heavy copy constructor.
      * Calculating for old block may require up to {DISK_SNAPSHOT_PERIOD} object copy & destroy.
      */
-    void ApplyDiff(gsl::not_null<const CBlockIndex*> pindex, const CDeterministicMNListDiff& diff);
-
-    void AddMN(const CDeterministicMNCPtr& dmn, bool fBumpTotalCount = true);
-    void UpdateMN(const CDeterministicMN& oldDmn, const std::shared_ptr<const CDeterministicMNState>& pdmnState);
-    void UpdateMN(const uint256& proTxHash, const std::shared_ptr<const CDeterministicMNState>& pdmnState);
-    void UpdateMN(const CDeterministicMN& oldDmn, const CDeterministicMNStateDiff& stateDiff);
-    void RemoveMN(const uint256& proTxHash);
+    void ApplyDiff(gsl::not_null<const CBlockIndex*> pindex, const CDeterministicMNListDiff& diff)
+        EXCLUSIVE_LOCKS_REQUIRED(!m_cached_sml_mutex);
+
+    void AddMN(const CDeterministicMNCPtr& dmn, bool fBumpTotalCount = true) EXCLUSIVE_LOCKS_REQUIRED(!m_cached_sml_mutex);
+    void UpdateMN(const CDeterministicMN& oldDmn, const std::shared_ptr<const CDeterministicMNState>& pdmnState)
+        EXCLUSIVE_LOCKS_REQUIRED(!m_cached_sml_mutex);
+    void UpdateMN(const uint256& proTxHash, const std::shared_ptr<const CDeterministicMNState>& pdmnState)
+        EXCLUSIVE_LOCKS_REQUIRED(!m_cached_sml_mutex);
+    void UpdateMN(const CDeterministicMN& oldDmn, const CDeterministicMNStateDiff& stateDiff)
+        EXCLUSIVE_LOCKS_REQUIRED(!m_cached_sml_mutex);
+    void RemoveMN(const uint256& proTxHash) EXCLUSIVE_LOCKS_REQUIRED(!m_cached_sml_mutex);
 
     template <typename T>
     [[nodiscard]] bool HasUniqueProperty(const T& v) const
@@ -672,7 +677,7 @@ class CDeterministicMNManager
     // Test if given TX is a ProRegTx which also contains the collateral at index n
     static bool IsProTxWithCollateral(const CTransactionRef& tx, uint32_t n);
 
-    void DoMaintenance() EXCLUSIVE_LOCKS_REQUIRED(!cs);
+    void DoMaintenance() EXCLUSIVE_LOCKS_REQUIRED(!cs, !cs_cleanup);
 
     // Migration support for nVersion-first CDeterministicMNStateDiff format
     [[nodiscard]] bool IsMigrationRequired() const EXCLUSIVE_LOCKS_REQUIRED(!cs, ::cs_main);
diff --git a/src/evo/mnhftx.h b/src/evo/mnhftx.h
index 855607b21698..210598086f7a 100644
--- a/src/evo/mnhftx.h
+++ b/src/evo/mnhftx.h
@@ -110,7 +110,8 @@ class CMNHFManager : public AbstractEHFManager
      * @pre Caller must ensure that LLMQContext has been initialized and the llmq::CQuorumManager pointer has been
      *      set by calling ConnectManagers() for this CMNHFManager instance
      */
-    std::optional<Signals> ProcessBlock(const CBlock& block, const CBlockIndex* const pindex, bool fJustCheck, BlockValidationState& state);
+    std::optional<Signals> ProcessBlock(const CBlock& block, const CBlockIndex* const pindex, bool fJustCheck,
+                                        BlockValidationState& state) EXCLUSIVE_LOCKS_REQUIRED(!cs_cache);
 
     /**
      * Every undo block should be processed when Tip() is updated by calling of CMNHFManager::UndoBlock
@@ -120,10 +121,10 @@ class CMNHFManager : public AbstractEHFManager
      * @pre Caller must ensure that LLMQContext has been initialized and the llmq::CQuorumManager pointer has been
      *      set by calling ConnectManagers() for this CMNHFManager instance
      */
-    bool UndoBlock(const CBlock& block, const CBlockIndex* const pindex);
+    bool UndoBlock(const CBlock& block, const CBlockIndex* const pindex) EXCLUSIVE_LOCKS_REQUIRED(!cs_cache);
 
     // Implements interface
-    Signals GetSignalsStage(const CBlockIndex* const pindexPrev) override;
+    Signals GetSignalsStage(const CBlockIndex* const pindexPrev) override EXCLUSIVE_LOCKS_REQUIRED(!cs_cache);
 
     /**
      * Helper that used in Unit Test to forcely setup EHF signal for specific block
@@ -145,10 +146,10 @@ class CMNHFManager : public AbstractEHFManager
      */
     void DisconnectManagers();
 
-    bool ForceSignalDBUpdate() EXCLUSIVE_LOCKS_REQUIRED(::cs_main);
+    bool ForceSignalDBUpdate() EXCLUSIVE_LOCKS_REQUIRED(::cs_main, !cs_cache);
 
 private:
-    void AddToCache(const Signals& signals, const CBlockIndex* const pindex);
+    void AddToCache(const Signals& signals, const CBlockIndex* const pindex) EXCLUSIVE_LOCKS_REQUIRED(!cs_cache);
 
     /**
      * This function returns list of signals available on previous block.
@@ -156,13 +157,13 @@ class CMNHFManager : public AbstractEHFManager
      * until state won't be recovered.
      * NOTE: that some signals could expired between blocks.
      */
-    Signals GetForBlock(const CBlockIndex* const pindex);
+    Signals GetForBlock(const CBlockIndex* const pindex) EXCLUSIVE_LOCKS_REQUIRED(!cs_cache);
 
     /**
      * This function access to in-memory cache or to evo db but does not calculate anything
      * NOTE: that some signals could expired between blocks.
      */
-    std::optional<Signals> GetFromCache(const CBlockIndex* const pindex);
+    std::optional<Signals> GetFromCache(const CBlockIndex* const pindex) EXCLUSIVE_LOCKS_REQUIRED(!cs_cache);
 };
 
 std::optional<uint8_t> extractEHFSignal(const CTransaction& tx);
diff --git a/src/governance/governance.cpp b/src/governance/governance.cpp
index 1ff5ddda0e01..dc09f514e50d 100644
--- a/src/governance/governance.cpp
+++ b/src/governance/governance.cpp
@@ -718,7 +718,7 @@ std::optional<const CGovernanceObject> CGovernanceManager::CreateGovernanceTrigg
     }
 
     // Nobody submitted a trigger we'd like to see, so let's do it but only if we are the payee
-    const CBlockIndex *tip = WITH_LOCK(::cs_main, return m_chainman.ActiveChain().Tip());
+    const CBlockIndex* tip = m_chainman.ActiveChain().Tip();
     const auto mnList = Assert(m_dmnman)->GetListForBlock(tip);
     const auto mn_payees = mnList.GetProjectedMNPayees(tip);
 
diff --git a/src/instantsend/instantsend.h b/src/instantsend/instantsend.h
index ddeb91c9d144..e9b5c809c197 100644
--- a/src/instantsend/instantsend.h
+++ b/src/instantsend/instantsend.h
@@ -119,7 +119,7 @@ class CInstantSendManager final : public instantsend::InstantSendSignerParent
         EXCLUSIVE_LOCKS_REQUIRED(!cs_nonLocked, !cs_pendingLocks, !cs_pendingRetry);
 
     void AddNonLockedTx(const CTransactionRef& tx, const CBlockIndex* pindexMined)
-        EXCLUSIVE_LOCKS_REQUIRED(!cs_nonLocked, !cs_pendingLocks);
+        EXCLUSIVE_LOCKS_REQUIRED(!cs_nonLocked, !cs_pendingLocks, !cs_timingsTxSeen);
     void RemoveNonLockedTx(const uint256& txid, bool retryChildren)
         EXCLUSIVE_LOCKS_REQUIRED(!cs_nonLocked, !cs_pendingRetry);
     void RemoveConflictedTx(const CTransaction& tx)
@@ -142,13 +142,14 @@ class CInstantSendManager final : public instantsend::InstantSendSignerParent
     bool IsWaitingForTx(const uint256& txHash) const EXCLUSIVE_LOCKS_REQUIRED(!cs_pendingLocks);
     instantsend::InstantSendLockPtr GetConflictingLock(const CTransaction& tx) const override;
 
-    [[nodiscard]] MessageProcessingResult ProcessMessage(NodeId from, std::string_view msg_type, CDataStream& vRecv);
+    [[nodiscard]] MessageProcessingResult ProcessMessage(NodeId from, std::string_view msg_type, CDataStream& vRecv)
+        EXCLUSIVE_LOCKS_REQUIRED(!cs_pendingLocks);
 
     void TransactionAddedToMempool(const CTransactionRef& tx)
-        EXCLUSIVE_LOCKS_REQUIRED(!cs_nonLocked, !cs_pendingLocks, !cs_pendingRetry);
+        EXCLUSIVE_LOCKS_REQUIRED(!cs_nonLocked, !cs_pendingLocks, !cs_pendingRetry, !cs_timingsTxSeen);
     void TransactionRemovedFromMempool(const CTransactionRef& tx);
     void BlockConnected(const std::shared_ptr<const CBlock>& pblock, const CBlockIndex* pindex)
-        EXCLUSIVE_LOCKS_REQUIRED(!cs_nonLocked, !cs_pendingLocks, !cs_pendingRetry);
+        EXCLUSIVE_LOCKS_REQUIRED(!cs_nonLocked, !cs_pendingLocks, !cs_pendingRetry, !cs_timingsTxSeen);
     void BlockDisconnected(const std::shared_ptr<const CBlock>& pblock, const CBlockIndex* pindexDisconnected);
 
     bool AlreadyHave(const CInv& inv) const EXCLUSIVE_LOCKS_REQUIRED(!cs_pendingLocks);
diff --git a/src/llmq/blockprocessor.h b/src/llmq/blockprocessor.h
index f4f19ae067fe..de026946d7ab 100644
--- a/src/llmq/blockprocessor.h
+++ b/src/llmq/blockprocessor.h
@@ -58,18 +58,26 @@ class CQuorumBlockProcessor
                                    CQuorumSnapshotManager& qsnapman);
     ~CQuorumBlockProcessor();
 
-    [[nodiscard]] MessageProcessingResult ProcessMessage(const CNode& peer, std::string_view msg_type, CDataStream& vRecv);
+    [[nodiscard]] MessageProcessingResult ProcessMessage(const CNode& peer, std::string_view msg_type, CDataStream& vRecv)
+        EXCLUSIVE_LOCKS_REQUIRED(!minableCommitmentsCs);
 
-    bool ProcessBlock(const CBlock& block, gsl::not_null<const CBlockIndex*> pindex, BlockValidationState& state, bool fJustCheck, bool fBLSChecks) EXCLUSIVE_LOCKS_REQUIRED(::cs_main);
-    bool UndoBlock(const CBlock& block, gsl::not_null<const CBlockIndex*> pindex) EXCLUSIVE_LOCKS_REQUIRED(::cs_main);
+    bool ProcessBlock(const CBlock& block, gsl::not_null<const CBlockIndex*> pindex, BlockValidationState& state,
+                      bool fJustCheck, bool fBLSChecks) EXCLUSIVE_LOCKS_REQUIRED(::cs_main, !minableCommitmentsCs);
+    bool UndoBlock(const CBlock& block, gsl::not_null<const CBlockIndex*> pindex)
+        EXCLUSIVE_LOCKS_REQUIRED(::cs_main, !minableCommitmentsCs);
 
     //! it returns hash of commitment if it should be relay, otherwise nullopt
-    std::optional<CInv> AddMineableCommitment(const CFinalCommitment& fqc);
-    bool HasMineableCommitment(const uint256& hash) const;
-    bool GetMineableCommitmentByHash(const uint256& commitmentHash, CFinalCommitment& ret) const;
-    std::optional<std::vector<CFinalCommitment>> GetMineableCommitments(const Consensus::LLMQParams& llmqParams, int nHeight) const EXCLUSIVE_LOCKS_REQUIRED(::cs_main);
-    bool GetMineableCommitmentsTx(const Consensus::LLMQParams& llmqParams, int nHeight, std::vector<CTransactionRef>& ret) const EXCLUSIVE_LOCKS_REQUIRED(::cs_main);
-    bool HasMinedCommitment(Consensus::LLMQType llmqType, const uint256& quorumHash) const;
+    std::optional<CInv> AddMineableCommitment(const CFinalCommitment& fqc) EXCLUSIVE_LOCKS_REQUIRED(!minableCommitmentsCs);
+    bool HasMineableCommitment(const uint256& hash) const EXCLUSIVE_LOCKS_REQUIRED(!minableCommitmentsCs);
+    bool GetMineableCommitmentByHash(const uint256& commitmentHash, CFinalCommitment& ret) const
+        EXCLUSIVE_LOCKS_REQUIRED(!minableCommitmentsCs);
+    std::optional<std::vector<CFinalCommitment>> GetMineableCommitments(const Consensus::LLMQParams& llmqParams,
+                                                                        int nHeight) const
+        EXCLUSIVE_LOCKS_REQUIRED(::cs_main, !minableCommitmentsCs);
+    bool GetMineableCommitmentsTx(const Consensus::LLMQParams& llmqParams, int nHeight, std::vector<CTransactionRef>& ret) const
+        EXCLUSIVE_LOCKS_REQUIRED(::cs_main, !minableCommitmentsCs);
+    bool HasMinedCommitment(Consensus::LLMQType llmqType, const uint256& quorumHash) const
+        EXCLUSIVE_LOCKS_REQUIRED(!minableCommitmentsCs);
     std::pair<CFinalCommitment, uint256> GetMinedCommitment(Consensus::LLMQType llmqType, const uint256& quorumHash) const;
 
     std::vector<const CBlockIndex*> GetMinedCommitmentsUntilBlock(Consensus::LLMQType llmqType, gsl::not_null<const CBlockIndex*> pindex, size_t maxCount) const;
@@ -82,9 +90,10 @@ class CQuorumBlockProcessor
     std::optional<const CBlockIndex*> GetLastMinedCommitmentsByQuorumIndexUntilBlock(Consensus::LLMQType llmqType, const CBlockIndex* pindex, int quorumIndex, size_t cycle) const;
 private:
     static bool GetCommitmentsFromBlock(const CBlock& block, gsl::not_null<const CBlockIndex*> pindex, std::multimap<Consensus::LLMQType, CFinalCommitment>& ret, BlockValidationState& state) EXCLUSIVE_LOCKS_REQUIRED(::cs_main);
-    bool ProcessCommitment(int nHeight, const uint256& blockHash, const CFinalCommitment& qc,
-                           BlockValidationState& state, bool fJustCheck) EXCLUSIVE_LOCKS_REQUIRED(::cs_main);
-    size_t GetNumCommitmentsRequired(const Consensus::LLMQParams& llmqParams, int nHeight) const EXCLUSIVE_LOCKS_REQUIRED(::cs_main);
+    bool ProcessCommitment(int nHeight, const uint256& blockHash, const CFinalCommitment& qc, BlockValidationState& state,
+                           bool fJustCheck) EXCLUSIVE_LOCKS_REQUIRED(::cs_main, !minableCommitmentsCs);
+    size_t GetNumCommitmentsRequired(const Consensus::LLMQParams& llmqParams, int nHeight) const
+        EXCLUSIVE_LOCKS_REQUIRED(::cs_main, !minableCommitmentsCs);
     static uint256 GetQuorumBlockHash(const Consensus::LLMQParams& llmqParams, const CChain& active_chain, int nHeight, int quorumIndex) EXCLUSIVE_LOCKS_REQUIRED(::cs_main);
 };
 } // namespace llmq
diff --git a/src/llmq/debug.h b/src/llmq/debug.h
index b97d6bc25cec..61ba107adfd7 100644
--- a/src/llmq/debug.h
+++ b/src/llmq/debug.h
@@ -103,13 +103,18 @@ class CDKGDebugManager
 public:
     CDKGDebugManager();
 
-    void GetLocalDebugStatus(CDKGDebugStatus& ret) const;
-
-    void ResetLocalSessionStatus(Consensus::LLMQType llmqType, int quorumIndex);
-    void InitLocalSessionStatus(const Consensus::LLMQParams& llmqParams, int quorumIndex, const uint256& quorumHash, int quorumHeight);
-
-    void UpdateLocalSessionStatus(Consensus::LLMQType llmqType, int quorumIndex, std::function<bool(CDKGDebugSessionStatus& status)>&& func);
-    void UpdateLocalMemberStatus(Consensus::LLMQType llmqType, int quorumIndex, size_t memberIdx, std::function<bool(CDKGDebugMemberStatus& status)>&& func);
+    void GetLocalDebugStatus(CDKGDebugStatus& ret) const EXCLUSIVE_LOCKS_REQUIRED(!cs_lockStatus);
+
+    void ResetLocalSessionStatus(Consensus::LLMQType llmqType, int quorumIndex) EXCLUSIVE_LOCKS_REQUIRED(!cs_lockStatus);
+    void InitLocalSessionStatus(const Consensus::LLMQParams& llmqParams, int quorumIndex, const uint256& quorumHash,
+                                int quorumHeight) EXCLUSIVE_LOCKS_REQUIRED(!cs_lockStatus);
+
+    void UpdateLocalSessionStatus(Consensus::LLMQType llmqType, int quorumIndex,
+                                  std::function<bool(CDKGDebugSessionStatus& status)>&& func)
+        EXCLUSIVE_LOCKS_REQUIRED(!cs_lockStatus);
+    void UpdateLocalMemberStatus(Consensus::LLMQType llmqType, int quorumIndex, size_t memberIdx,
+                                 std::function<bool(CDKGDebugMemberStatus& status)>&& func)
+        EXCLUSIVE_LOCKS_REQUIRED(!cs_lockStatus);
 };
 
 } // namespace llmq
diff --git a/src/llmq/dkgsession.h b/src/llmq/dkgsession.h
index 33b11d811a14..2b1b095b93fe 100644
--- a/src/llmq/dkgsession.h
+++ b/src/llmq/dkgsession.h
@@ -357,30 +357,31 @@ class CDKGSession
     void Contribute(CDKGPendingMessages& pendingMessages, PeerManager& peerman);
     void SendContributions(CDKGPendingMessages& pendingMessages, PeerManager& peerman);
     bool PreVerifyMessage(const CDKGContribution& qc, bool& retBan) const;
-    std::optional<CInv> ReceiveMessage(const CDKGContribution& qc);
+    std::optional<CInv> ReceiveMessage(const CDKGContribution& qc) EXCLUSIVE_LOCKS_REQUIRED(!invCs, !cs_pending);
     void VerifyPendingContributions() EXCLUSIVE_LOCKS_REQUIRED(cs_pending);
 
     // Phase 2: complaint
-    void VerifyAndComplain(CConnman& connman, CDKGPendingMessages& pendingMessages, PeerManager& peerman);
+    void VerifyAndComplain(CConnman& connman, CDKGPendingMessages& pendingMessages, PeerManager& peerman)
+        EXCLUSIVE_LOCKS_REQUIRED(!cs_pending);
     void VerifyConnectionAndMinProtoVersions(CConnman& connman) const;
     void SendComplaint(CDKGPendingMessages& pendingMessages, PeerManager& peerman);
     bool PreVerifyMessage(const CDKGComplaint& qc, bool& retBan) const;
-    std::optional<CInv> ReceiveMessage(const CDKGComplaint& qc);
+    std::optional<CInv> ReceiveMessage(const CDKGComplaint& qc) EXCLUSIVE_LOCKS_REQUIRED(!invCs);
 
     // Phase 3: justification
-    void VerifyAndJustify(CDKGPendingMessages& pendingMessages, PeerManager& peerman);
+    void VerifyAndJustify(CDKGPendingMessages& pendingMessages, PeerManager& peerman) EXCLUSIVE_LOCKS_REQUIRED(!invCs);
     void SendJustification(CDKGPendingMessages& pendingMessages, PeerManager& peerman, const std::set<uint256>& forMembers);
     bool PreVerifyMessage(const CDKGJustification& qj, bool& retBan) const;
-    std::optional<CInv> ReceiveMessage(const CDKGJustification& qj);
+    std::optional<CInv> ReceiveMessage(const CDKGJustification& qj) EXCLUSIVE_LOCKS_REQUIRED(!invCs);
 
     // Phase 4: commit
     void VerifyAndCommit(CDKGPendingMessages& pendingMessages, PeerManager& peerman);
     void SendCommitment(CDKGPendingMessages& pendingMessages, PeerManager& peerman);
     bool PreVerifyMessage(const CDKGPrematureCommitment& qc, bool& retBan) const;
-    std::optional<CInv> ReceiveMessage(const CDKGPrematureCommitment& qc);
+    std::optional<CInv> ReceiveMessage(const CDKGPrematureCommitment& qc) EXCLUSIVE_LOCKS_REQUIRED(!invCs);
 
     // Phase 5: aggregate/finalize
-    std::vector<CFinalCommitment> FinalizeCommitments();
+    std::vector<CFinalCommitment> FinalizeCommitments() EXCLUSIVE_LOCKS_REQUIRED(!invCs);
 
     // All Phases 5-in-1 for single-node-quorum
     CFinalCommitment FinalizeSingleCommitment();
diff --git a/src/llmq/dkgsessionhandler.h b/src/llmq/dkgsessionhandler.h
index faab21a69b17..ad241a5efc13 100644
--- a/src/llmq/dkgsessionhandler.h
+++ b/src/llmq/dkgsessionhandler.h
@@ -76,14 +76,15 @@ class CDKGPendingMessages
     explicit CDKGPendingMessages(size_t _maxMessagesPerNode, uint32_t _invType) :
             invType(_invType), maxMessagesPerNode(_maxMessagesPerNode) {};
 
-    [[nodiscard]] MessageProcessingResult PushPendingMessage(NodeId from, CDataStream& vRecv);
-    std::list<BinaryMessage> PopPendingMessages(size_t maxCount);
-    bool HasSeen(const uint256& hash) const;
+    [[nodiscard]] MessageProcessingResult PushPendingMessage(NodeId from, CDataStream& vRecv)
+        EXCLUSIVE_LOCKS_REQUIRED(!cs_messages);
+    std::list<BinaryMessage> PopPendingMessages(size_t maxCount) EXCLUSIVE_LOCKS_REQUIRED(!cs_messages);
+    bool HasSeen(const uint256& hash) const EXCLUSIVE_LOCKS_REQUIRED(!cs_messages);
     void Misbehaving(NodeId from, int score, PeerManager& peerman);
-    void Clear();
+    void Clear() EXCLUSIVE_LOCKS_REQUIRED(!cs_messages);
 
     template <typename Message>
-    void PushPendingMessage(NodeId from, Message& msg, PeerManager& peerman)
+    void PushPendingMessage(NodeId from, Message& msg, PeerManager& peerman) EXCLUSIVE_LOCKS_REQUIRED(!cs_messages)
     {
         CDataStream ds(SER_NETWORK, PROTOCOL_VERSION);
         ds << msg;
@@ -91,8 +92,9 @@ class CDKGPendingMessages
     }
 
     // Might return nullptr messages, which indicates that deserialization failed for some reason
-    template<typename Message>
+    template <typename Message>
     std::vector<std::pair<NodeId, std::shared_ptr<Message>>> PopAndDeserializeMessages(size_t maxCount)
+        EXCLUSIVE_LOCKS_REQUIRED(!cs_messages)
     {
         auto binaryMessages = PopPendingMessages(maxCount);
         if (binaryMessages.empty()) {
@@ -165,7 +167,7 @@ class CDKGSessionHandler
                        const CSporkManager& sporkman, const Consensus::LLMQParams& _params, int _quorumIndex);
     ~CDKGSessionHandler();
 
-    void UpdatedBlockTip(const CBlockIndex *pindexNew);
+    void UpdatedBlockTip(const CBlockIndex* pindexNew) EXCLUSIVE_LOCKS_REQUIRED(!cs_phase_qhash);
     [[nodiscard]] MessageProcessingResult ProcessMessage(NodeId from, std::string_view msg_type, CDataStream& vRecv);
 
     void StartThread(CConnman& connman, PeerManager& peerman);
@@ -179,7 +181,7 @@ class CDKGSessionHandler
 private:
     bool InitNewQuorum(const CBlockIndex* pQuorumBaseBlockIndex);
 
-    std::pair<QuorumPhase, uint256> GetPhaseAndQuorumHash() const;
+    std::pair<QuorumPhase, uint256> GetPhaseAndQuorumHash() const EXCLUSIVE_LOCKS_REQUIRED(!cs_phase_qhash);
 
     using StartPhaseFunc = std::function<void()>;
     using WhileWaitFunc = std::function<bool()>;
@@ -189,12 +191,17 @@ class CDKGSessionHandler
      * @param expectedQuorumHash expected QuorumHash, defaults to null
      * @param shouldNotWait function that returns bool, defaults to function that returns false. If the function returns false, we will wait in the loop, if true, we don't wait
      */
-    void WaitForNextPhase(std::optional<QuorumPhase> curPhase, QuorumPhase nextPhase, const uint256& expectedQuorumHash=uint256(), const WhileWaitFunc& shouldNotWait=[]{return false;}) const;
-    void WaitForNewQuorum(const uint256& oldQuorumHash) const;
-    void SleepBeforePhase(QuorumPhase curPhase, const uint256& expectedQuorumHash, double randomSleepFactor, const WhileWaitFunc& runWhileWaiting) const;
-    void HandlePhase(QuorumPhase curPhase, QuorumPhase nextPhase, const uint256& expectedQuorumHash, double randomSleepFactor, const StartPhaseFunc& startPhaseFunc, const WhileWaitFunc& runWhileWaiting);
-    void HandleDKGRound(CConnman& connman, PeerManager& peerman);
-    void PhaseHandlerThread(CConnman& connman, PeerManager& peerman);
+    void WaitForNextPhase(
+        std::optional<QuorumPhase> curPhase, QuorumPhase nextPhase, const uint256& expectedQuorumHash = uint256(),
+        const WhileWaitFunc& shouldNotWait = [] { return false; }) const EXCLUSIVE_LOCKS_REQUIRED(!cs_phase_qhash);
+    void WaitForNewQuorum(const uint256& oldQuorumHash) const EXCLUSIVE_LOCKS_REQUIRED(!cs_phase_qhash);
+    void SleepBeforePhase(QuorumPhase curPhase, const uint256& expectedQuorumHash, double randomSleepFactor,
+                          const WhileWaitFunc& runWhileWaiting) const EXCLUSIVE_LOCKS_REQUIRED(!cs_phase_qhash);
+    void HandlePhase(QuorumPhase curPhase, QuorumPhase nextPhase, const uint256& expectedQuorumHash,
+                     double randomSleepFactor, const StartPhaseFunc& startPhaseFunc,
+                     const WhileWaitFunc& runWhileWaiting) EXCLUSIVE_LOCKS_REQUIRED(!cs_phase_qhash);
+    void HandleDKGRound(CConnman& connman, PeerManager& peerman) EXCLUSIVE_LOCKS_REQUIRED(!cs_phase_qhash);
+    void PhaseHandlerThread(CConnman& connman, PeerManager& peerman) EXCLUSIVE_LOCKS_REQUIRED(!cs_phase_qhash);
 };
 
 } // namespace llmq
diff --git a/src/llmq/dkgsessionmgr.h b/src/llmq/dkgsessionmgr.h
index 51fb2fdbe8e9..dba7948ec2f7 100644
--- a/src/llmq/dkgsessionmgr.h
+++ b/src/llmq/dkgsessionmgr.h
@@ -87,7 +87,8 @@ class CDKGSessionManager
     void StartThreads(CConnman& connman, PeerManager& peerman);
     void StopThreads();
 
-    void UpdatedBlockTip(const CBlockIndex *pindexNew, bool fInitialDownload);
+    void UpdatedBlockTip(const CBlockIndex* pindexNew, bool fInitialDownload)
+        EXCLUSIVE_LOCKS_REQUIRED(!contributionsCacheCs);
 
     [[nodiscard]] MessageProcessingResult ProcessMessage(CNode& pfrom, bool is_masternode, std::string_view msg_type,
                                                          CDataStream& vRecv);
@@ -100,7 +101,11 @@ class CDKGSessionManager
     // Contributions are written while in the DKG
     void WriteVerifiedVvecContribution(Consensus::LLMQType llmqType, const CBlockIndex* pQuorumBaseBlockIndex, const uint256& proTxHash, const BLSVerificationVectorPtr& vvec);
     void WriteVerifiedSkContribution(Consensus::LLMQType llmqType, const CBlockIndex* pQuorumBaseBlockIndex, const uint256& proTxHash, const CBLSSecretKey& skContribution);
-    bool GetVerifiedContributions(Consensus::LLMQType llmqType, const CBlockIndex* pQuorumBaseBlockIndex, const std::vector<bool>& validMembers, std::vector<uint16_t>& memberIndexesRet, std::vector<BLSVerificationVectorPtr>& vvecsRet, std::vector<CBLSSecretKey>& skContributionsRet) const;
+    bool GetVerifiedContributions(Consensus::LLMQType llmqType, const CBlockIndex* pQuorumBaseBlockIndex,
+                                  const std::vector<bool>& validMembers, std::vector<uint16_t>& memberIndexesRet,
+                                  std::vector<BLSVerificationVectorPtr>& vvecsRet,
+                                  std::vector<CBLSSecretKey>& skContributionsRet) const
+        EXCLUSIVE_LOCKS_REQUIRED(!contributionsCacheCs);
     /// Write encrypted (unverified) DKG contributions for the member with the given proTxHash to the llmqDb
     void WriteEncryptedContributions(Consensus::LLMQType llmqType, const CBlockIndex* pQuorumBaseBlockIndex, const uint256& proTxHash, const CBLSIESMultiRecipientObjects<CBLSSecretKey>& contributions);
     /// Read encrypted (unverified) DKG contributions for the member with the given proTxHash from the llmqDb
@@ -109,7 +114,7 @@ class CDKGSessionManager
     void CleanupOldContributions() const;
 
 private:
-    void CleanupCache() const;
+    void CleanupCache() const EXCLUSIVE_LOCKS_REQUIRED(!contributionsCacheCs);
 };
 } // namespace llmq
 
diff --git a/src/llmq/quorums.h b/src/llmq/quorums.h
index 33acc6f3bbeb..1ba398103739 100644
--- a/src/llmq/quorums.h
+++ b/src/llmq/quorums.h
@@ -197,25 +197,27 @@ class CQuorum
     ~CQuorum() = default;
     void Init(CFinalCommitmentPtr _qc, const CBlockIndex* _pQuorumBaseBlockIndex, const uint256& _minedBlockHash, Span<CDeterministicMNCPtr> _members);
 
-    bool SetVerificationVector(const std::vector<CBLSPublicKey>& quorumVecIn);
-    void SetVerificationVector(BLSVerificationVectorPtr vvec_in) {
+    bool SetVerificationVector(const std::vector<CBLSPublicKey>& quorumVecIn) EXCLUSIVE_LOCKS_REQUIRED(!cs_vvec_shShare);
+    void SetVerificationVector(BLSVerificationVectorPtr vvec_in) EXCLUSIVE_LOCKS_REQUIRED(!cs_vvec_shShare)
+    {
         LOCK(cs_vvec_shShare);
         quorumVvec = std::move(vvec_in);
     }
-    bool SetSecretKeyShare(const CBLSSecretKey& secretKeyShare, const CActiveMasternodeManager& mn_activeman);
+    bool SetSecretKeyShare(const CBLSSecretKey& secretKeyShare, const CActiveMasternodeManager& mn_activeman)
+        EXCLUSIVE_LOCKS_REQUIRED(!cs_vvec_shShare);
 
-    bool HasVerificationVector() const LOCKS_EXCLUDED(cs_vvec_shShare);
+    bool HasVerificationVector() const EXCLUSIVE_LOCKS_REQUIRED(!cs_vvec_shShare);
     bool IsMember(const uint256& proTxHash) const;
     bool IsValidMember(const uint256& proTxHash) const;
     int GetMemberIndex(const uint256& proTxHash) const;
 
-    CBLSPublicKey GetPubKeyShare(size_t memberIdx) const;
-    CBLSSecretKey GetSkShare() const;
+    CBLSPublicKey GetPubKeyShare(size_t memberIdx) const EXCLUSIVE_LOCKS_REQUIRED(!cs_vvec_shShare);
+    CBLSSecretKey GetSkShare() const EXCLUSIVE_LOCKS_REQUIRED(!cs_vvec_shShare);
 
 private:
     bool HasVerificationVectorInternal() const EXCLUSIVE_LOCKS_REQUIRED(cs_vvec_shShare);
-    void WriteContributions(CDBWrapper& db) const;
-    bool ReadContributions(const CDBWrapper& db);
+    void WriteContributions(CDBWrapper& db) const EXCLUSIVE_LOCKS_REQUIRED(!cs_vvec_shShare);
+    bool ReadContributions(const CDBWrapper& db) EXCLUSIVE_LOCKS_REQUIRED(!cs_vvec_shShare);
 };
 
 /**
@@ -242,7 +244,7 @@ class CQuorumManager
 
     mutable Mutex cs_map_quorums;
     mutable std::map<Consensus::LLMQType, Uint256LruHashMap<CQuorumPtr>> mapQuorumsCache GUARDED_BY(cs_map_quorums);
-    mutable Mutex cs_scan_quorums;
+    mutable Mutex cs_scan_quorums; // TODO: merge cs_map_quorums, cs_scan_quorums mutexes
     mutable std::map<Consensus::LLMQType, Uint256LruHashMap<std::vector<CQuorumCPtr>>> scanQuorumsCache
         GUARDED_BY(cs_scan_quorums);
     mutable Mutex cs_cleanup;
@@ -266,11 +268,15 @@ class CQuorumManager
     void Start();
     void Stop();
 
-    void TriggerQuorumDataRecoveryThreads(CConnman& connman, const CBlockIndex* pIndex) const;
+    void TriggerQuorumDataRecoveryThreads(CConnman& connman, const CBlockIndex* pIndex) const
+        EXCLUSIVE_LOCKS_REQUIRED(!cs_db, !cs_scan_quorums, !cs_map_quorums);
 
-    void UpdatedBlockTip(const CBlockIndex* pindexNew, CConnman& connman, bool fInitialDownload) const;
+    void UpdatedBlockTip(const CBlockIndex* pindexNew, CConnman& connman, bool fInitialDownload) const
+        EXCLUSIVE_LOCKS_REQUIRED(!cs_db, !cs_scan_quorums, !cs_map_quorums);
 
-    [[nodiscard]] MessageProcessingResult ProcessMessage(CNode& pfrom, CConnman& connman, std::string_view msg_type, CDataStream& vRecv);
+    [[nodiscard]] MessageProcessingResult ProcessMessage(CNode& pfrom, CConnman& connman, std::string_view msg_type,
+                                                         CDataStream& vRecv)
+        EXCLUSIVE_LOCKS_REQUIRED(!cs_map_quorums, !cs_db);
 
     static bool HasQuorum(Consensus::LLMQType llmqType, const CQuorumBlockProcessor& quorum_block_processor, const uint256& quorumHash);
 
@@ -278,21 +284,28 @@ class CQuorumManager
                            const uint256& proTxHash = uint256()) const;
 
     // all these methods will lock cs_main for a short period of time
-    CQuorumCPtr GetQuorum(Consensus::LLMQType llmqType, const uint256& quorumHash) const;
-    std::vector<CQuorumCPtr> ScanQuorums(Consensus::LLMQType llmqType, size_t nCountRequested) const;
+    CQuorumCPtr GetQuorum(Consensus::LLMQType llmqType, const uint256& quorumHash) const
+        EXCLUSIVE_LOCKS_REQUIRED(!cs_db, !cs_map_quorums);
+    std::vector<CQuorumCPtr> ScanQuorums(Consensus::LLMQType llmqType, size_t nCountRequested) const
+        EXCLUSIVE_LOCKS_REQUIRED(!cs_db, !cs_map_quorums, !cs_scan_quorums);
 
     // this one is cs_main-free
-    std::vector<CQuorumCPtr> ScanQuorums(Consensus::LLMQType llmqType, const CBlockIndex* pindexStart, size_t nCountRequested) const;
+    std::vector<CQuorumCPtr> ScanQuorums(Consensus::LLMQType llmqType, const CBlockIndex* pindexStart,
+                                         size_t nCountRequested) const
+        EXCLUSIVE_LOCKS_REQUIRED(!cs_db, !cs_map_quorums, !cs_scan_quorums);
 
 private:
     // all private methods here are cs_main-free
-    void CheckQuorumConnections(CConnman& connman, const Consensus::LLMQParams& llmqParams,
-                                const CBlockIndex* pindexNew) const;
+    void CheckQuorumConnections(CConnman& connman, const Consensus::LLMQParams& llmqParams, const CBlockIndex* pindexNew) const
+        EXCLUSIVE_LOCKS_REQUIRED(!cs_db, !cs_scan_quorums, !cs_map_quorums);
 
-    CQuorumPtr BuildQuorumFromCommitment(Consensus::LLMQType llmqType, gsl::not_null<const CBlockIndex*> pQuorumBaseBlockIndex, bool populate_cache) const;
+    CQuorumPtr BuildQuorumFromCommitment(Consensus::LLMQType llmqType,
+                                         gsl::not_null<const CBlockIndex*> pQuorumBaseBlockIndex,
+                                         bool populate_cache) const EXCLUSIVE_LOCKS_REQUIRED(!cs_db, !cs_map_quorums);
     bool BuildQuorumContributions(const CFinalCommitmentPtr& fqc, const std::shared_ptr<CQuorum>& quorum) const;
 
-    CQuorumCPtr GetQuorum(Consensus::LLMQType llmqType, gsl::not_null<const CBlockIndex*> pindex, bool populate_cache = true) const;
+    CQuorumCPtr GetQuorum(Consensus::LLMQType llmqType, gsl::not_null<const CBlockIndex*> pindex,
+                          bool populate_cache = true) const EXCLUSIVE_LOCKS_REQUIRED(!cs_db, !cs_map_quorums);
     /// Returns the start offset for the masternode with the given proTxHash. This offset is applied when picking data recovery members of a quorum's
     /// memberlist and is calculated based on a list of all member of all active quorums for the given llmqType in a way that each member
     /// should receive the same number of request if all active llmqType members requests data from one llmqType quorum.
@@ -303,7 +316,7 @@ class CQuorumManager
                                        uint16_t nDataMask) const;
 
     void StartCleanupOldQuorumDataThread(const CBlockIndex* pIndex) const;
-    void MigrateOldQuorumDB(CEvoDB& evoDb) const;
+    void MigrateOldQuorumDB(CEvoDB& evoDb) const EXCLUSIVE_LOCKS_REQUIRED(!cs_db);
 };
 
 // when selecting a quorum for signing and verification, we use CQuorumManager::SelectQuorum with this offset as
diff --git a/src/llmq/signing.h b/src/llmq/signing.h
index 2425de093604..e49e76a14329 100644
--- a/src/llmq/signing.h
+++ b/src/llmq/signing.h
@@ -127,15 +127,15 @@ class CRecoveredSigsDb
     ~CRecoveredSigsDb();
 
     bool HasRecoveredSig(Consensus::LLMQType llmqType, const uint256& id, const uint256& msgHash) const;
-    bool HasRecoveredSigForId(Consensus::LLMQType llmqType, const uint256& id) const;
-    bool HasRecoveredSigForSession(const uint256& signHash) const;
-    bool HasRecoveredSigForHash(const uint256& hash) const;
+    bool HasRecoveredSigForId(Consensus::LLMQType llmqType, const uint256& id) const EXCLUSIVE_LOCKS_REQUIRED(!cs_cache);
+    bool HasRecoveredSigForSession(const uint256& signHash) const EXCLUSIVE_LOCKS_REQUIRED(!cs_cache);
+    bool HasRecoveredSigForHash(const uint256& hash) const EXCLUSIVE_LOCKS_REQUIRED(!cs_cache);
     bool GetRecoveredSigByHash(const uint256& hash, CRecoveredSig& ret) const;
     bool GetRecoveredSigById(Consensus::LLMQType llmqType, const uint256& id, CRecoveredSig& ret) const;
-    void WriteRecoveredSig(const CRecoveredSig& recSig);
-    void TruncateRecoveredSig(Consensus::LLMQType llmqType, const uint256& id);
+    void WriteRecoveredSig(const CRecoveredSig& recSig) EXCLUSIVE_LOCKS_REQUIRED(!cs_cache);
+    void TruncateRecoveredSig(Consensus::LLMQType llmqType, const uint256& id) EXCLUSIVE_LOCKS_REQUIRED(!cs_cache);
 
-    void CleanupOldRecoveredSigs(int64_t maxAge);
+    void CleanupOldRecoveredSigs(int64_t maxAge) EXCLUSIVE_LOCKS_REQUIRED(!cs_cache);
 
     // votes are removed when the recovered sig is written to the db
     bool HasVotedOnId(Consensus::LLMQType llmqType, const uint256& id) const;
@@ -146,7 +146,8 @@ class CRecoveredSigsDb
 
 private:
     bool ReadRecoveredSig(Consensus::LLMQType llmqType, const uint256& id, CRecoveredSig& ret) const;
-    void RemoveRecoveredSig(CDBBatch& batch, Consensus::LLMQType llmqType, const uint256& id, bool deleteHashKey, bool deleteTimeKey);
+    void RemoveRecoveredSig(CDBBatch& batch, Consensus::LLMQType llmqType, const uint256& id, bool deleteHashKey,
+                            bool deleteTimeKey) EXCLUSIVE_LOCKS_REQUIRED(!cs_cache);
 };
 
 class CRecoveredSigsListener
@@ -182,14 +183,16 @@ class CSigningManager
     CSigningManager(const CActiveMasternodeManager* const mn_activeman, const CChainState& chainstate,
                     const CQuorumManager& _qman, bool fMemory, bool fWipe);
 
-    bool AlreadyHave(const CInv& inv) const;
+    bool AlreadyHave(const CInv& inv) const EXCLUSIVE_LOCKS_REQUIRED(!cs_pending);
     bool GetRecoveredSigForGetData(const uint256& hash, CRecoveredSig& ret) const;
 
-    [[nodiscard]] MessageProcessingResult ProcessMessage(NodeId from, std::string_view msg_type, CDataStream& vRecv);
+    [[nodiscard]] MessageProcessingResult ProcessMessage(NodeId from, std::string_view msg_type, CDataStream& vRecv)
+        EXCLUSIVE_LOCKS_REQUIRED(!cs_pending);
 
     // This is called when a recovered signature was was reconstructed from another P2P message and is known to be valid
     // This is the case for example when a signature appears as part of InstantSend or ChainLocks
-    void PushReconstructedRecoveredSig(const std::shared_ptr<const CRecoveredSig>& recoveredSig);
+    void PushReconstructedRecoveredSig(const std::shared_ptr<const CRecoveredSig>& recoveredSig)
+        EXCLUSIVE_LOCKS_REQUIRED(!cs_pending);
 
     // This is called when a recovered signature can be safely removed from the DB. This is only safe when some other
     // mechanism prevents possible conflicts. As an example, ChainLocks prevent conflicts in confirmed TXs InstantSend votes
@@ -198,22 +201,26 @@ class CSigningManager
     void TruncateRecoveredSig(Consensus::LLMQType llmqType, const uint256& id);
 
 private:
-    void CollectPendingRecoveredSigsToVerify(size_t maxUniqueSessions,
-            std::unordered_map<NodeId, std::list<std::shared_ptr<const CRecoveredSig>>>& retSigShares,
-            std::unordered_map<std::pair<Consensus::LLMQType, uint256>, CQuorumCPtr, StaticSaltedHasher>& retQuorums);
-    void ProcessPendingReconstructedRecoveredSigs(PeerManager& peerman);
-    bool ProcessPendingRecoveredSigs(PeerManager& peerman); // called from the worker thread of CSigSharesManager
+    void CollectPendingRecoveredSigsToVerify(
+        size_t maxUniqueSessions, std::unordered_map<NodeId, std::list<std::shared_ptr<const CRecoveredSig>>>& retSigShares,
+        std::unordered_map<std::pair<Consensus::LLMQType, uint256>, CQuorumCPtr, StaticSaltedHasher>& retQuorums)
+        EXCLUSIVE_LOCKS_REQUIRED(!cs_pending);
+    void ProcessPendingReconstructedRecoveredSigs(PeerManager& peerman)
+        EXCLUSIVE_LOCKS_REQUIRED(!cs_pending, !cs_listeners);
+    bool ProcessPendingRecoveredSigs(PeerManager& peerman)
+        EXCLUSIVE_LOCKS_REQUIRED(!cs_pending, !cs_listeners); // called from the worker thread of CSigSharesManager
 public:
     // TODO - should not be public!
-    void ProcessRecoveredSig(const std::shared_ptr<const CRecoveredSig>& recoveredSig, PeerManager& peerman);
+    void ProcessRecoveredSig(const std::shared_ptr<const CRecoveredSig>& recoveredSig, PeerManager& peerman)
+        EXCLUSIVE_LOCKS_REQUIRED(!cs_pending, !cs_listeners);
 
 private:
     void Cleanup(); // called from the worker thread of CSigSharesManager
 
 public:
     // public interface
-    void RegisterRecoveredSigsListener(CRecoveredSigsListener* l);
-    void UnregisterRecoveredSigsListener(CRecoveredSigsListener* l);
+    void RegisterRecoveredSigsListener(CRecoveredSigsListener* l) EXCLUSIVE_LOCKS_REQUIRED(!cs_listeners);
+    void UnregisterRecoveredSigsListener(CRecoveredSigsListener* l) EXCLUSIVE_LOCKS_REQUIRED(!cs_listeners);
 
     bool AsyncSignIfMember(Consensus::LLMQType llmqType, CSigSharesManager& shareman, const uint256& id,
                            const uint256& msgHash, const uint256& quorumHash = uint256(), bool allowReSign = false,
@@ -229,7 +236,8 @@ class CSigningManager
 private:
     std::thread workThread;
     CThreadInterrupt workInterrupt;
-    void WorkThreadMain(PeerManager& peerman);
+    void WorkThreadMain(PeerManager& peerman) EXCLUSIVE_LOCKS_REQUIRED(!cs_pending, !cs_listeners);
+    ;
 
 public:
     void StartWorkerThread(PeerManager& peerman);
diff --git a/src/llmq/signing_shares.h b/src/llmq/signing_shares.h
index b47a41c16a1d..258a6f2417a6 100644
--- a/src/llmq/signing_shares.h
+++ b/src/llmq/signing_shares.h
@@ -433,7 +433,8 @@ class CSigSharesManager : public CRecoveredSigsListener
     void ProcessMessage(const CNode& pnode, PeerManager& peerman, const CSporkManager& sporkman,
                         const std::string& msg_type, CDataStream& vRecv);
 
-    void AsyncSign(const CQuorumCPtr& quorum, const uint256& id, const uint256& msgHash);
+    void AsyncSign(const CQuorumCPtr& quorum, const uint256& id, const uint256& msgHash)
+        EXCLUSIVE_LOCKS_REQUIRED(!cs_pendingSigns);
     std::optional<CSigShare> CreateSigShare(const CQuorumCPtr& quorum, const uint256& id, const uint256& msgHash) const;
     void ForceReAnnouncement(const CQuorumCPtr& quorum, Consensus::LLMQType llmqType, const uint256& id, const uint256& msgHash);
 
@@ -485,8 +486,8 @@ class CSigSharesManager : public CRecoveredSigsListener
     void CollectSigSharesToAnnounce(const CConnman& connman,
                                     std::unordered_map<NodeId, Uint256HashMap<CSigSharesInv>>& sigSharesToAnnounce)
         EXCLUSIVE_LOCKS_REQUIRED(cs);
-    void SignPendingSigShares(const CConnman& connman, PeerManager& peerman);
-    void WorkThreadMain(CConnman& connman, PeerManager& peerman);
+    void SignPendingSigShares(const CConnman& connman, PeerManager& peerman) EXCLUSIVE_LOCKS_REQUIRED(!cs_pendingSigns);
+    void WorkThreadMain(CConnman& connman, PeerManager& peerman) EXCLUSIVE_LOCKS_REQUIRED(!cs_pendingSigns);
 };
 } // namespace llmq
 
diff --git a/src/net.h b/src/net.h
index 1f86bf5a0199..33740a656b10 100644
--- a/src/net.h
+++ b/src/net.h
@@ -1027,7 +1027,7 @@ class CNode
 
     void CloseSocketDisconnect(CConnman* connman) EXCLUSIVE_LOCKS_REQUIRED(!m_sock_mutex);
 
-    void CopyStats(CNodeStats& stats) EXCLUSIVE_LOCKS_REQUIRED(!m_subver_mutex, !m_addr_local_mutex, !cs_vSend, !cs_vRecv);
+    void CopyStats(CNodeStats& stats) EXCLUSIVE_LOCKS_REQUIRED(!m_subver_mutex, !m_addr_local_mutex, !cs_vSend, !cs_vRecv, !cs_mnauth);
 
     std::string ConnectionTypeAsString() const { return ::ConnectionTypeAsString(m_conn_type); }
 
@@ -1041,42 +1041,42 @@ class CNode
 
     bool CanRelay() const { return !m_masternode_connection || m_masternode_iqr_connection; }
 
-    uint256 GetSentMNAuthChallenge() const {
+    uint256 GetSentMNAuthChallenge() const EXCLUSIVE_LOCKS_REQUIRED(!cs_mnauth) {
         LOCK(cs_mnauth);
         return sentMNAuthChallenge;
     }
 
-    uint256 GetReceivedMNAuthChallenge() const {
+    uint256 GetReceivedMNAuthChallenge() const EXCLUSIVE_LOCKS_REQUIRED(!cs_mnauth) {
         LOCK(cs_mnauth);
         return receivedMNAuthChallenge;
     }
 
-    uint256 GetVerifiedProRegTxHash() const {
+    uint256 GetVerifiedProRegTxHash() const EXCLUSIVE_LOCKS_REQUIRED(!cs_mnauth) {
         LOCK(cs_mnauth);
         return verifiedProRegTxHash;
     }
 
-    uint256 GetVerifiedPubKeyHash() const {
+    uint256 GetVerifiedPubKeyHash() const EXCLUSIVE_LOCKS_REQUIRED(!cs_mnauth) {
         LOCK(cs_mnauth);
         return verifiedPubKeyHash;
     }
 
-    void SetSentMNAuthChallenge(const uint256& newSentMNAuthChallenge) {
+    void SetSentMNAuthChallenge(const uint256& newSentMNAuthChallenge) EXCLUSIVE_LOCKS_REQUIRED(!cs_mnauth) {
         LOCK(cs_mnauth);
         sentMNAuthChallenge = newSentMNAuthChallenge;
     }
 
-    void SetReceivedMNAuthChallenge(const uint256& newReceivedMNAuthChallenge) {
+    void SetReceivedMNAuthChallenge(const uint256& newReceivedMNAuthChallenge) EXCLUSIVE_LOCKS_REQUIRED(!cs_mnauth) {
         LOCK(cs_mnauth);
         receivedMNAuthChallenge = newReceivedMNAuthChallenge;
     }
 
-    void SetVerifiedProRegTxHash(const uint256& newVerifiedProRegTxHash) {
+    void SetVerifiedProRegTxHash(const uint256& newVerifiedProRegTxHash) EXCLUSIVE_LOCKS_REQUIRED(!cs_mnauth) {
         LOCK(cs_mnauth);
         verifiedProRegTxHash = newVerifiedProRegTxHash;
     }
 
-    void SetVerifiedPubKeyHash(const uint256& newVerifiedPubKeyHash) {
+    void SetVerifiedPubKeyHash(const uint256& newVerifiedPubKeyHash) EXCLUSIVE_LOCKS_REQUIRED(!cs_mnauth) {
         LOCK(cs_mnauth);
         verifiedPubKeyHash = newVerifiedPubKeyHash;
     }
@@ -1244,8 +1244,8 @@ friend class CNode;
         EXCLUSIVE_LOCKS_REQUIRED(!m_total_bytes_sent_mutex, !m_added_nodes_mutex, !m_addr_fetches_mutex, !mutexMsgProc);
 
     void StopThreads();
-    void StopNodes();
-    void Stop()
+    void StopNodes() EXCLUSIVE_LOCKS_REQUIRED(!cs_mapSocketToNode, !cs_sendable_receivable_nodes);
+    void Stop() EXCLUSIVE_LOCKS_REQUIRED(!cs_mapSocketToNode, !cs_sendable_receivable_nodes)
     {
         StopThreads();
         StopNodes();
@@ -1274,9 +1274,9 @@ friend class CNode;
                                const char* strDest, ConnectionType conn_type, bool use_v2transport,
                                MasternodeConn masternode_connection = MasternodeConn::IsNotConnection,
                                MasternodeProbeConn masternode_probe_connection = MasternodeProbeConn::IsNotConnection)
-        EXCLUSIVE_LOCKS_REQUIRED(!m_unused_i2p_sessions_mutex, !mutexMsgProc);
+        EXCLUSIVE_LOCKS_REQUIRED(!m_unused_i2p_sessions_mutex, !mutexMsgProc, !cs_mapSocketToNode);
     void OpenMasternodeConnection(const CAddress& addrConnect, bool use_v2transport, MasternodeProbeConn probe = MasternodeProbeConn::IsConnection)
-        EXCLUSIVE_LOCKS_REQUIRED(!m_unused_i2p_sessions_mutex, !mutexMsgProc);
+        EXCLUSIVE_LOCKS_REQUIRED(!m_unused_i2p_sessions_mutex, !mutexMsgProc, !cs_mapSocketToNode);
     bool CheckIncomingNonce(uint64_t nonce);
 
     // alias for thread safety annotations only, not defined
@@ -1477,7 +1477,7 @@ friend class CNode;
      *                          - Max connection capacity for type is filled
      */
     bool AddConnection(const std::string& address, ConnectionType conn_type, bool use_v2transport)
-        EXCLUSIVE_LOCKS_REQUIRED(!m_unused_i2p_sessions_mutex, !mutexMsgProc);
+        EXCLUSIVE_LOCKS_REQUIRED(!m_unused_i2p_sessions_mutex, !mutexMsgProc, !cs_mapSocketToNode);
 
     bool AddPendingMasternode(const uint256& proTxHash);
     void SetMasternodeQuorumNodes(Consensus::LLMQType llmqType, const uint256& quorumHash, const Uint256HashSet& proTxHashes);
@@ -1579,16 +1579,16 @@ friend class CNode;
     bool InitBinds(const Options& options);
 
     void ThreadOpenAddedConnections()
-        EXCLUSIVE_LOCKS_REQUIRED(!m_added_nodes_mutex, !m_unused_i2p_sessions_mutex, !m_reconnections_mutex, !mutexMsgProc);
+        EXCLUSIVE_LOCKS_REQUIRED(!m_added_nodes_mutex, !m_unused_i2p_sessions_mutex, !m_reconnections_mutex, !mutexMsgProc, !cs_mapSocketToNode);
     void AddAddrFetch(const std::string& strDest) EXCLUSIVE_LOCKS_REQUIRED(!m_addr_fetches_mutex);
     void ProcessAddrFetch()
-        EXCLUSIVE_LOCKS_REQUIRED(!m_addr_fetches_mutex, !m_unused_i2p_sessions_mutex, !mutexMsgProc);
+        EXCLUSIVE_LOCKS_REQUIRED(!m_addr_fetches_mutex, !m_unused_i2p_sessions_mutex, !mutexMsgProc, !cs_mapSocketToNode);
     void ThreadOpenConnections(const std::vector<std::string> connect, CDeterministicMNManager& dmnman)
-        EXCLUSIVE_LOCKS_REQUIRED(!m_addr_fetches_mutex, !m_added_nodes_mutex, !m_nodes_mutex, !m_unused_i2p_sessions_mutex, !m_reconnections_mutex, !mutexMsgProc);
+        EXCLUSIVE_LOCKS_REQUIRED(!m_addr_fetches_mutex, !m_added_nodes_mutex, !m_nodes_mutex, !m_unused_i2p_sessions_mutex, !m_reconnections_mutex, !mutexMsgProc, !cs_mapSocketToNode);
     void ThreadMessageHandler() EXCLUSIVE_LOCKS_REQUIRED(!mutexMsgProc);
-    void ThreadI2PAcceptIncoming(CMasternodeSync& mn_sync) EXCLUSIVE_LOCKS_REQUIRED(!mutexMsgProc);
+    void ThreadI2PAcceptIncoming(CMasternodeSync& mn_sync) EXCLUSIVE_LOCKS_REQUIRED(!mutexMsgProc, !cs_mapSocketToNode);
     void AcceptConnection(const ListenSocket& hListenSocket, CMasternodeSync& mn_sync)
-        EXCLUSIVE_LOCKS_REQUIRED(!mutexMsgProc);
+        EXCLUSIVE_LOCKS_REQUIRED(!mutexMsgProc, !cs_mapSocketToNode);
 
     /**
      * Create a `CNode` object from a socket that has just been accepted and add the node to
@@ -1602,7 +1602,7 @@ friend class CNode;
                                       NetPermissionFlags permission_flags,
                                       const CAddress& addr_bind,
                                       const CAddress& addr,
-                                      CMasternodeSync& mn_sync) EXCLUSIVE_LOCKS_REQUIRED(!mutexMsgProc);
+                                      CMasternodeSync& mn_sync) EXCLUSIVE_LOCKS_REQUIRED(!mutexMsgProc, !cs_mapSocketToNode);
 
     void DisconnectNodes() EXCLUSIVE_LOCKS_REQUIRED(!m_reconnections_mutex, !m_nodes_mutex);
     void NotifyNumConnectionsChanged(CMasternodeSync& mn_sync);
@@ -1620,28 +1620,28 @@ friend class CNode;
     /**
      * Check connected and listening sockets for IO readiness and process them accordingly.
      */
-    void SocketHandler(CMasternodeSync& mn_sync) EXCLUSIVE_LOCKS_REQUIRED(!m_total_bytes_sent_mutex, !mutexMsgProc);
+    void SocketHandler(CMasternodeSync& mn_sync) EXCLUSIVE_LOCKS_REQUIRED(!m_total_bytes_sent_mutex, !mutexMsgProc, !cs_mapSocketToNode, !cs_sendable_receivable_nodes);
 
     /**
      * Do the read/write for connected sockets that are ready for IO.
      * @param[in] events_per_sock Sockets that are ready for IO.
      */
     void SocketHandlerConnected(const Sock::EventsPerSock& events_per_sock)
-        EXCLUSIVE_LOCKS_REQUIRED(!m_total_bytes_sent_mutex, !mutexMsgProc);
+        EXCLUSIVE_LOCKS_REQUIRED(!m_total_bytes_sent_mutex, !mutexMsgProc, !cs_sendable_receivable_nodes, !cs_mapSocketToNode, !cs_sendable_receivable_nodes);
 
     /**
      * Accept incoming connections, one from each read-ready listening socket.
      * @param[in] events_per_sock Sockets that are ready for IO.
      */
     void SocketHandlerListening(const Sock::EventsPerSock& events_per_sock, CMasternodeSync& mn_sync)
-        EXCLUSIVE_LOCKS_REQUIRED(!mutexMsgProc);
+        EXCLUSIVE_LOCKS_REQUIRED(!mutexMsgProc, !cs_mapSocketToNode);
 
     void ThreadSocketHandler(CMasternodeSync& mn_sync)
-        EXCLUSIVE_LOCKS_REQUIRED(!m_total_bytes_sent_mutex, !mutexMsgProc, !m_nodes_mutex, !m_reconnections_mutex);
+        EXCLUSIVE_LOCKS_REQUIRED(!m_total_bytes_sent_mutex, !mutexMsgProc, !m_nodes_mutex, !m_reconnections_mutex, !cs_mapSocketToNode, !cs_sendable_receivable_nodes);
     void ThreadDNSAddressSeed() EXCLUSIVE_LOCKS_REQUIRED(!m_addr_fetches_mutex, !m_nodes_mutex);
     void ThreadOpenMasternodeConnections(CDeterministicMNManager& dmnman, CMasternodeMetaMan& mn_metaman,
                                          CMasternodeSync& mn_sync)
-        EXCLUSIVE_LOCKS_REQUIRED(!m_addr_fetches_mutex, !m_nodes_mutex, !m_unused_i2p_sessions_mutex, !mutexMsgProc);
+        EXCLUSIVE_LOCKS_REQUIRED(!m_addr_fetches_mutex, !m_nodes_mutex, !m_unused_i2p_sessions_mutex, !mutexMsgProc, !cs_mapSocketToNode);
 
     uint64_t CalculateKeyedNetGroup(const CAddress& ad) const;
 
@@ -1934,7 +1934,7 @@ friend class CNode;
     std::list<ReconnectionInfo> m_reconnections GUARDED_BY(m_reconnections_mutex);
 
     /** Attempt reconnections, if m_reconnections non-empty. */
-    void PerformReconnections() EXCLUSIVE_LOCKS_REQUIRED(!mutexMsgProc, !m_reconnections_mutex, !m_unused_i2p_sessions_mutex);
+    void PerformReconnections() EXCLUSIVE_LOCKS_REQUIRED(!mutexMsgProc, !m_reconnections_mutex, !m_unused_i2p_sessions_mutex, !cs_mapSocketToNode);
 
     /**
      * Cap on the size of `m_unused_i2p_sessions`, to ensure it does not
diff --git a/src/net_processing.cpp b/src/net_processing.cpp
index 6e104ac8ab5b..e449f31d7b27 100644
--- a/src/net_processing.cpp
+++ b/src/net_processing.cpp
@@ -324,7 +324,7 @@ struct Peer {
     /**
      * (Bitcoin) Initializes a TxRelay struct for this peer. Can be called at most once for a peer.
      * (Dash)    Enables the flag that allows GetTxRelay() to return m_tx_relay */
-    TxRelay* SetTxRelay() LOCKS_EXCLUDED(m_tx_relay_mutex)
+    TxRelay* SetTxRelay() EXCLUSIVE_LOCKS_REQUIRED(!m_tx_relay_mutex)
     {
         LOCK(m_tx_relay_mutex);
         Assume(!m_can_tx_relay);
@@ -337,12 +337,12 @@ struct Peer {
         return WITH_LOCK(m_tx_relay_mutex, return m_tx_relay.get());
     }
 
-    TxRelay* GetTxRelay() LOCKS_EXCLUDED(m_tx_relay_mutex)
+    TxRelay* GetTxRelay() EXCLUSIVE_LOCKS_REQUIRED(!m_tx_relay_mutex)
     {
         LOCK(m_tx_relay_mutex);
         return m_can_tx_relay ? m_tx_relay.get() : nullptr;
     };
-    const TxRelay* GetTxRelay() const LOCKS_EXCLUDED(m_tx_relay_mutex)
+    const TxRelay* GetTxRelay() const EXCLUSIVE_LOCKS_REQUIRED(!m_tx_relay_mutex)
     {
         LOCK(m_tx_relay_mutex);
         return m_can_tx_relay ? m_tx_relay.get() : nullptr;
@@ -611,15 +611,15 @@ class PeerManagerImpl final : public PeerManager
         EXCLUSIVE_LOCKS_REQUIRED(!m_peer_mutex);
     void BlockChecked(const CBlock& block, const BlockValidationState& state) override
         EXCLUSIVE_LOCKS_REQUIRED(!m_peer_mutex);
-    void NewPoWValidBlock(const CBlockIndex *pindex, const std::shared_ptr<const CBlock>& pblock) override;
+    void NewPoWValidBlock(const CBlockIndex *pindex, const std::shared_ptr<const CBlock>& pblock) override EXCLUSIVE_LOCKS_REQUIRED(!m_most_recent_block_mutex);
 
     /** Implement NetEventsInterface */
     void InitializeNode(CNode& node, ServiceFlags our_services) override EXCLUSIVE_LOCKS_REQUIRED(!m_peer_mutex);
     void FinalizeNode(const CNode& node) override EXCLUSIVE_LOCKS_REQUIRED(!m_peer_mutex);
     bool ProcessMessages(CNode* pfrom, std::atomic<bool>& interrupt) override
-        EXCLUSIVE_LOCKS_REQUIRED(!m_peer_mutex, !m_recent_confirmed_transactions_mutex, g_msgproc_mutex);
+        EXCLUSIVE_LOCKS_REQUIRED(!m_peer_mutex, !m_recent_confirmed_transactions_mutex, g_msgproc_mutex, !m_most_recent_block_mutex);
     bool SendMessages(CNode* pto) override
-        EXCLUSIVE_LOCKS_REQUIRED(!m_peer_mutex, !m_recent_confirmed_transactions_mutex, g_msgproc_mutex);
+        EXCLUSIVE_LOCKS_REQUIRED(!m_peer_mutex, !m_recent_confirmed_transactions_mutex, g_msgproc_mutex, !m_most_recent_block_mutex);
 
     /** Implement PeerManager */
     void StartScheduledTasks(CScheduler& scheduler) override;
@@ -639,12 +639,12 @@ class PeerManagerImpl final : public PeerManager
     void Misbehaving(const NodeId pnode, const int howmuch, const std::string& message = "") override EXCLUSIVE_LOCKS_REQUIRED(!m_peer_mutex);
     void ProcessMessage(CNode& pfrom, const std::string& msg_type, CDataStream& vRecv,
                         const std::chrono::microseconds time_received, const std::atomic<bool>& interruptMsgProc) override
-        EXCLUSIVE_LOCKS_REQUIRED(!m_peer_mutex, !m_recent_confirmed_transactions_mutex, g_msgproc_mutex);
+        EXCLUSIVE_LOCKS_REQUIRED(!m_peer_mutex, !m_recent_confirmed_transactions_mutex, g_msgproc_mutex, !m_most_recent_block_mutex);
     void UpdateLastBlockAnnounceTime(NodeId node, int64_t time_in_seconds) override;
     bool IsBanned(NodeId pnode) override EXCLUSIVE_LOCKS_REQUIRED(cs_main, !m_peer_mutex);
     size_t GetRequestedObjectCount(NodeId nodeid) const override EXCLUSIVE_LOCKS_REQUIRED(::cs_main);
 private:
-    void _RelayTransaction(const uint256& txid) EXCLUSIVE_LOCKS_REQUIRED(cs_main);
+    void _RelayTransaction(const uint256& txid) EXCLUSIVE_LOCKS_REQUIRED(cs_main, !m_peer_mutex);
 
     /** Ask peers that have a transaction in their inventory to relay it to us. */
     void AskPeersForTransaction(const uint256& txid) EXCLUSIVE_LOCKS_REQUIRED(!m_peer_mutex);
@@ -852,7 +852,7 @@ class PeerManagerImpl final : public PeerManager
      */
     bool BlockRequestAllowed(const CBlockIndex* pindex) EXCLUSIVE_LOCKS_REQUIRED(cs_main);
     bool AlreadyHaveBlock(const uint256& block_hash) EXCLUSIVE_LOCKS_REQUIRED(cs_main);
-    void ProcessGetBlockData(CNode& pfrom, Peer& peer, const CInv& inv, llmq::CInstantSendManager& isman);
+    void ProcessGetBlockData(CNode& pfrom, Peer& peer, const CInv& inv, llmq::CInstantSendManager& isman) EXCLUSIVE_LOCKS_REQUIRED(!m_most_recent_block_mutex);
 
     /**
      * Validation logic for compact filters request handling.
@@ -1034,7 +1034,7 @@ class PeerManagerImpl final : public PeerManager
     /** Determine whether or not a peer can request a transaction, and return it (or nullptr if not found or not allowed). */
     CTransactionRef FindTxForGetData(const CNode* peer, const uint256& txid, const std::chrono::seconds mempool_req, const std::chrono::seconds now) LOCKS_EXCLUDED(cs_main);
 
-    void ProcessGetData(CNode& pfrom, Peer& peer, const std::atomic<bool>& interruptMsgProc) EXCLUSIVE_LOCKS_REQUIRED(peer.m_getdata_requests_mutex) LOCKS_EXCLUDED(::cs_main);
+    void ProcessGetData(CNode& pfrom, Peer& peer, const std::atomic<bool>& interruptMsgProc) EXCLUSIVE_LOCKS_REQUIRED(peer.m_getdata_requests_mutex, !m_most_recent_block_mutex) LOCKS_EXCLUDED(::cs_main);
 
     /** Process a new block. Perform any post-processing housekeeping */
     void ProcessBlock(CNode& from, const std::shared_ptr<const CBlock>& pblock, bool force_processing);
diff --git a/src/spork.h b/src/spork.h
index 3841f3a04c1d..5dde49cb4dbe 100644
--- a/src/spork.h
+++ b/src/spork.h
@@ -234,7 +234,7 @@ class CSporkManager : public SporkStore
      * SporkValueIfActive is used to get the value agreed upon by the majority
      * of signed spork messages for a given Spork ID.
      */
-    std::optional<SporkValue> SporkValueIfActive(SporkId nSporkID) const EXCLUSIVE_LOCKS_REQUIRED(cs);
+    std::optional<SporkValue> SporkValueIfActive(SporkId nSporkID) const EXCLUSIVE_LOCKS_REQUIRED(cs, !cs_cache);
 
 public:
     CSporkManager();
@@ -257,7 +257,8 @@ class CSporkManager : public SporkStore
     /**
      * ProcessMessage is used to call ProcessSpork and ProcessGetSporks. See below
      */
-    [[nodiscard]] MessageProcessingResult ProcessMessage(CNode& peer, CConnman& connman, std::string_view msg_type, CDataStream& vRecv);
+    [[nodiscard]] MessageProcessingResult ProcessMessage(CNode& peer, CConnman& connman, std::string_view msg_type,
+                                                         CDataStream& vRecv) EXCLUSIVE_LOCKS_REQUIRED(!cs_cache);
 
     /**
      * ProcessSpork is used to handle the 'spork' p2p message.
@@ -265,7 +266,8 @@ class CSporkManager : public SporkStore
      * For 'spork', it validates the spork and adds it to the internal spork storage and
      * performs any necessary processing.
      */
-    [[nodiscard]] MessageProcessingResult ProcessSpork(NodeId from, CDataStream& vRecv) EXCLUSIVE_LOCKS_REQUIRED(!cs);
+    [[nodiscard]] MessageProcessingResult ProcessSpork(NodeId from, CDataStream& vRecv)
+        EXCLUSIVE_LOCKS_REQUIRED(!cs, !cs_cache);
 
     /**
      * ProcessGetSporks is used to handle the 'getsporks' p2p message.
@@ -278,7 +280,7 @@ class CSporkManager : public SporkStore
      * UpdateSpork is used by the spork RPC command to set a new spork value, sign
      * and broadcast the spork message.
      */
-    bool UpdateSpork(PeerManager& peerman, SporkId nSporkID, SporkValue nValue) EXCLUSIVE_LOCKS_REQUIRED(!cs);
+    bool UpdateSpork(PeerManager& peerman, SporkId nSporkID, SporkValue nValue) EXCLUSIVE_LOCKS_REQUIRED(!cs, !cs_cache);
 
     /**
      * IsSporkActive returns a bool for time-based sporks, and should be used
@@ -288,13 +290,13 @@ class CSporkManager : public SporkStore
      * instead, and therefore this method doesn't make sense and should not be
      * used.
      */
-    bool IsSporkActive(SporkId nSporkID) const;
+    bool IsSporkActive(SporkId nSporkID) const EXCLUSIVE_LOCKS_REQUIRED(!cs_cache);
 
     /**
      * GetSporkValue returns the spork value given a Spork ID. If no active spork
      * message has yet been received by the node, it returns the default value.
      */
-    SporkValue GetSporkValue(SporkId nSporkID) const EXCLUSIVE_LOCKS_REQUIRED(!cs);
+    SporkValue GetSporkValue(SporkId nSporkID) const EXCLUSIVE_LOCKS_REQUIRED(!cs, !cs_cache);
 
     /**
      * GetSporkIDByName returns the internal Spork ID given the spork name.
diff --git a/src/stats/client.cpp b/src/stats/client.cpp
index d0e3a938e1e1..973fcb266941 100644
--- a/src/stats/client.cpp
+++ b/src/stats/client.cpp
@@ -48,24 +48,63 @@ class StatsdClientImpl final : public StatsdClient
     ~StatsdClientImpl() = default;
 
 public:
-    bool dec(std::string_view key, float sample_rate) override { return count(key, -1, sample_rate); }
-    bool inc(std::string_view key, float sample_rate) override { return count(key, 1, sample_rate); }
-    bool count(std::string_view key, int64_t delta, float sample_rate) override { return _send(key, delta, STATSD_METRIC_COUNT, sample_rate); }
-    bool gauge(std::string_view key, int64_t value, float sample_rate) override { return _send(key, value, STATSD_METRIC_GAUGE, sample_rate); }
-    bool gaugeDouble(std::string_view key, double value, float sample_rate) override { return _send(key, value, STATSD_METRIC_GAUGE, sample_rate); }
-    bool timing(std::string_view key, uint64_t ms, float sample_rate) override { return _send(key, ms, STATSD_METRIC_TIMING, sample_rate); }
-
-    bool send(std::string_view key, double value, std::string_view type, float sample_rate) override { return _send(key, value, type, sample_rate); }
-    bool send(std::string_view key, int32_t value, std::string_view type, float sample_rate) override { return _send(key, value, type, sample_rate); }
-    bool send(std::string_view key, int64_t value, std::string_view type, float sample_rate) override { return _send(key, value, type, sample_rate); }
-    bool send(std::string_view key, uint32_t value, std::string_view type, float sample_rate) override { return _send(key, value, type, sample_rate); }
-    bool send(std::string_view key, uint64_t value, std::string_view type, float sample_rate) override { return _send(key, value, type, sample_rate); }
+    bool dec(std::string_view key, float sample_rate) override EXCLUSIVE_LOCKS_REQUIRED(!cs)
+    {
+        return count(key, -1, sample_rate);
+    }
+    bool inc(std::string_view key, float sample_rate) override EXCLUSIVE_LOCKS_REQUIRED(!cs)
+    {
+        return count(key, 1, sample_rate);
+    }
+    bool count(std::string_view key, int64_t delta, float sample_rate) override EXCLUSIVE_LOCKS_REQUIRED(!cs)
+    {
+        return _send(key, delta, STATSD_METRIC_COUNT, sample_rate);
+    }
+    bool gauge(std::string_view key, int64_t value, float sample_rate) override EXCLUSIVE_LOCKS_REQUIRED(!cs)
+    {
+        return _send(key, value, STATSD_METRIC_GAUGE, sample_rate);
+    }
+    bool gaugeDouble(std::string_view key, double value, float sample_rate) override EXCLUSIVE_LOCKS_REQUIRED(!cs)
+    {
+        return _send(key, value, STATSD_METRIC_GAUGE, sample_rate);
+    }
+    bool timing(std::string_view key, uint64_t ms, float sample_rate) override EXCLUSIVE_LOCKS_REQUIRED(!cs)
+    {
+        return _send(key, ms, STATSD_METRIC_TIMING, sample_rate);
+    }
+
+    bool send(std::string_view key, double value, std::string_view type, float sample_rate) override
+        EXCLUSIVE_LOCKS_REQUIRED(!cs)
+    {
+        return _send(key, value, type, sample_rate);
+    }
+    bool send(std::string_view key, int32_t value, std::string_view type, float sample_rate) override
+        EXCLUSIVE_LOCKS_REQUIRED(!cs)
+    {
+        return _send(key, value, type, sample_rate);
+    }
+    bool send(std::string_view key, int64_t value, std::string_view type, float sample_rate) override
+        EXCLUSIVE_LOCKS_REQUIRED(!cs)
+    {
+        return _send(key, value, type, sample_rate);
+    }
+    bool send(std::string_view key, uint32_t value, std::string_view type, float sample_rate) override
+        EXCLUSIVE_LOCKS_REQUIRED(!cs)
+    {
+        return _send(key, value, type, sample_rate);
+    }
+    bool send(std::string_view key, uint64_t value, std::string_view type, float sample_rate) override
+        EXCLUSIVE_LOCKS_REQUIRED(!cs)
+    {
+        return _send(key, value, type, sample_rate);
+    }
 
     bool active() const override { return m_sender != nullptr; }
 
 private:
     template <typename T1>
-    inline bool _send(std::string_view key, T1 value, std::string_view type, float sample_rate);
+    inline bool _send(std::string_view key, T1 value, std::string_view type, float sample_rate)
+        EXCLUSIVE_LOCKS_REQUIRED(!cs);
 
 private:
     /* Mutex to protect PRNG */
diff --git a/src/versionbits.h b/src/versionbits.h
index 19232ba61977..036fba26b423 100644
--- a/src/versionbits.h
+++ b/src/versionbits.h
@@ -85,7 +85,7 @@ class VersionBitsCache
 
 public:
     /** Get the numerical statistics for a given deployment for the signalling period that includes the block after pindexPrev. */
-    BIP9Stats Statistics(const CBlockIndex* pindexPrev, const Consensus::Params& params, Consensus::DeploymentPos pos);
+    BIP9Stats Statistics(const CBlockIndex* pindexPrev, const Consensus::Params& params, Consensus::DeploymentPos pos) EXCLUSIVE_LOCKS_REQUIRED(!m_mutex);
 
     static uint32_t Mask(const Consensus::Params& params, Consensus::DeploymentPos pos);
 

From b70c995171c0fa5b66ee3a731d35722bce606a6a Mon Sep 17 00:00:00 2001
From: MarcoFalke <falke.marco@gmail.com>
Date: Mon, 22 Feb 2021 09:47:11 +0100
Subject: [PATCH 089/656] Merge #21202: [validation] Two small clang lock
 annotation improvements
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

25c57d640992255ed67964a44b17afbfd4bed0cf [doc] Add a note about where lock annotations should go. (Amiti Uttarwar)
ad5f01b96045f304b6cf9100879592b835c49c40 [validation] Move the lock annotation from function definition to declaration (Amiti Uttarwar)

Pull request description:

  Based on reviewing #21188

  the first commit switches the lock annotations on `CheckInputScripts` to be on the function declaration instead of on the function definition. this ensures that all call sites are checked, not just ones that come after the definition.

  the second commit adds a note to the developer-notes section to clarify where the annotations should be applied.

ACKs for top commit:
  MarcoFalke:
    ACK 25c57d640992255ed67964a44b17afbfd4bed0cf 🥘
  promag:
    Code review ACK 25c57d640992255ed67964a44b17afbfd4bed0cf.

Tree-SHA512: 61b6ef856bf6c6016d535fbdd19daf57b9e59fe54a1f30d47282a071b9b9d60b2466b044ee57929e0320cb1bdef52e7a1687cacaa27031bbc43d058ffffe22ba
---
 doc/developer-notes.md               |  5 +++++
 src/test/txvalidationcache_tests.cpp |  5 ++++-
 src/validation.cpp                   | 11 +++++++++--
 3 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/doc/developer-notes.md b/doc/developer-notes.md
index 67f377b200e1..4c0d3deea7b1 100644
--- a/doc/developer-notes.md
+++ b/doc/developer-notes.md
@@ -952,6 +952,11 @@ Threads and synchronization
   called unconditionally after it because `LOCK()` does the same check as
   `AssertLockNotHeld()` internally, for non-recursive mutexes):
 
+  - In functions that are declared separately from where they are defined, the
+    thread safety annotations should be added exclusively to the function
+    declaration. Annotations on the definition could lead to false positives
+    (lack of compile failure) at call sites between the two.
+
 ```C++
 // txmempool.h
 class CTxMemPool
diff --git a/src/test/txvalidationcache_tests.cpp b/src/test/txvalidationcache_tests.cpp
index 708c4686e7e6..62eea17e34a0 100644
--- a/src/test/txvalidationcache_tests.cpp
+++ b/src/test/txvalidationcache_tests.cpp
@@ -17,7 +17,10 @@ struct Dersig100Setup : public TestChain100Setup {
         : TestChain100Setup{CBaseChainParams::REGTEST, {"-testactivationheight=dersig@102"}} {}
 };
 
-bool CheckInputScripts(const CTransaction& tx, TxValidationState &state, const CCoinsViewCache &inputs, unsigned int flags, bool cacheSigStore, bool cacheFullScriptStore, PrecomputedTransactionData& txdata, std::vector<CScriptCheck> *pvChecks);
+bool CheckInputScripts(const CTransaction& tx, TxValidationState& state,
+                       const CCoinsViewCache& inputs, unsigned int flags, bool cacheSigStore,
+                       bool cacheFullScriptStore, PrecomputedTransactionData& txdata,
+                       std::vector<CScriptCheck>* pvChecks) EXCLUSIVE_LOCKS_REQUIRED(cs_main);
 
 BOOST_AUTO_TEST_SUITE(txvalidationcache_tests)
 
diff --git a/src/validation.cpp b/src/validation.cpp
index 63f7109b83f9..967fe2d716b3 100644
--- a/src/validation.cpp
+++ b/src/validation.cpp
@@ -161,7 +161,11 @@ const CBlockIndex* CChainState::FindForkInGlobalIndex(const CBlockLocator& locat
     return m_chain.Genesis();
 }
 
-bool CheckInputScripts(const CTransaction& tx, TxValidationState &state, const CCoinsViewCache &inputs, unsigned int flags, bool cacheSigStore, bool cacheFullScriptStore, PrecomputedTransactionData& txdata, std::vector<CScriptCheck> *pvChecks = nullptr);
+bool CheckInputScripts(const CTransaction& tx, TxValidationState& state,
+                       const CCoinsViewCache& inputs, unsigned int flags, bool cacheSigStore,
+                       bool cacheFullScriptStore, PrecomputedTransactionData& txdata,
+                       std::vector<CScriptCheck>* pvChecks = nullptr)
+                       EXCLUSIVE_LOCKS_REQUIRED(cs_main);
 
 bool CheckFinalTxAtTip(const CBlockIndex& active_chain_tip, const CTransaction& tx)
 {
@@ -1793,7 +1797,10 @@ void InitScriptExecutionCache() {
  *
  * Non-static (and re-declared) in src/test/txvalidationcache_tests.cpp
  */
-bool CheckInputScripts(const CTransaction& tx, TxValidationState &state, const CCoinsViewCache &inputs, unsigned int flags, bool cacheSigStore, bool cacheFullScriptStore, PrecomputedTransactionData& txdata, std::vector<CScriptCheck> *pvChecks) EXCLUSIVE_LOCKS_REQUIRED(cs_main)
+bool CheckInputScripts(const CTransaction& tx, TxValidationState& state,
+                       const CCoinsViewCache& inputs, unsigned int flags, bool cacheSigStore,
+                       bool cacheFullScriptStore, PrecomputedTransactionData& txdata,
+                       std::vector<CScriptCheck>* pvChecks)
 {
     auto start = Now<SteadyMilliseconds>();
     if (tx.IsCoinBase()) return true;

From 4e37f90c642decdb978306df6f4d29cd49aacbee Mon Sep 17 00:00:00 2001
From: MacroFake <falke.marco@gmail.com>
Date: Fri, 10 Jun 2022 16:42:26 +0200
Subject: [PATCH 090/656] Merge bitcoin/bitcoin#24931: Strengthen thread safety
 assertions
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

ce893c0497fc9b8ab9752153dfcc77c9f427545e doc: Update developer notes (Anthony Towns)
d2852917eecad6ab422a7b2c9892d351a7f0cc96 sync.h: Imply negative assertions when calling LOCK (Anthony Towns)
bba87c0553780eacf0317fbfec7330ea27aa02f8 scripted-diff: Convert global Mutexes to GlobalMutexes (Anthony Towns)
a559509a0b8cade27199740212d7b589f71a0e3b sync.h: Add GlobalMutex type (Anthony Towns)
be6aa72f9f8d50b6b5b19b319a74abe7ab4099ff qt/clientmodel: thread safety annotation for m_cached_tip_mutex (Anthony Towns)
f24bd45b37e1b2d19e5a053dbfefa30306c1d41a net_processing: thread safety annotation for m_tx_relay_mutex (Anthony Towns)

Pull request description:

  This changes `LOCK(mutex)` for non-global, non-recursive mutexes to be annotated with the negative capability for the mutex it refers to, to prevent . clang applies negative capabilities recursively, so this helps avoid forgetting to annotate functions.

  This can't reasonably be used for globals, because clang would require every function to be annotated with `EXCLUSIVE_LOCKS_REQUIRED(!g_mutex)` for each global mutex; so this introduces a trivial `GlobalMutex` subclass of `Mutex`, and reduces the annotations for both `GlobalMutex`  to `LOCKS_EXCLUDED` which only catches trivial errors (eg (`LOCK(x); LOCK(x);`).

ACKs for top commit:
  MarcoFalke:
    review ACK ce893c0497fc9b8ab9752153dfcc77c9f427545e 🐦
  hebasto:
    ACK ce893c0497fc9b8ab9752153dfcc77c9f427545e

Tree-SHA512: 5c35e8c7677ce3d994a7e3774f4344adad496223a51b3a1d1d3b5f20684b2e1d5cff688eb3fbc8d33e1b9940dfa76e515f9434e21de6f3ce3c935e29a319f529
---
 doc/developer-notes.md | 41 ++++++++++++++++++++++++++---------
 src/httpserver.cpp     |  2 +-
 src/init.cpp           |  2 +-
 src/net.cpp            |  2 +-
 src/net.h              |  2 +-
 src/net_processing.cpp |  2 +-
 src/netbase.cpp        |  2 +-
 src/qt/clientmodel.h   |  2 +-
 src/rpc/blockchain.cpp |  2 +-
 src/rpc/server.cpp     |  4 ++--
 src/sync.h             | 49 ++++++++++++++++++++++++++++++++++--------
 src/timedata.cpp       |  2 +-
 src/util/system.cpp    |  2 +-
 src/validation.cpp     |  2 +-
 src/validation.h       |  2 +-
 src/wallet/wallet.cpp  |  4 ++--
 src/warnings.cpp       |  2 +-
 17 files changed, 88 insertions(+), 36 deletions(-)

diff --git a/doc/developer-notes.md b/doc/developer-notes.md
index 4c0d3deea7b1..ea7d9c1fd526 100644
--- a/doc/developer-notes.md
+++ b/doc/developer-notes.md
@@ -947,16 +947,21 @@ Threads and synchronization
 - Prefer `Mutex` type to `RecursiveMutex` one.
 
 - Consistently use [Clang Thread Safety Analysis](https://clang.llvm.org/docs/ThreadSafetyAnalysis.html) annotations to
-  get compile-time warnings about potential race conditions in code. Combine annotations in function declarations with
-  run-time asserts in function definitions (`AssertLockNotHeld()` can be omitted if `LOCK()` is
-  called unconditionally after it because `LOCK()` does the same check as
-  `AssertLockNotHeld()` internally, for non-recursive mutexes):
+  get compile-time warnings about potential race conditions or deadlocks in code.
 
   - In functions that are declared separately from where they are defined, the
     thread safety annotations should be added exclusively to the function
     declaration. Annotations on the definition could lead to false positives
     (lack of compile failure) at call sites between the two.
 
+  - Prefer locks that are in a class rather than global, and that are
+    internal to a class (private or protected) rather than public.
+
+  - Combine annotations in function declarations with run-time asserts in
+    function definitions (`AssertLockNotHeld()` can be omitted if `LOCK()` is
+    called unconditionally after it because `LOCK()` does the same check as
+    `AssertLockNotHeld()` internally, for non-recursive mutexes):
+
 ```C++
 // txmempool.h
 class CTxMemPool
@@ -980,21 +985,37 @@ void CTxMemPool::UpdateTransactionsFromBlock(...)
 
 ```C++
 // validation.h
-class ChainstateManager
+class CChainState
 {
+protected:
+    ...
+    Mutex m_chainstate_mutex;
+    ...
 public:
     ...
-    bool ProcessNewBlock(...) LOCKS_EXCLUDED(::cs_main);
+    bool ActivateBestChain(
+        BlockValidationState& state,
+        std::shared_ptr<const CBlock> pblock = nullptr)
+        EXCLUSIVE_LOCKS_REQUIRED(!m_chainstate_mutex)
+        LOCKS_EXCLUDED(::cs_main);
+    ...
+    bool PreciousBlock(BlockValidationState& state, CBlockIndex* pindex)
+        EXCLUSIVE_LOCKS_REQUIRED(!m_chainstate_mutex)
+        LOCKS_EXCLUDED(::cs_main);
     ...
 }
 
 // validation.cpp
-bool ChainstateManager::ProcessNewBlock(...)
+bool CChainState::PreciousBlock(BlockValidationState& state, CBlockIndex* pindex)
 {
+    AssertLockNotHeld(m_chainstate_mutex);
     AssertLockNotHeld(::cs_main);
-    ...
-    LOCK(::cs_main);
-    ...
+    {
+        LOCK(cs_main);
+        ...
+    }
+
+    return ActivateBestChain(state, std::shared_ptr<const CBlock>());
 }
 ```
 
diff --git a/src/httpserver.cpp b/src/httpserver.cpp
index fe8c8879ea43..7cdf8cd072cb 100644
--- a/src/httpserver.cpp
+++ b/src/httpserver.cpp
@@ -159,7 +159,7 @@ static std::unique_ptr<WorkQueue<HTTPClosure>> g_work_queue{nullptr};
 //! List of 'external' RPC users (global variable, used by httprpc)
 std::vector<std::string> g_external_usernames;
 //! Handlers for (sub)paths
-static Mutex g_httppathhandlers_mutex;
+static GlobalMutex g_httppathhandlers_mutex;
 static std::vector<HTTPPathHandler> pathHandlers GUARDED_BY(g_httppathhandlers_mutex);
 //! Bound listening sockets
 static std::vector<evhttp_bound_socket *> boundSockets;
diff --git a/src/init.cpp b/src/init.cpp
index 25b2ca72090c..bfa35a053cc1 100644
--- a/src/init.cpp
+++ b/src/init.cpp
@@ -800,7 +800,7 @@ void SetupServerArgs(ArgsManager& argsman)
 }
 
 static bool fHaveGenesis = false;
-static Mutex g_genesis_wait_mutex;
+static GlobalMutex g_genesis_wait_mutex;
 static std::condition_variable g_genesis_wait_cv;
 
 static void BlockNotifyGenesisWait(const CBlockIndex* pBlockIndex)
diff --git a/src/net.cpp b/src/net.cpp
index b339dd451460..ea96b1162a40 100644
--- a/src/net.cpp
+++ b/src/net.cpp
@@ -128,7 +128,7 @@ static const uint64_t RANDOMIZER_ID_ADDRCACHE = 0x1cf2e4ddd306dda9ULL; // SHA256
 //
 bool fDiscover = true;
 bool fListen = true;
-Mutex g_maplocalhost_mutex;
+GlobalMutex g_maplocalhost_mutex;
 std::map<CNetAddr, LocalServiceInfo> mapLocalHost GUARDED_BY(g_maplocalhost_mutex);
 std::string strSubVersion;
 
diff --git a/src/net.h b/src/net.h
index 33740a656b10..bbbc260a1e11 100644
--- a/src/net.h
+++ b/src/net.h
@@ -199,7 +199,7 @@ struct LocalServiceInfo {
     uint16_t nPort;
 };
 
-extern Mutex g_maplocalhost_mutex;
+extern GlobalMutex g_maplocalhost_mutex;
 extern std::map<CNetAddr, LocalServiceInfo> mapLocalHost GUARDED_BY(g_maplocalhost_mutex);
 
 extern const std::string NET_MESSAGE_TYPE_OTHER;
diff --git a/src/net_processing.cpp b/src/net_processing.cpp
index e449f31d7b27..284b7942ef75 100644
--- a/src/net_processing.cpp
+++ b/src/net_processing.cpp
@@ -332,7 +332,7 @@ struct Peer {
         return m_tx_relay.get();
     };
 
-    TxRelay* GetInvRelay() LOCKS_EXCLUDED(m_tx_relay_mutex)
+    TxRelay* GetInvRelay() EXCLUSIVE_LOCKS_REQUIRED(!m_tx_relay_mutex)
     {
         return WITH_LOCK(m_tx_relay_mutex, return m_tx_relay.get());
     }
diff --git a/src/netbase.cpp b/src/netbase.cpp
index 64034b919b50..7ac84ad4e3d0 100644
--- a/src/netbase.cpp
+++ b/src/netbase.cpp
@@ -29,7 +29,7 @@
 #endif
 
 // Settings
-static Mutex g_proxyinfo_mutex;
+static GlobalMutex g_proxyinfo_mutex;
 static Proxy proxyInfo[NET_MAX] GUARDED_BY(g_proxyinfo_mutex);
 static Proxy nameProxy GUARDED_BY(g_proxyinfo_mutex);
 int nConnectTimeout = DEFAULT_CONNECT_TIMEOUT;
diff --git a/src/qt/clientmodel.h b/src/qt/clientmodel.h
index f4f39a4f61f1..241639e2cd14 100644
--- a/src/qt/clientmodel.h
+++ b/src/qt/clientmodel.h
@@ -123,7 +123,7 @@ class ClientModel : public QObject
     std::unique_ptr<CDeterministicMNList> mnListCached GUARDED_BY(cs_mnlist){};
     const CBlockIndex* mnListTip{nullptr};
 
-    void TipChanged(SynchronizationState sync_state, interfaces::BlockTip tip, double verification_progress, bool header);
+    void TipChanged(SynchronizationState sync_state, interfaces::BlockTip tip, double verification_progress, bool header) EXCLUSIVE_LOCKS_REQUIRED(!m_cached_tip_mutex);
     void subscribeToCoreSignals();
     void unsubscribeFromCoreSignals();
 
diff --git a/src/rpc/blockchain.cpp b/src/rpc/blockchain.cpp
index 35e4d54c1f25..ac07d6a5a029 100644
--- a/src/rpc/blockchain.cpp
+++ b/src/rpc/blockchain.cpp
@@ -77,7 +77,7 @@ struct CUpdatedBlock
     int height;
 };
 
-static Mutex cs_blockchange;
+static GlobalMutex cs_blockchange;
 static std::condition_variable cond_blockchange;
 static CUpdatedBlock latestblock GUARDED_BY(cs_blockchange);
 
diff --git a/src/rpc/server.cpp b/src/rpc/server.cpp
index 80e07ad9b1d5..1932268917ae 100644
--- a/src/rpc/server.cpp
+++ b/src/rpc/server.cpp
@@ -23,14 +23,14 @@
 #include <mutex>
 #include <unordered_map>
 
-static Mutex g_rpc_warmup_mutex;
+static GlobalMutex g_rpc_warmup_mutex;
 static std::atomic<bool> g_rpc_running{false};
 static bool fRPCInWarmup GUARDED_BY(g_rpc_warmup_mutex) = true;
 static std::string rpcWarmupStatus GUARDED_BY(g_rpc_warmup_mutex) = "RPC server started";
 /* Timer-creating functions */
 static RPCTimerInterface* timerInterface = nullptr;
 /* Map of name to timer. */
-static Mutex g_deadline_timers_mutex;
+static GlobalMutex g_deadline_timers_mutex;
 static std::map<std::string, std::unique_ptr<RPCTimerBase> > deadlineTimers GUARDED_BY(g_deadline_timers_mutex);
 static bool ExecuteCommand(const CRPCCommand& command, const JSONRPCRequest& request, UniValue& result, bool last_handler);
 
diff --git a/src/sync.h b/src/sync.h
index 6d10e10637ce..8ca945cca76f 100644
--- a/src/sync.h
+++ b/src/sync.h
@@ -144,6 +144,17 @@ using RecursiveMutex = AnnotatedMixin<std::recursive_mutex>;
 /** Wrapped mutex: supports waiting but not recursive locking */
 using Mutex = AnnotatedMixin<std::mutex>;
 
+/** Different type to mark Mutex at global scope
+ *
+ * Thread safety analysis can't handle negative assertions about mutexes
+ * with global scope well, so mark them with a separate type, and
+ * eventually move all the mutexes into classes so they are not globally
+ * visible.
+ *
+ * See: https://github.com/bitcoin/bitcoin/pull/20272#issuecomment-720755781
+ */
+class GlobalMutex : public Mutex { };
+
 /** Wrapped shared mutex: supports read locking via .shared_lock, exclusive locking via .lock;
  * does not support recursive locking */
 using SharedMutex = SharedAnnotatedMixin<std::shared_mutex>;
@@ -152,6 +163,7 @@ using SharedMutex = SharedAnnotatedMixin<std::shared_mutex>;
 
 inline void AssertLockNotHeldInline(const char* name, const char* file, int line, Mutex* cs) EXCLUSIVE_LOCKS_REQUIRED(!cs) { AssertLockNotHeldInternal(name, file, line, cs); }
 inline void AssertLockNotHeldInline(const char* name, const char* file, int line, RecursiveMutex* cs) LOCKS_EXCLUDED(cs) { AssertLockNotHeldInternal(name, file, line, cs); }
+inline void AssertLockNotHeldInline(const char* name, const char* file, int line, GlobalMutex* cs) LOCKS_EXCLUDED(cs) { AssertLockNotHeldInternal(name, file, line, cs); }
 inline void AssertLockNotHeldInline(const char* name, const char* file, int line, SharedMutex* cs) LOCKS_EXCLUDED(cs) { AssertLockNotHeldInternal(name, file, line, cs); }
 #define AssertLockNotHeld(cs) AssertLockNotHeldInline(#cs, __FILE__, __LINE__, &cs)
 
@@ -308,14 +320,33 @@ using DebugLock = UniqueLock<typename std::remove_reference<typename std::remove
 template<typename MutexArg>
 using ReadLock = SharedLock<typename std::remove_reference<typename std::remove_pointer<MutexArg>::type>::type>;
 
-#define LOCK(cs) DebugLock<decltype(cs)> UNIQUE_NAME(criticalblock)(cs, #cs, __FILE__, __LINE__)
-#define READ_LOCK(cs) ReadLock<decltype(cs)> UNIQUE_NAME(criticalblock)(cs, #cs, __FILE__, __LINE__)
+// When locking a Mutex, require negative capability to ensure the lock
+// is not already held
+inline Mutex& MaybeCheckNotHeld(Mutex& cs) EXCLUSIVE_LOCKS_REQUIRED(!cs) LOCK_RETURNED(cs) { return cs; }
+inline Mutex* MaybeCheckNotHeld(Mutex* cs) EXCLUSIVE_LOCKS_REQUIRED(!cs) LOCK_RETURNED(cs) { return cs; }
+
+// When locking a GlobalMutex, just check it is not locked in the surrounding scope
+inline GlobalMutex& MaybeCheckNotHeld(GlobalMutex& cs) LOCKS_EXCLUDED(cs) LOCK_RETURNED(cs) { return cs; }
+inline GlobalMutex* MaybeCheckNotHeld(GlobalMutex* cs) LOCKS_EXCLUDED(cs) LOCK_RETURNED(cs) { return cs; }
+
+// When locking a RecursiveMutex, it's okay to already hold the lock
+// but check that it is not known to be locked in the surrounding scope anyway
+inline RecursiveMutex& MaybeCheckNotHeld(RecursiveMutex& cs) LOCKS_EXCLUDED(cs) LOCK_RETURNED(cs) { return cs; }
+inline RecursiveMutex* MaybeCheckNotHeld(RecursiveMutex* cs) LOCKS_EXCLUDED(cs) LOCK_RETURNED(cs) { return cs; }
+
+// When locking a SharedMutex, it's okay to already hold the lock
+// but check that it is not known to be locked in the surrounding scope anyway
+inline SharedMutex& MaybeCheckNotHeld(SharedMutex& cs) LOCKS_EXCLUDED(cs) LOCK_RETURNED(cs) { return cs; }
+inline SharedMutex* MaybeCheckNotHeld(SharedMutex* cs) LOCKS_EXCLUDED(cs) LOCK_RETURNED(cs) { return cs; }
+
+#define LOCK(cs) DebugLock<decltype(cs)> UNIQUE_NAME(criticalblock)(MaybeCheckNotHeld(cs), #cs, __FILE__, __LINE__)
+#define READ_LOCK(cs) ReadLock<decltype(cs)> UNIQUE_NAME(criticalblock)(MaybeCheckNotHeld(cs), #cs, __FILE__, __LINE__)
 #define LOCK2(cs1, cs2)                                               \
-    DebugLock<decltype(cs1)> criticalblock1(cs1, #cs1, __FILE__, __LINE__); \
-    DebugLock<decltype(cs2)> criticalblock2(cs2, #cs2, __FILE__, __LINE__)
-#define TRY_LOCK(cs, name) DebugLock<decltype(cs)> name(cs, #cs, __FILE__, __LINE__, true)
-#define TRY_READ_LOCK(cs, name) ReadLock<decltype(cs)> name(cs, #cs, __FILE__, __LINE__, true)
-#define WAIT_LOCK(cs, name) DebugLock<decltype(cs)> name(cs, #cs, __FILE__, __LINE__)
+    DebugLock<decltype(cs1)> criticalblock1(MaybeCheckNotHeld(cs1), #cs1, __FILE__, __LINE__); \
+    DebugLock<decltype(cs2)> criticalblock2(MaybeCheckNotHeld(cs2), #cs2, __FILE__, __LINE__)
+#define TRY_LOCK(cs, name) DebugLock<decltype(cs)> name(MaybeCheckNotHeld(cs), #cs, __FILE__, __LINE__, true)
+#define TRY_READ_LOCK(cs, name) ReadLock<decltype(cs)> name(MaybeCheckNotHeld(cs), #cs, __FILE__, __LINE__, true)
+#define WAIT_LOCK(cs, name) DebugLock<decltype(cs)> name(MaybeCheckNotHeld(cs), #cs, __FILE__, __LINE__)
 
 #define ENTER_CRITICAL_SECTION(cs)                            \
     {                                                         \
@@ -354,8 +385,8 @@ using ReadLock = SharedLock<typename std::remove_reference<typename std::remove_
 //!
 //! The above is detectable at compile-time with the -Wreturn-local-addr flag in
 //! gcc and the -Wreturn-stack-address flag in clang, both enabled by default.
-#define WITH_LOCK(cs, code) [&]() -> decltype(auto) { LOCK(cs); code; }()
-#define WITH_READ_LOCK(cs, code) [&]() -> decltype(auto) { READ_LOCK(cs); code; }()
+#define WITH_LOCK(cs, code) (MaybeCheckNotHeld(cs), [&]() -> decltype(auto) { LOCK(cs); code; }())
+#define WITH_READ_LOCK(cs, code) (MaybeCheckNotHeld(cs), [&]() -> decltype(auto) { READ_LOCK(cs); code; }())
 
 /** An implementation of a semaphore.
  *
diff --git a/src/timedata.cpp b/src/timedata.cpp
index 8debca706562..ceee08e68c4e 100644
--- a/src/timedata.cpp
+++ b/src/timedata.cpp
@@ -16,7 +16,7 @@
 #include <util/translation.h>
 #include <warnings.h>
 
-static Mutex g_timeoffset_mutex;
+static GlobalMutex g_timeoffset_mutex;
 static int64_t nTimeOffset GUARDED_BY(g_timeoffset_mutex) = 0;
 
 /**
diff --git a/src/util/system.cpp b/src/util/system.cpp
index e92324817c23..efa58bbd22cf 100644
--- a/src/util/system.cpp
+++ b/src/util/system.cpp
@@ -97,7 +97,7 @@ const char * const BITCOIN_SETTINGS_FILENAME = "settings.json";
 ArgsManager gArgs;
 
 /** Mutex to protect dir_locks. */
-static Mutex cs_dir_locks;
+static GlobalMutex cs_dir_locks;
 
 /** A map that contains all the currently held directory locks. After
  * successful locking, these will be held here until the global destructor
diff --git a/src/validation.cpp b/src/validation.cpp
index 967fe2d716b3..5354f8909c88 100644
--- a/src/validation.cpp
+++ b/src/validation.cpp
@@ -125,7 +125,7 @@ static constexpr int PRUNE_LOCK_BUFFER{10};
  */
 RecursiveMutex cs_main;
 
-Mutex g_best_block_mutex;
+GlobalMutex g_best_block_mutex;
 std::condition_variable g_best_block_cv;
 uint256 g_best_block;
 bool g_parallel_script_checks{false};
diff --git a/src/validation.h b/src/validation.h
index 5da4e69f203f..31318029cf8e 100644
--- a/src/validation.h
+++ b/src/validation.h
@@ -111,7 +111,7 @@ enum class SynchronizationState {
 };
 
 extern RecursiveMutex cs_main;
-extern Mutex g_best_block_mutex;
+extern GlobalMutex g_best_block_mutex;
 extern std::condition_variable g_best_block_cv;
 /** Used to notify getblocktemplate RPC of new tips. */
 extern uint256 g_best_block;
diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp
index e9c09e8186e0..1caf30747a3b 100644
--- a/src/wallet/wallet.cpp
+++ b/src/wallet/wallet.cpp
@@ -197,8 +197,8 @@ void NotifyWalletLoaded(WalletContext& context, const std::shared_ptr<CWallet>&
     }
 }
 
-static Mutex g_loading_wallet_mutex;
-static Mutex g_wallet_release_mutex;
+static GlobalMutex g_loading_wallet_mutex;
+static GlobalMutex g_wallet_release_mutex;
 static std::condition_variable g_wallet_release_cv;
 static std::set<std::string> g_loading_wallet_set GUARDED_BY(g_loading_wallet_mutex);
 static std::set<std::string> g_unloading_wallet_set GUARDED_BY(g_wallet_release_mutex);
diff --git a/src/warnings.cpp b/src/warnings.cpp
index a4ba98333c0f..85719d2dcdb1 100644
--- a/src/warnings.cpp
+++ b/src/warnings.cpp
@@ -13,7 +13,7 @@
 
 #include <vector>
 
-static Mutex g_warnings_mutex;
+static GlobalMutex g_warnings_mutex;
 static bilingual_str g_misc_warnings GUARDED_BY(g_warnings_mutex);
 static bool fLargeWorkInvalidChainFound GUARDED_BY(g_warnings_mutex) = false;
 

From 896c4ae0185257c43be066fcc28827b90d85a31b Mon Sep 17 00:00:00 2001
From: Hennadii Stepanov <32963518+hebasto@users.noreply.github.com>
Date: Thu, 2 Jun 2022 19:34:14 +0200
Subject: [PATCH 091/656] Merge bitcoin-core/gui#583: Add translator comments
 to `TransactionDesc::FormatTxStatus`

8cfb5627d51ecaa1d1e92ec21e2ac56a380c77e6 qt, refactor: add translator comments in `TransactionDesc::FormatTxStatus()` (w0xlt)

Pull request description:

  This PR adds translator comments to `TransactionDesc::FormatTxStatus` as suggested in https://github.com/bitcoin-core/gui/pull/552#discussion_r812602741 and https://github.com/bitcoin-core/gui/pull/552#issuecomment-1097294710.

ACKs for top commit:
  hebasto:
    ACK 8cfb5627d51ecaa1d1e92ec21e2ac56a380c77e6

Tree-SHA512: 2c44b915e6309508f34fc22bb90e3d88ad32ed82fdb3a395f7c6716941edc1b311991140d28e838ad622a7484ed86aedd25e55674857fec8716d9575aed25fa0
---
 src/qt/transactiondesc.cpp | 28 +++++++++++++++++++++++++++-
 1 file changed, 27 insertions(+), 1 deletion(-)

diff --git a/src/qt/transactiondesc.cpp b/src/qt/transactiondesc.cpp
index bb6ac6992289..a1c91b64bd56 100644
--- a/src/qt/transactiondesc.cpp
+++ b/src/qt/transactiondesc.cpp
@@ -35,25 +35,51 @@ using wallet::isminetype;
 QString TransactionDesc::FormatTxStatus(const interfaces::WalletTxStatus& status, bool inMempool)
 {
     int depth = status.depth_in_main_chain;
-    if (depth < 0) return tr("conflicted");
+    if (depth < 0) {
+        /*: Text explaining the current status of a transaction, shown in the
+            status field of the details window for this transaction. This status
+            represents an unconfirmed transaction that conflicts with a confirmed
+            transaction. */
+        return tr("conflicted with a transaction with %1 confirmations").arg(-depth);
+    }
 
     QString strTxStatus;
     bool fChainLocked = status.is_chainlocked;
 
     if (depth == 0) {
+        /*: Text explaining the current status of a transaction, shown in the
+            status field of the details window for this transaction. This
+            status represents an abandoned transaction. */
         const QString abandoned{status.is_abandoned ? QLatin1String(", ") + tr("abandoned") : QString()};
+        /*: Text explaining the current status of a transaction, shown in the
+            status field of the details window for this transaction. This status
+            represents an unconfirmed transaction that is in the memory pool. */
         strTxStatus = tr("0/unconfirmed, %1").arg((inMempool ? tr("in memory pool") : tr("not in memory pool"))) + abandoned;
     } else if (!fChainLocked && depth < 6) {
+        /*: Text explaining the current status of a transaction, shown in the
+            status field of the details window for this transaction. This status
+            represents a transaction confirmed in at least one block,
+            but less than 6 blocks, and still not locked via ChainLocks. */
         strTxStatus = tr("%1/unconfirmed").arg(depth);
     } else {
+        /*: Text explaining the current status of a transaction, shown in the
+            status field of the details window for this transaction. This
+            status represents a transaction confirmed in 6 or more blocks
+            or locked via ChainLocks. */
         strTxStatus = tr("%1 confirmations").arg(depth);
         if (fChainLocked) {
+            /*: Text explaining the current status of a transaction, shown in the
+                status field of the details window for this transaction. This status
+                represents a transaction confirmed in at least one block and has been locked by ChainLocks. */
             strTxStatus += QLatin1String(", ") + tr("locked via ChainLocks");
             return strTxStatus;
         }
     }
 
     if (status.is_islocked) {
+        /*: Text explaining the current status of a transaction, shown in the
+            status field of the details window for this transaction. This status
+            represents an unconfirmed transaction that has been locked by InstantSend. */
         strTxStatus += QLatin1String(", ") + tr("verified via InstantSend");
     }
 

From 23688537ff872ac5a50dea436bab9e5943354017 Mon Sep 17 00:00:00 2001
From: MacroFake <falke.marco@gmail.com>
Date: Fri, 27 May 2022 15:15:24 +0200
Subject: [PATCH 092/656] Merge bitcoin/bitcoin#24408: rpc: add rpc to get
 mempool txs spending specific prevouts

418557034055f740951294e7677ae9fd5149ea9b Add RPC to get mempool txs spending outputs (t-bast)

Pull request description:

  We add an RPC to fetch mempool transactions spending any of the given outpoints.

  Without this RPC, application developers need to first call `getrawmempool` which returns a long list of `txid`, then fetch each of these transactions individually (`getrawtransaction`) to check whether they spend the given outpoints, which wastes a lot of bandwidth (in the worst case we need to transfer the whole mempool).

  For example in lightning, when we discover that one of our channel funding transactions has been spent, we need to find the spending transaction to claim our outputs from it. We are currently forced to fetch the whole mempool to do the analysis ourselves, which is quite costly.

  I believe that this RPC is also generally useful when doing some introspection on your mempool after one of your transactions failed to broadcast, for example when you implement RBF at the application level. Fetching and analyzing the conflicting transaction gives you more information to successfully replace it.

ACKs for top commit:
  darosior:
    re-utACK 418557034055f740951294e7677ae9fd5149ea9b
  vincenzopalazzo:
    re-ACK https://github.com/bitcoin/bitcoin/pull/24408/commits/418557034055f740951294e7677ae9fd5149ea9b
  danielabrozzoni:
    re-tACK 418557034055f740951294e7677ae9fd5149ea9b
  w0xlt:
    reACK https://github.com/bitcoin/bitcoin/pull/24408/commits/418557034055f740951294e7677ae9fd5149ea9b

Tree-SHA512: 206687efb720308b7e0b6cf16dd0a994006c0b5a290c8eb386917a80130973a6356d0d5cae1c63a01bb29e066dd721594969db106cba7249214fcac90d2c3dbc
---
 doc/release-notes/release-notes-24408.md |   5 ++
 src/rpc/client.cpp                       |   1 +
 src/rpc/mempool.cpp                      |  84 +++++++++++++++++++
 src/test/fuzz/rpc.cpp                    |   1 +
 test/functional/mempool_packages.py      |   6 ++
 test/functional/rpc_mempool_info.py      | 102 +++++++++++++++++++++++
 test/functional/test_runner.py           |   1 +
 7 files changed, 200 insertions(+)
 create mode 100644 doc/release-notes/release-notes-24408.md
 create mode 100755 test/functional/rpc_mempool_info.py

diff --git a/doc/release-notes/release-notes-24408.md b/doc/release-notes/release-notes-24408.md
new file mode 100644
index 000000000000..1072ec786a53
--- /dev/null
+++ b/doc/release-notes/release-notes-24408.md
@@ -0,0 +1,5 @@
+New RPCs
+--------
+
+- A new `gettxspendingprevout` RPC has been added, which scans the mempool to find
+  transactions spending any of the given outpoints. (#24408)
\ No newline at end of file
diff --git a/src/rpc/client.cpp b/src/rpc/client.cpp
index eeb75eba835d..92378a3455a7 100644
--- a/src/rpc/client.cpp
+++ b/src/rpc/client.cpp
@@ -199,6 +199,7 @@ static const CRPCConvertParam vRPCConvertParams[] =
     { "setwalletflag", 1, "value" },
     { "getmempoolancestors", 1, "verbose" },
     { "getmempooldescendants", 1, "verbose" },
+    { "gettxspendingprevout", 0, "outputs" },
     { "logging", 0, "include" },
     { "logging", 1, "exclude" },
     { "sporkupdate", 1, "value" },
diff --git a/src/rpc/mempool.cpp b/src/rpc/mempool.cpp
index 929ac1037099..33eef2952162 100644
--- a/src/rpc/mempool.cpp
+++ b/src/rpc/mempool.cpp
@@ -593,6 +593,89 @@ static RPCHelpMan getmempoolentry()
     };
 }
 
+static RPCHelpMan gettxspendingprevout()
+{
+    return RPCHelpMan{"gettxspendingprevout",
+        "Scans the mempool to find transactions spending any of the given outputs",
+        {
+            {"outputs", RPCArg::Type::ARR, RPCArg::Optional::NO, "The transaction outputs that we want to check, and within each, the txid (string) vout (numeric).",
+                {
+                    {"", RPCArg::Type::OBJ, RPCArg::Optional::OMITTED, "",
+                        {
+                            {"txid", RPCArg::Type::STR_HEX, RPCArg::Optional::NO, "The transaction id"},
+                            {"vout", RPCArg::Type::NUM, RPCArg::Optional::NO, "The output number"},
+                        },
+                    },
+                },
+            },
+        },
+        RPCResult{
+            RPCResult::Type::ARR, "", "",
+            {
+                {RPCResult::Type::OBJ, "", "",
+                {
+                    {RPCResult::Type::STR_HEX, "txid", "the transaction id of the checked output"},
+                    {RPCResult::Type::NUM, "vout", "the vout value of the checked output"},
+                    {RPCResult::Type::STR_HEX, "spendingtxid", /*optional=*/true, "the transaction id of the mempool transaction spending this output (omitted if unspent)"},
+                }},
+            }
+        },
+        RPCExamples{
+            HelpExampleCli("gettxspendingprevout", "\"[{\\\"txid\\\":\\\"a08e6907dbbd3d809776dbfc5d82e371b764ed838b5655e72f463568df1aadf0\\\",\\\"vout\\\":3}]\"")
+            + HelpExampleRpc("gettxspendingprevout", "\"[{\\\"txid\\\":\\\"a08e6907dbbd3d809776dbfc5d82e371b764ed838b5655e72f463568df1aadf0\\\",\\\"vout\\\":3}]\"")
+        },
+        [&](const RPCHelpMan& self, const JSONRPCRequest& request) -> UniValue
+        {
+            RPCTypeCheckArgument(request.params[0], UniValue::VARR);
+            const UniValue& output_params = request.params[0];
+            if (output_params.empty()) {
+                throw JSONRPCError(RPC_INVALID_PARAMETER, "Invalid parameter, outputs are missing");
+            }
+
+            std::vector<COutPoint> prevouts;
+            prevouts.reserve(output_params.size());
+
+            for (unsigned int idx = 0; idx < output_params.size(); idx++) {
+                const UniValue& o = output_params[idx].get_obj();
+
+                RPCTypeCheckObj(o,
+                                {
+                                    {"txid", UniValueType(UniValue::VSTR)},
+                                    {"vout", UniValueType(UniValue::VNUM)},
+                                }, /*fAllowNull=*/false, /*fStrict=*/true);
+
+                const uint256 txid(ParseHashO(o, "txid"));
+                const int nOutput{o.find_value("vout").getInt<int>()};
+                if (nOutput < 0) {
+                    throw JSONRPCError(RPC_INVALID_PARAMETER, "Invalid parameter, vout cannot be negative");
+                }
+
+                prevouts.emplace_back(txid, nOutput);
+            }
+
+            const CTxMemPool& mempool = EnsureAnyMemPool(request.context);
+            LOCK(mempool.cs);
+
+            UniValue result{UniValue::VARR};
+
+            for (const COutPoint& prevout : prevouts) {
+                UniValue o(UniValue::VOBJ);
+                o.pushKV("txid", prevout.hash.ToString());
+                o.pushKV("vout", (uint64_t)prevout.n);
+
+                const CTransaction* spendingTx = mempool.GetConflictTx(prevout);
+                if (spendingTx != nullptr) {
+                    o.pushKV("spendingtxid", spendingTx->GetHash().ToString());
+                }
+
+                result.push_back(o);
+            }
+
+            return result;
+        },
+    };
+}
+
 UniValue MempoolInfoToJSON(const CTxMemPool& pool, const llmq::CInstantSendManager& isman)
 {
     // Make sure this call is atomic in the pool.
@@ -688,6 +771,7 @@ void RegisterMempoolRPCCommands(CRPCTable& t)
         {"blockchain", &getmempoolancestors},
         {"blockchain", &getmempooldescendants},
         {"blockchain", &getmempoolentry},
+        {"blockchain", &gettxspendingprevout},
         {"blockchain", &getmempoolinfo},
         {"blockchain", &getrawmempool},
         {"blockchain", &savemempool},
diff --git a/src/test/fuzz/rpc.cpp b/src/test/fuzz/rpc.cpp
index c959523a1681..b95b93425e8e 100644
--- a/src/test/fuzz/rpc.cpp
+++ b/src/test/fuzz/rpc.cpp
@@ -125,6 +125,7 @@ const std::vector<std::string> RPC_COMMANDS_SAFE_FOR_FUZZING{
     "getmempoolancestors",
     "getmempooldescendants",
     "getmempoolentry",
+    "gettxspendingprevout",
     "getmempoolinfo",
     "getmininginfo",
     "getnettotals",
diff --git a/test/functional/mempool_packages.py b/test/functional/mempool_packages.py
index 0a9d227aadeb..b922a7678bf4 100755
--- a/test/functional/mempool_packages.py
+++ b/test/functional/mempool_packages.py
@@ -99,6 +99,12 @@ def run_test(self):
             entry = self.nodes[0].getmempoolentry(x)
             assert_equal(entry, mempool[x])
 
+            # Check that gettxspendingprevout is consistent with getrawmempool
+            witnesstx = self.nodes[0].gettransaction(txid=x, verbose=True)['decoded']
+            for tx_in in witnesstx["vin"]:
+                spending_result = self.nodes[0].gettxspendingprevout([ {'txid' : tx_in["txid"], 'vout' : tx_in["vout"]} ])
+                assert_equal(spending_result, [ {'txid' : tx_in["txid"], 'vout' : tx_in["vout"], 'spendingtxid' : x} ])
+
             # Check that the descendant calculations are correct
             assert_equal(entry['descendantcount'], descendant_count)
             descendant_fees += entry['fees']['base']
diff --git a/test/functional/rpc_mempool_info.py b/test/functional/rpc_mempool_info.py
new file mode 100755
index 000000000000..cd7a48d387ea
--- /dev/null
+++ b/test/functional/rpc_mempool_info.py
@@ -0,0 +1,102 @@
+#!/usr/bin/env python3
+# Copyright (c) 2014-2022 The Bitcoin Core developers
+# Distributed under the MIT software license, see the accompanying
+# file COPYING or http://www.opensource.org/licenses/mit-license.php.
+"""Test RPCs that retrieve information from the mempool."""
+
+from test_framework.blocktools import COINBASE_MATURITY
+from test_framework.test_framework import BitcoinTestFramework
+from test_framework.util import (
+    assert_equal,
+    assert_raises_rpc_error,
+)
+from test_framework.wallet import MiniWallet
+
+
+class RPCMempoolInfoTest(BitcoinTestFramework):
+    def set_test_params(self):
+        self.num_nodes = 1
+
+    def run_test(self):
+        self.wallet = MiniWallet(self.nodes[0])
+        self.generate(self.wallet, COINBASE_MATURITY + 1)
+        self.wallet.rescan_utxos()
+        confirmed_utxo = self.wallet.get_utxo()
+
+        # Create a tree of unconfirmed transactions in the mempool:
+        #             txA
+        #             / \
+        #            /   \
+        #           /     \
+        #          /       \
+        #         /         \
+        #       txB         txC
+        #       / \         / \
+        #      /   \       /   \
+        #    txD   txE   txF   txG
+        #            \   /
+        #             \ /
+        #             txH
+
+        def create_tx(**kwargs):
+            return self.wallet.send_self_transfer_multi(
+                from_node=self.nodes[0],
+                **kwargs,
+            )
+
+        txA = create_tx(utxos_to_spend=[confirmed_utxo], num_outputs=2)
+        txB = create_tx(utxos_to_spend=[txA["new_utxos"][0]], num_outputs=2)
+        txC = create_tx(utxos_to_spend=[txA["new_utxos"][1]], num_outputs=2)
+        txD = create_tx(utxos_to_spend=[txB["new_utxos"][0]], num_outputs=1)
+        txE = create_tx(utxos_to_spend=[txB["new_utxos"][1]], num_outputs=1)
+        txF = create_tx(utxos_to_spend=[txC["new_utxos"][0]], num_outputs=2)
+        txG = create_tx(utxos_to_spend=[txC["new_utxos"][1]], num_outputs=1)
+        txH = create_tx(utxos_to_spend=[txE["new_utxos"][0],txF["new_utxos"][0]], num_outputs=1)
+        txidA, txidB, txidC, txidD, txidE, txidF, txidG, txidH = [
+            tx["txid"] for tx in [txA, txB, txC, txD, txE, txF, txG, txH]
+        ]
+
+        mempool = self.nodes[0].getrawmempool()
+        assert_equal(len(mempool), 8)
+        for txid in [txidA, txidB, txidC, txidD, txidE, txidF, txidG, txidH]:
+            assert_equal(txid in mempool, True)
+
+        self.log.info("Find transactions spending outputs")
+        result = self.nodes[0].gettxspendingprevout([ {'txid' : confirmed_utxo['txid'], 'vout' : 0}, {'txid' : txidA, 'vout' : 1} ])
+        assert_equal(result, [ {'txid' : confirmed_utxo['txid'], 'vout' : 0, 'spendingtxid' : txidA}, {'txid' : txidA, 'vout' : 1, 'spendingtxid' : txidC} ])
+
+        self.log.info("Find transaction spending multiple outputs")
+        result = self.nodes[0].gettxspendingprevout([ {'txid' : txidE, 'vout' : 0}, {'txid' : txidF, 'vout' : 0} ])
+        assert_equal(result, [ {'txid' : txidE, 'vout' : 0, 'spendingtxid' : txidH}, {'txid' : txidF, 'vout' : 0, 'spendingtxid' : txidH} ])
+
+        self.log.info("Find no transaction when output is unspent")
+        result = self.nodes[0].gettxspendingprevout([ {'txid' : txidH, 'vout' : 0} ])
+        assert_equal(result, [ {'txid' : txidH, 'vout' : 0} ])
+        result = self.nodes[0].gettxspendingprevout([ {'txid' : txidA, 'vout' : 5} ])
+        assert_equal(result, [ {'txid' : txidA, 'vout' : 5} ])
+
+        self.log.info("Mixed spent and unspent outputs")
+        result = self.nodes[0].gettxspendingprevout([ {'txid' : txidB, 'vout' : 0}, {'txid' : txidG, 'vout' : 3} ])
+        assert_equal(result, [ {'txid' : txidB, 'vout' : 0, 'spendingtxid' : txidD}, {'txid' : txidG, 'vout' : 3} ])
+
+        self.log.info("Unknown input fields")
+        assert_raises_rpc_error(-3, "Unexpected key unknown", self.nodes[0].gettxspendingprevout, [{'txid' : txidC, 'vout' : 1, 'unknown' : 42}])
+
+        self.log.info("Invalid vout provided")
+        assert_raises_rpc_error(-8, "Invalid parameter, vout cannot be negative", self.nodes[0].gettxspendingprevout, [{'txid' : txidA, 'vout' : -1}])
+
+        self.log.info("Invalid txid provided")
+        assert_raises_rpc_error(-3, "Expected type string for txid, got number", self.nodes[0].gettxspendingprevout, [{'txid' : 42, 'vout' : 0}])
+
+        self.log.info("Missing outputs")
+        assert_raises_rpc_error(-8, "Invalid parameter, outputs are missing", self.nodes[0].gettxspendingprevout, [])
+
+        self.log.info("Missing vout")
+        assert_raises_rpc_error(-3, "Missing vout", self.nodes[0].gettxspendingprevout, [{'txid' : txidA}])
+
+        self.log.info("Missing txid")
+        assert_raises_rpc_error(-3, "Missing txid", self.nodes[0].gettxspendingprevout, [{'vout' : 3}])
+
+
+if __name__ == '__main__':
+    RPCMempoolInfoTest().main()
diff --git a/test/functional/test_runner.py b/test/functional/test_runner.py
index 602ba0ca70f7..7d517531684f 100755
--- a/test/functional/test_runner.py
+++ b/test/functional/test_runner.py
@@ -393,6 +393,7 @@
     'rpc_getdescriptorinfo.py',
     'rpc_getpeerinfo_deprecation.py',
     'rpc_mempool_entry_fee_fields_deprecation.py',
+    'rpc_mempool_info.py',
     'rpc_help.py',
     'feature_dirsymlinks.py',
     'feature_help.py',

From 3630df6caa7a55eeb733aa2a0bb82bbe8f49c9a9 Mon Sep 17 00:00:00 2001
From: MacroFake <falke.marco@gmail.com>
Date: Fri, 3 Jun 2022 08:46:40 +0200
Subject: [PATCH 093/656] Merge bitcoin/bitcoin#25256: logging: fix logging
 empty thread name

3a171f742c31addf5a343e8a6905054a1fbb12aa logging: fix logging empty threadname (klementtan)

Pull request description:

  Currently, `leveldb` background thread does not have a thread name and as a result, an empty thread name is logged.

  This PR fixes this by logging thread name as `"unknown"` if the thread name is empty

  On master:
  ```txt
  2022-06-02T14:30:38Z [] [leveldb:debug] Generated table #281@0: 1862 keys, 138303 bytes
  ```

  On this PR:
  ```txt
  2022-06-02T14:30:38Z [unknown] [leveldb:debug] Generated table #281@0: 1862 keys, 138303 bytes
  ```

ACKs for top commit:
  laanwj:
    Code review ACK 3a171f742c31addf5a343e8a6905054a1fbb12aa
  hebasto:
    ACK 3a171f742c31addf5a343e8a6905054a1fbb12aa

Tree-SHA512: 0af0fa5c4ddd3640c6dab9595fe9d97f74d0e0f4b41287a6630cf8ac5a21240250e0659ec4ac5a561e888d522f5304bf627104de2aba0fd0a86c1222de0897c2
---
 src/logging.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/logging.cpp b/src/logging.cpp
index 1655206166fa..1b8dc8a91ae4 100644
--- a/src/logging.cpp
+++ b/src/logging.cpp
@@ -462,8 +462,9 @@ void BCLog::Logger::LogPrintStr(const std::string& str, const std::string& loggi
     }
 
     if (m_log_threadnames && m_started_new_line) {
+        const auto threadname = util::ThreadGetInternalName();
         // 16 chars total, "dash-" is 5 of them and another 1 is a NUL terminator
-        str_prefixed.insert(0, "[" + strprintf("%10s", util::ThreadGetInternalName()) + "] ");
+        str_prefixed.insert(0, "[" + strprintf("%10s", (threadname.empty() ? "unknown" : threadname)) + "] ");
     }
 
     str_prefixed = LogTimestampStr(str_prefixed);

From ba3de372bd9ec829cd10199661483f9fe636bab0 Mon Sep 17 00:00:00 2001
From: MacroFake <falke.marco@gmail.com>
Date: Mon, 6 Jun 2022 15:54:28 +0200
Subject: [PATCH 094/656] Merge bitcoin/bitcoin#25276: doc: Fix typo in
 importdescriptors

210cd592cd67e05434c87d6f95e2d8d5b7abc800 doc: Fix typo in importdescriptors (Kolby Moroz Liebl)

Pull request description:

ACKs for top commit:
  1440000bytes:
    ACK https://github.com/bitcoin/bitcoin/pull/25276/commits/210cd592cd67e05434c87d6f95e2d8d5b7abc800
  LarryRuane:
    ACK 210cd592cd67e05434c87d6f95e2d8d5b7abc800
  brunoerg:
    crACK 210cd592cd67e05434c87d6f95e2d8d5b7abc800

Tree-SHA512: 39ff9777b05abc1a68c8c3e646e00b0672838696c567c582d0492baa753863231447fd8439bd41cd8a8b8ba752299b032e839c8862c02faa2bdc207a9a7a8540
---
 src/wallet/rpc/backup.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/wallet/rpc/backup.cpp b/src/wallet/rpc/backup.cpp
index 1e3cf53c5293..8d3d03bf76fa 100644
--- a/src/wallet/rpc/backup.cpp
+++ b/src/wallet/rpc/backup.cpp
@@ -1848,7 +1848,7 @@ RPCHelpMan importdescriptors() {
                 },
                 RPCExamples{
                     HelpExampleCli("importdescriptors", "'[{ \"desc\": \"<my descriptor>\", \"timestamp\":1455191478, \"internal\": true }, "
-                                          "{ \"desc\": \"<my desccriptor 2>\", \"label\": \"example 2\", \"timestamp\": 1455191480 }]'") +
+                                          "{ \"desc\": \"<my descriptor 2>\", \"label\": \"example 2\", \"timestamp\": 1455191480 }]'") +
                     HelpExampleCli("importdescriptors", "'[{ \"desc\": \"<my descriptor>\", \"timestamp\":1455191478, \"active\": true, \"range\": [0,100], \"label\": \"<my wallet>\" }]'")
                 },
         [&](const RPCHelpMan& self, const JSONRPCRequest& main_request) -> UniValue

From 10e09cfe7a4328bcc5f534e15219878a07c5ef0d Mon Sep 17 00:00:00 2001
From: laanwj <126646+laanwj@users.noreply.github.com>
Date: Wed, 22 Jun 2022 13:10:06 +0200
Subject: [PATCH 095/656] Merge bitcoin/bitcoin#25414: doc: Update Arch Linux
 build example

f67b6fce3777ea8dfd23b3983d0b46a2f69d7d77 Update Arch Linux build example (Igor Bubelov)

Pull request description:

  The current build example has two issues:

  1. The claim that the wallet functionality will be missing is obsolete since Bitcoin Core can use SQLite, which is a hard dependency of `pacman` so we can assume that it's always present.
  2. Installing package groups such as `base-devel` adds some friction and uncertainty by forcing readers to choose which packages they need, interactively. Listing required deps explicitly speeds up the whole process, makes it more transparent and cuts the number of installed packages.

ACKs for top commit:
  laanwj:
    re-ACK f67b6fce3777ea8dfd23b3983d0b46a2f69d7d77

Tree-SHA512: c068dac5d244044827d5d94a4b48f239180301b6870dce31b003fa111a69f7e3a483681a7ea2b3d393d6791b40043685ce2fe62c338cce1b7e37a6db0f02b1a2
---
 doc/build-unix.md | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

diff --git a/doc/build-unix.md b/doc/build-unix.md
index 946b4fd0eebd..0a6300557736 100644
--- a/doc/build-unix.md
+++ b/doc/build-unix.md
@@ -272,20 +272,16 @@ A list of additional configure flags can be displayed with:
 
 Setup and Build Example: Arch Linux
 -----------------------------------
-This example lists the steps necessary to setup and build a command line only, non-wallet distribution of the latest changes on Arch Linux:
+This example lists the steps necessary to setup and build a command line only distribution of the latest changes on Arch Linux:
 
 ```sh
-pacman -S git base-devel boost libevent python
+pacman --sync --needed autoconf automake boost gcc git libevent libtool make pkgconf python sqlite
 git clone https://github.com/dashpay/dash.git
 cd dash/
 ./autogen.sh
-./configure --disable-wallet --without-gui --without-miniupnpc
+./configure
 make check
+./src/dashd
 ```
 
-Note:
-Enabling wallet support requires either compiling against a Berkeley DB newer than 4.8 (package `db`) using `--with-incompatible-bdb`,
-or building and depending on a local version of Berkeley DB 4.8. The readily available Arch Linux packages are currently built using
-`--with-incompatible-bdb` according to the [PKGBUILD](https://github.com/archlinux/svntogit-community/blob/packages/bitcoin/trunk/PKGBUILD).
-As mentioned above, when maintaining portability of the wallet between the standard Dash Core distributions and independently built
-node software is desired, Berkeley DB 4.8 must be used.
+If you intend to work with legacy Berkeley DB wallets, see [Berkeley DB](#berkeley-db) section.

From 469e07419fa8448d0b526e46bc091dd51fbedfe5 Mon Sep 17 00:00:00 2001
From: MacroFake <falke.marco@gmail.com>
Date: Wed, 18 May 2022 19:19:45 +0200
Subject: [PATCH 096/656] Merge bitcoin/bitcoin#25108: tidy: add
 modernize-use-default-member-init

ac6fbf2c83578129a0397d0d0dc9b1c6bdb30701 tidy: use modernize-use-default-member-init (fanquake)
7aa40f55636be565441a9e0af8de0a346bfa4da2 refactor: use C++11 default initializers (fanquake)

Pull request description:

  Refactor and then enable [`modernize-use-default-member-init`](https://clang.llvm.org/extra/clang-tidy/checks/modernize-use-default-member-init.html) in our `clang-tidy` job.

Top commit has no ACKs.

Tree-SHA512: 536b406f20639f8c588fe9e96175ec60c7bb825506b2670b562370b2f572801c24203c483443be3c199e1b958c0765d4532e57c57a4e78689162a1dd422d844f
---
 src/.clang-tidy                     | 2 ++
 src/bench/checkqueue.cpp            | 3 +--
 src/bench/prevector.cpp             | 4 ++--
 src/bitcoin-cli.cpp                 | 8 ++++----
 src/httpserver.cpp                  | 8 +++-----
 src/index/txindex.cpp               | 2 +-
 src/net.cpp                         | 2 +-
 src/netaddress.cpp                  | 2 +-
 src/node/context.cpp                | 4 ++--
 src/policy/fees.cpp                 | 4 +---
 src/qt/addresstablemodel.cpp        | 2 +-
 src/qt/bantablemodel.cpp            | 5 +----
 src/qt/bitcoinamountfield.cpp       | 9 ++++-----
 src/qt/notificator.cpp              | 2 +-
 src/qt/overviewpage.cpp             | 4 ++--
 src/qt/paymentserver.cpp            | 4 +---
 src/qt/peertablemodel.cpp           | 5 +----
 src/qt/recentrequeststablemodel.cpp | 5 +----
 src/qt/rpcconsole.cpp               | 4 ++--
 src/qt/transactiontablemodel.cpp    | 2 +-
 src/qt/walletframe.cpp              | 4 +---
 src/qt/walletview.cpp               | 4 +---
 src/random.cpp                      | 4 +---
 src/rpc/blockchain.cpp              | 4 ++--
 src/rpc/mining.cpp                  | 4 ++--
 src/rpc/util.cpp                    | 3 +--
 src/scheduler.cpp                   | 4 +---
 src/script/sign.cpp                 | 2 +-
 src/support/lockedpool.cpp          | 5 ++---
 src/test/checkqueue_tests.cpp       | 4 ++--
 src/test/dbwrapper_tests.cpp        | 2 +-
 src/test/fuzz/signature_checker.cpp | 2 +-
 src/test/script_tests.cpp           | 6 +++---
 src/test/util_tests.cpp             | 4 ++--
 src/torcontrol.cpp                  | 3 +--
 src/txdb.cpp                        | 2 +-
 src/util/system.cpp                 | 4 ++--
 src/validation.cpp                  | 2 +-
 src/wallet/context.cpp              | 4 ++--
 src/wallet/rpc/transactions.cpp     | 4 +---
 src/wallet/walletdb.cpp             | 3 +--
 41 files changed, 63 insertions(+), 92 deletions(-)

diff --git a/src/.clang-tidy b/src/.clang-tidy
index 3d8b242963ff..5ac571061309 100644
--- a/src/.clang-tidy
+++ b/src/.clang-tidy
@@ -1,6 +1,7 @@
 Checks: '
 -*,
 bugprone-argument-comment,
+modernize-use-default-member-init,
 modernize-use-nullptr,
 readability-const-return-type,
 readability-redundant-declaration,
@@ -8,6 +9,7 @@ readability-redundant-string-init,
 '
 WarningsAsErrors: '
 bugprone-argument-comment,
+modernize-use-default-member-init,
 modernize-use-nullptr,
 readability-redundant-declaration,
 readability-redundant-string-init,
diff --git a/src/bench/checkqueue.cpp b/src/bench/checkqueue.cpp
index 85b3ce61bcc7..d861faac243f 100644
--- a/src/bench/checkqueue.cpp
+++ b/src/bench/checkqueue.cpp
@@ -29,8 +29,7 @@ static void CCheckQueueSpeedPrevectorJob(benchmark::Bench& bench)
 
     struct PrevectorJob {
         prevector<PREVECTOR_SIZE, uint8_t> p;
-        PrevectorJob(){
-        }
+        PrevectorJob() = default;
         explicit PrevectorJob(FastRandomContext& insecure_rand){
             p.resize(insecure_rand.randrange(PREVECTOR_SIZE*2));
         }
diff --git a/src/bench/prevector.cpp b/src/bench/prevector.cpp
index 3b2682001fd8..9ff4629741b3 100644
--- a/src/bench/prevector.cpp
+++ b/src/bench/prevector.cpp
@@ -11,8 +11,8 @@
 #include <bench/bench.h>
 
 struct nontrivial_t {
-    int x;
-    nontrivial_t() :x(-1) {}
+    int x{-1};
+    nontrivial_t() = default;
     SERIALIZE_METHODS(nontrivial_t, obj) { READWRITE(obj.x); }
 };
 typedef prevector<28, unsigned char> prevec;
diff --git a/src/bitcoin-cli.cpp b/src/bitcoin-cli.cpp
index 29f262e0c25b..3e94ea5a2689 100644
--- a/src/bitcoin-cli.cpp
+++ b/src/bitcoin-cli.cpp
@@ -199,10 +199,10 @@ static int AppInitRPC(int argc, char* argv[])
 /** Reply structure for request_done to fill in */
 struct HTTPReply
 {
-    HTTPReply(): status(0), error(-1) {}
+    HTTPReply() = default;
 
-    int status;
-    int error;
+    int status{0};
+    int error{-1};
     std::string body;
 };
 
@@ -263,7 +263,7 @@ static void http_error_cb(enum evhttp_request_error err, void *ctx)
 class BaseRequestHandler
 {
 public:
-    virtual ~BaseRequestHandler() {}
+    virtual ~BaseRequestHandler() = default;
     virtual UniValue PrepareRequest(const std::string& method, const std::vector<std::string>& args) = 0;
     virtual UniValue ProcessReply(const UniValue &batch_in) = 0;
 };
diff --git a/src/httpserver.cpp b/src/httpserver.cpp
index fe8c8879ea43..60c5b9e89035 100644
--- a/src/httpserver.cpp
+++ b/src/httpserver.cpp
@@ -72,20 +72,18 @@ class WorkQueue
     std::condition_variable cond GUARDED_BY(cs);
     std::deque<std::unique_ptr<WorkItem>> queue GUARDED_BY(cs);
     std::deque<std::unique_ptr<WorkItem>> external_queue GUARDED_BY(cs);
-    bool running GUARDED_BY(cs);
+    bool running GUARDED_BY(cs){true};
     const size_t maxDepth;
     const size_t m_external_depth;
 
 public:
-    explicit WorkQueue(size_t _maxDepth, size_t external_depth) : running(true),
+    explicit WorkQueue(size_t _maxDepth, size_t external_depth) :
                                  maxDepth(_maxDepth), m_external_depth(external_depth)
     {
     }
     /** Precondition: worker threads have all stopped (they have been joined).
      */
-    ~WorkQueue()
-    {
-    }
+    ~WorkQueue() = default;
     /** Enqueue a work item */
     bool Enqueue(WorkItem* item, bool is_external) EXCLUSIVE_LOCKS_REQUIRED(!cs)
     {
diff --git a/src/index/txindex.cpp b/src/index/txindex.cpp
index 75e8bea7033f..5c2c78454331 100644
--- a/src/index/txindex.cpp
+++ b/src/index/txindex.cpp
@@ -52,7 +52,7 @@ TxIndex::TxIndex(size_t n_cache_size, bool f_memory, bool f_wipe)
     : m_db(std::make_unique<TxIndex::DB>(n_cache_size, f_memory, f_wipe))
 {}
 
-TxIndex::~TxIndex() {}
+TxIndex::~TxIndex() = default;
 
 bool TxIndex::WriteBlock(const CBlock& block, const CBlockIndex* pindex)
 {
diff --git a/src/net.cpp b/src/net.cpp
index b339dd451460..d5f5b2f5e2d5 100644
--- a/src/net.cpp
+++ b/src/net.cpp
@@ -4064,7 +4064,7 @@ bool CConnman::Start(CDeterministicMNManager& dmnman, CMasternodeMetaMan& mn_met
 class CNetCleanup
 {
 public:
-    CNetCleanup() {}
+    CNetCleanup() = default;
 
     ~CNetCleanup()
     {
diff --git a/src/netaddress.cpp b/src/netaddress.cpp
index cea9e194e9d4..76fe1f2e8e82 100644
--- a/src/netaddress.cpp
+++ b/src/netaddress.cpp
@@ -99,7 +99,7 @@ bool fAllowPrivateNet = DEFAULT_ALLOWPRIVATENET;
  *
  * @note This address is considered invalid by CNetAddr::IsValid()
  */
-CNetAddr::CNetAddr() {}
+CNetAddr::CNetAddr() = default;
 
 void CNetAddr::SetIP(const CNetAddr& ipIn)
 {
diff --git a/src/node/context.cpp b/src/node/context.cpp
index 22296e423a92..e8407d8548f6 100644
--- a/src/node/context.cpp
+++ b/src/node/context.cpp
@@ -31,6 +31,6 @@
 #include <validation.h>
 
 namespace node {
-NodeContext::NodeContext() {}
-NodeContext::~NodeContext() {}
+NodeContext::NodeContext() = default;
+NodeContext::~NodeContext() = default;
 } // namespace node
diff --git a/src/policy/fees.cpp b/src/policy/fees.cpp
index 489c9944519e..c5f97a13191f 100644
--- a/src/policy/fees.cpp
+++ b/src/policy/fees.cpp
@@ -568,9 +568,7 @@ CBlockPolicyEstimator::CBlockPolicyEstimator()
     }
 }
 
-CBlockPolicyEstimator::~CBlockPolicyEstimator()
-{
-}
+CBlockPolicyEstimator::~CBlockPolicyEstimator() = default;
 
 void CBlockPolicyEstimator::processTransaction(const CTxMemPoolEntry& entry, bool validFeeEstimate)
 {
diff --git a/src/qt/addresstablemodel.cpp b/src/qt/addresstablemodel.cpp
index d40a3deef6eb..f9eaf6d904b2 100644
--- a/src/qt/addresstablemodel.cpp
+++ b/src/qt/addresstablemodel.cpp
@@ -30,7 +30,7 @@ struct AddressTableEntry
     QString label;
     QString address;
 
-    AddressTableEntry() {}
+    AddressTableEntry() = default;
     AddressTableEntry(Type _type, const QString &_label, const QString &_address):
         type(_type), label(_label), address(_address) {}
 };
diff --git a/src/qt/bantablemodel.cpp b/src/qt/bantablemodel.cpp
index ba0e7b8480b2..107b7e797579 100644
--- a/src/qt/bantablemodel.cpp
+++ b/src/qt/bantablemodel.cpp
@@ -89,10 +89,7 @@ BanTableModel::BanTableModel(interfaces::Node& node, QObject* parent) :
     refresh();
 }
 
-BanTableModel::~BanTableModel()
-{
-    // Intentionally left empty
-}
+BanTableModel::~BanTableModel() = default;
 
 int BanTableModel::rowCount(const QModelIndex &parent) const
 {
diff --git a/src/qt/bitcoinamountfield.cpp b/src/qt/bitcoinamountfield.cpp
index 37ac0c91d4ae..d71e08fd2ee8 100644
--- a/src/qt/bitcoinamountfield.cpp
+++ b/src/qt/bitcoinamountfield.cpp
@@ -38,12 +38,12 @@ static CAmount parse(const QString &text, BitcoinUnit nUnit, bool *valid_out= nu
 class AmountValidator : public QValidator
 {
     Q_OBJECT
-    BitcoinUnit currentUnit;
+    BitcoinUnit currentUnit{BitcoinUnit::DASH};
 
 public:
     explicit AmountValidator(QObject *parent) :
-        QValidator(parent),
-        currentUnit(BitcoinUnit::DASH) {}
+        QValidator(parent)
+        {}
 
     State validate(QString &input, int &pos) const override
     {
@@ -70,8 +70,7 @@ class AmountLineEdit: public QLineEdit
     AmountValidator* amountValidator;
 public:
     explicit AmountLineEdit(QWidget *parent):
-        QLineEdit(parent),
-        currentUnit(BitcoinUnit::DASH)
+        QLineEdit(parent)
     {
         setAlignment(Qt::AlignLeft);
         amountValidator = new AmountValidator(this);
diff --git a/src/qt/notificator.cpp b/src/qt/notificator.cpp
index 0d6d52e67e46..e9f666b506cc 100644
--- a/src/qt/notificator.cpp
+++ b/src/qt/notificator.cpp
@@ -70,7 +70,7 @@ Notificator::~Notificator()
 class FreedesktopImage
 {
 public:
-    FreedesktopImage() {}
+    FreedesktopImage() = default;
     explicit FreedesktopImage(const QImage &img);
 
     // Image to variant that can be marshalled over DBus
diff --git a/src/qt/overviewpage.cpp b/src/qt/overviewpage.cpp
index eacf650e993a..80f399bd0328 100644
--- a/src/qt/overviewpage.cpp
+++ b/src/qt/overviewpage.cpp
@@ -43,7 +43,7 @@ class TxViewDelegate : public QAbstractItemDelegate
     Q_OBJECT
 public:
     explicit TxViewDelegate(QObject* parent = nullptr)
-        : QAbstractItemDelegate(parent), unit(BitcoinUnit::DASH)
+        : QAbstractItemDelegate(parent)
     {
         connect(this, &TxViewDelegate::width_changed, this, &TxViewDelegate::sizeHintChanged);
     }
@@ -126,7 +126,7 @@ class TxViewDelegate : public QAbstractItemDelegate
         return {ITEM_HEIGHT + 8 + minimum_text_width, ITEM_HEIGHT};
     }
 
-    BitcoinUnit unit;
+    BitcoinUnit unit{BitcoinUnit::DASH};
 
 Q_SIGNALS:
     //! An intermediate signal for emitting from the `paint() const` member function.
diff --git a/src/qt/paymentserver.cpp b/src/qt/paymentserver.cpp
index ecc92e12822e..6adf7fe4cc9b 100644
--- a/src/qt/paymentserver.cpp
+++ b/src/qt/paymentserver.cpp
@@ -157,9 +157,7 @@ PaymentServer::PaymentServer(QObject* parent, bool startLocalServer) :
     }
 }
 
-PaymentServer::~PaymentServer()
-{
-}
+PaymentServer::~PaymentServer() = default;
 
 //
 // OSX-specific way of handling dash: URIs
diff --git a/src/qt/peertablemodel.cpp b/src/qt/peertablemodel.cpp
index 736dbf6f4fd8..370f40e9931e 100644
--- a/src/qt/peertablemodel.cpp
+++ b/src/qt/peertablemodel.cpp
@@ -27,10 +27,7 @@ PeerTableModel::PeerTableModel(interfaces::Node& node, QObject* parent) :
     refresh();
 }
 
-PeerTableModel::~PeerTableModel()
-{
-    // Intentionally left empty
-}
+PeerTableModel::~PeerTableModel() = default;
 
 void PeerTableModel::startAutoRefresh()
 {
diff --git a/src/qt/recentrequeststablemodel.cpp b/src/qt/recentrequeststablemodel.cpp
index faab8f46ba55..2b86f7aa2ac4 100644
--- a/src/qt/recentrequeststablemodel.cpp
+++ b/src/qt/recentrequeststablemodel.cpp
@@ -34,10 +34,7 @@ RecentRequestsTableModel::RecentRequestsTableModel(WalletModel *parent) :
     connect(walletModel->getOptionsModel(), &OptionsModel::displayUnitChanged, this, &RecentRequestsTableModel::updateDisplayUnit);
 }
 
-RecentRequestsTableModel::~RecentRequestsTableModel()
-{
-    /* Intentionally left empty */
-}
+RecentRequestsTableModel::~RecentRequestsTableModel() = default;
 
 int RecentRequestsTableModel::rowCount(const QModelIndex &parent) const
 {
diff --git a/src/qt/rpcconsole.cpp b/src/qt/rpcconsole.cpp
index 4308740e5e88..35292d0fc370 100644
--- a/src/qt/rpcconsole.cpp
+++ b/src/qt/rpcconsole.cpp
@@ -122,7 +122,7 @@ class QtRPCTimerBase: public QObject, public RPCTimerBase
         connect(&timer, &QTimer::timeout, [this]{ func(); });
         timer.start(millis);
     }
-    ~QtRPCTimerBase() {}
+    ~QtRPCTimerBase() = default;
 private:
     QTimer timer;
     std::function<void()> func;
@@ -131,7 +131,7 @@ class QtRPCTimerBase: public QObject, public RPCTimerBase
 class QtRPCTimerInterface: public RPCTimerInterface
 {
 public:
-    ~QtRPCTimerInterface() {}
+    ~QtRPCTimerInterface() = default;
     const char *Name() override { return "Qt"; }
     RPCTimerBase* NewTimer(std::function<void()>& func, int64_t millis) override
     {
diff --git a/src/qt/transactiontablemodel.cpp b/src/qt/transactiontablemodel.cpp
index c0e8d540fd92..d337057b2fb6 100644
--- a/src/qt/transactiontablemodel.cpp
+++ b/src/qt/transactiontablemodel.cpp
@@ -61,7 +61,7 @@ struct TxLessThan
 struct TransactionNotification
 {
 public:
-    TransactionNotification() {}
+    TransactionNotification() = default;
     TransactionNotification(uint256 _hash, ChangeType _status, bool _showTransaction):
         hash(_hash), status(_status), showTransaction(_showTransaction) {}
 
diff --git a/src/qt/walletframe.cpp b/src/qt/walletframe.cpp
index 3a64e3327d26..9373ab6119df 100644
--- a/src/qt/walletframe.cpp
+++ b/src/qt/walletframe.cpp
@@ -62,9 +62,7 @@ WalletFrame::WalletFrame(QWidget* parent)
     walletStack->addWidget(governanceListPage);
 }
 
-WalletFrame::~WalletFrame()
-{
-}
+WalletFrame::~WalletFrame() = default;
 
 void WalletFrame::setClientModel(ClientModel *_clientModel)
 {
diff --git a/src/qt/walletview.cpp b/src/qt/walletview.cpp
index 38535b920d21..813a2e01c226 100644
--- a/src/qt/walletview.cpp
+++ b/src/qt/walletview.cpp
@@ -153,9 +153,7 @@ WalletView::WalletView(WalletModel* wallet_model, QWidget* parent)
     GUIUtil::disableMacFocusRect(this);
 }
 
-WalletView::~WalletView()
-{
-}
+WalletView::~WalletView() = default;
 
 void WalletView::setClientModel(ClientModel *_clientModel)
 {
diff --git a/src/random.cpp b/src/random.cpp
index 362499abefb1..a7626224603b 100644
--- a/src/random.cpp
+++ b/src/random.cpp
@@ -443,9 +443,7 @@ class RNGState {
         InitHardwareRand();
     }
 
-    ~RNGState()
-    {
-    }
+    ~RNGState() = default;
 
     void AddEvent(uint32_t event_info) noexcept EXCLUSIVE_LOCKS_REQUIRED(!m_events_mutex)
     {
diff --git a/src/rpc/blockchain.cpp b/src/rpc/blockchain.cpp
index 92c0f1fa31ed..d7b736a21575 100644
--- a/src/rpc/blockchain.cpp
+++ b/src/rpc/blockchain.cpp
@@ -2354,9 +2354,9 @@ static std::atomic<bool> g_should_abort_scan;
 class CoinsViewScanReserver
 {
 private:
-    bool m_could_reserve;
+    bool m_could_reserve{false};
 public:
-    explicit CoinsViewScanReserver() : m_could_reserve(false) {}
+    explicit CoinsViewScanReserver() = default;
 
     bool reserve() {
         CHECK_NONFATAL(!m_could_reserve);
diff --git a/src/rpc/mining.cpp b/src/rpc/mining.cpp
index 8755ae72b33f..74cb13e40db7 100644
--- a/src/rpc/mining.cpp
+++ b/src/rpc/mining.cpp
@@ -978,10 +978,10 @@ class submitblock_StateCatcher final : public CValidationInterface
 {
 public:
     uint256 hash;
-    bool found;
+    bool found{false};
     BlockValidationState state;
 
-    explicit submitblock_StateCatcher(const uint256 &hashIn) : hash(hashIn), found(false), state() {}
+    explicit submitblock_StateCatcher(const uint256 &hashIn) : hash(hashIn), state() {}
 
 protected:
     void BlockChecked(const CBlock& block, const BlockValidationState& stateIn) override {
diff --git a/src/rpc/util.cpp b/src/rpc/util.cpp
index 482caccec770..90ee7464c17e 100644
--- a/src/rpc/util.cpp
+++ b/src/rpc/util.cpp
@@ -297,8 +297,7 @@ CTxDestination AddAndGetMultisigDestination(const int required, const std::vecto
 class DescribeAddressVisitor
 {
 public:
-
-    explicit DescribeAddressVisitor() {}
+    explicit DescribeAddressVisitor() = default;
 
     UniValue operator()(const CNoDestination &dest) const { return UniValue(UniValue::VOBJ); }
 
diff --git a/src/scheduler.cpp b/src/scheduler.cpp
index 9774c2b37256..c0cdfd99b64a 100644
--- a/src/scheduler.cpp
+++ b/src/scheduler.cpp
@@ -11,9 +11,7 @@
 #include <functional>
 #include <utility>
 
-CScheduler::CScheduler()
-{
-}
+CScheduler::CScheduler() = default;
 
 CScheduler::~CScheduler()
 {
diff --git a/src/script/sign.cpp b/src/script/sign.cpp
index d58286fbabf7..ab46a35ec428 100644
--- a/src/script/sign.cpp
+++ b/src/script/sign.cpp
@@ -347,7 +347,7 @@ namespace {
 class DummySignatureChecker final : public BaseSignatureChecker
 {
 public:
-    DummySignatureChecker() {}
+    DummySignatureChecker() = default;
     bool CheckSig(const std::vector<unsigned char>& scriptSig, const std::vector<unsigned char>& vchPubKey, const CScript& scriptCode, SigVersion sigversion) const override { return true; }
 };
 const DummySignatureChecker DUMMY_CHECKER;
diff --git a/src/support/lockedpool.cpp b/src/support/lockedpool.cpp
index b130b3957229..5682211630a3 100644
--- a/src/support/lockedpool.cpp
+++ b/src/support/lockedpool.cpp
@@ -286,9 +286,8 @@ LockedPool::LockedPool(std::unique_ptr<LockedPageAllocator> allocator_in, Lockin
 {
 }
 
-LockedPool::~LockedPool()
-{
-}
+LockedPool::~LockedPool() = default;
+
 void* LockedPool::alloc(size_t size)
 {
     std::lock_guard<std::mutex> lock(mutex);
diff --git a/src/test/checkqueue_tests.cpp b/src/test/checkqueue_tests.cpp
index 5c20001ad036..cd816f943c4d 100644
--- a/src/test/checkqueue_tests.cpp
+++ b/src/test/checkqueue_tests.cpp
@@ -94,7 +94,7 @@ struct MemoryCheck {
     {
         return true;
     }
-    MemoryCheck(){};
+    MemoryCheck() = default;
     MemoryCheck(const MemoryCheck& x)
     {
         // We have to do this to make sure that destructor calls are paired
@@ -128,7 +128,7 @@ struct FrozenCleanupCheck {
     {
         return true;
     }
-    FrozenCleanupCheck() {}
+    FrozenCleanupCheck() = default;
     ~FrozenCleanupCheck()
     {
         if (should_freeze) {
diff --git a/src/test/dbwrapper_tests.cpp b/src/test/dbwrapper_tests.cpp
index 158ccb879b4d..eb05aeea16df 100644
--- a/src/test/dbwrapper_tests.cpp
+++ b/src/test/dbwrapper_tests.cpp
@@ -322,7 +322,7 @@ struct StringContentsSerializer {
     // Used to make two serialized objects the same while letting them have different lengths
     // This is a terrible idea
     std::string str;
-    StringContentsSerializer() {}
+    StringContentsSerializer() = default;
     explicit StringContentsSerializer(const std::string& inp) : str(inp) {}
 
     template<typename Stream>
diff --git a/src/test/fuzz/signature_checker.cpp b/src/test/fuzz/signature_checker.cpp
index 4b8a9f9be9fe..bb43e761a87e 100644
--- a/src/test/fuzz/signature_checker.cpp
+++ b/src/test/fuzz/signature_checker.cpp
@@ -39,7 +39,7 @@ class FuzzedSignatureChecker : public BaseSignatureChecker
         return m_fuzzed_data_provider.ConsumeBool();
     }
 
-    virtual ~FuzzedSignatureChecker() {}
+    virtual ~FuzzedSignatureChecker() = default;
 };
 } // namespace
 
diff --git a/src/test/script_tests.cpp b/src/test/script_tests.cpp
index 9407dc80d5de..e26f15307cec 100644
--- a/src/test/script_tests.cpp
+++ b/src/test/script_tests.cpp
@@ -219,11 +219,11 @@ class TestBuilder
     CScript scriptPubKey;
     CTransactionRef creditTx;
     CMutableTransaction spendTx;
-    bool havePush;
+    bool havePush{false};
     std::vector<unsigned char> push;
     std::string comment;
     uint32_t flags;
-    int scriptError;
+    int scriptError{SCRIPT_ERR_OK};
 
     void DoPush()
     {
@@ -241,7 +241,7 @@ class TestBuilder
     }
 
 public:
-    TestBuilder(const CScript& script_, const std::string& comment_, uint32_t flags_, bool P2SH = false) : scriptPubKey(script_), havePush(false), comment(comment_), flags(flags_), scriptError(SCRIPT_ERR_OK)
+    TestBuilder(const CScript& script_, const std::string& comment_, uint32_t flags_, bool P2SH = false) : scriptPubKey(script_), comment(comment_), flags(flags_)
     {
         if (P2SH) {
             creditTx = MakeTransactionRef(BuildCreditingTransaction(CScript() << OP_HASH160 << ToByteVector(CScriptID(script_)) << OP_EQUAL));
diff --git a/src/test/util_tests.cpp b/src/test/util_tests.cpp
index 844e61a109b5..ae2778ac5690 100644
--- a/src/test/util_tests.cpp
+++ b/src/test/util_tests.cpp
@@ -1272,9 +1272,9 @@ struct Tracker
     //! Points to the original object (possibly itself) we moved/copied from
     const Tracker* origin;
     //! How many copies where involved between the original object and this one (moves are not counted)
-    int copies;
+    int copies{0};
 
-    Tracker() noexcept : origin(this), copies(0) {}
+    Tracker() noexcept : origin(this) {}
     Tracker(const Tracker& t) noexcept : origin(t.origin), copies(t.copies + 1) {}
     Tracker(Tracker&& t) noexcept : origin(t.origin), copies(t.copies) {}
     Tracker& operator=(const Tracker& t) noexcept
diff --git a/src/torcontrol.cpp b/src/torcontrol.cpp
index 5b9e73194fde..50c01a4d718a 100644
--- a/src/torcontrol.cpp
+++ b/src/torcontrol.cpp
@@ -314,8 +314,7 @@ std::map<std::string,std::string> ParseTorReplyMapping(const std::string &s)
 
 TorController::TorController(struct event_base* _base, const std::string& tor_control_center, const CService& target):
     base(_base),
-    m_tor_control_center(tor_control_center), conn(base), reconnect(true), reconnect_ev(nullptr),
-    reconnect_timeout(RECONNECT_TIMEOUT_START),
+    m_tor_control_center(tor_control_center), conn(base), reconnect(true), reconnect_timeout(RECONNECT_TIMEOUT_START),
     m_target(target)
 {
     reconnect_ev = event_new(base, -1, 0, reconnect_cb, this);
diff --git a/src/txdb.cpp b/src/txdb.cpp
index 561be22d6c7a..62d8b49e7fcd 100644
--- a/src/txdb.cpp
+++ b/src/txdb.cpp
@@ -210,7 +210,7 @@ class CCoinsViewDBCursor: public CCoinsViewCursor
     // cache warmup on instantiation.
     CCoinsViewDBCursor(CDBIterator* pcursorIn, const uint256&hashBlockIn):
         CCoinsViewCursor(hashBlockIn), pcursor(pcursorIn) {}
-    ~CCoinsViewDBCursor() {}
+    ~CCoinsViewDBCursor() = default;
 
     bool GetKey(COutPoint &key) const override;
     bool GetValue(Coin &coin) const override;
diff --git a/src/util/system.cpp b/src/util/system.cpp
index e92324817c23..b643bba295f5 100644
--- a/src/util/system.cpp
+++ b/src/util/system.cpp
@@ -264,8 +264,8 @@ static std::optional<util::SettingsValue> InterpretValue(const KeyInfo& key, con
 // Define default constructor and destructor that are not inline, so code instantiating this class doesn't need to
 // #include class definitions for all members.
 // For example, m_settings has an internal dependency on univalue.
-ArgsManager::ArgsManager() {}
-ArgsManager::~ArgsManager() {}
+ArgsManager::ArgsManager() = default;
+ArgsManager::~ArgsManager() = default;
 
 std::set<std::string> ArgsManager::GetUnsuitableSectionOnlyArgs() const
 {
diff --git a/src/validation.cpp b/src/validation.cpp
index 63f7109b83f9..687173e56330 100644
--- a/src/validation.cpp
+++ b/src/validation.cpp
@@ -3041,7 +3041,7 @@ static int64_t nTimePostConnect = 0;
 struct PerBlockConnectTrace {
     CBlockIndex* pindex = nullptr;
     std::shared_ptr<const CBlock> pblock;
-    PerBlockConnectTrace() {}
+    PerBlockConnectTrace() = default;
 };
 /**
  * Used to track blocks whose transactions were applied to the UTXO state as a
diff --git a/src/wallet/context.cpp b/src/wallet/context.cpp
index 800aa5bf9c46..3d4bf9d70310 100644
--- a/src/wallet/context.cpp
+++ b/src/wallet/context.cpp
@@ -5,6 +5,6 @@
 #include <wallet/context.h>
 
 namespace wallet {
-WalletContext::WalletContext() {}
-WalletContext::~WalletContext() {}
+WalletContext::WalletContext() = default;
+WalletContext::~WalletContext() = default;
 } // namespace wallet
diff --git a/src/wallet/rpc/transactions.cpp b/src/wallet/rpc/transactions.cpp
index 92c150594d15..23e93bfb4b62 100644
--- a/src/wallet/rpc/transactions.cpp
+++ b/src/wallet/rpc/transactions.cpp
@@ -63,9 +63,7 @@ struct tallyitem
     int nConf{std::numeric_limits<int>::max()};
     std::vector<uint256> txids;
     bool fIsWatchonly{false};
-    tallyitem()
-    {
-    }
+    tallyitem() = default;
 };
 
 static UniValue ListReceived(const CWallet& wallet, const UniValue& params, const bool by_label, const bool include_immature_coinbase) EXCLUSIVE_LOCKS_REQUIRED(wallet.cs_wallet)
diff --git a/src/wallet/walletdb.cpp b/src/wallet/walletdb.cpp
index 1bae3fb2156b..e2e4452d64da 100644
--- a/src/wallet/walletdb.cpp
+++ b/src/wallet/walletdb.cpp
@@ -340,8 +340,7 @@ class CWalletScanState {
     std::map<std::pair<uint256, CKeyID>, std::pair<std::vector<unsigned char>, std::vector<unsigned char>>> crypted_mnemonics;
     bool tx_corrupt{false};
 
-    CWalletScanState() {
-    }
+    CWalletScanState() = default;
 };
 
 static bool

From ede74425bd2fcec7e184541aae14ea94990a9f74 Mon Sep 17 00:00:00 2001
From: Konstantin Akimov <knstqq@gmail.com>
Date: Thu, 9 Oct 2025 16:14:15 +0700
Subject: [PATCH 097/656] fix: missing cases of readability-const-return-type
 as follow-up bitcoin/bitcoin#26935

    util/system.cpp:306:1: warning: return type 'const std::map<std::string, std::vector<util::SettingsValue>>' (aka 'const map<basic_string<char>, vector<UniValue>>') is 'const'-qualified at the top level, which may reduce code readability without improving const correctness [readability-const-return-type]
      306 | const std::map<std::string, std::vector<util::SettingsValue>> ArgsManager::GetCommandLineArgs() const {
          | ^~~~~
---
 src/bench/wallet_loading.cpp | 2 +-
 src/qt/guiutil.cpp           | 6 +++---
 src/qt/guiutil.h             | 6 +++---
 src/util/system.cpp          | 2 +-
 src/util/system.h            | 2 +-
 5 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/bench/wallet_loading.cpp b/src/bench/wallet_loading.cpp
index b01732b615a1..3d8700d5592b 100644
--- a/src/bench/wallet_loading.cpp
+++ b/src/bench/wallet_loading.cpp
@@ -26,7 +26,7 @@ using wallet::WALLET_FLAG_DESCRIPTORS;
 using wallet::WalletContext;
 using wallet::WalletDatabase;
 
-static const std::shared_ptr<CWallet> BenchLoadWallet(std::unique_ptr<WalletDatabase> database, WalletContext& context, DatabaseOptions& options)
+static std::shared_ptr<CWallet> BenchLoadWallet(std::unique_ptr<WalletDatabase> database, WalletContext& context, DatabaseOptions& options)
 {
     bilingual_str error;
     std::vector<bilingual_str> warnings;
diff --git a/src/qt/guiutil.cpp b/src/qt/guiutil.cpp
index 728d861fb5ba..0fbbfcca41e6 100644
--- a/src/qt/guiutil.cpp
+++ b/src/qt/guiutil.cpp
@@ -886,7 +886,7 @@ bool isStyleSheetDirectoryCustom()
     return stylesheetDirectory != defaultStylesheetDirectory;
 }
 
-const std::vector<QString> listStyleSheets()
+std::vector<QString> listStyleSheets()
 {
     std::vector<QString> vecStylesheets;
     for (const auto& it : mapThemeToStyle) {
@@ -895,7 +895,7 @@ const std::vector<QString> listStyleSheets()
     return vecStylesheets;
 }
 
-const std::vector<QString> listThemes()
+std::vector<QString> listThemes()
 {
     std::vector<QString> vecThemes;
     for (const auto& it : mapThemeToStyle) {
@@ -905,7 +905,7 @@ const std::vector<QString> listThemes()
     return vecThemes;
 }
 
-const QString getDefaultTheme()
+QString getDefaultTheme()
 {
     return defaultTheme;
 }
diff --git a/src/qt/guiutil.h b/src/qt/guiutil.h
index c3fd6a37a8cf..de3b1109ec9f 100644
--- a/src/qt/guiutil.h
+++ b/src/qt/guiutil.h
@@ -293,13 +293,13 @@ namespace GUIUtil
     bool isStyleSheetDirectoryCustom();
 
     /** Return a list of all required css files */
-    const std::vector<QString> listStyleSheets();
+    std::vector<QString> listStyleSheets();
 
     /** Return a list of all theme css files */
-    const std::vector<QString> listThemes();
+    std::vector<QString> listThemes();
 
     /** Return the name of the default theme `*/
-    const QString getDefaultTheme();
+    QString getDefaultTheme();
 
     /** Check if the given theme name is valid or not */
     bool isValidTheme(const QString& strTheme);
diff --git a/src/util/system.cpp b/src/util/system.cpp
index b643bba295f5..93b5a663b737 100644
--- a/src/util/system.cpp
+++ b/src/util/system.cpp
@@ -303,7 +303,7 @@ std::list<SectionInfo> ArgsManager::GetUnrecognizedSections() const
     return unrecognized;
 }
 
-const std::map<std::string, std::vector<util::SettingsValue>> ArgsManager::GetCommandLineArgs() const {
+std::map<std::string, std::vector<util::SettingsValue>> ArgsManager::GetCommandLineArgs() const {
     LOCK(cs_args);
     return m_settings.command_line_options;
 }
diff --git a/src/util/system.h b/src/util/system.h
index 8837b7666d2b..53675ccf4cb8 100644
--- a/src/util/system.h
+++ b/src/util/system.h
@@ -292,7 +292,7 @@ class ArgsManager
     /**
      * Return the map of all the args passed via the command line
      */
-    const std::map<std::string, std::vector<util::SettingsValue>> GetCommandLineArgs() const;
+    std::map<std::string, std::vector<util::SettingsValue>> GetCommandLineArgs() const;
 
     /**
      * Get blocks directory path

From 5a4c884ed2225802175dece5faebb1544291974d Mon Sep 17 00:00:00 2001
From: fanquake <fanquake@gmail.com>
Date: Wed, 6 Apr 2022 10:26:01 +0100
Subject: [PATCH 098/656] Merge bitcoin/bitcoin#24652: doc: rewrite OpenBSD
 build docs for 7.0

a2b56dcd1fa102dcb3023cd2af63075525789453 doc: update OpenBSD build docs for 7.0 (fanquake)

Pull request description:

  Removes redundant notes for setting `CC` &`CXX` now that Clang is well and truly the base compiler. See: https://www.openbsd.org/70.html
  > Disabled base-gcc on amd64.

  Cleans up the wallet docs, i.e #23446.

  Make the notes more similar to the FreeBSD notes.

ACKs for top commit:
  shaavan:
    ACK a2b56dcd1fa102dcb3023cd2af63075525789453
  theStack:
    ACK a2b56dcd1fa102dcb3023cd2af63075525789453

Tree-SHA512: a0494de3b168e5c35f541edf62dcb42529b23387febbe4c004eb82ef9aff6f97def43b6cd5c91e13612c5247767d79553efcd21b9792ccb6a9608302c5d082f1
---
 doc/build-openbsd.md | 134 +++++++++++++++++++++++++------------------
 1 file changed, 78 insertions(+), 56 deletions(-)

diff --git a/doc/build-openbsd.md b/doc/build-openbsd.md
index afcc43355dd5..1ff8489ae615 100644
--- a/doc/build-openbsd.md
+++ b/doc/build-openbsd.md
@@ -1,113 +1,135 @@
-OpenBSD build guide
-======================
-**Updated for OpenBSD [7.4](https://www.openbsd.org/74.html)**
+# OpenBSD Build Guide
 
-This guide describes how to build dashd, dash-qt, and command-line utilities on OpenBSD.
+**Updated for OpenBSD [7.0](https://www.openbsd.org/70.html)**
 
-Preparation
--------------
+This guide describes how to build dashd, command-line utilities, and GUI on OpenBSD.
 
-Run the following as root to install the base dependencies for building:
+## Preparation
+
+### 1. Install Required Dependencies
+Run the following as root to install the base dependencies for building.
 
 ```bash
-pkg_add git gmake libevent libtool
-pkg_add qt5 # (optional for enabling the GUI)
-pkg_add autoconf # (select highest version, e.g. 2.69)
-pkg_add automake # (select highest version, e.g. 1.15)
-pkg_add python # (select highest version, e.g. 3.9)
-pkg_add gmp
-pkg_add bash
-pkg_add boost
+pkg_add bash git gmake gmp libevent libtool boost
+# Select the newest version of the follow packages:
+pkg_add autoconf automake python
 
 git clone https://github.com/dashpay/dash.git
 ```
 
 See [dependencies.md](dependencies.md) for a complete overview.
 
-**Important**: From OpenBSD 6.2 onwards a C++11-supporting clang compiler is
-part of the base image, and while building it is necessary to make sure that
-this compiler is used and not ancient g++ 4.2.1. This is done by appending
-`CC=cc CXX=c++` to configuration commands. Mixing different compilers within
-the same executable will result in errors.
+### 2. Clone Dash Core Repo
+Clone the Dash Core repository to a directory. All build scripts and commands will run from this directory.
+``` bash
+git clone https://github.com/dashpay/dash.git
+```
 
-### Building BerkeleyDB
+### 3. Install Optional Dependencies
 
-BerkeleyDB is only necessary for the wallet functionality. To skip this, pass
-`--disable-wallet` to `./configure` and skip to the next section.
+#### Wallet Dependencies
 
-It is recommended to use Berkeley DB 4.8. You cannot use the BerkeleyDB library
-from ports, for the same reason as boost above (g++/libstd++ incompatibility).
-If you have to build it yourself, you can use [the installation script included
-in contrib/](/contrib/install_db4.sh) like so:
+It is not necessary to build wallet functionality to run either `dashd` or `dash-qt`.
+
+###### Descriptor Wallet Support
+
+`sqlite3` is required to support [descriptor wallets](descriptors.md).
+
+``` bash
+pkg_add install sqlite3
+```
+
+###### Legacy Wallet Support
+BerkeleyDB is only required to support legacy wallets.
 
-Refer to [depends/README.md](/depends/README.md) for detailed instructions.
+It is recommended to use Berkeley DB 4.8. You cannot use the BerkeleyDB library
+from ports. However you can build it yourself, [using the installation script included in contrib/](/contrib/install_db4.sh), like so, from the root of the repository.
 
 ```bash
-./contrib/install_db4.sh `pwd` CC=cc CXX=c++
+./contrib/install_db4.sh `pwd`
 ```
 
-from the root of the repository. Then set `BDB_PREFIX` for the next section:
+Then set `BDB_PREFIX`:
 
 ```bash
 export BDB_PREFIX="$PWD/db4"
 ```
 
-### Building Dash Core
+#### GUI Dependencies
+###### Qt5
+
+Dash Core includes a GUI built with the cross-platform Qt Framework. To compile the GUI, Qt 5 is required.
+
+```bash
+pkg_add qt5
+```
+
+## Building Dash Core
 
 **Important**: Use `gmake` (the non-GNU `make` will exit with an error).
 
 Preparation:
 ```bash
-export AUTOCONF_VERSION=2.69 # replace this with the autoconf version that you installed
-export AUTOMAKE_VERSION=1.15 # replace this with the automake version that you installed
+
+# Adapt the following for the version you installed (major.minor only):
+export AUTOCONF_VERSION=2.71
+export AUTOMAKE_VERSION=1.16
+
 ./autogen.sh
 ```
-Make sure `BDB_PREFIX` is set to the appropriate path from the above steps.
 
-To configure with wallet:
-```bash
-./configure --with-gui=no CC=cc CXX=c++ \
-    BDB_LIBS="-L${BDB_PREFIX}/lib -ldb_cxx-4.8" \
-    BDB_CFLAGS="-I${BDB_PREFIX}/include" \
-    MAKE=gmake
-```
+### 1. Configuration
+
+Note that building with external signer support currently fails on OpenBSD,
+hence you have to explicitly disable it by passing the parameter
+`--disable-external-signer` to the configure script. The feature requires the
+header-only library boost::process, which is available on OpenBSD, but contains
+certain system calls and preprocessor defines like `waitid()` and `WEXITED` that
+are not available.
+
+There are many ways to configure Dash Core, here are a few common examples:
+
+##### Descriptor Wallet and GUI:
+This enables the GUI and descriptor wallet support, assuming `sqlite` and `qt5` are installed.
 
-To configure without wallet:
 ```bash
-./configure --disable-wallet --with-gui=no CC=cc CXX=c++ MAKE=gmake
+./configure --disable-external-signer MAKE=gmake
 ```
 
-To configure with GUI:
+##### Descriptor & Legacy Wallet. No GUI:
+This enables support for both wallet types and disables the GUI:
+
 ```bash
-./configure --with-gui=yes CC=cc CXX=c++ \
+./configure --disable-external-signer --with-gui=no \
     BDB_LIBS="-L${BDB_PREFIX}/lib -ldb_cxx-4.8" \
     BDB_CFLAGS="-I${BDB_PREFIX}/include" \
     MAKE=gmake
 ```
 
-Build and run the tests:
+### 2. Compile
+**Important**: Use `gmake` (the non-GNU `make` will exit with an error).
+
 ```bash
-gmake # use "-j N" here for N parallel jobs
-gmake check
+gmake # use "-j N" for N parallel jobs
+gmake check # Run tests if Python 3 is available
 ```
 
-Resource limits
--------------------
+## Resource limits
 
 If the build runs into out-of-memory errors, the instructions in this section
 might help.
 
 The standard ulimit restrictions in OpenBSD are very strict:
-
-    data(kbytes)         1572864
+```bash
+data(kbytes)         1572864
+```
 
 This, unfortunately, in some cases not enough to compile some `.cpp` files in the project,
 (see issue [#6658](https://github.com/bitcoin/bitcoin/issues/6658)).
 If your user is in the `staff` group the limit can be raised with:
-
-    ulimit -d 3000000
-
+```bash
+ulimit -d 3000000
+```
 The change will only affect the current shell and processes spawned by it. To
 make the change system-wide, change `datasize-cur` and `datasize-max` in
 `/etc/login.conf`, and reboot.
-

From 73cbb43571bd16c0c1be04975aec30dfb3f50554 Mon Sep 17 00:00:00 2001
From: fanquake <fanquake@gmail.com>
Date: Mon, 23 May 2022 08:37:53 +0200
Subject: [PATCH 099/656] Merge bitcoin/bitcoin#25178: doc: remove passing
 `--disable-external-signer` in OpenBSD build guide

9ecb0a355099c0126c9c8193c7597c73f73428ad doc: remove passing `--disable-external-signer` in OpenBSD build guide (Sebastian Falbesoner)

Pull request description:

  Since we have a Boost.Process usage check in the build system (#24254, commit abc057c6030b2a0ddab46835a7801054da677781), passing the option `--disable-external-signer` explicitly is not needed anymore on OpenBSD; the configure script will automatically detect that including `<boost/process.hpp>` leads to a compile error and disable external signer support accordingly:

  ```
  $ ./configure MAKE=gmake
  ...
  checking whether Boost.Process can be used... no
  ...
  Options used to compile and link:
    external signer = no
  ...

  $ ./configure --enable-external-signer MAKE=gmake
  ...
  checking whether Boost.Process can be used... no
  configure: error: External signing is not supported for this Boost version
  ```
  The PR basically reverts #22335 but keeps the part mentioning that external signer support is not available on OpenBSD. Also bumps the guide to version 7.1 (released [about a month ago](https://www.openbsd.org/71.html)), where I could verify that the instructions are still accurate.

ACKs for top commit:
  fanquake:
    ACK 9ecb0a355099c0126c9c8193c7597c73f73428ad

Tree-SHA512: a5f7e89a5a78f062a06e0047802c42ad49d89e0f0afb963886caa684966ea2e9c8a660320eedd98a5aa5eee0a9c2bb8bf7f5772338c4b49738a69c00e9367a15
---
 doc/build-openbsd.md | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/doc/build-openbsd.md b/doc/build-openbsd.md
index 1ff8489ae615..8ebcb68ed24b 100644
--- a/doc/build-openbsd.md
+++ b/doc/build-openbsd.md
@@ -1,6 +1,6 @@
 # OpenBSD Build Guide
 
-**Updated for OpenBSD [7.0](https://www.openbsd.org/70.html)**
+**Updated for OpenBSD [7.1](https://www.openbsd.org/71.html)**
 
 This guide describes how to build dashd, command-line utilities, and GUI on OpenBSD.
 
@@ -80,12 +80,9 @@ export AUTOMAKE_VERSION=1.16
 
 ### 1. Configuration
 
-Note that building with external signer support currently fails on OpenBSD,
-hence you have to explicitly disable it by passing the parameter
-`--disable-external-signer` to the configure script. The feature requires the
-header-only library boost::process, which is available on OpenBSD, but contains
-certain system calls and preprocessor defines like `waitid()` and `WEXITED` that
-are not available.
+Note that external signer support is currently not available on OpenBSD, since
+the used header-only library Boost.Process fails to compile (certain system
+calls and preprocessor defines like `waitid()` and `WEXITED` are missing).
 
 There are many ways to configure Dash Core, here are a few common examples:
 
@@ -93,14 +90,14 @@ There are many ways to configure Dash Core, here are a few common examples:
 This enables the GUI and descriptor wallet support, assuming `sqlite` and `qt5` are installed.
 
 ```bash
-./configure --disable-external-signer MAKE=gmake
+./configure MAKE=gmake
 ```
 
 ##### Descriptor & Legacy Wallet. No GUI:
 This enables support for both wallet types and disables the GUI:
 
 ```bash
-./configure --disable-external-signer --with-gui=no \
+./configure --with-gui=no \
     BDB_LIBS="-L${BDB_PREFIX}/lib -ldb_cxx-4.8" \
     BDB_CFLAGS="-I${BDB_PREFIX}/include" \
     MAKE=gmake

From 63d97767fb2394e9461ca76754a7dffda2ca671a Mon Sep 17 00:00:00 2001
From: Hennadii Stepanov <32963518+hebasto@users.noreply.github.com>
Date: Wed, 13 Apr 2022 01:22:33 +0200
Subject: [PATCH 100/656] Merge bitcoin-core/gui#577: Getting ready to Qt 6
 (1/n)

63125752a902de725f8aad1ee5bdaf5cb0c70f91 qt: Update deprecated enum value (Hennadii Stepanov)
c7add881a674d927e58f11dac0dca223c7322cb9 qt: Use `|` instead of `+` for key modifiers (Hennadii Stepanov)
6f1e162fe135d051d16859be57ef44d191e095cc qt: Fix headers (Hennadii Stepanov)

Pull request description:

  For Qt 5 all changes in this PR are refactoring. But for [Qt 6](https://github.com/bitcoin/bitcoin/pull/24798) they are real bugfixes :)

  As I do not provide anyway way to build `bitcoin-qt` against Qt 6.2.4 fir now, suggesting to reviewers to verify changes for Qt 5 only.

ACKs for top commit:
  shaavan:
    ACK 63125752a902de725f8aad1ee5bdaf5cb0c70f91
  jarolrod:
    tACK https://github.com/bitcoin-core/gui/commit/63125752a902de725f8aad1ee5bdaf5cb0c70f91

Tree-SHA512: ceee983192ddf62f09c1305458af3447ff0e3bd90311fa6328b139673bcaed3407dc0ce0b275028d4e0ca251d6b54dad40b48049211aeb251f65cbb4f5330834
---
 src/qt/bitcoingui.cpp        | 1 +
 src/qt/coincontroldialog.cpp | 2 +-
 src/qt/guiutil.cpp           | 1 +
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/qt/bitcoingui.cpp b/src/qt/bitcoingui.cpp
index 3b440e87e2d3..18bf1be5b7e5 100644
--- a/src/qt/bitcoingui.cpp
+++ b/src/qt/bitcoingui.cpp
@@ -44,6 +44,7 @@
 #include <validation.h>
 
 #include <QAction>
+#include <QActionGroup>
 #include <QApplication>
 #include <QButtonGroup>
 #include <QComboBox>
diff --git a/src/qt/coincontroldialog.cpp b/src/qt/coincontroldialog.cpp
index d9bafaafdc3c..9c486d100713 100644
--- a/src/qt/coincontroldialog.cpp
+++ b/src/qt/coincontroldialog.cpp
@@ -638,7 +638,7 @@ void CoinControlDialog::updateView()
     ui->treeWidget->setEnabled(false); // performance, otherwise updateLabels would be called for every checked checkbox
     ui->treeWidget->setAlternatingRowColors(!treeMode);
     QFlags<Qt::ItemFlag> flgCheckbox = Qt::ItemIsSelectable | Qt::ItemIsEnabled | Qt::ItemIsUserCheckable;
-    QFlags<Qt::ItemFlag> flgTristate = Qt::ItemIsSelectable | Qt::ItemIsEnabled | Qt::ItemIsUserCheckable | Qt::ItemIsTristate;
+    QFlags<Qt::ItemFlag> flgTristate = Qt::ItemIsSelectable | Qt::ItemIsEnabled | Qt::ItemIsUserCheckable | Qt::ItemIsAutoTristate;
 
     BitcoinUnit nDisplayUnit = model->getOptionsModel()->getDisplayUnit();
 
diff --git a/src/qt/guiutil.cpp b/src/qt/guiutil.cpp
index 728d861fb5ba..72f747aee5fd 100644
--- a/src/qt/guiutil.cpp
+++ b/src/qt/guiutil.cpp
@@ -62,6 +62,7 @@
 #include <QSettings>
 #include <QShortcut>
 #include <QSize>
+#include <QStandardPaths>
 #include <QString>
 #include <QTextDocument> // for Qt::mightBeRichText
 #include <QThread>

From 73669f5156afff575b9a95432de5bdcc5f494c70 Mon Sep 17 00:00:00 2001
From: Hennadii Stepanov <32963518+hebasto@users.noreply.github.com>
Date: Wed, 27 Apr 2022 14:34:32 +0200
Subject: [PATCH 101/656] Merge bitcoin-core/gui#589: Getting ready to Qt 6
 (7/n). Do not pass `WalletModel*` to a queued connection

ab73d5985de5d9c4d1e3fd0f4d9d88a0908ea319 Do not pass `WalletModel*` to queued connection (Hennadii Stepanov)
fdf72859504d063d0a6b60a6dac5ad170bd86440 refactor: Make `RPCExecutor*` a member of the `RPCConsole` class (Hennadii Stepanov)
61457c179aec23227dcf3952c575052204103b50 refactor: Guard `RPCConsole::{add,remove}Wallet()` with `ENABLE_WALLET` (Hennadii Stepanov)

Pull request description:

  On master (094d9fda5ccee7d78a2e3d8b1eec17b8b6a33466), the following queued connection https://github.com/bitcoin-core/gui/blob/094d9fda5ccee7d78a2e3d8b1eec17b8b6a33466/src/qt/rpcconsole.cpp#L1107 uses a `const WalletModel*` parameter regardless whether the `ENABLE_WALLET` macro is defined.

  Although this code works in Qt 5, it is flawed. On Qt 6, the code gets broken because the fully defined `WalletModel` type is required which is not the case if `ENABLE_WALLET` is undefined.

  This PR fixes the issue described above.

ACKs for top commit:
  promag:
    ACK ab73d5985de5d9c4d1e3fd0f4d9d88a0908ea319
  jarolrod:
    code review ACK https://github.com/bitcoin-core/gui/commit/ab73d5985de5d9c4d1e3fd0f4d9d88a0908ea319

Tree-SHA512: 544ba984da4480aa34f1516a737d6034eb5616b8f78db38dc9bf2d15c15251957bc0b0c9b0d5a365552da9b64a850801a6f4caa12b0ac220f51bd2b334fbe545
---
 src/qt/rpcconsole.cpp | 21 +++++++++++----------
 src/qt/rpcconsole.h   | 13 ++++++++++---
 2 files changed, 21 insertions(+), 13 deletions(-)

diff --git a/src/qt/rpcconsole.cpp b/src/qt/rpcconsole.cpp
index 4308740e5e88..c907a3485435 100644
--- a/src/qt/rpcconsole.cpp
+++ b/src/qt/rpcconsole.cpp
@@ -1174,8 +1174,9 @@ void RPCConsole::on_lineEdit_returnPressed()
 
     ui->lineEdit->clear();
 
+    WalletModel* wallet_model{nullptr};
 #ifdef ENABLE_WALLET
-    WalletModel* wallet_model = ui->WalletSelector->currentData().value<WalletModel*>();
+    wallet_model = ui->WalletSelector->currentData().value<WalletModel*>();
 
     if (m_last_wallet_model != wallet_model) {
         if (wallet_model) {
@@ -1191,7 +1192,10 @@ void RPCConsole::on_lineEdit_returnPressed()
     //: A console message indicating an entered command is currently being executed.
     message(CMD_REPLY, tr("Executing…"));
     m_is_executing = true;
-    Q_EMIT cmdRequest(cmd, m_last_wallet_model);
+
+    QMetaObject::invokeMethod(m_executor, [this, cmd, wallet_model] {
+        m_executor->request(cmd, wallet_model);
+    });
 
     cmd = QString::fromStdString(strFilteredCmd);
 
@@ -1233,11 +1237,11 @@ void RPCConsole::browseHistory(int offset)
 
 void RPCConsole::startExecutor()
 {
-    RPCExecutor *executor = new RPCExecutor(m_node);
-    executor->moveToThread(&thread);
+    m_executor = new RPCExecutor(m_node);
+    m_executor->moveToThread(&thread);
 
     // Replies from executor object must go to this object
-    connect(executor, &RPCExecutor::reply, this, [this](int category, const QString& command) {
+    connect(m_executor, &RPCExecutor::reply, this, [this](int category, const QString& command) {
         // Remove "Executing…" message.
         ui->messagesWidget->undo();
         message(category, command);
@@ -1245,16 +1249,13 @@ void RPCConsole::startExecutor()
         m_is_executing = false;
     });
 
-    // Requests from this object must go to executor
-    connect(this, &RPCConsole::cmdRequest, executor, &RPCExecutor::request);
-
     // Make sure executor object is deleted in its own thread
-    connect(&thread, &QThread::finished, executor, &RPCExecutor::deleteLater);
+    connect(&thread, &QThread::finished, m_executor, &RPCExecutor::deleteLater);
 
     // Default implementation of QThread::run() simply spins up an event loop in the thread,
     // which is what we want.
     thread.start();
-    QTimer::singleShot(0, executor, []() {
+    QTimer::singleShot(0, m_executor, []() {
         util::ThreadRename("qt-rpcconsole");
     });
 }
diff --git a/src/qt/rpcconsole.h b/src/qt/rpcconsole.h
index 9b825f4227e9..8bb1c1b9dfdd 100644
--- a/src/qt/rpcconsole.h
+++ b/src/qt/rpcconsole.h
@@ -5,6 +5,10 @@
 #ifndef BITCOIN_QT_RPCCONSOLE_H
 #define BITCOIN_QT_RPCCONSOLE_H
 
+#if defined(HAVE_CONFIG_H)
+#include <config/bitcoin-config.h>
+#endif
+
 #include <qt/guiutil.h>
 #include <qt/peertablemodel.h>
 #include <qt/trafficgraphdata.h>
@@ -18,6 +22,7 @@
 #include <QWidget>
 
 class ClientModel;
+class RPCExecutor;
 class RPCTimerInterface;
 class WalletModel;
 
@@ -51,8 +56,11 @@ class RPCConsole: public QWidget
     }
 
     void setClientModel(ClientModel *model = nullptr, int bestblock_height = 0, int64_t bestblock_date = 0, uint256 bestblock_hash = uint256(), double verification_progress = 0.0);
-    void addWallet(WalletModel * const walletModel);
+
+#ifdef ENABLE_WALLET
+    void addWallet(WalletModel* const walletModel);
     void removeWallet(WalletModel* const walletModel);
+#endif // ENABLE_WALLET
 
     enum MessageClass {
         MC_ERROR,
@@ -149,8 +157,6 @@ public Q_SLOTS:
 #endif // ENABLE_WALLET
 
 Q_SIGNALS:
-    // For RPC command executor
-    void cmdRequest(const QString &command, const WalletModel* wallet_model);
     /** Get restart command-line parameters and handle restart */
     void handleRestart(QStringList args);
 
@@ -193,6 +199,7 @@ public Q_SLOTS:
     int consoleFontSize = 0;
     QCompleter *autoCompleter = nullptr;
     QThread thread;
+    RPCExecutor* m_executor{nullptr};
     WalletModel* m_last_wallet_model{nullptr};
     bool m_is_executing{false};
     QByteArray m_peer_widget_header_state;

From 30b4e9d6405cba4282c2a9e4581451fa45459686 Mon Sep 17 00:00:00 2001
From: Hennadii Stepanov <32963518+hebasto@users.noreply.github.com>
Date: Tue, 24 May 2022 10:50:39 +0200
Subject: [PATCH 102/656] Merge bitcoin-core/gui#593: Getting ready to Qt 6
 (8/n). Use `QRegularExpression` in `AddressBookSortFilterProxyModel` class

e280087946184b37c8a1eb345fae30ebb07f3384 qt: Use `QRegularExpression` in `AddressBookSortFilterProxyModel` class (Hennadii Stepanov)
5c5d8f2465be70cbc256ec59913ac0a3c7c958be qt, test: Add tests for searching in `AddressBookPage` dialog (Hennadii Stepanov)

Pull request description:

  This is a step in [migration](https://github.com/bitcoin/bitcoin/pull/24798) to Qt 6.

  Related:
  - bitcoin-core/gui#578
  - bitcoin-core/gui#585

  No behavior change. To ensure this, tests have been added.

ACKs for top commit:
  hebasto:
    > tACK [e280087](https://github.com/bitcoin-core/gui/commit/e280087946184b37c8a1eb345fae30ebb07f3384) on Ubuntu 21.10 Qt 5.15.2
  promag:
    Tested ACK e280087946184b37c8a1eb345fae30ebb07f3384 with Qt6 on macOS 12 M1.
  w0xlt:
    tACK https://github.com/bitcoin-core/gui/pull/593/commits/e280087946184b37c8a1eb345fae30ebb07f3384 on Ubuntu 21.10 Qt 5.15.2
  jarolrod:
    Tested ACK https://github.com/bitcoin-core/gui/commit/e280087946184b37c8a1eb345fae30ebb07f3384 on M1 mac, x86 mac, x86 Linux with Qt5 and separately with Qt6

Tree-SHA512: 664baacc1504deb2f7fa651ea4a44f3942f5c9058befe4d2ce292beed032d4b1697710cfd10c0909602d8a4a6eeb680414e4a1f56d2038478c1ae2f34965d74f
---
 src/qt/addressbookpage.cpp       | 18 +++++++----
 src/qt/test/addressbooktests.cpp | 52 ++++++++++++++++++++++++++++++--
 2 files changed, 61 insertions(+), 9 deletions(-)

diff --git a/src/qt/addressbookpage.cpp b/src/qt/addressbookpage.cpp
index 441531bb9207..31ebe8f4a676 100644
--- a/src/qt/addressbookpage.cpp
+++ b/src/qt/addressbookpage.cpp
@@ -21,6 +21,11 @@
 #include <QMenu>
 #include <QMessageBox>
 #include <QSortFilterProxyModel>
+#if (QT_VERSION >= QT_VERSION_CHECK(6, 0, 0))
+#include <QRegularExpression>
+#else
+#include <QRegExp>
+#endif
 
 class AddressBookSortFilterProxyModel final : public QSortFilterProxyModel
 {
@@ -48,12 +53,13 @@ class AddressBookSortFilterProxyModel final : public QSortFilterProxyModel
 
         auto address = model->index(row, AddressTableModel::Address, parent);
 
-        if (filterRegExp().indexIn(model->data(address).toString()) < 0 &&
-            filterRegExp().indexIn(model->data(label).toString()) < 0) {
-            return false;
-        }
-
-        return true;
+#if (QT_VERSION >= QT_VERSION_CHECK(6, 0, 0))
+        const auto pattern = filterRegularExpression();
+#else
+        const auto pattern = filterRegExp();
+#endif
+        return (model->data(address).toString().contains(pattern) ||
+                model->data(label).toString().contains(pattern));
     }
 };
 
diff --git a/src/qt/test/addressbooktests.cpp b/src/qt/test/addressbooktests.cpp
index fb3c80f23c98..0701557b0ada 100644
--- a/src/qt/test/addressbooktests.cpp
+++ b/src/qt/test/addressbooktests.cpp
@@ -23,6 +23,7 @@
 #include <chrono>
 
 #include <QApplication>
+#include <QLineEdit>
 #include <QMessageBox>
 #include <QTableView>
 #include <QTimer>
@@ -98,11 +99,13 @@ void TestAddAddressesToSendBook(interfaces::Node& node)
     QString s_label("already here (s)");
 
     // Define a new address (which should add to the address book successfully).
-    QString new_address;
+    QString new_address_a;
+    QString new_address_b;
 
     std::tie(r_key_dest, preexisting_r_address) = build_address();
     std::tie(s_key_dest, preexisting_s_address) = build_address();
-    std::tie(std::ignore, new_address) = build_address();
+    std::tie(std::ignore, new_address_a) = build_address();
+    std::tie(std::ignore, new_address_b) = build_address();
 
     {
         LOCK(wallet->cs_wallet);
@@ -154,9 +157,52 @@ void TestAddAddressesToSendBook(interfaces::Node& node)
     // Submit a new address which should add successfully - we expect the
     // warning message to be blank.
     EditAddressAndSubmit(
-        &editAddressDialog, QString("new"), new_address, QString(""));
+        &editAddressDialog, QString("io - new A"), new_address_a, QString(""));
     check_addbook_size(3);
     QCOMPARE(table_view->model()->rowCount(), 2);
+
+    EditAddressAndSubmit(
+        &editAddressDialog, QString("io - new B"), new_address_b, QString(""));
+    check_addbook_size(4);
+    QCOMPARE(table_view->model()->rowCount(), 3);
+
+    auto search_line = address_book.findChild<QLineEdit*>("searchLineEdit");
+
+    search_line->setText(r_label);
+    QCOMPARE(table_view->model()->rowCount(), 0);
+
+    search_line->setText(s_label);
+    QCOMPARE(table_view->model()->rowCount(), 1);
+
+    search_line->setText("io");
+    QCOMPARE(table_view->model()->rowCount(), 2);
+
+    // Check wilcard "?".
+    search_line->setText("io?new");
+    QCOMPARE(table_view->model()->rowCount(), 0);
+    search_line->setText("io???new");
+    QCOMPARE(table_view->model()->rowCount(), 2);
+
+    // Check wilcard "*".
+    search_line->setText("io*new");
+    QCOMPARE(table_view->model()->rowCount(), 2);
+    search_line->setText("*");
+    QCOMPARE(table_view->model()->rowCount(), 3);
+
+    search_line->setText(preexisting_r_address);
+    QCOMPARE(table_view->model()->rowCount(), 0);
+
+    search_line->setText(preexisting_s_address);
+    QCOMPARE(table_view->model()->rowCount(), 1);
+
+    search_line->setText(new_address_a);
+    QCOMPARE(table_view->model()->rowCount(), 1);
+
+    search_line->setText(new_address_b);
+    QCOMPARE(table_view->model()->rowCount(), 1);
+
+    search_line->setText("");
+    QCOMPARE(table_view->model()->rowCount(), 3);
 }
 
 } // namespace

From e87226c90d11f7fd3b2f7a59f2df20146ad450b7 Mon Sep 17 00:00:00 2001
From: Konstantin Akimov <knstqq@gmail.com>
Date: Sat, 11 Oct 2025 10:46:29 +0700
Subject: [PATCH 103/656] fix: removed duplicated annotations for
 masternode/meta

---
 src/masternode/meta.cpp | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/masternode/meta.cpp b/src/masternode/meta.cpp
index 93dda0796f13..adb2aaa30259 100644
--- a/src/masternode/meta.cpp
+++ b/src/masternode/meta.cpp
@@ -66,7 +66,7 @@ void CMasternodeMetaInfo::RemoveGovernanceObject(const uint256& nGovernanceObjec
     mapGovernanceObjectsVotedOn.erase(nGovernanceObjectHash);
 }
 
-CMasternodeMetaInfoPtr CMasternodeMetaMan::GetMetaInfo(const uint256& proTxHash, bool fCreate) EXCLUSIVE_LOCKS_REQUIRED(!cs)
+CMasternodeMetaInfoPtr CMasternodeMetaMan::GetMetaInfo(const uint256& proTxHash, bool fCreate)
 {
     LOCK(cs);
     auto it = metaInfos.find(proTxHash);
@@ -115,7 +115,7 @@ bool CMasternodeMetaMan::AddGovernanceVote(const uint256& proTxHash, const uint2
     return true;
 }
 
-void CMasternodeMetaMan::RemoveGovernanceObject(const uint256& nGovernanceObjectHash) EXCLUSIVE_LOCKS_REQUIRED(!cs)
+void CMasternodeMetaMan::RemoveGovernanceObject(const uint256& nGovernanceObjectHash)
 {
     LOCK(cs);
     for(const auto& p : metaInfos) {
@@ -123,20 +123,20 @@ void CMasternodeMetaMan::RemoveGovernanceObject(const uint256& nGovernanceObject
     }
 }
 
-std::vector<uint256> CMasternodeMetaMan::GetAndClearDirtyGovernanceObjectHashes() EXCLUSIVE_LOCKS_REQUIRED(!cs)
+std::vector<uint256> CMasternodeMetaMan::GetAndClearDirtyGovernanceObjectHashes()
 {
     std::vector<uint256> vecTmp;
     WITH_LOCK(cs, vecTmp.swap(vecDirtyGovernanceObjectHashes));
     return vecTmp;
 }
 
-bool CMasternodeMetaMan::AlreadyHavePlatformBan(const uint256& inv_hash) const EXCLUSIVE_LOCKS_REQUIRED(!cs)
+bool CMasternodeMetaMan::AlreadyHavePlatformBan(const uint256& inv_hash) const
 {
     LOCK(cs);
     return m_seen_platform_bans.exists(inv_hash);
 }
 
-std::optional<PlatformBanMessage> CMasternodeMetaMan::GetPlatformBan(const uint256& inv_hash) const EXCLUSIVE_LOCKS_REQUIRED(!cs)
+std::optional<PlatformBanMessage> CMasternodeMetaMan::GetPlatformBan(const uint256& inv_hash) const
 {
     LOCK(cs);
     PlatformBanMessage ret;
@@ -147,13 +147,13 @@ std::optional<PlatformBanMessage> CMasternodeMetaMan::GetPlatformBan(const uint2
     return ret;
 }
 
-void CMasternodeMetaMan::RememberPlatformBan(const uint256& inv_hash, PlatformBanMessage&& msg) EXCLUSIVE_LOCKS_REQUIRED(!cs)
+void CMasternodeMetaMan::RememberPlatformBan(const uint256& inv_hash, PlatformBanMessage&& msg)
 {
     LOCK(cs);
     m_seen_platform_bans.insert(inv_hash, std::move(msg));
 }
 
-std::string MasternodeMetaStore::ToString() const EXCLUSIVE_LOCKS_REQUIRED(!cs)
+std::string MasternodeMetaStore::ToString() const
 {
     LOCK(cs);
     return strprintf("Masternodes: meta infos object count: %d, nDsqCount: %d", metaInfos.size(), nDsqCount);

From 8d142aaec0d30db1a20edcaa5b7fce1a51b07d6d Mon Sep 17 00:00:00 2001
From: UdjinM6 <UdjinM6@users.noreply.github.com>
Date: Fri, 10 Oct 2025 17:19:40 +0300
Subject: [PATCH 104/656] fix: missing asserts for masternode/meta.h after
 rebase

---
 src/masternode/meta.h | 30 +++++++++++++++++++-----------
 1 file changed, 19 insertions(+), 11 deletions(-)

diff --git a/src/masternode/meta.h b/src/masternode/meta.h
index 8d8df8d0df92..217b9d800287 100644
--- a/src/masternode/meta.h
+++ b/src/masternode/meta.h
@@ -70,18 +70,26 @@ class CMasternodeMetaInfo
     {
     }
 
-    SERIALIZE_METHODS(CMasternodeMetaInfo, obj)
+    template <typename Stream>
+    void Serialize(Stream& s) const EXCLUSIVE_LOCKS_REQUIRED(!cs)
     {
-        LOCK(obj.cs);
-        READWRITE(obj.proTxHash, obj.nLastDsq, obj.nMixingTxCount, obj.mapGovernanceObjectsVotedOn,
-                  obj.outboundAttemptCount, obj.lastOutboundAttempt, obj.lastOutboundSuccess, obj.m_platform_ban,
-                  obj.m_platform_ban_updated);
+        LOCK(cs);
+        s << proTxHash << nLastDsq << nMixingTxCount << mapGovernanceObjectsVotedOn << outboundAttemptCount
+          << lastOutboundAttempt << lastOutboundSuccess << m_platform_ban << m_platform_ban_updated;
+    }
+
+    template <typename Stream>
+    void Unserialize(Stream& s) EXCLUSIVE_LOCKS_REQUIRED(!cs)
+    {
+        LOCK(cs);
+        s >> proTxHash >> nLastDsq >> nMixingTxCount >> mapGovernanceObjectsVotedOn >> outboundAttemptCount >>
+            lastOutboundAttempt >> lastOutboundSuccess >> m_platform_ban >> m_platform_ban_updated;
     }
 
-    UniValue ToJson() const;
+    UniValue ToJson() const EXCLUSIVE_LOCKS_REQUIRED(!cs);
 
 public:
-    const uint256 GetProTxHash() const
+    const uint256 GetProTxHash() const EXCLUSIVE_LOCKS_REQUIRED(!cs)
     {
         LOCK(cs);
         return proTxHash;
@@ -92,16 +100,16 @@ class CMasternodeMetaInfo
     bool IsValidForMixingTxes() const { return GetMixingTxCount() <= MASTERNODE_MAX_MIXING_TXES; }
 
     // KEEP TRACK OF EACH GOVERNANCE ITEM IN CASE THIS NODE GOES OFFLINE, SO WE CAN RECALCULATE THEIR STATUS
-    void AddGovernanceVote(const uint256& nGovernanceObjectHash);
+    void AddGovernanceVote(const uint256& nGovernanceObjectHash) EXCLUSIVE_LOCKS_REQUIRED(!cs);
 
-    void RemoveGovernanceObject(const uint256& nGovernanceObjectHash);
+    void RemoveGovernanceObject(const uint256& nGovernanceObjectHash) EXCLUSIVE_LOCKS_REQUIRED(!cs);
 
     bool OutboundFailedTooManyTimes() const { return outboundAttemptCount > MASTERNODE_MAX_FAILED_OUTBOUND_ATTEMPTS; }
     void SetLastOutboundAttempt(int64_t t) { lastOutboundAttempt = t; ++outboundAttemptCount; }
     int64_t GetLastOutboundAttempt() const { return lastOutboundAttempt; }
     void SetLastOutboundSuccess(int64_t t) { lastOutboundSuccess = t; outboundAttemptCount = 0; }
     int64_t GetLastOutboundSuccess() const { return lastOutboundSuccess; }
-    bool SetPlatformBan(bool is_banned, int height)
+    bool SetPlatformBan(bool is_banned, int height) EXCLUSIVE_LOCKS_REQUIRED(!cs)
     {
         LOCK(cs);
         if (height < m_platform_ban_updated) {
@@ -114,7 +122,7 @@ class CMasternodeMetaInfo
         m_platform_ban_updated = height;
         return true;
     }
-    bool IsPlatformBanned() const
+    bool IsPlatformBanned() const EXCLUSIVE_LOCKS_REQUIRED(!cs)
     {
         LOCK(cs);
         return m_platform_ban;

From 0406472b8e679c696ec18cbee04b6abab38ab34d Mon Sep 17 00:00:00 2001
From: laanwj <126646+laanwj@users.noreply.github.com>
Date: Wed, 4 May 2022 19:52:09 +0200
Subject: [PATCH 105/656] Merge bitcoin/bitcoin#24993: test, contrib, refactor:
 use `with` when opening a file

027aab663aaca32818051d456c3900326377281c test, contrib, refactor: use `with` when opening a file (brunoerg)

Pull request description:

  When manipulating a file in Python without using `with()`, you have to close the file manually, so this PR does it in `get_block_hashes` (`contrib/linearize/linearize-data.py`).

  Edit: this PR does it for all occurances that previously weren't using `with`.

ACKs for top commit:
  laanwj:
    Code review ACK 027aab663aaca32818051d456c3900326377281c

Tree-SHA512: 879400968e0013e8678ec16f1fe5d0963a73c1e0d442ca34802d885214f0783d2e9a9b500fc6be7c3b93560a367b6a3d685eee24d2f9ce53fddf064ea6feecf8
---
 contrib/devtools/copyright_header.py          | 10 ++---
 contrib/linearize/linearize-data.py           | 37 +++++++++----------
 contrib/linearize/linearize-hashes.py         | 25 ++++++-------
 contrib/verify-commits/verify-commits.py      | 15 +++++---
 test/functional/feature_config_args.py        |  3 +-
 .../functional/feature_versionbits_warning.py |  3 +-
 test/util/test_runner.py                      | 12 ++++--
 7 files changed, 56 insertions(+), 49 deletions(-)

diff --git a/contrib/devtools/copyright_header.py b/contrib/devtools/copyright_header.py
index c18c156d5f5e..a1b13e97c5dd 100755
--- a/contrib/devtools/copyright_header.py
+++ b/contrib/devtools/copyright_header.py
@@ -330,15 +330,13 @@ def get_most_recent_git_change_year(filename):
 ################################################################################
 
 def read_file_lines(filename):
-    f = open(filename, 'r', encoding="utf8")
-    file_lines = f.readlines()
-    f.close()
+    with open(filename, 'r', encoding="utf8") as f:
+        file_lines = f.readlines()
     return file_lines
 
 def write_file_lines(filename, file_lines):
-    f = open(filename, 'w', encoding="utf8")
-    f.write(''.join(file_lines))
-    f.close()
+    with open(filename, 'w', encoding="utf8") as f:
+        f.write(''.join(file_lines))
 
 ################################################################################
 # update header years execution
diff --git a/contrib/linearize/linearize-data.py b/contrib/linearize/linearize-data.py
index 6f2b5eb2ba5b..2fab116cdefb 100755
--- a/contrib/linearize/linearize-data.py
+++ b/contrib/linearize/linearize-data.py
@@ -34,12 +34,12 @@ def get_blk_dt(blk_hdr):
 # When getting the list of block hashes, undo any byte reversals.
 def get_block_hashes(settings):
     blkindex = []
-    f = open(settings['hashlist'], "r", encoding="utf8")
-    for line in f:
-        line = line.rstrip()
-        if settings['rev_hash_bytes'] == 'true':
-            line = bytes.fromhex(line)[::-1].hex()
-        blkindex.append(line)
+    with open(settings['hashlist'], "r", encoding="utf8") as f:
+        for line in f:
+            line = line.rstrip()
+            if settings['rev_hash_bytes'] == 'true':
+                line = bytes.fromhex(line)[::-1].hex()
+            blkindex.append(line)
 
     print("Read " + str(len(blkindex)) + " hashes")
 
@@ -249,19 +249,18 @@ def run(self):
         print("Usage: linearize-data.py CONFIG-FILE")
         sys.exit(1)
 
-    f = open(sys.argv[1], encoding="utf8")
-    for line in f:
-        # skip comment lines
-        m = re.search(r'^\s*#', line)
-        if m:
-            continue
-
-        # parse key=value lines
-        m = re.search(r'^(\w+)\s*=\s*(\S.*)$', line)
-        if m is None:
-            continue
-        settings[m.group(1)] = m.group(2)
-    f.close()
+    with open(sys.argv[1], encoding="utf8") as f:
+        for line in f:
+            # skip comment lines
+            m = re.search(r'^\s*#', line)
+            if m:
+                continue
+
+            # parse key=value lines
+            m = re.search(r'^(\w+)\s*=\s*(\S.*)$', line)
+            if m is None:
+                continue
+            settings[m.group(1)] = m.group(2)
 
     # Force hash byte format setting to be lowercase to make comparisons easier.
     # Also place upfront in case any settings need to know about it.
diff --git a/contrib/linearize/linearize-hashes.py b/contrib/linearize/linearize-hashes.py
index 373eafc76b41..94571cd9616c 100755
--- a/contrib/linearize/linearize-hashes.py
+++ b/contrib/linearize/linearize-hashes.py
@@ -98,19 +98,18 @@ def get_rpc_cookie():
         print("Usage: linearize-hashes.py CONFIG-FILE")
         sys.exit(1)
 
-    f = open(sys.argv[1], encoding="utf8")
-    for line in f:
-        # skip comment lines
-        m = re.search(r'^\s*#', line)
-        if m:
-            continue
-
-        # parse key=value lines
-        m = re.search(r'^(\w+)\s*=\s*(\S.*)$', line)
-        if m is None:
-            continue
-        settings[m.group(1)] = m.group(2)
-    f.close()
+    with open(sys.argv[1], encoding="utf8") as f:
+        for line in f:
+            # skip comment lines
+            m = re.search(r'^\s*#', line)
+            if m:
+                continue
+
+            # parse key=value lines
+            m = re.search(r'^(\w+)\s*=\s*(\S.*)$', line)
+            if m is None:
+                continue
+            settings[m.group(1)] = m.group(2)
 
     if 'host' not in settings:
         settings['host'] = '127.0.0.1'
diff --git a/contrib/verify-commits/verify-commits.py b/contrib/verify-commits/verify-commits.py
index d522d9ce43ce..65924716a03f 100755
--- a/contrib/verify-commits/verify-commits.py
+++ b/contrib/verify-commits/verify-commits.py
@@ -82,11 +82,16 @@ def main():
     # get directory of this program and read data files
     dirname = os.path.dirname(os.path.abspath(__file__))
     print("Using verify-commits data from " + dirname)
-    verified_root = open(dirname + "/trusted-git-root", "r", encoding="utf8").read().splitlines()[0]
-    verified_sha512_root = open(dirname + "/trusted-sha512-root-commit", "r", encoding="utf8").read().splitlines()[0]
-    revsig_allowed = open(dirname + "/allow-revsig-commits", "r", encoding="utf-8").read().splitlines()
-    unclean_merge_allowed = open(dirname + "/allow-unclean-merge-commits", "r", encoding="utf-8").read().splitlines()
-    incorrect_sha512_allowed = open(dirname + "/allow-incorrect-sha512-commits", "r", encoding="utf-8").read().splitlines()
+    with open(dirname + "/trusted-git-root", "r", encoding="utf8") as f:
+        verified_root = f.read().splitlines()[0]
+    with open(dirname + "/trusted-sha512-root-commit", "r", encoding="utf8") as f:
+        verified_sha512_root = f.read().splitlines()[0]
+    with open(dirname + "/allow-revsig-commits", "r", encoding="utf8") as f:
+        revsig_allowed = f.read().splitlines()
+    with open(dirname + "/allow-unclean-merge-commit", "r", encoding="utf8") as f:
+        unclean_merge_allowed = f.read().splitlines()
+    with open(dirname + "/allow-incorrect-sha512-commits", "r", encoding="utf8") as f:
+        incorrect_sha512_allowed = f.read().splitlines()
 
     # Set commit and branch and set variables
     current_commit = args.commit
diff --git a/test/functional/feature_config_args.py b/test/functional/feature_config_args.py
index c98144baeb10..88e900a011e8 100755
--- a/test/functional/feature_config_args.py
+++ b/test/functional/feature_config_args.py
@@ -294,7 +294,8 @@ def run_test(self):
         conf_file = os.path.join(default_data_dir, "dash.conf")
 
         # datadir needs to be set before [chain] section
-        conf_file_contents = open(conf_file, encoding='utf8').read()
+        with open(conf_file, encoding='utf8') as f:
+            conf_file_contents = f.read()
         with open(conf_file, 'w', encoding='utf8') as f:
             f.write(f"datadir={new_data_dir}\n")
             f.write(conf_file_contents)
diff --git a/test/functional/feature_versionbits_warning.py b/test/functional/feature_versionbits_warning.py
index aedac443c6df..20e131c56899 100755
--- a/test/functional/feature_versionbits_warning.py
+++ b/test/functional/feature_versionbits_warning.py
@@ -56,7 +56,8 @@ def send_blocks_with_version(self, peer, numblocks, version):
 
     def versionbits_in_alert_file(self):
         """Test that the versionbits warning has been written to the alert file."""
-        alert_text = open(self.alert_filename, 'r', encoding='utf8').read()
+        with open(self.alert_filename, 'r', encoding='utf8') as f:
+            alert_text = f.read()
         return VB_PATTERN.search(alert_text) is not None
 
     def run_test(self):
diff --git a/test/util/test_runner.py b/test/util/test_runner.py
index 576c2d3de06c..d12f8cec31bd 100755
--- a/test/util/test_runner.py
+++ b/test/util/test_runner.py
@@ -22,7 +22,8 @@
 def main():
     config = configparser.ConfigParser()
     config.optionxform = str
-    config.read_file(open(os.path.join(os.path.dirname(__file__), "../config.ini"), encoding="utf8"))
+    with open(os.path.join(os.path.dirname(__file__), "../config.ini"), encoding="utf8") as f:
+        config.read_file(f)
     env_conf = dict(config.items('environment'))
 
     parser = argparse.ArgumentParser(description=__doc__)
@@ -43,7 +44,8 @@ def main():
 def bctester(testDir, input_basename, buildenv):
     """ Loads and parses the input file, runs all tests and reports results"""
     input_filename = os.path.join(testDir, input_basename)
-    raw_data = open(input_filename, encoding="utf8").read()
+    with open(input_filename, encoding="utf8") as f:
+        raw_data = f.read()
     input_data = json.loads(raw_data)
 
     failed_testcases = []
@@ -80,7 +82,8 @@ def bctest(testDir, testObj, buildenv):
     inputData = None
     if "input" in testObj:
         filename = os.path.join(testDir, testObj["input"])
-        inputData = open(filename, encoding="utf8").read()
+        with open(filename, encoding="utf8") as f:
+            inputData = f.read()
         stdinCfg = subprocess.PIPE
 
     # Read the expected output data (if there is any)
@@ -91,7 +94,8 @@ def bctest(testDir, testObj, buildenv):
         outputFn = testObj['output_cmp']
         outputType = os.path.splitext(outputFn)[1][1:]  # output type from file extension (determines how to compare)
         try:
-            outputData = open(os.path.join(testDir, outputFn), encoding="utf8").read()
+            with open(os.path.join(testDir, outputFn), encoding="utf8") as f:
+                outputData = f.read()
         except:
             logging.error("Output file " + outputFn + " cannot be opened")
             raise

From 57be1101b74e4d18ca8f781f5233aeec65581a8c Mon Sep 17 00:00:00 2001
From: fanquake <fanquake@gmail.com>
Date: Thu, 5 May 2022 17:44:43 +0100
Subject: [PATCH 106/656] Merge bitcoin/bitcoin#25070: contrib: fix dirname on
 `verify-commits`

ded915e842e6a4135fbc5ce6110453c74192e251 contrib: fix dirname on `verify-commits` (brunoerg)

Pull request description:

  Fixes: https://github.com/bitcoin/bitcoin/runs/6309423255

ACKs for top commit:
  fanquake:
    ACK ded915e842e6a4135fbc5ce6110453c74192e251

Tree-SHA512: fbc46e907ec6151aca76360b471f0f34b9fc7d7eb054616df61feaf392bc4710dc26a965adb432e91e18498d446787c388c7989d07e4858d0fbf6bf28074b24c
---
 contrib/verify-commits/verify-commits.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/contrib/verify-commits/verify-commits.py b/contrib/verify-commits/verify-commits.py
index 65924716a03f..51506a1a2746 100755
--- a/contrib/verify-commits/verify-commits.py
+++ b/contrib/verify-commits/verify-commits.py
@@ -88,7 +88,7 @@ def main():
         verified_sha512_root = f.read().splitlines()[0]
     with open(dirname + "/allow-revsig-commits", "r", encoding="utf8") as f:
         revsig_allowed = f.read().splitlines()
-    with open(dirname + "/allow-unclean-merge-commit", "r", encoding="utf8") as f:
+    with open(dirname + "/allow-unclean-merge-commits", "r", encoding="utf8") as f:
         unclean_merge_allowed = f.read().splitlines()
     with open(dirname + "/allow-incorrect-sha512-commits", "r", encoding="utf8") as f:
         incorrect_sha512_allowed = f.read().splitlines()

From 97e876580c61a960654e9aa9b5f29f57b16d49b8 Mon Sep 17 00:00:00 2001
From: MacroFake <falke.marco@gmail.com>
Date: Thu, 30 Jun 2022 16:09:50 +0200
Subject: [PATCH 107/656] Merge bitcoin/bitcoin#25511: test: non-positive
 integer value to `-peertimeout` should throw an error

d22bd543cc666e7fdb6fdd0eca5f7514f516b393 test: passing a non-positive integer value to `-peertimeout` should throw an error (brunoerg)

Pull request description:

  This PR adds test coverage for #25506, since #25505 gets closed.

ACKs for top commit:
  kristapsk:
    ACK d22bd543cc666e7fdb6fdd0eca5f7514f516b393
  w0xlt:
    ACK https://github.com/bitcoin/bitcoin/pull/25511/commits/d22bd543cc666e7fdb6fdd0eca5f7514f516b393
  1440000bytes:
    ACK https://github.com/bitcoin/bitcoin/pull/25511/commits/d22bd543cc666e7fdb6fdd0eca5f7514f516b393

Tree-SHA512: 89c8a097606cb52569d816cc2227baac832df70e381d07c4a12aeb024c500d334c8102218fc6519eebb3819159d8308119d7253d9192a6bebe13b8e738b286b9
---
 test/functional/p2p_timeouts.py | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/test/functional/p2p_timeouts.py b/test/functional/p2p_timeouts.py
index b6163a696cd6..f4a90e44358f 100755
--- a/test/functional/p2p_timeouts.py
+++ b/test/functional/p2p_timeouts.py
@@ -101,6 +101,11 @@ def run_test(self):
             no_version_node.wait_for_disconnect(timeout=1)
             no_send_node.wait_for_disconnect(timeout=1)
 
+        self.stop_nodes(0)
+        self.nodes[0].assert_start_raises_init_error(
+            expected_msg='Error: peertimeout must be a positive integer.',
+            extra_args=['-peertimeout=0'],
+        )
 
 
 if __name__ == '__main__':

From eb3cae67512e74dbf844f112abb15196546e2353 Mon Sep 17 00:00:00 2001
From: MacroFake <falke.marco@gmail.com>
Date: Fri, 8 Jul 2022 13:17:39 +0200
Subject: [PATCH 108/656] Merge bitcoin/bitcoin#25549: doc: update for NetBSD
 9.2, add GUI Build Instructions

d3e9a1c71bef1d730b5820f85e9758af54267ac3 doc: update for NetBSD 9.2, add GUI Build Instructions (Jarol Rodriguez)

Pull request description:

  **For reviewer:** as I suppose few have a NetBSD system available, I wrote a [guide](https://gist.github.com/jarolrod/385dc063bb02c90aea0cbe8a147fc418#file-netbsd-vm-setup-guide-md) to setup a VM for testing purposes.

  This attempts to update the NetBSD docs so one can successfully build on the latest release. It also adds instructions to build the GUI.

  Additionally, it includes a note and an example on how one could update the gcc version bundled with NetBSD 9.2 and prior to be able to actually compile. This note can be updated with the release of NetBSD 10, as it will package an acceptable gcc version.

  Master: [render](https://github.com/bitcoin/bitcoin/blob/master/doc/build-netbsd.md)
  PR: [render](https://github.com/bitcoin/bitcoin/blob/d3e9a1c71bef1d730b5820f85e9758af54267ac3/doc/build-netbsd.md)

  Related to #20610, but reworked.

ACKs for top commit:
  aureleoules:
    ACK d3e9a1c71bef1d730b5820f85e9758af54267ac3.
  fanquake:
    ACK d3e9a1c71bef1d730b5820f85e9758af54267ac3

Tree-SHA512: fc3c12689cee886f26782c1d57f3b794ceaedc965a571dd06cfc4a57f90393842ad2124e6dba55a12ac9de9bf63d8e3eb4aa541768f2aa8603248175ce7d1c08
---
 doc/build-netbsd.md | 123 ++++++++++++++++++++++++++------------------
 1 file changed, 73 insertions(+), 50 deletions(-)

diff --git a/doc/build-netbsd.md b/doc/build-netbsd.md
index cd02fc693234..9e02d9195640 100644
--- a/doc/build-netbsd.md
+++ b/doc/build-netbsd.md
@@ -1,95 +1,118 @@
-NetBSD Build Guide
-======================
-**Updated for NetBSD [8.0](https://www.netbsd.org/releases/formal-8/NetBSD-8.0.html)**
+# NetBSD Build Guide
 
-This guide describes how to build dashd and command-line utilities on NetBSD.
+Updated for NetBSD [9.2](https://netbsd.org/releases/formal-9/NetBSD-9.2.html).
 
-This guide does not contain instructions for building the GUI.
+This guide describes how to build dashd, command-line utilities, and GUI on NetBSD.
 
 **This guide has not been tested for building Dash Core and is expected to fail due to missing `bls_dash` and `backtrace`. Please report your results; contributions welcome.**
 
-Preparation
--------------
+## Preparation
 
-You will need the following modules, which can be installed via pkgsrc or pkgin:
+### 1. Install Required Dependencies
+
+Install the required dependencies the usual way you [install software on NetBSD](https://www.netbsd.org/docs/guide/en/chap-boot.html#chap-boot-pkgsrc).
+The example commands below use `pkgin`.
+
+```bash
+pkgin install autoconf automake libtool pkg-config git gmake boost libevent gmp
 
 ```
-autoconf
-automake
-boost
-git
-gmake
-gmp
-libevent
-libtool
-pkg-config
-python37
 
-git clone https://github.com/dashpay/dash.git
+NetBSD currently ships with an older version of `gcc` than is needed to build. You should upgrade your `gcc` and then pass this new version to the configure script.
+
+For example, grab `gcc9`:
+```
+pkgin install gcc9
+```
+
+Then, when configuring, pass the following:
+```bash
+./configure
+    ...
+    CC="/usr/pkg/gcc9/bin/gcc" \
+    CXX="/usr/pkg/gcc9/bin/g++" \
+    ...
 ```
 
 See [dependencies.md](dependencies.md) for a complete overview.
 
-### Building Dash Core
+### 2. Clone Dash Core Repo
 
-**Important**: Use `gmake` (the non-GNU `make` will exit with an error).
+Clone the Dash Core repository to a directory. All build scripts and commands will run from this directory.
 
-#### With descriptor wallet:
+```bash
+git clone https://github.com/dashpay/dash.git
+```
+
+### 3. Install Optional Dependencies
+
+#### Wallet Dependencies
+
+It is not necessary to build wallet functionality to run dashd or the GUI.
+
+###### Descriptor Wallet Support
+
+`sqlite3` is required to enable support for [descriptor wallets](https://github.com/dashpay/dash/blob/master/doc/descriptors.md).
 
-The descriptor wallet uses `sqlite3`. You can install it using:
 ```bash
 pkgin install sqlite3
 ```
 
+###### Legacy Wallet Support
+
+`db4` is required to enable support for legacy wallets.
+
 ```bash
-./autogen.sh
-./configure --with-gui=no --without-bdb \
-    CPPFLAGS="-I/usr/pkg/include" \
-    LDFLAGS="-L/usr/pkg/lib" \
-    BOOST_CPPFLAGS="-I/usr/pkg/include" \
-    MAKE=gmake
+pkgin install db4
 ```
 
-#### With legacy wallet:
-
-BerkeleyDB is use for legacy wallet functionality.
+#### GUI Dependencies
 
-It is recommended to use Berkeley DB 4.8. You cannot use the BerkeleyDB library
-from ports.
-You can use [the installation script included in contrib/](/contrib/install_db4.sh) like so:
+Dash Core includes a GUI built with the cross-platform Qt Framework. To compile the GUI, we need to install `qt5`.
 
 ```bash
-./contrib/install_db4.sh `pwd`
+pkgin install qt5
 ```
 
-from the root of the repository. Then set `BDB_PREFIX` for the next section:
+The GUI can encode addresses in a QR Code. To build in QR support for the GUI, install `qrencode`.
 
 ```bash
-export BDB_PREFIX="$PWD/db4"
+pkgin install qrencode
 ```
 
+#### Test Suite Dependencies
+
+There is an included test suite that is useful for testing code changes when developing.
+To run the test suite (recommended), you will need to have Python 3 installed:
+
 ```bash
-./autogen.sh
-./configure --with-gui=no CPPFLAGS="-I/usr/pkg/include" \
-    LDFLAGS="-L/usr/pkg/lib" \
-    BOOST_CPPFLAGS="-I/usr/pkg/include" \
-    BDB_LIBS="-L${BDB_PREFIX}/lib -ldb_cxx-4.8" \
-    BDB_CFLAGS="-I${BDB_PREFIX}/include" \
-    MAKE=gmake
+pkgin install python37
 ```
 
-#### Without wallet:
+### Building Dash Core
+
+**Note**: Use `gmake` (the non-GNU `make` will exit with an error).
+
+
+### 1. Configuration
+
+There are many ways to configure Dash Core. Here is an example that
+explicitly disables the wallet and GUI:
+
 ```bash
 ./autogen.sh
-./configure --with-gui=no --disable-wallet \
+./configure --without-wallet --with-gui=no \
     CPPFLAGS="-I/usr/pkg/include" \
-    LDFLAGS="-L/usr/pkg/lib" \
-    BOOST_CPPFLAGS="-I/usr/pkg/include" \
     MAKE=gmake
 ```
 
+For a full list of configuration options, see the output of `./configure --help`
+
+### 2. Compile
+
 Build and run the tests:
+
 ```bash
 gmake # use "-j N" here for N parallel jobs
-gmake check
+gmake check # Run tests if Python 3 is available
 ```

From cf1b7c9c0c48fbb37d7565313238096b55b57c5e Mon Sep 17 00:00:00 2001
From: MacroFake <falke.marco@gmail.com>
Date: Mon, 11 Jul 2022 09:21:34 +0200
Subject: [PATCH 109/656] Merge bitcoin/bitcoin#25581: test: refactor: pass
 absolute fee in `create_lots_of_big_transactions` helper

6cbe65c5d7fb23e922e5e0451a6907abb69c7cde test: refactor: pass absolute fee in `create_lots_of_big_transactions` helper (Sebastian Falbesoner)

Pull request description:

  Recently merged PR #25522 (commit 2222842ae73f85494797b14753bc18446e4817a2) enabled specifying an absolute fee for MiniWallet's `create_self_transfer` method. We can use that in the `create_lots_of_big_transactions` helper to avoid deducting the fee manually (with prior conversion from BTC to Satoshis). This helper is used (directly or indirectly) in the tests `feature_maxuploadtarget.py`, `mempool_limit.py`, `mining_prioritisetransaction.py`.

ACKs for top commit:
  MarcoFalke:
    cr ACK 6cbe65c5d7fb23e922e5e0451a6907abb69c7cde

Tree-SHA512: 63d66939ae36722a2dc787cbd8f1f995de6232139c2169a3d25525f43c7aaacf646d86b4095a8078f26db18e916778c8097acb19ef17ab0f58382b8bb718d60b
---
 test/functional/test_framework/util.py | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/test/functional/test_framework/util.py b/test/functional/test_framework/util.py
index 47dd5eca0703..107bd72cc6c3 100644
--- a/test/functional/test_framework/util.py
+++ b/test/functional/test_framework/util.py
@@ -612,16 +612,13 @@ def gen_return_txouts():
 # Create a spend of each passed-in utxo, splicing in "txouts" to each raw
 # transaction to make it large.  See gen_return_txouts() above.
 def create_lots_of_big_transactions(mini_wallet, node, fee, tx_batch_size, txouts, utxos=None):
-    from .messages import COIN
-    fee_sats = int(fee * COIN)
     txids = []
     use_internal_utxos = utxos is None
     for _ in range(tx_batch_size):
         tx = mini_wallet.create_self_transfer(
             utxo_to_spend=None if use_internal_utxos else utxos.pop(),
-            fee_rate=0,
-        )['tx']
-        tx.vout[0].nValue -= fee_sats
+            fee=fee,
+        )["tx"]
         tx.vout.extend(txouts)
         res = node.testmempoolaccept([tx.serialize().hex()])[0]
         assert_equal(res['fees']['base'], fee)

From 8360d20454eca234c2cb79b3f762e0e3542acb64 Mon Sep 17 00:00:00 2001
From: MacroFake <falke.marco@gmail.com>
Date: Tue, 12 Jul 2022 09:02:08 +0200
Subject: [PATCH 110/656] Merge bitcoin/bitcoin#25565: doc: improve
 developer-notes about threads

dc02edcba1dc67f2d49f618a556f127b41bc04b0 doc: update the URLs to thread functions in developer-notes (Vasil Dimov)
c5cc3f140cb13bf933a9d1cb5333445b5d434940 doc: list the I2P accept thread in developer-notes (Vasil Dimov)

Pull request description:

  Document `i2paccept` in `doc/developer-notes.md` and fix broken URLs to doxygen.bitcoincore.org.

ACKs for top commit:
  theStack:
    re-ACK dc02edcba1dc67f2d49f618a556f127b41bc04b0

Tree-SHA512: 7d396885dd2e8fda2b050aaa25a82b4217ced6a5aa3478339fb892d5392d2b8b6b5997f8bb9acaab7867c0c5bf58bd0b720ef36b335b1e7eb617b8fc205915b0
---
 doc/developer-notes.md | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/doc/developer-notes.md b/doc/developer-notes.md
index 67f377b200e1..89db0105312f 100644
--- a/doc/developer-notes.md
+++ b/doc/developer-notes.md
@@ -612,10 +612,10 @@ Threads
   : Started from `main()` in `bitcoind.cpp`. Responsible for starting up and
   shutting down the application.
 
-- [ThreadImport (`d-loadblk`)](https://doxygen.bitcoincore.org/init_8cpp.html#ae9e290a0e829ec0198518de2eda579d1)
+- [ThreadImport (`d-loadblk`)](https://doxygen.bitcoincore.org/namespacenode.html#ab4305679079866f0f420f7dbf278381d)
   : Loads blocks from `blk*.dat` files or `-loadblock=<file>` on startup.
 
-- [ThreadScriptCheck (`d-scriptch.x`)](https://doxygen.bitcoincore.org/validation_8cpp.html#a925a33e7952a157922b0bbb8dab29a20)
+- [CCheckQueue::Loop (`d-scriptch.x`)](https://doxygen.bitcoincore.org/class_c_check_queue.html#a6e7fa51d3a25e7cb65446d4b50e6a987)
   : Parallel script validation threads for transactions in blocks.
 
 - [ThreadHTTP (`d-http`)](https://doxygen.bitcoincore.org/httpserver_8cpp.html#abb9f6ea8819672bd9a62d3695070709c)
@@ -631,7 +631,7 @@ Threads
   : Does asynchronous background tasks like dumping wallet contents, dumping
   addrman and running asynchronous validationinterface callbacks.
 
-- [TorControlThread (`d-torcontrol`)](https://doxygen.bitcoincore.org/torcontrol_8cpp.html#a4faed3692d57a0d7bdbecf3b37f72de0)
+- [TorControlThread (`d-torcontrol`)](https://doxygen.bitcoincore.org/torcontrol_8cpp.html#a52a3efff23634500bb42c6474f306091)
   : Libevent thread for tor connections.
 
 - Net threads:
@@ -643,7 +643,7 @@ Threads
   - [ThreadDNSAddressSeed (`d-dnsseed`)](https://doxygen.bitcoincore.org/class_c_connman.html#aa7c6970ed98a4a7bafbc071d24897d13)
     : Loads addresses of peers from the DNS.
 
-  - [ThreadMapPort (`d-upnp`)](https://doxygen.bitcoincore.org/net_8cpp.html#a63f82a71c4169290c2db1651a9bbe249)
+  - ThreadMapPort (`d-mapport`)
     : Universal plug-and-play startup/shutdown.
 
   - [ThreadSocketHandler (`d-net`)](https://doxygen.bitcoincore.org/class_c_connman.html#a765597cbfe99c083d8fa3d61bb464e34)
@@ -655,6 +655,9 @@ Threads
   - [ThreadOpenConnections (`d-opencon`)](https://doxygen.bitcoincore.org/class_c_connman.html#a55e9feafc3bab78e5c9d408c207faa45)
     : Initiates new connections to peers.
 
+  - [ThreadI2PAcceptIncoming (`d-i2paccept`)](https://doxygen.bitcoincore.org/class_c_connman.html#a57787b4f9ac847d24065fbb0dd6e70f8)
+    : Listens for and accepts incoming I2P connections through the I2P SAM proxy.
+
   - ThreadOpenMasternodeConnections (`d-mncon`)
     : Opens network connections to masternodes.
 

From b52fabbafb07544e1df639c9101bbf78a6b82394 Mon Sep 17 00:00:00 2001
From: Konstantin Akimov <knstqq@gmail.com>
Date: Mon, 13 Oct 2025 17:35:08 +0700
Subject: [PATCH 111/656] fixup: follow-up for bitcoin#12755 - no more
 expected_stderr is needed for stop_nodes()

---
 test/functional/test_framework/test_framework.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/functional/test_framework/test_framework.py b/test/functional/test_framework/test_framework.py
index 5194b06cb2cd..d9ad16b25459 100755
--- a/test/functional/test_framework/test_framework.py
+++ b/test/functional/test_framework/test_framework.py
@@ -681,11 +681,11 @@ def stop_node(self, i, expected_stderr='', wait=0):
         """Stop a dashd test node"""
         self.nodes[i].stop_node(expected_stderr=expected_stderr, wait=wait)
 
-    def stop_nodes(self, expected_stderr='', wait=0):
+    def stop_nodes(self, wait=0):
         """Stop multiple dashd test nodes"""
         for node in self.nodes:
             # Issue RPC to stop nodes
-            node.stop_node(expected_stderr=expected_stderr, wait=wait, wait_until_stopped=False)
+            node.stop_node(wait=wait, wait_until_stopped=False)
 
         for node in self.nodes:
             # Wait for nodes to stop

From cbcd3f940065948a11ff044bdcfc102ea96389f2 Mon Sep 17 00:00:00 2001
From: MacroFake <falke.marco@gmail.com>
Date: Tue, 12 Jul 2022 17:08:31 +0200
Subject: [PATCH 112/656] Merge bitcoin/bitcoin#25592: test persistence of
 non-mempool tx prioritisation

a9790ba95fa0ad9344ca9a6fda9262ea19ef4649 [test] persist prioritisation of transactions not in mempool (glozow)

Pull request description:

  We persist tx prioritisation/fee deltas in mempool.dat (see `DumpMempool`). It seems we have test coverage for persistence of modified fees of mempool entries (see `vinfo` loop), but not for the prioritisation of transactions not in mempool (see `mapDeltas`).

  Relevant: https://github.com/bitcoin/bitcoin/pull/25487#discussion_r917490221

ACKs for top commit:
  darosior:
    utACK a9790ba95fa0ad9344ca9a6fda9262ea19ef4649
  w0xlt:
    ACK https://github.com/bitcoin/bitcoin/pull/25592/commits/a9790ba95fa0ad9344ca9a6fda9262ea19ef4649

Tree-SHA512: 3f2769a917041f12414584f69b2239eef57586f9975869e826f356633fcaf893fde15500619b302e7663de14f3661c6cba22c7524cab5286e715e2c105726521
---
 test/functional/mempool_persist.py | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/test/functional/mempool_persist.py b/test/functional/mempool_persist.py
index bc9a6d949c22..440639b85098 100755
--- a/test/functional/mempool_persist.py
+++ b/test/functional/mempool_persist.py
@@ -103,6 +103,11 @@ def run_test(self):
         assert_equal(len(self.nodes[0].p2ps), 0)
         self.mini_wallet.send_self_transfer(from_node=self.nodes[0])
 
+        # Test persistence of prioritisation for transactions not in the mempool.
+        # Create a tx and prioritise but don't submit until after the restart.
+        tx_prioritised_not_submitted = self.mini_wallet.create_self_transfer()
+        self.nodes[0].prioritisetransaction(txid=tx_prioritised_not_submitted['txid'], fee_delta=9999)
+
         self.log.debug("Stop-start the nodes. Verify that node0 has the transactions in its mempool and node1 does not. Verify that node2 calculates its balance correctly after loading wallet transactions.")
         self.stop_nodes()
         # Give this node a head-start, so we can be "extra-sure" that it didn't load anything later
@@ -123,6 +128,9 @@ def run_test(self):
 
         self.log.debug('Verify all fields are loaded correctly')
         assert_equal(last_entry, self.nodes[0].getmempoolentry(txid=last_txid))
+        self.nodes[0].sendrawtransaction(tx_prioritised_not_submitted['hex'])
+        entry_prioritised_before_restart = self.nodes[0].getmempoolentry(txid=tx_prioritised_not_submitted['txid'])
+        assert_equal(entry_prioritised_before_restart['fees']['base'] + Decimal('0.00009999'), entry_prioritised_before_restart['fees']['modified'])
 
         # Verify accounting of mempool transactions after restart is correct
         if self.is_sqlite_compiled():
@@ -141,7 +149,7 @@ def run_test(self):
         self.stop_nodes()
         self.start_node(0)
         assert self.nodes[0].getmempoolinfo()["loaded"]
-        assert_equal(len(self.nodes[0].getrawmempool()), 6)
+        assert_equal(len(self.nodes[0].getrawmempool()), 7)
 
         mempooldat0 = os.path.join(self.nodes[0].datadir, self.chain, 'mempool.dat')
         mempooldat1 = os.path.join(self.nodes[1].datadir, self.chain, 'mempool.dat')
@@ -151,12 +159,12 @@ def run_test(self):
         assert os.path.isfile(mempooldat0)
         assert_equal(result0['filename'], mempooldat0)
 
-        self.log.debug("Stop nodes, make node1 use mempool.dat from node0. Verify it has 6 transactions")
+        self.log.debug("Stop nodes, make node1 use mempool.dat from node0. Verify it has 7 transactions")
         os.rename(mempooldat0, mempooldat1)
         self.stop_nodes()
         self.start_node(1, extra_args=["-persistmempool"])
         assert self.nodes[1].getmempoolinfo()["loaded"]
-        assert_equal(len(self.nodes[1].getrawmempool()), 6)
+        assert_equal(len(self.nodes[1].getrawmempool()), 7)
 
         self.log.debug("Prevent dashd from writing mempool.dat to disk. Verify that `savemempool` fails")
         # to test the exception we are creating a tmp folder called mempool.dat.new

From 4c6bc3e7a7f00bc0a01267efd462be2f08f3d630 Mon Sep 17 00:00:00 2001
From: fanquake <fanquake@gmail.com>
Date: Wed, 13 Jul 2022 16:03:35 +0100
Subject: [PATCH 113/656] Merge bitcoin/bitcoin#25472: build: Increase MS
 Visual Studio minimum version

630c1711b47ce50805f4dd2883777a100f7e5339 refactor: Drop no longer needed `util/designator.h` (Hennadii Stepanov)
88ec5d40dcf5d9f95217b123b48203b2f334c0a1 build: Increase MS Visual Studio minimum version (Hennadii Stepanov)
555f9dd5d39b316bf404017401b5aedc23ec6226 rpc, refactor: Add `decodepsbt_outputs` (Hennadii Stepanov)
0c432cbbfa9e83a68e061b388745326e278369fb rpc, refactor: Add `decodepsbt_inputs` (Hennadii Stepanov)
01d95a3964267d243df00d9bcc93b28adcfe16d7 rpc, refactor: Add `getblock_prevout` (Hennadii Stepanov)

Pull request description:

  Visual Studio 2022 with `/std:c++20` supports [designated initializers](https://github.com/bitcoin/bitcoin/pull/24531).

ACKs for top commit:
  sipsorcery:
    reACK 630c1711b47ce50805f4dd2883777a100f7e5339.

Tree-SHA512: 5b8933940dd69061c6b077512168bebb6fea05d429b63ffbab191950798b4c825e8484b1a651db0ae13f97eae481097d3c16395659c0f3b9f847af2aaf44b65d
---
 src/rpc/blockchain.cpp     |  44 ++++----
 src/rpc/rawtransaction.cpp | 208 +++++++++++++++++++------------------
 2 files changed, 132 insertions(+), 120 deletions(-)

diff --git a/src/rpc/blockchain.cpp b/src/rpc/blockchain.cpp
index 35e4d54c1f25..b890d7f98a20 100644
--- a/src/rpc/blockchain.cpp
+++ b/src/rpc/blockchain.cpp
@@ -886,6 +886,29 @@ static RPCHelpMan getmerkleblocks()
     };
 }
 
+const RPCResult getblock_vin{
+    RPCResult::Type::ARR, "vin", "",
+    {
+        {RPCResult::Type::OBJ, "", "",
+        {
+            {RPCResult::Type::ELISION, "", "The same output as verbosity = 2"},
+            {RPCResult::Type::OBJ, "prevout", "(Only if undo information is available)",
+            {
+                {RPCResult::Type::BOOL, "generated", "Coinbase or not"},
+                {RPCResult::Type::NUM, "height", "The height of the prevout"},
+                {RPCResult::Type::NUM, "value", "The value in " + CURRENCY_UNIT},
+                {RPCResult::Type::OBJ, "scriptPubKey", "",
+                {
+                    {RPCResult::Type::STR, "asm", "The asm"},
+                    {RPCResult::Type::STR, "hex", "The hex"},
+                    {RPCResult::Type::STR, "address", /*optional=*/true, "The Dash address (only if a well-defined address exists)"},
+                    {RPCResult::Type::STR, "type", "The type, eg 'pubkeyhash'"},
+                }},
+            }},
+        }},
+    }
+};
+
 static RPCHelpMan getblock()
 {
     return RPCHelpMan{"getblock",
@@ -945,26 +968,7 @@ static RPCHelpMan getblock()
                     {
                         {RPCResult::Type::OBJ, "", "",
                         {
-                            {RPCResult::Type::ARR, "vin", "",
-                            {
-                                {RPCResult::Type::OBJ, "", "",
-                                {
-                                    {RPCResult::Type::ELISION, "", "The same output as verbosity = 2"},
-                                    {RPCResult::Type::OBJ, "prevout", "(Only if undo information is available)",
-                                    {
-                                        {RPCResult::Type::BOOL, "generated", "Coinbase or not"},
-                                        {RPCResult::Type::NUM, "height", "The height of the prevout"},
-                                        {RPCResult::Type::NUM, "value", "The value in " + CURRENCY_UNIT},
-                                        {RPCResult::Type::OBJ, "scriptPubKey", "",
-                                        {
-                                            {RPCResult::Type::STR, "asm", "The asm"},
-                                            {RPCResult::Type::STR, "hex", "The hex"},
-                                            {RPCResult::Type::STR, "address", /*optional=*/true, "The Dash address (only if a well-defined address exists)"},
-                                            {RPCResult::Type::STR, "type", "The type, eg 'pubkeyhash'"},
-                                        }},
-                                    }},
-                                }},
-                            }},
+                            getblock_vin,
                         }},
                     }},
                 }},
diff --git a/src/rpc/rawtransaction.cpp b/src/rpc/rawtransaction.cpp
index 77de92f39f67..105d8c905b31 100644
--- a/src/rpc/rawtransaction.cpp
+++ b/src/rpc/rawtransaction.cpp
@@ -1017,6 +1017,112 @@ static RPCHelpMan signrawtransactionwithkey()
     };
 }
 
+const RPCResult decodepsbt_inputs{
+    RPCResult::Type::ARR, "inputs", "",
+    {
+        {RPCResult::Type::OBJ, "", "",
+        {
+            {RPCResult::Type::OBJ, "non_witness_utxo", /*optional=*/true, "Decoded network transaction for non-witness UTXOs",
+            {
+                {RPCResult::Type::ELISION, "",""},
+            }},
+            {RPCResult::Type::OBJ_DYN, "partial_signatures", /*optional=*/true, "",
+            {
+                {RPCResult::Type::STR, "pubkey", "The public key and signature that corresponds to it."},
+            }},
+            {RPCResult::Type::STR, "sighash", /*optional=*/true, "The sighash type to be used"},
+            {RPCResult::Type::OBJ, "redeem_script", /*optional=*/true, "",
+            {
+                {RPCResult::Type::STR, "asm", "The asm"},
+                {RPCResult::Type::STR_HEX, "hex", "The hex"},
+                {RPCResult::Type::STR, "type", "The type, eg 'pubkeyhash'"},
+            }},
+            {RPCResult::Type::ARR, "bip32_derivs", /*optional=*/true, "",
+            {
+                {RPCResult::Type::OBJ, "", "",
+                {
+                    {RPCResult::Type::STR, "pubkey", "The public key with the derivation path as the value."},
+                    {RPCResult::Type::STR, "master_fingerprint", "The fingerprint of the master key"},
+                    {RPCResult::Type::STR, "path", "The path"},
+                }},
+            }},
+            {RPCResult::Type::OBJ, "final_scriptSig", /*optional=*/true, "",
+            {
+                {RPCResult::Type::STR, "asm", "The asm"},
+                {RPCResult::Type::STR, "hex", "The hex"},
+            }},
+            {RPCResult::Type::OBJ_DYN, "ripemd160_preimages", /*optional=*/true, "",
+            {
+                {RPCResult::Type::STR, "hash", "The hash and preimage that corresponds to it."},
+            }},
+            {RPCResult::Type::OBJ_DYN, "sha256_preimages", /*optional=*/true, "",
+            {
+                {RPCResult::Type::STR, "hash", "The hash and preimage that corresponds to it."},
+            }},
+            {RPCResult::Type::OBJ_DYN, "hash160_preimages", /*optional=*/true, "",
+            {
+                {RPCResult::Type::STR, "hash", "The hash and preimage that corresponds to it."},
+            }},
+            {RPCResult::Type::OBJ_DYN, "hash256_preimages", /*optional=*/true, "",
+            {
+                {RPCResult::Type::STR, "hash", "The hash and preimage that corresponds to it."},
+            }},
+            {RPCResult::Type::OBJ_DYN, "unknown", /*optional=*/true, "The unknown input fields",
+            {
+                {RPCResult::Type::STR_HEX, "key", "(key-value pair) An unknown key-value pair"},
+            }},
+            {RPCResult::Type::ARR, "proprietary", /*optional=*/true, "The input proprietary map",
+            {
+                {RPCResult::Type::OBJ, "", "",
+                {
+                    {RPCResult::Type::STR_HEX, "identifier", "The hex string for the proprietary identifier"},
+                    {RPCResult::Type::NUM, "subtype", "The number for the subtype"},
+                    {RPCResult::Type::STR_HEX, "key", "The hex for the key"},
+                    {RPCResult::Type::STR_HEX, "value", "The hex for the value"},
+                }},
+            }},
+        }},
+    }
+};
+
+const RPCResult decodepsbt_outputs{
+    RPCResult::Type::ARR, "outputs", "",
+    {
+        {RPCResult::Type::OBJ, "", "",
+        {
+            {RPCResult::Type::OBJ, "redeem_script", /*optional=*/true, "",
+            {
+                {RPCResult::Type::STR, "asm", "The asm"},
+                {RPCResult::Type::STR_HEX, "hex", "The hex"},
+                {RPCResult::Type::STR, "type", "The type, eg 'pubkeyhash'"},
+            }},
+            {RPCResult::Type::ARR, "bip32_derivs", /*optional=*/true, "",
+            {
+                {RPCResult::Type::OBJ, "", "",
+                {
+                    {RPCResult::Type::STR, "pubkey", "The public key this path corresponds to"},
+                    {RPCResult::Type::STR, "master_fingerprint", "The fingerprint of the master key"},
+                    {RPCResult::Type::STR, "path", "The path"},
+                }},
+            }},
+            {RPCResult::Type::OBJ_DYN, "unknown", /*optional=*/true, "The unknown global fields",
+            {
+                {RPCResult::Type::STR_HEX, "key", "(key-value pair) An unknown key-value pair"},
+            }},
+            {RPCResult::Type::ARR, "proprietary", /*optional=*/true, "The output proprietary map",
+            {
+                {RPCResult::Type::OBJ, "", "",
+                {
+                    {RPCResult::Type::STR_HEX, "identifier", "The hex string for the proprietary identifier"},
+                    {RPCResult::Type::NUM, "subtype", "The number for the subtype"},
+                    {RPCResult::Type::STR_HEX, "key", "The hex for the key"},
+                    {RPCResult::Type::STR_HEX, "value", "The hex for the value"},
+                }},
+            }},
+        }},
+    }
+};
+
 static RPCHelpMan decodepsbt()
 {
     return RPCHelpMan{
@@ -1056,106 +1162,8 @@ static RPCHelpMan decodepsbt()
                 {
                      {RPCResult::Type::STR_HEX, "key", "(key-value pair) An unknown key-value pair"},
                 }},
-                {RPCResult::Type::ARR, "inputs", "",
-                {
-                    {RPCResult::Type::OBJ, "", "",
-                    {
-                        {RPCResult::Type::OBJ, "non_witness_utxo", /*optional=*/true, "Decoded network transaction for non-witness UTXOs",
-                        {
-                            {RPCResult::Type::ELISION, "",""},
-                        }},
-                        {RPCResult::Type::OBJ_DYN, "partial_signatures", /*optional=*/true, "",
-                        {
-                            {RPCResult::Type::STR, "pubkey", "The public key and signature that corresponds to it."},
-                        }},
-                        {RPCResult::Type::STR, "sighash", /*optional=*/true, "The sighash type to be used"},
-                        {RPCResult::Type::OBJ, "redeem_script", /*optional=*/true, "",
-                        {
-                            {RPCResult::Type::STR, "asm", "The asm"},
-                            {RPCResult::Type::STR_HEX, "hex", "The hex"},
-                            {RPCResult::Type::STR, "type", "The type, eg 'pubkeyhash'"},
-                        }},
-                        {RPCResult::Type::ARR, "bip32_derivs", /*optional=*/true, "",
-                        {
-                            {RPCResult::Type::OBJ, "", "",
-                            {
-                                {RPCResult::Type::STR, "pubkey", "The public key with the derivation path as the value."},
-                                {RPCResult::Type::STR, "master_fingerprint", "The fingerprint of the master key"},
-                                {RPCResult::Type::STR, "path", "The path"},
-                            }},
-                        }},
-                        {RPCResult::Type::OBJ, "final_scriptSig", /*optional=*/true, "",
-                        {
-                            {RPCResult::Type::STR, "asm", "The asm"},
-                            {RPCResult::Type::STR, "hex", "The hex"},
-                        }},
-                        {RPCResult::Type::OBJ_DYN, "ripemd160_preimages", /*optional=*/ true, "",
-                        {
-                            {RPCResult::Type::STR, "hash", "The hash and preimage that corresponds to it."},
-                        }},
-                        {RPCResult::Type::OBJ_DYN, "sha256_preimages", /*optional=*/ true, "",
-                        {
-                            {RPCResult::Type::STR, "hash", "The hash and preimage that corresponds to it."},
-                        }},
-                        {RPCResult::Type::OBJ_DYN, "hash160_preimages", /*optional=*/ true, "",
-                        {
-                            {RPCResult::Type::STR, "hash", "The hash and preimage that corresponds to it."},
-                        }},
-                        {RPCResult::Type::OBJ_DYN, "hash256_preimages", /*optional=*/ true, "",
-                        {
-                            {RPCResult::Type::STR, "hash", "The hash and preimage that corresponds to it."},
-                        }},
-                        {RPCResult::Type::OBJ_DYN, "unknown", /*optional=*/ true, "The unknown input fields",
-                        {
-                            {RPCResult::Type::STR_HEX, "key", "(key-value pair) An unknown key-value pair"},
-                        }},
-                        {RPCResult::Type::ARR, "proprietary", /*optional=*/ true, "The input proprietary map",
-                        {
-                            {RPCResult::Type::OBJ, "", "",
-                            {
-                                {RPCResult::Type::STR_HEX, "identifier", "The hex string for the proprietary identifier"},
-                                {RPCResult::Type::NUM, "subtype", "The number for the subtype"},
-                                {RPCResult::Type::STR_HEX, "key", "The hex for the key"},
-                                {RPCResult::Type::STR_HEX, "value", "The hex for the value"},
-                            }},
-                        }},
-                    }},
-                }},
-                {RPCResult::Type::ARR, "outputs", "",
-                {
-                    {RPCResult::Type::OBJ, "", "",
-                    {
-                        {RPCResult::Type::OBJ, "redeem_script", /*optional=*/true, "",
-                        {
-                            {RPCResult::Type::STR, "asm", "The asm"},
-                            {RPCResult::Type::STR_HEX, "hex", "The hex"},
-                            {RPCResult::Type::STR, "type", "The type, eg 'pubkeyhash'"},
-                        }},
-                        {RPCResult::Type::ARR, "bip32_derivs", /*optional=*/true, "",
-                        {
-                            {RPCResult::Type::OBJ, "", "",
-                            {
-                                {RPCResult::Type::STR, "pubkey", "The public key this path corresponds to"},
-                                {RPCResult::Type::STR, "master_fingerprint", "The fingerprint of the master key"},
-                                {RPCResult::Type::STR, "path", "The path"},
-                            }},
-                        }},
-                        {RPCResult::Type::OBJ_DYN, "unknown", /*optional=*/true, "The unknown global fields",
-                        {
-                            {RPCResult::Type::STR_HEX, "key", "(key-value pair) An unknown key-value pair"},
-                        }},
-                        {RPCResult::Type::ARR, "proprietary", /*optional=*/true, "The output proprietary map",
-                        {
-                            {RPCResult::Type::OBJ, "", "",
-                            {
-                                {RPCResult::Type::STR_HEX, "identifier", "The hex string for the proprietary identifier"},
-                                {RPCResult::Type::NUM, "subtype", "The number for the subtype"},
-                                {RPCResult::Type::STR_HEX, "key", "The hex for the key"},
-                                {RPCResult::Type::STR_HEX, "value", "The hex for the value"},
-                            }},
-                        }},
-                    }},
-                }},
+                decodepsbt_inputs,
+                decodepsbt_outputs,
                 {RPCResult::Type::STR_AMOUNT, "fee", /*optional=*/true, "The transaction fee paid if all UTXOs slots in the PSBT have been filled."},
             }
         },

From a2e6b6d06f4e829ff620154417fe12e3e20c9866 Mon Sep 17 00:00:00 2001
From: MacroFake <falke.marco@gmail.com>
Date: Sun, 17 Jul 2022 08:52:50 +0200
Subject: [PATCH 114/656] Merge bitcoin/bitcoin#25615: rpc: add missing
 description in gettxout help text

743a84a5f6f660e113574de349553144e0b490ff fix gettxout help text (Marnix)

Pull request description:

  replaces #25578

  Add help text to asm & hex (like everywhere else).
  I've also changed two `RPCResult::Type::STR` to `RPCResult::Type::STR_HEX`

Top commit has no ACKs.

Tree-SHA512: 4109d6abddf71b24899f3252545248bb0c7cc366eb994d30927eb300d0b939a14b8140bac4a4c2bd45098a406666dbe1feb10da8dec923777bb8ed26784dfd54
---
 src/rpc/blockchain.cpp     | 6 +++---
 src/rpc/rawtransaction.cpp | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/rpc/blockchain.cpp b/src/rpc/blockchain.cpp
index b890d7f98a20..dc2a537a4b4e 100644
--- a/src/rpc/blockchain.cpp
+++ b/src/rpc/blockchain.cpp
@@ -900,7 +900,7 @@ const RPCResult getblock_vin{
                 {RPCResult::Type::OBJ, "scriptPubKey", "",
                 {
                     {RPCResult::Type::STR, "asm", "The asm"},
-                    {RPCResult::Type::STR, "hex", "The hex"},
+                    {RPCResult::Type::STR_HEX, "hex", "The hex"},
                     {RPCResult::Type::STR, "address", /*optional=*/true, "The Dash address (only if a well-defined address exists)"},
                     {RPCResult::Type::STR, "type", "The type, eg 'pubkeyhash'"},
                 }},
@@ -1266,9 +1266,9 @@ static RPCHelpMan gettxout()
                 {RPCResult::Type::STR_AMOUNT, "value", "The transaction value in " + CURRENCY_UNIT},
                 {RPCResult::Type::OBJ, "scriptPubKey", "",
                     {
-                        {RPCResult::Type::STR, "asm", ""},
+                        {RPCResult::Type::STR, "asm", "The asm"},
                         {RPCResult::Type::STR, "desc", "Inferred descriptor for the output"},
-                        {RPCResult::Type::STR_HEX, "hex", ""},
+                        {RPCResult::Type::STR_HEX, "hex", "The hex"},
                         {RPCResult::Type::STR_HEX, "type", "The type, eg pubkeyhash"},
                         {RPCResult::Type::STR, "address", /*optional=*/ true, "Dash address (only if a well-defined address exists)"},
                     }},
diff --git a/src/rpc/rawtransaction.cpp b/src/rpc/rawtransaction.cpp
index 105d8c905b31..9f812731ccbb 100644
--- a/src/rpc/rawtransaction.cpp
+++ b/src/rpc/rawtransaction.cpp
@@ -1049,7 +1049,7 @@ const RPCResult decodepsbt_inputs{
             {RPCResult::Type::OBJ, "final_scriptSig", /*optional=*/true, "",
             {
                 {RPCResult::Type::STR, "asm", "The asm"},
-                {RPCResult::Type::STR, "hex", "The hex"},
+                {RPCResult::Type::STR_HEX, "hex", "The hex"},
             }},
             {RPCResult::Type::OBJ_DYN, "ripemd160_preimages", /*optional=*/true, "",
             {

From 9ade0c17b8341c211b4508ae0bb2ffa92baa6bad Mon Sep 17 00:00:00 2001
From: "W. J. van der Laan" <laanwj@protonmail.com>
Date: Fri, 22 Oct 2021 16:24:29 +0200
Subject: [PATCH 115/656] Merge bitcoin/bitcoin#23139: rpc: fix "trusted" field
 in TransactionDescriptionString(), add coverage

66f6efc70a72cc1613906fd3c10281f9af0ba0db rpc: improve TransactionDescriptionString() "generated" help (Jon Atack)
296cfa312fd9ce19f1f820aeafa37d87764ad21d test: add listtransactions/listsinceblock "trusted" coverage (Jon Atack)
d95913fc432f0fde9dec743884b14c5df83727af rpc: fix "trusted" description in TransactionDescriptionString (Jon Atack)

Pull request description:

  The RPC gettransaction, listtransactions, and listsinceblock helps returned by `TransactionDescriptionString()` inform the user that the `trusted` boolean field is only present if the transaction is trusted and safe to spend from.

  The field is in fact returned by `WalletTxToJSON()` when the transaction has 0 confirmations (or negative confirmations, if conflicted), and it can be true or false.

  This patch fixes the help, adds test coverage, and touches up the help for the neighboring `generate` field.

ACKs for top commit:
  rajarshimaitra:
    tACK https://github.com/bitcoin/bitcoin/pull/23139/commits/66f6efc70a72cc1613906fd3c10281f9af0ba0db
  theStack:
    Tested ACK 66f6efc70a72cc1613906fd3c10281f9af0ba0db

Tree-SHA512: 4c2127765b82780e07bbdbf519d27163d414d9f15598e01e02210f210e6009be344c84951d7274e747b1386991d4c3b082cd25aebe885fb8cf0b92d57178f68e
---
 src/wallet/rpc/transactions.cpp            |  4 +++-
 test/functional/wallet_import_rescan.py    |  2 +-
 test/functional/wallet_listsinceblock.py   | 11 +++++++++++
 test/functional/wallet_listtransactions.py |  4 ++--
 4 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/src/wallet/rpc/transactions.cpp b/src/wallet/rpc/transactions.cpp
index 92c150594d15..c4042bcfd23c 100644
--- a/src/wallet/rpc/transactions.cpp
+++ b/src/wallet/rpc/transactions.cpp
@@ -425,7 +425,9 @@ static std::vector<RPCResult> TransactionDescriptionString()
             {RPCResult::Type::BOOL, "instantlock", "Current transaction lock state. Available for 'send' and 'receive' category of transactions"},
             {RPCResult::Type::BOOL, "instantlock-internal", "Current internal transaction lock state. Available for 'send' and 'receive' category of transactions"},
             {RPCResult::Type::BOOL, "chainlock", "The state of the corresponding block ChainLock"},
-            {RPCResult::Type::BOOL, "trusted", /*optional=*/true, "Whether we consider the outputs of this unconfirmed transaction safe to spend."},
+            {RPCResult::Type::BOOL, "generated", /*optional=*/true, "Only present if the transaction's only input is a coinbase one."},
+            {RPCResult::Type::BOOL, "trusted", /*optional=*/true, "Whether we consider the transaction to be trusted and safe to spend from.\n"
+                "Only present when the transaction has 0 confirmations (or negative confirmations, if conflicted)."},
             {RPCResult::Type::STR_HEX, "blockhash", /*optional=*/true, "The block hash containing the transaction. Available for 'send' and 'receive'\n"
                                                    "category of transactions."},
             {RPCResult::Type::STR_HEX, "blockheight", /*optional=*/true, "The block height containing the transaction."},
diff --git a/test/functional/wallet_import_rescan.py b/test/functional/wallet_import_rescan.py
index f23afa2d68ad..12424c4d7c7f 100755
--- a/test/functional/wallet_import_rescan.py
+++ b/test/functional/wallet_import_rescan.py
@@ -89,7 +89,7 @@ def check(self, txid=None, amount=None, confirmation_height=None):
             assert_equal(tx["label"], self.label)
             assert_equal(tx["txid"], txid)
             assert_equal(tx["confirmations"], 1 + current_height - confirmation_height)
-            assert_equal("trusted" not in tx, True)
+            assert "trusted" not in tx
 
             address, = [ad for ad in addresses if txid in ad["txids"]]
             assert_equal(address["address"], self.address["address"])
diff --git a/test/functional/wallet_listsinceblock.py b/test/functional/wallet_listsinceblock.py
index d8acff8abe32..4a4167f11155 100755
--- a/test/functional/wallet_listsinceblock.py
+++ b/test/functional/wallet_listsinceblock.py
@@ -45,6 +45,14 @@ def run_test(self):
     def test_no_blockhash(self):
         self.log.info("Test no blockhash")
         txid = self.nodes[2].sendtoaddress(self.nodes[0].getnewaddress(), 1)
+        self.sync_all()
+        assert_array_result(self.nodes[0].listtransactions(), {"txid": txid}, {
+            "category": "receive",
+            "amount": 1,
+            "confirmations": 0,
+            "trusted": False,
+        })
+
         blockhash, = self.generate(self.nodes[2], 1)
         blockheight = self.nodes[2].getblockheader(blockhash)['height']
 
@@ -56,6 +64,9 @@ def test_no_blockhash(self):
             "blockheight": blockheight,
             "confirmations": 1,
         })
+        assert_equal(len(txs), 1)
+        assert "trusted" not in txs[0]
+
         assert_equal(
             self.nodes[0].listsinceblock(),
             {"lastblock": blockhash,
diff --git a/test/functional/wallet_listtransactions.py b/test/functional/wallet_listtransactions.py
index 77a58b0d2192..82e42a72e305 100755
--- a/test/functional/wallet_listtransactions.py
+++ b/test/functional/wallet_listtransactions.py
@@ -27,10 +27,10 @@ def run_test(self):
         self.sync_all()
         assert_array_result(self.nodes[0].listtransactions(),
                             {"txid": txid},
-                            {"category": "send", "amount": Decimal("-0.1"), "confirmations": 0})
+                            {"category": "send", "amount": Decimal("-0.1"), "confirmations": 0, "trusted": True})
         assert_array_result(self.nodes[1].listtransactions(),
                             {"txid": txid},
-                            {"category": "receive", "amount": Decimal("0.1"), "confirmations": 0})
+                            {"category": "receive", "amount": Decimal("0.1"), "confirmations": 0, "trusted": False})
         self.log.info("Test confirmations change after mining a block")
         blockhash = self.generate(self.nodes[0], 1)[0]
         blockheight = self.nodes[0].getblockheader(blockhash)['height']

From 8d13227cf2cb165ec750bb64ec632c8718f3fad5 Mon Sep 17 00:00:00 2001
From: Kittywhiskers Van Gogh <63189531+kwvg@users.noreply.github.com>
Date: Tue, 1 Aug 2023 11:01:48 +0200
Subject: [PATCH 116/656] partial bitcoin#28195: Drop legacy -txindex check

includes:
- fa8685597e7302fc136f21b6dd3a4b187fa8e251
---
 src/init.cpp                                  |  4 ---
 src/txdb.cpp                                  | 28 +++++--------------
 src/txdb.h                                    |  2 --
 .../feature_txindex_compatibility.py          | 14 ----------
 4 files changed, 7 insertions(+), 41 deletions(-)

diff --git a/src/init.cpp b/src/init.cpp
index 25b2ca72090c..691e1fdf0bb0 100644
--- a/src/init.cpp
+++ b/src/init.cpp
@@ -2193,10 +2193,6 @@ bool AppInitMain(NodeContext& node, interfaces::BlockAndHeaderTipInfo* tip_info)
 
     // ********************************************************* Step 8: start indexers
     if (args.GetBoolArg("-txindex", DEFAULT_TXINDEX)) {
-        if (const auto error{WITH_LOCK(cs_main, return CheckLegacyTxindex(*Assert(chainman.m_blockman.m_block_tree_db)))}) {
-            return InitError(*error);
-        }
-
         g_txindex = std::make_unique<TxIndex>(cache_sizes.tx_index, false, fReindex);
         if (!g_txindex->Start(chainman.ActiveChainstate())) {
             return false;
diff --git a/src/txdb.cpp b/src/txdb.cpp
index 561be22d6c7a..e1dddcfd90f8 100644
--- a/src/txdb.cpp
+++ b/src/txdb.cpp
@@ -7,6 +7,7 @@
 
 #include <chain.h>
 #include <pow.h>
+#include <primitives/transaction.h>
 #include <random.h>
 #include <shutdown.h>
 #include <uint256.h>
@@ -14,7 +15,9 @@
 #include <util/translation.h>
 #include <util/vector.h>
 
-#include <stdint.h>
+#include <cassert>
+#include <cstdlib>
+#include <iterator>
 
 static constexpr uint8_t DB_COIN{'C'};
 static constexpr uint8_t DB_BLOCK_FILES{'f'};
@@ -32,26 +35,9 @@ static constexpr uint8_t DB_LAST_BLOCK{'l'};
 
 // Keys used in previous version that might still be found in the DB:
 static constexpr uint8_t DB_COINS{'c'};
-static constexpr uint8_t DB_TXINDEX_BLOCK{'T'};
-//               uint8_t DB_TXINDEX{'t'}
-
-std::optional<bilingual_str> CheckLegacyTxindex(CBlockTreeDB& block_tree_db)
-{
-    CBlockLocator ignored{};
-    if (block_tree_db.Read(DB_TXINDEX_BLOCK, ignored)) {
-        return _("The -txindex upgrade started by a previous version cannot be completed. Restart with the previous version or run a full -reindex.");
-    }
-    bool txindex_legacy_flag{false};
-    block_tree_db.ReadFlag("txindex", txindex_legacy_flag);
-    if (txindex_legacy_flag) {
-        // Disable legacy txindex and warn once about occupied disk space
-        if (!block_tree_db.WriteFlag("txindex", false)) {
-            return Untranslated("Failed to write block index db flag 'txindex'='0'");
-        }
-        return _("The block index db contains a legacy 'txindex'. To clear the occupied disk space, run a full -reindex, otherwise ignore this error. This error message will not be displayed again.");
-    }
-    return std::nullopt;
-}
+// CBlockTreeDB::DB_TXINDEX_BLOCK{'T'};
+// CBlockTreeDB::DB_TXINDEX{'t'}
+// CBlockTreeDB::ReadFlag("txindex")
 
 bool CCoinsViewDB::NeedsUpgrade()
 {
diff --git a/src/txdb.h b/src/txdb.h
index e101ad8c523d..2c812300dfad 100644
--- a/src/txdb.h
+++ b/src/txdb.h
@@ -111,6 +111,4 @@ class CBlockTreeDB : public CDBWrapper
         EXCLUSIVE_LOCKS_REQUIRED(::cs_main);
 };
 
-std::optional<bilingual_str> CheckLegacyTxindex(CBlockTreeDB& block_tree_db);
-
 #endif // BITCOIN_TXDB_H
diff --git a/test/functional/feature_txindex_compatibility.py b/test/functional/feature_txindex_compatibility.py
index ed913f51372f..98ac1ee339a5 100755
--- a/test/functional/feature_txindex_compatibility.py
+++ b/test/functional/feature_txindex_compatibility.py
@@ -7,7 +7,6 @@
 Previous releases are required by this test, see test/README.md.
 """
 
-import os
 import shutil
 
 from test_framework.test_framework import BitcoinTestFramework
@@ -73,25 +72,12 @@ def run_test(self):
         drop_index_chain_dir = os.path.join(self.nodes[1].datadir, self.chain)
         shutil.rmtree(drop_index_chain_dir)
         shutil.copytree(legacy_chain_dir, drop_index_chain_dir)
-        self.nodes[1].assert_start_raises_init_error(
-            extra_args=["-txindex"],
-            expected_msg="Error: The block index db contains a legacy 'txindex'. To clear the occupied disk space, run a full -reindex, otherwise ignore this error. This error message will not be displayed again.",
-        )
         # Build txindex from scratch and check there is no error this time
         self.start_node(1, extra_args=["-txindex"])
         self.nodes[2].getrawtransaction(txid=spend_utxo["txid"])  # Requires -txindex
 
         self.stop_nodes()
 
-        self.log.info("Check migrated txindex cannot be read by legacy node")
-        err_msg = f": You need to rebuild the database using -reindex to change -txindex.{os.linesep}Please restart with -reindex or -reindex-chainstate to recover."
-        shutil.rmtree(legacy_chain_dir)
-        shutil.copytree(migrate_chain_dir, legacy_chain_dir)
-        self.nodes[0].assert_start_raises_init_error(extra_args=["-txindex"], expected_msg=err_msg)
-        shutil.rmtree(legacy_chain_dir)
-        shutil.copytree(drop_index_chain_dir, legacy_chain_dir)
-        self.nodes[0].assert_start_raises_init_error(extra_args=["-txindex"], expected_msg=err_msg)
-
 
 if __name__ == "__main__":
     MempoolCompatibilityTest().main()

From 1d39829dba4002b0e674e81c06a7389718016673 Mon Sep 17 00:00:00 2001
From: Kittywhiskers Van Gogh <63189531+kwvg@users.noreply.github.com>
Date: Mon, 30 Oct 2023 13:06:37 +0300
Subject: [PATCH 117/656] merge bitcoin#28753: Remove
 feature_txindex_compatibility.py

---
 .../feature_txindex_compatibility.py          | 83 -------------------
 test/functional/test_runner.py                |  1 -
 2 files changed, 84 deletions(-)
 delete mode 100755 test/functional/feature_txindex_compatibility.py

diff --git a/test/functional/feature_txindex_compatibility.py b/test/functional/feature_txindex_compatibility.py
deleted file mode 100755
index 98ac1ee339a5..000000000000
--- a/test/functional/feature_txindex_compatibility.py
+++ /dev/null
@@ -1,83 +0,0 @@
-#!/usr/bin/env python3
-# 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.
-"""Test that legacy txindex will be disabled on upgrade.
-
-Previous releases are required by this test, see test/README.md.
-"""
-
-import shutil
-
-from test_framework.test_framework import BitcoinTestFramework
-from test_framework.wallet import MiniWallet
-
-
-class MempoolCompatibilityTest(BitcoinTestFramework):
-    def set_test_params(self):
-        self.num_nodes = 3
-        self.extra_args = [
-            ["-reindex", "-txindex"],
-            ["-txindex=0"],
-            ["-txindex=0"],
-        ]
-
-    def skip_test_if_missing_module(self):
-        self.skip_if_no_previous_releases()
-
-    def setup_network(self):
-        self.add_nodes(
-            self.num_nodes,
-            self.extra_args,
-            versions=[
-                170003,   # Last release with legacy txindex
-                None,     # For MiniWallet, without migration code
-                18020200, # Any release with migration code (0.18.x - 21.x)
-                          # We are using v18.2.2 to avoid MigrateDBIfNeeded(2) routines as
-                          # they don't handle a no-upgrade case correctly
-            ],
-        )
-        # Delete v18.2.2 cached datadir to avoid making a legacy version try to
-        # make sense of our current database formats
-        shutil.rmtree(os.path.join(self.nodes[2].datadir, self.chain))
-        self.start_nodes()
-        self.connect_nodes(0, 1)
-        self.connect_nodes(1, 2)
-
-    def run_test(self):
-        mini_wallet = MiniWallet(self.nodes[1])
-        mini_wallet.rescan_utxos()
-        spend_utxo = mini_wallet.get_utxo()
-        mini_wallet.send_self_transfer(from_node=self.nodes[1], utxo_to_spend=spend_utxo)
-        self.generate(self.nodes[1], 1)
-
-        self.log.info("Check legacy txindex")
-        self.nodes[0].getrawtransaction(txid=spend_utxo["txid"])  # Requires -txindex
-
-        self.stop_nodes()
-        legacy_chain_dir = os.path.join(self.nodes[0].datadir, self.chain)
-
-        self.log.info("Migrate legacy txindex")
-        migrate_chain_dir = os.path.join(self.nodes[2].datadir, self.chain)
-        shutil.rmtree(migrate_chain_dir)
-        shutil.copytree(legacy_chain_dir, migrate_chain_dir)
-        with self.nodes[2].assert_debug_log([
-                "Upgrading txindex database...",
-                "txindex is enabled at height 200",
-        ]):
-            self.start_node(2, extra_args=["-txindex"])
-        self.nodes[2].getrawtransaction(txid=spend_utxo["txid"])  # Requires -txindex
-
-        self.log.info("Drop legacy txindex")
-        drop_index_chain_dir = os.path.join(self.nodes[1].datadir, self.chain)
-        shutil.rmtree(drop_index_chain_dir)
-        shutil.copytree(legacy_chain_dir, drop_index_chain_dir)
-        # Build txindex from scratch and check there is no error this time
-        self.start_node(1, extra_args=["-txindex"])
-        self.nodes[2].getrawtransaction(txid=spend_utxo["txid"])  # Requires -txindex
-
-        self.stop_nodes()
-
-
-if __name__ == "__main__":
-    MempoolCompatibilityTest().main()
diff --git a/test/functional/test_runner.py b/test/functional/test_runner.py
index 602ba0ca70f7..307415e661d3 100755
--- a/test/functional/test_runner.py
+++ b/test/functional/test_runner.py
@@ -373,7 +373,6 @@
     'p2p_ping.py',
     'p2p_sendtxrcncl.py',
     'rpc_scantxoutset.py',
-    'feature_txindex_compatibility.py',
     'feature_unsupported_utxo_db.py',
     'feature_logging.py',
     'feature_anchors.py',

From 5d9435db103d1e59aff0c9686f06528e14d3feb3 Mon Sep 17 00:00:00 2001
From: Kittywhiskers Van Gogh <63189531+kwvg@users.noreply.github.com>
Date: Fri, 10 Oct 2025 23:00:48 +0530
Subject: [PATCH 118/656] chore: bump `MIN_PEER_PROTO_VERSION` to `70221`

Co-Authored-By: UdjinM6 <UdjinM6@users.noreply.github.com>
---
 doc/release-notes-6877.md                  | 4 ++++
 src/version.h                              | 2 +-
 test/functional/feature_llmq_simplepose.py | 5 ++++-
 3 files changed, 9 insertions(+), 2 deletions(-)
 create mode 100644 doc/release-notes-6877.md

diff --git a/doc/release-notes-6877.md b/doc/release-notes-6877.md
new file mode 100644
index 000000000000..8e2a997cdbe2
--- /dev/null
+++ b/doc/release-notes-6877.md
@@ -0,0 +1,4 @@
+P2P and Network Changes
+-----------------------
+
+`MIN_PEER_PROTO_VERSION` has been bumped to `70221`
diff --git a/src/version.h b/src/version.h
index 4364d77b6400..ed7c989e662b 100644
--- a/src/version.h
+++ b/src/version.h
@@ -17,7 +17,7 @@ static const int PROTOCOL_VERSION = 70238;
 static const int INIT_PROTO_VERSION = 209;
 
 //! disconnect from peers older than this proto version
-static const int MIN_PEER_PROTO_VERSION = 70216;
+static const int MIN_PEER_PROTO_VERSION = 70221;
 
 //! minimum proto version of masternode to accept in DKGs
 static const int MIN_MASTERNODE_PROTO_VERSION = 70238;
diff --git a/test/functional/feature_llmq_simplepose.py b/test/functional/feature_llmq_simplepose.py
index 1b7ce5294f74..0b3cfcb3953a 100755
--- a/test/functional/feature_llmq_simplepose.py
+++ b/test/functional/feature_llmq_simplepose.py
@@ -19,6 +19,9 @@
 )
 from test_framework.util import assert_equal, force_finish_mnsync
 
+# See version.h
+MIN_MASTERNODE_PROTO_VERSION = 70238
+
 class LLMQSimplePoSeTest(DashTestFramework):
     def set_test_params(self):
         # rotating quorums add instability for this functional tests
@@ -87,7 +90,7 @@ def close_mn_port(self, mn: MasternodeInfo):
 
     def force_old_mn_proto(self, mn: MasternodeInfo):
         self.stop_node(mn.nodeIdx)
-        self.start_masternode(mn, ["-pushversion=70216"])
+        self.start_masternode(mn, [f"-pushversion={MIN_MASTERNODE_PROTO_VERSION - 1}"])
         self.connect_nodes(mn.nodeIdx, 0)
         self.reset_probe_timeouts()
         return False, True

From 8c141f8194fc1656d952ea2b09add73046f134ab Mon Sep 17 00:00:00 2001
From: Kittywhiskers Van Gogh <63189531+kwvg@users.noreply.github.com>
Date: Tue, 7 Oct 2025 15:51:35 +0000
Subject: [PATCH 119/656] chore: drop `MNAUTH_NODE_VER_VERSION` checks

---
 src/evo/mnauth.cpp | 19 ++-----------------
 src/version.h      |  3 ---
 2 files changed, 2 insertions(+), 20 deletions(-)

diff --git a/src/evo/mnauth.cpp b/src/evo/mnauth.cpp
index 3c2b080059c1..376c96ecfaf4 100644
--- a/src/evo/mnauth.cpp
+++ b/src/evo/mnauth.cpp
@@ -38,13 +38,7 @@ void CMNAuth::PushMNAUTH(CNode& peer, CConnman& connman, const CActiveMasternode
     }
     auto pk = mn_activeman.GetPubKey();
     const CBLSPublicKey pubKey(pk);
-    uint256 signHash = [&]() {
-        if (peer.nVersion < MNAUTH_NODE_VER_VERSION || nOurNodeVersion < MNAUTH_NODE_VER_VERSION) {
-            return ::SerializeHash(std::make_tuple(pubKey, receivedMNAuthChallenge, peer.IsInboundConn()));
-        } else {
-            return ::SerializeHash(std::make_tuple(pubKey, receivedMNAuthChallenge, peer.IsInboundConn(), nOurNodeVersion));
-        }
-    }();
+    const uint256 signHash{::SerializeHash(std::make_tuple(pubKey, receivedMNAuthChallenge, peer.IsInboundConn(), nOurNodeVersion))};
 
     mnauth.proRegTxHash = mn_activeman.GetProTxHash();
 
@@ -97,18 +91,9 @@ MessageProcessingResult CMNAuth::ProcessMessage(CNode& peer, ServiceFlags node_s
         return MisbehavingError{10, "missing mnauth masternode"};
     }
 
-    uint256 signHash;
-    int nOurNodeVersion{PROTOCOL_VERSION};
-    if (Params().NetworkIDString() != CBaseChainParams::MAIN && gArgs.IsArgSet("-pushversion")) {
-        nOurNodeVersion = gArgs.GetIntArg("-pushversion", PROTOCOL_VERSION);
-    }
     const CBLSPublicKey pubKey(dmn->pdmnState->pubKeyOperator.Get());
     // See comment in PushMNAUTH (fInbound is negated here as we're on the other side of the connection)
-    if (peer.nVersion < MNAUTH_NODE_VER_VERSION || nOurNodeVersion < MNAUTH_NODE_VER_VERSION) {
-        signHash = ::SerializeHash(std::make_tuple(pubKey, peer.GetSentMNAuthChallenge(), !peer.IsInboundConn()));
-    } else {
-        signHash = ::SerializeHash(std::make_tuple(pubKey, peer.GetSentMNAuthChallenge(), !peer.IsInboundConn(), peer.nVersion.load()));
-    }
+    const uint256 signHash{::SerializeHash(std::make_tuple(pubKey, peer.GetSentMNAuthChallenge(), !peer.IsInboundConn(), peer.nVersion.load()))};
     LogPrint(BCLog::NET_NETCONN, "CMNAuth::%s -- constructed signHash for nVersion %d, peer=%d\n", __func__, peer.nVersion, peer.GetId());
 
     if (!mnauth.sig.VerifyInsecure(dmn->pdmnState->pubKeyOperator.Get(), signHash, false)) {
diff --git a/src/version.h b/src/version.h
index ed7c989e662b..946da4fd793a 100644
--- a/src/version.h
+++ b/src/version.h
@@ -22,9 +22,6 @@ static const int MIN_PEER_PROTO_VERSION = 70221;
 //! minimum proto version of masternode to accept in DKGs
 static const int MIN_MASTERNODE_PROTO_VERSION = 70238;
 
-//! protocol version is included in MNAUTH starting with this version
-static const int MNAUTH_NODE_VER_VERSION = 70218;
-
 //! introduction of QGETDATA/QDATA messages
 static const int LLMQ_DATA_MESSAGES_VERSION = 70219;
 

From 4096d77d2bb250a08a96e615ce1dab0d29309f32 Mon Sep 17 00:00:00 2001
From: Kittywhiskers Van Gogh <63189531+kwvg@users.noreply.github.com>
Date: Tue, 7 Oct 2025 15:12:54 +0000
Subject: [PATCH 120/656] chore: drop `LLMQ_DATA_MESSAGES_VERSION` checks

---
 src/llmq/quorums.cpp | 4 ----
 src/version.h        | 3 ---
 2 files changed, 7 deletions(-)

diff --git a/src/llmq/quorums.cpp b/src/llmq/quorums.cpp
index 196967cab358..c73395a01071 100644
--- a/src/llmq/quorums.cpp
+++ b/src/llmq/quorums.cpp
@@ -482,10 +482,6 @@ bool CQuorumManager::RequestQuorumData(CNode* pfrom, CConnman& connman, CQuorumC
         LogPrint(BCLog::LLMQ, "CQuorumManager::%s -- Invalid pfrom: nullptr\n", __func__);
         return false;
     }
-    if (pfrom->nVersion < LLMQ_DATA_MESSAGES_VERSION) {
-        LogPrint(BCLog::LLMQ, "CQuorumManager::%s -- Version must be %d or greater.\n", __func__, LLMQ_DATA_MESSAGES_VERSION);
-        return false;
-    }
     if (pfrom->GetVerifiedProRegTxHash().IsNull()) {
         LogPrint(BCLog::LLMQ, "CQuorumManager::%s -- pfrom is not a verified masternode\n", __func__);
         return false;
diff --git a/src/version.h b/src/version.h
index 946da4fd793a..0a944d477e28 100644
--- a/src/version.h
+++ b/src/version.h
@@ -22,9 +22,6 @@ static const int MIN_PEER_PROTO_VERSION = 70221;
 //! minimum proto version of masternode to accept in DKGs
 static const int MIN_MASTERNODE_PROTO_VERSION = 70238;
 
-//! introduction of QGETDATA/QDATA messages
-static const int LLMQ_DATA_MESSAGES_VERSION = 70219;
-
 //! introduction of instant send deterministic lock (ISDLOCK)
 static const int ISDLOCK_PROTO_VERSION = 70220;
 

From c5bfb572b82be145aac2d9ead4415de918903a16 Mon Sep 17 00:00:00 2001
From: Kittywhiskers Van Gogh <63189531+kwvg@users.noreply.github.com>
Date: Tue, 7 Oct 2025 15:54:37 +0000
Subject: [PATCH 121/656] chore: drop `ISDLOCK_PROTO_VERSION` checks

---
 src/net_processing.cpp | 17 ++++++++---------
 src/version.h          |  3 ---
 2 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/src/net_processing.cpp b/src/net_processing.cpp
index 6e104ac8ab5b..9e63581af17a 100644
--- a/src/net_processing.cpp
+++ b/src/net_processing.cpp
@@ -650,13 +650,13 @@ class PeerManagerImpl final : public PeerManager
     void AskPeersForTransaction(const uint256& txid) EXCLUSIVE_LOCKS_REQUIRED(!m_peer_mutex);
 
     /** Relay inventories to peers that find it relevant */
-    void RelayInvFiltered(const CInv& inv, const CTransaction& relatedTx, const int minProtoVersion) EXCLUSIVE_LOCKS_REQUIRED(!m_peer_mutex);
+    void RelayInvFiltered(const CInv& inv, const CTransaction& relatedTx) EXCLUSIVE_LOCKS_REQUIRED(!m_peer_mutex);
 
     /**
      * This overload will not update node filters, use it only for the cases
      * when other messages will update related transaction data in filters
      */
-    void RelayInvFiltered(const CInv& inv, const uint256& relatedTxHash, const int minProtoVersion) EXCLUSIVE_LOCKS_REQUIRED(!m_peer_mutex);
+    void RelayInvFiltered(const CInv& inv, const uint256& relatedTxHash) EXCLUSIVE_LOCKS_REQUIRED(!m_peer_mutex);
 
     void EraseObjectRequest(NodeId nodeid, const CInv& inv) EXCLUSIVE_LOCKS_REQUIRED(::cs_main);
 
@@ -2402,7 +2402,7 @@ void PeerManagerImpl::RelayDSQ(const CCoinJoinQueue& queue)
     }
 }
 
-void PeerManagerImpl::RelayInvFiltered(const CInv& inv, const CTransaction& relatedTx, const int minProtoVersion)
+void PeerManagerImpl::RelayInvFiltered(const CInv& inv, const CTransaction& relatedTx)
 {
     // TODO: Migrate to iteration through m_peer_map
     m_connman.ForEachNode([&](CNode* pnode) {
@@ -2410,7 +2410,7 @@ void PeerManagerImpl::RelayInvFiltered(const CInv& inv, const CTransaction& rela
         if (peer == nullptr) return;
 
         auto tx_relay = peer->GetTxRelay();
-        if (pnode->nVersion < minProtoVersion || !pnode->CanRelay() || tx_relay == nullptr) {
+        if (!pnode->CanRelay() || tx_relay == nullptr) {
             return;
         }
 
@@ -2427,7 +2427,7 @@ void PeerManagerImpl::RelayInvFiltered(const CInv& inv, const CTransaction& rela
     });
 }
 
-void PeerManagerImpl::RelayInvFiltered(const CInv& inv, const uint256& relatedTxHash, const int minProtoVersion)
+void PeerManagerImpl::RelayInvFiltered(const CInv& inv, const uint256& relatedTxHash)
 {
     // TODO: Migrate to iteration through m_peer_map
     m_connman.ForEachNode([&](CNode* pnode) {
@@ -2435,7 +2435,7 @@ void PeerManagerImpl::RelayInvFiltered(const CInv& inv, const uint256& relatedTx
         if (peer == nullptr) return;
 
         auto tx_relay = peer->GetTxRelay();
-        if (pnode->nVersion < minProtoVersion || !pnode->CanRelay() || tx_relay == nullptr) {
+        if (!pnode->CanRelay() || tx_relay == nullptr) {
             return;
         }
 
@@ -3525,9 +3525,9 @@ void PeerManagerImpl::PostProcessMessage(MessageProcessingResult&& result, NodeI
     if (result.m_inv_filter) {
         const auto& [inv, filter] = result.m_inv_filter.value();
         if (std::holds_alternative<CTransactionRef>(filter)) {
-            RelayInvFiltered(inv, *std::get<CTransactionRef>(filter), ISDLOCK_PROTO_VERSION);
+            RelayInvFiltered(inv, *std::get<CTransactionRef>(filter));
         } else if (std::holds_alternative<uint256>(filter)) {
-            RelayInvFiltered(inv, std::get<uint256>(filter), ISDLOCK_PROTO_VERSION);
+            RelayInvFiltered(inv, std::get<uint256>(filter));
         } else {
             assert(false);
         }
@@ -6211,7 +6211,6 @@ bool PeerManagerImpl::SendMessages(CNode* pto)
 
                     const auto islock = m_llmq_ctx->isman->GetInstantSendLockByTxid(hash);
                     if (islock == nullptr) continue;
-                    if (pto->nVersion < ISDLOCK_PROTO_VERSION) continue;
                     uint256 isLockHash{::SerializeHash(*islock)};
                     tx_relay->m_tx_inventory_known_filter.insert(isLockHash);
                     queueAndMaybePushInv(CInv(MSG_ISDLOCK, isLockHash));
diff --git a/src/version.h b/src/version.h
index 0a944d477e28..51a08aff2516 100644
--- a/src/version.h
+++ b/src/version.h
@@ -22,9 +22,6 @@ static const int MIN_PEER_PROTO_VERSION = 70221;
 //! minimum proto version of masternode to accept in DKGs
 static const int MIN_MASTERNODE_PROTO_VERSION = 70238;
 
-//! introduction of instant send deterministic lock (ISDLOCK)
-static const int ISDLOCK_PROTO_VERSION = 70220;
-
 //! GOVSCRIPT was activated in this version
 static const int GOVSCRIPT_PROTO_VERSION = 70221;
 

From 356204571fdd5dc367fbf6aa2112f1de2b49faa7 Mon Sep 17 00:00:00 2001
From: Kittywhiskers Van Gogh <63189531+kwvg@users.noreply.github.com>
Date: Sun, 7 Sep 2025 15:26:51 +0000
Subject: [PATCH 122/656] chore: drop `GOVSCRIPT_PROTO_VERSION` checks

---
 src/governance/governance.cpp | 13 -------------
 src/governance/object.cpp     | 15 +--------------
 src/version.h                 |  3 ---
 3 files changed, 1 insertion(+), 30 deletions(-)

diff --git a/src/governance/governance.cpp b/src/governance/governance.cpp
index 1ff5ddda0e01..7dd2b4a47099 100644
--- a/src/governance/governance.cpp
+++ b/src/governance/governance.cpp
@@ -1005,19 +1005,6 @@ MessageProcessingResult CGovernanceManager::SyncObjects(CNode& peer, CConnman& c
             continue;
         }
 
-        if (peer.nVersion < GOVSCRIPT_PROTO_VERSION && govobj.GetObjectType() == GovernanceObject::PROPOSAL) {
-            // We know this proposal is valid locally, otherwise we would not store it.
-            // But we don't want to relay it to pre-GOVSCRIPT_PROTO_VERSION peers if payment_address is p2sh
-            // because they won't accept it anyway and will simply ban us eventually.
-            CProposalValidator validator(govobj.GetDataAsHexString(), false /* no script */);
-            if (!validator.Validate(false /* ignore expiration */)) {
-                // The only way we could get here is when proposal is valid but payment_address is actually p2sh.
-                LogPrintf("CGovernanceManager::%s -- not syncing p2sh govobj to older node: %s, peer=%d\n", __func__,
-                    strHash, peer.GetId());
-                continue;
-            }
-        }
-
         // Push the inventory budget proposal message over to the other client
         LogPrint(BCLog::GOBJECT, "CGovernanceManager::%s -- syncing govobj: %s, peer=%d\n", __func__, strHash, peer.GetId());
         ret.m_inventory.emplace_back(MSG_GOVERNANCE_OBJECT, nHash);
diff --git a/src/governance/object.cpp b/src/governance/object.cpp
index ddf3231537aa..8945ec62f7fa 100644
--- a/src/governance/object.cpp
+++ b/src/governance/object.cpp
@@ -602,21 +602,8 @@ void CGovernanceObject::Relay(PeerManager& peerman, const CMasternodeSync& mn_sy
         return;
     }
 
-    int minProtoVersion = MIN_PEER_PROTO_VERSION;
-    if (m_obj.type == GovernanceObject::PROPOSAL) {
-        // We know this proposal is valid locally, otherwise we would not get to the point we should relay it.
-        // But we don't want to relay it to pre-GOVSCRIPT_PROTO_VERSION peers if payment_address is p2sh
-        // because they won't accept it anyway and will simply ban us eventually.
-        CProposalValidator validator(GetDataAsHexString(), false /* no script */);
-        if (!validator.Validate(false /* ignore expiration */)) {
-            // The only way we could get here is when proposal is valid but payment_address is actually p2sh.
-            LogPrint(BCLog::GOBJECT, "CGovernanceObject::Relay -- won't relay %s to older peers\n", GetHash().ToString());
-            minProtoVersion = GOVSCRIPT_PROTO_VERSION;
-        }
-    }
-
     CInv inv(MSG_GOVERNANCE_OBJECT, GetHash());
-    peerman.RelayInv(inv, minProtoVersion);
+    peerman.RelayInv(inv);
 }
 
 void CGovernanceObject::UpdateSentinelVariables(const CDeterministicMNList& tip_mn_list)
diff --git a/src/version.h b/src/version.h
index 51a08aff2516..6b5edffb7755 100644
--- a/src/version.h
+++ b/src/version.h
@@ -22,9 +22,6 @@ static const int MIN_PEER_PROTO_VERSION = 70221;
 //! minimum proto version of masternode to accept in DKGs
 static const int MIN_MASTERNODE_PROTO_VERSION = 70238;
 
-//! GOVSCRIPT was activated in this version
-static const int GOVSCRIPT_PROTO_VERSION = 70221;
-
 //! ADDRV2 was introduced in this version
 static const int ADDRV2_PROTO_VERSION = 70223;
 

From af856085eb54ed1df1220463d96290b76bd716e6 Mon Sep 17 00:00:00 2001
From: UdjinM6 <UdjinM6@users.noreply.github.com>
Date: Mon, 13 Oct 2025 17:36:14 +0300
Subject: [PATCH 123/656] fix: improve governance/proposal dialog strings

- make strings easier to translate
- stop translating non-translatable strings
- use `%n` where possible
---
 src/qt/forms/proposalwizard.ui | 14 +++++++-------
 src/qt/governancelist.cpp      | 21 ++++++++++-----------
 src/qt/proposalwizard.cpp      |  9 +++++----
 3 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/src/qt/forms/proposalwizard.ui b/src/qt/forms/proposalwizard.ui
index d8b749cc65d4..046be2a81ecf 100644
--- a/src/qt/forms/proposalwizard.ui
+++ b/src/qt/forms/proposalwizard.ui
@@ -110,7 +110,7 @@
              </sizepolicy>
             </property>
            <property name="placeholderText">
-            <string>short-unique-name</string>
+            <string notr="true">short-unique-name</string>
            </property>
             <property name="maximumHeight">
              <number>24</number>
@@ -136,7 +136,7 @@
              </sizepolicy>
             </property>
            <property name="placeholderText">
-            <string>https://example.com/my-proposal</string>
+            <string notr="true">https://example.com/my-proposal</string>
            </property>
             <property name="maximumHeight">
              <number>24</number>
@@ -255,7 +255,7 @@
           <item row="6" column="1">
            <widget class="QLabel" name="labelTotalValue">
             <property name="text">
-             <string>0</string>
+             <string notr="true">0</string>
             </property>
            </widget>
           </item>
@@ -342,7 +342,7 @@
        <item>
         <widget class="QLabel" name="labelValidateStatus">
          <property name="text">
-          <string>-</string>
+          <string notr="true">-</string>
          </property>
         </widget>
        </item>
@@ -427,7 +427,7 @@
          <item>
           <widget class="QLabel" name="labelTxidCaption">
            <property name="text">
-            <string>TxID:</string>
+            <string notr="true">TxID:</string>
            </property>
           </widget>
          </item>
@@ -437,7 +437,7 @@
             <bool>true</bool>
            </property>
            <property name="placeholderText">
-            <string>-</string>
+            <string notr="true">-</string>
            </property>
             <property name="maximumHeight">
              <number>24</number>
@@ -661,7 +661,7 @@
             <bool>true</bool>
            </property>
            <property name="placeholderText">
-            <string>-</string>
+            <string notr="true">-</string>
            </property>
             <property name="maximumHeight">
              <number>24</number>
diff --git a/src/qt/governancelist.cpp b/src/qt/governancelist.cpp
index 35567f47eb2b..49c6abe6e628 100644
--- a/src/qt/governancelist.cpp
+++ b/src/qt/governancelist.cpp
@@ -595,18 +595,17 @@ void GovernanceList::voteForProposal(vote_outcome_enum_t outcome)
 
     // Show results
     QString message;
-    if (nSuccessful > 0 && nFailed == 0) {
-        message = tr("Voted successfully %1 time(s).").arg(nSuccessful);
-    } else if (nSuccessful > 0 && nFailed > 0) {
-        message = tr("Voted successfully %1 time(s) and failed %2 time(s).").arg(nSuccessful).arg(nFailed);
-        if (!failedMessages.isEmpty()) {
-            message += tr("\n\nFailed votes:\n%1").arg(failedMessages.join("\n"));
-        }
-    } else {
-        message = tr("Failed to vote %1 time(s).").arg(nFailed);
-        if (!failedMessages.isEmpty()) {
-            message += tr("\n\nErrors:\n%1").arg(failedMessages.join("\n"));
+    if (nSuccessful > 0) {
+        message += tr("Voted successfully %n time(s)", "", nSuccessful);
+    }
+    if (nFailed > 0) {
+        if (nSuccessful > 0) {
+            message += QString("\n");
         }
+        message += tr("Failed to vote %n time(s)", "", nFailed);
+    }
+    if (!failedMessages.isEmpty()) {
+        message += QString("\n\n") + tr("Errors:") + QString("\n") + failedMessages.join("\n");
     }
 
     QMessageBox::information(this, tr("Voting Results"), message);
diff --git a/src/qt/proposalwizard.cpp b/src/qt/proposalwizard.cpp
index b4cd0f06432c..3b61a9fa3976 100644
--- a/src/qt/proposalwizard.cpp
+++ b/src/qt/proposalwizard.cpp
@@ -60,7 +60,7 @@ ProposalWizard::ProposalWizard(interfaces::Node& node, WalletModel* walletModel,
     // Initialize fields
     // Populate payments dropdown (mainnet 1..12 by default; adjust by network later if needed)
     for (int i = 1; i <= 12; ++i) {
-        m_ui->comboPayments->addItem(tr("%1").arg(i), i);
+        m_ui->comboPayments->addItem(QString().setNum(i), i);
     }
     m_ui->comboPayments->setCurrentIndex(0);
 
@@ -290,8 +290,8 @@ void ProposalWizard::onMaybeAdvanceAfterConfirmations()
             if (m_confirmTimer) m_confirmTimer->stop();
         } else {
             const auto mins = (secs + 59) / 60;
-            m_ui->labelEta->setText(tr("Estimated time remaining: %1 min").arg(mins));
-            m_ui->labelEta2->setText(tr("Estimated time remaining: %1 min").arg(mins));
+            m_ui->labelEta->setText(tr("Estimated time remaining: %n minute(s)", "", mins));
+            m_ui->labelEta2->setText(tr("Estimated time remaining: %n minute(s)", "", mins));
         }
     }
     // Allow submitting (relay/postpone) at 1 confirmation and enable Next to proceed
@@ -321,7 +321,8 @@ void ProposalWizard::onSubmit()
     const QString govId = QString::fromStdString(obj_hash);
     m_ui->editGovObjId->setText(govId);
     QMessageBox::information(this, tr("Proposal submitted"),
-                             tr("Your proposal was submitted successfully.\nID: %1").arg(govId));
+                             tr("Your proposal was submitted successfully.") +
+                             QString("\nID: %1").arg(govId));
     m_submitted = true;
     m_ui->btnSubmit->setEnabled(false);
     // When 6 confs are reached show a final success message

From cc1a8fdcaaeb2383b794e6e0d23ca9c123458b6d Mon Sep 17 00:00:00 2001
From: Konstantin Akimov <knstqq@gmail.com>
Date: Tue, 7 Oct 2025 19:56:16 +0700
Subject: [PATCH 124/656] fix: add missing RPC help result for masternode RPCs

 - masternode (composite command)
 - masternode connect
 - masternode count
 - masternode winners
---
 src/rpc/evo.cpp        |  1 +
 src/rpc/masternode.cpp | 52 +++++++++++++++++++++++++++++++++++++-----
 2 files changed, 47 insertions(+), 6 deletions(-)

diff --git a/src/rpc/evo.cpp b/src/rpc/evo.cpp
index 3e0dcc641636..a8268a653de3 100644
--- a/src/rpc/evo.cpp
+++ b/src/rpc/evo.cpp
@@ -1511,6 +1511,7 @@ static RPCHelpMan protx_info()
         RPCResult{
             RPCResult::Type::OBJ, "", "Details about a specific deterministic masternode",
             {
+                // TODO: implement proper doc for protx info
                 {RPCResult::Type::ELISION, "", ""}
             }
         },
diff --git a/src/rpc/masternode.cpp b/src/rpc/masternode.cpp
index 727b20e9ebf5..bc683e83911c 100644
--- a/src/rpc/masternode.cpp
+++ b/src/rpc/masternode.cpp
@@ -49,7 +49,9 @@ static RPCHelpMan masternode_connect()
             {"address", RPCArg::Type::STR, RPCArg::Optional::NO, "The address of the masternode to connect"},
             {"v2transport", RPCArg::Type::BOOL, RPCArg::DefaultHint{"set by -v2transport"}, "Attempt to connect using BIP324 v2 transport protocol"},
         },
-        RPCResults{},
+        RPCResult{
+            RPCResult::Type::STR, "status", "Returns 'successfully connected' if succeed"
+        },
         RPCExamples{""},
         [&](const RPCHelpMan& self, const JSONRPCRequest& request) -> UniValue
 {
@@ -85,7 +87,28 @@ static RPCHelpMan masternode_count()
     return RPCHelpMan{"masternode count",
         "Get information about number of masternodes.\n",
         {},
-        RPCResults{},
+        RPCResult{
+            RPCResult::Type::OBJ, "", "",
+            {
+                {RPCResult::Type::NUM, "total", "Total amount Masternodes"},
+                {RPCResult::Type::NUM, "enabled", "Amount of enabled Masternodes"},
+                {RPCResult::Type::OBJ, "details", "Amount of enabled Masternodes",
+                    {{RPCResult::Type::OBJ, "", "",
+                    {
+                        {RPCResult::Type::OBJ, "regular", "Details for regular masternodes",
+                            {
+                                {RPCResult::Type::NUM, "total", "Total amount regular Masternodes"},
+                                {RPCResult::Type::NUM, "enabled", "Amount of enabled regular Masternodes"}
+                        }},
+                        {RPCResult::Type::OBJ, "evo", "Details for Evo nodes",
+                            {
+                                {RPCResult::Type::NUM, "total", "Total amount Evo nodes"},
+                                {RPCResult::Type::NUM, "enabled", "Amount of enabled Evo nodes"}
+                        }},
+                    }},
+                    }}
+            }
+        },
         RPCExamples{""},
         [&](const RPCHelpMan& self, const JSONRPCRequest& request) -> UniValue
 {
@@ -157,7 +180,13 @@ static RPCHelpMan masternode_status()
     return RPCHelpMan{"masternode status",
         "Print masternode status information\n",
         {},
-        RPCResults{},
+        RPCResult{
+            RPCResult::Type::OBJ, "", "",
+            {
+                // TODO: implement proper type validator instead ELISION
+                {RPCResult::Type::ELISION, "", ""}
+            }
+        },
         RPCExamples{""},
         [&](const RPCHelpMan& self, const JSONRPCRequest& request) -> UniValue
 {
@@ -232,7 +261,12 @@ static RPCHelpMan masternode_winners()
             {"count", RPCArg::Type::NUM, RPCArg::Default{10}, "number of last winners to return"},
             {"filter", RPCArg::Type::STR, RPCArg::Default{""}, "filter for returned winners"},
         },
-        RPCResults{},
+        RPCResult{
+            RPCResult::Type::OBJ, "", "Details about a specific deterministic masternode",
+            {
+                {RPCResult::Type::STR, "height", "payment string"}
+            }
+        },
         RPCExamples{""},
         [&](const RPCHelpMan& self, const JSONRPCRequest& request) -> UniValue
 {
@@ -454,7 +488,7 @@ static RPCHelpMan masternode_help()
         {
             {"command", RPCArg::Type::STR, RPCArg::Optional::NO, "The command to execute"},
         },
-        RPCResults{},
+        RPCResult{RPCResult::Type::NONE, "", ""},
         RPCExamples{""},
         [&](const RPCHelpMan& self, const JSONRPCRequest& request) -> UniValue
 {
@@ -491,7 +525,13 @@ static RPCHelpMan masternodelist_helper(bool is_composite)
             {"mode", RPCArg::Type::STR, RPCArg::DefaultHint{"json"}, "The mode to run list in"},
             {"filter", RPCArg::Type::STR, RPCArg::Default{""}, "Filter results. Partial match by outpoint by default in all modes, additional matches in some modes are also available"},
         },
-        RPCResults{},
+        RPCResult{
+            RPCResult::Type::OBJ, "", "",
+            {
+                // TODO: implement proper type validator instead ELISION
+                {RPCResult::Type::ELISION, "", ""}
+            }
+        },
         RPCExamples{""},
         [&](const RPCHelpMan& self, const JSONRPCRequest& request) -> UniValue
 {

From b174fe07801f25a88a6154ed14489cfb1d383bde Mon Sep 17 00:00:00 2001
From: Konstantin Akimov <knstqq@gmail.com>
Date: Tue, 7 Oct 2025 19:56:46 +0700
Subject: [PATCH 125/656] fix: add missing RPC help result for RPC
 mockscheduler

---
 src/rpc/node.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/rpc/node.cpp b/src/rpc/node.cpp
index 97d6188828b9..a34c54330712 100644
--- a/src/rpc/node.cpp
+++ b/src/rpc/node.cpp
@@ -825,7 +825,7 @@ static RPCHelpMan mockscheduler()
         {
             {"delta_time", RPCArg::Type::NUM, RPCArg::Optional::NO, "Number of seconds to forward the scheduler into the future." },
         },
-        RPCResults{},
+        RPCResult{RPCResult::Type::NONE, "", ""},
         RPCExamples{""},
         [&](const RPCHelpMan& self, const JSONRPCRequest& request) -> UniValue
 {

From b216d138c1ecd4ce198bad6c0bb8ea4ce830b7da Mon Sep 17 00:00:00 2001
From: Konstantin Akimov <knstqq@gmail.com>
Date: Mon, 13 Oct 2025 23:23:25 +0700
Subject: [PATCH 126/656] fix: set proper RPCResult for coinjoin RPC

Fixed:
 - `setcoinjoinrounds`
 - `setcoinjoinamount`
 - `coinjoinsalt`
 - composite command `coinjoin`
---
 src/rpc/coinjoin.cpp      | 4 ++--
 src/wallet/rpc/wallet.cpp | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/rpc/coinjoin.cpp b/src/rpc/coinjoin.cpp
index e0367734467a..93e70008895d 100644
--- a/src/rpc/coinjoin.cpp
+++ b/src/rpc/coinjoin.cpp
@@ -59,7 +59,7 @@ static RPCHelpMan coinjoin()
         {
             {"command", RPCArg::Type::STR, RPCArg::Optional::NO, "The command to execute"},
         },
-        RPCResults{},
+        RPCResult{RPCResult::Type::NONE, "", ""},
         RPCExamples{""},
         [&](const RPCHelpMan& self, const JSONRPCRequest& request) -> UniValue
 {
@@ -231,7 +231,7 @@ static RPCHelpMan coinjoinsalt()
         {
             {"command", RPCArg::Type::STR, RPCArg::Optional::NO, "The command to execute"},
         },
-        RPCResults{},
+        RPCResult{RPCResult::Type::NONE, "", ""},
         RPCExamples{""},
         [&](const RPCHelpMan& self, const JSONRPCRequest& request) -> UniValue
 {
diff --git a/src/wallet/rpc/wallet.cpp b/src/wallet/rpc/wallet.cpp
index d7fdae8cd609..699fb7795e3b 100644
--- a/src/wallet/rpc/wallet.cpp
+++ b/src/wallet/rpc/wallet.cpp
@@ -96,7 +96,7 @@ static RPCHelpMan setcoinjoinrounds()
                 "The default number of rounds is " + ToString(DEFAULT_COINJOIN_ROUNDS) +
                 " Cannot be more than " + ToString(MAX_COINJOIN_ROUNDS) + " nor less than " + ToString(MIN_COINJOIN_ROUNDS)},
         },
-        RPCResults{},
+        RPCResult{RPCResult::Type::NONE, "", ""},
         RPCExamples{
             HelpExampleCli("setcoinjoinrounds", "4")
     + HelpExampleRpc("setcoinjoinrounds", "16")
@@ -127,7 +127,7 @@ static RPCHelpMan setcoinjoinamount()
                 "The default amount is " + ToString(DEFAULT_COINJOIN_AMOUNT) +
                 " Cannot be more than " + ToString(MAX_COINJOIN_AMOUNT) + " nor less than " + ToString(MIN_COINJOIN_AMOUNT)},
         },
-        RPCResults{},
+        RPCResult{RPCResult::Type::NONE, "", ""},
         RPCExamples{
             HelpExampleCli("setcoinjoinamount", "500")
     + HelpExampleRpc("setcoinjoinamount", "208")

From b820266ea9c0509cb1bfedb42c9b5814bfd03b93 Mon Sep 17 00:00:00 2001
From: Kittywhiskers Van Gogh <63189531+kwvg@users.noreply.github.com>
Date: Tue, 17 Dec 2024 04:28:10 +0000
Subject: [PATCH 127/656] revert: stop tracking cmake dependency
 relic_conf.h.in

reverts:
- 02260cba57f5b28c35509fbd6168feac50a1980e.
---
 .../depends/relic/include/relic_conf.h.in     | 717 ++++++++++++++++++
 1 file changed, 717 insertions(+)
 create mode 100644 src/dashbls/depends/relic/include/relic_conf.h.in

diff --git a/src/dashbls/depends/relic/include/relic_conf.h.in b/src/dashbls/depends/relic/include/relic_conf.h.in
new file mode 100644
index 000000000000..7db6f5b509c4
--- /dev/null
+++ b/src/dashbls/depends/relic/include/relic_conf.h.in
@@ -0,0 +1,717 @@
+/*
+ * RELIC is an Efficient LIbrary for Cryptography
+ * Copyright (c) 2009 RELIC Authors
+ *
+ * This file is part of RELIC. RELIC is legal property of its developers,
+ * whose names are not listed here. Please refer to the COPYRIGHT file
+ * for contact information.
+ *
+ * RELIC is free software; you can redistribute it and/or modify it under the
+ * terms of the version 2.1 (or later) of the GNU Lesser General Public License
+ * as published by the Free Software Foundation; or version 2.0 of the Apache
+ * License as published by the Apache Software Foundation. See the LICENSE files
+ * for more details.
+ *
+ * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ * A PARTICULAR PURPOSE. See the LICENSE files for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public or the
+ * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
+ * or <https://www.apache.org/licenses/>.
+ */
+
+/**
+ * @file
+ *
+ * Project configuration.
+ *
+ * @version $Id: relic_conf.h.in 45 2009-07-04 23:45:48Z dfaranha $
+ * @ingroup relic
+ */
+
+#ifndef RLC_CONF_H
+#define RLC_CONF_H
+
+/** Project version. */
+#define RLC_VERSION "@VERSION@"
+
+/** Debugging support. */
+#cmakedefine DEBUG
+/** Profiling support. */
+#cmakedefine PROFL
+/** Error handling support. */
+#cmakedefine CHECK
+/** Verbose error messages. */
+#cmakedefine VERBS
+/** Build with overhead estimation. */
+#cmakedefine OVERH
+/** Build documentation. */
+#cmakedefine DOCUM
+/** Build only the selected algorithms. */
+#cmakedefine STRIP
+/** Build with printing disabled. */
+#cmakedefine QUIET
+/** Build with colored output. */
+#cmakedefine COLOR
+/** Build with big-endian support. */
+#cmakedefine BIGED
+/** Build shared library. */
+#cmakedefine SHLIB
+/** Build static library. */
+#cmakedefine STLIB
+
+/** Number of times each test is ran. */
+#define TESTS    @TESTS@
+/** Number of times each benchmark is ran. */
+#define BENCH    @BENCH@
+/** Number of available cores. */
+#define CORES    @CORES@
+
+/** Atmel AVR ATMega128 8-bit architecture. */
+#define AVR      1
+/** MSP430 16-bit architecture. */
+#define MSP      2
+/** ARM 32-bit architecture. */
+#define ARM      3
+/** Intel x86-compatible 32-bit architecture. */
+#define X86      4
+/** AMD64-compatible 64-bit architecture. */
+#define X64      5
+/** Architecture. */
+#cmakedefine ARCH	 @ARCH@
+
+/** Size of word in this architecture. */
+#define WSIZE    @WSIZE@
+
+/** Byte boundary to align digit vectors. */
+#define ALIGN    @ALIGN@
+
+/** Build multiple precision integer module. */
+#cmakedefine WITH_BN
+/** Build prime field module. */
+#cmakedefine WITH_FP
+/** Build prime field extension module. */
+#cmakedefine WITH_FPX
+/** Build binary field module. */
+#cmakedefine WITH_FB
+/** Build prime elliptic curve module. */
+#cmakedefine WITH_EP
+/** Build prime field extension elliptic curve module. */
+#cmakedefine WITH_EPX
+/** Build binary elliptic curve module. */
+#cmakedefine WITH_EB
+/** Build elliptic Edwards curve module. */
+#cmakedefine WITH_ED
+/** Build elliptic curve cryptography module. */
+#cmakedefine WITH_EC
+/** Build pairings over prime curves module. */
+#cmakedefine WITH_PP
+/** Build pairing-based cryptography module. */
+#cmakedefine WITH_PC
+/** Build block ciphers. */
+#cmakedefine WITH_BC
+/** Build hash functions. */
+#cmakedefine WITH_MD
+/** Build cryptographic protocols. */
+#cmakedefine WITH_CP
+/** Build Multi-party computation primitives. */
+#cmakedefine WITH_MPC
+
+/** Easy C-only backend. */
+#define EASY	 1
+/** GMP backend. */
+#define GMP      2
+/** GMP constant-time backend. */
+#define GMP_SEC  3
+/** Arithmetic backend. */
+#define ARITH    @ARITH@
+
+/** Required precision in bits. */
+#define BN_PRECI @BN_PRECI@
+/** A multiple precision integer can store w words. */
+#define SINGLE	 0
+/** A multiple precision integer can store the result of an addition. */
+#define CARRY	 1
+/** A multiple precision integer can store the result of a multiplication. */
+#define DOUBLE	 2
+/** Effective size of a multiple precision integer. */
+#define BN_MAGNI @BN_MAGNI@
+/** Number of Karatsuba steps. */
+#define BN_KARAT @BN_KARAT@
+
+/** Schoolbook multiplication. */
+#define BASIC    1
+/** Comba multiplication. */
+#define COMBA    2
+/** Chosen multiple precision multiplication method. */
+#define BN_MUL   @BN_MUL@
+
+/** Schoolbook squaring. */
+#define BASIC    1
+/** Comba squaring. */
+#define COMBA    2
+/** Reuse multiplication for squaring. */
+#define MULTP    4
+/** Chosen multiple precision multiplication method. */
+#define BN_SQR   @BN_SQR@
+
+/** Division modular reduction. */
+#define BASIC    1
+/** Barrett modular reduction. */
+#define BARRT    2
+/** Montgomery modular reduction. */
+#define MONTY    3
+/** Pseudo-Mersenne modular reduction. */
+#define PMERS    4
+/** Chosen multiple precision modular reduction method. */
+#define BN_MOD   @BN_MOD@
+
+/** Binary modular exponentiation. */
+#define BASIC    1
+/** Sliding window modular exponentiation. */
+#define SLIDE    2
+/** Montgomery powering ladder. */
+#define MONTY    3
+/** Chosen multiple precision modular exponentiation method. */
+#define BN_MXP   @BN_MXP@
+
+/** Basic Euclidean GCD Algorithm. */
+#define BASIC    1
+/** Lehmer's fast GCD Algorithm. */
+#define LEHME    2
+/** Stein's binary GCD Algorithm. */
+#define STEIN    3
+/** Chosen multiple precision greatest common divisor method. */
+#define BN_GCD   @BN_GCD@
+
+/** Basic prime generation. */
+#define BASIC    1
+/** Safe prime generation. */
+#define SAFEP    2
+/** Strong prime generation. */
+#define STRON    3
+/** Chosen prime generation algorithm. */
+#define BN_GEN   @BN_GEN@
+
+/** Multiple precision arithmetic method */
+#define BN_METHD "@BN_METHD@"
+
+/** Prime field size in bits. */
+#define FP_PRIME @FP_PRIME@
+/** Number of Karatsuba steps. */
+#define FP_KARAT @FP_KARAT@
+/** Prefer Pseudo-Mersenne primes over random primes. */
+#cmakedefine FP_PMERS
+/** Use -1 as quadratic non-residue. */
+#cmakedefine FP_QNRES
+/** Width of window processing for exponentiation methods. */
+#define FP_WIDTH @FP_WIDTH@
+
+/** Schoolbook addition. */
+#define BASIC    1
+/** Integrated modular addtion. */
+#define INTEG    3
+/** Chosen prime field multiplication method. */
+#define FP_ADD   @FP_ADD@
+
+/** Schoolbook multiplication. */
+#define BASIC    1
+/** Comba multiplication. */
+#define COMBA    2
+/** Integrated modular multiplication. */
+#define INTEG    3
+/** Chosen prime field multiplication method. */
+#define FP_MUL   @FP_MUL@
+
+/** Schoolbook squaring. */
+#define BASIC    1
+/** Comba squaring. */
+#define COMBA    2
+/** Integrated modular squaring. */
+#define INTEG    3
+/** Reuse multiplication for squaring. */
+#define MULTP    4
+/** Chosen prime field multiplication method. */
+#define FP_SQR   @FP_SQR@
+
+/** Division-based reduction. */
+#define BASIC    1
+/** Fast reduction modulo special form prime. */
+#define QUICK    2
+/** Montgomery modular reduction. */
+#define MONTY    3
+/** Chosen prime field reduction method. */
+#define FP_RDC   @FP_RDC@
+
+/** Inversion by Fermat's Little Theorem. */
+#define BASIC    1
+/** Binary inversion. */
+#define BINAR    2
+/** Integrated modular multiplication. */
+#define MONTY    3
+/** Extended Euclidean algorithm. */
+#define EXGCD    4
+/** Constant-time inversion by Bernstein-Yang division steps. */
+#define DIVST    5
+/** Use implementation provided by the lower layer. */
+#define LOWER    8
+/** Chosen prime field inversion method. */
+#define FP_INV   @FP_INV@
+
+/** Binary modular exponentiation. */
+#define BASIC    1
+/** Sliding window modular exponentiation. */
+#define SLIDE    2
+/** Constant-time Montgomery powering ladder. */
+#define MONTY    3
+/** Chosen multiple precision modular exponentiation method. */
+#define FP_EXP   @FP_EXP@
+
+/** Prime field arithmetic method */
+#define FP_METHD "@FP_METHD@"
+
+/** Basic quadratic extension field arithmetic. */
+#define BASIC    1
+/** Integrated extension field arithmetic. */
+#define INTEG    3
+/* Chosen extension field arithmetic method. */
+#define FPX_QDR   @FPX_QDR@
+
+/** Basic cubic extension field arithmetic. */
+#define BASIC    1
+/** Integrated extension field arithmetic. */
+#define INTEG    3
+/* Chosen extension field arithmetic method. */
+#define FPX_CBC   @FPX_CBC@
+
+/** Basic quadratic extension field arithmetic. */
+#define BASIC    1
+/** Lazy-reduced extension field arithmetic. */
+#define LAZYR    2
+/* Chosen extension field arithmetic method. */
+#define FPX_RDC   @FPX_RDC@
+
+/** Prime extension field arithmetic method */
+#define FPX_METHD "@FPX_METHD@"
+
+/** Irreducible polynomial size in bits. */
+#define FB_POLYN @FB_POLYN@
+/** Number of Karatsuba steps. */
+#define FB_KARAT @FB_KARAT@
+/** Prefer trinomials over pentanomials. */
+#cmakedefine FB_TRINO
+/** Prefer square-root friendly polynomials. */
+#cmakedefine FB_SQRTF
+/** Precompute multiplication table for sqrt(z). */
+#cmakedefine FB_PRECO
+/** Width of window processing for exponentiation methods. */
+#define FB_WIDTH @FB_WIDTH@
+
+/** Shift-and-add multiplication. */
+#define BASIC    1
+/** Lopez-Dahab multiplication. */
+#define LODAH	 2
+/** Integrated modular multiplication. */
+#define INTEG	 3
+/** Chosen binary field multiplication method. */
+#define FB_MUL   @FB_MUL@
+
+/** Basic squaring. */
+#define BASIC    1
+/** Table-based squaring. */
+#define QUICK    2
+/** Integrated modular squaring. */
+#define INTEG	 3
+/** Chosen binary field squaring method. */
+#define FB_SQR   @FB_SQR@
+
+/** Shift-and-add modular reduction. */
+#define BASIC    1
+/** Fast reduction modulo a trinomial or pentanomial. */
+#define QUICK	 2
+/** Chosen binary field modular reduction method. */
+#define FB_RDC   @FB_RDC@
+
+/** Square root by repeated squaring. */
+#define BASIC    1
+/** Fast square root extraction. */
+#define QUICK	 2
+/** Chosen binary field modular reduction method. */
+#define FB_SRT   @FB_SRT@
+
+/** Trace by repeated squaring. */
+#define BASIC    1
+/** Fast trace computation. */
+#define QUICK	 2
+/** Chosen trace computation method. */
+#define FB_TRC   @FB_TRC@
+
+/** Solve by half-trace computation. */
+#define BASIC    1
+/** Solve with precomputed half-traces. */
+#define QUICK	 2
+/** Chosen method to solve a quadratic equation. */
+#define FB_SLV   @FB_SLV@
+
+/** Inversion by Fermat's Little Theorem. */
+#define BASIC    1
+/** Binary inversion. */
+#define BINAR    2
+/** Almost inverse algorithm. */
+#define ALMOS    3
+/** Extended Euclidean algorithm. */
+#define EXGCD    4
+/** Itoh-Tsuji inversion. */
+#define ITOHT    5
+/** Hardware-friendly inversion by Brunner-Curiger-Hofstetter.*/
+#define BRUCH    6
+/** Constant-time version of almost inverse. */
+#define CTAIA    7
+/** Use implementation provided by the lower layer. */
+#define LOWER    8
+/** Chosen binary field inversion method. */
+#define FB_INV   @FB_INV@
+
+/** Binary modular exponentiation. */
+#define BASIC    1
+/** Sliding window modular exponentiation. */
+#define SLIDE    2
+/** Constant-time Montgomery powering ladder. */
+#define MONTY    3
+/** Chosen multiple precision modular exponentiation method. */
+#define FB_EXP   @FB_EXP@
+
+/** Iterated squaring/square-root by consecutive squaring/square-root. */
+#define BASIC    1
+/** Iterated squaring/square-root by table-based method. */
+#define QUICK	 2
+/** Chosen method to solve a quadratic equation. */
+#define FB_ITR   @FB_ITR@
+
+/** Binary field arithmetic method */
+#define FB_METHD "@FB_METHD@"
+
+/** Support for ordinary curves. */
+#cmakedefine EP_PLAIN
+/** Support for supersingular curves. */
+#cmakedefine EP_SUPER
+/** Support for prime curves with efficient endormorphisms. */
+#cmakedefine EP_ENDOM
+/** Use mixed coordinates. */
+#cmakedefine EP_MIXED
+/** Build precomputation table for generator. */
+#cmakedefine EP_PRECO
+/** Enable isogeny map for SSWU map-to-curve. */
+#cmakedefine EP_CTMAP
+/** Width of precomputation table for fixed point methods. */
+#define EP_DEPTH @EP_DEPTH@
+/** Width of window processing for unknown point methods. */
+#define EP_WIDTH @EP_WIDTH@
+
+/** Affine coordinates. */
+#define BASIC	 1
+/** Projective coordinates. */
+#define PROJC	 2
+/** Jacobian coordinates. */
+#define JACOB	 3
+/** Chosen prime elliptic curve coordinate method. */
+#define EP_ADD	 @EP_ADD@
+
+/** Binary point multiplication. */
+#define BASIC	 1
+/** Sliding window. */
+#define SLIDE    2
+/** Montgomery powering ladder. */
+#define MONTY	 3
+/** Left-to-right Width-w NAF. */
+#define LWNAF	 4
+/** Left-to-right Width-w NAF. */
+#define LWREG	 5
+/** Chosen prime elliptic curve point multiplication method. */
+#define EP_MUL	 @EP_MUL@
+
+/** Binary point multiplication. */
+#define BASIC	 1
+/** Single-table comb method. */
+#define COMBS	 2
+/** Double-table comb method. */
+#define COMBD    3
+/** Left-to-right Width-w NAF. */
+#define LWNAF	 4
+/** Chosen prime elliptic curve point multiplication method. */
+#define EP_FIX	 @EP_FIX@
+
+/** Basic simultaneouns point multiplication. */
+#define BASIC    1
+/** Shamir's trick. */
+#define TRICK    2
+/** Interleaving of w-(T)NAFs. */
+#define INTER    3
+/** Joint sparse form. */
+#define JOINT    4
+/** Chosen prime elliptic curve simulteanous point multiplication method. */
+#define EP_SIM   @EP_SIM@
+
+/** Prime elliptic curve arithmetic method. */
+#define EP_METHD "@EP_METHD@"
+
+/** Support for ordinary curves without endormorphisms. */
+#cmakedefine EB_PLAIN
+/** Support for Koblitz anomalous binary curves. */
+#cmakedefine EB_KBLTZ
+/** Use mixed coordinates. */
+#cmakedefine EB_MIXED
+/** Build precomputation table for generator. */
+#cmakedefine EB_PRECO
+/** Width of precomputation table for fixed point methods. */
+#define EB_DEPTH @EB_DEPTH@
+/** Width of window processing for unknown point methods. */
+#define EB_WIDTH @EB_WIDTH@
+
+/** Binary elliptic curve arithmetic method. */
+#define EB_METHD "@EB_METHD@"
+
+/** Affine coordinates. */
+#define BASIC	 1
+/** López-Dahab Projective coordinates. */
+#define PROJC	 2
+/** Chosen binary elliptic curve coordinate method. */
+#define EB_ADD	 @EB_ADD@
+
+/** Binary point multiplication. */
+#define BASIC	 1
+/** L�pez-Dahab point multiplication. */
+#define LODAH	 2
+/** Halving. */
+#define HALVE    3
+/** Left-to-right width-w (T)NAF. */
+#define LWNAF	 4
+/** Right-to-left width-w (T)NAF. */
+#define RWNAF	 5
+/** Chosen binary elliptic curve point multiplication method. */
+#define EB_MUL	 @EB_MUL@
+
+/** Binary point multiplication. */
+#define BASIC	 1
+/** Single-table comb method. */
+#define COMBS	 2
+/** Double-table comb method. */
+#define COMBD    3
+/** Left-to-right Width-w NAF. */
+#define LWNAF	 4
+/** Chosen binary elliptic curve point multiplication method. */
+#define EB_FIX	 @EB_FIX@
+
+/** Basic simultaneouns point multiplication. */
+#define BASIC    1
+/** Shamir's trick. */
+#define TRICK    2
+/** Interleaving of w-(T)NAFs. */
+#define INTER    3
+/** Joint sparse form. */
+#define JOINT    4
+/** Chosen binary elliptic curve simulteanous point multiplication method. */
+#define EB_SIM   @EB_SIM@
+
+/** Build precomputation table for generator. */
+#cmakedefine ED_PRECO
+/** Width of precomputation table for fixed point methods. */
+#define ED_DEPTH @ED_DEPTH@
+/** Width of window processing for unknown point methods. */
+#define ED_WIDTH @ED_WIDTH@
+
+/** Edwards elliptic curve arithmetic method. */
+#define ED_METHD "@ED_METHD@"
+
+/** Affine coordinates. */
+#define BASIC    1
+/** Simple projective twisted Edwards coordinates */
+#define PROJC	 2
+/** Extended projective twisted Edwards coordinates */
+#define EXTND	 3
+/** Chosen binary elliptic curve coordinate method. */
+#define ED_ADD	 @ED_ADD@
+
+/** Binary point multiplication. */
+#define BASIC	 1
+/** Sliding window. */
+#define SLIDE    2
+/** Montgomery powering ladder. */
+#define MONTY	 3
+/** Left-to-right Width-w NAF. */
+#define LWNAF	 4
+/** Left-to-right Width-w NAF. */
+#define LWREG	 5
+/** Chosen prime elliptic twisted Edwards curve point multiplication method. */
+#define ED_MUL	 @ED_MUL@
+
+/** Binary point multiplication. */
+#define BASIC	 1
+/** Single-table comb method. */
+#define COMBS	 2
+/** Double-table comb method. */
+#define COMBD    3
+/** Left-to-right Width-w NAF. */
+#define LWNAF	 4
+/** Chosen prime elliptic twisted Edwards curve point multiplication method. */
+#define ED_FIX	 @ED_FIX@
+
+/** Basic simultaneouns point multiplication. */
+#define BASIC    1
+/** Shamir's trick. */
+#define TRICK    2
+/** Interleaving of w-(T)NAFs. */
+#define INTER    3
+/** Joint sparse form. */
+#define JOINT    4
+/** Chosen prime elliptic curve simulteanous point multiplication method. */
+#define ED_SIM   @ED_SIM@
+
+/** Prime curves. */
+#define PRIME    1
+/** Binary curves. */
+#define CHAR2    2
+/** Edwards curves */
+#define EDDIE    3
+/** Chosen elliptic curve type. */
+#define EC_CUR	 @EC_CUR@
+
+/** Chosen elliptic curve cryptography method. */
+#define EC_METHD "@EC_METHD@"
+/** Prefer curves with efficient endomorphisms. */
+#cmakedefine EC_ENDOM
+
+/** Basic quadratic extension field arithmetic. */
+#define BASIC    1
+/** Lazy-reduced extension field arithmetic. */
+#define LAZYR    2
+/* Chosen extension field arithmetic method. */
+#define PP_EXT   @PP_EXT@
+
+/** Bilinear pairing method. */
+#define PP_METHD "@PP_METHD@"
+
+/** Tate pairing. */
+#define TATEP    1
+/** Weil pairing. */
+#define WEILP    2
+/** Optimal ate pairing. */
+#define OATEP    3
+/** Chosen pairing method over prime elliptic curves. */
+#define PP_MAP   @PP_MAP@
+
+/** SHA-224 hash function. */
+#define SH224          2
+/** SHA-256 hash function. */
+#define SH256          3
+/** SHA-384 hash function. */
+#define SH384          4
+/** SHA-512 hash function. */
+#define SH512          5
+/** BLAKE2s-160 hash function. */
+#define B2S160         6
+/** BLAKE2s-256 hash function. */
+#define B2S256         7
+/** Chosen hash function. */
+#define MD_MAP   @MD_MAP@
+
+/** Choice of hash function. */
+#define MD_METHD "@MD_METHD@"
+
+/** Chosen RSA method. */
+#cmakedefine CP_CRT
+/** RSA without padding. */
+#define BASIC    1
+/** RSA PKCS#1 v1.5 padding. */
+#define PKCS1    2
+/** RSA PKCS#1 v2.1 padding. */
+#define PKCS2    3
+/** Chosen RSA padding method. */
+#define CP_RSAPD @CP_RSAPD@
+
+/** Automatic memory allocation. */
+#define AUTO     1
+/** Dynamic memory allocation. */
+#define DYNAMIC  2
+/** Chosen memory allocation policy. */
+#define ALLOC    @ALLOC@
+
+/** NIST HASH-DRBG generator. */
+#define HASHD    1
+/** Intel RdRand instruction. */
+#define RDRND    2
+/** Operating system underlying generator. */
+#define UDEV     3
+/** Override library generator with the callback. */
+#define CALL     4
+/** Chosen random generator. */
+#define RAND     @RAND@
+
+/** Standard C library generator. */
+#define LIBC     1
+/** Intel RdRand instruction. */
+#define RDRND    2
+/** Device node generator. */
+#define UDEV     3
+/** Use Windows' CryptGenRandom. */
+#define WCGR     4
+/** Chosen random generator seeder. */
+#cmakedefine SEED     @SEED@
+
+/** GNU/Linux operating system. */
+#define LINUX    1
+/** FreeBSD operating system. */
+#define FREEBSD  2
+/** Windows operating system. */
+#define MACOSX   3
+/** Windows operating system. */
+#define WINDOWS  4
+/** Android operating system. */
+#define DROID    5
+/** Arduino platform. */
+#define DUINO    6
+/** OpenBSD operating system. */
+#define OPENBSD  7
+/** Detected operation system. */
+#cmakedefine OPSYS    @OPSYS@
+
+/** OpenMP multithreading support. */
+#define OPENMP   1
+/** POSIX multithreading support. */
+#define PTHREAD  2
+/** Chosen multithreading API. */
+#cmakedefine MULTI    @MULTI@
+
+/** Per-process high-resolution timer. */
+#define HREAL    1
+/** Per-process high-resolution timer. */
+#define HPROC    2
+/** Per-thread high-resolution timer. */
+#define HTHRD    3
+/** POSIX-compatible timer. */
+#define POSIX    4
+/** ANSI-compatible timer. */
+#define ANSI     5
+/** Cycle-counting timer. */
+#define CYCLE    6
+/** Performance monitoring framework. */
+#define PERF     7
+/** Chosen timer. */
+#cmakedefine TIMER    @TIMER@
+
+/** Prefix to identity this build of the library. */
+#cmakedefine LABEL    @LABEL@
+
+#ifndef ASM
+
+#include "relic_label.h"
+
+/**
+ * Prints the project options selected at build time.
+ */
+void conf_print(void);
+
+#endif /* ASM */
+
+#endif /* !RLC_CONF_H */

From e686744ef18d1e42a13a51c8d81ebe023185eb54 Mon Sep 17 00:00:00 2001
From: Kittywhiskers Van Gogh <63189531+kwvg@users.noreply.github.com>
Date: Tue, 14 Oct 2025 22:55:09 +0530
Subject: [PATCH 128/656] Squashed 'src/dashbls/' changes from
 0bb5c5b032..dd683653c6

dd683653c6 Merge pull request #115 from kwvg/bump_1.3.6
f5dc3d0a87  chore: bump version to 1.3.6
3a2208ecc3 Merge pull request #114 from kwvg/bye_ssp
6e0a611212 build: remove explicit libssp linking from Windows build
d5e656f707 chore: update cmake (#113)
02fc11abfd ci: use ubuntu-latest instead of 20.04 as actions is EOLing 20.04 (#109)

git-subtree-dir: src/dashbls
git-subtree-split: dd683653c6eaba7235bc9c600f46bafbb8210291
---
 .github/workflows/build-test.yaml    | 2 +-
 configure.ac                         | 8 +-------
 depends/mimalloc/CMakeLists.txt      | 2 +-
 depends/mimalloc/test/CMakeLists.txt | 2 +-
 depends/relic/CMakeLists.txt         | 2 +-
 5 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/build-test.yaml b/.github/workflows/build-test.yaml
index e023515ee2cb..2f210d86255e 100644
--- a/.github/workflows/build-test.yaml
+++ b/.github/workflows/build-test.yaml
@@ -22,7 +22,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ macos-latest, ubuntu-20.04 ]
+        os: [ macos-latest, ubuntu-latest ]
         builder: [ cmake, autotools ]
         compiler:
           - cc: gcc
diff --git a/configure.ac b/configure.ac
index 815a015b03dc..7551af213c18 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 AC_PREREQ([2.60])
-AC_INIT([libdashbls],[1.3.5])
+AC_INIT([libdashbls],[1.3.6])
 AC_CONFIG_AUX_DIR([build-aux])
 AC_CONFIG_MACRO_DIR([build-aux/m4])
 
@@ -772,12 +772,6 @@ if test "$use_hardening" != "no"; then
   AX_CHECK_LINK_FLAG([-Wl,-z,now], [HARDENED_LDFLAGS="$HARDENED_LDFLAGS -Wl,-z,now"], [], [])
   AX_CHECK_LINK_FLAG([-Wl,-z,separate-code], [HARDENED_LDFLAGS="$HARDENED_LDFLAGS -Wl,-z,separate-code"], [], [])
   AX_CHECK_LINK_FLAG([-fPIE -pie], [HARDENED_FLAGS="$HARDENED_FLAGS -fPIE"; HARDENED_LDFLAGS="$HARDENED_LDFLAGS -pie"], [], [])
-
-  case $host in
-    *mingw*)
-       AC_CHECK_LIB([ssp], [main], [], [AC_MSG_ERROR([libssp missing])])
-    ;;
-  esac
 fi
 
 CORE_CPPFLAGS="$CORE_CPPFLAGS -DHAVE_BUILD_INFO"
diff --git a/depends/mimalloc/CMakeLists.txt b/depends/mimalloc/CMakeLists.txt
index 2550f0d51420..7ac6673e6bf4 100644
--- a/depends/mimalloc/CMakeLists.txt
+++ b/depends/mimalloc/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.0)
+cmake_minimum_required(VERSION 3.14)
 project(libmimalloc C CXX)
 
 set(CMAKE_C_STANDARD 11)
diff --git a/depends/mimalloc/test/CMakeLists.txt b/depends/mimalloc/test/CMakeLists.txt
index e76ffa64fcd5..fb4b48111f03 100644
--- a/depends/mimalloc/test/CMakeLists.txt
+++ b/depends/mimalloc/test/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.0)
+cmake_minimum_required(VERSION 3.14)
 project(mimalloc-test C CXX)
 
 set(CMAKE_C_STANDARD 11)
diff --git a/depends/relic/CMakeLists.txt b/depends/relic/CMakeLists.txt
index db5a62507468..58bf27a5a40f 100644
--- a/depends/relic/CMakeLists.txt
+++ b/depends/relic/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.1)
+cmake_minimum_required(VERSION 3.14)
 if(NOT ${CMAKE_VERSION} VERSION_LESS "3.1")
 	cmake_policy(SET CMP0054 NEW)
 endif()

From b31fd9862b911dbbbe92caa41740b1521991478a Mon Sep 17 00:00:00 2001
From: Kittywhiskers Van Gogh <63189531+kwvg@users.noreply.github.com>
Date: Tue, 17 Dec 2024 04:34:08 +0000
Subject: [PATCH 129/656] build: stop tracking cmake dependency relic_conf.h.in

---
 .../depends/relic/include/relic_conf.h.in     | 717 ------------------
 1 file changed, 717 deletions(-)
 delete mode 100644 src/dashbls/depends/relic/include/relic_conf.h.in

diff --git a/src/dashbls/depends/relic/include/relic_conf.h.in b/src/dashbls/depends/relic/include/relic_conf.h.in
deleted file mode 100644
index 7db6f5b509c4..000000000000
--- a/src/dashbls/depends/relic/include/relic_conf.h.in
+++ /dev/null
@@ -1,717 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2009 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Project configuration.
- *
- * @version $Id: relic_conf.h.in 45 2009-07-04 23:45:48Z dfaranha $
- * @ingroup relic
- */
-
-#ifndef RLC_CONF_H
-#define RLC_CONF_H
-
-/** Project version. */
-#define RLC_VERSION "@VERSION@"
-
-/** Debugging support. */
-#cmakedefine DEBUG
-/** Profiling support. */
-#cmakedefine PROFL
-/** Error handling support. */
-#cmakedefine CHECK
-/** Verbose error messages. */
-#cmakedefine VERBS
-/** Build with overhead estimation. */
-#cmakedefine OVERH
-/** Build documentation. */
-#cmakedefine DOCUM
-/** Build only the selected algorithms. */
-#cmakedefine STRIP
-/** Build with printing disabled. */
-#cmakedefine QUIET
-/** Build with colored output. */
-#cmakedefine COLOR
-/** Build with big-endian support. */
-#cmakedefine BIGED
-/** Build shared library. */
-#cmakedefine SHLIB
-/** Build static library. */
-#cmakedefine STLIB
-
-/** Number of times each test is ran. */
-#define TESTS    @TESTS@
-/** Number of times each benchmark is ran. */
-#define BENCH    @BENCH@
-/** Number of available cores. */
-#define CORES    @CORES@
-
-/** Atmel AVR ATMega128 8-bit architecture. */
-#define AVR      1
-/** MSP430 16-bit architecture. */
-#define MSP      2
-/** ARM 32-bit architecture. */
-#define ARM      3
-/** Intel x86-compatible 32-bit architecture. */
-#define X86      4
-/** AMD64-compatible 64-bit architecture. */
-#define X64      5
-/** Architecture. */
-#cmakedefine ARCH	 @ARCH@
-
-/** Size of word in this architecture. */
-#define WSIZE    @WSIZE@
-
-/** Byte boundary to align digit vectors. */
-#define ALIGN    @ALIGN@
-
-/** Build multiple precision integer module. */
-#cmakedefine WITH_BN
-/** Build prime field module. */
-#cmakedefine WITH_FP
-/** Build prime field extension module. */
-#cmakedefine WITH_FPX
-/** Build binary field module. */
-#cmakedefine WITH_FB
-/** Build prime elliptic curve module. */
-#cmakedefine WITH_EP
-/** Build prime field extension elliptic curve module. */
-#cmakedefine WITH_EPX
-/** Build binary elliptic curve module. */
-#cmakedefine WITH_EB
-/** Build elliptic Edwards curve module. */
-#cmakedefine WITH_ED
-/** Build elliptic curve cryptography module. */
-#cmakedefine WITH_EC
-/** Build pairings over prime curves module. */
-#cmakedefine WITH_PP
-/** Build pairing-based cryptography module. */
-#cmakedefine WITH_PC
-/** Build block ciphers. */
-#cmakedefine WITH_BC
-/** Build hash functions. */
-#cmakedefine WITH_MD
-/** Build cryptographic protocols. */
-#cmakedefine WITH_CP
-/** Build Multi-party computation primitives. */
-#cmakedefine WITH_MPC
-
-/** Easy C-only backend. */
-#define EASY	 1
-/** GMP backend. */
-#define GMP      2
-/** GMP constant-time backend. */
-#define GMP_SEC  3
-/** Arithmetic backend. */
-#define ARITH    @ARITH@
-
-/** Required precision in bits. */
-#define BN_PRECI @BN_PRECI@
-/** A multiple precision integer can store w words. */
-#define SINGLE	 0
-/** A multiple precision integer can store the result of an addition. */
-#define CARRY	 1
-/** A multiple precision integer can store the result of a multiplication. */
-#define DOUBLE	 2
-/** Effective size of a multiple precision integer. */
-#define BN_MAGNI @BN_MAGNI@
-/** Number of Karatsuba steps. */
-#define BN_KARAT @BN_KARAT@
-
-/** Schoolbook multiplication. */
-#define BASIC    1
-/** Comba multiplication. */
-#define COMBA    2
-/** Chosen multiple precision multiplication method. */
-#define BN_MUL   @BN_MUL@
-
-/** Schoolbook squaring. */
-#define BASIC    1
-/** Comba squaring. */
-#define COMBA    2
-/** Reuse multiplication for squaring. */
-#define MULTP    4
-/** Chosen multiple precision multiplication method. */
-#define BN_SQR   @BN_SQR@
-
-/** Division modular reduction. */
-#define BASIC    1
-/** Barrett modular reduction. */
-#define BARRT    2
-/** Montgomery modular reduction. */
-#define MONTY    3
-/** Pseudo-Mersenne modular reduction. */
-#define PMERS    4
-/** Chosen multiple precision modular reduction method. */
-#define BN_MOD   @BN_MOD@
-
-/** Binary modular exponentiation. */
-#define BASIC    1
-/** Sliding window modular exponentiation. */
-#define SLIDE    2
-/** Montgomery powering ladder. */
-#define MONTY    3
-/** Chosen multiple precision modular exponentiation method. */
-#define BN_MXP   @BN_MXP@
-
-/** Basic Euclidean GCD Algorithm. */
-#define BASIC    1
-/** Lehmer's fast GCD Algorithm. */
-#define LEHME    2
-/** Stein's binary GCD Algorithm. */
-#define STEIN    3
-/** Chosen multiple precision greatest common divisor method. */
-#define BN_GCD   @BN_GCD@
-
-/** Basic prime generation. */
-#define BASIC    1
-/** Safe prime generation. */
-#define SAFEP    2
-/** Strong prime generation. */
-#define STRON    3
-/** Chosen prime generation algorithm. */
-#define BN_GEN   @BN_GEN@
-
-/** Multiple precision arithmetic method */
-#define BN_METHD "@BN_METHD@"
-
-/** Prime field size in bits. */
-#define FP_PRIME @FP_PRIME@
-/** Number of Karatsuba steps. */
-#define FP_KARAT @FP_KARAT@
-/** Prefer Pseudo-Mersenne primes over random primes. */
-#cmakedefine FP_PMERS
-/** Use -1 as quadratic non-residue. */
-#cmakedefine FP_QNRES
-/** Width of window processing for exponentiation methods. */
-#define FP_WIDTH @FP_WIDTH@
-
-/** Schoolbook addition. */
-#define BASIC    1
-/** Integrated modular addtion. */
-#define INTEG    3
-/** Chosen prime field multiplication method. */
-#define FP_ADD   @FP_ADD@
-
-/** Schoolbook multiplication. */
-#define BASIC    1
-/** Comba multiplication. */
-#define COMBA    2
-/** Integrated modular multiplication. */
-#define INTEG    3
-/** Chosen prime field multiplication method. */
-#define FP_MUL   @FP_MUL@
-
-/** Schoolbook squaring. */
-#define BASIC    1
-/** Comba squaring. */
-#define COMBA    2
-/** Integrated modular squaring. */
-#define INTEG    3
-/** Reuse multiplication for squaring. */
-#define MULTP    4
-/** Chosen prime field multiplication method. */
-#define FP_SQR   @FP_SQR@
-
-/** Division-based reduction. */
-#define BASIC    1
-/** Fast reduction modulo special form prime. */
-#define QUICK    2
-/** Montgomery modular reduction. */
-#define MONTY    3
-/** Chosen prime field reduction method. */
-#define FP_RDC   @FP_RDC@
-
-/** Inversion by Fermat's Little Theorem. */
-#define BASIC    1
-/** Binary inversion. */
-#define BINAR    2
-/** Integrated modular multiplication. */
-#define MONTY    3
-/** Extended Euclidean algorithm. */
-#define EXGCD    4
-/** Constant-time inversion by Bernstein-Yang division steps. */
-#define DIVST    5
-/** Use implementation provided by the lower layer. */
-#define LOWER    8
-/** Chosen prime field inversion method. */
-#define FP_INV   @FP_INV@
-
-/** Binary modular exponentiation. */
-#define BASIC    1
-/** Sliding window modular exponentiation. */
-#define SLIDE    2
-/** Constant-time Montgomery powering ladder. */
-#define MONTY    3
-/** Chosen multiple precision modular exponentiation method. */
-#define FP_EXP   @FP_EXP@
-
-/** Prime field arithmetic method */
-#define FP_METHD "@FP_METHD@"
-
-/** Basic quadratic extension field arithmetic. */
-#define BASIC    1
-/** Integrated extension field arithmetic. */
-#define INTEG    3
-/* Chosen extension field arithmetic method. */
-#define FPX_QDR   @FPX_QDR@
-
-/** Basic cubic extension field arithmetic. */
-#define BASIC    1
-/** Integrated extension field arithmetic. */
-#define INTEG    3
-/* Chosen extension field arithmetic method. */
-#define FPX_CBC   @FPX_CBC@
-
-/** Basic quadratic extension field arithmetic. */
-#define BASIC    1
-/** Lazy-reduced extension field arithmetic. */
-#define LAZYR    2
-/* Chosen extension field arithmetic method. */
-#define FPX_RDC   @FPX_RDC@
-
-/** Prime extension field arithmetic method */
-#define FPX_METHD "@FPX_METHD@"
-
-/** Irreducible polynomial size in bits. */
-#define FB_POLYN @FB_POLYN@
-/** Number of Karatsuba steps. */
-#define FB_KARAT @FB_KARAT@
-/** Prefer trinomials over pentanomials. */
-#cmakedefine FB_TRINO
-/** Prefer square-root friendly polynomials. */
-#cmakedefine FB_SQRTF
-/** Precompute multiplication table for sqrt(z). */
-#cmakedefine FB_PRECO
-/** Width of window processing for exponentiation methods. */
-#define FB_WIDTH @FB_WIDTH@
-
-/** Shift-and-add multiplication. */
-#define BASIC    1
-/** Lopez-Dahab multiplication. */
-#define LODAH	 2
-/** Integrated modular multiplication. */
-#define INTEG	 3
-/** Chosen binary field multiplication method. */
-#define FB_MUL   @FB_MUL@
-
-/** Basic squaring. */
-#define BASIC    1
-/** Table-based squaring. */
-#define QUICK    2
-/** Integrated modular squaring. */
-#define INTEG	 3
-/** Chosen binary field squaring method. */
-#define FB_SQR   @FB_SQR@
-
-/** Shift-and-add modular reduction. */
-#define BASIC    1
-/** Fast reduction modulo a trinomial or pentanomial. */
-#define QUICK	 2
-/** Chosen binary field modular reduction method. */
-#define FB_RDC   @FB_RDC@
-
-/** Square root by repeated squaring. */
-#define BASIC    1
-/** Fast square root extraction. */
-#define QUICK	 2
-/** Chosen binary field modular reduction method. */
-#define FB_SRT   @FB_SRT@
-
-/** Trace by repeated squaring. */
-#define BASIC    1
-/** Fast trace computation. */
-#define QUICK	 2
-/** Chosen trace computation method. */
-#define FB_TRC   @FB_TRC@
-
-/** Solve by half-trace computation. */
-#define BASIC    1
-/** Solve with precomputed half-traces. */
-#define QUICK	 2
-/** Chosen method to solve a quadratic equation. */
-#define FB_SLV   @FB_SLV@
-
-/** Inversion by Fermat's Little Theorem. */
-#define BASIC    1
-/** Binary inversion. */
-#define BINAR    2
-/** Almost inverse algorithm. */
-#define ALMOS    3
-/** Extended Euclidean algorithm. */
-#define EXGCD    4
-/** Itoh-Tsuji inversion. */
-#define ITOHT    5
-/** Hardware-friendly inversion by Brunner-Curiger-Hofstetter.*/
-#define BRUCH    6
-/** Constant-time version of almost inverse. */
-#define CTAIA    7
-/** Use implementation provided by the lower layer. */
-#define LOWER    8
-/** Chosen binary field inversion method. */
-#define FB_INV   @FB_INV@
-
-/** Binary modular exponentiation. */
-#define BASIC    1
-/** Sliding window modular exponentiation. */
-#define SLIDE    2
-/** Constant-time Montgomery powering ladder. */
-#define MONTY    3
-/** Chosen multiple precision modular exponentiation method. */
-#define FB_EXP   @FB_EXP@
-
-/** Iterated squaring/square-root by consecutive squaring/square-root. */
-#define BASIC    1
-/** Iterated squaring/square-root by table-based method. */
-#define QUICK	 2
-/** Chosen method to solve a quadratic equation. */
-#define FB_ITR   @FB_ITR@
-
-/** Binary field arithmetic method */
-#define FB_METHD "@FB_METHD@"
-
-/** Support for ordinary curves. */
-#cmakedefine EP_PLAIN
-/** Support for supersingular curves. */
-#cmakedefine EP_SUPER
-/** Support for prime curves with efficient endormorphisms. */
-#cmakedefine EP_ENDOM
-/** Use mixed coordinates. */
-#cmakedefine EP_MIXED
-/** Build precomputation table for generator. */
-#cmakedefine EP_PRECO
-/** Enable isogeny map for SSWU map-to-curve. */
-#cmakedefine EP_CTMAP
-/** Width of precomputation table for fixed point methods. */
-#define EP_DEPTH @EP_DEPTH@
-/** Width of window processing for unknown point methods. */
-#define EP_WIDTH @EP_WIDTH@
-
-/** Affine coordinates. */
-#define BASIC	 1
-/** Projective coordinates. */
-#define PROJC	 2
-/** Jacobian coordinates. */
-#define JACOB	 3
-/** Chosen prime elliptic curve coordinate method. */
-#define EP_ADD	 @EP_ADD@
-
-/** Binary point multiplication. */
-#define BASIC	 1
-/** Sliding window. */
-#define SLIDE    2
-/** Montgomery powering ladder. */
-#define MONTY	 3
-/** Left-to-right Width-w NAF. */
-#define LWNAF	 4
-/** Left-to-right Width-w NAF. */
-#define LWREG	 5
-/** Chosen prime elliptic curve point multiplication method. */
-#define EP_MUL	 @EP_MUL@
-
-/** Binary point multiplication. */
-#define BASIC	 1
-/** Single-table comb method. */
-#define COMBS	 2
-/** Double-table comb method. */
-#define COMBD    3
-/** Left-to-right Width-w NAF. */
-#define LWNAF	 4
-/** Chosen prime elliptic curve point multiplication method. */
-#define EP_FIX	 @EP_FIX@
-
-/** Basic simultaneouns point multiplication. */
-#define BASIC    1
-/** Shamir's trick. */
-#define TRICK    2
-/** Interleaving of w-(T)NAFs. */
-#define INTER    3
-/** Joint sparse form. */
-#define JOINT    4
-/** Chosen prime elliptic curve simulteanous point multiplication method. */
-#define EP_SIM   @EP_SIM@
-
-/** Prime elliptic curve arithmetic method. */
-#define EP_METHD "@EP_METHD@"
-
-/** Support for ordinary curves without endormorphisms. */
-#cmakedefine EB_PLAIN
-/** Support for Koblitz anomalous binary curves. */
-#cmakedefine EB_KBLTZ
-/** Use mixed coordinates. */
-#cmakedefine EB_MIXED
-/** Build precomputation table for generator. */
-#cmakedefine EB_PRECO
-/** Width of precomputation table for fixed point methods. */
-#define EB_DEPTH @EB_DEPTH@
-/** Width of window processing for unknown point methods. */
-#define EB_WIDTH @EB_WIDTH@
-
-/** Binary elliptic curve arithmetic method. */
-#define EB_METHD "@EB_METHD@"
-
-/** Affine coordinates. */
-#define BASIC	 1
-/** López-Dahab Projective coordinates. */
-#define PROJC	 2
-/** Chosen binary elliptic curve coordinate method. */
-#define EB_ADD	 @EB_ADD@
-
-/** Binary point multiplication. */
-#define BASIC	 1
-/** L�pez-Dahab point multiplication. */
-#define LODAH	 2
-/** Halving. */
-#define HALVE    3
-/** Left-to-right width-w (T)NAF. */
-#define LWNAF	 4
-/** Right-to-left width-w (T)NAF. */
-#define RWNAF	 5
-/** Chosen binary elliptic curve point multiplication method. */
-#define EB_MUL	 @EB_MUL@
-
-/** Binary point multiplication. */
-#define BASIC	 1
-/** Single-table comb method. */
-#define COMBS	 2
-/** Double-table comb method. */
-#define COMBD    3
-/** Left-to-right Width-w NAF. */
-#define LWNAF	 4
-/** Chosen binary elliptic curve point multiplication method. */
-#define EB_FIX	 @EB_FIX@
-
-/** Basic simultaneouns point multiplication. */
-#define BASIC    1
-/** Shamir's trick. */
-#define TRICK    2
-/** Interleaving of w-(T)NAFs. */
-#define INTER    3
-/** Joint sparse form. */
-#define JOINT    4
-/** Chosen binary elliptic curve simulteanous point multiplication method. */
-#define EB_SIM   @EB_SIM@
-
-/** Build precomputation table for generator. */
-#cmakedefine ED_PRECO
-/** Width of precomputation table for fixed point methods. */
-#define ED_DEPTH @ED_DEPTH@
-/** Width of window processing for unknown point methods. */
-#define ED_WIDTH @ED_WIDTH@
-
-/** Edwards elliptic curve arithmetic method. */
-#define ED_METHD "@ED_METHD@"
-
-/** Affine coordinates. */
-#define BASIC    1
-/** Simple projective twisted Edwards coordinates */
-#define PROJC	 2
-/** Extended projective twisted Edwards coordinates */
-#define EXTND	 3
-/** Chosen binary elliptic curve coordinate method. */
-#define ED_ADD	 @ED_ADD@
-
-/** Binary point multiplication. */
-#define BASIC	 1
-/** Sliding window. */
-#define SLIDE    2
-/** Montgomery powering ladder. */
-#define MONTY	 3
-/** Left-to-right Width-w NAF. */
-#define LWNAF	 4
-/** Left-to-right Width-w NAF. */
-#define LWREG	 5
-/** Chosen prime elliptic twisted Edwards curve point multiplication method. */
-#define ED_MUL	 @ED_MUL@
-
-/** Binary point multiplication. */
-#define BASIC	 1
-/** Single-table comb method. */
-#define COMBS	 2
-/** Double-table comb method. */
-#define COMBD    3
-/** Left-to-right Width-w NAF. */
-#define LWNAF	 4
-/** Chosen prime elliptic twisted Edwards curve point multiplication method. */
-#define ED_FIX	 @ED_FIX@
-
-/** Basic simultaneouns point multiplication. */
-#define BASIC    1
-/** Shamir's trick. */
-#define TRICK    2
-/** Interleaving of w-(T)NAFs. */
-#define INTER    3
-/** Joint sparse form. */
-#define JOINT    4
-/** Chosen prime elliptic curve simulteanous point multiplication method. */
-#define ED_SIM   @ED_SIM@
-
-/** Prime curves. */
-#define PRIME    1
-/** Binary curves. */
-#define CHAR2    2
-/** Edwards curves */
-#define EDDIE    3
-/** Chosen elliptic curve type. */
-#define EC_CUR	 @EC_CUR@
-
-/** Chosen elliptic curve cryptography method. */
-#define EC_METHD "@EC_METHD@"
-/** Prefer curves with efficient endomorphisms. */
-#cmakedefine EC_ENDOM
-
-/** Basic quadratic extension field arithmetic. */
-#define BASIC    1
-/** Lazy-reduced extension field arithmetic. */
-#define LAZYR    2
-/* Chosen extension field arithmetic method. */
-#define PP_EXT   @PP_EXT@
-
-/** Bilinear pairing method. */
-#define PP_METHD "@PP_METHD@"
-
-/** Tate pairing. */
-#define TATEP    1
-/** Weil pairing. */
-#define WEILP    2
-/** Optimal ate pairing. */
-#define OATEP    3
-/** Chosen pairing method over prime elliptic curves. */
-#define PP_MAP   @PP_MAP@
-
-/** SHA-224 hash function. */
-#define SH224          2
-/** SHA-256 hash function. */
-#define SH256          3
-/** SHA-384 hash function. */
-#define SH384          4
-/** SHA-512 hash function. */
-#define SH512          5
-/** BLAKE2s-160 hash function. */
-#define B2S160         6
-/** BLAKE2s-256 hash function. */
-#define B2S256         7
-/** Chosen hash function. */
-#define MD_MAP   @MD_MAP@
-
-/** Choice of hash function. */
-#define MD_METHD "@MD_METHD@"
-
-/** Chosen RSA method. */
-#cmakedefine CP_CRT
-/** RSA without padding. */
-#define BASIC    1
-/** RSA PKCS#1 v1.5 padding. */
-#define PKCS1    2
-/** RSA PKCS#1 v2.1 padding. */
-#define PKCS2    3
-/** Chosen RSA padding method. */
-#define CP_RSAPD @CP_RSAPD@
-
-/** Automatic memory allocation. */
-#define AUTO     1
-/** Dynamic memory allocation. */
-#define DYNAMIC  2
-/** Chosen memory allocation policy. */
-#define ALLOC    @ALLOC@
-
-/** NIST HASH-DRBG generator. */
-#define HASHD    1
-/** Intel RdRand instruction. */
-#define RDRND    2
-/** Operating system underlying generator. */
-#define UDEV     3
-/** Override library generator with the callback. */
-#define CALL     4
-/** Chosen random generator. */
-#define RAND     @RAND@
-
-/** Standard C library generator. */
-#define LIBC     1
-/** Intel RdRand instruction. */
-#define RDRND    2
-/** Device node generator. */
-#define UDEV     3
-/** Use Windows' CryptGenRandom. */
-#define WCGR     4
-/** Chosen random generator seeder. */
-#cmakedefine SEED     @SEED@
-
-/** GNU/Linux operating system. */
-#define LINUX    1
-/** FreeBSD operating system. */
-#define FREEBSD  2
-/** Windows operating system. */
-#define MACOSX   3
-/** Windows operating system. */
-#define WINDOWS  4
-/** Android operating system. */
-#define DROID    5
-/** Arduino platform. */
-#define DUINO    6
-/** OpenBSD operating system. */
-#define OPENBSD  7
-/** Detected operation system. */
-#cmakedefine OPSYS    @OPSYS@
-
-/** OpenMP multithreading support. */
-#define OPENMP   1
-/** POSIX multithreading support. */
-#define PTHREAD  2
-/** Chosen multithreading API. */
-#cmakedefine MULTI    @MULTI@
-
-/** Per-process high-resolution timer. */
-#define HREAL    1
-/** Per-process high-resolution timer. */
-#define HPROC    2
-/** Per-thread high-resolution timer. */
-#define HTHRD    3
-/** POSIX-compatible timer. */
-#define POSIX    4
-/** ANSI-compatible timer. */
-#define ANSI     5
-/** Cycle-counting timer. */
-#define CYCLE    6
-/** Performance monitoring framework. */
-#define PERF     7
-/** Chosen timer. */
-#cmakedefine TIMER    @TIMER@
-
-/** Prefix to identity this build of the library. */
-#cmakedefine LABEL    @LABEL@
-
-#ifndef ASM
-
-#include "relic_label.h"
-
-/**
- * Prints the project options selected at build time.
- */
-void conf_print(void);
-
-#endif /* ASM */
-
-#endif /* !RLC_CONF_H */

From f8d4a485bf9a3ed4f5e7a58c5785204ca941109a Mon Sep 17 00:00:00 2001
From: fanquake <fanquake@gmail.com>
Date: Wed, 22 Nov 2023 17:16:54 +0000
Subject: [PATCH 130/656] Merge bitcoin/bitcoin#28461: build: Windows SSP
 roundup

f95af98128f17002bf137a48441167020f3ef9bb guix: default ssp for Windows GCC (fanquake)
95d55b96c2cfd2a0d5a246d4a9eff9d0744ba223 guix: remove ssp workaround from Windows GCC (fanquake)
8f43302a0a1bb79129933e4cc174bf8d8d59ec15 build: remove explicit libssp linking from Windows build (fanquake)

Pull request description:

  I was expecting this to fail to compile somewhere, maybe in the CI, but that doesn't seem to be the case?
  Seems workable given the SSP related changes in the newer mingw-w64 headers (which are in Guix):
  > Implement some of the stack protector functions/variables so -lssp is now optional when _FORTIFY_SOURCE or -fstack-protector-strong is used.

  However I think this would still be broken in some older environments, so we might have to wait for a compiler bump, or similar. The optional -lssp also seems to work when using older headers, which doesn't make sense.

  Would fix #28104.

ACKs for top commit:
  hebasto:
    ACK f95af98128f17002bf137a48441167020f3ef9bb, I've verified binaries from `bitcoin-f95af98128f1-win64.zip` on Windows 11 Pro 23H2.
  TheCharlatan:
    ACK f95af98128f17002bf137a48441167020f3ef9bb

Tree-SHA512: 71169ec513cfe692dfa7741d2bf37b45da05627c0af1cbd50cf8c3c04cc21c4bf88f3284532bddc1e3e648391ec78dbaca5170987a13c21ac204a7bcaf27f349
---
 configure.ac              | 6 ------
 contrib/guix/manifest.scm | 8 ++------
 2 files changed, 2 insertions(+), 12 deletions(-)

diff --git a/configure.ac b/configure.ac
index e7cf3d2183dd..d216ffd04eba 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1119,12 +1119,6 @@ if test "$use_hardening" != "no"; then
   AX_CHECK_LINK_FLAG([-Wl,-z,now], [HARDENED_LDFLAGS="$HARDENED_LDFLAGS -Wl,-z,now"], [], [$LDFLAG_WERROR])
   AX_CHECK_LINK_FLAG([-Wl,-z,separate-code], [HARDENED_LDFLAGS="$HARDENED_LDFLAGS -Wl,-z,separate-code"], [], [$LDFLAG_WERROR])
   AX_CHECK_LINK_FLAG([-fPIE -pie], [PIE_FLAGS="-fPIE"; HARDENED_LDFLAGS="$HARDENED_LDFLAGS -pie"], [], [$CXXFLAG_WERROR])
-
-  case $host in
-    *mingw*)
-       AC_CHECK_LIB([ssp], [main], [], [AC_MSG_ERROR([libssp missing])])
-    ;;
-  esac
 fi
 
 dnl These flags are specific to ld64, and may cause issues with other linkers.
diff --git a/contrib/guix/manifest.scm b/contrib/guix/manifest.scm
index 62dd18f19b1d..aa613f443f82 100644
--- a/contrib/guix/manifest.scm
+++ b/contrib/guix/manifest.scm
@@ -431,12 +431,8 @@ inspecting signatures in Mach-O binaries.")
           `(append ,flags
             ;; https://gcc.gnu.org/install/configure.html
             (list "--enable-threads=posix",
-                  building-on)))
-        ((#:make-flags flags)
-          ;; Uses the SSP functions from glibc instead of from libssp.so.
-          ;; Our 'symbol-check' script will complain if we link against libssp.so,
-          ;; and thus will ensure that this works properly.
-          `(cons "gcc_cv_libc_provides_ssp=yes" ,flags))))))
+                  "--enable-default-ssp=yes",
+                  building-on)))))))
 
 (define-public linux-base-gcc
   (package

From d0eb2b50c5d1ba8b443a1ebb0dee3732107e4c7d Mon Sep 17 00:00:00 2001
From: UdjinM6 <UdjinM6@users.noreply.github.com>
Date: Tue, 14 Oct 2025 20:50:44 +0300
Subject: [PATCH 131/656] guix: avoid downloading macOS SDK for non-darwin
 target HOSTs

---
 contrib/containers/guix/scripts/guix-start | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/contrib/containers/guix/scripts/guix-start b/contrib/containers/guix/scripts/guix-start
index 50264c42d0ee..ee0be9d28550 100755
--- a/contrib/containers/guix/scripts/guix-start
+++ b/contrib/containers/guix/scripts/guix-start
@@ -9,10 +9,12 @@ if [[ ! -d "${WORKSPACE_PATH}" || ! "${WORKSPACE_PATH}" = /* || ! -f "${WORKSPAC
     exit 1
 fi
 
-export SDK_PATH="${SDK_PATH:-${WORKSPACE_PATH}/depends/SDKs}"
-export SDK_SRCS="${SDK_PATH:-${WORKSPACE_PATH}/depends/sdk-sources}"
+if [[ -z "${HOSTS}" || "${HOSTS}" == *"darwin"* ]]; then
+    export SDK_PATH="${SDK_PATH:-${WORKSPACE_PATH}/depends/SDKs}"
+    export SDK_SRCS="${SDK_PATH:-${WORKSPACE_PATH}/depends/sdk-sources}"
 
-./contrib/containers/guix/scripts/setup-sdk
+    ./contrib/containers/guix/scripts/setup-sdk
+fi
 
 # Add safe.directory option only when WORKSPACE_PATH was specified via cmd-line arguments (happens in CI)
 if [[ -n "${1}" ]]; then

From f0a2cec0cab204ac4352c03bdd25e777b36f1ad0 Mon Sep 17 00:00:00 2001
From: Konstantin Akimov <knstqq@gmail.com>
Date: Wed, 15 Oct 2025 03:14:49 +0700
Subject: [PATCH 132/656] refactor: drop dependency of spork on net_processing

---
 src/rpc/node.cpp                        |  8 ++--
 src/spork.cpp                           | 50 +++++++++++--------------
 src/spork.h                             | 11 ++----
 test/lint/lint-circular-dependencies.py |  1 -
 4 files changed, 29 insertions(+), 41 deletions(-)

diff --git a/src/rpc/node.cpp b/src/rpc/node.cpp
index 97d6188828b9..0140bc17aec6 100644
--- a/src/rpc/node.cpp
+++ b/src/rpc/node.cpp
@@ -19,6 +19,7 @@
 #include <interfaces/ipc.h>
 #include <key_io.h>
 #include <net.h>
+#include <net_processing.h>
 #include <node/context.h>
 #include <rpc/index_util.h>
 #include <rpc/server.h>
@@ -220,14 +221,15 @@ static RPCHelpMan sporkupdate()
     }
 
     const NodeContext& node = EnsureAnyNodeContext(request.context);
-    PeerManager& peerman = EnsurePeerman(node);
     CHECK_NONFATAL(node.sporkman);
 
     // SPORK VALUE
     int64_t nValue = request.params[1].getInt<int64_t>();
 
-    // broadcast new spork
-    if (node.sporkman->UpdateSpork(peerman, nSporkID, nValue)) {
+    auto inv{node.sporkman->UpdateSpork(nSporkID, nValue)};
+    if (inv.has_value()) {
+        PeerManager& peerman = EnsurePeerman(node);
+        peerman.RelayInv(inv.value());
         return "success";
     }
 
diff --git a/src/spork.cpp b/src/spork.cpp
index 0b66222d6911..9842e44226f6 100644
--- a/src/spork.cpp
+++ b/src/spork.cpp
@@ -10,7 +10,6 @@
 #include <logging.h>
 #include <messagesigner.h>
 #include <net.h>
-#include <net_processing.h>
 #include <netmessagemaker.h>
 #include <protocol.h>
 #include <script/standard.h>
@@ -206,37 +205,36 @@ void CSporkManager::ProcessGetSporks(CNode& peer, CConnman& connman)
 }
 
 
-bool CSporkManager::UpdateSpork(PeerManager& peerman, SporkId nSporkID, SporkValue nValue)
+std::optional<CInv> CSporkManager::UpdateSpork(SporkId nSporkID, SporkValue nValue)
 {
     CSporkMessage spork(nSporkID, nValue, GetAdjustedTime());
 
-    {
-        LOCK(cs);
+    LOCK(cs);
 
-        if (!spork.Sign(sporkPrivKey)) {
-            LogPrintf("CSporkManager::%s -- ERROR: signing failed for spork %d\n", __func__, nSporkID);
-            return false;
-        }
+    if (!spork.Sign(sporkPrivKey)) {
+        LogPrintf("CSporkManager::%s -- ERROR: signing failed for spork %d\n", __func__, nSporkID);
+        return std::nullopt;
+    }
 
-        auto opt_keyIDSigner = spork.GetSignerKeyID();
-        if (opt_keyIDSigner == std::nullopt || !setSporkPubKeyIDs.count(*opt_keyIDSigner)) {
-            LogPrintf("CSporkManager::UpdateSpork: failed to find keyid for private key\n");
-            return false;
-        }
+    auto opt_keyIDSigner = spork.GetSignerKeyID();
+    if (opt_keyIDSigner == std::nullopt || !setSporkPubKeyIDs.count(*opt_keyIDSigner)) {
+        LogPrintf("CSporkManager::UpdateSpork: failed to find keyid for private key\n");
+        return std::nullopt;
+    }
 
-        LogPrintf("CSporkManager::%s -- signed %d %s\n", __func__, nSporkID, spork.GetHash().ToString());
+    LogPrintf("CSporkManager::%s -- signed %d %s\n", __func__, nSporkID, spork.GetHash().ToString());
 
-        mapSporksByHash[spork.GetHash()] = spork;
-        mapSporksActive[nSporkID][*opt_keyIDSigner] = spork;
-        // Clear cached values on new spork being processed
+    mapSporksByHash[spork.GetHash()] = spork;
+    mapSporksActive[nSporkID][*opt_keyIDSigner] = spork;
+    // Clear cached values on new spork being processed
 
-        LOCK(cs_cache);
-        mapSporksCachedActive.erase(spork.nSporkID);
-        mapSporksCachedValues.erase(spork.nSporkID);
-    }
+    LOCK(cs_cache);
+    mapSporksCachedActive.erase(spork.nSporkID);
+    mapSporksCachedValues.erase(spork.nSporkID);
 
-    spork.Relay(peerman);
-    return true;
+
+    CInv inv(MSG_SPORK, spork.GetHash());
+    return inv;
 }
 
 bool CSporkManager::IsSporkActive(SporkId nSporkID) const
@@ -460,9 +458,3 @@ std::optional<CKeyID> CSporkMessage::GetSignerKeyID() const
 
     return {pubkeyFromSig.GetID()};
 }
-
-void CSporkMessage::Relay(PeerManager& peerman) const
-{
-    CInv inv(MSG_SPORK, GetHash());
-    peerman.RelayInv(inv);
-}
diff --git a/src/spork.h b/src/spork.h
index 5dde49cb4dbe..56ddd098d7ce 100644
--- a/src/spork.h
+++ b/src/spork.h
@@ -25,7 +25,6 @@ template<typename T>
 class CFlatDB;
 class CNode;
 class CDataStream;
-class PeerManager;
 
 class CSporkMessage;
 class CSporkManager;
@@ -151,11 +150,6 @@ class CSporkMessage
      * in order to identify which spork key signed this message.
      */
     std::optional<CKeyID> GetSignerKeyID() const;
-
-    /**
-     * Relay is used to send this spork message to other peers.
-     */
-    void Relay(PeerManager& peerman) const;
 };
 
 class SporkStore
@@ -278,9 +272,10 @@ class CSporkManager : public SporkStore
 
     /**
      * UpdateSpork is used by the spork RPC command to set a new spork value, sign
-     * and broadcast the spork message.
+     * and return the spork message, ready for network relay.
+     * It returns nullopt if nothing to relay
      */
-    bool UpdateSpork(PeerManager& peerman, SporkId nSporkID, SporkValue nValue) EXCLUSIVE_LOCKS_REQUIRED(!cs, !cs_cache);
+    std::optional<CInv> UpdateSpork(SporkId nSporkID, SporkValue nValue) EXCLUSIVE_LOCKS_REQUIRED(!cs, !cs_cache);
 
     /**
      * IsSporkActive returns a bool for time-based sporks, and should be used
diff --git a/test/lint/lint-circular-dependencies.py b/test/lint/lint-circular-dependencies.py
index 4934b002e1a9..4a294c80c81b 100755
--- a/test/lint/lint-circular-dependencies.py
+++ b/test/lint/lint-circular-dependencies.py
@@ -67,7 +67,6 @@
     "llmq/signing_shares -> net_processing -> llmq/signing_shares",
     "masternode/payments -> validation -> masternode/payments",
     "net -> netmessagemaker -> net",
-    "net_processing -> spork -> net_processing",
     "netaddress -> netbase -> netaddress",
     "qt/appearancewidget -> qt/guiutil -> qt/appearancewidget",
     "qt/bitcoinaddressvalidator -> qt/guiutil -> qt/bitcoinaddressvalidator",

From 0bb1f529fae467c5387651e263901da0bdb17921 Mon Sep 17 00:00:00 2001
From: MacroFake <falke.marco@gmail.com>
Date: Fri, 20 May 2022 18:43:04 +0100
Subject: [PATCH 133/656] Merge bitcoin/bitcoin#25175: refactor: Improve thread
 safety analysis by propagating some negative capabilities

2b3373c1520aa0b41277cd89956224e08cbd79dd refactor: Propagate negative `!m_tx_relay_mutex` capability (Hennadii Stepanov)
5a6e3c1db3e9d8ee2ecb0f0fe2fba073a442ad76 refactor: Propagate negative `!m_most_recent_block_mutex` capability (Hennadii Stepanov)

Pull request description:

  This PR is a follow-up for bitcoin/bitcoin#22778 and bitcoin/bitcoin#24062, and it seems [required](https://github.com/bitcoin/bitcoin/pull/24931#issuecomment-1132800173) for bitcoin/bitcoin#24931.

  See details in the commit messages.

ACKs for top commit:
  ajtowns:
    ACK 2b3373c1520aa0b41277cd89956224e08cbd79dd
  w0xlt:
    ACK https://github.com/bitcoin/bitcoin/pull/25175/commits/2b3373c1520aa0b41277cd89956224e08cbd79dd

Tree-SHA512: 8a4bb9641af8d79824ec12e2d6bfce0e09524094b298a2edcdb2ab115fbaa21215b9c97a6b059f8aa023551071fd5798eca66ab8d262a3f97246a91d960850d0
---
 src/net_processing.cpp | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/net_processing.cpp b/src/net_processing.cpp
index bee912118e31..d8fdc269836c 100644
--- a/src/net_processing.cpp
+++ b/src/net_processing.cpp
@@ -611,15 +611,16 @@ class PeerManagerImpl final : public PeerManager
         EXCLUSIVE_LOCKS_REQUIRED(!m_peer_mutex);
     void BlockChecked(const CBlock& block, const BlockValidationState& state) override
         EXCLUSIVE_LOCKS_REQUIRED(!m_peer_mutex);
-    void NewPoWValidBlock(const CBlockIndex *pindex, const std::shared_ptr<const CBlock>& pblock) override EXCLUSIVE_LOCKS_REQUIRED(!m_most_recent_block_mutex);
+    void NewPoWValidBlock(const CBlockIndex *pindex, const std::shared_ptr<const CBlock>& pblock) override
+        EXCLUSIVE_LOCKS_REQUIRED(!m_most_recent_block_mutex);
 
     /** Implement NetEventsInterface */
     void InitializeNode(CNode& node, ServiceFlags our_services) override EXCLUSIVE_LOCKS_REQUIRED(!m_peer_mutex);
     void FinalizeNode(const CNode& node) override EXCLUSIVE_LOCKS_REQUIRED(!m_peer_mutex);
     bool ProcessMessages(CNode* pfrom, std::atomic<bool>& interrupt) override
-        EXCLUSIVE_LOCKS_REQUIRED(!m_peer_mutex, !m_recent_confirmed_transactions_mutex, g_msgproc_mutex, !m_most_recent_block_mutex);
+        EXCLUSIVE_LOCKS_REQUIRED(!m_peer_mutex, !m_recent_confirmed_transactions_mutex, !m_most_recent_block_mutex, g_msgproc_mutex);
     bool SendMessages(CNode* pto) override
-        EXCLUSIVE_LOCKS_REQUIRED(!m_peer_mutex, !m_recent_confirmed_transactions_mutex, g_msgproc_mutex, !m_most_recent_block_mutex);
+        EXCLUSIVE_LOCKS_REQUIRED(!m_peer_mutex, !m_recent_confirmed_transactions_mutex, !m_most_recent_block_mutex, g_msgproc_mutex);
 
     /** Implement PeerManager */
     void StartScheduledTasks(CScheduler& scheduler) override;
@@ -639,7 +640,7 @@ class PeerManagerImpl final : public PeerManager
     void Misbehaving(const NodeId pnode, const int howmuch, const std::string& message = "") override EXCLUSIVE_LOCKS_REQUIRED(!m_peer_mutex);
     void ProcessMessage(CNode& pfrom, const std::string& msg_type, CDataStream& vRecv,
                         const std::chrono::microseconds time_received, const std::atomic<bool>& interruptMsgProc) override
-        EXCLUSIVE_LOCKS_REQUIRED(!m_peer_mutex, !m_recent_confirmed_transactions_mutex, g_msgproc_mutex, !m_most_recent_block_mutex);
+        EXCLUSIVE_LOCKS_REQUIRED(!m_peer_mutex, !m_recent_confirmed_transactions_mutex, !m_most_recent_block_mutex, g_msgproc_mutex);
     void UpdateLastBlockAnnounceTime(NodeId node, int64_t time_in_seconds) override;
     bool IsBanned(NodeId pnode) override EXCLUSIVE_LOCKS_REQUIRED(cs_main, !m_peer_mutex);
     size_t GetRequestedObjectCount(NodeId nodeid) const override EXCLUSIVE_LOCKS_REQUIRED(::cs_main);
@@ -1034,7 +1035,8 @@ class PeerManagerImpl final : public PeerManager
     /** Determine whether or not a peer can request a transaction, and return it (or nullptr if not found or not allowed). */
     CTransactionRef FindTxForGetData(const CNode* peer, const uint256& txid, const std::chrono::seconds mempool_req, const std::chrono::seconds now) LOCKS_EXCLUDED(cs_main);
 
-    void ProcessGetData(CNode& pfrom, Peer& peer, const std::atomic<bool>& interruptMsgProc) EXCLUSIVE_LOCKS_REQUIRED(peer.m_getdata_requests_mutex, !m_most_recent_block_mutex) LOCKS_EXCLUDED(::cs_main);
+    void ProcessGetData(CNode& pfrom, Peer& peer, const std::atomic<bool>& interruptMsgProc)
+        EXCLUSIVE_LOCKS_REQUIRED(!m_most_recent_block_mutex, peer.m_getdata_requests_mutex) LOCKS_EXCLUDED(::cs_main);
 
     /** Process a new block. Perform any post-processing housekeeping */
     void ProcessBlock(CNode& from, const std::shared_ptr<const CBlock>& pblock, bool force_processing);

From 20feacf7cdba6a1a682e78f65f9ed9e118da8b06 Mon Sep 17 00:00:00 2001
From: Andrew Chow <achow101-github@achow101.com>
Date: Wed, 15 Jun 2022 13:35:50 -0400
Subject: [PATCH 134/656] Merge bitcoin/bitcoin#25368: doc: Update
 importaddress mention incompatibility with descriptor wallet

e3609cdc01cf992800f28b20b0107b7fdc1f880e doc: Update importaddress mention incompatibility with descriptor wallet (BrokenProgrammer)

Pull request description:

  This is related to #25363 and offers a small update to the error messages from `EnsureLegacyScriptPubKeyMan` and `EnsureConstLegacyScriptPubKeyMan` to mention that they only are compatible with legacy wallets.

  The RPC documentation for `importaddress` is also updated to mention this as well as guide the user to the alternative `importdescriptors` for cases when using descriptor wallets.

  I'm thinking that we can introduce a "porting guide" document mentioned in #25363 in a separate PR since I would have to make myself more familiar with the subject before being able to tackle that.

ACKs for top commit:
  laanwj:
    Code review ACK e3609cdc01cf992800f28b20b0107b7fdc1f880e
  achow101:
    ACK e3609cdc01cf992800f28b20b0107b7fdc1f880e

Tree-SHA512: c7a924a7283fe59dc4e04c8c8fa034c15601f0b25eff09d975e98e2e8db5268ff470336b2d978d6916af9f782f9257b840d64bd15485b1742b4a8b8bfd0bb50f
---
 src/wallet/rpc/backup.cpp            |  6 +++---
 src/wallet/rpc/util.cpp              |  4 ++--
 test/functional/wallet_descriptor.py | 18 +++++++++---------
 3 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/src/wallet/rpc/backup.cpp b/src/wallet/rpc/backup.cpp
index 1e3cf53c5293..d0984b5264f6 100644
--- a/src/wallet/rpc/backup.cpp
+++ b/src/wallet/rpc/backup.cpp
@@ -205,15 +205,15 @@ RPCHelpMan abortrescan()
 RPCHelpMan importaddress()
 {
     return RPCHelpMan{"importaddress",
-        "\nAdds an address or script (in hex) that can be watched as if it were in your wallet but cannot be used to spend. Requires a new wallet backup.\n"
+    "\nAdds an address or script (in hex) that can be watched as if it were in your wallet but cannot be used to spend. Requires a new wallet backup.\n"
     "\nNote: This call can take over an hour to complete if rescan is true, during that time, other rpc calls\n"
     "may report that the imported address exists but related transactions are still missing, leading to temporarily incorrect/bogus balances and unspent outputs until rescan completes.\n"
     "If you have the full public key, you should call importpubkey instead of this.\n"
     "Hint: use importmulti to import more than one address.\n"
     "\nNote: If you import a non-standard raw script in hex form, outputs sending to it will be treated\n"
     "as change, and not show up in many RPCs.\n"
-    "Note: This command is only compatible with legacy wallets. Use \"importdescriptors\" for descriptor wallets.\n",
-        {
+    "Note: This command is only compatible with legacy wallets. Use \"importdescriptors\" with \"addr(X)\" for descriptor wallets.\n",
+    {
             {"address", RPCArg::Type::STR, RPCArg::Optional::NO, "The Dash address (or hex-encoded script)"},
             {"label", RPCArg::Type::STR, RPCArg::Default{""}, "An optional label"},
             {"rescan", RPCArg::Type::BOOL, RPCArg::Default{true}, "Rescan the wallet for transactions"},
diff --git a/src/wallet/rpc/util.cpp b/src/wallet/rpc/util.cpp
index cc795b2d7405..6ccd1d147135 100644
--- a/src/wallet/rpc/util.cpp
+++ b/src/wallet/rpc/util.cpp
@@ -100,7 +100,7 @@ LegacyScriptPubKeyMan& EnsureLegacyScriptPubKeyMan(CWallet& wallet, bool also_cr
         spk_man = wallet.GetOrCreateLegacyScriptPubKeyMan();
     }
     if (!spk_man) {
-        throw JSONRPCError(RPC_WALLET_ERROR, "This type of wallet does not support this command");
+        throw JSONRPCError(RPC_WALLET_ERROR, "Only legacy wallets are supported by this command");
     }
     return *spk_man;
 }
@@ -109,7 +109,7 @@ const LegacyScriptPubKeyMan& EnsureConstLegacyScriptPubKeyMan(const CWallet& wal
 {
     const LegacyScriptPubKeyMan* spk_man = wallet.GetLegacyScriptPubKeyMan();
     if (!spk_man) {
-        throw JSONRPCError(RPC_WALLET_ERROR, "This type of wallet does not support this command");
+        throw JSONRPCError(RPC_WALLET_ERROR, "Only legacy wallets are supported by this command");
     }
     return *spk_man;
 }
diff --git a/test/functional/wallet_descriptor.py b/test/functional/wallet_descriptor.py
index 4e76904d15ac..eba75ff94108 100755
--- a/test/functional/wallet_descriptor.py
+++ b/test/functional/wallet_descriptor.py
@@ -72,15 +72,15 @@ def run_test(self):
 
         # Make sure things are disabled
         self.log.info("Test disabled RPCs")
-        assert_raises_rpc_error(-4, "This type of wallet does not support this command", recv_wrpc.rpc.importprivkey, "cVpF924EspNh8KjYsfhgY96mmxvT6DgdWiTYMtMjuM74hJaU5psW")
-        assert_raises_rpc_error(-4, "This type of wallet does not support this command", recv_wrpc.rpc.importpubkey, send_wrpc.getaddressinfo(send_wrpc.getnewaddress()))
-        assert_raises_rpc_error(-4, "This type of wallet does not support this command", recv_wrpc.rpc.importaddress, recv_wrpc.getnewaddress())
-        assert_raises_rpc_error(-4, "This type of wallet does not support this command", recv_wrpc.rpc.importmulti, [])
-        assert_raises_rpc_error(-4, "This type of wallet does not support this command", recv_wrpc.rpc.addmultisigaddress, 1, [recv_wrpc.getnewaddress()])
-        assert_raises_rpc_error(-4, "This type of wallet does not support this command", recv_wrpc.rpc.dumpprivkey, recv_wrpc.getnewaddress())
-        assert_raises_rpc_error(-4, "This type of wallet does not support this command", recv_wrpc.rpc.dumpwallet, 'wallet.dump')
-        assert_raises_rpc_error(-4, "This type of wallet does not support this command", recv_wrpc.rpc.importwallet, 'wallet.dump')
-        assert_raises_rpc_error(-4, "This type of wallet does not support this command", recv_wrpc.rpc.sethdseed)
+        assert_raises_rpc_error(-4, "Only legacy wallets are supported by this command", recv_wrpc.rpc.importprivkey, "cVpF924EspNh8KjYsfhgY96mmxvT6DgdWiTYMtMjuM74hJaU5psW")
+        assert_raises_rpc_error(-4, "Only legacy wallets are supported by this command", recv_wrpc.rpc.importpubkey, send_wrpc.getaddressinfo(send_wrpc.getnewaddress()))
+        assert_raises_rpc_error(-4, "Only legacy wallets are supported by this command", recv_wrpc.rpc.importaddress, recv_wrpc.getnewaddress())
+        assert_raises_rpc_error(-4, "Only legacy wallets are supported by this command", recv_wrpc.rpc.importmulti, [])
+        assert_raises_rpc_error(-4, "Only legacy wallets are supported by this command", recv_wrpc.rpc.addmultisigaddress, 1, [recv_wrpc.getnewaddress()])
+        assert_raises_rpc_error(-4, "Only legacy wallets are supported by this command", recv_wrpc.rpc.dumpprivkey, recv_wrpc.getnewaddress())
+        assert_raises_rpc_error(-4, "Only legacy wallets are supported by this command", recv_wrpc.rpc.dumpwallet, 'wallet.dump')
+        assert_raises_rpc_error(-4, "Only legacy wallets are supported by this command", recv_wrpc.rpc.importwallet, 'wallet.dump')
+        assert_raises_rpc_error(-4, "Only legacy wallets are supported by this command", recv_wrpc.rpc.sethdseed)
 
         self.log.info("Test encryption")
         # Get the master fingerprint before encrypt

From 04999f41df7d90973e833c837a8ebf7ed37c190b Mon Sep 17 00:00:00 2001
From: laanwj <126646+laanwj@users.noreply.github.com>
Date: Wed, 22 Jun 2022 07:12:56 +0200
Subject: [PATCH 135/656] Merge bitcoin/bitcoin#24352: Add
 doc/design/libraries.md

dc1e7ad7a5713d885f70ccc6c93e7a4c07e76559 Add doc/design/libraries.md (Ryan Ofsky)

Pull request description:

  Prompted by the [libbitcoinkernel issue #24303](https://github.com/bitcoin/bitcoin/issues/24303) and PRs, I started looking at  existing libraries and what their dependencies are and wrote this document to describe them and where `libbitcoinkernel` fits in.

  Readable link is:  https://github.com/ryanofsky/bitcoin/blob/pr/libs/doc/design/libraries.md

  Feedback is welcome

ACKs for top commit:
  laanwj:
    ACK dc1e7ad7a5713d885f70ccc6c93e7a4c07e76559
  hebasto:
    Approach ACK dc1e7ad7a5713d885f70ccc6c93e7a4c07e76559, using this doc as a guide in https://github.com/hebasto/bitcoin/pull/3 :)

Tree-SHA512: 7687b1847797c50de1f5ea721bd201cc8304690064743fbe6d69e2198cc239084e9da7d158be65bea948a6ec3d71d74c84122c0e523c390b389b49ea8d2cddc9
---
 doc/README.md                    |   2 +-
 doc/{ => design}/assumeutxo.md   |   0
 doc/design/libraries.md          | 106 +++++++++++++++++++++++++++++++
 doc/{ => design}/multiprocess.md |   0
 src/chain.h                      |   2 +-
 5 files changed, 108 insertions(+), 2 deletions(-)
 rename doc/{ => design}/assumeutxo.md (100%)
 create mode 100644 doc/design/libraries.md
 rename doc/{ => design}/multiprocess.md (100%)

diff --git a/doc/README.md b/doc/README.md
index 89bf34b7df65..384ba6442f66 100644
--- a/doc/README.md
+++ b/doc/README.md
@@ -58,6 +58,7 @@ The Dash Core repo's [root README](/README.md) contains relevant information on
 - [BIPS](bips.md)
 - [Dnsseed Policy](dnsseed-policy.md)
 - [Benchmarking](benchmarking.md)
+- [Internal Design Docs](design/)
 
 ### Resources
 * See the [Dash Developer Documentation](https://dashcore.readme.io/)
@@ -68,7 +69,6 @@ The Dash Core repo's [root README](/README.md) contains relevant information on
 
 ### Miscellaneous
 - [Assets Attribution](assets-attribution.md)
-- [Assumeutxo design](assumeutxo.md)
 - [dash.conf Configuration File](dash-conf.md)
 - [CJDNS Support](cjdns.md)
 - [Files](files.md)
diff --git a/doc/assumeutxo.md b/doc/design/assumeutxo.md
similarity index 100%
rename from doc/assumeutxo.md
rename to doc/design/assumeutxo.md
diff --git a/doc/design/libraries.md b/doc/design/libraries.md
new file mode 100644
index 000000000000..548e8c861847
--- /dev/null
+++ b/doc/design/libraries.md
@@ -0,0 +1,106 @@
+# Libraries
+
+| Name                     | Description |
+|--------------------------|-------------|
+| *libbitcoin_cli*         | RPC client functionality used by *dash-cli* executable |
+| *libbitcoin_common*      | Home for common functionality shared by different executables and libraries. Similar to *libbitcoin_util*, but higher-level (see [Dependencies](#dependencies)). |
+| *libdash_consensus*      | Stable, backwards-compatible consensus functionality used by *libbitcoin_node* and *libbitcoin_wallet* and also exposed as a [shared library](../shared-libraries.md). |
+| *libbitcoinconsensus*    | Shared library build of static *libdash_consensus* library |
+| *libbitcoin_kernel*      | Consensus engine and support library used for validation by *libbitcoin_node* and also exposed as a [shared library](../shared-libraries.md). |
+| *libbitcoinqt*           | GUI functionality used by *dash-qt* and *dash-gui* executables |
+| *libbitcoin_ipc*         | IPC functionality used by *dash-node*, *dash-wallet*, *dash-gui* executables to communicate when [`--enable-multiprocess`](multiprocess.md) is used. |
+| *libbitcoin_node*        | P2P and RPC server functionality used by *dashd* and *dash-qt* executables. |
+| *libbitcoin_util*        | Home for common functionality shared by different executables and libraries. Similar to *libbitcoin_common*, but lower-level (see [Dependencies](#dependencies)). |
+| *libbitcoin_wallet*      | Wallet functionality used by *dashd* and *dash-wallet* executables. |
+| *libbitcoin_wallet_tool* | Lower-level wallet functionality used by *dash-wallet* executable. |
+| *libbitcoin_zmq*         | [ZeroMQ](../zmq.md) functionality used by *dashd* and *dash-qt* executables. |
+
+Note: libbitcoin_kernel is a subject to be backported & dashified.
+
+## Conventions
+
+- Most libraries are internal libraries and have APIs which are completely unstable! There are few or no restrictions on backwards compatibility or rules about external dependencies. Exceptions are *libdash_consensus* and *libdash_kernel* which have external interfaces documented at [../shared-libraries.md](../shared-libraries.md).
+
+- Generally each library should have a corresponding source directory and namespace. Source code organization is a work in progress, so it is true that some namespaces are applied inconsistently, and if you look at [`libbitcoin_*_SOURCES`](../../src/Makefile.am) lists you can see that many libraries pull in files from outside their source directory. But when working with libraries, it is good to follow a consistent pattern like:
+
+  - *libbitcoin_node* code lives in `src/node/` in the `node::` namespace
+  - *libbitcoin_wallet* code lives in `src/wallet/` in the `wallet::` namespace
+  - *libbitcoin_ipc* code lives in `src/ipc/` in the `ipc::` namespace
+  - *libbitcoin_util* code lives in `src/util/` in the `util::` namespace
+  - *libdash_consensus* code lives in `src/consensus/` in the `Consensus::` namespace
+
+## Dependencies
+
+- Libraries should minimize what other libraries they depend on, and only reference symbols following the arrows shown in the dependency graph below:
+
+<table><tr><td>
+
+```mermaid
+
+%%{ init : { "flowchart" : { "curve" : "linear" }}}%%
+
+graph TD;
+
+dash-cli[dash-cli]-->libbitcoin_cli;
+
+dashd[dashd]-->libbitcoin_node;
+dashd[dashd]-->libbitcoin_wallet;
+
+dash-qt[dash-qt]-->libbitcoin_node;
+dash-qt[dash-qt]-->libbitcoinqt;
+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_common-->libbitcoin_util;
+libbitcoin_common-->libdash_consensus;
+
+libbitcoin_kernel-->libdash_consensus;
+libbitcoin_kernel-->libbitcoin_util;
+
+libbitcoin_node-->libbitcoin_common;
+libbitcoin_node-->libdash_consensus;
+libbitcoin_node-->libbitcoin_kernel;
+libbitcoin_node-->libbitcoin_util;
+
+libbitcoinqt-->libbitcoin_common;
+libbitcoinqt-->libbitcoin_util;
+
+libbitcoin_wallet-->libbitcoin_common;
+libbitcoin_wallet-->libbitcoin_util;
+
+libbitcoin_wallet_tool-->libbitcoin_util;
+libbitcoin_wallet_tool-->libbitcoin_wallet;
+
+classDef bold stroke-width:2px, font-weight:bold, font-size: smaller;
+class dash-qt,dashd,dash-cli,dash-wallet bold
+```
+</td></tr><tr><td>
+
+**Dependency graph**. Arrows show linker symbol dependencies. *Consensus* lib depends on nothing. *Util* lib is depended on by everything. *Kernel* lib depends only on consensus and util.
+
+</td></tr></table>
+
+- The graph shows what _linker symbols_ (functions and variables) from each library other libraries can call and reference directly, but it is not a call graph. For example, there is no arrow connecting *libbitcoin_wallet* and *libbitcoin_node* libraries, because these libraries are intended to be modular and not depend on each other's internal implementation details. But wallet code still is still able to call node code indirectly through the `interfaces::Chain` abstract class in [`interfaces/chain.h`](../../src/interfaces/chain.h) and node code calls wallet code through the `interfaces::ChainClient` and `interfaces::Chain::Notifications` abstract classes in the same file. In general, defining abstract classes in [`src/interfaces/`](../../src/interfaces/) can be a convenient way of avoiding unwanted direct dependencies or circular dependencies between libraries.
+
+- *libdash_consensus* should be a standalone dependency that any library can depend on, and it should not depend on any other libraries itself.
+
+- *libbitcoin_util* should also be a standalone dependency that any library can depend on, and it should not depend on other internal libraries.
+
+- *libbitcoin_common* should serve a similar function as *libbitcoin_util* and be a place for miscellaneous code used by various daemon, GUI, and CLI applications and libraries to live. It should not depend on anything other than *libbitcoin_util* and *libdash_consensus*. The boundary between _util_ and _common_ is a little fuzzy but historically _util_ has been used for more generic, lower-level things like parsing hex, and _common_ has been used for bitcoin-specific, higher-level things like parsing base58. The difference between util and common is mostly important because *libbitcoin_kernel* is not supposed to depend on *libbitcoin_common*, only *libbitcoin_util*. In general, if it is ever unclear whether it is better to add code to *util* or *common*, it is probably better to add it to *common* unless it is very generically useful or useful particularly to include in the kernel.
+
+
+- *libbitcoin_kernel* should only depend on *libbitcoin_util* and *libdash_consensus*.
+
+- The only thing that should depend on *libbitcoin_kernel* internally should be *libbitcoin_node*. GUI and wallet libraries *libbitcoinqt* and *libbitcoin_wallet* in particular should not depend on *libbitcoin_kernel* and the unneeded functionality it would pull in, like block validation. To the extent that GUI and wallet code need scripting and signing functionality, they should be get able it from *libdash_consensus*, *libbitcoin_common*, and *libbitcoin_util*, instead of *libbitcoin_kernel*.
+
+- GUI, node, and wallet code internal implementations should all be independent of each other, and the *libbitcoinqt*, *libbitcoin_node*, *libbitcoin_wallet* libraries should never reference each other's symbols. They should only call each other through [`src/interfaces/`](`../../src/interfaces/`) abstract interfaces.
+
+## Work in progress
+
+- Validation code is moving from *libbitcoin_node* to *libbitcoin_kernel* as part of [The libbitcoinkernel Project #24303](https://github.com/bitcoin/bitcoin/issues/24303)
+- Source code organization is discussed in general in [Library source code organization #15732](https://github.com/bitcoin/bitcoin/issues/15732)
diff --git a/doc/multiprocess.md b/doc/design/multiprocess.md
similarity index 100%
rename from doc/multiprocess.md
rename to doc/design/multiprocess.md
diff --git a/src/chain.h b/src/chain.h
index 2fdac98e85c0..47d1e3096774 100644
--- a/src/chain.h
+++ b/src/chain.h
@@ -121,7 +121,7 @@ enum BlockStatus : uint32_t {
      * If set, this indicates that the block index entry is assumed-valid.
      * Certain diagnostics will be skipped in e.g. CheckBlockIndex().
      * It almost certainly means that the block's full validation is pending
-     * on a background chainstate. See `doc/assumeutxo.md`.
+     * on a background chainstate. See `doc/design/assumeutxo.md`.
      */
     BLOCK_ASSUMED_VALID      =   256,
 };

From 30750576504f25b85d7ad91bda4037d1cf7abb13 Mon Sep 17 00:00:00 2001
From: Suhas Daftuar <sdaftuar@gmail.com>
Date: Tue, 28 Jun 2022 10:53:02 -0400
Subject: [PATCH 136/656] Merge #25454: p2p: Avoid multiple getheaders messages
 in flight to the same peer

BACKPORT NOTE:
leftover commit 99f4785cad94657dcf349d00fdd6f1d44cac9bb0

Replace GetTime() with NodeClock in MaybeSendGetHeaders()
---
 src/net_processing.cpp | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/net_processing.cpp b/src/net_processing.cpp
index d8fdc269836c..101d453b2a72 100644
--- a/src/net_processing.cpp
+++ b/src/net_processing.cpp
@@ -416,7 +416,7 @@ struct Peer {
     std::deque<CInv> m_getdata_requests GUARDED_BY(m_getdata_requests_mutex);
 
     /** Time of the last getheaders message to this peer */
-    std::atomic<std::chrono::seconds> m_last_getheaders_timestamp GUARDED_BY(NetEventsInterface::g_msgproc_mutex){0s};
+    std::atomic<NodeClock::time_point> m_last_getheaders_timestamp GUARDED_BY(NetEventsInterface::g_msgproc_mutex){NodeSeconds{}};
 
     explicit Peer(NodeId id, ServiceFlags our_services)
         : m_id(id)
@@ -3019,10 +3019,11 @@ bool PeerManagerImpl::MaybeSendGetHeaders(CNode& pfrom, const std::string& msg_t
 
     const CNetMsgMaker msgMaker(pfrom.GetCommonVersion());
 
-    const auto current_time = GetTime<std::chrono::seconds>();
+    const auto current_time = NodeClock::now();
+
     // Only allow a new getheaders message to go out if we don't have a recent
     // one already in-flight
-    if (peer.m_last_getheaders_timestamp.load() < current_time - HEADERS_RESPONSE_TIME) {
+    if (current_time - peer.m_last_getheaders_timestamp.load() > HEADERS_RESPONSE_TIME) {
         m_connman.PushMessage(&pfrom, msgMaker.Make(msg_type, locator, uint256()));
         peer.m_last_getheaders_timestamp = current_time;
         return true;
@@ -4996,7 +4997,7 @@ void PeerManagerImpl::ProcessMessage(
 
         // Assume that this is in response to any outstanding getheaders
         // request we may have sent, and clear out the time of our last request
-        peer->m_last_getheaders_timestamp = 0s;
+        peer->m_last_getheaders_timestamp.store(NodeSeconds{});
 
         std::vector<CBlockHeader> headers;
 

From fefbe27ee49c471936569da3412bdca9741299a9 Mon Sep 17 00:00:00 2001
From: Kittywhiskers Van Gogh <63189531+kwvg@users.noreply.github.com>
Date: Mon, 6 Oct 2025 22:04:39 +0000
Subject: [PATCH 137/656] refactor: replace `Sign` functions with direct
 activeman call

We are discarding the value of `ObjName::Sign()` so we are assuming it
is always valid, let's codify that assumption with an assert, something
we generate should hold valid to ourselves.
---
 src/coinjoin/coinjoin.cpp         | 25 -------------------------
 src/coinjoin/coinjoin.h           | 11 +----------
 src/coinjoin/server.cpp           |  6 +++---
 src/governance/governance.cpp     |  4 ++--
 src/governance/object.cpp         | 10 ++--------
 src/governance/object.h           |  5 +++--
 src/governance/vote.cpp           | 11 -----------
 src/governance/vote.h             |  3 ---
 src/masternode/node.cpp           |  8 ++++++++
 src/masternode/node.h             |  1 +
 src/test/coinjoin_queue_tests.cpp |  2 +-
 11 files changed, 21 insertions(+), 65 deletions(-)

diff --git a/src/coinjoin/coinjoin.cpp b/src/coinjoin/coinjoin.cpp
index 07ddb2018090..d48239927f1a 100644
--- a/src/coinjoin/coinjoin.cpp
+++ b/src/coinjoin/coinjoin.cpp
@@ -16,7 +16,6 @@
 #include <bls/bls.h>
 #include <chainlock/chainlock.h>
 #include <instantsend/instantsend.h>
-#include <masternode/node.h>
 #include <masternode/sync.h>
 
 #include <string>
@@ -45,18 +44,6 @@ uint256 CCoinJoinQueue::GetSignatureHash() const
 }
 uint256 CCoinJoinQueue::GetHash() const { return SerializeHash(*this, SER_NETWORK, PROTOCOL_VERSION); }
 
-bool CCoinJoinQueue::Sign(const CActiveMasternodeManager& mn_activeman)
-{
-    uint256 hash = GetSignatureHash();
-    CBLSSignature sig = mn_activeman.Sign(hash, /*is_legacy=*/ false);
-    if (!sig.IsValid()) {
-        return false;
-    }
-    vchSig = sig.ToByteVector(false);
-
-    return true;
-}
-
 bool CCoinJoinQueue::CheckSignature(const CBLSPublicKey& blsPubKey) const
 {
     if (!CBLSSignature(Span{vchSig}, false).VerifyInsecure(blsPubKey, GetSignatureHash(), false)) {
@@ -84,18 +71,6 @@ uint256 CCoinJoinBroadcastTx::GetSignatureHash() const
     return SerializeHash(*this, SER_GETHASH, PROTOCOL_VERSION);
 }
 
-bool CCoinJoinBroadcastTx::Sign(const CActiveMasternodeManager& mn_activeman)
-{
-    uint256 hash = GetSignatureHash();
-    CBLSSignature sig = mn_activeman.Sign(hash, /*is_legacy=*/ false);
-    if (!sig.IsValid()) {
-        return false;
-    }
-    vchSig = sig.ToByteVector(false);
-
-    return true;
-}
-
 bool CCoinJoinBroadcastTx::CheckSignature(const CBLSPublicKey& blsPubKey) const
 {
     if (!CBLSSignature(Span{vchSig}, false).VerifyInsecure(blsPubKey, GetSignatureHash(), false)) {
diff --git a/src/coinjoin/coinjoin.h b/src/coinjoin/coinjoin.h
index d69d6c12d051..90d1fe2fe4a9 100644
--- a/src/coinjoin/coinjoin.h
+++ b/src/coinjoin/coinjoin.h
@@ -22,7 +22,6 @@
 #include <optional>
 #include <utility>
 
-class CActiveMasternodeManager;
 class CChainState;
 class CBLSPublicKey;
 class CBlockIndex;
@@ -209,14 +208,7 @@ class CCoinJoinQueue
 
     [[nodiscard]] uint256 GetHash() const;
     [[nodiscard]] uint256 GetSignatureHash() const;
-    /** Sign this mixing transaction
-     *  return true if all conditions are met:
-     *     1) we have an active Masternode,
-     *     2) we have a valid Masternode private key,
-     *     3) we signed the message successfully, and
-     *     4) we verified the message successfully
-     */
-    bool Sign(const CActiveMasternodeManager& mn_activeman);
+
     /// Check if we have a valid Masternode address
     [[nodiscard]] bool CheckSignature(const CBLSPublicKey& blsPubKey) const;
 
@@ -284,7 +276,6 @@ class CCoinJoinBroadcastTx
 
     [[nodiscard]] uint256 GetSignatureHash() const;
 
-    bool Sign(const CActiveMasternodeManager& mn_activeman);
     [[nodiscard]] bool CheckSignature(const CBLSPublicKey& blsPubKey) const;
 
     // Used only for unit tests
diff --git a/src/coinjoin/server.cpp b/src/coinjoin/server.cpp
index 70c5b4772109..86c8e67bc5cb 100644
--- a/src/coinjoin/server.cpp
+++ b/src/coinjoin/server.cpp
@@ -345,7 +345,7 @@ void CCoinJoinServer::CommitFinalTransaction()
     if (!m_dstxman.GetDSTX(hashTx)) {
         CCoinJoinBroadcastTx dstxNew(finalTransaction, m_mn_activeman.GetOutPoint(), m_mn_activeman.GetProTxHash(),
                                      GetAdjustedTime());
-        dstxNew.Sign(m_mn_activeman);
+        dstxNew.vchSig = m_mn_activeman.SignBasic(dstxNew.GetSignatureHash());
         m_dstxman.AddDSTX(dstxNew);
     }
 
@@ -504,7 +504,7 @@ void CCoinJoinServer::CheckForCompleteQueue()
                            GetAdjustedTime(), true);
         LogPrint(BCLog::COINJOIN, "CCoinJoinServer::CheckForCompleteQueue -- queue is ready, signing and relaying (%s) " /* Continued */
                                      "with %d participants\n", dsq.ToString(), vecSessionCollaterals.size());
-        dsq.Sign(m_mn_activeman);
+        dsq.vchSig = m_mn_activeman.SignBasic(dsq.GetSignatureHash());
         m_peerman.RelayDSQ(dsq);
         WITH_LOCK(cs_vecqueue, vecCoinJoinQueue.push_back(dsq));
     }
@@ -714,7 +714,7 @@ bool CCoinJoinServer::CreateNewSession(const CCoinJoinAccept& dsa, PoolMessage&
         CCoinJoinQueue dsq(nSessionDenom, m_mn_activeman.GetOutPoint(), m_mn_activeman.GetProTxHash(),
                            GetAdjustedTime(), false);
         LogPrint(BCLog::COINJOIN, "CCoinJoinServer::CreateNewSession -- signing and relaying new queue: %s\n", dsq.ToString());
-        dsq.Sign(m_mn_activeman);
+        dsq.vchSig = m_mn_activeman.SignBasic(dsq.GetSignatureHash());
         m_peerman.RelayDSQ(dsq);
         LOCK(cs_vecqueue);
         vecCoinJoinQueue.push_back(dsq);
diff --git a/src/governance/governance.cpp b/src/governance/governance.cpp
index 3cc1d9ac34e8..cf3f2604c1d1 100644
--- a/src/governance/governance.cpp
+++ b/src/governance/governance.cpp
@@ -732,7 +732,7 @@ std::optional<const CGovernanceObject> CGovernanceManager::CreateGovernanceTrigg
         return std::nullopt;
     }
     gov_sb.SetMasternodeOutpoint(mn_activeman.GetOutPoint());
-    gov_sb.Sign(mn_activeman);
+    gov_sb.SetSignature(mn_activeman.SignBasic(gov_sb.GetSignatureHash()));
 
     if (std::string strError; !gov_sb.IsValidLocally(m_dmnman->GetListAtChainTip(), m_chainman, strError, true)) {
         LogPrint(BCLog::GOBJECT, "CGovernanceManager::%s Created trigger is invalid:%s\n", __func__, strError);
@@ -841,7 +841,7 @@ bool CGovernanceManager::VoteFundingTrigger(const uint256& nHash, const vote_out
 {
     CGovernanceVote vote(mn_activeman.GetOutPoint(), nHash, VOTE_SIGNAL_FUNDING, outcome);
     vote.SetTime(GetAdjustedTime());
-    vote.Sign(mn_activeman);
+    vote.SetSignature(mn_activeman.SignBasic(vote.GetSignatureHash()));
 
     CGovernanceException exception;
     if (!ProcessVoteAndRelay(vote, exception, connman, peerman)) {
diff --git a/src/governance/object.cpp b/src/governance/object.cpp
index 8945ec62f7fa..2e4dbfbe43e3 100644
--- a/src/governance/object.cpp
+++ b/src/governance/object.cpp
@@ -12,7 +12,6 @@
 #include <governance/validators.h>
 #include <index/txindex.h>
 #include <masternode/meta.h>
-#include <masternode/node.h>
 #include <masternode/sync.h>
 #include <net_processing.h>
 #include <timedata.h>
@@ -244,14 +243,9 @@ void CGovernanceObject::SetMasternodeOutpoint(const COutPoint& outpoint)
     m_obj.masternodeOutpoint = outpoint;
 }
 
-bool CGovernanceObject::Sign(const CActiveMasternodeManager& mn_activeman)
+void CGovernanceObject::SetSignature(Span<const uint8_t> sig)
 {
-    CBLSSignature sig = mn_activeman.Sign(GetSignatureHash(), false);
-    if (!sig.IsValid()) {
-        return false;
-    }
-    m_obj.vchSig = sig.ToByteVector(false);
-    return true;
+    m_obj.vchSig.assign(sig.begin(), sig.end());
 }
 
 bool CGovernanceObject::CheckSignature(const CBLSPublicKey& pubKey) const
diff --git a/src/governance/object.h b/src/governance/object.h
index 66324a75d62b..34ebaa4efa99 100644
--- a/src/governance/object.h
+++ b/src/governance/object.h
@@ -11,9 +11,10 @@
 #include <governance/votedb.h>
 #include <sync.h>
 
+#include <span.h>
+
 #include <univalue.h>
 
-class CActiveMasternodeManager;
 class CBLSPublicKey;
 class CDeterministicMNList;
 class CGovernanceManager;
@@ -221,7 +222,7 @@ class CGovernanceObject
     // Signature related functions
 
     void SetMasternodeOutpoint(const COutPoint& outpoint);
-    bool Sign(const CActiveMasternodeManager& mn_activeman);
+    void SetSignature(Span<const uint8_t> sig);
     bool CheckSignature(const CBLSPublicKey& pubKey) const;
 
     uint256 GetSignatureHash() const;
diff --git a/src/governance/vote.cpp b/src/governance/vote.cpp
index 57c6e5d69ffd..a20d2afc246d 100644
--- a/src/governance/vote.cpp
+++ b/src/governance/vote.cpp
@@ -8,7 +8,6 @@
 #include <chainparams.h>
 #include <evo/deterministicmns.h>
 #include <evo/dmn_types.h>
-#include <masternode/node.h>
 #include <masternode/sync.h>
 #include <messagesigner.h>
 #include <net_processing.h>
@@ -158,16 +157,6 @@ bool CGovernanceVote::CheckSignature(const CKeyID& keyID) const
     return true;
 }
 
-bool CGovernanceVote::Sign(const CActiveMasternodeManager& mn_activeman)
-{
-    CBLSSignature sig = mn_activeman.Sign(GetSignatureHash(), false);
-    if (!sig.IsValid()) {
-        return false;
-    }
-    vchSig = sig.ToByteVector(false);
-    return true;
-}
-
 bool CGovernanceVote::CheckSignature(const CBLSPublicKey& pubKey) const
 {
     CBLSSignature sig;
diff --git a/src/governance/vote.h b/src/governance/vote.h
index 6d2388a132af..25f62a4408a9 100644
--- a/src/governance/vote.h
+++ b/src/governance/vote.h
@@ -10,7 +10,6 @@
 #include <uint256.h>
 #include <util/string.h>
 
-class CActiveMasternodeManager;
 class CBLSPublicKey;
 class CDeterministicMNList;
 class CGovernanceVote;
@@ -97,9 +96,7 @@ class CGovernanceVote
 
     void SetSignature(const std::vector<unsigned char>& vchSigIn) { vchSig = vchSigIn; }
 
-    bool Sign(const CKey& key, const CKeyID& keyID);
     bool CheckSignature(const CKeyID& keyID) const;
-    bool Sign(const CActiveMasternodeManager& mn_activeman);
     bool CheckSignature(const CBLSPublicKey& pubKey) const;
     bool IsValid(const CDeterministicMNList& tip_mn_list, bool useVotingKey) const;
     std::string GetSignatureString() const
diff --git a/src/masternode/node.cpp b/src/masternode/node.cpp
index 5399ab47ba14..2f0f69238871 100644
--- a/src/masternode/node.cpp
+++ b/src/masternode/node.cpp
@@ -276,6 +276,14 @@ template bool CActiveMasternodeManager::Decrypt(const CBLSIESMultiRecipientObjec
     return WITH_READ_LOCK(cs, return m_info.blsKeyOperator.Sign(hash, is_legacy));
 }
 
+[[nodiscard]] std::vector<uint8_t> CActiveMasternodeManager::SignBasic(const uint256& hash) const
+{
+    AssertLockNotHeld(cs);
+    auto sig = Sign(hash, /*is_legacy=*/false);
+    assert(sig.IsValid());
+    return sig.ToByteVector(/*specificLegacyScheme=*/false);
+}
+
 // We need to pass a copy as opposed to a const ref because CBLSPublicKeyVersionWrapper
 // does not accept a const ref in its construction args
 [[nodiscard]] CBLSPublicKey CActiveMasternodeManager::GetPubKey() const
diff --git a/src/masternode/node.h b/src/masternode/node.h
index 931233c42f72..656fafd77e95 100644
--- a/src/masternode/node.h
+++ b/src/masternode/node.h
@@ -66,6 +66,7 @@ class CActiveMasternodeManager
     [[nodiscard]] bool Decrypt(const EncryptedObj<Obj>& obj, size_t idx, Obj& ret_obj, int version) const
         EXCLUSIVE_LOCKS_REQUIRED(!cs);
     [[nodiscard]] CBLSSignature Sign(const uint256& hash, const bool is_legacy) const EXCLUSIVE_LOCKS_REQUIRED(!cs);
+    [[nodiscard]] std::vector<uint8_t> SignBasic(const uint256& hash) const EXCLUSIVE_LOCKS_REQUIRED(!cs);
 
     /* TODO: Reconsider external locking */
     [[nodiscard]] COutPoint GetOutPoint() const { READ_LOCK(cs); return m_info.outpoint; }
diff --git a/src/test/coinjoin_queue_tests.cpp b/src/test/coinjoin_queue_tests.cpp
index 55323a5a37ad..fda668146477 100644
--- a/src/test/coinjoin_queue_tests.cpp
+++ b/src/test/coinjoin_queue_tests.cpp
@@ -34,7 +34,7 @@ BOOST_AUTO_TEST_CASE(queue_sign_and_verify)
     q.fReady = false;
 
     // Sign and verify with corresponding pubkey
-    BOOST_CHECK(q.Sign(mn_activeman));
+    q.vchSig = mn_activeman.SignBasic(q.GetSignatureHash());
     const CBLSPublicKey pub = mn_activeman.GetPubKey();
     BOOST_CHECK(q.CheckSignature(pub));
 }

From 2b74e152cf77bbdb26386d7d666340b2d8617dac Mon Sep 17 00:00:00 2001
From: Kittywhiskers Van Gogh <63189531+kwvg@users.noreply.github.com>
Date: Fri, 3 Oct 2025 11:47:11 +0000
Subject: [PATCH 138/656] refactor: move masternode mode logic to
 `governance/signing.cpp`

Review with `git log -p -n1 --color-moved=dimmed_zebra`.
---
 src/Makefile.am               |   1 +
 src/governance/governance.cpp | 270 -------------------------------
 src/governance/signing.cpp    | 288 ++++++++++++++++++++++++++++++++++
 3 files changed, 289 insertions(+), 270 deletions(-)
 create mode 100644 src/governance/signing.cpp

diff --git a/src/Makefile.am b/src/Makefile.am
index 9ad66b87a276..e2a817d65680 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -510,6 +510,7 @@ libbitcoin_node_a_SOURCES = \
   governance/exceptions.cpp \
   governance/governance.cpp \
   governance/object.cpp \
+  governance/signing.cpp \
   governance/validators.cpp \
   governance/vote.cpp \
   governance/votedb.cpp \
diff --git a/src/governance/governance.cpp b/src/governance/governance.cpp
index cf3f2604c1d1..af1451ea3835 100644
--- a/src/governance/governance.cpp
+++ b/src/governance/governance.cpp
@@ -592,276 +592,6 @@ struct sortProposalsByVotes {
     }
 };
 
-std::optional<const CSuperblock> CGovernanceManager::CreateSuperblockCandidate(int nHeight) const
-{
-    if (!IsValid()) return std::nullopt;
-    if (!m_mn_sync.IsSynced()) return std::nullopt;
-    if (nHeight % Params().GetConsensus().nSuperblockCycle < Params().GetConsensus().nSuperblockCycle - Params().GetConsensus().nSuperblockMaturityWindow) return std::nullopt;
-    if (HasAlreadyVotedFundingTrigger()) return std::nullopt;
-
-    // A proposal is considered passing if (YES votes) >= (Total Weight of Masternodes / 10),
-    // count total valid (ENABLED) masternodes to determine passing threshold.
-    const auto tip_mn_list = Assert(m_dmnman)->GetListAtChainTip();
-    const int nWeightedMnCount = tip_mn_list.GetValidWeightedMNsCount();
-    const int nAbsVoteReq = std::max(Params().GetConsensus().nGovernanceMinQuorum, nWeightedMnCount / 10);
-
-    // Use std::vector of std::shared_ptr<const CGovernanceObject> because CGovernanceObject doesn't support move operations (needed for sorting the vector later)
-    std::vector<std::shared_ptr<const CGovernanceObject>> approvedProposals;
-
-    {
-        LOCK(cs);
-        for (const auto& [unused, object] : mapObjects) {
-            // Skip all non-proposals objects
-            if (object.GetObjectType() != GovernanceObject::PROPOSAL) continue;
-
-            const int absYesCount = object.GetAbsoluteYesCount(tip_mn_list, VOTE_SIGNAL_FUNDING);
-            // Skip non-passing proposals
-            if (absYesCount < nAbsVoteReq) continue;
-
-            approvedProposals.emplace_back(std::make_shared<const CGovernanceObject>(object));
-        }
-    } // cs
-
-    // Sort approved proposals by absolute Yes votes descending
-    std::sort(approvedProposals.begin(), approvedProposals.end(), [tip_mn_list](std::shared_ptr<const CGovernanceObject> a, std::shared_ptr<const CGovernanceObject> b) {
-        const auto a_yes = a->GetAbsoluteYesCount(tip_mn_list, VOTE_SIGNAL_FUNDING);
-        const auto b_yes = b->GetAbsoluteYesCount(tip_mn_list, VOTE_SIGNAL_FUNDING);
-        return a_yes == b_yes ? UintToArith256(a->GetHash()) > UintToArith256(b->GetHash()) : a_yes > b_yes;
-    });
-
-    if (approvedProposals.empty()) {
-        LogPrint(BCLog::GOBJECT, "CGovernanceManager::%s nHeight:%d empty approvedProposals\n", __func__, nHeight);
-        return std::nullopt;
-    }
-
-    std::vector<CGovernancePayment> payments;
-    int nLastSuperblock;
-    int nNextSuperblock;
-
-    CSuperblock::GetNearestSuperblocksHeights(nHeight, nLastSuperblock, nNextSuperblock);
-    auto SBEpochTime = static_cast<int64_t>(GetTime<std::chrono::seconds>().count() + (nNextSuperblock - nHeight) * 2.62 * 60);
-    auto governanceBudget = CSuperblock::GetPaymentsLimit(m_chainman.ActiveChain(), nNextSuperblock);
-
-    CAmount budgetAllocated{};
-    for (const auto& proposal : approvedProposals) {
-        // Extract payment address and amount from proposal
-        UniValue jproposal = proposal->GetJSONObject();
-
-        CTxDestination dest = DecodeDestination(jproposal["payment_address"].getValStr());
-        if (!IsValidDestination(dest)) continue;
-
-        CAmount nAmount{};
-        try {
-            nAmount = ParsePaymentAmount(jproposal["payment_amount"].getValStr());
-        }
-        catch (const std::runtime_error& e) {
-            LogPrint(BCLog::GOBJECT, "CGovernanceManager::%s nHeight:%d Skipping payment exception:%s\n", __func__,nHeight, e.what());
-            continue;
-        }
-
-        // Construct CGovernancePayment object and make sure it is valid
-        CGovernancePayment payment(dest, nAmount, proposal->GetHash());
-        if (!payment.IsValid()) continue;
-
-        // Skip proposals that are too expensive
-        if (budgetAllocated + payment.nAmount > governanceBudget) continue;
-
-        int64_t windowStart = jproposal["start_epoch"].getInt<int64_t>() - GOVERNANCE_FUDGE_WINDOW;
-        int64_t windowEnd = jproposal["end_epoch"].getInt<int64_t>() + GOVERNANCE_FUDGE_WINDOW;
-
-        // Skip proposals if the SB isn't within the proposal time window
-        if (SBEpochTime < windowStart) {
-            LogPrint(BCLog::GOBJECT, "CGovernanceManager::%s nHeight:%d SB:%d windowStart:%d\n", __func__,nHeight, SBEpochTime, windowStart);
-            continue;
-        }
-        if (SBEpochTime > windowEnd) {
-            LogPrint(BCLog::GOBJECT, "CGovernanceManager::%s nHeight:%d SB:%d windowEnd:%d\n", __func__,nHeight, SBEpochTime, windowEnd);
-            continue;
-        }
-
-        // Keep track of total budget allocation
-        budgetAllocated += payment.nAmount;
-
-        // Add the payment
-        payments.push_back(payment);
-    }
-
-    // No proposals made the cut
-    if (payments.empty()) {
-        LogPrint(BCLog::GOBJECT, "CGovernanceManager::%s CreateSuperblockCandidate nHeight:%d empty payments\n", __func__, nHeight);
-        return std::nullopt;
-    }
-
-    // Sort by proposal hash descending
-    std::sort(payments.begin(), payments.end(), [](const CGovernancePayment& a, const CGovernancePayment& b) {
-        return UintToArith256(a.proposalHash) > UintToArith256(b.proposalHash);
-    });
-
-    // Create Superblock
-    return CSuperblock(nNextSuperblock, std::move(payments));
-}
-
-std::optional<const CGovernanceObject> CGovernanceManager::CreateGovernanceTrigger(const std::optional<const CSuperblock>& sb_opt, PeerManager& peerman,
-                                                                                   const CActiveMasternodeManager& mn_activeman)
-{
-    // no sb_opt, no trigger
-    if (!sb_opt.has_value()) return std::nullopt;
-
-    //TODO: Check if nHashParentIn, nRevision and nCollateralHashIn are correct
-    LOCK2(::cs_main, cs);
-
-    // Check if identical trigger (equal DataHash()) is already created (signed by other masternode)
-    CGovernanceObject gov_sb(uint256(), 1, GetAdjustedTime(), uint256(), sb_opt.value().GetHexStrData());
-    if (auto identical_sb = FindGovernanceObjectByDataHash(gov_sb.GetDataHash())) {
-        // Somebody submitted a trigger with the same data, support it instead of submitting a duplicate
-        return std::make_optional<CGovernanceObject>(*identical_sb);
-    }
-
-    // Nobody submitted a trigger we'd like to see, so let's do it but only if we are the payee
-    const CBlockIndex* tip = m_chainman.ActiveChain().Tip();
-    const auto mnList = Assert(m_dmnman)->GetListForBlock(tip);
-    const auto mn_payees = mnList.GetProjectedMNPayees(tip);
-
-    if (mn_payees.empty()) {
-        LogPrint(BCLog::GOBJECT, "CGovernanceManager::%s payee list is empty\n", __func__);
-        return std::nullopt;
-    }
-
-    if (mn_payees.front()->proTxHash != mn_activeman.GetProTxHash()) {
-        LogPrint(BCLog::GOBJECT, "CGovernanceManager::%s we are not the payee, skipping\n", __func__);
-        return std::nullopt;
-    }
-    gov_sb.SetMasternodeOutpoint(mn_activeman.GetOutPoint());
-    gov_sb.SetSignature(mn_activeman.SignBasic(gov_sb.GetSignatureHash()));
-
-    if (std::string strError; !gov_sb.IsValidLocally(m_dmnman->GetListAtChainTip(), m_chainman, strError, true)) {
-        LogPrint(BCLog::GOBJECT, "CGovernanceManager::%s Created trigger is invalid:%s\n", __func__, strError);
-        return std::nullopt;
-    }
-
-    if (!MasternodeRateCheck(gov_sb)) {
-        LogPrint(BCLog::GOBJECT, "CGovernanceManager::%s Trigger rejected because of rate check failure hash(%s)\n", __func__, gov_sb.GetHash().ToString());
-        return std::nullopt;
-    }
-
-    // The trigger we just created looks good, submit it
-    AddGovernanceObject(gov_sb, peerman);
-    return std::make_optional<CGovernanceObject>(gov_sb);
-}
-
-void CGovernanceManager::VoteGovernanceTriggers(const std::optional<const CGovernanceObject>& trigger_opt, CConnman& connman, PeerManager& peerman,
-                                                const CActiveMasternodeManager& mn_activeman)
-{
-    // only active masternodes can vote on triggers
-    if (mn_activeman.GetProTxHash().IsNull()) return;
-
-    LOCK2(::cs_main, cs);
-
-    if (trigger_opt.has_value()) {
-        // We should never vote "yes" on another trigger or the same trigger twice
-        assert(!votedFundingYesTriggerHash.has_value());
-        // Vote YES-FUNDING for the trigger we like, unless we already did
-        const uint256 gov_sb_hash = trigger_opt.value().GetHash();
-        bool voted_already{false};
-        if (vote_rec_t voteRecord; trigger_opt.value().GetCurrentMNVotes(mn_activeman.GetOutPoint(), voteRecord)) {
-            const auto& strFunc = __func__;
-            // Let's see if there is a VOTE_SIGNAL_FUNDING vote from us already
-            voted_already = ranges::any_of(voteRecord.mapInstances, [&](const auto& voteInstancePair) {
-                if (voteInstancePair.first == VOTE_SIGNAL_FUNDING) {
-                    if (voteInstancePair.second.eOutcome == VOTE_OUTCOME_YES) {
-                        votedFundingYesTriggerHash = gov_sb_hash;
-                    }
-                    LogPrint(BCLog::GOBJECT, /* Continued */
-                             "CGovernanceManager::%s "
-                             "Not voting YES-FUNDING for trigger:%s, we voted %s for it already\n",
-                             strFunc, gov_sb_hash.ToString(),
-                             CGovernanceVoting::ConvertOutcomeToString(voteInstancePair.second.eOutcome));
-                    return true;
-                }
-                return false;
-            });
-        }
-        if (!voted_already) {
-            // No previous VOTE_SIGNAL_FUNDING was found, vote now
-            if (VoteFundingTrigger(gov_sb_hash, VOTE_OUTCOME_YES, connman, peerman, mn_activeman)) {
-                LogPrint(BCLog::GOBJECT, "CGovernanceManager::%s Voting YES-FUNDING for new trigger:%s success\n",
-                         __func__, gov_sb_hash.ToString());
-                votedFundingYesTriggerHash = gov_sb_hash;
-            } else {
-                LogPrint(BCLog::GOBJECT, "CGovernanceManager::%s Voting YES-FUNDING for new trigger:%s failed\n",
-                         __func__, gov_sb_hash.ToString());
-                // this should never happen, bail out
-                return;
-            }
-        }
-    }
-
-    // Vote NO-FUNDING for the rest of the active triggers
-    const auto activeTriggers = GetActiveTriggers();
-    for (const auto& trigger : activeTriggers) {
-        const auto govobj = FindGovernanceObject(trigger->GetGovernanceObjHash());
-        const uint256 trigger_hash = govobj->GetHash();
-        if (trigger->GetBlockHeight() <= nCachedBlockHeight) {
-            // ignore triggers from the past
-            LogPrint(BCLog::GOBJECT, "CGovernanceManager::%s Not voting NO-FUNDING for outdated trigger:%s\n", __func__, trigger_hash.ToString());
-            continue;
-        }
-        if (trigger_hash == votedFundingYesTriggerHash) {
-            // Skip actual trigger
-            LogPrint(BCLog::GOBJECT, "CGovernanceManager::%s Not voting NO-FUNDING for trigger:%s, we voted yes for it already\n", __func__, trigger_hash.ToString());
-            continue;
-        }
-        if (vote_rec_t voteRecord; govobj->GetCurrentMNVotes(mn_activeman.GetOutPoint(), voteRecord)) {
-            const auto& strFunc = __func__;
-            if (ranges::any_of(voteRecord.mapInstances, [&](const auto& voteInstancePair) {
-                    if (voteInstancePair.first == VOTE_SIGNAL_FUNDING) {
-                        LogPrint(BCLog::GOBJECT, /* Continued */
-                                 "CGovernanceManager::%s "
-                                 "Not voting NO-FUNDING for trigger:%s, we voted %s for it already\n",
-                                 strFunc, trigger_hash.ToString(),
-                                 CGovernanceVoting::ConvertOutcomeToString(voteInstancePair.second.eOutcome));
-                        return true;
-                    }
-                    return false;
-                })) {
-                continue;
-            }
-        }
-        if (!VoteFundingTrigger(trigger_hash, VOTE_OUTCOME_NO, connman, peerman, mn_activeman)) {
-            LogPrint(BCLog::GOBJECT, "CGovernanceManager::%s Voting NO-FUNDING for trigger:%s failed\n", __func__, trigger_hash.ToString());
-            // failing here is ok-ish
-            continue;
-        }
-        LogPrint(BCLog::GOBJECT, "CGovernanceManager::%s Voting NO-FUNDING for trigger:%s success\n", __func__, trigger_hash.ToString());
-    }
-}
-
-bool CGovernanceManager::VoteFundingTrigger(const uint256& nHash, const vote_outcome_enum_t outcome, CConnman& connman, PeerManager& peerman,
-                                            const CActiveMasternodeManager& mn_activeman)
-{
-    CGovernanceVote vote(mn_activeman.GetOutPoint(), nHash, VOTE_SIGNAL_FUNDING, outcome);
-    vote.SetTime(GetAdjustedTime());
-    vote.SetSignature(mn_activeman.SignBasic(vote.GetSignatureHash()));
-
-    CGovernanceException exception;
-    if (!ProcessVoteAndRelay(vote, exception, connman, peerman)) {
-        LogPrint(BCLog::GOBJECT, "CGovernanceManager::%s Vote FUNDING %d for trigger:%s failed:%s\n", __func__, outcome, nHash.ToString(), exception.what());
-        return false;
-    }
-
-    return true;
-}
-
-bool CGovernanceManager::HasAlreadyVotedFundingTrigger() const
-{
-    return votedFundingYesTriggerHash.has_value();
-}
-
-void CGovernanceManager::ResetVotedFundingTrigger()
-{
-    votedFundingYesTriggerHash = std::nullopt;
-}
-
 void CGovernanceManager::DoMaintenance(CConnman& connman)
 {
     if (!IsValid()) return;
diff --git a/src/governance/signing.cpp b/src/governance/signing.cpp
new file mode 100644
index 000000000000..0c6a79ea1391
--- /dev/null
+++ b/src/governance/signing.cpp
@@ -0,0 +1,288 @@
+// Copyright (c) 2014-2025 The Dash Core developers
+// Distributed under the MIT software license, see the accompanying
+// file COPYING or http://www.opensource.org/licenses/mit-license.php.
+
+#include <governance/governance.h>
+
+#include <evo/deterministicmns.h>
+#include <governance/classes.h>
+#include <masternode/node.h>
+#include <masternode/sync.h>
+
+#include <chainparams.h>
+#include <logging.h>
+#include <timedata.h>
+#include <util/check.h>
+#include <validation.h>
+
+#include <algorithm>
+
+std::optional<const CSuperblock> CGovernanceManager::CreateSuperblockCandidate(int nHeight) const
+{
+    if (!IsValid()) return std::nullopt;
+    if (!m_mn_sync.IsSynced()) return std::nullopt;
+    if (nHeight % Params().GetConsensus().nSuperblockCycle < Params().GetConsensus().nSuperblockCycle - Params().GetConsensus().nSuperblockMaturityWindow) return std::nullopt;
+    if (HasAlreadyVotedFundingTrigger()) return std::nullopt;
+
+    // A proposal is considered passing if (YES votes) >= (Total Weight of Masternodes / 10),
+    // count total valid (ENABLED) masternodes to determine passing threshold.
+    const auto tip_mn_list = Assert(m_dmnman)->GetListAtChainTip();
+    const int nWeightedMnCount = tip_mn_list.GetValidWeightedMNsCount();
+    const int nAbsVoteReq = std::max(Params().GetConsensus().nGovernanceMinQuorum, nWeightedMnCount / 10);
+
+    // Use std::vector of std::shared_ptr<const CGovernanceObject> because CGovernanceObject doesn't support move operations (needed for sorting the vector later)
+    std::vector<std::shared_ptr<const CGovernanceObject>> approvedProposals;
+
+    {
+        LOCK(cs);
+        for (const auto& [unused, object] : mapObjects) {
+            // Skip all non-proposals objects
+            if (object.GetObjectType() != GovernanceObject::PROPOSAL) continue;
+
+            const int absYesCount = object.GetAbsoluteYesCount(tip_mn_list, VOTE_SIGNAL_FUNDING);
+            // Skip non-passing proposals
+            if (absYesCount < nAbsVoteReq) continue;
+
+            approvedProposals.emplace_back(std::make_shared<const CGovernanceObject>(object));
+        }
+    } // cs
+
+    // Sort approved proposals by absolute Yes votes descending
+    std::sort(approvedProposals.begin(), approvedProposals.end(), [tip_mn_list](std::shared_ptr<const CGovernanceObject> a, std::shared_ptr<const CGovernanceObject> b) {
+        const auto a_yes = a->GetAbsoluteYesCount(tip_mn_list, VOTE_SIGNAL_FUNDING);
+        const auto b_yes = b->GetAbsoluteYesCount(tip_mn_list, VOTE_SIGNAL_FUNDING);
+        return a_yes == b_yes ? UintToArith256(a->GetHash()) > UintToArith256(b->GetHash()) : a_yes > b_yes;
+    });
+
+    if (approvedProposals.empty()) {
+        LogPrint(BCLog::GOBJECT, "CGovernanceManager::%s nHeight:%d empty approvedProposals\n", __func__, nHeight);
+        return std::nullopt;
+    }
+
+    std::vector<CGovernancePayment> payments;
+    int nLastSuperblock;
+    int nNextSuperblock;
+
+    CSuperblock::GetNearestSuperblocksHeights(nHeight, nLastSuperblock, nNextSuperblock);
+    auto SBEpochTime = static_cast<int64_t>(GetTime<std::chrono::seconds>().count() + (nNextSuperblock - nHeight) * 2.62 * 60);
+    auto governanceBudget = CSuperblock::GetPaymentsLimit(m_chainman.ActiveChain(), nNextSuperblock);
+
+    CAmount budgetAllocated{};
+    for (const auto& proposal : approvedProposals) {
+        // Extract payment address and amount from proposal
+        UniValue jproposal = proposal->GetJSONObject();
+
+        CTxDestination dest = DecodeDestination(jproposal["payment_address"].getValStr());
+        if (!IsValidDestination(dest)) continue;
+
+        CAmount nAmount{};
+        try {
+            nAmount = ParsePaymentAmount(jproposal["payment_amount"].getValStr());
+        }
+        catch (const std::runtime_error& e) {
+            LogPrint(BCLog::GOBJECT, "CGovernanceManager::%s nHeight:%d Skipping payment exception:%s\n", __func__,nHeight, e.what());
+            continue;
+        }
+
+        // Construct CGovernancePayment object and make sure it is valid
+        CGovernancePayment payment(dest, nAmount, proposal->GetHash());
+        if (!payment.IsValid()) continue;
+
+        // Skip proposals that are too expensive
+        if (budgetAllocated + payment.nAmount > governanceBudget) continue;
+
+        int64_t windowStart = jproposal["start_epoch"].getInt<int64_t>() - GOVERNANCE_FUDGE_WINDOW;
+        int64_t windowEnd = jproposal["end_epoch"].getInt<int64_t>() + GOVERNANCE_FUDGE_WINDOW;
+
+        // Skip proposals if the SB isn't within the proposal time window
+        if (SBEpochTime < windowStart) {
+            LogPrint(BCLog::GOBJECT, "CGovernanceManager::%s nHeight:%d SB:%d windowStart:%d\n", __func__,nHeight, SBEpochTime, windowStart);
+            continue;
+        }
+        if (SBEpochTime > windowEnd) {
+            LogPrint(BCLog::GOBJECT, "CGovernanceManager::%s nHeight:%d SB:%d windowEnd:%d\n", __func__,nHeight, SBEpochTime, windowEnd);
+            continue;
+        }
+
+        // Keep track of total budget allocation
+        budgetAllocated += payment.nAmount;
+
+        // Add the payment
+        payments.push_back(payment);
+    }
+
+    // No proposals made the cut
+    if (payments.empty()) {
+        LogPrint(BCLog::GOBJECT, "CGovernanceManager::%s CreateSuperblockCandidate nHeight:%d empty payments\n", __func__, nHeight);
+        return std::nullopt;
+    }
+
+    // Sort by proposal hash descending
+    std::sort(payments.begin(), payments.end(), [](const CGovernancePayment& a, const CGovernancePayment& b) {
+        return UintToArith256(a.proposalHash) > UintToArith256(b.proposalHash);
+    });
+
+    // Create Superblock
+    return CSuperblock(nNextSuperblock, std::move(payments));
+}
+
+std::optional<const CGovernanceObject> CGovernanceManager::CreateGovernanceTrigger(const std::optional<const CSuperblock>& sb_opt, PeerManager& peerman,
+                                                                                   const CActiveMasternodeManager& mn_activeman)
+{
+    // no sb_opt, no trigger
+    if (!sb_opt.has_value()) return std::nullopt;
+
+    //TODO: Check if nHashParentIn, nRevision and nCollateralHashIn are correct
+    LOCK2(::cs_main, cs);
+
+    // Check if identical trigger (equal DataHash()) is already created (signed by other masternode)
+    CGovernanceObject gov_sb(uint256(), 1, GetAdjustedTime(), uint256(), sb_opt.value().GetHexStrData());
+    if (auto identical_sb = FindGovernanceObjectByDataHash(gov_sb.GetDataHash())) {
+        // Somebody submitted a trigger with the same data, support it instead of submitting a duplicate
+        return std::make_optional<CGovernanceObject>(*identical_sb);
+    }
+
+    // Nobody submitted a trigger we'd like to see, so let's do it but only if we are the payee
+    const CBlockIndex* tip = m_chainman.ActiveChain().Tip();
+    const auto mnList = Assert(m_dmnman)->GetListForBlock(tip);
+    const auto mn_payees = mnList.GetProjectedMNPayees(tip);
+
+    if (mn_payees.empty()) {
+        LogPrint(BCLog::GOBJECT, "CGovernanceManager::%s payee list is empty\n", __func__);
+        return std::nullopt;
+    }
+
+    if (mn_payees.front()->proTxHash != mn_activeman.GetProTxHash()) {
+        LogPrint(BCLog::GOBJECT, "CGovernanceManager::%s we are not the payee, skipping\n", __func__);
+        return std::nullopt;
+    }
+    gov_sb.SetMasternodeOutpoint(mn_activeman.GetOutPoint());
+    gov_sb.SetSignature(mn_activeman.SignBasic(gov_sb.GetSignatureHash()));
+
+    if (std::string strError; !gov_sb.IsValidLocally(m_dmnman->GetListAtChainTip(), m_chainman, strError, true)) {
+        LogPrint(BCLog::GOBJECT, "CGovernanceManager::%s Created trigger is invalid:%s\n", __func__, strError);
+        return std::nullopt;
+    }
+
+    if (!MasternodeRateCheck(gov_sb)) {
+        LogPrint(BCLog::GOBJECT, "CGovernanceManager::%s Trigger rejected because of rate check failure hash(%s)\n", __func__, gov_sb.GetHash().ToString());
+        return std::nullopt;
+    }
+
+    // The trigger we just created looks good, submit it
+    AddGovernanceObject(gov_sb, peerman);
+    return std::make_optional<CGovernanceObject>(gov_sb);
+}
+
+void CGovernanceManager::VoteGovernanceTriggers(const std::optional<const CGovernanceObject>& trigger_opt, CConnman& connman, PeerManager& peerman,
+                                                const CActiveMasternodeManager& mn_activeman)
+{
+    // only active masternodes can vote on triggers
+    if (mn_activeman.GetProTxHash().IsNull()) return;
+
+    LOCK2(::cs_main, cs);
+
+    if (trigger_opt.has_value()) {
+        // We should never vote "yes" on another trigger or the same trigger twice
+        assert(!votedFundingYesTriggerHash.has_value());
+        // Vote YES-FUNDING for the trigger we like, unless we already did
+        const uint256 gov_sb_hash = trigger_opt.value().GetHash();
+        bool voted_already{false};
+        if (vote_rec_t voteRecord; trigger_opt.value().GetCurrentMNVotes(mn_activeman.GetOutPoint(), voteRecord)) {
+            const auto& strFunc = __func__;
+            // Let's see if there is a VOTE_SIGNAL_FUNDING vote from us already
+            voted_already = ranges::any_of(voteRecord.mapInstances, [&](const auto& voteInstancePair) {
+                if (voteInstancePair.first == VOTE_SIGNAL_FUNDING) {
+                    if (voteInstancePair.second.eOutcome == VOTE_OUTCOME_YES) {
+                        votedFundingYesTriggerHash = gov_sb_hash;
+                    }
+                    LogPrint(BCLog::GOBJECT, /* Continued */
+                             "CGovernanceManager::%s "
+                             "Not voting YES-FUNDING for trigger:%s, we voted %s for it already\n",
+                             strFunc, gov_sb_hash.ToString(),
+                             CGovernanceVoting::ConvertOutcomeToString(voteInstancePair.second.eOutcome));
+                    return true;
+                }
+                return false;
+            });
+        }
+        if (!voted_already) {
+            // No previous VOTE_SIGNAL_FUNDING was found, vote now
+            if (VoteFundingTrigger(gov_sb_hash, VOTE_OUTCOME_YES, connman, peerman, mn_activeman)) {
+                LogPrint(BCLog::GOBJECT, "CGovernanceManager::%s Voting YES-FUNDING for new trigger:%s success\n",
+                         __func__, gov_sb_hash.ToString());
+                votedFundingYesTriggerHash = gov_sb_hash;
+            } else {
+                LogPrint(BCLog::GOBJECT, "CGovernanceManager::%s Voting YES-FUNDING for new trigger:%s failed\n",
+                         __func__, gov_sb_hash.ToString());
+                // this should never happen, bail out
+                return;
+            }
+        }
+    }
+
+    // Vote NO-FUNDING for the rest of the active triggers
+    const auto activeTriggers = GetActiveTriggers();
+    for (const auto& trigger : activeTriggers) {
+        const auto govobj = FindGovernanceObject(trigger->GetGovernanceObjHash());
+        const uint256 trigger_hash = govobj->GetHash();
+        if (trigger->GetBlockHeight() <= nCachedBlockHeight) {
+            // ignore triggers from the past
+            LogPrint(BCLog::GOBJECT, "CGovernanceManager::%s Not voting NO-FUNDING for outdated trigger:%s\n", __func__, trigger_hash.ToString());
+            continue;
+        }
+        if (trigger_hash == votedFundingYesTriggerHash) {
+            // Skip actual trigger
+            LogPrint(BCLog::GOBJECT, "CGovernanceManager::%s Not voting NO-FUNDING for trigger:%s, we voted yes for it already\n", __func__, trigger_hash.ToString());
+            continue;
+        }
+        if (vote_rec_t voteRecord; govobj->GetCurrentMNVotes(mn_activeman.GetOutPoint(), voteRecord)) {
+            const auto& strFunc = __func__;
+            if (ranges::any_of(voteRecord.mapInstances, [&](const auto& voteInstancePair) {
+                    if (voteInstancePair.first == VOTE_SIGNAL_FUNDING) {
+                        LogPrint(BCLog::GOBJECT, /* Continued */
+                                 "CGovernanceManager::%s "
+                                 "Not voting NO-FUNDING for trigger:%s, we voted %s for it already\n",
+                                 strFunc, trigger_hash.ToString(),
+                                 CGovernanceVoting::ConvertOutcomeToString(voteInstancePair.second.eOutcome));
+                        return true;
+                    }
+                    return false;
+                })) {
+                continue;
+            }
+        }
+        if (!VoteFundingTrigger(trigger_hash, VOTE_OUTCOME_NO, connman, peerman, mn_activeman)) {
+            LogPrint(BCLog::GOBJECT, "CGovernanceManager::%s Voting NO-FUNDING for trigger:%s failed\n", __func__, trigger_hash.ToString());
+            // failing here is ok-ish
+            continue;
+        }
+        LogPrint(BCLog::GOBJECT, "CGovernanceManager::%s Voting NO-FUNDING for trigger:%s success\n", __func__, trigger_hash.ToString());
+    }
+}
+
+bool CGovernanceManager::VoteFundingTrigger(const uint256& nHash, const vote_outcome_enum_t outcome, CConnman& connman, PeerManager& peerman,
+                                            const CActiveMasternodeManager& mn_activeman)
+{
+    CGovernanceVote vote(mn_activeman.GetOutPoint(), nHash, VOTE_SIGNAL_FUNDING, outcome);
+    vote.SetTime(GetAdjustedTime());
+    vote.SetSignature(mn_activeman.SignBasic(vote.GetSignatureHash()));
+
+    CGovernanceException exception;
+    if (!ProcessVoteAndRelay(vote, exception, connman, peerman)) {
+        LogPrint(BCLog::GOBJECT, "CGovernanceManager::%s Vote FUNDING %d for trigger:%s failed:%s\n", __func__, outcome, nHash.ToString(), exception.what());
+        return false;
+    }
+
+    return true;
+}
+
+bool CGovernanceManager::HasAlreadyVotedFundingTrigger() const
+{
+    return votedFundingYesTriggerHash.has_value();
+}
+
+void CGovernanceManager::ResetVotedFundingTrigger()
+{
+    votedFundingYesTriggerHash = std::nullopt;
+}

From bd6af835fff8958fd69cff6784d26f2646c7729d Mon Sep 17 00:00:00 2001
From: Kittywhiskers Van Gogh <63189531+kwvg@users.noreply.github.com>
Date: Mon, 6 Oct 2025 22:09:20 +0000
Subject: [PATCH 139/656] refactor: separate masternode mode logic into
 dedicated signer class

---
 src/Makefile.am                               |   3 +-
 src/dsnotificationinterface.cpp               |   4 +-
 src/dsnotificationinterface.h                 |   3 -
 src/governance/governance.cpp                 |  23 +--
 src/governance/governance.h                   |  51 +++----
 src/governance/signing.cpp                    | 141 +++++++++++-------
 src/governance/signing.h                      |  56 +++++++
 src/init.cpp                                  |   8 +-
 src/masternode/active/context.cpp             |   9 +-
 src/masternode/active/context.h               |   9 +-
 .../active/notificationinterface.cpp          |   2 +
 src/node/interfaces.cpp                       |   1 +
 src/qt/governancelist.h                       |   9 +-
 src/wallet/interfaces.cpp                     |   1 -
 test/functional/feature_governance.py         |   2 +-
 15 files changed, 204 insertions(+), 118 deletions(-)
 create mode 100644 src/governance/signing.h

diff --git a/src/Makefile.am b/src/Makefile.am
index e2a817d65680..639a7d9eff83 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -222,11 +222,12 @@ BITCOIN_CORE_H = \
   evo/specialtxman.h \
   evo/types.h \
   dsnotificationinterface.h \
-  governance/governance.h \
   governance/classes.h \
   governance/common.h \
+  governance/governance.h \
   governance/exceptions.h \
   governance/object.h \
+  governance/signing.h \
   governance/validators.h \
   governance/vote.h \
   governance/votedb.h \
diff --git a/src/dsnotificationinterface.cpp b/src/dsnotificationinterface.cpp
index 95066be54658..4f8c7ed0358a 100644
--- a/src/dsnotificationinterface.cpp
+++ b/src/dsnotificationinterface.cpp
@@ -26,7 +26,6 @@ CDSNotificationInterface::CDSNotificationInterface(CConnman& connman,
                                                    CGovernanceManager& govman,
                                                    PeerManager& peerman,
                                                    const ChainstateManager& chainman,
-                                                   const CActiveMasternodeManager* const mn_activeman,
                                                    const std::unique_ptr<CDeterministicMNManager>& dmnman,
                                                    const std::unique_ptr<LLMQContext>& llmq_ctx,
                                                    const std::unique_ptr<CJContext>& cj_ctx)
@@ -35,7 +34,6 @@ CDSNotificationInterface::CDSNotificationInterface(CConnman& connman,
     m_govman(govman),
     m_peerman(peerman),
     m_chainman(chainman),
-    m_mn_activeman(mn_activeman),
     m_dmnman(dmnman),
     m_llmq_ctx(llmq_ctx),
     m_cj_ctx(cj_ctx) {}
@@ -94,7 +92,7 @@ void CDSNotificationInterface::UpdatedBlockTip(const CBlockIndex *pindexNew, con
     m_llmq_ctx->qdkgsman->UpdatedBlockTip(pindexNew, fInitialDownload);
 
     if (m_govman.IsValid()) {
-        m_govman.UpdatedBlockTip(pindexNew, m_connman, m_peerman, m_mn_activeman);
+        m_govman.UpdatedBlockTip(pindexNew, m_peerman);
     }
 }
 
diff --git a/src/dsnotificationinterface.h b/src/dsnotificationinterface.h
index 6ca8634e2cc1..9ae958be5f62 100644
--- a/src/dsnotificationinterface.h
+++ b/src/dsnotificationinterface.h
@@ -7,7 +7,6 @@
 
 #include <validationinterface.h>
 
-class CActiveMasternodeManager;
 class CConnman;
 class CDeterministicMNManager;
 class CGovernanceManager;
@@ -25,7 +24,6 @@ class CDSNotificationInterface : public CValidationInterface
                                       CGovernanceManager& govman,
                                       PeerManager& peerman,
                                       const ChainstateManager& chainman,
-                                      const CActiveMasternodeManager* const mn_activeman,
                                       const std::unique_ptr<CDeterministicMNManager>& dmnman,
                                       const std::unique_ptr<LLMQContext>& llmq_ctx,
                                       const std::unique_ptr<CJContext>& cj_ctx);
@@ -54,7 +52,6 @@ class CDSNotificationInterface : public CValidationInterface
     CGovernanceManager& m_govman;
     PeerManager& m_peerman;
     const ChainstateManager& m_chainman;
-    const CActiveMasternodeManager* const m_mn_activeman;
     const std::unique_ptr<CDeterministicMNManager>& m_dmnman;
     const std::unique_ptr<LLMQContext>& m_llmq_ctx;
     const std::unique_ptr<CJContext>& m_cj_ctx;
diff --git a/src/governance/governance.cpp b/src/governance/governance.cpp
index af1451ea3835..3e6d78b7e045 100644
--- a/src/governance/governance.cpp
+++ b/src/governance/governance.cpp
@@ -14,7 +14,6 @@
 #include <governance/common.h>
 #include <governance/validators.h>
 #include <masternode/meta.h>
-#include <masternode/node.h>
 #include <masternode/sync.h>
 #include <net_processing.h>
 #include <netfulfilledman.h>
@@ -75,6 +74,7 @@ CGovernanceManager::CGovernanceManager(CMasternodeMetaMan& mn_metaman, CNetFulfi
     m_mn_sync{mn_sync},
     nTimeLastDiff(0),
     nCachedBlockHeight(0),
+    mapPostponedObjects(),
     fRateChecksEnabled(true),
     votedFundingYesTriggerHash(std::nullopt),
     mapTrigger{}
@@ -140,6 +140,12 @@ bool CGovernanceManager::SerializeVoteForHash(const uint256& nHash, CDataStream&
     return cmapVoteToObject.Get(nHash, pGovobj) && pGovobj->GetVoteFile().SerializeVoteToStream(nHash, ss);
 }
 
+void CGovernanceManager::AddPostponedObject(const CGovernanceObject& govobj)
+{
+    LOCK(cs);
+    mapPostponedObjects.insert(std::make_pair(govobj.GetHash(), govobj));
+}
+
 MessageProcessingResult CGovernanceManager::ProcessMessage(CNode& peer, CConnman& connman, PeerManager& peerman, std::string_view msg_type, CDataStream& vRecv)
 {
     if (!IsValid()) return {};
@@ -998,6 +1004,11 @@ void CGovernanceManager::RequestGovernanceObject(CNode* pfrom, const uint256& nH
     connman.PushMessage(pfrom, msgMaker.Make(NetMsgType::MNGOVERNANCESYNC, nHash, filter));
 }
 
+void CGovernanceManager::AddInvalidVote(const CGovernanceVote& vote)
+{
+    cmapInvalidVotes.Insert(vote.GetHash(), vote);
+}
+
 int CGovernanceManager::RequestGovernanceObjectVotes(CNode& peer, CConnman& connman, const PeerManager& peerman) const
 {
     const std::vector<CNode*> vNodeCopy{&peer};
@@ -1246,7 +1257,7 @@ UniValue CGovernanceManager::ToJson() const
     return jsonObj;
 }
 
-void CGovernanceManager::UpdatedBlockTip(const CBlockIndex* pindex, CConnman& connman, PeerManager& peerman, const CActiveMasternodeManager* const mn_activeman)
+void CGovernanceManager::UpdatedBlockTip(const CBlockIndex* pindex, PeerManager& peerman)
 {
     // Note this gets called from ActivateBestChain without cs_main being held
     // so it should be safe to lock our mutex here without risking a deadlock
@@ -1257,12 +1268,6 @@ void CGovernanceManager::UpdatedBlockTip(const CBlockIndex* pindex, CConnman& co
         return;
     }
 
-    if (mn_activeman) {
-        const auto sb_opt = CreateSuperblockCandidate(pindex->nHeight);
-        const auto trigger_opt = CreateGovernanceTrigger(sb_opt, peerman, *mn_activeman);
-        VoteGovernanceTriggers(trigger_opt, connman, peerman, *mn_activeman);
-    }
-
     nCachedBlockHeight = pindex->nHeight;
     LogPrint(BCLog::GOBJECT, "CGovernanceManager::UpdatedBlockTip -- nCachedBlockHeight: %d\n", nCachedBlockHeight);
 
@@ -1655,11 +1660,9 @@ void CGovernanceManager::ExecuteBestSuperblock(const CDeterministicMNList& tip_m
         // All checks are done in CSuperblock::IsValid via IsBlockValueValid and IsBlockPayeeValid,
         // tip wouldn't be updated if anything was wrong. Mark this trigger as executed.
         pSuperblock->SetExecuted();
-        ResetVotedFundingTrigger();
     }
 }
 
-
 bool AreSuperblocksEnabled(const CSporkManager& sporkman)
 {
     return sporkman.IsSporkActive(SPORK_9_SUPERBLOCKS_ENABLED);
diff --git a/src/governance/governance.h b/src/governance/governance.h
index 2657c94602c0..9ecd9b391ff7 100644
--- a/src/governance/governance.h
+++ b/src/governance/governance.h
@@ -5,27 +5,33 @@
 #ifndef BITCOIN_GOVERNANCE_GOVERNANCE_H
 #define BITCOIN_GOVERNANCE_GOVERNANCE_H
 
-#include <governance/classes.h>
-#include <governance/object.h>
-
 #include <cachemap.h>
 #include <cachemultimap.h>
 #include <protocol.h>
-#include <util/check.h>
+#include <sync.h>
 
-#include <optional>
+#include <limits>
+#include <map>
+#include <memory>
+#include <set>
+#include <string>
 #include <string_view>
+#include <vector>
 
 class CBloomFilter;
 class CBlockIndex;
+class CChain;
 class CConnman;
+class ChainstateManager;
 template<typename T>
 class CFlatDB;
 class CInv;
+class CNode;
 class PeerManager;
 
 class CDeterministicMNList;
 class CDeterministicMNManager;
+class CGovernanceException;
 class CGovernanceManager;
 class CGovernanceObject;
 class CGovernanceVote;
@@ -33,6 +39,14 @@ class CMasternodeMetaMan;
 class CMasternodeSync;
 class CNetFulfilledRequestManager;
 class CSporkManager;
+class CSuperblock;
+class GovernanceSigner;
+
+class UniValue;
+
+using CDeterministicMNListPtr = std::shared_ptr<CDeterministicMNList>;
+using CSuperblock_sptr = std::shared_ptr<CSuperblock>;
+using vote_time_pair_t = std::pair<CGovernanceVote, int64_t>;
 
 static constexpr int RATE_BUFFER_SIZE = 5;
 static constexpr bool DEFAULT_GOVERNANCE_ENABLE{true};
@@ -275,10 +289,6 @@ class CGovernanceManager : public GovernanceStore
 
     [[nodiscard]] MessageProcessingResult ProcessMessage(CNode& peer, CConnman& connman, PeerManager& peerman, std::string_view msg_type, CDataStream& vRecv);
 
-private:
-    void ResetVotedFundingTrigger();
-
-public:
     void DoMaintenance(CConnman& connman);
 
     const CGovernanceObject* FindConstGovernanceObject(const uint256& nHash) const EXCLUSIVE_LOCKS_REQUIRED(cs);
@@ -296,7 +306,7 @@ class CGovernanceManager : public GovernanceStore
 
     UniValue ToJson() const;
 
-    void UpdatedBlockTip(const CBlockIndex* pindex, CConnman& connman, PeerManager& peerman, const CActiveMasternodeManager* const mn_activeman);
+    void UpdatedBlockTip(const CBlockIndex* pindex, PeerManager& peerman);
     int64_t GetLastDiffTime() const { return nTimeLastDiff; }
     void UpdateLastDiffTime(int64_t nTimeIn) { nTimeLastDiff = nTimeIn; }
 
@@ -313,11 +323,7 @@ class CGovernanceManager : public GovernanceStore
 
     bool SerializeVoteForHash(const uint256& nHash, CDataStream& ss) const;
 
-    void AddPostponedObject(const CGovernanceObject& govobj)
-    {
-        LOCK(cs);
-        mapPostponedObjects.insert(std::make_pair(govobj.GetHash(), govobj));
-    }
+    void AddPostponedObject(const CGovernanceObject& govobj);
 
     void MasternodeRateUpdate(const CGovernanceObject& govobj);
 
@@ -375,21 +381,9 @@ class CGovernanceManager : public GovernanceStore
     bool GetBestSuperblock(const CDeterministicMNList& tip_mn_list, CSuperblock_sptr& pSuperblockRet, int nBlockHeight)
         EXCLUSIVE_LOCKS_REQUIRED(cs);
 
-    std::optional<const CSuperblock> CreateSuperblockCandidate(int nHeight) const;
-    std::optional<const CGovernanceObject> CreateGovernanceTrigger(const std::optional<const CSuperblock>& sb_opt, PeerManager& peerman,
-                                                                   const CActiveMasternodeManager& mn_activeman);
-    void VoteGovernanceTriggers(const std::optional<const CGovernanceObject>& trigger_opt, CConnman& connman, PeerManager& peerman,
-                                const CActiveMasternodeManager& mn_activeman);
-    bool VoteFundingTrigger(const uint256& nHash, const vote_outcome_enum_t outcome, CConnman& connman, PeerManager& peerman,
-                            const CActiveMasternodeManager& mn_activeman);
-    bool HasAlreadyVotedFundingTrigger() const;
-
     void RequestGovernanceObject(CNode* pfrom, const uint256& nHash, CConnman& connman, bool fUseFilter = false) const;
 
-    void AddInvalidVote(const CGovernanceVote& vote)
-    {
-        cmapInvalidVotes.Insert(vote.GetHash(), vote);
-    }
+    void AddInvalidVote(const CGovernanceVote& vote);
 
     bool ProcessVote(CNode* pfrom, const CGovernanceVote& vote, CGovernanceException& exception, CConnman& connman);
 
@@ -408,6 +402,7 @@ class CGovernanceManager : public GovernanceStore
 
     void RemoveInvalidVotes();
 
+    friend class GovernanceSigner;
 };
 
 bool AreSuperblocksEnabled(const CSporkManager& sporkman);
diff --git a/src/governance/signing.cpp b/src/governance/signing.cpp
index 0c6a79ea1391..86b9ae5137bf 100644
--- a/src/governance/signing.cpp
+++ b/src/governance/signing.cpp
@@ -2,10 +2,11 @@
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-#include <governance/governance.h>
+#include <governance/signing.h>
 
 #include <evo/deterministicmns.h>
 #include <governance/classes.h>
+#include <governance/governance.h>
 #include <masternode/node.h>
 #include <masternode/sync.h>
 
@@ -17,16 +18,31 @@
 
 #include <algorithm>
 
-std::optional<const CSuperblock> CGovernanceManager::CreateSuperblockCandidate(int nHeight) const
+GovernanceSigner::GovernanceSigner(CConnman& connman, CDeterministicMNManager& dmnman, CGovernanceManager& govman,
+                                   PeerManager& peerman, const CActiveMasternodeManager& mn_activeman,
+                                   const ChainstateManager& chainman, const CMasternodeSync& mn_sync) :
+    m_connman{connman},
+    m_dmnman{dmnman},
+    m_govman{govman},
+    m_peerman{peerman},
+    m_mn_activeman{mn_activeman},
+    m_chainman{chainman},
+    m_mn_sync{mn_sync}
+{
+}
+
+GovernanceSigner::~GovernanceSigner() = default;
+
+std::optional<const CSuperblock> GovernanceSigner::CreateSuperblockCandidate(int nHeight) const
 {
-    if (!IsValid()) return std::nullopt;
+    if (!m_govman.IsValid()) return std::nullopt;
     if (!m_mn_sync.IsSynced()) return std::nullopt;
     if (nHeight % Params().GetConsensus().nSuperblockCycle < Params().GetConsensus().nSuperblockCycle - Params().GetConsensus().nSuperblockMaturityWindow) return std::nullopt;
     if (HasAlreadyVotedFundingTrigger()) return std::nullopt;
 
     // A proposal is considered passing if (YES votes) >= (Total Weight of Masternodes / 10),
     // count total valid (ENABLED) masternodes to determine passing threshold.
-    const auto tip_mn_list = Assert(m_dmnman)->GetListAtChainTip();
+    const auto tip_mn_list = m_dmnman.GetListAtChainTip();
     const int nWeightedMnCount = tip_mn_list.GetValidWeightedMNsCount();
     const int nAbsVoteReq = std::max(Params().GetConsensus().nGovernanceMinQuorum, nWeightedMnCount / 10);
 
@@ -34,8 +50,8 @@ std::optional<const CSuperblock> CGovernanceManager::CreateSuperblockCandidate(i
     std::vector<std::shared_ptr<const CGovernanceObject>> approvedProposals;
 
     {
-        LOCK(cs);
-        for (const auto& [unused, object] : mapObjects) {
+        LOCK(m_govman.cs);
+        for (const auto& [unused, object] : m_govman.mapObjects) {
             // Skip all non-proposals objects
             if (object.GetObjectType() != GovernanceObject::PROPOSAL) continue;
 
@@ -55,7 +71,7 @@ std::optional<const CSuperblock> CGovernanceManager::CreateSuperblockCandidate(i
     });
 
     if (approvedProposals.empty()) {
-        LogPrint(BCLog::GOBJECT, "CGovernanceManager::%s nHeight:%d empty approvedProposals\n", __func__, nHeight);
+        LogPrint(BCLog::GOBJECT, "%s -- nHeight:%d empty approvedProposals\n", __func__, nHeight);
         return std::nullopt;
     }
 
@@ -80,7 +96,7 @@ std::optional<const CSuperblock> CGovernanceManager::CreateSuperblockCandidate(i
             nAmount = ParsePaymentAmount(jproposal["payment_amount"].getValStr());
         }
         catch (const std::runtime_error& e) {
-            LogPrint(BCLog::GOBJECT, "CGovernanceManager::%s nHeight:%d Skipping payment exception:%s\n", __func__,nHeight, e.what());
+            LogPrint(BCLog::GOBJECT, "%s -- nHeight:%d Skipping payment exception:%s\n", __func__,nHeight, e.what());
             continue;
         }
 
@@ -96,11 +112,11 @@ std::optional<const CSuperblock> CGovernanceManager::CreateSuperblockCandidate(i
 
         // Skip proposals if the SB isn't within the proposal time window
         if (SBEpochTime < windowStart) {
-            LogPrint(BCLog::GOBJECT, "CGovernanceManager::%s nHeight:%d SB:%d windowStart:%d\n", __func__,nHeight, SBEpochTime, windowStart);
+            LogPrint(BCLog::GOBJECT, "%s -- nHeight:%d SB:%d windowStart:%d\n", __func__,nHeight, SBEpochTime, windowStart);
             continue;
         }
         if (SBEpochTime > windowEnd) {
-            LogPrint(BCLog::GOBJECT, "CGovernanceManager::%s nHeight:%d SB:%d windowEnd:%d\n", __func__,nHeight, SBEpochTime, windowEnd);
+            LogPrint(BCLog::GOBJECT, "%s -- nHeight:%d SB:%d windowEnd:%d\n", __func__,nHeight, SBEpochTime, windowEnd);
             continue;
         }
 
@@ -113,7 +129,7 @@ std::optional<const CSuperblock> CGovernanceManager::CreateSuperblockCandidate(i
 
     // No proposals made the cut
     if (payments.empty()) {
-        LogPrint(BCLog::GOBJECT, "CGovernanceManager::%s CreateSuperblockCandidate nHeight:%d empty payments\n", __func__, nHeight);
+        LogPrint(BCLog::GOBJECT, "%s -- CreateSuperblockCandidate nHeight:%d empty payments\n", __func__, nHeight);
         return std::nullopt;
     }
 
@@ -126,61 +142,59 @@ std::optional<const CSuperblock> CGovernanceManager::CreateSuperblockCandidate(i
     return CSuperblock(nNextSuperblock, std::move(payments));
 }
 
-std::optional<const CGovernanceObject> CGovernanceManager::CreateGovernanceTrigger(const std::optional<const CSuperblock>& sb_opt, PeerManager& peerman,
-                                                                                   const CActiveMasternodeManager& mn_activeman)
+std::optional<const CGovernanceObject> GovernanceSigner::CreateGovernanceTrigger(const std::optional<const CSuperblock>& sb_opt)
 {
     // no sb_opt, no trigger
     if (!sb_opt.has_value()) return std::nullopt;
 
     //TODO: Check if nHashParentIn, nRevision and nCollateralHashIn are correct
-    LOCK2(::cs_main, cs);
+    LOCK2(::cs_main, m_govman.cs);
 
     // Check if identical trigger (equal DataHash()) is already created (signed by other masternode)
     CGovernanceObject gov_sb(uint256(), 1, GetAdjustedTime(), uint256(), sb_opt.value().GetHexStrData());
-    if (auto identical_sb = FindGovernanceObjectByDataHash(gov_sb.GetDataHash())) {
+    if (auto identical_sb = m_govman.FindGovernanceObjectByDataHash(gov_sb.GetDataHash())) {
         // Somebody submitted a trigger with the same data, support it instead of submitting a duplicate
         return std::make_optional<CGovernanceObject>(*identical_sb);
     }
 
     // Nobody submitted a trigger we'd like to see, so let's do it but only if we are the payee
     const CBlockIndex* tip = m_chainman.ActiveChain().Tip();
-    const auto mnList = Assert(m_dmnman)->GetListForBlock(tip);
+    const auto mnList = m_dmnman.GetListForBlock(tip);
     const auto mn_payees = mnList.GetProjectedMNPayees(tip);
 
     if (mn_payees.empty()) {
-        LogPrint(BCLog::GOBJECT, "CGovernanceManager::%s payee list is empty\n", __func__);
+        LogPrint(BCLog::GOBJECT, "%s -- payee list is empty\n", __func__);
         return std::nullopt;
     }
 
-    if (mn_payees.front()->proTxHash != mn_activeman.GetProTxHash()) {
-        LogPrint(BCLog::GOBJECT, "CGovernanceManager::%s we are not the payee, skipping\n", __func__);
+    if (mn_payees.front()->proTxHash != m_mn_activeman.GetProTxHash()) {
+        LogPrint(BCLog::GOBJECT, "%s -- we are not the payee, skipping\n", __func__);
         return std::nullopt;
     }
-    gov_sb.SetMasternodeOutpoint(mn_activeman.GetOutPoint());
-    gov_sb.SetSignature(mn_activeman.SignBasic(gov_sb.GetSignatureHash()));
+    gov_sb.SetMasternodeOutpoint(m_mn_activeman.GetOutPoint());
+    gov_sb.SetSignature(m_mn_activeman.SignBasic(gov_sb.GetSignatureHash()));
 
-    if (std::string strError; !gov_sb.IsValidLocally(m_dmnman->GetListAtChainTip(), m_chainman, strError, true)) {
-        LogPrint(BCLog::GOBJECT, "CGovernanceManager::%s Created trigger is invalid:%s\n", __func__, strError);
+    if (std::string strError; !gov_sb.IsValidLocally(m_dmnman.GetListAtChainTip(), m_chainman, strError, true)) {
+        LogPrint(BCLog::GOBJECT, "%s -- Created trigger is invalid:%s\n", __func__, strError);
         return std::nullopt;
     }
 
-    if (!MasternodeRateCheck(gov_sb)) {
-        LogPrint(BCLog::GOBJECT, "CGovernanceManager::%s Trigger rejected because of rate check failure hash(%s)\n", __func__, gov_sb.GetHash().ToString());
+    if (!m_govman.MasternodeRateCheck(gov_sb)) {
+        LogPrint(BCLog::GOBJECT, "%s -- Trigger rejected because of rate check failure hash(%s)\n", __func__, gov_sb.GetHash().ToString());
         return std::nullopt;
     }
 
     // The trigger we just created looks good, submit it
-    AddGovernanceObject(gov_sb, peerman);
+    m_govman.AddGovernanceObject(gov_sb, m_peerman);
     return std::make_optional<CGovernanceObject>(gov_sb);
 }
 
-void CGovernanceManager::VoteGovernanceTriggers(const std::optional<const CGovernanceObject>& trigger_opt, CConnman& connman, PeerManager& peerman,
-                                                const CActiveMasternodeManager& mn_activeman)
+void GovernanceSigner::VoteGovernanceTriggers(const std::optional<const CGovernanceObject>& trigger_opt)
 {
     // only active masternodes can vote on triggers
-    if (mn_activeman.GetProTxHash().IsNull()) return;
+    if (m_mn_activeman.GetProTxHash().IsNull()) return;
 
-    LOCK2(::cs_main, cs);
+    LOCK2(::cs_main, m_govman.cs);
 
     if (trigger_opt.has_value()) {
         // We should never vote "yes" on another trigger or the same trigger twice
@@ -188,7 +202,7 @@ void CGovernanceManager::VoteGovernanceTriggers(const std::optional<const CGover
         // Vote YES-FUNDING for the trigger we like, unless we already did
         const uint256 gov_sb_hash = trigger_opt.value().GetHash();
         bool voted_already{false};
-        if (vote_rec_t voteRecord; trigger_opt.value().GetCurrentMNVotes(mn_activeman.GetOutPoint(), voteRecord)) {
+        if (vote_rec_t voteRecord; trigger_opt.value().GetCurrentMNVotes(m_mn_activeman.GetOutPoint(), voteRecord)) {
             const auto& strFunc = __func__;
             // Let's see if there is a VOTE_SIGNAL_FUNDING vote from us already
             voted_already = ranges::any_of(voteRecord.mapInstances, [&](const auto& voteInstancePair) {
@@ -197,9 +211,8 @@ void CGovernanceManager::VoteGovernanceTriggers(const std::optional<const CGover
                         votedFundingYesTriggerHash = gov_sb_hash;
                     }
                     LogPrint(BCLog::GOBJECT, /* Continued */
-                             "CGovernanceManager::%s "
-                             "Not voting YES-FUNDING for trigger:%s, we voted %s for it already\n",
-                             strFunc, gov_sb_hash.ToString(),
+                             "%s -- Not voting YES-FUNDING for trigger:%s, we voted %s for it already\n", strFunc,
+                             gov_sb_hash.ToString(),
                              CGovernanceVoting::ConvertOutcomeToString(voteInstancePair.second.eOutcome));
                     return true;
                 }
@@ -208,13 +221,13 @@ void CGovernanceManager::VoteGovernanceTriggers(const std::optional<const CGover
         }
         if (!voted_already) {
             // No previous VOTE_SIGNAL_FUNDING was found, vote now
-            if (VoteFundingTrigger(gov_sb_hash, VOTE_OUTCOME_YES, connman, peerman, mn_activeman)) {
-                LogPrint(BCLog::GOBJECT, "CGovernanceManager::%s Voting YES-FUNDING for new trigger:%s success\n",
-                         __func__, gov_sb_hash.ToString());
+            if (VoteFundingTrigger(gov_sb_hash, VOTE_OUTCOME_YES)) {
+                LogPrint(BCLog::GOBJECT, "%s -- Voting YES-FUNDING for new trigger:%s success\n", __func__,
+                         gov_sb_hash.ToString());
                 votedFundingYesTriggerHash = gov_sb_hash;
             } else {
-                LogPrint(BCLog::GOBJECT, "CGovernanceManager::%s Voting YES-FUNDING for new trigger:%s failed\n",
-                         __func__, gov_sb_hash.ToString());
+                LogPrint(BCLog::GOBJECT, "%s -- Voting YES-FUNDING for new trigger:%s failed\n", __func__,
+                         gov_sb_hash.ToString());
                 // this should never happen, bail out
                 return;
             }
@@ -222,27 +235,26 @@ void CGovernanceManager::VoteGovernanceTriggers(const std::optional<const CGover
     }
 
     // Vote NO-FUNDING for the rest of the active triggers
-    const auto activeTriggers = GetActiveTriggers();
+    const auto activeTriggers = m_govman.GetActiveTriggers();
     for (const auto& trigger : activeTriggers) {
-        const auto govobj = FindGovernanceObject(trigger->GetGovernanceObjHash());
+        const auto govobj = m_govman.FindGovernanceObject(trigger->GetGovernanceObjHash());
         const uint256 trigger_hash = govobj->GetHash();
-        if (trigger->GetBlockHeight() <= nCachedBlockHeight) {
+        if (trigger->GetBlockHeight() <= m_govman.nCachedBlockHeight) {
             // ignore triggers from the past
-            LogPrint(BCLog::GOBJECT, "CGovernanceManager::%s Not voting NO-FUNDING for outdated trigger:%s\n", __func__, trigger_hash.ToString());
+            LogPrint(BCLog::GOBJECT, "%s -- Not voting NO-FUNDING for outdated trigger:%s\n", __func__, trigger_hash.ToString());
             continue;
         }
         if (trigger_hash == votedFundingYesTriggerHash) {
             // Skip actual trigger
-            LogPrint(BCLog::GOBJECT, "CGovernanceManager::%s Not voting NO-FUNDING for trigger:%s, we voted yes for it already\n", __func__, trigger_hash.ToString());
+            LogPrint(BCLog::GOBJECT, "%s -- Not voting NO-FUNDING for trigger:%s, we voted yes for it already\n", __func__, trigger_hash.ToString());
             continue;
         }
-        if (vote_rec_t voteRecord; govobj->GetCurrentMNVotes(mn_activeman.GetOutPoint(), voteRecord)) {
+        if (vote_rec_t voteRecord; govobj->GetCurrentMNVotes(m_mn_activeman.GetOutPoint(), voteRecord)) {
             const auto& strFunc = __func__;
             if (ranges::any_of(voteRecord.mapInstances, [&](const auto& voteInstancePair) {
                     if (voteInstancePair.first == VOTE_SIGNAL_FUNDING) {
                         LogPrint(BCLog::GOBJECT, /* Continued */
-                                 "CGovernanceManager::%s "
-                                 "Not voting NO-FUNDING for trigger:%s, we voted %s for it already\n",
+                                 "%s -- Not voting NO-FUNDING for trigger:%s, we voted %s for it already\n",
                                  strFunc, trigger_hash.ToString(),
                                  CGovernanceVoting::ConvertOutcomeToString(voteInstancePair.second.eOutcome));
                         return true;
@@ -252,37 +264,50 @@ void CGovernanceManager::VoteGovernanceTriggers(const std::optional<const CGover
                 continue;
             }
         }
-        if (!VoteFundingTrigger(trigger_hash, VOTE_OUTCOME_NO, connman, peerman, mn_activeman)) {
-            LogPrint(BCLog::GOBJECT, "CGovernanceManager::%s Voting NO-FUNDING for trigger:%s failed\n", __func__, trigger_hash.ToString());
+        if (!VoteFundingTrigger(trigger_hash, VOTE_OUTCOME_NO)) {
+            LogPrint(BCLog::GOBJECT, "%s -- Voting NO-FUNDING for trigger:%s failed\n", __func__, trigger_hash.ToString());
             // failing here is ok-ish
             continue;
         }
-        LogPrint(BCLog::GOBJECT, "CGovernanceManager::%s Voting NO-FUNDING for trigger:%s success\n", __func__, trigger_hash.ToString());
+        LogPrint(BCLog::GOBJECT, "%s -- Voting NO-FUNDING for trigger:%s success\n", __func__, trigger_hash.ToString());
     }
 }
 
-bool CGovernanceManager::VoteFundingTrigger(const uint256& nHash, const vote_outcome_enum_t outcome, CConnman& connman, PeerManager& peerman,
-                                            const CActiveMasternodeManager& mn_activeman)
+bool GovernanceSigner::VoteFundingTrigger(const uint256& nHash, const vote_outcome_enum_t outcome)
 {
-    CGovernanceVote vote(mn_activeman.GetOutPoint(), nHash, VOTE_SIGNAL_FUNDING, outcome);
+    CGovernanceVote vote(m_mn_activeman.GetOutPoint(), nHash, VOTE_SIGNAL_FUNDING, outcome);
     vote.SetTime(GetAdjustedTime());
-    vote.SetSignature(mn_activeman.SignBasic(vote.GetSignatureHash()));
+    vote.SetSignature(m_mn_activeman.SignBasic(vote.GetSignatureHash()));
 
     CGovernanceException exception;
-    if (!ProcessVoteAndRelay(vote, exception, connman, peerman)) {
-        LogPrint(BCLog::GOBJECT, "CGovernanceManager::%s Vote FUNDING %d for trigger:%s failed:%s\n", __func__, outcome, nHash.ToString(), exception.what());
+    if (!m_govman.ProcessVoteAndRelay(vote, exception, m_connman, m_peerman)) {
+        LogPrint(BCLog::GOBJECT, "%s -- Vote FUNDING %d for trigger:%s failed:%s\n", __func__, outcome, nHash.ToString(), exception.what());
         return false;
     }
 
     return true;
 }
 
-bool CGovernanceManager::HasAlreadyVotedFundingTrigger() const
+bool GovernanceSigner::HasAlreadyVotedFundingTrigger() const
 {
     return votedFundingYesTriggerHash.has_value();
 }
 
-void CGovernanceManager::ResetVotedFundingTrigger()
+void GovernanceSigner::ResetVotedFundingTrigger()
 {
     votedFundingYesTriggerHash = std::nullopt;
 }
+
+void GovernanceSigner::UpdatedBlockTip(const CBlockIndex* pindex)
+{
+    const auto sb_opt = CreateSuperblockCandidate(pindex->nHeight);
+    const auto trigger_opt = CreateGovernanceTrigger(sb_opt);
+    VoteGovernanceTriggers(trigger_opt);
+    {
+        LOCK(m_govman.cs);
+        CSuperblock_sptr pSuperblock;
+        if (m_govman.GetBestSuperblock(m_dmnman.GetListAtChainTip(), pSuperblock, pindex->nHeight)) {
+            ResetVotedFundingTrigger();
+        }
+    }
+}
diff --git a/src/governance/signing.h b/src/governance/signing.h
new file mode 100644
index 000000000000..77d6260145dc
--- /dev/null
+++ b/src/governance/signing.h
@@ -0,0 +1,56 @@
+// Copyright (c) 2014-2025 The Dash Core developers
+// Distributed under the MIT software license, see the accompanying
+// file COPYING or http://www.opensource.org/licenses/mit-license.php.
+
+#ifndef BITCOIN_GOVERNANCE_SIGNING_H
+#define BITCOIN_GOVERNANCE_SIGNING_H
+
+#include <governance/classes.h>
+#include <governance/object.h>
+
+#include <uint256.h>
+
+#include <optional>
+
+class CActiveMasternodeManager;
+class CBlockIndex;
+class CConnman;
+class CDeterministicMNManager;
+class CGovernanceManager;
+class ChainstateManager;
+class CMasternodeSync;
+class PeerManager;
+enum vote_outcome_enum_t : int;
+
+class GovernanceSigner
+{
+private:
+    CConnman& m_connman;
+    CDeterministicMNManager& m_dmnman;
+    CGovernanceManager& m_govman;
+    PeerManager& m_peerman;
+    const CActiveMasternodeManager& m_mn_activeman;
+    const ChainstateManager& m_chainman;
+    const CMasternodeSync& m_mn_sync;
+
+private:
+    std::optional<uint256> votedFundingYesTriggerHash{std::nullopt};
+
+public:
+    explicit GovernanceSigner(CConnman& connman, CDeterministicMNManager& dmnman, CGovernanceManager& govman,
+                              PeerManager& peerman, const CActiveMasternodeManager& mn_activeman,
+                              const ChainstateManager& chainman, const CMasternodeSync& mn_sync);
+    ~GovernanceSigner();
+
+    void UpdatedBlockTip(const CBlockIndex* pindex);
+
+private:
+    bool HasAlreadyVotedFundingTrigger() const;
+    bool VoteFundingTrigger(const uint256& nHash, const vote_outcome_enum_t outcome);
+    std::optional<const CGovernanceObject> CreateGovernanceTrigger(const std::optional<const CSuperblock>& sb_opt);
+    std::optional<const CSuperblock> CreateSuperblockCandidate(int nHeight) const;
+    void ResetVotedFundingTrigger();
+    void VoteGovernanceTriggers(const std::optional<const CGovernanceObject>& trigger_opt);
+};
+
+#endif // BITCOIN_GOVERNANCE_SIGNING_H
diff --git a/src/init.cpp b/src/init.cpp
index 55bb5fb72bcb..8b82d9a9e8dd 100644
--- a/src/init.cpp
+++ b/src/init.cpp
@@ -2140,7 +2140,7 @@ bool AppInitMain(NodeContext& node, interfaces::BlockAndHeaderTipInfo* tip_info)
     RegisterValidationInterface(node.peerman.get());
 
     g_ds_notification_interface = std::make_unique<CDSNotificationInterface>(
-        *node.connman, *node.mn_sync, *node.govman, *node.peerman, chainman, node.mn_activeman.get(), node.dmnman, node.llmq_ctx, node.cj_ctx
+        *node.connman, *node.mn_sync, *node.govman, *node.peerman, chainman, node.dmnman, node.llmq_ctx, node.cj_ctx
     );
     RegisterValidationInterface(g_ds_notification_interface.get());
 
@@ -2154,9 +2154,9 @@ bool AppInitMain(NodeContext& node, interfaces::BlockAndHeaderTipInfo* tip_info)
     assert(!node.active_ctx);
     assert(!g_active_notification_interface);
     if (node.mn_activeman) {
-        node.active_ctx = std::make_unique<ActiveContext>(chainman, *node.connman, *node.dmnman, *node.cj_ctx->dstxman, *node.mn_metaman, *node.mnhf_manager,
-                                                          *node.llmq_ctx, *node.sporkman, *node.mempool, *node.peerman, *node.mn_activeman,
-                                                          *node.mn_sync);
+        node.active_ctx = std::make_unique<ActiveContext>(chainman, *node.connman, *node.dmnman, *node.cj_ctx->dstxman, *node.govman, *node.mn_metaman,
+                                                          *node.mnhf_manager, *node.sporkman, *node.mempool, *node.llmq_ctx, *node.peerman,
+                                                          *node.mn_activeman, *node.mn_sync);
         g_active_notification_interface = std::make_unique<ActiveNotificationInterface>(*node.active_ctx, *node.mn_activeman);
         RegisterValidationInterface(g_active_notification_interface.get());
     }
diff --git a/src/masternode/active/context.cpp b/src/masternode/active/context.cpp
index 3fdfa75bad39..1cc39f8485e4 100644
--- a/src/masternode/active/context.cpp
+++ b/src/masternode/active/context.cpp
@@ -7,6 +7,7 @@
 #include <chainlock/chainlock.h>
 #include <chainlock/signing.h>
 #include <coinjoin/server.h>
+#include <governance/signing.h>
 #include <instantsend/instantsend.h>
 #include <instantsend/signing.h>
 #include <llmq/context.h>
@@ -14,9 +15,10 @@
 #include <validation.h>
 
 ActiveContext::ActiveContext(ChainstateManager& chainman, CConnman& connman, CDeterministicMNManager& dmnman,
-                             CDSTXManager& dstxman, CMasternodeMetaMan& mn_metaman, CMNHFManager& mnhfman,
-                             LLMQContext& llmq_ctx, CSporkManager& sporkman, CTxMemPool& mempool, PeerManager& peerman,
-                             const CActiveMasternodeManager& mn_activeman, const CMasternodeSync& mn_sync) :
+                             CDSTXManager& dstxman, CGovernanceManager& govman, CMasternodeMetaMan& mn_metaman,
+                             CMNHFManager& mnhfman, CSporkManager& sporkman, CTxMemPool& mempool, LLMQContext& llmq_ctx,
+                             PeerManager& peerman, const CActiveMasternodeManager& mn_activeman,
+                             const CMasternodeSync& mn_sync) :
     m_llmq_ctx{llmq_ctx},
     cl_signer{std::make_unique<chainlock::ChainLockSigner>(chainman.ActiveChainstate(), *llmq_ctx.clhandler,
                                                            *llmq_ctx.sigman, *llmq_ctx.shareman, sporkman, mn_sync)},
@@ -25,6 +27,7 @@ ActiveContext::ActiveContext(ChainstateManager& chainman, CConnman& connman, CDe
                                                                *llmq_ctx.qman, sporkman, mempool, mn_sync)},
     cj_server{std::make_unique<CCoinJoinServer>(chainman, connman, dmnman, dstxman, mn_metaman, mempool, peerman,
                                                 mn_activeman, mn_sync, *llmq_ctx.isman)},
+    gov_signer{std::make_unique<GovernanceSigner>(connman, dmnman, govman, peerman, mn_activeman, chainman, mn_sync)},
     ehf_sighandler{std::make_unique<llmq::CEHFSignalsHandler>(chainman, mnhfman, *llmq_ctx.sigman, *llmq_ctx.shareman,
                                                               *llmq_ctx.qman)}
 {
diff --git a/src/masternode/active/context.h b/src/masternode/active/context.h
index 7dd04a507b47..ca1cf697ecc9 100644
--- a/src/masternode/active/context.h
+++ b/src/masternode/active/context.h
@@ -13,11 +13,13 @@ class CCoinJoinServer;
 class CConnman;
 class CDeterministicMNManager;
 class CDSTXManager;
+class CGovernanceManager;
 class CMasternodeMetaMan;
 class CMasternodeSync;
 class CMNHFManager;
 class CSporkManager;
 class CTxMemPool;
+class GovernanceSigner;
 class PeerManager;
 struct LLMQContext;
 namespace chainlock {
@@ -46,9 +48,9 @@ struct ActiveContext {
     ActiveContext() = delete;
     ActiveContext(const ActiveContext&) = delete;
     ActiveContext(ChainstateManager& chainman, CConnman& connman, CDeterministicMNManager& dmnman,
-                  CDSTXManager& dstxman, CMasternodeMetaMan& mn_metaman, CMNHFManager& mnhfman, LLMQContext& llmq_ctx,
-                  CSporkManager& sporkman, CTxMemPool& mempool, PeerManager& peerman,
-                  const CActiveMasternodeManager& mn_activeman, const CMasternodeSync& mn_sync);
+                  CDSTXManager& dstxman, CGovernanceManager& govman, CMasternodeMetaMan& mn_metaman,
+                  CMNHFManager& mnhfman, CSporkManager& sporkman, CTxMemPool& mempool, LLMQContext& llmq_ctx,
+                  PeerManager& peerman, const CActiveMasternodeManager& mn_activeman, const CMasternodeSync& mn_sync);
     ~ActiveContext();
 
     /*
@@ -57,6 +59,7 @@ struct ActiveContext {
      * TODO: Move CActiveMasternodeManager here when dependents have been migrated
      */
     const std::unique_ptr<CCoinJoinServer> cj_server;
+    const std::unique_ptr<GovernanceSigner> gov_signer;
     const std::unique_ptr<llmq::CEHFSignalsHandler> ehf_sighandler;
 };
 
diff --git a/src/masternode/active/notificationinterface.cpp b/src/masternode/active/notificationinterface.cpp
index 215458a9e9dd..aee9f1917afc 100644
--- a/src/masternode/active/notificationinterface.cpp
+++ b/src/masternode/active/notificationinterface.cpp
@@ -4,6 +4,7 @@
 
 #include <masternode/active/notificationinterface.h>
 
+#include <governance/signing.h>
 #include <llmq/ehf_signals.h>
 #include <masternode/active/context.h>
 #include <masternode/node.h>
@@ -22,6 +23,7 @@ void ActiveNotificationInterface::UpdatedBlockTip(const CBlockIndex* pindexNew,
 
     m_mn_activeman.UpdatedBlockTip(pindexNew, pindexFork, fInitialDownload);
     m_active_ctx.ehf_sighandler->UpdatedBlockTip(pindexNew);
+    m_active_ctx.gov_signer->UpdatedBlockTip(pindexNew);
 }
 
 std::unique_ptr<ActiveNotificationInterface> g_active_notification_interface;
diff --git a/src/node/interfaces.cpp b/src/node/interfaces.cpp
index 420dd9f6baf3..14177a6b3a13 100644
--- a/src/node/interfaces.cpp
+++ b/src/node/interfaces.cpp
@@ -12,6 +12,7 @@
 #include <coinjoin/common.h>
 #include <deploymentstatus.h>
 #include <evo/deterministicmns.h>
+#include <governance/classes.h>
 #include <governance/exceptions.h>
 #include <governance/governance.h>
 #include <governance/object.h>
diff --git a/src/qt/governancelist.h b/src/qt/governancelist.h
index 1f696d7f1669..dd79fe51e571 100644
--- a/src/qt/governancelist.h
+++ b/src/qt/governancelist.h
@@ -5,13 +5,14 @@
 #ifndef BITCOIN_QT_GOVERNANCELIST_H
 #define BITCOIN_QT_GOVERNANCELIST_H
 
-#include <governance/object.h>
-#include <governance/vote.h>
 #include <primitives/transaction.h>
+#include <pubkey.h>
 #include <qt/bitcoinunits.h>
 #include <sync.h>
 #include <util/system.h>
 
+#include <governance/object.h>
+
 #include <QAbstractTableModel>
 #include <QDateTime>
 #include <QMenu>
@@ -28,12 +29,14 @@ namespace Ui {
 class GovernanceList;
 }
 
-class CDeterministicMNList;
 class ClientModel;
 class ProposalModel;
 class WalletModel;
 class ProposalWizard;
 
+class CDeterministicMNList;
+enum vote_outcome_enum_t : int;
+
 /** Governance Manager page widget */
 class GovernanceList : public QWidget
 {
diff --git a/src/wallet/interfaces.cpp b/src/wallet/interfaces.cpp
index 324bea3952a1..4c134c76220e 100644
--- a/src/wallet/interfaces.cpp
+++ b/src/wallet/interfaces.cpp
@@ -30,7 +30,6 @@
 #include <wallet/rpc/wallet.h>
 #include <wallet/spend.h>
 #include <wallet/wallet.h>
-#include <governance/object.h>
 #include <governance/validators.h>
 #include <evo/deterministicmns.h>
 #include <masternode/sync.h>
diff --git a/test/functional/feature_governance.py b/test/functional/feature_governance.py
index 9ed1e59d4991..82025d06d6cd 100755
--- a/test/functional/feature_governance.py
+++ b/test/functional/feature_governance.py
@@ -317,7 +317,7 @@ def sync_gov(node):
         self.bump_mocktime(GOVERNANCE_UPDATE_MIN + 1, update_schedulers=False)
 
         self.log.info("Move another block inside the Superblock maturity window")
-        with self.nodes[1].assert_debug_log(["CGovernanceManager::VoteGovernanceTriggers"]):
+        with self.nodes[1].assert_debug_log(["VoteGovernanceTriggers --"]):
             self.bump_mocktime(1)
             self.generate(self.nodes[0], 1, sync_fun=self.sync_blocks())
 

From 757ded31dd715796d7546500b21c37a35db9e698 Mon Sep 17 00:00:00 2001
From: Kittywhiskers Van Gogh <63189531+kwvg@users.noreply.github.com>
Date: Mon, 6 Oct 2025 18:10:15 +0000
Subject: [PATCH 140/656] refactor: remove need for access to private members

---
 src/governance/governance.cpp | 81 ++++++++++++++++++++++++++++-------
 src/governance/governance.h   | 22 +++++++---
 src/governance/signing.cpp    | 46 +++-----------------
 3 files changed, 87 insertions(+), 62 deletions(-)

diff --git a/src/governance/governance.cpp b/src/governance/governance.cpp
index 3e6d78b7e045..448baaa477f0 100644
--- a/src/governance/governance.cpp
+++ b/src/governance/governance.cpp
@@ -505,21 +505,25 @@ const CGovernanceObject* CGovernanceManager::FindConstGovernanceObject(const uin
 
 CGovernanceObject* CGovernanceManager::FindGovernanceObject(const uint256& nHash)
 {
-    AssertLockHeld(cs);
+    AssertLockNotHeld(cs);
+    LOCK(cs);
+    return FindGovernanceObjectInternal(nHash);
+}
 
+CGovernanceObject* CGovernanceManager::FindGovernanceObjectInternal(const uint256& nHash)
+{
+    AssertLockHeld(cs);
     if (mapObjects.count(nHash)) return &mapObjects[nHash];
-
     return nullptr;
 }
 
 CGovernanceObject* CGovernanceManager::FindGovernanceObjectByDataHash(const uint256 &nDataHash)
 {
-    AssertLockHeld(cs);
-
+    AssertLockNotHeld(cs);
+    LOCK(cs);
     for (const auto& [nHash, object] : mapObjects) {
         if (object.GetDataHash() == nDataHash) return &mapObjects[nHash];
     }
-
     return nullptr;
 }
 
@@ -1392,7 +1396,7 @@ bool CGovernanceManager::AddNewTrigger(uint256 nHash)
 
     CSuperblock_sptr pSuperblock;
     try {
-        const CGovernanceObject* pGovObj = FindGovernanceObject(nHash);
+        const CGovernanceObject* pGovObj = FindGovernanceObjectInternal(nHash);
         if (!pGovObj) {
             throw std::runtime_error("CSuperblock: Failed to find Governance Object");
         }
@@ -1434,7 +1438,7 @@ void CGovernanceManager::CleanAndRemoveTriggers()
             LogPrint(BCLog::GOBJECT, "CGovernanceManager::%s -- nullptr superblock\n", __func__);
             remove = true;
         } else {
-            pObj = FindGovernanceObject(it->first);
+            pObj = FindGovernanceObjectInternal(it->first);
             if (!pObj || pObj->GetObjectType() != GovernanceObject::TRIGGER) {
                 LogPrint(BCLog::GOBJECT, "CGovernanceManager::%s -- Unknown or non-trigger superblock\n", __func__);
                 pSuperblock->SetStatus(SeenObjectStatus::ErrorInvalid);
@@ -1487,8 +1491,14 @@ void CGovernanceManager::CleanAndRemoveTriggers()
  *   - Look through triggers and scan for active ones
  *   - Return the triggers in a list
  */
-
 std::vector<CSuperblock_sptr> CGovernanceManager::GetActiveTriggers() const
+{
+    AssertLockNotHeld(cs);
+    LOCK(cs);
+    return GetActiveTriggersInternal();
+}
+
+std::vector<CSuperblock_sptr> CGovernanceManager::GetActiveTriggersInternal() const
 {
     AssertLockHeld(cs);
     std::vector<CSuperblock_sptr> vecResults;
@@ -1513,7 +1523,7 @@ bool CGovernanceManager::IsSuperblockTriggered(const CDeterministicMNList& tip_m
 
     LOCK(cs);
     // GET ALL ACTIVE TRIGGERS
-    std::vector<CSuperblock_sptr> vecTriggers = GetActiveTriggers();
+    std::vector<CSuperblock_sptr> vecTriggers = GetActiveTriggersInternal();
 
     LogPrint(BCLog::GOBJECT, "IsSuperblockTriggered -- vecTriggers.size() = %d\n", vecTriggers.size());
 
@@ -1523,7 +1533,7 @@ bool CGovernanceManager::IsSuperblockTriggered(const CDeterministicMNList& tip_m
             continue;
         }
 
-        CGovernanceObject* pObj = FindGovernanceObject(pSuperblock->GetGovernanceObjHash());
+        CGovernanceObject* pObj = FindGovernanceObjectInternal(pSuperblock->GetGovernanceObjHash());
         if (!pObj) {
             LogPrintf("IsSuperblockTriggered -- pObj == nullptr, continuing\n");
             continue;
@@ -1556,16 +1566,23 @@ bool CGovernanceManager::IsSuperblockTriggered(const CDeterministicMNList& tip_m
     return false;
 }
 
-
 bool CGovernanceManager::GetBestSuperblock(const CDeterministicMNList& tip_mn_list, CSuperblock_sptr& pSuperblockRet,
                                            int nBlockHeight)
+{
+    AssertLockNotHeld(cs);
+    LOCK(cs);
+    return GetBestSuperblockInternal(tip_mn_list, pSuperblockRet, nBlockHeight);
+}
+
+bool CGovernanceManager::GetBestSuperblockInternal(const CDeterministicMNList& tip_mn_list, CSuperblock_sptr& pSuperblockRet,
+                                            int nBlockHeight)
 {
     if (!CSuperblock::IsValidBlockHeight(nBlockHeight)) {
         return false;
     }
 
     AssertLockHeld(cs);
-    std::vector<CSuperblock_sptr> vecTriggers = GetActiveTriggers();
+    std::vector<CSuperblock_sptr> vecTriggers = GetActiveTriggersInternal();
     int nYesCount = 0;
 
     for (const auto& pSuperblock : vecTriggers) {
@@ -1573,7 +1590,7 @@ bool CGovernanceManager::GetBestSuperblock(const CDeterministicMNList& tip_mn_li
             continue;
         }
 
-        const CGovernanceObject* pObj = FindGovernanceObject(pSuperblock->GetGovernanceObjHash());
+        const CGovernanceObject* pObj = FindGovernanceObjectInternal(pSuperblock->GetGovernanceObjHash());
         if (!pObj) {
             continue;
         }
@@ -1598,7 +1615,7 @@ bool CGovernanceManager::GetSuperblockPayments(const CDeterministicMNList& tip_m
     // GET THE BEST SUPERBLOCK FOR THIS BLOCK HEIGHT
 
     CSuperblock_sptr pSuperblock;
-    if (!GetBestSuperblock(tip_mn_list, pSuperblock, nBlockHeight)) {
+    if (!GetBestSuperblockInternal(tip_mn_list, pSuperblock, nBlockHeight)) {
         LogPrint(BCLog::GOBJECT, "GetSuperblockPayments -- Can't find superblock for height %d\n", nBlockHeight);
         return false;
     }
@@ -1644,7 +1661,7 @@ bool CGovernanceManager::IsValidSuperblock(const CChain& active_chain, const CDe
     LOCK(cs);
 
     CSuperblock_sptr pSuperblock;
-    if (GetBestSuperblock(tip_mn_list, pSuperblock, nBlockHeight)) {
+    if (GetBestSuperblockInternal(tip_mn_list, pSuperblock, nBlockHeight)) {
         return pSuperblock->IsValid(active_chain, txNew, nBlockHeight, blockReward);
     }
 
@@ -1656,13 +1673,45 @@ void CGovernanceManager::ExecuteBestSuperblock(const CDeterministicMNList& tip_m
     LOCK(cs);
 
     CSuperblock_sptr pSuperblock;
-    if (GetBestSuperblock(tip_mn_list, pSuperblock, nBlockHeight)) {
+    if (GetBestSuperblockInternal(tip_mn_list, pSuperblock, nBlockHeight)) {
         // All checks are done in CSuperblock::IsValid via IsBlockValueValid and IsBlockPayeeValid,
         // tip wouldn't be updated if anything was wrong. Mark this trigger as executed.
         pSuperblock->SetExecuted();
     }
 }
 
+std::vector<std::shared_ptr<const CGovernanceObject>> CGovernanceManager::GetApprovedProposals(const CDeterministicMNList& tip_mn_list)
+{
+    AssertLockNotHeld(cs);
+
+    // Use std::vector of std::shared_ptr<const CGovernanceObject> because CGovernanceObject doesn't support move operations (needed for sorting the vector later)
+    std::vector<std::shared_ptr<const CGovernanceObject>> ret{};
+
+    // A proposal is considered passing if (YES votes) >= (Total Weight of Masternodes / 10),
+    // count total valid (ENABLED) masternodes to determine passing threshold.
+    const int nWeightedMnCount = tip_mn_list.GetValidWeightedMNsCount();
+    const int nAbsVoteReq = std::max(Params().GetConsensus().nGovernanceMinQuorum, nWeightedMnCount / 10);
+
+    LOCK(cs);
+    for (const auto& [unused, object] : mapObjects) {
+        // Skip all non-proposals objects
+        if (object.GetObjectType() != GovernanceObject::PROPOSAL) continue;
+        // Skip non-passing proposals
+        const int absYesCount = object.GetAbsoluteYesCount(tip_mn_list, VOTE_SIGNAL_FUNDING);
+        if (absYesCount < nAbsVoteReq) continue;
+        ret.emplace_back(std::make_shared<const CGovernanceObject>(object));
+    }
+
+    // Sort approved proposals by absolute Yes votes descending
+    std::sort(ret.begin(), ret.end(), [&tip_mn_list](auto& lhs, auto& rhs) {
+        const auto lhs_yes = lhs->GetAbsoluteYesCount(tip_mn_list, VOTE_SIGNAL_FUNDING);
+        const auto rhs_yes = rhs->GetAbsoluteYesCount(tip_mn_list, VOTE_SIGNAL_FUNDING);
+        return lhs_yes == rhs_yes ? UintToArith256(lhs->GetHash()) > UintToArith256(rhs->GetHash()) : lhs_yes > rhs_yes;
+    });
+
+    return ret;
+}
+
 bool AreSuperblocksEnabled(const CSporkManager& sporkman)
 {
     return sporkman.IsSporkActive(SPORK_9_SUPERBLOCKS_ENABLED);
diff --git a/src/governance/governance.h b/src/governance/governance.h
index 9ecd9b391ff7..4e350e9feb42 100644
--- a/src/governance/governance.h
+++ b/src/governance/governance.h
@@ -292,8 +292,8 @@ class CGovernanceManager : public GovernanceStore
     void DoMaintenance(CConnman& connman);
 
     const CGovernanceObject* FindConstGovernanceObject(const uint256& nHash) const EXCLUSIVE_LOCKS_REQUIRED(cs);
-    CGovernanceObject* FindGovernanceObject(const uint256& nHash) EXCLUSIVE_LOCKS_REQUIRED(cs);
-    CGovernanceObject* FindGovernanceObjectByDataHash(const uint256& nDataHash) EXCLUSIVE_LOCKS_REQUIRED(cs);
+    CGovernanceObject* FindGovernanceObject(const uint256& nHash) EXCLUSIVE_LOCKS_REQUIRED(!cs);
+    CGovernanceObject* FindGovernanceObjectByDataHash(const uint256& nDataHash) EXCLUSIVE_LOCKS_REQUIRED(!cs);
     void DeleteGovernanceObject(const uint256& nHash);
 
     // These commands are only used in RPC
@@ -352,7 +352,7 @@ class CGovernanceManager : public GovernanceStore
      *   - Track governance objects which are triggers
      *   - After triggers are activated and executed, they can be removed
     */
-    std::vector<std::shared_ptr<CSuperblock>> GetActiveTriggers() const EXCLUSIVE_LOCKS_REQUIRED(cs);
+    std::vector<std::shared_ptr<CSuperblock>> GetActiveTriggers() const EXCLUSIVE_LOCKS_REQUIRED(!cs);
     bool AddNewTrigger(uint256 nHash) EXCLUSIVE_LOCKS_REQUIRED(cs);
     void CleanAndRemoveTriggers() EXCLUSIVE_LOCKS_REQUIRED(cs);
 
@@ -376,11 +376,21 @@ class CGovernanceManager : public GovernanceStore
     bool IsValidSuperblock(const CChain& active_chain, const CDeterministicMNList& tip_mn_list,
                            const CTransaction& txNew, int nBlockHeight, CAmount blockReward);
 
-private:
-    void ExecuteBestSuperblock(const CDeterministicMNList& tip_mn_list, int nBlockHeight);
     bool GetBestSuperblock(const CDeterministicMNList& tip_mn_list, CSuperblock_sptr& pSuperblockRet, int nBlockHeight)
+        EXCLUSIVE_LOCKS_REQUIRED(!cs);
+
+    std::vector<std::shared_ptr<const CGovernanceObject>> GetApprovedProposals(const CDeterministicMNList& tip_mn_list)
+        EXCLUSIVE_LOCKS_REQUIRED(!cs);
+
+private:
+    //! Internal functions that require locks to be held
+    CGovernanceObject* FindGovernanceObjectInternal(const uint256& nHash) EXCLUSIVE_LOCKS_REQUIRED(cs);
+    std::vector<std::shared_ptr<CSuperblock>> GetActiveTriggersInternal() const EXCLUSIVE_LOCKS_REQUIRED(cs);
+    bool GetBestSuperblockInternal(const CDeterministicMNList& tip_mn_list, CSuperblock_sptr& pSuperblockRet, int nBlockHeight)
         EXCLUSIVE_LOCKS_REQUIRED(cs);
 
+    void ExecuteBestSuperblock(const CDeterministicMNList& tip_mn_list, int nBlockHeight);
+
     void RequestGovernanceObject(CNode* pfrom, const uint256& nHash, CConnman& connman, bool fUseFilter = false) const;
 
     void AddInvalidVote(const CGovernanceVote& vote);
@@ -401,8 +411,6 @@ class CGovernanceManager : public GovernanceStore
     void CleanOrphanObjects();
 
     void RemoveInvalidVotes();
-
-    friend class GovernanceSigner;
 };
 
 bool AreSuperblocksEnabled(const CSporkManager& sporkman);
diff --git a/src/governance/signing.cpp b/src/governance/signing.cpp
index 86b9ae5137bf..184a3fcbf600 100644
--- a/src/governance/signing.cpp
+++ b/src/governance/signing.cpp
@@ -40,36 +40,7 @@ std::optional<const CSuperblock> GovernanceSigner::CreateSuperblockCandidate(int
     if (nHeight % Params().GetConsensus().nSuperblockCycle < Params().GetConsensus().nSuperblockCycle - Params().GetConsensus().nSuperblockMaturityWindow) return std::nullopt;
     if (HasAlreadyVotedFundingTrigger()) return std::nullopt;
 
-    // A proposal is considered passing if (YES votes) >= (Total Weight of Masternodes / 10),
-    // count total valid (ENABLED) masternodes to determine passing threshold.
-    const auto tip_mn_list = m_dmnman.GetListAtChainTip();
-    const int nWeightedMnCount = tip_mn_list.GetValidWeightedMNsCount();
-    const int nAbsVoteReq = std::max(Params().GetConsensus().nGovernanceMinQuorum, nWeightedMnCount / 10);
-
-    // Use std::vector of std::shared_ptr<const CGovernanceObject> because CGovernanceObject doesn't support move operations (needed for sorting the vector later)
-    std::vector<std::shared_ptr<const CGovernanceObject>> approvedProposals;
-
-    {
-        LOCK(m_govman.cs);
-        for (const auto& [unused, object] : m_govman.mapObjects) {
-            // Skip all non-proposals objects
-            if (object.GetObjectType() != GovernanceObject::PROPOSAL) continue;
-
-            const int absYesCount = object.GetAbsoluteYesCount(tip_mn_list, VOTE_SIGNAL_FUNDING);
-            // Skip non-passing proposals
-            if (absYesCount < nAbsVoteReq) continue;
-
-            approvedProposals.emplace_back(std::make_shared<const CGovernanceObject>(object));
-        }
-    } // cs
-
-    // Sort approved proposals by absolute Yes votes descending
-    std::sort(approvedProposals.begin(), approvedProposals.end(), [tip_mn_list](std::shared_ptr<const CGovernanceObject> a, std::shared_ptr<const CGovernanceObject> b) {
-        const auto a_yes = a->GetAbsoluteYesCount(tip_mn_list, VOTE_SIGNAL_FUNDING);
-        const auto b_yes = b->GetAbsoluteYesCount(tip_mn_list, VOTE_SIGNAL_FUNDING);
-        return a_yes == b_yes ? UintToArith256(a->GetHash()) > UintToArith256(b->GetHash()) : a_yes > b_yes;
-    });
-
+    const auto approvedProposals = m_govman.GetApprovedProposals(m_dmnman.GetListAtChainTip());
     if (approvedProposals.empty()) {
         LogPrint(BCLog::GOBJECT, "%s -- nHeight:%d empty approvedProposals\n", __func__, nHeight);
         return std::nullopt;
@@ -148,7 +119,7 @@ std::optional<const CGovernanceObject> GovernanceSigner::CreateGovernanceTrigger
     if (!sb_opt.has_value()) return std::nullopt;
 
     //TODO: Check if nHashParentIn, nRevision and nCollateralHashIn are correct
-    LOCK2(::cs_main, m_govman.cs);
+    LOCK(::cs_main);
 
     // Check if identical trigger (equal DataHash()) is already created (signed by other masternode)
     CGovernanceObject gov_sb(uint256(), 1, GetAdjustedTime(), uint256(), sb_opt.value().GetHexStrData());
@@ -194,7 +165,7 @@ void GovernanceSigner::VoteGovernanceTriggers(const std::optional<const CGoverna
     // only active masternodes can vote on triggers
     if (m_mn_activeman.GetProTxHash().IsNull()) return;
 
-    LOCK2(::cs_main, m_govman.cs);
+    LOCK(::cs_main);
 
     if (trigger_opt.has_value()) {
         // We should never vote "yes" on another trigger or the same trigger twice
@@ -239,7 +210,7 @@ void GovernanceSigner::VoteGovernanceTriggers(const std::optional<const CGoverna
     for (const auto& trigger : activeTriggers) {
         const auto govobj = m_govman.FindGovernanceObject(trigger->GetGovernanceObjHash());
         const uint256 trigger_hash = govobj->GetHash();
-        if (trigger->GetBlockHeight() <= m_govman.nCachedBlockHeight) {
+        if (trigger->GetBlockHeight() <= m_govman.GetCachedBlockHeight()) {
             // ignore triggers from the past
             LogPrint(BCLog::GOBJECT, "%s -- Not voting NO-FUNDING for outdated trigger:%s\n", __func__, trigger_hash.ToString());
             continue;
@@ -303,11 +274,8 @@ void GovernanceSigner::UpdatedBlockTip(const CBlockIndex* pindex)
     const auto sb_opt = CreateSuperblockCandidate(pindex->nHeight);
     const auto trigger_opt = CreateGovernanceTrigger(sb_opt);
     VoteGovernanceTriggers(trigger_opt);
-    {
-        LOCK(m_govman.cs);
-        CSuperblock_sptr pSuperblock;
-        if (m_govman.GetBestSuperblock(m_dmnman.GetListAtChainTip(), pSuperblock, pindex->nHeight)) {
-            ResetVotedFundingTrigger();
-        }
+    CSuperblock_sptr pSuperblock;
+    if (m_govman.GetBestSuperblock(m_dmnman.GetListAtChainTip(), pSuperblock, pindex->nHeight)) {
+        ResetVotedFundingTrigger();
     }
 }

From 63448ff1cc50e5363e205b7554309f826bda9fb3 Mon Sep 17 00:00:00 2001
From: Kittywhiskers Van Gogh <63189531+kwvg@users.noreply.github.com>
Date: Fri, 12 Sep 2025 14:02:12 +0000
Subject: [PATCH 141/656] refactor: abstract away parent implementation from
 signer

---
 src/governance/governance.h       | 26 +++++++++++++++-----------
 src/governance/signing.cpp        |  3 +--
 src/governance/signing.h          | 28 +++++++++++++++++++++++++---
 src/masternode/active/context.cpp |  1 +
 4 files changed, 42 insertions(+), 16 deletions(-)

diff --git a/src/governance/governance.h b/src/governance/governance.h
index 4e350e9feb42..9e1219a1458c 100644
--- a/src/governance/governance.h
+++ b/src/governance/governance.h
@@ -7,12 +7,16 @@
 
 #include <cachemap.h>
 #include <cachemultimap.h>
+#include <governance/signing.h>
+
 #include <protocol.h>
 #include <sync.h>
 
+#include <chrono>
 #include <limits>
 #include <map>
 #include <memory>
+#include <optional>
 #include <set>
 #include <string>
 #include <string_view>
@@ -236,7 +240,7 @@ class GovernanceStore
 //
 // Governance Manager : Contains all proposals for the budget
 //
-class CGovernanceManager : public GovernanceStore
+class CGovernanceManager : public GovernanceStore, public GovernanceSignerParent
 {
     friend class CGovernanceObject;
 
@@ -275,7 +279,7 @@ class CGovernanceManager : public GovernanceStore
 
     bool LoadCache(bool load_cache);
 
-    bool IsValid() const { return is_valid; }
+    bool IsValid() const override { return is_valid; }
 
     /**
      * This is called by AlreadyHave in net_processing.cpp as part of the inventory
@@ -292,15 +296,15 @@ class CGovernanceManager : public GovernanceStore
     void DoMaintenance(CConnman& connman);
 
     const CGovernanceObject* FindConstGovernanceObject(const uint256& nHash) const EXCLUSIVE_LOCKS_REQUIRED(cs);
-    CGovernanceObject* FindGovernanceObject(const uint256& nHash) EXCLUSIVE_LOCKS_REQUIRED(!cs);
-    CGovernanceObject* FindGovernanceObjectByDataHash(const uint256& nDataHash) EXCLUSIVE_LOCKS_REQUIRED(!cs);
+    CGovernanceObject* FindGovernanceObject(const uint256& nHash) override EXCLUSIVE_LOCKS_REQUIRED(!cs);
+    CGovernanceObject* FindGovernanceObjectByDataHash(const uint256& nDataHash) override EXCLUSIVE_LOCKS_REQUIRED(!cs);
     void DeleteGovernanceObject(const uint256& nHash);
 
     // These commands are only used in RPC
     std::vector<CGovernanceVote> GetCurrentVotes(const uint256& nParentHash, const COutPoint& mnCollateralOutpointFilter) const;
     void GetAllNewerThan(std::vector<CGovernanceObject>& objs, int64_t nMoreThanTime) const;
 
-    void AddGovernanceObject(CGovernanceObject& govobj, PeerManager& peerman, const CNode* pfrom = nullptr);
+    void AddGovernanceObject(CGovernanceObject& govobj, PeerManager& peerman, const CNode* pfrom = nullptr) override;
 
     void CheckAndRemove();
 
@@ -310,7 +314,7 @@ class CGovernanceManager : public GovernanceStore
     int64_t GetLastDiffTime() const { return nTimeLastDiff; }
     void UpdateLastDiffTime(int64_t nTimeIn) { nTimeLastDiff = nTimeIn; }
 
-    int GetCachedBlockHeight() const { return nCachedBlockHeight; }
+    int GetCachedBlockHeight() const override { return nCachedBlockHeight; }
 
     // Accessors for thread-safe access to maps
     bool HaveObjectForHash(const uint256& nHash) const;
@@ -327,11 +331,11 @@ class CGovernanceManager : public GovernanceStore
 
     void MasternodeRateUpdate(const CGovernanceObject& govobj);
 
-    bool MasternodeRateCheck(const CGovernanceObject& govobj, bool fUpdateFailStatus = false);
+    bool MasternodeRateCheck(const CGovernanceObject& govobj, bool fUpdateFailStatus = false) override;
 
     bool MasternodeRateCheck(const CGovernanceObject& govobj, bool fUpdateFailStatus, bool fForce, bool& fRateCheckBypassed);
 
-    bool ProcessVoteAndRelay(const CGovernanceVote& vote, CGovernanceException& exception, CConnman& connman, PeerManager& peerman);
+    bool ProcessVoteAndRelay(const CGovernanceVote& vote, CGovernanceException& exception, CConnman& connman, PeerManager& peerman) override;
 
     void CheckPostponedObjects(PeerManager& peerman);
 
@@ -352,7 +356,7 @@ class CGovernanceManager : public GovernanceStore
      *   - Track governance objects which are triggers
      *   - After triggers are activated and executed, they can be removed
     */
-    std::vector<std::shared_ptr<CSuperblock>> GetActiveTriggers() const EXCLUSIVE_LOCKS_REQUIRED(!cs);
+    std::vector<std::shared_ptr<CSuperblock>> GetActiveTriggers() const override EXCLUSIVE_LOCKS_REQUIRED(!cs);
     bool AddNewTrigger(uint256 nHash) EXCLUSIVE_LOCKS_REQUIRED(cs);
     void CleanAndRemoveTriggers() EXCLUSIVE_LOCKS_REQUIRED(cs);
 
@@ -376,10 +380,10 @@ class CGovernanceManager : public GovernanceStore
     bool IsValidSuperblock(const CChain& active_chain, const CDeterministicMNList& tip_mn_list,
                            const CTransaction& txNew, int nBlockHeight, CAmount blockReward);
 
-    bool GetBestSuperblock(const CDeterministicMNList& tip_mn_list, CSuperblock_sptr& pSuperblockRet, int nBlockHeight)
+    bool GetBestSuperblock(const CDeterministicMNList& tip_mn_list, CSuperblock_sptr& pSuperblockRet, int nBlockHeight) override
         EXCLUSIVE_LOCKS_REQUIRED(!cs);
 
-    std::vector<std::shared_ptr<const CGovernanceObject>> GetApprovedProposals(const CDeterministicMNList& tip_mn_list)
+    std::vector<std::shared_ptr<const CGovernanceObject>> GetApprovedProposals(const CDeterministicMNList& tip_mn_list) override
         EXCLUSIVE_LOCKS_REQUIRED(!cs);
 
 private:
diff --git a/src/governance/signing.cpp b/src/governance/signing.cpp
index 184a3fcbf600..3374752df949 100644
--- a/src/governance/signing.cpp
+++ b/src/governance/signing.cpp
@@ -6,7 +6,6 @@
 
 #include <evo/deterministicmns.h>
 #include <governance/classes.h>
-#include <governance/governance.h>
 #include <masternode/node.h>
 #include <masternode/sync.h>
 
@@ -18,7 +17,7 @@
 
 #include <algorithm>
 
-GovernanceSigner::GovernanceSigner(CConnman& connman, CDeterministicMNManager& dmnman, CGovernanceManager& govman,
+GovernanceSigner::GovernanceSigner(CConnman& connman, CDeterministicMNManager& dmnman, GovernanceSignerParent& govman,
                                    PeerManager& peerman, const CActiveMasternodeManager& mn_activeman,
                                    const ChainstateManager& chainman, const CMasternodeSync& mn_sync) :
     m_connman{connman},
diff --git a/src/governance/signing.h b/src/governance/signing.h
index 77d6260145dc..044d103157d0 100644
--- a/src/governance/signing.h
+++ b/src/governance/signing.h
@@ -10,24 +10,46 @@
 
 #include <uint256.h>
 
+#include <memory>
 #include <optional>
+#include <vector>
 
 class CActiveMasternodeManager;
 class CBlockIndex;
 class CConnman;
+class CDeterministicMNList;
 class CDeterministicMNManager;
-class CGovernanceManager;
+class CGovernanceException;
+class CGovernanceVote;
 class ChainstateManager;
 class CMasternodeSync;
+class CNode;
 class PeerManager;
 enum vote_outcome_enum_t : int;
 
+class GovernanceSignerParent
+{
+public:
+    virtual ~GovernanceSignerParent() = default;
+
+    virtual bool IsValid() const = 0;
+    virtual bool GetBestSuperblock(const CDeterministicMNList& tip_mn_list, std::shared_ptr<CSuperblock>& pSuperblockRet, int nBlockHeight) = 0;
+    virtual bool MasternodeRateCheck(const CGovernanceObject& govobj, bool fUpdateFailStatus = false) = 0;
+    virtual bool ProcessVoteAndRelay(const CGovernanceVote& vote, CGovernanceException& exception, CConnman& connman, PeerManager& peerman) = 0;
+    virtual int GetCachedBlockHeight() const = 0;
+    virtual CGovernanceObject* FindGovernanceObject(const uint256& nHash) = 0;
+    virtual CGovernanceObject* FindGovernanceObjectByDataHash(const uint256& nDataHash) = 0;
+    virtual std::vector<std::shared_ptr<CSuperblock>> GetActiveTriggers() const = 0;
+    virtual std::vector<std::shared_ptr<const CGovernanceObject>> GetApprovedProposals(const CDeterministicMNList& tip_mn_list) = 0;
+    virtual void AddGovernanceObject(CGovernanceObject& govobj, PeerManager& peerman, const CNode* pfrom = nullptr) = 0;
+};
+
 class GovernanceSigner
 {
 private:
     CConnman& m_connman;
     CDeterministicMNManager& m_dmnman;
-    CGovernanceManager& m_govman;
+    GovernanceSignerParent& m_govman;
     PeerManager& m_peerman;
     const CActiveMasternodeManager& m_mn_activeman;
     const ChainstateManager& m_chainman;
@@ -37,7 +59,7 @@ class GovernanceSigner
     std::optional<uint256> votedFundingYesTriggerHash{std::nullopt};
 
 public:
-    explicit GovernanceSigner(CConnman& connman, CDeterministicMNManager& dmnman, CGovernanceManager& govman,
+    explicit GovernanceSigner(CConnman& connman, CDeterministicMNManager& dmnman, GovernanceSignerParent& govman,
                               PeerManager& peerman, const CActiveMasternodeManager& mn_activeman,
                               const ChainstateManager& chainman, const CMasternodeSync& mn_sync);
     ~GovernanceSigner();
diff --git a/src/masternode/active/context.cpp b/src/masternode/active/context.cpp
index 1cc39f8485e4..7b8df853e7ea 100644
--- a/src/masternode/active/context.cpp
+++ b/src/masternode/active/context.cpp
@@ -7,6 +7,7 @@
 #include <chainlock/chainlock.h>
 #include <chainlock/signing.h>
 #include <coinjoin/server.h>
+#include <governance/governance.h>
 #include <governance/signing.h>
 #include <instantsend/instantsend.h>
 #include <instantsend/signing.h>

From 38119244a01ee05162c8a2eca76fca1fbf1bbdd8 Mon Sep 17 00:00:00 2001
From: Kittywhiskers Van Gogh <63189531+kwvg@users.noreply.github.com>
Date: Fri, 12 Sep 2025 10:04:43 +0000
Subject: [PATCH 142/656] governance: drop `Relay()` from
 `CGovernance{Object,Vote}`

---
 src/governance/governance.cpp | 40 +++++++++++++++++++++++++++++------
 src/governance/governance.h   |  3 +++
 src/governance/object.cpp     | 12 -----------
 src/governance/object.h       |  3 ---
 src/governance/vote.cpp       | 17 ---------------
 src/governance/vote.h         |  2 --
 src/node/interfaces.cpp       |  2 +-
 src/rpc/governance.cpp        |  2 +-
 8 files changed, 39 insertions(+), 42 deletions(-)

diff --git a/src/governance/governance.cpp b/src/governance/governance.cpp
index 448baaa477f0..b9f594956e71 100644
--- a/src/governance/governance.cpp
+++ b/src/governance/governance.cpp
@@ -98,6 +98,34 @@ bool CGovernanceManager::LoadCache(bool load_cache)
     return is_valid;
 }
 
+void CGovernanceManager::RelayMessage(PeerManager& peerman, const CGovernanceObject& obj) const
+{
+    if (!m_mn_sync.IsSynced()) {
+        LogPrint(BCLog::GOBJECT, "%s -- won't relay until fully synced\n", __func__);
+        return;
+    }
+
+    CInv inv(MSG_GOVERNANCE_OBJECT, obj.GetHash());
+    peerman.RelayInv(inv);
+}
+
+void CGovernanceManager::RelayMessage(PeerManager& peerman, const CGovernanceVote& vote) const
+{
+    if (!m_mn_sync.IsSynced()) {
+        LogPrint(BCLog::GOBJECT, "%s -- won't relay until fully synced\n", __func__);
+        return;
+    }
+
+    const auto tip_mn_list = Assert(m_dmnman)->GetListAtChainTip();
+    auto dmn = tip_mn_list.GetMNByCollateral(vote.GetMasternodeOutpoint());
+    if (!dmn) {
+        return;
+    }
+
+    CInv inv(MSG_GOVERNANCE_OBJECT_VOTE, vote.GetHash());
+    peerman.RelayInv(inv);
+}
+
 // Accessors for thread-safe access to maps
 bool CGovernanceManager::HaveObjectForHash(const uint256& nHash) const
 {
@@ -273,7 +301,7 @@ MessageProcessingResult CGovernanceManager::ProcessMessage(CNode& peer, CConnman
         if (ProcessVote(&peer, vote, exception, connman)) {
             LogPrint(BCLog::GOBJECT, "MNGOVERNANCEOBJECTVOTE -- %s new\n", strHash);
             m_mn_sync.BumpAssetLastTime("MNGOVERNANCEOBJECTVOTE");
-            vote.Relay(peerman, m_mn_sync, tip_mn_list);
+            RelayMessage(peerman, vote);
         } else {
             LogPrint(BCLog::GOBJECT, "MNGOVERNANCEOBJECTVOTE -- Rejected vote, error = %s\n", exception.what());
             if ((exception.GetNodePenalty() != 0) && m_mn_sync.IsSynced()) {
@@ -305,7 +333,7 @@ void CGovernanceManager::CheckOrphanVotes(CGovernanceObject& govobj, PeerManager
         if (pairVote.second < nNow) {
             fRemove = true;
         } else if (govobj.ProcessVote(m_mn_metaman, *this, tip_mn_list, vote, e)) {
-            vote.Relay(peerman, m_mn_sync, tip_mn_list);
+            RelayMessage(peerman, vote);
             fRemove = true;
         }
         if (fRemove) {
@@ -359,7 +387,7 @@ void CGovernanceManager::AddGovernanceObject(CGovernanceObject& govobj, PeerMana
     }
 
     LogPrint(BCLog::GOBJECT, "CGovernanceManager::AddGovernanceObject -- %s new, received from peer %s\n", strHash, pfrom ? pfrom->GetLogString() : "nullptr");
-    govobj.Relay(peerman, m_mn_sync);
+    RelayMessage(peerman, govobj);
 
     // Update the rate buffer
     MasternodeRateUpdate(govobj);
@@ -852,9 +880,9 @@ bool CGovernanceManager::MasternodeRateCheck(const CGovernanceObject& govobj, bo
 
 bool CGovernanceManager::ProcessVoteAndRelay(const CGovernanceVote& vote, CGovernanceException& exception, CConnman& connman, PeerManager& peerman)
 {
-    bool fOK = ProcessVote(/* pfrom = */ nullptr, vote, exception, connman);
+    bool fOK = ProcessVote(/*pfrom=*/nullptr, vote, exception, connman);
     if (fOK) {
-        vote.Relay(peerman, m_mn_sync, Assert(m_dmnman)->GetListAtChainTip());
+        RelayMessage(peerman, vote);
     }
     return fOK;
 }
@@ -962,7 +990,7 @@ void CGovernanceManager::CheckPostponedObjects(PeerManager& peerman)
             if (fValid) {
                 if (fReady) {
                     LogPrint(BCLog::GOBJECT, "CGovernanceManager::CheckPostponedObjects -- additional relay: hash = %s\n", govobj.GetHash().ToString());
-                    govobj.Relay(peerman, m_mn_sync);
+                    RelayMessage(peerman, govobj);
                 } else {
                     it++;
                     continue;
diff --git a/src/governance/governance.h b/src/governance/governance.h
index 9e1219a1458c..8705e2fd4437 100644
--- a/src/governance/governance.h
+++ b/src/governance/governance.h
@@ -281,6 +281,9 @@ class CGovernanceManager : public GovernanceStore, public GovernanceSignerParent
 
     bool IsValid() const override { return is_valid; }
 
+    void RelayMessage(PeerManager& peerman, const CGovernanceObject& obj) const;
+    void RelayMessage(PeerManager& peerman, const CGovernanceVote& vote) const;
+
     /**
      * This is called by AlreadyHave in net_processing.cpp as part of the inventory
      * retrieval process.  Returns true if we want to retrieve the object, otherwise
diff --git a/src/governance/object.cpp b/src/governance/object.cpp
index 2e4dbfbe43e3..65f8a164bd44 100644
--- a/src/governance/object.cpp
+++ b/src/governance/object.cpp
@@ -588,18 +588,6 @@ bool CGovernanceObject::GetCurrentMNVotes(const COutPoint& mnCollateralOutpoint,
     return true;
 }
 
-void CGovernanceObject::Relay(PeerManager& peerman, const CMasternodeSync& mn_sync) const
-{
-    // Do not relay until fully synced
-    if (!mn_sync.IsSynced()) {
-        LogPrint(BCLog::GOBJECT, "CGovernanceObject::Relay -- won't relay until fully synced\n");
-        return;
-    }
-
-    CInv inv(MSG_GOVERNANCE_OBJECT, GetHash());
-    peerman.RelayInv(inv);
-}
-
 void CGovernanceObject::UpdateSentinelVariables(const CDeterministicMNList& tip_mn_list)
 {
     // CALCULATE MINIMUM SUPPORT LEVELS REQUIRED
diff --git a/src/governance/object.h b/src/governance/object.h
index 34ebaa4efa99..b3866cfa3aff 100644
--- a/src/governance/object.h
+++ b/src/governance/object.h
@@ -24,7 +24,6 @@ class ChainstateManager;
 class CMasternodeMetaMan;
 class CMasternodeSync;
 class CNode;
-class PeerManager;
 
 extern RecursiveMutex cs_main;
 
@@ -253,8 +252,6 @@ class CGovernanceObject
 
     UniValue GetJSONObject() const;
 
-    void Relay(PeerManager& peerman, const CMasternodeSync& mn_sync) const;
-
     uint256 GetHash() const;
     uint256 GetDataHash() const;
 
diff --git a/src/governance/vote.cpp b/src/governance/vote.cpp
index a20d2afc246d..828f46ddeaef 100644
--- a/src/governance/vote.cpp
+++ b/src/governance/vote.cpp
@@ -101,23 +101,6 @@ std::string CGovernanceVote::ToString(const CDeterministicMNList& tip_mn_list) c
         voteWeight);
 }
 
-void CGovernanceVote::Relay(PeerManager& peerman, const CMasternodeSync& mn_sync, const CDeterministicMNList& tip_mn_list) const
-{
-    // Do not relay until fully synced
-    if (!mn_sync.IsSynced()) {
-        LogPrint(BCLog::GOBJECT, "CGovernanceVote::Relay -- won't relay until fully synced\n");
-        return;
-    }
-
-    auto dmn = tip_mn_list.GetMNByCollateral(masternodeOutpoint);
-    if (!dmn) {
-        return;
-    }
-
-    CInv inv(MSG_GOVERNANCE_OBJECT_VOTE, GetHash());
-    peerman.RelayInv(inv);
-}
-
 void CGovernanceVote::UpdateHash() const
 {
     // Note: doesn't match serialization
diff --git a/src/governance/vote.h b/src/governance/vote.h
index 25f62a4408a9..65c05703f098 100644
--- a/src/governance/vote.h
+++ b/src/governance/vote.h
@@ -16,7 +16,6 @@ class CGovernanceVote;
 class CMasternodeSync;
 class CKey;
 class CKeyID;
-class PeerManager;
 
 // INTENTION OF MASTERNODES REGARDING ITEM
 enum vote_outcome_enum_t : int {
@@ -106,7 +105,6 @@ class CGovernanceVote
                                  ::ToString(nVoteOutcome) + "|" +
                                  ::ToString(nTime);
     }
-    void Relay(PeerManager& peerman, const CMasternodeSync& mn_sync, const CDeterministicMNList& tip_mn_list) const;
 
     const COutPoint& GetMasternodeOutpoint() const { return masternodeOutpoint; }
 
diff --git a/src/node/interfaces.cpp b/src/node/interfaces.cpp
index 14177a6b3a13..2acb65316058 100644
--- a/src/node/interfaces.cpp
+++ b/src/node/interfaces.cpp
@@ -238,7 +238,7 @@ class GOVImpl : public GOV
         PeerManager& peerman = EnsurePeerman(context());
         if (fMissingConfirmations) {
             context().govman->AddPostponedObject(govobj);
-            govobj.Relay(peerman, *Assert(context().mn_sync));
+            context().govman->RelayMessage(peerman, govobj);
         } else {
             context().govman->AddGovernanceObject(govobj, peerman);
         }
diff --git a/src/rpc/governance.cpp b/src/rpc/governance.cpp
index ea66057b457c..e6b1a4df0ea2 100644
--- a/src/rpc/governance.cpp
+++ b/src/rpc/governance.cpp
@@ -396,7 +396,7 @@ static RPCHelpMan gobject_submit()
     PeerManager& peerman = EnsurePeerman(node);
     if (fMissingConfirmations) {
         node.govman->AddPostponedObject(govobj);
-        govobj.Relay(peerman, *CHECK_NONFATAL(node.mn_sync));
+        node.govman->RelayMessage(peerman, govobj);
     } else {
         node.govman->AddGovernanceObject(govobj, peerman);
     }

From df589c7ab2d735a4bd598dcd9befbbf64175db30 Mon Sep 17 00:00:00 2001
From: Kittywhiskers Van Gogh <63189531+kwvg@users.noreply.github.com>
Date: Mon, 6 Oct 2025 22:04:58 +0000
Subject: [PATCH 143/656] governance: introduce task for relaying governance
 objects

---
 src/dsnotificationinterface.cpp   |  4 +--
 src/dsnotificationinterface.h     |  3 --
 src/governance/governance.cpp     | 59 ++++++++++++++++++++-----------
 src/governance/governance.h       | 22 +++++++-----
 src/governance/signing.cpp        |  9 +++--
 src/governance/signing.h          |  8 ++---
 src/init.cpp                      |  3 +-
 src/masternode/active/context.cpp |  2 +-
 src/net_processing.cpp            |  2 +-
 src/node/interfaces.cpp           |  9 +++--
 src/rpc/governance.cpp            | 11 +++---
 11 files changed, 72 insertions(+), 60 deletions(-)

diff --git a/src/dsnotificationinterface.cpp b/src/dsnotificationinterface.cpp
index 4f8c7ed0358a..484a564039ab 100644
--- a/src/dsnotificationinterface.cpp
+++ b/src/dsnotificationinterface.cpp
@@ -24,7 +24,6 @@
 CDSNotificationInterface::CDSNotificationInterface(CConnman& connman,
                                                    CMasternodeSync& mn_sync,
                                                    CGovernanceManager& govman,
-                                                   PeerManager& peerman,
                                                    const ChainstateManager& chainman,
                                                    const std::unique_ptr<CDeterministicMNManager>& dmnman,
                                                    const std::unique_ptr<LLMQContext>& llmq_ctx,
@@ -32,7 +31,6 @@ CDSNotificationInterface::CDSNotificationInterface(CConnman& connman,
   : m_connman(connman),
     m_mn_sync(mn_sync),
     m_govman(govman),
-    m_peerman(peerman),
     m_chainman(chainman),
     m_dmnman(dmnman),
     m_llmq_ctx(llmq_ctx),
@@ -92,7 +90,7 @@ void CDSNotificationInterface::UpdatedBlockTip(const CBlockIndex *pindexNew, con
     m_llmq_ctx->qdkgsman->UpdatedBlockTip(pindexNew, fInitialDownload);
 
     if (m_govman.IsValid()) {
-        m_govman.UpdatedBlockTip(pindexNew, m_peerman);
+        m_govman.UpdatedBlockTip(pindexNew);
     }
 }
 
diff --git a/src/dsnotificationinterface.h b/src/dsnotificationinterface.h
index 9ae958be5f62..bcb614006b6f 100644
--- a/src/dsnotificationinterface.h
+++ b/src/dsnotificationinterface.h
@@ -12,7 +12,6 @@ class CDeterministicMNManager;
 class CGovernanceManager;
 class ChainstateManager;
 class CMasternodeSync;
-class PeerManager;
 struct CJContext;
 struct LLMQContext;
 
@@ -22,7 +21,6 @@ class CDSNotificationInterface : public CValidationInterface
     explicit CDSNotificationInterface(CConnman& connman,
                                       CMasternodeSync& mn_sync,
                                       CGovernanceManager& govman,
-                                      PeerManager& peerman,
                                       const ChainstateManager& chainman,
                                       const std::unique_ptr<CDeterministicMNManager>& dmnman,
                                       const std::unique_ptr<LLMQContext>& llmq_ctx,
@@ -50,7 +48,6 @@ class CDSNotificationInterface : public CValidationInterface
     CConnman& m_connman;
     CMasternodeSync& m_mn_sync;
     CGovernanceManager& m_govman;
-    PeerManager& m_peerman;
     const ChainstateManager& m_chainman;
     const std::unique_ptr<CDeterministicMNManager>& m_dmnman;
     const std::unique_ptr<LLMQContext>& m_llmq_ctx;
diff --git a/src/governance/governance.cpp b/src/governance/governance.cpp
index b9f594956e71..d203c25ef7e3 100644
--- a/src/governance/governance.cpp
+++ b/src/governance/governance.cpp
@@ -23,6 +23,7 @@
 #include <spork.h>
 #include <timedata.h>
 #include <util/ranges.h>
+#include <util/thread.h>
 #include <util/time.h>
 #include <validation.h>
 
@@ -87,6 +88,22 @@ CGovernanceManager::~CGovernanceManager()
     m_db->Store(*this);
 }
 
+void CGovernanceManager::Schedule(CScheduler& scheduler, PeerManager& peerman)
+{
+    assert(IsValid());
+
+    scheduler.scheduleEvery(
+        [this, &peerman]() -> void {
+            LOCK(cs_relay);
+            for (const auto& inv : m_relay_invs) {
+                peerman.RelayInv(inv);
+            }
+            m_relay_invs.clear();
+        },
+        // Tests need tighter timings to avoid timeouts, use more relaxed pacing otherwise
+        Params().IsMockableChain() ? std::chrono::seconds{1} : std::chrono::seconds{5});
+}
+
 bool CGovernanceManager::LoadCache(bool load_cache)
 {
     assert(m_db != nullptr);
@@ -98,18 +115,18 @@ bool CGovernanceManager::LoadCache(bool load_cache)
     return is_valid;
 }
 
-void CGovernanceManager::RelayMessage(PeerManager& peerman, const CGovernanceObject& obj) const
+void CGovernanceManager::RelayObject(const CGovernanceObject& obj)
 {
     if (!m_mn_sync.IsSynced()) {
         LogPrint(BCLog::GOBJECT, "%s -- won't relay until fully synced\n", __func__);
         return;
     }
 
-    CInv inv(MSG_GOVERNANCE_OBJECT, obj.GetHash());
-    peerman.RelayInv(inv);
+    LOCK(cs_relay);
+    m_relay_invs.emplace_back(MSG_GOVERNANCE_OBJECT, obj.GetHash());
 }
 
-void CGovernanceManager::RelayMessage(PeerManager& peerman, const CGovernanceVote& vote) const
+void CGovernanceManager::RelayVote(const CGovernanceVote& vote)
 {
     if (!m_mn_sync.IsSynced()) {
         LogPrint(BCLog::GOBJECT, "%s -- won't relay until fully synced\n", __func__);
@@ -122,8 +139,8 @@ void CGovernanceManager::RelayMessage(PeerManager& peerman, const CGovernanceVot
         return;
     }
 
-    CInv inv(MSG_GOVERNANCE_OBJECT_VOTE, vote.GetHash());
-    peerman.RelayInv(inv);
+    LOCK(cs_relay);
+    m_relay_invs.emplace_back(MSG_GOVERNANCE_OBJECT_VOTE, vote.GetHash());
 }
 
 // Accessors for thread-safe access to maps
@@ -174,7 +191,7 @@ void CGovernanceManager::AddPostponedObject(const CGovernanceObject& govobj)
     mapPostponedObjects.insert(std::make_pair(govobj.GetHash(), govobj));
 }
 
-MessageProcessingResult CGovernanceManager::ProcessMessage(CNode& peer, CConnman& connman, PeerManager& peerman, std::string_view msg_type, CDataStream& vRecv)
+MessageProcessingResult CGovernanceManager::ProcessMessage(CNode& peer, CConnman& connman, std::string_view msg_type, CDataStream& vRecv)
 {
     if (!IsValid()) return {};
     if (!m_mn_sync.IsBlockchainSynced()) return {};
@@ -267,7 +284,7 @@ MessageProcessingResult CGovernanceManager::ProcessMessage(CNode& peer, CConnman
             return ret;
         }
 
-        AddGovernanceObject(govobj, peerman, &peer);
+        AddGovernanceObject(govobj, &peer);
         return ret;
     }
 
@@ -301,7 +318,7 @@ MessageProcessingResult CGovernanceManager::ProcessMessage(CNode& peer, CConnman
         if (ProcessVote(&peer, vote, exception, connman)) {
             LogPrint(BCLog::GOBJECT, "MNGOVERNANCEOBJECTVOTE -- %s new\n", strHash);
             m_mn_sync.BumpAssetLastTime("MNGOVERNANCEOBJECTVOTE");
-            RelayMessage(peerman, vote);
+            RelayVote(vote);
         } else {
             LogPrint(BCLog::GOBJECT, "MNGOVERNANCEOBJECTVOTE -- Rejected vote, error = %s\n", exception.what());
             if ((exception.GetNodePenalty() != 0) && m_mn_sync.IsSynced()) {
@@ -316,7 +333,7 @@ MessageProcessingResult CGovernanceManager::ProcessMessage(CNode& peer, CConnman
     return {};
 }
 
-void CGovernanceManager::CheckOrphanVotes(CGovernanceObject& govobj, PeerManager& peerman)
+void CGovernanceManager::CheckOrphanVotes(CGovernanceObject& govobj)
 {
     uint256 nHash = govobj.GetHash();
     std::vector<vote_time_pair_t> vecVotePairs;
@@ -333,7 +350,7 @@ void CGovernanceManager::CheckOrphanVotes(CGovernanceObject& govobj, PeerManager
         if (pairVote.second < nNow) {
             fRemove = true;
         } else if (govobj.ProcessVote(m_mn_metaman, *this, tip_mn_list, vote, e)) {
-            RelayMessage(peerman, vote);
+            RelayVote(vote);
             fRemove = true;
         }
         if (fRemove) {
@@ -342,7 +359,7 @@ void CGovernanceManager::CheckOrphanVotes(CGovernanceObject& govobj, PeerManager
     }
 }
 
-void CGovernanceManager::AddGovernanceObject(CGovernanceObject& govobj, PeerManager& peerman, const CNode* pfrom)
+void CGovernanceManager::AddGovernanceObject(CGovernanceObject& govobj, const CNode* pfrom)
 {
     uint256 nHash = govobj.GetHash();
     std::string strHash = nHash.ToString();
@@ -387,7 +404,7 @@ void CGovernanceManager::AddGovernanceObject(CGovernanceObject& govobj, PeerMana
     }
 
     LogPrint(BCLog::GOBJECT, "CGovernanceManager::AddGovernanceObject -- %s new, received from peer %s\n", strHash, pfrom ? pfrom->GetLogString() : "nullptr");
-    RelayMessage(peerman, govobj);
+    RelayObject(govobj);
 
     // Update the rate buffer
     MasternodeRateUpdate(govobj);
@@ -396,7 +413,7 @@ void CGovernanceManager::AddGovernanceObject(CGovernanceObject& govobj, PeerMana
 
     // WE MIGHT HAVE PENDING/ORPHAN VOTES FOR THIS OBJECT
 
-    CheckOrphanVotes(govobj, peerman);
+    CheckOrphanVotes(govobj);
 
     // SEND NOTIFICATION TO SCRIPT/ZMQ
     GetMainSignals().NotifyGovernanceObject(std::make_shared<const Governance::Object>(govobj.Object()), nHash.ToString());
@@ -878,11 +895,11 @@ bool CGovernanceManager::MasternodeRateCheck(const CGovernanceObject& govobj, bo
     return false;
 }
 
-bool CGovernanceManager::ProcessVoteAndRelay(const CGovernanceVote& vote, CGovernanceException& exception, CConnman& connman, PeerManager& peerman)
+bool CGovernanceManager::ProcessVoteAndRelay(const CGovernanceVote& vote, CGovernanceException& exception, CConnman& connman)
 {
     bool fOK = ProcessVote(/*pfrom=*/nullptr, vote, exception, connman);
     if (fOK) {
-        RelayMessage(peerman, vote);
+        RelayVote(vote);
     }
     return fOK;
 }
@@ -940,7 +957,7 @@ bool CGovernanceManager::ProcessVote(CNode* pfrom, const CGovernanceVote& vote,
     return fOk;
 }
 
-void CGovernanceManager::CheckPostponedObjects(PeerManager& peerman)
+void CGovernanceManager::CheckPostponedObjects()
 {
     if (!m_mn_sync.IsSynced()) return;
 
@@ -957,7 +974,7 @@ void CGovernanceManager::CheckPostponedObjects(PeerManager& peerman)
         bool fMissingConfirmations;
         if (govobj.IsCollateralValid(m_chainman, strError, fMissingConfirmations)) {
             if (govobj.IsValidLocally(Assert(m_dmnman)->GetListAtChainTip(), m_chainman, strError, false)) {
-                AddGovernanceObject(govobj, peerman);
+                AddGovernanceObject(govobj);
             } else {
                 LogPrint(BCLog::GOBJECT, "CGovernanceManager::CheckPostponedObjects -- %s invalid\n", nHash.ToString());
             }
@@ -990,7 +1007,7 @@ void CGovernanceManager::CheckPostponedObjects(PeerManager& peerman)
             if (fValid) {
                 if (fReady) {
                     LogPrint(BCLog::GOBJECT, "CGovernanceManager::CheckPostponedObjects -- additional relay: hash = %s\n", govobj.GetHash().ToString());
-                    RelayMessage(peerman, govobj);
+                    RelayObject(govobj);
                 } else {
                     it++;
                     continue;
@@ -1289,7 +1306,7 @@ UniValue CGovernanceManager::ToJson() const
     return jsonObj;
 }
 
-void CGovernanceManager::UpdatedBlockTip(const CBlockIndex* pindex, PeerManager& peerman)
+void CGovernanceManager::UpdatedBlockTip(const CBlockIndex* pindex)
 {
     // Note this gets called from ActivateBestChain without cs_main being held
     // so it should be safe to lock our mutex here without risking a deadlock
@@ -1307,7 +1324,7 @@ void CGovernanceManager::UpdatedBlockTip(const CBlockIndex* pindex, PeerManager&
         RemoveInvalidVotes();
     }
 
-    CheckPostponedObjects(peerman);
+    CheckPostponedObjects();
 
     ExecuteBestSuperblock(Assert(m_dmnman)->GetListAtChainTip(), pindex->nHeight);
 }
diff --git a/src/governance/governance.h b/src/governance/governance.h
index 8705e2fd4437..d7f26b393a85 100644
--- a/src/governance/governance.h
+++ b/src/governance/governance.h
@@ -31,6 +31,7 @@ template<typename T>
 class CFlatDB;
 class CInv;
 class CNode;
+class CScheduler;
 class PeerManager;
 
 class CDeterministicMNList;
@@ -271,18 +272,23 @@ class CGovernanceManager : public GovernanceStore, public GovernanceSignerParent
     std::optional<uint256> votedFundingYesTriggerHash;
     std::map<uint256, std::shared_ptr<CSuperblock>> mapTrigger;
 
+    mutable Mutex cs_relay;
+    std::vector<CInv> m_relay_invs GUARDED_BY(cs_relay);
+
 public:
     explicit CGovernanceManager(CMasternodeMetaMan& mn_metaman, CNetFulfilledRequestManager& netfulfilledman,
                                 const ChainstateManager& chainman,
                                 const std::unique_ptr<CDeterministicMNManager>& dmnman, CMasternodeSync& mn_sync);
     ~CGovernanceManager();
 
+    void Schedule(CScheduler& scheduler, PeerManager& peerman);
+
     bool LoadCache(bool load_cache);
 
     bool IsValid() const override { return is_valid; }
 
-    void RelayMessage(PeerManager& peerman, const CGovernanceObject& obj) const;
-    void RelayMessage(PeerManager& peerman, const CGovernanceVote& vote) const;
+    void RelayObject(const CGovernanceObject& obj);
+    void RelayVote(const CGovernanceVote& vote);
 
     /**
      * This is called by AlreadyHave in net_processing.cpp as part of the inventory
@@ -294,7 +300,7 @@ class CGovernanceManager : public GovernanceStore, public GovernanceSignerParent
     [[nodiscard]] MessageProcessingResult SyncSingleObjVotes(CNode& peer, const uint256& nProp, const CBloomFilter& filter, CConnman& connman);
     [[nodiscard]] MessageProcessingResult SyncObjects(CNode& peer, CConnman& connman) const;
 
-    [[nodiscard]] MessageProcessingResult ProcessMessage(CNode& peer, CConnman& connman, PeerManager& peerman, std::string_view msg_type, CDataStream& vRecv);
+    [[nodiscard]] MessageProcessingResult ProcessMessage(CNode& peer, CConnman& connman, std::string_view msg_type, CDataStream& vRecv);
 
     void DoMaintenance(CConnman& connman);
 
@@ -307,13 +313,13 @@ class CGovernanceManager : public GovernanceStore, public GovernanceSignerParent
     std::vector<CGovernanceVote> GetCurrentVotes(const uint256& nParentHash, const COutPoint& mnCollateralOutpointFilter) const;
     void GetAllNewerThan(std::vector<CGovernanceObject>& objs, int64_t nMoreThanTime) const;
 
-    void AddGovernanceObject(CGovernanceObject& govobj, PeerManager& peerman, const CNode* pfrom = nullptr) override;
+    void AddGovernanceObject(CGovernanceObject& govobj, const CNode* pfrom = nullptr) override;
 
     void CheckAndRemove();
 
     UniValue ToJson() const;
 
-    void UpdatedBlockTip(const CBlockIndex* pindex, PeerManager& peerman);
+    void UpdatedBlockTip(const CBlockIndex* pindex);
     int64_t GetLastDiffTime() const { return nTimeLastDiff; }
     void UpdateLastDiffTime(int64_t nTimeIn) { nTimeLastDiff = nTimeIn; }
 
@@ -338,9 +344,9 @@ class CGovernanceManager : public GovernanceStore, public GovernanceSignerParent
 
     bool MasternodeRateCheck(const CGovernanceObject& govobj, bool fUpdateFailStatus, bool fForce, bool& fRateCheckBypassed);
 
-    bool ProcessVoteAndRelay(const CGovernanceVote& vote, CGovernanceException& exception, CConnman& connman, PeerManager& peerman) override;
+    bool ProcessVoteAndRelay(const CGovernanceVote& vote, CGovernanceException& exception, CConnman& connman) override;
 
-    void CheckPostponedObjects(PeerManager& peerman);
+    void CheckPostponedObjects();
 
     bool AreRateChecksEnabled() const
     {
@@ -407,7 +413,7 @@ class CGovernanceManager : public GovernanceStore, public GovernanceSignerParent
     /// Called to indicate a requested object or vote has been received
     bool AcceptMessage(const uint256& nHash);
 
-    void CheckOrphanVotes(CGovernanceObject& govobj, PeerManager& peerman);
+    void CheckOrphanVotes(CGovernanceObject& govobj);
 
     void RebuildIndexes();
 
diff --git a/src/governance/signing.cpp b/src/governance/signing.cpp
index 3374752df949..1da2b9bc5311 100644
--- a/src/governance/signing.cpp
+++ b/src/governance/signing.cpp
@@ -18,12 +18,11 @@
 #include <algorithm>
 
 GovernanceSigner::GovernanceSigner(CConnman& connman, CDeterministicMNManager& dmnman, GovernanceSignerParent& govman,
-                                   PeerManager& peerman, const CActiveMasternodeManager& mn_activeman,
-                                   const ChainstateManager& chainman, const CMasternodeSync& mn_sync) :
+                                   const CActiveMasternodeManager& mn_activeman, const ChainstateManager& chainman,
+                                   const CMasternodeSync& mn_sync) :
     m_connman{connman},
     m_dmnman{dmnman},
     m_govman{govman},
-    m_peerman{peerman},
     m_mn_activeman{mn_activeman},
     m_chainman{chainman},
     m_mn_sync{mn_sync}
@@ -155,7 +154,7 @@ std::optional<const CGovernanceObject> GovernanceSigner::CreateGovernanceTrigger
     }
 
     // The trigger we just created looks good, submit it
-    m_govman.AddGovernanceObject(gov_sb, m_peerman);
+    m_govman.AddGovernanceObject(gov_sb);
     return std::make_optional<CGovernanceObject>(gov_sb);
 }
 
@@ -250,7 +249,7 @@ bool GovernanceSigner::VoteFundingTrigger(const uint256& nHash, const vote_outco
     vote.SetSignature(m_mn_activeman.SignBasic(vote.GetSignatureHash()));
 
     CGovernanceException exception;
-    if (!m_govman.ProcessVoteAndRelay(vote, exception, m_connman, m_peerman)) {
+    if (!m_govman.ProcessVoteAndRelay(vote, exception, m_connman)) {
         LogPrint(BCLog::GOBJECT, "%s -- Vote FUNDING %d for trigger:%s failed:%s\n", __func__, outcome, nHash.ToString(), exception.what());
         return false;
     }
diff --git a/src/governance/signing.h b/src/governance/signing.h
index 044d103157d0..e50d12f8651d 100644
--- a/src/governance/signing.h
+++ b/src/governance/signing.h
@@ -24,7 +24,6 @@ class CGovernanceVote;
 class ChainstateManager;
 class CMasternodeSync;
 class CNode;
-class PeerManager;
 enum vote_outcome_enum_t : int;
 
 class GovernanceSignerParent
@@ -35,13 +34,13 @@ class GovernanceSignerParent
     virtual bool IsValid() const = 0;
     virtual bool GetBestSuperblock(const CDeterministicMNList& tip_mn_list, std::shared_ptr<CSuperblock>& pSuperblockRet, int nBlockHeight) = 0;
     virtual bool MasternodeRateCheck(const CGovernanceObject& govobj, bool fUpdateFailStatus = false) = 0;
-    virtual bool ProcessVoteAndRelay(const CGovernanceVote& vote, CGovernanceException& exception, CConnman& connman, PeerManager& peerman) = 0;
+    virtual bool ProcessVoteAndRelay(const CGovernanceVote& vote, CGovernanceException& exception, CConnman& connman) = 0;
     virtual int GetCachedBlockHeight() const = 0;
     virtual CGovernanceObject* FindGovernanceObject(const uint256& nHash) = 0;
     virtual CGovernanceObject* FindGovernanceObjectByDataHash(const uint256& nDataHash) = 0;
     virtual std::vector<std::shared_ptr<CSuperblock>> GetActiveTriggers() const = 0;
     virtual std::vector<std::shared_ptr<const CGovernanceObject>> GetApprovedProposals(const CDeterministicMNList& tip_mn_list) = 0;
-    virtual void AddGovernanceObject(CGovernanceObject& govobj, PeerManager& peerman, const CNode* pfrom = nullptr) = 0;
+    virtual void AddGovernanceObject(CGovernanceObject& govobj, const CNode* pfrom = nullptr) = 0;
 };
 
 class GovernanceSigner
@@ -50,7 +49,6 @@ class GovernanceSigner
     CConnman& m_connman;
     CDeterministicMNManager& m_dmnman;
     GovernanceSignerParent& m_govman;
-    PeerManager& m_peerman;
     const CActiveMasternodeManager& m_mn_activeman;
     const ChainstateManager& m_chainman;
     const CMasternodeSync& m_mn_sync;
@@ -60,7 +58,7 @@ class GovernanceSigner
 
 public:
     explicit GovernanceSigner(CConnman& connman, CDeterministicMNManager& dmnman, GovernanceSignerParent& govman,
-                              PeerManager& peerman, const CActiveMasternodeManager& mn_activeman,
+                              const CActiveMasternodeManager& mn_activeman,
                               const ChainstateManager& chainman, const CMasternodeSync& mn_sync);
     ~GovernanceSigner();
 
diff --git a/src/init.cpp b/src/init.cpp
index 8b82d9a9e8dd..231efc9abf09 100644
--- a/src/init.cpp
+++ b/src/init.cpp
@@ -2140,7 +2140,7 @@ bool AppInitMain(NodeContext& node, interfaces::BlockAndHeaderTipInfo* tip_info)
     RegisterValidationInterface(node.peerman.get());
 
     g_ds_notification_interface = std::make_unique<CDSNotificationInterface>(
-        *node.connman, *node.mn_sync, *node.govman, *node.peerman, chainman, node.dmnman, node.llmq_ctx, node.cj_ctx
+        *node.connman, *node.mn_sync, *node.govman, chainman, node.dmnman, node.llmq_ctx, node.cj_ctx
     );
     RegisterValidationInterface(g_ds_notification_interface.get());
 
@@ -2262,6 +2262,7 @@ bool AppInitMain(NodeContext& node, interfaces::BlockAndHeaderTipInfo* tip_info)
     node.scheduler->scheduleEvery(std::bind(&CDeterministicMNManager::DoMaintenance, std::ref(*node.dmnman)), std::chrono::seconds{10});
 
     if (node.govman->IsValid()) {
+        node.govman->Schedule(*node.scheduler, *node.peerman);
         node.scheduler->scheduleEvery(std::bind(&CGovernanceManager::DoMaintenance, std::ref(*node.govman), std::ref(*node.connman)), std::chrono::minutes{5});
     }
 
diff --git a/src/masternode/active/context.cpp b/src/masternode/active/context.cpp
index 7b8df853e7ea..23ff1e24ba3d 100644
--- a/src/masternode/active/context.cpp
+++ b/src/masternode/active/context.cpp
@@ -28,7 +28,7 @@ ActiveContext::ActiveContext(ChainstateManager& chainman, CConnman& connman, CDe
                                                                *llmq_ctx.qman, sporkman, mempool, mn_sync)},
     cj_server{std::make_unique<CCoinJoinServer>(chainman, connman, dmnman, dstxman, mn_metaman, mempool, peerman,
                                                 mn_activeman, mn_sync, *llmq_ctx.isman)},
-    gov_signer{std::make_unique<GovernanceSigner>(connman, dmnman, govman, peerman, mn_activeman, chainman, mn_sync)},
+    gov_signer{std::make_unique<GovernanceSigner>(connman, dmnman, govman, mn_activeman, chainman, mn_sync)},
     ehf_sighandler{std::make_unique<llmq::CEHFSignalsHandler>(chainman, mnhfman, *llmq_ctx.sigman, *llmq_ctx.shareman,
                                                               *llmq_ctx.qman)}
 {
diff --git a/src/net_processing.cpp b/src/net_processing.cpp
index bee912118e31..63d5aac9657b 100644
--- a/src/net_processing.cpp
+++ b/src/net_processing.cpp
@@ -5380,7 +5380,7 @@ void PeerManagerImpl::ProcessMessage(
         }
         PostProcessMessage(m_sporkman.ProcessMessage(pfrom, m_connman, msg_type, vRecv), pfrom.GetId());
         m_mn_sync.ProcessMessage(pfrom, msg_type, vRecv);
-        PostProcessMessage(m_govman.ProcessMessage(pfrom, m_connman, *this, msg_type, vRecv), pfrom.GetId());
+        PostProcessMessage(m_govman.ProcessMessage(pfrom, m_connman, msg_type, vRecv), pfrom.GetId());
         PostProcessMessage(CMNAuth::ProcessMessage(pfrom, peer->m_their_services, m_connman, m_mn_metaman, m_mn_activeman, m_mn_sync, m_dmnman->GetListAtChainTip(), msg_type, vRecv), pfrom.GetId());
         PostProcessMessage(m_llmq_ctx->quorum_block_processor->ProcessMessage(pfrom, msg_type, vRecv), pfrom.GetId());
         PostProcessMessage(m_llmq_ctx->qdkgsman->ProcessMessage(pfrom, is_masternode, msg_type, vRecv), pfrom.GetId());
diff --git a/src/node/interfaces.cpp b/src/node/interfaces.cpp
index 2acb65316058..312378ffa9ea 100644
--- a/src/node/interfaces.cpp
+++ b/src/node/interfaces.cpp
@@ -148,9 +148,9 @@ class GOVImpl : public GOV
     }
     bool processVoteAndRelay(const CGovernanceVote& vote, std::string& error) override
     {
-        if (context().govman != nullptr && context().connman != nullptr && context().peerman != nullptr) {
+        if (context().govman != nullptr && context().connman != nullptr) {
             CGovernanceException exception;
-            bool result = context().govman->ProcessVoteAndRelay(vote, exception, *context().connman, *context().peerman);
+            bool result = context().govman->ProcessVoteAndRelay(vote, exception, *context().connman);
             if (!result) {
                 error = exception.GetMessage();
             }
@@ -235,12 +235,11 @@ class GOVImpl : public GOV
             }
         }
         if (!Assert(context().govman)->MasternodeRateCheck(govobj)) { error = "Object creation rate limit exceeded"; return false; }
-        PeerManager& peerman = EnsurePeerman(context());
         if (fMissingConfirmations) {
             context().govman->AddPostponedObject(govobj);
-            context().govman->RelayMessage(peerman, govobj);
+            context().govman->RelayObject(govobj);
         } else {
-            context().govman->AddGovernanceObject(govobj, peerman);
+            context().govman->AddGovernanceObject(govobj);
         }
         out_object_hash = govobj.GetHash().ToString();
         return true;
diff --git a/src/rpc/governance.cpp b/src/rpc/governance.cpp
index e6b1a4df0ea2..f9ee9f7c69b5 100644
--- a/src/rpc/governance.cpp
+++ b/src/rpc/governance.cpp
@@ -393,12 +393,11 @@ static RPCHelpMan gobject_submit()
 
     LogPrintf("gobject(submit) -- Adding locally created governance object - %s\n", strHash);
 
-    PeerManager& peerman = EnsurePeerman(node);
     if (fMissingConfirmations) {
         node.govman->AddPostponedObject(govobj);
-        node.govman->RelayMessage(peerman, govobj);
+        node.govman->RelayObject(govobj);
     } else {
-        node.govman->AddGovernanceObject(govobj, peerman);
+        node.govman->AddGovernanceObject(govobj);
     }
 
     return govobj.GetHash().ToString();
@@ -456,8 +455,7 @@ static UniValue VoteWithMasternodes(const JSONRPCRequest& request, const CWallet
 
         CGovernanceException exception;
         CConnman& connman = EnsureConnman(node);
-        PeerManager& peerman = EnsurePeerman(node);
-        if (node.govman->ProcessVoteAndRelay(vote, exception, connman, peerman)) {
+        if (node.govman->ProcessVoteAndRelay(vote, exception, connman)) {
             nSuccessful++;
             statusObj.pushKV("result", "success");
         } else {
@@ -961,10 +959,9 @@ static RPCHelpMan voteraw()
     }
 
     CConnman& connman = EnsureConnman(node);
-    PeerManager& peerman = EnsurePeerman(node);
 
     CGovernanceException exception;
-    if (node.govman->ProcessVoteAndRelay(vote, exception, connman, peerman)) {
+    if (node.govman->ProcessVoteAndRelay(vote, exception, connman)) {
         return "Voted successfully";
     } else {
         throw JSONRPCError(RPC_INTERNAL_ERROR, "Error voting : " + exception.GetMessage());

From e2249912879c1b6dbdf5f2319675c6dbce471b70 Mon Sep 17 00:00:00 2001
From: Kittywhiskers Van Gogh <63189531+kwvg@users.noreply.github.com>
Date: Sun, 7 Sep 2025 22:22:24 +0000
Subject: [PATCH 144/656] governance: add lock annotations for `cs_relay`

---
 src/governance/governance.cpp |  8 ++++++++
 src/governance/governance.h   | 19 +++++++++++--------
 2 files changed, 19 insertions(+), 8 deletions(-)

diff --git a/src/governance/governance.cpp b/src/governance/governance.cpp
index d203c25ef7e3..b215d0dec07b 100644
--- a/src/governance/governance.cpp
+++ b/src/governance/governance.cpp
@@ -117,6 +117,7 @@ bool CGovernanceManager::LoadCache(bool load_cache)
 
 void CGovernanceManager::RelayObject(const CGovernanceObject& obj)
 {
+    AssertLockNotHeld(cs_relay);
     if (!m_mn_sync.IsSynced()) {
         LogPrint(BCLog::GOBJECT, "%s -- won't relay until fully synced\n", __func__);
         return;
@@ -128,6 +129,7 @@ void CGovernanceManager::RelayObject(const CGovernanceObject& obj)
 
 void CGovernanceManager::RelayVote(const CGovernanceVote& vote)
 {
+    AssertLockNotHeld(cs_relay);
     if (!m_mn_sync.IsSynced()) {
         LogPrint(BCLog::GOBJECT, "%s -- won't relay until fully synced\n", __func__);
         return;
@@ -193,6 +195,7 @@ void CGovernanceManager::AddPostponedObject(const CGovernanceObject& govobj)
 
 MessageProcessingResult CGovernanceManager::ProcessMessage(CNode& peer, CConnman& connman, std::string_view msg_type, CDataStream& vRecv)
 {
+    AssertLockNotHeld(cs_relay);
     if (!IsValid()) return {};
     if (!m_mn_sync.IsBlockchainSynced()) return {};
 
@@ -335,6 +338,7 @@ MessageProcessingResult CGovernanceManager::ProcessMessage(CNode& peer, CConnman
 
 void CGovernanceManager::CheckOrphanVotes(CGovernanceObject& govobj)
 {
+    AssertLockNotHeld(cs_relay);
     uint256 nHash = govobj.GetHash();
     std::vector<vote_time_pair_t> vecVotePairs;
     cmmapOrphanVotes.GetAll(nHash, vecVotePairs);
@@ -361,6 +365,7 @@ void CGovernanceManager::CheckOrphanVotes(CGovernanceObject& govobj)
 
 void CGovernanceManager::AddGovernanceObject(CGovernanceObject& govobj, const CNode* pfrom)
 {
+    AssertLockNotHeld(cs_relay);
     uint256 nHash = govobj.GetHash();
     std::string strHash = nHash.ToString();
 
@@ -897,6 +902,7 @@ bool CGovernanceManager::MasternodeRateCheck(const CGovernanceObject& govobj, bo
 
 bool CGovernanceManager::ProcessVoteAndRelay(const CGovernanceVote& vote, CGovernanceException& exception, CConnman& connman)
 {
+    AssertLockNotHeld(cs_relay);
     bool fOK = ProcessVote(/*pfrom=*/nullptr, vote, exception, connman);
     if (fOK) {
         RelayVote(vote);
@@ -959,6 +965,7 @@ bool CGovernanceManager::ProcessVote(CNode* pfrom, const CGovernanceVote& vote,
 
 void CGovernanceManager::CheckPostponedObjects()
 {
+    AssertLockNotHeld(cs_relay);
     if (!m_mn_sync.IsSynced()) return;
 
     LOCK2(::cs_main, cs);
@@ -1308,6 +1315,7 @@ UniValue CGovernanceManager::ToJson() const
 
 void CGovernanceManager::UpdatedBlockTip(const CBlockIndex* pindex)
 {
+    AssertLockNotHeld(cs_relay);
     // Note this gets called from ActivateBestChain without cs_main being held
     // so it should be safe to lock our mutex here without risking a deadlock
     // On the other hand it should be safe for us to access pindex without holding a lock
diff --git a/src/governance/governance.h b/src/governance/governance.h
index d7f26b393a85..8e5f50d0e0b2 100644
--- a/src/governance/governance.h
+++ b/src/governance/governance.h
@@ -287,8 +287,8 @@ class CGovernanceManager : public GovernanceStore, public GovernanceSignerParent
 
     bool IsValid() const override { return is_valid; }
 
-    void RelayObject(const CGovernanceObject& obj);
-    void RelayVote(const CGovernanceVote& vote);
+    void RelayObject(const CGovernanceObject& obj) EXCLUSIVE_LOCKS_REQUIRED(!cs_relay);
+    void RelayVote(const CGovernanceVote& vote) EXCLUSIVE_LOCKS_REQUIRED(!cs_relay);
 
     /**
      * This is called by AlreadyHave in net_processing.cpp as part of the inventory
@@ -300,7 +300,8 @@ class CGovernanceManager : public GovernanceStore, public GovernanceSignerParent
     [[nodiscard]] MessageProcessingResult SyncSingleObjVotes(CNode& peer, const uint256& nProp, const CBloomFilter& filter, CConnman& connman);
     [[nodiscard]] MessageProcessingResult SyncObjects(CNode& peer, CConnman& connman) const;
 
-    [[nodiscard]] MessageProcessingResult ProcessMessage(CNode& peer, CConnman& connman, std::string_view msg_type, CDataStream& vRecv);
+    [[nodiscard]] MessageProcessingResult ProcessMessage(CNode& peer, CConnman& connman, std::string_view msg_type, CDataStream& vRecv)
+        EXCLUSIVE_LOCKS_REQUIRED(!cs_relay);
 
     void DoMaintenance(CConnman& connman);
 
@@ -313,13 +314,14 @@ class CGovernanceManager : public GovernanceStore, public GovernanceSignerParent
     std::vector<CGovernanceVote> GetCurrentVotes(const uint256& nParentHash, const COutPoint& mnCollateralOutpointFilter) const;
     void GetAllNewerThan(std::vector<CGovernanceObject>& objs, int64_t nMoreThanTime) const;
 
-    void AddGovernanceObject(CGovernanceObject& govobj, const CNode* pfrom = nullptr) override;
+    void AddGovernanceObject(CGovernanceObject& govobj, const CNode* pfrom = nullptr) override
+        EXCLUSIVE_LOCKS_REQUIRED(!cs_relay);
 
     void CheckAndRemove();
 
     UniValue ToJson() const;
 
-    void UpdatedBlockTip(const CBlockIndex* pindex);
+    void UpdatedBlockTip(const CBlockIndex* pindex) EXCLUSIVE_LOCKS_REQUIRED(!cs_relay);
     int64_t GetLastDiffTime() const { return nTimeLastDiff; }
     void UpdateLastDiffTime(int64_t nTimeIn) { nTimeLastDiff = nTimeIn; }
 
@@ -344,9 +346,10 @@ class CGovernanceManager : public GovernanceStore, public GovernanceSignerParent
 
     bool MasternodeRateCheck(const CGovernanceObject& govobj, bool fUpdateFailStatus, bool fForce, bool& fRateCheckBypassed);
 
-    bool ProcessVoteAndRelay(const CGovernanceVote& vote, CGovernanceException& exception, CConnman& connman) override;
+    bool ProcessVoteAndRelay(const CGovernanceVote& vote, CGovernanceException& exception, CConnman& connman) override
+        EXCLUSIVE_LOCKS_REQUIRED(!cs_relay);
 
-    void CheckPostponedObjects();
+    void CheckPostponedObjects() EXCLUSIVE_LOCKS_REQUIRED(!cs_relay);
 
     bool AreRateChecksEnabled() const
     {
@@ -413,7 +416,7 @@ class CGovernanceManager : public GovernanceStore, public GovernanceSignerParent
     /// Called to indicate a requested object or vote has been received
     bool AcceptMessage(const uint256& nHash);
 
-    void CheckOrphanVotes(CGovernanceObject& govobj);
+    void CheckOrphanVotes(CGovernanceObject& govobj) EXCLUSIVE_LOCKS_REQUIRED(!cs_relay);
 
     void RebuildIndexes();
 

From 4d96f5fcc40b39baa7d970341a7c728af59d547e Mon Sep 17 00:00:00 2001
From: Kittywhiskers Van Gogh <63189531+kwvg@users.noreply.github.com>
Date: Wed, 10 Sep 2025 06:40:35 +0000
Subject: [PATCH 145/656] refactor: move `DoMaintenance()` inside `Schedule()`

---
 src/governance/governance.cpp | 29 ++++++++++++++---------------
 src/governance/governance.h   |  4 +---
 src/init.cpp                  |  3 +--
 3 files changed, 16 insertions(+), 20 deletions(-)

diff --git a/src/governance/governance.cpp b/src/governance/governance.cpp
index b215d0dec07b..54bf2a5dd213 100644
--- a/src/governance/governance.cpp
+++ b/src/governance/governance.cpp
@@ -88,10 +88,23 @@ CGovernanceManager::~CGovernanceManager()
     m_db->Store(*this);
 }
 
-void CGovernanceManager::Schedule(CScheduler& scheduler, PeerManager& peerman)
+void CGovernanceManager::Schedule(CScheduler& scheduler, CConnman& connman, PeerManager& peerman)
 {
     assert(IsValid());
 
+    scheduler.scheduleEvery(
+        [this, &connman]() -> void {
+            if (!m_mn_sync.IsSynced()) return;
+
+            // CHECK OBJECTS WE'VE ASKED FOR, REMOVE OLD ENTRIES
+            CleanOrphanObjects();
+            RequestOrphanObjects(connman);
+
+            // CHECK AND REMOVE - REPROCESS GOVERNANCE OBJECTS
+            CheckAndRemove();
+        },
+        std::chrono::minutes{5});
+
     scheduler.scheduleEvery(
         [this, &peerman]() -> void {
             LOCK(cs_relay);
@@ -652,20 +665,6 @@ struct sortProposalsByVotes {
     }
 };
 
-void CGovernanceManager::DoMaintenance(CConnman& connman)
-{
-    if (!IsValid()) return;
-    if (!m_mn_sync.IsSynced()) return;
-    if (ShutdownRequested()) return;
-
-    // CHECK OBJECTS WE'VE ASKED FOR, REMOVE OLD ENTRIES
-    CleanOrphanObjects();
-    RequestOrphanObjects(connman);
-
-    // CHECK AND REMOVE - REPROCESS GOVERNANCE OBJECTS
-    CheckAndRemove();
-}
-
 bool CGovernanceManager::ConfirmInventoryRequest(const CInv& inv)
 {
     // do not request objects until it's time to sync
diff --git a/src/governance/governance.h b/src/governance/governance.h
index 8e5f50d0e0b2..0747baddc149 100644
--- a/src/governance/governance.h
+++ b/src/governance/governance.h
@@ -281,7 +281,7 @@ class CGovernanceManager : public GovernanceStore, public GovernanceSignerParent
                                 const std::unique_ptr<CDeterministicMNManager>& dmnman, CMasternodeSync& mn_sync);
     ~CGovernanceManager();
 
-    void Schedule(CScheduler& scheduler, PeerManager& peerman);
+    void Schedule(CScheduler& scheduler, CConnman& connman, PeerManager& peerman);
 
     bool LoadCache(bool load_cache);
 
@@ -303,8 +303,6 @@ class CGovernanceManager : public GovernanceStore, public GovernanceSignerParent
     [[nodiscard]] MessageProcessingResult ProcessMessage(CNode& peer, CConnman& connman, std::string_view msg_type, CDataStream& vRecv)
         EXCLUSIVE_LOCKS_REQUIRED(!cs_relay);
 
-    void DoMaintenance(CConnman& connman);
-
     const CGovernanceObject* FindConstGovernanceObject(const uint256& nHash) const EXCLUSIVE_LOCKS_REQUIRED(cs);
     CGovernanceObject* FindGovernanceObject(const uint256& nHash) override EXCLUSIVE_LOCKS_REQUIRED(!cs);
     CGovernanceObject* FindGovernanceObjectByDataHash(const uint256& nDataHash) override EXCLUSIVE_LOCKS_REQUIRED(!cs);
diff --git a/src/init.cpp b/src/init.cpp
index 231efc9abf09..4ecda7683d7f 100644
--- a/src/init.cpp
+++ b/src/init.cpp
@@ -2262,8 +2262,7 @@ bool AppInitMain(NodeContext& node, interfaces::BlockAndHeaderTipInfo* tip_info)
     node.scheduler->scheduleEvery(std::bind(&CDeterministicMNManager::DoMaintenance, std::ref(*node.dmnman)), std::chrono::seconds{10});
 
     if (node.govman->IsValid()) {
-        node.govman->Schedule(*node.scheduler, *node.peerman);
-        node.scheduler->scheduleEvery(std::bind(&CGovernanceManager::DoMaintenance, std::ref(*node.govman), std::ref(*node.connman)), std::chrono::minutes{5});
+        node.govman->Schedule(*node.scheduler, *node.connman, *node.peerman);
     }
 
     if (node.mn_activeman) {

From 17779190fc3fff8e0e2960c6203d3e851522326b Mon Sep 17 00:00:00 2001
From: Kittywhiskers Van Gogh <63189531+kwvg@users.noreply.github.com>
Date: Sun, 5 Oct 2025 08:42:48 +0000
Subject: [PATCH 146/656] refactor: use `std::chrono` for governance time
 constants

---
 src/governance/governance.cpp | 35 ++++++++++++++++++++---------------
 src/governance/governance.h   |  4 ----
 src/governance/object.h       |  6 ------
 src/governance/signing.cpp    |  9 +++++++--
 4 files changed, 27 insertions(+), 27 deletions(-)

diff --git a/src/governance/governance.cpp b/src/governance/governance.cpp
index 54bf2a5dd213..15efc0868466 100644
--- a/src/governance/governance.cpp
+++ b/src/governance/governance.cpp
@@ -30,10 +30,13 @@
 int nSubmittedFinalBudget;
 
 const std::string GovernanceStore::SERIALIZATION_VERSION_STRING = "CGovernanceManager-Version-16";
-const int CGovernanceManager::MAX_TIME_FUTURE_DEVIATION = 60 * 60;
-const int CGovernanceManager::RELIABLE_PROPAGATION_TIME = 60;
 
 namespace {
+constexpr std::chrono::seconds GOVERNANCE_DELETION_DELAY{10min};
+constexpr std::chrono::seconds GOVERNANCE_ORPHAN_EXPIRATION_TIME{10min};
+constexpr std::chrono::seconds MAX_TIME_FUTURE_DEVIATION{1h};
+constexpr std::chrono::seconds RELIABLE_PROPAGATION_TIME{1min};
+
 class ScopedLockBool
 {
     bool& ref;
@@ -466,7 +469,7 @@ void CGovernanceManager::CheckAndRemove()
     CleanAndRemoveTriggers();
 
     auto it = mapObjects.begin();
-    int64_t nNow = GetTime<std::chrono::seconds>().count();
+    const auto nNow = GetTime<std::chrono::seconds>();
 
     while (it != mapObjects.end()) {
         CGovernanceObject* pObj = &((*it).second);
@@ -485,10 +488,10 @@ void CGovernanceManager::CheckAndRemove()
 
         // IF DELETE=TRUE, THEN CLEAN THE MESS UP!
 
-        int64_t nTimeSinceDeletion = nNow - pObj->GetDeletionTime();
+        const auto nTimeSinceDeletion = nNow - std::chrono::seconds{pObj->GetDeletionTime()};
 
         LogPrint(BCLog::GOBJECT, "CGovernanceManager::UpdateCachesAndClean -- Checking object for deletion: %s, deletion time = %d, time since deletion = %d, delete flag = %d, expired flag = %d\n",
-            strHash, pObj->GetDeletionTime(), nTimeSinceDeletion, pObj->IsSetCachedDelete(), pObj->IsSetExpired());
+            strHash, pObj->GetDeletionTime(), nTimeSinceDeletion.count(), pObj->IsSetCachedDelete(), pObj->IsSetExpired());
 
         if ((pObj->IsSetCachedDelete() || pObj->IsSetExpired()) &&
             (nTimeSinceDeletion >= GOVERNANCE_DELETION_DELAY)) {
@@ -515,7 +518,9 @@ void CGovernanceManager::CheckAndRemove()
                 nTimeExpired = std::numeric_limits<int64_t>::max();
             } else {
                 int64_t nSuperblockCycleSeconds = Params().GetConsensus().nSuperblockCycle * Params().GetConsensus().nPowTargetSpacing;
-                nTimeExpired = pObj->GetCreationTime() + 2 * nSuperblockCycleSeconds + GOVERNANCE_DELETION_DELAY;
+                nTimeExpired = (std::chrono::seconds{pObj->GetCreationTime()} +
+                                std::chrono::seconds{2 * nSuperblockCycleSeconds} +
+                                GOVERNANCE_DELETION_DELAY).count();
             }
 
             mapErasedGovernanceObjects.insert(std::make_pair(nHash, nTimeExpired));
@@ -525,7 +530,7 @@ void CGovernanceManager::CheckAndRemove()
                 CProposalValidator validator(pObj->GetDataAsHexString());
                 if (!validator.Validate()) {
                     LogPrint(BCLog::GOBJECT, "CGovernanceManager::UpdateCachesAndClean -- set for deletion expired obj %s\n", strHash);
-                    pObj->PrepareDeletion(nNow);
+                    pObj->PrepareDeletion(nNow.count());
                 }
             }
             ++it;
@@ -535,7 +540,7 @@ void CGovernanceManager::CheckAndRemove()
     // forget about expired deleted objects
     auto s_it = mapErasedGovernanceObjects.begin();
     while (s_it != mapErasedGovernanceObjects.end()) {
-        if (s_it->second < nNow) {
+        if (s_it->second < nNow.count()) {
             mapErasedGovernanceObjects.erase(s_it++);
         } else {
             ++s_it;
@@ -545,7 +550,7 @@ void CGovernanceManager::CheckAndRemove()
     // forget about expired requests
     auto r_it = m_requested_hash_time.begin();
     while (r_it != m_requested_hash_time.end()) {
-        if (r_it->second < std::chrono::seconds(nNow)) {
+        if (r_it->second < nNow) {
             m_requested_hash_time.erase(r_it++);
         } else {
             ++r_it;
@@ -695,7 +700,7 @@ bool CGovernanceManager::ConfirmInventoryRequest(const CInv& inv)
         return false;
     }
 
-    const auto valid_until = GetTime<std::chrono::seconds>() + std::chrono::seconds(RELIABLE_PROPAGATION_TIME);
+    const auto valid_until = GetTime<std::chrono::seconds>() + RELIABLE_PROPAGATION_TIME;
     const auto& [_itr, inserted] = m_requested_hash_time.emplace(inv.hash, valid_until);
 
     if (inserted) {
@@ -821,7 +826,7 @@ void CGovernanceManager::MasternodeRateUpdate(const CGovernanceObject& govobj)
     int64_t nTimestamp = govobj.GetCreationTime();
     it->second.triggerBuffer.AddTimestamp(nTimestamp);
 
-    if (nTimestamp > GetTime() + MAX_TIME_FUTURE_DEVIATION - RELIABLE_PROPAGATION_TIME) {
+    if (nTimestamp > GetTime() + count_seconds(MAX_TIME_FUTURE_DEVIATION) - count_seconds(RELIABLE_PROPAGATION_TIME)) {
         // schedule additional relay for the object
         setAdditionalRelayObjects.insert(govobj.GetHash());
     }
@@ -862,7 +867,7 @@ bool CGovernanceManager::MasternodeRateCheck(const CGovernanceObject& govobj, bo
         return false;
     }
 
-    if (nTimestamp > nNow + MAX_TIME_FUTURE_DEVIATION) {
+    if (nTimestamp > nNow + count_seconds(MAX_TIME_FUTURE_DEVIATION)) {
         LogPrint(BCLog::GOBJECT, "CGovernanceManager::MasternodeRateCheck -- object %s rejected due to too new (future) timestamp, masternode = %s, timestamp = %d, current time = %d\n",
             strHash, masternodeOutpoint.ToStringShort(), nTimestamp, nNow);
         return false;
@@ -936,7 +941,7 @@ bool CGovernanceManager::ProcessVote(CNode* pfrom, const CGovernanceVote& vote,
         std::string msg{strprintf("CGovernanceManager::%s -- Unknown parent object %s, MN outpoint = %s", __func__,
             nHashGovobj.ToString(), vote.GetMasternodeOutpoint().ToStringShort())};
         exception = CGovernanceException(msg, GOVERNANCE_EXCEPTION_WARNING);
-        if (cmmapOrphanVotes.Insert(nHashGovobj, vote_time_pair_t(vote, GetTime<std::chrono::seconds>().count() + GOVERNANCE_ORPHAN_EXPIRATION_TIME))) {
+        if (cmmapOrphanVotes.Insert(nHashGovobj, vote_time_pair_t(vote, count_seconds(GetTime<std::chrono::seconds>() + GOVERNANCE_ORPHAN_EXPIRATION_TIME)))) {
             LEAVE_CRITICAL_SECTION(cs);
             RequestGovernanceObject(pfrom, nHashGovobj, connman);
             LogPrint(BCLog::GOBJECT, "%s\n", msg);
@@ -1007,8 +1012,8 @@ void CGovernanceManager::CheckPostponedObjects()
 
             int64_t nTimestamp = govobj.GetCreationTime();
 
-            bool fValid = (nTimestamp <= nNow + MAX_TIME_FUTURE_DEVIATION) && (nTimestamp >= nNow - 2 * nSuperblockCycleSeconds);
-            bool fReady = (nTimestamp <= nNow + MAX_TIME_FUTURE_DEVIATION - RELIABLE_PROPAGATION_TIME);
+            bool fValid = (nTimestamp <= nNow + count_seconds(MAX_TIME_FUTURE_DEVIATION)) && (nTimestamp >= nNow - 2 * nSuperblockCycleSeconds);
+            bool fReady = (nTimestamp <= nNow + count_seconds(MAX_TIME_FUTURE_DEVIATION) - count_seconds(RELIABLE_PROPAGATION_TIME));
 
             if (fValid) {
                 if (fReady) {
diff --git a/src/governance/governance.h b/src/governance/governance.h
index 0747baddc149..4b246cc6a563 100644
--- a/src/governance/governance.h
+++ b/src/governance/governance.h
@@ -248,10 +248,6 @@ class CGovernanceManager : public GovernanceStore, public GovernanceSignerParent
 private:
     using db_type = CFlatDB<GovernanceStore>;
 
-private:
-    static const int MAX_TIME_FUTURE_DEVIATION;
-    static const int RELIABLE_PROPAGATION_TIME;
-
 private:
     const std::unique_ptr<db_type> m_db;
     bool is_valid{false};
diff --git a/src/governance/object.h b/src/governance/object.h
index b3866cfa3aff..1804878e268a 100644
--- a/src/governance/object.h
+++ b/src/governance/object.h
@@ -28,16 +28,10 @@ class CNode;
 extern RecursiveMutex cs_main;
 
 static constexpr double GOVERNANCE_FILTER_FP_RATE = 0.001;
-
-
 static constexpr CAmount GOVERNANCE_PROPOSAL_FEE_TX = (1 * COIN);
-
 static constexpr int64_t GOVERNANCE_FEE_CONFIRMATIONS = 6;
 static constexpr int64_t GOVERNANCE_MIN_RELAY_FEE_CONFIRMATIONS = 1;
 static constexpr int64_t GOVERNANCE_UPDATE_MIN = 60 * 60;
-static constexpr int64_t GOVERNANCE_DELETION_DELAY = 10 * 60;
-static constexpr int64_t GOVERNANCE_ORPHAN_EXPIRATION_TIME = 10 * 60;
-static constexpr int64_t GOVERNANCE_FUDGE_WINDOW = 60 * 60 * 2;
 
 // FOR SEEN MAP ARRAYS - GOVERNANCE OBJECTS AND VOTES
 enum class SeenObjectStatus {
diff --git a/src/governance/signing.cpp b/src/governance/signing.cpp
index 1da2b9bc5311..50bcaa698c38 100644
--- a/src/governance/signing.cpp
+++ b/src/governance/signing.cpp
@@ -13,10 +13,15 @@
 #include <logging.h>
 #include <timedata.h>
 #include <util/check.h>
+#include <util/time.h>
 #include <validation.h>
 
 #include <algorithm>
 
+namespace {
+constexpr std::chrono::seconds GOVERNANCE_FUDGE_WINDOW{2h};
+} // anonymous namespace
+
 GovernanceSigner::GovernanceSigner(CConnman& connman, CDeterministicMNManager& dmnman, GovernanceSignerParent& govman,
                                    const CActiveMasternodeManager& mn_activeman, const ChainstateManager& chainman,
                                    const CMasternodeSync& mn_sync) :
@@ -76,8 +81,8 @@ std::optional<const CSuperblock> GovernanceSigner::CreateSuperblockCandidate(int
         // Skip proposals that are too expensive
         if (budgetAllocated + payment.nAmount > governanceBudget) continue;
 
-        int64_t windowStart = jproposal["start_epoch"].getInt<int64_t>() - GOVERNANCE_FUDGE_WINDOW;
-        int64_t windowEnd = jproposal["end_epoch"].getInt<int64_t>() + GOVERNANCE_FUDGE_WINDOW;
+        int64_t windowStart = jproposal["start_epoch"].getInt<int64_t>() - count_seconds(GOVERNANCE_FUDGE_WINDOW);
+        int64_t windowEnd = jproposal["end_epoch"].getInt<int64_t>() + count_seconds(GOVERNANCE_FUDGE_WINDOW);
 
         // Skip proposals if the SB isn't within the proposal time window
         if (SBEpochTime < windowStart) {

From d19e1f33156c99db0d6dfad9acb464a5068bf4c1 Mon Sep 17 00:00:00 2001
From: Kittywhiskers Van Gogh <63189531+kwvg@users.noreply.github.com>
Date: Sat, 4 Oct 2025 19:01:16 +0000
Subject: [PATCH 147/656] fix: add `nullptr` check before using
 `FindGovernanceObject()` retval

---
 src/governance/signing.cpp | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/governance/signing.cpp b/src/governance/signing.cpp
index 50bcaa698c38..a44971b0a551 100644
--- a/src/governance/signing.cpp
+++ b/src/governance/signing.cpp
@@ -212,6 +212,12 @@ void GovernanceSigner::VoteGovernanceTriggers(const std::optional<const CGoverna
     const auto activeTriggers = m_govman.GetActiveTriggers();
     for (const auto& trigger : activeTriggers) {
         const auto govobj = m_govman.FindGovernanceObject(trigger->GetGovernanceObjHash());
+        if (!govobj) {
+            LogPrint(BCLog::GOBJECT, "%s -- Not voting NO-FUNDING for unknown trigger %s\n", __func__,
+                     trigger->GetGovernanceObjHash().ToString());
+            continue;
+        }
+
         const uint256 trigger_hash = govobj->GetHash();
         if (trigger->GetBlockHeight() <= m_govman.GetCachedBlockHeight()) {
             // ignore triggers from the past

From c516fd353764ce6f53ec1958e6240d47e9fb7248 Mon Sep 17 00:00:00 2001
From: Kittywhiskers Van Gogh <63189531+kwvg@users.noreply.github.com>
Date: Sat, 4 Oct 2025 19:02:53 +0000
Subject: [PATCH 148/656] refactor: apply review suggestions

---
 src/governance/governance.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/governance/governance.cpp b/src/governance/governance.cpp
index 15efc0868466..30eefb514452 100644
--- a/src/governance/governance.cpp
+++ b/src/governance/governance.cpp
@@ -206,7 +206,7 @@ bool CGovernanceManager::SerializeVoteForHash(const uint256& nHash, CDataStream&
 void CGovernanceManager::AddPostponedObject(const CGovernanceObject& govobj)
 {
     LOCK(cs);
-    mapPostponedObjects.insert(std::make_pair(govobj.GetHash(), govobj));
+    mapPostponedObjects.emplace(govobj.GetHash(), govobj);
 }
 
 MessageProcessingResult CGovernanceManager::ProcessMessage(CNode& peer, CConnman& connman, std::string_view msg_type, CDataStream& vRecv)

From 700e069f3af38210d27ca0f42217a4b2cb5b833d Mon Sep 17 00:00:00 2001
From: Kittywhiskers Van Gogh <63189531+kwvg@users.noreply.github.com>
Date: Mon, 6 Oct 2025 22:44:39 +0000
Subject: [PATCH 149/656] refactor: cleanup headers and forward decls

---
 src/coinjoin/coinjoin.h    | 1 -
 src/governance/object.cpp  | 9 +++++----
 src/governance/object.h    | 2 --
 src/governance/signing.cpp | 1 -
 src/governance/vote.cpp    | 5 +++--
 src/governance/vote.h      | 2 --
 6 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/src/coinjoin/coinjoin.h b/src/coinjoin/coinjoin.h
index 90d1fe2fe4a9..b0c13beebbdb 100644
--- a/src/coinjoin/coinjoin.h
+++ b/src/coinjoin/coinjoin.h
@@ -28,7 +28,6 @@ class CBlockIndex;
 class ChainstateManager;
 class CMasternodeSync;
 class CTxMemPool;
-class TxValidationState;
 
 namespace llmq {
 class CChainLocksHandler;
diff --git a/src/governance/object.cpp b/src/governance/object.cpp
index 65f8a164bd44..8bea754eea50 100644
--- a/src/governance/object.cpp
+++ b/src/governance/object.cpp
@@ -5,15 +5,16 @@
 #include <governance/object.h>
 
 #include <bls/bls.h>
-#include <chainparams.h>
-#include <core_io.h>
 #include <evo/deterministicmns.h>
 #include <governance/governance.h>
 #include <governance/validators.h>
-#include <index/txindex.h>
 #include <masternode/meta.h>
 #include <masternode/sync.h>
-#include <net_processing.h>
+
+#include <chainparams.h>
+#include <core_io.h>
+#include <index/txindex.h>
+#include <logging.h>
 #include <timedata.h>
 #include <util/time.h>
 #include <validation.h>
diff --git a/src/governance/object.h b/src/governance/object.h
index 1804878e268a..5e0374520859 100644
--- a/src/governance/object.h
+++ b/src/governance/object.h
@@ -22,8 +22,6 @@ class CGovernanceObject;
 class CGovernanceVote;
 class ChainstateManager;
 class CMasternodeMetaMan;
-class CMasternodeSync;
-class CNode;
 
 extern RecursiveMutex cs_main;
 
diff --git a/src/governance/signing.cpp b/src/governance/signing.cpp
index a44971b0a551..53322c7ffee2 100644
--- a/src/governance/signing.cpp
+++ b/src/governance/signing.cpp
@@ -12,7 +12,6 @@
 #include <chainparams.h>
 #include <logging.h>
 #include <timedata.h>
-#include <util/check.h>
 #include <util/time.h>
 #include <validation.h>
 
diff --git a/src/governance/vote.cpp b/src/governance/vote.cpp
index 828f46ddeaef..2a013465e38c 100644
--- a/src/governance/vote.cpp
+++ b/src/governance/vote.cpp
@@ -5,12 +5,13 @@
 #include <governance/vote.h>
 
 #include <bls/bls.h>
-#include <chainparams.h>
 #include <evo/deterministicmns.h>
 #include <evo/dmn_types.h>
 #include <masternode/sync.h>
 #include <messagesigner.h>
-#include <net_processing.h>
+
+#include <chainparams.h>
+#include <logging.h>
 #include <timedata.h>
 #include <util/string.h>
 
diff --git a/src/governance/vote.h b/src/governance/vote.h
index 65c05703f098..18664f8b97ec 100644
--- a/src/governance/vote.h
+++ b/src/governance/vote.h
@@ -13,8 +13,6 @@
 class CBLSPublicKey;
 class CDeterministicMNList;
 class CGovernanceVote;
-class CMasternodeSync;
-class CKey;
 class CKeyID;
 
 // INTENTION OF MASTERNODES REGARDING ITEM

From b51cd1d39c0638d43bc34a4af31b1c40cf03bcf7 Mon Sep 17 00:00:00 2001
From: Kittywhiskers Van Gogh <63189531+kwvg@users.noreply.github.com>
Date: Mon, 6 Oct 2025 22:33:16 +0000
Subject: [PATCH 150/656] lint: apply most `clang-format` suggestions, update
 circular allowlist

---
 src/governance/governance.cpp           | 23 +++++++++-------
 src/governance/governance.h             | 12 ++++-----
 src/governance/signing.cpp              | 35 +++++++++++++++----------
 src/governance/signing.h                | 10 ++++---
 test/lint/lint-circular-dependencies.py |  6 ++++-
 5 files changed, 52 insertions(+), 34 deletions(-)

diff --git a/src/governance/governance.cpp b/src/governance/governance.cpp
index 30eefb514452..9d193de7036c 100644
--- a/src/governance/governance.cpp
+++ b/src/governance/governance.cpp
@@ -209,7 +209,8 @@ void CGovernanceManager::AddPostponedObject(const CGovernanceObject& govobj)
     mapPostponedObjects.emplace(govobj.GetHash(), govobj);
 }
 
-MessageProcessingResult CGovernanceManager::ProcessMessage(CNode& peer, CConnman& connman, std::string_view msg_type, CDataStream& vRecv)
+MessageProcessingResult CGovernanceManager::ProcessMessage(CNode& peer, CConnman& connman, std::string_view msg_type,
+                                                           CDataStream& vRecv)
 {
     AssertLockNotHeld(cs_relay);
     if (!IsValid()) return {};
@@ -519,8 +520,8 @@ void CGovernanceManager::CheckAndRemove()
             } else {
                 int64_t nSuperblockCycleSeconds = Params().GetConsensus().nSuperblockCycle * Params().GetConsensus().nPowTargetSpacing;
                 nTimeExpired = (std::chrono::seconds{pObj->GetCreationTime()} +
-                                std::chrono::seconds{2 * nSuperblockCycleSeconds} +
-                                GOVERNANCE_DELETION_DELAY).count();
+                                std::chrono::seconds{2 * nSuperblockCycleSeconds} + GOVERNANCE_DELETION_DELAY)
+                                   .count();
             }
 
             mapErasedGovernanceObjects.insert(std::make_pair(nHash, nTimeExpired));
@@ -941,7 +942,8 @@ bool CGovernanceManager::ProcessVote(CNode* pfrom, const CGovernanceVote& vote,
         std::string msg{strprintf("CGovernanceManager::%s -- Unknown parent object %s, MN outpoint = %s", __func__,
             nHashGovobj.ToString(), vote.GetMasternodeOutpoint().ToStringShort())};
         exception = CGovernanceException(msg, GOVERNANCE_EXCEPTION_WARNING);
-        if (cmmapOrphanVotes.Insert(nHashGovobj, vote_time_pair_t(vote, count_seconds(GetTime<std::chrono::seconds>() + GOVERNANCE_ORPHAN_EXPIRATION_TIME)))) {
+        if (cmmapOrphanVotes.Insert(nHashGovobj, vote_time_pair_t(vote, count_seconds(GetTime<std::chrono::seconds>() +
+                                                                                      GOVERNANCE_ORPHAN_EXPIRATION_TIME)))) {
             LEAVE_CRITICAL_SECTION(cs);
             RequestGovernanceObject(pfrom, nHashGovobj, connman);
             LogPrint(BCLog::GOBJECT, "%s\n", msg);
@@ -1012,8 +1014,10 @@ void CGovernanceManager::CheckPostponedObjects()
 
             int64_t nTimestamp = govobj.GetCreationTime();
 
-            bool fValid = (nTimestamp <= nNow + count_seconds(MAX_TIME_FUTURE_DEVIATION)) && (nTimestamp >= nNow - 2 * nSuperblockCycleSeconds);
-            bool fReady = (nTimestamp <= nNow + count_seconds(MAX_TIME_FUTURE_DEVIATION) - count_seconds(RELIABLE_PROPAGATION_TIME));
+            bool fValid = (nTimestamp <= nNow + count_seconds(MAX_TIME_FUTURE_DEVIATION)) &&
+                          (nTimestamp >= nNow - 2 * nSuperblockCycleSeconds);
+            bool fReady = (nTimestamp <=
+                           nNow + count_seconds(MAX_TIME_FUTURE_DEVIATION) - count_seconds(RELIABLE_PROPAGATION_TIME));
 
             if (fValid) {
                 if (fReady) {
@@ -1631,8 +1635,8 @@ bool CGovernanceManager::GetBestSuperblock(const CDeterministicMNList& tip_mn_li
     return GetBestSuperblockInternal(tip_mn_list, pSuperblockRet, nBlockHeight);
 }
 
-bool CGovernanceManager::GetBestSuperblockInternal(const CDeterministicMNList& tip_mn_list, CSuperblock_sptr& pSuperblockRet,
-                                            int nBlockHeight)
+bool CGovernanceManager::GetBestSuperblockInternal(const CDeterministicMNList& tip_mn_list,
+                                                   CSuperblock_sptr& pSuperblockRet, int nBlockHeight)
 {
     if (!CSuperblock::IsValidBlockHeight(nBlockHeight)) {
         return false;
@@ -1737,7 +1741,8 @@ void CGovernanceManager::ExecuteBestSuperblock(const CDeterministicMNList& tip_m
     }
 }
 
-std::vector<std::shared_ptr<const CGovernanceObject>> CGovernanceManager::GetApprovedProposals(const CDeterministicMNList& tip_mn_list)
+std::vector<std::shared_ptr<const CGovernanceObject>> CGovernanceManager::GetApprovedProposals(
+    const CDeterministicMNList& tip_mn_list)
 {
     AssertLockNotHeld(cs);
 
diff --git a/src/governance/governance.h b/src/governance/governance.h
index 4b246cc6a563..43d3979bdcd4 100644
--- a/src/governance/governance.h
+++ b/src/governance/governance.h
@@ -296,8 +296,8 @@ class CGovernanceManager : public GovernanceStore, public GovernanceSignerParent
     [[nodiscard]] MessageProcessingResult SyncSingleObjVotes(CNode& peer, const uint256& nProp, const CBloomFilter& filter, CConnman& connman);
     [[nodiscard]] MessageProcessingResult SyncObjects(CNode& peer, CConnman& connman) const;
 
-    [[nodiscard]] MessageProcessingResult ProcessMessage(CNode& peer, CConnman& connman, std::string_view msg_type, CDataStream& vRecv)
-        EXCLUSIVE_LOCKS_REQUIRED(!cs_relay);
+    [[nodiscard]] MessageProcessingResult ProcessMessage(CNode& peer, CConnman& connman, std::string_view msg_type,
+                                                         CDataStream& vRecv) EXCLUSIVE_LOCKS_REQUIRED(!cs_relay);
 
     const CGovernanceObject* FindConstGovernanceObject(const uint256& nHash) const EXCLUSIVE_LOCKS_REQUIRED(cs);
     CGovernanceObject* FindGovernanceObject(const uint256& nHash) override EXCLUSIVE_LOCKS_REQUIRED(!cs);
@@ -386,8 +386,8 @@ class CGovernanceManager : public GovernanceStore, public GovernanceSignerParent
     bool IsValidSuperblock(const CChain& active_chain, const CDeterministicMNList& tip_mn_list,
                            const CTransaction& txNew, int nBlockHeight, CAmount blockReward);
 
-    bool GetBestSuperblock(const CDeterministicMNList& tip_mn_list, CSuperblock_sptr& pSuperblockRet, int nBlockHeight) override
-        EXCLUSIVE_LOCKS_REQUIRED(!cs);
+    bool GetBestSuperblock(const CDeterministicMNList& tip_mn_list, CSuperblock_sptr& pSuperblockRet,
+                           int nBlockHeight) override EXCLUSIVE_LOCKS_REQUIRED(!cs);
 
     std::vector<std::shared_ptr<const CGovernanceObject>> GetApprovedProposals(const CDeterministicMNList& tip_mn_list) override
         EXCLUSIVE_LOCKS_REQUIRED(!cs);
@@ -396,8 +396,8 @@ class CGovernanceManager : public GovernanceStore, public GovernanceSignerParent
     //! Internal functions that require locks to be held
     CGovernanceObject* FindGovernanceObjectInternal(const uint256& nHash) EXCLUSIVE_LOCKS_REQUIRED(cs);
     std::vector<std::shared_ptr<CSuperblock>> GetActiveTriggersInternal() const EXCLUSIVE_LOCKS_REQUIRED(cs);
-    bool GetBestSuperblockInternal(const CDeterministicMNList& tip_mn_list, CSuperblock_sptr& pSuperblockRet, int nBlockHeight)
-        EXCLUSIVE_LOCKS_REQUIRED(cs);
+    bool GetBestSuperblockInternal(const CDeterministicMNList& tip_mn_list, CSuperblock_sptr& pSuperblockRet,
+                                   int nBlockHeight) EXCLUSIVE_LOCKS_REQUIRED(cs);
 
     void ExecuteBestSuperblock(const CDeterministicMNList& tip_mn_list, int nBlockHeight);
 
diff --git a/src/governance/signing.cpp b/src/governance/signing.cpp
index 53322c7ffee2..13dd74d88637 100644
--- a/src/governance/signing.cpp
+++ b/src/governance/signing.cpp
@@ -39,7 +39,9 @@ std::optional<const CSuperblock> GovernanceSigner::CreateSuperblockCandidate(int
 {
     if (!m_govman.IsValid()) return std::nullopt;
     if (!m_mn_sync.IsSynced()) return std::nullopt;
-    if (nHeight % Params().GetConsensus().nSuperblockCycle < Params().GetConsensus().nSuperblockCycle - Params().GetConsensus().nSuperblockMaturityWindow) return std::nullopt;
+    if (nHeight % Params().GetConsensus().nSuperblockCycle <
+        Params().GetConsensus().nSuperblockCycle - Params().GetConsensus().nSuperblockMaturityWindow)
+        return std::nullopt;
     if (HasAlreadyVotedFundingTrigger()) return std::nullopt;
 
     const auto approvedProposals = m_govman.GetApprovedProposals(m_dmnman.GetListAtChainTip());
@@ -53,7 +55,8 @@ std::optional<const CSuperblock> GovernanceSigner::CreateSuperblockCandidate(int
     int nNextSuperblock;
 
     CSuperblock::GetNearestSuperblocksHeights(nHeight, nLastSuperblock, nNextSuperblock);
-    auto SBEpochTime = static_cast<int64_t>(GetTime<std::chrono::seconds>().count() + (nNextSuperblock - nHeight) * 2.62 * 60);
+    auto SBEpochTime = static_cast<int64_t>(GetTime<std::chrono::seconds>().count() +
+                                            (nNextSuperblock - nHeight) * 2.62 * 60);
     auto governanceBudget = CSuperblock::GetPaymentsLimit(m_chainman.ActiveChain(), nNextSuperblock);
 
     CAmount budgetAllocated{};
@@ -67,9 +70,8 @@ std::optional<const CSuperblock> GovernanceSigner::CreateSuperblockCandidate(int
         CAmount nAmount{};
         try {
             nAmount = ParsePaymentAmount(jproposal["payment_amount"].getValStr());
-        }
-        catch (const std::runtime_error& e) {
-            LogPrint(BCLog::GOBJECT, "%s -- nHeight:%d Skipping payment exception:%s\n", __func__,nHeight, e.what());
+        } catch (const std::runtime_error& e) {
+            LogPrint(BCLog::GOBJECT, "%s -- nHeight:%d Skipping payment exception:%s\n", __func__, nHeight, e.what());
             continue;
         }
 
@@ -85,11 +87,12 @@ std::optional<const CSuperblock> GovernanceSigner::CreateSuperblockCandidate(int
 
         // Skip proposals if the SB isn't within the proposal time window
         if (SBEpochTime < windowStart) {
-            LogPrint(BCLog::GOBJECT, "%s -- nHeight:%d SB:%d windowStart:%d\n", __func__,nHeight, SBEpochTime, windowStart);
+            LogPrint(BCLog::GOBJECT, "%s -- nHeight:%d SB:%d windowStart:%d\n", __func__, nHeight, SBEpochTime,
+                     windowStart);
             continue;
         }
         if (SBEpochTime > windowEnd) {
-            LogPrint(BCLog::GOBJECT, "%s -- nHeight:%d SB:%d windowEnd:%d\n", __func__,nHeight, SBEpochTime, windowEnd);
+            LogPrint(BCLog::GOBJECT, "%s -- nHeight:%d SB:%d windowEnd:%d\n", __func__, nHeight, SBEpochTime, windowEnd);
             continue;
         }
 
@@ -120,7 +123,7 @@ std::optional<const CGovernanceObject> GovernanceSigner::CreateGovernanceTrigger
     // no sb_opt, no trigger
     if (!sb_opt.has_value()) return std::nullopt;
 
-    //TODO: Check if nHashParentIn, nRevision and nCollateralHashIn are correct
+    // TODO: Check if nHashParentIn, nRevision and nCollateralHashIn are correct
     LOCK(::cs_main);
 
     // Check if identical trigger (equal DataHash()) is already created (signed by other masternode)
@@ -153,7 +156,8 @@ std::optional<const CGovernanceObject> GovernanceSigner::CreateGovernanceTrigger
     }
 
     if (!m_govman.MasternodeRateCheck(gov_sb)) {
-        LogPrint(BCLog::GOBJECT, "%s -- Trigger rejected because of rate check failure hash(%s)\n", __func__, gov_sb.GetHash().ToString());
+        LogPrint(BCLog::GOBJECT, "%s -- Trigger rejected because of rate check failure hash(%s)\n", __func__,
+                 gov_sb.GetHash().ToString());
         return std::nullopt;
     }
 
@@ -220,12 +224,14 @@ void GovernanceSigner::VoteGovernanceTriggers(const std::optional<const CGoverna
         const uint256 trigger_hash = govobj->GetHash();
         if (trigger->GetBlockHeight() <= m_govman.GetCachedBlockHeight()) {
             // ignore triggers from the past
-            LogPrint(BCLog::GOBJECT, "%s -- Not voting NO-FUNDING for outdated trigger:%s\n", __func__, trigger_hash.ToString());
+            LogPrint(BCLog::GOBJECT, "%s -- Not voting NO-FUNDING for outdated trigger:%s\n", __func__,
+                     trigger_hash.ToString());
             continue;
         }
         if (trigger_hash == votedFundingYesTriggerHash) {
             // Skip actual trigger
-            LogPrint(BCLog::GOBJECT, "%s -- Not voting NO-FUNDING for trigger:%s, we voted yes for it already\n", __func__, trigger_hash.ToString());
+            LogPrint(BCLog::GOBJECT, "%s -- Not voting NO-FUNDING for trigger:%s, we voted yes for it already\n",
+                     __func__, trigger_hash.ToString());
             continue;
         }
         if (vote_rec_t voteRecord; govobj->GetCurrentMNVotes(m_mn_activeman.GetOutPoint(), voteRecord)) {
@@ -233,8 +239,8 @@ void GovernanceSigner::VoteGovernanceTriggers(const std::optional<const CGoverna
             if (ranges::any_of(voteRecord.mapInstances, [&](const auto& voteInstancePair) {
                     if (voteInstancePair.first == VOTE_SIGNAL_FUNDING) {
                         LogPrint(BCLog::GOBJECT, /* Continued */
-                                 "%s -- Not voting NO-FUNDING for trigger:%s, we voted %s for it already\n",
-                                 strFunc, trigger_hash.ToString(),
+                                 "%s -- Not voting NO-FUNDING for trigger:%s, we voted %s for it already\n", strFunc,
+                                 trigger_hash.ToString(),
                                  CGovernanceVoting::ConvertOutcomeToString(voteInstancePair.second.eOutcome));
                         return true;
                     }
@@ -260,7 +266,8 @@ bool GovernanceSigner::VoteFundingTrigger(const uint256& nHash, const vote_outco
 
     CGovernanceException exception;
     if (!m_govman.ProcessVoteAndRelay(vote, exception, m_connman)) {
-        LogPrint(BCLog::GOBJECT, "%s -- Vote FUNDING %d for trigger:%s failed:%s\n", __func__, outcome, nHash.ToString(), exception.what());
+        LogPrint(BCLog::GOBJECT, "%s -- Vote FUNDING %d for trigger:%s failed:%s\n", __func__, outcome,
+                 nHash.ToString(), exception.what());
         return false;
     }
 
diff --git a/src/governance/signing.h b/src/governance/signing.h
index e50d12f8651d..750e2c168c18 100644
--- a/src/governance/signing.h
+++ b/src/governance/signing.h
@@ -32,14 +32,16 @@ class GovernanceSignerParent
     virtual ~GovernanceSignerParent() = default;
 
     virtual bool IsValid() const = 0;
-    virtual bool GetBestSuperblock(const CDeterministicMNList& tip_mn_list, std::shared_ptr<CSuperblock>& pSuperblockRet, int nBlockHeight) = 0;
+    virtual bool GetBestSuperblock(const CDeterministicMNList& tip_mn_list,
+                                   std::shared_ptr<CSuperblock>& pSuperblockRet, int nBlockHeight) = 0;
     virtual bool MasternodeRateCheck(const CGovernanceObject& govobj, bool fUpdateFailStatus = false) = 0;
     virtual bool ProcessVoteAndRelay(const CGovernanceVote& vote, CGovernanceException& exception, CConnman& connman) = 0;
     virtual int GetCachedBlockHeight() const = 0;
     virtual CGovernanceObject* FindGovernanceObject(const uint256& nHash) = 0;
     virtual CGovernanceObject* FindGovernanceObjectByDataHash(const uint256& nDataHash) = 0;
     virtual std::vector<std::shared_ptr<CSuperblock>> GetActiveTriggers() const = 0;
-    virtual std::vector<std::shared_ptr<const CGovernanceObject>> GetApprovedProposals(const CDeterministicMNList& tip_mn_list) = 0;
+    virtual std::vector<std::shared_ptr<const CGovernanceObject>> GetApprovedProposals(
+        const CDeterministicMNList& tip_mn_list) = 0;
     virtual void AddGovernanceObject(CGovernanceObject& govobj, const CNode* pfrom = nullptr) = 0;
 };
 
@@ -58,8 +60,8 @@ class GovernanceSigner
 
 public:
     explicit GovernanceSigner(CConnman& connman, CDeterministicMNManager& dmnman, GovernanceSignerParent& govman,
-                              const CActiveMasternodeManager& mn_activeman,
-                              const ChainstateManager& chainman, const CMasternodeSync& mn_sync);
+                              const CActiveMasternodeManager& mn_activeman, const ChainstateManager& chainman,
+                              const CMasternodeSync& mn_sync);
     ~GovernanceSigner();
 
     void UpdatedBlockTip(const CBlockIndex* pindex);
diff --git a/test/lint/lint-circular-dependencies.py b/test/lint/lint-circular-dependencies.py
index 4934b002e1a9..266fd02574db 100755
--- a/test/lint/lint-circular-dependencies.py
+++ b/test/lint/lint-circular-dependencies.py
@@ -40,6 +40,8 @@
     "consensus/tx_verify -> evo/assetlocktx -> llmq/commitment -> validation -> consensus/tx_verify",
     "consensus/tx_verify -> evo/assetlocktx -> llmq/commitment -> validation -> txmempool -> consensus/tx_verify",
     "core_io -> evo/mnhftx -> llmq/signing -> net_processing -> evo/smldiff -> core_io",
+    "core_io -> evo/mnhftx -> llmq/signing -> net_processing -> masternode/active/context -> governance/signing -> governance/classes -> core_io",
+    "core_io -> evo/mnhftx -> llmq/signing -> net_processing -> masternode/active/context -> governance/signing -> governance/object -> core_io",
     "evo/assetlocktx -> llmq/commitment -> validation -> txmempool -> evo/assetlocktx",
     "evo/chainhelper -> evo/specialtxman -> validation -> evo/chainhelper",
     "evo/deterministicmns -> index/txindex -> validation -> evo/deterministicmns",
@@ -47,8 +49,10 @@
     "evo/netinfo -> evo/providertx -> evo/netinfo",
     "evo/smldiff -> llmq/blockprocessor -> llmq/utils -> llmq/snapshot -> evo/smldiff",
     "evo/specialtxman -> validation -> evo/specialtxman",
-    "governance/governance -> governance/object -> governance/governance",
+    "governance/classes -> governance/object -> governance/governance -> governance/classes",
+    "governance/governance -> governance/signing -> governance/object -> governance/governance",
     "governance/governance -> masternode/sync -> governance/governance",
+    "governance/governance -> net_processing -> masternode/active/context -> governance/governance",
     "governance/governance -> net_processing -> governance/governance",
     "instantsend/instantsend -> net_processing -> instantsend/instantsend",
     "instantsend/instantsend -> net_processing -> llmq/context -> instantsend/instantsend",

From c792c654a8bf667da68a03f0502da30c332449f9 Mon Sep 17 00:00:00 2001
From: MacroFake <falke.marco@gmail.com>
Date: Thu, 14 Jul 2022 09:55:40 +0200
Subject: [PATCH 151/656] Merge bitcoin/bitcoin#25557: p2p: Eliminate atomic
 for m_last_getheaders_timestamp

613e2211493ae2c78b71d1f4ea62661438d2cb73 test: remove unnecessary parens (Suhas Daftuar)
e939cf2b7645c2b20a68cb6129f3aebfdf287d61 Remove atomic for m_last_getheaders_timestamp (Suhas Daftuar)

Pull request description:

  Eliminate the unnecessary atomic guarding `m_last_getheaders_timestamp`, which is only accessed in a single thread (thanks to MarcoFalke for pointing this out).

  Also address a nit that came up in #25454.

ACKs for top commit:
  MarcoFalke:
    review ACK 613e2211493ae2c78b71d1f4ea62661438d2cb73
  vasild:
    ACK 613e2211493ae2c78b71d1f4ea62661438d2cb73

Tree-SHA512: 6d6c473735b450b8ad43aae5cf16ed419154d72f4a05c0a6ce6f26caecab9db2361041398b70bf9395611c107d50897f501fa5fdbabb2891144bbc2b479dfdad
---
 src/net_processing.cpp                  | 6 +++---
 test/functional/feature_minchainwork.py | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/net_processing.cpp b/src/net_processing.cpp
index 101d453b2a72..c80bb36c687b 100644
--- a/src/net_processing.cpp
+++ b/src/net_processing.cpp
@@ -416,7 +416,7 @@ struct Peer {
     std::deque<CInv> m_getdata_requests GUARDED_BY(m_getdata_requests_mutex);
 
     /** Time of the last getheaders message to this peer */
-    std::atomic<NodeClock::time_point> m_last_getheaders_timestamp GUARDED_BY(NetEventsInterface::g_msgproc_mutex){NodeSeconds{}};
+    NodeClock::time_point m_last_getheaders_timestamp GUARDED_BY(NetEventsInterface::g_msgproc_mutex){};
 
     explicit Peer(NodeId id, ServiceFlags our_services)
         : m_id(id)
@@ -3023,7 +3023,7 @@ bool PeerManagerImpl::MaybeSendGetHeaders(CNode& pfrom, const std::string& msg_t
 
     // Only allow a new getheaders message to go out if we don't have a recent
     // one already in-flight
-    if (current_time - peer.m_last_getheaders_timestamp.load() > HEADERS_RESPONSE_TIME) {
+    if (current_time - peer.m_last_getheaders_timestamp > HEADERS_RESPONSE_TIME) {
         m_connman.PushMessage(&pfrom, msgMaker.Make(msg_type, locator, uint256()));
         peer.m_last_getheaders_timestamp = current_time;
         return true;
@@ -4997,7 +4997,7 @@ void PeerManagerImpl::ProcessMessage(
 
         // Assume that this is in response to any outstanding getheaders
         // request we may have sent, and clear out the time of our last request
-        peer->m_last_getheaders_timestamp.store(NodeSeconds{});
+        peer->m_last_getheaders_timestamp = {};
 
         std::vector<CBlockHeader> headers;
 
diff --git a/test/functional/feature_minchainwork.py b/test/functional/feature_minchainwork.py
index cb8aee912baf..9dd8655c5acb 100755
--- a/test/functional/feature_minchainwork.py
+++ b/test/functional/feature_minchainwork.py
@@ -85,7 +85,7 @@ def run_test(self):
         msg.hashstop = 0
         peer.send_and_ping(msg)
         time.sleep(5)
-        assert ("headers" not in peer.last_message or len(peer.last_message["headers"].headers) == 0)
+        assert "headers" not in peer.last_message or len(peer.last_message["headers"].headers) == 0
 
         self.log.info("Generating one more block")
         self.generate(self.nodes[0], 1)

From b86eadef13104b8518c653cdd75f7fb0a47c8d87 Mon Sep 17 00:00:00 2001
From: fanquake <fanquake@gmail.com>
Date: Tue, 19 Jul 2022 11:19:12 +0100
Subject: [PATCH 152/656] Merge bitcoin/bitcoin#25629: univalue: Return more
 detailed type check error messages

fae5ce8795080018875227aee8613677f92e99ce univalue: Return more detailed type check error messages (MacroFake)
fafab147e7ff41ab1b961349f20a364f6bf847d2 move-only: Move UniValue::getInt definition to keep class with definitions only (MacroFake)

Pull request description:

  Print the current type and the expected type

ACKs for top commit:
  aureleoules:
    ACK fae5ce8795080018875227aee8613677f92e99ce.

Tree-SHA512: 4ae720a012ff8245baf5cd7f844f93b946c58feebe62de6dfd84ebc5c8afb988295a94de7c01aef98aaf4c6228f7184ed622f37079c738924617e0f336ac5b6e
---
 src/univalue/include/univalue.h               | 30 ++++++++++---------
 src/univalue/lib/univalue.cpp                 | 19 ++++++++----
 src/univalue/lib/univalue_get.cpp             | 19 ++++--------
 .../mining_prioritisetransaction.py           |  2 +-
 test/functional/rpc_blockchain.py             |  6 ++--
 test/functional/rpc_help.py                   |  2 +-
 test/functional/rpc_rawtransaction.py         | 16 +++++-----
 test/functional/wallet_basic.py               |  2 +-
 test/functional/wallet_hd.py                  |  4 +--
 test/functional/wallet_multiwallet.py         |  2 +-
 10 files changed, 53 insertions(+), 49 deletions(-)

diff --git a/src/univalue/include/univalue.h b/src/univalue/include/univalue.h
index ec4a1aae64b8..372b0ed7c6f4 100644
--- a/src/univalue/include/univalue.h
+++ b/src/univalue/include/univalue.h
@@ -100,6 +100,7 @@ class UniValue {
     std::vector<std::string> keys;
     std::vector<UniValue> values;
 
+    void checkType(const VType& expected) const;
     bool findKey(const std::string& key, size_t& retIdx) const;
     void writeArray(unsigned int prettyIndent, unsigned int indentLevel, std::string& s) const;
     void writeObject(unsigned int prettyIndent, unsigned int indentLevel, std::string& s) const;
@@ -110,19 +111,7 @@ class UniValue {
     const std::vector<std::string>& getKeys() const;
     const std::vector<UniValue>& getValues() const;
     template <typename Int>
-    auto getInt() const
-    {
-        static_assert(std::is_integral<Int>::value);
-        if (typ != VNUM) {
-            throw std::runtime_error("JSON value is not an integer as expected");
-        }
-        Int result;
-        const auto [first_nonmatching, error_condition] = std::from_chars(val.data(), val.data() + val.size(), result);
-        if (first_nonmatching != val.data() + val.size() || error_condition != std::errc{}) {
-            throw std::runtime_error("JSON integer out of range");
-        }
-        return result;
-    }
+    Int getInt() const;
     bool get_bool() const;
     const std::string& get_str() const;
     double get_real() const;
@@ -136,10 +125,23 @@ class UniValue {
 template <class It>
 void UniValue::push_backV(It first, It last)
 {
-    if (typ != VARR) throw std::runtime_error{"JSON value is not an array as expected"};
+    checkType(VARR);
     values.insert(values.end(), first, last);
 }
 
+template <typename Int>
+Int UniValue::getInt() const
+{
+    static_assert(std::is_integral<Int>::value);
+    checkType(VNUM);
+    Int result;
+    const auto [first_nonmatching, error_condition] = std::from_chars(val.data(), val.data() + val.size(), result);
+    if (first_nonmatching != val.data() + val.size() || error_condition != std::errc{}) {
+        throw std::runtime_error("JSON integer out of range");
+    }
+    return result;
+}
+
 enum jtokentype {
     JTOK_ERR        = -1,
     JTOK_NONE       = 0,                           // eof
diff --git a/src/univalue/lib/univalue.cpp b/src/univalue/lib/univalue.cpp
index a00c9f348146..4c8066767a94 100644
--- a/src/univalue/lib/univalue.cpp
+++ b/src/univalue/lib/univalue.cpp
@@ -103,21 +103,21 @@ void UniValue::setObject()
 
 void UniValue::push_back(const UniValue& val_)
 {
-    if (typ != VARR) throw std::runtime_error{"JSON value is not an array as expected"};
+    checkType(VARR);
 
     values.push_back(val_);
 }
 
 void UniValue::push_backV(const std::vector<UniValue>& vec)
 {
-    if (typ != VARR) throw std::runtime_error{"JSON value is not an array as expected"};
+    checkType(VARR);
 
     values.insert(values.end(), vec.begin(), vec.end());
 }
 
 void UniValue::__pushKV(const std::string& key, const UniValue& val_)
 {
-    if (typ != VOBJ) throw std::runtime_error{"JSON value is not an object as expected"};
+    checkType(VOBJ);
 
     keys.push_back(key);
     values.push_back(val_);
@@ -125,7 +125,7 @@ void UniValue::__pushKV(const std::string& key, const UniValue& val_)
 
 void UniValue::pushKV(const std::string& key, const UniValue& val_)
 {
-    if (typ != VOBJ) throw std::runtime_error{"JSON value is not an object as expected"};
+    checkType(VOBJ);
 
     size_t idx;
     if (findKey(key, idx))
@@ -136,7 +136,8 @@ void UniValue::pushKV(const std::string& key, const UniValue& val_)
 
 void UniValue::pushKVs(const UniValue& obj)
 {
-    if (typ != VOBJ || obj.typ != VOBJ) throw std::runtime_error{"JSON value is not an object as expected"};
+    checkType(VOBJ);
+    obj.checkType(VOBJ);
 
     for (size_t i = 0; i < obj.keys.size(); i++)
         __pushKV(obj.keys[i], obj.values.at(i));
@@ -206,6 +207,14 @@ const UniValue& UniValue::operator[](size_t index) const
     return values.at(index);
 }
 
+void UniValue::checkType(const VType& expected) const
+{
+    if (typ != expected) {
+        throw std::runtime_error{"JSON value of type " + std::string{uvTypeName(typ)} + " is not of expected type " +
+                                 std::string{uvTypeName(expected)}};
+    }
+}
+
 const char *uvTypeName(UniValue::VType t)
 {
     switch (t) {
diff --git a/src/univalue/lib/univalue_get.cpp b/src/univalue/lib/univalue_get.cpp
index 9bbdb1fe69b9..5c58f388ddc5 100644
--- a/src/univalue/lib/univalue_get.cpp
+++ b/src/univalue/lib/univalue_get.cpp
@@ -46,8 +46,7 @@ bool ParseDouble(const std::string& str, double *out)
 
 const std::vector<std::string>& UniValue::getKeys() const
 {
-    if (typ != VOBJ)
-        throw std::runtime_error("JSON value is not an object as expected");
+    checkType(VOBJ);
     return keys;
 }
 
@@ -60,22 +59,19 @@ const std::vector<UniValue>& UniValue::getValues() const
 
 bool UniValue::get_bool() const
 {
-    if (typ != VBOOL)
-        throw std::runtime_error("JSON value is not a boolean as expected");
+    checkType(VBOOL);
     return getBool();
 }
 
 const std::string& UniValue::get_str() const
 {
-    if (typ != VSTR)
-        throw std::runtime_error("JSON value is not a string as expected");
+    checkType(VSTR);
     return getValStr();
 }
 
 double UniValue::get_real() const
 {
-    if (typ != VNUM)
-        throw std::runtime_error("JSON value is not a number as expected");
+    checkType(VNUM);
     double retval;
     if (!ParseDouble(getValStr(), &retval))
         throw std::runtime_error("JSON double out of range");
@@ -84,15 +80,12 @@ double UniValue::get_real() const
 
 const UniValue& UniValue::get_obj() const
 {
-    if (typ != VOBJ)
-        throw std::runtime_error("JSON value is not an object as expected");
+    checkType(VOBJ);
     return *this;
 }
 
 const UniValue& UniValue::get_array() const
 {
-    if (typ != VARR)
-        throw std::runtime_error("JSON value is not an array as expected");
+    checkType(VARR);
     return *this;
 }
-
diff --git a/test/functional/mining_prioritisetransaction.py b/test/functional/mining_prioritisetransaction.py
index 6fb6e2d1bef6..1f9bf2c60571 100755
--- a/test/functional/mining_prioritisetransaction.py
+++ b/test/functional/mining_prioritisetransaction.py
@@ -120,7 +120,7 @@ def run_test(self):
         txid = '1d1d4e24ed99057e84c3f80fd8fbec79ed9e1acee37da269356ecea000000000'
 
         # Test `prioritisetransaction` invalid `fee_delta`
-        assert_raises_rpc_error(-1, "JSON value is not an integer as expected", self.nodes[0].prioritisetransaction, txid=txid, fee_delta='foo')
+        assert_raises_rpc_error(-1, "JSON value of type string is not of expected type number", self.nodes[0].prioritisetransaction, txid=txid, fee_delta='foo')
 
         self.test_diamond()
 
diff --git a/test/functional/rpc_blockchain.py b/test/functional/rpc_blockchain.py
index 6ffaaa75f0f9..cf6ef0f7aeeb 100755
--- a/test/functional/rpc_blockchain.py
+++ b/test/functional/rpc_blockchain.py
@@ -263,12 +263,12 @@ def _test_getchaintxstats(self):
         assert_raises_rpc_error(-1, 'getchaintxstats', self.nodes[0].getchaintxstats, 0, '', 0)
 
         # Test `getchaintxstats` invalid `nblocks`
-        assert_raises_rpc_error(-1, "JSON value is not an integer as expected", self.nodes[0].getchaintxstats, '')
+        assert_raises_rpc_error(-1, "JSON value of type string is not of expected type number", self.nodes[0].getchaintxstats, '')
         assert_raises_rpc_error(-8, "Invalid block count: should be between 0 and the block's height - 1", self.nodes[0].getchaintxstats, -1)
         assert_raises_rpc_error(-8, "Invalid block count: should be between 0 and the block's height - 1", self.nodes[0].getchaintxstats, self.nodes[0].getblockcount())
 
         # Test `getchaintxstats` invalid `blockhash`
-        assert_raises_rpc_error(-1, "JSON value is not a string as expected", self.nodes[0].getchaintxstats, blockhash=0)
+        assert_raises_rpc_error(-1, "JSON value of type number is not of expected type string", self.nodes[0].getchaintxstats, blockhash=0)
         assert_raises_rpc_error(-8, "blockhash must be of length 64 (not 1, for '0')", self.nodes[0].getchaintxstats, blockhash='0')
         assert_raises_rpc_error(-8, "blockhash must be hexadecimal string (not 'ZZZ0000000000000000000000000000000000000000000000000000000000000')", self.nodes[0].getchaintxstats, blockhash='ZZZ0000000000000000000000000000000000000000000000000000000000000')
         assert_raises_rpc_error(-5, "Block not found", self.nodes[0].getchaintxstats, blockhash='0000000000000000000000000000000000000000000000000000000000000000')
@@ -543,7 +543,7 @@ def assert_vin_does_not_contain_prevout(verbosity):
         datadir = get_datadir_path(self.options.tmpdir, 0)
 
         self.log.info("Test that getblock with invalid verbosity type returns proper error message")
-        assert_raises_rpc_error(-1, "JSON value is not an integer as expected", node.getblock, blockhash, "2")
+        assert_raises_rpc_error(-1, "JSON value of type string is not of expected type number", node.getblock, blockhash, "2")
 
         def move_block_file(old, new):
             old_path = os.path.join(datadir, self.chain, 'blocks', old)
diff --git a/test/functional/rpc_help.py b/test/functional/rpc_help.py
index c473dc8707f5..795f3856b78a 100755
--- a/test/functional/rpc_help.py
+++ b/test/functional/rpc_help.py
@@ -92,7 +92,7 @@ def test_categories(self):
         assert_raises_rpc_error(-1, 'help', node.help, 'foo', 'bar', 'foobar')
 
         # invalid argument
-        assert_raises_rpc_error(-1, 'JSON value is not a string as expected', node.help, 0)
+        assert_raises_rpc_error(-1, "JSON value of type number is not of expected type string", node.help, 0)
 
         # help of unknown command
         assert_equal(node.help('foo'), 'help: unknown command: foo')
diff --git a/test/functional/rpc_rawtransaction.py b/test/functional/rpc_rawtransaction.py
index ecbd706fc014..338a3eb91fcc 100755
--- a/test/functional/rpc_rawtransaction.py
+++ b/test/functional/rpc_rawtransaction.py
@@ -128,14 +128,14 @@ def getrawtransaction_tests(self):
 
             # 6. invalid parameters - supply txid and invalid boolean values (strings) for verbose
             for value in ["True", "False"]:
-                assert_raises_rpc_error(-1, "not a boolean", self.nodes[n].getrawtransaction, txid=txId, verbose=value)
-                assert_raises_rpc_error(-1, "not a boolean", self.nodes[n].getrawtransactionmulti, transactions={"0":[txId]}, verbose=value)
+                assert_raises_rpc_error(-1, "not of expected type bool", self.nodes[n].getrawtransaction, txid=txId, verbose=value)
+                assert_raises_rpc_error(-1, "not of expected type bool", self.nodes[n].getrawtransactionmulti, transactions={"0":[txId]}, verbose=value)
 
             # 7. invalid parameters - supply txid and empty array
-            assert_raises_rpc_error(-1, "not a boolean", self.nodes[n].getrawtransaction, txId, [])
+            assert_raises_rpc_error(-1, "not of expected type bool", self.nodes[n].getrawtransaction, txId, [])
 
             # 8. invalid parameters - supply txid and empty dict
-            assert_raises_rpc_error(-1, "not a boolean", self.nodes[n].getrawtransaction, txId, {})
+            assert_raises_rpc_error(-1, "not of expected type bool", self.nodes[n].getrawtransaction, txId, {})
 
         # Make a tx by sending, then generate 2 blocks; block1 has the tx in it
         tx = self.wallet.send_self_transfer(from_node=self.nodes[2])['txid']
@@ -157,7 +157,7 @@ def getrawtransaction_tests(self):
             # We should not get the tx if we provide an unrelated block
             assert_raises_rpc_error(-5, "No such transaction found", self.nodes[n].getrawtransaction, txid=tx, blockhash=block2)
             # An invalid block hash should raise the correct errors
-            assert_raises_rpc_error(-1, "JSON value is not a string as expected", self.nodes[n].getrawtransaction, txid=tx, blockhash=True)
+            assert_raises_rpc_error(-1, "JSON value of type bool is not of expected type string", self.nodes[n].getrawtransaction, txid=tx, blockhash=True)
             assert_raises_rpc_error(-8, "parameter 3 must be of length 64 (not 6, for 'foobar')", self.nodes[n].getrawtransaction, txid=tx, blockhash="foobar")
             assert_raises_rpc_error(-8, "parameter 3 must be of length 64 (not 8, for 'abcd1234')", self.nodes[n].getrawtransaction, txid=tx, blockhash="abcd1234")
             foo = "ZZZ0000000000000000000000000000000000000000000000000000000000000"
@@ -187,8 +187,8 @@ def createrawtransaction_tests(self):
 
         # Test `createrawtransaction` invalid `inputs`
         assert_raises_rpc_error(-3, "JSON value of type string is not of expected type array", self.nodes[0].createrawtransaction, 'foo', {})
-        assert_raises_rpc_error(-1, "JSON value is not an object as expected", self.nodes[0].createrawtransaction, ['foo'], {})
-        assert_raises_rpc_error(-1, "JSON value is not a string as expected", self.nodes[0].createrawtransaction, [{}], {})
+        assert_raises_rpc_error(-1, "JSON value of type string is not of expected type object", self.nodes[0].createrawtransaction, ['foo'], {})
+        assert_raises_rpc_error(-1, "JSON value of type null is not of expected type string", self.nodes[0].createrawtransaction, [{}], {})
         assert_raises_rpc_error(-8, "txid must be of length 64 (not 3, for 'foo')", self.nodes[0].createrawtransaction, [{'txid': 'foo'}], {})
         txid = "ZZZ7bb8b1697ea987f3b223ba7819250cae33efacb068d23dc24859824a77844"
         assert_raises_rpc_error(-8, f"txid must be hexadecimal string (not '{txid}')", self.nodes[0].createrawtransaction, [{'txid': txid}], {})
@@ -213,7 +213,7 @@ def createrawtransaction_tests(self):
 
         # Test `createrawtransaction` invalid `outputs`
         address = getnewdestination()[2]
-        assert_raises_rpc_error(-1, "JSON value is not an array as expected", self.nodes[0].createrawtransaction, [], 'foo')
+        assert_raises_rpc_error(-1, "JSON value of type string is not of expected type array", self.nodes[0].createrawtransaction, [], 'foo')
         self.nodes[0].createrawtransaction(inputs=[], outputs={})  # Should not throw for backwards compatibility
         self.nodes[0].createrawtransaction(inputs=[], outputs=[])
         assert_raises_rpc_error(-8, "Data must be hexadecimal string", self.nodes[0].createrawtransaction, [], {'data': 'foo'})
diff --git a/test/functional/wallet_basic.py b/test/functional/wallet_basic.py
index c33facaa4405..c478a6e16421 100755
--- a/test/functional/wallet_basic.py
+++ b/test/functional/wallet_basic.py
@@ -453,7 +453,7 @@ def run_test(self):
         assert_raises_rpc_error(-3, "Invalid amount", self.nodes[0].sendtoaddress, self.nodes[2].getnewaddress(), "1f-4")
 
         # This will raise an exception since generate does not accept a string
-        assert_raises_rpc_error(-1, "not an integer", self.generate, self.nodes[0], "2")
+        assert_raises_rpc_error(-1, "not of expected type number", self.generate, self.nodes[0], "2")
 
         if not self.options.descriptors:
 
diff --git a/test/functional/wallet_hd.py b/test/functional/wallet_hd.py
index b6cf51315781..665529f72662 100755
--- a/test/functional/wallet_hd.py
+++ b/test/functional/wallet_hd.py
@@ -184,8 +184,8 @@ def run_test(self):
             # Sethdseed parameter validity
             assert_raises_rpc_error(-1, 'sethdseed', self.nodes[0].sethdseed, False, new_seed, 0)
             assert_raises_rpc_error(-5, "Invalid private key", wallet_no_seed.sethdseed, False, "not_wif")
-            assert_raises_rpc_error(-1, "JSON value is not a boolean as expected", wallet_no_seed.sethdseed, "Not_bool")
-            assert_raises_rpc_error(-1, "JSON value is not a string as expected", wallet_no_seed.sethdseed, False, True)
+            assert_raises_rpc_error(-1, "JSON value of type string is not of expected type bool", wallet_no_seed.sethdseed, "Not_bool")
+            assert_raises_rpc_error(-1, "JSON value of type bool is not of expected type string", wallet_no_seed.sethdseed, False, True)
             assert_raises_rpc_error(-5, "Already have this key", wallet_no_seed.sethdseed, False, non_hd_key)
 
             self.log.info('Test sethdseed restoring with keys outside of the initial keypool')
diff --git a/test/functional/wallet_multiwallet.py b/test/functional/wallet_multiwallet.py
index 9be0a3031b5c..3902129aa088 100755
--- a/test/functional/wallet_multiwallet.py
+++ b/test/functional/wallet_multiwallet.py
@@ -353,7 +353,7 @@ def wallet_file(name):
         self.log.info("Test dynamic wallet unloading")
 
         # Test `unloadwallet` errors
-        assert_raises_rpc_error(-1, "JSON value is not a string as expected", self.nodes[0].unloadwallet)
+        assert_raises_rpc_error(-1, "JSON value of type null is not of expected type string", self.nodes[0].unloadwallet)
         assert_raises_rpc_error(-18, "Requested wallet does not exist or is not loaded", self.nodes[0].unloadwallet, "dummy")
         assert_raises_rpc_error(-18, "Requested wallet does not exist or is not loaded", node.get_wallet_rpc("dummy").unloadwallet)
         assert_raises_rpc_error(-8, "RPC endpoint wallet and wallet_name parameter specify different wallets", w1.unloadwallet, "w2"),

From d34be4b2e92fdafde4f486dc264b3766beaef99d Mon Sep 17 00:00:00 2001
From: Konstantin Akimov <knstqq@gmail.com>
Date: Mon, 13 Oct 2025 17:35:08 +0700
Subject: [PATCH 153/656] fixup: follow-up for bitcoin#12755 - no more
 expected_stderr is needed for stop_nodes()

---
 test/functional/test_framework/test_framework.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/functional/test_framework/test_framework.py b/test/functional/test_framework/test_framework.py
index 5194b06cb2cd..d9ad16b25459 100755
--- a/test/functional/test_framework/test_framework.py
+++ b/test/functional/test_framework/test_framework.py
@@ -681,11 +681,11 @@ def stop_node(self, i, expected_stderr='', wait=0):
         """Stop a dashd test node"""
         self.nodes[i].stop_node(expected_stderr=expected_stderr, wait=wait)
 
-    def stop_nodes(self, expected_stderr='', wait=0):
+    def stop_nodes(self, wait=0):
         """Stop multiple dashd test nodes"""
         for node in self.nodes:
             # Issue RPC to stop nodes
-            node.stop_node(expected_stderr=expected_stderr, wait=wait, wait_until_stopped=False)
+            node.stop_node(wait=wait, wait_until_stopped=False)
 
         for node in self.nodes:
             # Wait for nodes to stop

From f0b71d5de2a46cd61714ae00f7e0a6a4078d0d59 Mon Sep 17 00:00:00 2001
From: pasta <pasta@dashboost.org>
Date: Thu, 16 Oct 2025 10:02:20 -0500
Subject: [PATCH 154/656] refactor: change GetMasternodeQuorumNodes return type
 from unordered_set to vector

Updated the GetMasternodeQuorumNodes method to return a vector of NodeId instead of an unordered_set. This change simplifies the logic for filtering and transforming nodes, enhancing readability and maintainability. Additionally, adjusted related code in ProcessSigShare to accommodate the new return type.
---
 src/llmq/signing_shares.cpp |  8 +++++---
 src/net.cpp                 | 24 +++++++++++++-----------
 src/net.h                   |  2 +-
 3 files changed, 19 insertions(+), 15 deletions(-)

diff --git a/src/llmq/signing_shares.cpp b/src/llmq/signing_shares.cpp
index 1c9a911989b5..d20a6ebe0314 100644
--- a/src/llmq/signing_shares.cpp
+++ b/src/llmq/signing_shares.cpp
@@ -717,9 +717,11 @@ void CSigSharesManager::ProcessSigShare(PeerManager& peerman, const CSigShare& s
     auto llmqType = quorum->params.type;
     bool canTryRecovery = false;
 
+    const bool isAllMembersConnectedEnabled = IsAllMembersConnectedEnabled(llmqType, m_sporkman);
+
     // prepare node set for direct-push in case this is our sig share
-    std::unordered_set<NodeId> quorumNodes;
-    if (!IsAllMembersConnectedEnabled(llmqType, m_sporkman) && sigShare.getQuorumMember() == quorum->GetMemberIndex(m_mn_activeman->GetProTxHash())) {
+    std::vector<NodeId> quorumNodes;
+    if (!isAllMembersConnectedEnabled && sigShare.getQuorumMember() == quorum->GetMemberIndex(m_mn_activeman->GetProTxHash())) {
         quorumNodes = connman.GetMasternodeQuorumNodes(sigShare.getLlmqType(), sigShare.getQuorumHash());
     }
 
@@ -733,7 +735,7 @@ void CSigSharesManager::ProcessSigShare(PeerManager& peerman, const CSigShare& s
         if (!sigShares.Add(sigShare.GetKey(), sigShare)) {
             return;
         }
-        if (!IsAllMembersConnectedEnabled(llmqType, m_sporkman)) {
+        if (!isAllMembersConnectedEnabled) {
             sigSharesQueuedToAnnounce.Add(sigShare.GetKey(), true);
         }
 
diff --git a/src/net.cpp b/src/net.cpp
index ea96b1162a40..670edc6abee6 100644
--- a/src/net.cpp
+++ b/src/net.cpp
@@ -4348,7 +4348,7 @@ Uint256HashSet CConnman::GetMasternodeQuorums(Consensus::LLMQType llmqType) cons
     return result;
 }
 
-std::unordered_set<NodeId> CConnman::GetMasternodeQuorumNodes(Consensus::LLMQType llmqType, const uint256& quorumHash) const
+std::vector<NodeId> CConnman::GetMasternodeQuorumNodes(Consensus::LLMQType llmqType, const uint256& quorumHash) const
 {
     LOCK2(m_nodes_mutex, cs_vPendingMasternodes);
     auto it = masternodeQuorumNodes.find(std::make_pair(llmqType, quorumHash));
@@ -4357,16 +4357,18 @@ std::unordered_set<NodeId> CConnman::GetMasternodeQuorumNodes(Consensus::LLMQTyp
     }
     const auto& proRegTxHashes = it->second;
 
-    std::unordered_set<NodeId> nodes;
-    for (const auto pnode : m_nodes) {
-        if (pnode->fDisconnect) {
-            continue;
-        }
-        auto verifiedProRegTxHash = pnode->GetVerifiedProRegTxHash();
-        if (!pnode->qwatch && (verifiedProRegTxHash.IsNull() || !proRegTxHashes.count(verifiedProRegTxHash))) {
-            continue;
-        }
-        nodes.emplace(pnode->GetId());
+    std::vector<NodeId> nodes;
+
+    auto IsMasternodeQuorumNode = [&](const CNode* n) {
+        if (n->fDisconnect) return false;
+        const auto h = n->GetVerifiedProRegTxHash();
+        return n->qwatch || (!h.IsNull() && proRegTxHashes.contains(h));
+    };
+
+    for (NodeId id : m_nodes
+        | std::views::filter(IsMasternodeQuorumNode)
+        | std::views::transform([](const CNode* n){ return n->GetId(); })) {
+        nodes.push_back(id);
     }
     return nodes;
 }
diff --git a/src/net.h b/src/net.h
index bbbc260a1e11..9e0fb5d8b5b8 100644
--- a/src/net.h
+++ b/src/net.h
@@ -1485,7 +1485,7 @@ friend class CNode;
     bool HasMasternodeQuorumNodes(Consensus::LLMQType llmqType, const uint256& quorumHash) const;
     Uint256HashSet GetMasternodeQuorums(Consensus::LLMQType llmqType) const;
     // also returns QWATCH nodes
-    std::unordered_set<NodeId> GetMasternodeQuorumNodes(Consensus::LLMQType llmqType, const uint256& quorumHash) const;
+    std::vector<NodeId> GetMasternodeQuorumNodes(Consensus::LLMQType llmqType, const uint256& quorumHash) const;
     void RemoveMasternodeQuorumNodes(Consensus::LLMQType llmqType, const uint256& quorumHash);
     bool IsMasternodeQuorumNode(const CNode* pnode, const CDeterministicMNList& tip_mn_list) const;
     bool IsMasternodeQuorumRelayMember(const uint256& protxHash);

From bc75b4313a960b7520b9d846ae72bb0e3c56ac03 Mon Sep 17 00:00:00 2001
From: Konstantin Akimov <knstqq@gmail.com>
Date: Thu, 16 Oct 2025 03:16:45 +0700
Subject: [PATCH 155/656] fix: missing src/qt/Makefile - supposed to be added
 by bitcoin#4241

---
 src/qt/Makefile | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 src/qt/Makefile

diff --git a/src/qt/Makefile b/src/qt/Makefile
new file mode 100644
index 000000000000..e69de29bb2d1

From fc3e8ccf03284f3211c53680380a417f546a6c50 Mon Sep 17 00:00:00 2001
From: fanquake <fanquake@gmail.com>
Date: Tue, 19 Jul 2022 16:26:35 +0100
Subject: [PATCH 156/656] Merge bitcoin/bitcoin#25630: Add symlinks for
 hardcoded Makefiles in out of tree builds

9aeeb75cf91fdfb03206284e900887211dc76ed3 Add symlinks for hardcoded Makefiles in out of tree builds (Pablo Greco)

Pull request description:

  When doing out of tree builds, some hardwired Makefiles are not symlinked, which makes it a bit more uncomfortable to run some instances of make.

  There's no "real" functionality loss without this patch because the symlinked files are just for quick access to thinks in the main Makefile

ACKs for top commit:
  hebasto:
    ACK 9aeeb75cf91fdfb03206284e900887211dc76ed3, tested on Ubuntu 22.04.

Tree-SHA512: 656f73c387584cee34f66b3f95993267a40b915762949c7a84b73ba2ea8d37b7b5850733377110e0110ed2f7da64e6a5f9b303812080fe7815154dbb40c8a44c
---
 configure.ac | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/configure.ac b/configure.ac
index d216ffd04eba..08002825e606 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1999,6 +1999,9 @@ AC_CONFIG_LINKS([test/functional/test_runner.py:test/functional/test_runner.py])
 AC_CONFIG_LINKS([test/fuzz/test_runner.py:test/fuzz/test_runner.py])
 AC_CONFIG_LINKS([test/util/test_runner.py:test/util/test_runner.py])
 AC_CONFIG_LINKS([test/util/rpcauth-test.py:test/util/rpcauth-test.py])
+AC_CONFIG_LINKS([src/qt/Makefile:src/qt/Makefile])
+AC_CONFIG_LINKS([src/qt/test/Makefile:src/qt/test/Makefile])
+AC_CONFIG_LINKS([src/test/Makefile:src/test/Makefile])
 
 dnl boost's m4 checks do something really nasty: they export these vars. As a
 dnl result, they leak into secp256k1's configure and crazy things happen.

From 7a3f393a9dc3a2d4b9bd55e2a9758f3b98c30014 Mon Sep 17 00:00:00 2001
From: fanquake <fanquake@gmail.com>
Date: Tue, 19 Jul 2022 21:43:52 +0100
Subject: [PATCH 157/656] Merge bitcoin/bitcoin#25645: refactor: Remove unused
 includes from dbwrapper.h

faf98aecf876fae0ec6d4d16b7e66f3a35253180 Remove unused includes in rpc/fees.cpp (MacroFake)
1111ddeedf7ea801507db4e23b4737ec183eb19c Remove unused includes from dbwrapper.h (MacroFake)
fa77fdd0475fa15a1a3641c5d5a2bf7ad095aa84 Add missing includes (MacroFake)
fa869ce2c2b906d8b087c4e7a5f1804a74b1c522 Add missing includes to node/chainstate (MacroFake)

Pull request description:

  Unused includes are confusing, but also cause unrelated compile errors when the unused includes were to be removed.

  Fix that by adding the missing includes where they are needed and then remove them where they are not needed. This is also checked by iwyu.

ACKs for top commit:
  hebasto:
    ACK faf98aecf876fae0ec6d4d16b7e66f3a35253180, I have reviewed the code and it looks OK, I agree it can be merged.
  jarolrod:
    Code Review ACK https://github.com/bitcoin/bitcoin/commit/faf98aecf876fae0ec6d4d16b7e66f3a35253180

Tree-SHA512: 75f3c6e6f6ecf8a98233e1a1463c75ca4e0eb3ec341150d274141072fe95413a3c2ec6386d1c527899cc63d43f63f5eb5991509847412773362808ddfb1bb435
---
 ci/dash/lint-tidy.sh           |  2 ++
 src/bench/checkblock.cpp       |  1 +
 src/dbwrapper.cpp              | 18 +++++++++++++++---
 src/dbwrapper.h                | 16 ++++++++++++++--
 src/evo/evodb.cpp              |  1 +
 src/evo/specialtxman.cpp       |  1 +
 src/index/base.cpp             |  1 +
 src/index/blockfilterindex.cpp |  1 +
 src/index/coinstatsindex.cpp   |  1 +
 src/node/chainstate.cpp        | 13 +++++++++++++
 src/qt/optionsdialog.cpp       |  3 ++-
 src/rpc/fees.cpp               |  1 -
 src/rpc/mempool.cpp            |  2 ++
 src/txdb.h                     |  1 +
 14 files changed, 55 insertions(+), 7 deletions(-)

diff --git a/ci/dash/lint-tidy.sh b/ci/dash/lint-tidy.sh
index d417d0009b90..87d21a1367af 100755
--- a/ci/dash/lint-tidy.sh
+++ b/ci/dash/lint-tidy.sh
@@ -21,7 +21,9 @@ fi
 cd "${BASE_ROOT_DIR}/build-ci/dashcore-${BUILD_TARGET}"
 iwyu_tool.py \
   "src/compat" \
+  "src/dbwrapper.cpp" \
   "src/init" \
+  "src/node/chainstate.cpp" \
   "src/rpc/fees.cpp" \
   "src/rpc/signmessage.cpp" \
   "src/test/fuzz/txorphan.cpp" \
diff --git a/src/bench/checkblock.cpp b/src/bench/checkblock.cpp
index 5e987bcefc66..b5e866d3a1b7 100644
--- a/src/bench/checkblock.cpp
+++ b/src/bench/checkblock.cpp
@@ -9,6 +9,7 @@
 #include <consensus/validation.h>
 #include <stats/client.h>
 #include <streams.h>
+#include <util/system.h>
 #include <validation.h>
 
 #include <memory>
diff --git a/src/dbwrapper.cpp b/src/dbwrapper.cpp
index 87adcb254418..4dbc83994163 100644
--- a/src/dbwrapper.cpp
+++ b/src/dbwrapper.cpp
@@ -4,15 +4,27 @@
 
 #include <dbwrapper.h>
 
-#include <memory>
+#include <fs.h>
+#include <logging.h>
 #include <random.h>
+#include <tinyformat.h>
+#include <util/strencodings.h>
+#include <util/system.h>
 
+#include <algorithm>
+#include <cassert>
+#include <cstdarg>
+#include <cstdint>
+#include <cstdio>
 #include <leveldb/cache.h>
+#include <leveldb/db.h>
 #include <leveldb/env.h>
 #include <leveldb/filter_policy.h>
 #include <leveldb/helpers/memenv/memenv.h>
-#include <stdint.h>
-#include <algorithm>
+#include <leveldb/iterator.h>
+#include <leveldb/options.h>
+#include <leveldb/status.h>
+#include <memory>
 #include <optional>
 
 class CBitcoinLevelDBLogger : public leveldb::Logger {
diff --git a/src/dbwrapper.h b/src/dbwrapper.h
index 91f5bae74fc1..3d7dd9eede05 100644
--- a/src/dbwrapper.h
+++ b/src/dbwrapper.h
@@ -7,16 +7,28 @@
 
 #include <clientversion.h>
 #include <fs.h>
+#include <logging.h>
 #include <serialize.h>
 #include <span.h>
 #include <streams.h>
-#include <util/strencodings.h>
-#include <util/system.h>
 
 #include <typeindex>
 
+#include <cstddef>
+#include <cstdint>
+#include <exception>
 #include <leveldb/db.h>
+#include <leveldb/iterator.h>
+#include <leveldb/options.h>
+#include <leveldb/slice.h>
+#include <leveldb/status.h>
 #include <leveldb/write_batch.h>
+#include <stdexcept>
+#include <string>
+#include <vector>
+namespace leveldb {
+class Env;
+}
 
 static const size_t DBWRAPPER_PREALLOC_KEY_SIZE = 64;
 static const size_t DBWRAPPER_PREALLOC_VALUE_SIZE = 1024;
diff --git a/src/evo/evodb.cpp b/src/evo/evodb.cpp
index b1396e9ef423..32d7e2475533 100644
--- a/src/evo/evodb.cpp
+++ b/src/evo/evodb.cpp
@@ -3,6 +3,7 @@
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
 #include <evo/evodb.h>
+#include <util/system.h>
 
 #include <uint256.h>
 
diff --git a/src/evo/specialtxman.cpp b/src/evo/specialtxman.cpp
index 45d022b7acda..35d3fe14bc43 100644
--- a/src/evo/specialtxman.cpp
+++ b/src/evo/specialtxman.cpp
@@ -11,6 +11,7 @@
 #include <hash.h>
 #include <primitives/block.h>
 #include <util/irange.h>
+#include <util/system.h>
 #include <validation.h>
 
 #include <chainlock/chainlock.h>
diff --git a/src/index/base.cpp b/src/index/base.cpp
index c3368088c44c..d585cac6dd53 100644
--- a/src/index/base.cpp
+++ b/src/index/base.cpp
@@ -8,6 +8,7 @@
 #include <node/interface_ui.h>
 #include <shutdown.h>
 #include <tinyformat.h>
+#include <util/system.h>
 #include <util/thread.h>
 #include <util/translation.h>
 #include <validation.h>
diff --git a/src/index/blockfilterindex.cpp b/src/index/blockfilterindex.cpp
index c0cf84e51285..35781403ba29 100644
--- a/src/index/blockfilterindex.cpp
+++ b/src/index/blockfilterindex.cpp
@@ -9,6 +9,7 @@
 #include <index/blockfilterindex.h>
 #include <node/blockstorage.h>
 #include <serialize.h>
+#include <util/system.h>
 
 using node::UndoReadFromDisk;
 
diff --git a/src/index/coinstatsindex.cpp b/src/index/coinstatsindex.cpp
index 457590ec9c3f..6bf43e28f7db 100644
--- a/src/index/coinstatsindex.cpp
+++ b/src/index/coinstatsindex.cpp
@@ -10,6 +10,7 @@
 #include <serialize.h>
 #include <txdb.h>
 #include <undo.h>
+#include <util/system.h>
 #include <validation.h>
 #include <util/check.h>
 
diff --git a/src/node/chainstate.cpp b/src/node/chainstate.cpp
index 555cef21a831..b8ff3ae92afd 100644
--- a/src/node/chainstate.cpp
+++ b/src/node/chainstate.cpp
@@ -4,10 +4,17 @@
 
 #include <node/chainstate.h>
 
+#include <chain.h>
+#include <coins.h>
 #include <chainparamsbase.h>
 #include <consensus/params.h>
 #include <deploymentstatus.h>
 #include <node/blockstorage.h>
+#include <sync.h>
+#include <threadsafety.h>
+#include <txdb.h>
+#include <uint256.h>
+#include <util/time.h>
 #include <validation.h>
 
 #include <evo/chainhelper.h>
@@ -17,6 +24,12 @@
 #include <evo/mnhftx.h>
 #include <llmq/context.h>
 
+#include <algorithm>
+#include <atomic>
+#include <cassert>
+#include <memory>
+#include <vector>
+
 namespace node {
 std::optional<ChainstateLoadingError> LoadChainstate(bool fReset,
                                                      ChainstateManager& chainman,
diff --git a/src/qt/optionsdialog.cpp b/src/qt/optionsdialog.cpp
index 0cd82261e3f5..32ace0a1a275 100644
--- a/src/qt/optionsdialog.cpp
+++ b/src/qt/optionsdialog.cpp
@@ -23,11 +23,12 @@
 #include <netbase.h>
 #include <txdb.h> // for -dbcache defaults
 #include <util/strencodings.h>
+#include <util/system.h>
 #include <util/underlying.h>
 
-#include <QButtonGroup>
 #include <chrono>
 
+#include <QButtonGroup>
 #include <QDataWidgetMapper>
 #include <QDir>
 #include <QIntValidator>
diff --git a/src/rpc/fees.cpp b/src/rpc/fees.cpp
index 00940a583279..7451d236ff9b 100644
--- a/src/rpc/fees.cpp
+++ b/src/rpc/fees.cpp
@@ -7,7 +7,6 @@
 #include <node/context.h>
 #include <policy/feerate.h>
 #include <policy/fees.h>
-#include <policy/policy.h>
 #include <policy/settings.h>
 #include <rpc/protocol.h>
 #include <rpc/request.h>
diff --git a/src/rpc/mempool.cpp b/src/rpc/mempool.cpp
index 75512672c6fa..2d15eeae2fdb 100644
--- a/src/rpc/mempool.cpp
+++ b/src/rpc/mempool.cpp
@@ -16,6 +16,8 @@
 #include <univalue.h>
 #include <util/moneystr.h>
 #include <validation.h>
+#include <util/system.h>
+#include <util/time.h>
 
 #include <instantsend/instantsend.h>
 #include <llmq/context.h>
diff --git a/src/txdb.h b/src/txdb.h
index 2c812300dfad..493be625128f 100644
--- a/src/txdb.h
+++ b/src/txdb.h
@@ -9,6 +9,7 @@
 #include <coins.h>
 #include <dbwrapper.h>
 #include <spentindex.h>
+#include <sync.h>
 #include <timestampindex.h>
 
 #include <memory>

From bf1dd33a5ba327a377235159eccb1d81b9c7b8af Mon Sep 17 00:00:00 2001
From: MacroFake <falke.marco@gmail.com>
Date: Fri, 22 Jul 2022 09:46:57 +0200
Subject: [PATCH 158/656] Merge bitcoin/bitcoin#25668: refactor: Fix iwyu on
 node/chainstate

fad3c5826e6618fa1d58b9be48972f4ef03a2103 refactor: Fix iwyu on node/chainstate (MacroFake)

Pull request description:

  Fix the CI warning on master: https://cirrus-ci.com/task/5398182703136768?logs=ci#L7020

ACKs for top commit:
  fanquake:
    ACK fad3c5826e6618fa1d58b9be48972f4ef03a2103 - could do chain.h

Tree-SHA512: 94f6ea0b3d9667863a4217b65bd1b9e07c65bdb566378faf0727bae5eb38d2d527ecae0c39efdda740b7ab7c8269141437ffbcb470cca7d559f09b8ee132d101
---
 src/node/chainstate.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/node/chainstate.cpp b/src/node/chainstate.cpp
index b8ff3ae92afd..371040de19bf 100644
--- a/src/node/chainstate.cpp
+++ b/src/node/chainstate.cpp
@@ -12,9 +12,11 @@
 #include <node/blockstorage.h>
 #include <sync.h>
 #include <threadsafety.h>
+#include <tinyformat.h>
 #include <txdb.h>
 #include <uint256.h>
 #include <util/time.h>
+#include <util/translation.h>
 #include <validation.h>
 
 #include <evo/chainhelper.h>

From b9a96300b6beab89395bc147a4820035dca9d3f4 Mon Sep 17 00:00:00 2001
From: Konstantin Akimov <knstqq@gmail.com>
Date: Fri, 17 Oct 2025 00:45:56 +0700
Subject: [PATCH 159/656] fix: missing lint-tidy warnings from
 bitcoin/bitcoin#25254

---
 ci/dash/lint-tidy.sh | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/ci/dash/lint-tidy.sh b/ci/dash/lint-tidy.sh
index 87d21a1367af..e0fdbad17cc0 100755
--- a/ci/dash/lint-tidy.sh
+++ b/ci/dash/lint-tidy.sh
@@ -24,6 +24,9 @@ iwyu_tool.py \
   "src/dbwrapper.cpp" \
   "src/init" \
   "src/node/chainstate.cpp" \
+  "src/policy/feerate.cpp" \
+  "src/policy/packages.cpp" \
+  "src/policy/settings.cpp" \
   "src/rpc/fees.cpp" \
   "src/rpc/signmessage.cpp" \
   "src/test/fuzz/txorphan.cpp" \

From f1ad7a63a163c69cadcd382dee2117a8665ccccd Mon Sep 17 00:00:00 2001
From: Konstantin Akimov <knstqq@gmail.com>
Date: Fri, 17 Oct 2025 00:47:13 +0700
Subject: [PATCH 160/656] fix: missing iwyu items from bitcoin/bitcoin#25694

---
 ci/dash/lint-tidy.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ci/dash/lint-tidy.sh b/ci/dash/lint-tidy.sh
index e0fdbad17cc0..6621b7c01e87 100755
--- a/ci/dash/lint-tidy.sh
+++ b/ci/dash/lint-tidy.sh
@@ -27,6 +27,7 @@ iwyu_tool.py \
   "src/policy/feerate.cpp" \
   "src/policy/packages.cpp" \
   "src/policy/settings.cpp" \
+  "src/primitives/transaction.cpp" \
   "src/rpc/fees.cpp" \
   "src/rpc/signmessage.cpp" \
   "src/test/fuzz/txorphan.cpp" \

From d5c8cabd9c5e1bc69d14deaf5e9af8a04e48fe6e Mon Sep 17 00:00:00 2001
From: Konstantin Akimov <knstqq@gmail.com>
Date: Fri, 17 Oct 2025 00:48:38 +0700
Subject: [PATCH 161/656] fix: missing iwyu from bitcoin/bitcoin#24974

---
 ci/dash/lint-tidy.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ci/dash/lint-tidy.sh b/ci/dash/lint-tidy.sh
index 6621b7c01e87..9899718039e1 100755
--- a/ci/dash/lint-tidy.sh
+++ b/ci/dash/lint-tidy.sh
@@ -31,6 +31,7 @@ iwyu_tool.py \
   "src/rpc/fees.cpp" \
   "src/rpc/signmessage.cpp" \
   "src/test/fuzz/txorphan.cpp" \
+  "src/threadinterrupt.cpp" \
   "src/util/bip32.cpp" \
   "src/util/bytevectorhash.cpp" \
   "src/util/check.cpp" \

From 79f742411ce7c5467eb7e561f86c75e7eda9b7e2 Mon Sep 17 00:00:00 2001
From: Konstantin Akimov <knstqq@gmail.com>
Date: Fri, 17 Oct 2025 01:56:18 +0700
Subject: [PATCH 162/656] fix: some iwyu recommendations to update includes

---
 src/dbwrapper.cpp            |  1 -
 src/dbwrapper.h              | 10 +++++++++-
 src/init/common.cpp          |  1 +
 src/node/chainstate.cpp      |  5 +++--
 src/policy/packages.h        |  1 -
 src/primitives/transaction.h |  5 ++---
 src/rpc/fees.cpp             |  1 +
 src/util/bip32.cpp           |  1 -
 src/util/check.cpp           |  1 -
 9 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/src/dbwrapper.cpp b/src/dbwrapper.cpp
index 4dbc83994163..c4d9cf615faa 100644
--- a/src/dbwrapper.cpp
+++ b/src/dbwrapper.cpp
@@ -7,7 +7,6 @@
 #include <fs.h>
 #include <logging.h>
 #include <random.h>
-#include <tinyformat.h>
 #include <util/strencodings.h>
 #include <util/system.h>
 
diff --git a/src/dbwrapper.h b/src/dbwrapper.h
index 3d7dd9eede05..fea0ce67cdb0 100644
--- a/src/dbwrapper.h
+++ b/src/dbwrapper.h
@@ -5,6 +5,7 @@
 #ifndef BITCOIN_DBWRAPPER_H
 #define BITCOIN_DBWRAPPER_H
 
+#include <assert.h>
 #include <clientversion.h>
 #include <fs.h>
 #include <logging.h>
@@ -12,8 +13,9 @@
 #include <span.h>
 #include <streams.h>
 
-#include <typeindex>
+#include <sys/types.h>
 
+#include <algorithm>
 #include <cstddef>
 #include <cstdint>
 #include <exception>
@@ -23,9 +25,15 @@
 #include <leveldb/slice.h>
 #include <leveldb/status.h>
 #include <leveldb/write_batch.h>
+#include <map>
+#include <memory>
+#include <set>
 #include <stdexcept>
 #include <string>
+#include <type_traits>
+#include <utility>
 #include <vector>
+
 namespace leveldb {
 class Env;
 }
diff --git a/src/init/common.cpp b/src/init/common.cpp
index 8ca786eaa045..fc1cc551aa1b 100644
--- a/src/init/common.cpp
+++ b/src/init/common.cpp
@@ -16,6 +16,7 @@
 #include <node/interface_ui.h>
 #include <random.h>
 #include <tinyformat.h>
+#include <util/time.h>
 #include <util/string.h>
 #include <util/system.h>
 #include <util/translation.h>
diff --git a/src/node/chainstate.cpp b/src/node/chainstate.cpp
index 371040de19bf..fa44b04d17f8 100644
--- a/src/node/chainstate.cpp
+++ b/src/node/chainstate.cpp
@@ -14,19 +14,20 @@
 #include <threadsafety.h>
 #include <tinyformat.h>
 #include <txdb.h>
+#include <txmempool.h>
 #include <uint256.h>
-#include <util/time.h>
 #include <util/translation.h>
 #include <validation.h>
 
+#include <bls/bls.h>
 #include <evo/chainhelper.h>
 #include <evo/creditpool.h>
 #include <evo/deterministicmns.h>
 #include <evo/evodb.h>
 #include <evo/mnhftx.h>
+#include <gsl/pointers.h>
 #include <llmq/context.h>
 
-#include <algorithm>
 #include <atomic>
 #include <cassert>
 #include <memory>
diff --git a/src/policy/packages.h b/src/policy/packages.h
index 47c6717b0330..997056a61471 100644
--- a/src/policy/packages.h
+++ b/src/policy/packages.h
@@ -5,7 +5,6 @@
 #ifndef BITCOIN_POLICY_PACKAGES_H
 #define BITCOIN_POLICY_PACKAGES_H
 
-#include <consensus/consensus.h>
 #include <consensus/validation.h>
 #include <policy/policy.h>
 #include <primitives/transaction.h>
diff --git a/src/primitives/transaction.h b/src/primitives/transaction.h
index f3062ce00740..b45e81fa6e88 100644
--- a/src/primitives/transaction.h
+++ b/src/primitives/transaction.h
@@ -12,13 +12,12 @@
 #include <serialize.h>
 #include <uint256.h>
 
-#include <cstddef>
+#include <algorithm>
 #include <cstdint>
-#include <ios>
+#include <iterator>
 #include <limits>
 #include <memory>
 #include <string>
-#include <tuple>
 #include <utility>
 #include <vector>
 
diff --git a/src/rpc/fees.cpp b/src/rpc/fees.cpp
index 7451d236ff9b..00940a583279 100644
--- a/src/rpc/fees.cpp
+++ b/src/rpc/fees.cpp
@@ -7,6 +7,7 @@
 #include <node/context.h>
 #include <policy/feerate.h>
 #include <policy/fees.h>
+#include <policy/policy.h>
 #include <policy/settings.h>
 #include <rpc/protocol.h>
 #include <rpc/request.h>
diff --git a/src/util/bip32.cpp b/src/util/bip32.cpp
index c8864d9bedd7..796af4a5442f 100644
--- a/src/util/bip32.cpp
+++ b/src/util/bip32.cpp
@@ -6,7 +6,6 @@
 #include <util/bip32.h>
 #include <util/strencodings.h>
 
-#include <algorithm>
 #include <cstdint>
 #include <cstdio>
 #include <sstream>
diff --git a/src/util/check.cpp b/src/util/check.cpp
index 77032c8753f0..047cd4b1b3f7 100644
--- a/src/util/check.cpp
+++ b/src/util/check.cpp
@@ -13,7 +13,6 @@
 
 #include <cstdio>
 #include <cstdlib>
-#include <string>
 
 
 NonFatalCheckError::NonFatalCheckError(const char* msg, const char* file, int line, const char* func)

From 7d3e90996f9eb09d0d9bb17d9dd03786c50effd3 Mon Sep 17 00:00:00 2001
From: UdjinM6 <UdjinM6@users.noreply.github.com>
Date: Sun, 19 Oct 2025 21:14:47 +0300
Subject: [PATCH 163/656] guix: adjust scripts to use `SDK_SOURCES` env
 variable properly

---
 contrib/containers/guix/scripts/guix-start | 2 +-
 contrib/containers/guix/scripts/setup-sdk  | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/contrib/containers/guix/scripts/guix-start b/contrib/containers/guix/scripts/guix-start
index ee0be9d28550..42300bc453b6 100755
--- a/contrib/containers/guix/scripts/guix-start
+++ b/contrib/containers/guix/scripts/guix-start
@@ -11,7 +11,7 @@ fi
 
 if [[ -z "${HOSTS}" || "${HOSTS}" == *"darwin"* ]]; then
     export SDK_PATH="${SDK_PATH:-${WORKSPACE_PATH}/depends/SDKs}"
-    export SDK_SRCS="${SDK_PATH:-${WORKSPACE_PATH}/depends/sdk-sources}"
+    export SDK_SOURCES="${SDK_SOURCES:-${WORKSPACE_PATH}/depends/sdk-sources}"
 
     ./contrib/containers/guix/scripts/setup-sdk
 fi
diff --git a/contrib/containers/guix/scripts/setup-sdk b/contrib/containers/guix/scripts/setup-sdk
index 4550aeed6424..9781ce07285d 100755
--- a/contrib/containers/guix/scripts/setup-sdk
+++ b/contrib/containers/guix/scripts/setup-sdk
@@ -9,16 +9,16 @@ set -eo pipefail
 
 SDK_URL="${SDK_URL:-https://bitcoincore.org/depends-sources/sdks}"
 SDK_PATH="${SDK_PATH:-depends/SDKs}"
-SDK_SRCS="${SDK_SOURCES:-depends/sdk-sources}"
+SDK_SOURCES="${SDK_SOURCES:-depends/sdk-sources}"
 XCODE_VERSION="${XCODE_VERSION:-15.0}"
 XCODE_RELEASE="${XCODE_RELEASE:-15A240d}"
 XCODE_ARCHIVE="Xcode-${XCODE_VERSION}-${XCODE_RELEASE}-extracted-SDK-with-libcxx-headers"
-XCODE_AR_PATH="${SDK_SRCS}/${XCODE_ARCHIVE}.tar.gz"
+XCODE_AR_PATH="${SDK_SOURCES}/${XCODE_ARCHIVE}.tar.gz"
 
 if [ ! -d "${SDK_PATH}/${XCODE_ARCHIVE}" ]; then
     if [ ! -f "${XCODE_AR_PATH}" ]; then
         echo "Downloading macOS SDK..."
-        mkdir -p "${SDK_SRCS}"
+        mkdir -p "${SDK_SOURCES}"
         curl --location --fail "${SDK_URL}/${XCODE_ARCHIVE}.tar.gz" -o "${XCODE_AR_PATH}"
     fi
     echo "Extracting macOS SDK..."

From f43be22c7eb503ccf83aee40896683376b99ce20 Mon Sep 17 00:00:00 2001
From: Kittywhiskers Van Gogh <63189531+kwvg@users.noreply.github.com>
Date: Mon, 20 Oct 2025 03:27:13 +0530
Subject: [PATCH 164/656] fix: remove incorrect request generation with bad
 serialization hash

We should not be generating the hash using a CTxIn, only a COutPoint
---
 src/instantsend/instantsend.cpp | 6 +++++-
 src/instantsend/lock.cpp        | 5 +----
 src/instantsend/lock.h          | 3 +--
 src/instantsend/signing.cpp     | 4 ++--
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/instantsend/instantsend.cpp b/src/instantsend/instantsend.cpp
index b3cb1d4b677b..f2d186a27b5f 100644
--- a/src/instantsend/instantsend.cpp
+++ b/src/instantsend/instantsend.cpp
@@ -44,7 +44,11 @@ Uint256HashSet GetIdsFromLockable(const std::vector<T>& vec)
     if (vec.empty()) return ret;
     ret.reserve(vec.size());
     for (const auto& in : vec) {
-        ret.emplace(instantsend::GenInputLockRequestId(in));
+        if constexpr (std::is_same_v<T, CTxIn>) {
+            ret.emplace(instantsend::GenInputLockRequestId(in.prevout));
+        } else {
+            ret.emplace(instantsend::GenInputLockRequestId(in));
+        }
     }
     return ret;
 }
diff --git a/src/instantsend/lock.cpp b/src/instantsend/lock.cpp
index 10ef0afc3c2d..e6d6d0ab50b5 100644
--- a/src/instantsend/lock.cpp
+++ b/src/instantsend/lock.cpp
@@ -38,11 +38,8 @@ bool InstantSendLock::TriviallyValid() const
     return inputs_set.size() == inputs.size();
 }
 
-template <typename T>
-uint256 GenInputLockRequestId(const T& val)
+uint256 GenInputLockRequestId(const COutPoint& val)
 {
     return ::SerializeHash(std::make_pair(INPUTLOCK_REQUESTID_PREFIX, val));
 }
-template uint256 GenInputLockRequestId(const COutPoint& val);
-template uint256 GenInputLockRequestId(const CTxIn& val);
 } // namespace instantsend
diff --git a/src/instantsend/lock.h b/src/instantsend/lock.h
index 2786ba1ff7cf..2f775c46a763 100644
--- a/src/instantsend/lock.h
+++ b/src/instantsend/lock.h
@@ -40,8 +40,7 @@ struct InstantSendLock {
     bool TriviallyValid() const;
 };
 
-template <typename T>
-uint256 GenInputLockRequestId(const T& val);
+uint256 GenInputLockRequestId(const COutPoint& val);
 
 using InstantSendLockPtr = std::shared_ptr<InstantSendLock>;
 } // namespace instantsend
diff --git a/src/instantsend/signing.cpp b/src/instantsend/signing.cpp
index 93d2320f7fa3..fa6d40f4623e 100644
--- a/src/instantsend/signing.cpp
+++ b/src/instantsend/signing.cpp
@@ -295,7 +295,7 @@ bool InstantSendSigner::TrySignInputLocks(const CTransaction& tx, bool fRetroact
 
     size_t alreadyVotedCount = 0;
     for (const auto& in : tx.vin) {
-        auto id = GenInputLockRequestId(in);
+        auto id = GenInputLockRequestId(in.prevout);
         ids.emplace_back(id);
 
         uint256 otherTxHash;
@@ -344,7 +344,7 @@ void InstantSendSigner::TrySignInstantSendLock(const CTransaction& tx)
     const auto llmqType = Params().GetConsensus().llmqTypeDIP0024InstantSend;
 
     for (const auto& in : tx.vin) {
-        auto id = GenInputLockRequestId(in);
+        auto id = GenInputLockRequestId(in.prevout);
         if (!m_sigman.HasRecoveredSig(llmqType, id, tx.GetHash())) {
             return;
         }

From 58f671c4c2741e9a80f4335dec1a3027304c842c Mon Sep 17 00:00:00 2001
From: UdjinM6 <UdjinM6@users.noreply.github.com>
Date: Mon, 20 Oct 2025 06:04:43 +0300
Subject: [PATCH 165/656] refactor: trivial s/val/outpoint/

---
 src/instantsend/lock.cpp | 4 ++--
 src/instantsend/lock.h   | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/instantsend/lock.cpp b/src/instantsend/lock.cpp
index e6d6d0ab50b5..f0f2c1d1508d 100644
--- a/src/instantsend/lock.cpp
+++ b/src/instantsend/lock.cpp
@@ -38,8 +38,8 @@ bool InstantSendLock::TriviallyValid() const
     return inputs_set.size() == inputs.size();
 }
 
-uint256 GenInputLockRequestId(const COutPoint& val)
+uint256 GenInputLockRequestId(const COutPoint& outpoint)
 {
-    return ::SerializeHash(std::make_pair(INPUTLOCK_REQUESTID_PREFIX, val));
+    return ::SerializeHash(std::make_pair(INPUTLOCK_REQUESTID_PREFIX, outpoint));
 }
 } // namespace instantsend
diff --git a/src/instantsend/lock.h b/src/instantsend/lock.h
index 2f775c46a763..b0536e8421bc 100644
--- a/src/instantsend/lock.h
+++ b/src/instantsend/lock.h
@@ -40,7 +40,7 @@ struct InstantSendLock {
     bool TriviallyValid() const;
 };
 
-uint256 GenInputLockRequestId(const COutPoint& val);
+uint256 GenInputLockRequestId(const COutPoint& outpoint);
 
 using InstantSendLockPtr = std::shared_ptr<InstantSendLock>;
 } // namespace instantsend

From f557dc48e55969e835dd6172c4d1cf31672808f3 Mon Sep 17 00:00:00 2001
From: MacroFake <falke.marco@gmail.com>
Date: Mon, 16 May 2022 10:49:40 +0200
Subject: [PATCH 166/656] Merge bitcoin/bitcoin#25067: validationinterface:
 make MainSignalsInstance() a class, drop unused forward declarations

ca1ac1f0e0fbabbe97666aca94024afb8104da06 scripted-diff: Rename MainSignalsInstance() class to MainSignalsImpl() (Jon Atack)
2aaec2352d14753e1f2d4bf4b11bbe6ad42edf5c refactor: remove unused forward declarations in validationinterface.h (Jon Atack)
23854f84024c292164ce49b3fefee2a9b4fe0831 refactor: make MainSignalsInstance() a class (Jon Atack)

Pull request description:

  Make MainSignalsInstance a class, rename it to MainSignalsImpl, use Doxygen documentation for it, and remove no longer used forward declarations in src/validationinterface.h.

  ----

  MainSignalsInstance was created in 3a19fed9db5 and originally was a collection of boost::signals methods moved to validationinterface.cpp, in order to no longer need to include boost/signals in validationinterface.h.

  MainSignalsInstance then evolved in d6815a23131 to become class-like:

  - [C.8: Use class rather than struct if any member is non-public](https://isocpp.github.io/CppCoreGuidelines/CppCoreGuidelines#Rc-class)

   - [C.2: Use class if the class has an invariant; use struct if the data members can vary independently](https://isocpp.github.io/CppCoreGuidelines/CppCoreGuidelines#c2-use-class-if-the-class-has-an-invariant-use-struct-if-the-data-members-can-vary-independently)

  - A class has the advantage of default private access, as opposed to public for a struct.

ACKs for top commit:
  furszy:
    Code ACK ca1ac1f
  promag:
    Code review ACK ca1ac1f0e0fbabbe97666aca94024afb8104da06.
  danielabrozzoni:
    Code review ACK ca1ac1f0e0fbabbe97666aca94024afb8104da06

Tree-SHA512: 25f85e2b582fe8c269e6cf384a4aa29350b97ea6477edf3c63591e4f68a97364f7fb2fc4ad2764f61ff86b27353e31d2f12eed7a23368a247e4cf271c7e133ea
---
 src/masternode/node.h       |  1 +
 src/validationinterface.cpp | 22 ++++++++++++----------
 src/validationinterface.h   |  6 ++----
 3 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/src/masternode/node.h b/src/masternode/node.h
index 931233c42f72..5e4d94bc352a 100644
--- a/src/masternode/node.h
+++ b/src/masternode/node.h
@@ -11,6 +11,7 @@
 #include <threadsafety.h>
 #include <validationinterface.h>
 
+class CConnman;
 class CDeterministicMNManager;
 
 struct CActiveMasternodeInfo {
diff --git a/src/validationinterface.cpp b/src/validationinterface.cpp
index 88668ea79bbe..a71c7ab1f3c5 100644
--- a/src/validationinterface.cpp
+++ b/src/validationinterface.cpp
@@ -19,14 +19,16 @@
 
 std::string RemovalReasonToString(const MemPoolRemovalReason& r) noexcept;
 
-//! The MainSignalsInstance manages a list of shared_ptr<CValidationInterface>
-//! callbacks.
-//!
-//! A std::unordered_map is used to track what callbacks are currently
-//! registered, and a std::list is to used to store the callbacks that are
-//! currently registered as well as any callbacks that are just unregistered
-//! and about to be deleted when they are done executing.
-struct MainSignalsInstance {
+/**
+ * MainSignalsImpl manages a list of shared_ptr<CValidationInterface> callbacks.
+ *
+ * A std::unordered_map is used to track what callbacks are currently
+ * registered, and a std::list is used to store the callbacks that are
+ * currently registered as well as any callbacks that are just unregistered
+ * and about to be deleted when they are done executing.
+ */
+class MainSignalsImpl
+{
 private:
     Mutex m_mutex;
     //! List entries consist of a callback pointer and reference count. The
@@ -43,7 +45,7 @@ struct MainSignalsInstance {
     // our own queue here :(
     SingleThreadedSchedulerClient m_schedulerClient;
 
-    explicit MainSignalsInstance(CScheduler& scheduler LIFETIMEBOUND) : m_schedulerClient(scheduler) {}
+    explicit MainSignalsImpl(CScheduler& scheduler LIFETIMEBOUND) : m_schedulerClient(scheduler) {}
 
     void Register(std::shared_ptr<CValidationInterface> callbacks) EXCLUSIVE_LOCKS_REQUIRED(!m_mutex)
     {
@@ -95,7 +97,7 @@ static CMainSignals g_signals;
 void CMainSignals::RegisterBackgroundSignalScheduler(CScheduler& scheduler)
 {
     assert(!m_internals);
-    m_internals = std::make_unique<MainSignalsInstance>(scheduler);
+    m_internals = std::make_unique<MainSignalsImpl>(scheduler);
 }
 
 void CMainSignals::UnregisterBackgroundSignalScheduler()
diff --git a/src/validationinterface.h b/src/validationinterface.h
index dc20388ddfc6..271c76f88fa5 100644
--- a/src/validationinterface.h
+++ b/src/validationinterface.h
@@ -17,12 +17,10 @@ class BlockValidationState;
 class CBlock;
 class CBlockIndex;
 struct CBlockLocator;
-class CConnman;
 class CValidationInterface;
 class CGovernanceVote;
 class CDeterministicMNList;
 class CDeterministicMNListDiff;
-class uint256;
 class CScheduler;
 enum class MemPoolRemovalReason;
 namespace chainlock {
@@ -204,10 +202,10 @@ class CValidationInterface {
     friend class ValidationInterfaceTest;
 };
 
-struct MainSignalsInstance;
+class MainSignalsImpl;
 class CMainSignals {
 private:
-    std::unique_ptr<MainSignalsInstance> m_internals;
+    std::unique_ptr<MainSignalsImpl> m_internals;
 
     friend void ::RegisterSharedValidationInterface(std::shared_ptr<CValidationInterface>);
     friend void ::UnregisterValidationInterface(CValidationInterface*);

From 796fea71743aa69872d3701c22c174dff88f32e4 Mon Sep 17 00:00:00 2001
From: Andrew Chow <achow101-github@achow101.com>
Date: Mon, 16 May 2022 14:28:31 -0400
Subject: [PATCH 167/656] Merge bitcoin/bitcoin#23662: rpc: improve
 `getreceivedby{address,label}` performance

f336ff7f213564909cf5f9742618cc6ec87600fd rpc: avoid expensive `IsMine` calls in `GetReceived` tally (Sebastian Falbesoner)
a7b65af2a4450663d4a20a617c59dac87b34fb36 rpc: avoid scriptPubKey<->CTxDestination conversions in `GetReceived` tally (Sebastian Falbesoner)

Pull request description:

  The RPC calls `getreceivedbyaddress`/`getreceivedbylabel` both use the internal helper function `GetReceived` which was introduced in PR #17579 to deduplicate tallying code. For every wallet-related transaction output, the following unnecessary operations are currently performed in the tally loop, leading to a quite bad performance (as reported in #23645):
  - converting from CScript -> TxDestination (`ExtractDestination(...)`), converting from TxDestination -> CScript (`CWallet::IsMine(const CTxDestination& dest)`); this can be avoided by directly using output scripts in the search set instead of addresses (first commit)
  - checking if the iterated output script belongs to the wallet by calling `IsMine`; this can be avoided by only adding addresses to the search set which fulfil `IsMine` in the first place (second commit)

  ### Benchmark results
  The functional test [wallet_pr23662.py](https://github.com/theStack/bitcoin/blob/pr23662_benchmarks/test/functional/wallet_pr23662.py) (not part of this PR) creates transactions with 15000 different addresses:
  - 5000 outputs (500 txs with 10 outputs each) with label set, IsMine set (received)
  - 5000 outputs (500 txs with 10 outputs each) with label set, IsMine not set (sent)
  - 5000 outputs (500 txs with 10 outputs each) without label set, IsMine not set (sent)

  Then, the time is measured for calling `getreceivedbyaddress` and `getreceivedbylabel`, the latter with two variants. Results on my machine:

  | branch             | `getreceivedbyaddress` (single) | `getreceivedbylabel` (single) | `getreceivedbylabel` (10000) |
  |--------------------|---------------------------------|-------------------------------|------------------------------|
  | master             |             406.13ms            |          425.33ms             |          446.58ms            |
  | PR (first commit)  |             367.18ms            |          365.81ms             |          426.33ms            |
  | PR (second commit) |               3.96ms            |            4.83ms             |          339.69ms            |

  Fixes #23645.

ACKs for top commit:
  achow101:
    ACK f336ff7f213564909cf5f9742618cc6ec87600fd
  w0xlt:
    ACK https://github.com/bitcoin/bitcoin/pull/23662/commits/f336ff7f213564909cf5f9742618cc6ec87600fd
  furszy:
    Code ACK f336ff7f

Tree-SHA512: 9cbf402b9e269713bd3feda9e31719d9dca8a0dfd526de12fd3d561711589195d0c50143432c65dae279c4eab90a4fc3f99e29fbc0452fefe05113e92d129b8f
---
 src/wallet/rpc/coins.cpp | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/src/wallet/rpc/coins.cpp b/src/wallet/rpc/coins.cpp
index 84accf15ce1b..369b506c4e56 100644
--- a/src/wallet/rpc/coins.cpp
+++ b/src/wallet/rpc/coins.cpp
@@ -17,12 +17,17 @@
 namespace wallet {
 static CAmount GetReceived(const CWallet& wallet, const UniValue& params, bool by_label) EXCLUSIVE_LOCKS_REQUIRED(wallet.cs_wallet)
 {
-    std::vector<CTxDestination> address_vector;
+    std::vector<CScript> output_scripts;
 
     if (by_label) {
         // Get the set of addresses assigned to label
         std::string label = LabelFromValue(params[0]);
-        address_vector = wallet.ListAddrBookAddresses(CWallet::AddrBookFilter{label});
+        for (const auto& address : wallet.ListAddrBookAddresses(CWallet::AddrBookFilter{label})) {
+            auto output_script{GetScriptForDestination(address)};
+            if (wallet.IsMine(output_script)) {
+                output_scripts.emplace_back(output_script);
+            }
+        }
     } else {
         // Get the address
         CTxDestination dest = DecodeDestination(params[0].get_str());
@@ -33,7 +38,7 @@ static CAmount GetReceived(const CWallet& wallet, const UniValue& params, bool b
         if (!wallet.IsMine(script_pub_key)) {
             throw JSONRPCError(RPC_WALLET_ERROR, "Address not found in wallet");
         }
-        address_vector.emplace_back(dest);
+        output_scripts.emplace_back(script_pub_key);
     }
 
     // Minimum confirmations
@@ -66,8 +71,7 @@ static CAmount GetReceived(const CWallet& wallet, const UniValue& params, bool b
         if (depth < min_depth && !(fAddLocked && wallet.IsTxLockedByInstantSend(wtx))) continue;
 
         for (const CTxOut& txout : wtx.tx->vout) {
-            CTxDestination address;
-            if (ExtractDestination(txout.scriptPubKey, address) && wallet.IsMine(address) && std::find(address_vector.begin(), address_vector.end(), address) != address_vector.end()) {
+            if (std::find(output_scripts.begin(), output_scripts.end(), txout.scriptPubKey) != output_scripts.end()) {
                 amount += txout.nValue;
             }
         }

From 3b4095c8ed87c61f2851c28cafd717786933b854 Mon Sep 17 00:00:00 2001
From: Konstantin Akimov <knstqq@gmail.com>
Date: Mon, 13 Oct 2025 23:58:30 +0700
Subject: [PATCH 168/656] fix: add proper RPC result for governance RPC

 - gobject (composite command)
 - gobject check
 - gobject count
 - gobject deserialize
 - gobject get
 - gobject getcurrentvotes
 - gobject list
 - gobject listprepared
 - gobject prepare
 - gobject submit
 - gobject vote-alias
 - gobject vote-many
 - gobject voteraw
---
 src/rpc/governance.cpp | 107 ++++++++++++++++++++++++++++++++++++-----
 1 file changed, 94 insertions(+), 13 deletions(-)

diff --git a/src/rpc/governance.cpp b/src/rpc/governance.cpp
index ea66057b457c..2905cb296e83 100644
--- a/src/rpc/governance.cpp
+++ b/src/rpc/governance.cpp
@@ -43,7 +43,20 @@ static RPCHelpMan gobject_count()
         {
             {"mode", RPCArg::Type::STR, RPCArg::DefaultHint{"json"}, "Output format: json (\"json\") or string in free form (\"all\")"},
         },
-        RPCResults{},
+        {
+            RPCResult{"for mode = json",
+                RPCResult::Type::OBJ, "", "",
+                {
+                    {RPCResult::Type::NUM, "objects_total", "Total number of all governance objects"},
+                    {RPCResult::Type::NUM, "proposals", "Number of governance proposals"},
+                    {RPCResult::Type::NUM, "triggers", "Number of triggers"},
+                    {RPCResult::Type::NUM, "other", "Total number of unknown governance objects"},
+                    {RPCResult::Type::NUM, "erased", "Number of removed (expired) objects"},
+                    {RPCResult::Type::NUM, "votes", "Total number of votes"},
+                }
+            },
+            RPCResult{"for mode = all", RPCResult::Type::STR, "", "Human-friendly summary string for proposals and votes"},
+        },
         RPCExamples{""},
         [&](const RPCHelpMan& self, const JSONRPCRequest& request) -> UniValue
 {
@@ -71,7 +84,18 @@ static RPCHelpMan gobject_deserialize()
         {
             {"hex_data", RPCArg::Type::STR_HEX, RPCArg::Optional::NO, "data in hex string form"},
         },
-        RPCResults{},
+        {
+            RPCResult{
+                RPCResult::Type::OBJ, "", "Deserialized governance object",
+                {
+                    // TODO: list fields of output for RPC help instead ELISION
+                    {RPCResult::Type::ELISION, "", ""}
+                }
+            },
+            RPCResult{"for mode = all",
+                RPCResult::Type::STR, "", "The transaction hash in hex"
+            },
+        },
         RPCExamples{""},
         [&](const RPCHelpMan& self, const JSONRPCRequest& request) -> UniValue
 {
@@ -96,7 +120,12 @@ static RPCHelpMan gobject_check()
         {
             {"hex_data", RPCArg::Type::STR_HEX, RPCArg::Optional::NO, "data in hex string format"},
         },
-        RPCResults{},
+        RPCResult{"if object is valid",
+            RPCResult::Type::OBJ, "", "",
+            {
+                {RPCResult::Type::STR, "Object status", "OK"},
+            }
+        },
         RPCExamples{""},
         [&](const RPCHelpMan& self, const JSONRPCRequest& request) -> UniValue
 {
@@ -145,7 +174,9 @@ static RPCHelpMan gobject_prepare()
             {"outputHash", RPCArg::Type::STR_HEX, RPCArg::Default{""}, "the single output to submit the proposal fee from"},
             {"outputIndex", RPCArg::Type::NUM, RPCArg::Default{0}, "The output index."},
         },
-        RPCResults{},
+        {
+            RPCResult{"if object valid", RPCResult::Type::STR, "", "serialized governance object"},
+        },
         RPCExamples{""},
         [&](const RPCHelpMan& self, const JSONRPCRequest& request) -> UniValue
 {
@@ -254,7 +285,16 @@ static RPCHelpMan gobject_list_prepared()
         {
             {"count", RPCArg::Type::NUM, RPCArg::Default{10}, "Maximum number of objects to return."},
         },
-        RPCResults{},
+        RPCResult{
+            RPCResult::Type::ARR, "", "list of governance objects",
+            {
+                {RPCResult::Type::OBJ, "", "",
+                {
+                    // TODO: list fields of output for RPC help instead ELISION
+                    {RPCResult::Type::ELISION, "", ""}
+                }},
+            }
+        },
         RPCExamples{""},
         [&](const RPCHelpMan& self, const JSONRPCRequest& request) -> UniValue
 {
@@ -303,7 +343,7 @@ static RPCHelpMan gobject_submit()
             {"data-hex", RPCArg::Type::STR_HEX, RPCArg::Optional::NO, "data in hex string form"},
             {"fee-txid", RPCArg::Type::STR_HEX, RPCArg::Optional::NO, "txid of the corresponding proposal fee transaction"},
         },
-        RPCResults{},
+        RPCResult{RPCResult::Type::STR_HEX, "data", "A string that is serialized, hex-encoded data for the gobject"},
         RPCExamples{""},
         [&](const RPCHelpMan& self, const JSONRPCRequest& request) -> UniValue
 {
@@ -484,6 +524,23 @@ static bool CheckWalletOwnsKey(const CWallet& wallet, const CKeyID& keyid)
     return wallet.IsMine(script) == isminetype::ISMINE_SPENDABLE;
 }
 
+namespace {
+const RPCResult vote_results{
+    RPCResult::Type::OBJ, "", "",
+        {
+            {RPCResult::Type::STR, "overall", "Total amount of successful and failed votes"},
+            {RPCResult::Type::OBJ, "detail", "Detailed information for each vote",
+            {
+                {RPCResult::Type::OBJ, "protx", "ProTx of masternode for voting",
+                {
+                    {RPCResult::Type::STR, "result", "Result of voting: {success|failed}"},
+                    {RPCResult::Type::STR, "errorMessage", /*optional=*/true, "Error message if failed"},
+                }},
+            }},
+        },
+};
+} // anonymous namespace
+
 static RPCHelpMan gobject_vote_many()
 {
     return RPCHelpMan{"gobject vote-many",
@@ -494,7 +551,7 @@ static RPCHelpMan gobject_vote_many()
             {"vote", RPCArg::Type::STR, RPCArg::Optional::NO, "vote, possible values: [funding|valid|delete|endorsed]"},
             {"vote-outcome", RPCArg::Type::STR, RPCArg::Optional::NO, "vote outcome, possible values: [yes|no|abstain]"},
         },
-        RPCResults{},
+        vote_results,
         RPCExamples{""},
         [&](const RPCHelpMan& self, const JSONRPCRequest& request) -> UniValue
 {
@@ -547,7 +604,7 @@ static RPCHelpMan gobject_vote_alias()
             {"vote-outcome", RPCArg::Type::STR, RPCArg::Optional::NO, "vote outcome, possible values: [yes|no|abstain]"},
             {"protx-hash", RPCArg::Type::STR_HEX, RPCArg::Optional::NO, "masternode's proTxHash"},
         },
-        RPCResults{},
+        vote_results,
         RPCExamples{""},
         [&](const RPCHelpMan& self, const JSONRPCRequest& request) -> UniValue
 {
@@ -669,7 +726,18 @@ static RPCHelpMan gobject_list_helper(const bool make_a_diff)
             {"signal", RPCArg::Type::STR, RPCArg::Default{"valid"}, "cached signal, possible values: [valid|funding|delete|endorsed|all]"},
             {"type", RPCArg::Type::STR, RPCArg::Default{"all"}, "object type, possible values: [proposals|triggers|all]"},
         },
-        RPCResults{},
+        {
+            RPCResult{"if request is valid",
+                RPCResult::Type::OBJ, "hash", "Object details",
+                {
+                    // TODO: list fields of output for RPC help instead ELISION
+                    {RPCResult::Type::ELISION, "", ""}
+                },
+            },
+            RPCResult{"if request is invalid",
+                RPCResult::Type::STR_HEX, "", "Error string"
+            },
+        },
         RPCExamples{""},
         [&](const RPCHelpMan& self, const JSONRPCRequest& request) -> UniValue
 {
@@ -715,7 +783,15 @@ static RPCHelpMan gobject_get()
         {
             {"governance-hash", RPCArg::Type::STR_HEX, RPCArg::Optional::NO, "object id"},
         },
-        RPCResults{},
+        {
+            RPCResult{
+                RPCResult::Type::OBJ, "", "",
+                {
+                    // TODO: list fields of output for RPC help instead ELISION
+                    {RPCResult::Type::ELISION, "", ""}
+                }
+            },
+        },
         RPCExamples{""},
         [&](const RPCHelpMan& self, const JSONRPCRequest& request) -> UniValue
 {
@@ -811,7 +887,12 @@ static RPCHelpMan gobject_getcurrentvotes()
             {"txid", RPCArg::Type::STR_HEX, RPCArg::Default{""}, "masternode collateral txid"},
             {"vout", RPCArg::Type::STR, RPCArg::Default{""}, "masternode collateral output index, required if <txid> present"},
         },
-        RPCResults{},
+        RPCResult{
+            RPCResult::Type::OBJ, "", "Map with governance votes",
+            {
+                {RPCResult::Type::STR, "votehash", "Human-friendly presentation of vote"},
+            },
+        },
         RPCExamples{""},
         [&](const RPCHelpMan& self, const JSONRPCRequest& request) -> UniValue
 {
@@ -877,7 +958,7 @@ static RPCHelpMan gobject()
         {
             {"command", RPCArg::Type::STR, RPCArg::Optional::NO, "The command to execute"},
         },
-        RPCResults{},
+        RPCResult{RPCResult::Type::NONE, "", ""},
         RPCExamples{""},
         [&](const RPCHelpMan& self, const JSONRPCRequest& request) -> UniValue
 {
@@ -899,7 +980,7 @@ static RPCHelpMan voteraw()
             {"time", RPCArg::Type::NUM, RPCArg::Optional::NO, ""},
             {"vote-sig", RPCArg::Type::STR_HEX, RPCArg::Optional::NO, ""},
         },
-        RPCResults{},
+        RPCResult{RPCResult::Type::STR, "", "Result of voting"},
         RPCExamples{""},
         [&](const RPCHelpMan& self, const JSONRPCRequest& request) -> UniValue
 {

From 7d6b60656f24d4aba09d4f10eca1cec7ab447ae8 Mon Sep 17 00:00:00 2001
From: Konstantin Akimov <knstqq@gmail.com>
Date: Tue, 14 Oct 2025 01:41:25 +0700
Subject: [PATCH 169/656] fix: add missing RPC help result for evo RPCs

Fixed RPC:
 - bls (composite command)
 - protx (composite command)
 - protx list
 - protx listdiff
---
 src/rpc/evo.cpp | 51 ++++++++++++++++++++++++++++++++++++++++++++-----
 1 file changed, 46 insertions(+), 5 deletions(-)

diff --git a/src/rpc/evo.cpp b/src/rpc/evo.cpp
index a8268a653de3..ecb649c1a925 100644
--- a/src/rpc/evo.cpp
+++ b/src/rpc/evo.cpp
@@ -1404,7 +1404,16 @@ static RPCHelpMan protx_list()
             {"detailed", RPCArg::Type::BOOL, RPCArg::Default{false}, "If not specified, only the hashes of the ProTx will be returned."},
             {"height", RPCArg::Type::NUM, RPCArg::DefaultHint{"current chain-tip"}, ""},
         },
-        RPCResults{},
+        RPCResult{
+            RPCResult::Type::ARR, "", "list of masternodes",
+            {
+                {RPCResult::Type::OBJ, "", "",
+                {
+                    // TODO: list fields of output for RPC help instead ELISION
+                    {RPCResult::Type::ELISION, "", ""}
+                }},
+            },
+        },
         RPCExamples{""},
         [&](const RPCHelpMan& self, const JSONRPCRequest& request) -> UniValue
 {
@@ -1645,8 +1654,40 @@ static RPCHelpMan protx_listdiff()
                        {"baseBlock", RPCArg::Type::NUM, RPCArg::Optional::NO, "The starting block height."},
                        {"block", RPCArg::Type::NUM, RPCArg::Optional::NO, "The ending block height."},
                },
-               RPCResults{},
-               RPCExamples{""},
+                RPCResult {
+                    RPCResult::Type::OBJ, "", "",
+                    {
+                        {RPCResult::Type::NUM, "baseHeight", "height of base (starting) block"},
+                        {RPCResult::Type::NUM, "blockHeight", "height of target (ending) block"},
+                        {RPCResult::Type::ARR, "addedMNs", "added masternodes",
+                            {
+                                {RPCResult::Type::OBJ, "", "",
+                                {
+                                    // TODO: list fields of output for RPC help instead ELISION
+                                    {RPCResult::Type::ELISION, "", ""}
+                                }},
+                            },
+                        },
+                        {RPCResult::Type::ARR, "removedMns", "removed masternodes",
+                            {
+                                {RPCResult::Type::STR_HEX, "protx", "ProTx of removed masternode"},
+                            },
+                        },
+                        {RPCResult::Type::ARR, "addedMNs", "added masternodes",
+                            {
+                                {RPCResult::Type::OBJ, "", "",
+                                {
+                                    {RPCResult::Type::OBJ, "protx", "ProTx of updated masternode",
+                                    {
+                                        // TODO: list fields of output for RPC help instead ELISION
+                                        {RPCResult::Type::ELISION, "", ""}
+                                    }},
+                                }},
+                            },
+                        },
+                    },
+                },
+                RPCExamples{""},
         [&](const RPCHelpMan& self, const JSONRPCRequest& request) -> UniValue
 {
     const NodeContext& node = EnsureAnyNodeContext(request.context);
@@ -1744,7 +1785,7 @@ static RPCHelpMan protx_help()
         {
             {"command", RPCArg::Type::STR, RPCArg::Optional::NO, "The command to execute"},
         },
-        RPCResults{},
+        RPCResult{RPCResult::Type::NONE, "", ""},
         RPCExamples{""},
         [&](const RPCHelpMan& self, const JSONRPCRequest& request) -> UniValue
 {
@@ -1834,7 +1875,7 @@ static RPCHelpMan bls_help()
         {
             {"command", RPCArg::Type::STR, RPCArg::Optional::NO, "The command to execute"},
         },
-        RPCResults{},
+        RPCResult{RPCResult::Type::NONE, "", ""},
         RPCExamples{""},
         [&](const RPCHelpMan& self, const JSONRPCRequest& request) -> UniValue
 {

From 72284b525ef5429c04044c2fbb0ebbdba2a4579e Mon Sep 17 00:00:00 2001
From: Konstantin Akimov <knstqq@gmail.com>
Date: Tue, 14 Oct 2025 01:54:05 +0700
Subject: [PATCH 170/656] fix: add missing RPC help result for RPC
 getrawtransactionmulti

---
 src/rpc/rawtransaction.cpp | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/src/rpc/rawtransaction.cpp b/src/rpc/rawtransaction.cpp
index 77de92f39f67..ddca93f4669d 100644
--- a/src/rpc/rawtransaction.cpp
+++ b/src/rpc/rawtransaction.cpp
@@ -358,8 +358,19 @@ static RPCHelpMan getrawtransactionmulti() {
                     {"verbose", RPCArg::Type::BOOL, RPCArg::Default{false},
                      "If false, return a string, otherwise return a json object"},
             },
-            // TODO: replace RPCResults to proper annotation
-            RPCResults{},
+            RPCResult{
+                RPCResult::Type::OBJ, "", "",
+                {
+                    {"if verbose is not set or set to false",
+                        RPCResult::Type::STR_HEX, "txid", "The serialized, hex-encoded data for 'txid'"},
+                    {"if verbose is set to true",
+                        RPCResult::Type::OBJ, "txid", "The decoded network-serialized transaction.",
+                        {
+                            {RPCResult::Type::ELISION, "", "The layout is the same as the output of getrawtransaction."},
+                        }},
+                    {"if tx is unknown", RPCResult::Type::STR, "txid", "None"},
+                },
+            },
             RPCExamples{
                     HelpExampleCli("getrawtransactionmulti",
                                    R"('{"blockhash1":["txid1","txid2"], "0":["txid3"]}')")

From 661db513cf2be3e74fd26b5ace03bf0090aa9d05 Mon Sep 17 00:00:00 2001
From: Konstantin Akimov <knstqq@gmail.com>
Date: Tue, 14 Oct 2025 02:06:21 +0700
Subject: [PATCH 171/656] fix: add missing RPC help result for quorum RPCs

 - quorum (composite command)
 - quorum dkgstats
 - quorum info
 - quorum sign
 - quorum platformsign
 - quorum verify
 - quorum hasrecsig
 - quorum isconflicting
 - quorum selectquorum
 - quorum dkgsimerror
 - quorum getdata
 - quorum verifychainlock
 - quorum verifyislock
---
 src/rpc/quorums.cpp | 99 ++++++++++++++++++++++++++++++++++++++-------
 1 file changed, 84 insertions(+), 15 deletions(-)

diff --git a/src/rpc/quorums.cpp b/src/rpc/quorums.cpp
index a9b3b88d3455..f287c0c805a5 100644
--- a/src/rpc/quorums.cpp
+++ b/src/rpc/quorums.cpp
@@ -242,7 +242,12 @@ static RPCHelpMan quorum_info()
             {"quorumHash", RPCArg::Type::STR_HEX, RPCArg::Optional::NO, "Block hash of quorum."},
             {"includeSkShare", RPCArg::Type::BOOL, RPCArg::Default{false}, "Include secret key share in output."},
         },
-        RPCResults{},
+        RPCResult{
+            RPCResult::Type::OBJ, "", "",
+            {
+                {RPCResult::Type::ELISION, "", ""}
+            },
+        },
         RPCExamples{""},
         [&](const RPCHelpMan& self, const JSONRPCRequest& request) -> UniValue
 {
@@ -280,7 +285,35 @@ static RPCHelpMan quorum_dkgstatus()
                 "Detail level of output.\n"
                 "0=Only show counts. 1=Show member indexes. 2=Show member's ProTxHashes."},
         },
-        RPCResults{},
+        RPCResult{
+            RPCResult::Type::OBJ, "", "",
+            {
+                {RPCResult::Type::NUM, "time", "Adjusted time for the last update, timestamp"},
+                {RPCResult::Type::STR, "timeStr", "Adjusted time for the last update, human friendly"},
+                {RPCResult::Type::ARR, "session", "",
+                    {
+                        {RPCResult::Type::OBJ, "", "",
+                        {
+                            {RPCResult::Type::NUM, "llmqType", "Name of quorum"},
+                            {RPCResult::Type::NUM, "quorumIndex", "Relevant for rotation quorums only, for non rotating quorums is 0"},
+                            {RPCResult::Type::OBJ, "status", "",
+                            {
+                                // TODO: list fields of output for RPC help instead ELISION
+                                {RPCResult::Type::ELISION, "", ""},
+                            }},
+                        }},
+                    },
+                },
+                {RPCResult::Type::ARR, "quorumConnections", "",
+                    // TODO: list fields of output for RPC help instead ELISION
+                    {{RPCResult::Type::ELISION, "", ""}},
+                },
+                {RPCResult::Type::ARR, "mineableCommitments", "",
+                    // TODO: list fields of output for RPC help instead ELISION
+                    {{RPCResult::Type::ELISION, "", ""}},
+                },
+            },
+        },
         RPCExamples{""},
         [&](const RPCHelpMan& self, const JSONRPCRequest& request) -> UniValue
 {
@@ -388,7 +421,17 @@ static RPCHelpMan quorum_memberof()
                 "Can be CPU/disk heavy when the value is larger than the number of active quorums."
             },
         },
-        RPCResults{},
+        RPCResult{
+            RPCResult::Type::ARR, "quorums", "",
+            {
+                {RPCResult::Type::OBJ, "", "Quorum Info",
+                {
+                    {RPCResult::Type::ELISION, "", "See for details help for `quorum info`"},
+                    {RPCResult::Type::BOOL, "isValidMember", ""},
+                    {RPCResult::Type::NUM, "memberIndex", ""},
+                }},
+            },
+        },
         RPCExamples{""},
         [&](const RPCHelpMan& self, const JSONRPCRequest& request) -> UniValue
 {
@@ -492,6 +535,23 @@ static UniValue quorum_sign_helper(const JSONRPCRequest& request, Consensus::LLM
     }
 }
 
+namespace {
+const RPCResults quorum_sign_result{
+    RPCResult{"if submit is set to true", RPCResult::Type::BOOL, "result", "result of signing, true if success"},
+    RPCResult{"if submit is not set or set to false", RPCResult::Type::OBJ, "", "",
+        {
+            {RPCResult::Type::NUM, "llmqType", "Quorum type"},
+            {RPCResult::Type::STR_HEX, "quorumHash", "Quorum Hash"},
+            {RPCResult::Type::NUM, "quorumMember", "Number of quorum member"},
+            {RPCResult::Type::STR_HEX, "id", "Request ID"},
+            {RPCResult::Type::STR_HEX, "msgHash", "Hash of message"},
+            {RPCResult::Type::STR_HEX, "signHash", "Hash of signature"},
+            {RPCResult::Type::STR_HEX, "signature", "Hex encoded signature"},
+        },
+    },
+};
+} // anonymous namespace
+
 static RPCHelpMan quorum_sign()
 {
     return RPCHelpMan{"quorum sign",
@@ -504,7 +564,7 @@ static RPCHelpMan quorum_sign()
             {"submit", RPCArg::Type::BOOL, RPCArg::Default{true}, "Submits the signature share to the network if this is true. "
                                                                 "Returns an object containing the signature share if this is false."},
         },
-        RPCResults{},
+        quorum_sign_result,
         RPCExamples{""},
         [&](const RPCHelpMan& self, const JSONRPCRequest& request) -> UniValue
 {
@@ -531,7 +591,7 @@ static RPCHelpMan quorum_platformsign()
             {"submit", RPCArg::Type::BOOL, RPCArg::Default{true}, "Submits the signature share to the network if this is true. "
                                                                 "Returns an object containing the signature share if this is false."},
         },
-        RPCResults{},
+        quorum_sign_result,
         RPCExamples{""},
         [&](const RPCHelpMan& self, const JSONRPCRequest& request) -> UniValue
 {
@@ -569,7 +629,7 @@ static RPCHelpMan quorum_verify()
                 "The height at which the message was signed.\n"
                 "Only works when quorumHash is \"\"."},
         },
-        RPCResults{},
+        RPCResult{RPCResult::Type::BOOL, "", "Returns true if the signature is valid"},
         RPCExamples{""},
         [&](const RPCHelpMan& self, const JSONRPCRequest& request) -> UniValue
 {
@@ -623,7 +683,7 @@ static RPCHelpMan quorum_hasrecsig()
             {"id", RPCArg::Type::STR_HEX, RPCArg::Optional::NO, "Request id."},
             {"msgHash", RPCArg::Type::STR_HEX, RPCArg::Optional::NO, "Message hash."},
         },
-        RPCResults{},
+        RPCResult{RPCResult::Type::BOOL, "", "Returns true if node has this recovered signature"},
         RPCExamples{""},
         [&](const RPCHelpMan& self, const JSONRPCRequest& request) -> UniValue
 {
@@ -688,7 +748,7 @@ static RPCHelpMan quorum_isconflicting()
             {"id", RPCArg::Type::STR_HEX, RPCArg::Optional::NO, "Request id."},
             {"msgHash", RPCArg::Type::STR_HEX, RPCArg::Optional::NO, "Message hash."},
         },
-        RPCResults{},
+        RPCResult{RPCResult::Type::BOOL, "", "Returns true if this msgHash is conflicting with previous signing sessions"},
         RPCExamples{""},
         [&](const RPCHelpMan& self, const JSONRPCRequest& request) -> UniValue
 {
@@ -716,7 +776,16 @@ static RPCHelpMan quorum_selectquorum()
             {"llmqType", RPCArg::Type::NUM, RPCArg::Optional::NO, "LLMQ type."},
             {"id", RPCArg::Type::STR_HEX, RPCArg::Optional::NO, "Request id."},
         },
-        RPCResults{},
+        RPCResult{
+            RPCResult::Type::OBJ, "", "",
+            {
+                {RPCResult::Type::STR_HEX, "quorumHash", "Hash of chosen quorum"},
+/*                {RPCResult::Type::ARR, "recoveryMembers", "list of members to do sig recovery",
+                        {RPCResult::Type::STR_HEX, "hash", "protx hash of member"}
+                },
+                */
+            }
+        },
         RPCExamples{""},
         [&](const RPCHelpMan& self, const JSONRPCRequest& request) -> UniValue
 {
@@ -761,7 +830,7 @@ static RPCHelpMan quorum_dkgsimerror()
             {"type", RPCArg::Type::STR, RPCArg::Optional::NO, "Error type."},
             {"rate", RPCArg::Type::NUM, RPCArg::Optional::NO, "Rate at which to simulate this error type (between 0 and 100)."},
         },
-        RPCResults{},
+        RPCResult{RPCResult::Type::NONE, "", ""},
         RPCExamples{""},
         [&](const RPCHelpMan& self, const JSONRPCRequest& request) -> UniValue
 {
@@ -777,7 +846,7 @@ static RPCHelpMan quorum_dkgsimerror()
         throw JSONRPCError(RPC_INVALID_PARAMETER, "invalid type. See DKGError class implementation");
     } else {
         llmq::SetSimulatedDKGErrorRate(type, static_cast<double>(rate) / 100);
-        return UniValue();
+        return NullUniValue;
     }
 },
     };
@@ -798,7 +867,7 @@ static RPCHelpMan quorum_getdata()
                 "3 - Request both, 1 and 2"},
             {"proTxHash", RPCArg::Type::STR_HEX, RPCArg::Default{""}, "The proTxHash the contributions will be requested for. Must be member of the specified LLMQ."},
         },
-        RPCResults{},
+        RPCResult{RPCResult::Type::BOOL, "", "Returns true if the message QGETDATA has been successfully sent"},
         RPCExamples{""},
         [&](const RPCHelpMan& self, const JSONRPCRequest& request) -> UniValue
 {
@@ -960,7 +1029,7 @@ static RPCHelpMan quorum_help()
             {
                 {"command", RPCArg::Type::STR, RPCArg::Optional::NO, "The command to execute"},
             },
-            RPCResults{},
+            RPCResult{RPCResult::Type::NONE, "", ""},
             RPCExamples{""},
         [&](const RPCHelpMan& self, const JSONRPCRequest& request) -> UniValue
 {
@@ -978,7 +1047,7 @@ static RPCHelpMan verifychainlock()
             {"signature", RPCArg::Type::STR, RPCArg::Optional::NO, "The signature of the ChainLock."},
             {"blockHeight", RPCArg::Type::NUM, RPCArg::DefaultHint{"There will be an internal lookup of \"blockHash\" if this is not provided."}, "The height of the ChainLock."},
         },
-        RPCResults{},
+        RPCResult{RPCResult::Type::BOOL, "", "Returns true if the chainlock is valid"},
         RPCExamples{""},
         [&](const RPCHelpMan& self, const JSONRPCRequest& request) -> UniValue
 {
@@ -1037,7 +1106,7 @@ static RPCHelpMan verifyislock()
             {"signature", RPCArg::Type::STR, RPCArg::Optional::NO, "The InstantSend Lock signature to verify."},
             {"maxHeight", RPCArg::Type::NUM, RPCArg::Default{-1}, "The maximum height to search quorums from."},
         },
-        RPCResults{},
+        RPCResult{RPCResult::Type::BOOL, "", "Returns true if the instantsent is valid"},
         RPCExamples{""},
         [&](const RPCHelpMan& self, const JSONRPCRequest& request) -> UniValue
 {

From 6e89094d94e0cd219e5b7d36840101d82b61d8c8 Mon Sep 17 00:00:00 2001
From: Konstantin Akimov <knstqq@gmail.com>
Date: Wed, 15 Oct 2025 22:03:26 +0700
Subject: [PATCH 172/656] fix: multiple code-review comments

Co-authored-by: thephez <thephez@users.noreply.github.com>
Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>
---
 src/rpc/evo.cpp        | 18 +++++++++---------
 src/rpc/governance.cpp |  6 ++----
 src/rpc/masternode.cpp | 16 ++++++++--------
 src/rpc/quorums.cpp    |  5 ++---
 4 files changed, 21 insertions(+), 24 deletions(-)

diff --git a/src/rpc/evo.cpp b/src/rpc/evo.cpp
index ecb649c1a925..60c1c35b3db4 100644
--- a/src/rpc/evo.cpp
+++ b/src/rpc/evo.cpp
@@ -1405,15 +1405,15 @@ static RPCHelpMan protx_list()
             {"height", RPCArg::Type::NUM, RPCArg::DefaultHint{"current chain-tip"}, ""},
         },
         RPCResult{
-            RPCResult::Type::ARR, "", "list of masternodes",
+            RPCResult::Type::ARR, "", "List of masternodes",
             {
-                {RPCResult::Type::OBJ, "", "",
-                {
-                    // TODO: list fields of output for RPC help instead ELISION
-                    {RPCResult::Type::ELISION, "", ""}
-                }},
-            },
-        },
+                RPCResult{"when detailed=false", RPCResult::Type::STR, "", "ProTx hash"},
+                RPCResult{"when detailed=true", RPCResult::Type::OBJ, "", "",
+                    {
+                        // TODO: document fields of the detailed entry
+                        {RPCResult::Type::ELISION, "", ""}
+                    }},
+            }},
         RPCExamples{""},
         [&](const RPCHelpMan& self, const JSONRPCRequest& request) -> UniValue
 {
@@ -1673,7 +1673,7 @@ static RPCHelpMan protx_listdiff()
                                 {RPCResult::Type::STR_HEX, "protx", "ProTx of removed masternode"},
                             },
                         },
-                        {RPCResult::Type::ARR, "addedMNs", "added masternodes",
+                        {RPCResult::Type::ARR, "updatedMNs", "updated masternodes",
                             {
                                 {RPCResult::Type::OBJ, "", "",
                                 {
diff --git a/src/rpc/governance.cpp b/src/rpc/governance.cpp
index 2905cb296e83..5c75502cf3c6 100644
--- a/src/rpc/governance.cpp
+++ b/src/rpc/governance.cpp
@@ -174,9 +174,7 @@ static RPCHelpMan gobject_prepare()
             {"outputHash", RPCArg::Type::STR_HEX, RPCArg::Default{""}, "the single output to submit the proposal fee from"},
             {"outputIndex", RPCArg::Type::NUM, RPCArg::Default{0}, "The output index."},
         },
-        {
-            RPCResult{"if object valid", RPCResult::Type::STR, "", "serialized governance object"},
-        },
+        {RPCResult{"if object valid", RPCResult::Type::STR, "", "The collateral transaction id (txid)"}},
         RPCExamples{""},
         [&](const RPCHelpMan& self, const JSONRPCRequest& request) -> UniValue
 {
@@ -735,7 +733,7 @@ static RPCHelpMan gobject_list_helper(const bool make_a_diff)
                 },
             },
             RPCResult{"if request is invalid",
-                RPCResult::Type::STR_HEX, "", "Error string"
+                RPCResult::Type::STR, "", "Error string"
             },
         },
         RPCExamples{""},
diff --git a/src/rpc/masternode.cpp b/src/rpc/masternode.cpp
index bc683e83911c..9a07a54f41b7 100644
--- a/src/rpc/masternode.cpp
+++ b/src/rpc/masternode.cpp
@@ -50,7 +50,7 @@ static RPCHelpMan masternode_connect()
             {"v2transport", RPCArg::Type::BOOL, RPCArg::DefaultHint{"set by -v2transport"}, "Attempt to connect using BIP324 v2 transport protocol"},
         },
         RPCResult{
-            RPCResult::Type::STR, "status", "Returns 'successfully connected' if succeed"
+            RPCResult::Type::STR, "status", "Returns 'successfully connected' if successful"
         },
         RPCExamples{""},
         [&](const RPCHelpMan& self, const JSONRPCRequest& request) -> UniValue
@@ -90,20 +90,20 @@ static RPCHelpMan masternode_count()
         RPCResult{
             RPCResult::Type::OBJ, "", "",
             {
-                {RPCResult::Type::NUM, "total", "Total amount Masternodes"},
-                {RPCResult::Type::NUM, "enabled", "Amount of enabled Masternodes"},
-                {RPCResult::Type::OBJ, "details", "Amount of enabled Masternodes",
+                {RPCResult::Type::NUM, "total", "Total number of Masternodes"},
+                {RPCResult::Type::NUM, "enabled", "Number of enabled Masternodes"},
+                {RPCResult::Type::OBJ, "details", "Breakdown of masternodes by type",
                     {{RPCResult::Type::OBJ, "", "",
                     {
                         {RPCResult::Type::OBJ, "regular", "Details for regular masternodes",
                             {
-                                {RPCResult::Type::NUM, "total", "Total amount regular Masternodes"},
-                                {RPCResult::Type::NUM, "enabled", "Amount of enabled regular Masternodes"}
+                                {RPCResult::Type::NUM, "total", "Total number of regular Masternodes"},
+                                {RPCResult::Type::NUM, "enabled", "Number of enabled regular Masternodes"}
                         }},
                         {RPCResult::Type::OBJ, "evo", "Details for Evo nodes",
                             {
-                                {RPCResult::Type::NUM, "total", "Total amount Evo nodes"},
-                                {RPCResult::Type::NUM, "enabled", "Amount of enabled Evo nodes"}
+                                {RPCResult::Type::NUM, "total", "Total number of Evo nodes"},
+                                {RPCResult::Type::NUM, "enabled", "Number of enabled Evo nodes"}
                         }},
                     }},
                     }}
diff --git a/src/rpc/quorums.cpp b/src/rpc/quorums.cpp
index f287c0c805a5..af89f33789cd 100644
--- a/src/rpc/quorums.cpp
+++ b/src/rpc/quorums.cpp
@@ -780,10 +780,9 @@ static RPCHelpMan quorum_selectquorum()
             RPCResult::Type::OBJ, "", "",
             {
                 {RPCResult::Type::STR_HEX, "quorumHash", "Hash of chosen quorum"},
-/*                {RPCResult::Type::ARR, "recoveryMembers", "list of members to do sig recovery",
-                        {RPCResult::Type::STR_HEX, "hash", "protx hash of member"}
+                {RPCResult::Type::ARR, "recoveryMembers", "List of members to use for signature recovery",
+                    {{RPCResult::Type::STR_HEX, "hash", "ProTxHash of member"}}
                 },
-                */
             }
         },
         RPCExamples{""},

From 690ff3ad8fa9c788ad56f7e9a3b8443141ad62fe Mon Sep 17 00:00:00 2001
From: Konstantin Akimov <knstqq@gmail.com>
Date: Mon, 20 Oct 2025 15:21:38 +0700
Subject: [PATCH 173/656] fix: apply suggestions from code review

Co-authored-by: UdjinM6 <UdjinM6@users.noreply.github.com>
Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>
---
 src/rpc/governance.cpp | 21 +++++----------------
 src/rpc/masternode.cpp |  4 ++--
 2 files changed, 7 insertions(+), 18 deletions(-)

diff --git a/src/rpc/governance.cpp b/src/rpc/governance.cpp
index 5c75502cf3c6..6ff3bb60d001 100644
--- a/src/rpc/governance.cpp
+++ b/src/rpc/governance.cpp
@@ -84,18 +84,7 @@ static RPCHelpMan gobject_deserialize()
         {
             {"hex_data", RPCArg::Type::STR_HEX, RPCArg::Optional::NO, "data in hex string form"},
         },
-        {
-            RPCResult{
-                RPCResult::Type::OBJ, "", "Deserialized governance object",
-                {
-                    // TODO: list fields of output for RPC help instead ELISION
-                    {RPCResult::Type::ELISION, "", ""}
-                }
-            },
-            RPCResult{"for mode = all",
-                RPCResult::Type::STR, "", "The transaction hash in hex"
-            },
-        },
+        RPCResult{RPCResult::Type::STR, "", "JSON string of the deserialized governance object"},
         RPCExamples{""},
         [&](const RPCHelpMan& self, const JSONRPCRequest& request) -> UniValue
 {
@@ -174,7 +163,7 @@ static RPCHelpMan gobject_prepare()
             {"outputHash", RPCArg::Type::STR_HEX, RPCArg::Default{""}, "the single output to submit the proposal fee from"},
             {"outputIndex", RPCArg::Type::NUM, RPCArg::Default{0}, "The output index."},
         },
-        {RPCResult{"if object valid", RPCResult::Type::STR, "", "The collateral transaction id (txid)"}},
+        {RPCResult{"if object valid", RPCResult::Type::STR_HEX, "", "The collateral transaction id (txid)"}},
         RPCExamples{""},
         [&](const RPCHelpMan& self, const JSONRPCRequest& request) -> UniValue
 {
@@ -341,7 +330,7 @@ static RPCHelpMan gobject_submit()
             {"data-hex", RPCArg::Type::STR_HEX, RPCArg::Optional::NO, "data in hex string form"},
             {"fee-txid", RPCArg::Type::STR_HEX, RPCArg::Optional::NO, "txid of the corresponding proposal fee transaction"},
         },
-        RPCResult{RPCResult::Type::STR_HEX, "data", "A string that is serialized, hex-encoded data for the gobject"},
+        RPCResult{RPCResult::Type::STR_HEX, "hash", "Hash of the submitted governance object"},
         RPCExamples{""},
         [&](const RPCHelpMan& self, const JSONRPCRequest& request) -> UniValue
 {
@@ -886,9 +875,9 @@ static RPCHelpMan gobject_getcurrentvotes()
             {"vout", RPCArg::Type::STR, RPCArg::Default{""}, "masternode collateral output index, required if <txid> present"},
         },
         RPCResult{
-            RPCResult::Type::OBJ, "", "Map with governance votes",
+            RPCResult::Type::OBJ_DYN, "", "Keys are hashes of vote, values are votes",
             {
-                {RPCResult::Type::STR, "votehash", "Human-friendly presentation of vote"},
+                {RPCResult::Type::STR, "votes", "Human-friendly presentation of vote"},
             },
         },
         RPCExamples{""},
diff --git a/src/rpc/masternode.cpp b/src/rpc/masternode.cpp
index 9a07a54f41b7..c516f6f4151e 100644
--- a/src/rpc/masternode.cpp
+++ b/src/rpc/masternode.cpp
@@ -262,9 +262,9 @@ static RPCHelpMan masternode_winners()
             {"filter", RPCArg::Type::STR, RPCArg::Default{""}, "filter for returned winners"},
         },
         RPCResult{
-            RPCResult::Type::OBJ, "", "Details about a specific deterministic masternode",
+            RPCResult::Type::OBJ_DYN, "", "Keys are block heights (as strings); values describe the payees for that height",
             {
-                {RPCResult::Type::STR, "height", "payment string"}
+                {RPCResult::Type::STR, "payee", "Payee for the height"}
             }
         },
         RPCExamples{""},

From 54563547c397154b61c8ab09001de08fb694a7af Mon Sep 17 00:00:00 2001
From: UdjinM6 <UdjinM6@users.noreply.github.com>
Date: Mon, 20 Oct 2025 14:30:38 +0300
Subject: [PATCH 174/656] fix: trivial safety belt

---
 src/instantsend/instantsend.cpp | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/instantsend/instantsend.cpp b/src/instantsend/instantsend.cpp
index f2d186a27b5f..34537ffb64c8 100644
--- a/src/instantsend/instantsend.cpp
+++ b/src/instantsend/instantsend.cpp
@@ -44,10 +44,12 @@ Uint256HashSet GetIdsFromLockable(const std::vector<T>& vec)
     if (vec.empty()) return ret;
     ret.reserve(vec.size());
     for (const auto& in : vec) {
-        if constexpr (std::is_same_v<T, CTxIn>) {
+        if constexpr (std::is_same_v<T, COutPoint>) {
+            ret.emplace(instantsend::GenInputLockRequestId(in));
+        } else if constexpr (std::is_same_v<T, CTxIn>) {
             ret.emplace(instantsend::GenInputLockRequestId(in.prevout));
         } else {
-            ret.emplace(instantsend::GenInputLockRequestId(in));
+            assert(false);
         }
     }
     return ret;

From a8506ec2be4c5e2137d165b478d6575787c4b08b Mon Sep 17 00:00:00 2001
From: UdjinM6 <UdjinM6@users.noreply.github.com>
Date: Mon, 20 Oct 2025 14:42:47 +0300
Subject: [PATCH 175/656] test: add tests for `inlock` id generation

---
 src/test/evo_islock_tests.cpp | 102 ++++++++++++++++++++++++++++++++++
 1 file changed, 102 insertions(+)

diff --git a/src/test/evo_islock_tests.cpp b/src/test/evo_islock_tests.cpp
index eb6767b6216d..7dc76475941d 100644
--- a/src/test/evo_islock_tests.cpp
+++ b/src/test/evo_islock_tests.cpp
@@ -107,4 +107,106 @@ BOOST_AUTO_TEST_CASE(deserialize_instantlock_from_realdata2)
     BOOST_CHECK_EQUAL(islock.sig.Get().ToString(), expectedSignatureStr);
 }
 
+BOOST_AUTO_TEST_CASE(geninputlockrequestid_basic)
+{
+    // Test that GenInputLockRequestId generates consistent hashes for the same outpoint
+    const uint256 txHash = uint256S("0x1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef");
+    const uint32_t outputIndex = 5;
+
+    COutPoint outpoint1(txHash, outputIndex);
+    COutPoint outpoint2(txHash, outputIndex);
+
+    // Same outpoints should produce identical request IDs
+    const uint256 requestId1 = instantsend::GenInputLockRequestId(outpoint1);
+    const uint256 requestId2 = instantsend::GenInputLockRequestId(outpoint2);
+
+    BOOST_CHECK(requestId1 == requestId2);
+    BOOST_CHECK(!requestId1.IsNull());
+}
+
+BOOST_AUTO_TEST_CASE(geninputlockrequestid_different_outpoints)
+{
+    // Test that different outpoints produce different request IDs
+    const uint256 txHash1 = uint256S("0x1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef");
+    const uint256 txHash2 = uint256S("0xfedcba0987654321fedcba0987654321fedcba0987654321fedcba0987654321");
+
+    COutPoint outpoint1(txHash1, 0);
+    COutPoint outpoint2(txHash2, 0);
+    COutPoint outpoint3(txHash1, 1); // Same hash, different index
+
+    const uint256 requestId1 = instantsend::GenInputLockRequestId(outpoint1);
+    const uint256 requestId2 = instantsend::GenInputLockRequestId(outpoint2);
+    const uint256 requestId3 = instantsend::GenInputLockRequestId(outpoint3);
+
+    // All should be different
+    BOOST_CHECK(requestId1 != requestId2);
+    BOOST_CHECK(requestId1 != requestId3);
+    BOOST_CHECK(requestId2 != requestId3);
+}
+
+BOOST_AUTO_TEST_CASE(geninputlockrequestid_only_outpoint_matters)
+{
+    // Critical test: Verify that only the COutPoint is hashed, not scriptSig or nSequence
+    // This validates the fix where CTxIn was incorrectly used before
+    const uint256 txHash = uint256S("0xabcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890");
+    const uint32_t outputIndex = 3;
+
+    COutPoint outpoint(txHash, outputIndex);
+
+    // Create two CTxIn objects with the same prevout but different scriptSig and nSequence
+    CTxIn txin1;
+    txin1.prevout = outpoint;
+    txin1.scriptSig = CScript() << OP_1 << OP_2;
+    txin1.nSequence = 0xFFFFFFFF;
+
+    CTxIn txin2;
+    txin2.prevout = outpoint;
+    txin2.scriptSig = CScript() << OP_3 << OP_4 << OP_5; // Different scriptSig
+    txin2.nSequence = 0x12345678;                        // Different nSequence
+
+    // The request IDs should be identical because they share the same prevout (COutPoint)
+    const uint256 requestId1 = instantsend::GenInputLockRequestId(txin1.prevout);
+    const uint256 requestId2 = instantsend::GenInputLockRequestId(txin2.prevout);
+
+    BOOST_CHECK(requestId1 == requestId2);
+
+    // Also verify against the direct outpoint
+    const uint256 requestId3 = instantsend::GenInputLockRequestId(outpoint);
+    BOOST_CHECK(requestId1 == requestId3);
+}
+
+BOOST_AUTO_TEST_CASE(geninputlockrequestid_serialization_format)
+{
+    // Test that the serialization format is: SerializeHash(pair("inlock", outpoint))
+    const uint256 txHash = uint256S("0x0000000000000000000000000000000000000000000000000000000000000001");
+    const uint32_t outputIndex = 0;
+
+    COutPoint outpoint(txHash, outputIndex);
+
+    // Calculate the expected hash manually
+    const uint256 expectedHash = ::SerializeHash(std::make_pair(std::string_view("inlock"), outpoint));
+
+    // Get the actual hash from the function
+    const uint256 actualHash = instantsend::GenInputLockRequestId(outpoint);
+
+    BOOST_CHECK(actualHash == expectedHash);
+}
+
+BOOST_AUTO_TEST_CASE(geninputlockrequestid_edge_cases)
+{
+    // Test edge cases: null hash, max index
+    COutPoint nullOutpoint(uint256(), 0);
+    COutPoint maxIndexOutpoint(uint256::ONE, COutPoint::NULL_INDEX);
+
+    const uint256 nullRequestId = instantsend::GenInputLockRequestId(nullOutpoint);
+    const uint256 maxIndexRequestId = instantsend::GenInputLockRequestId(maxIndexOutpoint);
+
+    // Both should produce valid (non-null) request IDs
+    BOOST_CHECK(!nullRequestId.IsNull());
+    BOOST_CHECK(!maxIndexRequestId.IsNull());
+
+    // And they should be different from each other
+    BOOST_CHECK(nullRequestId != maxIndexRequestId);
+}
+
 BOOST_AUTO_TEST_SUITE_END()

From 928ead87fa3d3d9ef08b931230208cbefa068641 Mon Sep 17 00:00:00 2001
From: MacroFake <falke.marco@gmail.com>
Date: Wed, 8 Jun 2022 07:51:58 +0200
Subject: [PATCH 176/656] Merge bitcoin/bitcoin#25298: doc: Fix command in
 "OpenBSD Build Guide"

b1f662b859ff4e8f28ede49a0ab2589920de9726 doc: Fix command in "OpenBSD Build Guide" (Hennadii Stepanov)

Pull request description:

  Fixed `pkg_add sqlite3` command.

ACKs for top commit:
  theStack:
    ACK b1f662b859ff4e8f28ede49a0ab2589920de9726

Tree-SHA512: b1dd1baa238f76dadfb188b46bc72f993cc88ea4651cf0836cd85348429baa15228e9cd4c15e588675c9f340692118952302a8629f45d7dc275cc086917c11ca
---
 doc/build-openbsd.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/build-openbsd.md b/doc/build-openbsd.md
index 8ebcb68ed24b..efdabae92f19 100644
--- a/doc/build-openbsd.md
+++ b/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

From 47e5043261bc30fbff25cf6d06d2300fe92a4fce Mon Sep 17 00:00:00 2001
From: MacroFake <falke.marco@gmail.com>
Date: Mon, 27 Jun 2022 14:50:40 +0200
Subject: [PATCH 177/656] Merge bitcoin/bitcoin#25445: test: Return new_utxo
 from create_self_transfer in MiniWallet
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

fa83c0c44ff2072f7c3e56000edc805321bcf41a test: Remove unused call to generate in rpc_mempool_info (MacroFake)
fa13375aa3fcb4fd5b9e0d4c69ac31cf66c3209a test: Sync MiniWallet utxo state after each generate call (MacroFake)
dddd7c4d390f54c5528986716c7c4089c4652ae9 test: Drop spent utxos in MiniWallet scan_tx (MacroFake)
fa04ff61b6c209e48bce7d581466356e84617637 test: Return new_utxos from create_self_transfer_multi in MiniWallet (MacroFake)
fa34e44e98d3840fa79533fec512c80e9e1d3ea1 test: Return new_utxo from create_self_transfer in MiniWallet (MacroFake)

Pull request description:

  I need this for some stuff, but it also makes sense on its own to:

  * unify the flow with a private `_create_utxo` helper
  * simplify the flow by giving the caller ownership of the utxo right away

ACKs for top commit:
  kouloumos:
    re-ACK fa83c0c44ff2072f7c3e56000edc805321bcf41a 🚀

Tree-SHA512: 381f0e814864ba207363a56859a6c0519e4a86d0562927f16a610a5b706c9fc942c1b5e93388cda0fa0b3cacd58f55bc2ffcc60355858a580263e5bef33c2f4b
---
 test/functional/feature_dbcrash.py        | 3 +--
 test/functional/feature_fee_estimation.py | 3 ++-
 test/functional/rpc_mempool_info.py       | 2 --
 3 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/test/functional/feature_dbcrash.py b/test/functional/feature_dbcrash.py
index dd8230f3a1f1..1607c9a45295 100755
--- a/test/functional/feature_dbcrash.py
+++ b/test/functional/feature_dbcrash.py
@@ -196,9 +196,8 @@ def generate_small_transactions(self, node, count, utxo_list):
                 from_node=node,
                 utxos_to_spend=utxos_to_spend,
                 num_outputs=3,
-                fee_per_output=FEE // 3
+                fee_per_output=FEE // 3,
             )
-
             num_transactions += 1
 
     def run_test(self):
diff --git a/test/functional/feature_fee_estimation.py b/test/functional/feature_fee_estimation.py
index c9fc12470fb7..d8f3c535e32b 100755
--- a/test/functional/feature_fee_estimation.py
+++ b/test/functional/feature_fee_estimation.py
@@ -51,7 +51,8 @@ def small_txpuzzle_randfee(
         raise RuntimeError(f"Insufficient funds: need {amount + fee}, have {total_in}")
     tx = wallet.create_self_transfer_multi(
         utxos_to_spend=utxos_to_spend,
-        fee_per_output=0)["tx"]
+        fee_per_output=0,
+    )["tx"]
     tx.vout[0].nValue = int((total_in - amount - fee) * COIN)
     tx.vout.append(deepcopy(tx.vout[0]))
     tx.vout[1].nValue = int(amount * COIN)
diff --git a/test/functional/rpc_mempool_info.py b/test/functional/rpc_mempool_info.py
index cd7a48d387ea..9b5a3b91123f 100755
--- a/test/functional/rpc_mempool_info.py
+++ b/test/functional/rpc_mempool_info.py
@@ -4,7 +4,6 @@
 # file COPYING or http://www.opensource.org/licenses/mit-license.php.
 """Test RPCs that retrieve information from the mempool."""
 
-from test_framework.blocktools import COINBASE_MATURITY
 from test_framework.test_framework import BitcoinTestFramework
 from test_framework.util import (
     assert_equal,
@@ -19,7 +18,6 @@ def set_test_params(self):
 
     def run_test(self):
         self.wallet = MiniWallet(self.nodes[0])
-        self.generate(self.wallet, COINBASE_MATURITY + 1)
         self.wallet.rescan_utxos()
         confirmed_utxo = self.wallet.get_utxo()
 

From 080d4b2f0ab627265e218fd755261edf203d3811 Mon Sep 17 00:00:00 2001
From: Kittywhiskers Van Gogh <63189531+kwvg@users.noreply.github.com>
Date: Thu, 16 Oct 2025 01:18:45 +0530
Subject: [PATCH 178/656] docs: remove extra Berkeley DB fragment in
 `build-osx.md`

This section should've been gone with bitcoin#21343 (ddc6fca7f3 in
dash#6114)
---
 doc/build-osx.md | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/doc/build-osx.md b/doc/build-osx.md
index 3a9d7f0e92be..1793a4a6f85d 100644
--- a/doc/build-osx.md
+++ b/doc/build-osx.md
@@ -211,17 +211,6 @@ Additionally, this explicitly disables the GUI.
 ./autogen.sh
 ./configure --with-gui=no
 ```
-
-###### Berkeley DB
-
-It is recommended to use Berkeley DB 4.8. If you have to build it yourself,
-you can use [the installation script included in contrib/](contrib/install_db4.sh)
-like so:
-
-```shell
-./contrib/install_db4.sh .
-```
-
 ##### Wallet (only SQlite) and GUI Support:
 
 This explicitly enables the GUI and disables legacy wallet support.

From 2ca99848a40436d50e3829de57458847bebd4c3c Mon Sep 17 00:00:00 2001
From: Kittywhiskers Van Gogh <63189531+kwvg@users.noreply.github.com>
Date: Wed, 16 Mar 2022 12:25:01 +0000
Subject: [PATCH 179/656] merge bitcoin#24585: mention that BDB is for the
 legacy wallet in build-osx.md

---
 doc/build-osx.md    | 24 ++++++++----------------
 doc/dependencies.md |  2 +-
 2 files changed, 9 insertions(+), 17 deletions(-)

diff --git a/doc/build-osx.md b/doc/build-osx.md
index 1793a4a6f85d..318346cf6bc6 100644
--- a/doc/build-osx.md
+++ b/doc/build-osx.md
@@ -79,29 +79,21 @@ git clone https://github.com/dashpay/dash.git
 #### Wallet Dependencies
 
 It is not necessary to build wallet functionality to run `dashd` or  `dash-qt`.
-To enable legacy wallets, you must install `berkeley-db@4`.
-To enable [descriptor wallets](https://github.com/dashpay/dash/blob/master/doc/descriptors.md), `sqlite` is required.
-Skip `berkeley-db@4` if you intend to *exclusively* use descriptor wallets.
 
-###### Legacy Wallet Support
+###### Descriptor Wallet Support
 
-`berkeley-db@4` is required to enable support for legacy wallets.
-Skip if you don't intend to use legacy wallets.
+`sqlite` is required to support for descriptor wallets.
 
-``` bash
-brew install berkeley-db@4
-```
+macOS ships with a useable `sqlite` package, meaning you don't need to
+install anything.
 
-###### Descriptor Wallet Support
-
-Note: Apple has included a useable `sqlite` package since macOS 10.14.
-You may not need to install this package.
+###### Legacy Wallet Support
 
-`sqlite` is required to enable support for descriptor wallets.
-Skip if you don't intend to use descriptor wallets.
+`berkeley-db@4` is only required to support for legacy wallets.
+Skip if you don't intend to use legacy wallets.
 
 ``` bash
-brew install sqlite
+brew install berkeley-db@4
 ```
 ---
 
diff --git a/doc/dependencies.md b/doc/dependencies.md
index cef8516ac5ab..e16bf1705095 100644
--- a/doc/dependencies.md
+++ b/doc/dependencies.md
@@ -4,7 +4,7 @@ These are the dependencies used by Dash Core.
 You can find installation instructions in the `build-*.md` file for your platform.
 "Runtime" and "Version Used" are both in reference to the release binaries.
 
-| Compiler | Minimum required |
+| Dependency | Minimum required |
 | --- | --- |
 | [Autoconf](https://www.gnu.org/software/autoconf/) | [2.69](https://github.com/bitcoin/bitcoin/pull/17769) |
 | [Automake](https://www.gnu.org/software/automake/) | [1.13](https://github.com/bitcoin/bitcoin/pull/18290) |

From f3f2fd311758f9be5e01b98107110d90b0e09a34 Mon Sep 17 00:00:00 2001
From: Kittywhiskers Van Gogh <63189531+kwvg@users.noreply.github.com>
Date: Thu, 16 Oct 2025 01:22:14 +0530
Subject: [PATCH 180/656] doc: update disclaimer in `build-netbsd.md`

The disclaimer needs to be more generic because
* libbacktrace is an *optional* dependency if `--enable-stacktraces=no`
  is passed during configuration
* `dashpay/bls-signatures` was made in-tree with dash#5077
---
 doc/build-netbsd.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/build-netbsd.md b/doc/build-netbsd.md
index 9e02d9195640..86f72e1096e4 100644
--- a/doc/build-netbsd.md
+++ b/doc/build-netbsd.md
@@ -4,7 +4,7 @@ Updated for NetBSD [9.2](https://netbsd.org/releases/formal-9/NetBSD-9.2.html).
 
 This guide describes how to build dashd, command-line utilities, and GUI on NetBSD.
 
-**This guide has not been tested for building Dash Core and is expected to fail due to missing `bls_dash` and `backtrace`. Please report your results; contributions welcome.**
+**This guide has not been tested for building Dash Core and may fail. Please report your results; contributions welcome.**
 
 ## Preparation
 

From 12e04f5fc5107e5cd600bce6588bdac4682f3b67 Mon Sep 17 00:00:00 2001
From: Kittywhiskers Van Gogh <63189531+kwvg@users.noreply.github.com>
Date: Mon, 20 Oct 2025 19:36:23 +0530
Subject: [PATCH 181/656] merge bitcoin#26834: remove install_db4.sh

---
 Makefile.am            |   1 -
 contrib/install_db4.sh | 259 -----------------------------------------
 depends/README.md      |   2 +
 doc/build-openbsd.md   |   8 +-
 doc/build-unix.md      |  22 ++--
 5 files changed, 20 insertions(+), 272 deletions(-)
 delete mode 100755 contrib/install_db4.sh

diff --git a/Makefile.am b/Makefile.am
index ad1c903f1acb..0631f2e839dd 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -41,7 +41,6 @@ OSX_PLIST=$(top_builddir)/share/qt/Info.plist #not installed
 
 DIST_CONTRIB = \
            $(top_srcdir)/contrib/debian/copyright \
-           $(top_srcdir)/contrib/install_db4.sh \
            $(top_srcdir)/test/sanitizer_suppressions/lsan \
            $(top_srcdir)/test/sanitizer_suppressions/tsan \
            $(top_srcdir)/test/sanitizer_suppressions/ubsan \
diff --git a/contrib/install_db4.sh b/contrib/install_db4.sh
deleted file mode 100755
index 352e7e1a0c72..000000000000
--- a/contrib/install_db4.sh
+++ /dev/null
@@ -1,259 +0,0 @@
-#!/bin/sh
-# Copyright (c) 2017-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.
-
-# Install libdb4.8 (Berkeley DB).
-
-export LC_ALL=C
-set -e
-
-if [ -z "${1}" ]; then
-  echo "Usage: $0 <base-dir> [<extra-bdb-configure-flag> ...]"
-  echo
-  echo "Must specify a single argument: the directory in which db4 will be built."
-  echo "This is probably \`pwd\` if you're at the root of the dash repository."
-  exit 1
-fi
-
-expand_path() {
-  cd "${1}" && pwd -P
-}
-
-BDB_PREFIX="$(expand_path "${1}")/db4"; shift;
-BDB_VERSION='db-4.8.30.NC'
-BDB_HASH='12edc0df75bf9abd7f82f821795bcee50f42cb2e5f76a6a281b85732798364ef'
-BDB_URL="https://download.oracle.com/berkeley-db/${BDB_VERSION}.tar.gz"
-
-check_exists() {
-  command -v "$1" >/dev/null
-}
-
-sha256_check() {
-  # Args: <sha256_hash> <filename>
-  #
-  if [ "$(uname)" = "FreeBSD" ]; then
-    # sha256sum exists on FreeBSD, but takes different arguments than the GNU version
-    sha256 -c "${1}" "${2}"
-  elif check_exists sha256sum; then
-    echo "${1} ${2}" | sha256sum -c
-  elif check_exists sha256; then
-    echo "${1} ${2}" | sha256 -c
-  else
-    echo "${1} ${2}" | shasum -a 256 -c
-  fi
-}
-
-http_get() {
-  # Args: <url> <filename> <sha256_hash>
-  #
-  # It's acceptable that we don't require SSL here because we manually verify
-  # content hashes below.
-  #
-  if [ -f "${2}" ]; then
-    echo "File ${2} already exists; not downloading again"
-  elif check_exists curl; then
-    curl --insecure --retry 5 "${1}" -o "${2}"
-  elif check_exists wget; then
-    wget --no-check-certificate "${1}" -O "${2}"
-  else
-    echo "Simple transfer utilities 'curl' and 'wget' not found. Please install one of them and try again."
-    exit 1
-  fi
-
-  sha256_check "${3}" "${2}"
-}
-
-# Ensure the commands we use exist on the system
-if ! check_exists patch; then
-    echo "Command-line tool 'patch' not found. Install patch and try again."
-    exit 1
-fi
-
-mkdir -p "${BDB_PREFIX}"
-http_get "${BDB_URL}" "${BDB_VERSION}.tar.gz" "${BDB_HASH}"
-tar -xzvf ${BDB_VERSION}.tar.gz -C "$BDB_PREFIX"
-cd "${BDB_PREFIX}/${BDB_VERSION}/"
-
-# Apply a patch necessary when building with clang and c++11 (see https://community.oracle.com/thread/3952592)
-patch --ignore-whitespace -p1 << 'EOF'
-commit 3311d68f11d1697565401eee6efc85c34f022ea7
-Author: fanquake <fanquake@gmail.com>
-Date:   Mon Aug 17 20:03:56 2020 +0800
-
-    Fix C++11 compatibility
-
-diff --git a/dbinc/atomic.h b/dbinc/atomic.h
-index 0034dcc..7c11d4a 100644
---- a/dbinc/atomic.h
-+++ b/dbinc/atomic.h
-@@ -70,7 +70,7 @@ typedef struct {
-  * These have no memory barriers; the caller must include them when necessary.
-  */
- #define	atomic_read(p)		((p)->value)
--#define	atomic_init(p, val)	((p)->value = (val))
-+#define	atomic_init_db(p, val)	((p)->value = (val))
-
- #ifdef HAVE_ATOMIC_SUPPORT
-
-@@ -144,7 +144,7 @@ typedef LONG volatile *interlocked_val;
- #define	atomic_inc(env, p)	__atomic_inc(p)
- #define	atomic_dec(env, p)	__atomic_dec(p)
- #define	atomic_compare_exchange(env, p, o, n)	\
--	__atomic_compare_exchange((p), (o), (n))
-+	__atomic_compare_exchange_db((p), (o), (n))
- static inline int __atomic_inc(db_atomic_t *p)
- {
- 	int	temp;
-@@ -176,7 +176,7 @@ static inline int __atomic_dec(db_atomic_t *p)
-  * http://gcc.gnu.org/onlinedocs/gcc-4.1.0/gcc/Atomic-Builtins.html
-  * which configure could be changed to use.
-  */
--static inline int __atomic_compare_exchange(
-+static inline int __atomic_compare_exchange_db(
- 	db_atomic_t *p, atomic_value_t oldval, atomic_value_t newval)
- {
- 	atomic_value_t was;
-@@ -206,7 +206,7 @@ static inline int __atomic_compare_exchange(
- #define	atomic_dec(env, p)	(--(p)->value)
- #define	atomic_compare_exchange(env, p, oldval, newval)		\
- 	(DB_ASSERT(env, atomic_read(p) == (oldval)),		\
--	atomic_init(p, (newval)), 1)
-+	atomic_init_db(p, (newval)), 1)
- #else
- #define atomic_inc(env, p)	__atomic_inc(env, p)
- #define atomic_dec(env, p)	__atomic_dec(env, p)
-diff --git a/mp/mp_fget.c b/mp/mp_fget.c
-index 5fdee5a..0b75f57 100644
---- a/mp/mp_fget.c
-+++ b/mp/mp_fget.c
-@@ -617,7 +617,7 @@ alloc:		/* Allocate a new buffer header and data space. */
-
- 		/* Initialize enough so we can call __memp_bhfree. */
- 		alloc_bhp->flags = 0;
--		atomic_init(&alloc_bhp->ref, 1);
-+		atomic_init_db(&alloc_bhp->ref, 1);
- #ifdef DIAGNOSTIC
- 		if ((uintptr_t)alloc_bhp->buf & (sizeof(size_t) - 1)) {
- 			__db_errx(env,
-@@ -911,7 +911,7 @@ alloc:		/* Allocate a new buffer header and data space. */
- 			MVCC_MPROTECT(bhp->buf, mfp->stat.st_pagesize,
- 			    PROT_READ);
-
--		atomic_init(&alloc_bhp->ref, 1);
-+		atomic_init_db(&alloc_bhp->ref, 1);
- 		MUTEX_LOCK(env, alloc_bhp->mtx_buf);
- 		alloc_bhp->priority = bhp->priority;
- 		alloc_bhp->pgno = bhp->pgno;
-diff --git a/mp/mp_mvcc.c b/mp/mp_mvcc.c
-index 34467d2..f05aa0c 100644
---- a/mp/mp_mvcc.c
-+++ b/mp/mp_mvcc.c
-@@ -276,7 +276,7 @@ __memp_bh_freeze(dbmp, infop, hp, bhp, need_frozenp)
- #else
- 	memcpy(frozen_bhp, bhp, SSZA(BH, buf));
- #endif
--	atomic_init(&frozen_bhp->ref, 0);
-+	atomic_init_db(&frozen_bhp->ref, 0);
- 	if (mutex != MUTEX_INVALID)
- 		frozen_bhp->mtx_buf = mutex;
- 	else if ((ret = __mutex_alloc(env, MTX_MPOOL_BH,
-@@ -428,7 +428,7 @@ __memp_bh_thaw(dbmp, infop, hp, frozen_bhp, alloc_bhp)
- #endif
- 		alloc_bhp->mtx_buf = mutex;
- 		MUTEX_LOCK(env, alloc_bhp->mtx_buf);
--		atomic_init(&alloc_bhp->ref, 1);
-+		atomic_init_db(&alloc_bhp->ref, 1);
- 		F_CLR(alloc_bhp, BH_FROZEN);
- 	}
-
-diff --git a/mp/mp_region.c b/mp/mp_region.c
-index e6cece9..ddbe906 100644
---- a/mp/mp_region.c
-+++ b/mp/mp_region.c
-@@ -224,7 +224,7 @@ __memp_init(env, dbmp, reginfo_off, htab_buckets, max_nreg)
- 			     MTX_MPOOL_FILE_BUCKET, 0, &htab[i].mtx_hash)) != 0)
- 				return (ret);
- 			SH_TAILQ_INIT(&htab[i].hash_bucket);
--			atomic_init(&htab[i].hash_page_dirty, 0);
-+			atomic_init_db(&htab[i].hash_page_dirty, 0);
- 		}
-
- 		/*
-@@ -269,7 +269,7 @@ __memp_init(env, dbmp, reginfo_off, htab_buckets, max_nreg)
- 		hp->mtx_hash = (mtx_base == MUTEX_INVALID) ? MUTEX_INVALID :
- 		    mtx_base + i;
- 		SH_TAILQ_INIT(&hp->hash_bucket);
--		atomic_init(&hp->hash_page_dirty, 0);
-+		atomic_init_db(&hp->hash_page_dirty, 0);
- #ifdef HAVE_STATISTICS
- 		hp->hash_io_wait = 0;
- 		hp->hash_frozen = hp->hash_thawed = hp->hash_frozen_freed = 0;
-diff --git a/mutex/mut_method.c b/mutex/mut_method.c
-index 2588763..5c6d516 100644
---- a/mutex/mut_method.c
-+++ b/mutex/mut_method.c
-@@ -426,7 +426,7 @@ atomic_compare_exchange(env, v, oldval, newval)
- 	MUTEX_LOCK(env, mtx);
- 	ret = atomic_read(v) == oldval;
- 	if (ret)
--		atomic_init(v, newval);
-+		atomic_init_db(v, newval);
- 	MUTEX_UNLOCK(env, mtx);
-
- 	return (ret);
-diff --git a/mutex/mut_tas.c b/mutex/mut_tas.c
-index f3922e0..e40fcdf 100644
---- a/mutex/mut_tas.c
-+++ b/mutex/mut_tas.c
-@@ -46,7 +46,7 @@ __db_tas_mutex_init(env, mutex, flags)
-
- #ifdef HAVE_SHARED_LATCHES
- 	if (F_ISSET(mutexp, DB_MUTEX_SHARED))
--		atomic_init(&mutexp->sharecount, 0);
-+		atomic_init_db(&mutexp->sharecount, 0);
- 	else
- #endif
- 	if (MUTEX_INIT(&mutexp->tas)) {
-@@ -486,7 +486,7 @@ __db_tas_mutex_unlock(env, mutex)
- 			F_CLR(mutexp, DB_MUTEX_LOCKED);
- 			/* Flush flag update before zeroing count */
- 			MEMBAR_EXIT();
--			atomic_init(&mutexp->sharecount, 0);
-+			atomic_init_db(&mutexp->sharecount, 0);
- 		} else {
- 			DB_ASSERT(env, sharecount > 0);
- 			MEMBAR_EXIT();
-EOF
-
-# The packaged config.guess and config.sub are ancient (2009) and can cause build issues.
-# Replace them with modern versions.
-# See https://github.com/bitcoin/bitcoin/issues/16064
-CONFIG_GUESS_URL='https://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=4550d2f15b3a7ce2451c1f29500b9339430c877f'
-CONFIG_GUESS_HASH='c8f530e01840719871748a8071113435bdfdf75b74c57e78e47898edea8754ae'
-CONFIG_SUB_URL='https://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=4550d2f15b3a7ce2451c1f29500b9339430c877f'
-CONFIG_SUB_HASH='3969f7d5f6967ccc6f792401b8ef3916a1d1b1d0f0de5a4e354c95addb8b800e'
-
-rm -f "dist/config.guess"
-rm -f "dist/config.sub"
-
-http_get "${CONFIG_GUESS_URL}" dist/config.guess "${CONFIG_GUESS_HASH}"
-http_get "${CONFIG_SUB_URL}" dist/config.sub "${CONFIG_SUB_HASH}"
-
-cd build_unix/
-
-"${BDB_PREFIX}/${BDB_VERSION}/dist/configure" \
-  --enable-cxx --disable-shared --disable-replication --with-pic --prefix="${BDB_PREFIX}" \
-  "${@}"
-
-make install
-
-echo
-echo "db4 build complete."
-echo
-# shellcheck disable=SC2016
-echo 'When compiling dashd, run `./configure` in the following way:'
-echo
-echo "  export BDB_PREFIX='${BDB_PREFIX}'"
-# shellcheck disable=SC2016
-echo '  ./configure BDB_LIBS="-L${BDB_PREFIX}/lib -ldb_cxx-4.8" BDB_CFLAGS="-I${BDB_PREFIX}/include" ...'
diff --git a/depends/README.md b/depends/README.md
index 5d800ce06abf..dcafd548cc01 100644
--- a/depends/README.md
+++ b/depends/README.md
@@ -106,6 +106,8 @@ The following can be set when running make: `make FOO=bar`
 - `FALLBACK_DOWNLOAD_PATH`: If a source file can't be fetched, try here before giving up
 - `C_STANDARD`: Set the C standard version used. Defaults to `c11`.
 - `CXX_STANDARD`: Set the C++ standard version used. Defaults to `c++20`.
+- `NO_BOOST`: Don't download/build/cache Boost
+- `NO_LIBEVENT`: Don't download/build/cache Libevent
 - `NO_QT`: Don't download/build/cache Qt and its dependencies
 - `NO_QR`: Don't download/build/cache packages needed for enabling qrencode
 - `NO_ZMQ`: Don't download/build/cache packages needed for enabling ZeroMQ
diff --git a/doc/build-openbsd.md b/doc/build-openbsd.md
index 8ebcb68ed24b..24ccbe452571 100644
--- a/doc/build-openbsd.md
+++ b/doc/build-openbsd.md
@@ -43,16 +43,18 @@ pkg_add install sqlite3
 BerkeleyDB is only required to support legacy wallets.
 
 It is recommended to use Berkeley DB 4.8. You cannot use the BerkeleyDB library
-from ports. However you can build it yourself, [using the installation script included in contrib/](/contrib/install_db4.sh), like so, from the root of the repository.
+from ports. However you can build it yourself, [using depends](/depends).
 
 ```bash
-./contrib/install_db4.sh `pwd`
+gmake -C depends NO_BOOST=1 NO_LIBEVENT=1 NO_QT=1 NO_SQLITE=1 NO_NATPMP=1 NO_UPNP=1 NO_ZMQ=1 NO_USDT=1
+...
+to: /path/to/dash/depends/x86_64-unknown-openbsd
 ```
 
 Then set `BDB_PREFIX`:
 
 ```bash
-export BDB_PREFIX="$PWD/db4"
+export BDB_PREFIX="/path/to/dash/depends/x86_64-unknown-openbsd"
 ```
 
 #### GUI Dependencies
diff --git a/doc/build-unix.md b/doc/build-unix.md
index 0a6300557736..9d28ad8a16e3 100644
--- a/doc/build-unix.md
+++ b/doc/build-unix.md
@@ -236,17 +236,21 @@ Berkeley DB
 -----------
 
 The legacy wallet uses Berkeley DB. To ensure backwards compatibility it is
-recommended to use Berkeley DB 4.8. If you have to build it yourself, you can
-use [the installation script included in contrib/](/contrib/install_db4.sh)
-like so:
-
-```sh
-./contrib/install_db4.sh `pwd`
+recommended to use Berkeley DB 4.8. If you have to build it yourself, and don't
+want to use any other libraries built in depends, you can do:
+```bash
+make -C depends NO_BOOST=1 NO_LIBEVENT=1 NO_QT=1 NO_SQLITE=1 NO_NATPMP=1 NO_UPNP=1 NO_ZMQ=1 NO_USDT=1
+...
+to: /path/to/dash/depends/x86_64-pc-linux-gnu
 ```
+and configure using the following:
+```bash
+export BDB_PREFIX="/path/to/dash/depends/x86_64-pc-linux-gnu"
 
-from the root of the repository.
-
-Otherwise, you can build Dash Core from self-compiled [depends](/depends/README.md).
+./configure \
+    BDB_LIBS="-L${BDB_PREFIX}/lib -ldb_cxx-4.8" \
+    BDB_CFLAGS="-I${BDB_PREFIX}/include"
+```
 
 **Note**: You only need Berkeley DB if the legacy wallet is enabled (see [*Disable-wallet mode*](#disable-wallet-mode)).
 

From 2d2f22097663f7f4f4a9aead23bd44470bf4fb64 Mon Sep 17 00:00:00 2001
From: Kittywhiskers Van Gogh <63189531+kwvg@users.noreply.github.com>
Date: Mon, 20 Oct 2025 19:37:22 +0530
Subject: [PATCH 182/656] merge bitcoin#26773: FreeBSD build doc updates to
 reflect removal of install_db4.sh

---
 doc/build-freebsd.md | 35 ++++++++++++++++++++++++++---------
 1 file changed, 26 insertions(+), 9 deletions(-)

diff --git a/doc/build-freebsd.md b/doc/build-freebsd.md
index 06c1dd4387a0..1c937f1583a9 100644
--- a/doc/build-freebsd.md
+++ b/doc/build-freebsd.md
@@ -41,13 +41,30 @@ pkg install sqlite3
 ```
 
 ###### Legacy Wallet Support
-`db5` is only required to support legacy wallets.
-Skip if you don't intend to use legacy wallets.
+BerkeleyDB is only required if legacy wallet support is required.
+
+It is required to use Berkeley DB 4.8. You **cannot** use the BerkeleyDB library
+from ports. However, you can build DB 4.8 yourself [using depends](/depends).
 
-```bash
-pkg install db5
 ```
----
+gmake -C depends NO_BOOST=1 NO_LIBEVENT=1 NO_QT=1 NO_SQLITE=1 NO_NATPMP=1 NO_UPNP=1 NO_ZMQ=1 NO_USDT=1
+```
+
+When the build is complete, the Berkeley DB installation location will be displayed:
+
+```
+to: /path/to/dash/depends/x86_64-unknown-freebsd[release-number]
+```
+
+Finally, set `BDB_PREFIX` to this path according to your shell:
+
+```
+csh: setenv BDB_PREFIX [path displayed above]
+```
+
+```
+sh/bash: export BDB_PREFIX=[path displayed above]
+```
 
 #### GUI Dependencies
 ###### Qt5
@@ -96,12 +113,12 @@ This explicitly enables the GUI and disables legacy wallet support, assuming `sq
 
 ##### Descriptor & Legacy Wallet. No GUI:
 This enables support for both wallet types and disables the GUI, assuming
-`sqlite3` and `db5` are both installed.
+`sqlite3` and `db4` are both installed.
 ```bash
 ./autogen.sh
-./configure --with-gui=no --with-incompatible-bdb \
-    BDB_LIBS="-ldb_cxx-5" \
-    BDB_CFLAGS="-I/usr/local/include/db5" \
+./configure --with-gui=no \
+    BDB_LIBS="-L${BDB_PREFIX}/lib -ldb_cxx-4.8" \
+    BDB_CFLAGS="-I${BDB_PREFIX}/include" \
     MAKE=gmake
 ```
 

From 2e0e44a4b243eab52f072f89e5c64a7b33d7b2b8 Mon Sep 17 00:00:00 2001
From: Kittywhiskers Van Gogh <63189531+kwvg@users.noreply.github.com>
Date: Fri, 27 Sep 2024 12:51:36 +0100
Subject: [PATCH 183/656] merge bitcoin#30989: Drop no longer needed PATH
 modification

---
 contrib/guix/libexec/build.sh | 2 --
 1 file changed, 2 deletions(-)

diff --git a/contrib/guix/libexec/build.sh b/contrib/guix/libexec/build.sh
index 1bb910b7cc4a..3387f320e448 100755
--- a/contrib/guix/libexec/build.sh
+++ b/contrib/guix/libexec/build.sh
@@ -238,8 +238,6 @@ case "$HOST" in
     *mingw*)  HOST_LDFLAGS="-Wl,--no-insert-timestamp" ;;
 esac
 
-# Make $HOST-specific native binaries from depends available in $PATH
-export PATH="${BASEPREFIX}/${HOST}/native/bin:${PATH}"
 mkdir -p "$DISTSRC"
 (
     cd "$DISTSRC"

From a2d0e4aa5bd1acaedc6ce0fbf2e9662f662b5bb2 Mon Sep 17 00:00:00 2001
From: Kittywhiskers Van Gogh <63189531+kwvg@users.noreply.github.com>
Date: Wed, 14 May 2025 15:06:20 +0100
Subject: [PATCH 184/656] merge bitcoin#32498: remove Carls substitute server
 from Guix docs

---
 contrib/guix/README.md | 16 +++++-----------
 1 file changed, 5 insertions(+), 11 deletions(-)

diff --git a/contrib/guix/README.md b/contrib/guix/README.md
index 94536700f855..5e468c783977 100644
--- a/contrib/guix/README.md
+++ b/contrib/guix/README.md
@@ -364,12 +364,6 @@ Where `<PREFIX>` is likely:
 - `/usr/local` if you installed Guix from source and didn't supply any
   prefix-modifying flags to Guix's `./configure`
 
-For dongcarl's substitute server at https://guix.carldong.io, run as root:
-
-```sh
-wget -qO- 'https://guix.carldong.io/signing-key.pub' | guix archive --authorize
-```
-
 #### Removing authorized keys
 
 To remove previously authorized keys, simply edit `/etc/guix/acl` and remove the
@@ -381,28 +375,28 @@ Once its key is authorized, the official Guix build farm at
 https://ci.guix.gnu.org is automatically used unless the `--no-substitutes` flag
 is supplied. This default list of substitute servers is overridable both on a
 `guix-daemon` level and when you invoke `guix` commands. See examples below for
-the various ways of adding dongcarl's substitute server after having [authorized
-his signing key](#step-1-authorize-the-signing-keys).
+the various ways of adding a substitute server after having [authorized
+its signing key](#step-1-authorize-the-signing-keys).
 
 Change the **default list** of substitute servers by starting `guix-daemon` with
 the `--substitute-urls` option (you will likely need to edit your init script):
 
 ```sh
-guix-daemon <cmd> --substitute-urls='https://guix.carldong.io https://ci.guix.gnu.org'
+guix-daemon <cmd> --substitute-urls='https://bordeaux.guix.gnu.org https://ci.guix.gnu.org'
 ```
 
 Override the default list of substitute servers by passing the
 `--substitute-urls` option for invocations of `guix` commands:
 
 ```sh
-guix <cmd> --substitute-urls='https://guix.carldong.io https://ci.guix.gnu.org'
+guix <cmd> --substitute-urls='https://bordeaux.guix.gnu.org https://ci.guix.gnu.org'
 ```
 
 For scripts under `./contrib/guix`, set the `SUBSTITUTE_URLS` environment
 variable:
 
 ```sh
-export SUBSTITUTE_URLS='https://guix.carldong.io https://ci.guix.gnu.org'
+export SUBSTITUTE_URLS='https://bordeaux.guix.gnu.org https://ci.guix.gnu.org'
 ```
 
 ## Option 2: Disabling substitutes on an ad-hoc basis

From 2e0b2093dcb8c78c7464233510e39a1edc97b693 Mon Sep 17 00:00:00 2001
From: Kittywhiskers Van Gogh <63189531+kwvg@users.noreply.github.com>
Date: Wed, 15 Oct 2025 23:43:31 +0530
Subject: [PATCH 185/656] merge bitcoin#32439: accomodate migration to codeberg

---
 contrib/guix/INSTALL.md           | 8 ++++----
 contrib/guix/libexec/prelude.bash | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/contrib/guix/INSTALL.md b/contrib/guix/INSTALL.md
index f2d635895963..d96e71edf218 100644
--- a/contrib/guix/INSTALL.md
+++ b/contrib/guix/INSTALL.md
@@ -319,7 +319,7 @@ Source: https://logs.guix.gnu.org/guix/2020-11-12.log#232527
 Start by cloning Guix:
 
 ```
-git clone https://git.savannah.gnu.org/git/guix.git
+git clone https://codeberg.org/guix/guix.git
 cd guix
 ```
 
@@ -607,7 +607,7 @@ checklist.
    ```
    Generation 38   Feb 22 2021 16:39:31    (current)
      guix f350df4
-       repository URL: https://git.savannah.gnu.org/git/guix.git
+       repository URL: https://codeberg.org/guix/guix.git
        branch: version-1.2.0
        commit: f350df405fbcd5b9e27e6b6aa500da7f101f41e7
    ```
@@ -760,8 +760,8 @@ Please see the following links for more details:
 
 - An upstream coreutils bug has been filed: [debbugs#47940](https://debbugs.gnu.org/cgi/bugreport.cgi?bug=47940)
 - A Guix bug detailing the underlying problem has been filed: [guix-issues#47935](https://issues.guix.gnu.org/47935), [guix-issues#49985](https://issues.guix.gnu.org/49985#5)
-- A commit to skip this test in Guix has been merged into the core-updates branch:
-[savannah/guix@6ba1058](https://git.savannah.gnu.org/cgit/guix.git/commit/?id=6ba1058df0c4ce5611c2367531ae5c3cdc729ab4)
+- A commit to skip this test is included since Guix 1.4.0:
+[codeberg/guix@6ba1058](https://codeberg.org/guix/guix/commit/6ba1058df0c4ce5611c2367531ae5c3cdc729ab4)
 
 
 [install-script]: #options-1-and-2-using-the-official-shell-installer-script-or-binary-tarball
diff --git a/contrib/guix/libexec/prelude.bash b/contrib/guix/libexec/prelude.bash
index 1b40b08c5ba9..13a59fa2644a 100644
--- a/contrib/guix/libexec/prelude.bash
+++ b/contrib/guix/libexec/prelude.bash
@@ -50,7 +50,7 @@ fi
 # across time.
 time-machine() {
     # shellcheck disable=SC2086
-    guix time-machine --url=https://git.savannah.gnu.org/git/guix.git \
+    guix time-machine --url=https://codeberg.org/guix/guix.git \
                       --commit=7bf1d7aeaffba15c4f680f93ae88fbef25427252 \
                       --cores="$JOBS" \
                       --keep-failed \

From f97695682dc349a75dd600327b94f7a767c5097f Mon Sep 17 00:00:00 2001
From: Kittywhiskers Van Gogh <63189531+kwvg@users.noreply.github.com>
Date: Wed, 4 Jun 2025 12:24:08 +0100
Subject: [PATCH 186/656] merge bitcoin#32678: warn and abort when
 SOURCE_DATE_EPOCH is set

---
 contrib/guix/guix-build | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/contrib/guix/guix-build b/contrib/guix/guix-build
index 122c8dc22df1..8bc966e4f998 100755
--- a/contrib/guix/guix-build
+++ b/contrib/guix/guix-build
@@ -69,6 +69,24 @@ fi
 
 mkdir -p "$VERSION_BASE"
 
+################
+# SOURCE_DATE_EPOCH should not unintentionally be set
+################
+
+if [ -n "$SOURCE_DATE_EPOCH" ] && [ -z "$FORCE_SOURCE_DATE_EPOCH" ]; then
+cat << EOF
+ERR: Environment variable SOURCE_DATE_EPOCH is set which may break reproducibility.
+
+     Aborting...
+
+Hint: You may want to:
+      1. Unset this variable: \`unset SOURCE_DATE_EPOCH\` before rebuilding
+      2. Set the 'FORCE_SOURCE_DATE_EPOCH' environment variable if you insist on
+         using your own epoch
+EOF
+exit 1
+fi
+
 ################
 # Build directories should not exist
 ################

From 24b390d2b9e9f027ad7fd91934bb66a33e08a15b Mon Sep 17 00:00:00 2001
From: Kittywhiskers Van Gogh <63189531+kwvg@users.noreply.github.com>
Date: Sun, 27 Jul 2025 21:51:39 +0100
Subject: [PATCH 187/656] merge bitcoin#33073: warn SOURCE_DATE_EPOCH set in
 guix-codesign

---
 contrib/guix/guix-build           | 14 +-------------
 contrib/guix/guix-codesign        |  6 ++++++
 contrib/guix/libexec/prelude.bash | 20 ++++++++++++++++++++
 3 files changed, 27 insertions(+), 13 deletions(-)

diff --git a/contrib/guix/guix-build b/contrib/guix/guix-build
index 8bc966e4f998..80b719eb29d8 100755
--- a/contrib/guix/guix-build
+++ b/contrib/guix/guix-build
@@ -73,19 +73,7 @@ mkdir -p "$VERSION_BASE"
 # SOURCE_DATE_EPOCH should not unintentionally be set
 ################
 
-if [ -n "$SOURCE_DATE_EPOCH" ] && [ -z "$FORCE_SOURCE_DATE_EPOCH" ]; then
-cat << EOF
-ERR: Environment variable SOURCE_DATE_EPOCH is set which may break reproducibility.
-
-     Aborting...
-
-Hint: You may want to:
-      1. Unset this variable: \`unset SOURCE_DATE_EPOCH\` before rebuilding
-      2. Set the 'FORCE_SOURCE_DATE_EPOCH' environment variable if you insist on
-         using your own epoch
-EOF
-exit 1
-fi
+check_source_date_epoch
 
 ################
 # Build directories should not exist
diff --git a/contrib/guix/guix-codesign b/contrib/guix/guix-codesign
index 3ce038186550..e17e3a07a66b 100755
--- a/contrib/guix/guix-codesign
+++ b/contrib/guix/guix-codesign
@@ -67,6 +67,12 @@ EOF
 exit 1
 fi
 
+################
+# SOURCE_DATE_EPOCH should not unintentionally be set
+################
+
+check_source_date_epoch
+
 ################
 # The codesignature git worktree should not be dirty
 ################
diff --git a/contrib/guix/libexec/prelude.bash b/contrib/guix/libexec/prelude.bash
index 13a59fa2644a..67c05cf90b6b 100644
--- a/contrib/guix/libexec/prelude.bash
+++ b/contrib/guix/libexec/prelude.bash
@@ -21,6 +21,26 @@ check_tools() {
     done
 }
 
+################
+# SOURCE_DATE_EPOCH should not unintentionally be set
+################
+
+check_source_date_epoch() {
+    if [ -n "$SOURCE_DATE_EPOCH" ] && [ -z "$FORCE_SOURCE_DATE_EPOCH" ]; then
+        cat << EOF
+ERR: Environment variable SOURCE_DATE_EPOCH is set which may break reproducibility.
+
+     Aborting...
+
+Hint: You may want to:
+      1. Unset this variable: \`unset SOURCE_DATE_EPOCH\` before rebuilding
+      2. Set the 'FORCE_SOURCE_DATE_EPOCH' environment variable if you insist on
+         using your own epoch
+EOF
+        exit 1
+    fi
+}
+
 check_tools cat env readlink dirname basename git
 
 ################

From 4891135b0c9af3c2319f1f854255dc7da27f81b1 Mon Sep 17 00:00:00 2001
From: Kittywhiskers Van Gogh <63189531+kwvg@users.noreply.github.com>
Date: Sun, 19 Oct 2025 02:56:03 +0530
Subject: [PATCH 188/656] ci: ensure that Codeberg is used as the `guix`
 channel

Co-authored-by: UdjinM6 <UdjinM6@users.noreply.github.com>
---
 contrib/containers/guix/Dockerfile   |  3 +++
 contrib/containers/guix/channels.scm | 11 +++++++++++
 2 files changed, 14 insertions(+)
 create mode 100644 contrib/containers/guix/channels.scm

diff --git a/contrib/containers/guix/Dockerfile b/contrib/containers/guix/Dockerfile
index 89d052403e4c..527a2a5de07e 100644
--- a/contrib/containers/guix/Dockerfile
+++ b/contrib/containers/guix/Dockerfile
@@ -73,6 +73,9 @@ RUN groupmod -g ${GROUP_ID} ubuntu; \
     echo '%sudo ALL=(ALL) NOPASSWD:ALL' >> /etc/sudoers
 
 # Copy required files to container
+COPY --chown=${USER_ID}:${GROUP_ID} \
+     --chmod=u=rwX,go=rX \
+     --from=docker_root ./channels.scm         /home/ubuntu/.config/guix/channels.scm
 COPY --from=docker_root ./motd.txt             /etc/motd
 COPY --from=docker_root ./scripts/entrypoint   /usr/local/bin/entrypoint
 COPY --from=docker_root ./scripts/guix-check   /usr/local/bin/guix-check
diff --git a/contrib/containers/guix/channels.scm b/contrib/containers/guix/channels.scm
new file mode 100644
index 000000000000..98f965d70968
--- /dev/null
+++ b/contrib/containers/guix/channels.scm
@@ -0,0 +1,11 @@
+(list (channel
+        (name 'guix)
+        (url "https://codeberg.org/guix/guix")
+        (branch "master")
+        (commit
+          "56344729cd07c76d5133047f2866237bbb08dced")
+        (introduction
+          (make-channel-introduction
+            "9edb3f66fd807b096b48283debdcddccfea34bad"
+            (openpgp-fingerprint
+              "2A39 3FFF 68F4 EF7A 3D29  12AF 6F51 20A0 22FB B2D5")))))

From 0ae477b841cfc85f4971848e4343c01e9b24c1d9 Mon Sep 17 00:00:00 2001
From: Kittywhiskers Van Gogh <63189531+kwvg@users.noreply.github.com>
Date: Wed, 15 Oct 2025 23:26:21 +0530
Subject: [PATCH 189/656] ci: add `berlin.guix.gnu.org` to substitute URLs list

---
 contrib/containers/guix/Dockerfile         | 5 +++--
 contrib/containers/guix/scripts/entrypoint | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/contrib/containers/guix/Dockerfile b/contrib/containers/guix/Dockerfile
index 527a2a5de07e..c1d8b8d63b8d 100644
--- a/contrib/containers/guix/Dockerfile
+++ b/contrib/containers/guix/Dockerfile
@@ -52,8 +52,9 @@ RUN guix_file_name=guix-binary-${guix_version}.$(uname -m)-linux.tar.xz
 
 RUN touch /etc/nsswitch.conf
 
-RUN guix archive --authorize < /usr/local/guix/current/share/guix/ci.guix.gnu.org.pub && \
-    guix archive --authorize < /usr/local/guix/current/share/guix/bordeaux.guix.gnu.org.pub
+RUN guix archive --authorize < /usr/local/guix/current/share/guix/berlin.guix.gnu.org.pub && \
+    guix archive --authorize < /usr/local/guix/current/share/guix/bordeaux.guix.gnu.org.pub && \
+    guix archive --authorize < /usr/local/guix/current/share/guix/ci.guix.gnu.org.pub
 
 # Build Environment Setup
 # https://guix.gnu.org/manual/en/html_node/Build-Environment-Setup.html
diff --git a/contrib/containers/guix/scripts/entrypoint b/contrib/containers/guix/scripts/entrypoint
index f84cf4227093..d5e81062f88e 100755
--- a/contrib/containers/guix/scripts/entrypoint
+++ b/contrib/containers/guix/scripts/entrypoint
@@ -8,7 +8,7 @@ cat /etc/motd
 # Start the Guix daemon
 sudo env PATH=${PATH} guix-daemon \
   --build-users-group='guixbuild' \
-  --substitute-urls='https://bordeaux.guix.gnu.org https://ci.guix.gnu.org' < /dev/null 2>&1 |
+  --substitute-urls='https://berlin.guix.gnu.org https://bordeaux.guix.gnu.org https://ci.guix.gnu.org' < /dev/null 2>&1 |
   sudo tee /var/log/guix.log > /dev/null &
 
 # Hand over control

From 90f25816666e19c66c07a6175aac59b3e02d2663 Mon Sep 17 00:00:00 2001
From: Kittywhiskers Van Gogh <63189531+kwvg@users.noreply.github.com>
Date: Wed, 15 Oct 2025 23:47:35 +0530
Subject: [PATCH 190/656] ci: add mirrors to Bordeaux substitution server

Needed to accommodate for differences in network performance due to
geography as each new container instance has to re-download everything.
We don't need to import new public keys as they inherit the key for the
server they're mirroring (i.e. the mirror cannot modify the contents it
is mirroring without _also_ invalidating it), so the risk of malicious
changes are relatively mitigated.
---
 contrib/containers/guix/scripts/entrypoint | 20 +++++++++++++++++---
 1 file changed, 17 insertions(+), 3 deletions(-)

diff --git a/contrib/containers/guix/scripts/entrypoint b/contrib/containers/guix/scripts/entrypoint
index d5e81062f88e..2255e6e37d93 100755
--- a/contrib/containers/guix/scripts/entrypoint
+++ b/contrib/containers/guix/scripts/entrypoint
@@ -5,11 +5,25 @@ set -eo pipefail
 # Read instructions
 cat /etc/motd
 
+SERVERS=(
+  # Official substitution servers
+  https://berlin.guix.gnu.org
+  https://bordeaux.guix.gnu.org
+  https://ci.guix.gnu.org
+
+  # Mirrors of Bordeaux substitution server
+  https://bordeaux-singapore-mirror.cbaines.net
+  https://bordeaux-us-east-mirror.cbaines.net
+  https://hydra-guix-129.guix.gnu.org
+)
+
 # Start the Guix daemon
-sudo env PATH=${PATH} guix-daemon \
-  --build-users-group='guixbuild' \
-  --substitute-urls='https://berlin.guix.gnu.org https://bordeaux.guix.gnu.org https://ci.guix.gnu.org' < /dev/null 2>&1 |
+IFS_OLD="${IFS}"
+IFS=' '
+sudo env PATH=${PATH} \
+  guix-daemon --build-users-group='guixbuild' --substitute-urls="${SERVERS[*]}" < /dev/null 2>&1 |
   sudo tee /var/log/guix.log > /dev/null &
+IFS="${IFS_OLD}"
 
 # Hand over control
 exec bash

From 18d9966a21fa01398e4e7aa81830cb6af16f81c9 Mon Sep 17 00:00:00 2001
From: Kittywhiskers Van Gogh <63189531+kwvg@users.noreply.github.com>
Date: Mon, 20 Oct 2025 19:40:16 +0530
Subject: [PATCH 191/656] ci: make `guix-check` print out the set of hashes
 compared against

The ad-hoc generation method we use now can't be compared against the
attested checksums on dashpay/guix.sigs, so we resort to using a
creative use of guix-attest to generate the exact set of checksums that
an attestor would generate.
---
 contrib/containers/guix/scripts/entrypoint |  5 +----
 contrib/containers/guix/scripts/guix-check | 16 ++++++----------
 2 files changed, 7 insertions(+), 14 deletions(-)

diff --git a/contrib/containers/guix/scripts/entrypoint b/contrib/containers/guix/scripts/entrypoint
index 2255e6e37d93..019928d49f2c 100755
--- a/contrib/containers/guix/scripts/entrypoint
+++ b/contrib/containers/guix/scripts/entrypoint
@@ -18,12 +18,9 @@ SERVERS=(
 )
 
 # Start the Guix daemon
-IFS_OLD="${IFS}"
-IFS=' '
 sudo env PATH=${PATH} \
-  guix-daemon --build-users-group='guixbuild' --substitute-urls="${SERVERS[*]}" < /dev/null 2>&1 |
+  guix-daemon --build-users-group='guixbuild' --substitute-urls="$(IFS=' '; echo "${SERVERS[*]}")" < /dev/null 2>&1 |
   sudo tee /var/log/guix.log > /dev/null &
-IFS="${IFS_OLD}"
 
 # Hand over control
 exec bash
diff --git a/contrib/containers/guix/scripts/guix-check b/contrib/containers/guix/scripts/guix-check
index 12c9983753e2..04363162c12b 100755
--- a/contrib/containers/guix/scripts/guix-check
+++ b/contrib/containers/guix/scripts/guix-check
@@ -13,13 +13,9 @@ cd "$WORKSPACE_PATH"
 
 source "contrib/guix/libexec/prelude.bash"
 
-printf "\nBinaries:\n\n"
-( \
-SRC_PATH_PREFIX="${VERSION_BASE}/distsrc-" && \
-sha256sum ${SRC_PATH_PREFIX}*/src/dash{d,-cli,-tx,-wallet}{,.exe} && \
-sha256sum ${SRC_PATH_PREFIX}*/src/qt/dash-qt{,.exe} && \
-sha256sum ${SRC_PATH_PREFIX}*/src/test/test_dash{,.exe} \
-) | sort -k 2
-
-printf "\nArchives:\n\n"
-find "${OUTDIR_BASE}" -type f | grep -v SHA256 | xargs sha256sum | sort -k 2
+GUIX_SIGS_REPO="$(mktemp -d)"
+trap 'rm -rf -- "$GUIX_SIGS_REPO"' EXIT
+SIGNER=dummy
+env GUIX_SIGS_REPO="${GUIX_SIGS_REPO}" NO_SIGN=1 SIGNER=${SIGNER} ./contrib/guix/guix-attest
+SHASUM_LOC="${GUIX_SIGS_REPO}/${VERSION}/${SIGNER}"
+cat "${SHASUM_LOC}/all.sha256sums" 2>/dev/null || cat "${SHASUM_LOC}/noncodesigned.SHA256SUMS"

From 3a7297cafc63358d6d321f7bc1b4ea7228f818ae Mon Sep 17 00:00:00 2001
From: fanquake <fanquake@gmail.com>
Date: Wed, 20 Jul 2022 09:13:00 +0100
Subject: [PATCH 192/656] Merge bitcoin/bitcoin#25285: Add AutoFile without
 ser-type and ser-version and use it where possible

facc2fa7b8a218a0df6a19772e1641ea68dda2e3 Use AutoFile where possible (MacroFake)
6666803c897e4ad27b45cb74e3a9aa74a335f1bf streams: Add AutoFile without ser-type and ser-version (MacroFake)

Pull request description:

  This was done in the context of https://github.com/bitcoin/bitcoin/pull/25284 , but I think it also makes sense standalone.

  The basic idea is that serialization type should not be initialized when it is not needed. Same for the serialization version.

  So do this here for `AutoFile`. `CAutoFile` remains in places where it is not yet possible.

ACKs for top commit:
  laanwj:
    Code review ACK facc2fa7b8a218a0df6a19772e1641ea68dda2e3
  fanquake:
    ACK facc2fa7b8a218a0df6a19772e1641ea68dda2e3

Tree-SHA512: d82d024d55af57565ac53d9d1517afafc12b46964effba0332de62a6c77869356fa77f89e6d4834438fff44c45b64fccdf5a1358bfea03e28dfe55013b3c099d
---
 src/flat-database.h                           |  8 +--
 src/index/blockfilterindex.cpp                |  8 +--
 src/index/txindex.cpp                         |  2 +-
 src/net.cpp                                   |  2 +-
 src/policy/fees.cpp                           | 16 ++---
 src/policy/fees.h                             |  6 +-
 src/rpc/blockchain.cpp                        |  4 +-
 src/rpc/blockchain.h                          |  2 +-
 src/streams.h                                 | 69 +++++++++++--------
 src/test/flatfile_tests.cpp                   | 12 ++--
 src/test/fuzz/autofile.cpp                    |  4 +-
 src/test/fuzz/policy_estimator.cpp            |  2 +-
 src/test/fuzz/policy_estimator_io.cpp         |  2 +-
 src/test/fuzz/util.h                          |  7 +-
 src/test/fuzz/utxo_snapshot.cpp               |  4 +-
 src/test/util/chainstate.h                    |  6 +-
 .../validation_chainstatemanager_tests.cpp    | 10 +--
 src/util/asmap.cpp                            |  2 +-
 src/validation.cpp                            |  8 +--
 src/validation.h                              |  4 +-
 test/functional/feature_addrman.py            |  2 +-
 21 files changed, 96 insertions(+), 84 deletions(-)

diff --git a/src/flat-database.h b/src/flat-database.h
index 75fd91225ac9..3fd0002e4b27 100644
--- a/src/flat-database.h
+++ b/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;
diff --git a/src/index/blockfilterindex.cpp b/src/index/blockfilterindex.cpp
index c0cf84e51285..38697b4315aa 100644
--- a/src/index/blockfilterindex.cpp
+++ b/src/index/blockfilterindex.cpp
@@ -166,7 +166,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);
     }
@@ -180,7 +180,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;
     }
@@ -210,7 +210,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;
@@ -236,7 +236,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;
diff --git a/src/index/txindex.cpp b/src/index/txindex.cpp
index 5c2c78454331..1a6a0cf7fe01 100644
--- a/src/index/txindex.cpp
+++ b/src/index/txindex.cpp
@@ -80,7 +80,7 @@ bool TxIndex::FindTx(const uint256& tx_hash, uint256& block_hash, CTransactionRe
         return false;
     }
 
-    CAutoFile file(OpenBlockFile(postx, true), SER_DISK, CLIENT_VERSION);
+    AutoFile file{OpenBlockFile(postx, true)};
     if (file.IsNull()) {
         return error("%s: OpenBlockFile failed", __func__);
     }
diff --git a/src/net.cpp b/src/net.cpp
index 1ba0dee0cc6d..159f712fb17f 100644
--- a/src/net.cpp
+++ b/src/net.cpp
@@ -4886,7 +4886,7 @@ static void CaptureMessageToFile(const CAddress& addr,
     fs::create_directories(base_path);
 
     fs::path path = base_path / (is_incoming ? "msgs_recv.dat" : "msgs_sent.dat");
-    CAutoFile f(fsbridge::fopen(path, "ab"), SER_DISK, CLIENT_VERSION);
+    AutoFile f{fsbridge::fopen(path, "ab")};
 
     ser_writedata64(f, now.count());
     f.write(MakeByteSpan(msg_type));
diff --git a/src/policy/fees.cpp b/src/policy/fees.cpp
index c5f97a13191f..e0586637450a 100644
--- a/src/policy/fees.cpp
+++ b/src/policy/fees.cpp
@@ -163,13 +163,13 @@ class TxConfirmStats
     unsigned int GetMaxConfirms() const { return scale * confAvg.size(); }
 
     /** Write state of estimation data to a file*/
-    void Write(CAutoFile& fileout) const;
+    void Write(AutoFile& fileout) const;
 
     /**
      * Read saved state of estimation data from a file and replace all internal data structures and
      * variables with this state.
      */
-    void Read(CAutoFile& filein, int nFileVersion, size_t numBuckets);
+    void Read(AutoFile& filein, int nFileVersion, size_t numBuckets);
 };
 
 
@@ -405,7 +405,7 @@ double TxConfirmStats::EstimateMedianVal(int confTarget, double sufficientTxVal,
     return median;
 }
 
-void TxConfirmStats::Write(CAutoFile& fileout) const
+void TxConfirmStats::Write(AutoFile& fileout) const
 {
     fileout << Using<EncodedDoubleFormatter>(decay);
     fileout << scale;
@@ -415,7 +415,7 @@ void TxConfirmStats::Write(CAutoFile& fileout) const
     fileout << Using<VectorFormatter<VectorFormatter<EncodedDoubleFormatter>>>(failAvg);
 }
 
-void TxConfirmStats::Read(CAutoFile& filein, int nFileVersion, size_t numBuckets)
+void TxConfirmStats::Read(AutoFile& filein, int nFileVersion, size_t numBuckets)
 {
     // Read data file and do some very basic sanity checking
     // buckets and bucketMap are not updated yet, so don't access them
@@ -562,7 +562,7 @@ CBlockPolicyEstimator::CBlockPolicyEstimator()
 
     // If the fee estimation file is present, read recorded estimations
     fs::path est_filepath = gArgs.GetDataDirNet() / FEE_ESTIMATES_FILENAME;
-    CAutoFile est_file(fsbridge::fopen(est_filepath, "rb"), SER_DISK, CLIENT_VERSION);
+    AutoFile est_file{fsbridge::fopen(est_filepath, "rb")};
     if (est_file.IsNull() || !Read(est_file)) {
         LogPrintf("Failed to read fee estimates from %s. Continue anyway.\n", fs::PathToString(est_filepath));
     }
@@ -920,13 +920,13 @@ void CBlockPolicyEstimator::Flush() {
     FlushUnconfirmed();
 
     fs::path est_filepath = gArgs.GetDataDirNet() / FEE_ESTIMATES_FILENAME;
-    CAutoFile est_file(fsbridge::fopen(est_filepath, "wb"), SER_DISK, CLIENT_VERSION);
+    AutoFile est_file{fsbridge::fopen(est_filepath, "wb")};
     if (est_file.IsNull() || !Write(est_file)) {
         LogPrintf("Failed to write fee estimates to %s. Continue anyway.\n", fs::PathToString(est_filepath));
     }
 }
 
-bool CBlockPolicyEstimator::Write(CAutoFile& fileout) const
+bool CBlockPolicyEstimator::Write(AutoFile& fileout) const
 {
     try {
         LOCK(m_cs_fee_estimator);
@@ -951,7 +951,7 @@ bool CBlockPolicyEstimator::Write(CAutoFile& fileout) const
     return true;
 }
 
-bool CBlockPolicyEstimator::Read(CAutoFile& filein)
+bool CBlockPolicyEstimator::Read(AutoFile& filein)
 {
     try {
         LOCK(m_cs_fee_estimator);
diff --git a/src/policy/fees.h b/src/policy/fees.h
index 753d983cf8b0..3a0ed2dc1b11 100644
--- a/src/policy/fees.h
+++ b/src/policy/fees.h
@@ -19,7 +19,7 @@
 #include <string>
 #include <vector>
 
-class CAutoFile;
+class AutoFile;
 class CTxMemPoolEntry;
 class TxConfirmStats;
 
@@ -218,11 +218,11 @@ class CBlockPolicyEstimator
         EXCLUSIVE_LOCKS_REQUIRED(!m_cs_fee_estimator);
 
     /** Write estimation data to a file */
-    bool Write(CAutoFile& fileout) const
+    bool Write(AutoFile& fileout) const
         EXCLUSIVE_LOCKS_REQUIRED(!m_cs_fee_estimator);
 
     /** Read estimation data from a file */
-    bool Read(CAutoFile& filein)
+    bool Read(AutoFile& filein)
         EXCLUSIVE_LOCKS_REQUIRED(!m_cs_fee_estimator);
 
     /** Empty mempool transactions on shutdown to record failure to confirm for txs still in mempool */
diff --git a/src/rpc/blockchain.cpp b/src/rpc/blockchain.cpp
index 505fce3303a9..e0f192267c46 100644
--- a/src/rpc/blockchain.cpp
+++ b/src/rpc/blockchain.cpp
@@ -2671,7 +2671,7 @@ static RPCHelpMan dumptxoutset()
     }
 
     FILE* file{fsbridge::fopen(temppath, "wb")};
-    CAutoFile afile{file, SER_DISK, CLIENT_VERSION};
+    AutoFile afile{file};
     if (afile.IsNull()) {
         throw JSONRPCError(
             RPC_INVALID_PARAMETER,
@@ -2692,7 +2692,7 @@ static RPCHelpMan dumptxoutset()
 UniValue CreateUTXOSnapshot(
     NodeContext& node,
     CChainState& chainstate,
-    CAutoFile& afile,
+    AutoFile& afile,
     const fs::path& path,
     const fs::path& temppath)
 {
diff --git a/src/rpc/blockchain.h b/src/rpc/blockchain.h
index 6438cfcf6a02..824c9d70ba74 100644
--- a/src/rpc/blockchain.h
+++ b/src/rpc/blockchain.h
@@ -58,7 +58,7 @@ void CalculatePercentilesBySize(CAmount result[NUM_GETBLOCKSTATS_PERCENTILES], s
 UniValue CreateUTXOSnapshot(
     node::NodeContext& node,
     CChainState& chainstate,
-    CAutoFile& afile,
+    AutoFile& afile,
     const fs::path& path,
     const fs::path& tmppath);
 
diff --git a/src/streams.h b/src/streams.h
index 22972ffb25e8..9790914f47cd 100644
--- a/src/streams.h
+++ b/src/streams.h
@@ -484,35 +484,28 @@ class BitStreamWriter
 };
 
 
-
 /** Non-refcounted RAII wrapper for FILE*
  *
  * Will automatically close the file when it goes out of scope if not null.
  * If you're returning the file pointer, return file.release().
  * If you need to close the file early, use file.fclose() instead of fclose(file).
  */
-class CAutoFile
+class AutoFile
 {
-private:
-    const int nType;
-    const int nVersion;
-
+protected:
     FILE* file;
 
 public:
-    CAutoFile(FILE* filenew, int nTypeIn, int nVersionIn) : nType(nTypeIn), nVersion(nVersionIn)
-    {
-        file = filenew;
-    }
+    explicit AutoFile(FILE* filenew) : file{filenew} {}
 
-    ~CAutoFile()
+    ~AutoFile()
     {
         fclose();
     }
 
     // Disallow copies
-    CAutoFile(const CAutoFile&) = delete;
-    CAutoFile& operator=(const CAutoFile&) = delete;
+    AutoFile(const AutoFile&) = delete;
+    AutoFile& operator=(const AutoFile&) = delete;
 
     void fclose()
     {
@@ -523,14 +516,14 @@ class CAutoFile
     }
 
     /** Get wrapped FILE* with transfer of ownership.
-     * @note This will invalidate the CAutoFile object, and makes it the responsibility of the caller
+     * @note This will invalidate the AutoFile object, and makes it the responsibility of the caller
      * of this function to clean up the returned FILE*.
      */
     FILE* release()             { FILE* ret = file; file = nullptr; return ret; }
 
     /** Get wrapped FILE* without transfer of ownership.
      * @note Ownership of the FILE* will remain with this class. Use this only if the scope of the
-     * CAutoFile outlives use of the passed pointer.
+     * AutoFile outlives use of the passed pointer.
      */
     FILE* Get() const           { return file; }
 
@@ -541,40 +534,62 @@ class CAutoFile
     //
     // Stream subset
     //
-    int GetType() const          { return nType; }
-    int GetVersion() const       { return nVersion; }
-
     void read(Span<std::byte> dst)
     {
-        if (!file)
-            throw std::ios_base::failure("CAutoFile::read: file handle is nullptr");
+        if (!file) throw std::ios_base::failure("AutoFile::read: file handle is nullptr");
         if (fread(dst.data(), 1, dst.size(), file) != dst.size()) {
-            throw std::ios_base::failure(feof(file) ? "CAutoFile::read: end of file" : "CAutoFile::read: fread failed");
+            throw std::ios_base::failure(feof(file) ? "AutoFile::read: end of file" : "AutoFile::read: fread failed");
         }
     }
 
     void ignore(size_t nSize)
     {
-        if (!file)
-            throw std::ios_base::failure("CAutoFile::ignore: file handle is nullptr");
+        if (!file) throw std::ios_base::failure("AutoFile::ignore: file handle is nullptr");
         unsigned char data[4096];
         while (nSize > 0) {
             size_t nNow = std::min<size_t>(nSize, sizeof(data));
             if (fread(data, 1, nNow, file) != nNow)
-                throw std::ios_base::failure(feof(file) ? "CAutoFile::ignore: end of file" : "CAutoFile::read: fread failed");
+                throw std::ios_base::failure(feof(file) ? "AutoFile::ignore: end of file" : "AutoFile::read: fread failed");
             nSize -= nNow;
         }
     }
 
     void write(Span<const std::byte> src)
     {
-        if (!file)
-            throw std::ios_base::failure("CAutoFile::write: file handle is nullptr");
+        if (!file) throw std::ios_base::failure("AutoFile::write: file handle is nullptr");
         if (fwrite(src.data(), 1, src.size(), file) != src.size()) {
-            throw std::ios_base::failure("CAutoFile::write: write failed");
+            throw std::ios_base::failure("AutoFile::write: write failed");
         }
     }
 
+    template <typename T>
+    AutoFile& operator<<(const T& obj)
+    {
+        if (!file) throw std::ios_base::failure("AutoFile::operator<<: file handle is nullptr");
+        ::Serialize(*this, obj);
+        return *this;
+    }
+
+    template <typename T>
+    AutoFile& operator>>(T&& obj)
+    {
+        if (!file) throw std::ios_base::failure("AutoFile::operator>>: file handle is nullptr");
+        ::Unserialize(*this, obj);
+        return *this;
+    }
+};
+
+class CAutoFile : public AutoFile
+{
+private:
+    const int nType;
+    const int nVersion;
+
+public:
+    CAutoFile(FILE* filenew, int nTypeIn, int nVersionIn) : AutoFile{filenew}, nType(nTypeIn), nVersion(nVersionIn) {}
+    int GetType() const          { return nType; }
+    int GetVersion() const       { return nVersion; }
+
     template<typename T>
     CAutoFile& operator<<(const T& obj)
     {
diff --git a/src/test/flatfile_tests.cpp b/src/test/flatfile_tests.cpp
index bdc64a93d4f9..9d8e9286f341 100644
--- a/src/test/flatfile_tests.cpp
+++ b/src/test/flatfile_tests.cpp
@@ -44,26 +44,26 @@ BOOST_AUTO_TEST_CASE(flatfile_open)
 
     // Write first line to file.
     {
-        CAutoFile file(seq.Open(FlatFilePos(0, pos1)), SER_DISK, CLIENT_VERSION);
+        AutoFile file{seq.Open(FlatFilePos(0, pos1))};
         file << LIMITED_STRING(line1, 256);
     }
 
     // Attempt to append to file opened in read-only mode.
     {
-        CAutoFile file(seq.Open(FlatFilePos(0, pos2), true), SER_DISK, CLIENT_VERSION);
+        AutoFile file{seq.Open(FlatFilePos(0, pos2), true)};
         BOOST_CHECK_THROW(file << LIMITED_STRING(line2, 256), std::ios_base::failure);
     }
 
     // Append second line to file.
     {
-        CAutoFile file(seq.Open(FlatFilePos(0, pos2)), SER_DISK, CLIENT_VERSION);
+        AutoFile file{seq.Open(FlatFilePos(0, pos2))};
         file << LIMITED_STRING(line2, 256);
     }
 
     // Read text from file in read-only mode.
     {
         std::string text;
-        CAutoFile file(seq.Open(FlatFilePos(0, pos1), true), SER_DISK, CLIENT_VERSION);
+        AutoFile file{seq.Open(FlatFilePos(0, pos1), true)};
 
         file >> LIMITED_STRING(text, 256);
         BOOST_CHECK_EQUAL(text, line1);
@@ -75,7 +75,7 @@ BOOST_AUTO_TEST_CASE(flatfile_open)
     // Read text from file with position offset.
     {
         std::string text;
-        CAutoFile file(seq.Open(FlatFilePos(0, pos2)), SER_DISK, CLIENT_VERSION);
+        AutoFile file{seq.Open(FlatFilePos(0, pos2))};
 
         file >> LIMITED_STRING(text, 256);
         BOOST_CHECK_EQUAL(text, line2);
@@ -84,7 +84,7 @@ BOOST_AUTO_TEST_CASE(flatfile_open)
     // Ensure another file in the sequence has no data.
     {
         std::string text;
-        CAutoFile file(seq.Open(FlatFilePos(1, pos2)), SER_DISK, CLIENT_VERSION);
+        AutoFile file{seq.Open(FlatFilePos(1, pos2))};
         BOOST_CHECK_THROW(file >> LIMITED_STRING(text, 256), std::ios_base::failure);
     }
 }
diff --git a/src/test/fuzz/autofile.cpp b/src/test/fuzz/autofile.cpp
index 30ecb2ac75a1..953be2b64874 100644
--- a/src/test/fuzz/autofile.cpp
+++ b/src/test/fuzz/autofile.cpp
@@ -17,7 +17,7 @@ FUZZ_TARGET(autofile)
 {
     FuzzedDataProvider fuzzed_data_provider{buffer.data(), buffer.size()};
     FuzzedAutoFileProvider fuzzed_auto_file_provider = ConsumeAutoFile(fuzzed_data_provider);
-    CAutoFile auto_file = fuzzed_auto_file_provider.open();
+    AutoFile auto_file{fuzzed_auto_file_provider.open()};
     LIMITED_WHILE(fuzzed_data_provider.ConsumeBool(), 10000) {
         CallOneOf(
             fuzzed_data_provider,
@@ -52,8 +52,6 @@ FUZZ_TARGET(autofile)
             });
     }
     (void)auto_file.Get();
-    (void)auto_file.GetType();
-    (void)auto_file.GetVersion();
     (void)auto_file.IsNull();
     if (fuzzed_data_provider.ConsumeBool()) {
         FILE* f = auto_file.release();
diff --git a/src/test/fuzz/policy_estimator.cpp b/src/test/fuzz/policy_estimator.cpp
index d870aebcd7f6..3d3d41db0349 100644
--- a/src/test/fuzz/policy_estimator.cpp
+++ b/src/test/fuzz/policy_estimator.cpp
@@ -70,7 +70,7 @@ FUZZ_TARGET(policy_estimator, .init = initialize_policy_estimator)
     }
     {
         FuzzedAutoFileProvider fuzzed_auto_file_provider = ConsumeAutoFile(fuzzed_data_provider);
-        CAutoFile fuzzed_auto_file = fuzzed_auto_file_provider.open();
+        AutoFile fuzzed_auto_file{fuzzed_auto_file_provider.open()};
         block_policy_estimator.Write(fuzzed_auto_file);
         block_policy_estimator.Read(fuzzed_auto_file);
     }
diff --git a/src/test/fuzz/policy_estimator_io.cpp b/src/test/fuzz/policy_estimator_io.cpp
index 8de00981e1c6..9da23b5bba72 100644
--- a/src/test/fuzz/policy_estimator_io.cpp
+++ b/src/test/fuzz/policy_estimator_io.cpp
@@ -20,7 +20,7 @@ FUZZ_TARGET(policy_estimator_io, .init = initialize_policy_estimator_io)
 {
     FuzzedDataProvider fuzzed_data_provider(buffer.data(), buffer.size());
     FuzzedAutoFileProvider fuzzed_auto_file_provider = ConsumeAutoFile(fuzzed_data_provider);
-    CAutoFile fuzzed_auto_file = fuzzed_auto_file_provider.open();
+    AutoFile fuzzed_auto_file{fuzzed_auto_file_provider.open()};
     // Re-using block_policy_estimator across runs to avoid costly creation of CBlockPolicyEstimator object.
     static CBlockPolicyEstimator block_policy_estimator;
     if (block_policy_estimator.Read(fuzzed_auto_file)) {
diff --git a/src/test/fuzz/util.h b/src/test/fuzz/util.h
index c3e5ff98519f..0f505cc79439 100644
--- a/src/test/fuzz/util.h
+++ b/src/test/fuzz/util.h
@@ -389,17 +389,16 @@ class FuzzedFileProvider
 
 class FuzzedAutoFileProvider
 {
-    FuzzedDataProvider& m_fuzzed_data_provider;
     FuzzedFileProvider m_fuzzed_file_provider;
 
 public:
-    FuzzedAutoFileProvider(FuzzedDataProvider& fuzzed_data_provider) : m_fuzzed_data_provider{fuzzed_data_provider}, m_fuzzed_file_provider{fuzzed_data_provider}
+    FuzzedAutoFileProvider(FuzzedDataProvider& fuzzed_data_provider) : m_fuzzed_file_provider{fuzzed_data_provider}
     {
     }
 
-    CAutoFile open()
+    AutoFile open()
     {
-        return {m_fuzzed_file_provider.open(), m_fuzzed_data_provider.ConsumeIntegral<int>(), m_fuzzed_data_provider.ConsumeIntegral<int>()};
+        return AutoFile{m_fuzzed_file_provider.open()};
     }
 };
 
diff --git a/src/test/fuzz/utxo_snapshot.cpp b/src/test/fuzz/utxo_snapshot.cpp
index a587cf919fb9..b1025023ca81 100644
--- a/src/test/fuzz/utxo_snapshot.cpp
+++ b/src/test/fuzz/utxo_snapshot.cpp
@@ -38,13 +38,13 @@ FUZZ_TARGET(utxo_snapshot, .init = initialize_chain)
     Assert(!chainman.SnapshotBlockhash());
 
     {
-        CAutoFile outfile{fsbridge::fopen(snapshot_path, "wb"), SER_DISK, CLIENT_VERSION};
+        AutoFile outfile{fsbridge::fopen(snapshot_path, "wb")};
         const auto file_data{ConsumeRandomLengthByteVector(fuzzed_data_provider)};
         outfile << Span<const uint8_t>{file_data};
     }
 
     const auto ActivateFuzzedSnapshot{[&] {
-        CAutoFile infile{fsbridge::fopen(snapshot_path, "rb"), SER_DISK, CLIENT_VERSION};
+        AutoFile infile{fsbridge::fopen(snapshot_path, "rb")};
         SnapshotMetadata metadata;
         try {
             infile >> metadata;
diff --git a/src/test/util/chainstate.h b/src/test/util/chainstate.h
index b82368aa7051..2f0021b11448 100644
--- a/src/test/util/chainstate.h
+++ b/src/test/util/chainstate.h
@@ -15,7 +15,7 @@
 
 #include <univalue.h>
 
-const auto NoMalleation = [](CAutoFile& file, node::SnapshotMetadata& meta){};
+const auto NoMalleation = [](AutoFile& file, node::SnapshotMetadata& meta){};
 
 /**
  * Create and activate a UTXO snapshot, optionally providing a function to
@@ -31,7 +31,7 @@ CreateAndActivateUTXOSnapshot(node::NodeContext& node, const fs::path root, F ma
     WITH_LOCK(::cs_main, height = node.chainman->ActiveHeight());
     fs::path snapshot_path = root / fs::u8path(tfm::format("test_snapshot.%d.dat", height));
     FILE* outfile{fsbridge::fopen(snapshot_path, "wb")};
-    CAutoFile auto_outfile{outfile, SER_DISK, CLIENT_VERSION};
+    AutoFile auto_outfile{outfile};
 
     UniValue result = CreateUTXOSnapshot(
         node, node.chainman->ActiveChainstate(), auto_outfile, snapshot_path, snapshot_path);
@@ -41,7 +41,7 @@ CreateAndActivateUTXOSnapshot(node::NodeContext& node, const fs::path root, F ma
     // Read the written snapshot in and then activate it.
     //
     FILE* infile{fsbridge::fopen(snapshot_path, "rb")};
-    CAutoFile auto_infile{infile, SER_DISK, CLIENT_VERSION};
+    AutoFile auto_infile{infile};
     node::SnapshotMetadata metadata;
     auto_infile >> metadata;
 
diff --git a/src/test/validation_chainstatemanager_tests.cpp b/src/test/validation_chainstatemanager_tests.cpp
index 2de98a6fc65b..0900bf53a558 100644
--- a/src/test/validation_chainstatemanager_tests.cpp
+++ b/src/test/validation_chainstatemanager_tests.cpp
@@ -218,7 +218,7 @@ BOOST_FIXTURE_TEST_CASE(chainstatemanager_activate_snapshot, TestChain100Setup)
 
     // Should not load malleated snapshots
     BOOST_REQUIRE(!CreateAndActivateUTXOSnapshot(
-        m_node, m_path_root, [](CAutoFile& auto_infile, SnapshotMetadata& metadata) {
+        m_node, m_path_root, [](AutoFile& auto_infile, SnapshotMetadata& metadata) {
             // A UTXO is missing but count is correct
             metadata.m_coins_count -= 1;
 
@@ -229,22 +229,22 @@ BOOST_FIXTURE_TEST_CASE(chainstatemanager_activate_snapshot, TestChain100Setup)
             auto_infile >> coin;
     }));
     BOOST_REQUIRE(!CreateAndActivateUTXOSnapshot(
-        m_node, m_path_root, [](CAutoFile& auto_infile, SnapshotMetadata& metadata) {
+        m_node, m_path_root, [](AutoFile& auto_infile, SnapshotMetadata& metadata) {
             // Coins count is larger than coins in file
             metadata.m_coins_count += 1;
     }));
     BOOST_REQUIRE(!CreateAndActivateUTXOSnapshot(
-        m_node, m_path_root, [](CAutoFile& auto_infile, SnapshotMetadata& metadata) {
+        m_node, m_path_root, [](AutoFile& auto_infile, SnapshotMetadata& metadata) {
             // Coins count is smaller than coins in file
             metadata.m_coins_count -= 1;
     }));
     BOOST_REQUIRE(!CreateAndActivateUTXOSnapshot(
-        m_node, m_path_root, [](CAutoFile& auto_infile, SnapshotMetadata& metadata) {
+        m_node, m_path_root, [](AutoFile& auto_infile, SnapshotMetadata& metadata) {
             // Wrong hash
             metadata.m_base_blockhash = uint256::ZERO;
     }));
     BOOST_REQUIRE(!CreateAndActivateUTXOSnapshot(
-        m_node, m_path_root, [](CAutoFile& auto_infile, SnapshotMetadata& metadata) {
+        m_node, m_path_root, [](AutoFile& auto_infile, SnapshotMetadata& metadata) {
             // Wrong hash
             metadata.m_base_blockhash = uint256::ONE;
     }));
diff --git a/src/util/asmap.cpp b/src/util/asmap.cpp
index 8a4f5c4d7bbd..47f25c7aef4a 100644
--- a/src/util/asmap.cpp
+++ b/src/util/asmap.cpp
@@ -198,7 +198,7 @@ std::vector<bool> DecodeAsmap(fs::path path)
 {
     std::vector<bool> bits;
     FILE *filestr = fsbridge::fopen(path, "rb");
-    CAutoFile file(filestr, SER_DISK, CLIENT_VERSION);
+    AutoFile file{filestr};
     if (file.IsNull()) {
         LogPrintf("Failed to open asmap file from disk\n");
         return bits;
diff --git a/src/validation.cpp b/src/validation.cpp
index f0292f45ff6e..a17c102a432c 100644
--- a/src/validation.cpp
+++ b/src/validation.cpp
@@ -5424,7 +5424,7 @@ bool LoadMempool(CTxMemPool& pool, CChainState& active_chainstate, FopenFn mocka
 {
     int64_t nExpiryTimeout = gArgs.GetIntArg("-mempoolexpiry", DEFAULT_MEMPOOL_EXPIRY) * 60 * 60;
     FILE* filestr{mockable_fopen_function(gArgs.GetDataDirNet() / "mempool.dat", "rb")};
-    CAutoFile file(filestr, SER_DISK, CLIENT_VERSION);
+    AutoFile file{filestr};
     if (file.IsNull()) {
         LogPrintf("Failed to open mempool file from disk. Continuing anyway.\n");
         return false;
@@ -5533,7 +5533,7 @@ bool DumpMempool(const CTxMemPool& pool, FopenFn mockable_fopen_function, bool s
             return false;
         }
 
-        CAutoFile file(filestr, SER_DISK, CLIENT_VERSION);
+        AutoFile file{filestr};
 
         uint64_t version = MEMPOOL_DUMP_VERSION;
         file << version;
@@ -5650,7 +5650,7 @@ const AssumeutxoData* ExpectedAssumeutxo(
 }
 
 bool ChainstateManager::ActivateSnapshot(
-        CAutoFile& coins_file,
+        AutoFile& coins_file,
         const SnapshotMetadata& metadata,
         bool in_memory)
 {
@@ -5749,7 +5749,7 @@ static void FlushSnapshotToDisk(CCoinsViewCache& coins_cache, bool snapshot_load
 
 bool ChainstateManager::PopulateAndValidateSnapshot(
     CChainState& snapshot_chainstate,
-    CAutoFile& coins_file,
+    AutoFile& coins_file,
     const SnapshotMetadata& metadata)
 {
     // It's okay to release cs_main before we're done using `coins_cache` because we know
diff --git a/src/validation.h b/src/validation.h
index 31318029cf8e..5fb683c9ca15 100644
--- a/src/validation.h
+++ b/src/validation.h
@@ -894,7 +894,7 @@ class ChainstateManager
     //! Internal helper for ActivateSnapshot().
     [[nodiscard]] bool PopulateAndValidateSnapshot(
         CChainState& snapshot_chainstate,
-        CAutoFile& coins_file,
+        AutoFile& coins_file,
         const node::SnapshotMetadata& metadata);
 
     /**
@@ -976,7 +976,7 @@ class ChainstateManager
     //! - Move the new chainstate to `m_snapshot_chainstate` and make it our
     //!   ChainstateActive().
     [[nodiscard]] bool ActivateSnapshot(
-        CAutoFile& coins_file, const node::SnapshotMetadata& metadata, bool in_memory);
+        AutoFile& coins_file, const node::SnapshotMetadata& metadata, bool in_memory);
 
     //! The most-work chain.
     CChainState& ActiveChainstate() const;
diff --git a/test/functional/feature_addrman.py b/test/functional/feature_addrman.py
index 490b554a3225..3f3d3ca2fb37 100755
--- a/test/functional/feature_addrman.py
+++ b/test/functional/feature_addrman.py
@@ -94,7 +94,7 @@ def run_test(self):
         with open(peers_dat, "wb") as f:
             f.write(serialize_addrman()[:-1])
         self.nodes[0].assert_start_raises_init_error(
-            expected_msg=init_error("CAutoFile::read: end of file.*"),
+            expected_msg=init_error("AutoFile::read: end of file.*"),
             match=ErrorMatch.FULL_REGEX,
         )
 

From a412dae904342cf90cdd3b38030b07401a75d9d2 Mon Sep 17 00:00:00 2001
From: MacroFake <falke.marco@gmail.com>
Date: Wed, 20 Jul 2022 15:29:17 +0200
Subject: [PATCH 193/656] Merge bitcoin/bitcoin#25638: refactor: Use chainman()
 helper consistently in ChainImpl

fa32b1bbfd418410c47b2a33c6fa106371288138 refactor: Use chainman() helper consistently in ChainImpl (MacroFake)

Pull request description:

  Doing anything else will just lead to more verbose and inconsistent code.

ACKs for top commit:
  fanquake:
    ACK fa32b1bbfd418410c47b2a33c6fa106371288138 - all instances of `Assert(m_node.chainman)` in node/interfaces replaced with `chainman()`, which is the same thing.
  shaavan:
    Code Review ACK fa32b1bbfd418410c47b2a33c6fa106371288138

Tree-SHA512: a417680f79c150e4431aa89bc9db79fdf2dd409419081eb243194837b4ab8d16434165393f39a157473802753843e8c5314ad05c569b4e9221ce29a9fd1cefb8
---
 src/node/interfaces.cpp | 36 ++++++++++++++++++------------------
 1 file changed, 18 insertions(+), 18 deletions(-)

diff --git a/src/node/interfaces.cpp b/src/node/interfaces.cpp
index 420dd9f6baf3..8b589e343436 100644
--- a/src/node/interfaces.cpp
+++ b/src/node/interfaces.cpp
@@ -828,7 +828,7 @@ class ChainImpl : public Chain
     std::optional<int> getHeight() override
     {
         LOCK(::cs_main);
-        const CChain& active = Assert(m_node.chainman)->ActiveChain();
+        const CChain& active = chainman().ActiveChain();
         int height = active.Height();
         if (height >= 0) {
             return height;
@@ -838,7 +838,7 @@ class ChainImpl : public Chain
     uint256 getBlockHash(int height) override
     {
         LOCK(::cs_main);
-        const CChain& active = Assert(m_node.chainman)->ActiveChain();
+        const CChain& active = chainman().ActiveChain();
         CBlockIndex* block = active[height];
         assert(block != nullptr);
         return block->GetBlockHash();
@@ -846,7 +846,7 @@ class ChainImpl : public Chain
     bool haveBlockOnDisk(int height) override
     {
         LOCK(::cs_main);
-        const CChain& active = Assert(m_node.chainman)->ActiveChain();
+        const CChain& active = chainman().ActiveChain();
         CBlockIndex* block = active[height];
         return block && ((block->nStatus & BLOCK_HAVE_DATA) != 0) && block->nTx > 0;
     }
@@ -883,7 +883,7 @@ class ChainImpl : public Chain
     std::optional<int> findLocatorFork(const CBlockLocator& locator) override
     {
         LOCK(::cs_main);
-        const CChainState& active = Assert(m_node.chainman)->ActiveChainstate();
+        const CChainState& active = chainman().ActiveChainstate();
         if (const CBlockIndex* fork = active.FindForkInGlobalIndex(locator)) {
             return fork->nHeight;
         }
@@ -918,20 +918,20 @@ class ChainImpl : public Chain
     bool findBlock(const uint256& hash, const FoundBlock& block) override
     {
         WAIT_LOCK(cs_main, lock);
-        const CChain& active = Assert(m_node.chainman)->ActiveChain();
-        return FillBlock(m_node.chainman->m_blockman.LookupBlockIndex(hash), block, lock, active);
+        const CChain& active = chainman().ActiveChain();
+        return FillBlock(chainman().m_blockman.LookupBlockIndex(hash), block, lock, active);
     }
     bool findFirstBlockWithTimeAndHeight(int64_t min_time, int min_height, const FoundBlock& block) override
     {
         WAIT_LOCK(cs_main, lock);
-        const CChain& active = Assert(m_node.chainman)->ActiveChain();
+        const CChain& active = chainman().ActiveChain();
         return FillBlock(active.FindEarliestAtLeast(min_time, min_height), block, lock, active);
     }
     bool findAncestorByHeight(const uint256& block_hash, int ancestor_height, const FoundBlock& ancestor_out) override
     {
         WAIT_LOCK(cs_main, lock);
-        const CChain& active = Assert(m_node.chainman)->ActiveChain();
-        if (const CBlockIndex* block = m_node.chainman->m_blockman.LookupBlockIndex(block_hash)) {
+        const CChain& active = chainman().ActiveChain();
+        if (const CBlockIndex* block = chainman().m_blockman.LookupBlockIndex(block_hash)) {
             if (const CBlockIndex* ancestor = block->GetAncestor(ancestor_height)) {
                 return FillBlock(ancestor, ancestor_out, lock, active);
             }
@@ -941,18 +941,18 @@ class ChainImpl : public Chain
     bool findAncestorByHash(const uint256& block_hash, const uint256& ancestor_hash, const FoundBlock& ancestor_out) override
     {
         WAIT_LOCK(cs_main, lock);
-        const CChain& active = Assert(m_node.chainman)->ActiveChain();
-        const CBlockIndex* block = m_node.chainman->m_blockman.LookupBlockIndex(block_hash);
-        const CBlockIndex* ancestor = m_node.chainman->m_blockman.LookupBlockIndex(ancestor_hash);
+        const CChain& active = chainman().ActiveChain();
+        const CBlockIndex* block = chainman().m_blockman.LookupBlockIndex(block_hash);
+        const CBlockIndex* ancestor = chainman().m_blockman.LookupBlockIndex(ancestor_hash);
         if (block && ancestor && block->GetAncestor(ancestor->nHeight) != ancestor) ancestor = nullptr;
         return FillBlock(ancestor, ancestor_out, lock, active);
     }
     bool findCommonAncestor(const uint256& block_hash1, const uint256& block_hash2, const FoundBlock& ancestor_out, const FoundBlock& block1_out, const FoundBlock& block2_out) override
     {
         WAIT_LOCK(cs_main, lock);
-        const CChain& active = Assert(m_node.chainman)->ActiveChain();
-        const CBlockIndex* block1 = m_node.chainman->m_blockman.LookupBlockIndex(block_hash1);
-        const CBlockIndex* block2 = m_node.chainman->m_blockman.LookupBlockIndex(block_hash2);
+        const CChain& active = chainman().ActiveChain();
+        const CBlockIndex* block1 = chainman().m_blockman.LookupBlockIndex(block_hash1);
+        const CBlockIndex* block2 = chainman().m_blockman.LookupBlockIndex(block_hash2);
         const CBlockIndex* ancestor = block1 && block2 ? LastCommonAncestor(block1, block2) : nullptr;
         // Using & instead of && below to avoid short circuiting and leaving
         // output uninitialized. Cast bool to int to avoid -Wbitwise-instead-of-logical
@@ -1055,7 +1055,7 @@ class ChainImpl : public Chain
     bool havePruned() override
     {
         LOCK(::cs_main);
-        return m_node.chainman->m_blockman.m_have_pruned;
+        return chainman().m_blockman.m_have_pruned;
     }
     bool isReadyToBroadcast() override { return !node::fImporting && !node::fReindex && !isInitialBlockDownload(); }
     bool isInitialBlockDownload() override {
@@ -1077,7 +1077,7 @@ class ChainImpl : public Chain
     {
         if (!old_tip.IsNull()) {
             LOCK(::cs_main);
-            const CChain& active = Assert(m_node.chainman)->ActiveChain();
+            const CChain& active = chainman().ActiveChain();
             if (old_tip == active.Tip()->GetBlockHash()) return;
         }
         SyncWithValidationInterfaceQueue();
@@ -1130,7 +1130,7 @@ class ChainImpl : public Chain
     }
     bool hasAssumedValidChain() override
     {
-        return Assert(m_node.chainman)->IsSnapshotActive();
+        return chainman().IsSnapshotActive();
     }
 
     NodeContext& m_node;

From d60848b439852bc69b3a4f5c9bb1dc594673b45d Mon Sep 17 00:00:00 2001
From: fanquake <fanquake@gmail.com>
Date: Fri, 22 Jul 2022 08:36:00 +0100
Subject: [PATCH 194/656] partial Merge bitcoin/bitcoin#25331: Add HashWriter
 without ser-type and ser-version and use it where possible

faf9accd662974a69390213fee1b5c6237846b42 Use HashWriter where possible (MacroFake)
faa5425629d35708326b255570c51139aef0c8c4 Add HashWriter without ser-type and ser-version (MacroFake)

Pull request description:

  This was done in the context of https://github.com/bitcoin/bitcoin/pull/25284 , but I think it also makes sense standalone.

  The basic idea is that serialization type should not be initialized when it is not needed. Same for the serialization version.

  So do this here for `HashWriter`. `CHashWriter` remains in places where it is not yet possible.

ACKs for top commit:
  sipa:
    utACK faf9accd662974a69390213fee1b5c6237846b42
  Empact:
    utACK https://github.com/bitcoin/bitcoin/pull/25331/commits/faf9accd662974a69390213fee1b5c6237846b42

Tree-SHA512: 544cc712436e49f6e608120bcd3ddc5ea72dd236554ce30fb6cfff34a92d7e67b6e6527336ad0f5b6365e2b2884f4c6508aef775953ccd9312f17752729703f2
---
 src/crypto/muhash.cpp         | 4 ++--
 src/hash.cpp                  | 4 ++--
 src/hash.h                    | 6 +++---
 src/node/blockstorage.cpp     | 2 +-
 src/node/coinstats.cpp        | 8 ++++----
 src/node/txreconciliation.cpp | 2 +-
 src/script/interpreter.cpp    | 8 ++++----
 src/util/message.cpp          | 2 +-
 src/wallet/dump.cpp           | 4 ++--
 9 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/src/crypto/muhash.cpp b/src/crypto/muhash.cpp
index b79da158ba08..8c257c9ee705 100644
--- a/src/crypto/muhash.cpp
+++ b/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
diff --git a/src/hash.cpp b/src/hash.cpp
index 87ffc3982a39..0544468bfd94 100644
--- a/src/hash.cpp
+++ b/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;
diff --git a/src/hash.h b/src/hash.h
index 5dad7c72bcf7..8db12e811cd4 100644
--- a/src/hash.h
+++ b/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
diff --git a/src/node/blockstorage.cpp b/src/node/blockstorage.cpp
index 0a5ca022fa73..9752b6635888 100644
--- a/src/node/blockstorage.cpp
+++ b/src/node/blockstorage.cpp
@@ -505,7 +505,7 @@ static bool UndoWriteToDisk(const CBlockUndo& blockundo, FlatFilePos& pos, const
     fileout << blockundo;
 
     // calculate & write checksum
-    CHashWriter hasher(SER_GETHASH, PROTOCOL_VERSION);
+    HashWriter hasher{};
     hasher << hashBlock;
     hasher << blockundo;
     fileout << hasher.GetHash();
diff --git a/src/node/coinstats.cpp b/src/node/coinstats.cpp
index c31509e15304..d824bf563de6 100644
--- a/src/node/coinstats.cpp
+++ b/src/node/coinstats.cpp
@@ -50,7 +50,7 @@ CDataStream TxOutSer(const COutPoint& outpoint, const Coin& coin) {
 //! It is also possible, though very unlikely, that a change in this
 //! construction could cause a previously invalid (and potentially malicious)
 //! UTXO snapshot to be considered valid.
-static void ApplyHash(CHashWriter& ss, const uint256& hash, const std::map<uint32_t, Coin>& outputs)
+static void ApplyHash(HashWriter& ss, const uint256& hash, const std::map<uint32_t, Coin>& outputs)
 {
     for (auto it = outputs.begin(); it != outputs.end(); ++it) {
         if (it == outputs.begin()) {
@@ -149,7 +149,7 @@ bool GetUTXOStats(CCoinsView* view, BlockManager& blockman, CCoinsStats& stats,
 {
     switch (stats.m_hash_type) {
     case(CoinStatsHashType::HASH_SERIALIZED): {
-        CHashWriter ss(SER_GETHASH, PROTOCOL_VERSION);
+        HashWriter ss{};
         return GetUTXOStats(view, blockman, stats, ss, interruption_point, pindex);
     }
     case(CoinStatsHashType::MUHASH): {
@@ -164,7 +164,7 @@ bool GetUTXOStats(CCoinsView* view, BlockManager& blockman, CCoinsStats& stats,
 }
 
 // The legacy hash serializes the hashBlock
-static void PrepareHash(CHashWriter& ss, const CCoinsStats& stats)
+static void PrepareHash(HashWriter& ss, const CCoinsStats& stats)
 {
     ss << stats.hashBlock;
 }
@@ -172,7 +172,7 @@ static void PrepareHash(CHashWriter& ss, const CCoinsStats& stats)
 static void PrepareHash(MuHash3072& muhash, CCoinsStats& stats) {}
 static void PrepareHash(std::nullptr_t, CCoinsStats& stats) {}
 
-static void FinalizeHash(CHashWriter& ss, CCoinsStats& stats)
+static void FinalizeHash(HashWriter& ss, CCoinsStats& stats)
 {
     stats.hashSerialized = ss.GetHash();
 }
diff --git a/src/node/txreconciliation.cpp b/src/node/txreconciliation.cpp
index 03d4258a84aa..ed04a78cecfa 100644
--- a/src/node/txreconciliation.cpp
+++ b/src/node/txreconciliation.cpp
@@ -15,7 +15,7 @@ namespace {
 
 /** Static salt component used to compute short txids for sketch construction, see BIP-330. */
 const std::string RECON_STATIC_SALT = "Tx Relay Salting";
-const CHashWriter RECON_SALT_HASHER = TaggedHash(RECON_STATIC_SALT);
+const HashWriter RECON_SALT_HASHER = TaggedHash(RECON_STATIC_SALT);
 
 /**
  * Salt (specified by BIP-330) constructed from contributions from both peers. It is used
diff --git a/src/script/interpreter.cpp b/src/script/interpreter.cpp
index 0d7f63a82a64..e8211fe247d0 100644
--- a/src/script/interpreter.cpp
+++ b/src/script/interpreter.cpp
@@ -1468,7 +1468,7 @@ class CTransactionSignatureSerializer
 template <class T>
 uint256 GetPrevoutsSHA256(const T& txTo)
 {
-    CHashWriter ss(SER_GETHASH, 0);
+    HashWriter ss{};
     for (const auto& txin : txTo.vin) {
         ss << txin.prevout;
     }
@@ -1479,7 +1479,7 @@ uint256 GetPrevoutsSHA256(const T& txTo)
 template <class T>
 uint256 GetSequencesSHA256(const T& txTo)
 {
-    CHashWriter ss(SER_GETHASH, 0);
+    HashWriter ss{};
     for (const auto& txin : txTo.vin) {
         ss << txin.nSequence;
     }
@@ -1490,7 +1490,7 @@ uint256 GetSequencesSHA256(const T& txTo)
 template <class T>
 uint256 GetOutputsSHA256(const T& txTo)
 {
-    CHashWriter ss(SER_GETHASH, 0);
+    HashWriter ss{};
     for (const auto& txout : txTo.vout) {
         ss << txout;
     }
@@ -1550,7 +1550,7 @@ uint256 SignatureHash(const CScript& scriptCode, const T& txTo, unsigned int nIn
     CTransactionSignatureSerializer<T> txTmp(txTo, scriptCode, nIn, nHashType);
 
     // Serialize and hash
-    CHashWriter ss(SER_GETHASH, 0);
+    HashWriter ss{};
     ss << txTmp << nHashType;
     return ss.GetHash();
 }
diff --git a/src/util/message.cpp b/src/util/message.cpp
index 81510735ed46..685093bb12da 100644
--- a/src/util/message.cpp
+++ b/src/util/message.cpp
@@ -74,7 +74,7 @@ bool MessageSign(
 
 uint256 MessageHash(const std::string& message)
 {
-    CHashWriter hasher(SER_GETHASH, 0);
+    HashWriter hasher{};
     hasher << MESSAGE_MAGIC << message;
 
     return hasher.GetHash();
diff --git a/src/wallet/dump.cpp b/src/wallet/dump.cpp
index 87fc4242f982..9e36a864b3ac 100644
--- a/src/wallet/dump.cpp
+++ b/src/wallet/dump.cpp
@@ -41,7 +41,7 @@ bool DumpWallet(const ArgsManager& args, CWallet& wallet, bilingual_str& error)
         return false;
     }
 
-    CHashWriter hasher(0, 0);
+    HashWriter hasher{};
 
     WalletDatabase& db = wallet.GetDatabase();
     std::unique_ptr<DatabaseBatch> batch = db.MakeBatch();
@@ -132,7 +132,7 @@ bool CreateFromDump(const ArgsManager& args, const std::string& name, const fs::
     std::ifstream dump_file{dump_path};
 
     // Compute the checksum
-    CHashWriter hasher(0, 0);
+    HashWriter hasher{};
     uint256 checksum;
 
     // Check the magic and version

From 3f34f20b5fa5c207b19da2378ad4cd562de10251 Mon Sep 17 00:00:00 2001
From: MacroFake <falke.marco@gmail.com>
Date: Mon, 25 Jul 2022 11:34:03 +0200
Subject: [PATCH 195/656] Merge bitcoin/bitcoin#25691: RPC: Document "asm" and
 "hex" fields for scripts & fix getblock help

56d92447d0e75f459511bf48e105efae0dffc6b6 RPC: Document "asm" and "hex" fields for scripts (Luke Dashjr)
2cdd4df1406fc3ea892ecc29cd78fcded2ae4e10 Bugfix: RPC/blockchain: Correct type of "value" in getblock docs; add missing "desc" (Jon Atack)

Pull request description:

  Inspired by #24718

ACKs for top commit:
  kristapsk:
    cr utACK 56d92447d0e75f459511bf48e105efae0dffc6b6

Tree-SHA512: 2c6d0291397929f6a76b2d2998789187da123d7bfcace77375331cb81995eb0afd2600286c1e25cf68d16e35bd58706d2f672f63a3febe5e3a556a668f2175a2
---
 src/rpc/blockchain.cpp     | 11 ++++++-----
 src/rpc/rawtransaction.cpp | 20 ++++++++++----------
 2 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/src/rpc/blockchain.cpp b/src/rpc/blockchain.cpp
index e0f192267c46..d619964cd6b0 100644
--- a/src/rpc/blockchain.cpp
+++ b/src/rpc/blockchain.cpp
@@ -896,11 +896,12 @@ const RPCResult getblock_vin{
             {
                 {RPCResult::Type::BOOL, "generated", "Coinbase or not"},
                 {RPCResult::Type::NUM, "height", "The height of the prevout"},
-                {RPCResult::Type::NUM, "value", "The value in " + CURRENCY_UNIT},
+                {RPCResult::Type::STR_AMOUNT, "value", "The value in " + CURRENCY_UNIT},
                 {RPCResult::Type::OBJ, "scriptPubKey", "",
                 {
-                    {RPCResult::Type::STR, "asm", "The asm"},
-                    {RPCResult::Type::STR_HEX, "hex", "The hex"},
+                    {RPCResult::Type::STR, "asm", "Disassembly of the public key script"},
+                    {RPCResult::Type::STR, "desc", "Inferred descriptor for the output"},
+                    {RPCResult::Type::STR_HEX, "hex", "The raw public key script bytes, hex-encoded"},
                     {RPCResult::Type::STR, "address", /*optional=*/true, "The Dash address (only if a well-defined address exists)"},
                     {RPCResult::Type::STR, "type", "The type, eg 'pubkeyhash'"},
                 }},
@@ -1266,9 +1267,9 @@ static RPCHelpMan gettxout()
                 {RPCResult::Type::STR_AMOUNT, "value", "The transaction value in " + CURRENCY_UNIT},
                 {RPCResult::Type::OBJ, "scriptPubKey", "",
                     {
-                        {RPCResult::Type::STR, "asm", "The asm"},
+                        {RPCResult::Type::STR, "asm", "Disassembly of the public key script"},
                         {RPCResult::Type::STR, "desc", "Inferred descriptor for the output"},
-                        {RPCResult::Type::STR_HEX, "hex", "The hex"},
+                        {RPCResult::Type::STR_HEX, "hex", "The raw public key script bytes, hex-encoded"},
                         {RPCResult::Type::STR_HEX, "type", "The type, eg pubkeyhash"},
                         {RPCResult::Type::STR, "address", /*optional=*/ true, "Dash address (only if a well-defined address exists)"},
                     }},
diff --git a/src/rpc/rawtransaction.cpp b/src/rpc/rawtransaction.cpp
index 18ff5550aae7..3667d4543b4f 100644
--- a/src/rpc/rawtransaction.cpp
+++ b/src/rpc/rawtransaction.cpp
@@ -148,8 +148,8 @@ static std::vector<RPCResult> DecodeTxDoc(const std::string& txid_field_doc)
                 {RPCResult::Type::NUM, "vout", /*optional=*/true, "The output number (if not coinbase transaction)"},
                 {RPCResult::Type::OBJ, "scriptSig", /*optional=*/true, "The script (if not coinbase transaction)",
                 {
-                    {RPCResult::Type::STR, "asm", "asm"},
-                    {RPCResult::Type::STR_HEX, "hex", "hex"},
+                    {RPCResult::Type::STR, "asm", "Disassembly of the signature script"},
+                    {RPCResult::Type::STR_HEX, "hex", "The raw signature script bytes, hex-encoded"},
                 }},
                 {RPCResult::Type::NUM, "sequence", "The script sequence number"},
             }},
@@ -162,9 +162,9 @@ static std::vector<RPCResult> DecodeTxDoc(const std::string& txid_field_doc)
                 {RPCResult::Type::NUM, "n", "index"},
                 {RPCResult::Type::OBJ, "scriptPubKey", "",
                 {
-                    {RPCResult::Type::STR, "asm", "the asm"},
+                    {RPCResult::Type::STR, "asm", "Disassembly of the public key script"},
                     {RPCResult::Type::STR, "desc", "Inferred descriptor for the output"},
-                    {RPCResult::Type::STR_HEX, "hex", "the hex"},
+                    {RPCResult::Type::STR_HEX, "hex", "The raw public key script bytes, hex-encoded"},
                     {RPCResult::Type::STR, "type", "The type, eg 'pubkeyhash'"},
                     {RPCResult::Type::STR, "address", /*optional=*/true, "The Dash address (only if a well-defined address exists)"},
                 }},
@@ -1033,8 +1033,8 @@ const RPCResult decodepsbt_inputs{
             {RPCResult::Type::STR, "sighash", /*optional=*/true, "The sighash type to be used"},
             {RPCResult::Type::OBJ, "redeem_script", /*optional=*/true, "",
             {
-                {RPCResult::Type::STR, "asm", "The asm"},
-                {RPCResult::Type::STR_HEX, "hex", "The hex"},
+                {RPCResult::Type::STR, "asm", "Disassembly of the redeem script"},
+                {RPCResult::Type::STR_HEX, "hex", "The raw redeem script bytes, hex-encoded"},
                 {RPCResult::Type::STR, "type", "The type, eg 'pubkeyhash'"},
             }},
             {RPCResult::Type::ARR, "bip32_derivs", /*optional=*/true, "",
@@ -1048,8 +1048,8 @@ const RPCResult decodepsbt_inputs{
             }},
             {RPCResult::Type::OBJ, "final_scriptSig", /*optional=*/true, "",
             {
-                {RPCResult::Type::STR, "asm", "The asm"},
-                {RPCResult::Type::STR_HEX, "hex", "The hex"},
+                {RPCResult::Type::STR, "asm", "Disassembly of the final signature script"},
+                {RPCResult::Type::STR_HEX, "hex", "The raw final signature script bytes, hex-encoded"},
             }},
             {RPCResult::Type::OBJ_DYN, "ripemd160_preimages", /*optional=*/true, "",
             {
@@ -1092,8 +1092,8 @@ const RPCResult decodepsbt_outputs{
         {
             {RPCResult::Type::OBJ, "redeem_script", /*optional=*/true, "",
             {
-                {RPCResult::Type::STR, "asm", "The asm"},
-                {RPCResult::Type::STR_HEX, "hex", "The hex"},
+                {RPCResult::Type::STR, "asm", "Disassembly of the redeem script"},
+                {RPCResult::Type::STR_HEX, "hex", "The raw redeem script bytes, hex-encoded"},
                 {RPCResult::Type::STR, "type", "The type, eg 'pubkeyhash'"},
             }},
             {RPCResult::Type::ARR, "bip32_derivs", /*optional=*/true, "",

From f90a43ff807e6e88b18bc1e7f87f333b35d4e744 Mon Sep 17 00:00:00 2001
From: fanquake <fanquake@gmail.com>
Date: Tue, 26 Jul 2022 10:05:52 +0100
Subject: [PATCH 196/656] Merge bitcoin/bitcoin#25699: scripted-diff: Replace
 NullUniValue with UniValue::VNULL

fa28d0f3c3fe528dae7fd6dc7725219b9bdf0e1b scripted-diff: Replace NullUniValue with UniValue::VNULL (MacroFake)
fa962103e8eb0b078b83943a21831be39e7716c9 fuzz: refactor: Replace NullUniValue with UniValue{} (MacroFake)

Pull request description:

  This refactor is needed to disable the (potentially expensive for large json) UniValue copy constructors.

ACKs for top commit:
  fanquake:
    ACK fa28d0f3c3fe528dae7fd6dc7725219b9bdf0e1b

Tree-SHA512: 7d4204cce0a6fc4ecda96973de77d15b7e4c7caa3e0e890e1f5b9a4b9ace8b240b1f7565d6ab586e168a5fa1201b6c60a924868ef34d6abfbfd8ab7f0f99fbc7
---
 src/rpc/blockchain.cpp           | 14 +++++-----
 src/rpc/coinjoin.cpp             | 14 +++++-----
 src/rpc/evo.cpp                  | 10 +++----
 src/rpc/governance.cpp           |  8 +++---
 src/rpc/masternode.cpp           |  4 +--
 src/rpc/mining.cpp               |  4 +--
 src/rpc/net.cpp                  | 16 +++++------
 src/rpc/node.cpp                 |  8 +++---
 src/test/fuzz/parse_univalue.cpp |  2 +-
 src/wallet/rpc/addresses.cpp     | 26 +++++++++---------
 src/wallet/rpc/backup.cpp        | 46 ++++++++++++++++----------------
 src/wallet/rpc/coins.cpp         | 16 +++++------
 src/wallet/rpc/encrypt.cpp       | 14 +++++-----
 src/wallet/rpc/signmessage.cpp   |  2 +-
 src/wallet/rpc/spend.cpp         | 16 +++++------
 src/wallet/rpc/transactions.cpp  | 16 +++++------
 src/wallet/rpc/wallet.cpp        | 26 +++++++++---------
 17 files changed, 121 insertions(+), 121 deletions(-)

diff --git a/src/rpc/blockchain.cpp b/src/rpc/blockchain.cpp
index d619964cd6b0..7387f553db98 100644
--- a/src/rpc/blockchain.cpp
+++ b/src/rpc/blockchain.cpp
@@ -451,7 +451,7 @@ static RPCHelpMan syncwithvalidationinterfacequeue()
         [&](const RPCHelpMan& self, const JSONRPCRequest& request) -> UniValue
 {
     SyncWithValidationInterfaceQueue();
-    return NullUniValue;
+    return UniValue::VNULL;
 },
     };
 }
@@ -1310,11 +1310,11 @@ static RPCHelpMan gettxout()
         LOCK(mempool.cs);
         CCoinsViewMemPool view(coins_view, mempool);
         if (!view.GetCoin(out, coin) || mempool.isSpent(out)) {
-            return NullUniValue;
+            return UniValue::VNULL;
         }
     } else {
         if (!coins_view->GetCoin(out, coin)) {
-            return NullUniValue;
+            return UniValue::VNULL;
         }
     }
 
@@ -1741,7 +1741,7 @@ static RPCHelpMan preciousblock()
         throw JSONRPCError(RPC_DATABASE_ERROR, state.ToString());
     }
 
-    return NullUniValue;
+    return UniValue::VNULL;
 },
     };
 }
@@ -1784,7 +1784,7 @@ static RPCHelpMan invalidateblock()
         throw JSONRPCError(RPC_DATABASE_ERROR, state.ToString());
     }
 
-    return NullUniValue;
+    return UniValue::VNULL;
 },
     };
 }
@@ -1828,7 +1828,7 @@ static RPCHelpMan reconsiderblock()
         throw JSONRPCError(RPC_DATABASE_ERROR, state.ToString());
     }
 
-    return NullUniValue;
+    return UniValue::VNULL;
 },
     };
 }
@@ -2461,7 +2461,7 @@ static RPCHelpMan scantxoutset()
         CoinsViewScanReserver reserver;
         if (reserver.reserve()) {
             // no scan in progress
-            return NullUniValue;
+            return UniValue::VNULL;
         }
         result.pushKV("progress", g_scan_progress.load());
         return result;
diff --git a/src/rpc/coinjoin.cpp b/src/rpc/coinjoin.cpp
index ef578d726101..e8e8165b7f76 100644
--- a/src/rpc/coinjoin.cpp
+++ b/src/rpc/coinjoin.cpp
@@ -83,7 +83,7 @@ static RPCHelpMan coinjoin_reset()
         [&](const RPCHelpMan& self, const JSONRPCRequest& request) -> UniValue
 {
     const std::shared_ptr<const CWallet> wallet = GetWalletForJSONRPCRequest(request);
-    if (!wallet) return NullUniValue;
+    if (!wallet) return UniValue::VNULL;
 
     const NodeContext& node = EnsureAnyNodeContext(request.context);
 
@@ -117,7 +117,7 @@ static RPCHelpMan coinjoin_start()
         [&](const RPCHelpMan& self, const JSONRPCRequest& request) -> UniValue
 {
     const std::shared_ptr<const CWallet> wallet = GetWalletForJSONRPCRequest(request);
-    if (!wallet) return NullUniValue;
+    if (!wallet) return UniValue::VNULL;
 
     const NodeContext& node = EnsureAnyNodeContext(request.context);
 
@@ -158,7 +158,7 @@ static RPCHelpMan coinjoin_status()
         [&](const RPCHelpMan& self, const JSONRPCRequest& request) -> UniValue
 {
     const std::shared_ptr<const CWallet> wallet = GetWalletForJSONRPCRequest(request);
-    if (!wallet) return NullUniValue;
+    if (!wallet) return UniValue::VNULL;
 
     const NodeContext& node = EnsureAnyNodeContext(request.context);
 
@@ -197,7 +197,7 @@ static RPCHelpMan coinjoin_stop()
         [&](const RPCHelpMan& self, const JSONRPCRequest& request) -> UniValue
 {
     const std::shared_ptr<const CWallet> wallet = GetWalletForJSONRPCRequest(request);
-    if (!wallet) return NullUniValue;
+    if (!wallet) return UniValue::VNULL;
 
     const NodeContext& node = EnsureAnyNodeContext(request.context);
 
@@ -258,7 +258,7 @@ static RPCHelpMan coinjoinsalt_generate()
         [&](const RPCHelpMan& self, const JSONRPCRequest& request) -> UniValue
 {
     std::shared_ptr<CWallet> const wallet = GetWalletForJSONRPCRequest(request);
-    if (!wallet) return NullUniValue;
+    if (!wallet) return UniValue::VNULL;
 
     const auto str_wallet = wallet->GetName();
     if (wallet->IsWalletFlagSet(WALLET_FLAG_DISABLE_PRIVATE_KEYS)) {
@@ -322,7 +322,7 @@ static RPCHelpMan coinjoinsalt_get()
         [&](const RPCHelpMan& self, const JSONRPCRequest& request) -> UniValue
 {
     std::shared_ptr<CWallet> const wallet = GetWalletForJSONRPCRequest(request);
-    if (!wallet) return NullUniValue;
+    if (!wallet) return UniValue::VNULL;
 
     const auto str_wallet = wallet->GetName();
     if (wallet->IsWalletFlagSet(WALLET_FLAG_DISABLE_PRIVATE_KEYS)) {
@@ -360,7 +360,7 @@ static RPCHelpMan coinjoinsalt_set()
         [&](const RPCHelpMan& self, const JSONRPCRequest& request) -> UniValue
 {
     std::shared_ptr<CWallet> const wallet = GetWalletForJSONRPCRequest(request);
-    if (!wallet) return NullUniValue;
+    if (!wallet) return UniValue::VNULL;
 
     const auto salt{ParseHashV(request.params[0], "salt")};
     if (salt == uint256::ZERO) {
diff --git a/src/rpc/evo.cpp b/src/rpc/evo.cpp
index 81bf1ecd7814..d9c8189bd1ad 100644
--- a/src/rpc/evo.cpp
+++ b/src/rpc/evo.cpp
@@ -683,7 +683,7 @@ static UniValue protx_register_common_wrapper(const JSONRPCRequest& request,
     const bool isEvoRequested = mnType == MnType::Evo;
 
     std::shared_ptr<CWallet> const pwallet = GetWalletForJSONRPCRequest(request);
-    if (!pwallet) return NullUniValue;
+    if (!pwallet) return UniValue::VNULL;
 
     if (action == ProTxRegisterAction::External || action == ProTxRegisterAction::Fund) {
         EnsureWalletIsUnlocked(*pwallet);
@@ -888,7 +888,7 @@ static RPCHelpMan protx_register_submit()
     CChainstateHelper& chain_helper = *CHECK_NONFATAL(node.chain_helper);
 
     const std::shared_ptr<const CWallet> wallet = GetWalletForJSONRPCRequest(request);
-    if (!wallet) return NullUniValue;
+    if (!wallet) return UniValue::VNULL;
 
     EnsureWalletIsUnlocked(*wallet);
 
@@ -997,7 +997,7 @@ static UniValue protx_update_service_common_wrapper(const JSONRPCRequest& reques
 
     const bool isEvoRequested = mnType == MnType::Evo;
     std::shared_ptr<CWallet> const wallet = GetWalletForJSONRPCRequest(request);
-    if (!wallet) return NullUniValue;
+    if (!wallet) return UniValue::VNULL;
 
     EnsureWalletIsUnlocked(*wallet);
 
@@ -1131,7 +1131,7 @@ static RPCHelpMan protx_update_registrar_wrapper(const bool specific_legacy_bls_
     CChainstateHelper& chain_helper = *CHECK_NONFATAL(node.chain_helper);
 
     std::shared_ptr<CWallet> const wallet = GetWalletForJSONRPCRequest(request);
-    if (!wallet) return NullUniValue;
+    if (!wallet) return UniValue::VNULL;
 
     EnsureWalletIsUnlocked(*wallet);
 
@@ -1251,7 +1251,7 @@ static RPCHelpMan protx_revoke()
     CChainstateHelper& chain_helper = *CHECK_NONFATAL(node.chain_helper);
 
     std::shared_ptr<CWallet> const pwallet = GetWalletForJSONRPCRequest(request);
-    if (!pwallet) return NullUniValue;
+    if (!pwallet) return UniValue::VNULL;
 
     EnsureWalletIsUnlocked(*pwallet);
 
diff --git a/src/rpc/governance.cpp b/src/rpc/governance.cpp
index abbffc93804a..d28eecce4a77 100644
--- a/src/rpc/governance.cpp
+++ b/src/rpc/governance.cpp
@@ -150,7 +150,7 @@ static RPCHelpMan gobject_prepare()
         [&](const RPCHelpMan& self, const JSONRPCRequest& request) -> UniValue
 {
     std::shared_ptr<CWallet> const wallet = GetWalletForJSONRPCRequest(request);
-    if (!wallet) return NullUniValue;
+    if (!wallet) return UniValue::VNULL;
 
     EnsureWalletIsUnlocked(*wallet);
 
@@ -259,7 +259,7 @@ static RPCHelpMan gobject_list_prepared()
         [&](const RPCHelpMan& self, const JSONRPCRequest& request) -> UniValue
 {
     std::shared_ptr<CWallet> const wallet = GetWalletForJSONRPCRequest(request);
-    if (!wallet) return NullUniValue;
+    if (!wallet) return UniValue::VNULL;
     EnsureWalletIsUnlocked(*wallet);
 
     int64_t nCount = request.params.empty() ? 10 : ParseInt64V(request.params[0], "count");
@@ -499,7 +499,7 @@ static RPCHelpMan gobject_vote_many()
         [&](const RPCHelpMan& self, const JSONRPCRequest& request) -> UniValue
 {
     const std::shared_ptr<const CWallet> wallet = GetWalletForJSONRPCRequest(request);
-    if (!wallet) return NullUniValue;
+    if (!wallet) return UniValue::VNULL;
 
     const NodeContext& node = EnsureAnyNodeContext(request.context);
 
@@ -552,7 +552,7 @@ static RPCHelpMan gobject_vote_alias()
         [&](const RPCHelpMan& self, const JSONRPCRequest& request) -> UniValue
 {
     const std::shared_ptr<const CWallet> wallet = GetWalletForJSONRPCRequest(request);
-    if (!wallet) return NullUniValue;
+    if (!wallet) return UniValue::VNULL;
 
     const NodeContext& node = EnsureAnyNodeContext(request.context);
 
diff --git a/src/rpc/masternode.cpp b/src/rpc/masternode.cpp
index d3fc88b11f97..b35d70446de5 100644
--- a/src/rpc/masternode.cpp
+++ b/src/rpc/masternode.cpp
@@ -135,7 +135,7 @@ static RPCHelpMan masternode_outputs()
         [&](const RPCHelpMan& self, const JSONRPCRequest& request) -> UniValue
 {
     const std::shared_ptr<const CWallet> wallet = GetWalletForJSONRPCRequest(request);
-    if (!wallet) return NullUniValue;
+    if (!wallet) return UniValue::VNULL;
 
     // Find possible candidates
     CCoinControl coin_control(CoinType::ONLY_MASTERNODE_COLLATERAL);
@@ -242,7 +242,7 @@ static RPCHelpMan masternode_winners()
     {
         LOCK(::cs_main);
         pindexTip = chainman.ActiveChain().Tip();
-        if (!pindexTip) return NullUniValue;
+        if (!pindexTip) return UniValue::VNULL;
     }
 
     int nCount = 10;
diff --git a/src/rpc/mining.cpp b/src/rpc/mining.cpp
index 74cb13e40db7..11e6cd906d45 100644
--- a/src/rpc/mining.cpp
+++ b/src/rpc/mining.cpp
@@ -516,7 +516,7 @@ static RPCHelpMan prioritisetransaction()
 static UniValue BIP22ValidationResult(const BlockValidationState& state)
 {
     if (state.IsValid())
-        return NullUniValue;
+        return UniValue::VNULL;
 
     if (state.IsError())
         throw JSONRPCError(RPC_VERIFY_ERROR, state.ToString());
@@ -1083,7 +1083,7 @@ static RPCHelpMan submitheader()
 
     BlockValidationState state;
     chainman.ProcessNewBlockHeaders({h}, state, Params());
-    if (state.IsValid()) return NullUniValue;
+    if (state.IsValid()) return UniValue::VNULL;
     if (state.IsError()) {
         throw JSONRPCError(RPC_VERIFY_ERROR, state.ToString());
     }
diff --git a/src/rpc/net.cpp b/src/rpc/net.cpp
index fbd72f6c349d..266fc27672ca 100644
--- a/src/rpc/net.cpp
+++ b/src/rpc/net.cpp
@@ -90,7 +90,7 @@ static RPCHelpMan ping()
 
     // Request that each node send a ping during next message processing pass
     peerman.SendPings();
-    return NullUniValue;
+    return UniValue::VNULL;
 },
     };
 }
@@ -340,7 +340,7 @@ static RPCHelpMan addnode()
     {
         CAddress addr;
         connman.OpenNetworkConnection(addr, /*fCountFailure=*/false, /*grant_outbound=*/{}, node_arg.c_str(), ConnectionType::MANUAL, use_v2transport);
-        return NullUniValue;
+        return UniValue::VNULL;
     }
 
     if (command == "add")
@@ -356,7 +356,7 @@ static RPCHelpMan addnode()
         }
     }
 
-    return NullUniValue;
+    return UniValue::VNULL;
 },
     };
 }
@@ -466,7 +466,7 @@ static RPCHelpMan disconnectnode()
         throw JSONRPCError(RPC_CLIENT_NODE_NOT_CONNECTED, "Node not found in connected nodes");
     }
 
-    return NullUniValue;
+    return UniValue::VNULL;
 },
     };
 }
@@ -804,7 +804,7 @@ static RPCHelpMan setban()
             throw JSONRPCError(RPC_CLIENT_INVALID_IP_OR_SUBNET, "Error: Unban failed. Requested address/subnet was not previously manually banned.");
         }
     }
-    return NullUniValue;
+    return UniValue::VNULL;
 },
     };
 }
@@ -872,7 +872,7 @@ static RPCHelpMan clearbanned()
 
     banman.ClearBanned();
 
-    return NullUniValue;
+    return UniValue::VNULL;
 },
     };
 }
@@ -893,7 +893,7 @@ static RPCHelpMan cleardiscouraged()
 
     banman.ClearDiscouraged();
 
-    return NullUniValue;
+    return UniValue::VNULL;
 },
     };
 }
@@ -1079,7 +1079,7 @@ static RPCHelpMan sendmsgtopeer()
                 throw JSONRPCError(RPC_MISC_ERROR, "Error: Could not send message to peer");
             }
 
-            return NullUniValue;
+            return UniValue::VNULL;
         },
     };
 }
diff --git a/src/rpc/node.cpp b/src/rpc/node.cpp
index 0140bc17aec6..5b07cd49a76a 100644
--- a/src/rpc/node.cpp
+++ b/src/rpc/node.cpp
@@ -191,7 +191,7 @@ static RPCHelpMan spork()
         return ret;
     }
 
-    return NullUniValue;
+    return UniValue::VNULL;
 },
     };
 }
@@ -233,7 +233,7 @@ static RPCHelpMan sporkupdate()
         return "success";
     }
 
-    return NullUniValue;
+    return UniValue::VNULL;
 },
     };
 }
@@ -274,7 +274,7 @@ static RPCHelpMan setmocktime()
         }
     }
 
-    return NullUniValue;
+    return UniValue::VNULL;
 },
     };
 }
@@ -847,7 +847,7 @@ static RPCHelpMan mockscheduler()
     CHECK_NONFATAL(node_context->scheduler);
     node_context->scheduler->MockForward(std::chrono::seconds(delta_seconds));
 
-    return NullUniValue;
+    return UniValue::VNULL;
 },
     };
 }
diff --git a/src/test/fuzz/parse_univalue.cpp b/src/test/fuzz/parse_univalue.cpp
index fb44233f1ba6..0d889c60a8cc 100644
--- a/src/test/fuzz/parse_univalue.cpp
+++ b/src/test/fuzz/parse_univalue.cpp
@@ -27,7 +27,7 @@ FUZZ_TARGET(parse_univalue, .init = initialize_parse_univalue)
             return ParseNonRFCJSONValue(random_string);
         } catch (const std::runtime_error&) {
             valid = false;
-            return NullUniValue;
+            return UniValue{};
         }
     }();
     if (!valid) {
diff --git a/src/wallet/rpc/addresses.cpp b/src/wallet/rpc/addresses.cpp
index 5752c5dd30fc..6058e621aa6f 100644
--- a/src/wallet/rpc/addresses.cpp
+++ b/src/wallet/rpc/addresses.cpp
@@ -33,7 +33,7 @@ RPCHelpMan getnewaddress()
         [&](const RPCHelpMan& self, const JSONRPCRequest& request) -> UniValue
 {
     std::shared_ptr<CWallet> const pwallet = GetWalletForJSONRPCRequest(request);
-    if (!pwallet) return NullUniValue;
+    if (!pwallet) return UniValue::VNULL;
 
     LOCK(pwallet->cs_wallet);
 
@@ -71,7 +71,7 @@ RPCHelpMan getrawchangeaddress()
         [&](const RPCHelpMan& self, const JSONRPCRequest& request) -> UniValue
 {
     std::shared_ptr<CWallet> const pwallet = GetWalletForJSONRPCRequest(request);
-    if (!pwallet) return NullUniValue;
+    if (!pwallet) return UniValue::VNULL;
 
     LOCK(pwallet->cs_wallet);
 
@@ -104,7 +104,7 @@ RPCHelpMan setlabel()
         [&](const RPCHelpMan& self, const JSONRPCRequest& request) -> UniValue
 {
     std::shared_ptr<CWallet> const pwallet = GetWalletForJSONRPCRequest(request);
-    if (!pwallet) return NullUniValue;
+    if (!pwallet) return UniValue::VNULL;
 
     LOCK(pwallet->cs_wallet);
 
@@ -121,7 +121,7 @@ RPCHelpMan setlabel()
         pwallet->SetAddressBook(dest, label, "send");
     }
 
-    return NullUniValue;
+    return UniValue::VNULL;
 },
     };
 }
@@ -153,7 +153,7 @@ RPCHelpMan listaddressgroupings()
         [&](const RPCHelpMan& self, const JSONRPCRequest& request) -> UniValue
 {
     const std::shared_ptr<const CWallet> pwallet = GetWalletForJSONRPCRequest(request);
-    if (!pwallet) return NullUniValue;
+    if (!pwallet) return UniValue::VNULL;
 
     // Make sure the results are valid at least up to the most recent block
     // the user could have gotten from another RPC command prior to now
@@ -220,7 +220,7 @@ RPCHelpMan addmultisigaddress()
         [&](const RPCHelpMan& self, const JSONRPCRequest& request) -> UniValue
 {
     std::shared_ptr<CWallet> const pwallet = GetWalletForJSONRPCRequest(request);
-    if (!pwallet) return NullUniValue;
+    if (!pwallet) return UniValue::VNULL;
 
     LegacyScriptPubKeyMan& spk_man = EnsureLegacyScriptPubKeyMan(*pwallet);
 
@@ -276,7 +276,7 @@ RPCHelpMan keypoolrefill()
         [&](const RPCHelpMan& self, const JSONRPCRequest& request) -> UniValue
 {
     std::shared_ptr<CWallet> const pwallet = GetWalletForJSONRPCRequest(request);
-    if (!pwallet) return NullUniValue;
+    if (!pwallet) return UniValue::VNULL;
 
     if (pwallet->IsLegacy() && pwallet->IsWalletFlagSet(WALLET_FLAG_DISABLE_PRIVATE_KEYS)) {
         throw JSONRPCError(RPC_WALLET_ERROR, "Error: Private keys are disabled for this wallet");
@@ -299,7 +299,7 @@ RPCHelpMan keypoolrefill()
         throw JSONRPCError(RPC_WALLET_ERROR, "Error refreshing keypool.");
     }
 
-    return NullUniValue;
+    return UniValue::VNULL;
 },
     };
 }
@@ -324,14 +324,14 @@ RPCHelpMan newkeypool()
         [&](const RPCHelpMan& self, const JSONRPCRequest& request) -> UniValue
 {
     std::shared_ptr<CWallet> const pwallet = GetWalletForJSONRPCRequest(request);
-    if (!pwallet) return NullUniValue;
+    if (!pwallet) return UniValue::VNULL;
 
     LOCK(pwallet->cs_wallet);
 
     LegacyScriptPubKeyMan& spk_man = EnsureLegacyScriptPubKeyMan(*pwallet, true);
     spk_man.NewKeyPool();
 
-    return NullUniValue;
+    return UniValue::VNULL;
 },
     };
 }
@@ -471,7 +471,7 @@ RPCHelpMan getaddressinfo()
         [&](const RPCHelpMan& self, const JSONRPCRequest& request) -> UniValue
 {
     const std::shared_ptr<const CWallet> pwallet = GetWalletForJSONRPCRequest(request);
-    if (!pwallet) return NullUniValue;
+    if (!pwallet) return UniValue::VNULL;
 
     LOCK(pwallet->cs_wallet);
 
@@ -581,7 +581,7 @@ RPCHelpMan getaddressesbylabel()
         [&](const RPCHelpMan& self, const JSONRPCRequest& request) -> UniValue
 {
     const std::shared_ptr<const CWallet> pwallet = GetWalletForJSONRPCRequest(request);
-    if (!pwallet) return NullUniValue;
+    if (!pwallet) return UniValue::VNULL;
 
     LOCK(pwallet->cs_wallet);
 
@@ -644,7 +644,7 @@ RPCHelpMan listlabels()
         [&](const RPCHelpMan& self, const JSONRPCRequest& request) -> UniValue
 {
     const std::shared_ptr<const CWallet> pwallet = GetWalletForJSONRPCRequest(request);
-    if (!pwallet) return NullUniValue;
+    if (!pwallet) return UniValue::VNULL;
 
     LOCK(pwallet->cs_wallet);
 
diff --git a/src/wallet/rpc/backup.cpp b/src/wallet/rpc/backup.cpp
index 8d3d03bf76fa..b53bd7892ba1 100644
--- a/src/wallet/rpc/backup.cpp
+++ b/src/wallet/rpc/backup.cpp
@@ -113,7 +113,7 @@ RPCHelpMan importprivkey()
         [&](const RPCHelpMan& self, const JSONRPCRequest& request) -> UniValue
 {
     std::shared_ptr<CWallet> const pwallet = GetWalletForJSONRPCRequest(request);
-    if (!pwallet) return NullUniValue;
+    if (!pwallet) return UniValue::VNULL;
 
     if (pwallet->IsWalletFlagSet(WALLET_FLAG_DISABLE_PRIVATE_KEYS)) {
         throw JSONRPCError(RPC_WALLET_ERROR, "Cannot import private keys to a wallet with private keys disabled");
@@ -171,7 +171,7 @@ RPCHelpMan importprivkey()
     if (fRescan) {
         RescanWallet(*pwallet, reserver);
     }
-    return NullUniValue;
+    return UniValue::VNULL;
 },
     };
 }
@@ -193,7 +193,7 @@ RPCHelpMan abortrescan()
         [&](const RPCHelpMan& self, const JSONRPCRequest& request) -> UniValue
 {
     std::shared_ptr<CWallet> const pwallet = GetWalletForJSONRPCRequest(request);
-    if (!pwallet) return NullUniValue;
+    if (!pwallet) return UniValue::VNULL;
 
     if (!pwallet->IsScanning() || pwallet->IsAbortingRescan()) return false;
     pwallet->AbortRescan();
@@ -231,7 +231,7 @@ RPCHelpMan importaddress()
         [&](const RPCHelpMan& self, const JSONRPCRequest& request) -> UniValue
 {
     std::shared_ptr<CWallet> const pwallet = GetWalletForJSONRPCRequest(request);
-    if (!pwallet) return NullUniValue;
+    if (!pwallet) return UniValue::VNULL;
 
     EnsureLegacyScriptPubKeyMan(*pwallet, true);
 
@@ -298,7 +298,7 @@ RPCHelpMan importaddress()
         }
     }
 
-    return NullUniValue;
+    return UniValue::VNULL;
 },
     };
 }
@@ -316,7 +316,7 @@ RPCHelpMan importprunedfunds()
         [&](const RPCHelpMan& self, const JSONRPCRequest& request) -> UniValue
 {
     std::shared_ptr<CWallet> const pwallet = GetWalletForJSONRPCRequest(request);
-    if (!pwallet) return NullUniValue;
+    if (!pwallet) return UniValue::VNULL;
 
     CMutableTransaction tx;
     if (!DecodeHexTx(tx, request.params[0].get_str())) {
@@ -351,7 +351,7 @@ RPCHelpMan importprunedfunds()
     CTransactionRef tx_ref = MakeTransactionRef(tx);
     if (pwallet->IsMine(*tx_ref)) {
         pwallet->AddToWallet(std::move(tx_ref), TxStateConfirmed{merkleBlock.header.GetHash(), height, static_cast<int>(txnIndex)});
-        return NullUniValue;
+        return UniValue::VNULL;
     }
 
     throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "No addresses in wallet correspond to included transaction");
@@ -375,7 +375,7 @@ RPCHelpMan removeprunedfunds()
         [&](const RPCHelpMan& self, const JSONRPCRequest& request) -> UniValue
 {
     std::shared_ptr<CWallet> const pwallet = GetWalletForJSONRPCRequest(request);
-    if (!pwallet) return NullUniValue;
+    if (!pwallet) return UniValue::VNULL;
 
     LOCK(pwallet->cs_wallet);
 
@@ -392,7 +392,7 @@ RPCHelpMan removeprunedfunds()
         throw JSONRPCError(RPC_INVALID_PARAMETER, "Transaction does not exist in wallet.");
     }
 
-    return NullUniValue;
+    return UniValue::VNULL;
 },
     };
 }
@@ -422,7 +422,7 @@ RPCHelpMan importpubkey()
         [&](const RPCHelpMan& self, const JSONRPCRequest& request) -> UniValue
 {
     std::shared_ptr<CWallet> const pwallet = GetWalletForJSONRPCRequest(request);
-    if (!pwallet) return NullUniValue;
+    if (!pwallet) return UniValue::VNULL;
 
     EnsureLegacyScriptPubKeyMan(*pwallet, true);
 
@@ -475,7 +475,7 @@ RPCHelpMan importpubkey()
         }
     }
 
-    return NullUniValue;
+    return UniValue::VNULL;
 },
     };
 }
@@ -501,7 +501,7 @@ RPCHelpMan importwallet()
         [&](const RPCHelpMan& self, const JSONRPCRequest& request) -> UniValue
 {
     std::shared_ptr<CWallet> const pwallet = GetWalletForJSONRPCRequest(request);
-    if (!pwallet) return NullUniValue;
+    if (!pwallet) return UniValue::VNULL;
 
     EnsureLegacyScriptPubKeyMan(*pwallet, true);
 
@@ -637,7 +637,7 @@ RPCHelpMan importwallet()
     if (!fGood)
         throw JSONRPCError(RPC_WALLET_ERROR, "Error adding some keys/scripts to wallet");
 
-    return NullUniValue;
+    return UniValue::VNULL;
 },
     };
 }
@@ -664,7 +664,7 @@ RPCHelpMan importelectrumwallet()
 {
 
     std::shared_ptr<CWallet> const pwallet = GetWalletForJSONRPCRequest(request);
-    if (!pwallet) return NullUniValue;
+    if (!pwallet) return UniValue::VNULL;
 
     if (pwallet->chain().havePruned())
         throw JSONRPCError(RPC_WALLET_ERROR, "Importing wallets is disabled in pruned mode");
@@ -817,7 +817,7 @@ RPCHelpMan importelectrumwallet()
     if (!fGood)
         throw JSONRPCError(RPC_WALLET_ERROR, "Error adding some keys to wallet");
 
-    return NullUniValue;
+    return UniValue::VNULL;
 },
     };
 }
@@ -842,7 +842,7 @@ RPCHelpMan dumpprivkey()
         [&](const RPCHelpMan& self, const JSONRPCRequest& request) -> UniValue
 {
     const std::shared_ptr<const CWallet> pwallet = GetWalletForJSONRPCRequest(request);
-    if (!pwallet) return NullUniValue;
+    if (!pwallet) return UniValue::VNULL;
 
     const LegacyScriptPubKeyMan& spk_man = EnsureConstLegacyScriptPubKeyMan(*pwallet);
 
@@ -889,7 +889,7 @@ RPCHelpMan dumphdinfo()
         [&](const RPCHelpMan& self, const JSONRPCRequest& request) -> UniValue
 {
     std::shared_ptr<CWallet> const pwallet = GetWalletForJSONRPCRequest(request);
-    if (!pwallet) return NullUniValue;
+    if (!pwallet) return UniValue::VNULL;
 
     LOCK(pwallet->cs_wallet);
 
@@ -943,7 +943,7 @@ RPCHelpMan dumpwallet()
         [&](const RPCHelpMan& self, const JSONRPCRequest& request) -> UniValue
 {
     const std::shared_ptr<const CWallet> pwallet = GetWalletForJSONRPCRequest(request);
-    if (!pwallet) return NullUniValue;
+    if (!pwallet) return UniValue::VNULL;
 
     const CWallet& wallet = *pwallet;
     const LegacyScriptPubKeyMan& spk_man = EnsureConstLegacyScriptPubKeyMan(wallet);
@@ -1551,7 +1551,7 @@ RPCHelpMan importmulti()
     const UniValue& requests = mainRequest.params[0];
 
     std::shared_ptr<CWallet> const pwallet = GetWalletForJSONRPCRequest(mainRequest);
-    if (!pwallet) return NullUniValue;
+    if (!pwallet) return UniValue::VNULL;
     CWallet& wallet{*pwallet};
 
     // Make sure the results are valid at least up to the most recent block
@@ -1855,7 +1855,7 @@ RPCHelpMan importdescriptors() {
 {
     // Acquire the wallet
     std::shared_ptr<CWallet> const pwallet = GetWalletForJSONRPCRequest(main_request);
-    if (!pwallet) return NullUniValue;
+    if (!pwallet) return UniValue::VNULL;
     CWallet& wallet{*pwallet};
 
     // Make sure the results are valid at least up to the most recent block
@@ -1994,7 +1994,7 @@ RPCHelpMan listdescriptors()
         [&](const RPCHelpMan& self, const JSONRPCRequest& request) -> UniValue
 {
     const std::shared_ptr<const CWallet> wallet = GetWalletForJSONRPCRequest(request);
-    if (!wallet) return NullUniValue;
+    if (!wallet) return UniValue::VNULL;
 
     if (!wallet->IsWalletFlagSet(WALLET_FLAG_DESCRIPTORS)) {
         throw JSONRPCError(RPC_WALLET_ERROR, "listdescriptors is not available for non-descriptor wallets");
@@ -2080,7 +2080,7 @@ RPCHelpMan backupwallet()
         [&](const RPCHelpMan& self, const JSONRPCRequest& request) -> UniValue
 {
     const std::shared_ptr<const CWallet> pwallet = GetWalletForJSONRPCRequest(request);
-    if (!pwallet) return NullUniValue;
+    if (!pwallet) return UniValue::VNULL;
 
     // Make sure the results are valid at least up to the most recent block
     // the user could have gotten from another RPC command prior to now
@@ -2093,7 +2093,7 @@ RPCHelpMan backupwallet()
         throw JSONRPCError(RPC_WALLET_ERROR, "Error: Wallet backup failed!");
     }
 
-    return NullUniValue;
+    return UniValue::VNULL;
 },
     };
 }
diff --git a/src/wallet/rpc/coins.cpp b/src/wallet/rpc/coins.cpp
index 84accf15ce1b..c31b3eba313c 100644
--- a/src/wallet/rpc/coins.cpp
+++ b/src/wallet/rpc/coins.cpp
@@ -104,7 +104,7 @@ RPCHelpMan getreceivedbyaddress()
         [&](const RPCHelpMan& self, const JSONRPCRequest& request) -> UniValue
 {
     const std::shared_ptr<const CWallet> pwallet = GetWalletForJSONRPCRequest(request);
-    if (!pwallet) return NullUniValue;
+    if (!pwallet) return UniValue::VNULL;
 
     // Make sure the results are valid at least up to the most recent block
     // the user could have gotten from another RPC command prior to now
@@ -145,7 +145,7 @@ RPCHelpMan getreceivedbylabel()
         [&](const RPCHelpMan& self, const JSONRPCRequest& request) -> UniValue
 {
     const std::shared_ptr<const CWallet> pwallet = GetWalletForJSONRPCRequest(request);
-    if (!pwallet) return NullUniValue;
+    if (!pwallet) return UniValue::VNULL;
 
     // Make sure the results are valid at least up to the most recent block
     // the user could have gotten from another RPC command prior to now
@@ -185,7 +185,7 @@ RPCHelpMan getbalance()
         [&](const RPCHelpMan& self, const JSONRPCRequest& request) -> UniValue
 {
     const std::shared_ptr<const CWallet> pwallet = GetWalletForJSONRPCRequest(request);
-    if (!pwallet) return NullUniValue;
+    if (!pwallet) return UniValue::VNULL;
 
     // Make sure the results are valid at least up to the most recent block
     // the user could have gotten from another RPC command prior to now
@@ -229,7 +229,7 @@ RPCHelpMan getunconfirmedbalance()
         [&](const RPCHelpMan& self, const JSONRPCRequest& request) -> UniValue
 {
     const std::shared_ptr<const CWallet> pwallet = GetWalletForJSONRPCRequest(request);
-    if (!pwallet) return NullUniValue;
+    if (!pwallet) return UniValue::VNULL;
 
     // Make sure the results are valid at least up to the most recent block
     // the user could have gotten from another RPC command prior to now
@@ -288,7 +288,7 @@ RPCHelpMan lockunspent()
         [&](const RPCHelpMan& self, const JSONRPCRequest& request) -> UniValue
 {
     std::shared_ptr<CWallet> const pwallet = GetWalletForJSONRPCRequest(request);
-    if (!pwallet) return NullUniValue;
+    if (!pwallet) return UniValue::VNULL;
 
     // Make sure the results are valid at least up to the most recent block
     // the user could have gotten from another RPC command prior to now
@@ -413,7 +413,7 @@ RPCHelpMan listlockunspent()
         [&](const RPCHelpMan& self, const JSONRPCRequest& request) -> UniValue
 {
     const std::shared_ptr<const CWallet> pwallet = GetWalletForJSONRPCRequest(request);
-    if (!pwallet) return NullUniValue;
+    if (!pwallet) return UniValue::VNULL;
 
     LOCK(pwallet->cs_wallet);
 
@@ -461,7 +461,7 @@ RPCHelpMan getbalances()
         [&](const RPCHelpMan& self, const JSONRPCRequest& request) -> UniValue
 {
     const std::shared_ptr<const CWallet> rpc_wallet = GetWalletForJSONRPCRequest(request);
-    if (!rpc_wallet) return NullUniValue;
+    if (!rpc_wallet) return UniValue::VNULL;
     const CWallet& wallet = *rpc_wallet;
 
     // Make sure the results are valid at least up to the most recent block
@@ -563,7 +563,7 @@ RPCHelpMan listunspent()
         [&](const RPCHelpMan& self, const JSONRPCRequest& request) -> UniValue
 {
     const std::shared_ptr<const CWallet> pwallet = GetWalletForJSONRPCRequest(request);
-    if (!pwallet) return NullUniValue;
+    if (!pwallet) return UniValue::VNULL;
 
     int nMinDepth = 1;
     if (!request.params[0].isNull()) {
diff --git a/src/wallet/rpc/encrypt.cpp b/src/wallet/rpc/encrypt.cpp
index 4bf0a881c744..5dffbb848a17 100644
--- a/src/wallet/rpc/encrypt.cpp
+++ b/src/wallet/rpc/encrypt.cpp
@@ -34,7 +34,7 @@ RPCHelpMan walletpassphrase()
         [&](const RPCHelpMan& self, const JSONRPCRequest& request) -> UniValue
 {
     std::shared_ptr<CWallet> const wallet = GetWalletForJSONRPCRequest(request);
-    if (!wallet) return NullUniValue;
+    if (!wallet) return UniValue::VNULL;
     CWallet* const pwallet = wallet.get();
 
     int64_t nSleepTime;
@@ -118,7 +118,7 @@ RPCHelpMan walletpassphrase()
         }
     }, nSleepTime);
 
-    return NullUniValue;
+    return UniValue::VNULL;
 },
     };
 }
@@ -139,7 +139,7 @@ RPCHelpMan walletpassphrasechange()
         [&](const RPCHelpMan& self, const JSONRPCRequest& request) -> UniValue
 {
     std::shared_ptr<CWallet> const pwallet = GetWalletForJSONRPCRequest(request);
-    if (!pwallet) return NullUniValue;
+    if (!pwallet) return UniValue::VNULL;
 
     LOCK(pwallet->cs_wallet);
 
@@ -171,7 +171,7 @@ RPCHelpMan walletpassphrasechange()
         }
     }
 
-    return NullUniValue;
+    return UniValue::VNULL;
 },
     };
 }
@@ -197,7 +197,7 @@ RPCHelpMan walletlock()
         [&](const RPCHelpMan& self, const JSONRPCRequest& request) -> UniValue
 {
     std::shared_ptr<CWallet> const pwallet = GetWalletForJSONRPCRequest(request);
-    if (!pwallet) return NullUniValue;
+    if (!pwallet) return UniValue::VNULL;
 
     LOCK(pwallet->cs_wallet);
 
@@ -208,7 +208,7 @@ RPCHelpMan walletlock()
     pwallet->Lock();
     pwallet->nRelockTime = 0;
 
-    return NullUniValue;
+    return UniValue::VNULL;
 },
     };
 }
@@ -240,7 +240,7 @@ RPCHelpMan encryptwallet()
         [&](const RPCHelpMan& self, const JSONRPCRequest& request) -> UniValue
 {
     std::shared_ptr<CWallet> const pwallet = GetWalletForJSONRPCRequest(request);
-    if (!pwallet) return NullUniValue;
+    if (!pwallet) return UniValue::VNULL;
 
     LOCK(pwallet->cs_wallet);
 
diff --git a/src/wallet/rpc/signmessage.cpp b/src/wallet/rpc/signmessage.cpp
index 2bd851f5e9fe..fb670fbe24e8 100644
--- a/src/wallet/rpc/signmessage.cpp
+++ b/src/wallet/rpc/signmessage.cpp
@@ -36,7 +36,7 @@ RPCHelpMan signmessage()
         [&](const RPCHelpMan& self, const JSONRPCRequest& request) -> UniValue
         {
             const std::shared_ptr<const CWallet> pwallet = GetWalletForJSONRPCRequest(request);
-            if (!pwallet) return NullUniValue;
+            if (!pwallet) return UniValue::VNULL;
 
             LOCK(pwallet->cs_wallet);
 
diff --git a/src/wallet/rpc/spend.cpp b/src/wallet/rpc/spend.cpp
index f874f6dbac0d..309da88bff3a 100644
--- a/src/wallet/rpc/spend.cpp
+++ b/src/wallet/rpc/spend.cpp
@@ -168,7 +168,7 @@ RPCHelpMan sendtoaddress()
         [&](const RPCHelpMan& self, const JSONRPCRequest& request) -> UniValue
 {
     std::shared_ptr<CWallet> const pwallet = GetWalletForJSONRPCRequest(request);
-    if (!pwallet) return NullUniValue;
+    if (!pwallet) return UniValue::VNULL;
 
     // Make sure the results are valid at least up to the most recent block
     // the user could have gotten from another RPC command prior to now
@@ -275,7 +275,7 @@ RPCHelpMan sendmany()
         [&](const RPCHelpMan& self, const JSONRPCRequest& request) -> UniValue
 {
     std::shared_ptr<CWallet> const pwallet = GetWalletForJSONRPCRequest(request);
-    if (!pwallet) return NullUniValue;
+    if (!pwallet) return UniValue::VNULL;
 
     // Make sure the results are valid at least up to the most recent block
     // the user could have gotten from another RPC command prior to now
@@ -332,7 +332,7 @@ RPCHelpMan settxfee()
         [&](const RPCHelpMan& self, const JSONRPCRequest& request) -> UniValue
 {
     std::shared_ptr<CWallet> const pwallet = GetWalletForJSONRPCRequest(request);
-    if (!pwallet) return NullUniValue;
+    if (!pwallet) return UniValue::VNULL;
 
     LOCK(pwallet->cs_wallet);
 
@@ -613,7 +613,7 @@ RPCHelpMan fundrawtransaction()
     RPCTypeCheck(request.params, {UniValue::VSTR, UniValueType(), UniValue::VBOOL});
 
     std::shared_ptr<CWallet> const pwallet = GetWalletForJSONRPCRequest(request);
-    if (!pwallet) return NullUniValue;
+    if (!pwallet) return UniValue::VNULL;
 
     // parse hex string from parameter
     CMutableTransaction tx;
@@ -695,7 +695,7 @@ RPCHelpMan signrawtransactionwithwallet()
     RPCTypeCheck(request.params, {UniValue::VSTR, UniValue::VARR, UniValue::VSTR}, true);
 
     const std::shared_ptr<const CWallet> pwallet = GetWalletForJSONRPCRequest(request);
-    if (!pwallet) return NullUniValue;
+    if (!pwallet) return UniValue::VNULL;
 
     CMutableTransaction mtx;
     if (!DecodeHexTx(mtx, request.params[0].get_str())) {
@@ -845,7 +845,7 @@ RPCHelpMan send()
             );
 
     std::shared_ptr<CWallet> const pwallet = GetWalletForJSONRPCRequest(request);
-    if (!pwallet) return NullUniValue;
+    if (!pwallet) return UniValue::VNULL;
 
     UniValue options{request.params[4].isNull() ? UniValue::VOBJ : request.params[4]};
     if (options.exists("estimate_mode") || options.exists("conf_target")) {
@@ -975,7 +975,7 @@ RPCHelpMan walletprocesspsbt()
     RPCTypeCheck(request.params, {UniValue::VSTR});
 
     const std::shared_ptr<const CWallet> pwallet = GetWalletForJSONRPCRequest(request);
-    if (!pwallet) return NullUniValue;
+    if (!pwallet) return UniValue::VNULL;
 
     const CWallet& wallet{*pwallet};
     // Make sure the results are valid at least up to the most recent block
@@ -1128,7 +1128,7 @@ RPCHelpMan walletcreatefundedpsbt()
     );
 
     std::shared_ptr<CWallet> const pwallet = GetWalletForJSONRPCRequest(request);
-    if (!pwallet) return NullUniValue;
+    if (!pwallet) return UniValue::VNULL;
 
     CWallet& wallet{*pwallet};
     // Make sure the results are valid at least up to the most recent block
diff --git a/src/wallet/rpc/transactions.cpp b/src/wallet/rpc/transactions.cpp
index 3870162016db..879f17c440dc 100644
--- a/src/wallet/rpc/transactions.cpp
+++ b/src/wallet/rpc/transactions.cpp
@@ -251,7 +251,7 @@ RPCHelpMan listreceivedbyaddress()
         [&](const RPCHelpMan& self, const JSONRPCRequest& request) -> UniValue
 {
     const std::shared_ptr<const CWallet> pwallet = GetWalletForJSONRPCRequest(request);
-    if (!pwallet) return NullUniValue;
+    if (!pwallet) return UniValue::VNULL;
 
     // Make sure the results are valid at least up to the most recent block
     // the user could have gotten from another RPC command prior to now
@@ -298,7 +298,7 @@ RPCHelpMan listreceivedbylabel()
         [&](const RPCHelpMan& self, const JSONRPCRequest& request) -> UniValue
 {
     const std::shared_ptr<const CWallet> pwallet = GetWalletForJSONRPCRequest(request);
-    if (!pwallet) return NullUniValue;
+    if (!pwallet) return UniValue::VNULL;
 
     // Make sure the results are valid at least up to the most recent block
     // the user could have gotten from another RPC command prior to now
@@ -491,7 +491,7 @@ RPCHelpMan listtransactions()
         [&](const RPCHelpMan& self, const JSONRPCRequest& request) -> UniValue
 {
     const std::shared_ptr<const CWallet> pwallet = GetWalletForJSONRPCRequest(request);
-    if (!pwallet) return NullUniValue;
+    if (!pwallet) return UniValue::VNULL;
 
     // Make sure the results are valid at least up to the most recent block
     // the user could have gotten from another RPC command prior to now
@@ -607,7 +607,7 @@ RPCHelpMan listsinceblock()
         [&](const RPCHelpMan& self, const JSONRPCRequest& request) -> UniValue
 {
     const std::shared_ptr<const CWallet> pwallet = GetWalletForJSONRPCRequest(request);
-    if (!pwallet) return NullUniValue;
+    if (!pwallet) return UniValue::VNULL;
 
     const CWallet& wallet = *pwallet;
     // Make sure the results are valid at least up to the most recent block
@@ -746,7 +746,7 @@ RPCHelpMan gettransaction()
         [&](const RPCHelpMan& self, const JSONRPCRequest& request) -> UniValue
 {
     const std::shared_ptr<const CWallet> pwallet = GetWalletForJSONRPCRequest(request);
-    if (!pwallet) return NullUniValue;
+    if (!pwallet) return UniValue::VNULL;
 
     // Make sure the results are valid at least up to the most recent block
     // the user could have gotten from another RPC command prior to now
@@ -819,7 +819,7 @@ RPCHelpMan abandontransaction()
         [&](const RPCHelpMan& self, const JSONRPCRequest& request) -> UniValue
 {
     std::shared_ptr<CWallet> const pwallet = GetWalletForJSONRPCRequest(request);
-    if (!pwallet) return NullUniValue;
+    if (!pwallet) return UniValue::VNULL;
 
     // Make sure the results are valid at least up to the most recent block
     // the user could have gotten from another RPC command prior to now
@@ -836,7 +836,7 @@ RPCHelpMan abandontransaction()
         throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "Transaction not eligible for abandonment");
     }
 
-    return NullUniValue;
+    return UniValue::VNULL;
 },
     };
 }
@@ -864,7 +864,7 @@ RPCHelpMan rescanblockchain()
         [&](const RPCHelpMan& self, const JSONRPCRequest& request) -> UniValue
 {
     std::shared_ptr<CWallet> const pwallet = GetWalletForJSONRPCRequest(request);
-    if (!pwallet) return NullUniValue;
+    if (!pwallet) return UniValue::VNULL;
     CWallet& wallet{*pwallet};
 
     // Make sure the results are valid at least up to the most recent block
diff --git a/src/wallet/rpc/wallet.cpp b/src/wallet/rpc/wallet.cpp
index b55a93fe5185..d8f124480e1a 100644
--- a/src/wallet/rpc/wallet.cpp
+++ b/src/wallet/rpc/wallet.cpp
@@ -64,7 +64,7 @@ static RPCHelpMan listaddressbalances()
         [&](const RPCHelpMan& self, const JSONRPCRequest& request) -> UniValue
 {
     const std::shared_ptr<const CWallet> pwallet = GetWalletForJSONRPCRequest(request);
-    if (!pwallet) return NullUniValue;
+    if (!pwallet) return UniValue::VNULL;
 
     LOCK(pwallet->cs_wallet);
 
@@ -104,7 +104,7 @@ static RPCHelpMan setcoinjoinrounds()
         [&](const RPCHelpMan& self, const JSONRPCRequest& request) -> UniValue
 {
     const std::shared_ptr<const CWallet> wallet = GetWalletForJSONRPCRequest(request);
-    if (!wallet) return NullUniValue;
+    if (!wallet) return UniValue::VNULL;
 
     int nRounds = request.params[0].getInt<int>();
 
@@ -113,7 +113,7 @@ static RPCHelpMan setcoinjoinrounds()
 
     CCoinJoinClientOptions::SetRounds(nRounds);
 
-    return NullUniValue;
+    return UniValue::VNULL;
 },
     };
 }
@@ -135,7 +135,7 @@ static RPCHelpMan setcoinjoinamount()
         [&](const RPCHelpMan& self, const JSONRPCRequest& request) -> UniValue
 {
     const std::shared_ptr<const CWallet> wallet = GetWalletForJSONRPCRequest(request);
-    if (!wallet) return NullUniValue;
+    if (!wallet) return UniValue::VNULL;
 
     int nAmount = request.params[0].getInt<int>();
 
@@ -144,7 +144,7 @@ static RPCHelpMan setcoinjoinamount()
 
     CCoinJoinClientOptions::SetAmount(nAmount);
 
-    return NullUniValue;
+    return UniValue::VNULL;
 },
     };
 }
@@ -200,7 +200,7 @@ static RPCHelpMan getwalletinfo()
         [&](const RPCHelpMan& self, const JSONRPCRequest& request) -> UniValue
 {
     const std::shared_ptr<const CWallet> pwallet = GetWalletForJSONRPCRequest(request);
-    if (!pwallet) return NullUniValue;
+    if (!pwallet) return UniValue::VNULL;
 
     // Make sure the results are valid at least up to the most recent block
     // the user could have gotten from another RPC command prior to now
@@ -365,7 +365,7 @@ static RPCHelpMan upgradetohd()
         [&](const RPCHelpMan& self, const JSONRPCRequest& request) -> UniValue
 {
     std::shared_ptr<CWallet> const pwallet = GetWalletForJSONRPCRequest(request);
-    if (!pwallet) return NullUniValue;
+    if (!pwallet) return UniValue::VNULL;
 
     bool generate_mnemonic = request.params[0].isNull() || request.params[0].get_str().empty();
     bool mnemonic_passphrase_has_null{false};
@@ -570,7 +570,7 @@ static RPCHelpMan setwalletflag()
         [&](const RPCHelpMan& self, const JSONRPCRequest& request) -> UniValue
 {
     std::shared_ptr<CWallet> const pwallet = GetWalletForJSONRPCRequest(request);
-    if (!pwallet) return NullUniValue;
+    if (!pwallet) return UniValue::VNULL;
 
 
     std::string flag_str = request.params[0].get_str();
@@ -776,7 +776,7 @@ static RPCHelpMan wipewallettxes()
         [&](const RPCHelpMan& self, const JSONRPCRequest& request) -> UniValue
 {
     std::shared_ptr<CWallet> const wallet = GetWalletForJSONRPCRequest(request);
-    if (!wallet) return NullUniValue;
+    if (!wallet) return UniValue::VNULL;
     CWallet* const pwallet = wallet.get();
 
     WalletRescanReserver reserver(*pwallet);
@@ -825,7 +825,7 @@ static RPCHelpMan wipewallettxes()
 
     pwallet->ShowProgress(strprintf("%s " + _("Wiping wallet transactions…").translated, pwallet->GetDisplayName()), 100);
 
-    return NullUniValue;
+    return UniValue::VNULL;
 },
     };
 }
@@ -854,7 +854,7 @@ static RPCHelpMan sethdseed()
         [&](const RPCHelpMan& self, const JSONRPCRequest& request) -> UniValue
 {
     std::shared_ptr<CWallet> const pwallet = GetWalletForJSONRPCRequest(request);
-    if (!pwallet) return NullUniValue;
+    if (!pwallet) return UniValue::VNULL;
 
     LegacyScriptPubKeyMan& spk_man = EnsureLegacyScriptPubKeyMan(*pwallet, true);
 
@@ -902,7 +902,7 @@ static RPCHelpMan sethdseed()
 
     if (flush_key_pool) spk_man.NewKeyPool();
 
-    return NullUniValue;
+    return UniValue::VNULL;
 },
     };
 }
@@ -933,7 +933,7 @@ static RPCHelpMan upgradewallet()
         [&](const RPCHelpMan& self, const JSONRPCRequest& request) -> UniValue
 {
     std::shared_ptr<CWallet> const pwallet = GetWalletForJSONRPCRequest(request);
-    if (!pwallet) return NullUniValue;
+    if (!pwallet) return UniValue::VNULL;
 
     RPCTypeCheck(request.params, {UniValue::VNUM}, true);
 

From cd31ec6bdbc1c9e3f915fa384b5f62aa855e94c3 Mon Sep 17 00:00:00 2001
From: fanquake <fanquake@gmail.com>
Date: Tue, 16 Aug 2022 09:11:55 +0100
Subject: [PATCH 197/656] Merge bitcoin/bitcoin#25809: build: add
 test_bitcoin.exe to win installer, don't install entire docs/ dir

d755ffc3277c11b5c4a38c52e900b561d1636d0b build: package test_bitcoin in Windows installer (fanquake)
aa30e046ace860d40736d01f91edd8802adfdf2d build: remove entire docs dir from Windows installer (fanquake)

Pull request description:

  Haven't tested other than checking that it Guix builds.

  Fixes: #17171.

  Guix build (x86_64):
  ```bash
  6e2886c80eba9c829047c04586b142d5f8f1c53c31aa82834aff39ae5dbf1762  guix-build-d755ffc3277c/output/dist-archive/bitcoin-d755ffc3277c.tar.gz
  cdf727c45c3283523726b4ec27f051de5931469874af736eac05d48016d6369b  guix-build-d755ffc3277c/output/x86_64-w64-mingw32/SHA256SUMS.part
  546866b2f0c8067c168a936246c4cda25745c1b484322201230b885511f2abd7  guix-build-d755ffc3277c/output/x86_64-w64-mingw32/bitcoin-d755ffc3277c-win64-debug.zip
  31dbb780dff003089d0e9a3a2598cde89453af4f1b18e392a186a6ec14718b48  guix-build-d755ffc3277c/output/x86_64-w64-mingw32/bitcoin-d755ffc3277c-win64-setup-unsigned.exe
  39f1c55a2426390f014282d0a736ceb77e461199fde6ccefcef53ecf10dc4960  guix-build-d755ffc3277c/output/x86_64-w64-mingw32/bitcoin-d755ffc3277c-win64-unsigned.tar.gz
  7e4f7dc3475598d187e77cc31842ad2ce876fb98dc42e999b32bdefbf0b79df1  guix-build-d755ffc3277c/output/x86_64-w64-mingw32/bitcoin-d755ffc3277c-win64.zip
  ```

ACKs for top commit:
  jarolrod:
    ACK d755ffc3277c11b5c4a38c52e900b561d1636d0b
  1440000bytes:
    ACK https://github.com/bitcoin/bitcoin/pull/25809/commits/d755ffc3277c11b5c4a38c52e900b561d1636d0b
  hebasto:
    ACK d755ffc3277c11b5c4a38c52e900b561d1636d0b, tested on Windows 11 Pro.

Tree-SHA512: 7f1b46182b616806f706e20ccb05d8e563d5ff8f1155169713db780c06bbe3fffdb4c1b3f5da7c3e01bfcd40e7046811ff0710b81342d4c53d67ce91b36a7da7
---
 Makefile.am        | 2 ++
 configure.ac       | 2 ++
 share/setup.nsi.in | 4 +---
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index ad1c903f1acb..0c06009442fb 100644
--- a/Makefile.am
+++ b/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)
@@ -77,6 +78,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
diff --git a/configure.ac b/configure.ac
index d216ffd04eba..95902d3c0fb7 100644
--- a/configure.ac
+++ b/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)
diff --git a/share/setup.nsi.in b/share/setup.nsi.in
index 79097c8744af..58abe0e86a5e 100644
--- a/share/setup.nsi.in
+++ b/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
 

From aba475766341a808dcd6fd12777c4655f7a266e1 Mon Sep 17 00:00:00 2001
From: fanquake <fanquake@gmail.com>
Date: Wed, 14 Sep 2022 14:46:04 +0100
Subject: [PATCH 198/656] Merge bitcoin/bitcoin#26079: Revert "doc: note that
 brew installed qt is not supported"

34a2f91055ea467b4c20c419646849da5bd7fb94 Revert "doc: note that brew installed qt is not supported" (Hennadii Stepanov)

Pull request description:

  As bitcoin/bitcoin#26056 fixes bitcoin/bitcoin#25947 it looks reasonable to revert bitcoin/bitcoin#21988.

ACKs for top commit:
  fanquake:
    ACK 34a2f91055ea467b4c20c419646849da5bd7fb94 - haven't tested at all.
  jarolrod:
    ACK https://github.com/bitcoin/bitcoin/commit/34a2f91055ea467b4c20c419646849da5bd7fb94

Tree-SHA512: 4470f21fb6ea32970d7572c83ba064bcbe6e3282cea79122312f8ac203a5b1617b21952db1d6e47ba5b6f605abc23f72c04c07cef7251272e22fb593ff317beb
---
 doc/build-osx.md | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/doc/build-osx.md b/doc/build-osx.md
index 3a9d7f0e92be..089b66fb14ec 100644
--- a/doc/build-osx.md
+++ b/doc/build-osx.md
@@ -117,14 +117,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).
 

From 312e438b88b19ea9fe02bdb4d38a0037aa3312fa Mon Sep 17 00:00:00 2001
From: MacroFake <falke.marco@gmail.com>
Date: Mon, 5 Sep 2022 14:15:25 +0200
Subject: [PATCH 199/656] Merge bitcoin/bitcoin#25976: QA: rpc_blockchain: Test
 output of getblock verbosity 0, False, and True

f663b43df041da7777e6f45a8df04fa852f79106 QA: rpc_blockchain: Test output of getblock verbosity 0, False, and True (Luke Dashjr)

Pull request description:

  Currently getblock's "verbosity" is documented as a NUM, though it has a fallback to Boolean for the (deprecated?) "verbose" alias.

  Since we've been doing more generic type-checking on RPC stuff, I think it would be a good idea to actually test the Boolean values work.

  I didn't see an existing test for verbosity=0, so this adds that too.

ACKs for top commit:
  aureleoules:
    ACK f663b43df041da7777e6f45a8df04fa852f79106.

Tree-SHA512: 321a7795a2f32e469d28879dd323c85cb6b221828030e2a33ad9afd35a648191151a79b04e359b2f58314e43360f81c25f05be07deb42f61efdf556850a7266c
---
 test/functional/rpc_blockchain.py | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/test/functional/rpc_blockchain.py b/test/functional/rpc_blockchain.py
index 6ffaaa75f0f9..819c004a3e4a 100755
--- a/test/functional/rpc_blockchain.py
+++ b/test/functional/rpc_blockchain.py
@@ -35,6 +35,7 @@
 from test_framework.governance import EXPECTED_STDERR_NO_GOV_PRUNE
 from test_framework.messages import (
     CBlockHeader,
+    dashhash,
     from_hex,
     msg_block,
 )
@@ -491,6 +492,10 @@ def _test_getblock(self):
         self.wallet.send_self_transfer(fee_rate=fee_per_kb, from_node=node)
         blockhash = self.generate(node, 1)[0]
 
+        def assert_hexblock_hashes(verbosity):
+            block = node.getblock(blockhash, verbosity)
+            assert_equal(blockhash, dashhash(bytes.fromhex(block[:160]))[::-1].hex())
+
         def assert_fee_not_in_block(verbosity):
             block = node.getblock(blockhash, verbosity)
             assert 'fee' not in block['tx'][1]
@@ -525,8 +530,13 @@ def assert_vin_does_not_contain_prevout(verbosity):
                 for vin in tx["vin"]:
                     assert "prevout" not in vin
 
+        self.log.info("Test that getblock with verbosity 0 hashes to expected value")
+        assert_hexblock_hashes(0)
+        assert_hexblock_hashes(False)
+
         self.log.info("Test that getblock with verbosity 1 doesn't include fee")
         assert_fee_not_in_block(1)
+        assert_fee_not_in_block(True)
 
         self.log.info('Test that getblock with verbosity 2 and 3 includes expected fee')
         assert_fee_in_block(2)

From 844eaafc9474032d812fd4622f872a0fc0c27310 Mon Sep 17 00:00:00 2001
From: fanquake <fanquake@gmail.com>
Date: Thu, 7 Apr 2022 09:43:25 +0100
Subject: [PATCH 200/656] Merge bitcoin/bitcoin#24152: policy / validation:
 CPFP fee bumping within packages

BACKPORT NOTE:
This PR is backported to minimize conflicts in future even if Dash Core has no bumpfee feature

9bebf35e269b2a918df27708565ecd0c5bd3f116 [validation] don't package validate if not policy or missing inputs (glozow)
51edcffa0e156dba06191a8d5c636ba01fa5b65f [unit test] package feerate and package cpfp (glozow)
1b93748c937e870e7574a8e120a85bee6f9013ff [validation] try individual validation before package validation (glozow)
17a8ffd8020375d60428695858558f2be264aa36 [packages/policy] use package feerate in package validation (glozow)
09f32cffa6c3e8b2d77281a5983ffe8f482a5945 [docs] package feerate (glozow)

Pull request description:

  Part of #22290, aka [Package Mempool Accept](https://gist.github.com/glozow/dc4e9d5c5b14ade7cdfac40f43adb18a).

  This enables CPFP fee bumping in child-with-unconfirmed-parents packages by introducing [package feerate](https://gist.github.com/glozow/dc4e9d5c5b14ade7cdfac40f43adb18a#fee-related-checks-use-package-feerate) (total modified fees divided by total virtual size) and using it in place of individual feerate. We also always [validate individual transactions first](https://gist.github.com/glozow/dc4e9d5c5b14ade7cdfac40f43adb18a#always-try-individual-submission-first) to avoid incentive-incompatible policies like "parents pay for children" or "siblings pay for siblings" behavior.

ACKs for top commit:
  instagibbs:
    reACK https://github.com/bitcoin/bitcoin/pull/24152/commits/9bebf35e269b2a918df27708565ecd0c5bd3f116
  mzumsande:
    Code review ACK 9bebf35e269b2a918df27708565ecd0c5bd3f116
  t-bast:
    ACK https://github.com/bitcoin/bitcoin/pull/24152/commits/9bebf35e269b2a918df27708565ecd0c5bd3f116

Tree-SHA512: 5117cfcc3ce55c00384d9e8003a0589ceac1e6f738b1c299007d9cd9cdd2d7c530d31cfd23658b041a6604d39073bcc6e81f0639a300082a92097682a6ea8c8f
---
 doc/policy/packages.md       |  37 +++++++
 src/test/fuzz/tx_pool.cpp    |  14 ++-
 src/test/txpackage_tests.cpp | 209 ++++++++++++++++++++++++++++++++++-
 src/validation.cpp           |  88 +++++++++++++--
 src/validation.h             |   8 ++
 5 files changed, 337 insertions(+), 19 deletions(-)

diff --git a/doc/policy/packages.md b/doc/policy/packages.md
index 1e2ddbd82f96..aa720050588c 100644
--- a/doc/policy/packages.md
+++ b/doc/policy/packages.md
@@ -60,3 +60,40 @@ test accepts):
    - *Rationale*: We want to prevent potential censorship vectors. We should not reject entire
      packages because we already have one of the transactions. Also, if an attacker first broadcasts
      a competing package, the honest package should still be considered for acceptance.
+
+### Package Fees and Feerate
+
+*Package Feerate* is the total modified fees (base fees + any fee delta from
+`prioritisetransaction`) divided by the total size of all transactions in the package.
+If any transactions in the package are already in the mempool, they are not submitted again
+("deduplicated") and are thus excluded from this calculation.
+
+To meet the two feerate requirements of a mempool, i.e., the pre-configured minimum relay feerate
+(`minRelayTxFee`) and the dynamic mempool minimum feerate, the total package feerate is used instead
+of the individual feerate. The individual transactions are allowed to be below the feerate
+requirements if the package meets the feerate requirements. For example, the parent(s) in the
+package can pay no fees but be paid for by the child.
+
+*Rationale*: This can be thought of as "CPFP within a package," solving the issue of a parent not
+meeting minimum fees on its own. This would allow contracting applications to adjust their fees at
+broadcast time instead of overshooting or risking becoming stuck or pinned.
+
+*Rationale*: It would be incorrect to use the fees of transactions that are already in the mempool, as
+we do not want a transaction's fees to be double-counted.
+
+Implementation Note: Transactions within a package are always validated individually first, and
+package validation is used for the transactions that failed. Since package feerate is only
+calculated using transactions that are not in the mempool, this implementation detail affects the
+outcome of package validation.
+
+*Rationale*: We must not allow a low-feerate child to prevent its parent from being accepted; fees
+of children should not negatively impact their parents, since they are not necessary for the parents
+to be mined. More generally, if transaction B is not needed in order for transaction A to be mined,
+B's fees cannot harm A. In a child-with-parents package, simply validating parents individually
+first is sufficient to ensure this.
+
+*Rationale*: As a principle, we want to avoid accidentally restricting policy in order to be
+backward-compatible for users and applications that rely on p2p transaction relay. Concretely,
+package validation should not prevent the acceptance of a transaction that would otherwise be
+policy-valid on its own. By always accepting a transaction that passes individual validation before
+trying package validation, we prevent any unintentional restriction of policy.
diff --git a/src/test/fuzz/tx_pool.cpp b/src/test/fuzz/tx_pool.cpp
index adb1a170440d..bb7718dbc70f 100644
--- a/src/test/fuzz/tx_pool.cpp
+++ b/src/test/fuzz/tx_pool.cpp
@@ -233,14 +233,18 @@ FUZZ_TARGET(tx_pool_standard, .init = initialize_tx_pool)
         const bool bypass_limits = fuzzed_data_provider.ConsumeBool();
         ::fRequireStandard = fuzzed_data_provider.ConsumeBool();
 
-        // Make sure ProcessNewPackage on one transaction works and always fully validates the transaction.
+        // Make sure ProcessNewPackage on one transaction works.
         // The result is not guaranteed to be the same as what is returned by ATMP.
         const auto result_package = WITH_LOCK(::cs_main,
                                     return ProcessNewPackage(chainstate, tx_pool, {tx}, true));
-        auto it = result_package.m_tx_results.find(tx->GetHash());
-        Assert(it != result_package.m_tx_results.end());
-        Assert(it->second.m_result_type == MempoolAcceptResult::ResultType::VALID ||
-               it->second.m_result_type == MempoolAcceptResult::ResultType::INVALID);
+        // If something went wrong due to a package-specific policy, it might not return a
+        // validation result for the transaction.
+        if (result_package.m_state.GetResult() != PackageValidationResult::PCKG_POLICY) {
+            auto it = result_package.m_tx_results.find(tx->GetHash());
+            Assert(it != result_package.m_tx_results.end());
+            Assert(it->second.m_result_type == MempoolAcceptResult::ResultType::VALID ||
+                   it->second.m_result_type == MempoolAcceptResult::ResultType::INVALID);
+        }
 
         const auto res = WITH_LOCK(::cs_main, return AcceptToMemoryPool(chainstate, tx, GetTime(), bypass_limits, /*test_accept=*/false));
         const bool accepted = res.m_result_type == MempoolAcceptResult::ResultType::VALID;
diff --git a/src/test/txpackage_tests.cpp b/src/test/txpackage_tests.cpp
index e645a71776f7..20b30657d666 100644
--- a/src/test/txpackage_tests.cpp
+++ b/src/test/txpackage_tests.cpp
@@ -81,7 +81,7 @@ BOOST_FIXTURE_TEST_CASE(package_validation_tests, TestChain100NoDIP0001Setup)
     auto mtx_parent = CreateValidMempoolTransaction(/*input_transaction=*/m_coinbase_txns[0], /*input_vout=*/0,
                                                     /*input_height=*/0, /*input_signing_key=*/coinbaseKey,
                                                     /*output_destination=*/parent_locking_script,
-                                                    /*output_amount=*/CAmount(49 * COIN), /*submit=*/false);
+                                                    /*output_amount=*/CAmount(499 * COIN), /*submit=*/false);
     CTransactionRef tx_parent = MakeTransactionRef(mtx_parent);
 
     CKey child_key;
@@ -90,7 +90,7 @@ BOOST_FIXTURE_TEST_CASE(package_validation_tests, TestChain100NoDIP0001Setup)
     auto mtx_child = CreateValidMempoolTransaction(/*input_transaction=*/tx_parent, /*input_vout=*/0,
                                                    /*input_height=*/101, /*input_signing_key=*/parent_key,
                                                    /*output_destination=*/child_locking_script,
-                                                   /*output_amount=*/CAmount(48 * COIN), /*submit=*/false);
+                                                   /*output_amount=*/CAmount(498 * COIN), /*submit=*/false);
     CTransactionRef tx_child = MakeTransactionRef(mtx_child);
     const auto result_parent_child = ProcessNewPackage(m_node.chainman->ActiveChainstate(), *m_node.mempool, {tx_parent, tx_child}, /*test_accept=*/true);
     BOOST_CHECK_MESSAGE(result_parent_child.m_state.IsValid(),
@@ -103,6 +103,9 @@ BOOST_FIXTURE_TEST_CASE(package_validation_tests, TestChain100NoDIP0001Setup)
     BOOST_CHECK(it_child != result_parent_child.m_tx_results.end());
     BOOST_CHECK_MESSAGE(it_child->second.m_state.IsValid(),
                         "Package validation unexpectedly failed: " << it_child->second.m_state.GetRejectReason());
+    BOOST_CHECK(result_parent_child.m_package_feerate.has_value());
+    BOOST_CHECK(result_parent_child.m_package_feerate.value() ==
+                CFeeRate(2 * COIN, GetVirtualTransactionSize(*tx_parent) + GetVirtualTransactionSize(*tx_child)));
 
     // A single, giant transaction submitted through ProcessNewPackage fails on single tx policy.
     CTransactionRef giant_ptx = create_placeholder_tx(999, 999);
@@ -114,6 +117,7 @@ BOOST_FIXTURE_TEST_CASE(package_validation_tests, TestChain100NoDIP0001Setup)
     auto it_giant_tx = result_single_large.m_tx_results.find(giant_ptx->GetHash());
     BOOST_CHECK(it_giant_tx != result_single_large.m_tx_results.end());
     BOOST_CHECK_EQUAL(it_giant_tx->second.m_state.GetRejectReason(), "tx-size");
+    BOOST_CHECK(result_single_large.m_package_feerate == std::nullopt);
 
     // Check that mempool size hasn't changed.
     BOOST_CHECK_EQUAL(m_node.mempool->size(), initialPoolSize);
@@ -234,6 +238,7 @@ BOOST_FIXTURE_TEST_CASE(package_submission_tests, TestChain100NoDIP0001Setup)
     BOOST_CHECK_EQUAL(result_unrelated_submit.m_state.GetResult(), PackageValidationResult::PCKG_POLICY);
     BOOST_CHECK_EQUAL(result_unrelated_submit.m_state.GetRejectReason(), "package-not-child-with-parents");
     BOOST_CHECK_EQUAL(m_node.mempool->size(), expected_pool_size);
+    BOOST_CHECK(result_unrelated_submit.m_package_feerate == std::nullopt);
 
     // Parent and Child (and Grandchild) Package
     Package package_parent_child;
@@ -275,6 +280,7 @@ BOOST_FIXTURE_TEST_CASE(package_submission_tests, TestChain100NoDIP0001Setup)
         BOOST_CHECK_EQUAL(result_3gen_submit.m_state.GetResult(), PackageValidationResult::PCKG_POLICY);
         BOOST_CHECK_EQUAL(result_3gen_submit.m_state.GetRejectReason(), "package-not-child-with-parents");
         BOOST_CHECK_EQUAL(m_node.mempool->size(), expected_pool_size);
+        BOOST_CHECK(result_3gen_submit.m_package_feerate == std::nullopt);
     }
 
     // Child with missing parent.
@@ -290,6 +296,7 @@ BOOST_FIXTURE_TEST_CASE(package_submission_tests, TestChain100NoDIP0001Setup)
         BOOST_CHECK_EQUAL(result_missing_parent.m_state.GetRejectReason(), "package-not-child-with-unconfirmed-parents");
         BOOST_CHECK_EQUAL(m_node.mempool->size(), expected_pool_size);
 
+        BOOST_CHECK(result_missing_parent.m_package_feerate == std::nullopt);
     }
 
     // Submit package with parent + child.
@@ -309,6 +316,10 @@ BOOST_FIXTURE_TEST_CASE(package_submission_tests, TestChain100NoDIP0001Setup)
         BOOST_CHECK_EQUAL(m_node.mempool->size(), expected_pool_size);
         BOOST_CHECK(m_node.mempool->exists(tx_parent->GetHash()));
         BOOST_CHECK(m_node.mempool->exists(tx_child->GetHash()));
+
+        // Since both transactions have high feerates, they each passed validation individually.
+        // Package validation was unnecessary, so there is no package feerate.
+        BOOST_CHECK(submit_parent_child.m_package_feerate == std::nullopt);
     }
 
     // Already-in-mempool transactions should be detected and de-duplicated.
@@ -329,6 +340,200 @@ BOOST_FIXTURE_TEST_CASE(package_submission_tests, TestChain100NoDIP0001Setup)
         BOOST_CHECK_EQUAL(m_node.mempool->size(), expected_pool_size);
         BOOST_CHECK(m_node.mempool->exists(tx_parent->GetHash()));
         BOOST_CHECK(m_node.mempool->exists(tx_child->GetHash()));
+
+        BOOST_CHECK(submit_deduped.m_package_feerate == std::nullopt);
+    }
+}
+
+BOOST_FIXTURE_TEST_CASE(package_cpfp_tests, TestChain100Setup)
+{
+    mineBlocks(5);
+    LOCK(::cs_main);
+    size_t expected_pool_size = m_node.mempool->size();
+    CKey child_key;
+    child_key.MakeNewKey(true);
+    CScript parent_spk = GetScriptForDestination(PKHash(child_key.GetPubKey()));
+    CKey grandchild_key;
+    grandchild_key.MakeNewKey(true);
+    CScript child_spk = GetScriptForDestination(PKHash(grandchild_key.GetPubKey()));
+
+    // zero-fee parent and high-fee child package
+    const CAmount coinbase_value{500 * COIN};
+    const CAmount parent_value{coinbase_value - 0};
+    const CAmount child_value{parent_value - COIN};
+
+    Package package_cpfp;
+    auto mtx_parent = CreateValidMempoolTransaction(/*input_transaction=*/ m_coinbase_txns[0], /*vout=*/ 0,
+                                                    /*input_height=*/ 0, /*input_signing_key=*/ coinbaseKey,
+                                                    /*output_destination=*/ parent_spk,
+                                                    /*output_amount=*/ parent_value, /*submit=*/ false);
+    CTransactionRef tx_parent = MakeTransactionRef(mtx_parent);
+    package_cpfp.push_back(tx_parent);
+
+    auto mtx_child = CreateValidMempoolTransaction(/*input_transaction=*/ tx_parent, /*vout=*/ 0,
+                                                   /*input_height=*/ 101, /*input_signing_key=*/ child_key,
+                                                   /*output_destination=*/ child_spk,
+                                                   /*output_amount=*/ child_value, /*submit=*/ false);
+    CTransactionRef tx_child = MakeTransactionRef(mtx_child);
+    package_cpfp.push_back(tx_child);
+
+    // Package feerate is calculated using modified fees, and prioritisetransaction accepts negative
+    // fee deltas. This should be taken into account. De-prioritise the parent transaction by -1BTC,
+    // bringing the package feerate to 0.
+    m_node.mempool->PrioritiseTransaction(tx_parent->GetHash(), -1 * COIN);
+    {
+        BOOST_CHECK_EQUAL(m_node.mempool->size(), expected_pool_size);
+        const auto submit_cpfp_deprio = ProcessNewPackage(m_node.chainman->ActiveChainstate(), *m_node.mempool,
+                                                   package_cpfp, /*test_accept=*/ false);
+        BOOST_CHECK_MESSAGE(submit_cpfp_deprio.m_state.IsInvalid(),
+                            "Package validation unexpectedly succeeded: " << submit_cpfp_deprio.m_state.GetRejectReason());
+        BOOST_CHECK(submit_cpfp_deprio.m_tx_results.empty());
+        BOOST_CHECK_EQUAL(m_node.mempool->size(), expected_pool_size);
+        const CFeeRate expected_feerate(0, GetVirtualTransactionSize(*tx_parent) + GetVirtualTransactionSize(*tx_child));
+        BOOST_CHECK(submit_cpfp_deprio.m_package_feerate.has_value());
+        BOOST_CHECK(submit_cpfp_deprio.m_package_feerate.value() == CFeeRate{0});
+        BOOST_CHECK_MESSAGE(submit_cpfp_deprio.m_package_feerate.value() == expected_feerate,
+                            strprintf("Expected package feerate %s, got %s", expected_feerate.ToString(),
+                                      submit_cpfp_deprio.m_package_feerate.value().ToString()));
+    }
+
+    // Clear the prioritisation of the parent transaction.
+    WITH_LOCK(m_node.mempool->cs, m_node.mempool->ClearPrioritisation(tx_parent->GetHash()));
+
+    // Package CPFP: Even though the parent pays 0 absolute fees, the child pays 1 BTC which is
+    // enough for the package feerate to meet the threshold.
+    {
+        BOOST_CHECK_EQUAL(m_node.mempool->size(), expected_pool_size);
+        const auto submit_cpfp = ProcessNewPackage(m_node.chainman->ActiveChainstate(), *m_node.mempool,
+                                                   package_cpfp, /*test_accept=*/ false);
+        expected_pool_size += 2;
+        BOOST_CHECK_MESSAGE(submit_cpfp.m_state.IsValid(),
+                            "Package validation unexpectedly failed: " << submit_cpfp.m_state.GetRejectReason());
+        auto it_parent = submit_cpfp.m_tx_results.find(tx_parent->GetHash());
+        auto it_child = submit_cpfp.m_tx_results.find(tx_child->GetHash());
+        BOOST_CHECK(it_parent != submit_cpfp.m_tx_results.end());
+        BOOST_CHECK(it_parent->second.m_result_type == MempoolAcceptResult::ResultType::VALID);
+        BOOST_CHECK(it_parent->second.m_base_fees.value() == 0);
+        BOOST_CHECK(it_child != submit_cpfp.m_tx_results.end());
+        BOOST_CHECK(it_child->second.m_result_type == MempoolAcceptResult::ResultType::VALID);
+        BOOST_CHECK(it_child->second.m_base_fees.value() == COIN);
+
+        BOOST_CHECK_EQUAL(m_node.mempool->size(), expected_pool_size);
+        BOOST_CHECK(m_node.mempool->exists(tx_parent->GetHash()));
+        BOOST_CHECK(m_node.mempool->exists(tx_child->GetHash()));
+
+        const CFeeRate expected_feerate(coinbase_value - child_value,
+                                        GetVirtualTransactionSize(*tx_parent) + GetVirtualTransactionSize(*tx_child));
+        BOOST_CHECK(expected_feerate.GetFeePerK() > 1000);
+        BOOST_CHECK(submit_cpfp.m_package_feerate.has_value());
+        BOOST_CHECK_MESSAGE(submit_cpfp.m_package_feerate.value() == expected_feerate,
+                            strprintf("Expected package feerate %s, got %s", expected_feerate.ToString(),
+                                      submit_cpfp.m_package_feerate.value().ToString()));
+    }
+
+    // Just because we allow low-fee parents doesn't mean we allow low-feerate packages.
+    // This package just pays 200 satoshis total. This would be enough to pay for the child alone,
+    // but isn't enough for the entire package to meet the 1sat/vbyte minimum.
+    Package package_still_too_low;
+    auto mtx_parent_cheap = CreateValidMempoolTransaction(/*input_transaction=*/ m_coinbase_txns[1], /*vout=*/ 0,
+                                                          /*input_height=*/ 0, /*input_signing_key=*/ coinbaseKey,
+                                                          /*output_destination=*/ parent_spk,
+                                                          /*output_amount=*/ coinbase_value, /*submit=*/ false);
+    CTransactionRef tx_parent_cheap = MakeTransactionRef(mtx_parent_cheap);
+    package_still_too_low.push_back(tx_parent_cheap);
+
+    auto mtx_child_cheap = CreateValidMempoolTransaction(/*input_transaction=*/ tx_parent_cheap, /*vout=*/ 0,
+                                                         /*input_height=*/ 101, /* input_signing_key */ child_key,
+                                                         /*output_destination=*/ child_spk,
+                                                         /*output_amount=*/ coinbase_value - 200, /*submit=*/ false);
+    CTransactionRef tx_child_cheap = MakeTransactionRef(mtx_child_cheap);
+    package_still_too_low.push_back(tx_child_cheap);
+
+    // Cheap package should fail with package-fee-too-low.
+    {
+        BOOST_CHECK_EQUAL(m_node.mempool->size(), expected_pool_size);
+        const auto submit_package_too_low = ProcessNewPackage(m_node.chainman->ActiveChainstate(), *m_node.mempool,
+                                                   package_still_too_low, /* test_accept */ false);
+        BOOST_CHECK_MESSAGE(submit_package_too_low.m_state.IsInvalid(), "Package validation unexpectedly succeeded");
+        BOOST_CHECK_EQUAL(submit_package_too_low.m_state.GetResult(), PackageValidationResult::PCKG_POLICY);
+        BOOST_CHECK_EQUAL(submit_package_too_low.m_state.GetRejectReason(), "package-fee-too-low");
+        BOOST_CHECK_EQUAL(m_node.mempool->size(), expected_pool_size);
+        const CFeeRate child_feerate(200, GetVirtualTransactionSize(*tx_child_cheap));
+        BOOST_CHECK(child_feerate.GetFeePerK() > 1000);
+        const CFeeRate expected_feerate(200,
+            GetVirtualTransactionSize(*tx_parent_cheap) + GetVirtualTransactionSize(*tx_child_cheap));
+        BOOST_CHECK(expected_feerate.GetFeePerK() < 1000);
+        BOOST_CHECK(submit_package_too_low.m_package_feerate.has_value());
+        BOOST_CHECK_MESSAGE(submit_package_too_low.m_package_feerate.value() == expected_feerate,
+                            strprintf("Expected package feerate %s, got %s", expected_feerate.ToString(),
+                                      submit_package_too_low.m_package_feerate.value().ToString()));
+    }
+
+    // Package feerate includes the modified fees of the transactions.
+    // This means a child with its fee delta from prioritisetransaction can pay for a parent.
+    m_node.mempool->PrioritiseTransaction(tx_child_cheap->GetHash(), 1 * COIN);
+    // Now that the child's fees have "increased" by 1 BTC, the cheap package should succeed.
+    {
+        const auto submit_prioritised_package = ProcessNewPackage(m_node.chainman->ActiveChainstate(), *m_node.mempool,
+                                                                  package_still_too_low, /*test_accept=*/ false);
+        expected_pool_size += 2;
+        BOOST_CHECK_MESSAGE(submit_prioritised_package.m_state.IsValid(),
+                "Package validation unexpectedly failed" << submit_prioritised_package.m_state.GetRejectReason());
+        const CFeeRate expected_feerate(1 * COIN + 200,
+            GetVirtualTransactionSize(*tx_parent_cheap) + GetVirtualTransactionSize(*tx_child_cheap));
+        BOOST_CHECK(submit_prioritised_package.m_package_feerate.has_value());
+        BOOST_CHECK_MESSAGE(submit_prioritised_package.m_package_feerate.value() == expected_feerate,
+                            strprintf("Expected package feerate %s, got %s", expected_feerate.ToString(),
+                                      submit_prioritised_package.m_package_feerate.value().ToString()));
+    }
+
+    // Package feerate is calculated without topology in mind; it's just aggregating fees and sizes.
+    // However, this should not allow parents to pay for children. Each transaction should be
+    // validated individually first, eliminating sufficient-feerate parents before they are unfairly
+    // included in the package feerate. It's also important that the low-fee child doesn't prevent
+    // the parent from being accepted.
+    Package package_rich_parent;
+    const CAmount high_parent_fee{1 * COIN};
+    auto mtx_parent_rich = CreateValidMempoolTransaction(/*input_transaction=*/ m_coinbase_txns[2], /*vout=*/ 0,
+                                                         /*input_height=*/ 0, /*input_signing_key=*/ coinbaseKey,
+                                                         /*output_destination=*/ parent_spk,
+                                                         /*output_amount=*/ coinbase_value - high_parent_fee, /*submit=*/ false);
+    CTransactionRef tx_parent_rich = MakeTransactionRef(mtx_parent_rich);
+    package_rich_parent.push_back(tx_parent_rich);
+
+    auto mtx_child_poor = CreateValidMempoolTransaction(/*input_transaction=*/ tx_parent_rich, /*vout=*/ 0,
+                                                        /*input_height=*/ 101, /*input_signing_key=*/ child_key,
+                                                        /*output_destination=*/ child_spk,
+                                                        /*output_amount=*/ coinbase_value - high_parent_fee, /*submit=*/ false);
+    CTransactionRef tx_child_poor = MakeTransactionRef(mtx_child_poor);
+    package_rich_parent.push_back(tx_child_poor);
+
+    // Parent pays 1 BTC and child pays none. The parent should be accepted without the child.
+    {
+        BOOST_CHECK_EQUAL(m_node.mempool->size(), expected_pool_size);
+        const auto submit_rich_parent = ProcessNewPackage(m_node.chainman->ActiveChainstate(), *m_node.mempool,
+                                                          package_rich_parent, /* test_accept */ false);
+        expected_pool_size += 1;
+        BOOST_CHECK_MESSAGE(submit_rich_parent.m_state.IsInvalid(), "Package validation unexpectedly succeeded");
+
+        // The child would have been validated on its own and failed, then submitted as a "package" of 1.
+        // The package feerate is just the child's feerate, which is 0sat/vb.
+        BOOST_CHECK(submit_rich_parent.m_package_feerate.has_value());
+        BOOST_CHECK_MESSAGE(submit_rich_parent.m_package_feerate.value() == CFeeRate(),
+                            "expected 0, got " << submit_rich_parent.m_package_feerate.value().ToString());
+        BOOST_CHECK_EQUAL(submit_rich_parent.m_state.GetResult(), PackageValidationResult::PCKG_POLICY);
+        BOOST_CHECK_EQUAL(submit_rich_parent.m_state.GetRejectReason(), "package-fee-too-low");
+
+        auto it_parent = submit_rich_parent.m_tx_results.find(tx_parent_rich->GetHash());
+        BOOST_CHECK(it_parent != submit_rich_parent.m_tx_results.end());
+        BOOST_CHECK(it_parent->second.m_result_type == MempoolAcceptResult::ResultType::VALID);
+        BOOST_CHECK(it_parent->second.m_state.GetRejectReason() == "");
+        BOOST_CHECK_MESSAGE(it_parent->second.m_base_fees.value() == high_parent_fee,
+                strprintf("rich parent: expected fee %s, got %s", high_parent_fee, it_parent->second.m_base_fees.value()));
+
+        BOOST_CHECK_EQUAL(m_node.mempool->size(), expected_pool_size);
+        BOOST_CHECK(m_node.mempool->exists(tx_parent_rich->GetHash()));
+        BOOST_CHECK(!m_node.mempool->exists(tx_child_poor->GetHash()));
     }
 }
 BOOST_AUTO_TEST_SUITE_END()
diff --git a/src/validation.cpp b/src/validation.cpp
index f0292f45ff6e..7a505d13135e 100644
--- a/src/validation.cpp
+++ b/src/validation.cpp
@@ -559,6 +559,10 @@ class MemPoolAccept
          * partially submitted.
          */
         const bool m_package_submission;
+        /** When true, use package feerates instead of individual transaction feerates for fee-based
+         * policies such as mempool min fee and min relay fee.
+         */
+        const bool m_package_feerates;
 
         /** Parameters for single transaction mempool validation. */
         static ATMPArgs SingleAccept(const CChainParams& chainparams, int64_t accept_time,
@@ -570,6 +574,7 @@ class MemPoolAccept
                             /* m_coins_to_uncache */ coins_to_uncache,
                             /* m_test_accept */ test_accept,
                             /* m_package_submission */ false,
+                            /* m_package_feerates */ false,
             };
         }
 
@@ -582,6 +587,7 @@ class MemPoolAccept
                             /* m_coins_to_uncache */ coins_to_uncache,
                             /* m_test_accept */ true,
                             /* m_package_submission */ false, // not submitting to mempool
+                            /* m_package_feerates */ false,
             };
         }
 
@@ -594,6 +600,19 @@ class MemPoolAccept
                             /* m_coins_to_uncache */ coins_to_uncache,
                             /* m_test_accept */ false,
                             /* m_package_submission */ true,
+                            /* m_package_feerates */ true,
+            };
+        }
+
+        /** Parameters for a single transaction within a package. */
+        static ATMPArgs SingleInPackageAccept(const ATMPArgs& package_args) {
+            return ATMPArgs{/* m_chainparams */ package_args.m_chainparams,
+                            /* m_accept_time */ package_args.m_accept_time,
+                            /* m_bypass_limits */ false,
+                            /* m_coins_to_uncache */ package_args.m_coins_to_uncache,
+                            /* m_test_accept */ package_args.m_test_accept,
+                            /* m_package_submission */ false,
+                            /* m_package_feerates */ false, // only 1 transaction
             };
         }
 
@@ -605,13 +624,15 @@ class MemPoolAccept
                  bool bypass_limits,
                  std::vector<COutPoint>& coins_to_uncache,
                  bool test_accept,
-                 bool package_submission)
+                 bool package_submission,
+                 bool package_feerates)
             : m_chainparams{chainparams},
               m_accept_time{accept_time},
               m_bypass_limits{bypass_limits},
               m_coins_to_uncache{coins_to_uncache},
               m_test_accept{test_accept},
-              m_package_submission{package_submission}
+              m_package_submission{package_submission},
+              m_package_feerates{package_feerates}
         {
         }
     };
@@ -892,12 +913,13 @@ bool MemPoolAccept::PreChecks(ATMPArgs& args, Workspace& ws)
         return state.Invalid(TxValidationResult::TX_NOT_STANDARD, "bad-txns-too-many-sigops",
                 strprintf("%d", nSigOps));
 
-    // No transactions are allowed below minRelayTxFee except from disconnected
-    // blocks
+    // No individual transactions are allowed below minRelayTxFee and mempool min fee except from
+    // disconnected blocks and transactions in a package. Package transactions will be checked using
+    // package feerate later.
     // Checking of fee for MNHF_SIGNAL should be skipped: mnhf does not have
     // inputs, outputs, or fee
     if (!tx.IsSpecialTxVersion() || tx.nType != TRANSACTION_MNHF_SIGNAL) {
-        if (!bypass_limits && !CheckFeeRate(ws.m_vsize, ws.m_modified_fees, state)) return false;
+        if (!bypass_limits && !args.m_package_feerates && !CheckFeeRate(ws.m_vsize, ws.m_modified_fees, state)) return false;
     }
 
     // Calculate in-mempool ancestors, up to a limit.
@@ -1201,12 +1223,27 @@ PackageMempoolAcceptResult MemPoolAccept::AcceptMultipleTransactions(const std::
         m_viewmempool.PackageAddTransaction(ws.m_ptx);
     }
 
+    // Transactions must meet two minimum feerates: the mempool minimum fee and min relay fee.
+    // For transactions consisting of exactly one child and its parents, it suffices to use the
+    // package feerate (total modified fees / total virtual size) to check this requirement.
+    const auto m_total_vsize = std::accumulate(workspaces.cbegin(), workspaces.cend(), int64_t{0},
+        [](int64_t sum, auto& ws) { return sum + ws.m_vsize; });
+    const auto m_total_modified_fees = std::accumulate(workspaces.cbegin(), workspaces.cend(), CAmount{0},
+        [](CAmount sum, auto& ws) { return sum + ws.m_modified_fees; });
+    const CFeeRate package_feerate(m_total_modified_fees, m_total_vsize);
+    TxValidationState placeholder_state;
+    if (args.m_package_feerates &&
+        !CheckFeeRate(m_total_vsize, m_total_modified_fees, placeholder_state)) {
+        package_state.Invalid(PackageValidationResult::PCKG_POLICY, "package-fee-too-low");
+        return PackageMempoolAcceptResult(package_state, package_feerate, {});
+    }
+
     // Apply package mempool ancestor/descendant limits. Skip if there is only one transaction,
     // because it's unnecessary. Also, CPFP carve out can increase the limit for individual
     // transactions, but this exemption is not extended to packages in CheckPackageLimits().
     std::string err_string;
     if (txns.size() > 1 && !PackageMempoolChecks(txns, package_state)) {
-        return PackageMempoolAcceptResult(package_state, std::move(results));
+        return PackageMempoolAcceptResult(package_state, package_feerate, std::move(results));
     }
 
     for (Workspace& ws : workspaces) {
@@ -1214,7 +1251,7 @@ PackageMempoolAcceptResult MemPoolAccept::AcceptMultipleTransactions(const std::
             // Exit early to avoid doing pointless work. Update the failed tx result; the rest are unfinished.
             package_state.Invalid(PackageValidationResult::PCKG_TX, "transaction failed");
             results.emplace(ws.m_ptx -> GetHash(), MempoolAcceptResult::Failure(ws.m_state));
-            return PackageMempoolAcceptResult(package_state, std::move(results));
+            return PackageMempoolAcceptResult(package_state, package_feerate, std::move(results));
         }
         if (args.m_test_accept) {
             // When test_accept=true, transactions that pass PolicyScriptChecks are valid because there are
@@ -1224,14 +1261,14 @@ PackageMempoolAcceptResult MemPoolAccept::AcceptMultipleTransactions(const std::
         }
     }
 
-    if (args.m_test_accept) return PackageMempoolAcceptResult(package_state, std::move(results));
+    if (args.m_test_accept) return PackageMempoolAcceptResult(package_state, package_feerate, std::move(results));
 
     if (!SubmitPackage(args, workspaces, package_state, results)) {
         // PackageValidationState filled in by SubmitPackage().
-        return PackageMempoolAcceptResult(package_state, std::move(results));
+        return PackageMempoolAcceptResult(package_state, package_feerate, std::move(results));
     }
 
-    return PackageMempoolAcceptResult(package_state, std::move(results));
+    return PackageMempoolAcceptResult(package_state, package_feerate, std::move(results));
 }
 
 PackageMempoolAcceptResult MemPoolAccept::AcceptPackage(const Package& package, ATMPArgs& args)
@@ -1298,6 +1335,8 @@ PackageMempoolAcceptResult MemPoolAccept::AcceptPackage(const Package& package,
     // transactions that are already in the mempool, and only call AcceptMultipleTransactions() with
     // the new transactions. This ensures we don't double-count transaction counts and sizes when
     // checking ancestor/descendant limits, or double-count transaction fees for fee-related policy.
+    ATMPArgs single_args = ATMPArgs::SingleInPackageAccept(args);
+    bool quit_early{false};
     std::vector<CTransactionRef> txns_new;
     for (const auto& tx : package) {
         const auto& txid = tx->GetHash();
@@ -1310,18 +1349,43 @@ PackageMempoolAcceptResult MemPoolAccept::AcceptPackage(const Package& package,
             results.emplace(txid, MempoolAcceptResult::MempoolTx(iter.value()->GetTxSize(), iter.value()->GetFee()));
         } else {
             // Transaction does not already exist in the mempool.
-            txns_new.push_back(tx);
+            // Try submitting the transaction on its own.
+            const auto single_res = AcceptSingleTransaction(tx, single_args);
+            if (single_res.m_result_type == MempoolAcceptResult::ResultType::VALID) {
+                // The transaction succeeded on its own and is now in the mempool. Don't include it
+                // in package validation, because its fees should only be "used" once.
+                assert(m_pool.exists(txid));
+                results.emplace(txid, single_res);
+            } else if (single_res.m_state.GetResult() != TxValidationResult::TX_MEMPOOL_POLICY &&
+                       single_res.m_state.GetResult() != TxValidationResult::TX_MISSING_INPUTS) {
+                // Package validation policy only differs from individual policy in its evaluation
+                // of feerate. For example, if a transaction fails here due to violation of a
+                // consensus rule, the result will not change when it is submitted as part of a
+                // package. To minimize the amount of repeated work, unless the transaction fails
+                // due to feerate or missing inputs (its parent is a previous transaction in the
+                // package that failed due to feerate), don't run package validation. Note that this
+                // decision might not make sense if different types of packages are allowed in the
+                // future.  Continue individually validating the rest of the transactions, because
+                // some of them may still be valid.
+                quit_early = true;
+            } else {
+                txns_new.push_back(tx);
+            }
         }
     }
 
     // Nothing to do if the entire package has already been submitted.
-    if (txns_new.empty()) return PackageMempoolAcceptResult(package_state, std::move(results));
+    if (quit_early || txns_new.empty()) {
+        // No package feerate when no package validation was done.
+        return PackageMempoolAcceptResult(package_state, std::move(results));
+    }
     // Validate the (deduplicated) transactions as a package.
     auto submission_result = AcceptMultipleTransactions(txns_new, args);
     // Include already-in-mempool transaction results in the final result.
     for (const auto& [txid, mempoolaccept_res] : results) {
         submission_result.m_tx_results.emplace(txid, mempoolaccept_res);
     }
+    if (submission_result.m_state.IsValid()) assert(submission_result.m_package_feerate.has_value());
     return submission_result;
 }
 
diff --git a/src/validation.h b/src/validation.h
index 31318029cf8e..72769a0562dc 100644
--- a/src/validation.h
+++ b/src/validation.h
@@ -231,11 +231,19 @@ struct PackageMempoolAcceptResult
     * was a package-wide error (see result in m_state), m_tx_results will be empty.
     */
     std::map<const uint256, const MempoolAcceptResult> m_tx_results;
+    /** Package feerate, defined as the aggregated modified fees divided by the total size
+     * of all transactions in the package.  May be unavailable if some inputs were not available or
+     * a transaction failure caused validation to terminate early. */
+    std::optional<CFeeRate> m_package_feerate;
 
     explicit PackageMempoolAcceptResult(PackageValidationState state,
                                         std::map<const uint256, const MempoolAcceptResult>&& results)
         : m_state{state}, m_tx_results(std::move(results)) {}
 
+    explicit PackageMempoolAcceptResult(PackageValidationState state, CFeeRate feerate,
+                                        std::map<const uint256, const MempoolAcceptResult>&& results)
+        : m_state{state}, m_tx_results(std::move(results)), m_package_feerate{feerate} {}
+
     /** Constructor to create a PackageMempoolAcceptResult from a single MempoolAcceptResult */
     explicit PackageMempoolAcceptResult(const uint256 &txid, const MempoolAcceptResult& result)
         : m_tx_results{ {txid, result} } {}

From fcfb96ea421fcc0f0fe8c149087dc9ab12457a00 Mon Sep 17 00:00:00 2001
From: Konstantin Akimov <knstqq@gmail.com>
Date: Fri, 3 Oct 2025 03:44:08 +0700
Subject: [PATCH 201/656] fix: remove mentioning of `virtual` from validation.h
 which are irrelevant

---
 src/validation.cpp | 4 ++--
 src/validation.h   | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/validation.cpp b/src/validation.cpp
index 7a505d13135e..8f99f5240e5a 100644
--- a/src/validation.cpp
+++ b/src/validation.cpp
@@ -664,7 +664,7 @@ class MemPoolAccept
          * inserted into the mempool until Finalize(). */
         std::unique_ptr<CTxMemPoolEntry> m_entry;
 
-        /** Virtual size of the transaction as used by the mempool, calculated using serialized size
+        /** Size of the transaction as used by the mempool, calculated using serialized size
          * of the transaction and sigops. */
         int64_t m_vsize;
         /** Fees paid by this transaction: total input amounts subtracted by total output amounts. */
@@ -1225,7 +1225,7 @@ PackageMempoolAcceptResult MemPoolAccept::AcceptMultipleTransactions(const std::
 
     // Transactions must meet two minimum feerates: the mempool minimum fee and min relay fee.
     // For transactions consisting of exactly one child and its parents, it suffices to use the
-    // package feerate (total modified fees / total virtual size) to check this requirement.
+    // package feerate (total modified fees / total size) to check this requirement.
     const auto m_total_vsize = std::accumulate(workspaces.cbegin(), workspaces.cend(), int64_t{0},
         [](int64_t sum, auto& ws) { return sum + ws.m_vsize; });
     const auto m_total_modified_fees = std::accumulate(workspaces.cbegin(), workspaces.cend(), CAmount{0},
diff --git a/src/validation.h b/src/validation.h
index 72769a0562dc..f53f098b9a3b 100644
--- a/src/validation.h
+++ b/src/validation.h
@@ -180,7 +180,7 @@ struct MempoolAcceptResult {
     const TxValidationState m_state;
 
     // The following fields are only present when m_result_type = ResultType::VALID or MEMPOOL_ENTRY
-    /** Virtual size as used by the mempool, calculated using serialized size and sigops. */
+    /** Size as used by the mempool, calculated using serialized size and sigops. */
     const std::optional<int64_t> m_vsize;
     /** Raw base fees in satoshis. */
     const std::optional<CAmount> m_base_fees;

From 5867f716c45c491a5a24ba5901f03e3d0dd2eafe Mon Sep 17 00:00:00 2001
From: laanwj <126646+laanwj@users.noreply.github.com>
Date: Tue, 5 Apr 2022 13:02:27 +0200
Subject: [PATCH 202/656] Merge bitcoin/bitcoin#24147: Miniscript integration

2da94a4c6f55f7a3621f4a6f70902c52f735c868 fuzz: add a fuzz target for Miniscript decoding from Script (Antoine Poinsot)
f8369996e76dbc41a12f7b7eea14a7e7990a81c1 Miniscript: ops limit and stack size computation (Pieter Wuille)
2e55e88f86d0dd49b35d04af3f57e863498aabae Miniscript: conversion from script (Pieter Wuille)
1ddaa66eae67b102f5e37d212d366a5dcad4aa26 Miniscript: type system, script creation, text notation, tests (Pieter Wuille)
4fe29368c0ded0e62f437cab3a7c904f7fd3ad67 script: expose getter for CScriptNum, add a BuildScript helper (Antoine Poinsot)
f4e289f384efdda6c3f56e1e1c30820a91ac2612 script: move CheckMinimalPush from interpreter to script.h (Antoine Poinsot)
31ec6ae92a5d9910a26d90a6ff20bab27dee5826 script: make IsPushdataOp non-static (Antoine Poinsot)

Pull request description:

  Miniscript is a language for writing (a subset of) Bitcoin Scripts in a structured way.

  Miniscript permits:
  - To safely extend the Output Descriptor language to many more scripting features thanks to the typing system (composition).
  - Statical analysis of spending conditions, maximum spending cost of each branch, security properties, third-party malleability.
  - General satisfaction of any correctly typed ("valid" [0]) Miniscript. The satisfaction itself is also analyzable.
  - To extend the possibilities of external signers, because of all of the above and since it carries enough metadata.

  Miniscript guarantees:
  - That for any statically-analyzed as "safe" [0] Script, a witness can be constructed in the bounds of the consensus and standardness rules (standardness complete).
  - That unless the conditions of the Miniscript are met, no witness can be created for the Script (consensus sound).
  - Third-party malleability protection for the satisfaction of a sane Miniscript, which is too complex to summarize here.

  For more details around Miniscript (including the specifications), please refer to the [website](https://bitcoin.sipa.be/miniscript/).

  Miniscript was designed by Pieter Wuille, Andrew Poelstra and Sanket Kanjalkar.
  This PR is an updated and rebased version of #16800. See [the commit history of the Miniscript repository](https://github.com/sipa/miniscript/commits/master) for details about the changes made since September 2019 (TL;DR: bugfixes, introduction of timelock conflicts in the type system, `pk()` and `pkh()` aliases, `thresh_m` renamed to `multi`, all recursive algorithms were made non-recursive).

  This PR is also the first in a series of 3:
  - The first one (here) integrates the backbone of Miniscript.
  - The second one (#24148) introduces support for Miniscript in Output Descriptors, allowing for watch-only support of Miniscript Descriptors in the wallet.
  - The third one (#24149) implements signing for these Miniscript Descriptors, using Miniscript's satisfaction algorithm.

  Note to reviewers:
  - Miniscript is currently defined only for P2WSH. No Taproot yet.
  - Miniscript is different from the policy language (a high-level logical representation of a spending policy). A policy->Miniscript compiler is not included here.
  - The fuzz target included here is more interestingly extended in the 3rd PR to check a script's satisfaction against `VerifyScript`. I think it could be further improved by having custom mutators as we now have for multisig (see https://github.com/bitcoin/bitcoin/issues/23105). A minified corpus of Miniscript Scripts is available at https://github.com/bitcoin-core/qa-assets/pull/85.

  [0] We call "valid" any correctly-typed Miniscript. And "safe" any sane Miniscript, ie one whose satisfaction isn't malleable, which requires a key for any spending path, etc..

ACKs for top commit:
  jb55:
    ACK 2da94a4c6f55f7a3621f4a6f70902c52f735c868
  laanwj:
    Light code review ACK 2da94a4c6f55f7a3621f4a6f70902c52f735c868 (mostly reviewed the changes to the existing code and build system)

Tree-SHA512: d3ef558436cfcc699a50ad13caf1e776f7d0addddb433ee28ef38f66ea5c3e581382d8c748ccac9b51768e4b95712ed7a6112b0e3281a6551e0f325331de9167
---
 src/Makefile.am                     |    2 +
 src/Makefile.test.include           |    2 +
 src/script/interpreter.cpp          |   25 -
 src/script/interpreter.h            |    2 -
 src/script/miniscript.cpp           |  348 ++++++
 src/script/miniscript.h             | 1649 +++++++++++++++++++++++++++
 src/script/script.cpp               |   25 +
 src/script/script.h                 |   29 +
 src/script/standard.cpp             |    5 -
 src/script/standard.h               |    5 +
 src/test/fuzz/miniscript_decode.cpp |   72 ++
 src/test/miniscript_tests.cpp       |  284 +++++
 12 files changed, 2416 insertions(+), 32 deletions(-)
 create mode 100644 src/script/miniscript.cpp
 create mode 100644 src/script/miniscript.h
 create mode 100644 src/test/fuzz/miniscript_decode.cpp
 create mode 100644 src/test/miniscript_tests.cpp

diff --git a/src/Makefile.am b/src/Makefile.am
index 9ad66b87a276..cacc53d622ec 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -345,6 +345,7 @@ BITCOIN_CORE_H = \
   scheduler.h \
   script/descriptor.h \
   script/keyorigin.h \
+  script/miniscript.h \
   script/sigcache.h \
   script/sign.h \
   script/signingprovider.h \
@@ -923,6 +924,7 @@ libbitcoin_common_a_SOURCES = \
   saltedhasher.cpp \
   scheduler.cpp \
   script/descriptor.cpp \
+  script/miniscript.cpp \
   script/sign.cpp \
   script/signingprovider.cpp \
   script/standard.cpp \
diff --git a/src/Makefile.test.include b/src/Makefile.test.include
index b05116eaee52..d4107750889d 100644
--- a/src/Makefile.test.include
+++ b/src/Makefile.test.include
@@ -145,6 +145,7 @@ BITCOIN_TESTS =\
   test/mempool_tests.cpp \
   test/merkle_tests.cpp \
   test/merkleblock_tests.cpp \
+  test/miniscript_tests.cpp \
   test/minisketch_tests.cpp \
   test/miner_tests.cpp \
   test/multisig_tests.cpp \
@@ -320,6 +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/minisketch.cpp \
  test/fuzz/muhash.cpp \
  test/fuzz/multiplication_overflow.cpp \
diff --git a/src/script/interpreter.cpp b/src/script/interpreter.cpp
index 0d7f63a82a64..7d2c42f2fe6a 100644
--- a/src/script/interpreter.cpp
+++ b/src/script/interpreter.cpp
@@ -221,31 +221,6 @@ bool static CheckPubKeyEncoding(const valtype &vchPubKey, unsigned int flags, co
     return true;
 }
 
-bool CheckMinimalPush(const valtype& data, opcodetype opcode) {
-    // Excludes OP_1NEGATE, OP_1-16 since they are by definition minimal
-    assert(0 <= opcode && opcode <= OP_PUSHDATA4);
-    if (data.size() == 0) {
-        // Should have used OP_0.
-        return opcode == OP_0;
-    } else if (data.size() == 1 && data[0] >= 1 && data[0] <= 16) {
-        // Should have used OP_1 .. OP_16.
-        return false;
-    } else if (data.size() == 1 && data[0] == 0x81) {
-        // Should have used OP_1NEGATE.
-        return false;
-    } else if (data.size() <= 75) {
-        // Must have used a direct push (opcode indicating number of bytes pushed + those bytes).
-        return opcode == data.size();
-    } else if (data.size() <= 255) {
-        // Must have used OP_PUSHDATA.
-        return opcode == OP_PUSHDATA1;
-    } else if (data.size() <= 65535) {
-        // Must have used OP_PUSHDATA2.
-        return opcode == OP_PUSHDATA2;
-    }
-    return true;
-}
-
 int FindAndDelete(CScript& script, const CScript& b)
 {
     int nFound = 0;
diff --git a/src/script/interpreter.h b/src/script/interpreter.h
index d8809f386c71..f2678e4b748f 100644
--- a/src/script/interpreter.h
+++ b/src/script/interpreter.h
@@ -214,8 +214,6 @@ class DeferringSignatureChecker : public BaseSignatureChecker
 bool EvalScript(std::vector<std::vector<unsigned char> >& stack, const CScript& script, unsigned int flags, const BaseSignatureChecker& checker, SigVersion sigversion, ScriptError* error = nullptr);
 bool VerifyScript(const CScript& scriptSig, const CScript& scriptPubKey, unsigned int flags, const BaseSignatureChecker& checker, ScriptError* error = nullptr);
 
-bool CheckMinimalPush(const std::vector<unsigned char>& data, opcodetype opcode);
-
 int FindAndDelete(CScript& script, const CScript& b);
 
 #endif // BITCOIN_SCRIPT_INTERPRETER_H
diff --git a/src/script/miniscript.cpp b/src/script/miniscript.cpp
new file mode 100644
index 000000000000..d0bb93788524
--- /dev/null
+++ b/src/script/miniscript.cpp
@@ -0,0 +1,348 @@
+// Copyright (c) 2019 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 <string>
+#include <vector>
+#include <script/script.h>
+#include <script/standard.h>
+#include <script/miniscript.h>
+
+#include <assert.h>
+
+namespace miniscript {
+namespace internal {
+
+Type SanitizeType(Type e) {
+    int num_types = (e << "K"_mst) + (e << "V"_mst) + (e << "B"_mst) + (e << "W"_mst);
+    if (num_types == 0) return ""_mst; // No valid type, don't care about the rest
+    assert(num_types == 1); // K, V, B, W all conflict with each other
+    bool ok = // Work around a GCC 4.8 bug that breaks user-defined literals in macro calls.
+        (!(e << "z"_mst) || !(e << "o"_mst)) && // z conflicts with o
+        (!(e << "n"_mst) || !(e << "z"_mst)) && // n conflicts with z
+        (!(e << "n"_mst) || !(e << "W"_mst)) && // n conflicts with W
+        (!(e << "V"_mst) || !(e << "d"_mst)) && // V conflicts with d
+        (!(e << "K"_mst) ||  (e << "u"_mst)) && // K implies u
+        (!(e << "V"_mst) || !(e << "u"_mst)) && // V conflicts with u
+        (!(e << "e"_mst) || !(e << "f"_mst)) && // e conflicts with f
+        (!(e << "e"_mst) ||  (e << "d"_mst)) && // e implies d
+        (!(e << "V"_mst) || !(e << "e"_mst)) && // V conflicts with e
+        (!(e << "d"_mst) || !(e << "f"_mst)) && // d conflicts with f
+        (!(e << "V"_mst) ||  (e << "f"_mst)) && // V implies f
+        (!(e << "K"_mst) ||  (e << "s"_mst)) && // K implies s
+        (!(e << "z"_mst) ||  (e << "m"_mst)); // z implies m
+    assert(ok);
+    return e;
+}
+
+Type ComputeType(Fragment nodetype, Type x, Type y, Type z, const std::vector<Type>& sub_types, uint32_t k, size_t data_size, size_t n_subs, size_t n_keys) {
+    // Sanity check on data
+    if (nodetype == Fragment::SHA256 || nodetype == Fragment::HASH256) {
+        assert(data_size == 32);
+    } else if (nodetype == Fragment::RIPEMD160 || nodetype == Fragment::HASH160) {
+        assert(data_size == 20);
+    } else {
+        assert(data_size == 0);
+    }
+    // Sanity check on k
+    if (nodetype == Fragment::OLDER || nodetype == Fragment::AFTER) {
+        assert(k >= 1 && k < 0x80000000UL);
+    } else if (nodetype == Fragment::MULTI) {
+        assert(k >= 1 && k <= n_keys);
+    } else if (nodetype == Fragment::THRESH) {
+        assert(k >= 1 && k <= n_subs);
+    } else {
+        assert(k == 0);
+    }
+    // Sanity check on subs
+    if (nodetype == Fragment::AND_V || nodetype == Fragment::AND_B || nodetype == Fragment::OR_B ||
+        nodetype == Fragment::OR_C || nodetype == Fragment::OR_I || nodetype == Fragment::OR_D) {
+        assert(n_subs == 2);
+    } else if (nodetype == Fragment::ANDOR) {
+        assert(n_subs == 3);
+    } else if (nodetype == Fragment::WRAP_A || nodetype == Fragment::WRAP_S || nodetype == Fragment::WRAP_C ||
+               nodetype == Fragment::WRAP_D || nodetype == Fragment::WRAP_V || nodetype == Fragment::WRAP_J ||
+               nodetype == Fragment::WRAP_N) {
+        assert(n_subs == 1);
+    } else if (nodetype != Fragment::THRESH) {
+        assert(n_subs == 0);
+    }
+    // Sanity check on keys
+    if (nodetype == Fragment::PK_K || nodetype == Fragment::PK_H) {
+        assert(n_keys == 1);
+    } else if (nodetype == Fragment::MULTI) {
+        assert(n_keys >= 1 && n_keys <= 20);
+    } else {
+        assert(n_keys == 0);
+    }
+
+    // Below is the per-nodetype logic for computing the expression types.
+    // It heavily relies on Type's << operator (where "X << a_mst" means
+    // "X has all properties listed in a").
+    switch (nodetype) {
+        case Fragment::PK_K: return "Konudemsxk"_mst;
+        case Fragment::PK_H: return "Knudemsxk"_mst;
+        case Fragment::OLDER: return
+            "g"_mst.If(k & CTxIn::SEQUENCE_LOCKTIME_TYPE_FLAG) |
+            "h"_mst.If(!(k & CTxIn::SEQUENCE_LOCKTIME_TYPE_FLAG)) |
+            "Bzfmxk"_mst;
+        case Fragment::AFTER: return
+            "i"_mst.If(k >= LOCKTIME_THRESHOLD) |
+            "j"_mst.If(k < LOCKTIME_THRESHOLD) |
+            "Bzfmxk"_mst;
+        case Fragment::SHA256: return "Bonudmk"_mst;
+        case Fragment::RIPEMD160: return "Bonudmk"_mst;
+        case Fragment::HASH256: return "Bonudmk"_mst;
+        case Fragment::HASH160: return "Bonudmk"_mst;
+        case Fragment::JUST_1: return "Bzufmxk"_mst;
+        case Fragment::JUST_0: return "Bzudemsxk"_mst;
+        case Fragment::WRAP_A: return
+            "W"_mst.If(x << "B"_mst) | // W=B_x
+            (x & "ghijk"_mst) | // g=g_x, h=h_x, i=i_x, j=j_x, k=k_x
+            (x & "udfems"_mst) | // u=u_x, d=d_x, f=f_x, e=e_x, m=m_x, s=s_x
+            "x"_mst; // x
+        case Fragment::WRAP_S: return
+            "W"_mst.If(x << "Bo"_mst) | // W=B_x*o_x
+            (x & "ghijk"_mst) | // g=g_x, h=h_x, i=i_x, j=j_x, k=k_x
+            (x & "udfemsx"_mst); // u=u_x, d=d_x, f=f_x, e=e_x, m=m_x, s=s_x, x=x_x
+        case Fragment::WRAP_C: return
+            "B"_mst.If(x << "K"_mst) | // B=K_x
+            (x & "ghijk"_mst) | // g=g_x, h=h_x, i=i_x, j=j_x, k=k_x
+            (x & "ondfem"_mst) | // o=o_x, n=n_x, d=d_x, f=f_x, e=e_x, m=m_x
+            "us"_mst; // u, s
+        case Fragment::WRAP_D: return
+            "B"_mst.If(x << "Vz"_mst) | // B=V_x*z_x
+            "o"_mst.If(x << "z"_mst) | // o=z_x
+            "e"_mst.If(x << "f"_mst) | // e=f_x
+            (x & "ghijk"_mst) | // g=g_x, h=h_x, i=i_x, j=j_x, k=k_x
+            (x & "ms"_mst) | // m=m_x, s=s_x
+            "nudx"_mst; // n, u, d, x
+        case Fragment::WRAP_V: return
+            "V"_mst.If(x << "B"_mst) | // V=B_x
+            (x & "ghijk"_mst) | // g=g_x, h=h_x, i=i_x, j=j_x, k=k_x
+            (x & "zonms"_mst) | // z=z_x, o=o_x, n=n_x, m=m_x, s=s_x
+            "fx"_mst; // f, x
+        case Fragment::WRAP_J: return
+            "B"_mst.If(x << "Bn"_mst) | // B=B_x*n_x
+            "e"_mst.If(x << "f"_mst) | // e=f_x
+            (x & "ghijk"_mst) | // g=g_x, h=h_x, i=i_x, j=j_x, k=k_x
+            (x & "oums"_mst) | // o=o_x, u=u_x, m=m_x, s=s_x
+            "ndx"_mst; // n, d, x
+        case Fragment::WRAP_N: return
+            (x & "ghijk"_mst) | // g=g_x, h=h_x, i=i_x, j=j_x, k=k_x
+            (x & "Bzondfems"_mst) | // B=B_x, z=z_x, o=o_x, n=n_x, d=d_x, f=f_x, e=e_x, m=m_x, s=s_x
+            "ux"_mst; // u, x
+        case Fragment::AND_V: return
+            (y & "KVB"_mst).If(x << "V"_mst) | // B=V_x*B_y, V=V_x*V_y, K=V_x*K_y
+            (x & "n"_mst) | (y & "n"_mst).If(x << "z"_mst) | // n=n_x+z_x*n_y
+            ((x | y) & "o"_mst).If((x | y) << "z"_mst) | // o=o_x*z_y+z_x*o_y
+            (x & y & "dmz"_mst) | // d=d_x*d_y, m=m_x*m_y, z=z_x*z_y
+            ((x | y) & "s"_mst) | // s=s_x+s_y
+            "f"_mst.If((y << "f"_mst) || (x << "s"_mst)) | // f=f_y+s_x
+            (y & "ux"_mst) | // u=u_y, x=x_y
+            ((x | y) & "ghij"_mst) | // g=g_x+g_y, h=h_x+h_y, i=i_x+i_y, j=j_x+j_y
+            "k"_mst.If(((x & y) << "k"_mst) &&
+                !(((x << "g"_mst) && (y << "h"_mst)) ||
+                ((x << "h"_mst) && (y << "g"_mst)) ||
+                ((x << "i"_mst) && (y << "j"_mst)) ||
+                ((x << "j"_mst) && (y << "i"_mst)))); // k=k_x*k_y*!(g_x*h_y + h_x*g_y + i_x*j_y + j_x*i_y)
+        case Fragment::AND_B: return
+            (x & "B"_mst).If(y << "W"_mst) | // B=B_x*W_y
+            ((x | y) & "o"_mst).If((x | y) << "z"_mst) | // o=o_x*z_y+z_x*o_y
+            (x & "n"_mst) | (y & "n"_mst).If(x << "z"_mst) | // n=n_x+z_x*n_y
+            (x & y & "e"_mst).If((x & y) << "s"_mst) | // e=e_x*e_y*s_x*s_y
+            (x & y & "dzm"_mst) | // d=d_x*d_y, z=z_x*z_y, m=m_x*m_y
+            "f"_mst.If(((x & y) << "f"_mst) || (x << "sf"_mst) || (y << "sf"_mst)) | // f=f_x*f_y + f_x*s_x + f_y*s_y
+            ((x | y) & "s"_mst) | // s=s_x+s_y
+            "ux"_mst | // u, x
+            ((x | y) & "ghij"_mst) | // g=g_x+g_y, h=h_x+h_y, i=i_x+i_y, j=j_x+j_y
+            "k"_mst.If(((x & y) << "k"_mst) &&
+                !(((x << "g"_mst) && (y << "h"_mst)) ||
+                ((x << "h"_mst) && (y << "g"_mst)) ||
+                ((x << "i"_mst) && (y << "j"_mst)) ||
+                ((x << "j"_mst) && (y << "i"_mst)))); // k=k_x*k_y*!(g_x*h_y + h_x*g_y + i_x*j_y + j_x*i_y)
+        case Fragment::OR_B: return
+            "B"_mst.If(x << "Bd"_mst && y << "Wd"_mst) | // B=B_x*d_x*W_x*d_y
+            ((x | y) & "o"_mst).If((x | y) << "z"_mst) | // o=o_x*z_y+z_x*o_y
+            (x & y & "m"_mst).If((x | y) << "s"_mst && (x & y) << "e"_mst) | // m=m_x*m_y*e_x*e_y*(s_x+s_y)
+            (x & y & "zse"_mst) | // z=z_x*z_y, s=s_x*s_y, e=e_x*e_y
+            "dux"_mst | // d, u, x
+            ((x | y) & "ghij"_mst) | // g=g_x+g_y, h=h_x+h_y, i=i_x+i_y, j=j_x+j_y
+            (x & y & "k"_mst); // k=k_x*k_y
+        case Fragment::OR_D: return
+            (y & "B"_mst).If(x << "Bdu"_mst) | // B=B_y*B_x*d_x*u_x
+            (x & "o"_mst).If(y << "z"_mst) | // o=o_x*z_y
+            (x & y & "m"_mst).If(x << "e"_mst && (x | y) << "s"_mst) | // m=m_x*m_y*e_x*(s_x+s_y)
+            (x & y & "zes"_mst) | // z=z_x*z_y, e=e_x*e_y, s=s_x*s_y
+            (y & "ufd"_mst) | // u=u_y, f=f_y, d=d_y
+            "x"_mst | // x
+            ((x | y) & "ghij"_mst) | // g=g_x+g_y, h=h_x+h_y, i=i_x+i_y, j=j_x+j_y
+            (x & y & "k"_mst); // k=k_x*k_y
+        case Fragment::OR_C: return
+            (y & "V"_mst).If(x << "Bdu"_mst) | // V=V_y*B_x*u_x*d_x
+            (x & "o"_mst).If(y << "z"_mst) | // o=o_x*z_y
+            (x & y & "m"_mst).If(x << "e"_mst && (x | y) << "s"_mst) | // m=m_x*m_y*e_x*(s_x+s_y)
+            (x & y & "zs"_mst) | // z=z_x*z_y, s=s_x*s_y
+            "fx"_mst | // f, x
+            ((x | y) & "ghij"_mst) | // g=g_x+g_y, h=h_x+h_y, i=i_x+i_y, j=j_x+j_y
+            (x & y & "k"_mst); // k=k_x*k_y
+        case Fragment::OR_I: return
+            (x & y & "VBKufs"_mst) | // V=V_x*V_y, B=B_x*B_y, K=K_x*K_y, u=u_x*u_y, f=f_x*f_y, s=s_x*s_y
+            "o"_mst.If((x & y) << "z"_mst) | // o=z_x*z_y
+            ((x | y) & "e"_mst).If((x | y) << "f"_mst) | // e=e_x*f_y+f_x*e_y
+            (x & y & "m"_mst).If((x | y) << "s"_mst) | // m=m_x*m_y*(s_x+s_y)
+            ((x | y) & "d"_mst) | // d=d_x+d_y
+            "x"_mst | // x
+            ((x | y) & "ghij"_mst) | // g=g_x+g_y, h=h_x+h_y, i=i_x+i_y, j=j_x+j_y
+            (x & y & "k"_mst); // k=k_x*k_y
+        case Fragment::ANDOR: return
+            (y & z & "BKV"_mst).If(x << "Bdu"_mst) | // B=B_x*d_x*u_x*B_y*B_z, K=B_x*d_x*u_x*K_y*K_z, V=B_x*d_x*u_x*V_y*V_z
+            (x & y & z & "z"_mst) | // z=z_x*z_y*z_z
+            ((x | (y & z)) & "o"_mst).If((x | (y & z)) << "z"_mst) | // o=o_x*z_y*z_z+z_x*o_y*o_z
+            (y & z & "u"_mst) | // u=u_y*u_z
+            (z & "f"_mst).If((x << "s"_mst) || (y << "f"_mst)) | // f=(s_x+f_y)*f_z
+            (z & "d"_mst) | // d=d_z
+            (x & z & "e"_mst).If(x << "s"_mst || y << "f"_mst) | // e=e_x*e_z*(s_x+f_y)
+            (x & y & z & "m"_mst).If(x << "e"_mst && (x | y | z) << "s"_mst) | // m=m_x*m_y*m_z*e_x*(s_x+s_y+s_z)
+            (z & (x | y) & "s"_mst) | // s=s_z*(s_x+s_y)
+            "x"_mst | // x
+            ((x | y | z) & "ghij"_mst) | // g=g_x+g_y+g_z, h=h_x+h_y+h_z, i=i_x+i_y+i_z, j=j_x+j_y_j_z
+            "k"_mst.If(((x & y & z) << "k"_mst) &&
+                !(((x << "g"_mst) && (y << "h"_mst)) ||
+                ((x << "h"_mst) && (y << "g"_mst)) ||
+                ((x << "i"_mst) && (y << "j"_mst)) ||
+                ((x << "j"_mst) && (y << "i"_mst)))); // k=k_x*k_y*k_z* !(g_x*h_y + h_x*g_y + i_x*j_y + j_x*i_y)
+        case Fragment::MULTI: return "Bnudemsk"_mst;
+        case Fragment::THRESH: {
+            bool all_e = true;
+            bool all_m = true;
+            uint32_t args = 0;
+            uint32_t num_s = 0;
+            Type acc_tl = "k"_mst;
+            for (size_t i = 0; i < sub_types.size(); ++i) {
+                Type t = sub_types[i];
+                if (!(t << (i ? "Wdu"_mst : "Bdu"_mst))) return ""_mst; // Require Bdu, Wdu, Wdu, ...
+                if (!(t << "e"_mst)) all_e = false;
+                if (!(t << "m"_mst)) all_m = false;
+                if (t << "s"_mst) num_s += 1;
+                args += (t << "z"_mst) ? 0 : (t << "o"_mst) ? 1 : 2;
+                acc_tl = ((acc_tl | t) & "ghij"_mst) |
+                    // Thresh contains a combination of timelocks if it has threshold > 1 and
+                    // it contains two different children that have different types of timelocks
+                    // Note how if any of the children don't have "k", the parent also does not have "k"
+                    "k"_mst.If(((acc_tl & t) << "k"_mst) && ((k <= 1) ||
+                        ((k > 1) && !(((acc_tl << "g"_mst) && (t << "h"_mst)) ||
+                        ((acc_tl << "h"_mst) && (t << "g"_mst)) ||
+                        ((acc_tl << "i"_mst) && (t << "j"_mst)) ||
+                        ((acc_tl << "j"_mst) && (t << "i"_mst))))));
+            }
+            return "Bdu"_mst |
+                   "z"_mst.If(args == 0) | // z=all z
+                   "o"_mst.If(args == 1) | // o=all z except one o
+                   "e"_mst.If(all_e && num_s == n_subs) | // e=all e and all s
+                   "m"_mst.If(all_e && all_m && num_s >= n_subs - k) | // m=all e, >=(n-k) s
+                   "s"_mst.If(num_s >= n_subs - k + 1) |  // s= >=(n-k+1) s
+                   acc_tl; // timelock info
+            }
+    }
+    assert(false);
+    return ""_mst;
+}
+
+size_t ComputeScriptLen(Fragment nodetype, Type sub0typ, size_t subsize, uint32_t k, size_t n_subs, size_t n_keys) {
+    switch (nodetype) {
+        case Fragment::JUST_1:
+        case Fragment::JUST_0: return 1;
+        case Fragment::PK_K: return 34;
+        case Fragment::PK_H: return 3 + 21;
+        case Fragment::OLDER:
+        case Fragment::AFTER: return 1 + BuildScript(k).size();
+        case Fragment::HASH256:
+        case Fragment::SHA256: return 4 + 2 + 33;
+        case Fragment::HASH160:
+        case Fragment::RIPEMD160: return 4 + 2 + 21;
+        case Fragment::MULTI: return 3 + (n_keys > 16) + (k > 16) + 34 * n_keys;
+        case Fragment::AND_V: return subsize;
+        case Fragment::WRAP_V: return subsize + (sub0typ << "x"_mst);
+        case Fragment::WRAP_S:
+        case Fragment::WRAP_C:
+        case Fragment::WRAP_N:
+        case Fragment::AND_B:
+        case Fragment::OR_B: return subsize + 1;
+        case Fragment::WRAP_A:
+        case Fragment::OR_C: return subsize + 2;
+        case Fragment::WRAP_D:
+        case Fragment::OR_D:
+        case Fragment::OR_I:
+        case Fragment::ANDOR: return subsize + 3;
+        case Fragment::WRAP_J: return subsize + 4;
+        case Fragment::THRESH: return subsize + n_subs + BuildScript(k).size();
+    }
+    assert(false);
+    return 0;
+}
+
+bool DecomposeScript(const CScript& script, std::vector<std::pair<opcodetype, std::vector<unsigned char>>>& out)
+{
+    out.clear();
+    CScript::const_iterator it = script.begin(), itend = script.end();
+    while (it != itend) {
+        std::vector<unsigned char> push_data;
+        opcodetype opcode;
+        if (!script.GetOp(it, opcode, push_data)) {
+            out.clear();
+            return false;
+        } else if (opcode >= OP_1 && opcode <= OP_16) {
+            // Deal with OP_n (GetOp does not turn them into pushes).
+            push_data.assign(1, CScript::DecodeOP_N(opcode));
+        } else if (opcode == OP_CHECKSIGVERIFY) {
+            // Decompose OP_CHECKSIGVERIFY into OP_CHECKSIG OP_VERIFY
+            out.emplace_back(OP_CHECKSIG, std::vector<unsigned char>());
+            opcode = OP_VERIFY;
+        } else if (opcode == OP_CHECKMULTISIGVERIFY) {
+            // Decompose OP_CHECKMULTISIGVERIFY into OP_CHECKMULTISIG OP_VERIFY
+            out.emplace_back(OP_CHECKMULTISIG, std::vector<unsigned char>());
+            opcode = OP_VERIFY;
+        } else if (opcode == OP_EQUALVERIFY) {
+            // Decompose OP_EQUALVERIFY into OP_EQUAL OP_VERIFY
+            out.emplace_back(OP_EQUAL, std::vector<unsigned char>());
+            opcode = OP_VERIFY;
+        } else if (IsPushdataOp(opcode)) {
+            if (!CheckMinimalPush(push_data, opcode)) return false;
+        } else if (it != itend && (opcode == OP_CHECKSIG || opcode == OP_CHECKMULTISIG || opcode == OP_EQUAL) && (*it == OP_VERIFY)) {
+            // Rule out non minimal VERIFY sequences
+            return false;
+        }
+        out.emplace_back(opcode, std::move(push_data));
+    }
+    std::reverse(out.begin(), out.end());
+    return true;
+}
+
+bool ParseScriptNumber(const std::pair<opcodetype, std::vector<unsigned char>>& in, int64_t& k) {
+    if (in.first == OP_0) {
+        k = 0;
+        return true;
+    }
+    if (!in.second.empty()) {
+        if (IsPushdataOp(in.first) && !CheckMinimalPush(in.second, in.first)) return false;
+        try {
+            k = CScriptNum(in.second, true).GetInt64();
+            return true;
+        } catch(const scriptnum_error&) {}
+    }
+    return false;
+}
+
+int FindNextChar(Span<const char> sp, const char m)
+{
+    for (int i = 0; i < (int)sp.size(); ++i) {
+        if (sp[i] == m) return i;
+        // We only search within the current parentheses
+        if (sp[i] == ')') break;
+    }
+    return -1;
+}
+
+} // namespace internal
+} // namespace miniscript
diff --git a/src/script/miniscript.h b/src/script/miniscript.h
new file mode 100644
index 000000000000..b3fd536365c6
--- /dev/null
+++ b/src/script/miniscript.h
@@ -0,0 +1,1649 @@
+// Copyright (c) 2019 The Bitcoin Core developers
+// Distributed under the MIT software license, see the accompanying
+// file COPYING or http://www.opensource.org/licenses/mit-license.php.
+
+#ifndef BITCOIN_SCRIPT_MINISCRIPT_H
+#define BITCOIN_SCRIPT_MINISCRIPT_H
+
+#include <algorithm>
+#include <numeric>
+#include <memory>
+#include <optional>
+#include <string>
+#include <vector>
+
+#include <stdlib.h>
+#include <assert.h>
+
+#include <policy/policy.h>
+#include <primitives/transaction.h>
+#include <script/script.h>
+#include <span.h>
+#include <util/spanparsing.h>
+#include <util/strencodings.h>
+#include <util/string.h>
+#include <util/vector.h>
+
+namespace miniscript {
+
+/** This type encapsulates the miniscript type system properties.
+ *
+ * Every miniscript expression is one of 4 basic types, and additionally has
+ * a number of boolean type properties.
+ *
+ * The basic types are:
+ * - "B" Base:
+ *   - Takes its inputs from the top of the stack.
+ *   - When satisfied, pushes a nonzero value of up to 4 bytes onto the stack.
+ *   - When dissatisfied, pushes a 0 onto the stack.
+ *   - This is used for most expressions, and required for the top level one.
+ *   - For example: older(n) = <n> OP_CHECKSEQUENCEVERIFY.
+ * - "V" Verify:
+ *   - Takes its inputs from the top of the stack.
+ *   - When satisfactied, pushes nothing.
+ *   - Cannot be dissatisfied.
+ *   - This can be obtained by adding an OP_VERIFY to a B, modifying the last opcode
+ *     of a B to its -VERIFY version (only for OP_CHECKSIG, OP_CHECKSIGVERIFY
+ *     and OP_EQUAL), or by combining a V fragment under some conditions.
+ *   - For example vc:pk_k(key) = <key> OP_CHECKSIGVERIFY
+ * - "K" Key:
+ *   - Takes its inputs from the top of the stack.
+ *   - Becomes a B when followed by OP_CHECKSIG.
+ *   - Always pushes a public key onto the stack, for which a signature is to be
+ *     provided to satisfy the expression.
+ *   - For example pk_h(key) = OP_DUP OP_HASH160 <Hash160(key)> OP_EQUALVERIFY
+ * - "W" Wrapped:
+ *   - Takes its input from one below the top of the stack.
+ *   - When satisfied, pushes a nonzero value (like B) on top of the stack, or one below.
+ *   - When dissatisfied, pushes 0 op top of the stack or one below.
+ *   - Is always "OP_SWAP [B]" or "OP_TOALTSTACK [B] OP_FROMALTSTACK".
+ *   - For example sc:pk_k(key) = OP_SWAP <key> OP_CHECKSIG
+ *
+ * There a type properties that help reasoning about correctness:
+ * - "z" Zero-arg:
+ *   - Is known to always consume exactly 0 stack elements.
+ *   - For example after(n) = <n> OP_CHECKLOCKTIMEVERIFY
+ * - "o" One-arg:
+ *   - Is known to always consume exactly 1 stack element.
+ *   - Conflicts with property 'z'
+ *   - For example sha256(hash) = OP_SIZE 32 OP_EQUALVERIFY OP_SHA256 <hash> OP_EQUAL
+ * - "n" Nonzero:
+ *   - For every way this expression can be satisfied, a satisfaction exists that never needs
+ *     a zero top stack element.
+ *   - Conflicts with property 'z' and with type 'W'.
+ * - "d" Dissatisfiable:
+ *   - There is an easy way to construct a dissatisfaction for this expression.
+ *   - Conflicts with type 'V'.
+ * - "u" Unit:
+ *   - In case of satisfaction, an exact 1 is put on the stack (rather than just nonzero).
+ *   - Conflicts with type 'V'.
+ *
+ * Additional type properties help reasoning about nonmalleability:
+ * - "e" Expression:
+ *   - This implies property 'd', but the dissatisfaction is nonmalleable.
+ *   - This generally requires 'e' for all subexpressions which are invoked for that
+ *     dissatifsaction, and property 'f' for the unexecuted subexpressions in that case.
+ *   - Conflicts with type 'V'.
+ * - "f" Forced:
+ *   - Dissatisfactions (if any) for this expression always involve at least one signature.
+ *   - Is always true for type 'V'.
+ * - "s" Safe:
+ *   - Satisfactions for this expression always involve at least one signature.
+ * - "m" Nonmalleable:
+ *   - For every way this expression can be satisfied (which may be none),
+ *     a nonmalleable satisfaction exists.
+ *   - This generally requires 'm' for all subexpressions, and 'e' for all subexpressions
+ *     which are dissatisfied when satisfying the parent.
+ *
+ * One type property is an implementation detail:
+ * - "x" Expensive verify:
+ *   - Expressions with this property have a script whose last opcode is not EQUAL, CHECKSIG, or CHECKMULTISIG.
+ *   - Not having this property means that it can be converted to a V at no cost (by switching to the
+ *     -VERIFY version of the last opcode).
+ *
+ * Five more type properties for representing timelock information. Spend paths
+ * in miniscripts containing conflicting timelocks and heightlocks cannot be spent together.
+ * This helps users detect if miniscript does not match the semantic behaviour the
+ * user expects.
+ * - "g" Whether the branch contains a relative time timelock
+ * - "h" Whether the branch contains a relative height timelock
+ * - "i" Whether the branch contains an absolute time timelock
+ * - "j" Whether the branch contains an absolute height timelock
+ * - "k"
+ *   - Whether all satisfactions of this expression don't contain a mix of heightlock and timelock
+ *     of the same type.
+ *   - If the miniscript does not have the "k" property, the miniscript template will not match
+ *     the user expectation of the corresponding spending policy.
+ * For each of these properties the subset rule holds: an expression with properties X, Y, and Z, is also
+ * valid in places where an X, a Y, a Z, an XY, ... is expected.
+*/
+class Type {
+    //! Internal bitmap of properties (see ""_mst operator for details).
+    uint32_t m_flags;
+
+    //! Internal constructor used by the ""_mst operator.
+    explicit constexpr Type(uint32_t flags) : m_flags(flags) {}
+
+public:
+    //! The only way to publicly construct a Type is using this literal operator.
+    friend constexpr Type operator"" _mst(const char* c, size_t l);
+
+    //! Compute the type with the union of properties.
+    constexpr Type operator|(Type x) const { return Type(m_flags | x.m_flags); }
+
+    //! Compute the type with the intersection of properties.
+    constexpr Type operator&(Type x) const { return Type(m_flags & x.m_flags); }
+
+    //! Check whether the left hand's properties are superset of the right's (= left is a subtype of right).
+    constexpr bool operator<<(Type x) const { return (x.m_flags & ~m_flags) == 0; }
+
+    //! Comparison operator to enable use in sets/maps (total ordering incompatible with <<).
+    constexpr bool operator<(Type x) const { return m_flags < x.m_flags; }
+
+    //! Equality operator.
+    constexpr bool operator==(Type x) const { return m_flags == x.m_flags; }
+
+    //! The empty type if x is false, itself otherwise.
+    constexpr Type If(bool x) const { return Type(x ? m_flags : 0); }
+};
+
+//! Literal operator to construct Type objects.
+inline constexpr Type operator"" _mst(const char* c, size_t l) {
+    Type typ{0};
+
+    for (const char *p = c; p < c + l; p++) {
+        typ = typ | Type(
+            *p == 'B' ? 1 << 0 : // Base type
+            *p == 'V' ? 1 << 1 : // Verify type
+            *p == 'K' ? 1 << 2 : // Key type
+            *p == 'W' ? 1 << 3 : // Wrapped type
+            *p == 'z' ? 1 << 4 : // Zero-arg property
+            *p == 'o' ? 1 << 5 : // One-arg property
+            *p == 'n' ? 1 << 6 : // Nonzero arg property
+            *p == 'd' ? 1 << 7 : // Dissatisfiable property
+            *p == 'u' ? 1 << 8 : // Unit property
+            *p == 'e' ? 1 << 9 : // Expression property
+            *p == 'f' ? 1 << 10 : // Forced property
+            *p == 's' ? 1 << 11 : // Safe property
+            *p == 'm' ? 1 << 12 : // Nonmalleable property
+            *p == 'x' ? 1 << 13 : // Expensive verify
+            *p == 'g' ? 1 << 14 : // older: contains relative time timelock   (csv_time)
+            *p == 'h' ? 1 << 15 : // older: contains relative height timelock (csv_height)
+            *p == 'i' ? 1 << 16 : // after: contains time timelock   (cltv_time)
+            *p == 'j' ? 1 << 17 : // after: contains height timelock   (cltv_height)
+            *p == 'k' ? 1 << 18 : // does not contain a combination of height and time locks
+            (throw std::logic_error("Unknown character in _mst literal"), 0)
+        );
+    }
+
+    return typ;
+}
+
+template<typename Key> struct Node;
+template<typename Key> using NodeRef = std::shared_ptr<const Node<Key>>;
+
+//! Construct a miniscript node as a shared_ptr.
+template<typename Key, typename... Args>
+NodeRef<Key> MakeNodeRef(Args&&... args) { return std::make_shared<const Node<Key>>(std::forward<Args>(args)...); }
+
+//! The different node types in miniscript.
+enum class Fragment {
+    JUST_0,    //!< OP_0
+    JUST_1,    //!< OP_1
+    PK_K,      //!< [key]
+    PK_H,      //!< OP_DUP OP_HASH160 [keyhash] OP_EQUALVERIFY
+    OLDER,     //!< [n] OP_CHECKSEQUENCEVERIFY
+    AFTER,     //!< [n] OP_CHECKLOCKTIMEVERIFY
+    SHA256,    //!< OP_SIZE 32 OP_EQUALVERIFY OP_SHA256 [hash] OP_EQUAL
+    HASH256,   //!< OP_SIZE 32 OP_EQUALVERIFY OP_HASH256 [hash] OP_EQUAL
+    RIPEMD160, //!< OP_SIZE 32 OP_EQUALVERIFY OP_RIPEMD160 [hash] OP_EQUAL
+    HASH160,   //!< OP_SIZE 32 OP_EQUALVERIFY OP_HASH160 [hash] OP_EQUAL
+    WRAP_A,    //!< OP_TOALTSTACK [X] OP_FROMALTSTACK
+    WRAP_S,    //!< OP_SWAP [X]
+    WRAP_C,    //!< [X] OP_CHECKSIG
+    WRAP_D,    //!< OP_DUP OP_IF [X] OP_ENDIF
+    WRAP_V,    //!< [X] OP_VERIFY (or -VERIFY version of last opcode in X)
+    WRAP_J,    //!< OP_SIZE OP_0NOTEQUAL OP_IF [X] OP_ENDIF
+    WRAP_N,    //!< [X] OP_0NOTEQUAL
+    AND_V,     //!< [X] [Y]
+    AND_B,     //!< [X] [Y] OP_BOOLAND
+    OR_B,      //!< [X] [Y] OP_BOOLOR
+    OR_C,      //!< [X] OP_NOTIF [Y] OP_ENDIF
+    OR_D,      //!< [X] OP_IFDUP OP_NOTIF [Y] OP_ENDIF
+    OR_I,      //!< OP_IF [X] OP_ELSE [Y] OP_ENDIF
+    ANDOR,     //!< [X] OP_NOTIF [Z] OP_ELSE [Y] OP_ENDIF
+    THRESH,    //!< [X1] ([Xn] OP_ADD)* [k] OP_EQUAL
+    MULTI,     //!< [k] [key_n]* [n] OP_CHECKMULTISIG
+    // AND_N(X,Y) is represented as ANDOR(X,Y,0)
+    // WRAP_T(X) is represented as AND_V(X,1)
+    // WRAP_L(X) is represented as OR_I(0,X)
+    // WRAP_U(X) is represented as OR_I(X,0)
+};
+
+
+namespace internal {
+
+//! Helper function for Node::CalcType.
+Type ComputeType(Fragment nodetype, Type x, Type y, Type z, const std::vector<Type>& sub_types, uint32_t k, size_t data_size, size_t n_subs, size_t n_keys);
+
+//! Helper function for Node::CalcScriptLen.
+size_t ComputeScriptLen(Fragment nodetype, Type sub0typ, size_t subsize, uint32_t k, size_t n_subs, size_t n_keys);
+
+//! A helper sanitizer/checker for the output of CalcType.
+Type SanitizeType(Type x);
+
+//! Class whose objects represent the maximum of a list of integers.
+template<typename I>
+struct MaxInt {
+    const bool valid;
+    const I value;
+
+    MaxInt() : valid(false), value(0) {}
+    MaxInt(I val) : valid(true), value(val) {}
+
+    friend MaxInt<I> operator+(const MaxInt<I>& a, const MaxInt<I>& b) {
+        if (!a.valid || !b.valid) return {};
+        return a.value + b.value;
+    }
+
+    friend MaxInt<I> operator|(const MaxInt<I>& a, const MaxInt<I>& b) {
+        if (!a.valid) return b;
+        if (!b.valid) return a;
+        return std::max(a.value, b.value);
+    }
+};
+
+struct Ops {
+    //! Non-push opcodes.
+    uint32_t count;
+    //! Number of keys in possibly executed OP_CHECKMULTISIG(VERIFY)s to satisfy.
+    MaxInt<uint32_t> sat;
+    //! Number of keys in possibly executed OP_CHECKMULTISIG(VERIFY)s to dissatisfy.
+    MaxInt<uint32_t> dsat;
+
+    Ops(uint32_t in_count, MaxInt<uint32_t> in_sat, MaxInt<uint32_t> in_dsat) : count(in_count), sat(in_sat), dsat(in_dsat) {};
+};
+
+struct StackSize {
+    //! Maximum stack size to satisfy;
+    MaxInt<uint32_t> sat;
+    //! Maximum stack size to dissatisfy;
+    MaxInt<uint32_t> dsat;
+
+    StackSize(MaxInt<uint32_t> in_sat, MaxInt<uint32_t> in_dsat) : sat(in_sat), dsat(in_dsat) {};
+};
+
+} // namespace internal
+
+//! A node in a miniscript expression.
+template<typename Key>
+struct Node {
+    //! What node type this node is.
+    const Fragment nodetype;
+    //! The k parameter (time for OLDER/AFTER, threshold for THRESH(_M))
+    const uint32_t k = 0;
+    //! The keys used by this expression (only for PK_K/PK_H/MULTI)
+    const std::vector<Key> keys;
+    //! The data bytes in this expression (only for HASH160/HASH256/SHA256/RIPEMD10).
+    const std::vector<unsigned char> data;
+    //! Subexpressions (for WRAP_*/AND_*/OR_*/ANDOR/THRESH)
+    const std::vector<NodeRef<Key>> subs;
+
+private:
+    //! Cached ops counts.
+    const internal::Ops ops;
+    //! Cached stack size bounds.
+    const internal::StackSize ss;
+    //! Cached expression type (computed by CalcType and fed through SanitizeType).
+    const Type typ;
+    //! Cached script length (computed by CalcScriptLen).
+    const size_t scriptlen;
+
+    //! Compute the length of the script for this miniscript (including children).
+    size_t CalcScriptLen() const {
+        size_t subsize = 0;
+        for (const auto& sub : subs) {
+            subsize += sub->ScriptSize();
+        }
+        Type sub0type = subs.size() > 0 ? subs[0]->GetType() : ""_mst;
+        return internal::ComputeScriptLen(nodetype, sub0type, subsize, k, subs.size(), keys.size());
+    }
+
+    /* Apply a recursive algorithm to a Miniscript tree, without actual recursive calls.
+     *
+     * The algorithm is defined by two functions: downfn and upfn. Conceptually, the
+     * result can be thought of as first using downfn to compute a "state" for each node,
+     * from the root down to the leaves. Then upfn is used to compute a "result" for each
+     * node, from the leaves back up to the root, which is then returned. In the actual
+     * implementation, both functions are invoked in an interleaved fashion, performing a
+     * depth-first traversal of the tree.
+     *
+     * In more detail, it is invoked as node.TreeEvalMaybe<Result>(root, downfn, upfn):
+     * - root is the state of the root node, of type State.
+     * - downfn is a callable (State&, const Node&, size_t) -> State, which given a
+     *   node, its state, and an index of one of its children, computes the state of that
+     *   child. It can modify the state. Children of a given node will have downfn()
+     *   called in order.
+     * - upfn is a callable (State&&, const Node&, Span<Result>) -> std::optional<Result>,
+     *   which given a node, its state, and a Span of the results of its children,
+     *   computes the result of the node. If std::nullopt is returned by upfn,
+     *   TreeEvalMaybe() immediately returns std::nullopt.
+     * The return value of TreeEvalMaybe is the result of the root node.
+     */
+    template<typename Result, typename State, typename DownFn, typename UpFn>
+    std::optional<Result> TreeEvalMaybe(State root_state, DownFn downfn, UpFn upfn) const
+    {
+        /** Entries of the explicit stack tracked in this algorithm. */
+        struct StackElem
+        {
+            const Node& node; //!< The node being evaluated.
+            size_t expanded; //!< How many children of this node have been expanded.
+            State state; //!< The state for that node.
+
+            StackElem(const Node& node_, size_t exp_, State&& state_) :
+                node(node_), expanded(exp_), state(std::move(state_)) {}
+        };
+        /* Stack of tree nodes being explored. */
+        std::vector<StackElem> stack;
+        /* Results of subtrees so far. Their order and mapping to tree nodes
+         * is implicitly defined by stack. */
+        std::vector<Result> results;
+        stack.emplace_back(*this, 0, std::move(root_state));
+
+        /* Here is a demonstration of the algorithm, for an example tree A(B,C(D,E),F).
+         * State variables are omitted for simplicity.
+         *
+         * First: stack=[(A,0)] results=[]
+         *        stack=[(A,1),(B,0)] results=[]
+         *        stack=[(A,1)] results=[B]
+         *        stack=[(A,2),(C,0)] results=[B]
+         *        stack=[(A,2),(C,1),(D,0)] results=[B]
+         *        stack=[(A,2),(C,1)] results=[B,D]
+         *        stack=[(A,2),(C,2),(E,0)] results=[B,D]
+         *        stack=[(A,2),(C,2)] results=[B,D,E]
+         *        stack=[(A,2)] results=[B,C]
+         *        stack=[(A,3),(F,0)] results=[B,C]
+         *        stack=[(A,3)] results=[B,C,F]
+         * Final: stack=[] results=[A]
+         */
+        while (stack.size()) {
+            const Node& node = stack.back().node;
+            if (stack.back().expanded < node.subs.size()) {
+                /* We encounter a tree node with at least one unexpanded child.
+                 * Expand it. By the time we hit this node again, the result of
+                 * that child (and all earlier children) will be at the end of `results`. */
+                size_t child_index = stack.back().expanded++;
+                State child_state = downfn(stack.back().state, node, child_index);
+                stack.emplace_back(*node.subs[child_index], 0, std::move(child_state));
+                continue;
+            }
+            // Invoke upfn with the last node.subs.size() elements of results as input.
+            assert(results.size() >= node.subs.size());
+            std::optional<Result> result{upfn(std::move(stack.back().state), node,
+                Span<Result>{results}.last(node.subs.size()))};
+            // If evaluation returns std::nullopt, abort immediately.
+            if (!result) return {};
+            // Replace the last node.subs.size() elements of results with the new result.
+            results.erase(results.end() - node.subs.size(), results.end());
+            results.push_back(std::move(*result));
+            stack.pop_back();
+        }
+        // The final remaining results element is the root result, return it.
+        assert(results.size() == 1);
+        return std::move(results[0]);
+    }
+
+    /** Like TreeEvalMaybe, but always produces a result. upfn must return Result. */
+    template<typename Result, typename State, typename DownFn, typename UpFn>
+    Result TreeEval(State root_state, DownFn&& downfn, UpFn upfn) const
+    {
+        // Invoke TreeEvalMaybe with upfn wrapped to return std::optional<Result>, and then
+        // unconditionally dereference the result (it cannot be std::nullopt).
+        return std::move(*TreeEvalMaybe<Result>(std::move(root_state),
+            std::forward<DownFn>(downfn),
+            [&upfn](State&& state, const Node& node, Span<Result> subs) {
+                Result res{upfn(std::move(state), node, subs)};
+                return std::optional<Result>(std::move(res));
+            }
+        ));
+    }
+
+    //! Compute the type for this miniscript.
+    Type CalcType() const {
+        using namespace internal;
+
+        // THRESH has a variable number of subexpressions
+        std::vector<Type> sub_types;
+        if (nodetype == Fragment::THRESH) {
+            for (const auto& sub : subs) sub_types.push_back(sub->GetType());
+        }
+        // All other nodes than THRESH can be computed just from the types of the 0-3 subexpressions.
+        Type x = subs.size() > 0 ? subs[0]->GetType() : ""_mst;
+        Type y = subs.size() > 1 ? subs[1]->GetType() : ""_mst;
+        Type z = subs.size() > 2 ? subs[2]->GetType() : ""_mst;
+
+        return SanitizeType(ComputeType(nodetype, x, y, z, sub_types, k, data.size(), subs.size(), keys.size()));
+    }
+
+public:
+    template<typename Ctx>
+    CScript ToScript(const Ctx& ctx) const
+    {
+        // To construct the CScript for a Miniscript object, we use the TreeEval algorithm.
+        // The State is a boolean: whether or not the node's script expansion is followed
+        // by an OP_VERIFY (which may need to be combined with the last script opcode).
+        auto downfn = [](bool verify, const Node& node, size_t index) {
+            // For WRAP_V, the subexpression is certainly followed by OP_VERIFY.
+            if (node.nodetype == Fragment::WRAP_V) return true;
+            // The subexpression of WRAP_S, and the last subexpression of AND_V
+            // inherit the followed-by-OP_VERIFY property from the parent.
+            if (node.nodetype == Fragment::WRAP_S ||
+                (node.nodetype == Fragment::AND_V && index == 1)) return verify;
+            return false;
+        };
+        // The upward function computes for a node, given its followed-by-OP_VERIFY status
+        // and the CScripts of its child nodes, the CScript of the node.
+        auto upfn = [&ctx](bool verify, const Node& node, Span<CScript> subs) -> CScript {
+            switch (node.nodetype) {
+                case Fragment::PK_K: return BuildScript(ctx.ToPKBytes(node.keys[0]));
+                case Fragment::PK_H: return BuildScript(OP_DUP, OP_HASH160, ctx.ToPKHBytes(node.keys[0]), OP_EQUALVERIFY);
+                case Fragment::OLDER: return BuildScript(node.k, OP_CHECKSEQUENCEVERIFY);
+                case Fragment::AFTER: return BuildScript(node.k, OP_CHECKLOCKTIMEVERIFY);
+                case Fragment::SHA256: return BuildScript(OP_SIZE, 32, OP_EQUALVERIFY, OP_SHA256, node.data, verify ? OP_EQUALVERIFY : OP_EQUAL);
+                case Fragment::RIPEMD160: return BuildScript(OP_SIZE, 32, OP_EQUALVERIFY, OP_RIPEMD160, node.data, verify ? OP_EQUALVERIFY : OP_EQUAL);
+                case Fragment::HASH256: return BuildScript(OP_SIZE, 32, OP_EQUALVERIFY, OP_HASH256, node.data, verify ? OP_EQUALVERIFY : OP_EQUAL);
+                case Fragment::HASH160: return BuildScript(OP_SIZE, 32, OP_EQUALVERIFY, OP_HASH160, node.data, verify ? OP_EQUALVERIFY : OP_EQUAL);
+                case Fragment::WRAP_A: return BuildScript(OP_TOALTSTACK, subs[0], OP_FROMALTSTACK);
+                case Fragment::WRAP_S: return BuildScript(OP_SWAP, subs[0]);
+                case Fragment::WRAP_C: return BuildScript(std::move(subs[0]), verify ? OP_CHECKSIGVERIFY : OP_CHECKSIG);
+                case Fragment::WRAP_D: return BuildScript(OP_DUP, OP_IF, subs[0], OP_ENDIF);
+                case Fragment::WRAP_V: {
+                    if (node.subs[0]->GetType() << "x"_mst) {
+                        return BuildScript(std::move(subs[0]), OP_VERIFY);
+                    } else {
+                        return std::move(subs[0]);
+                    }
+                }
+                case Fragment::WRAP_J: return BuildScript(OP_SIZE, OP_0NOTEQUAL, OP_IF, subs[0], OP_ENDIF);
+                case Fragment::WRAP_N: return BuildScript(std::move(subs[0]), OP_0NOTEQUAL);
+                case Fragment::JUST_1: return BuildScript(OP_1);
+                case Fragment::JUST_0: return BuildScript(OP_0);
+                case Fragment::AND_V: return BuildScript(std::move(subs[0]), subs[1]);
+                case Fragment::AND_B: return BuildScript(std::move(subs[0]), subs[1], OP_BOOLAND);
+                case Fragment::OR_B: return BuildScript(std::move(subs[0]), subs[1], OP_BOOLOR);
+                case Fragment::OR_D: return BuildScript(std::move(subs[0]), OP_IFDUP, OP_NOTIF, subs[1], OP_ENDIF);
+                case Fragment::OR_C: return BuildScript(std::move(subs[0]), OP_NOTIF, subs[1], OP_ENDIF);
+                case Fragment::OR_I: return BuildScript(OP_IF, subs[0], OP_ELSE, subs[1], OP_ENDIF);
+                case Fragment::ANDOR: return BuildScript(std::move(subs[0]), OP_NOTIF, subs[2], OP_ELSE, subs[1], OP_ENDIF);
+                case Fragment::MULTI: {
+                    CScript script = BuildScript(node.k);
+                    for (const auto& key : node.keys) {
+                        script = BuildScript(std::move(script), ctx.ToPKBytes(key));
+                    }
+                    return BuildScript(std::move(script), node.keys.size(), verify ? OP_CHECKMULTISIGVERIFY : OP_CHECKMULTISIG);
+                }
+                case Fragment::THRESH: {
+                    CScript script = std::move(subs[0]);
+                    for (size_t i = 1; i < subs.size(); ++i) {
+                        script = BuildScript(std::move(script), subs[i], OP_ADD);
+                    }
+                    return BuildScript(std::move(script), node.k, verify ? OP_EQUALVERIFY : OP_EQUAL);
+                }
+            }
+            assert(false);
+            return {};
+        };
+        return TreeEval<CScript>(false, downfn, upfn);
+    }
+
+    template<typename CTx>
+    bool ToString(const CTx& ctx, std::string& ret) const {
+        // To construct the std::string representation for a Miniscript object, we use
+        // the TreeEvalMaybe algorithm. The State is a boolean: whether the parent node is a
+        // wrapper. If so, non-wrapper expressions must be prefixed with a ":".
+        auto downfn = [](bool, const Node& node, size_t) {
+            return (node.nodetype == Fragment::WRAP_A || node.nodetype == Fragment::WRAP_S ||
+                    node.nodetype == Fragment::WRAP_D || node.nodetype == Fragment::WRAP_V ||
+                    node.nodetype == Fragment::WRAP_J || node.nodetype == Fragment::WRAP_N ||
+                    node.nodetype == Fragment::WRAP_C ||
+                    (node.nodetype == Fragment::AND_V && node.subs[1]->nodetype == Fragment::JUST_1) ||
+                    (node.nodetype == Fragment::OR_I && node.subs[0]->nodetype == Fragment::JUST_0) ||
+                    (node.nodetype == Fragment::OR_I && node.subs[1]->nodetype == Fragment::JUST_0));
+        };
+        // The upward function computes for a node, given whether its parent is a wrapper,
+        // and the string representations of its child nodes, the string representation of the node.
+        auto upfn = [&ctx](bool wrapped, const Node& node, Span<std::string> subs) -> std::optional<std::string> {
+            std::string ret = wrapped ? ":" : "";
+
+            switch (node.nodetype) {
+                case Fragment::WRAP_A: return "a" + std::move(subs[0]);
+                case Fragment::WRAP_S: return "s" + std::move(subs[0]);
+                case Fragment::WRAP_C:
+                    if (node.subs[0]->nodetype == Fragment::PK_K) {
+                        // pk(K) is syntactic sugar for c:pk_k(K)
+                        std::string key_str;
+                        if (!ctx.ToString(node.subs[0]->keys[0], key_str)) return {};
+                        return std::move(ret) + "pk(" + std::move(key_str) + ")";
+                    }
+                    if (node.subs[0]->nodetype == Fragment::PK_H) {
+                        // pkh(K) is syntactic sugar for c:pk_h(K)
+                        std::string key_str;
+                        if (!ctx.ToString(node.subs[0]->keys[0], key_str)) return {};
+                        return std::move(ret) + "pkh(" + std::move(key_str) + ")";
+                    }
+                    return "c" + std::move(subs[0]);
+                case Fragment::WRAP_D: return "d" + std::move(subs[0]);
+                case Fragment::WRAP_V: return "v" + std::move(subs[0]);
+                case Fragment::WRAP_J: return "j" + std::move(subs[0]);
+                case Fragment::WRAP_N: return "n" + std::move(subs[0]);
+                case Fragment::AND_V:
+                    // t:X is syntactic sugar for and_v(X,1).
+                    if (node.subs[1]->nodetype == Fragment::JUST_1) return "t" + std::move(subs[0]);
+                    break;
+                case Fragment::OR_I:
+                    if (node.subs[0]->nodetype == Fragment::JUST_0) return "l" + std::move(subs[1]);
+                    if (node.subs[1]->nodetype == Fragment::JUST_0) return "u" + std::move(subs[0]);
+                    break;
+                default: break;
+            }
+            switch (node.nodetype) {
+                case Fragment::PK_K: {
+                    std::string key_str;
+                    if (!ctx.ToString(node.keys[0], key_str)) return {};
+                    return std::move(ret) + "pk_k(" + std::move(key_str) + ")";
+                }
+                case Fragment::PK_H: {
+                    std::string key_str;
+                    if (!ctx.ToString(node.keys[0], key_str)) return {};
+                    return std::move(ret) + "pk_h(" + std::move(key_str) + ")";
+                }
+                case Fragment::AFTER: return std::move(ret) + "after(" + ::ToString(node.k) + ")";
+                case Fragment::OLDER: return std::move(ret) + "older(" + ::ToString(node.k) + ")";
+                case Fragment::HASH256: return std::move(ret) + "hash256(" + HexStr(node.data) + ")";
+                case Fragment::HASH160: return std::move(ret) + "hash160(" + HexStr(node.data) + ")";
+                case Fragment::SHA256: return std::move(ret) + "sha256(" + HexStr(node.data) + ")";
+                case Fragment::RIPEMD160: return std::move(ret) + "ripemd160(" + HexStr(node.data) + ")";
+                case Fragment::JUST_1: return std::move(ret) + "1";
+                case Fragment::JUST_0: return std::move(ret) + "0";
+                case Fragment::AND_V: return std::move(ret) + "and_v(" + std::move(subs[0]) + "," + std::move(subs[1]) + ")";
+                case Fragment::AND_B: return std::move(ret) + "and_b(" + std::move(subs[0]) + "," + std::move(subs[1]) + ")";
+                case Fragment::OR_B: return std::move(ret) + "or_b(" + std::move(subs[0]) + "," + std::move(subs[1]) + ")";
+                case Fragment::OR_D: return std::move(ret) + "or_d(" + std::move(subs[0]) + "," + std::move(subs[1]) + ")";
+                case Fragment::OR_C: return std::move(ret) + "or_c(" + std::move(subs[0]) + "," + std::move(subs[1]) + ")";
+                case Fragment::OR_I: return std::move(ret) + "or_i(" + std::move(subs[0]) + "," + std::move(subs[1]) + ")";
+                case Fragment::ANDOR:
+                    // and_n(X,Y) is syntactic sugar for andor(X,Y,0).
+                    if (node.subs[2]->nodetype == Fragment::JUST_0) return std::move(ret) + "and_n(" + std::move(subs[0]) + "," + std::move(subs[1]) + ")";
+                    return std::move(ret) + "andor(" + std::move(subs[0]) + "," + std::move(subs[1]) + "," + std::move(subs[2]) + ")";
+                case Fragment::MULTI: {
+                    auto str = std::move(ret) + "multi(" + ::ToString(node.k);
+                    for (const auto& key : node.keys) {
+                        std::string key_str;
+                        if (!ctx.ToString(key, key_str)) return {};
+                        str += "," + std::move(key_str);
+                    }
+                    return std::move(str) + ")";
+                }
+                case Fragment::THRESH: {
+                    auto str = std::move(ret) + "thresh(" + ::ToString(node.k);
+                    for (auto& sub : subs) {
+                        str += "," + std::move(sub);
+                    }
+                    return std::move(str) + ")";
+                }
+                default: assert(false);
+            }
+            return ""; // Should never be reached.
+        };
+
+        auto res = TreeEvalMaybe<std::string>(false, downfn, upfn);
+        if (res.has_value()) ret = std::move(*res);
+        return res.has_value();
+    }
+
+    internal::Ops CalcOps() const {
+        switch (nodetype) {
+            case Fragment::JUST_1: return {0, 0, {}};
+            case Fragment::JUST_0: return {0, {}, 0};
+            case Fragment::PK_K: return {0, 0, 0};
+            case Fragment::PK_H: return {3, 0, 0};
+            case Fragment::OLDER:
+            case Fragment::AFTER: return {1, 0, {}};
+            case Fragment::SHA256:
+            case Fragment::RIPEMD160:
+            case Fragment::HASH256:
+            case Fragment::HASH160: return {4, 0, {}};
+            case Fragment::AND_V: return {subs[0]->ops.count + subs[1]->ops.count, subs[0]->ops.sat + subs[1]->ops.sat, {}};
+            case Fragment::AND_B: {
+                const auto count{1 + subs[0]->ops.count + subs[1]->ops.count};
+                const auto sat{subs[0]->ops.sat + subs[1]->ops.sat};
+                const auto dsat{subs[0]->ops.dsat + subs[1]->ops.dsat};
+                return {count, sat, dsat};
+            }
+            case Fragment::OR_B: {
+                const auto count{1 + subs[0]->ops.count + subs[1]->ops.count};
+                const auto sat{(subs[0]->ops.sat + subs[1]->ops.dsat) | (subs[1]->ops.sat + subs[0]->ops.dsat)};
+                const auto dsat{subs[0]->ops.dsat + subs[1]->ops.dsat};
+                return {count, sat, dsat};
+            }
+            case Fragment::OR_D: {
+                const auto count{3 + subs[0]->ops.count + subs[1]->ops.count};
+                const auto sat{subs[0]->ops.sat | (subs[1]->ops.sat + subs[0]->ops.dsat)};
+                const auto dsat{subs[0]->ops.dsat + subs[1]->ops.dsat};
+                return {count, sat, dsat};
+            }
+            case Fragment::OR_C: {
+                const auto count{2 + subs[0]->ops.count + subs[1]->ops.count};
+                const auto sat{subs[0]->ops.sat | (subs[1]->ops.sat + subs[0]->ops.dsat)};
+                return {count, sat, {}};
+            }
+            case Fragment::OR_I: {
+                const auto count{3 + subs[0]->ops.count + subs[1]->ops.count};
+                const auto sat{subs[0]->ops.sat | subs[1]->ops.sat};
+                const auto dsat{subs[0]->ops.dsat | subs[1]->ops.dsat};
+                return {count, sat, dsat};
+            }
+            case Fragment::ANDOR: {
+                const auto count{3 + subs[0]->ops.count + subs[1]->ops.count + subs[2]->ops.count};
+                const auto sat{(subs[1]->ops.sat + subs[0]->ops.sat) | (subs[0]->ops.dsat + subs[2]->ops.sat)};
+                const auto dsat{subs[0]->ops.dsat + subs[2]->ops.dsat};
+                return {count, sat, dsat};
+            }
+            case Fragment::MULTI: return {1, (uint32_t)keys.size(), (uint32_t)keys.size()};
+            case Fragment::WRAP_S:
+            case Fragment::WRAP_C:
+            case Fragment::WRAP_N: return {1 + subs[0]->ops.count, subs[0]->ops.sat, subs[0]->ops.dsat};
+            case Fragment::WRAP_A: return {2 + subs[0]->ops.count, subs[0]->ops.sat, subs[0]->ops.dsat};
+            case Fragment::WRAP_D: return {3 + subs[0]->ops.count, subs[0]->ops.sat, 0};
+            case Fragment::WRAP_J: return {4 + subs[0]->ops.count, subs[0]->ops.sat, 0};
+            case Fragment::WRAP_V: return {subs[0]->ops.count + (subs[0]->GetType() << "x"_mst), subs[0]->ops.sat, {}};
+            case Fragment::THRESH: {
+                uint32_t count = 0;
+                auto sats = Vector(internal::MaxInt<uint32_t>(0));
+                for (const auto& sub : subs) {
+                    count += sub->ops.count + 1;
+                    auto next_sats = Vector(sats[0] + sub->ops.dsat);
+                    for (size_t j = 1; j < sats.size(); ++j) next_sats.push_back((sats[j] + sub->ops.dsat) | (sats[j - 1] + sub->ops.sat));
+                    next_sats.push_back(sats[sats.size() - 1] + sub->ops.sat);
+                    sats = std::move(next_sats);
+                }
+                assert(k <= sats.size());
+                return {count, sats[k], sats[0]};
+            }
+        }
+        assert(false);
+        return {0, {}, {}};
+    }
+
+    internal::StackSize CalcStackSize() const {
+        switch (nodetype) {
+            case Fragment::JUST_0: return {{}, 0};
+            case Fragment::JUST_1:
+            case Fragment::OLDER:
+            case Fragment::AFTER: return {0, {}};
+            case Fragment::PK_K: return {1, 1};
+            case Fragment::PK_H: return {2, 2};
+            case Fragment::SHA256:
+            case Fragment::RIPEMD160:
+            case Fragment::HASH256:
+            case Fragment::HASH160: return {1, {}};
+            case Fragment::ANDOR: {
+                const auto sat{(subs[0]->ss.sat + subs[1]->ss.sat) | (subs[0]->ss.dsat + subs[2]->ss.sat)};
+                const auto dsat{subs[0]->ss.dsat + subs[2]->ss.dsat};
+                return {sat, dsat};
+            }
+            case Fragment::AND_V: return {subs[0]->ss.sat + subs[1]->ss.sat, {}};
+            case Fragment::AND_B: return {subs[0]->ss.sat + subs[1]->ss.sat, subs[0]->ss.dsat + subs[1]->ss.dsat};
+            case Fragment::OR_B: {
+                const auto sat{(subs[0]->ss.dsat + subs[1]->ss.sat) | (subs[0]->ss.sat + subs[1]->ss.dsat)};
+                const auto dsat{subs[0]->ss.dsat + subs[1]->ss.dsat};
+                return {sat, dsat};
+            }
+            case Fragment::OR_C: return {subs[0]->ss.sat | (subs[0]->ss.dsat + subs[1]->ss.sat), {}};
+            case Fragment::OR_D: return {subs[0]->ss.sat | (subs[0]->ss.dsat + subs[1]->ss.sat), subs[0]->ss.dsat + subs[1]->ss.dsat};
+            case Fragment::OR_I: return {(subs[0]->ss.sat + 1) | (subs[1]->ss.sat + 1), (subs[0]->ss.dsat + 1) | (subs[1]->ss.dsat + 1)};
+            case Fragment::MULTI: return {k + 1, k + 1};
+            case Fragment::WRAP_A:
+            case Fragment::WRAP_N:
+            case Fragment::WRAP_S:
+            case Fragment::WRAP_C: return subs[0]->ss;
+            case Fragment::WRAP_D: return {1 + subs[0]->ss.sat, 1};
+            case Fragment::WRAP_V: return {subs[0]->ss.sat, {}};
+            case Fragment::WRAP_J: return {subs[0]->ss.sat, 1};
+            case Fragment::THRESH: {
+                auto sats = Vector(internal::MaxInt<uint32_t>(0));
+                for (const auto& sub : subs) {
+                    auto next_sats = Vector(sats[0] + sub->ss.dsat);
+                    for (size_t j = 1; j < sats.size(); ++j) next_sats.push_back((sats[j] + sub->ss.dsat) | (sats[j - 1] + sub->ss.sat));
+                    next_sats.push_back(sats[sats.size() - 1] + sub->ss.sat);
+                    sats = std::move(next_sats);
+                }
+                assert(k <= sats.size());
+                return {sats[k], sats[0]};
+            }
+        }
+        assert(false);
+        return {{}, {}};
+    }
+
+public:
+    //! Return the size of the script for this expression (faster than ToScript().size()).
+    size_t ScriptSize() const { return scriptlen; }
+
+    //! Return the maximum number of ops needed to satisfy this script non-malleably.
+    uint32_t GetOps() const { return ops.count + ops.sat.value; }
+
+    //! Check the ops limit of this script against the consensus limit.
+    bool CheckOpsLimit() const { return GetOps() <= MAX_OPS_PER_SCRIPT; }
+
+    /** Return the maximum number of stack elements needed to satisfy this script non-malleably, including
+     * the script push. */
+    uint32_t GetStackSize() const { return ss.sat.value + 1; }
+
+    //! Return the expression type.
+    Type GetType() const { return typ; }
+
+    //! Check whether this node is valid at all.
+    bool IsValid() const { return !(GetType() == ""_mst); }
+
+    //! Check whether this node is valid as a script on its own.
+    bool IsValidTopLevel() const { return IsValid() && GetType() << "B"_mst; }
+
+    //! Check whether this script can always be satisfied in a non-malleable way.
+    bool IsNonMalleable() const { return GetType() << "m"_mst; }
+
+    //! Check whether this script always needs a signature.
+    bool NeedsSignature() const { return GetType() << "s"_mst; }
+
+    //! Do all sanity checks.
+    bool IsSane() const { return IsValid() && GetType() << "mk"_mst && CheckOpsLimit(); }
+
+    //! Check whether this node is safe as a script on its own.
+    bool IsSaneTopLevel() const { return IsValidTopLevel() && IsSane() && NeedsSignature(); }
+
+    //! Equality testing.
+    bool operator==(const Node<Key>& arg) const
+    {
+        if (nodetype != arg.nodetype) return false;
+        if (k != arg.k) return false;
+        if (data != arg.data) return false;
+        if (keys != arg.keys) return false;
+        if (subs.size() != arg.subs.size()) return false;
+        for (size_t i = 0; i < subs.size(); ++i) {
+            if (!(*subs[i] == *arg.subs[i])) return false;
+        }
+        assert(scriptlen == arg.scriptlen);
+        assert(typ == arg.typ);
+        return true;
+    }
+
+    // Constructors with various argument combinations.
+    Node(Fragment nt, std::vector<NodeRef<Key>> sub, std::vector<unsigned char> arg, uint32_t val = 0) : nodetype(nt), k(val), data(std::move(arg)), subs(std::move(sub)), ops(CalcOps()), ss(CalcStackSize()), typ(CalcType()), scriptlen(CalcScriptLen()) {}
+    Node(Fragment nt, std::vector<unsigned char> arg, uint32_t val = 0) : nodetype(nt), k(val), data(std::move(arg)), ops(CalcOps()), ss(CalcStackSize()), typ(CalcType()), scriptlen(CalcScriptLen()) {}
+    Node(Fragment nt, std::vector<NodeRef<Key>> sub, std::vector<Key> key, uint32_t val = 0) : nodetype(nt), k(val), keys(std::move(key)), subs(std::move(sub)), ops(CalcOps()), ss(CalcStackSize()), typ(CalcType()), scriptlen(CalcScriptLen()) {}
+    Node(Fragment nt, std::vector<Key> key, uint32_t val = 0) : nodetype(nt), k(val), keys(std::move(key)), ops(CalcOps()), ss(CalcStackSize()), typ(CalcType()), scriptlen(CalcScriptLen()) {}
+    Node(Fragment nt, std::vector<NodeRef<Key>> sub, uint32_t val = 0) : nodetype(nt), k(val), subs(std::move(sub)), ops(CalcOps()), ss(CalcStackSize()), typ(CalcType()), scriptlen(CalcScriptLen()) {}
+    Node(Fragment nt, uint32_t val = 0) : nodetype(nt), k(val), ops(CalcOps()), ss(CalcStackSize()), typ(CalcType()), scriptlen(CalcScriptLen()) {}
+};
+
+namespace internal {
+
+enum class ParseContext {
+    /** An expression which may be begin with wrappers followed by a colon. */
+    WRAPPED_EXPR,
+    /** A miniscript expression which does not begin with wrappers. */
+    EXPR,
+
+    /** SWAP wraps the top constructed node with s: */
+    SWAP,
+    /** ALT wraps the top constructed node with a: */
+    ALT,
+    /** CHECK wraps the top constructed node with c: */
+    CHECK,
+    /** DUP_IF wraps the top constructed node with d: */
+    DUP_IF,
+    /** VERIFY wraps the top constructed node with v: */
+    VERIFY,
+    /** NON_ZERO wraps the top constructed node with j: */
+    NON_ZERO,
+    /** ZERO_NOTEQUAL wraps the top constructed node with n: */
+    ZERO_NOTEQUAL,
+    /** WRAP_U will construct an or_i(X,0) node from the top constructed node. */
+    WRAP_U,
+    /** WRAP_T will construct an and_v(X,1) node from the top constructed node. */
+    WRAP_T,
+
+    /** AND_N will construct an andor(X,Y,0) node from the last two constructed nodes. */
+    AND_N,
+    /** AND_V will construct an and_v node from the last two constructed nodes. */
+    AND_V,
+    /** AND_B will construct an and_b node from the last two constructed nodes. */
+    AND_B,
+    /** ANDOR will construct an andor node from the last three constructed nodes. */
+    ANDOR,
+    /** OR_B will construct an or_b node from the last two constructed nodes. */
+    OR_B,
+    /** OR_C will construct an or_c node from the last two constructed nodes. */
+    OR_C,
+    /** OR_D will construct an or_d node from the last two constructed nodes. */
+    OR_D,
+    /** OR_I will construct an or_i node from the last two constructed nodes. */
+    OR_I,
+
+    /** THRESH will read a wrapped expression, and then look for a COMMA. If
+     * no comma follows, it will construct a thresh node from the appropriate
+     * number of constructed children. Otherwise, it will recurse with another
+     * THRESH. */
+    THRESH,
+
+    /** COMMA expects the next element to be ',' and fails if not. */
+    COMMA,
+    /** CLOSE_BRACKET expects the next element to be ')' and fails if not. */
+    CLOSE_BRACKET,
+};
+
+int FindNextChar(Span<const char> in, const char m);
+
+/** Parse a key string ending with a ')' or ','. */
+template<typename Key, typename Ctx>
+std::optional<std::pair<Key, int>> ParseKeyEnd(Span<const char> in, const Ctx& ctx)
+{
+    Key key;
+    int key_size = FindNextChar(in, ')');
+    if (key_size < 1) return {};
+    if (!ctx.FromString(in.begin(), in.begin() + key_size, key)) return {};
+    return {{std::move(key), key_size}};
+}
+
+/** Parse a hex string ending at the end of the fragment's text representation. */
+template<typename Ctx>
+std::optional<std::pair<std::vector<unsigned char>, int>> ParseHexStrEnd(Span<const char> in, const size_t expected_size,
+                                                                         const Ctx& ctx)
+{
+    int hash_size = FindNextChar(in, ')');
+    if (hash_size < 1) return {};
+    std::string val = std::string(in.begin(), in.begin() + hash_size);
+    if (!IsHex(val)) return {};
+    auto hash = ParseHex(val);
+    if (hash.size() != expected_size) return {};
+    return {{std::move(hash), hash_size}};
+}
+
+/** BuildBack pops the last two elements off `constructed` and wraps them in the specified Fragment */
+template<typename Key>
+void BuildBack(Fragment nt, std::vector<NodeRef<Key>>& constructed, const bool reverse = false)
+{
+    NodeRef<Key> child = std::move(constructed.back());
+    constructed.pop_back();
+    if (reverse) {
+        constructed.back() = MakeNodeRef<Key>(nt, Vector(std::move(child), std::move(constructed.back())));
+    } else {
+        constructed.back() = MakeNodeRef<Key>(nt, Vector(std::move(constructed.back()), std::move(child)));
+    }
+}
+
+//! Parse a miniscript from its textual descriptor form.
+template<typename Key, typename Ctx>
+inline NodeRef<Key> Parse(Span<const char> in, const Ctx& ctx)
+{
+    using namespace spanparsing;
+
+    // The two integers are used to hold state for thresh()
+    std::vector<std::tuple<ParseContext, int64_t, int64_t>> to_parse;
+    std::vector<NodeRef<Key>> constructed;
+
+    to_parse.emplace_back(ParseContext::WRAPPED_EXPR, -1, -1);
+
+    while (!to_parse.empty()) {
+        // Get the current context we are decoding within
+        auto [cur_context, n, k] = to_parse.back();
+        to_parse.pop_back();
+
+        switch (cur_context) {
+        case ParseContext::WRAPPED_EXPR: {
+            int colon_index = -1;
+            for (int i = 1; i < (int)in.size(); ++i) {
+                if (in[i] == ':') {
+                    colon_index = i;
+                    break;
+                }
+                if (in[i] < 'a' || in[i] > 'z') break;
+            }
+            // If there is no colon, this loop won't execute
+            for (int j = 0; j < colon_index; ++j) {
+                if (in[j] == 'a') {
+                    to_parse.emplace_back(ParseContext::ALT, -1, -1);
+                } else if (in[j] == 's') {
+                    to_parse.emplace_back(ParseContext::SWAP, -1, -1);
+                } else if (in[j] == 'c') {
+                    to_parse.emplace_back(ParseContext::CHECK, -1, -1);
+                } else if (in[j] == 'd') {
+                    to_parse.emplace_back(ParseContext::DUP_IF, -1, -1);
+                } else if (in[j] == 'j') {
+                    to_parse.emplace_back(ParseContext::NON_ZERO, -1, -1);
+                } else if (in[j] == 'n') {
+                    to_parse.emplace_back(ParseContext::ZERO_NOTEQUAL, -1, -1);
+                } else if (in[j] == 'v') {
+                    to_parse.emplace_back(ParseContext::VERIFY, -1, -1);
+                } else if (in[j] == 'u') {
+                    to_parse.emplace_back(ParseContext::WRAP_U, -1, -1);
+                } else if (in[j] == 't') {
+                    to_parse.emplace_back(ParseContext::WRAP_T, -1, -1);
+                } else if (in[j] == 'l') {
+                    // The l: wrapper is equivalent to or_i(0,X)
+                    constructed.push_back(MakeNodeRef<Key>(Fragment::JUST_0));
+                    to_parse.emplace_back(ParseContext::OR_I, -1, -1);
+                } else {
+                    return {};
+                }
+            }
+            to_parse.emplace_back(ParseContext::EXPR, -1, -1);
+            in = in.subspan(colon_index + 1);
+            break;
+        }
+        case ParseContext::EXPR: {
+            if (Const("0", in)) {
+                constructed.push_back(MakeNodeRef<Key>(Fragment::JUST_0));
+            } else if (Const("1", in)) {
+                constructed.push_back(MakeNodeRef<Key>(Fragment::JUST_1));
+            } else if (Const("pk(", in)) {
+                auto res = ParseKeyEnd<Key, Ctx>(in, ctx);
+                if (!res) return {};
+                auto& [key, key_size] = *res;
+                constructed.push_back(MakeNodeRef<Key>(Fragment::WRAP_C, Vector(MakeNodeRef<Key>(Fragment::PK_K, Vector(std::move(key))))));
+                in = in.subspan(key_size + 1);
+            } else if (Const("pkh(", in)) {
+                auto res = ParseKeyEnd<Key>(in, ctx);
+                if (!res) return {};
+                auto& [key, key_size] = *res;
+                constructed.push_back(MakeNodeRef<Key>(Fragment::WRAP_C, Vector(MakeNodeRef<Key>(Fragment::PK_H, Vector(std::move(key))))));
+                in = in.subspan(key_size + 1);
+            } else if (Const("pk_k(", in)) {
+                auto res = ParseKeyEnd<Key>(in, ctx);
+                if (!res) return {};
+                auto& [key, key_size] = *res;
+                constructed.push_back(MakeNodeRef<Key>(Fragment::PK_K, Vector(std::move(key))));
+                in = in.subspan(key_size + 1);
+            } else if (Const("pk_h(", in)) {
+                auto res = ParseKeyEnd<Key>(in, ctx);
+                if (!res) return {};
+                auto& [key, key_size] = *res;
+                constructed.push_back(MakeNodeRef<Key>(Fragment::PK_H, Vector(std::move(key))));
+                in = in.subspan(key_size + 1);
+            } else if (Const("sha256(", in)) {
+                auto res = ParseHexStrEnd(in, 32, ctx);
+                if (!res) return {};
+                auto& [hash, hash_size] = *res;
+                constructed.push_back(MakeNodeRef<Key>(Fragment::SHA256, std::move(hash)));
+                in = in.subspan(hash_size + 1);
+            } else if (Const("ripemd160(", in)) {
+                auto res = ParseHexStrEnd(in, 20, ctx);
+                if (!res) return {};
+                auto& [hash, hash_size] = *res;
+                constructed.push_back(MakeNodeRef<Key>(Fragment::RIPEMD160, std::move(hash)));
+                in = in.subspan(hash_size + 1);
+            } else if (Const("hash256(", in)) {
+                auto res = ParseHexStrEnd(in, 32, ctx);
+                if (!res) return {};
+                auto& [hash, hash_size] = *res;
+                constructed.push_back(MakeNodeRef<Key>(Fragment::HASH256, std::move(hash)));
+                in = in.subspan(hash_size + 1);
+            } else if (Const("hash160(", in)) {
+                auto res = ParseHexStrEnd(in, 20, ctx);
+                if (!res) return {};
+                auto& [hash, hash_size] = *res;
+                constructed.push_back(MakeNodeRef<Key>(Fragment::HASH160, std::move(hash)));
+                in = in.subspan(hash_size + 1);
+            } else if (Const("after(", in)) {
+                int arg_size = FindNextChar(in, ')');
+                if (arg_size < 1) return {};
+                int64_t num;
+                if (!ParseInt64(std::string(in.begin(), in.begin() + arg_size), &num)) return {};
+                if (num < 1 || num >= 0x80000000L) return {};
+                constructed.push_back(MakeNodeRef<Key>(Fragment::AFTER, num));
+                in = in.subspan(arg_size + 1);
+            } else if (Const("older(", in)) {
+                int arg_size = FindNextChar(in, ')');
+                if (arg_size < 1) return {};
+                int64_t num;
+                if (!ParseInt64(std::string(in.begin(), in.begin() + arg_size), &num)) return {};
+                if (num < 1 || num >= 0x80000000L) return {};
+                constructed.push_back(MakeNodeRef<Key>(Fragment::OLDER, num));
+                in = in.subspan(arg_size + 1);
+            } else if (Const("multi(", in)) {
+                // Get threshold
+                int next_comma = FindNextChar(in, ',');
+                if (next_comma < 1) return {};
+                if (!ParseInt64(std::string(in.begin(), in.begin() + next_comma), &k)) return {};
+                in = in.subspan(next_comma + 1);
+                // Get keys
+                std::vector<Key> keys;
+                while (next_comma != -1) {
+                    Key key;
+                    next_comma = FindNextChar(in, ',');
+                    int key_length = (next_comma == -1) ? FindNextChar(in, ')') : next_comma;
+                    if (key_length < 1) return {};
+                    if (!ctx.FromString(in.begin(), in.begin() + key_length, key)) return {};
+                    keys.push_back(std::move(key));
+                    in = in.subspan(key_length + 1);
+                }
+                if (keys.size() < 1 || keys.size() > 20) return {};
+                if (k < 1 || k > (int64_t)keys.size()) return {};
+                constructed.push_back(MakeNodeRef<Key>(Fragment::MULTI, std::move(keys), k));
+            } else if (Const("thresh(", in)) {
+                int next_comma = FindNextChar(in, ',');
+                if (next_comma < 1) return {};
+                if (!ParseInt64(std::string(in.begin(), in.begin() + next_comma), &k)) return {};
+                if (k < 1) return {};
+                in = in.subspan(next_comma + 1);
+                // n = 1 here because we read the first WRAPPED_EXPR before reaching THRESH
+                to_parse.emplace_back(ParseContext::THRESH, 1, k);
+                to_parse.emplace_back(ParseContext::WRAPPED_EXPR, -1, -1);
+            } else if (Const("andor(", in)) {
+                to_parse.emplace_back(ParseContext::ANDOR, -1, -1);
+                to_parse.emplace_back(ParseContext::CLOSE_BRACKET, -1, -1);
+                to_parse.emplace_back(ParseContext::WRAPPED_EXPR, -1, -1);
+                to_parse.emplace_back(ParseContext::COMMA, -1, -1);
+                to_parse.emplace_back(ParseContext::WRAPPED_EXPR, -1, -1);
+                to_parse.emplace_back(ParseContext::COMMA, -1, -1);
+                to_parse.emplace_back(ParseContext::WRAPPED_EXPR, -1, -1);
+            } else {
+                if (Const("and_n(", in)) {
+                    to_parse.emplace_back(ParseContext::AND_N, -1, -1);
+                } else if (Const("and_b(", in)) {
+                    to_parse.emplace_back(ParseContext::AND_B, -1, -1);
+                } else if (Const("and_v(", in)) {
+                    to_parse.emplace_back(ParseContext::AND_V, -1, -1);
+                } else if (Const("or_b(", in)) {
+                    to_parse.emplace_back(ParseContext::OR_B, -1, -1);
+                } else if (Const("or_c(", in)) {
+                    to_parse.emplace_back(ParseContext::OR_C, -1, -1);
+                } else if (Const("or_d(", in)) {
+                    to_parse.emplace_back(ParseContext::OR_D, -1, -1);
+                } else if (Const("or_i(", in)) {
+                    to_parse.emplace_back(ParseContext::OR_I, -1, -1);
+                } else {
+                    return {};
+                }
+                to_parse.emplace_back(ParseContext::CLOSE_BRACKET, -1, -1);
+                to_parse.emplace_back(ParseContext::WRAPPED_EXPR, -1, -1);
+                to_parse.emplace_back(ParseContext::COMMA, -1, -1);
+                to_parse.emplace_back(ParseContext::WRAPPED_EXPR, -1, -1);
+            }
+            break;
+        }
+        case ParseContext::ALT: {
+            constructed.back() = MakeNodeRef<Key>(Fragment::WRAP_A, Vector(std::move(constructed.back())));
+            break;
+        }
+        case ParseContext::SWAP: {
+            constructed.back() = MakeNodeRef<Key>(Fragment::WRAP_S, Vector(std::move(constructed.back())));
+            break;
+        }
+        case ParseContext::CHECK: {
+            constructed.back() = MakeNodeRef<Key>(Fragment::WRAP_C, Vector(std::move(constructed.back())));
+            break;
+        }
+        case ParseContext::DUP_IF: {
+            constructed.back() = MakeNodeRef<Key>(Fragment::WRAP_D, Vector(std::move(constructed.back())));
+            break;
+        }
+        case ParseContext::NON_ZERO: {
+            constructed.back() = MakeNodeRef<Key>(Fragment::WRAP_J, Vector(std::move(constructed.back())));
+            break;
+        }
+        case ParseContext::ZERO_NOTEQUAL: {
+            constructed.back() = MakeNodeRef<Key>(Fragment::WRAP_N, Vector(std::move(constructed.back())));
+            break;
+        }
+        case ParseContext::VERIFY: {
+            constructed.back() = MakeNodeRef<Key>(Fragment::WRAP_V, Vector(std::move(constructed.back())));
+            break;
+        }
+        case ParseContext::WRAP_U: {
+            constructed.back() = MakeNodeRef<Key>(Fragment::OR_I, Vector(std::move(constructed.back()), MakeNodeRef<Key>(Fragment::JUST_0)));
+            break;
+        }
+        case ParseContext::WRAP_T: {
+            constructed.back() = MakeNodeRef<Key>(Fragment::AND_V, Vector(std::move(constructed.back()), MakeNodeRef<Key>(Fragment::JUST_1)));
+            break;
+        }
+        case ParseContext::AND_B: {
+            BuildBack(Fragment::AND_B, constructed);
+            break;
+        }
+        case ParseContext::AND_N: {
+            auto mid = std::move(constructed.back());
+            constructed.pop_back();
+            constructed.back() = MakeNodeRef<Key>(Fragment::ANDOR, Vector(std::move(constructed.back()), std::move(mid), MakeNodeRef<Key>(Fragment::JUST_0)));
+            break;
+        }
+        case ParseContext::AND_V: {
+            BuildBack(Fragment::AND_V, constructed);
+            break;
+        }
+        case ParseContext::OR_B: {
+            BuildBack(Fragment::OR_B, constructed);
+            break;
+        }
+        case ParseContext::OR_C: {
+            BuildBack(Fragment::OR_C, constructed);
+            break;
+        }
+        case ParseContext::OR_D: {
+            BuildBack(Fragment::OR_D, constructed);
+            break;
+        }
+        case ParseContext::OR_I: {
+            BuildBack(Fragment::OR_I, constructed);
+            break;
+        }
+        case ParseContext::ANDOR: {
+            auto right = std::move(constructed.back());
+            constructed.pop_back();
+            auto mid = std::move(constructed.back());
+            constructed.pop_back();
+            constructed.back() = MakeNodeRef<Key>(Fragment::ANDOR, Vector(std::move(constructed.back()), std::move(mid), std::move(right)));
+            break;
+        }
+        case ParseContext::THRESH: {
+            if (in.size() < 1) return {};
+            if (in[0] == ',') {
+                in = in.subspan(1);
+                to_parse.emplace_back(ParseContext::THRESH, n+1, k);
+                to_parse.emplace_back(ParseContext::WRAPPED_EXPR, -1, -1);
+            } else if (in[0] == ')') {
+                if (k > n) return {};
+                in = in.subspan(1);
+                // Children are constructed in reverse order, so iterate from end to beginning
+                std::vector<NodeRef<Key>> subs;
+                for (int i = 0; i < n; ++i) {
+                    subs.push_back(std::move(constructed.back()));
+                    constructed.pop_back();
+                }
+                std::reverse(subs.begin(), subs.end());
+                constructed.push_back(MakeNodeRef<Key>(Fragment::THRESH, std::move(subs), k));
+            } else {
+                return {};
+            }
+            break;
+        }
+        case ParseContext::COMMA: {
+            if (in.size() < 1 || in[0] != ',') return {};
+            in = in.subspan(1);
+            break;
+        }
+        case ParseContext::CLOSE_BRACKET: {
+            if (in.size() < 1 || in[0] != ')') return {};
+            in = in.subspan(1);
+            break;
+        }
+        }
+    }
+
+    // Sanity checks on the produced miniscript
+    assert(constructed.size() == 1);
+    if (in.size() > 0) return {};
+    const NodeRef<Key> tl_node = std::move(constructed.front());
+    if (!tl_node->IsValidTopLevel()) return {};
+    return tl_node;
+}
+
+/** Decode a script into opcode/push pairs.
+ *
+ * Construct a vector with one element per opcode in the script, in reverse order.
+ * Each element is a pair consisting of the opcode, as well as the data pushed by
+ * the opcode (including OP_n), if any. OP_CHECKSIGVERIFY, OP_CHECKMULTISIGVERIFY,
+ * and OP_EQUALVERIFY are decomposed into OP_CHECKSIG, OP_CHECKMULTISIG, OP_EQUAL
+ * respectively, plus OP_VERIFY.
+ */
+bool DecomposeScript(const CScript& script, std::vector<std::pair<opcodetype, std::vector<unsigned char>>>& out);
+
+/** Determine whether the passed pair (created by DecomposeScript) is pushing a number. */
+bool ParseScriptNumber(const std::pair<opcodetype, std::vector<unsigned char>>& in, int64_t& k);
+
+enum class DecodeContext {
+    /** A single expression of type B, K, or V. Specifically, this can't be an
+     * and_v or an expression of type W (a: and s: wrappers). */
+    SINGLE_BKV_EXPR,
+    /** Potentially multiple SINGLE_BKV_EXPRs as children of (potentially multiple)
+     * and_v expressions. Syntactic sugar for MAYBE_AND_V + SINGLE_BKV_EXPR. */
+    BKV_EXPR,
+    /** An expression of type W (a: or s: wrappers). */
+    W_EXPR,
+
+    /** SWAP expects the next element to be OP_SWAP (inside a W-type expression that
+     * didn't end with FROMALTSTACK), and wraps the top of the constructed stack
+     * with s: */
+    SWAP,
+    /** ALT expects the next element to be TOALTSTACK (we must have already read a
+     * FROMALTSTACK earlier), and wraps the top of the constructed stack with a: */
+    ALT,
+    /** CHECK wraps the top constructed node with c: */
+    CHECK,
+    /** DUP_IF wraps the top constructed node with d: */
+    DUP_IF,
+    /** VERIFY wraps the top constructed node with v: */
+    VERIFY,
+    /** NON_ZERO wraps the top constructed node with j: */
+    NON_ZERO,
+    /** ZERO_NOTEQUAL wraps the top constructed node with n: */
+    ZERO_NOTEQUAL,
+
+    /** MAYBE_AND_V will check if the next part of the script could be a valid
+     * miniscript sub-expression, and if so it will push AND_V and SINGLE_BKV_EXPR
+     * to decode it and construct the and_v node. This is recursive, to deal with
+     * multiple and_v nodes inside each other. */
+    MAYBE_AND_V,
+    /** AND_V will construct an and_v node from the last two constructed nodes. */
+    AND_V,
+    /** AND_B will construct an and_b node from the last two constructed nodes. */
+    AND_B,
+    /** ANDOR will construct an andor node from the last three constructed nodes. */
+    ANDOR,
+    /** OR_B will construct an or_b node from the last two constructed nodes. */
+    OR_B,
+    /** OR_C will construct an or_c node from the last two constructed nodes. */
+    OR_C,
+    /** OR_D will construct an or_d node from the last two constructed nodes. */
+    OR_D,
+
+    /** In a thresh expression, all sub-expressions other than the first are W-type,
+     * and end in OP_ADD. THRESH_W will check for this OP_ADD and either push a W_EXPR
+     * or a SINGLE_BKV_EXPR and jump to THRESH_E accordingly. */
+    THRESH_W,
+    /** THRESH_E constructs a thresh node from the appropriate number of constructed
+     * children. */
+    THRESH_E,
+
+    /** ENDIF signals that we are inside some sort of OP_IF structure, which could be
+     * or_d, or_c, or_i, andor, d:, or j: wrapper, depending on what follows. We read
+     * a BKV_EXPR and then deal with the next opcode case-by-case. */
+    ENDIF,
+    /** If, inside an ENDIF context, we find an OP_NOTIF before finding an OP_ELSE,
+     * we could either be in an or_d or an or_c node. We then check for IFDUP to
+     * distinguish these cases. */
+    ENDIF_NOTIF,
+    /** If, inside an ENDIF context, we find an OP_ELSE, then we could be in either an
+     * or_i or an andor node. Read the next BKV_EXPR and find either an OP_IF or an
+     * OP_NOTIF. */
+    ENDIF_ELSE,
+};
+
+//! Parse a miniscript from a bitcoin script
+template<typename Key, typename Ctx, typename I>
+inline NodeRef<Key> DecodeScript(I& in, I last, const Ctx& ctx)
+{
+    // The two integers are used to hold state for thresh()
+    std::vector<std::tuple<DecodeContext, int64_t, int64_t>> to_parse;
+    std::vector<NodeRef<Key>> constructed;
+
+    // This is the top level, so we assume the type is B
+    // (in particular, disallowing top level W expressions)
+    to_parse.emplace_back(DecodeContext::BKV_EXPR, -1, -1);
+
+    while (!to_parse.empty()) {
+        // Exit early if the Miniscript is not going to be valid.
+        if (!constructed.empty() && !constructed.back()->IsValid()) return {};
+
+        // Get the current context we are decoding within
+        auto [cur_context, n, k] = to_parse.back();
+        to_parse.pop_back();
+
+        switch(cur_context) {
+        case DecodeContext::SINGLE_BKV_EXPR: {
+            if (in >= last) return {};
+
+            // Constants
+            if (in[0].first == OP_1) {
+                ++in;
+                constructed.push_back(MakeNodeRef<Key>(Fragment::JUST_1));
+                break;
+            }
+            if (in[0].first == OP_0) {
+                ++in;
+                constructed.push_back(MakeNodeRef<Key>(Fragment::JUST_0));
+                break;
+            }
+            // Public keys
+            if (in[0].second.size() == 33) {
+                Key key;
+                if (!ctx.FromPKBytes(in[0].second.begin(), in[0].second.end(), key)) return {};
+                ++in;
+                constructed.push_back(MakeNodeRef<Key>(Fragment::PK_K, Vector(std::move(key))));
+                break;
+            }
+            if (last - in >= 5 && in[0].first == OP_VERIFY && in[1].first == OP_EQUAL && in[3].first == OP_HASH160 && in[4].first == OP_DUP && in[2].second.size() == 20) {
+                Key key;
+                if (!ctx.FromPKHBytes(in[2].second.begin(), in[2].second.end(), key)) return {};
+                in += 5;
+                constructed.push_back(MakeNodeRef<Key>(Fragment::PK_H, Vector(std::move(key))));
+                break;
+            }
+            // Time locks
+            if (last - in >= 2 && in[0].first == OP_CHECKSEQUENCEVERIFY && ParseScriptNumber(in[1], k)) {
+                in += 2;
+                if (k < 1 || k > 0x7FFFFFFFL) return {};
+                constructed.push_back(MakeNodeRef<Key>(Fragment::OLDER, k));
+                break;
+            }
+            if (last - in >= 2 && in[0].first == OP_CHECKLOCKTIMEVERIFY && ParseScriptNumber(in[1], k)) {
+                in += 2;
+                if (k < 1 || k > 0x7FFFFFFFL) return {};
+                constructed.push_back(MakeNodeRef<Key>(Fragment::AFTER, k));
+                break;
+            }
+            // Hashes
+            if (last - in >= 7 && in[0].first == OP_EQUAL && in[3].first == OP_VERIFY && in[4].first == OP_EQUAL && ParseScriptNumber(in[5], k) && k == 32 && in[6].first == OP_SIZE) {
+                if (in[2].first == OP_SHA256 && in[1].second.size() == 32) {
+                    constructed.push_back(MakeNodeRef<Key>(Fragment::SHA256, in[1].second));
+                    in += 7;
+                    break;
+                } else if (in[2].first == OP_RIPEMD160 && in[1].second.size() == 20) {
+                    constructed.push_back(MakeNodeRef<Key>(Fragment::RIPEMD160, in[1].second));
+                    in += 7;
+                    break;
+                } else if (in[2].first == OP_HASH256 && in[1].second.size() == 32) {
+                    constructed.push_back(MakeNodeRef<Key>(Fragment::HASH256, in[1].second));
+                    in += 7;
+                    break;
+                } else if (in[2].first == OP_HASH160 && in[1].second.size() == 20) {
+                    constructed.push_back(MakeNodeRef<Key>(Fragment::HASH160, in[1].second));
+                    in += 7;
+                    break;
+                }
+            }
+            // Multi
+            if (last - in >= 3 && in[0].first == OP_CHECKMULTISIG) {
+                std::vector<Key> keys;
+                if (!ParseScriptNumber(in[1], n)) return {};
+                if (last - in < 3 + n) return {};
+                if (n < 1 || n > 20) return {};
+                for (int i = 0; i < n; ++i) {
+                    Key key;
+                    if (in[2 + i].second.size() != 33) return {};
+                    if (!ctx.FromPKBytes(in[2 + i].second.begin(), in[2 + i].second.end(), key)) return {};
+                    keys.push_back(std::move(key));
+                }
+                if (!ParseScriptNumber(in[2 + n], k)) return {};
+                if (k < 1 || k > n) return {};
+                in += 3 + n;
+                std::reverse(keys.begin(), keys.end());
+                constructed.push_back(MakeNodeRef<Key>(Fragment::MULTI, std::move(keys), k));
+                break;
+            }
+            /** In the following wrappers, we only need to push SINGLE_BKV_EXPR rather
+             * than BKV_EXPR, because and_v commutes with these wrappers. For example,
+             * c:and_v(X,Y) produces the same script as and_v(X,c:Y). */
+            // c: wrapper
+            if (in[0].first == OP_CHECKSIG) {
+                ++in;
+                to_parse.emplace_back(DecodeContext::CHECK, -1, -1);
+                to_parse.emplace_back(DecodeContext::SINGLE_BKV_EXPR, -1, -1);
+                break;
+            }
+            // v: wrapper
+            if (in[0].first == OP_VERIFY) {
+                ++in;
+                to_parse.emplace_back(DecodeContext::VERIFY, -1, -1);
+                to_parse.emplace_back(DecodeContext::SINGLE_BKV_EXPR, -1, -1);
+                break;
+            }
+            // n: wrapper
+            if (in[0].first == OP_0NOTEQUAL) {
+                ++in;
+                to_parse.emplace_back(DecodeContext::ZERO_NOTEQUAL, -1, -1);
+                to_parse.emplace_back(DecodeContext::SINGLE_BKV_EXPR, -1, -1);
+                break;
+            }
+            // Thresh
+            if (last - in >= 3 && in[0].first == OP_EQUAL && ParseScriptNumber(in[1], k)) {
+                if (k < 1) return {};
+                in += 2;
+                to_parse.emplace_back(DecodeContext::THRESH_W, 0, k);
+                break;
+            }
+            // OP_ENDIF can be WRAP_J, WRAP_D, ANDOR, OR_C, OR_D, or OR_I
+            if (in[0].first == OP_ENDIF) {
+                ++in;
+                to_parse.emplace_back(DecodeContext::ENDIF, -1, -1);
+                to_parse.emplace_back(DecodeContext::BKV_EXPR, -1, -1);
+                break;
+            }
+            /** In and_b and or_b nodes, we only look for SINGLE_BKV_EXPR, because
+             * or_b(and_v(X,Y),Z) has script [X] [Y] [Z] OP_BOOLOR, the same as
+             * and_v(X,or_b(Y,Z)). In this example, the former of these is invalid as
+             * miniscript, while the latter is valid. So we leave the and_v "outside"
+             * while decoding. */
+            // and_b
+            if (in[0].first == OP_BOOLAND) {
+                ++in;
+                to_parse.emplace_back(DecodeContext::AND_B, -1, -1);
+                to_parse.emplace_back(DecodeContext::SINGLE_BKV_EXPR, -1, -1);
+                to_parse.emplace_back(DecodeContext::W_EXPR, -1, -1);
+                break;
+            }
+            // or_b
+            if (in[0].first == OP_BOOLOR) {
+                ++in;
+                to_parse.emplace_back(DecodeContext::OR_B, -1, -1);
+                to_parse.emplace_back(DecodeContext::SINGLE_BKV_EXPR, -1, -1);
+                to_parse.emplace_back(DecodeContext::W_EXPR, -1, -1);
+                break;
+            }
+            // Unrecognised expression
+            return {};
+        }
+        case DecodeContext::BKV_EXPR: {
+            to_parse.emplace_back(DecodeContext::MAYBE_AND_V, -1, -1);
+            to_parse.emplace_back(DecodeContext::SINGLE_BKV_EXPR, -1, -1);
+            break;
+        }
+        case DecodeContext::W_EXPR: {
+            // a: wrapper
+            if (in >= last) return {};
+            if (in[0].first == OP_FROMALTSTACK) {
+                ++in;
+                to_parse.emplace_back(DecodeContext::ALT, -1, -1);
+            } else {
+                to_parse.emplace_back(DecodeContext::SWAP, -1, -1);
+            }
+            to_parse.emplace_back(DecodeContext::BKV_EXPR, -1, -1);
+            break;
+        }
+        case DecodeContext::MAYBE_AND_V: {
+            // If we reach a potential AND_V top-level, check if the next part of the script could be another AND_V child
+            // These op-codes cannot end any well-formed miniscript so cannot be used in an and_v node.
+            if (in < last && in[0].first != OP_IF && in[0].first != OP_ELSE && in[0].first != OP_NOTIF && in[0].first != OP_TOALTSTACK && in[0].first != OP_SWAP) {
+                to_parse.emplace_back(DecodeContext::AND_V, -1, -1);
+                // BKV_EXPR can contain more AND_V nodes
+                to_parse.emplace_back(DecodeContext::BKV_EXPR, -1, -1);
+            }
+            break;
+        }
+        case DecodeContext::SWAP: {
+            if (in >= last || in[0].first != OP_SWAP || constructed.empty()) return {};
+            ++in;
+            constructed.back() = MakeNodeRef<Key>(Fragment::WRAP_S, Vector(std::move(constructed.back())));
+            break;
+        }
+        case DecodeContext::ALT: {
+            if (in >= last || in[0].first != OP_TOALTSTACK || constructed.empty()) return {};
+            ++in;
+            constructed.back() = MakeNodeRef<Key>(Fragment::WRAP_A, Vector(std::move(constructed.back())));
+            break;
+        }
+        case DecodeContext::CHECK: {
+            if (constructed.empty()) return {};
+            constructed.back() = MakeNodeRef<Key>(Fragment::WRAP_C, Vector(std::move(constructed.back())));
+            break;
+        }
+        case DecodeContext::DUP_IF: {
+            if (constructed.empty()) return {};
+            constructed.back() = MakeNodeRef<Key>(Fragment::WRAP_D, Vector(std::move(constructed.back())));
+            break;
+        }
+        case DecodeContext::VERIFY: {
+            if (constructed.empty()) return {};
+            constructed.back() = MakeNodeRef<Key>(Fragment::WRAP_V, Vector(std::move(constructed.back())));
+            break;
+        }
+        case DecodeContext::NON_ZERO: {
+            if (constructed.empty()) return {};
+            constructed.back() = MakeNodeRef<Key>(Fragment::WRAP_J, Vector(std::move(constructed.back())));
+            break;
+        }
+        case DecodeContext::ZERO_NOTEQUAL: {
+            if (constructed.empty()) return {};
+            constructed.back() = MakeNodeRef<Key>(Fragment::WRAP_N, Vector(std::move(constructed.back())));
+            break;
+        }
+        case DecodeContext::AND_V: {
+            if (constructed.size() < 2) return {};
+            BuildBack(Fragment::AND_V, constructed, /* reverse */ true);
+            break;
+        }
+        case DecodeContext::AND_B: {
+            if (constructed.size() < 2) return {};
+            BuildBack(Fragment::AND_B, constructed, /* reverse */ true);
+            break;
+        }
+        case DecodeContext::OR_B: {
+            if (constructed.size() < 2) return {};
+            BuildBack(Fragment::OR_B, constructed, /* reverse */ true);
+            break;
+        }
+        case DecodeContext::OR_C: {
+            if (constructed.size() < 2) return {};
+            BuildBack(Fragment::OR_C, constructed, /* reverse */ true);
+            break;
+        }
+        case DecodeContext::OR_D: {
+            if (constructed.size() < 2) return {};
+            BuildBack(Fragment::OR_D, constructed, /* reverse */ true);
+            break;
+        }
+        case DecodeContext::ANDOR: {
+            if (constructed.size() < 3) return {};
+            NodeRef<Key> left = std::move(constructed.back());
+            constructed.pop_back();
+            NodeRef<Key> right = std::move(constructed.back());
+            constructed.pop_back();
+            NodeRef<Key> mid = std::move(constructed.back());
+            constructed.back() = MakeNodeRef<Key>(Fragment::ANDOR, Vector(std::move(left), std::move(mid), std::move(right)));
+            break;
+        }
+        case DecodeContext::THRESH_W: {
+            if (in >= last) return {};
+            if (in[0].first == OP_ADD) {
+                ++in;
+                to_parse.emplace_back(DecodeContext::THRESH_W, n+1, k);
+                to_parse.emplace_back(DecodeContext::W_EXPR, -1, -1);
+            } else {
+                to_parse.emplace_back(DecodeContext::THRESH_E, n+1, k);
+                // All children of thresh have type modifier d, so cannot be and_v
+                to_parse.emplace_back(DecodeContext::SINGLE_BKV_EXPR, -1, -1);
+            }
+            break;
+        }
+        case DecodeContext::THRESH_E: {
+            if (k < 1 || k > n || constructed.size() < static_cast<size_t>(n)) return {};
+            std::vector<NodeRef<Key>> subs;
+            for (int i = 0; i < n; ++i) {
+                NodeRef<Key> sub = std::move(constructed.back());
+                constructed.pop_back();
+                subs.push_back(std::move(sub));
+            }
+            constructed.push_back(MakeNodeRef<Key>(Fragment::THRESH, std::move(subs), k));
+            break;
+        }
+        case DecodeContext::ENDIF: {
+            if (in >= last) return {};
+
+            // could be andor or or_i
+            if (in[0].first == OP_ELSE) {
+                ++in;
+                to_parse.emplace_back(DecodeContext::ENDIF_ELSE, -1, -1);
+                to_parse.emplace_back(DecodeContext::BKV_EXPR, -1, -1);
+            }
+            // could be j: or d: wrapper
+            else if (in[0].first == OP_IF) {
+                if (last - in >= 2 && in[1].first == OP_DUP) {
+                    in += 2;
+                    to_parse.emplace_back(DecodeContext::DUP_IF, -1, -1);
+                } else if (last - in >= 3 && in[1].first == OP_0NOTEQUAL && in[2].first == OP_SIZE) {
+                    in += 3;
+                    to_parse.emplace_back(DecodeContext::NON_ZERO, -1, -1);
+                }
+                else {
+                    return {};
+                }
+            // could be or_c or or_d
+            } else if (in[0].first == OP_NOTIF) {
+                ++in;
+                to_parse.emplace_back(DecodeContext::ENDIF_NOTIF, -1, -1);
+            }
+            else {
+                return {};
+            }
+            break;
+        }
+        case DecodeContext::ENDIF_NOTIF: {
+            if (in >= last) return {};
+            if (in[0].first == OP_IFDUP) {
+                ++in;
+                to_parse.emplace_back(DecodeContext::OR_D, -1, -1);
+            } else {
+                to_parse.emplace_back(DecodeContext::OR_C, -1, -1);
+            }
+            // or_c and or_d both require X to have type modifier d so, can't contain and_v
+            to_parse.emplace_back(DecodeContext::SINGLE_BKV_EXPR, -1, -1);
+            break;
+        }
+        case DecodeContext::ENDIF_ELSE: {
+            if (in >= last) return {};
+            if (in[0].first == OP_IF) {
+                ++in;
+                BuildBack(Fragment::OR_I, constructed, /* reverse */ true);
+            } else if (in[0].first == OP_NOTIF) {
+                ++in;
+                to_parse.emplace_back(DecodeContext::ANDOR, -1, -1);
+                // andor requires X to have type modifier d, so it can't be and_v
+                to_parse.emplace_back(DecodeContext::SINGLE_BKV_EXPR, -1, -1);
+            } else {
+                return {};
+            }
+            break;
+        }
+        }
+    }
+    if (constructed.size() != 1) return {};
+    const NodeRef<Key> tl_node = std::move(constructed.front());
+    // Note that due to how ComputeType works (only assign the type to the node if the
+    // subs' types are valid) this would fail if any node of tree is badly typed.
+    if (!tl_node->IsValidTopLevel()) return {};
+    return tl_node;
+}
+
+} // namespace internal
+
+template<typename Ctx>
+inline NodeRef<typename Ctx::Key> FromString(const std::string& str, const Ctx& ctx) {
+    return internal::Parse<typename Ctx::Key>(str, ctx);
+}
+
+template<typename Ctx>
+inline NodeRef<typename Ctx::Key> FromScript(const CScript& script, const Ctx& ctx) {
+    using namespace internal;
+    std::vector<std::pair<opcodetype, std::vector<unsigned char>>> decomposed;
+    if (!DecomposeScript(script, decomposed)) return {};
+    auto it = decomposed.begin();
+    auto ret = DecodeScript<typename Ctx::Key>(it, decomposed.end(), ctx);
+    if (!ret) return {};
+    if (it != decomposed.end()) return {};
+    return ret;
+}
+
+} // namespace miniscript
+
+#endif // BITCOIN_SCRIPT_MINISCRIPT_H
diff --git a/src/script/script.cpp b/src/script/script.cpp
index 1e1faccbcc38..4deb1d20f02b 100644
--- a/src/script/script.cpp
+++ b/src/script/script.cpp
@@ -382,3 +382,28 @@ bool CScriptNum::MinimallyEncode(std::vector<uint8_t>& data)
     data = {};
     return true;
 }
+
+bool CheckMinimalPush(const std::vector<unsigned char>& data, opcodetype opcode) {
+    // Excludes OP_1NEGATE, OP_1-16 since they are by definition minimal
+    assert(0 <= opcode && opcode <= OP_PUSHDATA4);
+    if (data.size() == 0) {
+        // Should have used OP_0.
+        return opcode == OP_0;
+    } else if (data.size() == 1 && data[0] >= 1 && data[0] <= 16) {
+        // Should have used OP_1 .. OP_16.
+        return false;
+    } else if (data.size() == 1 && data[0] == 0x81) {
+        // Should have used OP_1NEGATE.
+        return false;
+    } else if (data.size() <= 75) {
+        // Must have used a direct push (opcode indicating number of bytes pushed + those bytes).
+        return opcode == data.size();
+    } else if (data.size() <= 255) {
+        // Must have used OP_PUSHDATA.
+        return opcode == OP_PUSHDATA1;
+    } else if (data.size() <= 65535) {
+        // Must have used OP_PUSHDATA2.
+        return opcode == OP_PUSHDATA2;
+    }
+    return true;
+}
diff --git a/src/script/script.h b/src/script/script.h
index bb93e2eb5a43..8e4bf786987c 100644
--- a/src/script/script.h
+++ b/src/script/script.h
@@ -320,6 +320,8 @@ class CScriptNum
         return m_value;
     }
 
+    int64_t GetInt64() const { return m_value; }
+
     std::vector<unsigned char> getvch() const
     {
         return serialize(m_value);
@@ -542,4 +544,31 @@ class CScript : public CScriptBase
     }
 };
 
+bool CheckMinimalPush(const std::vector<unsigned char>& data, opcodetype opcode);
+
+/** Build a script by concatenating other scripts, or any argument accepted by CScript::operator<<. */
+template<typename... Ts>
+CScript BuildScript(Ts&&... inputs)
+{
+    CScript ret;
+    int cnt{0};
+
+    ([&ret, &cnt] (Ts&& input) {
+        cnt++;
+        if constexpr (std::is_same_v<std::remove_cv_t<std::remove_reference_t<Ts>>, CScript>) {
+            // If it is a CScript, extend ret with it. Move or copy the first element instead.
+            if (cnt == 0) {
+                ret = std::forward<Ts>(input);
+            } else {
+                ret.insert(ret.end(), input.begin(), input.end());
+            }
+        } else {
+            // Otherwise invoke CScript::operator<<.
+            ret << input;
+        }
+    } (std::forward<Ts>(inputs)), ...);
+
+    return ret;
+}
+
 #endif // BITCOIN_SCRIPT_SCRIPT_H
diff --git a/src/script/standard.cpp b/src/script/standard.cpp
index 8836658fd590..83d751f334ed 100644
--- a/src/script/standard.cpp
+++ b/src/script/standard.cpp
@@ -70,11 +70,6 @@ static constexpr bool IsSmallInteger(opcodetype opcode)
     return opcode >= OP_1 && opcode <= OP_16;
 }
 
-static constexpr bool IsPushdataOp(opcodetype opcode)
-{
-    return opcode > OP_FALSE && opcode <= OP_PUSHDATA4;
-}
-
 static constexpr bool IsValidMultisigKeyCount(int n_keys)
 {
     return n_keys > 0 && n_keys <= MAX_PUBKEYS_PER_MULTISIG;
diff --git a/src/script/standard.h b/src/script/standard.h
index 1b047f1925ce..3b7a75f6fa96 100644
--- a/src/script/standard.h
+++ b/src/script/standard.h
@@ -109,6 +109,11 @@ bool IsValidDestination(const CTxDestination& dest);
 /** Get the name of a TxoutType as a C string, or nullptr if unknown. */
 std::string GetTxnOutputType(TxoutType t);
 
+constexpr bool IsPushdataOp(opcodetype opcode)
+{
+    return opcode > OP_FALSE && opcode <= OP_PUSHDATA4;
+}
+
 /**
  * Parse a scriptPubKey and identify script type for standard scripts. If
  * successful, returns script type and parsed pubkeys or hashes, depending on
diff --git a/src/test/fuzz/miniscript_decode.cpp b/src/test/fuzz/miniscript_decode.cpp
new file mode 100644
index 000000000000..4cc0a1be8fd8
--- /dev/null
+++ b/src/test/fuzz/miniscript_decode.cpp
@@ -0,0 +1,72 @@
+// Copyright (c) 2022 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 <core_io.h>
+#include <hash.h>
+#include <key.h>
+#include <script/miniscript.h>
+#include <script/script.h>
+#include <span.h>
+#include <test/fuzz/FuzzedDataProvider.h>
+#include <test/fuzz/fuzz.h>
+#include <test/fuzz/util.h>
+#include <util/strencodings.h>
+
+#include <optional>
+
+using miniscript::operator""_mst;
+
+
+struct Converter {
+    typedef CPubKey Key;
+
+    bool ToString(const Key& key, std::string& ret) const {
+        ret = HexStr(key);
+        return true;
+    }
+    const std::vector<unsigned char> ToPKBytes(const Key& key) const {
+        return {key.begin(), key.end()};
+    }
+    const std::vector<unsigned char> ToPKHBytes(const Key& key) const {
+        const auto h = Hash160(key);
+        return {h.begin(), h.end()};
+    }
+
+    template<typename I>
+    bool FromString(I first, I last, Key& key) const {
+        const auto bytes = ParseHex(std::string(first, last));
+        key.Set(bytes.begin(), bytes.end());
+        return key.IsValid();
+    }
+    template<typename I>
+    bool FromPKBytes(I first, I last, CPubKey& key) const {
+        key.Set(first, last);
+        return key.IsValid();
+    }
+    template<typename I>
+    bool FromPKHBytes(I first, I last, CPubKey& key) const {
+        assert(last - first == 20);
+        return false;
+    }
+};
+
+const Converter CONVERTER;
+
+FUZZ_TARGET(miniscript_decode)
+{
+    FuzzedDataProvider fuzzed_data_provider(buffer.data(), buffer.size());
+    const std::optional<CScript> script = ConsumeDeserializable<CScript>(fuzzed_data_provider);
+    if (!script) return;
+
+    const auto ms = miniscript::FromScript(*script, CONVERTER);
+    if (!ms) return;
+
+    // We can roundtrip it to its string representation.
+    std::string ms_str;
+    assert(ms->ToString(CONVERTER, ms_str));
+    assert(*miniscript::FromString(ms_str, CONVERTER) == *ms);
+    // The Script representation must roundtrip since we parsed it this way the first time.
+    const CScript ms_script = ms->ToScript(CONVERTER);
+    assert(ms_script == *script);
+}
diff --git a/src/test/miniscript_tests.cpp b/src/test/miniscript_tests.cpp
new file mode 100644
index 000000000000..949d30dfd5ef
--- /dev/null
+++ b/src/test/miniscript_tests.cpp
@@ -0,0 +1,284 @@
+// Copyright (c) 2019 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 <string>
+
+#include <test/util/setup_common.h>
+#include <boost/test/unit_test.hpp>
+
+#include <hash.h>
+#include <pubkey.h>
+#include <uint256.h>
+#include <crypto/ripemd160.h>
+#include <crypto/sha256.h>
+#include <script/miniscript.h>
+
+namespace {
+
+/** TestData groups various kinds of precomputed data necessary in this test. */
+struct TestData {
+    //! The only public keys used in this test.
+    std::vector<CPubKey> pubkeys;
+    //! A map from the public keys to their CKeyIDs (faster than hashing every time).
+    std::map<CPubKey, CKeyID> pkhashes;
+    std::map<CKeyID, CPubKey> pkmap;
+
+    // Various precomputed hashes
+    std::vector<std::vector<unsigned char>> sha256;
+    std::vector<std::vector<unsigned char>> ripemd160;
+    std::vector<std::vector<unsigned char>> hash256;
+    std::vector<std::vector<unsigned char>> hash160;
+
+    TestData()
+    {
+        // We generate 255 public keys and 255 hashes of each type.
+        for (int i = 1; i <= 255; ++i) {
+            // This 32-byte array functions as both private key data and hash preimage (31 zero bytes plus any nonzero byte).
+            unsigned char keydata[32] = {0};
+            keydata[31] = i;
+
+            // Compute CPubkey and CKeyID
+            CKey key;
+            key.Set(keydata, keydata + 32, true);
+            CPubKey pubkey = key.GetPubKey();
+            CKeyID keyid = pubkey.GetID();
+            pubkeys.push_back(pubkey);
+            pkhashes.emplace(pubkey, keyid);
+            pkmap.emplace(keyid, pubkey);
+
+            // Compute various hashes
+            std::vector<unsigned char> hash;
+            hash.resize(32);
+            CSHA256().Write(keydata, 32).Finalize(hash.data());
+            sha256.push_back(hash);
+            CHash256().Write(keydata).Finalize(hash);
+            hash256.push_back(hash);
+            hash.resize(20);
+            CRIPEMD160().Write(keydata, 32).Finalize(hash.data());
+            ripemd160.push_back(hash);
+            CHash160().Write(keydata).Finalize(hash);
+            hash160.push_back(hash);
+        }
+    }
+};
+
+//! Global TestData object
+std::unique_ptr<const TestData> g_testdata;
+
+/** A class encapsulating conversion routing for CPubKey. */
+struct KeyConverter {
+    typedef CPubKey Key;
+
+    //! Convert a public key to bytes.
+    std::vector<unsigned char> ToPKBytes(const CPubKey& key) const { return {key.begin(), key.end()}; }
+
+    //! Convert a public key to its Hash160 bytes (precomputed).
+    std::vector<unsigned char> ToPKHBytes(const CPubKey& key) const
+    {
+        auto it = g_testdata->pkhashes.find(key);
+        assert(it != g_testdata->pkhashes.end());
+        return {it->second.begin(), it->second.end()};
+    }
+
+    //! Parse a public key from a range of hex characters.
+    template<typename I>
+    bool FromString(I first, I last, CPubKey& key) const {
+        auto bytes = ParseHex(std::string(first, last));
+        key.Set(bytes.begin(), bytes.end());
+        return key.IsValid();
+    }
+
+    template<typename I>
+    bool FromPKBytes(I first, I last, CPubKey& key) const {
+        key.Set(first, last);
+        return key.IsValid();
+    }
+
+    template<typename I>
+    bool FromPKHBytes(I first, I last, CPubKey& key) const {
+        assert(last - first == 20);
+        CKeyID keyid;
+        std::copy(first, last, keyid.begin());
+        auto it = g_testdata->pkmap.find(keyid);
+        assert(it != g_testdata->pkmap.end());
+        key = it->second;
+        return true;
+    }
+};
+
+//! Singleton instance of KeyConverter.
+const KeyConverter CONVERTER{};
+
+using miniscript::operator"" _mst;
+
+enum TestMode : int {
+    TESTMODE_INVALID = 0,
+    TESTMODE_VALID = 1,
+    TESTMODE_NONMAL = 2,
+    TESTMODE_NEEDSIG = 4,
+    TESTMODE_TIMELOCKMIX = 8
+};
+
+void Test(const std::string& ms, const std::string& hexscript, int mode, int opslimit = -1, int stacklimit = -1)
+{
+    auto node = miniscript::FromString(ms, CONVERTER);
+    if (mode == TESTMODE_INVALID) {
+        BOOST_CHECK_MESSAGE(!node || !node->IsValid(), "Unexpectedly valid: " + ms);
+    } else {
+        BOOST_CHECK_MESSAGE(node, "Unparseable: " + ms);
+        BOOST_CHECK_MESSAGE(node->IsValid(), "Invalid: " + ms);
+        BOOST_CHECK_MESSAGE(node->IsValidTopLevel(), "Invalid top level: " + ms);
+        auto computed_script = node->ToScript(CONVERTER);
+        BOOST_CHECK_MESSAGE(node->ScriptSize() == computed_script.size(), "Script size mismatch: " + ms);
+        if (hexscript != "?") BOOST_CHECK_MESSAGE(HexStr(computed_script) == hexscript, "Script mismatch: " + ms + " (" + HexStr(computed_script) + " vs " + hexscript + ")");
+        BOOST_CHECK_MESSAGE(node->IsNonMalleable() == !!(mode & TESTMODE_NONMAL), "Malleability mismatch: " + ms);
+        BOOST_CHECK_MESSAGE(node->NeedsSignature() == !!(mode & TESTMODE_NEEDSIG), "Signature necessity mismatch: " + ms);
+        BOOST_CHECK_MESSAGE((node->GetType() << "k"_mst) == !(mode & TESTMODE_TIMELOCKMIX), "Timelock mix mismatch: " + ms);
+        auto inferred_miniscript = miniscript::FromScript(computed_script, CONVERTER);
+        BOOST_CHECK_MESSAGE(inferred_miniscript, "Cannot infer miniscript from script: " + ms);
+        BOOST_CHECK_MESSAGE(inferred_miniscript->ToScript(CONVERTER) == computed_script, "Roundtrip failure: miniscript->script != miniscript->script->miniscript->script: " + ms);
+        if (opslimit != -1) BOOST_CHECK_MESSAGE((int)node->GetOps() == opslimit, "Ops limit mismatch: " << ms << " (" << node->GetOps() << " vs " << opslimit << ")");
+        if (stacklimit != -1) BOOST_CHECK_MESSAGE((int)node->GetStackSize() == stacklimit, "Stack limit mismatch: " << ms << " (" << node->GetStackSize() << " vs " << stacklimit << ")");
+    }
+}
+} // namespace
+
+BOOST_FIXTURE_TEST_SUITE(miniscript_tests, BasicTestingSetup)
+
+BOOST_AUTO_TEST_CASE(fixed_tests)
+{
+    g_testdata.reset(new TestData());
+
+    // Validity rules
+    Test("l:older(1)", "?", TESTMODE_VALID | TESTMODE_NONMAL); // older(1): valid
+    Test("l:older(0)", "?", TESTMODE_INVALID); // older(0): k must be at least 1
+    Test("l:older(2147483647)", "?", TESTMODE_VALID | TESTMODE_NONMAL); // older(2147483647): valid
+    Test("l:older(2147483648)", "?", TESTMODE_INVALID); // older(2147483648): k must be below 2^31
+    Test("u:after(1)", "?", TESTMODE_VALID | TESTMODE_NONMAL); // after(1): valid
+    Test("u:after(0)", "?", TESTMODE_INVALID); // after(0): k must be at least 1
+    Test("u:after(2147483647)", "?", TESTMODE_VALID | TESTMODE_NONMAL); // after(2147483647): valid
+    Test("u:after(2147483648)", "?", TESTMODE_INVALID); // after(2147483648): k must be below 2^31
+    Test("andor(0,1,1)", "?", TESTMODE_VALID | TESTMODE_NONMAL); // andor(Bdu,B,B): valid
+    Test("andor(a:0,1,1)", "?", TESTMODE_INVALID); // andor(Wdu,B,B): X must be B
+    Test("andor(0,a:1,a:1)", "?", TESTMODE_INVALID); // andor(Bdu,W,W): Y and Z must be B/V/K
+    Test("andor(1,1,1)", "?", TESTMODE_INVALID); // andor(Bu,B,B): X must be d
+    Test("andor(n:or_i(0,after(1)),1,1)", "?", TESTMODE_VALID); // andor(Bdu,B,B): valid
+    Test("andor(or_i(0,after(1)),1,1)", "?", TESTMODE_INVALID); // andor(Bd,B,B): X must be u
+    Test("c:andor(0,pk_k(03a0434d9e47f3c86235477c7b1ae6ae5d3442d49b1943c2b752a68e2a47e247c7),pk_k(036d2b085e9e382ed10b69fc311a03f8641ccfff21574de0927513a49d9a688a00))", "?", TESTMODE_VALID | TESTMODE_NONMAL | TESTMODE_NEEDSIG); // andor(Bdu,K,K): valid
+    Test("t:andor(0,v:1,v:1)", "?", TESTMODE_VALID | TESTMODE_NONMAL); // andor(Bdu,V,V): valid
+    Test("and_v(v:1,1)", "?", TESTMODE_VALID | TESTMODE_NONMAL); // and_v(V,B): valid
+    Test("t:and_v(v:1,v:1)", "?", TESTMODE_VALID | TESTMODE_NONMAL); // and_v(V,V): valid
+    Test("c:and_v(v:1,pk_k(036d2b085e9e382ed10b69fc311a03f8641ccfff21574de0927513a49d9a688a00))", "?", TESTMODE_VALID | TESTMODE_NONMAL | TESTMODE_NEEDSIG); // and_v(V,K): valid
+    Test("and_v(1,1)", "?", TESTMODE_INVALID); // and_v(B,B): X must be V
+    Test("and_v(pk_k(02352bbf4a4cdd12564f93fa332ce333301d9ad40271f8107181340aef25be59d5),1)", "?", TESTMODE_INVALID); // and_v(K,B): X must be V
+    Test("and_v(v:1,a:1)", "?", TESTMODE_INVALID); // and_v(K,W): Y must be B/V/K
+    Test("and_b(1,a:1)", "?", TESTMODE_VALID | TESTMODE_NONMAL); // and_b(B,W): valid
+    Test("and_b(1,1)", "?", TESTMODE_INVALID); // and_b(B,B): Y must W
+    Test("and_b(v:1,a:1)", "?", TESTMODE_INVALID); // and_b(V,W): X must be B
+    Test("and_b(a:1,a:1)", "?", TESTMODE_INVALID); // and_b(W,W): X must be B
+    Test("and_b(pk_k(025601570cb47f238d2b0286db4a990fa0f3ba28d1a319f5e7cf55c2a2444da7cc),a:1)", "?", TESTMODE_INVALID); // and_b(K,W): X must be B
+    Test("or_b(0,a:0)", "?", TESTMODE_VALID | TESTMODE_NONMAL | TESTMODE_NEEDSIG); // or_b(Bd,Wd): valid
+    Test("or_b(1,a:0)", "?", TESTMODE_INVALID); // or_b(B,Wd): X must be d
+    Test("or_b(0,a:1)", "?", TESTMODE_INVALID); // or_b(Bd,W): Y must be d
+    Test("or_b(0,0)", "?", TESTMODE_INVALID); // or_b(Bd,Bd): Y must W
+    Test("or_b(v:0,a:0)", "?", TESTMODE_INVALID); // or_b(V,Wd): X must be B
+    Test("or_b(a:0,a:0)", "?", TESTMODE_INVALID); // or_b(Wd,Wd): X must be B
+    Test("or_b(pk_k(025601570cb47f238d2b0286db4a990fa0f3ba28d1a319f5e7cf55c2a2444da7cc),a:0)", "?", TESTMODE_INVALID); // or_b(Kd,Wd): X must be B
+    Test("t:or_c(0,v:1)", "?", TESTMODE_VALID | TESTMODE_NONMAL); // or_c(Bdu,V): valid
+    Test("t:or_c(a:0,v:1)", "?", TESTMODE_INVALID); // or_c(Wdu,V): X must be B
+    Test("t:or_c(1,v:1)", "?", TESTMODE_INVALID); // or_c(Bu,V): X must be d
+    Test("t:or_c(n:or_i(0,after(1)),v:1)", "?", TESTMODE_VALID); // or_c(Bdu,V): valid
+    Test("t:or_c(or_i(0,after(1)),v:1)", "?", TESTMODE_INVALID); // or_c(Bd,V): X must be u
+    Test("t:or_c(0,1)", "?", TESTMODE_INVALID); // or_c(Bdu,B): Y must be V
+    Test("or_d(0,1)", "?", TESTMODE_VALID | TESTMODE_NONMAL); // or_d(Bdu,B): valid
+    Test("or_d(a:0,1)", "?", TESTMODE_INVALID); // or_d(Wdu,B): X must be B
+    Test("or_d(1,1)", "?", TESTMODE_INVALID); // or_d(Bu,B): X must be d
+    Test("or_d(n:or_i(0,after(1)),1)", "?", TESTMODE_VALID); // or_d(Bdu,B): valid
+    Test("or_d(or_i(0,after(1)),1)", "?", TESTMODE_INVALID); // or_d(Bd,B): X must be u
+    Test("or_d(0,v:1)", "?", TESTMODE_INVALID); // or_d(Bdu,V): Y must be B
+    Test("or_i(1,1)", "?", TESTMODE_VALID); // or_i(B,B): valid
+    Test("t:or_i(v:1,v:1)", "?", TESTMODE_VALID); // or_i(V,V): valid
+    Test("c:or_i(pk_k(03a0434d9e47f3c86235477c7b1ae6ae5d3442d49b1943c2b752a68e2a47e247c7),pk_k(036d2b085e9e382ed10b69fc311a03f8641ccfff21574de0927513a49d9a688a00))", "?", TESTMODE_VALID | TESTMODE_NONMAL | TESTMODE_NEEDSIG); // or_i(K,K): valid
+    Test("or_i(a:1,a:1)", "?", TESTMODE_INVALID); // or_i(W,W): X and Y must be B/V/K
+    Test("or_b(l:after(100),al:after(1000000000))", "?", TESTMODE_VALID); // or_b(timelock, heighlock) valid
+    Test("and_b(after(100),a:after(1000000000))", "?", TESTMODE_VALID | TESTMODE_NONMAL | TESTMODE_TIMELOCKMIX); // and_b(timelock, heighlock) invalid
+    Test("pk(03d30199d74fb5a22d47b6e054e2f378cedacffcb89904a61d75d0dbd407143e65)", "2103d30199d74fb5a22d47b6e054e2f378cedacffcb89904a61d75d0dbd407143e65ac", TESTMODE_VALID | TESTMODE_NONMAL | TESTMODE_NEEDSIG); // alias to c:pk_k
+    Test("pkh(03d30199d74fb5a22d47b6e054e2f378cedacffcb89904a61d75d0dbd407143e65)", "76a914fcd35ddacad9f2d5be5e464639441c6065e6955d88ac", TESTMODE_VALID | TESTMODE_NONMAL | TESTMODE_NEEDSIG); // alias to c:pk_h
+
+
+    // Randomly generated test set that covers the majority of type and node type combinations
+    Test("lltvln:after(1231488000)", "6300676300676300670400046749b1926869516868", TESTMODE_VALID | TESTMODE_NONMAL, 12, 4);
+    Test("uuj:and_v(v:multi(2,03d01115d548e7561b15c38f004d734633687cf4419620095bc5b0f47070afe85a,025601570cb47f238d2b0286db4a990fa0f3ba28d1a319f5e7cf55c2a2444da7cc),after(1231488000))", "6363829263522103d01115d548e7561b15c38f004d734633687cf4419620095bc5b0f47070afe85a21025601570cb47f238d2b0286db4a990fa0f3ba28d1a319f5e7cf55c2a2444da7cc52af0400046749b168670068670068", TESTMODE_VALID | TESTMODE_NONMAL | TESTMODE_NEEDSIG, 14, 6);
+    Test("or_b(un:multi(2,03daed4f2be3a8bf278e70132fb0beb7522f570e144bf615c07e996d443dee8729,024ce119c96e2fa357200b559b2f7dd5a5f02d5290aff74b03f3e471b273211c97),al:older(16))", "63522103daed4f2be3a8bf278e70132fb0beb7522f570e144bf615c07e996d443dee872921024ce119c96e2fa357200b559b2f7dd5a5f02d5290aff74b03f3e471b273211c9752ae926700686b63006760b2686c9b", TESTMODE_VALID, 14, 6);
+    Test("j:and_v(vdv:after(1567547623),older(2016))", "829263766304e7e06e5db169686902e007b268", TESTMODE_VALID | TESTMODE_NONMAL, 11, 2);
+    Test("t:and_v(vu:hash256(131772552c01444cd81360818376a040b7c3b2b7b0a53550ee3edde216cec61b),v:sha256(ec4916dd28fc4c10d78e287ca5d9cc51ee1ae73cbfde08c6b37324cbfaac8bc5))", "6382012088aa20131772552c01444cd81360818376a040b7c3b2b7b0a53550ee3edde216cec61b876700686982012088a820ec4916dd28fc4c10d78e287ca5d9cc51ee1ae73cbfde08c6b37324cbfaac8bc58851", TESTMODE_VALID | TESTMODE_NONMAL, 12, 4);
+    Test("t:andor(multi(3,02d7924d4f7d43ea965a465ae3095ff41131e5946f3c85f79e44adbcf8e27e080e,03fff97bd5755eeea420453a14355235d382f6472f8568a18b2f057a1460297556,02e493dbf1c10d80f3581e4904930b1404cc6c13900ee0758474fa94abe8c4cd13),v:older(4194305),v:sha256(9267d3dbed802941483f1afa2a6bc68de5f653128aca9bf1461c5d0a3ad36ed2))", "532102d7924d4f7d43ea965a465ae3095ff41131e5946f3c85f79e44adbcf8e27e080e2103fff97bd5755eeea420453a14355235d382f6472f8568a18b2f057a14602975562102e493dbf1c10d80f3581e4904930b1404cc6c13900ee0758474fa94abe8c4cd1353ae6482012088a8209267d3dbed802941483f1afa2a6bc68de5f653128aca9bf1461c5d0a3ad36ed2886703010040b2696851", TESTMODE_VALID | TESTMODE_NONMAL, 13, 6);
+    Test("or_d(multi(1,02f9308a019258c31049344f85f89d5229b531c845836f99b08601f113bce036f9),or_b(multi(3,022f01e5e15cca351daff3843fb70f3c2f0a1bdd05e5af888a67784ef3e10a2a01,032fa2104d6b38d11b0230010559879124e42ab8dfeff5ff29dc9cdadd4ecacc3f,03d01115d548e7561b15c38f004d734633687cf4419620095bc5b0f47070afe85a),su:after(500000)))", "512102f9308a019258c31049344f85f89d5229b531c845836f99b08601f113bce036f951ae73645321022f01e5e15cca351daff3843fb70f3c2f0a1bdd05e5af888a67784ef3e10a2a0121032fa2104d6b38d11b0230010559879124e42ab8dfeff5ff29dc9cdadd4ecacc3f2103d01115d548e7561b15c38f004d734633687cf4419620095bc5b0f47070afe85a53ae7c630320a107b16700689b68", TESTMODE_VALID | TESTMODE_NONMAL, 15, 8);
+    Test("or_d(sha256(38df1c1f64a24a77b23393bca50dff872e31edc4f3b5aa3b90ad0b82f4f089b6),and_n(un:after(499999999),older(4194305)))", "82012088a82038df1c1f64a24a77b23393bca50dff872e31edc4f3b5aa3b90ad0b82f4f089b68773646304ff64cd1db19267006864006703010040b26868", TESTMODE_VALID, 16, 2);
+    Test("and_v(or_i(v:multi(2,02c6047f9441ed7d6d3045406e95c07cd85c778e4b8cef3ca7abac09b95c709ee5,03774ae7f858a9411e5ef4246b70c65aac5649980be5c17891bbec17895da008cb),v:multi(2,03e60fce93b59e9ec53011aabc21c23e97b2a31369b87a5ae9c44ee89e2a6dec0a,025cbdf0646e5db4eaa398f365f2ea7a0e3d419b7e0330e39ce92bddedcac4f9bc)),sha256(d1ec675902ef1633427ca360b290b0b3045a0d9058ddb5e648b4c3c3224c5c68))", "63522102c6047f9441ed7d6d3045406e95c07cd85c778e4b8cef3ca7abac09b95c709ee52103774ae7f858a9411e5ef4246b70c65aac5649980be5c17891bbec17895da008cb52af67522103e60fce93b59e9ec53011aabc21c23e97b2a31369b87a5ae9c44ee89e2a6dec0a21025cbdf0646e5db4eaa398f365f2ea7a0e3d419b7e0330e39ce92bddedcac4f9bc52af6882012088a820d1ec675902ef1633427ca360b290b0b3045a0d9058ddb5e648b4c3c3224c5c6887", TESTMODE_VALID | TESTMODE_NONMAL | TESTMODE_NEEDSIG, 11, 6);
+    Test("j:and_b(multi(2,0279be667ef9dcbbac55a06295ce870b07029bfcdb2dce28d959f2815b16f81798,024ce119c96e2fa357200b559b2f7dd5a5f02d5290aff74b03f3e471b273211c97),s:or_i(older(1),older(4252898)))", "82926352210279be667ef9dcbbac55a06295ce870b07029bfcdb2dce28d959f2815b16f8179821024ce119c96e2fa357200b559b2f7dd5a5f02d5290aff74b03f3e471b273211c9752ae7c6351b26703e2e440b2689a68", TESTMODE_VALID | TESTMODE_NEEDSIG, 14, 5);
+    Test("and_b(older(16),s:or_d(sha256(e38990d0c7fc009880a9c07c23842e886c6bbdc964ce6bdd5817ad357335ee6f),n:after(1567547623)))", "60b27c82012088a820e38990d0c7fc009880a9c07c23842e886c6bbdc964ce6bdd5817ad357335ee6f87736404e7e06e5db192689a", TESTMODE_VALID, 12, 2);
+    Test("j:and_v(v:hash160(20195b5a3d650c17f0f29f91c33f8f6335193d07),or_d(sha256(96de8fc8c256fa1e1556d41af431cace7dca68707c78dd88c3acab8b17164c47),older(16)))", "82926382012088a91420195b5a3d650c17f0f29f91c33f8f6335193d078882012088a82096de8fc8c256fa1e1556d41af431cace7dca68707c78dd88c3acab8b17164c4787736460b26868", TESTMODE_VALID, 16, 3);
+    Test("and_b(hash256(32ba476771d01e37807990ead8719f08af494723de1d228f2c2c07cc0aa40bac),a:and_b(hash256(131772552c01444cd81360818376a040b7c3b2b7b0a53550ee3edde216cec61b),a:older(1)))", "82012088aa2032ba476771d01e37807990ead8719f08af494723de1d228f2c2c07cc0aa40bac876b82012088aa20131772552c01444cd81360818376a040b7c3b2b7b0a53550ee3edde216cec61b876b51b26c9a6c9a", TESTMODE_VALID | TESTMODE_NONMAL, 15, 3);
+    Test("thresh(2,multi(2,03a0434d9e47f3c86235477c7b1ae6ae5d3442d49b1943c2b752a68e2a47e247c7,036d2b085e9e382ed10b69fc311a03f8641ccfff21574de0927513a49d9a688a00),a:multi(1,036d2b085e9e382ed10b69fc311a03f8641ccfff21574de0927513a49d9a688a00),ac:pk_k(022f01e5e15cca351daff3843fb70f3c2f0a1bdd05e5af888a67784ef3e10a2a01))", "522103a0434d9e47f3c86235477c7b1ae6ae5d3442d49b1943c2b752a68e2a47e247c721036d2b085e9e382ed10b69fc311a03f8641ccfff21574de0927513a49d9a688a0052ae6b5121036d2b085e9e382ed10b69fc311a03f8641ccfff21574de0927513a49d9a688a0051ae6c936b21022f01e5e15cca351daff3843fb70f3c2f0a1bdd05e5af888a67784ef3e10a2a01ac6c935287", TESTMODE_VALID | TESTMODE_NONMAL | TESTMODE_NEEDSIG, 13, 7);
+    Test("and_n(sha256(d1ec675902ef1633427ca360b290b0b3045a0d9058ddb5e648b4c3c3224c5c68),t:or_i(v:older(4252898),v:older(144)))", "82012088a820d1ec675902ef1633427ca360b290b0b3045a0d9058ddb5e648b4c3c3224c5c68876400676303e2e440b26967029000b269685168", TESTMODE_VALID, 14, 3);
+    Test("or_d(d:and_v(v:older(4252898),v:older(4252898)),sha256(38df1c1f64a24a77b23393bca50dff872e31edc4f3b5aa3b90ad0b82f4f089b6))", "766303e2e440b26903e2e440b26968736482012088a82038df1c1f64a24a77b23393bca50dff872e31edc4f3b5aa3b90ad0b82f4f089b68768", TESTMODE_VALID, 14, 3);
+    Test("c:and_v(or_c(sha256(9267d3dbed802941483f1afa2a6bc68de5f653128aca9bf1461c5d0a3ad36ed2),v:multi(1,02c44d12c7065d812e8acf28d7cbb19f9011ecd9e9fdf281b0e6a3b5e87d22e7db)),pk_k(03acd484e2f0c7f65309ad178a9f559abde09796974c57e714c35f110dfc27ccbe))", "82012088a8209267d3dbed802941483f1afa2a6bc68de5f653128aca9bf1461c5d0a3ad36ed28764512102c44d12c7065d812e8acf28d7cbb19f9011ecd9e9fdf281b0e6a3b5e87d22e7db51af682103acd484e2f0c7f65309ad178a9f559abde09796974c57e714c35f110dfc27ccbeac", TESTMODE_VALID | TESTMODE_NEEDSIG, 8, 3);
+    Test("c:and_v(or_c(multi(2,036d2b085e9e382ed10b69fc311a03f8641ccfff21574de0927513a49d9a688a00,02352bbf4a4cdd12564f93fa332ce333301d9ad40271f8107181340aef25be59d5),v:ripemd160(1b0f3c404d12075c68c938f9f60ebea4f74941a0)),pk_k(03fff97bd5755eeea420453a14355235d382f6472f8568a18b2f057a1460297556))", "5221036d2b085e9e382ed10b69fc311a03f8641ccfff21574de0927513a49d9a688a002102352bbf4a4cdd12564f93fa332ce333301d9ad40271f8107181340aef25be59d552ae6482012088a6141b0f3c404d12075c68c938f9f60ebea4f74941a088682103fff97bd5755eeea420453a14355235d382f6472f8568a18b2f057a1460297556ac", TESTMODE_VALID | TESTMODE_NONMAL | TESTMODE_NEEDSIG, 10, 6);
+    Test("and_v(andor(hash256(8a35d9ca92a48eaade6f53a64985e9e2afeb74dcf8acb4c3721e0dc7e4294b25),v:hash256(939894f70e6c3a25da75da0cc2071b4076d9b006563cf635986ada2e93c0d735),v:older(50000)),after(499999999))", "82012088aa208a35d9ca92a48eaade6f53a64985e9e2afeb74dcf8acb4c3721e0dc7e4294b2587640350c300b2696782012088aa20939894f70e6c3a25da75da0cc2071b4076d9b006563cf635986ada2e93c0d735886804ff64cd1db1", TESTMODE_VALID, 14, 3);
+    Test("andor(hash256(5f8d30e655a7ba0d7596bb3ddfb1d2d20390d23b1845000e1e118b3be1b3f040),j:and_v(v:hash160(3a2bff0da9d96868e66abc4427bea4691cf61ccd),older(4194305)),ripemd160(44d90e2d3714c8663b632fcf0f9d5f22192cc4c8))", "82012088aa205f8d30e655a7ba0d7596bb3ddfb1d2d20390d23b1845000e1e118b3be1b3f040876482012088a61444d90e2d3714c8663b632fcf0f9d5f22192cc4c8876782926382012088a9143a2bff0da9d96868e66abc4427bea4691cf61ccd8803010040b26868", TESTMODE_VALID, 20, 3);
+    Test("or_i(c:and_v(v:after(500000),pk_k(02c6047f9441ed7d6d3045406e95c07cd85c778e4b8cef3ca7abac09b95c709ee5)),sha256(d9147961436944f43cd99d28b2bbddbf452ef872b30c8279e255e7daafc7f946))", "630320a107b1692102c6047f9441ed7d6d3045406e95c07cd85c778e4b8cef3ca7abac09b95c709ee5ac6782012088a820d9147961436944f43cd99d28b2bbddbf452ef872b30c8279e255e7daafc7f9468768", TESTMODE_VALID | TESTMODE_NONMAL, 10, 3);
+    Test("thresh(2,c:pk_h(025cbdf0646e5db4eaa398f365f2ea7a0e3d419b7e0330e39ce92bddedcac4f9bc),s:sha256(e38990d0c7fc009880a9c07c23842e886c6bbdc964ce6bdd5817ad357335ee6f),a:hash160(dd69735817e0e3f6f826a9238dc2e291184f0131))", "76a9145dedfbf9ea599dd4e3ca6a80b333c472fd0b3f6988ac7c82012088a820e38990d0c7fc009880a9c07c23842e886c6bbdc964ce6bdd5817ad357335ee6f87936b82012088a914dd69735817e0e3f6f826a9238dc2e291184f0131876c935287", TESTMODE_VALID, 18, 5);
+    Test("and_n(sha256(9267d3dbed802941483f1afa2a6bc68de5f653128aca9bf1461c5d0a3ad36ed2),uc:and_v(v:older(144),pk_k(03fe72c435413d33d48ac09c9161ba8b09683215439d62b7940502bda8b202e6ce)))", "82012088a8209267d3dbed802941483f1afa2a6bc68de5f653128aca9bf1461c5d0a3ad36ed28764006763029000b2692103fe72c435413d33d48ac09c9161ba8b09683215439d62b7940502bda8b202e6ceac67006868", TESTMODE_VALID | TESTMODE_NEEDSIG, 13, 4);
+    Test("and_n(c:pk_k(03daed4f2be3a8bf278e70132fb0beb7522f570e144bf615c07e996d443dee8729),and_b(l:older(4252898),a:older(16)))", "2103daed4f2be3a8bf278e70132fb0beb7522f570e144bf615c07e996d443dee8729ac64006763006703e2e440b2686b60b26c9a68", TESTMODE_VALID | TESTMODE_NONMAL | TESTMODE_NEEDSIG | TESTMODE_TIMELOCKMIX, 12, 3);
+    Test("c:or_i(and_v(v:older(16),pk_h(02d7924d4f7d43ea965a465ae3095ff41131e5946f3c85f79e44adbcf8e27e080e)),pk_h(026a245bf6dc698504c89a20cfded60853152b695336c28063b61c65cbd269e6b4))", "6360b26976a9149fc5dbe5efdce10374a4dd4053c93af540211718886776a9142fbd32c8dd59ee7c17e66cb6ebea7e9846c3040f8868ac", TESTMODE_VALID | TESTMODE_NONMAL | TESTMODE_NEEDSIG, 12, 4);
+    Test("or_d(c:pk_h(02e493dbf1c10d80f3581e4904930b1404cc6c13900ee0758474fa94abe8c4cd13),andor(c:pk_k(024ce119c96e2fa357200b559b2f7dd5a5f02d5290aff74b03f3e471b273211c97),older(2016),after(1567547623)))", "76a914c42e7ef92fdb603af844d064faad95db9bcdfd3d88ac736421024ce119c96e2fa357200b559b2f7dd5a5f02d5290aff74b03f3e471b273211c97ac6404e7e06e5db16702e007b26868", TESTMODE_VALID | TESTMODE_NONMAL, 13, 4);
+    Test("c:andor(ripemd160(6ad07d21fd5dfc646f0b30577045ce201616b9ba),pk_h(02d7924d4f7d43ea965a465ae3095ff41131e5946f3c85f79e44adbcf8e27e080e),and_v(v:hash256(8a35d9ca92a48eaade6f53a64985e9e2afeb74dcf8acb4c3721e0dc7e4294b25),pk_h(03d01115d548e7561b15c38f004d734633687cf4419620095bc5b0f47070afe85a)))", "82012088a6146ad07d21fd5dfc646f0b30577045ce201616b9ba876482012088aa208a35d9ca92a48eaade6f53a64985e9e2afeb74dcf8acb4c3721e0dc7e4294b258876a914dd100be7d9aea5721158ebde6d6a1fd8fff93bb1886776a9149fc5dbe5efdce10374a4dd4053c93af5402117188868ac", TESTMODE_VALID | TESTMODE_NEEDSIG, 18, 4);
+    Test("c:andor(u:ripemd160(6ad07d21fd5dfc646f0b30577045ce201616b9ba),pk_h(03daed4f2be3a8bf278e70132fb0beb7522f570e144bf615c07e996d443dee8729),or_i(pk_h(022f01e5e15cca351daff3843fb70f3c2f0a1bdd05e5af888a67784ef3e10a2a01),pk_h(0279be667ef9dcbbac55a06295ce870b07029bfcdb2dce28d959f2815b16f81798)))", "6382012088a6146ad07d21fd5dfc646f0b30577045ce201616b9ba87670068646376a9149652d86bedf43ad264362e6e6eba6eb764508127886776a914751e76e8199196d454941c45d1b3a323f1433bd688686776a91420d637c1a6404d2227f3561fdbaff5a680dba6488868ac", TESTMODE_VALID | TESTMODE_NEEDSIG, 23, 5);
+    Test("c:or_i(andor(c:pk_h(03d30199d74fb5a22d47b6e054e2f378cedacffcb89904a61d75d0dbd407143e65),pk_h(022f01e5e15cca351daff3843fb70f3c2f0a1bdd05e5af888a67784ef3e10a2a01),pk_h(02c6047f9441ed7d6d3045406e95c07cd85c778e4b8cef3ca7abac09b95c709ee5)),pk_k(02d7924d4f7d43ea965a465ae3095ff41131e5946f3c85f79e44adbcf8e27e080e))", "6376a914fcd35ddacad9f2d5be5e464639441c6065e6955d88ac6476a91406afd46bcdfd22ef94ac122aa11f241244a37ecc886776a9149652d86bedf43ad264362e6e6eba6eb7645081278868672102d7924d4f7d43ea965a465ae3095ff41131e5946f3c85f79e44adbcf8e27e080e68ac", TESTMODE_VALID | TESTMODE_NONMAL | TESTMODE_NEEDSIG, 17, 6);
+    Test("thresh(1,c:pk_k(03d30199d74fb5a22d47b6e054e2f378cedacffcb89904a61d75d0dbd407143e65),altv:after(1000000000),altv:after(100))", "2103d30199d74fb5a22d47b6e054e2f378cedacffcb89904a61d75d0dbd407143e65ac6b6300670400ca9a3bb16951686c936b6300670164b16951686c935187", TESTMODE_VALID, 18, 4);
+    Test("thresh(2,c:pk_k(03d30199d74fb5a22d47b6e054e2f378cedacffcb89904a61d75d0dbd407143e65),ac:pk_k(03fff97bd5755eeea420453a14355235d382f6472f8568a18b2f057a1460297556),altv:after(1000000000),altv:after(100))", "2103d30199d74fb5a22d47b6e054e2f378cedacffcb89904a61d75d0dbd407143e65ac6b2103fff97bd5755eeea420453a14355235d382f6472f8568a18b2f057a1460297556ac6c936b6300670400ca9a3bb16951686c936b6300670164b16951686c935287", TESTMODE_VALID | TESTMODE_NONMAL | TESTMODE_TIMELOCKMIX, 22, 5);
+
+    // Misc unit tests
+    // A Script with a non minimal push is invalid
+    std::vector<unsigned char> nonminpush = ParseHex("0000210232780000feff00ffffffffffff21ff005f00ae21ae00000000060602060406564c2102320000060900fe00005f00ae21ae00100000060606060606000000000000000000000000000000000000000000000000000000000000000000");
+    const CScript nonminpush_script(nonminpush.begin(), nonminpush.end());
+    BOOST_CHECK(miniscript::FromScript(nonminpush_script, CONVERTER) == nullptr);
+    // A non-minimal VERIFY (<key> CHECKSIG VERIFY 1)
+    std::vector<unsigned char> nonminverify = ParseHex("2103a0434d9e47f3c86235477c7b1ae6ae5d3442d49b1943c2b752a68e2a47e247c7ac6951");
+    const CScript nonminverify_script(nonminverify.begin(), nonminverify.end());
+    BOOST_CHECK(miniscript::FromScript(nonminverify_script, CONVERTER) == nullptr);
+    // A threshold as large as the number of subs is valid.
+    Test("thresh(2,c:pk_k(03d30199d74fb5a22d47b6e054e2f378cedacffcb89904a61d75d0dbd407143e65),altv:after(100))", "2103d30199d74fb5a22d47b6e054e2f378cedacffcb89904a61d75d0dbd407143e65ac6b6300670164b16951686c935287", TESTMODE_VALID | TESTMODE_NEEDSIG | TESTMODE_NONMAL);
+    // A threshold of 1 is valid.
+    Test("thresh(1,c:pk_k(03d30199d74fb5a22d47b6e054e2f378cedacffcb89904a61d75d0dbd407143e65),sc:pk_k(03fff97bd5755eeea420453a14355235d382f6472f8568a18b2f057a1460297556))", "2103d30199d74fb5a22d47b6e054e2f378cedacffcb89904a61d75d0dbd407143e65ac7c2103fff97bd5755eeea420453a14355235d382f6472f8568a18b2f057a1460297556ac935187", TESTMODE_VALID | TESTMODE_NEEDSIG | TESTMODE_NONMAL);
+    // A threshold with a k larger than the number of subs is invalid
+    Test("thresh(3,c:pk_k(03d30199d74fb5a22d47b6e054e2f378cedacffcb89904a61d75d0dbd407143e65),sc:pk_k(03fff97bd5755eeea420453a14355235d382f6472f8568a18b2f057a1460297556))", "2103d30199d74fb5a22d47b6e054e2f378cedacffcb89904a61d75d0dbd407143e65ac7c2103fff97bd5755eeea420453a14355235d382f6472f8568a18b2f057a1460297556ac935187", TESTMODE_INVALID);
+    // A threshold with a k null is invalid
+    Test("thresh(0,c:pk_k(03d30199d74fb5a22d47b6e054e2f378cedacffcb89904a61d75d0dbd407143e65),sc:pk_k(03fff97bd5755eeea420453a14355235d382f6472f8568a18b2f057a1460297556))", "2103d30199d74fb5a22d47b6e054e2f378cedacffcb89904a61d75d0dbd407143e65ac7c2103fff97bd5755eeea420453a14355235d382f6472f8568a18b2f057a1460297556ac935187", TESTMODE_INVALID);
+    // For CHECKMULTISIG the OP cost is the number of keys, but the stack size is the number of sigs (+1)
+    const auto ms_multi = miniscript::FromString("multi(1,03d30199d74fb5a22d47b6e054e2f378cedacffcb89904a61d75d0dbd407143e65,03fff97bd5755eeea420453a14355235d382f6472f8568a18b2f057a1460297556,0279be667ef9dcbbac55a06295ce870b07029bfcdb2dce28d959f2815b16f81798)", CONVERTER);
+    BOOST_CHECK(ms_multi);
+    BOOST_CHECK_EQUAL(ms_multi->GetOps(), 4); // 3 pubkeys + CMS
+    BOOST_CHECK_EQUAL(ms_multi->GetStackSize(), 3); // 1 sig + dummy elem + script push
+
+    // Timelock tests
+    Test("after(100)", "?", TESTMODE_VALID | TESTMODE_NONMAL); // only heightlock
+    Test("after(1000000000)", "?", TESTMODE_VALID | TESTMODE_NONMAL); // only timelock
+    Test("or_b(l:after(100),al:after(1000000000))", "?", TESTMODE_VALID); // or_b(timelock, heighlock) valid
+    Test("and_b(after(100),a:after(1000000000))", "?", TESTMODE_VALID | TESTMODE_NONMAL | TESTMODE_TIMELOCKMIX); // and_b(timelock, heighlock) invalid
+    /* This is correctly detected as non-malleable but for the wrong reason. The type system assumes that branches 1 and 2
+       can be spent together to create a non-malleble witness, but because of mixing of timelocks they cannot be spent together.
+       But since exactly one of the two after's can be satisfied, the witness involving the key cannot be malleated.
+    */
+    Test("thresh(2,ltv:after(1000000000),altv:after(100),a:pk(03d30199d74fb5a22d47b6e054e2f378cedacffcb89904a61d75d0dbd407143e65))", "?", TESTMODE_VALID | TESTMODE_TIMELOCKMIX | TESTMODE_NONMAL); // thresh with k = 2
+    // This is actually non-malleable in practice, but we cannot detect it in type system. See above rationale
+    Test("thresh(1,c:pk_k(03d30199d74fb5a22d47b6e054e2f378cedacffcb89904a61d75d0dbd407143e65),altv:after(1000000000),altv:after(100))", "?", TESTMODE_VALID); // thresh with k = 1
+
+
+    g_testdata.reset();
+}
+
+BOOST_AUTO_TEST_SUITE_END()

From c5b37738485dd9229bbe9c948b9e9628c9b4b7e3 Mon Sep 17 00:00:00 2001
From: fanquake <fanquake@gmail.com>
Date: Wed, 6 Apr 2022 16:17:42 +0100
Subject: [PATCH 203/656] Merge bitcoin/bitcoin#24786: doc: Convert remaining
 comments to clang-tidy format

ffffb7a25a7cb5370ac1ed8dee4c7197a77afde8 doc: Convert remaining comments to clang-tidy format (MarcoFalke)

Pull request description:

  This is a follow-up to commit 0da559e02e442f246c18b3d94ed166b97d1fb649, hopefully the last one.

ACKs for top commit:
  Empact:
    Code review ACK ffffb7a25a7cb5370ac1ed8dee4c7197a77afde8
  vincenzopalazzo:
    ACK https://github.com/bitcoin/bitcoin/pull/24786/commits/ffffb7a25a7cb5370ac1ed8dee4c7197a77afde8

Tree-SHA512: 541f5e69aeee53815e77e63b9012d3ed24856eec5f7e28cc764b3ce29f897563e56ade07db9891324f2809dcf064ce10333b1a1e4a7490af9bd97dcf6ff4e4f7
---
 src/node/chainstate.cpp   |  6 +++---
 src/rest.cpp              |  2 +-
 src/rpc/util.cpp          |  4 ++--
 src/script/miniscript.h   | 12 ++++++------
 src/validation.cpp        |  2 +-
 src/wallet/rpc/backup.cpp |  6 +++---
 6 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/src/node/chainstate.cpp b/src/node/chainstate.cpp
index 555cef21a831..4e751f9de2d2 100644
--- a/src/node/chainstate.cpp
+++ b/src/node/chainstate.cpp
@@ -148,9 +148,9 @@ std::optional<ChainstateLoadingError> LoadChainstate(bool fReset,
 
     for (CChainState* chainstate : chainman.GetAll()) {
         chainstate->InitCoinsDB(
-            /* cache_size_bytes */ nCoinDBCache,
-            /* in_memory */ coins_db_in_memory,
-            /* should_wipe */ fReset || fReindexChainState);
+            /*cache_size_bytes=*/nCoinDBCache,
+            /*in_memory=*/coins_db_in_memory,
+            /*should_wipe=*/fReset || fReindexChainState);
 
         if (coins_error_cb) {
             chainstate->CoinsErrorCatcher().AddReadErrCallback(coins_error_cb);
diff --git a/src/rest.cpp b/src/rest.cpp
index e58a650689f6..5b6222724572 100644
--- a/src/rest.cpp
+++ b/src/rest.cpp
@@ -691,7 +691,7 @@ static bool rest_tx(const CoreContext& context, HTTPRequest* req, const std::str
     const NodeContext* const node = GetNodeContext(context, req);
     if (!node) return false;
     uint256 hashBlock = uint256();
-    const CTransactionRef tx = GetTransaction(/* block_index */ nullptr, node->mempool.get(), hash, Params().GetConsensus(), hashBlock);
+    const CTransactionRef tx = GetTransaction(/*block_index=*/nullptr, node->mempool.get(), hash, Params().GetConsensus(), hashBlock);
     if (!tx) {
         return RESTERR(req, HTTP_NOT_FOUND, hashStr + " not found");
     }
diff --git a/src/rpc/util.cpp b/src/rpc/util.cpp
index 90ee7464c17e..60d7ddd10104 100644
--- a/src/rpc/util.cpp
+++ b/src/rpc/util.cpp
@@ -375,7 +375,7 @@ struct Sections {
             if (arg.m_type_str.size() != 0 && push_name) {
                 left += "\"" + arg.GetName() + "\": " + arg.m_type_str.at(0);
             } else {
-                left += push_name ? arg.ToStringObj(/* oneline */ false) : arg.ToString(/* oneline */ false);
+                left += push_name ? arg.ToStringObj(/*oneline=*/false) : arg.ToString(/*oneline=*/false);
             }
             left += ",";
             PushSection({left, arg.ToDescriptionString()});
@@ -578,7 +578,7 @@ std::string RPCHelpMan::ToString() const
             if (was_optional) ret += ") ";
             was_optional = false;
         }
-        ret += arg.ToString(/* oneline */ true);
+        ret += arg.ToString(/*oneline=*/true);
     }
     if (was_optional) ret += " )";
 
diff --git a/src/script/miniscript.h b/src/script/miniscript.h
index b3fd536365c6..13da65e758b3 100644
--- a/src/script/miniscript.h
+++ b/src/script/miniscript.h
@@ -1500,27 +1500,27 @@ inline NodeRef<Key> DecodeScript(I& in, I last, const Ctx& ctx)
         }
         case DecodeContext::AND_V: {
             if (constructed.size() < 2) return {};
-            BuildBack(Fragment::AND_V, constructed, /* reverse */ true);
+            BuildBack(Fragment::AND_V, constructed, /*reverse=*/true);
             break;
         }
         case DecodeContext::AND_B: {
             if (constructed.size() < 2) return {};
-            BuildBack(Fragment::AND_B, constructed, /* reverse */ true);
+            BuildBack(Fragment::AND_B, constructed, /*reverse=*/true);
             break;
         }
         case DecodeContext::OR_B: {
             if (constructed.size() < 2) return {};
-            BuildBack(Fragment::OR_B, constructed, /* reverse */ true);
+            BuildBack(Fragment::OR_B, constructed, /*reverse=*/true);
             break;
         }
         case DecodeContext::OR_C: {
             if (constructed.size() < 2) return {};
-            BuildBack(Fragment::OR_C, constructed, /* reverse */ true);
+            BuildBack(Fragment::OR_C, constructed, /*reverse=*/true);
             break;
         }
         case DecodeContext::OR_D: {
             if (constructed.size() < 2) return {};
-            BuildBack(Fragment::OR_D, constructed, /* reverse */ true);
+            BuildBack(Fragment::OR_D, constructed, /*reverse=*/true);
             break;
         }
         case DecodeContext::ANDOR: {
@@ -1604,7 +1604,7 @@ inline NodeRef<Key> DecodeScript(I& in, I last, const Ctx& ctx)
             if (in >= last) return {};
             if (in[0].first == OP_IF) {
                 ++in;
-                BuildBack(Fragment::OR_I, constructed, /* reverse */ true);
+                BuildBack(Fragment::OR_I, constructed, /*reverse=*/true);
             } else if (in[0].first == OP_NOTIF) {
                 ++in;
                 to_parse.emplace_back(DecodeContext::ANDOR, -1, -1);
diff --git a/src/validation.cpp b/src/validation.cpp
index 8f99f5240e5a..205cc33c4de6 100644
--- a/src/validation.cpp
+++ b/src/validation.cpp
@@ -5758,7 +5758,7 @@ bool ChainstateManager::ActivateSnapshot(
     }
 
     auto snapshot_chainstate = WITH_LOCK(::cs_main, return std::make_unique<CChainState>(
-            /* mempool */ nullptr, m_blockman, *this,
+            /*mempool=*/ nullptr, m_blockman, *this,
             this->ActiveChainstate().m_evoDb,
             this->ActiveChainstate().m_chain_helper,
             base_blockhash
diff --git a/src/wallet/rpc/backup.cpp b/src/wallet/rpc/backup.cpp
index 8d3d03bf76fa..559c92efcadd 100644
--- a/src/wallet/rpc/backup.cpp
+++ b/src/wallet/rpc/backup.cpp
@@ -1486,7 +1486,7 @@ RPCHelpMan importmulti()
                             {"desc", RPCArg::Type::STR, RPCArg::Optional::OMITTED, "Descriptor to import. If using descriptor, do not also provide address/scriptPubKey, scripts, or pubkeys"
                             },
                             {"scriptPubKey", RPCArg::Type::STR, RPCArg::Optional::NO, "Type of scriptPubKey (string for script, json for address). Should not be provided if using a descriptor",
-                                /* oneline_description */ "", {"\"<script>\" | { \"address\":\"<address>\" }", "string / json"}
+                                /*oneline_description=*/"", {"\"<script>\" | { \"address\":\"<address>\" }", "string / json"}
                             },
                             {"timestamp", RPCArg::Type::NUM, RPCArg::Optional::NO, "Creation time of the key expressed in " + UNIX_EPOCH_TIME + ",\n"
 "                                                              or the string \"now\" to substitute the current synced blockchain time. The timestamp of the oldest\n"
@@ -1494,7 +1494,7 @@ RPCHelpMan importmulti()
 "                                                              \"now\" can be specified to bypass scanning, for keys which are known to never have been used, and\n"
 "                                                              0 can be specified to scan the entire blockchain. Blocks up to 2 hours before the earliest key\n"
 "                                                              creation time of all keys being imported by the importmulti call will be scanned.",
-                                /* oneline_description */ "", {"timestamp | \"now\"", "integer / string"}
+                                /*oneline_description=*/"", {"timestamp | \"now\"", "integer / string"}
                             },
                             {"redeemscript", RPCArg::Type::STR, RPCArg::Optional::OMITTED, "Allowed only if the scriptPubKey is a P2SH address or  a P2SH scriptPubKey"},
                             {"pubkeys", RPCArg::Type::ARR, RPCArg::Default{UniValue::VARR}, "Array of strings giving pubkeys to import. They must occur in P2PKH or P2WPKH scripts. They are not required when the private key is also provided (see the \"keys\" argument).",
@@ -1820,7 +1820,7 @@ RPCHelpMan importdescriptors() {
         "                                                              \"now\" can be specified to bypass scanning, for outputs which are known to never have been used, and\n"
         "                                                              0 can be specified to scan the entire blockchain. Blocks up to 2 hours before the earliest timestamp\n"
         "                                                              of all descriptors being imported will be scanned.",
-                                        /* oneline_description */ "", {"timestamp | \"now\"", "integer / string"}
+                                        /*oneline_description=*/"", {"timestamp | \"now\"", "integer / string"}
                                     },
                                     {"internal", RPCArg::Type::BOOL, RPCArg::Default{false}, "Whether matching outputs should be treated as not incoming payments (e.g. change)"},
                                     {"label", RPCArg::Type::STR, RPCArg::Default{""}, "Label to assign to the address, only allowed with internal=false. Disabled for ranged descriptors"},

From f8c17c6cc07c69e5d8250bb2e4913e282dbe25ed Mon Sep 17 00:00:00 2001
From: MarcoFalke <falke.marco@gmail.com>
Date: Thu, 7 Apr 2022 14:30:44 +0200
Subject: [PATCH 204/656] Merge bitcoin/bitcoin#24796: lint: misc updates &
 fixes

f87f25948a3b43d55c74d4f988a6f16f11649341 refactor: fixup named args in txpackage tests (fanquake)
864772c4f753284964538a83e1419b9338a6d84a lint: mypy 0.942 (fanquake)
38031adee808c6a3f191a03b95403c38d00195dd lint: flake8 4.0.1 (fanquake)
eaf712c8019383dfa247dc7b9692bbd423cd01ba lint: codespell 2.1.0 (fanquake)

Pull request description:

  Use newer versions of our lint packages.
  Fix all the outstanding typos.
  Fix the failing CI.

ACKs for top commit:
  MarcoFalke:
    review ACK f87f25948a3b43d55c74d4f988a6f16f11649341

Tree-SHA512: 2c1471c13e088d5b9cdd436ebde40180516ae1dd2a2ea4d2f54214762a0712557d899e73c4cfd32992fe45fce6fdba50ba39254f2c79cd5d1180e873a79b9b22
---
 ci/lint/04_install.sh                    |  6 +--
 contrib/containers/ci/ci-slim.Dockerfile |  6 +--
 doc/build-openbsd.md                     |  2 +-
 src/test/txpackage_tests.cpp             | 54 ++++++++++++------------
 4 files changed, 34 insertions(+), 34 deletions(-)

diff --git a/ci/lint/04_install.sh b/ci/lint/04_install.sh
index 431672ba1fb3..f70ff2d2235e 100755
--- a/ci/lint/04_install.sh
+++ b/ci/lint/04_install.sh
@@ -33,10 +33,10 @@ if [ -z "${SKIP_PYTHON_INSTALL}" ]; then
     python3 --version
 fi
 
-${CI_RETRY_EXE} pip3 install codespell==2.0.0
-${CI_RETRY_EXE} pip3 install flake8==3.8.3
+${CI_RETRY_EXE} pip3 install codespell==2.1.0
+${CI_RETRY_EXE} pip3 install flake8==4.0.1
 ${CI_RETRY_EXE} pip3 install lief==0.13.1
-${CI_RETRY_EXE} pip3 install mypy==0.910
+${CI_RETRY_EXE} pip3 install mypy==0.942
 ${CI_RETRY_EXE} pip3 install pyzmq==22.3.0
 ${CI_RETRY_EXE} pip3 install vulture==2.3
 
diff --git a/contrib/containers/ci/ci-slim.Dockerfile b/contrib/containers/ci/ci-slim.Dockerfile
index 2bfb3baea243..b5d8ca1d7485 100644
--- a/contrib/containers/ci/ci-slim.Dockerfile
+++ b/contrib/containers/ci/ci-slim.Dockerfile
@@ -69,12 +69,12 @@ RUN set -ex; \
 # Install Python packages
 RUN set -ex; \
     pip3 install --no-cache-dir \
-    codespell==1.17.1 \
-    flake8==3.8.3 \
+    codespell==2.1.0 \
+    flake8==4.0.1 \
     jinja2 \
     lief==0.13.2 \
     multiprocess \
-    mypy==0.910 \
+    mypy==0.942 \
     pyzmq==22.3.0 \
     vulture==2.3
 
diff --git a/doc/build-openbsd.md b/doc/build-openbsd.md
index 8ebcb68ed24b..0b5ebb1453c8 100644
--- a/doc/build-openbsd.md
+++ b/doc/build-openbsd.md
@@ -11,7 +11,7 @@ Run the following as root to install the base dependencies for building.
 
 ```bash
 pkg_add bash git gmake gmp libevent libtool boost
-# Select the newest version of the follow packages:
+# Select the newest version of the following packages:
 pkg_add autoconf automake python
 
 git clone https://github.com/dashpay/dash.git
diff --git a/src/test/txpackage_tests.cpp b/src/test/txpackage_tests.cpp
index 20b30657d666..312bf3894248 100644
--- a/src/test/txpackage_tests.cpp
+++ b/src/test/txpackage_tests.cpp
@@ -363,17 +363,17 @@ BOOST_FIXTURE_TEST_CASE(package_cpfp_tests, TestChain100Setup)
     const CAmount child_value{parent_value - COIN};
 
     Package package_cpfp;
-    auto mtx_parent = CreateValidMempoolTransaction(/*input_transaction=*/ m_coinbase_txns[0], /*vout=*/ 0,
-                                                    /*input_height=*/ 0, /*input_signing_key=*/ coinbaseKey,
-                                                    /*output_destination=*/ parent_spk,
-                                                    /*output_amount=*/ parent_value, /*submit=*/ false);
+    auto mtx_parent = CreateValidMempoolTransaction(/*input_transaction=*/m_coinbase_txns[0], /*input_vout=*/0,
+                                                    /*input_height=*/0, /*input_signing_key=*/coinbaseKey,
+                                                    /*output_destination=*/parent_spk,
+                                                    /*output_amount=*/parent_value, /*submit=*/false);
     CTransactionRef tx_parent = MakeTransactionRef(mtx_parent);
     package_cpfp.push_back(tx_parent);
 
-    auto mtx_child = CreateValidMempoolTransaction(/*input_transaction=*/ tx_parent, /*vout=*/ 0,
-                                                   /*input_height=*/ 101, /*input_signing_key=*/ child_key,
-                                                   /*output_destination=*/ child_spk,
-                                                   /*output_amount=*/ child_value, /*submit=*/ false);
+    auto mtx_child = CreateValidMempoolTransaction(/*input_transaction=*/tx_parent, /*input_vout=*/0,
+                                                   /*input_height=*/101, /*input_signing_key=*/child_key,
+                                                   /*output_destination=*/child_spk,
+                                                   /*output_amount=*/child_value, /*submit=*/false);
     CTransactionRef tx_child = MakeTransactionRef(mtx_child);
     package_cpfp.push_back(tx_child);
 
@@ -435,17 +435,17 @@ BOOST_FIXTURE_TEST_CASE(package_cpfp_tests, TestChain100Setup)
     // This package just pays 200 satoshis total. This would be enough to pay for the child alone,
     // but isn't enough for the entire package to meet the 1sat/vbyte minimum.
     Package package_still_too_low;
-    auto mtx_parent_cheap = CreateValidMempoolTransaction(/*input_transaction=*/ m_coinbase_txns[1], /*vout=*/ 0,
-                                                          /*input_height=*/ 0, /*input_signing_key=*/ coinbaseKey,
-                                                          /*output_destination=*/ parent_spk,
-                                                          /*output_amount=*/ coinbase_value, /*submit=*/ false);
+    auto mtx_parent_cheap = CreateValidMempoolTransaction(/*input_transaction=*/m_coinbase_txns[1], /*input_vout=*/0,
+                                                          /*input_height=*/0, /*input_signing_key=*/coinbaseKey,
+                                                          /*output_destination=*/parent_spk,
+                                                          /*output_amount=*/coinbase_value, /*submit=*/false);
     CTransactionRef tx_parent_cheap = MakeTransactionRef(mtx_parent_cheap);
     package_still_too_low.push_back(tx_parent_cheap);
 
-    auto mtx_child_cheap = CreateValidMempoolTransaction(/*input_transaction=*/ tx_parent_cheap, /*vout=*/ 0,
-                                                         /*input_height=*/ 101, /* input_signing_key */ child_key,
-                                                         /*output_destination=*/ child_spk,
-                                                         /*output_amount=*/ coinbase_value - 200, /*submit=*/ false);
+    auto mtx_child_cheap = CreateValidMempoolTransaction(/*input_transaction=*/tx_parent_cheap, /*input_vout=*/0,
+                                                         /*input_height=*/101, /*input_signing_key=*/child_key,
+                                                         /*output_destination=*/child_spk,
+                                                         /*output_amount=*/coinbase_value - 200, /*submit=*/false);
     CTransactionRef tx_child_cheap = MakeTransactionRef(mtx_child_cheap);
     package_still_too_low.push_back(tx_child_cheap);
 
@@ -453,7 +453,7 @@ BOOST_FIXTURE_TEST_CASE(package_cpfp_tests, TestChain100Setup)
     {
         BOOST_CHECK_EQUAL(m_node.mempool->size(), expected_pool_size);
         const auto submit_package_too_low = ProcessNewPackage(m_node.chainman->ActiveChainstate(), *m_node.mempool,
-                                                   package_still_too_low, /* test_accept */ false);
+                                                   package_still_too_low, /*test_accept=*/false);
         BOOST_CHECK_MESSAGE(submit_package_too_low.m_state.IsInvalid(), "Package validation unexpectedly succeeded");
         BOOST_CHECK_EQUAL(submit_package_too_low.m_state.GetResult(), PackageValidationResult::PCKG_POLICY);
         BOOST_CHECK_EQUAL(submit_package_too_low.m_state.GetRejectReason(), "package-fee-too-low");
@@ -475,7 +475,7 @@ BOOST_FIXTURE_TEST_CASE(package_cpfp_tests, TestChain100Setup)
     // Now that the child's fees have "increased" by 1 BTC, the cheap package should succeed.
     {
         const auto submit_prioritised_package = ProcessNewPackage(m_node.chainman->ActiveChainstate(), *m_node.mempool,
-                                                                  package_still_too_low, /*test_accept=*/ false);
+                                                                  package_still_too_low, /*test_accept=*/false);
         expected_pool_size += 2;
         BOOST_CHECK_MESSAGE(submit_prioritised_package.m_state.IsValid(),
                 "Package validation unexpectedly failed" << submit_prioritised_package.m_state.GetRejectReason());
@@ -494,17 +494,17 @@ BOOST_FIXTURE_TEST_CASE(package_cpfp_tests, TestChain100Setup)
     // the parent from being accepted.
     Package package_rich_parent;
     const CAmount high_parent_fee{1 * COIN};
-    auto mtx_parent_rich = CreateValidMempoolTransaction(/*input_transaction=*/ m_coinbase_txns[2], /*vout=*/ 0,
-                                                         /*input_height=*/ 0, /*input_signing_key=*/ coinbaseKey,
-                                                         /*output_destination=*/ parent_spk,
-                                                         /*output_amount=*/ coinbase_value - high_parent_fee, /*submit=*/ false);
+    auto mtx_parent_rich = CreateValidMempoolTransaction(/*input_transaction=*/m_coinbase_txns[2], /*input_vout=*/0,
+                                                         /*input_height=*/0, /*input_signing_key=*/coinbaseKey,
+                                                         /*output_destination=*/parent_spk,
+                                                         /*output_amount=*/coinbase_value - high_parent_fee, /*submit=*/false);
     CTransactionRef tx_parent_rich = MakeTransactionRef(mtx_parent_rich);
     package_rich_parent.push_back(tx_parent_rich);
 
-    auto mtx_child_poor = CreateValidMempoolTransaction(/*input_transaction=*/ tx_parent_rich, /*vout=*/ 0,
-                                                        /*input_height=*/ 101, /*input_signing_key=*/ child_key,
-                                                        /*output_destination=*/ child_spk,
-                                                        /*output_amount=*/ coinbase_value - high_parent_fee, /*submit=*/ false);
+    auto mtx_child_poor = CreateValidMempoolTransaction(/*input_transaction=*/tx_parent_rich, /*input_vout=*/0,
+                                                        /*input_height=*/101, /*input_signing_key=*/child_key,
+                                                        /*output_destination=*/child_spk,
+                                                        /*output_amount=*/coinbase_value - high_parent_fee, /*submit=*/false);
     CTransactionRef tx_child_poor = MakeTransactionRef(mtx_child_poor);
     package_rich_parent.push_back(tx_child_poor);
 
@@ -512,7 +512,7 @@ BOOST_FIXTURE_TEST_CASE(package_cpfp_tests, TestChain100Setup)
     {
         BOOST_CHECK_EQUAL(m_node.mempool->size(), expected_pool_size);
         const auto submit_rich_parent = ProcessNewPackage(m_node.chainman->ActiveChainstate(), *m_node.mempool,
-                                                          package_rich_parent, /* test_accept */ false);
+                                                          package_rich_parent, /*test_accept=*/false);
         expected_pool_size += 1;
         BOOST_CHECK_MESSAGE(submit_rich_parent.m_state.IsInvalid(), "Package validation unexpectedly succeeded");
 

From 38bc9966aee9a9e42b5aa342f199536fd104c9ca Mon Sep 17 00:00:00 2001
From: fanquake <fanquake@gmail.com>
Date: Wed, 1 Dec 2021 10:44:32 +0800
Subject: [PATCH 205/656] Merge bitcoin/bitcoin#23635: test: Bump shellcheck
 version to 0.8.0

5202bd1dc0942953c415ef39c14ffd48cbaab6b9 test: Bump shellcheck version to 0.8.0 (Hennadii Stepanov)

Pull request description:

  Among [added](https://github.com/koalaman/shellcheck/blob/master/CHANGELOG.md#v080---2021-11-06) rules, SC2295 could be [useful](https://github.com/bitcoin/bitcoin/pull/23506#issuecomment-982201468) for us.

ACKs for top commit:
  dongcarl:
    Code Review ACK 5202bd1dc0942953c415ef39c14ffd48cbaab6b9
  fanquake:
    ACK 5202bd1dc0942953c415ef39c14ffd48cbaab6b9 - would have rather this just been a part of #23506 to avoid another PR and pointless rebasing.

Tree-SHA512: fd7ff801c71af03c5a5b2823b7daba25a430b3ead5e5e50a3663961ee2223e55d322aec91d79999814cd35bd7ed6e9415a0b797718ceb8c0b1dbdbb40c336b82
---
 contrib/containers/ci/ci-slim.Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/contrib/containers/ci/ci-slim.Dockerfile b/contrib/containers/ci/ci-slim.Dockerfile
index b5d8ca1d7485..7a498bf2b71b 100644
--- a/contrib/containers/ci/ci-slim.Dockerfile
+++ b/contrib/containers/ci/ci-slim.Dockerfile
@@ -86,7 +86,7 @@ RUN set -ex; \
     cd dash_hash && pip3 install -r requirements.txt .; \
     cd .. && rm -rf dash_hash
 
-ARG SHELLCHECK_VERSION=v0.7.1
+ARG SHELLCHECK_VERSION=v0.8.0
 RUN set -ex; \
     curl -fL "https://github.com/koalaman/shellcheck/releases/download/${SHELLCHECK_VERSION}/shellcheck-${SHELLCHECK_VERSION}.linux.x86_64.tar.xz" -o /tmp/shellcheck.tar.xz; \
     mkdir -p /opt/shellcheck && tar -xf /tmp/shellcheck.tar.xz -C /opt/shellcheck --strip-components=1 && rm /tmp/shellcheck.tar.xz

From a061cb9a1d6c5b73bbfb954e0fea717f55fe658a Mon Sep 17 00:00:00 2001
From: Andrew Chow <achow101-github@achow101.com>
Date: Tue, 19 Apr 2022 13:16:36 -0400
Subject: [PATCH 206/656] Merge bitcoin/bitcoin#24906: miniscript: the 'd:'
 wrapper must not be 'u'

74175941870347458ba8a0074f88b22cb94d0235 miniscript: the 'd:' wrapper must not be 'u' (Antoine Poinsot)

Pull request description:

  The type system was incorrectly relying on a standardness rule to be sound.

  This bug was found and reported by Andrew Poelstra [based on a question from Aman Kumar Kashyap](https://github.com/rust-bitcoin/rust-miniscript/discussions/341).

ACKs for top commit:
  sipa:
    ACK 74175941870347458ba8a0074f88b22cb94d0235
  apoelstra:
    utACK 74175941870347458ba8a0074f88b22cb94d0235
  achow101:
    ACK 74175941870347458ba8a0074f88b22cb94d0235

Tree-SHA512: af68c1df1c40e40dd105ef54544c226f560524dd8e35248fa0305dbef966e96ec1fa6ff2fe50fb8f2792ac310761a29c55ea81dd7b6d122a0de0a68b135e5aaa
---
 src/script/miniscript.cpp     |  3 ++-
 src/test/miniscript_tests.cpp | 11 ++++++++++-
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/src/script/miniscript.cpp b/src/script/miniscript.cpp
index d0bb93788524..019f02f1594d 100644
--- a/src/script/miniscript.cpp
+++ b/src/script/miniscript.cpp
@@ -116,7 +116,8 @@ Type ComputeType(Fragment nodetype, Type x, Type y, Type z, const std::vector<Ty
             "e"_mst.If(x << "f"_mst) | // e=f_x
             (x & "ghijk"_mst) | // g=g_x, h=h_x, i=i_x, j=j_x, k=k_x
             (x & "ms"_mst) | // m=m_x, s=s_x
-            "nudx"_mst; // n, u, d, x
+            // NOTE: 'd:' is not 'u' under P2WSH as MINIMALIF is only a policy rule there.
+            "ndx"_mst; // n, d, x
         case Fragment::WRAP_V: return
             "V"_mst.If(x << "B"_mst) | // V=B_x
             (x & "ghijk"_mst) | // g=g_x, h=h_x, i=i_x, j=j_x, k=k_x
diff --git a/src/test/miniscript_tests.cpp b/src/test/miniscript_tests.cpp
index 949d30dfd5ef..930582ea24c0 100644
--- a/src/test/miniscript_tests.cpp
+++ b/src/test/miniscript_tests.cpp
@@ -224,7 +224,7 @@ BOOST_AUTO_TEST_CASE(fixed_tests)
     Test("and_b(hash256(32ba476771d01e37807990ead8719f08af494723de1d228f2c2c07cc0aa40bac),a:and_b(hash256(131772552c01444cd81360818376a040b7c3b2b7b0a53550ee3edde216cec61b),a:older(1)))", "82012088aa2032ba476771d01e37807990ead8719f08af494723de1d228f2c2c07cc0aa40bac876b82012088aa20131772552c01444cd81360818376a040b7c3b2b7b0a53550ee3edde216cec61b876b51b26c9a6c9a", TESTMODE_VALID | TESTMODE_NONMAL, 15, 3);
     Test("thresh(2,multi(2,03a0434d9e47f3c86235477c7b1ae6ae5d3442d49b1943c2b752a68e2a47e247c7,036d2b085e9e382ed10b69fc311a03f8641ccfff21574de0927513a49d9a688a00),a:multi(1,036d2b085e9e382ed10b69fc311a03f8641ccfff21574de0927513a49d9a688a00),ac:pk_k(022f01e5e15cca351daff3843fb70f3c2f0a1bdd05e5af888a67784ef3e10a2a01))", "522103a0434d9e47f3c86235477c7b1ae6ae5d3442d49b1943c2b752a68e2a47e247c721036d2b085e9e382ed10b69fc311a03f8641ccfff21574de0927513a49d9a688a0052ae6b5121036d2b085e9e382ed10b69fc311a03f8641ccfff21574de0927513a49d9a688a0051ae6c936b21022f01e5e15cca351daff3843fb70f3c2f0a1bdd05e5af888a67784ef3e10a2a01ac6c935287", TESTMODE_VALID | TESTMODE_NONMAL | TESTMODE_NEEDSIG, 13, 7);
     Test("and_n(sha256(d1ec675902ef1633427ca360b290b0b3045a0d9058ddb5e648b4c3c3224c5c68),t:or_i(v:older(4252898),v:older(144)))", "82012088a820d1ec675902ef1633427ca360b290b0b3045a0d9058ddb5e648b4c3c3224c5c68876400676303e2e440b26967029000b269685168", TESTMODE_VALID, 14, 3);
-    Test("or_d(d:and_v(v:older(4252898),v:older(4252898)),sha256(38df1c1f64a24a77b23393bca50dff872e31edc4f3b5aa3b90ad0b82f4f089b6))", "766303e2e440b26903e2e440b26968736482012088a82038df1c1f64a24a77b23393bca50dff872e31edc4f3b5aa3b90ad0b82f4f089b68768", TESTMODE_VALID, 14, 3);
+    Test("or_d(nd:and_v(v:older(4252898),v:older(4252898)),sha256(38df1c1f64a24a77b23393bca50dff872e31edc4f3b5aa3b90ad0b82f4f089b6))", "766303e2e440b26903e2e440b2696892736482012088a82038df1c1f64a24a77b23393bca50dff872e31edc4f3b5aa3b90ad0b82f4f089b68768", TESTMODE_VALID, 15, 3);
     Test("c:and_v(or_c(sha256(9267d3dbed802941483f1afa2a6bc68de5f653128aca9bf1461c5d0a3ad36ed2),v:multi(1,02c44d12c7065d812e8acf28d7cbb19f9011ecd9e9fdf281b0e6a3b5e87d22e7db)),pk_k(03acd484e2f0c7f65309ad178a9f559abde09796974c57e714c35f110dfc27ccbe))", "82012088a8209267d3dbed802941483f1afa2a6bc68de5f653128aca9bf1461c5d0a3ad36ed28764512102c44d12c7065d812e8acf28d7cbb19f9011ecd9e9fdf281b0e6a3b5e87d22e7db51af682103acd484e2f0c7f65309ad178a9f559abde09796974c57e714c35f110dfc27ccbeac", TESTMODE_VALID | TESTMODE_NEEDSIG, 8, 3);
     Test("c:and_v(or_c(multi(2,036d2b085e9e382ed10b69fc311a03f8641ccfff21574de0927513a49d9a688a00,02352bbf4a4cdd12564f93fa332ce333301d9ad40271f8107181340aef25be59d5),v:ripemd160(1b0f3c404d12075c68c938f9f60ebea4f74941a0)),pk_k(03fff97bd5755eeea420453a14355235d382f6472f8568a18b2f057a1460297556))", "5221036d2b085e9e382ed10b69fc311a03f8641ccfff21574de0927513a49d9a688a002102352bbf4a4cdd12564f93fa332ce333301d9ad40271f8107181340aef25be59d552ae6482012088a6141b0f3c404d12075c68c938f9f60ebea4f74941a088682103fff97bd5755eeea420453a14355235d382f6472f8568a18b2f057a1460297556ac", TESTMODE_VALID | TESTMODE_NONMAL | TESTMODE_NEEDSIG, 10, 6);
     Test("and_v(andor(hash256(8a35d9ca92a48eaade6f53a64985e9e2afeb74dcf8acb4c3721e0dc7e4294b25),v:hash256(939894f70e6c3a25da75da0cc2071b4076d9b006563cf635986ada2e93c0d735),v:older(50000)),after(499999999))", "82012088aa208a35d9ca92a48eaade6f53a64985e9e2afeb74dcf8acb4c3721e0dc7e4294b2587640350c300b2696782012088aa20939894f70e6c3a25da75da0cc2071b4076d9b006563cf635986ada2e93c0d735886804ff64cd1db1", TESTMODE_VALID, 14, 3);
@@ -263,6 +263,15 @@ BOOST_AUTO_TEST_CASE(fixed_tests)
     BOOST_CHECK(ms_multi);
     BOOST_CHECK_EQUAL(ms_multi->GetOps(), 4); // 3 pubkeys + CMS
     BOOST_CHECK_EQUAL(ms_multi->GetStackSize(), 3); // 1 sig + dummy elem + script push
+    // The 'd:' wrapper leaves on the stack what was DUP'ed at the beginning of its execution.
+    // Since it contains an OP_IF just after on the same element, we can make sure that the element
+    // in question must be OP_1 if OP_IF enforces that its argument must only be OP_1 or the empty
+    // vector (since otherwise the execution would immediately fail). This is the MINIMALIF rule.
+    // Unfortunately, this rule is consensus for Taproot but only policy for P2WSH. Therefore we can't
+    // (for now) have 'd:' be 'u'. This tests we can't use a 'd:' wrapper for a thresh, which requires
+    // its subs to all be 'u' (taken from https://github.com/rust-bitcoin/rust-miniscript/discussions/341).
+    const auto ms_minimalif = miniscript::FromString("thresh(3,c:pk_k(03d30199d74fb5a22d47b6e054e2f378cedacffcb89904a61d75d0dbd407143e65),sc:pk_k(03fff97bd5755eeea420453a14355235d382f6472f8568a18b2f057a1460297556),sc:pk_k(0279be667ef9dcbbac55a06295ce870b07029bfcdb2dce28d959f2815b16f81798),sdv:older(32))", CONVERTER);
+    BOOST_CHECK(!ms_minimalif);
 
     // Timelock tests
     Test("after(100)", "?", TESTMODE_VALID | TESTMODE_NONMAL); // only heightlock

From b282987817fd6b126826c4feff49dcd6129a72a6 Mon Sep 17 00:00:00 2001
From: MacroFake <falke.marco@gmail.com>
Date: Fri, 6 May 2022 11:06:08 +0200
Subject: [PATCH 207/656] Merge bitcoin/bitcoin#24538: miner: bug fix? update
 for ancestor inclusion using modified fees, not base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

e4303c337c8423f21c2c72ee1bcca3aaf46fa1cb [unit test] prioritisation in mining (glozow)
7a8d60676bc0eec289687b2dfd5d2b00b83c0eaa [miner] bug fix: update for parent inclusion using modified fee (glozow)
0f9a44461c294cf21a335e8a8c13e498baac110f MOVEONLY: group miner tests into MinerTestingSetup functions (glozow)

Pull request description:

  Came up while reviewing #24364, where some of us incorrectly assumed that we use the same fee deduction in `CTxMemPoolModifiedEntry::nModFeesWithAncestors` when first constructing an entry and in `update_for_parent_inclusion`.

  Actually, the behavior is this: when a mempool entry's ancestor is included in the block template, we create a `CTxMemPoolModifiedEntry` for it, subtracting the ancestor's modified fees from `nModFeesWithAncestors`. If another ancestor is included, we update it again, but use the ancestor's _base_ fees instead.

  I can't explain why we use `GetFee` in one place and `GetModifiedFee` in the other, but I'm quite certain we should be using the same one for both.

  And should it be base or modified fees? Modified, otherwise the child inherits the prioritisation of the parent, but only until the parent gets mined. If we want prioritisation to cascade down to current in-mempool descendants, we should probably document that in the `prioritsetransaction` helpstring and implement it in `CTxMemPool::mapDeltas`, not as a quirk in the mining code?

  Wrote a test in which a mempool entry has 2 ancestors, both prioritised, and both included in a block template individually. This test should fail without the s/GetFee/GetModifiedFee commit.

ACKs for top commit:
  ccdle12:
    tested ACK e4303c3
  MarcoFalke:
    ACK e4303c337c8423f21c2c72ee1bcca3aaf46fa1cb 🚗

Tree-SHA512: 4cd94106fbc9353e9f9b6d5af268ecda5aec7539245298c940ca220606dd0737264505bfaae1f83d94765cc2d9e1a6e913a765048fe6c19292482241761a6762
---
 src/node/miner.h         |   2 +-
 src/test/miner_tests.cpp | 210 ++++++++++++++++++++++++++++-----------
 2 files changed, 151 insertions(+), 61 deletions(-)

diff --git a/src/node/miner.h b/src/node/miner.h
index 188416d3ff44..eea4d69884bd 100644
--- a/src/node/miner.h
+++ b/src/node/miner.h
@@ -135,7 +135,7 @@ struct update_for_parent_inclusion
 
     void operator() (CTxMemPoolModifiedEntry &e)
     {
-        e.nModFeesWithAncestors -= iter->GetFee();
+        e.nModFeesWithAncestors -= iter->GetModifiedFee();
         e.nSizeWithAncestors -= iter->GetTxSize();
         e.nSigOpCountWithAncestors -= iter->GetSigOpCount();
     }
diff --git a/src/test/miner_tests.cpp b/src/test/miner_tests.cpp
index a24d10afe5a3..b84a3a0c8131 100644
--- a/src/test/miner_tests.cpp
+++ b/src/test/miner_tests.cpp
@@ -37,6 +37,8 @@ using node::CBlockTemplate;
 namespace miner_tests {
 struct MinerTestingSetup : public TestingSetup {
     void TestPackageSelection(const CChainParams& chainparams, const CScript& scriptPubKey, const std::vector<CTransactionRef>& txFirst) EXCLUSIVE_LOCKS_REQUIRED(::cs_main, m_node.mempool->cs);
+    void TestBasicMining(const CChainParams& chainparams, const CScript& scriptPubKey, const std::vector<CTransactionRef>& txFirst, int baseheight) EXCLUSIVE_LOCKS_REQUIRED(::cs_main, m_node.mempool->cs);
+    void TestPrioritisedMining(const CChainParams& chainparams, const CScript& scriptPubKey, const std::vector<CTransactionRef>& txFirst) EXCLUSIVE_LOCKS_REQUIRED(::cs_main, m_node.mempool->cs);
     bool TestSequenceLocks(const CTransaction& tx) EXCLUSIVE_LOCKS_REQUIRED(::cs_main, m_node.mempool->cs)
     {
         CCoinsViewMemPool view_mempool(&m_node.chainman->ActiveChainstate().CoinsTip(), *m_node.mempool);
@@ -205,70 +207,16 @@ void MinerTestingSetup::TestPackageSelection(const CChainParams& chainparams, co
     BOOST_CHECK(pblocktemplate->block.vtx[8]->GetHash() == hashLowFeeTx2);
 }
 
-// NOTE: These tests rely on CreateNewBlock doing its own self-validation!
-BOOST_AUTO_TEST_CASE(CreateNewBlock_validity)
+void MinerTestingSetup::TestBasicMining(const CChainParams& chainparams, const CScript& scriptPubKey, const std::vector<CTransactionRef>& txFirst, int baseheight)
 {
-    const auto chainParams = CreateChainParams(*m_node.args, CBaseChainParams::MAIN);
-    const CChainParams& chainparams = *chainParams;
-    CScript scriptPubKey = CScript() << ParseHex("04678afdb0fe5548271967f1a67130b7105cd6a828e03909a67962e0ea1f61deb649f6bc3f4cef38c4f35504e51ec112de5c384df7ba0b8d578a4c702b6bf11d5f") << OP_CHECKSIG;
-    std::unique_ptr<CBlockTemplate> pblocktemplate, pemptyblocktemplate;
-    CMutableTransaction tx;
-    CScript script;
     uint256 hash;
+    CMutableTransaction tx;
     TestMemPoolEntryHelper entry;
     entry.nFee = 11;
     entry.nHeight = 11;
-
-    fCheckpointsEnabled = false;
-
-    // Simple block creation, nothing special yet:
-    BOOST_CHECK(pemptyblocktemplate = AssemblerForTest(chainparams).CreateNewBlock(scriptPubKey));
-
-    // We can't make transactions until we have inputs
-    // Therefore, load 100 blocks :)
-    int baseheight = 0;
-    std::vector<CTransactionRef> txFirst;
-
-    auto createAndProcessEmptyBlock = [&]() {
-        int i = m_node.chainman->ActiveChain().Height() % blockinfo_size;
-        CBlock *pblock = &pemptyblocktemplate->block; // pointer for convenience
-        {
-            LOCK(cs_main);
-            pblock->nVersion = VERSIONBITS_TOP_BITS;
-            pblock->nTime = m_node.chainman->ActiveChain().Tip()->GetMedianTimePast()+1;
-            CMutableTransaction txCoinbase(*pblock->vtx[0]);
-            txCoinbase.nVersion = 1;
-            txCoinbase.vin[0].scriptSig = CScript{} << (m_node.chainman->ActiveChain().Height() + 1) << BLOCKINFO[i].extranonce;
-            txCoinbase.vout[0].scriptPubKey = CScript();
-            pblock->vtx[0] = MakeTransactionRef(std::move(txCoinbase));
-            if (txFirst.size() == 0)
-                baseheight = m_node.chainman->ActiveChain().Height();
-            if (txFirst.size() < 4)
-                txFirst.push_back(pblock->vtx[0]);
-            pblock->hashMerkleRoot = BlockMerkleRoot(*pblock);
-            pblock->nNonce = BLOCKINFO[i].nonce;
-
-            // This will usually succeed in the first round as we take the nonce from BLOCKINFO
-            // It's however useful when adding new blocks with unknown nonces (you should add the found block to BLOCKINFO)
-            while (!CheckProofOfWork(pblock->GetHash(), pblock->nBits, chainparams.GetConsensus())) {
-                pblock->nNonce++;
-            }
-        }
-        std::shared_ptr<const CBlock> shared_pblock = std::make_shared<const CBlock>(*pblock);
-        BOOST_CHECK(Assert(m_node.chainman)->ProcessNewBlock(chainparams, shared_pblock, true, nullptr));
-        pblock->hashPrevBlock = pblock->GetHash();
-    };
-
-    for ([[maybe_unused]] const auto& _ : BLOCKINFO) {
-        createAndProcessEmptyBlock();
-    }
-
-    {
-    LOCK(cs_main);
-    LOCK(m_node.mempool->cs);
-
     // Just to make sure we can still make simple blocks
-    BOOST_CHECK(pblocktemplate = AssemblerForTest(chainparams).CreateNewBlock(scriptPubKey));
+    auto pblocktemplate = AssemblerForTest(chainparams).CreateNewBlock(scriptPubKey);
+    BOOST_CHECK(pblocktemplate);
 
     const CAmount BLOCKSUBSIDY = 500*COIN;
     const CAmount LOWFEE = CENT;
@@ -410,7 +358,7 @@ BOOST_AUTO_TEST_CASE(CreateNewBlock_validity)
     tx.vin[0].prevout.n = 0;
     tx.vin[0].scriptSig = CScript() << OP_1;
     tx.vout[0].nValue = BLOCKSUBSIDY-LOWFEE;
-    script = CScript() << OP_0;
+    CScript script = CScript() << OP_0;
     tx.vout[0].scriptPubKey = GetScriptForDestination(ScriptHash(script));
     hash = tx.GetHash();
     m_node.mempool->addUnchecked(entry.Fee(LOWFEE).Time(Now<NodeSeconds>()).SpendsCoinbase(true).FromTx(tx));
@@ -530,7 +478,143 @@ BOOST_AUTO_TEST_CASE(CreateNewBlock_validity)
     for (int i = 0; i < CBlockIndex::nMedianTimeSpan; ++i) {
         CBlockIndex* ancestor{Assert(m_node.chainman->ActiveChain().Tip()->GetAncestor(m_node.chainman->ActiveChain().Tip()->nHeight - i))};
         ancestor->nTime += SEQUENCE_LOCK_TIME; // Trick the MedianTimePast
-    } // unlock cs_main while calling createAndProcessEmptyBlock
+    }
+}
+
+void MinerTestingSetup::TestPrioritisedMining(const CChainParams& chainparams, const CScript& scriptPubKey, const std::vector<CTransactionRef>& txFirst)
+{
+    TestMemPoolEntryHelper entry;
+
+    // Test that a tx below min fee but prioritised is included
+    CMutableTransaction tx;
+    tx.vin.resize(1);
+    tx.vin[0].prevout.hash = txFirst[0]->GetHash();
+    tx.vin[0].prevout.n = 0;
+    tx.vin[0].scriptSig = CScript() << OP_1;
+    tx.vout.resize(1);
+    tx.vout[0].nValue = 5000000000LL; // 0 fee
+    uint256 hashFreePrioritisedTx = tx.GetHash();
+    m_node.mempool->addUnchecked(entry.Fee(0).Time(Now<NodeSeconds>()).SpendsCoinbase(true).FromTx(tx));
+    m_node.mempool->PrioritiseTransaction(hashFreePrioritisedTx, 5 * COIN);
+
+    tx.vin[0].prevout.hash = txFirst[1]->GetHash();
+    tx.vin[0].prevout.n = 0;
+    tx.vout[0].nValue = 5000000000LL - 1000;
+    // This tx has a low fee: 1000 satoshis
+    uint256 hashParentTx = tx.GetHash(); // save this txid for later use
+    m_node.mempool->addUnchecked(entry.Fee(1000).Time(Now<NodeSeconds>()).SpendsCoinbase(true).FromTx(tx));
+
+    // This tx has a medium fee: 10000 satoshis
+    tx.vin[0].prevout.hash = txFirst[2]->GetHash();
+    tx.vout[0].nValue = 5000000000LL - 10000;
+    uint256 hashMediumFeeTx = tx.GetHash();
+    m_node.mempool->addUnchecked(entry.Fee(10000).Time(Now<NodeSeconds>()).SpendsCoinbase(true).FromTx(tx));
+    m_node.mempool->PrioritiseTransaction(hashMediumFeeTx, -5 * COIN);
+
+    // This tx also has a low fee, but is prioritised
+    tx.vin[0].prevout.hash = hashParentTx;
+    tx.vout[0].nValue = 5000000000LL - 1000 - 1000; // 1000 satoshi fee
+    uint256 hashPrioritsedChild = tx.GetHash();
+    m_node.mempool->addUnchecked(entry.Fee(1000).Time(Now<NodeSeconds>()).SpendsCoinbase(false).FromTx(tx));
+    m_node.mempool->PrioritiseTransaction(hashPrioritsedChild, 2 * COIN);
+
+    // Test that transaction selection properly updates ancestor fee calculations as prioritised
+    // parents get included in a block. Create a transaction with two prioritised ancestors, each
+    // included by itself: FreeParent <- FreeChild <- FreeGrandchild.
+    // When FreeParent is added, a modified entry will be created for FreeChild + FreeGrandchild
+    // FreeParent's prioritisation should not be included in that entry.
+    // When FreeChild is included, FreeChild's prioritisation should also not be included.
+    tx.vin[0].prevout.hash = txFirst[3]->GetHash();
+    tx.vout[0].nValue = 5000000000LL; // 0 fee
+    uint256 hashFreeParent = tx.GetHash();
+    m_node.mempool->addUnchecked(entry.Fee(0).SpendsCoinbase(true).FromTx(tx));
+    m_node.mempool->PrioritiseTransaction(hashFreeParent, 10 * COIN);
+
+    tx.vin[0].prevout.hash = hashFreeParent;
+    tx.vout[0].nValue = 5000000000LL; // 0 fee
+    uint256 hashFreeChild = tx.GetHash();
+    m_node.mempool->addUnchecked(entry.Fee(0).SpendsCoinbase(false).FromTx(tx));
+    m_node.mempool->PrioritiseTransaction(hashFreeChild, 1 * COIN);
+
+    tx.vin[0].prevout.hash = hashFreeChild;
+    tx.vout[0].nValue = 5000000000LL; // 0 fee
+    uint256 hashFreeGrandchild = tx.GetHash();
+    m_node.mempool->addUnchecked(entry.Fee(0).SpendsCoinbase(false).FromTx(tx));
+
+    auto pblocktemplate = AssemblerForTest(chainparams).CreateNewBlock(scriptPubKey);
+    BOOST_REQUIRE_EQUAL(pblocktemplate->block.vtx.size(), 6U);
+    BOOST_CHECK(pblocktemplate->block.vtx[1]->GetHash() == hashFreeParent);
+    BOOST_CHECK(pblocktemplate->block.vtx[2]->GetHash() == hashFreePrioritisedTx);
+    BOOST_CHECK(pblocktemplate->block.vtx[3]->GetHash() == hashParentTx);
+    BOOST_CHECK(pblocktemplate->block.vtx[4]->GetHash() == hashPrioritsedChild);
+    BOOST_CHECK(pblocktemplate->block.vtx[5]->GetHash() == hashFreeChild);
+    for (size_t i=0; i<pblocktemplate->block.vtx.size(); ++i) {
+        // The FreeParent and FreeChild's prioritisations should not impact the child.
+        BOOST_CHECK(pblocktemplate->block.vtx[i]->GetHash() != hashFreeGrandchild);
+        // De-prioritised transaction should not be included.
+        BOOST_CHECK(pblocktemplate->block.vtx[i]->GetHash() != hashMediumFeeTx);
+    }
+}
+
+// NOTE: These tests rely on CreateNewBlock doing its own self-validation!
+BOOST_AUTO_TEST_CASE(CreateNewBlock_validity)
+{
+    // Note that by default, these tests run with size accounting enabled.
+    const auto chainParams = CreateChainParams(*m_node.args, CBaseChainParams::MAIN);
+    const CChainParams& chainparams = *chainParams;
+    CScript scriptPubKey = CScript() << ParseHex("04678afdb0fe5548271967f1a67130b7105cd6a828e03909a67962e0ea1f61deb649f6bc3f4cef38c4f35504e51ec112de5c384df7ba0b8d578a4c702b6bf11d5f") << OP_CHECKSIG;
+    std::unique_ptr<CBlockTemplate> pblocktemplate, pemptyblocktemplate;
+
+    fCheckpointsEnabled = false;
+
+    // Simple block creation, nothing special yet:
+    BOOST_CHECK(pemptyblocktemplate = AssemblerForTest(chainparams).CreateNewBlock(scriptPubKey));
+
+    // We can't make transactions until we have inputs
+    // Therefore, load 100 blocks :)
+    int baseheight = 0;
+    std::vector<CTransactionRef> txFirst;
+
+    auto createAndProcessEmptyBlock = [&]() {
+        int i = m_node.chainman->ActiveChain().Height() % blockinfo_size;
+        CBlock *pblock = &pemptyblocktemplate->block; // pointer for convenience
+        {
+            LOCK(cs_main);
+            pblock->nVersion = VERSIONBITS_TOP_BITS;
+            pblock->nTime = m_node.chainman->ActiveChain().Tip()->GetMedianTimePast()+1;
+            CMutableTransaction txCoinbase(*pblock->vtx[0]);
+            txCoinbase.nVersion = 1;
+            txCoinbase.vin[0].scriptSig = CScript{} << (m_node.chainman->ActiveChain().Height() + 1) << BLOCKINFO[i].extranonce;
+            txCoinbase.vout[0].scriptPubKey = CScript();
+            pblock->vtx[0] = MakeTransactionRef(std::move(txCoinbase));
+            if (txFirst.size() == 0)
+                baseheight = m_node.chainman->ActiveChain().Height();
+            if (txFirst.size() < 4)
+                txFirst.push_back(pblock->vtx[0]);
+            pblock->hashMerkleRoot = BlockMerkleRoot(*pblock);
+            pblock->nNonce = BLOCKINFO[i].nonce;
+
+            // This will usually succeed in the first round as we take the nonce from BLOCKINFO
+            // It's however useful when adding new blocks with unknown nonces (you should add the found block to BLOCKINFO)
+            while (!CheckProofOfWork(pblock->GetHash(), pblock->nBits, chainparams.GetConsensus())) {
+                pblock->nNonce++;
+            }
+        }
+        std::shared_ptr<const CBlock> shared_pblock = std::make_shared<const CBlock>(*pblock);
+        BOOST_CHECK(Assert(m_node.chainman)->ProcessNewBlock(chainparams, shared_pblock, true, nullptr));
+        pblock->hashPrevBlock = pblock->GetHash();
+    };
+
+    for ([[maybe_unused]] const auto& _ : BLOCKINFO) {
+        createAndProcessEmptyBlock();
+    }
+
+
+    {
+    LOCK(cs_main);
+    LOCK(m_node.mempool->cs);
+
+    TestBasicMining(chainparams, scriptPubKey, txFirst, baseheight);
     }
 
     // Mine an empty block
@@ -554,6 +638,12 @@ BOOST_AUTO_TEST_CASE(CreateNewBlock_validity)
     LOCK2(cs_main, m_node.mempool->cs);
     TestPackageSelection(chainparams, scriptPubKey, txFirst);
 
+    m_node.chainman->ActiveChain().Tip()->nHeight--;
+    SetMockTime(0);
+    m_node.mempool->clear();
+
+    TestPrioritisedMining(chainparams, scriptPubKey, txFirst);
+
     fCheckpointsEnabled = true;
 }
 

From b8a20d917454f0089814ab151451fea7147c4a06 Mon Sep 17 00:00:00 2001
From: fanquake <fanquake@gmail.com>
Date: Sun, 1 May 2022 12:08:37 +0100
Subject: [PATCH 208/656] Merge bitcoin/bitcoin#25043: Reject invalid rpcauth
 formats

fa12706fc6dbaf82eca37f30afa07c37fcd44932 Reject invalid rpcauth formats (MacroFake)

Pull request description:

  This was added in commit 438ee59839ad49bf629452279478462c987b7137, but I couldn't determine if it was intentional.

  One reason to accept `foo:bar:baz` over `foo:bar$baz` is that `$` may be eaten by the shell. Though, I don't think many users pass `rpcauth` via the shell. Also it should be easy to avoid by passing `'-rpcauth=foo:bar$baz'` or `"-rpcauth=foo:bar\$baz"`.

  Can be tested with the added test.

ACKs for top commit:
  pk-b2:
    ACK fa12706fc6dbaf82eca37f30afa07c37fcd44932

Tree-SHA512: 9998cbb295c79f7b0342bf86e1d3e5b5ab90851c627662ad6495b699a65a9035998173cf1debfd94325387faba184de683407b609fe86acdd8f6749157644441
---
 src/httprpc.cpp              | 13 +++++++------
 test/functional/rpc_users.py |  3 +++
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/src/httprpc.cpp b/src/httprpc.cpp
index 22c1be063a8b..46cb1041c23e 100644
--- a/src/httprpc.cpp
+++ b/src/httprpc.cpp
@@ -4,7 +4,6 @@
 
 #include <httprpc.h>
 
-#include <chainparams.h>
 #include <crypto/hmac_sha256.h>
 #include <httpserver.h>
 #include <rpc/protocol.h>
@@ -12,7 +11,6 @@
 #include <util/strencodings.h>
 #include <util/string.h>
 #include <util/system.h>
-#include <util/translation.h>
 #include <walletinitinterface.h>
 
 #include <algorithm>
@@ -21,6 +19,7 @@
 #include <memory>
 #include <set>
 #include <string>
+#include <vector>
 
 /** WWW-Authenticate to present with 401 Unauthorized response */
 static const char* WWW_AUTH_HEADER_DATA = "Basic realm=\"jsonrpc\"";
@@ -288,12 +287,14 @@ static bool InitRPCAuthentication()
         LogPrintf("Config options rpcuser and rpcpassword will soon be deprecated. Locally-run instances may remove rpcuser to use cookie-based auth, or may be replaced with rpcauth. Please see share/rpcauth for rpcauth auth generation.\n");
         strRPCUserColonPass = gArgs.GetArg("-rpcuser", "") + ":" + gArgs.GetArg("-rpcpassword", "");
     }
-    if (gArgs.GetArg("-rpcauth","") != "")
-    {
+    if (gArgs.GetArg("-rpcauth", "") != "") {
         LogPrintf("Using rpcauth authentication.\n");
         for (const std::string& rpcauth : gArgs.GetArgs("-rpcauth")) {
-            std::vector<std::string> fields = SplitString(rpcauth, ":$");
-            if (fields.size() == 3) {
+            std::vector<std::string> fields{SplitString(rpcauth, ':')};
+            const std::vector<std::string> salt_hmac{SplitString(fields.back(), '$')};
+            if (fields.size() == 2 && salt_hmac.size() == 2) {
+                fields.pop_back();
+                fields.insert(fields.end(), salt_hmac.begin(), salt_hmac.end());
                 g_rpcauth.push_back(fields);
             } else {
                 LogPrintf("Invalid -rpcauth argument.\n");
diff --git a/test/functional/rpc_users.py b/test/functional/rpc_users.py
index 8889adca14e1..e8fe872bf5d5 100755
--- a/test/functional/rpc_users.py
+++ b/test/functional/rpc_users.py
@@ -106,6 +106,9 @@ def run_test(self):
         self.stop_node(0)
         self.nodes[0].assert_start_raises_init_error(expected_msg=init_error, extra_args=['-rpcauth=foo'])
         self.nodes[0].assert_start_raises_init_error(expected_msg=init_error, extra_args=['-rpcauth=foo:bar'])
+        self.nodes[0].assert_start_raises_init_error(expected_msg=init_error, extra_args=['-rpcauth=foo:bar:baz'])
+        self.nodes[0].assert_start_raises_init_error(expected_msg=init_error, extra_args=['-rpcauth=foo$bar:baz'])
+        self.nodes[0].assert_start_raises_init_error(expected_msg=init_error, extra_args=['-rpcauth=foo$bar$baz'])
 
         self.log.info('Check that failure to write cookie file will abort the node gracefully')
         cookie_file = os.path.join(get_datadir_path(self.options.tmpdir, 0), self.chain, '.cookie.tmp')

From 9dc33607b63d14990fb3ca0c0e34ecf3cd7d0409 Mon Sep 17 00:00:00 2001
From: laanwj <126646+laanwj@users.noreply.github.com>
Date: Wed, 4 May 2022 21:09:04 +0200
Subject: [PATCH 209/656] Merge bitcoin/bitcoin#22235: script: add script to
 generate example bitcoin.conf

b42643c2537ffbe99d6d94fb1fb3b7f9d5234f93 doc: update init.cpp -conf help text (josibake)
970b9987ad5bcb72e581c40a7cdd408d94a48c81 doc: update devtools, release-process readmes (josibake)
50635d27b45d125b6264ac2abfbd6a1129c7228f build: include bitcoin.conf in build outputs (josibake)
6aac946f49aea243de1dc50631bb72f0186bbf58 doc: update bitcoin-conf.md (Josiah Baker)
1c7e820ded0846ef6ab4be9616b0de452336ef64 script: add script to generate example bitcoin.conf (josibake)
b483084d866c16d97a34251ae652bac94f85f61d doc: replace bitcoin.conf with placeholder file (josibake)

Pull request description:

  create a script for parsing the output from `bitcoind --help` to create an example conf file for new users

  ## problem

  per #10746 , `bitcoin.conf` not being put into the data directory during installation causes some confusion for users when running bitcoin. in the discussion on the issue, one proposed solution was to have an example config file and instruct users to `cp` it into their data directory after startup. in addition to #10746 , there have been other requests for a "skeleton config file" (https://github.com/bitcoin/bitcoin/issues/19641) to help users get started with configuring bitcoind.

  the main issue with an example config file is that it creates a second source of truth regarding what options are available for configuring bitcoind. this means any changes to the options (including the addition or removal of options) would have to be updated for the command line and also updated in the example file.

  this PR addresses this issue by providing a script to generate an example file directly from the `bitcoind --help` on-demand by running `contrib/devtools/gen-bitcoin-conf.sh`. this solution was originally proposed on #10746 and would also solve #19641 . this guarantees any changes made to the command-line options or the command-line options help would also be reflected in the example file after compiling and running the script.

  the main purpose of this script is to generate a config file to be included with releases, same as `gen-manpages.sh`. this ensures every release also includes an up-to-date, full example config file for users to edit. the script is also available for users who compile from source for generating an example config for their compiled binary.

  ## special considerations

  this removes the `bitcoin.conf` example file from the repo as it is now generated by this script. the original example file did contain extra text related to how to use certain options but going forward all option help docs should be moved into `init.cpp`

  this also edits `init.cpp` to have the option help indicate that `-conf` is not usable from the config file. this is similar to how `-includeconf` 's help indicates it cannot be used from the command line

ACKs for top commit:
  laanwj:
    Tested and code review ACK b42643c2537ffbe99d6d94fb1fb3b7f9d5234f93

Tree-SHA512: 4546e0cef92aa1398da553294ce4712d02e616dd72dcbe0b921af474e54f24750464ec813661f1283802472d1e8774e634dd1cc26fbf1f13286d3e0406c02c09
---
 contrib/debian/examples/dash.conf | 186 +-----------------------------
 contrib/devtools/README.md        |  15 +++
 contrib/devtools/gen-dash-conf.sh |  80 +++++++++++++
 contrib/guix/libexec/build.sh     |   4 +
 doc/dash-conf.md                  |  10 +-
 doc/release-process.md            |   5 +-
 src/init.cpp                      |   2 +-
 7 files changed, 113 insertions(+), 189 deletions(-)
 create mode 100755 contrib/devtools/gen-dash-conf.sh

diff --git a/contrib/debian/examples/dash.conf b/contrib/debian/examples/dash.conf
index 3bb5690ca496..22965bc6c000 100644
--- a/contrib/debian/examples/dash.conf
+++ b/contrib/debian/examples/dash.conf
@@ -1,185 +1 @@
-##
-## dash.conf configuration file. Lines beginning with # are comments.
-##
-
-# Network-related settings:
-
-# Note that if you use testnet or regtest, particularly with the options
-# addnode, connect, port, bind, rpcport, rpcbind or wallet, you will also
-# want to read "[Sections]" further down.
-
-# Run on the test network instead of the real dash network.
-#testnet=0
-
-# Run a regression test network
-#regtest=0
-
-# Connect via a SOCKS5 proxy
-#proxy=127.0.0.1:9050
-
-# Bind to given address and always listen on it. Use [host]:port notation for IPv6
-#bind=<addr>
-
-# Bind to given address and add permission flags to peers connecting to it. Use [host]:port notation for IPv6
-#whitebind=perm@<addr>
-
-##############################################################
-##            Quick Primer on addnode vs connect            ##
-##  Let's say for instance you use addnode=4.2.2.4          ##
-##  addnode will connect you to and tell you about the      ##
-##    nodes connected to 4.2.2.4.  In addition it will tell ##
-##    the other nodes connected to it that you exist so     ##
-##    they can connect to you.                              ##
-##  connect will not do the above when you 'connect' to it. ##
-##    It will *only* connect you to 4.2.2.4 and no one else.##
-##                                                          ##
-##  So if you're behind a firewall, or have other problems  ##
-##  finding nodes, add some using 'addnode'.                ##
-##                                                          ##
-##  If you want to stay private, use 'connect' to only      ##
-##  connect to "trusted" nodes.                             ##
-##                                                          ##
-##  If you run multiple nodes on a LAN, there's no need for ##
-##  all of them to open lots of connections.  Instead       ##
-##  'connect' them all to one node that is port forwarded   ##
-##  and has lots of connections.                            ##
-##       Thanks goes to [Noodle] on Freenode.               ##
-##############################################################
-
-# Use as many addnode= settings as you like to connect to specific peers
-#addnode=69.164.218.197
-#addnode=10.0.0.2:9999
-
-# Alternatively use as many connect= settings as you like to connect ONLY to specific peers
-#connect=69.164.218.197
-#connect=10.0.0.1:9999
-
-# Listening mode, enabled by default except when 'connect' is being used
-#listen=1
-
-# Port on which to listen for connections (default: 9999, testnet: 19999, regtest: 19899)
-#port=
-
-# Maximum number of inbound + outbound connections (default: 125). This option
-# applies only if inbound connections are enabled; otherwise, the number of connections
-# will not be more than 11: 8 full-relay connections, 2 block-relay-only ones, and
-# occasionally 1 short-lived feeler or extra outbound block-relay-only connection.
-# These limits do not apply to connections added manually with the -addnode
-# configuration option or the addnode RPC, which have a separate limit of 8 connections.
-#maxconnections=
-
-# Maximum upload bandwidth target in MiB per day (e.g. 'maxuploadtarget=1024' is 1 GiB per day).
-# This limits the upload bandwidth for those with bandwidth limits. 0 = no limit (default: 0).
-# -maxuploadtarget does not apply to peers with 'download' permission.
-# For more information on reducing bandwidth utilization, see: doc/reduce-traffic.md.
-#maxuploadtarget=
-
-#
-# JSON-RPC options (for controlling a running Dash/dashd process)
-#
-
-# server=1 tells Dash-Qt and dashd to accept JSON-RPC commands
-#server=0
-
-# Bind to given address to listen for JSON-RPC connections.
-# Refer to the manpage or dashd -help for further details.
-#rpcbind=<addr>
-
-# If no rpcpassword is set, rpc cookie auth is sought. The default `-rpccookiefile` name
-# is .cookie and found in the `-datadir` being used for dashd. This option is typically used
-# when the server and client are run as the same user.
-#
-# If not, you must set rpcuser and rpcpassword to secure the JSON-RPC API.
-#
-# The config option `rpcauth` can be added to server startup argument. It is set at initialization time
-# using the output from the script in share/rpcauth/rpcauth.py after providing a username:
-#
-# ./share/rpcauth/rpcauth.py alice
-# String to be appended to dash.conf:
-# rpcauth=alice:f7efda5c189b999524f151318c0c86$d5b51b3beffbc02b724e5d095828e0bc8b2456e9ac8757ae3211a5d9b16a22ae
-# Your password:
-# DONT_USE_THIS_YOU_WILL_GET_ROBBED_8ak1gI25KFTvjovL3gAM967mies3E=
-#
-# On client-side, you add the normal user/password pair to send commands:
-#rpcuser=alice
-#rpcpassword=DONT_USE_THIS_YOU_WILL_GET_ROBBED_8ak1gI25KFTvjovL3gAM967mies3E=
-#
-# You can even add multiple entries of these to the server conf file, and client can use any of them:
-# rpcauth=bob:b2dd077cb54591a2f3139e69a897ac$4e71f08d48b4347cf8eff3815c0e25ae2e9a4340474079f55705f40574f4ec99
-
-# How many seconds Dash Core will wait for a complete RPC HTTP request.
-# after the HTTP connection is established.
-#rpcclienttimeout=30
-
-# By default, only RPC connections from localhost are allowed.
-# Specify as many rpcallowip= settings as you like to allow connections from other hosts,
-# either as a single IPv4/IPv6 or with a subnet specification.
-
-# NOTE: opening up the RPC port to hosts outside your local trusted network is NOT RECOMMENDED,
-# because the rpcpassword is transmitted over the network unencrypted.
-
-# server=1 tells Dash-Qt to accept JSON-RPC commands.
-# it is also read by dashd to determine if RPC should be enabled
-#rpcallowip=10.1.1.34/255.255.255.0
-#rpcallowip=1.2.3.4/24
-#rpcallowip=2001:db8:85a3:0:0:8a2e:370:7334/96
-
-# Listen for RPC connections on this TCP port:
-#rpcport=9998
-
-# You can use Dash or dashd to send commands to Dash/dashd
-# running on another host using this option:
-#rpcconnect=127.0.0.1
-
-# Wallet options
-
-# Specify where to find wallet, lockfile and logs. If not present, those files will be
-# created as new.
-#wallet=</path/to/dir>
-
-# Create transactions that have enough fees so they are likely to begin confirmation within n blocks (default: 6).
-# This setting is over-ridden by the -paytxfee option.
-#txconfirmtarget=n
-
-# Pay a transaction fee every time you send dash.
-#paytxfee=0.000x
-
-# Miscellaneous options
-
-# Pre-generate this many public/private key pairs, so wallet backups will be valid for
-# both prior transactions and several dozen future transactions.
-#keypool=100
-
-# Maintain coinstats index used by the gettxoutsetinfo RPC (default: 0).
-#coinstatsindex=1
-
-# Enable pruning to reduce storage requirements by deleting old blocks.
-# This mode is incompatible with -txindex, -coinstatsindex and -rescan.
-# 0 = default (no pruning).
-# 1 = allows manual pruning via RPC.
-# >=945 = target to stay under in MiB.
-#prune=945
-
-# User interface options
-
-# Start Dash minimized
-#min=1
-
-# Minimize to the system tray
-#minimizetotray=1
-
-# [Sections]
-# Most options apply to mainnet, testnet and regtest.
-# If you want to confine an option to just one network, you should add it in the
-# relevant section below.
-# EXCEPTIONS: The options addnode, connect, port, bind, rpcport, rpcbind and wallet
-# only apply to mainnet unless they appear in the appropriate section below.
-
-# Options only for mainnet
-[main]
-
-# Options only for testnet
-[test]
-
-# Options only for regtest
-[regtest]
+# This is a placeholder file. Please follow the instructions in `contrib/devtools/README.md` to generate a dash.conf file.
diff --git a/contrib/devtools/README.md b/contrib/devtools/README.md
index 4aadde68ab4b..31cc1f032c77 100644
--- a/contrib/devtools/README.md
+++ b/contrib/devtools/README.md
@@ -90,6 +90,21 @@ example:
 BUILDDIR=$PWD/build contrib/devtools/gen-manpages.py
 ```
 
+gen-dash-conf.sh
+===================
+
+Generates a dash.conf file in `contrib/debian/examples/` by parsing the output from `dashd --help`. This script is run during the
+release process to include a dash.conf with the release binaries and can also be run by users to generate a file locally.
+When generating a file as part of the release process, make sure to commit the changes after running the script.
+
+With in-tree builds this tool can be run from any directory within the
+repository. To use this tool with out-of-tree builds set `BUILDDIR`. For
+example:
+
+```bash
+BUILDDIR=$PWD/build contrib/devtools/gen-dash-conf.sh
+```
+
 github-merge.py
 ===============
 
diff --git a/contrib/devtools/gen-dash-conf.sh b/contrib/devtools/gen-dash-conf.sh
new file mode 100755
index 000000000000..ebc93daf75a8
--- /dev/null
+++ b/contrib/devtools/gen-dash-conf.sh
@@ -0,0 +1,80 @@
+#!/usr/bin/env bash
+# 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.
+
+export LC_ALL=C
+TOPDIR=${TOPDIR:-$(git rev-parse --show-toplevel)}
+BUILDDIR=${BUILDDIR:-$TOPDIR}
+BINDIR=${BINDIR:-$BUILDDIR/src}
+DASHD=${DASHD:-$BINDIR/dashd}
+SHARE_EXAMPLES_DIR=${SHARE_EXAMPLES_DIR:-$TOPDIR/contrib/debian/examples/}
+EXAMPLE_CONF_FILE=${EXAMPLE_CONF_FILE:-$SHARE_EXAMPLES_DIR/dash.conf}
+
+[ ! -x "$DASHD" ] && echo "$DASHD not found or not executable." && exit 1
+
+DIRTY=""
+VERSION_OUTPUT=$($DASHD --version)
+if [[ $VERSION_OUTPUT == *"dirty"* ]]; then
+  DIRTY="${DIRTY}${DASHD}\n"
+fi
+
+if [ -n "$DIRTY" ]
+then
+  echo -e "WARNING: $DASHD was built from a dirty tree.\n"
+  echo -e "To safely generate a dash.conf file, please commit your changes to $DASHD, rebuild, then run this script again.\n"
+fi
+
+echo 'Generating example dash.conf file in contrib/debian/examples/'
+
+# create the directory, if it doesn't exist
+mkdir -p "${SHARE_EXAMPLES_DIR}"
+
+# create the header text
+cat > "${EXAMPLE_CONF_FILE}" << 'EOF'
+##
+## dash.conf configuration file.
+## Generated by contrib/devtools/gen-dash-conf.sh.
+##
+## Lines beginning with # are comments.
+## All possible configuration options are provided. To use, copy this file
+## to your data directory (default or specified by -datadir), uncomment
+## options you would like to change, and save the file.
+##
+
+
+### Options
+EOF
+
+# parse the output from dashd --help
+# adding newlines is a bit funky to ensure portability for BSD
+# see here for more details: https://stackoverflow.com/a/24575385
+${DASHD} --help \
+    | sed '1,/Print this help message and exit/d' \
+    | sed -E 's/^[[:space:]]{2}\-/#/' \
+    | sed -E 's/^[[:space:]]{7}/# /' \
+    | sed -E '/[=[:space:]]/!s/#.*$/&=1/' \
+    | awk '/^#[a-z]/{x=$0;next}{if (NF==0) print x"\n",x="";else print}' \
+    | sed 's,\(^[[:upper:]].*\)\:$,\
+### \1,' \
+    | sed 's/[[:space:]]*$//' >> "${EXAMPLE_CONF_FILE}"
+
+# create the footer text
+cat >> "${EXAMPLE_CONF_FILE}" << 'EOF'
+
+# [Sections]
+# Most options will apply to all networks. To confine an option to a specific
+# network, add it under the relevant section below.
+#
+# Note: If not specified under a network section, the options addnode, connect,
+# port, bind, rpcport, rpcbind, and wallet will only apply to mainnet.
+
+# Options for mainnet
+[main]
+
+# Options for testnet
+[test]
+
+# Options for regtest
+[regtest]
+EOF
diff --git a/contrib/guix/libexec/build.sh b/contrib/guix/libexec/build.sh
index 1bb910b7cc4a..8f9a0fdcc25b 100755
--- a/contrib/guix/libexec/build.sh
+++ b/contrib/guix/libexec/build.sh
@@ -355,6 +355,10 @@ mkdir -p "$DISTSRC"
                 ;;
         esac
 
+        # copy over the example dash.conf file. if contrib/devtools/gen-dash-conf.sh
+        # has not been run before buildling, this file will be a stub
+        cp "${DISTSRC}/contrib/debian/examples/dash.conf" "${DISTNAME}/"
+
         # Finally, deterministically produce {non-,}debug binary tarballs ready
         # for release
         case "$HOST" in
diff --git a/doc/dash-conf.md b/doc/dash-conf.md
index 13fa0ab70889..3d1c9580948d 100644
--- a/doc/dash-conf.md
+++ b/doc/dash-conf.md
@@ -63,4 +63,12 @@ Windows | `%APPDATA%\DashCore\` | `C:\Users\username\AppData\Roaming\DashCore\da
 Linux | `$HOME/.dashcore/` | `/home/username/.dashcore/dash.conf`
 macOS | `$HOME/Library/Application Support/DashCore/` | `/Users/username/Library/Application Support/DashCore/dash.conf`
 
-You can find an example dash.conf file in [share/examples/dash.conf](../share/examples/dash.conf).
+An example configuration file can be generated by [contrib/devtools/gen-dash-conf.sh](../contrib/devtools/gen-dash-conf.sh).
+Run this script after compiling to generate an up-to-date configuration file.
+The output is placed under `contrib/debian/examples/dash.conf`.
+To use the generated configuration file, copy the example file into your data directory and edit it there, like so:
+
+```
+# example copy command for linux user
+cp contrib/debian/examples/dash.conf ~/.dashcore
+```
diff --git a/doc/release-process.md b/doc/release-process.md
index 2390badea11f..846086929194 100644
--- a/doc/release-process.md
+++ b/doc/release-process.md
@@ -1,8 +1,9 @@
 Release Process
 ====================
 
-* [ ] Update translations, see [translation_process.md](https://github.com/dashpay/dash/blob/master/doc/translation_process.md#synchronising-translations).
-* [ ] Update manpages (after rebuilding the binaries), see [gen-manpages.py](https://github.com/bitcoin/bitcoin/blob/master/contrib/devtools/README.md#gen-manpagespy).
+* [ ] Update translations, see [translation_process.md](https://github.com/dashpay/dash/blob/develop/doc/translation_process.md#synchronising-translations).
+* [ ] Update manpages (after rebuilding the binaries), see [gen-manpages.py](https://github.com/dashpay/dash/blob/develop/contrib/devtools/README.md#gen-manpagespy).
+* [ ] Update dash.conf and commit, see [gen-dash-conf.sh](https://github.com/dashpay/dash/blob/develop/contrib/devtools/README.md#gen-dash-confsh).
 
 Before every minor and major release:
 
diff --git a/src/init.cpp b/src/init.cpp
index e8028aa0a354..1b2a4072de05 100644
--- a/src/init.cpp
+++ b/src/init.cpp
@@ -520,7 +520,7 @@ void SetupServerArgs(ArgsManager& argsman)
     argsman.AddArg("-chainlocknotify=<cmd>", "Execute command when the best chainlock changes (%s in cmd is replaced by chainlocked block hash)", ArgsManager::ALLOW_ANY, OptionsCategory::OPTIONS);
 #endif
     argsman.AddArg("-coinstatsindex", strprintf("Maintain coinstats index used by the gettxoutsetinfo RPC (default: %u)", DEFAULT_COINSTATSINDEX), ArgsManager::ALLOW_ANY, OptionsCategory::OPTIONS);
-    argsman.AddArg("-conf=<file>", strprintf("Specify path to read-only configuration file. Relative paths will be prefixed by datadir location. (default: %s)", BITCOIN_CONF_FILENAME), ArgsManager::ALLOW_ANY, OptionsCategory::OPTIONS);
+    argsman.AddArg("-conf=<file>", strprintf("Specify path to read-only configuration file. Relative paths will be prefixed by datadir location (only useable from command line, not configuration file) (default: %s)", BITCOIN_CONF_FILENAME), ArgsManager::ALLOW_ANY, OptionsCategory::OPTIONS);
     argsman.AddArg("-datadir=<dir>", "Specify data directory", ArgsManager::ALLOW_ANY, OptionsCategory::OPTIONS);
     argsman.AddArg("-dbbatchsize", strprintf("Maximum database write batch size in bytes (default: %u)", nDefaultDbBatchSize), ArgsManager::ALLOW_ANY | ArgsManager::DEBUG_ONLY, OptionsCategory::OPTIONS);
     argsman.AddArg("-dbcache=<n>", strprintf("Maximum database cache size <n> MiB (%d to %d, default: %d). In addition, unused mempool memory is shared for this cache (see -maxmempool).", nMinDbCache, nMaxDbCache, nDefaultDbCache), ArgsManager::ALLOW_ANY, OptionsCategory::OPTIONS);

From 9f617e3a8b90efd60ff41c29965062f86b03d20c Mon Sep 17 00:00:00 2001
From: Konstantin Akimov <knstqq@gmail.com>
Date: Tue, 21 Oct 2025 00:05:57 +0700
Subject: [PATCH 210/656] fix: remove mentioning of BIP-125

---
 src/init.cpp                               | 5 ++---
 src/policy/policy.h                        | 2 +-
 src/wallet/test/wallet_tests.cpp           | 1 -
 src/wallet/wallet.h                        | 2 --
 test/functional/test_framework/messages.py | 2 +-
 5 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/src/init.cpp b/src/init.cpp
index 0753588739f1..e8f89056a96a 100644
--- a/src/init.cpp
+++ b/src/init.cpp
@@ -747,7 +747,7 @@ void SetupServerArgs(ArgsManager& argsman)
 
     argsman.AddArg("-acceptnonstdtxn", strprintf("Relay and mine \"non-standard\" transactions (%sdefault: %u)", "testnet/regtest only; ", !testnetChainParams->RequireStandard()), ArgsManager::ALLOW_ANY | ArgsManager::DEBUG_ONLY, OptionsCategory::NODE_RELAY);
     argsman.AddArg("-dustrelayfee=<amt>", strprintf("Fee rate (in %s/kB) used to define dust, the value of an output such that it will cost more than its value in fees at this fee rate to spend it. (default: %s)", CURRENCY_UNIT, FormatMoney(DUST_RELAY_TX_FEE)), ArgsManager::ALLOW_ANY | ArgsManager::DEBUG_ONLY, OptionsCategory::NODE_RELAY);
-    argsman.AddArg("-incrementalrelayfee=<amt>", strprintf("Fee rate (in %s/kB) used to define cost of relay, used for mempool limiting and BIP 125 replacement. (default: %s)", CURRENCY_UNIT, FormatMoney(DEFAULT_INCREMENTAL_RELAY_FEE)), ArgsManager::ALLOW_ANY | ArgsManager::DEBUG_ONLY, OptionsCategory::NODE_RELAY);
+    argsman.AddArg("-incrementalrelayfee=<amt>", strprintf("Fee rate (in %s/kB) used to define cost of relay, used for mempool limiting. (default: %s)", CURRENCY_UNIT, FormatMoney(DEFAULT_INCREMENTAL_RELAY_FEE)), ArgsManager::ALLOW_ANY | ArgsManager::DEBUG_ONLY, OptionsCategory::NODE_RELAY);
     argsman.AddArg("-bytespersigop", strprintf("Equivalent bytes per sigop in transactions for relay and mining (default: %u)", DEFAULT_BYTES_PER_SIGOP), ArgsManager::ALLOW_ANY, OptionsCategory::NODE_RELAY);
     argsman.AddArg("-datacarrier", strprintf("Relay and mine data carrier transactions (default: %u)", DEFAULT_ACCEPT_DATACARRIER), ArgsManager::ALLOW_ANY, OptionsCategory::NODE_RELAY);
     argsman.AddArg("-datacarriersize", strprintf("Maximum size of data in data carrier transactions we relay and mine (default: %u)", MAX_OP_RETURN_RELAY), ArgsManager::ALLOW_ANY, OptionsCategory::NODE_RELAY);
@@ -1255,8 +1255,7 @@ bool AppInitParameterInteraction(const ArgsManager& args)
     int64_t nMempoolSizeMin = args.GetIntArg("-limitdescendantsize", DEFAULT_DESCENDANT_SIZE_LIMIT) * 1000 * 40;
     if (nMempoolSizeMax < 0 || nMempoolSizeMax < nMempoolSizeMin)
         return InitError(strprintf(_("-maxmempool must be at least %d MB"), std::ceil(nMempoolSizeMin / 1000000.0)));
-    // incremental relay fee sets the minimum feerate increase necessary for BIP 125 replacement in the mempool
-    // and the amount the mempool min fee increases above the feerate of txs evicted due to mempool limiting.
+    // incremental relay fee sets the amount the mempool min fee increases above the feerate of txs evicted due to mempool limiting.
     if (args.IsArgSet("-incrementalrelayfee")) {
         if (std::optional<CAmount> inc_relay_fee = ParseMoney(args.GetArg("-incrementalrelayfee", ""))) {
             ::incrementalRelayFee = CFeeRate{inc_relay_fee.value()};
diff --git a/src/policy/policy.h b/src/policy/policy.h
index c83bab928dbb..838f35306498 100644
--- a/src/policy/policy.h
+++ b/src/policy/policy.h
@@ -33,7 +33,7 @@ static constexpr unsigned int MAX_P2SH_SIGOPS{15};
 static constexpr unsigned int MAX_STANDARD_TX_SIGOPS{4000};
 /** Default for -maxmempool, maximum megabytes of mempool memory usage */
 static constexpr unsigned int DEFAULT_MAX_MEMPOOL_SIZE{300};
-/** Default for -incrementalrelayfee, which sets the minimum feerate increase for mempool limiting or BIP 125 replacement **/
+/** Default for -incrementalrelayfee, which sets the minimum feerate increase for mempool limiting **/
 static constexpr unsigned int DEFAULT_INCREMENTAL_RELAY_FEE{1000};
 /** Default for -bytespersigop */
 static constexpr unsigned int DEFAULT_BYTES_PER_SIGOP{20};
diff --git a/src/wallet/test/wallet_tests.cpp b/src/wallet/test/wallet_tests.cpp
index 5912d59dbcaa..13fed41d8f7f 100644
--- a/src/wallet/test/wallet_tests.cpp
+++ b/src/wallet/test/wallet_tests.cpp
@@ -49,7 +49,6 @@ extern RPCHelpMan addmultisigaddress();
 // Ensure that fee levels defined in the wallet are at least as high
 // as the default levels for node policy.
 static_assert(DEFAULT_TRANSACTION_MINFEE >= DEFAULT_MIN_RELAY_TX_FEE, "wallet minimum fee is smaller than default relay fee");
-static_assert(WALLET_INCREMENTAL_RELAY_FEE >= DEFAULT_INCREMENTAL_RELAY_FEE, "wallet incremental fee is smaller than default incremental relay fee");
 
 BOOST_FIXTURE_TEST_SUITE(wallet_tests, WalletTestingSetup)
 
diff --git a/src/wallet/wallet.h b/src/wallet/wallet.h
index 2de6a6899a43..8e43ce6d63ba 100644
--- a/src/wallet/wallet.h
+++ b/src/wallet/wallet.h
@@ -99,8 +99,6 @@ static const CAmount DEFAULT_CONSOLIDATE_FEERATE{1000}; // 10 sat/vbyte
 static const CAmount DEFAULT_MAX_AVOIDPARTIALSPEND_FEE = 0;
 //! discourage APS fee higher than this amount
 constexpr CAmount HIGH_APS_FEE{COIN / 10000};
-//! minimum recommended increment for BIP 125 replacement txs
-static const CAmount WALLET_INCREMENTAL_RELAY_FEE = 5000;
 //! Default for -spendzeroconfchange
 static const bool DEFAULT_SPEND_ZEROCONF_CHANGE = true;
 //! Default for -walletrejectlongchains
diff --git a/test/functional/test_framework/messages.py b/test/functional/test_framework/messages.py
index 5bc74df2a07f..b22cb5475370 100755
--- a/test/functional/test_framework/messages.py
+++ b/test/functional/test_framework/messages.py
@@ -40,7 +40,7 @@
 COIN = 100000000  # 1 btc in satoshis
 MAX_MONEY = 21000000 * COIN
 
-BIP125_SEQUENCE_NUMBER = 0xfffffffd  # Sequence number that is BIP 125 opt-in and BIP 68-opt-out
+BIP125_SEQUENCE_NUMBER = 0xfffffffd  # Sequence number that is BIP 125 opt-in and BIP 68-opt-out -- not used in DASH
 SEQUENCE_FINAL = 0xffffffff  # Sequence number that disables nLockTime if set for every input of a tx
 
 MAX_PROTOCOL_MESSAGE_LENGTH = 3 * 1024 * 1024  # Maximum length of incoming protocol messages

From d87ea73533e6477441ad995347ea5b4fddf64f9b Mon Sep 17 00:00:00 2001
From: pasta <pasta@dashboost.org>
Date: Sat, 18 Oct 2025 11:21:42 -0500
Subject: [PATCH 211/656] perf: optimize public key aggregation in
 bls_batchverifier.h

---
 src/bls/bls_batchverifier.h | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

diff --git a/src/bls/bls_batchverifier.h b/src/bls/bls_batchverifier.h
index 282c2f869f61..954d4c2f2bd2 100644
--- a/src/bls/bls_batchverifier.h
+++ b/src/bls/bls_batchverifier.h
@@ -142,12 +142,11 @@ class CBLSBatchVerifier
         msgHashes.reserve(messages.size());
         pubKeys.reserve(messages.size());
 
-        for (const auto& p : byMessageHash) {
-            const auto& msgHash = p.first;
+        for (const auto& [msgHash, vec_message_it] : byMessageHash) {
+            std::vector<CBLSPublicKey> pubKeysToAggregate;
+            pubKeysToAggregate.reserve(vec_message_it.size());
 
-            CBLSPublicKey aggPubKey;
-
-            for (const auto& msgIt : p.second) {
+            for (const auto& msgIt : vec_message_it) {
                 const auto& msg = msgIt->second;
 
                 if (!dups.emplace(msg.msgId).second) {
@@ -160,13 +159,11 @@ class CBLSBatchVerifier
                     aggSig.AggregateInsecure(msg.sig);
                 }
 
-                if (!aggPubKey.IsValid()) {
-                    aggPubKey = msg.pubKey;
-                } else {
-                    aggPubKey.AggregateInsecure(msg.pubKey);
-                }
+                pubKeysToAggregate.push_back(msg.pubKey);
             }
 
+            CBLSPublicKey aggPubKey = CBLSPublicKey::AggregateInsecure(pubKeysToAggregate);
+
             if (!aggPubKey.IsValid()) {
                 // only duplicates for this msgHash
                 continue;

From e786b4ccd55d22faac9bc8624ce69de81a945974 Mon Sep 17 00:00:00 2001
From: Kittywhiskers Van Gogh <63189531+kwvg@users.noreply.github.com>
Date: Mon, 29 Sep 2025 16:17:41 +0000
Subject: [PATCH 212/656] refactor: move CDSTXManager out of CJContext

We moved CCoinJoinServer to ActiveContext and 2/3 members of CJContext
are conditionally initialized, let's move the unconditionally init'ed
member out so we can conditionally initialize the whole object.
---
 src/coinjoin/context.cpp                |  7 ++-
 src/coinjoin/context.h                  |  2 -
 src/dsnotificationinterface.cpp         | 70 +++++++++++--------------
 src/dsnotificationinterface.h           |  3 ++
 src/init.cpp                            | 22 ++++----
 src/net_processing.cpp                  | 50 +++++++++---------
 src/net_processing.h                    |  3 +-
 src/node/context.cpp                    |  1 +
 src/node/context.h                      |  2 +
 src/test/coinjoin_dstxmanager_tests.cpp |  4 +-
 src/test/denialofservice_tests.cpp      |  8 +--
 src/test/net_peer_connection_tests.cpp  |  2 +-
 src/test/util/setup_common.cpp          |  5 +-
 test/lint/lint-circular-dependencies.py |  1 -
 14 files changed, 88 insertions(+), 92 deletions(-)

diff --git a/src/coinjoin/context.cpp b/src/coinjoin/context.cpp
index 52884e802b0e..af343d6742cc 100644
--- a/src/coinjoin/context.cpp
+++ b/src/coinjoin/context.cpp
@@ -7,19 +7,18 @@
 #ifdef ENABLE_WALLET
 #include <coinjoin/client.h>
 #endif // ENABLE_WALLET
-#include <coinjoin/coinjoin.h>
 
 CJContext::CJContext(ChainstateManager& chainman, CDeterministicMNManager& dmnman, CMasternodeMetaMan& mn_metaman,
                      CTxMemPool& mempool, const CActiveMasternodeManager* const mn_activeman,
-                     const CMasternodeSync& mn_sync, const llmq::CInstantSendManager& isman, bool relay_txes) :
+                     const CMasternodeSync& mn_sync, const llmq::CInstantSendManager& isman, bool relay_txes)
 #ifdef ENABLE_WALLET
+    :
     walletman{std::make_unique<CoinJoinWalletManager>(chainman, dmnman, mn_metaman, mempool, mn_sync, isman, queueman,
                                                       /*is_masternode=*/mn_activeman != nullptr)},
     queueman{relay_txes ? std::make_unique<CCoinJoinClientQueueManager>(*walletman, dmnman, mn_metaman, mn_sync,
                                                                         /*is_masternode=*/mn_activeman != nullptr)
-                        : nullptr},
+                        : nullptr}
 #endif // ENABLE_WALLET
-    dstxman{std::make_unique<CDSTXManager>()}
 {}
 
 CJContext::~CJContext() {}
diff --git a/src/coinjoin/context.h b/src/coinjoin/context.h
index eb924f345772..8e71602928d2 100644
--- a/src/coinjoin/context.h
+++ b/src/coinjoin/context.h
@@ -13,7 +13,6 @@
 
 class CActiveMasternodeManager;
 class CDeterministicMNManager;
-class CDSTXManager;
 class ChainstateManager;
 class CMasternodeMetaMan;
 class CMasternodeSync;
@@ -40,7 +39,6 @@ struct CJContext {
     const std::unique_ptr<CoinJoinWalletManager> walletman;
     const std::unique_ptr<CCoinJoinClientQueueManager> queueman;
 #endif // ENABLE_WALLET
-    const std::unique_ptr<CDSTXManager> dstxman;
 };
 
 #endif // BITCOIN_COINJOIN_CONTEXT_H
diff --git a/src/dsnotificationinterface.cpp b/src/dsnotificationinterface.cpp
index 484a564039ab..bf71b87a3b9d 100644
--- a/src/dsnotificationinterface.cpp
+++ b/src/dsnotificationinterface.cpp
@@ -2,39 +2,47 @@
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-#include <coinjoin/coinjoin.h>
-#ifdef ENABLE_WALLET
-#include <coinjoin/client.h>
-#endif // ENABLE_WALLET
-#include <coinjoin/context.h>
+
 #include <dsnotificationinterface.h>
-#include <governance/governance.h>
-#include <masternode/sync.h>
+
+#include <util/check.h>
 #include <validation.h>
 
 #include <chainlock/chainlock.h>
+#include <coinjoin/coinjoin.h>
+#include <coinjoin/context.h>
 #include <evo/deterministicmns.h>
 #include <evo/mnauth.h>
+#include <governance/governance.h>
 #include <instantsend/instantsend.h>
 #include <llmq/context.h>
 #include <llmq/dkgsessionmgr.h>
 #include <llmq/ehf_signals.h>
 #include <llmq/quorums.h>
+#include <masternode/sync.h>
+
+#ifdef ENABLE_WALLET
+#include <coinjoin/client.h>
+#endif // ENABLE_WALLET
 
 CDSNotificationInterface::CDSNotificationInterface(CConnman& connman,
+                                                   CDSTXManager& dstxman,
                                                    CMasternodeSync& mn_sync,
                                                    CGovernanceManager& govman,
                                                    const ChainstateManager& chainman,
                                                    const std::unique_ptr<CDeterministicMNManager>& dmnman,
                                                    const std::unique_ptr<LLMQContext>& llmq_ctx,
-                                                   const std::unique_ptr<CJContext>& cj_ctx)
-  : m_connman(connman),
+                                                   const std::unique_ptr<CJContext>& cj_ctx) :
+    m_connman(connman),
+    m_dstxman(dstxman),
     m_mn_sync(mn_sync),
     m_govman(govman),
     m_chainman(chainman),
     m_dmnman(dmnman),
     m_llmq_ctx(llmq_ctx),
-    m_cj_ctx(cj_ctx) {}
+    m_cj_ctx(cj_ctx)
+{
+}
 
 void CDSNotificationInterface::InitializeCurrentBlockTip()
 {
@@ -44,9 +52,7 @@ void CDSNotificationInterface::InitializeCurrentBlockTip()
 
 void CDSNotificationInterface::AcceptedBlockHeader(const CBlockIndex *pindexNew)
 {
-    assert(m_llmq_ctx);
-
-    m_llmq_ctx->clhandler->AcceptedBlockHeader(pindexNew);
+    Assert(m_llmq_ctx)->clhandler->AcceptedBlockHeader(pindexNew);
     m_mn_sync.AcceptedBlockHeader(pindexNew);
 }
 
@@ -57,18 +63,14 @@ void CDSNotificationInterface::NotifyHeaderTip(const CBlockIndex *pindexNew, boo
 
 void CDSNotificationInterface::SynchronousUpdatedBlockTip(const CBlockIndex *pindexNew, const CBlockIndex *pindexFork, bool fInitialDownload)
 {
-    assert(m_dmnman);
-
     if (pindexNew == pindexFork) // blocks were disconnected without any new ones
         return;
 
-    m_dmnman->UpdatedBlockTip(pindexNew);
+    Assert(m_dmnman)->UpdatedBlockTip(pindexNew);
 }
 
 void CDSNotificationInterface::UpdatedBlockTip(const CBlockIndex *pindexNew, const CBlockIndex *pindexFork, bool fInitialDownload)
 {
-    assert(m_cj_ctx && m_llmq_ctx);
-
     if (pindexNew == pindexFork) // blocks were disconnected without any new ones
         return;
 
@@ -77,9 +79,9 @@ void CDSNotificationInterface::UpdatedBlockTip(const CBlockIndex *pindexNew, con
     if (fInitialDownload)
         return;
 
-    m_cj_ctx->dstxman->UpdatedBlockTip(pindexNew, *m_llmq_ctx->clhandler, m_mn_sync);
+    m_dstxman.UpdatedBlockTip(pindexNew, *Assert(m_llmq_ctx)->clhandler, m_mn_sync);
 #ifdef ENABLE_WALLET
-    m_cj_ctx->walletman->ForEachCJClientMan(
+    Assert(m_cj_ctx)->walletman->ForEachCJClientMan(
         [&pindexNew](std::unique_ptr<CCoinJoinClientManager>& clientman) { clientman->UpdatedBlockTip(pindexNew); });
 #endif // ENABLE_WALLET
 
@@ -97,37 +99,29 @@ void CDSNotificationInterface::UpdatedBlockTip(const CBlockIndex *pindexNew, con
 void CDSNotificationInterface::TransactionAddedToMempool(const CTransactionRef& ptx, int64_t nAcceptTime,
                                                          uint64_t mempool_sequence)
 {
-    assert(m_cj_ctx && m_llmq_ctx);
-
-    m_llmq_ctx->isman->TransactionAddedToMempool(ptx);
+    Assert(m_llmq_ctx)->isman->TransactionAddedToMempool(ptx);
     m_llmq_ctx->clhandler->TransactionAddedToMempool(ptx, nAcceptTime);
-    m_cj_ctx->dstxman->TransactionAddedToMempool(ptx);
+    m_dstxman.TransactionAddedToMempool(ptx);
 }
 
 void CDSNotificationInterface::TransactionRemovedFromMempool(const CTransactionRef& ptx, MemPoolRemovalReason reason,
                                                              uint64_t mempool_sequence)
 {
-    assert(m_llmq_ctx);
-
-    m_llmq_ctx->isman->TransactionRemovedFromMempool(ptx);
+    Assert(m_llmq_ctx)->isman->TransactionRemovedFromMempool(ptx);
 }
 
 void CDSNotificationInterface::BlockConnected(const std::shared_ptr<const CBlock>& pblock, const CBlockIndex* pindex)
 {
-    assert(m_cj_ctx && m_llmq_ctx);
-
-    m_llmq_ctx->isman->BlockConnected(pblock, pindex);
+    Assert(m_llmq_ctx)->isman->BlockConnected(pblock, pindex);
     m_llmq_ctx->clhandler->BlockConnected(pblock, pindex);
-    m_cj_ctx->dstxman->BlockConnected(pblock, pindex);
+    m_dstxman.BlockConnected(pblock, pindex);
 }
 
 void CDSNotificationInterface::BlockDisconnected(const std::shared_ptr<const CBlock>& pblock, const CBlockIndex* pindexDisconnected)
 {
-    assert(m_cj_ctx && m_llmq_ctx);
-
-    m_llmq_ctx->isman->BlockDisconnected(pblock, pindexDisconnected);
+    Assert(m_llmq_ctx)->isman->BlockDisconnected(pblock, pindexDisconnected);
     m_llmq_ctx->clhandler->BlockDisconnected(pblock, pindexDisconnected);
-    m_cj_ctx->dstxman->BlockDisconnected(pblock, pindexDisconnected);
+    m_dstxman.BlockDisconnected(pblock, pindexDisconnected);
 }
 
 void CDSNotificationInterface::NotifyMasternodeListChanged(bool undo, const CDeterministicMNList& oldMNList, const CDeterministicMNListDiff& diff)
@@ -141,10 +135,8 @@ void CDSNotificationInterface::NotifyMasternodeListChanged(bool undo, const CDet
 void CDSNotificationInterface::NotifyChainLock(const CBlockIndex* pindex,
                                                const std::shared_ptr<const chainlock::ChainLockSig>& clsig)
 {
-    assert(m_cj_ctx && m_llmq_ctx);
-
-    m_llmq_ctx->isman->NotifyChainLock(pindex);
-    m_cj_ctx->dstxman->NotifyChainLock(pindex, *m_llmq_ctx->clhandler, m_mn_sync);
+    Assert(m_llmq_ctx)->isman->NotifyChainLock(pindex);
+    m_dstxman.NotifyChainLock(pindex, *m_llmq_ctx->clhandler, m_mn_sync);
 }
 
 std::unique_ptr<CDSNotificationInterface> g_ds_notification_interface;
diff --git a/src/dsnotificationinterface.h b/src/dsnotificationinterface.h
index bcb614006b6f..90cea2a37557 100644
--- a/src/dsnotificationinterface.h
+++ b/src/dsnotificationinterface.h
@@ -8,6 +8,7 @@
 #include <validationinterface.h>
 
 class CConnman;
+class CDSTXManager;
 class CDeterministicMNManager;
 class CGovernanceManager;
 class ChainstateManager;
@@ -19,6 +20,7 @@ class CDSNotificationInterface : public CValidationInterface
 {
 public:
     explicit CDSNotificationInterface(CConnman& connman,
+                                      CDSTXManager& dstxman,
                                       CMasternodeSync& mn_sync,
                                       CGovernanceManager& govman,
                                       const ChainstateManager& chainman,
@@ -46,6 +48,7 @@ class CDSNotificationInterface : public CValidationInterface
 
 private:
     CConnman& m_connman;
+    CDSTXManager& m_dstxman;
     CMasternodeSync& m_mn_sync;
     CGovernanceManager& m_govman;
     const ChainstateManager& m_chainman;
diff --git a/src/init.cpp b/src/init.cpp
index 0753588739f1..bf72cd08e739 100644
--- a/src/init.cpp
+++ b/src/init.cpp
@@ -388,6 +388,7 @@ void PrepareShutdown(NodeContext& node)
     // After all wallets are removed, destroy all CoinJoin objects
     // and reset them to nullptr
     node.cj_ctx.reset();
+    node.dstxman.reset();
 
     UnregisterAllValidationInterfaces();
     GetMainSignals().UnregisterBackgroundSignalScheduler();
@@ -2131,36 +2132,35 @@ bool AppInitMain(NodeContext& node, interfaces::BlockAndHeaderTipInfo* tip_info)
 
     ChainstateManager& chainman = *Assert(node.chainman);
 
+    node.dstxman = std::make_unique<CDSTXManager>();
+    node.cj_ctx = std::make_unique<CJContext>(chainman, *node.dmnman, *node.mn_metaman, *node.mempool,
+                                              node.mn_activeman.get(), *node.mn_sync, *node.llmq_ctx->isman,
+                                              !ignores_incoming_txs);
+
     assert(!node.peerman);
-    node.peerman = PeerManager::make(chainparams, *node.connman, *node.addrman, node.banman.get(),
+    node.peerman = PeerManager::make(chainparams, *node.connman, *node.addrman, node.banman.get(), *node.dstxman,
                                      chainman, *node.mempool, *node.mn_metaman, *node.mn_sync,
                                      *node.govman, *node.sporkman, node.mn_activeman.get(), node.dmnman,
                                      node.active_ctx, node.cj_ctx, node.llmq_ctx, ignores_incoming_txs);
     RegisterValidationInterface(node.peerman.get());
 
     g_ds_notification_interface = std::make_unique<CDSNotificationInterface>(
-        *node.connman, *node.mn_sync, *node.govman, chainman, node.dmnman, node.llmq_ctx, node.cj_ctx
+        *node.connman, *node.dstxman, *node.mn_sync, *node.govman, chainman, node.dmnman, node.llmq_ctx, node.cj_ctx
     );
     RegisterValidationInterface(g_ds_notification_interface.get());
 
-    // ********************************************************* Step 7c: Setup CoinJoin
-
-    node.cj_ctx = std::make_unique<CJContext>(chainman, *node.dmnman, *node.mn_metaman, *node.mempool,
-                                              node.mn_activeman.get(), *node.mn_sync, *node.llmq_ctx->isman,
-                                              !ignores_incoming_txs);
-
-    // ********************************************************* Step 7d: Setup masternode mode
+    // ********************************************************* Step 7c: Setup masternode mode
     assert(!node.active_ctx);
     assert(!g_active_notification_interface);
     if (node.mn_activeman) {
-        node.active_ctx = std::make_unique<ActiveContext>(chainman, *node.connman, *node.dmnman, *node.cj_ctx->dstxman, *node.govman, *node.mn_metaman,
+        node.active_ctx = std::make_unique<ActiveContext>(chainman, *node.connman, *node.dmnman, *node.dstxman, *node.govman, *node.mn_metaman,
                                                           *node.mnhf_manager, *node.sporkman, *node.mempool, *node.llmq_ctx, *node.peerman,
                                                           *node.mn_activeman, *node.mn_sync);
         g_active_notification_interface = std::make_unique<ActiveNotificationInterface>(*node.active_ctx, *node.mn_activeman);
         RegisterValidationInterface(g_active_notification_interface.get());
     }
 
-    // ********************************************************* Step 7e: Setup other Dash services
+    // ********************************************************* Step 7d: Setup other Dash services
 
     bool fLoadCacheFiles = !(fReindex || fReindexChainState) && (chainman.ActiveChain().Tip() != nullptr);
 
diff --git a/src/net_processing.cpp b/src/net_processing.cpp
index 63d5aac9657b..01d7b0e33e8e 100644
--- a/src/net_processing.cpp
+++ b/src/net_processing.cpp
@@ -592,15 +592,12 @@ class PeerManagerImpl final : public PeerManager
 {
 public:
     PeerManagerImpl(const CChainParams& chainparams, CConnman& connman, AddrMan& addrman, BanMan* banman,
-                    ChainstateManager& chainman, CTxMemPool& pool,
-                    CMasternodeMetaMan& mn_metaman, CMasternodeSync& mn_sync,
-                    CGovernanceManager& govman, CSporkManager& sporkman,
-                    const CActiveMasternodeManager* const mn_activeman,
+                    CDSTXManager& dstxman, ChainstateManager& chainman, CTxMemPool& pool,
+                    CMasternodeMetaMan& mn_metaman, CMasternodeSync& mn_sync, CGovernanceManager& govman,
+                    CSporkManager& sporkman, const CActiveMasternodeManager* const mn_activeman,
                     const std::unique_ptr<CDeterministicMNManager>& dmnman,
-                    const std::unique_ptr<ActiveContext>& active_ctx,
-                    const std::unique_ptr<CJContext>& cj_ctx,
-                    const std::unique_ptr<LLMQContext>& llmq_ctx,
-                    bool ignore_incoming_txs);
+                    const std::unique_ptr<ActiveContext>& active_ctx, const std::unique_ptr<CJContext>& cj_ctx,
+                    const std::unique_ptr<LLMQContext>& llmq_ctx, bool ignore_incoming_txs);
 
     /** Overridden from CValidationInterface. */
     void BlockConnected(const std::shared_ptr<const CBlock>& pblock, const CBlockIndex* pindexConnected) override
@@ -789,6 +786,7 @@ class PeerManagerImpl final : public PeerManager
     AddrMan& m_addrman;
     /** Pointer to this node's banman. May be nullptr - check existence before dereferencing. */
     BanMan* const m_banman;
+    CDSTXManager& m_dstxman;
     ChainstateManager& m_chainman;
     CTxMemPool& m_mempool;
     std::unique_ptr<TxReconciliationTracker> m_txreconciliation;
@@ -1960,33 +1958,33 @@ std::optional<std::string> PeerManagerImpl::FetchBlock(NodeId peer_id, const CBl
     return std::nullopt;
 }
 
-std::unique_ptr<PeerManager> PeerManager::make(const CChainParams& chainparams, CConnman& connman, AddrMan& addrman, BanMan* banman,
-                                               ChainstateManager& chainman, CTxMemPool& pool,
-                                               CMasternodeMetaMan& mn_metaman, CMasternodeSync& mn_sync,
-                                               CGovernanceManager& govman, CSporkManager& sporkman,
+std::unique_ptr<PeerManager> PeerManager::make(const CChainParams& chainparams, CConnman& connman, AddrMan& addrman,
+                                               BanMan* banman, CDSTXManager& dstxman, ChainstateManager& chainman,
+                                               CTxMemPool& pool, CMasternodeMetaMan& mn_metaman,
+                                               CMasternodeSync& mn_sync, CGovernanceManager& govman,
+                                               CSporkManager& sporkman,
                                                const CActiveMasternodeManager* const mn_activeman,
                                                const std::unique_ptr<CDeterministicMNManager>& dmnman,
                                                const std::unique_ptr<ActiveContext>& active_ctx,
                                                const std::unique_ptr<CJContext>& cj_ctx,
                                                const std::unique_ptr<LLMQContext>& llmq_ctx, bool ignore_incoming_txs)
 {
-    return std::make_unique<PeerManagerImpl>(chainparams, connman, addrman, banman, chainman, pool, mn_metaman, mn_sync, govman, sporkman, mn_activeman, dmnman, active_ctx, cj_ctx, llmq_ctx, ignore_incoming_txs);
+    return std::make_unique<PeerManagerImpl>(chainparams, connman, addrman, banman, dstxman, chainman, pool, mn_metaman, mn_sync, govman, sporkman, mn_activeman, dmnman, active_ctx, cj_ctx, llmq_ctx, ignore_incoming_txs);
 }
 
 PeerManagerImpl::PeerManagerImpl(const CChainParams& chainparams, CConnman& connman, AddrMan& addrman, BanMan* banman,
-                                 ChainstateManager& chainman, CTxMemPool& pool,
-                                 CMasternodeMetaMan& mn_metaman, CMasternodeSync& mn_sync,
-                                 CGovernanceManager& govman, CSporkManager& sporkman,
-                                 const CActiveMasternodeManager* const mn_activeman,
+                                 CDSTXManager& dstxman, ChainstateManager& chainman, CTxMemPool& pool,
+                                 CMasternodeMetaMan& mn_metaman, CMasternodeSync& mn_sync, CGovernanceManager& govman,
+                                 CSporkManager& sporkman, const CActiveMasternodeManager* const mn_activeman,
                                  const std::unique_ptr<CDeterministicMNManager>& dmnman,
                                  const std::unique_ptr<ActiveContext>& active_ctx,
                                  const std::unique_ptr<CJContext>& cj_ctx,
-                                 const std::unique_ptr<LLMQContext>& llmq_ctx,
-                                 bool ignore_incoming_txs)
+                                 const std::unique_ptr<LLMQContext>& llmq_ctx, bool ignore_incoming_txs)
     : m_chainparams(chainparams),
       m_connman(connman),
       m_addrman(addrman),
       m_banman(banman),
+      m_dstxman(dstxman),
       m_chainman(chainman),
       m_mempool(pool),
       m_dmnman(dmnman),
@@ -2242,7 +2240,7 @@ bool PeerManagerImpl::AlreadyHave(const CInv& inv)
                                         m_llmq_ctx->isman->IsLocked(inv.hash);
 
             return (!fIgnoreRecentRejects && m_recent_rejects.contains(inv.hash)) ||
-                   (inv.IsMsgDstx() && static_cast<bool>(m_cj_ctx->dstxman->GetDSTX(inv.hash))) ||
+                   (inv.IsMsgDstx() && static_cast<bool>(m_dstxman.GetDSTX(inv.hash))) ||
                    m_mempool.exists(inv.hash) ||
                    (g_txindex != nullptr && g_txindex->HasTx(inv.hash));
         }
@@ -2459,7 +2457,7 @@ void PeerManagerImpl::RelayTransaction(const uint256& txid)
 
 void PeerManagerImpl::_RelayTransaction(const uint256& txid)
 {
-    const CInv inv{m_cj_ctx->dstxman->GetDSTX(txid) ? MSG_DSTX : MSG_TX, txid};
+    const CInv inv{m_dstxman.GetDSTX(txid) ? MSG_DSTX : MSG_TX, txid};
     LOCK(m_peer_mutex);
     for(auto& it : m_peer_map) {
         Peer& peer = *it.second;
@@ -2751,7 +2749,7 @@ void PeerManagerImpl::ProcessGetData(CNode& pfrom, Peer& peer, const std::atomic
             if (tx) {
                 CCoinJoinBroadcastTx dstx;
                 if (inv.IsMsgDstx()) {
-                    dstx = m_cj_ctx->dstxman->GetDSTX(inv.hash);
+                    dstx = m_dstxman.GetDSTX(inv.hash);
                 }
                 if (dstx) {
                     m_connman.PushMessage(&pfrom, msgMaker.Make(NetMsgType::DSTX, dstx));
@@ -4565,7 +4563,7 @@ void PeerManagerImpl::ProcessMessage(
         if (nInvType == MSG_DSTX) {
            // Validate DSTX and return bRet if we need to return from here
            uint256 hashTx = tx.GetHash();
-           const auto& [bRet, bDoReturn] = ValidateDSTX(*m_dmnman, *(m_cj_ctx->dstxman), m_chainman, m_mn_metaman, m_mempool, dstx, hashTx);
+           const auto& [bRet, bDoReturn] = ValidateDSTX(*m_dmnman, m_dstxman, m_chainman, m_mn_metaman, m_mempool, dstx, hashTx);
            if (bDoReturn) {
                return;
            }
@@ -4597,7 +4595,7 @@ void PeerManagerImpl::ProcessMessage(
             if (nInvType == MSG_DSTX) {
                 LogPrint(BCLog::COINJOIN, "DSTX -- Masternode transaction accepted, txid=%s, peer=%d\n",
                          tx.GetHash().ToString(), pfrom.GetId());
-                m_cj_ctx->dstxman->AddDSTX(dstx);
+                m_dstxman.AddDSTX(dstx);
             }
 
             _RelayTransaction(tx.GetHash());
@@ -6205,7 +6203,7 @@ bool PeerManagerImpl::SendMessages(CNode* pto)
                     tx_relay->m_tx_inventory_to_send.erase(hash);
                     if (tx_relay->m_bloom_filter && !tx_relay->m_bloom_filter->IsRelevantAndUpdate(*txinfo.tx)) continue;
 
-                    int nInvType = m_cj_ctx->dstxman->GetDSTX(hash) ? MSG_DSTX : MSG_TX;
+                    int nInvType = m_dstxman.GetDSTX(hash) ? MSG_DSTX : MSG_TX;
                     tx_relay->m_tx_inventory_known_filter.insert(hash);
                     queueAndMaybePushInv(CInv(nInvType, hash));
 
@@ -6280,7 +6278,7 @@ bool PeerManagerImpl::SendMessages(CNode* pto)
                             g_relay_expiration.emplace_back(current_time + RELAY_TX_CACHE_TIME, ret.first);
                         }
                     }
-                    int nInvType = m_cj_ctx->dstxman->GetDSTX(hash) ? MSG_DSTX : MSG_TX;
+                    int nInvType = m_dstxman.GetDSTX(hash) ? MSG_DSTX : MSG_TX;
                     tx_relay->m_tx_inventory_known_filter.insert(hash);
                     queueAndMaybePushInv(CInv(nInvType, hash));
                 }
diff --git a/src/net_processing.h b/src/net_processing.h
index 56efc63adce8..27f9091845ff 100644
--- a/src/net_processing.h
+++ b/src/net_processing.h
@@ -17,6 +17,7 @@ class AddrMan;
 class CTxMemPool;
 class CCoinJoinQueue;
 class CDeterministicMNManager;
+class CDSTXManager;
 class CMasternodeMetaMan;
 class CMasternodeSync;
 class ChainstateManager;
@@ -56,7 +57,7 @@ class PeerManager : public CValidationInterface, public NetEventsInterface
 {
 public:
     static std::unique_ptr<PeerManager> make(const CChainParams& chainparams, CConnman& connman, AddrMan& addrman,
-                                             BanMan* banman, ChainstateManager& chainman,
+                                             BanMan* banman, CDSTXManager& dstxman, ChainstateManager& chainman,
                                              CTxMemPool& pool, CMasternodeMetaMan& mn_metaman, CMasternodeSync& mn_sync,
                                              CGovernanceManager& govman, CSporkManager& sporkman,
                                              const CActiveMasternodeManager* const mn_activeman,
diff --git a/src/node/context.cpp b/src/node/context.cpp
index e8407d8548f6..f63b1f4fca0a 100644
--- a/src/node/context.cpp
+++ b/src/node/context.cpp
@@ -6,6 +6,7 @@
 
 #include <addrman.h>
 #include <banman.h>
+#include <coinjoin/coinjoin.h>
 #include <coinjoin/context.h>
 #include <evo/chainhelper.h>
 #include <evo/creditpool.h>
diff --git a/src/node/context.h b/src/node/context.h
index fc04830e72d6..439fd3a8aab8 100644
--- a/src/node/context.h
+++ b/src/node/context.h
@@ -18,6 +18,7 @@ class CBlockPolicyEstimator;
 class CConnman;
 class CCreditPoolManager;
 class CDeterministicMNManager;
+class CDSTXManager;
 class CChainstateHelper;
 class ChainstateManager;
 class CEvoDB;
@@ -80,6 +81,7 @@ struct NodeContext {
     //! Dash managers
     std::unique_ptr<CActiveMasternodeManager> mn_activeman;
     std::unique_ptr<CCreditPoolManager> cpoolman;
+    std::unique_ptr<CDSTXManager> dstxman;
     std::unique_ptr<CEvoDB> evodb;
     std::unique_ptr<CChainstateHelper> chain_helper;
     std::unique_ptr<CDeterministicMNManager> dmnman;
diff --git a/src/test/coinjoin_dstxmanager_tests.cpp b/src/test/coinjoin_dstxmanager_tests.cpp
index bbe5c94c74ee..04e9ce5f93e7 100644
--- a/src/test/coinjoin_dstxmanager_tests.cpp
+++ b/src/test/coinjoin_dstxmanager_tests.cpp
@@ -39,7 +39,7 @@ static CCoinJoinBroadcastTx MakeDSTX(int vin_vout_count = 3)
 BOOST_AUTO_TEST_CASE(add_get_dstx)
 {
     CCoinJoinBroadcastTx dstx = MakeDSTX();
-    auto& man = *Assert(Assert(m_node.cj_ctx)->dstxman);
+    auto& man = *Assert(m_node.dstxman);
     // Not present initially
     BOOST_CHECK(!man.GetDSTX(dstx.tx->GetHash()));
     // Add
@@ -53,7 +53,7 @@ BOOST_AUTO_TEST_CASE(add_get_dstx)
 BOOST_AUTO_TEST_CASE(update_heights_block_connect_disconnect)
 {
     CCoinJoinBroadcastTx dstx = MakeDSTX();
-    auto& man = *Assert(Assert(m_node.cj_ctx)->dstxman);
+    auto& man = *Assert(m_node.dstxman);
     man.AddDSTX(dstx);
 
     // Create a fake block containing the tx
diff --git a/src/test/denialofservice_tests.cpp b/src/test/denialofservice_tests.cpp
index 06c92a1434c5..d8e573c61c63 100644
--- a/src/test/denialofservice_tests.cpp
+++ b/src/test/denialofservice_tests.cpp
@@ -148,7 +148,7 @@ BOOST_AUTO_TEST_CASE(stale_tip_peer_management)
     NodeId id{0};
     const CChainParams& chainparams = Params();
     auto connman = std::make_unique<ConnmanTestMsg>(0x1337, 0x1337, *m_node.addrman, *m_node.netgroupman);
-    auto peerLogic = PeerManager::make(chainparams, *connman, *m_node.addrman, /*banman=*/nullptr,
+    auto peerLogic = PeerManager::make(chainparams, *connman, *m_node.addrman, /*banman=*/nullptr, *m_node.dstxman,
                                        *m_node.chainman, *m_node.mempool, *m_node.mn_metaman, *m_node.mn_sync,
                                        *m_node.govman, *m_node.sporkman, /*mn_activeman=*/ nullptr, m_node.dmnman,
                                        /*active_ctx=*/nullptr, m_node.cj_ctx, m_node.llmq_ctx, /*ignore_incoming_txs=*/false);
@@ -252,7 +252,7 @@ BOOST_AUTO_TEST_CASE(block_relay_only_eviction)
     NodeId id{0};
     const CChainParams& chainparams = Params();
     auto connman = std::make_unique<ConnmanTestMsg>(0x1337, 0x1337, *m_node.addrman, *m_node.netgroupman);
-    auto peerLogic = PeerManager::make(chainparams, *connman, *m_node.addrman, /*banman=*/nullptr,
+    auto peerLogic = PeerManager::make(chainparams, *connman, *m_node.addrman, /*banman=*/nullptr, *m_node.dstxman,
                                        *m_node.chainman, *m_node.mempool, *m_node.mn_metaman, *m_node.mn_sync,
                                        *m_node.govman, *m_node.sporkman, /*mn_activeman=*/ nullptr, m_node.dmnman,
                                        /*active_ctx=*/nullptr, m_node.cj_ctx, m_node.llmq_ctx, /*ignore_incoming_txs=*/false);
@@ -319,7 +319,7 @@ BOOST_AUTO_TEST_CASE(peer_discouragement)
     const CChainParams& chainparams = Params();
     auto banman = std::make_unique<BanMan>(m_args.GetDataDirBase() / "banlist", nullptr, DEFAULT_MISBEHAVING_BANTIME);
     auto connman = std::make_unique<ConnmanTestMsg>(0x1337, 0x1337, *m_node.addrman, *m_node.netgroupman);
-    auto peerLogic = PeerManager::make(chainparams, *connman, *m_node.addrman, banman.get(),
+    auto peerLogic = PeerManager::make(chainparams, *connman, *m_node.addrman, banman.get(), *m_node.dstxman,
                                        *m_node.chainman, *m_node.mempool, *m_node.mn_metaman, *m_node.mn_sync,
                                        *m_node.govman, *m_node.sporkman, /*mn_activeman=*/nullptr, m_node.dmnman,
                                        /*active_ctx=*/nullptr, m_node.cj_ctx, m_node.llmq_ctx, /*ignore_incoming_txs=*/false);
@@ -424,7 +424,7 @@ BOOST_AUTO_TEST_CASE(DoS_bantime)
     const CChainParams& chainparams = Params();
     auto banman = std::make_unique<BanMan>(m_args.GetDataDirBase() / "banlist", nullptr, DEFAULT_MISBEHAVING_BANTIME);
     auto connman = std::make_unique<CConnman>(0x1337, 0x1337, *m_node.addrman, *m_node.netgroupman);
-    auto peerLogic = PeerManager::make(chainparams, *connman, *m_node.addrman, banman.get(),
+    auto peerLogic = PeerManager::make(chainparams, *connman, *m_node.addrman, banman.get(), *m_node.dstxman,
                                        *m_node.chainman, *m_node.mempool, *m_node.mn_metaman, *m_node.mn_sync,
                                        *m_node.govman, *m_node.sporkman, /*mn_activeman=*/nullptr, m_node.dmnman,
                                        /*active_ctx=*/nullptr, m_node.cj_ctx, m_node.llmq_ctx, /*ignore_incoming_txs=*/false);
diff --git a/src/test/net_peer_connection_tests.cpp b/src/test/net_peer_connection_tests.cpp
index ac8e307f463c..a883f9c6ba1e 100644
--- a/src/test/net_peer_connection_tests.cpp
+++ b/src/test/net_peer_connection_tests.cpp
@@ -85,7 +85,7 @@ BOOST_AUTO_TEST_CASE(test_addnode_getaddednodeinfo_and_connection_detection)
 {
     const auto& chainparams = Params();
     auto connman = std::make_unique<ConnmanTestMsg>(0x1337, 0x1337, *m_node.addrman, *m_node.netgroupman);
-    auto peerman = PeerManager::make(chainparams, *connman, *m_node.addrman, nullptr,
+    auto peerman = PeerManager::make(chainparams, *connman, *m_node.addrman, /*banman=*/nullptr, *m_node.dstxman,
                                      *m_node.chainman, *m_node.mempool, *m_node.mn_metaman, *m_node.mn_sync,
                                      *m_node.govman, *m_node.sporkman, /*mn_activeman=*/nullptr, m_node.dmnman,
                                      /*active_ctx=*/nullptr, m_node.cj_ctx, m_node.llmq_ctx, /*ignore_incoming_txs=*/false);
diff --git a/src/test/util/setup_common.cpp b/src/test/util/setup_common.cpp
index 7942e3c2a57f..6881691e9e6e 100644
--- a/src/test/util/setup_common.cpp
+++ b/src/test/util/setup_common.cpp
@@ -48,6 +48,7 @@
 #include <walletinitinterface.h>
 
 #include <bls/bls.h>
+#include <coinjoin/coinjoin.h>
 #include <coinjoin/context.h>
 #include <evo/cbtx.h>
 #include <evo/chainhelper.h>
@@ -340,8 +341,9 @@ TestingSetup::TestingSetup(const std::string& chainName, const std::vector<const
         });
     assert(!maybe_verify_error.has_value());
 
+    m_node.dstxman = std::make_unique<CDSTXManager>();
     m_node.banman = std::make_unique<BanMan>(m_args.GetDataDirBase() / "banlist", nullptr, DEFAULT_MISBEHAVING_BANTIME);
-    m_node.peerman = PeerManager::make(chainparams, *m_node.connman, *m_node.addrman, m_node.banman.get(),
+    m_node.peerman = PeerManager::make(chainparams, *m_node.connman, *m_node.addrman, m_node.banman.get(), *m_node.dstxman,
                                        *m_node.chainman, *m_node.mempool, *m_node.mn_metaman, *m_node.mn_sync,
                                        *m_node.govman, *m_node.sporkman, /*mn_activeman=*/nullptr, m_node.dmnman,
                                        /*active_ctx=*/nullptr, m_node.cj_ctx, m_node.llmq_ctx, /*ignore_incoming_txs=*/false);
@@ -400,6 +402,7 @@ TestingSetup::~TestingSetup()
 
     m_node.peerman.reset();
     m_node.banman.reset();
+    m_node.dstxman.reset();
 }
 
 TestChain100Setup::TestChain100Setup(const std::string& chain_name, const std::vector<const char*>& extra_args)
diff --git a/test/lint/lint-circular-dependencies.py b/test/lint/lint-circular-dependencies.py
index 32718063789b..bcd5aa0ecc5b 100755
--- a/test/lint/lint-circular-dependencies.py
+++ b/test/lint/lint-circular-dependencies.py
@@ -32,7 +32,6 @@
     "chainlock/signing -> instantsend/instantsend -> net_processing -> masternode/active/context -> chainlock/signing",
     "coinjoin/client -> net_processing -> coinjoin/client",
     "coinjoin/client -> net_processing -> coinjoin/context -> coinjoin/client",
-    "coinjoin/coinjoin -> instantsend/instantsend -> net_processing -> coinjoin/context -> coinjoin/coinjoin",
     "coinjoin/server -> net_processing -> coinjoin/server",
     "coinjoin/server -> net_processing -> masternode/active/context -> coinjoin/server",
     "common/bloom -> evo/assetlocktx -> llmq/commitment -> evo/deterministicmns -> evo/simplifiedmns -> merkleblock -> common/bloom",

From 2606d8c9cb9dfd5df66fdb16f3283adbcf832494 Mon Sep 17 00:00:00 2001
From: Kittywhiskers Van Gogh <63189531+kwvg@users.noreply.github.com>
Date: Mon, 8 Sep 2025 13:59:36 +0000
Subject: [PATCH 213/656] refactor: obscure scheduled CoinJoin tasks by moving
 into context

---
 src/coinjoin/context.cpp | 22 ++++++++++++++++++----
 src/coinjoin/context.h   |  9 +++++++++
 src/init.cpp             |  9 ++++-----
 3 files changed, 31 insertions(+), 9 deletions(-)

diff --git a/src/coinjoin/context.cpp b/src/coinjoin/context.cpp
index af343d6742cc..c501f3d80e45 100644
--- a/src/coinjoin/context.cpp
+++ b/src/coinjoin/context.cpp
@@ -4,6 +4,8 @@
 
 #include <coinjoin/context.h>
 
+#include <scheduler.h>
+
 #ifdef ENABLE_WALLET
 #include <coinjoin/client.h>
 #endif // ENABLE_WALLET
@@ -13,12 +15,24 @@ CJContext::CJContext(ChainstateManager& chainman, CDeterministicMNManager& dmnma
                      const CMasternodeSync& mn_sync, const llmq::CInstantSendManager& isman, bool relay_txes)
 #ifdef ENABLE_WALLET
     :
+    m_relay_txes{relay_txes},
     walletman{std::make_unique<CoinJoinWalletManager>(chainman, dmnman, mn_metaman, mempool, mn_sync, isman, queueman,
                                                       /*is_masternode=*/mn_activeman != nullptr)},
-    queueman{relay_txes ? std::make_unique<CCoinJoinClientQueueManager>(*walletman, dmnman, mn_metaman, mn_sync,
-                                                                        /*is_masternode=*/mn_activeman != nullptr)
-                        : nullptr}
+    queueman{m_relay_txes ? std::make_unique<CCoinJoinClientQueueManager>(*walletman, dmnman, mn_metaman, mn_sync,
+                                                                          /*is_masternode=*/mn_activeman != nullptr)
+                          : nullptr}
 #endif // ENABLE_WALLET
 {}
 
-CJContext::~CJContext() {}
+CJContext::~CJContext() = default;
+
+void CJContext::Schedule(CConnman& connman, CScheduler& scheduler)
+{
+#ifdef ENABLE_WALLET
+    if (!m_relay_txes) return;
+    scheduler.scheduleEvery(std::bind(&CCoinJoinClientQueueManager::DoMaintenance, std::ref(*queueman)),
+                            std::chrono::seconds{1});
+    scheduler.scheduleEvery(std::bind(&CoinJoinWalletManager::DoMaintenance, std::ref(*walletman), std::ref(connman)),
+                            std::chrono::seconds{1});
+#endif // ENABLE_WALLET
+}
diff --git a/src/coinjoin/context.h b/src/coinjoin/context.h
index 8e71602928d2..be77e4f14546 100644
--- a/src/coinjoin/context.h
+++ b/src/coinjoin/context.h
@@ -12,10 +12,12 @@
 #include <memory>
 
 class CActiveMasternodeManager;
+class CConnman;
 class CDeterministicMNManager;
 class ChainstateManager;
 class CMasternodeMetaMan;
 class CMasternodeSync;
+class CScheduler;
 class CTxMemPool;
 namespace llmq {
 class CInstantSendManager;
@@ -27,6 +29,7 @@ class CoinJoinWalletManager;
 #endif // ENABLE_WALLET
 
 struct CJContext {
+public:
     CJContext() = delete;
     CJContext(const CJContext&) = delete;
     CJContext(ChainstateManager& chainman, CDeterministicMNManager& dmnman, CMasternodeMetaMan& mn_metaman,
@@ -34,7 +37,13 @@ struct CJContext {
               const llmq::CInstantSendManager& isman, bool relay_txes);
     ~CJContext();
 
+    void Schedule(CConnman& connman, CScheduler& scheduler);
+
 #ifdef ENABLE_WALLET
+private:
+    const bool m_relay_txes;
+
+public:
     // The main object for accessing mixing
     const std::unique_ptr<CoinJoinWalletManager> walletman;
     const std::unique_ptr<CCoinJoinClientQueueManager> queueman;
diff --git a/src/init.cpp b/src/init.cpp
index bf72cd08e739..acc253159d4e 100644
--- a/src/init.cpp
+++ b/src/init.cpp
@@ -2267,11 +2267,10 @@ bool AppInitMain(NodeContext& node, interfaces::BlockAndHeaderTipInfo* tip_info)
     if (node.mn_activeman) {
         node.scheduler->scheduleEvery(std::bind(&CCoinJoinServer::DoMaintenance, std::ref(*node.active_ctx->cj_server)), std::chrono::seconds{1});
         node.scheduler->scheduleEvery(std::bind(&llmq::CDKGSessionManager::CleanupOldContributions, std::ref(*node.llmq_ctx->qdkgsman)), std::chrono::hours{1});
-#ifdef ENABLE_WALLET
-    } else if (!ignores_incoming_txs) {
-        node.scheduler->scheduleEvery(std::bind(&CCoinJoinClientQueueManager::DoMaintenance, std::ref(*node.cj_ctx->queueman)), std::chrono::seconds{1});
-        node.scheduler->scheduleEvery(std::bind(&CoinJoinWalletManager::DoMaintenance, std::ref(*node.cj_ctx->walletman), std::ref(*node.connman)), std::chrono::seconds{1});
-#endif // ENABLE_WALLET
+    }
+
+    if (node.cj_ctx) {
+        node.cj_ctx->Schedule(*node.connman, *node.scheduler);
     }
 
     if (::g_stats_client->active()) {

From cebe18bbd44cf98adae6b7e580134033fdffdb97 Mon Sep 17 00:00:00 2001
From: Kittywhiskers Van Gogh <63189531+kwvg@users.noreply.github.com>
Date: Mon, 8 Sep 2025 13:59:46 +0000
Subject: [PATCH 214/656] refactor: remove `ENABLE_WALLET` from
 `dsnotificationinterface.cpp`

Currently a lot of non-wallet code is peppered with `ENABLE_WALLET` due
to wallet-only CoinJoin managers, we need to contain them.
---
 src/coinjoin/context.cpp        | 11 +++++++++++
 src/coinjoin/context.h          | 11 +++++++++--
 src/dsnotificationinterface.cpp | 18 +++---------------
 src/dsnotificationinterface.h   |  5 +----
 src/init.cpp                    | 17 +++++++++++------
 5 files changed, 35 insertions(+), 27 deletions(-)

diff --git a/src/coinjoin/context.cpp b/src/coinjoin/context.cpp
index c501f3d80e45..c1c84d3fe52b 100644
--- a/src/coinjoin/context.cpp
+++ b/src/coinjoin/context.cpp
@@ -36,3 +36,14 @@ void CJContext::Schedule(CConnman& connman, CScheduler& scheduler)
                             std::chrono::seconds{1});
 #endif // ENABLE_WALLET
 }
+
+void CJContext::UpdatedBlockTip(const CBlockIndex* pindexNew, const CBlockIndex* pindexFork, bool fInitialDownload)
+{
+#ifdef ENABLE_WALLET
+    if (fInitialDownload || pindexNew == pindexFork) // In IBD or blocks were disconnected without any new ones
+        return;
+
+    walletman->ForEachCJClientMan(
+        [&pindexNew](std::unique_ptr<CCoinJoinClientManager>& clientman) { clientman->UpdatedBlockTip(pindexNew); });
+#endif // ENABLE_WALLET
+}
diff --git a/src/coinjoin/context.h b/src/coinjoin/context.h
index be77e4f14546..a26d00e4fbe1 100644
--- a/src/coinjoin/context.h
+++ b/src/coinjoin/context.h
@@ -9,9 +9,12 @@
 #include <config/bitcoin-config.h>
 #endif
 
+#include <validationinterface.h>
+
 #include <memory>
 
 class CActiveMasternodeManager;
+class CBlockIndex;
 class CConnman;
 class CDeterministicMNManager;
 class ChainstateManager;
@@ -28,17 +31,21 @@ class CCoinJoinClientQueueManager;
 class CoinJoinWalletManager;
 #endif // ENABLE_WALLET
 
-struct CJContext {
+struct CJContext final : public CValidationInterface {
 public:
     CJContext() = delete;
     CJContext(const CJContext&) = delete;
     CJContext(ChainstateManager& chainman, CDeterministicMNManager& dmnman, CMasternodeMetaMan& mn_metaman,
               CTxMemPool& mempool, const CActiveMasternodeManager* const mn_activeman, const CMasternodeSync& mn_sync,
               const llmq::CInstantSendManager& isman, bool relay_txes);
-    ~CJContext();
+    virtual ~CJContext();
 
     void Schedule(CConnman& connman, CScheduler& scheduler);
 
+protected:
+    // CValidationInterface
+    void UpdatedBlockTip(const CBlockIndex* pindexNew, const CBlockIndex* pindexFork, bool fInitialDownload) override;
+
 #ifdef ENABLE_WALLET
 private:
     const bool m_relay_txes;
diff --git a/src/dsnotificationinterface.cpp b/src/dsnotificationinterface.cpp
index bf71b87a3b9d..1a1faa969563 100644
--- a/src/dsnotificationinterface.cpp
+++ b/src/dsnotificationinterface.cpp
@@ -10,7 +10,6 @@
 
 #include <chainlock/chainlock.h>
 #include <coinjoin/coinjoin.h>
-#include <coinjoin/context.h>
 #include <evo/deterministicmns.h>
 #include <evo/mnauth.h>
 #include <governance/governance.h>
@@ -21,26 +20,20 @@
 #include <llmq/quorums.h>
 #include <masternode/sync.h>
 
-#ifdef ENABLE_WALLET
-#include <coinjoin/client.h>
-#endif // ENABLE_WALLET
-
 CDSNotificationInterface::CDSNotificationInterface(CConnman& connman,
                                                    CDSTXManager& dstxman,
                                                    CMasternodeSync& mn_sync,
                                                    CGovernanceManager& govman,
                                                    const ChainstateManager& chainman,
                                                    const std::unique_ptr<CDeterministicMNManager>& dmnman,
-                                                   const std::unique_ptr<LLMQContext>& llmq_ctx,
-                                                   const std::unique_ptr<CJContext>& cj_ctx) :
+                                                   const std::unique_ptr<LLMQContext>& llmq_ctx) :
     m_connman(connman),
     m_dstxman(dstxman),
     m_mn_sync(mn_sync),
     m_govman(govman),
     m_chainman(chainman),
     m_dmnman(dmnman),
-    m_llmq_ctx(llmq_ctx),
-    m_cj_ctx(cj_ctx)
+    m_llmq_ctx(llmq_ctx)
 {
 }
 
@@ -80,16 +73,11 @@ void CDSNotificationInterface::UpdatedBlockTip(const CBlockIndex *pindexNew, con
         return;
 
     m_dstxman.UpdatedBlockTip(pindexNew, *Assert(m_llmq_ctx)->clhandler, m_mn_sync);
-#ifdef ENABLE_WALLET
-    Assert(m_cj_ctx)->walletman->ForEachCJClientMan(
-        [&pindexNew](std::unique_ptr<CCoinJoinClientManager>& clientman) { clientman->UpdatedBlockTip(pindexNew); });
-#endif // ENABLE_WALLET
 
     m_llmq_ctx->isman->UpdatedBlockTip(pindexNew);
     m_llmq_ctx->clhandler->UpdatedBlockTip(*m_llmq_ctx->isman);
-
-    m_llmq_ctx->qman->UpdatedBlockTip(pindexNew, m_connman, fInitialDownload);
     m_llmq_ctx->qdkgsman->UpdatedBlockTip(pindexNew, fInitialDownload);
+    m_llmq_ctx->qman->UpdatedBlockTip(pindexNew, m_connman, fInitialDownload);
 
     if (m_govman.IsValid()) {
         m_govman.UpdatedBlockTip(pindexNew);
diff --git a/src/dsnotificationinterface.h b/src/dsnotificationinterface.h
index 90cea2a37557..52cf0b2f62af 100644
--- a/src/dsnotificationinterface.h
+++ b/src/dsnotificationinterface.h
@@ -13,7 +13,6 @@ class CDeterministicMNManager;
 class CGovernanceManager;
 class ChainstateManager;
 class CMasternodeSync;
-struct CJContext;
 struct LLMQContext;
 
 class CDSNotificationInterface : public CValidationInterface
@@ -25,8 +24,7 @@ class CDSNotificationInterface : public CValidationInterface
                                       CGovernanceManager& govman,
                                       const ChainstateManager& chainman,
                                       const std::unique_ptr<CDeterministicMNManager>& dmnman,
-                                      const std::unique_ptr<LLMQContext>& llmq_ctx,
-                                      const std::unique_ptr<CJContext>& cj_ctx);
+                                      const std::unique_ptr<LLMQContext>& llmq_ctx);
     virtual ~CDSNotificationInterface() = default;
 
     // a small helper to initialize current block height in sub-modules on startup
@@ -54,7 +52,6 @@ class CDSNotificationInterface : public CValidationInterface
     const ChainstateManager& m_chainman;
     const std::unique_ptr<CDeterministicMNManager>& m_dmnman;
     const std::unique_ptr<LLMQContext>& m_llmq_ctx;
-    const std::unique_ptr<CJContext>& m_cj_ctx;
 };
 
 extern std::unique_ptr<CDSNotificationInterface> g_ds_notification_interface;
diff --git a/src/init.cpp b/src/init.cpp
index acc253159d4e..5ca253518c6e 100644
--- a/src/init.cpp
+++ b/src/init.cpp
@@ -325,6 +325,15 @@ void PrepareShutdown(NodeContext& node)
         g_active_notification_interface.reset();
     }
 
+    if (node.cj_ctx) {
+        UnregisterValidationInterface(node.cj_ctx.get());
+    }
+
+    if (g_ds_notification_interface) {
+        UnregisterValidationInterface(g_ds_notification_interface.get());
+        g_ds_notification_interface.reset();
+    }
+
     // After all scheduled tasks have been flushed, destroy pointers
     // and reset all to nullptr.
     node.active_ctx.reset();
@@ -376,11 +385,6 @@ void PrepareShutdown(NodeContext& node)
     }
 #endif
 
-    if (g_ds_notification_interface) {
-        UnregisterValidationInterface(g_ds_notification_interface.get());
-        g_ds_notification_interface.reset();
-    }
-
     node.mn_activeman.reset();
 
     node.chain_clients.clear();
@@ -2136,6 +2140,7 @@ bool AppInitMain(NodeContext& node, interfaces::BlockAndHeaderTipInfo* tip_info)
     node.cj_ctx = std::make_unique<CJContext>(chainman, *node.dmnman, *node.mn_metaman, *node.mempool,
                                               node.mn_activeman.get(), *node.mn_sync, *node.llmq_ctx->isman,
                                               !ignores_incoming_txs);
+    RegisterValidationInterface(node.cj_ctx.get());
 
     assert(!node.peerman);
     node.peerman = PeerManager::make(chainparams, *node.connman, *node.addrman, node.banman.get(), *node.dstxman,
@@ -2145,7 +2150,7 @@ bool AppInitMain(NodeContext& node, interfaces::BlockAndHeaderTipInfo* tip_info)
     RegisterValidationInterface(node.peerman.get());
 
     g_ds_notification_interface = std::make_unique<CDSNotificationInterface>(
-        *node.connman, *node.dstxman, *node.mn_sync, *node.govman, chainman, node.dmnman, node.llmq_ctx, node.cj_ctx
+        *node.connman, *node.dstxman, *node.mn_sync, *node.govman, chainman, node.dmnman, node.llmq_ctx
     );
     RegisterValidationInterface(g_ds_notification_interface.get());
 

From 9d06491fac1461bf9ab2d394b924bfd01b001a59 Mon Sep 17 00:00:00 2001
From: Kittywhiskers Van Gogh <63189531+kwvg@users.noreply.github.com>
Date: Tue, 21 Oct 2025 17:22:37 +0530
Subject: [PATCH 215/656] refactor: allow `MessageProcessingResult` to submit
 DSQ messages

---
 src/coinjoin/client.cpp                 | 5 ++---
 src/coinjoin/client.h                   | 5 ++---
 src/coinjoin/server.cpp                 | 2 +-
 src/net_processing.cpp                  | 5 ++++-
 src/protocol.h                          | 7 +++++++
 test/lint/lint-circular-dependencies.py | 2 --
 6 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/src/coinjoin/client.cpp b/src/coinjoin/client.cpp
index c08a647cac7e..81771d1d95ac 100644
--- a/src/coinjoin/client.cpp
+++ b/src/coinjoin/client.cpp
@@ -12,7 +12,6 @@
 #include <masternode/meta.h>
 #include <masternode/sync.h>
 #include <net.h>
-#include <net_processing.h>
 #include <netmessagemaker.h>
 #include <rpc/evo_util.h>
 #include <shutdown.h>
@@ -39,7 +38,7 @@ using wallet::CoinType;
 using wallet::CWallet;
 using wallet::ReserveDestination;
 
-MessageProcessingResult CCoinJoinClientQueueManager::ProcessMessage(NodeId from, CConnman& connman, PeerManager& peerman,
+MessageProcessingResult CCoinJoinClientQueueManager::ProcessMessage(NodeId from, CConnman& connman,
                                                                     std::string_view msg_type, CDataStream& vRecv)
 {
     if (msg_type != NetMsgType::DSQUEUE) {
@@ -138,7 +137,7 @@ MessageProcessingResult CCoinJoinClientQueueManager::ProcessMessage(NodeId from,
             WITH_LOCK(cs_vecqueue, vecCoinJoinQueue.push_back(dsq));
         }
     } // cs_ProcessDSQueue
-    peerman.RelayDSQ(dsq);
+    ret.m_dsq.push_back(dsq);
     return ret;
 }
 
diff --git a/src/coinjoin/client.h b/src/coinjoin/client.h
index cba6903030b3..b49bb7f87fbc 100644
--- a/src/coinjoin/client.h
+++ b/src/coinjoin/client.h
@@ -29,7 +29,6 @@ class CMasternodeSync;
 class CNode;
 class CoinJoinWalletManager;
 class CTxMemPool;
-class PeerManager;
 
 class UniValue;
 
@@ -251,8 +250,8 @@ class CCoinJoinClientQueueManager : public CCoinJoinBaseManager
         m_mn_sync(mn_sync),
         m_is_masternode{is_masternode} {};
 
-    [[nodiscard]] MessageProcessingResult ProcessMessage(NodeId from, CConnman& connman, PeerManager& peerman,
-                                                         std::string_view msg_type, CDataStream& vRecv)
+    [[nodiscard]] MessageProcessingResult ProcessMessage(NodeId from, CConnman& connman, std::string_view msg_type,
+                                                         CDataStream& vRecv)
         EXCLUSIVE_LOCKS_REQUIRED(!cs_vecqueue, !cs_ProcessDSQueue);
     void DoMaintenance();
 };
diff --git a/src/coinjoin/server.cpp b/src/coinjoin/server.cpp
index 86c8e67bc5cb..6f7169af7486 100644
--- a/src/coinjoin/server.cpp
+++ b/src/coinjoin/server.cpp
@@ -188,7 +188,7 @@ MessageProcessingResult CCoinJoinServer::ProcessDSQUEUE(NodeId from, CDataStream
         TRY_LOCK(cs_vecqueue, lockRecv);
         if (!lockRecv) return ret;
         vecCoinJoinQueue.push_back(dsq);
-        m_peerman.RelayDSQ(dsq);
+        ret.m_dsq.push_back(dsq);
     }
     return ret;
 }
diff --git a/src/net_processing.cpp b/src/net_processing.cpp
index 01d7b0e33e8e..cbd2a5f0067f 100644
--- a/src/net_processing.cpp
+++ b/src/net_processing.cpp
@@ -3520,6 +3520,9 @@ void PeerManagerImpl::PostProcessMessage(MessageProcessingResult&& result, NodeI
     for (const auto& inv : result.m_inventory) {
         RelayInv(inv);
     }
+    for (const auto& dsq : result.m_dsq) {
+        RelayDSQ(dsq);
+    }
     if (result.m_inv_filter) {
         const auto& [inv, filter] = result.m_inv_filter.value();
         if (std::holds_alternative<CTransactionRef>(filter)) {
@@ -5367,7 +5370,7 @@ void PeerManagerImpl::ProcessMessage(
         //probably one the extensions
 #ifdef ENABLE_WALLET
         if (m_cj_ctx->queueman) {
-            PostProcessMessage(m_cj_ctx->queueman->ProcessMessage(pfrom.GetId(), m_connman, *this, msg_type, vRecv), pfrom.GetId());
+            PostProcessMessage(m_cj_ctx->queueman->ProcessMessage(pfrom.GetId(), m_connman, msg_type, vRecv), pfrom.GetId());
         }
         m_cj_ctx->walletman->ForEachCJClientMan([this, &pfrom, &msg_type, &vRecv](std::unique_ptr<CCoinJoinClientManager>& clientman) {
             clientman->ProcessMessage(pfrom, m_chainman.ActiveChainstate(), m_connman, m_mempool, msg_type, vRecv);
diff --git a/src/protocol.h b/src/protocol.h
index 75456d161fb7..535a63e50432 100644
--- a/src/protocol.h
+++ b/src/protocol.h
@@ -13,11 +13,15 @@
 #include <uint256.h>
 #include <util/time.h>
 
+#include <coinjoin/coinjoin.h>
+
 #include <cstdint>
 #include <limits>
 #include <string>
 #include <variant>
 
+class CCoinJoinQueue;
+
 /** Message header.
  * (4) message start.
  * (12) command.
@@ -602,6 +606,9 @@ struct MessageProcessingResult
     //! @m_inventory will relay these inventories to connected peers
     std::vector<CInv> m_inventory;
 
+    //! @m_dsq will relay DSQs to connected peers
+    std::vector<CCoinJoinQueue> m_dsq;
+
     //! @m_inv_filter will relay this inventory if filter matches to connected peers if not nullopt
     std::optional<std::pair<CInv, std::variant<CTransactionRef, uint256>>> m_inv_filter;
 
diff --git a/test/lint/lint-circular-dependencies.py b/test/lint/lint-circular-dependencies.py
index bcd5aa0ecc5b..59aab9053be9 100755
--- a/test/lint/lint-circular-dependencies.py
+++ b/test/lint/lint-circular-dependencies.py
@@ -30,8 +30,6 @@
     "chainlock/chainlock -> validation -> chainlock/chainlock",
     "chainlock/chainlock -> validation -> evo/chainhelper -> chainlock/chainlock",
     "chainlock/signing -> instantsend/instantsend -> net_processing -> masternode/active/context -> chainlock/signing",
-    "coinjoin/client -> net_processing -> coinjoin/client",
-    "coinjoin/client -> net_processing -> coinjoin/context -> coinjoin/client",
     "coinjoin/server -> net_processing -> coinjoin/server",
     "coinjoin/server -> net_processing -> masternode/active/context -> coinjoin/server",
     "common/bloom -> evo/assetlocktx -> llmq/commitment -> evo/deterministicmns -> evo/simplifiedmns -> merkleblock -> common/bloom",

From cd77127b626420bbee63dd73203865ea1d00d3b7 Mon Sep 17 00:00:00 2001
From: Kittywhiskers Van Gogh <63189531+kwvg@users.noreply.github.com>
Date: Sun, 5 Oct 2025 14:57:24 +0000
Subject: [PATCH 216/656] refactor: separate `MisbehavingError` and
 `MessageProcessingResult`

Placing them in `protocol.h` limits what headers we can include as
circular dependencies can balloon unexpectedly, a separate header will
reduce how often this happens.
---
 src/Makefile.am                         |  1 +
 src/coinjoin/client.h                   |  1 +
 src/coinjoin/server.h                   |  1 +
 src/evo/mnauth.h                        |  2 +
 src/governance/governance.h             |  1 +
 src/llmq/blockprocessor.h               |  7 ++-
 src/llmq/dkgsessionhandler.h            |  2 +
 src/llmq/dkgsessionmgr.h                |  1 +
 src/llmq/ehf_signals.h                  |  1 +
 src/llmq/quorums.h                      |  2 +-
 src/llmq/signing.h                      |  2 +-
 src/llmq/signing_shares.h               |  4 +-
 src/msg_result.h                        | 79 +++++++++++++++++++++++++
 src/net_processing.cpp                  | 56 +++++++++---------
 src/net_processing.h                    |  2 +
 src/protocol.h                          | 64 --------------------
 src/spork.h                             |  2 +
 test/lint/lint-circular-dependencies.py |  4 ++
 18 files changed, 133 insertions(+), 99 deletions(-)
 create mode 100644 src/msg_result.h

diff --git a/src/Makefile.am b/src/Makefile.am
index 639a7d9eff83..77445e48cc8b 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -292,6 +292,7 @@ BITCOIN_CORE_H = \
   memusage.h \
   merkleblock.h \
   messagesigner.h \
+  msg_result.h \
   net.h \
   net_permissions.h \
   net_processing.h \
diff --git a/src/coinjoin/client.h b/src/coinjoin/client.h
index b49bb7f87fbc..0d4aab3986ce 100644
--- a/src/coinjoin/client.h
+++ b/src/coinjoin/client.h
@@ -8,6 +8,7 @@
 #include <coinjoin/coinjoin.h>
 #include <coinjoin/util.h>
 #include <evo/types.h>
+#include <msg_result.h>
 
 #include <net_types.h>
 #include <protocol.h>
diff --git a/src/coinjoin/server.h b/src/coinjoin/server.h
index 31099a6ac384..86e486ab3156 100644
--- a/src/coinjoin/server.h
+++ b/src/coinjoin/server.h
@@ -6,6 +6,7 @@
 #define BITCOIN_COINJOIN_SERVER_H
 
 #include <coinjoin/coinjoin.h>
+#include <msg_result.h>
 
 #include <net_types.h>
 #include <protocol.h>
diff --git a/src/evo/mnauth.h b/src/evo/mnauth.h
index 9508cca595c8..0ab8acf4dc95 100644
--- a/src/evo/mnauth.h
+++ b/src/evo/mnauth.h
@@ -6,6 +6,8 @@
 #define BITCOIN_EVO_MNAUTH_H
 
 #include <bls/bls.h>
+#include <msg_result.h>
+
 #include <protocol.h>
 #include <serialize.h>
 #include <uint256.h>
diff --git a/src/governance/governance.h b/src/governance/governance.h
index 43d3979bdcd4..8035985fdad6 100644
--- a/src/governance/governance.h
+++ b/src/governance/governance.h
@@ -8,6 +8,7 @@
 #include <cachemap.h>
 #include <cachemultimap.h>
 #include <governance/signing.h>
+#include <msg_result.h>
 
 #include <protocol.h>
 #include <sync.h>
diff --git a/src/llmq/blockprocessor.h b/src/llmq/blockprocessor.h
index de026946d7ab..fb58be574250 100644
--- a/src/llmq/blockprocessor.h
+++ b/src/llmq/blockprocessor.h
@@ -5,12 +5,13 @@
 #ifndef BITCOIN_LLMQ_BLOCKPROCESSOR_H
 #define BITCOIN_LLMQ_BLOCKPROCESSOR_H
 
-#include <unordered_lru_cache.h>
-
 #include <bls/bls.h>
-#include <checkqueue.h>
 #include <llmq/params.h>
 #include <llmq/utils.h>
+#include <msg_result.h>
+#include <unordered_lru_cache.h>
+
+#include <checkqueue.h>
 #include <protocol.h>
 #include <saltedhasher.h>
 #include <sync.h>
diff --git a/src/llmq/dkgsessionhandler.h b/src/llmq/dkgsessionhandler.h
index ad241a5efc13..e40611a0238a 100644
--- a/src/llmq/dkgsessionhandler.h
+++ b/src/llmq/dkgsessionhandler.h
@@ -5,6 +5,8 @@
 #ifndef BITCOIN_LLMQ_DKGSESSIONHANDLER_H
 #define BITCOIN_LLMQ_DKGSESSIONHANDLER_H
 
+#include <msg_result.h>
+
 #include <net.h> // for NodeId
 #include <net_processing.h>
 
diff --git a/src/llmq/dkgsessionmgr.h b/src/llmq/dkgsessionmgr.h
index dba7948ec2f7..b7d0b5211f2e 100644
--- a/src/llmq/dkgsessionmgr.h
+++ b/src/llmq/dkgsessionmgr.h
@@ -8,6 +8,7 @@
 #include <bls/bls.h>
 #include <bls/bls_worker.h>
 #include <llmq/dkgsessionhandler.h>
+#include <msg_result.h>
 #include <net_types.h>
 
 #include <map>
diff --git a/src/llmq/ehf_signals.h b/src/llmq/ehf_signals.h
index 33283f6dbca8..cc9893061dca 100644
--- a/src/llmq/ehf_signals.h
+++ b/src/llmq/ehf_signals.h
@@ -6,6 +6,7 @@
 #define BITCOIN_LLMQ_EHF_SIGNALS_H
 
 #include <llmq/signing.h>
+#include <msg_result.h>
 
 #include <set>
 
diff --git a/src/llmq/quorums.h b/src/llmq/quorums.h
index 1ba398103739..01a1e75dad75 100644
--- a/src/llmq/quorums.h
+++ b/src/llmq/quorums.h
@@ -11,9 +11,9 @@
 #include <evo/types.h>
 #include <llmq/params.h>
 #include <llmq/types.h>
+#include <msg_result.h>
 #include <unordered_lru_cache.h>
 
-#include <protocol.h>
 #include <saltedhasher.h>
 #include <util/threadinterrupt.h>
 #include <util/time.h>
diff --git a/src/llmq/signing.h b/src/llmq/signing.h
index e49e76a14329..5438de2aaa1a 100644
--- a/src/llmq/signing.h
+++ b/src/llmq/signing.h
@@ -9,10 +9,10 @@
 #include <llmq/params.h>
 #include <llmq/signhash.h>
 #include <llmq/types.h>
+#include <msg_result.h>
 #include <unordered_lru_cache.h>
 
 #include <net_types.h>
-#include <protocol.h>
 #include <random.h>
 #include <saltedhasher.h>
 #include <sync.h>
diff --git a/src/llmq/signing_shares.h b/src/llmq/signing_shares.h
index 258a6f2417a6..0b0d2cacb3d8 100644
--- a/src/llmq/signing_shares.h
+++ b/src/llmq/signing_shares.h
@@ -5,10 +5,10 @@
 #ifndef BITCOIN_LLMQ_SIGNING_SHARES_H
 #define BITCOIN_LLMQ_SIGNING_SHARES_H
 
-#include <llmq/signing.h>
-
 #include <bls/bls.h>
 #include <evo/types.h>
+#include <llmq/signing.h>
+#include <msg_result.h>
 
 #include <random.h>
 #include <saltedhasher.h>
diff --git a/src/msg_result.h b/src/msg_result.h
new file mode 100644
index 000000000000..01b14288ee27
--- /dev/null
+++ b/src/msg_result.h
@@ -0,0 +1,79 @@
+// Copyright (c) 2024-2025 The Dash Core developers
+// Distributed under the MIT software license, see the accompanying
+// file COPYING or http://www.opensource.org/licenses/mit-license.php.
+
+#ifndef BITCOIN_MSG_RESULT_H
+#define BITCOIN_MSG_RESULT_H
+
+#include <coinjoin/coinjoin.h>
+
+#include <primitives/transaction.h>
+#include <protocol.h>
+#include <uint256.h>
+
+#include <optional>
+#include <string>
+#include <utility>
+#include <variant>
+#include <vector>
+
+struct MisbehavingError
+{
+    int score;
+    std::string message;
+
+    MisbehavingError(int s) : score{s} {}
+
+    // Constructor does a perfect forwarding reference
+    template <typename T>
+    MisbehavingError(int s, T&& msg) :
+        score{s},
+        message{std::forward<T>(msg)}
+    {}
+};
+
+/**
+ * This struct is a helper to return values from handlers that are processing
+ * network messages but implemented outside of net_processing.cpp,
+ * for example llmq's messages.
+ *
+ * These handlers do not supposed to know anything about PeerManager to avoid
+ * circular dependencies.
+ *
+ * See `PeerManagerImpl::PostProcessMessage` to see how each type of return code
+ * is processed.
+ */
+struct MessageProcessingResult
+{
+    //! @m_error triggers Misbehaving error with score and optional message if not nullopt
+    std::optional<MisbehavingError> m_error;
+
+    //! @m_inventory will relay these inventories to connected peers
+    std::vector<CInv> m_inventory;
+
+    //! @m_dsq will relay DSQs to connected peers
+    std::vector<CCoinJoinQueue> m_dsq;
+
+    //! @m_inv_filter will relay this inventory if filter matches to connected peers if not nullopt
+    std::optional<std::pair<CInv, std::variant<CTransactionRef, uint256>>> m_inv_filter;
+
+    //! @m_request_tx will ask connected peers to relay transaction if not nullopt
+    std::optional<uint256> m_request_tx;
+
+    //! @m_transactions will relay transactions to peers which is ready to accept it (some peers does not accept transactions)
+    std::vector<uint256> m_transactions;
+
+    //! @m_to_erase triggers EraseObjectRequest from PeerManager for this inventory if not nullopt
+    std::optional<CInv> m_to_erase;
+
+    MessageProcessingResult() = default;
+    MessageProcessingResult(CInv inv) :
+        m_inventory({inv})
+    {
+    }
+    MessageProcessingResult(MisbehavingError error) :
+        m_error(error)
+    {}
+};
+
+#endif // BITCOIN_MSG_RESULT_H
diff --git a/src/net_processing.cpp b/src/net_processing.cpp
index cbd2a5f0067f..1a0352fc93df 100644
--- a/src/net_processing.cpp
+++ b/src/net_processing.cpp
@@ -14,11 +14,11 @@
 #include <consensus/validation.h>
 #include <hash.h>
 #include <index/blockfilterindex.h>
-#include <validation.h>
+#include <index/txindex.h>
 #include <merkleblock.h>
-#include <netmessagemaker.h>
-#include <netbase.h>
 #include <net_types.h>
+#include <netbase.h>
+#include <netmessagemaker.h>
 #include <node/blockstorage.h>
 #include <node/txreconciliation.h>
 #include <policy/policy.h>
@@ -31,42 +31,24 @@
 #include <sync.h>
 #include <timedata.h>
 #include <tinyformat.h>
-#include <index/txindex.h>
 #include <txmempool.h>
 #include <txorphanage.h>
 #include <util/check.h>
-#include <util/system.h>
 #include <util/strencodings.h>
-#include <util/underlying.h>
+#include <util/system.h>
 #include <util/trace.h>
+#include <util/underlying.h>
+#include <validation.h>
 
-#include <algorithm>
-#include <atomic>
-#include <chrono>
-#include <future>
-#include <list>
-#include <memory>
-#include <optional>
-#include <ranges>
-#include <typeinfo>
-
-#include <spork.h>
-#include <governance/governance.h>
-#include <masternode/active/context.h>
-#include <masternode/sync.h>
-#include <masternode/meta.h>
-#ifdef ENABLE_WALLET
-#include <coinjoin/client.h>
-#endif // ENABLE_WALLET
+#include <chainlock/chainlock.h>
 #include <coinjoin/context.h>
 #include <coinjoin/server.h>
-
-#include <chainlock/chainlock.h>
 #include <evo/deterministicmns.h>
 #include <evo/mnauth.h>
 #include <evo/smldiff.h>
-#include <instantsend/lock.h>
+#include <governance/governance.h>
 #include <instantsend/instantsend.h>
+#include <instantsend/lock.h>
 #include <llmq/blockprocessor.h>
 #include <llmq/commitment.h>
 #include <llmq/context.h>
@@ -77,9 +59,27 @@
 #include <llmq/signing.h>
 #include <llmq/signing_shares.h>
 #include <llmq/snapshot.h>
-
+#include <masternode/active/context.h>
+#include <masternode/meta.h>
+#include <masternode/sync.h>
+#include <msg_result.h>
+#include <spork.h>
 #include <stats/client.h>
 
+#ifdef ENABLE_WALLET
+#include <coinjoin/client.h>
+#endif // ENABLE_WALLET
+
+#include <algorithm>
+#include <atomic>
+#include <chrono>
+#include <future>
+#include <list>
+#include <memory>
+#include <optional>
+#include <ranges>
+#include <typeinfo>
+
 using node::ReadBlockFromDisk;
 using node::fImporting;
 using node::fPruneMode;
diff --git a/src/net_processing.h b/src/net_processing.h
index 27f9091845ff..de81c5f846f6 100644
--- a/src/net_processing.h
+++ b/src/net_processing.h
@@ -10,6 +10,8 @@
 #include <validationinterface.h>
 #include <version.h>
 
+#include <msg_result.h>
+
 #include <atomic>
 
 class CActiveMasternodeManager;
diff --git a/src/protocol.h b/src/protocol.h
index 535a63e50432..ed1b71705b80 100644
--- a/src/protocol.h
+++ b/src/protocol.h
@@ -7,21 +7,16 @@
 #define BITCOIN_PROTOCOL_H
 
 #include <netaddress.h>
-#include <primitives/transaction.h>
 #include <serialize.h>
 #include <streams.h>
 #include <uint256.h>
 #include <util/time.h>
 
-#include <coinjoin/coinjoin.h>
-
 #include <cstdint>
 #include <limits>
 #include <string>
 #include <variant>
 
-class CCoinJoinQueue;
-
 /** Message header.
  * (4) message start.
  * (12) command.
@@ -572,63 +567,4 @@ class CInv
     uint256 hash;
 };
 
-struct MisbehavingError
-{
-    int score;
-    std::string message;
-
-    MisbehavingError(int s) : score{s} {}
-
-     // Constructor does a perfect forwarding reference
-    template <typename T>
-    MisbehavingError(int s, T&& msg) :
-        score{s},
-        message{std::forward<T>(msg)}
-    {}
-};
-
-/**
- * This struct is a helper to return values from handlers that are processing
- * network messages but implemented outside of net_processing.cpp,
- * for example llmq's messages.
- *
- * These handlers do not supposed to know anything about PeerManager to avoid
- * circular dependencies.
- *
- * See `PeerManagerImpl::PostProcessMessage` to see how each type of return code
- * is processed.
- */
-struct MessageProcessingResult
-{
-    //! @m_error triggers Misbehaving error with score and optional message if not nullopt
-    std::optional<MisbehavingError> m_error;
-
-    //! @m_inventory will relay these inventories to connected peers
-    std::vector<CInv> m_inventory;
-
-    //! @m_dsq will relay DSQs to connected peers
-    std::vector<CCoinJoinQueue> m_dsq;
-
-    //! @m_inv_filter will relay this inventory if filter matches to connected peers if not nullopt
-    std::optional<std::pair<CInv, std::variant<CTransactionRef, uint256>>> m_inv_filter;
-
-    //! @m_request_tx will ask connected peers to relay transaction if not nullopt
-    std::optional<uint256> m_request_tx;
-
-    //! @m_transactions will relay transactions to peers which is ready to accept it (some peers does not accept transactions)
-    std::vector<uint256> m_transactions;
-
-    //! @m_to_erase triggers EraseObjectRequest from PeerManager for this inventory if not nullopt
-    std::optional<CInv> m_to_erase;
-
-    MessageProcessingResult() = default;
-    MessageProcessingResult(MisbehavingError error) :
-        m_error(error)
-    {}
-    MessageProcessingResult(CInv inv) :
-        m_inventory({inv})
-    {
-    }
-};
-
 #endif // BITCOIN_PROTOCOL_H
diff --git a/src/spork.h b/src/spork.h
index 56ddd098d7ce..4ea43b435354 100644
--- a/src/spork.h
+++ b/src/spork.h
@@ -5,6 +5,8 @@
 #ifndef BITCOIN_SPORK_H
 #define BITCOIN_SPORK_H
 
+#include <msg_result.h>
+
 #include <hash.h>
 #include <key.h>
 #include <net.h>
diff --git a/test/lint/lint-circular-dependencies.py b/test/lint/lint-circular-dependencies.py
index 59aab9053be9..3208860b5da5 100755
--- a/test/lint/lint-circular-dependencies.py
+++ b/test/lint/lint-circular-dependencies.py
@@ -27,9 +27,13 @@
     "chainlock/chainlock -> instantsend/instantsend -> instantsend/signing -> chainlock/chainlock",
     "chainlock/chainlock -> instantsend/instantsend -> net_processing -> chainlock/chainlock",
     "chainlock/chainlock -> instantsend/instantsend -> net_processing -> masternode/active/context -> chainlock/chainlock",
+    "chainlock/chainlock -> llmq/quorums -> msg_result -> coinjoin/coinjoin -> chainlock/chainlock",
     "chainlock/chainlock -> validation -> chainlock/chainlock",
     "chainlock/chainlock -> validation -> evo/chainhelper -> chainlock/chainlock",
     "chainlock/signing -> instantsend/instantsend -> net_processing -> masternode/active/context -> chainlock/signing",
+    "coinjoin/client -> coinjoin/coinjoin -> instantsend/instantsend -> net_processing -> coinjoin/client",
+    "coinjoin/client -> coinjoin/coinjoin -> instantsend/instantsend -> net_processing -> coinjoin/context -> coinjoin/client",
+    "coinjoin/coinjoin -> instantsend/instantsend -> llmq/quorums -> msg_result -> coinjoin/coinjoin",
     "coinjoin/server -> net_processing -> coinjoin/server",
     "coinjoin/server -> net_processing -> masternode/active/context -> coinjoin/server",
     "common/bloom -> evo/assetlocktx -> llmq/commitment -> evo/deterministicmns -> evo/simplifiedmns -> merkleblock -> common/bloom",

From d56879fe037fb29984aff433bf412da8bd8e3b8e Mon Sep 17 00:00:00 2001
From: Kittywhiskers Van Gogh <63189531+kwvg@users.noreply.github.com>
Date: Sun, 5 Oct 2025 14:47:05 +0000
Subject: [PATCH 217/656] refactor: restrict access to CoinJoin wallet managers

---
 src/coinjoin/context.cpp           | 87 ++++++++++++++++++++++++++++++
 src/coinjoin/context.h             | 26 ++++++++-
 src/coinjoin/interfaces.cpp        | 12 ++---
 src/init.cpp                       |  2 +-
 src/masternode/utils.cpp           | 28 ++++------
 src/masternode/utils.h             |  4 +-
 src/net_processing.cpp             | 19 ++-----
 src/rpc/coinjoin.cpp               |  6 ++-
 src/wallet/test/coinjoin_tests.cpp | 16 +++---
 9 files changed, 147 insertions(+), 53 deletions(-)

diff --git a/src/coinjoin/context.cpp b/src/coinjoin/context.cpp
index c1c84d3fe52b..3584d25bebda 100644
--- a/src/coinjoin/context.cpp
+++ b/src/coinjoin/context.cpp
@@ -4,8 +4,11 @@
 
 #include <coinjoin/context.h>
 
+#include <net.h>
 #include <scheduler.h>
 
+#include <evo/deterministicmns.h>
+
 #ifdef ENABLE_WALLET
 #include <coinjoin/client.h>
 #endif // ENABLE_WALLET
@@ -47,3 +50,87 @@ void CJContext::UpdatedBlockTip(const CBlockIndex* pindexNew, const CBlockIndex*
         [&pindexNew](std::unique_ptr<CCoinJoinClientManager>& clientman) { clientman->UpdatedBlockTip(pindexNew); });
 #endif // ENABLE_WALLET
 }
+
+bool CJContext::hasQueue(const uint256& hash) const
+{
+#ifdef ENABLE_WALLET
+    if (queueman) {
+        return queueman->HasQueue(hash);
+    }
+#endif // ENABLE_WALLET
+    return false;
+}
+
+CCoinJoinClientManager* CJContext::getClient(const std::string& name)
+{
+#ifdef ENABLE_WALLET
+    return walletman->Get(name);
+#else
+    return nullptr;
+#endif // ENABLE_WALLET
+}
+
+MessageProcessingResult CJContext::processMessage(CNode& pfrom, CChainState& chainstate, CConnman& connman,
+                                                  CTxMemPool& mempool, std::string_view msg_type, CDataStream& vRecv)
+{
+#ifdef ENABLE_WALLET
+    walletman->ForEachCJClientMan([&](std::unique_ptr<CCoinJoinClientManager>& clientman) {
+        clientman->ProcessMessage(pfrom, chainstate, connman, mempool, msg_type, vRecv);
+    });
+    if (queueman) {
+        return queueman->ProcessMessage(pfrom.GetId(), connman, msg_type, vRecv);
+    }
+#endif // ENABLE_WALLET
+    return {};
+}
+
+std::optional<CCoinJoinQueue> CJContext::getQueueFromHash(const uint256& hash) const
+{
+#ifdef ENABLE_WALLET
+    if (queueman) {
+        return queueman->GetQueueFromHash(hash);
+    }
+#endif // ENABLE_WALLET
+    return std::nullopt;
+}
+
+std::optional<int> CJContext::getQueueSize() const
+{
+#ifdef ENABLE_WALLET
+    if (queueman) {
+        return queueman->GetQueueSize();
+    }
+#endif // ENABLE_WALLET
+    return std::nullopt;
+}
+
+std::vector<CDeterministicMNCPtr> CJContext::getMixingMasternodes() const
+{
+    std::vector<CDeterministicMNCPtr> ret{};
+#ifdef ENABLE_WALLET
+    walletman->ForEachCJClientMan(
+        [&](const std::unique_ptr<CCoinJoinClientManager>& clientman) { clientman->GetMixingMasternodesInfo(ret); });
+#endif // ENABLE_WALLET
+    return ret;
+}
+
+void CJContext::addWallet(const std::shared_ptr<wallet::CWallet>& wallet)
+{
+#ifdef ENABLE_WALLET
+    walletman->Add(wallet);
+#endif // ENABLE_WALLET
+}
+
+void CJContext::flushWallet(const std::string& name)
+{
+#ifdef ENABLE_WALLET
+    walletman->Flush(name);
+#endif // ENABLE_WALLET
+}
+
+void CJContext::removeWallet(const std::string& name)
+{
+#ifdef ENABLE_WALLET
+    walletman->Remove(name);
+#endif // ENABLE_WALLET
+}
diff --git a/src/coinjoin/context.h b/src/coinjoin/context.h
index a26d00e4fbe1..96edc00d505c 100644
--- a/src/coinjoin/context.h
+++ b/src/coinjoin/context.h
@@ -9,22 +9,34 @@
 #include <config/bitcoin-config.h>
 #endif
 
+#include <evo/types.h>
+#include <msg_result.h>
+
 #include <validationinterface.h>
 
 #include <memory>
+#include <optional>
+#include <string_view>
 
 class CActiveMasternodeManager;
 class CBlockIndex;
+class CChainState;
+class CCoinJoinClientManager;
+class CCoinJoinQueue;
 class CConnman;
 class CDeterministicMNManager;
 class ChainstateManager;
 class CMasternodeMetaMan;
 class CMasternodeSync;
+class CNode;
 class CScheduler;
 class CTxMemPool;
 namespace llmq {
 class CInstantSendManager;
-};
+} // namespace llmq
+namespace wallet {
+class CWallet;
+} // namespace wallet
 
 #ifdef ENABLE_WALLET
 class CCoinJoinClientQueueManager;
@@ -42,6 +54,17 @@ struct CJContext final : public CValidationInterface {
 
     void Schedule(CConnman& connman, CScheduler& scheduler);
 
+    bool hasQueue(const uint256& hash) const;
+    CCoinJoinClientManager* getClient(const std::string& name);
+    MessageProcessingResult processMessage(CNode& peer, CChainState& chainstate, CConnman& connman, CTxMemPool& mempool,
+                                           std::string_view msg_type, CDataStream& vRecv);
+    std::optional<CCoinJoinQueue> getQueueFromHash(const uint256& hash) const;
+    std::optional<int> getQueueSize() const;
+    std::vector<CDeterministicMNCPtr> getMixingMasternodes() const;
+    void addWallet(const std::shared_ptr<wallet::CWallet>& wallet);
+    void removeWallet(const std::string& name);
+    void flushWallet(const std::string& name);
+
 protected:
     // CValidationInterface
     void UpdatedBlockTip(const CBlockIndex* pindexNew, const CBlockIndex* pindexFork, bool fInitialDownload) override;
@@ -50,7 +73,6 @@ struct CJContext final : public CValidationInterface {
 private:
     const bool m_relay_txes;
 
-public:
     // The main object for accessing mixing
     const std::unique_ptr<CoinJoinWalletManager> walletman;
     const std::unique_ptr<CCoinJoinClientQueueManager> queueman;
diff --git a/src/coinjoin/interfaces.cpp b/src/coinjoin/interfaces.cpp
index 98091b694c12..561df7a9083b 100644
--- a/src/coinjoin/interfaces.cpp
+++ b/src/coinjoin/interfaces.cpp
@@ -77,9 +77,9 @@ class CoinJoinClientImpl : public interfaces::CoinJoin::Client
 class CoinJoinLoaderImpl : public interfaces::CoinJoin::Loader
 {
 private:
-    CoinJoinWalletManager& walletman()
+    CJContext& manager()
     {
-        return *Assert(Assert(m_node.cj_ctx)->walletman);
+        return *Assert(m_node.cj_ctx);
     }
 
     interfaces::WalletLoader& wallet_loader()
@@ -97,21 +97,21 @@ class CoinJoinLoaderImpl : public interfaces::CoinJoin::Loader
 
     void AddWallet(const std::shared_ptr<CWallet>& wallet) override
     {
-        walletman().Add(wallet);
+        manager().addWallet(wallet);
         g_wallet_init_interface.InitCoinJoinSettings(*this, wallet_loader());
     }
     void RemoveWallet(const std::string& name) override
     {
-        walletman().Remove(name);
+        manager().removeWallet(name);
         g_wallet_init_interface.InitCoinJoinSettings(*this, wallet_loader());
     }
     void FlushWallet(const std::string& name) override
     {
-        walletman().Flush(name);
+        manager().flushWallet(name);
     }
     std::unique_ptr<interfaces::CoinJoin::Client> GetClient(const std::string& name) override
     {
-        auto clientman = walletman().Get(name);
+        auto clientman = manager().getClient(name);
         return clientman ? std::make_unique<CoinJoinClientImpl>(*clientman) : nullptr;
     }
 
diff --git a/src/init.cpp b/src/init.cpp
index 5ca253518c6e..ab1b92040c93 100644
--- a/src/init.cpp
+++ b/src/init.cpp
@@ -2262,7 +2262,7 @@ bool AppInitMain(NodeContext& node, interfaces::BlockAndHeaderTipInfo* tip_info)
 
     node.scheduler->scheduleEvery(std::bind(&CNetFulfilledRequestManager::DoMaintenance, std::ref(*node.netfulfilledman)), std::chrono::minutes{1});
     node.scheduler->scheduleEvery(std::bind(&CMasternodeSync::DoMaintenance, std::ref(*node.mn_sync), std::cref(*node.peerman), std::cref(*node.govman)), std::chrono::seconds{1});
-    node.scheduler->scheduleEvery(std::bind(&CMasternodeUtils::DoMaintenance, std::ref(*node.connman), std::ref(*node.dmnman), std::ref(*node.mn_sync), std::ref(*node.cj_ctx)), std::chrono::minutes{1});
+    node.scheduler->scheduleEvery(std::bind(&CMasternodeUtils::DoMaintenance, std::ref(*node.connman), std::ref(*node.dmnman), std::ref(*node.mn_sync), node.cj_ctx.get()), std::chrono::minutes{1});
     node.scheduler->scheduleEvery(std::bind(&CDeterministicMNManager::DoMaintenance, std::ref(*node.dmnman)), std::chrono::seconds{10});
 
     if (node.govman->IsValid()) {
diff --git a/src/masternode/utils.cpp b/src/masternode/utils.cpp
index 2988b3ffe801..d5961446a4d3 100644
--- a/src/masternode/utils.cpp
+++ b/src/masternode/utils.cpp
@@ -3,30 +3,25 @@
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
 #include <masternode/utils.h>
-#include <evo/deterministicmns.h>
 
-#ifdef ENABLE_WALLET
-#include <coinjoin/client.h>
-#endif
-#include <masternode/sync.h>
 #include <net.h>
 #include <shutdown.h>
 #include <util/ranges.h>
+
 #include <coinjoin/context.h>
+#include <evo/deterministicmns.h>
+#include <masternode/sync.h>
 
-void CMasternodeUtils::DoMaintenance(CConnman& connman, CDeterministicMNManager& dmnman,
-                                     const CMasternodeSync& mn_sync, const CJContext& cj_ctx)
+#ifdef ENABLE_WALLET
+#include <coinjoin/client.h>
+#endif
+
+void CMasternodeUtils::DoMaintenance(CConnman& connman, CDeterministicMNManager& dmnman, const CMasternodeSync& mn_sync,
+                                     const CJContext* const cj_ctx)
 {
     if (!mn_sync.IsBlockchainSynced()) return;
     if (ShutdownRequested()) return;
 
-    std::vector<CDeterministicMNCPtr> vecDmns; // will be empty when no wallet
-#ifdef ENABLE_WALLET
-    cj_ctx.walletman->ForEachCJClientMan([&vecDmns](const std::unique_ptr<CCoinJoinClientManager>& clientman) {
-        clientman->GetMixingMasternodesInfo(vecDmns);
-    });
-#endif // ENABLE_WALLET
-
     // Don't disconnect masternode connections when we have less then the desired amount of outbound nodes
     int nonMasternodeCount = 0;
     connman.ForEachNode(CConnman::AllNodes, [&](const CNode* pnode) {
@@ -45,6 +40,7 @@ void CMasternodeUtils::DoMaintenance(CConnman& connman, CDeterministicMNManager&
         return;
     }
 
+    auto mixing_masternodes = cj_ctx ? cj_ctx->getMixingMasternodes() : std::vector<CDeterministicMNCPtr>{};
     connman.ForEachNode(CConnman::AllNodes, [&](CNode* pnode) {
         if (pnode->m_masternode_probe_connection) {
             // we're not disconnecting masternode probes for at least PROBE_WAIT_INTERVAL seconds
@@ -75,12 +71,10 @@ void CMasternodeUtils::DoMaintenance(CConnman& connman, CDeterministicMNManager&
             }
         }
 
-#ifdef ENABLE_WALLET
-        bool fFound = ranges::any_of(vecDmns, [&pnode](const auto& dmn) {
+        bool fFound = ranges::any_of(mixing_masternodes, [&pnode](const auto& dmn) {
             return pnode->addr == dmn->pdmnState->netInfo->GetPrimary();
         });
         if (fFound) return; // do NOT disconnect mixing masternodes
-#endif // ENABLE_WALLET
         if (fLogIPs) {
             LogPrint(BCLog::NET_NETCONN, "Closing Masternode connection: peer=%d, addr=%s\n", pnode->GetId(),
                      pnode->addr.ToStringAddrPort());
diff --git a/src/masternode/utils.h b/src/masternode/utils.h
index eb50990985c1..2350dc0160de 100644
--- a/src/masternode/utils.h
+++ b/src/masternode/utils.h
@@ -13,8 +13,8 @@ struct CJContext;
 class CMasternodeUtils
 {
 public:
-    static void DoMaintenance(CConnman &connman, CDeterministicMNManager& dmnman,
-                              const CMasternodeSync& mn_sync, const CJContext& cj_ctx);
+    static void DoMaintenance(CConnman& connman, CDeterministicMNManager& dmnman, const CMasternodeSync& mn_sync,
+                              const CJContext* const cj_ctx);
 };
 
 #endif // BITCOIN_MASTERNODE_UTILS_H
diff --git a/src/net_processing.cpp b/src/net_processing.cpp
index 1a0352fc93df..9999afe898ab 100644
--- a/src/net_processing.cpp
+++ b/src/net_processing.cpp
@@ -2278,11 +2278,7 @@ bool PeerManagerImpl::AlreadyHave(const CInv& inv)
     case MSG_ISDLOCK:
         return m_llmq_ctx->isman->AlreadyHave(inv);
     case MSG_DSQ:
-        return
-#ifdef ENABLE_WALLET
-                (m_cj_ctx->queueman && m_cj_ctx->queueman->HasQueue(inv.hash)) ||
-#endif // ENABLE_WALLET
-                (m_active_ctx && m_active_ctx->cj_server->HasQueue(inv.hash));
+        return (m_cj_ctx && m_cj_ctx->hasQueue(inv.hash)) || (m_active_ctx && m_active_ctx->cj_server->HasQueue(inv.hash));
     case MSG_PLATFORM_BAN:
         return m_mn_metaman.AlreadyHavePlatformBan(inv.hash);
     }
@@ -2888,11 +2884,9 @@ void PeerManagerImpl::ProcessGetData(CNode& pfrom, Peer& peer, const std::atomic
         }
         if (!push && inv.type == MSG_DSQ) {
             auto opt_dsq = m_active_ctx ? m_active_ctx->cj_server->GetQueueFromHash(inv.hash) : std::nullopt;
-#ifdef ENABLE_WALLET
-            if (m_cj_ctx->queueman && !opt_dsq.has_value()) {
-                opt_dsq = m_cj_ctx->queueman->GetQueueFromHash(inv.hash);
+            if (m_cj_ctx && !opt_dsq.has_value()) {
+                opt_dsq = m_cj_ctx->getQueueFromHash(inv.hash);
             }
-#endif
             if (opt_dsq.has_value()) {
                 m_connman.PushMessage(&pfrom, msgMaker.Make(NetMsgType::DSQUEUE, *opt_dsq));
                 push = true;
@@ -5369,12 +5363,9 @@ void PeerManagerImpl::ProcessMessage(
     {
         //probably one the extensions
 #ifdef ENABLE_WALLET
-        if (m_cj_ctx->queueman) {
-            PostProcessMessage(m_cj_ctx->queueman->ProcessMessage(pfrom.GetId(), m_connman, msg_type, vRecv), pfrom.GetId());
+        if (m_cj_ctx) {
+            PostProcessMessage(m_cj_ctx->processMessage(pfrom, m_chainman.ActiveChainstate(), m_connman, m_mempool, msg_type, vRecv), pfrom.GetId());
         }
-        m_cj_ctx->walletman->ForEachCJClientMan([this, &pfrom, &msg_type, &vRecv](std::unique_ptr<CCoinJoinClientManager>& clientman) {
-            clientman->ProcessMessage(pfrom, m_chainman.ActiveChainstate(), m_connman, m_mempool, msg_type, vRecv);
-        });
 #endif // ENABLE_WALLET
         if (m_active_ctx) {
             PostProcessMessage(m_active_ctx->cj_server->ProcessMessage(pfrom, msg_type, vRecv), pfrom.GetId());
diff --git a/src/rpc/coinjoin.cpp b/src/rpc/coinjoin.cpp
index ef578d726101..225936dae6db 100644
--- a/src/rpc/coinjoin.cpp
+++ b/src/rpc/coinjoin.cpp
@@ -473,8 +473,10 @@ static RPCHelpMan getcoinjoininfo()
 #ifdef ENABLE_WALLET
     CCoinJoinClientOptions::GetJsonInfo(obj);
 
-    if (node.cj_ctx->queueman) {
-        obj.pushKV("queue_size", node.cj_ctx->queueman->GetQueueSize());
+    if (node.cj_ctx) {
+        if (auto queue_size = node.cj_ctx->getQueueSize()) {
+            obj.pushKV("queue_size", queue_size.value());
+        }
     }
 
     const std::shared_ptr<const CWallet> wallet = GetWalletForJSONRPCRequest(request);
diff --git a/src/wallet/test/coinjoin_tests.cpp b/src/wallet/test/coinjoin_tests.cpp
index 7c3cc037de43..688f72efceb0 100644
--- a/src/wallet/test/coinjoin_tests.cpp
+++ b/src/wallet/test/coinjoin_tests.cpp
@@ -221,17 +221,15 @@ class CTransactionBuilderTestSetup : public TestChain100Setup
 
 BOOST_FIXTURE_TEST_CASE(coinjoin_manager_start_stop_tests, CTransactionBuilderTestSetup)
 {
-    CCoinJoinClientManager* cj_man = m_node.cj_ctx->walletman->Get("");
-    BOOST_REQUIRE(cj_man != nullptr);
-    BOOST_CHECK_EQUAL(cj_man->IsMixing(), false);
-    BOOST_CHECK_EQUAL(cj_man->StartMixing(), true);
-    BOOST_CHECK_EQUAL(cj_man->IsMixing(), true);
-    BOOST_CHECK_EQUAL(cj_man->StartMixing(), false);
-    cj_man->StopMixing();
-    BOOST_CHECK_EQUAL(cj_man->IsMixing(), false);
+    auto& cj_man = *Assert(m_node.cj_ctx->getClient(""));
+    BOOST_CHECK_EQUAL(cj_man.IsMixing(), false);
+    BOOST_CHECK_EQUAL(cj_man.StartMixing(), true);
+    BOOST_CHECK_EQUAL(cj_man.IsMixing(), true);
+    BOOST_CHECK_EQUAL(cj_man.StartMixing(), false);
+    cj_man.StopMixing();
+    BOOST_CHECK_EQUAL(cj_man.IsMixing(), false);
 }
 
-
 BOOST_FIXTURE_TEST_CASE(CTransactionBuilderTest, CTransactionBuilderTestSetup)
 {
     // NOTE: Mock wallet version is FEATURE_BASE which means that it uses uncompressed pubkeys

From 80c201b58e4ed0785cca4c6c82cc528d43bdfa6a Mon Sep 17 00:00:00 2001
From: Kittywhiskers Van Gogh <63189531+kwvg@users.noreply.github.com>
Date: Tue, 30 Sep 2025 10:54:40 +0000
Subject: [PATCH 218/656] refactor: make `CJContext` an interface, move
 implementation to source

This should prevent ENABLE_WALLET from spilling out to files that
include the header.
---
 src/coinjoin/context.cpp                | 115 +++++++++++++++---------
 src/coinjoin/context.h                  |  62 +++++--------
 src/init.cpp                            |  12 ++-
 src/masternode/utils.h                  |   2 +-
 src/net_processing.cpp                  |   6 --
 src/net_processing.h                    |  14 +--
 src/node/context.h                      |   2 +-
 src/test/util/setup_common.cpp          |   6 +-
 test/lint/lint-circular-dependencies.py |   1 -
 9 files changed, 116 insertions(+), 104 deletions(-)

diff --git a/src/coinjoin/context.cpp b/src/coinjoin/context.cpp
index 3584d25bebda..09417ba561c5 100644
--- a/src/coinjoin/context.cpp
+++ b/src/coinjoin/context.cpp
@@ -2,10 +2,15 @@
 // Distributed under the MIT/X11 software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
+#if defined(HAVE_CONFIG_H)
+#include <config/bitcoin-config.h>
+#endif
+
 #include <coinjoin/context.h>
 
 #include <net.h>
 #include <scheduler.h>
+#include <streams.h>
 
 #include <evo/deterministicmns.h>
 
@@ -13,124 +18,148 @@
 #include <coinjoin/client.h>
 #endif // ENABLE_WALLET
 
-CJContext::CJContext(ChainstateManager& chainman, CDeterministicMNManager& dmnman, CMasternodeMetaMan& mn_metaman,
-                     CTxMemPool& mempool, const CActiveMasternodeManager* const mn_activeman,
-                     const CMasternodeSync& mn_sync, const llmq::CInstantSendManager& isman, bool relay_txes)
+#include <memory>
+
 #ifdef ENABLE_WALLET
-    :
+class CJContextImpl final : public CJContext
+{
+public:
+    CJContextImpl(ChainstateManager& chainman, CDeterministicMNManager& dmnman, CMasternodeMetaMan& mn_metaman,
+                  CTxMemPool& mempool, const CActiveMasternodeManager* const mn_activeman,
+                  const CMasternodeSync& mn_sync, const llmq::CInstantSendManager& isman, bool relay_txes);
+    virtual ~CJContextImpl() = default;
+
+public:
+    void Schedule(CConnman& connman, CScheduler& scheduler) override;
+
+public:
+    bool hasQueue(const uint256& hash) const override;
+    CCoinJoinClientManager* getClient(const std::string& name) override;
+    MessageProcessingResult processMessage(CNode& peer, CChainState& chainstate, CConnman& connman, CTxMemPool& mempool,
+                                           std::string_view msg_type, CDataStream& vRecv) override;
+    std::optional<CCoinJoinQueue> getQueueFromHash(const uint256& hash) const override;
+    std::optional<int> getQueueSize() const override;
+    std::vector<CDeterministicMNCPtr> getMixingMasternodes() const override;
+    void addWallet(const std::shared_ptr<wallet::CWallet>& wallet) override;
+    void removeWallet(const std::string& name) override;
+    void flushWallet(const std::string& name) override;
+
+protected:
+    // CValidationInterface
+    void UpdatedBlockTip(const CBlockIndex* pindexNew, const CBlockIndex* pindexFork, bool fInitialDownload) override;
+
+private:
+    const bool m_relay_txes;
+
+    const std::unique_ptr<CoinJoinWalletManager> walletman;
+    const std::unique_ptr<CCoinJoinClientQueueManager> queueman;
+};
+
+CJContextImpl::CJContextImpl(ChainstateManager& chainman, CDeterministicMNManager& dmnman, CMasternodeMetaMan& mn_metaman,
+                             CTxMemPool& mempool, const CActiveMasternodeManager* const mn_activeman,
+                             const CMasternodeSync& mn_sync, const llmq::CInstantSendManager& isman, bool relay_txes) :
     m_relay_txes{relay_txes},
     walletman{std::make_unique<CoinJoinWalletManager>(chainman, dmnman, mn_metaman, mempool, mn_sync, isman, queueman,
                                                       /*is_masternode=*/mn_activeman != nullptr)},
     queueman{m_relay_txes ? std::make_unique<CCoinJoinClientQueueManager>(*walletman, dmnman, mn_metaman, mn_sync,
                                                                           /*is_masternode=*/mn_activeman != nullptr)
                           : nullptr}
-#endif // ENABLE_WALLET
-{}
-
-CJContext::~CJContext() = default;
+{
+}
 
-void CJContext::Schedule(CConnman& connman, CScheduler& scheduler)
+void CJContextImpl::Schedule(CConnman& connman, CScheduler& scheduler)
 {
-#ifdef ENABLE_WALLET
     if (!m_relay_txes) return;
     scheduler.scheduleEvery(std::bind(&CCoinJoinClientQueueManager::DoMaintenance, std::ref(*queueman)),
                             std::chrono::seconds{1});
     scheduler.scheduleEvery(std::bind(&CoinJoinWalletManager::DoMaintenance, std::ref(*walletman), std::ref(connman)),
                             std::chrono::seconds{1});
-#endif // ENABLE_WALLET
 }
 
-void CJContext::UpdatedBlockTip(const CBlockIndex* pindexNew, const CBlockIndex* pindexFork, bool fInitialDownload)
+void CJContextImpl::UpdatedBlockTip(const CBlockIndex* pindexNew, const CBlockIndex* pindexFork, bool fInitialDownload)
 {
-#ifdef ENABLE_WALLET
     if (fInitialDownload || pindexNew == pindexFork) // In IBD or blocks were disconnected without any new ones
         return;
 
     walletman->ForEachCJClientMan(
         [&pindexNew](std::unique_ptr<CCoinJoinClientManager>& clientman) { clientman->UpdatedBlockTip(pindexNew); });
-#endif // ENABLE_WALLET
 }
 
-bool CJContext::hasQueue(const uint256& hash) const
+bool CJContextImpl::hasQueue(const uint256& hash) const
 {
-#ifdef ENABLE_WALLET
     if (queueman) {
         return queueman->HasQueue(hash);
     }
-#endif // ENABLE_WALLET
     return false;
 }
 
-CCoinJoinClientManager* CJContext::getClient(const std::string& name)
+CCoinJoinClientManager* CJContextImpl::getClient(const std::string& name)
 {
-#ifdef ENABLE_WALLET
     return walletman->Get(name);
-#else
-    return nullptr;
-#endif // ENABLE_WALLET
 }
 
-MessageProcessingResult CJContext::processMessage(CNode& pfrom, CChainState& chainstate, CConnman& connman,
-                                                  CTxMemPool& mempool, std::string_view msg_type, CDataStream& vRecv)
+MessageProcessingResult CJContextImpl::processMessage(CNode& pfrom, CChainState& chainstate, CConnman& connman,
+                                                      CTxMemPool& mempool, std::string_view msg_type, CDataStream& vRecv)
 {
-#ifdef ENABLE_WALLET
     walletman->ForEachCJClientMan([&](std::unique_ptr<CCoinJoinClientManager>& clientman) {
         clientman->ProcessMessage(pfrom, chainstate, connman, mempool, msg_type, vRecv);
     });
     if (queueman) {
         return queueman->ProcessMessage(pfrom.GetId(), connman, msg_type, vRecv);
     }
-#endif // ENABLE_WALLET
     return {};
 }
 
-std::optional<CCoinJoinQueue> CJContext::getQueueFromHash(const uint256& hash) const
+std::optional<CCoinJoinQueue> CJContextImpl::getQueueFromHash(const uint256& hash) const
 {
-#ifdef ENABLE_WALLET
     if (queueman) {
         return queueman->GetQueueFromHash(hash);
     }
-#endif // ENABLE_WALLET
     return std::nullopt;
 }
 
-std::optional<int> CJContext::getQueueSize() const
+std::optional<int> CJContextImpl::getQueueSize() const
 {
-#ifdef ENABLE_WALLET
     if (queueman) {
         return queueman->GetQueueSize();
     }
-#endif // ENABLE_WALLET
     return std::nullopt;
 }
 
-std::vector<CDeterministicMNCPtr> CJContext::getMixingMasternodes() const
+std::vector<CDeterministicMNCPtr> CJContextImpl::getMixingMasternodes() const
 {
     std::vector<CDeterministicMNCPtr> ret{};
-#ifdef ENABLE_WALLET
     walletman->ForEachCJClientMan(
         [&](const std::unique_ptr<CCoinJoinClientManager>& clientman) { clientman->GetMixingMasternodesInfo(ret); });
-#endif // ENABLE_WALLET
     return ret;
 }
 
-void CJContext::addWallet(const std::shared_ptr<wallet::CWallet>& wallet)
+void CJContextImpl::addWallet(const std::shared_ptr<wallet::CWallet>& wallet)
 {
-#ifdef ENABLE_WALLET
     walletman->Add(wallet);
-#endif // ENABLE_WALLET
 }
 
-void CJContext::flushWallet(const std::string& name)
+void CJContextImpl::flushWallet(const std::string& name)
 {
-#ifdef ENABLE_WALLET
     walletman->Flush(name);
-#endif // ENABLE_WALLET
 }
 
-void CJContext::removeWallet(const std::string& name)
+void CJContextImpl::removeWallet(const std::string& name)
 {
-#ifdef ENABLE_WALLET
     walletman->Remove(name);
+}
+#endif // ENABLE_WALLET
+
+std::unique_ptr<CJContext> CJContext::make(ChainstateManager& chainman, CDeterministicMNManager& dmnman,
+                                           CMasternodeMetaMan& mn_metaman, CTxMemPool& mempool,
+                                           const CActiveMasternodeManager* const mn_activeman,
+                                           const CMasternodeSync& mn_sync, const llmq::CInstantSendManager& isman,
+                                           bool relay_txes)
+{
+#ifdef ENABLE_WALLET
+    return std::make_unique<CJContextImpl>(chainman, dmnman, mn_metaman, mempool, mn_activeman, mn_sync, isman, relay_txes);
+#else
+    // Cannot be constructed if wallet support isn't built
+    return nullptr;
 #endif // ENABLE_WALLET
 }
diff --git a/src/coinjoin/context.h b/src/coinjoin/context.h
index 96edc00d505c..be843d6ab9bb 100644
--- a/src/coinjoin/context.h
+++ b/src/coinjoin/context.h
@@ -5,16 +5,11 @@
 #ifndef BITCOIN_COINJOIN_CONTEXT_H
 #define BITCOIN_COINJOIN_CONTEXT_H
 
-#if defined(HAVE_CONFIG_H)
-#include <config/bitcoin-config.h>
-#endif
-
 #include <evo/types.h>
 #include <msg_result.h>
 
 #include <validationinterface.h>
 
-#include <memory>
 #include <optional>
 #include <string_view>
 
@@ -24,6 +19,7 @@ class CChainState;
 class CCoinJoinClientManager;
 class CCoinJoinQueue;
 class CConnman;
+class CDataStream;
 class CDeterministicMNManager;
 class ChainstateManager;
 class CMasternodeMetaMan;
@@ -38,45 +34,35 @@ namespace wallet {
 class CWallet;
 } // namespace wallet
 
-#ifdef ENABLE_WALLET
-class CCoinJoinClientQueueManager;
-class CoinJoinWalletManager;
-#endif // ENABLE_WALLET
-
-struct CJContext final : public CValidationInterface {
+class CJContext : public CValidationInterface
+{
 public:
-    CJContext() = delete;
-    CJContext(const CJContext&) = delete;
-    CJContext(ChainstateManager& chainman, CDeterministicMNManager& dmnman, CMasternodeMetaMan& mn_metaman,
-              CTxMemPool& mempool, const CActiveMasternodeManager* const mn_activeman, const CMasternodeSync& mn_sync,
-              const llmq::CInstantSendManager& isman, bool relay_txes);
-    virtual ~CJContext();
+    static std::unique_ptr<CJContext> make(ChainstateManager& chainman, CDeterministicMNManager& dmnman,
+                                           CMasternodeMetaMan& mn_metaman, CTxMemPool& mempool,
+                                           const CActiveMasternodeManager* const mn_activeman,
+                                           const CMasternodeSync& mn_sync, const llmq::CInstantSendManager& isman,
+                                           bool relay_txes);
+    virtual ~CJContext() = default;
 
-    void Schedule(CConnman& connman, CScheduler& scheduler);
+public:
+    virtual void Schedule(CConnman& connman, CScheduler& scheduler) = 0;
 
-    bool hasQueue(const uint256& hash) const;
-    CCoinJoinClientManager* getClient(const std::string& name);
-    MessageProcessingResult processMessage(CNode& peer, CChainState& chainstate, CConnman& connman, CTxMemPool& mempool,
-                                           std::string_view msg_type, CDataStream& vRecv);
-    std::optional<CCoinJoinQueue> getQueueFromHash(const uint256& hash) const;
-    std::optional<int> getQueueSize() const;
-    std::vector<CDeterministicMNCPtr> getMixingMasternodes() const;
-    void addWallet(const std::shared_ptr<wallet::CWallet>& wallet);
-    void removeWallet(const std::string& name);
-    void flushWallet(const std::string& name);
+public:
+    virtual bool hasQueue(const uint256& hash) const = 0;
+    virtual CCoinJoinClientManager* getClient(const std::string& name) = 0;
+    virtual MessageProcessingResult processMessage(CNode& peer, CChainState& chainstate, CConnman& connman,
+                                                   CTxMemPool& mempool, std::string_view msg_type, CDataStream& vRecv) = 0;
+    virtual std::optional<CCoinJoinQueue> getQueueFromHash(const uint256& hash) const = 0;
+    virtual std::optional<int> getQueueSize() const = 0;
+    virtual std::vector<CDeterministicMNCPtr> getMixingMasternodes() const = 0;
+    virtual void addWallet(const std::shared_ptr<wallet::CWallet>& wallet) = 0;
+    virtual void removeWallet(const std::string& name) = 0;
+    virtual void flushWallet(const std::string& name) = 0;
 
 protected:
     // CValidationInterface
-    void UpdatedBlockTip(const CBlockIndex* pindexNew, const CBlockIndex* pindexFork, bool fInitialDownload) override;
-
-#ifdef ENABLE_WALLET
-private:
-    const bool m_relay_txes;
-
-    // The main object for accessing mixing
-    const std::unique_ptr<CoinJoinWalletManager> walletman;
-    const std::unique_ptr<CCoinJoinClientQueueManager> queueman;
-#endif // ENABLE_WALLET
+    virtual void UpdatedBlockTip(const CBlockIndex* pindexNew, const CBlockIndex* pindexFork,
+                                 bool fInitialDownload) override = 0;
 };
 
 #endif // BITCOIN_COINJOIN_CONTEXT_H
diff --git a/src/init.cpp b/src/init.cpp
index ab1b92040c93..621b3d07432e 100644
--- a/src/init.cpp
+++ b/src/init.cpp
@@ -2136,11 +2136,15 @@ bool AppInitMain(NodeContext& node, interfaces::BlockAndHeaderTipInfo* tip_info)
 
     ChainstateManager& chainman = *Assert(node.chainman);
 
+    assert(!node.dstxman);
     node.dstxman = std::make_unique<CDSTXManager>();
-    node.cj_ctx = std::make_unique<CJContext>(chainman, *node.dmnman, *node.mn_metaman, *node.mempool,
-                                              node.mn_activeman.get(), *node.mn_sync, *node.llmq_ctx->isman,
-                                              !ignores_incoming_txs);
-    RegisterValidationInterface(node.cj_ctx.get());
+
+    assert(!node.cj_ctx);
+    node.cj_ctx = CJContext::make(chainman, *node.dmnman, *node.mn_metaman, *node.mempool, node.mn_activeman.get(),
+                                  *node.mn_sync, *node.llmq_ctx->isman, !ignores_incoming_txs);
+    if (node.cj_ctx) {
+        RegisterValidationInterface(node.cj_ctx.get());
+    }
 
     assert(!node.peerman);
     node.peerman = PeerManager::make(chainparams, *node.connman, *node.addrman, node.banman.get(), *node.dstxman,
diff --git a/src/masternode/utils.h b/src/masternode/utils.h
index 2350dc0160de..0c9b2adfec18 100644
--- a/src/masternode/utils.h
+++ b/src/masternode/utils.h
@@ -8,7 +8,7 @@
 class CConnman;
 class CDeterministicMNManager;
 class CMasternodeSync;
-struct CJContext;
+class CJContext;
 
 class CMasternodeUtils
 {
diff --git a/src/net_processing.cpp b/src/net_processing.cpp
index 9999afe898ab..5bab7573f9bd 100644
--- a/src/net_processing.cpp
+++ b/src/net_processing.cpp
@@ -66,10 +66,6 @@
 #include <spork.h>
 #include <stats/client.h>
 
-#ifdef ENABLE_WALLET
-#include <coinjoin/client.h>
-#endif // ENABLE_WALLET
-
 #include <algorithm>
 #include <atomic>
 #include <chrono>
@@ -5362,11 +5358,9 @@ void PeerManagerImpl::ProcessMessage(
     if (found)
     {
         //probably one the extensions
-#ifdef ENABLE_WALLET
         if (m_cj_ctx) {
             PostProcessMessage(m_cj_ctx->processMessage(pfrom, m_chainman.ActiveChainstate(), m_connman, m_mempool, msg_type, vRecv), pfrom.GetId());
         }
-#endif // ENABLE_WALLET
         if (m_active_ctx) {
             PostProcessMessage(m_active_ctx->cj_server->ProcessMessage(pfrom, msg_type, vRecv), pfrom.GetId());
         }
diff --git a/src/net_processing.h b/src/net_processing.h
index de81c5f846f6..0a1e3b2b37d4 100644
--- a/src/net_processing.h
+++ b/src/net_processing.h
@@ -14,22 +14,22 @@
 
 #include <atomic>
 
-class CActiveMasternodeManager;
 class AddrMan;
-class CTxMemPool;
+class CActiveMasternodeManager;
 class CCoinJoinQueue;
+class CCoinJoinServer;
 class CDeterministicMNManager;
 class CDSTXManager;
-class CMasternodeMetaMan;
-class CMasternodeSync;
-class ChainstateManager;
-class CCoinJoinServer;
 class CGovernanceManager;
+class ChainstateManager;
 class CInv;
+class CJContext;
+class CMasternodeMetaMan;
+class CMasternodeSync;
 class CSporkManager;
 class CTransaction;
+class CTxMemPool;
 struct ActiveContext;
-struct CJContext;
 struct LLMQContext;
 
 /** Default for -maxorphantxsize, maximum size in megabytes the orphan map can grow before entries are removed */
diff --git a/src/node/context.h b/src/node/context.h
index 439fd3a8aab8..8429e10daf57 100644
--- a/src/node/context.h
+++ b/src/node/context.h
@@ -23,6 +23,7 @@ class CChainstateHelper;
 class ChainstateManager;
 class CEvoDB;
 class CGovernanceManager;
+class CJContext;
 class CMasternodeMetaMan;
 class CMasternodeSync;
 class CNetFulfilledRequestManager;
@@ -33,7 +34,6 @@ class CMNHFManager;
 class NetGroupManager;
 class PeerManager;
 struct ActiveContext;
-struct CJContext;
 struct LLMQContext;
 
 namespace interfaces {
diff --git a/src/test/util/setup_common.cpp b/src/test/util/setup_common.cpp
index 6881691e9e6e..db7298e92fa9 100644
--- a/src/test/util/setup_common.cpp
+++ b/src/test/util/setup_common.cpp
@@ -354,9 +354,9 @@ TestingSetup::TestingSetup(const std::string& chainName, const std::vector<const
         m_node.connman->Init(options);
     }
 
-    m_node.cj_ctx = std::make_unique<CJContext>(*m_node.chainman, *m_node.dmnman, *m_node.mn_metaman, *m_node.mempool,
-                                                /*mn_activeman=*/nullptr, *m_node.mn_sync, *m_node.llmq_ctx->isman,
-                                                /*relay_txes=*/true);
+    m_node.cj_ctx = CJContext::make(*m_node.chainman, *m_node.dmnman, *m_node.mn_metaman, *m_node.mempool,
+                                    /*mn_activeman=*/nullptr, *m_node.mn_sync, *m_node.llmq_ctx->isman,
+                                    /*relay_txes=*/true);
 
 #ifdef ENABLE_WALLET
     // WalletInit::Construct()-like logic needed for wallet tests that run on
diff --git a/test/lint/lint-circular-dependencies.py b/test/lint/lint-circular-dependencies.py
index 3208860b5da5..e05e64a50d7d 100755
--- a/test/lint/lint-circular-dependencies.py
+++ b/test/lint/lint-circular-dependencies.py
@@ -31,7 +31,6 @@
     "chainlock/chainlock -> validation -> chainlock/chainlock",
     "chainlock/chainlock -> validation -> evo/chainhelper -> chainlock/chainlock",
     "chainlock/signing -> instantsend/instantsend -> net_processing -> masternode/active/context -> chainlock/signing",
-    "coinjoin/client -> coinjoin/coinjoin -> instantsend/instantsend -> net_processing -> coinjoin/client",
     "coinjoin/client -> coinjoin/coinjoin -> instantsend/instantsend -> net_processing -> coinjoin/context -> coinjoin/client",
     "coinjoin/coinjoin -> instantsend/instantsend -> llmq/quorums -> msg_result -> coinjoin/coinjoin",
     "coinjoin/server -> net_processing -> coinjoin/server",

From 1a35a65cf58b5e24e60185f3fdb603ef2b227793 Mon Sep 17 00:00:00 2001
From: Kittywhiskers Van Gogh <63189531+kwvg@users.noreply.github.com>
Date: Tue, 30 Sep 2025 11:11:34 +0000
Subject: [PATCH 219/656] refactor: drop `mn_activeman` from `CJContext`

Now that we no longer assume that cj_ctx is always initialized, we can
skip the whole process if we are in masternode mode.
---
 src/coinjoin/context.cpp               | 17 +++++------
 src/coinjoin/context.h                 |  2 --
 src/init.cpp                           |  8 +++--
 src/net_processing.cpp                 |  9 +++---
 src/net_processing.h                   |  4 +--
 src/test/denialofservice_tests.cpp     | 10 +++----
 src/test/net_peer_connection_tests.cpp |  2 +-
 src/test/util/setup_common.cpp         | 41 +++++++++++++-------------
 8 files changed, 46 insertions(+), 47 deletions(-)

diff --git a/src/coinjoin/context.cpp b/src/coinjoin/context.cpp
index 09417ba561c5..8405fd8a2eb5 100644
--- a/src/coinjoin/context.cpp
+++ b/src/coinjoin/context.cpp
@@ -25,8 +25,8 @@ class CJContextImpl final : public CJContext
 {
 public:
     CJContextImpl(ChainstateManager& chainman, CDeterministicMNManager& dmnman, CMasternodeMetaMan& mn_metaman,
-                  CTxMemPool& mempool, const CActiveMasternodeManager* const mn_activeman,
-                  const CMasternodeSync& mn_sync, const llmq::CInstantSendManager& isman, bool relay_txes);
+                  CTxMemPool& mempool, const CMasternodeSync& mn_sync, const llmq::CInstantSendManager& isman,
+                  bool relay_txes);
     virtual ~CJContextImpl() = default;
 
 public:
@@ -55,14 +55,14 @@ class CJContextImpl final : public CJContext
     const std::unique_ptr<CCoinJoinClientQueueManager> queueman;
 };
 
-CJContextImpl::CJContextImpl(ChainstateManager& chainman, CDeterministicMNManager& dmnman, CMasternodeMetaMan& mn_metaman,
-                             CTxMemPool& mempool, const CActiveMasternodeManager* const mn_activeman,
-                             const CMasternodeSync& mn_sync, const llmq::CInstantSendManager& isman, bool relay_txes) :
+CJContextImpl::CJContextImpl(ChainstateManager& chainman, CDeterministicMNManager& dmnman,
+                             CMasternodeMetaMan& mn_metaman, CTxMemPool& mempool, const CMasternodeSync& mn_sync,
+                             const llmq::CInstantSendManager& isman, bool relay_txes) :
     m_relay_txes{relay_txes},
     walletman{std::make_unique<CoinJoinWalletManager>(chainman, dmnman, mn_metaman, mempool, mn_sync, isman, queueman,
-                                                      /*is_masternode=*/mn_activeman != nullptr)},
+                                                      /*is_masternode=*/false)},
     queueman{m_relay_txes ? std::make_unique<CCoinJoinClientQueueManager>(*walletman, dmnman, mn_metaman, mn_sync,
-                                                                          /*is_masternode=*/mn_activeman != nullptr)
+                                                                          /*is_masternode=*/false)
                           : nullptr}
 {
 }
@@ -152,12 +152,11 @@ void CJContextImpl::removeWallet(const std::string& name)
 
 std::unique_ptr<CJContext> CJContext::make(ChainstateManager& chainman, CDeterministicMNManager& dmnman,
                                            CMasternodeMetaMan& mn_metaman, CTxMemPool& mempool,
-                                           const CActiveMasternodeManager* const mn_activeman,
                                            const CMasternodeSync& mn_sync, const llmq::CInstantSendManager& isman,
                                            bool relay_txes)
 {
 #ifdef ENABLE_WALLET
-    return std::make_unique<CJContextImpl>(chainman, dmnman, mn_metaman, mempool, mn_activeman, mn_sync, isman, relay_txes);
+    return std::make_unique<CJContextImpl>(chainman, dmnman, mn_metaman, mempool, mn_sync, isman, relay_txes);
 #else
     // Cannot be constructed if wallet support isn't built
     return nullptr;
diff --git a/src/coinjoin/context.h b/src/coinjoin/context.h
index be843d6ab9bb..9e9b5de11846 100644
--- a/src/coinjoin/context.h
+++ b/src/coinjoin/context.h
@@ -13,7 +13,6 @@
 #include <optional>
 #include <string_view>
 
-class CActiveMasternodeManager;
 class CBlockIndex;
 class CChainState;
 class CCoinJoinClientManager;
@@ -39,7 +38,6 @@ class CJContext : public CValidationInterface
 public:
     static std::unique_ptr<CJContext> make(ChainstateManager& chainman, CDeterministicMNManager& dmnman,
                                            CMasternodeMetaMan& mn_metaman, CTxMemPool& mempool,
-                                           const CActiveMasternodeManager* const mn_activeman,
                                            const CMasternodeSync& mn_sync, const llmq::CInstantSendManager& isman,
                                            bool relay_txes);
     virtual ~CJContext() = default;
diff --git a/src/init.cpp b/src/init.cpp
index 621b3d07432e..27eaf71fae31 100644
--- a/src/init.cpp
+++ b/src/init.cpp
@@ -2140,8 +2140,10 @@ bool AppInitMain(NodeContext& node, interfaces::BlockAndHeaderTipInfo* tip_info)
     node.dstxman = std::make_unique<CDSTXManager>();
 
     assert(!node.cj_ctx);
-    node.cj_ctx = CJContext::make(chainman, *node.dmnman, *node.mn_metaman, *node.mempool, node.mn_activeman.get(),
-                                  *node.mn_sync, *node.llmq_ctx->isman, !ignores_incoming_txs);
+    if (!node.mn_activeman) {
+        node.cj_ctx = CJContext::make(chainman, *node.dmnman, *node.mn_metaman, *node.mempool, *node.mn_sync,
+                                      *node.llmq_ctx->isman, !ignores_incoming_txs);
+    }
     if (node.cj_ctx) {
         RegisterValidationInterface(node.cj_ctx.get());
     }
@@ -2150,7 +2152,7 @@ bool AppInitMain(NodeContext& node, interfaces::BlockAndHeaderTipInfo* tip_info)
     node.peerman = PeerManager::make(chainparams, *node.connman, *node.addrman, node.banman.get(), *node.dstxman,
                                      chainman, *node.mempool, *node.mn_metaman, *node.mn_sync,
                                      *node.govman, *node.sporkman, node.mn_activeman.get(), node.dmnman,
-                                     node.active_ctx, node.cj_ctx, node.llmq_ctx, ignores_incoming_txs);
+                                     node.active_ctx, node.cj_ctx.get(), node.llmq_ctx, ignores_incoming_txs);
     RegisterValidationInterface(node.peerman.get());
 
     g_ds_notification_interface = std::make_unique<CDSNotificationInterface>(
diff --git a/src/net_processing.cpp b/src/net_processing.cpp
index 5bab7573f9bd..962b64db38ff 100644
--- a/src/net_processing.cpp
+++ b/src/net_processing.cpp
@@ -592,7 +592,7 @@ class PeerManagerImpl final : public PeerManager
                     CMasternodeMetaMan& mn_metaman, CMasternodeSync& mn_sync, CGovernanceManager& govman,
                     CSporkManager& sporkman, const CActiveMasternodeManager* const mn_activeman,
                     const std::unique_ptr<CDeterministicMNManager>& dmnman,
-                    const std::unique_ptr<ActiveContext>& active_ctx, const std::unique_ptr<CJContext>& cj_ctx,
+                    const std::unique_ptr<ActiveContext>& active_ctx, CJContext* const cj_ctx,
                     const std::unique_ptr<LLMQContext>& llmq_ctx, bool ignore_incoming_txs);
 
     /** Overridden from CValidationInterface. */
@@ -788,7 +788,8 @@ class PeerManagerImpl final : public PeerManager
     std::unique_ptr<TxReconciliationTracker> m_txreconciliation;
     const std::unique_ptr<CDeterministicMNManager>& m_dmnman;
     const std::unique_ptr<ActiveContext>& m_active_ctx;
-    const std::unique_ptr<CJContext>& m_cj_ctx;
+    /** Pointer to this node's CJContext. May be nullptr - check existence before dereferencing. */
+    CJContext* const m_cj_ctx;
     const std::unique_ptr<LLMQContext>& m_llmq_ctx;
     CMasternodeMetaMan& m_mn_metaman;
     CMasternodeSync& m_mn_sync;
@@ -1962,7 +1963,7 @@ std::unique_ptr<PeerManager> PeerManager::make(const CChainParams& chainparams,
                                                const CActiveMasternodeManager* const mn_activeman,
                                                const std::unique_ptr<CDeterministicMNManager>& dmnman,
                                                const std::unique_ptr<ActiveContext>& active_ctx,
-                                               const std::unique_ptr<CJContext>& cj_ctx,
+                                               CJContext* const cj_ctx,
                                                const std::unique_ptr<LLMQContext>& llmq_ctx, bool ignore_incoming_txs)
 {
     return std::make_unique<PeerManagerImpl>(chainparams, connman, addrman, banman, dstxman, chainman, pool, mn_metaman, mn_sync, govman, sporkman, mn_activeman, dmnman, active_ctx, cj_ctx, llmq_ctx, ignore_incoming_txs);
@@ -1974,7 +1975,7 @@ PeerManagerImpl::PeerManagerImpl(const CChainParams& chainparams, CConnman& conn
                                  CSporkManager& sporkman, const CActiveMasternodeManager* const mn_activeman,
                                  const std::unique_ptr<CDeterministicMNManager>& dmnman,
                                  const std::unique_ptr<ActiveContext>& active_ctx,
-                                 const std::unique_ptr<CJContext>& cj_ctx,
+                                 CJContext* const cj_ctx,
                                  const std::unique_ptr<LLMQContext>& llmq_ctx, bool ignore_incoming_txs)
     : m_chainparams(chainparams),
       m_connman(connman),
diff --git a/src/net_processing.h b/src/net_processing.h
index 0a1e3b2b37d4..f957a14011cb 100644
--- a/src/net_processing.h
+++ b/src/net_processing.h
@@ -65,8 +65,8 @@ class PeerManager : public CValidationInterface, public NetEventsInterface
                                              const CActiveMasternodeManager* const mn_activeman,
                                              const std::unique_ptr<CDeterministicMNManager>& dmnman,
                                              const std::unique_ptr<ActiveContext>& active_ctx,
-                                             const std::unique_ptr<CJContext>& cj_ctx,
-                                             const std::unique_ptr<LLMQContext>& llmq_ctx, bool ignore_incoming_txs);
+                                             CJContext* const cj_ctx, const std::unique_ptr<LLMQContext>& llmq_ctx,
+                                             bool ignore_incoming_txs);
     virtual ~PeerManager() { }
 
     /**
diff --git a/src/test/denialofservice_tests.cpp b/src/test/denialofservice_tests.cpp
index d8e573c61c63..6a3c993e644f 100644
--- a/src/test/denialofservice_tests.cpp
+++ b/src/test/denialofservice_tests.cpp
@@ -151,7 +151,7 @@ BOOST_AUTO_TEST_CASE(stale_tip_peer_management)
     auto peerLogic = PeerManager::make(chainparams, *connman, *m_node.addrman, /*banman=*/nullptr, *m_node.dstxman,
                                        *m_node.chainman, *m_node.mempool, *m_node.mn_metaman, *m_node.mn_sync,
                                        *m_node.govman, *m_node.sporkman, /*mn_activeman=*/ nullptr, m_node.dmnman,
-                                       /*active_ctx=*/nullptr, m_node.cj_ctx, m_node.llmq_ctx, /*ignore_incoming_txs=*/false);
+                                       /*active_ctx=*/nullptr, /*cj_ctx=*/nullptr, m_node.llmq_ctx, /*ignore_incoming_txs=*/false);
 
     constexpr int max_outbound_full_relay = MAX_OUTBOUND_FULL_RELAY_CONNECTIONS;
     CConnman::Options options;
@@ -254,8 +254,8 @@ BOOST_AUTO_TEST_CASE(block_relay_only_eviction)
     auto connman = std::make_unique<ConnmanTestMsg>(0x1337, 0x1337, *m_node.addrman, *m_node.netgroupman);
     auto peerLogic = PeerManager::make(chainparams, *connman, *m_node.addrman, /*banman=*/nullptr, *m_node.dstxman,
                                        *m_node.chainman, *m_node.mempool, *m_node.mn_metaman, *m_node.mn_sync,
-                                       *m_node.govman, *m_node.sporkman, /*mn_activeman=*/ nullptr, m_node.dmnman,
-                                       /*active_ctx=*/nullptr, m_node.cj_ctx, m_node.llmq_ctx, /*ignore_incoming_txs=*/false);
+                                       *m_node.govman, *m_node.sporkman, /*mn_activeman=*/nullptr, m_node.dmnman,
+                                       /*active_ctx=*/nullptr, /*cj_ctx=*/nullptr, m_node.llmq_ctx, /*ignore_incoming_txs=*/false);
 
     constexpr int max_outbound_block_relay{MAX_BLOCK_RELAY_ONLY_CONNECTIONS};
     constexpr int64_t MINIMUM_CONNECT_TIME{30};
@@ -322,7 +322,7 @@ BOOST_AUTO_TEST_CASE(peer_discouragement)
     auto peerLogic = PeerManager::make(chainparams, *connman, *m_node.addrman, banman.get(), *m_node.dstxman,
                                        *m_node.chainman, *m_node.mempool, *m_node.mn_metaman, *m_node.mn_sync,
                                        *m_node.govman, *m_node.sporkman, /*mn_activeman=*/nullptr, m_node.dmnman,
-                                       /*active_ctx=*/nullptr, m_node.cj_ctx, m_node.llmq_ctx, /*ignore_incoming_txs=*/false);
+                                       /*active_ctx=*/nullptr, /*cj_ctx=*/nullptr, m_node.llmq_ctx, /*ignore_incoming_txs=*/false);
 
     CNetAddr tor_netaddr;
     BOOST_REQUIRE(
@@ -427,7 +427,7 @@ BOOST_AUTO_TEST_CASE(DoS_bantime)
     auto peerLogic = PeerManager::make(chainparams, *connman, *m_node.addrman, banman.get(), *m_node.dstxman,
                                        *m_node.chainman, *m_node.mempool, *m_node.mn_metaman, *m_node.mn_sync,
                                        *m_node.govman, *m_node.sporkman, /*mn_activeman=*/nullptr, m_node.dmnman,
-                                       /*active_ctx=*/nullptr, m_node.cj_ctx, m_node.llmq_ctx, /*ignore_incoming_txs=*/false);
+                                       /*active_ctx=*/nullptr, /*cj_ctx=*/nullptr, m_node.llmq_ctx, /*ignore_incoming_txs=*/false);
 
     banman->ClearBanned();
     int64_t nStartTime = GetTime();
diff --git a/src/test/net_peer_connection_tests.cpp b/src/test/net_peer_connection_tests.cpp
index a883f9c6ba1e..966aec6dddce 100644
--- a/src/test/net_peer_connection_tests.cpp
+++ b/src/test/net_peer_connection_tests.cpp
@@ -88,7 +88,7 @@ BOOST_AUTO_TEST_CASE(test_addnode_getaddednodeinfo_and_connection_detection)
     auto peerman = PeerManager::make(chainparams, *connman, *m_node.addrman, /*banman=*/nullptr, *m_node.dstxman,
                                      *m_node.chainman, *m_node.mempool, *m_node.mn_metaman, *m_node.mn_sync,
                                      *m_node.govman, *m_node.sporkman, /*mn_activeman=*/nullptr, m_node.dmnman,
-                                     /*active_ctx=*/nullptr, m_node.cj_ctx, m_node.llmq_ctx, /*ignore_incoming_txs=*/false);
+                                     /*active_ctx=*/nullptr, /*cj_ctx=*/nullptr, m_node.llmq_ctx, /*ignore_incoming_txs=*/false);
     NodeId id{0};
     std::vector<CNode*> nodes;
 
diff --git a/src/test/util/setup_common.cpp b/src/test/util/setup_common.cpp
index db7298e92fa9..727550fe44b6 100644
--- a/src/test/util/setup_common.cpp
+++ b/src/test/util/setup_common.cpp
@@ -342,23 +342,12 @@ TestingSetup::TestingSetup(const std::string& chainName, const std::vector<const
     assert(!maybe_verify_error.has_value());
 
     m_node.dstxman = std::make_unique<CDSTXManager>();
-    m_node.banman = std::make_unique<BanMan>(m_args.GetDataDirBase() / "banlist", nullptr, DEFAULT_MISBEHAVING_BANTIME);
-    m_node.peerman = PeerManager::make(chainparams, *m_node.connman, *m_node.addrman, m_node.banman.get(), *m_node.dstxman,
-                                       *m_node.chainman, *m_node.mempool, *m_node.mn_metaman, *m_node.mn_sync,
-                                       *m_node.govman, *m_node.sporkman, /*mn_activeman=*/nullptr, m_node.dmnman,
-                                       /*active_ctx=*/nullptr, m_node.cj_ctx, m_node.llmq_ctx, /*ignore_incoming_txs=*/false);
-    {
-        CConnman::Options options;
-        options.m_msgproc = m_node.peerman.get();
-        options.socketEventsMode = ::g_socket_events_mode;
-        m_node.connman->Init(options);
-    }
-
+#ifdef ENABLE_WALLET
+    // The test suite doesn't use masternode mode, so we may initialize it
     m_node.cj_ctx = CJContext::make(*m_node.chainman, *m_node.dmnman, *m_node.mn_metaman, *m_node.mempool,
-                                    /*mn_activeman=*/nullptr, *m_node.mn_sync, *m_node.llmq_ctx->isman,
-                                    /*relay_txes=*/true);
+                                    *m_node.mn_sync, *m_node.llmq_ctx->isman, /*relay_txes=*/true);
+    assert(m_node.cj_ctx);
 
-#ifdef ENABLE_WALLET
     // WalletInit::Construct()-like logic needed for wallet tests that run on
     // TestingSetup and its children (e.g. TestChain100Setup) instead of
     // WalletTestingSetup
@@ -369,6 +358,18 @@ TestingSetup::TestingSetup(const std::string& chainName, const std::vector<const
     m_node.chain_clients.emplace_back(std::move(wallet_loader));
 #endif // ENABLE_WALLET
 
+    m_node.banman = std::make_unique<BanMan>(m_args.GetDataDirBase() / "banlist", nullptr, DEFAULT_MISBEHAVING_BANTIME);
+    m_node.peerman = PeerManager::make(chainparams, *m_node.connman, *m_node.addrman, m_node.banman.get(), *m_node.dstxman,
+                                       *m_node.chainman, *m_node.mempool, *m_node.mn_metaman, *m_node.mn_sync,
+                                       *m_node.govman, *m_node.sporkman, /*mn_activeman=*/nullptr, m_node.dmnman,
+                                       /*active_ctx=*/nullptr, m_node.cj_ctx.get(), m_node.llmq_ctx, /*ignore_incoming_txs=*/false);
+    {
+        CConnman::Options options;
+        options.m_msgproc = m_node.peerman.get();
+        options.socketEventsMode = ::g_socket_events_mode;
+        m_node.connman->Init(options);
+    }
+
     BlockValidationState state;
     if (!m_node.chainman->ActiveChainstate().ActivateBestChain(state)) {
         throw std::runtime_error(strprintf("ActivateBestChain failed. (%s)", state.ToString()));
@@ -377,15 +378,17 @@ TestingSetup::TestingSetup(const std::string& chainName, const std::vector<const
 
 TestingSetup::~TestingSetup()
 {
+    m_node.peerman.reset();
+    m_node.banman.reset();
 #ifdef ENABLE_WALLET
     for (auto& client : m_node.chain_clients) {
         client.reset();
     }
     m_node.wallet_loader = nullptr;
-
     m_node.coinjoin_loader.reset();
-#endif // ENABLE_WALLET
     m_node.cj_ctx.reset();
+#endif // ENABLE_WALLET
+    m_node.dstxman.reset();
 
     // Interrupt() and PrepareShutdown() routines
     if (m_node.llmq_ctx) {
@@ -399,10 +402,6 @@ TestingSetup::~TestingSetup()
     // DashChainstateSetup() is called by LoadChainstate() internally but
     // winding them down is our responsibility
     DashChainstateSetupClose(m_node);
-
-    m_node.peerman.reset();
-    m_node.banman.reset();
-    m_node.dstxman.reset();
 }
 
 TestChain100Setup::TestChain100Setup(const std::string& chain_name, const std::vector<const char*>& extra_args)

From 5bd1a6b56dbb2c144d26eeb48dc4c74e126bb1b6 Mon Sep 17 00:00:00 2001
From: Kittywhiskers Van Gogh <63189531+kwvg@users.noreply.github.com>
Date: Mon, 8 Sep 2025 22:15:11 +0000
Subject: [PATCH 220/656] refactor: drop `m_is_masternode` from
 `CCoinJoinClientQueueManager`

As it's now a fixed value, we can drop it, yay!
---
 src/coinjoin/client.cpp  | 4 ----
 src/coinjoin/client.h    | 9 ++++-----
 src/coinjoin/context.cpp | 4 +---
 3 files changed, 5 insertions(+), 12 deletions(-)

diff --git a/src/coinjoin/client.cpp b/src/coinjoin/client.cpp
index 81771d1d95ac..a26a071d60e4 100644
--- a/src/coinjoin/client.cpp
+++ b/src/coinjoin/client.cpp
@@ -44,8 +44,6 @@ MessageProcessingResult CCoinJoinClientQueueManager::ProcessMessage(NodeId from,
     if (msg_type != NetMsgType::DSQUEUE) {
         return {};
     }
-
-    if (m_is_masternode) return {};
     if (!m_mn_sync.IsBlockchainSynced()) return {};
 
     assert(m_mn_metaman.IsValid());
@@ -1839,8 +1837,6 @@ void CCoinJoinClientManager::UpdatedBlockTip(const CBlockIndex* pindex)
 
 void CCoinJoinClientQueueManager::DoMaintenance()
 {
-    if (m_is_masternode) return; // no client-side mixing on masternodes
-
     if (!m_mn_sync.IsBlockchainSynced() || ShutdownRequested()) return;
 
     CheckQueue();
diff --git a/src/coinjoin/client.h b/src/coinjoin/client.h
index 0d4aab3986ce..b364dc937280 100644
--- a/src/coinjoin/client.h
+++ b/src/coinjoin/client.h
@@ -239,17 +239,16 @@ class CCoinJoinClientQueueManager : public CCoinJoinBaseManager
     const CMasternodeSync& m_mn_sync;
 
     mutable Mutex cs_ProcessDSQueue;
-    const bool m_is_masternode;
 
 public:
     explicit CCoinJoinClientQueueManager(CoinJoinWalletManager& walletman, CDeterministicMNManager& dmnman,
-                                         CMasternodeMetaMan& mn_metaman, const CMasternodeSync& mn_sync,
-                                         bool is_masternode) :
+                                         CMasternodeMetaMan& mn_metaman, const CMasternodeSync& mn_sync) :
         m_walletman(walletman),
         m_dmnman(dmnman),
         m_mn_metaman(mn_metaman),
-        m_mn_sync(mn_sync),
-        m_is_masternode{is_masternode} {};
+        m_mn_sync(mn_sync)
+    {
+    }
 
     [[nodiscard]] MessageProcessingResult ProcessMessage(NodeId from, CConnman& connman, std::string_view msg_type,
                                                          CDataStream& vRecv)
diff --git a/src/coinjoin/context.cpp b/src/coinjoin/context.cpp
index 8405fd8a2eb5..90422cf471d3 100644
--- a/src/coinjoin/context.cpp
+++ b/src/coinjoin/context.cpp
@@ -61,9 +61,7 @@ CJContextImpl::CJContextImpl(ChainstateManager& chainman, CDeterministicMNManage
     m_relay_txes{relay_txes},
     walletman{std::make_unique<CoinJoinWalletManager>(chainman, dmnman, mn_metaman, mempool, mn_sync, isman, queueman,
                                                       /*is_masternode=*/false)},
-    queueman{m_relay_txes ? std::make_unique<CCoinJoinClientQueueManager>(*walletman, dmnman, mn_metaman, mn_sync,
-                                                                          /*is_masternode=*/false)
-                          : nullptr}
+    queueman{m_relay_txes ? std::make_unique<CCoinJoinClientQueueManager>(*walletman, dmnman, mn_metaman, mn_sync) : nullptr}
 {
 }
 

From 4f3da688bba5a88363f0a0221e6f76f1a5c71357 Mon Sep 17 00:00:00 2001
From: Kittywhiskers Van Gogh <63189531+kwvg@users.noreply.github.com>
Date: Tue, 30 Sep 2025 11:59:38 +0000
Subject: [PATCH 221/656] refactor: drop `m_is_masternode` from
 `CoinJoinWalletManager`

---
 src/coinjoin/client.cpp  | 29 ++++-------------------------
 src/coinjoin/client.h    | 20 +++++---------------
 src/coinjoin/context.cpp | 27 +++++++++++++--------------
 src/coinjoin/context.h   |  2 +-
 src/masternode/utils.cpp |  2 +-
 src/masternode/utils.h   |  2 +-
 6 files changed, 25 insertions(+), 57 deletions(-)

diff --git a/src/coinjoin/client.cpp b/src/coinjoin/client.cpp
index a26a071d60e4..88d5ee4f8187 100644
--- a/src/coinjoin/client.cpp
+++ b/src/coinjoin/client.cpp
@@ -141,7 +141,6 @@ MessageProcessingResult CCoinJoinClientQueueManager::ProcessMessage(NodeId from,
 
 void CCoinJoinClientManager::ProcessMessage(CNode& peer, CChainState& active_chainstate, CConnman& connman, const CTxMemPool& mempool, std::string_view msg_type, CDataStream& vRecv)
 {
-    if (m_is_masternode) return;
     if (!CCoinJoinClientOptions::IsEnabled()) return;
     if (!m_mn_sync.IsBlockchainSynced()) return;
 
@@ -166,21 +165,18 @@ void CCoinJoinClientManager::ProcessMessage(CNode& peer, CChainState& active_cha
 CCoinJoinClientSession::CCoinJoinClientSession(const std::shared_ptr<CWallet>& wallet, CCoinJoinClientManager& clientman,
                                                CDeterministicMNManager& dmnman, CMasternodeMetaMan& mn_metaman,
                                                const CMasternodeSync& mn_sync, const llmq::CInstantSendManager& isman,
-                                               const std::unique_ptr<CCoinJoinClientQueueManager>& queueman,
-                                               bool is_masternode) :
+                                               const std::unique_ptr<CCoinJoinClientQueueManager>& queueman) :
     m_wallet(wallet),
     m_clientman(clientman),
     m_dmnman(dmnman),
     m_mn_metaman(mn_metaman),
     m_mn_sync(mn_sync),
     m_isman{isman},
-    m_queueman(queueman),
-    m_is_masternode{is_masternode}
+    m_queueman(queueman)
 {}
 
 void CCoinJoinClientSession::ProcessMessage(CNode& peer, CChainState& active_chainstate, CConnman& connman, const CTxMemPool& mempool, std::string_view msg_type, CDataStream& vRecv)
 {
-    if (m_is_masternode) return;
     if (!CCoinJoinClientOptions::IsEnabled()) return;
     if (!m_mn_sync.IsBlockchainSynced()) return;
 
@@ -383,8 +379,6 @@ bool CCoinJoinClientManager::GetMixingMasternodesInfo(std::vector<CDeterministic
 //
 bool CCoinJoinClientSession::CheckTimeout()
 {
-    if (m_is_masternode) return false;
-
     if (nState == POOL_STATE_IDLE) return false;
 
     if (nState == POOL_STATE_ERROR) {
@@ -420,7 +414,6 @@ bool CCoinJoinClientSession::CheckTimeout()
 void CCoinJoinClientManager::CheckTimeout()
 {
     AssertLockNotHeld(cs_deqsessions);
-    if (m_is_masternode) return;
 
     if (!CCoinJoinClientOptions::IsEnabled() || !IsMixing()) return;
 
@@ -438,11 +431,6 @@ void CCoinJoinClientManager::CheckTimeout()
 //
 bool CCoinJoinClientSession::SendDenominate(const std::vector<std::pair<CTxDSIn, CTxOut> >& vecPSInOutPairsIn, CConnman& connman)
 {
-    if (m_is_masternode) {
-        WalletCJLogPrint(m_wallet, "CCoinJoinClientSession::SendDenominate -- CoinJoin from a Masternode is not supported currently.\n");
-        return false;
-    }
-
     if (CTransaction(txMyCollateral).IsNull()) {
         WalletCJLogPrint(m_wallet, "CCoinJoinClient:SendDenominate -- CoinJoin collateral not set\n");
         return false;
@@ -495,8 +483,6 @@ bool CCoinJoinClientSession::SendDenominate(const std::vector<std::pair<CTxDSIn,
 // Process incoming messages from Masternode updating the progress of mixing
 void CCoinJoinClientSession::ProcessPoolStateUpdate(CCoinJoinStatusUpdate psssup)
 {
-    if (m_is_masternode) return;
-
     // do not update state when mixing client state is one of these
     if (nState == POOL_STATE_IDLE || nState == POOL_STATE_ERROR) return;
 
@@ -549,7 +535,6 @@ bool CCoinJoinClientSession::SignFinalTransaction(CNode& peer, CChainState& acti
 {
     if (!CCoinJoinClientOptions::IsEnabled()) return false;
 
-    if (m_is_masternode) return false;
     if (!mixingMasternode) return false;
 
     LOCK(m_wallet->cs_wallet);
@@ -679,8 +664,6 @@ bool CCoinJoinClientSession::SignFinalTransaction(CNode& peer, CChainState& acti
 // mixing transaction was completed (failed or successful)
 void CCoinJoinClientSession::CompletedTransaction(PoolMessage nMessageID)
 {
-    if (m_is_masternode) return;
-
     if (nMessageID == MSG_SUCCESS) {
         m_clientman.UpdatedSuccessBlock();
         keyHolderStorage.KeepAll();
@@ -696,7 +679,6 @@ void CCoinJoinClientSession::CompletedTransaction(PoolMessage nMessageID)
 
 void CCoinJoinClientManager::UpdatedSuccessBlock()
 {
-    if (m_is_masternode) return;
     nCachedLastSuccessBlock = nCachedBlockHeight;
 }
 
@@ -788,7 +770,6 @@ bool CCoinJoinClientManager::CheckAutomaticBackup()
 bool CCoinJoinClientSession::DoAutomaticDenominating(ChainstateManager& chainman, CConnman& connman,
                                                      const CTxMemPool& mempool, bool fDryRun)
 {
-    if (m_is_masternode) return false; // no client-side mixing on masternodes
     if (nState != POOL_STATE_IDLE) return false;
 
     if (!m_mn_sync.IsBlockchainSynced()) {
@@ -969,7 +950,6 @@ bool CCoinJoinClientSession::DoAutomaticDenominating(ChainstateManager& chainman
 bool CCoinJoinClientManager::DoAutomaticDenominating(ChainstateManager& chainman, CConnman& connman,
                                                      const CTxMemPool& mempool, bool fDryRun)
 {
-    if (m_is_masternode) return false; // no client-side mixing on masternodes
     if (!CCoinJoinClientOptions::IsEnabled() || !IsMixing()) return false;
 
     if (!m_mn_sync.IsBlockchainSynced()) {
@@ -998,7 +978,7 @@ bool CCoinJoinClientManager::DoAutomaticDenominating(ChainstateManager& chainman
     AssertLockNotHeld(cs_deqsessions);
     LOCK(cs_deqsessions);
     if (int(deqSessions.size()) < CCoinJoinClientOptions::GetSessions()) {
-        deqSessions.emplace_back(m_wallet, *this, m_dmnman, m_mn_metaman, m_mn_sync, m_isman, m_queueman, m_is_masternode);
+        deqSessions.emplace_back(m_wallet, *this, m_dmnman, m_mn_metaman, m_mn_sync, m_isman, m_queueman);
     }
     for (auto& session : deqSessions) {
         if (!CheckAutomaticBackup()) return false;
@@ -1845,7 +1825,6 @@ void CCoinJoinClientQueueManager::DoMaintenance()
 void CCoinJoinClientManager::DoMaintenance(ChainstateManager& chainman, CConnman& connman, const CTxMemPool& mempool)
 {
     if (!CCoinJoinClientOptions::IsEnabled()) return;
-    if (m_is_masternode) return; // no client-side mixing on masternodes
 
     if (!m_mn_sync.IsBlockchainSynced() || ShutdownRequested()) return;
 
@@ -1899,7 +1878,7 @@ void CoinJoinWalletManager::Add(const std::shared_ptr<CWallet>& wallet)
     LOCK(cs_wallet_manager_map);
     m_wallet_manager_map.try_emplace(wallet->GetName(),
                                      std::make_unique<CCoinJoinClientManager>(wallet, m_dmnman, m_mn_metaman, m_mn_sync,
-                                                                              m_isman, m_queueman, m_is_masternode));
+                                                                              m_isman, m_queueman));
 }
 
 void CoinJoinWalletManager::DoMaintenance(CConnman& connman)
diff --git a/src/coinjoin/client.h b/src/coinjoin/client.h
index b364dc937280..222122b0329e 100644
--- a/src/coinjoin/client.h
+++ b/src/coinjoin/client.h
@@ -77,15 +77,14 @@ class CoinJoinWalletManager {
 public:
     CoinJoinWalletManager(ChainstateManager& chainman, CDeterministicMNManager& dmnman, CMasternodeMetaMan& mn_metaman,
                           const CTxMemPool& mempool, const CMasternodeSync& mn_sync, const llmq::CInstantSendManager& isman,
-                          const std::unique_ptr<CCoinJoinClientQueueManager>& queueman, bool is_masternode) :
+                          const std::unique_ptr<CCoinJoinClientQueueManager>& queueman) :
         m_chainman(chainman),
         m_dmnman(dmnman),
         m_mn_metaman(mn_metaman),
         m_mempool(mempool),
         m_mn_sync(mn_sync),
         m_isman{isman},
-        m_queueman(queueman),
-        m_is_masternode{is_masternode}
+        m_queueman(queueman)
     {}
 
     ~CoinJoinWalletManager() {
@@ -128,8 +127,6 @@ class CoinJoinWalletManager {
     const llmq::CInstantSendManager& m_isman;
     const std::unique_ptr<CCoinJoinClientQueueManager>& m_queueman;
 
-    const bool m_is_masternode;
-
     mutable Mutex cs_wallet_manager_map;
     wallet_name_cjman_map m_wallet_manager_map GUARDED_BY(cs_wallet_manager_map);
 };
@@ -145,9 +142,6 @@ class CCoinJoinClientSession : public CCoinJoinBaseSession
     const llmq::CInstantSendManager& m_isman;
     const std::unique_ptr<CCoinJoinClientQueueManager>& m_queueman;
 
-    // Track node type
-    const bool m_is_masternode;
-
     std::vector<COutPoint> vecOutPointLocked;
 
     bilingual_str strLastMessage;
@@ -202,7 +196,7 @@ class CCoinJoinClientSession : public CCoinJoinBaseSession
     explicit CCoinJoinClientSession(const std::shared_ptr<wallet::CWallet>& wallet, CCoinJoinClientManager& clientman,
                                     CDeterministicMNManager& dmnman, CMasternodeMetaMan& mn_metaman,
                                     const CMasternodeSync& mn_sync, const llmq::CInstantSendManager& isman,
-                                    const std::unique_ptr<CCoinJoinClientQueueManager>& queueman, bool is_masternode);
+                                    const std::unique_ptr<CCoinJoinClientQueueManager>& queueman);
 
     void ProcessMessage(CNode& peer, CChainState& active_chainstate, CConnman& connman, const CTxMemPool& mempool, std::string_view msg_type, CDataStream& vRecv);
 
@@ -268,9 +262,6 @@ class CCoinJoinClientManager
     const llmq::CInstantSendManager& m_isman;
     const std::unique_ptr<CCoinJoinClientQueueManager>& m_queueman;
 
-    // Track node type
-    const bool m_is_masternode;
-
     // Keep track of the used Masternodes
     std::vector<COutPoint> vecMasternodesUsed;
 
@@ -303,14 +294,13 @@ class CCoinJoinClientManager
     explicit CCoinJoinClientManager(const std::shared_ptr<wallet::CWallet>& wallet, CDeterministicMNManager& dmnman,
                                     CMasternodeMetaMan& mn_metaman, const CMasternodeSync& mn_sync,
                                     const llmq::CInstantSendManager& isman,
-                                    const std::unique_ptr<CCoinJoinClientQueueManager>& queueman, bool is_masternode) :
+                                    const std::unique_ptr<CCoinJoinClientQueueManager>& queueman) :
         m_wallet(wallet),
         m_dmnman(dmnman),
         m_mn_metaman(mn_metaman),
         m_mn_sync(mn_sync),
         m_isman{isman},
-        m_queueman(queueman),
-        m_is_masternode{is_masternode}
+        m_queueman(queueman)
     {
     }
 
diff --git a/src/coinjoin/context.cpp b/src/coinjoin/context.cpp
index 90422cf471d3..cb85be55c35b 100644
--- a/src/coinjoin/context.cpp
+++ b/src/coinjoin/context.cpp
@@ -39,7 +39,7 @@ class CJContextImpl final : public CJContext
                                            std::string_view msg_type, CDataStream& vRecv) override;
     std::optional<CCoinJoinQueue> getQueueFromHash(const uint256& hash) const override;
     std::optional<int> getQueueSize() const override;
-    std::vector<CDeterministicMNCPtr> getMixingMasternodes() const override;
+    std::vector<CDeterministicMNCPtr> getMixingMasternodes() override;
     void addWallet(const std::shared_ptr<wallet::CWallet>& wallet) override;
     void removeWallet(const std::string& name) override;
     void flushWallet(const std::string& name) override;
@@ -51,7 +51,7 @@ class CJContextImpl final : public CJContext
 private:
     const bool m_relay_txes;
 
-    const std::unique_ptr<CoinJoinWalletManager> walletman;
+    CoinJoinWalletManager walletman;
     const std::unique_ptr<CCoinJoinClientQueueManager> queueman;
 };
 
@@ -59,9 +59,8 @@ CJContextImpl::CJContextImpl(ChainstateManager& chainman, CDeterministicMNManage
                              CMasternodeMetaMan& mn_metaman, CTxMemPool& mempool, const CMasternodeSync& mn_sync,
                              const llmq::CInstantSendManager& isman, bool relay_txes) :
     m_relay_txes{relay_txes},
-    walletman{std::make_unique<CoinJoinWalletManager>(chainman, dmnman, mn_metaman, mempool, mn_sync, isman, queueman,
-                                                      /*is_masternode=*/false)},
-    queueman{m_relay_txes ? std::make_unique<CCoinJoinClientQueueManager>(*walletman, dmnman, mn_metaman, mn_sync) : nullptr}
+    walletman{chainman, dmnman, mn_metaman, mempool, mn_sync, isman, queueman},
+    queueman{m_relay_txes ? std::make_unique<CCoinJoinClientQueueManager>(walletman, dmnman, mn_metaman, mn_sync) : nullptr}
 {
 }
 
@@ -70,7 +69,7 @@ void CJContextImpl::Schedule(CConnman& connman, CScheduler& scheduler)
     if (!m_relay_txes) return;
     scheduler.scheduleEvery(std::bind(&CCoinJoinClientQueueManager::DoMaintenance, std::ref(*queueman)),
                             std::chrono::seconds{1});
-    scheduler.scheduleEvery(std::bind(&CoinJoinWalletManager::DoMaintenance, std::ref(*walletman), std::ref(connman)),
+    scheduler.scheduleEvery(std::bind(&CoinJoinWalletManager::DoMaintenance, std::ref(walletman), std::ref(connman)),
                             std::chrono::seconds{1});
 }
 
@@ -79,7 +78,7 @@ void CJContextImpl::UpdatedBlockTip(const CBlockIndex* pindexNew, const CBlockIn
     if (fInitialDownload || pindexNew == pindexFork) // In IBD or blocks were disconnected without any new ones
         return;
 
-    walletman->ForEachCJClientMan(
+    walletman.ForEachCJClientMan(
         [&pindexNew](std::unique_ptr<CCoinJoinClientManager>& clientman) { clientman->UpdatedBlockTip(pindexNew); });
 }
 
@@ -93,13 +92,13 @@ bool CJContextImpl::hasQueue(const uint256& hash) const
 
 CCoinJoinClientManager* CJContextImpl::getClient(const std::string& name)
 {
-    return walletman->Get(name);
+    return walletman.Get(name);
 }
 
 MessageProcessingResult CJContextImpl::processMessage(CNode& pfrom, CChainState& chainstate, CConnman& connman,
                                                       CTxMemPool& mempool, std::string_view msg_type, CDataStream& vRecv)
 {
-    walletman->ForEachCJClientMan([&](std::unique_ptr<CCoinJoinClientManager>& clientman) {
+    walletman.ForEachCJClientMan([&](std::unique_ptr<CCoinJoinClientManager>& clientman) {
         clientman->ProcessMessage(pfrom, chainstate, connman, mempool, msg_type, vRecv);
     });
     if (queueman) {
@@ -124,27 +123,27 @@ std::optional<int> CJContextImpl::getQueueSize() const
     return std::nullopt;
 }
 
-std::vector<CDeterministicMNCPtr> CJContextImpl::getMixingMasternodes() const
+std::vector<CDeterministicMNCPtr> CJContextImpl::getMixingMasternodes()
 {
     std::vector<CDeterministicMNCPtr> ret{};
-    walletman->ForEachCJClientMan(
+    walletman.ForEachCJClientMan(
         [&](const std::unique_ptr<CCoinJoinClientManager>& clientman) { clientman->GetMixingMasternodesInfo(ret); });
     return ret;
 }
 
 void CJContextImpl::addWallet(const std::shared_ptr<wallet::CWallet>& wallet)
 {
-    walletman->Add(wallet);
+    walletman.Add(wallet);
 }
 
 void CJContextImpl::flushWallet(const std::string& name)
 {
-    walletman->Flush(name);
+    walletman.Flush(name);
 }
 
 void CJContextImpl::removeWallet(const std::string& name)
 {
-    walletman->Remove(name);
+    walletman.Remove(name);
 }
 #endif // ENABLE_WALLET
 
diff --git a/src/coinjoin/context.h b/src/coinjoin/context.h
index 9e9b5de11846..18f64f7db4a6 100644
--- a/src/coinjoin/context.h
+++ b/src/coinjoin/context.h
@@ -52,7 +52,7 @@ class CJContext : public CValidationInterface
                                                    CTxMemPool& mempool, std::string_view msg_type, CDataStream& vRecv) = 0;
     virtual std::optional<CCoinJoinQueue> getQueueFromHash(const uint256& hash) const = 0;
     virtual std::optional<int> getQueueSize() const = 0;
-    virtual std::vector<CDeterministicMNCPtr> getMixingMasternodes() const = 0;
+    virtual std::vector<CDeterministicMNCPtr> getMixingMasternodes() = 0;
     virtual void addWallet(const std::shared_ptr<wallet::CWallet>& wallet) = 0;
     virtual void removeWallet(const std::string& name) = 0;
     virtual void flushWallet(const std::string& name) = 0;
diff --git a/src/masternode/utils.cpp b/src/masternode/utils.cpp
index d5961446a4d3..c392411108fb 100644
--- a/src/masternode/utils.cpp
+++ b/src/masternode/utils.cpp
@@ -17,7 +17,7 @@
 #endif
 
 void CMasternodeUtils::DoMaintenance(CConnman& connman, CDeterministicMNManager& dmnman, const CMasternodeSync& mn_sync,
-                                     const CJContext* const cj_ctx)
+                                     CJContext* const cj_ctx)
 {
     if (!mn_sync.IsBlockchainSynced()) return;
     if (ShutdownRequested()) return;
diff --git a/src/masternode/utils.h b/src/masternode/utils.h
index 0c9b2adfec18..227027435476 100644
--- a/src/masternode/utils.h
+++ b/src/masternode/utils.h
@@ -14,7 +14,7 @@ class CMasternodeUtils
 {
 public:
     static void DoMaintenance(CConnman& connman, CDeterministicMNManager& dmnman, const CMasternodeSync& mn_sync,
-                              const CJContext* const cj_ctx);
+                              CJContext* const cj_ctx);
 };
 
 #endif // BITCOIN_MASTERNODE_UTILS_H

From 6a20464584f16b611b1a4c079863b29d868096f7 Mon Sep 17 00:00:00 2001
From: Kittywhiskers Van Gogh <63189531+kwvg@users.noreply.github.com>
Date: Sun, 5 Oct 2025 14:46:27 +0000
Subject: [PATCH 222/656] refactor: `s/CJContext/CJWalletManager/g`

CJContext is no longer just a context class, it's a lot more involved
now and serves triple duty as also a notification interface and a layer
of abstraction. Name reflects that it's the wallet-specific components
of CoinJoin.
---
 src/Makefile.am                             |  4 +-
 src/coinjoin/interfaces.cpp                 |  6 +--
 src/coinjoin/{context.cpp => walletman.cpp} | 54 +++++++++++----------
 src/coinjoin/{context.h => walletman.h}     | 18 +++----
 src/init.cpp                                | 26 +++++-----
 src/masternode/utils.cpp                    | 10 ++--
 src/masternode/utils.h                      |  4 +-
 src/net_processing.cpp                      | 26 +++++-----
 src/net_processing.h                        |  6 +--
 src/node/context.cpp                        |  2 +-
 src/node/context.h                          |  4 +-
 src/rpc/coinjoin.cpp                        |  7 ++-
 src/test/coinjoin_dstxmanager_tests.cpp     |  1 -
 src/test/denialofservice_tests.cpp          | 14 ++++--
 src/test/net_peer_connection_tests.cpp      |  3 +-
 src/test/util/setup_common.cpp              | 13 ++---
 src/wallet/test/coinjoin_tests.cpp          |  4 +-
 src/wallet/test/wallet_tests.cpp            |  1 -
 test/lint/lint-circular-dependencies.py     |  2 +-
 19 files changed, 103 insertions(+), 102 deletions(-)
 rename src/coinjoin/{context.cpp => walletman.cpp} (60%)
 rename src/coinjoin/{context.h => walletman.h} (74%)

diff --git a/src/Makefile.am b/src/Makefile.am
index 77445e48cc8b..fd94d2bca363 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -179,10 +179,10 @@ BITCOIN_CORE_H = \
   coinjoin/coinjoin.h \
   coinjoin/client.h \
   coinjoin/common.h \
-  coinjoin/context.h \
   coinjoin/options.h \
   coinjoin/server.h \
   coinjoin/util.h \
+  coinjoin/walletman.h \
   coins.h \
   common/bloom.h \
   compat/assumptions.h \
@@ -486,8 +486,8 @@ libbitcoin_node_a_SOURCES = \
   chainlock/clsig.cpp \
   chainlock/signing.cpp \
   coinjoin/coinjoin.cpp \
-  coinjoin/context.cpp \
   coinjoin/server.cpp \
+  coinjoin/walletman.cpp \
   consensus/tx_verify.cpp \
   dbwrapper.cpp \
   deploymentstatus.cpp \
diff --git a/src/coinjoin/interfaces.cpp b/src/coinjoin/interfaces.cpp
index 561df7a9083b..07f7d889701d 100644
--- a/src/coinjoin/interfaces.cpp
+++ b/src/coinjoin/interfaces.cpp
@@ -5,8 +5,8 @@
 #include <interfaces/coinjoin.h>
 
 #include <coinjoin/client.h>
-#include <coinjoin/context.h>
 #include <coinjoin/options.h>
+#include <coinjoin/walletman.h>
 #include <node/context.h>
 #include <util/check.h>
 #include <walletinitinterface.h>
@@ -77,9 +77,9 @@ class CoinJoinClientImpl : public interfaces::CoinJoin::Client
 class CoinJoinLoaderImpl : public interfaces::CoinJoin::Loader
 {
 private:
-    CJContext& manager()
+    CJWalletManager& manager()
     {
-        return *Assert(m_node.cj_ctx);
+        return *Assert(m_node.cj_walletman);
     }
 
     interfaces::WalletLoader& wallet_loader()
diff --git a/src/coinjoin/context.cpp b/src/coinjoin/walletman.cpp
similarity index 60%
rename from src/coinjoin/context.cpp
rename to src/coinjoin/walletman.cpp
index cb85be55c35b..50b552d766fb 100644
--- a/src/coinjoin/context.cpp
+++ b/src/coinjoin/walletman.cpp
@@ -6,7 +6,7 @@
 #include <config/bitcoin-config.h>
 #endif
 
-#include <coinjoin/context.h>
+#include <coinjoin/walletman.h>
 
 #include <net.h>
 #include <scheduler.h>
@@ -21,13 +21,13 @@
 #include <memory>
 
 #ifdef ENABLE_WALLET
-class CJContextImpl final : public CJContext
+class CJWalletManagerImpl final : public CJWalletManager
 {
 public:
-    CJContextImpl(ChainstateManager& chainman, CDeterministicMNManager& dmnman, CMasternodeMetaMan& mn_metaman,
-                  CTxMemPool& mempool, const CMasternodeSync& mn_sync, const llmq::CInstantSendManager& isman,
-                  bool relay_txes);
-    virtual ~CJContextImpl() = default;
+    CJWalletManagerImpl(ChainstateManager& chainman, CDeterministicMNManager& dmnman, CMasternodeMetaMan& mn_metaman,
+                        CTxMemPool& mempool, const CMasternodeSync& mn_sync, const llmq::CInstantSendManager& isman,
+                        bool relay_txes);
+    virtual ~CJWalletManagerImpl() = default;
 
 public:
     void Schedule(CConnman& connman, CScheduler& scheduler) override;
@@ -55,16 +55,17 @@ class CJContextImpl final : public CJContext
     const std::unique_ptr<CCoinJoinClientQueueManager> queueman;
 };
 
-CJContextImpl::CJContextImpl(ChainstateManager& chainman, CDeterministicMNManager& dmnman,
-                             CMasternodeMetaMan& mn_metaman, CTxMemPool& mempool, const CMasternodeSync& mn_sync,
-                             const llmq::CInstantSendManager& isman, bool relay_txes) :
+CJWalletManagerImpl::CJWalletManagerImpl(ChainstateManager& chainman, CDeterministicMNManager& dmnman,
+                                         CMasternodeMetaMan& mn_metaman, CTxMemPool& mempool,
+                                         const CMasternodeSync& mn_sync, const llmq::CInstantSendManager& isman,
+                                         bool relay_txes) :
     m_relay_txes{relay_txes},
     walletman{chainman, dmnman, mn_metaman, mempool, mn_sync, isman, queueman},
     queueman{m_relay_txes ? std::make_unique<CCoinJoinClientQueueManager>(walletman, dmnman, mn_metaman, mn_sync) : nullptr}
 {
 }
 
-void CJContextImpl::Schedule(CConnman& connman, CScheduler& scheduler)
+void CJWalletManagerImpl::Schedule(CConnman& connman, CScheduler& scheduler)
 {
     if (!m_relay_txes) return;
     scheduler.scheduleEvery(std::bind(&CCoinJoinClientQueueManager::DoMaintenance, std::ref(*queueman)),
@@ -73,7 +74,7 @@ void CJContextImpl::Schedule(CConnman& connman, CScheduler& scheduler)
                             std::chrono::seconds{1});
 }
 
-void CJContextImpl::UpdatedBlockTip(const CBlockIndex* pindexNew, const CBlockIndex* pindexFork, bool fInitialDownload)
+void CJWalletManagerImpl::UpdatedBlockTip(const CBlockIndex* pindexNew, const CBlockIndex* pindexFork, bool fInitialDownload)
 {
     if (fInitialDownload || pindexNew == pindexFork) // In IBD or blocks were disconnected without any new ones
         return;
@@ -82,7 +83,7 @@ void CJContextImpl::UpdatedBlockTip(const CBlockIndex* pindexNew, const CBlockIn
         [&pindexNew](std::unique_ptr<CCoinJoinClientManager>& clientman) { clientman->UpdatedBlockTip(pindexNew); });
 }
 
-bool CJContextImpl::hasQueue(const uint256& hash) const
+bool CJWalletManagerImpl::hasQueue(const uint256& hash) const
 {
     if (queueman) {
         return queueman->HasQueue(hash);
@@ -90,13 +91,14 @@ bool CJContextImpl::hasQueue(const uint256& hash) const
     return false;
 }
 
-CCoinJoinClientManager* CJContextImpl::getClient(const std::string& name)
+CCoinJoinClientManager* CJWalletManagerImpl::getClient(const std::string& name)
 {
     return walletman.Get(name);
 }
 
-MessageProcessingResult CJContextImpl::processMessage(CNode& pfrom, CChainState& chainstate, CConnman& connman,
-                                                      CTxMemPool& mempool, std::string_view msg_type, CDataStream& vRecv)
+MessageProcessingResult CJWalletManagerImpl::processMessage(CNode& pfrom, CChainState& chainstate, CConnman& connman,
+                                                            CTxMemPool& mempool, std::string_view msg_type,
+                                                            CDataStream& vRecv)
 {
     walletman.ForEachCJClientMan([&](std::unique_ptr<CCoinJoinClientManager>& clientman) {
         clientman->ProcessMessage(pfrom, chainstate, connman, mempool, msg_type, vRecv);
@@ -107,7 +109,7 @@ MessageProcessingResult CJContextImpl::processMessage(CNode& pfrom, CChainState&
     return {};
 }
 
-std::optional<CCoinJoinQueue> CJContextImpl::getQueueFromHash(const uint256& hash) const
+std::optional<CCoinJoinQueue> CJWalletManagerImpl::getQueueFromHash(const uint256& hash) const
 {
     if (queueman) {
         return queueman->GetQueueFromHash(hash);
@@ -115,7 +117,7 @@ std::optional<CCoinJoinQueue> CJContextImpl::getQueueFromHash(const uint256& has
     return std::nullopt;
 }
 
-std::optional<int> CJContextImpl::getQueueSize() const
+std::optional<int> CJWalletManagerImpl::getQueueSize() const
 {
     if (queueman) {
         return queueman->GetQueueSize();
@@ -123,7 +125,7 @@ std::optional<int> CJContextImpl::getQueueSize() const
     return std::nullopt;
 }
 
-std::vector<CDeterministicMNCPtr> CJContextImpl::getMixingMasternodes()
+std::vector<CDeterministicMNCPtr> CJWalletManagerImpl::getMixingMasternodes()
 {
     std::vector<CDeterministicMNCPtr> ret{};
     walletman.ForEachCJClientMan(
@@ -131,29 +133,29 @@ std::vector<CDeterministicMNCPtr> CJContextImpl::getMixingMasternodes()
     return ret;
 }
 
-void CJContextImpl::addWallet(const std::shared_ptr<wallet::CWallet>& wallet)
+void CJWalletManagerImpl::addWallet(const std::shared_ptr<wallet::CWallet>& wallet)
 {
     walletman.Add(wallet);
 }
 
-void CJContextImpl::flushWallet(const std::string& name)
+void CJWalletManagerImpl::flushWallet(const std::string& name)
 {
     walletman.Flush(name);
 }
 
-void CJContextImpl::removeWallet(const std::string& name)
+void CJWalletManagerImpl::removeWallet(const std::string& name)
 {
     walletman.Remove(name);
 }
 #endif // ENABLE_WALLET
 
-std::unique_ptr<CJContext> CJContext::make(ChainstateManager& chainman, CDeterministicMNManager& dmnman,
-                                           CMasternodeMetaMan& mn_metaman, CTxMemPool& mempool,
-                                           const CMasternodeSync& mn_sync, const llmq::CInstantSendManager& isman,
-                                           bool relay_txes)
+std::unique_ptr<CJWalletManager> CJWalletManager::make(ChainstateManager& chainman, CDeterministicMNManager& dmnman,
+                                                       CMasternodeMetaMan& mn_metaman, CTxMemPool& mempool,
+                                                       const CMasternodeSync& mn_sync,
+                                                       const llmq::CInstantSendManager& isman, bool relay_txes)
 {
 #ifdef ENABLE_WALLET
-    return std::make_unique<CJContextImpl>(chainman, dmnman, mn_metaman, mempool, mn_sync, isman, relay_txes);
+    return std::make_unique<CJWalletManagerImpl>(chainman, dmnman, mn_metaman, mempool, mn_sync, isman, relay_txes);
 #else
     // Cannot be constructed if wallet support isn't built
     return nullptr;
diff --git a/src/coinjoin/context.h b/src/coinjoin/walletman.h
similarity index 74%
rename from src/coinjoin/context.h
rename to src/coinjoin/walletman.h
index 18f64f7db4a6..720a4bdf2f81 100644
--- a/src/coinjoin/context.h
+++ b/src/coinjoin/walletman.h
@@ -2,8 +2,8 @@
 // Distributed under the MIT/X11 software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-#ifndef BITCOIN_COINJOIN_CONTEXT_H
-#define BITCOIN_COINJOIN_CONTEXT_H
+#ifndef BITCOIN_COINJOIN_WALLETMAN_H
+#define BITCOIN_COINJOIN_WALLETMAN_H
 
 #include <evo/types.h>
 #include <msg_result.h>
@@ -33,14 +33,14 @@ namespace wallet {
 class CWallet;
 } // namespace wallet
 
-class CJContext : public CValidationInterface
+class CJWalletManager : public CValidationInterface
 {
 public:
-    static std::unique_ptr<CJContext> make(ChainstateManager& chainman, CDeterministicMNManager& dmnman,
-                                           CMasternodeMetaMan& mn_metaman, CTxMemPool& mempool,
-                                           const CMasternodeSync& mn_sync, const llmq::CInstantSendManager& isman,
-                                           bool relay_txes);
-    virtual ~CJContext() = default;
+    static std::unique_ptr<CJWalletManager> make(ChainstateManager& chainman, CDeterministicMNManager& dmnman,
+                                                 CMasternodeMetaMan& mn_metaman, CTxMemPool& mempool,
+                                                 const CMasternodeSync& mn_sync, const llmq::CInstantSendManager& isman,
+                                                 bool relay_txes);
+    virtual ~CJWalletManager() = default;
 
 public:
     virtual void Schedule(CConnman& connman, CScheduler& scheduler) = 0;
@@ -63,4 +63,4 @@ class CJContext : public CValidationInterface
                                  bool fInitialDownload) override = 0;
 };
 
-#endif // BITCOIN_COINJOIN_CONTEXT_H
+#endif // BITCOIN_COINJOIN_WALLETMAN_H
diff --git a/src/init.cpp b/src/init.cpp
index 27eaf71fae31..6f7a09542a8a 100644
--- a/src/init.cpp
+++ b/src/init.cpp
@@ -78,8 +78,8 @@
 
 #include <bls/bls.h>
 #include <coinjoin/coinjoin.h>
-#include <coinjoin/context.h>
 #include <coinjoin/server.h>
+#include <coinjoin/walletman.h>
 #include <dsnotificationinterface.h>
 #include <evo/deterministicmns.h>
 #include <evo/evodb.h>
@@ -325,8 +325,8 @@ void PrepareShutdown(NodeContext& node)
         g_active_notification_interface.reset();
     }
 
-    if (node.cj_ctx) {
-        UnregisterValidationInterface(node.cj_ctx.get());
+    if (node.cj_walletman) {
+        UnregisterValidationInterface(node.cj_walletman.get());
     }
 
     if (g_ds_notification_interface) {
@@ -391,7 +391,7 @@ void PrepareShutdown(NodeContext& node)
 
     // After all wallets are removed, destroy all CoinJoin objects
     // and reset them to nullptr
-    node.cj_ctx.reset();
+    node.cj_walletman.reset();
     node.dstxman.reset();
 
     UnregisterAllValidationInterfaces();
@@ -2139,20 +2139,20 @@ bool AppInitMain(NodeContext& node, interfaces::BlockAndHeaderTipInfo* tip_info)
     assert(!node.dstxman);
     node.dstxman = std::make_unique<CDSTXManager>();
 
-    assert(!node.cj_ctx);
+    assert(!node.cj_walletman);
     if (!node.mn_activeman) {
-        node.cj_ctx = CJContext::make(chainman, *node.dmnman, *node.mn_metaman, *node.mempool, *node.mn_sync,
-                                      *node.llmq_ctx->isman, !ignores_incoming_txs);
+        node.cj_walletman = CJWalletManager::make(chainman, *node.dmnman, *node.mn_metaman, *node.mempool, *node.mn_sync,
+                                                  *node.llmq_ctx->isman, !ignores_incoming_txs);
     }
-    if (node.cj_ctx) {
-        RegisterValidationInterface(node.cj_ctx.get());
+    if (node.cj_walletman) {
+        RegisterValidationInterface(node.cj_walletman.get());
     }
 
     assert(!node.peerman);
     node.peerman = PeerManager::make(chainparams, *node.connman, *node.addrman, node.banman.get(), *node.dstxman,
                                      chainman, *node.mempool, *node.mn_metaman, *node.mn_sync,
                                      *node.govman, *node.sporkman, node.mn_activeman.get(), node.dmnman,
-                                     node.active_ctx, node.cj_ctx.get(), node.llmq_ctx, ignores_incoming_txs);
+                                     node.active_ctx, node.cj_walletman.get(), node.llmq_ctx, ignores_incoming_txs);
     RegisterValidationInterface(node.peerman.get());
 
     g_ds_notification_interface = std::make_unique<CDSNotificationInterface>(
@@ -2268,7 +2268,7 @@ bool AppInitMain(NodeContext& node, interfaces::BlockAndHeaderTipInfo* tip_info)
 
     node.scheduler->scheduleEvery(std::bind(&CNetFulfilledRequestManager::DoMaintenance, std::ref(*node.netfulfilledman)), std::chrono::minutes{1});
     node.scheduler->scheduleEvery(std::bind(&CMasternodeSync::DoMaintenance, std::ref(*node.mn_sync), std::cref(*node.peerman), std::cref(*node.govman)), std::chrono::seconds{1});
-    node.scheduler->scheduleEvery(std::bind(&CMasternodeUtils::DoMaintenance, std::ref(*node.connman), std::ref(*node.dmnman), std::ref(*node.mn_sync), node.cj_ctx.get()), std::chrono::minutes{1});
+    node.scheduler->scheduleEvery(std::bind(&CMasternodeUtils::DoMaintenance, std::ref(*node.connman), std::ref(*node.dmnman), std::ref(*node.mn_sync), node.cj_walletman.get()), std::chrono::minutes{1});
     node.scheduler->scheduleEvery(std::bind(&CDeterministicMNManager::DoMaintenance, std::ref(*node.dmnman)), std::chrono::seconds{10});
 
     if (node.govman->IsValid()) {
@@ -2280,8 +2280,8 @@ bool AppInitMain(NodeContext& node, interfaces::BlockAndHeaderTipInfo* tip_info)
         node.scheduler->scheduleEvery(std::bind(&llmq::CDKGSessionManager::CleanupOldContributions, std::ref(*node.llmq_ctx->qdkgsman)), std::chrono::hours{1});
     }
 
-    if (node.cj_ctx) {
-        node.cj_ctx->Schedule(*node.connman, *node.scheduler);
+    if (node.cj_walletman) {
+        node.cj_walletman->Schedule(*node.connman, *node.scheduler);
     }
 
     if (::g_stats_client->active()) {
diff --git a/src/masternode/utils.cpp b/src/masternode/utils.cpp
index c392411108fb..4ed51031db27 100644
--- a/src/masternode/utils.cpp
+++ b/src/masternode/utils.cpp
@@ -8,16 +8,12 @@
 #include <shutdown.h>
 #include <util/ranges.h>
 
-#include <coinjoin/context.h>
+#include <coinjoin/walletman.h>
 #include <evo/deterministicmns.h>
 #include <masternode/sync.h>
 
-#ifdef ENABLE_WALLET
-#include <coinjoin/client.h>
-#endif
-
 void CMasternodeUtils::DoMaintenance(CConnman& connman, CDeterministicMNManager& dmnman, const CMasternodeSync& mn_sync,
-                                     CJContext* const cj_ctx)
+                                     CJWalletManager* const cj_walletman)
 {
     if (!mn_sync.IsBlockchainSynced()) return;
     if (ShutdownRequested()) return;
@@ -40,7 +36,7 @@ void CMasternodeUtils::DoMaintenance(CConnman& connman, CDeterministicMNManager&
         return;
     }
 
-    auto mixing_masternodes = cj_ctx ? cj_ctx->getMixingMasternodes() : std::vector<CDeterministicMNCPtr>{};
+    auto mixing_masternodes = cj_walletman ? cj_walletman->getMixingMasternodes() : std::vector<CDeterministicMNCPtr>{};
     connman.ForEachNode(CConnman::AllNodes, [&](CNode* pnode) {
         if (pnode->m_masternode_probe_connection) {
             // we're not disconnecting masternode probes for at least PROBE_WAIT_INTERVAL seconds
diff --git a/src/masternode/utils.h b/src/masternode/utils.h
index 227027435476..e1e7b586a912 100644
--- a/src/masternode/utils.h
+++ b/src/masternode/utils.h
@@ -8,13 +8,13 @@
 class CConnman;
 class CDeterministicMNManager;
 class CMasternodeSync;
-class CJContext;
+class CJWalletManager;
 
 class CMasternodeUtils
 {
 public:
     static void DoMaintenance(CConnman& connman, CDeterministicMNManager& dmnman, const CMasternodeSync& mn_sync,
-                              CJContext* const cj_ctx);
+                              CJWalletManager* const cj_walletman);
 };
 
 #endif // BITCOIN_MASTERNODE_UTILS_H
diff --git a/src/net_processing.cpp b/src/net_processing.cpp
index 962b64db38ff..97fec4a10733 100644
--- a/src/net_processing.cpp
+++ b/src/net_processing.cpp
@@ -41,8 +41,8 @@
 #include <validation.h>
 
 #include <chainlock/chainlock.h>
-#include <coinjoin/context.h>
 #include <coinjoin/server.h>
+#include <coinjoin/walletman.h>
 #include <evo/deterministicmns.h>
 #include <evo/mnauth.h>
 #include <evo/smldiff.h>
@@ -592,7 +592,7 @@ class PeerManagerImpl final : public PeerManager
                     CMasternodeMetaMan& mn_metaman, CMasternodeSync& mn_sync, CGovernanceManager& govman,
                     CSporkManager& sporkman, const CActiveMasternodeManager* const mn_activeman,
                     const std::unique_ptr<CDeterministicMNManager>& dmnman,
-                    const std::unique_ptr<ActiveContext>& active_ctx, CJContext* const cj_ctx,
+                    const std::unique_ptr<ActiveContext>& active_ctx, CJWalletManager* const cj_walletman,
                     const std::unique_ptr<LLMQContext>& llmq_ctx, bool ignore_incoming_txs);
 
     /** Overridden from CValidationInterface. */
@@ -788,8 +788,8 @@ class PeerManagerImpl final : public PeerManager
     std::unique_ptr<TxReconciliationTracker> m_txreconciliation;
     const std::unique_ptr<CDeterministicMNManager>& m_dmnman;
     const std::unique_ptr<ActiveContext>& m_active_ctx;
-    /** Pointer to this node's CJContext. May be nullptr - check existence before dereferencing. */
-    CJContext* const m_cj_ctx;
+    /** Pointer to this node's CJWalletManager. May be nullptr - check existence before dereferencing. */
+    CJWalletManager* const m_cj_walletman;
     const std::unique_ptr<LLMQContext>& m_llmq_ctx;
     CMasternodeMetaMan& m_mn_metaman;
     CMasternodeSync& m_mn_sync;
@@ -1963,10 +1963,10 @@ std::unique_ptr<PeerManager> PeerManager::make(const CChainParams& chainparams,
                                                const CActiveMasternodeManager* const mn_activeman,
                                                const std::unique_ptr<CDeterministicMNManager>& dmnman,
                                                const std::unique_ptr<ActiveContext>& active_ctx,
-                                               CJContext* const cj_ctx,
+                                               CJWalletManager* const cj_walletman,
                                                const std::unique_ptr<LLMQContext>& llmq_ctx, bool ignore_incoming_txs)
 {
-    return std::make_unique<PeerManagerImpl>(chainparams, connman, addrman, banman, dstxman, chainman, pool, mn_metaman, mn_sync, govman, sporkman, mn_activeman, dmnman, active_ctx, cj_ctx, llmq_ctx, ignore_incoming_txs);
+    return std::make_unique<PeerManagerImpl>(chainparams, connman, addrman, banman, dstxman, chainman, pool, mn_metaman, mn_sync, govman, sporkman, mn_activeman, dmnman, active_ctx, cj_walletman, llmq_ctx, ignore_incoming_txs);
 }
 
 PeerManagerImpl::PeerManagerImpl(const CChainParams& chainparams, CConnman& connman, AddrMan& addrman, BanMan* banman,
@@ -1975,7 +1975,7 @@ PeerManagerImpl::PeerManagerImpl(const CChainParams& chainparams, CConnman& conn
                                  CSporkManager& sporkman, const CActiveMasternodeManager* const mn_activeman,
                                  const std::unique_ptr<CDeterministicMNManager>& dmnman,
                                  const std::unique_ptr<ActiveContext>& active_ctx,
-                                 CJContext* const cj_ctx,
+                                 CJWalletManager* const cj_walletman,
                                  const std::unique_ptr<LLMQContext>& llmq_ctx, bool ignore_incoming_txs)
     : m_chainparams(chainparams),
       m_connman(connman),
@@ -1986,7 +1986,7 @@ PeerManagerImpl::PeerManagerImpl(const CChainParams& chainparams, CConnman& conn
       m_mempool(pool),
       m_dmnman(dmnman),
       m_active_ctx(active_ctx),
-      m_cj_ctx(cj_ctx),
+      m_cj_walletman(cj_walletman),
       m_llmq_ctx(llmq_ctx),
       m_mn_metaman(mn_metaman),
       m_mn_sync(mn_sync),
@@ -2275,7 +2275,7 @@ bool PeerManagerImpl::AlreadyHave(const CInv& inv)
     case MSG_ISDLOCK:
         return m_llmq_ctx->isman->AlreadyHave(inv);
     case MSG_DSQ:
-        return (m_cj_ctx && m_cj_ctx->hasQueue(inv.hash)) || (m_active_ctx && m_active_ctx->cj_server->HasQueue(inv.hash));
+        return (m_cj_walletman && m_cj_walletman->hasQueue(inv.hash)) || (m_active_ctx && m_active_ctx->cj_server->HasQueue(inv.hash));
     case MSG_PLATFORM_BAN:
         return m_mn_metaman.AlreadyHavePlatformBan(inv.hash);
     }
@@ -2881,8 +2881,8 @@ void PeerManagerImpl::ProcessGetData(CNode& pfrom, Peer& peer, const std::atomic
         }
         if (!push && inv.type == MSG_DSQ) {
             auto opt_dsq = m_active_ctx ? m_active_ctx->cj_server->GetQueueFromHash(inv.hash) : std::nullopt;
-            if (m_cj_ctx && !opt_dsq.has_value()) {
-                opt_dsq = m_cj_ctx->getQueueFromHash(inv.hash);
+            if (m_cj_walletman && !opt_dsq.has_value()) {
+                opt_dsq = m_cj_walletman->getQueueFromHash(inv.hash);
             }
             if (opt_dsq.has_value()) {
                 m_connman.PushMessage(&pfrom, msgMaker.Make(NetMsgType::DSQUEUE, *opt_dsq));
@@ -5359,8 +5359,8 @@ void PeerManagerImpl::ProcessMessage(
     if (found)
     {
         //probably one the extensions
-        if (m_cj_ctx) {
-            PostProcessMessage(m_cj_ctx->processMessage(pfrom, m_chainman.ActiveChainstate(), m_connman, m_mempool, msg_type, vRecv), pfrom.GetId());
+        if (m_cj_walletman) {
+            PostProcessMessage(m_cj_walletman->processMessage(pfrom, m_chainman.ActiveChainstate(), m_connman, m_mempool, msg_type, vRecv), pfrom.GetId());
         }
         if (m_active_ctx) {
             PostProcessMessage(m_active_ctx->cj_server->ProcessMessage(pfrom, msg_type, vRecv), pfrom.GetId());
diff --git a/src/net_processing.h b/src/net_processing.h
index f957a14011cb..8a4a4e7aba88 100644
--- a/src/net_processing.h
+++ b/src/net_processing.h
@@ -23,7 +23,7 @@ class CDSTXManager;
 class CGovernanceManager;
 class ChainstateManager;
 class CInv;
-class CJContext;
+class CJWalletManager;
 class CMasternodeMetaMan;
 class CMasternodeSync;
 class CSporkManager;
@@ -65,8 +65,8 @@ class PeerManager : public CValidationInterface, public NetEventsInterface
                                              const CActiveMasternodeManager* const mn_activeman,
                                              const std::unique_ptr<CDeterministicMNManager>& dmnman,
                                              const std::unique_ptr<ActiveContext>& active_ctx,
-                                             CJContext* const cj_ctx, const std::unique_ptr<LLMQContext>& llmq_ctx,
-                                             bool ignore_incoming_txs);
+                                             CJWalletManager* const cj_walletman,
+                                             const std::unique_ptr<LLMQContext>& llmq_ctx, bool ignore_incoming_txs);
     virtual ~PeerManager() { }
 
     /**
diff --git a/src/node/context.cpp b/src/node/context.cpp
index f63b1f4fca0a..a13ef83414e1 100644
--- a/src/node/context.cpp
+++ b/src/node/context.cpp
@@ -7,7 +7,7 @@
 #include <addrman.h>
 #include <banman.h>
 #include <coinjoin/coinjoin.h>
-#include <coinjoin/context.h>
+#include <coinjoin/walletman.h>
 #include <evo/chainhelper.h>
 #include <evo/creditpool.h>
 #include <evo/deterministicmns.h>
diff --git a/src/node/context.h b/src/node/context.h
index 8429e10daf57..15845e6ce2ce 100644
--- a/src/node/context.h
+++ b/src/node/context.h
@@ -23,7 +23,7 @@ class CChainstateHelper;
 class ChainstateManager;
 class CEvoDB;
 class CGovernanceManager;
-class CJContext;
+class CJWalletManager;
 class CMasternodeMetaMan;
 class CMasternodeSync;
 class CNetFulfilledRequestManager;
@@ -81,6 +81,7 @@ struct NodeContext {
     //! Dash managers
     std::unique_ptr<CActiveMasternodeManager> mn_activeman;
     std::unique_ptr<CCreditPoolManager> cpoolman;
+    std::unique_ptr<CJWalletManager> cj_walletman;
     std::unique_ptr<CDSTXManager> dstxman;
     std::unique_ptr<CEvoDB> evodb;
     std::unique_ptr<CChainstateHelper> chain_helper;
@@ -93,7 +94,6 @@ struct NodeContext {
     std::unique_ptr<CSporkManager> sporkman;
     //! Dash contexts
     std::unique_ptr<ActiveContext> active_ctx;
-    std::unique_ptr<CJContext> cj_ctx;
     std::unique_ptr<LLMQContext> llmq_ctx;
 
     //! Declare default constructor and destructor that are not inline, so code
diff --git a/src/rpc/coinjoin.cpp b/src/rpc/coinjoin.cpp
index 225936dae6db..7fe29ab4da85 100644
--- a/src/rpc/coinjoin.cpp
+++ b/src/rpc/coinjoin.cpp
@@ -2,8 +2,8 @@
 // Distributed under the MIT/X11 software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-#include <coinjoin/context.h>
 #include <coinjoin/server.h>
+#include <coinjoin/walletman.h>
 #include <masternode/active/context.h>
 #include <node/context.h>
 #include <rpc/server.h>
@@ -15,7 +15,6 @@
 #include <walletinitinterface.h>
 
 #ifdef ENABLE_WALLET
-#include <coinjoin/client.h>
 #include <coinjoin/options.h>
 #include <interfaces/coinjoin.h>
 #endif // ENABLE_WALLET
@@ -473,8 +472,8 @@ static RPCHelpMan getcoinjoininfo()
 #ifdef ENABLE_WALLET
     CCoinJoinClientOptions::GetJsonInfo(obj);
 
-    if (node.cj_ctx) {
-        if (auto queue_size = node.cj_ctx->getQueueSize()) {
+    if (node.cj_walletman) {
+        if (auto queue_size = node.cj_walletman->getQueueSize()) {
             obj.pushKV("queue_size", queue_size.value());
         }
     }
diff --git a/src/test/coinjoin_dstxmanager_tests.cpp b/src/test/coinjoin_dstxmanager_tests.cpp
index 04e9ce5f93e7..24afd2f8fe69 100644
--- a/src/test/coinjoin_dstxmanager_tests.cpp
+++ b/src/test/coinjoin_dstxmanager_tests.cpp
@@ -7,7 +7,6 @@
 #include <chain.h>
 #include <coinjoin/coinjoin.h>
 #include <coinjoin/common.h>
-#include <coinjoin/context.h>
 #include <script/script.h>
 #include <uint256.h>
 
diff --git a/src/test/denialofservice_tests.cpp b/src/test/denialofservice_tests.cpp
index 6a3c993e644f..59ed403e5067 100644
--- a/src/test/denialofservice_tests.cpp
+++ b/src/test/denialofservice_tests.cpp
@@ -150,8 +150,9 @@ BOOST_AUTO_TEST_CASE(stale_tip_peer_management)
     auto connman = std::make_unique<ConnmanTestMsg>(0x1337, 0x1337, *m_node.addrman, *m_node.netgroupman);
     auto peerLogic = PeerManager::make(chainparams, *connman, *m_node.addrman, /*banman=*/nullptr, *m_node.dstxman,
                                        *m_node.chainman, *m_node.mempool, *m_node.mn_metaman, *m_node.mn_sync,
-                                       *m_node.govman, *m_node.sporkman, /*mn_activeman=*/ nullptr, m_node.dmnman,
-                                       /*active_ctx=*/nullptr, /*cj_ctx=*/nullptr, m_node.llmq_ctx, /*ignore_incoming_txs=*/false);
+                                       *m_node.govman, *m_node.sporkman, /*mn_activeman=*/nullptr, m_node.dmnman,
+                                       /*active_ctx=*/nullptr, /*cj_walletman=*/nullptr, m_node.llmq_ctx,
+                                       /*ignore_incoming_txs=*/false);
 
     constexpr int max_outbound_full_relay = MAX_OUTBOUND_FULL_RELAY_CONNECTIONS;
     CConnman::Options options;
@@ -255,7 +256,8 @@ BOOST_AUTO_TEST_CASE(block_relay_only_eviction)
     auto peerLogic = PeerManager::make(chainparams, *connman, *m_node.addrman, /*banman=*/nullptr, *m_node.dstxman,
                                        *m_node.chainman, *m_node.mempool, *m_node.mn_metaman, *m_node.mn_sync,
                                        *m_node.govman, *m_node.sporkman, /*mn_activeman=*/nullptr, m_node.dmnman,
-                                       /*active_ctx=*/nullptr, /*cj_ctx=*/nullptr, m_node.llmq_ctx, /*ignore_incoming_txs=*/false);
+                                       /*active_ctx=*/nullptr, /*cj_walletman=*/nullptr, m_node.llmq_ctx,
+                                       /*ignore_incoming_txs=*/false);
 
     constexpr int max_outbound_block_relay{MAX_BLOCK_RELAY_ONLY_CONNECTIONS};
     constexpr int64_t MINIMUM_CONNECT_TIME{30};
@@ -322,7 +324,8 @@ BOOST_AUTO_TEST_CASE(peer_discouragement)
     auto peerLogic = PeerManager::make(chainparams, *connman, *m_node.addrman, banman.get(), *m_node.dstxman,
                                        *m_node.chainman, *m_node.mempool, *m_node.mn_metaman, *m_node.mn_sync,
                                        *m_node.govman, *m_node.sporkman, /*mn_activeman=*/nullptr, m_node.dmnman,
-                                       /*active_ctx=*/nullptr, /*cj_ctx=*/nullptr, m_node.llmq_ctx, /*ignore_incoming_txs=*/false);
+                                       /*active_ctx=*/nullptr, /*cj_walletman=*/nullptr, m_node.llmq_ctx,
+                                       /*ignore_incoming_txs=*/false);
 
     CNetAddr tor_netaddr;
     BOOST_REQUIRE(
@@ -427,7 +430,8 @@ BOOST_AUTO_TEST_CASE(DoS_bantime)
     auto peerLogic = PeerManager::make(chainparams, *connman, *m_node.addrman, banman.get(), *m_node.dstxman,
                                        *m_node.chainman, *m_node.mempool, *m_node.mn_metaman, *m_node.mn_sync,
                                        *m_node.govman, *m_node.sporkman, /*mn_activeman=*/nullptr, m_node.dmnman,
-                                       /*active_ctx=*/nullptr, /*cj_ctx=*/nullptr, m_node.llmq_ctx, /*ignore_incoming_txs=*/false);
+                                       /*active_ctx=*/nullptr, /*cj_walletman=*/nullptr, m_node.llmq_ctx,
+                                       /*ignore_incoming_txs=*/false);
 
     banman->ClearBanned();
     int64_t nStartTime = GetTime();
diff --git a/src/test/net_peer_connection_tests.cpp b/src/test/net_peer_connection_tests.cpp
index 966aec6dddce..03469be6e3a2 100644
--- a/src/test/net_peer_connection_tests.cpp
+++ b/src/test/net_peer_connection_tests.cpp
@@ -88,7 +88,8 @@ BOOST_AUTO_TEST_CASE(test_addnode_getaddednodeinfo_and_connection_detection)
     auto peerman = PeerManager::make(chainparams, *connman, *m_node.addrman, /*banman=*/nullptr, *m_node.dstxman,
                                      *m_node.chainman, *m_node.mempool, *m_node.mn_metaman, *m_node.mn_sync,
                                      *m_node.govman, *m_node.sporkman, /*mn_activeman=*/nullptr, m_node.dmnman,
-                                     /*active_ctx=*/nullptr, /*cj_ctx=*/nullptr, m_node.llmq_ctx, /*ignore_incoming_txs=*/false);
+                                     /*active_ctx=*/nullptr, /*cj_walletman=*/nullptr, m_node.llmq_ctx,
+                                     /*ignore_incoming_txs=*/false);
     NodeId id{0};
     std::vector<CNode*> nodes;
 
diff --git a/src/test/util/setup_common.cpp b/src/test/util/setup_common.cpp
index 727550fe44b6..480296e80fc5 100644
--- a/src/test/util/setup_common.cpp
+++ b/src/test/util/setup_common.cpp
@@ -49,7 +49,7 @@
 
 #include <bls/bls.h>
 #include <coinjoin/coinjoin.h>
-#include <coinjoin/context.h>
+#include <coinjoin/walletman.h>
 #include <evo/cbtx.h>
 #include <evo/chainhelper.h>
 #include <evo/creditpool.h>
@@ -344,9 +344,9 @@ TestingSetup::TestingSetup(const std::string& chainName, const std::vector<const
     m_node.dstxman = std::make_unique<CDSTXManager>();
 #ifdef ENABLE_WALLET
     // The test suite doesn't use masternode mode, so we may initialize it
-    m_node.cj_ctx = CJContext::make(*m_node.chainman, *m_node.dmnman, *m_node.mn_metaman, *m_node.mempool,
-                                    *m_node.mn_sync, *m_node.llmq_ctx->isman, /*relay_txes=*/true);
-    assert(m_node.cj_ctx);
+    m_node.cj_walletman = CJWalletManager::make(*m_node.chainman, *m_node.dmnman, *m_node.mn_metaman, *m_node.mempool,
+                                                *m_node.mn_sync, *m_node.llmq_ctx->isman, /*relay_txes=*/true);
+    assert(m_node.cj_walletman);
 
     // WalletInit::Construct()-like logic needed for wallet tests that run on
     // TestingSetup and its children (e.g. TestChain100Setup) instead of
@@ -362,7 +362,8 @@ TestingSetup::TestingSetup(const std::string& chainName, const std::vector<const
     m_node.peerman = PeerManager::make(chainparams, *m_node.connman, *m_node.addrman, m_node.banman.get(), *m_node.dstxman,
                                        *m_node.chainman, *m_node.mempool, *m_node.mn_metaman, *m_node.mn_sync,
                                        *m_node.govman, *m_node.sporkman, /*mn_activeman=*/nullptr, m_node.dmnman,
-                                       /*active_ctx=*/nullptr, m_node.cj_ctx.get(), m_node.llmq_ctx, /*ignore_incoming_txs=*/false);
+                                       /*active_ctx=*/nullptr, m_node.cj_walletman.get(), m_node.llmq_ctx,
+                                       /*ignore_incoming_txs=*/false);
     {
         CConnman::Options options;
         options.m_msgproc = m_node.peerman.get();
@@ -386,7 +387,7 @@ TestingSetup::~TestingSetup()
     }
     m_node.wallet_loader = nullptr;
     m_node.coinjoin_loader.reset();
-    m_node.cj_ctx.reset();
+    m_node.cj_walletman.reset();
 #endif // ENABLE_WALLET
     m_node.dstxman.reset();
 
diff --git a/src/wallet/test/coinjoin_tests.cpp b/src/wallet/test/coinjoin_tests.cpp
index 688f72efceb0..166c367c0ebd 100644
--- a/src/wallet/test/coinjoin_tests.cpp
+++ b/src/wallet/test/coinjoin_tests.cpp
@@ -6,7 +6,7 @@
 
 #include <coinjoin/client.h>
 #include <coinjoin/coinjoin.h>
-#include <coinjoin/context.h>
+#include <coinjoin/walletman.h>
 #include <coinjoin/options.h>
 #include <coinjoin/util.h>
 #include <consensus/amount.h>
@@ -221,7 +221,7 @@ class CTransactionBuilderTestSetup : public TestChain100Setup
 
 BOOST_FIXTURE_TEST_CASE(coinjoin_manager_start_stop_tests, CTransactionBuilderTestSetup)
 {
-    auto& cj_man = *Assert(m_node.cj_ctx->getClient(""));
+    auto& cj_man = *Assert(m_node.cj_walletman->getClient(""));
     BOOST_CHECK_EQUAL(cj_man.IsMixing(), false);
     BOOST_CHECK_EQUAL(cj_man.StartMixing(), true);
     BOOST_CHECK_EQUAL(cj_man.IsMixing(), true);
diff --git a/src/wallet/test/wallet_tests.cpp b/src/wallet/test/wallet_tests.cpp
index 5912d59dbcaa..6617a316ada4 100644
--- a/src/wallet/test/wallet_tests.cpp
+++ b/src/wallet/test/wallet_tests.cpp
@@ -11,7 +11,6 @@
 #include <vector>
 
 #include <coinjoin/client.h>
-#include <coinjoin/context.h>
 #include <interfaces/chain.h>
 #include <interfaces/coinjoin.h>
 #include <key_io.h>
diff --git a/test/lint/lint-circular-dependencies.py b/test/lint/lint-circular-dependencies.py
index e05e64a50d7d..2bbe393b7850 100755
--- a/test/lint/lint-circular-dependencies.py
+++ b/test/lint/lint-circular-dependencies.py
@@ -31,7 +31,7 @@
     "chainlock/chainlock -> validation -> chainlock/chainlock",
     "chainlock/chainlock -> validation -> evo/chainhelper -> chainlock/chainlock",
     "chainlock/signing -> instantsend/instantsend -> net_processing -> masternode/active/context -> chainlock/signing",
-    "coinjoin/client -> coinjoin/coinjoin -> instantsend/instantsend -> net_processing -> coinjoin/context -> coinjoin/client",
+    "coinjoin/client -> coinjoin/coinjoin -> instantsend/instantsend -> net_processing -> coinjoin/walletman -> coinjoin/client",
     "coinjoin/coinjoin -> instantsend/instantsend -> llmq/quorums -> msg_result -> coinjoin/coinjoin",
     "coinjoin/server -> net_processing -> coinjoin/server",
     "coinjoin/server -> net_processing -> masternode/active/context -> coinjoin/server",

From cefca520702978d2de268f583bf68f983f97ebf3 Mon Sep 17 00:00:00 2001
From: pasta <pasta@dashboost.org>
Date: Mon, 20 Oct 2025 21:45:44 -0500
Subject: [PATCH 223/656] bench: add benchmarks for BLS public key aggregation
 methods

---
 src/Makefile.bench.include   |   1 +
 src/bench/bls_pubkey_agg.cpp | 129 +++++++++++++++++++++++++++++++++++
 2 files changed, 130 insertions(+)
 create mode 100644 src/bench/bls_pubkey_agg.cpp

diff --git a/src/Makefile.bench.include b/src/Makefile.bench.include
index dc17fc2bfb68..345752eeddfd 100644
--- a/src/Makefile.bench.include
+++ b/src/Makefile.bench.include
@@ -23,6 +23,7 @@ bench_bench_dash_SOURCES = \
   bench/block_assemble.cpp \
   bench/bls.cpp \
   bench/bls_dkg.cpp \
+  bench/bls_pubkey_agg.cpp \
   bench/ccoins_caching.cpp \
   bench/chacha20.cpp \
   bench/checkblock.cpp \
diff --git a/src/bench/bls_pubkey_agg.cpp b/src/bench/bls_pubkey_agg.cpp
new file mode 100644
index 000000000000..9814103b459b
--- /dev/null
+++ b/src/bench/bls_pubkey_agg.cpp
@@ -0,0 +1,129 @@
+// Copyright (c) 2025 The Dash Core developers
+// Distributed under the MIT software license, see the accompanying
+// file COPYING or http://www.opensource.org/licenses/mit-license.php.
+
+#include <bench/bench.h>
+#include <bls/bls.h>
+#include <random.h>
+
+// Benchmark for the OLD approach: iterative aggregation
+// This mimics the code before commit d87ea73533e6477441ad995347ea5b4fddf64f9b
+static void BLS_PubKeyAggregate_Iterative(size_t count, benchmark::Bench& bench)
+{
+    // Generate test public keys
+    std::vector<CBLSPublicKey> pubKeys;
+    pubKeys.reserve(count);
+
+    for (size_t i = 0; i < count; i++) {
+        CBLSSecretKey secKey;
+        secKey.MakeNewKey();
+        pubKeys.push_back(secKey.GetPublicKey());
+    }
+
+    // Benchmark: OLD approach - iterative aggregation
+    bench.minEpochIterations(100).run([&] {
+        CBLSPublicKey aggPubKey;
+
+        for (const auto& pubKey : pubKeys) {
+            if (!aggPubKey.IsValid()) {
+                aggPubKey = pubKey;
+            } else {
+                aggPubKey.AggregateInsecure(pubKey);
+            }
+        }
+
+        // Ensure the result is used to prevent optimization
+        assert(aggPubKey.IsValid());
+    });
+}
+
+// Benchmark for the NEW approach: batch aggregation
+// This mimics the code after commit d87ea73533e6477441ad995347ea5b4fddf64f9b
+static void BLS_PubKeyAggregate_Batch(size_t count, benchmark::Bench& bench)
+{
+    // Generate test public keys
+    std::vector<CBLSPublicKey> pubKeys;
+    pubKeys.reserve(count);
+
+    for (size_t i = 0; i < count; i++) {
+        CBLSSecretKey secKey;
+        secKey.MakeNewKey();
+        pubKeys.push_back(secKey.GetPublicKey());
+    }
+
+    // Benchmark: NEW approach - batch aggregation
+    bench.minEpochIterations(100).run([&] {
+        CBLSPublicKey aggPubKey = CBLSPublicKey::AggregateInsecure(pubKeys);
+        // Ensure the result is used to prevent optimization
+        assert(aggPubKey.IsValid());
+    });
+}
+
+// Benchmarks for different sizes
+
+// Small aggregation (5 keys) - typical for small quorum subsets
+static void BLS_PubKeyAggregate_Iterative_5(benchmark::Bench& bench)
+{
+    BLS_PubKeyAggregate_Iterative(5, bench);
+}
+
+static void BLS_PubKeyAggregate_Batch_5(benchmark::Bench& bench)
+{
+    BLS_PubKeyAggregate_Batch(5, bench);
+}
+
+// Medium aggregation (25 keys) - typical for medium quorum subsets
+static void BLS_PubKeyAggregate_Iterative_25(benchmark::Bench& bench)
+{
+    BLS_PubKeyAggregate_Iterative(25, bench);
+}
+
+static void BLS_PubKeyAggregate_Batch_25(benchmark::Bench& bench)
+{
+    BLS_PubKeyAggregate_Batch(25, bench);
+}
+
+// Large aggregation (50 keys) - typical for larger quorums
+static void BLS_PubKeyAggregate_Iterative_50(benchmark::Bench& bench)
+{
+    BLS_PubKeyAggregate_Iterative(50, bench);
+}
+
+static void BLS_PubKeyAggregate_Batch_50(benchmark::Bench& bench)
+{
+    BLS_PubKeyAggregate_Batch(50, bench);
+}
+
+// Very large aggregation (100 keys) - stress test
+static void BLS_PubKeyAggregate_Iterative_100(benchmark::Bench& bench)
+{
+    BLS_PubKeyAggregate_Iterative(100, bench);
+}
+
+static void BLS_PubKeyAggregate_Batch_100(benchmark::Bench& bench)
+{
+    BLS_PubKeyAggregate_Batch(100, bench);
+}
+
+// Extra large aggregation (200 keys) - extreme case
+static void BLS_PubKeyAggregate_Iterative_200(benchmark::Bench& bench)
+{
+    BLS_PubKeyAggregate_Iterative(200, bench);
+}
+
+static void BLS_PubKeyAggregate_Batch_200(benchmark::Bench& bench)
+{
+    BLS_PubKeyAggregate_Batch(200, bench);
+}
+
+// Register all benchmarks
+BENCHMARK(BLS_PubKeyAggregate_Iterative_5)
+BENCHMARK(BLS_PubKeyAggregate_Batch_5)
+BENCHMARK(BLS_PubKeyAggregate_Iterative_25)
+BENCHMARK(BLS_PubKeyAggregate_Batch_25)
+BENCHMARK(BLS_PubKeyAggregate_Iterative_50)
+BENCHMARK(BLS_PubKeyAggregate_Batch_50)
+BENCHMARK(BLS_PubKeyAggregate_Iterative_100)
+BENCHMARK(BLS_PubKeyAggregate_Batch_100)
+BENCHMARK(BLS_PubKeyAggregate_Iterative_200)
+BENCHMARK(BLS_PubKeyAggregate_Batch_200)

From 10d5bd5f62c7f00ee1affe204d73a24bfd079f69 Mon Sep 17 00:00:00 2001
From: UdjinM6 <UdjinM6@users.noreply.github.com>
Date: Tue, 21 Oct 2025 19:00:52 +0300
Subject: [PATCH 224/656] en + dashstrings.cpp

---
 src/qt/dashstrings.cpp    |   64 +-
 src/qt/locale/dash_en.ts  | 1553 +++++---
 src/qt/locale/dash_en.xlf | 7501 ++++++++++++++++---------------------
 3 files changed, 4293 insertions(+), 4825 deletions(-)

diff --git a/src/qt/dashstrings.cpp b/src/qt/dashstrings.cpp
index 59a3ec2a47f1..772330ce8ba8 100644
--- a/src/qt/dashstrings.cpp
+++ b/src/qt/dashstrings.cpp
@@ -17,6 +17,8 @@ QT_TRANSLATE_NOOP("dash-core", ""
 "%s file contains all private keys from this wallet. Do not share it with "
 "anyone!"),
 QT_TRANSLATE_NOOP("dash-core", ""
+"%s is set very high! Fees this large could be paid on a single transaction."),
+QT_TRANSLATE_NOOP("dash-core", ""
 "%s request to listen on port %u. This port is considered \"bad\" and thus it "
 "is unlikely that any Dash Core peers connect to it. See doc/p2p-bad-ports.md "
 "for details and a full list."),
@@ -24,9 +26,6 @@ QT_TRANSLATE_NOOP("dash-core", ""
 "%s uses exact denominated amounts to send funds, you might simply need to "
 "mix some more coins."),
 QT_TRANSLATE_NOOP("dash-core", ""
-"-maxtxfee is set very high! Fees this large could be paid on a single "
-"transaction."),
-QT_TRANSLATE_NOOP("dash-core", ""
 "-reindex-chainstate option is not compatible with -blockfilterindex. Please "
 "temporarily disable blockfilterindex while using -reindex-chainstate, or "
 "replace -reindex-chainstate with -reindex to fully rebuild all indexes."),
@@ -47,9 +46,6 @@ QT_TRANSLATE_NOOP("dash-core", ""
 "Cannot provide specific connections and have addrman find outgoing "
 "connections at the same time."),
 QT_TRANSLATE_NOOP("dash-core", ""
-"Cannot upgrade a non HD wallet from version %i to version %i which is non-HD "
-"wallet. Use upgradetohd RPC"),
-QT_TRANSLATE_NOOP("dash-core", ""
 "Distributed under the MIT software license, see the accompanying file %s or "
 "%s"),
 QT_TRANSLATE_NOOP("dash-core", ""
@@ -78,7 +74,7 @@ QT_TRANSLATE_NOOP("dash-core", ""
 "again."),
 QT_TRANSLATE_NOOP("dash-core", ""
 "Fee estimation failed. Fallbackfee is disabled. Wait a few blocks or enable "
-"-fallbackfee."),
+"%s."),
 QT_TRANSLATE_NOOP("dash-core", ""
 "File %s already exists. If you are sure this is what you want, move it out "
 "of the way first."),
@@ -94,8 +90,8 @@ QT_TRANSLATE_NOOP("dash-core", ""
 QT_TRANSLATE_NOOP("dash-core", ""
 "Invalid -socketevents ('%s') specified. Only these modes are supported: %s"),
 QT_TRANSLATE_NOOP("dash-core", ""
-"Invalid amount for -maxtxfee=<amount>: '%s' (must be at least the minrelay "
-"fee of %s to prevent stuck transactions)"),
+"Invalid amount for %s=<amount>: '%s' (must be at least the minrelay fee of "
+"%s to prevent stuck transactions)"),
 QT_TRANSLATE_NOOP("dash-core", ""
 "Invalid or corrupt peers.dat (%s). If you believe this is a bug, please "
 "report it to %s. As a workaround, you can move the file (%s) out of the way "
@@ -115,6 +111,9 @@ QT_TRANSLATE_NOOP("dash-core", ""
 "No wallet file format provided. To use createfromdump, -format=<format> must "
 "be provided."),
 QT_TRANSLATE_NOOP("dash-core", ""
+"Outbound connections restricted to CJDNS (-onlynet=cjdns) but "
+"-cjdnsreachable is not provided"),
+QT_TRANSLATE_NOOP("dash-core", ""
 "Outbound connections restricted to Tor (-onlynet=onion) but the proxy for "
 "reaching the Tor network is explicitly forbidden: -onion=0"),
 QT_TRANSLATE_NOOP("dash-core", ""
@@ -122,6 +121,9 @@ QT_TRANSLATE_NOOP("dash-core", ""
 "reaching the Tor network is not provided: none of -proxy, -onion or "
 "-listenonion is given"),
 QT_TRANSLATE_NOOP("dash-core", ""
+"Outbound connections restricted to i2p (-onlynet=i2p) but -i2psam is not "
+"provided"),
+QT_TRANSLATE_NOOP("dash-core", ""
 "Please check that your computer's date and time are correct! If your clock "
 "is wrong, %s will not work properly."),
 QT_TRANSLATE_NOOP("dash-core", ""
@@ -139,18 +141,11 @@ QT_TRANSLATE_NOOP("dash-core", ""
 "SQLiteDatabase: Unknown sqlite wallet schema version %d. Only version %d is "
 "supported"),
 QT_TRANSLATE_NOOP("dash-core", ""
-"The -txindex upgrade started by a previous version cannot be completed. "
-"Restart with the previous version or run a full -reindex."),
-QT_TRANSLATE_NOOP("dash-core", ""
 "The block database contains a block which appears to be from the future. "
 "This may be due to your computer's date and time being set incorrectly. Only "
 "rebuild the block database if you are sure that your computer's date and "
 "time are correct"),
 QT_TRANSLATE_NOOP("dash-core", ""
-"The block index db contains a legacy 'txindex'. To clear the occupied disk "
-"space, run a full -reindex, otherwise ignore this error. This error message "
-"will not be displayed again."),
-QT_TRANSLATE_NOOP("dash-core", ""
 "The transaction amount is too small to send after the fee has been deducted"),
 QT_TRANSLATE_NOOP("dash-core", ""
 "This error could occur if this wallet was not shutdown cleanly and was last "
@@ -175,8 +170,8 @@ QT_TRANSLATE_NOOP("dash-core", ""
 "Either start with -disablegovernance command line switch or enable "
 "transaction index."),
 QT_TRANSLATE_NOOP("dash-core", ""
-"Transaction needs a change address, but we can't generate it. Please call "
-"keypoolrefill first."),
+"Transaction requires one destination of non-0 value, a non-0 feerate, or a "
+"pre-selected input"),
 QT_TRANSLATE_NOOP("dash-core", ""
 "Unable to replay blocks. You will need to rebuild the database using "
 "-reindex-chainstate."),
@@ -187,6 +182,9 @@ QT_TRANSLATE_NOOP("dash-core", ""
 "Unsupported category-specific logging level -loglevel=%s. Expected "
 "-loglevel=<category>:<loglevel>. Valid categories: %s. Valid loglevels: %s."),
 QT_TRANSLATE_NOOP("dash-core", ""
+"Unsupported chainstate database format found. Please restart with -reindex-"
+"chainstate. This will rebuild the chainstate database."),
+QT_TRANSLATE_NOOP("dash-core", ""
 "WARNING! Failed to replenish keypool, please unlock your wallet to do so."),
 QT_TRANSLATE_NOOP("dash-core", ""
 "Wallet is locked, can't replenish keypool! Automatic backups and mixing are "
@@ -215,12 +213,17 @@ QT_TRANSLATE_NOOP("dash-core", "-devnet can only be specified once"),
 QT_TRANSLATE_NOOP("dash-core", "-maxmempool must be at least %d MB"),
 QT_TRANSLATE_NOOP("dash-core", "-port must be specified when -devnet and -listen are specified"),
 QT_TRANSLATE_NOOP("dash-core", "-rpcport must be specified when -devnet and -server are specified"),
+QT_TRANSLATE_NOOP("dash-core", "-statsbatchsize cannot be configured with a negative value."),
+QT_TRANSLATE_NOOP("dash-core", "-statsduration cannot be configured with a negative value."),
 QT_TRANSLATE_NOOP("dash-core", "A fatal internal error occurred, see debug.log for details"),
 QT_TRANSLATE_NOOP("dash-core", "Already have that input."),
 QT_TRANSLATE_NOOP("dash-core", "Automatic backups disabled"),
 QT_TRANSLATE_NOOP("dash-core", "Can't find random Masternode."),
 QT_TRANSLATE_NOOP("dash-core", "Can't mix while sync in progress."),
 QT_TRANSLATE_NOOP("dash-core", "Can't mix: no compatible inputs found!"),
+QT_TRANSLATE_NOOP("dash-core", "Cannot create socket (socket() returned error %s)"),
+QT_TRANSLATE_NOOP("dash-core", "Cannot get socket address for %s"),
+QT_TRANSLATE_NOOP("dash-core", "Cannot init Statsd client"),
 QT_TRANSLATE_NOOP("dash-core", "Cannot resolve -%s address: '%s'"),
 QT_TRANSLATE_NOOP("dash-core", "Cannot set -peerblockfilters without -blockfilterindex."),
 QT_TRANSLATE_NOOP("dash-core", "Cannot write to data directory '%s'; check permissions."),
@@ -249,8 +252,6 @@ QT_TRANSLATE_NOOP("dash-core", "Error loading block database"),
 QT_TRANSLATE_NOOP("dash-core", "Error opening block database"),
 QT_TRANSLATE_NOOP("dash-core", "Error reading from database, shutting down."),
 QT_TRANSLATE_NOOP("dash-core", "Error reading next record from wallet database"),
-QT_TRANSLATE_NOOP("dash-core", "Error upgrading Evo database"),
-QT_TRANSLATE_NOOP("dash-core", "Error upgrading chainstate database"),
 QT_TRANSLATE_NOOP("dash-core", "Error upgrading evo database for EHF"),
 QT_TRANSLATE_NOOP("dash-core", "Error: Couldn't create cursor into database"),
 QT_TRANSLATE_NOOP("dash-core", "Error: Disk space is low for %s"),
@@ -262,7 +263,6 @@ QT_TRANSLATE_NOOP("dash-core", "Error: Missing checksum"),
 QT_TRANSLATE_NOOP("dash-core", "Error: No addresses available."),
 QT_TRANSLATE_NOOP("dash-core", "Error: Unable to parse version %u as a uint32_t"),
 QT_TRANSLATE_NOOP("dash-core", "Error: Unable to write record to new wallet"),
-QT_TRANSLATE_NOOP("dash-core", "Exceeded max tries."),
 QT_TRANSLATE_NOOP("dash-core", "Failed to clear fulfilled requests cache at %s"),
 QT_TRANSLATE_NOOP("dash-core", "Failed to clear governance cache at %s"),
 QT_TRANSLATE_NOOP("dash-core", "Failed to clear masternode cache at %s"),
@@ -278,10 +278,13 @@ QT_TRANSLATE_NOOP("dash-core", "Failed to load masternode cache from %s"),
 QT_TRANSLATE_NOOP("dash-core", "Failed to load sporks cache from %s"),
 QT_TRANSLATE_NOOP("dash-core", "Failed to rescan the wallet during initialization"),
 QT_TRANSLATE_NOOP("dash-core", "Failed to start a new mixing queue"),
+QT_TRANSLATE_NOOP("dash-core", "Failed to upgrade Evo database"),
 QT_TRANSLATE_NOOP("dash-core", "Failed to verify database"),
+QT_TRANSLATE_NOOP("dash-core", "Fee needed > fee paid"),
 QT_TRANSLATE_NOOP("dash-core", "Fee rate (%s) is lower than the minimum fee rate setting (%s)"),
 QT_TRANSLATE_NOOP("dash-core", "Found enough users, signing ( waiting %s )"),
 QT_TRANSLATE_NOOP("dash-core", "Found enough users, signing…"),
+QT_TRANSLATE_NOOP("dash-core", "Host %s on unsupported network"),
 QT_TRANSLATE_NOOP("dash-core", "Ignoring duplicate -wallet %s."),
 QT_TRANSLATE_NOOP("dash-core", "Importing…"),
 QT_TRANSLATE_NOOP("dash-core", "Incompatible mode."),
@@ -298,13 +301,13 @@ QT_TRANSLATE_NOOP("dash-core", "Invalid -i2psam address or hostname: '%s'"),
 QT_TRANSLATE_NOOP("dash-core", "Invalid -onion address or hostname: '%s'"),
 QT_TRANSLATE_NOOP("dash-core", "Invalid -proxy address or hostname: '%s'"),
 QT_TRANSLATE_NOOP("dash-core", "Invalid P2P permission: '%s'"),
+QT_TRANSLATE_NOOP("dash-core", "Invalid amount for %s=<amount>: '%s' (must be at least %s)"),
+QT_TRANSLATE_NOOP("dash-core", "Invalid amount for %s=<amount>: '%s'"),
 QT_TRANSLATE_NOOP("dash-core", "Invalid amount for -%s=<amount>: '%s'"),
-QT_TRANSLATE_NOOP("dash-core", "Invalid amount for -discardfee=<amount>: '%s'"),
-QT_TRANSLATE_NOOP("dash-core", "Invalid amount for -fallbackfee=<amount>: '%s'"),
-QT_TRANSLATE_NOOP("dash-core", "Invalid amount for -paytxfee=<amount>: '%s' (must be at least %s)"),
 QT_TRANSLATE_NOOP("dash-core", "Invalid masternodeblsprivkey. Please see documentation."),
 QT_TRANSLATE_NOOP("dash-core", "Invalid minimum number of spork signers specified with -minsporkkeys"),
 QT_TRANSLATE_NOOP("dash-core", "Invalid netmask specified in -whitelist: '%s'"),
+QT_TRANSLATE_NOOP("dash-core", "Invalid port specified in %s: '%s'"),
 QT_TRANSLATE_NOOP("dash-core", "Invalid script detected."),
 QT_TRANSLATE_NOOP("dash-core", "Invalid spork address specified with -sporkaddr"),
 QT_TRANSLATE_NOOP("dash-core", "Last queue was created too recently."),
@@ -318,17 +321,22 @@ QT_TRANSLATE_NOOP("dash-core", "Lock is already in place."),
 QT_TRANSLATE_NOOP("dash-core", "Masternode queue is full."),
 QT_TRANSLATE_NOOP("dash-core", "Masternode:"),
 QT_TRANSLATE_NOOP("dash-core", "Missing input transaction information."),
+QT_TRANSLATE_NOOP("dash-core", "Missing solving data for estimating transaction size"),
 QT_TRANSLATE_NOOP("dash-core", "Mixing in progress…"),
 QT_TRANSLATE_NOOP("dash-core", "Need to specify a port with -whitebind: '%s'"),
 QT_TRANSLATE_NOOP("dash-core", "No Masternodes detected."),
 QT_TRANSLATE_NOOP("dash-core", "No addresses available"),
 QT_TRANSLATE_NOOP("dash-core", "No compatible Masternode found."),
 QT_TRANSLATE_NOOP("dash-core", "No errors detected."),
+QT_TRANSLATE_NOOP("dash-core", "No host specified"),
+QT_TRANSLATE_NOOP("dash-core", "No host specified, malformed URL"),
 QT_TRANSLATE_NOOP("dash-core", "No matching denominations found for mixing."),
+QT_TRANSLATE_NOOP("dash-core", "No text before the scheme delimiter, malformed URL"),
 QT_TRANSLATE_NOOP("dash-core", "Not compatible with existing transactions."),
 QT_TRANSLATE_NOOP("dash-core", "Not enough file descriptors available."),
 QT_TRANSLATE_NOOP("dash-core", "Not enough funds to mix."),
 QT_TRANSLATE_NOOP("dash-core", "Not in the Masternode list."),
+QT_TRANSLATE_NOOP("dash-core", "Port must be between %d and %d, supplied %d"),
 QT_TRANSLATE_NOOP("dash-core", "Prune cannot be configured with a negative value."),
 QT_TRANSLATE_NOOP("dash-core", "Prune mode is incompatible with -disablegovernance=false."),
 QT_TRANSLATE_NOOP("dash-core", "Prune mode is incompatible with -txindex."),
@@ -344,6 +352,7 @@ QT_TRANSLATE_NOOP("dash-core", "Section [%s] is not recognized."),
 QT_TRANSLATE_NOOP("dash-core", "Session not complete!"),
 QT_TRANSLATE_NOOP("dash-core", "Session timed out."),
 QT_TRANSLATE_NOOP("dash-core", "Signing transaction failed"),
+QT_TRANSLATE_NOOP("dash-core", "Socket not initialized, cannot send message"),
 QT_TRANSLATE_NOOP("dash-core", "Specified -walletdir \"%s\" does not exist"),
 QT_TRANSLATE_NOOP("dash-core", "Specified -walletdir \"%s\" is a relative path"),
 QT_TRANSLATE_NOOP("dash-core", "Specified -walletdir \"%s\" is not a directory"),
@@ -369,6 +378,7 @@ QT_TRANSLATE_NOOP("dash-core", "Transaction created successfully."),
 QT_TRANSLATE_NOOP("dash-core", "Transaction fees are too high."),
 QT_TRANSLATE_NOOP("dash-core", "Transaction has too long of a mempool chain"),
 QT_TRANSLATE_NOOP("dash-core", "Transaction must have at least one recipient"),
+QT_TRANSLATE_NOOP("dash-core", "Transaction needs a change address, but we can't generate it."),
 QT_TRANSLATE_NOOP("dash-core", "Transaction not valid."),
 QT_TRANSLATE_NOOP("dash-core", "Transaction too large"),
 QT_TRANSLATE_NOOP("dash-core", "Trying to connect…"),
@@ -378,8 +388,10 @@ QT_TRANSLATE_NOOP("dash-core", "Unable to create the PID file '%s': %s"),
 QT_TRANSLATE_NOOP("dash-core", "Unable to generate initial keys"),
 QT_TRANSLATE_NOOP("dash-core", "Unable to locate enough mixed funds for this transaction."),
 QT_TRANSLATE_NOOP("dash-core", "Unable to locate enough non-denominated funds for this transaction."),
+QT_TRANSLATE_NOOP("dash-core", "Unable to lookup host %s"),
 QT_TRANSLATE_NOOP("dash-core", "Unable to open %s for writing"),
-QT_TRANSLATE_NOOP("dash-core", "Unable to parse -maxuploadtarget: '%s' (possible integer overflow?)"),
+QT_TRANSLATE_NOOP("dash-core", "Unable to parse -maxuploadtarget: '%s'"),
+QT_TRANSLATE_NOOP("dash-core", "Unable to send message to %s (::sendto() returned error %s)"),
 QT_TRANSLATE_NOOP("dash-core", "Unable to sign spork message, wrong key?"),
 QT_TRANSLATE_NOOP("dash-core", "Unable to start HTTP server. See debug log for details."),
 QT_TRANSLATE_NOOP("dash-core", "Unknown -blockfilterindex value %s."),
@@ -387,9 +399,9 @@ QT_TRANSLATE_NOOP("dash-core", "Unknown network specified in -onlynet: '%s'"),
 QT_TRANSLATE_NOOP("dash-core", "Unknown new rules activated (versionbit %i)"),
 QT_TRANSLATE_NOOP("dash-core", "Unknown response."),
 QT_TRANSLATE_NOOP("dash-core", "Unknown state: id = %u"),
+QT_TRANSLATE_NOOP("dash-core", "Unsupported URL scheme, must begin with udp://"),
 QT_TRANSLATE_NOOP("dash-core", "Unsupported global logging level -loglevel=%s. Valid values: %s."),
 QT_TRANSLATE_NOOP("dash-core", "Unsupported logging category %s=%s."),
-QT_TRANSLATE_NOOP("dash-core", "Upgrading UTXO database"),
 QT_TRANSLATE_NOOP("dash-core", "User Agent comment (%s) contains unsafe characters."),
 QT_TRANSLATE_NOOP("dash-core", "Verifying blocks…"),
 QT_TRANSLATE_NOOP("dash-core", "Verifying wallet(s)…"),
diff --git a/src/qt/locale/dash_en.ts b/src/qt/locale/dash_en.ts
index 4d01405250eb..30ef1b6b193a 100644
--- a/src/qt/locale/dash_en.ts
+++ b/src/qt/locale/dash_en.ts
@@ -50,7 +50,7 @@
     </message>
     <message>
         <location line="+3"/>
-        <location filename="../addressbookpage.cpp" line="+121"/>
+        <location filename="../addressbookpage.cpp" line="+117"/>
         <source>&amp;Delete</source>
         <translation>&amp;Delete</translation>
     </message>
@@ -70,7 +70,7 @@
         <translation>C&amp;lose</translation>
     </message>
     <message>
-        <location filename="../addressbookpage.cpp" line="-42"/>
+        <location filename="../addressbookpage.cpp" line="-34"/>
         <source>Choose the address to send coins to</source>
         <translation>Choose the address to send coins to</translation>
     </message>
@@ -86,16 +86,6 @@
     </message>
     <message>
         <location line="+6"/>
-        <source>Sending addresses</source>
-        <translation>Sending addresses</translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Receiving addresses</source>
-        <translation>Receiving addresses</translation>
-    </message>
-    <message>
-        <location line="+7"/>
         <source>These are your Dash addresses for sending payments. Always check the amount and the receiving address before sending coins.</source>
         <translation>These are your Dash addresses for sending payments. Always check the amount and the receiving address before sending coins.</translation>
     </message>
@@ -125,7 +115,7 @@
         <translation>Show address &amp;QR code</translation>
     </message>
     <message>
-        <location line="+124"/>
+        <location line="+125"/>
         <source>QR code</source>
         <translation>QR code</translation>
     </message>
@@ -147,7 +137,17 @@
         <translation>There was an error trying to save the address list to %1. Please try again.</translation>
     </message>
     <message>
-        <location line="-3"/>
+        <location line="+32"/>
+        <source>Sending addresses - %1</source>
+        <translation>Sending addresses - %1</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Receiving addresses - %1</source>
+        <translation>Receiving addresses - %1</translation>
+    </message>
+    <message>
+        <location line="-36"/>
         <source>Exporting Failed</source>
         <translation>Exporting Failed</translation>
     </message>
@@ -274,7 +274,7 @@
         <translation>Change passphrase</translation>
     </message>
     <message>
-        <location line="+48"/>
+        <location line="+47"/>
         <source>Confirm wallet encryption</source>
         <translation>Confirm wallet encryption</translation>
     </message>
@@ -291,12 +291,12 @@
     <message>
         <location line="+19"/>
         <location line="+10"/>
-        <location line="+49"/>
+        <location line="+60"/>
         <source>Wallet encrypted</source>
         <translation>Wallet encrypted</translation>
     </message>
     <message>
-        <location line="-149"/>
+        <location line="-159"/>
         <source>Enter the new passphrase for the wallet.&lt;br/&gt;Please use a passphrase of &lt;b&gt;ten or more random characters&lt;/b&gt;, or &lt;b&gt;eight or more words&lt;/b&gt;.</source>
         <translation>Enter the new passphrase for the wallet.&lt;br/&gt;Please use a passphrase of &lt;b&gt;ten or more random characters&lt;/b&gt;, or &lt;b&gt;eight or more words&lt;/b&gt;.</translation>
     </message>
@@ -306,7 +306,7 @@
         <translation>Enter the old passphrase and new passphrase for the wallet.</translation>
     </message>
     <message>
-        <location line="+55"/>
+        <location line="+54"/>
         <source>Remember that encrypting your wallet cannot fully protect your funds from being stolen by malware infecting your computer.</source>
         <translation>Remember that encrypting your wallet cannot fully protect your funds from being stolen by malware infecting your computer.</translation>
     </message>
@@ -339,41 +339,57 @@
     <message>
         <location line="+7"/>
         <location line="+8"/>
-        <location line="+36"/>
-        <location line="+6"/>
+        <location line="+63"/>
         <source>Wallet encryption failed</source>
         <translation>Wallet encryption failed</translation>
     </message>
     <message>
-        <location line="-49"/>
+        <location line="-70"/>
         <source>Wallet encryption failed due to an internal error. Your wallet was not encrypted.</source>
         <translation>Wallet encryption failed due to an internal error. Your wallet was not encrypted.</translation>
     </message>
     <message>
         <location line="+8"/>
-        <location line="+42"/>
+        <location line="+63"/>
         <source>The supplied passphrases do not match.</source>
         <translation>The supplied passphrases do not match.</translation>
     </message>
     <message>
-        <location line="-29"/>
-        <location line="+8"/>
+        <location line="-48"/>
+        <location line="+3"/>
+        <location line="+14"/>
         <source>Wallet unlock failed</source>
         <translation>Wallet unlock failed</translation>
     </message>
     <message>
-        <location line="-7"/>
-        <location line="+22"/>
+        <location line="-16"/>
+        <location line="+33"/>
         <source>The passphrase entered for the wallet decryption was incorrect.</source>
         <translation>The passphrase entered for the wallet decryption was incorrect.</translation>
     </message>
     <message>
-        <location line="-6"/>
+        <location line="-30"/>
+        <source>The passphrase entered for the wallet decryption is incorrect. It contains a null character (ie - a zero byte). If the passphrase was set with a version of this software prior to 23.0, please try again with only the characters up to — but not including — the first null character. If this is successful, please set a new passphrase to avoid this issue in the future.</source>
+        <translation>The passphrase entered for the wallet decryption is incorrect. It contains a null character (ie - a zero byte). If the passphrase was set with a version of this software prior to 23.0, please try again with only the characters up to — but not including — the first null character. If this is successful, please set a new passphrase to avoid this issue in the future.</translation>
+    </message>
+    <message>
+        <location line="+22"/>
         <source>Wallet passphrase was successfully changed.</source>
         <translation>Wallet passphrase was successfully changed.</translation>
     </message>
     <message>
-        <location line="+47"/>
+        <location line="+7"/>
+        <location line="+3"/>
+        <source>Passphrase change failed</source>
+        <translation>Passphrase change failed</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>The old passphrase entered for the wallet decryption is incorrect. It contains a null character (ie - a zero byte). If the passphrase was set with a version of this software prior to 23.0, please try again with only the characters up to — but not including — the first null character.</source>
+        <translation>The old passphrase entered for the wallet decryption is incorrect. It contains a null character (ie - a zero byte). If the passphrase was set with a version of this software prior to 23.0, please try again with only the characters up to — but not including — the first null character.</translation>
+    </message>
+    <message>
+        <location line="+46"/>
         <location line="+33"/>
         <source>Warning: The Caps Lock key is on!</source>
         <translation>Warning: The Caps Lock key is on!</translation>
@@ -395,7 +411,7 @@
 <context>
     <name>BitcoinAmountField</name>
     <message>
-        <location filename="../bitcoinamountfield.cpp" line="+292"/>
+        <location filename="../bitcoinamountfield.cpp" line="+293"/>
         <source>Amount in %1</source>
         <translation>Amount in %1</translation>
     </message>
@@ -403,7 +419,7 @@
 <context>
     <name>BitcoinApplication</name>
     <message>
-        <location filename="../bitcoin.cpp" line="+419"/>
+        <location filename="../bitcoin.cpp" line="+452"/>
         <source>Runaway exception</source>
         <translation>Runaway exception</translation>
     </message>
@@ -426,7 +442,7 @@
 <context>
     <name>BitcoinGUI</name>
     <message>
-        <location filename="../bitcoingui.cpp" line="+683"/>
+        <location filename="../bitcoingui.cpp" line="+703"/>
         <source>&amp;Overview</source>
         <translation>&amp;Overview</translation>
     </message>
@@ -436,7 +452,7 @@
         <translation>Show general overview of wallet</translation>
     </message>
     <message>
-        <location line="-328"/>
+        <location line="-351"/>
         <source>&amp;Send</source>
         <translation>&amp;Send</translation>
     </message>
@@ -446,7 +462,7 @@
         <translation>Send coins to a Dash address</translation>
     </message>
     <message>
-        <location line="+8"/>
+        <location line="+6"/>
         <source>&amp;Receive</source>
         <translation>&amp;Receive</translation>
     </message>
@@ -466,7 +482,7 @@
         <translation>&amp;Options…</translation>
     </message>
     <message>
-        <location line="+7"/>
+        <location line="+5"/>
         <source>&amp;Encrypt Wallet…</source>
         <translation>&amp;Encrypt Wallet…</translation>
     </message>
@@ -501,12 +517,7 @@
         <translation>&amp;Load PSBT from file…</translation>
     </message>
     <message>
-        <location line="+2"/>
-        <source>Load PSBT from clipboard…</source>
-        <translation>Load PSBT from clipboard…</translation>
-    </message>
-    <message>
-        <location line="+27"/>
+        <location line="+29"/>
         <source>&amp;Sending addresses</source>
         <translation>&amp;Sending addresses</translation>
     </message>
@@ -536,22 +547,17 @@
         <translation>Close wallet</translation>
     </message>
     <message>
-        <location line="+88"/>
+        <location line="+93"/>
         <source>No wallets available</source>
         <translation>No wallets available</translation>
     </message>
     <message>
-        <location line="+69"/>
+        <location line="+91"/>
         <source>&amp;Window</source>
         <translation>&amp;Window</translation>
     </message>
     <message>
-        <location line="+2"/>
-        <source>Minimize</source>
-        <translation>Minimize</translation>
-    </message>
-    <message>
-        <location line="+10"/>
+        <location line="+12"/>
         <source>Zoom</source>
         <translation>Zoom</translation>
     </message>
@@ -581,7 +587,7 @@
         <translation>Browse masternodes</translation>
     </message>
     <message>
-        <location line="-331"/>
+        <location line="-356"/>
         <source>E&amp;xit</source>
         <translation>E&amp;xit</translation>
     </message>
@@ -616,17 +622,7 @@
         <translation>Modify configuration options for %1</translation>
     </message>
     <message>
-        <location line="+3"/>
-        <source>&amp;Show / Hide</source>
-        <translation>&amp;Show / Hide</translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Show or hide the main Window</source>
-        <translation>Show or hide the main Window</translation>
-    </message>
-    <message>
-        <location line="+3"/>
+        <location line="+5"/>
         <source>Encrypt the private keys that belong to your wallet</source>
         <translation>Encrypt the private keys that belong to your wallet</translation>
     </message>
@@ -706,12 +702,7 @@
         <translation>Show wallet repair options</translation>
     </message>
     <message>
-        <location line="+1"/>
-        <source>Open Wallet &amp;Configuration File</source>
-        <translation>Open Wallet &amp;Configuration File</translation>
-    </message>
-    <message>
-        <location line="+1"/>
+        <location line="+2"/>
         <source>Open configuration file</source>
         <translation>Open configuration file</translation>
     </message>
@@ -736,7 +727,7 @@
         <translation>Show the list of used receiving addresses and labels</translation>
     </message>
     <message>
-        <location line="+20"/>
+        <location line="+26"/>
         <source>&amp;Command-line options</source>
         <translation>&amp;Command-line options</translation>
     </message>
@@ -746,44 +737,54 @@
         <translation>Show the %1 help message to get a list with possible Dash command-line options</translation>
     </message>
     <message>
-        <location line="+57"/>
+        <location line="+56"/>
         <source>default wallet</source>
         <translation>default wallet</translation>
     </message>
     <message>
-        <location line="+508"/>
+        <location line="+540"/>
         <source>%1 client</source>
         <translation>%1 client</translation>
     </message>
     <message>
-        <location line="+775"/>
+        <location line="+802"/>
         <source>Wallet: %1
 </source>
         <translation>Wallet: %1
 </translation>
     </message>
     <message>
-        <location line="+75"/>
+        <location line="+81"/>
         <source>Wallet is &lt;b&gt;unencrypted&lt;/b&gt;</source>
         <translation>Wallet is &lt;b&gt;unencrypted&lt;/b&gt;</translation>
     </message>
     <message>
-        <location line="-1305"/>
+        <location line="-1350"/>
         <source>&amp;File</source>
         <translation>&amp;File</translation>
     </message>
     <message>
-        <location line="-190"/>
+        <location line="-213"/>
         <source>Show information about %1</source>
         <translation>Show information about %1</translation>
     </message>
     <message>
-        <location line="+34"/>
+        <location line="+26"/>
+        <source>Load PSBT from &amp;clipboard…</source>
+        <translation>Load PSBT from &amp;clipboard…</translation>
+    </message>
+    <message>
+        <location line="+6"/>
         <source>Open debugging and diagnostic console</source>
         <translation>Open debugging and diagnostic console</translation>
     </message>
     <message>
-        <location line="+27"/>
+        <location line="+7"/>
+        <source>Open &amp;wallet configuration file</source>
+        <translation>Open &amp;wallet configuration file</translation>
+    </message>
+    <message>
+        <location line="+20"/>
         <source>Open a dash: URI</source>
         <translation>Open a dash: URI</translation>
     </message>
@@ -792,6 +793,18 @@
         <source>Create a new wallet</source>
         <translation>Create a new wallet</translation>
     </message>
+    <message>
+        <location line="+3"/>
+        <source>Restore Wallet…</source>
+        <extracomment>Name of the menu item that restores wallet from a backup file.</extracomment>
+        <translation>Restore Wallet…</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Restore a wallet from a backup file</source>
+        <extracomment>Status tip for Restore Wallet menu item</extracomment>
+        <translation>Restore a wallet from a backup file</translation>
+    </message>
     <message>
         <location line="+3"/>
         <source>Close all wallets</source>
@@ -818,12 +831,41 @@
         <translation></translation>
     </message>
     <message>
-        <location line="+125"/>
+        <location line="+74"/>
+        <source>Wallet Data</source>
+        <extracomment>Name of the wallet data file format.</extracomment>
+        <translation>Wallet Data</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Load Wallet Backup</source>
+        <extracomment>The title for Restore Wallet File Windows</extracomment>
+        <translation>Load Wallet Backup</translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Restore Wallet</source>
+        <extracomment>Title of pop-up window shown when the user is attempting to restore a wallet.</extracomment>
+        <translation>Restore Wallet</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Wallet Name</source>
+        <extracomment>Label of the input field where the name of the wallet is entered.</extracomment>
+        <translation>Wallet Name</translation>
+    </message>
+    <message>
+        <location line="+59"/>
         <source>&amp;Settings</source>
         <translation>&amp;Settings</translation>
     </message>
     <message>
-        <location line="+63"/>
+        <location line="+15"/>
+        <source>&amp;Minimize</source>
+        <translation>&amp;Minimize</translation>
+    </message>
+    <message>
+        <location line="+48"/>
         <source>&amp;Help</source>
         <translation>&amp;Help</translation>
     </message>
@@ -842,8 +884,18 @@
         <source>View Governance Proposals</source>
         <translation>View Governance Proposals</translation>
     </message>
+    <message>
+        <location line="+381"/>
+        <source>&amp;Hide</source>
+        <translation>&amp;Hide</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>S&amp;how</source>
+        <translation>S&amp;how</translation>
+    </message>
     <message numerus="yes">
-        <location line="+573"/>
+        <location line="+229"/>
         <source>%n active connection(s) to Dash network</source>
         <extracomment>A substring of the tooltip.</extracomment>
         <translation>
@@ -857,7 +909,7 @@
         <translation>Network activity disabled</translation>
     </message>
     <message numerus="yes">
-        <location line="+200"/>
+        <location line="+199"/>
         <source>Processed %n block(s) of transaction history.</source>
         <translation>
             <numerusform>Processed %n block of transaction history.</numerusform>
@@ -870,7 +922,7 @@
         <translation>%1 behind</translation>
     </message>
     <message>
-        <location line="-1061"/>
+        <location line="-1125"/>
         <source>Close Wallet…</source>
         <translation>Close Wallet…</translation>
     </message>
@@ -890,7 +942,7 @@
         <translation>Create Wallet…</translation>
     </message>
     <message>
-        <location line="+4"/>
+        <location line="+10"/>
         <source>Close All Wallets…</source>
         <translation>Close All Wallets…</translation>
     </message>
@@ -900,12 +952,12 @@
         <translation>Ctrl+Shift+D</translation>
     </message>
     <message>
-        <location line="+142"/>
+        <location line="+163"/>
         <source>Ctrl+M</source>
         <translation>Ctrl+M</translation>
     </message>
     <message>
-        <location line="+689"/>
+        <location line="+727"/>
         <source>Click for more actions.</source>
         <extracomment>A substring of the tooltip. &quot;More actions&quot; are available via the context menu.</extracomment>
         <translation>Click for more actions.</translation>
@@ -934,7 +986,7 @@
         <translation>Syncing Headers (%1%)…</translation>
     </message>
     <message>
-        <location line="+123"/>
+        <location line="+125"/>
         <source>Synchronizing with network…</source>
         <translation>Synchronizing with network…</translation>
     </message>
@@ -949,12 +1001,7 @@
         <translation>Processing blocks on disk…</translation>
     </message>
     <message>
-        <location line="+4"/>
-        <source>Reindexing blocks on disk…</source>
-        <translation>Reindexing blocks on disk…</translation>
-    </message>
-    <message>
-        <location line="+6"/>
+        <location line="+7"/>
         <source>Connecting to peers…</source>
         <translation>Connecting to peers…</translation>
     </message>
@@ -1088,7 +1135,7 @@
         <translation>HD key generation is &lt;b&gt;enabled&lt;/b&gt;</translation>
     </message>
     <message>
-        <location line="+22"/>
+        <location line="+28"/>
         <source>Wallet is &lt;b&gt;encrypted&lt;/b&gt; and currently &lt;b&gt;unlocked&lt;/b&gt;</source>
         <translation>Wallet is &lt;b&gt;encrypted&lt;/b&gt; and currently &lt;b&gt;unlocked&lt;/b&gt;</translation>
     </message>
@@ -1116,7 +1163,7 @@
 <context>
     <name>CoinControlDialog</name>
     <message>
-        <location filename="../forms/coincontroldialog.ui" line="+42"/>
+        <location filename="../forms/coincontroldialog.ui" line="+45"/>
         <source>Quantity:</source>
         <translation>Quantity:</translation>
     </message>
@@ -1131,22 +1178,17 @@
         <translation>Amount:</translation>
     </message>
     <message>
-        <location line="+68"/>
+        <location line="+39"/>
         <source>Fee:</source>
         <translation>Fee:</translation>
     </message>
     <message>
-        <location line="-158"/>
+        <location line="-132"/>
         <source>Coin Selection</source>
         <translation>Coin Selection</translation>
     </message>
     <message>
-        <location line="+116"/>
-        <source>Dust:</source>
-        <translation>Dust:</translation>
-    </message>
-    <message>
-        <location line="+81"/>
+        <location line="+174"/>
         <source>After Fee:</source>
         <translation>After Fee:</translation>
     </message>
@@ -1216,7 +1258,7 @@
         <translation>Confirmed</translation>
     </message>
     <message>
-        <location filename="../coincontroldialog.cpp" line="+78"/>
+        <location filename="../coincontroldialog.cpp" line="+79"/>
         <source>Copy amount</source>
         <translation>Copy amount</translation>
     </message>
@@ -1270,48 +1312,28 @@
         <source>Copy bytes</source>
         <translation>Copy bytes</translation>
     </message>
-    <message>
-        <location line="+1"/>
-        <source>Copy dust</source>
-        <translation>Copy dust</translation>
-    </message>
     <message>
         <location line="+1"/>
         <source>Copy change</source>
         <translation>Copy change</translation>
     </message>
     <message>
-        <location line="+139"/>
+        <location line="+137"/>
         <source>Please switch to &quot;List mode&quot; to use this function.</source>
         <translation>Please switch to &quot;List mode&quot; to use this function.</translation>
     </message>
     <message>
-        <location line="+210"/>
+        <location line="+204"/>
         <source>(%1 locked)</source>
         <translation>(%1 locked)</translation>
     </message>
     <message>
-        <location line="+157"/>
-        <source>yes</source>
-        <translation>yes</translation>
-    </message>
-    <message>
-        <location line="+0"/>
-        <source>no</source>
-        <translation>no</translation>
-    </message>
-    <message>
-        <location line="+14"/>
-        <source>This label turns red if any recipient receives an amount smaller than the current dust threshold.</source>
-        <translation>This label turns red if any recipient receives an amount smaller than the current dust threshold.</translation>
-    </message>
-    <message>
-        <location line="+5"/>
+        <location line="+156"/>
         <source>Can vary +/- %1 duff(s) per input.</source>
         <translation>Can vary +/- %1 duff(s) per input.</translation>
     </message>
     <message>
-        <location line="+20"/>
+        <location line="+18"/>
         <source>Some coins were unselected because they were spent.</source>
         <translation>Some coins were unselected because they were spent.</translation>
     </message>
@@ -1360,7 +1382,7 @@
 <context>
     <name>CreateWalletActivity</name>
     <message>
-        <location filename="../walletcontroller.cpp" line="+258"/>
+        <location filename="../walletcontroller.cpp" line="+244"/>
         <source>Create Wallet</source>
         <extracomment>Title of window indicating the progress of creation of a new wallet.</extracomment>
         <translation>Create Wallet</translation>
@@ -1372,7 +1394,7 @@
         <translation>Creating Wallet &lt;b&gt;%1&lt;/b&gt;…</translation>
     </message>
     <message>
-        <location line="+28"/>
+        <location line="+30"/>
         <source>Create wallet failed</source>
         <translation>Create wallet failed</translation>
     </message>
@@ -1569,25 +1591,140 @@
         <translation>Filter proposal list</translation>
     </message>
     <message>
-        <location line="+23"/>
+        <location line="+26"/>
+        <source>Masternode Count:</source>
+        <translation>Masternode Count:</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Number of masternodes this wallet can vote with (masternodes for which this wallet holds the voting key)</source>
+        <translation>Number of masternodes this wallet can vote with (masternodes for which this wallet holds the voting key)</translation>
+    </message>
+    <message>
+        <location line="+30"/>
         <source>Proposal Count:</source>
         <translation>Proposal Count:</translation>
     </message>
     <message>
-        <location line="-20"/>
+        <location line="+30"/>
+        <source>Create Proposal</source>
+        <translation>Create Proposal</translation>
+    </message>
+    <message>
+        <location line="-86"/>
         <source>Filter by Title</source>
         <translation>Filter by Title</translation>
     </message>
     <message>
         <location filename="../governancelist.cpp" line="+426"/>
+        <source>Unavailable</source>
+        <translation>Unavailable</translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>A synced node and an unlocked wallet are required.</source>
+        <translation>A synced node and an unlocked wallet are required.</translation>
+    </message>
+    <message>
+        <location line="+36"/>
+        <source>Vote Yes</source>
+        <translation>Vote Yes</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Vote No</source>
+        <translation>Vote No</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Vote Abstain</source>
+        <translation>Vote Abstain</translation>
+    </message>
+    <message>
+        <location line="+17"/>
         <source>Proposal Info: %1</source>
         <translation>Proposal Info: %1</translation>
     </message>
+    <message>
+        <location line="+42"/>
+        <location line="+5"/>
+        <location line="+7"/>
+        <location line="+14"/>
+        <location line="+11"/>
+        <source>Voting Failed</source>
+        <translation>Voting Failed</translation>
+    </message>
+    <message>
+        <location line="-37"/>
+        <source>No wallet available.</source>
+        <translation>No wallet available.</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>No masternode voting keys found in wallet.</source>
+        <translation>No masternode voting keys found in wallet.</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Please select a proposal to vote on.</source>
+        <translation>Please select a proposal to vote on.</translation>
+    </message>
+    <message>
+        <location line="+14"/>
+        <source>Unable to unlock wallet.</source>
+        <translation>Unable to unlock wallet.</translation>
+    </message>
+    <message>
+        <location line="+11"/>
+        <source>Unable to get masternode list. Please try again later.</source>
+        <translation>Unable to get masternode list. Please try again later.</translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>Masternode %1 not found</source>
+        <translation>Masternode %1 not found</translation>
+    </message>
+    <message>
+        <location line="+11"/>
+        <source>Failed to sign vote for masternode %1</source>
+        <translation>Failed to sign vote for masternode %1</translation>
+    </message>
+    <message>
+        <location line="+11"/>
+        <source>Masternode %1: %2</source>
+        <translation>Masternode %1: %2</translation>
+    </message>
+    <message numerus="yes">
+        <location line="+7"/>
+        <source>Voted successfully %n time(s)</source>
+        <translation>
+            <numerusform>Voted successfully %n time</numerusform>
+            <numerusform>Voted successfully %n times</numerusform>
+        </translation>
+    </message>
+    <message numerus="yes">
+        <location line="+6"/>
+        <source>Failed to vote %n time(s)</source>
+        <translation>
+            <numerusform>Failed to vote %n time</numerusform>
+            <numerusform>Failed to vote %n times</numerusform>
+        </translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Errors:</source>
+        <translation>Errors:</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Voting Results</source>
+        <translation>Voting Results</translation>
+    </message>
 </context>
 <context>
     <name>HelpMessageDialog</name>
     <message>
-        <location filename="../utilitydialog.cpp" line="+40"/>
+        <location filename="../utilitydialog.cpp" line="+41"/>
         <source>version</source>
         <translation>version</translation>
     </message>
@@ -1597,12 +1734,12 @@
         <translation>About %1</translation>
     </message>
     <message>
-        <location line="+20"/>
+        <location line="+19"/>
         <source>Command-line options</source>
         <translation>Command-line options</translation>
     </message>
     <message>
-        <location line="+47"/>
+        <location line="+48"/>
         <source>%1 information</source>
         <translation>%1 information</translation>
     </message>
@@ -1669,20 +1806,29 @@
         <source>Use a custom data directory:</source>
         <translation>Use a custom data directory:</translation>
     </message>
-    <message>
-        <location filename="../intro.cpp" line="+199"/>
-        <source>%1 GB of space available</source>
-        <translation>%1 GB of space available</translation>
+    <message numerus="yes">
+        <location filename="../intro.cpp" line="+201"/>
+        <source>%n GB of space available</source>
+        <translation>
+            <numerusform>%n GB of space available</numerusform>
+            <numerusform>%n GB of space available</numerusform>
+        </translation>
     </message>
-    <message>
+    <message numerus="yes">
         <location line="+2"/>
-        <source>(of %1 GB needed)</source>
-        <translation>(of %1 GB needed)</translation>
+        <source>(of %n GB needed)</source>
+        <translation>
+            <numerusform>(of %n GB needed)</numerusform>
+            <numerusform>(of %n GB needed)</numerusform>
+        </translation>
     </message>
-    <message>
+    <message numerus="yes">
         <location line="+3"/>
-        <source>(%1 GB needed for full chain)</source>
-        <translation>(%1 GB needed for full chain)</translation>
+        <source>(%n GB needed for full chain)</source>
+        <translation>
+            <numerusform>(%n GB needed for full chain)</numerusform>
+            <numerusform>(%n GB needed for full chain)</numerusform>
+        </translation>
     </message>
     <message>
         <location line="+72"/>
@@ -1724,6 +1870,14 @@
         <translation>Error</translation>
     </message>
 </context>
+<context>
+    <name>LoadWalletsActivity</name>
+    <message>
+        <location filename="../walletcontroller.cpp" line="+78"/>
+        <source>Loading wallets…</source>
+        <translation>Loading wallets…</translation>
+    </message>
+</context>
 <context>
     <name>MasternodeList</name>
     <message>
@@ -1817,7 +1971,7 @@
         <translation>Voting Address</translation>
     </message>
     <message>
-        <location filename="../masternodelist.cpp" line="+85"/>
+        <location filename="../masternodelist.cpp" line="+83"/>
         <source>Copy ProTx Hash</source>
         <translation>Copy ProTx Hash</translation>
     </message>
@@ -1909,7 +2063,7 @@
     <message>
         <location line="+7"/>
         <location line="+20"/>
-        <location filename="../modaloverlay.cpp" line="+172"/>
+        <location filename="../modaloverlay.cpp" line="+171"/>
         <source>Unknown…</source>
         <translation>Unknown…</translation>
     </message>
@@ -1967,11 +2121,17 @@
         <source>URI:</source>
         <translation>URI:</translation>
     </message>
-</context>
-<context>
+    <message>
+        <location line="+14"/>
+        <source>Paste address from clipboard</source>
+        <extracomment>Tooltip text for button that allows you to paste an address that is in your clipboard.</extracomment>
+        <translation>Paste address from clipboard</translation>
+    </message>
+</context>
+<context>
     <name>OpenWalletActivity</name>
     <message>
-        <location filename="../walletcontroller.cpp" line="+39"/>
+        <location filename="../walletcontroller.cpp" line="-41"/>
         <source>Open wallet failed</source>
         <translation>Open wallet failed</translation>
     </message>
@@ -2103,6 +2263,18 @@
     </message>
     <message>
         <location line="+19"/>
+        <source>Enable &amp;PSBT controls</source>
+        <extracomment>An options window setting to enable PSBT controls.</extracomment>
+        <translation>Enable &amp;PSBT controls</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Whether to show PSBT controls.</source>
+        <extracomment>Tooltip text for options window setting that enables PSBT controls.</extracomment>
+        <translation>Whether to show PSBT controls.</translation>
+    </message>
+    <message>
+        <location line="+7"/>
         <source>Whether to keep the specified custom change address or not.</source>
         <translation>Whether to keep the specified custom change address or not.</translation>
     </message>
@@ -2281,28 +2453,28 @@ https://explore.transifex.com/dash/dash/</source>
 https://explore.transifex.com/dash/dash/</translation>
     </message>
     <message>
-        <location line="+131"/>
-        <source>Options set in this dialog are overridden by the command line or in the configuration file:</source>
-        <translation>Options set in this dialog are overridden by the command line or in the configuration file:</translation>
+        <location line="+64"/>
+        <location line="+13"/>
+        <source>Third-party URLs (e.g. a block explorer) that appear in the transactions tab as context menu items.&lt;br/&gt;%s in the URL is replaced by transaction hash. Multiple URLs are separated by vertical bar |.</source>
+        <translation>Third-party URLs (e.g. a block explorer) that appear in the transactions tab as context menu items.&lt;br/&gt;%s in the URL is replaced by transaction hash. Multiple URLs are separated by vertical bar |.</translation>
     </message>
     <message>
-        <location line="-945"/>
-        <source>Minimize instead of exit the application when the window is closed. When this option is enabled, the application will be closed only after selecting Exit in the menu.</source>
-        <translation>Minimize instead of exit the application when the window is closed. When this option is enabled, the application will be closed only after selecting Exit in the menu.</translation>
+        <location line="-10"/>
+        <source>&amp;Third-party transaction URLs</source>
+        <translation>&amp;Third-party transaction URLs</translation>
     </message>
     <message>
-        <location line="+878"/>
-        <location line="+13"/>
-        <source>Third party URLs (e.g. a block explorer) that appear in the transactions tab as context menu items.&lt;br/&gt;%s in the URL is replaced by transaction hash. Multiple URLs are separated by vertical bar |.</source>
-        <translation>Third party URLs (e.g. a block explorer) that appear in the transactions tab as context menu items.&lt;br/&gt;%s in the URL is replaced by transaction hash. Multiple URLs are separated by vertical bar |.</translation>
+        <location line="+64"/>
+        <source>Options set in this dialog are overridden by the command line or in the configuration file:</source>
+        <translation>Options set in this dialog are overridden by the command line or in the configuration file:</translation>
     </message>
     <message>
-        <location line="-10"/>
-        <source>&amp;Third party transaction URLs</source>
-        <translation>&amp;Third party transaction URLs</translation>
+        <location line="-955"/>
+        <source>Minimize instead of exit the application when the window is closed. When this option is enabled, the application will be closed only after selecting Exit in the menu.</source>
+        <translation>Minimize instead of exit the application when the window is closed. When this option is enabled, the application will be closed only after selecting Exit in the menu.</translation>
     </message>
     <message>
-        <location line="-696"/>
+        <location line="+185"/>
         <source>Whether to show coin control features or not.</source>
         <translation>Whether to show coin control features or not.</translation>
     </message>
@@ -2322,7 +2494,7 @@ https://explore.transifex.com/dash/dash/</translation>
         <translation>Enable coin &amp;control features</translation>
     </message>
     <message>
-        <location line="+40"/>
+        <location line="+50"/>
         <source>&amp;Spend unconfirmed change</source>
         <translation>&amp;Spend unconfirmed change</translation>
     </message>
@@ -2332,7 +2504,7 @@ https://explore.transifex.com/dash/dash/</translation>
         <translation>This setting determines the amount of individual masternodes that an input will be mixed through.&lt;br/&gt;More rounds of mixing gives a higher degree of privacy, but also costs more in fees.</translation>
     </message>
     <message>
-        <location line="-420"/>
+        <location line="-430"/>
         <source>&amp;Network</source>
         <translation>&amp;Network</translation>
     </message>
@@ -2342,7 +2514,7 @@ https://explore.transifex.com/dash/dash/</translation>
         <translation>Enabling pruning significantly reduces the disk space required to store transactions. All blocks are still fully validated. Reverting this setting requires re-downloading the entire blockchain.</translation>
     </message>
     <message>
-        <location line="+474"/>
+        <location line="+484"/>
         <source>Map port using &amp;UPnP</source>
         <translation>Map port using &amp;UPnP</translation>
     </message>
@@ -2396,7 +2568,7 @@ https://explore.transifex.com/dash/dash/</translation>
         <translation>Tor</translation>
     </message>
     <message>
-        <location line="-658"/>
+        <location line="-668"/>
         <source>Show only a tray icon after minimizing the window.</source>
         <translation>Show only a tray icon after minimizing the window.</translation>
     </message>
@@ -2416,7 +2588,7 @@ https://explore.transifex.com/dash/dash/</translation>
         <translation>&amp;Display</translation>
     </message>
     <message>
-        <location line="+751"/>
+        <location line="+761"/>
         <source>Connect to the Dash network through a separate SOCKS5 proxy for Tor onion services.</source>
         <translation>Connect to the Dash network through a separate SOCKS5 proxy for Tor onion services.</translation>
     </message>
@@ -2471,7 +2643,7 @@ https://explore.transifex.com/dash/dash/</translation>
         <translation>&amp;Cancel</translation>
     </message>
     <message>
-        <location filename="../optionsdialog.cpp" line="+74"/>
+        <location filename="../optionsdialog.cpp" line="+77"/>
         <source>Enable %1 features</source>
         <translation>Enable %1 features</translation>
     </message>
@@ -2481,23 +2653,32 @@ https://explore.transifex.com/dash/dash/</translation>
         <translation>default</translation>
     </message>
     <message>
-        <location line="+244"/>
+        <location line="+260"/>
         <source>Confirm options reset</source>
+        <extracomment>Window title text of pop-up window shown when the user has chosen to reset options.</extracomment>
         <translation>Confirm options reset</translation>
     </message>
     <message>
-        <location line="+1"/>
-        <location line="+55"/>
+        <location line="-9"/>
+        <location line="+65"/>
         <source>Client restart required to activate changes.</source>
+        <extracomment>Text explaining that the settings changed will not come into effect until the client is restarted.</extracomment>
         <translation>Client restart required to activate changes.</translation>
     </message>
     <message>
-        <location line="-55"/>
+        <location line="-61"/>
+        <source>Current settings will be backed up at &quot;%1&quot;.</source>
+        <extracomment>Text explaining to the user that the client&apos;s current settings will be backed up at a specific location. %1 is a stand-in argument for the backup location&apos;s path.</extracomment>
+        <translation>Current settings will be backed up at &quot;%1&quot;.</translation>
+    </message>
+    <message>
+        <location line="+3"/>
         <source>Client will be shut down. Do you want to proceed?</source>
+        <extracomment>Text asking the user to confirm if they would like to proceed with a client shutdown.</extracomment>
         <translation>Client will be shut down. Do you want to proceed?</translation>
     </message>
     <message>
-        <location line="+59"/>
+        <location line="+62"/>
         <source>This change would require a client restart.</source>
         <translation>This change would require a client restart.</translation>
     </message>
@@ -2654,29 +2835,30 @@ https://explore.transifex.com/dash/dash/</translation>
         <translation>out of sync</translation>
     </message>
     <message>
-        <location line="+316"/>
+        <location line="+321"/>
         <source>Automatic backups are disabled, no mixing available!</source>
         <translation>Automatic backups are disabled, no mixing available!</translation>
     </message>
     <message>
-        <location line="-114"/>
+        <location line="-116"/>
         <location line="+6"/>
         <source>No inputs detected</source>
         <translation>No inputs detected</translation>
     </message>
     <message>
-        <location line="-204"/>
+        <location line="-207"/>
         <source>%1 Balance</source>
         <translation>%1 Balance</translation>
     </message>
     <message>
-        <location line="+28"/>
+        <location line="+32"/>
         <source>Discreet mode activated for the Overview tab. To unmask the values, uncheck Settings-&gt;Discreet mode.</source>
         <translation>Discreet mode activated for the Overview tab. To unmask the values, uncheck Settings-&gt;Discreet mode.</translation>
     </message>
     <message numerus="yes">
-        <location line="+174"/>
-        <location line="+20"/>
+        <location line="+173"/>
+        <location line="+17"/>
+        <location line="+6"/>
         <location line="+11"/>
         <source>%n Rounds</source>
         <translation>
@@ -2695,7 +2877,7 @@ https://explore.transifex.com/dash/dash/</translation>
         <translation>Not enough compatible inputs to mix &lt;span style=&apos;%1&apos;&gt;%2&lt;/span&gt;,&lt;br&gt;will mix &lt;span style=&apos;%1&apos;&gt;%3&lt;/span&gt; instead</translation>
     </message>
     <message>
-        <location line="+59"/>
+        <location line="+58"/>
         <source>Overall progress</source>
         <translation>Overall progress</translation>
     </message>
@@ -2842,7 +3024,7 @@ https://explore.transifex.com/dash/dash/</translation>
         <translation>Close</translation>
     </message>
     <message>
-        <location filename="../psbtoperationsdialog.cpp" line="+58"/>
+        <location filename="../psbtoperationsdialog.cpp" line="+61"/>
         <source>Failed to load transaction: %1</source>
         <translation>Failed to load transaction: %1</translation>
     </message>
@@ -2981,7 +3163,7 @@ https://explore.transifex.com/dash/dash/</translation>
 <context>
     <name>PaymentServer</name>
     <message>
-        <location filename="../paymentserver.cpp" line="+153"/>
+        <location filename="../paymentserver.cpp" line="+151"/>
         <source>Payment request error</source>
         <translation>Payment request error</translation>
     </message>
@@ -2991,7 +3173,7 @@ https://explore.transifex.com/dash/dash/</translation>
         <translation>Cannot start dash: click-to-pay handler</translation>
     </message>
     <message>
-        <location line="+50"/>
+        <location line="+48"/>
         <location line="+16"/>
         <location line="+5"/>
         <location line="+8"/>
@@ -3085,7 +3267,7 @@ Due to discontinued support, you should request the merchant to provide you with
         <translation>Network</translation>
     </message>
     <message>
-        <location filename="../peertablemodel.cpp" line="+81"/>
+        <location filename="../peertablemodel.cpp" line="+77"/>
         <source>Inbound</source>
         <extracomment>An Inbound Connection from a Peer.</extracomment>
         <translation>Inbound</translation>
@@ -3100,7 +3282,7 @@ Due to discontinued support, you should request the merchant to provide you with
 <context>
     <name>Proposal</name>
     <message>
-        <location filename="../governancelist.cpp" line="-340"/>
+        <location filename="../governancelist.cpp" line="-516"/>
         <source>Passing +%1</source>
         <translation>Passing +%1</translation>
     </message>
@@ -3158,10 +3340,242 @@ Due to discontinued support, you should request the merchant to provide you with
         <translation>Status</translation>
     </message>
 </context>
+<context>
+    <name>ProposalWizard</name>
+    <message>
+        <location filename="../forms/proposalwizard.ui" line="+14"/>
+        <source>Create Governance Proposal</source>
+        <translation>Create Governance Proposal</translation>
+    </message>
+    <message>
+        <location line="+40"/>
+        <source>Enter proposal details</source>
+        <translation>Enter proposal details</translation>
+    </message>
+    <message>
+        <location line="+16"/>
+        <source>A fee will be burned when you prepare the proposal.</source>
+        <translation>A fee will be burned when you prepare the proposal.</translation>
+    </message>
+    <message>
+        <location line="+27"/>
+        <source>Proposal &amp;name</source>
+        <translation>Proposal &amp;name</translation>
+    </message>
+    <message>
+        <location line="+26"/>
+        <source>&amp;Description URL</source>
+        <translation>&amp;Description URL</translation>
+    </message>
+    <message>
+        <location line="+26"/>
+        <source>Payment &amp;address</source>
+        <translation>Payment &amp;address</translation>
+    </message>
+    <message>
+        <location line="+23"/>
+        <source>Payment &amp;amount</source>
+        <translation>Payment &amp;amount</translation>
+    </message>
+    <message>
+        <location line="+16"/>
+        <source>The amount to request in a single payment</source>
+        <translation>The amount to request in a single payment</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>&amp;First payment</source>
+        <translation>&amp;First payment</translation>
+    </message>
+    <message>
+        <location line="+28"/>
+        <source>Pa&amp;yments</source>
+        <translation>Pa&amp;yments</translation>
+    </message>
+    <message>
+        <location line="+25"/>
+        <source>To&amp;tal amount</source>
+        <translation>To&amp;tal amount</translation>
+    </message>
+    <message>
+        <location line="+17"/>
+        <source>Proposal &amp;fee</source>
+        <translation>Proposal &amp;fee</translation>
+    </message>
+    <message>
+        <location line="+40"/>
+        <location line="+91"/>
+        <location line="+166"/>
+        <source>Next</source>
+        <translation>Next</translation>
+    </message>
+    <message>
+        <location line="-238"/>
+        <source>Review proposal JSON and validate.</source>
+        <translation>Review proposal JSON and validate.</translation>
+    </message>
+    <message>
+        <location line="+14"/>
+        <source>Hex-encoded JSON</source>
+        <translation>Hex-encoded JSON</translation>
+    </message>
+    <message>
+        <location line="+32"/>
+        <location line="+166"/>
+        <source>Back</source>
+        <translation>Back</translation>
+    </message>
+    <message>
+        <location line="-153"/>
+        <source>Validate</source>
+        <translation>Validate</translation>
+    </message>
+    <message>
+        <location line="+35"/>
+        <source>Prepare (burn fee) and wait for confirmations.</source>
+        <translation>Prepare (burn fee) and wait for confirmations.</translation>
+    </message>
+    <message>
+        <location line="+32"/>
+        <location line="+224"/>
+        <source>Copy</source>
+        <translation>Copy</translation>
+    </message>
+    <message>
+        <location line="-200"/>
+        <source>At 1/6 confirmations: can be relayed and queued. At 6/6: accepted and processed.</source>
+        <translation>At 1/6 confirmations: can be relayed and queued. At 6/6: accepted and processed.</translation>
+    </message>
+    <message>
+        <location line="+25"/>
+        <location line="+131"/>
+        <source>Confirmations progress</source>
+        <translation>Confirmations progress</translation>
+    </message>
+    <message>
+        <location line="-128"/>
+        <location line="+131"/>
+        <source>Shows progress toward the required number of confirmations for the proposal fee transaction.</source>
+        <translation>Shows progress toward the required number of confirmations for the proposal fee transaction.</translation>
+    </message>
+    <message>
+        <location line="-124"/>
+        <location line="+131"/>
+        <source>Estimated time remaining: -</source>
+        <translation>Estimated time remaining: -</translation>
+    </message>
+    <message>
+        <location line="-91"/>
+        <source>Prepare Proposal</source>
+        <translation>Prepare Proposal</translation>
+    </message>
+    <message>
+        <location line="+35"/>
+        <source>You can submit after 1 confirmation. At 6 confirmations it is accepted and processed.</source>
+        <translation>You can submit after 1 confirmation. At 6 confirmations it is accepted and processed.</translation>
+    </message>
+    <message>
+        <location line="+70"/>
+        <source>Proposal ID:</source>
+        <translation>Proposal ID:</translation>
+    </message>
+    <message>
+        <location line="+53"/>
+        <source>Submit Proposal</source>
+        <translation>Submit Proposal</translation>
+    </message>
+    <message>
+        <location line="+16"/>
+        <source>Close</source>
+        <translation>Close</translation>
+    </message>
+    <message>
+        <location filename="../proposalwizard.cpp" line="+211"/>
+        <source>Valid</source>
+        <translation>Valid</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Invalid: %1</source>
+        <translation>Invalid: %1</translation>
+    </message>
+    <message>
+        <location line="+16"/>
+        <source>Burn %1</source>
+        <translation>Burn %1</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Burn %1 to create the fee transaction?</source>
+        <translation>Burn %1 to create the fee transaction?</translation>
+    </message>
+    <message>
+        <location line="+16"/>
+        <location line="+5"/>
+        <source>Prepare failed</source>
+        <translation>Prepare failed</translation>
+    </message>
+    <message>
+        <location line="+27"/>
+        <location line="+4"/>
+        <source>Confirmations: %1 / %2 required</source>
+        <translation>Confirmations: %1 / %2 required</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <location line="+1"/>
+        <source>Estimated time remaining: Ready</source>
+        <translation>Estimated time remaining: Ready</translation>
+    </message>
+    <message numerus="yes">
+        <location line="+4"/>
+        <location line="+1"/>
+        <source>Estimated time remaining: %n minute(s)</source>
+        <translation>
+            <numerusform>Estimated time remaining: %n minute</numerusform>
+            <numerusform>Estimated time remaining: %n minutes</numerusform>
+        </translation>
+    </message>
+    <message>
+        <location line="+30"/>
+        <source>Your proposal was submitted successfully.</source>
+        <translation>Your proposal was submitted successfully.</translation>
+    </message>
+    <message>
+        <location line="-13"/>
+        <source>Already submitted</source>
+        <translation>Already submitted</translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>This proposal has already been submitted.</source>
+        <translation>This proposal has already been submitted.</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Submission failed</source>
+        <translation>Submission failed</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Proposal submitted</source>
+        <translation>Proposal submitted</translation>
+    </message>
+    <message>
+        <location line="+36"/>
+        <source>A fee of %1 will be burned when you prepare the proposal.</source>
+        <translation>A fee of %1 will be burned when you prepare the proposal.</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Prepare (burn %1) and wait for %2 confirmations.</source>
+        <translation>Prepare (burn %1) and wait for %2 confirmations.</translation>
+    </message>
+</context>
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../bitcoin.cpp" line="-264"/>
+        <location filename="../bitcoin.cpp" line="-276"/>
         <source>Do you want to reset settings to default values, or to abort without making changes?</source>
         <extracomment>Explanatory text shown on startup when the settings file cannot be read. Prompts user to make a choice between resetting or aborting.</extracomment>
         <translation>Do you want to reset settings to default values, or to abort without making changes?</translation>
@@ -3173,7 +3587,7 @@ Due to discontinued support, you should request the merchant to provide you with
         <translation>A fatal error occurred. Check that settings file is writable, or try running with -nosettings.</translation>
     </message>
     <message>
-        <location line="+265"/>
+        <location line="+277"/>
         <source>Choose data directory on startup (default: %u)</source>
         <translation>Choose data directory on startup (default: %u)</translation>
     </message>
@@ -3218,17 +3632,17 @@ Due to discontinued support, you should request the merchant to provide you with
         <translation>Show splash screen on startup (default: %u)</translation>
     </message>
     <message>
-        <location line="+96"/>
+        <location line="+98"/>
         <source>Error: Specified data directory &quot;%1&quot; does not exist.</source>
         <translation>Error: Specified data directory &quot;%1&quot; does not exist.</translation>
     </message>
     <message>
-        <location line="+6"/>
+        <location line="+9"/>
         <source>Error: Cannot parse configuration file: %1.</source>
         <translation>Error: Cannot parse configuration file: %1.</translation>
     </message>
     <message>
-        <location line="+15"/>
+        <location line="+14"/>
         <source>Error: %1</source>
         <translation>Error: %1</translation>
     </message>
@@ -3273,12 +3687,12 @@ Due to discontinued support, you should request the merchant to provide you with
         <translation>%1 didn&apos;t yet exit safely…</translation>
     </message>
     <message>
-        <location filename="../bitcoinunits.cpp" line="+258"/>
+        <location filename="../bitcoinunits.cpp" line="+213"/>
         <source>Amount</source>
         <translation>Amount</translation>
     </message>
     <message>
-        <location filename="../guiutil.cpp" line="+298"/>
+        <location filename="../guiutil.cpp" line="+294"/>
         <source>Enter a Dash address (e.g. %1)</source>
         <translation>Enter a Dash address (e.g. %1)</translation>
     </message>
@@ -3298,7 +3712,7 @@ Due to discontinued support, you should request the merchant to provide you with
         <translation>This can also be adjusted later in the &quot;Appearance&quot; tab of the preferences.</translation>
     </message>
     <message>
-        <location line="+324"/>
+        <location line="+329"/>
         <source>Ctrl+W</source>
         <translation>Ctrl+W</translation>
     </message>
@@ -3355,7 +3769,7 @@ Due to discontinued support, you should request the merchant to provide you with
         <translation>Address Fetch</translation>
     </message>
     <message>
-        <location line="+13"/>
+        <location line="+12"/>
         <location line="+12"/>
         <source>%1 d</source>
         <translation>%1 d</translation>
@@ -3455,11 +3869,14 @@ Due to discontinued support, you should request the merchant to provide you with
     </message>
     <message>
         <location line="+2"/>
+        <location filename="../rpcconsole.cpp" line="+1114"/>
         <source>%1 kB</source>
         <translation>%1 kB</translation>
     </message>
     <message>
         <location line="+2"/>
+        <location filename="../rpcconsole.cpp" line="+1"/>
+        <location line="+1"/>
         <source>%1 MB</source>
         <translation>%1 MB</translation>
     </message>
@@ -3495,7 +3912,7 @@ Due to discontinued support, you should request the merchant to provide you with
 <context>
     <name>QRImageWidget</name>
     <message>
-        <location filename="../qrimagewidget.cpp" line="+30"/>
+        <location filename="../qrimagewidget.cpp" line="+29"/>
         <source>&amp;Save Image…</source>
         <translation>&amp;Save Image…</translation>
     </message>
@@ -3561,7 +3978,7 @@ Due to discontinued support, you should request the merchant to provide you with
         <location line="+26"/>
         <location line="+30"/>
         <location line="+23"/>
-        <location line="+23"/>
+        <location line="+58"/>
         <location line="+20"/>
         <location line="+27"/>
         <location line="+23"/>
@@ -3601,28 +4018,28 @@ Due to discontinued support, you should request the merchant to provide you with
         <location line="+26"/>
         <location line="+26"/>
         <location line="+26"/>
-        <location filename="../rpcconsole.h" line="+156"/>
+        <location filename="../rpcconsole.h" line="+166"/>
         <source>N/A</source>
         <translation>N/A</translation>
     </message>
     <message>
-        <location line="-1376"/>
+        <location line="-1411"/>
         <source>Number of connections</source>
         <translation>Number of connections</translation>
     </message>
     <message>
-        <location line="+266"/>
+        <location line="+301"/>
         <source>&amp;Open</source>
         <translation>&amp;Open</translation>
     </message>
     <message>
-        <location line="-319"/>
+        <location line="-354"/>
         <source>Startup time</source>
         <translation>Startup time</translation>
     </message>
     <message>
         <location line="+23"/>
-        <location line="+788"/>
+        <location line="+823"/>
         <source>Network</source>
         <translation>Network</translation>
     </message>
@@ -3637,12 +4054,12 @@ Due to discontinued support, you should request the merchant to provide you with
         <translation>Debug log file</translation>
     </message>
     <message>
-        <location line="-416"/>
+        <location line="-451"/>
         <source>Client version</source>
         <translation>Client version</translation>
     </message>
     <message>
-        <location line="+223"/>
+        <location line="+258"/>
         <source>Block chain</source>
         <translation>Block chain</translation>
     </message>
@@ -3662,22 +4079,22 @@ Due to discontinued support, you should request the merchant to provide you with
         <translation>Memory usage</translation>
     </message>
     <message>
-        <location line="-440"/>
+        <location line="-475"/>
         <source>&amp;Console</source>
         <translation>&amp;Console</translation>
     </message>
     <message>
-        <location line="+600"/>
+        <location line="+635"/>
         <source>Clear console</source>
         <translation>Clear console</translation>
     </message>
     <message>
-        <location line="-590"/>
+        <location line="-625"/>
         <source>&amp;Network Traffic</source>
         <translation>&amp;Network Traffic</translation>
     </message>
     <message>
-        <location line="+1382"/>
+        <location line="+1417"/>
         <source>Received</source>
         <translation>Received</translation>
     </message>
@@ -3687,12 +4104,12 @@ Due to discontinued support, you should request the merchant to provide you with
         <translation>Sent</translation>
     </message>
     <message>
-        <location line="-1349"/>
+        <location line="-1384"/>
         <source>&amp;Peers</source>
         <translation>&amp;Peers</translation>
     </message>
     <message>
-        <location line="+534"/>
+        <location line="+569"/>
         <source>Wallet:</source>
         <translation>Wallet:</translation>
     </message>
@@ -3703,7 +4120,7 @@ Due to discontinued support, you should request the merchant to provide you with
     </message>
     <message>
         <location line="+63"/>
-        <location filename="../rpcconsole.cpp" line="+1275"/>
+        <location filename="../rpcconsole.cpp" line="+181"/>
         <source>Select a peer to view detailed information.</source>
         <translation>Select a peer to view detailed information.</translation>
     </message>
@@ -3713,17 +4130,7 @@ Due to discontinued support, you should request the merchant to provide you with
         <translation>Version</translation>
     </message>
     <message>
-        <location line="+72"/>
-        <source>Whether the peer requested us to relay transactions.</source>
-        <translation>Whether the peer requested us to relay transactions.</translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>Wants Tx Relay</source>
-        <translation>Wants Tx Relay</translation>
-    </message>
-    <message>
-        <location line="+23"/>
+        <location line="+98"/>
         <source>High bandwidth BIP152 compact block relay: %1</source>
         <translation>High bandwidth BIP152 compact block relay: %1</translation>
     </message>
@@ -3828,13 +4235,13 @@ Due to discontinued support, you should request the merchant to provide you with
         <translation>-rescan=2: Rescan the block chain for missing wallet transactions starting from genesis block.</translation>
     </message>
     <message>
-        <location line="-1614"/>
-        <location line="+990"/>
+        <location line="-1649"/>
+        <location line="+1025"/>
         <source>User Agent</source>
         <translation>User Agent</translation>
     </message>
     <message>
-        <location line="-964"/>
+        <location line="-999"/>
         <source>Datadir</source>
         <translation>Datadir</translation>
     </message>
@@ -3855,6 +4262,16 @@ Due to discontinued support, you should request the merchant to provide you with
     </message>
     <message>
         <location line="+95"/>
+        <source>Local Addresses</source>
+        <translation>Local Addresses</translation>
+    </message>
+    <message>
+        <location line="+28"/>
+        <source>Network addresses that your Dash node is currently using to communicate with other nodes.</source>
+        <translation>Network addresses that your Dash node is currently using to communicate with other nodes.</translation>
+    </message>
+    <message>
+        <location line="+7"/>
         <source>Number of regular Masternodes</source>
         <translation>Number of regular Masternodes</translation>
     </message>
@@ -3969,7 +4386,17 @@ Due to discontinued support, you should request the merchant to provide you with
         <translation>Services</translation>
     </message>
     <message>
-        <location line="+144"/>
+        <location line="+23"/>
+        <source>Whether we relay transactions to this peer.</source>
+        <translation>Whether we relay transactions to this peer.</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Transaction Relay</source>
+        <translation>Transaction Relay</translation>
+    </message>
+    <message>
+        <location line="+118"/>
         <source>Connection Time</source>
         <translation>Connection Time</translation>
     </message>
@@ -4009,12 +4436,12 @@ Due to discontinued support, you should request the merchant to provide you with
         <translation>Time Offset</translation>
     </message>
     <message>
-        <location line="-1457"/>
+        <location line="-1492"/>
         <source>&amp;Wallet Repair</source>
         <translation>&amp;Wallet Repair</translation>
     </message>
     <message>
-        <location line="+1532"/>
+        <location line="+1567"/>
         <source>The total number of addresses received from this peer that were processed (excludes addresses that were dropped due to rate-limiting).</source>
         <extracomment>Tooltip text for the Addresses Processed field in the peer details area, which displays the total number of addresses received from this peer that were processed (excludes addresses that were dropped due to rate-limiting).</extracomment>
         <translation>The total number of addresses received from this peer that were processed (excludes addresses that were dropped due to rate-limiting).</translation>
@@ -4041,7 +4468,7 @@ Due to discontinued support, you should request the merchant to provide you with
         <translation>-reindex: Rebuild block chain index from current blk000??.dat files.</translation>
     </message>
     <message>
-        <location filename="../rpcconsole.cpp" line="-759"/>
+        <location filename="../rpcconsole.cpp" line="-778"/>
         <source>Inbound: initiated by peer</source>
         <extracomment>Explanatory text for an inbound peer connection.</extracomment>
         <translation>Inbound: initiated by peer</translation>
@@ -4137,7 +4564,7 @@ Due to discontinued support, you should request the merchant to provide you with
         <translation>&amp;Unban</translation>
     </message>
     <message>
-        <location line="+260"/>
+        <location line="+264"/>
         <source>In:</source>
         <translation>In:</translation>
     </message>
@@ -4152,18 +4579,23 @@ Due to discontinued support, you should request the merchant to provide you with
         <translation>Network activity disabled</translation>
     </message>
     <message>
-        <location line="+44"/>
+        <location line="+13"/>
+        <source>None</source>
+        <translation>None</translation>
+    </message>
+    <message>
+        <location line="+43"/>
         <location line="+4"/>
         <source>Total: %1 (Enabled: %2)</source>
         <translation>Total: %1 (Enabled: %2)</translation>
     </message>
     <message>
-        <location line="+79"/>
+        <location line="+82"/>
         <source>Executing command without any wallet</source>
         <translation>Executing command without any wallet</translation>
     </message>
     <message>
-        <location line="+208"/>
+        <location line="+212"/>
         <source>Ctrl++</source>
         <extracomment>Main shortcut to increase the RPC console font size.</extracomment>
         <translation>Ctrl++</translation>
@@ -4187,7 +4619,7 @@ Due to discontinued support, you should request the merchant to provide you with
         <translation>Ctrl+_</translation>
     </message>
     <message>
-        <location line="+150"/>
+        <location line="+146"/>
         <source>Ctrl+Shift+I</source>
         <translation>Ctrl+Shift+I</translation>
     </message>
@@ -4217,7 +4649,7 @@ Due to discontinued support, you should request the merchant to provide you with
         <translation>Executing command using &quot;%1&quot; wallet</translation>
     </message>
     <message>
-        <location line="-619"/>
+        <location line="-638"/>
         <source>detecting: peer could be v1 or v2</source>
         <extracomment>Explanatory text for &quot;detecting&quot; transport type.</extracomment>
         <translation>detecting: peer could be v1 or v2</translation>
@@ -4252,7 +4684,7 @@ Due to discontinued support, you should request the merchant to provide you with
         <translation>&amp;Copy IP/Netmask</translation>
     </message>
     <message>
-        <location line="+217"/>
+        <location line="+221"/>
         <source>Welcome to the %1 RPC console.
 Use up and down arrows to navigate history, and %2 to clear screen.
 Use %3 and %4 to increase or decrease the font size.
@@ -4270,7 +4702,7 @@ For more information on using this console, type %6.
 %7WARNING: Scammers have been active, telling users to type commands here, stealing their wallet contents. Do not use this console without fully understanding the ramifications of a command.%8</translation>
     </message>
     <message>
-        <location line="+186"/>
+        <location line="+201"/>
         <source>Executing…</source>
         <extracomment>A console message indicating an entered command is currently being executed.</extracomment>
         <translation>Executing…</translation>
@@ -4286,7 +4718,7 @@ For more information on using this console, type %6.
         <translation>via %1</translation>
     </message>
     <message>
-        <location line="+43"/>
+        <location line="+47"/>
         <source>Regular</source>
         <translation>Regular</translation>
     </message>
@@ -4311,7 +4743,7 @@ For more information on using this console, type %6.
         <translation>Unknown</translation>
     </message>
     <message>
-        <location line="+47"/>
+        <location line="+48"/>
         <source>Never</source>
         <translation>Never</translation>
     </message>
@@ -4415,7 +4847,7 @@ For more information on using this console, type %6.
         <translation>Enter a message to attach to the payment request</translation>
     </message>
     <message>
-        <location filename="../receivecoinsdialog.cpp" line="+36"/>
+        <location filename="../receivecoinsdialog.cpp" line="+33"/>
         <source>Copy &amp;URI</source>
         <translation>Copy &amp;URI</translation>
     </message>
@@ -4526,7 +4958,7 @@ For more information on using this console, type %6.
         <translation>Message</translation>
     </message>
     <message>
-        <location line="+41"/>
+        <location line="+38"/>
         <source>(no label)</source>
         <translation>(no label)</translation>
     </message>
@@ -4546,11 +4978,44 @@ For more information on using this console, type %6.
         <translation>Requested</translation>
     </message>
 </context>
+<context>
+    <name>RestoreWalletActivity</name>
+    <message>
+        <location filename="../walletcontroller.cpp" line="+44"/>
+        <source>Restore Wallet</source>
+        <extracomment>Title of progress window which is displayed when wallets are being restored.</extracomment>
+        <translation>Restore Wallet</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Restoring Wallet &lt;b&gt;%1&lt;/b&gt;…</source>
+        <extracomment>Descriptive text of the restore wallets progress window which indicates to the user that wallets are currently being restored.</extracomment>
+        <translation>Restoring Wallet &lt;b&gt;%1&lt;/b&gt;…</translation>
+    </message>
+    <message>
+        <location line="+19"/>
+        <source>Restore wallet failed</source>
+        <extracomment>Title of message box which is displayed when the wallet could not be restored.</extracomment>
+        <translation>Restore wallet failed</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Restore wallet warning</source>
+        <extracomment>Title of message box which is displayed when the wallet is restored with some warning.</extracomment>
+        <translation>Restore wallet warning</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Restore wallet message</source>
+        <extracomment>Title of message box which is displayed when the wallet is successfully restored.</extracomment>
+        <translation>Restore wallet message</translation>
+    </message>
+</context>
 <context>
     <name>SendCoinsDialog</name>
     <message>
         <location filename="../forms/sendcoinsdialog.ui" line="+14"/>
-        <location filename="../sendcoinsdialog.cpp" line="+766"/>
+        <location filename="../sendcoinsdialog.cpp" line="+777"/>
         <source>Send Coins</source>
         <translation>Send Coins</translation>
     </message>
@@ -4570,7 +5035,7 @@ For more information on using this console, type %6.
         <translation>Insufficient funds!</translation>
     </message>
     <message>
-        <location line="+83"/>
+        <location line="+86"/>
         <source>Quantity:</source>
         <translation>Quantity:</translation>
     </message>
@@ -4585,22 +5050,17 @@ For more information on using this console, type %6.
         <translation>Amount:</translation>
     </message>
     <message>
-        <location line="+68"/>
+        <location line="+45"/>
         <source>Fee:</source>
         <translation>Fee:</translation>
     </message>
     <message>
-        <location line="-42"/>
-        <source>Dust:</source>
-        <translation>Dust:</translation>
-    </message>
-    <message>
-        <location line="-200"/>
+        <location line="-222"/>
         <source>Inputs…</source>
         <translation>Inputs…</translation>
     </message>
     <message>
-        <location line="+287"/>
+        <location line="+270"/>
         <source>After Fee:</source>
         <translation>After Fee:</translation>
     </message>
@@ -4691,7 +5151,7 @@ For more information on using this console, type %6.
     </message>
     <message>
         <location line="+165"/>
-        <location filename="../sendcoinsdialog.cpp" line="-610"/>
+        <location filename="../sendcoinsdialog.cpp" line="-626"/>
         <source>Confirm the send action</source>
         <translation>Confirm the send action</translation>
     </message>
@@ -4727,7 +5187,7 @@ For more information on using this console, type %6.
         <translation>Balance:</translation>
     </message>
     <message>
-        <location filename="../sendcoinsdialog.cpp" line="-45"/>
+        <location filename="../sendcoinsdialog.cpp" line="-42"/>
         <source>Copy quantity</source>
         <translation>Copy quantity</translation>
     </message>
@@ -4751,49 +5211,34 @@ For more information on using this console, type %6.
         <source>Copy bytes</source>
         <translation>Copy bytes</translation>
     </message>
-    <message>
-        <location line="+1"/>
-        <source>Copy dust</source>
-        <translation>Copy dust</translation>
-    </message>
     <message>
         <location line="+1"/>
         <source>Copy change</source>
         <translation>Copy change</translation>
     </message>
     <message>
-        <location line="+96"/>
+        <location line="+94"/>
         <source>%1 (%2 blocks)</source>
         <translation>%1 (%2 blocks)</translation>
     </message>
     <message>
-        <location line="+165"/>
-        <source>This will produce a Partially Signed Transaction (PSBT) which you can save or copy and then sign with e.g. an offline %1 wallet, or a PSBT-compatible hardware wallet.</source>
-        <translation>This will produce a Partially Signed Transaction (PSBT) which you can save or copy and then sign with e.g. an offline %1 wallet, or a PSBT-compatible hardware wallet.</translation>
-    </message>
-    <message>
-        <location line="+10"/>
+        <location line="+190"/>
         <location line="+2"/>
         <source>using</source>
         <translation>using</translation>
     </message>
     <message>
-        <location line="-31"/>
+        <location line="-46"/>
         <source>%1 to %2</source>
         <translation>%1 to %2</translation>
     </message>
     <message>
-        <location line="+15"/>
-        <source>Are you sure you want to send?</source>
-        <translation>Are you sure you want to send?</translation>
-    </message>
-    <message>
-        <location line="+25"/>
+        <location line="+55"/>
         <source>&lt;b&gt;(%1 of %2 entries displayed)&lt;/b&gt;</source>
         <translation>&lt;b&gt;(%1 of %2 entries displayed)&lt;/b&gt;</translation>
     </message>
     <message>
-        <location line="-246"/>
+        <location line="-261"/>
         <source>S&amp;end mixed funds</source>
         <translation>S&amp;end mixed funds</translation>
     </message>
@@ -4818,12 +5263,7 @@ For more information on using this console, type %6.
         <translation>%1 to &apos;%2&apos;</translation>
     </message>
     <message>
-        <location line="+18"/>
-        <source>Do you want to draft this transaction?</source>
-        <translation>Do you want to draft this transaction?</translation>
-    </message>
-    <message>
-        <location line="+16"/>
+        <location line="+49"/>
         <source>%1 funds only</source>
         <translation>%1 funds only</translation>
     </message>
@@ -4871,7 +5311,7 @@ For more information on using this console, type %6.
         <translation>Click to learn more</translation>
     </message>
     <message>
-        <location line="+17"/>
+        <location line="+16"/>
         <source>Total Amount</source>
         <translation>Total Amount</translation>
     </message>
@@ -4881,22 +5321,12 @@ For more information on using this console, type %6.
         <translation>or</translation>
     </message>
     <message>
-        <location line="+19"/>
+        <location line="+22"/>
         <source>Confirm send coins</source>
         <translation>Confirm send coins</translation>
     </message>
     <message>
-        <location line="+0"/>
-        <source>Confirm transaction proposal</source>
-        <translation>Confirm transaction proposal</translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Create Unsigned</source>
-        <translation>Create Unsigned</translation>
-    </message>
-    <message>
-        <location line="+44"/>
+        <location line="+45"/>
         <source>Save Transaction Data</source>
         <translation>Save Transaction Data</translation>
     </message>
@@ -4906,22 +5336,41 @@ For more information on using this console, type %6.
         <translation>PSBT saved</translation>
     </message>
     <message>
-        <location line="+178"/>
+        <location line="+177"/>
         <source>Watch-only balance:</source>
         <translation>Watch-only balance:</translation>
     </message>
     <message>
-        <location line="-231"/>
-        <source>Send</source>
-        <translation>Send</translation>
-    </message>
-    <message>
-        <location line="-242"/>
+        <location line="-489"/>
         <source>Creates a Partially Signed Blockchain Transaction (PSBT) for use with e.g. an offline %1 wallet, or a PSBT-compatible hardware wallet.</source>
         <translation>Creates a Partially Signed Blockchain Transaction (PSBT) for use with e.g. an offline %1 wallet, or a PSBT-compatible hardware wallet.</translation>
     </message>
     <message>
-        <location line="+225"/>
+        <location line="+139"/>
+        <source>Do you want to create this transaction?</source>
+        <extracomment>Message displayed when attempting to create a transaction. Cautionary text to prompt the user to verify that the displayed transaction details represent the transaction the user intends to create.</extracomment>
+        <translation>Do you want to create this transaction?</translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source>Please, review your transaction proposal. This will produce a Partially Signed Blockchain Transaction (PSBT) which you can save or copy and then sign with e.g. an offline %1 wallet, or a PSBT-compatible hardware wallet.</source>
+        <extracomment>Text to inform a user attempting to create a transaction of their current options. At this stage, a user can only create a PSBT. This string is displayed when private keys are disabled and an external signer is not available.</extracomment>
+        <translation>Please, review your transaction proposal. This will produce a Partially Signed Blockchain Transaction (PSBT) which you can save or copy and then sign with e.g. an offline %1 wallet, or a PSBT-compatible hardware wallet.</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Please, review your transaction. You can create and send this transaction or create a Partially Signed Blockchain Transaction (PSBT), which you can save or copy and then sign with, e.g., an offline %1 wallet, or a PSBT-compatible hardware wallet.</source>
+        <extracomment>Text to inform a user attempting to create a transaction of their current options. At this stage, a user can send their transaction or create a PSBT. This string is displayed when both private keys and PSBT controls are enabled.</extracomment>
+        <translation>Please, review your transaction. You can create and send this transaction or create a Partially Signed Blockchain Transaction (PSBT), which you can save or copy and then sign with, e.g., an offline %1 wallet, or a PSBT-compatible hardware wallet.</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Please, review your transaction.</source>
+        <extracomment>Text to prompt a user to review the details of the transaction they are attempting to send.</extracomment>
+        <translation>Please, review your transaction.</translation>
+    </message>
+    <message>
+        <location line="+86"/>
         <source>To review recipient list click &quot;Show Details…&quot;</source>
         <translation>To review recipient list click &quot;Show Details…&quot;</translation>
     </message>
@@ -4932,7 +5381,7 @@ For more information on using this console, type %6.
         <translation>Partially Signed Transaction (Binary)</translation>
     </message>
     <message>
-        <location line="+215"/>
+        <location line="+214"/>
         <source>The recipient address is not valid. Please recheck.</source>
         <translation>The recipient address is not valid. Please recheck.</translation>
     </message>
@@ -4975,7 +5424,7 @@ For more information on using this console, type %6.
         </translation>
     </message>
     <message>
-        <location line="+101"/>
+        <location line="+95"/>
         <source>Warning: Invalid Dash address</source>
         <translation>Warning: Invalid Dash address</translation>
     </message>
@@ -5003,7 +5452,7 @@ For more information on using this console, type %6.
 <context>
     <name>SendCoinsEntry</name>
     <message>
-        <location filename="../forms/sendcoinsentry.ui" line="+39"/>
+        <location filename="../forms/sendcoinsentry.ui" line="+35"/>
         <source>Pay &amp;To:</source>
         <translation>Pay &amp;To:</translation>
     </message>
@@ -5034,13 +5483,11 @@ For more information on using this console, type %6.
     </message>
     <message>
         <location line="+7"/>
-        <location line="+558"/>
-        <location line="+529"/>
         <source>Remove this entry</source>
         <translation>Remove this entry</translation>
     </message>
     <message>
-        <location line="-1069"/>
+        <location line="+18"/>
         <source>&amp;Label:</source>
         <translation>&amp;Label:</translation>
     </message>
@@ -5052,13 +5499,11 @@ For more information on using this console, type %6.
     </message>
     <message>
         <location line="+7"/>
-        <location line="+546"/>
-        <location line="+529"/>
         <source>A&amp;mount:</source>
         <translation>A&amp;mount:</translation>
     </message>
     <message>
-        <location line="-1060"/>
+        <location line="+15"/>
         <source>The amount to send in the selected unit</source>
         <translation>The amount to send in the selected unit</translation>
     </message>
@@ -5087,27 +5532,18 @@ For more information on using this console, type %6.
         <source>A message that was attached to the dash: URI which will be stored with the transaction for your reference. Note: This message will not be sent over the Dash network.</source>
         <translation>A message that was attached to the dash: URI which will be stored with the transaction for your reference. Note: This message will not be sent over the Dash network.</translation>
     </message>
+</context>
+<context>
+    <name>SendConfirmationDialog</name>
     <message>
-        <location line="+433"/>
-        <source>This is an unauthenticated payment request.</source>
-        <translation>This is an unauthenticated payment request.</translation>
-    </message>
-    <message>
-        <location line="+525"/>
-        <source>This is an authenticated payment request.</source>
-        <translation>This is an authenticated payment request.</translation>
-    </message>
-    <message>
-        <location line="-510"/>
-        <location line="+525"/>
-        <source>Pay To:</source>
-        <translation>Pay To:</translation>
+        <location filename="../sendcoinsdialog.h" line="+133"/>
+        <source>Send</source>
+        <translation>Send</translation>
     </message>
     <message>
-        <location line="-495"/>
-        <location line="+529"/>
-        <source>Memo:</source>
-        <translation>Memo:</translation>
+        <location line="+2"/>
+        <source>Create Unsigned</source>
+        <translation>Create Unsigned</translation>
     </message>
 </context>
 <context>
@@ -5338,7 +5774,7 @@ For more information on using this console, type %6.
 <context>
     <name>SplashScreen</name>
     <message>
-        <location filename="../splashscreen.cpp" line="+192"/>
+        <location filename="../splashscreen.cpp" line="+181"/>
         <source>(press q to shutdown and continue later)</source>
         <translation>(press q to shutdown and continue later)</translation>
     </message>
@@ -5373,27 +5809,10 @@ For more information on using this console, type %6.
 </context>
 <context>
     <name>TransactionDesc</name>
-    <message numerus="yes">
-        <location filename="../transactiondesc.cpp" line="+36"/>
-        <source>Open for %n more block(s)</source>
-        <translation>
-            <numerusform>Open for %n more block</numerusform>
-            <numerusform>Open for %n more blocks</numerusform>
-        </translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <source>Open until %1</source>
-        <translation>Open until %1</translation>
-    </message>
-    <message>
-        <location line="+5"/>
-        <source>conflicted</source>
-        <translation>conflicted</translation>
-    </message>
     <message>
-        <location line="+7"/>
+        <location filename="../transactiondesc.cpp" line="+57"/>
         <source>0/unconfirmed, %1</source>
+        <extracomment>Text explaining the current status of a transaction, shown in the status field of the details window for this transaction. This status represents an unconfirmed transaction that is in the memory pool.</extracomment>
         <translation>0/unconfirmed, %1</translation>
     </message>
     <message>
@@ -5407,32 +5826,43 @@ For more information on using this console, type %6.
         <translation>not in memory pool</translation>
     </message>
     <message>
-        <location line="-1"/>
+        <location line="-4"/>
         <source>abandoned</source>
+        <extracomment>Text explaining the current status of a transaction, shown in the status field of the details window for this transaction. This status represents an abandoned transaction.</extracomment>
         <translation>abandoned</translation>
     </message>
     <message>
-        <location line="+3"/>
+        <location line="-10"/>
+        <source>conflicted with a transaction with %1 confirmations</source>
+        <extracomment>Text explaining the current status of a transaction, shown in the status field of the details window for this transaction. This status represents an unconfirmed transaction that conflicts with a confirmed transaction.</extracomment>
+        <translation>conflicted with a transaction with %1 confirmations</translation>
+    </message>
+    <message>
+        <location line="+20"/>
         <source>%1/unconfirmed</source>
+        <extracomment>Text explaining the current status of a transaction, shown in the status field of the details window for this transaction. This status represents a transaction confirmed in at least one block, but less than 6 blocks, and still not locked via ChainLocks.</extracomment>
         <translation>%1/unconfirmed</translation>
     </message>
     <message>
-        <location line="+2"/>
+        <location line="+6"/>
         <source>%1 confirmations</source>
+        <extracomment>Text explaining the current status of a transaction, shown in the status field of the details window for this transaction. This status represents a transaction confirmed in 6 or more blocks or locked via ChainLocks.</extracomment>
         <translation>%1 confirmations</translation>
     </message>
     <message>
-        <location line="+2"/>
+        <location line="+5"/>
         <source>locked via ChainLocks</source>
+        <extracomment>Text explaining the current status of a transaction, shown in the status field of the details window for this transaction. This status represents a transaction confirmed in at least one block and has been locked by ChainLocks.</extracomment>
         <translation>locked via ChainLocks</translation>
     </message>
     <message>
-        <location line="+6"/>
+        <location line="+9"/>
         <source>verified via InstantSend</source>
+        <extracomment>Text explaining the current status of a transaction, shown in the status field of the details window for this transaction. This status represents an unconfirmed transaction that has been locked by InstantSend.</extracomment>
         <translation>verified via InstantSend</translation>
     </message>
     <message>
-        <location line="+25"/>
+        <location line="+24"/>
         <source>Status</source>
         <translation>Status</translation>
     </message>
@@ -5613,7 +6043,7 @@ For more information on using this console, type %6.
         <translation>This pane shows a detailed description of the transaction</translation>
     </message>
     <message>
-        <location filename="../transactiondescdialog.cpp" line="+21"/>
+        <location filename="../transactiondescdialog.cpp" line="+20"/>
         <source>Details for %1</source>
         <translation>Details for %1</translation>
     </message>
@@ -5621,7 +6051,7 @@ For more information on using this console, type %6.
 <context>
     <name>TransactionTableModel</name>
     <message>
-        <location filename="../transactiontablemodel.cpp" line="+276"/>
+        <location filename="../transactiontablemodel.cpp" line="+277"/>
         <source>Date</source>
         <translation>Date</translation>
     </message>
@@ -5635,21 +6065,8 @@ For more information on using this console, type %6.
         <source>Address / Label</source>
         <translation>Address / Label</translation>
     </message>
-    <message numerus="yes">
-        <location line="+78"/>
-        <source>Open for %n more block(s)</source>
-        <translation>
-            <numerusform>Open for %n more block</numerusform>
-            <numerusform>Open for %n more blocks</numerusform>
-        </translation>
-    </message>
     <message>
-        <location line="+3"/>
-        <source>Open until %1</source>
-        <translation>Open until %1</translation>
-    </message>
-    <message>
-        <location line="+3"/>
+        <location line="+78"/>
         <source>Unconfirmed</source>
         <translation>Unconfirmed</translation>
     </message>
@@ -5764,7 +6181,7 @@ For more information on using this console, type %6.
         <translation>(n/a)</translation>
     </message>
     <message>
-        <location line="+236"/>
+        <location line="+233"/>
         <source>(no label)</source>
         <translation>(no label)</translation>
     </message>
@@ -5802,7 +6219,7 @@ For more information on using this console, type %6.
 <context>
     <name>TransactionView</name>
     <message>
-        <location filename="../transactionview.cpp" line="+70"/>
+        <location filename="../transactionview.cpp" line="+71"/>
         <location line="+13"/>
         <source>All</source>
         <translation>All</translation>
@@ -5963,7 +6380,13 @@ For more information on using this console, type %6.
         <translation>Show address &amp;QR code</translation>
     </message>
     <message>
-        <location line="+203"/>
+        <location line="+78"/>
+        <source>Show in %1</source>
+        <extracomment>Transactions table context menu action to show the selected transaction in a third-party block explorer. %1 is a stand-in argument for the URL of the explorer.</extracomment>
+        <translation>Show in %1</translation>
+    </message>
+    <message>
+        <location line="+129"/>
         <source>Export Transaction History</source>
         <translation>Export Transaction History</translation>
     </message>
@@ -6055,7 +6478,7 @@ For more information on using this console, type %6.
 <context>
     <name>WalletController</name>
     <message>
-        <location filename="../walletcontroller.cpp" line="-261"/>
+        <location filename="../walletcontroller.cpp" line="-323"/>
         <source>Close wallet</source>
         <translation>Close wallet</translation>
     </message>
@@ -6097,14 +6520,14 @@ Go to File &gt; Open Wallet to load a wallet.
         <translation>Create a new wallet</translation>
     </message>
     <message>
-        <location line="+207"/>
-        <location line="+10"/>
+        <location line="+204"/>
         <location line="+10"/>
+        <location line="+18"/>
         <source>Error</source>
         <translation>Error</translation>
     </message>
     <message>
-        <location line="-20"/>
+        <location line="-28"/>
         <source>Unable to decode PSBT from clipboard (invalid base64)</source>
         <translation>Unable to decode PSBT from clipboard (invalid base64)</translation>
     </message>
@@ -6124,7 +6547,7 @@ Go to File &gt; Open Wallet to load a wallet.
         <translation>PSBT file must be smaller than 100 MiB</translation>
     </message>
     <message>
-        <location line="+10"/>
+        <location line="+18"/>
         <source>Unable to decode PSBT</source>
         <translation>Unable to decode PSBT</translation>
     </message>
@@ -6132,12 +6555,12 @@ Go to File &gt; Open Wallet to load a wallet.
 <context>
     <name>WalletModel</name>
     <message>
-        <location filename="../walletmodel.cpp" line="+265"/>
+        <location filename="../walletmodel.cpp" line="+269"/>
         <source>Send Coins</source>
         <translation>Send Coins</translation>
     </message>
     <message>
-        <location line="+322"/>
+        <location line="+325"/>
         <source>default wallet</source>
         <translation>default wallet</translation>
     </message>
@@ -6145,7 +6568,7 @@ Go to File &gt; Open Wallet to load a wallet.
 <context>
     <name>WalletView</name>
     <message>
-        <location filename="../walletview.cpp" line="+51"/>
+        <location filename="../walletview.cpp" line="+53"/>
         <source>&amp;Export</source>
         <translation>&amp;Export</translation>
     </message>
@@ -6160,7 +6583,7 @@ Go to File &gt; Open Wallet to load a wallet.
         <translation>Selected amount:</translation>
     </message>
     <message>
-        <location line="+261"/>
+        <location line="+246"/>
         <source>Wallet Data</source>
         <extracomment>Name of the wallet data file format.</extracomment>
         <translation>Wallet Data</translation>
@@ -6191,7 +6614,7 @@ Go to File &gt; Open Wallet to load a wallet.
         <translation>The wallet data was successfully saved to %1.</translation>
     </message>
     <message>
-        <location line="+53"/>
+        <location line="+42"/>
         <source>Cancel</source>
         <translation>Cancel</translation>
     </message>
@@ -6199,12 +6622,7 @@ Go to File &gt; Open Wallet to load a wallet.
 <context>
     <name>dash-core</name>
     <message>
-        <location filename="../dashstrings.cpp" line="+79"/>
-        <source>Fee estimation failed. Fallbackfee is disabled. Wait a few blocks or enable -fallbackfee.</source>
-        <translation>Fee estimation failed. Fallbackfee is disabled. Wait a few blocks or enable -fallbackfee.</translation>
-    </message>
-    <message>
-        <location line="+76"/>
+        <location filename="../dashstrings.cpp" line="+150"/>
         <source>This error could occur if this wallet was not shutdown cleanly and was last loaded using a build with a newer version of Berkeley DB. If so, please use the software that last loaded this wallet</source>
         <translation>This error could occur if this wallet was not shutdown cleanly and was last loaded using a build with a newer version of Berkeley DB. If so, please use the software that last loaded this wallet</translation>
     </message>
@@ -6214,17 +6632,17 @@ Go to File &gt; Open Wallet to load a wallet.
         <translation>This is a pre-release test build - use at your own risk - do not use for mining or merchant applications</translation>
     </message>
     <message>
-        <location line="+40"/>
+        <location line="+43"/>
         <source>Warning: We do not appear to fully agree with our peers! You may need to upgrade, or other nodes may need to upgrade.</source>
         <translation>Warning: We do not appear to fully agree with our peers! You may need to upgrade, or other nodes may need to upgrade.</translation>
     </message>
     <message>
-        <location line="+20"/>
+        <location line="+22"/>
         <source>Already have that input.</source>
         <translation>Already have that input.</translation>
     </message>
     <message>
-        <location line="+8"/>
+        <location line="+11"/>
         <source>Collateral not valid.</source>
         <translation>Collateral not valid.</translation>
     </message>
@@ -6274,7 +6692,7 @@ Go to File &gt; Open Wallet to load a wallet.
         <translation>Error reading from database, shutting down.</translation>
     </message>
     <message>
-        <location line="+11"/>
+        <location line="+9"/>
         <source>Error: Missing checksum</source>
         <translation>Error: Missing checksum</translation>
     </message>
@@ -6289,17 +6707,12 @@ Go to File &gt; Open Wallet to load a wallet.
         <translation>Error: Unable to write record to new wallet</translation>
     </message>
     <message>
-        <location line="+10"/>
+        <location line="+9"/>
         <source>Failed to listen on any port. Use -listen=0 if you want this.</source>
         <translation>Failed to listen on any port. Use -listen=0 if you want this.</translation>
     </message>
     <message>
-        <location line="-248"/>
-        <source>-maxtxfee is set very high! Fees this large could be paid on a single transaction.</source>
-        <translation>-maxtxfee is set very high! Fees this large could be paid on a single transaction.</translation>
-    </message>
-    <message>
-        <location line="+59"/>
+        <location line="-193"/>
         <source>Found unconfirmed denominated outputs, will wait till they confirm to continue.</source>
         <translation>Found unconfirmed denominated outputs, will wait till they confirm to continue.</translation>
     </message>
@@ -6309,22 +6722,12 @@ Go to File &gt; Open Wallet to load a wallet.
         <translation>Invalid -socketevents (&apos;%s&apos;) specified. Only these modes are supported: %s</translation>
     </message>
     <message>
-        <location line="+2"/>
-        <source>Invalid amount for -maxtxfee=&lt;amount&gt;: &apos;%s&apos; (must be at least the minrelay fee of %s to prevent stuck transactions)</source>
-        <translation>Invalid amount for -maxtxfee=&lt;amount&gt;: &apos;%s&apos; (must be at least the minrelay fee of %s to prevent stuck transactions)</translation>
-    </message>
-    <message>
-        <location line="+42"/>
+        <location line="+50"/>
         <source>SQLiteDatabase: Unknown sqlite wallet schema version %d. Only version %d is supported</source>
         <translation>SQLiteDatabase: Unknown sqlite wallet schema version %d. Only version %d is supported</translation>
     </message>
     <message>
-        <location line="+3"/>
-        <source>The -txindex upgrade started by a previous version cannot be completed. Restart with the previous version or run a full -reindex.</source>
-        <translation>The -txindex upgrade started by a previous version cannot be completed. Restart with the previous version or run a full -reindex.</translation>
-    </message>
-    <message>
-        <location line="+32"/>
+        <location line="+28"/>
         <source>Transaction index can&apos;t be disabled with governance validation enabled. Either start with -disablegovernance command line switch or enable transaction index.</source>
         <translation>Transaction index can&apos;t be disabled with governance validation enabled. Either start with -disablegovernance command line switch or enable transaction index.</translation>
     </message>
@@ -6334,37 +6737,32 @@ Go to File &gt; Open Wallet to load a wallet.
         <translation>Unsupported category-specific logging level -loglevel=%s. Expected -loglevel=&lt;category&gt;:&lt;loglevel&gt;. Valid categories: %s. Valid loglevels: %s.</translation>
     </message>
     <message>
-        <location line="+37"/>
+        <location line="+42"/>
         <source>Can&apos;t mix: no compatible inputs found!</source>
         <translation>Can&apos;t mix: no compatible inputs found!</translation>
     </message>
     <message>
-        <location line="+16"/>
+        <location line="+19"/>
         <source>Entry exceeds maximum size.</source>
         <translation>Entry exceeds maximum size.</translation>
     </message>
     <message>
         <location line="+13"/>
-        <source>Error upgrading Evo database</source>
-        <translation>Error upgrading Evo database</translation>
-    </message>
-    <message>
-        <location line="+2"/>
         <source>Error upgrading evo database for EHF</source>
         <translation>Error upgrading evo database for EHF</translation>
     </message>
     <message>
-        <location line="+15"/>
+        <location line="+14"/>
         <source>Failed to commit Evo database</source>
         <translation>Failed to commit Evo database</translation>
     </message>
     <message>
-        <location line="+14"/>
+        <location line="+16"/>
         <source>Found enough users, signing ( waiting %s )</source>
         <translation>Found enough users, signing ( waiting %s )</translation>
     </message>
     <message>
-        <location line="+4"/>
+        <location line="+5"/>
         <source>Incompatible mode.</source>
         <translation>Incompatible mode.</translation>
     </message>
@@ -6389,22 +6787,12 @@ Go to File &gt; Open Wallet to load a wallet.
         <translation>Insufficient funds.</translation>
     </message>
     <message>
-        <location line="+7"/>
-        <source>Invalid amount for -discardfee=&lt;amount&gt;: &apos;%s&apos;</source>
-        <translation>Invalid amount for -discardfee=&lt;amount&gt;: &apos;%s&apos;</translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <source>Invalid amount for -paytxfee=&lt;amount&gt;: &apos;%s&apos; (must be at least %s)</source>
-        <translation>Invalid amount for -paytxfee=&lt;amount&gt;: &apos;%s&apos; (must be at least %s)</translation>
-    </message>
-    <message>
-        <location line="+2"/>
+        <location line="+10"/>
         <source>Invalid minimum number of spork signers specified with -minsporkkeys</source>
         <translation>Invalid minimum number of spork signers specified with -minsporkkeys</translation>
     </message>
     <message>
-        <location line="+6"/>
+        <location line="+7"/>
         <source>Listening for incoming connections failed (listen returned error %s)</source>
         <translation>Listening for incoming connections failed (listen returned error %s)</translation>
     </message>
@@ -6414,7 +6802,7 @@ Go to File &gt; Open Wallet to load a wallet.
         <translation>Lock is already in place.</translation>
     </message>
     <message>
-        <location line="+5"/>
+        <location line="+6"/>
         <source>Need to specify a port with -whitebind: &apos;%s&apos;</source>
         <translation>Need to specify a port with -whitebind: &apos;%s&apos;</translation>
     </message>
@@ -6429,7 +6817,7 @@ Go to File &gt; Open Wallet to load a wallet.
         <translation>No compatible Masternode found.</translation>
     </message>
     <message>
-        <location line="+5"/>
+        <location line="+8"/>
         <source>Not enough funds to mix.</source>
         <translation>Not enough funds to mix.</translation>
     </message>
@@ -6439,7 +6827,7 @@ Go to File &gt; Open Wallet to load a wallet.
         <translation>Not in the Masternode list.</translation>
     </message>
     <message>
-        <location line="+4"/>
+        <location line="+5"/>
         <source>Pruning blockstore…</source>
         <translation>Pruning blockstore…</translation>
     </message>
@@ -6454,7 +6842,7 @@ Go to File &gt; Open Wallet to load a wallet.
         <translation>Rescanning…</translation>
     </message>
     <message>
-        <location line="+13"/>
+        <location line="+14"/>
         <source>Starting network threads…</source>
         <translation>Starting network threads…</translation>
     </message>
@@ -6484,7 +6872,7 @@ Go to File &gt; Open Wallet to load a wallet.
         <translation>Transaction change output index out of range</translation>
     </message>
     <message>
-        <location line="+17"/>
+        <location line="+20"/>
         <source>Unable to start HTTP server. See debug log for details.</source>
         <translation>Unable to start HTTP server. See debug log for details.</translation>
     </message>
@@ -6494,22 +6882,22 @@ Go to File &gt; Open Wallet to load a wallet.
         <translation>Unknown response.</translation>
     </message>
     <message>
-        <location line="+2"/>
+        <location line="+3"/>
         <source>Unsupported global logging level -loglevel=%s. Valid values: %s.</source>
         <translation>Unsupported global logging level -loglevel=%s. Valid values: %s.</translation>
     </message>
     <message>
-        <location line="+3"/>
+        <location line="+2"/>
         <source>User Agent comment (%s) contains unsafe characters.</source>
         <translation>User Agent comment (%s) contains unsafe characters.</translation>
     </message>
     <message>
-        <location line="-172"/>
+        <location line="-184"/>
         <source>Can&apos;t find random Masternode.</source>
         <translation>Can&apos;t find random Masternode.</translation>
     </message>
     <message>
-        <location line="-13"/>
+        <location line="-15"/>
         <source>%s can&apos;t be lower than %s</source>
         <translation>%s can&apos;t be lower than %s</translation>
     </message>
@@ -6519,27 +6907,27 @@ Go to File &gt; Open Wallet to load a wallet.
         <translation>%s is idle.</translation>
     </message>
     <message>
-        <location line="+12"/>
+        <location line="+14"/>
         <source>Can&apos;t mix while sync in progress.</source>
         <translation>Can&apos;t mix while sync in progress.</translation>
     </message>
     <message>
-        <location line="+85"/>
+        <location line="+87"/>
         <source>Invalid netmask specified in -whitelist: &apos;%s&apos;</source>
         <translation>Invalid netmask specified in -whitelist: &apos;%s&apos;</translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="+2"/>
         <source>Invalid script detected.</source>
         <translation>Invalid script detected.</translation>
     </message>
     <message>
-        <location line="-292"/>
+        <location line="-295"/>
         <source>%s file contains all private keys from this wallet. Do not share it with anyone!</source>
         <translation>%s file contains all private keys from this wallet. Do not share it with anyone!</translation>
     </message>
     <message>
-        <location line="+56"/>
+        <location line="+52"/>
         <source>Failed to create backup, file already exists! This could happen if you restarted wallet in less than 60 seconds. You can continue if you are ok with this.</source>
         <translation>Failed to create backup, file already exists! This could happen if you restarted wallet in less than 60 seconds. You can continue if you are ok with this.</translation>
     </message>
@@ -6554,7 +6942,7 @@ Go to File &gt; Open Wallet to load a wallet.
         <translation>More than one onion bind address is provided. Using %s for the automatically created Tor onion service.</translation>
     </message>
     <message>
-        <location line="+24"/>
+        <location line="+30"/>
         <source>Prune configured below the minimum of %d MiB.  Please use a higher number.</source>
         <translation>Prune configured below the minimum of %d MiB.  Please use a higher number.</translation>
     </message>
@@ -6564,12 +6952,12 @@ Go to File &gt; Open Wallet to load a wallet.
         <translation>Prune: last wallet synchronisation goes beyond pruned data. You need to -reindex (download the whole blockchain again in case of pruned node)</translation>
     </message>
     <message>
-        <location line="+9"/>
+        <location line="+6"/>
         <source>The block database contains a block which appears to be from the future. This may be due to your computer&apos;s date and time being set incorrectly. Only rebuild the block database if you are sure that your computer&apos;s date and time are correct</source>
         <translation>The block database contains a block which appears to be from the future. This may be due to your computer&apos;s date and time being set incorrectly. Only rebuild the block database if you are sure that your computer&apos;s date and time are correct</translation>
     </message>
     <message>
-        <location line="+9"/>
+        <location line="+5"/>
         <source>The transaction amount is too small to send after the fee has been deducted</source>
         <translation>The transaction amount is too small to send after the fee has been deducted</translation>
     </message>
@@ -6579,12 +6967,7 @@ Go to File &gt; Open Wallet to load a wallet.
         <translation>Total length of network version string (%i) exceeds maximum length (%i). Reduce the number or size of uacomments.</translation>
     </message>
     <message>
-        <location line="+7"/>
-        <source>Transaction needs a change address, but we can&apos;t generate it. Please call keypoolrefill first.</source>
-        <translation>Transaction needs a change address, but we can&apos;t generate it. Please call keypoolrefill first.</translation>
-    </message>
-    <message>
-        <location line="+12"/>
+        <location line="+22"/>
         <source>WARNING! Failed to replenish keypool, please unlock your wallet to do so.</source>
         <translation>WARNING! Failed to replenish keypool, please unlock your wallet to do so.</translation>
     </message>
@@ -6609,12 +6992,12 @@ Go to File &gt; Open Wallet to load a wallet.
         <translation>-maxmempool must be at least %d MB</translation>
     </message>
     <message>
-        <location line="+5"/>
+        <location line="+7"/>
         <source>Automatic backups disabled</source>
         <translation>Automatic backups disabled</translation>
     </message>
     <message>
-        <location line="+5"/>
+        <location line="+8"/>
         <source>Cannot set -peerblockfilters without -blockfilterindex.</source>
         <translation>Cannot set -peerblockfilters without -blockfilterindex.</translation>
     </message>
@@ -6644,7 +7027,7 @@ Go to File &gt; Open Wallet to load a wallet.
         <translation>Error loading %s: Private keys can only be disabled during creation</translation>
     </message>
     <message>
-        <location line="+11"/>
+        <location line="+9"/>
         <source>Error: Couldn&apos;t create cursor into database</source>
         <translation>Error: Couldn&apos;t create cursor into database</translation>
     </message>
@@ -6679,12 +7062,7 @@ Go to File &gt; Open Wallet to load a wallet.
         <translation>Error: No addresses available.</translation>
     </message>
     <message>
-        <location line="+3"/>
-        <source>Exceeded max tries.</source>
-        <translation>Exceeded max tries.</translation>
-    </message>
-    <message>
-        <location line="+5"/>
+        <location line="+7"/>
         <source>Failed to create backup %s!</source>
         <translation>Failed to create backup %s!</translation>
     </message>
@@ -6704,12 +7082,12 @@ Go to File &gt; Open Wallet to load a wallet.
         <translation>Failed to rescan the wallet during initialization</translation>
     </message>
     <message>
-        <location line="+2"/>
+        <location line="+3"/>
         <source>Failed to verify database</source>
         <translation>Failed to verify database</translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="+2"/>
         <source>Fee rate (%s) is lower than the minimum fee rate setting (%s)</source>
         <translation>Fee rate (%s) is lower than the minimum fee rate setting (%s)</translation>
     </message>
@@ -6719,7 +7097,7 @@ Go to File &gt; Open Wallet to load a wallet.
         <translation>Found enough users, signing…</translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="+2"/>
         <source>Ignoring duplicate -wallet %s.</source>
         <translation>Ignoring duplicate -wallet %s.</translation>
     </message>
@@ -6734,17 +7112,12 @@ Go to File &gt; Open Wallet to load a wallet.
         <translation>Invalid P2P permission: &apos;%s&apos;</translation>
     </message>
     <message>
-        <location line="+3"/>
-        <source>Invalid amount for -fallbackfee=&lt;amount&gt;: &apos;%s&apos;</source>
-        <translation>Invalid amount for -fallbackfee=&lt;amount&gt;: &apos;%s&apos;</translation>
-    </message>
-    <message>
-        <location line="+2"/>
+        <location line="+4"/>
         <source>Invalid masternodeblsprivkey. Please see documentation.</source>
         <translation>Invalid masternodeblsprivkey. Please see documentation.</translation>
     </message>
     <message>
-        <location line="+13"/>
+        <location line="+14"/>
         <source>Masternode queue is full.</source>
         <translation>Masternode queue is full.</translation>
     </message>
@@ -6759,7 +7132,7 @@ Go to File &gt; Open Wallet to load a wallet.
         <translation>Missing input transaction information.</translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="+2"/>
         <source>Mixing in progress…</source>
         <translation>Mixing in progress…</translation>
     </message>
@@ -6774,12 +7147,12 @@ Go to File &gt; Open Wallet to load a wallet.
         <translation>No errors detected.</translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="+3"/>
         <source>No matching denominations found for mixing.</source>
         <translation>No matching denominations found for mixing.</translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="+2"/>
         <source>Not compatible with existing transactions.</source>
         <translation>Not compatible with existing transactions.</translation>
     </message>
@@ -6789,7 +7162,7 @@ Go to File &gt; Open Wallet to load a wallet.
         <translation>Not enough file descriptors available.</translation>
     </message>
     <message>
-        <location line="+3"/>
+        <location line="+4"/>
         <source>Prune cannot be configured with a negative value.</source>
         <translation>Prune cannot be configured with a negative value.</translation>
     </message>
@@ -6829,7 +7202,7 @@ Go to File &gt; Open Wallet to load a wallet.
         <translation>Section [%s] is not recognized.</translation>
     </message>
     <message>
-        <location line="+4"/>
+        <location line="+5"/>
         <source>Specified -walletdir &quot;%s&quot; does not exist</source>
         <translation>Specified -walletdir &quot;%s&quot; does not exist</translation>
     </message>
@@ -6884,7 +7257,7 @@ Go to File &gt; Open Wallet to load a wallet.
         <translation>Transaction must have at least one recipient</translation>
     </message>
     <message>
-        <location line="+2"/>
+        <location line="+3"/>
         <source>Transaction too large</source>
         <translation>Transaction too large</translation>
     </message>
@@ -6904,17 +7277,12 @@ Go to File &gt; Open Wallet to load a wallet.
         <translation>Unable to generate initial keys</translation>
     </message>
     <message>
-        <location line="+3"/>
+        <location line="+4"/>
         <source>Unable to open %s for writing</source>
         <translation>Unable to open %s for writing</translation>
     </message>
     <message>
-        <location line="+1"/>
-        <source>Unable to parse -maxuploadtarget: &apos;%s&apos; (possible integer overflow?)</source>
-        <translation>Unable to parse -maxuploadtarget: &apos;%s&apos; (possible integer overflow?)</translation>
-    </message>
-    <message>
-        <location line="+3"/>
+        <location line="+5"/>
         <source>Unknown -blockfilterindex value %s.</source>
         <translation>Unknown -blockfilterindex value %s.</translation>
     </message>
@@ -6924,12 +7292,7 @@ Go to File &gt; Open Wallet to load a wallet.
         <translation>Unknown new rules activated (versionbit %i)</translation>
     </message>
     <message>
-        <location line="+5"/>
-        <source>Upgrading UTXO database</source>
-        <translation>Upgrading UTXO database</translation>
-    </message>
-    <message>
-        <location line="+2"/>
+        <location line="+7"/>
         <source>Verifying blocks…</source>
         <translation>Verifying blocks…</translation>
     </message>
@@ -6969,17 +7332,17 @@ Go to File &gt; Open Wallet to load a wallet.
         <translation>see debug.log for details.</translation>
     </message>
     <message>
-        <location line="-399"/>
+        <location line="-411"/>
         <source>The %s developers</source>
         <translation>The %s developers</translation>
     </message>
     <message>
-        <location line="+11"/>
+        <location line="+13"/>
         <source>%s uses exact denominated amounts to send funds, you might simply need to mix some more coins.</source>
         <translation>%s uses exact denominated amounts to send funds, you might simply need to mix some more coins.</translation>
     </message>
     <message>
-        <location line="+6"/>
+        <location line="+3"/>
         <source>-reindex-chainstate option is not compatible with -blockfilterindex. Please temporarily disable blockfilterindex while using -reindex-chainstate, or replace -reindex-chainstate with -reindex to fully rebuild all indexes.</source>
         <translation>-reindex-chainstate option is not compatible with -blockfilterindex. Please temporarily disable blockfilterindex while using -reindex-chainstate, or replace -reindex-chainstate with -reindex to fully rebuild all indexes.</translation>
     </message>
@@ -7005,11 +7368,6 @@ Go to File &gt; Open Wallet to load a wallet.
     </message>
     <message>
         <location line="+5"/>
-        <source>Cannot upgrade a non HD wallet from version %i to version %i which is non-HD wallet. Use upgradetohd RPC</source>
-        <translation>Cannot upgrade a non HD wallet from version %i to version %i which is non-HD wallet. Use upgradetohd RPC</translation>
-    </message>
-    <message>
-        <location line="+3"/>
         <source>Distributed under the MIT software license, see the accompanying file %s or %s</source>
         <translation>Distributed under the MIT software license, see the accompanying file %s or %s</translation>
     </message>
@@ -7049,7 +7407,12 @@ Go to File &gt; Open Wallet to load a wallet.
         <translation>Failed to rename invalid peers.dat file. Please move or delete it and try again.</translation>
     </message>
     <message>
-        <location line="+6"/>
+        <location line="+3"/>
+        <source>Fee estimation failed. Fallbackfee is disabled. Wait a few blocks or enable %s.</source>
+        <translation>Fee estimation failed. Fallbackfee is disabled. Wait a few blocks or enable %s.</translation>
+    </message>
+    <message>
+        <location line="+3"/>
         <source>File %s already exists. If you are sure this is what you want, move it out of the way first.</source>
         <translation>File %s already exists. If you are sure this is what you want, move it out of the way first.</translation>
     </message>
@@ -7064,7 +7427,12 @@ Go to File &gt; Open Wallet to load a wallet.
         <translation>Incorrect or no devnet genesis block found. Wrong datadir for devnet specified?</translation>
     </message>
     <message>
-        <location line="+8"/>
+        <location line="+5"/>
+        <source>Invalid amount for %s=&lt;amount&gt;: &apos;%s&apos; (must be at least the minrelay fee of %s to prevent stuck transactions)</source>
+        <translation>Invalid amount for %s=&lt;amount&gt;: &apos;%s&apos; (must be at least the minrelay fee of %s to prevent stuck transactions)</translation>
+    </message>
+    <message>
+        <location line="+3"/>
         <source>Invalid or corrupt peers.dat (%s). If you believe this is a bug, please report it to %s. As a workaround, you can move the file (%s) out of the way (rename, move, or delete) to have a new one created on the next start.</source>
         <translation>Invalid or corrupt peers.dat (%s). If you believe this is a bug, please report it to %s. As a workaround, you can move the file (%s) out of the way (rename, move, or delete) to have a new one created on the next start.</translation>
     </message>
@@ -7083,6 +7451,11 @@ Go to File &gt; Open Wallet to load a wallet.
         <source>No wallet file format provided. To use createfromdump, -format=&lt;format&gt; must be provided.</source>
         <translation>No wallet file format provided. To use createfromdump, -format=&lt;format&gt; must be provided.</translation>
     </message>
+    <message>
+        <location line="+3"/>
+        <source>Outbound connections restricted to CJDNS (-onlynet=cjdns) but -cjdnsreachable is not provided</source>
+        <translation>Outbound connections restricted to CJDNS (-onlynet=cjdns) but -cjdnsreachable is not provided</translation>
+    </message>
     <message>
         <location line="+3"/>
         <source>Outbound connections restricted to Tor (-onlynet=onion) but the proxy for reaching the Tor network is explicitly forbidden: -onion=0</source>
@@ -7095,6 +7468,11 @@ Go to File &gt; Open Wallet to load a wallet.
     </message>
     <message>
         <location line="+4"/>
+        <source>Outbound connections restricted to i2p (-onlynet=i2p) but -i2psam is not provided</source>
+        <translation>Outbound connections restricted to i2p (-onlynet=i2p) but -i2psam is not provided</translation>
+    </message>
+    <message>
+        <location line="+3"/>
         <source>Please check that your computer&apos;s date and time are correct! If your clock is wrong, %s will not work properly.</source>
         <translation>Please check that your computer&apos;s date and time are correct! If your clock is wrong, %s will not work properly.</translation>
     </message>
@@ -7109,12 +7487,7 @@ Go to File &gt; Open Wallet to load a wallet.
         <translation>Prune mode is incompatible with -reindex-chainstate. Use full -reindex instead.</translation>
     </message>
     <message>
-        <location line="+17"/>
-        <source>The block index db contains a legacy &apos;txindex&apos;. To clear the occupied disk space, run a full -reindex, otherwise ignore this error. This error message will not be displayed again.</source>
-        <translation>The block index db contains a legacy &apos;txindex&apos;. To clear the occupied disk space, run a full -reindex, otherwise ignore this error. This error message will not be displayed again.</translation>
-    </message>
-    <message>
-        <location line="+13"/>
+        <location line="+23"/>
         <source>This is the maximum transaction fee you pay (in addition to the normal fee) to prioritize partial spend avoidance over regular coin selection.</source>
         <translation>This is the maximum transaction fee you pay (in addition to the normal fee) to prioritize partial spend avoidance over regular coin selection.</translation>
     </message>
@@ -7129,7 +7502,12 @@ Go to File &gt; Open Wallet to load a wallet.
         <translation>This is the transaction fee you may pay when fee estimates are not available.</translation>
     </message>
     <message>
-        <location line="+12"/>
+        <location line="+9"/>
+        <source>Transaction requires one destination of non-0 value, a non-0 feerate, or a pre-selected input</source>
+        <translation>Transaction requires one destination of non-0 value, a non-0 feerate, or a pre-selected input</translation>
+    </message>
+    <message>
+        <location line="+3"/>
         <source>Unable to replay blocks. You will need to rebuild the database using -reindex-chainstate.</source>
         <translation>Unable to replay blocks. You will need to rebuild the database using -reindex-chainstate.</translation>
     </message>
@@ -7139,7 +7517,12 @@ Go to File &gt; Open Wallet to load a wallet.
         <translation>Unknown wallet file format &quot;%s&quot; provided. Please provide one of &quot;bdb&quot; or &quot;sqlite&quot;.</translation>
     </message>
     <message>
-        <location line="+11"/>
+        <location line="+6"/>
+        <source>Unsupported chainstate database format found. Please restart with -reindex-chainstate. This will rebuild the chainstate database.</source>
+        <translation>Unsupported chainstate database format found. Please restart with -reindex-chainstate. This will rebuild the chainstate database.</translation>
+    </message>
+    <message>
+        <location line="+8"/>
         <source>Warning: Dumpfile wallet format &quot;%s&quot; does not match command line specified format &quot;%s&quot;.</source>
         <translation>Warning: Dumpfile wallet format &quot;%s&quot; does not match command line specified format &quot;%s&quot;.</translation>
     </message>
@@ -7188,6 +7571,16 @@ Go to File &gt; Open Wallet to load a wallet.
         <source>-rpcport must be specified when -devnet and -server are specified</source>
         <translation>-rpcport must be specified when -devnet and -server are specified</translation>
     </message>
+    <message>
+        <location line="+1"/>
+        <source>-statsbatchsize cannot be configured with a negative value.</source>
+        <translation>-statsbatchsize cannot be configured with a negative value.</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>-statsduration cannot be configured with a negative value.</source>
+        <translation>-statsduration cannot be configured with a negative value.</translation>
+    </message>
     <message>
         <location line="+1"/>
         <source>A fatal internal error occurred, see debug.log for details</source>
@@ -7195,6 +7588,21 @@ Go to File &gt; Open Wallet to load a wallet.
     </message>
     <message>
         <location line="+6"/>
+        <source>Cannot create socket (socket() returned error %s)</source>
+        <translation>Cannot create socket (socket() returned error %s)</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Cannot get socket address for %s</source>
+        <translation>Cannot get socket address for %s</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Cannot init Statsd client</source>
+        <translation>Cannot init Statsd client</translation>
+    </message>
+    <message>
+        <location line="+1"/>
         <source>Cannot resolve -%s address: &apos;%s&apos;</source>
         <translation>Cannot resolve -%s address: &apos;%s&apos;</translation>
     </message>
@@ -7249,12 +7657,7 @@ Go to File &gt; Open Wallet to load a wallet.
         <translation>Error reading next record from wallet database</translation>
     </message>
     <message>
-        <location line="+2"/>
-        <source>Error upgrading chainstate database</source>
-        <translation>Error upgrading chainstate database</translation>
-    </message>
-    <message>
-        <location line="+60"/>
+        <location line="+62"/>
         <source>Loading P2P addresses…</source>
         <translation>Loading P2P addresses…</translation>
     </message>
@@ -7274,7 +7677,7 @@ Go to File &gt; Open Wallet to load a wallet.
         <translation>Loading wallet…</translation>
     </message>
     <message>
-        <location line="-50"/>
+        <location line="-53"/>
         <source>Failed to clear fulfilled requests cache at %s</source>
         <translation>Failed to clear fulfilled requests cache at %s</translation>
     </message>
@@ -7319,7 +7722,7 @@ Go to File &gt; Open Wallet to load a wallet.
         <translation>Failed to start a new mixing queue</translation>
     </message>
     <message>
-        <location line="+6"/>
+        <location line="+9"/>
         <source>Importing…</source>
         <translation>Importing…</translation>
     </message>
@@ -7359,17 +7762,17 @@ Go to File &gt; Open Wallet to load a wallet.
         <translation>Invalid -proxy address or hostname: &apos;%s&apos;</translation>
     </message>
     <message>
-        <location line="+2"/>
+        <location line="+4"/>
         <source>Invalid amount for -%s=&lt;amount&gt;: &apos;%s&apos;</source>
         <translation>Invalid amount for -%s=&lt;amount&gt;: &apos;%s&apos;</translation>
     </message>
     <message>
-        <location line="+8"/>
+        <location line="+6"/>
         <source>Invalid spork address specified with -sporkaddr</source>
         <translation>Invalid spork address specified with -sporkaddr</translation>
     </message>
     <message>
-        <location line="+27"/>
+        <location line="+32"/>
         <source>Reducing -maxconnections from %d to %d, because of system limitations.</source>
         <translation>Reducing -maxconnections from %d to %d, because of system limitations.</translation>
     </message>
@@ -7389,37 +7792,102 @@ Go to File &gt; Open Wallet to load a wallet.
         <translation>Signing transaction failed</translation>
     </message>
     <message>
-        <location line="+4"/>
+        <location line="+5"/>
         <source>Specified blocks directory &quot;%s&quot; does not exist.</source>
         <translation>Specified blocks directory &quot;%s&quot; does not exist.</translation>
     </message>
     <message>
-        <location line="-40"/>
+        <location line="-46"/>
         <source>Last queue was created too recently.</source>
         <translation>Last queue was created too recently.</translation>
     </message>
     <message>
-        <location line="-297"/>
+        <location line="-300"/>
         <source>%s corrupt. Try using the wallet tool dash-wallet to salvage or restoring a backup.</source>
         <translation>%s corrupt. Try using the wallet tool dash-wallet to salvage or restoring a backup.</translation>
     </message>
     <message>
         <location line="+6"/>
+        <source>%s is set very high! Fees this large could be paid on a single transaction.</source>
+        <translation>%s is set very high! Fees this large could be paid on a single transaction.</translation>
+    </message>
+    <message>
+        <location line="+2"/>
         <source>%s request to listen on port %u. This port is considered &quot;bad&quot; and thus it is unlikely that any Dash Core peers connect to it. See doc/p2p-bad-ports.md for details and a full list.</source>
         <translation>%s request to listen on port %u. This port is considered &quot;bad&quot; and thus it is unlikely that any Dash Core peers connect to it. See doc/p2p-bad-ports.md for details and a full list.</translation>
     </message>
     <message>
-        <location line="+27"/>
+        <location line="+24"/>
         <source>Cannot provide specific connections and have addrman find outgoing connections at the same time.</source>
         <translation>Cannot provide specific connections and have addrman find outgoing connections at the same time.</translation>
     </message>
     <message>
-        <location line="+265"/>
+        <location line="+236"/>
+        <source>Failed to upgrade Evo database</source>
+        <translation>Failed to upgrade Evo database</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Fee needed &gt; fee paid</source>
+        <translation>Fee needed &gt; fee paid</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Host %s on unsupported network</source>
+        <translation>Host %s on unsupported network</translation>
+    </message>
+    <message>
+        <location line="+17"/>
+        <source>Invalid amount for %s=&lt;amount&gt;: &apos;%s&apos; (must be at least %s)</source>
+        <translation>Invalid amount for %s=&lt;amount&gt;: &apos;%s&apos; (must be at least %s)</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Invalid amount for %s=&lt;amount&gt;: &apos;%s&apos;</source>
+        <translation>Invalid amount for %s=&lt;amount&gt;: &apos;%s&apos;</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Invalid port specified in %s: &apos;%s&apos;</source>
+        <translation>Invalid port specified in %s: &apos;%s&apos;</translation>
+    </message>
+    <message>
+        <location line="+4"/>
         <source>Last successful action was too recent.</source>
         <translation>Last successful action was too recent.</translation>
     </message>
     <message>
-        <location line="+45"/>
+        <location line="+10"/>
+        <source>Missing solving data for estimating transaction size</source>
+        <translation>Missing solving data for estimating transaction size</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>No host specified</source>
+        <translation>No host specified</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>No host specified, malformed URL</source>
+        <translation>No host specified, malformed URL</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>No text before the scheme delimiter, malformed URL</source>
+        <translation>No text before the scheme delimiter, malformed URL</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Port must be between %d and %d, supplied %d</source>
+        <translation>Port must be between %d and %d, supplied %d</translation>
+    </message>
+    <message>
+        <location line="+16"/>
+        <source>Socket not initialized, cannot send message</source>
+        <translation>Socket not initialized, cannot send message</translation>
+    </message>
+    <message>
+        <location line="+10"/>
         <source>The source code is available from %s.</source>
         <translation>The source code is available from %s.</translation>
     </message>
@@ -7455,6 +7923,11 @@ Go to File &gt; Open Wallet to load a wallet.
     </message>
     <message>
         <location line="+3"/>
+        <source>Transaction needs a change address, but we can&apos;t generate it.</source>
+        <translation>Transaction needs a change address, but we can&apos;t generate it.</translation>
+    </message>
+    <message>
+        <location line="+1"/>
         <source>Transaction not valid.</source>
         <translation>Transaction not valid.</translation>
     </message>
@@ -7479,7 +7952,22 @@ Go to File &gt; Open Wallet to load a wallet.
         <translation>Unable to locate enough non-denominated funds for this transaction.</translation>
     </message>
     <message>
-        <location line="+3"/>
+        <location line="+1"/>
+        <source>Unable to lookup host %s</source>
+        <translation>Unable to lookup host %s</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Unable to parse -maxuploadtarget: &apos;%s&apos;</source>
+        <translation>Unable to parse -maxuploadtarget: &apos;%s&apos;</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Unable to send message to %s (::sendto() returned error %s)</source>
+        <translation>Unable to send message to %s (::sendto() returned error %s)</translation>
+    </message>
+    <message>
+        <location line="+1"/>
         <source>Unable to sign spork message, wrong key?</source>
         <translation>Unable to sign spork message, wrong key?</translation>
     </message>
@@ -7493,13 +7981,18 @@ Go to File &gt; Open Wallet to load a wallet.
         <source>Unknown state: id = %u</source>
         <translation>Unknown state: id = %u</translation>
     </message>
+    <message>
+        <location line="+1"/>
+        <source>Unsupported URL scheme, must begin with udp://</source>
+        <translation>Unsupported URL scheme, must begin with udp://</translation>
+    </message>
     <message>
         <location line="+2"/>
         <source>Unsupported logging category %s=%s.</source>
         <translation>Unsupported logging category %s=%s.</translation>
     </message>
     <message>
-        <location line="+5"/>
+        <location line="+4"/>
         <source>Very low number of keys left: %d</source>
         <translation>Very low number of keys left: %d</translation>
     </message>
@@ -7549,7 +8042,7 @@ Go to File &gt; Open Wallet to load a wallet.
         <translation>Your entries added successfully.</translation>
     </message>
     <message>
-        <location filename="../bitcoin.cpp" line="-583"/>
+        <location filename="../bitcoin.cpp" line="-599"/>
         <source>Settings file could not be read</source>
         <translation>Settings file could not be read</translation>
     </message>
diff --git a/src/qt/locale/dash_en.xlf b/src/qt/locale/dash_en.xlf
index c4a01dee73ff..4276d5c132e0 100644
--- a/src/qt/locale/dash_en.xlf
+++ b/src/qt/locale/dash_en.xlf
@@ -1,3733 +1,3426 @@
 <?xml version="1.0" encoding="utf-8"?>
 <xliff version="1.2" xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:trolltech="urn:trolltech:names:ts:document:1.0">
-  <file original="../forms/addressbookpage.ui" datatype="x-trolltech-designer-ui" source-language="en" target-language="en"><body>
+  <file original="../forms/addressbookpage.ui" datatype="x-trolltech-designer-ui" source-language="en"><body>
     <group restype="x-trolltech-linguist-context" resname="AddressBookPage">
-      <trans-unit id="_msg1" approved="yes">
+      <trans-unit id="_msg1">
         <source xml:space="preserve">Enter address or label to search</source>
-        <target xml:space="preserve">Enter address or label to search</target>
         <context-group purpose="location"><context context-type="linenumber">27</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg2" approved="yes">
+      <trans-unit id="_msg2">
         <source xml:space="preserve">Right-click to edit address or label</source>
-        <target xml:space="preserve">Right-click to edit address or label</target>
         <context-group purpose="location"><context context-type="linenumber">37</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg3" approved="yes">
+      <trans-unit id="_msg3">
         <source xml:space="preserve">Create a new address</source>
-        <target xml:space="preserve">Create a new address</target>
         <context-group purpose="location"><context context-type="linenumber">64</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg4" approved="yes">
+      <trans-unit id="_msg4">
         <source xml:space="preserve">&amp;New</source>
-        <target xml:space="preserve">&amp;New</target>
         <context-group purpose="location"><context context-type="linenumber">67</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg5" approved="yes">
+      <trans-unit id="_msg5">
         <source xml:space="preserve">Copy the currently selected address to the system clipboard</source>
-        <target xml:space="preserve">Copy the currently selected address to the system clipboard</target>
         <context-group purpose="location"><context context-type="linenumber">77</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg6" approved="yes">
+      <trans-unit id="_msg6">
         <source xml:space="preserve">&amp;Copy</source>
-        <target xml:space="preserve">&amp;Copy</target>
         <context-group purpose="location"><context context-type="linenumber">80</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg7" approved="yes">
+      <trans-unit id="_msg7">
         <source xml:space="preserve">Show QR code for the currently selected address</source>
-        <target xml:space="preserve">Show QR code for the currently selected address</target>
         <context-group purpose="location"><context context-type="linenumber">90</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg8" approved="yes">
+      <trans-unit id="_msg8">
         <source xml:space="preserve">&amp;Show QR code</source>
-        <target xml:space="preserve">&amp;Show QR code</target>
         <context-group purpose="location"><context context-type="linenumber">93</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg9" approved="yes">
+      <trans-unit id="_msg9">
         <source xml:space="preserve">Delete the currently selected address from the list</source>
-        <target xml:space="preserve">Delete the currently selected address from the list</target>
         <context-group purpose="location"><context context-type="linenumber">103</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg10" approved="yes">
+      <trans-unit id="_msg10">
         <source xml:space="preserve">&amp;Delete</source>
-        <target xml:space="preserve">&amp;Delete</target>
         <context-group purpose="location"><context context-type="linenumber">106</context></context-group>
-        <context-group purpose="location"><context context-type="sourcefile">../addressbookpage.cpp</context><context context-type="linenumber">121</context></context-group>
+        <context-group purpose="location"><context context-type="sourcefile">../addressbookpage.cpp</context><context context-type="linenumber">117</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg11" approved="yes">
+      <trans-unit id="_msg11">
         <source xml:space="preserve">Export the data in the current tab to a file</source>
-        <target xml:space="preserve">Export the data in the current tab to a file</target>
         <context-group purpose="location"><context context-type="linenumber">129</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg12" approved="yes">
+      <trans-unit id="_msg12">
         <source xml:space="preserve">&amp;Export</source>
-        <target xml:space="preserve">&amp;Export</target>
         <context-group purpose="location"><context context-type="linenumber">132</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg13" approved="yes">
+      <trans-unit id="_msg13">
         <source xml:space="preserve">C&amp;lose</source>
-        <target xml:space="preserve">C&amp;lose</target>
         <context-group purpose="location"><context context-type="linenumber">148</context></context-group>
       </trans-unit>
     </group>
   </body></file>
-  <file original="../addressbookpage.cpp" datatype="cpp" source-language="en" target-language="en"><body>
+  <file original="../addressbookpage.cpp" datatype="cpp" source-language="en"><body>
     <group restype="x-trolltech-linguist-context" resname="AddressBookPage">
-      <trans-unit id="_msg14" approved="yes">
+      <trans-unit id="_msg14">
         <source xml:space="preserve">Choose the address to send coins to</source>
-        <target xml:space="preserve">Choose the address to send coins to</target>
-        <context-group purpose="location"><context context-type="linenumber">79</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">83</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg15" approved="yes">
+      <trans-unit id="_msg15">
         <source xml:space="preserve">Choose the address to receive coins with</source>
-        <target xml:space="preserve">Choose the address to receive coins with</target>
-        <context-group purpose="location"><context context-type="linenumber">80</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">84</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg16" approved="yes">
+      <trans-unit id="_msg16">
         <source xml:space="preserve">C&amp;hoose</source>
-        <target xml:space="preserve">C&amp;hoose</target>
-        <context-group purpose="location"><context context-type="linenumber">85</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg17" approved="yes">
-        <source xml:space="preserve">Sending addresses</source>
-        <target xml:space="preserve">Sending addresses</target>
-        <context-group purpose="location"><context context-type="linenumber">91</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg18" approved="yes">
-        <source xml:space="preserve">Receiving addresses</source>
-        <target xml:space="preserve">Receiving addresses</target>
-        <context-group purpose="location"><context context-type="linenumber">92</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">89</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg19" approved="yes">
+      <trans-unit id="_msg17">
         <source xml:space="preserve">These are your Dash addresses for sending payments. Always check the amount and the receiving address before sending coins.</source>
-        <target xml:space="preserve">These are your Dash addresses for sending payments. Always check the amount and the receiving address before sending coins.</target>
-        <context-group purpose="location"><context context-type="linenumber">99</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">95</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg20" approved="yes">
+      <trans-unit id="_msg18">
         <source xml:space="preserve">These are your Dash addresses for receiving payments. Use the &apos;Create new receiving address&apos; button in the receive tab to create new addresses.</source>
-        <target xml:space="preserve">These are your Dash addresses for receiving payments. Use the &apos;Create new receiving address&apos; button in the receive tab to create new addresses.</target>
-        <context-group purpose="location"><context context-type="linenumber">104</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">100</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg21" approved="yes">
+      <trans-unit id="_msg19">
         <source xml:space="preserve">&amp;Copy Address</source>
-        <target xml:space="preserve">&amp;Copy Address</target>
-        <context-group purpose="location"><context context-type="linenumber">112</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">108</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg22" approved="yes">
+      <trans-unit id="_msg20">
         <source xml:space="preserve">Copy &amp;Label</source>
-        <target xml:space="preserve">Copy &amp;Label</target>
-        <context-group purpose="location"><context context-type="linenumber">113</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">109</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg23" approved="yes">
+      <trans-unit id="_msg21">
         <source xml:space="preserve">&amp;Edit</source>
-        <target xml:space="preserve">&amp;Edit</target>
-        <context-group purpose="location"><context context-type="linenumber">114</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">110</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg24" approved="yes">
+      <trans-unit id="_msg22">
         <source xml:space="preserve">Show address &amp;QR code</source>
-        <target xml:space="preserve">Show address &amp;QR code</target>
-        <context-group purpose="location"><context context-type="linenumber">115</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">111</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg25" approved="yes">
+      <trans-unit id="_msg23">
         <source xml:space="preserve">QR code</source>
-        <target xml:space="preserve">QR code</target>
-        <context-group purpose="location"><context context-type="linenumber">239</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">236</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg26" approved="yes">
+      <trans-unit id="_msg24">
         <source xml:space="preserve">Export Address List</source>
-        <target xml:space="preserve">Export Address List</target>
-        <context-group purpose="location"><context context-type="linenumber">307</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">304</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg27" approved="yes">
+      <trans-unit id="_msg25">
         <source xml:space="preserve">Comma separated file</source>
-        <target xml:space="preserve">Comma separated file</target>
-        <context-group purpose="location"><context context-type="linenumber">310</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">307</context></context-group>
         <note annotates="source" from="developer">Expanded name of the CSV file format. See: https://en.wikipedia.org/wiki/Comma-separated_values.</note>
       </trans-unit>
-      <trans-unit id="_msg28" approved="yes">
+      <trans-unit id="_msg26">
         <source xml:space="preserve">There was an error trying to save the address list to %1. Please try again.</source>
-        <target xml:space="preserve">There was an error trying to save the address list to %1. Please try again.</target>
-        <context-group purpose="location"><context context-type="linenumber">326</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">323</context></context-group>
         <note annotates="source" from="developer">An error message. %1 is a stand-in argument for the name of the file we attempted to save to.</note>
       </trans-unit>
-      <trans-unit id="_msg29" approved="yes">
+      <trans-unit id="_msg27">
+        <source xml:space="preserve">Sending addresses - %1</source>
+        <context-group purpose="location"><context context-type="linenumber">355</context></context-group>
+      </trans-unit>
+      <trans-unit id="_msg28">
+        <source xml:space="preserve">Receiving addresses - %1</source>
+        <context-group purpose="location"><context context-type="linenumber">356</context></context-group>
+      </trans-unit>
+      <trans-unit id="_msg29">
         <source xml:space="preserve">Exporting Failed</source>
-        <target xml:space="preserve">Exporting Failed</target>
-        <context-group purpose="location"><context context-type="linenumber">323</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">320</context></context-group>
       </trans-unit>
     </group>
   </body></file>
-  <file original="../addresstablemodel.cpp" datatype="cpp" source-language="en" target-language="en"><body>
+  <file original="../addresstablemodel.cpp" datatype="cpp" source-language="en"><body>
     <group restype="x-trolltech-linguist-context" resname="AddressTableModel">
-      <trans-unit id="_msg30" approved="yes">
+      <trans-unit id="_msg30">
         <source xml:space="preserve">Label</source>
-        <target xml:space="preserve">Label</target>
         <context-group purpose="location"><context context-type="linenumber">165</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg31" approved="yes">
+      <trans-unit id="_msg31">
         <source xml:space="preserve">Address</source>
-        <target xml:space="preserve">Address</target>
         <context-group purpose="location"><context context-type="linenumber">165</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg32" approved="yes">
+      <trans-unit id="_msg32">
         <source xml:space="preserve">(no label)</source>
-        <target xml:space="preserve">(no label)</target>
         <context-group purpose="location"><context context-type="linenumber">203</context></context-group>
       </trans-unit>
     </group>
   </body></file>
-  <file original="../forms/appearancewidget.ui" datatype="x-trolltech-designer-ui" source-language="en" target-language="en"><body>
+  <file original="../forms/appearancewidget.ui" datatype="x-trolltech-designer-ui" source-language="en"><body>
     <group restype="x-trolltech-linguist-context" resname="AppearanceWidget">
-      <trans-unit id="_msg33" approved="yes">
+      <trans-unit id="_msg33">
         <source xml:space="preserve">Lighter</source>
-        <target xml:space="preserve">Lighter</target>
         <context-group purpose="location"><context context-type="linenumber">60</context></context-group>
         <context-group purpose="location"><context context-type="linenumber">350</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg34" approved="yes">
+      <trans-unit id="_msg34">
         <source xml:space="preserve">Bolder</source>
-        <target xml:space="preserve">Bolder</target>
         <context-group purpose="location"><context context-type="linenumber">116</context></context-group>
         <context-group purpose="location"><context context-type="linenumber">406</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg35" approved="yes">
+      <trans-unit id="_msg35">
         <source xml:space="preserve">Font Weight Normal:</source>
-        <target xml:space="preserve">Font Weight Normal:</target>
         <context-group purpose="location"><context context-type="linenumber">134</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg36" approved="yes">
+      <trans-unit id="_msg36">
         <source xml:space="preserve">Smaller</source>
-        <target xml:space="preserve">Smaller</target>
         <context-group purpose="location"><context context-type="linenumber">158</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg37" approved="yes">
+      <trans-unit id="_msg37">
         <source xml:space="preserve">Bigger</source>
-        <target xml:space="preserve">Bigger</target>
         <context-group purpose="location"><context context-type="linenumber">223</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg38" approved="yes">
+      <trans-unit id="_msg38">
         <source xml:space="preserve">Font Scale:</source>
-        <target xml:space="preserve">Font Scale:</target>
         <context-group purpose="location"><context context-type="linenumber">241</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg39" approved="yes">
+      <trans-unit id="_msg39">
         <source xml:space="preserve">Font Family:</source>
-        <target xml:space="preserve">Font Family:</target>
         <context-group purpose="location"><context context-type="linenumber">277</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg40" approved="yes">
+      <trans-unit id="_msg40">
         <source xml:space="preserve">Theme:</source>
-        <target xml:space="preserve">Theme:</target>
         <context-group purpose="location"><context context-type="linenumber">313</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg41" approved="yes">
+      <trans-unit id="_msg41">
         <source xml:space="preserve">Font Weight Bold:</source>
-        <target xml:space="preserve">Font Weight Bold:</target>
         <context-group purpose="location"><context context-type="linenumber">326</context></context-group>
       </trans-unit>
     </group>
   </body></file>
-  <file original="../forms/askpassphrasedialog.ui" datatype="x-trolltech-designer-ui" source-language="en" target-language="en"><body>
+  <file original="../forms/askpassphrasedialog.ui" datatype="x-trolltech-designer-ui" source-language="en"><body>
     <group restype="x-trolltech-linguist-context" resname="AskPassphraseDialog">
-      <trans-unit id="_msg42" approved="yes">
+      <trans-unit id="_msg42">
         <source xml:space="preserve">Passphrase Dialog</source>
-        <target xml:space="preserve">Passphrase Dialog</target>
         <context-group purpose="location"><context context-type="linenumber">26</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg43" approved="yes">
+      <trans-unit id="_msg43">
         <source xml:space="preserve">Enter passphrase</source>
-        <target xml:space="preserve">Enter passphrase</target>
         <context-group purpose="location"><context context-type="linenumber">56</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg44" approved="yes">
+      <trans-unit id="_msg44">
         <source xml:space="preserve">New passphrase</source>
-        <target xml:space="preserve">New passphrase</target>
         <context-group purpose="location"><context context-type="linenumber">70</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg45" approved="yes">
+      <trans-unit id="_msg45">
         <source xml:space="preserve">Repeat new passphrase</source>
-        <target xml:space="preserve">Repeat new passphrase</target>
         <context-group purpose="location"><context context-type="linenumber">84</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg46" approved="yes">
+      <trans-unit id="_msg46">
         <source xml:space="preserve">Show passphrase</source>
-        <target xml:space="preserve">Show passphrase</target>
         <context-group purpose="location"><context context-type="linenumber">98</context></context-group>
       </trans-unit>
     </group>
   </body></file>
-  <file original="../askpassphrasedialog.cpp" datatype="cpp" source-language="en" target-language="en"><body>
+  <file original="../askpassphrasedialog.cpp" datatype="cpp" source-language="en"><body>
     <group restype="x-trolltech-linguist-context" resname="AskPassphraseDialog">
-      <trans-unit id="_msg47" approved="yes">
+      <trans-unit id="_msg47">
         <source xml:space="preserve">Encrypt wallet</source>
-        <target xml:space="preserve">Encrypt wallet</target>
         <context-group purpose="location"><context context-type="linenumber">58</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg48" approved="yes">
+      <trans-unit id="_msg48">
         <source xml:space="preserve">This operation needs your wallet passphrase to unlock the wallet.</source>
-        <target xml:space="preserve">This operation needs your wallet passphrase to unlock the wallet.</target>
         <context-group purpose="location"><context context-type="linenumber">61</context></context-group>
         <context-group purpose="location"><context context-type="linenumber">69</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg49" approved="yes">
+      <trans-unit id="_msg49">
         <source xml:space="preserve">Unlock wallet for mixing only</source>
-        <target xml:space="preserve">Unlock wallet for mixing only</target>
         <context-group purpose="location"><context context-type="linenumber">66</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg50" approved="yes">
+      <trans-unit id="_msg50">
         <source xml:space="preserve">Unlock wallet</source>
-        <target xml:space="preserve">Unlock wallet</target>
         <context-group purpose="location"><context context-type="linenumber">74</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg51" approved="yes">
+      <trans-unit id="_msg51">
         <source xml:space="preserve">Change passphrase</source>
-        <target xml:space="preserve">Change passphrase</target>
         <context-group purpose="location"><context context-type="linenumber">77</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg52" approved="yes">
+      <trans-unit id="_msg52">
         <source xml:space="preserve">Confirm wallet encryption</source>
-        <target xml:space="preserve">Confirm wallet encryption</target>
-        <context-group purpose="location"><context context-type="linenumber">125</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">124</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg53" approved="yes">
+      <trans-unit id="_msg53">
         <source xml:space="preserve">Warning: If you encrypt your wallet and lose your passphrase, you will &lt;b&gt;LOSE ALL OF YOUR DASH&lt;/b&gt;!</source>
-        <target xml:space="preserve">Warning: If you encrypt your wallet and lose your passphrase, you will &lt;b&gt;LOSE ALL OF YOUR DASH&lt;/b&gt;!</target>
-        <context-group purpose="location"><context context-type="linenumber">126</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">125</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg54" approved="yes">
+      <trans-unit id="_msg54">
         <source xml:space="preserve">Are you sure you wish to encrypt your wallet?</source>
-        <target xml:space="preserve">Are you sure you wish to encrypt your wallet?</target>
-        <context-group purpose="location"><context context-type="linenumber">126</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">125</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg55" approved="yes">
+      <trans-unit id="_msg55">
         <source xml:space="preserve">Wallet encrypted</source>
-        <target xml:space="preserve">Wallet encrypted</target>
-        <context-group purpose="location"><context context-type="linenumber">145</context></context-group>
-        <context-group purpose="location"><context context-type="linenumber">155</context></context-group>
-        <context-group purpose="location"><context context-type="linenumber">204</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">144</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">154</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">214</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg56" approved="yes">
+      <trans-unit id="_msg56">
         <source xml:space="preserve">Enter the new passphrase for the wallet.&lt;br/&gt;Please use a passphrase of &lt;b&gt;ten or more random characters&lt;/b&gt;, or &lt;b&gt;eight or more words&lt;/b&gt;.</source>
-        <target xml:space="preserve">Enter the new passphrase for the wallet.&lt;br/&gt;Please use a passphrase of &lt;b&gt;ten or more random characters&lt;/b&gt;, or &lt;b&gt;eight or more words&lt;/b&gt;.</target>
         <context-group purpose="location"><context context-type="linenumber">55</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg57" approved="yes">
+      <trans-unit id="_msg57">
         <source xml:space="preserve">Enter the old passphrase and new passphrase for the wallet.</source>
-        <target xml:space="preserve">Enter the old passphrase and new passphrase for the wallet.</target>
         <context-group purpose="location"><context context-type="linenumber">78</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg58" approved="yes">
+      <trans-unit id="_msg58">
         <source xml:space="preserve">Remember that encrypting your wallet cannot fully protect your funds from being stolen by malware infecting your computer.</source>
-        <target xml:space="preserve">Remember that encrypting your wallet cannot fully protect your funds from being stolen by malware infecting your computer.</target>
-        <context-group purpose="location"><context context-type="linenumber">133</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">132</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg59" approved="yes">
+      <trans-unit id="_msg59">
         <source xml:space="preserve">Wallet to be encrypted</source>
-        <target xml:space="preserve">Wallet to be encrypted</target>
-        <context-group purpose="location"><context context-type="linenumber">137</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">136</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg60" approved="yes">
+      <trans-unit id="_msg60">
         <source xml:space="preserve">Your wallet is about to be encrypted. </source>
-        <target xml:space="preserve">Your wallet is about to be encrypted. </target>
-        <context-group purpose="location"><context context-type="linenumber">139</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">138</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg61" approved="yes">
+      <trans-unit id="_msg61">
         <source xml:space="preserve">Your wallet is now encrypted. </source>
-        <target xml:space="preserve">Your wallet is now encrypted. </target>
-        <context-group purpose="location"><context context-type="linenumber">147</context></context-group>
-        <context-group purpose="location"><context context-type="linenumber">157</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">146</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">156</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg62" approved="yes">
+      <trans-unit id="_msg62">
         <source xml:space="preserve">IMPORTANT: Any previous backups you have made of your wallet file should be replaced with the newly generated, encrypted wallet file. Previous backups of the unencrypted wallet file contain the same HD seed and still have full access to all your funds just like the new, encrypted wallet.</source>
-        <target xml:space="preserve">IMPORTANT: Any previous backups you have made of your wallet file should be replaced with the newly generated, encrypted wallet file. Previous backups of the unencrypted wallet file contain the same HD seed and still have full access to all your funds just like the new, encrypted wallet.</target>
-        <context-group purpose="location"><context context-type="linenumber">149</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">148</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg63" approved="yes">
+      <trans-unit id="_msg63">
         <source xml:space="preserve">IMPORTANT: Any previous backups you have made of your wallet file should be replaced with the newly generated, encrypted wallet file. For security reasons, previous backups of the unencrypted wallet file will become useless as soon as you start using the new, encrypted wallet.</source>
-        <target xml:space="preserve">IMPORTANT: Any previous backups you have made of your wallet file should be replaced with the newly generated, encrypted wallet file. For security reasons, previous backups of the unencrypted wallet file will become useless as soon as you start using the new, encrypted wallet.</target>
-        <context-group purpose="location"><context context-type="linenumber">159</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">158</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg64" approved="yes">
+      <trans-unit id="_msg64">
         <source xml:space="preserve">Wallet encryption failed</source>
-        <target xml:space="preserve">Wallet encryption failed</target>
-        <context-group purpose="location"><context context-type="linenumber">166</context></context-group>
-        <context-group purpose="location"><context context-type="linenumber">174</context></context-group>
-        <context-group purpose="location"><context context-type="linenumber">210</context></context-group>
-        <context-group purpose="location"><context context-type="linenumber">216</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">165</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">173</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">236</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg65" approved="yes">
+      <trans-unit id="_msg65">
         <source xml:space="preserve">Wallet encryption failed due to an internal error. Your wallet was not encrypted.</source>
-        <target xml:space="preserve">Wallet encryption failed due to an internal error. Your wallet was not encrypted.</target>
-        <context-group purpose="location"><context context-type="linenumber">167</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">166</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg66" approved="yes">
+      <trans-unit id="_msg66">
         <source xml:space="preserve">The supplied passphrases do not match.</source>
-        <target xml:space="preserve">The supplied passphrases do not match.</target>
-        <context-group purpose="location"><context context-type="linenumber">175</context></context-group>
-        <context-group purpose="location"><context context-type="linenumber">217</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">174</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">237</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg67" approved="yes">
+      <trans-unit id="_msg67">
         <source xml:space="preserve">Wallet unlock failed</source>
-        <target xml:space="preserve">Wallet unlock failed</target>
-        <context-group purpose="location"><context context-type="linenumber">188</context></context-group>
-        <context-group purpose="location"><context context-type="linenumber">196</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">189</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">192</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">206</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg68" approved="yes">
+      <trans-unit id="_msg68">
         <source xml:space="preserve">The passphrase entered for the wallet decryption was incorrect.</source>
-        <target xml:space="preserve">The passphrase entered for the wallet decryption was incorrect.</target>
-        <context-group purpose="location"><context context-type="linenumber">189</context></context-group>
-        <context-group purpose="location"><context context-type="linenumber">211</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">190</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">223</context></context-group>
+      </trans-unit>
+      <trans-unit id="_msg69">
+        <source xml:space="preserve">The passphrase entered for the wallet decryption is incorrect. It contains a null character (ie - a zero byte). If the passphrase was set with a version of this software prior to 23.0, please try again with only the characters up to — but not including — the first null character. If this is successful, please set a new passphrase to avoid this issue in the future.</source>
+        <context-group purpose="location"><context context-type="linenumber">193</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg69" approved="yes">
+      <trans-unit id="_msg70">
         <source xml:space="preserve">Wallet passphrase was successfully changed.</source>
-        <target xml:space="preserve">Wallet passphrase was successfully changed.</target>
-        <context-group purpose="location"><context context-type="linenumber">205</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">215</context></context-group>
+      </trans-unit>
+      <trans-unit id="_msg71">
+        <source xml:space="preserve">Passphrase change failed</source>
+        <context-group purpose="location"><context context-type="linenumber">222</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">225</context></context-group>
+      </trans-unit>
+      <trans-unit id="_msg72">
+        <source xml:space="preserve">The old passphrase entered for the wallet decryption is incorrect. It contains a null character (ie - a zero byte). If the passphrase was set with a version of this software prior to 23.0, please try again with only the characters up to — but not including — the first null character.</source>
+        <context-group purpose="location"><context context-type="linenumber">226</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg70" approved="yes">
+      <trans-unit id="_msg73">
         <source xml:space="preserve">Warning: The Caps Lock key is on!</source>
-        <target xml:space="preserve">Warning: The Caps Lock key is on!</target>
-        <context-group purpose="location"><context context-type="linenumber">252</context></context-group>
-        <context-group purpose="location"><context context-type="linenumber">285</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">272</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">305</context></context-group>
       </trans-unit>
     </group>
   </body></file>
-  <file original="../bantablemodel.cpp" datatype="cpp" source-language="en" target-language="en"><body>
+  <file original="../bantablemodel.cpp" datatype="cpp" source-language="en"><body>
     <group restype="x-trolltech-linguist-context" resname="BanTableModel">
-      <trans-unit id="_msg71" approved="yes">
+      <trans-unit id="_msg74">
         <source xml:space="preserve">IP/Netmask</source>
-        <target xml:space="preserve">IP/Netmask</target>
         <context-group purpose="location"><context context-type="linenumber">85</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg72" approved="yes">
+      <trans-unit id="_msg75">
         <source xml:space="preserve">Banned Until</source>
-        <target xml:space="preserve">Banned Until</target>
         <context-group purpose="location"><context context-type="linenumber">85</context></context-group>
       </trans-unit>
     </group>
   </body></file>
-  <file original="../bitcoinamountfield.cpp" datatype="cpp" source-language="en" target-language="en"><body>
+  <file original="../bitcoinamountfield.cpp" datatype="cpp" source-language="en"><body>
     <group restype="x-trolltech-linguist-context" resname="BitcoinAmountField">
-      <trans-unit id="_msg73" approved="yes">
+      <trans-unit id="_msg76">
         <source xml:space="preserve">Amount in %1</source>
-        <target xml:space="preserve">Amount in %1</target>
-        <context-group purpose="location"><context context-type="linenumber">292</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">293</context></context-group>
       </trans-unit>
     </group>
   </body></file>
-  <file original="../bitcoin.cpp" datatype="cpp" source-language="en" target-language="en"><body>
+  <file original="../bitcoin.cpp" datatype="cpp" source-language="en"><body>
     <group restype="x-trolltech-linguist-context" resname="BitcoinApplication">
-      <trans-unit id="_msg74" approved="yes">
+      <trans-unit id="_msg77">
         <source xml:space="preserve">Runaway exception</source>
-        <target xml:space="preserve">Runaway exception</target>
-        <context-group purpose="location"><context context-type="linenumber">419</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">452</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg75" approved="yes">
+      <trans-unit id="_msg78">
         <source xml:space="preserve">A fatal error occurred. %1 can no longer continue safely and will quit.</source>
-        <target xml:space="preserve">A fatal error occurred. %1 can no longer continue safely and will quit.</target>
-        <context-group purpose="location"><context context-type="linenumber">420</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">453</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg76" approved="yes">
+      <trans-unit id="_msg79">
         <source xml:space="preserve">Internal error</source>
-        <target xml:space="preserve">Internal error</target>
-        <context-group purpose="location"><context context-type="linenumber">429</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">462</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg77" approved="yes">
+      <trans-unit id="_msg80">
         <source xml:space="preserve">An internal error occurred. %1 will attempt to continue safely. This is an unexpected bug which can be reported as described below.</source>
-        <target xml:space="preserve">An internal error occurred. %1 will attempt to continue safely. This is an unexpected bug which can be reported as described below.</target>
-        <context-group purpose="location"><context context-type="linenumber">430</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">463</context></context-group>
       </trans-unit>
     </group>
     <group restype="x-trolltech-linguist-context" resname="QObject">
-      <trans-unit id="_msg78" approved="yes">
+      <trans-unit id="_msg81">
         <source xml:space="preserve">Do you want to reset settings to default values, or to abort without making changes?</source>
-        <target xml:space="preserve">Do you want to reset settings to default values, or to abort without making changes?</target>
-        <context-group purpose="location"><context context-type="linenumber">166</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">187</context></context-group>
         <note annotates="source" from="developer">Explanatory text shown on startup when the settings file cannot be read. Prompts user to make a choice between resetting or aborting.</note>
       </trans-unit>
-      <trans-unit id="_msg79" approved="yes">
+      <trans-unit id="_msg82">
         <source xml:space="preserve">A fatal error occurred. Check that settings file is writable, or try running with -nosettings.</source>
-        <target xml:space="preserve">A fatal error occurred. Check that settings file is writable, or try running with -nosettings.</target>
-        <context-group purpose="location"><context context-type="linenumber">190</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">211</context></context-group>
         <note annotates="source" from="developer">Explanatory text shown on startup when the settings file could not be written. Prompts user to check that we have the ability to write to the file. Explains that the user has the option of running without a settings file.</note>
       </trans-unit>
-      <trans-unit id="_msg80" approved="yes">
+      <trans-unit id="_msg83">
         <source xml:space="preserve">Choose data directory on startup (default: %u)</source>
-        <target xml:space="preserve">Choose data directory on startup (default: %u)</target>
-        <context-group purpose="location"><context context-type="linenumber">455</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">488</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg81" approved="yes">
+      <trans-unit id="_msg84">
         <source xml:space="preserve">Set the font family. Possible values: %1. (default: %2)</source>
-        <target xml:space="preserve">Set the font family. Possible values: %1. (default: %2)</target>
-        <context-group purpose="location"><context context-type="linenumber">457</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">490</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg82" approved="yes">
+      <trans-unit id="_msg85">
         <source xml:space="preserve">Set a scale factor which gets applied to the base font size. Possible range %1 (smallest fonts) to %2 (largest fonts). (default: %3)</source>
-        <target xml:space="preserve">Set a scale factor which gets applied to the base font size. Possible range %1 (smallest fonts) to %2 (largest fonts). (default: %3)</target>
-        <context-group purpose="location"><context context-type="linenumber">458</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">491</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg83" approved="yes">
+      <trans-unit id="_msg86">
         <source xml:space="preserve">Set the font weight for bold texts. Possible range %1 to %2 (default: %3)</source>
-        <target xml:space="preserve">Set the font weight for bold texts. Possible range %1 to %2 (default: %3)</target>
-        <context-group purpose="location"><context context-type="linenumber">459</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">492</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg84" approved="yes">
+      <trans-unit id="_msg87">
         <source xml:space="preserve">Set the font weight for normal texts. Possible range %1 to %2 (default: %3)</source>
-        <target xml:space="preserve">Set the font weight for normal texts. Possible range %1 to %2 (default: %3)</target>
-        <context-group purpose="location"><context context-type="linenumber">460</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">493</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg85" approved="yes">
+      <trans-unit id="_msg88">
         <source xml:space="preserve">Set language, for example &quot;de_DE&quot; (default: system locale)</source>
-        <target xml:space="preserve">Set language, for example &quot;de_DE&quot; (default: system locale)</target>
-        <context-group purpose="location"><context context-type="linenumber">461</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">494</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg86" approved="yes">
+      <trans-unit id="_msg89">
         <source xml:space="preserve">Start minimized</source>
-        <target xml:space="preserve">Start minimized</target>
-        <context-group purpose="location"><context context-type="linenumber">462</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">495</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg87" approved="yes">
+      <trans-unit id="_msg90">
         <source xml:space="preserve">Reset all settings changed in the GUI</source>
-        <target xml:space="preserve">Reset all settings changed in the GUI</target>
-        <context-group purpose="location"><context context-type="linenumber">463</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">496</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg88" approved="yes">
+      <trans-unit id="_msg91">
         <source xml:space="preserve">Show splash screen on startup (default: %u)</source>
-        <target xml:space="preserve">Show splash screen on startup (default: %u)</target>
-        <context-group purpose="location"><context context-type="linenumber">464</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">497</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg89" approved="yes">
+      <trans-unit id="_msg92">
         <source xml:space="preserve">Error: Specified data directory &quot;%1&quot; does not exist.</source>
-        <target xml:space="preserve">Error: Specified data directory &quot;%1&quot; does not exist.</target>
-        <context-group purpose="location"><context context-type="linenumber">560</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">595</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg90" approved="yes">
+      <trans-unit id="_msg93">
         <source xml:space="preserve">Error: Cannot parse configuration file: %1.</source>
-        <target xml:space="preserve">Error: Cannot parse configuration file: %1.</target>
-        <context-group purpose="location"><context context-type="linenumber">566</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">604</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg91" approved="yes">
+      <trans-unit id="_msg94">
         <source xml:space="preserve">Error: %1</source>
-        <target xml:space="preserve">Error: %1</target>
-        <context-group purpose="location"><context context-type="linenumber">581</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">618</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg92" approved="yes">
+      <trans-unit id="_msg95">
         <source xml:space="preserve">Error: Failed to load application fonts.</source>
-        <target xml:space="preserve">Error: Failed to load application fonts.</target>
-        <context-group purpose="location"><context context-type="linenumber">632</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">669</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg93" approved="yes">
+      <trans-unit id="_msg96">
         <source xml:space="preserve">Error: Specified font-family invalid. Valid values: %1.</source>
-        <target xml:space="preserve">Error: Specified font-family invalid. Valid values: %1.</target>
-        <context-group purpose="location"><context context-type="linenumber">645</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">682</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg94" approved="yes">
+      <trans-unit id="_msg97">
         <source xml:space="preserve">Error: Specified font-weight-normal invalid. Valid range %1 to %2.</source>
-        <target xml:space="preserve">Error: Specified font-weight-normal invalid. Valid range %1 to %2.</target>
-        <context-group purpose="location"><context context-type="linenumber">655</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">692</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg95" approved="yes">
+      <trans-unit id="_msg98">
         <source xml:space="preserve">Error: Specified font-weight-bold invalid. Valid range %1 to %2.</source>
-        <target xml:space="preserve">Error: Specified font-weight-bold invalid. Valid range %1 to %2.</target>
-        <context-group purpose="location"><context context-type="linenumber">665</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">702</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg96" approved="yes">
+      <trans-unit id="_msg99">
         <source xml:space="preserve">Error: Specified font-scale invalid. Valid range %1 to %2.</source>
-        <target xml:space="preserve">Error: Specified font-scale invalid. Valid range %1 to %2.</target>
-        <context-group purpose="location"><context context-type="linenumber">676</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">713</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg97" approved="yes">
+      <trans-unit id="_msg100">
         <source xml:space="preserve">Error: Invalid -custom-css-dir path.</source>
-        <target xml:space="preserve">Error: Invalid -custom-css-dir path.</target>
-        <context-group purpose="location"><context context-type="linenumber">690</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">727</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg98" approved="yes">
+      <trans-unit id="_msg101">
         <source xml:space="preserve">Error: %1 CSS file(s) missing in -custom-css-dir path.</source>
-        <target xml:space="preserve">Error: %1 CSS file(s) missing in -custom-css-dir path.</target>
-        <context-group purpose="location"><context context-type="linenumber">710</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">747</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg99" approved="yes">
+      <trans-unit id="_msg102">
         <source xml:space="preserve">%1 didn&apos;t yet exit safely…</source>
-        <target xml:space="preserve">%1 didn&apos;t yet exit safely…</target>
-        <context-group purpose="location"><context context-type="linenumber">742</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">779</context></context-group>
       </trans-unit>
     </group>
     <group restype="x-trolltech-linguist-context" resname="dash-core">
-      <trans-unit id="_msg100" approved="yes">
+      <trans-unit id="_msg103">
         <source xml:space="preserve">Settings file could not be read</source>
-        <target xml:space="preserve">Settings file could not be read</target>
-        <context-group purpose="location"><context context-type="linenumber">159</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">180</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg101" approved="yes">
+      <trans-unit id="_msg104">
         <source xml:space="preserve">Settings file could not be written</source>
-        <target xml:space="preserve">Settings file could not be written</target>
-        <context-group purpose="location"><context context-type="linenumber">182</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">203</context></context-group>
       </trans-unit>
     </group>
   </body></file>
-  <file original="../bitcoingui.cpp" datatype="cpp" source-language="en" target-language="en"><body>
+  <file original="../bitcoingui.cpp" datatype="cpp" source-language="en"><body>
     <group restype="x-trolltech-linguist-context" resname="BitcoinGUI">
-      <trans-unit id="_msg102" approved="yes">
+      <trans-unit id="_msg105">
         <source xml:space="preserve">&amp;Overview</source>
-        <target xml:space="preserve">&amp;Overview</target>
-        <context-group purpose="location"><context context-type="linenumber">683</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">703</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg103" approved="yes">
+      <trans-unit id="_msg106">
         <source xml:space="preserve">Show general overview of wallet</source>
-        <target xml:space="preserve">Show general overview of wallet</target>
-        <context-group purpose="location"><context context-type="linenumber">684</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">704</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg104" approved="yes">
+      <trans-unit id="_msg107">
         <source xml:space="preserve">&amp;Send</source>
-        <target xml:space="preserve">&amp;Send</target>
-        <context-group purpose="location"><context context-type="linenumber">356</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">353</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg105" approved="yes">
+      <trans-unit id="_msg108">
         <source xml:space="preserve">Send coins to a Dash address</source>
-        <target xml:space="preserve">Send coins to a Dash address</target>
-        <context-group purpose="location"><context context-type="linenumber">357</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">354</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg106" approved="yes">
+      <trans-unit id="_msg109">
         <source xml:space="preserve">&amp;Receive</source>
-        <target xml:space="preserve">&amp;Receive</target>
-        <context-group purpose="location"><context context-type="linenumber">365</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">360</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg107" approved="yes">
+      <trans-unit id="_msg110">
         <source xml:space="preserve">Request payments (generates QR codes and dash: URIs)</source>
-        <target xml:space="preserve">Request payments (generates QR codes and dash: URIs)</target>
-        <context-group purpose="location"><context context-type="linenumber">366</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">361</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg108" approved="yes">
+      <trans-unit id="_msg111">
         <source xml:space="preserve">Ctrl+Q</source>
-        <target xml:space="preserve">Ctrl+Q</target>
-        <context-group purpose="location"><context context-type="linenumber">382</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">377</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg109" approved="yes">
+      <trans-unit id="_msg112">
         <source xml:space="preserve">&amp;Options…</source>
-        <target xml:space="preserve">&amp;Options…</target>
-        <context-group purpose="location"><context context-type="linenumber">391</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">386</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg110" approved="yes">
+      <trans-unit id="_msg113">
         <source xml:space="preserve">&amp;Encrypt Wallet…</source>
-        <target xml:space="preserve">&amp;Encrypt Wallet…</target>
-        <context-group purpose="location"><context context-type="linenumber">398</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">391</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg111" approved="yes">
+      <trans-unit id="_msg114">
         <source xml:space="preserve">&amp;Backup Wallet…</source>
-        <target xml:space="preserve">&amp;Backup Wallet…</target>
-        <context-group purpose="location"><context context-type="linenumber">400</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">393</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg112" approved="yes">
+      <trans-unit id="_msg115">
         <source xml:space="preserve">&amp;Change Passphrase…</source>
-        <target xml:space="preserve">&amp;Change Passphrase…</target>
-        <context-group purpose="location"><context context-type="linenumber">402</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">395</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg113" approved="yes">
+      <trans-unit id="_msg116">
         <source xml:space="preserve">&amp;Unlock Wallet…</source>
-        <target xml:space="preserve">&amp;Unlock Wallet…</target>
-        <context-group purpose="location"><context context-type="linenumber">404</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">397</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg114" approved="yes">
+      <trans-unit id="_msg117">
         <source xml:space="preserve">Sign &amp;message…</source>
-        <target xml:space="preserve">Sign &amp;message…</target>
-        <context-group purpose="location"><context context-type="linenumber">407</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">400</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg115" approved="yes">
+      <trans-unit id="_msg118">
         <source xml:space="preserve">&amp;Verify message…</source>
-        <target xml:space="preserve">&amp;Verify message…</target>
-        <context-group purpose="location"><context context-type="linenumber">409</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">402</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg116" approved="yes">
+      <trans-unit id="_msg119">
         <source xml:space="preserve">&amp;Load PSBT from file…</source>
-        <target xml:space="preserve">&amp;Load PSBT from file…</target>
-        <context-group purpose="location"><context context-type="linenumber">411</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg117" approved="yes">
-        <source xml:space="preserve">Load PSBT from clipboard…</source>
-        <target xml:space="preserve">Load PSBT from clipboard…</target>
-        <context-group purpose="location"><context context-type="linenumber">413</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">404</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg118" approved="yes">
+      <trans-unit id="_msg120">
         <source xml:space="preserve">&amp;Sending addresses</source>
-        <target xml:space="preserve">&amp;Sending addresses</target>
-        <context-group purpose="location"><context context-type="linenumber">440</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">433</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg119" approved="yes">
+      <trans-unit id="_msg121">
         <source xml:space="preserve">&amp;Receiving addresses</source>
-        <target xml:space="preserve">&amp;Receiving addresses</target>
-        <context-group purpose="location"><context context-type="linenumber">442</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">435</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg120" approved="yes">
+      <trans-unit id="_msg122">
         <source xml:space="preserve">Open &amp;URI…</source>
-        <target xml:space="preserve">Open &amp;URI…</target>
-        <context-group purpose="location"><context context-type="linenumber">445</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">438</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg121" approved="yes">
+      <trans-unit id="_msg123">
         <source xml:space="preserve">Open Wallet</source>
-        <target xml:space="preserve">Open Wallet</target>
-        <context-group purpose="location"><context context-type="linenumber">448</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">441</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg122" approved="yes">
+      <trans-unit id="_msg124">
         <source xml:space="preserve">Open a wallet</source>
-        <target xml:space="preserve">Open a wallet</target>
-        <context-group purpose="location"><context context-type="linenumber">450</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">443</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg123" approved="yes">
+      <trans-unit id="_msg125">
         <source xml:space="preserve">Close wallet</source>
-        <target xml:space="preserve">Close wallet</target>
-        <context-group purpose="location"><context context-type="linenumber">454</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">447</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg124" approved="yes">
+      <trans-unit id="_msg126">
         <source xml:space="preserve">No wallets available</source>
-        <target xml:space="preserve">No wallets available</target>
-        <context-group purpose="location"><context context-type="linenumber">542</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">540</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg125" approved="yes">
+      <trans-unit id="_msg127">
         <source xml:space="preserve">&amp;Window</source>
-        <target xml:space="preserve">&amp;Window</target>
-        <context-group purpose="location"><context context-type="linenumber">611</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg126" approved="yes">
-        <source xml:space="preserve">Minimize</source>
-        <target xml:space="preserve">Minimize</target>
-        <context-group purpose="location"><context context-type="linenumber">613</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">631</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg127" approved="yes">
+      <trans-unit id="_msg128">
         <source xml:space="preserve">Zoom</source>
-        <target xml:space="preserve">Zoom</target>
-        <context-group purpose="location"><context context-type="linenumber">623</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">643</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg128" approved="yes">
+      <trans-unit id="_msg129">
         <source xml:space="preserve">Main Window</source>
-        <target xml:space="preserve">Main Window</target>
-        <context-group purpose="location"><context context-type="linenumber">641</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">661</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg129" approved="yes">
+      <trans-unit id="_msg130">
         <source xml:space="preserve">&amp;Transactions</source>
-        <target xml:space="preserve">&amp;Transactions</target>
-        <context-group purpose="location"><context context-type="linenumber">698</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">718</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg130" approved="yes">
+      <trans-unit id="_msg131">
         <source xml:space="preserve">Browse transaction history</source>
-        <target xml:space="preserve">Browse transaction history</target>
-        <context-group purpose="location"><context context-type="linenumber">699</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">719</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg131" approved="yes">
+      <trans-unit id="_msg132">
         <source xml:space="preserve">&amp;Masternodes</source>
-        <target xml:space="preserve">&amp;Masternodes</target>
-        <context-group purpose="location"><context context-type="linenumber">710</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">730</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg132" approved="yes">
+      <trans-unit id="_msg133">
         <source xml:space="preserve">Browse masternodes</source>
-        <target xml:space="preserve">Browse masternodes</target>
-        <context-group purpose="location"><context context-type="linenumber">711</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">731</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg133" approved="yes">
+      <trans-unit id="_msg134">
         <source xml:space="preserve">E&amp;xit</source>
-        <target xml:space="preserve">E&amp;xit</target>
-        <context-group purpose="location"><context context-type="linenumber">380</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">375</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg134" approved="yes">
+      <trans-unit id="_msg135">
         <source xml:space="preserve">Quit application</source>
-        <target xml:space="preserve">Quit application</target>
-        <context-group purpose="location"><context context-type="linenumber">381</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">376</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg135" approved="yes">
+      <trans-unit id="_msg136">
         <source xml:space="preserve">About &amp;Qt</source>
-        <target xml:space="preserve">About &amp;Qt</target>
-        <context-group purpose="location"><context context-type="linenumber">388</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">383</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg136" approved="yes">
+      <trans-unit id="_msg137">
         <source xml:space="preserve">Show information about Qt</source>
-        <target xml:space="preserve">Show information about Qt</target>
-        <context-group purpose="location"><context context-type="linenumber">389</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">384</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg137" approved="yes">
+      <trans-unit id="_msg138">
         <source xml:space="preserve">&amp;About %1</source>
-        <target xml:space="preserve">&amp;About %1</target>
-        <context-group purpose="location"><context context-type="linenumber">384</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">379</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg138" approved="yes">
+      <trans-unit id="_msg139">
         <source xml:space="preserve">Send %1 funds to a Dash address</source>
-        <target xml:space="preserve">Send %1 funds to a Dash address</target>
-        <context-group purpose="location"><context context-type="linenumber">362</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">357</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg139" approved="yes">
+      <trans-unit id="_msg140">
         <source xml:space="preserve">Modify configuration options for %1</source>
-        <target xml:space="preserve">Modify configuration options for %1</target>
-        <context-group purpose="location"><context context-type="linenumber">392</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg140" approved="yes">
-        <source xml:space="preserve">&amp;Show / Hide</source>
-        <target xml:space="preserve">&amp;Show / Hide</target>
-        <context-group purpose="location"><context context-type="linenumber">395</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg141" approved="yes">
-        <source xml:space="preserve">Show or hide the main Window</source>
-        <target xml:space="preserve">Show or hide the main Window</target>
-        <context-group purpose="location"><context context-type="linenumber">396</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">387</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg142" approved="yes">
+      <trans-unit id="_msg141">
         <source xml:space="preserve">Encrypt the private keys that belong to your wallet</source>
-        <target xml:space="preserve">Encrypt the private keys that belong to your wallet</target>
-        <context-group purpose="location"><context context-type="linenumber">399</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">392</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg143" approved="yes">
+      <trans-unit id="_msg142">
         <source xml:space="preserve">Backup wallet to another location</source>
-        <target xml:space="preserve">Backup wallet to another location</target>
-        <context-group purpose="location"><context context-type="linenumber">401</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">394</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg144" approved="yes">
+      <trans-unit id="_msg143">
         <source xml:space="preserve">Change the passphrase used for wallet encryption</source>
-        <target xml:space="preserve">Change the passphrase used for wallet encryption</target>
-        <context-group purpose="location"><context context-type="linenumber">403</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">396</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg145" approved="yes">
+      <trans-unit id="_msg144">
         <source xml:space="preserve">Unlock wallet</source>
-        <target xml:space="preserve">Unlock wallet</target>
-        <context-group purpose="location"><context context-type="linenumber">405</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">398</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg146" approved="yes">
+      <trans-unit id="_msg145">
         <source xml:space="preserve">&amp;Lock Wallet</source>
-        <target xml:space="preserve">&amp;Lock Wallet</target>
-        <context-group purpose="location"><context context-type="linenumber">406</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">399</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg147" approved="yes">
+      <trans-unit id="_msg146">
         <source xml:space="preserve">Sign messages with your Dash addresses to prove you own them</source>
-        <target xml:space="preserve">Sign messages with your Dash addresses to prove you own them</target>
-        <context-group purpose="location"><context context-type="linenumber">408</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">401</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg148" approved="yes">
+      <trans-unit id="_msg147">
         <source xml:space="preserve">Verify messages to ensure they were signed with specified Dash addresses</source>
-        <target xml:space="preserve">Verify messages to ensure they were signed with specified Dash addresses</target>
-        <context-group purpose="location"><context context-type="linenumber">410</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">403</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg149" approved="yes">
+      <trans-unit id="_msg148">
         <source xml:space="preserve">&amp;Information</source>
-        <target xml:space="preserve">&amp;Information</target>
-        <context-group purpose="location"><context context-type="linenumber">416</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">409</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg150" approved="yes">
+      <trans-unit id="_msg149">
         <source xml:space="preserve">Show diagnostic information</source>
-        <target xml:space="preserve">Show diagnostic information</target>
-        <context-group purpose="location"><context context-type="linenumber">417</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">410</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg151" approved="yes">
+      <trans-unit id="_msg150">
         <source xml:space="preserve">&amp;Debug console</source>
-        <target xml:space="preserve">&amp;Debug console</target>
-        <context-group purpose="location"><context context-type="linenumber">418</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">411</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg152" approved="yes">
+      <trans-unit id="_msg151">
         <source xml:space="preserve">&amp;Network Monitor</source>
-        <target xml:space="preserve">&amp;Network Monitor</target>
-        <context-group purpose="location"><context context-type="linenumber">420</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">413</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg153" approved="yes">
+      <trans-unit id="_msg152">
         <source xml:space="preserve">Show network monitor</source>
-        <target xml:space="preserve">Show network monitor</target>
-        <context-group purpose="location"><context context-type="linenumber">421</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">414</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg154" approved="yes">
+      <trans-unit id="_msg153">
         <source xml:space="preserve">&amp;Peers list</source>
-        <target xml:space="preserve">&amp;Peers list</target>
-        <context-group purpose="location"><context context-type="linenumber">422</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">415</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg155" approved="yes">
+      <trans-unit id="_msg154">
         <source xml:space="preserve">Show peers info</source>
-        <target xml:space="preserve">Show peers info</target>
-        <context-group purpose="location"><context context-type="linenumber">423</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">416</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg156" approved="yes">
+      <trans-unit id="_msg155">
         <source xml:space="preserve">Wallet &amp;Repair</source>
-        <target xml:space="preserve">Wallet &amp;Repair</target>
-        <context-group purpose="location"><context context-type="linenumber">424</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">417</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg157" approved="yes">
+      <trans-unit id="_msg156">
         <source xml:space="preserve">Show wallet repair options</source>
-        <target xml:space="preserve">Show wallet repair options</target>
-        <context-group purpose="location"><context context-type="linenumber">425</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg158" approved="yes">
-        <source xml:space="preserve">Open Wallet &amp;Configuration File</source>
-        <target xml:space="preserve">Open Wallet &amp;Configuration File</target>
-        <context-group purpose="location"><context context-type="linenumber">426</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">418</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg159" approved="yes">
+      <trans-unit id="_msg157">
         <source xml:space="preserve">Open configuration file</source>
-        <target xml:space="preserve">Open configuration file</target>
-        <context-group purpose="location"><context context-type="linenumber">427</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">420</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg160" approved="yes">
+      <trans-unit id="_msg158">
         <source xml:space="preserve">Show Automatic &amp;Backups</source>
-        <target xml:space="preserve">Show Automatic &amp;Backups</target>
-        <context-group purpose="location"><context context-type="linenumber">430</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">423</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg161" approved="yes">
+      <trans-unit id="_msg159">
         <source xml:space="preserve">Show automatically created wallet backups</source>
-        <target xml:space="preserve">Show automatically created wallet backups</target>
-        <context-group purpose="location"><context context-type="linenumber">431</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">424</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg162" approved="yes">
+      <trans-unit id="_msg160">
         <source xml:space="preserve">Show the list of used sending addresses and labels</source>
-        <target xml:space="preserve">Show the list of used sending addresses and labels</target>
-        <context-group purpose="location"><context context-type="linenumber">441</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">434</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg163" approved="yes">
+      <trans-unit id="_msg161">
         <source xml:space="preserve">Show the list of used receiving addresses and labels</source>
-        <target xml:space="preserve">Show the list of used receiving addresses and labels</target>
-        <context-group purpose="location"><context context-type="linenumber">443</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">436</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg164" approved="yes">
+      <trans-unit id="_msg162">
         <source xml:space="preserve">&amp;Command-line options</source>
-        <target xml:space="preserve">&amp;Command-line options</target>
-        <context-group purpose="location"><context context-type="linenumber">463</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">462</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg165" approved="yes">
+      <trans-unit id="_msg163">
         <source xml:space="preserve">Show the %1 help message to get a list with possible Dash command-line options</source>
-        <target xml:space="preserve">Show the %1 help message to get a list with possible Dash command-line options</target>
-        <context-group purpose="location"><context context-type="linenumber">465</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">464</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg166" approved="yes">
+      <trans-unit id="_msg164">
         <source xml:space="preserve">default wallet</source>
-        <target xml:space="preserve">default wallet</target>
-        <context-group purpose="location"><context context-type="linenumber">522</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">520</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg167" approved="yes">
+      <trans-unit id="_msg165">
         <source xml:space="preserve">%1 client</source>
-        <target xml:space="preserve">%1 client</target>
-        <context-group purpose="location"><context context-type="linenumber">1030</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">1060</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg168" approved="yes">
+      <trans-unit id="_msg166">
         <source xml:space="preserve">Wallet: %1
 </source>
-        <target xml:space="preserve">Wallet: %1
-</target>
-        <context-group purpose="location"><context context-type="linenumber">1805</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">1862</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg169" approved="yes">
+      <trans-unit id="_msg167">
         <source xml:space="preserve">Wallet is &lt;b&gt;unencrypted&lt;/b&gt;</source>
-        <target xml:space="preserve">Wallet is &lt;b&gt;unencrypted&lt;/b&gt;</target>
-        <context-group purpose="location"><context context-type="linenumber">1880</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">1943</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg170" approved="yes">
+      <trans-unit id="_msg168">
         <source xml:space="preserve">&amp;File</source>
-        <target xml:space="preserve">&amp;File</target>
-        <context-group purpose="location"><context context-type="linenumber">575</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">593</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg171" approved="yes">
+      <trans-unit id="_msg169">
         <source xml:space="preserve">Show information about %1</source>
-        <target xml:space="preserve">Show information about %1</target>
-        <context-group purpose="location"><context context-type="linenumber">385</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">380</context></context-group>
+      </trans-unit>
+      <trans-unit id="_msg170">
+        <source xml:space="preserve">Load PSBT from &amp;clipboard…</source>
+        <context-group purpose="location"><context context-type="linenumber">406</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg172" approved="yes">
+      <trans-unit id="_msg171">
         <source xml:space="preserve">Open debugging and diagnostic console</source>
-        <target xml:space="preserve">Open debugging and diagnostic console</target>
+        <context-group purpose="location"><context context-type="linenumber">412</context></context-group>
+      </trans-unit>
+      <trans-unit id="_msg172">
+        <source xml:space="preserve">Open &amp;wallet configuration file</source>
         <context-group purpose="location"><context context-type="linenumber">419</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg173" approved="yes">
+      <trans-unit id="_msg173">
         <source xml:space="preserve">Open a dash: URI</source>
-        <target xml:space="preserve">Open a dash: URI</target>
-        <context-group purpose="location"><context context-type="linenumber">446</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">439</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg174" approved="yes">
+      <trans-unit id="_msg174">
         <source xml:space="preserve">Create a new wallet</source>
-        <target xml:space="preserve">Create a new wallet</target>
-        <context-group purpose="location"><context context-type="linenumber">458</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">451</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg175" approved="yes">
-        <source xml:space="preserve">Close all wallets</source>
-        <target xml:space="preserve">Close all wallets</target>
-        <context-group purpose="location"><context context-type="linenumber">461</context></context-group>
+      <trans-unit id="_msg175">
+        <source xml:space="preserve">Restore Wallet…</source>
+        <context-group purpose="location"><context context-type="linenumber">454</context></context-group>
+        <note annotates="source" from="developer">Name of the menu item that restores wallet from a backup file.</note>
       </trans-unit>
-      <trans-unit id="_msg176" approved="yes">
+      <trans-unit id="_msg176">
+        <source xml:space="preserve">Restore a wallet from a backup file</source>
+        <context-group purpose="location"><context context-type="linenumber">457</context></context-group>
+        <note annotates="source" from="developer">Status tip for Restore Wallet menu item</note>
+      </trans-unit>
+      <trans-unit id="_msg177">
+        <source xml:space="preserve">Close all wallets</source>
+        <context-group purpose="location"><context context-type="linenumber">460</context></context-group>
+      </trans-unit>
+      <trans-unit id="_msg178">
         <source xml:space="preserve">%1 &amp;information</source>
-        <target xml:space="preserve">%1 &amp;information</target>
-        <context-group purpose="location"><context context-type="linenumber">467</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">466</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg177" approved="yes">
+      <trans-unit id="_msg179">
         <source xml:space="preserve">Show the %1 basic information</source>
-        <target xml:space="preserve">Show the %1 basic information</target>
-        <context-group purpose="location"><context context-type="linenumber">469</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">468</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg178" approved="yes">
+      <trans-unit id="_msg180">
         <source xml:space="preserve">&amp;Discreet mode</source>
-        <target xml:space="preserve">&amp;Discreet mode</target>
-        <context-group purpose="location"><context context-type="linenumber">471</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">470</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg179" approved="yes">
+      <trans-unit id="_msg181">
         <source xml:space="preserve">Mask the values in the Overview tab</source>
-        <target xml:space="preserve"></target>
-        <context-group purpose="location"><context context-type="linenumber">473</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">472</context></context-group>
+      </trans-unit>
+      <trans-unit id="_msg182">
+        <source xml:space="preserve">Wallet Data</source>
+        <context-group purpose="location"><context context-type="linenumber">546</context></context-group>
+        <note annotates="source" from="developer">Name of the wallet data file format.</note>
+      </trans-unit>
+      <trans-unit id="_msg183">
+        <source xml:space="preserve">Load Wallet Backup</source>
+        <context-group purpose="location"><context context-type="linenumber">549</context></context-group>
+        <note annotates="source" from="developer">The title for Restore Wallet File Windows</note>
+      </trans-unit>
+      <trans-unit id="_msg184">
+        <source xml:space="preserve">Restore Wallet</source>
+        <context-group purpose="location"><context context-type="linenumber">557</context></context-group>
+        <note annotates="source" from="developer">Title of pop-up window shown when the user is attempting to restore a wallet.</note>
+      </trans-unit>
+      <trans-unit id="_msg185">
+        <source xml:space="preserve">Wallet Name</source>
+        <context-group purpose="location"><context context-type="linenumber">559</context></context-group>
+        <note annotates="source" from="developer">Label of the input field where the name of the wallet is entered.</note>
       </trans-unit>
-      <trans-unit id="_msg180" approved="yes">
+      <trans-unit id="_msg186">
         <source xml:space="preserve">&amp;Settings</source>
-        <target xml:space="preserve">&amp;Settings</target>
-        <context-group purpose="location"><context context-type="linenumber">598</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">618</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg181" approved="yes">
+      <trans-unit id="_msg187">
+        <source xml:space="preserve">&amp;Minimize</source>
+        <context-group purpose="location"><context context-type="linenumber">633</context></context-group>
+      </trans-unit>
+      <trans-unit id="_msg188">
         <source xml:space="preserve">&amp;Help</source>
-        <target xml:space="preserve">&amp;Help</target>
-        <context-group purpose="location"><context context-type="linenumber">661</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">681</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg182" approved="yes">
+      <trans-unit id="_msg189">
         <source xml:space="preserve">Tabs toolbar</source>
-        <target xml:space="preserve">Tabs toolbar</target>
-        <context-group purpose="location"><context context-type="linenumber">674</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">694</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg183" approved="yes">
+      <trans-unit id="_msg190">
         <source xml:space="preserve">&amp;Governance</source>
-        <target xml:space="preserve">&amp;Governance</target>
-        <context-group purpose="location"><context context-type="linenumber">719</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">739</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg184" approved="yes">
+      <trans-unit id="_msg191">
         <source xml:space="preserve">View Governance Proposals</source>
-        <target xml:space="preserve">View Governance Proposals</target>
-        <context-group purpose="location"><context context-type="linenumber">720</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">740</context></context-group>
+      </trans-unit>
+      <trans-unit id="_msg192">
+        <source xml:space="preserve">&amp;Hide</source>
+        <context-group purpose="location"><context context-type="linenumber">1121</context></context-group>
+      </trans-unit>
+      <trans-unit id="_msg193">
+        <source xml:space="preserve">S&amp;how</source>
+        <context-group purpose="location"><context context-type="linenumber">1122</context></context-group>
       </trans-unit>
       <group restype="x-gettext-plurals">
-        <context-group purpose="location"><context context-type="linenumber">1293</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">1351</context></context-group>
         <note annotates="source" from="developer">A substring of the tooltip.</note>
-        <trans-unit id="_msg185[0]" approved="yes">
+        <trans-unit id="_msg194[0]">
           <source xml:space="preserve">%n active connection(s) to Dash network</source>
-          <target xml:space="preserve">%n active connection to Dash network</target>
         </trans-unit>
-        <trans-unit id="_msg185[1]" approved="yes">
+        <trans-unit id="_msg194[1]">
           <source xml:space="preserve">%n active connection(s) to Dash network</source>
-          <target xml:space="preserve">%n active connections to Dash network</target>
         </trans-unit>
       </group>
-      <trans-unit id="_msg186" approved="yes">
+      <trans-unit id="_msg195">
         <source xml:space="preserve">Network activity disabled</source>
-        <target xml:space="preserve">Network activity disabled</target>
-        <context-group purpose="location"><context context-type="linenumber">1295</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">1353</context></context-group>
       </trans-unit>
       <group restype="x-gettext-plurals">
-        <context-group purpose="location"><context context-type="linenumber">1495</context></context-group>
-        <trans-unit id="_msg187[0]" approved="yes">
+        <context-group purpose="location"><context context-type="linenumber">1552</context></context-group>
+        <trans-unit id="_msg196[0]">
           <source xml:space="preserve">Processed %n block(s) of transaction history.</source>
-          <target xml:space="preserve">Processed %n block of transaction history.</target>
         </trans-unit>
-        <trans-unit id="_msg187[1]" approved="yes">
+        <trans-unit id="_msg196[1]">
           <source xml:space="preserve">Processed %n block(s) of transaction history.</source>
-          <target xml:space="preserve">Processed %n blocks of transaction history.</target>
         </trans-unit>
       </group>
-      <trans-unit id="_msg188" approved="yes">
+      <trans-unit id="_msg197">
         <source xml:space="preserve">%1 behind</source>
-        <target xml:space="preserve">%1 behind</target>
-        <context-group purpose="location"><context context-type="linenumber">1514</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">1571</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg189" approved="yes">
+      <trans-unit id="_msg198">
         <source xml:space="preserve">Close Wallet…</source>
-        <target xml:space="preserve">Close Wallet…</target>
-        <context-group purpose="location"><context context-type="linenumber">453</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">446</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg190">
+      <trans-unit id="_msg199">
         <source xml:space="preserve">Load Partially Signed Blockchain Transaction</source>
-        <target xml:space="preserve"></target>
-        <context-group purpose="location"><context context-type="linenumber">412</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">405</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg191">
+      <trans-unit id="_msg200">
         <source xml:space="preserve">Load Partially Signed Blockchain Transaction from clipboard</source>
-        <target xml:space="preserve"></target>
-        <context-group purpose="location"><context context-type="linenumber">414</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">407</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg192" approved="yes">
+      <trans-unit id="_msg201">
         <source xml:space="preserve">Create Wallet…</source>
-        <target xml:space="preserve">Create Wallet…</target>
-        <context-group purpose="location"><context context-type="linenumber">456</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">449</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg193" approved="yes">
+      <trans-unit id="_msg202">
         <source xml:space="preserve">Close All Wallets…</source>
-        <target xml:space="preserve">Close All Wallets…</target>
-        <context-group purpose="location"><context context-type="linenumber">460</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">459</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg194" approved="yes">
+      <trans-unit id="_msg203">
         <source xml:space="preserve">Ctrl+Shift+D</source>
-        <target xml:space="preserve">Ctrl+Shift+D</target>
-        <context-group purpose="location"><context context-type="linenumber">472</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">471</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg195" approved="yes">
+      <trans-unit id="_msg204">
         <source xml:space="preserve">Ctrl+M</source>
-        <target xml:space="preserve">Ctrl+M</target>
-        <context-group purpose="location"><context context-type="linenumber">614</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">634</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg196" approved="yes">
+      <trans-unit id="_msg205">
         <source xml:space="preserve">Click for more actions.</source>
-        <target xml:space="preserve">Click for more actions.</target>
-        <context-group purpose="location"><context context-type="linenumber">1303</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">1361</context></context-group>
         <note annotates="source" from="developer">A substring of the tooltip. &quot;More actions&quot; are available via the context menu.</note>
       </trans-unit>
-      <trans-unit id="_msg197" approved="yes">
+      <trans-unit id="_msg206">
         <source xml:space="preserve">Show Peers tab</source>
-        <target xml:space="preserve">Show Peers tab</target>
-        <context-group purpose="location"><context context-type="linenumber">1326</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">1384</context></context-group>
         <note annotates="source" from="developer">A context menu item. The &quot;Peers tab&quot; is an element of the &quot;Node window&quot;.</note>
       </trans-unit>
-      <trans-unit id="_msg198" approved="yes">
+      <trans-unit id="_msg207">
         <source xml:space="preserve">Disable network activity</source>
-        <target xml:space="preserve">Disable network activity</target>
-        <context-group purpose="location"><context context-type="linenumber">1334</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">1392</context></context-group>
         <note annotates="source" from="developer">A context menu item.</note>
       </trans-unit>
-      <trans-unit id="_msg199" approved="yes">
+      <trans-unit id="_msg208">
         <source xml:space="preserve">Enable network activity</source>
-        <target xml:space="preserve">Enable network activity</target>
-        <context-group purpose="location"><context context-type="linenumber">1336</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">1394</context></context-group>
         <note annotates="source" from="developer">A context menu item. The network activity was disabled previously.</note>
       </trans-unit>
-      <trans-unit id="_msg200" approved="yes">
+      <trans-unit id="_msg209">
         <source xml:space="preserve">Syncing Headers (%1%)…</source>
-        <target xml:space="preserve">Syncing Headers (%1%)…</target>
-        <context-group purpose="location"><context context-type="linenumber">1346</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">1404</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg201" approved="yes">
+      <trans-unit id="_msg210">
         <source xml:space="preserve">Synchronizing with network…</source>
-        <target xml:space="preserve">Synchronizing with network…</target>
-        <context-group purpose="location"><context context-type="linenumber">1469</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">1529</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg202" approved="yes">
+      <trans-unit id="_msg211">
         <source xml:space="preserve">Indexing blocks on disk…</source>
-        <target xml:space="preserve">Indexing blocks on disk…</target>
-        <context-group purpose="location"><context context-type="linenumber">1474</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">1534</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg203" approved="yes">
+      <trans-unit id="_msg212">
         <source xml:space="preserve">Processing blocks on disk…</source>
-        <target xml:space="preserve">Processing blocks on disk…</target>
-        <context-group purpose="location"><context context-type="linenumber">1476</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg204" approved="yes">
-        <source xml:space="preserve">Reindexing blocks on disk…</source>
-        <target xml:space="preserve">Reindexing blocks on disk…</target>
-        <context-group purpose="location"><context context-type="linenumber">1480</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">1536</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg205" approved="yes">
+      <trans-unit id="_msg213">
         <source xml:space="preserve">Connecting to peers…</source>
-        <target xml:space="preserve">Connecting to peers…</target>
-        <context-group purpose="location"><context context-type="linenumber">1486</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">1543</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg206" approved="yes">
+      <trans-unit id="_msg214">
         <source xml:space="preserve">Catching up…</source>
-        <target xml:space="preserve">Catching up…</target>
-        <context-group purpose="location"><context context-type="linenumber">1518</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">1575</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg207" approved="yes">
+      <trans-unit id="_msg215">
         <source xml:space="preserve">Last received block was generated %1 ago.</source>
-        <target xml:space="preserve">Last received block was generated %1 ago.</target>
-        <context-group purpose="location"><context context-type="linenumber">1528</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">1585</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg208" approved="yes">
+      <trans-unit id="_msg216">
         <source xml:space="preserve">Transactions after this will not yet be visible.</source>
-        <target xml:space="preserve">Transactions after this will not yet be visible.</target>
-        <context-group purpose="location"><context context-type="linenumber">1530</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">1587</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg209" approved="yes">
+      <trans-unit id="_msg217">
         <source xml:space="preserve">Up to date</source>
-        <target xml:space="preserve">Up to date</target>
-        <context-group purpose="location"><context context-type="linenumber">1569</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">1626</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg210" approved="yes">
+      <trans-unit id="_msg218">
         <source xml:space="preserve">Synchronizing additional data: %p%</source>
-        <target xml:space="preserve">Synchronizing additional data: %p%</target>
-        <context-group purpose="location"><context context-type="linenumber">1582</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">1639</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg211" approved="yes">
+      <trans-unit id="_msg219">
         <source xml:space="preserve">Error</source>
-        <target xml:space="preserve">Error</target>
-        <context-group purpose="location"><context context-type="linenumber">1613</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">1670</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg212" approved="yes">
+      <trans-unit id="_msg220">
         <source xml:space="preserve">Error: %1</source>
-        <target xml:space="preserve">Error: %1</target>
-        <context-group purpose="location"><context context-type="linenumber">1614</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">1671</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg213" approved="yes">
+      <trans-unit id="_msg221">
         <source xml:space="preserve">Warning</source>
-        <target xml:space="preserve">Warning</target>
-        <context-group purpose="location"><context context-type="linenumber">1617</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">1674</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg214" approved="yes">
+      <trans-unit id="_msg222">
         <source xml:space="preserve">Warning: %1</source>
-        <target xml:space="preserve">Warning: %1</target>
-        <context-group purpose="location"><context context-type="linenumber">1618</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">1675</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg215" approved="yes">
+      <trans-unit id="_msg223">
         <source xml:space="preserve">Information</source>
-        <target xml:space="preserve">Information</target>
-        <context-group purpose="location"><context context-type="linenumber">1621</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">1678</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg216" approved="yes">
+      <trans-unit id="_msg224">
         <source xml:space="preserve">Received and sent multiple transactions</source>
-        <target xml:space="preserve">Received and sent multiple transactions</target>
-        <context-group purpose="location"><context context-type="linenumber">1778</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">1835</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg217" approved="yes">
+      <trans-unit id="_msg225">
         <source xml:space="preserve">Sent multiple transactions</source>
-        <target xml:space="preserve">Sent multiple transactions</target>
-        <context-group purpose="location"><context context-type="linenumber">1780</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">1837</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg218" approved="yes">
+      <trans-unit id="_msg226">
         <source xml:space="preserve">Received multiple transactions</source>
-        <target xml:space="preserve">Received multiple transactions</target>
-        <context-group purpose="location"><context context-type="linenumber">1782</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">1839</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg219" approved="yes">
+      <trans-unit id="_msg227">
         <source xml:space="preserve">Sent Amount: %1
 </source>
-        <target xml:space="preserve">Sent Amount: %1
-</target>
-        <context-group purpose="location"><context context-type="linenumber">1792</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">1849</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg220" approved="yes">
+      <trans-unit id="_msg228">
         <source xml:space="preserve">Received Amount: %1
 </source>
-        <target xml:space="preserve">Received Amount: %1
-</target>
-        <context-group purpose="location"><context context-type="linenumber">1795</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">1852</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg221" approved="yes">
+      <trans-unit id="_msg229">
         <source xml:space="preserve">Date: %1
 </source>
-        <target xml:space="preserve">Date: %1
-</target>
-        <context-group purpose="location"><context context-type="linenumber">1802</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">1859</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg222" approved="yes">
+      <trans-unit id="_msg230">
         <source xml:space="preserve">Amount: %1
 </source>
-        <target xml:space="preserve">Amount: %1
-</target>
-        <context-group purpose="location"><context context-type="linenumber">1803</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">1860</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg223" approved="yes">
+      <trans-unit id="_msg231">
         <source xml:space="preserve">Type: %1
 </source>
-        <target xml:space="preserve">Type: %1
-</target>
-        <context-group purpose="location"><context context-type="linenumber">1807</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">1864</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg224" approved="yes">
+      <trans-unit id="_msg232">
         <source xml:space="preserve">Label: %1
 </source>
-        <target xml:space="preserve">Label: %1
-</target>
-        <context-group purpose="location"><context context-type="linenumber">1809</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">1866</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg225" approved="yes">
+      <trans-unit id="_msg233">
         <source xml:space="preserve">Address: %1
 </source>
-        <target xml:space="preserve">Address: %1
-</target>
-        <context-group purpose="location"><context context-type="linenumber">1811</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">1868</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg226" approved="yes">
+      <trans-unit id="_msg234">
         <source xml:space="preserve">Sent transaction</source>
-        <target xml:space="preserve">Sent transaction</target>
-        <context-group purpose="location"><context context-type="linenumber">1812</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">1869</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg227" approved="yes">
+      <trans-unit id="_msg235">
         <source xml:space="preserve">Incoming transaction</source>
-        <target xml:space="preserve">Incoming transaction</target>
-        <context-group purpose="location"><context context-type="linenumber">1812</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">1869</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg228" approved="yes">
+      <trans-unit id="_msg236">
         <source xml:space="preserve">HD key generation is &lt;b&gt;enabled&lt;/b&gt;</source>
-        <target xml:space="preserve">HD key generation is &lt;b&gt;enabled&lt;/b&gt;</target>
-        <context-group purpose="location"><context context-type="linenumber">1867</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">1924</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg229" approved="yes">
+      <trans-unit id="_msg237">
         <source xml:space="preserve">Wallet is &lt;b&gt;encrypted&lt;/b&gt; and currently &lt;b&gt;unlocked&lt;/b&gt;</source>
-        <target xml:space="preserve">Wallet is &lt;b&gt;encrypted&lt;/b&gt; and currently &lt;b&gt;unlocked&lt;/b&gt;</target>
-        <context-group purpose="location"><context context-type="linenumber">1889</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">1952</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg230" approved="yes">
+      <trans-unit id="_msg238">
         <source xml:space="preserve">Wallet is &lt;b&gt;encrypted&lt;/b&gt; and currently &lt;b&gt;unlocked&lt;/b&gt; for mixing only</source>
-        <target xml:space="preserve">Wallet is &lt;b&gt;encrypted&lt;/b&gt; and currently &lt;b&gt;unlocked&lt;/b&gt; for mixing only</target>
-        <context-group purpose="location"><context context-type="linenumber">1898</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">1961</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg231" approved="yes">
+      <trans-unit id="_msg239">
         <source xml:space="preserve">Wallet is &lt;b&gt;encrypted&lt;/b&gt; and currently &lt;b&gt;locked&lt;/b&gt;</source>
-        <target xml:space="preserve">Wallet is &lt;b&gt;encrypted&lt;/b&gt; and currently &lt;b&gt;locked&lt;/b&gt;</target>
-        <context-group purpose="location"><context context-type="linenumber">1907</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">1970</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg232" approved="yes">
+      <trans-unit id="_msg240">
         <source xml:space="preserve">Proxy is &lt;b&gt;enabled&lt;/b&gt;: %1</source>
-        <target xml:space="preserve">Proxy is &lt;b&gt;enabled&lt;/b&gt;: %1</target>
-        <context-group purpose="location"><context context-type="linenumber">1939</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">2002</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg233" approved="yes">
+      <trans-unit id="_msg241">
         <source xml:space="preserve">Original message:</source>
-        <target xml:space="preserve">Original message:</target>
-        <context-group purpose="location"><context context-type="linenumber">2031</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">2094</context></context-group>
       </trans-unit>
     </group>
     <group restype="x-trolltech-linguist-context" resname="UnitDisplayStatusBarControl">
-      <trans-unit id="_msg234" approved="yes">
+      <trans-unit id="_msg242">
         <source xml:space="preserve">Unit to show amounts in. Click to select another unit.</source>
-        <target xml:space="preserve">Unit to show amounts in. Click to select another unit.</target>
-        <context-group purpose="location"><context context-type="linenumber">2078</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">2141</context></context-group>
       </trans-unit>
     </group>
   </body></file>
-  <file original="../forms/coincontroldialog.ui" datatype="x-trolltech-designer-ui" source-language="en" target-language="en"><body>
+  <file original="../forms/coincontroldialog.ui" datatype="x-trolltech-designer-ui" source-language="en"><body>
     <group restype="x-trolltech-linguist-context" resname="CoinControlDialog">
-      <trans-unit id="_msg235" approved="yes">
+      <trans-unit id="_msg243">
         <source xml:space="preserve">Quantity:</source>
-        <target xml:space="preserve">Quantity:</target>
-        <context-group purpose="location"><context context-type="linenumber">42</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">45</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg236" approved="yes">
+      <trans-unit id="_msg244">
         <source xml:space="preserve">Bytes:</source>
-        <target xml:space="preserve">Bytes:</target>
-        <context-group purpose="location"><context context-type="linenumber">65</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">68</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg237" approved="yes">
+      <trans-unit id="_msg245">
         <source xml:space="preserve">Amount:</source>
-        <target xml:space="preserve">Amount:</target>
-        <context-group purpose="location"><context context-type="linenumber">104</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">107</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg238" approved="yes">
+      <trans-unit id="_msg246">
         <source xml:space="preserve">Fee:</source>
-        <target xml:space="preserve">Fee:</target>
-        <context-group purpose="location"><context context-type="linenumber">172</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">146</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg239" approved="yes">
+      <trans-unit id="_msg247">
         <source xml:space="preserve">Coin Selection</source>
-        <target xml:space="preserve">Coin Selection</target>
         <context-group purpose="location"><context context-type="linenumber">14</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg240" approved="yes">
-        <source xml:space="preserve">Dust:</source>
-        <target xml:space="preserve">Dust:</target>
-        <context-group purpose="location"><context context-type="linenumber">130</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg241" approved="yes">
+      <trans-unit id="_msg248">
         <source xml:space="preserve">After Fee:</source>
-        <target xml:space="preserve">After Fee:</target>
-        <context-group purpose="location"><context context-type="linenumber">211</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">188</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg242" approved="yes">
+      <trans-unit id="_msg249">
         <source xml:space="preserve">Change:</source>
-        <target xml:space="preserve">Change:</target>
-        <context-group purpose="location"><context context-type="linenumber">237</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">214</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg243" approved="yes">
+      <trans-unit id="_msg250">
         <source xml:space="preserve">(un)select all</source>
-        <target xml:space="preserve">(un)select all</target>
-        <context-group purpose="location"><context context-type="linenumber">293</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">270</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg244" approved="yes">
+      <trans-unit id="_msg251">
         <source xml:space="preserve">toggle lock state</source>
-        <target xml:space="preserve">toggle lock state</target>
-        <context-group purpose="location"><context context-type="linenumber">309</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">286</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg245" approved="yes">
+      <trans-unit id="_msg252">
         <source xml:space="preserve">Tree mode</source>
-        <target xml:space="preserve">Tree mode</target>
-        <context-group purpose="location"><context context-type="linenumber">341</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">318</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg246" approved="yes">
+      <trans-unit id="_msg253">
         <source xml:space="preserve">List mode</source>
-        <target xml:space="preserve">List mode</target>
-        <context-group purpose="location"><context context-type="linenumber">354</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">331</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg247" approved="yes">
+      <trans-unit id="_msg254">
         <source xml:space="preserve">(1 locked)</source>
-        <target xml:space="preserve">(1 locked)</target>
-        <context-group purpose="location"><context context-type="linenumber">364</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">341</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg248" approved="yes">
+      <trans-unit id="_msg255">
         <source xml:space="preserve">Amount</source>
-        <target xml:space="preserve">Amount</target>
-        <context-group purpose="location"><context context-type="linenumber">410</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">387</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg249" approved="yes">
+      <trans-unit id="_msg256">
         <source xml:space="preserve">Received with label</source>
-        <target xml:space="preserve">Received with label</target>
-        <context-group purpose="location"><context context-type="linenumber">415</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">392</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg250" approved="yes">
+      <trans-unit id="_msg257">
         <source xml:space="preserve">Received with address</source>
-        <target xml:space="preserve">Received with address</target>
-        <context-group purpose="location"><context context-type="linenumber">420</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">397</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg251" approved="yes">
+      <trans-unit id="_msg258">
         <source xml:space="preserve">Mixing Rounds</source>
-        <target xml:space="preserve">Mixing Rounds</target>
-        <context-group purpose="location"><context context-type="linenumber">425</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">402</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg252" approved="yes">
+      <trans-unit id="_msg259">
         <source xml:space="preserve">Date</source>
-        <target xml:space="preserve">Date</target>
-        <context-group purpose="location"><context context-type="linenumber">430</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">407</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg253" approved="yes">
+      <trans-unit id="_msg260">
         <source xml:space="preserve">Confirmations</source>
-        <target xml:space="preserve">Confirmations</target>
-        <context-group purpose="location"><context context-type="linenumber">435</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">412</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg254" approved="yes">
+      <trans-unit id="_msg261">
         <source xml:space="preserve">Confirmed</source>
-        <target xml:space="preserve">Confirmed</target>
-        <context-group purpose="location"><context context-type="linenumber">438</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">415</context></context-group>
       </trans-unit>
     </group>
   </body></file>
-  <file original="../coincontroldialog.cpp" datatype="cpp" source-language="en" target-language="en"><body>
+  <file original="../coincontroldialog.cpp" datatype="cpp" source-language="en"><body>
     <group restype="x-trolltech-linguist-context" resname="CoinControlDialog">
-      <trans-unit id="_msg255" approved="yes">
+      <trans-unit id="_msg262">
         <source xml:space="preserve">Copy amount</source>
-        <target xml:space="preserve">Copy amount</target>
-        <context-group purpose="location"><context context-type="linenumber">78</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">79</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg256" approved="yes">
+      <trans-unit id="_msg263">
         <source xml:space="preserve">&amp;Copy address</source>
-        <target xml:space="preserve">&amp;Copy address</target>
-        <context-group purpose="location"><context context-type="linenumber">67</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">68</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg257" approved="yes">
+      <trans-unit id="_msg264">
         <source xml:space="preserve">Copy &amp;label</source>
-        <target xml:space="preserve">Copy &amp;label</target>
-        <context-group purpose="location"><context context-type="linenumber">68</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">69</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg258" approved="yes">
+      <trans-unit id="_msg265">
         <source xml:space="preserve">Copy &amp;amount</source>
-        <target xml:space="preserve">Copy &amp;amount</target>
-        <context-group purpose="location"><context context-type="linenumber">69</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">70</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg259" approved="yes">
+      <trans-unit id="_msg266">
         <source xml:space="preserve">Copy transaction &amp;ID and output index</source>
-        <target xml:space="preserve">Copy transaction &amp;ID and output index</target>
-        <context-group purpose="location"><context context-type="linenumber">70</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">71</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg260" approved="yes">
+      <trans-unit id="_msg267">
         <source xml:space="preserve">L&amp;ock unspent</source>
-        <target xml:space="preserve">L&amp;ock unspent</target>
-        <context-group purpose="location"><context context-type="linenumber">72</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">73</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg261" approved="yes">
+      <trans-unit id="_msg268">
         <source xml:space="preserve">&amp;Unlock unspent</source>
-        <target xml:space="preserve">&amp;Unlock unspent</target>
-        <context-group purpose="location"><context context-type="linenumber">73</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">74</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg262" approved="yes">
+      <trans-unit id="_msg269">
         <source xml:space="preserve">Copy quantity</source>
-        <target xml:space="preserve">Copy quantity</target>
-        <context-group purpose="location"><context context-type="linenumber">77</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">78</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg263" approved="yes">
+      <trans-unit id="_msg270">
         <source xml:space="preserve">Copy fee</source>
-        <target xml:space="preserve">Copy fee</target>
-        <context-group purpose="location"><context context-type="linenumber">79</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg264" approved="yes">
-        <source xml:space="preserve">Copy after fee</source>
-        <target xml:space="preserve">Copy after fee</target>
         <context-group purpose="location"><context context-type="linenumber">80</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg265" approved="yes">
-        <source xml:space="preserve">Copy bytes</source>
-        <target xml:space="preserve">Copy bytes</target>
+      <trans-unit id="_msg271">
+        <source xml:space="preserve">Copy after fee</source>
         <context-group purpose="location"><context context-type="linenumber">81</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg266" approved="yes">
-        <source xml:space="preserve">Copy dust</source>
-        <target xml:space="preserve">Copy dust</target>
+      <trans-unit id="_msg272">
+        <source xml:space="preserve">Copy bytes</source>
         <context-group purpose="location"><context context-type="linenumber">82</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg267" approved="yes">
+      <trans-unit id="_msg273">
         <source xml:space="preserve">Copy change</source>
-        <target xml:space="preserve">Copy change</target>
         <context-group purpose="location"><context context-type="linenumber">83</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg268" approved="yes">
+      <trans-unit id="_msg274">
         <source xml:space="preserve">Please switch to &quot;List mode&quot; to use this function.</source>
-        <target xml:space="preserve">Please switch to &quot;List mode&quot; to use this function.</target>
-        <context-group purpose="location"><context context-type="linenumber">222</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">220</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg269" approved="yes">
+      <trans-unit id="_msg275">
         <source xml:space="preserve">(%1 locked)</source>
-        <target xml:space="preserve">(%1 locked)</target>
-        <context-group purpose="location"><context context-type="linenumber">432</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg270" approved="yes">
-        <source xml:space="preserve">yes</source>
-        <target xml:space="preserve">yes</target>
-        <context-group purpose="location"><context context-type="linenumber">589</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg271" approved="yes">
-        <source xml:space="preserve">no</source>
-        <target xml:space="preserve">no</target>
-        <context-group purpose="location"><context context-type="linenumber">589</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg272" approved="yes">
-        <source xml:space="preserve">This label turns red if any recipient receives an amount smaller than the current dust threshold.</source>
-        <target xml:space="preserve">This label turns red if any recipient receives an amount smaller than the current dust threshold.</target>
-        <context-group purpose="location"><context context-type="linenumber">603</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">424</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg273" approved="yes">
+      <trans-unit id="_msg276">
         <source xml:space="preserve">Can vary +/- %1 duff(s) per input.</source>
-        <target xml:space="preserve">Can vary +/- %1 duff(s) per input.</target>
-        <context-group purpose="location"><context context-type="linenumber">608</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">580</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg274" approved="yes">
+      <trans-unit id="_msg277">
         <source xml:space="preserve">Some coins were unselected because they were spent.</source>
-        <target xml:space="preserve">Some coins were unselected because they were spent.</target>
-        <context-group purpose="location"><context context-type="linenumber">628</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">598</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg275" approved="yes">
+      <trans-unit id="_msg278">
         <source xml:space="preserve">Show all coins</source>
-        <target xml:space="preserve">Show all coins</target>
-        <context-group purpose="location"><context context-type="linenumber">652</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">622</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg276" approved="yes">
+      <trans-unit id="_msg279">
         <source xml:space="preserve">Hide %1 coins</source>
-        <target xml:space="preserve">Hide %1 coins</target>
-        <context-group purpose="location"><context context-type="linenumber">654</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">624</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg277" approved="yes">
+      <trans-unit id="_msg280">
         <source xml:space="preserve">Show all %1 coins</source>
-        <target xml:space="preserve">Show all %1 coins</target>
-        <context-group purpose="location"><context context-type="linenumber">658</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">628</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg278" approved="yes">
+      <trans-unit id="_msg281">
         <source xml:space="preserve">Show spendable coins only</source>
-        <target xml:space="preserve">Show spendable coins only</target>
-        <context-group purpose="location"><context context-type="linenumber">660</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">630</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg279" approved="yes">
+      <trans-unit id="_msg282">
         <source xml:space="preserve">(no label)</source>
-        <target xml:space="preserve">(no label)</target>
-        <context-group purpose="location"><context context-type="linenumber">680</context></context-group>
-        <context-group purpose="location"><context context-type="linenumber">755</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">650</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">725</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg280" approved="yes">
+      <trans-unit id="_msg283">
         <source xml:space="preserve">change from %1 (%2)</source>
-        <target xml:space="preserve">change from %1 (%2)</target>
-        <context-group purpose="location"><context context-type="linenumber">750</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">720</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg281" approved="yes">
+      <trans-unit id="_msg284">
         <source xml:space="preserve">(change)</source>
-        <target xml:space="preserve">(change)</target>
-        <context-group purpose="location"><context context-type="linenumber">751</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">721</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg282" approved="yes">
+      <trans-unit id="_msg285">
         <source xml:space="preserve">n/a</source>
-        <target xml:space="preserve">n/a</target>
-        <context-group purpose="location"><context context-type="linenumber">775</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">745</context></context-group>
       </trans-unit>
     </group>
   </body></file>
-  <file original="../walletcontroller.cpp" datatype="cpp" source-language="en" target-language="en"><body>
+  <file original="../walletcontroller.cpp" datatype="cpp" source-language="en"><body>
     <group restype="x-trolltech-linguist-context" resname="CreateWalletActivity">
-      <trans-unit id="_msg283" approved="yes">
+      <trans-unit id="_msg286">
         <source xml:space="preserve">Create Wallet</source>
-        <target xml:space="preserve">Create Wallet</target>
-        <context-group purpose="location"><context context-type="linenumber">258</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">244</context></context-group>
         <note annotates="source" from="developer">Title of window indicating the progress of creation of a new wallet.</note>
       </trans-unit>
-      <trans-unit id="_msg284" approved="yes">
+      <trans-unit id="_msg287">
         <source xml:space="preserve">Creating Wallet &lt;b&gt;%1&lt;/b&gt;…</source>
-        <target xml:space="preserve">Creating Wallet &lt;b&gt;%1&lt;/b&gt;…</target>
-        <context-group purpose="location"><context context-type="linenumber">261</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">247</context></context-group>
         <note annotates="source" from="developer">Descriptive text of the create wallet progress window which indicates to the user which wallet is currently being created.</note>
       </trans-unit>
-      <trans-unit id="_msg285" approved="yes">
+      <trans-unit id="_msg288">
         <source xml:space="preserve">Create wallet failed</source>
-        <target xml:space="preserve">Create wallet failed</target>
-        <context-group purpose="location"><context context-type="linenumber">289</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">277</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg286" approved="yes">
+      <trans-unit id="_msg289">
         <source xml:space="preserve">Create wallet warning</source>
-        <target xml:space="preserve">Create wallet warning</target>
-        <context-group purpose="location"><context context-type="linenumber">291</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">279</context></context-group>
+      </trans-unit>
+    </group>
+    <group restype="x-trolltech-linguist-context" resname="LoadWalletsActivity">
+      <trans-unit id="_msg290">
+        <source xml:space="preserve">Loading wallets…</source>
+        <context-group purpose="location"><context context-type="linenumber">357</context></context-group>
       </trans-unit>
     </group>
     <group restype="x-trolltech-linguist-context" resname="OpenWalletActivity">
-      <trans-unit id="_msg287" approved="yes">
+      <trans-unit id="_msg291">
         <source xml:space="preserve">Open wallet failed</source>
-        <target xml:space="preserve">Open wallet failed</target>
-        <context-group purpose="location"><context context-type="linenumber">330</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">316</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg288" approved="yes">
+      <trans-unit id="_msg292">
         <source xml:space="preserve">Open wallet warning</source>
-        <target xml:space="preserve">Open wallet warning</target>
-        <context-group purpose="location"><context context-type="linenumber">332</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">318</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg289" approved="yes">
+      <trans-unit id="_msg293">
         <source xml:space="preserve">default wallet</source>
-        <target xml:space="preserve">default wallet</target>
-        <context-group purpose="location"><context context-type="linenumber">342</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">328</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg290" approved="yes">
+      <trans-unit id="_msg294">
         <source xml:space="preserve">Open Wallet</source>
-        <target xml:space="preserve">Open Wallet</target>
-        <context-group purpose="location"><context context-type="linenumber">346</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">332</context></context-group>
         <note annotates="source" from="developer">Title of window indicating the progress of opening of a wallet.</note>
       </trans-unit>
-      <trans-unit id="_msg291" approved="yes">
+      <trans-unit id="_msg295">
         <source xml:space="preserve">Opening Wallet &lt;b&gt;%1&lt;/b&gt;…</source>
-        <target xml:space="preserve">Opening Wallet &lt;b&gt;%1&lt;/b&gt;…</target>
-        <context-group purpose="location"><context context-type="linenumber">349</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">335</context></context-group>
         <note annotates="source" from="developer">Descriptive text of the open wallet progress window which indicates to the user which wallet is currently being opened.</note>
       </trans-unit>
     </group>
+    <group restype="x-trolltech-linguist-context" resname="RestoreWalletActivity">
+      <trans-unit id="_msg296">
+        <source xml:space="preserve">Restore Wallet</source>
+        <context-group purpose="location"><context context-type="linenumber">379</context></context-group>
+        <note annotates="source" from="developer">Title of progress window which is displayed when wallets are being restored.</note>
+      </trans-unit>
+      <trans-unit id="_msg297">
+        <source xml:space="preserve">Restoring Wallet &lt;b&gt;%1&lt;/b&gt;…</source>
+        <context-group purpose="location"><context context-type="linenumber">382</context></context-group>
+        <note annotates="source" from="developer">Descriptive text of the restore wallets progress window which indicates to the user that wallets are currently being restored.</note>
+      </trans-unit>
+      <trans-unit id="_msg298">
+        <source xml:space="preserve">Restore wallet failed</source>
+        <context-group purpose="location"><context context-type="linenumber">401</context></context-group>
+        <note annotates="source" from="developer">Title of message box which is displayed when the wallet could not be restored.</note>
+      </trans-unit>
+      <trans-unit id="_msg299">
+        <source xml:space="preserve">Restore wallet warning</source>
+        <context-group purpose="location"><context context-type="linenumber">404</context></context-group>
+        <note annotates="source" from="developer">Title of message box which is displayed when the wallet is restored with some warning.</note>
+      </trans-unit>
+      <trans-unit id="_msg300">
+        <source xml:space="preserve">Restore wallet message</source>
+        <context-group purpose="location"><context context-type="linenumber">407</context></context-group>
+        <note annotates="source" from="developer">Title of message box which is displayed when the wallet is successfully restored.</note>
+      </trans-unit>
+    </group>
     <group restype="x-trolltech-linguist-context" resname="WalletController">
-      <trans-unit id="_msg292" approved="yes">
+      <trans-unit id="_msg301">
         <source xml:space="preserve">Close wallet</source>
-        <target xml:space="preserve">Close wallet</target>
-        <context-group purpose="location"><context context-type="linenumber">88</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">84</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg293" approved="yes">
+      <trans-unit id="_msg302">
         <source xml:space="preserve">Are you sure you wish to close the wallet &lt;i&gt;%1&lt;/i&gt;?</source>
-        <target xml:space="preserve">Are you sure you wish to close the wallet &lt;i&gt;%1&lt;/i&gt;?</target>
-        <context-group purpose="location"><context context-type="linenumber">89</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">85</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg294" approved="yes">
+      <trans-unit id="_msg303">
         <source xml:space="preserve">Closing the wallet for too long can result in having to resync the entire chain if pruning is enabled.</source>
-        <target xml:space="preserve">Closing the wallet for too long can result in having to resync the entire chain if pruning is enabled.</target>
-        <context-group purpose="location"><context context-type="linenumber">90</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">86</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg295" approved="yes">
+      <trans-unit id="_msg304">
         <source xml:space="preserve">Close all wallets</source>
-        <target xml:space="preserve">Close all wallets</target>
-        <context-group purpose="location"><context context-type="linenumber">103</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">99</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg296" approved="yes">
+      <trans-unit id="_msg305">
         <source xml:space="preserve">Are you sure you wish to close all wallets?</source>
-        <target xml:space="preserve">Are you sure you wish to close all wallets?</target>
-        <context-group purpose="location"><context context-type="linenumber">104</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">100</context></context-group>
       </trans-unit>
     </group>
   </body></file>
-  <file original="../forms/createwalletdialog.ui" datatype="x-trolltech-designer-ui" source-language="en" target-language="en"><body>
+  <file original="../forms/createwalletdialog.ui" datatype="x-trolltech-designer-ui" source-language="en"><body>
     <group restype="x-trolltech-linguist-context" resname="CreateWalletDialog">
-      <trans-unit id="_msg297" approved="yes">
+      <trans-unit id="_msg306">
         <source xml:space="preserve">Create Wallet</source>
-        <target xml:space="preserve">Create Wallet</target>
         <context-group purpose="location"><context context-type="linenumber">14</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg298" approved="yes">
+      <trans-unit id="_msg307">
         <source xml:space="preserve">Wallet Name</source>
-        <target xml:space="preserve">Wallet Name</target>
         <context-group purpose="location"><context context-type="linenumber">25</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg299" approved="yes">
+      <trans-unit id="_msg308">
         <source xml:space="preserve">Wallet</source>
-        <target xml:space="preserve">Wallet</target>
         <context-group purpose="location"><context context-type="linenumber">38</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg300" approved="yes">
+      <trans-unit id="_msg309">
         <source xml:space="preserve">Encrypt the wallet. The wallet will be encrypted with a passphrase of your choice.</source>
-        <target xml:space="preserve">Encrypt the wallet. The wallet will be encrypted with a passphrase of your choice.</target>
         <context-group purpose="location"><context context-type="linenumber">47</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg301" approved="yes">
+      <trans-unit id="_msg310">
         <source xml:space="preserve">Encrypt Wallet</source>
-        <target xml:space="preserve">Encrypt Wallet</target>
         <context-group purpose="location"><context context-type="linenumber">50</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg302" approved="yes">
+      <trans-unit id="_msg311">
         <source xml:space="preserve">Advanced Options</source>
-        <target xml:space="preserve">Advanced Options</target>
         <context-group purpose="location"><context context-type="linenumber">76</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg303" approved="yes">
+      <trans-unit id="_msg312">
         <source xml:space="preserve">Disable private keys for this wallet. Wallets with private keys disabled will have no private keys and cannot have an HD seed or imported private keys. This is ideal for watch-only wallets.</source>
-        <target xml:space="preserve">Disable private keys for this wallet. Wallets with private keys disabled will have no private keys and cannot have an HD seed or imported private keys. This is ideal for watch-only wallets.</target>
         <context-group purpose="location"><context context-type="linenumber">85</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg304" approved="yes">
+      <trans-unit id="_msg313">
         <source xml:space="preserve">Disable Private Keys</source>
-        <target xml:space="preserve">Disable Private Keys</target>
         <context-group purpose="location"><context context-type="linenumber">88</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg305" approved="yes">
+      <trans-unit id="_msg314">
         <source xml:space="preserve">Make a blank wallet. Blank wallets do not initially have private keys or scripts. Private keys and addresses can be imported, or an HD seed can be set, at a later time.</source>
-        <target xml:space="preserve">Make a blank wallet. Blank wallets do not initially have private keys or scripts. Private keys and addresses can be imported, or an HD seed can be set, at a later time.</target>
         <context-group purpose="location"><context context-type="linenumber">95</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg306" approved="yes">
+      <trans-unit id="_msg315">
         <source xml:space="preserve">Make Blank Wallet</source>
-        <target xml:space="preserve">Make Blank Wallet</target>
         <context-group purpose="location"><context context-type="linenumber">98</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg307" approved="yes">
+      <trans-unit id="_msg316">
         <source xml:space="preserve">Use descriptors for scriptPubKey management. This feature is well-tested but still considered experimental and not recommended for use yet.</source>
-        <target xml:space="preserve">Use descriptors for scriptPubKey management. This feature is well-tested but still considered experimental and not recommended for use yet.</target>
         <context-group purpose="location"><context context-type="linenumber">105</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg308" approved="yes">
+      <trans-unit id="_msg317">
         <source xml:space="preserve">Descriptor Wallet (EXPERIMENTAL)</source>
-        <target xml:space="preserve">Descriptor Wallet (EXPERIMENTAL)</target>
         <context-group purpose="location"><context context-type="linenumber">108</context></context-group>
       </trans-unit>
     </group>
   </body></file>
-  <file original="../createwalletdialog.cpp" datatype="cpp" source-language="en" target-language="en"><body>
+  <file original="../createwalletdialog.cpp" datatype="cpp" source-language="en"><body>
     <group restype="x-trolltech-linguist-context" resname="CreateWalletDialog">
-      <trans-unit id="_msg309" approved="yes">
+      <trans-unit id="_msg318">
         <source xml:space="preserve">Create</source>
-        <target xml:space="preserve">Create</target>
         <context-group purpose="location"><context context-type="linenumber">21</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg310" approved="yes">
+      <trans-unit id="_msg319">
         <source xml:space="preserve">Compiled without sqlite support (required for descriptor wallets)</source>
-        <target xml:space="preserve">Compiled without sqlite support (required for descriptor wallets)</target>
         <context-group purpose="location"><context context-type="linenumber">62</context></context-group>
       </trans-unit>
     </group>
   </body></file>
-  <file original="../forms/editaddressdialog.ui" datatype="x-trolltech-designer-ui" source-language="en" target-language="en"><body>
+  <file original="../forms/editaddressdialog.ui" datatype="x-trolltech-designer-ui" source-language="en"><body>
     <group restype="x-trolltech-linguist-context" resname="EditAddressDialog">
-      <trans-unit id="_msg311" approved="yes">
+      <trans-unit id="_msg320">
         <source xml:space="preserve">Edit Address</source>
-        <target xml:space="preserve">Edit Address</target>
         <context-group purpose="location"><context context-type="linenumber">14</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg312" approved="yes">
+      <trans-unit id="_msg321">
         <source xml:space="preserve">&amp;Label</source>
-        <target xml:space="preserve">&amp;Label</target>
         <context-group purpose="location"><context context-type="linenumber">25</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg313" approved="yes">
+      <trans-unit id="_msg322">
         <source xml:space="preserve">The label associated with this address list entry</source>
-        <target xml:space="preserve">The label associated with this address list entry</target>
         <context-group purpose="location"><context context-type="linenumber">35</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg314" approved="yes">
+      <trans-unit id="_msg323">
         <source xml:space="preserve">&amp;Address</source>
-        <target xml:space="preserve">&amp;Address</target>
         <context-group purpose="location"><context context-type="linenumber">42</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg315" approved="yes">
+      <trans-unit id="_msg324">
         <source xml:space="preserve">The address associated with this address list entry. This can only be modified for sending addresses.</source>
-        <target xml:space="preserve">The address associated with this address list entry. This can only be modified for sending addresses.</target>
         <context-group purpose="location"><context context-type="linenumber">52</context></context-group>
       </trans-unit>
     </group>
   </body></file>
-  <file original="../editaddressdialog.cpp" datatype="cpp" source-language="en" target-language="en"><body>
+  <file original="../editaddressdialog.cpp" datatype="cpp" source-language="en"><body>
     <group restype="x-trolltech-linguist-context" resname="EditAddressDialog">
-      <trans-unit id="_msg316" approved="yes">
+      <trans-unit id="_msg325">
         <source xml:space="preserve">New sending address</source>
-        <target xml:space="preserve">New sending address</target>
         <context-group purpose="location"><context context-type="linenumber">31</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg317" approved="yes">
+      <trans-unit id="_msg326">
         <source xml:space="preserve">Edit receiving address</source>
-        <target xml:space="preserve">Edit receiving address</target>
         <context-group purpose="location"><context context-type="linenumber">34</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg318" approved="yes">
+      <trans-unit id="_msg327">
         <source xml:space="preserve">Edit sending address</source>
-        <target xml:space="preserve">Edit sending address</target>
         <context-group purpose="location"><context context-type="linenumber">38</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg319" approved="yes">
+      <trans-unit id="_msg328">
         <source xml:space="preserve">The entered address &quot;%1&quot; is not a valid Dash address.</source>
-        <target xml:space="preserve">The entered address &quot;%1&quot; is not a valid Dash address.</target>
         <context-group purpose="location"><context context-type="linenumber">114</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg320" approved="yes">
+      <trans-unit id="_msg329">
         <source xml:space="preserve">Address &quot;%1&quot; already exists as a receiving address with label &quot;%2&quot; and so cannot be added as a sending address.</source>
-        <target xml:space="preserve">Address &quot;%1&quot; already exists as a receiving address with label &quot;%2&quot; and so cannot be added as a sending address.</target>
         <context-group purpose="location"><context context-type="linenumber">147</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg321" approved="yes">
+      <trans-unit id="_msg330">
         <source xml:space="preserve">The entered address &quot;%1&quot; is already in the address book with label &quot;%2&quot;.</source>
-        <target xml:space="preserve">The entered address &quot;%1&quot; is already in the address book with label &quot;%2&quot;.</target>
         <context-group purpose="location"><context context-type="linenumber">152</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg322" approved="yes">
+      <trans-unit id="_msg331">
         <source xml:space="preserve">Could not unlock wallet.</source>
-        <target xml:space="preserve">Could not unlock wallet.</target>
         <context-group purpose="location"><context context-type="linenumber">124</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg323" approved="yes">
+      <trans-unit id="_msg332">
         <source xml:space="preserve">New key generation failed.</source>
-        <target xml:space="preserve">New key generation failed.</target>
         <context-group purpose="location"><context context-type="linenumber">129</context></context-group>
       </trans-unit>
     </group>
   </body></file>
-  <file original="../intro.cpp" datatype="cpp" source-language="en" target-language="en"><body>
+  <file original="../intro.cpp" datatype="cpp" source-language="en"><body>
     <group restype="x-trolltech-linguist-context" resname="FreespaceChecker">
-      <trans-unit id="_msg324" approved="yes">
+      <trans-unit id="_msg333">
         <source xml:space="preserve">A new data directory will be created.</source>
-        <target xml:space="preserve">A new data directory will be created.</target>
         <context-group purpose="location"><context context-type="linenumber">74</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg325" approved="yes">
+      <trans-unit id="_msg334">
         <source xml:space="preserve">name</source>
-        <target xml:space="preserve">name</target>
         <context-group purpose="location"><context context-type="linenumber">96</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg326" approved="yes">
+      <trans-unit id="_msg335">
         <source xml:space="preserve">Directory already exists. Add %1 if you intend to create a new directory here.</source>
-        <target xml:space="preserve">Directory already exists. Add %1 if you intend to create a new directory here.</target>
         <context-group purpose="location"><context context-type="linenumber">98</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg327" approved="yes">
+      <trans-unit id="_msg336">
         <source xml:space="preserve">Path already exists, and is not a directory.</source>
-        <target xml:space="preserve">Path already exists, and is not a directory.</target>
         <context-group purpose="location"><context context-type="linenumber">101</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg328" approved="yes">
+      <trans-unit id="_msg337">
         <source xml:space="preserve">Cannot create data directory here.</source>
-        <target xml:space="preserve">Cannot create data directory here.</target>
         <context-group purpose="location"><context context-type="linenumber">108</context></context-group>
       </trans-unit>
     </group>
     <group restype="x-trolltech-linguist-context" resname="Intro">
-      <trans-unit id="_msg329">
-        <source xml:space="preserve">%1 GB of space available</source>
-        <target xml:space="preserve"></target>
-        <context-group purpose="location"><context context-type="linenumber">307</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg330" approved="yes">
-        <source xml:space="preserve">(of %1 GB needed)</source>
-        <target xml:space="preserve">(of %1 GB needed)</target>
+      <group restype="x-gettext-plurals">
         <context-group purpose="location"><context context-type="linenumber">309</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg331" approved="yes">
-        <source xml:space="preserve">(%1 GB needed for full chain)</source>
-        <target xml:space="preserve">(%1 GB needed for full chain)</target>
-        <context-group purpose="location"><context context-type="linenumber">312</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg332" approved="yes">
+        <trans-unit id="_msg338[0]">
+          <source xml:space="preserve">%n GB of space available</source>
+        </trans-unit>
+        <trans-unit id="_msg338[1]">
+          <source xml:space="preserve">%n GB of space available</source>
+        </trans-unit>
+      </group>
+      <group restype="x-gettext-plurals">
+        <context-group purpose="location"><context context-type="linenumber">311</context></context-group>
+        <trans-unit id="_msg339[0]">
+          <source xml:space="preserve">(of %n GB needed)</source>
+        </trans-unit>
+        <trans-unit id="_msg339[1]">
+          <source xml:space="preserve">(of %n GB needed)</source>
+        </trans-unit>
+      </group>
+      <group restype="x-gettext-plurals">
+        <context-group purpose="location"><context context-type="linenumber">314</context></context-group>
+        <trans-unit id="_msg340[0]">
+          <source xml:space="preserve">(%n GB needed for full chain)</source>
+        </trans-unit>
+        <trans-unit id="_msg340[1]">
+          <source xml:space="preserve">(%n GB needed for full chain)</source>
+        </trans-unit>
+      </group>
+      <trans-unit id="_msg341">
         <source xml:space="preserve">At least %1 GB of data will be stored in this directory, and it will grow over time.</source>
-        <target xml:space="preserve">At least %1 GB of data will be stored in this directory, and it will grow over time.</target>
-        <context-group purpose="location"><context context-type="linenumber">384</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">386</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg333" approved="yes">
+      <trans-unit id="_msg342">
         <source xml:space="preserve">Approximately %1 GB of data will be stored in this directory.</source>
-        <target xml:space="preserve">Approximately %1 GB of data will be stored in this directory.</target>
-        <context-group purpose="location"><context context-type="linenumber">387</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">389</context></context-group>
       </trans-unit>
       <group restype="x-gettext-plurals">
-        <context-group purpose="location"><context context-type="linenumber">396</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">398</context></context-group>
         <note annotates="source" from="developer">Explanatory text on the capability of the current prune target.</note>
-        <trans-unit id="_msg334[0]" approved="yes">
+        <trans-unit id="_msg343[0]">
           <source xml:space="preserve">(sufficient to restore backups %n day(s) old)</source>
-          <target xml:space="preserve">(sufficient to restore backups %n day old)</target>
         </trans-unit>
-        <trans-unit id="_msg334[1]" approved="yes">
+        <trans-unit id="_msg343[1]">
           <source xml:space="preserve">(sufficient to restore backups %n day(s) old)</source>
-          <target xml:space="preserve">(sufficient to restore backups %n days old)</target>
         </trans-unit>
       </group>
-      <trans-unit id="_msg335" approved="yes">
+      <trans-unit id="_msg344">
         <source xml:space="preserve">%1 will download and store a copy of the Dash block chain.</source>
-        <target xml:space="preserve">%1 will download and store a copy of the Dash block chain.</target>
-        <context-group purpose="location"><context context-type="linenumber">398</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">400</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg336" approved="yes">
+      <trans-unit id="_msg345">
         <source xml:space="preserve">The wallet will also be stored in this directory.</source>
-        <target xml:space="preserve">The wallet will also be stored in this directory.</target>
-        <context-group purpose="location"><context context-type="linenumber">400</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">402</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg337" approved="yes">
+      <trans-unit id="_msg346">
         <source xml:space="preserve">Error: Specified data directory &quot;%1&quot; cannot be created.</source>
-        <target xml:space="preserve">Error: Specified data directory &quot;%1&quot; cannot be created.</target>
-        <context-group purpose="location"><context context-type="linenumber">255</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">257</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg338" approved="yes">
+      <trans-unit id="_msg347">
         <source xml:space="preserve">Error</source>
-        <target xml:space="preserve">Error</target>
-        <context-group purpose="location"><context context-type="linenumber">286</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">288</context></context-group>
       </trans-unit>
     </group>
   </body></file>
-  <file original="../forms/governancelist.ui" datatype="x-trolltech-designer-ui" source-language="en" target-language="en"><body>
+  <file original="../forms/governancelist.ui" datatype="x-trolltech-designer-ui" source-language="en"><body>
     <group restype="x-trolltech-linguist-context" resname="GovernanceList">
-      <trans-unit id="_msg339" approved="yes">
+      <trans-unit id="_msg348">
         <source xml:space="preserve">Form</source>
-        <target xml:space="preserve">Form</target>
         <context-group purpose="location"><context context-type="linenumber">14</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg340" approved="yes">
+      <trans-unit id="_msg349">
         <source xml:space="preserve">Filter List:</source>
-        <target xml:space="preserve">Filter List:</target>
         <context-group purpose="location"><context context-type="linenumber">57</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg341" approved="yes">
+      <trans-unit id="_msg350">
         <source xml:space="preserve">Filter proposal list</source>
-        <target xml:space="preserve">Filter proposal list</target>
         <context-group purpose="location"><context context-type="linenumber">64</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg342" approved="yes">
+      <trans-unit id="_msg351">
+        <source xml:space="preserve">Masternode Count:</source>
+        <context-group purpose="location"><context context-type="linenumber">90</context></context-group>
+      </trans-unit>
+      <trans-unit id="_msg352">
+        <source xml:space="preserve">Number of masternodes this wallet can vote with (masternodes for which this wallet holds the voting key)</source>
+        <context-group purpose="location"><context context-type="linenumber">93</context></context-group>
+      </trans-unit>
+      <trans-unit id="_msg353">
         <source xml:space="preserve">Proposal Count:</source>
-        <target xml:space="preserve">Proposal Count:</target>
-        <context-group purpose="location"><context context-type="linenumber">87</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">123</context></context-group>
+      </trans-unit>
+      <trans-unit id="_msg354">
+        <source xml:space="preserve">Create Proposal</source>
+        <context-group purpose="location"><context context-type="linenumber">153</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg343" approved="yes">
+      <trans-unit id="_msg355">
         <source xml:space="preserve">Filter by Title</source>
-        <target xml:space="preserve">Filter by Title</target>
         <context-group purpose="location"><context context-type="linenumber">67</context></context-group>
       </trans-unit>
     </group>
   </body></file>
-  <file original="../governancelist.cpp" datatype="cpp" source-language="en" target-language="en"><body>
+  <file original="../governancelist.cpp" datatype="cpp" source-language="en"><body>
     <group restype="x-trolltech-linguist-context" resname="GovernanceList">
-      <trans-unit id="_msg344" approved="yes">
-        <source xml:space="preserve">Proposal Info: %1</source>
-        <target xml:space="preserve">Proposal Info: %1</target>
+      <trans-unit id="_msg356">
+        <source xml:space="preserve">Unavailable</source>
         <context-group purpose="location"><context context-type="linenumber">426</context></context-group>
       </trans-unit>
-    </group>
-    <group restype="x-trolltech-linguist-context" resname="Proposal">
-      <trans-unit id="_msg345" approved="yes">
-        <source xml:space="preserve">Passing +%1</source>
-        <target xml:space="preserve">Passing +%1</target>
-        <context-group purpose="location"><context context-type="linenumber">86</context></context-group>
+      <trans-unit id="_msg357">
+        <source xml:space="preserve">A synced node and an unlocked wallet are required.</source>
+        <context-group purpose="location"><context context-type="linenumber">426</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg346" approved="yes">
-        <source xml:space="preserve">Needs additional %1 votes</source>
-        <target xml:space="preserve">Needs additional %1 votes</target>
-        <context-group purpose="location"><context context-type="linenumber">88</context></context-group>
+      <trans-unit id="_msg358">
+        <source xml:space="preserve">Vote Yes</source>
+        <context-group purpose="location"><context context-type="linenumber">462</context></context-group>
       </trans-unit>
-    </group>
-    <group restype="x-trolltech-linguist-context" resname="ProposalModel">
-      <trans-unit id="_msg347" approved="yes">
-        <source xml:space="preserve">Yes</source>
-        <target xml:space="preserve">Yes</target>
-        <context-group purpose="location"><context context-type="linenumber">144</context></context-group>
+      <trans-unit id="_msg359">
+        <source xml:space="preserve">Vote No</source>
+        <context-group purpose="location"><context context-type="linenumber">463</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg348" approved="yes">
-        <source xml:space="preserve">No</source>
-        <target xml:space="preserve">No</target>
-        <context-group purpose="location"><context context-type="linenumber">144</context></context-group>
+      <trans-unit id="_msg360">
+        <source xml:space="preserve">Vote Abstain</source>
+        <context-group purpose="location"><context context-type="linenumber">464</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg349" approved="yes">
-        <source xml:space="preserve">Hash</source>
-        <target xml:space="preserve">Hash</target>
-        <context-group purpose="location"><context context-type="linenumber">184</context></context-group>
+      <trans-unit id="_msg361">
+        <source xml:space="preserve">Proposal Info: %1</source>
+        <context-group purpose="location"><context context-type="linenumber">481</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg350" approved="yes">
-        <source xml:space="preserve">Title</source>
-        <target xml:space="preserve">Title</target>
-        <context-group purpose="location"><context context-type="linenumber">186</context></context-group>
+      <trans-unit id="_msg362">
+        <source xml:space="preserve">Voting Failed</source>
+        <context-group purpose="location"><context context-type="linenumber">523</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">528</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">535</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">549</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">560</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg351" approved="yes">
-        <source xml:space="preserve">Start</source>
-        <target xml:space="preserve">Start</target>
-        <context-group purpose="location"><context context-type="linenumber">188</context></context-group>
+      <trans-unit id="_msg363">
+        <source xml:space="preserve">No wallet available.</source>
+        <context-group purpose="location"><context context-type="linenumber">523</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg352" approved="yes">
-        <source xml:space="preserve">End</source>
-        <target xml:space="preserve">End</target>
-        <context-group purpose="location"><context context-type="linenumber">190</context></context-group>
+      <trans-unit id="_msg364">
+        <source xml:space="preserve">No masternode voting keys found in wallet.</source>
+        <context-group purpose="location"><context context-type="linenumber">528</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg353" approved="yes">
-        <source xml:space="preserve">Amount</source>
-        <target xml:space="preserve">Amount</target>
-        <context-group purpose="location"><context context-type="linenumber">192</context></context-group>
+      <trans-unit id="_msg365">
+        <source xml:space="preserve">Please select a proposal to vote on.</source>
+        <context-group purpose="location"><context context-type="linenumber">535</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg354" approved="yes">
-        <source xml:space="preserve">Active</source>
-        <target xml:space="preserve">Active</target>
-        <context-group purpose="location"><context context-type="linenumber">194</context></context-group>
+      <trans-unit id="_msg366">
+        <source xml:space="preserve">Unable to unlock wallet.</source>
+        <context-group purpose="location"><context context-type="linenumber">549</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg355" approved="yes">
-        <source xml:space="preserve">Status</source>
-        <target xml:space="preserve">Status</target>
-        <context-group purpose="location"><context context-type="linenumber">196</context></context-group>
+      <trans-unit id="_msg367">
+        <source xml:space="preserve">Unable to get masternode list. Please try again later.</source>
+        <context-group purpose="location"><context context-type="linenumber">560</context></context-group>
+      </trans-unit>
+      <trans-unit id="_msg368">
+        <source xml:space="preserve">Masternode %1 not found</source>
+        <context-group purpose="location"><context context-type="linenumber">570</context></context-group>
+      </trans-unit>
+      <trans-unit id="_msg369">
+        <source xml:space="preserve">Failed to sign vote for masternode %1</source>
+        <context-group purpose="location"><context context-type="linenumber">581</context></context-group>
+      </trans-unit>
+      <trans-unit id="_msg370">
+        <source xml:space="preserve">Masternode %1: %2</source>
+        <context-group purpose="location"><context context-type="linenumber">592</context></context-group>
+      </trans-unit>
+      <group restype="x-gettext-plurals">
+        <context-group purpose="location"><context context-type="linenumber">599</context></context-group>
+        <trans-unit id="_msg371[0]">
+          <source xml:space="preserve">Voted successfully %n time(s)</source>
+        </trans-unit>
+        <trans-unit id="_msg371[1]">
+          <source xml:space="preserve">Voted successfully %n time(s)</source>
+        </trans-unit>
+      </group>
+      <group restype="x-gettext-plurals">
+        <context-group purpose="location"><context context-type="linenumber">605</context></context-group>
+        <trans-unit id="_msg372[0]">
+          <source xml:space="preserve">Failed to vote %n time(s)</source>
+        </trans-unit>
+        <trans-unit id="_msg372[1]">
+          <source xml:space="preserve">Failed to vote %n time(s)</source>
+        </trans-unit>
+      </group>
+      <trans-unit id="_msg373">
+        <source xml:space="preserve">Errors:</source>
+        <context-group purpose="location"><context context-type="linenumber">608</context></context-group>
+      </trans-unit>
+      <trans-unit id="_msg374">
+        <source xml:space="preserve">Voting Results</source>
+        <context-group purpose="location"><context context-type="linenumber">611</context></context-group>
+      </trans-unit>
+    </group>
+    <group restype="x-trolltech-linguist-context" resname="Proposal">
+      <trans-unit id="_msg375">
+        <source xml:space="preserve">Passing +%1</source>
+        <context-group purpose="location"><context context-type="linenumber">95</context></context-group>
+      </trans-unit>
+      <trans-unit id="_msg376">
+        <source xml:space="preserve">Needs additional %1 votes</source>
+        <context-group purpose="location"><context context-type="linenumber">97</context></context-group>
+      </trans-unit>
+    </group>
+    <group restype="x-trolltech-linguist-context" resname="ProposalModel">
+      <trans-unit id="_msg377">
+        <source xml:space="preserve">Yes</source>
+        <context-group purpose="location"><context context-type="linenumber">153</context></context-group>
+      </trans-unit>
+      <trans-unit id="_msg378">
+        <source xml:space="preserve">No</source>
+        <context-group purpose="location"><context context-type="linenumber">153</context></context-group>
+      </trans-unit>
+      <trans-unit id="_msg379">
+        <source xml:space="preserve">Hash</source>
+        <context-group purpose="location"><context context-type="linenumber">193</context></context-group>
+      </trans-unit>
+      <trans-unit id="_msg380">
+        <source xml:space="preserve">Title</source>
+        <context-group purpose="location"><context context-type="linenumber">195</context></context-group>
+      </trans-unit>
+      <trans-unit id="_msg381">
+        <source xml:space="preserve">Start</source>
+        <context-group purpose="location"><context context-type="linenumber">197</context></context-group>
+      </trans-unit>
+      <trans-unit id="_msg382">
+        <source xml:space="preserve">End</source>
+        <context-group purpose="location"><context context-type="linenumber">199</context></context-group>
+      </trans-unit>
+      <trans-unit id="_msg383">
+        <source xml:space="preserve">Amount</source>
+        <context-group purpose="location"><context context-type="linenumber">201</context></context-group>
+      </trans-unit>
+      <trans-unit id="_msg384">
+        <source xml:space="preserve">Active</source>
+        <context-group purpose="location"><context context-type="linenumber">203</context></context-group>
+      </trans-unit>
+      <trans-unit id="_msg385">
+        <source xml:space="preserve">Status</source>
+        <context-group purpose="location"><context context-type="linenumber">205</context></context-group>
       </trans-unit>
     </group>
   </body></file>
-  <file original="../utilitydialog.cpp" datatype="cpp" source-language="en" target-language="en"><body>
+  <file original="../utilitydialog.cpp" datatype="cpp" source-language="en"><body>
     <group restype="x-trolltech-linguist-context" resname="HelpMessageDialog">
-      <trans-unit id="_msg356" approved="yes">
+      <trans-unit id="_msg386">
         <source xml:space="preserve">version</source>
-        <target xml:space="preserve">version</target>
-        <context-group purpose="location"><context context-type="linenumber">40</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">41</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg357" approved="yes">
+      <trans-unit id="_msg387">
         <source xml:space="preserve">About %1</source>
-        <target xml:space="preserve">About %1</target>
-        <context-group purpose="location"><context context-type="linenumber">44</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">45</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg358" approved="yes">
+      <trans-unit id="_msg388">
         <source xml:space="preserve">Command-line options</source>
-        <target xml:space="preserve">Command-line options</target>
         <context-group purpose="location"><context context-type="linenumber">64</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg359" approved="yes">
+      <trans-unit id="_msg389">
         <source xml:space="preserve">%1 information</source>
-        <target xml:space="preserve">%1 information</target>
-        <context-group purpose="location"><context context-type="linenumber">111</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">112</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg360" approved="yes">
+      <trans-unit id="_msg390">
         <source xml:space="preserve">&lt;h3&gt;%1 Basics&lt;/h3&gt; %1 gives you true financial privacy by obscuring the origins of your funds. All the Dash in your wallet is comprised of different &quot;inputs&quot; which you can think of as separate, discrete coins.&lt;br&gt; %1 uses an innovative process to mix your inputs with the inputs of two or more other people, without having your coins ever leave your wallet. You retain control of your money at all times.&lt;hr&gt; &lt;b&gt;The %1 process works like this:&lt;/b&gt;&lt;ol type=&quot;1&quot;&gt; &lt;li&gt;%1 begins by breaking your transaction inputs down into standard denominations. These denominations are 0.001 DASH, 0.01 DASH, 0.1 DASH, 1 DASH and 10 DASH -- sort of like the paper money you use every day.&lt;/li&gt; &lt;li&gt;Your wallet then sends requests to specially configured software nodes on the network, called &quot;masternodes.&quot; These masternodes are informed then that you are interested in mixing a certain denomination. No identifiable information is sent to the masternodes, so they never know &quot;who&quot; you are.&lt;/li&gt; &lt;li&gt;When two or more other people send similar messages, indicating that they wish to mix the same denomination, a mixing session begins. The masternode mixes up the inputs and instructs all three users&apos; wallets to pay the now-transformed input back to themselves. Your wallet pays that denomination directly to itself, but in a different address (called a change address).&lt;/li&gt; &lt;li&gt;In order to fully obscure your funds, your wallet must repeat this process a number of times with each denomination. Each time the process is completed, it&apos;s called a &quot;round.&quot; Each round of %1 makes it exponentially more difficult to determine where your funds originated.&lt;/li&gt; &lt;li&gt;This mixing process happens in the background without any intervention on your part. When you wish to make a transaction, your funds will already be mixed. No additional waiting is required.&lt;/li&gt; &lt;/ol&gt; &lt;hr&gt;&lt;b&gt;IMPORTANT:&lt;/b&gt; Your wallet only contains 1000 of these &quot;change addresses.&quot; Every time a mixing event happens, up to 9 of your addresses are used up. This means those 1000 addresses last for about 100 mixing events. When 900 of them are used, your wallet must create more addresses. It can only do this, however, if you have automatic backups enabled.&lt;br&gt; Consequently, users who have backups disabled will also have %1 disabled. &lt;hr&gt;For more information, see the &lt;a style=&quot;%2&quot; href=&quot;%3&quot;&gt;%1 documentation&lt;/a&gt;.</source>
-        <target xml:space="preserve">&lt;h3&gt;%1 Basics&lt;/h3&gt; %1 gives you true financial privacy by obscuring the origins of your funds. All the Dash in your wallet is comprised of different &quot;inputs&quot; which you can think of as separate, discrete coins.&lt;br&gt; %1 uses an innovative process to mix your inputs with the inputs of two or more other people, without having your coins ever leave your wallet. You retain control of your money at all times.&lt;hr&gt; &lt;b&gt;The %1 process works like this:&lt;/b&gt;&lt;ol type=&quot;1&quot;&gt; &lt;li&gt;%1 begins by breaking your transaction inputs down into standard denominations. These denominations are 0.001 DASH, 0.01 DASH, 0.1 DASH, 1 DASH and 10 DASH -- sort of like the paper money you use every day.&lt;/li&gt; &lt;li&gt;Your wallet then sends requests to specially configured software nodes on the network, called &quot;masternodes.&quot; These masternodes are informed then that you are interested in mixing a certain denomination. No identifiable information is sent to the masternodes, so they never know &quot;who&quot; you are.&lt;/li&gt; &lt;li&gt;When two or more other people send similar messages, indicating that they wish to mix the same denomination, a mixing session begins. The masternode mixes up the inputs and instructs all three users&apos; wallets to pay the now-transformed input back to themselves. Your wallet pays that denomination directly to itself, but in a different address (called a change address).&lt;/li&gt; &lt;li&gt;In order to fully obscure your funds, your wallet must repeat this process a number of times with each denomination. Each time the process is completed, it&apos;s called a &quot;round.&quot; Each round of %1 makes it exponentially more difficult to determine where your funds originated.&lt;/li&gt; &lt;li&gt;This mixing process happens in the background without any intervention on your part. When you wish to make a transaction, your funds will already be mixed. No additional waiting is required.&lt;/li&gt; &lt;/ol&gt; &lt;hr&gt;&lt;b&gt;IMPORTANT:&lt;/b&gt; Your wallet only contains 1000 of these &quot;change addresses.&quot; Every time a mixing event happens, up to 9 of your addresses are used up. This means those 1000 addresses last for about 100 mixing events. When 900 of them are used, your wallet must create more addresses. It can only do this, however, if you have automatic backups enabled.&lt;br&gt; Consequently, users who have backups disabled will also have %1 disabled. &lt;hr&gt;For more information, see the &lt;a style=&quot;%2&quot; href=&quot;%3&quot;&gt;%1 documentation&lt;/a&gt;.</target>
-        <context-group purpose="location"><context context-type="linenumber">115</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">116</context></context-group>
       </trans-unit>
     </group>
     <group restype="x-trolltech-linguist-context" resname="ShutdownWindow">
-      <trans-unit id="_msg361" approved="yes">
+      <trans-unit id="_msg391">
         <source xml:space="preserve">%1 is shutting down…</source>
-        <target xml:space="preserve">%1 is shutting down…</target>
-        <context-group purpose="location"><context context-type="linenumber">189</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">190</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg362" approved="yes">
+      <trans-unit id="_msg392">
         <source xml:space="preserve">Do not shut down the computer until this window disappears.</source>
-        <target xml:space="preserve">Do not shut down the computer until this window disappears.</target>
-        <context-group purpose="location"><context context-type="linenumber">190</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">191</context></context-group>
       </trans-unit>
     </group>
   </body></file>
-  <file original="../forms/intro.ui" datatype="x-trolltech-designer-ui" source-language="en" target-language="en"><body>
+  <file original="../forms/intro.ui" datatype="x-trolltech-designer-ui" source-language="en"><body>
     <group restype="x-trolltech-linguist-context" resname="Intro">
-      <trans-unit id="_msg363" approved="yes">
+      <trans-unit id="_msg393">
         <source xml:space="preserve">Welcome</source>
-        <target xml:space="preserve">Welcome</target>
         <context-group purpose="location"><context context-type="linenumber">14</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg364" approved="yes">
+      <trans-unit id="_msg394">
         <source xml:space="preserve">Welcome to %1.</source>
-        <target xml:space="preserve">Welcome to %1.</target>
         <context-group purpose="location"><context context-type="linenumber">23</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg365" approved="yes">
+      <trans-unit id="_msg395">
         <source xml:space="preserve">As this is the first time the program is launched, you can choose where %1 will store its data.</source>
-        <target xml:space="preserve">As this is the first time the program is launched, you can choose where %1 will store its data.</target>
         <context-group purpose="location"><context context-type="linenumber">49</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg366" approved="yes">
+      <trans-unit id="_msg396">
         <source xml:space="preserve">Limit block chain storage to</source>
-        <target xml:space="preserve">Limit block chain storage to</target>
         <context-group purpose="location"><context context-type="linenumber">238</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg367" approved="yes">
+      <trans-unit id="_msg397">
         <source xml:space="preserve">Reverting this setting requires re-downloading the entire blockchain. It is faster to download the full chain first and prune it later. Disables some advanced features.</source>
-        <target xml:space="preserve">Reverting this setting requires re-downloading the entire blockchain. It is faster to download the full chain first and prune it later. Disables some advanced features.</target>
         <context-group purpose="location"><context context-type="linenumber">241</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg368" approved="yes">
+      <trans-unit id="_msg398">
         <source xml:space="preserve"> GB</source>
-        <target xml:space="preserve"> GB</target>
         <context-group purpose="location"><context context-type="linenumber">248</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg369" approved="yes">
+      <trans-unit id="_msg399">
         <source xml:space="preserve">This initial synchronisation is very demanding, and may expose hardware problems with your computer that had previously gone unnoticed. Each time you run %1, it will continue downloading where it left off.</source>
-        <target xml:space="preserve">This initial synchronisation is very demanding, and may expose hardware problems with your computer that had previously gone unnoticed. Each time you run %1, it will continue downloading where it left off.</target>
         <context-group purpose="location"><context context-type="linenumber">216</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg370" approved="yes">
+      <trans-unit id="_msg400">
         <source xml:space="preserve">When you click OK, %1 will begin to download and process the full %4 block chain (%2 GB) starting with the earliest transactions in %3 when %4 initially launched.</source>
-        <target xml:space="preserve">When you click OK, %1 will begin to download and process the full %4 block chain (%2 GB) starting with the earliest transactions in %3 when %4 initially launched.</target>
         <context-group purpose="location"><context context-type="linenumber">206</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg371" approved="yes">
+      <trans-unit id="_msg401">
         <source xml:space="preserve">If you have chosen to limit block chain storage (pruning), the historical data must still be downloaded and processed, but will be deleted afterward to keep your disk usage low.</source>
-        <target xml:space="preserve">If you have chosen to limit block chain storage (pruning), the historical data must still be downloaded and processed, but will be deleted afterward to keep your disk usage low.</target>
         <context-group purpose="location"><context context-type="linenumber">226</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg372" approved="yes">
+      <trans-unit id="_msg402">
         <source xml:space="preserve">Use the default data directory</source>
-        <target xml:space="preserve">Use the default data directory</target>
         <context-group purpose="location"><context context-type="linenumber">66</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg373" approved="yes">
+      <trans-unit id="_msg403">
         <source xml:space="preserve">Use a custom data directory:</source>
-        <target xml:space="preserve">Use a custom data directory:</target>
         <context-group purpose="location"><context context-type="linenumber">73</context></context-group>
       </trans-unit>
     </group>
   </body></file>
-  <file original="../forms/masternodelist.ui" datatype="x-trolltech-designer-ui" source-language="en" target-language="en"><body>
+  <file original="../forms/masternodelist.ui" datatype="x-trolltech-designer-ui" source-language="en"><body>
     <group restype="x-trolltech-linguist-context" resname="MasternodeList">
-      <trans-unit id="_msg374" approved="yes">
+      <trans-unit id="_msg404">
         <source xml:space="preserve">Form</source>
-        <target xml:space="preserve">Form</target>
         <context-group purpose="location"><context context-type="linenumber">14</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg375" approved="yes">
+      <trans-unit id="_msg405">
         <source xml:space="preserve">Status</source>
-        <target xml:space="preserve">Status</target>
         <context-group purpose="location"><context context-type="linenumber">142</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg376" approved="yes">
+      <trans-unit id="_msg406">
         <source xml:space="preserve">Filter List:</source>
-        <target xml:space="preserve">Filter List:</target>
         <context-group purpose="location"><context context-type="linenumber">57</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg377" approved="yes">
+      <trans-unit id="_msg407">
         <source xml:space="preserve">Filter masternode list</source>
-        <target xml:space="preserve">Filter masternode list</target>
         <context-group purpose="location"><context context-type="linenumber">64</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg378" approved="yes">
+      <trans-unit id="_msg408">
         <source xml:space="preserve">Node Count:</source>
-        <target xml:space="preserve">Node Count:</target>
         <context-group purpose="location"><context context-type="linenumber">97</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg379" approved="yes">
+      <trans-unit id="_msg409">
         <source xml:space="preserve">Show only masternodes this wallet has keys for.</source>
-        <target xml:space="preserve">Show only masternodes this wallet has keys for.</target>
         <context-group purpose="location"><context context-type="linenumber">74</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg380" approved="yes">
+      <trans-unit id="_msg410">
         <source xml:space="preserve">My masternodes only</source>
-        <target xml:space="preserve">My masternodes only</target>
         <context-group purpose="location"><context context-type="linenumber">77</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg381" approved="yes">
+      <trans-unit id="_msg411">
         <source xml:space="preserve">Service</source>
-        <target xml:space="preserve">Service</target>
         <context-group purpose="location"><context context-type="linenumber">132</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg382" approved="yes">
+      <trans-unit id="_msg412">
         <source xml:space="preserve">Type</source>
-        <target xml:space="preserve">Type</target>
         <context-group purpose="location"><context context-type="linenumber">137</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg383" approved="yes">
+      <trans-unit id="_msg413">
         <source xml:space="preserve">PoSe Score</source>
-        <target xml:space="preserve">PoSe Score</target>
         <context-group purpose="location"><context context-type="linenumber">147</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg384" approved="yes">
+      <trans-unit id="_msg414">
         <source xml:space="preserve">Registered</source>
-        <target xml:space="preserve">Registered</target>
         <context-group purpose="location"><context context-type="linenumber">152</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg385" approved="yes">
+      <trans-unit id="_msg415">
         <source xml:space="preserve">Last Paid</source>
-        <target xml:space="preserve">Last Paid</target>
         <context-group purpose="location"><context context-type="linenumber">157</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg386" approved="yes">
+      <trans-unit id="_msg416">
         <source xml:space="preserve">Next Payment</source>
-        <target xml:space="preserve">Next Payment</target>
         <context-group purpose="location"><context context-type="linenumber">162</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg387" approved="yes">
+      <trans-unit id="_msg417">
         <source xml:space="preserve">Payout Address</source>
-        <target xml:space="preserve">Payout Address</target>
         <context-group purpose="location"><context context-type="linenumber">167</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg388" approved="yes">
+      <trans-unit id="_msg418">
         <source xml:space="preserve">Operator Reward</source>
-        <target xml:space="preserve">Operator Reward</target>
         <context-group purpose="location"><context context-type="linenumber">172</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg389" approved="yes">
+      <trans-unit id="_msg419">
         <source xml:space="preserve">Collateral Address</source>
-        <target xml:space="preserve">Collateral Address</target>
         <context-group purpose="location"><context context-type="linenumber">177</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg390" approved="yes">
+      <trans-unit id="_msg420">
         <source xml:space="preserve">Owner Address</source>
-        <target xml:space="preserve">Owner Address</target>
         <context-group purpose="location"><context context-type="linenumber">182</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg391" approved="yes">
+      <trans-unit id="_msg421">
         <source xml:space="preserve">Voting Address</source>
-        <target xml:space="preserve">Voting Address</target>
         <context-group purpose="location"><context context-type="linenumber">187</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg392" approved="yes">
+      <trans-unit id="_msg422">
         <source xml:space="preserve">Filter by any property (e.g. address or protx hash)</source>
-        <target xml:space="preserve">Filter by any property (e.g. address or protx hash)</target>
         <context-group purpose="location"><context context-type="linenumber">67</context></context-group>
       </trans-unit>
     </group>
   </body></file>
-  <file original="../masternodelist.cpp" datatype="cpp" source-language="en" target-language="en"><body>
+  <file original="../masternodelist.cpp" datatype="cpp" source-language="en"><body>
     <group restype="x-trolltech-linguist-context" resname="MasternodeList">
-      <trans-unit id="_msg393" approved="yes">
+      <trans-unit id="_msg423">
         <source xml:space="preserve">Copy ProTx Hash</source>
-        <target xml:space="preserve">Copy ProTx Hash</target>
-        <context-group purpose="location"><context context-type="linenumber">85</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">83</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg394" approved="yes">
+      <trans-unit id="_msg424">
         <source xml:space="preserve">Copy Collateral Outpoint</source>
-        <target xml:space="preserve">Copy Collateral Outpoint</target>
-        <context-group purpose="location"><context context-type="linenumber">86</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">84</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg395" approved="yes">
+      <trans-unit id="_msg425">
         <source xml:space="preserve">Please wait…</source>
-        <target xml:space="preserve">Please wait…</target>
-        <context-group purpose="location"><context context-type="linenumber">143</context></context-group>
-        <context-group purpose="location"><context context-type="linenumber">323</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">141</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">321</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg396" approved="yes">
+      <trans-unit id="_msg426">
         <source xml:space="preserve">Updating…</source>
-        <target xml:space="preserve">Updating…</target>
-        <context-group purpose="location"><context context-type="linenumber">193</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">191</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg397" approved="yes">
+      <trans-unit id="_msg427">
         <source xml:space="preserve">ENABLED</source>
-        <target xml:space="preserve">ENABLED</target>
-        <context-group purpose="location"><context context-type="linenumber">229</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">227</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg398" approved="yes">
+      <trans-unit id="_msg428">
         <source xml:space="preserve">POSE_BANNED</source>
-        <target xml:space="preserve">POSE_BANNED</target>
-        <context-group purpose="location"><context context-type="linenumber">229</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">227</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg399" approved="yes">
+      <trans-unit id="_msg429">
         <source xml:space="preserve">UNKNOWN</source>
-        <target xml:space="preserve">UNKNOWN</target>
-        <context-group purpose="location"><context context-type="linenumber">243</context></context-group>
-        <context-group purpose="location"><context context-type="linenumber">266</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">241</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">264</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg400" approved="yes">
+      <trans-unit id="_msg430">
         <source xml:space="preserve">to %1</source>
-        <target xml:space="preserve">to %1</target>
-        <context-group purpose="location"><context context-type="linenumber">256</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">254</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg401" approved="yes">
+      <trans-unit id="_msg431">
         <source xml:space="preserve">to UNKNOWN</source>
-        <target xml:space="preserve">to UNKNOWN</target>
-        <context-group purpose="location"><context context-type="linenumber">258</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">256</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg402" approved="yes">
+      <trans-unit id="_msg432">
         <source xml:space="preserve">but not claimed</source>
-        <target xml:space="preserve">but not claimed</target>
-        <context-group purpose="location"><context context-type="linenumber">261</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">259</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg403" approved="yes">
+      <trans-unit id="_msg433">
         <source xml:space="preserve">NONE</source>
-        <target xml:space="preserve">NONE</target>
-        <context-group purpose="location"><context context-type="linenumber">249</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">247</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg404" approved="yes">
+      <trans-unit id="_msg434">
         <source xml:space="preserve">Additional information for DIP3 Masternode %1</source>
-        <target xml:space="preserve">Additional information for DIP3 Masternode %1</target>
-        <context-group purpose="location"><context context-type="linenumber">370</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">368</context></context-group>
       </trans-unit>
     </group>
   </body></file>
-  <file original="../forms/modaloverlay.ui" datatype="x-trolltech-designer-ui" source-language="en" target-language="en"><body>
+  <file original="../forms/modaloverlay.ui" datatype="x-trolltech-designer-ui" source-language="en"><body>
     <group restype="x-trolltech-linguist-context" resname="ModalOverlay">
-      <trans-unit id="_msg405" approved="yes">
+      <trans-unit id="_msg435">
         <source xml:space="preserve">Form</source>
-        <target xml:space="preserve">Form</target>
         <context-group purpose="location"><context context-type="linenumber">14</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg406" approved="yes">
+      <trans-unit id="_msg436">
         <source xml:space="preserve">Recent transactions may not yet be visible, and therefore your wallet&apos;s balance might be incorrect. This information will be correct once your wallet has finished synchronizing with the Dash network, as detailed below.</source>
-        <target xml:space="preserve">Recent transactions may not yet be visible, and therefore your wallet&apos;s balance might be incorrect. This information will be correct once your wallet has finished synchronizing with the Dash network, as detailed below.</target>
         <context-group purpose="location"><context context-type="linenumber">114</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg407" approved="yes">
+      <trans-unit id="_msg437">
         <source xml:space="preserve">Attempting to spend Dash that are affected by not-yet-displayed transactions will not be accepted by the network.</source>
-        <target xml:space="preserve">Attempting to spend Dash that are affected by not-yet-displayed transactions will not be accepted by the network.</target>
         <context-group purpose="location"><context context-type="linenumber">127</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg408" approved="yes">
+      <trans-unit id="_msg438">
         <source xml:space="preserve">Number of blocks left</source>
-        <target xml:space="preserve">Number of blocks left</target>
         <context-group purpose="location"><context context-type="linenumber">187</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg409" approved="yes">
+      <trans-unit id="_msg439">
         <source xml:space="preserve">Unknown…</source>
-        <target xml:space="preserve">Unknown…</target>
         <context-group purpose="location"><context context-type="linenumber">194</context></context-group>
         <context-group purpose="location"><context context-type="linenumber">214</context></context-group>
-        <context-group purpose="location"><context context-type="sourcefile">../modaloverlay.cpp</context><context context-type="linenumber">172</context></context-group>
+        <context-group purpose="location"><context context-type="sourcefile">../modaloverlay.cpp</context><context context-type="linenumber">171</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg410" approved="yes">
+      <trans-unit id="_msg440">
         <source xml:space="preserve">calculating…</source>
-        <target xml:space="preserve">calculating…</target>
         <context-group purpose="location"><context context-type="linenumber">246</context></context-group>
         <context-group purpose="location"><context context-type="linenumber">260</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg411" approved="yes">
+      <trans-unit id="_msg441">
         <source xml:space="preserve">Last block time</source>
-        <target xml:space="preserve">Last block time</target>
         <context-group purpose="location"><context context-type="linenumber">201</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg412" approved="yes">
+      <trans-unit id="_msg442">
         <source xml:space="preserve">Progress</source>
-        <target xml:space="preserve">Progress</target>
         <context-group purpose="location"><context context-type="linenumber">221</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg413" approved="yes">
+      <trans-unit id="_msg443">
         <source xml:space="preserve">Progress increase per hour</source>
-        <target xml:space="preserve">Progress increase per hour</target>
         <context-group purpose="location"><context context-type="linenumber">239</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg414" approved="yes">
+      <trans-unit id="_msg444">
         <source xml:space="preserve">Estimated time left until synced</source>
-        <target xml:space="preserve">Estimated time left until synced</target>
         <context-group purpose="location"><context context-type="linenumber">253</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg415" approved="yes">
+      <trans-unit id="_msg445">
         <source xml:space="preserve">Hide</source>
-        <target xml:space="preserve">Hide</target>
         <context-group purpose="location"><context context-type="linenumber">290</context></context-group>
       </trans-unit>
     </group>
   </body></file>
-  <file original="../modaloverlay.cpp" datatype="cpp" source-language="en" target-language="en"><body>
+  <file original="../modaloverlay.cpp" datatype="cpp" source-language="en"><body>
     <group restype="x-trolltech-linguist-context" resname="ModalOverlay">
-      <trans-unit id="_msg416" approved="yes">
+      <trans-unit id="_msg446">
         <source xml:space="preserve">%1 is currently syncing.  It will download headers and blocks from peers and validate them until reaching the tip of the block chain.</source>
-        <target xml:space="preserve">%1 is currently syncing.  It will download headers and blocks from peers and validate them until reaching the tip of the block chain.</target>
-        <context-group purpose="location"><context context-type="linenumber">49</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">48</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg417" approved="yes">
+      <trans-unit id="_msg447">
         <source xml:space="preserve">Unknown. Syncing Headers (%1, %2%)…</source>
-        <target xml:space="preserve">Unknown. Syncing Headers (%1, %2%)…</target>
-        <context-group purpose="location"><context context-type="linenumber">178</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">177</context></context-group>
       </trans-unit>
     </group>
     <group restype="x-trolltech-linguist-context" resname="QObject">
-      <trans-unit id="_msg418" approved="yes">
+      <trans-unit id="_msg448">
         <source xml:space="preserve">unknown</source>
-        <target xml:space="preserve">unknown</target>
-        <context-group purpose="location"><context context-type="linenumber">143</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">142</context></context-group>
       </trans-unit>
     </group>
   </body></file>
-  <file original="../forms/openuridialog.ui" datatype="x-trolltech-designer-ui" source-language="en" target-language="en"><body>
+  <file original="../forms/openuridialog.ui" datatype="x-trolltech-designer-ui" source-language="en"><body>
     <group restype="x-trolltech-linguist-context" resname="OpenURIDialog">
-      <trans-unit id="_msg419" approved="yes">
+      <trans-unit id="_msg449">
         <source xml:space="preserve">Open URI</source>
-        <target xml:space="preserve">Open URI</target>
         <context-group purpose="location"><context context-type="linenumber">14</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg420" approved="yes">
+      <trans-unit id="_msg450">
         <source xml:space="preserve">URI:</source>
-        <target xml:space="preserve">URI:</target>
         <context-group purpose="location"><context context-type="linenumber">22</context></context-group>
       </trans-unit>
+      <trans-unit id="_msg451">
+        <source xml:space="preserve">Paste address from clipboard</source>
+        <context-group purpose="location"><context context-type="linenumber">36</context></context-group>
+        <note annotates="source" from="developer">Tooltip text for button that allows you to paste an address that is in your clipboard.</note>
+      </trans-unit>
     </group>
   </body></file>
-  <file original="../forms/optionsdialog.ui" datatype="x-trolltech-designer-ui" source-language="en" target-language="en"><body>
+  <file original="../forms/optionsdialog.ui" datatype="x-trolltech-designer-ui" source-language="en"><body>
     <group restype="x-trolltech-linguist-context" resname="OptionsDialog">
-      <trans-unit id="_msg421" approved="yes">
+      <trans-unit id="_msg452">
         <source xml:space="preserve">Options</source>
-        <target xml:space="preserve">Options</target>
         <context-group purpose="location"><context context-type="linenumber">20</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg422" approved="yes">
+      <trans-unit id="_msg453">
         <source xml:space="preserve">&amp;Main</source>
-        <target xml:space="preserve">&amp;Main</target>
         <context-group purpose="location"><context context-type="linenumber">37</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg423" approved="yes">
+      <trans-unit id="_msg454">
         <source xml:space="preserve">Size of &amp;database cache</source>
-        <target xml:space="preserve">Size of &amp;database cache</target>
         <context-group purpose="location"><context context-type="linenumber">223</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg424" approved="yes">
+      <trans-unit id="_msg455">
         <source xml:space="preserve">Number of script &amp;verification threads</source>
-        <target xml:space="preserve">Number of script &amp;verification threads</target>
         <context-group purpose="location"><context context-type="linenumber">269</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg425" approved="yes">
+      <trans-unit id="_msg456">
         <source xml:space="preserve">(0 = auto, &lt;0 = leave that many cores free)</source>
-        <target xml:space="preserve">(0 = auto, &lt;0 = leave that many cores free)</target>
         <context-group purpose="location"><context context-type="linenumber">282</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg426" approved="yes">
+      <trans-unit id="_msg457">
         <source xml:space="preserve">W&amp;allet</source>
-        <target xml:space="preserve">W&amp;allet</target>
         <context-group purpose="location"><context context-type="linenumber">47</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg427" approved="yes">
+      <trans-unit id="_msg458">
         <source xml:space="preserve">&amp;Appearance</source>
-        <target xml:space="preserve">&amp;Appearance</target>
         <context-group purpose="location"><context context-type="linenumber">87</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg428" approved="yes">
+      <trans-unit id="_msg459">
         <source xml:space="preserve">Show the icon in the system tray.</source>
-        <target xml:space="preserve">Show the icon in the system tray.</target>
         <context-group purpose="location"><context context-type="linenumber">135</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg429" approved="yes">
+      <trans-unit id="_msg460">
         <source xml:space="preserve">&amp;Show tray icon</source>
-        <target xml:space="preserve">&amp;Show tray icon</target>
         <context-group purpose="location"><context context-type="linenumber">138</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg430" approved="yes">
+      <trans-unit id="_msg461">
         <source xml:space="preserve">Prune &amp;block storage to</source>
-        <target xml:space="preserve">Prune &amp;block storage to</target>
         <context-group purpose="location"><context context-type="linenumber">173</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg431" approved="yes">
+      <trans-unit id="_msg462">
         <source xml:space="preserve">GB</source>
-        <target xml:space="preserve">GB</target>
         <context-group purpose="location"><context context-type="linenumber">183</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg432" approved="yes">
+      <trans-unit id="_msg463">
         <source xml:space="preserve">Reverting this setting requires re-downloading the entire blockchain.</source>
-        <target xml:space="preserve">Reverting this setting requires re-downloading the entire blockchain.</target>
         <context-group purpose="location"><context context-type="linenumber">208</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg433" approved="yes">
+      <trans-unit id="_msg464">
         <source xml:space="preserve">Maximum database cache size. A larger cache can contribute to faster sync, after which the benefit is less pronounced for most use cases. Lowering the cache size will reduce memory usage. Unused mempool memory is shared for this cache.</source>
-        <target xml:space="preserve">Maximum database cache size. A larger cache can contribute to faster sync, after which the benefit is less pronounced for most use cases. Lowering the cache size will reduce memory usage. Unused mempool memory is shared for this cache.</target>
         <context-group purpose="location"><context context-type="linenumber">220</context></context-group>
         <note annotates="source" from="developer">Tooltip text for Options window setting that sets the size of the database cache. Explains the corresponding effects of increasing/decreasing this value.</note>
       </trans-unit>
-      <trans-unit id="_msg434" approved="yes">
+      <trans-unit id="_msg465">
         <source xml:space="preserve">MiB</source>
-        <target xml:space="preserve">MiB</target>
         <context-group purpose="location"><context context-type="linenumber">239</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg435" approved="yes">
+      <trans-unit id="_msg466">
         <source xml:space="preserve">Set the number of script verification threads. Negative values correspond to the number of cores you want to leave free to the system.</source>
-        <target xml:space="preserve">Set the number of script verification threads. Negative values correspond to the number of cores you want to leave free to the system.</target>
         <context-group purpose="location"><context context-type="linenumber">266</context></context-group>
         <note annotates="source" from="developer">Tooltip text for Options window setting that sets the number of script verification threads. Explains that negative values mean to leave these many cores free to the system.</note>
       </trans-unit>
-      <trans-unit id="_msg436" approved="yes">
+      <trans-unit id="_msg467">
         <source xml:space="preserve">This allows you or a third party tool to communicate with the node through command-line and JSON-RPC commands.</source>
-        <target xml:space="preserve">This allows you or a third party tool to communicate with the node through command-line and JSON-RPC commands.</target>
         <context-group purpose="location"><context context-type="linenumber">304</context></context-group>
         <note annotates="source" from="developer">Tooltip text for Options window setting that enables the RPC server.</note>
       </trans-unit>
-      <trans-unit id="_msg437" approved="yes">
+      <trans-unit id="_msg468">
         <source xml:space="preserve">Enable R&amp;PC server</source>
-        <target xml:space="preserve">Enable R&amp;PC server</target>
         <context-group purpose="location"><context context-type="linenumber">307</context></context-group>
         <note annotates="source" from="developer">An Options window setting to enable the RPC server.</note>
       </trans-unit>
-      <trans-unit id="_msg438" approved="yes">
+      <trans-unit id="_msg469">
         <source xml:space="preserve">Whether to set subtract fee from amount as default or not.</source>
-        <target xml:space="preserve">Whether to set subtract fee from amount as default or not.</target>
         <context-group purpose="location"><context context-type="linenumber">331</context></context-group>
         <note annotates="source" from="developer">Tooltip text for Options window setting that sets subtracting the fee from a sending amount as default.</note>
       </trans-unit>
-      <trans-unit id="_msg439" approved="yes">
+      <trans-unit id="_msg470">
         <source xml:space="preserve">Subtract &amp;fee from amount by default</source>
-        <target xml:space="preserve">Subtract &amp;fee from amount by default</target>
         <context-group purpose="location"><context context-type="linenumber">334</context></context-group>
         <note annotates="source" from="developer">An Options window setting to set subtracting the fee from a sending amount as default.</note>
       </trans-unit>
-      <trans-unit id="_msg440" approved="yes">
-        <source xml:space="preserve">Whether to keep the specified custom change address or not.</source>
-        <target xml:space="preserve">Whether to keep the specified custom change address or not.</target>
+      <trans-unit id="_msg471">
+        <source xml:space="preserve">Enable &amp;PSBT controls</source>
         <context-group purpose="location"><context context-type="linenumber">353</context></context-group>
+        <note annotates="source" from="developer">An options window setting to enable PSBT controls.</note>
       </trans-unit>
-      <trans-unit id="_msg441" approved="yes">
-        <source xml:space="preserve">Keep custom change &amp;address</source>
-        <target xml:space="preserve">Keep custom change &amp;address</target>
+      <trans-unit id="_msg472">
+        <source xml:space="preserve">Whether to show PSBT controls.</source>
         <context-group purpose="location"><context context-type="linenumber">356</context></context-group>
+        <note annotates="source" from="developer">Tooltip text for options window setting that enables PSBT controls.</note>
       </trans-unit>
-      <trans-unit id="_msg442" approved="yes">
-        <source xml:space="preserve">Show additional tab listing all your masternodes in first sub-tab&lt;br/&gt;and all masternodes on the network in second sub-tab.</source>
-        <target xml:space="preserve">Show additional tab listing all your masternodes in first sub-tab&lt;br/&gt;and all masternodes on the network in second sub-tab.</target>
+      <trans-unit id="_msg473">
+        <source xml:space="preserve">Whether to keep the specified custom change address or not.</source>
         <context-group purpose="location"><context context-type="linenumber">363</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg443" approved="yes">
-        <source xml:space="preserve">Show Masternodes Tab</source>
-        <target xml:space="preserve">Show Masternodes Tab</target>
+      <trans-unit id="_msg474">
+        <source xml:space="preserve">Keep custom change &amp;address</source>
         <context-group purpose="location"><context context-type="linenumber">366</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg444" approved="yes">
-        <source xml:space="preserve">Show additional tab listing governance proposals.</source>
-        <target xml:space="preserve">Show additional tab listing governance proposals.</target>
+      <trans-unit id="_msg475">
+        <source xml:space="preserve">Show additional tab listing all your masternodes in first sub-tab&lt;br/&gt;and all masternodes on the network in second sub-tab.</source>
         <context-group purpose="location"><context context-type="linenumber">373</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg445" approved="yes">
-        <source xml:space="preserve">Show Governance Tab</source>
-        <target xml:space="preserve">Show Governance Tab</target>
+      <trans-unit id="_msg476">
+        <source xml:space="preserve">Show Masternodes Tab</source>
         <context-group purpose="location"><context context-type="linenumber">376</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg446" approved="yes">
-        <source xml:space="preserve">If you disable the spending of unconfirmed change, the change from a transaction&lt;br/&gt;cannot be used until that transaction has at least one confirmation.&lt;br/&gt;This also affects how your balance is computed.</source>
-        <target xml:space="preserve">If you disable the spending of unconfirmed change, the change from a transaction&lt;br/&gt;cannot be used until that transaction has at least one confirmation.&lt;br/&gt;This also affects how your balance is computed.</target>
+      <trans-unit id="_msg477">
+        <source xml:space="preserve">Show additional tab listing governance proposals.</source>
         <context-group purpose="location"><context context-type="linenumber">383</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg447" approved="yes">
-        <source xml:space="preserve">Show mixing interface on Overview screen and reveal an additional screen which allows to spend fully mixed coins only.&lt;br/&gt;A new tab with more settings will also appear in this dialog, please make sure to check them before mixing your coins.</source>
-        <target xml:space="preserve">Show mixing interface on Overview screen and reveal an additional screen which allows to spend fully mixed coins only.&lt;br/&gt;A new tab with more settings will also appear in this dialog, please make sure to check them before mixing your coins.</target>
+      <trans-unit id="_msg478">
+        <source xml:space="preserve">Show Governance Tab</source>
+        <context-group purpose="location"><context context-type="linenumber">386</context></context-group>
+      </trans-unit>
+      <trans-unit id="_msg479">
+        <source xml:space="preserve">If you disable the spending of unconfirmed change, the change from a transaction&lt;br/&gt;cannot be used until that transaction has at least one confirmation.&lt;br/&gt;This also affects how your balance is computed.</source>
         <context-group purpose="location"><context context-type="linenumber">393</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg448" approved="yes">
+      <trans-unit id="_msg480">
+        <source xml:space="preserve">Show mixing interface on Overview screen and reveal an additional screen which allows to spend fully mixed coins only.&lt;br/&gt;A new tab with more settings will also appear in this dialog, please make sure to check them before mixing your coins.</source>
+        <context-group purpose="location"><context context-type="linenumber">403</context></context-group>
+      </trans-unit>
+      <trans-unit id="_msg481">
         <source xml:space="preserve">Show additional information and buttons on overview screen.</source>
-        <target xml:space="preserve">Show additional information and buttons on overview screen.</target>
-        <context-group purpose="location"><context context-type="linenumber">422</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">432</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg449" approved="yes">
+      <trans-unit id="_msg482">
         <source xml:space="preserve">Enable advanced interface</source>
-        <target xml:space="preserve">Enable advanced interface</target>
-        <context-group purpose="location"><context context-type="linenumber">425</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">435</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg450" approved="yes">
+      <trans-unit id="_msg483">
         <source xml:space="preserve">Show system popups for mixing transactions&lt;br/&gt;just like for all other transaction types.</source>
-        <target xml:space="preserve">Show system popups for mixing transactions&lt;br/&gt;just like for all other transaction types.</target>
-        <context-group purpose="location"><context context-type="linenumber">432</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">442</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg451" approved="yes">
+      <trans-unit id="_msg484">
         <source xml:space="preserve">Show popups for mixing transactions</source>
-        <target xml:space="preserve">Show popups for mixing transactions</target>
-        <context-group purpose="location"><context context-type="linenumber">435</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">445</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg452" approved="yes">
+      <trans-unit id="_msg485">
         <source xml:space="preserve">Show warning dialog when the wallet has very low number of keys left.</source>
-        <target xml:space="preserve">Show warning dialog when the wallet has very low number of keys left.</target>
-        <context-group purpose="location"><context context-type="linenumber">442</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">452</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg453" approved="yes">
+      <trans-unit id="_msg486">
         <source xml:space="preserve">Warn if the wallet is running out of keys</source>
-        <target xml:space="preserve">Warn if the wallet is running out of keys</target>
-        <context-group purpose="location"><context context-type="linenumber">445</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">455</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg454" approved="yes">
+      <trans-unit id="_msg487">
         <source xml:space="preserve">Whether to use experimental mode with multiple mixing sessions per block.&lt;br/&gt;Note: You must use this feature carefully.&lt;br/&gt;Make sure you always have recent wallet (auto)backup in a safe place!</source>
-        <target xml:space="preserve">Whether to use experimental mode with multiple mixing sessions per block.&lt;br/&gt;Note: You must use this feature carefully.&lt;br/&gt;Make sure you always have recent wallet (auto)backup in a safe place!</target>
-        <context-group purpose="location"><context context-type="linenumber">452</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">462</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg455" approved="yes">
+      <trans-unit id="_msg488">
         <source xml:space="preserve">Enable &amp;multi-session</source>
-        <target xml:space="preserve">Enable &amp;multi-session</target>
-        <context-group purpose="location"><context context-type="linenumber">455</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">465</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg456" approved="yes">
+      <trans-unit id="_msg489">
         <source xml:space="preserve">Use this many separate masternodes in parallel to mix funds.&lt;br/&gt;Note: You must use this feature carefully.&lt;br/&gt;Make sure you always have recent wallet (auto)backup in a safe place!</source>
-        <target xml:space="preserve">Use this many separate masternodes in parallel to mix funds.&lt;br/&gt;Note: You must use this feature carefully.&lt;br/&gt;Make sure you always have recent wallet (auto)backup in a safe place!</target>
-        <context-group purpose="location"><context context-type="linenumber">464</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">474</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg457" approved="yes">
+      <trans-unit id="_msg490">
         <source xml:space="preserve">Parallel sessions</source>
-        <target xml:space="preserve">Parallel sessions</target>
-        <context-group purpose="location"><context context-type="linenumber">467</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">477</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg458" approved="yes">
+      <trans-unit id="_msg491">
         <source xml:space="preserve">Mixing rounds</source>
-        <target xml:space="preserve">Mixing rounds</target>
-        <context-group purpose="location"><context context-type="linenumber">490</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">500</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg459" approved="yes">
+      <trans-unit id="_msg492">
         <source xml:space="preserve">This amount acts as a threshold to turn off mixing once it&apos;s reached.</source>
-        <target xml:space="preserve">This amount acts as a threshold to turn off mixing once it&apos;s reached.</target>
-        <context-group purpose="location"><context context-type="linenumber">510</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">520</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg460" approved="yes">
+      <trans-unit id="_msg493">
         <source xml:space="preserve">Target balance</source>
-        <target xml:space="preserve">Target balance</target>
-        <context-group purpose="location"><context context-type="linenumber">525</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">535</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg461" approved="yes">
+      <trans-unit id="_msg494">
         <source xml:space="preserve">How many inputs of each denominated amount are created.&lt;br/&gt;Lower these numbers if you want fewer smaller denominations.</source>
-        <target xml:space="preserve">How many inputs of each denominated amount are created.&lt;br/&gt;Lower these numbers if you want fewer smaller denominations.</target>
-        <context-group purpose="location"><context context-type="linenumber">548</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">558</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg462" approved="yes">
+      <trans-unit id="_msg495">
         <source xml:space="preserve">Inputs per denomination</source>
-        <target xml:space="preserve">Inputs per denomination</target>
-        <context-group purpose="location"><context context-type="linenumber">551</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">561</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg463" approved="yes">
+      <trans-unit id="_msg496">
         <source xml:space="preserve">Try to create at least this many inputs for each denominated amount.&lt;br/&gt;Lower this number if you want fewer smaller denominations.</source>
-        <target xml:space="preserve">Try to create at least this many inputs for each denominated amount.&lt;br/&gt;Lower this number if you want fewer smaller denominations.</target>
-        <context-group purpose="location"><context context-type="linenumber">562</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">572</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg464" approved="yes">
+      <trans-unit id="_msg497">
         <source xml:space="preserve">Target</source>
-        <target xml:space="preserve">Target</target>
-        <context-group purpose="location"><context context-type="linenumber">565</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">575</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg465" approved="yes">
+      <trans-unit id="_msg498">
         <source xml:space="preserve">Create up to this many inputs for each denominated amount.&lt;br/&gt;Lower this number if you want fewer smaller denominations.</source>
-        <target xml:space="preserve">Create up to this many inputs for each denominated amount.&lt;br/&gt;Lower this number if you want fewer smaller denominations.</target>
-        <context-group purpose="location"><context context-type="linenumber">592</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">602</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg466" approved="yes">
+      <trans-unit id="_msg499">
         <source xml:space="preserve">Maximum</source>
-        <target xml:space="preserve">Maximum</target>
-        <context-group purpose="location"><context context-type="linenumber">595</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">605</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg467" approved="yes">
+      <trans-unit id="_msg500">
         <source xml:space="preserve">Automatically open the Dash Core client port on the router. This only works when your router supports UPnP and it is enabled.</source>
-        <target xml:space="preserve">Automatically open the Dash Core client port on the router. This only works when your router supports UPnP and it is enabled.</target>
-        <context-group purpose="location"><context context-type="linenumber">641</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">651</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg468" approved="yes">
+      <trans-unit id="_msg501">
         <source xml:space="preserve">Map port using NA&amp;T-PMP</source>
-        <target xml:space="preserve">Map port using NA&amp;T-PMP</target>
-        <context-group purpose="location"><context context-type="linenumber">654</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">664</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg469" approved="yes">
+      <trans-unit id="_msg502">
         <source xml:space="preserve">Accept connections from outside.</source>
-        <target xml:space="preserve">Accept connections from outside.</target>
-        <context-group purpose="location"><context context-type="linenumber">661</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">671</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg470" approved="yes">
+      <trans-unit id="_msg503">
         <source xml:space="preserve">Allow incomin&amp;g connections</source>
-        <target xml:space="preserve">Allow incomin&amp;g connections</target>
-        <context-group purpose="location"><context context-type="linenumber">664</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">674</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg471" approved="yes">
+      <trans-unit id="_msg504">
         <source xml:space="preserve">Connect to the Dash network through a SOCKS5 proxy.</source>
-        <target xml:space="preserve">Connect to the Dash network through a SOCKS5 proxy.</target>
-        <context-group purpose="location"><context context-type="linenumber">671</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">681</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg472" approved="yes">
+      <trans-unit id="_msg505">
         <source xml:space="preserve">&amp;Connect through SOCKS5 proxy (default proxy):</source>
-        <target xml:space="preserve">&amp;Connect through SOCKS5 proxy (default proxy):</target>
-        <context-group purpose="location"><context context-type="linenumber">674</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">684</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg473" approved="yes">
+      <trans-unit id="_msg506">
         <source xml:space="preserve">Shows if the supplied default SOCKS5 proxy is used to reach peers via this network type.</source>
-        <target xml:space="preserve">Shows if the supplied default SOCKS5 proxy is used to reach peers via this network type.</target>
-        <context-group purpose="location"><context context-type="linenumber">777</context></context-group>
-        <context-group purpose="location"><context context-type="linenumber">790</context></context-group>
-        <context-group purpose="location"><context context-type="linenumber">803</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">787</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">800</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">813</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg474" approved="yes">
+      <trans-unit id="_msg507">
         <source xml:space="preserve">Language missing or translation incomplete? Help contributing translations here:
 https://explore.transifex.com/dash/dash/</source>
-        <target xml:space="preserve">Language missing or translation incomplete? Help contributing translations here:
-https://explore.transifex.com/dash/dash/</target>
-        <context-group purpose="location"><context context-type="linenumber">972</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">982</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg475" approved="yes">
+      <trans-unit id="_msg508">
+        <source xml:space="preserve">Third-party URLs (e.g. a block explorer) that appear in the transactions tab as context menu items.&lt;br/&gt;%s in the URL is replaced by transaction hash. Multiple URLs are separated by vertical bar |.</source>
+        <context-group purpose="location"><context context-type="linenumber">1046</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">1059</context></context-group>
+      </trans-unit>
+      <trans-unit id="_msg509">
+        <source xml:space="preserve">&amp;Third-party transaction URLs</source>
+        <context-group purpose="location"><context context-type="linenumber">1049</context></context-group>
+      </trans-unit>
+      <trans-unit id="_msg510">
         <source xml:space="preserve">Options set in this dialog are overridden by the command line or in the configuration file:</source>
-        <target xml:space="preserve">Options set in this dialog are overridden by the command line or in the configuration file:</target>
-        <context-group purpose="location"><context context-type="linenumber">1103</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">1113</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg476" approved="yes">
+      <trans-unit id="_msg511">
         <source xml:space="preserve">Minimize instead of exit the application when the window is closed. When this option is enabled, the application will be closed only after selecting Exit in the menu.</source>
-        <target xml:space="preserve">Minimize instead of exit the application when the window is closed. When this option is enabled, the application will be closed only after selecting Exit in the menu.</target>
         <context-group purpose="location"><context context-type="linenumber">158</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg477" approved="yes">
-        <source xml:space="preserve">Third party URLs (e.g. a block explorer) that appear in the transactions tab as context menu items.&lt;br/&gt;%s in the URL is replaced by transaction hash. Multiple URLs are separated by vertical bar |.</source>
-        <target xml:space="preserve">Third party URLs (e.g. a block explorer) that appear in the transactions tab as context menu items.&lt;br/&gt;%s in the URL is replaced by transaction hash. Multiple URLs are separated by vertical bar |.</target>
-        <context-group purpose="location"><context context-type="linenumber">1036</context></context-group>
-        <context-group purpose="location"><context context-type="linenumber">1049</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg478" approved="yes">
-        <source xml:space="preserve">&amp;Third party transaction URLs</source>
-        <target xml:space="preserve">&amp;Third party transaction URLs</target>
-        <context-group purpose="location"><context context-type="linenumber">1039</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg479" approved="yes">
+      <trans-unit id="_msg512">
         <source xml:space="preserve">Whether to show coin control features or not.</source>
-        <target xml:space="preserve">Whether to show coin control features or not.</target>
         <context-group purpose="location"><context context-type="linenumber">343</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg480" approved="yes">
+      <trans-unit id="_msg513">
         <source xml:space="preserve">Automatically start %1 after logging in to the system.</source>
-        <target xml:space="preserve">Automatically start %1 after logging in to the system.</target>
         <context-group purpose="location"><context context-type="linenumber">112</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg481" approved="yes">
+      <trans-unit id="_msg514">
         <source xml:space="preserve">&amp;Start %1 on system login</source>
-        <target xml:space="preserve">&amp;Start %1 on system login</target>
         <context-group purpose="location"><context context-type="linenumber">115</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg482" approved="yes">
+      <trans-unit id="_msg515">
         <source xml:space="preserve">Enable coin &amp;control features</source>
-        <target xml:space="preserve">Enable coin &amp;control features</target>
         <context-group purpose="location"><context context-type="linenumber">346</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg483" approved="yes">
+      <trans-unit id="_msg516">
         <source xml:space="preserve">&amp;Spend unconfirmed change</source>
-        <target xml:space="preserve">&amp;Spend unconfirmed change</target>
-        <context-group purpose="location"><context context-type="linenumber">386</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">396</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg484" approved="yes">
+      <trans-unit id="_msg517">
         <source xml:space="preserve">This setting determines the amount of individual masternodes that an input will be mixed through.&lt;br/&gt;More rounds of mixing gives a higher degree of privacy, but also costs more in fees.</source>
-        <target xml:space="preserve">This setting determines the amount of individual masternodes that an input will be mixed through.&lt;br/&gt;More rounds of mixing gives a higher degree of privacy, but also costs more in fees.</target>
-        <context-group purpose="location"><context context-type="linenumber">487</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">497</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg485" approved="yes">
+      <trans-unit id="_msg518">
         <source xml:space="preserve">&amp;Network</source>
-        <target xml:space="preserve">&amp;Network</target>
         <context-group purpose="location"><context context-type="linenumber">67</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg486" approved="yes">
+      <trans-unit id="_msg519">
         <source xml:space="preserve">Enabling pruning significantly reduces the disk space required to store transactions. All blocks are still fully validated. Reverting this setting requires re-downloading the entire blockchain.</source>
-        <target xml:space="preserve">Enabling pruning significantly reduces the disk space required to store transactions. All blocks are still fully validated. Reverting this setting requires re-downloading the entire blockchain.</target>
         <context-group purpose="location"><context context-type="linenumber">170</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg487" approved="yes">
+      <trans-unit id="_msg520">
         <source xml:space="preserve">Map port using &amp;UPnP</source>
-        <target xml:space="preserve">Map port using &amp;UPnP</target>
-        <context-group purpose="location"><context context-type="linenumber">644</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">654</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg488" approved="yes">
+      <trans-unit id="_msg521">
         <source xml:space="preserve">Automatically open the Dash Core client port on the router. This only works when your router supports NAT-PMP and it is enabled. The external port could be random.</source>
-        <target xml:space="preserve">Automatically open the Dash Core client port on the router. This only works when your router supports NAT-PMP and it is enabled. The external port could be random.</target>
-        <context-group purpose="location"><context context-type="linenumber">651</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">661</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg489" approved="yes">
+      <trans-unit id="_msg522">
         <source xml:space="preserve">Proxy &amp;IP:</source>
-        <target xml:space="preserve">Proxy &amp;IP:</target>
-        <context-group purpose="location"><context context-type="linenumber">683</context></context-group>
-        <context-group purpose="location"><context context-type="linenumber">840</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">693</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">850</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg490" approved="yes">
+      <trans-unit id="_msg523">
         <source xml:space="preserve">IP address of the proxy (e.g. IPv4: 127.0.0.1 / IPv6: ::1)</source>
-        <target xml:space="preserve">IP address of the proxy (e.g. IPv4: 127.0.0.1 / IPv6: ::1)</target>
-        <context-group purpose="location"><context context-type="linenumber">708</context></context-group>
-        <context-group purpose="location"><context context-type="linenumber">865</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">718</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">875</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg491" approved="yes">
+      <trans-unit id="_msg524">
         <source xml:space="preserve">&amp;Port:</source>
-        <target xml:space="preserve">&amp;Port:</target>
-        <context-group purpose="location"><context context-type="linenumber">715</context></context-group>
-        <context-group purpose="location"><context context-type="linenumber">872</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">725</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">882</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg492" approved="yes">
+      <trans-unit id="_msg525">
         <source xml:space="preserve">Port of the proxy (e.g. 9050)</source>
-        <target xml:space="preserve">Port of the proxy (e.g. 9050)</target>
-        <context-group purpose="location"><context context-type="linenumber">740</context></context-group>
-        <context-group purpose="location"><context context-type="linenumber">897</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">750</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">907</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg493" approved="yes">
+      <trans-unit id="_msg526">
         <source xml:space="preserve">Used for reaching peers via:</source>
-        <target xml:space="preserve">Used for reaching peers via:</target>
-        <context-group purpose="location"><context context-type="linenumber">764</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">774</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg494" approved="yes">
+      <trans-unit id="_msg527">
         <source xml:space="preserve">IPv4</source>
-        <target xml:space="preserve">IPv4</target>
-        <context-group purpose="location"><context context-type="linenumber">780</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">790</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg495" approved="yes">
+      <trans-unit id="_msg528">
         <source xml:space="preserve">IPv6</source>
-        <target xml:space="preserve">IPv6</target>
-        <context-group purpose="location"><context context-type="linenumber">793</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">803</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg496" approved="yes">
+      <trans-unit id="_msg529">
         <source xml:space="preserve">Tor</source>
-        <target xml:space="preserve">Tor</target>
-        <context-group purpose="location"><context context-type="linenumber">806</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">816</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg497" approved="yes">
+      <trans-unit id="_msg530">
         <source xml:space="preserve">Show only a tray icon after minimizing the window.</source>
-        <target xml:space="preserve">Show only a tray icon after minimizing the window.</target>
         <context-group purpose="location"><context context-type="linenumber">148</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg498" approved="yes">
+      <trans-unit id="_msg531">
         <source xml:space="preserve">&amp;Minimize to the tray instead of the taskbar</source>
-        <target xml:space="preserve">&amp;Minimize to the tray instead of the taskbar</target>
         <context-group purpose="location"><context context-type="linenumber">151</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg499" approved="yes">
+      <trans-unit id="_msg532">
         <source xml:space="preserve">M&amp;inimize on close</source>
-        <target xml:space="preserve">M&amp;inimize on close</target>
         <context-group purpose="location"><context context-type="linenumber">161</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg500" approved="yes">
+      <trans-unit id="_msg533">
         <source xml:space="preserve">&amp;Display</source>
-        <target xml:space="preserve">&amp;Display</target>
         <context-group purpose="location"><context context-type="linenumber">77</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg501" approved="yes">
+      <trans-unit id="_msg534">
         <source xml:space="preserve">Connect to the Dash network through a separate SOCKS5 proxy for Tor onion services.</source>
-        <target xml:space="preserve">Connect to the Dash network through a separate SOCKS5 proxy for Tor onion services.</target>
-        <context-group purpose="location"><context context-type="linenumber">828</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">838</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg502" approved="yes">
+      <trans-unit id="_msg535">
         <source xml:space="preserve">Use separate SOCKS&amp;5 proxy to reach peers via Tor onion services:</source>
-        <target xml:space="preserve">Use separate SOCKS&amp;5 proxy to reach peers via Tor onion services:</target>
-        <context-group purpose="location"><context context-type="linenumber">831</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">841</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg503" approved="yes">
+      <trans-unit id="_msg536">
         <source xml:space="preserve">User Interface &amp;language:</source>
-        <target xml:space="preserve">User Interface &amp;language:</target>
-        <context-group purpose="location"><context context-type="linenumber">938</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">948</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg504" approved="yes">
+      <trans-unit id="_msg537">
         <source xml:space="preserve">The user interface language can be set here. This setting will take effect after restarting %1.</source>
-        <target xml:space="preserve">The user interface language can be set here. This setting will take effect after restarting %1.</target>
-        <context-group purpose="location"><context context-type="linenumber">951</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">961</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg505" approved="yes">
+      <trans-unit id="_msg538">
         <source xml:space="preserve">&amp;Unit to show amounts in:</source>
-        <target xml:space="preserve">&amp;Unit to show amounts in:</target>
-        <context-group purpose="location"><context context-type="linenumber">998</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">1008</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg506" approved="yes">
+      <trans-unit id="_msg539">
         <source xml:space="preserve">Choose the default subdivision unit to show in the interface and when sending coins.</source>
-        <target xml:space="preserve">Choose the default subdivision unit to show in the interface and when sending coins.</target>
-        <context-group purpose="location"><context context-type="linenumber">1011</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">1021</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg507" approved="yes">
+      <trans-unit id="_msg540">
         <source xml:space="preserve">Decimal digits</source>
-        <target xml:space="preserve">Decimal digits</target>
-        <context-group purpose="location"><context context-type="linenumber">1022</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">1032</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg508" approved="yes">
+      <trans-unit id="_msg541">
         <source xml:space="preserve">Reset all client options to default.</source>
-        <target xml:space="preserve">Reset all client options to default.</target>
-        <context-group purpose="location"><context context-type="linenumber">1149</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">1159</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg509" approved="yes">
+      <trans-unit id="_msg542">
         <source xml:space="preserve">&amp;Reset Options</source>
-        <target xml:space="preserve">&amp;Reset Options</target>
-        <context-group purpose="location"><context context-type="linenumber">1152</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">1162</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg510" approved="yes">
+      <trans-unit id="_msg543">
         <source xml:space="preserve">&amp;OK</source>
-        <target xml:space="preserve">&amp;OK</target>
-        <context-group purpose="location"><context context-type="linenumber">1207</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">1217</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg511" approved="yes">
+      <trans-unit id="_msg544">
         <source xml:space="preserve">&amp;Cancel</source>
-        <target xml:space="preserve">&amp;Cancel</target>
-        <context-group purpose="location"><context context-type="linenumber">1220</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">1230</context></context-group>
       </trans-unit>
     </group>
   </body></file>
-  <file original="../optionsdialog.cpp" datatype="cpp" source-language="en" target-language="en"><body>
+  <file original="../optionsdialog.cpp" datatype="cpp" source-language="en"><body>
     <group restype="x-trolltech-linguist-context" resname="OptionsDialog">
-      <trans-unit id="_msg512" approved="yes">
+      <trans-unit id="_msg545">
         <source xml:space="preserve">Enable %1 features</source>
-        <target xml:space="preserve">Enable %1 features</target>
-        <context-group purpose="location"><context context-type="linenumber">74</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">77</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg513" approved="yes">
+      <trans-unit id="_msg546">
         <source xml:space="preserve">default</source>
-        <target xml:space="preserve">default</target>
-        <context-group purpose="location"><context context-type="linenumber">155</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">158</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg514" approved="yes">
+      <trans-unit id="_msg547">
         <source xml:space="preserve">Confirm options reset</source>
-        <target xml:space="preserve">Confirm options reset</target>
-        <context-group purpose="location"><context context-type="linenumber">399</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">418</context></context-group>
+        <note annotates="source" from="developer">Window title text of pop-up window shown when the user has chosen to reset options.</note>
       </trans-unit>
-      <trans-unit id="_msg515" approved="yes">
+      <trans-unit id="_msg548">
         <source xml:space="preserve">Client restart required to activate changes.</source>
-        <target xml:space="preserve">Client restart required to activate changes.</target>
-        <context-group purpose="location"><context context-type="linenumber">400</context></context-group>
-        <context-group purpose="location"><context context-type="linenumber">455</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">409</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">474</context></context-group>
+        <note annotates="source" from="developer">Text explaining that the settings changed will not come into effect until the client is restarted.</note>
       </trans-unit>
-      <trans-unit id="_msg516" approved="yes">
+      <trans-unit id="_msg549">
+        <source xml:space="preserve">Current settings will be backed up at &quot;%1&quot;.</source>
+        <context-group purpose="location"><context context-type="linenumber">413</context></context-group>
+        <note annotates="source" from="developer">Text explaining to the user that the client&apos;s current settings will be backed up at a specific location. %1 is a stand-in argument for the backup location&apos;s path.</note>
+      </trans-unit>
+      <trans-unit id="_msg550">
         <source xml:space="preserve">Client will be shut down. Do you want to proceed?</source>
-        <target xml:space="preserve">Client will be shut down. Do you want to proceed?</target>
-        <context-group purpose="location"><context context-type="linenumber">400</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">416</context></context-group>
+        <note annotates="source" from="developer">Text asking the user to confirm if they would like to proceed with a client shutdown.</note>
       </trans-unit>
-      <trans-unit id="_msg517" approved="yes">
+      <trans-unit id="_msg551">
         <source xml:space="preserve">This change would require a client restart.</source>
-        <target xml:space="preserve">This change would require a client restart.</target>
-        <context-group purpose="location"><context context-type="linenumber">459</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">478</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg518" approved="yes">
+      <trans-unit id="_msg552">
         <source xml:space="preserve">The supplied proxy address is invalid.</source>
-        <target xml:space="preserve">The supplied proxy address is invalid.</target>
-        <context-group purpose="location"><context context-type="linenumber">487</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">506</context></context-group>
       </trans-unit>
     </group>
   </body></file>
-  <file original="../forms/overviewpage.ui" datatype="x-trolltech-designer-ui" source-language="en" target-language="en"><body>
+  <file original="../forms/overviewpage.ui" datatype="x-trolltech-designer-ui" source-language="en"><body>
     <group restype="x-trolltech-linguist-context" resname="OverviewPage">
-      <trans-unit id="_msg519" approved="yes">
+      <trans-unit id="_msg553">
         <source xml:space="preserve">Form</source>
-        <target xml:space="preserve">Form</target>
         <context-group purpose="location"><context context-type="linenumber">20</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg520" approved="yes">
+      <trans-unit id="_msg554">
         <source xml:space="preserve">The displayed information may be out of date. Your wallet automatically synchronizes with the Dash network after a connection is established, but this process has not completed yet.</source>
-        <target xml:space="preserve">The displayed information may be out of date. Your wallet automatically synchronizes with the Dash network after a connection is established, but this process has not completed yet.</target>
         <context-group purpose="location"><context context-type="linenumber">80</context></context-group>
         <context-group purpose="location"><context context-type="linenumber">378</context></context-group>
         <context-group purpose="location"><context context-type="linenumber">615</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg521" approved="yes">
+      <trans-unit id="_msg555">
         <source xml:space="preserve">Available:</source>
-        <target xml:space="preserve">Available:</target>
         <context-group purpose="location"><context context-type="linenumber">290</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg522" approved="yes">
+      <trans-unit id="_msg556">
         <source xml:space="preserve">Your current spendable balance</source>
-        <target xml:space="preserve">Your current spendable balance</target>
         <context-group purpose="location"><context context-type="linenumber">300</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg523" approved="yes">
+      <trans-unit id="_msg557">
         <source xml:space="preserve">Pending:</source>
-        <target xml:space="preserve">Pending:</target>
         <context-group purpose="location"><context context-type="linenumber">335</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg524" approved="yes">
+      <trans-unit id="_msg558">
         <source xml:space="preserve">Total of transactions that have yet to be confirmed, and do not yet count toward the spendable balance</source>
-        <target xml:space="preserve">Total of transactions that have yet to be confirmed, and do not yet count toward the spendable balance</target>
         <context-group purpose="location"><context context-type="linenumber">135</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg525" approved="yes">
+      <trans-unit id="_msg559">
         <source xml:space="preserve">Immature:</source>
-        <target xml:space="preserve">Immature:</target>
         <context-group purpose="location"><context context-type="linenumber">235</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg526" approved="yes">
+      <trans-unit id="_msg560">
         <source xml:space="preserve">Mined balance that has not yet matured</source>
-        <target xml:space="preserve">Mined balance that has not yet matured</target>
         <context-group purpose="location"><context context-type="linenumber">206</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg527" approved="yes">
+      <trans-unit id="_msg561">
         <source xml:space="preserve">Balances</source>
-        <target xml:space="preserve">Balances</target>
         <context-group purpose="location"><context context-type="linenumber">73</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg528" approved="yes">
+      <trans-unit id="_msg562">
         <source xml:space="preserve">Unconfirmed transactions to watch-only addresses</source>
-        <target xml:space="preserve">Unconfirmed transactions to watch-only addresses</target>
         <context-group purpose="location"><context context-type="linenumber">116</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg529" approved="yes">
+      <trans-unit id="_msg563">
         <source xml:space="preserve">Mined balance in watch-only addresses that has not yet matured</source>
-        <target xml:space="preserve">Mined balance in watch-only addresses that has not yet matured</target>
         <context-group purpose="location"><context context-type="linenumber">154</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg530" approved="yes">
+      <trans-unit id="_msg564">
         <source xml:space="preserve">Total:</source>
-        <target xml:space="preserve">Total:</target>
         <context-group purpose="location"><context context-type="linenumber">196</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg531" approved="yes">
+      <trans-unit id="_msg565">
         <source xml:space="preserve">Your current total balance</source>
-        <target xml:space="preserve">Your current total balance</target>
         <context-group purpose="location"><context context-type="linenumber">245</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg532" approved="yes">
+      <trans-unit id="_msg566">
         <source xml:space="preserve">Current total balance in watch-only addresses</source>
-        <target xml:space="preserve">Current total balance in watch-only addresses</target>
         <context-group purpose="location"><context context-type="linenumber">264</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg533" approved="yes">
+      <trans-unit id="_msg567">
         <source xml:space="preserve">Watch-only:</source>
-        <target xml:space="preserve">Watch-only:</target>
         <context-group purpose="location"><context context-type="linenumber">280</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg534" approved="yes">
+      <trans-unit id="_msg568">
         <source xml:space="preserve">Your current balance in watch-only addresses</source>
-        <target xml:space="preserve">Your current balance in watch-only addresses</target>
         <context-group purpose="location"><context context-type="linenumber">319</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg535" approved="yes">
+      <trans-unit id="_msg569">
         <source xml:space="preserve">Spendable:</source>
-        <target xml:space="preserve">Spendable:</target>
         <context-group purpose="location"><context context-type="linenumber">342</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg536" approved="yes">
+      <trans-unit id="_msg570">
         <source xml:space="preserve">Status:</source>
-        <target xml:space="preserve">Status:</target>
         <context-group purpose="location"><context context-type="linenumber">417</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg537" approved="yes">
+      <trans-unit id="_msg571">
         <source xml:space="preserve">Enabled/Disabled</source>
-        <target xml:space="preserve">Enabled/Disabled</target>
         <context-group purpose="location"><context context-type="linenumber">424</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg538" approved="yes">
+      <trans-unit id="_msg572">
         <source xml:space="preserve">Completion:</source>
-        <target xml:space="preserve">Completion:</target>
         <context-group purpose="location"><context context-type="linenumber">431</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg539" approved="yes">
+      <trans-unit id="_msg573">
         <source xml:space="preserve">Amount and Rounds:</source>
-        <target xml:space="preserve">Amount and Rounds:</target>
         <context-group purpose="location"><context context-type="linenumber">465</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg540" approved="yes">
+      <trans-unit id="_msg574">
         <source xml:space="preserve">0 DASH / 0 Rounds</source>
-        <target xml:space="preserve">0 DASH / 0 Rounds</target>
         <context-group purpose="location"><context context-type="linenumber">472</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg541" approved="yes">
+      <trans-unit id="_msg575">
         <source xml:space="preserve">Submitted Denom:</source>
-        <target xml:space="preserve">Submitted Denom:</target>
         <context-group purpose="location"><context context-type="linenumber">479</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg542" approved="yes">
+      <trans-unit id="_msg576">
         <source xml:space="preserve">n/a</source>
-        <target xml:space="preserve">n/a</target>
         <context-group purpose="location"><context context-type="linenumber">489</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg543" approved="yes">
+      <trans-unit id="_msg577">
         <source xml:space="preserve">Recent transactions</source>
-        <target xml:space="preserve">Recent transactions</target>
         <context-group purpose="location"><context context-type="linenumber">608</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg544" approved="yes">
+      <trans-unit id="_msg578">
         <source xml:space="preserve">Start/Stop Mixing</source>
-        <target xml:space="preserve">Start/Stop Mixing</target>
         <context-group purpose="location"><context context-type="linenumber">527</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg545" approved="yes">
+      <trans-unit id="_msg579">
         <source xml:space="preserve">The denominations you submitted to the Masternode.&lt;br&gt;To mix, other users must submit the exact same denominations.</source>
-        <target xml:space="preserve">The denominations you submitted to the Masternode.&lt;br&gt;To mix, other users must submit the exact same denominations.</target>
         <context-group purpose="location"><context context-type="linenumber">486</context></context-group>
       </trans-unit>
     </group>
   </body></file>
-  <file original="../overviewpage.cpp" datatype="cpp" source-language="en" target-language="en"><body>
+  <file original="../overviewpage.cpp" datatype="cpp" source-language="en"><body>
     <group restype="x-trolltech-linguist-context" resname="OverviewPage">
-      <trans-unit id="_msg546" approved="yes">
+      <trans-unit id="_msg580">
         <source xml:space="preserve">out of sync</source>
-        <target xml:space="preserve">out of sync</target>
         <context-group purpose="location"><context context-type="linenumber">181</context></context-group>
         <context-group purpose="location"><context context-type="linenumber">182</context></context-group>
         <context-group purpose="location"><context context-type="linenumber">183</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg547" approved="yes">
+      <trans-unit id="_msg581">
         <source xml:space="preserve">Automatic backups are disabled, no mixing available!</source>
-        <target xml:space="preserve">Automatic backups are disabled, no mixing available!</target>
-        <context-group purpose="location"><context context-type="linenumber">499</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">504</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg548" approved="yes">
+      <trans-unit id="_msg582">
         <source xml:space="preserve">No inputs detected</source>
-        <target xml:space="preserve">No inputs detected</target>
-        <context-group purpose="location"><context context-type="linenumber">385</context></context-group>
-        <context-group purpose="location"><context context-type="linenumber">391</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">388</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">394</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg549" approved="yes">
+      <trans-unit id="_msg583">
         <source xml:space="preserve">%1 Balance</source>
-        <target xml:space="preserve">%1 Balance</target>
         <context-group purpose="location"><context context-type="linenumber">187</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg550" approved="yes">
+      <trans-unit id="_msg584">
         <source xml:space="preserve">Discreet mode activated for the Overview tab. To unmask the values, uncheck Settings-&gt;Discreet mode.</source>
-        <target xml:space="preserve">Discreet mode activated for the Overview tab. To unmask the values, uncheck Settings-&gt;Discreet mode.</target>
-        <context-group purpose="location"><context context-type="linenumber">215</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">219</context></context-group>
       </trans-unit>
       <group restype="x-gettext-plurals">
-        <context-group purpose="location"><context context-type="linenumber">389</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">392</context></context-group>
         <context-group purpose="location"><context context-type="linenumber">409</context></context-group>
-        <context-group purpose="location"><context context-type="linenumber">420</context></context-group>
-        <trans-unit id="_msg551[0]" approved="yes">
+        <context-group purpose="location"><context context-type="linenumber">415</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">426</context></context-group>
+        <trans-unit id="_msg585[0]">
           <source xml:space="preserve">%n Rounds</source>
-          <target xml:space="preserve">%n Round</target>
         </trans-unit>
-        <trans-unit id="_msg551[1]" approved="yes">
+        <trans-unit id="_msg585[1]">
           <source xml:space="preserve">%n Rounds</source>
-          <target xml:space="preserve">%n Rounds</target>
         </trans-unit>
       </group>
-      <trans-unit id="_msg552" approved="yes">
+      <trans-unit id="_msg586">
         <source xml:space="preserve">Found enough compatible inputs to mix %1</source>
-        <target xml:space="preserve">Found enough compatible inputs to mix %1</target>
-        <context-group purpose="location"><context context-type="linenumber">406</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">412</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg553" approved="yes">
+      <trans-unit id="_msg587">
         <source xml:space="preserve">Not enough compatible inputs to mix &lt;span style=&apos;%1&apos;&gt;%2&lt;/span&gt;,&lt;br&gt;will mix &lt;span style=&apos;%1&apos;&gt;%3&lt;/span&gt; instead</source>
-        <target xml:space="preserve">Not enough compatible inputs to mix &lt;span style=&apos;%1&apos;&gt;%2&lt;/span&gt;,&lt;br&gt;will mix &lt;span style=&apos;%1&apos;&gt;%3&lt;/span&gt; instead</target>
-        <context-group purpose="location"><context context-type="linenumber">412</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">418</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg554" approved="yes">
+      <trans-unit id="_msg588">
         <source xml:space="preserve">Overall progress</source>
-        <target xml:space="preserve">Overall progress</target>
-        <context-group purpose="location"><context context-type="linenumber">471</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">476</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg555" approved="yes">
+      <trans-unit id="_msg589">
         <source xml:space="preserve">Denominated</source>
-        <target xml:space="preserve">Denominated</target>
-        <context-group purpose="location"><context context-type="linenumber">472</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">477</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg556" approved="yes">
+      <trans-unit id="_msg590">
         <source xml:space="preserve">Partially mixed</source>
-        <target xml:space="preserve">Partially mixed</target>
-        <context-group purpose="location"><context context-type="linenumber">473</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">478</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg557" approved="yes">
+      <trans-unit id="_msg591">
         <source xml:space="preserve">Mixed</source>
-        <target xml:space="preserve">Mixed</target>
-        <context-group purpose="location"><context context-type="linenumber">474</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">479</context></context-group>
       </trans-unit>
       <group restype="x-gettext-plurals">
-        <context-group purpose="location"><context context-type="linenumber">475</context></context-group>
-        <trans-unit id="_msg558[0]" approved="yes">
+        <context-group purpose="location"><context context-type="linenumber">480</context></context-group>
+        <trans-unit id="_msg592[0]">
           <source xml:space="preserve">Denominated inputs have %5 of %n rounds on average</source>
-          <target xml:space="preserve">Denominated inputs have %5 of %n round on average</target>
         </trans-unit>
-        <trans-unit id="_msg558[1]" approved="yes">
+        <trans-unit id="_msg592[1]">
           <source xml:space="preserve">Denominated inputs have %5 of %n rounds on average</source>
-          <target xml:space="preserve">Denominated inputs have %5 of %n rounds on average</target>
         </trans-unit>
       </group>
-      <trans-unit id="_msg559" approved="yes">
+      <trans-unit id="_msg593">
         <source xml:space="preserve">keys left: %1</source>
-        <target xml:space="preserve">keys left: %1</target>
-        <context-group purpose="location"><context context-type="linenumber">557</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">562</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg560" approved="yes">
+      <trans-unit id="_msg594">
         <source xml:space="preserve">Start %1</source>
-        <target xml:space="preserve">Start %1</target>
-        <context-group purpose="location"><context context-type="linenumber">575</context></context-group>
-        <context-group purpose="location"><context context-type="linenumber">710</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">580</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">715</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg561" approved="yes">
+      <trans-unit id="_msg595">
         <source xml:space="preserve">If you don&apos;t want to see internal %1 fees/transactions select &quot;Most Common&quot; as Type on the &quot;Transactions&quot; tab.</source>
-        <target xml:space="preserve">If you don&apos;t want to see internal %1 fees/transactions select &quot;Most Common&quot; as Type on the &quot;Transactions&quot; tab.</target>
-        <context-group purpose="location"><context context-type="linenumber">673</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">678</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg562" approved="yes">
+      <trans-unit id="_msg596">
         <source xml:space="preserve">%1 requires at least %2 to use.</source>
-        <target xml:space="preserve">%1 requires at least %2 to use.</target>
-        <context-group purpose="location"><context context-type="linenumber">684</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">689</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg563" approved="yes">
+      <trans-unit id="_msg597">
         <source xml:space="preserve">Wallet is locked and user declined to unlock. Disabling %1.</source>
-        <target xml:space="preserve">Wallet is locked and user declined to unlock. Disabling %1.</target>
-        <context-group purpose="location"><context context-type="linenumber">698</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">703</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg564" approved="yes">
+      <trans-unit id="_msg598">
         <source xml:space="preserve">Stop %1</source>
-        <target xml:space="preserve">Stop %1</target>
-        <context-group purpose="location"><context context-type="linenumber">714</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">719</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg565" approved="yes">
+      <trans-unit id="_msg599">
         <source xml:space="preserve">Disabled</source>
-        <target xml:space="preserve">Disabled</target>
-        <context-group purpose="location"><context context-type="linenumber">577</context></context-group>
-        <context-group purpose="location"><context context-type="linenumber">631</context></context-group>
-        <context-group purpose="location"><context context-type="linenumber">750</context></context-group>
-        <context-group purpose="location"><context context-type="linenumber">753</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">582</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">636</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">755</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">758</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg566" approved="yes">
+      <trans-unit id="_msg600">
         <source xml:space="preserve">Very low number of keys left since last automatic backup!</source>
-        <target xml:space="preserve">Very low number of keys left since last automatic backup!</target>
-        <context-group purpose="location"><context context-type="linenumber">596</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">601</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg567" approved="yes">
+      <trans-unit id="_msg601">
         <source xml:space="preserve">We are about to create a new automatic backup for you, however &lt;span style=&apos;%1&apos;&gt; you should always make sure you have backups saved in some safe place&lt;/span&gt;!</source>
-        <target xml:space="preserve">We are about to create a new automatic backup for you, however &lt;span style=&apos;%1&apos;&gt; you should always make sure you have backups saved in some safe place&lt;/span&gt;!</target>
-        <context-group purpose="location"><context context-type="linenumber">597</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">602</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg568" approved="yes">
+      <trans-unit id="_msg602">
         <source xml:space="preserve">Note: You can turn this message off in options.</source>
-        <target xml:space="preserve">Note: You can turn this message off in options.</target>
-        <context-group purpose="location"><context context-type="linenumber">600</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">605</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg569" approved="yes">
+      <trans-unit id="_msg603">
         <source xml:space="preserve">WARNING! Something went wrong on automatic backup</source>
-        <target xml:space="preserve">WARNING! Something went wrong on automatic backup</target>
-        <context-group purpose="location"><context context-type="linenumber">616</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">621</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg570" approved="yes">
+      <trans-unit id="_msg604">
         <source xml:space="preserve">ERROR! Failed to create automatic backup</source>
-        <target xml:space="preserve">ERROR! Failed to create automatic backup</target>
-        <context-group purpose="location"><context context-type="linenumber">624</context></context-group>
-        <context-group purpose="location"><context context-type="linenumber">641</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">629</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">646</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg571" approved="yes">
+      <trans-unit id="_msg605">
         <source xml:space="preserve">Mixing is disabled, please close your wallet and fix the issue!</source>
-        <target xml:space="preserve">Mixing is disabled, please close your wallet and fix the issue!</target>
-        <context-group purpose="location"><context context-type="linenumber">625</context></context-group>
-        <context-group purpose="location"><context context-type="linenumber">643</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">630</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">648</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg572" approved="yes">
+      <trans-unit id="_msg606">
         <source xml:space="preserve">Enabled</source>
-        <target xml:space="preserve">Enabled</target>
-        <context-group purpose="location"><context context-type="linenumber">631</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">636</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg573" approved="yes">
+      <trans-unit id="_msg607">
         <source xml:space="preserve">see debug.log for details.</source>
-        <target xml:space="preserve">see debug.log for details.</target>
-        <context-group purpose="location"><context context-type="linenumber">642</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">647</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg574" approved="yes">
+      <trans-unit id="_msg608">
         <source xml:space="preserve">WARNING! Failed to replenish keypool, please unlock your wallet to do so.</source>
-        <target xml:space="preserve">WARNING! Failed to replenish keypool, please unlock your wallet to do so.</target>
-        <context-group purpose="location"><context context-type="linenumber">649</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">654</context></context-group>
       </trans-unit>
     </group>
   </body></file>
-  <file original="../forms/psbtoperationsdialog.ui" datatype="x-trolltech-designer-ui" source-language="en" target-language="en"><body>
+  <file original="../forms/psbtoperationsdialog.ui" datatype="x-trolltech-designer-ui" source-language="en"><body>
     <group restype="x-trolltech-linguist-context" resname="PSBTOperationsDialog">
-      <trans-unit id="_msg575" approved="yes">
+      <trans-unit id="_msg609">
         <source xml:space="preserve">Dialog</source>
-        <target xml:space="preserve">Dialog</target>
         <context-group purpose="location"><context context-type="linenumber">14</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg576" approved="yes">
+      <trans-unit id="_msg610">
         <source xml:space="preserve">Sign Tx</source>
-        <target xml:space="preserve">Sign Tx</target>
         <context-group purpose="location"><context context-type="linenumber">86</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg577" approved="yes">
+      <trans-unit id="_msg611">
         <source xml:space="preserve">Broadcast Tx</source>
-        <target xml:space="preserve">Broadcast Tx</target>
         <context-group purpose="location"><context context-type="linenumber">102</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg578" approved="yes">
+      <trans-unit id="_msg612">
         <source xml:space="preserve">Copy to Clipboard</source>
-        <target xml:space="preserve">Copy to Clipboard</target>
         <context-group purpose="location"><context context-type="linenumber">122</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg579" approved="yes">
+      <trans-unit id="_msg613">
         <source xml:space="preserve">Save…</source>
-        <target xml:space="preserve">Save…</target>
         <context-group purpose="location"><context context-type="linenumber">129</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg580" approved="yes">
+      <trans-unit id="_msg614">
         <source xml:space="preserve">Close</source>
-        <target xml:space="preserve">Close</target>
         <context-group purpose="location"><context context-type="linenumber">136</context></context-group>
       </trans-unit>
     </group>
   </body></file>
-  <file original="../psbtoperationsdialog.cpp" datatype="cpp" source-language="en" target-language="en"><body>
+  <file original="../psbtoperationsdialog.cpp" datatype="cpp" source-language="en"><body>
     <group restype="x-trolltech-linguist-context" resname="PSBTOperationsDialog">
-      <trans-unit id="_msg581" approved="yes">
+      <trans-unit id="_msg615">
         <source xml:space="preserve">Failed to load transaction: %1</source>
-        <target xml:space="preserve">Failed to load transaction: %1</target>
-        <context-group purpose="location"><context context-type="linenumber">58</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">61</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg582" approved="yes">
+      <trans-unit id="_msg616">
         <source xml:space="preserve">Failed to sign transaction: %1</source>
-        <target xml:space="preserve">Failed to sign transaction: %1</target>
-        <context-group purpose="location"><context context-type="linenumber">83</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">86</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg583">
+      <trans-unit id="_msg617">
         <source xml:space="preserve">Cannot sign inputs while wallet is locked.</source>
-        <target xml:space="preserve"></target>
-        <context-group purpose="location"><context context-type="linenumber">91</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">94</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg584" approved="yes">
+      <trans-unit id="_msg618">
         <source xml:space="preserve">Could not sign any more inputs.</source>
-        <target xml:space="preserve">Could not sign any more inputs.</target>
-        <context-group purpose="location"><context context-type="linenumber">93</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">96</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg585" approved="yes">
+      <trans-unit id="_msg619">
         <source xml:space="preserve">Signed %1 inputs, but more signatures are still required.</source>
-        <target xml:space="preserve">Signed %1 inputs, but more signatures are still required.</target>
-        <context-group purpose="location"><context context-type="linenumber">95</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">98</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg586" approved="yes">
+      <trans-unit id="_msg620">
         <source xml:space="preserve">Signed transaction successfully. Transaction is ready to broadcast.</source>
-        <target xml:space="preserve">Signed transaction successfully. Transaction is ready to broadcast.</target>
-        <context-group purpose="location"><context context-type="linenumber">98</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">101</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg587" approved="yes">
+      <trans-unit id="_msg621">
         <source xml:space="preserve">Unknown error processing transaction.</source>
-        <target xml:space="preserve">Unknown error processing transaction.</target>
-        <context-group purpose="location"><context context-type="linenumber">110</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">113</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg588" approved="yes">
+      <trans-unit id="_msg622">
         <source xml:space="preserve">Transaction broadcast successfully! Transaction ID: %1</source>
-        <target xml:space="preserve">Transaction broadcast successfully! Transaction ID: %1</target>
-        <context-group purpose="location"><context context-type="linenumber">120</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">123</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg589" approved="yes">
+      <trans-unit id="_msg623">
         <source xml:space="preserve">Transaction broadcast failed: %1</source>
-        <target xml:space="preserve">Transaction broadcast failed: %1</target>
-        <context-group purpose="location"><context context-type="linenumber">123</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">126</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg590" approved="yes">
+      <trans-unit id="_msg624">
         <source xml:space="preserve">PSBT copied to clipboard.</source>
-        <target xml:space="preserve">PSBT copied to clipboard.</target>
-        <context-group purpose="location"><context context-type="linenumber">132</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">135</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg591" approved="yes">
+      <trans-unit id="_msg625">
         <source xml:space="preserve">Save Transaction Data</source>
-        <target xml:space="preserve">Save Transaction Data</target>
-        <context-group purpose="location"><context context-type="linenumber">155</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">158</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg592" approved="yes">
+      <trans-unit id="_msg626">
         <source xml:space="preserve">Partially Signed Transaction (Binary)</source>
-        <target xml:space="preserve">Partially Signed Transaction (Binary)</target>
-        <context-group purpose="location"><context context-type="linenumber">157</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">160</context></context-group>
         <note annotates="source" from="developer">Expanded name of the binary PSBT file format. See: BIP 174.</note>
       </trans-unit>
-      <trans-unit id="_msg593" approved="yes">
+      <trans-unit id="_msg627">
         <source xml:space="preserve">PSBT saved to disk.</source>
-        <target xml:space="preserve">PSBT saved to disk.</target>
-        <context-group purpose="location"><context context-type="linenumber">164</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">167</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg594" approved="yes">
+      <trans-unit id="_msg628">
         <source xml:space="preserve"> * Sends %1 to %2</source>
-        <target xml:space="preserve"> * Sends %1 to %2</target>
-        <context-group purpose="location"><context context-type="linenumber">180</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">183</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg595" approved="yes">
+      <trans-unit id="_msg629">
         <source xml:space="preserve">own address</source>
-        <target xml:space="preserve">own address</target>
-        <context-group purpose="location"><context context-type="linenumber">184</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">187</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg596" approved="yes">
+      <trans-unit id="_msg630">
         <source xml:space="preserve">Unable to calculate transaction fee or total transaction amount.</source>
-        <target xml:space="preserve">Unable to calculate transaction fee or total transaction amount.</target>
-        <context-group purpose="location"><context context-type="linenumber">192</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">195</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg597" approved="yes">
+      <trans-unit id="_msg631">
         <source xml:space="preserve">Pays transaction fee: </source>
-        <target xml:space="preserve">Pays transaction fee: </target>
-        <context-group purpose="location"><context context-type="linenumber">194</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">197</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg598" approved="yes">
+      <trans-unit id="_msg632">
         <source xml:space="preserve">Total Amount</source>
-        <target xml:space="preserve">Total Amount</target>
-        <context-group purpose="location"><context context-type="linenumber">206</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">209</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg599" approved="yes">
+      <trans-unit id="_msg633">
         <source xml:space="preserve">or</source>
-        <target xml:space="preserve">or</target>
-        <context-group purpose="location"><context context-type="linenumber">209</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">212</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg600" approved="yes">
+      <trans-unit id="_msg634">
         <source xml:space="preserve">Transaction has %1 unsigned inputs.</source>
-        <target xml:space="preserve">Transaction has %1 unsigned inputs.</target>
-        <context-group purpose="location"><context context-type="linenumber">215</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">218</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg601" approved="yes">
+      <trans-unit id="_msg635">
         <source xml:space="preserve">Transaction is missing some information about inputs.</source>
-        <target xml:space="preserve">Transaction is missing some information about inputs.</target>
-        <context-group purpose="location"><context context-type="linenumber">261</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">264</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg602" approved="yes">
+      <trans-unit id="_msg636">
         <source xml:space="preserve">Transaction still needs signature(s).</source>
-        <target xml:space="preserve">Transaction still needs signature(s).</target>
-        <context-group purpose="location"><context context-type="linenumber">265</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">268</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg603" approved="yes">
+      <trans-unit id="_msg637">
         <source xml:space="preserve">(But no wallet is loaded.)</source>
-        <target xml:space="preserve">(But no wallet is loaded.)</target>
-        <context-group purpose="location"><context context-type="linenumber">268</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">271</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg604" approved="yes">
+      <trans-unit id="_msg638">
         <source xml:space="preserve">(But this wallet cannot sign transactions.)</source>
-        <target xml:space="preserve">(But this wallet cannot sign transactions.)</target>
-        <context-group purpose="location"><context context-type="linenumber">271</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">274</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg605" approved="yes">
+      <trans-unit id="_msg639">
         <source xml:space="preserve">(But this wallet does not have the right keys.)</source>
-        <target xml:space="preserve">(But this wallet does not have the right keys.)</target>
-        <context-group purpose="location"><context context-type="linenumber">274</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">277</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg606" approved="yes">
+      <trans-unit id="_msg640">
         <source xml:space="preserve">Transaction is fully signed and ready for broadcast.</source>
-        <target xml:space="preserve">Transaction is fully signed and ready for broadcast.</target>
-        <context-group purpose="location"><context context-type="linenumber">282</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">285</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg607" approved="yes">
+      <trans-unit id="_msg641">
         <source xml:space="preserve">Transaction status is unknown.</source>
-        <target xml:space="preserve">Transaction status is unknown.</target>
-        <context-group purpose="location"><context context-type="linenumber">286</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">289</context></context-group>
       </trans-unit>
     </group>
   </body></file>
-  <file original="../paymentserver.cpp" datatype="cpp" source-language="en" target-language="en"><body>
+  <file original="../paymentserver.cpp" datatype="cpp" source-language="en"><body>
     <group restype="x-trolltech-linguist-context" resname="PaymentServer">
-      <trans-unit id="_msg608" approved="yes">
+      <trans-unit id="_msg642">
         <source xml:space="preserve">Payment request error</source>
-        <target xml:space="preserve">Payment request error</target>
-        <context-group purpose="location"><context context-type="linenumber">153</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">151</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg609" approved="yes">
+      <trans-unit id="_msg643">
         <source xml:space="preserve">Cannot start dash: click-to-pay handler</source>
-        <target xml:space="preserve">Cannot start dash: click-to-pay handler</target>
-        <context-group purpose="location"><context context-type="linenumber">154</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">152</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg610" approved="yes">
+      <trans-unit id="_msg644">
         <source xml:space="preserve">URI handling</source>
-        <target xml:space="preserve">URI handling</target>
-        <context-group purpose="location"><context context-type="linenumber">204</context></context-group>
-        <context-group purpose="location"><context context-type="linenumber">220</context></context-group>
-        <context-group purpose="location"><context context-type="linenumber">225</context></context-group>
-        <context-group purpose="location"><context context-type="linenumber">233</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">200</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">216</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">221</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">229</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg611" approved="yes">
+      <trans-unit id="_msg645">
         <source xml:space="preserve">&apos;dash://&apos; is not a valid URI. Use &apos;dash:&apos; instead.</source>
-        <target xml:space="preserve">&apos;dash://&apos; is not a valid URI. Use &apos;dash:&apos; instead.</target>
-        <context-group purpose="location"><context context-type="linenumber">204</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">200</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg612" approved="yes">
+      <trans-unit id="_msg646">
         <source xml:space="preserve">Cannot process payment request as BIP70 is no longer supported.
 Due to discontinued support, you should request the merchant to provide you with a BIP21 compatible URI or use a wallet that does continue to support BIP70.</source>
-        <target xml:space="preserve">Cannot process payment request as BIP70 is no longer supported.
-Due to discontinued support, you should request the merchant to provide you with a BIP21 compatible URI or use a wallet that does continue to support BIP70.</target>
-        <context-group purpose="location"><context context-type="linenumber">221</context></context-group>
-        <context-group purpose="location"><context context-type="linenumber">244</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">217</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">240</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg613" approved="yes">
+      <trans-unit id="_msg647">
         <source xml:space="preserve">URI cannot be parsed! This can be caused by an invalid Dash address or malformed URI parameters.</source>
-        <target xml:space="preserve">URI cannot be parsed! This can be caused by an invalid Dash address or malformed URI parameters.</target>
-        <context-group purpose="location"><context context-type="linenumber">234</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">230</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg614" approved="yes">
+      <trans-unit id="_msg648">
         <source xml:space="preserve">Payment request file handling</source>
-        <target xml:space="preserve">Payment request file handling</target>
-        <context-group purpose="location"><context context-type="linenumber">243</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">239</context></context-group>
       </trans-unit>
     </group>
   </body></file>
-  <file original="../peertablemodel.h" datatype="c" source-language="en" target-language="en"><body>
+  <file original="../peertablemodel.h" datatype="c" source-language="en"><body>
     <group restype="x-trolltech-linguist-context" resname="PeerTableModel">
-      <trans-unit id="_msg615" approved="yes">
+      <trans-unit id="_msg649">
         <source xml:space="preserve">User Agent</source>
-        <target xml:space="preserve">User Agent</target>
         <context-group purpose="location"><context context-type="linenumber">112</context></context-group>
         <note annotates="source" from="developer">Title of Peers Table column which contains the peer&apos;s User Agent string.</note>
       </trans-unit>
-      <trans-unit id="_msg616" approved="yes">
+      <trans-unit id="_msg650">
         <source xml:space="preserve">Ping</source>
-        <target xml:space="preserve">Ping</target>
         <context-group purpose="location"><context context-type="linenumber">103</context></context-group>
         <note annotates="source" from="developer">Title of Peers Table column which indicates the current latency of the connection with the peer.</note>
       </trans-unit>
-      <trans-unit id="_msg617" approved="yes">
+      <trans-unit id="_msg651">
         <source xml:space="preserve">Peer</source>
-        <target xml:space="preserve">Peer</target>
         <context-group purpose="location"><context context-type="linenumber">85</context></context-group>
         <note annotates="source" from="developer">Title of Peers Table column which contains a unique number used to identify a connection.</note>
       </trans-unit>
-      <trans-unit id="_msg618" approved="yes">
+      <trans-unit id="_msg652">
         <source xml:space="preserve">Age</source>
-        <target xml:space="preserve">Age</target>
         <context-group purpose="location"><context context-type="linenumber">88</context></context-group>
         <note annotates="source" from="developer">Title of Peers Table column which indicates the duration (length of time) since the peer connection started.</note>
       </trans-unit>
-      <trans-unit id="_msg619" approved="yes">
+      <trans-unit id="_msg653">
         <source xml:space="preserve">Direction</source>
-        <target xml:space="preserve">Direction</target>
         <context-group purpose="location"><context context-type="linenumber">94</context></context-group>
         <note annotates="source" from="developer">Title of Peers Table column which indicates the direction the peer connection was initiated from.</note>
       </trans-unit>
-      <trans-unit id="_msg620" approved="yes">
+      <trans-unit id="_msg654">
         <source xml:space="preserve">Type</source>
-        <target xml:space="preserve">Type</target>
         <context-group purpose="location"><context context-type="linenumber">97</context></context-group>
         <note annotates="source" from="developer">Title of Peers Table column which describes the type of peer connection. The &quot;type&quot; describes why the connection exists.</note>
       </trans-unit>
-      <trans-unit id="_msg621" approved="yes">
+      <trans-unit id="_msg655">
         <source xml:space="preserve">Sent</source>
-        <target xml:space="preserve">Sent</target>
         <context-group purpose="location"><context context-type="linenumber">106</context></context-group>
         <note annotates="source" from="developer">Title of Peers Table column which indicates the total amount of network information we have sent to the peer.</note>
       </trans-unit>
-      <trans-unit id="_msg622" approved="yes">
+      <trans-unit id="_msg656">
         <source xml:space="preserve">Received</source>
-        <target xml:space="preserve">Received</target>
         <context-group purpose="location"><context context-type="linenumber">109</context></context-group>
         <note annotates="source" from="developer">Title of Peers Table column which indicates the total amount of network information we have received from the peer.</note>
       </trans-unit>
-      <trans-unit id="_msg623" approved="yes">
+      <trans-unit id="_msg657">
         <source xml:space="preserve">Address</source>
-        <target xml:space="preserve">Address</target>
         <context-group purpose="location"><context context-type="linenumber">91</context></context-group>
         <note annotates="source" from="developer">Title of Peers Table column which contains the IP/Onion/I2P address of the connected peer.</note>
       </trans-unit>
-      <trans-unit id="_msg624" approved="yes">
+      <trans-unit id="_msg658">
         <source xml:space="preserve">Network</source>
-        <target xml:space="preserve">Network</target>
         <context-group purpose="location"><context context-type="linenumber">100</context></context-group>
         <note annotates="source" from="developer">Title of Peers Table column which states the network the peer connected through.</note>
       </trans-unit>
     </group>
   </body></file>
-  <file original="../peertablemodel.cpp" datatype="cpp" source-language="en" target-language="en"><body>
+  <file original="../peertablemodel.cpp" datatype="cpp" source-language="en"><body>
     <group restype="x-trolltech-linguist-context" resname="PeerTableModel">
-      <trans-unit id="_msg625" approved="yes">
+      <trans-unit id="_msg659">
         <source xml:space="preserve">Inbound</source>
-        <target xml:space="preserve">Inbound</target>
-        <context-group purpose="location"><context context-type="linenumber">81</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">77</context></context-group>
         <note annotates="source" from="developer">An Inbound Connection from a Peer.</note>
       </trans-unit>
-      <trans-unit id="_msg626" approved="yes">
+      <trans-unit id="_msg660">
         <source xml:space="preserve">Outbound</source>
-        <target xml:space="preserve">Outbound</target>
-        <context-group purpose="location"><context context-type="linenumber">83</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">79</context></context-group>
         <note annotates="source" from="developer">An Outbound Connection to a Peer.</note>
       </trans-unit>
     </group>
   </body></file>
-  <file original="../bitcoinunits.cpp" datatype="cpp" source-language="en" target-language="en"><body>
+  <file original="../forms/proposalwizard.ui" datatype="x-trolltech-designer-ui" source-language="en"><body>
+    <group restype="x-trolltech-linguist-context" resname="ProposalWizard">
+      <trans-unit id="_msg661">
+        <source xml:space="preserve">Create Governance Proposal</source>
+        <context-group purpose="location"><context context-type="linenumber">14</context></context-group>
+      </trans-unit>
+      <trans-unit id="_msg662">
+        <source xml:space="preserve">Enter proposal details</source>
+        <context-group purpose="location"><context context-type="linenumber">54</context></context-group>
+      </trans-unit>
+      <trans-unit id="_msg663">
+        <source xml:space="preserve">A fee will be burned when you prepare the proposal.</source>
+        <context-group purpose="location"><context context-type="linenumber">70</context></context-group>
+      </trans-unit>
+      <trans-unit id="_msg664">
+        <source xml:space="preserve">Proposal &amp;name</source>
+        <context-group purpose="location"><context context-type="linenumber">97</context></context-group>
+      </trans-unit>
+      <trans-unit id="_msg665">
+        <source xml:space="preserve">&amp;Description URL</source>
+        <context-group purpose="location"><context context-type="linenumber">123</context></context-group>
+      </trans-unit>
+      <trans-unit id="_msg666">
+        <source xml:space="preserve">Payment &amp;address</source>
+        <context-group purpose="location"><context context-type="linenumber">149</context></context-group>
+      </trans-unit>
+      <trans-unit id="_msg667">
+        <source xml:space="preserve">Payment &amp;amount</source>
+        <context-group purpose="location"><context context-type="linenumber">172</context></context-group>
+      </trans-unit>
+      <trans-unit id="_msg668">
+        <source xml:space="preserve">The amount to request in a single payment</source>
+        <context-group purpose="location"><context context-type="linenumber">188</context></context-group>
+      </trans-unit>
+      <trans-unit id="_msg669">
+        <source xml:space="preserve">&amp;First payment</source>
+        <context-group purpose="location"><context context-type="linenumber">195</context></context-group>
+      </trans-unit>
+      <trans-unit id="_msg670">
+        <source xml:space="preserve">Pa&amp;yments</source>
+        <context-group purpose="location"><context context-type="linenumber">223</context></context-group>
+      </trans-unit>
+      <trans-unit id="_msg671">
+        <source xml:space="preserve">To&amp;tal amount</source>
+        <context-group purpose="location"><context context-type="linenumber">248</context></context-group>
+      </trans-unit>
+      <trans-unit id="_msg672">
+        <source xml:space="preserve">Proposal &amp;fee</source>
+        <context-group purpose="location"><context context-type="linenumber">265</context></context-group>
+      </trans-unit>
+      <trans-unit id="_msg673">
+        <source xml:space="preserve">Next</source>
+        <context-group purpose="location"><context context-type="linenumber">305</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">396</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">562</context></context-group>
+      </trans-unit>
+      <trans-unit id="_msg674">
+        <source xml:space="preserve">Review proposal JSON and validate.</source>
+        <context-group purpose="location"><context context-type="linenumber">324</context></context-group>
+      </trans-unit>
+      <trans-unit id="_msg675">
+        <source xml:space="preserve">Hex-encoded JSON</source>
+        <context-group purpose="location"><context context-type="linenumber">338</context></context-group>
+      </trans-unit>
+      <trans-unit id="_msg676">
+        <source xml:space="preserve">Back</source>
+        <context-group purpose="location"><context context-type="linenumber">370</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">536</context></context-group>
+      </trans-unit>
+      <trans-unit id="_msg677">
+        <source xml:space="preserve">Validate</source>
+        <context-group purpose="location"><context context-type="linenumber">383</context></context-group>
+      </trans-unit>
+      <trans-unit id="_msg678">
+        <source xml:space="preserve">Prepare (burn fee) and wait for confirmations.</source>
+        <context-group purpose="location"><context context-type="linenumber">418</context></context-group>
+      </trans-unit>
+      <trans-unit id="_msg679">
+        <source xml:space="preserve">Copy</source>
+        <context-group purpose="location"><context context-type="linenumber">450</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">674</context></context-group>
+      </trans-unit>
+      <trans-unit id="_msg680">
+        <source xml:space="preserve">At 1/6 confirmations: can be relayed and queued. At 6/6: accepted and processed.</source>
+        <context-group purpose="location"><context context-type="linenumber">474</context></context-group>
+      </trans-unit>
+      <trans-unit id="_msg681">
+        <source xml:space="preserve">Confirmations progress</source>
+        <context-group purpose="location"><context context-type="linenumber">499</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">630</context></context-group>
+      </trans-unit>
+      <trans-unit id="_msg682">
+        <source xml:space="preserve">Shows progress toward the required number of confirmations for the proposal fee transaction.</source>
+        <context-group purpose="location"><context context-type="linenumber">502</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">633</context></context-group>
+      </trans-unit>
+      <trans-unit id="_msg683">
+        <source xml:space="preserve">Estimated time remaining: -</source>
+        <context-group purpose="location"><context context-type="linenumber">509</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">640</context></context-group>
+      </trans-unit>
+      <trans-unit id="_msg684">
+        <source xml:space="preserve">Prepare Proposal</source>
+        <context-group purpose="location"><context context-type="linenumber">549</context></context-group>
+      </trans-unit>
+      <trans-unit id="_msg685">
+        <source xml:space="preserve">You can submit after 1 confirmation. At 6 confirmations it is accepted and processed.</source>
+        <context-group purpose="location"><context context-type="linenumber">584</context></context-group>
+      </trans-unit>
+      <trans-unit id="_msg686">
+        <source xml:space="preserve">Proposal ID:</source>
+        <context-group purpose="location"><context context-type="linenumber">654</context></context-group>
+      </trans-unit>
+      <trans-unit id="_msg687">
+        <source xml:space="preserve">Submit Proposal</source>
+        <context-group purpose="location"><context context-type="linenumber">707</context></context-group>
+      </trans-unit>
+      <trans-unit id="_msg688">
+        <source xml:space="preserve">Close</source>
+        <context-group purpose="location"><context context-type="linenumber">723</context></context-group>
+      </trans-unit>
+    </group>
+  </body></file>
+  <file original="../proposalwizard.cpp" datatype="cpp" source-language="en"><body>
+    <group restype="x-trolltech-linguist-context" resname="ProposalWizard">
+      <trans-unit id="_msg689">
+        <source xml:space="preserve">Valid</source>
+        <context-group purpose="location"><context context-type="linenumber">211</context></context-group>
+      </trans-unit>
+      <trans-unit id="_msg690">
+        <source xml:space="preserve">Invalid: %1</source>
+        <context-group purpose="location"><context context-type="linenumber">214</context></context-group>
+      </trans-unit>
+      <trans-unit id="_msg691">
+        <source xml:space="preserve">Burn %1</source>
+        <context-group purpose="location"><context context-type="linenumber">230</context></context-group>
+      </trans-unit>
+      <trans-unit id="_msg692">
+        <source xml:space="preserve">Burn %1 to create the fee transaction?</source>
+        <context-group purpose="location"><context context-type="linenumber">231</context></context-group>
+      </trans-unit>
+      <trans-unit id="_msg693">
+        <source xml:space="preserve">Prepare failed</source>
+        <context-group purpose="location"><context context-type="linenumber">247</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">252</context></context-group>
+      </trans-unit>
+      <trans-unit id="_msg694">
+        <source xml:space="preserve">Confirmations: %1 / %2 required</source>
+        <context-group purpose="location"><context context-type="linenumber">279</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">283</context></context-group>
+      </trans-unit>
+      <trans-unit id="_msg695">
+        <source xml:space="preserve">Estimated time remaining: Ready</source>
+        <context-group purpose="location"><context context-type="linenumber">288</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">289</context></context-group>
+      </trans-unit>
+      <group restype="x-gettext-plurals">
+        <context-group purpose="location"><context context-type="linenumber">293</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">294</context></context-group>
+        <trans-unit id="_msg696[0]">
+          <source xml:space="preserve">Estimated time remaining: %n minute(s)</source>
+        </trans-unit>
+        <trans-unit id="_msg696[1]">
+          <source xml:space="preserve">Estimated time remaining: %n minute(s)</source>
+        </trans-unit>
+      </group>
+      <trans-unit id="_msg697">
+        <source xml:space="preserve">Your proposal was submitted successfully.</source>
+        <context-group purpose="location"><context context-type="linenumber">324</context></context-group>
+      </trans-unit>
+      <trans-unit id="_msg698">
+        <source xml:space="preserve">Already submitted</source>
+        <context-group purpose="location"><context context-type="linenumber">311</context></context-group>
+      </trans-unit>
+      <trans-unit id="_msg699">
+        <source xml:space="preserve">This proposal has already been submitted.</source>
+        <context-group purpose="location"><context context-type="linenumber">311</context></context-group>
+      </trans-unit>
+      <trans-unit id="_msg700">
+        <source xml:space="preserve">Submission failed</source>
+        <context-group purpose="location"><context context-type="linenumber">318</context></context-group>
+      </trans-unit>
+      <trans-unit id="_msg701">
+        <source xml:space="preserve">Proposal submitted</source>
+        <context-group purpose="location"><context context-type="linenumber">323</context></context-group>
+      </trans-unit>
+      <trans-unit id="_msg702">
+        <source xml:space="preserve">A fee of %1 will be burned when you prepare the proposal.</source>
+        <context-group purpose="location"><context context-type="linenumber">359</context></context-group>
+      </trans-unit>
+      <trans-unit id="_msg703">
+        <source xml:space="preserve">Prepare (burn %1) and wait for %2 confirmations.</source>
+        <context-group purpose="location"><context context-type="linenumber">363</context></context-group>
+      </trans-unit>
+    </group>
+  </body></file>
+  <file original="../bitcoinunits.cpp" datatype="cpp" source-language="en"><body>
     <group restype="x-trolltech-linguist-context" resname="QObject">
-      <trans-unit id="_msg627" approved="yes">
+      <trans-unit id="_msg704">
         <source xml:space="preserve">Amount</source>
-        <target xml:space="preserve">Amount</target>
-        <context-group purpose="location"><context context-type="linenumber">258</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">213</context></context-group>
       </trans-unit>
     </group>
   </body></file>
-  <file original="../guiutil.cpp" datatype="cpp" source-language="en" target-language="en"><body>
+  <file original="../guiutil.cpp" datatype="cpp" source-language="en"><body>
     <group restype="x-trolltech-linguist-context" resname="QObject">
-      <trans-unit id="_msg628" approved="yes">
+      <trans-unit id="_msg705">
         <source xml:space="preserve">Enter a Dash address (e.g. %1)</source>
-        <target xml:space="preserve">Enter a Dash address (e.g. %1)</target>
-        <context-group purpose="location"><context context-type="linenumber">298</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">294</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg629" approved="yes">
+      <trans-unit id="_msg706">
         <source xml:space="preserve">Appearance Setup</source>
-        <target xml:space="preserve">Appearance Setup</target>
-        <context-group purpose="location"><context context-type="linenumber">310</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">306</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg630" approved="yes">
+      <trans-unit id="_msg707">
         <source xml:space="preserve">Please choose your preferred settings for the appearance of %1</source>
-        <target xml:space="preserve">Please choose your preferred settings for the appearance of %1</target>
-        <context-group purpose="location"><context context-type="linenumber">313</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">309</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg631" approved="yes">
+      <trans-unit id="_msg708">
         <source xml:space="preserve">This can also be adjusted later in the &quot;Appearance&quot; tab of the preferences.</source>
-        <target xml:space="preserve">This can also be adjusted later in the &quot;Appearance&quot; tab of the preferences.</target>
-        <context-group purpose="location"><context context-type="linenumber">316</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">312</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg632" approved="yes">
+      <trans-unit id="_msg709">
         <source xml:space="preserve">Ctrl+W</source>
-        <target xml:space="preserve">Ctrl+W</target>
-        <context-group purpose="location"><context context-type="linenumber">640</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">641</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg633" approved="yes">
+      <trans-unit id="_msg710">
         <source xml:space="preserve">Unroutable</source>
-        <target xml:space="preserve">Unroutable</target>
-        <context-group purpose="location"><context context-type="linenumber">1674</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">1675</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg634" approved="yes">
+      <trans-unit id="_msg711">
         <source xml:space="preserve">Internal</source>
-        <target xml:space="preserve">Internal</target>
-        <context-group purpose="location"><context context-type="linenumber">1680</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">1681</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg635" approved="yes">
+      <trans-unit id="_msg712">
         <source xml:space="preserve">Inbound</source>
-        <target xml:space="preserve">Inbound</target>
-        <context-group purpose="location"><context context-type="linenumber">1693</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">1694</context></context-group>
         <note annotates="source" from="developer">An inbound connection from a peer. An inbound connection is a connection initiated by a peer.</note>
       </trans-unit>
-      <trans-unit id="_msg636" approved="yes">
+      <trans-unit id="_msg713">
         <source xml:space="preserve">Outbound</source>
-        <target xml:space="preserve">Outbound</target>
-        <context-group purpose="location"><context context-type="linenumber">1696</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">1697</context></context-group>
         <note annotates="source" from="developer">An outbound connection to a peer. An outbound connection is a connection initiated by us.</note>
       </trans-unit>
-      <trans-unit id="_msg637" approved="yes">
+      <trans-unit id="_msg714">
         <source xml:space="preserve">Full Relay</source>
-        <target xml:space="preserve">Full Relay</target>
-        <context-group purpose="location"><context context-type="linenumber">1701</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">1702</context></context-group>
         <note annotates="source" from="developer">Peer connection type that relays all network information.</note>
       </trans-unit>
-      <trans-unit id="_msg638" approved="yes">
+      <trans-unit id="_msg715">
         <source xml:space="preserve">Block Relay</source>
-        <target xml:space="preserve">Block Relay</target>
-        <context-group purpose="location"><context context-type="linenumber">1704</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">1705</context></context-group>
         <note annotates="source" from="developer">Peer connection type that relays network information about blocks and not transactions or addresses.</note>
       </trans-unit>
-      <trans-unit id="_msg639" approved="yes">
+      <trans-unit id="_msg716">
         <source xml:space="preserve">Manual</source>
-        <target xml:space="preserve">Manual</target>
-        <context-group purpose="location"><context context-type="linenumber">1706</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">1707</context></context-group>
         <note annotates="source" from="developer">Peer connection type established manually through one of several methods.</note>
       </trans-unit>
-      <trans-unit id="_msg640" approved="yes">
+      <trans-unit id="_msg717">
         <source xml:space="preserve">Feeler</source>
-        <target xml:space="preserve">Feeler</target>
-        <context-group purpose="location"><context context-type="linenumber">1708</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">1709</context></context-group>
         <note annotates="source" from="developer">Short-lived peer connection type that tests the aliveness of known addresses.</note>
       </trans-unit>
-      <trans-unit id="_msg641" approved="yes">
+      <trans-unit id="_msg718">
         <source xml:space="preserve">Address Fetch</source>
-        <target xml:space="preserve">Address Fetch</target>
-        <context-group purpose="location"><context context-type="linenumber">1710</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">1711</context></context-group>
         <note annotates="source" from="developer">Short-lived peer connection type that solicits known addresses from a peer.</note>
       </trans-unit>
-      <trans-unit id="_msg642" approved="yes">
+      <trans-unit id="_msg719">
         <source xml:space="preserve">%1 d</source>
-        <target xml:space="preserve">%1 d</target>
         <context-group purpose="location"><context context-type="linenumber">1723</context></context-group>
         <context-group purpose="location"><context context-type="linenumber">1735</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg643" approved="yes">
+      <trans-unit id="_msg720">
         <source xml:space="preserve">%1 h</source>
-        <target xml:space="preserve">%1 h</target>
         <context-group purpose="location"><context context-type="linenumber">1724</context></context-group>
         <context-group purpose="location"><context context-type="linenumber">1736</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg644" approved="yes">
+      <trans-unit id="_msg721">
         <source xml:space="preserve">%1 m</source>
-        <target xml:space="preserve">%1 m</target>
         <context-group purpose="location"><context context-type="linenumber">1725</context></context-group>
         <context-group purpose="location"><context context-type="linenumber">1737</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg645" approved="yes">
+      <trans-unit id="_msg722">
         <source xml:space="preserve">%1 s</source>
-        <target xml:space="preserve">%1 s</target>
         <context-group purpose="location"><context context-type="linenumber">1727</context></context-group>
         <context-group purpose="location"><context context-type="linenumber">1738</context></context-group>
         <context-group purpose="location"><context context-type="linenumber">1764</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg646" approved="yes">
+      <trans-unit id="_msg723">
         <source xml:space="preserve">None</source>
-        <target xml:space="preserve">None</target>
         <context-group purpose="location"><context context-type="linenumber">1752</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg647" approved="yes">
+      <trans-unit id="_msg724">
         <source xml:space="preserve">N/A</source>
-        <target xml:space="preserve">N/A</target>
         <context-group purpose="location"><context context-type="linenumber">1758</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg648" approved="yes">
+      <trans-unit id="_msg725">
         <source xml:space="preserve">%1 ms</source>
-        <target xml:space="preserve">%1 ms</target>
         <context-group purpose="location"><context context-type="linenumber">1759</context></context-group>
       </trans-unit>
       <group restype="x-gettext-plurals">
         <context-group purpose="location"><context context-type="linenumber">1777</context></context-group>
-        <trans-unit id="_msg649[0]" approved="yes">
+        <trans-unit id="_msg726[0]">
           <source xml:space="preserve">%n second(s)</source>
-          <target xml:space="preserve">%n second</target>
         </trans-unit>
-        <trans-unit id="_msg649[1]" approved="yes">
+        <trans-unit id="_msg726[1]">
           <source xml:space="preserve">%n second(s)</source>
-          <target xml:space="preserve">%n seconds</target>
         </trans-unit>
       </group>
       <group restype="x-gettext-plurals">
         <context-group purpose="location"><context context-type="linenumber">1781</context></context-group>
-        <trans-unit id="_msg650[0]" approved="yes">
+        <trans-unit id="_msg727[0]">
           <source xml:space="preserve">%n minute(s)</source>
-          <target xml:space="preserve">%n minute</target>
         </trans-unit>
-        <trans-unit id="_msg650[1]" approved="yes">
+        <trans-unit id="_msg727[1]">
           <source xml:space="preserve">%n minute(s)</source>
-          <target xml:space="preserve">%n minutes</target>
         </trans-unit>
       </group>
       <group restype="x-gettext-plurals">
         <context-group purpose="location"><context context-type="linenumber">1785</context></context-group>
-        <trans-unit id="_msg651[0]" approved="yes">
+        <trans-unit id="_msg728[0]">
           <source xml:space="preserve">%n hour(s)</source>
-          <target xml:space="preserve">%n hour</target>
         </trans-unit>
-        <trans-unit id="_msg651[1]" approved="yes">
+        <trans-unit id="_msg728[1]">
           <source xml:space="preserve">%n hour(s)</source>
-          <target xml:space="preserve">%n hours</target>
         </trans-unit>
       </group>
       <group restype="x-gettext-plurals">
         <context-group purpose="location"><context context-type="linenumber">1789</context></context-group>
-        <trans-unit id="_msg652[0]" approved="yes">
+        <trans-unit id="_msg729[0]">
           <source xml:space="preserve">%n day(s)</source>
-          <target xml:space="preserve">%n day</target>
         </trans-unit>
-        <trans-unit id="_msg652[1]" approved="yes">
+        <trans-unit id="_msg729[1]">
           <source xml:space="preserve">%n day(s)</source>
-          <target xml:space="preserve">%n days</target>
         </trans-unit>
       </group>
       <group restype="x-gettext-plurals">
         <context-group purpose="location"><context context-type="linenumber">1793</context></context-group>
         <context-group purpose="location"><context context-type="linenumber">1799</context></context-group>
-        <trans-unit id="_msg653[0]" approved="yes">
+        <trans-unit id="_msg730[0]">
           <source xml:space="preserve">%n week(s)</source>
-          <target xml:space="preserve">%n week</target>
         </trans-unit>
-        <trans-unit id="_msg653[1]" approved="yes">
+        <trans-unit id="_msg730[1]">
           <source xml:space="preserve">%n week(s)</source>
-          <target xml:space="preserve">%n weeks</target>
         </trans-unit>
       </group>
       <group restype="x-gettext-plurals">
         <context-group purpose="location"><context context-type="linenumber">1799</context></context-group>
-        <trans-unit id="_msg654[0]" approved="yes">
+        <trans-unit id="_msg731[0]">
           <source xml:space="preserve">%n year(s)</source>
-          <target xml:space="preserve">%n year</target>
         </trans-unit>
-        <trans-unit id="_msg654[1]" approved="yes">
+        <trans-unit id="_msg731[1]">
           <source xml:space="preserve">%n year(s)</source>
-          <target xml:space="preserve">%n years</target>
         </trans-unit>
       </group>
-      <trans-unit id="_msg655" approved="yes">
+      <trans-unit id="_msg732">
         <source xml:space="preserve">%1 and %2</source>
-        <target xml:space="preserve">%1 and %2</target>
         <context-group purpose="location"><context context-type="linenumber">1799</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg656" approved="yes">
+      <trans-unit id="_msg733">
         <source xml:space="preserve">%1 B</source>
-        <target xml:space="preserve">%1 B</target>
         <context-group purpose="location"><context context-type="linenumber">1807</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg657" approved="yes">
+      <trans-unit id="_msg734">
         <source xml:space="preserve">%1 kB</source>
-        <target xml:space="preserve">%1 kB</target>
         <context-group purpose="location"><context context-type="linenumber">1809</context></context-group>
+        <context-group purpose="location"><context context-type="sourcefile">../rpcconsole.cpp</context><context context-type="linenumber">1114</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg658" approved="yes">
+      <trans-unit id="_msg735">
         <source xml:space="preserve">%1 MB</source>
-        <target xml:space="preserve">%1 MB</target>
         <context-group purpose="location"><context context-type="linenumber">1811</context></context-group>
+        <context-group purpose="location"><context context-type="sourcefile">../rpcconsole.cpp</context><context context-type="linenumber">1115</context></context-group>
+        <context-group purpose="location"><context context-type="sourcefile">../rpcconsole.cpp</context><context context-type="linenumber">1116</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg659" approved="yes">
+      <trans-unit id="_msg736">
         <source xml:space="preserve">%1 GB</source>
-        <target xml:space="preserve">%1 GB</target>
         <context-group purpose="location"><context context-type="linenumber">1813</context></context-group>
       </trans-unit>
     </group>
   </body></file>
-  <file original="../forms/qrdialog.ui" datatype="x-trolltech-designer-ui" source-language="en" target-language="en"><body>
+  <file original="../forms/qrdialog.ui" datatype="x-trolltech-designer-ui" source-language="en"><body>
     <group restype="x-trolltech-linguist-context" resname="QRDialog">
-      <trans-unit id="_msg660" approved="yes">
+      <trans-unit id="_msg737">
         <source xml:space="preserve">QR-Code Title</source>
-        <target xml:space="preserve">QR-Code Title</target>
         <context-group purpose="location"><context context-type="linenumber">17</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg661" approved="yes">
+      <trans-unit id="_msg738">
         <source xml:space="preserve">QR Code</source>
-        <target xml:space="preserve">QR Code</target>
         <context-group purpose="location"><context context-type="linenumber">39</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg662" approved="yes">
+      <trans-unit id="_msg739">
         <source xml:space="preserve">&amp;Save Image…</source>
-        <target xml:space="preserve">&amp;Save Image…</target>
         <context-group purpose="location"><context context-type="linenumber">85</context></context-group>
       </trans-unit>
     </group>
   </body></file>
-  <file original="../qrimagewidget.cpp" datatype="cpp" source-language="en" target-language="en"><body>
+  <file original="../qrimagewidget.cpp" datatype="cpp" source-language="en"><body>
     <group restype="x-trolltech-linguist-context" resname="QRImageWidget">
-      <trans-unit id="_msg663" approved="yes">
+      <trans-unit id="_msg740">
         <source xml:space="preserve">&amp;Save Image…</source>
-        <target xml:space="preserve">&amp;Save Image…</target>
-        <context-group purpose="location"><context context-type="linenumber">30</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">29</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg664" approved="yes">
+      <trans-unit id="_msg741">
         <source xml:space="preserve">&amp;Copy Image</source>
-        <target xml:space="preserve">&amp;Copy Image</target>
-        <context-group purpose="location"><context context-type="linenumber">31</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">30</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg665" approved="yes">
+      <trans-unit id="_msg742">
         <source xml:space="preserve">Resulting URI too long, try to reduce the text for label / message.</source>
-        <target xml:space="preserve">Resulting URI too long, try to reduce the text for label / message.</target>
-        <context-group purpose="location"><context context-type="linenumber">42</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">41</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg666" approved="yes">
+      <trans-unit id="_msg743">
         <source xml:space="preserve">Error encoding URI into QR Code.</source>
-        <target xml:space="preserve">Error encoding URI into QR Code.</target>
-        <context-group purpose="location"><context context-type="linenumber">49</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">48</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg667" approved="yes">
+      <trans-unit id="_msg744">
         <source xml:space="preserve">QR code support not available.</source>
-        <target xml:space="preserve">QR code support not available.</target>
-        <context-group purpose="location"><context context-type="linenumber">104</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">103</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg668" approved="yes">
+      <trans-unit id="_msg745">
         <source xml:space="preserve">Save QR Code</source>
-        <target xml:space="preserve">Save QR Code</target>
-        <context-group purpose="location"><context context-type="linenumber">134</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">133</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg669" approved="yes">
+      <trans-unit id="_msg746">
         <source xml:space="preserve">PNG Image</source>
-        <target xml:space="preserve">PNG Image</target>
-        <context-group purpose="location"><context context-type="linenumber">137</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">136</context></context-group>
         <note annotates="source" from="developer">Expanded name of the PNG file format. See: https://en.wikipedia.org/wiki/Portable_Network_Graphics.</note>
       </trans-unit>
     </group>
   </body></file>
-  <file original="../forms/debugwindow.ui" datatype="x-trolltech-designer-ui" source-language="en" target-language="en"><body>
+  <file original="../forms/debugwindow.ui" datatype="x-trolltech-designer-ui" source-language="en"><body>
     <group restype="x-trolltech-linguist-context" resname="RPCConsole">
-      <trans-unit id="_msg670" approved="yes">
+      <trans-unit id="_msg747">
         <source xml:space="preserve">Tools window</source>
-        <target xml:space="preserve">Tools window</target>
         <context-group purpose="location"><context context-type="linenumber">14</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg671" approved="yes">
+      <trans-unit id="_msg748">
         <source xml:space="preserve">&amp;Information</source>
-        <target xml:space="preserve">&amp;Information</target>
         <context-group purpose="location"><context context-type="linenumber">44</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg672" approved="yes">
+      <trans-unit id="_msg749">
         <source xml:space="preserve">General</source>
-        <target xml:space="preserve">General</target>
         <context-group purpose="location"><context context-type="linenumber">112</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg673" approved="yes">
+      <trans-unit id="_msg750">
         <source xml:space="preserve">Name</source>
-        <target xml:space="preserve">Name</target>
         <context-group purpose="location"><context context-type="linenumber">256</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg674" approved="yes">
+      <trans-unit id="_msg751">
         <source xml:space="preserve">N/A</source>
-        <target xml:space="preserve">N/A</target>
         <context-group purpose="location"><context context-type="linenumber">129</context></context-group>
         <context-group purpose="location"><context context-type="linenumber">155</context></context-group>
         <context-group purpose="location"><context context-type="linenumber">181</context></context-group>
@@ -3735,679 +3428,571 @@ Due to discontinued support, you should request the merchant to provide you with
         <context-group purpose="location"><context context-type="linenumber">236</context></context-group>
         <context-group purpose="location"><context context-type="linenumber">266</context></context-group>
         <context-group purpose="location"><context context-type="linenumber">289</context></context-group>
-        <context-group purpose="location"><context context-type="linenumber">312</context></context-group>
-        <context-group purpose="location"><context context-type="linenumber">332</context></context-group>
-        <context-group purpose="location"><context context-type="linenumber">359</context></context-group>
-        <context-group purpose="location"><context context-type="linenumber">382</context></context-group>
-        <context-group purpose="location"><context context-type="linenumber">405</context></context-group>
-        <context-group purpose="location"><context context-type="linenumber">428</context></context-group>
-        <context-group purpose="location"><context context-type="linenumber">451</context></context-group>
-        <context-group purpose="location"><context context-type="linenumber">481</context></context-group>
-        <context-group purpose="location"><context context-type="linenumber">504</context></context-group>
-        <context-group purpose="location"><context context-type="linenumber">567</context></context-group>
-        <context-group purpose="location"><context context-type="linenumber">946</context></context-group>
-        <context-group purpose="location"><context context-type="linenumber">969</context></context-group>
-        <context-group purpose="location"><context context-type="linenumber">995</context></context-group>
-        <context-group purpose="location"><context context-type="linenumber">1021</context></context-group>
-        <context-group purpose="location"><context context-type="linenumber">1047</context></context-group>
-        <context-group purpose="location"><context context-type="linenumber">1070</context></context-group>
-        <context-group purpose="location"><context context-type="linenumber">1096</context></context-group>
-        <context-group purpose="location"><context context-type="linenumber">1119</context></context-group>
-        <context-group purpose="location"><context context-type="linenumber">1142</context></context-group>
-        <context-group purpose="location"><context context-type="linenumber">1168</context></context-group>
-        <context-group purpose="location"><context context-type="linenumber">1194</context></context-group>
-        <context-group purpose="location"><context context-type="linenumber">1220</context></context-group>
-        <context-group purpose="location"><context context-type="linenumber">1243</context></context-group>
-        <context-group purpose="location"><context context-type="linenumber">1266</context></context-group>
-        <context-group purpose="location"><context context-type="linenumber">1289</context></context-group>
-        <context-group purpose="location"><context context-type="linenumber">1312</context></context-group>
-        <context-group purpose="location"><context context-type="linenumber">1338</context></context-group>
-        <context-group purpose="location"><context context-type="linenumber">1364</context></context-group>
-        <context-group purpose="location"><context context-type="linenumber">1387</context></context-group>
-        <context-group purpose="location"><context context-type="linenumber">1410</context></context-group>
-        <context-group purpose="location"><context context-type="linenumber">1433</context></context-group>
-        <context-group purpose="location"><context context-type="linenumber">1456</context></context-group>
-        <context-group purpose="location"><context context-type="linenumber">1479</context></context-group>
-        <context-group purpose="location"><context context-type="linenumber">1505</context></context-group>
-        <context-group purpose="location"><context context-type="linenumber">1528</context></context-group>
-        <context-group purpose="location"><context context-type="linenumber">1551</context></context-group>
-        <context-group purpose="location"><context context-type="linenumber">1577</context></context-group>
-        <context-group purpose="location"><context context-type="linenumber">1603</context></context-group>
-        <context-group purpose="location"><context context-type="linenumber">1629</context></context-group>
-        <context-group purpose="location"><context context-type="linenumber">1655</context></context-group>
-        <context-group purpose="location"><context context-type="sourcefile">../rpcconsole.h</context><context context-type="linenumber">156</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg675" approved="yes">
+        <context-group purpose="location"><context context-type="linenumber">347</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">367</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">394</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">417</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">440</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">463</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">486</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">516</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">539</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">602</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">981</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">1004</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">1030</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">1056</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">1082</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">1105</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">1131</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">1154</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">1177</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">1203</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">1229</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">1255</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">1278</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">1301</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">1324</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">1347</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">1373</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">1399</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">1422</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">1445</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">1468</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">1491</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">1514</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">1540</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">1563</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">1586</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">1612</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">1638</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">1664</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">1690</context></context-group>
+        <context-group purpose="location"><context context-type="sourcefile">../rpcconsole.h</context><context context-type="linenumber">166</context></context-group>
+      </trans-unit>
+      <trans-unit id="_msg752">
         <source xml:space="preserve">Number of connections</source>
-        <target xml:space="preserve">Number of connections</target>
         <context-group purpose="location"><context context-type="linenumber">279</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg676" approved="yes">
+      <trans-unit id="_msg753">
         <source xml:space="preserve">&amp;Open</source>
-        <target xml:space="preserve">&amp;Open</target>
-        <context-group purpose="location"><context context-type="linenumber">545</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">580</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg677" approved="yes">
+      <trans-unit id="_msg754">
         <source xml:space="preserve">Startup time</source>
-        <target xml:space="preserve">Startup time</target>
         <context-group purpose="location"><context context-type="linenumber">226</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg678" approved="yes">
+      <trans-unit id="_msg755">
         <source xml:space="preserve">Network</source>
-        <target xml:space="preserve">Network</target>
         <context-group purpose="location"><context context-type="linenumber">249</context></context-group>
-        <context-group purpose="location"><context context-type="linenumber">1037</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">1072</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg679" approved="yes">
+      <trans-unit id="_msg756">
         <source xml:space="preserve">Last block time</source>
-        <target xml:space="preserve">Last block time</target>
-        <context-group purpose="location"><context context-type="linenumber">372</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">407</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg680" approved="yes">
+      <trans-unit id="_msg757">
         <source xml:space="preserve">Debug log file</source>
-        <target xml:space="preserve">Debug log file</target>
-        <context-group purpose="location"><context context-type="linenumber">535</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">570</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg681" approved="yes">
+      <trans-unit id="_msg758">
         <source xml:space="preserve">Client version</source>
-        <target xml:space="preserve">Client version</target>
         <context-group purpose="location"><context context-type="linenumber">119</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg682" approved="yes">
+      <trans-unit id="_msg759">
         <source xml:space="preserve">Block chain</source>
-        <target xml:space="preserve">Block chain</target>
-        <context-group purpose="location"><context context-type="linenumber">342</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">377</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg683" approved="yes">
+      <trans-unit id="_msg760">
         <source xml:space="preserve">Memory Pool</source>
-        <target xml:space="preserve">Memory Pool</target>
-        <context-group purpose="location"><context context-type="linenumber">464</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">499</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg684" approved="yes">
+      <trans-unit id="_msg761">
         <source xml:space="preserve">Current number of transactions</source>
-        <target xml:space="preserve">Current number of transactions</target>
-        <context-group purpose="location"><context context-type="linenumber">471</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">506</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg685" approved="yes">
+      <trans-unit id="_msg762">
         <source xml:space="preserve">Memory usage</source>
-        <target xml:space="preserve">Memory usage</target>
-        <context-group purpose="location"><context context-type="linenumber">494</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">529</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg686" approved="yes">
+      <trans-unit id="_msg763">
         <source xml:space="preserve">&amp;Console</source>
-        <target xml:space="preserve">&amp;Console</target>
         <context-group purpose="location"><context context-type="linenumber">54</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg687" approved="yes">
+      <trans-unit id="_msg764">
         <source xml:space="preserve">Clear console</source>
-        <target xml:space="preserve">Clear console</target>
-        <context-group purpose="location"><context context-type="linenumber">654</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">689</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg688" approved="yes">
+      <trans-unit id="_msg765">
         <source xml:space="preserve">&amp;Network Traffic</source>
-        <target xml:space="preserve">&amp;Network Traffic</target>
         <context-group purpose="location"><context context-type="linenumber">64</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg689" approved="yes">
+      <trans-unit id="_msg766">
         <source xml:space="preserve">Received</source>
-        <target xml:space="preserve">Received</target>
-        <context-group purpose="location"><context context-type="linenumber">1446</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">1481</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg690" approved="yes">
+      <trans-unit id="_msg767">
         <source xml:space="preserve">Sent</source>
-        <target xml:space="preserve">Sent</target>
-        <context-group purpose="location"><context context-type="linenumber">1423</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">1458</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg691" approved="yes">
+      <trans-unit id="_msg768">
         <source xml:space="preserve">&amp;Peers</source>
-        <target xml:space="preserve">&amp;Peers</target>
         <context-group purpose="location"><context context-type="linenumber">74</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg692" approved="yes">
+      <trans-unit id="_msg769">
         <source xml:space="preserve">Wallet:</source>
-        <target xml:space="preserve">Wallet:</target>
-        <context-group purpose="location"><context context-type="linenumber">608</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">643</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg693" approved="yes">
+      <trans-unit id="_msg770">
         <source xml:space="preserve">Banned peers</source>
-        <target xml:space="preserve">Banned peers</target>
-        <context-group purpose="location"><context context-type="linenumber">842</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">877</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg694" approved="yes">
+      <trans-unit id="_msg771">
         <source xml:space="preserve">Select a peer to view detailed information.</source>
-        <target xml:space="preserve">Select a peer to view detailed information.</target>
-        <context-group purpose="location"><context context-type="linenumber">905</context></context-group>
-        <context-group purpose="location"><context context-type="sourcefile">../rpcconsole.cpp</context><context context-type="linenumber">1275</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">940</context></context-group>
+        <context-group purpose="location"><context context-type="sourcefile">../rpcconsole.cpp</context><context context-type="linenumber">1297</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg695" approved="yes">
+      <trans-unit id="_msg772">
         <source xml:space="preserve">Version</source>
-        <target xml:space="preserve">Version</target>
-        <context-group purpose="location"><context context-type="linenumber">1109</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg696" approved="yes">
-        <source xml:space="preserve">Whether the peer requested us to relay transactions.</source>
-        <target xml:space="preserve">Whether the peer requested us to relay transactions.</target>
-        <context-group purpose="location"><context context-type="linenumber">1181</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg697" approved="yes">
-        <source xml:space="preserve">Wants Tx Relay</source>
-        <target xml:space="preserve">Wants Tx Relay</target>
-        <context-group purpose="location"><context context-type="linenumber">1184</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">1144</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg698" approved="yes">
+      <trans-unit id="_msg773">
         <source xml:space="preserve">High bandwidth BIP152 compact block relay: %1</source>
-        <target xml:space="preserve">High bandwidth BIP152 compact block relay: %1</target>
-        <context-group purpose="location"><context context-type="linenumber">1207</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">1242</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg699" approved="yes">
+      <trans-unit id="_msg774">
         <source xml:space="preserve">High Bandwidth</source>
-        <target xml:space="preserve">High Bandwidth</target>
-        <context-group purpose="location"><context context-type="linenumber">1210</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">1245</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg700" approved="yes">
+      <trans-unit id="_msg775">
         <source xml:space="preserve">Starting Block</source>
-        <target xml:space="preserve">Starting Block</target>
-        <context-group purpose="location"><context context-type="linenumber">1233</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">1268</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg701" approved="yes">
+      <trans-unit id="_msg776">
         <source xml:space="preserve">Synced Headers</source>
-        <target xml:space="preserve">Synced Headers</target>
-        <context-group purpose="location"><context context-type="linenumber">1256</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">1291</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg702" approved="yes">
+      <trans-unit id="_msg777">
         <source xml:space="preserve">Synced Blocks</source>
-        <target xml:space="preserve">Synced Blocks</target>
-        <context-group purpose="location"><context context-type="linenumber">1279</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">1314</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg703" approved="yes">
+      <trans-unit id="_msg778">
         <source xml:space="preserve">Elapsed time since a novel block passing initial validity checks was received from this peer.</source>
-        <target xml:space="preserve">Elapsed time since a novel block passing initial validity checks was received from this peer.</target>
-        <context-group purpose="location"><context context-type="linenumber">1325</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">1360</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg704" approved="yes">
+      <trans-unit id="_msg779">
         <source xml:space="preserve">Last Block</source>
-        <target xml:space="preserve">Last Block</target>
-        <context-group purpose="location"><context context-type="linenumber">1328</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">1363</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg705" approved="yes">
+      <trans-unit id="_msg780">
         <source xml:space="preserve">Elapsed time since a novel transaction accepted into our mempool was received from this peer.</source>
-        <target xml:space="preserve">Elapsed time since a novel transaction accepted into our mempool was received from this peer.</target>
-        <context-group purpose="location"><context context-type="linenumber">1351</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">1386</context></context-group>
         <note annotates="source" from="developer">Tooltip text for the Last Transaction field in the peer details area.</note>
       </trans-unit>
-      <trans-unit id="_msg706" approved="yes">
+      <trans-unit id="_msg781">
         <source xml:space="preserve">Last Transaction</source>
-        <target xml:space="preserve">Last Transaction</target>
-        <context-group purpose="location"><context context-type="linenumber">1354</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">1389</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg707" approved="yes">
+      <trans-unit id="_msg782">
         <source xml:space="preserve">The mapped Autonomous System used for diversifying peer selection.</source>
-        <target xml:space="preserve">The mapped Autonomous System used for diversifying peer selection.</target>
-        <context-group purpose="location"><context context-type="linenumber">1564</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">1599</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg708" approved="yes">
+      <trans-unit id="_msg783">
         <source xml:space="preserve">Mapped AS</source>
-        <target xml:space="preserve">Mapped AS</target>
-        <context-group purpose="location"><context context-type="linenumber">1567</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">1602</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg709" approved="yes">
+      <trans-unit id="_msg784">
         <source xml:space="preserve">Whether we relay addresses to this peer.</source>
-        <target xml:space="preserve">Whether we relay addresses to this peer.</target>
-        <context-group purpose="location"><context context-type="linenumber">1590</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">1625</context></context-group>
         <note annotates="source" from="developer">Tooltip text for the Address Relay field in the peer details area, which displays whether we relay addresses to this peer (Yes/No).</note>
       </trans-unit>
-      <trans-unit id="_msg710" approved="yes">
+      <trans-unit id="_msg785">
         <source xml:space="preserve">Address Relay</source>
-        <target xml:space="preserve">Address Relay</target>
-        <context-group purpose="location"><context context-type="linenumber">1593</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">1628</context></context-group>
         <note annotates="source" from="developer">Text title for the Address Relay field in the peer details area, which displays whether we relay addresses to this peer (Yes/No).</note>
       </trans-unit>
-      <trans-unit id="_msg711" approved="yes">
+      <trans-unit id="_msg786">
         <source xml:space="preserve">Addresses Processed</source>
-        <target xml:space="preserve">Addresses Processed</target>
-        <context-group purpose="location"><context context-type="linenumber">1619</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">1654</context></context-group>
         <note annotates="source" from="developer">Text title for the Addresses Processed field in the peer details area, which displays the total number of addresses received from this peer that were processed (excludes addresses that were dropped due to rate-limiting).</note>
       </trans-unit>
-      <trans-unit id="_msg712" approved="yes">
+      <trans-unit id="_msg787">
         <source xml:space="preserve">Addresses Rate-Limited</source>
-        <target xml:space="preserve">Addresses Rate-Limited</target>
-        <context-group purpose="location"><context context-type="linenumber">1645</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">1680</context></context-group>
         <note annotates="source" from="developer">Text title for the Addresses Rate-Limited field in the peer details area, which displays the total number of addresses received from this peer that were dropped (not processed) due to rate-limiting.</note>
       </trans-unit>
-      <trans-unit id="_msg713" approved="yes">
+      <trans-unit id="_msg788">
         <source xml:space="preserve">Rescan blockchain files 1</source>
-        <target xml:space="preserve">Rescan blockchain files 1</target>
-        <context-group purpose="location"><context context-type="linenumber">1726</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">1761</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg714" approved="yes">
+      <trans-unit id="_msg789">
         <source xml:space="preserve">Rescan blockchain files 2</source>
-        <target xml:space="preserve">Rescan blockchain files 2</target>
-        <context-group purpose="location"><context context-type="linenumber">1749</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">1784</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg715" approved="yes">
+      <trans-unit id="_msg790">
         <source xml:space="preserve">The buttons below will restart the wallet with command-line options to repair the wallet, fix issues with corrupt blockchain files or missing/obsolete transactions.</source>
-        <target xml:space="preserve">The buttons below will restart the wallet with command-line options to repair the wallet, fix issues with corrupt blockchain files or missing/obsolete transactions.</target>
-        <context-group purpose="location"><context context-type="linenumber">1706</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">1741</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg716" approved="yes">
+      <trans-unit id="_msg791">
         <source xml:space="preserve">-rescan=1: Rescan the block chain for missing wallet transactions starting from wallet creation time.</source>
-        <target xml:space="preserve">-rescan=1: Rescan the block chain for missing wallet transactions starting from wallet creation time.</target>
-        <context-group purpose="location"><context context-type="linenumber">1733</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">1768</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg717" approved="yes">
+      <trans-unit id="_msg792">
         <source xml:space="preserve">-rescan=2: Rescan the block chain for missing wallet transactions starting from genesis block.</source>
-        <target xml:space="preserve">-rescan=2: Rescan the block chain for missing wallet transactions starting from genesis block.</target>
-        <context-group purpose="location"><context context-type="linenumber">1756</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">1791</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg718" approved="yes">
+      <trans-unit id="_msg793">
         <source xml:space="preserve">User Agent</source>
-        <target xml:space="preserve">User Agent</target>
         <context-group purpose="location"><context context-type="linenumber">142</context></context-group>
-        <context-group purpose="location"><context context-type="linenumber">1132</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">1167</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg719" approved="yes">
+      <trans-unit id="_msg794">
         <source xml:space="preserve">Datadir</source>
-        <target xml:space="preserve">Datadir</target>
         <context-group purpose="location"><context context-type="linenumber">168</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg720" approved="yes">
+      <trans-unit id="_msg795">
         <source xml:space="preserve">To specify a non-default location of the data directory use the &apos;%1&apos; option.</source>
-        <target xml:space="preserve">To specify a non-default location of the data directory use the &apos;%1&apos; option.</target>
         <context-group purpose="location"><context context-type="linenumber">178</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg721" approved="yes">
+      <trans-unit id="_msg796">
         <source xml:space="preserve">Blocksdir</source>
-        <target xml:space="preserve">Blocksdir</target>
         <context-group purpose="location"><context context-type="linenumber">197</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg722" approved="yes">
+      <trans-unit id="_msg797">
         <source xml:space="preserve">To specify a non-default location of the blocks directory use the &apos;%1&apos; option.</source>
-        <target xml:space="preserve">To specify a non-default location of the blocks directory use the &apos;%1&apos; option.</target>
         <context-group purpose="location"><context context-type="linenumber">207</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg723" approved="yes">
-        <source xml:space="preserve">Number of regular Masternodes</source>
-        <target xml:space="preserve">Number of regular Masternodes</target>
+      <trans-unit id="_msg798">
+        <source xml:space="preserve">Local Addresses</source>
         <context-group purpose="location"><context context-type="linenumber">302</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg724" approved="yes">
+      <trans-unit id="_msg799">
+        <source xml:space="preserve">Network addresses that your Dash node is currently using to communicate with other nodes.</source>
+        <context-group purpose="location"><context context-type="linenumber">330</context></context-group>
+      </trans-unit>
+      <trans-unit id="_msg800">
+        <source xml:space="preserve">Number of regular Masternodes</source>
+        <context-group purpose="location"><context context-type="linenumber">337</context></context-group>
+      </trans-unit>
+      <trans-unit id="_msg801">
         <source xml:space="preserve">Number of EvoNodes</source>
-        <target xml:space="preserve">Number of EvoNodes</target>
-        <context-group purpose="location"><context context-type="linenumber">322</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">357</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg725" approved="yes">
+      <trans-unit id="_msg802">
         <source xml:space="preserve">Current block height</source>
-        <target xml:space="preserve">Current block height</target>
-        <context-group purpose="location"><context context-type="linenumber">349</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">384</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg726" approved="yes">
+      <trans-unit id="_msg803">
         <source xml:space="preserve">Last block hash</source>
-        <target xml:space="preserve">Last block hash</target>
-        <context-group purpose="location"><context context-type="linenumber">395</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">430</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg727" approved="yes">
+      <trans-unit id="_msg804">
         <source xml:space="preserve">Latest ChainLocked block hash</source>
-        <target xml:space="preserve">Latest ChainLocked block hash</target>
-        <context-group purpose="location"><context context-type="linenumber">418</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">453</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg728" approved="yes">
+      <trans-unit id="_msg805">
         <source xml:space="preserve">Latest ChainLocked block height</source>
-        <target xml:space="preserve">Latest ChainLocked block height</target>
-        <context-group purpose="location"><context context-type="linenumber">441</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">476</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg729" approved="yes">
+      <trans-unit id="_msg806">
         <source xml:space="preserve">Open the %1 debug log file from the current data directory. This can take a few seconds for large log files.</source>
-        <target xml:space="preserve">Open the %1 debug log file from the current data directory. This can take a few seconds for large log files.</target>
-        <context-group purpose="location"><context context-type="linenumber">542</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">577</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg730" approved="yes">
+      <trans-unit id="_msg807">
         <source xml:space="preserve">InstantSend locks</source>
-        <target xml:space="preserve">InstantSend locks</target>
-        <context-group purpose="location"><context context-type="linenumber">557</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">592</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg731" approved="yes">
+      <trans-unit id="_msg808">
         <source xml:space="preserve">(none)</source>
-        <target xml:space="preserve">(none)</target>
-        <context-group purpose="location"><context context-type="linenumber">619</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">654</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg732" approved="yes">
+      <trans-unit id="_msg809">
         <source xml:space="preserve">Decrease font size</source>
-        <target xml:space="preserve">Decrease font size</target>
-        <context-group purpose="location"><context context-type="linenumber">640</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">675</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg733" approved="yes">
+      <trans-unit id="_msg810">
         <source xml:space="preserve">Increase font size</source>
-        <target xml:space="preserve">Increase font size</target>
-        <context-group purpose="location"><context context-type="linenumber">647</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">682</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg734" approved="yes">
+      <trans-unit id="_msg811">
         <source xml:space="preserve">&amp;Reset</source>
-        <target xml:space="preserve">&amp;Reset</target>
-        <context-group purpose="location"><context context-type="linenumber">759</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">794</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg735" approved="yes">
+      <trans-unit id="_msg812">
         <source xml:space="preserve">Node Type</source>
-        <target xml:space="preserve">Node Type</target>
-        <context-group purpose="location"><context context-type="linenumber">936</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">971</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg736" approved="yes">
+      <trans-unit id="_msg813">
         <source xml:space="preserve">PoSe Score</source>
-        <target xml:space="preserve">PoSe Score</target>
-        <context-group purpose="location"><context context-type="linenumber">959</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">994</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg737" approved="yes">
+      <trans-unit id="_msg814">
         <source xml:space="preserve">The transport layer version: %1</source>
-        <target xml:space="preserve">The transport layer version: %1</target>
-        <context-group purpose="location"><context context-type="linenumber">982</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">1017</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg738" approved="yes">
+      <trans-unit id="_msg815">
         <source xml:space="preserve">Transport</source>
-        <target xml:space="preserve">Transport</target>
-        <context-group purpose="location"><context context-type="linenumber">985</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">1020</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg739" approved="yes">
+      <trans-unit id="_msg816">
         <source xml:space="preserve">The BIP324 session ID string in hex.</source>
-        <target xml:space="preserve">The BIP324 session ID string in hex.</target>
-        <context-group purpose="location"><context context-type="linenumber">1008</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">1043</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg740" approved="yes">
+      <trans-unit id="_msg817">
         <source xml:space="preserve">Session ID</source>
-        <target xml:space="preserve">Session ID</target>
-        <context-group purpose="location"><context context-type="linenumber">1011</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">1046</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg741" approved="yes">
+      <trans-unit id="_msg818">
         <source xml:space="preserve">The network protocol this peer is connected through: IPv4, IPv6, Onion, I2P, or CJDNS.</source>
-        <target xml:space="preserve">The network protocol this peer is connected through: IPv4, IPv6, Onion, I2P, or CJDNS.</target>
-        <context-group purpose="location"><context context-type="linenumber">1034</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">1069</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg742" approved="yes">
+      <trans-unit id="_msg819">
         <source xml:space="preserve">Permissions</source>
-        <target xml:space="preserve">Permissions</target>
-        <context-group purpose="location"><context context-type="linenumber">1060</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">1095</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg743" approved="yes">
+      <trans-unit id="_msg820">
         <source xml:space="preserve">The direction and type of peer connection: %1</source>
-        <target xml:space="preserve">The direction and type of peer connection: %1</target>
-        <context-group purpose="location"><context context-type="linenumber">1083</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">1118</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg744" approved="yes">
+      <trans-unit id="_msg821">
         <source xml:space="preserve">Direction/Type</source>
-        <target xml:space="preserve">Direction/Type</target>
-        <context-group purpose="location"><context context-type="linenumber">1086</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">1121</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg745" approved="yes">
+      <trans-unit id="_msg822">
         <source xml:space="preserve">Services</source>
-        <target xml:space="preserve">Services</target>
-        <context-group purpose="location"><context context-type="linenumber">1158</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">1193</context></context-group>
+      </trans-unit>
+      <trans-unit id="_msg823">
+        <source xml:space="preserve">Whether we relay transactions to this peer.</source>
+        <context-group purpose="location"><context context-type="linenumber">1216</context></context-group>
+      </trans-unit>
+      <trans-unit id="_msg824">
+        <source xml:space="preserve">Transaction Relay</source>
+        <context-group purpose="location"><context context-type="linenumber">1219</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg746" approved="yes">
+      <trans-unit id="_msg825">
         <source xml:space="preserve">Connection Time</source>
-        <target xml:space="preserve">Connection Time</target>
-        <context-group purpose="location"><context context-type="linenumber">1302</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">1337</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg747" approved="yes">
+      <trans-unit id="_msg826">
         <source xml:space="preserve">Last Send</source>
-        <target xml:space="preserve">Last Send</target>
-        <context-group purpose="location"><context context-type="linenumber">1377</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">1412</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg748" approved="yes">
+      <trans-unit id="_msg827">
         <source xml:space="preserve">Last Receive</source>
-        <target xml:space="preserve">Last Receive</target>
-        <context-group purpose="location"><context context-type="linenumber">1400</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">1435</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg749" approved="yes">
+      <trans-unit id="_msg828">
         <source xml:space="preserve">Ping Time</source>
-        <target xml:space="preserve">Ping Time</target>
-        <context-group purpose="location"><context context-type="linenumber">1469</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">1504</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg750" approved="yes">
+      <trans-unit id="_msg829">
         <source xml:space="preserve">The duration of a currently outstanding ping.</source>
-        <target xml:space="preserve">The duration of a currently outstanding ping.</target>
-        <context-group purpose="location"><context context-type="linenumber">1492</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">1527</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg751" approved="yes">
+      <trans-unit id="_msg830">
         <source xml:space="preserve">Ping Wait</source>
-        <target xml:space="preserve">Ping Wait</target>
-        <context-group purpose="location"><context context-type="linenumber">1495</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">1530</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg752" approved="yes">
+      <trans-unit id="_msg831">
         <source xml:space="preserve">Min Ping</source>
-        <target xml:space="preserve">Min Ping</target>
-        <context-group purpose="location"><context context-type="linenumber">1518</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">1553</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg753" approved="yes">
+      <trans-unit id="_msg832">
         <source xml:space="preserve">Time Offset</source>
-        <target xml:space="preserve">Time Offset</target>
-        <context-group purpose="location"><context context-type="linenumber">1541</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">1576</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg754" approved="yes">
+      <trans-unit id="_msg833">
         <source xml:space="preserve">&amp;Wallet Repair</source>
-        <target xml:space="preserve">&amp;Wallet Repair</target>
         <context-group purpose="location"><context context-type="linenumber">84</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg755" approved="yes">
+      <trans-unit id="_msg834">
         <source xml:space="preserve">The total number of addresses received from this peer that were processed (excludes addresses that were dropped due to rate-limiting).</source>
-        <target xml:space="preserve">The total number of addresses received from this peer that were processed (excludes addresses that were dropped due to rate-limiting).</target>
-        <context-group purpose="location"><context context-type="linenumber">1616</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">1651</context></context-group>
         <note annotates="source" from="developer">Tooltip text for the Addresses Processed field in the peer details area, which displays the total number of addresses received from this peer that were processed (excludes addresses that were dropped due to rate-limiting).</note>
       </trans-unit>
-      <trans-unit id="_msg756" approved="yes">
+      <trans-unit id="_msg835">
         <source xml:space="preserve">The total number of addresses received from this peer that were dropped (not processed) due to rate-limiting.</source>
-        <target xml:space="preserve">The total number of addresses received from this peer that were dropped (not processed) due to rate-limiting.</target>
-        <context-group purpose="location"><context context-type="linenumber">1642</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">1677</context></context-group>
         <note annotates="source" from="developer">Tooltip text for the Addresses Rate-Limited field in the peer details area, which displays the total number of addresses received from this peer that were dropped (not processed) due to rate-limiting.</note>
       </trans-unit>
-      <trans-unit id="_msg757" approved="yes">
+      <trans-unit id="_msg836">
         <source xml:space="preserve">Wallet repair options.</source>
-        <target xml:space="preserve">Wallet repair options.</target>
-        <context-group purpose="location"><context context-type="linenumber">1696</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">1731</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg758" approved="yes">
+      <trans-unit id="_msg837">
         <source xml:space="preserve">Rebuild index</source>
-        <target xml:space="preserve">Rebuild index</target>
-        <context-group purpose="location"><context context-type="linenumber">1766</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">1801</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg759" approved="yes">
+      <trans-unit id="_msg838">
         <source xml:space="preserve">-reindex: Rebuild block chain index from current blk000??.dat files.</source>
-        <target xml:space="preserve">-reindex: Rebuild block chain index from current blk000??.dat files.</target>
-        <context-group purpose="location"><context context-type="linenumber">1773</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">1808</context></context-group>
       </trans-unit>
     </group>
   </body></file>
-  <file original="../rpcconsole.cpp" datatype="cpp" source-language="en" target-language="en"><body>
+  <file original="../rpcconsole.cpp" datatype="cpp" source-language="en"><body>
     <group restype="x-trolltech-linguist-context" resname="RPCConsole">
-      <trans-unit id="_msg760" approved="yes">
+      <trans-unit id="_msg839">
         <source xml:space="preserve">Inbound: initiated by peer</source>
-        <target xml:space="preserve">Inbound: initiated by peer</target>
-        <context-group purpose="location"><context context-type="linenumber">516</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">519</context></context-group>
         <note annotates="source" from="developer">Explanatory text for an inbound peer connection.</note>
       </trans-unit>
-      <trans-unit id="_msg761" approved="yes">
+      <trans-unit id="_msg840">
         <source xml:space="preserve">Outbound Full Relay: default</source>
-        <target xml:space="preserve">Outbound Full Relay: default</target>
-        <context-group purpose="location"><context context-type="linenumber">520</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">523</context></context-group>
         <note annotates="source" from="developer">Explanatory text for an outbound peer connection that relays all network information. This is the default behavior for outbound connections.</note>
       </trans-unit>
-      <trans-unit id="_msg762" approved="yes">
+      <trans-unit id="_msg841">
         <source xml:space="preserve">Outbound Block Relay: does not relay transactions or addresses</source>
-        <target xml:space="preserve">Outbound Block Relay: does not relay transactions or addresses</target>
-        <context-group purpose="location"><context context-type="linenumber">523</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">526</context></context-group>
         <note annotates="source" from="developer">Explanatory text for an outbound peer connection that relays network information about blocks and not transactions or addresses.</note>
       </trans-unit>
-      <trans-unit id="_msg763" approved="yes">
+      <trans-unit id="_msg842">
         <source xml:space="preserve">Outbound Manual: added using RPC %1 or %2/%3 configuration options</source>
-        <target xml:space="preserve">Outbound Manual: added using RPC %1 or %2/%3 configuration options</target>
-        <context-group purpose="location"><context context-type="linenumber">528</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">531</context></context-group>
         <note annotates="source" from="developer">Explanatory text for an outbound peer connection that was established manually through one of several methods. The numbered arguments are stand-ins for the methods available to establish manual connections.</note>
       </trans-unit>
-      <trans-unit id="_msg764" approved="yes">
+      <trans-unit id="_msg843">
         <source xml:space="preserve">Outbound Feeler: short-lived, for testing addresses</source>
-        <target xml:space="preserve">Outbound Feeler: short-lived, for testing addresses</target>
-        <context-group purpose="location"><context context-type="linenumber">534</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">537</context></context-group>
         <note annotates="source" from="developer">Explanatory text for a short-lived outbound peer connection that is used to test the aliveness of known addresses.</note>
       </trans-unit>
-      <trans-unit id="_msg765" approved="yes">
+      <trans-unit id="_msg844">
         <source xml:space="preserve">Outbound Address Fetch: short-lived, for soliciting addresses</source>
-        <target xml:space="preserve">Outbound Address Fetch: short-lived, for soliciting addresses</target>
-        <context-group purpose="location"><context context-type="linenumber">537</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">540</context></context-group>
         <note annotates="source" from="developer">Explanatory text for a short-lived outbound peer connection that is used to request addresses from a peer.</note>
       </trans-unit>
-      <trans-unit id="_msg766" approved="yes">
+      <trans-unit id="_msg845">
         <source xml:space="preserve">we selected the peer for high bandwidth relay</source>
-        <target xml:space="preserve">we selected the peer for high bandwidth relay</target>
-        <context-group purpose="location"><context context-type="linenumber">550</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">553</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg767" approved="yes">
+      <trans-unit id="_msg846">
         <source xml:space="preserve">the peer selected us for high bandwidth relay</source>
-        <target xml:space="preserve">the peer selected us for high bandwidth relay</target>
-        <context-group purpose="location"><context context-type="linenumber">551</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">554</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg768" approved="yes">
+      <trans-unit id="_msg847">
         <source xml:space="preserve">no high bandwidth relay selected</source>
-        <target xml:space="preserve">no high bandwidth relay selected</target>
-        <context-group purpose="location"><context context-type="linenumber">552</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">555</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg769" approved="yes">
+      <trans-unit id="_msg848">
         <source xml:space="preserve">&amp;Disconnect</source>
-        <target xml:space="preserve">&amp;Disconnect</target>
-        <context-group purpose="location"><context context-type="linenumber">738</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">741</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg770" approved="yes">
+      <trans-unit id="_msg849">
         <source xml:space="preserve">1 &amp;hour</source>
-        <target xml:space="preserve">1 &amp;hour</target>
-        <context-group purpose="location"><context context-type="linenumber">739</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">742</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg771" approved="yes">
+      <trans-unit id="_msg850">
         <source xml:space="preserve">1 &amp;week</source>
-        <target xml:space="preserve">1 &amp;week</target>
-        <context-group purpose="location"><context context-type="linenumber">741</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">744</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg772" approved="yes">
+      <trans-unit id="_msg851">
         <source xml:space="preserve">1 &amp;year</source>
-        <target xml:space="preserve">1 &amp;year</target>
-        <context-group purpose="location"><context context-type="linenumber">742</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">745</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg773" approved="yes">
+      <trans-unit id="_msg852">
         <source xml:space="preserve">&amp;Unban</source>
-        <target xml:space="preserve">&amp;Unban</target>
-        <context-group purpose="location"><context context-type="linenumber">772</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">775</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg774" approved="yes">
+      <trans-unit id="_msg853">
         <source xml:space="preserve">In:</source>
-        <target xml:space="preserve">In:</target>
-        <context-group purpose="location"><context context-type="linenumber">1032</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">1039</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg775" approved="yes">
+      <trans-unit id="_msg854">
         <source xml:space="preserve">Out:</source>
-        <target xml:space="preserve">Out:</target>
-        <context-group purpose="location"><context context-type="linenumber">1033</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">1040</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg776" approved="yes">
+      <trans-unit id="_msg855">
         <source xml:space="preserve">Network activity disabled</source>
-        <target xml:space="preserve">Network activity disabled</target>
-        <context-group purpose="location"><context context-type="linenumber">1036</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">1043</context></context-group>
+      </trans-unit>
+      <trans-unit id="_msg856">
+        <source xml:space="preserve">None</source>
+        <context-group purpose="location"><context context-type="linenumber">1056</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg777" approved="yes">
+      <trans-unit id="_msg857">
         <source xml:space="preserve">Total: %1 (Enabled: %2)</source>
-        <target xml:space="preserve">Total: %1 (Enabled: %2)</target>
-        <context-group purpose="location"><context context-type="linenumber">1080</context></context-group>
-        <context-group purpose="location"><context context-type="linenumber">1084</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">1099</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">1103</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg778" approved="yes">
+      <trans-unit id="_msg858">
         <source xml:space="preserve">Executing command without any wallet</source>
-        <target xml:space="preserve">Executing command without any wallet</target>
-        <context-group purpose="location"><context context-type="linenumber">1163</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">1185</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg779" approved="yes">
+      <trans-unit id="_msg859">
         <source xml:space="preserve">Ctrl++</source>
-        <target xml:space="preserve">Ctrl++</target>
-        <context-group purpose="location"><context context-type="linenumber">1371</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">1397</context></context-group>
         <note annotates="source" from="developer">Main shortcut to increase the RPC console font size.</note>
       </trans-unit>
-      <trans-unit id="_msg780" approved="yes">
+      <trans-unit id="_msg860">
         <source xml:space="preserve">Ctrl+=</source>
-        <target xml:space="preserve">Ctrl+=</target>
-        <context-group purpose="location"><context context-type="linenumber">1373</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">1399</context></context-group>
         <note annotates="source" from="developer">Secondary shortcut to increase the RPC console font size.</note>
       </trans-unit>
-      <trans-unit id="_msg781" approved="yes">
+      <trans-unit id="_msg861">
         <source xml:space="preserve">Ctrl+-</source>
-        <target xml:space="preserve">Ctrl+-</target>
-        <context-group purpose="location"><context context-type="linenumber">1377</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">1403</context></context-group>
         <note annotates="source" from="developer">Main shortcut to decrease the RPC console font size.</note>
       </trans-unit>
-      <trans-unit id="_msg782" approved="yes">
+      <trans-unit id="_msg862">
         <source xml:space="preserve">Ctrl+_</source>
-        <target xml:space="preserve">Ctrl+_</target>
-        <context-group purpose="location"><context context-type="linenumber">1379</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">1405</context></context-group>
         <note annotates="source" from="developer">Secondary shortcut to decrease the RPC console font size.</note>
       </trans-unit>
-      <trans-unit id="_msg783" approved="yes">
+      <trans-unit id="_msg863">
         <source xml:space="preserve">Ctrl+Shift+I</source>
-        <target xml:space="preserve">Ctrl+Shift+I</target>
-        <context-group purpose="location"><context context-type="linenumber">1529</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">1551</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg784" approved="yes">
+      <trans-unit id="_msg864">
         <source xml:space="preserve">Ctrl+Shift+C</source>
-        <target xml:space="preserve">Ctrl+Shift+C</target>
-        <context-group purpose="location"><context context-type="linenumber">1530</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">1552</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg785" approved="yes">
+      <trans-unit id="_msg865">
         <source xml:space="preserve">Ctrl+Shift+G</source>
-        <target xml:space="preserve">Ctrl+Shift+G</target>
-        <context-group purpose="location"><context context-type="linenumber">1531</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">1553</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg786" approved="yes">
+      <trans-unit id="_msg866">
         <source xml:space="preserve">Ctrl+Shift+P</source>
-        <target xml:space="preserve">Ctrl+Shift+P</target>
-        <context-group purpose="location"><context context-type="linenumber">1532</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">1554</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg787" approved="yes">
+      <trans-unit id="_msg867">
         <source xml:space="preserve">Ctrl+Shift+R</source>
-        <target xml:space="preserve">Ctrl+Shift+R</target>
-        <context-group purpose="location"><context context-type="linenumber">1533</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">1555</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg788" approved="yes">
+      <trans-unit id="_msg868">
         <source xml:space="preserve">Executing command using &quot;%1&quot; wallet</source>
-        <target xml:space="preserve">Executing command using &quot;%1&quot; wallet</target>
-        <context-group purpose="location"><context context-type="linenumber">1161</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">1183</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg789" approved="yes">
+      <trans-unit id="_msg869">
         <source xml:space="preserve">detecting: peer could be v1 or v2</source>
-        <target xml:space="preserve">detecting: peer could be v1 or v2</target>
-        <context-group purpose="location"><context context-type="linenumber">542</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">545</context></context-group>
         <note annotates="source" from="developer">Explanatory text for &quot;detecting&quot; transport type.</note>
       </trans-unit>
-      <trans-unit id="_msg790" approved="yes">
+      <trans-unit id="_msg870">
         <source xml:space="preserve">v1: unencrypted, plaintext transport protocol</source>
-        <target xml:space="preserve">v1: unencrypted, plaintext transport protocol</target>
-        <context-group purpose="location"><context context-type="linenumber">544</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">547</context></context-group>
         <note annotates="source" from="developer">Explanatory text for v1 transport type.</note>
       </trans-unit>
-      <trans-unit id="_msg791" approved="yes">
+      <trans-unit id="_msg871">
         <source xml:space="preserve">v2: BIP324 encrypted transport protocol</source>
-        <target xml:space="preserve">v2: BIP324 encrypted transport protocol</target>
-        <context-group purpose="location"><context context-type="linenumber">546</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">549</context></context-group>
         <note annotates="source" from="developer">Explanatory text for v2 transport type.</note>
       </trans-unit>
-      <trans-unit id="_msg792" approved="yes">
+      <trans-unit id="_msg872">
         <source xml:space="preserve">&amp;Copy address</source>
-        <target xml:space="preserve">&amp;Copy address</target>
-        <context-group purpose="location"><context context-type="linenumber">734</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">737</context></context-group>
         <note annotates="source" from="developer">Context menu action to copy the address of a peer</note>
       </trans-unit>
-      <trans-unit id="_msg793" approved="yes">
+      <trans-unit id="_msg873">
         <source xml:space="preserve">1 d&amp;ay</source>
-        <target xml:space="preserve">1 d&amp;ay</target>
-        <context-group purpose="location"><context context-type="linenumber">740</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">743</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg794" approved="yes">
+      <trans-unit id="_msg874">
         <source xml:space="preserve">&amp;Copy IP/Netmask</source>
-        <target xml:space="preserve">&amp;Copy IP/Netmask</target>
-        <context-group purpose="location"><context context-type="linenumber">768</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">771</context></context-group>
         <note annotates="source" from="developer">Context menu action to copy the IP/Netmask of a banned peer. IP/Netmask is the combination of a peer&apos;s IP address and its Netmask. For IP address see: https://en.wikipedia.org/wiki/IP_address</note>
       </trans-unit>
-      <trans-unit id="_msg795" approved="yes">
+      <trans-unit id="_msg875">
         <source xml:space="preserve">Welcome to the %1 RPC console.
 Use up and down arrows to navigate history, and %2 to clear screen.
 Use %3 and %4 to increase or decrease the font size.
@@ -4415,3320 +4000,2698 @@ Type %5 for an overview of available commands.
 For more information on using this console, type %6.
 
 %7WARNING: Scammers have been active, telling users to type commands here, stealing their wallet contents. Do not use this console without fully understanding the ramifications of a command.%8</source>
-        <target xml:space="preserve">Welcome to the %1 RPC console.
-Use up and down arrows to navigate history, and %2 to clear screen.
-Use %3 and %4 to increase or decrease the font size.
-Type %5 for an overview of available commands.
-For more information on using this console, type %6.
-
-%7WARNING: Scammers have been active, telling users to type commands here, stealing their wallet contents. Do not use this console without fully understanding the ramifications of a command.%8</target>
-        <context-group purpose="location"><context context-type="linenumber">985</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">992</context></context-group>
         <note annotates="source" from="developer">RPC console welcome message. Placeholders %7 and %8 are style tags for the warning content, and they are not space separated from the rest of the text intentionally.</note>
       </trans-unit>
-      <trans-unit id="_msg796" approved="yes">
+      <trans-unit id="_msg876">
         <source xml:space="preserve">Executing…</source>
-        <target xml:space="preserve">Executing…</target>
-        <context-group purpose="location"><context context-type="linenumber">1171</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">1193</context></context-group>
         <note annotates="source" from="developer">A console message indicating an entered command is currently being executed.</note>
       </trans-unit>
-      <trans-unit id="_msg797" approved="yes">
+      <trans-unit id="_msg877">
         <source xml:space="preserve">(peer: %1)</source>
-        <target xml:space="preserve">(peer: %1)</target>
-        <context-group purpose="location"><context context-type="linenumber">1281</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">1303</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg798" approved="yes">
+      <trans-unit id="_msg878">
         <source xml:space="preserve">via %1</source>
-        <target xml:space="preserve">via %1</target>
-        <context-group purpose="location"><context context-type="linenumber">1283</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">1305</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg799" approved="yes">
+      <trans-unit id="_msg879">
         <source xml:space="preserve">Regular</source>
-        <target xml:space="preserve">Regular</target>
-        <context-group purpose="location"><context context-type="linenumber">1326</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">1352</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg800" approved="yes">
+      <trans-unit id="_msg880">
         <source xml:space="preserve">Masternode</source>
-        <target xml:space="preserve">Masternode</target>
-        <context-group purpose="location"><context context-type="linenumber">1330</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">1356</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg801" approved="yes">
+      <trans-unit id="_msg881">
         <source xml:space="preserve">Verified Masternode</source>
-        <target xml:space="preserve">Verified Masternode</target>
-        <context-group purpose="location"><context context-type="linenumber">1332</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">1358</context></context-group>
       </trans-unit>
     </group>
   </body></file>
-  <file original="../rpcconsole.h" datatype="c" source-language="en" target-language="en"><body>
+  <file original="../rpcconsole.h" datatype="c" source-language="en"><body>
     <group restype="x-trolltech-linguist-context" resname="RPCConsole">
-      <trans-unit id="_msg802" approved="yes">
+      <trans-unit id="_msg882">
         <source xml:space="preserve">To</source>
-        <target xml:space="preserve">To</target>
-        <context-group purpose="location"><context context-type="linenumber">155</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">165</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg803" approved="yes">
+      <trans-unit id="_msg883">
         <source xml:space="preserve">From</source>
-        <target xml:space="preserve">From</target>
-        <context-group purpose="location"><context context-type="linenumber">155</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">165</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg804" approved="yes">
+      <trans-unit id="_msg884">
         <source xml:space="preserve">No</source>
-        <target xml:space="preserve">No</target>
-        <context-group purpose="location"><context context-type="linenumber">155</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">165</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg805" approved="yes">
+      <trans-unit id="_msg885">
         <source xml:space="preserve">Ban for</source>
-        <target xml:space="preserve">Ban for</target>
-        <context-group purpose="location"><context context-type="linenumber">156</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">166</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg806" approved="yes">
+      <trans-unit id="_msg886">
         <source xml:space="preserve">Yes</source>
-        <target xml:space="preserve">Yes</target>
-        <context-group purpose="location"><context context-type="linenumber">155</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">165</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg807" approved="yes">
+      <trans-unit id="_msg887">
         <source xml:space="preserve">Unknown</source>
-        <target xml:space="preserve">Unknown</target>
-        <context-group purpose="location"><context context-type="linenumber">156</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">166</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg808" approved="yes">
+      <trans-unit id="_msg888">
         <source xml:space="preserve">Never</source>
-        <target xml:space="preserve">Never</target>
-        <context-group purpose="location"><context context-type="linenumber">203</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">214</context></context-group>
       </trans-unit>
     </group>
   </body></file>
-  <file original="../forms/receivecoinsdialog.ui" datatype="x-trolltech-designer-ui" source-language="en" target-language="en"><body>
+  <file original="../forms/receivecoinsdialog.ui" datatype="x-trolltech-designer-ui" source-language="en"><body>
     <group restype="x-trolltech-linguist-context" resname="ReceiveCoinsDialog">
-      <trans-unit id="_msg809" approved="yes">
+      <trans-unit id="_msg889">
         <source xml:space="preserve">An optional message to attach to the payment request, which will be displayed when the request is opened. Note: The message will not be sent with the payment over the Dash network.</source>
-        <target xml:space="preserve">An optional message to attach to the payment request, which will be displayed when the request is opened. Note: The message will not be sent with the payment over the Dash network.</target>
         <context-group purpose="location"><context context-type="linenumber">34</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg810" approved="yes">
+      <trans-unit id="_msg890">
         <source xml:space="preserve">&amp;Message:</source>
-        <target xml:space="preserve">&amp;Message:</target>
         <context-group purpose="location"><context context-type="linenumber">37</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg811" approved="yes">
+      <trans-unit id="_msg891">
         <source xml:space="preserve">An optional label to associate with the new receiving address.</source>
-        <target xml:space="preserve">An optional label to associate with the new receiving address.</target>
         <context-group purpose="location"><context context-type="linenumber">77</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg812" approved="yes">
+      <trans-unit id="_msg892">
         <source xml:space="preserve">An optional message to attach to the payment request, which will be displayed when the request is opened.&lt;br&gt;Note: The message will not be sent with the payment over the Dash network.</source>
-        <target xml:space="preserve">An optional message to attach to the payment request, which will be displayed when the request is opened.&lt;br&gt;Note: The message will not be sent with the payment over the Dash network.</target>
         <context-group purpose="location"><context context-type="linenumber">60</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg813" approved="yes">
+      <trans-unit id="_msg893">
         <source xml:space="preserve">An optional label to associate with the new receiving address (used by you to identify an invoice).  It is also attached to the payment request.</source>
-        <target xml:space="preserve">An optional label to associate with the new receiving address (used by you to identify an invoice).  It is also attached to the payment request.</target>
         <context-group purpose="location"><context context-type="linenumber">50</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg814" approved="yes">
+      <trans-unit id="_msg894">
         <source xml:space="preserve">Use this form to request payments. All fields are &lt;b&gt;optional&lt;/b&gt;.</source>
-        <target xml:space="preserve">Use this form to request payments. All fields are &lt;b&gt;optional&lt;/b&gt;.</target>
         <context-group purpose="location"><context context-type="linenumber">70</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg815" approved="yes">
+      <trans-unit id="_msg895">
         <source xml:space="preserve">&amp;Label:</source>
-        <target xml:space="preserve">&amp;Label:</target>
         <context-group purpose="location"><context context-type="linenumber">80</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg816" approved="yes">
+      <trans-unit id="_msg896">
         <source xml:space="preserve">An optional amount to request. Leave this empty or zero to not request a specific amount.</source>
-        <target xml:space="preserve">An optional amount to request. Leave this empty or zero to not request a specific amount.</target>
         <context-group purpose="location"><context context-type="linenumber">93</context></context-group>
         <context-group purpose="location"><context context-type="linenumber">179</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg817" approved="yes">
+      <trans-unit id="_msg897">
         <source xml:space="preserve">&amp;Amount:</source>
-        <target xml:space="preserve">&amp;Amount:</target>
         <context-group purpose="location"><context context-type="linenumber">96</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg818" approved="yes">
+      <trans-unit id="_msg898">
         <source xml:space="preserve">&amp;Create new receiving address</source>
-        <target xml:space="preserve">&amp;Create new receiving address</target>
         <context-group purpose="location"><context context-type="linenumber">117</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg819" approved="yes">
+      <trans-unit id="_msg899">
         <source xml:space="preserve">Clear all fields of the form.</source>
-        <target xml:space="preserve">Clear all fields of the form.</target>
         <context-group purpose="location"><context context-type="linenumber">136</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg820" approved="yes">
+      <trans-unit id="_msg900">
         <source xml:space="preserve">Clear</source>
-        <target xml:space="preserve">Clear</target>
         <context-group purpose="location"><context context-type="linenumber">139</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg821" approved="yes">
+      <trans-unit id="_msg901">
         <source xml:space="preserve">Requested payments history</source>
-        <target xml:space="preserve">Requested payments history</target>
         <context-group purpose="location"><context context-type="linenumber">234</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg822" approved="yes">
+      <trans-unit id="_msg902">
         <source xml:space="preserve">Show the selected request (does the same as double clicking an entry)</source>
-        <target xml:space="preserve">Show the selected request (does the same as double clicking an entry)</target>
         <context-group purpose="location"><context context-type="linenumber">259</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg823" approved="yes">
+      <trans-unit id="_msg903">
         <source xml:space="preserve">Show</source>
-        <target xml:space="preserve">Show</target>
         <context-group purpose="location"><context context-type="linenumber">262</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg824" approved="yes">
+      <trans-unit id="_msg904">
         <source xml:space="preserve">Remove the selected entries from the list</source>
-        <target xml:space="preserve">Remove the selected entries from the list</target>
         <context-group purpose="location"><context context-type="linenumber">275</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg825" approved="yes">
+      <trans-unit id="_msg905">
         <source xml:space="preserve">Remove</source>
-        <target xml:space="preserve">Remove</target>
         <context-group purpose="location"><context context-type="linenumber">278</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg826" approved="yes">
+      <trans-unit id="_msg906">
         <source xml:space="preserve">Enter a label to associate with the new receiving address</source>
-        <target xml:space="preserve">Enter a label to associate with the new receiving address</target>
         <context-group purpose="location"><context context-type="linenumber">53</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg827" approved="yes">
+      <trans-unit id="_msg907">
         <source xml:space="preserve">Enter a message to attach to the payment request</source>
-        <target xml:space="preserve">Enter a message to attach to the payment request</target>
         <context-group purpose="location"><context context-type="linenumber">63</context></context-group>
       </trans-unit>
     </group>
   </body></file>
-  <file original="../receivecoinsdialog.cpp" datatype="cpp" source-language="en" target-language="en"><body>
+  <file original="../receivecoinsdialog.cpp" datatype="cpp" source-language="en"><body>
     <group restype="x-trolltech-linguist-context" resname="ReceiveCoinsDialog">
-      <trans-unit id="_msg828" approved="yes">
+      <trans-unit id="_msg908">
         <source xml:space="preserve">Copy &amp;URI</source>
-        <target xml:space="preserve">Copy &amp;URI</target>
-        <context-group purpose="location"><context context-type="linenumber">36</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">33</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg829" approved="yes">
+      <trans-unit id="_msg909">
         <source xml:space="preserve">&amp;Copy address</source>
-        <target xml:space="preserve">&amp;Copy address</target>
-        <context-group purpose="location"><context context-type="linenumber">37</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">34</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg830" approved="yes">
+      <trans-unit id="_msg910">
         <source xml:space="preserve">Copy &amp;label</source>
-        <target xml:space="preserve">Copy &amp;label</target>
-        <context-group purpose="location"><context context-type="linenumber">38</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">35</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg831" approved="yes">
+      <trans-unit id="_msg911">
         <source xml:space="preserve">Copy &amp;message</source>
-        <target xml:space="preserve">Copy &amp;message</target>
-        <context-group purpose="location"><context context-type="linenumber">39</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">36</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg832" approved="yes">
+      <trans-unit id="_msg912">
         <source xml:space="preserve">Copy &amp;amount</source>
-        <target xml:space="preserve">Copy &amp;amount</target>
-        <context-group purpose="location"><context context-type="linenumber">40</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">37</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg833" approved="yes">
+      <trans-unit id="_msg913">
         <source xml:space="preserve">Could not unlock wallet.</source>
-        <target xml:space="preserve">Could not unlock wallet.</target>
-        <context-group purpose="location"><context context-type="linenumber">145</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">142</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg834" approved="yes">
+      <trans-unit id="_msg914">
         <source xml:space="preserve">Could not generate new address</source>
-        <target xml:space="preserve">Could not generate new address</target>
-        <context-group purpose="location"><context context-type="linenumber">150</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">147</context></context-group>
       </trans-unit>
     </group>
   </body></file>
-  <file original="../forms/receiverequestdialog.ui" datatype="x-trolltech-designer-ui" source-language="en" target-language="en"><body>
+  <file original="../forms/receiverequestdialog.ui" datatype="x-trolltech-designer-ui" source-language="en"><body>
     <group restype="x-trolltech-linguist-context" resname="ReceiveRequestDialog">
-      <trans-unit id="_msg835" approved="yes">
+      <trans-unit id="_msg915">
         <source xml:space="preserve">Request payment to …</source>
-        <target xml:space="preserve">Request payment to …</target>
         <context-group purpose="location"><context context-type="linenumber">14</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg836" approved="yes">
+      <trans-unit id="_msg916">
         <source xml:space="preserve">Address:</source>
-        <target xml:space="preserve">Address:</target>
         <context-group purpose="location"><context context-type="linenumber">90</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg837" approved="yes">
+      <trans-unit id="_msg917">
         <source xml:space="preserve">Amount:</source>
-        <target xml:space="preserve">Amount:</target>
         <context-group purpose="location"><context context-type="linenumber">119</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg838" approved="yes">
+      <trans-unit id="_msg918">
         <source xml:space="preserve">Label:</source>
-        <target xml:space="preserve">Label:</target>
         <context-group purpose="location"><context context-type="linenumber">148</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg839" approved="yes">
+      <trans-unit id="_msg919">
         <source xml:space="preserve">Message:</source>
-        <target xml:space="preserve">Message:</target>
         <context-group purpose="location"><context context-type="linenumber">180</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg840" approved="yes">
+      <trans-unit id="_msg920">
         <source xml:space="preserve">Wallet:</source>
-        <target xml:space="preserve">Wallet:</target>
         <context-group purpose="location"><context context-type="linenumber">212</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg841" approved="yes">
+      <trans-unit id="_msg921">
         <source xml:space="preserve">Copy &amp;URI</source>
-        <target xml:space="preserve">Copy &amp;URI</target>
         <context-group purpose="location"><context context-type="linenumber">240</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg842" approved="yes">
+      <trans-unit id="_msg922">
         <source xml:space="preserve">Copy &amp;Address</source>
-        <target xml:space="preserve">Copy &amp;Address</target>
         <context-group purpose="location"><context context-type="linenumber">250</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg843" approved="yes">
+      <trans-unit id="_msg923">
         <source xml:space="preserve">&amp;Save Image…</source>
-        <target xml:space="preserve">&amp;Save Image…</target>
         <context-group purpose="location"><context context-type="linenumber">260</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg844" approved="yes">
+      <trans-unit id="_msg924">
         <source xml:space="preserve">Payment information</source>
-        <target xml:space="preserve">Payment information</target>
         <context-group purpose="location"><context context-type="linenumber">39</context></context-group>
       </trans-unit>
     </group>
   </body></file>
-  <file original="../receiverequestdialog.cpp" datatype="cpp" source-language="en" target-language="en"><body>
+  <file original="../receiverequestdialog.cpp" datatype="cpp" source-language="en"><body>
     <group restype="x-trolltech-linguist-context" resname="ReceiveRequestDialog">
-      <trans-unit id="_msg845" approved="yes">
+      <trans-unit id="_msg925">
         <source xml:space="preserve">Request payment to %1</source>
-        <target xml:space="preserve">Request payment to %1</target>
         <context-group purpose="location"><context context-type="linenumber">52</context></context-group>
       </trans-unit>
     </group>
   </body></file>
-  <file original="../recentrequeststablemodel.cpp" datatype="cpp" source-language="en" target-language="en"><body>
+  <file original="../recentrequeststablemodel.cpp" datatype="cpp" source-language="en"><body>
     <group restype="x-trolltech-linguist-context" resname="RecentRequestsTableModel">
-      <trans-unit id="_msg846" approved="yes">
+      <trans-unit id="_msg926">
         <source xml:space="preserve">Date</source>
-        <target xml:space="preserve">Date</target>
         <context-group purpose="location"><context context-type="linenumber">32</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg847" approved="yes">
+      <trans-unit id="_msg927">
         <source xml:space="preserve">Label</source>
-        <target xml:space="preserve">Label</target>
         <context-group purpose="location"><context context-type="linenumber">32</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg848" approved="yes">
+      <trans-unit id="_msg928">
         <source xml:space="preserve">Message</source>
-        <target xml:space="preserve">Message</target>
         <context-group purpose="location"><context context-type="linenumber">32</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg849" approved="yes">
+      <trans-unit id="_msg929">
         <source xml:space="preserve">(no label)</source>
-        <target xml:space="preserve">(no label)</target>
-        <context-group purpose="location"><context context-type="linenumber">73</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">70</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg850" approved="yes">
+      <trans-unit id="_msg930">
         <source xml:space="preserve">(no message)</source>
-        <target xml:space="preserve">(no message)</target>
-        <context-group purpose="location"><context context-type="linenumber">82</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">79</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg851" approved="yes">
+      <trans-unit id="_msg931">
         <source xml:space="preserve">(no amount requested)</source>
-        <target xml:space="preserve">(no amount requested)</target>
-        <context-group purpose="location"><context context-type="linenumber">90</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">87</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg852" approved="yes">
+      <trans-unit id="_msg932">
         <source xml:space="preserve">Requested</source>
-        <target xml:space="preserve">Requested</target>
-        <context-group purpose="location"><context context-type="linenumber">133</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">130</context></context-group>
       </trans-unit>
     </group>
   </body></file>
-  <file original="../forms/sendcoinsdialog.ui" datatype="x-trolltech-designer-ui" source-language="en" target-language="en"><body>
+  <file original="../forms/sendcoinsdialog.ui" datatype="x-trolltech-designer-ui" source-language="en"><body>
     <group restype="x-trolltech-linguist-context" resname="SendCoinsDialog">
-      <trans-unit id="_msg853" approved="yes">
+      <trans-unit id="_msg933">
         <source xml:space="preserve">Send Coins</source>
-        <target xml:space="preserve">Send Coins</target>
         <context-group purpose="location"><context context-type="linenumber">14</context></context-group>
-        <context-group purpose="location"><context context-type="sourcefile">../sendcoinsdialog.cpp</context><context context-type="linenumber">766</context></context-group>
+        <context-group purpose="location"><context context-type="sourcefile">../sendcoinsdialog.cpp</context><context context-type="linenumber">777</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg854" approved="yes">
+      <trans-unit id="_msg934">
         <source xml:space="preserve">Coin Control Features</source>
-        <target xml:space="preserve">Coin Control Features</target>
         <context-group purpose="location"><context context-type="linenumber">81</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg855" approved="yes">
+      <trans-unit id="_msg935">
         <source xml:space="preserve">automatically selected</source>
-        <target xml:space="preserve">automatically selected</target>
         <context-group purpose="location"><context context-type="linenumber">111</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg856" approved="yes">
+      <trans-unit id="_msg936">
         <source xml:space="preserve">Insufficient funds!</source>
-        <target xml:space="preserve">Insufficient funds!</target>
         <context-group purpose="location"><context context-type="linenumber">121</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg857" approved="yes">
+      <trans-unit id="_msg937">
         <source xml:space="preserve">Quantity:</source>
-        <target xml:space="preserve">Quantity:</target>
-        <context-group purpose="location"><context context-type="linenumber">204</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">207</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg858" approved="yes">
+      <trans-unit id="_msg938">
         <source xml:space="preserve">Bytes:</source>
-        <target xml:space="preserve">Bytes:</target>
-        <context-group purpose="location"><context context-type="linenumber">233</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">236</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg859" approved="yes">
+      <trans-unit id="_msg939">
         <source xml:space="preserve">Amount:</source>
-        <target xml:space="preserve">Amount:</target>
-        <context-group purpose="location"><context context-type="linenumber">275</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">278</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg860" approved="yes">
+      <trans-unit id="_msg940">
         <source xml:space="preserve">Fee:</source>
-        <target xml:space="preserve">Fee:</target>
-        <context-group purpose="location"><context context-type="linenumber">343</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg861" approved="yes">
-        <source xml:space="preserve">Dust:</source>
-        <target xml:space="preserve">Dust:</target>
-        <context-group purpose="location"><context context-type="linenumber">301</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">323</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg862" approved="yes">
+      <trans-unit id="_msg941">
         <source xml:space="preserve">Inputs…</source>
-        <target xml:space="preserve">Inputs…</target>
         <context-group purpose="location"><context context-type="linenumber">101</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg863" approved="yes">
+      <trans-unit id="_msg942">
         <source xml:space="preserve">After Fee:</source>
-        <target xml:space="preserve">After Fee:</target>
-        <context-group purpose="location"><context context-type="linenumber">388</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">371</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg864" approved="yes">
+      <trans-unit id="_msg943">
         <source xml:space="preserve">Change:</source>
-        <target xml:space="preserve">Change:</target>
-        <context-group purpose="location"><context context-type="linenumber">414</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">397</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg865" approved="yes">
+      <trans-unit id="_msg944">
         <source xml:space="preserve">If this is activated, but the change address is empty or invalid, change will be sent to a newly generated address.</source>
-        <target xml:space="preserve">If this is activated, but the change address is empty or invalid, change will be sent to a newly generated address.</target>
-        <context-group purpose="location"><context context-type="linenumber">458</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">441</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg866" approved="yes">
+      <trans-unit id="_msg945">
         <source xml:space="preserve">Custom change address</source>
-        <target xml:space="preserve">Custom change address</target>
-        <context-group purpose="location"><context context-type="linenumber">461</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">444</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg867" approved="yes">
+      <trans-unit id="_msg946">
         <source xml:space="preserve">Transaction Fee:</source>
-        <target xml:space="preserve">Transaction Fee:</target>
-        <context-group purpose="location"><context context-type="linenumber">658</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">641</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg868" approved="yes">
+      <trans-unit id="_msg947">
         <source xml:space="preserve">When there is less transaction volume than space in the blocks, miners as well as relaying nodes may enforce a minimum fee. Paying only this minimum fee is just fine, but be aware that this can result in a never confirming transaction once there is more demand for dash transactions than the network can process.</source>
-        <target xml:space="preserve">When there is less transaction volume than space in the blocks, miners as well as relaying nodes may enforce a minimum fee. Paying only this minimum fee is just fine, but be aware that this can result in a never confirming transaction once there is more demand for dash transactions than the network can process.</target>
-        <context-group purpose="location"><context context-type="linenumber">822</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">805</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg869" approved="yes">
+      <trans-unit id="_msg948">
         <source xml:space="preserve">A too low fee might result in a never confirming transaction (read the tooltip)</source>
-        <target xml:space="preserve">A too low fee might result in a never confirming transaction (read the tooltip)</target>
-        <context-group purpose="location"><context context-type="linenumber">825</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">808</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg870" approved="yes">
+      <trans-unit id="_msg949">
         <source xml:space="preserve">(Smart fee not initialized yet. This usually takes a few blocks…)</source>
-        <target xml:space="preserve">(Smart fee not initialized yet. This usually takes a few blocks…)</target>
-        <context-group purpose="location"><context context-type="linenumber">942</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">925</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg871" approved="yes">
+      <trans-unit id="_msg950">
         <source xml:space="preserve">Confirmation time target:</source>
-        <target xml:space="preserve">Confirmation time target:</target>
-        <context-group purpose="location"><context context-type="linenumber">968</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">951</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg872" approved="yes">
+      <trans-unit id="_msg951">
         <source xml:space="preserve">If the custom fee is set to 1000 duffs and the transaction is only 250 bytes, then &quot;per kilobyte&quot; only pays 250 duffs in fee,&lt;br /&gt;while &quot;at least&quot; pays 1000 duffs. For transactions bigger than a kilobyte both pay by kilobyte.</source>
-        <target xml:space="preserve">If the custom fee is set to 1000 duffs and the transaction is only 250 bytes, then &quot;per kilobyte&quot; only pays 250 duffs in fee,&lt;br /&gt;while &quot;at least&quot; pays 1000 duffs. For transactions bigger than a kilobyte both pay by kilobyte.</target>
-        <context-group purpose="location"><context context-type="linenumber">789</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">772</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg873" approved="yes">
+      <trans-unit id="_msg952">
         <source xml:space="preserve">per kilobyte</source>
-        <target xml:space="preserve">per kilobyte</target>
-        <context-group purpose="location"><context context-type="linenumber">792</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">775</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg874" approved="yes">
+      <trans-unit id="_msg953">
         <source xml:space="preserve">Using the fallbackfee can result in sending a transaction that will take several hours or days (or never) to confirm. Consider choosing your fee manually or wait until you have validated the complete chain.</source>
-        <target xml:space="preserve">Using the fallbackfee can result in sending a transaction that will take several hours or days (or never) to confirm. Consider choosing your fee manually or wait until you have validated the complete chain.</target>
-        <context-group purpose="location"><context context-type="linenumber">694</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">677</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg875" approved="yes">
+      <trans-unit id="_msg954">
         <source xml:space="preserve">Choose…</source>
-        <target xml:space="preserve">Choose…</target>
-        <context-group purpose="location"><context context-type="linenumber">672</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">655</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg876" approved="yes">
+      <trans-unit id="_msg955">
         <source xml:space="preserve">Note: Not enough data for fee estimation, using the fallback fee instead.</source>
-        <target xml:space="preserve">Note: Not enough data for fee estimation, using the fallback fee instead.</target>
-        <context-group purpose="location"><context context-type="linenumber">697</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">680</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg877" approved="yes">
+      <trans-unit id="_msg956">
         <source xml:space="preserve">Hide transaction fee settings</source>
-        <target xml:space="preserve">Hide transaction fee settings</target>
-        <context-group purpose="location"><context context-type="linenumber">735</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">718</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg878" approved="yes">
+      <trans-unit id="_msg957">
         <source xml:space="preserve">Hide</source>
-        <target xml:space="preserve">Hide</target>
-        <context-group purpose="location"><context context-type="linenumber">738</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">721</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg879" approved="yes">
+      <trans-unit id="_msg958">
         <source xml:space="preserve">Recommended:</source>
-        <target xml:space="preserve">Recommended:</target>
-        <context-group purpose="location"><context context-type="linenumber">857</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">840</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg880" approved="yes">
+      <trans-unit id="_msg959">
         <source xml:space="preserve">Custom:</source>
-        <target xml:space="preserve">Custom:</target>
-        <context-group purpose="location"><context context-type="linenumber">890</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">873</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg881" approved="yes">
+      <trans-unit id="_msg960">
         <source xml:space="preserve">Confirm the send action</source>
-        <target xml:space="preserve">Confirm the send action</target>
-        <context-group purpose="location"><context context-type="linenumber">1055</context></context-group>
-        <context-group purpose="location"><context context-type="sourcefile">../sendcoinsdialog.cpp</context><context context-type="linenumber">156</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">1038</context></context-group>
+        <context-group purpose="location"><context context-type="sourcefile">../sendcoinsdialog.cpp</context><context context-type="linenumber">151</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg882" approved="yes">
+      <trans-unit id="_msg961">
         <source xml:space="preserve">S&amp;end</source>
-        <target xml:space="preserve">S&amp;end</target>
-        <context-group purpose="location"><context context-type="linenumber">1058</context></context-group>
-        <context-group purpose="location"><context context-type="sourcefile">../sendcoinsdialog.cpp</context><context context-type="linenumber">155</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">1041</context></context-group>
+        <context-group purpose="location"><context context-type="sourcefile">../sendcoinsdialog.cpp</context><context context-type="linenumber">150</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg883" approved="yes">
+      <trans-unit id="_msg962">
         <source xml:space="preserve">Clear all fields of the form.</source>
-        <target xml:space="preserve">Clear all fields of the form.</target>
-        <context-group purpose="location"><context context-type="linenumber">1077</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">1060</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg884" approved="yes">
+      <trans-unit id="_msg963">
         <source xml:space="preserve">Clear &amp;All</source>
-        <target xml:space="preserve">Clear &amp;All</target>
-        <context-group purpose="location"><context context-type="linenumber">1080</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">1063</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg885" approved="yes">
+      <trans-unit id="_msg964">
         <source xml:space="preserve">Send to multiple recipients at once</source>
-        <target xml:space="preserve">Send to multiple recipients at once</target>
-        <context-group purpose="location"><context context-type="linenumber">1090</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">1073</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg886" approved="yes">
+      <trans-unit id="_msg965">
         <source xml:space="preserve">Add &amp;Recipient</source>
-        <target xml:space="preserve">Add &amp;Recipient</target>
-        <context-group purpose="location"><context context-type="linenumber">1093</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">1076</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg887" approved="yes">
+      <trans-unit id="_msg966">
         <source xml:space="preserve">Balance:</source>
-        <target xml:space="preserve">Balance:</target>
-        <context-group purpose="location"><context context-type="linenumber">1121</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">1104</context></context-group>
       </trans-unit>
     </group>
   </body></file>
-  <file original="../sendcoinsdialog.cpp" datatype="cpp" source-language="en" target-language="en"><body>
+  <file original="../sendcoinsdialog.cpp" datatype="cpp" source-language="en"><body>
     <group restype="x-trolltech-linguist-context" resname="SendCoinsDialog">
-      <trans-unit id="_msg888" approved="yes">
+      <trans-unit id="_msg967">
         <source xml:space="preserve">Copy quantity</source>
-        <target xml:space="preserve">Copy quantity</target>
-        <context-group purpose="location"><context context-type="linenumber">110</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">108</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg889" approved="yes">
+      <trans-unit id="_msg968">
         <source xml:space="preserve">Copy amount</source>
-        <target xml:space="preserve">Copy amount</target>
-        <context-group purpose="location"><context context-type="linenumber">111</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">109</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg890" approved="yes">
+      <trans-unit id="_msg969">
         <source xml:space="preserve">Copy fee</source>
-        <target xml:space="preserve">Copy fee</target>
-        <context-group purpose="location"><context context-type="linenumber">112</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">110</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg891" approved="yes">
+      <trans-unit id="_msg970">
         <source xml:space="preserve">Copy after fee</source>
-        <target xml:space="preserve">Copy after fee</target>
-        <context-group purpose="location"><context context-type="linenumber">113</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">111</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg892" approved="yes">
+      <trans-unit id="_msg971">
         <source xml:space="preserve">Copy bytes</source>
-        <target xml:space="preserve">Copy bytes</target>
-        <context-group purpose="location"><context context-type="linenumber">114</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg893" approved="yes">
-        <source xml:space="preserve">Copy dust</source>
-        <target xml:space="preserve">Copy dust</target>
-        <context-group purpose="location"><context context-type="linenumber">115</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">112</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg894" approved="yes">
+      <trans-unit id="_msg972">
         <source xml:space="preserve">Copy change</source>
-        <target xml:space="preserve">Copy change</target>
-        <context-group purpose="location"><context context-type="linenumber">116</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">113</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg895" approved="yes">
+      <trans-unit id="_msg973">
         <source xml:space="preserve">%1 (%2 blocks)</source>
-        <target xml:space="preserve">%1 (%2 blocks)</target>
-        <context-group purpose="location"><context context-type="linenumber">212</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg896" approved="yes">
-        <source xml:space="preserve">This will produce a Partially Signed Transaction (PSBT) which you can save or copy and then sign with e.g. an offline %1 wallet, or a PSBT-compatible hardware wallet.</source>
-        <target xml:space="preserve">This will produce a Partially Signed Transaction (PSBT) which you can save or copy and then sign with e.g. an offline %1 wallet, or a PSBT-compatible hardware wallet.</target>
-        <context-group purpose="location"><context context-type="linenumber">377</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">207</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg897" approved="yes">
+      <trans-unit id="_msg974">
         <source xml:space="preserve">using</source>
-        <target xml:space="preserve">using</target>
-        <context-group purpose="location"><context context-type="linenumber">387</context></context-group>
-        <context-group purpose="location"><context context-type="linenumber">389</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">397</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">399</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg898" approved="yes">
+      <trans-unit id="_msg975">
         <source xml:space="preserve">%1 to %2</source>
-        <target xml:space="preserve">%1 to %2</target>
-        <context-group purpose="location"><context context-type="linenumber">358</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg899" approved="yes">
-        <source xml:space="preserve">Are you sure you want to send?</source>
-        <target xml:space="preserve">Are you sure you want to send?</target>
-        <context-group purpose="location"><context context-type="linenumber">373</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">353</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg900" approved="yes">
+      <trans-unit id="_msg976">
         <source xml:space="preserve">&lt;b&gt;(%1 of %2 entries displayed)&lt;/b&gt;</source>
-        <target xml:space="preserve">&lt;b&gt;(%1 of %2 entries displayed)&lt;/b&gt;</target>
-        <context-group purpose="location"><context context-type="linenumber">398</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">408</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg901" approved="yes">
+      <trans-unit id="_msg977">
         <source xml:space="preserve">S&amp;end mixed funds</source>
-        <target xml:space="preserve">S&amp;end mixed funds</target>
-        <context-group purpose="location"><context context-type="linenumber">152</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">147</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg902" approved="yes">
+      <trans-unit id="_msg978">
         <source xml:space="preserve">Confirm the %1 send action</source>
-        <target xml:space="preserve">Confirm the %1 send action</target>
-        <context-group purpose="location"><context context-type="linenumber">153</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">148</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg903" approved="yes">
+      <trans-unit id="_msg979">
         <source xml:space="preserve">Cr&amp;eate Unsigned</source>
-        <target xml:space="preserve">Cr&amp;eate Unsigned</target>
-        <context-group purpose="location"><context context-type="linenumber">235</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">230</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg904" approved="yes">
+      <trans-unit id="_msg980">
         <source xml:space="preserve"> from wallet &apos;%1&apos;</source>
-        <target xml:space="preserve"> from wallet &apos;%1&apos;</target>
-        <context-group purpose="location"><context context-type="linenumber">342</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">337</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg905" approved="yes">
+      <trans-unit id="_msg981">
         <source xml:space="preserve">%1 to &apos;%2&apos;</source>
-        <target xml:space="preserve">%1 to &apos;%2&apos;</target>
-        <context-group purpose="location"><context context-type="linenumber">353</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg906" approved="yes">
-        <source xml:space="preserve">Do you want to draft this transaction?</source>
-        <target xml:space="preserve">Do you want to draft this transaction?</target>
-        <context-group purpose="location"><context context-type="linenumber">371</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">348</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg907" approved="yes">
+      <trans-unit id="_msg982">
         <source xml:space="preserve">%1 funds only</source>
-        <target xml:space="preserve">%1 funds only</target>
-        <context-group purpose="location"><context context-type="linenumber">387</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">397</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg908" approved="yes">
+      <trans-unit id="_msg983">
         <source xml:space="preserve">any available funds</source>
-        <target xml:space="preserve">any available funds</target>
-        <context-group purpose="location"><context context-type="linenumber">389</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">399</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg909" approved="yes">
+      <trans-unit id="_msg984">
         <source xml:space="preserve">Transaction fee</source>
-        <target xml:space="preserve">Transaction fee</target>
-        <context-group purpose="location"><context context-type="linenumber">408</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">418</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg910" approved="yes">
+      <trans-unit id="_msg985">
         <source xml:space="preserve">(%1 transactions have higher fees usually due to no change output being allowed)</source>
-        <target xml:space="preserve">(%1 transactions have higher fees usually due to no change output being allowed)</target>
-        <context-group purpose="location"><context context-type="linenumber">414</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">424</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg911" approved="yes">
+      <trans-unit id="_msg986">
         <source xml:space="preserve">Transaction size: %1</source>
-        <target xml:space="preserve">Transaction size: %1</target>
-        <context-group purpose="location"><context context-type="linenumber">421</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">431</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg912" approved="yes">
+      <trans-unit id="_msg987">
         <source xml:space="preserve">Fee rate: %1</source>
-        <target xml:space="preserve">Fee rate: %1</target>
-        <context-group purpose="location"><context context-type="linenumber">424</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">434</context></context-group>
       </trans-unit>
       <group restype="x-gettext-plurals">
-        <context-group purpose="location"><context context-type="linenumber">430</context></context-group>
-        <trans-unit id="_msg913[0]" approved="yes">
+        <context-group purpose="location"><context context-type="linenumber">440</context></context-group>
+        <trans-unit id="_msg988[0]">
           <source xml:space="preserve">This transaction will consume %n input(s)</source>
-          <target xml:space="preserve">This transaction will consume %n input</target>
         </trans-unit>
-        <trans-unit id="_msg913[1]" approved="yes">
+        <trans-unit id="_msg988[1]">
           <source xml:space="preserve">This transaction will consume %n input(s)</source>
-          <target xml:space="preserve">This transaction will consume %n inputs</target>
         </trans-unit>
       </group>
-      <trans-unit id="_msg914" approved="yes">
+      <trans-unit id="_msg989">
         <source xml:space="preserve">Warning: Using %1 with %2 or more inputs can harm your privacy and is not recommended</source>
-        <target xml:space="preserve">Warning: Using %1 with %2 or more inputs can harm your privacy and is not recommended</target>
-        <context-group purpose="location"><context context-type="linenumber">436</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">446</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg915" approved="yes">
+      <trans-unit id="_msg990">
         <source xml:space="preserve">Click to learn more</source>
-        <target xml:space="preserve">Click to learn more</target>
-        <context-group purpose="location"><context context-type="linenumber">438</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">448</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg916" approved="yes">
+      <trans-unit id="_msg991">
         <source xml:space="preserve">Total Amount</source>
-        <target xml:space="preserve">Total Amount</target>
-        <context-group purpose="location"><context context-type="linenumber">455</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">464</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg917" approved="yes">
+      <trans-unit id="_msg992">
         <source xml:space="preserve">or</source>
-        <target xml:space="preserve">or</target>
-        <context-group purpose="location"><context context-type="linenumber">458</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">467</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg918" approved="yes">
+      <trans-unit id="_msg993">
         <source xml:space="preserve">Confirm send coins</source>
-        <target xml:space="preserve">Confirm send coins</target>
-        <context-group purpose="location"><context context-type="linenumber">477</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg919" approved="yes">
-        <source xml:space="preserve">Confirm transaction proposal</source>
-        <target xml:space="preserve">Confirm transaction proposal</target>
-        <context-group purpose="location"><context context-type="linenumber">477</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg920" approved="yes">
-        <source xml:space="preserve">Create Unsigned</source>
-        <target xml:space="preserve">Create Unsigned</target>
-        <context-group purpose="location"><context context-type="linenumber">478</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">489</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg921" approved="yes">
+      <trans-unit id="_msg994">
         <source xml:space="preserve">Save Transaction Data</source>
-        <target xml:space="preserve">Save Transaction Data</target>
-        <context-group purpose="location"><context context-type="linenumber">522</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">534</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg922" approved="yes">
+      <trans-unit id="_msg995">
         <source xml:space="preserve">PSBT saved</source>
-        <target xml:space="preserve">PSBT saved</target>
-        <context-group purpose="location"><context context-type="linenumber">531</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">543</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg923" approved="yes">
+      <trans-unit id="_msg996">
         <source xml:space="preserve">Watch-only balance:</source>
-        <target xml:space="preserve">Watch-only balance:</target>
-        <context-group purpose="location"><context context-type="linenumber">709</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg924" approved="yes">
-        <source xml:space="preserve">Send</source>
-        <target xml:space="preserve">Send</target>
-        <context-group purpose="location"><context context-type="linenumber">478</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">720</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg925">
+      <trans-unit id="_msg997">
         <source xml:space="preserve">Creates a Partially Signed Blockchain Transaction (PSBT) for use with e.g. an offline %1 wallet, or a PSBT-compatible hardware wallet.</source>
-        <target xml:space="preserve"></target>
-        <context-group purpose="location"><context context-type="linenumber">236</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">231</context></context-group>
+      </trans-unit>
+      <trans-unit id="_msg998">
+        <source xml:space="preserve">Do you want to create this transaction?</source>
+        <context-group purpose="location"><context context-type="linenumber">370</context></context-group>
+        <note annotates="source" from="developer">Message displayed when attempting to create a transaction. Cautionary text to prompt the user to verify that the displayed transaction details represent the transaction the user intends to create.</note>
+      </trans-unit>
+      <trans-unit id="_msg999">
+        <source xml:space="preserve">Please, review your transaction proposal. This will produce a Partially Signed Blockchain Transaction (PSBT) which you can save or copy and then sign with e.g. an offline %1 wallet, or a PSBT-compatible hardware wallet.</source>
+        <context-group purpose="location"><context context-type="linenumber">379</context></context-group>
+        <note annotates="source" from="developer">Text to inform a user attempting to create a transaction of their current options. At this stage, a user can only create a PSBT. This string is displayed when private keys are disabled and an external signer is not available.</note>
+      </trans-unit>
+      <trans-unit id="_msg1000">
+        <source xml:space="preserve">Please, review your transaction. You can create and send this transaction or create a Partially Signed Blockchain Transaction (PSBT), which you can save or copy and then sign with, e.g., an offline %1 wallet, or a PSBT-compatible hardware wallet.</source>
+        <context-group purpose="location"><context context-type="linenumber">384</context></context-group>
+        <note annotates="source" from="developer">Text to inform a user attempting to create a transaction of their current options. At this stage, a user can send their transaction or create a PSBT. This string is displayed when both private keys and PSBT controls are enabled.</note>
+      </trans-unit>
+      <trans-unit id="_msg1001">
+        <source xml:space="preserve">Please, review your transaction.</source>
+        <context-group purpose="location"><context context-type="linenumber">387</context></context-group>
+        <note annotates="source" from="developer">Text to prompt a user to review the details of the transaction they are attempting to send.</note>
       </trans-unit>
-      <trans-unit id="_msg926" approved="yes">
+      <trans-unit id="_msg1002">
         <source xml:space="preserve">To review recipient list click &quot;Show Details…&quot;</source>
-        <target xml:space="preserve">To review recipient list click &quot;Show Details…&quot;</target>
-        <context-group purpose="location"><context context-type="linenumber">461</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">473</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg927" approved="yes">
+      <trans-unit id="_msg1003">
         <source xml:space="preserve">Partially Signed Transaction (Binary)</source>
-        <target xml:space="preserve">Partially Signed Transaction (Binary)</target>
-        <context-group purpose="location"><context context-type="linenumber">524</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">536</context></context-group>
         <note annotates="source" from="developer">Expanded name of the binary PSBT file format. See: BIP 174.</note>
       </trans-unit>
-      <trans-unit id="_msg928" approved="yes">
+      <trans-unit id="_msg1004">
         <source xml:space="preserve">The recipient address is not valid. Please recheck.</source>
-        <target xml:space="preserve">The recipient address is not valid. Please recheck.</target>
-        <context-group purpose="location"><context context-type="linenumber">739</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">750</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg929" approved="yes">
+      <trans-unit id="_msg1005">
         <source xml:space="preserve">The amount to pay must be larger than 0.</source>
-        <target xml:space="preserve">The amount to pay must be larger than 0.</target>
-        <context-group purpose="location"><context context-type="linenumber">742</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">753</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg930" approved="yes">
+      <trans-unit id="_msg1006">
         <source xml:space="preserve">The amount exceeds your balance.</source>
-        <target xml:space="preserve">The amount exceeds your balance.</target>
-        <context-group purpose="location"><context context-type="linenumber">745</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">756</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg931" approved="yes">
+      <trans-unit id="_msg1007">
         <source xml:space="preserve">The total exceeds your balance when the %1 transaction fee is included.</source>
-        <target xml:space="preserve">The total exceeds your balance when the %1 transaction fee is included.</target>
-        <context-group purpose="location"><context context-type="linenumber">748</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">759</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg932" approved="yes">
+      <trans-unit id="_msg1008">
         <source xml:space="preserve">Duplicate address found: addresses should only be used once each.</source>
-        <target xml:space="preserve">Duplicate address found: addresses should only be used once each.</target>
-        <context-group purpose="location"><context context-type="linenumber">751</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">762</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg933" approved="yes">
+      <trans-unit id="_msg1009">
         <source xml:space="preserve">Transaction creation failed!</source>
-        <target xml:space="preserve">Transaction creation failed!</target>
-        <context-group purpose="location"><context context-type="linenumber">754</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">765</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg934" approved="yes">
+      <trans-unit id="_msg1010">
         <source xml:space="preserve">A fee higher than %1 is considered an absurdly high fee.</source>
-        <target xml:space="preserve">A fee higher than %1 is considered an absurdly high fee.</target>
-        <context-group purpose="location"><context context-type="linenumber">758</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">769</context></context-group>
       </trans-unit>
       <group restype="x-gettext-plurals">
-        <context-group purpose="location"><context context-type="linenumber">876</context></context-group>
-        <trans-unit id="_msg935[0]" approved="yes">
+        <context-group purpose="location"><context context-type="linenumber">887</context></context-group>
+        <trans-unit id="_msg1011[0]">
           <source xml:space="preserve">Estimated to begin confirmation within %n block(s).</source>
-          <target xml:space="preserve">Estimated to begin confirmation within %n block.</target>
         </trans-unit>
-        <trans-unit id="_msg935[1]" approved="yes">
+        <trans-unit id="_msg1011[1]">
           <source xml:space="preserve">Estimated to begin confirmation within %n block(s).</source>
-          <target xml:space="preserve">Estimated to begin confirmation within %n blocks.</target>
         </trans-unit>
       </group>
-      <trans-unit id="_msg936" approved="yes">
+      <trans-unit id="_msg1012">
         <source xml:space="preserve">Warning: Invalid Dash address</source>
-        <target xml:space="preserve">Warning: Invalid Dash address</target>
-        <context-group purpose="location"><context context-type="linenumber">977</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">982</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg937" approved="yes">
+      <trans-unit id="_msg1013">
         <source xml:space="preserve">Warning: Unknown change address</source>
-        <target xml:space="preserve">Warning: Unknown change address</target>
-        <context-group purpose="location"><context context-type="linenumber">982</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">987</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg938" approved="yes">
+      <trans-unit id="_msg1014">
         <source xml:space="preserve">Confirm custom change address</source>
-        <target xml:space="preserve">Confirm custom change address</target>
-        <context-group purpose="location"><context context-type="linenumber">985</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">990</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg939" approved="yes">
+      <trans-unit id="_msg1015">
         <source xml:space="preserve">The address you selected for change is not part of this wallet. Any or all funds in your wallet may be sent to this address. Are you sure?</source>
-        <target xml:space="preserve">The address you selected for change is not part of this wallet. Any or all funds in your wallet may be sent to this address. Are you sure?</target>
-        <context-group purpose="location"><context context-type="linenumber">985</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">990</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg940" approved="yes">
+      <trans-unit id="_msg1016">
         <source xml:space="preserve">(no label)</source>
-        <target xml:space="preserve">(no label)</target>
-        <context-group purpose="location"><context context-type="linenumber">1006</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">1011</context></context-group>
       </trans-unit>
     </group>
   </body></file>
-  <file original="../forms/sendcoinsentry.ui" datatype="x-trolltech-designer-ui" source-language="en" target-language="en"><body>
+  <file original="../forms/sendcoinsentry.ui" datatype="x-trolltech-designer-ui" source-language="en"><body>
     <group restype="x-trolltech-linguist-context" resname="SendCoinsEntry">
-      <trans-unit id="_msg941" approved="yes">
+      <trans-unit id="_msg1017">
         <source xml:space="preserve">Pay &amp;To:</source>
-        <target xml:space="preserve">Pay &amp;To:</target>
-        <context-group purpose="location"><context context-type="linenumber">39</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">35</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg942" approved="yes">
+      <trans-unit id="_msg1018">
         <source xml:space="preserve">The Dash address to send the payment to</source>
-        <target xml:space="preserve">The Dash address to send the payment to</target>
-        <context-group purpose="location"><context context-type="linenumber">57</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">53</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg943" approved="yes">
+      <trans-unit id="_msg1019">
         <source xml:space="preserve">Choose previously used address</source>
-        <target xml:space="preserve">Choose previously used address</target>
-        <context-group purpose="location"><context context-type="linenumber">64</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">60</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg944" approved="yes">
+      <trans-unit id="_msg1020">
         <source xml:space="preserve">Alt+A</source>
-        <target xml:space="preserve">Alt+A</target>
-        <context-group purpose="location"><context context-type="linenumber">76</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">72</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg945" approved="yes">
+      <trans-unit id="_msg1021">
         <source xml:space="preserve">Paste address from clipboard</source>
-        <target xml:space="preserve">Paste address from clipboard</target>
-        <context-group purpose="location"><context context-type="linenumber">83</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">79</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg946" approved="yes">
+      <trans-unit id="_msg1022">
         <source xml:space="preserve">Alt+P</source>
-        <target xml:space="preserve">Alt+P</target>
-        <context-group purpose="location"><context context-type="linenumber">95</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">91</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg947" approved="yes">
+      <trans-unit id="_msg1023">
         <source xml:space="preserve">Remove this entry</source>
-        <target xml:space="preserve">Remove this entry</target>
-        <context-group purpose="location"><context context-type="linenumber">102</context></context-group>
-        <context-group purpose="location"><context context-type="linenumber">660</context></context-group>
-        <context-group purpose="location"><context context-type="linenumber">1189</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">98</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg948" approved="yes">
+      <trans-unit id="_msg1024">
         <source xml:space="preserve">&amp;Label:</source>
-        <target xml:space="preserve">&amp;Label:</target>
-        <context-group purpose="location"><context context-type="linenumber">120</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">116</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg949" approved="yes">
+      <trans-unit id="_msg1025">
         <source xml:space="preserve">Enter a label for this address to add it to the list of used addresses</source>
-        <target xml:space="preserve">Enter a label for this address to add it to the list of used addresses</target>
-        <context-group purpose="location"><context context-type="linenumber">133</context></context-group>
-        <context-group purpose="location"><context context-type="linenumber">136</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">129</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">132</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg950" approved="yes">
+      <trans-unit id="_msg1026">
         <source xml:space="preserve">A&amp;mount:</source>
-        <target xml:space="preserve">A&amp;mount:</target>
-        <context-group purpose="location"><context context-type="linenumber">143</context></context-group>
-        <context-group purpose="location"><context context-type="linenumber">689</context></context-group>
-        <context-group purpose="location"><context context-type="linenumber">1218</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">139</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg951" approved="yes">
+      <trans-unit id="_msg1027">
         <source xml:space="preserve">The amount to send in the selected unit</source>
-        <target xml:space="preserve">The amount to send in the selected unit</target>
-        <context-group purpose="location"><context context-type="linenumber">158</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">154</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg952" approved="yes">
+      <trans-unit id="_msg1028">
         <source xml:space="preserve">The fee will be deducted from the amount being sent. The recipient will receive a lower amount of Dash than you enter in the amount field. If multiple recipients are selected, the fee is split equally.</source>
-        <target xml:space="preserve">The fee will be deducted from the amount being sent. The recipient will receive a lower amount of Dash than you enter in the amount field. If multiple recipients are selected, the fee is split equally.</target>
-        <context-group purpose="location"><context context-type="linenumber">165</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">161</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg953" approved="yes">
+      <trans-unit id="_msg1029">
         <source xml:space="preserve">S&amp;ubtract fee from amount</source>
-        <target xml:space="preserve">S&amp;ubtract fee from amount</target>
-        <context-group purpose="location"><context context-type="linenumber">168</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">164</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg954" approved="yes">
+      <trans-unit id="_msg1030">
         <source xml:space="preserve">Use available balance</source>
-        <target xml:space="preserve">Use available balance</target>
-        <context-group purpose="location"><context context-type="linenumber">175</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">171</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg955" approved="yes">
+      <trans-unit id="_msg1031">
         <source xml:space="preserve">Message:</source>
-        <target xml:space="preserve">Message:</target>
-        <context-group purpose="location"><context context-type="linenumber">184</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">180</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg956" approved="yes">
+      <trans-unit id="_msg1032">
         <source xml:space="preserve">A message that was attached to the dash: URI which will be stored with the transaction for your reference. Note: This message will not be sent over the Dash network.</source>
-        <target xml:space="preserve">A message that was attached to the dash: URI which will be stored with the transaction for your reference. Note: This message will not be sent over the Dash network.</target>
-        <context-group purpose="location"><context context-type="linenumber">194</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg957" approved="yes">
-        <source xml:space="preserve">This is an unauthenticated payment request.</source>
-        <target xml:space="preserve">This is an unauthenticated payment request.</target>
-        <context-group purpose="location"><context context-type="linenumber">627</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg958" approved="yes">
-        <source xml:space="preserve">This is an authenticated payment request.</source>
-        <target xml:space="preserve">This is an authenticated payment request.</target>
-        <context-group purpose="location"><context context-type="linenumber">1152</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">190</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg959" approved="yes">
-        <source xml:space="preserve">Pay To:</source>
-        <target xml:space="preserve">Pay To:</target>
-        <context-group purpose="location"><context context-type="linenumber">642</context></context-group>
-        <context-group purpose="location"><context context-type="linenumber">1167</context></context-group>
+    </group>
+  </body></file>
+  <file original="../sendcoinsdialog.h" datatype="c" source-language="en"><body>
+    <group restype="x-trolltech-linguist-context" resname="SendConfirmationDialog">
+      <trans-unit id="_msg1033">
+        <source xml:space="preserve">Send</source>
+        <context-group purpose="location"><context context-type="linenumber">133</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg960" approved="yes">
-        <source xml:space="preserve">Memo:</source>
-        <target xml:space="preserve">Memo:</target>
-        <context-group purpose="location"><context context-type="linenumber">672</context></context-group>
-        <context-group purpose="location"><context context-type="linenumber">1201</context></context-group>
+      <trans-unit id="_msg1034">
+        <source xml:space="preserve">Create Unsigned</source>
+        <context-group purpose="location"><context context-type="linenumber">135</context></context-group>
       </trans-unit>
     </group>
   </body></file>
-  <file original="../forms/signverifymessagedialog.ui" datatype="x-trolltech-designer-ui" source-language="en" target-language="en"><body>
+  <file original="../forms/signverifymessagedialog.ui" datatype="x-trolltech-designer-ui" source-language="en"><body>
     <group restype="x-trolltech-linguist-context" resname="SignVerifyMessageDialog">
-      <trans-unit id="_msg961" approved="yes">
+      <trans-unit id="_msg1035">
         <source xml:space="preserve">Signatures - Sign / Verify a Message</source>
-        <target xml:space="preserve">Signatures - Sign / Verify a Message</target>
         <context-group purpose="location"><context context-type="linenumber">14</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg962" approved="yes">
+      <trans-unit id="_msg1036">
         <source xml:space="preserve">&amp;Sign Message</source>
-        <target xml:space="preserve">&amp;Sign Message</target>
         <context-group purpose="location"><context context-type="linenumber">31</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg963" approved="yes">
+      <trans-unit id="_msg1037">
         <source xml:space="preserve">You can sign messages/agreements with your addresses to prove you can receive Dash sent to them. Be careful not to sign anything vague or random, as phishing attacks may try to trick you into signing your identity over to them. Only sign fully-detailed statements you agree to.</source>
-        <target xml:space="preserve">You can sign messages/agreements with your addresses to prove you can receive Dash sent to them. Be careful not to sign anything vague or random, as phishing attacks may try to trick you into signing your identity over to them. Only sign fully-detailed statements you agree to.</target>
         <context-group purpose="location"><context context-type="linenumber">66</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg964" approved="yes">
+      <trans-unit id="_msg1038">
         <source xml:space="preserve">The Dash address to sign the message with</source>
-        <target xml:space="preserve">The Dash address to sign the message with</target>
         <context-group purpose="location"><context context-type="linenumber">84</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg965" approved="yes">
+      <trans-unit id="_msg1039">
         <source xml:space="preserve">Choose previously used address</source>
-        <target xml:space="preserve">Choose previously used address</target>
         <context-group purpose="location"><context context-type="linenumber">91</context></context-group>
         <context-group purpose="location"><context context-type="linenumber">264</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg966" approved="yes">
+      <trans-unit id="_msg1040">
         <source xml:space="preserve">Alt+A</source>
-        <target xml:space="preserve">Alt+A</target>
         <context-group purpose="location"><context context-type="linenumber">97</context></context-group>
         <context-group purpose="location"><context context-type="linenumber">270</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg967" approved="yes">
+      <trans-unit id="_msg1041">
         <source xml:space="preserve">Paste address from clipboard</source>
-        <target xml:space="preserve">Paste address from clipboard</target>
         <context-group purpose="location"><context context-type="linenumber">104</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg968" approved="yes">
+      <trans-unit id="_msg1042">
         <source xml:space="preserve">Alt+P</source>
-        <target xml:space="preserve">Alt+P</target>
         <context-group purpose="location"><context context-type="linenumber">110</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg969" approved="yes">
+      <trans-unit id="_msg1043">
         <source xml:space="preserve">Enter the message you want to sign here</source>
-        <target xml:space="preserve">Enter the message you want to sign here</target>
         <context-group purpose="location"><context context-type="linenumber">119</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg970" approved="yes">
+      <trans-unit id="_msg1044">
         <source xml:space="preserve">Signature</source>
-        <target xml:space="preserve">Signature</target>
         <context-group purpose="location"><context context-type="linenumber">129</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg971" approved="yes">
+      <trans-unit id="_msg1045">
         <source xml:space="preserve">Copy the current signature to the system clipboard</source>
-        <target xml:space="preserve">Copy the current signature to the system clipboard</target>
         <context-group purpose="location"><context context-type="linenumber">154</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg972" approved="yes">
+      <trans-unit id="_msg1046">
         <source xml:space="preserve">Sign the message to prove you own this Dash address</source>
-        <target xml:space="preserve">Sign the message to prove you own this Dash address</target>
         <context-group purpose="location"><context context-type="linenumber">168</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg973" approved="yes">
+      <trans-unit id="_msg1047">
         <source xml:space="preserve">Sign &amp;Message</source>
-        <target xml:space="preserve">Sign &amp;Message</target>
         <context-group purpose="location"><context context-type="linenumber">171</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg974" approved="yes">
+      <trans-unit id="_msg1048">
         <source xml:space="preserve">Reset all sign message fields</source>
-        <target xml:space="preserve">Reset all sign message fields</target>
         <context-group purpose="location"><context context-type="linenumber">181</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg975" approved="yes">
+      <trans-unit id="_msg1049">
         <source xml:space="preserve">Clear &amp;All</source>
-        <target xml:space="preserve">Clear &amp;All</target>
         <context-group purpose="location"><context context-type="linenumber">184</context></context-group>
         <context-group purpose="location"><context context-type="linenumber">317</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg976" approved="yes">
+      <trans-unit id="_msg1050">
         <source xml:space="preserve">&amp;Verify Message</source>
-        <target xml:space="preserve">&amp;Verify Message</target>
         <context-group purpose="location"><context context-type="linenumber">41</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg977" approved="yes">
+      <trans-unit id="_msg1051">
         <source xml:space="preserve">Enter the receiver&apos;s address, message (ensure you copy line breaks, spaces, tabs, etc. exactly) and signature below to verify the message. Be careful not to read more into the signature than what is in the signed message itself, to avoid being tricked by a man-in-the-middle attack. Note that this only proves the signing party receives with the address, it cannot prove sendership of any transaction!</source>
-        <target xml:space="preserve">Enter the receiver&apos;s address, message (ensure you copy line breaks, spaces, tabs, etc. exactly) and signature below to verify the message. Be careful not to read more into the signature than what is in the signed message itself, to avoid being tricked by a man-in-the-middle attack. Note that this only proves the signing party receives with the address, it cannot prove sendership of any transaction!</target>
         <context-group purpose="location"><context context-type="linenumber">236</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg978" approved="yes">
+      <trans-unit id="_msg1052">
         <source xml:space="preserve">The Dash address the message was signed with</source>
-        <target xml:space="preserve">The Dash address the message was signed with</target>
         <context-group purpose="location"><context context-type="linenumber">257</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg979" approved="yes">
+      <trans-unit id="_msg1053">
         <source xml:space="preserve">The signed message to verify</source>
-        <target xml:space="preserve">The signed message to verify</target>
         <context-group purpose="location"><context context-type="linenumber">279</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg980" approved="yes">
+      <trans-unit id="_msg1054">
         <source xml:space="preserve">The signature given when the message was signed</source>
-        <target xml:space="preserve">The signature given when the message was signed</target>
         <context-group purpose="location"><context context-type="linenumber">289</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg981" approved="yes">
+      <trans-unit id="_msg1055">
         <source xml:space="preserve">Verify the message to ensure it was signed with the specified Dash address</source>
-        <target xml:space="preserve">Verify the message to ensure it was signed with the specified Dash address</target>
         <context-group purpose="location"><context context-type="linenumber">301</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg982" approved="yes">
+      <trans-unit id="_msg1056">
         <source xml:space="preserve">Verify &amp;Message</source>
-        <target xml:space="preserve">Verify &amp;Message</target>
         <context-group purpose="location"><context context-type="linenumber">304</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg983" approved="yes">
+      <trans-unit id="_msg1057">
         <source xml:space="preserve">Reset all verify message fields</source>
-        <target xml:space="preserve">Reset all verify message fields</target>
         <context-group purpose="location"><context context-type="linenumber">314</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg984" approved="yes">
+      <trans-unit id="_msg1058">
         <source xml:space="preserve">Enter a message to be signed</source>
-        <target xml:space="preserve">Enter a message to be signed</target>
         <context-group purpose="location"><context context-type="linenumber">122</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg985" approved="yes">
+      <trans-unit id="_msg1059">
         <source xml:space="preserve">Click &quot;Sign Message&quot; to generate signature</source>
-        <target xml:space="preserve">Click &quot;Sign Message&quot; to generate signature</target>
         <context-group purpose="location"><context context-type="linenumber">144</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg986" approved="yes">
+      <trans-unit id="_msg1060">
         <source xml:space="preserve">Enter a message to be verified</source>
-        <target xml:space="preserve">Enter a message to be verified</target>
         <context-group purpose="location"><context context-type="linenumber">282</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg987" approved="yes">
+      <trans-unit id="_msg1061">
         <source xml:space="preserve">Enter a signature for the message to be verified</source>
-        <target xml:space="preserve">Enter a signature for the message to be verified</target>
         <context-group purpose="location"><context context-type="linenumber">292</context></context-group>
       </trans-unit>
     </group>
   </body></file>
-  <file original="../signverifymessagedialog.cpp" datatype="cpp" source-language="en" target-language="en"><body>
+  <file original="../signverifymessagedialog.cpp" datatype="cpp" source-language="en"><body>
     <group restype="x-trolltech-linguist-context" resname="SignVerifyMessageDialog">
-      <trans-unit id="_msg988" approved="yes">
+      <trans-unit id="_msg1062">
         <source xml:space="preserve">The entered address is invalid.</source>
-        <target xml:space="preserve">The entered address is invalid.</target>
         <context-group purpose="location"><context context-type="linenumber">151</context></context-group>
         <context-group purpose="location"><context context-type="linenumber">250</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg989" approved="yes">
+      <trans-unit id="_msg1063">
         <source xml:space="preserve">Please check the address and try again.</source>
-        <target xml:space="preserve">Please check the address and try again.</target>
         <context-group purpose="location"><context context-type="linenumber">151</context></context-group>
         <context-group purpose="location"><context context-type="linenumber">158</context></context-group>
         <context-group purpose="location"><context context-type="linenumber">251</context></context-group>
         <context-group purpose="location"><context context-type="linenumber">258</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg990" approved="yes">
+      <trans-unit id="_msg1064">
         <source xml:space="preserve">The entered address does not refer to a key.</source>
-        <target xml:space="preserve">The entered address does not refer to a key.</target>
         <context-group purpose="location"><context context-type="linenumber">158</context></context-group>
         <context-group purpose="location"><context context-type="linenumber">257</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg991" approved="yes">
+      <trans-unit id="_msg1065">
         <source xml:space="preserve">Wallet unlock was cancelled.</source>
-        <target xml:space="preserve">Wallet unlock was cancelled.</target>
         <context-group purpose="location"><context context-type="linenumber">166</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg992" approved="yes">
+      <trans-unit id="_msg1066">
         <source xml:space="preserve">No error</source>
-        <target xml:space="preserve">No error</target>
         <context-group purpose="location"><context context-type="linenumber">177</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg993" approved="yes">
+      <trans-unit id="_msg1067">
         <source xml:space="preserve">Private key for the entered address is not available.</source>
-        <target xml:space="preserve">Private key for the entered address is not available.</target>
         <context-group purpose="location"><context context-type="linenumber">180</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg994" approved="yes">
+      <trans-unit id="_msg1068">
         <source xml:space="preserve">Message signing failed.</source>
-        <target xml:space="preserve">Message signing failed.</target>
         <context-group purpose="location"><context context-type="linenumber">183</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg995" approved="yes">
+      <trans-unit id="_msg1069">
         <source xml:space="preserve">Message signed.</source>
-        <target xml:space="preserve">Message signed.</target>
         <context-group purpose="location"><context context-type="linenumber">195</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg996" approved="yes">
+      <trans-unit id="_msg1070">
         <source xml:space="preserve">The signature could not be decoded.</source>
-        <target xml:space="preserve">The signature could not be decoded.</target>
         <context-group purpose="location"><context context-type="linenumber">264</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg997" approved="yes">
+      <trans-unit id="_msg1071">
         <source xml:space="preserve">Please check the signature and try again.</source>
-        <target xml:space="preserve">Please check the signature and try again.</target>
         <context-group purpose="location"><context context-type="linenumber">265</context></context-group>
         <context-group purpose="location"><context context-type="linenumber">272</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg998" approved="yes">
+      <trans-unit id="_msg1072">
         <source xml:space="preserve">The signature did not match the message digest.</source>
-        <target xml:space="preserve">The signature did not match the message digest.</target>
         <context-group purpose="location"><context context-type="linenumber">271</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg999" approved="yes">
+      <trans-unit id="_msg1073">
         <source xml:space="preserve">Message verification failed.</source>
-        <target xml:space="preserve">Message verification failed.</target>
         <context-group purpose="location"><context context-type="linenumber">277</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg1000" approved="yes">
+      <trans-unit id="_msg1074">
         <source xml:space="preserve">Message verified.</source>
-        <target xml:space="preserve">Message verified.</target>
         <context-group purpose="location"><context context-type="linenumber">245</context></context-group>
       </trans-unit>
     </group>
   </body></file>
-  <file original="../splashscreen.cpp" datatype="cpp" source-language="en" target-language="en"><body>
+  <file original="../splashscreen.cpp" datatype="cpp" source-language="en"><body>
     <group restype="x-trolltech-linguist-context" resname="SplashScreen">
-      <trans-unit id="_msg1001" approved="yes">
+      <trans-unit id="_msg1075">
         <source xml:space="preserve">(press q to shutdown and continue later)</source>
-        <target xml:space="preserve">(press q to shutdown and continue later)</target>
-        <context-group purpose="location"><context context-type="linenumber">192</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">181</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg1002" approved="yes">
+      <trans-unit id="_msg1076">
         <source xml:space="preserve">press q to shutdown</source>
-        <target xml:space="preserve">press q to shutdown</target>
-        <context-group purpose="location"><context context-type="linenumber">193</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">182</context></context-group>
       </trans-unit>
     </group>
   </body></file>
-  <file original="../trafficgraphwidget.cpp" datatype="cpp" source-language="en" target-language="en"><body>
+  <file original="../trafficgraphwidget.cpp" datatype="cpp" source-language="en"><body>
     <group restype="x-trolltech-linguist-context" resname="TrafficGraphWidget">
-      <trans-unit id="_msg1003" approved="yes">
+      <trans-unit id="_msg1077">
         <source xml:space="preserve">kB/s</source>
-        <target xml:space="preserve">kB/s</target>
         <context-group purpose="location"><context context-type="linenumber">101</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg1004" approved="yes">
+      <trans-unit id="_msg1078">
         <source xml:space="preserve">Total</source>
-        <target xml:space="preserve">Total</target>
         <context-group purpose="location"><context context-type="linenumber">166</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg1005" approved="yes">
+      <trans-unit id="_msg1079">
         <source xml:space="preserve">Received</source>
-        <target xml:space="preserve">Received</target>
         <context-group purpose="location"><context context-type="linenumber">167</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg1006" approved="yes">
+      <trans-unit id="_msg1080">
         <source xml:space="preserve">Sent</source>
-        <target xml:space="preserve">Sent</target>
         <context-group purpose="location"><context context-type="linenumber">168</context></context-group>
       </trans-unit>
     </group>
   </body></file>
-  <file original="../transactiondesc.cpp" datatype="cpp" source-language="en" target-language="en"><body>
+  <file original="../transactiondesc.cpp" datatype="cpp" source-language="en"><body>
     <group restype="x-trolltech-linguist-context" resname="TransactionDesc">
-      <group restype="x-gettext-plurals">
-        <context-group purpose="location"><context context-type="linenumber">36</context></context-group>
-        <trans-unit id="_msg1007[0]" approved="yes">
-          <source xml:space="preserve">Open for %n more block(s)</source>
-          <target xml:space="preserve">Open for %n more block</target>
-        </trans-unit>
-        <trans-unit id="_msg1007[1]" approved="yes">
-          <source xml:space="preserve">Open for %n more block(s)</source>
-          <target xml:space="preserve">Open for %n more blocks</target>
-        </trans-unit>
-      </group>
-      <trans-unit id="_msg1008" approved="yes">
-        <source xml:space="preserve">Open until %1</source>
-        <target xml:space="preserve">Open until %1</target>
-        <context-group purpose="location"><context context-type="linenumber">38</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg1009" approved="yes">
-        <source xml:space="preserve">conflicted</source>
-        <target xml:space="preserve">conflicted</target>
-        <context-group purpose="location"><context context-type="linenumber">43</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg1010" approved="yes">
+      <trans-unit id="_msg1081">
         <source xml:space="preserve">0/unconfirmed, %1</source>
-        <target xml:space="preserve">0/unconfirmed, %1</target>
-        <context-group purpose="location"><context context-type="linenumber">50</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">57</context></context-group>
+        <note annotates="source" from="developer">Text explaining the current status of a transaction, shown in the status field of the details window for this transaction. This status represents an unconfirmed transaction that is in the memory pool.</note>
       </trans-unit>
-      <trans-unit id="_msg1011" approved="yes">
+      <trans-unit id="_msg1082">
         <source xml:space="preserve">in memory pool</source>
-        <target xml:space="preserve">in memory pool</target>
-        <context-group purpose="location"><context context-type="linenumber">50</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">57</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg1012" approved="yes">
+      <trans-unit id="_msg1083">
         <source xml:space="preserve">not in memory pool</source>
-        <target xml:space="preserve">not in memory pool</target>
-        <context-group purpose="location"><context context-type="linenumber">50</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">57</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg1013" approved="yes">
+      <trans-unit id="_msg1084">
         <source xml:space="preserve">abandoned</source>
-        <target xml:space="preserve">abandoned</target>
-        <context-group purpose="location"><context context-type="linenumber">49</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">53</context></context-group>
+        <note annotates="source" from="developer">Text explaining the current status of a transaction, shown in the status field of the details window for this transaction. This status represents an abandoned transaction.</note>
+      </trans-unit>
+      <trans-unit id="_msg1085">
+        <source xml:space="preserve">conflicted with a transaction with %1 confirmations</source>
+        <context-group purpose="location"><context context-type="linenumber">43</context></context-group>
+        <note annotates="source" from="developer">Text explaining the current status of a transaction, shown in the status field of the details window for this transaction. This status represents an unconfirmed transaction that conflicts with a confirmed transaction.</note>
       </trans-unit>
-      <trans-unit id="_msg1014" approved="yes">
+      <trans-unit id="_msg1086">
         <source xml:space="preserve">%1/unconfirmed</source>
-        <target xml:space="preserve">%1/unconfirmed</target>
-        <context-group purpose="location"><context context-type="linenumber">52</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">63</context></context-group>
+        <note annotates="source" from="developer">Text explaining the current status of a transaction, shown in the status field of the details window for this transaction. This status represents a transaction confirmed in at least one block, but less than 6 blocks, and still not locked via ChainLocks.</note>
       </trans-unit>
-      <trans-unit id="_msg1015" approved="yes">
+      <trans-unit id="_msg1087">
         <source xml:space="preserve">%1 confirmations</source>
-        <target xml:space="preserve">%1 confirmations</target>
-        <context-group purpose="location"><context context-type="linenumber">54</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">69</context></context-group>
+        <note annotates="source" from="developer">Text explaining the current status of a transaction, shown in the status field of the details window for this transaction. This status represents a transaction confirmed in 6 or more blocks or locked via ChainLocks.</note>
       </trans-unit>
-      <trans-unit id="_msg1016" approved="yes">
+      <trans-unit id="_msg1088">
         <source xml:space="preserve">locked via ChainLocks</source>
-        <target xml:space="preserve">locked via ChainLocks</target>
-        <context-group purpose="location"><context context-type="linenumber">56</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">74</context></context-group>
+        <note annotates="source" from="developer">Text explaining the current status of a transaction, shown in the status field of the details window for this transaction. This status represents a transaction confirmed in at least one block and has been locked by ChainLocks.</note>
       </trans-unit>
-      <trans-unit id="_msg1017" approved="yes">
+      <trans-unit id="_msg1089">
         <source xml:space="preserve">verified via InstantSend</source>
-        <target xml:space="preserve">verified via InstantSend</target>
-        <context-group purpose="location"><context context-type="linenumber">62</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">83</context></context-group>
+        <note annotates="source" from="developer">Text explaining the current status of a transaction, shown in the status field of the details window for this transaction. This status represents an unconfirmed transaction that has been locked by InstantSend.</note>
       </trans-unit>
-      <trans-unit id="_msg1018" approved="yes">
+      <trans-unit id="_msg1090">
         <source xml:space="preserve">Status</source>
-        <target xml:space="preserve">Status</target>
-        <context-group purpose="location"><context context-type="linenumber">87</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">107</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg1019" approved="yes">
+      <trans-unit id="_msg1091">
         <source xml:space="preserve">Date</source>
-        <target xml:space="preserve">Date</target>
-        <context-group purpose="location"><context context-type="linenumber">90</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">110</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg1020" approved="yes">
+      <trans-unit id="_msg1092">
         <source xml:space="preserve">Source</source>
-        <target xml:space="preserve">Source</target>
-        <context-group purpose="location"><context context-type="linenumber">97</context></context-group>
-        <context-group purpose="location"><context context-type="linenumber">101</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">117</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">121</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg1021" approved="yes">
+      <trans-unit id="_msg1093">
         <source xml:space="preserve">Generated</source>
-        <target xml:space="preserve">Generated</target>
-        <context-group purpose="location"><context context-type="linenumber">97</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">117</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg1022" approved="yes">
+      <trans-unit id="_msg1094">
         <source xml:space="preserve">Platform Transfer</source>
-        <target xml:space="preserve">Platform Transfer</target>
-        <context-group purpose="location"><context context-type="linenumber">101</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">121</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg1023" approved="yes">
+      <trans-unit id="_msg1095">
         <source xml:space="preserve">From</source>
-        <target xml:space="preserve">From</target>
-        <context-group purpose="location"><context context-type="linenumber">106</context></context-group>
-        <context-group purpose="location"><context context-type="linenumber">120</context></context-group>
-        <context-group purpose="location"><context context-type="linenumber">192</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">126</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">140</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">212</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg1024" approved="yes">
+      <trans-unit id="_msg1096">
         <source xml:space="preserve">unknown</source>
-        <target xml:space="preserve">unknown</target>
-        <context-group purpose="location"><context context-type="linenumber">120</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">140</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg1025" approved="yes">
+      <trans-unit id="_msg1097">
         <source xml:space="preserve">To</source>
-        <target xml:space="preserve">To</target>
-        <context-group purpose="location"><context context-type="linenumber">121</context></context-group>
         <context-group purpose="location"><context context-type="linenumber">141</context></context-group>
-        <context-group purpose="location"><context context-type="linenumber">211</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">161</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">231</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg1026" approved="yes">
+      <trans-unit id="_msg1098">
         <source xml:space="preserve">own address</source>
-        <target xml:space="preserve">own address</target>
-        <context-group purpose="location"><context context-type="linenumber">123</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">143</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg1027" approved="yes">
+      <trans-unit id="_msg1099">
         <source xml:space="preserve">watch-only</source>
-        <target xml:space="preserve">watch-only</target>
-        <context-group purpose="location"><context context-type="linenumber">123</context></context-group>
-        <context-group purpose="location"><context context-type="linenumber">192</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">143</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">212</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg1028" approved="yes">
+      <trans-unit id="_msg1100">
         <source xml:space="preserve">label</source>
-        <target xml:space="preserve">label</target>
-        <context-group purpose="location"><context context-type="linenumber">125</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">145</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg1029" approved="yes">
+      <trans-unit id="_msg1101">
         <source xml:space="preserve">Credit</source>
-        <target xml:space="preserve">Credit</target>
-        <context-group purpose="location"><context context-type="linenumber">161</context></context-group>
-        <context-group purpose="location"><context context-type="linenumber">173</context></context-group>
-        <context-group purpose="location"><context context-type="linenumber">227</context></context-group>
-        <context-group purpose="location"><context context-type="linenumber">257</context></context-group>
-        <context-group purpose="location"><context context-type="linenumber">300</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">181</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">193</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">247</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">277</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">320</context></context-group>
       </trans-unit>
       <group restype="x-gettext-plurals">
-        <context-group purpose="location"><context context-type="linenumber">163</context></context-group>
-        <trans-unit id="_msg1030[0]" approved="yes">
+        <context-group purpose="location"><context context-type="linenumber">183</context></context-group>
+        <trans-unit id="_msg1102[0]">
           <source xml:space="preserve">matures in %n more block(s)</source>
-          <target xml:space="preserve">matures in %n more block</target>
         </trans-unit>
-        <trans-unit id="_msg1030[1]" approved="yes">
+        <trans-unit id="_msg1102[1]">
           <source xml:space="preserve">matures in %n more block(s)</source>
-          <target xml:space="preserve">matures in %n more blocks</target>
         </trans-unit>
       </group>
-      <trans-unit id="_msg1031" approved="yes">
+      <trans-unit id="_msg1103">
         <source xml:space="preserve">not accepted</source>
-        <target xml:space="preserve">not accepted</target>
-        <context-group purpose="location"><context context-type="linenumber">165</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">185</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg1032" approved="yes">
+      <trans-unit id="_msg1104">
         <source xml:space="preserve">Debit</source>
-        <target xml:space="preserve">Debit</target>
-        <context-group purpose="location"><context context-type="linenumber">225</context></context-group>
-        <context-group purpose="location"><context context-type="linenumber">251</context></context-group>
-        <context-group purpose="location"><context context-type="linenumber">297</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">245</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">271</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">317</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg1033" approved="yes">
+      <trans-unit id="_msg1105">
         <source xml:space="preserve">Total debit</source>
-        <target xml:space="preserve">Total debit</target>
-        <context-group purpose="location"><context context-type="linenumber">235</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">255</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg1034" approved="yes">
+      <trans-unit id="_msg1106">
         <source xml:space="preserve">Total credit</source>
-        <target xml:space="preserve">Total credit</target>
-        <context-group purpose="location"><context context-type="linenumber">236</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">256</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg1035" approved="yes">
+      <trans-unit id="_msg1107">
         <source xml:space="preserve">Transaction fee</source>
-        <target xml:space="preserve">Transaction fee</target>
-        <context-group purpose="location"><context context-type="linenumber">241</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">261</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg1036" approved="yes">
+      <trans-unit id="_msg1108">
         <source xml:space="preserve">Net amount</source>
-        <target xml:space="preserve">Net amount</target>
-        <context-group purpose="location"><context context-type="linenumber">263</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">283</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg1037" approved="yes">
+      <trans-unit id="_msg1109">
         <source xml:space="preserve">Message</source>
-        <target xml:space="preserve">Message</target>
-        <context-group purpose="location"><context context-type="linenumber">269</context></context-group>
-        <context-group purpose="location"><context context-type="linenumber">280</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">289</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">300</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg1038" approved="yes">
+      <trans-unit id="_msg1110">
         <source xml:space="preserve">Comment</source>
-        <target xml:space="preserve">Comment</target>
-        <context-group purpose="location"><context context-type="linenumber">271</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">291</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg1039" approved="yes">
+      <trans-unit id="_msg1111">
         <source xml:space="preserve">Transaction ID</source>
-        <target xml:space="preserve">Transaction ID</target>
-        <context-group purpose="location"><context context-type="linenumber">273</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">293</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg1040" approved="yes">
+      <trans-unit id="_msg1112">
         <source xml:space="preserve">Output index</source>
-        <target xml:space="preserve">Output index</target>
-        <context-group purpose="location"><context context-type="linenumber">274</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">294</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg1041" approved="yes">
+      <trans-unit id="_msg1113">
         <source xml:space="preserve">Transaction total size</source>
-        <target xml:space="preserve">Transaction total size</target>
-        <context-group purpose="location"><context context-type="linenumber">275</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">295</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg1042" approved="yes">
+      <trans-unit id="_msg1114">
         <source xml:space="preserve">Generated coins must mature %1 blocks before they can be spent. When you generated this block, it was broadcast to the network to be added to the block chain. If it fails to get into the chain, its state will change to &quot;not accepted&quot; and it won&apos;t be spendable. This may occasionally happen if another node generates a block within a few seconds of yours.</source>
-        <target xml:space="preserve">Generated coins must mature %1 blocks before they can be spent. When you generated this block, it was broadcast to the network to be added to the block chain. If it fails to get into the chain, its state will change to &quot;not accepted&quot; and it won&apos;t be spendable. This may occasionally happen if another node generates a block within a few seconds of yours.</target>
-        <context-group purpose="location"><context context-type="linenumber">286</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">306</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg1043" approved="yes">
+      <trans-unit id="_msg1115">
         <source xml:space="preserve">Debug information</source>
-        <target xml:space="preserve">Debug information</target>
-        <context-group purpose="location"><context context-type="linenumber">294</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">314</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg1044" approved="yes">
+      <trans-unit id="_msg1116">
         <source xml:space="preserve">Transaction</source>
-        <target xml:space="preserve">Transaction</target>
-        <context-group purpose="location"><context context-type="linenumber">302</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">322</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg1045" approved="yes">
+      <trans-unit id="_msg1117">
         <source xml:space="preserve">Inputs</source>
-        <target xml:space="preserve">Inputs</target>
-        <context-group purpose="location"><context context-type="linenumber">305</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">325</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg1046" approved="yes">
+      <trans-unit id="_msg1118">
         <source xml:space="preserve">Amount</source>
-        <target xml:space="preserve">Amount</target>
-        <context-group purpose="location"><context context-type="linenumber">326</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">346</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg1047" approved="yes">
+      <trans-unit id="_msg1119">
         <source xml:space="preserve">true</source>
-        <target xml:space="preserve">true</target>
-        <context-group purpose="location"><context context-type="linenumber">327</context></context-group>
-        <context-group purpose="location"><context context-type="linenumber">328</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">347</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">348</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg1048" approved="yes">
+      <trans-unit id="_msg1120">
         <source xml:space="preserve">false</source>
-        <target xml:space="preserve">false</target>
-        <context-group purpose="location"><context context-type="linenumber">327</context></context-group>
-        <context-group purpose="location"><context context-type="linenumber">328</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">347</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">348</context></context-group>
       </trans-unit>
     </group>
   </body></file>
-  <file original="../forms/transactiondescdialog.ui" datatype="x-trolltech-designer-ui" source-language="en" target-language="en"><body>
+  <file original="../forms/transactiondescdialog.ui" datatype="x-trolltech-designer-ui" source-language="en"><body>
     <group restype="x-trolltech-linguist-context" resname="TransactionDescDialog">
-      <trans-unit id="_msg1049" approved="yes">
+      <trans-unit id="_msg1121">
         <source xml:space="preserve">This pane shows a detailed description of the transaction</source>
-        <target xml:space="preserve">This pane shows a detailed description of the transaction</target>
         <context-group purpose="location"><context context-type="linenumber">20</context></context-group>
       </trans-unit>
     </group>
   </body></file>
-  <file original="../transactiondescdialog.cpp" datatype="cpp" source-language="en" target-language="en"><body>
+  <file original="../transactiondescdialog.cpp" datatype="cpp" source-language="en"><body>
     <group restype="x-trolltech-linguist-context" resname="TransactionDescDialog">
-      <trans-unit id="_msg1050" approved="yes">
+      <trans-unit id="_msg1122">
         <source xml:space="preserve">Details for %1</source>
-        <target xml:space="preserve">Details for %1</target>
-        <context-group purpose="location"><context context-type="linenumber">21</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">20</context></context-group>
       </trans-unit>
     </group>
   </body></file>
-  <file original="../transactiontablemodel.cpp" datatype="cpp" source-language="en" target-language="en"><body>
+  <file original="../transactiontablemodel.cpp" datatype="cpp" source-language="en"><body>
     <group restype="x-trolltech-linguist-context" resname="TransactionTableModel">
-      <trans-unit id="_msg1051" approved="yes">
+      <trans-unit id="_msg1123">
         <source xml:space="preserve">Date</source>
-        <target xml:space="preserve">Date</target>
-        <context-group purpose="location"><context context-type="linenumber">276</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">277</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg1052" approved="yes">
+      <trans-unit id="_msg1124">
         <source xml:space="preserve">Type</source>
-        <target xml:space="preserve">Type</target>
-        <context-group purpose="location"><context context-type="linenumber">276</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">277</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg1053" approved="yes">
+      <trans-unit id="_msg1125">
         <source xml:space="preserve">Address / Label</source>
-        <target xml:space="preserve">Address / Label</target>
-        <context-group purpose="location"><context context-type="linenumber">276</context></context-group>
-      </trans-unit>
-      <group restype="x-gettext-plurals">
-        <context-group purpose="location"><context context-type="linenumber">354</context></context-group>
-        <trans-unit id="_msg1054[0]" approved="yes">
-          <source xml:space="preserve">Open for %n more block(s)</source>
-          <target xml:space="preserve">Open for %n more block</target>
-        </trans-unit>
-        <trans-unit id="_msg1054[1]" approved="yes">
-          <source xml:space="preserve">Open for %n more block(s)</source>
-          <target xml:space="preserve">Open for %n more blocks</target>
-        </trans-unit>
-      </group>
-      <trans-unit id="_msg1055" approved="yes">
-        <source xml:space="preserve">Open until %1</source>
-        <target xml:space="preserve">Open until %1</target>
-        <context-group purpose="location"><context context-type="linenumber">357</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">277</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg1056" approved="yes">
+      <trans-unit id="_msg1126">
         <source xml:space="preserve">Unconfirmed</source>
-        <target xml:space="preserve">Unconfirmed</target>
-        <context-group purpose="location"><context context-type="linenumber">360</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">355</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg1057" approved="yes">
+      <trans-unit id="_msg1127">
         <source xml:space="preserve">Abandoned</source>
-        <target xml:space="preserve">Abandoned</target>
-        <context-group purpose="location"><context context-type="linenumber">363</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">358</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg1058" approved="yes">
+      <trans-unit id="_msg1128">
         <source xml:space="preserve">Confirming (%1 of %2 recommended confirmations)</source>
-        <target xml:space="preserve">Confirming (%1 of %2 recommended confirmations)</target>
-        <context-group purpose="location"><context context-type="linenumber">366</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">361</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg1059" approved="yes">
+      <trans-unit id="_msg1129">
         <source xml:space="preserve">Confirmed (%1 confirmations)</source>
-        <target xml:space="preserve">Confirmed (%1 confirmations)</target>
-        <context-group purpose="location"><context context-type="linenumber">369</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">364</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg1060" approved="yes">
+      <trans-unit id="_msg1130">
         <source xml:space="preserve">Conflicted</source>
-        <target xml:space="preserve">Conflicted</target>
-        <context-group purpose="location"><context context-type="linenumber">372</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">367</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg1061" approved="yes">
+      <trans-unit id="_msg1131">
         <source xml:space="preserve">Immature (%1 confirmations, will be available after %2)</source>
-        <target xml:space="preserve">Immature (%1 confirmations, will be available after %2)</target>
-        <context-group purpose="location"><context context-type="linenumber">375</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">370</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg1062" approved="yes">
+      <trans-unit id="_msg1132">
         <source xml:space="preserve">Generated but not accepted</source>
-        <target xml:space="preserve">Generated but not accepted</target>
-        <context-group purpose="location"><context context-type="linenumber">378</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">373</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg1063" approved="yes">
+      <trans-unit id="_msg1133">
         <source xml:space="preserve">verified via InstantSend</source>
-        <target xml:space="preserve">verified via InstantSend</target>
-        <context-group purpose="location"><context context-type="linenumber">383</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">378</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg1064" approved="yes">
+      <trans-unit id="_msg1134">
         <source xml:space="preserve">locked via ChainLocks</source>
-        <target xml:space="preserve">locked via ChainLocks</target>
-        <context-group purpose="location"><context context-type="linenumber">386</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">381</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg1065" approved="yes">
+      <trans-unit id="_msg1135">
         <source xml:space="preserve">Received with</source>
-        <target xml:space="preserve">Received with</target>
-        <context-group purpose="location"><context context-type="linenumber">423</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">418</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg1066" approved="yes">
+      <trans-unit id="_msg1136">
         <source xml:space="preserve">Received from</source>
-        <target xml:space="preserve">Received from</target>
-        <context-group purpose="location"><context context-type="linenumber">425</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">420</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg1067" approved="yes">
+      <trans-unit id="_msg1137">
         <source xml:space="preserve">Received via %1</source>
-        <target xml:space="preserve">Received via %1</target>
-        <context-group purpose="location"><context context-type="linenumber">427</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">422</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg1068" approved="yes">
+      <trans-unit id="_msg1138">
         <source xml:space="preserve">Sent to</source>
-        <target xml:space="preserve">Sent to</target>
-        <context-group purpose="location"><context context-type="linenumber">430</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">425</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg1069" approved="yes">
+      <trans-unit id="_msg1139">
         <source xml:space="preserve">Payment to yourself</source>
-        <target xml:space="preserve">Payment to yourself</target>
-        <context-group purpose="location"><context context-type="linenumber">432</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">427</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg1070" approved="yes">
+      <trans-unit id="_msg1140">
         <source xml:space="preserve">Mined</source>
-        <target xml:space="preserve">Mined</target>
-        <context-group purpose="location"><context context-type="linenumber">434</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">429</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg1071" approved="yes">
+      <trans-unit id="_msg1141">
         <source xml:space="preserve">Platform Transfer</source>
-        <target xml:space="preserve">Platform Transfer</target>
-        <context-group purpose="location"><context context-type="linenumber">436</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">431</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg1072" approved="yes">
+      <trans-unit id="_msg1142">
         <source xml:space="preserve">%1 Mixing</source>
-        <target xml:space="preserve">%1 Mixing</target>
-        <context-group purpose="location"><context context-type="linenumber">439</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">434</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg1073" approved="yes">
+      <trans-unit id="_msg1143">
         <source xml:space="preserve">%1 Collateral Payment</source>
-        <target xml:space="preserve">%1 Collateral Payment</target>
-        <context-group purpose="location"><context context-type="linenumber">441</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">436</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg1074" approved="yes">
+      <trans-unit id="_msg1144">
         <source xml:space="preserve">%1 Make Collateral Inputs</source>
-        <target xml:space="preserve">%1 Make Collateral Inputs</target>
-        <context-group purpose="location"><context context-type="linenumber">443</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">438</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg1075" approved="yes">
+      <trans-unit id="_msg1145">
         <source xml:space="preserve">%1 Create Denominations</source>
-        <target xml:space="preserve">%1 Create Denominations</target>
-        <context-group purpose="location"><context context-type="linenumber">445</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">440</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg1076" approved="yes">
+      <trans-unit id="_msg1146">
         <source xml:space="preserve">%1 Send</source>
-        <target xml:space="preserve">%1 Send</target>
-        <context-group purpose="location"><context context-type="linenumber">447</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">442</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg1077" approved="yes">
+      <trans-unit id="_msg1147">
         <source xml:space="preserve">watch-only</source>
-        <target xml:space="preserve">watch-only</target>
-        <context-group purpose="location"><context context-type="linenumber">468</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">463</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg1078" approved="yes">
+      <trans-unit id="_msg1148">
         <source xml:space="preserve">(n/a)</source>
-        <target xml:space="preserve">(n/a)</target>
-        <context-group purpose="location"><context context-type="linenumber">493</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">488</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg1079" approved="yes">
+      <trans-unit id="_msg1149">
         <source xml:space="preserve">(no label)</source>
-        <target xml:space="preserve">(no label)</target>
-        <context-group purpose="location"><context context-type="linenumber">729</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">721</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg1080" approved="yes">
+      <trans-unit id="_msg1150">
         <source xml:space="preserve">Transaction status. Hover over this field to show number of confirmations.</source>
-        <target xml:space="preserve">Transaction status. Hover over this field to show number of confirmations.</target>
-        <context-group purpose="location"><context context-type="linenumber">768</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">760</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg1081" approved="yes">
+      <trans-unit id="_msg1151">
         <source xml:space="preserve">Date and time that the transaction was received.</source>
-        <target xml:space="preserve">Date and time that the transaction was received.</target>
-        <context-group purpose="location"><context context-type="linenumber">770</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">762</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg1082" approved="yes">
+      <trans-unit id="_msg1152">
         <source xml:space="preserve">Type of transaction.</source>
-        <target xml:space="preserve">Type of transaction.</target>
-        <context-group purpose="location"><context context-type="linenumber">772</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">764</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg1083" approved="yes">
+      <trans-unit id="_msg1153">
         <source xml:space="preserve">Whether or not a watch-only address is involved in this transaction.</source>
-        <target xml:space="preserve">Whether or not a watch-only address is involved in this transaction.</target>
-        <context-group purpose="location"><context context-type="linenumber">774</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">766</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg1084" approved="yes">
+      <trans-unit id="_msg1154">
         <source xml:space="preserve">User-defined intent/purpose of the transaction.</source>
-        <target xml:space="preserve">User-defined intent/purpose of the transaction.</target>
-        <context-group purpose="location"><context context-type="linenumber">776</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">768</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg1085" approved="yes">
+      <trans-unit id="_msg1155">
         <source xml:space="preserve">Amount removed from or added to balance.</source>
-        <target xml:space="preserve">Amount removed from or added to balance.</target>
-        <context-group purpose="location"><context context-type="linenumber">778</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">770</context></context-group>
       </trans-unit>
     </group>
   </body></file>
-  <file original="../transactionview.cpp" datatype="cpp" source-language="en" target-language="en"><body>
+  <file original="../transactionview.cpp" datatype="cpp" source-language="en"><body>
     <group restype="x-trolltech-linguist-context" resname="TransactionView">
-      <trans-unit id="_msg1086" approved="yes">
+      <trans-unit id="_msg1156">
         <source xml:space="preserve">All</source>
-        <target xml:space="preserve">All</target>
-        <context-group purpose="location"><context context-type="linenumber">70</context></context-group>
-        <context-group purpose="location"><context context-type="linenumber">83</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">71</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">84</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg1087" approved="yes">
+      <trans-unit id="_msg1157">
         <source xml:space="preserve">Today</source>
-        <target xml:space="preserve">Today</target>
-        <context-group purpose="location"><context context-type="linenumber">71</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">72</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg1088" approved="yes">
+      <trans-unit id="_msg1158">
         <source xml:space="preserve">This week</source>
-        <target xml:space="preserve">This week</target>
-        <context-group purpose="location"><context context-type="linenumber">72</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">73</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg1089" approved="yes">
+      <trans-unit id="_msg1159">
         <source xml:space="preserve">This month</source>
-        <target xml:space="preserve">This month</target>
-        <context-group purpose="location"><context context-type="linenumber">73</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">74</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg1090" approved="yes">
+      <trans-unit id="_msg1160">
         <source xml:space="preserve">Last month</source>
-        <target xml:space="preserve">Last month</target>
-        <context-group purpose="location"><context context-type="linenumber">74</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">75</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg1091" approved="yes">
+      <trans-unit id="_msg1161">
         <source xml:space="preserve">This year</source>
-        <target xml:space="preserve">This year</target>
-        <context-group purpose="location"><context context-type="linenumber">75</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">76</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg1092" approved="yes">
+      <trans-unit id="_msg1162">
         <source xml:space="preserve">Range…</source>
-        <target xml:space="preserve">Range…</target>
-        <context-group purpose="location"><context context-type="linenumber">76</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">77</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg1093" approved="yes">
+      <trans-unit id="_msg1163">
         <source xml:space="preserve">Most Common</source>
-        <target xml:space="preserve">Most Common</target>
-        <context-group purpose="location"><context context-type="linenumber">84</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">85</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg1094" approved="yes">
+      <trans-unit id="_msg1164">
         <source xml:space="preserve">Received with</source>
-        <target xml:space="preserve">Received with</target>
-        <context-group purpose="location"><context context-type="linenumber">85</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">86</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg1095" approved="yes">
+      <trans-unit id="_msg1165">
         <source xml:space="preserve">Sent to</source>
-        <target xml:space="preserve">Sent to</target>
-        <context-group purpose="location"><context context-type="linenumber">87</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">88</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg1096" approved="yes">
+      <trans-unit id="_msg1166">
         <source xml:space="preserve">%1 Send</source>
-        <target xml:space="preserve">%1 Send</target>
-        <context-group purpose="location"><context context-type="linenumber">89</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">90</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg1097" approved="yes">
+      <trans-unit id="_msg1167">
         <source xml:space="preserve">%1 Make Collateral Inputs</source>
-        <target xml:space="preserve">%1 Make Collateral Inputs</target>
-        <context-group purpose="location"><context context-type="linenumber">90</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">91</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg1098" approved="yes">
+      <trans-unit id="_msg1168">
         <source xml:space="preserve">%1 Create Denominations</source>
-        <target xml:space="preserve">%1 Create Denominations</target>
-        <context-group purpose="location"><context context-type="linenumber">91</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">92</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg1099" approved="yes">
+      <trans-unit id="_msg1169">
         <source xml:space="preserve">%1 Mixing</source>
-        <target xml:space="preserve">%1 Mixing</target>
-        <context-group purpose="location"><context context-type="linenumber">92</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">93</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg1100" approved="yes">
+      <trans-unit id="_msg1170">
         <source xml:space="preserve">%1 Collateral Payment</source>
-        <target xml:space="preserve">%1 Collateral Payment</target>
-        <context-group purpose="location"><context context-type="linenumber">93</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">94</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg1101" approved="yes">
+      <trans-unit id="_msg1171">
         <source xml:space="preserve">To yourself</source>
-        <target xml:space="preserve">To yourself</target>
-        <context-group purpose="location"><context context-type="linenumber">94</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">95</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg1102" approved="yes">
+      <trans-unit id="_msg1172">
         <source xml:space="preserve">Mined</source>
-        <target xml:space="preserve">Mined</target>
-        <context-group purpose="location"><context context-type="linenumber">95</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">96</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg1103" approved="yes">
+      <trans-unit id="_msg1173">
         <source xml:space="preserve">Platform Transfer</source>
-        <target xml:space="preserve">Platform Transfer</target>
-        <context-group purpose="location"><context context-type="linenumber">96</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">97</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg1104" approved="yes">
+      <trans-unit id="_msg1174">
         <source xml:space="preserve">Other</source>
-        <target xml:space="preserve">Other</target>
-        <context-group purpose="location"><context context-type="linenumber">97</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">98</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg1105" approved="yes">
+      <trans-unit id="_msg1175">
         <source xml:space="preserve">Enter address, transaction id, or label to search</source>
-        <target xml:space="preserve">Enter address, transaction id, or label to search</target>
-        <context-group purpose="location"><context context-type="linenumber">103</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">104</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg1106" approved="yes">
+      <trans-unit id="_msg1176">
         <source xml:space="preserve">Min amount</source>
-        <target xml:space="preserve">Min amount</target>
-        <context-group purpose="location"><context context-type="linenumber">108</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">109</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg1107" approved="yes">
+      <trans-unit id="_msg1177">
         <source xml:space="preserve">&amp;Copy address</source>
-        <target xml:space="preserve">&amp;Copy address</target>
-        <context-group purpose="location"><context context-type="linenumber">154</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">155</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg1108" approved="yes">
+      <trans-unit id="_msg1178">
         <source xml:space="preserve">Copy &amp;label</source>
-        <target xml:space="preserve">Copy &amp;label</target>
-        <context-group purpose="location"><context context-type="linenumber">155</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">156</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg1109" approved="yes">
+      <trans-unit id="_msg1179">
         <source xml:space="preserve">Copy &amp;amount</source>
-        <target xml:space="preserve">Copy &amp;amount</target>
-        <context-group purpose="location"><context context-type="linenumber">156</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">157</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg1110" approved="yes">
+      <trans-unit id="_msg1180">
         <source xml:space="preserve">Copy transaction &amp;ID</source>
-        <target xml:space="preserve">Copy transaction &amp;ID</target>
-        <context-group purpose="location"><context context-type="linenumber">157</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">158</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg1111" approved="yes">
+      <trans-unit id="_msg1181">
         <source xml:space="preserve">Copy &amp;raw transaction</source>
-        <target xml:space="preserve">Copy &amp;raw transaction</target>
-        <context-group purpose="location"><context context-type="linenumber">158</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">159</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg1112" approved="yes">
+      <trans-unit id="_msg1182">
         <source xml:space="preserve">Copy full transaction &amp;details</source>
-        <target xml:space="preserve">Copy full transaction &amp;details</target>
-        <context-group purpose="location"><context context-type="linenumber">159</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">160</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg1113" approved="yes">
+      <trans-unit id="_msg1183">
         <source xml:space="preserve">&amp;Show transaction details</source>
-        <target xml:space="preserve">&amp;Show transaction details</target>
-        <context-group purpose="location"><context context-type="linenumber">160</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">161</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg1114" approved="yes">
+      <trans-unit id="_msg1184">
         <source xml:space="preserve">A&amp;bandon transaction</source>
-        <target xml:space="preserve">A&amp;bandon transaction</target>
-        <context-group purpose="location"><context context-type="linenumber">162</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">163</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg1115" approved="yes">
+      <trans-unit id="_msg1185">
         <source xml:space="preserve">Rese&amp;nd transaction</source>
-        <target xml:space="preserve">Rese&amp;nd transaction</target>
-        <context-group purpose="location"><context context-type="linenumber">163</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">164</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg1116" approved="yes">
+      <trans-unit id="_msg1186">
         <source xml:space="preserve">&amp;Edit address label</source>
-        <target xml:space="preserve">&amp;Edit address label</target>
-        <context-group purpose="location"><context context-type="linenumber">164</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">165</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg1117" approved="yes">
+      <trans-unit id="_msg1187">
         <source xml:space="preserve">Show address &amp;QR code</source>
-        <target xml:space="preserve">Show address &amp;QR code</target>
-        <context-group purpose="location"><context context-type="linenumber">165</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">166</context></context-group>
+      </trans-unit>
+      <trans-unit id="_msg1188">
+        <source xml:space="preserve">Show in %1</source>
+        <context-group purpose="location"><context context-type="linenumber">244</context></context-group>
+        <note annotates="source" from="developer">Transactions table context menu action to show the selected transaction in a third-party block explorer. %1 is a stand-in argument for the URL of the explorer.</note>
       </trans-unit>
-      <trans-unit id="_msg1118" approved="yes">
+      <trans-unit id="_msg1189">
         <source xml:space="preserve">Export Transaction History</source>
-        <target xml:space="preserve">Export Transaction History</target>
-        <context-group purpose="location"><context context-type="linenumber">368</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">373</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg1119" approved="yes">
+      <trans-unit id="_msg1190">
         <source xml:space="preserve">Comma separated file</source>
-        <target xml:space="preserve">Comma separated file</target>
-        <context-group purpose="location"><context context-type="linenumber">371</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">376</context></context-group>
         <note annotates="source" from="developer">Expanded name of the CSV file format. See: https://en.wikipedia.org/wiki/Comma-separated_values.</note>
       </trans-unit>
-      <trans-unit id="_msg1120" approved="yes">
+      <trans-unit id="_msg1191">
         <source xml:space="preserve">Confirmed</source>
-        <target xml:space="preserve">Confirmed</target>
-        <context-group purpose="location"><context context-type="linenumber">380</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">385</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg1121" approved="yes">
+      <trans-unit id="_msg1192">
         <source xml:space="preserve">Watch-only</source>
-        <target xml:space="preserve">Watch-only</target>
-        <context-group purpose="location"><context context-type="linenumber">382</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">387</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg1122" approved="yes">
+      <trans-unit id="_msg1193">
         <source xml:space="preserve">Date</source>
-        <target xml:space="preserve">Date</target>
-        <context-group purpose="location"><context context-type="linenumber">383</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">388</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg1123" approved="yes">
+      <trans-unit id="_msg1194">
         <source xml:space="preserve">Type</source>
-        <target xml:space="preserve">Type</target>
-        <context-group purpose="location"><context context-type="linenumber">384</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">389</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg1124" approved="yes">
+      <trans-unit id="_msg1195">
         <source xml:space="preserve">Label</source>
-        <target xml:space="preserve">Label</target>
-        <context-group purpose="location"><context context-type="linenumber">385</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">390</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg1125" approved="yes">
+      <trans-unit id="_msg1196">
         <source xml:space="preserve">Address</source>
-        <target xml:space="preserve">Address</target>
-        <context-group purpose="location"><context context-type="linenumber">386</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">391</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg1126" approved="yes">
+      <trans-unit id="_msg1197">
         <source xml:space="preserve">ID</source>
-        <target xml:space="preserve">ID</target>
-        <context-group purpose="location"><context context-type="linenumber">388</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">393</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg1127" approved="yes">
+      <trans-unit id="_msg1198">
         <source xml:space="preserve">Exporting Failed</source>
-        <target xml:space="preserve">Exporting Failed</target>
-        <context-group purpose="location"><context context-type="linenumber">391</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">396</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg1128" approved="yes">
+      <trans-unit id="_msg1199">
         <source xml:space="preserve">There was an error trying to save the transaction history to %1.</source>
-        <target xml:space="preserve">There was an error trying to save the transaction history to %1.</target>
-        <context-group purpose="location"><context context-type="linenumber">391</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">396</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg1129" approved="yes">
+      <trans-unit id="_msg1200">
         <source xml:space="preserve">Exporting Successful</source>
-        <target xml:space="preserve">Exporting Successful</target>
-        <context-group purpose="location"><context context-type="linenumber">395</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">400</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg1130" approved="yes">
+      <trans-unit id="_msg1201">
         <source xml:space="preserve">The transaction history was successfully saved to %1.</source>
-        <target xml:space="preserve">The transaction history was successfully saved to %1.</target>
-        <context-group purpose="location"><context context-type="linenumber">395</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">400</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg1131" approved="yes">
+      <trans-unit id="_msg1202">
         <source xml:space="preserve">QR code</source>
-        <target xml:space="preserve">QR code</target>
-        <context-group purpose="location"><context context-type="linenumber">553</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">558</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg1132" approved="yes">
+      <trans-unit id="_msg1203">
         <source xml:space="preserve">Range:</source>
-        <target xml:space="preserve">Range:</target>
-        <context-group purpose="location"><context context-type="linenumber">596</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">601</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg1133" approved="yes">
+      <trans-unit id="_msg1204">
         <source xml:space="preserve">to</source>
-        <target xml:space="preserve">to</target>
-        <context-group purpose="location"><context context-type="linenumber">605</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">610</context></context-group>
       </trans-unit>
     </group>
   </body></file>
-  <file original="../walletframe.cpp" datatype="cpp" source-language="en" target-language="en"><body>
+  <file original="../walletframe.cpp" datatype="cpp" source-language="en"><body>
     <group restype="x-trolltech-linguist-context" resname="WalletFrame">
-      <trans-unit id="_msg1134" approved="yes">
+      <trans-unit id="_msg1205">
         <source xml:space="preserve">No wallet has been loaded.
 Go to File &gt; Open Wallet to load a wallet.
 - OR -</source>
-        <target xml:space="preserve">No wallet has been loaded.
-Go to File &gt; Open Wallet to load a wallet.
-- OR -</target>
         <context-group purpose="location"><context context-type="linenumber">46</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg1135" approved="yes">
+      <trans-unit id="_msg1206">
         <source xml:space="preserve">Create a new wallet</source>
-        <target xml:space="preserve">Create a new wallet</target>
         <context-group purpose="location"><context context-type="linenumber">51</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg1136" approved="yes">
+      <trans-unit id="_msg1207">
         <source xml:space="preserve">Error</source>
-        <target xml:space="preserve">Error</target>
-        <context-group purpose="location"><context context-type="linenumber">258</context></context-group>
-        <context-group purpose="location"><context context-type="linenumber">268</context></context-group>
-        <context-group purpose="location"><context context-type="linenumber">278</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">255</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">265</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">283</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg1137" approved="yes">
+      <trans-unit id="_msg1208">
         <source xml:space="preserve">Unable to decode PSBT from clipboard (invalid base64)</source>
-        <target xml:space="preserve">Unable to decode PSBT from clipboard (invalid base64)</target>
-        <context-group purpose="location"><context context-type="linenumber">258</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">255</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg1138" approved="yes">
+      <trans-unit id="_msg1209">
         <source xml:space="preserve">Load Transaction Data</source>
-        <target xml:space="preserve">Load Transaction Data</target>
-        <context-group purpose="location"><context context-type="linenumber">264</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">261</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg1139" approved="yes">
+      <trans-unit id="_msg1210">
         <source xml:space="preserve">Partially Signed Transaction (*.psbt)</source>
-        <target xml:space="preserve">Partially Signed Transaction (*.psbt)</target>
-        <context-group purpose="location"><context context-type="linenumber">265</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">262</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg1140" approved="yes">
+      <trans-unit id="_msg1211">
         <source xml:space="preserve">PSBT file must be smaller than 100 MiB</source>
-        <target xml:space="preserve">PSBT file must be smaller than 100 MiB</target>
-        <context-group purpose="location"><context context-type="linenumber">268</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">265</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg1141" approved="yes">
+      <trans-unit id="_msg1212">
         <source xml:space="preserve">Unable to decode PSBT</source>
-        <target xml:space="preserve">Unable to decode PSBT</target>
-        <context-group purpose="location"><context context-type="linenumber">278</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">283</context></context-group>
       </trans-unit>
     </group>
   </body></file>
-  <file original="../walletmodel.cpp" datatype="cpp" source-language="en" target-language="en"><body>
+  <file original="../walletmodel.cpp" datatype="cpp" source-language="en"><body>
     <group restype="x-trolltech-linguist-context" resname="WalletModel">
-      <trans-unit id="_msg1142" approved="yes">
+      <trans-unit id="_msg1213">
         <source xml:space="preserve">Send Coins</source>
-        <target xml:space="preserve">Send Coins</target>
-        <context-group purpose="location"><context context-type="linenumber">265</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">269</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg1143" approved="yes">
+      <trans-unit id="_msg1214">
         <source xml:space="preserve">default wallet</source>
-        <target xml:space="preserve">default wallet</target>
-        <context-group purpose="location"><context context-type="linenumber">587</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">594</context></context-group>
       </trans-unit>
     </group>
   </body></file>
-  <file original="../walletview.cpp" datatype="cpp" source-language="en" target-language="en"><body>
+  <file original="../walletview.cpp" datatype="cpp" source-language="en"><body>
     <group restype="x-trolltech-linguist-context" resname="WalletView">
-      <trans-unit id="_msg1144" approved="yes">
+      <trans-unit id="_msg1215">
         <source xml:space="preserve">&amp;Export</source>
-        <target xml:space="preserve">&amp;Export</target>
-        <context-group purpose="location"><context context-type="linenumber">51</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">53</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg1145" approved="yes">
+      <trans-unit id="_msg1216">
         <source xml:space="preserve">Export the data in the current tab to a file</source>
-        <target xml:space="preserve">Export the data in the current tab to a file</target>
-        <context-group purpose="location"><context context-type="linenumber">52</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">54</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg1146" approved="yes">
+      <trans-unit id="_msg1217">
         <source xml:space="preserve">Selected amount:</source>
-        <target xml:space="preserve">Selected amount:</target>
-        <context-group purpose="location"><context context-type="linenumber">58</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">60</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg1147" approved="yes">
+      <trans-unit id="_msg1218">
         <source xml:space="preserve">Wallet Data</source>
-        <target xml:space="preserve">Wallet Data</target>
-        <context-group purpose="location"><context context-type="linenumber">319</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">306</context></context-group>
         <note annotates="source" from="developer">Name of the wallet data file format.</note>
       </trans-unit>
-      <trans-unit id="_msg1148" approved="yes">
+      <trans-unit id="_msg1219">
         <source xml:space="preserve">Backup Wallet</source>
-        <target xml:space="preserve">Backup Wallet</target>
-        <context-group purpose="location"><context context-type="linenumber">317</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">304</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg1149" approved="yes">
+      <trans-unit id="_msg1220">
         <source xml:space="preserve">Backup Failed</source>
-        <target xml:space="preserve">Backup Failed</target>
-        <context-group purpose="location"><context context-type="linenumber">325</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">312</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg1150" approved="yes">
+      <trans-unit id="_msg1221">
         <source xml:space="preserve">There was an error trying to save the wallet data to %1.</source>
-        <target xml:space="preserve">There was an error trying to save the wallet data to %1.</target>
-        <context-group purpose="location"><context context-type="linenumber">325</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">312</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg1151" approved="yes">
+      <trans-unit id="_msg1222">
         <source xml:space="preserve">Backup Successful</source>
-        <target xml:space="preserve">Backup Successful</target>
-        <context-group purpose="location"><context context-type="linenumber">329</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">316</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg1152" approved="yes">
+      <trans-unit id="_msg1223">
         <source xml:space="preserve">The wallet data was successfully saved to %1.</source>
-        <target xml:space="preserve">The wallet data was successfully saved to %1.</target>
-        <context-group purpose="location"><context context-type="linenumber">329</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">316</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg1153" approved="yes">
+      <trans-unit id="_msg1224">
         <source xml:space="preserve">Cancel</source>
-        <target xml:space="preserve">Cancel</target>
-        <context-group purpose="location"><context context-type="linenumber">382</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">358</context></context-group>
       </trans-unit>
     </group>
   </body></file>
-  <file original="../dashstrings.cpp" datatype="cpp" source-language="en" target-language="en"><body>
+  <file original="../dashstrings.cpp" datatype="cpp" source-language="en"><body>
     <group restype="x-trolltech-linguist-context" resname="dash-core">
-      <trans-unit id="_msg1154" approved="yes">
-        <source xml:space="preserve">Fee estimation failed. Fallbackfee is disabled. Wait a few blocks or enable -fallbackfee.</source>
-        <target xml:space="preserve">Fee estimation failed. Fallbackfee is disabled. Wait a few blocks or enable -fallbackfee.</target>
-        <context-group purpose="location"><context context-type="linenumber">79</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg1155" approved="yes">
+      <trans-unit id="_msg1225">
         <source xml:space="preserve">This error could occur if this wallet was not shutdown cleanly and was last loaded using a build with a newer version of Berkeley DB. If so, please use the software that last loaded this wallet</source>
-        <target xml:space="preserve">This error could occur if this wallet was not shutdown cleanly and was last loaded using a build with a newer version of Berkeley DB. If so, please use the software that last loaded this wallet</target>
-        <context-group purpose="location"><context context-type="linenumber">155</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">150</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg1156" approved="yes">
+      <trans-unit id="_msg1226">
         <source xml:space="preserve">This is a pre-release test build - use at your own risk - do not use for mining or merchant applications</source>
-        <target xml:space="preserve">This is a pre-release test build - use at your own risk - do not use for mining or merchant applications</target>
-        <context-group purpose="location"><context context-type="linenumber">159</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">154</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg1157" approved="yes">
+      <trans-unit id="_msg1227">
         <source xml:space="preserve">Warning: We do not appear to fully agree with our peers! You may need to upgrade, or other nodes may need to upgrade.</source>
-        <target xml:space="preserve">Warning: We do not appear to fully agree with our peers! You may need to upgrade, or other nodes may need to upgrade.</target>
-        <context-group purpose="location"><context context-type="linenumber">199</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">197</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg1158" approved="yes">
+      <trans-unit id="_msg1228">
         <source xml:space="preserve">Already have that input.</source>
-        <target xml:space="preserve">Already have that input.</target>
         <context-group purpose="location"><context context-type="linenumber">219</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg1159" approved="yes">
+      <trans-unit id="_msg1229">
         <source xml:space="preserve">Collateral not valid.</source>
-        <target xml:space="preserve">Collateral not valid.</target>
-        <context-group purpose="location"><context context-type="linenumber">227</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">230</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg1160" approved="yes">
+      <trans-unit id="_msg1230">
         <source xml:space="preserve">Corrupted block database detected</source>
-        <target xml:space="preserve">Corrupted block database detected</target>
-        <context-group purpose="location"><context context-type="linenumber">230</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">233</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg1161" approved="yes">
+      <trans-unit id="_msg1231">
         <source xml:space="preserve">Do you want to rebuild the block database now?</source>
-        <target xml:space="preserve">Do you want to rebuild the block database now?</target>
-        <context-group purpose="location"><context context-type="linenumber">234</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">237</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg1162" approved="yes">
+      <trans-unit id="_msg1232">
         <source xml:space="preserve">Done loading</source>
-        <target xml:space="preserve">Done loading</target>
-        <context-group purpose="location"><context context-type="linenumber">235</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">238</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg1163" approved="yes">
+      <trans-unit id="_msg1233">
         <source xml:space="preserve">Entries are full.</source>
-        <target xml:space="preserve">Entries are full.</target>
-        <context-group purpose="location"><context context-type="linenumber">238</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">241</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg1164" approved="yes">
+      <trans-unit id="_msg1234">
         <source xml:space="preserve">Error initializing block database</source>
-        <target xml:space="preserve">Error initializing block database</target>
-        <context-group purpose="location"><context context-type="linenumber">241</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">244</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg1165" approved="yes">
+      <trans-unit id="_msg1235">
         <source xml:space="preserve">Error initializing wallet database environment %s!</source>
-        <target xml:space="preserve">Error initializing wallet database environment %s!</target>
-        <context-group purpose="location"><context context-type="linenumber">242</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">245</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg1166" approved="yes">
+      <trans-unit id="_msg1236">
         <source xml:space="preserve">Error loading block database</source>
-        <target xml:space="preserve">Error loading block database</target>
-        <context-group purpose="location"><context context-type="linenumber">248</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">251</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg1167" approved="yes">
+      <trans-unit id="_msg1237">
         <source xml:space="preserve">Error opening block database</source>
-        <target xml:space="preserve">Error opening block database</target>
-        <context-group purpose="location"><context context-type="linenumber">249</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">252</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg1168" approved="yes">
+      <trans-unit id="_msg1238">
         <source xml:space="preserve">Error reading from database, shutting down.</source>
-        <target xml:space="preserve">Error reading from database, shutting down.</target>
-        <context-group purpose="location"><context context-type="linenumber">250</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">253</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg1169" approved="yes">
+      <trans-unit id="_msg1239">
         <source xml:space="preserve">Error: Missing checksum</source>
-        <target xml:space="preserve">Error: Missing checksum</target>
-        <context-group purpose="location"><context context-type="linenumber">261</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">262</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg1170" approved="yes">
+      <trans-unit id="_msg1240">
         <source xml:space="preserve">Error: Unable to parse version %u as a uint32_t</source>
-        <target xml:space="preserve">Error: Unable to parse version %u as a uint32_t</target>
-        <context-group purpose="location"><context context-type="linenumber">263</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">264</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg1171" approved="yes">
+      <trans-unit id="_msg1241">
         <source xml:space="preserve">Error: Unable to write record to new wallet</source>
-        <target xml:space="preserve">Error: Unable to write record to new wallet</target>
-        <context-group purpose="location"><context context-type="linenumber">264</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">265</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg1172" approved="yes">
+      <trans-unit id="_msg1242">
         <source xml:space="preserve">Failed to listen on any port. Use -listen=0 if you want this.</source>
-        <target xml:space="preserve">Failed to listen on any port. Use -listen=0 if you want this.</target>
         <context-group purpose="location"><context context-type="linenumber">274</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg1173" approved="yes">
-        <source xml:space="preserve">-maxtxfee is set very high! Fees this large could be paid on a single transaction.</source>
-        <target xml:space="preserve">-maxtxfee is set very high! Fees this large could be paid on a single transaction.</target>
-        <context-group purpose="location"><context context-type="linenumber">26</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg1174" approved="yes">
+      <trans-unit id="_msg1243">
         <source xml:space="preserve">Found unconfirmed denominated outputs, will wait till they confirm to continue.</source>
-        <target xml:space="preserve">Found unconfirmed denominated outputs, will wait till they confirm to continue.</target>
-        <context-group purpose="location"><context context-type="linenumber">85</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">81</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg1175" approved="yes">
+      <trans-unit id="_msg1244">
         <source xml:space="preserve">Invalid -socketevents (&apos;%s&apos;) specified. Only these modes are supported: %s</source>
-        <target xml:space="preserve">Invalid -socketevents (&apos;%s&apos;) specified. Only these modes are supported: %s</target>
-        <context-group purpose="location"><context context-type="linenumber">94</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg1176" approved="yes">
-        <source xml:space="preserve">Invalid amount for -maxtxfee=&lt;amount&gt;: &apos;%s&apos; (must be at least the minrelay fee of %s to prevent stuck transactions)</source>
-        <target xml:space="preserve">Invalid amount for -maxtxfee=&lt;amount&gt;: &apos;%s&apos; (must be at least the minrelay fee of %s to prevent stuck transactions)</target>
-        <context-group purpose="location"><context context-type="linenumber">96</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">90</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg1177" approved="yes">
+      <trans-unit id="_msg1245">
         <source xml:space="preserve">SQLiteDatabase: Unknown sqlite wallet schema version %d. Only version %d is supported</source>
-        <target xml:space="preserve">SQLiteDatabase: Unknown sqlite wallet schema version %d. Only version %d is supported</target>
-        <context-group purpose="location"><context context-type="linenumber">138</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg1178">
-        <source xml:space="preserve">The -txindex upgrade started by a previous version cannot be completed. Restart with the previous version or run a full -reindex.</source>
-        <target xml:space="preserve"></target>
-        <context-group purpose="location"><context context-type="linenumber">141</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">140</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg1179" approved="yes">
+      <trans-unit id="_msg1246">
         <source xml:space="preserve">Transaction index can&apos;t be disabled with governance validation enabled. Either start with -disablegovernance command line switch or enable transaction index.</source>
-        <target xml:space="preserve">Transaction index can&apos;t be disabled with governance validation enabled. Either start with -disablegovernance command line switch or enable transaction index.</target>
-        <context-group purpose="location"><context context-type="linenumber">173</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">168</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg1180">
+      <trans-unit id="_msg1247">
         <source xml:space="preserve">Unsupported category-specific logging level -loglevel=%s. Expected -loglevel=&lt;category&gt;:&lt;loglevel&gt;. Valid categories: %s. Valid loglevels: %s.</source>
-        <target xml:space="preserve"></target>
-        <context-group purpose="location"><context context-type="linenumber">186</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">181</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg1181" approved="yes">
+      <trans-unit id="_msg1248">
         <source xml:space="preserve">Can&apos;t mix: no compatible inputs found!</source>
-        <target xml:space="preserve">Can&apos;t mix: no compatible inputs found!</target>
         <context-group purpose="location"><context context-type="linenumber">223</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg1182" approved="yes">
+      <trans-unit id="_msg1249">
         <source xml:space="preserve">Entry exceeds maximum size.</source>
-        <target xml:space="preserve">Entry exceeds maximum size.</target>
-        <context-group purpose="location"><context context-type="linenumber">239</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg1183">
-        <source xml:space="preserve">Error upgrading Evo database</source>
-        <target xml:space="preserve"></target>
-        <context-group purpose="location"><context context-type="linenumber">252</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">242</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg1184">
+      <trans-unit id="_msg1250">
         <source xml:space="preserve">Error upgrading evo database for EHF</source>
-        <target xml:space="preserve"></target>
-        <context-group purpose="location"><context context-type="linenumber">254</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">255</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg1185">
+      <trans-unit id="_msg1251">
         <source xml:space="preserve">Failed to commit Evo database</source>
-        <target xml:space="preserve"></target>
         <context-group purpose="location"><context context-type="linenumber">269</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg1186" approved="yes">
+      <trans-unit id="_msg1252">
         <source xml:space="preserve">Found enough users, signing ( waiting %s )</source>
-        <target xml:space="preserve">Found enough users, signing ( waiting %s )</target>
-        <context-group purpose="location"><context context-type="linenumber">283</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">285</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg1187" approved="yes">
+      <trans-unit id="_msg1253">
         <source xml:space="preserve">Incompatible mode.</source>
-        <target xml:space="preserve">Incompatible mode.</target>
-        <context-group purpose="location"><context context-type="linenumber">287</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">290</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg1188" approved="yes">
+      <trans-unit id="_msg1254">
         <source xml:space="preserve">Incompatible version.</source>
-        <target xml:space="preserve">Incompatible version.</target>
-        <context-group purpose="location"><context context-type="linenumber">288</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">291</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg1189" approved="yes">
+      <trans-unit id="_msg1255">
         <source xml:space="preserve">Incorrect or no genesis block found. Wrong datadir for network?</source>
-        <target xml:space="preserve">Incorrect or no genesis block found. Wrong datadir for network?</target>
-        <context-group purpose="location"><context context-type="linenumber">290</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">293</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg1190" approved="yes">
+      <trans-unit id="_msg1256">
         <source xml:space="preserve">Input is not valid.</source>
-        <target xml:space="preserve">Input is not valid.</target>
-        <context-group purpose="location"><context context-type="linenumber">292</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg1191" approved="yes">
-        <source xml:space="preserve">Insufficient funds.</source>
-        <target xml:space="preserve">Insufficient funds.</target>
         <context-group purpose="location"><context context-type="linenumber">295</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg1192" approved="yes">
-        <source xml:space="preserve">Invalid amount for -discardfee=&lt;amount&gt;: &apos;%s&apos;</source>
-        <target xml:space="preserve">Invalid amount for -discardfee=&lt;amount&gt;: &apos;%s&apos;</target>
-        <context-group purpose="location"><context context-type="linenumber">302</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg1193" approved="yes">
-        <source xml:space="preserve">Invalid amount for -paytxfee=&lt;amount&gt;: &apos;%s&apos; (must be at least %s)</source>
-        <target xml:space="preserve">Invalid amount for -paytxfee=&lt;amount&gt;: &apos;%s&apos; (must be at least %s)</target>
-        <context-group purpose="location"><context context-type="linenumber">304</context></context-group>
+      <trans-unit id="_msg1257">
+        <source xml:space="preserve">Insufficient funds.</source>
+        <context-group purpose="location"><context context-type="linenumber">298</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg1194" approved="yes">
+      <trans-unit id="_msg1258">
         <source xml:space="preserve">Invalid minimum number of spork signers specified with -minsporkkeys</source>
-        <target xml:space="preserve">Invalid minimum number of spork signers specified with -minsporkkeys</target>
-        <context-group purpose="location"><context context-type="linenumber">306</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">308</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg1195">
+      <trans-unit id="_msg1259">
         <source xml:space="preserve">Listening for incoming connections failed (listen returned error %s)</source>
-        <target xml:space="preserve"></target>
-        <context-group purpose="location"><context context-type="linenumber">312</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">315</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg1196" approved="yes">
+      <trans-unit id="_msg1260">
         <source xml:space="preserve">Lock is already in place.</source>
-        <target xml:space="preserve">Lock is already in place.</target>
-        <context-group purpose="location"><context context-type="linenumber">317</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">320</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg1197" approved="yes">
+      <trans-unit id="_msg1261">
         <source xml:space="preserve">Need to specify a port with -whitebind: &apos;%s&apos;</source>
-        <target xml:space="preserve">Need to specify a port with -whitebind: &apos;%s&apos;</target>
-        <context-group purpose="location"><context context-type="linenumber">322</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">326</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg1198" approved="yes">
+      <trans-unit id="_msg1262">
         <source xml:space="preserve">No Masternodes detected.</source>
-        <target xml:space="preserve">No Masternodes detected.</target>
-        <context-group purpose="location"><context context-type="linenumber">323</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">327</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg1199" approved="yes">
+      <trans-unit id="_msg1263">
         <source xml:space="preserve">No compatible Masternode found.</source>
-        <target xml:space="preserve">No compatible Masternode found.</target>
-        <context-group purpose="location"><context context-type="linenumber">325</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">329</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg1200" approved="yes">
+      <trans-unit id="_msg1264">
         <source xml:space="preserve">Not enough funds to mix.</source>
-        <target xml:space="preserve">Not enough funds to mix.</target>
-        <context-group purpose="location"><context context-type="linenumber">330</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">337</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg1201" approved="yes">
+      <trans-unit id="_msg1265">
         <source xml:space="preserve">Not in the Masternode list.</source>
-        <target xml:space="preserve">Not in the Masternode list.</target>
-        <context-group purpose="location"><context context-type="linenumber">331</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">338</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg1202" approved="yes">
+      <trans-unit id="_msg1266">
         <source xml:space="preserve">Pruning blockstore…</source>
-        <target xml:space="preserve">Pruning blockstore…</target>
-        <context-group purpose="location"><context context-type="linenumber">335</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">343</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg1203" approved="yes">
+      <trans-unit id="_msg1267">
         <source xml:space="preserve">Replaying blocks…</source>
-        <target xml:space="preserve">Replaying blocks…</target>
-        <context-group purpose="location"><context context-type="linenumber">337</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">345</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg1204" approved="yes">
+      <trans-unit id="_msg1268">
         <source xml:space="preserve">Rescanning…</source>
-        <target xml:space="preserve">Rescanning…</target>
-        <context-group purpose="location"><context context-type="linenumber">338</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">346</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg1205" approved="yes">
+      <trans-unit id="_msg1269">
         <source xml:space="preserve">Starting network threads…</source>
-        <target xml:space="preserve">Starting network threads…</target>
-        <context-group purpose="location"><context context-type="linenumber">351</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">360</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg1206" approved="yes">
+      <trans-unit id="_msg1270">
         <source xml:space="preserve">Submitted to masternode, waiting in queue %s</source>
-        <target xml:space="preserve">Submitted to masternode, waiting in queue %s</target>
-        <context-group purpose="location"><context context-type="linenumber">352</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">361</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg1207" approved="yes">
+      <trans-unit id="_msg1271">
         <source xml:space="preserve">Synchronization finished</source>
-        <target xml:space="preserve">Synchronization finished</target>
-        <context-group purpose="location"><context context-type="linenumber">353</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">362</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg1208" approved="yes">
+      <trans-unit id="_msg1272">
         <source xml:space="preserve">Synchronizing blockchain…</source>
-        <target xml:space="preserve">Synchronizing blockchain…</target>
-        <context-group purpose="location"><context context-type="linenumber">354</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">363</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg1209" approved="yes">
+      <trans-unit id="_msg1273">
         <source xml:space="preserve">Synchronizing governance objects…</source>
-        <target xml:space="preserve">Synchronizing governance objects…</target>
-        <context-group purpose="location"><context context-type="linenumber">355</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">364</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg1210">
+      <trans-unit id="_msg1274">
         <source xml:space="preserve">Transaction change output index out of range</source>
-        <target xml:space="preserve"></target>
-        <context-group purpose="location"><context context-type="linenumber">367</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">376</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg1211" approved="yes">
+      <trans-unit id="_msg1275">
         <source xml:space="preserve">Unable to start HTTP server. See debug log for details.</source>
-        <target xml:space="preserve">Unable to start HTTP server. See debug log for details.</target>
-        <context-group purpose="location"><context context-type="linenumber">384</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">396</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg1212" approved="yes">
+      <trans-unit id="_msg1276">
         <source xml:space="preserve">Unknown response.</source>
-        <target xml:space="preserve">Unknown response.</target>
-        <context-group purpose="location"><context context-type="linenumber">388</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">400</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg1213">
+      <trans-unit id="_msg1277">
         <source xml:space="preserve">Unsupported global logging level -loglevel=%s. Valid values: %s.</source>
-        <target xml:space="preserve"></target>
-        <context-group purpose="location"><context context-type="linenumber">390</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">403</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg1214" approved="yes">
+      <trans-unit id="_msg1278">
         <source xml:space="preserve">User Agent comment (%s) contains unsafe characters.</source>
-        <target xml:space="preserve">User Agent comment (%s) contains unsafe characters.</target>
-        <context-group purpose="location"><context context-type="linenumber">393</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">405</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg1215" approved="yes">
+      <trans-unit id="_msg1279">
         <source xml:space="preserve">Can&apos;t find random Masternode.</source>
-        <target xml:space="preserve">Can&apos;t find random Masternode.</target>
         <context-group purpose="location"><context context-type="linenumber">221</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg1216" approved="yes">
+      <trans-unit id="_msg1280">
         <source xml:space="preserve">%s can&apos;t be lower than %s</source>
-        <target xml:space="preserve">%s can&apos;t be lower than %s</target>
-        <context-group purpose="location"><context context-type="linenumber">208</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">206</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg1217" approved="yes">
+      <trans-unit id="_msg1281">
         <source xml:space="preserve">%s is idle.</source>
-        <target xml:space="preserve">%s is idle.</target>
-        <context-group purpose="location"><context context-type="linenumber">210</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">208</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg1218" approved="yes">
+      <trans-unit id="_msg1282">
         <source xml:space="preserve">Can&apos;t mix while sync in progress.</source>
-        <target xml:space="preserve">Can&apos;t mix while sync in progress.</target>
         <context-group purpose="location"><context context-type="linenumber">222</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg1219" approved="yes">
+      <trans-unit id="_msg1283">
         <source xml:space="preserve">Invalid netmask specified in -whitelist: &apos;%s&apos;</source>
-        <target xml:space="preserve">Invalid netmask specified in -whitelist: &apos;%s&apos;</target>
-        <context-group purpose="location"><context context-type="linenumber">307</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">309</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg1220" approved="yes">
+      <trans-unit id="_msg1284">
         <source xml:space="preserve">Invalid script detected.</source>
-        <target xml:space="preserve">Invalid script detected.</target>
-        <context-group purpose="location"><context context-type="linenumber">308</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">311</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg1221" approved="yes">
+      <trans-unit id="_msg1285">
         <source xml:space="preserve">%s file contains all private keys from this wallet. Do not share it with anyone!</source>
-        <target xml:space="preserve">%s file contains all private keys from this wallet. Do not share it with anyone!</target>
         <context-group purpose="location"><context context-type="linenumber">16</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg1222" approved="yes">
+      <trans-unit id="_msg1286">
         <source xml:space="preserve">Failed to create backup, file already exists! This could happen if you restarted wallet in less than 60 seconds. You can continue if you are ok with this.</source>
-        <target xml:space="preserve">Failed to create backup, file already exists! This could happen if you restarted wallet in less than 60 seconds. You can continue if you are ok with this.</target>
-        <context-group purpose="location"><context context-type="linenumber">72</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">68</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg1223" approved="yes">
+      <trans-unit id="_msg1287">
         <source xml:space="preserve">Make sure to encrypt your wallet and delete all non-encrypted backups after you have verified that the wallet works!</source>
-        <target xml:space="preserve">Make sure to encrypt your wallet and delete all non-encrypted backups after you have verified that the wallet works!</target>
-        <context-group purpose="location"><context context-type="linenumber">103</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">99</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg1224" approved="yes">
+      <trans-unit id="_msg1288">
         <source xml:space="preserve">More than one onion bind address is provided. Using %s for the automatically created Tor onion service.</source>
-        <target xml:space="preserve">More than one onion bind address is provided. Using %s for the automatically created Tor onion service.</target>
-        <context-group purpose="location"><context context-type="linenumber">106</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">102</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg1225" approved="yes">
+      <trans-unit id="_msg1289">
         <source xml:space="preserve">Prune configured below the minimum of %d MiB.  Please use a higher number.</source>
-        <target xml:space="preserve">Prune configured below the minimum of %d MiB.  Please use a higher number.</target>
-        <context-group purpose="location"><context context-type="linenumber">130</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">132</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg1226" approved="yes">
+      <trans-unit id="_msg1290">
         <source xml:space="preserve">Prune: last wallet synchronisation goes beyond pruned data. You need to -reindex (download the whole blockchain again in case of pruned node)</source>
-        <target xml:space="preserve">Prune: last wallet synchronisation goes beyond pruned data. You need to -reindex (download the whole blockchain again in case of pruned node)</target>
-        <context-group purpose="location"><context context-type="linenumber">135</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">137</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg1227" approved="yes">
+      <trans-unit id="_msg1291">
         <source xml:space="preserve">The block database contains a block which appears to be from the future. This may be due to your computer&apos;s date and time being set incorrectly. Only rebuild the block database if you are sure that your computer&apos;s date and time are correct</source>
-        <target xml:space="preserve">The block database contains a block which appears to be from the future. This may be due to your computer&apos;s date and time being set incorrectly. Only rebuild the block database if you are sure that your computer&apos;s date and time are correct</target>
-        <context-group purpose="location"><context context-type="linenumber">144</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">143</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg1228" approved="yes">
+      <trans-unit id="_msg1292">
         <source xml:space="preserve">The transaction amount is too small to send after the fee has been deducted</source>
-        <target xml:space="preserve">The transaction amount is too small to send after the fee has been deducted</target>
-        <context-group purpose="location"><context context-type="linenumber">153</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">148</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg1229" approved="yes">
+      <trans-unit id="_msg1293">
         <source xml:space="preserve">Total length of network version string (%i) exceeds maximum length (%i). Reduce the number or size of uacomments.</source>
-        <target xml:space="preserve">Total length of network version string (%i) exceeds maximum length (%i). Reduce the number or size of uacomments.</target>
-        <context-group purpose="location"><context context-type="linenumber">170</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg1230" approved="yes">
-        <source xml:space="preserve">Transaction needs a change address, but we can&apos;t generate it. Please call keypoolrefill first.</source>
-        <target xml:space="preserve">Transaction needs a change address, but we can&apos;t generate it. Please call keypoolrefill first.</target>
-        <context-group purpose="location"><context context-type="linenumber">177</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">165</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg1231" approved="yes">
+      <trans-unit id="_msg1294">
         <source xml:space="preserve">WARNING! Failed to replenish keypool, please unlock your wallet to do so.</source>
-        <target xml:space="preserve">WARNING! Failed to replenish keypool, please unlock your wallet to do so.</target>
-        <context-group purpose="location"><context context-type="linenumber">189</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">187</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg1232" approved="yes">
+      <trans-unit id="_msg1295">
         <source xml:space="preserve">Wallet is locked, can&apos;t replenish keypool! Automatic backups and mixing are disabled, please unlock your wallet to replenish keypool.</source>
-        <target xml:space="preserve">Wallet is locked, can&apos;t replenish keypool! Automatic backups and mixing are disabled, please unlock your wallet to replenish keypool.</target>
-        <context-group purpose="location"><context context-type="linenumber">191</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">189</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg1233" approved="yes">
+      <trans-unit id="_msg1296">
         <source xml:space="preserve">You need to rebuild the database using -reindex to go back to unpruned mode.  This will redownload the entire blockchain</source>
-        <target xml:space="preserve">You need to rebuild the database using -reindex to go back to unpruned mode.  This will redownload the entire blockchain</target>
-        <context-group purpose="location"><context context-type="linenumber">204</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">202</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg1234" approved="yes">
+      <trans-unit id="_msg1297">
         <source xml:space="preserve">%s failed</source>
-        <target xml:space="preserve">%s failed</target>
-        <context-group purpose="location"><context context-type="linenumber">209</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">207</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg1235" approved="yes">
+      <trans-unit id="_msg1298">
         <source xml:space="preserve">-maxmempool must be at least %d MB</source>
-        <target xml:space="preserve">-maxmempool must be at least %d MB</target>
-        <context-group purpose="location"><context context-type="linenumber">215</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">213</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg1236" approved="yes">
+      <trans-unit id="_msg1299">
         <source xml:space="preserve">Automatic backups disabled</source>
-        <target xml:space="preserve">Automatic backups disabled</target>
         <context-group purpose="location"><context context-type="linenumber">220</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg1237" approved="yes">
+      <trans-unit id="_msg1300">
         <source xml:space="preserve">Cannot set -peerblockfilters without -blockfilterindex.</source>
-        <target xml:space="preserve">Cannot set -peerblockfilters without -blockfilterindex.</target>
-        <context-group purpose="location"><context context-type="linenumber">225</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">228</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg1238" approved="yes">
+      <trans-unit id="_msg1301">
         <source xml:space="preserve">Config setting for %s only applied on %s network when in [%s] section.</source>
-        <target xml:space="preserve">Config setting for %s only applied on %s network when in [%s] section.</target>
-        <context-group purpose="location"><context context-type="linenumber">228</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">231</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg1239" approved="yes">
+      <trans-unit id="_msg1302">
         <source xml:space="preserve">Could not find asmap file %s</source>
-        <target xml:space="preserve">Could not find asmap file %s</target>
-        <context-group purpose="location"><context context-type="linenumber">231</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">234</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg1240" approved="yes">
+      <trans-unit id="_msg1303">
         <source xml:space="preserve">Could not parse asmap file %s</source>
-        <target xml:space="preserve">Could not parse asmap file %s</target>
-        <context-group purpose="location"><context context-type="linenumber">232</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">235</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg1241" approved="yes">
+      <trans-unit id="_msg1304">
         <source xml:space="preserve">ERROR! Failed to create automatic backup</source>
-        <target xml:space="preserve">ERROR! Failed to create automatic backup</target>
-        <context-group purpose="location"><context context-type="linenumber">237</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">240</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg1242" approved="yes">
+      <trans-unit id="_msg1305">
         <source xml:space="preserve">Error loading %s: Private keys can only be disabled during creation</source>
-        <target xml:space="preserve">Error loading %s: Private keys can only be disabled during creation</target>
-        <context-group purpose="location"><context context-type="linenumber">244</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">247</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg1243" approved="yes">
+      <trans-unit id="_msg1306">
         <source xml:space="preserve">Error: Couldn&apos;t create cursor into database</source>
-        <target xml:space="preserve">Error: Couldn&apos;t create cursor into database</target>
-        <context-group purpose="location"><context context-type="linenumber">255</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">256</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg1244" approved="yes">
+      <trans-unit id="_msg1307">
         <source xml:space="preserve">Error: Disk space is low for %s</source>
-        <target xml:space="preserve">Error: Disk space is low for %s</target>
-        <context-group purpose="location"><context context-type="linenumber">256</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">257</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg1245" approved="yes">
+      <trans-unit id="_msg1308">
         <source xml:space="preserve">Error: Dumpfile checksum does not match. Computed %s, expected %s</source>
-        <target xml:space="preserve">Error: Dumpfile checksum does not match. Computed %s, expected %s</target>
-        <context-group purpose="location"><context context-type="linenumber">257</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">258</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg1246" approved="yes">
+      <trans-unit id="_msg1309">
         <source xml:space="preserve">Error: Got key that was not hex: %s</source>
-        <target xml:space="preserve">Error: Got key that was not hex: %s</target>
-        <context-group purpose="location"><context context-type="linenumber">258</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">259</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg1247" approved="yes">
+      <trans-unit id="_msg1310">
         <source xml:space="preserve">Error: Got value that was not hex: %s</source>
-        <target xml:space="preserve">Error: Got value that was not hex: %s</target>
-        <context-group purpose="location"><context context-type="linenumber">259</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">260</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg1248" approved="yes">
+      <trans-unit id="_msg1311">
         <source xml:space="preserve">Error: Keypool ran out, please call keypoolrefill first</source>
-        <target xml:space="preserve">Error: Keypool ran out, please call keypoolrefill first</target>
-        <context-group purpose="location"><context context-type="linenumber">260</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">261</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg1249" approved="yes">
+      <trans-unit id="_msg1312">
         <source xml:space="preserve">Error: No addresses available.</source>
-        <target xml:space="preserve">Error: No addresses available.</target>
-        <context-group purpose="location"><context context-type="linenumber">262</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg1250" approved="yes">
-        <source xml:space="preserve">Exceeded max tries.</source>
-        <target xml:space="preserve">Exceeded max tries.</target>
-        <context-group purpose="location"><context context-type="linenumber">265</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">263</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg1251" approved="yes">
+      <trans-unit id="_msg1313">
         <source xml:space="preserve">Failed to create backup %s!</source>
-        <target xml:space="preserve">Failed to create backup %s!</target>
         <context-group purpose="location"><context context-type="linenumber">270</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg1252" approved="yes">
+      <trans-unit id="_msg1314">
         <source xml:space="preserve">Failed to create backup, error: %s</source>
-        <target xml:space="preserve">Failed to create backup, error: %s</target>
         <context-group purpose="location"><context context-type="linenumber">271</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg1253" approved="yes">
+      <trans-unit id="_msg1315">
         <source xml:space="preserve">Failed to delete backup, error: %s</source>
-        <target xml:space="preserve">Failed to delete backup, error: %s</target>
         <context-group purpose="location"><context context-type="linenumber">272</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg1254" approved="yes">
+      <trans-unit id="_msg1316">
         <source xml:space="preserve">Failed to rescan the wallet during initialization</source>
-        <target xml:space="preserve">Failed to rescan the wallet during initialization</target>
         <context-group purpose="location"><context context-type="linenumber">279</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg1255" approved="yes">
+      <trans-unit id="_msg1317">
         <source xml:space="preserve">Failed to verify database</source>
-        <target xml:space="preserve">Failed to verify database</target>
-        <context-group purpose="location"><context context-type="linenumber">281</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">282</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg1256" approved="yes">
+      <trans-unit id="_msg1318">
         <source xml:space="preserve">Fee rate (%s) is lower than the minimum fee rate setting (%s)</source>
-        <target xml:space="preserve">Fee rate (%s) is lower than the minimum fee rate setting (%s)</target>
-        <context-group purpose="location"><context context-type="linenumber">282</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">284</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg1257" approved="yes">
+      <trans-unit id="_msg1319">
         <source xml:space="preserve">Found enough users, signing…</source>
-        <target xml:space="preserve">Found enough users, signing…</target>
-        <context-group purpose="location"><context context-type="linenumber">284</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">286</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg1258" approved="yes">
+      <trans-unit id="_msg1320">
         <source xml:space="preserve">Ignoring duplicate -wallet %s.</source>
-        <target xml:space="preserve">Ignoring duplicate -wallet %s.</target>
-        <context-group purpose="location"><context context-type="linenumber">285</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">288</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg1259" approved="yes">
+      <trans-unit id="_msg1321">
         <source xml:space="preserve">Input not found or already spent</source>
-        <target xml:space="preserve">Input not found or already spent</target>
-        <context-group purpose="location"><context context-type="linenumber">293</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">296</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg1260" approved="yes">
+      <trans-unit id="_msg1322">
         <source xml:space="preserve">Invalid P2P permission: &apos;%s&apos;</source>
-        <target xml:space="preserve">Invalid P2P permission: &apos;%s&apos;</target>
-        <context-group purpose="location"><context context-type="linenumber">300</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg1261" approved="yes">
-        <source xml:space="preserve">Invalid amount for -fallbackfee=&lt;amount&gt;: &apos;%s&apos;</source>
-        <target xml:space="preserve">Invalid amount for -fallbackfee=&lt;amount&gt;: &apos;%s&apos;</target>
         <context-group purpose="location"><context context-type="linenumber">303</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg1262" approved="yes">
+      <trans-unit id="_msg1323">
         <source xml:space="preserve">Invalid masternodeblsprivkey. Please see documentation.</source>
-        <target xml:space="preserve">Invalid masternodeblsprivkey. Please see documentation.</target>
-        <context-group purpose="location"><context context-type="linenumber">305</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">307</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg1263" approved="yes">
+      <trans-unit id="_msg1324">
         <source xml:space="preserve">Masternode queue is full.</source>
-        <target xml:space="preserve">Masternode queue is full.</target>
-        <context-group purpose="location"><context context-type="linenumber">318</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">321</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg1264" approved="yes">
+      <trans-unit id="_msg1325">
         <source xml:space="preserve">Masternode:</source>
-        <target xml:space="preserve">Masternode:</target>
-        <context-group purpose="location"><context context-type="linenumber">319</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">322</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg1265" approved="yes">
+      <trans-unit id="_msg1326">
         <source xml:space="preserve">Missing input transaction information.</source>
-        <target xml:space="preserve">Missing input transaction information.</target>
-        <context-group purpose="location"><context context-type="linenumber">320</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">323</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg1266" approved="yes">
+      <trans-unit id="_msg1327">
         <source xml:space="preserve">Mixing in progress…</source>
-        <target xml:space="preserve">Mixing in progress…</target>
-        <context-group purpose="location"><context context-type="linenumber">321</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">325</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg1267" approved="yes">
+      <trans-unit id="_msg1328">
         <source xml:space="preserve">No addresses available</source>
-        <target xml:space="preserve">No addresses available</target>
-        <context-group purpose="location"><context context-type="linenumber">324</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">328</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg1268" approved="yes">
+      <trans-unit id="_msg1329">
         <source xml:space="preserve">No errors detected.</source>
-        <target xml:space="preserve">No errors detected.</target>
-        <context-group purpose="location"><context context-type="linenumber">326</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">330</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg1269" approved="yes">
+      <trans-unit id="_msg1330">
         <source xml:space="preserve">No matching denominations found for mixing.</source>
-        <target xml:space="preserve">No matching denominations found for mixing.</target>
-        <context-group purpose="location"><context context-type="linenumber">327</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">333</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg1270" approved="yes">
+      <trans-unit id="_msg1331">
         <source xml:space="preserve">Not compatible with existing transactions.</source>
-        <target xml:space="preserve">Not compatible with existing transactions.</target>
-        <context-group purpose="location"><context context-type="linenumber">328</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">335</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg1271" approved="yes">
+      <trans-unit id="_msg1332">
         <source xml:space="preserve">Not enough file descriptors available.</source>
-        <target xml:space="preserve">Not enough file descriptors available.</target>
-        <context-group purpose="location"><context context-type="linenumber">329</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">336</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg1272" approved="yes">
+      <trans-unit id="_msg1333">
         <source xml:space="preserve">Prune cannot be configured with a negative value.</source>
-        <target xml:space="preserve">Prune cannot be configured with a negative value.</target>
-        <context-group purpose="location"><context context-type="linenumber">332</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">340</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg1273" approved="yes">
+      <trans-unit id="_msg1334">
         <source xml:space="preserve">Prune mode is incompatible with -disablegovernance=false.</source>
-        <target xml:space="preserve">Prune mode is incompatible with -disablegovernance=false.</target>
-        <context-group purpose="location"><context context-type="linenumber">333</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">341</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg1274" approved="yes">
+      <trans-unit id="_msg1335">
         <source xml:space="preserve">Prune mode is incompatible with -txindex.</source>
-        <target xml:space="preserve">Prune mode is incompatible with -txindex.</target>
-        <context-group purpose="location"><context context-type="linenumber">334</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">342</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg1275" approved="yes">
+      <trans-unit id="_msg1336">
         <source xml:space="preserve">SQLiteDatabase: Failed to execute statement to verify database: %s</source>
-        <target xml:space="preserve">SQLiteDatabase: Failed to execute statement to verify database: %s</target>
-        <context-group purpose="location"><context context-type="linenumber">339</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">347</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg1276" approved="yes">
+      <trans-unit id="_msg1337">
         <source xml:space="preserve">SQLiteDatabase: Failed to prepare statement to verify database: %s</source>
-        <target xml:space="preserve">SQLiteDatabase: Failed to prepare statement to verify database: %s</target>
-        <context-group purpose="location"><context context-type="linenumber">340</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">348</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg1277" approved="yes">
+      <trans-unit id="_msg1338">
         <source xml:space="preserve">SQLiteDatabase: Failed to read database verification error: %s</source>
-        <target xml:space="preserve">SQLiteDatabase: Failed to read database verification error: %s</target>
-        <context-group purpose="location"><context context-type="linenumber">341</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">349</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg1278" approved="yes">
+      <trans-unit id="_msg1339">
         <source xml:space="preserve">SQLiteDatabase: Unexpected application id. Expected %u, got %u</source>
-        <target xml:space="preserve">SQLiteDatabase: Unexpected application id. Expected %u, got %u</target>
-        <context-group purpose="location"><context context-type="linenumber">342</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">350</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg1279" approved="yes">
+      <trans-unit id="_msg1340">
         <source xml:space="preserve">Section [%s] is not recognized.</source>
-        <target xml:space="preserve">Section [%s] is not recognized.</target>
-        <context-group purpose="location"><context context-type="linenumber">343</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">351</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg1280" approved="yes">
+      <trans-unit id="_msg1341">
         <source xml:space="preserve">Specified -walletdir &quot;%s&quot; does not exist</source>
-        <target xml:space="preserve">Specified -walletdir &quot;%s&quot; does not exist</target>
-        <context-group purpose="location"><context context-type="linenumber">347</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">356</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg1281" approved="yes">
+      <trans-unit id="_msg1342">
         <source xml:space="preserve">Specified -walletdir &quot;%s&quot; is a relative path</source>
-        <target xml:space="preserve">Specified -walletdir &quot;%s&quot; is a relative path</target>
-        <context-group purpose="location"><context context-type="linenumber">348</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">357</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg1282" approved="yes">
+      <trans-unit id="_msg1343">
         <source xml:space="preserve">Specified -walletdir &quot;%s&quot; is not a directory</source>
-        <target xml:space="preserve">Specified -walletdir &quot;%s&quot; is not a directory</target>
-        <context-group purpose="location"><context context-type="linenumber">349</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">358</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg1283" approved="yes">
+      <trans-unit id="_msg1344">
         <source xml:space="preserve">The wallet will avoid paying less than the minimum relay fee.</source>
-        <target xml:space="preserve">The wallet will avoid paying less than the minimum relay fee.</target>
-        <context-group purpose="location"><context context-type="linenumber">359</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">368</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg1284" approved="yes">
+      <trans-unit id="_msg1345">
         <source xml:space="preserve">This is expected because you are running a pruned node.</source>
-        <target xml:space="preserve">This is expected because you are running a pruned node.</target>
-        <context-group purpose="location"><context context-type="linenumber">360</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">369</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg1285" approved="yes">
+      <trans-unit id="_msg1346">
         <source xml:space="preserve">This is the minimum transaction fee you pay on every transaction.</source>
-        <target xml:space="preserve">This is the minimum transaction fee you pay on every transaction.</target>
-        <context-group purpose="location"><context context-type="linenumber">362</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">371</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg1286" approved="yes">
+      <trans-unit id="_msg1347">
         <source xml:space="preserve">This is the transaction fee you will pay if you send a transaction.</source>
-        <target xml:space="preserve">This is the transaction fee you will pay if you send a transaction.</target>
-        <context-group purpose="location"><context context-type="linenumber">363</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">372</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg1287" approved="yes">
+      <trans-unit id="_msg1348">
         <source xml:space="preserve">Topping up keypool…</source>
-        <target xml:space="preserve">Topping up keypool…</target>
-        <context-group purpose="location"><context context-type="linenumber">364</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">373</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg1288" approved="yes">
+      <trans-unit id="_msg1349">
         <source xml:space="preserve">Transaction amounts must not be negative</source>
-        <target xml:space="preserve">Transaction amounts must not be negative</target>
-        <context-group purpose="location"><context context-type="linenumber">366</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">375</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg1289" approved="yes">
+      <trans-unit id="_msg1350">
         <source xml:space="preserve">Transaction has too long of a mempool chain</source>
-        <target xml:space="preserve">Transaction has too long of a mempool chain</target>
-        <context-group purpose="location"><context context-type="linenumber">370</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">379</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg1290" approved="yes">
+      <trans-unit id="_msg1351">
         <source xml:space="preserve">Transaction must have at least one recipient</source>
-        <target xml:space="preserve">Transaction must have at least one recipient</target>
-        <context-group purpose="location"><context context-type="linenumber">371</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">380</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg1291" approved="yes">
+      <trans-unit id="_msg1352">
         <source xml:space="preserve">Transaction too large</source>
-        <target xml:space="preserve">Transaction too large</target>
-        <context-group purpose="location"><context context-type="linenumber">373</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">383</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg1292" approved="yes">
+      <trans-unit id="_msg1353">
         <source xml:space="preserve">Unable to bind to %s on this computer. %s is probably already running.</source>
-        <target xml:space="preserve">Unable to bind to %s on this computer. %s is probably already running.</target>
-        <context-group purpose="location"><context context-type="linenumber">376</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">386</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg1293" approved="yes">
+      <trans-unit id="_msg1354">
         <source xml:space="preserve">Unable to create the PID file &apos;%s&apos;: %s</source>
-        <target xml:space="preserve">Unable to create the PID file &apos;%s&apos;: %s</target>
-        <context-group purpose="location"><context context-type="linenumber">377</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">387</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg1294" approved="yes">
+      <trans-unit id="_msg1355">
         <source xml:space="preserve">Unable to generate initial keys</source>
-        <target xml:space="preserve">Unable to generate initial keys</target>
-        <context-group purpose="location"><context context-type="linenumber">378</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">388</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg1295" approved="yes">
+      <trans-unit id="_msg1356">
         <source xml:space="preserve">Unable to open %s for writing</source>
-        <target xml:space="preserve">Unable to open %s for writing</target>
-        <context-group purpose="location"><context context-type="linenumber">381</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg1296" approved="yes">
-        <source xml:space="preserve">Unable to parse -maxuploadtarget: &apos;%s&apos; (possible integer overflow?)</source>
-        <target xml:space="preserve">Unable to parse -maxuploadtarget: &apos;%s&apos; (possible integer overflow?)</target>
-        <context-group purpose="location"><context context-type="linenumber">382</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">392</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg1297" approved="yes">
+      <trans-unit id="_msg1357">
         <source xml:space="preserve">Unknown -blockfilterindex value %s.</source>
-        <target xml:space="preserve">Unknown -blockfilterindex value %s.</target>
-        <context-group purpose="location"><context context-type="linenumber">385</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">397</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg1298" approved="yes">
+      <trans-unit id="_msg1358">
         <source xml:space="preserve">Unknown new rules activated (versionbit %i)</source>
-        <target xml:space="preserve">Unknown new rules activated (versionbit %i)</target>
-        <context-group purpose="location"><context context-type="linenumber">387</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg1299" approved="yes">
-        <source xml:space="preserve">Upgrading UTXO database</source>
-        <target xml:space="preserve">Upgrading UTXO database</target>
-        <context-group purpose="location"><context context-type="linenumber">392</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">399</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg1300" approved="yes">
+      <trans-unit id="_msg1359">
         <source xml:space="preserve">Verifying blocks…</source>
-        <target xml:space="preserve">Verifying blocks…</target>
-        <context-group purpose="location"><context context-type="linenumber">394</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">406</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg1301" approved="yes">
+      <trans-unit id="_msg1360">
         <source xml:space="preserve">Verifying wallet(s)…</source>
-        <target xml:space="preserve">Verifying wallet(s)…</target>
-        <context-group purpose="location"><context context-type="linenumber">395</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">407</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg1302" approved="yes">
+      <trans-unit id="_msg1361">
         <source xml:space="preserve">Wallet needed to be rewritten: restart %s to complete</source>
-        <target xml:space="preserve">Wallet needed to be rewritten: restart %s to complete</target>
-        <context-group purpose="location"><context context-type="linenumber">398</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">410</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg1303" approved="yes">
+      <trans-unit id="_msg1362">
         <source xml:space="preserve">Wasn&apos;t able to create wallet backup folder %s!</source>
-        <target xml:space="preserve">Wasn&apos;t able to create wallet backup folder %s!</target>
-        <context-group purpose="location"><context context-type="linenumber">401</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">413</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg1304" approved="yes">
+      <trans-unit id="_msg1363">
         <source xml:space="preserve">Wiping wallet transactions…</source>
-        <target xml:space="preserve">Wiping wallet transactions…</target>
-        <context-group purpose="location"><context context-type="linenumber">403</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">415</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg1305" approved="yes">
+      <trans-unit id="_msg1364">
         <source xml:space="preserve">You can not start a masternode with wallet enabled.</source>
-        <target xml:space="preserve">You can not start a masternode with wallet enabled.</target>
-        <context-group purpose="location"><context context-type="linenumber">406</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">418</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg1306" approved="yes">
+      <trans-unit id="_msg1365">
         <source xml:space="preserve">no mixing available.</source>
-        <target xml:space="preserve">no mixing available.</target>
-        <context-group purpose="location"><context context-type="linenumber">410</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">422</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg1307" approved="yes">
+      <trans-unit id="_msg1366">
         <source xml:space="preserve">see debug.log for details.</source>
-        <target xml:space="preserve">see debug.log for details.</target>
-        <context-group purpose="location"><context context-type="linenumber">411</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">423</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg1308" approved="yes">
+      <trans-unit id="_msg1367">
         <source xml:space="preserve">The %s developers</source>
-        <target xml:space="preserve">The %s developers</target>
         <context-group purpose="location"><context context-type="linenumber">12</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg1309" approved="yes">
+      <trans-unit id="_msg1368">
         <source xml:space="preserve">%s uses exact denominated amounts to send funds, you might simply need to mix some more coins.</source>
-        <target xml:space="preserve">%s uses exact denominated amounts to send funds, you might simply need to mix some more coins.</target>
-        <context-group purpose="location"><context context-type="linenumber">23</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">25</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg1310" approved="yes">
+      <trans-unit id="_msg1369">
         <source xml:space="preserve">-reindex-chainstate option is not compatible with -blockfilterindex. Please temporarily disable blockfilterindex while using -reindex-chainstate, or replace -reindex-chainstate with -reindex to fully rebuild all indexes.</source>
-        <target xml:space="preserve">-reindex-chainstate option is not compatible with -blockfilterindex. Please temporarily disable blockfilterindex while using -reindex-chainstate, or replace -reindex-chainstate with -reindex to fully rebuild all indexes.</target>
-        <context-group purpose="location"><context context-type="linenumber">29</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">28</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg1311" approved="yes">
+      <trans-unit id="_msg1370">
         <source xml:space="preserve">-reindex-chainstate option is not compatible with -coinstatsindex. Please temporarily disable coinstatsindex while using -reindex-chainstate, or replace -reindex-chainstate with -reindex to fully rebuild all indexes.</source>
-        <target xml:space="preserve">-reindex-chainstate option is not compatible with -coinstatsindex. Please temporarily disable coinstatsindex while using -reindex-chainstate, or replace -reindex-chainstate with -reindex to fully rebuild all indexes.</target>
-        <context-group purpose="location"><context context-type="linenumber">33</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">32</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg1312" approved="yes">
+      <trans-unit id="_msg1371">
         <source xml:space="preserve">-reindex-chainstate option is not compatible with -txindex. Please temporarily disable txindex while using -reindex-chainstate, or replace -reindex-chainstate with -reindex to fully rebuild all indexes.</source>
-        <target xml:space="preserve">-reindex-chainstate option is not compatible with -txindex. Please temporarily disable txindex while using -reindex-chainstate, or replace -reindex-chainstate with -reindex to fully rebuild all indexes.</target>
-        <context-group purpose="location"><context context-type="linenumber">37</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">36</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg1313" approved="yes">
+      <trans-unit id="_msg1372">
         <source xml:space="preserve">Cannot downgrade wallet from version %i to version %i. Wallet version unchanged.</source>
-        <target xml:space="preserve">Cannot downgrade wallet from version %i to version %i. Wallet version unchanged.</target>
-        <context-group purpose="location"><context context-type="linenumber">41</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">40</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg1314" approved="yes">
+      <trans-unit id="_msg1373">
         <source xml:space="preserve">Cannot obtain a lock on data directory %s. %s is probably already running.</source>
-        <target xml:space="preserve">Cannot obtain a lock on data directory %s. %s is probably already running.</target>
-        <context-group purpose="location"><context context-type="linenumber">44</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg1315" approved="yes">
-        <source xml:space="preserve">Cannot upgrade a non HD wallet from version %i to version %i which is non-HD wallet. Use upgradetohd RPC</source>
-        <target xml:space="preserve">Cannot upgrade a non HD wallet from version %i to version %i which is non-HD wallet. Use upgradetohd RPC</target>
-        <context-group purpose="location"><context context-type="linenumber">49</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">43</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg1316" approved="yes">
+      <trans-unit id="_msg1374">
         <source xml:space="preserve">Distributed under the MIT software license, see the accompanying file %s or %s</source>
-        <target xml:space="preserve">Distributed under the MIT software license, see the accompanying file %s or %s</target>
-        <context-group purpose="location"><context context-type="linenumber">52</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">48</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg1317" approved="yes">
+      <trans-unit id="_msg1375">
         <source xml:space="preserve">Error loading %s: You can&apos;t enable HD on an already existing non-HD wallet</source>
-        <target xml:space="preserve">Error loading %s: You can&apos;t enable HD on an already existing non-HD wallet</target>
-        <context-group purpose="location"><context context-type="linenumber">55</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">51</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg1318" approved="yes">
+      <trans-unit id="_msg1376">
         <source xml:space="preserve">Error loading wallet. Wallet requires blocks to be downloaded, and software does not currently support loading wallets while blocks are being downloaded out of order when using assumeutxo snapshots. Wallet should be able to load successfully after node sync reaches height %s</source>
-        <target xml:space="preserve">Error loading wallet. Wallet requires blocks to be downloaded, and software does not currently support loading wallets while blocks are being downloaded out of order when using assumeutxo snapshots. Wallet should be able to load successfully after node sync reaches height %s</target>
-        <context-group purpose="location"><context context-type="linenumber">57</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">53</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg1319" approved="yes">
+      <trans-unit id="_msg1377">
         <source xml:space="preserve">Error reading %s! All keys read correctly, but transaction data or address book entries might be missing or incorrect.</source>
-        <target xml:space="preserve">Error reading %s! All keys read correctly, but transaction data or address book entries might be missing or incorrect.</target>
-        <context-group purpose="location"><context context-type="linenumber">62</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">58</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg1320" approved="yes">
+      <trans-unit id="_msg1378">
         <source xml:space="preserve">Error: Dumpfile format record is incorrect. Got &quot;%s&quot;, expected &quot;format&quot;.</source>
-        <target xml:space="preserve">Error: Dumpfile format record is incorrect. Got &quot;%s&quot;, expected &quot;format&quot;.</target>
-        <context-group purpose="location"><context context-type="linenumber">65</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">61</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg1321" approved="yes">
+      <trans-unit id="_msg1379">
         <source xml:space="preserve">Error: Dumpfile identifier record is incorrect. Got &quot;%s&quot;, expected &quot;%s&quot;.</source>
-        <target xml:space="preserve">Error: Dumpfile identifier record is incorrect. Got &quot;%s&quot;, expected &quot;%s&quot;.</target>
-        <context-group purpose="location"><context context-type="linenumber">67</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">63</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg1322" approved="yes">
+      <trans-unit id="_msg1380">
         <source xml:space="preserve">Error: Dumpfile version is not supported. This version of bitcoin-wallet only supports version 1 dumpfiles. Got dumpfile with version %s</source>
-        <target xml:space="preserve">Error: Dumpfile version is not supported. This version of bitcoin-wallet only supports version 1 dumpfiles. Got dumpfile with version %s</target>
-        <context-group purpose="location"><context context-type="linenumber">69</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">65</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg1323" approved="yes">
+      <trans-unit id="_msg1381">
         <source xml:space="preserve">Failed to rename invalid peers.dat file. Please move or delete it and try again.</source>
-        <target xml:space="preserve">Failed to rename invalid peers.dat file. Please move or delete it and try again.</target>
-        <context-group purpose="location"><context context-type="linenumber">76</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">72</context></context-group>
+      </trans-unit>
+      <trans-unit id="_msg1382">
+        <source xml:space="preserve">Fee estimation failed. Fallbackfee is disabled. Wait a few blocks or enable %s.</source>
+        <context-group purpose="location"><context context-type="linenumber">75</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg1324" approved="yes">
+      <trans-unit id="_msg1383">
         <source xml:space="preserve">File %s already exists. If you are sure this is what you want, move it out of the way first.</source>
-        <target xml:space="preserve">File %s already exists. If you are sure this is what you want, move it out of the way first.</target>
-        <context-group purpose="location"><context context-type="linenumber">82</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">78</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg1325" approved="yes">
+      <trans-unit id="_msg1384">
         <source xml:space="preserve">Incompatible options: -dnsseed=1 was explicitly specified, but -onlynet forbids connections to IPv4/IPv6</source>
-        <target xml:space="preserve">Incompatible options: -dnsseed=1 was explicitly specified, but -onlynet forbids connections to IPv4/IPv6</target>
-        <context-group purpose="location"><context context-type="linenumber">88</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">84</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg1326" approved="yes">
+      <trans-unit id="_msg1385">
         <source xml:space="preserve">Incorrect or no devnet genesis block found. Wrong datadir for devnet specified?</source>
-        <target xml:space="preserve">Incorrect or no devnet genesis block found. Wrong datadir for devnet specified?</target>
-        <context-group purpose="location"><context context-type="linenumber">91</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">87</context></context-group>
+      </trans-unit>
+      <trans-unit id="_msg1386">
+        <source xml:space="preserve">Invalid amount for %s=&lt;amount&gt;: &apos;%s&apos; (must be at least the minrelay fee of %s to prevent stuck transactions)</source>
+        <context-group purpose="location"><context context-type="linenumber">92</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg1327" approved="yes">
+      <trans-unit id="_msg1387">
         <source xml:space="preserve">Invalid or corrupt peers.dat (%s). If you believe this is a bug, please report it to %s. As a workaround, you can move the file (%s) out of the way (rename, move, or delete) to have a new one created on the next start.</source>
-        <target xml:space="preserve">Invalid or corrupt peers.dat (%s). If you believe this is a bug, please report it to %s. As a workaround, you can move the file (%s) out of the way (rename, move, or delete) to have a new one created on the next start.</target>
-        <context-group purpose="location"><context context-type="linenumber">99</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">95</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg1328" approved="yes">
+      <trans-unit id="_msg1388">
         <source xml:space="preserve">No dump file provided. To use createfromdump, -dumpfile=&lt;filename&gt; must be provided.</source>
-        <target xml:space="preserve">No dump file provided. To use createfromdump, -dumpfile=&lt;filename&gt; must be provided.</target>
-        <context-group purpose="location"><context context-type="linenumber">109</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">105</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg1329" approved="yes">
+      <trans-unit id="_msg1389">
         <source xml:space="preserve">No dump file provided. To use dump, -dumpfile=&lt;filename&gt; must be provided.</source>
-        <target xml:space="preserve">No dump file provided. To use dump, -dumpfile=&lt;filename&gt; must be provided.</target>
-        <context-group purpose="location"><context context-type="linenumber">112</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">108</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg1330" approved="yes">
+      <trans-unit id="_msg1390">
         <source xml:space="preserve">No wallet file format provided. To use createfromdump, -format=&lt;format&gt; must be provided.</source>
-        <target xml:space="preserve">No wallet file format provided. To use createfromdump, -format=&lt;format&gt; must be provided.</target>
-        <context-group purpose="location"><context context-type="linenumber">114</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">110</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg1331" approved="yes">
+      <trans-unit id="_msg1391">
+        <source xml:space="preserve">Outbound connections restricted to CJDNS (-onlynet=cjdns) but -cjdnsreachable is not provided</source>
+        <context-group purpose="location"><context context-type="linenumber">113</context></context-group>
+      </trans-unit>
+      <trans-unit id="_msg1392">
         <source xml:space="preserve">Outbound connections restricted to Tor (-onlynet=onion) but the proxy for reaching the Tor network is explicitly forbidden: -onion=0</source>
-        <target xml:space="preserve">Outbound connections restricted to Tor (-onlynet=onion) but the proxy for reaching the Tor network is explicitly forbidden: -onion=0</target>
-        <context-group purpose="location"><context context-type="linenumber">117</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">116</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg1332" approved="yes">
+      <trans-unit id="_msg1393">
         <source xml:space="preserve">Outbound connections restricted to Tor (-onlynet=onion) but the proxy for reaching the Tor network is not provided: none of -proxy, -onion or -listenonion is given</source>
-        <target xml:space="preserve">Outbound connections restricted to Tor (-onlynet=onion) but the proxy for reaching the Tor network is not provided: none of -proxy, -onion or -listenonion is given</target>
-        <context-group purpose="location"><context context-type="linenumber">120</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">119</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg1333" approved="yes">
+      <trans-unit id="_msg1394">
+        <source xml:space="preserve">Outbound connections restricted to i2p (-onlynet=i2p) but -i2psam is not provided</source>
+        <context-group purpose="location"><context context-type="linenumber">123</context></context-group>
+      </trans-unit>
+      <trans-unit id="_msg1395">
         <source xml:space="preserve">Please check that your computer&apos;s date and time are correct! If your clock is wrong, %s will not work properly.</source>
-        <target xml:space="preserve">Please check that your computer&apos;s date and time are correct! If your clock is wrong, %s will not work properly.</target>
-        <context-group purpose="location"><context context-type="linenumber">124</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">126</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg1334" approved="yes">
+      <trans-unit id="_msg1396">
         <source xml:space="preserve">Please contribute if you find %s useful. Visit %s for further information about the software.</source>
-        <target xml:space="preserve">Please contribute if you find %s useful. Visit %s for further information about the software.</target>
-        <context-group purpose="location"><context context-type="linenumber">127</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">129</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg1335" approved="yes">
+      <trans-unit id="_msg1397">
         <source xml:space="preserve">Prune mode is incompatible with -reindex-chainstate. Use full -reindex instead.</source>
-        <target xml:space="preserve">Prune mode is incompatible with -reindex-chainstate. Use full -reindex instead.</target>
-        <context-group purpose="location"><context context-type="linenumber">132</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg1336" approved="yes">
-        <source xml:space="preserve">The block index db contains a legacy &apos;txindex&apos;. To clear the occupied disk space, run a full -reindex, otherwise ignore this error. This error message will not be displayed again.</source>
-        <target xml:space="preserve">The block index db contains a legacy &apos;txindex&apos;. To clear the occupied disk space, run a full -reindex, otherwise ignore this error. This error message will not be displayed again.</target>
-        <context-group purpose="location"><context context-type="linenumber">149</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">134</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg1337" approved="yes">
+      <trans-unit id="_msg1398">
         <source xml:space="preserve">This is the maximum transaction fee you pay (in addition to the normal fee) to prioritize partial spend avoidance over regular coin selection.</source>
-        <target xml:space="preserve">This is the maximum transaction fee you pay (in addition to the normal fee) to prioritize partial spend avoidance over regular coin selection.</target>
-        <context-group purpose="location"><context context-type="linenumber">162</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">157</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg1338" approved="yes">
+      <trans-unit id="_msg1399">
         <source xml:space="preserve">This is the transaction fee you may discard if change is smaller than dust at this level</source>
-        <target xml:space="preserve">This is the transaction fee you may discard if change is smaller than dust at this level</target>
-        <context-group purpose="location"><context context-type="linenumber">165</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">160</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg1339" approved="yes">
+      <trans-unit id="_msg1400">
         <source xml:space="preserve">This is the transaction fee you may pay when fee estimates are not available.</source>
-        <target xml:space="preserve">This is the transaction fee you may pay when fee estimates are not available.</target>
-        <context-group purpose="location"><context context-type="linenumber">168</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">163</context></context-group>
+      </trans-unit>
+      <trans-unit id="_msg1401">
+        <source xml:space="preserve">Transaction requires one destination of non-0 value, a non-0 feerate, or a pre-selected input</source>
+        <context-group purpose="location"><context context-type="linenumber">172</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg1340" approved="yes">
+      <trans-unit id="_msg1402">
         <source xml:space="preserve">Unable to replay blocks. You will need to rebuild the database using -reindex-chainstate.</source>
-        <target xml:space="preserve">Unable to replay blocks. You will need to rebuild the database using -reindex-chainstate.</target>
-        <context-group purpose="location"><context context-type="linenumber">180</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">175</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg1341" approved="yes">
+      <trans-unit id="_msg1403">
         <source xml:space="preserve">Unknown wallet file format &quot;%s&quot; provided. Please provide one of &quot;bdb&quot; or &quot;sqlite&quot;.</source>
-        <target xml:space="preserve">Unknown wallet file format &quot;%s&quot; provided. Please provide one of &quot;bdb&quot; or &quot;sqlite&quot;.</target>
-        <context-group purpose="location"><context context-type="linenumber">183</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">178</context></context-group>
+      </trans-unit>
+      <trans-unit id="_msg1404">
+        <source xml:space="preserve">Unsupported chainstate database format found. Please restart with -reindex-chainstate. This will rebuild the chainstate database.</source>
+        <context-group purpose="location"><context context-type="linenumber">184</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg1342" approved="yes">
+      <trans-unit id="_msg1405">
         <source xml:space="preserve">Warning: Dumpfile wallet format &quot;%s&quot; does not match command line specified format &quot;%s&quot;.</source>
-        <target xml:space="preserve">Warning: Dumpfile wallet format &quot;%s&quot; does not match command line specified format &quot;%s&quot;.</target>
-        <context-group purpose="location"><context context-type="linenumber">194</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">192</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg1343" approved="yes">
+      <trans-unit id="_msg1406">
         <source xml:space="preserve">Warning: Private keys detected in wallet {%s} with disabled private keys</source>
-        <target xml:space="preserve">Warning: Private keys detected in wallet {%s} with disabled private keys</target>
-        <context-group purpose="location"><context context-type="linenumber">197</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">195</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg1344" approved="yes">
+      <trans-unit id="_msg1407">
         <source xml:space="preserve">You need to rebuild the database using -reindex to enable -timestampindex</source>
-        <target xml:space="preserve">You need to rebuild the database using -reindex to enable -timestampindex</target>
-        <context-group purpose="location"><context context-type="linenumber">202</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">200</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg1345" approved="yes">
+      <trans-unit id="_msg1408">
         <source xml:space="preserve">%s -- Incorrect seed, it should be a hex string</source>
-        <target xml:space="preserve">%s -- Incorrect seed, it should be a hex string</target>
-        <context-group purpose="location"><context context-type="linenumber">207</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">205</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg1346" approved="yes">
+      <trans-unit id="_msg1409">
         <source xml:space="preserve">%s is not a valid backup folder!</source>
-        <target xml:space="preserve">%s is not a valid backup folder!</target>
-        <context-group purpose="location"><context context-type="linenumber">211</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">209</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg1347" approved="yes">
+      <trans-unit id="_msg1410">
         <source xml:space="preserve">%s is set very high!</source>
-        <target xml:space="preserve">%s is set very high!</target>
-        <context-group purpose="location"><context context-type="linenumber">212</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">210</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg1348" approved="yes">
+      <trans-unit id="_msg1411">
         <source xml:space="preserve">%s request incomplete:</source>
-        <target xml:space="preserve">%s request incomplete:</target>
-        <context-group purpose="location"><context context-type="linenumber">213</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">211</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg1349" approved="yes">
+      <trans-unit id="_msg1412">
         <source xml:space="preserve">-devnet can only be specified once</source>
-        <target xml:space="preserve">-devnet can only be specified once</target>
-        <context-group purpose="location"><context context-type="linenumber">214</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">212</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg1350" approved="yes">
+      <trans-unit id="_msg1413">
         <source xml:space="preserve">-port must be specified when -devnet and -listen are specified</source>
-        <target xml:space="preserve">-port must be specified when -devnet and -listen are specified</target>
-        <context-group purpose="location"><context context-type="linenumber">216</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">214</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg1351" approved="yes">
+      <trans-unit id="_msg1414">
         <source xml:space="preserve">-rpcport must be specified when -devnet and -server are specified</source>
-        <target xml:space="preserve">-rpcport must be specified when -devnet and -server are specified</target>
+        <context-group purpose="location"><context context-type="linenumber">215</context></context-group>
+      </trans-unit>
+      <trans-unit id="_msg1415">
+        <source xml:space="preserve">-statsbatchsize cannot be configured with a negative value.</source>
+        <context-group purpose="location"><context context-type="linenumber">216</context></context-group>
+      </trans-unit>
+      <trans-unit id="_msg1416">
+        <source xml:space="preserve">-statsduration cannot be configured with a negative value.</source>
         <context-group purpose="location"><context context-type="linenumber">217</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg1352" approved="yes">
+      <trans-unit id="_msg1417">
         <source xml:space="preserve">A fatal internal error occurred, see debug.log for details</source>
-        <target xml:space="preserve">A fatal internal error occurred, see debug.log for details</target>
         <context-group purpose="location"><context context-type="linenumber">218</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg1353" approved="yes">
-        <source xml:space="preserve">Cannot resolve -%s address: &apos;%s&apos;</source>
-        <target xml:space="preserve">Cannot resolve -%s address: &apos;%s&apos;</target>
+      <trans-unit id="_msg1418">
+        <source xml:space="preserve">Cannot create socket (socket() returned error %s)</source>
         <context-group purpose="location"><context context-type="linenumber">224</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg1354" approved="yes">
-        <source xml:space="preserve">Cannot write to data directory &apos;%s&apos;; check permissions.</source>
-        <target xml:space="preserve">Cannot write to data directory &apos;%s&apos;; check permissions.</target>
+      <trans-unit id="_msg1419">
+        <source xml:space="preserve">Cannot get socket address for %s</source>
+        <context-group purpose="location"><context context-type="linenumber">225</context></context-group>
+      </trans-unit>
+      <trans-unit id="_msg1420">
+        <source xml:space="preserve">Cannot init Statsd client</source>
         <context-group purpose="location"><context context-type="linenumber">226</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg1355" approved="yes">
-        <source xml:space="preserve">Copyright (C)</source>
-        <target xml:space="preserve">Copyright (C)</target>
+      <trans-unit id="_msg1421">
+        <source xml:space="preserve">Cannot resolve -%s address: &apos;%s&apos;</source>
+        <context-group purpose="location"><context context-type="linenumber">227</context></context-group>
+      </trans-unit>
+      <trans-unit id="_msg1422">
+        <source xml:space="preserve">Cannot write to data directory &apos;%s&apos;; check permissions.</source>
         <context-group purpose="location"><context context-type="linenumber">229</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg1356" approved="yes">
+      <trans-unit id="_msg1423">
+        <source xml:space="preserve">Copyright (C)</source>
+        <context-group purpose="location"><context context-type="linenumber">232</context></context-group>
+      </trans-unit>
+      <trans-unit id="_msg1424">
         <source xml:space="preserve">Disk space is too low!</source>
-        <target xml:space="preserve">Disk space is too low!</target>
-        <context-group purpose="location"><context context-type="linenumber">233</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">236</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg1357" approved="yes">
+      <trans-unit id="_msg1425">
         <source xml:space="preserve">Dump file %s does not exist.</source>
-        <target xml:space="preserve">Dump file %s does not exist.</target>
-        <context-group purpose="location"><context context-type="linenumber">236</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">239</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg1358" approved="yes">
+      <trans-unit id="_msg1426">
         <source xml:space="preserve">Error creating %s</source>
-        <target xml:space="preserve">Error creating %s</target>
-        <context-group purpose="location"><context context-type="linenumber">240</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">243</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg1359" approved="yes">
+      <trans-unit id="_msg1427">
         <source xml:space="preserve">Error loading %s</source>
-        <target xml:space="preserve">Error loading %s</target>
-        <context-group purpose="location"><context context-type="linenumber">243</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">246</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg1360" approved="yes">
+      <trans-unit id="_msg1428">
         <source xml:space="preserve">Error loading %s: Wallet corrupted</source>
-        <target xml:space="preserve">Error loading %s: Wallet corrupted</target>
-        <context-group purpose="location"><context context-type="linenumber">245</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">248</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg1361" approved="yes">
+      <trans-unit id="_msg1429">
         <source xml:space="preserve">Error loading %s: Wallet requires newer version of %s</source>
-        <target xml:space="preserve">Error loading %s: Wallet requires newer version of %s</target>
-        <context-group purpose="location"><context context-type="linenumber">246</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">249</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg1362" approved="yes">
+      <trans-unit id="_msg1430">
         <source xml:space="preserve">Error loading %s: You can&apos;t disable HD on an already existing HD wallet</source>
-        <target xml:space="preserve">Error loading %s: You can&apos;t disable HD on an already existing HD wallet</target>
-        <context-group purpose="location"><context context-type="linenumber">247</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">250</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg1363" approved="yes">
+      <trans-unit id="_msg1431">
         <source xml:space="preserve">Error reading next record from wallet database</source>
-        <target xml:space="preserve">Error reading next record from wallet database</target>
-        <context-group purpose="location"><context context-type="linenumber">251</context></context-group>
-      </trans-unit>
-      <trans-unit id="_msg1364" approved="yes">
-        <source xml:space="preserve">Error upgrading chainstate database</source>
-        <target xml:space="preserve">Error upgrading chainstate database</target>
-        <context-group purpose="location"><context context-type="linenumber">253</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">254</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg1365" approved="yes">
+      <trans-unit id="_msg1432">
         <source xml:space="preserve">Loading P2P addresses…</source>
-        <target xml:space="preserve">Loading P2P addresses…</target>
-        <context-group purpose="location"><context context-type="linenumber">313</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">316</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg1366" approved="yes">
+      <trans-unit id="_msg1433">
         <source xml:space="preserve">Loading banlist…</source>
-        <target xml:space="preserve">Loading banlist…</target>
-        <context-group purpose="location"><context context-type="linenumber">314</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">317</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg1367" approved="yes">
+      <trans-unit id="_msg1434">
         <source xml:space="preserve">Loading block index…</source>
-        <target xml:space="preserve">Loading block index…</target>
-        <context-group purpose="location"><context context-type="linenumber">315</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">318</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg1368" approved="yes">
+      <trans-unit id="_msg1435">
         <source xml:space="preserve">Loading wallet…</source>
-        <target xml:space="preserve">Loading wallet…</target>
-        <context-group purpose="location"><context context-type="linenumber">316</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">319</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg1369" approved="yes">
+      <trans-unit id="_msg1436">
         <source xml:space="preserve">Failed to clear fulfilled requests cache at %s</source>
-        <target xml:space="preserve">Failed to clear fulfilled requests cache at %s</target>
         <context-group purpose="location"><context context-type="linenumber">266</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg1370" approved="yes">
+      <trans-unit id="_msg1437">
         <source xml:space="preserve">Failed to clear governance cache at %s</source>
-        <target xml:space="preserve">Failed to clear governance cache at %s</target>
         <context-group purpose="location"><context context-type="linenumber">267</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg1371" approved="yes">
+      <trans-unit id="_msg1438">
         <source xml:space="preserve">Failed to clear masternode cache at %s</source>
-        <target xml:space="preserve">Failed to clear masternode cache at %s</target>
         <context-group purpose="location"><context context-type="linenumber">268</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg1372" approved="yes">
+      <trans-unit id="_msg1439">
         <source xml:space="preserve">Failed to find mixing queue to join</source>
-        <target xml:space="preserve">Failed to find mixing queue to join</target>
         <context-group purpose="location"><context context-type="linenumber">273</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg1373" approved="yes">
+      <trans-unit id="_msg1440">
         <source xml:space="preserve">Failed to load fulfilled requests cache from %s</source>
-        <target xml:space="preserve">Failed to load fulfilled requests cache from %s</target>
         <context-group purpose="location"><context context-type="linenumber">275</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg1374" approved="yes">
+      <trans-unit id="_msg1441">
         <source xml:space="preserve">Failed to load governance cache from %s</source>
-        <target xml:space="preserve">Failed to load governance cache from %s</target>
         <context-group purpose="location"><context context-type="linenumber">276</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg1375" approved="yes">
+      <trans-unit id="_msg1442">
         <source xml:space="preserve">Failed to load masternode cache from %s</source>
-        <target xml:space="preserve">Failed to load masternode cache from %s</target>
         <context-group purpose="location"><context context-type="linenumber">277</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg1376" approved="yes">
+      <trans-unit id="_msg1443">
         <source xml:space="preserve">Failed to load sporks cache from %s</source>
-        <target xml:space="preserve">Failed to load sporks cache from %s</target>
         <context-group purpose="location"><context context-type="linenumber">278</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg1377" approved="yes">
+      <trans-unit id="_msg1444">
         <source xml:space="preserve">Failed to start a new mixing queue</source>
-        <target xml:space="preserve">Failed to start a new mixing queue</target>
         <context-group purpose="location"><context context-type="linenumber">280</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg1378" approved="yes">
+      <trans-unit id="_msg1445">
         <source xml:space="preserve">Importing…</source>
-        <target xml:space="preserve">Importing…</target>
-        <context-group purpose="location"><context context-type="linenumber">286</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">289</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg1379" approved="yes">
+      <trans-unit id="_msg1446">
         <source xml:space="preserve">Incorrect -rescan mode, falling back to default value</source>
-        <target xml:space="preserve">Incorrect -rescan mode, falling back to default value</target>
-        <context-group purpose="location"><context context-type="linenumber">289</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">292</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg1380" approved="yes">
+      <trans-unit id="_msg1447">
         <source xml:space="preserve">Initialization sanity check failed. %s is shutting down.</source>
-        <target xml:space="preserve">Initialization sanity check failed. %s is shutting down.</target>
-        <context-group purpose="location"><context context-type="linenumber">291</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">294</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg1381" approved="yes">
+      <trans-unit id="_msg1448">
         <source xml:space="preserve">Inputs vs outputs size mismatch.</source>
-        <target xml:space="preserve">Inputs vs outputs size mismatch.</target>
-        <context-group purpose="location"><context context-type="linenumber">294</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">297</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg1382" approved="yes">
+      <trans-unit id="_msg1449">
         <source xml:space="preserve">Invalid &apos;%s&apos;. Allowed values: 128, 160, 192, 224, 256.</source>
-        <target xml:space="preserve">Invalid &apos;%s&apos;. Allowed values: 128, 160, 192, 224, 256.</target>
-        <context-group purpose="location"><context context-type="linenumber">296</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">299</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg1383" approved="yes">
+      <trans-unit id="_msg1450">
         <source xml:space="preserve">Invalid -i2psam address or hostname: &apos;%s&apos;</source>
-        <target xml:space="preserve">Invalid -i2psam address or hostname: &apos;%s&apos;</target>
-        <context-group purpose="location"><context context-type="linenumber">297</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">300</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg1384" approved="yes">
+      <trans-unit id="_msg1451">
         <source xml:space="preserve">Invalid -onion address or hostname: &apos;%s&apos;</source>
-        <target xml:space="preserve">Invalid -onion address or hostname: &apos;%s&apos;</target>
-        <context-group purpose="location"><context context-type="linenumber">298</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">301</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg1385" approved="yes">
+      <trans-unit id="_msg1452">
         <source xml:space="preserve">Invalid -proxy address or hostname: &apos;%s&apos;</source>
-        <target xml:space="preserve">Invalid -proxy address or hostname: &apos;%s&apos;</target>
-        <context-group purpose="location"><context context-type="linenumber">299</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">302</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg1386" approved="yes">
+      <trans-unit id="_msg1453">
         <source xml:space="preserve">Invalid amount for -%s=&lt;amount&gt;: &apos;%s&apos;</source>
-        <target xml:space="preserve">Invalid amount for -%s=&lt;amount&gt;: &apos;%s&apos;</target>
-        <context-group purpose="location"><context context-type="linenumber">301</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">306</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg1387" approved="yes">
+      <trans-unit id="_msg1454">
         <source xml:space="preserve">Invalid spork address specified with -sporkaddr</source>
-        <target xml:space="preserve">Invalid spork address specified with -sporkaddr</target>
-        <context-group purpose="location"><context context-type="linenumber">309</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">312</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg1388" approved="yes">
+      <trans-unit id="_msg1455">
         <source xml:space="preserve">Reducing -maxconnections from %d to %d, because of system limitations.</source>
-        <target xml:space="preserve">Reducing -maxconnections from %d to %d, because of system limitations.</target>
-        <context-group purpose="location"><context context-type="linenumber">336</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">344</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg1389" approved="yes">
+      <trans-unit id="_msg1456">
         <source xml:space="preserve">Session not complete!</source>
-        <target xml:space="preserve">Session not complete!</target>
-        <context-group purpose="location"><context context-type="linenumber">344</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">352</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg1390" approved="yes">
+      <trans-unit id="_msg1457">
         <source xml:space="preserve">Session timed out.</source>
-        <target xml:space="preserve">Session timed out.</target>
-        <context-group purpose="location"><context context-type="linenumber">345</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">353</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg1391" approved="yes">
+      <trans-unit id="_msg1458">
         <source xml:space="preserve">Signing transaction failed</source>
-        <target xml:space="preserve">Signing transaction failed</target>
-        <context-group purpose="location"><context context-type="linenumber">346</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">354</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg1392" approved="yes">
+      <trans-unit id="_msg1459">
         <source xml:space="preserve">Specified blocks directory &quot;%s&quot; does not exist.</source>
-        <target xml:space="preserve">Specified blocks directory &quot;%s&quot; does not exist.</target>
-        <context-group purpose="location"><context context-type="linenumber">350</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">359</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg1393" approved="yes">
+      <trans-unit id="_msg1460">
         <source xml:space="preserve">Last queue was created too recently.</source>
-        <target xml:space="preserve">Last queue was created too recently.</target>
-        <context-group purpose="location"><context context-type="linenumber">310</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">313</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg1394" approved="yes">
+      <trans-unit id="_msg1461">
         <source xml:space="preserve">%s corrupt. Try using the wallet tool dash-wallet to salvage or restoring a backup.</source>
-        <target xml:space="preserve">%s corrupt. Try using the wallet tool dash-wallet to salvage or restoring a backup.</target>
         <context-group purpose="location"><context context-type="linenumber">13</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg1395">
-        <source xml:space="preserve">%s request to listen on port %u. This port is considered &quot;bad&quot; and thus it is unlikely that any Dash Core peers connect to it. See doc/p2p-bad-ports.md for details and a full list.</source>
-        <target xml:space="preserve"></target>
+      <trans-unit id="_msg1462">
+        <source xml:space="preserve">%s is set very high! Fees this large could be paid on a single transaction.</source>
         <context-group purpose="location"><context context-type="linenumber">19</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg1396">
+      <trans-unit id="_msg1463">
+        <source xml:space="preserve">%s request to listen on port %u. This port is considered &quot;bad&quot; and thus it is unlikely that any Dash Core peers connect to it. See doc/p2p-bad-ports.md for details and a full list.</source>
+        <context-group purpose="location"><context context-type="linenumber">21</context></context-group>
+      </trans-unit>
+      <trans-unit id="_msg1464">
         <source xml:space="preserve">Cannot provide specific connections and have addrman find outgoing connections at the same time.</source>
-        <target xml:space="preserve"></target>
-        <context-group purpose="location"><context context-type="linenumber">46</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">45</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg1397" approved="yes">
+      <trans-unit id="_msg1465">
+        <source xml:space="preserve">Failed to upgrade Evo database</source>
+        <context-group purpose="location"><context context-type="linenumber">281</context></context-group>
+      </trans-unit>
+      <trans-unit id="_msg1466">
+        <source xml:space="preserve">Fee needed &gt; fee paid</source>
+        <context-group purpose="location"><context context-type="linenumber">283</context></context-group>
+      </trans-unit>
+      <trans-unit id="_msg1467">
+        <source xml:space="preserve">Host %s on unsupported network</source>
+        <context-group purpose="location"><context context-type="linenumber">287</context></context-group>
+      </trans-unit>
+      <trans-unit id="_msg1468">
+        <source xml:space="preserve">Invalid amount for %s=&lt;amount&gt;: &apos;%s&apos; (must be at least %s)</source>
+        <context-group purpose="location"><context context-type="linenumber">304</context></context-group>
+      </trans-unit>
+      <trans-unit id="_msg1469">
+        <source xml:space="preserve">Invalid amount for %s=&lt;amount&gt;: &apos;%s&apos;</source>
+        <context-group purpose="location"><context context-type="linenumber">305</context></context-group>
+      </trans-unit>
+      <trans-unit id="_msg1470">
+        <source xml:space="preserve">Invalid port specified in %s: &apos;%s&apos;</source>
+        <context-group purpose="location"><context context-type="linenumber">310</context></context-group>
+      </trans-unit>
+      <trans-unit id="_msg1471">
         <source xml:space="preserve">Last successful action was too recent.</source>
-        <target xml:space="preserve">Last successful action was too recent.</target>
-        <context-group purpose="location"><context context-type="linenumber">311</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">314</context></context-group>
+      </trans-unit>
+      <trans-unit id="_msg1472">
+        <source xml:space="preserve">Missing solving data for estimating transaction size</source>
+        <context-group purpose="location"><context context-type="linenumber">324</context></context-group>
+      </trans-unit>
+      <trans-unit id="_msg1473">
+        <source xml:space="preserve">No host specified</source>
+        <context-group purpose="location"><context context-type="linenumber">331</context></context-group>
+      </trans-unit>
+      <trans-unit id="_msg1474">
+        <source xml:space="preserve">No host specified, malformed URL</source>
+        <context-group purpose="location"><context context-type="linenumber">332</context></context-group>
+      </trans-unit>
+      <trans-unit id="_msg1475">
+        <source xml:space="preserve">No text before the scheme delimiter, malformed URL</source>
+        <context-group purpose="location"><context context-type="linenumber">334</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg1398" approved="yes">
+      <trans-unit id="_msg1476">
+        <source xml:space="preserve">Port must be between %d and %d, supplied %d</source>
+        <context-group purpose="location"><context context-type="linenumber">339</context></context-group>
+      </trans-unit>
+      <trans-unit id="_msg1477">
+        <source xml:space="preserve">Socket not initialized, cannot send message</source>
+        <context-group purpose="location"><context context-type="linenumber">355</context></context-group>
+      </trans-unit>
+      <trans-unit id="_msg1478">
         <source xml:space="preserve">The source code is available from %s.</source>
-        <target xml:space="preserve">The source code is available from %s.</target>
-        <context-group purpose="location"><context context-type="linenumber">356</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">365</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg1399" approved="yes">
+      <trans-unit id="_msg1479">
         <source xml:space="preserve">The specified config file %s does not exist</source>
-        <target xml:space="preserve">The specified config file %s does not exist</target>
-        <context-group purpose="location"><context context-type="linenumber">357</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">366</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg1400" approved="yes">
+      <trans-unit id="_msg1480">
         <source xml:space="preserve">The transaction amount is too small to pay the fee</source>
-        <target xml:space="preserve">The transaction amount is too small to pay the fee</target>
-        <context-group purpose="location"><context context-type="linenumber">358</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">367</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg1401" approved="yes">
+      <trans-unit id="_msg1481">
         <source xml:space="preserve">This is experimental software.</source>
-        <target xml:space="preserve">This is experimental software.</target>
-        <context-group purpose="location"><context context-type="linenumber">361</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">370</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg1402" approved="yes">
+      <trans-unit id="_msg1482">
         <source xml:space="preserve">Transaction amount too small</source>
-        <target xml:space="preserve">Transaction amount too small</target>
-        <context-group purpose="location"><context context-type="linenumber">365</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">374</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg1403" approved="yes">
+      <trans-unit id="_msg1483">
         <source xml:space="preserve">Transaction created successfully.</source>
-        <target xml:space="preserve">Transaction created successfully.</target>
-        <context-group purpose="location"><context context-type="linenumber">368</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">377</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg1404" approved="yes">
+      <trans-unit id="_msg1484">
         <source xml:space="preserve">Transaction fees are too high.</source>
-        <target xml:space="preserve">Transaction fees are too high.</target>
-        <context-group purpose="location"><context context-type="linenumber">369</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">378</context></context-group>
+      </trans-unit>
+      <trans-unit id="_msg1485">
+        <source xml:space="preserve">Transaction needs a change address, but we can&apos;t generate it.</source>
+        <context-group purpose="location"><context context-type="linenumber">381</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg1405" approved="yes">
+      <trans-unit id="_msg1486">
         <source xml:space="preserve">Transaction not valid.</source>
-        <target xml:space="preserve">Transaction not valid.</target>
-        <context-group purpose="location"><context context-type="linenumber">372</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">382</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg1406" approved="yes">
+      <trans-unit id="_msg1487">
         <source xml:space="preserve">Trying to connect…</source>
-        <target xml:space="preserve">Trying to connect…</target>
-        <context-group purpose="location"><context context-type="linenumber">374</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">384</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg1407" approved="yes">
+      <trans-unit id="_msg1488">
         <source xml:space="preserve">Unable to bind to %s on this computer (bind returned error %s)</source>
-        <target xml:space="preserve">Unable to bind to %s on this computer (bind returned error %s)</target>
-        <context-group purpose="location"><context context-type="linenumber">375</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">385</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg1408" approved="yes">
+      <trans-unit id="_msg1489">
         <source xml:space="preserve">Unable to locate enough mixed funds for this transaction.</source>
-        <target xml:space="preserve">Unable to locate enough mixed funds for this transaction.</target>
-        <context-group purpose="location"><context context-type="linenumber">379</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">389</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg1409" approved="yes">
+      <trans-unit id="_msg1490">
         <source xml:space="preserve">Unable to locate enough non-denominated funds for this transaction.</source>
-        <target xml:space="preserve">Unable to locate enough non-denominated funds for this transaction.</target>
-        <context-group purpose="location"><context context-type="linenumber">380</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">390</context></context-group>
+      </trans-unit>
+      <trans-unit id="_msg1491">
+        <source xml:space="preserve">Unable to lookup host %s</source>
+        <context-group purpose="location"><context context-type="linenumber">391</context></context-group>
+      </trans-unit>
+      <trans-unit id="_msg1492">
+        <source xml:space="preserve">Unable to parse -maxuploadtarget: &apos;%s&apos;</source>
+        <context-group purpose="location"><context context-type="linenumber">393</context></context-group>
+      </trans-unit>
+      <trans-unit id="_msg1493">
+        <source xml:space="preserve">Unable to send message to %s (::sendto() returned error %s)</source>
+        <context-group purpose="location"><context context-type="linenumber">394</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg1410" approved="yes">
+      <trans-unit id="_msg1494">
         <source xml:space="preserve">Unable to sign spork message, wrong key?</source>
-        <target xml:space="preserve">Unable to sign spork message, wrong key?</target>
-        <context-group purpose="location"><context context-type="linenumber">383</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">395</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg1411" approved="yes">
+      <trans-unit id="_msg1495">
         <source xml:space="preserve">Unknown network specified in -onlynet: &apos;%s&apos;</source>
-        <target xml:space="preserve">Unknown network specified in -onlynet: &apos;%s&apos;</target>
-        <context-group purpose="location"><context context-type="linenumber">386</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">398</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg1412" approved="yes">
+      <trans-unit id="_msg1496">
         <source xml:space="preserve">Unknown state: id = %u</source>
-        <target xml:space="preserve">Unknown state: id = %u</target>
-        <context-group purpose="location"><context context-type="linenumber">389</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">401</context></context-group>
+      </trans-unit>
+      <trans-unit id="_msg1497">
+        <source xml:space="preserve">Unsupported URL scheme, must begin with udp://</source>
+        <context-group purpose="location"><context context-type="linenumber">402</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg1413" approved="yes">
+      <trans-unit id="_msg1498">
         <source xml:space="preserve">Unsupported logging category %s=%s.</source>
-        <target xml:space="preserve">Unsupported logging category %s=%s.</target>
-        <context-group purpose="location"><context context-type="linenumber">391</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">404</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg1414" approved="yes">
+      <trans-unit id="_msg1499">
         <source xml:space="preserve">Very low number of keys left: %d</source>
-        <target xml:space="preserve">Very low number of keys left: %d</target>
-        <context-group purpose="location"><context context-type="linenumber">396</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">408</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg1415" approved="yes">
+      <trans-unit id="_msg1500">
         <source xml:space="preserve">Wallet is locked.</source>
-        <target xml:space="preserve">Wallet is locked.</target>
-        <context-group purpose="location"><context context-type="linenumber">397</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">409</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg1416" approved="yes">
+      <trans-unit id="_msg1501">
         <source xml:space="preserve">Warning: can&apos;t use %s and %s together, will prefer %s</source>
-        <target xml:space="preserve">Warning: can&apos;t use %s and %s together, will prefer %s</target>
-        <context-group purpose="location"><context context-type="linenumber">399</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">411</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg1417" approved="yes">
+      <trans-unit id="_msg1502">
         <source xml:space="preserve">Warning: incorrect parameter %s, path must exist! Using default path.</source>
-        <target xml:space="preserve">Warning: incorrect parameter %s, path must exist! Using default path.</target>
-        <context-group purpose="location"><context context-type="linenumber">400</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">412</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg1418" approved="yes">
+      <trans-unit id="_msg1503">
         <source xml:space="preserve">Will retry…</source>
-        <target xml:space="preserve">Will retry…</target>
-        <context-group purpose="location"><context context-type="linenumber">402</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">414</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg1419" approved="yes">
+      <trans-unit id="_msg1504">
         <source xml:space="preserve">You are starting with governance validation disabled.</source>
-        <target xml:space="preserve">You are starting with governance validation disabled.</target>
-        <context-group purpose="location"><context context-type="linenumber">404</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">416</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg1420" approved="yes">
+      <trans-unit id="_msg1505">
         <source xml:space="preserve">You can not disable governance validation on a masternode.</source>
-        <target xml:space="preserve">You can not disable governance validation on a masternode.</target>
-        <context-group purpose="location"><context context-type="linenumber">405</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">417</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg1421" approved="yes">
+      <trans-unit id="_msg1506">
         <source xml:space="preserve">You need to rebuild the database using -reindex to enable -addressindex</source>
-        <target xml:space="preserve">You need to rebuild the database using -reindex to enable -addressindex</target>
-        <context-group purpose="location"><context context-type="linenumber">407</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">419</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg1422" approved="yes">
+      <trans-unit id="_msg1507">
         <source xml:space="preserve">You need to rebuild the database using -reindex to enable -spentindex</source>
-        <target xml:space="preserve">You need to rebuild the database using -reindex to enable -spentindex</target>
-        <context-group purpose="location"><context context-type="linenumber">408</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">420</context></context-group>
       </trans-unit>
-      <trans-unit id="_msg1423" approved="yes">
+      <trans-unit id="_msg1508">
         <source xml:space="preserve">Your entries added successfully.</source>
-        <target xml:space="preserve">Your entries added successfully.</target>
-        <context-group purpose="location"><context context-type="linenumber">409</context></context-group>
+        <context-group purpose="location"><context context-type="linenumber">421</context></context-group>
       </trans-unit>
     </group>
   </body></file>

From a425211b87a2a535535447b6176e14213a7d554d Mon Sep 17 00:00:00 2001
From: pasta <pasta@dashboost.org>
Date: Sun, 19 Oct 2025 13:49:23 -0500
Subject: [PATCH 225/656] perf: bail out in RelayInvFiltered early if !CanRelay

---
 src/net_processing.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/net_processing.cpp b/src/net_processing.cpp
index bee912118e31..8a0722f65543 100644
--- a/src/net_processing.cpp
+++ b/src/net_processing.cpp
@@ -2406,11 +2406,13 @@ void PeerManagerImpl::RelayInvFiltered(const CInv& inv, const CTransaction& rela
 {
     // TODO: Migrate to iteration through m_peer_map
     m_connman.ForEachNode([&](CNode* pnode) {
+        if (!pnode->CanRelay()) return;
+
         PeerRef peer = GetPeerRef(pnode->GetId());
         if (peer == nullptr) return;
 
         auto tx_relay = peer->GetTxRelay();
-        if (!pnode->CanRelay() || tx_relay == nullptr) {
+        if (tx_relay == nullptr) {
             return;
         }
 

From 37c097defdabdc78fd1c0a206f28cfc94f7ad746 Mon Sep 17 00:00:00 2001
From: pasta <pasta@dashboost.org>
Date: Tue, 21 Oct 2025 16:45:23 -0500
Subject: [PATCH 226/656] perf: convert m_nodes_mutex from recursive mutex to
 mutex

---
 src/net.cpp            |  72 +++++++++++++++-------
 src/net.h              | 131 ++++++++++++++++++++++-------------------
 src/net_processing.cpp |  22 +++----
 3 files changed, 132 insertions(+), 93 deletions(-)

diff --git a/src/net.cpp b/src/net.cpp
index 7035045eb548..3017fa2aeb50 100644
--- a/src/net.cpp
+++ b/src/net.cpp
@@ -338,9 +338,9 @@ bool IsLocal(const CService& addr)
     return mapLocalHost.count(addr) > 0;
 }
 
-CNode* CConnman::FindNode(const CNetAddr& ip, bool fExcludeDisconnecting)
+CNode* CConnman::FindNodeLocked(const CNetAddr& ip, bool fExcludeDisconnecting)
 {
-    LOCK(m_nodes_mutex);
+    AssertLockHeld(m_nodes_mutex);
     for (CNode* pnode : m_nodes) {
         if (fExcludeDisconnecting && pnode->fDisconnect) {
             continue;
@@ -352,9 +352,9 @@ CNode* CConnman::FindNode(const CNetAddr& ip, bool fExcludeDisconnecting)
     return nullptr;
 }
 
-CNode* CConnman::FindNode(const std::string& addrName, bool fExcludeDisconnecting)
+CNode* CConnman::FindNodeLocked(const std::string& addrName, bool fExcludeDisconnecting)
 {
-    LOCK(m_nodes_mutex);
+    AssertLockHeld(m_nodes_mutex);
     for (CNode* pnode : m_nodes) {
         if (fExcludeDisconnecting && pnode->fDisconnect) {
             continue;
@@ -366,9 +366,9 @@ CNode* CConnman::FindNode(const std::string& addrName, bool fExcludeDisconnectin
     return nullptr;
 }
 
-CNode* CConnman::FindNode(const CService& addr, bool fExcludeDisconnecting)
+CNode* CConnman::FindNodeLocked(const CService& addr, bool fExcludeDisconnecting)
 {
-    LOCK(m_nodes_mutex);
+    AssertLockHeld(m_nodes_mutex);
     for (CNode* pnode : m_nodes) {
         if (fExcludeDisconnecting && pnode->fDisconnect) {
             continue;
@@ -380,6 +380,24 @@ CNode* CConnman::FindNode(const CService& addr, bool fExcludeDisconnecting)
     return nullptr;
 }
 
+CNode* CConnman::FindNode(const CNetAddr& ip, bool fExcludeDisconnecting)
+{
+    LOCK(m_nodes_mutex);
+    return FindNodeLocked(ip, fExcludeDisconnecting);
+}
+
+CNode* CConnman::FindNode(const std::string& addrName, bool fExcludeDisconnecting)
+{
+    LOCK(m_nodes_mutex);
+    return FindNodeLocked(addrName, fExcludeDisconnecting);
+}
+
+CNode* CConnman::FindNode(const CService& addr, bool fExcludeDisconnecting)
+{
+    LOCK(m_nodes_mutex);
+    return FindNodeLocked(addr, fExcludeDisconnecting);
+}
+
 bool CConnman::AlreadyConnectedToAddress(const CAddress& addr)
 {
     return FindNode(addr.ToStringAddrPort());
@@ -458,7 +476,7 @@ CNode* CConnman::ConnectNode(CAddress addrConnect, const char *pszDest, bool fCo
                 // It is possible that we already have a connection to the IP/port pszDest resolved to.
                 // In that case, drop the connection that was just created.
                 LOCK(m_nodes_mutex);
-                CNode* pnode = FindNode(static_cast<CService>(addrConnect));
+                CNode* pnode = FindNodeLocked(static_cast<CService>(addrConnect));
                 if (pnode) {
                     LogPrintf("Not opening a connection to %s, already connected to %s\n", pszDest, addrConnect.ToStringAddrPort());
                     return nullptr;
@@ -3415,7 +3433,8 @@ void CConnman::ThreadOpenMasternodeConnections(CDeterministicMNManager& dmnman,
 
         MasternodeProbeConn isProbe = MasternodeProbeConn::IsNotConnection;
 
-        const auto getPendingQuorumNodes = [&]() EXCLUSIVE_LOCKS_REQUIRED(cs_vPendingMasternodes) {
+        const auto getPendingQuorumNodes = [&]() EXCLUSIVE_LOCKS_REQUIRED(m_nodes_mutex, cs_vPendingMasternodes) {
+            AssertLockHeld(m_nodes_mutex);
             AssertLockHeld(cs_vPendingMasternodes);
             std::vector<CDeterministicMNCPtr> ret;
             for (const auto& group : masternodeQuorumNodes) {
@@ -3428,20 +3447,21 @@ void CConnman::ThreadOpenMasternodeConnections(CDeterministicMNManager& dmnman,
                     if (connectedNodes.count(addr2) && !connectedProRegTxHashes.count(proRegTxHash)) {
                         // we probably connected to it before it became a masternode
                         // or maybe we are still waiting for mnauth
-                        (void)ForNode(addr2, [&](CNode* pnode) {
-                            if (pnode->nTimeFirstMessageReceived.load() != 0s && GetTime<std::chrono::seconds>() - pnode->nTimeFirstMessageReceived.load() > 5s) {
-                                // clearly not expecting mnauth to take that long even if it wasn't the first message
-                                // we received (as it should normally), disconnect
-                                LogPrint(BCLog::NET_NETCONN, "CConnman::%s -- dropping non-mnauth connection to %s, service=%s\n", _func_, proRegTxHash.ToString(), addr2.ToStringAddrPort());
-                                pnode->fDisconnect = true;
-                                return true;
-                            }
-                            return false;
-                        });
+                        // Use FindNodeLocked since we already hold m_nodes_mutex
+                        CNode* pnode = FindNodeLocked(addr2);
+                        if (pnode && pnode->nTimeFirstMessageReceived.load() != 0s && GetTime<std::chrono::seconds>() - pnode->nTimeFirstMessageReceived.load() > 5s) {
+                            // clearly not expecting mnauth to take that long even if it wasn't the first message
+                            // we received (as it should normally), disconnect
+                            LogPrint(BCLog::NET_NETCONN, "CConnman::%s -- dropping non-mnauth connection to %s, service=%s\n", _func_, proRegTxHash.ToString(), addr2.ToStringAddrPort());
+                            pnode->fDisconnect = true;
+                        }
                         // either way - it's not ready, skip it for now
                         continue;
                     }
-                    if (!connectedNodes.count(addr2) && !IsMasternodeOrDisconnectRequested(addr2) && !connectedProRegTxHashes.count(proRegTxHash)) {
+                    // Check if node is masternode or disconnect requested using FindNodeLocked
+                    CNode* existingNode = FindNodeLocked(addr2);
+                    bool isDisconnectRequested = existingNode && (existingNode->m_masternode_connection || existingNode->fDisconnect);
+                    if (!connectedNodes.count(addr2) && !isDisconnectRequested && !connectedProRegTxHashes.count(proRegTxHash)) {
                         int64_t lastAttempt = mn_metaman.GetMetaInfo(dmn->proTxHash)->GetLastOutboundAttempt();
                         // back off trying connecting to an address if we already tried recently
                         if (nANow - lastAttempt < chainParams.LLMQConnectionRetryTimeout()) {
@@ -3454,7 +3474,8 @@ void CConnman::ThreadOpenMasternodeConnections(CDeterministicMNManager& dmnman,
             return ret;
         };
 
-        const auto getPendingProbes = [&]() EXCLUSIVE_LOCKS_REQUIRED(cs_vPendingMasternodes) {
+        const auto getPendingProbes = [&]() EXCLUSIVE_LOCKS_REQUIRED(m_nodes_mutex, cs_vPendingMasternodes) {
+            AssertLockHeld(m_nodes_mutex);
             AssertLockHeld(cs_vPendingMasternodes);
             std::vector<CDeterministicMNCPtr> ret;
             for (auto it = masternodePendingProbes.begin(); it != masternodePendingProbes.end(); ) {
@@ -3490,7 +3511,14 @@ void CConnman::ThreadOpenMasternodeConnections(CDeterministicMNManager& dmnman,
             if (!vPendingMasternodes.empty()) {
                 auto dmn = mnList.GetValidMN(vPendingMasternodes.front());
                 vPendingMasternodes.erase(vPendingMasternodes.begin());
-                if (dmn && !connectedNodes.count(dmn->pdmnState->netInfo->GetPrimary()) && !IsMasternodeOrDisconnectRequested(dmn->pdmnState->netInfo->GetPrimary())) {
+                // Check if we should connect to this masternode
+                // We already hold m_nodes_mutex here, so check fDisconnect and m_masternode_connection directly
+                bool shouldConnect = true;
+                if (dmn && !connectedNodes.count(dmn->pdmnState->netInfo->GetPrimary())) {
+                    CNode* pnode = FindNodeLocked(dmn->pdmnState->netInfo->GetPrimary());
+                    shouldConnect = !pnode || (!pnode->m_masternode_connection && !pnode->fDisconnect);
+                }
+                if (dmn && shouldConnect) {
                     LogPrint(BCLog::NET_NETCONN, "CConnman::%s -- opening pending masternode connection to %s, service=%s\n", _func_, dmn->proTxHash.ToString(), dmn->pdmnState->netInfo->GetPrimary().ToStringAddrPort());
                     return dmn;
                 }
@@ -4485,7 +4513,7 @@ void CConnman::GetNodeStats(std::vector<CNodeStats>& vstats) const
 bool CConnman::DisconnectNode(const std::string& strNode)
 {
     LOCK(m_nodes_mutex);
-    if (CNode* pnode = FindNode(strNode)) {
+    if (CNode* pnode = FindNodeLocked(strNode)) {
         LogPrint(BCLog::NET_NETCONN, "disconnect by address%s matched peer=%d; disconnecting\n", (fLogIPs ? strprintf("=%s", strNode) : ""), pnode->GetId());
         pnode->fDisconnect = true;
         return true;
diff --git a/src/net.h b/src/net.h
index 9e0fb5d8b5b8..d3b1ae0b86ef 100644
--- a/src/net.h
+++ b/src/net.h
@@ -1244,8 +1244,8 @@ friend class CNode;
         EXCLUSIVE_LOCKS_REQUIRED(!m_total_bytes_sent_mutex, !m_added_nodes_mutex, !m_addr_fetches_mutex, !mutexMsgProc);
 
     void StopThreads();
-    void StopNodes() EXCLUSIVE_LOCKS_REQUIRED(!cs_mapSocketToNode, !cs_sendable_receivable_nodes);
-    void Stop() EXCLUSIVE_LOCKS_REQUIRED(!cs_mapSocketToNode, !cs_sendable_receivable_nodes)
+    void StopNodes() EXCLUSIVE_LOCKS_REQUIRED(!m_nodes_mutex, !cs_mapSocketToNode, !cs_sendable_receivable_nodes);
+    void Stop() EXCLUSIVE_LOCKS_REQUIRED(!m_nodes_mutex, !cs_mapSocketToNode, !cs_sendable_receivable_nodes)
     {
         StopThreads();
         StopNodes();
@@ -1274,13 +1274,13 @@ friend class CNode;
                                const char* strDest, ConnectionType conn_type, bool use_v2transport,
                                MasternodeConn masternode_connection = MasternodeConn::IsNotConnection,
                                MasternodeProbeConn masternode_probe_connection = MasternodeProbeConn::IsNotConnection)
-        EXCLUSIVE_LOCKS_REQUIRED(!m_unused_i2p_sessions_mutex, !mutexMsgProc, !cs_mapSocketToNode);
+        EXCLUSIVE_LOCKS_REQUIRED(!m_nodes_mutex, !m_unused_i2p_sessions_mutex, !mutexMsgProc, !cs_mapSocketToNode);
     void OpenMasternodeConnection(const CAddress& addrConnect, bool use_v2transport, MasternodeProbeConn probe = MasternodeProbeConn::IsConnection)
-        EXCLUSIVE_LOCKS_REQUIRED(!m_unused_i2p_sessions_mutex, !mutexMsgProc, !cs_mapSocketToNode);
-    bool CheckIncomingNonce(uint64_t nonce);
+        EXCLUSIVE_LOCKS_REQUIRED(!m_nodes_mutex, !m_unused_i2p_sessions_mutex, !mutexMsgProc, !cs_mapSocketToNode);
+    bool CheckIncomingNonce(uint64_t nonce) EXCLUSIVE_LOCKS_REQUIRED(!m_nodes_mutex);
 
     // alias for thread safety annotations only, not defined
-    RecursiveMutex& GetNodesMutex() const LOCK_RETURNED(m_nodes_mutex);
+    Mutex& GetNodesMutex() const LOCK_RETURNED(m_nodes_mutex);
 
     struct CFullyConnectedOnly {
         bool operator() (const CNode* pnode) const {
@@ -1296,37 +1296,37 @@ friend class CNode;
 
     constexpr static const CAllNodes AllNodes{};
 
-    bool ForNode(NodeId id, std::function<bool(const CNode* pnode)> cond, std::function<bool(CNode* pnode)> func);
-    bool ForNode(const CService& addr, std::function<bool(const CNode* pnode)> cond, std::function<bool(CNode* pnode)> func);
+    bool ForNode(NodeId id, std::function<bool(const CNode* pnode)> cond, std::function<bool(CNode* pnode)> func) EXCLUSIVE_LOCKS_REQUIRED(!m_nodes_mutex);
+    bool ForNode(const CService& addr, std::function<bool(const CNode* pnode)> cond, std::function<bool(CNode* pnode)> func) EXCLUSIVE_LOCKS_REQUIRED(!m_nodes_mutex);
 
     template<typename Callable>
-    bool ForNode(const CService& addr, Callable&& func)
+    bool ForNode(const CService& addr, Callable&& func) EXCLUSIVE_LOCKS_REQUIRED(!m_nodes_mutex)
     {
         return ForNode(addr, FullyConnectedOnly, func);
     }
 
     template<typename Callable>
-    bool ForNode(NodeId id, Callable&& func)
+    bool ForNode(NodeId id, Callable&& func) EXCLUSIVE_LOCKS_REQUIRED(!m_nodes_mutex)
     {
         return ForNode(id, FullyConnectedOnly, func);
     }
 
     using NodeFn = std::function<void(CNode*)>;
 
-    bool IsConnected(const CService& addr, std::function<bool(const CNode* pnode)> cond)
+    bool IsConnected(const CService& addr, std::function<bool(const CNode* pnode)> cond) EXCLUSIVE_LOCKS_REQUIRED(!m_nodes_mutex)
     {
         return ForNode(addr, cond, [](CNode* pnode){
             return true;
         });
     }
 
-    bool IsMasternodeOrDisconnectRequested(const CService& addr);
+    bool IsMasternodeOrDisconnectRequested(const CService& addr) EXCLUSIVE_LOCKS_REQUIRED(!m_nodes_mutex);
 
     void PushMessage(CNode* pnode, CSerializedNetMsg&& msg)
         EXCLUSIVE_LOCKS_REQUIRED(!mutexMsgProc, !m_total_bytes_sent_mutex);
 
     template<typename Condition, typename Callable>
-    bool ForEachNodeContinueIf(const Condition& cond, Callable&& func)
+    bool ForEachNodeContinueIf(const Condition& cond, Callable&& func) EXCLUSIVE_LOCKS_REQUIRED(!m_nodes_mutex)
     {
         LOCK(m_nodes_mutex);
         for (auto&& node : m_nodes)
@@ -1337,13 +1337,13 @@ friend class CNode;
     };
 
     template<typename Callable>
-    bool ForEachNodeContinueIf(Callable&& func)
+    bool ForEachNodeContinueIf(Callable&& func) EXCLUSIVE_LOCKS_REQUIRED(!m_nodes_mutex)
     {
         return ForEachNodeContinueIf(FullyConnectedOnly, func);
     }
 
     template<typename Condition, typename Callable>
-    bool ForEachNodeContinueIf(const Condition& cond, Callable&& func) const
+    bool ForEachNodeContinueIf(const Condition& cond, Callable&& func) const EXCLUSIVE_LOCKS_REQUIRED(!m_nodes_mutex)
     {
         LOCK(m_nodes_mutex);
         for (const auto& node : m_nodes)
@@ -1354,13 +1354,13 @@ friend class CNode;
     };
 
     template<typename Callable>
-    bool ForEachNodeContinueIf(Callable&& func) const
+    bool ForEachNodeContinueIf(Callable&& func) const EXCLUSIVE_LOCKS_REQUIRED(!m_nodes_mutex)
     {
         return ForEachNodeContinueIf(FullyConnectedOnly, func);
     }
 
     template<typename Condition, typename Callable>
-    void ForEachNode(const Condition& cond, Callable&& func)
+    void ForEachNode(const Condition& cond, Callable&& func) EXCLUSIVE_LOCKS_REQUIRED(!m_nodes_mutex)
     {
         LOCK(m_nodes_mutex);
         for (auto&& node : m_nodes) {
@@ -1369,13 +1369,13 @@ friend class CNode;
         }
     };
 
-    void ForEachNode(const NodeFn& fn)
+    void ForEachNode(const NodeFn& fn) EXCLUSIVE_LOCKS_REQUIRED(!m_nodes_mutex)
     {
         ForEachNode(FullyConnectedOnly, fn);
     }
 
     template<typename Condition, typename Callable>
-    void ForEachNode(const Condition& cond, Callable&& func) const
+    void ForEachNode(const Condition& cond, Callable&& func) const EXCLUSIVE_LOCKS_REQUIRED(!m_nodes_mutex)
     {
         LOCK(m_nodes_mutex);
         for (auto&& node : m_nodes) {
@@ -1384,13 +1384,13 @@ friend class CNode;
         }
     };
 
-    void ForEachNode(const NodeFn& fn) const
+    void ForEachNode(const NodeFn& fn) const EXCLUSIVE_LOCKS_REQUIRED(!m_nodes_mutex)
     {
         ForEachNode(FullyConnectedOnly, fn);
     }
 
     template<typename Condition, typename Callable, typename CallableAfter>
-    void ForEachNodeThen(const Condition& cond, Callable&& pre, CallableAfter&& post)
+    void ForEachNodeThen(const Condition& cond, Callable&& pre, CallableAfter&& post) EXCLUSIVE_LOCKS_REQUIRED(!m_nodes_mutex)
     {
         LOCK(m_nodes_mutex);
         for (auto&& node : m_nodes) {
@@ -1401,13 +1401,13 @@ friend class CNode;
     };
 
     template<typename Callable, typename CallableAfter>
-    void ForEachNodeThen(Callable&& pre, CallableAfter&& post)
+    void ForEachNodeThen(Callable&& pre, CallableAfter&& post) EXCLUSIVE_LOCKS_REQUIRED(!m_nodes_mutex)
     {
         ForEachNodeThen(FullyConnectedOnly, pre, post);
     }
 
     template<typename Condition, typename Callable, typename CallableAfter>
-    void ForEachNodeThen(const Condition& cond, Callable&& pre, CallableAfter&& post) const
+    void ForEachNodeThen(const Condition& cond, Callable&& pre, CallableAfter&& post) const EXCLUSIVE_LOCKS_REQUIRED(!m_nodes_mutex)
     {
         LOCK(m_nodes_mutex);
         for (auto&& node : m_nodes) {
@@ -1418,7 +1418,7 @@ friend class CNode;
     };
 
     template<typename Callable, typename CallableAfter>
-    void ForEachNodeThen(Callable&& pre, CallableAfter&& post) const
+    void ForEachNodeThen(Callable&& pre, CallableAfter&& post) const EXCLUSIVE_LOCKS_REQUIRED(!m_nodes_mutex)
     {
         ForEachNodeThen(FullyConnectedOnly, pre, post);
     }
@@ -1454,14 +1454,15 @@ friend class CNode;
     // return a value less than (num_outbound_connections - num_outbound_slots)
     // in cases where some outbound connections are not yet fully connected, or
     // not yet fully disconnected.
-    int GetExtraFullOutboundCount() const;
+    int GetExtraFullOutboundCount() const EXCLUSIVE_LOCKS_REQUIRED(!m_nodes_mutex);
     // Count the number of block-relay-only peers we have over our limit.
-    int GetExtraBlockRelayCount() const;
+    int GetExtraBlockRelayCount() const EXCLUSIVE_LOCKS_REQUIRED(!m_nodes_mutex);
 
     bool AddNode(const AddedNodeParams& add) EXCLUSIVE_LOCKS_REQUIRED(!m_added_nodes_mutex);
     bool RemoveAddedNode(const std::string& node) EXCLUSIVE_LOCKS_REQUIRED(!m_added_nodes_mutex);
     bool AddedNodesContain(const CAddress& addr) const EXCLUSIVE_LOCKS_REQUIRED(!m_added_nodes_mutex);
-    std::vector<AddedNodeInfo> GetAddedNodeInfo(bool include_connected) const EXCLUSIVE_LOCKS_REQUIRED(!m_added_nodes_mutex);
+    std::vector<AddedNodeInfo> GetAddedNodeInfo(bool include_connected) const
+        EXCLUSIVE_LOCKS_REQUIRED(!m_added_nodes_mutex, !m_nodes_mutex);
 
     /**
      * Attempts to open a connection. Currently only used from tests.
@@ -1477,29 +1478,29 @@ friend class CNode;
      *                          - Max connection capacity for type is filled
      */
     bool AddConnection(const std::string& address, ConnectionType conn_type, bool use_v2transport)
-        EXCLUSIVE_LOCKS_REQUIRED(!m_unused_i2p_sessions_mutex, !mutexMsgProc, !cs_mapSocketToNode);
+        EXCLUSIVE_LOCKS_REQUIRED(!m_nodes_mutex, !m_unused_i2p_sessions_mutex, !mutexMsgProc, !cs_mapSocketToNode);
 
     bool AddPendingMasternode(const uint256& proTxHash);
     void SetMasternodeQuorumNodes(Consensus::LLMQType llmqType, const uint256& quorumHash, const Uint256HashSet& proTxHashes);
-    void SetMasternodeQuorumRelayMembers(Consensus::LLMQType llmqType, const uint256& quorumHash, const Uint256HashSet& proTxHashes);
+    void SetMasternodeQuorumRelayMembers(Consensus::LLMQType llmqType, const uint256& quorumHash, const Uint256HashSet& proTxHashes) EXCLUSIVE_LOCKS_REQUIRED(!m_nodes_mutex);
     bool HasMasternodeQuorumNodes(Consensus::LLMQType llmqType, const uint256& quorumHash) const;
     Uint256HashSet GetMasternodeQuorums(Consensus::LLMQType llmqType) const;
     // also returns QWATCH nodes
-    std::vector<NodeId> GetMasternodeQuorumNodes(Consensus::LLMQType llmqType, const uint256& quorumHash) const;
+    std::vector<NodeId> GetMasternodeQuorumNodes(Consensus::LLMQType llmqType, const uint256& quorumHash) const EXCLUSIVE_LOCKS_REQUIRED(!m_nodes_mutex);
     void RemoveMasternodeQuorumNodes(Consensus::LLMQType llmqType, const uint256& quorumHash);
     bool IsMasternodeQuorumNode(const CNode* pnode, const CDeterministicMNList& tip_mn_list) const;
     bool IsMasternodeQuorumRelayMember(const uint256& protxHash);
     void AddPendingProbeConnections(const std::set<uint256>& proTxHashes);
 
-    size_t GetNodeCount(ConnectionDirection) const;
+    size_t GetNodeCount(ConnectionDirection) const EXCLUSIVE_LOCKS_REQUIRED(!m_nodes_mutex);
     std::map<CNetAddr, LocalServiceInfo> getNetLocalAddresses() const;
     size_t GetMaxOutboundNodeCount();
     size_t GetMaxOutboundOnionNodeCount();
-    void GetNodeStats(std::vector<CNodeStats>& vstats) const;
-    bool DisconnectNode(const std::string& node);
-    bool DisconnectNode(const CSubNet& subnet);
-    bool DisconnectNode(const CNetAddr& addr);
-    bool DisconnectNode(NodeId id);
+    void GetNodeStats(std::vector<CNodeStats>& vstats) const EXCLUSIVE_LOCKS_REQUIRED(!m_nodes_mutex);
+    bool DisconnectNode(const std::string& node) EXCLUSIVE_LOCKS_REQUIRED(!m_nodes_mutex);
+    bool DisconnectNode(const CSubNet& subnet) EXCLUSIVE_LOCKS_REQUIRED(!m_nodes_mutex);
+    bool DisconnectNode(const CNetAddr& addr) EXCLUSIVE_LOCKS_REQUIRED(!m_nodes_mutex);
+    bool DisconnectNode(NodeId id) EXCLUSIVE_LOCKS_REQUIRED(!m_nodes_mutex);
 
     //! Used to convey which local services we are offering peers during node
     //! connection.
@@ -1544,7 +1545,8 @@ friend class CNode;
     {
     public:
         explicit NodesSnapshot(const CConnman& connman, std::function<bool(const CNode* pnode)> cond = AllNodes,
-                               bool shuffle = false);
+                               bool shuffle = false)
+            EXCLUSIVE_LOCKS_REQUIRED(!connman.m_nodes_mutex);
         ~NodesSnapshot();
 
         const std::vector<CNode*>& Nodes() const
@@ -1579,16 +1581,19 @@ friend class CNode;
     bool InitBinds(const Options& options);
 
     void ThreadOpenAddedConnections()
-        EXCLUSIVE_LOCKS_REQUIRED(!m_added_nodes_mutex, !m_unused_i2p_sessions_mutex, !m_reconnections_mutex, !mutexMsgProc, !cs_mapSocketToNode);
+        EXCLUSIVE_LOCKS_REQUIRED(!m_added_nodes_mutex, !m_nodes_mutex, !m_reconnections_mutex,
+                                 !m_unused_i2p_sessions_mutex, !mutexMsgProc, !cs_mapSocketToNode);
     void AddAddrFetch(const std::string& strDest) EXCLUSIVE_LOCKS_REQUIRED(!m_addr_fetches_mutex);
     void ProcessAddrFetch()
-        EXCLUSIVE_LOCKS_REQUIRED(!m_addr_fetches_mutex, !m_unused_i2p_sessions_mutex, !mutexMsgProc, !cs_mapSocketToNode);
+        EXCLUSIVE_LOCKS_REQUIRED(!m_addr_fetches_mutex, !m_nodes_mutex, !m_unused_i2p_sessions_mutex,
+                                 !mutexMsgProc, !cs_mapSocketToNode);
     void ThreadOpenConnections(const std::vector<std::string> connect, CDeterministicMNManager& dmnman)
-        EXCLUSIVE_LOCKS_REQUIRED(!m_addr_fetches_mutex, !m_added_nodes_mutex, !m_nodes_mutex, !m_unused_i2p_sessions_mutex, !m_reconnections_mutex, !mutexMsgProc, !cs_mapSocketToNode);
-    void ThreadMessageHandler() EXCLUSIVE_LOCKS_REQUIRED(!mutexMsgProc);
-    void ThreadI2PAcceptIncoming(CMasternodeSync& mn_sync) EXCLUSIVE_LOCKS_REQUIRED(!mutexMsgProc, !cs_mapSocketToNode);
+        EXCLUSIVE_LOCKS_REQUIRED(!m_addr_fetches_mutex, !m_added_nodes_mutex, !m_nodes_mutex, !m_reconnections_mutex,
+                                 !m_unused_i2p_sessions_mutex, !mutexMsgProc, !cs_mapSocketToNode);
+    void ThreadMessageHandler() EXCLUSIVE_LOCKS_REQUIRED(!m_nodes_mutex, !mutexMsgProc);
+    void ThreadI2PAcceptIncoming(CMasternodeSync& mn_sync) EXCLUSIVE_LOCKS_REQUIRED(!m_nodes_mutex, !mutexMsgProc, !cs_mapSocketToNode);
     void AcceptConnection(const ListenSocket& hListenSocket, CMasternodeSync& mn_sync)
-        EXCLUSIVE_LOCKS_REQUIRED(!mutexMsgProc, !cs_mapSocketToNode);
+        EXCLUSIVE_LOCKS_REQUIRED(!m_nodes_mutex, !mutexMsgProc, !cs_mapSocketToNode);
 
     /**
      * Create a `CNode` object from a socket that has just been accepted and add the node to
@@ -1602,11 +1607,12 @@ friend class CNode;
                                       NetPermissionFlags permission_flags,
                                       const CAddress& addr_bind,
                                       const CAddress& addr,
-                                      CMasternodeSync& mn_sync) EXCLUSIVE_LOCKS_REQUIRED(!mutexMsgProc, !cs_mapSocketToNode);
+                                      CMasternodeSync& mn_sync)
+        EXCLUSIVE_LOCKS_REQUIRED(!m_nodes_mutex, !mutexMsgProc, !cs_mapSocketToNode);
 
     void DisconnectNodes() EXCLUSIVE_LOCKS_REQUIRED(!m_reconnections_mutex, !m_nodes_mutex);
-    void NotifyNumConnectionsChanged(CMasternodeSync& mn_sync);
-    void CalculateNumConnectionsChangedStats();
+    void NotifyNumConnectionsChanged(CMasternodeSync& mn_sync) EXCLUSIVE_LOCKS_REQUIRED(!m_nodes_mutex);
+    void CalculateNumConnectionsChangedStats() EXCLUSIVE_LOCKS_REQUIRED(!m_nodes_mutex);
     /** Return true if the peer is inactive and should be disconnected. */
     bool InactivityCheck(const CNode& node) const;
 
@@ -1620,21 +1626,21 @@ friend class CNode;
     /**
      * Check connected and listening sockets for IO readiness and process them accordingly.
      */
-    void SocketHandler(CMasternodeSync& mn_sync) EXCLUSIVE_LOCKS_REQUIRED(!m_total_bytes_sent_mutex, !mutexMsgProc, !cs_mapSocketToNode, !cs_sendable_receivable_nodes);
+    void SocketHandler(CMasternodeSync& mn_sync) EXCLUSIVE_LOCKS_REQUIRED(!m_nodes_mutex, !m_total_bytes_sent_mutex, !mutexMsgProc, !cs_mapSocketToNode, !cs_sendable_receivable_nodes);
 
     /**
      * Do the read/write for connected sockets that are ready for IO.
      * @param[in] events_per_sock Sockets that are ready for IO.
      */
     void SocketHandlerConnected(const Sock::EventsPerSock& events_per_sock)
-        EXCLUSIVE_LOCKS_REQUIRED(!m_total_bytes_sent_mutex, !mutexMsgProc, !cs_sendable_receivable_nodes, !cs_mapSocketToNode, !cs_sendable_receivable_nodes);
+        EXCLUSIVE_LOCKS_REQUIRED(!m_nodes_mutex, !m_total_bytes_sent_mutex, !mutexMsgProc, !cs_sendable_receivable_nodes, !cs_mapSocketToNode, !cs_sendable_receivable_nodes);
 
     /**
      * Accept incoming connections, one from each read-ready listening socket.
      * @param[in] events_per_sock Sockets that are ready for IO.
      */
     void SocketHandlerListening(const Sock::EventsPerSock& events_per_sock, CMasternodeSync& mn_sync)
-        EXCLUSIVE_LOCKS_REQUIRED(!mutexMsgProc, !cs_mapSocketToNode);
+        EXCLUSIVE_LOCKS_REQUIRED(!m_nodes_mutex, !mutexMsgProc, !cs_mapSocketToNode);
 
     void ThreadSocketHandler(CMasternodeSync& mn_sync)
         EXCLUSIVE_LOCKS_REQUIRED(!m_total_bytes_sent_mutex, !mutexMsgProc, !m_nodes_mutex, !m_reconnections_mutex, !cs_mapSocketToNode, !cs_sendable_receivable_nodes);
@@ -1645,18 +1651,23 @@ friend class CNode;
 
     uint64_t CalculateKeyedNetGroup(const CAddress& ad) const;
 
-    CNode* FindNode(const CNetAddr& ip, bool fExcludeDisconnecting = true);
-    CNode* FindNode(const std::string& addrName, bool fExcludeDisconnecting = true);
-    CNode* FindNode(const CService& addr, bool fExcludeDisconnecting = true);
+    CNode* FindNode(const CNetAddr& ip, bool fExcludeDisconnecting = true) EXCLUSIVE_LOCKS_REQUIRED(!m_nodes_mutex);
+    CNode* FindNode(const std::string& addrName, bool fExcludeDisconnecting = true) EXCLUSIVE_LOCKS_REQUIRED(!m_nodes_mutex);
+    CNode* FindNode(const CService& addr, bool fExcludeDisconnecting = true) EXCLUSIVE_LOCKS_REQUIRED(!m_nodes_mutex);
+
+    // Internal versions that require the lock to be held
+    CNode* FindNodeLocked(const CNetAddr& ip, bool fExcludeDisconnecting = true) EXCLUSIVE_LOCKS_REQUIRED(m_nodes_mutex);
+    CNode* FindNodeLocked(const std::string& addrName, bool fExcludeDisconnecting = true) EXCLUSIVE_LOCKS_REQUIRED(m_nodes_mutex);
+    CNode* FindNodeLocked(const CService& addr, bool fExcludeDisconnecting = true) EXCLUSIVE_LOCKS_REQUIRED(m_nodes_mutex);
 
     /**
      * Determine whether we're already connected to a given address, in order to
      * avoid initiating duplicate connections.
      */
-    bool AlreadyConnectedToAddress(const CAddress& addr);
+    bool AlreadyConnectedToAddress(const CAddress& addr) EXCLUSIVE_LOCKS_REQUIRED(!m_nodes_mutex);
 
-    bool AttemptToEvictConnection();
-    CNode* ConnectNode(CAddress addrConnect, const char *pszDest, bool fCountFailure, ConnectionType conn_type, bool use_v2transport) EXCLUSIVE_LOCKS_REQUIRED(!m_unused_i2p_sessions_mutex);
+    bool AttemptToEvictConnection() EXCLUSIVE_LOCKS_REQUIRED(!m_nodes_mutex);
+    CNode* ConnectNode(CAddress addrConnect, const char *pszDest, bool fCountFailure, ConnectionType conn_type, bool use_v2transport) EXCLUSIVE_LOCKS_REQUIRED(!m_nodes_mutex, !m_unused_i2p_sessions_mutex);
     void AddWhitelistPermissionFlags(NetPermissionFlags& flags, const CNetAddr &addr) const;
 
     void DeleteNode(CNode* pnode);
@@ -1666,7 +1677,7 @@ friend class CNode;
     /** (Try to) send data from node's vSendMsg. Returns (bytes_sent, data_left). */
     std::pair<size_t, bool> SocketSendData(CNode& node) const EXCLUSIVE_LOCKS_REQUIRED(node.cs_vSend);
 
-    size_t SocketRecvData(CNode* pnode) EXCLUSIVE_LOCKS_REQUIRED(!mutexMsgProc);
+    size_t SocketRecvData(CNode* pnode) EXCLUSIVE_LOCKS_REQUIRED(!m_nodes_mutex, !mutexMsgProc);
 
     void DumpAddresses();
 
@@ -1683,7 +1694,7 @@ friend class CNode;
     /**
      * Return vector of current BLOCK_RELAY peers.
      */
-    std::vector<CAddress> GetCurrentBlockRelayOnlyConns() const;
+    std::vector<CAddress> GetCurrentBlockRelayOnlyConns() const EXCLUSIVE_LOCKS_REQUIRED(!m_nodes_mutex);
 
     /**
      * Search for a "preferred" network, a reachable network to which we
@@ -1695,7 +1706,7 @@ friend class CNode;
      *
      * @return           bool        Whether a preferred network was found.
      */
-    bool MaybePickPreferredNetwork(std::optional<Network>& network);
+    bool MaybePickPreferredNetwork(std::optional<Network>& network) EXCLUSIVE_LOCKS_REQUIRED(!m_nodes_mutex);
 
     // Whether the node should be passed out in ForEach* callbacks
     static bool NodeFullyConnected(const CNode* pnode);
@@ -1735,7 +1746,7 @@ friend class CNode;
     mutable Mutex m_added_nodes_mutex;
     std::vector<CNode*> m_nodes GUARDED_BY(m_nodes_mutex);
     std::list<CNode*> m_nodes_disconnected;
-    mutable RecursiveMutex m_nodes_mutex;
+    mutable Mutex m_nodes_mutex;
     std::atomic<NodeId> nLastNodeId{0};
     unsigned int nPrevNodeCount{0};
 
@@ -1934,7 +1945,7 @@ friend class CNode;
     std::list<ReconnectionInfo> m_reconnections GUARDED_BY(m_reconnections_mutex);
 
     /** Attempt reconnections, if m_reconnections non-empty. */
-    void PerformReconnections() EXCLUSIVE_LOCKS_REQUIRED(!mutexMsgProc, !m_reconnections_mutex, !m_unused_i2p_sessions_mutex, !cs_mapSocketToNode);
+    void PerformReconnections() EXCLUSIVE_LOCKS_REQUIRED(!m_nodes_mutex, !mutexMsgProc, !m_reconnections_mutex, !m_unused_i2p_sessions_mutex, !cs_mapSocketToNode);
 
     /**
      * Cap on the size of `m_unused_i2p_sessions`, to ensure it does not
diff --git a/src/net_processing.cpp b/src/net_processing.cpp
index 63d5aac9657b..ea3800bdaab1 100644
--- a/src/net_processing.cpp
+++ b/src/net_processing.cpp
@@ -1299,23 +1299,23 @@ void PeerManagerImpl::MaybeSetPeerAsAnnouncingHeaderAndIDs(NodeId nodeid)
     }
     m_connman.ForNode(nodeid, [this](CNode* pfrom) EXCLUSIVE_LOCKS_REQUIRED(::cs_main) {
         AssertLockHeld(::cs_main);
-        if (lNodesAnnouncingHeaderAndIDs.size() >= 3) {
-            // As per BIP152, we only get 3 of our peers to announce
-            // blocks using compact encodings.
-            m_connman.ForNode(lNodesAnnouncingHeaderAndIDs.front(), [this](CNode* pnodeStop){
-                m_connman.PushMessage(pnodeStop, CNetMsgMaker(pnodeStop->GetCommonVersion()).Make(NetMsgType::SENDCMPCT, /*high_bandwidth=*/false, /*version=*/CMPCTBLOCKS_VERSION));
-                // save BIP152 bandwidth state: we select peer to be low-bandwidth
-                pnodeStop->m_bip152_highbandwidth_to = false;
-                return true;
-            });
-            lNodesAnnouncingHeaderAndIDs.pop_front();
-        }
         m_connman.PushMessage(pfrom, CNetMsgMaker(pfrom->GetCommonVersion()).Make(NetMsgType::SENDCMPCT, /*high_bandwidth=*/true, /*version=*/CMPCTBLOCKS_VERSION));
         // save BIP152 bandwidth state: we select peer to be high-bandwidth
         pfrom->m_bip152_highbandwidth_to = true;
         lNodesAnnouncingHeaderAndIDs.push_back(pfrom->GetId());
         return true;
     });
+    if (lNodesAnnouncingHeaderAndIDs.size() > 3) {
+        // As per BIP152, we only get 3 of our peers to announce
+        // blocks using compact encodings.
+        m_connman.ForNode(lNodesAnnouncingHeaderAndIDs.front(), [this](CNode* pnodeStop){
+            m_connman.PushMessage(pnodeStop, CNetMsgMaker(pnodeStop->GetCommonVersion()).Make(NetMsgType::SENDCMPCT, /*high_bandwidth=*/false, /*version=*/CMPCTBLOCKS_VERSION));
+            // save BIP152 bandwidth state: we select peer to be low-bandwidth
+            pnodeStop->m_bip152_highbandwidth_to = false;
+            return true;
+        });
+        lNodesAnnouncingHeaderAndIDs.pop_front();
+    }
 }
 
 bool PeerManagerImpl::TipMayBeStale()

From 63cf92d88ec56f1eaa52a3629da9288246ac3291 Mon Sep 17 00:00:00 2001
From: pasta <pasta@dashboost.org>
Date: Tue, 21 Oct 2025 22:10:25 -0500
Subject: [PATCH 227/656] perf: convert m_nodes_mutex from mutex to shared
 mutex

---
 src/net.cpp | 289 ++++++++++++++++++++++++++++++----------------------
 src/net.h   | 103 +++++++++++++++----
 src/sync.h  |   5 +
 3 files changed, 255 insertions(+), 142 deletions(-)

diff --git a/src/net.cpp b/src/net.cpp
index 3017fa2aeb50..0ce860e45c4e 100644
--- a/src/net.cpp
+++ b/src/net.cpp
@@ -338,10 +338,10 @@ bool IsLocal(const CService& addr)
     return mapLocalHost.count(addr) > 0;
 }
 
-CNode* CConnman::FindNodeLocked(const CNetAddr& ip, bool fExcludeDisconnecting)
+// Internal FindNodeLocked - const versions do the actual work
+const CNode* CConnman::FindNodeLocked(const CNetAddr& ip, bool fExcludeDisconnecting) const
 {
-    AssertLockHeld(m_nodes_mutex);
-    for (CNode* pnode : m_nodes) {
+    for (const CNode* pnode : m_nodes) {
         if (fExcludeDisconnecting && pnode->fDisconnect) {
             continue;
         }
@@ -352,10 +352,9 @@ CNode* CConnman::FindNodeLocked(const CNetAddr& ip, bool fExcludeDisconnecting)
     return nullptr;
 }
 
-CNode* CConnman::FindNodeLocked(const std::string& addrName, bool fExcludeDisconnecting)
+const CNode* CConnman::FindNodeLocked(const std::string& addrName, bool fExcludeDisconnecting) const
 {
-    AssertLockHeld(m_nodes_mutex);
-    for (CNode* pnode : m_nodes) {
+    for (const CNode* pnode : m_nodes) {
         if (fExcludeDisconnecting && pnode->fDisconnect) {
             continue;
         }
@@ -366,10 +365,9 @@ CNode* CConnman::FindNodeLocked(const std::string& addrName, bool fExcludeDiscon
     return nullptr;
 }
 
-CNode* CConnman::FindNodeLocked(const CService& addr, bool fExcludeDisconnecting)
+const CNode* CConnman::FindNodeLocked(const CService& addr, bool fExcludeDisconnecting) const
 {
-    AssertLockHeld(m_nodes_mutex);
-    for (CNode* pnode : m_nodes) {
+    for (const CNode* pnode : m_nodes) {
         if (fExcludeDisconnecting && pnode->fDisconnect) {
             continue;
         }
@@ -380,32 +378,53 @@ CNode* CConnman::FindNodeLocked(const CService& addr, bool fExcludeDisconnecting
     return nullptr;
 }
 
-CNode* CConnman::FindNode(const CNetAddr& ip, bool fExcludeDisconnecting)
+const CNode* CConnman::FindNodeLocked(NodeId id, bool fExcludeDisconnecting) const
 {
-    LOCK(m_nodes_mutex);
-    return FindNodeLocked(ip, fExcludeDisconnecting);
+    for (const CNode* pnode : m_nodes) {
+        if (fExcludeDisconnecting && pnode->fDisconnect) {
+            continue;
+        }
+        if (pnode->GetId() == id) {
+            return pnode;
+        }
+    }
+    return nullptr;
 }
 
-CNode* CConnman::FindNode(const std::string& addrName, bool fExcludeDisconnecting)
+CNode* CConnman::FindNodeLockedMutable(const CNetAddr& ip, bool fExcludeDisconnecting)
 {
-    LOCK(m_nodes_mutex);
-    return FindNodeLocked(addrName, fExcludeDisconnecting);
+    AssertLockHeld(m_nodes_mutex);
+    return const_cast<CNode*>(FindNodeLocked(ip, fExcludeDisconnecting));
 }
 
-CNode* CConnman::FindNode(const CService& addr, bool fExcludeDisconnecting)
+CNode* CConnman::FindNodeLockedMutable(const std::string& addrName, bool fExcludeDisconnecting)
 {
-    LOCK(m_nodes_mutex);
-    return FindNodeLocked(addr, fExcludeDisconnecting);
+    AssertLockHeld(m_nodes_mutex);
+    return const_cast<CNode*>(FindNodeLocked(addrName, fExcludeDisconnecting));
 }
 
-bool CConnman::AlreadyConnectedToAddress(const CAddress& addr)
+CNode* CConnman::FindNodeLockedMutable(const CService& addr, bool fExcludeDisconnecting)
 {
-    return FindNode(addr.ToStringAddrPort());
+    AssertLockHeld(m_nodes_mutex);
+    return const_cast<CNode*>(FindNodeLocked(addr, fExcludeDisconnecting));
 }
 
-bool CConnman::CheckIncomingNonce(uint64_t nonce)
+CNode* CConnman::FindNodeLockedMutable(NodeId id, bool fExcludeDisconnecting)
 {
-    LOCK(m_nodes_mutex);
+    AssertLockHeld(m_nodes_mutex);
+    return const_cast<CNode*>(FindNodeLocked(id, fExcludeDisconnecting));
+}
+
+
+bool CConnman::AlreadyConnectedToAddress(const CAddress& addr) const
+{
+    READ_LOCK(m_nodes_mutex);
+    return FindNodeLocked(addr.ToStringAddrPort()) != nullptr;
+}
+
+bool CConnman::CheckIncomingNonce(uint64_t nonce) const
+{
+    READ_LOCK(m_nodes_mutex);
     for (const CNode* pnode : m_nodes) {
         if (!pnode->fSuccessfullyConnected && !pnode->IsInboundConn() && pnode->GetLocalNonce() == nonce)
             return false;
@@ -438,8 +457,7 @@ CNode* CConnman::ConnectNode(CAddress addrConnect, const char *pszDest, bool fCo
         }
 
         // Look for an existing connection
-        CNode* pnode = FindNode(static_cast<CService>(addrConnect));
-        if (pnode)
+        if (WithNodeShared(static_cast<CService>(addrConnect), [](const CNode*){ return true; }))
         {
             LogPrintf("Failed to open new connection, already connected\n");
             return nullptr;
@@ -475,9 +493,7 @@ CNode* CConnman::ConnectNode(CAddress addrConnect, const char *pszDest, bool fCo
                 }
                 // It is possible that we already have a connection to the IP/port pszDest resolved to.
                 // In that case, drop the connection that was just created.
-                LOCK(m_nodes_mutex);
-                CNode* pnode = FindNodeLocked(static_cast<CService>(addrConnect));
-                if (pnode) {
+                if (WithNodeExclusive(static_cast<CService>(addrConnect), [&](CNode* /*pnode*/){ return true; })) {
                     LogPrintf("Not opening a connection to %s, already connected to %s\n", pszDest, addrConnect.ToStringAddrPort());
                     return nullptr;
                 }
@@ -655,7 +671,7 @@ bool CNode::IsConnectedThroughPrivacyNet() const
 
 #undef X
 #define X(name) stats.name = name
-void CNode::CopyStats(CNodeStats& stats)
+void CNode::CopyStats(CNodeStats& stats) const
 {
     stats.nodeid = this->GetId();
     X(addr);
@@ -1801,6 +1817,56 @@ std::pair<size_t, bool> CConnman::SocketSendData(CNode& node) const
     return {nSentSize, data_left};
 }
 
+std::vector<NodeEvictionCandidate> CConnman::GetEvictionCandidates() const
+{
+    std::vector<NodeEvictionCandidate> vEvictionCandidates;
+    READ_LOCK(m_nodes_mutex);
+
+    for (const CNode* node : m_nodes) {
+        if (node->fDisconnect)
+            continue;
+
+        if (m_active_masternode) {
+            // This handles eviction protected nodes. Nodes are always protected for a short time after the connection
+            // was accepted. This short time is meant for the VERSION/VERACK exchange and the possible MNAUTH that might
+            // follow when the incoming connection is from another masternode. When a message other than MNAUTH
+            // is received after VERSION/VERACK, the protection is lifted immediately.
+            bool isProtected = GetTime<std::chrono::seconds>() - node->m_connected < INBOUND_EVICTION_PROTECTION_TIME;
+            if (node->nTimeFirstMessageReceived.load() != 0s && !node->fFirstMessageIsMNAUTH) {
+                isProtected = false;
+            }
+            // if MNAUTH was valid, the node is always protected (and at the same time not accounted when
+            // checking incoming connection limits)
+            if (!node->GetVerifiedProRegTxHash().IsNull()) {
+                isProtected = true;
+            }
+            if (isProtected) {
+                continue;
+            }
+        }
+
+        NodeEvictionCandidate candidate{
+            .id = node->GetId(),
+            .m_connected = node->m_connected,
+            .m_min_ping_time = node->m_min_ping_time,
+            .m_last_block_time = node->m_last_block_time,
+            .m_last_tx_time = node->m_last_tx_time,
+            .fRelevantServices = node->m_has_all_wanted_services,
+            .m_relay_txs = node->m_relays_txs.load(),
+            .fBloomFilter = node->m_bloom_filter_loaded.load(),
+            .nKeyedNetGroup = node->nKeyedNetGroup,
+            .prefer_evict = node->m_prefer_evict,
+            .m_is_local = node->addr.IsLocal(),
+            .m_network = node->ConnectedThroughNetwork(),
+            .m_noban = node->HasPermission(NetPermissionFlags::NoBan),
+            .m_conn_type = node->m_conn_type,
+        };
+        vEvictionCandidates.push_back(candidate);
+    }
+
+    return vEvictionCandidates;
+}
+
 /** Try to find a connection to evict when the node is full.
  *  Extreme care must be taken to avoid opening the node to attacker
  *   triggered network partitioning.
@@ -1811,65 +1877,16 @@ std::pair<size_t, bool> CConnman::SocketSendData(CNode& node) const
  */
 bool CConnman::AttemptToEvictConnection()
 {
-    std::vector<NodeEvictionCandidate> vEvictionCandidates;
-    {
-        LOCK(m_nodes_mutex);
-
-        for (const CNode* node : m_nodes) {
-            if (node->fDisconnect)
-                continue;
-
-            if (m_active_masternode) {
-                // This handles eviction protected nodes. Nodes are always protected for a short time after the connection
-                // was accepted. This short time is meant for the VERSION/VERACK exchange and the possible MNAUTH that might
-                // follow when the incoming connection is from another masternode. When a message other than MNAUTH
-                // is received after VERSION/VERACK, the protection is lifted immediately.
-                bool isProtected = GetTime<std::chrono::seconds>() - node->m_connected < INBOUND_EVICTION_PROTECTION_TIME;
-                if (node->nTimeFirstMessageReceived.load() != 0s && !node->fFirstMessageIsMNAUTH) {
-                    isProtected = false;
-                }
-                // if MNAUTH was valid, the node is always protected (and at the same time not accounted when
-                // checking incoming connection limits)
-                if (!node->GetVerifiedProRegTxHash().IsNull()) {
-                    isProtected = true;
-                }
-                if (isProtected) {
-                    continue;
-                }
-            }
-
-            NodeEvictionCandidate candidate{
-                .id = node->GetId(),
-                .m_connected = node->m_connected,
-                .m_min_ping_time = node->m_min_ping_time,
-                .m_last_block_time = node->m_last_block_time,
-                .m_last_tx_time = node->m_last_tx_time,
-                .fRelevantServices = node->m_has_all_wanted_services,
-                .m_relay_txs = node->m_relays_txs.load(),
-                .fBloomFilter = node->m_bloom_filter_loaded.load(),
-                .nKeyedNetGroup = node->nKeyedNetGroup,
-                .prefer_evict = node->m_prefer_evict,
-                .m_is_local = node->addr.IsLocal(),
-                .m_network = node->ConnectedThroughNetwork(),
-                .m_noban = node->HasPermission(NetPermissionFlags::NoBan),
-                .m_conn_type = node->m_conn_type,
-            };
-            vEvictionCandidates.push_back(candidate);
-        }
-    }
+    std::vector<NodeEvictionCandidate> vEvictionCandidates = GetEvictionCandidates();
     const std::optional<NodeId> node_id_to_evict = SelectNodeToEvict(std::move(vEvictionCandidates));
     if (!node_id_to_evict) {
         return false;
     }
-    LOCK(m_nodes_mutex);
-    for (CNode* pnode : m_nodes) {
-        if (pnode->GetId() == *node_id_to_evict) {
-            LogPrint(BCLog::NET_NETCONN, "selected %s connection for eviction peer=%d; disconnecting\n", pnode->ConnectionTypeAsString(), pnode->GetId());
-            pnode->fDisconnect = true;
-            return true;
-        }
-    }
-    return false;
+    return WithNodeExclusive(*node_id_to_evict, [](CNode* pnode){
+        LogPrint(BCLog::NET_NETCONN, "selected %s connection for eviction peer=%d; disconnecting\n", pnode->ConnectionTypeAsString(), pnode->GetId());
+        pnode->fDisconnect = true;
+        return true;
+    }).value_or(false);
 }
 
 void CConnman::AcceptConnection(const ListenSocket& hListenSocket, CMasternodeSync& mn_sync) {
@@ -1919,8 +1936,9 @@ void CConnman::CreateNodeFromAcceptedSocket(std::unique_ptr<Sock>&& sock,
         NetPermissions::AddFlag(permission_flags, NetPermissionFlags::NoBan);
     }
 
+        
     {
-        LOCK(m_nodes_mutex);
+        READ_LOCK(m_nodes_mutex);
         for (const CNode* pnode : m_nodes) {
             if (pnode->IsInboundConn()) {
                 nInbound++;
@@ -1929,7 +1947,6 @@ void CConnman::CreateNodeFromAcceptedSocket(std::unique_ptr<Sock>&& sock,
                 }
             }
         }
-
     }
 
     std::string strDropped;
@@ -2078,7 +2095,7 @@ bool CConnman::AddConnection(const std::string& address, ConnectionType conn_typ
     } // no default case, so the compiler can warn about missing cases
 
     // Count existing connections
-    int existing_connections = WITH_LOCK(m_nodes_mutex,
+    int existing_connections = WITH_READ_LOCK(m_nodes_mutex,
                                          return std::count_if(m_nodes.begin(), m_nodes.end(), [conn_type](CNode* node) { return node->m_conn_type == conn_type; }););
 
     // Max connections of specified type already exist
@@ -2219,11 +2236,7 @@ void CConnman::DisconnectNodes()
 
 void CConnman::NotifyNumConnectionsChanged(CMasternodeSync& mn_sync)
 {
-    size_t nodes_size;
-    {
-        LOCK(m_nodes_mutex);
-        nodes_size = m_nodes.size();
-    }
+    size_t nodes_size = WITH_READ_LOCK(m_nodes_mutex, return m_nodes.size(););
 
     // If we had zero connections before and new connections now or if we just dropped
     // to zero connections reset the sync process if its outdated.
@@ -2391,7 +2404,8 @@ void CConnman::SocketHandler(CMasternodeSync& mn_sync)
 
     bool only_poll = [this]() {
         // Check if we have work to do and thus should avoid waiting for events
-        LOCK2(m_nodes_mutex, cs_sendable_receivable_nodes);
+        READ_LOCK(m_nodes_mutex); // We acquire this to avoid the pointers stored in mapSendableNodes and mapReceivableNodes being invalidated by ThreadSocketHandler
+        LOCK(cs_sendable_receivable_nodes); 
         if (!mapReceivableNodes.empty()) {
             return true;
         }
@@ -2721,7 +2735,7 @@ void CConnman::ThreadDNSAddressSeed()
 
                     int nRelevant = 0;
                     {
-                        LOCK(m_nodes_mutex);
+                        READ_LOCK(m_nodes_mutex);
                         for (const CNode* pnode : m_nodes) {
                             if (pnode->fSuccessfullyConnected && !pnode->IsFullOutboundConn() && !pnode->m_masternode_probe_connection) ++nRelevant;
                         }
@@ -2846,7 +2860,7 @@ int CConnman::GetExtraFullOutboundCount() const
 {
     int full_outbound_peers = 0;
     {
-        LOCK(m_nodes_mutex);
+        READ_LOCK(m_nodes_mutex);
         for (const CNode* pnode : m_nodes) {
             // don't count outbound masternodes
             if (pnode->m_masternode_connection) {
@@ -2864,7 +2878,7 @@ int CConnman::GetExtraBlockRelayCount() const
 {
     int block_relay_peers = 0;
     {
-        LOCK(m_nodes_mutex);
+        READ_LOCK(m_nodes_mutex);
         for (const CNode* pnode : m_nodes) {
             if (pnode->fSuccessfullyConnected && !pnode->fDisconnect && pnode->IsBlockOnlyConn()) {
                 ++block_relay_peers;
@@ -2889,7 +2903,7 @@ std::unordered_set<Network> CConnman::GetReachableEmptyNetworks() const
 
 bool CConnman::MultipleManualOrFullOutboundConns(Network net) const
 {
-    AssertLockHeld(m_nodes_mutex);
+    AssertSharedLockHeld(m_nodes_mutex);
     return m_network_conn_counts[net] > 1;
 }
 
@@ -2898,7 +2912,7 @@ bool CConnman::MaybePickPreferredNetwork(std::optional<Network>& network)
     std::array<Network, 5> nets{NET_IPV4, NET_IPV6, NET_ONION, NET_I2P, NET_CJDNS};
     Shuffle(nets.begin(), nets.end(), FastRandomContext());
 
-    LOCK(m_nodes_mutex);
+    READ_LOCK(m_nodes_mutex);
     for (const auto net : nets) {
         if (g_reachable_nets.Contains(net) && m_network_conn_counts[net] == 0 && addrman.Size(net) != 0) {
             network = net;
@@ -3021,7 +3035,7 @@ void CConnman::ThreadOpenConnections(const std::vector<std::string> connect, CDe
         std::set<std::vector<unsigned char>> outbound_ipv46_peer_netgroups;
 
         if (!Params().AllowMultipleAddressesFromGroup()) {
-            LOCK(m_nodes_mutex);
+            READ_LOCK(m_nodes_mutex);
             for (const CNode* pnode : m_nodes) {
                 if (pnode->IsFullOutboundConn() && !pnode->m_masternode_connection) nOutboundFullRelay++;
                 if (pnode->IsBlockOnlyConn()) nOutboundBlockRelay++;
@@ -3060,8 +3074,8 @@ void CConnman::ThreadOpenConnections(const std::vector<std::string> connect, CDe
 
         std::set<uint256> setConnectedMasternodes;
         {
-            LOCK(m_nodes_mutex);
-            for (CNode* pnode : m_nodes) {
+            READ_LOCK(m_nodes_mutex);
+            for (const CNode* pnode : m_nodes) {
                 auto verifiedProRegTxHash = pnode->GetVerifiedProRegTxHash();
                 if (!verifiedProRegTxHash.IsNull()) {
                     setConnectedMasternodes.emplace(verifiedProRegTxHash);
@@ -3290,7 +3304,7 @@ void CConnman::ThreadOpenConnections(const std::vector<std::string> connect, CDe
 std::vector<CAddress> CConnman::GetCurrentBlockRelayOnlyConns() const
 {
     std::vector<CAddress> ret;
-    LOCK(m_nodes_mutex);
+    READ_LOCK(m_nodes_mutex);
     for (const CNode* pnode : m_nodes) {
         if (pnode->IsBlockRelayOnly()) {
             ret.push_back(pnode->addr);
@@ -3316,7 +3330,7 @@ std::vector<AddedNodeInfo> CConnman::GetAddedNodeInfo(bool include_connected) co
     std::map<CService, bool> mapConnected;
     std::map<std::string, std::pair<bool, CService>> mapConnectedByName;
     {
-        LOCK(m_nodes_mutex);
+        READ_LOCK(m_nodes_mutex);
         for (const CNode* pnode : m_nodes) {
             if (pnode->addr.IsValid()) {
                 mapConnected[pnode->addr] = pnode->IsInboundConn();
@@ -3447,19 +3461,22 @@ void CConnman::ThreadOpenMasternodeConnections(CDeterministicMNManager& dmnman,
                     if (connectedNodes.count(addr2) && !connectedProRegTxHashes.count(proRegTxHash)) {
                         // we probably connected to it before it became a masternode
                         // or maybe we are still waiting for mnauth
-                        // Use FindNodeLocked since we already hold m_nodes_mutex
-                        CNode* pnode = FindNodeLocked(addr2);
-                        if (pnode && pnode->nTimeFirstMessageReceived.load() != 0s && GetTime<std::chrono::seconds>() - pnode->nTimeFirstMessageReceived.load() > 5s) {
+                        // Use shared access since we already hold m_nodes_mutex
+                        bool slowHandshake = false;
+                        if (const CNode* pnode = FindNodeLocked(addr2)) {
+                            slowHandshake = pnode->nTimeFirstMessageReceived.load() != 0s && GetTime<std::chrono::seconds>() - pnode->nTimeFirstMessageReceived.load() > 5s;
+                        }
+                        if (slowHandshake) {
                             // clearly not expecting mnauth to take that long even if it wasn't the first message
                             // we received (as it should normally), disconnect
                             LogPrint(BCLog::NET_NETCONN, "CConnman::%s -- dropping non-mnauth connection to %s, service=%s\n", _func_, proRegTxHash.ToString(), addr2.ToStringAddrPort());
-                            pnode->fDisconnect = true;
+                            if (CNode* p2 = FindNodeLockedMutable(addr2)) { p2->fDisconnect = true; }
                         }
                         // either way - it's not ready, skip it for now
                         continue;
                     }
                     // Check if node is masternode or disconnect requested using FindNodeLocked
-                    CNode* existingNode = FindNodeLocked(addr2);
+                    const CNode* existingNode = FindNodeLocked(addr2);
                     bool isDisconnectRequested = existingNode && (existingNode->m_masternode_connection || existingNode->fDisconnect);
                     if (!connectedNodes.count(addr2) && !isDisconnectRequested && !connectedProRegTxHashes.count(proRegTxHash)) {
                         int64_t lastAttempt = mn_metaman.GetMetaInfo(dmn->proTxHash)->GetLastOutboundAttempt();
@@ -3515,8 +3532,11 @@ void CConnman::ThreadOpenMasternodeConnections(CDeterministicMNManager& dmnman,
                 // We already hold m_nodes_mutex here, so check fDisconnect and m_masternode_connection directly
                 bool shouldConnect = true;
                 if (dmn && !connectedNodes.count(dmn->pdmnState->netInfo->GetPrimary())) {
-                    CNode* pnode = FindNodeLocked(dmn->pdmnState->netInfo->GetPrimary());
-                    shouldConnect = !pnode || (!pnode->m_masternode_connection && !pnode->fDisconnect);
+                    bool anyBad = false;
+                    if (const CNode* pnode = FindNodeLocked(dmn->pdmnState->netInfo->GetPrimary())) {
+                        anyBad = pnode->m_masternode_connection || pnode->fDisconnect;
+                    }
+                    shouldConnect = !anyBad;
                 }
                 if (dmn && shouldConnect) {
                     LogPrint(BCLog::NET_NETCONN, "CConnman::%s -- opening pending masternode connection to %s, service=%s\n", _func_, dmn->proTxHash.ToString(), dmn->pdmnState->netInfo->GetPrimary().ToStringAddrPort());
@@ -3556,7 +3576,7 @@ void CConnman::ThreadOpenMasternodeConnections(CDeterministicMNManager& dmnman,
 
         OpenMasternodeConnection(CAddress(connectToDmn->pdmnState->netInfo->GetPrimary(), NODE_NETWORK), /*use_v2transport=*/GetLocalServices() & NODE_P2P_V2, isProbe);
         // should be in the list now if connection was opened
-        bool connected = ForNode(connectToDmn->pdmnState->netInfo->GetPrimary(), CConnman::AllNodes, [&](CNode* pnode) {
+        bool connected = ForNode(connectToDmn->pdmnState->netInfo->GetPrimary(), CConnman::AllNodes, [&](const CNode* pnode) {
             if (pnode->fDisconnect) {
                 return false;
             }
@@ -3606,7 +3626,7 @@ void CConnman::OpenNetworkConnection(const CAddress& addrConnect, bool fCountFai
         if (addrConnect.GetPort() == GetListenPort() && IsLocal(addrConnect)) {
             return;
         }
-    } else if (FindNode(std::string(pszDest)))
+    } else if (WithNodeShared(std::string(pszDest), [](const CNode*){ return true; }))
         return;
 
     LogPrint(BCLog::NET_NETCONN, "CConnman::%s -- connecting to %s\n", __func__, getIpStr());
@@ -4378,7 +4398,8 @@ Uint256HashSet CConnman::GetMasternodeQuorums(Consensus::LLMQType llmqType) cons
 
 std::vector<NodeId> CConnman::GetMasternodeQuorumNodes(Consensus::LLMQType llmqType, const uint256& quorumHash) const
 {
-    LOCK2(m_nodes_mutex, cs_vPendingMasternodes);
+    READ_LOCK(m_nodes_mutex);
+    LOCK(cs_vPendingMasternodes);
     auto it = masternodeQuorumNodes.find(std::make_pair(llmqType, quorumHash));
     if (it == masternodeQuorumNodes.end()) {
         return {};
@@ -4459,7 +4480,7 @@ void CConnman::AddPendingProbeConnections(const std::set<uint256> &proTxHashes)
 
 size_t CConnman::GetNodeCount(ConnectionDirection flags) const
 {
-    LOCK(m_nodes_mutex);
+    READ_LOCK(m_nodes_mutex);
 
     int nNum = 0;
     for (const auto& pnode : m_nodes) {
@@ -4498,9 +4519,9 @@ size_t CConnman::GetMaxOutboundOnionNodeCount()
 void CConnman::GetNodeStats(std::vector<CNodeStats>& vstats) const
 {
     vstats.clear();
-    LOCK(m_nodes_mutex);
+    READ_LOCK(m_nodes_mutex);
     vstats.reserve(m_nodes.size());
-    for (CNode* pnode : m_nodes) {
+    for (const CNode* pnode : m_nodes) {
         if (pnode->fDisconnect) {
             continue;
         }
@@ -4512,13 +4533,11 @@ void CConnman::GetNodeStats(std::vector<CNodeStats>& vstats) const
 
 bool CConnman::DisconnectNode(const std::string& strNode)
 {
-    LOCK(m_nodes_mutex);
-    if (CNode* pnode = FindNodeLocked(strNode)) {
+    return WithNodeExclusive(strNode, [&](CNode* pnode){
         LogPrint(BCLog::NET_NETCONN, "disconnect by address%s matched peer=%d; disconnecting\n", (fLogIPs ? strprintf("=%s", strNode) : ""), pnode->GetId());
         pnode->fDisconnect = true;
         return true;
-    }
-    return false;
+    }).value_or(false);
 }
 
 bool CConnman::DisconnectNode(const CSubNet& subnet)
@@ -4798,6 +4817,8 @@ void CConnman::PushMessage(CNode* pnode, CSerializedNetMsg&& msg)
     }
 }
 
+ 
+
 bool CConnman::ForNode(const CService& addr, std::function<bool(const CNode* pnode)> cond, std::function<bool(CNode* pnode)> func)
 {
     CNode* found = nullptr;
@@ -4811,6 +4832,32 @@ bool CConnman::ForNode(const CService& addr, std::function<bool(const CNode* pno
     return found != nullptr && cond(found) && func(found);
 }
 
+bool CConnman::ForNode(const CService& addr, std::function<bool(const CNode* pnode)> cond, std::function<bool(const CNode* pnode)> func) const
+{
+    CNode* found = nullptr;
+    READ_LOCK(m_nodes_mutex);
+    for (auto&& pnode : m_nodes) {
+        if((CService)pnode->addr == addr) {
+            found = pnode;
+            break;
+        }
+    }
+    return found != nullptr && cond(found) && func(found);
+}
+
+bool CConnman::ForNode(NodeId id, std::function<bool(const CNode* pnode)> cond, std::function<bool(const CNode* pnode)> func) const
+{
+    CNode* found = nullptr;
+    READ_LOCK(m_nodes_mutex);
+    for (auto&& pnode : m_nodes) {
+        if(pnode->GetId() == id) {
+            found = pnode;
+            break;
+        }
+    }
+    return found != nullptr && cond(found) && func(found);
+}
+
 bool CConnman::ForNode(NodeId id, std::function<bool(const CNode* pnode)> cond, std::function<bool(CNode* pnode)> func)
 {
     CNode* found = nullptr;
@@ -4825,7 +4872,7 @@ bool CConnman::ForNode(NodeId id, std::function<bool(const CNode* pnode)> cond,
 }
 
 bool CConnman::IsMasternodeOrDisconnectRequested(const CService& addr) {
-    return ForNode(addr, AllNodes, [](CNode* pnode){
+    return ForNode(addr, AllNodes, [](const CNode* pnode){
         return pnode->m_masternode_connection || pnode->fDisconnect;
     });
 }
@@ -4834,7 +4881,7 @@ CConnman::NodesSnapshot::NodesSnapshot(const CConnman& connman, std::function<bo
                                        bool shuffle)
 {
     {
-        LOCK(connman.m_nodes_mutex);
+        READ_LOCK(connman.m_nodes_mutex);
         m_nodes_copy.reserve(connman.m_nodes.size());
 
         for (auto& node : connman.m_nodes) {
diff --git a/src/net.h b/src/net.h
index d3b1ae0b86ef..73cbb80e6737 100644
--- a/src/net.h
+++ b/src/net.h
@@ -48,6 +48,7 @@
 #include <optional>
 #include <queue>
 #include <thread>
+#include <type_traits>
 #include <unordered_set>
 #include <vector>
 
@@ -61,6 +62,7 @@ class CMasternodeSync;
 class CNode;
 class CScheduler;
 struct bilingual_str;
+struct NodeEvictionCandidate;
 
 /** Default for -whitelistrelay. */
 static const bool DEFAULT_WHITELISTRELAY = true;
@@ -730,9 +732,9 @@ class CNode
     /** Messages still to be fed to m_transport->SetMessageToSend. */
     std::deque<CSerializedNetMsg> vSendMsg GUARDED_BY(cs_vSend);
     std::atomic<size_t> nSendMsgSize{0};
-    Mutex cs_vSend;
+    mutable Mutex cs_vSend;
     Mutex m_sock_mutex;
-    Mutex cs_vRecv;
+    mutable Mutex cs_vRecv;
 
     uint64_t nRecvBytes GUARDED_BY(cs_vRecv){0};
 
@@ -755,7 +757,7 @@ class CNode
     const bool m_inbound_onion;
     std::atomic<int> nNumWarningsSkipped{0};
     std::atomic<int> nVersion{0};
-    Mutex m_subver_mutex;
+    mutable Mutex m_subver_mutex;
     /**
      * cleanSubVer is a sanitized string of the user agent byte array we read
      * from the wire. This cleaned string can safely be logged or displayed.
@@ -1027,7 +1029,7 @@ class CNode
 
     void CloseSocketDisconnect(CConnman* connman) EXCLUSIVE_LOCKS_REQUIRED(!m_sock_mutex);
 
-    void CopyStats(CNodeStats& stats) EXCLUSIVE_LOCKS_REQUIRED(!m_subver_mutex, !m_addr_local_mutex, !cs_vSend, !cs_vRecv, !cs_mnauth);
+    void CopyStats(CNodeStats& stats) const EXCLUSIVE_LOCKS_REQUIRED(!m_subver_mutex, !m_addr_local_mutex, !cs_vSend, !cs_vRecv, !cs_mnauth);
 
     std::string ConnectionTypeAsString() const { return ::ConnectionTypeAsString(m_conn_type); }
 
@@ -1277,10 +1279,10 @@ friend class CNode;
         EXCLUSIVE_LOCKS_REQUIRED(!m_nodes_mutex, !m_unused_i2p_sessions_mutex, !mutexMsgProc, !cs_mapSocketToNode);
     void OpenMasternodeConnection(const CAddress& addrConnect, bool use_v2transport, MasternodeProbeConn probe = MasternodeProbeConn::IsConnection)
         EXCLUSIVE_LOCKS_REQUIRED(!m_nodes_mutex, !m_unused_i2p_sessions_mutex, !mutexMsgProc, !cs_mapSocketToNode);
-    bool CheckIncomingNonce(uint64_t nonce) EXCLUSIVE_LOCKS_REQUIRED(!m_nodes_mutex);
+    bool CheckIncomingNonce(uint64_t nonce) const EXCLUSIVE_LOCKS_REQUIRED(!m_nodes_mutex);
 
     // alias for thread safety annotations only, not defined
-    Mutex& GetNodesMutex() const LOCK_RETURNED(m_nodes_mutex);
+    SharedMutex& GetNodesMutex() const LOCK_RETURNED(m_nodes_mutex);
 
     struct CFullyConnectedOnly {
         bool operator() (const CNode* pnode) const {
@@ -1297,7 +1299,9 @@ friend class CNode;
     constexpr static const CAllNodes AllNodes{};
 
     bool ForNode(NodeId id, std::function<bool(const CNode* pnode)> cond, std::function<bool(CNode* pnode)> func) EXCLUSIVE_LOCKS_REQUIRED(!m_nodes_mutex);
-    bool ForNode(const CService& addr, std::function<bool(const CNode* pnode)> cond, std::function<bool(CNode* pnode)> func) EXCLUSIVE_LOCKS_REQUIRED(!m_nodes_mutex);
+    bool ForNode(NodeId id, std::function<bool(const CNode* pnode)> cond, std::function<bool(const CNode* pnode)> func) const EXCLUSIVE_LOCKS_REQUIRED(!m_nodes_mutex);
+    bool ForNode(const CService& addr, std::function<bool(const CNode* pnode)> cond, std::function<bool(CNode* pnode)> func)  EXCLUSIVE_LOCKS_REQUIRED(!m_nodes_mutex);
+    bool ForNode(const CService& addr, std::function<bool(const CNode* pnode)> cond, std::function<bool(const CNode* pnode)> func) const EXCLUSIVE_LOCKS_REQUIRED(!m_nodes_mutex);
 
     template<typename Callable>
     bool ForNode(const CService& addr, Callable&& func) EXCLUSIVE_LOCKS_REQUIRED(!m_nodes_mutex)
@@ -1345,7 +1349,7 @@ friend class CNode;
     template<typename Condition, typename Callable>
     bool ForEachNodeContinueIf(const Condition& cond, Callable&& func) const EXCLUSIVE_LOCKS_REQUIRED(!m_nodes_mutex)
     {
-        LOCK(m_nodes_mutex);
+        READ_LOCK(m_nodes_mutex);
         for (const auto& node : m_nodes)
             if (cond(node))
                 if(!func(node))
@@ -1377,7 +1381,7 @@ friend class CNode;
     template<typename Condition, typename Callable>
     void ForEachNode(const Condition& cond, Callable&& func) const EXCLUSIVE_LOCKS_REQUIRED(!m_nodes_mutex)
     {
-        LOCK(m_nodes_mutex);
+        READ_LOCK(m_nodes_mutex);
         for (auto&& node : m_nodes) {
             if (cond(node))
                 func(node);
@@ -1409,7 +1413,7 @@ friend class CNode;
     template<typename Condition, typename Callable, typename CallableAfter>
     void ForEachNodeThen(const Condition& cond, Callable&& pre, CallableAfter&& post) const EXCLUSIVE_LOCKS_REQUIRED(!m_nodes_mutex)
     {
-        LOCK(m_nodes_mutex);
+        READ_LOCK(m_nodes_mutex);
         for (auto&& node : m_nodes) {
             if (cond(node))
                 pre(node);
@@ -1535,7 +1539,7 @@ friend class CNode;
     /** Return true if we should disconnect the peer for failing an inactivity check. */
     bool ShouldRunInactivityChecks(const CNode& node, std::chrono::seconds now) const;
 
-    bool MultipleManualOrFullOutboundConns(Network net) const EXCLUSIVE_LOCKS_REQUIRED(m_nodes_mutex);
+    bool MultipleManualOrFullOutboundConns(Network net) const SHARED_LOCKS_REQUIRED(m_nodes_mutex);
 
     /**
      * RAII helper to atomically create a copy of `m_nodes` and add a reference
@@ -1651,21 +1655,78 @@ friend class CNode;
 
     uint64_t CalculateKeyedNetGroup(const CAddress& ad) const;
 
-    CNode* FindNode(const CNetAddr& ip, bool fExcludeDisconnecting = true) EXCLUSIVE_LOCKS_REQUIRED(!m_nodes_mutex);
-    CNode* FindNode(const std::string& addrName, bool fExcludeDisconnecting = true) EXCLUSIVE_LOCKS_REQUIRED(!m_nodes_mutex);
-    CNode* FindNode(const CService& addr, bool fExcludeDisconnecting = true) EXCLUSIVE_LOCKS_REQUIRED(!m_nodes_mutex);
+    const CNode* FindNodeLocked(const CNetAddr& ip, bool fExcludeDisconnecting = true) const SHARED_LOCKS_REQUIRED(m_nodes_mutex);
+    const CNode* FindNodeLocked(const std::string& addrName, bool fExcludeDisconnecting = true) const SHARED_LOCKS_REQUIRED(m_nodes_mutex);
+    const CNode* FindNodeLocked(const CService& addr, bool fExcludeDisconnecting = true) const SHARED_LOCKS_REQUIRED(m_nodes_mutex);
+    const CNode* FindNodeLocked(NodeId id, bool fExcludeDisconnecting = true) const SHARED_LOCKS_REQUIRED(m_nodes_mutex);
+
+    // Mutable find helpers for callers that already hold the exclusive lock
+    CNode* FindNodeLockedMutable(const CNetAddr& ip, bool fExcludeDisconnecting = true) EXCLUSIVE_LOCKS_REQUIRED(m_nodes_mutex);
+    CNode* FindNodeLockedMutable(const std::string& addrName, bool fExcludeDisconnecting = true) EXCLUSIVE_LOCKS_REQUIRED(m_nodes_mutex);
+    CNode* FindNodeLockedMutable(const CService& addr, bool fExcludeDisconnecting = true) EXCLUSIVE_LOCKS_REQUIRED(m_nodes_mutex);
+    CNode* FindNodeLockedMutable(NodeId id, bool fExcludeDisconnecting = true) EXCLUSIVE_LOCKS_REQUIRED(m_nodes_mutex);
+
+    // Type-agnostic node matching helpers
+    static inline bool NodeMatches(const CNode* p, const CService& addr)
+    {
+        return static_cast<CService>(p->addr) == addr;
+    }
+    static inline bool NodeMatches(const CNode* p, const CNetAddr& ip)
+    {
+        return static_cast<CNetAddr>(p->addr) == ip;
+    }
+    static inline bool NodeMatches(const CNode* p, const std::string& addrName)
+    {
+        return p->m_addr_name == addrName;
+    }
+    static inline bool NodeMatches(const CNode* p, const NodeId id)
+    {
+        return p->GetId() == id;
+    }
+
+    template<typename Key>
+    const CNode* FindNodeLockedBy(const Key& key, bool fExcludeDisconnecting = true) const SHARED_LOCKS_REQUIRED(m_nodes_mutex)
+    {
+        for (const CNode* pnode : m_nodes) {
+            if (fExcludeDisconnecting && pnode->fDisconnect) continue;
+            if (NodeMatches(pnode, key)) return pnode;
+        }
+        return nullptr;
+    }
+
+    // Callback helpers with explicit lock semantics (templated on key type)
+    // Lambda-based shared accessor returning optional result (nullopt = not found)
+    template<typename Key, typename Callable>
+    std::optional<std::invoke_result_t<Callable, const CNode*>> WithNodeShared(const Key& key, Callable&& fn) EXCLUSIVE_LOCKS_REQUIRED(!m_nodes_mutex)
+    {
+        READ_LOCK(m_nodes_mutex);
+        if (const CNode* p = FindNodeLockedBy(key)) return std::optional<std::invoke_result_t<Callable, const CNode*>>{fn(p)};
+        return std::nullopt;
+    }
 
-    // Internal versions that require the lock to be held
-    CNode* FindNodeLocked(const CNetAddr& ip, bool fExcludeDisconnecting = true) EXCLUSIVE_LOCKS_REQUIRED(m_nodes_mutex);
-    CNode* FindNodeLocked(const std::string& addrName, bool fExcludeDisconnecting = true) EXCLUSIVE_LOCKS_REQUIRED(m_nodes_mutex);
-    CNode* FindNodeLocked(const CService& addr, bool fExcludeDisconnecting = true) EXCLUSIVE_LOCKS_REQUIRED(m_nodes_mutex);
+    // Fast existence check under shared lock
+    template<typename Key>
+    bool ExistsNodeShared(const Key& key) EXCLUSIVE_LOCKS_REQUIRED(!m_nodes_mutex)
+    {
+        READ_LOCK(m_nodes_mutex);
+        return FindNodeLockedBy(key) != nullptr;
+    }
+
+    template<typename Key, typename Callable>
+    std::optional<std::invoke_result_t<Callable, CNode*>> WithNodeExclusive(const Key& key, Callable&& fn) EXCLUSIVE_LOCKS_REQUIRED(!m_nodes_mutex)
+    {
+        LOCK(m_nodes_mutex);
+        if (const CNode* cp = FindNodeLockedBy(key)) return std::optional<std::invoke_result_t<Callable, CNode*>>{fn(const_cast<CNode*>(cp))};
+        return std::nullopt;
+    }
 
     /**
      * Determine whether we're already connected to a given address, in order to
      * avoid initiating duplicate connections.
      */
-    bool AlreadyConnectedToAddress(const CAddress& addr) EXCLUSIVE_LOCKS_REQUIRED(!m_nodes_mutex);
+    bool AlreadyConnectedToAddress(const CAddress& addr) const EXCLUSIVE_LOCKS_REQUIRED(!m_nodes_mutex);
 
+    std::vector<NodeEvictionCandidate> GetEvictionCandidates() const EXCLUSIVE_LOCKS_REQUIRED(!m_nodes_mutex);
     bool AttemptToEvictConnection() EXCLUSIVE_LOCKS_REQUIRED(!m_nodes_mutex);
     CNode* ConnectNode(CAddress addrConnect, const char *pszDest, bool fCountFailure, ConnectionType conn_type, bool use_v2transport) EXCLUSIVE_LOCKS_REQUIRED(!m_nodes_mutex, !m_unused_i2p_sessions_mutex);
     void AddWhitelistPermissionFlags(NetPermissionFlags& flags, const CNetAddr &addr) const;
@@ -1746,12 +1807,12 @@ friend class CNode;
     mutable Mutex m_added_nodes_mutex;
     std::vector<CNode*> m_nodes GUARDED_BY(m_nodes_mutex);
     std::list<CNode*> m_nodes_disconnected;
-    mutable Mutex m_nodes_mutex;
+    mutable SharedMutex m_nodes_mutex;
     std::atomic<NodeId> nLastNodeId{0};
     unsigned int nPrevNodeCount{0};
 
     // Stores number of full-tx connections (outbound and manual) per network
-    std::array<unsigned int, Network::NET_MAX> m_network_conn_counts GUARDED_BY(m_nodes_mutex) = {};
+    std::array<unsigned int, Network::NET_MAX> m_network_conn_counts GUARDED_BY(m_nodes_mutex) = {}; // TODO consider moving this to seperate mutex
 
     std::vector<uint256> vPendingMasternodes;
     mutable RecursiveMutex cs_vPendingMasternodes;
diff --git a/src/sync.h b/src/sync.h
index 8ca945cca76f..e22fb3c62ad7 100644
--- a/src/sync.h
+++ b/src/sync.h
@@ -161,6 +161,11 @@ using SharedMutex = SharedAnnotatedMixin<std::shared_mutex>;
 
 #define AssertLockHeld(cs) AssertLockHeldInternal(#cs, __FILE__, __LINE__, &cs)
 
+// For shared locks, we use the same internal function but disable thread safety analysis
+// because the function signature requires exclusive lock but we only have shared lock
+inline void AssertSharedLockHeldInline(const char* name, const char* file, int line, SharedMutex* cs) NO_THREAD_SAFETY_ANALYSIS { AssertLockHeldInternal(name, file, line, cs); }
+#define AssertSharedLockHeld(cs) (AssertSharedLockHeldInline(#cs, __FILE__, __LINE__, &cs))
+
 inline void AssertLockNotHeldInline(const char* name, const char* file, int line, Mutex* cs) EXCLUSIVE_LOCKS_REQUIRED(!cs) { AssertLockNotHeldInternal(name, file, line, cs); }
 inline void AssertLockNotHeldInline(const char* name, const char* file, int line, RecursiveMutex* cs) LOCKS_EXCLUDED(cs) { AssertLockNotHeldInternal(name, file, line, cs); }
 inline void AssertLockNotHeldInline(const char* name, const char* file, int line, GlobalMutex* cs) LOCKS_EXCLUDED(cs) { AssertLockNotHeldInternal(name, file, line, cs); }

From 7121c3cc6829720c3eafbddecb7dc599c97324cd Mon Sep 17 00:00:00 2001
From: pasta <pasta@dashboost.org>
Date: Tue, 21 Oct 2025 22:26:17 -0500
Subject: [PATCH 228/656] code review fixes

---
 src/net.cpp | 2 +-
 src/net.h   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/net.cpp b/src/net.cpp
index 0ce860e45c4e..5ed1037179d2 100644
--- a/src/net.cpp
+++ b/src/net.cpp
@@ -419,7 +419,7 @@ CNode* CConnman::FindNodeLockedMutable(NodeId id, bool fExcludeDisconnecting)
 bool CConnman::AlreadyConnectedToAddress(const CAddress& addr) const
 {
     READ_LOCK(m_nodes_mutex);
-    return FindNodeLocked(addr.ToStringAddrPort()) != nullptr;
+    return FindNodeLocked(static_cast<CService>(addr)) != nullptr;
 }
 
 bool CConnman::CheckIncomingNonce(uint64_t nonce) const
diff --git a/src/net.h b/src/net.h
index 73cbb80e6737..15ddd9c4e322 100644
--- a/src/net.h
+++ b/src/net.h
@@ -1637,7 +1637,7 @@ friend class CNode;
      * @param[in] events_per_sock Sockets that are ready for IO.
      */
     void SocketHandlerConnected(const Sock::EventsPerSock& events_per_sock)
-        EXCLUSIVE_LOCKS_REQUIRED(!m_nodes_mutex, !m_total_bytes_sent_mutex, !mutexMsgProc, !cs_sendable_receivable_nodes, !cs_mapSocketToNode, !cs_sendable_receivable_nodes);
+        EXCLUSIVE_LOCKS_REQUIRED(!m_nodes_mutex, !m_total_bytes_sent_mutex, !mutexMsgProc, !cs_sendable_receivable_nodes, !cs_mapSocketToNode);
 
     /**
      * Accept incoming connections, one from each read-ready listening socket.

From 420f6148048754ce5d22cd32584abbce0ec64f13 Mon Sep 17 00:00:00 2001
From: pasta <pasta@dashboost.org>
Date: Tue, 21 Oct 2025 22:35:48 -0500
Subject: [PATCH 229/656] style: clean up whitespace in net.cpp

---
 src/net.cpp | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/net.cpp b/src/net.cpp
index 5ed1037179d2..aa6eb382e60a 100644
--- a/src/net.cpp
+++ b/src/net.cpp
@@ -1936,7 +1936,7 @@ void CConnman::CreateNodeFromAcceptedSocket(std::unique_ptr<Sock>&& sock,
         NetPermissions::AddFlag(permission_flags, NetPermissionFlags::NoBan);
     }
 
-        
+
     {
         READ_LOCK(m_nodes_mutex);
         for (const CNode* pnode : m_nodes) {
@@ -2405,7 +2405,7 @@ void CConnman::SocketHandler(CMasternodeSync& mn_sync)
     bool only_poll = [this]() {
         // Check if we have work to do and thus should avoid waiting for events
         READ_LOCK(m_nodes_mutex); // We acquire this to avoid the pointers stored in mapSendableNodes and mapReceivableNodes being invalidated by ThreadSocketHandler
-        LOCK(cs_sendable_receivable_nodes); 
+        LOCK(cs_sendable_receivable_nodes);
         if (!mapReceivableNodes.empty()) {
             return true;
         }
@@ -4817,8 +4817,6 @@ void CConnman::PushMessage(CNode* pnode, CSerializedNetMsg&& msg)
     }
 }
 
- 
-
 bool CConnman::ForNode(const CService& addr, std::function<bool(const CNode* pnode)> cond, std::function<bool(CNode* pnode)> func)
 {
     CNode* found = nullptr;

From 9af4c5550dab83e9c181e9cfa3a24dcb1c5de49b Mon Sep 17 00:00:00 2001
From: Konstantin Akimov <knstqq@gmail.com>
Date: Wed, 22 Oct 2025 13:42:04 +0700
Subject: [PATCH 230/656] fix: typos and capitalizations

Co-authored-by: thephez <thephez@users.noreply.github.com>
---
 src/rpc/evo.cpp            | 10 +++++-----
 src/rpc/governance.cpp     |  6 +++---
 src/rpc/quorums.cpp        |  4 ++--
 src/rpc/rawtransaction.cpp |  4 ++--
 4 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/rpc/evo.cpp b/src/rpc/evo.cpp
index 60c1c35b3db4..aa96e1cccfb0 100644
--- a/src/rpc/evo.cpp
+++ b/src/rpc/evo.cpp
@@ -1657,9 +1657,9 @@ static RPCHelpMan protx_listdiff()
                 RPCResult {
                     RPCResult::Type::OBJ, "", "",
                     {
-                        {RPCResult::Type::NUM, "baseHeight", "height of base (starting) block"},
-                        {RPCResult::Type::NUM, "blockHeight", "height of target (ending) block"},
-                        {RPCResult::Type::ARR, "addedMNs", "added masternodes",
+                        {RPCResult::Type::NUM, "baseHeight", "Height of base (starting) block"},
+                        {RPCResult::Type::NUM, "blockHeight", "Height of target (ending) block"},
+                        {RPCResult::Type::ARR, "addedMNs", "Added masternodes",
                             {
                                 {RPCResult::Type::OBJ, "", "",
                                 {
@@ -1668,12 +1668,12 @@ static RPCHelpMan protx_listdiff()
                                 }},
                             },
                         },
-                        {RPCResult::Type::ARR, "removedMns", "removed masternodes",
+                        {RPCResult::Type::ARR, "removedMns", "Removed masternodes",
                             {
                                 {RPCResult::Type::STR_HEX, "protx", "ProTx of removed masternode"},
                             },
                         },
-                        {RPCResult::Type::ARR, "updatedMNs", "updated masternodes",
+                        {RPCResult::Type::ARR, "updatedMNs", "Updated masternodes",
                             {
                                 {RPCResult::Type::OBJ, "", "",
                                 {
diff --git a/src/rpc/governance.cpp b/src/rpc/governance.cpp
index 6ff3bb60d001..c67eb7749538 100644
--- a/src/rpc/governance.cpp
+++ b/src/rpc/governance.cpp
@@ -515,7 +515,7 @@ namespace {
 const RPCResult vote_results{
     RPCResult::Type::OBJ, "", "",
         {
-            {RPCResult::Type::STR, "overall", "Total amount of successful and failed votes"},
+            {RPCResult::Type::STR, "overall", "Total number of successful and failed votes"},
             {RPCResult::Type::OBJ, "detail", "Detailed information for each vote",
             {
                 {RPCResult::Type::OBJ, "protx", "ProTx of masternode for voting",
@@ -714,14 +714,14 @@ static RPCHelpMan gobject_list_helper(const bool make_a_diff)
             {"type", RPCArg::Type::STR, RPCArg::Default{"all"}, "object type, possible values: [proposals|triggers|all]"},
         },
         {
-            RPCResult{"if request is valid",
+            RPCResult{"If request is valid",
                 RPCResult::Type::OBJ, "hash", "Object details",
                 {
                     // TODO: list fields of output for RPC help instead ELISION
                     {RPCResult::Type::ELISION, "", ""}
                 },
             },
-            RPCResult{"if request is invalid",
+            RPCResult{"If request is invalid",
                 RPCResult::Type::STR, "", "Error string"
             },
         },
diff --git a/src/rpc/quorums.cpp b/src/rpc/quorums.cpp
index af89f33789cd..da9e2e29d71f 100644
--- a/src/rpc/quorums.cpp
+++ b/src/rpc/quorums.cpp
@@ -295,7 +295,7 @@ static RPCHelpMan quorum_dkgstatus()
                         {RPCResult::Type::OBJ, "", "",
                         {
                             {RPCResult::Type::NUM, "llmqType", "Name of quorum"},
-                            {RPCResult::Type::NUM, "quorumIndex", "Relevant for rotation quorums only, for non rotating quorums is 0"},
+                            {RPCResult::Type::NUM, "quorumIndex", "Relevant for rotation quorums only, 0 for non-rotating quorums"},
                             {RPCResult::Type::OBJ, "status", "",
                             {
                                 // TODO: list fields of output for RPC help instead ELISION
@@ -1105,7 +1105,7 @@ static RPCHelpMan verifyislock()
             {"signature", RPCArg::Type::STR, RPCArg::Optional::NO, "The InstantSend Lock signature to verify."},
             {"maxHeight", RPCArg::Type::NUM, RPCArg::Default{-1}, "The maximum height to search quorums from."},
         },
-        RPCResult{RPCResult::Type::BOOL, "", "Returns true if the instantsent is valid"},
+        RPCResult{RPCResult::Type::BOOL, "", "Returns true if the instantsend lock is valid"},
         RPCExamples{""},
         [&](const RPCHelpMan& self, const JSONRPCRequest& request) -> UniValue
 {
diff --git a/src/rpc/rawtransaction.cpp b/src/rpc/rawtransaction.cpp
index ddca93f4669d..f9b7397ebba7 100644
--- a/src/rpc/rawtransaction.cpp
+++ b/src/rpc/rawtransaction.cpp
@@ -361,14 +361,14 @@ static RPCHelpMan getrawtransactionmulti() {
             RPCResult{
                 RPCResult::Type::OBJ, "", "",
                 {
-                    {"if verbose is not set or set to false",
+                    {"If verbose is not set or set to false",
                         RPCResult::Type::STR_HEX, "txid", "The serialized, hex-encoded data for 'txid'"},
                     {"if verbose is set to true",
                         RPCResult::Type::OBJ, "txid", "The decoded network-serialized transaction.",
                         {
                             {RPCResult::Type::ELISION, "", "The layout is the same as the output of getrawtransaction."},
                         }},
-                    {"if tx is unknown", RPCResult::Type::STR, "txid", "None"},
+                    {"If tx is unknown", RPCResult::Type::STR, "txid", "None"},
                 },
             },
             RPCExamples{

From 6563ade3c70dd10572061081cc1991bbb6eb7fde Mon Sep 17 00:00:00 2001
From: Kittywhiskers Van Gogh <63189531+kwvg@users.noreply.github.com>
Date: Mon, 8 Sep 2025 23:27:47 +0000
Subject: [PATCH 231/656] refactor: remove unused `CSigningManager` from
 `CChainLocksHandler` ctor

---
 src/chainlock/chainlock.cpp | 4 ++--
 src/chainlock/chainlock.h   | 4 ++--
 src/llmq/context.cpp        | 3 +--
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/src/chainlock/chainlock.cpp b/src/chainlock/chainlock.cpp
index d87dcb52ba1b..bb4380170cf0 100644
--- a/src/chainlock/chainlock.cpp
+++ b/src/chainlock/chainlock.cpp
@@ -43,8 +43,8 @@ bool AreChainLocksEnabled(const CSporkManager& sporkman)
     return sporkman.IsSporkActive(SPORK_19_CHAINLOCKS_ENABLED);
 }
 
-CChainLocksHandler::CChainLocksHandler(CChainState& chainstate, CQuorumManager& _qman, CSigningManager& _sigman,
-                                       CSporkManager& sporkman, CTxMemPool& _mempool, const CMasternodeSync& mn_sync) :
+CChainLocksHandler::CChainLocksHandler(CChainState& chainstate, CQuorumManager& _qman, CSporkManager& sporkman,
+                                       CTxMemPool& _mempool, const CMasternodeSync& mn_sync) :
     m_chainstate{chainstate},
     qman{_qman},
     spork_manager{sporkman},
diff --git a/src/chainlock/chainlock.h b/src/chainlock/chainlock.h
index a9f375223636..ab6b0a108582 100644
--- a/src/chainlock/chainlock.h
+++ b/src/chainlock/chainlock.h
@@ -66,8 +66,8 @@ class CChainLocksHandler final : public chainlock::ChainLockSignerParent
     std::atomic<std::chrono::seconds> lastCleanupTime{0s};
 
 public:
-    explicit CChainLocksHandler(CChainState& chainstate, CQuorumManager& _qman, CSigningManager& _sigman,
-                                CSporkManager& sporkman, CTxMemPool& _mempool, const CMasternodeSync& mn_sync);
+    explicit CChainLocksHandler(CChainState& chainstate, CQuorumManager& _qman, CSporkManager& sporkman,
+                                CTxMemPool& _mempool, const CMasternodeSync& mn_sync);
     ~CChainLocksHandler();
 
     void ConnectSigner(gsl::not_null<chainlock::ChainLockSigner*> signer)
diff --git a/src/llmq/context.cpp b/src/llmq/context.cpp
index 75e98f40bbfb..c6056f1741ab 100644
--- a/src/llmq/context.cpp
+++ b/src/llmq/context.cpp
@@ -34,8 +34,7 @@ LLMQContext::LLMQContext(ChainstateManager& chainman, CDeterministicMNManager& d
                                                 unit_tests, wipe)},
     sigman{std::make_unique<llmq::CSigningManager>(mn_activeman, chainman.ActiveChainstate(), *qman, unit_tests, wipe)},
     shareman{std::make_unique<llmq::CSigSharesManager>(*sigman, mn_activeman, *qman, sporkman)},
-    clhandler{std::make_unique<llmq::CChainLocksHandler>(chainman.ActiveChainstate(), *qman, *sigman, sporkman, mempool,
-                                                         mn_sync)},
+    clhandler{std::make_unique<llmq::CChainLocksHandler>(chainman.ActiveChainstate(), *qman, sporkman, mempool, mn_sync)},
     isman{std::make_unique<llmq::CInstantSendManager>(*clhandler, chainman.ActiveChainstate(), *qman, *sigman, sporkman,
                                                       mempool, mn_sync, unit_tests, wipe)}
 {

From 74afa2840331d908e69e0ccaf71a1e59e3b3f3bd Mon Sep 17 00:00:00 2001
From: Kittywhiskers Van Gogh <63189531+kwvg@users.noreply.github.com>
Date: Wed, 22 Oct 2025 17:18:13 +0530
Subject: [PATCH 232/656] refactor: move `CSigSharesManager` to `ActiveContext`

---
 src/init.cpp                            |  5 ++++
 src/llmq/context.cpp                    |  7 ------
 src/llmq/context.h                      |  2 --
 src/masternode/active/context.cpp       | 33 +++++++++++++++++++------
 src/masternode/active/context.h         | 21 ++++++++++------
 src/net_processing.cpp                  |  2 +-
 src/rpc/quorums.cpp                     | 12 ++++++---
 test/lint/lint-circular-dependencies.py |  1 +
 8 files changed, 56 insertions(+), 27 deletions(-)

diff --git a/src/init.cpp b/src/init.cpp
index 6b73e69bb862..c83bd17c4581 100644
--- a/src/init.cpp
+++ b/src/init.cpp
@@ -231,6 +231,9 @@ void Interrupt(NodeContext& node)
     InterruptRPC();
     InterruptREST();
     InterruptTorControl();
+    if (node.active_ctx) {
+        node.active_ctx->Interrupt();
+    }
     if (node.llmq_ctx) {
         node.llmq_ctx->Interrupt();
     }
@@ -266,6 +269,7 @@ void PrepareShutdown(NodeContext& node)
     StopREST();
     StopRPC();
     StopHTTPServer();
+    if (node.active_ctx) node.active_ctx->Stop();
     if (node.llmq_ctx) node.llmq_ctx->Stop();
 
     for (const auto& client : node.chain_clients) {
@@ -2253,6 +2257,7 @@ bool AppInitMain(NodeContext& node, interfaces::BlockAndHeaderTipInfo* tip_info)
     // ********************************************************* Step 10a: schedule Dash-specific tasks
 
     node.llmq_ctx->Start(*node.connman, *node.peerman);
+    if (node.active_ctx) node.active_ctx->Start(*node.connman, *node.peerman);
 
     node.scheduler->scheduleEvery(std::bind(&CNetFulfilledRequestManager::DoMaintenance, std::ref(*node.netfulfilledman)), std::chrono::minutes{1});
     node.scheduler->scheduleEvery(std::bind(&CMasternodeSync::DoMaintenance, std::ref(*node.mn_sync), std::cref(*node.peerman), std::cref(*node.govman)), std::chrono::seconds{1});
diff --git a/src/llmq/context.cpp b/src/llmq/context.cpp
index c6056f1741ab..35feaae44e46 100644
--- a/src/llmq/context.cpp
+++ b/src/llmq/context.cpp
@@ -12,7 +12,6 @@
 #include <llmq/dkgsessionmgr.h>
 #include <llmq/quorums.h>
 #include <llmq/signing.h>
-#include <llmq/signing_shares.h>
 #include <llmq/snapshot.h>
 #include <validation.h>
 
@@ -33,7 +32,6 @@ LLMQContext::LLMQContext(ChainstateManager& chainman, CDeterministicMNManager& d
                                                 *quorum_block_processor, *qsnapman, mn_activeman, mn_sync, sporkman,
                                                 unit_tests, wipe)},
     sigman{std::make_unique<llmq::CSigningManager>(mn_activeman, chainman.ActiveChainstate(), *qman, unit_tests, wipe)},
-    shareman{std::make_unique<llmq::CSigSharesManager>(*sigman, mn_activeman, *qman, sporkman)},
     clhandler{std::make_unique<llmq::CChainLocksHandler>(chainman.ActiveChainstate(), *qman, sporkman, mempool, mn_sync)},
     isman{std::make_unique<llmq::CInstantSendManager>(*clhandler, chainman.ActiveChainstate(), *qman, *sigman, sporkman,
                                                       mempool, mn_sync, unit_tests, wipe)}
@@ -48,7 +46,6 @@ LLMQContext::~LLMQContext() {
 
 void LLMQContext::Interrupt() {
     isman->InterruptWorkerThread();
-    shareman->InterruptWorkerThread();
     sigman->InterruptWorkerThread();
 }
 
@@ -59,8 +56,6 @@ void LLMQContext::Start(CConnman& connman, PeerManager& peerman)
     }
     qman->Start();
     sigman->StartWorkerThread(peerman);
-    shareman->RegisterAsRecoveredSigsListener();
-    shareman->StartWorkerThread(connman, peerman);
     clhandler->Start(*isman);
     isman->Start(peerman);
 }
@@ -68,8 +63,6 @@ void LLMQContext::Start(CConnman& connman, PeerManager& peerman)
 void LLMQContext::Stop() {
     isman->Stop();
     clhandler->Stop();
-    shareman->StopWorkerThread();
-    shareman->UnregisterAsRecoveredSigsListener();
     sigman->StopWorkerThread();
     qman->Stop();
     if (is_masternode) {
diff --git a/src/llmq/context.h b/src/llmq/context.h
index d27b2a7a8137..e1864e22c17d 100644
--- a/src/llmq/context.h
+++ b/src/llmq/context.h
@@ -28,7 +28,6 @@ class CInstantSendManager;
 class CQuorumBlockProcessor;
 class CQuorumManager;
 class CQuorumSnapshotManager;
-class CSigSharesManager;
 class CSigningManager;
 }
 
@@ -66,7 +65,6 @@ struct LLMQContext {
     const std::unique_ptr<llmq::CDKGSessionManager> qdkgsman;
     const std::unique_ptr<llmq::CQuorumManager> qman;
     const std::unique_ptr<llmq::CSigningManager> sigman;
-    const std::unique_ptr<llmq::CSigSharesManager> shareman;
     const std::unique_ptr<llmq::CChainLocksHandler> clhandler;
     const std::unique_ptr<llmq::CInstantSendManager> isman;
 };
diff --git a/src/masternode/active/context.cpp b/src/masternode/active/context.cpp
index 23ff1e24ba3d..6fe4170dd6e2 100644
--- a/src/masternode/active/context.cpp
+++ b/src/masternode/active/context.cpp
@@ -13,6 +13,7 @@
 #include <instantsend/signing.h>
 #include <llmq/context.h>
 #include <llmq/ehf_signals.h>
+#include <llmq/signing_shares.h>
 #include <validation.h>
 
 ActiveContext::ActiveContext(ChainstateManager& chainman, CConnman& connman, CDeterministicMNManager& dmnman,
@@ -21,16 +22,17 @@ ActiveContext::ActiveContext(ChainstateManager& chainman, CConnman& connman, CDe
                              PeerManager& peerman, const CActiveMasternodeManager& mn_activeman,
                              const CMasternodeSync& mn_sync) :
     m_llmq_ctx{llmq_ctx},
-    cl_signer{std::make_unique<chainlock::ChainLockSigner>(chainman.ActiveChainstate(), *llmq_ctx.clhandler,
-                                                           *llmq_ctx.sigman, *llmq_ctx.shareman, sporkman, mn_sync)},
-    is_signer{std::make_unique<instantsend::InstantSendSigner>(chainman.ActiveChainstate(), *llmq_ctx.clhandler,
-                                                               *llmq_ctx.isman, *llmq_ctx.sigman, *llmq_ctx.shareman,
-                                                               *llmq_ctx.qman, sporkman, mempool, mn_sync)},
     cj_server{std::make_unique<CCoinJoinServer>(chainman, connman, dmnman, dstxman, mn_metaman, mempool, peerman,
                                                 mn_activeman, mn_sync, *llmq_ctx.isman)},
     gov_signer{std::make_unique<GovernanceSigner>(connman, dmnman, govman, mn_activeman, chainman, mn_sync)},
-    ehf_sighandler{std::make_unique<llmq::CEHFSignalsHandler>(chainman, mnhfman, *llmq_ctx.sigman, *llmq_ctx.shareman,
-                                                              *llmq_ctx.qman)}
+    shareman{std::make_unique<llmq::CSigSharesManager>(*llmq_ctx.sigman, &mn_activeman, *llmq_ctx.qman, sporkman)},
+    ehf_sighandler{
+        std::make_unique<llmq::CEHFSignalsHandler>(chainman, mnhfman, *llmq_ctx.sigman, *shareman, *llmq_ctx.qman)},
+    cl_signer{std::make_unique<chainlock::ChainLockSigner>(chainman.ActiveChainstate(), *llmq_ctx.clhandler,
+                                                           *llmq_ctx.sigman, *shareman, sporkman, mn_sync)},
+    is_signer{std::make_unique<instantsend::InstantSendSigner>(chainman.ActiveChainstate(), *llmq_ctx.clhandler,
+                                                               *llmq_ctx.isman, *llmq_ctx.sigman, *shareman,
+                                                               *llmq_ctx.qman, sporkman, mempool, mn_sync)}
 {
     m_llmq_ctx.clhandler->ConnectSigner(cl_signer.get());
     m_llmq_ctx.isman->ConnectSigner(is_signer.get());
@@ -41,3 +43,20 @@ ActiveContext::~ActiveContext()
     m_llmq_ctx.clhandler->DisconnectSigner();
     m_llmq_ctx.isman->DisconnectSigner();
 }
+
+void ActiveContext::Interrupt()
+{
+    shareman->InterruptWorkerThread();
+}
+
+void ActiveContext::Start(CConnman& connman, PeerManager& peerman)
+{
+    shareman->RegisterAsRecoveredSigsListener();
+    shareman->StartWorkerThread(connman, peerman);
+}
+
+void ActiveContext::Stop()
+{
+    shareman->StopWorkerThread();
+    shareman->UnregisterAsRecoveredSigsListener();
+}
diff --git a/src/masternode/active/context.h b/src/masternode/active/context.h
index ca1cf697ecc9..d6308b8c0b6e 100644
--- a/src/masternode/active/context.h
+++ b/src/masternode/active/context.h
@@ -30,6 +30,7 @@ class InstantSendSigner;
 } // namespace instantsend
 namespace llmq {
 class CEHFSignalsHandler;
+class CSigSharesManager;
 } // namespace llmq
 
 struct ActiveContext {
@@ -37,13 +38,6 @@ struct ActiveContext {
     // TODO: Switch to references to members when migration is finished
     LLMQContext& m_llmq_ctx;
 
-    /*
-     * Entities that are registered with LLMQContext members are not accessible
-     * and are managed with (Dis)connectSigner() in the (c/d)tor instead
-     */
-    const std::unique_ptr<chainlock::ChainLockSigner> cl_signer;
-    const std::unique_ptr<instantsend::InstantSendSigner> is_signer;
-
 public:
     ActiveContext() = delete;
     ActiveContext(const ActiveContext&) = delete;
@@ -53,6 +47,10 @@ struct ActiveContext {
                   PeerManager& peerman, const CActiveMasternodeManager& mn_activeman, const CMasternodeSync& mn_sync);
     ~ActiveContext();
 
+    void Interrupt();
+    void Start(CConnman& connman, PeerManager& peerman);
+    void Stop();
+
     /*
      * Entities that are only utilized when masternode mode is enabled
      * and are accessible in their own right
@@ -60,7 +58,16 @@ struct ActiveContext {
      */
     const std::unique_ptr<CCoinJoinServer> cj_server;
     const std::unique_ptr<GovernanceSigner> gov_signer;
+    const std::unique_ptr<llmq::CSigSharesManager> shareman;
     const std::unique_ptr<llmq::CEHFSignalsHandler> ehf_sighandler;
+
+private:
+    /*
+     * Entities that are registered with LLMQContext members are not accessible
+     * and are managed with (Dis)connectSigner() in the (c/d)tor instead
+     */
+    const std::unique_ptr<chainlock::ChainLockSigner> cl_signer;
+    const std::unique_ptr<instantsend::InstantSendSigner> is_signer;
 };
 
 #endif // BITCOIN_MASTERNODE_ACTIVE_CONTEXT_H
diff --git a/src/net_processing.cpp b/src/net_processing.cpp
index 63d5aac9657b..495909fe8dc5 100644
--- a/src/net_processing.cpp
+++ b/src/net_processing.cpp
@@ -5377,6 +5377,7 @@ void PeerManagerImpl::ProcessMessage(
 #endif // ENABLE_WALLET
         if (m_active_ctx) {
             PostProcessMessage(m_active_ctx->cj_server->ProcessMessage(pfrom, msg_type, vRecv), pfrom.GetId());
+            m_active_ctx->shareman->ProcessMessage(pfrom, *this, m_sporkman, msg_type, vRecv);
         }
         PostProcessMessage(m_sporkman.ProcessMessage(pfrom, m_connman, msg_type, vRecv), pfrom.GetId());
         m_mn_sync.ProcessMessage(pfrom, msg_type, vRecv);
@@ -5385,7 +5386,6 @@ void PeerManagerImpl::ProcessMessage(
         PostProcessMessage(m_llmq_ctx->quorum_block_processor->ProcessMessage(pfrom, msg_type, vRecv), pfrom.GetId());
         PostProcessMessage(m_llmq_ctx->qdkgsman->ProcessMessage(pfrom, is_masternode, msg_type, vRecv), pfrom.GetId());
         PostProcessMessage(m_llmq_ctx->qman->ProcessMessage(pfrom, m_connman, msg_type, vRecv), pfrom.GetId());
-        m_llmq_ctx->shareman->ProcessMessage(pfrom, *this, m_sporkman, msg_type, vRecv);
         PostProcessMessage(m_llmq_ctx->sigman->ProcessMessage(pfrom.GetId(), msg_type, vRecv), pfrom.GetId());
         PostProcessMessage(ProcessPlatformBanMessage(pfrom.GetId(), msg_type, vRecv), pfrom.GetId());
 
diff --git a/src/rpc/quorums.cpp b/src/rpc/quorums.cpp
index b12b738f9046..54e36be3a34d 100644
--- a/src/rpc/quorums.cpp
+++ b/src/rpc/quorums.cpp
@@ -28,6 +28,7 @@
 #include <llmq/signing_shares.h>
 #include <llmq/snapshot.h>
 #include <llmq/utils.h>
+#include <masternode/active/context.h>
 #include <masternode/node.h>
 
 #include <iomanip>
@@ -439,6 +440,10 @@ static RPCHelpMan quorum_memberof()
 static UniValue quorum_sign_helper(const JSONRPCRequest& request, Consensus::LLMQType llmqType)
 {
     const NodeContext& node = EnsureAnyNodeContext(request.context);
+    if (!node.mn_activeman) {
+        throw JSONRPCError(RPC_INTERNAL_ERROR, "Only available in masternode mode.");
+    }
+
     const ChainstateManager& chainman = EnsureChainman(node);
     const LLMQContext& llmq_ctx = EnsureLLMQContext(node);
 
@@ -459,7 +464,8 @@ static UniValue quorum_sign_helper(const JSONRPCRequest& request, Consensus::LLM
         fSubmit = ParseBoolV(request.params[3], "submit");
     }
     if (fSubmit) {
-        return llmq_ctx.sigman->AsyncSignIfMember(llmqType, *llmq_ctx.shareman, id, msgHash, quorumHash);
+        return llmq_ctx.sigman->AsyncSignIfMember(llmqType, *CHECK_NONFATAL(node.active_ctx)->shareman, id, msgHash,
+                                                  quorumHash);
     } else {
         const auto pQuorum = [&]() {
             if (quorumHash.IsNull()) {
@@ -473,7 +479,7 @@ static UniValue quorum_sign_helper(const JSONRPCRequest& request, Consensus::LLM
             throw JSONRPCError(RPC_INVALID_PARAMETER, "quorum not found");
         }
 
-        auto sigShare = llmq_ctx.shareman->CreateSigShare(pQuorum, id, msgHash);
+        auto sigShare = CHECK_NONFATAL(node.active_ctx)->shareman->CreateSigShare(pQuorum, id, msgHash);
 
         if (!sigShare.has_value() || !sigShare->sigShare.Get().IsValid()) {
             throw JSONRPCError(RPC_INVALID_PARAMETER, "failed to create sigShare");
@@ -742,7 +748,7 @@ static RPCHelpMan quorum_selectquorum()
 
     UniValue recoveryMembers(UniValue::VARR);
     for (int i = 0; i < quorum->params.recoveryMembers; ++i) {
-        auto dmn = llmq_ctx.shareman->SelectMemberForRecovery(quorum, id, i);
+        auto dmn = llmq::CSigSharesManager::SelectMemberForRecovery(quorum, id, i);
         recoveryMembers.push_back(dmn->proTxHash.ToString());
     }
     ret.pushKV("recoveryMembers", recoveryMembers);
diff --git a/test/lint/lint-circular-dependencies.py b/test/lint/lint-circular-dependencies.py
index 32718063789b..e22949bcffad 100755
--- a/test/lint/lint-circular-dependencies.py
+++ b/test/lint/lint-circular-dependencies.py
@@ -69,6 +69,7 @@
     "llmq/signing -> llmq/signing_shares -> llmq/signing",
     "llmq/signing -> net_processing -> llmq/signing",
     "llmq/signing_shares -> net_processing -> llmq/signing_shares",
+    "llmq/signing_shares -> net_processing -> masternode/active/context -> llmq/signing_shares",
     "masternode/payments -> validation -> masternode/payments",
     "net -> netmessagemaker -> net",
     "netaddress -> netbase -> netaddress",

From f6b02b79ddd6c770bc141e55a488137bb117cc40 Mon Sep 17 00:00:00 2001
From: Kittywhiskers Van Gogh <63189531+kwvg@users.noreply.github.com>
Date: Mon, 8 Sep 2025 09:47:34 +0000
Subject: [PATCH 233/656] refactor: move `CDKGSessionManager` thread management
 to `ActiveContext`

---
 src/init.cpp                      |  2 +-
 src/llmq/context.cpp              | 12 +++---------
 src/llmq/context.h                |  6 +-----
 src/masternode/active/context.cpp |  3 +++
 4 files changed, 8 insertions(+), 15 deletions(-)

diff --git a/src/init.cpp b/src/init.cpp
index c83bd17c4581..582f67fcd016 100644
--- a/src/init.cpp
+++ b/src/init.cpp
@@ -2256,7 +2256,7 @@ bool AppInitMain(NodeContext& node, interfaces::BlockAndHeaderTipInfo* tip_info)
 
     // ********************************************************* Step 10a: schedule Dash-specific tasks
 
-    node.llmq_ctx->Start(*node.connman, *node.peerman);
+    node.llmq_ctx->Start(*node.peerman);
     if (node.active_ctx) node.active_ctx->Start(*node.connman, *node.peerman);
 
     node.scheduler->scheduleEvery(std::bind(&CNetFulfilledRequestManager::DoMaintenance, std::ref(*node.netfulfilledman)), std::chrono::minutes{1});
diff --git a/src/llmq/context.cpp b/src/llmq/context.cpp
index 35feaae44e46..61680c2c1dbe 100644
--- a/src/llmq/context.cpp
+++ b/src/llmq/context.cpp
@@ -19,7 +19,6 @@ LLMQContext::LLMQContext(ChainstateManager& chainman, CDeterministicMNManager& d
                          CMasternodeMetaMan& mn_metaman, CMNHFManager& mnhfman, CSporkManager& sporkman,
                          CTxMemPool& mempool, const CActiveMasternodeManager* const mn_activeman,
                          const CMasternodeSync& mn_sync, bool unit_tests, bool wipe) :
-    is_masternode{mn_activeman != nullptr},
     bls_worker{std::make_shared<CBLSWorker>()},
     dkg_debugman{std::make_unique<llmq::CDKGDebugManager>()},
     qsnapman{std::make_unique<llmq::CQuorumSnapshotManager>(evo_db)},
@@ -49,23 +48,18 @@ void LLMQContext::Interrupt() {
     sigman->InterruptWorkerThread();
 }
 
-void LLMQContext::Start(CConnman& connman, PeerManager& peerman)
+void LLMQContext::Start(PeerManager& peerman)
 {
-    if (is_masternode) {
-        qdkgsman->StartThreads(connman, peerman);
-    }
     qman->Start();
     sigman->StartWorkerThread(peerman);
     clhandler->Start(*isman);
     isman->Start(peerman);
 }
 
-void LLMQContext::Stop() {
+void LLMQContext::Stop()
+{
     isman->Stop();
     clhandler->Stop();
     sigman->StopWorkerThread();
     qman->Stop();
-    if (is_masternode) {
-        qdkgsman->StopThreads();
-    }
 }
diff --git a/src/llmq/context.h b/src/llmq/context.h
index e1864e22c17d..ef6e16009a69 100644
--- a/src/llmq/context.h
+++ b/src/llmq/context.h
@@ -9,7 +9,6 @@
 
 class CActiveMasternodeManager;
 class CBLSWorker;
-class CConnman;
 class ChainstateManager;
 class CDeterministicMNManager;
 class CEvoDB;
@@ -32,9 +31,6 @@ class CSigningManager;
 }
 
 struct LLMQContext {
-private:
-    const bool is_masternode;
-
 public:
     LLMQContext() = delete;
     LLMQContext(const LLMQContext&) = delete;
@@ -45,7 +41,7 @@ struct LLMQContext {
     ~LLMQContext();
 
     void Interrupt();
-    void Start(CConnman& connman, PeerManager& peerman);
+    void Start(PeerManager& peerman);
     void Stop();
 
     /** Guaranteed if LLMQContext is initialized then all members are valid too
diff --git a/src/masternode/active/context.cpp b/src/masternode/active/context.cpp
index 6fe4170dd6e2..d166b639786e 100644
--- a/src/masternode/active/context.cpp
+++ b/src/masternode/active/context.cpp
@@ -12,6 +12,7 @@
 #include <instantsend/instantsend.h>
 #include <instantsend/signing.h>
 #include <llmq/context.h>
+#include <llmq/dkgsessionmgr.h>
 #include <llmq/ehf_signals.h>
 #include <llmq/signing_shares.h>
 #include <validation.h>
@@ -51,6 +52,7 @@ void ActiveContext::Interrupt()
 
 void ActiveContext::Start(CConnman& connman, PeerManager& peerman)
 {
+    m_llmq_ctx.qdkgsman->StartThreads(connman, peerman);
     shareman->RegisterAsRecoveredSigsListener();
     shareman->StartWorkerThread(connman, peerman);
 }
@@ -59,4 +61,5 @@ void ActiveContext::Stop()
 {
     shareman->StopWorkerThread();
     shareman->UnregisterAsRecoveredSigsListener();
+    m_llmq_ctx.qdkgsman->StopThreads();
 }

From c1b3047d66ab30b274ce7172f22ee62d637a5ee2 Mon Sep 17 00:00:00 2001
From: pasta <pasta@dashboost.org>
Date: Wed, 22 Oct 2025 12:12:45 -0500
Subject: [PATCH 234/656] perf: only acquire exclusive locks on m_nodes_mutex
 if we mutate m_nodes; CNode is internally thread safe

---
 src/net.cpp         | 36 +++++++++++++-----------------------
 src/net.h           | 27 +++------------------------
 src/test/util/net.h |  2 +-
 3 files changed, 17 insertions(+), 48 deletions(-)

diff --git a/src/net.cpp b/src/net.cpp
index aa6eb382e60a..9b4a07a55690 100644
--- a/src/net.cpp
+++ b/src/net.cpp
@@ -493,7 +493,7 @@ CNode* CConnman::ConnectNode(CAddress addrConnect, const char *pszDest, bool fCo
                 }
                 // It is possible that we already have a connection to the IP/port pszDest resolved to.
                 // In that case, drop the connection that was just created.
-                if (WithNodeExclusive(static_cast<CService>(addrConnect), [&](CNode* /*pnode*/){ return true; })) {
+                if (ExistsNodeShared(static_cast<CService>(addrConnect))) {
                     LogPrintf("Not opening a connection to %s, already connected to %s\n", pszDest, addrConnect.ToStringAddrPort());
                     return nullptr;
                 }
@@ -2616,7 +2616,7 @@ size_t CConnman::SocketRecvData(CNode *pnode)
     {
         bool notify = false;
         if (!pnode->ReceiveMsgBytes(Span<const uint8_t>(pchBuf, nBytes), notify)) {
-            LOCK(m_nodes_mutex);
+            READ_LOCK(m_nodes_mutex); // is this here for lock ordering?
             pnode->CloseSocketDisconnect(this);
         }
         RecordBytesRecv(nBytes);
@@ -2631,7 +2631,7 @@ size_t CConnman::SocketRecvData(CNode *pnode)
         if (!pnode->fDisconnect) {
             LogPrint(BCLog::NET, "socket closed for peer=%d\n", pnode->GetId());
         }
-        LOCK(m_nodes_mutex);
+        READ_LOCK(m_nodes_mutex); // is this here for lock ordering?
         pnode->fOtherSideDisconnected = true; // avoid lingering
         pnode->CloseSocketDisconnect(this);
     }
@@ -2644,7 +2644,7 @@ size_t CConnman::SocketRecvData(CNode *pnode)
             if (!pnode->fDisconnect){
                 LogPrint(BCLog::NET, "socket recv error for peer=%d: %s\n", pnode->GetId(), NetworkErrorString(nErr));
             }
-            LOCK(m_nodes_mutex);
+            READ_LOCK(m_nodes_mutex); // is this here for lock ordering?
             pnode->fOtherSideDisconnected = true; // avoid lingering
             pnode->CloseSocketDisconnect(this);
         }
@@ -4543,7 +4543,7 @@ bool CConnman::DisconnectNode(const std::string& strNode)
 bool CConnman::DisconnectNode(const CSubNet& subnet)
 {
     bool disconnected = false;
-    LOCK(m_nodes_mutex);
+    READ_LOCK(m_nodes_mutex);
     for (CNode* pnode : m_nodes) {
         if (subnet.Match(pnode->addr)) {
             LogPrint(BCLog::NET_NETCONN, "disconnect by subnet%s matched peer=%d; disconnecting\n", (fLogIPs ? strprintf("=%s", subnet.ToString()) : ""), pnode->GetId());
@@ -4561,15 +4561,11 @@ bool CConnman::DisconnectNode(const CNetAddr& addr)
 
 bool CConnman::DisconnectNode(NodeId id)
 {
-    LOCK(m_nodes_mutex);
-    for(CNode* pnode : m_nodes) {
-        if (id == pnode->GetId()) {
-            LogPrint(BCLog::NET_NETCONN, "disconnect by id peer=%d; disconnecting\n", pnode->GetId());
-            pnode->fDisconnect = true;
-            return true;
-        }
-    }
-    return false;
+    return WithNodeExclusive(id, [&](CNode* pnode){
+        LogPrint(BCLog::NET_NETCONN, "disconnect by id peer=%d; disconnecting\n", pnode->GetId());
+        pnode->fDisconnect = true;
+        return true;
+    }).value_or(false);
 }
 
 void CConnman::RecordBytesRecv(uint64_t bytes)
@@ -4819,8 +4815,8 @@ void CConnman::PushMessage(CNode* pnode, CSerializedNetMsg&& msg)
 
 bool CConnman::ForNode(const CService& addr, std::function<bool(const CNode* pnode)> cond, std::function<bool(CNode* pnode)> func)
 {
+    READ_LOCK(m_nodes_mutex);
     CNode* found = nullptr;
-    LOCK(m_nodes_mutex);
     for (auto&& pnode : m_nodes) {
         if((CService)pnode->addr == addr) {
             found = pnode;
@@ -4832,14 +4828,8 @@ bool CConnman::ForNode(const CService& addr, std::function<bool(const CNode* pno
 
 bool CConnman::ForNode(const CService& addr, std::function<bool(const CNode* pnode)> cond, std::function<bool(const CNode* pnode)> func) const
 {
-    CNode* found = nullptr;
     READ_LOCK(m_nodes_mutex);
-    for (auto&& pnode : m_nodes) {
-        if((CService)pnode->addr == addr) {
-            found = pnode;
-            break;
-        }
-    }
+    const CNode* found = FindNodeLockedBy(addr, false);
     return found != nullptr && cond(found) && func(found);
 }
 
@@ -4859,7 +4849,7 @@ bool CConnman::ForNode(NodeId id, std::function<bool(const CNode* pnode)> cond,
 bool CConnman::ForNode(NodeId id, std::function<bool(const CNode* pnode)> cond, std::function<bool(CNode* pnode)> func)
 {
     CNode* found = nullptr;
-    LOCK(m_nodes_mutex);
+    READ_LOCK(m_nodes_mutex);
     for (auto&& pnode : m_nodes) {
         if(pnode->GetId() == id) {
             found = pnode;
diff --git a/src/net.h b/src/net.h
index 15ddd9c4e322..d06e0c845cf7 100644
--- a/src/net.h
+++ b/src/net.h
@@ -1319,7 +1319,7 @@ friend class CNode;
 
     bool IsConnected(const CService& addr, std::function<bool(const CNode* pnode)> cond) EXCLUSIVE_LOCKS_REQUIRED(!m_nodes_mutex)
     {
-        return ForNode(addr, cond, [](CNode* pnode){
+        return ForNode(addr, cond, [](const CNode* pnode){
             return true;
         });
     }
@@ -1332,7 +1332,7 @@ friend class CNode;
     template<typename Condition, typename Callable>
     bool ForEachNodeContinueIf(const Condition& cond, Callable&& func) EXCLUSIVE_LOCKS_REQUIRED(!m_nodes_mutex)
     {
-        LOCK(m_nodes_mutex);
+        READ_LOCK(m_nodes_mutex);
         for (auto&& node : m_nodes)
             if (cond(node))
                 if(!func(node))
@@ -1363,16 +1363,6 @@ friend class CNode;
         return ForEachNodeContinueIf(FullyConnectedOnly, func);
     }
 
-    template<typename Condition, typename Callable>
-    void ForEachNode(const Condition& cond, Callable&& func) EXCLUSIVE_LOCKS_REQUIRED(!m_nodes_mutex)
-    {
-        LOCK(m_nodes_mutex);
-        for (auto&& node : m_nodes) {
-            if (cond(node))
-                func(node);
-        }
-    };
-
     void ForEachNode(const NodeFn& fn) EXCLUSIVE_LOCKS_REQUIRED(!m_nodes_mutex)
     {
         ForEachNode(FullyConnectedOnly, fn);
@@ -1393,17 +1383,6 @@ friend class CNode;
         ForEachNode(FullyConnectedOnly, fn);
     }
 
-    template<typename Condition, typename Callable, typename CallableAfter>
-    void ForEachNodeThen(const Condition& cond, Callable&& pre, CallableAfter&& post) EXCLUSIVE_LOCKS_REQUIRED(!m_nodes_mutex)
-    {
-        LOCK(m_nodes_mutex);
-        for (auto&& node : m_nodes) {
-            if (cond(node))
-                pre(node);
-        }
-        post();
-    };
-
     template<typename Callable, typename CallableAfter>
     void ForEachNodeThen(Callable&& pre, CallableAfter&& post) EXCLUSIVE_LOCKS_REQUIRED(!m_nodes_mutex)
     {
@@ -1715,7 +1694,7 @@ friend class CNode;
     template<typename Key, typename Callable>
     std::optional<std::invoke_result_t<Callable, CNode*>> WithNodeExclusive(const Key& key, Callable&& fn) EXCLUSIVE_LOCKS_REQUIRED(!m_nodes_mutex)
     {
-        LOCK(m_nodes_mutex);
+        READ_LOCK(m_nodes_mutex);
         if (const CNode* cp = FindNodeLockedBy(key)) return std::optional<std::invoke_result_t<Callable, CNode*>>{fn(const_cast<CNode*>(cp))};
         return std::nullopt;
     }
diff --git a/src/test/util/net.h b/src/test/util/net.h
index ab1d958546c8..a52a3ec753d1 100644
--- a/src/test/util/net.h
+++ b/src/test/util/net.h
@@ -41,7 +41,7 @@ struct ConnmanTestMsg : public CConnman {
 
     std::vector<CNode*> TestNodes()
     {
-        LOCK(m_nodes_mutex);
+        READ_LOCK(m_nodes_mutex);
         return m_nodes;
     }
 

From 489cf6e4c1aac9beba0bbd34f1be63d8f24ce82d Mon Sep 17 00:00:00 2001
From: Kittywhiskers Van Gogh <63189531+kwvg@users.noreply.github.com>
Date: Wed, 22 Oct 2025 23:44:21 +0530
Subject: [PATCH 235/656] refactor: adjust `CSigSharesManager` ctor arguments

We initialize the masternode mode context later and as it's explicitly
networking-heavy, we can move CConnman and PeerManager back into the
ctor and trim down the arguments list a fair bit.

Effectively reverts 82d1aed1d6.
---
 src/llmq/signing_shares.cpp       | 164 +++++++++++++++---------------
 src/llmq/signing_shares.h         |  52 +++++-----
 src/masternode/active/context.cpp |   5 +-
 src/net_processing.cpp            |   2 +-
 4 files changed, 109 insertions(+), 114 deletions(-)

diff --git a/src/llmq/signing_shares.cpp b/src/llmq/signing_shares.cpp
index d20a6ebe0314..4e1519046d9b 100644
--- a/src/llmq/signing_shares.cpp
+++ b/src/llmq/signing_shares.cpp
@@ -179,15 +179,29 @@ void CSigSharesNodeState::RemoveSession(const uint256& signHash)
 
 //////////////////////
 
-void CSigSharesManager::StartWorkerThread(CConnman& connman, PeerManager& peerman)
+CSigSharesManager::CSigSharesManager(CConnman& connman, CSigningManager& _sigman, PeerManager& peerman,
+                                     const CActiveMasternodeManager& mn_activeman, const CQuorumManager& _qman,
+                                     const CSporkManager& sporkman) :
+    m_connman{connman},
+    sigman{_sigman},
+    m_peerman{peerman},
+    m_mn_activeman{mn_activeman},
+    qman{_qman},
+    m_sporkman{sporkman}
+{
+    workInterrupt.reset();
+}
+
+CSigSharesManager::~CSigSharesManager() = default;
+
+void CSigSharesManager::StartWorkerThread()
 {
     // can't start new thread if we have one running already
     if (workThread.joinable()) {
         assert(false);
     }
 
-    workThread = std::thread(&util::TraceThread, "sigshares",
-                             [this, &connman, &peerman] { WorkThreadMain(connman, peerman); });
+    workThread = std::thread(&util::TraceThread, "sigshares", [this] { WorkThreadMain(); });
 }
 
 void CSigSharesManager::StopWorkerThread()
@@ -217,25 +231,23 @@ void CSigSharesManager::InterruptWorkerThread()
     workInterrupt();
 }
 
-void CSigSharesManager::ProcessMessage(const CNode& pfrom, PeerManager& peerman, const CSporkManager& sporkman,
-                                       const std::string& msg_type, CDataStream& vRecv)
+void CSigSharesManager::ProcessMessage(const CNode& pfrom, const std::string& msg_type, CDataStream& vRecv)
 {
     // non-masternodes are not interested in sigshares
-    if (m_mn_activeman == nullptr) return;
-    if (m_mn_activeman->GetProTxHash().IsNull()) return;
+    if (m_mn_activeman.GetProTxHash().IsNull()) return;
 
-    if (sporkman.IsSporkActive(SPORK_21_QUORUM_ALL_CONNECTED) && msg_type == NetMsgType::QSIGSHARE) {
+    if (m_sporkman.IsSporkActive(SPORK_21_QUORUM_ALL_CONNECTED) && msg_type == NetMsgType::QSIGSHARE) {
         std::vector<CSigShare> receivedSigShares;
         vRecv >> receivedSigShares;
 
         if (receivedSigShares.size() > MAX_MSGS_SIG_SHARES) {
             LogPrint(BCLog::LLMQ_SIGS, "CSigSharesManager::%s -- too many sigs in QSIGSHARE message. cnt=%d, max=%d, node=%d\n", __func__, receivedSigShares.size(), MAX_MSGS_SIG_SHARES, pfrom.GetId());
-            BanNode(pfrom.GetId(), peerman);
+            BanNode(pfrom.GetId());
             return;
         }
 
         for (const auto& sigShare : receivedSigShares) {
-            ProcessMessageSigShare(pfrom.GetId(), peerman, sigShare);
+            ProcessMessageSigShare(pfrom.GetId(), sigShare);
         }
     }
 
@@ -244,12 +256,12 @@ void CSigSharesManager::ProcessMessage(const CNode& pfrom, PeerManager& peerman,
         vRecv >> msgs;
         if (msgs.size() > MAX_MSGS_CNT_QSIGSESANN) {
             LogPrint(BCLog::LLMQ_SIGS, "CSigSharesManager::%s -- too many announcements in QSIGSESANN message. cnt=%d, max=%d, node=%d\n", __func__, msgs.size(), MAX_MSGS_CNT_QSIGSESANN, pfrom.GetId());
-            BanNode(pfrom.GetId(), peerman);
+            BanNode(pfrom.GetId());
             return;
         }
         if (!ranges::all_of(msgs,
                             [this, &pfrom](const auto& ann){ return ProcessMessageSigSesAnn(pfrom, ann); })) {
-            BanNode(pfrom.GetId(), peerman);
+            BanNode(pfrom.GetId());
             return;
         }
     } else if (msg_type == NetMsgType::QSIGSHARESINV) {
@@ -257,12 +269,12 @@ void CSigSharesManager::ProcessMessage(const CNode& pfrom, PeerManager& peerman,
         vRecv >> msgs;
         if (msgs.size() > MAX_MSGS_CNT_QSIGSHARESINV) {
             LogPrint(BCLog::LLMQ_SIGS, "CSigSharesManager::%s -- too many invs in QSIGSHARESINV message. cnt=%d, max=%d, node=%d\n", __func__, msgs.size(), MAX_MSGS_CNT_QSIGSHARESINV, pfrom.GetId());
-            BanNode(pfrom.GetId(), peerman);
+            BanNode(pfrom.GetId());
             return;
         }
         if (!ranges::all_of(msgs,
                             [this, &pfrom](const auto& inv){ return ProcessMessageSigSharesInv(pfrom, inv); })) {
-            BanNode(pfrom.GetId(), peerman);
+            BanNode(pfrom.GetId());
             return;
         }
     } else if (msg_type == NetMsgType::QGETSIGSHARES) {
@@ -270,12 +282,12 @@ void CSigSharesManager::ProcessMessage(const CNode& pfrom, PeerManager& peerman,
         vRecv >> msgs;
         if (msgs.size() > MAX_MSGS_CNT_QGETSIGSHARES) {
             LogPrint(BCLog::LLMQ_SIGS, "CSigSharesManager::%s -- too many invs in QGETSIGSHARES message. cnt=%d, max=%d, node=%d\n", __func__, msgs.size(), MAX_MSGS_CNT_QGETSIGSHARES, pfrom.GetId());
-            BanNode(pfrom.GetId(), peerman);
+            BanNode(pfrom.GetId());
             return;
         }
         if (!ranges::all_of(msgs,
                             [this, &pfrom](const auto& inv){ return ProcessMessageGetSigShares(pfrom, inv); })) {
-            BanNode(pfrom.GetId(), peerman);
+            BanNode(pfrom.GetId());
             return;
         }
     } else if (msg_type == NetMsgType::QBSIGSHARES) {
@@ -287,12 +299,12 @@ void CSigSharesManager::ProcessMessage(const CNode& pfrom, PeerManager& peerman,
         }
         if (totalSigsCount > MAX_MSGS_TOTAL_BATCHED_SIGS) {
             LogPrint(BCLog::LLMQ_SIGS, "CSigSharesManager::%s -- too many sigs in QBSIGSHARES message. cnt=%d, max=%d, node=%d\n", __func__, msgs.size(), MAX_MSGS_TOTAL_BATCHED_SIGS, pfrom.GetId());
-            BanNode(pfrom.GetId(), peerman);
+            BanNode(pfrom.GetId());
             return;
         }
         if (!ranges::all_of(msgs,
                             [this, &pfrom](const auto& bs){ return ProcessMessageBatchedSigShares(pfrom, bs); })) {
-            BanNode(pfrom.GetId(), peerman);
+            BanNode(pfrom.GetId());
             return;
         }
     }
@@ -410,7 +422,7 @@ bool CSigSharesManager::ProcessMessageBatchedSigShares(const CNode& pfrom, const
         return true;
     }
 
-    if (bool ban{false}; !PreVerifyBatchedSigShares(*Assert(m_mn_activeman), qman, sessionInfo, batchedSigShares, ban)) {
+    if (bool ban{false}; !PreVerifyBatchedSigShares(m_mn_activeman, qman, sessionInfo, batchedSigShares, ban)) {
         return !ban;
     }
 
@@ -457,10 +469,8 @@ bool CSigSharesManager::ProcessMessageBatchedSigShares(const CNode& pfrom, const
     return true;
 }
 
-void CSigSharesManager::ProcessMessageSigShare(NodeId fromId, PeerManager& peerman, const CSigShare& sigShare)
+void CSigSharesManager::ProcessMessageSigShare(NodeId fromId, const CSigShare& sigShare)
 {
-    assert(m_mn_activeman);
-
     auto quorum = qman.GetQuorum(sigShare.getLlmqType(), sigShare.getQuorumHash());
     if (!quorum) {
         return;
@@ -469,7 +479,7 @@ void CSigSharesManager::ProcessMessageSigShare(NodeId fromId, PeerManager& peerm
         // quorum is too old
         return;
     }
-    if (!quorum->IsMember(m_mn_activeman->GetProTxHash())) {
+    if (!quorum->IsMember(m_mn_activeman.GetProTxHash())) {
         // we're not a member so we can't verify it (we actually shouldn't have received it)
         return;
     }
@@ -482,12 +492,12 @@ void CSigSharesManager::ProcessMessageSigShare(NodeId fromId, PeerManager& peerm
 
     if (sigShare.getQuorumMember() >= quorum->members.size()) {
         LogPrint(BCLog::LLMQ_SIGS, "CSigSharesManager::%s -- quorumMember out of bounds\n", __func__);
-        BanNode(fromId, peerman);
+        BanNode(fromId);
         return;
     }
     if (!quorum->qc->validMembers[sigShare.getQuorumMember()]) {
         LogPrint(BCLog::LLMQ_SIGS, "CSigSharesManager::%s -- quorumMember not valid\n", __func__);
-        BanNode(fromId, peerman);
+        BanNode(fromId);
         return;
     }
 
@@ -623,7 +633,7 @@ bool CSigSharesManager::CollectPendingSigSharesToVerify(
     return true;
 }
 
-bool CSigSharesManager::ProcessPendingSigShares(PeerManager& peerman, const CConnman& connman)
+bool CSigSharesManager::ProcessPendingSigShares()
 {
     std::unordered_map<NodeId, std::vector<CSigShare>> sigSharesByNodes;
     std::unordered_map<std::pair<Consensus::LLMQType, uint256>, CQuorumCPtr, StaticSaltedHasher> quorums;
@@ -649,7 +659,7 @@ bool CSigSharesManager::ProcessPendingSigShares(PeerManager& peerman, const CCon
             // we didn't check this earlier because we use a lazy BLS signature and tried to avoid doing the expensive
             // deserialization in the message thread
             if (!sigShare.sigShare.Get().IsValid()) {
-                BanNode(nodeId, peerman);
+                BanNode(nodeId);
                 // don't process any additional shares from this node
                 break;
             }
@@ -681,11 +691,11 @@ bool CSigSharesManager::ProcessPendingSigShares(PeerManager& peerman, const CCon
             LogPrint(BCLog::LLMQ_SIGS, "CSigSharesManager::%s -- invalid sig shares from other node, banning peer=%d\n",
                      __func__, nodeId);
             // this will also cause re-requesting of the shares that were sent by this node
-            BanNode(nodeId, peerman);
+            BanNode(nodeId);
             continue;
         }
 
-        ProcessPendingSigShares(v, quorums, peerman, connman);
+        ProcessPendingSigShares(v, quorums);
     }
 
     return sigSharesByNodes.size() >= nMaxBatchSize;
@@ -694,13 +704,12 @@ bool CSigSharesManager::ProcessPendingSigShares(PeerManager& peerman, const CCon
 // It's ensured that no duplicates are passed to this method
 void CSigSharesManager::ProcessPendingSigShares(
     const std::vector<CSigShare>& sigSharesToProcess,
-    const std::unordered_map<std::pair<Consensus::LLMQType, uint256>, CQuorumCPtr, StaticSaltedHasher>& quorums,
-    PeerManager& peerman, const CConnman& connman)
+    const std::unordered_map<std::pair<Consensus::LLMQType, uint256>, CQuorumCPtr, StaticSaltedHasher>& quorums)
 {
     cxxtimer::Timer t(true);
     for (const auto& sigShare : sigSharesToProcess) {
         auto quorumKey = std::make_pair(sigShare.getLlmqType(), sigShare.getQuorumHash());
-        ProcessSigShare(peerman, sigShare, connman, quorums.at(quorumKey));
+        ProcessSigShare(sigShare, quorums.at(quorumKey));
     }
     t.stop();
 
@@ -709,11 +718,8 @@ void CSigSharesManager::ProcessPendingSigShares(
 }
 
 // sig shares are already verified when entering this method
-void CSigSharesManager::ProcessSigShare(PeerManager& peerman, const CSigShare& sigShare, const CConnman& connman,
-                                        const CQuorumCPtr& quorum)
+void CSigSharesManager::ProcessSigShare(const CSigShare& sigShare, const CQuorumCPtr& quorum)
 {
-    assert(m_mn_activeman);
-
     auto llmqType = quorum->params.type;
     bool canTryRecovery = false;
 
@@ -721,8 +727,9 @@ void CSigSharesManager::ProcessSigShare(PeerManager& peerman, const CSigShare& s
 
     // prepare node set for direct-push in case this is our sig share
     std::vector<NodeId> quorumNodes;
-    if (!isAllMembersConnectedEnabled && sigShare.getQuorumMember() == quorum->GetMemberIndex(m_mn_activeman->GetProTxHash())) {
-        quorumNodes = connman.GetMasternodeQuorumNodes(sigShare.getLlmqType(), sigShare.getQuorumHash());
+    if (!isAllMembersConnectedEnabled &&
+        sigShare.getQuorumMember() == quorum->GetMemberIndex(m_mn_activeman.GetProTxHash())) {
+        quorumNodes = m_connman.GetMasternodeQuorumNodes(sigShare.getLlmqType(), sigShare.getQuorumHash());
     }
 
     if (sigman.HasRecoveredSigForId(llmqType, sigShare.getId())) {
@@ -759,12 +766,11 @@ void CSigSharesManager::ProcessSigShare(PeerManager& peerman, const CSigShare& s
     }
 
     if (canTryRecovery) {
-        TryRecoverSig(peerman, quorum, sigShare.getId(), sigShare.getMsgHash());
+        TryRecoverSig(quorum, sigShare.getId(), sigShare.getMsgHash());
     }
 }
 
-void CSigSharesManager::TryRecoverSig(PeerManager& peerman, const CQuorumCPtr& quorum, const uint256& id,
-                                      const uint256& msgHash)
+void CSigSharesManager::TryRecoverSig(const CQuorumCPtr& quorum, const uint256& id, const uint256& msgHash)
 {
     if (sigman.HasRecoveredSigForId(quorum->params.type, id)) {
         return;
@@ -796,7 +802,7 @@ void CSigSharesManager::TryRecoverSig(PeerManager& peerman, const CQuorumCPtr& q
 
             auto rs = std::make_shared<CRecoveredSig>(quorum->params.type, quorum->qc->quorumHash, id, msgHash,
                                                       recoveredSig);
-            sigman.ProcessRecoveredSig(rs, peerman);
+            sigman.ProcessRecoveredSig(rs, m_peerman);
             return; // end of single-quorum processing
         }
 
@@ -842,7 +848,7 @@ void CSigSharesManager::TryRecoverSig(PeerManager& peerman, const CQuorumCPtr& q
         }
     }
 
-    sigman.ProcessRecoveredSig(rs, peerman);
+    sigman.ProcessRecoveredSig(rs, m_peerman);
 }
 
 CDeterministicMNCPtr CSigSharesManager::SelectMemberForRecovery(const CQuorumCPtr& quorum, const uint256 &id, int attempt)
@@ -1052,8 +1058,7 @@ void CSigSharesManager::CollectSigSharesToSendConcentrated(std::unordered_map<No
     }
 }
 
-void CSigSharesManager::CollectSigSharesToAnnounce(const CConnman& connman,
-                                                   std::unordered_map<NodeId, Uint256HashMap<CSigSharesInv>>& sigSharesToAnnounce)
+void CSigSharesManager::CollectSigSharesToAnnounce(std::unordered_map<NodeId, Uint256HashMap<CSigSharesInv>>& sigSharesToAnnounce)
 {
     AssertLockHeld(cs);
 
@@ -1061,8 +1066,8 @@ void CSigSharesManager::CollectSigSharesToAnnounce(const CConnman& connman,
 
     // TODO: remove NO_THREAD_SAFETY_ANALYSIS
     // using here template ForEach makes impossible to use lock annotation
-    sigSharesQueuedToAnnounce.ForEach([this, &connman, &quorumNodesMap,
-                                       &sigSharesToAnnounce](const SigShareKey& sigShareKey, bool) NO_THREAD_SAFETY_ANALYSIS {
+    sigSharesQueuedToAnnounce.ForEach([this, &quorumNodesMap, &sigSharesToAnnounce](const SigShareKey& sigShareKey,
+                                                                                    bool) NO_THREAD_SAFETY_ANALYSIS {
         AssertLockHeld(cs);
         const auto& signHash = sigShareKey.first;
         auto quorumMember = sigShareKey.second;
@@ -1075,7 +1080,7 @@ void CSigSharesManager::CollectSigSharesToAnnounce(const CConnman& connman,
         auto quorumKey = std::make_pair(sigShare->getLlmqType(), sigShare->getQuorumHash());
         auto it = quorumNodesMap.find(quorumKey);
         if (it == quorumNodesMap.end()) {
-            auto nodeIds = connman.GetMasternodeQuorumNodes(quorumKey.first, quorumKey.second);
+            auto nodeIds = m_connman.GetMasternodeQuorumNodes(quorumKey.first, quorumKey.second);
             it = quorumNodesMap.emplace(std::piecewise_construct, std::forward_as_tuple(quorumKey), std::forward_as_tuple(nodeIds.begin(), nodeIds.end())).first;
         }
 
@@ -1110,7 +1115,7 @@ void CSigSharesManager::CollectSigSharesToAnnounce(const CConnman& connman,
     sigSharesQueuedToAnnounce.Clear();
 }
 
-bool CSigSharesManager::SendMessages(CConnman& connman)
+bool CSigSharesManager::SendMessages()
 {
     std::unordered_map<NodeId, Uint256HashMap<CSigSharesInv>> sigSharesToRequest;
     std::unordered_map<NodeId, Uint256HashMap<CBatchedSigShares>> sigShareBatchesToSend;
@@ -1139,12 +1144,12 @@ bool CSigSharesManager::SendMessages(CConnman& connman)
         return session->sendSessionId;
     };
 
-    const CConnman::NodesSnapshot snap{connman, /* cond = */ CConnman::FullyConnectedOnly};
+    const CConnman::NodesSnapshot snap{m_connman, /* cond = */ CConnman::FullyConnectedOnly};
     {
         LOCK(cs);
         CollectSigSharesToRequest(sigSharesToRequest);
         CollectSigSharesToSend(sigShareBatchesToSend);
-        CollectSigSharesToAnnounce(connman, sigSharesToAnnounce);
+        CollectSigSharesToAnnounce(sigSharesToAnnounce);
         CollectSigSharesToSendConcentrated(sigSharesToSend, snap.Nodes());
 
         for (auto& [nodeId, sigShareMap] : sigSharesToRequest) {
@@ -1177,13 +1182,13 @@ bool CSigSharesManager::SendMessages(CConnman& connman)
                          sigSesAnn.buildSignHash().ToString(), sigSesAnn.getSessionId(), pnode->GetId());
                 msgs.emplace_back(sigSesAnn);
                 if (msgs.size() == MAX_MSGS_CNT_QSIGSESANN) {
-                    connman.PushMessage(pnode, msgMaker.Make(NetMsgType::QSIGSESANN, msgs));
+                    m_connman.PushMessage(pnode, msgMaker.Make(NetMsgType::QSIGSESANN, msgs));
                     msgs.clear();
                     didSend = true;
                 }
             }
             if (!msgs.empty()) {
-                connman.PushMessage(pnode, msgMaker.Make(NetMsgType::QSIGSESANN, msgs));
+                m_connman.PushMessage(pnode, msgMaker.Make(NetMsgType::QSIGSESANN, msgs));
                 didSend = true;
             }
         }
@@ -1196,13 +1201,13 @@ bool CSigSharesManager::SendMessages(CConnman& connman)
                          signHash.ToString(), inv.ToString(), pnode->GetId());
                 msgs.emplace_back(inv);
                 if (msgs.size() == MAX_MSGS_CNT_QGETSIGSHARES) {
-                    connman.PushMessage(pnode, msgMaker.Make(NetMsgType::QGETSIGSHARES, msgs));
+                    m_connman.PushMessage(pnode, msgMaker.Make(NetMsgType::QGETSIGSHARES, msgs));
                     msgs.clear();
                     didSend = true;
                 }
             }
             if (!msgs.empty()) {
-                connman.PushMessage(pnode, msgMaker.Make(NetMsgType::QGETSIGSHARES, msgs));
+                m_connman.PushMessage(pnode, msgMaker.Make(NetMsgType::QGETSIGSHARES, msgs));
                 didSend = true;
             }
         }
@@ -1215,7 +1220,7 @@ bool CSigSharesManager::SendMessages(CConnman& connman)
                 LogPrint(BCLog::LLMQ_SIGS, "CSigSharesManager::SendMessages -- QBSIGSHARES signHash=%s, inv={%s}, node=%d\n",
                          signHash.ToString(), inv.ToInvString(), pnode->GetId());
                 if (totalSigsCount + inv.sigShares.size() > MAX_MSGS_TOTAL_BATCHED_SIGS) {
-                    connman.PushMessage(pnode, msgMaker.Make(NetMsgType::QBSIGSHARES, msgs));
+                    m_connman.PushMessage(pnode, msgMaker.Make(NetMsgType::QBSIGSHARES, msgs));
                     msgs.clear();
                     totalSigsCount = 0;
                     didSend = true;
@@ -1224,7 +1229,7 @@ bool CSigSharesManager::SendMessages(CConnman& connman)
                 msgs.emplace_back(inv);
             }
             if (!msgs.empty()) {
-                connman.PushMessage(pnode, msgMaker.Make(NetMsgType::QBSIGSHARES, std::move(msgs)));
+                m_connman.PushMessage(pnode, msgMaker.Make(NetMsgType::QBSIGSHARES, std::move(msgs)));
                 didSend = true;
             }
         }
@@ -1237,13 +1242,13 @@ bool CSigSharesManager::SendMessages(CConnman& connman)
                          signHash.ToString(), inv.ToString(), pnode->GetId());
                 msgs.emplace_back(inv);
                 if (msgs.size() == MAX_MSGS_CNT_QSIGSHARESINV) {
-                    connman.PushMessage(pnode, msgMaker.Make(NetMsgType::QSIGSHARESINV, msgs));
+                    m_connman.PushMessage(pnode, msgMaker.Make(NetMsgType::QSIGSHARESINV, msgs));
                     msgs.clear();
                     didSend = true;
                 }
             }
             if (!msgs.empty()) {
-                connman.PushMessage(pnode, msgMaker.Make(NetMsgType::QSIGSHARESINV, msgs));
+                m_connman.PushMessage(pnode, msgMaker.Make(NetMsgType::QSIGSHARESINV, msgs));
                 didSend = true;
             }
         }
@@ -1256,13 +1261,13 @@ bool CSigSharesManager::SendMessages(CConnman& connman)
                          sigShare.GetSignHash().ToString(), pnode->GetId());
                 msgs.emplace_back(std::move(sigShare));
                 if (msgs.size() == MAX_MSGS_SIG_SHARES) {
-                    connman.PushMessage(pnode, msgMaker.Make(NetMsgType::QSIGSHARE, msgs));
+                    m_connman.PushMessage(pnode, msgMaker.Make(NetMsgType::QSIGSHARE, msgs));
                     msgs.clear();
                     didSend = true;
                 }
             }
             if (!msgs.empty()) {
-                connman.PushMessage(pnode, msgMaker.Make(NetMsgType::QSIGSHARE, msgs));
+                m_connman.PushMessage(pnode, msgMaker.Make(NetMsgType::QSIGSHARE, msgs));
                 didSend = true;
             }
         }
@@ -1285,7 +1290,7 @@ CSigShare CSigSharesManager::RebuildSigShare(const CSigSharesNodeState::SessionI
     return sigShare;
 }
 
-void CSigSharesManager::Cleanup(const CConnman& connman)
+void CSigSharesManager::Cleanup()
 {
     int64_t now = GetTime<std::chrono::seconds>().count();
     if (now - lastCleanupTime < 5) {
@@ -1399,9 +1404,7 @@ void CSigSharesManager::Cleanup(const CConnman& connman)
             nodeStatesToDelete.emplace(nodeId);
         }
     }
-    connman.ForEachNode([&nodeStatesToDelete](const CNode* pnode) {
-        nodeStatesToDelete.erase(pnode->GetId());
-    });
+    m_connman.ForEachNode([&nodeStatesToDelete](const CNode* pnode) { nodeStatesToDelete.erase(pnode->GetId()); });
 
     // Now delete these node states
     LOCK(cs);
@@ -1438,13 +1441,13 @@ void CSigSharesManager::RemoveSigSharesForSession(const uint256& signHash)
     timeSeenForSessions.erase(signHash);
 }
 
-void CSigSharesManager::RemoveBannedNodeStates(PeerManager& peerman)
+void CSigSharesManager::RemoveBannedNodeStates()
 {
     // Called regularly to cleanup local node states for banned nodes
 
     LOCK(cs);
     for (auto it = nodeStates.begin(); it != nodeStates.end();) {
-        if (peerman.IsBanned(it->first)) {
+        if (m_peerman.IsBanned(it->first)) {
             // re-request sigshares from other nodes
             // TODO: remove NO_THREAD_SAFETY_ANALYSIS
             // using here template ForEach makes impossible to use lock annotation
@@ -1459,13 +1462,13 @@ void CSigSharesManager::RemoveBannedNodeStates(PeerManager& peerman)
     }
 }
 
-void CSigSharesManager::BanNode(NodeId nodeId, PeerManager& peerman)
+void CSigSharesManager::BanNode(NodeId nodeId)
 {
     if (nodeId == -1) {
         return;
     }
 
-    peerman.Misbehaving(nodeId, 100);
+    m_peerman.Misbehaving(nodeId, 100);
 
     LOCK(cs);
     auto it = nodeStates.find(nodeId);
@@ -1485,22 +1488,22 @@ void CSigSharesManager::BanNode(NodeId nodeId, PeerManager& peerman)
     nodeState.banned = true;
 }
 
-void CSigSharesManager::WorkThreadMain(CConnman& connman, PeerManager& peerman)
+void CSigSharesManager::WorkThreadMain()
 {
     int64_t lastSendTime = 0;
 
     while (!workInterrupt) {
-        RemoveBannedNodeStates(peerman);
+        RemoveBannedNodeStates();
 
-        bool fMoreWork = ProcessPendingSigShares(peerman, connman);
-        SignPendingSigShares(connman, peerman);
+        bool fMoreWork = ProcessPendingSigShares();
+        SignPendingSigShares();
 
         if (TicksSinceEpoch<std::chrono::milliseconds>(SystemClock::now()) - lastSendTime > 100) {
-            SendMessages(connman);
+            SendMessages();
             lastSendTime = TicksSinceEpoch<std::chrono::milliseconds>(SystemClock::now());
         }
 
-        Cleanup(connman);
+        Cleanup();
 
         // TODO Wakeup when pending signing is needed?
         if (!fMoreWork && !workInterrupt.sleep_for(std::chrono::milliseconds(100))) {
@@ -1515,7 +1518,7 @@ void CSigSharesManager::AsyncSign(const CQuorumCPtr& quorum, const uint256& id,
     pendingSigns.emplace_back(quorum, id, msgHash);
 }
 
-void CSigSharesManager::SignPendingSigShares(const CConnman& connman, PeerManager& peerman)
+void CSigSharesManager::SignPendingSigShares()
 {
     std::vector<PendingSignatureData> v;
     WITH_LOCK(cs_pendingSigns, v.swap(pendingSigns));
@@ -1525,7 +1528,7 @@ void CSigSharesManager::SignPendingSigShares(const CConnman& connman, PeerManage
 
         if (opt_sigShare.has_value() && opt_sigShare->sigShare.Get().IsValid()) {
             auto sigShare = *opt_sigShare;
-            ProcessSigShare(peerman, sigShare, connman, pQuorum);
+            ProcessSigShare(sigShare, pQuorum);
 
             if (IsAllMembersConnectedEnabled(pQuorum->params.type, m_sporkman)) {
                 LOCK(cs);
@@ -1541,10 +1544,8 @@ void CSigSharesManager::SignPendingSigShares(const CConnman& connman, PeerManage
 
 std::optional<CSigShare> CSigSharesManager::CreateSigShare(const CQuorumCPtr& quorum, const uint256& id, const uint256& msgHash) const
 {
-    assert(m_mn_activeman);
-
     cxxtimer::Timer t(true);
-    auto activeMasterNodeProTxHash = m_mn_activeman->GetProTxHash();
+    auto activeMasterNodeProTxHash = m_mn_activeman.GetProTxHash();
 
     if (!quorum->IsValidMember(activeMasterNodeProTxHash)) {
         return std::nullopt;
@@ -1562,7 +1563,7 @@ std::optional<CSigShare> CSigSharesManager::CreateSigShare(const CQuorumCPtr& qu
 
         // TODO: This one should be SIGN by QUORUM key, not by OPERATOR key
         // see TODO in CDKGSession::FinalizeSingleCommitment for details
-        sigShare.sigShare.Set(m_mn_activeman->Sign(signHash, bls::bls_legacy_scheme.load()), bls::bls_legacy_scheme.load());
+        sigShare.sigShare.Set(m_mn_activeman.Sign(signHash, bls::bls_legacy_scheme.load()), bls::bls_legacy_scheme.load());
 
         if (!sigShare.sigShare.Get().IsValid()) {
             LogPrintf("CSigSharesManager::%s -- failed to sign sigShare. signHash=%s, id=%s, msgHash=%s, time=%s\n",
@@ -1644,5 +1645,4 @@ MessageProcessingResult CSigSharesManager::HandleNewRecoveredSig(const llmq::CRe
     RemoveSigSharesForSession(recoveredSig.buildSignHash().Get());
     return {};
 }
-
 } // namespace llmq
diff --git a/src/llmq/signing_shares.h b/src/llmq/signing_shares.h
index 258a6f2417a6..0a3aec9d6ba5 100644
--- a/src/llmq/signing_shares.h
+++ b/src/llmq/signing_shares.h
@@ -27,6 +27,7 @@
 #include <utility>
 #include <vector>
 
+class CActiveMasternodeManager;
 class CNode;
 class CConnman;
 class CDeterministicMN;
@@ -403,8 +404,10 @@ class CSigSharesManager : public CRecoveredSigsListener
 
     FastRandomContext rnd GUARDED_BY(cs);
 
+    CConnman& m_connman;
     CSigningManager& sigman;
-    const CActiveMasternodeManager* const m_mn_activeman;
+    PeerManager& m_peerman;
+    const CActiveMasternodeManager& m_mn_activeman;
     const CQuorumManager& qman;
     const CSporkManager& m_sporkman;
 
@@ -412,26 +415,20 @@ class CSigSharesManager : public CRecoveredSigsListener
     std::atomic<uint32_t> recoveredSigsCounter{0};
 
 public:
-    explicit CSigSharesManager(CSigningManager& _sigman, const CActiveMasternodeManager* const mn_activeman,
-                               const CQuorumManager& _qman, const CSporkManager& sporkman) :
-        sigman(_sigman),
-        m_mn_activeman(mn_activeman),
-        qman(_qman),
-        m_sporkman(sporkman)
-    {
-        workInterrupt.reset();
-    };
+    explicit CSigSharesManager(CConnman& connman, CSigningManager& _sigman, PeerManager& peerman,
+                               const CActiveMasternodeManager& mn_activeman, const CQuorumManager& _qman,
+                               const CSporkManager& sporkman);
+    ~CSigSharesManager() override;
+
     CSigSharesManager() = delete;
-    ~CSigSharesManager() override = default;
 
-    void StartWorkerThread(CConnman& connman, PeerManager& peerman);
+    void StartWorkerThread();
     void StopWorkerThread();
     void RegisterAsRecoveredSigsListener();
     void UnregisterAsRecoveredSigsListener();
     void InterruptWorkerThread();
 
-    void ProcessMessage(const CNode& pnode, PeerManager& peerman, const CSporkManager& sporkman,
-                        const std::string& msg_type, CDataStream& vRecv);
+    void ProcessMessage(const CNode& pnode, const std::string& msg_type, CDataStream& vRecv);
 
     void AsyncSign(const CQuorumCPtr& quorum, const uint256& id, const uint256& msgHash)
         EXCLUSIVE_LOCKS_REQUIRED(!cs_pendingSigns);
@@ -448,7 +445,7 @@ class CSigSharesManager : public CRecoveredSigsListener
     bool ProcessMessageSigSharesInv(const CNode& pfrom, const CSigSharesInv& inv);
     bool ProcessMessageGetSigShares(const CNode& pfrom, const CSigSharesInv& inv);
     bool ProcessMessageBatchedSigShares(const CNode& pfrom, const CBatchedSigShares& batchedSigShares);
-    void ProcessMessageSigShare(NodeId fromId, PeerManager& peerman, const CSigShare& sigShare);
+    void ProcessMessageSigShare(NodeId fromId, const CSigShare& sigShare);
 
     static bool VerifySigSharesInv(Consensus::LLMQType llmqType, const CSigSharesInv& inv);
     static bool PreVerifyBatchedSigShares(const CActiveMasternodeManager& mn_activeman, const CQuorumManager& quorum_manager,
@@ -457,37 +454,34 @@ class CSigSharesManager : public CRecoveredSigsListener
     bool CollectPendingSigSharesToVerify(
         size_t maxUniqueSessions, std::unordered_map<NodeId, std::vector<CSigShare>>& retSigShares,
         std::unordered_map<std::pair<Consensus::LLMQType, uint256>, CQuorumCPtr, StaticSaltedHasher>& retQuorums);
-    bool ProcessPendingSigShares(PeerManager& peerman, const CConnman& connman);
+    bool ProcessPendingSigShares();
 
     void ProcessPendingSigShares(
         const std::vector<CSigShare>& sigSharesToProcess,
-        const std::unordered_map<std::pair<Consensus::LLMQType, uint256>, CQuorumCPtr, StaticSaltedHasher>& quorums,
-        PeerManager& peerman, const CConnman& connman);
+        const std::unordered_map<std::pair<Consensus::LLMQType, uint256>, CQuorumCPtr, StaticSaltedHasher>& quorums);
 
-    void ProcessSigShare(PeerManager& peerman, const CSigShare& sigShare, const CConnman& connman,
-                         const CQuorumCPtr& quorum);
-    void TryRecoverSig(PeerManager& peerman, const CQuorumCPtr& quorum, const uint256& id, const uint256& msgHash);
+    void ProcessSigShare(const CSigShare& sigShare, const CQuorumCPtr& quorum);
+    void TryRecoverSig(const CQuorumCPtr& quorum, const uint256& id, const uint256& msgHash);
 
     bool GetSessionInfoByRecvId(NodeId nodeId, uint32_t sessionId, CSigSharesNodeState::SessionInfo& retInfo);
     static CSigShare RebuildSigShare(const CSigSharesNodeState::SessionInfo& session, const std::pair<uint16_t, CBLSLazySignature>& in);
 
-    void Cleanup(const CConnman& connman);
+    void Cleanup();
     void RemoveSigSharesForSession(const uint256& signHash) EXCLUSIVE_LOCKS_REQUIRED(cs);
-    void RemoveBannedNodeStates(PeerManager& peerman);
+    void RemoveBannedNodeStates();
 
-    void BanNode(NodeId nodeId, PeerManager& peerman);
+    void BanNode(NodeId nodeId);
 
-    bool SendMessages(CConnman& connman);
+    bool SendMessages();
     void CollectSigSharesToRequest(std::unordered_map<NodeId, Uint256HashMap<CSigSharesInv>>& sigSharesToRequest)
         EXCLUSIVE_LOCKS_REQUIRED(cs);
     void CollectSigSharesToSend(std::unordered_map<NodeId, Uint256HashMap<CBatchedSigShares>>& sigSharesToSend)
         EXCLUSIVE_LOCKS_REQUIRED(cs);
     void CollectSigSharesToSendConcentrated(std::unordered_map<NodeId, std::vector<CSigShare>>& sigSharesToSend, const std::vector<CNode*>& vNodes) EXCLUSIVE_LOCKS_REQUIRED(cs);
-    void CollectSigSharesToAnnounce(const CConnman& connman,
-                                    std::unordered_map<NodeId, Uint256HashMap<CSigSharesInv>>& sigSharesToAnnounce)
+    void CollectSigSharesToAnnounce(std::unordered_map<NodeId, Uint256HashMap<CSigSharesInv>>& sigSharesToAnnounce)
         EXCLUSIVE_LOCKS_REQUIRED(cs);
-    void SignPendingSigShares(const CConnman& connman, PeerManager& peerman) EXCLUSIVE_LOCKS_REQUIRED(!cs_pendingSigns);
-    void WorkThreadMain(CConnman& connman, PeerManager& peerman) EXCLUSIVE_LOCKS_REQUIRED(!cs_pendingSigns);
+    void SignPendingSigShares() EXCLUSIVE_LOCKS_REQUIRED(!cs_pendingSigns);
+    void WorkThreadMain() EXCLUSIVE_LOCKS_REQUIRED(!cs_pendingSigns);
 };
 } // namespace llmq
 
diff --git a/src/masternode/active/context.cpp b/src/masternode/active/context.cpp
index d166b639786e..28d853dc35b2 100644
--- a/src/masternode/active/context.cpp
+++ b/src/masternode/active/context.cpp
@@ -26,7 +26,8 @@ ActiveContext::ActiveContext(ChainstateManager& chainman, CConnman& connman, CDe
     cj_server{std::make_unique<CCoinJoinServer>(chainman, connman, dmnman, dstxman, mn_metaman, mempool, peerman,
                                                 mn_activeman, mn_sync, *llmq_ctx.isman)},
     gov_signer{std::make_unique<GovernanceSigner>(connman, dmnman, govman, mn_activeman, chainman, mn_sync)},
-    shareman{std::make_unique<llmq::CSigSharesManager>(*llmq_ctx.sigman, &mn_activeman, *llmq_ctx.qman, sporkman)},
+    shareman{std::make_unique<llmq::CSigSharesManager>(connman, *llmq_ctx.sigman, peerman, mn_activeman, *llmq_ctx.qman,
+                                                       sporkman)},
     ehf_sighandler{
         std::make_unique<llmq::CEHFSignalsHandler>(chainman, mnhfman, *llmq_ctx.sigman, *shareman, *llmq_ctx.qman)},
     cl_signer{std::make_unique<chainlock::ChainLockSigner>(chainman.ActiveChainstate(), *llmq_ctx.clhandler,
@@ -54,7 +55,7 @@ void ActiveContext::Start(CConnman& connman, PeerManager& peerman)
 {
     m_llmq_ctx.qdkgsman->StartThreads(connman, peerman);
     shareman->RegisterAsRecoveredSigsListener();
-    shareman->StartWorkerThread(connman, peerman);
+    shareman->StartWorkerThread();
 }
 
 void ActiveContext::Stop()
diff --git a/src/net_processing.cpp b/src/net_processing.cpp
index 495909fe8dc5..8ad60042cb51 100644
--- a/src/net_processing.cpp
+++ b/src/net_processing.cpp
@@ -5377,7 +5377,7 @@ void PeerManagerImpl::ProcessMessage(
 #endif // ENABLE_WALLET
         if (m_active_ctx) {
             PostProcessMessage(m_active_ctx->cj_server->ProcessMessage(pfrom, msg_type, vRecv), pfrom.GetId());
-            m_active_ctx->shareman->ProcessMessage(pfrom, *this, m_sporkman, msg_type, vRecv);
+            m_active_ctx->shareman->ProcessMessage(pfrom, msg_type, vRecv);
         }
         PostProcessMessage(m_sporkman.ProcessMessage(pfrom, m_connman, msg_type, vRecv), pfrom.GetId());
         m_mn_sync.ProcessMessage(pfrom, msg_type, vRecv);

From 0052fcaa59bd0a5c9cde428fd0688c842b4ceec5 Mon Sep 17 00:00:00 2001
From: Kittywhiskers Van Gogh <63189531+kwvg@users.noreply.github.com>
Date: Wed, 22 Oct 2025 23:43:26 +0530
Subject: [PATCH 236/656] refactor: move `AsyncSignIfMember()` to
 `CSigSharesManager`

Giving write access of CRecoveredSigsDb to an external manager isn't
great but we have to do this if we want to drop CActiveMasternodeManager
from CSigSharesManager

Review with `git log -p -n1 --color-moved=dimmed_zebra`.
---
 src/chainlock/signing.cpp         |  3 +-
 src/instantsend/signing.cpp       |  5 +-
 src/llmq/ehf_signals.cpp          | 10 ++--
 src/llmq/signing.cpp              | 74 --------------------------
 src/llmq/signing.h                | 14 +++--
 src/llmq/signing_shares.cpp       | 88 +++++++++++++++++++++++++++++--
 src/llmq/signing_shares.h         | 12 +++--
 src/masternode/active/context.cpp |  4 +-
 src/rpc/quorums.cpp               |  3 +-
 9 files changed, 114 insertions(+), 99 deletions(-)

diff --git a/src/chainlock/signing.cpp b/src/chainlock/signing.cpp
index 3524fd204466..9b574d5cc6ee 100644
--- a/src/chainlock/signing.cpp
+++ b/src/chainlock/signing.cpp
@@ -9,6 +9,7 @@
 
 #include <chainlock/clsig.h>
 #include <instantsend/instantsend.h>
+#include <llmq/signing_shares.h>
 #include <masternode/sync.h>
 #include <spork.h>
 
@@ -140,7 +141,7 @@ void ChainLockSigner::TrySignChainTip(const llmq::CInstantSendManager& isman)
         lastSignedMsgHash = msgHash;
     }
 
-    m_sigman.AsyncSignIfMember(Params().GetConsensus().llmqTypeChainLocks, m_shareman, requestId, msgHash);
+    m_shareman.AsyncSignIfMember(Params().GetConsensus().llmqTypeChainLocks, m_sigman, requestId, msgHash);
 }
 
 void ChainLockSigner::EraseFromBlockHashTxidMap(const uint256& hash)
diff --git a/src/instantsend/signing.cpp b/src/instantsend/signing.cpp
index fa6d40f4623e..789c0135f968 100644
--- a/src/instantsend/signing.cpp
+++ b/src/instantsend/signing.cpp
@@ -13,6 +13,7 @@
 
 #include <chainlock/chainlock.h>
 #include <llmq/quorums.h>
+#include <llmq/signing_shares.h>
 #include <masternode/sync.h>
 #include <spork.h>
 
@@ -330,7 +331,7 @@ bool InstantSendSigner::TrySignInputLocks(const CTransaction& tx, bool fRetroact
         WITH_LOCK(cs_input_requests, inputRequestIds.emplace(id));
         LogPrint(BCLog::INSTANTSEND, "%s -- txid=%s: trying to vote on input %s with id %s. fRetroactive=%d\n",
                  __func__, tx.GetHash().ToString(), in.prevout.ToStringShort(), id.ToString(), fRetroactive);
-        if (m_sigman.AsyncSignIfMember(llmqType, m_shareman, id, tx.GetHash(), {}, fRetroactive)) {
+        if (m_shareman.AsyncSignIfMember(llmqType, m_sigman, id, tx.GetHash(), {}, fRetroactive)) {
             LogPrint(BCLog::INSTANTSEND, "%s -- txid=%s: voted on input %s with id %s\n", __func__,
                      tx.GetHash().ToString(), in.prevout.ToStringShort(), id.ToString());
         }
@@ -388,6 +389,6 @@ void InstantSendSigner::TrySignInstantSendLock(const CTransaction& tx)
         txToCreatingInstantSendLocks.emplace(tx.GetHash(), &e.first->second);
     }
 
-    m_sigman.AsyncSignIfMember(llmqType, m_shareman, id, tx.GetHash(), quorum->m_quorum_base_block_index->GetBlockHash());
+    m_shareman.AsyncSignIfMember(llmqType, m_sigman, id, tx.GetHash(), quorum->m_quorum_base_block_index->GetBlockHash());
 }
 } // namespace instantsend
diff --git a/src/llmq/ehf_signals.cpp b/src/llmq/ehf_signals.cpp
index b4689e2d4a3e..afec0ae3ee94 100644
--- a/src/llmq/ehf_signals.cpp
+++ b/src/llmq/ehf_signals.cpp
@@ -3,17 +3,19 @@
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
 #include <llmq/ehf_signals.h>
-#include <llmq/quorums.h>
-#include <llmq/commitment.h>
 
 #include <chainparams.h>
 #include <consensus/validation.h>
 #include <deploymentstatus.h>
-#include <evo/mnhftx.h>
 #include <index/txindex.h> // g_txindex
 #include <primitives/transaction.h>
 #include <validation.h>
 
+#include <evo/mnhftx.h>
+#include <llmq/commitment.h>
+#include <llmq/quorums.h>
+#include <llmq/signing_shares.h>
+
 namespace llmq {
 CEHFSignalsHandler::CEHFSignalsHandler(ChainstateManager& chainman, CMNHFManager& mnhfman, CSigningManager& sigman,
                                        CSigSharesManager& shareman, const CQuorumManager& qman) :
@@ -76,7 +78,7 @@ void CEHFSignalsHandler::trySignEHFSignal(int bit, const CBlockIndex* const pind
     const uint256 msgHash = mnhfPayload.PrepareTx().GetHash();
 
     WITH_LOCK(cs, ids.insert(requestId));
-    sigman.AsyncSignIfMember(llmqType, shareman, requestId, msgHash, quorum->qc->quorumHash, false, true);
+    shareman.AsyncSignIfMember(llmqType, sigman, requestId, msgHash, quorum->qc->quorumHash, false, true);
 }
 
 MessageProcessingResult CEHFSignalsHandler::HandleNewRecoveredSig(const CRecoveredSig& recoveredSig)
diff --git a/src/llmq/signing.cpp b/src/llmq/signing.cpp
index 55c0ab19db25..e6172efcb218 100644
--- a/src/llmq/signing.cpp
+++ b/src/llmq/signing.cpp
@@ -666,80 +666,6 @@ void CSigningManager::UnregisterRecoveredSigsListener(CRecoveredSigsListener* l)
     recoveredSigsListeners.erase(itRem, recoveredSigsListeners.end());
 }
 
-bool CSigningManager::AsyncSignIfMember(Consensus::LLMQType llmqType, CSigSharesManager& shareman, const uint256& id,
-                                        const uint256& msgHash, const uint256& quorumHash, bool allowReSign,
-                                        bool allowDiffMsgHashSigning)
-{
-    if (m_mn_activeman == nullptr) return false;
-    if (m_mn_activeman->GetProTxHash().IsNull()) return false;
-
-    const auto quorum = [&]() {
-        if (quorumHash.IsNull()) {
-            // This might end up giving different results on different members
-            // This might happen when we are on the brink of confirming a new quorum
-            // This gives a slight risk of not getting enough shares to recover a signature
-            // But at least it shouldn't be possible to get conflicting recovered signatures
-            // TODO fix this by re-signing when the next block arrives, but only when that block results in a change of the quorum list and no recovered signature has been created in the mean time
-            const auto &llmq_params_opt = Params().GetLLMQ(llmqType);
-            assert(llmq_params_opt.has_value());
-            return SelectQuorumForSigning(llmq_params_opt.value(), m_chainstate.m_chain, qman, id);
-        } else {
-            return qman.GetQuorum(llmqType, quorumHash);
-        }
-    }();
-
-    if (!quorum) {
-        LogPrint(BCLog::LLMQ, "CSigningManager::%s -- failed to select quorum. id=%s, msgHash=%s\n", __func__, id.ToString(), msgHash.ToString());
-        return false;
-    }
-
-    if (!quorum->IsValidMember(m_mn_activeman->GetProTxHash())) {
-        return false;
-    }
-
-    {
-        bool hasVoted = db.HasVotedOnId(llmqType, id);
-        if (hasVoted) {
-            uint256 prevMsgHash;
-            db.GetVoteForId(llmqType, id, prevMsgHash);
-            if (msgHash != prevMsgHash) {
-                if (allowDiffMsgHashSigning) {
-                    LogPrintf("CSigningManager::%s -- already voted for id=%s and msgHash=%s. Signing for different msgHash=%s\n",
-                              __func__, id.ToString(), prevMsgHash.ToString(), msgHash.ToString());
-                    hasVoted = false;
-                } else {
-                    LogPrintf("CSigningManager::%s -- already voted for id=%s and msgHash=%s. Not voting on conflicting msgHash=%s\n",
-                              __func__, id.ToString(), prevMsgHash.ToString(), msgHash.ToString());
-                    return false;
-                }
-            } else if (allowReSign) {
-                LogPrint(BCLog::LLMQ, "CSigningManager::%s -- already voted for id=%s and msgHash=%s. Resigning!\n", __func__,
-                         id.ToString(), prevMsgHash.ToString());
-            } else {
-                LogPrint(BCLog::LLMQ, "CSigningManager::%s -- already voted for id=%s and msgHash=%s. Not voting again.\n", __func__,
-                          id.ToString(), prevMsgHash.ToString());
-                return false;
-            }
-        }
-
-        if (db.HasRecoveredSigForId(llmqType, id)) {
-            // no need to sign it if we already have a recovered sig
-            return true;
-        }
-        if (!hasVoted) {
-            db.WriteVoteForId(llmqType, id, msgHash);
-        }
-    }
-
-    if (allowReSign) {
-        // make us re-announce all known shares (other nodes might have run into a timeout)
-        shareman.ForceReAnnouncement(quorum, llmqType, id, msgHash);
-    }
-    shareman.AsyncSign(quorum, id, msgHash);
-
-    return true;
-}
-
 bool CSigningManager::HasRecoveredSig(Consensus::LLMQType llmqType, const uint256& id, const uint256& msgHash) const
 {
     return db.HasRecoveredSig(llmqType, id, msgHash);
diff --git a/src/llmq/signing.h b/src/llmq/signing.h
index e49e76a14329..b9aba0d500da 100644
--- a/src/llmq/signing.h
+++ b/src/llmq/signing.h
@@ -209,22 +209,20 @@ class CSigningManager
         EXCLUSIVE_LOCKS_REQUIRED(!cs_pending, !cs_listeners);
     bool ProcessPendingRecoveredSigs(PeerManager& peerman)
         EXCLUSIVE_LOCKS_REQUIRED(!cs_pending, !cs_listeners); // called from the worker thread of CSigSharesManager
-public:
-    // TODO - should not be public!
+
+    // Used by CSigSharesManager
+    CRecoveredSigsDb& GetDb() { return db; }
     void ProcessRecoveredSig(const std::shared_ptr<const CRecoveredSig>& recoveredSig, PeerManager& peerman)
         EXCLUSIVE_LOCKS_REQUIRED(!cs_pending, !cs_listeners);
 
-private:
-    void Cleanup(); // called from the worker thread of CSigSharesManager
+    // Needed for access to GetDb() and ProcessRecoveredSig()
+    friend class CSigSharesManager;
 
 public:
     // public interface
     void RegisterRecoveredSigsListener(CRecoveredSigsListener* l) EXCLUSIVE_LOCKS_REQUIRED(!cs_listeners);
     void UnregisterRecoveredSigsListener(CRecoveredSigsListener* l) EXCLUSIVE_LOCKS_REQUIRED(!cs_listeners);
 
-    bool AsyncSignIfMember(Consensus::LLMQType llmqType, CSigSharesManager& shareman, const uint256& id,
-                           const uint256& msgHash, const uint256& quorumHash = uint256(), bool allowReSign = false,
-                           bool allowDiffMsgHashSigning = false);
     bool HasRecoveredSig(Consensus::LLMQType llmqType, const uint256& id, const uint256& msgHash) const;
     bool HasRecoveredSigForId(Consensus::LLMQType llmqType, const uint256& id) const;
     bool HasRecoveredSigForSession(const uint256& signHash) const;
@@ -236,8 +234,8 @@ class CSigningManager
 private:
     std::thread workThread;
     CThreadInterrupt workInterrupt;
+    void Cleanup(); // called from the worker thread of CSigSharesManager
     void WorkThreadMain(PeerManager& peerman) EXCLUSIVE_LOCKS_REQUIRED(!cs_pending, !cs_listeners);
-    ;
 
 public:
     void StartWorkerThread(PeerManager& peerman);
diff --git a/src/llmq/signing_shares.cpp b/src/llmq/signing_shares.cpp
index 4e1519046d9b..146e6a729642 100644
--- a/src/llmq/signing_shares.cpp
+++ b/src/llmq/signing_shares.cpp
@@ -21,6 +21,7 @@
 #include <util/thread.h>
 #include <util/time.h>
 #include <util/underlying.h>
+#include <validation.h>
 
 #include <cxxtimer.hpp>
 
@@ -179,10 +180,11 @@ void CSigSharesNodeState::RemoveSession(const uint256& signHash)
 
 //////////////////////
 
-CSigSharesManager::CSigSharesManager(CConnman& connman, CSigningManager& _sigman, PeerManager& peerman,
-                                     const CActiveMasternodeManager& mn_activeman, const CQuorumManager& _qman,
-                                     const CSporkManager& sporkman) :
+CSigSharesManager::CSigSharesManager(CConnman& connman, CChainState& chainstate, CSigningManager& _sigman,
+                                     PeerManager& peerman, const CActiveMasternodeManager& mn_activeman,
+                                     const CQuorumManager& _qman, const CSporkManager& sporkman) :
     m_connman{connman},
+    m_chainstate{chainstate},
     sigman{_sigman},
     m_peerman{peerman},
     m_mn_activeman{mn_activeman},
@@ -866,6 +868,86 @@ CDeterministicMNCPtr CSigSharesManager::SelectMemberForRecovery(const CQuorumCPt
     return v[attempt % v.size()].second;
 }
 
+bool CSigSharesManager::AsyncSignIfMember(Consensus::LLMQType llmqType, CSigningManager& sigman, const uint256& id,
+                                          const uint256& msgHash, const uint256& quorumHash, bool allowReSign,
+                                          bool allowDiffMsgHashSigning)
+{
+    AssertLockNotHeld(cs_pendingSigns);
+
+    if (m_mn_activeman.GetProTxHash().IsNull()) return false;
+
+    const auto quorum = [&]() {
+        if (quorumHash.IsNull()) {
+            // This might end up giving different results on different members
+            // This might happen when we are on the brink of confirming a new quorum
+            // This gives a slight risk of not getting enough shares to recover a signature
+            // But at least it shouldn't be possible to get conflicting recovered signatures
+            // TODO fix this by re-signing when the next block arrives, but only when that block results in a change of
+            // the quorum list and no recovered signature has been created in the mean time
+            const auto& llmq_params_opt = Params().GetLLMQ(llmqType);
+            assert(llmq_params_opt.has_value());
+            return SelectQuorumForSigning(llmq_params_opt.value(), m_chainstate.m_chain, qman, id);
+        } else {
+            return qman.GetQuorum(llmqType, quorumHash);
+        }
+    }();
+
+    if (!quorum) {
+        LogPrint(BCLog::LLMQ, "CSigningManager::%s -- failed to select quorum. id=%s, msgHash=%s\n", __func__,
+                 id.ToString(), msgHash.ToString());
+        return false;
+    }
+
+    if (!quorum->IsValidMember(m_mn_activeman.GetProTxHash())) {
+        return false;
+    }
+
+    {
+        auto& db = sigman.GetDb();
+        bool hasVoted = db.HasVotedOnId(llmqType, id);
+        if (hasVoted) {
+            uint256 prevMsgHash;
+            db.GetVoteForId(llmqType, id, prevMsgHash);
+            if (msgHash != prevMsgHash) {
+                if (allowDiffMsgHashSigning) {
+                    LogPrintf("%s -- already voted for id=%s and msgHash=%s. Signing for different " /* Continued */
+                              "msgHash=%s\n",
+                              __func__, id.ToString(), prevMsgHash.ToString(), msgHash.ToString());
+                    hasVoted = false;
+                } else {
+                    LogPrintf("%s -- already voted for id=%s and msgHash=%s. Not voting on " /* Continued */
+                              "conflicting msgHash=%s\n",
+                              __func__, id.ToString(), prevMsgHash.ToString(), msgHash.ToString());
+                    return false;
+                }
+            } else if (allowReSign) {
+                LogPrint(BCLog::LLMQ, "%s -- already voted for id=%s and msgHash=%s. Resigning!\n", __func__,
+                         id.ToString(), prevMsgHash.ToString());
+            } else {
+                LogPrint(BCLog::LLMQ, "%s -- already voted for id=%s and msgHash=%s. Not voting again.\n", __func__,
+                         id.ToString(), prevMsgHash.ToString());
+                return false;
+            }
+        }
+
+        if (db.HasRecoveredSigForId(llmqType, id)) {
+            // no need to sign it if we already have a recovered sig
+            return true;
+        }
+        if (!hasVoted) {
+            db.WriteVoteForId(llmqType, id, msgHash);
+        }
+    }
+
+    if (allowReSign) {
+        // make us re-announce all known shares (other nodes might have run into a timeout)
+        ForceReAnnouncement(quorum, llmqType, id, msgHash);
+    }
+    AsyncSign(quorum, id, msgHash);
+
+    return true;
+}
+
 void CSigSharesManager::CollectSigSharesToRequest(std::unordered_map<NodeId, Uint256HashMap<CSigSharesInv>>& sigSharesToRequest)
 {
     AssertLockHeld(cs);
diff --git a/src/llmq/signing_shares.h b/src/llmq/signing_shares.h
index 0a3aec9d6ba5..85e33a1f1d4d 100644
--- a/src/llmq/signing_shares.h
+++ b/src/llmq/signing_shares.h
@@ -405,6 +405,7 @@ class CSigSharesManager : public CRecoveredSigsListener
     FastRandomContext rnd GUARDED_BY(cs);
 
     CConnman& m_connman;
+    CChainState& m_chainstate;
     CSigningManager& sigman;
     PeerManager& m_peerman;
     const CActiveMasternodeManager& m_mn_activeman;
@@ -415,9 +416,9 @@ class CSigSharesManager : public CRecoveredSigsListener
     std::atomic<uint32_t> recoveredSigsCounter{0};
 
 public:
-    explicit CSigSharesManager(CConnman& connman, CSigningManager& _sigman, PeerManager& peerman,
-                               const CActiveMasternodeManager& mn_activeman, const CQuorumManager& _qman,
-                               const CSporkManager& sporkman);
+    explicit CSigSharesManager(CConnman& connman, CChainState& chainstate, CSigningManager& _sigman,
+                               PeerManager& peerman, const CActiveMasternodeManager& mn_activeman,
+                               const CQuorumManager& _qman, const CSporkManager& sporkman);
     ~CSigSharesManager() override;
 
     CSigSharesManager() = delete;
@@ -439,6 +440,11 @@ class CSigSharesManager : public CRecoveredSigsListener
 
     static CDeterministicMNCPtr SelectMemberForRecovery(const CQuorumCPtr& quorum, const uint256& id, int attempt);
 
+    bool AsyncSignIfMember(Consensus::LLMQType llmqType, CSigningManager& sigman, const uint256& id,
+                           const uint256& msgHash, const uint256& quorumHash = uint256(), bool allowReSign = false,
+                           bool allowDiffMsgHashSigning = false)
+        EXCLUSIVE_LOCKS_REQUIRED(!cs_pendingSigns);
+
 private:
     // all of these return false when the currently processed message should be aborted (as each message actually contains multiple messages)
     bool ProcessMessageSigSesAnn(const CNode& pfrom, const CSigSesAnn& ann);
diff --git a/src/masternode/active/context.cpp b/src/masternode/active/context.cpp
index 28d853dc35b2..c737d8a03d0b 100644
--- a/src/masternode/active/context.cpp
+++ b/src/masternode/active/context.cpp
@@ -26,8 +26,8 @@ ActiveContext::ActiveContext(ChainstateManager& chainman, CConnman& connman, CDe
     cj_server{std::make_unique<CCoinJoinServer>(chainman, connman, dmnman, dstxman, mn_metaman, mempool, peerman,
                                                 mn_activeman, mn_sync, *llmq_ctx.isman)},
     gov_signer{std::make_unique<GovernanceSigner>(connman, dmnman, govman, mn_activeman, chainman, mn_sync)},
-    shareman{std::make_unique<llmq::CSigSharesManager>(connman, *llmq_ctx.sigman, peerman, mn_activeman, *llmq_ctx.qman,
-                                                       sporkman)},
+    shareman{std::make_unique<llmq::CSigSharesManager>(connman, chainman.ActiveChainstate(), *llmq_ctx.sigman, peerman,
+                                                       mn_activeman, *llmq_ctx.qman, sporkman)},
     ehf_sighandler{
         std::make_unique<llmq::CEHFSignalsHandler>(chainman, mnhfman, *llmq_ctx.sigman, *shareman, *llmq_ctx.qman)},
     cl_signer{std::make_unique<chainlock::ChainLockSigner>(chainman.ActiveChainstate(), *llmq_ctx.clhandler,
diff --git a/src/rpc/quorums.cpp b/src/rpc/quorums.cpp
index 54e36be3a34d..424e587baa20 100644
--- a/src/rpc/quorums.cpp
+++ b/src/rpc/quorums.cpp
@@ -464,8 +464,7 @@ static UniValue quorum_sign_helper(const JSONRPCRequest& request, Consensus::LLM
         fSubmit = ParseBoolV(request.params[3], "submit");
     }
     if (fSubmit) {
-        return llmq_ctx.sigman->AsyncSignIfMember(llmqType, *CHECK_NONFATAL(node.active_ctx)->shareman, id, msgHash,
-                                                  quorumHash);
+        return CHECK_NONFATAL(node.active_ctx)->shareman->AsyncSignIfMember(llmqType, *llmq_ctx.sigman, id, msgHash, quorumHash);
     } else {
         const auto pQuorum = [&]() {
             if (quorumHash.IsNull()) {

From 6c89f0e3e9dade21349c06023aa0f1c2eae490c7 Mon Sep 17 00:00:00 2001
From: Kittywhiskers Van Gogh <63189531+kwvg@users.noreply.github.com>
Date: Mon, 8 Sep 2025 23:31:00 +0000
Subject: [PATCH 237/656] refactor: move `RelayRecoveredSig()` call out of
 `CSigSharesManager`

As ProcessRecoveredSig() triggers a NotifyRecoveredSig() notification,
we can stick the RelayRecoveredSig() into CSigSharesManager and have the
relay request processed through the notification interface instead, lets
us finally drop CActiveMasternodeManager from CSigSharesManager.
---
 src/llmq/context.cpp                            | 2 +-
 src/llmq/signing.cpp                            | 8 +-------
 src/llmq/signing.h                              | 5 +----
 src/llmq/signing_shares.cpp                     | 5 +++++
 src/llmq/signing_shares.h                       | 2 ++
 src/masternode/active/notificationinterface.cpp | 6 ++++++
 src/masternode/active/notificationinterface.h   | 6 ++++++
 7 files changed, 22 insertions(+), 12 deletions(-)

diff --git a/src/llmq/context.cpp b/src/llmq/context.cpp
index 61680c2c1dbe..359d2a23924c 100644
--- a/src/llmq/context.cpp
+++ b/src/llmq/context.cpp
@@ -30,7 +30,7 @@ LLMQContext::LLMQContext(ChainstateManager& chainman, CDeterministicMNManager& d
     qman{std::make_unique<llmq::CQuorumManager>(*bls_worker, chainman.ActiveChainstate(), dmnman, *qdkgsman, evo_db,
                                                 *quorum_block_processor, *qsnapman, mn_activeman, mn_sync, sporkman,
                                                 unit_tests, wipe)},
-    sigman{std::make_unique<llmq::CSigningManager>(mn_activeman, chainman.ActiveChainstate(), *qman, unit_tests, wipe)},
+    sigman{std::make_unique<llmq::CSigningManager>(chainman.ActiveChainstate(), *qman, unit_tests, wipe)},
     clhandler{std::make_unique<llmq::CChainLocksHandler>(chainman.ActiveChainstate(), *qman, sporkman, mempool, mn_sync)},
     isman{std::make_unique<llmq::CInstantSendManager>(*clhandler, chainman.ActiveChainstate(), *qman, *sigman, sporkman,
                                                       mempool, mn_sync, unit_tests, wipe)}
diff --git a/src/llmq/signing.cpp b/src/llmq/signing.cpp
index e6172efcb218..a2789737e7f2 100644
--- a/src/llmq/signing.cpp
+++ b/src/llmq/signing.cpp
@@ -332,10 +332,8 @@ void CRecoveredSigsDb::CleanupOldVotes(int64_t maxAge)
 
 //////////////////
 
-CSigningManager::CSigningManager(const CActiveMasternodeManager* const mn_activeman, const CChainState& chainstate,
-                                 const CQuorumManager& _qman, bool fMemory, bool fWipe) :
+CSigningManager::CSigningManager(const CChainState& chainstate, const CQuorumManager& _qman, bool fMemory, bool fWipe) :
     db(fMemory, fWipe),
-    m_mn_activeman(mn_activeman),
     m_chainstate(chainstate),
     qman(_qman)
 {
@@ -615,10 +613,6 @@ void CSigningManager::ProcessRecoveredSig(const std::shared_ptr<const CRecovered
     db.WriteRecoveredSig(*recoveredSig);
     WITH_LOCK(cs_pending, pendingReconstructedRecoveredSigs.erase(recoveredSig->GetHash()));
 
-    if (m_mn_activeman != nullptr) {
-        peerman.RelayRecoveredSig(recoveredSig->GetHash());
-    }
-
     auto listeners = WITH_LOCK(cs_listeners, return recoveredSigsListeners);
     for (auto& l : listeners) {
         peerman.PostProcessMessage(l->HandleNewRecoveredSig(*recoveredSig));
diff --git a/src/llmq/signing.h b/src/llmq/signing.h
index b9aba0d500da..49839074bf10 100644
--- a/src/llmq/signing.h
+++ b/src/llmq/signing.h
@@ -23,7 +23,6 @@
 #include <string_view>
 #include <unordered_map>
 
-class CActiveMasternodeManager;
 class CChainState;
 class CDataStream;
 class CDBBatch;
@@ -163,7 +162,6 @@ class CSigningManager
 private:
 
     CRecoveredSigsDb db;
-    const CActiveMasternodeManager* const m_mn_activeman;
     const CChainState& m_chainstate;
     const CQuorumManager& qman;
 
@@ -180,8 +178,7 @@ class CSigningManager
     std::vector<CRecoveredSigsListener*> recoveredSigsListeners GUARDED_BY(cs_listeners);
 
 public:
-    CSigningManager(const CActiveMasternodeManager* const mn_activeman, const CChainState& chainstate,
-                    const CQuorumManager& _qman, bool fMemory, bool fWipe);
+    CSigningManager(const CChainState& chainstate, const CQuorumManager& _qman, bool fMemory, bool fWipe);
 
     bool AlreadyHave(const CInv& inv) const EXCLUSIVE_LOCKS_REQUIRED(!cs_pending);
     bool GetRecoveredSigForGetData(const uint256& hash, CRecoveredSig& ret) const;
diff --git a/src/llmq/signing_shares.cpp b/src/llmq/signing_shares.cpp
index 146e6a729642..fdb7d967dba4 100644
--- a/src/llmq/signing_shares.cpp
+++ b/src/llmq/signing_shares.cpp
@@ -948,6 +948,11 @@ bool CSigSharesManager::AsyncSignIfMember(Consensus::LLMQType llmqType, CSigning
     return true;
 }
 
+void CSigSharesManager::NotifyRecoveredSig(const std::shared_ptr<const CRecoveredSig>& sig) const
+{
+    m_peerman.RelayRecoveredSig(Assert(sig)->GetHash());
+}
+
 void CSigSharesManager::CollectSigSharesToRequest(std::unordered_map<NodeId, Uint256HashMap<CSigSharesInv>>& sigSharesToRequest)
 {
     AssertLockHeld(cs);
diff --git a/src/llmq/signing_shares.h b/src/llmq/signing_shares.h
index 85e33a1f1d4d..426bfbc3a444 100644
--- a/src/llmq/signing_shares.h
+++ b/src/llmq/signing_shares.h
@@ -445,6 +445,8 @@ class CSigSharesManager : public CRecoveredSigsListener
                            bool allowDiffMsgHashSigning = false)
         EXCLUSIVE_LOCKS_REQUIRED(!cs_pendingSigns);
 
+    void NotifyRecoveredSig(const std::shared_ptr<const CRecoveredSig>& sig) const;
+
 private:
     // all of these return false when the currently processed message should be aborted (as each message actually contains multiple messages)
     bool ProcessMessageSigSesAnn(const CNode& pfrom, const CSigSesAnn& ann);
diff --git a/src/masternode/active/notificationinterface.cpp b/src/masternode/active/notificationinterface.cpp
index aee9f1917afc..5a71a476cd0c 100644
--- a/src/masternode/active/notificationinterface.cpp
+++ b/src/masternode/active/notificationinterface.cpp
@@ -6,6 +6,7 @@
 
 #include <governance/signing.h>
 #include <llmq/ehf_signals.h>
+#include <llmq/signing_shares.h>
 #include <masternode/active/context.h>
 #include <masternode/node.h>
 
@@ -26,4 +27,9 @@ void ActiveNotificationInterface::UpdatedBlockTip(const CBlockIndex* pindexNew,
     m_active_ctx.gov_signer->UpdatedBlockTip(pindexNew);
 }
 
+void ActiveNotificationInterface::NotifyRecoveredSig(const std::shared_ptr<const llmq::CRecoveredSig>& sig)
+{
+    m_active_ctx.shareman->NotifyRecoveredSig(sig);
+}
+
 std::unique_ptr<ActiveNotificationInterface> g_active_notification_interface;
diff --git a/src/masternode/active/notificationinterface.h b/src/masternode/active/notificationinterface.h
index ecb3f9fa962c..4e55bcf21681 100644
--- a/src/masternode/active/notificationinterface.h
+++ b/src/masternode/active/notificationinterface.h
@@ -7,8 +7,13 @@
 
 #include <validationinterface.h>
 
+#include <memory>
+
 class CActiveMasternodeManager;
 struct ActiveContext;
+namespace llmq {
+class CRecoveredSig;
+} // namespace llmq
 
 class ActiveNotificationInterface final : public CValidationInterface
 {
@@ -20,6 +25,7 @@ class ActiveNotificationInterface final : public CValidationInterface
 
 protected:
     // CValidationInterface
+    void NotifyRecoveredSig(const std::shared_ptr<const llmq::CRecoveredSig>& sig) override;
     void UpdatedBlockTip(const CBlockIndex* pindexNew, const CBlockIndex* pindexFork, bool fInitialDownload) override;
 
 private:

From af9a15f804f8cb2df0a3658368b0d2f8f4ef2f6e Mon Sep 17 00:00:00 2001
From: Kittywhiskers Van Gogh <63189531+kwvg@users.noreply.github.com>
Date: Wed, 22 Oct 2025 23:30:14 +0530
Subject: [PATCH 238/656] lint: apply review suggestions

---
 src/chainlock/chainlock.h | 4 ++++
 src/llmq/signing.cpp      | 2 +-
 src/llmq/signing.h        | 2 ++
 3 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/chainlock/chainlock.h b/src/chainlock/chainlock.h
index ab6b0a108582..14fcad13c5de 100644
--- a/src/chainlock/chainlock.h
+++ b/src/chainlock/chainlock.h
@@ -18,7 +18,11 @@
 #include <gsl/pointers.h>
 
 #include <atomic>
+#include <cassert>
+#include <chrono>
 #include <map>
+#include <memory>
+#include <thread>
 #include <unordered_map>
 
 class CBlock;
diff --git a/src/llmq/signing.cpp b/src/llmq/signing.cpp
index a2789737e7f2..8ed8640c60cb 100644
--- a/src/llmq/signing.cpp
+++ b/src/llmq/signing.cpp
@@ -711,7 +711,7 @@ void CSigningManager::StartWorkerThread(PeerManager& peerman)
         assert(false);
     }
 
-    workThread = std::thread(&util::TraceThread, "sigshares", [this, &peerman] { WorkThreadMain(peerman); });
+    workThread = std::thread(&util::TraceThread, "recsigs", [this, &peerman] { WorkThreadMain(peerman); });
 }
 
 void CSigningManager::StopWorkerThread()
diff --git a/src/llmq/signing.h b/src/llmq/signing.h
index 49839074bf10..fdb37ac10b71 100644
--- a/src/llmq/signing.h
+++ b/src/llmq/signing.h
@@ -20,7 +20,9 @@
 
 #include <gsl/pointers.h>
 
+#include <memory>
 #include <string_view>
+#include <thread>
 #include <unordered_map>
 
 class CChainState;

From fb00f52d189a03464e2622a6b027a01a4d42efd3 Mon Sep 17 00:00:00 2001
From: pasta <pasta@dashboost.org>
Date: Wed, 22 Oct 2025 21:36:28 -0500
Subject: [PATCH 239/656] perf: optimize signature aggregation in
 VerifyBatchInsecure and VerifyBatchSecureStep

---
 src/bls/bls_batchverifier.h | 22 ++++++++--------------
 1 file changed, 8 insertions(+), 14 deletions(-)

diff --git a/src/bls/bls_batchverifier.h b/src/bls/bls_batchverifier.h
index 954d4c2f2bd2..b69ba0e5d553 100644
--- a/src/bls/bls_batchverifier.h
+++ b/src/bls/bls_batchverifier.h
@@ -134,13 +134,14 @@ class CBLSBatchVerifier
 
     bool VerifyBatchInsecure(const std::map<uint256, std::vector<MessageMapIterator>>& byMessageHash)
     {
-        CBLSSignature aggSig;
+        std::vector<CBLSSignature> sigsToAggregate;
         std::vector<uint256> msgHashes;
         std::vector<CBLSPublicKey> pubKeys;
         std::set<MessageId> dups;
 
         msgHashes.reserve(messages.size());
         pubKeys.reserve(messages.size());
+        sigsToAggregate.reserve(messages.size());
 
         for (const auto& [msgHash, vec_message_it] : byMessageHash) {
             std::vector<CBLSPublicKey> pubKeysToAggregate;
@@ -153,12 +154,7 @@ class CBLSBatchVerifier
                     continue;
                 }
 
-                if (!aggSig.IsValid()) {
-                    aggSig = msg.sig;
-                } else {
-                    aggSig.AggregateInsecure(msg.sig);
-                }
-
+                sigsToAggregate.push_back(msg.sig);
                 pubKeysToAggregate.push_back(msg.pubKey);
             }
 
@@ -177,6 +173,7 @@ class CBLSBatchVerifier
             return true;
         }
 
+        CBLSSignature aggSig = CBLSSignature::AggregateInsecure(sigsToAggregate);
         return aggSig.VerifyInsecureAggregated(pubKeys, msgHashes);
     }
 
@@ -196,13 +193,14 @@ class CBLSBatchVerifier
 
     bool VerifyBatchSecureStep(std::map<uint256, std::vector<MessageMapIterator>>& byMessageHash)
     {
-        CBLSSignature aggSig;
+        std::vector<CBLSSignature> sigsToAggregate;
         std::vector<uint256> msgHashes;
         std::vector<CBLSPublicKey> pubKeys;
         std::set<MessageId> dups;
 
         msgHashes.reserve(messages.size());
         pubKeys.reserve(messages.size());
+        sigsToAggregate.reserve(messages.size());
 
         for (auto it = byMessageHash.begin(); it != byMessageHash.end(); ) {
             const auto& msgHash = it->first;
@@ -212,12 +210,7 @@ class CBLSBatchVerifier
             if (dups.emplace(msg.msgId).second) {
                 msgHashes.emplace_back(msgHash);
                 pubKeys.emplace_back(msg.pubKey);
-
-                if (!aggSig.IsValid()) {
-                    aggSig = msg.sig;
-                } else {
-                    aggSig.AggregateInsecure(msg.sig);
-                }
+                sigsToAggregate.push_back(msg.sig);
             }
 
             messageIts.pop_back();
@@ -230,6 +223,7 @@ class CBLSBatchVerifier
 
         assert(!msgHashes.empty());
 
+        CBLSSignature aggSig = CBLSSignature::AggregateInsecure(sigsToAggregate);
         return aggSig.VerifyInsecureAggregated(pubKeys, msgHashes);
     }
 };

From d8bd26af3e6430ac7284ce3e6f1a1791cf74c986 Mon Sep 17 00:00:00 2001
From: pasta <pasta@dashboost.org>
Date: Fri, 24 Oct 2025 11:47:14 -0500
Subject: [PATCH 240/656] refactor: extract buildSignHash outside acquiring cs

---
 src/llmq/signing_shares.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/llmq/signing_shares.cpp b/src/llmq/signing_shares.cpp
index fdb7d967dba4..7c639fbc8d18 100644
--- a/src/llmq/signing_shares.cpp
+++ b/src/llmq/signing_shares.cpp
@@ -1728,8 +1728,9 @@ void CSigSharesManager::ForceReAnnouncement(const CQuorumCPtr& quorum, Consensus
 
 MessageProcessingResult CSigSharesManager::HandleNewRecoveredSig(const llmq::CRecoveredSig& recoveredSig)
 {
+    auto signHash = recoveredSig.buildSignHash().Get();
     LOCK(cs);
-    RemoveSigSharesForSession(recoveredSig.buildSignHash().Get());
+    RemoveSigSharesForSession(signHash);
     return {};
 }
 } // namespace llmq

From 90a3b5737c6d2ee0b9da408d39023c5a0c264643 Mon Sep 17 00:00:00 2001
From: pasta <pasta@dashboost.org>
Date: Tue, 21 Oct 2025 10:47:42 -0500
Subject: [PATCH 241/656] refactor: replace size check with is_single_member()
 method for clarity

---
 src/llmq/commitment.cpp        | 4 ++--
 src/llmq/dkgsessionhandler.cpp | 2 +-
 src/llmq/params.h              | 1 +
 src/llmq/signing_shares.cpp    | 4 ++--
 src/rpc/quorums.cpp            | 2 +-
 5 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/llmq/commitment.cpp b/src/llmq/commitment.cpp
index 9d3d1f62153d..ee0c09a0f13a 100644
--- a/src/llmq/commitment.cpp
+++ b/src/llmq/commitment.cpp
@@ -51,7 +51,7 @@ bool CFinalCommitment::VerifySignatureAsync(CDeterministicMNManager& dmnman, CQu
         LogPrint(BCLog::LLMQ, "CFinalCommitment::%s members[%s] quorumPublicKey[%s] commitmentHash[%s]\n", __func__,
                  ss3.str(), quorumPublicKey.ToString(), commitmentHash.ToString());
     }
-    if (llmq_params.size == 1) {
+    if (llmq_params.is_single_member()) {
         LogPrintf("pubkey operator: %s\n", members[0]->pdmnState->pubKeyOperator.Get().ToString());
         if (!membersSig.VerifyInsecure(members[0]->pdmnState->pubKeyOperator.Get(), commitmentHash)) {
             LogPrint(BCLog::LLMQ, "CFinalCommitment -- q[%s] invalid member signature\n", quorumHash.ToString());
@@ -138,7 +138,7 @@ bool CFinalCommitment::Verify(CDeterministicMNManager& dmnman, CQuorumSnapshotMa
         LogPrint(BCLog::LLMQ, "CFinalCommitment -- q[%s] invalid quorumPublicKey\n", quorumHash.ToString());
         return false;
     }
-    if (llmq_params.size != 1 && quorumVvecHash.IsNull()) {
+    if (!llmq_params.is_single_member() && quorumVvecHash.IsNull()) {
         LogPrint(BCLog::LLMQ, "CFinalCommitment -- q[%s] invalid quorumVvecHash\n", quorumHash.ToString());
         return false;
     }
diff --git a/src/llmq/dkgsessionhandler.cpp b/src/llmq/dkgsessionhandler.cpp
index c5dfcce1acfd..1a200be7cf34 100644
--- a/src/llmq/dkgsessionhandler.cpp
+++ b/src/llmq/dkgsessionhandler.cpp
@@ -551,7 +551,7 @@ void CDKGSessionHandler::HandleDKGRound(CConnman& connman, PeerManager& peerman)
         return changed;
     });
 
-    if (params.size == 1) {
+    if (params.is_single_member()) {
         auto finalCommitment = curSession->FinalizeSingleCommitment();
         if (!finalCommitment.IsNull()) { // it can be null only if we are not member
             if (auto inv_opt = quorumBlockProcessor.AddMineableCommitment(finalCommitment); inv_opt.has_value()) {
diff --git a/src/llmq/params.h b/src/llmq/params.h
index 961f6e9a0b67..99574930075d 100644
--- a/src/llmq/params.h
+++ b/src/llmq/params.h
@@ -121,6 +121,7 @@ struct LLMQParams {
 
     // For how many blocks recent DKG info should be kept
     [[nodiscard]] constexpr int max_store_depth() const { return max_cycles(keepOldKeys) * dkgInterval; }
+    [[nodiscard]] constexpr bool is_single_member() const { return size == 1; }
 };
 
 //static_assert(std::is_trivial_v<Consensus::LLMQParams>, "LLMQParams is not a trivial type");
diff --git a/src/llmq/signing_shares.cpp b/src/llmq/signing_shares.cpp
index d20a6ebe0314..70ee85588c22 100644
--- a/src/llmq/signing_shares.cpp
+++ b/src/llmq/signing_shares.cpp
@@ -781,7 +781,7 @@ void CSigSharesManager::TryRecoverSig(PeerManager& peerman, const CQuorumCPtr& q
             return;
         }
 
-        if (quorum->params.size == 1) {
+        if (quorum->params.is_single_member()) {
             if (sigSharesForSignHash->empty()) {
                 LogPrint(BCLog::LLMQ_SIGS, /* Continued */
                          "CSigSharesManager::%s -- impossible to recover single-node signature - no shares yet. id=%s, "
@@ -1550,7 +1550,7 @@ std::optional<CSigShare> CSigSharesManager::CreateSigShare(const CQuorumCPtr& qu
         return std::nullopt;
     }
 
-    if (quorum->params.size == 1) {
+    if (quorum->params.is_single_member()) {
         int memberIdx = quorum->GetMemberIndex(activeMasterNodeProTxHash);
         if (memberIdx == -1) {
             // this should really not happen (IsValidMember gave true)
diff --git a/src/rpc/quorums.cpp b/src/rpc/quorums.cpp
index b12b738f9046..eae1543185fa 100644
--- a/src/rpc/quorums.cpp
+++ b/src/rpc/quorums.cpp
@@ -211,7 +211,7 @@ static UniValue BuildQuorumInfo(const llmq::CQuorumBlockProcessor& quorum_block_
             mo.pushKV("pubKeyOperator", dmn->pdmnState->pubKeyOperator.ToString());
             mo.pushKV("valid", static_cast<bool>(quorum->qc->validMembers[i]));
             if (quorum->qc->validMembers[i]) {
-                if (quorum->params.size == 1) {
+                if (quorum->params.is_single_member()) {
                     mo.pushKV("pubKeyShare", dmn->pdmnState->pubKeyOperator.ToString());
                 } else {
                     CBLSPublicKey pubKey = quorum->GetPubKeyShare(i);

From 80f1060757786d96bf384fae3694e11910c1b180 Mon Sep 17 00:00:00 2001
From: Konstantin Akimov <knstqq@gmail.com>
Date: Thu, 2 Oct 2025 23:48:00 +0700
Subject: [PATCH 242/656] fix: missing changes from 20459

---
 src/rpc/util.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/rpc/util.cpp b/src/rpc/util.cpp
index 60d7ddd10104..afbf34ca7e0c 100644
--- a/src/rpc/util.cpp
+++ b/src/rpc/util.cpp
@@ -536,7 +536,9 @@ UniValue RPCHelpMan::HandleRequest(const JSONRPCRequest& request) const
     if (request.mode == JSONRPCRequest::GET_HELP || !IsValidNumArgs(request.params.size())) {
         throw std::runtime_error(ToString());
     }
-    return m_fun(*this, request);
+    const UniValue ret = m_fun(*this, request);
+    CHECK_NONFATAL(std::any_of(m_results.m_results.begin(), m_results.m_results.end(), [ret](const RPCResult& res) { return res.MatchesType(ret); }));
+    return ret;
 }
 
 bool RPCHelpMan::IsValidNumArgs(size_t num_args) const

From 5f683dc513d7626df29c2e090629ec7b0014dc48 Mon Sep 17 00:00:00 2001
From: MacroFake <falke.marco@gmail.com>
Date: Thu, 19 May 2022 06:44:08 +0200
Subject: [PATCH 243/656] Merge bitcoin/bitcoin#25161: rpc: Put undocumented
 JSON failure mode behind a runtime flag

b953ea6cc691ba61bf08eb186e76e7e8b7ba8120 rpc: Put undocumented JSON failure mode behind a runtime flag (Suhail Saqan)

Pull request description:

  Fixes #24695 (Put undocumented JSON failure mode behind a runtime flag)

ACKs for top commit:
  luke-jr:
    utACK b953ea6cc691ba61bf08eb186e76e7e8b7ba8120
  vincenzopalazzo:
    ACK https://github.com/bitcoin/bitcoin/pull/25161/commits/b953ea6cc691ba61bf08eb186e76e7e8b7ba8120

Tree-SHA512: 2005ee1b1f3b637918390b2ecd4166f2fd8c86e3c59fba3da8a0cbd5b1dffd03190c92f6dca3c489ecce4276eaf3108b2edcf9cd6224b713adb52f5bb848163b
---
 src/init.cpp                           | 1 +
 src/rpc/util.cpp                       | 6 ++++--
 src/rpc/util.h                         | 2 ++
 test/functional/test_framework/util.py | 1 +
 4 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/init.cpp b/src/init.cpp
index 18d1cafe92c8..cb7eda0f5d3d 100644
--- a/src/init.cpp
+++ b/src/init.cpp
@@ -775,6 +775,7 @@ void SetupServerArgs(ArgsManager& argsman)
     argsman.AddArg("-rpcallowip=<ip>", "Allow JSON-RPC connections from specified source. Valid values for <ip> are a single IP (e.g. 1.2.3.4), a network/netmask (e.g. 1.2.3.4/255.255.255.0), a network/CIDR (e.g. 1.2.3.4/24), all ipv4 (0.0.0.0/0), or all ipv6 (::/0). This option can be specified multiple times", ArgsManager::ALLOW_ANY, OptionsCategory::RPC);
     argsman.AddArg("-rpcauth=<userpw>", "Username and HMAC-SHA-256 hashed password for JSON-RPC connections. The field <userpw> comes in the format: <USERNAME>:<SALT>$<HASH>. A canonical python script is included in share/rpcuser. The client then connects normally using the rpcuser=<USERNAME>/rpcpassword=<PASSWORD> pair of arguments. This option can be specified multiple times", ArgsManager::ALLOW_ANY | ArgsManager::SENSITIVE, OptionsCategory::RPC);
     argsman.AddArg("-rpcbind=<addr>[:port]", "Bind to given address to listen for JSON-RPC connections. Do not expose the RPC server to untrusted networks such as the public internet! This option is ignored unless -rpcallowip is also passed. Port is optional and overrides -rpcport. Use [host]:port notation for IPv6. This option can be specified multiple times (default: 127.0.0.1 and ::1 i.e., localhost, or if -rpcallowip has been specified, 0.0.0.0 and :: i.e., all addresses)", ArgsManager::ALLOW_ANY | ArgsManager::NETWORK_ONLY, OptionsCategory::RPC);
+    argsman.AddArg("-rpcdoccheck", strprintf("Throw a non-fatal error at runtime if the documentation for an RPC is incorrect (default: %u)", DEFAULT_RPC_DOC_CHECK), ArgsManager::ALLOW_ANY | ArgsManager::DEBUG_ONLY, OptionsCategory::RPC);
     argsman.AddArg("-rpccookiefile=<loc>", "Location of the auth cookie. Relative paths will be prefixed by a net-specific datadir location. (default: data dir)", ArgsManager::ALLOW_ANY, OptionsCategory::RPC);
     argsman.AddArg("-rpcexternaluser=<users>", "List of comma-separated usernames for JSON-RPC external connections", ArgsManager::ALLOW_ANY | ArgsManager::SENSITIVE, OptionsCategory::RPC);
     argsman.AddArg("-rpcexternalworkqueue=<n>", strprintf("Set the depth of the work queue to service external RPC calls (default: %d)", DEFAULT_HTTP_WORKQUEUE), ArgsManager::ALLOW_ANY | ArgsManager::DEBUG_ONLY, OptionsCategory::RPC);
diff --git a/src/rpc/util.cpp b/src/rpc/util.cpp
index afbf34ca7e0c..69f8ae73c599 100644
--- a/src/rpc/util.cpp
+++ b/src/rpc/util.cpp
@@ -12,9 +12,9 @@
 #include <script/signingprovider.h>
 #include <tinyformat.h>
 #include <util/check.h>
-#include <util/system.h>
 #include <util/strencodings.h>
 #include <util/string.h>
+#include <util/system.h>
 #include <util/translation.h>
 
 const std::string UNIX_EPOCH_TIME = "UNIX epoch time";
@@ -537,7 +537,9 @@ UniValue RPCHelpMan::HandleRequest(const JSONRPCRequest& request) const
         throw std::runtime_error(ToString());
     }
     const UniValue ret = m_fun(*this, request);
-    CHECK_NONFATAL(std::any_of(m_results.m_results.begin(), m_results.m_results.end(), [ret](const RPCResult& res) { return res.MatchesType(ret); }));
+    if (gArgs.GetBoolArg("-rpcdoccheck", DEFAULT_RPC_DOC_CHECK)) {
+        CHECK_NONFATAL(std::any_of(m_results.m_results.begin(), m_results.m_results.end(), [ret](const RPCResult& res) { return res.MatchesType(ret); }));
+    }
     return ret;
 }
 
diff --git a/src/rpc/util.h b/src/rpc/util.h
index a9f5d6246fd1..006125b749c9 100644
--- a/src/rpc/util.h
+++ b/src/rpc/util.h
@@ -23,6 +23,8 @@
 #include <variant>
 #include <vector>
 
+static constexpr bool DEFAULT_RPC_DOC_CHECK{false};
+
 /**
  * String used to describe UNIX epoch time in documentation, factored out to a
  * constant for consistency.
diff --git a/test/functional/test_framework/util.py b/test/functional/test_framework/util.py
index 107bd72cc6c3..7b9cfbd56b0d 100644
--- a/test/functional/test_framework/util.py
+++ b/test/functional/test_framework/util.py
@@ -390,6 +390,7 @@ def write_config(config_path, *, n, chain, extra_config="", disable_autoconnect=
             f.write("[{}]\n".format(chain_name_conf_section))
         f.write("port=" + str(p2p_port(n)) + "\n")
         f.write("rpcport=" + str(rpc_port(n)) + "\n")
+        f.write("rpcdoccheck=1\n")
         f.write("fallbackfee=0.00001\n")
         f.write("server=1\n")
         f.write("keypool=1\n")

From ef554040418daf8aa1d4a2730784bdb5434ccf79 Mon Sep 17 00:00:00 2001
From: fanquake <fanquake@gmail.com>
Date: Fri, 20 May 2022 08:32:41 +0100
Subject: [PATCH 244/656] Merge bitcoin/bitcoin#25170: build: Enable
 RPC_DOC_CHECK on --enable-debug

fafae678f6cd8aaca2be8ece501b258160f7fbfa build: Enable RPC_DOC_CHECK on --enable-debug (MacroFake)

Pull request description:

  This probably makes no large difference, as the setting is already enabled by default in the functional tests. However, I think it is nice to also enable it in debug builds by default to catch issues while manually testing without the runtime flags specified.

  See also https://github.com/bitcoin/bitcoin/issues/24709

ACKs for top commit:
  vincenzopalazzo:
    utACK https://github.com/bitcoin/bitcoin/pull/25170/commits/fafae678f6cd8aaca2be8ece501b258160f7fbfa

Tree-SHA512: cea3276fc9b5a3bc0f6d9819be9a50b19ecf762729d3e3975abdf00da06beaa3f664b18a826fbab1fedd9143bc0624a95a490bfe40c4b5b0a0f94dbc565ce738
---
 configure.ac   | 1 +
 src/rpc/util.h | 8 +++++++-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/configure.ac b/configure.ac
index d216ffd04eba..a1915299946b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -375,6 +375,7 @@ if test "$enable_debug" = "yes"; then
   AX_CHECK_PREPROC_FLAG([-DDEBUG_CORE], [DEBUG_CPPFLAGS="$DEBUG_CPPFLAGS -DDEBUG_CORE"], [], [$CXXFLAG_WERROR])
   AX_CHECK_PREPROC_FLAG([-DDEBUG_LOCKORDER], [DEBUG_CPPFLAGS="$DEBUG_CPPFLAGS -DDEBUG_LOCKORDER"], [], [$CXXFLAG_WERROR])
   AX_CHECK_PREPROC_FLAG([-DDEBUG_LOCKCONTENTION], [DEBUG_CPPFLAGS="$DEBUG_CPPFLAGS -DDEBUG_LOCKCONTENTION"], [], [$CXXFLAG_WERROR])
+  AX_CHECK_PREPROC_FLAG([-DRPC_DOC_CHECK], [DEBUG_CPPFLAGS="$DEBUG_CPPFLAGS -DRPC_DOC_CHECK"], [], [$CXXFLAG_WERROR])
   AX_CHECK_PREPROC_FLAG([-DABORT_ON_FAILED_ASSUME], [DEBUG_CPPFLAGS="$DEBUG_CPPFLAGS -DABORT_ON_FAILED_ASSUME"], [], [$CXXFLAG_WERROR])
   AX_CHECK_COMPILE_FLAG([-ftrapv], [DEBUG_CXXFLAGS="$DEBUG_CXXFLAGS -ftrapv"], [], [$CXXFLAG_WERROR])
 else
diff --git a/src/rpc/util.h b/src/rpc/util.h
index 006125b749c9..09cba33b813e 100644
--- a/src/rpc/util.h
+++ b/src/rpc/util.h
@@ -23,7 +23,13 @@
 #include <variant>
 #include <vector>
 
-static constexpr bool DEFAULT_RPC_DOC_CHECK{false};
+static constexpr bool DEFAULT_RPC_DOC_CHECK{
+#ifdef RPC_DOC_CHECK
+    true
+#else
+    false
+#endif
+};
 
 /**
  * String used to describe UNIX epoch time in documentation, factored out to a

From 9d93d5930f1ed6ca93dd044e3d3e22f571620797 Mon Sep 17 00:00:00 2001
From: fanquake <fanquake@gmail.com>
Date: Mon, 30 May 2022 09:15:50 +0100
Subject: [PATCH 245/656] Merge bitcoin/bitcoin#25237: rpc: Capture UniValue by
 ref for rpcdoccheck

20ff4991e548630d7bb5e491fa4d69ec49369872 rpc: Capture potentially large UniValue by ref for rpcdoccheck (Martin Zumsande)

Pull request description:

  Capturing it by reference instead of value should save us from making a copy of a potentially large object. Saw this while having a look at #25229 although I couldn't reproduce an actual leak, so this is not a fix for that issue.

ACKs for top commit:
  MarcoFalke:
    review ACK 20ff4991e548630d7bb5e491fa4d69ec49369872
  theStack:
    Code-review ACK 20ff4991e548630d7bb5e491fa4d69ec49369872
  furszy:
    Code ACK 20ff4991

Tree-SHA512: faf7bb14e37f8324b93a39095b07693626329da47c4a1ac8929bf99385e2e0567008e959e7e8540bc7d454d08fa41cccd39f55253c9a839fa88362922058a93b
---
 src/rpc/util.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/rpc/util.cpp b/src/rpc/util.cpp
index 69f8ae73c599..da552c410f5f 100644
--- a/src/rpc/util.cpp
+++ b/src/rpc/util.cpp
@@ -538,7 +538,7 @@ UniValue RPCHelpMan::HandleRequest(const JSONRPCRequest& request) const
     }
     const UniValue ret = m_fun(*this, request);
     if (gArgs.GetBoolArg("-rpcdoccheck", DEFAULT_RPC_DOC_CHECK)) {
-        CHECK_NONFATAL(std::any_of(m_results.m_results.begin(), m_results.m_results.end(), [ret](const RPCResult& res) { return res.MatchesType(ret); }));
+        CHECK_NONFATAL(std::any_of(m_results.m_results.begin(), m_results.m_results.end(), [&ret](const RPCResult& res) { return res.MatchesType(ret); }));
     }
     return ret;
 }

From 96dc666b10402ec49dfc5fde889a149a1c438423 Mon Sep 17 00:00:00 2001
From: pasta <pasta@dashboost.org>
Date: Fri, 24 Oct 2025 18:27:27 -0500
Subject: [PATCH 246/656] chore: run clang-format

---
 src/bench/bls_pubkey_agg.cpp | 50 ++++++++----------------------------
 1 file changed, 10 insertions(+), 40 deletions(-)

diff --git a/src/bench/bls_pubkey_agg.cpp b/src/bench/bls_pubkey_agg.cpp
index 9814103b459b..ab732e93806a 100644
--- a/src/bench/bls_pubkey_agg.cpp
+++ b/src/bench/bls_pubkey_agg.cpp
@@ -62,59 +62,29 @@ static void BLS_PubKeyAggregate_Batch(size_t count, benchmark::Bench& bench)
 // Benchmarks for different sizes
 
 // Small aggregation (5 keys) - typical for small quorum subsets
-static void BLS_PubKeyAggregate_Iterative_5(benchmark::Bench& bench)
-{
-    BLS_PubKeyAggregate_Iterative(5, bench);
-}
+static void BLS_PubKeyAggregate_Iterative_5(benchmark::Bench& bench) { BLS_PubKeyAggregate_Iterative(5, bench); }
 
-static void BLS_PubKeyAggregate_Batch_5(benchmark::Bench& bench)
-{
-    BLS_PubKeyAggregate_Batch(5, bench);
-}
+static void BLS_PubKeyAggregate_Batch_5(benchmark::Bench& bench) { BLS_PubKeyAggregate_Batch(5, bench); }
 
 // Medium aggregation (25 keys) - typical for medium quorum subsets
-static void BLS_PubKeyAggregate_Iterative_25(benchmark::Bench& bench)
-{
-    BLS_PubKeyAggregate_Iterative(25, bench);
-}
+static void BLS_PubKeyAggregate_Iterative_25(benchmark::Bench& bench) { BLS_PubKeyAggregate_Iterative(25, bench); }
 
-static void BLS_PubKeyAggregate_Batch_25(benchmark::Bench& bench)
-{
-    BLS_PubKeyAggregate_Batch(25, bench);
-}
+static void BLS_PubKeyAggregate_Batch_25(benchmark::Bench& bench) { BLS_PubKeyAggregate_Batch(25, bench); }
 
 // Large aggregation (50 keys) - typical for larger quorums
-static void BLS_PubKeyAggregate_Iterative_50(benchmark::Bench& bench)
-{
-    BLS_PubKeyAggregate_Iterative(50, bench);
-}
+static void BLS_PubKeyAggregate_Iterative_50(benchmark::Bench& bench) { BLS_PubKeyAggregate_Iterative(50, bench); }
 
-static void BLS_PubKeyAggregate_Batch_50(benchmark::Bench& bench)
-{
-    BLS_PubKeyAggregate_Batch(50, bench);
-}
+static void BLS_PubKeyAggregate_Batch_50(benchmark::Bench& bench) { BLS_PubKeyAggregate_Batch(50, bench); }
 
 // Very large aggregation (100 keys) - stress test
-static void BLS_PubKeyAggregate_Iterative_100(benchmark::Bench& bench)
-{
-    BLS_PubKeyAggregate_Iterative(100, bench);
-}
+static void BLS_PubKeyAggregate_Iterative_100(benchmark::Bench& bench) { BLS_PubKeyAggregate_Iterative(100, bench); }
 
-static void BLS_PubKeyAggregate_Batch_100(benchmark::Bench& bench)
-{
-    BLS_PubKeyAggregate_Batch(100, bench);
-}
+static void BLS_PubKeyAggregate_Batch_100(benchmark::Bench& bench) { BLS_PubKeyAggregate_Batch(100, bench); }
 
 // Extra large aggregation (200 keys) - extreme case
-static void BLS_PubKeyAggregate_Iterative_200(benchmark::Bench& bench)
-{
-    BLS_PubKeyAggregate_Iterative(200, bench);
-}
+static void BLS_PubKeyAggregate_Iterative_200(benchmark::Bench& bench) { BLS_PubKeyAggregate_Iterative(200, bench); }
 
-static void BLS_PubKeyAggregate_Batch_200(benchmark::Bench& bench)
-{
-    BLS_PubKeyAggregate_Batch(200, bench);
-}
+static void BLS_PubKeyAggregate_Batch_200(benchmark::Bench& bench) { BLS_PubKeyAggregate_Batch(200, bench); }
 
 // Register all benchmarks
 BENCHMARK(BLS_PubKeyAggregate_Iterative_5)

From 2c82532812531fcf1f069722f96c4674491d267b Mon Sep 17 00:00:00 2001
From: UdjinM6 <UdjinM6@users.noreply.github.com>
Date: Sat, 4 Oct 2025 18:39:20 +0300
Subject: [PATCH 247/656] feat: share `vecMasternodesUsed` across all wallets,
 improve its handling

---
 src/coinjoin/client.cpp | 30 +++++++++++++++++-------------
 src/coinjoin/client.h   |  5 +----
 src/masternode/meta.cpp | 30 +++++++++++++++++++++++++++++-
 src/masternode/meta.h   | 13 +++++++++++--
 4 files changed, 58 insertions(+), 20 deletions(-)

diff --git a/src/coinjoin/client.cpp b/src/coinjoin/client.cpp
index 88d5ee4f8187..bf9cb1b7091b 100644
--- a/src/coinjoin/client.cpp
+++ b/src/coinjoin/client.cpp
@@ -248,7 +248,6 @@ void CCoinJoinClientSession::ResetPool()
 void CCoinJoinClientManager::ResetPool()
 {
     nCachedLastSuccessBlock = 0;
-    vecMasternodesUsed.clear();
     AssertLockNotHeld(cs_deqsessions);
     LOCK(cs_deqsessions);
     for (auto& session : deqSessions) {
@@ -967,11 +966,15 @@ bool CCoinJoinClientManager::DoAutomaticDenominating(ChainstateManager& chainman
     // If we've used 90% of the Masternode list then drop the oldest first ~30%
     int nThreshold_high = nMnCountEnabled * 0.9;
     int nThreshold_low = nThreshold_high * 0.7;
-    WalletCJLogPrint(m_wallet, "Checking vecMasternodesUsed: size: %d, threshold: %d\n", (int)vecMasternodesUsed.size(), nThreshold_high);
+    size_t nUsedMasternodes{m_mn_metaman.GetUsedMasternodesCount()};
 
-    if ((int)vecMasternodesUsed.size() > nThreshold_high) {
-        vecMasternodesUsed.erase(vecMasternodesUsed.begin(), vecMasternodesUsed.begin() + vecMasternodesUsed.size() - nThreshold_low);
-        WalletCJLogPrint(m_wallet, "  vecMasternodesUsed: new size: %d, threshold: %d\n", (int)vecMasternodesUsed.size(), nThreshold_high);
+    WalletCJLogPrint(m_wallet, "Checking nUsedMasternodes: %d, threshold: %d\n", (int)nUsedMasternodes, nThreshold_high);
+
+    if ((int)nUsedMasternodes > nThreshold_high) {
+        size_t nToRemove{nUsedMasternodes - nThreshold_low};
+        m_mn_metaman.RemoveUsedMasternodes(nToRemove);
+        WalletCJLogPrint(m_wallet, "  new nUsedMasternodes: %d, threshold: %d\n",
+                         (int)m_mn_metaman.GetUsedMasternodesCount(), nThreshold_high);
     }
 
     bool fResult = true;
@@ -995,9 +998,9 @@ bool CCoinJoinClientManager::DoAutomaticDenominating(ChainstateManager& chainman
     return fResult;
 }
 
-void CCoinJoinClientManager::AddUsedMasternode(const COutPoint& outpointMn)
+void CCoinJoinClientManager::AddUsedMasternode(const uint256& proTxHash)
 {
-    vecMasternodesUsed.push_back(outpointMn);
+    m_mn_metaman.AddUsedMasternode(proTxHash);
 }
 
 CDeterministicMNCPtr CCoinJoinClientManager::GetRandomNotUsedMasternode()
@@ -1005,7 +1008,7 @@ CDeterministicMNCPtr CCoinJoinClientManager::GetRandomNotUsedMasternode()
     auto mnList = m_dmnman.GetListAtChainTip();
 
     size_t nCountEnabled = mnList.GetValidMNsCount();
-    size_t nCountNotExcluded = nCountEnabled - vecMasternodesUsed.size();
+    size_t nCountNotExcluded{nCountEnabled - m_mn_metaman.GetUsedMasternodesCount()};
 
     WalletCJLogPrint(m_wallet, "CCoinJoinClientManager::%s -- %d enabled masternodes, %d masternodes to choose from\n", __func__, nCountEnabled, nCountNotExcluded);
     if (nCountNotExcluded < 1) {
@@ -1022,15 +1025,16 @@ CDeterministicMNCPtr CCoinJoinClientManager::GetRandomNotUsedMasternode()
     // shuffle pointers
     Shuffle(vpMasternodesShuffled.begin(), vpMasternodesShuffled.end(), FastRandomContext());
 
-    std::set<COutPoint> excludeSet(vecMasternodesUsed.begin(), vecMasternodesUsed.end());
+    std::set<uint256> excludeSet{m_mn_metaman.GetUsedMasternodesSet()};
 
     // loop through
     for (const auto& dmn : vpMasternodesShuffled) {
-        if (excludeSet.count(dmn->collateralOutpoint)) {
+        if (excludeSet.count(dmn->proTxHash)) {
             continue;
         }
 
-        WalletCJLogPrint(m_wallet, "CCoinJoinClientManager::%s -- found, masternode=%s\n", __func__, dmn->collateralOutpoint.ToStringShort());
+        WalletCJLogPrint(m_wallet, "CCoinJoinClientManager::%s -- found, masternode=%s\n", __func__,
+                         dmn->proTxHash.ToString());
         return dmn;
     }
 
@@ -1083,7 +1087,7 @@ bool CCoinJoinClientSession::JoinExistingQueue(CAmount nBalanceNeedsAnonymized,
             continue;
         }
 
-        m_clientman.AddUsedMasternode(dsq.masternodeOutpoint);
+        m_clientman.AddUsedMasternode(dmn->proTxHash);
 
         if (connman.IsMasternodeOrDisconnectRequested(dmn->pdmnState->netInfo->GetPrimary())) {
             WalletCJLogPrint(m_wallet, /* Continued */
@@ -1137,7 +1141,7 @@ bool CCoinJoinClientSession::StartNewQueue(CAmount nBalanceNeedsAnonymized, CCon
             return false;
         }
 
-        m_clientman.AddUsedMasternode(dmn->collateralOutpoint);
+        m_clientman.AddUsedMasternode(dmn->proTxHash);
 
         // skip next mn payments winners
         if (dmn->pdmnState->nLastPaidHeight + nWeightedMnCount < mnList.GetHeight() + WinnersToSkip()) {
diff --git a/src/coinjoin/client.h b/src/coinjoin/client.h
index 222122b0329e..f999c9fa9c59 100644
--- a/src/coinjoin/client.h
+++ b/src/coinjoin/client.h
@@ -262,9 +262,6 @@ class CCoinJoinClientManager
     const llmq::CInstantSendManager& m_isman;
     const std::unique_ptr<CCoinJoinClientQueueManager>& m_queueman;
 
-    // Keep track of the used Masternodes
-    std::vector<COutPoint> vecMasternodesUsed;
-
     mutable Mutex cs_deqsessions;
     // TODO: or map<denom, CCoinJoinClientSession> ??
     std::deque<CCoinJoinClientSession> deqSessions GUARDED_BY(cs_deqsessions);
@@ -327,7 +324,7 @@ class CCoinJoinClientManager
 
     void ProcessPendingDsaRequest(CConnman& connman) EXCLUSIVE_LOCKS_REQUIRED(!cs_deqsessions);
 
-    void AddUsedMasternode(const COutPoint& outpointMn);
+    void AddUsedMasternode(const uint256& proTxHash);
     CDeterministicMNCPtr GetRandomNotUsedMasternode();
 
     void UpdatedSuccessBlock();
diff --git a/src/masternode/meta.cpp b/src/masternode/meta.cpp
index adb2aaa30259..2678867d984a 100644
--- a/src/masternode/meta.cpp
+++ b/src/masternode/meta.cpp
@@ -8,7 +8,7 @@
 #include <univalue.h>
 #include <util/time.h>
 
-const std::string MasternodeMetaStore::SERIALIZATION_VERSION_STRING = "CMasternodeMetaMan-Version-4";
+const std::string MasternodeMetaStore::SERIALIZATION_VERSION_STRING = "CMasternodeMetaMan-Version-5";
 
 CMasternodeMetaMan::CMasternodeMetaMan() :
     m_db{std::make_unique<db_type>("mncache.dat", "magicMasternodeCache")}
@@ -153,6 +153,34 @@ void CMasternodeMetaMan::RememberPlatformBan(const uint256& inv_hash, PlatformBa
     m_seen_platform_bans.insert(inv_hash, std::move(msg));
 }
 
+void CMasternodeMetaMan::AddUsedMasternode(const uint256& proTxHash)
+{
+    LOCK(cs);
+    m_used_masternodes.push_back(proTxHash);
+}
+
+void CMasternodeMetaMan::RemoveUsedMasternodes(size_t nCount)
+{
+    LOCK(cs);
+    if (nCount > m_used_masternodes.size()) {
+        m_used_masternodes.clear();
+    } else {
+        m_used_masternodes.erase(m_used_masternodes.begin(), m_used_masternodes.begin() + nCount);
+    }
+}
+
+size_t CMasternodeMetaMan::GetUsedMasternodesCount() const
+{
+    LOCK(cs);
+    return m_used_masternodes.size();
+}
+
+std::set<uint256> CMasternodeMetaMan::GetUsedMasternodesSet() const
+{
+    LOCK(cs);
+    return {m_used_masternodes.begin(), m_used_masternodes.end()};
+}
+
 std::string MasternodeMetaStore::ToString() const
 {
     LOCK(cs);
diff --git a/src/masternode/meta.h b/src/masternode/meta.h
index 217b9d800287..e0d05c1c0052 100644
--- a/src/masternode/meta.h
+++ b/src/masternode/meta.h
@@ -139,6 +139,8 @@ class MasternodeMetaStore
     std::map<uint256, CMasternodeMetaInfoPtr> metaInfos GUARDED_BY(cs);
     // keep track of dsq count to prevent masternodes from gaming coinjoin queue
     std::atomic<int64_t> nDsqCount{0};
+    // keep track of the used Masternodes for CoinJoin
+    std::vector<uint256> m_used_masternodes GUARDED_BY(cs);
 
 public:
     template<typename Stream>
@@ -149,7 +151,7 @@ class MasternodeMetaStore
         for (const auto& p : metaInfos) {
             tmpMetaInfo.emplace_back(*p.second);
         }
-        s << SERIALIZATION_VERSION_STRING << tmpMetaInfo << nDsqCount;
+        s << SERIALIZATION_VERSION_STRING << tmpMetaInfo << nDsqCount << m_used_masternodes;
     }
 
     template<typename Stream>
@@ -164,7 +166,7 @@ class MasternodeMetaStore
             return;
         }
         std::vector<CMasternodeMetaInfo> tmpMetaInfo;
-        s >> tmpMetaInfo >> nDsqCount;
+        s >> tmpMetaInfo >> nDsqCount >> m_used_masternodes;
         metaInfos.clear();
         for (auto& mm : tmpMetaInfo) {
             metaInfos.emplace(mm.GetProTxHash(), std::make_shared<CMasternodeMetaInfo>(std::move(mm)));
@@ -176,6 +178,7 @@ class MasternodeMetaStore
         LOCK(cs);
 
         metaInfos.clear();
+        m_used_masternodes.clear();
     }
 
     std::string ToString() const EXCLUSIVE_LOCKS_REQUIRED(!cs);
@@ -257,6 +260,12 @@ class CMasternodeMetaMan : public MasternodeMetaStore
     bool AlreadyHavePlatformBan(const uint256& inv_hash) const EXCLUSIVE_LOCKS_REQUIRED(!cs);
     std::optional<PlatformBanMessage> GetPlatformBan(const uint256& inv_hash) const EXCLUSIVE_LOCKS_REQUIRED(!cs);
     void RememberPlatformBan(const uint256& inv_hash, PlatformBanMessage&& msg) EXCLUSIVE_LOCKS_REQUIRED(!cs);
+
+    // CoinJoin masternode tracking
+    void AddUsedMasternode(const uint256& proTxHash) EXCLUSIVE_LOCKS_REQUIRED(!cs);
+    void RemoveUsedMasternodes(size_t nCount) EXCLUSIVE_LOCKS_REQUIRED(!cs);
+    size_t GetUsedMasternodesCount() const EXCLUSIVE_LOCKS_REQUIRED(!cs);
+    std::set<uint256> GetUsedMasternodesSet() const EXCLUSIVE_LOCKS_REQUIRED(!cs);
 };
 
 #endif // BITCOIN_MASTERNODE_META_H

From 13a28fa33f724838ea290158651a6b3e7807deba Mon Sep 17 00:00:00 2001
From: UdjinM6 <UdjinM6@users.noreply.github.com>
Date: Mon, 6 Oct 2025 19:30:53 +0300
Subject: [PATCH 248/656] perf: optimize CoinJoin masternode tracking with
 hybrid data structure
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Improves performance by implementing a dual data structure approach for
tracking used masternodes in CoinJoin sessions:

- Use std::deque<uint256> for maintaining FIFO insertion order
- Use std::unordered_set<uint256> for O(1) lookup performance
- Replace GetUsedMasternodesSet() with IsUsedMasternode() to avoid
  expensive set construction on every masternode selection

Performance improvements at 1800 used masternodes:
- Masternode selection: 2.5ms → 0.1ms (25x faster)
- Batch removal: 100µs → 27µs (4x faster)

The optimization becomes increasingly important at scale (>1000 MNs)
and in multi-wallet scenarios with concurrent CoinJoin sessions.

Key design decisions:
- Deque provides O(1) front removal (vs O(n) for vector)
- Unordered_set provides O(1) lookup (vs O(n log n) set construction)
- Only deque is serialized; set is rebuilt on load (no version bump)
- Both structures stay synchronized through all operations
- Automatic duplicate prevention in AddUsedMasternode()

Memory cost: ~130 KB for 1800 entries (negligible)
Code complexity: Minimal, well-encapsulated

This builds on PR #6875 which moved masternode tracking from per-wallet
to shared global storage. That PR solved the multi-wallet coordination
problem; this patch addresses the performance bottleneck at scale.
---
 src/coinjoin/client.cpp |  6 ++----
 src/masternode/meta.cpp | 19 ++++++++++++-------
 src/masternode/meta.h   | 23 ++++++++++++++++++-----
 3 files changed, 32 insertions(+), 16 deletions(-)

diff --git a/src/coinjoin/client.cpp b/src/coinjoin/client.cpp
index bf9cb1b7091b..86138670eede 100644
--- a/src/coinjoin/client.cpp
+++ b/src/coinjoin/client.cpp
@@ -1025,11 +1025,9 @@ CDeterministicMNCPtr CCoinJoinClientManager::GetRandomNotUsedMasternode()
     // shuffle pointers
     Shuffle(vpMasternodesShuffled.begin(), vpMasternodesShuffled.end(), FastRandomContext());
 
-    std::set<uint256> excludeSet{m_mn_metaman.GetUsedMasternodesSet()};
-
-    // loop through
+    // loop through - using direct O(1) lookup instead of creating a set copy
     for (const auto& dmn : vpMasternodesShuffled) {
-        if (excludeSet.count(dmn->proTxHash)) {
+        if (m_mn_metaman.IsUsedMasternode(dmn->proTxHash)) {
             continue;
         }
 
diff --git a/src/masternode/meta.cpp b/src/masternode/meta.cpp
index 2678867d984a..c7eb501a7528 100644
--- a/src/masternode/meta.cpp
+++ b/src/masternode/meta.cpp
@@ -156,16 +156,21 @@ void CMasternodeMetaMan::RememberPlatformBan(const uint256& inv_hash, PlatformBa
 void CMasternodeMetaMan::AddUsedMasternode(const uint256& proTxHash)
 {
     LOCK(cs);
-    m_used_masternodes.push_back(proTxHash);
+    // Only add if not already present (prevents duplicates)
+    if (m_used_masternodes_set.insert(proTxHash).second) {
+        m_used_masternodes.push_back(proTxHash);
+    }
 }
 
 void CMasternodeMetaMan::RemoveUsedMasternodes(size_t nCount)
 {
     LOCK(cs);
-    if (nCount > m_used_masternodes.size()) {
-        m_used_masternodes.clear();
-    } else {
-        m_used_masternodes.erase(m_used_masternodes.begin(), m_used_masternodes.begin() + nCount);
+    size_t removed = 0;
+    while (removed < nCount && !m_used_masternodes.empty()) {
+        // Remove from both the set and the deque
+        m_used_masternodes_set.erase(m_used_masternodes.front());
+        m_used_masternodes.pop_front();
+        ++removed;
     }
 }
 
@@ -175,10 +180,10 @@ size_t CMasternodeMetaMan::GetUsedMasternodesCount() const
     return m_used_masternodes.size();
 }
 
-std::set<uint256> CMasternodeMetaMan::GetUsedMasternodesSet() const
+bool CMasternodeMetaMan::IsUsedMasternode(const uint256& proTxHash) const
 {
     LOCK(cs);
-    return {m_used_masternodes.begin(), m_used_masternodes.end()};
+    return m_used_masternodes_set.find(proTxHash) != m_used_masternodes_set.end();
 }
 
 std::string MasternodeMetaStore::ToString() const
diff --git a/src/masternode/meta.h b/src/masternode/meta.h
index e0d05c1c0052..e9cdf931e38e 100644
--- a/src/masternode/meta.h
+++ b/src/masternode/meta.h
@@ -14,6 +14,7 @@
 #include <unordered_lru_cache.h>
 
 #include <atomic>
+#include <deque>
 #include <map>
 #include <memory>
 #include <optional>
@@ -139,8 +140,10 @@ class MasternodeMetaStore
     std::map<uint256, CMasternodeMetaInfoPtr> metaInfos GUARDED_BY(cs);
     // keep track of dsq count to prevent masternodes from gaming coinjoin queue
     std::atomic<int64_t> nDsqCount{0};
-    // keep track of the used Masternodes for CoinJoin
-    std::vector<uint256> m_used_masternodes GUARDED_BY(cs);
+    // keep track of the used Masternodes for CoinJoin across all wallets
+    // Using deque for efficient FIFO removal and unordered_set for O(1) lookups
+    std::deque<uint256> m_used_masternodes GUARDED_BY(cs);
+    Uint256HashSet m_used_masternodes_set GUARDED_BY(cs);
 
 public:
     template<typename Stream>
@@ -151,7 +154,9 @@ class MasternodeMetaStore
         for (const auto& p : metaInfos) {
             tmpMetaInfo.emplace_back(*p.second);
         }
-        s << SERIALIZATION_VERSION_STRING << tmpMetaInfo << nDsqCount << m_used_masternodes;
+        // Convert deque to vector for serialization - unordered_set will be rebuilt on deserialization
+        std::vector<uint256> tmpUsedMasternodes(m_used_masternodes.begin(), m_used_masternodes.end());
+        s << SERIALIZATION_VERSION_STRING << tmpMetaInfo << nDsqCount << tmpUsedMasternodes;
     }
 
     template<typename Stream>
@@ -166,11 +171,18 @@ class MasternodeMetaStore
             return;
         }
         std::vector<CMasternodeMetaInfo> tmpMetaInfo;
-        s >> tmpMetaInfo >> nDsqCount >> m_used_masternodes;
+        std::vector<uint256> tmpUsedMasternodes;
+        s >> tmpMetaInfo >> nDsqCount >> tmpUsedMasternodes;
+
         metaInfos.clear();
         for (auto& mm : tmpMetaInfo) {
             metaInfos.emplace(mm.GetProTxHash(), std::make_shared<CMasternodeMetaInfo>(std::move(mm)));
         }
+
+        // Convert vector to deque and build unordered_set for O(1) lookups
+        m_used_masternodes.assign(tmpUsedMasternodes.begin(), tmpUsedMasternodes.end());
+        m_used_masternodes_set.clear();
+        m_used_masternodes_set.insert(tmpUsedMasternodes.begin(), tmpUsedMasternodes.end());
     }
 
     void Clear() EXCLUSIVE_LOCKS_REQUIRED(!cs)
@@ -179,6 +191,7 @@ class MasternodeMetaStore
 
         metaInfos.clear();
         m_used_masternodes.clear();
+        m_used_masternodes_set.clear();
     }
 
     std::string ToString() const EXCLUSIVE_LOCKS_REQUIRED(!cs);
@@ -265,7 +278,7 @@ class CMasternodeMetaMan : public MasternodeMetaStore
     void AddUsedMasternode(const uint256& proTxHash) EXCLUSIVE_LOCKS_REQUIRED(!cs);
     void RemoveUsedMasternodes(size_t nCount) EXCLUSIVE_LOCKS_REQUIRED(!cs);
     size_t GetUsedMasternodesCount() const EXCLUSIVE_LOCKS_REQUIRED(!cs);
-    std::set<uint256> GetUsedMasternodesSet() const EXCLUSIVE_LOCKS_REQUIRED(!cs);
+    bool IsUsedMasternode(const uint256& proTxHash) const EXCLUSIVE_LOCKS_REQUIRED(!cs);
 };
 
 #endif // BITCOIN_MASTERNODE_META_H

From f50d09a94977956f92c9827a2d0509e603b5c271 Mon Sep 17 00:00:00 2001
From: UdjinM6 <UdjinM6@users.noreply.github.com>
Date: Fri, 10 Oct 2025 17:21:24 +0300
Subject: [PATCH 249/656] fix: update `MasternodeMetaStore::ToString()`

---
 src/masternode/meta.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/masternode/meta.cpp b/src/masternode/meta.cpp
index c7eb501a7528..4cdee0ab08e5 100644
--- a/src/masternode/meta.cpp
+++ b/src/masternode/meta.cpp
@@ -189,7 +189,8 @@ bool CMasternodeMetaMan::IsUsedMasternode(const uint256& proTxHash) const
 std::string MasternodeMetaStore::ToString() const
 {
     LOCK(cs);
-    return strprintf("Masternodes: meta infos object count: %d, nDsqCount: %d", metaInfos.size(), nDsqCount);
+    return strprintf("Masternodes: meta infos object count: %d, nDsqCount: %d, used masternodes count: %d",
+                     metaInfos.size(), nDsqCount, m_used_masternodes.size());
 }
 
 uint256 PlatformBanMessage::GetHash() const { return ::SerializeHash(*this); }

From 5e888c4251df06b574a9d102eb58defb2f8910d8 Mon Sep 17 00:00:00 2001
From: pasta <pasta@dashboost.org>
Date: Mon, 20 Oct 2025 22:40:51 -0500
Subject: [PATCH 250/656] refactor: optimize AsyncSign by using std::move for
 quorum parameter

---
 src/llmq/signing_shares.cpp | 8 ++++----
 src/llmq/signing_shares.h   | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/llmq/signing_shares.cpp b/src/llmq/signing_shares.cpp
index 4b070416b9bb..bd26063f094e 100644
--- a/src/llmq/signing_shares.cpp
+++ b/src/llmq/signing_shares.cpp
@@ -876,7 +876,7 @@ bool CSigSharesManager::AsyncSignIfMember(Consensus::LLMQType llmqType, CSigning
 
     if (m_mn_activeman.GetProTxHash().IsNull()) return false;
 
-    const auto quorum = [&]() {
+    auto quorum = [&]() {
         if (quorumHash.IsNull()) {
             // This might end up giving different results on different members
             // This might happen when we are on the brink of confirming a new quorum
@@ -943,7 +943,7 @@ bool CSigSharesManager::AsyncSignIfMember(Consensus::LLMQType llmqType, CSigning
         // make us re-announce all known shares (other nodes might have run into a timeout)
         ForceReAnnouncement(quorum, llmqType, id, msgHash);
     }
-    AsyncSign(quorum, id, msgHash);
+    AsyncSign(std::move(quorum), id, msgHash);
 
     return true;
 }
@@ -1599,10 +1599,10 @@ void CSigSharesManager::WorkThreadMain()
     }
 }
 
-void CSigSharesManager::AsyncSign(const CQuorumCPtr& quorum, const uint256& id, const uint256& msgHash)
+void CSigSharesManager::AsyncSign(CQuorumCPtr quorum, const uint256& id, const uint256& msgHash)
 {
     LOCK(cs_pendingSigns);
-    pendingSigns.emplace_back(quorum, id, msgHash);
+    pendingSigns.emplace_back(std::move(quorum), id, msgHash);
 }
 
 void CSigSharesManager::SignPendingSigShares()
diff --git a/src/llmq/signing_shares.h b/src/llmq/signing_shares.h
index fb2f692306fa..b49a25c12c5d 100644
--- a/src/llmq/signing_shares.h
+++ b/src/llmq/signing_shares.h
@@ -431,7 +431,7 @@ class CSigSharesManager : public CRecoveredSigsListener
 
     void ProcessMessage(const CNode& pnode, const std::string& msg_type, CDataStream& vRecv);
 
-    void AsyncSign(const CQuorumCPtr& quorum, const uint256& id, const uint256& msgHash)
+    void AsyncSign(CQuorumCPtr quorum, const uint256& id, const uint256& msgHash)
         EXCLUSIVE_LOCKS_REQUIRED(!cs_pendingSigns);
     std::optional<CSigShare> CreateSigShare(const CQuorumCPtr& quorum, const uint256& id, const uint256& msgHash) const;
     void ForceReAnnouncement(const CQuorumCPtr& quorum, Consensus::LLMQType llmqType, const uint256& id, const uint256& msgHash);

From 46856fc16d570d8706c0c43c348c51553c0d5296 Mon Sep 17 00:00:00 2001
From: pasta <pasta@dashboost.org>
Date: Mon, 20 Oct 2025 23:20:04 -0500
Subject: [PATCH 251/656] refactor: update RequestQuorumData and
 GetQuorumRecoveryStartOffset to use CQuorum reference

---
 src/llmq/quorums.cpp | 14 +++++++-------
 src/llmq/quorums.h   |  4 ++--
 src/rpc/quorums.cpp  |  2 +-
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/llmq/quorums.cpp b/src/llmq/quorums.cpp
index c73395a01071..9fa8b8e1018f 100644
--- a/src/llmq/quorums.cpp
+++ b/src/llmq/quorums.cpp
@@ -475,7 +475,7 @@ bool CQuorumManager::HasQuorum(Consensus::LLMQType llmqType, const CQuorumBlockP
     return quorum_block_processor.HasMinedCommitment(llmqType, quorumHash);
 }
 
-bool CQuorumManager::RequestQuorumData(CNode* pfrom, CConnman& connman, CQuorumCPtr pQuorum, uint16_t nDataMask,
+bool CQuorumManager::RequestQuorumData(CNode* pfrom, CConnman& connman, const CQuorum& quorum, uint16_t nDataMask,
                                        const uint256& proTxHash) const
 {
     if (pfrom == nullptr) {
@@ -486,12 +486,12 @@ bool CQuorumManager::RequestQuorumData(CNode* pfrom, CConnman& connman, CQuorumC
         LogPrint(BCLog::LLMQ, "CQuorumManager::%s -- pfrom is not a verified masternode\n", __func__);
         return false;
     }
-    const Consensus::LLMQType llmqType = pQuorum->qc->llmqType;
+    const Consensus::LLMQType llmqType = quorum.qc->llmqType;
     if (!Params().GetLLMQ(llmqType).has_value()) {
         LogPrint(BCLog::LLMQ, "CQuorumManager::%s -- Invalid llmqType: %d\n", __func__, ToUnderlying(llmqType));
         return false;
     }
-    const CBlockIndex* pindex{pQuorum->m_quorum_base_block_index};
+    const CBlockIndex* pindex{quorum.m_quorum_base_block_index};
     if (pindex == nullptr) {
         LogPrint(BCLog::LLMQ, "CQuorumManager::%s -- Invalid m_quorum_base_block_index : nullptr\n", __func__);
         return false;
@@ -673,7 +673,7 @@ CQuorumCPtr CQuorumManager::GetQuorum(Consensus::LLMQType llmqType, gsl::not_nul
     return BuildQuorumFromCommitment(llmqType, pQuorumBaseBlockIndex, populate_cache);
 }
 
-size_t CQuorumManager::GetQuorumRecoveryStartOffset(const CQuorumCPtr pQuorum, const CBlockIndex* pIndex) const
+size_t CQuorumManager::GetQuorumRecoveryStartOffset(const CQuorum& quorum, const CBlockIndex* pIndex) const
 {
     assert(m_mn_activeman);
 
@@ -695,7 +695,7 @@ size_t CQuorumManager::GetQuorumRecoveryStartOffset(const CQuorumCPtr pQuorum, c
             }
         }
     }
-    return nIndex % pQuorum->qc->validMembers.size();
+    return nIndex % quorum.qc->validMembers.size();
 }
 
 MessageProcessingResult CQuorumManager::ProcessMessage(CNode& pfrom, CConnman& connman, std::string_view msg_type, CDataStream& vRecv)
@@ -930,7 +930,7 @@ void CQuorumManager::StartQuorumDataRecoveryThread(CConnman& connman, const CQuo
         int64_t nTimeLastSuccess{0};
         uint256* pCurrentMemberHash{nullptr};
         std::vector<uint256> vecMemberHashes;
-        const size_t nMyStartOffset{GetQuorumRecoveryStartOffset(pQuorum, pIndex)};
+        const size_t nMyStartOffset{GetQuorumRecoveryStartOffset(*pQuorum, pIndex)};
         const int64_t nRequestTimeout{10};
 
         auto printLog = [&](const std::string& strMessage) {
@@ -1006,7 +1006,7 @@ void CQuorumManager::StartQuorumDataRecoveryThread(CConnman& connman, const CQuo
                     return;
                 }
 
-                if (RequestQuorumData(pNode, connman, pQuorum, nDataMask, proTxHash)) {
+                if (RequestQuorumData(pNode, connman, *pQuorum, nDataMask, proTxHash)) {
                     nTimeLastSuccess = GetTime<std::chrono::seconds>().count();
                     printLog("Requested");
                 } else {
diff --git a/src/llmq/quorums.h b/src/llmq/quorums.h
index 01a1e75dad75..ef31dfb002f1 100644
--- a/src/llmq/quorums.h
+++ b/src/llmq/quorums.h
@@ -280,7 +280,7 @@ class CQuorumManager
 
     static bool HasQuorum(Consensus::LLMQType llmqType, const CQuorumBlockProcessor& quorum_block_processor, const uint256& quorumHash);
 
-    bool RequestQuorumData(CNode* pfrom, CConnman& connman, const CQuorumCPtr pQuorum, uint16_t nDataMask,
+    bool RequestQuorumData(CNode* pfrom, CConnman& connman, const CQuorum& quorum, uint16_t nDataMask,
                            const uint256& proTxHash = uint256()) const;
 
     // all these methods will lock cs_main for a short period of time
@@ -309,7 +309,7 @@ class CQuorumManager
     /// Returns the start offset for the masternode with the given proTxHash. This offset is applied when picking data recovery members of a quorum's
     /// memberlist and is calculated based on a list of all member of all active quorums for the given llmqType in a way that each member
     /// should receive the same number of request if all active llmqType members requests data from one llmqType quorum.
-    size_t GetQuorumRecoveryStartOffset(const CQuorumCPtr pQuorum, const CBlockIndex* pIndex) const;
+    size_t GetQuorumRecoveryStartOffset(const CQuorum& quorum, const CBlockIndex* pIndex) const;
 
     void StartCachePopulatorThread(const CQuorumCPtr pQuorum) const;
     void StartQuorumDataRecoveryThread(CConnman& connman, const CQuorumCPtr pQuorum, const CBlockIndex* pIndex,
diff --git a/src/rpc/quorums.cpp b/src/rpc/quorums.cpp
index 16ce3eabc16a..9cc576ba9ecd 100644
--- a/src/rpc/quorums.cpp
+++ b/src/rpc/quorums.cpp
@@ -902,7 +902,7 @@ static RPCHelpMan quorum_getdata()
         throw JSONRPCError(RPC_INVALID_PARAMETER, "quorum not found");
     }
     return connman.ForNode(nodeId, [&](CNode* pNode) {
-        return llmq_ctx.qman->RequestQuorumData(pNode, connman, quorum, nDataMask, proTxHash);
+        return llmq_ctx.qman->RequestQuorumData(pNode, connman, *quorum, nDataMask, proTxHash);
     });
 },
     };

From 5a6e64d773b8d0e0a1f052b3b32caec4cafb1ec3 Mon Sep 17 00:00:00 2001
From: pasta <pasta@dashboost.org>
Date: Mon, 20 Oct 2025 23:27:42 -0500
Subject: [PATCH 252/656] refactor: use std::move for CQuorumCPtr in
 StartQuorumDataRecoveryThread

---
 src/llmq/quorums.cpp | 6 +++---
 src/llmq/quorums.h   | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/llmq/quorums.cpp b/src/llmq/quorums.cpp
index 9fa8b8e1018f..3bcc192b393f 100644
--- a/src/llmq/quorums.cpp
+++ b/src/llmq/quorums.cpp
@@ -293,7 +293,7 @@ void CQuorumManager::TriggerQuorumDataRecoveryThreads(CConnman& connman, const C
             }
 
             // Finally start the thread which triggers the requests for this quorum
-            StartQuorumDataRecoveryThread(connman, pQuorum, pIndex, nDataMask);
+            StartQuorumDataRecoveryThread(connman, std::move(pQuorum), pIndex, nDataMask);
         }
     }
 }
@@ -913,7 +913,7 @@ void CQuorumManager::StartCachePopulatorThread(const CQuorumCPtr pQuorum) const
     });
 }
 
-void CQuorumManager::StartQuorumDataRecoveryThread(CConnman& connman, const CQuorumCPtr pQuorum,
+void CQuorumManager::StartQuorumDataRecoveryThread(CConnman& connman, CQuorumCPtr pQuorum,
                                                    const CBlockIndex* pIndex, uint16_t nDataMaskIn) const
 {
     assert(m_mn_activeman);
@@ -924,7 +924,7 @@ void CQuorumManager::StartQuorumDataRecoveryThread(CConnman& connman, const CQuo
         return;
     }
 
-    workerPool.push([&connman, pQuorum, pIndex, nDataMaskIn, this](int threadId) {
+    workerPool.push([&connman, pQuorum = std::move(pQuorum), pIndex, nDataMaskIn, this](int threadId) {
         size_t nTries{0};
         uint16_t nDataMask{nDataMaskIn};
         int64_t nTimeLastSuccess{0};
diff --git a/src/llmq/quorums.h b/src/llmq/quorums.h
index ef31dfb002f1..7029deb2aef6 100644
--- a/src/llmq/quorums.h
+++ b/src/llmq/quorums.h
@@ -312,7 +312,7 @@ class CQuorumManager
     size_t GetQuorumRecoveryStartOffset(const CQuorum& quorum, const CBlockIndex* pIndex) const;
 
     void StartCachePopulatorThread(const CQuorumCPtr pQuorum) const;
-    void StartQuorumDataRecoveryThread(CConnman& connman, const CQuorumCPtr pQuorum, const CBlockIndex* pIndex,
+    void StartQuorumDataRecoveryThread(CConnman& connman, CQuorumCPtr pQuorum, const CBlockIndex* pIndex,
                                        uint16_t nDataMask) const;
 
     void StartCleanupOldQuorumDataThread(const CBlockIndex* pIndex) const;

From 382fd3c3e8b4bc4da6726abeb44d85f81632e8b9 Mon Sep 17 00:00:00 2001
From: pasta <pasta@dashboost.org>
Date: Mon, 20 Oct 2025 23:44:52 -0500
Subject: [PATCH 253/656] refactor: use std::move for CQuorumCPtr in
 StartCachePopulatorThread

---
 src/llmq/quorums.cpp | 4 ++--
 src/llmq/quorums.h   | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/llmq/quorums.cpp b/src/llmq/quorums.cpp
index 3bcc192b393f..fd35d69299e5 100644
--- a/src/llmq/quorums.cpp
+++ b/src/llmq/quorums.cpp
@@ -883,7 +883,7 @@ MessageProcessingResult CQuorumManager::ProcessMessage(CNode& pfrom, CConnman& c
     return {};
 }
 
-void CQuorumManager::StartCachePopulatorThread(const CQuorumCPtr pQuorum) const
+void CQuorumManager::StartCachePopulatorThread(CQuorumCPtr pQuorum) const
 {
     if (!pQuorum->HasVerificationVector()) {
         return;
@@ -896,7 +896,7 @@ void CQuorumManager::StartCachePopulatorThread(const CQuorumCPtr pQuorum) const
             pQuorum->m_quorum_base_block_index->GetBlockHash().ToString());
 
     // when then later some other thread tries to get keys, it will be much faster
-    workerPool.push([pQuorum, t, this](int threadId) {
+    workerPool.push([pQuorum = std::move(pQuorum), t, this](int threadId) {
         for (const auto i : irange::range(pQuorum->members.size())) {
             if (quorumThreadInterrupt) {
                 break;
diff --git a/src/llmq/quorums.h b/src/llmq/quorums.h
index 7029deb2aef6..cbbbdd5dccbf 100644
--- a/src/llmq/quorums.h
+++ b/src/llmq/quorums.h
@@ -311,7 +311,7 @@ class CQuorumManager
     /// should receive the same number of request if all active llmqType members requests data from one llmqType quorum.
     size_t GetQuorumRecoveryStartOffset(const CQuorum& quorum, const CBlockIndex* pIndex) const;
 
-    void StartCachePopulatorThread(const CQuorumCPtr pQuorum) const;
+    void StartCachePopulatorThread(CQuorumCPtr pQuorum) const;
     void StartQuorumDataRecoveryThread(CConnman& connman, CQuorumCPtr pQuorum, const CBlockIndex* pIndex,
                                        uint16_t nDataMask) const;
 

From 35a4f07371ad81e025b2553e919fbdd8a08ae88a Mon Sep 17 00:00:00 2001
From: pasta <pasta@dashboost.org>
Date: Mon, 20 Oct 2025 23:45:44 -0500
Subject: [PATCH 254/656] refactor: replace CQuorumCPtr with CQuorum references
 in quorum-related functions

---
 src/llmq/signing_shares.cpp | 66 ++++++++++++++++++-------------------
 src/llmq/signing_shares.h   |  8 ++---
 src/rpc/quorums.cpp         | 42 +++++++++++------------
 3 files changed, 58 insertions(+), 58 deletions(-)

diff --git a/src/llmq/signing_shares.cpp b/src/llmq/signing_shares.cpp
index bd26063f094e..f6d5ada3c004 100644
--- a/src/llmq/signing_shares.cpp
+++ b/src/llmq/signing_shares.cpp
@@ -768,13 +768,13 @@ void CSigSharesManager::ProcessSigShare(const CSigShare& sigShare, const CQuorum
     }
 
     if (canTryRecovery) {
-        TryRecoverSig(quorum, sigShare.getId(), sigShare.getMsgHash());
+        TryRecoverSig(*quorum, sigShare.getId(), sigShare.getMsgHash());
     }
 }
 
-void CSigSharesManager::TryRecoverSig(const CQuorumCPtr& quorum, const uint256& id, const uint256& msgHash)
+void CSigSharesManager::TryRecoverSig(const CQuorum& quorum, const uint256& id, const uint256& msgHash)
 {
-    if (sigman.HasRecoveredSigForId(quorum->params.type, id)) {
+    if (sigman.HasRecoveredSigForId(quorum.params.type, id)) {
         return;
     }
 
@@ -783,13 +783,13 @@ void CSigSharesManager::TryRecoverSig(const CQuorumCPtr& quorum, const uint256&
     {
         LOCK(cs);
 
-        auto signHash = SignHash(quorum->params.type, quorum->qc->quorumHash, id, msgHash).Get();
+        auto signHash = SignHash(quorum.params.type, quorum.qc->quorumHash, id, msgHash).Get();
         const auto* sigSharesForSignHash = sigShares.GetAllForSignHash(signHash);
         if (sigSharesForSignHash == nullptr) {
             return;
         }
 
-        if (quorum->params.is_single_member()) {
+        if (quorum.params.is_single_member()) {
             if (sigSharesForSignHash->empty()) {
                 LogPrint(BCLog::LLMQ_SIGS, /* Continued */
                          "CSigSharesManager::%s -- impossible to recover single-node signature - no shares yet. id=%s, "
@@ -802,22 +802,22 @@ void CSigSharesManager::TryRecoverSig(const CQuorumCPtr& quorum, const uint256&
             LogPrint(BCLog::LLMQ_SIGS, "CSigSharesManager::%s -- recover single-node signature. id=%s, msgHash=%s\n",
                      __func__, id.ToString(), msgHash.ToString());
 
-            auto rs = std::make_shared<CRecoveredSig>(quorum->params.type, quorum->qc->quorumHash, id, msgHash,
+            auto rs = std::make_shared<CRecoveredSig>(quorum.params.type, quorum.qc->quorumHash, id, msgHash,
                                                       recoveredSig);
             sigman.ProcessRecoveredSig(rs, m_peerman);
             return; // end of single-quorum processing
         }
 
-        sigSharesForRecovery.reserve((size_t) quorum->params.threshold);
-        idsForRecovery.reserve((size_t) quorum->params.threshold);
-        for (auto it = sigSharesForSignHash->begin(); it != sigSharesForSignHash->end() && sigSharesForRecovery.size() < size_t(quorum->params.threshold); ++it) {
+        sigSharesForRecovery.reserve((size_t) quorum.params.threshold);
+        idsForRecovery.reserve((size_t) quorum.params.threshold);
+        for (auto it = sigSharesForSignHash->begin(); it != sigSharesForSignHash->end() && sigSharesForRecovery.size() < size_t(quorum.params.threshold); ++it) {
             const auto& sigShare = it->second;
             sigSharesForRecovery.emplace_back(sigShare.sigShare.Get());
-            idsForRecovery.emplace_back(quorum->members[sigShare.getQuorumMember()]->proTxHash);
+            idsForRecovery.emplace_back(quorum.members[sigShare.getQuorumMember()]->proTxHash);
         }
 
         // check if we can recover the final signature
-        if (sigSharesForRecovery.size() < size_t(quorum->params.threshold)) {
+        if (sigSharesForRecovery.size() < size_t(quorum.params.threshold)) {
             return;
         }
     }
@@ -834,14 +834,14 @@ void CSigSharesManager::TryRecoverSig(const CQuorumCPtr& quorum, const uint256&
     LogPrint(BCLog::LLMQ_SIGS, "CSigSharesManager::%s -- recovered signature. id=%s, msgHash=%s, time=%d\n", __func__,
               id.ToString(), msgHash.ToString(), t.count());
 
-    auto rs = std::make_shared<CRecoveredSig>(quorum->params.type, quorum->qc->quorumHash, id, msgHash, recoveredSig);
+    auto rs = std::make_shared<CRecoveredSig>(quorum.params.type, quorum.qc->quorumHash, id, msgHash, recoveredSig);
 
     // There should actually be no need to verify the self-recovered signatures as it should always succeed. Let's
     // however still verify it from time to time, so that we have a chance to catch bugs. We do only this sporadic
     // verification because this is unbatched and thus slow verification that happens here.
     if (((recoveredSigsCounter++) % 100) == 0) {
         auto signHash = rs->buildSignHash();
-        bool valid = recoveredSig.VerifyInsecure(quorum->qc->quorumPublicKey, signHash.Get());
+        bool valid = recoveredSig.VerifyInsecure(quorum.qc->quorumPublicKey, signHash.Get());
         if (!valid) {
             // this should really not happen as we have verified all signature shares before
             LogPrintf("CSigSharesManager::%s -- own recovered signature is invalid. id=%s, msgHash=%s\n", __func__,
@@ -853,13 +853,13 @@ void CSigSharesManager::TryRecoverSig(const CQuorumCPtr& quorum, const uint256&
     sigman.ProcessRecoveredSig(rs, m_peerman);
 }
 
-CDeterministicMNCPtr CSigSharesManager::SelectMemberForRecovery(const CQuorumCPtr& quorum, const uint256 &id, int attempt)
+CDeterministicMNCPtr CSigSharesManager::SelectMemberForRecovery(const CQuorum& quorum, const uint256 &id, int attempt)
 {
-    assert(attempt < quorum->params.recoveryMembers);
+    assert(attempt < quorum.params.recoveryMembers);
 
     std::vector<std::pair<uint256, CDeterministicMNCPtr>> v;
-    v.reserve(quorum->members.size());
-    for (const auto& dmn : quorum->members) {
+    v.reserve(quorum.members.size());
+    for (const auto& dmn : quorum.members) {
         auto h = ::SerializeHash(std::make_pair(dmn->proTxHash, id));
         v.emplace_back(h, dmn);
     }
@@ -941,7 +941,7 @@ bool CSigSharesManager::AsyncSignIfMember(Consensus::LLMQType llmqType, CSigning
 
     if (allowReSign) {
         // make us re-announce all known shares (other nodes might have run into a timeout)
-        ForceReAnnouncement(quorum, llmqType, id, msgHash);
+        ForceReAnnouncement(*quorum, llmqType, id, msgHash);
     }
     AsyncSign(std::move(quorum), id, msgHash);
 
@@ -1128,7 +1128,7 @@ void CSigSharesManager::CollectSigSharesToSendConcentrated(std::unordered_map<No
             int64_t waitTime = exp2(signedSession.attempt) * EXP_SEND_FOR_RECOVERY_TIMEOUT;
             waitTime = std::min(MAX_SEND_FOR_RECOVERY_TIMEOUT, waitTime);
             signedSession.nextAttemptTime = curTime + waitTime;
-            auto dmn = SelectMemberForRecovery(signedSession.quorum, signedSession.sigShare.getId(), signedSession.attempt);
+            auto dmn = SelectMemberForRecovery(*signedSession.quorum, signedSession.sigShare.getId(), signedSession.attempt);
             signedSession.attempt++;
 
             LogPrint(BCLog::LLMQ_SIGS, "CSigSharesManager::%s -- signHash=%s, sending to %s, attempt=%d\n", __func__,
@@ -1611,7 +1611,7 @@ void CSigSharesManager::SignPendingSigShares()
     WITH_LOCK(cs_pendingSigns, v.swap(pendingSigns));
 
     for (const auto& [pQuorum, id, msgHash] : v) {
-        auto opt_sigShare = CreateSigShare(pQuorum, id, msgHash);
+        auto opt_sigShare = CreateSigShare(*pQuorum, id, msgHash);
 
         if (opt_sigShare.has_value() && opt_sigShare->sigShare.Get().IsValid()) {
             auto sigShare = *opt_sigShare;
@@ -1629,23 +1629,23 @@ void CSigSharesManager::SignPendingSigShares()
     }
 }
 
-std::optional<CSigShare> CSigSharesManager::CreateSigShare(const CQuorumCPtr& quorum, const uint256& id, const uint256& msgHash) const
+std::optional<CSigShare> CSigSharesManager::CreateSigShare(const CQuorum& quorum, const uint256& id, const uint256& msgHash) const
 {
     cxxtimer::Timer t(true);
     auto activeMasterNodeProTxHash = m_mn_activeman.GetProTxHash();
 
-    if (!quorum->IsValidMember(activeMasterNodeProTxHash)) {
+    if (!quorum.IsValidMember(activeMasterNodeProTxHash)) {
         return std::nullopt;
     }
 
-    if (quorum->params.is_single_member()) {
-        int memberIdx = quorum->GetMemberIndex(activeMasterNodeProTxHash);
+    if (quorum.params.is_single_member()) {
+        int memberIdx = quorum.GetMemberIndex(activeMasterNodeProTxHash);
         if (memberIdx == -1) {
             // this should really not happen (IsValidMember gave true)
             return std::nullopt;
         }
 
-        CSigShare sigShare(quorum->params.type, quorum->qc->quorumHash, id, msgHash, uint16_t(memberIdx), {});
+        CSigShare sigShare(quorum.params.type, quorum.qc->quorumHash, id, msgHash, uint16_t(memberIdx), {});
         uint256 signHash = sigShare.buildSignHash().Get();
 
         // TODO: This one should be SIGN by QUORUM key, not by OPERATOR key
@@ -1665,23 +1665,23 @@ std::optional<CSigShare> CSigSharesManager::CreateSigShare(const CQuorumCPtr& qu
                  "CSigSharesManager::%s -- created sigShare. signHash=%s, id=%s, msgHash=%s, llmqType=%d, quorum=%s, "
                  "time=%s\n",
                  __func__, signHash.ToString(), sigShare.getId().ToString(), sigShare.getMsgHash().ToString(),
-                 ToUnderlying(quorum->params.type), quorum->qc->quorumHash.ToString(), t.count());
+                 ToUnderlying(quorum.params.type), quorum.qc->quorumHash.ToString(), t.count());
 
         return sigShare;
     }
-    const CBLSSecretKey& skShare = quorum->GetSkShare();
+    const CBLSSecretKey& skShare = quorum.GetSkShare();
     if (!skShare.IsValid()) {
-        LogPrint(BCLog::LLMQ_SIGS, "CSigSharesManager::%s -- we don't have our skShare for quorum %s\n", __func__, quorum->qc->quorumHash.ToString());
+        LogPrint(BCLog::LLMQ_SIGS, "CSigSharesManager::%s -- we don't have our skShare for quorum %s\n", __func__, quorum.qc->quorumHash.ToString());
         return std::nullopt;
     }
 
-    int memberIdx = quorum->GetMemberIndex(activeMasterNodeProTxHash);
+    int memberIdx = quorum.GetMemberIndex(activeMasterNodeProTxHash);
     if (memberIdx == -1) {
         // this should really not happen (IsValidMember gave true)
         return std::nullopt;
     }
 
-    CSigShare sigShare(quorum->params.type, quorum->qc->quorumHash, id, msgHash, uint16_t(memberIdx), {});
+    CSigShare sigShare(quorum.params.type, quorum.qc->quorumHash, id, msgHash, uint16_t(memberIdx), {});
     uint256 signHash = sigShare.buildSignHash().Get();
 
     sigShare.sigShare.Set(skShare.Sign(signHash, bls::bls_legacy_scheme.load()), bls::bls_legacy_scheme.load());
@@ -1694,20 +1694,20 @@ std::optional<CSigShare> CSigSharesManager::CreateSigShare(const CQuorumCPtr& qu
     sigShare.UpdateKey();
 
     LogPrint(BCLog::LLMQ_SIGS, "CSigSharesManager::%s -- created sigShare. signHash=%s, id=%s, msgHash=%s, llmqType=%d, quorum=%s, time=%s\n", __func__,
-              signHash.ToString(), sigShare.getId().ToString(), sigShare.getMsgHash().ToString(), ToUnderlying(quorum->params.type), quorum->qc->quorumHash.ToString(), t.count());
+              signHash.ToString(), sigShare.getId().ToString(), sigShare.getMsgHash().ToString(), ToUnderlying(quorum.params.type), quorum.qc->quorumHash.ToString(), t.count());
 
     return sigShare;
 }
 
 // causes all known sigShares to be re-announced
-void CSigSharesManager::ForceReAnnouncement(const CQuorumCPtr& quorum, Consensus::LLMQType llmqType, const uint256& id, const uint256& msgHash)
+void CSigSharesManager::ForceReAnnouncement(const CQuorum& quorum, Consensus::LLMQType llmqType, const uint256& id, const uint256& msgHash)
 {
     if (IsAllMembersConnectedEnabled(llmqType, m_sporkman)) {
         return;
     }
 
     LOCK(cs);
-    auto signHash = SignHash(llmqType, quorum->qc->quorumHash, id, msgHash).Get();
+    auto signHash = SignHash(llmqType, quorum.qc->quorumHash, id, msgHash).Get();
     if (const auto *const sigs = sigShares.GetAllForSignHash(signHash)) {
         for (const auto& [quorumMemberIndex, _] : *sigs) {
             // re-announce every sigshare to every node
diff --git a/src/llmq/signing_shares.h b/src/llmq/signing_shares.h
index b49a25c12c5d..9d3084002667 100644
--- a/src/llmq/signing_shares.h
+++ b/src/llmq/signing_shares.h
@@ -433,12 +433,12 @@ class CSigSharesManager : public CRecoveredSigsListener
 
     void AsyncSign(CQuorumCPtr quorum, const uint256& id, const uint256& msgHash)
         EXCLUSIVE_LOCKS_REQUIRED(!cs_pendingSigns);
-    std::optional<CSigShare> CreateSigShare(const CQuorumCPtr& quorum, const uint256& id, const uint256& msgHash) const;
-    void ForceReAnnouncement(const CQuorumCPtr& quorum, Consensus::LLMQType llmqType, const uint256& id, const uint256& msgHash);
+    std::optional<CSigShare> CreateSigShare(const CQuorum& quorum, const uint256& id, const uint256& msgHash) const;
+    void ForceReAnnouncement(const CQuorum& quorum, Consensus::LLMQType llmqType, const uint256& id, const uint256& msgHash);
 
     [[nodiscard]] MessageProcessingResult HandleNewRecoveredSig(const CRecoveredSig& recoveredSig) override;
 
-    static CDeterministicMNCPtr SelectMemberForRecovery(const CQuorumCPtr& quorum, const uint256& id, int attempt);
+    static CDeterministicMNCPtr SelectMemberForRecovery(const CQuorum& quorum, const uint256& id, int attempt);
 
     bool AsyncSignIfMember(Consensus::LLMQType llmqType, CSigningManager& sigman, const uint256& id,
                            const uint256& msgHash, const uint256& quorumHash = uint256(), bool allowReSign = false,
@@ -469,7 +469,7 @@ class CSigSharesManager : public CRecoveredSigsListener
         const std::unordered_map<std::pair<Consensus::LLMQType, uint256>, CQuorumCPtr, StaticSaltedHasher>& quorums);
 
     void ProcessSigShare(const CSigShare& sigShare, const CQuorumCPtr& quorum);
-    void TryRecoverSig(const CQuorumCPtr& quorum, const uint256& id, const uint256& msgHash);
+    void TryRecoverSig(const CQuorum& quorum, const uint256& id, const uint256& msgHash);
 
     bool GetSessionInfoByRecvId(NodeId nodeId, uint32_t sessionId, CSigSharesNodeState::SessionInfo& retInfo);
     static CSigShare RebuildSigShare(const CSigSharesNodeState::SessionInfo& session, const std::pair<uint16_t, CBLSLazySignature>& in);
diff --git a/src/rpc/quorums.cpp b/src/rpc/quorums.cpp
index 9cc576ba9ecd..fb837dd0f1c3 100644
--- a/src/rpc/quorums.cpp
+++ b/src/rpc/quorums.cpp
@@ -180,20 +180,20 @@ static RPCHelpMan quorum_list_extended()
 }
 
 static UniValue BuildQuorumInfo(const llmq::CQuorumBlockProcessor& quorum_block_processor,
-                                const llmq::CQuorumCPtr& quorum, bool includeMembers, bool includeSkShare)
+                                const llmq::CQuorum& quorum, bool includeMembers, bool includeSkShare)
 {
     UniValue ret(UniValue::VOBJ);
 
-    ret.pushKV("height", quorum->m_quorum_base_block_index->nHeight);
-    ret.pushKV("type", std::string(quorum->params.name));
-    ret.pushKV("quorumHash", quorum->qc->quorumHash.ToString());
-    ret.pushKV("quorumIndex", quorum->qc->quorumIndex);
-    ret.pushKV("minedBlock", quorum->minedBlockHash.ToString());
+    ret.pushKV("height", quorum.m_quorum_base_block_index->nHeight);
+    ret.pushKV("type", std::string(quorum.params.name));
+    ret.pushKV("quorumHash", quorum.qc->quorumHash.ToString());
+    ret.pushKV("quorumIndex", quorum.qc->quorumIndex);
+    ret.pushKV("minedBlock", quorum.minedBlockHash.ToString());
 
-    if (quorum->params.useRotation) {
-        auto previousActiveCommitment = quorum_block_processor.GetLastMinedCommitmentsByQuorumIndexUntilBlock(quorum->params.type, quorum->m_quorum_base_block_index, quorum->qc->quorumIndex, 0);
+    if (quorum.params.useRotation) {
+        auto previousActiveCommitment = quorum_block_processor.GetLastMinedCommitmentsByQuorumIndexUntilBlock(quorum.params.type, quorum.m_quorum_base_block_index, quorum.qc->quorumIndex, 0);
         if (previousActiveCommitment.has_value()) {
-            int previousConsecutiveDKGFailures = (quorum->m_quorum_base_block_index->nHeight - previousActiveCommitment.value()->nHeight) /  quorum->params.dkgInterval - 1;
+            int previousConsecutiveDKGFailures = (quorum.m_quorum_base_block_index->nHeight - previousActiveCommitment.value()->nHeight) /  quorum.params.dkgInterval - 1;
             ret.pushKV("previousConsecutiveDKGFailures", previousConsecutiveDKGFailures);
         }
         else {
@@ -203,19 +203,19 @@ static UniValue BuildQuorumInfo(const llmq::CQuorumBlockProcessor& quorum_block_
 
     if (includeMembers) {
         UniValue membersArr(UniValue::VARR);
-        for (size_t i = 0; i < quorum->members.size(); i++) {
-            const auto& dmn = quorum->members[i];
+        for (size_t i = 0; i < quorum.members.size(); i++) {
+            const auto& dmn = quorum.members[i];
             UniValue mo(UniValue::VOBJ);
             mo.pushKV("proTxHash", dmn->proTxHash.ToString());
             mo.pushKV("service", dmn->pdmnState->netInfo->GetPrimary().ToStringAddrPort());
             mo.pushKV("addresses", GetNetInfoWithLegacyFields(*dmn->pdmnState, dmn->nType));
             mo.pushKV("pubKeyOperator", dmn->pdmnState->pubKeyOperator.ToString());
-            mo.pushKV("valid", static_cast<bool>(quorum->qc->validMembers[i]));
-            if (quorum->qc->validMembers[i]) {
-                if (quorum->params.is_single_member()) {
+            mo.pushKV("valid", static_cast<bool>(quorum.qc->validMembers[i]));
+            if (quorum.qc->validMembers[i]) {
+                if (quorum.params.is_single_member()) {
                     mo.pushKV("pubKeyShare", dmn->pdmnState->pubKeyOperator.ToString());
                 } else {
-                    CBLSPublicKey pubKey = quorum->GetPubKeyShare(i);
+                    CBLSPublicKey pubKey = quorum.GetPubKeyShare(i);
                     if (pubKey.IsValid()) {
                         mo.pushKV("pubKeyShare", pubKey.ToString());
                     }
@@ -226,8 +226,8 @@ static UniValue BuildQuorumInfo(const llmq::CQuorumBlockProcessor& quorum_block_
 
         ret.pushKV("members", membersArr);
     }
-    ret.pushKV("quorumPublicKey", quorum->qc->quorumPublicKey.ToString());
-    const CBLSSecretKey& skShare = quorum->GetSkShare();
+    ret.pushKV("quorumPublicKey", quorum.qc->quorumPublicKey.ToString());
+    const CBLSSecretKey& skShare = quorum.GetSkShare();
     if (includeSkShare && skShare.IsValid()) {
         ret.pushKV("secretKeyShare", skShare.ToString());
     }
@@ -271,7 +271,7 @@ static RPCHelpMan quorum_info()
         throw JSONRPCError(RPC_INVALID_PARAMETER, "quorum not found");
     }
 
-    return BuildQuorumInfo(*llmq_ctx.quorum_block_processor, quorum, true, includeSkShare);
+    return BuildQuorumInfo(*llmq_ctx.quorum_block_processor, *quorum, true, includeSkShare);
 },
     };
 }
@@ -467,7 +467,7 @@ static RPCHelpMan quorum_memberof()
         auto quorums = llmq_ctx.qman->ScanQuorums(llmq_params_opt->type, count);
         for (auto& quorum : quorums) {
             if (quorum->IsMember(dmn->proTxHash)) {
-                auto json = BuildQuorumInfo(*llmq_ctx.quorum_block_processor, quorum, false, false);
+                auto json = BuildQuorumInfo(*llmq_ctx.quorum_block_processor, *quorum, false, false);
                 json.pushKV("isValidMember", quorum->IsValidMember(dmn->proTxHash));
                 json.pushKV("memberIndex", quorum->GetMemberIndex(dmn->proTxHash));
                 result.push_back(json);
@@ -521,7 +521,7 @@ static UniValue quorum_sign_helper(const JSONRPCRequest& request, Consensus::LLM
             throw JSONRPCError(RPC_INVALID_PARAMETER, "quorum not found");
         }
 
-        auto sigShare = CHECK_NONFATAL(node.active_ctx)->shareman->CreateSigShare(pQuorum, id, msgHash);
+        auto sigShare = CHECK_NONFATAL(node.active_ctx)->shareman->CreateSigShare(*pQuorum, id, msgHash);
 
         if (!sigShare.has_value() || !sigShare->sigShare.Get().IsValid()) {
             throw JSONRPCError(RPC_INVALID_PARAMETER, "failed to create sigShare");
@@ -815,7 +815,7 @@ static RPCHelpMan quorum_selectquorum()
 
     UniValue recoveryMembers(UniValue::VARR);
     for (int i = 0; i < quorum->params.recoveryMembers; ++i) {
-        auto dmn = llmq::CSigSharesManager::SelectMemberForRecovery(quorum, id, i);
+        auto dmn = llmq::CSigSharesManager::SelectMemberForRecovery(*quorum, id, i);
         recoveryMembers.push_back(dmn->proTxHash.ToString());
     }
     ret.pushKV("recoveryMembers", recoveryMembers);

From 6b4973046a768b2ed29d59795b8cf93be90d8c46 Mon Sep 17 00:00:00 2001
From: pasta <pasta@dashboost.org>
Date: Tue, 21 Oct 2025 09:06:35 -0500
Subject: [PATCH 255/656] refactor: use non-const reference for pQuorum in
 quorum iteration loop to allow moves

---
 src/llmq/quorums.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/llmq/quorums.cpp b/src/llmq/quorums.cpp
index fd35d69299e5..cf8d01db4ac9 100644
--- a/src/llmq/quorums.cpp
+++ b/src/llmq/quorums.cpp
@@ -257,7 +257,7 @@ void CQuorumManager::TriggerQuorumDataRecoveryThreads(CConnman& connman, const C
     LogPrint(BCLog::LLMQ, "CQuorumManager::%s -- Process block %s\n", __func__, pIndex->GetBlockHash().ToString());
 
     for (const auto& params : Params().GetConsensus().llmqs) {
-        const auto vecQuorums = ScanQuorums(params.type, pIndex, params.keepOldConnections);
+        auto vecQuorums = ScanQuorums(params.type, pIndex, params.keepOldConnections);
 
         // First check if we are member of any quorum of this type
         const uint256 proTxHash = m_mn_activeman != nullptr ? m_mn_activeman->GetProTxHash() : uint256();
@@ -266,7 +266,7 @@ void CQuorumManager::TriggerQuorumDataRecoveryThreads(CConnman& connman, const C
             return pQuorum->IsValidMember(proTxHash);
         });
 
-        for (const auto& pQuorum : vecQuorums) {
+        for (auto& pQuorum : vecQuorums) {
             // If there is already a thread running for this specific quorum skip it
             if (pQuorum->fQuorumDataRecoveryThreadRunning) {
                 continue;

From f4d8b03c1b17507143cb18899f561a7973c656c1 Mon Sep 17 00:00:00 2001
From: Konstantin Akimov <knstqq@gmail.com>
Date: Sat, 25 Oct 2025 03:48:29 +0700
Subject: [PATCH 256/656] fix: extra fixes for rpc helps as follow-up for
 dash#6886

---
 src/rpc/quorums.cpp | 24 ++++++++++++++++++++++--
 1 file changed, 22 insertions(+), 2 deletions(-)

diff --git a/src/rpc/quorums.cpp b/src/rpc/quorums.cpp
index be9eb66a3d7f..f80a04e8d30c 100644
--- a/src/rpc/quorums.cpp
+++ b/src/rpc/quorums.cpp
@@ -246,7 +246,27 @@ static RPCHelpMan quorum_info()
         RPCResult{
             RPCResult::Type::OBJ, "", "",
             {
-                {RPCResult::Type::ELISION, "", ""}
+                {RPCResult::Type::NUM, "height", "Quorum Height"},
+                {RPCResult::Type::STR, "type", "Quorum type"},
+                {RPCResult::Type::STR_HEX, "quorumHash", "Quorum hash"},
+                {RPCResult::Type::NUM, "quorumIndex", "Quorum index (applicable only to rotated quorums)."},
+                {RPCResult::Type::STR_HEX, "minedBlock", "Blockhash where the commitment was mined."},
+                {RPCResult::Type::NUM, "previousConsecutiveDKGFailures", "Number of previous consecutive DKG failures."},
+                {RPCResult::Type::ARR, "members", "Members of quorum",
+                    {
+                        {RPCResult::Type::OBJ, "", "",
+                        {
+                            {RPCResult::Type::STR_HEX, "proTxHash", "ProTx of collaterial"},
+                            {RPCResult::Type::NUM, "service", "Address of node. Legacy, will be deprecated in further versions. See `addresses` instead."},
+                            {RPCResult::Type::ARR, "addresses", "Addresses of node",
+                                // TODO - expand it when extended addresses are fully implemented
+                                {{RPCResult::Type::ELISION, "", ""}},
+                            },
+                            {RPCResult::Type::STR_HEX, "pubKeyOperator", "The operator BLS public key"},
+                            {RPCResult::Type::BOOL, "valid", "True is member valid for this DKG"}
+                        }},
+                    },
+                },
             },
         },
         RPCExamples{""},
@@ -427,7 +447,7 @@ static RPCHelpMan quorum_memberof()
             {
                 {RPCResult::Type::OBJ, "", "Quorum Info",
                 {
-                    {RPCResult::Type::ELISION, "", "See for details help for `quorum info`"},
+                    {RPCResult::Type::ELISION, "", "See `help quorum info` for details"},
                     {RPCResult::Type::BOOL, "isValidMember", ""},
                     {RPCResult::Type::NUM, "memberIndex", ""},
                 }},

From 5fe76efd4e6fbbb8ddda686b4e908e689a3b79c9 Mon Sep 17 00:00:00 2001
From: Konstantin Akimov <knstqq@gmail.com>
Date: Sun, 26 Oct 2025 01:46:54 +0700
Subject: [PATCH 257/656] fix: typo mineable/minable commitments in rpc doc

---
 src/rpc/quorums.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/rpc/quorums.cpp b/src/rpc/quorums.cpp
index f80a04e8d30c..e17c91aac931 100644
--- a/src/rpc/quorums.cpp
+++ b/src/rpc/quorums.cpp
@@ -329,7 +329,7 @@ static RPCHelpMan quorum_dkgstatus()
                     // TODO: list fields of output for RPC help instead ELISION
                     {{RPCResult::Type::ELISION, "", ""}},
                 },
-                {RPCResult::Type::ARR, "mineableCommitments", "",
+                {RPCResult::Type::ARR, "minableCommitments", "",
                     // TODO: list fields of output for RPC help instead ELISION
                     {{RPCResult::Type::ELISION, "", ""}},
                 },

From 35ea486f8bef9880f8ccb41a089de2317a4bbafe Mon Sep 17 00:00:00 2001
From: Konstantin Akimov <knstqq@gmail.com>
Date: Sun, 26 Oct 2025 03:11:09 +0700
Subject: [PATCH 258/656] fix: typo NUM/STR for "service" in rpc help

Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>
---
 src/rpc/quorums.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/rpc/quorums.cpp b/src/rpc/quorums.cpp
index e17c91aac931..99b2258162e9 100644
--- a/src/rpc/quorums.cpp
+++ b/src/rpc/quorums.cpp
@@ -257,7 +257,7 @@ static RPCHelpMan quorum_info()
                         {RPCResult::Type::OBJ, "", "",
                         {
                             {RPCResult::Type::STR_HEX, "proTxHash", "ProTx of collaterial"},
-                            {RPCResult::Type::NUM, "service", "Address of node. Legacy, will be deprecated in further versions. See `addresses` instead."},
+                            {RPCResult::Type::STR, "service", "Address of node. Legacy, will be deprecated in further versions. See `addresses` instead."},
                             {RPCResult::Type::ARR, "addresses", "Addresses of node",
                                 // TODO - expand it when extended addresses are fully implemented
                                 {{RPCResult::Type::ELISION, "", ""}},

From f56ce76da391a6b35d7eba129ad974206921932e Mon Sep 17 00:00:00 2001
From: UdjinM6 <UdjinM6@users.noreply.github.com>
Date: Sun, 26 Oct 2025 15:34:19 +0300
Subject: [PATCH 259/656] test: wait for new trigger for up to 1s while mining
 in maturity window

---
 test/functional/feature_governance.py | 21 ++++++++++++++++-----
 1 file changed, 16 insertions(+), 5 deletions(-)

diff --git a/test/functional/feature_governance.py b/test/functional/feature_governance.py
index 82025d06d6cd..4169b9a9edc2 100755
--- a/test/functional/feature_governance.py
+++ b/test/functional/feature_governance.py
@@ -349,12 +349,19 @@ def sync_gov(node):
             assert_equal(self.nodes[0].gobject("list", "valid", "triggers")[isolated_trigger_hash]['NoCount'], self.mn_count - 1)
 
         block_count = self.nodes[0].getblockcount()
-        n = sb_cycle - block_count % sb_cycle
+        n = sb_immaturity_window - block_count % sb_cycle
+        assert n > 0
 
-        self.log.info("Move remaining n blocks until the next Superblock")
-        for _ in range(n - 1):
+        self.log.info("Move remaining n blocks until the next maturity window")
+        for _ in range(n):
+            self.bump_mocktime(1)
+            self.generate(self.nodes[0], 1, sync_fun=self.sync_blocks())
+
+        self.log.info("Move inside maturity window until the next Superblock")
+        for _ in range(sb_maturity_window - 1):
             self.bump_mocktime(1)
             self.generate(self.nodes[0], 1, sync_fun=self.sync_blocks())
+            self.wait_until(lambda: have_trigger_for_height(self.nodes, 180), timeout=1, do_assert=False)
         self.log.info("Wait for new trigger and votes")
         self.wait_until(lambda: have_trigger_for_height(self.nodes, 180))
         self.log.info("Mine superblock")
@@ -365,11 +372,15 @@ def sync_gov(node):
 
         self.log.info("Mine and check a couple more superblocks")
         for i in range(2):
-            for _ in range(sb_cycle - 1):
+            sb_block_height = 180 + (i + 1) * sb_cycle
+            for _ in range(sb_immaturity_window):
                 self.bump_mocktime(1)
                 self.generate(self.nodes[0], 1, sync_fun=self.sync_blocks())
+            for _ in range(sb_maturity_window - 1):
+                self.bump_mocktime(1)
+                self.generate(self.nodes[0], 1, sync_fun=self.sync_blocks())
+                self.wait_until(lambda: have_trigger_for_height(self.nodes, sb_block_height), timeout=1, do_assert=False)
             # Wait for new trigger and votes
-            sb_block_height = 180 + (i + 1) * sb_cycle
             self.wait_until(lambda: have_trigger_for_height(self.nodes, sb_block_height))
             # Mine superblock
             self.bump_mocktime(1)

From eb3be09fd4e37a144229a428abc607afc5a88bcf Mon Sep 17 00:00:00 2001
From: UdjinM6 <UdjinM6@users.noreply.github.com>
Date: Sun, 26 Oct 2025 18:08:09 +0300
Subject: [PATCH 260/656] refactor: code style/log text adjustments

---
 src/coinjoin/client.cpp | 13 ++++++-------
 src/masternode/meta.cpp |  4 ++--
 src/masternode/meta.h   |  2 +-
 3 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/src/coinjoin/client.cpp b/src/coinjoin/client.cpp
index 86138670eede..b0b9cd34dc1e 100644
--- a/src/coinjoin/client.cpp
+++ b/src/coinjoin/client.cpp
@@ -966,15 +966,14 @@ bool CCoinJoinClientManager::DoAutomaticDenominating(ChainstateManager& chainman
     // If we've used 90% of the Masternode list then drop the oldest first ~30%
     int nThreshold_high = nMnCountEnabled * 0.9;
     int nThreshold_low = nThreshold_high * 0.7;
-    size_t nUsedMasternodes{m_mn_metaman.GetUsedMasternodesCount()};
+    size_t used_count{m_mn_metaman.GetUsedMasternodesCount()};
 
-    WalletCJLogPrint(m_wallet, "Checking nUsedMasternodes: %d, threshold: %d\n", (int)nUsedMasternodes, nThreshold_high);
+    WalletCJLogPrint(m_wallet, "Checking threshold - used: %d, threshold: %d\n", (int)used_count, nThreshold_high);
 
-    if ((int)nUsedMasternodes > nThreshold_high) {
-        size_t nToRemove{nUsedMasternodes - nThreshold_low};
-        m_mn_metaman.RemoveUsedMasternodes(nToRemove);
-        WalletCJLogPrint(m_wallet, "  new nUsedMasternodes: %d, threshold: %d\n",
-                         (int)m_mn_metaman.GetUsedMasternodesCount(), nThreshold_high);
+    if ((int)used_count > nThreshold_high) {
+        m_mn_metaman.RemoveUsedMasternodes(used_count - nThreshold_low);
+        WalletCJLogPrint(m_wallet, "  new used: %d, threshold: %d\n", (int)m_mn_metaman.GetUsedMasternodesCount(),
+                         nThreshold_high);
     }
 
     bool fResult = true;
diff --git a/src/masternode/meta.cpp b/src/masternode/meta.cpp
index 4cdee0ab08e5..3940b08700ce 100644
--- a/src/masternode/meta.cpp
+++ b/src/masternode/meta.cpp
@@ -162,11 +162,11 @@ void CMasternodeMetaMan::AddUsedMasternode(const uint256& proTxHash)
     }
 }
 
-void CMasternodeMetaMan::RemoveUsedMasternodes(size_t nCount)
+void CMasternodeMetaMan::RemoveUsedMasternodes(size_t count)
 {
     LOCK(cs);
     size_t removed = 0;
-    while (removed < nCount && !m_used_masternodes.empty()) {
+    while (removed < count && !m_used_masternodes.empty()) {
         // Remove from both the set and the deque
         m_used_masternodes_set.erase(m_used_masternodes.front());
         m_used_masternodes.pop_front();
diff --git a/src/masternode/meta.h b/src/masternode/meta.h
index e9cdf931e38e..8b8f468c4841 100644
--- a/src/masternode/meta.h
+++ b/src/masternode/meta.h
@@ -276,7 +276,7 @@ class CMasternodeMetaMan : public MasternodeMetaStore
 
     // CoinJoin masternode tracking
     void AddUsedMasternode(const uint256& proTxHash) EXCLUSIVE_LOCKS_REQUIRED(!cs);
-    void RemoveUsedMasternodes(size_t nCount) EXCLUSIVE_LOCKS_REQUIRED(!cs);
+    void RemoveUsedMasternodes(size_t count) EXCLUSIVE_LOCKS_REQUIRED(!cs);
     size_t GetUsedMasternodesCount() const EXCLUSIVE_LOCKS_REQUIRED(!cs);
     bool IsUsedMasternode(const uint256& proTxHash) const EXCLUSIVE_LOCKS_REQUIRED(!cs);
 };

From 43fd60f86a3fb7a0cfc209eb8bd40eafda6f3a13 Mon Sep 17 00:00:00 2001
From: pasta <pasta@dashboost.org>
Date: Sun, 8 Dec 2024 17:30:46 -0600
Subject: [PATCH 261/656] perf: make m_peer_mutex a SharedMutex

---
 src/net_processing.cpp | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/net_processing.cpp b/src/net_processing.cpp
index c93252eb0a84..4804d513e661 100644
--- a/src/net_processing.cpp
+++ b/src/net_processing.cpp
@@ -814,7 +814,7 @@ class PeerManagerImpl final : public PeerManager
 
     /** Protects m_peer_map. This mutex must not be locked while holding a lock
      *  on any of the mutexes inside a Peer object. */
-    mutable Mutex m_peer_mutex;
+    mutable SharedMutex m_peer_mutex;
     /**
      * Map of all Peer objects, keyed by peer id. This map is protected
      * by the m_peer_mutex. Once a shared pointer reference is
@@ -1723,7 +1723,7 @@ void PeerManagerImpl::FinalizeNode(const CNode& node) {
 
 PeerRef PeerManagerImpl::GetPeerRef(NodeId id) const
 {
-    LOCK(m_peer_mutex);
+    READ_LOCK(m_peer_mutex);
     auto it = m_peer_map.find(id);
     return it != m_peer_map.end() ? it->second : nullptr;
 }
@@ -2292,7 +2292,7 @@ bool PeerManagerImpl::AlreadyHaveBlock(const uint256& block_hash)
 
 void PeerManagerImpl::SendPings()
 {
-    LOCK(m_peer_mutex);
+    READ_LOCK(m_peer_mutex);
     for(auto& it : m_peer_map) it.second->m_ping_queued = true;
 }
 
@@ -2302,7 +2302,7 @@ void PeerManagerImpl::AskPeersForTransaction(const uint256& txid)
     peersToAsk.reserve(4);
 
     {
-        LOCK(m_peer_mutex);
+        READ_LOCK(m_peer_mutex);
         // TODO consider prioritizing MNs again, once that flag is moved into Peer
         for (const auto& [_, peer] : m_peer_map) {
             if (peersToAsk.size() >= 4) {
@@ -2358,7 +2358,7 @@ void PeerManagerImpl::RelayInv(const CInv& inv, const int minProtoVersion)
 
 void PeerManagerImpl::RelayInv(const CInv& inv)
 {
-    LOCK(m_peer_mutex);
+    READ_LOCK(m_peer_mutex);
     for (const auto& [_, peer] : m_peer_map) {
         if (!peer->GetInvRelay()) continue;
         PushInv(*peer, inv);
@@ -2370,7 +2370,7 @@ void PeerManagerImpl::RelayDSQ(const CCoinJoinQueue& queue)
     CInv inv{MSG_DSQ, queue.GetHash()};
     std::vector<NodeId> nodes_send_all;
     {
-        LOCK(m_peer_mutex);
+        READ_LOCK(m_peer_mutex);
         for (const auto& [nodeid, peer] : m_peer_map) {
             switch (peer->m_wants_dsq) {
             case Peer::WantsDSQ::NONE:
@@ -2453,7 +2453,7 @@ void PeerManagerImpl::RelayTransaction(const uint256& txid)
 void PeerManagerImpl::_RelayTransaction(const uint256& txid)
 {
     const CInv inv{m_dstxman.GetDSTX(txid) ? MSG_DSTX : MSG_TX, txid};
-    LOCK(m_peer_mutex);
+    READ_LOCK(m_peer_mutex);
     for(auto& it : m_peer_map) {
         Peer& peer = *it.second;
         auto tx_relay = peer.GetTxRelay();
@@ -2466,7 +2466,7 @@ void PeerManagerImpl::_RelayTransaction(const uint256& txid)
 void PeerManagerImpl::RelayRecoveredSig(const uint256& sigHash)
 {
     const CInv inv{MSG_QUORUM_RECOVERED_SIG, sigHash};
-    LOCK(m_peer_mutex);
+    READ_LOCK(m_peer_mutex);
     for (const auto& [_, peer] : m_peer_map) {
         if (peer->m_wants_recsigs) {
             PushInv(*peer, inv);
@@ -2504,7 +2504,7 @@ void PeerManagerImpl::RelayAddress(NodeId originator,
     std::array<std::pair<uint64_t, Peer*>, 2> best{{{0, nullptr}, {0, nullptr}}};
     assert(nRelayNodes <= best.size());
 
-    LOCK(m_peer_mutex);
+    READ_LOCK(m_peer_mutex);
 
     for (auto& [id, peer] : m_peer_map) {
         if (peer->m_addr_relay_enabled && id != originator && IsAddrCompatible(*peer, addr)) {

From 5759d18c6b5a8e7d9c270925d9610232f89c9fd6 Mon Sep 17 00:00:00 2001
From: Andrew Chow <github@achow101.com>
Date: Tue, 20 Sep 2022 11:54:17 -0400
Subject: [PATCH 262/656] Merge bitcoin/bitcoin#26116: rpc: Allow importmulti
 watchonly imports with locked wallet
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

2c03465dfa18ee615f76b6e507a65ef451ce1b7c test: Test watchonly imports with passphrase-locked wallet (Aurèle Oulès)
1fcf9e6e81ea8299fad958b32777c36b696090ac rpc: Allow importmulti watchonly imports with locked wallet (Aurèle Oulès)

Pull request description:

  Allows watch-only imports on locked wallets with `importmulti`.
  Also adds a test.

  Fixes #17867.

ACKs for top commit:
  achow101:
    ACK 2c03465dfa18ee615f76b6e507a65ef451ce1b7c
  kristapsk:
    re-ACK 2c03465dfa18ee615f76b6e507a65ef451ce1b7c
  theStack:
    re-ACK 2c03465dfa18ee615f76b6e507a65ef451ce1b7c

Tree-SHA512: 9978d6e59a230c0d160efd312c671cf59458797387d6622b6bf5c9e0681c1fcfebedb3d834fa9314dc5a1eda97e3295696352eacbeab9b43a46b942990087035
---
 src/wallet/rpc/backup.cpp             | 13 ++++++++++++-
 test/functional/wallet_importmulti.py | 19 +++++++++++++++++++
 2 files changed, 31 insertions(+), 1 deletion(-)

diff --git a/src/wallet/rpc/backup.cpp b/src/wallet/rpc/backup.cpp
index c4842f18ae38..534f11c9bae1 100644
--- a/src/wallet/rpc/backup.cpp
+++ b/src/wallet/rpc/backup.cpp
@@ -1582,7 +1582,18 @@ RPCHelpMan importmulti()
     UniValue response(UniValue::VARR);
     {
         LOCK(pwallet->cs_wallet);
-        EnsureWalletIsUnlocked(*pwallet);
+
+        // Check all requests are watchonly
+        bool is_watchonly{true};
+        for (size_t i = 0; i < requests.size(); ++i) {
+            const UniValue& request = requests[i];
+            if (!request.exists("watchonly") || !request["watchonly"].get_bool()) {
+                is_watchonly = false;
+                break;
+            }
+        }
+        // Wallet does not need to be unlocked if all requests are watchonly
+        if (!is_watchonly) EnsureWalletIsUnlocked(wallet);
 
         // Verify all timestamps are present before importing any keys.
         CHECK_NONFATAL(pwallet->chain().findBlock(pwallet->GetLastBlockHash(), FoundBlock().time(nLowestTimestamp).mtpTime(now)));
diff --git a/test/functional/wallet_importmulti.py b/test/functional/wallet_importmulti.py
index 8883303305d4..d924a94ed342 100755
--- a/test/functional/wallet_importmulti.py
+++ b/test/functional/wallet_importmulti.py
@@ -708,6 +708,25 @@ def run_test(self):
             addr = wrpc.getnewaddress('')
             assert_equal(addr, addresses[i])
 
+        # Create wallet with passphrase
+        self.log.info('Test watchonly imports on a wallet with a passphrase, without unlocking')
+        self.nodes[1].createwallet(wallet_name='w1', blank=True, passphrase='pass')
+        wrpc = self.nodes[1].get_wallet_rpc('w1')
+        assert_raises_rpc_error(-13, "Please enter the wallet passphrase with walletpassphrase first.",
+                                wrpc.importmulti, [{
+                                    'desc': descsum_create('pkh(' + pub1 + ')'),
+                                    "timestamp": "now",
+                                }])
+
+        result = wrpc.importmulti(
+            [{
+                'desc': descsum_create('pkh(' + pub1 + ')'),
+                "timestamp": "now",
+                "watchonly": True,
+            }]
+        )
+        assert result[0]['success']
+
 
 if __name__ == '__main__':
     ImportMultiTest().main()

From b7f886aceba0ad35b7b285e4b1b3ba93fe25d8f5 Mon Sep 17 00:00:00 2001
From: pasta <pasta@dashboost.org>
Date: Sun, 26 Oct 2025 12:26:30 -0500
Subject: [PATCH 263/656] perf: optimize public key aggregation loop in
 bls_batchverifier.h

---
 src/bls/bls_batchverifier.h | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/bls/bls_batchverifier.h b/src/bls/bls_batchverifier.h
index b69ba0e5d553..a455b30d8d5f 100644
--- a/src/bls/bls_batchverifier.h
+++ b/src/bls/bls_batchverifier.h
@@ -143,8 +143,9 @@ class CBLSBatchVerifier
         pubKeys.reserve(messages.size());
         sigsToAggregate.reserve(messages.size());
 
+        std::vector<CBLSPublicKey> pubKeysToAggregate;
         for (const auto& [msgHash, vec_message_it] : byMessageHash) {
-            std::vector<CBLSPublicKey> pubKeysToAggregate;
+            pubKeysToAggregate.clear();
             pubKeysToAggregate.reserve(vec_message_it.size());
 
             for (const auto& msgIt : vec_message_it) {

From dfc97a93bfb620c7e28c0a301a0481347a31546d Mon Sep 17 00:00:00 2001
From: fanquake <fanquake@gmail.com>
Date: Tue, 4 Oct 2022 21:13:42 +0100
Subject: [PATCH 264/656] Merge bitcoin/bitcoin#26243: test: Remove unused
 fCheckpointsEnabled from miner_tests

fa9436e90859c31d9aa7bc0b7f223ab93ec14bdc test: Remove unused fCheckpointsEnabled from miner_tests (MacroFake)

Pull request description:

  The earliest checkpoint is at height 11111, so this can't possibly have any impact on this test.

ACKs for top commit:
  fanquake:
    ACK fa9436e90859c31d9aa7bc0b7f223ab93ec14bdc - given the low number of blocks, having the additional check in `ContextualCheckBlockHeader()` enabled should be a no-op, so disabling and re-enabling is dead code.

Tree-SHA512: 7d1b952c297c915e9588761f82f5006cf5186b7ff30e8a1c702302e0b44afe536bde9eda8acf2995825ae01d2ad9d2393ae2feefb29f15676aaf71881941579b
---
 src/test/miner_tests.cpp | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/src/test/miner_tests.cpp b/src/test/miner_tests.cpp
index b84a3a0c8131..25bd8a789689 100644
--- a/src/test/miner_tests.cpp
+++ b/src/test/miner_tests.cpp
@@ -565,8 +565,6 @@ BOOST_AUTO_TEST_CASE(CreateNewBlock_validity)
     CScript scriptPubKey = CScript() << ParseHex("04678afdb0fe5548271967f1a67130b7105cd6a828e03909a67962e0ea1f61deb649f6bc3f4cef38c4f35504e51ec112de5c384df7ba0b8d578a4c702b6bf11d5f") << OP_CHECKSIG;
     std::unique_ptr<CBlockTemplate> pblocktemplate, pemptyblocktemplate;
 
-    fCheckpointsEnabled = false;
-
     // Simple block creation, nothing special yet:
     BOOST_CHECK(pemptyblocktemplate = AssemblerForTest(chainparams).CreateNewBlock(scriptPubKey));
 
@@ -643,8 +641,6 @@ BOOST_AUTO_TEST_CASE(CreateNewBlock_validity)
     m_node.mempool->clear();
 
     TestPrioritisedMining(chainparams, scriptPubKey, txFirst);
-
-    fCheckpointsEnabled = true;
 }
 
 BOOST_AUTO_TEST_SUITE_END()

From 94b3905d6f4521f70b6df183a395026eec3465bc Mon Sep 17 00:00:00 2001
From: fanquake <fanquake@gmail.com>
Date: Fri, 4 Nov 2022 15:43:00 +0000
Subject: [PATCH 265/656] Merge bitcoin/bitcoin#26443: doc: mention BIP86 in
 doc/bips.md

303fb8ff459e67baf97c2ab0b6dd6fa25aff76e3 doc: mention BIP86 in doc/bips.md (Sebastian Falbesoner)

Pull request description:

ACKs for top commit:
  fanquake:
    ACK 303fb8ff459e67baf97c2ab0b6dd6fa25aff76e3

Tree-SHA512: f30de5be3c789d315d0118594671e9f6a5c7b6e9ec7b7f1c9428f582eeff13946c37ebae26910a2134091e284f30499fcc62923f873418d0ba46a0322af998ad
---
 doc/bips.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/doc/bips.md b/doc/bips.md
index fdd9afe17e77..b2db8e8637fb 100644
--- a/doc/bips.md
+++ b/doc/bips.md
@@ -29,6 +29,7 @@ Versions and PRs are relevant to Bitcoin's core if not mentioned other.
   and it is disabled by default at build time since **v0.19.0** ([PR #15584](https://github.com/bitcoin/bitcoin/pull/15584)).
   It has been removed as of **v0.20.0** ([PR 17165](https://github.com/bitcoin/bitcoin/pull/17165)).
 * [`BIP 84`](https://github.com/bitcoin/bips/blob/master/bip-0084.mediawiki): The experimental descriptor wallets introduced in **v0.21.0** by default use the Hierarchical Deterministic Wallet derivation proposed by BIP 84. ([PR #16528](https://github.com/bitcoin/bitcoin/pull/16528))
+* [`BIP 86`](https://github.com/bitcoin/bips/blob/master/bip-0086.mediawiki): Descriptor wallets by default use the Hierarchical Deterministic Wallet derivation proposed by BIP 86 since **v23.0** ([PR #22364](https://github.com/bitcoin/bitcoin/pull/22364)).
 * [`BIP 90`](https://github.com/bitcoin/bips/blob/master/bip-0090.mediawiki): Trigger mechanism for activation of BIPs 34, 65, and 66 has been simplified to block height checks since **v0.14.0** ([PR #8391](https://github.com/bitcoin/bitcoin/pull/8391)).
 * [`BIP 111`](https://github.com/bitcoin/bips/blob/master/bip-0111.mediawiki): `NODE_BLOOM` service bit added, and enforced for all peer versions as of **v0.13.0** ([PR #6579](https://github.com/bitcoin/bitcoin/pull/6579) and [PR #6641](https://github.com/bitcoin/bitcoin/pull/6641)).
 * [`BIP 112`](https://github.com/bitcoin/bips/blob/master/bip-0112.mediawiki): The CHECKSEQUENCEVERIFY opcode has been implemented since **v0.12.1** ([PR #7524](https://github.com/bitcoin/bitcoin/pull/7524)), and has been *buried* since **v0.19.0** ([PR #16060](https://github.com/bitcoin/bitcoin/pull/16060)).

From 12d52b2af5d2aad924907ead052e37d32197dd88 Mon Sep 17 00:00:00 2001
From: MarcoFalke <*~=`'#}+{/-|&$^_@721217.xyz>
Date: Mon, 5 Dec 2022 14:01:55 +0100
Subject: [PATCH 266/656] Merge bitcoin/bitcoin#24226: rpc: warn that nodes
 ignore requests for old stale blocks

f39d9269ebbcffe70d02674c67c4f53783b63005 rpc: warn that nodes ignore requests for old stale blocks (Sjors Provoost)

Pull request description:

  Adds warning to RPC help that `getblockfrompeer` is of little use for stale blocks that are more than a month old.

  This is an anti-fingerprinting measure. See `BlockRequestAllowed` in `net_processing`.

  It's been in Bitcoin Core since 2014, introduced in #2910 and later improved to not rely on checkpoints.
  Older and alternative clients might still serve these blocks, so not throwing an error.

  Allowing whitelisted nodes to fetch these blocks anyway might be nice.

ACKs for top commit:
  fjahr:
    Code review ACK f39d9269ebbcffe70d02674c67c4f53783b63005

Tree-SHA512: db88f9f7521289640c5e629c840dda1c2c3ab70d458e9e7136c60fbaeb02acfb36dc093502d83d4c098c331e22aab81bf8f4c4961d805e3bde0f8f3cfe68d968
---
 src/net_processing.cpp | 2 ++
 src/rpc/blockchain.cpp | 4 +++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/net_processing.cpp b/src/net_processing.cpp
index c93252eb0a84..961046126d9b 100644
--- a/src/net_processing.cpp
+++ b/src/net_processing.cpp
@@ -1933,6 +1933,8 @@ std::optional<std::string> PeerManagerImpl::FetchBlock(NodeId peer_id, const CBl
 
     LOCK(cs_main);
     // Mark block as in-flight unless it already is (for this peer).
+    // If the peer does not send us a block, vBlocksInFlight remains non-empty,
+    // causing us to timeout and disconnect.
     // If a block was already in-flight for a different peer, its BLOCKTXN
     // response will be dropped.
     if (!BlockRequested(peer_id, block_index)) return "Already requested from this peer";
diff --git a/src/rpc/blockchain.cpp b/src/rpc/blockchain.cpp
index 7387f553db98..e087224a9513 100644
--- a/src/rpc/blockchain.cpp
+++ b/src/rpc/blockchain.cpp
@@ -483,7 +483,9 @@ static RPCHelpMan getblockfrompeer()
         "getblockfrompeer",
         "Attempt to fetch block from a given peer.\n\n"
         "We must have the header for this block, e.g. using submitheader.\n"
-        "Subsequent calls for the same block and a new peer will cause the response from the previous peer to be ignored.\n\n"
+        "Subsequent calls for the same block and a new peer will cause the response from the previous peer to be ignored.\n"
+        "Peers generally ignore requests for a stale block that they never fully verified, or one that is more than a month old.\n"
+        "When a peer does not respond with a block, we will disconnect.\n\n"
         "Returns an empty JSON object if the request was successfully scheduled.",
         {
             {"blockhash", RPCArg::Type::STR_HEX, RPCArg::Optional::NO, "The block hash to try to fetch"},

From 08707f8e66afce5d964d61c61541ad099ec73ab6 Mon Sep 17 00:00:00 2001
From: MarcoFalke <*~=`'#}+{/-|&$^_@721217.xyz>
Date: Wed, 7 Dec 2022 17:33:13 +0100
Subject: [PATCH 267/656] Merge bitcoin/bitcoin#26517: test: Changed
 small_txpuzzle_randfee to return the virtual size instead of the transaction
 hex for feerate calculation.

6fb102c9f361a7ba0a6aa0a9b41315f5e04559f7 test: Changed small_txpuzzle_randfee to return the virtual size instead of the transaction hex for feerate calculation. (Randall Naar)

Pull request description:

  The fee rates used in feature_fee_estimation.py are calculated using the raw transaction size instead of the virtual transaction size (which is used in 'CBlockPolicyEstimator::processBlockTx' and 'CBlockPolicyEstimator::processBlock'). This leads to inconsistencies as the fee rates used in check_raw_estimates are incorrect and can cause assertions to fail.

  refs #25179

ACKs for top commit:
  MarcoFalke:
    ACK 6fb102c9f361a7ba0a6aa0a9b41315f5e04559f7

Tree-SHA512: b2bca85fffa605aeb17574f050736d4556506d782dd7fd969e165e48e108fd95ef4c4e2abbae83cce05ca777a00f4459cabfa0932694fa8bb93ddfba09d84357
---
 test/functional/feature_fee_estimation.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/test/functional/feature_fee_estimation.py b/test/functional/feature_fee_estimation.py
index d8f3c535e32b..2ed81d39a180 100755
--- a/test/functional/feature_fee_estimation.py
+++ b/test/functional/feature_fee_estimation.py
@@ -61,7 +61,7 @@ def small_txpuzzle_randfee(
     unconflist.append({"txid": txid, "vout": 0, "value": total_in - amount - fee})
     unconflist.append({"txid": txid, "vout": 1, "value": amount})
 
-    return (tx.serialize().hex(), fee)
+    return (tx.get_vsize(), fee)
 
 
 def check_raw_estimates(node, fees_seen):
@@ -148,7 +148,7 @@ def transact_and_mine(self, numblocks, mining_node):
             random.shuffle(self.confutxo)
             for _ in range(random.randrange(100 - 50, 100 + 50)):
                 from_index = random.randint(1, 2)
-                (txhex, fee) = small_txpuzzle_randfee(
+                (tx_bytes, fee) = small_txpuzzle_randfee(
                     self.wallet,
                     self.nodes[from_index],
                     self.confutxo,
@@ -157,7 +157,7 @@ def transact_and_mine(self, numblocks, mining_node):
                     min_fee,
                     min_fee,
                 )
-                tx_kbytes = (len(txhex) // 2) / 1000.0
+                tx_kbytes = tx_bytes / 1000.0
                 self.fees_per_kb.append(float(fee) / tx_kbytes)
             self.sync_mempools(wait=0.1)
             mined = mining_node.getblock(self.generate(mining_node, 1)[0], True)["tx"]

From 84c07bffc74e3554806042dc1536c7e032405987 Mon Sep 17 00:00:00 2001
From: MarcoFalke <*~=`'#}+{/-|&$^_@721217.xyz>
Date: Thu, 29 Dec 2022 11:46:53 +0100
Subject: [PATCH 268/656] Merge bitcoin/bitcoin#26738: test: add coverage for
 unknown wallet flag in `setwalletflag`

3666a06730b2229e5af24124e6ef0403e4a6792e test: add coverage for unknown wallet flag in `setwalletflag` (brunoerg)

Pull request description:

  This PR adds test coverage for the following error:
  https://github.com/bitcoin/bitcoin/blob/6d40a1a7e7f09ff2c32e53237f968adf8300d028/src/wallet/rpc/wallet.cpp#L275-L277

  https://marcofalke.github.io/btc_cov/total.coverage/src/wallet/rpc/wallet.cpp.gcov.html

ACKs for top commit:
  aureleoules:
    ACK 3666a06730b2229e5af24124e6ef0403e4a6792e

Tree-SHA512: b6b2415442dfbc2404aed9720cc899995686007d6ba222dae461d064e4454d5af1326d3d527770b51b1005721ac42a49972f1eabf21108f656c30d3584790747
---
 test/functional/wallet_avoidreuse.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/test/functional/wallet_avoidreuse.py b/test/functional/wallet_avoidreuse.py
index 27affeedee5a..7b444e05b75c 100755
--- a/test/functional/wallet_avoidreuse.py
+++ b/test/functional/wallet_avoidreuse.py
@@ -115,6 +115,8 @@ def test_persistence(self):
         assert_raises_rpc_error(-8, "Wallet flag is already set to false", self.nodes[0].setwalletflag, 'avoid_reuse', False)
         assert_raises_rpc_error(-8, "Wallet flag is already set to true", self.nodes[1].setwalletflag, 'avoid_reuse', True)
 
+        assert_raises_rpc_error(-8, "Unknown wallet flag: abc", self.nodes[0].setwalletflag, 'abc', True)
+
         # Create a wallet with avoid reuse, and test that disabling it afterwards persists
         self.nodes[1].createwallet(wallet_name="avoid_reuse_persist", avoid_reuse=True)
         w = self.nodes[1].get_wallet_rpc("avoid_reuse_persist")

From 13fd3976095cca1f2bc31ec56a45f25c6c4b14af Mon Sep 17 00:00:00 2001
From: merge-script
 <90386131+bitcoin-core-merge-script@users.noreply.github.com>
Date: Thu, 16 Feb 2023 15:17:54 +0100
Subject: [PATCH 269/656] Merge bitcoin/bitcoin#26714: test: add coverage for
 unparsable `-maxuploadtarget`

7a83aa0982dbe1c5e89b904f636840cb2ef56357 test: add coverage for unparsable `-maxuploadtarget` (brunoerg)

Pull request description:

  This PR adds test coverage for the following error:
  https://github.com/bitcoin/bitcoin/blob/7386da7a0b08cd2df8ba88dae1fab9d36424b15c/src/init.cpp#L1096-L1099

Top commit has no ACKs.

Tree-SHA512: c115b2b4d2d0eb2316bf9fafd7e0046aa18c9650062779b3a82d6145d188765bff5317f4ca5f79607732fde6d83e1f67756ac20a12c98d060ee68d8acc20c76e
---
 test/functional/feature_maxuploadtarget.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/test/functional/feature_maxuploadtarget.py b/test/functional/feature_maxuploadtarget.py
index ded08f5121b8..6a2136d59637 100755
--- a/test/functional/feature_maxuploadtarget.py
+++ b/test/functional/feature_maxuploadtarget.py
@@ -171,6 +171,9 @@ def run_test(self):
         assert_equal(len(peer_info), 1)  # node is still connected
         assert_equal(peer_info[0]['permissions'], ['download'])
 
+        self.log.info("Test passing an unparsable value to -maxuploadtarget throws an error")
+        self.stop_node(0)
+        self.nodes[0].assert_start_raises_init_error(extra_args=["-maxuploadtarget=abc"], expected_msg="Error: Unable to parse -maxuploadtarget: 'abc'")
 
 if __name__ == '__main__':
     MaxUploadTest().main()

From 76016804c89d8d88c97919a973b3481c49c22c06 Mon Sep 17 00:00:00 2001
From: fanquake <fanquake@gmail.com>
Date: Sat, 4 Jun 2022 20:52:10 +0100
Subject: [PATCH 270/656] Merge bitcoin/bitcoin#24860: Miniscript integration
 follow-ups

f3a50c9dfe645c548713e44e0eaf26ea9917a379 miniscript: rename IsSane and IsSaneSubexpression to prevent misuse (Antoine Poinsot)
c5fe5163dc31db939c44129f2ff8283b290a9330 miniscript: nit: don't return after assert(false) (Antoine Poinsot)
7bbaca9d8d355a17348a8d01e3e2521c5de466b0 miniscript: explicit the threshold size computation in multi() (Antoine Poinsot)
8323e4249db50d46ae4f43c1d8a50666549ae938 miniscript: add an OpCode typedef for readability (Antoine Poinsot)
7a549c6c59e6babbae76af008433426c6fa38fe2 miniscript: mark nodes with duplicate keys as insane (Antoine Poinsot)
8c0f8bf7bc3750fad648af1a548517a272114bca fuzz: add a Miniscript target for string representation roundtripping (Antoine Poinsot)
be34d5077b2fede7404de7706362f5858c443525 fuzz: rename and improve the Miniscript Script roundtrip target (Antoine Poinsot)
7eb70f0ac0a54adabc566e2b93bbf6b2beb54a79 miniscript: tiny doc fixups (Antoine Poinsot)
5cea85f12cba5dcfe3a298eddfa711f582adffac miniscript: split ValidSatisfactions from IsSane (Antoine Poinsot)
a0f064dc1474a048e236bfff12f4def3aa11daf3 miniscript: introduce a CheckTimeLocksMix helper (Antoine Poinsot)
ed45ee3882e69266d550b56ff69388e071f0ad1b miniscript: use optional instead of bool/outarg (Antoine Poinsot)
1ab8d89fd1bdb3c0f2a506b4a10df6c23ba21c48 miniscript: make equality operator non-recursive (Antoine Poinsot)
5922c662c08a061b3b3d5ac34a31f9f9d4640d47 scripted-diff: miniscript: rename 'nodetype' variables to 'fragment' (Antoine Poinsot)
c5f65db0f03b52bc4525acae944173829290ce6f miniscript: remove a workaround for a GCC 4.8 bug (Antoine Poinsot)

Pull request description:

  The Miniscript repository and the Miniscript integration PR here have been a moving target for the past months, and some final cleanups were done there that were not included here. I initially intended to add some small followup commits to #24148 but i think there are enough of them to be worth a followup PR on its own.

  Some parts of the code did not change since it was initially written in 2019, and the code could use some modernization. (Use std::optional instead of out args, remove old compiler workarounds).
  We refactored the helpers to be more meaningful, and also did some renaming. A new fuzz target was also added and both were merged in a single file. 2 more will be added in #24149 that will be contained in this file too.

  The only behaviour change in this PR is to rule out Miniscript with duplicate keys from sane Miniscripts. In a P2WSH context, signatures can be rebounded (Miniscript does not use CODESEPARATOR) and it's reasonable to assume that reusing keys across the Script drops the malleability guarantees.
  It was previously assumed such Miniscript would never exist in the first place since a compiler should never create them. We finally agreed that if one were to exist (say, written by hand or from a buggy compiler) it would be very confusing if an imported Miniscript descriptor (after #24148) with duplicate keys was deemed sane (ie, "safe to use") by Bitcoin Core. We now check for duplicate keys in the constructor.

  This is (still) joint work with Pieter Wuille. (Actually he entirely authored the cleanups and code modernization.)

ACKs for top commit:
  sipa:
    utACK f3a50c9dfe645c548713e44e0eaf26ea9917a379 (with the caveat that a lot of it is my own code)
  sanket1729:
    code review ACK f3a50c9dfe645c548713e44e0eaf26ea9917a379. Did not review the fuzz tests.

Tree-SHA512: c043325e4936fe25e8ece4266b46119e000c6745f88cea530fed1edf01c80f03ee6f9edc83b6e9d42ca01688d184bad16bfd967c5bb8037744e726993adf3deb
---
 src/Makefile.test.include           |   2 +-
 src/script/miniscript.cpp           |  95 +++----
 src/script/miniscript.h             | 415 ++++++++++++++++------------
 src/test/fuzz/miniscript.cpp        | 167 +++++++++++
 src/test/fuzz/miniscript_decode.cpp |  72 -----
 src/test/miniscript_tests.cpp       |  36 ++-
 6 files changed, 481 insertions(+), 306 deletions(-)
 create mode 100644 src/test/fuzz/miniscript.cpp
 delete mode 100644 src/test/fuzz/miniscript_decode.cpp

diff --git a/src/Makefile.test.include b/src/Makefile.test.include
index d4107750889d..ecce78db38f1 100644
--- a/src/Makefile.test.include
+++ b/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 \
diff --git a/src/script/miniscript.cpp b/src/script/miniscript.cpp
index 019f02f1594d..cb4d4cb783d0 100644
--- a/src/script/miniscript.cpp
+++ b/src/script/miniscript.cpp
@@ -17,69 +17,67 @@ Type SanitizeType(Type e) {
     int num_types = (e << "K"_mst) + (e << "V"_mst) + (e << "B"_mst) + (e << "W"_mst);
     if (num_types == 0) return ""_mst; // No valid type, don't care about the rest
     assert(num_types == 1); // K, V, B, W all conflict with each other
-    bool ok = // Work around a GCC 4.8 bug that breaks user-defined literals in macro calls.
-        (!(e << "z"_mst) || !(e << "o"_mst)) && // z conflicts with o
-        (!(e << "n"_mst) || !(e << "z"_mst)) && // n conflicts with z
-        (!(e << "n"_mst) || !(e << "W"_mst)) && // n conflicts with W
-        (!(e << "V"_mst) || !(e << "d"_mst)) && // V conflicts with d
-        (!(e << "K"_mst) ||  (e << "u"_mst)) && // K implies u
-        (!(e << "V"_mst) || !(e << "u"_mst)) && // V conflicts with u
-        (!(e << "e"_mst) || !(e << "f"_mst)) && // e conflicts with f
-        (!(e << "e"_mst) ||  (e << "d"_mst)) && // e implies d
-        (!(e << "V"_mst) || !(e << "e"_mst)) && // V conflicts with e
-        (!(e << "d"_mst) || !(e << "f"_mst)) && // d conflicts with f
-        (!(e << "V"_mst) ||  (e << "f"_mst)) && // V implies f
-        (!(e << "K"_mst) ||  (e << "s"_mst)) && // K implies s
-        (!(e << "z"_mst) ||  (e << "m"_mst)); // z implies m
-    assert(ok);
+    assert(!(e << "z"_mst) || !(e << "o"_mst)); // z conflicts with o
+    assert(!(e << "n"_mst) || !(e << "z"_mst)); // n conflicts with z
+    assert(!(e << "n"_mst) || !(e << "W"_mst)); // n conflicts with W
+    assert(!(e << "V"_mst) || !(e << "d"_mst)); // V conflicts with d
+    assert(!(e << "K"_mst) ||  (e << "u"_mst)); // K implies u
+    assert(!(e << "V"_mst) || !(e << "u"_mst)); // V conflicts with u
+    assert(!(e << "e"_mst) || !(e << "f"_mst)); // e conflicts with f
+    assert(!(e << "e"_mst) ||  (e << "d"_mst)); // e implies d
+    assert(!(e << "V"_mst) || !(e << "e"_mst)); // V conflicts with e
+    assert(!(e << "d"_mst) || !(e << "f"_mst)); // d conflicts with f
+    assert(!(e << "V"_mst) ||  (e << "f"_mst)); // V implies f
+    assert(!(e << "K"_mst) ||  (e << "s"_mst)); // K implies s
+    assert(!(e << "z"_mst) ||  (e << "m"_mst)); // z implies m
     return e;
 }
 
-Type ComputeType(Fragment nodetype, Type x, Type y, Type z, const std::vector<Type>& sub_types, uint32_t k, size_t data_size, size_t n_subs, size_t n_keys) {
+Type ComputeType(Fragment fragment, Type x, Type y, Type z, const std::vector<Type>& sub_types, uint32_t k, size_t data_size, size_t n_subs, size_t n_keys) {
     // Sanity check on data
-    if (nodetype == Fragment::SHA256 || nodetype == Fragment::HASH256) {
+    if (fragment == Fragment::SHA256 || fragment == Fragment::HASH256) {
         assert(data_size == 32);
-    } else if (nodetype == Fragment::RIPEMD160 || nodetype == Fragment::HASH160) {
+    } else if (fragment == Fragment::RIPEMD160 || fragment == Fragment::HASH160) {
         assert(data_size == 20);
     } else {
         assert(data_size == 0);
     }
     // Sanity check on k
-    if (nodetype == Fragment::OLDER || nodetype == Fragment::AFTER) {
+    if (fragment == Fragment::OLDER || fragment == Fragment::AFTER) {
         assert(k >= 1 && k < 0x80000000UL);
-    } else if (nodetype == Fragment::MULTI) {
+    } else if (fragment == Fragment::MULTI) {
         assert(k >= 1 && k <= n_keys);
-    } else if (nodetype == Fragment::THRESH) {
+    } else if (fragment == Fragment::THRESH) {
         assert(k >= 1 && k <= n_subs);
     } else {
         assert(k == 0);
     }
     // Sanity check on subs
-    if (nodetype == Fragment::AND_V || nodetype == Fragment::AND_B || nodetype == Fragment::OR_B ||
-        nodetype == Fragment::OR_C || nodetype == Fragment::OR_I || nodetype == Fragment::OR_D) {
+    if (fragment == Fragment::AND_V || fragment == Fragment::AND_B || fragment == Fragment::OR_B ||
+        fragment == Fragment::OR_C || fragment == Fragment::OR_I || fragment == Fragment::OR_D) {
         assert(n_subs == 2);
-    } else if (nodetype == Fragment::ANDOR) {
+    } else if (fragment == Fragment::ANDOR) {
         assert(n_subs == 3);
-    } else if (nodetype == Fragment::WRAP_A || nodetype == Fragment::WRAP_S || nodetype == Fragment::WRAP_C ||
-               nodetype == Fragment::WRAP_D || nodetype == Fragment::WRAP_V || nodetype == Fragment::WRAP_J ||
-               nodetype == Fragment::WRAP_N) {
+    } else if (fragment == Fragment::WRAP_A || fragment == Fragment::WRAP_S || fragment == Fragment::WRAP_C ||
+               fragment == Fragment::WRAP_D || fragment == Fragment::WRAP_V || fragment == Fragment::WRAP_J ||
+               fragment == Fragment::WRAP_N) {
         assert(n_subs == 1);
-    } else if (nodetype != Fragment::THRESH) {
+    } else if (fragment != Fragment::THRESH) {
         assert(n_subs == 0);
     }
     // Sanity check on keys
-    if (nodetype == Fragment::PK_K || nodetype == Fragment::PK_H) {
+    if (fragment == Fragment::PK_K || fragment == Fragment::PK_H) {
         assert(n_keys == 1);
-    } else if (nodetype == Fragment::MULTI) {
+    } else if (fragment == Fragment::MULTI) {
         assert(n_keys >= 1 && n_keys <= 20);
     } else {
         assert(n_keys == 0);
     }
 
-    // Below is the per-nodetype logic for computing the expression types.
+    // Below is the per-fragment logic for computing the expression types.
     // It heavily relies on Type's << operator (where "X << a_mst" means
     // "X has all properties listed in a").
-    switch (nodetype) {
+    switch (fragment) {
         case Fragment::PK_K: return "Konudemsxk"_mst;
         case Fragment::PK_H: return "Knudemsxk"_mst;
         case Fragment::OLDER: return
@@ -247,11 +245,10 @@ Type ComputeType(Fragment nodetype, Type x, Type y, Type z, const std::vector<Ty
             }
     }
     assert(false);
-    return ""_mst;
 }
 
-size_t ComputeScriptLen(Fragment nodetype, Type sub0typ, size_t subsize, uint32_t k, size_t n_subs, size_t n_keys) {
-    switch (nodetype) {
+size_t ComputeScriptLen(Fragment fragment, Type sub0typ, size_t subsize, uint32_t k, size_t n_subs, size_t n_keys) {
+    switch (fragment) {
         case Fragment::JUST_1:
         case Fragment::JUST_0: return 1;
         case Fragment::PK_K: return 34;
@@ -262,7 +259,7 @@ size_t ComputeScriptLen(Fragment nodetype, Type sub0typ, size_t subsize, uint32_
         case Fragment::SHA256: return 4 + 2 + 33;
         case Fragment::HASH160:
         case Fragment::RIPEMD160: return 4 + 2 + 21;
-        case Fragment::MULTI: return 3 + (n_keys > 16) + (k > 16) + 34 * n_keys;
+        case Fragment::MULTI: return 1 + BuildScript(n_keys).size() + BuildScript(k).size() + 34 * n_keys;
         case Fragment::AND_V: return subsize;
         case Fragment::WRAP_V: return subsize + (sub0typ << "x"_mst);
         case Fragment::WRAP_S:
@@ -280,19 +277,17 @@ size_t ComputeScriptLen(Fragment nodetype, Type sub0typ, size_t subsize, uint32_
         case Fragment::THRESH: return subsize + n_subs + BuildScript(k).size();
     }
     assert(false);
-    return 0;
 }
 
-bool DecomposeScript(const CScript& script, std::vector<std::pair<opcodetype, std::vector<unsigned char>>>& out)
+std::optional<std::vector<Opcode>> DecomposeScript(const CScript& script)
 {
-    out.clear();
+    std::vector<Opcode> out;
     CScript::const_iterator it = script.begin(), itend = script.end();
     while (it != itend) {
         std::vector<unsigned char> push_data;
         opcodetype opcode;
         if (!script.GetOp(it, opcode, push_data)) {
-            out.clear();
-            return false;
+            return {};
         } else if (opcode >= OP_1 && opcode <= OP_16) {
             // Deal with OP_n (GetOp does not turn them into pushes).
             push_data.assign(1, CScript::DecodeOP_N(opcode));
@@ -309,30 +304,28 @@ bool DecomposeScript(const CScript& script, std::vector<std::pair<opcodetype, st
             out.emplace_back(OP_EQUAL, std::vector<unsigned char>());
             opcode = OP_VERIFY;
         } else if (IsPushdataOp(opcode)) {
-            if (!CheckMinimalPush(push_data, opcode)) return false;
+            if (!CheckMinimalPush(push_data, opcode)) return {};
         } else if (it != itend && (opcode == OP_CHECKSIG || opcode == OP_CHECKMULTISIG || opcode == OP_EQUAL) && (*it == OP_VERIFY)) {
             // Rule out non minimal VERIFY sequences
-            return false;
+            return {};
         }
         out.emplace_back(opcode, std::move(push_data));
     }
     std::reverse(out.begin(), out.end());
-    return true;
+    return out;
 }
 
-bool ParseScriptNumber(const std::pair<opcodetype, std::vector<unsigned char>>& in, int64_t& k) {
+std::optional<int64_t> ParseScriptNumber(const Opcode& in) {
     if (in.first == OP_0) {
-        k = 0;
-        return true;
+        return 0;
     }
     if (!in.second.empty()) {
-        if (IsPushdataOp(in.first) && !CheckMinimalPush(in.second, in.first)) return false;
+        if (IsPushdataOp(in.first) && !CheckMinimalPush(in.second, in.first)) return {};
         try {
-            k = CScriptNum(in.second, true).GetInt64();
-            return true;
+            return CScriptNum(in.second, true).GetInt64();
         } catch(const scriptnum_error&) {}
     }
-    return false;
+    return {};
 }
 
 int FindNextChar(Span<const char> sp, const char m)
diff --git a/src/script/miniscript.h b/src/script/miniscript.h
index 13da65e758b3..51f7eafd5a37 100644
--- a/src/script/miniscript.h
+++ b/src/script/miniscript.h
@@ -6,6 +6,7 @@
 #define BITCOIN_SCRIPT_MINISCRIPT_H
 
 #include <algorithm>
+#include <functional>
 #include <numeric>
 #include <memory>
 #include <optional>
@@ -40,7 +41,7 @@ namespace miniscript {
  *   - For example: older(n) = <n> OP_CHECKSEQUENCEVERIFY.
  * - "V" Verify:
  *   - Takes its inputs from the top of the stack.
- *   - When satisfactied, pushes nothing.
+ *   - When satisfied, pushes nothing.
  *   - Cannot be dissatisfied.
  *   - This can be obtained by adding an OP_VERIFY to a B, modifying the last opcode
  *     of a B to its -VERIFY version (only for OP_CHECKSIG, OP_CHECKSIGVERIFY
@@ -179,6 +180,8 @@ inline constexpr Type operator"" _mst(const char* c, size_t l) {
     return typ;
 }
 
+using Opcode = std::pair<opcodetype, std::vector<unsigned char>>;
+
 template<typename Key> struct Node;
 template<typename Key> using NodeRef = std::shared_ptr<const Node<Key>>;
 
@@ -224,10 +227,10 @@ enum class Fragment {
 namespace internal {
 
 //! Helper function for Node::CalcType.
-Type ComputeType(Fragment nodetype, Type x, Type y, Type z, const std::vector<Type>& sub_types, uint32_t k, size_t data_size, size_t n_subs, size_t n_keys);
+Type ComputeType(Fragment fragment, Type x, Type y, Type z, const std::vector<Type>& sub_types, uint32_t k, size_t data_size, size_t n_subs, size_t n_keys);
 
 //! Helper function for Node::CalcScriptLen.
-size_t ComputeScriptLen(Fragment nodetype, Type sub0typ, size_t subsize, uint32_t k, size_t n_subs, size_t n_keys);
+size_t ComputeScriptLen(Fragment fragment, Type sub0typ, size_t subsize, uint32_t k, size_t n_subs, size_t n_keys);
 
 //! A helper sanitizer/checker for the output of CalcType.
 Type SanitizeType(Type x);
@@ -279,7 +282,7 @@ struct StackSize {
 template<typename Key>
 struct Node {
     //! What node type this node is.
-    const Fragment nodetype;
+    const Fragment fragment;
     //! The k parameter (time for OLDER/AFTER, threshold for THRESH(_M))
     const uint32_t k = 0;
     //! The keys used by this expression (only for PK_K/PK_H/MULTI)
@@ -298,6 +301,8 @@ struct Node {
     const Type typ;
     //! Cached script length (computed by CalcScriptLen).
     const size_t scriptlen;
+    //! Whether a public key appears more than once in this node.
+    const bool duplicate_key;
 
     //! Compute the length of the script for this miniscript (including children).
     size_t CalcScriptLen() const {
@@ -306,7 +311,7 @@ struct Node {
             subsize += sub->ScriptSize();
         }
         Type sub0type = subs.size() > 0 ? subs[0]->GetType() : ""_mst;
-        return internal::ComputeScriptLen(nodetype, sub0type, subsize, k, subs.size(), keys.size());
+        return internal::ComputeScriptLen(fragment, sub0type, subsize, k, subs.size(), keys.size());
     }
 
     /* Apply a recursive algorithm to a Miniscript tree, without actual recursive calls.
@@ -329,6 +334,8 @@ struct Node {
      *   computes the result of the node. If std::nullopt is returned by upfn,
      *   TreeEvalMaybe() immediately returns std::nullopt.
      * The return value of TreeEvalMaybe is the result of the root node.
+     *
+     * Result type cannot be bool due to the std::vector<bool> specialization.
      */
     template<typename Result, typename State, typename DownFn, typename UpFn>
     std::optional<Result> TreeEvalMaybe(State root_state, DownFn downfn, UpFn upfn) const
@@ -393,6 +400,20 @@ struct Node {
         return std::move(results[0]);
     }
 
+    /** Like TreeEvalMaybe, but without downfn or State type.
+     * upfn takes (const Node&, Span<Result>) and returns std::optional<Result>. */
+    template<typename Result, typename UpFn>
+    std::optional<Result> TreeEvalMaybe(UpFn upfn) const
+    {
+        struct DummyState {};
+        return TreeEvalMaybe<Result>(DummyState{},
+            [](DummyState, const Node&, size_t) { return DummyState{}; },
+            [&upfn](DummyState, const Node& node, Span<Result> subs) {
+                return upfn(node, subs);
+            }
+        );
+    }
+
     /** Like TreeEvalMaybe, but always produces a result. upfn must return Result. */
     template<typename Result, typename State, typename DownFn, typename UpFn>
     Result TreeEval(State root_state, DownFn&& downfn, UpFn upfn) const
@@ -408,13 +429,33 @@ struct Node {
         ));
     }
 
+    /** Compare two miniscript subtrees, using a non-recursive algorithm. */
+    friend int Compare(const Node<Key>& node1, const Node<Key>& node2)
+    {
+        std::vector<std::pair<const Node<Key>&, const Node<Key>&>> queue;
+        queue.emplace_back(node1, node2);
+        while (!queue.empty()) {
+            const auto& [a, b] = queue.back();
+            queue.pop_back();
+            if (std::tie(a.fragment, a.k, a.keys, a.data) < std::tie(b.fragment, b.k, b.keys, b.data)) return -1;
+            if (std::tie(b.fragment, b.k, b.keys, b.data) < std::tie(a.fragment, a.k, a.keys, a.data)) return 1;
+            if (a.subs.size() < b.subs.size()) return -1;
+            if (b.subs.size() < a.subs.size()) return 1;
+            size_t n = a.subs.size();
+            for (size_t i = 0; i < n; ++i) {
+                queue.emplace_back(*a.subs[n - 1 - i], *b.subs[n - 1 - i]);
+            }
+        }
+        return 0;
+    }
+
     //! Compute the type for this miniscript.
     Type CalcType() const {
         using namespace internal;
 
         // THRESH has a variable number of subexpressions
         std::vector<Type> sub_types;
-        if (nodetype == Fragment::THRESH) {
+        if (fragment == Fragment::THRESH) {
             for (const auto& sub : subs) sub_types.push_back(sub->GetType());
         }
         // All other nodes than THRESH can be computed just from the types of the 0-3 subexpressions.
@@ -422,7 +463,7 @@ struct Node {
         Type y = subs.size() > 1 ? subs[1]->GetType() : ""_mst;
         Type z = subs.size() > 2 ? subs[2]->GetType() : ""_mst;
 
-        return SanitizeType(ComputeType(nodetype, x, y, z, sub_types, k, data.size(), subs.size(), keys.size()));
+        return SanitizeType(ComputeType(fragment, x, y, z, sub_types, k, data.size(), subs.size(), keys.size()));
     }
 
 public:
@@ -434,17 +475,17 @@ struct Node {
         // by an OP_VERIFY (which may need to be combined with the last script opcode).
         auto downfn = [](bool verify, const Node& node, size_t index) {
             // For WRAP_V, the subexpression is certainly followed by OP_VERIFY.
-            if (node.nodetype == Fragment::WRAP_V) return true;
+            if (node.fragment == Fragment::WRAP_V) return true;
             // The subexpression of WRAP_S, and the last subexpression of AND_V
             // inherit the followed-by-OP_VERIFY property from the parent.
-            if (node.nodetype == Fragment::WRAP_S ||
-                (node.nodetype == Fragment::AND_V && index == 1)) return verify;
+            if (node.fragment == Fragment::WRAP_S ||
+                (node.fragment == Fragment::AND_V && index == 1)) return verify;
             return false;
         };
         // The upward function computes for a node, given its followed-by-OP_VERIFY status
         // and the CScripts of its child nodes, the CScript of the node.
         auto upfn = [&ctx](bool verify, const Node& node, Span<CScript> subs) -> CScript {
-            switch (node.nodetype) {
+            switch (node.fragment) {
                 case Fragment::PK_K: return BuildScript(ctx.ToPKBytes(node.keys[0]));
                 case Fragment::PK_H: return BuildScript(OP_DUP, OP_HASH160, ctx.ToPKHBytes(node.keys[0]), OP_EQUALVERIFY);
                 case Fragment::OLDER: return BuildScript(node.k, OP_CHECKSEQUENCEVERIFY);
@@ -491,45 +532,44 @@ struct Node {
                 }
             }
             assert(false);
-            return {};
         };
         return TreeEval<CScript>(false, downfn, upfn);
     }
 
     template<typename CTx>
-    bool ToString(const CTx& ctx, std::string& ret) const {
+    std::optional<std::string> ToString(const CTx& ctx) const {
         // To construct the std::string representation for a Miniscript object, we use
         // the TreeEvalMaybe algorithm. The State is a boolean: whether the parent node is a
         // wrapper. If so, non-wrapper expressions must be prefixed with a ":".
         auto downfn = [](bool, const Node& node, size_t) {
-            return (node.nodetype == Fragment::WRAP_A || node.nodetype == Fragment::WRAP_S ||
-                    node.nodetype == Fragment::WRAP_D || node.nodetype == Fragment::WRAP_V ||
-                    node.nodetype == Fragment::WRAP_J || node.nodetype == Fragment::WRAP_N ||
-                    node.nodetype == Fragment::WRAP_C ||
-                    (node.nodetype == Fragment::AND_V && node.subs[1]->nodetype == Fragment::JUST_1) ||
-                    (node.nodetype == Fragment::OR_I && node.subs[0]->nodetype == Fragment::JUST_0) ||
-                    (node.nodetype == Fragment::OR_I && node.subs[1]->nodetype == Fragment::JUST_0));
+            return (node.fragment == Fragment::WRAP_A || node.fragment == Fragment::WRAP_S ||
+                    node.fragment == Fragment::WRAP_D || node.fragment == Fragment::WRAP_V ||
+                    node.fragment == Fragment::WRAP_J || node.fragment == Fragment::WRAP_N ||
+                    node.fragment == Fragment::WRAP_C ||
+                    (node.fragment == Fragment::AND_V && node.subs[1]->fragment == Fragment::JUST_1) ||
+                    (node.fragment == Fragment::OR_I && node.subs[0]->fragment == Fragment::JUST_0) ||
+                    (node.fragment == Fragment::OR_I && node.subs[1]->fragment == Fragment::JUST_0));
         };
         // The upward function computes for a node, given whether its parent is a wrapper,
         // and the string representations of its child nodes, the string representation of the node.
         auto upfn = [&ctx](bool wrapped, const Node& node, Span<std::string> subs) -> std::optional<std::string> {
             std::string ret = wrapped ? ":" : "";
 
-            switch (node.nodetype) {
+            switch (node.fragment) {
                 case Fragment::WRAP_A: return "a" + std::move(subs[0]);
                 case Fragment::WRAP_S: return "s" + std::move(subs[0]);
                 case Fragment::WRAP_C:
-                    if (node.subs[0]->nodetype == Fragment::PK_K) {
+                    if (node.subs[0]->fragment == Fragment::PK_K) {
                         // pk(K) is syntactic sugar for c:pk_k(K)
-                        std::string key_str;
-                        if (!ctx.ToString(node.subs[0]->keys[0], key_str)) return {};
-                        return std::move(ret) + "pk(" + std::move(key_str) + ")";
+                        auto key_str = ctx.ToString(node.subs[0]->keys[0]);
+                        if (!key_str) return {};
+                        return std::move(ret) + "pk(" + std::move(*key_str) + ")";
                     }
-                    if (node.subs[0]->nodetype == Fragment::PK_H) {
+                    if (node.subs[0]->fragment == Fragment::PK_H) {
                         // pkh(K) is syntactic sugar for c:pk_h(K)
-                        std::string key_str;
-                        if (!ctx.ToString(node.subs[0]->keys[0], key_str)) return {};
-                        return std::move(ret) + "pkh(" + std::move(key_str) + ")";
+                        auto key_str = ctx.ToString(node.subs[0]->keys[0]);
+                        if (!key_str) return {};
+                        return std::move(ret) + "pkh(" + std::move(*key_str) + ")";
                     }
                     return "c" + std::move(subs[0]);
                 case Fragment::WRAP_D: return "d" + std::move(subs[0]);
@@ -538,24 +578,24 @@ struct Node {
                 case Fragment::WRAP_N: return "n" + std::move(subs[0]);
                 case Fragment::AND_V:
                     // t:X is syntactic sugar for and_v(X,1).
-                    if (node.subs[1]->nodetype == Fragment::JUST_1) return "t" + std::move(subs[0]);
+                    if (node.subs[1]->fragment == Fragment::JUST_1) return "t" + std::move(subs[0]);
                     break;
                 case Fragment::OR_I:
-                    if (node.subs[0]->nodetype == Fragment::JUST_0) return "l" + std::move(subs[1]);
-                    if (node.subs[1]->nodetype == Fragment::JUST_0) return "u" + std::move(subs[0]);
+                    if (node.subs[0]->fragment == Fragment::JUST_0) return "l" + std::move(subs[1]);
+                    if (node.subs[1]->fragment == Fragment::JUST_0) return "u" + std::move(subs[0]);
                     break;
                 default: break;
             }
-            switch (node.nodetype) {
+            switch (node.fragment) {
                 case Fragment::PK_K: {
-                    std::string key_str;
-                    if (!ctx.ToString(node.keys[0], key_str)) return {};
-                    return std::move(ret) + "pk_k(" + std::move(key_str) + ")";
+                    auto key_str = ctx.ToString(node.keys[0]);
+                    if (!key_str) return {};
+                    return std::move(ret) + "pk_k(" + std::move(*key_str) + ")";
                 }
                 case Fragment::PK_H: {
-                    std::string key_str;
-                    if (!ctx.ToString(node.keys[0], key_str)) return {};
-                    return std::move(ret) + "pk_h(" + std::move(key_str) + ")";
+                    auto key_str = ctx.ToString(node.keys[0]);
+                    if (!key_str) return {};
+                    return std::move(ret) + "pk_h(" + std::move(*key_str) + ")";
                 }
                 case Fragment::AFTER: return std::move(ret) + "after(" + ::ToString(node.k) + ")";
                 case Fragment::OLDER: return std::move(ret) + "older(" + ::ToString(node.k) + ")";
@@ -573,14 +613,14 @@ struct Node {
                 case Fragment::OR_I: return std::move(ret) + "or_i(" + std::move(subs[0]) + "," + std::move(subs[1]) + ")";
                 case Fragment::ANDOR:
                     // and_n(X,Y) is syntactic sugar for andor(X,Y,0).
-                    if (node.subs[2]->nodetype == Fragment::JUST_0) return std::move(ret) + "and_n(" + std::move(subs[0]) + "," + std::move(subs[1]) + ")";
+                    if (node.subs[2]->fragment == Fragment::JUST_0) return std::move(ret) + "and_n(" + std::move(subs[0]) + "," + std::move(subs[1]) + ")";
                     return std::move(ret) + "andor(" + std::move(subs[0]) + "," + std::move(subs[1]) + "," + std::move(subs[2]) + ")";
                 case Fragment::MULTI: {
                     auto str = std::move(ret) + "multi(" + ::ToString(node.k);
                     for (const auto& key : node.keys) {
-                        std::string key_str;
-                        if (!ctx.ToString(key, key_str)) return {};
-                        str += "," + std::move(key_str);
+                        auto key_str = ctx.ToString(key);
+                        if (!key_str) return {};
+                        str += "," + std::move(*key_str);
                     }
                     return std::move(str) + ")";
                 }
@@ -591,18 +631,16 @@ struct Node {
                     }
                     return std::move(str) + ")";
                 }
-                default: assert(false);
+                default: break;
             }
-            return ""; // Should never be reached.
+            assert(false);
         };
 
-        auto res = TreeEvalMaybe<std::string>(false, downfn, upfn);
-        if (res.has_value()) ret = std::move(*res);
-        return res.has_value();
+        return TreeEvalMaybe<std::string>(false, downfn, upfn);
     }
 
     internal::Ops CalcOps() const {
-        switch (nodetype) {
+        switch (fragment) {
             case Fragment::JUST_1: return {0, 0, {}};
             case Fragment::JUST_0: return {0, {}, 0};
             case Fragment::PK_K: return {0, 0, 0};
@@ -672,11 +710,10 @@ struct Node {
             }
         }
         assert(false);
-        return {0, {}, {}};
     }
 
     internal::StackSize CalcStackSize() const {
-        switch (nodetype) {
+        switch (fragment) {
             case Fragment::JUST_0: return {{}, 0};
             case Fragment::JUST_1:
             case Fragment::OLDER:
@@ -723,7 +760,42 @@ struct Node {
             }
         }
         assert(false);
-        return {{}, {}};
+    }
+
+    /** Check whether any key is repeated.
+     * This uses a custom key comparator provided by the context in order to still detect duplicates
+     * for more complicated types.
+     */
+    template<typename Ctx> bool ContainsDuplicateKey(const Ctx& ctx) const {
+        // We cannot use a lambda here, as lambdas are non assignable, and the set operations
+        // below require moving the comparators around.
+        struct Comp {
+            const Ctx* ctx_ptr;
+            Comp(const Ctx& ctx) : ctx_ptr(&ctx) {}
+            bool operator()(const Key& a, const Key& b) const { return ctx_ptr->KeyCompare(a, b); }
+        };
+        using set = std::set<Key, Comp>;
+
+        auto upfn = [this, &ctx](const Node& node, Span<set> subs) -> std::optional<set> {
+            if (&node != this && node.duplicate_key) return {};
+
+            size_t keys_count = node.keys.size();
+            set key_set{node.keys.begin(), node.keys.end(), Comp(ctx)};
+            if (key_set.size() != keys_count) return {};
+
+            for (auto& sub: subs) {
+                keys_count += sub.size();
+                // Small optimization: std::set::merge is linear in the size of the second arg but
+                // logarithmic in the size of the first.
+                if (key_set.size() < sub.size()) std::swap(key_set, sub);
+                key_set.merge(sub);
+                if (key_set.size() != keys_count) return {};
+            }
+
+            return key_set;
+        };
+
+        return !TreeEvalMaybe<set>(upfn);
     }
 
 public:
@@ -755,35 +827,31 @@ struct Node {
     //! Check whether this script always needs a signature.
     bool NeedsSignature() const { return GetType() << "s"_mst; }
 
-    //! Do all sanity checks.
-    bool IsSane() const { return IsValid() && GetType() << "mk"_mst && CheckOpsLimit(); }
+    //! Check whether there is no satisfaction path that contains both timelocks and heightlocks
+    bool CheckTimeLocksMix() const { return GetType() << "k"_mst; }
+
+    //! Check whether there is no duplicate key across this fragment and all its sub-fragments.
+    bool CheckDuplicateKey() const { return !duplicate_key; }
+
+    //! Whether successful non-malleable satisfactions are guaranteed to be valid.
+    bool ValidSatisfactions() const { return IsValid() && CheckOpsLimit(); }
+
+    //! Whether the apparent policy of this node matches its script semantics. Doesn't guarantee it is a safe script on its own.
+    bool IsSaneSubexpression() const { return ValidSatisfactions() && IsNonMalleable() && CheckTimeLocksMix() && CheckDuplicateKey(); }
 
     //! Check whether this node is safe as a script on its own.
-    bool IsSaneTopLevel() const { return IsValidTopLevel() && IsSane() && NeedsSignature(); }
+    bool IsSane() const { return IsValidTopLevel() && IsSaneSubexpression() && NeedsSignature(); }
 
     //! Equality testing.
-    bool operator==(const Node<Key>& arg) const
-    {
-        if (nodetype != arg.nodetype) return false;
-        if (k != arg.k) return false;
-        if (data != arg.data) return false;
-        if (keys != arg.keys) return false;
-        if (subs.size() != arg.subs.size()) return false;
-        for (size_t i = 0; i < subs.size(); ++i) {
-            if (!(*subs[i] == *arg.subs[i])) return false;
-        }
-        assert(scriptlen == arg.scriptlen);
-        assert(typ == arg.typ);
-        return true;
-    }
+    bool operator==(const Node<Key>& arg) const { return Compare(*this, arg) == 0; }
 
     // Constructors with various argument combinations.
-    Node(Fragment nt, std::vector<NodeRef<Key>> sub, std::vector<unsigned char> arg, uint32_t val = 0) : nodetype(nt), k(val), data(std::move(arg)), subs(std::move(sub)), ops(CalcOps()), ss(CalcStackSize()), typ(CalcType()), scriptlen(CalcScriptLen()) {}
-    Node(Fragment nt, std::vector<unsigned char> arg, uint32_t val = 0) : nodetype(nt), k(val), data(std::move(arg)), ops(CalcOps()), ss(CalcStackSize()), typ(CalcType()), scriptlen(CalcScriptLen()) {}
-    Node(Fragment nt, std::vector<NodeRef<Key>> sub, std::vector<Key> key, uint32_t val = 0) : nodetype(nt), k(val), keys(std::move(key)), subs(std::move(sub)), ops(CalcOps()), ss(CalcStackSize()), typ(CalcType()), scriptlen(CalcScriptLen()) {}
-    Node(Fragment nt, std::vector<Key> key, uint32_t val = 0) : nodetype(nt), k(val), keys(std::move(key)), ops(CalcOps()), ss(CalcStackSize()), typ(CalcType()), scriptlen(CalcScriptLen()) {}
-    Node(Fragment nt, std::vector<NodeRef<Key>> sub, uint32_t val = 0) : nodetype(nt), k(val), subs(std::move(sub)), ops(CalcOps()), ss(CalcStackSize()), typ(CalcType()), scriptlen(CalcScriptLen()) {}
-    Node(Fragment nt, uint32_t val = 0) : nodetype(nt), k(val), ops(CalcOps()), ss(CalcStackSize()), typ(CalcType()), scriptlen(CalcScriptLen()) {}
+    template <typename Ctx> Node(const Ctx& ctx, Fragment nt, std::vector<NodeRef<Key>> sub, std::vector<unsigned char> arg, uint32_t val = 0) : fragment(nt), k(val), data(std::move(arg)), subs(std::move(sub)), ops(CalcOps()), ss(CalcStackSize()), typ(CalcType()), scriptlen(CalcScriptLen()), duplicate_key(ContainsDuplicateKey(ctx)) {}
+    template <typename Ctx> Node(const Ctx& ctx, Fragment nt, std::vector<unsigned char> arg, uint32_t val = 0) : fragment(nt), k(val), data(std::move(arg)), ops(CalcOps()), ss(CalcStackSize()), typ(CalcType()), scriptlen(CalcScriptLen()), duplicate_key(ContainsDuplicateKey(ctx)) {}
+    template <typename Ctx> Node(const Ctx& ctx, Fragment nt, std::vector<NodeRef<Key>> sub, std::vector<Key> key, uint32_t val = 0) : fragment(nt), k(val), keys(std::move(key)), subs(std::move(sub)), ops(CalcOps()), ss(CalcStackSize()), typ(CalcType()), scriptlen(CalcScriptLen()), duplicate_key(ContainsDuplicateKey(ctx)) {}
+    template <typename Ctx> Node(const Ctx& ctx, Fragment nt, std::vector<Key> key, uint32_t val = 0) : fragment(nt), k(val), keys(std::move(key)), ops(CalcOps()), ss(CalcStackSize()), typ(CalcType()), scriptlen(CalcScriptLen()), duplicate_key(ContainsDuplicateKey(ctx)) {}
+    template <typename Ctx> Node(const Ctx& ctx, Fragment nt, std::vector<NodeRef<Key>> sub, uint32_t val = 0) : fragment(nt), k(val), subs(std::move(sub)), ops(CalcOps()), ss(CalcStackSize()), typ(CalcType()), scriptlen(CalcScriptLen()), duplicate_key(ContainsDuplicateKey(ctx)) {}
+    template <typename Ctx> Node(const Ctx& ctx, Fragment nt, uint32_t val = 0) : fragment(nt), k(val), ops(CalcOps()), ss(CalcStackSize()), typ(CalcType()), scriptlen(CalcScriptLen()), duplicate_key(ContainsDuplicateKey(ctx)) {}
 };
 
 namespace internal {
@@ -844,15 +912,15 @@ enum class ParseContext {
 
 int FindNextChar(Span<const char> in, const char m);
 
-/** Parse a key string ending with a ')' or ','. */
+/** Parse a key string ending at the end of the fragment's text representation. */
 template<typename Key, typename Ctx>
 std::optional<std::pair<Key, int>> ParseKeyEnd(Span<const char> in, const Ctx& ctx)
 {
-    Key key;
     int key_size = FindNextChar(in, ')');
     if (key_size < 1) return {};
-    if (!ctx.FromString(in.begin(), in.begin() + key_size, key)) return {};
-    return {{std::move(key), key_size}};
+    auto key = ctx.FromString(in.begin(), in.begin() + key_size);
+    if (!key) return {};
+    return {{std::move(*key), key_size}};
 }
 
 /** Parse a hex string ending at the end of the fragment's text representation. */
@@ -870,15 +938,15 @@ std::optional<std::pair<std::vector<unsigned char>, int>> ParseHexStrEnd(Span<co
 }
 
 /** BuildBack pops the last two elements off `constructed` and wraps them in the specified Fragment */
-template<typename Key>
-void BuildBack(Fragment nt, std::vector<NodeRef<Key>>& constructed, const bool reverse = false)
+template<typename Key, typename Ctx>
+void BuildBack(const Ctx& ctx, Fragment nt, std::vector<NodeRef<Key>>& constructed, const bool reverse = false)
 {
     NodeRef<Key> child = std::move(constructed.back());
     constructed.pop_back();
     if (reverse) {
-        constructed.back() = MakeNodeRef<Key>(nt, Vector(std::move(child), std::move(constructed.back())));
+        constructed.back() = MakeNodeRef<Key>(ctx, nt, Vector(std::move(child), std::move(constructed.back())));
     } else {
-        constructed.back() = MakeNodeRef<Key>(nt, Vector(std::move(constructed.back()), std::move(child)));
+        constructed.back() = MakeNodeRef<Key>(ctx, nt, Vector(std::move(constructed.back()), std::move(child)));
     }
 }
 
@@ -931,7 +999,7 @@ inline NodeRef<Key> Parse(Span<const char> in, const Ctx& ctx)
                     to_parse.emplace_back(ParseContext::WRAP_T, -1, -1);
                 } else if (in[j] == 'l') {
                     // The l: wrapper is equivalent to or_i(0,X)
-                    constructed.push_back(MakeNodeRef<Key>(Fragment::JUST_0));
+                    constructed.push_back(MakeNodeRef<Key>(ctx, Fragment::JUST_0));
                     to_parse.emplace_back(ParseContext::OR_I, -1, -1);
                 } else {
                     return {};
@@ -943,56 +1011,56 @@ inline NodeRef<Key> Parse(Span<const char> in, const Ctx& ctx)
         }
         case ParseContext::EXPR: {
             if (Const("0", in)) {
-                constructed.push_back(MakeNodeRef<Key>(Fragment::JUST_0));
+                constructed.push_back(MakeNodeRef<Key>(ctx, Fragment::JUST_0));
             } else if (Const("1", in)) {
-                constructed.push_back(MakeNodeRef<Key>(Fragment::JUST_1));
+                constructed.push_back(MakeNodeRef<Key>(ctx, Fragment::JUST_1));
             } else if (Const("pk(", in)) {
                 auto res = ParseKeyEnd<Key, Ctx>(in, ctx);
                 if (!res) return {};
                 auto& [key, key_size] = *res;
-                constructed.push_back(MakeNodeRef<Key>(Fragment::WRAP_C, Vector(MakeNodeRef<Key>(Fragment::PK_K, Vector(std::move(key))))));
+                constructed.push_back(MakeNodeRef<Key>(ctx, Fragment::WRAP_C, Vector(MakeNodeRef<Key>(ctx, Fragment::PK_K, Vector(std::move(key))))));
                 in = in.subspan(key_size + 1);
             } else if (Const("pkh(", in)) {
                 auto res = ParseKeyEnd<Key>(in, ctx);
                 if (!res) return {};
                 auto& [key, key_size] = *res;
-                constructed.push_back(MakeNodeRef<Key>(Fragment::WRAP_C, Vector(MakeNodeRef<Key>(Fragment::PK_H, Vector(std::move(key))))));
+                constructed.push_back(MakeNodeRef<Key>(ctx, Fragment::WRAP_C, Vector(MakeNodeRef<Key>(ctx, Fragment::PK_H, Vector(std::move(key))))));
                 in = in.subspan(key_size + 1);
             } else if (Const("pk_k(", in)) {
                 auto res = ParseKeyEnd<Key>(in, ctx);
                 if (!res) return {};
                 auto& [key, key_size] = *res;
-                constructed.push_back(MakeNodeRef<Key>(Fragment::PK_K, Vector(std::move(key))));
+                constructed.push_back(MakeNodeRef<Key>(ctx, Fragment::PK_K, Vector(std::move(key))));
                 in = in.subspan(key_size + 1);
             } else if (Const("pk_h(", in)) {
                 auto res = ParseKeyEnd<Key>(in, ctx);
                 if (!res) return {};
                 auto& [key, key_size] = *res;
-                constructed.push_back(MakeNodeRef<Key>(Fragment::PK_H, Vector(std::move(key))));
+                constructed.push_back(MakeNodeRef<Key>(ctx, Fragment::PK_H, Vector(std::move(key))));
                 in = in.subspan(key_size + 1);
             } else if (Const("sha256(", in)) {
                 auto res = ParseHexStrEnd(in, 32, ctx);
                 if (!res) return {};
                 auto& [hash, hash_size] = *res;
-                constructed.push_back(MakeNodeRef<Key>(Fragment::SHA256, std::move(hash)));
+                constructed.push_back(MakeNodeRef<Key>(ctx, Fragment::SHA256, std::move(hash)));
                 in = in.subspan(hash_size + 1);
             } else if (Const("ripemd160(", in)) {
                 auto res = ParseHexStrEnd(in, 20, ctx);
                 if (!res) return {};
                 auto& [hash, hash_size] = *res;
-                constructed.push_back(MakeNodeRef<Key>(Fragment::RIPEMD160, std::move(hash)));
+                constructed.push_back(MakeNodeRef<Key>(ctx, Fragment::RIPEMD160, std::move(hash)));
                 in = in.subspan(hash_size + 1);
             } else if (Const("hash256(", in)) {
                 auto res = ParseHexStrEnd(in, 32, ctx);
                 if (!res) return {};
                 auto& [hash, hash_size] = *res;
-                constructed.push_back(MakeNodeRef<Key>(Fragment::HASH256, std::move(hash)));
+                constructed.push_back(MakeNodeRef<Key>(ctx, Fragment::HASH256, std::move(hash)));
                 in = in.subspan(hash_size + 1);
             } else if (Const("hash160(", in)) {
                 auto res = ParseHexStrEnd(in, 20, ctx);
                 if (!res) return {};
                 auto& [hash, hash_size] = *res;
-                constructed.push_back(MakeNodeRef<Key>(Fragment::HASH160, std::move(hash)));
+                constructed.push_back(MakeNodeRef<Key>(ctx, Fragment::HASH160, std::move(hash)));
                 in = in.subspan(hash_size + 1);
             } else if (Const("after(", in)) {
                 int arg_size = FindNextChar(in, ')');
@@ -1000,7 +1068,7 @@ inline NodeRef<Key> Parse(Span<const char> in, const Ctx& ctx)
                 int64_t num;
                 if (!ParseInt64(std::string(in.begin(), in.begin() + arg_size), &num)) return {};
                 if (num < 1 || num >= 0x80000000L) return {};
-                constructed.push_back(MakeNodeRef<Key>(Fragment::AFTER, num));
+                constructed.push_back(MakeNodeRef<Key>(ctx, Fragment::AFTER, num));
                 in = in.subspan(arg_size + 1);
             } else if (Const("older(", in)) {
                 int arg_size = FindNextChar(in, ')');
@@ -1008,7 +1076,7 @@ inline NodeRef<Key> Parse(Span<const char> in, const Ctx& ctx)
                 int64_t num;
                 if (!ParseInt64(std::string(in.begin(), in.begin() + arg_size), &num)) return {};
                 if (num < 1 || num >= 0x80000000L) return {};
-                constructed.push_back(MakeNodeRef<Key>(Fragment::OLDER, num));
+                constructed.push_back(MakeNodeRef<Key>(ctx, Fragment::OLDER, num));
                 in = in.subspan(arg_size + 1);
             } else if (Const("multi(", in)) {
                 // Get threshold
@@ -1019,17 +1087,17 @@ inline NodeRef<Key> Parse(Span<const char> in, const Ctx& ctx)
                 // Get keys
                 std::vector<Key> keys;
                 while (next_comma != -1) {
-                    Key key;
                     next_comma = FindNextChar(in, ',');
                     int key_length = (next_comma == -1) ? FindNextChar(in, ')') : next_comma;
                     if (key_length < 1) return {};
-                    if (!ctx.FromString(in.begin(), in.begin() + key_length, key)) return {};
-                    keys.push_back(std::move(key));
+                    auto key = ctx.FromString(in.begin(), in.begin() + key_length);
+                    if (!key) return {};
+                    keys.push_back(std::move(*key));
                     in = in.subspan(key_length + 1);
                 }
                 if (keys.size() < 1 || keys.size() > 20) return {};
                 if (k < 1 || k > (int64_t)keys.size()) return {};
-                constructed.push_back(MakeNodeRef<Key>(Fragment::MULTI, std::move(keys), k));
+                constructed.push_back(MakeNodeRef<Key>(ctx, Fragment::MULTI, std::move(keys), k));
             } else if (Const("thresh(", in)) {
                 int next_comma = FindNextChar(in, ',');
                 if (next_comma < 1) return {};
@@ -1073,69 +1141,69 @@ inline NodeRef<Key> Parse(Span<const char> in, const Ctx& ctx)
             break;
         }
         case ParseContext::ALT: {
-            constructed.back() = MakeNodeRef<Key>(Fragment::WRAP_A, Vector(std::move(constructed.back())));
+            constructed.back() = MakeNodeRef<Key>(ctx, Fragment::WRAP_A, Vector(std::move(constructed.back())));
             break;
         }
         case ParseContext::SWAP: {
-            constructed.back() = MakeNodeRef<Key>(Fragment::WRAP_S, Vector(std::move(constructed.back())));
+            constructed.back() = MakeNodeRef<Key>(ctx, Fragment::WRAP_S, Vector(std::move(constructed.back())));
             break;
         }
         case ParseContext::CHECK: {
-            constructed.back() = MakeNodeRef<Key>(Fragment::WRAP_C, Vector(std::move(constructed.back())));
+            constructed.back() = MakeNodeRef<Key>(ctx, Fragment::WRAP_C, Vector(std::move(constructed.back())));
             break;
         }
         case ParseContext::DUP_IF: {
-            constructed.back() = MakeNodeRef<Key>(Fragment::WRAP_D, Vector(std::move(constructed.back())));
+            constructed.back() = MakeNodeRef<Key>(ctx, Fragment::WRAP_D, Vector(std::move(constructed.back())));
             break;
         }
         case ParseContext::NON_ZERO: {
-            constructed.back() = MakeNodeRef<Key>(Fragment::WRAP_J, Vector(std::move(constructed.back())));
+            constructed.back() = MakeNodeRef<Key>(ctx, Fragment::WRAP_J, Vector(std::move(constructed.back())));
             break;
         }
         case ParseContext::ZERO_NOTEQUAL: {
-            constructed.back() = MakeNodeRef<Key>(Fragment::WRAP_N, Vector(std::move(constructed.back())));
+            constructed.back() = MakeNodeRef<Key>(ctx, Fragment::WRAP_N, Vector(std::move(constructed.back())));
             break;
         }
         case ParseContext::VERIFY: {
-            constructed.back() = MakeNodeRef<Key>(Fragment::WRAP_V, Vector(std::move(constructed.back())));
+            constructed.back() = MakeNodeRef<Key>(ctx, Fragment::WRAP_V, Vector(std::move(constructed.back())));
             break;
         }
         case ParseContext::WRAP_U: {
-            constructed.back() = MakeNodeRef<Key>(Fragment::OR_I, Vector(std::move(constructed.back()), MakeNodeRef<Key>(Fragment::JUST_0)));
+            constructed.back() = MakeNodeRef<Key>(ctx, Fragment::OR_I, Vector(std::move(constructed.back()), MakeNodeRef<Key>(ctx, Fragment::JUST_0)));
             break;
         }
         case ParseContext::WRAP_T: {
-            constructed.back() = MakeNodeRef<Key>(Fragment::AND_V, Vector(std::move(constructed.back()), MakeNodeRef<Key>(Fragment::JUST_1)));
+            constructed.back() = MakeNodeRef<Key>(ctx, Fragment::AND_V, Vector(std::move(constructed.back()), MakeNodeRef<Key>(ctx, Fragment::JUST_1)));
             break;
         }
         case ParseContext::AND_B: {
-            BuildBack(Fragment::AND_B, constructed);
+            BuildBack(ctx, Fragment::AND_B, constructed);
             break;
         }
         case ParseContext::AND_N: {
             auto mid = std::move(constructed.back());
             constructed.pop_back();
-            constructed.back() = MakeNodeRef<Key>(Fragment::ANDOR, Vector(std::move(constructed.back()), std::move(mid), MakeNodeRef<Key>(Fragment::JUST_0)));
+            constructed.back() = MakeNodeRef<Key>(ctx, Fragment::ANDOR, Vector(std::move(constructed.back()), std::move(mid), MakeNodeRef<Key>(ctx, Fragment::JUST_0)));
             break;
         }
         case ParseContext::AND_V: {
-            BuildBack(Fragment::AND_V, constructed);
+            BuildBack(ctx, Fragment::AND_V, constructed);
             break;
         }
         case ParseContext::OR_B: {
-            BuildBack(Fragment::OR_B, constructed);
+            BuildBack(ctx, Fragment::OR_B, constructed);
             break;
         }
         case ParseContext::OR_C: {
-            BuildBack(Fragment::OR_C, constructed);
+            BuildBack(ctx, Fragment::OR_C, constructed);
             break;
         }
         case ParseContext::OR_D: {
-            BuildBack(Fragment::OR_D, constructed);
+            BuildBack(ctx, Fragment::OR_D, constructed);
             break;
         }
         case ParseContext::OR_I: {
-            BuildBack(Fragment::OR_I, constructed);
+            BuildBack(ctx, Fragment::OR_I, constructed);
             break;
         }
         case ParseContext::ANDOR: {
@@ -1143,7 +1211,7 @@ inline NodeRef<Key> Parse(Span<const char> in, const Ctx& ctx)
             constructed.pop_back();
             auto mid = std::move(constructed.back());
             constructed.pop_back();
-            constructed.back() = MakeNodeRef<Key>(Fragment::ANDOR, Vector(std::move(constructed.back()), std::move(mid), std::move(right)));
+            constructed.back() = MakeNodeRef<Key>(ctx, Fragment::ANDOR, Vector(std::move(constructed.back()), std::move(mid), std::move(right)));
             break;
         }
         case ParseContext::THRESH: {
@@ -1162,7 +1230,7 @@ inline NodeRef<Key> Parse(Span<const char> in, const Ctx& ctx)
                     constructed.pop_back();
                 }
                 std::reverse(subs.begin(), subs.end());
-                constructed.push_back(MakeNodeRef<Key>(Fragment::THRESH, std::move(subs), k));
+                constructed.push_back(MakeNodeRef<Key>(ctx, Fragment::THRESH, std::move(subs), k));
             } else {
                 return {};
             }
@@ -1197,10 +1265,10 @@ inline NodeRef<Key> Parse(Span<const char> in, const Ctx& ctx)
  * and OP_EQUALVERIFY are decomposed into OP_CHECKSIG, OP_CHECKMULTISIG, OP_EQUAL
  * respectively, plus OP_VERIFY.
  */
-bool DecomposeScript(const CScript& script, std::vector<std::pair<opcodetype, std::vector<unsigned char>>>& out);
+std::optional<std::vector<Opcode>> DecomposeScript(const CScript& script);
 
 /** Determine whether the passed pair (created by DecomposeScript) is pushing a number. */
-bool ParseScriptNumber(const std::pair<opcodetype, std::vector<unsigned char>>& in, int64_t& k);
+std::optional<int64_t> ParseScriptNumber(const Opcode& in);
 
 enum class DecodeContext {
     /** A single expression of type B, K, or V. Specifically, this can't be an
@@ -1297,58 +1365,59 @@ inline NodeRef<Key> DecodeScript(I& in, I last, const Ctx& ctx)
             // Constants
             if (in[0].first == OP_1) {
                 ++in;
-                constructed.push_back(MakeNodeRef<Key>(Fragment::JUST_1));
+                constructed.push_back(MakeNodeRef<Key>(ctx, Fragment::JUST_1));
                 break;
             }
             if (in[0].first == OP_0) {
                 ++in;
-                constructed.push_back(MakeNodeRef<Key>(Fragment::JUST_0));
+                constructed.push_back(MakeNodeRef<Key>(ctx, Fragment::JUST_0));
                 break;
             }
             // Public keys
             if (in[0].second.size() == 33) {
-                Key key;
-                if (!ctx.FromPKBytes(in[0].second.begin(), in[0].second.end(), key)) return {};
+                auto key = ctx.FromPKBytes(in[0].second.begin(), in[0].second.end());
+                if (!key) return {};
                 ++in;
-                constructed.push_back(MakeNodeRef<Key>(Fragment::PK_K, Vector(std::move(key))));
+                constructed.push_back(MakeNodeRef<Key>(ctx, Fragment::PK_K, Vector(std::move(*key))));
                 break;
             }
             if (last - in >= 5 && in[0].first == OP_VERIFY && in[1].first == OP_EQUAL && in[3].first == OP_HASH160 && in[4].first == OP_DUP && in[2].second.size() == 20) {
-                Key key;
-                if (!ctx.FromPKHBytes(in[2].second.begin(), in[2].second.end(), key)) return {};
+                auto key = ctx.FromPKHBytes(in[2].second.begin(), in[2].second.end());
+                if (!key) return {};
                 in += 5;
-                constructed.push_back(MakeNodeRef<Key>(Fragment::PK_H, Vector(std::move(key))));
+                constructed.push_back(MakeNodeRef<Key>(ctx, Fragment::PK_H, Vector(std::move(*key))));
                 break;
             }
             // Time locks
-            if (last - in >= 2 && in[0].first == OP_CHECKSEQUENCEVERIFY && ParseScriptNumber(in[1], k)) {
+            std::optional<int64_t> num;
+            if (last - in >= 2 && in[0].first == OP_CHECKSEQUENCEVERIFY && (num = ParseScriptNumber(in[1]))) {
                 in += 2;
-                if (k < 1 || k > 0x7FFFFFFFL) return {};
-                constructed.push_back(MakeNodeRef<Key>(Fragment::OLDER, k));
+                if (*num < 1 || *num > 0x7FFFFFFFL) return {};
+                constructed.push_back(MakeNodeRef<Key>(ctx, Fragment::OLDER, *num));
                 break;
             }
-            if (last - in >= 2 && in[0].first == OP_CHECKLOCKTIMEVERIFY && ParseScriptNumber(in[1], k)) {
+            if (last - in >= 2 && in[0].first == OP_CHECKLOCKTIMEVERIFY && (num = ParseScriptNumber(in[1]))) {
                 in += 2;
-                if (k < 1 || k > 0x7FFFFFFFL) return {};
-                constructed.push_back(MakeNodeRef<Key>(Fragment::AFTER, k));
+                if (num < 1 || num > 0x7FFFFFFFL) return {};
+                constructed.push_back(MakeNodeRef<Key>(ctx, Fragment::AFTER, *num));
                 break;
             }
             // Hashes
-            if (last - in >= 7 && in[0].first == OP_EQUAL && in[3].first == OP_VERIFY && in[4].first == OP_EQUAL && ParseScriptNumber(in[5], k) && k == 32 && in[6].first == OP_SIZE) {
+            if (last - in >= 7 && in[0].first == OP_EQUAL && in[3].first == OP_VERIFY && in[4].first == OP_EQUAL && (num = ParseScriptNumber(in[5])) && num == 32 && in[6].first == OP_SIZE) {
                 if (in[2].first == OP_SHA256 && in[1].second.size() == 32) {
-                    constructed.push_back(MakeNodeRef<Key>(Fragment::SHA256, in[1].second));
+                    constructed.push_back(MakeNodeRef<Key>(ctx, Fragment::SHA256, in[1].second));
                     in += 7;
                     break;
                 } else if (in[2].first == OP_RIPEMD160 && in[1].second.size() == 20) {
-                    constructed.push_back(MakeNodeRef<Key>(Fragment::RIPEMD160, in[1].second));
+                    constructed.push_back(MakeNodeRef<Key>(ctx, Fragment::RIPEMD160, in[1].second));
                     in += 7;
                     break;
                 } else if (in[2].first == OP_HASH256 && in[1].second.size() == 32) {
-                    constructed.push_back(MakeNodeRef<Key>(Fragment::HASH256, in[1].second));
+                    constructed.push_back(MakeNodeRef<Key>(ctx, Fragment::HASH256, in[1].second));
                     in += 7;
                     break;
                 } else if (in[2].first == OP_HASH160 && in[1].second.size() == 20) {
-                    constructed.push_back(MakeNodeRef<Key>(Fragment::HASH160, in[1].second));
+                    constructed.push_back(MakeNodeRef<Key>(ctx, Fragment::HASH160, in[1].second));
                     in += 7;
                     break;
                 }
@@ -1356,20 +1425,20 @@ inline NodeRef<Key> DecodeScript(I& in, I last, const Ctx& ctx)
             // Multi
             if (last - in >= 3 && in[0].first == OP_CHECKMULTISIG) {
                 std::vector<Key> keys;
-                if (!ParseScriptNumber(in[1], n)) return {};
-                if (last - in < 3 + n) return {};
-                if (n < 1 || n > 20) return {};
-                for (int i = 0; i < n; ++i) {
-                    Key key;
+                const auto n = ParseScriptNumber(in[1]);
+                if (!n || last - in < 3 + *n) return {};
+                if (*n < 1 || *n > 20) return {};
+                for (int i = 0; i < *n; ++i) {
                     if (in[2 + i].second.size() != 33) return {};
-                    if (!ctx.FromPKBytes(in[2 + i].second.begin(), in[2 + i].second.end(), key)) return {};
-                    keys.push_back(std::move(key));
+                    auto key = ctx.FromPKBytes(in[2 + i].second.begin(), in[2 + i].second.end());
+                    if (!key) return {};
+                    keys.push_back(std::move(*key));
                 }
-                if (!ParseScriptNumber(in[2 + n], k)) return {};
-                if (k < 1 || k > n) return {};
-                in += 3 + n;
+                const auto k = ParseScriptNumber(in[2 + *n]);
+                if (!k || *k < 1 || *k > *n) return {};
+                in += 3 + *n;
                 std::reverse(keys.begin(), keys.end());
-                constructed.push_back(MakeNodeRef<Key>(Fragment::MULTI, std::move(keys), k));
+                constructed.push_back(MakeNodeRef<Key>(ctx, Fragment::MULTI, std::move(keys), *k));
                 break;
             }
             /** In the following wrappers, we only need to push SINGLE_BKV_EXPR rather
@@ -1397,10 +1466,10 @@ inline NodeRef<Key> DecodeScript(I& in, I last, const Ctx& ctx)
                 break;
             }
             // Thresh
-            if (last - in >= 3 && in[0].first == OP_EQUAL && ParseScriptNumber(in[1], k)) {
-                if (k < 1) return {};
+            if (last - in >= 3 && in[0].first == OP_EQUAL && (num = ParseScriptNumber(in[1]))) {
+                if (*num < 1) return {};
                 in += 2;
-                to_parse.emplace_back(DecodeContext::THRESH_W, 0, k);
+                to_parse.emplace_back(DecodeContext::THRESH_W, 0, *num);
                 break;
             }
             // OP_ENDIF can be WRAP_J, WRAP_D, ANDOR, OR_C, OR_D, or OR_I
@@ -1464,63 +1533,63 @@ inline NodeRef<Key> DecodeScript(I& in, I last, const Ctx& ctx)
         case DecodeContext::SWAP: {
             if (in >= last || in[0].first != OP_SWAP || constructed.empty()) return {};
             ++in;
-            constructed.back() = MakeNodeRef<Key>(Fragment::WRAP_S, Vector(std::move(constructed.back())));
+            constructed.back() = MakeNodeRef<Key>(ctx, Fragment::WRAP_S, Vector(std::move(constructed.back())));
             break;
         }
         case DecodeContext::ALT: {
             if (in >= last || in[0].first != OP_TOALTSTACK || constructed.empty()) return {};
             ++in;
-            constructed.back() = MakeNodeRef<Key>(Fragment::WRAP_A, Vector(std::move(constructed.back())));
+            constructed.back() = MakeNodeRef<Key>(ctx, Fragment::WRAP_A, Vector(std::move(constructed.back())));
             break;
         }
         case DecodeContext::CHECK: {
             if (constructed.empty()) return {};
-            constructed.back() = MakeNodeRef<Key>(Fragment::WRAP_C, Vector(std::move(constructed.back())));
+            constructed.back() = MakeNodeRef<Key>(ctx, Fragment::WRAP_C, Vector(std::move(constructed.back())));
             break;
         }
         case DecodeContext::DUP_IF: {
             if (constructed.empty()) return {};
-            constructed.back() = MakeNodeRef<Key>(Fragment::WRAP_D, Vector(std::move(constructed.back())));
+            constructed.back() = MakeNodeRef<Key>(ctx, Fragment::WRAP_D, Vector(std::move(constructed.back())));
             break;
         }
         case DecodeContext::VERIFY: {
             if (constructed.empty()) return {};
-            constructed.back() = MakeNodeRef<Key>(Fragment::WRAP_V, Vector(std::move(constructed.back())));
+            constructed.back() = MakeNodeRef<Key>(ctx, Fragment::WRAP_V, Vector(std::move(constructed.back())));
             break;
         }
         case DecodeContext::NON_ZERO: {
             if (constructed.empty()) return {};
-            constructed.back() = MakeNodeRef<Key>(Fragment::WRAP_J, Vector(std::move(constructed.back())));
+            constructed.back() = MakeNodeRef<Key>(ctx, Fragment::WRAP_J, Vector(std::move(constructed.back())));
             break;
         }
         case DecodeContext::ZERO_NOTEQUAL: {
             if (constructed.empty()) return {};
-            constructed.back() = MakeNodeRef<Key>(Fragment::WRAP_N, Vector(std::move(constructed.back())));
+            constructed.back() = MakeNodeRef<Key>(ctx, Fragment::WRAP_N, Vector(std::move(constructed.back())));
             break;
         }
         case DecodeContext::AND_V: {
             if (constructed.size() < 2) return {};
-            BuildBack(Fragment::AND_V, constructed, /*reverse=*/true);
+            BuildBack(ctx, Fragment::AND_V, constructed, /*reverse=*/true);
             break;
         }
         case DecodeContext::AND_B: {
             if (constructed.size() < 2) return {};
-            BuildBack(Fragment::AND_B, constructed, /*reverse=*/true);
+            BuildBack(ctx, Fragment::AND_B, constructed, /*reverse=*/true);
             break;
         }
         case DecodeContext::OR_B: {
             if (constructed.size() < 2) return {};
-            BuildBack(Fragment::OR_B, constructed, /*reverse=*/true);
+            BuildBack(ctx, Fragment::OR_B, constructed, /*reverse=*/true);
             break;
         }
         case DecodeContext::OR_C: {
             if (constructed.size() < 2) return {};
-            BuildBack(Fragment::OR_C, constructed, /*reverse=*/true);
+            BuildBack(ctx, Fragment::OR_C, constructed, /*reverse=*/true);
             break;
         }
         case DecodeContext::OR_D: {
             if (constructed.size() < 2) return {};
-            BuildBack(Fragment::OR_D, constructed, /*reverse=*/true);
+            BuildBack(ctx, Fragment::OR_D, constructed, /*reverse=*/true);
             break;
         }
         case DecodeContext::ANDOR: {
@@ -1530,7 +1599,7 @@ inline NodeRef<Key> DecodeScript(I& in, I last, const Ctx& ctx)
             NodeRef<Key> right = std::move(constructed.back());
             constructed.pop_back();
             NodeRef<Key> mid = std::move(constructed.back());
-            constructed.back() = MakeNodeRef<Key>(Fragment::ANDOR, Vector(std::move(left), std::move(mid), std::move(right)));
+            constructed.back() = MakeNodeRef<Key>(ctx, Fragment::ANDOR, Vector(std::move(left), std::move(mid), std::move(right)));
             break;
         }
         case DecodeContext::THRESH_W: {
@@ -1554,7 +1623,7 @@ inline NodeRef<Key> DecodeScript(I& in, I last, const Ctx& ctx)
                 constructed.pop_back();
                 subs.push_back(std::move(sub));
             }
-            constructed.push_back(MakeNodeRef<Key>(Fragment::THRESH, std::move(subs), k));
+            constructed.push_back(MakeNodeRef<Key>(ctx, Fragment::THRESH, std::move(subs), k));
             break;
         }
         case DecodeContext::ENDIF: {
@@ -1604,7 +1673,7 @@ inline NodeRef<Key> DecodeScript(I& in, I last, const Ctx& ctx)
             if (in >= last) return {};
             if (in[0].first == OP_IF) {
                 ++in;
-                BuildBack(Fragment::OR_I, constructed, /*reverse=*/true);
+                BuildBack(ctx, Fragment::OR_I, constructed, /*reverse=*/true);
             } else if (in[0].first == OP_NOTIF) {
                 ++in;
                 to_parse.emplace_back(DecodeContext::ANDOR, -1, -1);
@@ -1635,12 +1704,12 @@ inline NodeRef<typename Ctx::Key> FromString(const std::string& str, const Ctx&
 template<typename Ctx>
 inline NodeRef<typename Ctx::Key> FromScript(const CScript& script, const Ctx& ctx) {
     using namespace internal;
-    std::vector<std::pair<opcodetype, std::vector<unsigned char>>> decomposed;
-    if (!DecomposeScript(script, decomposed)) return {};
-    auto it = decomposed.begin();
-    auto ret = DecodeScript<typename Ctx::Key>(it, decomposed.end(), ctx);
+    auto decomposed = DecomposeScript(script);
+    if (!decomposed) return {};
+    auto it = decomposed->begin();
+    auto ret = DecodeScript<typename Ctx::Key>(it, decomposed->end(), ctx);
     if (!ret) return {};
-    if (it != decomposed.end()) return {};
+    if (it != decomposed->end()) return {};
     return ret;
 }
 
diff --git a/src/test/fuzz/miniscript.cpp b/src/test/fuzz/miniscript.cpp
new file mode 100644
index 000000000000..591cbc77118f
--- /dev/null
+++ b/src/test/fuzz/miniscript.cpp
@@ -0,0 +1,167 @@
+// 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 <core_io.h>
+#include <hash.h>
+#include <key.h>
+#include <script/miniscript.h>
+#include <script/script.h>
+#include <test/fuzz/FuzzedDataProvider.h>
+#include <test/fuzz/fuzz.h>
+#include <test/fuzz/util.h>
+#include <util/strencodings.h>
+
+namespace {
+
+//! Some pre-computed data for more efficient string roundtrips.
+struct TestData {
+    typedef CPubKey Key;
+
+    // Precomputed public keys.
+    std::vector<Key> dummy_keys;
+    std::map<Key, int> dummy_key_idx_map;
+    std::map<CKeyID, Key> dummy_keys_map;
+
+    //! Set the precomputed data.
+    void Init() {
+        unsigned char keydata[32] = {1};
+        for (size_t i = 0; i < 256; i++) {
+            keydata[31] = i;
+            CKey privkey;
+            privkey.Set(keydata, keydata + 32, true);
+            const Key pubkey = privkey.GetPubKey();
+
+            dummy_keys.push_back(pubkey);
+            dummy_key_idx_map.emplace(pubkey, i);
+            dummy_keys_map.insert({pubkey.GetID(), pubkey});
+        }
+    }
+} TEST_DATA;
+
+/**
+ * Context to parse a Miniscript node to and from Script or text representation.
+ * Uses an integer (an index in the dummy keys array from the test data) as keys in order
+ * to focus on fuzzing the Miniscript nodes' test representation, not the key representation.
+ */
+struct ParserContext {
+    typedef CPubKey Key;
+
+    bool KeyCompare(const Key& a, const Key& b) const {
+        return a < b;
+    }
+
+    std::optional<std::string> ToString(const Key& key) const
+    {
+        auto it = TEST_DATA.dummy_key_idx_map.find(key);
+        if (it == TEST_DATA.dummy_key_idx_map.end()) return {};
+        uint8_t idx = it->second;
+        return HexStr(Span{&idx, 1});
+    }
+
+    template<typename I>
+    std::optional<Key> FromString(I first, I last) const {
+        if (last - first != 2) return {};
+        auto idx = ParseHex(std::string(first, last));
+        if (idx.size() != 1) return {};
+        return TEST_DATA.dummy_keys[idx[0]];
+    }
+
+    template<typename I>
+    std::optional<Key> FromPKBytes(I first, I last) const {
+        Key key;
+        key.Set(first, last);
+        if (!key.IsValid()) return {};
+        return key;
+    }
+
+    template<typename I>
+    std::optional<Key> FromPKHBytes(I first, I last) const {
+        assert(last - first == 20);
+        CKeyID keyid;
+        std::copy(first, last, keyid.begin());
+        const auto it = TEST_DATA.dummy_keys_map.find(keyid);
+        if (it == TEST_DATA.dummy_keys_map.end()) return {};
+        return it->second;
+    }
+} PARSER_CTX;
+
+//! Context that implements naive conversion from/to script only, for roundtrip testing.
+struct ScriptParserContext {
+    //! For Script roundtrip we never need the key from a key hash.
+    struct Key {
+        bool is_hash;
+        std::vector<unsigned char> data;
+    };
+
+    bool KeyCompare(const Key& a, const Key& b) const {
+        return a.data < b.data;
+    }
+
+    const std::vector<unsigned char>& ToPKBytes(const Key& key) const
+    {
+        assert(!key.is_hash);
+        return key.data;
+    }
+
+    const std::vector<unsigned char> ToPKHBytes(const Key& key) const
+    {
+        if (key.is_hash) return key.data;
+        const auto h = Hash160(key.data);
+        return {h.begin(), h.end()};
+    }
+
+    template<typename I>
+    std::optional<Key> FromPKBytes(I first, I last) const
+    {
+        Key key;
+        key.data.assign(first, last);
+        key.is_hash = false;
+        return key;
+    }
+
+    template<typename I>
+    std::optional<Key> FromPKHBytes(I first, I last) const
+    {
+        Key key;
+        key.data.assign(first, last);
+        key.is_hash = true;
+        return key;
+    }
+} SCRIPT_PARSER_CONTEXT;
+
+} // namespace
+
+void FuzzInit()
+{
+    ECC_Start();
+    TEST_DATA.Init();
+}
+
+/* Fuzz tests that test parsing from a string, and roundtripping via string. */
+FUZZ_TARGET(miniscript_string, .init = FuzzInit)
+{
+    FuzzedDataProvider provider(buffer.data(), buffer.size());
+    auto str = provider.ConsumeRemainingBytesAsString();
+    auto parsed = miniscript::FromString(str, PARSER_CTX);
+    if (!parsed) return;
+
+    const auto str2 = parsed->ToString(PARSER_CTX);
+    assert(str2);
+    auto parsed2 = miniscript::FromString(*str2, PARSER_CTX);
+    assert(parsed2);
+    assert(*parsed == *parsed2);
+}
+
+/* Fuzz tests that test parsing from a script, and roundtripping via script. */
+FUZZ_TARGET(miniscript_script)
+{
+    FuzzedDataProvider fuzzed_data_provider(buffer.data(), buffer.size());
+    const std::optional<CScript> script = ConsumeDeserializable<CScript>(fuzzed_data_provider);
+    if (!script) return;
+
+    const auto ms = miniscript::FromScript(*script, SCRIPT_PARSER_CONTEXT);
+    if (!ms) return;
+
+    assert(ms->ToScript(SCRIPT_PARSER_CONTEXT) == *script);
+}
diff --git a/src/test/fuzz/miniscript_decode.cpp b/src/test/fuzz/miniscript_decode.cpp
deleted file mode 100644
index 4cc0a1be8fd8..000000000000
--- a/src/test/fuzz/miniscript_decode.cpp
+++ /dev/null
@@ -1,72 +0,0 @@
-// Copyright (c) 2022 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 <core_io.h>
-#include <hash.h>
-#include <key.h>
-#include <script/miniscript.h>
-#include <script/script.h>
-#include <span.h>
-#include <test/fuzz/FuzzedDataProvider.h>
-#include <test/fuzz/fuzz.h>
-#include <test/fuzz/util.h>
-#include <util/strencodings.h>
-
-#include <optional>
-
-using miniscript::operator""_mst;
-
-
-struct Converter {
-    typedef CPubKey Key;
-
-    bool ToString(const Key& key, std::string& ret) const {
-        ret = HexStr(key);
-        return true;
-    }
-    const std::vector<unsigned char> ToPKBytes(const Key& key) const {
-        return {key.begin(), key.end()};
-    }
-    const std::vector<unsigned char> ToPKHBytes(const Key& key) const {
-        const auto h = Hash160(key);
-        return {h.begin(), h.end()};
-    }
-
-    template<typename I>
-    bool FromString(I first, I last, Key& key) const {
-        const auto bytes = ParseHex(std::string(first, last));
-        key.Set(bytes.begin(), bytes.end());
-        return key.IsValid();
-    }
-    template<typename I>
-    bool FromPKBytes(I first, I last, CPubKey& key) const {
-        key.Set(first, last);
-        return key.IsValid();
-    }
-    template<typename I>
-    bool FromPKHBytes(I first, I last, CPubKey& key) const {
-        assert(last - first == 20);
-        return false;
-    }
-};
-
-const Converter CONVERTER;
-
-FUZZ_TARGET(miniscript_decode)
-{
-    FuzzedDataProvider fuzzed_data_provider(buffer.data(), buffer.size());
-    const std::optional<CScript> script = ConsumeDeserializable<CScript>(fuzzed_data_provider);
-    if (!script) return;
-
-    const auto ms = miniscript::FromScript(*script, CONVERTER);
-    if (!ms) return;
-
-    // We can roundtrip it to its string representation.
-    std::string ms_str;
-    assert(ms->ToString(CONVERTER, ms_str));
-    assert(*miniscript::FromString(ms_str, CONVERTER) == *ms);
-    // The Script representation must roundtrip since we parsed it this way the first time.
-    const CScript ms_script = ms->ToScript(CONVERTER);
-    assert(ms_script == *script);
-}
diff --git a/src/test/miniscript_tests.cpp b/src/test/miniscript_tests.cpp
index 930582ea24c0..3877fea907e8 100644
--- a/src/test/miniscript_tests.cpp
+++ b/src/test/miniscript_tests.cpp
@@ -71,6 +71,10 @@ std::unique_ptr<const TestData> g_testdata;
 struct KeyConverter {
     typedef CPubKey Key;
 
+    bool KeyCompare(const Key& a, const Key& b) const {
+        return a < b;
+    }
+
     //! Convert a public key to bytes.
     std::vector<unsigned char> ToPKBytes(const CPubKey& key) const { return {key.begin(), key.end()}; }
 
@@ -84,27 +88,28 @@ struct KeyConverter {
 
     //! Parse a public key from a range of hex characters.
     template<typename I>
-    bool FromString(I first, I last, CPubKey& key) const {
+    std::optional<Key> FromString(I first, I last) const {
         auto bytes = ParseHex(std::string(first, last));
-        key.Set(bytes.begin(), bytes.end());
-        return key.IsValid();
+        Key key{bytes.begin(), bytes.end()};
+        if (key.IsValid()) return key;
+        return {};
     }
 
     template<typename I>
-    bool FromPKBytes(I first, I last, CPubKey& key) const {
-        key.Set(first, last);
-        return key.IsValid();
+    std::optional<Key> FromPKBytes(I first, I last) const {
+        Key key{first, last};
+        if (key.IsValid()) return key;
+        return {};
     }
 
     template<typename I>
-    bool FromPKHBytes(I first, I last, CPubKey& key) const {
+    std::optional<Key> FromPKHBytes(I first, I last) const {
         assert(last - first == 20);
         CKeyID keyid;
         std::copy(first, last, keyid.begin());
         auto it = g_testdata->pkmap.find(keyid);
         assert(it != g_testdata->pkmap.end());
-        key = it->second;
-        return true;
+        return it->second;
     }
 };
 
@@ -272,6 +277,19 @@ BOOST_AUTO_TEST_CASE(fixed_tests)
     // its subs to all be 'u' (taken from https://github.com/rust-bitcoin/rust-miniscript/discussions/341).
     const auto ms_minimalif = miniscript::FromString("thresh(3,c:pk_k(03d30199d74fb5a22d47b6e054e2f378cedacffcb89904a61d75d0dbd407143e65),sc:pk_k(03fff97bd5755eeea420453a14355235d382f6472f8568a18b2f057a1460297556),sc:pk_k(0279be667ef9dcbbac55a06295ce870b07029bfcdb2dce28d959f2815b16f81798),sdv:older(32))", CONVERTER);
     BOOST_CHECK(!ms_minimalif);
+    // A Miniscript with duplicate keys is not sane
+    const auto ms_dup1 = miniscript::FromString("and_v(v:pk(03d30199d74fb5a22d47b6e054e2f378cedacffcb89904a61d75d0dbd407143e65),pk(03d30199d74fb5a22d47b6e054e2f378cedacffcb89904a61d75d0dbd407143e65))", CONVERTER);
+    BOOST_CHECK(ms_dup1);
+    BOOST_CHECK(!ms_dup1->IsSane() && !ms_dup1->CheckDuplicateKey());
+    // Same with a disjunction, and different key nodes (pk and pkh)
+    const auto ms_dup2 = miniscript::FromString("or_b(c:pk_k(03d30199d74fb5a22d47b6e054e2f378cedacffcb89904a61d75d0dbd407143e65),ac:pk_h(03d30199d74fb5a22d47b6e054e2f378cedacffcb89904a61d75d0dbd407143e65))", CONVERTER);
+    BOOST_CHECK(ms_dup2 && !ms_dup2->IsSane() && !ms_dup2->CheckDuplicateKey());
+    // Same when the duplicates are leaves or a larger tree
+    const auto ms_dup3 = miniscript::FromString("or_i(and_b(pk(03d30199d74fb5a22d47b6e054e2f378cedacffcb89904a61d75d0dbd407143e65),s:pk(03fff97bd5755eeea420453a14355235d382f6472f8568a18b2f057a1460297556)),and_b(older(1),s:pk(03d30199d74fb5a22d47b6e054e2f378cedacffcb89904a61d75d0dbd407143e65)))", CONVERTER);
+    BOOST_CHECK(ms_dup3 && !ms_dup3->IsSane() && !ms_dup3->CheckDuplicateKey());
+    // Same when the duplicates are on different levels in the tree
+    const auto ms_dup4 = miniscript::FromString("thresh(2,pkh(03d30199d74fb5a22d47b6e054e2f378cedacffcb89904a61d75d0dbd407143e65),s:pk(03fff97bd5755eeea420453a14355235d382f6472f8568a18b2f057a1460297556),a:and_b(dv:older(1),s:pk(03d30199d74fb5a22d47b6e054e2f378cedacffcb89904a61d75d0dbd407143e65)))", CONVERTER);
+    BOOST_CHECK(ms_dup4 && !ms_dup4->IsSane() && !ms_dup4->CheckDuplicateKey());
 
     // Timelock tests
     Test("after(100)", "?", TESTMODE_VALID | TESTMODE_NONMAL); // only heightlock

From 0beeb91b762f142b433dc7fbff8de79004d020e5 Mon Sep 17 00:00:00 2001
From: MacroFake <falke.marco@gmail.com>
Date: Sat, 30 Jul 2022 17:48:31 +0200
Subject: [PATCH 271/656] Merge bitcoin/bitcoin#25709: script: actually trigger
 the optimization in BuildScript

00897d0677c2cb6609b90d52b89907c8b50d6de0 script: actually trigger the optimization in BuildScript (Antoine Poinsot)

Pull request description:

  The counter is an optimization over calling `ret.empty()`. It was
  suggested that the compiler would realize `cnt` is only `0` on the first
  iteration, and not actually emit the check and conditional.

  This optimization was actually not triggered at all, since we
  incremented `cnt` at the beginning of the first iteration. Fix it by
  incrementing at the end instead.

  This was reported by Github user "Janus".

  Fixes #25682. Note this does *not* change semantics. It only allows the optimization of moving instead of copying on first `CScript` element to actually be reachable.

ACKs for top commit:
  sipa:
    utACK 00897d0677c2cb6609b90d52b89907c8b50d6de0
  MarcoFalke:
    review ACK 00897d0677c2cb6609b90d52b89907c8b50d6de0

Tree-SHA512: b575bd444b0cd2fe754ec5f3e2f3f53d2696d5dcebedcace1e38be372c82365e75938dfe185429ed5a83efe1a395e204bfb33efe56c10defc5811eaee50580e3
---
 src/script/script.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/script/script.h b/src/script/script.h
index 8e4bf786987c..9ec21a048a65 100644
--- a/src/script/script.h
+++ b/src/script/script.h
@@ -554,7 +554,6 @@ CScript BuildScript(Ts&&... inputs)
     int cnt{0};
 
     ([&ret, &cnt] (Ts&& input) {
-        cnt++;
         if constexpr (std::is_same_v<std::remove_cv_t<std::remove_reference_t<Ts>>, CScript>) {
             // If it is a CScript, extend ret with it. Move or copy the first element instead.
             if (cnt == 0) {
@@ -566,6 +565,7 @@ CScript BuildScript(Ts&&... inputs)
             // Otherwise invoke CScript::operator<<.
             ret << input;
         }
+        cnt++;
     } (std::forward<Ts>(inputs)), ...);
 
     return ret;

From 696b926504be4ce6ccc5031c605d6d79e37356aa Mon Sep 17 00:00:00 2001
From: UdjinM6 <UdjinM6@users.noreply.github.com>
Date: Mon, 27 Oct 2025 01:53:23 +0300
Subject: [PATCH 272/656] fix: potential race condition in ProcessNewChainLock

---
 src/chainlock/chainlock.cpp | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/chainlock/chainlock.cpp b/src/chainlock/chainlock.cpp
index bb4380170cf0..39154d30d2d2 100644
--- a/src/chainlock/chainlock.cpp
+++ b/src/chainlock/chainlock.cpp
@@ -135,7 +135,7 @@ MessageProcessingResult CChainLocksHandler::ProcessNewChainLock(const NodeId fro
         }
 
         if (!bestChainLock.IsNull() && clsig.getHeight() <= bestChainLock.getHeight()) {
-            // no need to process/relay older CLSIGs
+            // no need to process older/same CLSIGs
             return {};
         }
     }
@@ -154,6 +154,11 @@ MessageProcessingResult CChainLocksHandler::ProcessNewChainLock(const NodeId fro
 
     {
         LOCK(cs);
+        // newer chainlock could be processed via another thread while we were not holding the lock, re-verify
+        if (!bestChainLock.IsNull() && clsig.getHeight() <= bestChainLock.getHeight()) {
+            // no need to process older/same CLSIGs
+            return {};
+        }
         bestChainLockHash = hash;
         bestChainLock = clsig;
 

From 9d647e8e3d12c60fa1ac35e898309cda41272242 Mon Sep 17 00:00:00 2001
From: Kittywhiskers Van Gogh <63189531+kwvg@users.noreply.github.com>
Date: Tue, 28 Oct 2025 16:58:01 +0530
Subject: [PATCH 273/656] refactor: remove unused code

`votedFundingYesTriggerHash` was moved to GovernanceSigner but the old
definition still lingered around, get rid of it.
---
 src/governance/governance.cpp | 23 -----------------------
 src/governance/governance.h   |  2 --
 2 files changed, 25 deletions(-)

diff --git a/src/governance/governance.cpp b/src/governance/governance.cpp
index 9d193de7036c..e4e7b93d7c0b 100644
--- a/src/governance/governance.cpp
+++ b/src/governance/governance.cpp
@@ -27,8 +27,6 @@
 #include <util/time.h>
 #include <validation.h>
 
-int nSubmittedFinalBudget;
-
 const std::string GovernanceStore::SERIALIZATION_VERSION_STRING = "CGovernanceManager-Version-16";
 
 namespace {
@@ -80,7 +78,6 @@ CGovernanceManager::CGovernanceManager(CMasternodeMetaMan& mn_metaman, CNetFulfi
     nCachedBlockHeight(0),
     mapPostponedObjects(),
     fRateChecksEnabled(true),
-    votedFundingYesTriggerHash(std::nullopt),
     mapTrigger{}
 {
 }
@@ -596,15 +593,6 @@ CGovernanceObject* CGovernanceManager::FindGovernanceObjectByDataHash(const uint
     return nullptr;
 }
 
-void CGovernanceManager::DeleteGovernanceObject(const uint256& nHash)
-{
-    LOCK(cs);
-
-    if (mapObjects.count(nHash)) {
-        mapObjects.erase(nHash);
-    }
-}
-
 std::vector<CGovernanceVote> CGovernanceManager::GetCurrentVotes(const uint256& nParentHash, const COutPoint& mnCollateralOutpointFilter) const
 {
     LOCK(cs);
@@ -660,17 +648,6 @@ void CGovernanceManager::GetAllNewerThan(std::vector<CGovernanceObject>& objs, i
     }
 }
 
-//
-// Sort by votes, if there's a tie sort by their feeHash TX
-//
-struct sortProposalsByVotes {
-    bool operator()(const std::pair<CGovernanceObject*, int>& left, const std::pair<CGovernanceObject*, int>& right) const
-    {
-        if (left.second != right.second) return (left.second > right.second);
-        return (UintToArith256(left.first->GetCollateralHash()) > UintToArith256(right.first->GetCollateralHash()));
-    }
-};
-
 bool CGovernanceManager::ConfirmInventoryRequest(const CInv& inv)
 {
     // do not request objects until it's time to sync
diff --git a/src/governance/governance.h b/src/governance/governance.h
index 43d3979bdcd4..bf26e812188c 100644
--- a/src/governance/governance.h
+++ b/src/governance/governance.h
@@ -265,7 +265,6 @@ class CGovernanceManager : public GovernanceStore, public GovernanceSignerParent
     std::set<uint256> setAdditionalRelayObjects;
     std::map<uint256, std::chrono::seconds> m_requested_hash_time;
     bool fRateChecksEnabled;
-    std::optional<uint256> votedFundingYesTriggerHash;
     std::map<uint256, std::shared_ptr<CSuperblock>> mapTrigger;
 
     mutable Mutex cs_relay;
@@ -302,7 +301,6 @@ class CGovernanceManager : public GovernanceStore, public GovernanceSignerParent
     const CGovernanceObject* FindConstGovernanceObject(const uint256& nHash) const EXCLUSIVE_LOCKS_REQUIRED(cs);
     CGovernanceObject* FindGovernanceObject(const uint256& nHash) override EXCLUSIVE_LOCKS_REQUIRED(!cs);
     CGovernanceObject* FindGovernanceObjectByDataHash(const uint256& nDataHash) override EXCLUSIVE_LOCKS_REQUIRED(!cs);
-    void DeleteGovernanceObject(const uint256& nHash);
 
     // These commands are only used in RPC
     std::vector<CGovernanceVote> GetCurrentVotes(const uint256& nParentHash, const COutPoint& mnCollateralOutpointFilter) const;

From 249d021a8c328575715f85e4f9d888ee8e359810 Mon Sep 17 00:00:00 2001
From: Kittywhiskers Van Gogh <63189531+kwvg@users.noreply.github.com>
Date: Thu, 23 Oct 2025 05:03:27 +0530
Subject: [PATCH 274/656] refactor: guard all `GovernanceStore` vars, move
 `cmapVoteToObject`

`cmapVoteToObject` isn't (de)ser'ed so we move it to the manager and
don't consider it for the mutex
---
 src/governance/governance.cpp | 27 ++++++++++++++++++++-------
 src/governance/governance.h   | 16 +++++++++-------
 2 files changed, 29 insertions(+), 14 deletions(-)

diff --git a/src/governance/governance.cpp b/src/governance/governance.cpp
index e4e7b93d7c0b..eae314ee378e 100644
--- a/src/governance/governance.cpp
+++ b/src/governance/governance.cpp
@@ -57,7 +57,6 @@ GovernanceStore::GovernanceStore() :
     cs(),
     mapObjects(),
     mapErasedGovernanceObjects(),
-    cmapVoteToObject(MAX_CACHE_SIZE),
     cmapInvalidVotes(MAX_CACHE_SIZE),
     cmmapOrphanVotes(MAX_CACHE_SIZE),
     mapLastMasternodeObject(),
@@ -76,6 +75,7 @@ CGovernanceManager::CGovernanceManager(CMasternodeMetaMan& mn_metaman, CNetFulfi
     m_mn_sync{mn_sync},
     nTimeLastDiff(0),
     nCachedBlockHeight(0),
+    cmapVoteToObject(MAX_CACHE_SIZE),
     mapPostponedObjects(),
     fRateChecksEnabled(true),
     mapTrigger{}
@@ -352,6 +352,8 @@ MessageProcessingResult CGovernanceManager::ProcessMessage(CNode& peer, CConnman
 
 void CGovernanceManager::CheckOrphanVotes(CGovernanceObject& govobj)
 {
+    LOCK(cs);
+
     AssertLockNotHeld(cs_relay);
     uint256 nHash = govobj.GetHash();
     std::vector<vote_time_pair_t> vecVotePairs;
@@ -794,6 +796,8 @@ void CGovernanceManager::MasternodeRateUpdate(const CGovernanceObject& govobj)
 {
     if (govobj.GetObjectType() != GovernanceObject::TRIGGER) return;
 
+    LOCK(cs);
+
     const COutPoint& masternodeOutpoint = govobj.GetMasternodeOutpoint();
     auto it = mapLastMasternodeObject.find(masternodeOutpoint);
 
@@ -1047,6 +1051,7 @@ void CGovernanceManager::RequestGovernanceObject(CNode* pfrom, const uint256& nH
 
 void CGovernanceManager::AddInvalidVote(const CGovernanceVote& vote)
 {
+    LOCK(cs);
     cmapInvalidVotes.Insert(vote.GetHash(), vote);
 }
 
@@ -1228,16 +1233,20 @@ void CGovernanceManager::InitOnLoad()
 void GovernanceStore::Clear()
 {
     LOCK(cs);
-
-    LogPrint(BCLog::GOBJECT, "Governance object manager was cleared\n");
     mapObjects.clear();
     mapErasedGovernanceObjects.clear();
-    cmapVoteToObject.Clear();
     cmapInvalidVotes.Clear();
     cmmapOrphanVotes.Clear();
     mapLastMasternodeObject.clear();
 }
 
+void CGovernanceManager::Clear()
+{
+    LogPrint(BCLog::GOBJECT, "Governance object manager was cleared\n");
+    GovernanceStore::Clear();
+    cmapVoteToObject.Clear();
+}
+
 std::string GovernanceStore::ToString() const
 {
     LOCK(cs);
@@ -1260,10 +1269,14 @@ std::string GovernanceStore::ToString() const
         }
     }
 
-    return strprintf("Governance Objects: %d (Proposals: %d, Triggers: %d, Other: %d; Erased: %d), Votes: %d",
+    return strprintf("Governance Objects: %d (Proposals: %d, Triggers: %d, Other: %d; Erased: %d)",
         (int)mapObjects.size(),
-        nProposalCount, nTriggerCount, nOtherCount, (int)mapErasedGovernanceObjects.size(),
-        (int)cmapVoteToObject.GetSize());
+        nProposalCount, nTriggerCount, nOtherCount, (int)mapErasedGovernanceObjects.size());
+}
+
+std::string CGovernanceManager::ToString() const
+{
+    return strprintf("%s, Votes: %d", GovernanceStore::ToString(), (int)cmapVoteToObject.GetSize());
 }
 
 UniValue CGovernanceManager::ToJson() const
diff --git a/src/governance/governance.h b/src/governance/governance.h
index bf26e812188c..d564982e10f2 100644
--- a/src/governance/governance.h
+++ b/src/governance/governance.h
@@ -170,7 +170,6 @@ class GovernanceStore
         bool fStatusOK;
     };
 
-    using object_ref_cm_t = CacheMap<uint256, CGovernanceObject*>;
     using txout_m_t = std::map<COutPoint, last_object_rec>;
     using vote_cmm_t = CacheMultiMap<uint256, vote_time_pair_t>;
 
@@ -188,13 +187,12 @@ class GovernanceStore
     // mapErasedGovernanceObjects contains key-value pairs, where
     //   key   - governance object's hash
     //   value - expiration time for deleted objects
-    std::map<uint256, int64_t> mapErasedGovernanceObjects;
-    object_ref_cm_t cmapVoteToObject;
-    CacheMap<uint256, CGovernanceVote> cmapInvalidVotes;
-    vote_cmm_t cmmapOrphanVotes;
-    txout_m_t mapLastMasternodeObject;
+    std::map<uint256, int64_t> mapErasedGovernanceObjects GUARDED_BY(cs);
+    CacheMap<uint256, CGovernanceVote> cmapInvalidVotes GUARDED_BY(cs);
+    vote_cmm_t cmmapOrphanVotes GUARDED_BY(cs);
+    txout_m_t mapLastMasternodeObject GUARDED_BY(cs);
     // used to check for changed voting keys
-    std::shared_ptr<CDeterministicMNList> lastMNListForVotingKeys;
+    std::shared_ptr<CDeterministicMNList> lastMNListForVotingKeys GUARDED_BY(cs);
 
 public:
     GovernanceStore();
@@ -247,6 +245,7 @@ class CGovernanceManager : public GovernanceStore, public GovernanceSignerParent
 
 private:
     using db_type = CFlatDB<GovernanceStore>;
+    using object_ref_cm_t = CacheMap<uint256, CGovernanceObject*>;
 
 private:
     const std::unique_ptr<db_type> m_db;
@@ -261,6 +260,7 @@ class CGovernanceManager : public GovernanceStore, public GovernanceSignerParent
     int64_t nTimeLastDiff;
     // keep track of current block height
     int nCachedBlockHeight;
+    object_ref_cm_t cmapVoteToObject;
     std::map<uint256, CGovernanceObject> mapPostponedObjects;
     std::set<uint256> setAdditionalRelayObjects;
     std::map<uint256, std::chrono::seconds> m_requested_hash_time;
@@ -309,9 +309,11 @@ class CGovernanceManager : public GovernanceStore, public GovernanceSignerParent
     void AddGovernanceObject(CGovernanceObject& govobj, const CNode* pfrom = nullptr) override
         EXCLUSIVE_LOCKS_REQUIRED(!cs_relay);
 
+    void Clear();
     void CheckAndRemove();
 
     UniValue ToJson() const;
+    std::string ToString() const;
 
     void UpdatedBlockTip(const CBlockIndex* pindex) EXCLUSIVE_LOCKS_REQUIRED(!cs_relay);
     int64_t GetLastDiffTime() const { return nTimeLastDiff; }

From 4080ee992c5e17ae5d0be5454c9ac01a9915462d Mon Sep 17 00:00:00 2001
From: Kittywhiskers Van Gogh <63189531+kwvg@users.noreply.github.com>
Date: Mon, 15 Sep 2025 18:01:25 +0000
Subject: [PATCH 275/656] refactor: group together public accessor functions

Review with `git log -p -n1 --color-moved=dimmed_zebra`.
---
 src/governance/governance.h | 26 +++++++++++---------------
 1 file changed, 11 insertions(+), 15 deletions(-)

diff --git a/src/governance/governance.h b/src/governance/governance.h
index d564982e10f2..4f42c3f30f27 100644
--- a/src/governance/governance.h
+++ b/src/governance/governance.h
@@ -299,7 +299,6 @@ class CGovernanceManager : public GovernanceStore, public GovernanceSignerParent
                                                          CDataStream& vRecv) EXCLUSIVE_LOCKS_REQUIRED(!cs_relay);
 
     const CGovernanceObject* FindConstGovernanceObject(const uint256& nHash) const EXCLUSIVE_LOCKS_REQUIRED(cs);
-    CGovernanceObject* FindGovernanceObject(const uint256& nHash) override EXCLUSIVE_LOCKS_REQUIRED(!cs);
     CGovernanceObject* FindGovernanceObjectByDataHash(const uint256& nDataHash) override EXCLUSIVE_LOCKS_REQUIRED(!cs);
 
     // These commands are only used in RPC
@@ -321,19 +320,20 @@ class CGovernanceManager : public GovernanceStore, public GovernanceSignerParent
 
     int GetCachedBlockHeight() const override { return nCachedBlockHeight; }
 
-    // Accessors for thread-safe access to maps
+    // Thread-safe accessors
+    bool GetBestSuperblock(const CDeterministicMNList& tip_mn_list, CSuperblock_sptr& pSuperblockRet,
+                           int nBlockHeight) override EXCLUSIVE_LOCKS_REQUIRED(!cs);
     bool HaveObjectForHash(const uint256& nHash) const;
-
     bool HaveVoteForHash(const uint256& nHash) const;
-
-    int GetVoteCount() const;
-
     bool SerializeObjectForHash(const uint256& nHash, CDataStream& ss) const;
-
     bool SerializeVoteForHash(const uint256& nHash, CDataStream& ss) const;
-
+    CGovernanceObject* FindGovernanceObject(const uint256& nHash) override EXCLUSIVE_LOCKS_REQUIRED(!cs);
+    int GetVoteCount() const;
     void AddPostponedObject(const CGovernanceObject& govobj);
 
+    // Thread-safe accessors for trigger management
+    std::vector<std::shared_ptr<CSuperblock>> GetActiveTriggers() const override EXCLUSIVE_LOCKS_REQUIRED(!cs);
+
     void MasternodeRateUpdate(const CGovernanceObject& govobj);
 
     bool MasternodeRateCheck(const CGovernanceObject& govobj, bool fUpdateFailStatus = false) override;
@@ -362,7 +362,6 @@ class CGovernanceManager : public GovernanceStore, public GovernanceSignerParent
      *   - Track governance objects which are triggers
      *   - After triggers are activated and executed, they can be removed
     */
-    std::vector<std::shared_ptr<CSuperblock>> GetActiveTriggers() const override EXCLUSIVE_LOCKS_REQUIRED(!cs);
     bool AddNewTrigger(uint256 nHash) EXCLUSIVE_LOCKS_REQUIRED(cs);
     void CleanAndRemoveTriggers() EXCLUSIVE_LOCKS_REQUIRED(cs);
 
@@ -386,18 +385,15 @@ class CGovernanceManager : public GovernanceStore, public GovernanceSignerParent
     bool IsValidSuperblock(const CChain& active_chain, const CDeterministicMNList& tip_mn_list,
                            const CTransaction& txNew, int nBlockHeight, CAmount blockReward);
 
-    bool GetBestSuperblock(const CDeterministicMNList& tip_mn_list, CSuperblock_sptr& pSuperblockRet,
-                           int nBlockHeight) override EXCLUSIVE_LOCKS_REQUIRED(!cs);
-
     std::vector<std::shared_ptr<const CGovernanceObject>> GetApprovedProposals(const CDeterministicMNList& tip_mn_list) override
         EXCLUSIVE_LOCKS_REQUIRED(!cs);
 
 private:
-    //! Internal functions that require locks to be held
-    CGovernanceObject* FindGovernanceObjectInternal(const uint256& nHash) EXCLUSIVE_LOCKS_REQUIRED(cs);
-    std::vector<std::shared_ptr<CSuperblock>> GetActiveTriggersInternal() const EXCLUSIVE_LOCKS_REQUIRED(cs);
+    // Internal counterparts to "Thread-safe accessors"
     bool GetBestSuperblockInternal(const CDeterministicMNList& tip_mn_list, CSuperblock_sptr& pSuperblockRet,
                                    int nBlockHeight) EXCLUSIVE_LOCKS_REQUIRED(cs);
+    CGovernanceObject* FindGovernanceObjectInternal(const uint256& nHash) EXCLUSIVE_LOCKS_REQUIRED(cs);
+    std::vector<std::shared_ptr<CSuperblock>> GetActiveTriggersInternal() const EXCLUSIVE_LOCKS_REQUIRED(cs);
 
     void ExecuteBestSuperblock(const CDeterministicMNList& tip_mn_list, int nBlockHeight);
 

From 423c1eb8401f90a2ddeca41b1b48ee987261d1be Mon Sep 17 00:00:00 2001
From: Kittywhiskers Van Gogh <63189531+kwvg@users.noreply.github.com>
Date: Thu, 23 Oct 2025 00:07:20 +0530
Subject: [PATCH 276/656] refactor: add `cs` annotations for accessor functions

---
 src/governance/governance.cpp | 10 +++++++--
 src/governance/governance.h   | 38 ++++++++++++++++++++++++-----------
 2 files changed, 34 insertions(+), 14 deletions(-)

diff --git a/src/governance/governance.cpp b/src/governance/governance.cpp
index eae314ee378e..39c30016a505 100644
--- a/src/governance/governance.cpp
+++ b/src/governance/governance.cpp
@@ -203,7 +203,13 @@ bool CGovernanceManager::SerializeVoteForHash(const uint256& nHash, CDataStream&
 void CGovernanceManager::AddPostponedObject(const CGovernanceObject& govobj)
 {
     LOCK(cs);
-    mapPostponedObjects.emplace(govobj.GetHash(), govobj);
+    AddPostponedObjectInternal(govobj);
+}
+
+void CGovernanceManager::AddPostponedObjectInternal(const CGovernanceObject& govobj)
+{
+    AssertLockHeld(cs);
+    mapPostponedObjects.insert(std::make_pair(govobj.GetHash(), govobj));
 }
 
 MessageProcessingResult CGovernanceManager::ProcessMessage(CNode& peer, CConnman& connman, std::string_view msg_type,
@@ -289,7 +295,7 @@ MessageProcessingResult CGovernanceManager::ProcessMessage(CNode& peer, CConnman
 
         if (!fIsValid) {
             if (fMissingConfirmations) {
-                AddPostponedObject(govobj);
+                AddPostponedObjectInternal(govobj);
                 LogPrintf("MNGOVERNANCEOBJECT -- Not enough fee confirmations for: %s, strError = %s\n", strHash, strError);
             } else {
                 LogPrint(BCLog::GOBJECT, "MNGOVERNANCEOBJECT -- Governance object is invalid - %s\n", strError);
diff --git a/src/governance/governance.h b/src/governance/governance.h
index 4f42c3f30f27..20c48fee9f23 100644
--- a/src/governance/governance.h
+++ b/src/governance/governance.h
@@ -322,17 +322,26 @@ class CGovernanceManager : public GovernanceStore, public GovernanceSignerParent
 
     // Thread-safe accessors
     bool GetBestSuperblock(const CDeterministicMNList& tip_mn_list, CSuperblock_sptr& pSuperblockRet,
-                           int nBlockHeight) override EXCLUSIVE_LOCKS_REQUIRED(!cs);
-    bool HaveObjectForHash(const uint256& nHash) const;
-    bool HaveVoteForHash(const uint256& nHash) const;
-    bool SerializeObjectForHash(const uint256& nHash, CDataStream& ss) const;
-    bool SerializeVoteForHash(const uint256& nHash, CDataStream& ss) const;
-    CGovernanceObject* FindGovernanceObject(const uint256& nHash) override EXCLUSIVE_LOCKS_REQUIRED(!cs);
-    int GetVoteCount() const;
-    void AddPostponedObject(const CGovernanceObject& govobj);
+                           int nBlockHeight) override
+        EXCLUSIVE_LOCKS_REQUIRED(!cs);
+    bool HaveObjectForHash(const uint256& nHash) const
+        EXCLUSIVE_LOCKS_REQUIRED(!cs);
+    bool HaveVoteForHash(const uint256& nHash) const
+        EXCLUSIVE_LOCKS_REQUIRED(!cs);
+    bool SerializeObjectForHash(const uint256& nHash, CDataStream& ss) const
+        EXCLUSIVE_LOCKS_REQUIRED(!cs);
+    bool SerializeVoteForHash(const uint256& nHash, CDataStream& ss) const
+        EXCLUSIVE_LOCKS_REQUIRED(!cs);
+    CGovernanceObject* FindGovernanceObject(const uint256& nHash) override
+        EXCLUSIVE_LOCKS_REQUIRED(!cs);
+    int GetVoteCount() const
+        EXCLUSIVE_LOCKS_REQUIRED(!cs);
+    void AddPostponedObject(const CGovernanceObject& govobj)
+        EXCLUSIVE_LOCKS_REQUIRED(!cs);
 
     // Thread-safe accessors for trigger management
-    std::vector<std::shared_ptr<CSuperblock>> GetActiveTriggers() const override EXCLUSIVE_LOCKS_REQUIRED(!cs);
+    std::vector<std::shared_ptr<CSuperblock>> GetActiveTriggers() const override
+        EXCLUSIVE_LOCKS_REQUIRED(!cs);
 
     void MasternodeRateUpdate(const CGovernanceObject& govobj);
 
@@ -390,10 +399,15 @@ class CGovernanceManager : public GovernanceStore, public GovernanceSignerParent
 
 private:
     // Internal counterparts to "Thread-safe accessors"
+    void AddPostponedObjectInternal(const CGovernanceObject& govobj)
+        EXCLUSIVE_LOCKS_REQUIRED(cs);
     bool GetBestSuperblockInternal(const CDeterministicMNList& tip_mn_list, CSuperblock_sptr& pSuperblockRet,
-                                   int nBlockHeight) EXCLUSIVE_LOCKS_REQUIRED(cs);
-    CGovernanceObject* FindGovernanceObjectInternal(const uint256& nHash) EXCLUSIVE_LOCKS_REQUIRED(cs);
-    std::vector<std::shared_ptr<CSuperblock>> GetActiveTriggersInternal() const EXCLUSIVE_LOCKS_REQUIRED(cs);
+                                   int nBlockHeight)
+        EXCLUSIVE_LOCKS_REQUIRED(cs);
+    CGovernanceObject* FindGovernanceObjectInternal(const uint256& nHash)
+        EXCLUSIVE_LOCKS_REQUIRED(cs);
+    std::vector<std::shared_ptr<CSuperblock>> GetActiveTriggersInternal() const
+        EXCLUSIVE_LOCKS_REQUIRED(cs);
 
     void ExecuteBestSuperblock(const CDeterministicMNList& tip_mn_list, int nBlockHeight);
 

From 17312727c352ca72874fd82c1fdde09b22508edd Mon Sep 17 00:00:00 2001
From: Kittywhiskers Van Gogh <63189531+kwvg@users.noreply.github.com>
Date: Tue, 28 Oct 2025 15:55:19 +0530
Subject: [PATCH 277/656] refactor: protect `GovernanceStore::cs`, add accessor
 to remove ext. use

---
 src/governance/governance.cpp | 10 ++++++++--
 src/governance/governance.h   |  8 +++++---
 src/rpc/governance.cpp        |  7 ++-----
 3 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/src/governance/governance.cpp b/src/governance/governance.cpp
index 39c30016a505..6b713e5acc49 100644
--- a/src/governance/governance.cpp
+++ b/src/governance/governance.cpp
@@ -568,6 +568,12 @@ void CGovernanceManager::CheckAndRemove()
 }
 
 const CGovernanceObject* CGovernanceManager::FindConstGovernanceObject(const uint256& nHash) const
+{
+    LOCK(cs);
+    return FindConstGovernanceObjectInternal(nHash);
+}
+
+const CGovernanceObject* CGovernanceManager::FindConstGovernanceObjectInternal(const uint256& nHash) const
 {
     AssertLockHeld(cs);
 
@@ -1039,7 +1045,7 @@ void CGovernanceManager::RequestGovernanceObject(CNode* pfrom, const uint256& nH
     size_t nVoteCount = 0;
     if (fUseFilter) {
         LOCK(cs);
-        const CGovernanceObject* pObj = FindConstGovernanceObject(nHash);
+        const CGovernanceObject* pObj = FindConstGovernanceObjectInternal(nHash);
 
         if (pObj) {
             filter = CBloomFilter(Params().GetConsensus().nGovernanceFilterElements, GOVERNANCE_FILTER_FP_RATE, GetRand<int>(/*nMax=*/999999), BLOOM_UPDATE_ALL);
@@ -1562,7 +1568,7 @@ std::vector<CSuperblock_sptr> CGovernanceManager::GetActiveTriggersInternal() co
 
     // LOOK AT THESE OBJECTS AND COMPILE A VALID LIST OF TRIGGERS
     for (const auto& pair : mapTrigger) {
-        const CGovernanceObject* pObj = FindConstGovernanceObject(pair.first);
+        const CGovernanceObject* pObj = FindConstGovernanceObjectInternal(pair.first);
         if (pObj) {
             vecResults.push_back(pair.second);
         }
diff --git a/src/governance/governance.h b/src/governance/governance.h
index 20c48fee9f23..e3f11d848ad3 100644
--- a/src/governance/governance.h
+++ b/src/governance/governance.h
@@ -177,11 +177,10 @@ class GovernanceStore
     static constexpr int MAX_CACHE_SIZE = 1000000;
     static const std::string SERIALIZATION_VERSION_STRING;
 
-public:
+protected:
     // critical section to protect the inner data structures
     mutable RecursiveMutex cs;
 
-protected:
     // keep track of the scanning errors
     std::map<uint256, CGovernanceObject> mapObjects GUARDED_BY(cs);
     // mapErasedGovernanceObjects contains key-value pairs, where
@@ -298,7 +297,6 @@ class CGovernanceManager : public GovernanceStore, public GovernanceSignerParent
     [[nodiscard]] MessageProcessingResult ProcessMessage(CNode& peer, CConnman& connman, std::string_view msg_type,
                                                          CDataStream& vRecv) EXCLUSIVE_LOCKS_REQUIRED(!cs_relay);
 
-    const CGovernanceObject* FindConstGovernanceObject(const uint256& nHash) const EXCLUSIVE_LOCKS_REQUIRED(cs);
     CGovernanceObject* FindGovernanceObjectByDataHash(const uint256& nDataHash) override EXCLUSIVE_LOCKS_REQUIRED(!cs);
 
     // These commands are only used in RPC
@@ -339,6 +337,8 @@ class CGovernanceManager : public GovernanceStore, public GovernanceSignerParent
     void AddPostponedObject(const CGovernanceObject& govobj)
         EXCLUSIVE_LOCKS_REQUIRED(!cs);
 
+    const CGovernanceObject* FindConstGovernanceObject(const uint256& nHash) const EXCLUSIVE_LOCKS_REQUIRED(!cs);
+
     // Thread-safe accessors for trigger management
     std::vector<std::shared_ptr<CSuperblock>> GetActiveTriggers() const override
         EXCLUSIVE_LOCKS_REQUIRED(!cs);
@@ -409,6 +409,8 @@ class CGovernanceManager : public GovernanceStore, public GovernanceSignerParent
     std::vector<std::shared_ptr<CSuperblock>> GetActiveTriggersInternal() const
         EXCLUSIVE_LOCKS_REQUIRED(cs);
 
+    const CGovernanceObject* FindConstGovernanceObjectInternal(const uint256& nHash) const EXCLUSIVE_LOCKS_REQUIRED(cs);
+
     void ExecuteBestSuperblock(const CDeterministicMNList& tip_mn_list, int nBlockHeight);
 
     void RequestGovernanceObject(CNode* pfrom, const uint256& nHash, CConnman& connman, bool fUseFilter = false) const;
diff --git a/src/rpc/governance.cpp b/src/rpc/governance.cpp
index 861678e0216a..42bec108ed1c 100644
--- a/src/rpc/governance.cpp
+++ b/src/rpc/governance.cpp
@@ -414,7 +414,6 @@ static UniValue VoteWithMasternodes(const JSONRPCRequest& request, const CWallet
     const NodeContext& node = EnsureAnyNodeContext(request.context);
     CHECK_NONFATAL(node.govman);
     {
-        LOCK(node.govman->cs);
         const CGovernanceObject *pGovObj = node.govman->FindConstGovernanceObject(hash);
         if (!pGovObj) {
             throw JSONRPCError(RPC_INVALID_PARAMETER, "Governance object not found");
@@ -604,7 +603,7 @@ static UniValue ListObjects(CGovernanceManager& govman, const CDeterministicMNLi
         g_txindex->BlockUntilSyncedToCurrentChain();
     }
 
-    LOCK2(cs_main, govman.cs);
+    LOCK(cs_main);
 
     std::vector<CGovernanceObject> objs;
     govman.GetAllNewerThan(objs, nStartTime);
@@ -729,7 +728,7 @@ static RPCHelpMan gobject_get()
     const ChainstateManager& chainman = EnsureChainman(node);
 
     CHECK_NONFATAL(node.govman);
-    LOCK2(cs_main, node.govman->cs);
+    LOCK(cs_main);
     const CGovernanceObject* pGovObj = node.govman->FindConstGovernanceObject(hash);
 
     if (pGovObj == nullptr) {
@@ -828,7 +827,6 @@ static RPCHelpMan gobject_getcurrentvotes()
     const NodeContext& node = EnsureAnyNodeContext(request.context);
 
     CHECK_NONFATAL(node.govman);
-    LOCK(node.govman->cs);
     const CGovernanceObject* pGovObj = node.govman->FindConstGovernanceObject(hash);
 
     if (pGovObj == nullptr) {
@@ -924,7 +922,6 @@ static RPCHelpMan voteraw()
     const NodeContext& node = EnsureAnyNodeContext(request.context);
     CHECK_NONFATAL(node.govman);
     GovernanceObject govObjType = [&]() {
-        LOCK(node.govman->cs);
         const CGovernanceObject *pGovObj = node.govman->FindConstGovernanceObject(hashGovObj);
         if (!pGovObj) {
             throw JSONRPCError(RPC_INVALID_PARAMETER, "Governance object not found");

From 9f5cf4ac34e7aebdbb0ee8d35ec7832def083748 Mon Sep 17 00:00:00 2001
From: Kittywhiskers Van Gogh <63189531+kwvg@users.noreply.github.com>
Date: Mon, 15 Sep 2025 17:57:42 +0000
Subject: [PATCH 278/656] refactor: privatize internally used functions

This will simplify our work in subsequent commits.

Review with `git log -p -n1 --color-moved=dimmed_zebra`.
---
 src/governance/governance.h | 141 +++++++++++++++---------------------
 1 file changed, 58 insertions(+), 83 deletions(-)

diff --git a/src/governance/governance.h b/src/governance/governance.h
index e3f11d848ad3..809351e969c0 100644
--- a/src/governance/governance.h
+++ b/src/governance/governance.h
@@ -275,48 +275,60 @@ class CGovernanceManager : public GovernanceStore, public GovernanceSignerParent
                                 const std::unique_ptr<CDeterministicMNManager>& dmnman, CMasternodeSync& mn_sync);
     ~CGovernanceManager();
 
-    void Schedule(CScheduler& scheduler, CConnman& connman, PeerManager& peerman);
-
+    // Basic initialization and querying
+    bool IsValid() const override { return is_valid; }
     bool LoadCache(bool load_cache);
+    std::string ToString() const;
+    UniValue ToJson() const;
+    void Clear();
+    void CheckAndRemove();
+    void Schedule(CScheduler& scheduler, CConnman& connman, PeerManager& peerman);
 
-    bool IsValid() const override { return is_valid; }
+    // CGovernanceObject
+    bool AreRateChecksEnabled() const { return fRateChecksEnabled; }
+    void AddInvalidVote(const CGovernanceVote& vote);
 
-    void RelayObject(const CGovernanceObject& obj) EXCLUSIVE_LOCKS_REQUIRED(!cs_relay);
-    void RelayVote(const CGovernanceVote& vote) EXCLUSIVE_LOCKS_REQUIRED(!cs_relay);
+    // Getters/Setters
+    int GetCachedBlockHeight() const override { return nCachedBlockHeight; }
+    int64_t GetLastDiffTime() const { return nTimeLastDiff; }
+    std::vector<CGovernanceVote> GetCurrentVotes(const uint256& nParentHash, const COutPoint& mnCollateralOutpointFilter) const;
+    void GetAllNewerThan(std::vector<CGovernanceObject>& objs, int64_t nMoreThanTime) const;
+    void UpdateLastDiffTime(int64_t nTimeIn) { nTimeLastDiff = nTimeIn; }
 
+    // Networking
     /**
      * This is called by AlreadyHave in net_processing.cpp as part of the inventory
      * retrieval process.  Returns true if we want to retrieve the object, otherwise
      * false. (Note logic is inverted in AlreadyHave).
      */
     bool ConfirmInventoryRequest(const CInv& inv);
-
-    [[nodiscard]] MessageProcessingResult SyncSingleObjVotes(CNode& peer, const uint256& nProp, const CBloomFilter& filter, CConnman& connman);
-    [[nodiscard]] MessageProcessingResult SyncObjects(CNode& peer, CConnman& connman) const;
-
+    bool ProcessVoteAndRelay(const CGovernanceVote& vote, CGovernanceException& exception, CConnman& connman) override
+        EXCLUSIVE_LOCKS_REQUIRED(!cs_relay);
+    int RequestGovernanceObjectVotes(CNode& peer, CConnman& connman, const PeerManager& peerman) const;
+    int RequestGovernanceObjectVotes(const std::vector<CNode*>& vNodesCopy, CConnman& connman,
+                                     const PeerManager& peerman) const;
     [[nodiscard]] MessageProcessingResult ProcessMessage(CNode& peer, CConnman& connman, std::string_view msg_type,
                                                          CDataStream& vRecv) EXCLUSIVE_LOCKS_REQUIRED(!cs_relay);
+    void RelayObject(const CGovernanceObject& obj) EXCLUSIVE_LOCKS_REQUIRED(!cs_relay);
+    void RelayVote(const CGovernanceVote& vote) EXCLUSIVE_LOCKS_REQUIRED(!cs_relay);
 
-    CGovernanceObject* FindGovernanceObjectByDataHash(const uint256& nDataHash) override EXCLUSIVE_LOCKS_REQUIRED(!cs);
-
-    // These commands are only used in RPC
-    std::vector<CGovernanceVote> GetCurrentVotes(const uint256& nParentHash, const COutPoint& mnCollateralOutpointFilter) const;
-    void GetAllNewerThan(std::vector<CGovernanceObject>& objs, int64_t nMoreThanTime) const;
+    // Notification interface trigger
+    void UpdatedBlockTip(const CBlockIndex* pindex) EXCLUSIVE_LOCKS_REQUIRED(!cs_relay);
 
+    // Signer interface
+    bool MasternodeRateCheck(const CGovernanceObject& govobj, bool fUpdateFailStatus = false) override;
+    CGovernanceObject* FindGovernanceObjectByDataHash(const uint256& nDataHash) override EXCLUSIVE_LOCKS_REQUIRED(!cs);
+    std::vector<std::shared_ptr<const CGovernanceObject>> GetApprovedProposals(const CDeterministicMNList& tip_mn_list) override
+        EXCLUSIVE_LOCKS_REQUIRED(!cs);
     void AddGovernanceObject(CGovernanceObject& govobj, const CNode* pfrom = nullptr) override
         EXCLUSIVE_LOCKS_REQUIRED(!cs_relay);
 
-    void Clear();
-    void CheckAndRemove();
-
-    UniValue ToJson() const;
-    std::string ToString() const;
-
-    void UpdatedBlockTip(const CBlockIndex* pindex) EXCLUSIVE_LOCKS_REQUIRED(!cs_relay);
-    int64_t GetLastDiffTime() const { return nTimeLastDiff; }
-    void UpdateLastDiffTime(int64_t nTimeIn) { nTimeLastDiff = nTimeIn; }
-
-    int GetCachedBlockHeight() const override { return nCachedBlockHeight; }
+    // Superblocks
+    bool GetSuperblockPayments(const CDeterministicMNList& tip_mn_list, int nBlockHeight,
+                               std::vector<CTxOut>& voutSuperblockRet);
+    bool IsSuperblockTriggered(const CDeterministicMNList& tip_mn_list, int nBlockHeight);
+    bool IsValidSuperblock(const CChain& active_chain, const CDeterministicMNList& tip_mn_list,
+                           const CTransaction& txNew, int nBlockHeight, CAmount blockReward);
 
     // Thread-safe accessors
     bool GetBestSuperblock(const CDeterministicMNList& tip_mn_list, CSuperblock_sptr& pSuperblockRet,
@@ -334,38 +346,40 @@ class CGovernanceManager : public GovernanceStore, public GovernanceSignerParent
         EXCLUSIVE_LOCKS_REQUIRED(!cs);
     int GetVoteCount() const
         EXCLUSIVE_LOCKS_REQUIRED(!cs);
+    std::vector<std::shared_ptr<CSuperblock>> GetActiveTriggers() const override
+        EXCLUSIVE_LOCKS_REQUIRED(!cs);
     void AddPostponedObject(const CGovernanceObject& govobj)
         EXCLUSIVE_LOCKS_REQUIRED(!cs);
 
-    const CGovernanceObject* FindConstGovernanceObject(const uint256& nHash) const EXCLUSIVE_LOCKS_REQUIRED(!cs);
-
-    // Thread-safe accessors for trigger management
-    std::vector<std::shared_ptr<CSuperblock>> GetActiveTriggers() const override
+    const CGovernanceObject* FindConstGovernanceObject(const uint256& nHash) const
         EXCLUSIVE_LOCKS_REQUIRED(!cs);
 
-    void MasternodeRateUpdate(const CGovernanceObject& govobj);
+private:
+    // Branches of ProcessMessage
+    [[nodiscard]] MessageProcessingResult SyncObjects(CNode& peer, CConnman& connman) const;
+    [[nodiscard]] MessageProcessingResult SyncSingleObjVotes(CNode& peer, const uint256& nProp, const CBloomFilter& filter, CConnman& connman);
 
-    bool MasternodeRateCheck(const CGovernanceObject& govobj, bool fUpdateFailStatus = false) override;
+    // Internal counterparts to "Thread-safe accessors"
+    void AddPostponedObjectInternal(const CGovernanceObject& govobj)
+        EXCLUSIVE_LOCKS_REQUIRED(cs);
+    bool GetBestSuperblockInternal(const CDeterministicMNList& tip_mn_list, CSuperblock_sptr& pSuperblockRet,
+                                   int nBlockHeight)
+        EXCLUSIVE_LOCKS_REQUIRED(cs);
+    CGovernanceObject* FindGovernanceObjectInternal(const uint256& nHash)
+        EXCLUSIVE_LOCKS_REQUIRED(cs);
+    std::vector<std::shared_ptr<CSuperblock>> GetActiveTriggersInternal() const
+        EXCLUSIVE_LOCKS_REQUIRED(cs);
 
-    bool MasternodeRateCheck(const CGovernanceObject& govobj, bool fUpdateFailStatus, bool fForce, bool& fRateCheckBypassed);
+    const CGovernanceObject* FindConstGovernanceObjectInternal(const uint256& nHash) const EXCLUSIVE_LOCKS_REQUIRED(cs);
 
-    bool ProcessVoteAndRelay(const CGovernanceVote& vote, CGovernanceException& exception, CConnman& connman) override
-        EXCLUSIVE_LOCKS_REQUIRED(!cs_relay);
+    void MasternodeRateUpdate(const CGovernanceObject& govobj);
 
-    void CheckPostponedObjects() EXCLUSIVE_LOCKS_REQUIRED(!cs_relay);
+    bool MasternodeRateCheck(const CGovernanceObject& govobj, bool fUpdateFailStatus, bool fForce, bool& fRateCheckBypassed);
 
-    bool AreRateChecksEnabled() const
-    {
-        LOCK(cs);
-        return fRateChecksEnabled;
-    }
+    void CheckPostponedObjects() EXCLUSIVE_LOCKS_REQUIRED(!cs_relay);
 
     void InitOnLoad();
 
-    int RequestGovernanceObjectVotes(CNode& peer, CConnman& connman, const PeerManager& peerman) const;
-    int RequestGovernanceObjectVotes(const std::vector<CNode*>& vNodesCopy, CConnman& connman,
-                                     const PeerManager& peerman) const;
-
     /*
      * Trigger Management (formerly CGovernanceTriggerManager)
      *   - Track governance objects which are triggers
@@ -374,49 +388,10 @@ class CGovernanceManager : public GovernanceStore, public GovernanceSignerParent
     bool AddNewTrigger(uint256 nHash) EXCLUSIVE_LOCKS_REQUIRED(cs);
     void CleanAndRemoveTriggers() EXCLUSIVE_LOCKS_REQUIRED(cs);
 
-    // Superblocks related:
-
-    /**
-     *   Is Superblock Triggered
-     *
-     *   - Does this block have a non-executed and activated trigger?
-     */
-    bool IsSuperblockTriggered(const CDeterministicMNList& tip_mn_list, int nBlockHeight);
-
-    /**
-     *   Get Superblock Payments
-     *
-     *   - Returns payments for superblock
-     */
-    bool GetSuperblockPayments(const CDeterministicMNList& tip_mn_list, int nBlockHeight,
-                               std::vector<CTxOut>& voutSuperblockRet);
-
-    bool IsValidSuperblock(const CChain& active_chain, const CDeterministicMNList& tip_mn_list,
-                           const CTransaction& txNew, int nBlockHeight, CAmount blockReward);
-
-    std::vector<std::shared_ptr<const CGovernanceObject>> GetApprovedProposals(const CDeterministicMNList& tip_mn_list) override
-        EXCLUSIVE_LOCKS_REQUIRED(!cs);
-
-private:
-    // Internal counterparts to "Thread-safe accessors"
-    void AddPostponedObjectInternal(const CGovernanceObject& govobj)
-        EXCLUSIVE_LOCKS_REQUIRED(cs);
-    bool GetBestSuperblockInternal(const CDeterministicMNList& tip_mn_list, CSuperblock_sptr& pSuperblockRet,
-                                   int nBlockHeight)
-        EXCLUSIVE_LOCKS_REQUIRED(cs);
-    CGovernanceObject* FindGovernanceObjectInternal(const uint256& nHash)
-        EXCLUSIVE_LOCKS_REQUIRED(cs);
-    std::vector<std::shared_ptr<CSuperblock>> GetActiveTriggersInternal() const
-        EXCLUSIVE_LOCKS_REQUIRED(cs);
-
-    const CGovernanceObject* FindConstGovernanceObjectInternal(const uint256& nHash) const EXCLUSIVE_LOCKS_REQUIRED(cs);
-
     void ExecuteBestSuperblock(const CDeterministicMNList& tip_mn_list, int nBlockHeight);
 
     void RequestGovernanceObject(CNode* pfrom, const uint256& nHash, CConnman& connman, bool fUseFilter = false) const;
 
-    void AddInvalidVote(const CGovernanceVote& vote);
-
     bool ProcessVote(CNode* pfrom, const CGovernanceVote& vote, CGovernanceException& exception, CConnman& connman);
 
     /// Called to indicate a requested object or vote has been received

From e8a1e8be766f60c295f8efd5cbb13e7afbe66f30 Mon Sep 17 00:00:00 2001
From: Kittywhiskers Van Gogh <63189531+kwvg@users.noreply.github.com>
Date: Thu, 23 Oct 2025 00:14:05 +0530
Subject: [PATCH 279/656] refactor: add `cs` annotations for private functions

---
 src/governance/governance.cpp | 46 +++++++++++++--------
 src/governance/governance.h   | 75 +++++++++++++++++++++++------------
 2 files changed, 79 insertions(+), 42 deletions(-)

diff --git a/src/governance/governance.cpp b/src/governance/governance.cpp
index 6b713e5acc49..4745d0bbcde0 100644
--- a/src/governance/governance.cpp
+++ b/src/governance/governance.cpp
@@ -119,6 +119,7 @@ void CGovernanceManager::Schedule(CScheduler& scheduler, CConnman& connman, Peer
 
 bool CGovernanceManager::LoadCache(bool load_cache)
 {
+    AssertLockNotHeld(cs);
     assert(m_db != nullptr);
     is_valid = load_cache ? m_db->Load(*this) : m_db->Store(*this);
     if (is_valid && load_cache) {
@@ -215,6 +216,7 @@ void CGovernanceManager::AddPostponedObjectInternal(const CGovernanceObject& gov
 MessageProcessingResult CGovernanceManager::ProcessMessage(CNode& peer, CConnman& connman, std::string_view msg_type,
                                                            CDataStream& vRecv)
 {
+    AssertLockNotHeld(cs);
     AssertLockNotHeld(cs_relay);
     if (!IsValid()) return {};
     if (!m_mn_sync.IsBlockchainSynced()) return {};
@@ -233,6 +235,7 @@ MessageProcessingResult CGovernanceManager::ProcessMessage(CNode& peer, CConnman
         vRecv >> filter;
 
         LogPrint(BCLog::GOBJECT, "MNGOVERNANCESYNC -- syncing governance objects to our peer %s\n", peer.GetLogString());
+        LOCK(cs);
         if (nProp == uint256()) {
             return SyncObjects(peer, connman);
         } else {
@@ -288,7 +291,8 @@ MessageProcessingResult CGovernanceManager::ProcessMessage(CNode& peer, CConnman
         bool fMissingConfirmations = false;
         bool fIsValid = govobj.IsValidLocally(tip_mn_list, m_chainman, strError, fMissingConfirmations, true);
 
-        if (fRateCheckBypassed && fIsValid && !MasternodeRateCheck(govobj, true)) {
+        bool unused_rcb;
+        if (fRateCheckBypassed && fIsValid && !MasternodeRateCheck(govobj, true, true, unused_rcb)) {
             LogPrint(BCLog::GOBJECT, "MNGOVERNANCEOBJECT -- masternode rate check failed (after signature verification) - %s - (current block height %d)\n", strHash, nCachedBlockHeight);
             return ret;
         }
@@ -358,9 +362,9 @@ MessageProcessingResult CGovernanceManager::ProcessMessage(CNode& peer, CConnman
 
 void CGovernanceManager::CheckOrphanVotes(CGovernanceObject& govobj)
 {
-    LOCK(cs);
-
+    AssertLockHeld(cs);
     AssertLockNotHeld(cs_relay);
+
     uint256 nHash = govobj.GetHash();
     std::vector<vote_time_pair_t> vecVotePairs;
     cmmapOrphanVotes.GetAll(nHash, vecVotePairs);
@@ -448,6 +452,7 @@ void CGovernanceManager::AddGovernanceObject(CGovernanceObject& govobj, const CN
 
 void CGovernanceManager::CheckAndRemove()
 {
+    AssertLockNotHeld(cs);
     assert(m_mn_metaman.IsValid());
 
     // Return on initial sync, spammed the debug.log and provided no use
@@ -707,6 +712,7 @@ bool CGovernanceManager::ConfirmInventoryRequest(const CInv& inv)
 
 MessageProcessingResult CGovernanceManager::SyncSingleObjVotes(CNode& peer, const uint256& nProp, const CBloomFilter& filter, CConnman& connman)
 {
+    AssertLockHeld(cs);
     // do not provide any data until our node is synced
     if (!m_mn_sync.IsSynced()) return {};
 
@@ -714,8 +720,6 @@ MessageProcessingResult CGovernanceManager::SyncSingleObjVotes(CNode& peer, cons
 
     LogPrint(BCLog::GOBJECT, "CGovernanceManager::%s -- syncing single object to peer=%d, nProp = %s\n", __func__, peer.GetId(), nProp.ToString());
 
-    LOCK(cs);
-
     // single valid object and its valid votes
     auto it = mapObjects.find(nProp);
     if (it == mapObjects.end()) {
@@ -758,6 +762,7 @@ MessageProcessingResult CGovernanceManager::SyncSingleObjVotes(CNode& peer, cons
 
 MessageProcessingResult CGovernanceManager::SyncObjects(CNode& peer, CConnman& connman) const
 {
+    AssertLockHeld(cs);
     assert(m_netfulfilledman.IsValid());
 
     // do not provide any data until our node is synced
@@ -774,8 +779,6 @@ MessageProcessingResult CGovernanceManager::SyncObjects(CNode& peer, CConnman& c
 
     LogPrint(BCLog::GOBJECT, "CGovernanceManager::%s -- syncing all objects to peer=%d\n", __func__, peer.GetId());
 
-    LOCK(cs);
-
     // all valid objects, no votes
     MessageProcessingResult ret{};
     for (const auto& objPair : mapObjects) {
@@ -806,9 +809,9 @@ MessageProcessingResult CGovernanceManager::SyncObjects(CNode& peer, CConnman& c
 
 void CGovernanceManager::MasternodeRateUpdate(const CGovernanceObject& govobj)
 {
-    if (govobj.GetObjectType() != GovernanceObject::TRIGGER) return;
+    AssertLockHeld(cs);
 
-    LOCK(cs);
+    if (govobj.GetObjectType() != GovernanceObject::TRIGGER) return;
 
     const COutPoint& masternodeOutpoint = govobj.GetMasternodeOutpoint();
     auto it = mapLastMasternodeObject.find(masternodeOutpoint);
@@ -830,13 +833,14 @@ void CGovernanceManager::MasternodeRateUpdate(const CGovernanceObject& govobj)
 
 bool CGovernanceManager::MasternodeRateCheck(const CGovernanceObject& govobj, bool fUpdateFailStatus)
 {
+    LOCK(cs);
     bool fRateCheckBypassed;
     return MasternodeRateCheck(govobj, fUpdateFailStatus, true, fRateCheckBypassed);
 }
 
 bool CGovernanceManager::MasternodeRateCheck(const CGovernanceObject& govobj, bool fUpdateFailStatus, bool fForce, bool& fRateCheckBypassed)
 {
-    LOCK(cs);
+    AssertLockHeld(cs);
 
     fRateCheckBypassed = false;
 
@@ -900,6 +904,7 @@ bool CGovernanceManager::MasternodeRateCheck(const CGovernanceObject& govobj, bo
 
 bool CGovernanceManager::ProcessVoteAndRelay(const CGovernanceVote& vote, CGovernanceException& exception, CConnman& connman)
 {
+    AssertLockNotHeld(cs);
     AssertLockNotHeld(cs_relay);
     bool fOK = ProcessVote(/*pfrom=*/nullptr, vote, exception, connman);
     if (fOK) {
@@ -910,6 +915,7 @@ bool CGovernanceManager::ProcessVoteAndRelay(const CGovernanceVote& vote, CGover
 
 bool CGovernanceManager::ProcessVote(CNode* pfrom, const CGovernanceVote& vote, CGovernanceException& exception, CConnman& connman)
 {
+    AssertLockNotHeld(cs);
     ENTER_CRITICAL_SECTION(cs);
     uint256 nHashVote = vote.GetHash();
     uint256 nHashGovobj = vote.GetParentHash();
@@ -964,10 +970,11 @@ bool CGovernanceManager::ProcessVote(CNode* pfrom, const CGovernanceVote& vote,
 
 void CGovernanceManager::CheckPostponedObjects()
 {
+    AssertLockHeld(cs);
     AssertLockNotHeld(cs_relay);
     if (!m_mn_sync.IsSynced()) return;
 
-    LOCK2(::cs_main, cs);
+    LOCK(::cs_main);
 
     // Check postponed proposals
     for (auto it = mapPostponedObjects.begin(); it != mapPostponedObjects.end();) {
@@ -1032,6 +1039,7 @@ void CGovernanceManager::CheckPostponedObjects()
 
 void CGovernanceManager::RequestGovernanceObject(CNode* pfrom, const uint256& nHash, CConnman& connman, bool fUseFilter) const
 {
+    AssertLockNotHeld(cs);
     if (!pfrom) {
         return;
     }
@@ -1186,6 +1194,7 @@ int CGovernanceManager::RequestGovernanceObjectVotes(const std::vector<CNode*>&
 
 bool CGovernanceManager::AcceptMessage(const uint256& nHash)
 {
+    AssertLockNotHeld(cs);
     LOCK(cs);
     auto it = m_requested_hash_time.find(nHash);
     if (it == m_requested_hash_time.end()) {
@@ -1199,7 +1208,7 @@ bool CGovernanceManager::AcceptMessage(const uint256& nHash)
 
 void CGovernanceManager::RebuildIndexes()
 {
-    LOCK(cs);
+    AssertLockHeld(cs);
 
     cmapVoteToObject.Clear();
     for (auto& objPair : mapObjects) {
@@ -1213,7 +1222,7 @@ void CGovernanceManager::RebuildIndexes()
 
 void CGovernanceManager::AddCachedTriggers()
 {
-    LOCK(cs);
+    AssertLockHeld(cs);
 
     int64_t nNow = GetTime<std::chrono::seconds>().count();
 
@@ -1325,6 +1334,7 @@ UniValue CGovernanceManager::ToJson() const
 
 void CGovernanceManager::UpdatedBlockTip(const CBlockIndex* pindex)
 {
+    AssertLockNotHeld(cs);
     AssertLockNotHeld(cs_relay);
     // Note this gets called from ActivateBestChain without cs_main being held
     // so it should be safe to lock our mutex here without risking a deadlock
@@ -1338,6 +1348,7 @@ void CGovernanceManager::UpdatedBlockTip(const CBlockIndex* pindex)
     nCachedBlockHeight = pindex->nHeight;
     LogPrint(BCLog::GOBJECT, "CGovernanceManager::UpdatedBlockTip -- nCachedBlockHeight: %d\n", nCachedBlockHeight);
 
+    LOCK(cs);
     if (DeploymentDIP0003Enforced(pindex->nHeight, Params().GetConsensus())) {
         RemoveInvalidVotes();
     }
@@ -1349,12 +1360,13 @@ void CGovernanceManager::UpdatedBlockTip(const CBlockIndex* pindex)
 
 void CGovernanceManager::RequestOrphanObjects(CConnman& connman)
 {
+    AssertLockNotHeld(cs);
     const CConnman::NodesSnapshot snap{connman, /* cond = */ CConnman::FullyConnectedOnly};
 
     std::vector<uint256> vecHashesFiltered;
     {
-        std::vector<uint256> vecHashes;
         LOCK(cs);
+        std::vector<uint256> vecHashes;
         cmmapOrphanVotes.GetKeys(vecHashes);
         for (const uint256& nHash : vecHashes) {
             if (mapObjects.find(nHash) == mapObjects.end()) {
@@ -1394,12 +1406,12 @@ void CGovernanceManager::CleanOrphanObjects()
 
 void CGovernanceManager::RemoveInvalidVotes()
 {
+    AssertLockHeld(cs);
+
     if (!m_mn_sync.IsSynced()) {
         return;
     }
 
-    LOCK(cs);
-
     const auto tip_mn_list = Assert(m_dmnman)->GetListAtChainTip();
     auto diff = lastMNListForVotingKeys->BuildDiff(tip_mn_list);
 
@@ -1733,7 +1745,7 @@ bool CGovernanceManager::IsValidSuperblock(const CChain& active_chain, const CDe
 
 void CGovernanceManager::ExecuteBestSuperblock(const CDeterministicMNList& tip_mn_list, int nBlockHeight)
 {
-    LOCK(cs);
+    AssertLockHeld(cs);
 
     CSuperblock_sptr pSuperblock;
     if (GetBestSuperblockInternal(tip_mn_list, pSuperblock, nBlockHeight)) {
diff --git a/src/governance/governance.h b/src/governance/governance.h
index 809351e969c0..445d42fbfa50 100644
--- a/src/governance/governance.h
+++ b/src/governance/governance.h
@@ -277,11 +277,13 @@ class CGovernanceManager : public GovernanceStore, public GovernanceSignerParent
 
     // Basic initialization and querying
     bool IsValid() const override { return is_valid; }
-    bool LoadCache(bool load_cache);
+    bool LoadCache(bool load_cache)
+        EXCLUSIVE_LOCKS_REQUIRED(!cs);
     std::string ToString() const;
     UniValue ToJson() const;
     void Clear();
-    void CheckAndRemove();
+    void CheckAndRemove()
+        EXCLUSIVE_LOCKS_REQUIRED(!cs);
     void Schedule(CScheduler& scheduler, CConnman& connman, PeerManager& peerman);
 
     // CGovernanceObject
@@ -303,20 +305,23 @@ class CGovernanceManager : public GovernanceStore, public GovernanceSignerParent
      */
     bool ConfirmInventoryRequest(const CInv& inv);
     bool ProcessVoteAndRelay(const CGovernanceVote& vote, CGovernanceException& exception, CConnman& connman) override
-        EXCLUSIVE_LOCKS_REQUIRED(!cs_relay);
+        EXCLUSIVE_LOCKS_REQUIRED(!cs, !cs_relay);
     int RequestGovernanceObjectVotes(CNode& peer, CConnman& connman, const PeerManager& peerman) const;
     int RequestGovernanceObjectVotes(const std::vector<CNode*>& vNodesCopy, CConnman& connman,
                                      const PeerManager& peerman) const;
     [[nodiscard]] MessageProcessingResult ProcessMessage(CNode& peer, CConnman& connman, std::string_view msg_type,
-                                                         CDataStream& vRecv) EXCLUSIVE_LOCKS_REQUIRED(!cs_relay);
+                                                         CDataStream& vRecv)
+        EXCLUSIVE_LOCKS_REQUIRED(!cs, !cs_relay);
     void RelayObject(const CGovernanceObject& obj) EXCLUSIVE_LOCKS_REQUIRED(!cs_relay);
     void RelayVote(const CGovernanceVote& vote) EXCLUSIVE_LOCKS_REQUIRED(!cs_relay);
 
     // Notification interface trigger
-    void UpdatedBlockTip(const CBlockIndex* pindex) EXCLUSIVE_LOCKS_REQUIRED(!cs_relay);
+    void UpdatedBlockTip(const CBlockIndex* pindex)
+        EXCLUSIVE_LOCKS_REQUIRED(!cs, !cs_relay);
 
     // Signer interface
-    bool MasternodeRateCheck(const CGovernanceObject& govobj, bool fUpdateFailStatus = false) override;
+    bool MasternodeRateCheck(const CGovernanceObject& govobj, bool fUpdateFailStatus = false) override
+        EXCLUSIVE_LOCKS_REQUIRED(!cs);
     CGovernanceObject* FindGovernanceObjectByDataHash(const uint256& nDataHash) override EXCLUSIVE_LOCKS_REQUIRED(!cs);
     std::vector<std::shared_ptr<const CGovernanceObject>> GetApprovedProposals(const CDeterministicMNList& tip_mn_list) override
         EXCLUSIVE_LOCKS_REQUIRED(!cs);
@@ -356,8 +361,11 @@ class CGovernanceManager : public GovernanceStore, public GovernanceSignerParent
 
 private:
     // Branches of ProcessMessage
-    [[nodiscard]] MessageProcessingResult SyncObjects(CNode& peer, CConnman& connman) const;
-    [[nodiscard]] MessageProcessingResult SyncSingleObjVotes(CNode& peer, const uint256& nProp, const CBloomFilter& filter, CConnman& connman);
+    [[nodiscard]] MessageProcessingResult SyncObjects(CNode& peer, CConnman& connman) const
+        EXCLUSIVE_LOCKS_REQUIRED(cs);
+    [[nodiscard]] MessageProcessingResult SyncSingleObjVotes(CNode& peer, const uint256& nProp, const CBloomFilter& filter,
+                                                             CConnman& connman)
+        EXCLUSIVE_LOCKS_REQUIRED(cs);
 
     // Internal counterparts to "Thread-safe accessors"
     void AddPostponedObjectInternal(const CGovernanceObject& govobj)
@@ -370,44 +378,61 @@ class CGovernanceManager : public GovernanceStore, public GovernanceSignerParent
     std::vector<std::shared_ptr<CSuperblock>> GetActiveTriggersInternal() const
         EXCLUSIVE_LOCKS_REQUIRED(cs);
 
-    const CGovernanceObject* FindConstGovernanceObjectInternal(const uint256& nHash) const EXCLUSIVE_LOCKS_REQUIRED(cs);
+    const CGovernanceObject* FindConstGovernanceObjectInternal(const uint256& nHash) const
+        EXCLUSIVE_LOCKS_REQUIRED(cs);
 
-    void MasternodeRateUpdate(const CGovernanceObject& govobj);
+    void MasternodeRateUpdate(const CGovernanceObject& govobj)
+        EXCLUSIVE_LOCKS_REQUIRED(cs);
 
-    bool MasternodeRateCheck(const CGovernanceObject& govobj, bool fUpdateFailStatus, bool fForce, bool& fRateCheckBypassed);
+    bool MasternodeRateCheck(const CGovernanceObject& govobj, bool fUpdateFailStatus, bool fForce, bool& fRateCheckBypassed)
+        EXCLUSIVE_LOCKS_REQUIRED(cs);
 
-    void CheckPostponedObjects() EXCLUSIVE_LOCKS_REQUIRED(!cs_relay);
+    void CheckPostponedObjects()
+        EXCLUSIVE_LOCKS_REQUIRED(cs, !cs_relay);
 
-    void InitOnLoad();
+    void InitOnLoad()
+        EXCLUSIVE_LOCKS_REQUIRED(!cs);
 
     /*
      * Trigger Management (formerly CGovernanceTriggerManager)
      *   - Track governance objects which are triggers
      *   - After triggers are activated and executed, they can be removed
     */
-    bool AddNewTrigger(uint256 nHash) EXCLUSIVE_LOCKS_REQUIRED(cs);
-    void CleanAndRemoveTriggers() EXCLUSIVE_LOCKS_REQUIRED(cs);
+    bool AddNewTrigger(uint256 nHash)
+        EXCLUSIVE_LOCKS_REQUIRED(cs);
+    void CleanAndRemoveTriggers()
+        EXCLUSIVE_LOCKS_REQUIRED(cs);
 
-    void ExecuteBestSuperblock(const CDeterministicMNList& tip_mn_list, int nBlockHeight);
+    void ExecuteBestSuperblock(const CDeterministicMNList& tip_mn_list, int nBlockHeight)
+        EXCLUSIVE_LOCKS_REQUIRED(cs);
 
-    void RequestGovernanceObject(CNode* pfrom, const uint256& nHash, CConnman& connman, bool fUseFilter = false) const;
+    void RequestGovernanceObject(CNode* pfrom, const uint256& nHash, CConnman& connman, bool fUseFilter = false) const
+        EXCLUSIVE_LOCKS_REQUIRED(!cs);
 
-    bool ProcessVote(CNode* pfrom, const CGovernanceVote& vote, CGovernanceException& exception, CConnman& connman);
+    bool ProcessVote(CNode* pfrom, const CGovernanceVote& vote, CGovernanceException& exception, CConnman& connman)
+        EXCLUSIVE_LOCKS_REQUIRED(!cs);
 
     /// Called to indicate a requested object or vote has been received
-    bool AcceptMessage(const uint256& nHash);
+    bool AcceptMessage(const uint256& nHash)
+        EXCLUSIVE_LOCKS_REQUIRED(!cs);
 
-    void CheckOrphanVotes(CGovernanceObject& govobj) EXCLUSIVE_LOCKS_REQUIRED(!cs_relay);
+    void CheckOrphanVotes(CGovernanceObject& govobj)
+        EXCLUSIVE_LOCKS_REQUIRED(cs, !cs_relay);
 
-    void RebuildIndexes();
+    void RebuildIndexes()
+        EXCLUSIVE_LOCKS_REQUIRED(cs);
 
-    void AddCachedTriggers();
+    void AddCachedTriggers()
+        EXCLUSIVE_LOCKS_REQUIRED(cs);
 
-    void RequestOrphanObjects(CConnman& connman);
+    void RequestOrphanObjects(CConnman& connman)
+        EXCLUSIVE_LOCKS_REQUIRED(!cs);
 
-    void CleanOrphanObjects();
+    void CleanOrphanObjects()
+        EXCLUSIVE_LOCKS_REQUIRED(!cs);
 
-    void RemoveInvalidVotes();
+    void RemoveInvalidVotes()
+        EXCLUSIVE_LOCKS_REQUIRED(cs);
 };
 
 bool AreSuperblocksEnabled(const CSporkManager& sporkman);

From 7b9997ce65678a9be4727189b8bf47a8bc31459c Mon Sep 17 00:00:00 2001
From: Kittywhiskers Van Gogh <63189531+kwvg@users.noreply.github.com>
Date: Mon, 15 Sep 2025 18:38:54 +0000
Subject: [PATCH 280/656] refactor: add `cs` annotations for public functions

---
 src/governance/governance.cpp | 14 +++++++++
 src/governance/governance.h   | 58 +++++++++++++++++++++++------------
 2 files changed, 52 insertions(+), 20 deletions(-)

diff --git a/src/governance/governance.cpp b/src/governance/governance.cpp
index 4745d0bbcde0..cb881ab24fc2 100644
--- a/src/governance/governance.cpp
+++ b/src/governance/governance.cpp
@@ -90,6 +90,9 @@ CGovernanceManager::~CGovernanceManager()
 
 void CGovernanceManager::Schedule(CScheduler& scheduler, CConnman& connman, PeerManager& peerman)
 {
+    AssertLockNotHeld(cs);
+    AssertLockNotHeld(cs_relay);
+
     assert(IsValid());
 
     scheduler.scheduleEvery(
@@ -464,6 +467,7 @@ void CGovernanceManager::CheckAndRemove()
 
     const auto tip_mn_list = Assert(m_dmnman)->GetListAtChainTip();
 
+    {
     LOCK2(::cs_main, cs);
 
     for (const uint256& nHash : vecDirtyHashes) {
@@ -567,6 +571,7 @@ void CGovernanceManager::CheckAndRemove()
             ++r_it;
         }
     }
+    }
 
     LogPrint(BCLog::GOBJECT, "CGovernanceManager::UpdateCachesAndClean -- %s, m_requested_hash_time size=%d\n",
              ToString(), m_requested_hash_time.size());
@@ -669,6 +674,8 @@ void CGovernanceManager::GetAllNewerThan(std::vector<CGovernanceObject>& objs, i
 
 bool CGovernanceManager::ConfirmInventoryRequest(const CInv& inv)
 {
+    AssertLockNotHeld(cs);
+
     // do not request objects until it's time to sync
     if (!m_mn_sync.IsBlockchainSynced()) return false;
 
@@ -1084,6 +1091,8 @@ int CGovernanceManager::RequestGovernanceObjectVotes(CNode& peer, CConnman& conn
 int CGovernanceManager::RequestGovernanceObjectVotes(const std::vector<CNode*>& vNodesCopy, CConnman& connman,
                                                      const PeerManager& peerman) const
 {
+    AssertLockNotHeld(cs);
+
     static std::map<uint256, std::map<CService, int64_t> > mapAskedRecently;
     // Maximum number of nodes to request votes from for the same object hash on real networks
     // (mainnet, testnet, devnets). Keep this low to avoid unnecessary bandwidth usage.
@@ -1241,6 +1250,7 @@ void CGovernanceManager::AddCachedTriggers()
 
 void CGovernanceManager::InitOnLoad()
 {
+    {
     LOCK(cs);
     const auto start{SteadyClock::now()};
     LogPrintf("Preparing masternode indexes and governance triggers...\n");
@@ -1248,6 +1258,7 @@ void CGovernanceManager::InitOnLoad()
     AddCachedTriggers();
     LogPrintf("Masternode indexes and governance triggers prepared  %dms\n",
               Ticks<std::chrono::milliseconds>(SteadyClock::now() - start));
+    }
     LogPrintf("     %s\n", ToString());
 }
 
@@ -1263,6 +1274,7 @@ void GovernanceStore::Clear()
 
 void CGovernanceManager::Clear()
 {
+    AssertLockNotHeld(cs);
     LogPrint(BCLog::GOBJECT, "Governance object manager was cleared\n");
     GovernanceStore::Clear();
     cmapVoteToObject.Clear();
@@ -1297,6 +1309,7 @@ std::string GovernanceStore::ToString() const
 
 std::string CGovernanceManager::ToString() const
 {
+    AssertLockNotHeld(cs);
     return strprintf("%s, Votes: %d", GovernanceStore::ToString(), (int)cmapVoteToObject.GetSize());
 }
 
@@ -1591,6 +1604,7 @@ std::vector<CSuperblock_sptr> CGovernanceManager::GetActiveTriggersInternal() co
 
 bool CGovernanceManager::IsSuperblockTriggered(const CDeterministicMNList& tip_mn_list, int nBlockHeight)
 {
+    AssertLockNotHeld(cs);
     LogPrint(BCLog::GOBJECT, "IsSuperblockTriggered -- Start nBlockHeight = %d\n", nBlockHeight);
     if (!CSuperblock::IsValidBlockHeight(nBlockHeight)) {
         return false;
diff --git a/src/governance/governance.h b/src/governance/governance.h
index 445d42fbfa50..b9ca42ddfe42 100644
--- a/src/governance/governance.h
+++ b/src/governance/governance.h
@@ -198,7 +198,7 @@ class GovernanceStore
     ~GovernanceStore() = default;
 
     template<typename Stream>
-    void Serialize(Stream &s) const
+    void Serialize(Stream &s) const EXCLUSIVE_LOCKS_REQUIRED(!cs)
     {
         LOCK(cs);
         s   << SERIALIZATION_VERSION_STRING
@@ -211,7 +211,7 @@ class GovernanceStore
     }
 
     template<typename Stream>
-    void Unserialize(Stream &s)
+    void Unserialize(Stream &s) EXCLUSIVE_LOCKS_REQUIRED(!cs)
     {
         Clear();
 
@@ -230,9 +230,11 @@ class GovernanceStore
             >> *lastMNListForVotingKeys;
     }
 
-    void Clear();
+    void Clear()
+        EXCLUSIVE_LOCKS_REQUIRED(!cs);
 
-    std::string ToString() const;
+    std::string ToString() const
+        EXCLUSIVE_LOCKS_REQUIRED(!cs);
 };
 
 //
@@ -279,22 +281,29 @@ class CGovernanceManager : public GovernanceStore, public GovernanceSignerParent
     bool IsValid() const override { return is_valid; }
     bool LoadCache(bool load_cache)
         EXCLUSIVE_LOCKS_REQUIRED(!cs);
-    std::string ToString() const;
-    UniValue ToJson() const;
-    void Clear();
+    std::string ToString() const
+        EXCLUSIVE_LOCKS_REQUIRED(!cs);
+    UniValue ToJson() const
+        EXCLUSIVE_LOCKS_REQUIRED(!cs);
+    void Clear()
+        EXCLUSIVE_LOCKS_REQUIRED(!cs);
     void CheckAndRemove()
         EXCLUSIVE_LOCKS_REQUIRED(!cs);
-    void Schedule(CScheduler& scheduler, CConnman& connman, PeerManager& peerman);
+    void Schedule(CScheduler& scheduler, CConnman& connman, PeerManager& peerman)
+        EXCLUSIVE_LOCKS_REQUIRED(!cs, !cs_relay);
 
     // CGovernanceObject
     bool AreRateChecksEnabled() const { return fRateChecksEnabled; }
-    void AddInvalidVote(const CGovernanceVote& vote);
+    void AddInvalidVote(const CGovernanceVote& vote)
+        EXCLUSIVE_LOCKS_REQUIRED(!cs);
 
     // Getters/Setters
     int GetCachedBlockHeight() const override { return nCachedBlockHeight; }
     int64_t GetLastDiffTime() const { return nTimeLastDiff; }
-    std::vector<CGovernanceVote> GetCurrentVotes(const uint256& nParentHash, const COutPoint& mnCollateralOutpointFilter) const;
-    void GetAllNewerThan(std::vector<CGovernanceObject>& objs, int64_t nMoreThanTime) const;
+    std::vector<CGovernanceVote> GetCurrentVotes(const uint256& nParentHash, const COutPoint& mnCollateralOutpointFilter) const
+        EXCLUSIVE_LOCKS_REQUIRED(!cs);
+    void GetAllNewerThan(std::vector<CGovernanceObject>& objs, int64_t nMoreThanTime) const
+        EXCLUSIVE_LOCKS_REQUIRED(!cs);
     void UpdateLastDiffTime(int64_t nTimeIn) { nTimeLastDiff = nTimeIn; }
 
     // Networking
@@ -303,17 +312,22 @@ class CGovernanceManager : public GovernanceStore, public GovernanceSignerParent
      * retrieval process.  Returns true if we want to retrieve the object, otherwise
      * false. (Note logic is inverted in AlreadyHave).
      */
-    bool ConfirmInventoryRequest(const CInv& inv);
+    bool ConfirmInventoryRequest(const CInv& inv)
+        EXCLUSIVE_LOCKS_REQUIRED(!cs);
     bool ProcessVoteAndRelay(const CGovernanceVote& vote, CGovernanceException& exception, CConnman& connman) override
         EXCLUSIVE_LOCKS_REQUIRED(!cs, !cs_relay);
-    int RequestGovernanceObjectVotes(CNode& peer, CConnman& connman, const PeerManager& peerman) const;
+    int RequestGovernanceObjectVotes(CNode& peer, CConnman& connman, const PeerManager& peerman) const
+        EXCLUSIVE_LOCKS_REQUIRED(!cs);
     int RequestGovernanceObjectVotes(const std::vector<CNode*>& vNodesCopy, CConnman& connman,
-                                     const PeerManager& peerman) const;
+                                     const PeerManager& peerman) const
+        EXCLUSIVE_LOCKS_REQUIRED(!cs);
     [[nodiscard]] MessageProcessingResult ProcessMessage(CNode& peer, CConnman& connman, std::string_view msg_type,
                                                          CDataStream& vRecv)
         EXCLUSIVE_LOCKS_REQUIRED(!cs, !cs_relay);
-    void RelayObject(const CGovernanceObject& obj) EXCLUSIVE_LOCKS_REQUIRED(!cs_relay);
-    void RelayVote(const CGovernanceVote& vote) EXCLUSIVE_LOCKS_REQUIRED(!cs_relay);
+    void RelayObject(const CGovernanceObject& obj)
+        EXCLUSIVE_LOCKS_REQUIRED(!cs_relay);
+    void RelayVote(const CGovernanceVote& vote)
+        EXCLUSIVE_LOCKS_REQUIRED(!cs_relay);
 
     // Notification interface trigger
     void UpdatedBlockTip(const CBlockIndex* pindex)
@@ -322,7 +336,8 @@ class CGovernanceManager : public GovernanceStore, public GovernanceSignerParent
     // Signer interface
     bool MasternodeRateCheck(const CGovernanceObject& govobj, bool fUpdateFailStatus = false) override
         EXCLUSIVE_LOCKS_REQUIRED(!cs);
-    CGovernanceObject* FindGovernanceObjectByDataHash(const uint256& nDataHash) override EXCLUSIVE_LOCKS_REQUIRED(!cs);
+    CGovernanceObject* FindGovernanceObjectByDataHash(const uint256& nDataHash) override
+        EXCLUSIVE_LOCKS_REQUIRED(!cs);
     std::vector<std::shared_ptr<const CGovernanceObject>> GetApprovedProposals(const CDeterministicMNList& tip_mn_list) override
         EXCLUSIVE_LOCKS_REQUIRED(!cs);
     void AddGovernanceObject(CGovernanceObject& govobj, const CNode* pfrom = nullptr) override
@@ -330,10 +345,13 @@ class CGovernanceManager : public GovernanceStore, public GovernanceSignerParent
 
     // Superblocks
     bool GetSuperblockPayments(const CDeterministicMNList& tip_mn_list, int nBlockHeight,
-                               std::vector<CTxOut>& voutSuperblockRet);
-    bool IsSuperblockTriggered(const CDeterministicMNList& tip_mn_list, int nBlockHeight);
+                               std::vector<CTxOut>& voutSuperblockRet)
+        EXCLUSIVE_LOCKS_REQUIRED(!cs);
+    bool IsSuperblockTriggered(const CDeterministicMNList& tip_mn_list, int nBlockHeight)
+        EXCLUSIVE_LOCKS_REQUIRED(!cs);
     bool IsValidSuperblock(const CChain& active_chain, const CDeterministicMNList& tip_mn_list,
-                           const CTransaction& txNew, int nBlockHeight, CAmount blockReward);
+                           const CTransaction& txNew, int nBlockHeight, CAmount blockReward)
+        EXCLUSIVE_LOCKS_REQUIRED(!cs);
 
     // Thread-safe accessors
     bool GetBestSuperblock(const CDeterministicMNList& tip_mn_list, CSuperblock_sptr& pSuperblockRet,

From f077ca3f37935f58dd4823fc2460566ccd242c6a Mon Sep 17 00:00:00 2001
From: Kittywhiskers Van Gogh <63189531+kwvg@users.noreply.github.com>
Date: Mon, 15 Sep 2025 18:50:15 +0000
Subject: [PATCH 281/656] refactor: move from `RecursiveMutex` to `Mutex`,
 rename to `cs_store`

---
 src/governance/governance.cpp | 164 +++++++++++++++++-----------------
 src/governance/governance.h   | 134 +++++++++++++--------------
 2 files changed, 149 insertions(+), 149 deletions(-)

diff --git a/src/governance/governance.cpp b/src/governance/governance.cpp
index cb881ab24fc2..f3df5d636c2b 100644
--- a/src/governance/governance.cpp
+++ b/src/governance/governance.cpp
@@ -41,7 +41,7 @@ class ScopedLockBool
     bool fPrevValue;
 
 public:
-    ScopedLockBool(RecursiveMutex& _cs, bool& _ref, bool _value) :
+    ScopedLockBool(Mutex& _cs, bool& _ref, bool _value) :
         ref(_ref)
     {
         AssertLockHeld(_cs);
@@ -54,7 +54,7 @@ class ScopedLockBool
 } // anonymous namespace
 
 GovernanceStore::GovernanceStore() :
-    cs(),
+    cs_store(),
     mapObjects(),
     mapErasedGovernanceObjects(),
     cmapInvalidVotes(MAX_CACHE_SIZE),
@@ -90,7 +90,7 @@ CGovernanceManager::~CGovernanceManager()
 
 void CGovernanceManager::Schedule(CScheduler& scheduler, CConnman& connman, PeerManager& peerman)
 {
-    AssertLockNotHeld(cs);
+    AssertLockNotHeld(cs_store);
     AssertLockNotHeld(cs_relay);
 
     assert(IsValid());
@@ -122,7 +122,7 @@ void CGovernanceManager::Schedule(CScheduler& scheduler, CConnman& connman, Peer
 
 bool CGovernanceManager::LoadCache(bool load_cache)
 {
-    AssertLockNotHeld(cs);
+    AssertLockNotHeld(cs_store);
     assert(m_db != nullptr);
     is_valid = load_cache ? m_db->Load(*this) : m_db->Store(*this);
     if (is_valid && load_cache) {
@@ -165,13 +165,13 @@ void CGovernanceManager::RelayVote(const CGovernanceVote& vote)
 // Accessors for thread-safe access to maps
 bool CGovernanceManager::HaveObjectForHash(const uint256& nHash) const
 {
-    LOCK(cs);
+    LOCK(cs_store);
     return (mapObjects.count(nHash) == 1 || mapPostponedObjects.count(nHash) == 1);
 }
 
 bool CGovernanceManager::SerializeObjectForHash(const uint256& nHash, CDataStream& ss) const
 {
-    LOCK(cs);
+    LOCK(cs_store);
     auto it = mapObjects.find(nHash);
     if (it == mapObjects.end()) {
         it = mapPostponedObjects.find(nHash);
@@ -184,7 +184,7 @@ bool CGovernanceManager::SerializeObjectForHash(const uint256& nHash, CDataStrea
 
 bool CGovernanceManager::HaveVoteForHash(const uint256& nHash) const
 {
-    LOCK(cs);
+    LOCK(cs_store);
 
     CGovernanceObject* pGovobj = nullptr;
     return cmapVoteToObject.Get(nHash, pGovobj) && pGovobj->GetVoteFile().HasVote(nHash);
@@ -192,13 +192,13 @@ bool CGovernanceManager::HaveVoteForHash(const uint256& nHash) const
 
 int CGovernanceManager::GetVoteCount() const
 {
-    LOCK(cs);
+    LOCK(cs_store);
     return (int)cmapVoteToObject.GetSize();
 }
 
 bool CGovernanceManager::SerializeVoteForHash(const uint256& nHash, CDataStream& ss) const
 {
-    LOCK(cs);
+    LOCK(cs_store);
 
     CGovernanceObject* pGovobj = nullptr;
     return cmapVoteToObject.Get(nHash, pGovobj) && pGovobj->GetVoteFile().SerializeVoteToStream(nHash, ss);
@@ -206,20 +206,20 @@ bool CGovernanceManager::SerializeVoteForHash(const uint256& nHash, CDataStream&
 
 void CGovernanceManager::AddPostponedObject(const CGovernanceObject& govobj)
 {
-    LOCK(cs);
+    LOCK(cs_store);
     AddPostponedObjectInternal(govobj);
 }
 
 void CGovernanceManager::AddPostponedObjectInternal(const CGovernanceObject& govobj)
 {
-    AssertLockHeld(cs);
+    AssertLockHeld(cs_store);
     mapPostponedObjects.insert(std::make_pair(govobj.GetHash(), govobj));
 }
 
 MessageProcessingResult CGovernanceManager::ProcessMessage(CNode& peer, CConnman& connman, std::string_view msg_type,
                                                            CDataStream& vRecv)
 {
-    AssertLockNotHeld(cs);
+    AssertLockNotHeld(cs_store);
     AssertLockNotHeld(cs_relay);
     if (!IsValid()) return {};
     if (!m_mn_sync.IsBlockchainSynced()) return {};
@@ -238,7 +238,7 @@ MessageProcessingResult CGovernanceManager::ProcessMessage(CNode& peer, CConnman
         vRecv >> filter;
 
         LogPrint(BCLog::GOBJECT, "MNGOVERNANCESYNC -- syncing governance objects to our peer %s\n", peer.GetLogString());
-        LOCK(cs);
+        LOCK(cs_store);
         if (nProp == uint256()) {
             return SyncObjects(peer, connman);
         } else {
@@ -274,7 +274,7 @@ MessageProcessingResult CGovernanceManager::ProcessMessage(CNode& peer, CConnman
             return ret;
         }
 
-        LOCK2(::cs_main, cs);
+        LOCK2(::cs_main, cs_store);
 
         if (mapObjects.count(nHash) || mapPostponedObjects.count(nHash) || mapErasedGovernanceObjects.count(nHash)) {
             // TODO - print error code? what if it's GOVOBJ_ERROR_IMMATURE?
@@ -365,14 +365,14 @@ MessageProcessingResult CGovernanceManager::ProcessMessage(CNode& peer, CConnman
 
 void CGovernanceManager::CheckOrphanVotes(CGovernanceObject& govobj)
 {
-    AssertLockHeld(cs);
+    AssertLockHeld(cs_store);
     AssertLockNotHeld(cs_relay);
 
     uint256 nHash = govobj.GetHash();
     std::vector<vote_time_pair_t> vecVotePairs;
     cmmapOrphanVotes.GetAll(nHash, vecVotePairs);
 
-    ScopedLockBool guard(cs, fRateChecksEnabled, false);
+    ScopedLockBool guard(cs_store, fRateChecksEnabled, false);
 
     int64_t nNow = GetAdjustedTime();
     const auto tip_mn_list = Assert(m_dmnman)->GetListAtChainTip();
@@ -404,7 +404,7 @@ void CGovernanceManager::AddGovernanceObject(CGovernanceObject& govobj, const CN
 
     govobj.UpdateSentinelVariables(tip_mn_list); //this sets local vars in object
 
-    LOCK2(::cs_main, cs);
+    LOCK2(::cs_main, cs_store);
     std::string strError;
 
     // MAKE SURE THIS OBJECT IS OK
@@ -455,7 +455,7 @@ void CGovernanceManager::AddGovernanceObject(CGovernanceObject& govobj, const CN
 
 void CGovernanceManager::CheckAndRemove()
 {
-    AssertLockNotHeld(cs);
+    AssertLockNotHeld(cs_store);
     assert(m_mn_metaman.IsValid());
 
     // Return on initial sync, spammed the debug.log and provided no use
@@ -468,7 +468,7 @@ void CGovernanceManager::CheckAndRemove()
     const auto tip_mn_list = Assert(m_dmnman)->GetListAtChainTip();
 
     {
-    LOCK2(::cs_main, cs);
+    LOCK2(::cs_main, cs_store);
 
     for (const uint256& nHash : vecDirtyHashes) {
         auto it = mapObjects.find(nHash);
@@ -478,7 +478,7 @@ void CGovernanceManager::CheckAndRemove()
         it->second.ClearMasternodeVotes(tip_mn_list);
     }
 
-    ScopedLockBool guard(cs, fRateChecksEnabled, false);
+    ScopedLockBool guard(cs_store, fRateChecksEnabled, false);
 
     // Clean up any expired or invalid triggers
     CleanAndRemoveTriggers();
@@ -579,13 +579,13 @@ void CGovernanceManager::CheckAndRemove()
 
 const CGovernanceObject* CGovernanceManager::FindConstGovernanceObject(const uint256& nHash) const
 {
-    LOCK(cs);
+    LOCK(cs_store);
     return FindConstGovernanceObjectInternal(nHash);
 }
 
 const CGovernanceObject* CGovernanceManager::FindConstGovernanceObjectInternal(const uint256& nHash) const
 {
-    AssertLockHeld(cs);
+    AssertLockHeld(cs_store);
 
     auto it = mapObjects.find(nHash);
     if (it != mapObjects.end()) return &(it->second);
@@ -595,22 +595,22 @@ const CGovernanceObject* CGovernanceManager::FindConstGovernanceObjectInternal(c
 
 CGovernanceObject* CGovernanceManager::FindGovernanceObject(const uint256& nHash)
 {
-    AssertLockNotHeld(cs);
-    LOCK(cs);
+    AssertLockNotHeld(cs_store);
+    LOCK(cs_store);
     return FindGovernanceObjectInternal(nHash);
 }
 
 CGovernanceObject* CGovernanceManager::FindGovernanceObjectInternal(const uint256& nHash)
 {
-    AssertLockHeld(cs);
+    AssertLockHeld(cs_store);
     if (mapObjects.count(nHash)) return &mapObjects[nHash];
     return nullptr;
 }
 
 CGovernanceObject* CGovernanceManager::FindGovernanceObjectByDataHash(const uint256 &nDataHash)
 {
-    AssertLockNotHeld(cs);
-    LOCK(cs);
+    AssertLockNotHeld(cs_store);
+    LOCK(cs_store);
     for (const auto& [nHash, object] : mapObjects) {
         if (object.GetDataHash() == nDataHash) return &mapObjects[nHash];
     }
@@ -619,7 +619,7 @@ CGovernanceObject* CGovernanceManager::FindGovernanceObjectByDataHash(const uint
 
 std::vector<CGovernanceVote> CGovernanceManager::GetCurrentVotes(const uint256& nParentHash, const COutPoint& mnCollateralOutpointFilter) const
 {
-    LOCK(cs);
+    LOCK(cs_store);
     std::vector<CGovernanceVote> vecResult;
 
     // Find the governance object or short-circuit.
@@ -659,7 +659,7 @@ std::vector<CGovernanceVote> CGovernanceManager::GetCurrentVotes(const uint256&
 
 void CGovernanceManager::GetAllNewerThan(std::vector<CGovernanceObject>& objs, int64_t nMoreThanTime) const
 {
-    LOCK(cs);
+    LOCK(cs_store);
 
     for (const auto& objPair : mapObjects) {
         // IF THIS OBJECT IS OLDER THAN TIME, CONTINUE
@@ -674,12 +674,12 @@ void CGovernanceManager::GetAllNewerThan(std::vector<CGovernanceObject>& objs, i
 
 bool CGovernanceManager::ConfirmInventoryRequest(const CInv& inv)
 {
-    AssertLockNotHeld(cs);
+    AssertLockNotHeld(cs_store);
 
     // do not request objects until it's time to sync
     if (!m_mn_sync.IsBlockchainSynced()) return false;
 
-    LOCK(cs);
+    LOCK(cs_store);
 
     LogPrint(BCLog::GOBJECT, "CGovernanceManager::ConfirmInventoryRequest inv = %s\n", inv.ToString());
 
@@ -719,7 +719,7 @@ bool CGovernanceManager::ConfirmInventoryRequest(const CInv& inv)
 
 MessageProcessingResult CGovernanceManager::SyncSingleObjVotes(CNode& peer, const uint256& nProp, const CBloomFilter& filter, CConnman& connman)
 {
-    AssertLockHeld(cs);
+    AssertLockHeld(cs_store);
     // do not provide any data until our node is synced
     if (!m_mn_sync.IsSynced()) return {};
 
@@ -769,7 +769,7 @@ MessageProcessingResult CGovernanceManager::SyncSingleObjVotes(CNode& peer, cons
 
 MessageProcessingResult CGovernanceManager::SyncObjects(CNode& peer, CConnman& connman) const
 {
-    AssertLockHeld(cs);
+    AssertLockHeld(cs_store);
     assert(m_netfulfilledman.IsValid());
 
     // do not provide any data until our node is synced
@@ -816,7 +816,7 @@ MessageProcessingResult CGovernanceManager::SyncObjects(CNode& peer, CConnman& c
 
 void CGovernanceManager::MasternodeRateUpdate(const CGovernanceObject& govobj)
 {
-    AssertLockHeld(cs);
+    AssertLockHeld(cs_store);
 
     if (govobj.GetObjectType() != GovernanceObject::TRIGGER) return;
 
@@ -840,14 +840,14 @@ void CGovernanceManager::MasternodeRateUpdate(const CGovernanceObject& govobj)
 
 bool CGovernanceManager::MasternodeRateCheck(const CGovernanceObject& govobj, bool fUpdateFailStatus)
 {
-    LOCK(cs);
+    LOCK(cs_store);
     bool fRateCheckBypassed;
     return MasternodeRateCheck(govobj, fUpdateFailStatus, true, fRateCheckBypassed);
 }
 
 bool CGovernanceManager::MasternodeRateCheck(const CGovernanceObject& govobj, bool fUpdateFailStatus, bool fForce, bool& fRateCheckBypassed)
 {
-    AssertLockHeld(cs);
+    AssertLockHeld(cs_store);
 
     fRateCheckBypassed = false;
 
@@ -911,7 +911,7 @@ bool CGovernanceManager::MasternodeRateCheck(const CGovernanceObject& govobj, bo
 
 bool CGovernanceManager::ProcessVoteAndRelay(const CGovernanceVote& vote, CGovernanceException& exception, CConnman& connman)
 {
-    AssertLockNotHeld(cs);
+    AssertLockNotHeld(cs_store);
     AssertLockNotHeld(cs_relay);
     bool fOK = ProcessVote(/*pfrom=*/nullptr, vote, exception, connman);
     if (fOK) {
@@ -922,15 +922,15 @@ bool CGovernanceManager::ProcessVoteAndRelay(const CGovernanceVote& vote, CGover
 
 bool CGovernanceManager::ProcessVote(CNode* pfrom, const CGovernanceVote& vote, CGovernanceException& exception, CConnman& connman)
 {
-    AssertLockNotHeld(cs);
-    ENTER_CRITICAL_SECTION(cs);
+    AssertLockNotHeld(cs_store);
+    ENTER_CRITICAL_SECTION(cs_store);
     uint256 nHashVote = vote.GetHash();
     uint256 nHashGovobj = vote.GetParentHash();
 
     if (cmapVoteToObject.HasKey(nHashVote)) {
         LogPrint(BCLog::GOBJECT, "CGovernanceObject::%s -- skipping known valid vote %s for object %s\n", __func__,
             nHashVote.ToString(), nHashGovobj.ToString());
-        LEAVE_CRITICAL_SECTION(cs);
+        LEAVE_CRITICAL_SECTION(cs_store);
         return false;
     }
 
@@ -939,7 +939,7 @@ bool CGovernanceManager::ProcessVote(CNode* pfrom, const CGovernanceVote& vote,
             __func__, vote.GetMasternodeOutpoint().ToStringShort(), nHashGovobj.ToString())};
         LogPrint(BCLog::GOBJECT, "%s\n", msg);
         exception = CGovernanceException(msg, GOVERNANCE_EXCEPTION_PERMANENT_ERROR, 20);
-        LEAVE_CRITICAL_SECTION(cs);
+        LEAVE_CRITICAL_SECTION(cs_store);
         return false;
     }
 
@@ -950,14 +950,14 @@ bool CGovernanceManager::ProcessVote(CNode* pfrom, const CGovernanceVote& vote,
         exception = CGovernanceException(msg, GOVERNANCE_EXCEPTION_WARNING);
         if (cmmapOrphanVotes.Insert(nHashGovobj, vote_time_pair_t(vote, count_seconds(GetTime<std::chrono::seconds>() +
                                                                                       GOVERNANCE_ORPHAN_EXPIRATION_TIME)))) {
-            LEAVE_CRITICAL_SECTION(cs);
+            LEAVE_CRITICAL_SECTION(cs_store);
             RequestGovernanceObject(pfrom, nHashGovobj, connman);
             LogPrint(BCLog::GOBJECT, "%s\n", msg);
             return false;
         }
 
         LogPrint(BCLog::GOBJECT, "%s\n", msg);
-        LEAVE_CRITICAL_SECTION(cs);
+        LEAVE_CRITICAL_SECTION(cs_store);
         return false;
     }
 
@@ -966,18 +966,18 @@ bool CGovernanceManager::ProcessVote(CNode* pfrom, const CGovernanceVote& vote,
     if (govobj.IsSetCachedDelete() || govobj.IsSetExpired()) {
         LogPrint(BCLog::GOBJECT, "CGovernanceObject::%s -- ignoring vote for expired or deleted object, hash = %s\n",
             __func__, nHashGovobj.ToString());
-        LEAVE_CRITICAL_SECTION(cs);
+        LEAVE_CRITICAL_SECTION(cs_store);
         return false;
     }
 
     bool fOk = govobj.ProcessVote(m_mn_metaman, *this, Assert(m_dmnman)->GetListAtChainTip(), vote, exception) && cmapVoteToObject.Insert(nHashVote, &govobj);
-    LEAVE_CRITICAL_SECTION(cs);
+    LEAVE_CRITICAL_SECTION(cs_store);
     return fOk;
 }
 
 void CGovernanceManager::CheckPostponedObjects()
 {
-    AssertLockHeld(cs);
+    AssertLockHeld(cs_store);
     AssertLockNotHeld(cs_relay);
     if (!m_mn_sync.IsSynced()) return;
 
@@ -1046,7 +1046,7 @@ void CGovernanceManager::CheckPostponedObjects()
 
 void CGovernanceManager::RequestGovernanceObject(CNode* pfrom, const uint256& nHash, CConnman& connman, bool fUseFilter) const
 {
-    AssertLockNotHeld(cs);
+    AssertLockNotHeld(cs_store);
     if (!pfrom) {
         return;
     }
@@ -1059,7 +1059,7 @@ void CGovernanceManager::RequestGovernanceObject(CNode* pfrom, const uint256& nH
 
     size_t nVoteCount = 0;
     if (fUseFilter) {
-        LOCK(cs);
+        LOCK(cs_store);
         const CGovernanceObject* pObj = FindConstGovernanceObjectInternal(nHash);
 
         if (pObj) {
@@ -1078,7 +1078,7 @@ void CGovernanceManager::RequestGovernanceObject(CNode* pfrom, const uint256& nH
 
 void CGovernanceManager::AddInvalidVote(const CGovernanceVote& vote)
 {
-    LOCK(cs);
+    LOCK(cs_store);
     cmapInvalidVotes.Insert(vote.GetHash(), vote);
 }
 
@@ -1091,7 +1091,7 @@ int CGovernanceManager::RequestGovernanceObjectVotes(CNode& peer, CConnman& conn
 int CGovernanceManager::RequestGovernanceObjectVotes(const std::vector<CNode*>& vNodesCopy, CConnman& connman,
                                                      const PeerManager& peerman) const
 {
-    AssertLockNotHeld(cs);
+    AssertLockNotHeld(cs_store);
 
     static std::map<uint256, std::map<CService, int64_t> > mapAskedRecently;
     // Maximum number of nodes to request votes from for the same object hash on real networks
@@ -1124,7 +1124,7 @@ int CGovernanceManager::RequestGovernanceObjectVotes(const std::vector<CNode*>&
     }
 
     {
-        LOCK(cs);
+        LOCK(cs_store);
 
         if (mapObjects.empty()) return -2;
 
@@ -1203,8 +1203,8 @@ int CGovernanceManager::RequestGovernanceObjectVotes(const std::vector<CNode*>&
 
 bool CGovernanceManager::AcceptMessage(const uint256& nHash)
 {
-    AssertLockNotHeld(cs);
-    LOCK(cs);
+    AssertLockNotHeld(cs_store);
+    LOCK(cs_store);
     auto it = m_requested_hash_time.find(nHash);
     if (it == m_requested_hash_time.end()) {
         // We never requested this
@@ -1217,7 +1217,7 @@ bool CGovernanceManager::AcceptMessage(const uint256& nHash)
 
 void CGovernanceManager::RebuildIndexes()
 {
-    AssertLockHeld(cs);
+    AssertLockHeld(cs_store);
 
     cmapVoteToObject.Clear();
     for (auto& objPair : mapObjects) {
@@ -1231,7 +1231,7 @@ void CGovernanceManager::RebuildIndexes()
 
 void CGovernanceManager::AddCachedTriggers()
 {
-    AssertLockHeld(cs);
+    AssertLockHeld(cs_store);
 
     int64_t nNow = GetTime<std::chrono::seconds>().count();
 
@@ -1251,7 +1251,7 @@ void CGovernanceManager::AddCachedTriggers()
 void CGovernanceManager::InitOnLoad()
 {
     {
-    LOCK(cs);
+    LOCK(cs_store);
     const auto start{SteadyClock::now()};
     LogPrintf("Preparing masternode indexes and governance triggers...\n");
     RebuildIndexes();
@@ -1264,7 +1264,7 @@ void CGovernanceManager::InitOnLoad()
 
 void GovernanceStore::Clear()
 {
-    LOCK(cs);
+    LOCK(cs_store);
     mapObjects.clear();
     mapErasedGovernanceObjects.clear();
     cmapInvalidVotes.Clear();
@@ -1274,7 +1274,7 @@ void GovernanceStore::Clear()
 
 void CGovernanceManager::Clear()
 {
-    AssertLockNotHeld(cs);
+    AssertLockNotHeld(cs_store);
     LogPrint(BCLog::GOBJECT, "Governance object manager was cleared\n");
     GovernanceStore::Clear();
     cmapVoteToObject.Clear();
@@ -1282,7 +1282,7 @@ void CGovernanceManager::Clear()
 
 std::string GovernanceStore::ToString() const
 {
-    LOCK(cs);
+    LOCK(cs_store);
 
     int nProposalCount = 0;
     int nTriggerCount = 0;
@@ -1309,13 +1309,13 @@ std::string GovernanceStore::ToString() const
 
 std::string CGovernanceManager::ToString() const
 {
-    AssertLockNotHeld(cs);
+    AssertLockNotHeld(cs_store);
     return strprintf("%s, Votes: %d", GovernanceStore::ToString(), (int)cmapVoteToObject.GetSize());
 }
 
 UniValue CGovernanceManager::ToJson() const
 {
-    LOCK(cs);
+    LOCK(cs_store);
 
     int nProposalCount = 0;
     int nTriggerCount = 0;
@@ -1347,7 +1347,7 @@ UniValue CGovernanceManager::ToJson() const
 
 void CGovernanceManager::UpdatedBlockTip(const CBlockIndex* pindex)
 {
-    AssertLockNotHeld(cs);
+    AssertLockNotHeld(cs_store);
     AssertLockNotHeld(cs_relay);
     // Note this gets called from ActivateBestChain without cs_main being held
     // so it should be safe to lock our mutex here without risking a deadlock
@@ -1361,7 +1361,7 @@ void CGovernanceManager::UpdatedBlockTip(const CBlockIndex* pindex)
     nCachedBlockHeight = pindex->nHeight;
     LogPrint(BCLog::GOBJECT, "CGovernanceManager::UpdatedBlockTip -- nCachedBlockHeight: %d\n", nCachedBlockHeight);
 
-    LOCK(cs);
+    LOCK(cs_store);
     if (DeploymentDIP0003Enforced(pindex->nHeight, Params().GetConsensus())) {
         RemoveInvalidVotes();
     }
@@ -1373,12 +1373,12 @@ void CGovernanceManager::UpdatedBlockTip(const CBlockIndex* pindex)
 
 void CGovernanceManager::RequestOrphanObjects(CConnman& connman)
 {
-    AssertLockNotHeld(cs);
+    AssertLockNotHeld(cs_store);
     const CConnman::NodesSnapshot snap{connman, /* cond = */ CConnman::FullyConnectedOnly};
 
     std::vector<uint256> vecHashesFiltered;
     {
-        LOCK(cs);
+        LOCK(cs_store);
         std::vector<uint256> vecHashes;
         cmmapOrphanVotes.GetKeys(vecHashes);
         for (const uint256& nHash : vecHashes) {
@@ -1401,7 +1401,7 @@ void CGovernanceManager::RequestOrphanObjects(CConnman& connman)
 
 void CGovernanceManager::CleanOrphanObjects()
 {
-    LOCK(cs);
+    LOCK(cs_store);
     const vote_cmm_t::list_t& items = cmmapOrphanVotes.GetItemList();
 
     int64_t nNow = GetTime<std::chrono::seconds>().count();
@@ -1419,7 +1419,7 @@ void CGovernanceManager::CleanOrphanObjects()
 
 void CGovernanceManager::RemoveInvalidVotes()
 {
-    AssertLockHeld(cs);
+    AssertLockHeld(cs_store);
 
     if (!m_mn_sync.IsSynced()) {
         return;
@@ -1473,7 +1473,7 @@ void CGovernanceManager::RemoveInvalidVotes()
 
 bool CGovernanceManager::AddNewTrigger(uint256 nHash)
 {
-    AssertLockHeld(cs);
+    AssertLockHeld(cs_store);
 
     // IF WE ALREADY HAVE THIS HASH, RETURN
     if (mapTrigger.count(nHash)) {
@@ -1512,7 +1512,7 @@ bool CGovernanceManager::AddNewTrigger(uint256 nHash)
 
 void CGovernanceManager::CleanAndRemoveTriggers()
 {
-    AssertLockHeld(cs);
+    AssertLockHeld(cs_store);
 
     // Remove triggers that are invalid or expired
     LogPrint(BCLog::GOBJECT, "CGovernanceManager::%s -- mapTrigger.size() = %d\n", __func__, mapTrigger.size());
@@ -1581,14 +1581,14 @@ void CGovernanceManager::CleanAndRemoveTriggers()
  */
 std::vector<CSuperblock_sptr> CGovernanceManager::GetActiveTriggers() const
 {
-    AssertLockNotHeld(cs);
-    LOCK(cs);
+    AssertLockNotHeld(cs_store);
+    LOCK(cs_store);
     return GetActiveTriggersInternal();
 }
 
 std::vector<CSuperblock_sptr> CGovernanceManager::GetActiveTriggersInternal() const
 {
-    AssertLockHeld(cs);
+    AssertLockHeld(cs_store);
     std::vector<CSuperblock_sptr> vecResults;
 
     // LOOK AT THESE OBJECTS AND COMPILE A VALID LIST OF TRIGGERS
@@ -1604,13 +1604,13 @@ std::vector<CSuperblock_sptr> CGovernanceManager::GetActiveTriggersInternal() co
 
 bool CGovernanceManager::IsSuperblockTriggered(const CDeterministicMNList& tip_mn_list, int nBlockHeight)
 {
-    AssertLockNotHeld(cs);
+    AssertLockNotHeld(cs_store);
     LogPrint(BCLog::GOBJECT, "IsSuperblockTriggered -- Start nBlockHeight = %d\n", nBlockHeight);
     if (!CSuperblock::IsValidBlockHeight(nBlockHeight)) {
         return false;
     }
 
-    LOCK(cs);
+    LOCK(cs_store);
     // GET ALL ACTIVE TRIGGERS
     std::vector<CSuperblock_sptr> vecTriggers = GetActiveTriggersInternal();
 
@@ -1658,8 +1658,8 @@ bool CGovernanceManager::IsSuperblockTriggered(const CDeterministicMNList& tip_m
 bool CGovernanceManager::GetBestSuperblock(const CDeterministicMNList& tip_mn_list, CSuperblock_sptr& pSuperblockRet,
                                            int nBlockHeight)
 {
-    AssertLockNotHeld(cs);
-    LOCK(cs);
+    AssertLockNotHeld(cs_store);
+    LOCK(cs_store);
     return GetBestSuperblockInternal(tip_mn_list, pSuperblockRet, nBlockHeight);
 }
 
@@ -1670,7 +1670,7 @@ bool CGovernanceManager::GetBestSuperblockInternal(const CDeterministicMNList& t
         return false;
     }
 
-    AssertLockHeld(cs);
+    AssertLockHeld(cs_store);
     std::vector<CSuperblock_sptr> vecTriggers = GetActiveTriggersInternal();
     int nYesCount = 0;
 
@@ -1699,7 +1699,7 @@ bool CGovernanceManager::GetBestSuperblockInternal(const CDeterministicMNList& t
 bool CGovernanceManager::GetSuperblockPayments(const CDeterministicMNList& tip_mn_list, int nBlockHeight,
                                                std::vector<CTxOut>& voutSuperblockRet)
 {
-    LOCK(cs);
+    LOCK(cs_store);
 
     // GET THE BEST SUPERBLOCK FOR THIS BLOCK HEIGHT
 
@@ -1747,7 +1747,7 @@ bool CGovernanceManager::IsValidSuperblock(const CChain& active_chain, const CDe
                                            const CTransaction& txNew, int nBlockHeight, CAmount blockReward)
 {
     // GET BEST SUPERBLOCK, SHOULD MATCH
-    LOCK(cs);
+    LOCK(cs_store);
 
     CSuperblock_sptr pSuperblock;
     if (GetBestSuperblockInternal(tip_mn_list, pSuperblock, nBlockHeight)) {
@@ -1759,7 +1759,7 @@ bool CGovernanceManager::IsValidSuperblock(const CChain& active_chain, const CDe
 
 void CGovernanceManager::ExecuteBestSuperblock(const CDeterministicMNList& tip_mn_list, int nBlockHeight)
 {
-    AssertLockHeld(cs);
+    AssertLockHeld(cs_store);
 
     CSuperblock_sptr pSuperblock;
     if (GetBestSuperblockInternal(tip_mn_list, pSuperblock, nBlockHeight)) {
@@ -1772,7 +1772,7 @@ void CGovernanceManager::ExecuteBestSuperblock(const CDeterministicMNList& tip_m
 std::vector<std::shared_ptr<const CGovernanceObject>> CGovernanceManager::GetApprovedProposals(
     const CDeterministicMNList& tip_mn_list)
 {
-    AssertLockNotHeld(cs);
+    AssertLockNotHeld(cs_store);
 
     // Use std::vector of std::shared_ptr<const CGovernanceObject> because CGovernanceObject doesn't support move operations (needed for sorting the vector later)
     std::vector<std::shared_ptr<const CGovernanceObject>> ret{};
@@ -1782,7 +1782,7 @@ std::vector<std::shared_ptr<const CGovernanceObject>> CGovernanceManager::GetApp
     const int nWeightedMnCount = tip_mn_list.GetValidWeightedMNsCount();
     const int nAbsVoteReq = std::max(Params().GetConsensus().nGovernanceMinQuorum, nWeightedMnCount / 10);
 
-    LOCK(cs);
+    LOCK(cs_store);
     for (const auto& [unused, object] : mapObjects) {
         // Skip all non-proposals objects
         if (object.GetObjectType() != GovernanceObject::PROPOSAL) continue;
diff --git a/src/governance/governance.h b/src/governance/governance.h
index b9ca42ddfe42..f63b10597124 100644
--- a/src/governance/governance.h
+++ b/src/governance/governance.h
@@ -179,28 +179,28 @@ class GovernanceStore
 
 protected:
     // critical section to protect the inner data structures
-    mutable RecursiveMutex cs;
+    mutable Mutex cs_store;
 
     // keep track of the scanning errors
-    std::map<uint256, CGovernanceObject> mapObjects GUARDED_BY(cs);
+    std::map<uint256, CGovernanceObject> mapObjects GUARDED_BY(cs_store);
     // mapErasedGovernanceObjects contains key-value pairs, where
     //   key   - governance object's hash
     //   value - expiration time for deleted objects
-    std::map<uint256, int64_t> mapErasedGovernanceObjects GUARDED_BY(cs);
-    CacheMap<uint256, CGovernanceVote> cmapInvalidVotes GUARDED_BY(cs);
-    vote_cmm_t cmmapOrphanVotes GUARDED_BY(cs);
-    txout_m_t mapLastMasternodeObject GUARDED_BY(cs);
+    std::map<uint256, int64_t> mapErasedGovernanceObjects GUARDED_BY(cs_store);
+    CacheMap<uint256, CGovernanceVote> cmapInvalidVotes GUARDED_BY(cs_store);
+    vote_cmm_t cmmapOrphanVotes GUARDED_BY(cs_store);
+    txout_m_t mapLastMasternodeObject GUARDED_BY(cs_store);
     // used to check for changed voting keys
-    std::shared_ptr<CDeterministicMNList> lastMNListForVotingKeys GUARDED_BY(cs);
+    std::shared_ptr<CDeterministicMNList> lastMNListForVotingKeys GUARDED_BY(cs_store);
 
 public:
     GovernanceStore();
     ~GovernanceStore() = default;
 
     template<typename Stream>
-    void Serialize(Stream &s) const EXCLUSIVE_LOCKS_REQUIRED(!cs)
+    void Serialize(Stream &s) const EXCLUSIVE_LOCKS_REQUIRED(!cs_store)
     {
-        LOCK(cs);
+        LOCK(cs_store);
         s   << SERIALIZATION_VERSION_STRING
             << mapErasedGovernanceObjects
             << cmapInvalidVotes
@@ -211,11 +211,11 @@ class GovernanceStore
     }
 
     template<typename Stream>
-    void Unserialize(Stream &s) EXCLUSIVE_LOCKS_REQUIRED(!cs)
+    void Unserialize(Stream &s) EXCLUSIVE_LOCKS_REQUIRED(!cs_store)
     {
         Clear();
 
-        LOCK(cs);
+        LOCK(cs_store);
         std::string strVersion;
         s >> strVersion;
         if (strVersion != SERIALIZATION_VERSION_STRING) {
@@ -231,10 +231,10 @@ class GovernanceStore
     }
 
     void Clear()
-        EXCLUSIVE_LOCKS_REQUIRED(!cs);
+        EXCLUSIVE_LOCKS_REQUIRED(!cs_store);
 
     std::string ToString() const
-        EXCLUSIVE_LOCKS_REQUIRED(!cs);
+        EXCLUSIVE_LOCKS_REQUIRED(!cs_store);
 };
 
 //
@@ -280,30 +280,30 @@ class CGovernanceManager : public GovernanceStore, public GovernanceSignerParent
     // Basic initialization and querying
     bool IsValid() const override { return is_valid; }
     bool LoadCache(bool load_cache)
-        EXCLUSIVE_LOCKS_REQUIRED(!cs);
+        EXCLUSIVE_LOCKS_REQUIRED(!cs_store);
     std::string ToString() const
-        EXCLUSIVE_LOCKS_REQUIRED(!cs);
+        EXCLUSIVE_LOCKS_REQUIRED(!cs_store);
     UniValue ToJson() const
-        EXCLUSIVE_LOCKS_REQUIRED(!cs);
+        EXCLUSIVE_LOCKS_REQUIRED(!cs_store);
     void Clear()
-        EXCLUSIVE_LOCKS_REQUIRED(!cs);
+        EXCLUSIVE_LOCKS_REQUIRED(!cs_store);
     void CheckAndRemove()
-        EXCLUSIVE_LOCKS_REQUIRED(!cs);
+        EXCLUSIVE_LOCKS_REQUIRED(!cs_store);
     void Schedule(CScheduler& scheduler, CConnman& connman, PeerManager& peerman)
-        EXCLUSIVE_LOCKS_REQUIRED(!cs, !cs_relay);
+        EXCLUSIVE_LOCKS_REQUIRED(!cs_store, !cs_relay);
 
     // CGovernanceObject
     bool AreRateChecksEnabled() const { return fRateChecksEnabled; }
     void AddInvalidVote(const CGovernanceVote& vote)
-        EXCLUSIVE_LOCKS_REQUIRED(!cs);
+        EXCLUSIVE_LOCKS_REQUIRED(!cs_store);
 
     // Getters/Setters
     int GetCachedBlockHeight() const override { return nCachedBlockHeight; }
     int64_t GetLastDiffTime() const { return nTimeLastDiff; }
     std::vector<CGovernanceVote> GetCurrentVotes(const uint256& nParentHash, const COutPoint& mnCollateralOutpointFilter) const
-        EXCLUSIVE_LOCKS_REQUIRED(!cs);
+        EXCLUSIVE_LOCKS_REQUIRED(!cs_store);
     void GetAllNewerThan(std::vector<CGovernanceObject>& objs, int64_t nMoreThanTime) const
-        EXCLUSIVE_LOCKS_REQUIRED(!cs);
+        EXCLUSIVE_LOCKS_REQUIRED(!cs_store);
     void UpdateLastDiffTime(int64_t nTimeIn) { nTimeLastDiff = nTimeIn; }
 
     // Networking
@@ -313,17 +313,17 @@ class CGovernanceManager : public GovernanceStore, public GovernanceSignerParent
      * false. (Note logic is inverted in AlreadyHave).
      */
     bool ConfirmInventoryRequest(const CInv& inv)
-        EXCLUSIVE_LOCKS_REQUIRED(!cs);
+        EXCLUSIVE_LOCKS_REQUIRED(!cs_store);
     bool ProcessVoteAndRelay(const CGovernanceVote& vote, CGovernanceException& exception, CConnman& connman) override
-        EXCLUSIVE_LOCKS_REQUIRED(!cs, !cs_relay);
+        EXCLUSIVE_LOCKS_REQUIRED(!cs_store, !cs_relay);
     int RequestGovernanceObjectVotes(CNode& peer, CConnman& connman, const PeerManager& peerman) const
-        EXCLUSIVE_LOCKS_REQUIRED(!cs);
+        EXCLUSIVE_LOCKS_REQUIRED(!cs_store);
     int RequestGovernanceObjectVotes(const std::vector<CNode*>& vNodesCopy, CConnman& connman,
                                      const PeerManager& peerman) const
-        EXCLUSIVE_LOCKS_REQUIRED(!cs);
+        EXCLUSIVE_LOCKS_REQUIRED(!cs_store);
     [[nodiscard]] MessageProcessingResult ProcessMessage(CNode& peer, CConnman& connman, std::string_view msg_type,
                                                          CDataStream& vRecv)
-        EXCLUSIVE_LOCKS_REQUIRED(!cs, !cs_relay);
+        EXCLUSIVE_LOCKS_REQUIRED(!cs_store, !cs_relay);
     void RelayObject(const CGovernanceObject& obj)
         EXCLUSIVE_LOCKS_REQUIRED(!cs_relay);
     void RelayVote(const CGovernanceVote& vote)
@@ -331,85 +331,85 @@ class CGovernanceManager : public GovernanceStore, public GovernanceSignerParent
 
     // Notification interface trigger
     void UpdatedBlockTip(const CBlockIndex* pindex)
-        EXCLUSIVE_LOCKS_REQUIRED(!cs, !cs_relay);
+        EXCLUSIVE_LOCKS_REQUIRED(!cs_store, !cs_relay);
 
     // Signer interface
     bool MasternodeRateCheck(const CGovernanceObject& govobj, bool fUpdateFailStatus = false) override
-        EXCLUSIVE_LOCKS_REQUIRED(!cs);
+        EXCLUSIVE_LOCKS_REQUIRED(!cs_store);
     CGovernanceObject* FindGovernanceObjectByDataHash(const uint256& nDataHash) override
-        EXCLUSIVE_LOCKS_REQUIRED(!cs);
+        EXCLUSIVE_LOCKS_REQUIRED(!cs_store);
     std::vector<std::shared_ptr<const CGovernanceObject>> GetApprovedProposals(const CDeterministicMNList& tip_mn_list) override
-        EXCLUSIVE_LOCKS_REQUIRED(!cs);
+        EXCLUSIVE_LOCKS_REQUIRED(!cs_store);
     void AddGovernanceObject(CGovernanceObject& govobj, const CNode* pfrom = nullptr) override
         EXCLUSIVE_LOCKS_REQUIRED(!cs_relay);
 
     // Superblocks
     bool GetSuperblockPayments(const CDeterministicMNList& tip_mn_list, int nBlockHeight,
                                std::vector<CTxOut>& voutSuperblockRet)
-        EXCLUSIVE_LOCKS_REQUIRED(!cs);
+        EXCLUSIVE_LOCKS_REQUIRED(!cs_store);
     bool IsSuperblockTriggered(const CDeterministicMNList& tip_mn_list, int nBlockHeight)
-        EXCLUSIVE_LOCKS_REQUIRED(!cs);
+        EXCLUSIVE_LOCKS_REQUIRED(!cs_store);
     bool IsValidSuperblock(const CChain& active_chain, const CDeterministicMNList& tip_mn_list,
                            const CTransaction& txNew, int nBlockHeight, CAmount blockReward)
-        EXCLUSIVE_LOCKS_REQUIRED(!cs);
+        EXCLUSIVE_LOCKS_REQUIRED(!cs_store);
 
     // Thread-safe accessors
     bool GetBestSuperblock(const CDeterministicMNList& tip_mn_list, CSuperblock_sptr& pSuperblockRet,
                            int nBlockHeight) override
-        EXCLUSIVE_LOCKS_REQUIRED(!cs);
+        EXCLUSIVE_LOCKS_REQUIRED(!cs_store);
     bool HaveObjectForHash(const uint256& nHash) const
-        EXCLUSIVE_LOCKS_REQUIRED(!cs);
+        EXCLUSIVE_LOCKS_REQUIRED(!cs_store);
     bool HaveVoteForHash(const uint256& nHash) const
-        EXCLUSIVE_LOCKS_REQUIRED(!cs);
+        EXCLUSIVE_LOCKS_REQUIRED(!cs_store);
     bool SerializeObjectForHash(const uint256& nHash, CDataStream& ss) const
-        EXCLUSIVE_LOCKS_REQUIRED(!cs);
+        EXCLUSIVE_LOCKS_REQUIRED(!cs_store);
     bool SerializeVoteForHash(const uint256& nHash, CDataStream& ss) const
-        EXCLUSIVE_LOCKS_REQUIRED(!cs);
+        EXCLUSIVE_LOCKS_REQUIRED(!cs_store);
     CGovernanceObject* FindGovernanceObject(const uint256& nHash) override
-        EXCLUSIVE_LOCKS_REQUIRED(!cs);
+        EXCLUSIVE_LOCKS_REQUIRED(!cs_store);
     int GetVoteCount() const
-        EXCLUSIVE_LOCKS_REQUIRED(!cs);
+        EXCLUSIVE_LOCKS_REQUIRED(!cs_store);
     std::vector<std::shared_ptr<CSuperblock>> GetActiveTriggers() const override
-        EXCLUSIVE_LOCKS_REQUIRED(!cs);
+        EXCLUSIVE_LOCKS_REQUIRED(!cs_store);
     void AddPostponedObject(const CGovernanceObject& govobj)
-        EXCLUSIVE_LOCKS_REQUIRED(!cs);
+        EXCLUSIVE_LOCKS_REQUIRED(!cs_store);
 
     const CGovernanceObject* FindConstGovernanceObject(const uint256& nHash) const
-        EXCLUSIVE_LOCKS_REQUIRED(!cs);
+        EXCLUSIVE_LOCKS_REQUIRED(!cs_store);
 
 private:
     // Branches of ProcessMessage
     [[nodiscard]] MessageProcessingResult SyncObjects(CNode& peer, CConnman& connman) const
-        EXCLUSIVE_LOCKS_REQUIRED(cs);
+        EXCLUSIVE_LOCKS_REQUIRED(cs_store);
     [[nodiscard]] MessageProcessingResult SyncSingleObjVotes(CNode& peer, const uint256& nProp, const CBloomFilter& filter,
                                                              CConnman& connman)
-        EXCLUSIVE_LOCKS_REQUIRED(cs);
+        EXCLUSIVE_LOCKS_REQUIRED(cs_store);
 
     // Internal counterparts to "Thread-safe accessors"
     void AddPostponedObjectInternal(const CGovernanceObject& govobj)
-        EXCLUSIVE_LOCKS_REQUIRED(cs);
+        EXCLUSIVE_LOCKS_REQUIRED(cs_store);
     bool GetBestSuperblockInternal(const CDeterministicMNList& tip_mn_list, CSuperblock_sptr& pSuperblockRet,
                                    int nBlockHeight)
-        EXCLUSIVE_LOCKS_REQUIRED(cs);
+        EXCLUSIVE_LOCKS_REQUIRED(cs_store);
     CGovernanceObject* FindGovernanceObjectInternal(const uint256& nHash)
-        EXCLUSIVE_LOCKS_REQUIRED(cs);
+        EXCLUSIVE_LOCKS_REQUIRED(cs_store);
     std::vector<std::shared_ptr<CSuperblock>> GetActiveTriggersInternal() const
-        EXCLUSIVE_LOCKS_REQUIRED(cs);
+        EXCLUSIVE_LOCKS_REQUIRED(cs_store);
 
     const CGovernanceObject* FindConstGovernanceObjectInternal(const uint256& nHash) const
-        EXCLUSIVE_LOCKS_REQUIRED(cs);
+        EXCLUSIVE_LOCKS_REQUIRED(cs_store);
 
     void MasternodeRateUpdate(const CGovernanceObject& govobj)
-        EXCLUSIVE_LOCKS_REQUIRED(cs);
+        EXCLUSIVE_LOCKS_REQUIRED(cs_store);
 
     bool MasternodeRateCheck(const CGovernanceObject& govobj, bool fUpdateFailStatus, bool fForce, bool& fRateCheckBypassed)
-        EXCLUSIVE_LOCKS_REQUIRED(cs);
+        EXCLUSIVE_LOCKS_REQUIRED(cs_store);
 
     void CheckPostponedObjects()
-        EXCLUSIVE_LOCKS_REQUIRED(cs, !cs_relay);
+        EXCLUSIVE_LOCKS_REQUIRED(cs_store, !cs_relay);
 
     void InitOnLoad()
-        EXCLUSIVE_LOCKS_REQUIRED(!cs);
+        EXCLUSIVE_LOCKS_REQUIRED(!cs_store);
 
     /*
      * Trigger Management (formerly CGovernanceTriggerManager)
@@ -417,40 +417,40 @@ class CGovernanceManager : public GovernanceStore, public GovernanceSignerParent
      *   - After triggers are activated and executed, they can be removed
     */
     bool AddNewTrigger(uint256 nHash)
-        EXCLUSIVE_LOCKS_REQUIRED(cs);
+        EXCLUSIVE_LOCKS_REQUIRED(cs_store);
     void CleanAndRemoveTriggers()
-        EXCLUSIVE_LOCKS_REQUIRED(cs);
+        EXCLUSIVE_LOCKS_REQUIRED(cs_store);
 
     void ExecuteBestSuperblock(const CDeterministicMNList& tip_mn_list, int nBlockHeight)
-        EXCLUSIVE_LOCKS_REQUIRED(cs);
+        EXCLUSIVE_LOCKS_REQUIRED(cs_store);
 
     void RequestGovernanceObject(CNode* pfrom, const uint256& nHash, CConnman& connman, bool fUseFilter = false) const
-        EXCLUSIVE_LOCKS_REQUIRED(!cs);
+        EXCLUSIVE_LOCKS_REQUIRED(!cs_store);
 
     bool ProcessVote(CNode* pfrom, const CGovernanceVote& vote, CGovernanceException& exception, CConnman& connman)
-        EXCLUSIVE_LOCKS_REQUIRED(!cs);
+        EXCLUSIVE_LOCKS_REQUIRED(!cs_store);
 
     /// Called to indicate a requested object or vote has been received
     bool AcceptMessage(const uint256& nHash)
-        EXCLUSIVE_LOCKS_REQUIRED(!cs);
+        EXCLUSIVE_LOCKS_REQUIRED(!cs_store);
 
     void CheckOrphanVotes(CGovernanceObject& govobj)
-        EXCLUSIVE_LOCKS_REQUIRED(cs, !cs_relay);
+        EXCLUSIVE_LOCKS_REQUIRED(cs_store, !cs_relay);
 
     void RebuildIndexes()
-        EXCLUSIVE_LOCKS_REQUIRED(cs);
+        EXCLUSIVE_LOCKS_REQUIRED(cs_store);
 
     void AddCachedTriggers()
-        EXCLUSIVE_LOCKS_REQUIRED(cs);
+        EXCLUSIVE_LOCKS_REQUIRED(cs_store);
 
     void RequestOrphanObjects(CConnman& connman)
-        EXCLUSIVE_LOCKS_REQUIRED(!cs);
+        EXCLUSIVE_LOCKS_REQUIRED(!cs_store);
 
     void CleanOrphanObjects()
-        EXCLUSIVE_LOCKS_REQUIRED(!cs);
+        EXCLUSIVE_LOCKS_REQUIRED(!cs_store);
 
     void RemoveInvalidVotes()
-        EXCLUSIVE_LOCKS_REQUIRED(cs);
+        EXCLUSIVE_LOCKS_REQUIRED(cs_store);
 };
 
 bool AreSuperblocksEnabled(const CSporkManager& sporkman);

From 2378a99bd236834f4247db73a3a41b6ffe162359 Mon Sep 17 00:00:00 2001
From: Kittywhiskers Van Gogh <63189531+kwvg@users.noreply.github.com>
Date: Mon, 15 Sep 2025 19:50:18 +0000
Subject: [PATCH 282/656] trivial: tidy-up `governance/object.h`

Needed to make the next commit easier to follow.
---
 src/governance/object.h | 108 ++++++++++------------------------------
 1 file changed, 26 insertions(+), 82 deletions(-)

diff --git a/src/governance/object.h b/src/governance/object.h
index 5e0374520859..3f0cc0047bfd 100644
--- a/src/governance/object.h
+++ b/src/governance/object.h
@@ -97,7 +97,6 @@ class CGovernanceObject
     /// time this object was marked for deletion
     int64_t nDeletionTime{0};
 
-
     /// is valid by blockchain
     bool fCachedLocalValidity{false};
     std::string strLocalValidityError;
@@ -133,99 +132,45 @@ class CGovernanceObject
 
 public:
     CGovernanceObject();
-
     CGovernanceObject(const uint256& nHashParentIn, int nRevisionIn, int64_t nTime, const uint256& nCollateralHashIn, const std::string& strDataHexIn);
-
     CGovernanceObject(const CGovernanceObject& other);
 
-    // Public Getter methods
-
-    const Governance::Object& Object() const
-    {
-        return m_obj;
-    }
-
-    int64_t GetCreationTime() const
-    {
-        return m_obj.time;
-    }
-
-    int64_t GetDeletionTime() const
-    {
-        return nDeletionTime;
-    }
-
-    GovernanceObject GetObjectType() const
-    {
-        return m_obj.type;
-    }
-
-    const uint256& GetCollateralHash() const
-    {
-        return m_obj.collateralHash;
-    }
-
-    const COutPoint& GetMasternodeOutpoint() const
-    {
-        return m_obj.masternodeOutpoint;
-    }
-
-    bool IsSetCachedFunding() const
-    {
-        return fCachedFunding;
-    }
-
-    bool IsSetCachedValid() const
-    {
-        return fCachedValid;
-    }
-
-    bool IsSetCachedDelete() const
-    {
-        return fCachedDelete;
-    }
-
-    bool IsSetCachedEndorsed() const
-    {
-        return fCachedEndorsed;
-    }
-
-    bool IsSetDirtyCache() const
-    {
-        return fDirtyCache;
-    }
-
-    bool IsSetExpired() const
-    {
-        return fExpired;
-    }
-
-    void SetExpired()
-    {
-        fExpired = true;
-    }
-
-    const CGovernanceObjectVoteFile& GetVoteFile() const
-    {
-        return fileVotes;
-    }
-
-    // Signature related functions
-
+    // Getters
+    bool IsSetCachedFunding() const { return fCachedFunding; }
+    bool IsSetCachedValid() const { return fCachedValid; }
+    bool IsSetCachedDelete() const { return fCachedDelete; }
+    bool IsSetCachedEndorsed() const { return fCachedEndorsed; }
+    bool IsSetDirtyCache() const { return fDirtyCache; }
+    bool IsSetExpired() const { return fExpired; }
+    GovernanceObject GetObjectType() const { return m_obj.type; }
+    int64_t GetCreationTime() const { return m_obj.time; }
+    int64_t GetDeletionTime() const { return nDeletionTime; }
+
+    const CGovernanceObjectVoteFile& GetVoteFile() const { return fileVotes; }
+    const COutPoint& GetMasternodeOutpoint() const { return m_obj.masternodeOutpoint; }
+    const Governance::Object& Object() const { return m_obj; }
+    const uint256& GetCollateralHash() const { return m_obj.collateralHash; }
+
+    // Setters
+    void SetExpired() { fExpired = true; }
     void SetMasternodeOutpoint(const COutPoint& outpoint);
     void SetSignature(Span<const uint8_t> sig);
-    bool CheckSignature(const CBLSPublicKey& pubKey) const;
 
+    // Signature related functions
+    bool CheckSignature(const CBLSPublicKey& pubKey) const;
     uint256 GetSignatureHash() const;
 
     // CORE OBJECT FUNCTIONS
 
-    bool IsValidLocally(const CDeterministicMNList& tip_mn_list, const ChainstateManager& chainman, std::string& strError, bool fCheckCollateral) const EXCLUSIVE_LOCKS_REQUIRED(::cs_main);
+    bool IsValidLocally(const CDeterministicMNList& tip_mn_list, const ChainstateManager& chainman, std::string& strError, bool fCheckCollateral) const
+        EXCLUSIVE_LOCKS_REQUIRED(::cs_main);
 
-    bool IsValidLocally(const CDeterministicMNList& tip_mn_list, const ChainstateManager& chainman, std::string& strError, bool& fMissingConfirmations, bool fCheckCollateral) const EXCLUSIVE_LOCKS_REQUIRED(::cs_main);
+    bool IsValidLocally(const CDeterministicMNList& tip_mn_list, const ChainstateManager& chainman, std::string& strError, bool& fMissingConfirmations, bool fCheckCollateral) const
+        EXCLUSIVE_LOCKS_REQUIRED(::cs_main);
 
     /// Check the collateral transaction for the budget proposal/finalized budget
-    bool IsCollateralValid(const ChainstateManager& chainman, std::string& strError, bool& fMissingConfirmations) const EXCLUSIVE_LOCKS_REQUIRED(::cs_main);
+    bool IsCollateralValid(const ChainstateManager& chainman, std::string& strError, bool& fMissingConfirmations) const
+        EXCLUSIVE_LOCKS_REQUIRED(::cs_main);
 
     void UpdateLocalValidity(const CDeterministicMNList& tip_mn_list, const ChainstateManager& chainman)
         EXCLUSIVE_LOCKS_REQUIRED(::cs_main);
@@ -297,5 +242,4 @@ class CGovernanceObject
     std::set<uint256> RemoveInvalidVotes(const CDeterministicMNList& tip_mn_list, const COutPoint& mnOutpoint);
 };
 
-
 #endif // BITCOIN_GOVERNANCE_OBJECT_H

From 2ee408fb38e810fba1318b64a87adfce891f4a73 Mon Sep 17 00:00:00 2001
From: Kittywhiskers Van Gogh <63189531+kwvg@users.noreply.github.com>
Date: Thu, 23 Oct 2025 00:19:50 +0530
Subject: [PATCH 283/656] refactor: protect some `CGovernanceObject` variables

Currently, the LOCKs aren't guarding anything. Variables protected were
based on existing LOCK'ing patterns (i.e. (de)ser'ed variables except
for m_obj).
---
 src/governance/governance.cpp | 15 ++++++----
 src/governance/object.cpp     |  1 +
 src/governance/object.h       | 53 ++++++++++++++++++++++++++---------
 3 files changed, 50 insertions(+), 19 deletions(-)

diff --git a/src/governance/governance.cpp b/src/governance/governance.cpp
index f3df5d636c2b..9ad5c6942da5 100644
--- a/src/governance/governance.cpp
+++ b/src/governance/governance.cpp
@@ -187,7 +187,7 @@ bool CGovernanceManager::HaveVoteForHash(const uint256& nHash) const
     LOCK(cs_store);
 
     CGovernanceObject* pGovobj = nullptr;
-    return cmapVoteToObject.Get(nHash, pGovobj) && pGovobj->GetVoteFile().HasVote(nHash);
+    return cmapVoteToObject.Get(nHash, pGovobj) && WITH_LOCK(pGovobj->cs, return pGovobj->GetVoteFile().HasVote(nHash));
 }
 
 int CGovernanceManager::GetVoteCount() const
@@ -201,7 +201,7 @@ bool CGovernanceManager::SerializeVoteForHash(const uint256& nHash, CDataStream&
     LOCK(cs_store);
 
     CGovernanceObject* pGovobj = nullptr;
-    return cmapVoteToObject.Get(nHash, pGovobj) && pGovobj->GetVoteFile().SerializeVoteToStream(nHash, ss);
+    return cmapVoteToObject.Get(nHash, pGovobj) && WITH_LOCK(pGovobj->cs, return pGovobj->GetVoteFile().SerializeVoteToStream(nHash, ss));
 }
 
 void CGovernanceManager::AddPostponedObject(const CGovernanceObject& govobj)
@@ -744,10 +744,12 @@ MessageProcessingResult CGovernanceManager::SyncSingleObjVotes(CNode& peer, cons
         return {};
     }
 
-    const auto& fileVotes = govobj.GetVoteFile();
+    MessageProcessingResult ret{};
     const auto tip_mn_list = Assert(m_dmnman)->GetListAtChainTip();
 
-    MessageProcessingResult ret{};
+    {
+    LOCK(govobj.cs);
+    const auto& fileVotes = govobj.GetVoteFile();
     for (const auto& vote : fileVotes.GetVotes()) {
         uint256 nVoteHash = vote.GetHash();
 
@@ -758,6 +760,7 @@ MessageProcessingResult CGovernanceManager::SyncSingleObjVotes(CNode& peer, cons
         }
         ret.m_inventory.emplace_back(MSG_GOVERNANCE_OBJECT_VOTE, nVoteHash);
     }
+    }
 
     CNetMsgMaker msgMaker(peer.GetCommonVersion());
     connman.PushMessage(&peer, msgMaker.Make(NetMsgType::SYNCSTATUSCOUNT, MASTERNODE_SYNC_GOVOBJ_VOTE,
@@ -1064,7 +1067,7 @@ void CGovernanceManager::RequestGovernanceObject(CNode* pfrom, const uint256& nH
 
         if (pObj) {
             filter = CBloomFilter(Params().GetConsensus().nGovernanceFilterElements, GOVERNANCE_FILTER_FP_RATE, GetRand<int>(/*nMax=*/999999), BLOOM_UPDATE_ALL);
-            std::vector<CGovernanceVote> vecVotes = pObj->GetVoteFile().GetVotes();
+            std::vector<CGovernanceVote> vecVotes = WITH_LOCK(pObj->cs, return pObj->GetVoteFile().GetVotes());
             nVoteCount = vecVotes.size();
             for (const auto& vote : vecVotes) {
                 filter.insert(vote.GetHash());
@@ -1222,7 +1225,7 @@ void CGovernanceManager::RebuildIndexes()
     cmapVoteToObject.Clear();
     for (auto& objPair : mapObjects) {
         CGovernanceObject& govobj = objPair.second;
-        std::vector<CGovernanceVote> vecVotes = govobj.GetVoteFile().GetVotes();
+        std::vector<CGovernanceVote> vecVotes = WITH_LOCK(govobj.cs, return govobj.GetVoteFile().GetVotes());
         for (const auto& vecVote : vecVotes) {
             cmapVoteToObject.Insert(vecVote.GetHash(), &govobj);
         }
diff --git a/src/governance/object.cpp b/src/governance/object.cpp
index 8bea754eea50..6ecfd6531433 100644
--- a/src/governance/object.cpp
+++ b/src/governance/object.cpp
@@ -614,6 +614,7 @@ void CGovernanceObject::UpdateSentinelVariables(const CDeterministicMNList& tip_
     if (GetAbsoluteYesCount(tip_mn_list, VOTE_SIGNAL_FUNDING) >= nAbsVoteReq) fCachedFunding = true;
     if ((GetAbsoluteYesCount(tip_mn_list, VOTE_SIGNAL_DELETE) >= nAbsDeleteReq) && !fCachedDelete) {
         fCachedDelete = true;
+        LOCK(cs);
         if (nDeletionTime == 0) {
             nDeletionTime = GetTime<std::chrono::seconds>().count();
         }
diff --git a/src/governance/object.h b/src/governance/object.h
index 3f0cc0047bfd..19c5ce5f447d 100644
--- a/src/governance/object.h
+++ b/src/governance/object.h
@@ -88,14 +88,15 @@ class CGovernanceObject
 public: // Types
     using vote_m_t = std::map<COutPoint, vote_rec_t>;
 
-private:
+public:
     /// critical section to protect the inner data structures
     mutable RecursiveMutex cs;
 
+private:
     Governance::Object m_obj;
 
     /// time this object was marked for deletion
-    int64_t nDeletionTime{0};
+    int64_t nDeletionTime GUARDED_BY(cs){0};
 
     /// is valid by blockchain
     bool fCachedLocalValidity{false};
@@ -121,14 +122,14 @@ class CGovernanceObject
     bool fDirtyCache{true};
 
     /// Object is no longer of interest
-    bool fExpired{false};
+    bool fExpired GUARDED_BY(cs){false};
 
     /// Failed to parse object data
     bool fUnparsable{false};
 
-    vote_m_t mapCurrentMNVotes;
+    vote_m_t mapCurrentMNVotes GUARDED_BY(cs);
 
-    CGovernanceObjectVoteFile fileVotes;
+    CGovernanceObjectVoteFile fileVotes GUARDED_BY(cs);
 
 public:
     CGovernanceObject();
@@ -141,18 +142,31 @@ class CGovernanceObject
     bool IsSetCachedDelete() const { return fCachedDelete; }
     bool IsSetCachedEndorsed() const { return fCachedEndorsed; }
     bool IsSetDirtyCache() const { return fDirtyCache; }
-    bool IsSetExpired() const { return fExpired; }
+    bool IsSetExpired() const EXCLUSIVE_LOCKS_REQUIRED(!cs)
+    {
+        return WITH_LOCK(cs, return fExpired);
+    }
     GovernanceObject GetObjectType() const { return m_obj.type; }
     int64_t GetCreationTime() const { return m_obj.time; }
-    int64_t GetDeletionTime() const { return nDeletionTime; }
+    int64_t GetDeletionTime() const EXCLUSIVE_LOCKS_REQUIRED(!cs)
+    {
+        return WITH_LOCK(cs, return nDeletionTime);
+    }
 
-    const CGovernanceObjectVoteFile& GetVoteFile() const { return fileVotes; }
+    const CGovernanceObjectVoteFile& GetVoteFile() const EXCLUSIVE_LOCKS_REQUIRED(cs)
+    {
+        AssertLockHeld(cs);
+        return fileVotes;
+    }
     const COutPoint& GetMasternodeOutpoint() const { return m_obj.masternodeOutpoint; }
     const Governance::Object& Object() const { return m_obj; }
     const uint256& GetCollateralHash() const { return m_obj.collateralHash; }
 
     // Setters
-    void SetExpired() { fExpired = true; }
+    void SetExpired() EXCLUSIVE_LOCKS_REQUIRED(!cs)
+    {
+        WITH_LOCK(cs, fExpired = true);
+    }
     void SetMasternodeOutpoint(const COutPoint& outpoint);
     void SetSignature(Span<const uint8_t> sig);
 
@@ -177,9 +191,10 @@ class CGovernanceObject
 
     void UpdateSentinelVariables(const CDeterministicMNList& tip_mn_list);
 
-    void PrepareDeletion(int64_t nDeletionTime_)
+    void PrepareDeletion(int64_t nDeletionTime_) EXCLUSIVE_LOCKS_REQUIRED(!cs)
     {
         fCachedDelete = true;
+        LOCK(cs);
         if (nDeletionTime == 0) {
             nDeletionTime = nDeletionTime_;
         }
@@ -211,15 +226,27 @@ class CGovernanceObject
 
     // SERIALIZER
 
-    SERIALIZE_METHODS(CGovernanceObject, obj)
+    template<typename Stream>
+    void Serialize(Stream& s) const EXCLUSIVE_LOCKS_REQUIRED(!cs)
     {
         // SERIALIZE DATA FOR SAVING/LOADING OR NETWORK FUNCTIONS
-        READWRITE(obj.m_obj);
+        s << m_obj;
         if (s.GetType() & SER_DISK) {
             // Only include these for the disk file format
-            READWRITE(obj.nDeletionTime, obj.fExpired, obj.mapCurrentMNVotes, obj.fileVotes);
+            LOCK(cs);
+            s << nDeletionTime << fExpired << mapCurrentMNVotes << fileVotes;
         }
+    }
 
+    template<typename Stream>
+    void Unserialize(Stream& s) EXCLUSIVE_LOCKS_REQUIRED(!cs)
+    {
+        s >> m_obj;
+        if (s.GetType() & SER_DISK) {
+            // Only include these for the disk file format
+            LOCK(cs);
+            s >> nDeletionTime >> fExpired >> mapCurrentMNVotes >> fileVotes;
+        }
         // AFTER DESERIALIZATION OCCURS, CACHED VARIABLES MUST BE CALCULATED MANUALLY
     }
 

From 009f5cb16a9e9f3967b0a1fa3a42aa38d038bc92 Mon Sep 17 00:00:00 2001
From: Kittywhiskers Van Gogh <63189531+kwvg@users.noreply.github.com>
Date: Thu, 23 Oct 2025 00:20:33 +0530
Subject: [PATCH 284/656] refactor: add `cs` annotations for
 `CGovernanceObject`

---
 src/governance/object.cpp |  7 +++++++
 src/governance/object.h   | 33 ++++++++++++++++++++++-----------
 2 files changed, 29 insertions(+), 11 deletions(-)

diff --git a/src/governance/object.cpp b/src/governance/object.cpp
index 6ecfd6531433..b46660600905 100644
--- a/src/governance/object.cpp
+++ b/src/governance/object.cpp
@@ -554,26 +554,31 @@ int CGovernanceObject::CountMatchingVotes(const CDeterministicMNList& tip_mn_lis
 
 int CGovernanceObject::GetAbsoluteYesCount(const CDeterministicMNList& tip_mn_list, vote_signal_enum_t eVoteSignalIn) const
 {
+    AssertLockNotHeld(cs);
     return GetYesCount(tip_mn_list, eVoteSignalIn) - GetNoCount(tip_mn_list, eVoteSignalIn);
 }
 
 int CGovernanceObject::GetAbsoluteNoCount(const CDeterministicMNList& tip_mn_list, vote_signal_enum_t eVoteSignalIn) const
 {
+    AssertLockNotHeld(cs);
     return GetNoCount(tip_mn_list, eVoteSignalIn) - GetYesCount(tip_mn_list, eVoteSignalIn);
 }
 
 int CGovernanceObject::GetYesCount(const CDeterministicMNList& tip_mn_list, vote_signal_enum_t eVoteSignalIn) const
 {
+    AssertLockNotHeld(cs);
     return CountMatchingVotes(tip_mn_list, eVoteSignalIn, VOTE_OUTCOME_YES);
 }
 
 int CGovernanceObject::GetNoCount(const CDeterministicMNList& tip_mn_list, vote_signal_enum_t eVoteSignalIn) const
 {
+    AssertLockNotHeld(cs);
     return CountMatchingVotes(tip_mn_list, eVoteSignalIn, VOTE_OUTCOME_NO);
 }
 
 int CGovernanceObject::GetAbstainCount(const CDeterministicMNList& tip_mn_list, vote_signal_enum_t eVoteSignalIn) const
 {
+    AssertLockNotHeld(cs);
     return CountMatchingVotes(tip_mn_list, eVoteSignalIn, VOTE_OUTCOME_ABSTAIN);
 }
 
@@ -591,6 +596,8 @@ bool CGovernanceObject::GetCurrentMNVotes(const COutPoint& mnCollateralOutpoint,
 
 void CGovernanceObject::UpdateSentinelVariables(const CDeterministicMNList& tip_mn_list)
 {
+    AssertLockNotHeld(cs);
+
     // CALCULATE MINIMUM SUPPORT LEVELS REQUIRED
 
     int nWeightedMnCount = (int)tip_mn_list.GetValidWeightedMNsCount();
diff --git a/src/governance/object.h b/src/governance/object.h
index 19c5ce5f447d..32d5a88e3737 100644
--- a/src/governance/object.h
+++ b/src/governance/object.h
@@ -189,7 +189,8 @@ class CGovernanceObject
     void UpdateLocalValidity(const CDeterministicMNList& tip_mn_list, const ChainstateManager& chainman)
         EXCLUSIVE_LOCKS_REQUIRED(::cs_main);
 
-    void UpdateSentinelVariables(const CDeterministicMNList& tip_mn_list);
+    void UpdateSentinelVariables(const CDeterministicMNList& tip_mn_list)
+        EXCLUSIVE_LOCKS_REQUIRED(!cs);
 
     void PrepareDeletion(int64_t nDeletionTime_) EXCLUSIVE_LOCKS_REQUIRED(!cs)
     {
@@ -209,15 +210,22 @@ class CGovernanceObject
 
     // GET VOTE COUNT FOR SIGNAL
 
-    int CountMatchingVotes(const CDeterministicMNList& tip_mn_list, vote_signal_enum_t eVoteSignalIn, vote_outcome_enum_t eVoteOutcomeIn) const;
+    int CountMatchingVotes(const CDeterministicMNList& tip_mn_list, vote_signal_enum_t eVoteSignalIn, vote_outcome_enum_t eVoteOutcomeIn) const
+        EXCLUSIVE_LOCKS_REQUIRED(!cs);
 
-    int GetAbsoluteYesCount(const CDeterministicMNList& tip_mn_list, vote_signal_enum_t eVoteSignalIn) const;
-    int GetAbsoluteNoCount(const CDeterministicMNList& tip_mn_list, vote_signal_enum_t eVoteSignalIn) const;
-    int GetYesCount(const CDeterministicMNList& tip_mn_list, vote_signal_enum_t eVoteSignalIn) const;
-    int GetNoCount(const CDeterministicMNList& tip_mn_list, vote_signal_enum_t eVoteSignalIn) const;
-    int GetAbstainCount(const CDeterministicMNList& tip_mn_list, vote_signal_enum_t eVoteSignalIn) const;
+    int GetAbsoluteYesCount(const CDeterministicMNList& tip_mn_list, vote_signal_enum_t eVoteSignalIn) const
+        EXCLUSIVE_LOCKS_REQUIRED(!cs);
+    int GetAbsoluteNoCount(const CDeterministicMNList& tip_mn_list, vote_signal_enum_t eVoteSignalIn) const
+        EXCLUSIVE_LOCKS_REQUIRED(!cs);
+    int GetYesCount(const CDeterministicMNList& tip_mn_list, vote_signal_enum_t eVoteSignalIn) const
+        EXCLUSIVE_LOCKS_REQUIRED(!cs);
+    int GetNoCount(const CDeterministicMNList& tip_mn_list, vote_signal_enum_t eVoteSignalIn) const
+        EXCLUSIVE_LOCKS_REQUIRED(!cs);
+    int GetAbstainCount(const CDeterministicMNList& tip_mn_list, vote_signal_enum_t eVoteSignalIn) const
+        EXCLUSIVE_LOCKS_REQUIRED(!cs);
 
-    bool GetCurrentMNVotes(const COutPoint& mnCollateralOutpoint, vote_rec_t& voteRecord) const;
+    bool GetCurrentMNVotes(const COutPoint& mnCollateralOutpoint, vote_rec_t& voteRecord) const
+        EXCLUSIVE_LOCKS_REQUIRED(!cs);
 
     // FUNCTIONS FOR DEALING WITH DATA STRING
 
@@ -257,16 +265,19 @@ class CGovernanceObject
     void GetData(UniValue& objResult) const;
 
     bool ProcessVote(CMasternodeMetaMan& mn_metaman, CGovernanceManager& govman, const CDeterministicMNList& tip_mn_list,
-                     const CGovernanceVote& vote, CGovernanceException& exception);
+                     const CGovernanceVote& vote, CGovernanceException& exception)
+        EXCLUSIVE_LOCKS_REQUIRED(!cs);
 
     /// Called when MN's which have voted on this object have been removed
-    void ClearMasternodeVotes(const CDeterministicMNList& tip_mn_list);
+    void ClearMasternodeVotes(const CDeterministicMNList& tip_mn_list)
+        EXCLUSIVE_LOCKS_REQUIRED(!cs);
 
     // Revalidate all votes from this MN and delete them if validation fails.
     // This is the case for DIP3 MNs that changed voting or operator keys and
     // also for MNs that were removed from the list completely.
     // Returns deleted vote hashes.
-    std::set<uint256> RemoveInvalidVotes(const CDeterministicMNList& tip_mn_list, const COutPoint& mnOutpoint);
+    std::set<uint256> RemoveInvalidVotes(const CDeterministicMNList& tip_mn_list, const COutPoint& mnOutpoint)
+        EXCLUSIVE_LOCKS_REQUIRED(!cs);
 };
 
 #endif // BITCOIN_GOVERNANCE_OBJECT_H

From 14c44cbd375f121e308d0881cd1c7586b8548539 Mon Sep 17 00:00:00 2001
From: Kittywhiskers Van Gogh <63189531+kwvg@users.noreply.github.com>
Date: Mon, 15 Sep 2025 20:14:27 +0000
Subject: [PATCH 285/656] refactor: switch `CGovernanceObject::cs` to `Mutex`

---
 src/governance/object.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/governance/object.h b/src/governance/object.h
index 32d5a88e3737..439c9d190b77 100644
--- a/src/governance/object.h
+++ b/src/governance/object.h
@@ -90,7 +90,7 @@ class CGovernanceObject
 
 public:
     /// critical section to protect the inner data structures
-    mutable RecursiveMutex cs;
+    mutable Mutex cs;
 
 private:
     Governance::Object m_obj;

From 035dfeefa484d2e32b744665f5348a1ff2680dfd Mon Sep 17 00:00:00 2001
From: Kittywhiskers Van Gogh <63189531+kwvg@users.noreply.github.com>
Date: Tue, 28 Oct 2025 20:13:48 +0530
Subject: [PATCH 286/656] fix: resolve lock order issues

---
 src/governance/governance.cpp | 21 ++++++++++++++-------
 src/governance/governance.h   | 11 +++++++++--
 2 files changed, 23 insertions(+), 9 deletions(-)

diff --git a/src/governance/governance.cpp b/src/governance/governance.cpp
index 9ad5c6942da5..d944c1e86ed8 100644
--- a/src/governance/governance.cpp
+++ b/src/governance/governance.cpp
@@ -314,7 +314,7 @@ MessageProcessingResult CGovernanceManager::ProcessMessage(CNode& peer, CConnman
             return ret;
         }
 
-        AddGovernanceObject(govobj, &peer);
+        AddGovernanceObjectInternal(govobj, &peer);
         return ret;
     }
 
@@ -392,9 +392,12 @@ void CGovernanceManager::CheckOrphanVotes(CGovernanceObject& govobj)
     }
 }
 
-void CGovernanceManager::AddGovernanceObject(CGovernanceObject& govobj, const CNode* pfrom)
+void CGovernanceManager::AddGovernanceObjectInternal(CGovernanceObject& govobj, const CNode* pfrom)
 {
+    AssertLockHeld(::cs_main);
+    AssertLockHeld(cs_store);
     AssertLockNotHeld(cs_relay);
+
     uint256 nHash = govobj.GetHash();
     std::string strHash = nHash.ToString();
 
@@ -404,7 +407,6 @@ void CGovernanceManager::AddGovernanceObject(CGovernanceObject& govobj, const CN
 
     govobj.UpdateSentinelVariables(tip_mn_list); //this sets local vars in object
 
-    LOCK2(::cs_main, cs_store);
     std::string strError;
 
     // MAKE SURE THIS OBJECT IS OK
@@ -453,6 +455,12 @@ void CGovernanceManager::AddGovernanceObject(CGovernanceObject& govobj, const CN
     GetMainSignals().NotifyGovernanceObject(std::make_shared<const Governance::Object>(govobj.Object()), nHash.ToString());
 }
 
+void CGovernanceManager::AddGovernanceObject(CGovernanceObject& govobj, const CNode* pfrom)
+{
+    LOCK2(::cs_main, cs_store);
+    AddGovernanceObjectInternal(govobj, pfrom);
+}
+
 void CGovernanceManager::CheckAndRemove()
 {
     AssertLockNotHeld(cs_store);
@@ -980,12 +988,11 @@ bool CGovernanceManager::ProcessVote(CNode* pfrom, const CGovernanceVote& vote,
 
 void CGovernanceManager::CheckPostponedObjects()
 {
+    AssertLockHeld(::cs_main);
     AssertLockHeld(cs_store);
     AssertLockNotHeld(cs_relay);
     if (!m_mn_sync.IsSynced()) return;
 
-    LOCK(::cs_main);
-
     // Check postponed proposals
     for (auto it = mapPostponedObjects.begin(); it != mapPostponedObjects.end();) {
         const uint256& nHash = it->first;
@@ -997,7 +1004,7 @@ void CGovernanceManager::CheckPostponedObjects()
         bool fMissingConfirmations;
         if (govobj.IsCollateralValid(m_chainman, strError, fMissingConfirmations)) {
             if (govobj.IsValidLocally(Assert(m_dmnman)->GetListAtChainTip(), m_chainman, strError, false)) {
-                AddGovernanceObject(govobj);
+                AddGovernanceObjectInternal(govobj);
             } else {
                 LogPrint(BCLog::GOBJECT, "CGovernanceManager::CheckPostponedObjects -- %s invalid\n", nHash.ToString());
             }
@@ -1364,7 +1371,7 @@ void CGovernanceManager::UpdatedBlockTip(const CBlockIndex* pindex)
     nCachedBlockHeight = pindex->nHeight;
     LogPrint(BCLog::GOBJECT, "CGovernanceManager::UpdatedBlockTip -- nCachedBlockHeight: %d\n", nCachedBlockHeight);
 
-    LOCK(cs_store);
+    LOCK2(::cs_main, cs_store);
     if (DeploymentDIP0003Enforced(pindex->nHeight, Params().GetConsensus())) {
         RemoveInvalidVotes();
     }
diff --git a/src/governance/governance.h b/src/governance/governance.h
index f63b10597124..7093e574126d 100644
--- a/src/governance/governance.h
+++ b/src/governance/governance.h
@@ -56,6 +56,8 @@ using vote_time_pair_t = std::pair<CGovernanceVote, int64_t>;
 static constexpr int RATE_BUFFER_SIZE = 5;
 static constexpr bool DEFAULT_GOVERNANCE_ENABLE{true};
 
+extern RecursiveMutex cs_main;
+
 class CRateCheckBuffer
 {
 private:
@@ -341,7 +343,7 @@ class CGovernanceManager : public GovernanceStore, public GovernanceSignerParent
     std::vector<std::shared_ptr<const CGovernanceObject>> GetApprovedProposals(const CDeterministicMNList& tip_mn_list) override
         EXCLUSIVE_LOCKS_REQUIRED(!cs_store);
     void AddGovernanceObject(CGovernanceObject& govobj, const CNode* pfrom = nullptr) override
-        EXCLUSIVE_LOCKS_REQUIRED(!cs_relay);
+        EXCLUSIVE_LOCKS_REQUIRED(!cs_store, !cs_relay);
 
     // Superblocks
     bool GetSuperblockPayments(const CDeterministicMNList& tip_mn_list, int nBlockHeight,
@@ -399,6 +401,11 @@ class CGovernanceManager : public GovernanceStore, public GovernanceSignerParent
     const CGovernanceObject* FindConstGovernanceObjectInternal(const uint256& nHash) const
         EXCLUSIVE_LOCKS_REQUIRED(cs_store);
 
+    // Internal counterpart to "Signer interface"
+    void AddGovernanceObjectInternal(CGovernanceObject& govobj, const CNode* pfrom = nullptr)
+        EXCLUSIVE_LOCKS_REQUIRED(::cs_main, cs_store, !cs_relay);
+
+    // ...
     void MasternodeRateUpdate(const CGovernanceObject& govobj)
         EXCLUSIVE_LOCKS_REQUIRED(cs_store);
 
@@ -406,7 +413,7 @@ class CGovernanceManager : public GovernanceStore, public GovernanceSignerParent
         EXCLUSIVE_LOCKS_REQUIRED(cs_store);
 
     void CheckPostponedObjects()
-        EXCLUSIVE_LOCKS_REQUIRED(cs_store, !cs_relay);
+        EXCLUSIVE_LOCKS_REQUIRED(::cs_main, cs_store, !cs_relay);
 
     void InitOnLoad()
         EXCLUSIVE_LOCKS_REQUIRED(!cs_store);

From 0bc28c314cfffb68391d2128a68a22ee4648eb14 Mon Sep 17 00:00:00 2001
From: Kittywhiskers Van Gogh <63189531+kwvg@users.noreply.github.com>
Date: Tue, 28 Oct 2025 20:28:30 +0530
Subject: [PATCH 287/656] fix: resolve potential deadlock

---
 src/governance/governance.cpp | 13 ++++++-------
 src/governance/governance.h   |  2 --
 src/governance/object.cpp     |  1 -
 3 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/src/governance/governance.cpp b/src/governance/governance.cpp
index d944c1e86ed8..3394556a1bf5 100644
--- a/src/governance/governance.cpp
+++ b/src/governance/governance.cpp
@@ -981,7 +981,12 @@ bool CGovernanceManager::ProcessVote(CNode* pfrom, const CGovernanceVote& vote,
         return false;
     }
 
-    bool fOk = govobj.ProcessVote(m_mn_metaman, *this, Assert(m_dmnman)->GetListAtChainTip(), vote, exception) && cmapVoteToObject.Insert(nHashVote, &govobj);
+    bool fOk = govobj.ProcessVote(m_mn_metaman, *this, Assert(m_dmnman)->GetListAtChainTip(), vote, exception);
+    if (fOk) {
+        fOk = cmapVoteToObject.Insert(nHashVote, &govobj);
+    } else if (exception.GetType() == GOVERNANCE_EXCEPTION_PERMANENT_ERROR && exception.GetNodePenalty() == 20) {
+        cmapInvalidVotes.Insert(nHashVote, vote);
+    }
     LEAVE_CRITICAL_SECTION(cs_store);
     return fOk;
 }
@@ -1086,12 +1091,6 @@ void CGovernanceManager::RequestGovernanceObject(CNode* pfrom, const uint256& nH
     connman.PushMessage(pfrom, msgMaker.Make(NetMsgType::MNGOVERNANCESYNC, nHash, filter));
 }
 
-void CGovernanceManager::AddInvalidVote(const CGovernanceVote& vote)
-{
-    LOCK(cs_store);
-    cmapInvalidVotes.Insert(vote.GetHash(), vote);
-}
-
 int CGovernanceManager::RequestGovernanceObjectVotes(CNode& peer, CConnman& connman, const PeerManager& peerman) const
 {
     const std::vector<CNode*> vNodeCopy{&peer};
diff --git a/src/governance/governance.h b/src/governance/governance.h
index 7093e574126d..420e8f13dd1d 100644
--- a/src/governance/governance.h
+++ b/src/governance/governance.h
@@ -296,8 +296,6 @@ class CGovernanceManager : public GovernanceStore, public GovernanceSignerParent
 
     // CGovernanceObject
     bool AreRateChecksEnabled() const { return fRateChecksEnabled; }
-    void AddInvalidVote(const CGovernanceVote& vote)
-        EXCLUSIVE_LOCKS_REQUIRED(!cs_store);
 
     // Getters/Setters
     int GetCachedBlockHeight() const override { return nCachedBlockHeight; }
diff --git a/src/governance/object.cpp b/src/governance/object.cpp
index b46660600905..3b44aaaffd1a 100644
--- a/src/governance/object.cpp
+++ b/src/governance/object.cpp
@@ -144,7 +144,6 @@ bool CGovernanceObject::ProcessVote(CMasternodeMetaMan& mn_metaman, CGovernanceM
             __func__, vote.GetMasternodeOutpoint().ToStringShort(), GetHash().ToString(), vote.GetHash().ToString())};
         LogPrintf("%s\n", msg);
         exception = CGovernanceException(msg, GOVERNANCE_EXCEPTION_PERMANENT_ERROR, 20);
-        govman.AddInvalidVote(vote);
         return false;
     }
 

From 828cad56c4e0e06f107134e6db0bd73dda25f0cf Mon Sep 17 00:00:00 2001
From: Kittywhiskers Van Gogh <63189531+kwvg@users.noreply.github.com>
Date: Tue, 28 Oct 2025 16:45:56 +0530
Subject: [PATCH 288/656] trivial: use structured bindings where possible,
 limit iterator scope

---
 src/governance/governance.cpp | 141 +++++++++++++++-------------------
 src/governance/object.cpp     |   5 +-
 src/rpc/governance.cpp        |   5 +-
 3 files changed, 66 insertions(+), 85 deletions(-)

diff --git a/src/governance/governance.cpp b/src/governance/governance.cpp
index 3394556a1bf5..549ee214b24f 100644
--- a/src/governance/governance.cpp
+++ b/src/governance/governance.cpp
@@ -377,10 +377,10 @@ void CGovernanceManager::CheckOrphanVotes(CGovernanceObject& govobj)
     int64_t nNow = GetAdjustedTime();
     const auto tip_mn_list = Assert(m_dmnman)->GetListAtChainTip();
     for (const auto& pairVote : vecVotePairs) {
+        const auto& [vote, time] = pairVote;
         bool fRemove = false;
-        const CGovernanceVote& vote = pairVote.first;
         CGovernanceException e;
-        if (pairVote.second < nNow) {
+        if (time < nNow) {
             fRemove = true;
         } else if (govobj.ProcessVote(m_mn_metaman, *this, tip_mn_list, vote, e)) {
             RelayVote(vote);
@@ -392,50 +392,51 @@ void CGovernanceManager::CheckOrphanVotes(CGovernanceObject& govobj)
     }
 }
 
-void CGovernanceManager::AddGovernanceObjectInternal(CGovernanceObject& govobj, const CNode* pfrom)
+void CGovernanceManager::AddGovernanceObjectInternal(CGovernanceObject& insert_obj, const CNode* pfrom)
 {
     AssertLockHeld(::cs_main);
     AssertLockHeld(cs_store);
     AssertLockNotHeld(cs_relay);
 
-    uint256 nHash = govobj.GetHash();
+    uint256 nHash = insert_obj.GetHash();
     std::string strHash = nHash.ToString();
 
     const auto tip_mn_list = Assert(m_dmnman)->GetListAtChainTip();
 
     // UPDATE CACHED VARIABLES FOR THIS OBJECT AND ADD IT TO OUR MANAGED DATA
 
-    govobj.UpdateSentinelVariables(tip_mn_list); //this sets local vars in object
+    insert_obj.UpdateSentinelVariables(tip_mn_list); //this sets local vars in object
 
     std::string strError;
 
     // MAKE SURE THIS OBJECT IS OK
 
-    if (!govobj.IsValidLocally(tip_mn_list, m_chainman, strError, true)) {
+    if (!insert_obj.IsValidLocally(tip_mn_list, m_chainman, strError, true)) {
         LogPrint(BCLog::GOBJECT, "CGovernanceManager::AddGovernanceObject -- invalid governance object - %s - (nCachedBlockHeight %d) \n", strError, nCachedBlockHeight);
         return;
     }
 
     LogPrint(BCLog::GOBJECT, "CGovernanceManager::AddGovernanceObject -- Adding object: hash = %s, type = %d\n", nHash.ToString(),
-             ToUnderlying(govobj.GetObjectType()));
+             ToUnderlying(insert_obj.GetObjectType()));
 
     // INSERT INTO OUR GOVERNANCE OBJECT MEMORY
     // IF WE HAVE THIS OBJECT ALREADY, WE DON'T WANT ANOTHER COPY
-    auto objpair = mapObjects.emplace(nHash, govobj);
+    auto [emplace_ret, emplace_status] = mapObjects.emplace(nHash, insert_obj);
 
-    if (!objpair.second) {
+    if (!emplace_status) {
         LogPrint(BCLog::GOBJECT, "CGovernanceManager::AddGovernanceObject -- already have governance object %s\n", nHash.ToString());
         return;
     }
 
     // SHOULD WE ADD THIS OBJECT TO ANY OTHER MANAGERS?
 
+    auto& [_, govobj] = *emplace_ret;
     LogPrint(BCLog::GOBJECT, "CGovernanceManager::AddGovernanceObject -- Before trigger block, GetDataAsPlainString = %s, nObjectType = %d\n",
                 govobj.GetDataAsPlainString(), ToUnderlying(govobj.GetObjectType()));
 
     if (govobj.GetObjectType() == GovernanceObject::TRIGGER && !AddNewTrigger(nHash)) {
         LogPrint(BCLog::GOBJECT, "CGovernanceManager::AddGovernanceObject -- undo adding invalid trigger object: hash = %s\n", nHash.ToString());
-        objpair.first->second.PrepareDeletion(GetTime<std::chrono::seconds>().count());
+        govobj.PrepareDeletion(GetTime<std::chrono::seconds>().count());
         return;
     }
 
@@ -491,41 +492,36 @@ void CGovernanceManager::CheckAndRemove()
     // Clean up any expired or invalid triggers
     CleanAndRemoveTriggers();
 
-    auto it = mapObjects.begin();
     const auto nNow = GetTime<std::chrono::seconds>();
-
-    while (it != mapObjects.end()) {
-        CGovernanceObject* pObj = &((*it).second);
-
-        uint256 nHash = it->first;
+    for (auto it = mapObjects.begin(); it != mapObjects.end();) {
+        auto [nHash, pObj] = *it;
         std::string strHash = nHash.ToString();
 
         // IF CACHE IS NOT DIRTY, WHY DO THIS?
-        if (pObj->IsSetDirtyCache()) {
+        if (pObj.IsSetDirtyCache()) {
             // UPDATE LOCAL VALIDITY AGAINST CRYPTO DATA
-            pObj->UpdateLocalValidity(tip_mn_list, m_chainman);
+            pObj.UpdateLocalValidity(tip_mn_list, m_chainman);
 
             // UPDATE SENTINEL SIGNALING VARIABLES
-            pObj->UpdateSentinelVariables(tip_mn_list);
+            pObj.UpdateSentinelVariables(tip_mn_list);
         }
 
         // IF DELETE=TRUE, THEN CLEAN THE MESS UP!
 
-        const auto nTimeSinceDeletion = nNow - std::chrono::seconds{pObj->GetDeletionTime()};
+        const auto nTimeSinceDeletion = nNow - std::chrono::seconds{pObj.GetDeletionTime()};
 
         LogPrint(BCLog::GOBJECT, "CGovernanceManager::UpdateCachesAndClean -- Checking object for deletion: %s, deletion time = %d, time since deletion = %d, delete flag = %d, expired flag = %d\n",
-            strHash, pObj->GetDeletionTime(), nTimeSinceDeletion.count(), pObj->IsSetCachedDelete(), pObj->IsSetExpired());
+            strHash, pObj.GetDeletionTime(), nTimeSinceDeletion.count(), pObj.IsSetCachedDelete(), pObj.IsSetExpired());
 
-        if ((pObj->IsSetCachedDelete() || pObj->IsSetExpired()) &&
+        if ((pObj.IsSetCachedDelete() || pObj.IsSetExpired()) &&
             (nTimeSinceDeletion >= GOVERNANCE_DELETION_DELAY)) {
-            LogPrint(BCLog::GOBJECT, "CGovernanceManager::UpdateCachesAndClean -- erase obj %s\n", (*it).first.ToString());
-            m_mn_metaman.RemoveGovernanceObject(pObj->GetHash());
+            LogPrint(BCLog::GOBJECT, "CGovernanceManager::UpdateCachesAndClean -- erase obj %s\n", nHash.ToString());
+            m_mn_metaman.RemoveGovernanceObject(pObj.GetHash());
 
             // Remove vote references
             const object_ref_cm_t::list_t& listItems = cmapVoteToObject.GetItemList();
-            auto lit = listItems.begin();
-            while (lit != listItems.end()) {
-                if (lit->value == pObj) {
+            for (auto lit = listItems.begin(); lit != listItems.end();) {
+                if (lit->value == &pObj) {
                     uint256 nKey = lit->key;
                     ++lit;
                     cmapVoteToObject.Erase(nKey);
@@ -536,12 +532,12 @@ void CGovernanceManager::CheckAndRemove()
 
             int64_t nTimeExpired{0};
 
-            if (pObj->GetObjectType() == GovernanceObject::PROPOSAL) {
+            if (pObj.GetObjectType() == GovernanceObject::PROPOSAL) {
                 // keep hashes of deleted proposals forever
                 nTimeExpired = std::numeric_limits<int64_t>::max();
             } else {
                 int64_t nSuperblockCycleSeconds = Params().GetConsensus().nSuperblockCycle * Params().GetConsensus().nPowTargetSpacing;
-                nTimeExpired = (std::chrono::seconds{pObj->GetCreationTime()} +
+                nTimeExpired = (std::chrono::seconds{pObj.GetCreationTime()} +
                                 std::chrono::seconds{2 * nSuperblockCycleSeconds} + GOVERNANCE_DELETION_DELAY)
                                    .count();
             }
@@ -549,11 +545,11 @@ void CGovernanceManager::CheckAndRemove()
             mapErasedGovernanceObjects.insert(std::make_pair(nHash, nTimeExpired));
             mapObjects.erase(it++);
         } else {
-            if (pObj->GetObjectType() == GovernanceObject::PROPOSAL) {
-                CProposalValidator validator(pObj->GetDataAsHexString());
+            if (pObj.GetObjectType() == GovernanceObject::PROPOSAL) {
+                CProposalValidator validator(pObj.GetDataAsHexString());
                 if (!validator.Validate()) {
                     LogPrint(BCLog::GOBJECT, "CGovernanceManager::UpdateCachesAndClean -- set for deletion expired obj %s\n", strHash);
-                    pObj->PrepareDeletion(nNow.count());
+                    pObj.PrepareDeletion(nNow.count());
                 }
             }
             ++it;
@@ -561,8 +557,7 @@ void CGovernanceManager::CheckAndRemove()
     }
 
     // forget about expired deleted objects
-    auto s_it = mapErasedGovernanceObjects.begin();
-    while (s_it != mapErasedGovernanceObjects.end()) {
+    for (auto s_it = mapErasedGovernanceObjects.begin(); s_it != mapErasedGovernanceObjects.end();) {
         if (s_it->second < nNow.count()) {
             mapErasedGovernanceObjects.erase(s_it++);
         } else {
@@ -571,8 +566,7 @@ void CGovernanceManager::CheckAndRemove()
     }
 
     // forget about expired requests
-    auto r_it = m_requested_hash_time.begin();
-    while (r_it != m_requested_hash_time.end()) {
+    for (auto r_it = m_requested_hash_time.begin(); r_it != m_requested_hash_time.end();) {
         if (r_it->second < nNow) {
             m_requested_hash_time.erase(r_it++);
         } else {
@@ -619,8 +613,8 @@ CGovernanceObject* CGovernanceManager::FindGovernanceObjectByDataHash(const uint
 {
     AssertLockNotHeld(cs_store);
     LOCK(cs_store);
-    for (const auto& [nHash, object] : mapObjects) {
-        if (object.GetDataHash() == nDataHash) return &mapObjects[nHash];
+    for (const auto& [nHash, govobj] : mapObjects) {
+        if (govobj.GetDataHash() == nDataHash) return &mapObjects[nHash];
     }
     return nullptr;
 }
@@ -649,13 +643,13 @@ std::vector<CGovernanceVote> CGovernanceManager::GetCurrentVotes(const uint256&
     }
 
     // Loop through each MN collateral outpoint and get the votes for the `nParentHash` governance object
-    for (const auto& mnpair : mapMasternodes) {
+    for (const auto& [outpoint, _] : mapMasternodes) {
         // get a vote_rec_t from the govobj
         vote_rec_t voteRecord;
-        if (!govobj.GetCurrentMNVotes(mnpair.first, voteRecord)) continue;
+        if (!govobj.GetCurrentMNVotes(outpoint, voteRecord)) continue;
 
         for (const auto& [signal, vote_instance] : voteRecord.mapInstances) {
-            CGovernanceVote vote = CGovernanceVote(mnpair.first, nParentHash, (vote_signal_enum_t)signal,
+            CGovernanceVote vote = CGovernanceVote(outpoint, nParentHash, (vote_signal_enum_t)signal,
                                                    vote_instance.eOutcome);
             vote.SetTime(vote_instance.nCreationTime);
             vecResult.push_back(vote);
@@ -669,14 +663,14 @@ void CGovernanceManager::GetAllNewerThan(std::vector<CGovernanceObject>& objs, i
 {
     LOCK(cs_store);
 
-    for (const auto& objPair : mapObjects) {
+    for (const auto& [_, govobj] : mapObjects) {
         // IF THIS OBJECT IS OLDER THAN TIME, CONTINUE
-        if (objPair.second.GetCreationTime() < nMoreThanTime) {
+        if (govobj.GetCreationTime() < nMoreThanTime) {
             continue;
         }
 
         // ADD GOVERNANCE OBJECT TO LIST
-        objs.push_back(objPair.second);
+        objs.push_back(govobj);
     }
 }
 
@@ -799,11 +793,8 @@ MessageProcessingResult CGovernanceManager::SyncObjects(CNode& peer, CConnman& c
 
     // all valid objects, no votes
     MessageProcessingResult ret{};
-    for (const auto& objPair : mapObjects) {
-        uint256 nHash = objPair.first;
-        const CGovernanceObject& govobj = objPair.second;
+    for (const auto& [nHash, govobj] : mapObjects) {
         std::string strHash = nHash.ToString();
-
         LogPrint(BCLog::GOBJECT, "CGovernanceManager::%s -- attempting to sync govobj: %s, peer=%d\n", __func__, strHash, peer.GetId());
 
         if (govobj.IsSetCachedDelete() || govobj.IsSetExpired()) {
@@ -1140,8 +1131,7 @@ int CGovernanceManager::RequestGovernanceObjectVotes(const std::vector<CNode*>&
         for (const auto& [nHash, govobj] : mapObjects) {
             if (govobj.IsSetCachedDelete()) continue;
             if (mapAskedRecently.count(nHash)) {
-                auto it = mapAskedRecently[nHash].begin();
-                while (it != mapAskedRecently[nHash].end()) {
+                for (auto it = mapAskedRecently[nHash].begin(); it != mapAskedRecently[nHash].end();) {
                     if (it->second < nNow) {
                         mapAskedRecently[nHash].erase(it++);
                     } else {
@@ -1229,8 +1219,7 @@ void CGovernanceManager::RebuildIndexes()
     AssertLockHeld(cs_store);
 
     cmapVoteToObject.Clear();
-    for (auto& objPair : mapObjects) {
-        CGovernanceObject& govobj = objPair.second;
+    for (auto& [_, govobj] : mapObjects) {
         std::vector<CGovernanceVote> vecVotes = WITH_LOCK(govobj.cs, return govobj.GetVoteFile().GetVotes());
         for (const auto& vecVote : vecVotes) {
             cmapVoteToObject.Insert(vecVote.GetHash(), &govobj);
@@ -1244,9 +1233,7 @@ void CGovernanceManager::AddCachedTriggers()
 
     int64_t nNow = GetTime<std::chrono::seconds>().count();
 
-    for (auto& objpair : mapObjects) {
-        CGovernanceObject& govobj = objpair.second;
-
+    for (auto& [_, govobj] : mapObjects) {
         if (govobj.GetObjectType() != GovernanceObject::TRIGGER) {
             continue;
         }
@@ -1297,8 +1284,8 @@ std::string GovernanceStore::ToString() const
     int nTriggerCount = 0;
     int nOtherCount = 0;
 
-    for (const auto& objPair : mapObjects) {
-        switch (objPair.second.GetObjectType()) {
+    for (const auto& [_, govobj] : mapObjects) {
+        switch (govobj.GetObjectType()) {
         case GovernanceObject::PROPOSAL:
             nProposalCount++;
             break;
@@ -1330,8 +1317,8 @@ UniValue CGovernanceManager::ToJson() const
     int nTriggerCount = 0;
     int nOtherCount = 0;
 
-    for (const auto& objpair : mapObjects) {
-        switch (objpair.second.GetObjectType()) {
+    for (const auto& [_, govobj] : mapObjects) {
+        switch (govobj.GetObjectType()) {
         case GovernanceObject::PROPOSAL:
             nProposalCount++;
             break;
@@ -1415,12 +1402,11 @@ void CGovernanceManager::CleanOrphanObjects()
 
     int64_t nNow = GetTime<std::chrono::seconds>().count();
 
-    auto it = items.begin();
-    while (it != items.end()) {
+    for (auto it = items.begin(); it != items.end();) {
         auto prevIt = it;
         ++it;
-        const vote_time_pair_t& pairVote = prevIt->value;
-        if (pairVote.second < nNow) {
+        const auto& [vote, time] = prevIt->value;
+        if (time < nNow) {
             cmmapOrphanVotes.Erase(prevIt->key, prevIt->value);
         }
     }
@@ -1438,14 +1424,14 @@ void CGovernanceManager::RemoveInvalidVotes()
     auto diff = lastMNListForVotingKeys->BuildDiff(tip_mn_list);
 
     std::vector<COutPoint> changedKeyMNs;
-    for (const auto& p : diff.updatedMNs) {
-        auto oldDmn = lastMNListForVotingKeys->GetMNByInternalId(p.first);
+    for (const auto& [internalId, pdmnState] : diff.updatedMNs) {
+        auto oldDmn = lastMNListForVotingKeys->GetMNByInternalId(internalId);
         // BuildDiff will construct itself with MNs that we already have knowledge
         // of, meaning that fetch operations should never fail.
         assert(oldDmn);
-        if ((p.second.fields & CDeterministicMNStateDiff::Field_keyIDVoting) && p.second.state.keyIDVoting != oldDmn->pdmnState->keyIDVoting) {
+        if ((pdmnState.fields & CDeterministicMNStateDiff::Field_keyIDVoting) && pdmnState.state.keyIDVoting != oldDmn->pdmnState->keyIDVoting) {
             changedKeyMNs.emplace_back(oldDmn->collateralOutpoint);
-        } else if ((p.second.fields & CDeterministicMNStateDiff::Field_pubKeyOperator) && p.second.state.pubKeyOperator != oldDmn->pdmnState->pubKeyOperator) {
+        } else if ((pdmnState.fields & CDeterministicMNStateDiff::Field_pubKeyOperator) && pdmnState.state.pubKeyOperator != oldDmn->pdmnState->pubKeyOperator) {
             changedKeyMNs.emplace_back(oldDmn->collateralOutpoint);
         }
     }
@@ -1458,8 +1444,8 @@ void CGovernanceManager::RemoveInvalidVotes()
     }
 
     for (const auto& outpoint : changedKeyMNs) {
-        for (auto& p : mapObjects) {
-            auto removed = p.second.RemoveInvalidVotes(tip_mn_list, outpoint);
+        for (auto& [_, govobj] : mapObjects) {
+            auto removed = govobj.RemoveInvalidVotes(tip_mn_list, outpoint);
             if (removed.empty()) {
                 continue;
             }
@@ -1526,8 +1512,7 @@ void CGovernanceManager::CleanAndRemoveTriggers()
     // Remove triggers that are invalid or expired
     LogPrint(BCLog::GOBJECT, "CGovernanceManager::%s -- mapTrigger.size() = %d\n", __func__, mapTrigger.size());
 
-    auto it = mapTrigger.begin();
-    while (it != mapTrigger.end()) {
+    for (auto it = mapTrigger.begin(); it != mapTrigger.end();) {
         bool remove = false;
         CGovernanceObject* pObj = nullptr;
         const CSuperblock_sptr& pSuperblock = it->second;
@@ -1601,10 +1586,10 @@ std::vector<CSuperblock_sptr> CGovernanceManager::GetActiveTriggersInternal() co
     std::vector<CSuperblock_sptr> vecResults;
 
     // LOOK AT THESE OBJECTS AND COMPILE A VALID LIST OF TRIGGERS
-    for (const auto& pair : mapTrigger) {
-        const CGovernanceObject* pObj = FindConstGovernanceObjectInternal(pair.first);
+    for (const auto& [nHash, pSuperblock] : mapTrigger) {
+        const CGovernanceObject* pObj = FindConstGovernanceObjectInternal(nHash);
         if (pObj) {
-            vecResults.push_back(pair.second);
+            vecResults.push_back(pSuperblock);
         }
     }
 
@@ -1792,13 +1777,13 @@ std::vector<std::shared_ptr<const CGovernanceObject>> CGovernanceManager::GetApp
     const int nAbsVoteReq = std::max(Params().GetConsensus().nGovernanceMinQuorum, nWeightedMnCount / 10);
 
     LOCK(cs_store);
-    for (const auto& [unused, object] : mapObjects) {
+    for (const auto& [_, govobj] : mapObjects) {
         // Skip all non-proposals objects
-        if (object.GetObjectType() != GovernanceObject::PROPOSAL) continue;
+        if (govobj.GetObjectType() != GovernanceObject::PROPOSAL) continue;
         // Skip non-passing proposals
-        const int absYesCount = object.GetAbsoluteYesCount(tip_mn_list, VOTE_SIGNAL_FUNDING);
+        const int absYesCount = govobj.GetAbsoluteYesCount(tip_mn_list, VOTE_SIGNAL_FUNDING);
         if (absYesCount < nAbsVoteReq) continue;
-        ret.emplace_back(std::make_shared<const CGovernanceObject>(object));
+        ret.emplace_back(std::make_shared<const CGovernanceObject>(govobj));
     }
 
     // Sort approved proposals by absolute Yes votes descending
diff --git a/src/governance/object.cpp b/src/governance/object.cpp
index 3b44aaaffd1a..cc961d4d4d81 100644
--- a/src/governance/object.cpp
+++ b/src/governance/object.cpp
@@ -534,13 +534,12 @@ int CGovernanceObject::CountMatchingVotes(const CDeterministicMNList& tip_mn_lis
     LOCK(cs);
 
     int nCount = 0;
-    for (const auto& votepair : mapCurrentMNVotes) {
-        const vote_rec_t& recVote = votepair.second;
+    for (const auto& [outpoint, recVote] : mapCurrentMNVotes) {
         auto it2 = recVote.mapInstances.find(eVoteSignalIn);
         if (it2 != recVote.mapInstances.end() && it2->second.eOutcome == eVoteOutcomeIn) {
             // 4x times weight vote for EvoNode owners.
             // No need to check if v19 is active since no EvoNode are allowed to register before v19s
-            auto dmn = tip_mn_list.GetMNByCollateral(votepair.first);
+            auto dmn = tip_mn_list.GetMNByCollateral(outpoint);
             if (dmn != nullptr) nCount += GetMnType(dmn->nType).voting_weight;
         }
     }
diff --git a/src/rpc/governance.cpp b/src/rpc/governance.cpp
index 42bec108ed1c..4ebfb69cf081 100644
--- a/src/rpc/governance.cpp
+++ b/src/rpc/governance.cpp
@@ -427,10 +427,7 @@ static UniValue VoteWithMasternodes(const JSONRPCRequest& request, const CWallet
 
     UniValue resultsObj(UniValue::VOBJ);
 
-    for (const auto& p : votingKeys) {
-        const auto& proTxHash = p.first;
-        const auto& keyID = p.second;
-
+    for (const auto& [proTxHash, keyID] : votingKeys) {
         UniValue statusObj(UniValue::VOBJ);
 
         auto dmn = mnList.GetValidMN(proTxHash);

From dc9787fcb5361a646a4f9a66ef79fa584f132b51 Mon Sep 17 00:00:00 2001
From: Kittywhiskers Van Gogh <63189531+kwvg@users.noreply.github.com>
Date: Tue, 28 Oct 2025 16:45:27 +0530
Subject: [PATCH 289/656] fix: use `std::shared_ptr` to manage
 `CGovernanceObject` lifetime

---
 src/governance/governance.cpp | 123 +++++++++++++++++-----------------
 src/governance/governance.h   |  16 ++---
 src/governance/object.h       |   2 +
 src/governance/signing.cpp    |   2 +-
 src/governance/signing.h      |   4 +-
 src/rpc/governance.cpp        |   8 +--
 6 files changed, 79 insertions(+), 76 deletions(-)

diff --git a/src/governance/governance.cpp b/src/governance/governance.cpp
index 549ee214b24f..39d9bd9792af 100644
--- a/src/governance/governance.cpp
+++ b/src/governance/governance.cpp
@@ -186,7 +186,7 @@ bool CGovernanceManager::HaveVoteForHash(const uint256& nHash) const
 {
     LOCK(cs_store);
 
-    CGovernanceObject* pGovobj = nullptr;
+    std::shared_ptr<CGovernanceObject> pGovobj{nullptr};
     return cmapVoteToObject.Get(nHash, pGovobj) && WITH_LOCK(pGovobj->cs, return pGovobj->GetVoteFile().HasVote(nHash));
 }
 
@@ -200,7 +200,7 @@ bool CGovernanceManager::SerializeVoteForHash(const uint256& nHash, CDataStream&
 {
     LOCK(cs_store);
 
-    CGovernanceObject* pGovobj = nullptr;
+    std::shared_ptr<CGovernanceObject> pGovobj{nullptr};
     return cmapVoteToObject.Get(nHash, pGovobj) && WITH_LOCK(pGovobj->cs, return pGovobj->GetVoteFile().SerializeVoteToStream(nHash, ss));
 }
 
@@ -213,7 +213,7 @@ void CGovernanceManager::AddPostponedObject(const CGovernanceObject& govobj)
 void CGovernanceManager::AddPostponedObjectInternal(const CGovernanceObject& govobj)
 {
     AssertLockHeld(cs_store);
-    mapPostponedObjects.insert(std::make_pair(govobj.GetHash(), govobj));
+    mapPostponedObjects.emplace(govobj.GetHash(), std::make_shared<CGovernanceObject>(govobj));
 }
 
 MessageProcessingResult CGovernanceManager::ProcessMessage(CNode& peer, CConnman& connman, std::string_view msg_type,
@@ -421,7 +421,7 @@ void CGovernanceManager::AddGovernanceObjectInternal(CGovernanceObject& insert_o
 
     // INSERT INTO OUR GOVERNANCE OBJECT MEMORY
     // IF WE HAVE THIS OBJECT ALREADY, WE DON'T WANT ANOTHER COPY
-    auto [emplace_ret, emplace_status] = mapObjects.emplace(nHash, insert_obj);
+    auto [emplace_ret, emplace_status] = mapObjects.emplace(nHash, std::make_shared<CGovernanceObject>(insert_obj));
 
     if (!emplace_status) {
         LogPrint(BCLog::GOBJECT, "CGovernanceManager::AddGovernanceObject -- already have governance object %s\n", nHash.ToString());
@@ -432,28 +432,28 @@ void CGovernanceManager::AddGovernanceObjectInternal(CGovernanceObject& insert_o
 
     auto& [_, govobj] = *emplace_ret;
     LogPrint(BCLog::GOBJECT, "CGovernanceManager::AddGovernanceObject -- Before trigger block, GetDataAsPlainString = %s, nObjectType = %d\n",
-                govobj.GetDataAsPlainString(), ToUnderlying(govobj.GetObjectType()));
+                Assert(govobj)->GetDataAsPlainString(), ToUnderlying(govobj->GetObjectType()));
 
-    if (govobj.GetObjectType() == GovernanceObject::TRIGGER && !AddNewTrigger(nHash)) {
+    if (govobj->GetObjectType() == GovernanceObject::TRIGGER && !AddNewTrigger(nHash)) {
         LogPrint(BCLog::GOBJECT, "CGovernanceManager::AddGovernanceObject -- undo adding invalid trigger object: hash = %s\n", nHash.ToString());
-        govobj.PrepareDeletion(GetTime<std::chrono::seconds>().count());
+        govobj->PrepareDeletion(GetTime<std::chrono::seconds>().count());
         return;
     }
 
     LogPrint(BCLog::GOBJECT, "CGovernanceManager::AddGovernanceObject -- %s new, received from peer %s\n", strHash, pfrom ? pfrom->GetLogString() : "nullptr");
-    RelayObject(govobj);
+    RelayObject(*govobj);
 
     // Update the rate buffer
-    MasternodeRateUpdate(govobj);
+    MasternodeRateUpdate(*govobj);
 
     m_mn_sync.BumpAssetLastTime("CGovernanceManager::AddGovernanceObject");
 
     // WE MIGHT HAVE PENDING/ORPHAN VOTES FOR THIS OBJECT
 
-    CheckOrphanVotes(govobj);
+    CheckOrphanVotes(*govobj);
 
     // SEND NOTIFICATION TO SCRIPT/ZMQ
-    GetMainSignals().NotifyGovernanceObject(std::make_shared<const Governance::Object>(govobj.Object()), nHash.ToString());
+    GetMainSignals().NotifyGovernanceObject(std::make_shared<const Governance::Object>(govobj->Object()), nHash.ToString());
 }
 
 void CGovernanceManager::AddGovernanceObject(CGovernanceObject& govobj, const CNode* pfrom)
@@ -484,7 +484,7 @@ void CGovernanceManager::CheckAndRemove()
         if (it == mapObjects.end()) {
             continue;
         }
-        it->second.ClearMasternodeVotes(tip_mn_list);
+        Assert(it->second)->ClearMasternodeVotes(tip_mn_list);
     }
 
     ScopedLockBool guard(cs_store, fRateChecksEnabled, false);
@@ -498,30 +498,30 @@ void CGovernanceManager::CheckAndRemove()
         std::string strHash = nHash.ToString();
 
         // IF CACHE IS NOT DIRTY, WHY DO THIS?
-        if (pObj.IsSetDirtyCache()) {
+        if (Assert(pObj)->IsSetDirtyCache()) {
             // UPDATE LOCAL VALIDITY AGAINST CRYPTO DATA
-            pObj.UpdateLocalValidity(tip_mn_list, m_chainman);
+            pObj->UpdateLocalValidity(tip_mn_list, m_chainman);
 
             // UPDATE SENTINEL SIGNALING VARIABLES
-            pObj.UpdateSentinelVariables(tip_mn_list);
+            pObj->UpdateSentinelVariables(tip_mn_list);
         }
 
         // IF DELETE=TRUE, THEN CLEAN THE MESS UP!
 
-        const auto nTimeSinceDeletion = nNow - std::chrono::seconds{pObj.GetDeletionTime()};
+        const auto nTimeSinceDeletion = nNow - std::chrono::seconds{pObj->GetDeletionTime()};
 
         LogPrint(BCLog::GOBJECT, "CGovernanceManager::UpdateCachesAndClean -- Checking object for deletion: %s, deletion time = %d, time since deletion = %d, delete flag = %d, expired flag = %d\n",
-            strHash, pObj.GetDeletionTime(), nTimeSinceDeletion.count(), pObj.IsSetCachedDelete(), pObj.IsSetExpired());
+            strHash, pObj->GetDeletionTime(), nTimeSinceDeletion.count(), pObj->IsSetCachedDelete(), pObj->IsSetExpired());
 
-        if ((pObj.IsSetCachedDelete() || pObj.IsSetExpired()) &&
+        if ((pObj->IsSetCachedDelete() || pObj->IsSetExpired()) &&
             (nTimeSinceDeletion >= GOVERNANCE_DELETION_DELAY)) {
             LogPrint(BCLog::GOBJECT, "CGovernanceManager::UpdateCachesAndClean -- erase obj %s\n", nHash.ToString());
-            m_mn_metaman.RemoveGovernanceObject(pObj.GetHash());
+            m_mn_metaman.RemoveGovernanceObject(pObj->GetHash());
 
             // Remove vote references
             const object_ref_cm_t::list_t& listItems = cmapVoteToObject.GetItemList();
             for (auto lit = listItems.begin(); lit != listItems.end();) {
-                if (lit->value == &pObj) {
+                if (lit->value == pObj) {
                     uint256 nKey = lit->key;
                     ++lit;
                     cmapVoteToObject.Erase(nKey);
@@ -532,12 +532,12 @@ void CGovernanceManager::CheckAndRemove()
 
             int64_t nTimeExpired{0};
 
-            if (pObj.GetObjectType() == GovernanceObject::PROPOSAL) {
+            if (pObj->GetObjectType() == GovernanceObject::PROPOSAL) {
                 // keep hashes of deleted proposals forever
                 nTimeExpired = std::numeric_limits<int64_t>::max();
             } else {
                 int64_t nSuperblockCycleSeconds = Params().GetConsensus().nSuperblockCycle * Params().GetConsensus().nPowTargetSpacing;
-                nTimeExpired = (std::chrono::seconds{pObj.GetCreationTime()} +
+                nTimeExpired = (std::chrono::seconds{pObj->GetCreationTime()} +
                                 std::chrono::seconds{2 * nSuperblockCycleSeconds} + GOVERNANCE_DELETION_DELAY)
                                    .count();
             }
@@ -545,11 +545,11 @@ void CGovernanceManager::CheckAndRemove()
             mapErasedGovernanceObjects.insert(std::make_pair(nHash, nTimeExpired));
             mapObjects.erase(it++);
         } else {
-            if (pObj.GetObjectType() == GovernanceObject::PROPOSAL) {
-                CProposalValidator validator(pObj.GetDataAsHexString());
+            if (pObj->GetObjectType() == GovernanceObject::PROPOSAL) {
+                CProposalValidator validator(pObj->GetDataAsHexString());
                 if (!validator.Validate()) {
                     LogPrint(BCLog::GOBJECT, "CGovernanceManager::UpdateCachesAndClean -- set for deletion expired obj %s\n", strHash);
-                    pObj.PrepareDeletion(nNow.count());
+                    pObj->PrepareDeletion(nNow.count());
                 }
             }
             ++it;
@@ -579,42 +579,42 @@ void CGovernanceManager::CheckAndRemove()
              ToString(), m_requested_hash_time.size());
 }
 
-const CGovernanceObject* CGovernanceManager::FindConstGovernanceObject(const uint256& nHash) const
+std::shared_ptr<const CGovernanceObject> CGovernanceManager::FindConstGovernanceObject(const uint256& nHash) const
 {
     LOCK(cs_store);
     return FindConstGovernanceObjectInternal(nHash);
 }
 
-const CGovernanceObject* CGovernanceManager::FindConstGovernanceObjectInternal(const uint256& nHash) const
+std::shared_ptr<const CGovernanceObject> CGovernanceManager::FindConstGovernanceObjectInternal(const uint256& nHash) const
 {
     AssertLockHeld(cs_store);
 
     auto it = mapObjects.find(nHash);
-    if (it != mapObjects.end()) return &(it->second);
+    if (it != mapObjects.end()) return (it->second);
 
     return nullptr;
 }
 
-CGovernanceObject* CGovernanceManager::FindGovernanceObject(const uint256& nHash)
+std::shared_ptr<CGovernanceObject> CGovernanceManager::FindGovernanceObject(const uint256& nHash)
 {
     AssertLockNotHeld(cs_store);
     LOCK(cs_store);
     return FindGovernanceObjectInternal(nHash);
 }
 
-CGovernanceObject* CGovernanceManager::FindGovernanceObjectInternal(const uint256& nHash)
+std::shared_ptr<CGovernanceObject> CGovernanceManager::FindGovernanceObjectInternal(const uint256& nHash)
 {
     AssertLockHeld(cs_store);
-    if (mapObjects.count(nHash)) return &mapObjects[nHash];
+    if (mapObjects.count(nHash)) return mapObjects[nHash];
     return nullptr;
 }
 
-CGovernanceObject* CGovernanceManager::FindGovernanceObjectByDataHash(const uint256 &nDataHash)
+std::shared_ptr<CGovernanceObject> CGovernanceManager::FindGovernanceObjectByDataHash(const uint256 &nDataHash)
 {
     AssertLockNotHeld(cs_store);
     LOCK(cs_store);
     for (const auto& [nHash, govobj] : mapObjects) {
-        if (govobj.GetDataHash() == nDataHash) return &mapObjects[nHash];
+        if (Assert(govobj)->GetDataHash() == nDataHash) return govobj;
     }
     return nullptr;
 }
@@ -627,7 +627,7 @@ std::vector<CGovernanceVote> CGovernanceManager::GetCurrentVotes(const uint256&
     // Find the governance object or short-circuit.
     auto it = mapObjects.find(nParentHash);
     if (it == mapObjects.end()) return vecResult;
-    const CGovernanceObject& govobj = it->second;
+    const auto& govobj = *Assert(it->second);
 
     const auto tip_mn_list = Assert(m_dmnman)->GetListAtChainTip();
     std::map<COutPoint, CDeterministicMNCPtr> mapMasternodes;
@@ -665,12 +665,12 @@ void CGovernanceManager::GetAllNewerThan(std::vector<CGovernanceObject>& objs, i
 
     for (const auto& [_, govobj] : mapObjects) {
         // IF THIS OBJECT IS OLDER THAN TIME, CONTINUE
-        if (govobj.GetCreationTime() < nMoreThanTime) {
+        if (Assert(govobj)->GetCreationTime() < nMoreThanTime) {
             continue;
         }
 
         // ADD GOVERNANCE OBJECT TO LIST
-        objs.push_back(govobj);
+        objs.push_back(*govobj);
     }
 }
 
@@ -735,7 +735,7 @@ MessageProcessingResult CGovernanceManager::SyncSingleObjVotes(CNode& peer, cons
         LogPrint(BCLog::GOBJECT, "CGovernanceManager::%s -- no matching object for hash %s, peer=%d\n", __func__, nProp.ToString(), peer.GetId());
         return {};
     }
-    const CGovernanceObject& govobj = it->second;
+    const auto& govobj = *Assert(it->second);
     std::string strHash = it->first.ToString();
 
     LogPrint(BCLog::GOBJECT, "CGovernanceManager::%s -- attempting to sync govobj: %s, peer=%d\n", __func__, strHash, peer.GetId());
@@ -797,7 +797,7 @@ MessageProcessingResult CGovernanceManager::SyncObjects(CNode& peer, CConnman& c
         std::string strHash = nHash.ToString();
         LogPrint(BCLog::GOBJECT, "CGovernanceManager::%s -- attempting to sync govobj: %s, peer=%d\n", __func__, strHash, peer.GetId());
 
-        if (govobj.IsSetCachedDelete() || govobj.IsSetExpired()) {
+        if (Assert(govobj)->IsSetCachedDelete() || govobj->IsSetExpired()) {
             LogPrint(BCLog::GOBJECT, "CGovernanceManager::%s -- not syncing deleted/expired govobj: %s, peer=%d\n", __func__,
                 strHash, peer.GetId());
             continue;
@@ -963,7 +963,7 @@ bool CGovernanceManager::ProcessVote(CNode* pfrom, const CGovernanceVote& vote,
         return false;
     }
 
-    CGovernanceObject& govobj = it->second;
+    auto& govobj = *Assert(it->second);
 
     if (govobj.IsSetCachedDelete() || govobj.IsSetExpired()) {
         LogPrint(BCLog::GOBJECT, "CGovernanceObject::%s -- ignoring vote for expired or deleted object, hash = %s\n",
@@ -974,7 +974,7 @@ bool CGovernanceManager::ProcessVote(CNode* pfrom, const CGovernanceVote& vote,
 
     bool fOk = govobj.ProcessVote(m_mn_metaman, *this, Assert(m_dmnman)->GetListAtChainTip(), vote, exception);
     if (fOk) {
-        fOk = cmapVoteToObject.Insert(nHashVote, &govobj);
+        fOk = cmapVoteToObject.Insert(nHashVote, it->second);
     } else if (exception.GetType() == GOVERNANCE_EXCEPTION_PERMANENT_ERROR && exception.GetNodePenalty() == 20) {
         cmapInvalidVotes.Insert(nHashVote, vote);
     }
@@ -992,7 +992,7 @@ void CGovernanceManager::CheckPostponedObjects()
     // Check postponed proposals
     for (auto it = mapPostponedObjects.begin(); it != mapPostponedObjects.end();) {
         const uint256& nHash = it->first;
-        CGovernanceObject& govobj = it->second;
+        auto& govobj = *Assert(it->second);
 
         assert(govobj.GetObjectType() != GovernanceObject::TRIGGER);
 
@@ -1023,7 +1023,7 @@ void CGovernanceManager::CheckPostponedObjects()
     for (auto it = setAdditionalRelayObjects.begin(); it != setAdditionalRelayObjects.end();) {
         auto itObject = mapObjects.find(*it);
         if (itObject != mapObjects.end()) {
-            const CGovernanceObject& govobj = itObject->second;
+            const auto& govobj = *Assert(itObject->second);
 
             int64_t nTimestamp = govobj.GetCreationTime();
 
@@ -1066,7 +1066,7 @@ void CGovernanceManager::RequestGovernanceObject(CNode* pfrom, const uint256& nH
     size_t nVoteCount = 0;
     if (fUseFilter) {
         LOCK(cs_store);
-        const CGovernanceObject* pObj = FindConstGovernanceObjectInternal(nHash);
+        auto pObj = FindConstGovernanceObjectInternal(nHash);
 
         if (pObj) {
             filter = CBloomFilter(Params().GetConsensus().nGovernanceFilterElements, GOVERNANCE_FILTER_FP_RATE, GetRand<int>(/*nMax=*/999999), BLOOM_UPDATE_ALL);
@@ -1129,7 +1129,7 @@ int CGovernanceManager::RequestGovernanceObjectVotes(const std::vector<CNode*>&
         if (mapObjects.empty()) return -2;
 
         for (const auto& [nHash, govobj] : mapObjects) {
-            if (govobj.IsSetCachedDelete()) continue;
+            if (Assert(govobj)->IsSetCachedDelete()) continue;
             if (mapAskedRecently.count(nHash)) {
                 for (auto it = mapAskedRecently[nHash].begin(); it != mapAskedRecently[nHash].end();) {
                     if (it->second < nNow) {
@@ -1141,7 +1141,7 @@ int CGovernanceManager::RequestGovernanceObjectVotes(const std::vector<CNode*>&
                 if (mapAskedRecently[nHash].size() >= nPeersPerHashMax) continue;
             }
 
-            if (govobj.GetObjectType() == GovernanceObject::TRIGGER) {
+            if (govobj->GetObjectType() == GovernanceObject::TRIGGER) {
                 vTriggerObjHashes.push_back(nHash);
             } else {
                 vOtherObjHashes.push_back(nHash);
@@ -1220,9 +1220,10 @@ void CGovernanceManager::RebuildIndexes()
 
     cmapVoteToObject.Clear();
     for (auto& [_, govobj] : mapObjects) {
-        std::vector<CGovernanceVote> vecVotes = WITH_LOCK(govobj.cs, return govobj.GetVoteFile().GetVotes());
+        assert(govobj);
+        std::vector<CGovernanceVote> vecVotes = WITH_LOCK(govobj->cs, return govobj->GetVoteFile().GetVotes());
         for (const auto& vecVote : vecVotes) {
-            cmapVoteToObject.Insert(vecVote.GetHash(), &govobj);
+            cmapVoteToObject.Insert(vecVote.GetHash(), govobj);
         }
     }
 }
@@ -1234,12 +1235,12 @@ void CGovernanceManager::AddCachedTriggers()
     int64_t nNow = GetTime<std::chrono::seconds>().count();
 
     for (auto& [_, govobj] : mapObjects) {
-        if (govobj.GetObjectType() != GovernanceObject::TRIGGER) {
+        if (Assert(govobj)->GetObjectType() != GovernanceObject::TRIGGER) {
             continue;
         }
 
-        if (!AddNewTrigger(govobj.GetHash())) {
-            govobj.PrepareDeletion(nNow);
+        if (!AddNewTrigger(govobj->GetHash())) {
+            govobj->PrepareDeletion(nNow);
         }
     }
 }
@@ -1285,7 +1286,7 @@ std::string GovernanceStore::ToString() const
     int nOtherCount = 0;
 
     for (const auto& [_, govobj] : mapObjects) {
-        switch (govobj.GetObjectType()) {
+        switch (Assert(govobj)->GetObjectType()) {
         case GovernanceObject::PROPOSAL:
             nProposalCount++;
             break;
@@ -1318,7 +1319,7 @@ UniValue CGovernanceManager::ToJson() const
     int nOtherCount = 0;
 
     for (const auto& [_, govobj] : mapObjects) {
-        switch (govobj.GetObjectType()) {
+        switch (Assert(govobj)->GetObjectType()) {
         case GovernanceObject::PROPOSAL:
             nProposalCount++;
             break;
@@ -1445,7 +1446,7 @@ void CGovernanceManager::RemoveInvalidVotes()
 
     for (const auto& outpoint : changedKeyMNs) {
         for (auto& [_, govobj] : mapObjects) {
-            auto removed = govobj.RemoveInvalidVotes(tip_mn_list, outpoint);
+            auto removed = Assert(govobj)->RemoveInvalidVotes(tip_mn_list, outpoint);
             if (removed.empty()) {
                 continue;
             }
@@ -1479,7 +1480,7 @@ bool CGovernanceManager::AddNewTrigger(uint256 nHash)
 
     CSuperblock_sptr pSuperblock;
     try {
-        const CGovernanceObject* pGovObj = FindGovernanceObjectInternal(nHash);
+        auto pGovObj = FindGovernanceObjectInternal(nHash);
         if (!pGovObj) {
             throw std::runtime_error("CSuperblock: Failed to find Governance Object");
         }
@@ -1514,7 +1515,7 @@ void CGovernanceManager::CleanAndRemoveTriggers()
 
     for (auto it = mapTrigger.begin(); it != mapTrigger.end();) {
         bool remove = false;
-        CGovernanceObject* pObj = nullptr;
+        std::shared_ptr<CGovernanceObject> pObj = nullptr;
         const CSuperblock_sptr& pSuperblock = it->second;
         if (!pSuperblock) {
             LogPrint(BCLog::GOBJECT, "CGovernanceManager::%s -- nullptr superblock\n", __func__);
@@ -1587,7 +1588,7 @@ std::vector<CSuperblock_sptr> CGovernanceManager::GetActiveTriggersInternal() co
 
     // LOOK AT THESE OBJECTS AND COMPILE A VALID LIST OF TRIGGERS
     for (const auto& [nHash, pSuperblock] : mapTrigger) {
-        const CGovernanceObject* pObj = FindConstGovernanceObjectInternal(nHash);
+        auto pObj = FindConstGovernanceObjectInternal(nHash);
         if (pObj) {
             vecResults.push_back(pSuperblock);
         }
@@ -1616,7 +1617,7 @@ bool CGovernanceManager::IsSuperblockTriggered(const CDeterministicMNList& tip_m
             continue;
         }
 
-        CGovernanceObject* pObj = FindGovernanceObjectInternal(pSuperblock->GetGovernanceObjHash());
+        auto pObj = FindGovernanceObjectInternal(pSuperblock->GetGovernanceObjHash());
         if (!pObj) {
             LogPrintf("IsSuperblockTriggered -- pObj == nullptr, continuing\n");
             continue;
@@ -1673,7 +1674,7 @@ bool CGovernanceManager::GetBestSuperblockInternal(const CDeterministicMNList& t
             continue;
         }
 
-        const CGovernanceObject* pObj = FindGovernanceObjectInternal(pSuperblock->GetGovernanceObjHash());
+        auto pObj = FindGovernanceObjectInternal(pSuperblock->GetGovernanceObjHash());
         if (!pObj) {
             continue;
         }
@@ -1779,11 +1780,11 @@ std::vector<std::shared_ptr<const CGovernanceObject>> CGovernanceManager::GetApp
     LOCK(cs_store);
     for (const auto& [_, govobj] : mapObjects) {
         // Skip all non-proposals objects
-        if (govobj.GetObjectType() != GovernanceObject::PROPOSAL) continue;
+        if (Assert(govobj)->GetObjectType() != GovernanceObject::PROPOSAL) continue;
         // Skip non-passing proposals
-        const int absYesCount = govobj.GetAbsoluteYesCount(tip_mn_list, VOTE_SIGNAL_FUNDING);
+        const int absYesCount = govobj->GetAbsoluteYesCount(tip_mn_list, VOTE_SIGNAL_FUNDING);
         if (absYesCount < nAbsVoteReq) continue;
-        ret.emplace_back(std::make_shared<const CGovernanceObject>(govobj));
+        ret.emplace_back(govobj);
     }
 
     // Sort approved proposals by absolute Yes votes descending
diff --git a/src/governance/governance.h b/src/governance/governance.h
index 420e8f13dd1d..8a662de236df 100644
--- a/src/governance/governance.h
+++ b/src/governance/governance.h
@@ -184,7 +184,7 @@ class GovernanceStore
     mutable Mutex cs_store;
 
     // keep track of the scanning errors
-    std::map<uint256, CGovernanceObject> mapObjects GUARDED_BY(cs_store);
+    std::map<uint256, std::shared_ptr<CGovernanceObject>> mapObjects GUARDED_BY(cs_store);
     // mapErasedGovernanceObjects contains key-value pairs, where
     //   key   - governance object's hash
     //   value - expiration time for deleted objects
@@ -248,7 +248,7 @@ class CGovernanceManager : public GovernanceStore, public GovernanceSignerParent
 
 private:
     using db_type = CFlatDB<GovernanceStore>;
-    using object_ref_cm_t = CacheMap<uint256, CGovernanceObject*>;
+    using object_ref_cm_t = CacheMap<uint256, std::shared_ptr<CGovernanceObject>>;
 
 private:
     const std::unique_ptr<db_type> m_db;
@@ -264,7 +264,7 @@ class CGovernanceManager : public GovernanceStore, public GovernanceSignerParent
     // keep track of current block height
     int nCachedBlockHeight;
     object_ref_cm_t cmapVoteToObject;
-    std::map<uint256, CGovernanceObject> mapPostponedObjects;
+    std::map<uint256, std::shared_ptr<CGovernanceObject>> mapPostponedObjects;
     std::set<uint256> setAdditionalRelayObjects;
     std::map<uint256, std::chrono::seconds> m_requested_hash_time;
     bool fRateChecksEnabled;
@@ -336,7 +336,7 @@ class CGovernanceManager : public GovernanceStore, public GovernanceSignerParent
     // Signer interface
     bool MasternodeRateCheck(const CGovernanceObject& govobj, bool fUpdateFailStatus = false) override
         EXCLUSIVE_LOCKS_REQUIRED(!cs_store);
-    CGovernanceObject* FindGovernanceObjectByDataHash(const uint256& nDataHash) override
+    std::shared_ptr<CGovernanceObject> FindGovernanceObjectByDataHash(const uint256& nDataHash) override
         EXCLUSIVE_LOCKS_REQUIRED(!cs_store);
     std::vector<std::shared_ptr<const CGovernanceObject>> GetApprovedProposals(const CDeterministicMNList& tip_mn_list) override
         EXCLUSIVE_LOCKS_REQUIRED(!cs_store);
@@ -365,7 +365,7 @@ class CGovernanceManager : public GovernanceStore, public GovernanceSignerParent
         EXCLUSIVE_LOCKS_REQUIRED(!cs_store);
     bool SerializeVoteForHash(const uint256& nHash, CDataStream& ss) const
         EXCLUSIVE_LOCKS_REQUIRED(!cs_store);
-    CGovernanceObject* FindGovernanceObject(const uint256& nHash) override
+    std::shared_ptr<CGovernanceObject> FindGovernanceObject(const uint256& nHash) override
         EXCLUSIVE_LOCKS_REQUIRED(!cs_store);
     int GetVoteCount() const
         EXCLUSIVE_LOCKS_REQUIRED(!cs_store);
@@ -374,7 +374,7 @@ class CGovernanceManager : public GovernanceStore, public GovernanceSignerParent
     void AddPostponedObject(const CGovernanceObject& govobj)
         EXCLUSIVE_LOCKS_REQUIRED(!cs_store);
 
-    const CGovernanceObject* FindConstGovernanceObject(const uint256& nHash) const
+    std::shared_ptr<const CGovernanceObject> FindConstGovernanceObject(const uint256& nHash) const
         EXCLUSIVE_LOCKS_REQUIRED(!cs_store);
 
 private:
@@ -391,12 +391,12 @@ class CGovernanceManager : public GovernanceStore, public GovernanceSignerParent
     bool GetBestSuperblockInternal(const CDeterministicMNList& tip_mn_list, CSuperblock_sptr& pSuperblockRet,
                                    int nBlockHeight)
         EXCLUSIVE_LOCKS_REQUIRED(cs_store);
-    CGovernanceObject* FindGovernanceObjectInternal(const uint256& nHash)
+    std::shared_ptr<CGovernanceObject> FindGovernanceObjectInternal(const uint256& nHash)
         EXCLUSIVE_LOCKS_REQUIRED(cs_store);
     std::vector<std::shared_ptr<CSuperblock>> GetActiveTriggersInternal() const
         EXCLUSIVE_LOCKS_REQUIRED(cs_store);
 
-    const CGovernanceObject* FindConstGovernanceObjectInternal(const uint256& nHash) const
+    std::shared_ptr<const CGovernanceObject> FindConstGovernanceObjectInternal(const uint256& nHash) const
         EXCLUSIVE_LOCKS_REQUIRED(cs_store);
 
     // Internal counterpart to "Signer interface"
diff --git a/src/governance/object.h b/src/governance/object.h
index 439c9d190b77..01bd7b65b35d 100644
--- a/src/governance/object.h
+++ b/src/governance/object.h
@@ -135,6 +135,8 @@ class CGovernanceObject
     CGovernanceObject();
     CGovernanceObject(const uint256& nHashParentIn, int nRevisionIn, int64_t nTime, const uint256& nCollateralHashIn, const std::string& strDataHexIn);
     CGovernanceObject(const CGovernanceObject& other);
+    template <typename Stream>
+    CGovernanceObject(deserialize_type, Stream& s) { s >> *this; }
 
     // Getters
     bool IsSetCachedFunding() const { return fCachedFunding; }
diff --git a/src/governance/signing.cpp b/src/governance/signing.cpp
index 13dd74d88637..ea06dee33051 100644
--- a/src/governance/signing.cpp
+++ b/src/governance/signing.cpp
@@ -214,7 +214,7 @@ void GovernanceSigner::VoteGovernanceTriggers(const std::optional<const CGoverna
     // Vote NO-FUNDING for the rest of the active triggers
     const auto activeTriggers = m_govman.GetActiveTriggers();
     for (const auto& trigger : activeTriggers) {
-        const auto govobj = m_govman.FindGovernanceObject(trigger->GetGovernanceObjHash());
+        auto govobj = m_govman.FindGovernanceObject(trigger->GetGovernanceObjHash());
         if (!govobj) {
             LogPrint(BCLog::GOBJECT, "%s -- Not voting NO-FUNDING for unknown trigger %s\n", __func__,
                      trigger->GetGovernanceObjHash().ToString());
diff --git a/src/governance/signing.h b/src/governance/signing.h
index 750e2c168c18..c037e9f46ffc 100644
--- a/src/governance/signing.h
+++ b/src/governance/signing.h
@@ -37,8 +37,8 @@ class GovernanceSignerParent
     virtual bool MasternodeRateCheck(const CGovernanceObject& govobj, bool fUpdateFailStatus = false) = 0;
     virtual bool ProcessVoteAndRelay(const CGovernanceVote& vote, CGovernanceException& exception, CConnman& connman) = 0;
     virtual int GetCachedBlockHeight() const = 0;
-    virtual CGovernanceObject* FindGovernanceObject(const uint256& nHash) = 0;
-    virtual CGovernanceObject* FindGovernanceObjectByDataHash(const uint256& nDataHash) = 0;
+    virtual std::shared_ptr<CGovernanceObject> FindGovernanceObject(const uint256& nHash) = 0;
+    virtual std::shared_ptr<CGovernanceObject> FindGovernanceObjectByDataHash(const uint256& nDataHash) = 0;
     virtual std::vector<std::shared_ptr<CSuperblock>> GetActiveTriggers() const = 0;
     virtual std::vector<std::shared_ptr<const CGovernanceObject>> GetApprovedProposals(
         const CDeterministicMNList& tip_mn_list) = 0;
diff --git a/src/rpc/governance.cpp b/src/rpc/governance.cpp
index 4ebfb69cf081..997b9fb34e30 100644
--- a/src/rpc/governance.cpp
+++ b/src/rpc/governance.cpp
@@ -414,7 +414,7 @@ static UniValue VoteWithMasternodes(const JSONRPCRequest& request, const CWallet
     const NodeContext& node = EnsureAnyNodeContext(request.context);
     CHECK_NONFATAL(node.govman);
     {
-        const CGovernanceObject *pGovObj = node.govman->FindConstGovernanceObject(hash);
+        auto pGovObj = node.govman->FindConstGovernanceObject(hash);
         if (!pGovObj) {
             throw JSONRPCError(RPC_INVALID_PARAMETER, "Governance object not found");
         }
@@ -726,7 +726,7 @@ static RPCHelpMan gobject_get()
 
     CHECK_NONFATAL(node.govman);
     LOCK(cs_main);
-    const CGovernanceObject* pGovObj = node.govman->FindConstGovernanceObject(hash);
+    auto pGovObj = node.govman->FindConstGovernanceObject(hash);
 
     if (pGovObj == nullptr) {
         throw JSONRPCError(RPC_INVALID_PARAMETER, "Unknown governance object");
@@ -824,7 +824,7 @@ static RPCHelpMan gobject_getcurrentvotes()
     const NodeContext& node = EnsureAnyNodeContext(request.context);
 
     CHECK_NONFATAL(node.govman);
-    const CGovernanceObject* pGovObj = node.govman->FindConstGovernanceObject(hash);
+    auto pGovObj = node.govman->FindConstGovernanceObject(hash);
 
     if (pGovObj == nullptr) {
         throw JSONRPCError(RPC_INVALID_PARAMETER, "Unknown governance-hash");
@@ -919,7 +919,7 @@ static RPCHelpMan voteraw()
     const NodeContext& node = EnsureAnyNodeContext(request.context);
     CHECK_NONFATAL(node.govman);
     GovernanceObject govObjType = [&]() {
-        const CGovernanceObject *pGovObj = node.govman->FindConstGovernanceObject(hashGovObj);
+        auto pGovObj = node.govman->FindConstGovernanceObject(hashGovObj);
         if (!pGovObj) {
             throw JSONRPCError(RPC_INVALID_PARAMETER, "Governance object not found");
         }

From f88f15fed0e4cbf9d1cca25d9ffa6339e9b804b6 Mon Sep 17 00:00:00 2001
From: Kittywhiskers Van Gogh <63189531+kwvg@users.noreply.github.com>
Date: Tue, 28 Oct 2025 16:29:21 +0530
Subject: [PATCH 290/656] fix: `CGovernanceManager::Clear()` should clear all
 fields

---
 src/governance/governance.cpp | 15 ++++++++++-----
 src/governance/governance.h   |  6 +++---
 2 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/src/governance/governance.cpp b/src/governance/governance.cpp
index 39d9bd9792af..108f3690b163 100644
--- a/src/governance/governance.cpp
+++ b/src/governance/governance.cpp
@@ -73,11 +73,8 @@ CGovernanceManager::CGovernanceManager(CMasternodeMetaMan& mn_metaman, CNetFulfi
     m_chainman{chainman},
     m_dmnman{dmnman},
     m_mn_sync{mn_sync},
-    nTimeLastDiff(0),
-    nCachedBlockHeight(0),
-    cmapVoteToObject(MAX_CACHE_SIZE),
-    mapPostponedObjects(),
-    fRateChecksEnabled(true),
+    cmapVoteToObject{MAX_CACHE_SIZE},
+    mapPostponedObjects{},
     mapTrigger{}
 {
 }
@@ -1267,6 +1264,7 @@ void GovernanceStore::Clear()
     cmapInvalidVotes.Clear();
     cmmapOrphanVotes.Clear();
     mapLastMasternodeObject.clear();
+    lastMNListForVotingKeys = std::make_shared<CDeterministicMNList>();
 }
 
 void CGovernanceManager::Clear()
@@ -1274,7 +1272,14 @@ void CGovernanceManager::Clear()
     AssertLockNotHeld(cs_store);
     LogPrint(BCLog::GOBJECT, "Governance object manager was cleared\n");
     GovernanceStore::Clear();
+    nTimeLastDiff = 0;
+    nCachedBlockHeight = 0;
     cmapVoteToObject.Clear();
+    mapPostponedObjects.clear();
+    setAdditionalRelayObjects.clear();
+    m_requested_hash_time.clear();
+    fRateChecksEnabled = true;
+    mapTrigger.clear();
 }
 
 std::string GovernanceStore::ToString() const
diff --git a/src/governance/governance.h b/src/governance/governance.h
index 8a662de236df..d5b009b924fa 100644
--- a/src/governance/governance.h
+++ b/src/governance/governance.h
@@ -260,14 +260,14 @@ class CGovernanceManager : public GovernanceStore, public GovernanceSignerParent
     const std::unique_ptr<CDeterministicMNManager>& m_dmnman;
     CMasternodeSync& m_mn_sync;
 
-    int64_t nTimeLastDiff;
+    int64_t nTimeLastDiff{0};
     // keep track of current block height
-    int nCachedBlockHeight;
+    int nCachedBlockHeight{0};
     object_ref_cm_t cmapVoteToObject;
     std::map<uint256, std::shared_ptr<CGovernanceObject>> mapPostponedObjects;
     std::set<uint256> setAdditionalRelayObjects;
     std::map<uint256, std::chrono::seconds> m_requested_hash_time;
-    bool fRateChecksEnabled;
+    bool fRateChecksEnabled{true};
     std::map<uint256, std::shared_ptr<CSuperblock>> mapTrigger;
 
     mutable Mutex cs_relay;

From 9ef8c53d7e6eaef51c6a7e5961552949518740cb Mon Sep 17 00:00:00 2001
From: Kittywhiskers Van Gogh <63189531+kwvg@users.noreply.github.com>
Date: Fri, 17 Oct 2025 12:22:21 +0530
Subject: [PATCH 291/656] test: drop extra `generate`s from
 `wallet_signrawtransactionwithwallet`

bitcoin#22550 adds assertions to validate CSV/CLTV activation and
replaces the `generate()` calls with a helper `generate_to_height()` but
bitcoin#22818 activates all forks from block 1 by default, so the
`generate_to_height()` calls have been dropped.

This leaves us with the `generate()` calls being swapped for assertions.
---
 test/functional/wallet_signrawtransactionwithwallet.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/test/functional/wallet_signrawtransactionwithwallet.py b/test/functional/wallet_signrawtransactionwithwallet.py
index 3127a93a8534..aaf02e7b5e7e 100755
--- a/test/functional/wallet_signrawtransactionwithwallet.py
+++ b/test/functional/wallet_signrawtransactionwithwallet.py
@@ -130,7 +130,7 @@ def test_signing_with_csv(self):
         getcontext().prec = 8
 
         # Make sure CSV is active
-        self.generate(self.nodes[0], 500)
+        assert self.nodes[0].getblockchaininfo()['softforks']['csv']['active']
 
         # Create a P2SH script with CSV
         script = CScript([1, OP_CHECKSEQUENCEVERIFY, OP_DROP, OP_TRUE])
@@ -159,11 +159,11 @@ def test_signing_with_cltv(self):
         self.nodes[0].walletpassphrase("password", 9999)
         getcontext().prec = 8
 
-        # Make sure CSV is active
-        self.generate(self.nodes[0], 1500)
+        # Make sure CLTV is active
+        assert self.nodes[0].getblockchaininfo()['softforks']['bip65']['active']
 
         # Create a P2SH script with CLTV
-        script = CScript([1000, OP_CHECKLOCKTIMEVERIFY, OP_DROP, OP_TRUE])
+        script = CScript([100, OP_CHECKLOCKTIMEVERIFY, OP_DROP, OP_TRUE])
         address = script_to_p2sh(script)
 
         # Fund that address and make the spend

From e4ace4459e3460063878d1a63456436fb7177994 Mon Sep 17 00:00:00 2001
From: Kittywhiskers Van Gogh <63189531+kwvg@users.noreply.github.com>
Date: Mon, 27 Oct 2025 02:05:22 +0530
Subject: [PATCH 292/656] fix: repair IP extraction in `makeseeds.py`, read
 from `core_p2p` arr

---
 contrib/seeds/makeseeds.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/contrib/seeds/makeseeds.py b/contrib/seeds/makeseeds.py
index b7b0aae50f77..17e06125ef4d 100755
--- a/contrib/seeds/makeseeds.py
+++ b/contrib/seeds/makeseeds.py
@@ -206,7 +206,7 @@ def main():
     print(f'After removing duplicates: {len(mns)}', file=sys.stderr)
 
     # Extract IPs
-    ips = [parseip(mn['state']['addresses'][0]) for mn in mns]
+    ips = [parseip(mn['state']['addresses']['core_p2p'][0]) for mn in mns]
     for onion in onions:
         parsed = parseip(onion)
         if parsed is not None:

From 36db83a96aa4aa5c731670fa1e5d675070f29c69 Mon Sep 17 00:00:00 2001
From: Kittywhiskers Van Gogh <63189531+kwvg@users.noreply.github.com>
Date: Sat, 11 Oct 2025 17:11:35 +0530
Subject: [PATCH 293/656] fix: annotate `getblockchaininfo[softforks]` as
 `OBJ_DYN`

---
 src/rpc/blockchain.cpp | 43 ++++++++++++++++++++++--------------------
 1 file changed, 23 insertions(+), 20 deletions(-)

diff --git a/src/rpc/blockchain.cpp b/src/rpc/blockchain.cpp
index 7387f553db98..9d27a2b8d0f5 100644
--- a/src/rpc/blockchain.cpp
+++ b/src/rpc/blockchain.cpp
@@ -1462,31 +1462,34 @@ RPCHelpMan getblockchaininfo()
                 {RPCResult::Type::NUM, "pruneheight", /*optional=*/true, "height of the last block pruned, plus one (only present if pruning is enabled)"},
                 {RPCResult::Type::BOOL, "automatic_pruning", /*optional=*/true, "whether automatic pruning is enabled (only present if pruning is enabled)"},
                 {RPCResult::Type::NUM, "prune_target_size", /*optional=*/true, "the target size used by pruning (only present if automatic pruning is enabled)"},
-                {RPCResult::Type::OBJ, "softforks", "status of softforks in progress",
+                {RPCResult::Type::OBJ_DYN, "softforks", "status of softforks in progress",
                 {
-                    {RPCResult::Type::STR, "type", "one of \"buried\", \"bip9\""},
-                    {RPCResult::Type::OBJ, "bip9", /*optional=*/true, "status of bip9 softforks (only for \"bip9\" type)",
+                    {RPCResult::Type::OBJ, "xxxx", "name of the softfork",
                     {
-                        {RPCResult::Type::STR, "status", "one of \"defined\", \"started\", \"locked_in\", \"active\", \"failed\""},
-                        {RPCResult::Type::NUM, "bit", /*optional=*/true, "the bit (0-28) in the block version field used to signal this softfork (only for \"started\" and \"locked_in\" status)"},
-                        {RPCResult::Type::NUM_TIME, "start_time", "the minimum median time past of a block at which the bit gains its meaning"},
-                        {RPCResult::Type::NUM_TIME, "timeout", "the median time past of a block at which the deployment is considered failed if not yet locked in"},
-                        {RPCResult::Type::BOOL, "ehf", "returns true for EHF activated forks"},
-                        {RPCResult::Type::NUM, "ehf_height", /*optional=*/true, "the minimum height when miner's signals for the deployment matter. Below this height miner signaling cannot trigger hard fork lock-in. Not specified for non-EHF forks"},
-                        {RPCResult::Type::NUM, "since", "height of the first block to which the status applies"},
-                        {RPCResult::Type::NUM, "activation_height", "expected activation height for this softfork (only for \"locked_in\" status)"},
-                        {RPCResult::Type::NUM, "min_activation_height", "minimum height of blocks for which the rules may be enforced"},
-                        {RPCResult::Type::OBJ, "statistics", /*optional=*/true, "numeric statistics about signalling for a softfork (only for \"started\" and \"locked_in\" status)",
+                        {RPCResult::Type::STR, "type", "one of \"buried\", \"bip9\""},
+                        {RPCResult::Type::OBJ, "bip9", /*optional=*/true, "status of bip9 softforks (only for \"bip9\" type)",
                         {
-                            {RPCResult::Type::NUM, "period", "the length in blocks of the signalling period"},
-                            {RPCResult::Type::NUM, "threshold", /*optional=*/true, "the number of blocks with the version bit set required to activate the feature (only for \"started\" status)"},
-                            {RPCResult::Type::NUM, "elapsed", "the number of blocks elapsed since the beginning of the current period"},
-                            {RPCResult::Type::NUM, "count", "the number of blocks with the version bit set in the current period"},
-                            {RPCResult::Type::BOOL, "possible", /*optional=*/true, "returns false if there are not enough blocks left in this period to pass activation threshold (only for \"started\" status)"},
+                            {RPCResult::Type::STR, "status", "one of \"defined\", \"started\", \"locked_in\", \"active\", \"failed\""},
+                            {RPCResult::Type::NUM, "bit", /*optional=*/true, "the bit (0-28) in the block version field used to signal this softfork (only for \"started\" and \"locked_in\" status)"},
+                            {RPCResult::Type::NUM_TIME, "start_time", "the minimum median time past of a block at which the bit gains its meaning"},
+                            {RPCResult::Type::NUM_TIME, "timeout", "the median time past of a block at which the deployment is considered failed if not yet locked in"},
+                            {RPCResult::Type::BOOL, "ehf", "returns true for EHF activated forks"},
+                            {RPCResult::Type::NUM, "ehf_height", /*optional=*/true, "the minimum height when miner's signals for the deployment matter. Below this height miner signaling cannot trigger hard fork lock-in. Not specified for non-EHF forks"},
+                            {RPCResult::Type::NUM, "since", "height of the first block to which the status applies"},
+                            {RPCResult::Type::NUM, "activation_height", "expected activation height for this softfork (only for \"locked_in\" status)"},
+                            {RPCResult::Type::NUM, "min_activation_height", "minimum height of blocks for which the rules may be enforced"},
+                            {RPCResult::Type::OBJ, "statistics", /*optional=*/true, "numeric statistics about signalling for a softfork (only for \"started\" and \"locked_in\" status)",
+                            {
+                                {RPCResult::Type::NUM, "period", "the length in blocks of the signalling period"},
+                                {RPCResult::Type::NUM, "threshold", /*optional=*/true, "the number of blocks with the version bit set required to activate the feature (only for \"started\" status)"},
+                                {RPCResult::Type::NUM, "elapsed", "the number of blocks elapsed since the beginning of the current period"},
+                                {RPCResult::Type::NUM, "count", "the number of blocks with the version bit set in the current period"},
+                                {RPCResult::Type::BOOL, "possible", /*optional=*/true, "returns false if there are not enough blocks left in this period to pass activation threshold (only for \"started\" status)"},
+                            }},
                         }},
+                        {RPCResult::Type::NUM, "height", /*optional=*/true, "height of the first block which the rules are or will be enforced (only for \"buried\" type, or \"bip9\" type with \"active\" status)"},
+                        {RPCResult::Type::BOOL, "active", "true if the rules are enforced for the mempool and the next block"},
                     }},
-                    {RPCResult::Type::NUM, "height", /*optional=*/true, "height of the first block which the rules are or will be enforced (only for \"buried\" type, or \"bip9\" type with \"active\" status)"},
-                    {RPCResult::Type::BOOL, "active", "true if the rules are enforced for the mempool and the next block"},
                 }},
                 {RPCResult::Type::STR, "warnings", "any network and blockchain warnings"},
             }},

From 39e847c417ee8f66fa101ab5e403d4d21a491446 Mon Sep 17 00:00:00 2001
From: Kittywhiskers Van Gogh <63189531+kwvg@users.noreply.github.com>
Date: Mon, 27 Oct 2025 03:11:03 +0530
Subject: [PATCH 294/656] fix: do not create group if GID is already taken

macOS uses GID 20 for staff but Linux uses it for dialout, so the build
will fail because GID 20 is already used.
---
 contrib/containers/ci/ci-slim.Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/contrib/containers/ci/ci-slim.Dockerfile b/contrib/containers/ci/ci-slim.Dockerfile
index 7a498bf2b71b..d2a1729d729c 100644
--- a/contrib/containers/ci/ci-slim.Dockerfile
+++ b/contrib/containers/ci/ci-slim.Dockerfile
@@ -106,7 +106,7 @@ RUN set -ex; \
 ARG USER_ID=1000 \
     GROUP_ID=1000
 RUN set -ex; \
-    groupmod -g ${GROUP_ID} -n dash ubuntu; \
+    getent group ${GROUP_ID} || groupmod -g ${GROUP_ID} -n dash ubuntu; \
     usermod -u ${USER_ID} -md /home/dash -l dash ubuntu; \
     chown ${USER_ID}:${GROUP_ID} -R /home/dash; \
     mkdir -p /src/dash && \

From fa22c3d0173c525918621e1d5cf31d616dc136c1 Mon Sep 17 00:00:00 2001
From: pasta <pasta@dashboost.org>
Date: Tue, 28 Oct 2025 13:25:26 -0500
Subject: [PATCH 295/656] ci: fetch fast in clang-diff-format.yml

---
 .github/workflows/clang-diff-format.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/clang-diff-format.yml b/.github/workflows/clang-diff-format.yml
index 130563872ebe..7a32ea455816 100644
--- a/.github/workflows/clang-diff-format.yml
+++ b/.github/workflows/clang-diff-format.yml
@@ -11,7 +11,7 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v3
       - name: Fetch git
-        run: git fetch
+        run: git fetch -fu origin develop:develop
       - name: Run Clang-Format-Diff.py
         run: |
           git diff -U0 origin/develop -- $(git ls-files -- $(cat test/util/data/non-backported.txt)) | ./contrib/devtools/clang-format-diff.py -p1 > diff_output.txt

From 3d2fc5f4c560ce39d64c6068bc648835a646cb99 Mon Sep 17 00:00:00 2001
From: pasta <pasta@dashboost.org>
Date: Tue, 28 Oct 2025 13:55:02 -0500
Subject: [PATCH 296/656] feat: streamline Python installation using uv and
 system Python

---
 contrib/containers/ci/ci-slim.Dockerfile | 21 ++++++++++-----------
 1 file changed, 10 insertions(+), 11 deletions(-)

diff --git a/contrib/containers/ci/ci-slim.Dockerfile b/contrib/containers/ci/ci-slim.Dockerfile
index 7a498bf2b71b..ee26b86394bf 100644
--- a/contrib/containers/ci/ci-slim.Dockerfile
+++ b/contrib/containers/ci/ci-slim.Dockerfile
@@ -54,21 +54,20 @@ RUN set -ex; \
     zstd \
     && rm -rf /var/lib/apt/lists/*
 
+# Install uv by copying from the official Docker image
+COPY --from=ghcr.io/astral-sh/uv:latest /uv /uvx /bin/
+
 # Install Python and set it as default
-ENV PYENV_ROOT="/usr/local/pyenv"
-ENV PATH="${PYENV_ROOT}/shims:${PYENV_ROOT}/bin:${PATH}"
 # PYTHON_VERSION should match the value in .python-version
 ARG PYTHON_VERSION=3.9.18
-RUN set -ex; \
-    curl https://pyenv.run | bash \
-    && pyenv update \
-    && pyenv install ${PYTHON_VERSION} \
-    && pyenv global ${PYTHON_VERSION} \
-    && pyenv rehash
+RUN uv python install ${PYTHON_VERSION}
+ENV PATH="/root/.local/share/uv/python/cpython-${PYTHON_VERSION}-linux-$(uname -m)-gnu/bin:${PATH}"
+
+# Use system Python for installations
+ENV UV_SYSTEM_PYTHON=1
 
 # Install Python packages
-RUN set -ex; \
-    pip3 install --no-cache-dir \
+RUN uv pip install --system --break-system-packages \
     codespell==2.1.0 \
     flake8==4.0.1 \
     jinja2 \
@@ -83,7 +82,7 @@ ARG DASH_HASH_VERSION=1.4.0
 RUN set -ex; \
     cd /tmp; \
     git clone --depth 1 --no-tags --branch=${DASH_HASH_VERSION} https://github.com/dashpay/dash_hash; \
-    cd dash_hash && pip3 install -r requirements.txt .; \
+    cd dash_hash && uv pip install --system --break-system-packages -r requirements.txt .; \
     cd .. && rm -rf dash_hash
 
 ARG SHELLCHECK_VERSION=v0.8.0

From 04da2dcbb3c4f11611aefc8edda562a86ebf8388 Mon Sep 17 00:00:00 2001
From: pasta <pasta@dashboost.org>
Date: Tue, 28 Oct 2025 14:19:55 -0500
Subject: [PATCH 297/656] refactor: update Dockerfile to streamline Python
 installation and remove unnecessary build dependencies

---
 contrib/containers/ci/ci-slim.Dockerfile | 26 ++++++++++++------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/contrib/containers/ci/ci-slim.Dockerfile b/contrib/containers/ci/ci-slim.Dockerfile
index ee26b86394bf..d42e6a81dc07 100644
--- a/contrib/containers/ci/ci-slim.Dockerfile
+++ b/contrib/containers/ci/ci-slim.Dockerfile
@@ -31,7 +31,8 @@ ENV DEBIAN_FRONTEND="noninteractive" TZ="Europe/London"
 # Build and base stuff
 ENV APT_ARGS="-y --no-install-recommends --no-upgrade"
 
-# Packages needed to build Python and extract artifacts
+# Packages needed for builds and tests
+# Note: Python build deps (libbz2-dev, libffi-dev, etc.) removed since uv installs Python binaries
 RUN set -ex; \
     apt-get update && apt-get install ${APT_ARGS} \
     build-essential \
@@ -39,29 +40,28 @@ RUN set -ex; \
     curl \
     g++ \
     git \
-    libbz2-dev \
-    libffi-dev \
-    liblzma-dev \
-    libncurses5-dev \
-    libncursesw5-dev \
-    libreadline-dev \
-    libsqlite3-dev \
-    libssl-dev \
     make \
-    tk-dev \
     xz-utils \
-    zlib1g-dev \
     zstd \
     && rm -rf /var/lib/apt/lists/*
 
 # Install uv by copying from the official Docker image
 COPY --from=ghcr.io/astral-sh/uv:latest /uv /uvx /bin/
 
-# Install Python and set it as default
+# Install Python to a system-wide location and set it as default
 # PYTHON_VERSION should match the value in .python-version
 ARG PYTHON_VERSION=3.9.18
+ENV UV_PYTHON_INSTALL_DIR=/usr/local/python
 RUN uv python install ${PYTHON_VERSION}
-ENV PATH="/root/.local/share/uv/python/cpython-${PYTHON_VERSION}-linux-$(uname -m)-gnu/bin:${PATH}"
+
+# Create symlinks to make python available system-wide
+RUN set -ex; \
+    PYTHON_PATH=$(uv python find ${PYTHON_VERSION}); \
+    PYTHON_DIR=$(dirname $PYTHON_PATH); \
+    ln -sf $PYTHON_DIR/python3 /usr/local/bin/python3; \
+    ln -sf $PYTHON_DIR/python3 /usr/local/bin/python; \
+    ln -sf $PYTHON_DIR/pip3 /usr/local/bin/pip3 2>/dev/null || true; \
+    ln -sf $PYTHON_DIR/pip /usr/local/bin/pip 2>/dev/null || true
 
 # Use system Python for installations
 ENV UV_SYSTEM_PYTHON=1

From ebd6c7a432be27732b60a9580bf8d32920187909 Mon Sep 17 00:00:00 2001
From: pasta <pasta@dashboost.org>
Date: Tue, 28 Oct 2025 14:27:33 -0500
Subject: [PATCH 298/656] feat: symlink Python package executables to
 /usr/local/bin for easier access

---
 contrib/containers/ci/ci-slim.Dockerfile | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/contrib/containers/ci/ci-slim.Dockerfile b/contrib/containers/ci/ci-slim.Dockerfile
index d42e6a81dc07..7d86113da4be 100644
--- a/contrib/containers/ci/ci-slim.Dockerfile
+++ b/contrib/containers/ci/ci-slim.Dockerfile
@@ -85,6 +85,19 @@ RUN set -ex; \
     cd dash_hash && uv pip install --system --break-system-packages -r requirements.txt .; \
     cd .. && rm -rf dash_hash
 
+# Symlink all Python package executables to /usr/local/bin
+RUN set -ex; \
+    PYTHON_PATH=$(uv python find ${PYTHON_VERSION}); \
+    PYTHON_BIN=$(dirname $PYTHON_PATH); \
+    for exe in $PYTHON_BIN/*; do \
+        if [ -x "$exe" ] && [ -f "$exe" ]; then \
+            basename_exe=$(basename $exe); \
+            if [ "$basename_exe" != "python" ] && [ "$basename_exe" != "python3" ] && [ "$basename_exe" != "pip" ] && [ "$basename_exe" != "pip3" ]; then \
+                ln -sf "$exe" "/usr/local/bin/$basename_exe"; \
+            fi; \
+        fi; \
+    done
+
 ARG SHELLCHECK_VERSION=v0.8.0
 RUN set -ex; \
     curl -fL "https://github.com/koalaman/shellcheck/releases/download/${SHELLCHECK_VERSION}/shellcheck-${SHELLCHECK_VERSION}.linux.x86_64.tar.xz" -o /tmp/shellcheck.tar.xz; \

From c6d4c362a56bd9f213f8fa67633c752c0d871e78 Mon Sep 17 00:00:00 2001
From: pasta <pasta@dashboost.org>
Date: Tue, 28 Oct 2025 14:43:14 -0500
Subject: [PATCH 299/656] refactor: addback additional needed build depends

---
 contrib/containers/ci/ci-slim.Dockerfile | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/contrib/containers/ci/ci-slim.Dockerfile b/contrib/containers/ci/ci-slim.Dockerfile
index 7d86113da4be..3ee64ef0ece3 100644
--- a/contrib/containers/ci/ci-slim.Dockerfile
+++ b/contrib/containers/ci/ci-slim.Dockerfile
@@ -32,7 +32,6 @@ ENV DEBIAN_FRONTEND="noninteractive" TZ="Europe/London"
 ENV APT_ARGS="-y --no-install-recommends --no-upgrade"
 
 # Packages needed for builds and tests
-# Note: Python build deps (libbz2-dev, libffi-dev, etc.) removed since uv installs Python binaries
 RUN set -ex; \
     apt-get update && apt-get install ${APT_ARGS} \
     build-essential \
@@ -40,8 +39,14 @@ RUN set -ex; \
     curl \
     g++ \
     git \
+    libbz2-dev \
+    liblzma-dev \
+    libreadline-dev \
+    libsqlite3-dev \
+    libssl-dev \
     make \
     xz-utils \
+    zlib1g-dev \
     zstd \
     && rm -rf /var/lib/apt/lists/*
 

From faa58da1f45be79864db93f8141c059a734e4ab0 Mon Sep 17 00:00:00 2001
From: Konstantin Akimov <knstqq@gmail.com>
Date: Tue, 28 Oct 2025 22:19:36 +0700
Subject: [PATCH 300/656] docs: update man pages for 23.0

---
 doc/man/dash-cli.1    | 16 ++++-----
 doc/man/dash-qt.1     | 74 +++++++++++++++++++++++----------------
 doc/man/dash-tx.1     |  8 ++---
 doc/man/dash-wallet.1 |  8 ++---
 doc/man/dashd.1       | 80 ++++++++++++++++++++++---------------------
 5 files changed, 101 insertions(+), 85 deletions(-)

diff --git a/doc/man/dash-cli.1 b/doc/man/dash-cli.1
index 07c8198332fd..d74ed986f458 100644
--- a/doc/man/dash-cli.1
+++ b/doc/man/dash-cli.1
@@ -1,7 +1,7 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.49.3.
-.TH DASH-CLI "1" "February 2025" "dash-cli v22.1.0" "User Commands"
+.TH DASH-CLI "1" "October 2025" "dash-cli v23.0.0" "User Commands"
 .SH NAME
-dash-cli \- manual page for dash-cli v22.1.0
+dash-cli \- manual page for dash-cli v23.0.0
 .SH SYNOPSIS
 .B dash-cli
 [\fI\,options\/\fR] \fI\,<command> \/\fR[\fI\,params\/\fR]  \fI\,Send command to Dash Core\/\fR
@@ -15,7 +15,7 @@ dash-cli \- manual page for dash-cli v22.1.0
 .B dash-cli
 [\fI\,options\/\fR] \fI\,help <command>      Get help for a command\/\fR
 .SH DESCRIPTION
-Dash Core RPC client version v22.1.0
+Dash Core RPC client version v23.0.0
 .SH OPTIONS
 .HP
 \-?
@@ -45,8 +45,8 @@ Specify data directory
 .HP
 \fB\-generate\fR
 .IP
-Generate blocks immediately, equivalent to RPC getnewaddress followed by
-RPC generatetoaddress. Optional positional integer arguments are
+Generate blocks, equivalent to RPC getnewaddress followed by RPC
+generatetoaddress. Optional positional integer arguments are
 number of blocks to generate (default: 1) and maximum iterations
 to try (default: 1000000), equivalent to RPC generatetoaddress
 nblocks and maxtries arguments. Example: dash\-cli \fB\-generate\fR 4
@@ -55,8 +55,8 @@ nblocks and maxtries arguments. Example: dash\-cli \fB\-generate\fR 4
 \fB\-getinfo\fR
 .IP
 Get general information from the remote server. Note that unlike
-server\-side RPC calls, the results of \fB\-getinfo\fR is the result of
-multiple non\-atomic requests. Some entries in the result may
+server\-side RPC calls, the output of \fB\-getinfo\fR is the result of
+multiple non\-atomic requests. Some entries in the output may
 represent results from different states (e.g. wallet balance may
 be as of a different block from the chain state reported)
 .HP
@@ -162,4 +162,4 @@ The source code is available from <https://github.com/dashpay/dash>.
 
 This is experimental software.
 Distributed under the MIT software license, see the accompanying file COPYING
-or <https://opensource.org/licenses/MIT>
\ No newline at end of file
+or <https://opensource.org/licenses/MIT>
diff --git a/doc/man/dash-qt.1 b/doc/man/dash-qt.1
index 0734575bcc41..aa0376070490 100644
--- a/doc/man/dash-qt.1
+++ b/doc/man/dash-qt.1
@@ -1,12 +1,14 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.49.3.
-.TH DASH-QT "1" "February 2025" "dash-qt v22.1.0" "User Commands"
+.TH DASH-QT "1" "October 2025" "dash-qt v23.0.0" "User Commands"
 .SH NAME
-dash-qt \- manual page for dash-qt v22.1.0
+dash-qt \- manual page for dash-qt v23.0.0
 .SH SYNOPSIS
 .B dash-qt
-[\fI\,command-line options\/\fR]
+[\fI\,command-line options\/\fR] [\fI\,URI\/\fR]
 .SH DESCRIPTION
-Dash Core version v22.1.0
+Dash Core version v23.0.0
+.PP
+Optional URI is a Dash address in BIP21 URI format.
 .SH OPTIONS
 .HP
 \-?
@@ -23,15 +25,16 @@ message)
 If this block is in the chain assume that it and its ancestors are valid
 and potentially skip their script verification (0 to verify all,
 default:
-000000000000001cf26547602d982dcaa909231bbcd1e70c0eb3c65de25473ba,
+000000000000000630fdfb37764bc6df460d301effa5e0fd4e8ef9ba821f36da,
 testnet:
-000000eef20eb0062abd4e799967e98bdebb165dd1c567ab4118c1c86c6e948f)
+000001d20827f1394354452ba2e836de387e4fbf2d1d35b3281adbb14adf89a1)
 .HP
 \fB\-blockfilterindex=\fR<type>
 .IP
 Maintain an index of compact filters by block (default: 0, values:
 basic). If <type> is not supplied or if <type> = 1, indexes for
-all known types are enabled.
+all known types are enabled. Automatically enabled for
+masternodes with value 'basic'.
 .HP
 \fB\-blocknotify=\fR<cmd>
 .IP
@@ -122,7 +125,12 @@ Do not keep transactions in the mempool longer than <n> hours (default:
 .HP
 \fB\-par=\fR<n>
 .IP
-Set the number of script verification threads (\fB\-16\fR to 15, 0 = auto, <0 =
+Set the number of script verification threads (\fB\-24\fR to 15, 0 = auto, <0 =
+leave that many cores free, default: 0)
+.HP
+\fB\-parbls=\fR<n>
+.IP
+Set the number of BLS verification threads (\fB\-24\fR to 33, 0 = auto, <0 =
 leave that many cores free, default: 0)
 .HP
 \fB\-persistmempool\fR
@@ -229,7 +237,7 @@ Allow DNS lookups for \fB\-addnode\fR, \fB\-seednode\fR and \fB\-connect\fR (def
 \fB\-dnsseed\fR
 .IP
 Query for peer addresses via DNS lookup, if low on addresses (default: 1
-unless \fB\-connect\fR used)
+unless \fB\-connect\fR used or \fB\-maxconnections\fR=\fI\,0\/\fR)
 .HP
 \fB\-externalip=\fR<ip>
 .IP
@@ -257,7 +265,8 @@ none)
 .HP
 \fB\-listen\fR
 .IP
-Accept connections from outside (default: 1 if no \fB\-proxy\fR or \fB\-connect\fR)
+Accept connections from outside (default: 1 if no \fB\-proxy\fR, \fB\-connect\fR or
+\fB\-maxconnections\fR=\fI\,0\/\fR)
 .HP
 \fB\-listenonion\fR
 .IP
@@ -302,10 +311,11 @@ Use NAT\-PMP to map the listening port (default: 0)
 Enable all P2P network activity (default: 1). Can be changed by the
 setnetworkactive RPC command
 .HP
-\fB\-onion=\fR<ip:port>
+\fB\-onion=\fR<ip:port|path>
 .IP
 Use separate SOCKS5 proxy to reach peers via Tor onion services, set
-\fB\-noonion\fR to disable (default: \fB\-proxy\fR)
+\fB\-noonion\fR to disable (default: \fB\-proxy\fR). May be a local file path
+prefixed with 'unix:'.
 .HP
 \fB\-onlynet=\fR<net>
 .IP
@@ -316,7 +326,8 @@ allow multiple networks.
 .HP
 \fB\-peerblockfilters\fR
 .IP
-Serve compact block filters to peers per BIP 157 (default: 0)
+Serve compact block filters to peers per BIP 157 (default: 0,
+automatically enabled for masternodes)
 .HP
 \fB\-peerbloomfilters\fR
 .IP
@@ -329,20 +340,17 @@ Specify a p2p connection timeout delay in seconds. After connecting to a
 peer, wait this amount of time before considering disconnection
 based on inactivity (minimum: 1, default: 60)
 .HP
-\fB\-permitbaremultisig\fR
-.IP
-Relay non\-P2SH multisig (default: 1)
-.HP
 \fB\-port=\fR<port>
 .IP
 Listen for connections on <port>. Nodes not using the default ports
 (default: 9999, testnet: 19999, regtest: 19899) are unlikely to
 get incoming connections. Not relevant for I2P (see doc/i2p.md).
 .HP
-\fB\-proxy=\fR<ip:port>
+\fB\-proxy=\fR<ip:port|path>
 .IP
 Connect through SOCKS5 proxy, set \fB\-noproxy\fR to disable (default:
-disabled)
+disabled). May be a local file path prefixed with 'unix:' if the
+proxy supports it.
 .HP
 \fB\-proxyrandomize\fR
 .IP
@@ -378,8 +386,7 @@ Tor control port password (default: empty)
 .HP
 \fB\-upnp\fR
 .IP
-Use UPnP to map the listening port (default: 1 when listening and no
-\fB\-proxy\fR)
+Use UPnP to map the listening port (default: 0)
 .HP
 \fB\-v2transport\fR
 .IP
@@ -484,10 +491,6 @@ Specify statsd host (default: )
 Specify the number of seconds between periodic measurements (default:
 60)
 .HP
-\fB\-statsport=\fR<port>
-.IP
-Specify statsd port (default: 8125)
-.HP
 \fB\-statsprefix=\fR<string>
 .IP
 Specify an optional string prepended to every stats key (default: )
@@ -509,6 +512,12 @@ limitation and possibly a larger\-than\-necessary number of inputs
 being used. Always enabled for wallets with "avoid_reuse"
 enabled, otherwise default: 0.
 .HP
+\fB\-consolidatefeerate=\fR<amt>
+.IP
+The maximum feerate (in DASH/kvB) at which transaction building may use
+more inputs than strictly necessary so that the wallet's UTXO
+pool can be reduced (default: 0.00001).
+.HP
 \fB\-createwalletbackups=\fR<n>
 .IP
 Number of automatic wallet backups (default: 10)
@@ -1014,6 +1023,10 @@ Maximum size of data in data carrier transactions we relay and mine
 Fees (in DASH/kB) smaller than this are considered zero fee for
 relaying, mining and transaction creation (default: 0.00001)
 .HP
+\fB\-permitbaremultisig\fR
+.IP
+Relay non\-P2SH multisig (default: 1)
+.HP
 \fB\-whitelistforcerelay\fR
 .IP
 Add 'forcerelay' permission to whitelisted inbound peers with default
@@ -1045,10 +1058,11 @@ Accept public REST requests (default: 0)
 .HP
 \fB\-rpcallowip=\fR<ip>
 .IP
-Allow JSON\-RPC connections from specified source. Valid for <ip> are a
-single IP (e.g. 1.2.3.4), a network/netmask (e.g.
-1.2.3.4/255.255.255.0) or a network/CIDR (e.g. 1.2.3.4/24). This
-option can be specified multiple times
+Allow JSON\-RPC connections from specified source. Valid values for <ip>
+are a single IP (e.g. 1.2.3.4), a network/netmask (e.g.
+1.2.3.4/255.255.255.0), a network/CIDR (e.g. 1.2.3.4/24), all
+ipv4 (0.0.0.0/0), or all ipv6 (::/0). This option can be
+specified multiple times
 .HP
 \fB\-rpcauth=\fR<userpw>
 .IP
@@ -1174,4 +1188,4 @@ The source code is available from <https://github.com/dashpay/dash>.
 
 This is experimental software.
 Distributed under the MIT software license, see the accompanying file COPYING
-or <https://opensource.org/licenses/MIT>
\ No newline at end of file
+or <https://opensource.org/licenses/MIT>
diff --git a/doc/man/dash-tx.1 b/doc/man/dash-tx.1
index 03bc412fe9fc..48c8c6622977 100644
--- a/doc/man/dash-tx.1
+++ b/doc/man/dash-tx.1
@@ -1,7 +1,7 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.49.3.
-.TH DASH-TX "1" "February 2025" "dash-tx v22.1.0" "User Commands"
+.TH DASH-TX "1" "October 2025" "dash-tx v23.0.0" "User Commands"
 .SH NAME
-dash-tx \- manual page for dash-tx v22.1.0
+dash-tx \- manual page for dash-tx v23.0.0
 .SH SYNOPSIS
 .B dash-tx
 [\fI\,options\/\fR] \fI\,<hex-tx> \/\fR[\fI\,commands\/\fR]  \fI\,Update hex-encoded dash transaction\/\fR
@@ -9,7 +9,7 @@ dash-tx \- manual page for dash-tx v22.1.0
 .B dash-tx
 [\fI\,options\/\fR] \fI\,-create \/\fR[\fI\,commands\/\fR]   \fI\,Create hex-encoded dash transaction\/\fR
 .SH DESCRIPTION
-Dash Core dash\-tx utility version v22.1.0
+Dash Core dash\-tx utility version v23.0.0
 .SH OPTIONS
 .HP
 \-?
@@ -119,4 +119,4 @@ The source code is available from <https://github.com/dashpay/dash>.
 
 This is experimental software.
 Distributed under the MIT software license, see the accompanying file COPYING
-or <https://opensource.org/licenses/MIT>
\ No newline at end of file
+or <https://opensource.org/licenses/MIT>
diff --git a/doc/man/dash-wallet.1 b/doc/man/dash-wallet.1
index 1c3b7032c974..8f6403314a0f 100644
--- a/doc/man/dash-wallet.1
+++ b/doc/man/dash-wallet.1
@@ -1,9 +1,9 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.49.3.
-.TH DASH-WALLET "1" "February 2025" "dash-wallet v22.1.0" "User Commands"
+.TH DASH-WALLET "1" "October 2025" "dash-wallet v23.0.0" "User Commands"
 .SH NAME
-dash-wallet \- manual page for dash-wallet v22.1.0
+dash-wallet \- manual page for dash-wallet v23.0.0
 .SH DESCRIPTION
-Dash Core dash\-wallet version v22.1.0
+Dash Core dash\-wallet version v23.0.0
 .PP
 dash\-wallet is an offline tool for creating and interacting with Dash Core wallet files.
 By default dash\-wallet will act on wallets in the default mainnet wallet directory in the datadir.
@@ -109,4 +109,4 @@ The source code is available from <https://github.com/dashpay/dash>.
 
 This is experimental software.
 Distributed under the MIT software license, see the accompanying file COPYING
-or <https://opensource.org/licenses/MIT>
\ No newline at end of file
+or <https://opensource.org/licenses/MIT>
diff --git a/doc/man/dashd.1 b/doc/man/dashd.1
index 997a2eda72bd..25f452ade75e 100644
--- a/doc/man/dashd.1
+++ b/doc/man/dashd.1
@@ -1,22 +1,12 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.49.3.
-.TH DASHD "1" "February 2025" "dashd v22.1.0" "User Commands"
+.TH DASHD "1" "October 2025" "dashd v23.0.0" "User Commands"
 .SH NAME
-dashd \- manual page for dashd v22.1.0
+dashd \- manual page for dashd v23.0.0
 .SH SYNOPSIS
 .B dashd
 [\fI\,options\/\fR]                     \fI\,Start Dash Core\/\fR
 .SH DESCRIPTION
-Dash Core version v22.1.0
-Copyright \(co 2014\-2025 The Dash Core developers
-Copyright \(co 2009\-2025 The Bitcoin Core developers
-.PP
-Please contribute if you find Dash Core useful. Visit <https://dash.org/> for
-further information about the software.
-The source code is available from <https://github.com/dashpay/dash>.
-.PP
-This is experimental software.
-Distributed under the MIT software license, see the accompanying file COPYING
-or <https://opensource.org/licenses/MIT>
+Dash Core version v23.0.0
 .SH OPTIONS
 .HP
 \-?
@@ -33,15 +23,16 @@ message)
 If this block is in the chain assume that it and its ancestors are valid
 and potentially skip their script verification (0 to verify all,
 default:
-000000000000001cf26547602d982dcaa909231bbcd1e70c0eb3c65de25473ba,
+000000000000000630fdfb37764bc6df460d301effa5e0fd4e8ef9ba821f36da,
 testnet:
-000000eef20eb0062abd4e799967e98bdebb165dd1c567ab4118c1c86c6e948f)
+000001d20827f1394354452ba2e836de387e4fbf2d1d35b3281adbb14adf89a1)
 .HP
 \fB\-blockfilterindex=\fR<type>
 .IP
 Maintain an index of compact filters by block (default: 0, values:
 basic). If <type> is not supplied or if <type> = 1, indexes for
-all known types are enabled.
+all known types are enabled. Automatically enabled for
+masternodes with value 'basic'.
 .HP
 \fB\-blocknotify=\fR<cmd>
 .IP
@@ -132,7 +123,12 @@ Do not keep transactions in the mempool longer than <n> hours (default:
 .HP
 \fB\-par=\fR<n>
 .IP
-Set the number of script verification threads (\fB\-16\fR to 15, 0 = auto, <0 =
+Set the number of script verification threads (\fB\-24\fR to 15, 0 = auto, <0 =
+leave that many cores free, default: 0)
+.HP
+\fB\-parbls=\fR<n>
+.IP
+Set the number of BLS verification threads (\fB\-24\fR to 33, 0 = auto, <0 =
 leave that many cores free, default: 0)
 .HP
 \fB\-persistmempool\fR
@@ -239,7 +235,7 @@ Allow DNS lookups for \fB\-addnode\fR, \fB\-seednode\fR and \fB\-connect\fR (def
 \fB\-dnsseed\fR
 .IP
 Query for peer addresses via DNS lookup, if low on addresses (default: 1
-unless \fB\-connect\fR used)
+unless \fB\-connect\fR used or \fB\-maxconnections\fR=\fI\,0\/\fR)
 .HP
 \fB\-externalip=\fR<ip>
 .IP
@@ -267,7 +263,8 @@ none)
 .HP
 \fB\-listen\fR
 .IP
-Accept connections from outside (default: 1 if no \fB\-proxy\fR or \fB\-connect\fR)
+Accept connections from outside (default: 1 if no \fB\-proxy\fR, \fB\-connect\fR or
+\fB\-maxconnections\fR=\fI\,0\/\fR)
 .HP
 \fB\-listenonion\fR
 .IP
@@ -312,10 +309,11 @@ Use NAT\-PMP to map the listening port (default: 0)
 Enable all P2P network activity (default: 1). Can be changed by the
 setnetworkactive RPC command
 .HP
-\fB\-onion=\fR<ip:port>
+\fB\-onion=\fR<ip:port|path>
 .IP
 Use separate SOCKS5 proxy to reach peers via Tor onion services, set
-\fB\-noonion\fR to disable (default: \fB\-proxy\fR)
+\fB\-noonion\fR to disable (default: \fB\-proxy\fR). May be a local file path
+prefixed with 'unix:'.
 .HP
 \fB\-onlynet=\fR<net>
 .IP
@@ -326,7 +324,8 @@ allow multiple networks.
 .HP
 \fB\-peerblockfilters\fR
 .IP
-Serve compact block filters to peers per BIP 157 (default: 0)
+Serve compact block filters to peers per BIP 157 (default: 0,
+automatically enabled for masternodes)
 .HP
 \fB\-peerbloomfilters\fR
 .IP
@@ -339,20 +338,17 @@ Specify a p2p connection timeout delay in seconds. After connecting to a
 peer, wait this amount of time before considering disconnection
 based on inactivity (minimum: 1, default: 60)
 .HP
-\fB\-permitbaremultisig\fR
-.IP
-Relay non\-P2SH multisig (default: 1)
-.HP
 \fB\-port=\fR<port>
 .IP
 Listen for connections on <port>. Nodes not using the default ports
 (default: 9999, testnet: 19999, regtest: 19899) are unlikely to
 get incoming connections. Not relevant for I2P (see doc/i2p.md).
 .HP
-\fB\-proxy=\fR<ip:port>
+\fB\-proxy=\fR<ip:port|path>
 .IP
 Connect through SOCKS5 proxy, set \fB\-noproxy\fR to disable (default:
-disabled)
+disabled). May be a local file path prefixed with 'unix:' if the
+proxy supports it.
 .HP
 \fB\-proxyrandomize\fR
 .IP
@@ -388,8 +384,7 @@ Tor control port password (default: empty)
 .HP
 \fB\-upnp\fR
 .IP
-Use UPnP to map the listening port (default: 1 when listening and no
-\fB\-proxy\fR)
+Use UPnP to map the listening port (default: 0)
 .HP
 \fB\-v2transport\fR
 .IP
@@ -494,10 +489,6 @@ Specify statsd host (default: )
 Specify the number of seconds between periodic measurements (default:
 60)
 .HP
-\fB\-statsport=\fR<port>
-.IP
-Specify statsd port (default: 8125)
-.HP
 \fB\-statsprefix=\fR<string>
 .IP
 Specify an optional string prepended to every stats key (default: )
@@ -519,6 +510,12 @@ limitation and possibly a larger\-than\-necessary number of inputs
 being used. Always enabled for wallets with "avoid_reuse"
 enabled, otherwise default: 0.
 .HP
+\fB\-consolidatefeerate=\fR<amt>
+.IP
+The maximum feerate (in DASH/kvB) at which transaction building may use
+more inputs than strictly necessary so that the wallet's UTXO
+pool can be reduced (default: 0.00001).
+.HP
 \fB\-createwalletbackups=\fR<n>
 .IP
 Number of automatic wallet backups (default: 10)
@@ -1024,6 +1021,10 @@ Maximum size of data in data carrier transactions we relay and mine
 Fees (in DASH/kB) smaller than this are considered zero fee for
 relaying, mining and transaction creation (default: 0.00001)
 .HP
+\fB\-permitbaremultisig\fR
+.IP
+Relay non\-P2SH multisig (default: 1)
+.HP
 \fB\-whitelistforcerelay\fR
 .IP
 Add 'forcerelay' permission to whitelisted inbound peers with default
@@ -1055,10 +1056,11 @@ Accept public REST requests (default: 0)
 .HP
 \fB\-rpcallowip=\fR<ip>
 .IP
-Allow JSON\-RPC connections from specified source. Valid for <ip> are a
-single IP (e.g. 1.2.3.4), a network/netmask (e.g.
-1.2.3.4/255.255.255.0) or a network/CIDR (e.g. 1.2.3.4/24). This
-option can be specified multiple times
+Allow JSON\-RPC connections from specified source. Valid values for <ip>
+are a single IP (e.g. 1.2.3.4), a network/netmask (e.g.
+1.2.3.4/255.255.255.0), a network/CIDR (e.g. 1.2.3.4/24), all
+ipv4 (0.0.0.0/0), or all ipv6 (::/0). This option can be
+specified multiple times
 .HP
 \fB\-rpcauth=\fR<userpw>
 .IP
@@ -1135,4 +1137,4 @@ The source code is available from <https://github.com/dashpay/dash>.
 
 This is experimental software.
 Distributed under the MIT software license, see the accompanying file COPYING
-or <https://opensource.org/licenses/MIT>
\ No newline at end of file
+or <https://opensource.org/licenses/MIT>

From adb2992e12e026051927c983855938e917336017 Mon Sep 17 00:00:00 2001
From: Kittywhiskers Van Gogh <63189531+kwvg@users.noreply.github.com>
Date: Wed, 29 Oct 2025 18:42:51 +0530
Subject: [PATCH 301/656] chore: update minimum chain work, tx stats and
 checkpoints for v23

---
 src/chainparams.cpp | 26 ++++++++++++++------------
 1 file changed, 14 insertions(+), 12 deletions(-)

diff --git a/src/chainparams.cpp b/src/chainparams.cpp
index 48c69ce4a92e..2c1a3fed2190 100644
--- a/src/chainparams.cpp
+++ b/src/chainparams.cpp
@@ -219,10 +219,10 @@ class CMainParams : public CChainParams {
         consensus.vDeployments[Consensus::DEPLOYMENT_V24].useEHF = true;
 
         // The best chain should have at least this much work.
-        consensus.nMinimumChainWork = uint256S("0x00000000000000000000000000000000000000000000aa587876325b0a1080c8"); // 2301632
+        consensus.nMinimumChainWork = uint256S("0x00000000000000000000000000000000000000000000ae8d578b28f390b9c630"); // 2361500
 
         // By default assume that the signatures in ancestors of this block are valid.
-        consensus.defaultAssumeValid = uint256S("0x000000000000000630fdfb37764bc6df460d301effa5e0fd4e8ef9ba821f36da"); // 2301632
+        consensus.defaultAssumeValid = uint256S("0x0000000000000009ba1e8f47851d036bb618a4f6565eb3c32d1f647d450ff195"); // 2361500
 
         /**
          * The message start string is designed to be unlikely to occur in normal data.
@@ -333,6 +333,7 @@ class CMainParams : public CChainParams {
                 {2109672, uint256S("0x000000000000001889bd33ef019065e250d32bd46911f4003d3fdd8128b5358d")},
                 {2175051, uint256S("0x000000000000001cf26547602d982dcaa909231bbcd1e70c0eb3c65de25473ba")},
                 {2216986, uint256S("0x0000000000000010b1135dc743f27f6fc8a138c6420a9d963fc676f96c2048f4")},
+                {2361500, uint256S("0x0000000000000009ba1e8f47851d036bb618a4f6565eb3c32d1f647d450ff195")},
             }
         };
 
@@ -340,12 +341,12 @@ class CMainParams : public CChainParams {
          // TODO to be specified in a future patch.
         };
 
-        // getchaintxstats 17280 000000000000001cf26547602d982dcaa909231bbcd1e70c0eb3c65de25473ba
+        // getchaintxstats 17280 0000000000000009ba1e8f47851d036bb618a4f6565eb3c32d1f647d450ff195
         chainTxData = ChainTxData{
-                1732068694, // * UNIX timestamp of last known number of transactions (Block 1969000)
-                55191134,   // * total number of transactions between genesis and that timestamp
+                1761459807, // * UNIX timestamp of last known number of transactions (Block 2361500)
+                60108260,   // * total number of transactions between genesis and that timestamp
                             //   (the tx=... number in the ChainStateFlushed debug.log lines)
-                0.1528060985790164,      // * estimated number of transactions per second after that timestamp
+                0.2794041165322403,      // * estimated number of transactions per second after that timestamp
         };
     }
 };
@@ -417,10 +418,10 @@ class CTestNetParams : public CChainParams {
         consensus.vDeployments[Consensus::DEPLOYMENT_V24].useEHF = true;
 
         // The best chain should have at least this much work.
-        consensus.nMinimumChainWork = uint256S("0x00000000000000000000000000000000000000000000000003472e1b8bd6a3b7"); // 1254997
+        consensus.nMinimumChainWork = uint256S("0x000000000000000000000000000000000000000000000000036073cd80626b9c"); // 1295700
 
         // By default assume that the signatures in ancestors of this block are valid.
-        consensus.defaultAssumeValid = uint256S("0x000001d20827f1394354452ba2e836de387e4fbf2d1d35b3281adbb14adf89a1"); // 1254997
+        consensus.defaultAssumeValid = uint256S("0x00000107d42829a38e31c1a38c660d621e1ca376a880df1520e85e38af175d3a"); // 1295700
 
         pchMessageStart[0] = 0xce;
         pchMessageStart[1] = 0xe2;
@@ -507,6 +508,7 @@ class CTestNetParams : public CChainParams {
                 {1069875, uint256S("0x00000034bfeb926662ba547c0b8dd4ba8cbb6e0c581f4e7d1bddce8f9ca3a608")},
                 {1143608, uint256S("0x000000eef20eb0062abd4e799967e98bdebb165dd1c567ab4118c1c86c6e948f")},
                 {1189000, uint256S("0x000001690314036dfbbecbdf382b230ead8e9c584241290a51f9f05a87a9cf7e")},
+                {1295700, uint256S("0x00000107d42829a38e31c1a38c660d621e1ca376a880df1520e85e38af175d3a")},
             }
         };
 
@@ -514,12 +516,12 @@ class CTestNetParams : public CChainParams {
             // TODO to be specified in a future patch.
         };
 
-        // getchaintxstats 17280 000000eef20eb0062abd4e799967e98bdebb165dd1c567ab4118c1c86c6e948f
+        // getchaintxstats 17280 00000107d42829a38e31c1a38c660d621e1ca376a880df1520e85e38af175d3a
         chainTxData = ChainTxData{
-                1732068833, // * UNIX timestamp of last known number of transactions (Block 905100)
-                6701197,    // * total number of transactions between genesis and that timestamp
+                1753531407, // * UNIX timestamp of last known number of transactions (Block 1295700)
+                7089137,    // * total number of transactions between genesis and that timestamp
                             //   (the tx=... number in the ChainStateFlushed debug.log lines)
-                0.01528131540752872,       // * estimated number of transactions per second after that timestamp
+                0.01231252383519851,       // * estimated number of transactions per second after that timestamp
         };
     }
 };

From 4e52655eca7f858fb8262919be2f14f3f4914ece Mon Sep 17 00:00:00 2001
From: Kittywhiskers Van Gogh <63189531+kwvg@users.noreply.github.com>
Date: Sun, 26 Oct 2025 17:28:08 +0530
Subject: [PATCH 302/656] chore: update `m_assumed_blockchain_size` for v23

---
 src/chainparams.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/chainparams.cpp b/src/chainparams.cpp
index 2c1a3fed2190..be5b6110fa2f 100644
--- a/src/chainparams.cpp
+++ b/src/chainparams.cpp
@@ -237,7 +237,7 @@ class CMainParams : public CChainParams {
         nDefaultPlatformP2PPort = 26656;
         nDefaultPlatformHTTPPort = 443;
         nPruneAfterHeight = 100000;
-        m_assumed_blockchain_size = 50;
+        m_assumed_blockchain_size = 54;
         m_assumed_chain_state_size = 1;
 
         genesis = CreateGenesisBlock(1390095618, 28917698, 0x1e0ffff0, 1, 50 * COIN);
@@ -431,7 +431,7 @@ class CTestNetParams : public CChainParams {
         nDefaultPlatformP2PPort = 22000;
         nDefaultPlatformHTTPPort = 22001;
         nPruneAfterHeight = 1000;
-        m_assumed_blockchain_size = 5;
+        m_assumed_blockchain_size = 10;
         m_assumed_chain_state_size = 1;
 
         genesis = CreateGenesisBlock(1390666206UL, 3861367235UL, 0x1e0ffff0, 1, 50 * COIN);

From d9fe32fe0e992e645f3c64363b11d112f42140c1 Mon Sep 17 00:00:00 2001
From: Kittywhiskers Van Gogh <63189531+kwvg@users.noreply.github.com>
Date: Mon, 27 Oct 2025 00:19:22 +0530
Subject: [PATCH 303/656] chore: drop unreachable onion seeds

---
 contrib/seeds/onion_seeds.txt | 17 -----------------
 1 file changed, 17 deletions(-)

diff --git a/contrib/seeds/onion_seeds.txt b/contrib/seeds/onion_seeds.txt
index 6dcd72828b35..a8f787a9346b 100644
--- a/contrib/seeds/onion_seeds.txt
+++ b/contrib/seeds/onion_seeds.txt
@@ -1,22 +1,12 @@
-cmhr5r3lqhy7ic2ebeil66ftcz5u62zq5qhbfdz53l6sqxljh7zxntyd.onion:9999
-k532fqvgzqotj6epfw3rfc377elrj3td47ztad2tkn6vwnw6nhxacrqd.onion:9999
 snu2xaql3crh2b4t6g2wxemgrpzmaxfxla4tua63bnp2phhxwr6hzzid.onion:9999
 5v5lgddolcidtt2qmhmvyka2ewht4mkmmj73tfwuimlckgmqb5lthtid.onion:9999
 k6bzqtkhtzyziethin3kkys342rlzcmqkrs5ibashqclcu23ehuz6oqd.onion:9999
 tuzjyti6guw32smcxgswmt2fkjlkyxnt47rtspvmqerbalzdeyguczyd.onion:9999
 h2cpqmjd3rqehro52stehi4vnyofxymfqdsexchhf7dpbbkoqkmjjiyd.onion:9999
 eee7cdynbju7pax44vm3bo7aazi72qbqgwktpvk37hoxg7jkqez2kcad.onion:9999
-qkcdtz6ejiycge6i3g6uyf6m4ivby7t77syt7yezlwwhtmbsk37u74yd.onion:9999
-buo3et3xvzdjqkpx6iscjz4oexyurhpbpl3is46d653kfitl2gdzm6yd.onion:9999
 gbg2wd4uwc5k7w5j3w46zre6r5ioezulgjriketxv4qekybzg2zwdnid.onion:9999
-pcabrbxdlxgybiyykuiccajsfzazmigvc7cemqbzpqw5du27iqaihmyd.onion:9999
 itkatc2gpfkuvbmjflxgranktjrsokc7wcunu25mq7ptqms7fwex6jyd.onion:9999
 i75yxbzhzkk6q55oig6xeidcexswpgcbquhjuxkkwehy6rvjq6sjxmad.onion:9999
-ggyyhg4yr2cv4cbjedcs43ag3vh3qvynaptmlg6yzono5hhgjqif37yd.onion:9999
-g62ldh5nedukfk5hvokn6ztbhmql6q7qegrq6dbzyvzir72xerqba6yd.onion:9999
-5gnyyuxpkwsqv6sm2ee2k6uaiuq5ayaipjm33n5pwe22uit37yozrcid.onion:9999
-xmbwpdsrsn2gdamvofesyy5zrgqcswsoorrh25jx7qy4w2gftttga7ad.onion:9999
-qaocy2qaktafiuzyd3i4apyukvr2hr6fwjet625cqwbwq5yr4qqocbid.onion:9999
 2br37z5ilg3i3rawwkznmh6lhczboql5zdrfgmkaxns4tpfrxmu6s5yd.onion:9999
 3cova3snmiydrdaqrszj5krnujpwgkueh2kjodun4hvixk3y5l5zmgid.onion:9999
 iy6wzfp65f5peehquqchqperx5r4qsybfmvvdjhe2ak3ig6pt3a452yd.onion:9999
@@ -24,22 +14,15 @@ k5gdngvamlwymwh2an6qlazpgvlhkrukaso6nv56d35pentpfhimvayd.onion:9999
 4da4s6fvz2wt672kxxqgra4iurots4jnzzmeplbdt7abix655fjn23qd.onion:9999
 uf3otvrjnj7grwm7skwslf6ltibo24hkolrwuyxyx7yzlalwnupw4bid.onion:9999
 dw4u6agw6gktz7ykmgxn7m3fmgnnybhhlnish3lvnuylcb5wcwzutdqd.onion:9999
-c5qhh5xrwnonmtniag5r7bftfweniwt2f6fdixq37c7gnunbjzgx26qd.onion:9999
 h4rycn3lgltahxvfxte6rzuyu3ooa3f3a5pcgzhkvh5baqei7s3w6yid.onion:9999
 mj5zq3oeodlwselk5bnx5lhiuhwuuz6xgmijx4kbnpnhamkf5t7aqcqd.onion:9999
 fzo6z4dcjtfg5eg7absrzsskznto5ivgsqty23hmcvf6bjeg4mq2m6yd.onion:9999
 3uvcjymiixi6n6m2p6fsgyjxkx2ceaesd7eopi3p7jn364i5z646koid.onion:9999
-wzf6u7feqa65kyd5ooyyvw3rxozurmuzgzr4r3qrigne3xlj5tazwnyd.onion:9999
 hu43stbffzpgfixmzgx4ae2sp65nrjui6kagzrhkpqhmgsk2kbnfs6id.onion:9999
 xjn2wouhpr2jrqtqa3itkccjxfvrpvjgehgkrqltggnei5wl2535eiyd.onion:9999
-hsq4dkpmgc3yeirpiufopkonabxq62kl43vkzry65vhp7ctlyl3ngayd.onion:9999
 ayhwwpjq4rg3bslbtt7yejqyhucyaqsbb7tn45blh4r7xj62wfonryqd.onion:9999
-iddbcb6xzrbrjpzwbozhe3pztgrhkwjo76o4wkrpi43p5jya6jv6m7qd.onion:9999
 542grzvty3cnbtzc3sjatubkmnhw22x5gfvnj2lromdparwlc4j7o4qd.onion:9999
-qbqa37m7uiie63723muhzgl4swqjvs6oddzhtzw5ke32t47am6lq5mad.onion:9999
-etiufki5csbodchyyoqv4bv4qm2xzaljidnst4khl632xkdrsiihulad.onion:9999
 lqg6nfbek54fbsgdycq6rej7edqcg4ps6mqmvsqr645iecbt7cz7e5qd.onion:9999
-rwl447roxllklmqkmbp5aq2bxj4vwzomx6ellodoguc5vegnrr6v3yyd.onion:9999
 p2d6rg6vh5f3mjrb75l2ppxtbbpjbf45vteyp3c4u3nxfonwpezaq4ad.onion:9999
 jqssjynvlqwfiordnux2vqt6glnr3fypypfwasrizbpwhbj2lvtuzqqd.onion:9999
 jjjhwysk4t3i7nrjyxyrf4yjjqmole4doowga7nnkyjih3hmi7q2jsad.onion:9999

From e1116f65d43b45b124ca4cd150205f28883d010f Mon Sep 17 00:00:00 2001
From: Kittywhiskers Van Gogh <63189531+kwvg@users.noreply.github.com>
Date: Sun, 26 Oct 2025 19:14:12 +0530
Subject: [PATCH 304/656] chore: update mainnet seeds for v23

---
 contrib/seeds/nodes_main.txt | 182 +++++++++++++++--------------------
 src/chainparamsseeds.h       | 182 +++++++++++++++--------------------
 2 files changed, 150 insertions(+), 214 deletions(-)

diff --git a/contrib/seeds/nodes_main.txt b/contrib/seeds/nodes_main.txt
index 1ec14942c37a..4ba5d506db1b 100644
--- a/contrib/seeds/nodes_main.txt
+++ b/contrib/seeds/nodes_main.txt
@@ -1,44 +1,27 @@
-xmbwpdsrsn2gdamvofesyy5zrgqcswsoorrh25jx7qy4w2gftttga7ad.onion:9999
 xjn2wouhpr2jrqtqa3itkccjxfvrpvjgehgkrqltggnei5wl2535eiyd.onion:9999
-wzf6u7feqa65kyd5ooyyvw3rxozurmuzgzr4r3qrigne3xlj5tazwnyd.onion:9999
 wtby3fkid4eqaknfvmakg6vofvpda4ukhuec7k52no76n6szxcvf7pid.onion:9999
 uf3otvrjnj7grwm7skwslf6ltibo24hkolrwuyxyx7yzlalwnupw4bid.onion:9999
 tuzjyti6guw32smcxgswmt2fkjlkyxnt47rtspvmqerbalzdeyguczyd.onion:9999
 snu2xaql3crh2b4t6g2wxemgrpzmaxfxla4tua63bnp2phhxwr6hzzid.onion:9999
-rwl447roxllklmqkmbp5aq2bxj4vwzomx6ellodoguc5vegnrr6v3yyd.onion:9999
-qkcdtz6ejiycge6i3g6uyf6m4ivby7t77syt7yezlwwhtmbsk37u74yd.onion:9999
-qbqa37m7uiie63723muhzgl4swqjvs6oddzhtzw5ke32t47am6lq5mad.onion:9999
-qaocy2qaktafiuzyd3i4apyukvr2hr6fwjet625cqwbwq5yr4qqocbid.onion:9999
-pcabrbxdlxgybiyykuiccajsfzazmigvc7cemqbzpqw5du27iqaihmyd.onion:9999
 p2d6rg6vh5f3mjrb75l2ppxtbbpjbf45vteyp3c4u3nxfonwpezaq4ad.onion:9999
 mj5zq3oeodlwselk5bnx5lhiuhwuuz6xgmijx4kbnpnhamkf5t7aqcqd.onion:9999
 lqg6nfbek54fbsgdycq6rej7edqcg4ps6mqmvsqr645iecbt7cz7e5qd.onion:9999
 k6bzqtkhtzyziethin3kkys342rlzcmqkrs5ibashqclcu23ehuz6oqd.onion:9999
 k5gdngvamlwymwh2an6qlazpgvlhkrukaso6nv56d35pentpfhimvayd.onion:9999
-k532fqvgzqotj6epfw3rfc377elrj3td47ztad2tkn6vwnw6nhxacrqd.onion:9999
 jqssjynvlqwfiordnux2vqt6glnr3fypypfwasrizbpwhbj2lvtuzqqd.onion:9999
 jjjhwysk4t3i7nrjyxyrf4yjjqmole4doowga7nnkyjih3hmi7q2jsad.onion:9999
 iy6wzfp65f5peehquqchqperx5r4qsybfmvvdjhe2ak3ig6pt3a452yd.onion:9999
 itkatc2gpfkuvbmjflxgranktjrsokc7wcunu25mq7ptqms7fwex6jyd.onion:9999
-iddbcb6xzrbrjpzwbozhe3pztgrhkwjo76o4wkrpi43p5jya6jv6m7qd.onion:9999
 i75yxbzhzkk6q55oig6xeidcexswpgcbquhjuxkkwehy6rvjq6sjxmad.onion:9999
 hu43stbffzpgfixmzgx4ae2sp65nrjui6kagzrhkpqhmgsk2kbnfs6id.onion:9999
-hsq4dkpmgc3yeirpiufopkonabxq62kl43vkzry65vhp7ctlyl3ngayd.onion:9999
 h4rycn3lgltahxvfxte6rzuyu3ooa3f3a5pcgzhkvh5baqei7s3w6yid.onion:9999
 h2cpqmjd3rqehro52stehi4vnyofxymfqdsexchhf7dpbbkoqkmjjiyd.onion:9999
-ggyyhg4yr2cv4cbjedcs43ag3vh3qvynaptmlg6yzono5hhgjqif37yd.onion:9999
 gbg2wd4uwc5k7w5j3w46zre6r5ioezulgjriketxv4qekybzg2zwdnid.onion:9999
-g62ldh5nedukfk5hvokn6ztbhmql6q7qegrq6dbzyvzir72xerqba6yd.onion:9999
 fzo6z4dcjtfg5eg7absrzsskznto5ivgsqty23hmcvf6bjeg4mq2m6yd.onion:9999
-etiufki5csbodchyyoqv4bv4qm2xzaljidnst4khl632xkdrsiihulad.onion:9999
 eee7cdynbju7pax44vm3bo7aazi72qbqgwktpvk37hoxg7jkqez2kcad.onion:9999
 dw4u6agw6gktz7ykmgxn7m3fmgnnybhhlnish3lvnuylcb5wcwzutdqd.onion:9999
-cmhr5r3lqhy7ic2ebeil66ftcz5u62zq5qhbfdz53l6sqxljh7zxntyd.onion:9999
-c5qhh5xrwnonmtniag5r7bftfweniwt2f6fdixq37c7gnunbjzgx26qd.onion:9999
-buo3et3xvzdjqkpx6iscjz4oexyurhpbpl3is46d653kfitl2gdzm6yd.onion:9999
 ayhwwpjq4rg3bslbtt7yejqyhucyaqsbb7tn45blh4r7xj62wfonryqd.onion:9999
 5v5lgddolcidtt2qmhmvyka2ewht4mkmmj73tfwuimlckgmqb5lthtid.onion:9999
-5gnyyuxpkwsqv6sm2ee2k6uaiuq5ayaipjm33n5pwe22uit37yozrcid.onion:9999
 542grzvty3cnbtzc3sjatubkmnhw22x5gfvnj2lromdparwlc4j7o4qd.onion:9999
 4da4s6fvz2wt672kxxqgra4iurots4jnzzmeplbdt7abix655fjn23qd.onion:9999
 3uvcjymiixi6n6m2p6fsgyjxkx2ceaesd7eopi3p7jn364i5z646koid.onion:9999
@@ -47,202 +30,187 @@ ayhwwpjq4rg3bslbtt7yejqyhucyaqsbb7tn45blh4r7xj62wfonryqd.onion:9999
 216.250.97.52:9999
 216.238.75.46:9999
 216.230.232.125:9999
+213.218.209.185:9999
 213.218.209.34:9999
-213.199.34.250:9999
+213.218.209.8:9999
 213.171.15.125:9999
 213.159.77.221:9999
 212.52.0.210:9999
-212.24.110.128:9999
+212.38.89.106:9999
+212.24.104.225:9999
 209.145.48.154:9999
 209.141.36.206:9999
 209.58.164.42:9999
 208.87.102.91:9999
 207.244.247.40:9999
+202.71.14.79:9999
 202.5.16.33:9999
+198.211.127.203:9999
 198.7.115.48:9999
-195.181.211.64:9999
 195.98.95.210:9999
-194.135.81.214:9999
+194.238.25.199:9999
+194.182.84.152:9999
+194.135.84.100:9999
 194.5.157.214:9999
+192.175.127.198:9999
 192.169.6.87:9999
-188.127.237.243:9999
-188.127.230.40:9999
 188.40.178.67:9999
 185.243.115.219:9999
 185.228.83.156:9999
-185.217.127.139:9999
-185.213.24.34:9999
-185.198.234.54:9999
+185.228.83.132:9999
 185.198.234.33:9999
-185.198.234.25:9999
-185.198.234.17:9999
-185.185.40.171:9999
+185.198.234.12:9999
+185.193.19.214:9999
 185.185.40.104:9999
+185.175.56.212:9999
 185.166.217.154:9999
 185.165.171.117:9999
 185.164.163.218:9999
 185.164.163.85:9999
-185.158.107.124:9999
-185.155.99.34:9999
 185.142.212.144:9999
+185.141.216.4:9999
+185.112.249.53:9999
 185.112.249.49:9999
-185.87.149.61:9999
+184.107.182.65:9999
+178.215.237.135:9999
+178.215.237.134:9999
 178.208.87.226:9999
 178.208.87.213:9999
 178.159.2.12:9999
-178.157.91.184:9999
-178.157.91.178:9999
 178.157.91.177:9999
 178.63.121.129:9999
+177.93.141.86:9999
+177.93.141.60:9999
 176.102.65.145:9999
-174.34.233.212:9999
-174.34.233.211:9999
-174.34.233.209:9999
-174.34.233.204:9999
+173.212.245.118:9999
+172.236.244.81:9999
+172.233.66.70:9999
 172.104.145.166:9999
-172.104.90.249:9999
-170.75.167.244:9999
-170.75.162.212:9999
 168.119.80.4:9999
 167.88.169.16:9999
 167.88.165.175:9999
+167.88.46.170:9999
 165.22.234.135:9999
 163.172.66.41:9999
-163.172.20.210:9999
-163.172.20.209:9999
-163.172.20.205:9999
 162.250.191.31:9999
+162.250.188.207:9999
 162.246.17.248:9999
+162.212.35.104:9999
+162.212.35.100:9999
+159.203.44.216:9999
 159.75.121.163:9999
 157.173.202.14:9999
-157.66.81.162:9999
-157.10.199.82:9999
-157.10.199.79:9999
-157.10.199.77:9999
-154.127.57.63:9999
+152.53.144.53:9999
 150.158.48.6:9999
 147.45.183.128:9999
 147.45.103.99:9999
-146.190.230.104:9999
-146.103.48.209:9999
 146.103.48.203:9999
-146.59.45.235:9999
-139.162.131.197:9999
-135.181.53.130:9999
+139.28.97.2:9999
 134.255.182.186:9999
-133.18.228.84:9999
+133.18.97.226:9999
 130.162.233.186:9999
 130.61.120.252:9999
 123.193.64.166:9999
-109.235.69.82:9999
+115.120.238.240:9999
+109.235.67.246:9999
 109.173.240.233:9999
 107.189.3.74:9999
-107.170.254.160:9999
+107.179.202.74:9999
+107.174.204.166:9999
 106.55.9.22:9999
-104.225.159.232:9999
-104.200.24.196:9999
 95.211.196.46:9999
 95.211.196.34:9999
 95.211.196.32:9999
-95.211.196.8:9999
 95.183.51.141:9999
 95.171.21.131:9999
-95.169.181.71:9999
 94.172.109.161:9999
-93.21.76.185:9999
-92.63.176.202:9999
-91.234.35.132:9999
-91.222.237.98:9999
+93.115.172.39:9999
+93.115.172.37:9999
 91.199.149.177:9999
 89.179.73.96:9999
-89.117.19.10:9999
-89.40.13.80:9999
-89.40.10.45:9999
-89.40.8.160:9999
-89.40.0.109:9999
-89.35.131.61:9999
+89.35.131.149:9999
+87.229.22.250:9999
 87.228.24.64:9999
-87.209.245.227:9999
-86.107.168.47:9999
-86.107.168.46:9999
-86.107.168.43:9999
-86.107.168.29:9999
-85.215.107.202:9999
-85.209.241.185:9999
+86.107.101.128:9999
+85.209.241.245:9999
+85.209.241.93:9999
+85.209.241.87:9999
 85.209.241.86:9999
-85.209.241.71:9999
-85.209.241.35:9999
+84.247.155.11:9999
 84.242.179.204:9999
+84.98.12.196:9999
 84.9.50.17:9999
-83.239.99.40:9999
-82.211.25.193:9999
+83.222.9.253:9999
 82.211.25.105:9999
+82.211.21.240:9999
 82.211.21.179:9999
 82.211.21.23:9999
 82.202.230.83:9999
+82.180.146.192:9999
 81.227.250.51:9999
+81.14.228.87:9999
 80.249.147.8:9999
 80.240.132.231:9999
-80.209.234.170:9999
+80.208.230.144:9999
 78.83.19.0:9999
 77.223.99.4:9999
 77.221.148.204:9999
 74.50.90.113:9999
+72.60.38.160:9999
 69.61.107.215:9999
 66.245.196.52:9999
 66.244.243.70:9999
 66.244.243.69:9999
+62.60.244.174:9999
 52.36.102.91:9999
 52.33.9.172:9999
-51.38.142.66:9999
-51.38.142.62:9999
+51.158.169.237:9999
+51.77.230.210:9999
 51.38.142.61:9999
-47.110.184.170:9999
 46.254.241.9:9999
-46.254.241.8:9999
 46.254.241.7:9999
+46.254.241.6:9999
 46.254.241.4:9999
+46.250.254.10:9999
 46.36.40.242:9999
-46.30.189.251:9999
-46.30.189.214:9999
-46.30.189.213:9999
-46.30.189.116:9999
-45.153.186.100:9999
+46.4.162.127:9999
 45.140.19.201:9999
-45.135.180.79:9999
-45.91.94.217:9999
+45.132.74.89:9999
+45.128.156.30:9999
 45.83.122.122:9999
-45.76.83.91:9999
-45.71.159.104:9999
-45.71.158.108:9999
-45.71.158.58:9999
+45.79.18.106:9999
+45.77.169.207:9999
 45.61.186.121:9999
 45.58.56.79:9999
-45.32.159.48:9999
-45.11.182.64:9999
+45.32.228.166:9999
 44.240.99.214:9999
 43.229.77.46:9999
 43.167.244.109:9999
 43.167.240.90:9999
+43.167.239.145:9999
 43.163.251.51:9999
-43.128.72.114:9999
-38.99.82.230:9999
+38.102.125.108:9999
+38.99.82.60:9999
 38.99.82.21:9999
 38.91.101.92:9999
 38.91.100.202:9999
-38.88.125.51:9999
-38.88.125.50:9999
+37.252.17.214:9999
 37.97.227.21:9999
-35.174.217.98:9999
 34.246.176.25:9999
-31.148.99.104:9999
+31.148.99.148:9999
 31.57.190.188:9999
 31.57.190.31:9999
 31.10.97.36:9999
 5.255.106.192:9999
+5.230.119.206:9999
+5.230.119.184:9999
+5.230.119.183:9999
+5.189.164.253:9999
 5.161.110.79:9999
-5.35.103.26:9999
+5.79.109.243:9999
 5.35.103.25:9999
 5.35.103.19:9999
 5.2.73.58:9999
+5.2.67.190:9999
 2.233.120.35:9999
+2.56.213.218:9999
diff --git a/src/chainparamsseeds.h b/src/chainparamsseeds.h
index 734090de975f..0ca206b2f615 100644
--- a/src/chainparamsseeds.h
+++ b/src/chainparamsseeds.h
@@ -7,47 +7,30 @@
  * Each line contains a BIP155 serialized (networkID, addr, port) tuple.
  */
 static const uint8_t chainparams_seed_main[] = {
-    0x04,0x20,0xbb,0x03,0x67,0x8e,0x51,0x93,0x74,0x61,0x81,0x95,0x71,0x49,0x2c,0x63,0xb9,0x89,0xa0,0x29,0x5a,0x4e,0x74,0x62,0x7d,0x75,0x37,0xfc,0x31,0xcb,0x68,0xc5,0x9c,0xe6,0x27,0x0f,
     0x04,0x20,0xba,0x5b,0xab,0x3a,0x87,0x7c,0x74,0x98,0xc2,0x70,0x06,0xd1,0x35,0x08,0x49,0xb9,0x6b,0x17,0xd5,0x26,0x21,0xcc,0xa8,0xc1,0x73,0x31,0x9a,0x44,0x76,0xcb,0xd7,0x77,0x27,0x0f,
-    0x04,0x20,0xb6,0x4b,0xea,0x7c,0xa4,0x80,0x3d,0xd5,0x60,0x7d,0x73,0xb1,0x8a,0xdb,0x71,0xbb,0xb3,0x48,0xb2,0x99,0x36,0x63,0xc8,0xee,0x11,0x41,0x9a,0x4d,0xdd,0x69,0xec,0xc1,0x27,0x0f,
     0x04,0x20,0xb4,0xc3,0x8d,0x95,0x48,0x1f,0x09,0x00,0x29,0xa5,0xab,0x00,0xa3,0x7a,0xae,0x2d,0x5e,0x30,0x72,0x8a,0x3d,0x08,0x2f,0xab,0xba,0x6b,0xbf,0xe6,0xfa,0x59,0xb8,0xaa,0x27,0x0f,
     0x04,0x20,0xa1,0x76,0xe9,0xd6,0x29,0x6a,0x7e,0x68,0xd9,0x9f,0x92,0xad,0x25,0x97,0xcb,0x9a,0x02,0xed,0x70,0xea,0x72,0xe3,0x6a,0x62,0xf8,0xbf,0xf1,0x95,0x81,0x76,0x6d,0x1f,0x27,0x0f,
     0x04,0x20,0x9d,0x32,0x9c,0x4d,0x1e,0x35,0x2d,0xbd,0x49,0x82,0xb9,0xa5,0x66,0x4f,0x45,0x52,0x56,0xac,0x5d,0xb3,0xe7,0xe3,0x39,0x3e,0xac,0x81,0x22,0x10,0x2f,0x23,0x26,0x0d,0x27,0x0f,
     0x04,0x20,0x93,0x69,0xab,0x82,0x0b,0xd8,0xa2,0x7d,0x07,0x93,0xf1,0xb5,0x6b,0x91,0x86,0x8b,0xf2,0xc0,0x5c,0xb7,0x58,0x39,0x3a,0x03,0xdb,0x0b,0x5f,0xa7,0x9c,0xf7,0xb4,0x7c,0x27,0x0f,
-    0x04,0x20,0x8d,0x97,0xce,0x7e,0x2e,0xba,0xd6,0xa5,0xb2,0x0a,0x60,0x5f,0xd0,0x43,0x41,0xba,0x79,0x5b,0x65,0xcc,0xbf,0x88,0xb5,0xb8,0x6e,0x35,0x05,0xda,0x90,0xcd,0x8c,0x7d,0x27,0x0f,
-    0x04,0x20,0x82,0x84,0x39,0xe7,0xc4,0x4a,0x30,0x23,0x13,0xc8,0xd9,0xbd,0x4c,0x17,0xcc,0xe2,0x2a,0x1c,0x7e,0x7f,0xfc,0xb1,0x3f,0xe0,0x99,0x5d,0xac,0x79,0xb0,0x32,0x56,0xff,0x27,0x0f,
-    0x04,0x20,0x80,0x60,0x0d,0xfd,0x9f,0xa2,0x10,0x4f,0x6f,0xfa,0xdb,0x28,0x7c,0x99,0x7c,0x95,0xa0,0x9a,0xcb,0xce,0x18,0xf2,0x79,0xe6,0xdd,0x51,0x37,0xa9,0xf3,0xe0,0x67,0x97,0x27,0x0f,
-    0x04,0x20,0x80,0x1c,0x2c,0x6a,0x00,0x54,0xc0,0x54,0x53,0x38,0x1e,0xd1,0xc0,0x3f,0x14,0x55,0x63,0xa3,0xc7,0xc5,0xb2,0x49,0x3f,0x6b,0xa2,0x85,0x83,0x68,0x77,0x11,0xe4,0x20,0x27,0x0f,
-    0x04,0x20,0x78,0x80,0x18,0x86,0xe3,0x5d,0xcd,0x80,0xa3,0x18,0x55,0x10,0x21,0x01,0x32,0x2e,0x41,0x96,0x20,0xd5,0x17,0xc4,0x46,0x40,0x39,0x7c,0x2d,0xd1,0xd3,0x5f,0x44,0x00,0x27,0x0f,
     0x04,0x20,0x7e,0x87,0xe8,0x9b,0xd5,0x3f,0x4b,0xb6,0x26,0x21,0xff,0x57,0xa7,0xbe,0xf3,0x08,0x5e,0x90,0x97,0x9d,0xac,0xc9,0x87,0xec,0x5c,0xa6,0xdb,0x72,0xb9,0xb6,0x79,0x32,0x27,0x0f,
     0x04,0x20,0x62,0x7b,0x98,0x6d,0xc4,0x70,0xd7,0x69,0x11,0x6a,0xe8,0x5b,0x7e,0xac,0xe8,0xa1,0xed,0x4a,0x67,0xd7,0x33,0x10,0x9b,0xf1,0x41,0x6b,0xda,0x70,0x31,0x45,0xec,0xfe,0x27,0x0f,
     0x04,0x20,0x5c,0x0d,0xe6,0x94,0x24,0x57,0x78,0x50,0xc8,0xc3,0xc0,0xa1,0xe8,0x91,0x3f,0x20,0xe0,0x23,0x71,0xf2,0xf3,0x20,0xca,0xca,0x11,0xf7,0x3a,0x82,0x08,0x33,0xf8,0xb3,0x27,0x0f,
     0x04,0x20,0x57,0x83,0x98,0x4d,0x47,0x9e,0x71,0x94,0x12,0x67,0x43,0x76,0xa5,0x62,0x5b,0xe6,0xa2,0xbc,0x89,0x90,0x54,0x65,0xd4,0x04,0x12,0x3c,0x04,0xb1,0x53,0x5b,0x21,0xe9,0x27,0x0f,
     0x04,0x20,0x57,0x4c,0x36,0x9a,0xa0,0x62,0xed,0x86,0x58,0xfa,0x03,0x7d,0x05,0x83,0x2f,0x35,0x56,0x75,0x46,0x8a,0x04,0x9d,0xe6,0xd7,0xbe,0x1e,0xfa,0xf2,0x36,0x6f,0x29,0xd0,0x27,0x0f,
-    0x04,0x20,0x57,0x77,0xa2,0xc2,0xa6,0xcc,0x1d,0x34,0xf8,0x8f,0x2d,0xb7,0x12,0x8b,0x7f,0xf9,0x17,0x14,0xee,0x63,0xe7,0xf3,0x30,0x0f,0x53,0x53,0x7d,0x5b,0x36,0xde,0x69,0xee,0x27,0x0f,
     0x04,0x20,0x4c,0x25,0x24,0xe1,0xb5,0x5c,0x2c,0x54,0x3a,0x23,0x6d,0x2f,0xaa,0xc2,0x7e,0x32,0xdb,0x1d,0x97,0x0f,0xc3,0xcb,0x60,0x4a,0x28,0xc8,0x5f,0x63,0x85,0x3a,0x5d,0x67,0x27,0x0f,
     0x04,0x20,0x4a,0x52,0x7b,0x62,0x4a,0xe4,0xf6,0x8f,0xb6,0x29,0xc5,0xf1,0x12,0xf3,0x09,0x4c,0x18,0xe5,0x93,0x83,0x73,0xac,0x60,0x7d,0xad,0x56,0x12,0x83,0xec,0xec,0x47,0xe1,0x27,0x0f,
     0x04,0x20,0x46,0x3d,0x6c,0x95,0xfe,0xe9,0x7a,0xf2,0x10,0xf0,0xa4,0x04,0x78,0x3c,0x91,0xbf,0x63,0xc8,0x4b,0x01,0x2b,0x2b,0x51,0xa4,0xe4,0xd0,0x15,0xb4,0x1b,0xcf,0x9e,0xc1,0x27,0x0f,
     0x04,0x20,0x44,0xd4,0x09,0x8b,0x46,0x79,0x55,0x4a,0x85,0x89,0x2a,0xee,0x68,0x81,0xaa,0x9a,0x63,0x27,0x28,0x5f,0xb0,0xa8,0xda,0x6b,0xac,0x87,0xdf,0x38,0x32,0x5f,0x2d,0x89,0x27,0x0f,
-    0x04,0x20,0x40,0xc6,0x11,0x07,0xd7,0xcc,0x43,0x14,0xbf,0x36,0x0b,0xb2,0x72,0x6d,0xf9,0x99,0xa2,0x75,0x59,0x2e,0xff,0x9d,0xcb,0x2a,0x2f,0x47,0x36,0xfe,0xa7,0x00,0xf2,0x6b,0x27,0x0f,
     0x04,0x20,0x47,0xfb,0x8b,0x87,0x27,0xca,0x95,0xe8,0x77,0xae,0x41,0xbd,0x72,0x20,0x62,0x25,0xe5,0x67,0x98,0x41,0x85,0x0e,0x9a,0x5d,0x4a,0xb1,0x0f,0x8f,0x46,0xa9,0x87,0xa4,0x27,0x0f,
     0x04,0x20,0x3d,0x39,0xb9,0x4c,0x25,0x2e,0x5e,0x62,0xa2,0xec,0xc9,0xaf,0xc0,0x13,0x52,0x7f,0xba,0xd8,0xa6,0x88,0xf2,0x80,0x6c,0xc4,0xea,0x7c,0x0e,0xc3,0x49,0x5a,0x50,0x5a,0x27,0x0f,
-    0x04,0x20,0x3c,0xa1,0xc1,0xa9,0xec,0x30,0xb7,0x82,0x22,0x2f,0x45,0x0a,0xe7,0xa9,0xcd,0x00,0x6f,0x0f,0x69,0x4b,0xe6,0xea,0xac,0xc7,0x1e,0xed,0x4e,0xff,0x8a,0x6b,0xc2,0xf6,0x27,0x0f,
     0x04,0x20,0x3f,0x23,0x81,0x37,0x6b,0x32,0xe6,0x03,0xde,0xa5,0xbc,0xc9,0xe8,0xe6,0x98,0xa6,0xdc,0xe0,0x6c,0xbb,0x07,0x5e,0x23,0x64,0xea,0xa9,0xfa,0x10,0x40,0x88,0xfc,0xb7,0x27,0x0f,
     0x04,0x20,0x3e,0x84,0xf8,0x31,0x23,0xdc,0x60,0x43,0xc5,0xdd,0xd4,0xa6,0x43,0xa3,0x95,0x6e,0x1c,0x5b,0xe1,0x85,0x80,0xe4,0x4b,0x88,0xe7,0x2f,0xc6,0xf0,0x85,0x4e,0x82,0x98,0x27,0x0f,
-    0x04,0x20,0x31,0xb1,0x83,0x9b,0x98,0x8e,0x85,0x5e,0x08,0x29,0x20,0xc5,0x2e,0x6c,0x06,0xdd,0x4f,0xb8,0x57,0x0d,0x03,0xe6,0xc5,0x9b,0xd8,0xcb,0x9a,0xee,0x9c,0xe6,0x4c,0x10,0x27,0x0f,
     0x04,0x20,0x30,0x4d,0xab,0x0f,0x94,0xb0,0xba,0xaf,0xdb,0xa9,0xdd,0xb9,0xec,0xc4,0x9e,0x8f,0x50,0xe2,0x66,0x8b,0x32,0x62,0x85,0x12,0x77,0xaf,0x20,0x45,0x60,0x39,0x36,0xb3,0x27,0x0f,
-    0x04,0x20,0x37,0xb4,0xb1,0x9f,0xad,0x20,0xe8,0xa2,0xab,0xa7,0xab,0x94,0xdf,0x66,0x61,0x3b,0x20,0xbf,0x43,0xf0,0x21,0xa3,0x0f,0x0c,0x39,0xc5,0x72,0x88,0xff,0x57,0x24,0x60,0x27,0x0f,
     0x04,0x20,0x2e,0x5d,0xec,0xf0,0x62,0x4c,0xca,0x6e,0x90,0xdf,0x00,0x65,0x1c,0xca,0x4a,0xcb,0x66,0xee,0xa2,0xa6,0x94,0x27,0x8d,0x6c,0xec,0x15,0x4b,0xe0,0xa4,0x86,0xe3,0x21,0x27,0x0f,
-    0x04,0x20,0x24,0xd1,0x42,0xa9,0x1d,0x14,0x82,0xe1,0x88,0xf8,0xc3,0xa1,0x5e,0x06,0xbc,0x83,0x35,0x7c,0x81,0x69,0x40,0xdb,0x29,0xf1,0x47,0x5f,0xb7,0xab,0xa8,0x71,0x92,0x10,0x27,0x0f,
     0x04,0x20,0x21,0x09,0xf1,0x0f,0x0d,0x0a,0x69,0xf7,0x82,0xfc,0xe5,0x59,0xb0,0xbb,0xe0,0x06,0x51,0xfd,0x40,0x30,0x35,0x95,0x37,0xd5,0x5b,0xf9,0xdd,0x73,0x7d,0x2a,0x81,0x33,0x27,0x0f,
     0x04,0x20,0x1d,0xb9,0x4f,0x00,0xd6,0xf1,0x95,0x3c,0xff,0x0a,0x61,0xae,0xdf,0xb3,0x65,0x61,0x9a,0xdc,0x04,0xe7,0x5b,0x51,0x23,0xed,0x75,0x6d,0x30,0xb1,0x07,0xb6,0x15,0xb3,0x27,0x0f,
-    0x04,0x20,0x13,0x0f,0x1e,0xc7,0x6b,0x81,0xf1,0xf4,0x0b,0x44,0x09,0x10,0xbf,0x78,0xb3,0x16,0x7b,0x4f,0x6b,0x30,0xec,0x0e,0x12,0x8f,0x3d,0xda,0xfd,0x28,0x5d,0x69,0x3f,0xf3,0x27,0x0f,
-    0x04,0x20,0x17,0x60,0x73,0xf6,0xf1,0xb3,0x5c,0xd6,0x4d,0xa8,0x01,0xbb,0x1f,0x84,0xb3,0x2d,0x88,0xd4,0x5a,0x7a,0x2f,0x8a,0x34,0x5e,0x1b,0xf8,0xbe,0x66,0xd1,0xa1,0x4e,0x4d,0x27,0x0f,
-    0x04,0x20,0x0d,0x1d,0xb2,0x4f,0x77,0xae,0x46,0x98,0x29,0xf7,0xf2,0x24,0x24,0xe7,0x8e,0x25,0xf1,0x48,0x9d,0xe1,0x7a,0xf6,0x89,0x73,0xc3,0xf7,0x76,0xa2,0xa2,0x6b,0xd1,0x87,0x27,0x0f,
     0x04,0x20,0x06,0x0f,0x6b,0x3d,0x30,0xe4,0x4d,0xb0,0xc9,0x61,0x9c,0xff,0x82,0x26,0x18,0x3d,0x05,0x80,0x42,0x41,0x0f,0xe6,0xde,0x74,0x2b,0x3f,0x23,0xfb,0xa7,0xda,0xb1,0x5c,0x27,0x0f,
     0x04,0x20,0xed,0x7a,0xb3,0x0c,0x6e,0x58,0x90,0x39,0xcf,0x50,0x61,0xd9,0x5c,0x28,0x1a,0x25,0x8f,0x3e,0x31,0x4c,0x62,0x7f,0xb9,0x96,0xd4,0x43,0x16,0x25,0x19,0x90,0x0f,0x57,0x27,0x0f,
-    0x04,0x20,0xe9,0x9b,0x8c,0x52,0xef,0x55,0xa5,0x0a,0xfa,0x4c,0xd1,0x09,0xa5,0x7a,0x80,0x45,0x21,0xd0,0x60,0x08,0x7a,0x59,0xbd,0xb7,0xaf,0xb1,0x35,0xaa,0x22,0x7b,0xfe,0x1d,0x27,0x0f,
     0x04,0x20,0xef,0x34,0x68,0xe6,0xb3,0xc6,0xc4,0xd0,0xcf,0x22,0xdc,0x92,0x09,0xd0,0x2a,0x63,0x4f,0x6d,0x6a,0xfd,0x31,0x6a,0xd4,0xe9,0x71,0x73,0x06,0xf0,0x46,0xcb,0x17,0x13,0x27,0x0f,
     0x04,0x20,0xe0,0xc1,0xc9,0x78,0xb5,0xce,0xad,0x3f,0x7f,0x4a,0xbd,0xe0,0x68,0x83,0x88,0xa4,0x5d,0x39,0x71,0x2d,0xce,0x58,0x47,0xac,0x23,0x9f,0xc0,0x14,0x5f,0xdd,0xe9,0x52,0x27,0x0f,
     0x04,0x20,0xdd,0x2a,0x24,0xe1,0x88,0x45,0xd1,0xe6,0xf9,0x9a,0x7f,0x8b,0x23,0x61,0x37,0x55,0xf4,0x22,0x00,0x92,0x1f,0xc8,0xe7,0xa3,0x6f,0xfa,0x5b,0xbf,0x71,0x1d,0xcf,0xb9,0x27,0x0f,
@@ -56,205 +39,190 @@ static const uint8_t chainparams_seed_main[] = {
     0x01,0x04,0xd8,0xfa,0x61,0x34,0x27,0x0f,
     0x01,0x04,0xd8,0xee,0x4b,0x2e,0x27,0x0f,
     0x01,0x04,0xd8,0xe6,0xe8,0x7d,0x27,0x0f,
+    0x01,0x04,0xd5,0xda,0xd1,0xb9,0x27,0x0f,
     0x01,0x04,0xd5,0xda,0xd1,0x22,0x27,0x0f,
-    0x01,0x04,0xd5,0xc7,0x22,0xfa,0x27,0x0f,
+    0x01,0x04,0xd5,0xda,0xd1,0x08,0x27,0x0f,
     0x01,0x04,0xd5,0xab,0x0f,0x7d,0x27,0x0f,
     0x01,0x04,0xd5,0x9f,0x4d,0xdd,0x27,0x0f,
     0x01,0x04,0xd4,0x34,0x00,0xd2,0x27,0x0f,
-    0x01,0x04,0xd4,0x18,0x6e,0x80,0x27,0x0f,
+    0x01,0x04,0xd4,0x26,0x59,0x6a,0x27,0x0f,
+    0x01,0x04,0xd4,0x18,0x68,0xe1,0x27,0x0f,
     0x01,0x04,0xd1,0x91,0x30,0x9a,0x27,0x0f,
     0x01,0x04,0xd1,0x8d,0x24,0xce,0x27,0x0f,
     0x01,0x04,0xd1,0x3a,0xa4,0x2a,0x27,0x0f,
     0x01,0x04,0xd0,0x57,0x66,0x5b,0x27,0x0f,
     0x01,0x04,0xcf,0xf4,0xf7,0x28,0x27,0x0f,
+    0x01,0x04,0xca,0x47,0x0e,0x4f,0x27,0x0f,
     0x01,0x04,0xca,0x05,0x10,0x21,0x27,0x0f,
+    0x01,0x04,0xc6,0xd3,0x7f,0xcb,0x27,0x0f,
     0x01,0x04,0xc6,0x07,0x73,0x30,0x27,0x0f,
-    0x01,0x04,0xc3,0xb5,0xd3,0x40,0x27,0x0f,
     0x01,0x04,0xc3,0x62,0x5f,0xd2,0x27,0x0f,
-    0x01,0x04,0xc2,0x87,0x51,0xd6,0x27,0x0f,
+    0x01,0x04,0xc2,0xee,0x19,0xc7,0x27,0x0f,
+    0x01,0x04,0xc2,0xb6,0x54,0x98,0x27,0x0f,
+    0x01,0x04,0xc2,0x87,0x54,0x64,0x27,0x0f,
     0x01,0x04,0xc2,0x05,0x9d,0xd6,0x27,0x0f,
+    0x01,0x04,0xc0,0xaf,0x7f,0xc6,0x27,0x0f,
     0x01,0x04,0xc0,0xa9,0x06,0x57,0x27,0x0f,
-    0x01,0x04,0xbc,0x7f,0xed,0xf3,0x27,0x0f,
-    0x01,0x04,0xbc,0x7f,0xe6,0x28,0x27,0x0f,
     0x01,0x04,0xbc,0x28,0xb2,0x43,0x27,0x0f,
     0x01,0x04,0xb9,0xf3,0x73,0xdb,0x27,0x0f,
     0x01,0x04,0xb9,0xe4,0x53,0x9c,0x27,0x0f,
-    0x01,0x04,0xb9,0xd9,0x7f,0x8b,0x27,0x0f,
-    0x01,0x04,0xb9,0xd5,0x18,0x22,0x27,0x0f,
-    0x01,0x04,0xb9,0xc6,0xea,0x36,0x27,0x0f,
+    0x01,0x04,0xb9,0xe4,0x53,0x84,0x27,0x0f,
     0x01,0x04,0xb9,0xc6,0xea,0x21,0x27,0x0f,
-    0x01,0x04,0xb9,0xc6,0xea,0x19,0x27,0x0f,
-    0x01,0x04,0xb9,0xc6,0xea,0x11,0x27,0x0f,
-    0x01,0x04,0xb9,0xb9,0x28,0xab,0x27,0x0f,
+    0x01,0x04,0xb9,0xc6,0xea,0x0c,0x27,0x0f,
+    0x01,0x04,0xb9,0xc1,0x13,0xd6,0x27,0x0f,
     0x01,0x04,0xb9,0xb9,0x28,0x68,0x27,0x0f,
+    0x01,0x04,0xb9,0xaf,0x38,0xd4,0x27,0x0f,
     0x01,0x04,0xb9,0xa6,0xd9,0x9a,0x27,0x0f,
     0x01,0x04,0xb9,0xa5,0xab,0x75,0x27,0x0f,
     0x01,0x04,0xb9,0xa4,0xa3,0xda,0x27,0x0f,
     0x01,0x04,0xb9,0xa4,0xa3,0x55,0x27,0x0f,
-    0x01,0x04,0xb9,0x9e,0x6b,0x7c,0x27,0x0f,
-    0x01,0x04,0xb9,0x9b,0x63,0x22,0x27,0x0f,
     0x01,0x04,0xb9,0x8e,0xd4,0x90,0x27,0x0f,
+    0x01,0x04,0xb9,0x8d,0xd8,0x04,0x27,0x0f,
+    0x01,0x04,0xb9,0x70,0xf9,0x35,0x27,0x0f,
     0x01,0x04,0xb9,0x70,0xf9,0x31,0x27,0x0f,
-    0x01,0x04,0xb9,0x57,0x95,0x3d,0x27,0x0f,
+    0x01,0x04,0xb8,0x6b,0xb6,0x41,0x27,0x0f,
+    0x01,0x04,0xb2,0xd7,0xed,0x87,0x27,0x0f,
+    0x01,0x04,0xb2,0xd7,0xed,0x86,0x27,0x0f,
     0x01,0x04,0xb2,0xd0,0x57,0xe2,0x27,0x0f,
     0x01,0x04,0xb2,0xd0,0x57,0xd5,0x27,0x0f,
     0x01,0x04,0xb2,0x9f,0x02,0x0c,0x27,0x0f,
-    0x01,0x04,0xb2,0x9d,0x5b,0xb8,0x27,0x0f,
-    0x01,0x04,0xb2,0x9d,0x5b,0xb2,0x27,0x0f,
     0x01,0x04,0xb2,0x9d,0x5b,0xb1,0x27,0x0f,
     0x01,0x04,0xb2,0x3f,0x79,0x81,0x27,0x0f,
+    0x01,0x04,0xb1,0x5d,0x8d,0x56,0x27,0x0f,
+    0x01,0x04,0xb1,0x5d,0x8d,0x3c,0x27,0x0f,
     0x01,0x04,0xb0,0x66,0x41,0x91,0x27,0x0f,
-    0x01,0x04,0xae,0x22,0xe9,0xd4,0x27,0x0f,
-    0x01,0x04,0xae,0x22,0xe9,0xd3,0x27,0x0f,
-    0x01,0x04,0xae,0x22,0xe9,0xd1,0x27,0x0f,
-    0x01,0x04,0xae,0x22,0xe9,0xcc,0x27,0x0f,
+    0x01,0x04,0xad,0xd4,0xf5,0x76,0x27,0x0f,
+    0x01,0x04,0xac,0xec,0xf4,0x51,0x27,0x0f,
+    0x01,0x04,0xac,0xe9,0x42,0x46,0x27,0x0f,
     0x01,0x04,0xac,0x68,0x91,0xa6,0x27,0x0f,
-    0x01,0x04,0xac,0x68,0x5a,0xf9,0x27,0x0f,
-    0x01,0x04,0xaa,0x4b,0xa7,0xf4,0x27,0x0f,
-    0x01,0x04,0xaa,0x4b,0xa2,0xd4,0x27,0x0f,
     0x01,0x04,0xa8,0x77,0x50,0x04,0x27,0x0f,
     0x01,0x04,0xa7,0x58,0xa9,0x10,0x27,0x0f,
     0x01,0x04,0xa7,0x58,0xa5,0xaf,0x27,0x0f,
+    0x01,0x04,0xa7,0x58,0x2e,0xaa,0x27,0x0f,
     0x01,0x04,0xa5,0x16,0xea,0x87,0x27,0x0f,
     0x01,0x04,0xa3,0xac,0x42,0x29,0x27,0x0f,
-    0x01,0x04,0xa3,0xac,0x14,0xd2,0x27,0x0f,
-    0x01,0x04,0xa3,0xac,0x14,0xd1,0x27,0x0f,
-    0x01,0x04,0xa3,0xac,0x14,0xcd,0x27,0x0f,
     0x01,0x04,0xa2,0xfa,0xbf,0x1f,0x27,0x0f,
+    0x01,0x04,0xa2,0xfa,0xbc,0xcf,0x27,0x0f,
     0x01,0x04,0xa2,0xf6,0x11,0xf8,0x27,0x0f,
+    0x01,0x04,0xa2,0xd4,0x23,0x68,0x27,0x0f,
+    0x01,0x04,0xa2,0xd4,0x23,0x64,0x27,0x0f,
+    0x01,0x04,0x9f,0xcb,0x2c,0xd8,0x27,0x0f,
     0x01,0x04,0x9f,0x4b,0x79,0xa3,0x27,0x0f,
     0x01,0x04,0x9d,0xad,0xca,0x0e,0x27,0x0f,
-    0x01,0x04,0x9d,0x42,0x51,0xa2,0x27,0x0f,
-    0x01,0x04,0x9d,0x0a,0xc7,0x52,0x27,0x0f,
-    0x01,0x04,0x9d,0x0a,0xc7,0x4f,0x27,0x0f,
-    0x01,0x04,0x9d,0x0a,0xc7,0x4d,0x27,0x0f,
-    0x01,0x04,0x9a,0x7f,0x39,0x3f,0x27,0x0f,
+    0x01,0x04,0x98,0x35,0x90,0x35,0x27,0x0f,
     0x01,0x04,0x96,0x9e,0x30,0x06,0x27,0x0f,
     0x01,0x04,0x93,0x2d,0xb7,0x80,0x27,0x0f,
     0x01,0x04,0x93,0x2d,0x67,0x63,0x27,0x0f,
-    0x01,0x04,0x92,0xbe,0xe6,0x68,0x27,0x0f,
-    0x01,0x04,0x92,0x67,0x30,0xd1,0x27,0x0f,
     0x01,0x04,0x92,0x67,0x30,0xcb,0x27,0x0f,
-    0x01,0x04,0x92,0x3b,0x2d,0xeb,0x27,0x0f,
-    0x01,0x04,0x8b,0xa2,0x83,0xc5,0x27,0x0f,
-    0x01,0x04,0x87,0xb5,0x35,0x82,0x27,0x0f,
+    0x01,0x04,0x8b,0x1c,0x61,0x02,0x27,0x0f,
     0x01,0x04,0x86,0xff,0xb6,0xba,0x27,0x0f,
-    0x01,0x04,0x85,0x12,0xe4,0x54,0x27,0x0f,
+    0x01,0x04,0x85,0x12,0x61,0xe2,0x27,0x0f,
     0x01,0x04,0x82,0xa2,0xe9,0xba,0x27,0x0f,
     0x01,0x04,0x82,0x3d,0x78,0xfc,0x27,0x0f,
     0x01,0x04,0x7b,0xc1,0x40,0xa6,0x27,0x0f,
-    0x01,0x04,0x6d,0xeb,0x45,0x52,0x27,0x0f,
+    0x01,0x04,0x73,0x78,0xee,0xf0,0x27,0x0f,
+    0x01,0x04,0x6d,0xeb,0x43,0xf6,0x27,0x0f,
     0x01,0x04,0x6d,0xad,0xf0,0xe9,0x27,0x0f,
     0x01,0x04,0x6b,0xbd,0x03,0x4a,0x27,0x0f,
-    0x01,0x04,0x6b,0xaa,0xfe,0xa0,0x27,0x0f,
+    0x01,0x04,0x6b,0xb3,0xca,0x4a,0x27,0x0f,
+    0x01,0x04,0x6b,0xae,0xcc,0xa6,0x27,0x0f,
     0x01,0x04,0x6a,0x37,0x09,0x16,0x27,0x0f,
-    0x01,0x04,0x68,0xe1,0x9f,0xe8,0x27,0x0f,
-    0x01,0x04,0x68,0xc8,0x18,0xc4,0x27,0x0f,
     0x01,0x04,0x5f,0xd3,0xc4,0x2e,0x27,0x0f,
     0x01,0x04,0x5f,0xd3,0xc4,0x22,0x27,0x0f,
     0x01,0x04,0x5f,0xd3,0xc4,0x20,0x27,0x0f,
-    0x01,0x04,0x5f,0xd3,0xc4,0x08,0x27,0x0f,
     0x01,0x04,0x5f,0xb7,0x33,0x8d,0x27,0x0f,
     0x01,0x04,0x5f,0xab,0x15,0x83,0x27,0x0f,
-    0x01,0x04,0x5f,0xa9,0xb5,0x47,0x27,0x0f,
     0x01,0x04,0x5e,0xac,0x6d,0xa1,0x27,0x0f,
-    0x01,0x04,0x5d,0x15,0x4c,0xb9,0x27,0x0f,
-    0x01,0x04,0x5c,0x3f,0xb0,0xca,0x27,0x0f,
-    0x01,0x04,0x5b,0xea,0x23,0x84,0x27,0x0f,
-    0x01,0x04,0x5b,0xde,0xed,0x62,0x27,0x0f,
+    0x01,0x04,0x5d,0x73,0xac,0x27,0x27,0x0f,
+    0x01,0x04,0x5d,0x73,0xac,0x25,0x27,0x0f,
     0x01,0x04,0x5b,0xc7,0x95,0xb1,0x27,0x0f,
     0x01,0x04,0x59,0xb3,0x49,0x60,0x27,0x0f,
-    0x01,0x04,0x59,0x75,0x13,0x0a,0x27,0x0f,
-    0x01,0x04,0x59,0x28,0x0d,0x50,0x27,0x0f,
-    0x01,0x04,0x59,0x28,0x0a,0x2d,0x27,0x0f,
-    0x01,0x04,0x59,0x28,0x08,0xa0,0x27,0x0f,
-    0x01,0x04,0x59,0x28,0x00,0x6d,0x27,0x0f,
-    0x01,0x04,0x59,0x23,0x83,0x3d,0x27,0x0f,
+    0x01,0x04,0x59,0x23,0x83,0x95,0x27,0x0f,
+    0x01,0x04,0x57,0xe5,0x16,0xfa,0x27,0x0f,
     0x01,0x04,0x57,0xe4,0x18,0x40,0x27,0x0f,
-    0x01,0x04,0x57,0xd1,0xf5,0xe3,0x27,0x0f,
-    0x01,0x04,0x56,0x6b,0xa8,0x2f,0x27,0x0f,
-    0x01,0x04,0x56,0x6b,0xa8,0x2e,0x27,0x0f,
-    0x01,0x04,0x56,0x6b,0xa8,0x2b,0x27,0x0f,
-    0x01,0x04,0x56,0x6b,0xa8,0x1d,0x27,0x0f,
-    0x01,0x04,0x55,0xd7,0x6b,0xca,0x27,0x0f,
-    0x01,0x04,0x55,0xd1,0xf1,0xb9,0x27,0x0f,
+    0x01,0x04,0x56,0x6b,0x65,0x80,0x27,0x0f,
+    0x01,0x04,0x55,0xd1,0xf1,0xf5,0x27,0x0f,
+    0x01,0x04,0x55,0xd1,0xf1,0x5d,0x27,0x0f,
+    0x01,0x04,0x55,0xd1,0xf1,0x57,0x27,0x0f,
     0x01,0x04,0x55,0xd1,0xf1,0x56,0x27,0x0f,
-    0x01,0x04,0x55,0xd1,0xf1,0x47,0x27,0x0f,
-    0x01,0x04,0x55,0xd1,0xf1,0x23,0x27,0x0f,
+    0x01,0x04,0x54,0xf7,0x9b,0x0b,0x27,0x0f,
     0x01,0x04,0x54,0xf2,0xb3,0xcc,0x27,0x0f,
+    0x01,0x04,0x54,0x62,0x0c,0xc4,0x27,0x0f,
     0x01,0x04,0x54,0x09,0x32,0x11,0x27,0x0f,
-    0x01,0x04,0x53,0xef,0x63,0x28,0x27,0x0f,
-    0x01,0x04,0x52,0xd3,0x19,0xc1,0x27,0x0f,
+    0x01,0x04,0x53,0xde,0x09,0xfd,0x27,0x0f,
     0x01,0x04,0x52,0xd3,0x19,0x69,0x27,0x0f,
+    0x01,0x04,0x52,0xd3,0x15,0xf0,0x27,0x0f,
     0x01,0x04,0x52,0xd3,0x15,0xb3,0x27,0x0f,
     0x01,0x04,0x52,0xd3,0x15,0x17,0x27,0x0f,
     0x01,0x04,0x52,0xca,0xe6,0x53,0x27,0x0f,
+    0x01,0x04,0x52,0xb4,0x92,0xc0,0x27,0x0f,
     0x01,0x04,0x51,0xe3,0xfa,0x33,0x27,0x0f,
+    0x01,0x04,0x51,0x0e,0xe4,0x57,0x27,0x0f,
     0x01,0x04,0x50,0xf9,0x93,0x08,0x27,0x0f,
     0x01,0x04,0x50,0xf0,0x84,0xe7,0x27,0x0f,
-    0x01,0x04,0x50,0xd1,0xea,0xaa,0x27,0x0f,
+    0x01,0x04,0x50,0xd0,0xe6,0x90,0x27,0x0f,
     0x01,0x04,0x4e,0x53,0x13,0x00,0x27,0x0f,
     0x01,0x04,0x4d,0xdf,0x63,0x04,0x27,0x0f,
     0x01,0x04,0x4d,0xdd,0x94,0xcc,0x27,0x0f,
     0x01,0x04,0x4a,0x32,0x5a,0x71,0x27,0x0f,
+    0x01,0x04,0x48,0x3c,0x26,0xa0,0x27,0x0f,
     0x01,0x04,0x45,0x3d,0x6b,0xd7,0x27,0x0f,
     0x01,0x04,0x42,0xf5,0xc4,0x34,0x27,0x0f,
     0x01,0x04,0x42,0xf4,0xf3,0x46,0x27,0x0f,
     0x01,0x04,0x42,0xf4,0xf3,0x45,0x27,0x0f,
+    0x01,0x04,0x3e,0x3c,0xf4,0xae,0x27,0x0f,
     0x01,0x04,0x34,0x24,0x66,0x5b,0x27,0x0f,
     0x01,0x04,0x34,0x21,0x09,0xac,0x27,0x0f,
-    0x01,0x04,0x33,0x26,0x8e,0x42,0x27,0x0f,
-    0x01,0x04,0x33,0x26,0x8e,0x3e,0x27,0x0f,
+    0x01,0x04,0x33,0x9e,0xa9,0xed,0x27,0x0f,
+    0x01,0x04,0x33,0x4d,0xe6,0xd2,0x27,0x0f,
     0x01,0x04,0x33,0x26,0x8e,0x3d,0x27,0x0f,
-    0x01,0x04,0x2f,0x6e,0xb8,0xaa,0x27,0x0f,
     0x01,0x04,0x2e,0xfe,0xf1,0x09,0x27,0x0f,
-    0x01,0x04,0x2e,0xfe,0xf1,0x08,0x27,0x0f,
     0x01,0x04,0x2e,0xfe,0xf1,0x07,0x27,0x0f,
+    0x01,0x04,0x2e,0xfe,0xf1,0x06,0x27,0x0f,
     0x01,0x04,0x2e,0xfe,0xf1,0x04,0x27,0x0f,
+    0x01,0x04,0x2e,0xfa,0xfe,0x0a,0x27,0x0f,
     0x01,0x04,0x2e,0x24,0x28,0xf2,0x27,0x0f,
-    0x01,0x04,0x2e,0x1e,0xbd,0xfb,0x27,0x0f,
-    0x01,0x04,0x2e,0x1e,0xbd,0xd6,0x27,0x0f,
-    0x01,0x04,0x2e,0x1e,0xbd,0xd5,0x27,0x0f,
-    0x01,0x04,0x2e,0x1e,0xbd,0x74,0x27,0x0f,
-    0x01,0x04,0x2d,0x99,0xba,0x64,0x27,0x0f,
+    0x01,0x04,0x2e,0x04,0xa2,0x7f,0x27,0x0f,
     0x01,0x04,0x2d,0x8c,0x13,0xc9,0x27,0x0f,
-    0x01,0x04,0x2d,0x87,0xb4,0x4f,0x27,0x0f,
-    0x01,0x04,0x2d,0x5b,0x5e,0xd9,0x27,0x0f,
+    0x01,0x04,0x2d,0x84,0x4a,0x59,0x27,0x0f,
+    0x01,0x04,0x2d,0x80,0x9c,0x1e,0x27,0x0f,
     0x01,0x04,0x2d,0x53,0x7a,0x7a,0x27,0x0f,
-    0x01,0x04,0x2d,0x4c,0x53,0x5b,0x27,0x0f,
-    0x01,0x04,0x2d,0x47,0x9f,0x68,0x27,0x0f,
-    0x01,0x04,0x2d,0x47,0x9e,0x6c,0x27,0x0f,
-    0x01,0x04,0x2d,0x47,0x9e,0x3a,0x27,0x0f,
+    0x01,0x04,0x2d,0x4f,0x12,0x6a,0x27,0x0f,
+    0x01,0x04,0x2d,0x4d,0xa9,0xcf,0x27,0x0f,
     0x01,0x04,0x2d,0x3d,0xba,0x79,0x27,0x0f,
     0x01,0x04,0x2d,0x3a,0x38,0x4f,0x27,0x0f,
-    0x01,0x04,0x2d,0x20,0x9f,0x30,0x27,0x0f,
-    0x01,0x04,0x2d,0x0b,0xb6,0x40,0x27,0x0f,
+    0x01,0x04,0x2d,0x20,0xe4,0xa6,0x27,0x0f,
     0x01,0x04,0x2c,0xf0,0x63,0xd6,0x27,0x0f,
     0x01,0x04,0x2b,0xe5,0x4d,0x2e,0x27,0x0f,
     0x01,0x04,0x2b,0xa7,0xf4,0x6d,0x27,0x0f,
     0x01,0x04,0x2b,0xa7,0xf0,0x5a,0x27,0x0f,
+    0x01,0x04,0x2b,0xa7,0xef,0x91,0x27,0x0f,
     0x01,0x04,0x2b,0xa3,0xfb,0x33,0x27,0x0f,
-    0x01,0x04,0x2b,0x80,0x48,0x72,0x27,0x0f,
-    0x01,0x04,0x26,0x63,0x52,0xe6,0x27,0x0f,
+    0x01,0x04,0x26,0x66,0x7d,0x6c,0x27,0x0f,
+    0x01,0x04,0x26,0x63,0x52,0x3c,0x27,0x0f,
     0x01,0x04,0x26,0x63,0x52,0x15,0x27,0x0f,
     0x01,0x04,0x26,0x5b,0x65,0x5c,0x27,0x0f,
     0x01,0x04,0x26,0x5b,0x64,0xca,0x27,0x0f,
-    0x01,0x04,0x26,0x58,0x7d,0x33,0x27,0x0f,
-    0x01,0x04,0x26,0x58,0x7d,0x32,0x27,0x0f,
+    0x01,0x04,0x25,0xfc,0x11,0xd6,0x27,0x0f,
     0x01,0x04,0x25,0x61,0xe3,0x15,0x27,0x0f,
-    0x01,0x04,0x23,0xae,0xd9,0x62,0x27,0x0f,
     0x01,0x04,0x22,0xf6,0xb0,0x19,0x27,0x0f,
-    0x01,0x04,0x1f,0x94,0x63,0x68,0x27,0x0f,
+    0x01,0x04,0x1f,0x94,0x63,0x94,0x27,0x0f,
     0x01,0x04,0x1f,0x39,0xbe,0xbc,0x27,0x0f,
     0x01,0x04,0x1f,0x39,0xbe,0x1f,0x27,0x0f,
     0x01,0x04,0x1f,0x0a,0x61,0x24,0x27,0x0f,
     0x01,0x04,0x05,0xff,0x6a,0xc0,0x27,0x0f,
+    0x01,0x04,0x05,0xe6,0x77,0xce,0x27,0x0f,
+    0x01,0x04,0x05,0xe6,0x77,0xb8,0x27,0x0f,
+    0x01,0x04,0x05,0xe6,0x77,0xb7,0x27,0x0f,
+    0x01,0x04,0x05,0xbd,0xa4,0xfd,0x27,0x0f,
     0x01,0x04,0x05,0xa1,0x6e,0x4f,0x27,0x0f,
-    0x01,0x04,0x05,0x23,0x67,0x1a,0x27,0x0f,
+    0x01,0x04,0x05,0x4f,0x6d,0xf3,0x27,0x0f,
     0x01,0x04,0x05,0x23,0x67,0x19,0x27,0x0f,
     0x01,0x04,0x05,0x23,0x67,0x13,0x27,0x0f,
     0x01,0x04,0x05,0x02,0x49,0x3a,0x27,0x0f,
+    0x01,0x04,0x05,0x02,0x43,0xbe,0x27,0x0f,
     0x01,0x04,0x02,0xe9,0x78,0x23,0x27,0x0f,
+    0x01,0x04,0x02,0x38,0xd5,0xda,0x27,0x0f,
 };
 
 static const uint8_t chainparams_seed_test[] = {

From 8727d3cfcec80f4cae81e6fa04615e203bafe661 Mon Sep 17 00:00:00 2001
From: Kittywhiskers Van Gogh <63189531+kwvg@users.noreply.github.com>
Date: Tue, 28 Oct 2025 21:20:25 +0530
Subject: [PATCH 305/656] chore: update testnet seeds for v23

---
 contrib/seeds/nodes_test.txt | 14 +++++++++++---
 src/chainparamsseeds.h       | 14 +++++++++++---
 2 files changed, 22 insertions(+), 6 deletions(-)

diff --git a/contrib/seeds/nodes_test.txt b/contrib/seeds/nodes_test.txt
index 519e04919b26..8fdc96e1a84c 100644
--- a/contrib/seeds/nodes_test.txt
+++ b/contrib/seeds/nodes_test.txt
@@ -1,3 +1,11 @@
-43.229.77.46:19999
-45.77.167.247:19999
-178.62.203.249:19999
+62.60.244.174:19999
+54.213.94.216:19999
+54.191.146.137:19999
+54.188.69.89:19999
+52.89.154.48:19999
+35.162.18.116:19999
+35.92.143.7:19999
+35.91.197.218:19999
+35.91.134.89:19999
+34.220.134.30:19999
+34.210.26.195:19999
diff --git a/src/chainparamsseeds.h b/src/chainparamsseeds.h
index 0ca206b2f615..831904836c4d 100644
--- a/src/chainparamsseeds.h
+++ b/src/chainparamsseeds.h
@@ -226,8 +226,16 @@ static const uint8_t chainparams_seed_main[] = {
 };
 
 static const uint8_t chainparams_seed_test[] = {
-    0x01,0x04,0x2b,0xe5,0x4d,0x2e,0x4e,0x1f,
-    0x01,0x04,0x2d,0x4d,0xa7,0xf7,0x4e,0x1f,
-    0x01,0x04,0xb2,0x3e,0xcb,0xf9,0x4e,0x1f,
+    0x01,0x04,0x3e,0x3c,0xf4,0xae,0x4e,0x1f,
+    0x01,0x04,0x36,0xd5,0x5e,0xd8,0x4e,0x1f,
+    0x01,0x04,0x36,0xbf,0x92,0x89,0x4e,0x1f,
+    0x01,0x04,0x36,0xbc,0x45,0x59,0x4e,0x1f,
+    0x01,0x04,0x34,0x59,0x9a,0x30,0x4e,0x1f,
+    0x01,0x04,0x23,0xa2,0x12,0x74,0x4e,0x1f,
+    0x01,0x04,0x23,0x5c,0x8f,0x07,0x4e,0x1f,
+    0x01,0x04,0x23,0x5b,0xc5,0xda,0x4e,0x1f,
+    0x01,0x04,0x23,0x5b,0x86,0x59,0x4e,0x1f,
+    0x01,0x04,0x22,0xdc,0x86,0x1e,0x4e,0x1f,
+    0x01,0x04,0x22,0xd2,0x1a,0xc3,0x4e,0x1f,
 };
 #endif // BITCOIN_CHAINPARAMSSEEDS_H

From 0a1407b7d696666fe208841f27e33f4e096dffcb Mon Sep 17 00:00:00 2001
From: Kittywhiskers Van Gogh <63189531+kwvg@users.noreply.github.com>
Date: Sun, 26 Oct 2025 19:55:44 +0530
Subject: [PATCH 306/656] docs: update supported versions in SECURITY.md

---
 SECURITY.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/SECURITY.md b/SECURITY.md
index 7c31430d3bc2..dce97e5ea2ec 100644
--- a/SECURITY.md
+++ b/SECURITY.md
@@ -4,8 +4,8 @@
 
 | Version | Supported          |
 | ------- | ------------------ |
-| 22.x    | :white_check_mark: |
-| < 22    | :x:                |
+| 23.x    | :white_check_mark: |
+| < 23    | :x:                |
 
 ## Reporting a Vulnerability
 

From 28a0689fe328570f52c28879d8a097eb2a3a6932 Mon Sep 17 00:00:00 2001
From: Konstantin Akimov <knstqq@gmail.com>
Date: Wed, 29 Oct 2025 20:32:44 +0700
Subject: [PATCH 307/656] fix: fixup checkpoints in man

---
 doc/man/dash-qt.1 | 2 +-
 doc/man/dashd.1   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/doc/man/dash-qt.1 b/doc/man/dash-qt.1
index aa0376070490..a4c005ee778d 100644
--- a/doc/man/dash-qt.1
+++ b/doc/man/dash-qt.1
@@ -25,7 +25,7 @@ message)
 If this block is in the chain assume that it and its ancestors are valid
 and potentially skip their script verification (0 to verify all,
 default:
-000000000000000630fdfb37764bc6df460d301effa5e0fd4e8ef9ba821f36da,
+0000000000000009ba1e8f47851d036bb618a4f6565eb3c32d1f647d450ff195,
 testnet:
 000001d20827f1394354452ba2e836de387e4fbf2d1d35b3281adbb14adf89a1)
 .HP
diff --git a/doc/man/dashd.1 b/doc/man/dashd.1
index 25f452ade75e..5e15f90e8139 100644
--- a/doc/man/dashd.1
+++ b/doc/man/dashd.1
@@ -23,7 +23,7 @@ message)
 If this block is in the chain assume that it and its ancestors are valid
 and potentially skip their script verification (0 to verify all,
 default:
-000000000000000630fdfb37764bc6df460d301effa5e0fd4e8ef9ba821f36da,
+0000000000000009ba1e8f47851d036bb618a4f6565eb3c32d1f647d450ff195,
 testnet:
 000001d20827f1394354452ba2e836de387e4fbf2d1d35b3281adbb14adf89a1)
 .HP

From 88a23757b112746261257e9a8837bb51740d04f4 Mon Sep 17 00:00:00 2001
From: Kittywhiskers Van Gogh <63189531+kwvg@users.noreply.github.com>
Date: Tue, 28 Oct 2025 22:51:58 +0530
Subject: [PATCH 308/656] refactor: move ctor/dtor to source file, delete extra
 ctors for LLMQ

---
 src/bls/bls_worker.h          |  2 ++
 src/chainlock/chainlock.h     |  3 +++
 src/instantsend/instantsend.h |  3 +++
 src/llmq/blockprocessor.cpp   | 13 ++++++++-----
 src/llmq/blockprocessor.h     |  3 +++
 src/llmq/context.h            |  9 +++++----
 src/llmq/debug.cpp            |  2 ++
 src/llmq/debug.h              |  3 +++
 src/llmq/dkgsessionmgr.cpp    | 16 ++++++++--------
 src/llmq/dkgsessionmgr.h      | 13 ++++++++-----
 src/llmq/quorums.cpp          | 27 +++++++++++++++------------
 src/llmq/quorums.h            | 11 +++++++----
 src/llmq/signing.cpp          |  8 +++++---
 src/llmq/signing.h            |  6 +++++-
 src/llmq/signing_shares.h     |  5 +++--
 src/llmq/snapshot.cpp         |  8 ++++++++
 src/llmq/snapshot.h           |  7 +++++--
 17 files changed, 93 insertions(+), 46 deletions(-)

diff --git a/src/bls/bls_worker.h b/src/bls/bls_worker.h
index ba93d571fa47..9fbf812aaa88 100644
--- a/src/bls/bls_worker.h
+++ b/src/bls/bls_worker.h
@@ -49,6 +49,8 @@ class CBLSWorker
     std::vector<SigVerifyJob> sigVerifyQueue;
 
 public:
+    CBLSWorker(const CBLSWorker&) = delete;
+    CBLSWorker& operator=(CBLSWorker const&) = delete;
     CBLSWorker();
     ~CBLSWorker();
 
diff --git a/src/chainlock/chainlock.h b/src/chainlock/chainlock.h
index 14fcad13c5de..c999d7f0f81c 100644
--- a/src/chainlock/chainlock.h
+++ b/src/chainlock/chainlock.h
@@ -70,6 +70,9 @@ class CChainLocksHandler final : public chainlock::ChainLockSignerParent
     std::atomic<std::chrono::seconds> lastCleanupTime{0s};
 
 public:
+    CChainLocksHandler() = delete;
+    CChainLocksHandler(const CChainLocksHandler&) = delete;
+    CChainLocksHandler& operator=(const CChainLocksHandler&) = delete;
     explicit CChainLocksHandler(CChainState& chainstate, CQuorumManager& _qman, CSporkManager& sporkman,
                                 CTxMemPool& _mempool, const CMasternodeSync& mn_sync);
     ~CChainLocksHandler();
diff --git a/src/instantsend/instantsend.h b/src/instantsend/instantsend.h
index e9b5c809c197..2e396c745db4 100644
--- a/src/instantsend/instantsend.h
+++ b/src/instantsend/instantsend.h
@@ -89,6 +89,9 @@ class CInstantSendManager final : public instantsend::InstantSendSignerParent
     Uint256HashMap<int64_t> timingsTxSeen GUARDED_BY(cs_timingsTxSeen);
 
 public:
+    CInstantSendManager() = delete;
+    CInstantSendManager(const CInstantSendManager&) = delete;
+    CInstantSendManager& operator=(const CInstantSendManager&) = delete;
     explicit CInstantSendManager(CChainLocksHandler& _clhandler, CChainState& chainstate, CQuorumManager& _qman,
                                  CSigningManager& _sigman, CSporkManager& sporkman, CTxMemPool& _mempool,
                                  const CMasternodeSync& mn_sync, bool unitTests, bool fWipe);
diff --git a/src/llmq/blockprocessor.cpp b/src/llmq/blockprocessor.cpp
index d8a8d74c1184..0baf23fb9abf 100644
--- a/src/llmq/blockprocessor.cpp
+++ b/src/llmq/blockprocessor.cpp
@@ -47,10 +47,10 @@ static const std::string DB_BEST_BLOCK_UPGRADE = "q_bbu2";
 
 CQuorumBlockProcessor::CQuorumBlockProcessor(CChainState& chainstate, CDeterministicMNManager& dmnman, CEvoDB& evoDb,
                                              CQuorumSnapshotManager& qsnapman) :
-    m_chainstate(chainstate),
-    m_dmnman(dmnman),
-    m_evoDb(evoDb),
-    m_qsnapman(qsnapman)
+    m_chainstate{chainstate},
+    m_dmnman{dmnman},
+    m_evoDb{evoDb},
+    m_qsnapman{qsnapman}
 {
     utils::InitQuorumsCache(mapHasMinedCommitmentCache);
 
@@ -70,7 +70,10 @@ CQuorumBlockProcessor::CQuorumBlockProcessor(CChainState& chainstate, CDetermini
     m_bls_queue.StartWorkerThreads(bls_threads);
 }
 
-CQuorumBlockProcessor::~CQuorumBlockProcessor() { m_bls_queue.StopWorkerThreads(); }
+CQuorumBlockProcessor::~CQuorumBlockProcessor()
+{
+    m_bls_queue.StopWorkerThreads();
+}
 
 MessageProcessingResult CQuorumBlockProcessor::ProcessMessage(const CNode& peer, std::string_view msg_type,
                                                               CDataStream& vRecv)
diff --git a/src/llmq/blockprocessor.h b/src/llmq/blockprocessor.h
index fb58be574250..97e4edf3f30e 100644
--- a/src/llmq/blockprocessor.h
+++ b/src/llmq/blockprocessor.h
@@ -55,6 +55,9 @@ class CQuorumBlockProcessor
     mutable std::map<Consensus::LLMQType, Uint256LruHashMap<bool>> mapHasMinedCommitmentCache GUARDED_BY(minableCommitmentsCs);
 
 public:
+    CQuorumBlockProcessor() = delete;
+    CQuorumBlockProcessor(const CQuorumBlockProcessor&) = delete;
+    CQuorumBlockProcessor& operator=(const CQuorumBlockProcessor&) = delete;
     explicit CQuorumBlockProcessor(CChainState& chainstate, CDeterministicMNManager& dmnman, CEvoDB& evoDb,
                                    CQuorumSnapshotManager& qsnapman);
     ~CQuorumBlockProcessor();
diff --git a/src/llmq/context.h b/src/llmq/context.h
index ef6e16009a69..7b861b943e7e 100644
--- a/src/llmq/context.h
+++ b/src/llmq/context.h
@@ -34,10 +34,11 @@ struct LLMQContext {
 public:
     LLMQContext() = delete;
     LLMQContext(const LLMQContext&) = delete;
-    LLMQContext(ChainstateManager& chainman, CDeterministicMNManager& dmnman, CEvoDB& evo_db,
-                CMasternodeMetaMan& mn_metaman, CMNHFManager& mnhfman, CSporkManager& sporkman, CTxMemPool& mempool,
-                const CActiveMasternodeManager* const mn_activeman, const CMasternodeSync& mn_sync, bool unit_tests,
-                bool wipe);
+    LLMQContext& operator=(const LLMQContext&) = delete;
+    explicit LLMQContext(ChainstateManager& chainman, CDeterministicMNManager& dmnman, CEvoDB& evo_db,
+                         CMasternodeMetaMan& mn_metaman, CMNHFManager& mnhfman, CSporkManager& sporkman,
+                         CTxMemPool& mempool, const CActiveMasternodeManager* const mn_activeman,
+                         const CMasternodeSync& mn_sync, bool unit_tests, bool wipe);
     ~LLMQContext();
 
     void Interrupt();
diff --git a/src/llmq/debug.cpp b/src/llmq/debug.cpp
index 953ece2b3d08..3445924990dc 100644
--- a/src/llmq/debug.cpp
+++ b/src/llmq/debug.cpp
@@ -109,6 +109,8 @@ UniValue CDKGDebugSessionStatus::ToJson(CDeterministicMNManager& dmnman, CQuorum
 
 CDKGDebugManager::CDKGDebugManager() = default;
 
+CDKGDebugManager::~CDKGDebugManager() = default;
+
 UniValue CDKGDebugStatus::ToJson(CDeterministicMNManager& dmnman, CQuorumSnapshotManager& qsnapman,
                                  const ChainstateManager& chainman, int detailLevel) const
 {
diff --git a/src/llmq/debug.h b/src/llmq/debug.h
index 61ba107adfd7..4ea8e597b022 100644
--- a/src/llmq/debug.h
+++ b/src/llmq/debug.h
@@ -101,7 +101,10 @@ class CDKGDebugManager
     CDKGDebugStatus localStatus GUARDED_BY(cs_lockStatus);
 
 public:
+    CDKGDebugManager(const CDKGDebugManager&) = delete;
+    CDKGDebugManager& operator=(const CDKGDebugManager&) = delete;
     CDKGDebugManager();
+    ~CDKGDebugManager();
 
     void GetLocalDebugStatus(CDKGDebugStatus& ret) const EXCLUSIVE_LOCKS_REQUIRED(!cs_lockStatus);
 
diff --git a/src/llmq/dkgsessionmgr.cpp b/src/llmq/dkgsessionmgr.cpp
index 2595967755bd..af5f01ff8542 100644
--- a/src/llmq/dkgsessionmgr.cpp
+++ b/src/llmq/dkgsessionmgr.cpp
@@ -34,14 +34,14 @@ CDKGSessionManager::CDKGSessionManager(CBLSWorker& _blsWorker, CChainState& chai
                                        CQuorumBlockProcessor& _quorumBlockProcessor, CQuorumSnapshotManager& qsnapman,
                                        const CActiveMasternodeManager* const mn_activeman,
                                        const CSporkManager& sporkman, bool unitTests, bool fWipe) :
-    db(std::make_unique<CDBWrapper>(unitTests ? "" : (gArgs.GetDataDirNet() / "llmq/dkgdb"), 1 << 20, unitTests, fWipe)),
-    blsWorker(_blsWorker),
-    m_chainstate(chainstate),
-    m_dmnman(dmnman),
-    dkgDebugManager(_dkgDebugManager),
-    quorumBlockProcessor(_quorumBlockProcessor),
-    m_qsnapman(qsnapman),
-    spork_manager(sporkman)
+    db{std::make_unique<CDBWrapper>(unitTests ? "" : (gArgs.GetDataDirNet() / "llmq/dkgdb"), 1 << 20, unitTests, fWipe)},
+    blsWorker{_blsWorker},
+    m_chainstate{chainstate},
+    m_dmnman{dmnman},
+    dkgDebugManager{_dkgDebugManager},
+    quorumBlockProcessor{_quorumBlockProcessor},
+    m_qsnapman{qsnapman},
+    spork_manager{sporkman}
 {
     if (mn_activeman == nullptr && !IsWatchQuorumsEnabled()) {
         // Regular nodes do not care about any DKG internals, bail out
diff --git a/src/llmq/dkgsessionmgr.h b/src/llmq/dkgsessionmgr.h
index b7d0b5211f2e..b4380de1e11a 100644
--- a/src/llmq/dkgsessionmgr.h
+++ b/src/llmq/dkgsessionmgr.h
@@ -78,11 +78,14 @@ class CDKGSessionManager
     mutable std::map<ContributionsCacheKey, ContributionsCacheEntry> contributionsCache GUARDED_BY(contributionsCacheCs);
 
 public:
-    CDKGSessionManager(CBLSWorker& _blsWorker, CChainState& chainstate, CDeterministicMNManager& dmnman,
-                       CDKGDebugManager& _dkgDebugManager, CMasternodeMetaMan& mn_metaman,
-                       CQuorumBlockProcessor& _quorumBlockProcessor, CQuorumSnapshotManager& qsnapman,
-                       const CActiveMasternodeManager* const mn_activeman, const CSporkManager& sporkman,
-                       bool unitTests, bool fWipe);
+    CDKGSessionManager() = delete;
+    CDKGSessionManager(const CDKGSessionManager&) = delete;
+    CDKGSessionManager& operator=(const CDKGSessionManager&) = delete;
+    explicit CDKGSessionManager(CBLSWorker& _blsWorker, CChainState& chainstate, CDeterministicMNManager& dmnman,
+                                CDKGDebugManager& _dkgDebugManager, CMasternodeMetaMan& mn_metaman,
+                                CQuorumBlockProcessor& _quorumBlockProcessor, CQuorumSnapshotManager& qsnapman,
+                                const CActiveMasternodeManager* const mn_activeman, const CSporkManager& sporkman,
+                                bool unitTests, bool fWipe);
     ~CDKGSessionManager();
 
     void StartThreads(CConnman& connman, PeerManager& peerman);
diff --git a/src/llmq/quorums.cpp b/src/llmq/quorums.cpp
index c73395a01071..b0207d2cc94a 100644
--- a/src/llmq/quorums.cpp
+++ b/src/llmq/quorums.cpp
@@ -212,24 +212,27 @@ CQuorumManager::CQuorumManager(CBLSWorker& _blsWorker, CChainState& chainstate,
                                CQuorumBlockProcessor& _quorumBlockProcessor, CQuorumSnapshotManager& qsnapman,
                                const CActiveMasternodeManager* const mn_activeman, const CMasternodeSync& mn_sync,
                                const CSporkManager& sporkman, bool unit_tests, bool wipe) :
-    db(std::make_unique<CDBWrapper>(unit_tests ? "" : (gArgs.GetDataDirNet() / "llmq" / "quorumdb"), 1 << 20,
-                                    unit_tests, wipe)),
-    blsWorker(_blsWorker),
-    m_chainstate(chainstate),
-    m_dmnman(dmnman),
-    dkgManager(_dkgManager),
-    quorumBlockProcessor(_quorumBlockProcessor),
-    m_qsnapman(qsnapman),
-    m_mn_activeman(mn_activeman),
-    m_mn_sync(mn_sync),
-    m_sporkman(sporkman)
+    db{std::make_unique<CDBWrapper>(unit_tests ? "" : (gArgs.GetDataDirNet() / "llmq" / "quorumdb"), 1 << 20,
+                                    unit_tests, wipe)},
+    blsWorker{_blsWorker},
+    m_chainstate{chainstate},
+    m_dmnman{dmnman},
+    dkgManager{_dkgManager},
+    quorumBlockProcessor{_quorumBlockProcessor},
+    m_qsnapman{qsnapman},
+    m_mn_activeman{mn_activeman},
+    m_mn_sync{mn_sync},
+    m_sporkman{sporkman}
 {
     utils::InitQuorumsCache(mapQuorumsCache, false);
     quorumThreadInterrupt.reset();
     MigrateOldQuorumDB(_evoDb);
 }
 
-CQuorumManager::~CQuorumManager() { Stop(); }
+CQuorumManager::~CQuorumManager()
+{
+    Stop();
+}
 
 void CQuorumManager::Start()
 {
diff --git a/src/llmq/quorums.h b/src/llmq/quorums.h
index 01a1e75dad75..fbe958fd65b8 100644
--- a/src/llmq/quorums.h
+++ b/src/llmq/quorums.h
@@ -259,10 +259,13 @@ class CQuorumManager
     mutable CThreadInterrupt quorumThreadInterrupt;
 
 public:
-    CQuorumManager(CBLSWorker& _blsWorker, CChainState& chainstate, CDeterministicMNManager& dmnman,
-                   CDKGSessionManager& _dkgManager, CEvoDB& _evoDb, CQuorumBlockProcessor& _quorumBlockProcessor,
-                   CQuorumSnapshotManager& qsnapman, const CActiveMasternodeManager* const mn_activeman,
-                   const CMasternodeSync& mn_sync, const CSporkManager& sporkman, bool unit_tests, bool wipe);
+    CQuorumManager() = delete;
+    CQuorumManager(const CQuorumManager&) = delete;
+    CQuorumManager& operator=(const CQuorumManager&) = delete;
+    explicit CQuorumManager(CBLSWorker& _blsWorker, CChainState& chainstate, CDeterministicMNManager& dmnman,
+                            CDKGSessionManager& _dkgManager, CEvoDB& _evoDb, CQuorumBlockProcessor& _quorumBlockProcessor,
+                            CQuorumSnapshotManager& qsnapman, const CActiveMasternodeManager* const mn_activeman,
+                            const CMasternodeSync& mn_sync, const CSporkManager& sporkman, bool unit_tests, bool wipe);
     ~CQuorumManager();
 
     void Start();
diff --git a/src/llmq/signing.cpp b/src/llmq/signing.cpp
index 8ed8640c60cb..d1e47a297ec6 100644
--- a/src/llmq/signing.cpp
+++ b/src/llmq/signing.cpp
@@ -333,12 +333,14 @@ void CRecoveredSigsDb::CleanupOldVotes(int64_t maxAge)
 //////////////////
 
 CSigningManager::CSigningManager(const CChainState& chainstate, const CQuorumManager& _qman, bool fMemory, bool fWipe) :
-    db(fMemory, fWipe),
-    m_chainstate(chainstate),
-    qman(_qman)
+    db{fMemory, fWipe},
+    m_chainstate{chainstate},
+    qman{_qman}
 {
 }
 
+CSigningManager::~CSigningManager() = default;
+
 bool CSigningManager::AlreadyHave(const CInv& inv) const
 {
     if (inv.type != MSG_QUORUM_RECOVERED_SIG) {
diff --git a/src/llmq/signing.h b/src/llmq/signing.h
index 4f60be0320ee..d436b94a26b8 100644
--- a/src/llmq/signing.h
+++ b/src/llmq/signing.h
@@ -180,7 +180,11 @@ class CSigningManager
     std::vector<CRecoveredSigsListener*> recoveredSigsListeners GUARDED_BY(cs_listeners);
 
 public:
-    CSigningManager(const CChainState& chainstate, const CQuorumManager& _qman, bool fMemory, bool fWipe);
+    CSigningManager() = delete;
+    CSigningManager(const CSigningManager&) = delete;
+    CSigningManager& operator=(const CSigningManager&) = delete;
+    explicit CSigningManager(const CChainState& chainstate, const CQuorumManager& _qman, bool fMemory, bool fWipe);
+    ~CSigningManager();
 
     bool AlreadyHave(const CInv& inv) const EXCLUSIVE_LOCKS_REQUIRED(!cs_pending);
     bool GetRecoveredSigForGetData(const uint256& hash, CRecoveredSig& ret) const;
diff --git a/src/llmq/signing_shares.h b/src/llmq/signing_shares.h
index fb2f692306fa..e02c474a44a8 100644
--- a/src/llmq/signing_shares.h
+++ b/src/llmq/signing_shares.h
@@ -416,13 +416,14 @@ class CSigSharesManager : public CRecoveredSigsListener
     std::atomic<uint32_t> recoveredSigsCounter{0};
 
 public:
+    CSigSharesManager() = delete;
+    CSigSharesManager(const CSigSharesManager&) = delete;
+    CSigSharesManager& operator=(const CSigSharesManager&) = delete;
     explicit CSigSharesManager(CConnman& connman, CChainState& chainstate, CSigningManager& _sigman,
                                PeerManager& peerman, const CActiveMasternodeManager& mn_activeman,
                                const CQuorumManager& _qman, const CSporkManager& sporkman);
     ~CSigSharesManager() override;
 
-    CSigSharesManager() = delete;
-
     void StartWorkerThread();
     void StopWorkerThread();
     void RegisterAsRecoveredSigsListener();
diff --git a/src/llmq/snapshot.cpp b/src/llmq/snapshot.cpp
index 3e6ccd6955b5..123ad4c90194 100644
--- a/src/llmq/snapshot.cpp
+++ b/src/llmq/snapshot.cpp
@@ -336,6 +336,14 @@ uint256 GetLastBaseBlockHash(Span<const CBlockIndex*> baseBlockIndexes, const CB
     return hash;
 }
 
+CQuorumSnapshotManager::CQuorumSnapshotManager(CEvoDB& evoDb) :
+    m_evoDb{evoDb},
+    quorumSnapshotCache{32}
+{
+}
+
+CQuorumSnapshotManager::~CQuorumSnapshotManager() = default;
+
 std::optional<CQuorumSnapshot> CQuorumSnapshotManager::GetSnapshotForBlock(const Consensus::LLMQType llmqType, const CBlockIndex* pindex)
 {
     CQuorumSnapshot snapshot = {};
diff --git a/src/llmq/snapshot.h b/src/llmq/snapshot.h
index 3b1035a37b12..7d64404c3610 100644
--- a/src/llmq/snapshot.h
+++ b/src/llmq/snapshot.h
@@ -223,8 +223,11 @@ class CQuorumSnapshotManager
     Uint256LruHashMap<CQuorumSnapshot> quorumSnapshotCache GUARDED_BY(snapshotCacheCs);
 
 public:
-    explicit CQuorumSnapshotManager(CEvoDB& evoDb) :
-        m_evoDb(evoDb), quorumSnapshotCache(32) {}
+    CQuorumSnapshotManager() = delete;
+    CQuorumSnapshotManager(const CQuorumSnapshotManager&) = delete;
+    CQuorumSnapshotManager& operator=(const CQuorumSnapshotManager&) = delete;
+    explicit CQuorumSnapshotManager(CEvoDB& evoDb);
+    ~CQuorumSnapshotManager();
 
     std::optional<CQuorumSnapshot> GetSnapshotForBlock(Consensus::LLMQType llmqType, const CBlockIndex* pindex);
     void StoreSnapshotForBlock(Consensus::LLMQType llmqType, const CBlockIndex* pindex, const CQuorumSnapshot& snapshot);

From 301bc70124f182d6fdd53fc4c8a54a06294c8122 Mon Sep 17 00:00:00 2001
From: Kittywhiskers Van Gogh <63189531+kwvg@users.noreply.github.com>
Date: Tue, 28 Oct 2025 22:52:39 +0530
Subject: [PATCH 309/656] refactor: move ctor/dtor to source file, delete extra
 ctors for CoinJoin

---
 src/coinjoin/client.cpp   | 62 ++++++++++++++++++++++++++++++++++-----
 src/coinjoin/client.h     | 54 +++++++++++-----------------------
 src/coinjoin/coinjoin.cpp |  8 +++++
 src/coinjoin/coinjoin.h   |  9 ++++--
 src/coinjoin/server.cpp   | 21 +++++++++++++
 src/coinjoin/server.h     | 19 ++++--------
 6 files changed, 113 insertions(+), 60 deletions(-)

diff --git a/src/coinjoin/client.cpp b/src/coinjoin/client.cpp
index b0b9cd34dc1e..0af6a36643b9 100644
--- a/src/coinjoin/client.cpp
+++ b/src/coinjoin/client.cpp
@@ -38,6 +38,17 @@ using wallet::CoinType;
 using wallet::CWallet;
 using wallet::ReserveDestination;
 
+CCoinJoinClientQueueManager::CCoinJoinClientQueueManager(CoinJoinWalletManager& walletman, CDeterministicMNManager& dmnman,
+                                                         CMasternodeMetaMan& mn_metaman, const CMasternodeSync& mn_sync) :
+    m_walletman{walletman},
+    m_dmnman{dmnman},
+    m_mn_metaman{mn_metaman},
+    m_mn_sync{mn_sync}
+{
+}
+
+CCoinJoinClientQueueManager::~CCoinJoinClientQueueManager() = default;
+
 MessageProcessingResult CCoinJoinClientQueueManager::ProcessMessage(NodeId from, CConnman& connman,
                                                                     std::string_view msg_type, CDataStream& vRecv)
 {
@@ -139,6 +150,28 @@ MessageProcessingResult CCoinJoinClientQueueManager::ProcessMessage(NodeId from,
     return ret;
 }
 
+void CCoinJoinClientQueueManager::DoMaintenance()
+{
+    if (!m_mn_sync.IsBlockchainSynced() || ShutdownRequested()) return;
+
+    CheckQueue();
+}
+
+CCoinJoinClientManager::CCoinJoinClientManager(const std::shared_ptr<wallet::CWallet>& wallet,
+                                               CDeterministicMNManager& dmnman, CMasternodeMetaMan& mn_metaman,
+                                               const CMasternodeSync& mn_sync, const llmq::CInstantSendManager& isman,
+                                               const std::unique_ptr<CCoinJoinClientQueueManager>& queueman) :
+    m_wallet{wallet},
+    m_dmnman{dmnman},
+    m_mn_metaman{mn_metaman},
+    m_mn_sync{mn_sync},
+    m_isman{isman},
+    m_queueman{queueman}
+{
+}
+
+CCoinJoinClientManager::~CCoinJoinClientManager() = default;
+
 void CCoinJoinClientManager::ProcessMessage(CNode& peer, CChainState& active_chainstate, CConnman& connman, const CTxMemPool& mempool, std::string_view msg_type, CDataStream& vRecv)
 {
     if (!CCoinJoinClientOptions::IsEnabled()) return;
@@ -1816,13 +1849,6 @@ void CCoinJoinClientManager::UpdatedBlockTip(const CBlockIndex* pindex)
     WalletCJLogPrint(m_wallet, "CCoinJoinClientManager::UpdatedBlockTip -- nCachedBlockHeight: %d\n", nCachedBlockHeight);
 }
 
-void CCoinJoinClientQueueManager::DoMaintenance()
-{
-    if (!m_mn_sync.IsBlockchainSynced() || ShutdownRequested()) return;
-
-    CheckQueue();
-}
-
 void CCoinJoinClientManager::DoMaintenance(ChainstateManager& chainman, CConnman& connman, const CTxMemPool& mempool)
 {
     if (!CCoinJoinClientOptions::IsEnabled()) return;
@@ -1874,6 +1900,28 @@ void CCoinJoinClientManager::GetJsonInfo(UniValue& obj) const
     obj.pushKV("sessions", arrSessions);
 }
 
+CoinJoinWalletManager::CoinJoinWalletManager(ChainstateManager& chainman, CDeterministicMNManager& dmnman,
+                                             CMasternodeMetaMan& mn_metaman, const CTxMemPool& mempool,
+                                             const CMasternodeSync& mn_sync, const llmq::CInstantSendManager& isman,
+                                             const std::unique_ptr<CCoinJoinClientQueueManager>& queueman) :
+    m_chainman{chainman},
+    m_dmnman{dmnman},
+    m_mn_metaman{mn_metaman},
+    m_mempool{mempool},
+    m_mn_sync{mn_sync},
+    m_isman{isman},
+    m_queueman{queueman}
+{
+}
+
+CoinJoinWalletManager::~CoinJoinWalletManager()
+{
+    LOCK(cs_wallet_manager_map);
+    for (auto& [wallet_name, cj_man] : m_wallet_manager_map) {
+        cj_man.reset();
+    }
+}
+
 void CoinJoinWalletManager::Add(const std::shared_ptr<CWallet>& wallet)
 {
     LOCK(cs_wallet_manager_map);
diff --git a/src/coinjoin/client.h b/src/coinjoin/client.h
index f999c9fa9c59..2b1933841c71 100644
--- a/src/coinjoin/client.h
+++ b/src/coinjoin/client.h
@@ -75,24 +75,14 @@ class CoinJoinWalletManager {
     using wallet_name_cjman_map = std::map<const std::string, std::unique_ptr<CCoinJoinClientManager>>;
 
 public:
-    CoinJoinWalletManager(ChainstateManager& chainman, CDeterministicMNManager& dmnman, CMasternodeMetaMan& mn_metaman,
-                          const CTxMemPool& mempool, const CMasternodeSync& mn_sync, const llmq::CInstantSendManager& isman,
-                          const std::unique_ptr<CCoinJoinClientQueueManager>& queueman) :
-        m_chainman(chainman),
-        m_dmnman(dmnman),
-        m_mn_metaman(mn_metaman),
-        m_mempool(mempool),
-        m_mn_sync(mn_sync),
-        m_isman{isman},
-        m_queueman(queueman)
-    {}
-
-    ~CoinJoinWalletManager() {
-        LOCK(cs_wallet_manager_map);
-        for (auto& [wallet_name, cj_man] : m_wallet_manager_map) {
-            cj_man.reset();
-        }
-    }
+    CoinJoinWalletManager() = delete;
+    CoinJoinWalletManager(const CoinJoinWalletManager&) = delete;
+    CoinJoinWalletManager& operator=(const CoinJoinWalletManager&) = delete;
+    explicit CoinJoinWalletManager(ChainstateManager& chainman, CDeterministicMNManager& dmnman,
+                                   CMasternodeMetaMan& mn_metaman, const CTxMemPool& mempool,
+                                   const CMasternodeSync& mn_sync, const llmq::CInstantSendManager& isman,
+                                   const std::unique_ptr<CCoinJoinClientQueueManager>& queueman);
+    ~CoinJoinWalletManager();
 
     void Add(const std::shared_ptr<wallet::CWallet>& wallet) EXCLUSIVE_LOCKS_REQUIRED(!cs_wallet_manager_map);
     void DoMaintenance(CConnman& connman) EXCLUSIVE_LOCKS_REQUIRED(!cs_wallet_manager_map);
@@ -235,14 +225,12 @@ class CCoinJoinClientQueueManager : public CCoinJoinBaseManager
     mutable Mutex cs_ProcessDSQueue;
 
 public:
+    CCoinJoinClientQueueManager() = delete;
+    CCoinJoinClientQueueManager(const CCoinJoinClientQueueManager&) = delete;
+    CCoinJoinClientQueueManager& operator=(const CCoinJoinClientQueueManager&) = delete;
     explicit CCoinJoinClientQueueManager(CoinJoinWalletManager& walletman, CDeterministicMNManager& dmnman,
-                                         CMasternodeMetaMan& mn_metaman, const CMasternodeSync& mn_sync) :
-        m_walletman(walletman),
-        m_dmnman(dmnman),
-        m_mn_metaman(mn_metaman),
-        m_mn_sync(mn_sync)
-    {
-    }
+                                         CMasternodeMetaMan& mn_metaman, const CMasternodeSync& mn_sync);
+    ~CCoinJoinClientQueueManager();
 
     [[nodiscard]] MessageProcessingResult ProcessMessage(NodeId from, CConnman& connman, std::string_view msg_type,
                                                          CDataStream& vRecv)
@@ -285,21 +273,13 @@ class CCoinJoinClientManager
     bool fCreateAutoBackups{true}; // builtin support for automatic backups
 
     CCoinJoinClientManager() = delete;
-    CCoinJoinClientManager(CCoinJoinClientManager const&) = delete;
-    CCoinJoinClientManager& operator=(CCoinJoinClientManager const&) = delete;
-
+    CCoinJoinClientManager(const CCoinJoinClientManager&) = delete;
+    CCoinJoinClientManager& operator=(const CCoinJoinClientManager&) = delete;
     explicit CCoinJoinClientManager(const std::shared_ptr<wallet::CWallet>& wallet, CDeterministicMNManager& dmnman,
                                     CMasternodeMetaMan& mn_metaman, const CMasternodeSync& mn_sync,
                                     const llmq::CInstantSendManager& isman,
-                                    const std::unique_ptr<CCoinJoinClientQueueManager>& queueman) :
-        m_wallet(wallet),
-        m_dmnman(dmnman),
-        m_mn_metaman(mn_metaman),
-        m_mn_sync(mn_sync),
-        m_isman{isman},
-        m_queueman(queueman)
-    {
-    }
+                                    const std::unique_ptr<CCoinJoinClientQueueManager>& queueman);
+    ~CCoinJoinClientManager();
 
     void ProcessMessage(CNode& peer, CChainState& active_chainstate, CConnman& connman, const CTxMemPool& mempool, std::string_view msg_type, CDataStream& vRecv) EXCLUSIVE_LOCKS_REQUIRED(!cs_deqsessions);
 
diff --git a/src/coinjoin/coinjoin.cpp b/src/coinjoin/coinjoin.cpp
index d48239927f1a..1d129d8521e6 100644
--- a/src/coinjoin/coinjoin.cpp
+++ b/src/coinjoin/coinjoin.cpp
@@ -122,6 +122,10 @@ void CCoinJoinBaseSession::SetNull()
     nTimeLastSuccessfulStep = GetTime();
 }
 
+CCoinJoinBaseManager::CCoinJoinBaseManager() = default;
+
+CCoinJoinBaseManager::~CCoinJoinBaseManager() = default;
+
 void CCoinJoinBaseManager::SetNull()
 {
     LOCK(cs_vecqueue);
@@ -394,6 +398,10 @@ bilingual_str CoinJoin::GetMessageByID(PoolMessage nMessageID)
     }
 }
 
+CDSTXManager::CDSTXManager() = default;
+
+CDSTXManager::~CDSTXManager() = default;
+
 void CDSTXManager::AddDSTX(const CCoinJoinBroadcastTx& dstx)
 {
     AssertLockNotHeld(cs_mapdstx);
diff --git a/src/coinjoin/coinjoin.h b/src/coinjoin/coinjoin.h
index b0c13beebbdb..9a15be8b6c03 100644
--- a/src/coinjoin/coinjoin.h
+++ b/src/coinjoin/coinjoin.h
@@ -331,7 +331,8 @@ class CCoinJoinBaseManager
     void CheckQueue() EXCLUSIVE_LOCKS_REQUIRED(!cs_vecqueue);
 
 public:
-    CCoinJoinBaseManager() = default;
+    CCoinJoinBaseManager();
+    virtual ~CCoinJoinBaseManager();
 
     int GetQueueSize() const EXCLUSIVE_LOCKS_REQUIRED(!cs_vecqueue) { LOCK(cs_vecqueue); return vecCoinJoinQueue.size(); }
     bool GetQueueItemAndTry(CCoinJoinQueue& dsqRet) EXCLUSIVE_LOCKS_REQUIRED(!cs_vecqueue);
@@ -371,7 +372,11 @@ class CDSTXManager
     std::map<uint256, CCoinJoinBroadcastTx> mapDSTX GUARDED_BY(cs_mapdstx);
 
 public:
-    CDSTXManager() = default;
+    CDSTXManager(const CDSTXManager&) = delete;
+    CDSTXManager& operator=(const CDSTXManager&) = delete;
+    CDSTXManager();
+    ~CDSTXManager();
+
     void AddDSTX(const CCoinJoinBroadcastTx& dstx) EXCLUSIVE_LOCKS_REQUIRED(!cs_mapdstx);
     CCoinJoinBroadcastTx GetDSTX(const uint256& hash) EXCLUSIVE_LOCKS_REQUIRED(!cs_mapdstx);
 
diff --git a/src/coinjoin/server.cpp b/src/coinjoin/server.cpp
index 6f7169af7486..3beb5641677a 100644
--- a/src/coinjoin/server.cpp
+++ b/src/coinjoin/server.cpp
@@ -23,6 +23,27 @@
 
 #include <univalue.h>
 
+CCoinJoinServer::CCoinJoinServer(ChainstateManager& chainman, CConnman& _connman, CDeterministicMNManager& dmnman,
+                                 CDSTXManager& dstxman, CMasternodeMetaMan& mn_metaman, CTxMemPool& mempool,
+                                 PeerManager& peerman, const CActiveMasternodeManager& mn_activeman,
+                                 const CMasternodeSync& mn_sync, const llmq::CInstantSendManager& isman) :
+    m_chainman{chainman},
+    connman{_connman},
+    m_dmnman{dmnman},
+    m_dstxman{dstxman},
+    m_mn_metaman{mn_metaman},
+    mempool{mempool},
+    m_peerman{peerman},
+    m_mn_activeman{mn_activeman},
+    m_mn_sync{mn_sync},
+    m_isman{isman},
+    vecSessionCollaterals{},
+    fUnitTest{false}
+{
+}
+
+CCoinJoinServer::~CCoinJoinServer() = default;
+
 MessageProcessingResult CCoinJoinServer::ProcessMessage(CNode& peer, std::string_view msg_type, CDataStream& vRecv)
 {
     if (!m_mn_sync.IsBlockchainSynced()) return {};
diff --git a/src/coinjoin/server.h b/src/coinjoin/server.h
index 86e486ab3156..cae4b8f8dddb 100644
--- a/src/coinjoin/server.h
+++ b/src/coinjoin/server.h
@@ -94,23 +94,14 @@ class CCoinJoinServer : public CCoinJoinBaseSession, public CCoinJoinBaseManager
     void SetNull() override EXCLUSIVE_LOCKS_REQUIRED(cs_coinjoin);
 
 public:
+    CCoinJoinServer() = delete;
+    CCoinJoinServer(const CCoinJoinServer&) = delete;
+    CCoinJoinServer& operator=(const CCoinJoinServer&) = delete;
     explicit CCoinJoinServer(ChainstateManager& chainman, CConnman& _connman, CDeterministicMNManager& dmnman,
                              CDSTXManager& dstxman, CMasternodeMetaMan& mn_metaman, CTxMemPool& mempool,
                              PeerManager& peerman, const CActiveMasternodeManager& mn_activeman,
-                             const CMasternodeSync& mn_sync, const llmq::CInstantSendManager& isman) :
-        m_chainman(chainman),
-        connman(_connman),
-        m_dmnman(dmnman),
-        m_dstxman(dstxman),
-        m_mn_metaman(mn_metaman),
-        mempool(mempool),
-        m_peerman(peerman),
-        m_mn_activeman(mn_activeman),
-        m_mn_sync(mn_sync),
-        m_isman{isman},
-        vecSessionCollaterals(),
-        fUnitTest(false)
-    {}
+                             const CMasternodeSync& mn_sync, const llmq::CInstantSendManager& isman);
+    ~CCoinJoinServer();
 
     [[nodiscard]] MessageProcessingResult ProcessMessage(CNode& pfrom, std::string_view msg_type, CDataStream& vRecv);
 

From adb51179aa787410fcb49fa7e3702aa5289f9b8e Mon Sep 17 00:00:00 2001
From: Kittywhiskers Van Gogh <63189531+kwvg@users.noreply.github.com>
Date: Sun, 26 Oct 2025 21:24:02 +0530
Subject: [PATCH 310/656] refactor: delete extra ctors for chainlock,
 instantsend, governance

---
 src/chainlock/signing.h     | 3 +++
 src/governance/governance.h | 3 +++
 src/governance/signing.h    | 3 +++
 src/instantsend/signing.h   | 3 +++
 4 files changed, 12 insertions(+)

diff --git a/src/chainlock/signing.h b/src/chainlock/signing.h
index ac9ee1fbada1..357b3295f757 100644
--- a/src/chainlock/signing.h
+++ b/src/chainlock/signing.h
@@ -63,6 +63,9 @@ class ChainLockSigner final : public llmq::CRecoveredSigsListener
     uint256 lastSignedMsgHash GUARDED_BY(cs_signer);
 
 public:
+    ChainLockSigner() = delete;
+    ChainLockSigner(const ChainLockSigner&) = delete;
+    ChainLockSigner& operator=(const ChainLockSigner&) = delete;
     explicit ChainLockSigner(CChainState& chainstate, ChainLockSignerParent& clhandler, llmq::CSigningManager& sigman,
                              llmq::CSigSharesManager& shareman, CSporkManager& sporkman, const CMasternodeSync& mn_sync);
     ~ChainLockSigner();
diff --git a/src/governance/governance.h b/src/governance/governance.h
index 6168bb308847..6d4a9bbf9b02 100644
--- a/src/governance/governance.h
+++ b/src/governance/governance.h
@@ -275,6 +275,9 @@ class CGovernanceManager : public GovernanceStore, public GovernanceSignerParent
     std::vector<CInv> m_relay_invs GUARDED_BY(cs_relay);
 
 public:
+    CGovernanceManager() = delete;
+    CGovernanceManager(const CGovernanceManager&) = delete;
+    CGovernanceManager& operator=(const CGovernanceManager&) = delete;
     explicit CGovernanceManager(CMasternodeMetaMan& mn_metaman, CNetFulfilledRequestManager& netfulfilledman,
                                 const ChainstateManager& chainman,
                                 const std::unique_ptr<CDeterministicMNManager>& dmnman, CMasternodeSync& mn_sync);
diff --git a/src/governance/signing.h b/src/governance/signing.h
index c037e9f46ffc..f03aec29096d 100644
--- a/src/governance/signing.h
+++ b/src/governance/signing.h
@@ -59,6 +59,9 @@ class GovernanceSigner
     std::optional<uint256> votedFundingYesTriggerHash{std::nullopt};
 
 public:
+    GovernanceSigner() = delete;
+    GovernanceSigner(const GovernanceSigner&) = delete;
+    GovernanceSigner& operator=(const GovernanceSigner&) = delete;
     explicit GovernanceSigner(CConnman& connman, CDeterministicMNManager& dmnman, GovernanceSignerParent& govman,
                               const CActiveMasternodeManager& mn_activeman, const ChainstateManager& chainman,
                               const CMasternodeSync& mn_sync);
diff --git a/src/instantsend/signing.h b/src/instantsend/signing.h
index 3cf41a843142..f62ea90c4a18 100644
--- a/src/instantsend/signing.h
+++ b/src/instantsend/signing.h
@@ -69,6 +69,9 @@ class InstantSendSigner final : public llmq::CRecoveredSigsListener
     Uint256HashMap<InstantSendLock*> txToCreatingInstantSendLocks GUARDED_BY(cs_creating);
 
 public:
+    InstantSendSigner() = delete;
+    InstantSendSigner(const InstantSendSigner&) = delete;
+    InstantSendSigner& operator=(const InstantSendSigner&) = delete;
     explicit InstantSendSigner(CChainState& chainstate, llmq::CChainLocksHandler& clhandler,
                                InstantSendSignerParent& isman, llmq::CSigningManager& sigman,
                                llmq::CSigSharesManager& shareman, llmq::CQuorumManager& qman, CSporkManager& sporkman,

From 52f7160ac3df90e4a8ce3483a6ab8de362668086 Mon Sep 17 00:00:00 2001
From: Kittywhiskers Van Gogh <63189531+kwvg@users.noreply.github.com>
Date: Sun, 26 Oct 2025 21:22:18 +0530
Subject: [PATCH 311/656] refactor: move ctor/dtor to source file, delete extra
 ctors for evo

---
 src/evo/chainhelper.h        |  6 +++---
 src/evo/creditpool.cpp       |  6 ++++--
 src/evo/creditpool.h         |  6 ++++--
 src/evo/deterministicmns.cpp |  8 ++++++++
 src/evo/deterministicmns.h   | 11 +++++------
 src/evo/evodb.cpp            | 10 ++++++----
 src/evo/evodb.h              |  4 ++++
 src/evo/mnhftx.cpp           |  2 +-
 src/evo/mnhftx.h             |  4 +++-
 9 files changed, 38 insertions(+), 19 deletions(-)

diff --git a/src/evo/chainhelper.h b/src/evo/chainhelper.h
index 6dd94bf1941f..66bee994652f 100644
--- a/src/evo/chainhelper.h
+++ b/src/evo/chainhelper.h
@@ -36,6 +36,9 @@ class CChainstateHelper
     const llmq::CChainLocksHandler& clhandler;
 
 public:
+    CChainstateHelper() = delete;
+    CChainstateHelper(const CChainstateHelper&) = delete;
+    CChainstateHelper& operator=(const CChainstateHelper&) = delete;
     explicit CChainstateHelper(CCreditPoolManager& cpoolman, CDeterministicMNManager& dmnman, CMNHFManager& mnhfman,
                                CGovernanceManager& govman, llmq::CInstantSendManager& isman,
                                llmq::CQuorumBlockProcessor& qblockman, llmq::CQuorumSnapshotManager& qsnapman,
@@ -44,9 +47,6 @@ class CChainstateHelper
                                const llmq::CChainLocksHandler& clhandler, const llmq::CQuorumManager& qman);
     ~CChainstateHelper();
 
-    CChainstateHelper() = delete;
-    CChainstateHelper(const CChainstateHelper&) = delete;
-
     /** Passthrough functions to CChainLocksHandler */
     bool HasConflictingChainLock(int nHeight, const uint256& blockHash) const;
     bool HasChainLock(int nHeight, const uint256& blockHash) const;
diff --git a/src/evo/creditpool.cpp b/src/evo/creditpool.cpp
index 2517af9567f1..7a82653b4bc5 100644
--- a/src/evo/creditpool.cpp
+++ b/src/evo/creditpool.cpp
@@ -238,11 +238,13 @@ CCreditPool CCreditPoolManager::GetCreditPool(const CBlockIndex* block_index, co
     return *poolTmp;
 }
 
-CCreditPoolManager::CCreditPoolManager(CEvoDB& _evoDb)
-: evoDb(_evoDb)
+CCreditPoolManager::CCreditPoolManager(CEvoDB& _evoDb) :
+    evoDb{_evoDb}
 {
 }
 
+CCreditPoolManager::~CCreditPoolManager() = default;
+
 CCreditPoolDiff::CCreditPoolDiff(CCreditPool starter, const CBlockIndex* pindexPrev,
                                  const Consensus::Params& consensusParams, const CAmount blockSubsidy) :
     pool(std::move(starter)),
diff --git a/src/evo/creditpool.h b/src/evo/creditpool.h
index 5b2bb8cf43d7..b0d0f57061c7 100644
--- a/src/evo/creditpool.h
+++ b/src/evo/creditpool.h
@@ -123,9 +123,11 @@ class CCreditPoolManager
     static constexpr CAmount LimitAmountV22 = 2000 * COIN;
     static constexpr CAmount LimitAmountV24 = 4000 * COIN;
 
+    CCreditPoolManager() = delete;
+    CCreditPoolManager(const CCreditPoolManager&) = delete;
+    CCreditPoolManager& operator=(const CCreditPoolManager&) = delete;
     explicit CCreditPoolManager(CEvoDB& _evoDb);
-
-    ~CCreditPoolManager() = default;
+    ~CCreditPoolManager();
 
     /**
       * @return CCreditPool with data or with empty depends on activation V19 at that block
diff --git a/src/evo/deterministicmns.cpp b/src/evo/deterministicmns.cpp
index edd30d189b28..d8140aa0db90 100644
--- a/src/evo/deterministicmns.cpp
+++ b/src/evo/deterministicmns.cpp
@@ -634,6 +634,14 @@ void CDeterministicMNList::RemoveMN(const uint256& proTxHash)
     InvalidateSMLCache();
 }
 
+CDeterministicMNManager::CDeterministicMNManager(CEvoDB& evoDb, CMasternodeMetaMan& mn_metaman) :
+    m_evoDb{evoDb},
+    m_mn_metaman{mn_metaman}
+{
+}
+
+CDeterministicMNManager::~CDeterministicMNManager() = default;
+
 bool CDeterministicMNManager::ProcessBlock(const CBlock& block, gsl::not_null<const CBlockIndex*> pindex,
                                            BlockValidationState& state, const CDeterministicMNList& newList,
                                            std::optional<MNListUpdates>& updatesRet)
diff --git a/src/evo/deterministicmns.h b/src/evo/deterministicmns.h
index e195577a5e3e..fe5a4f1dd787 100644
--- a/src/evo/deterministicmns.h
+++ b/src/evo/deterministicmns.h
@@ -654,12 +654,11 @@ class CDeterministicMNManager
     const CBlockIndex* m_initial_snapshot_index GUARDED_BY(cs) {nullptr};
 
 public:
-    explicit CDeterministicMNManager(CEvoDB& evoDb, CMasternodeMetaMan& mn_metaman) :
-        m_evoDb(evoDb),
-        m_mn_metaman(mn_metaman)
-    {
-    }
-    ~CDeterministicMNManager() = default;
+    CDeterministicMNManager() = delete;
+    CDeterministicMNManager(const CDeterministicMNManager&) = delete;
+    CDeterministicMNManager& operator=(const CDeterministicMNManager&) = delete;
+    explicit CDeterministicMNManager(CEvoDB& evoDb, CMasternodeMetaMan& mn_metaman);
+    ~CDeterministicMNManager();
 
     bool ProcessBlock(const CBlock& block, gsl::not_null<const CBlockIndex*> pindex, BlockValidationState& state,
                       const CDeterministicMNList& newList, std::optional<MNListUpdates>& updatesRet)
diff --git a/src/evo/evodb.cpp b/src/evo/evodb.cpp
index 32d7e2475533..0908aebda5a3 100644
--- a/src/evo/evodb.cpp
+++ b/src/evo/evodb.cpp
@@ -33,13 +33,15 @@ void CEvoDBScopedCommitter::Rollback()
 }
 
 CEvoDB::CEvoDB(size_t nCacheSize, bool fMemory, bool fWipe) :
-    db(fMemory ? "" : (gArgs.GetDataDirNet() / "evodb"), nCacheSize, fMemory, fWipe),
-    rootBatch(db),
-    rootDBTransaction(db, rootBatch),
-    curDBTransaction(rootDBTransaction, rootDBTransaction)
+    db{fMemory ? "" : (gArgs.GetDataDirNet() / "evodb"), nCacheSize, fMemory, fWipe},
+    rootBatch{db},
+    rootDBTransaction{db, rootBatch},
+    curDBTransaction{rootDBTransaction, rootDBTransaction}
 {
 }
 
+CEvoDB::~CEvoDB() = default;
+
 void CEvoDB::CommitCurTransaction()
 {
     LOCK(cs);
diff --git a/src/evo/evodb.h b/src/evo/evodb.h
index 594ced2cc5fb..0636ebf173b4 100644
--- a/src/evo/evodb.h
+++ b/src/evo/evodb.h
@@ -46,7 +46,11 @@ class CEvoDB
     CurTransaction curDBTransaction;
 
 public:
+    CEvoDB() = delete;
+    CEvoDB(const CEvoDB&) = delete;
+    CEvoDB& operator=(const CEvoDB&) = delete;
     explicit CEvoDB(size_t nCacheSize, bool fMemory = false, bool fWipe = false);
+    ~CEvoDB();
 
     std::unique_ptr<CEvoDBScopedCommitter> BeginTransaction() EXCLUSIVE_LOCKS_REQUIRED(!cs)
     {
diff --git a/src/evo/mnhftx.cpp b/src/evo/mnhftx.cpp
index 7e1da6cbafdc..54e5d0c29ce0 100644
--- a/src/evo/mnhftx.cpp
+++ b/src/evo/mnhftx.cpp
@@ -45,7 +45,7 @@ CMutableTransaction MNHFTxPayload::PrepareTx() const
 }
 
 CMNHFManager::CMNHFManager(CEvoDB& evoDb) :
-    m_evoDb(evoDb)
+    m_evoDb{evoDb}
 {
     assert(globalInstance == nullptr);
     globalInstance = this;
diff --git a/src/evo/mnhftx.h b/src/evo/mnhftx.h
index 210598086f7a..2c4260956763 100644
--- a/src/evo/mnhftx.h
+++ b/src/evo/mnhftx.h
@@ -99,9 +99,11 @@ class CMNHFManager : public AbstractEHFManager
     Uint256LruHashMap<Signals> mnhfCache GUARDED_BY(cs_cache){MNHFCacheSize};
 
 public:
+    CMNHFManager() = delete;
+    CMNHFManager(const CMNHFManager&) = delete;
+    CMNHFManager& operator=(const CMNHFManager&) = delete;
     explicit CMNHFManager(CEvoDB& evoDb);
     ~CMNHFManager();
-    explicit CMNHFManager(const CMNHFManager&) = delete;
 
     /**
      * Every new block should be processed when Tip() is updated by calling of CMNHFManager::ProcessBlock.

From 5163e8595d97516d7bc2298dfdac0c383657d7d7 Mon Sep 17 00:00:00 2001
From: Kittywhiskers Van Gogh <63189531+kwvg@users.noreply.github.com>
Date: Tue, 28 Oct 2025 22:53:33 +0530
Subject: [PATCH 312/656] refactor: move ctor/dtor to source file, delete extra
 ctors for mn

---
 src/masternode/active/context.h | 10 ++++++----
 src/masternode/meta.cpp         | 12 ++++++------
 src/masternode/meta.h           |  4 +++-
 src/masternode/node.cpp         |  7 +++++--
 src/masternode/node.h           |  4 ++++
 src/masternode/sync.cpp         | 10 ++++++----
 src/masternode/sync.h           |  4 ++++
 7 files changed, 34 insertions(+), 17 deletions(-)

diff --git a/src/masternode/active/context.h b/src/masternode/active/context.h
index d6308b8c0b6e..c34fbae09d22 100644
--- a/src/masternode/active/context.h
+++ b/src/masternode/active/context.h
@@ -41,10 +41,12 @@ struct ActiveContext {
 public:
     ActiveContext() = delete;
     ActiveContext(const ActiveContext&) = delete;
-    ActiveContext(ChainstateManager& chainman, CConnman& connman, CDeterministicMNManager& dmnman,
-                  CDSTXManager& dstxman, CGovernanceManager& govman, CMasternodeMetaMan& mn_metaman,
-                  CMNHFManager& mnhfman, CSporkManager& sporkman, CTxMemPool& mempool, LLMQContext& llmq_ctx,
-                  PeerManager& peerman, const CActiveMasternodeManager& mn_activeman, const CMasternodeSync& mn_sync);
+    ActiveContext& operator=(const ActiveContext&) = delete;
+    explicit ActiveContext(ChainstateManager& chainman, CConnman& connman, CDeterministicMNManager& dmnman,
+                           CDSTXManager& dstxman, CGovernanceManager& govman, CMasternodeMetaMan& mn_metaman,
+                           CMNHFManager& mnhfman, CSporkManager& sporkman, CTxMemPool& mempool, LLMQContext& llmq_ctx,
+                           PeerManager& peerman, const CActiveMasternodeManager& mn_activeman,
+                           const CMasternodeSync& mn_sync);
     ~ActiveContext();
 
     void Interrupt();
diff --git a/src/masternode/meta.cpp b/src/masternode/meta.cpp
index 3940b08700ce..dee9c08397dc 100644
--- a/src/masternode/meta.cpp
+++ b/src/masternode/meta.cpp
@@ -15,6 +15,12 @@ CMasternodeMetaMan::CMasternodeMetaMan() :
 {
 }
 
+CMasternodeMetaMan::~CMasternodeMetaMan()
+{
+    if (!is_valid) return;
+    m_db->Store(*this);
+}
+
 bool CMasternodeMetaMan::LoadCache(bool load_cache)
 {
     assert(m_db != nullptr);
@@ -22,12 +28,6 @@ bool CMasternodeMetaMan::LoadCache(bool load_cache)
     return is_valid;
 }
 
-CMasternodeMetaMan::~CMasternodeMetaMan()
-{
-    if (!is_valid) return;
-    m_db->Store(*this);
-}
-
 UniValue CMasternodeMetaInfo::ToJson() const
 {
     UniValue ret(UniValue::VOBJ);
diff --git a/src/masternode/meta.h b/src/masternode/meta.h
index 8b8f468c4841..c74b9afe04c5 100644
--- a/src/masternode/meta.h
+++ b/src/masternode/meta.h
@@ -250,7 +250,9 @@ class CMasternodeMetaMan : public MasternodeMetaStore
         SeenBanInventorySize};
 
 public:
-    explicit CMasternodeMetaMan();
+    CMasternodeMetaMan(const CMasternodeMetaMan&) = delete;
+    CMasternodeMetaMan& operator=(const CMasternodeMetaMan&) = delete;
+    CMasternodeMetaMan();
     ~CMasternodeMetaMan();
 
     bool LoadCache(bool load_cache);
diff --git a/src/masternode/node.cpp b/src/masternode/node.cpp
index 2f0f69238871..7c48ce7f4fba 100644
--- a/src/masternode/node.cpp
+++ b/src/masternode/node.cpp
@@ -49,8 +49,9 @@ bool GetLocal(CService& addr, const CNetAddr* paddrPeer)
 }
 } // anonymous namespace
 
-CActiveMasternodeManager::CActiveMasternodeManager(const CBLSSecretKey& sk, CConnman& connman, const std::unique_ptr<CDeterministicMNManager>& dmnman) :
-    m_info(sk, sk.GetPublicKey()),
+CActiveMasternodeManager::CActiveMasternodeManager(const CBLSSecretKey& sk, CConnman& connman,
+                                                   const std::unique_ptr<CDeterministicMNManager>& dmnman) :
+    m_info{sk, sk.GetPublicKey()},
     m_connman{connman},
     m_dmnman{dmnman}
 {
@@ -60,6 +61,8 @@ CActiveMasternodeManager::CActiveMasternodeManager(const CBLSSecretKey& sk, CCon
             m_info.blsPubKeyOperator.ToString(/*specificLegacyScheme=*/ false));
 }
 
+CActiveMasternodeManager::~CActiveMasternodeManager() = default;
+
 std::string CActiveMasternodeManager::GetStateString() const
 {
     switch (WITH_READ_LOCK(cs, return m_state)) {
diff --git a/src/masternode/node.h b/src/masternode/node.h
index 00a526d8b4fb..980a2f96814d 100644
--- a/src/masternode/node.h
+++ b/src/masternode/node.h
@@ -51,7 +51,11 @@ class CActiveMasternodeManager
     const std::unique_ptr<CDeterministicMNManager>& m_dmnman;
 
 public:
+    CActiveMasternodeManager() = delete;
+    CActiveMasternodeManager(const CActiveMasternodeManager&) = delete;
+    CActiveMasternodeManager& operator=(const CActiveMasternodeManager&) = delete;
     explicit CActiveMasternodeManager(const CBLSSecretKey& sk, CConnman& connman, const std::unique_ptr<CDeterministicMNManager>& dmnman);
+    ~CActiveMasternodeManager();
 
     void UpdatedBlockTip(const CBlockIndex* pindexNew, const CBlockIndex* pindexFork, bool fInitialDownload)
         EXCLUSIVE_LOCKS_REQUIRED(!cs);
diff --git a/src/masternode/sync.cpp b/src/masternode/sync.cpp
index b9bebb07cb64..674e6d7994c1 100644
--- a/src/masternode/sync.cpp
+++ b/src/masternode/sync.cpp
@@ -15,13 +15,15 @@
 #include <validation.h>
 
 CMasternodeSync::CMasternodeSync(CConnman& _connman, CNetFulfilledRequestManager& netfulfilledman) :
-    nTimeAssetSyncStarted(GetTime()),
-    nTimeLastBumped(GetTime()),
-    connman(_connman),
-    m_netfulfilledman(netfulfilledman)
+    nTimeAssetSyncStarted{GetTime()},
+    nTimeLastBumped{GetTime()},
+    connman{_connman},
+    m_netfulfilledman{netfulfilledman}
 {
 }
 
+CMasternodeSync::~CMasternodeSync() = default;
+
 void CMasternodeSync::Reset(bool fForce, bool fNotifyReset)
 {
     // Avoid resetting the sync process if we just "recently" received a new block
diff --git a/src/masternode/sync.h b/src/masternode/sync.h
index dc12376c7518..2af331c64e36 100644
--- a/src/masternode/sync.h
+++ b/src/masternode/sync.h
@@ -53,7 +53,11 @@ class CMasternodeSync
     CNetFulfilledRequestManager& m_netfulfilledman;
 
 public:
+    CMasternodeSync() = delete;
+    CMasternodeSync(const CMasternodeSync&) = delete;
+    CMasternodeSync& operator=(const CMasternodeSync&) = delete;
     explicit CMasternodeSync(CConnman& _connman, CNetFulfilledRequestManager& netfulfilledman);
+    ~CMasternodeSync();
 
     void SendGovernanceSyncRequest(CNode* pnode) const;
 

From 5dd2e996b22dcf4438d7b8a22bfa46a9d69036cd Mon Sep 17 00:00:00 2001
From: Kittywhiskers Van Gogh <63189531+kwvg@users.noreply.github.com>
Date: Tue, 28 Oct 2025 22:54:17 +0530
Subject: [PATCH 313/656] refactor: delete extra ctors for netfulfilled, spork

---
 src/netfulfilledman.cpp | 12 ++++++------
 src/netfulfilledman.h   |  4 +++-
 src/spork.h             |  2 ++
 3 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/src/netfulfilledman.cpp b/src/netfulfilledman.cpp
index 8e68dca02db7..43b981405911 100644
--- a/src/netfulfilledman.cpp
+++ b/src/netfulfilledman.cpp
@@ -12,6 +12,12 @@ CNetFulfilledRequestManager::CNetFulfilledRequestManager() :
 {
 }
 
+CNetFulfilledRequestManager::~CNetFulfilledRequestManager()
+{
+    if (!is_valid) return;
+    m_db->Store(*this);
+}
+
 bool CNetFulfilledRequestManager::LoadCache(bool load_cache)
 {
     assert(m_db != nullptr);
@@ -22,12 +28,6 @@ bool CNetFulfilledRequestManager::LoadCache(bool load_cache)
     return is_valid;
 }
 
-CNetFulfilledRequestManager::~CNetFulfilledRequestManager()
-{
-    if (!is_valid) return;
-    m_db->Store(*this);
-}
-
 void CNetFulfilledRequestManager::AddFulfilledRequest(const CService& addr, const std::string& strRequest)
 {
     LOCK(cs_mapFulfilledRequests);
diff --git a/src/netfulfilledman.h b/src/netfulfilledman.h
index 1a4471f3ccee..b3518f4fc9ab 100644
--- a/src/netfulfilledman.h
+++ b/src/netfulfilledman.h
@@ -50,7 +50,9 @@ class CNetFulfilledRequestManager : public NetFulfilledRequestStore
     bool is_valid{false};
 
 public:
-    explicit CNetFulfilledRequestManager();
+    CNetFulfilledRequestManager(const CNetFulfilledRequestManager&) = delete;
+    CNetFulfilledRequestManager& operator=(const CNetFulfilledRequestManager&) = delete;
+    CNetFulfilledRequestManager();
     ~CNetFulfilledRequestManager();
 
     bool LoadCache(bool load_cache);
diff --git a/src/spork.h b/src/spork.h
index 4ea43b435354..2351460f12af 100644
--- a/src/spork.h
+++ b/src/spork.h
@@ -233,6 +233,8 @@ class CSporkManager : public SporkStore
     std::optional<SporkValue> SporkValueIfActive(SporkId nSporkID) const EXCLUSIVE_LOCKS_REQUIRED(cs, !cs_cache);
 
 public:
+    CSporkManager(const CSporkManager&) = delete;
+    CSporkManager& operator=(const CSporkManager&) = delete;
     CSporkManager();
     ~CSporkManager();
 

From 556d0b8c744fd4bf9ecb57d735b34aa0f73246e5 Mon Sep 17 00:00:00 2001
From: Kittywhiskers Van Gogh <63189531+kwvg@users.noreply.github.com>
Date: Mon, 27 Oct 2025 04:23:02 +0530
Subject: [PATCH 314/656] refactor: move dtor to source file, delete extra
 ctors for notif int.

---
 src/dsnotificationinterface.cpp                 | 16 +++++++++-------
 src/dsnotificationinterface.h                   |  5 ++++-
 src/masternode/active/notificationinterface.cpp |  2 ++
 src/masternode/active/notificationinterface.h   |  3 ++-
 4 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/src/dsnotificationinterface.cpp b/src/dsnotificationinterface.cpp
index 1a1faa969563..830da58fb847 100644
--- a/src/dsnotificationinterface.cpp
+++ b/src/dsnotificationinterface.cpp
@@ -27,16 +27,18 @@ CDSNotificationInterface::CDSNotificationInterface(CConnman& connman,
                                                    const ChainstateManager& chainman,
                                                    const std::unique_ptr<CDeterministicMNManager>& dmnman,
                                                    const std::unique_ptr<LLMQContext>& llmq_ctx) :
-    m_connman(connman),
-    m_dstxman(dstxman),
-    m_mn_sync(mn_sync),
-    m_govman(govman),
-    m_chainman(chainman),
-    m_dmnman(dmnman),
-    m_llmq_ctx(llmq_ctx)
+    m_connman{connman},
+    m_dstxman{dstxman},
+    m_mn_sync{mn_sync},
+    m_govman{govman},
+    m_chainman{chainman},
+    m_dmnman{dmnman},
+    m_llmq_ctx{llmq_ctx}
 {
 }
 
+CDSNotificationInterface::~CDSNotificationInterface() = default;
+
 void CDSNotificationInterface::InitializeCurrentBlockTip()
 {
     SynchronousUpdatedBlockTip(m_chainman.ActiveChain().Tip(), nullptr, m_chainman.ActiveChainstate().IsInitialBlockDownload());
diff --git a/src/dsnotificationinterface.h b/src/dsnotificationinterface.h
index 52cf0b2f62af..7c33a3462adb 100644
--- a/src/dsnotificationinterface.h
+++ b/src/dsnotificationinterface.h
@@ -18,6 +18,9 @@ struct LLMQContext;
 class CDSNotificationInterface : public CValidationInterface
 {
 public:
+    CDSNotificationInterface() = delete;
+    CDSNotificationInterface(const CDSNotificationInterface&) = delete;
+    CDSNotificationInterface& operator=(const CDSNotificationInterface&) = delete;
     explicit CDSNotificationInterface(CConnman& connman,
                                       CDSTXManager& dstxman,
                                       CMasternodeSync& mn_sync,
@@ -25,7 +28,7 @@ class CDSNotificationInterface : public CValidationInterface
                                       const ChainstateManager& chainman,
                                       const std::unique_ptr<CDeterministicMNManager>& dmnman,
                                       const std::unique_ptr<LLMQContext>& llmq_ctx);
-    virtual ~CDSNotificationInterface() = default;
+    virtual ~CDSNotificationInterface();
 
     // a small helper to initialize current block height in sub-modules on startup
     void InitializeCurrentBlockTip();
diff --git a/src/masternode/active/notificationinterface.cpp b/src/masternode/active/notificationinterface.cpp
index 5a71a476cd0c..17340861ae6c 100644
--- a/src/masternode/active/notificationinterface.cpp
+++ b/src/masternode/active/notificationinterface.cpp
@@ -16,6 +16,8 @@ ActiveNotificationInterface::ActiveNotificationInterface(ActiveContext& active_c
 {
 }
 
+ActiveNotificationInterface::~ActiveNotificationInterface() = default;
+
 void ActiveNotificationInterface::UpdatedBlockTip(const CBlockIndex* pindexNew, const CBlockIndex* pindexFork,
                                                   bool fInitialDownload)
 {
diff --git a/src/masternode/active/notificationinterface.h b/src/masternode/active/notificationinterface.h
index 4e55bcf21681..905371e41b7a 100644
--- a/src/masternode/active/notificationinterface.h
+++ b/src/masternode/active/notificationinterface.h
@@ -20,8 +20,9 @@ class ActiveNotificationInterface final : public CValidationInterface
 public:
     ActiveNotificationInterface() = delete;
     ActiveNotificationInterface(const ActiveNotificationInterface&) = delete;
+    ActiveNotificationInterface& operator=(const ActiveNotificationInterface&) = delete;
     explicit ActiveNotificationInterface(ActiveContext& active_ctx, CActiveMasternodeManager& mn_activeman);
-    virtual ~ActiveNotificationInterface() = default;
+    virtual ~ActiveNotificationInterface();
 
 protected:
     // CValidationInterface

From a7bec545182c20d45619f35c8842d710365edfae Mon Sep 17 00:00:00 2001
From: Kittywhiskers Van Gogh <63189531+kwvg@users.noreply.github.com>
Date: Mon, 27 Oct 2025 01:32:07 +0530
Subject: [PATCH 315/656] refactor: move EvoDb cache size to constructor, use
 `std::unique_ptr`

To harmonize with the rest of the `CDBWrapper` instantiations needed
for the next commit.
---
 src/evo/evodb.cpp              | 10 +++++-----
 src/evo/evodb.h                |  8 ++++----
 src/node/chainstate.cpp        |  3 +--
 src/test/util/setup_common.cpp |  2 +-
 4 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/src/evo/evodb.cpp b/src/evo/evodb.cpp
index 0908aebda5a3..03d8b5d02296 100644
--- a/src/evo/evodb.cpp
+++ b/src/evo/evodb.cpp
@@ -32,10 +32,10 @@ void CEvoDBScopedCommitter::Rollback()
     evoDB.RollbackCurTransaction();
 }
 
-CEvoDB::CEvoDB(size_t nCacheSize, bool fMemory, bool fWipe) :
-    db{fMemory ? "" : (gArgs.GetDataDirNet() / "evodb"), nCacheSize, fMemory, fWipe},
-    rootBatch{db},
-    rootDBTransaction{db, rootBatch},
+CEvoDB::CEvoDB(bool fMemory, bool fWipe) :
+    db{std::make_unique<CDBWrapper>(fMemory ? "" : (gArgs.GetDataDirNet() / "evodb"), 64 << 20, fMemory, fWipe)},
+    rootBatch{*db},
+    rootDBTransaction{*db, rootBatch},
     curDBTransaction{rootDBTransaction, rootDBTransaction}
 {
 }
@@ -59,7 +59,7 @@ bool CEvoDB::CommitRootTransaction()
     LOCK(cs);
     assert(curDBTransaction.IsClean());
     rootDBTransaction.Commit();
-    bool ret = db.WriteBatch(rootBatch);
+    bool ret = db->WriteBatch(rootBatch);
     rootBatch.Clear();
     return ret;
 }
diff --git a/src/evo/evodb.h b/src/evo/evodb.h
index 0636ebf173b4..b86d91d416c5 100644
--- a/src/evo/evodb.h
+++ b/src/evo/evodb.h
@@ -36,7 +36,7 @@ class CEvoDB
 public:
     Mutex cs;
 private:
-    CDBWrapper db;
+    std::unique_ptr<CDBWrapper> db;
 
     using RootTransaction = CDBTransaction<CDBWrapper, CDBBatch>;
     using CurTransaction = CDBTransaction<RootTransaction, RootTransaction>;
@@ -49,7 +49,7 @@ class CEvoDB
     CEvoDB() = delete;
     CEvoDB(const CEvoDB&) = delete;
     CEvoDB& operator=(const CEvoDB&) = delete;
-    explicit CEvoDB(size_t nCacheSize, bool fMemory = false, bool fWipe = false);
+    explicit CEvoDB(bool fMemory, bool fWipe);
     ~CEvoDB();
 
     std::unique_ptr<CEvoDBScopedCommitter> BeginTransaction() EXCLUSIVE_LOCKS_REQUIRED(!cs)
@@ -94,7 +94,7 @@ class CEvoDB
 
     CDBWrapper& GetRawDB()
     {
-        return db;
+        return *db;
     }
 
     [[nodiscard]] size_t GetMemoryUsage() const
@@ -104,7 +104,7 @@ class CEvoDB
 
     bool CommitRootTransaction() EXCLUSIVE_LOCKS_REQUIRED(!cs);
 
-    bool IsEmpty() { return db.IsEmpty(); }
+    bool IsEmpty() { return db->IsEmpty(); }
 
     bool VerifyBestBlock(const uint256& hash) EXCLUSIVE_LOCKS_REQUIRED(!cs);
     void WriteBestBlock(const uint256& hash) EXCLUSIVE_LOCKS_REQUIRED(!cs);
diff --git a/src/node/chainstate.cpp b/src/node/chainstate.cpp
index b5e571425207..8e651d3bff78 100644
--- a/src/node/chainstate.cpp
+++ b/src/node/chainstate.cpp
@@ -71,9 +71,8 @@ std::optional<ChainstateLoadingError> LoadChainstate(bool fReset,
 
     LOCK(cs_main);
 
-    int64_t nEvoDbCache{64 * 1024 * 1024}; // TODO
     evodb.reset();
-    evodb = std::make_unique<CEvoDB>(nEvoDbCache, false, fReset || fReindexChainState);
+    evodb = std::make_unique<CEvoDB>(/*fMemory=*/false, /*fWipe=*/fReset || fReindexChainState);
 
     mnhf_manager.reset();
     mnhf_manager = std::make_unique<CMNHFManager>(*evodb);
diff --git a/src/test/util/setup_common.cpp b/src/test/util/setup_common.cpp
index 480296e80fc5..6cece8274664 100644
--- a/src/test/util/setup_common.cpp
+++ b/src/test/util/setup_common.cpp
@@ -214,7 +214,7 @@ BasicTestingSetup::BasicTestingSetup(const std::string& chainName, const std::ve
     m_node.connman = std::make_unique<ConnmanTestMsg>(0x1337, 0x1337, *m_node.addrman, *m_node.netgroupman); // Deterministic randomness for tests.
 
     fCheckBlockIndex = true;
-    m_node.evodb = std::make_unique<CEvoDB>(1 << 20, true, true);
+    m_node.evodb = std::make_unique<CEvoDB>(/*fMemory=*/true, /*fWipe=*/true);
     m_node.mnhf_manager = std::make_unique<CMNHFManager>(*m_node.evodb);
     m_node.cpoolman = std::make_unique<CCreditPoolManager>(*m_node.evodb);
     static bool noui_connected = false;

From 5b2e54a0d74f76586b505af50024ed2c63c2757a Mon Sep 17 00:00:00 2001
From: Kittywhiskers Van Gogh <63189531+kwvg@users.noreply.github.com>
Date: Wed, 29 Oct 2025 14:32:50 +0530
Subject: [PATCH 316/656] refactor: introduce `util::DbWrapperParams` and
 helper to pull out args

Helps us reduce our gArgs usage as bitcoin-chainstate won't be having
ArgsManager with it
---
 src/dbwrapper.h                 | 15 +++++++++++++++
 src/evo/evodb.cpp               |  5 ++---
 src/evo/evodb.h                 |  6 +++++-
 src/init.cpp                    |  1 +
 src/instantsend/db.cpp          | 11 +++++------
 src/instantsend/db.h            |  7 +++++--
 src/instantsend/instantsend.cpp |  4 ++--
 src/instantsend/instantsend.h   |  5 ++++-
 src/llmq/context.cpp            | 10 +++++-----
 src/llmq/context.h              |  7 +++++--
 src/llmq/dkgsessionmgr.cpp      |  4 ++--
 src/llmq/dkgsessionmgr.h        |  5 ++++-
 src/llmq/quorums.cpp            |  6 +++---
 src/llmq/quorums.h              | 10 +++++++---
 src/llmq/signing.cpp            |  9 +++++----
 src/llmq/signing.h              |  8 ++++++--
 src/node/chainstate.cpp         |  9 ++++++---
 src/node/chainstate.h           |  7 ++++++-
 src/test/util/setup_common.cpp  |  7 ++++---
 19 files changed, 92 insertions(+), 44 deletions(-)

diff --git a/src/dbwrapper.h b/src/dbwrapper.h
index fea0ce67cdb0..bd6e847180a6 100644
--- a/src/dbwrapper.h
+++ b/src/dbwrapper.h
@@ -709,4 +709,19 @@ class CDBTransaction {
     }
 };
 
+namespace util {
+struct DbWrapperParams
+{
+    const fs::path path{""};
+    const bool memory{false};
+    const bool wipe{false};
+    const size_t cache_size{1 << 20};
+};
+
+static inline std::unique_ptr<CDBWrapper> MakeDbWrapper(const DbWrapperParams& params)
+{
+    return std::make_unique<CDBWrapper>(params.path, params.cache_size, params.memory, params.wipe);
+}
+} // namespace util
+
 #endif // BITCOIN_DBWRAPPER_H
diff --git a/src/evo/evodb.cpp b/src/evo/evodb.cpp
index 03d8b5d02296..371e07ff466e 100644
--- a/src/evo/evodb.cpp
+++ b/src/evo/evodb.cpp
@@ -3,7 +3,6 @@
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
 #include <evo/evodb.h>
-#include <util/system.h>
 
 #include <uint256.h>
 
@@ -32,8 +31,8 @@ void CEvoDBScopedCommitter::Rollback()
     evoDB.RollbackCurTransaction();
 }
 
-CEvoDB::CEvoDB(bool fMemory, bool fWipe) :
-    db{std::make_unique<CDBWrapper>(fMemory ? "" : (gArgs.GetDataDirNet() / "evodb"), 64 << 20, fMemory, fWipe)},
+CEvoDB::CEvoDB(const util::DbWrapperParams& db_params) :
+    db{util::MakeDbWrapper({db_params.path / "evodb", db_params.memory, db_params.wipe, /*cache_size=*/64 << 20})},
     rootBatch{*db},
     rootDBTransaction{*db, rootBatch},
     curDBTransaction{rootDBTransaction, rootDBTransaction}
diff --git a/src/evo/evodb.h b/src/evo/evodb.h
index b86d91d416c5..32d5d655b1c6 100644
--- a/src/evo/evodb.h
+++ b/src/evo/evodb.h
@@ -9,6 +9,10 @@
 #include <sync.h>
 
 class uint256;
+namespace util {
+struct DbWrapperParams;
+} // namespace util
+
 // "b_b" was used in the initial version of deterministic MN storage
 // "b_b2" was used after compact diffs were introduced
 // "b_b3" was used after masternode type introduction in evoDB
@@ -49,7 +53,7 @@ class CEvoDB
     CEvoDB() = delete;
     CEvoDB(const CEvoDB&) = delete;
     CEvoDB& operator=(const CEvoDB&) = delete;
-    explicit CEvoDB(bool fMemory, bool fWipe);
+    explicit CEvoDB(const util::DbWrapperParams& db_params);
     ~CEvoDB();
 
     std::unique_ptr<CEvoDBScopedCommitter> BeginTransaction() EXCLUSIVE_LOCKS_REQUIRED(!cs)
diff --git a/src/init.cpp b/src/init.cpp
index 18d1cafe92c8..7779a773f390 100644
--- a/src/init.cpp
+++ b/src/init.cpp
@@ -1981,6 +1981,7 @@ bool AppInitMain(NodeContext& node, interfaces::BlockAndHeaderTipInfo* tip_info)
                                               node.mnhf_manager,
                                               node.llmq_ctx,
                                               Assert(node.mempool.get()),
+                                              args.GetDataDirNet(),
                                               fPruneMode,
                                               args.GetBoolArg("-addressindex", DEFAULT_ADDRESSINDEX),
                                               is_governance_enabled,
diff --git a/src/instantsend/db.cpp b/src/instantsend/db.cpp
index 695e297403bf..778596851385 100644
--- a/src/instantsend/db.cpp
+++ b/src/instantsend/db.cpp
@@ -26,23 +26,22 @@ static std::tuple<std::string, uint32_t, uint256> BuildInversedISLockKey(std::st
 }
 } // anonymous namespace
 
-CInstantSendDb::CInstantSendDb(bool unitTests, bool fWipe) :
-    db(std::make_unique<CDBWrapper>(unitTests ? "" : (gArgs.GetDataDirNet() / "llmq/isdb"), 32 << 20, unitTests, fWipe))
+CInstantSendDb::CInstantSendDb(const util::DbWrapperParams& db_params) :
+    db{util::MakeDbWrapper({db_params.path / "llmq" / "isdb", db_params.memory, db_params.wipe, /*cache_size=*/32 << 20})}
 {
-    Upgrade(unitTests);
+    Upgrade({db_params.path / "llmq" / "isdb", db_params.memory, /*wipe=*/true, /*cache_size=*/32 << 20});
 }
 
 CInstantSendDb::~CInstantSendDb() = default;
 
-void CInstantSendDb::Upgrade(bool unitTests)
+void CInstantSendDb::Upgrade(const util::DbWrapperParams& db_params)
 {
     LOCK(cs_db);
     int v{0};
     if (!db->Read(DB_VERSION, v) || v < CInstantSendDb::CURRENT_VERSION) {
         // Wipe db
         db.reset();
-        db = std::make_unique<CDBWrapper>(unitTests ? "" : (gArgs.GetDataDirNet() / "llmq/isdb"), 32 << 20, unitTests,
-                                          /*fWipe=*/true);
+        db = util::MakeDbWrapper(db_params);
         CDBBatch batch(*db);
         batch.Write(DB_VERSION, CInstantSendDb::CURRENT_VERSION);
         // Sync DB changes to disk
diff --git a/src/instantsend/db.h b/src/instantsend/db.h
index 6ab07f4be8a5..e8b5deb405c6 100644
--- a/src/instantsend/db.h
+++ b/src/instantsend/db.h
@@ -24,6 +24,9 @@ class CBlockIndex;
 class CDBBatch;
 class CDBWrapper;
 class COutPoint;
+namespace util {
+struct DbWrapperParams;
+} // namespace util
 
 namespace instantsend {
 class CInstantSendDb
@@ -78,10 +81,10 @@ class CInstantSendDb
     uint256 GetInstantSendLockHashByTxidInternal(const uint256& txid) const EXCLUSIVE_LOCKS_REQUIRED(cs_db);
 
 
-    void Upgrade(bool unitTests) EXCLUSIVE_LOCKS_REQUIRED(!cs_db);
+    void Upgrade(const util::DbWrapperParams& db_params) EXCLUSIVE_LOCKS_REQUIRED(!cs_db);
 
 public:
-    explicit CInstantSendDb(bool unitTests, bool fWipe);
+    explicit CInstantSendDb(const util::DbWrapperParams& db_params);
     ~CInstantSendDb();
 
     /**
diff --git a/src/instantsend/instantsend.cpp b/src/instantsend/instantsend.cpp
index 34537ffb64c8..2ddb6e80083e 100644
--- a/src/instantsend/instantsend.cpp
+++ b/src/instantsend/instantsend.cpp
@@ -58,8 +58,8 @@ Uint256HashSet GetIdsFromLockable(const std::vector<T>& vec)
 
 CInstantSendManager::CInstantSendManager(CChainLocksHandler& _clhandler, CChainState& chainstate, CQuorumManager& _qman,
                                          CSigningManager& _sigman, CSporkManager& sporkman, CTxMemPool& _mempool,
-                                         const CMasternodeSync& mn_sync, bool unitTests, bool fWipe) :
-    db{unitTests, fWipe},
+                                         const CMasternodeSync& mn_sync, const util::DbWrapperParams& db_params) :
+    db{db_params},
     clhandler{_clhandler},
     m_chainstate{chainstate},
     qman{_qman},
diff --git a/src/instantsend/instantsend.h b/src/instantsend/instantsend.h
index 2e396c745db4..d9343e9cf418 100644
--- a/src/instantsend/instantsend.h
+++ b/src/instantsend/instantsend.h
@@ -31,6 +31,9 @@ class PeerManager;
 namespace Consensus {
 struct LLMQParams;
 } // namespace Consensus
+namespace util {
+struct DbWrapperParams;
+} // namespace util
 
 namespace instantsend {
 class InstantSendSigner;
@@ -94,7 +97,7 @@ class CInstantSendManager final : public instantsend::InstantSendSignerParent
     CInstantSendManager& operator=(const CInstantSendManager&) = delete;
     explicit CInstantSendManager(CChainLocksHandler& _clhandler, CChainState& chainstate, CQuorumManager& _qman,
                                  CSigningManager& _sigman, CSporkManager& sporkman, CTxMemPool& _mempool,
-                                 const CMasternodeSync& mn_sync, bool unitTests, bool fWipe);
+                                 const CMasternodeSync& mn_sync, const util::DbWrapperParams& db_params);
     ~CInstantSendManager();
 
     void ConnectSigner(gsl::not_null<instantsend::InstantSendSigner*> signer)
diff --git a/src/llmq/context.cpp b/src/llmq/context.cpp
index 359d2a23924c..9e8cb27dea71 100644
--- a/src/llmq/context.cpp
+++ b/src/llmq/context.cpp
@@ -18,7 +18,7 @@
 LLMQContext::LLMQContext(ChainstateManager& chainman, CDeterministicMNManager& dmnman, CEvoDB& evo_db,
                          CMasternodeMetaMan& mn_metaman, CMNHFManager& mnhfman, CSporkManager& sporkman,
                          CTxMemPool& mempool, const CActiveMasternodeManager* const mn_activeman,
-                         const CMasternodeSync& mn_sync, bool unit_tests, bool wipe) :
+                         const CMasternodeSync& mn_sync, const util::DbWrapperParams& db_params) :
     bls_worker{std::make_shared<CBLSWorker>()},
     dkg_debugman{std::make_unique<llmq::CDKGDebugManager>()},
     qsnapman{std::make_unique<llmq::CQuorumSnapshotManager>(evo_db)},
@@ -26,14 +26,14 @@ LLMQContext::LLMQContext(ChainstateManager& chainman, CDeterministicMNManager& d
         std::make_unique<llmq::CQuorumBlockProcessor>(chainman.ActiveChainstate(), dmnman, evo_db, *qsnapman)},
     qdkgsman{std::make_unique<llmq::CDKGSessionManager>(*bls_worker, chainman.ActiveChainstate(), dmnman, *dkg_debugman,
                                                         mn_metaman, *quorum_block_processor, *qsnapman, mn_activeman,
-                                                        sporkman, unit_tests, wipe)},
+                                                        sporkman, db_params)},
     qman{std::make_unique<llmq::CQuorumManager>(*bls_worker, chainman.ActiveChainstate(), dmnman, *qdkgsman, evo_db,
                                                 *quorum_block_processor, *qsnapman, mn_activeman, mn_sync, sporkman,
-                                                unit_tests, wipe)},
-    sigman{std::make_unique<llmq::CSigningManager>(chainman.ActiveChainstate(), *qman, unit_tests, wipe)},
+                                                db_params)},
+    sigman{std::make_unique<llmq::CSigningManager>(chainman.ActiveChainstate(), *qman, db_params)},
     clhandler{std::make_unique<llmq::CChainLocksHandler>(chainman.ActiveChainstate(), *qman, sporkman, mempool, mn_sync)},
     isman{std::make_unique<llmq::CInstantSendManager>(*clhandler, chainman.ActiveChainstate(), *qman, *sigman, sporkman,
-                                                      mempool, mn_sync, unit_tests, wipe)}
+                                                      mempool, mn_sync, db_params)}
 {
     // Have to start it early to let VerifyDB check ChainLock signatures in coinbase
     bls_worker->Start();
diff --git a/src/llmq/context.h b/src/llmq/context.h
index 7b861b943e7e..42441e899e70 100644
--- a/src/llmq/context.h
+++ b/src/llmq/context.h
@@ -28,7 +28,10 @@ class CQuorumBlockProcessor;
 class CQuorumManager;
 class CQuorumSnapshotManager;
 class CSigningManager;
-}
+} // namespace llmq
+namespace util {
+struct DbWrapperParams;
+} // namespace util
 
 struct LLMQContext {
 public:
@@ -38,7 +41,7 @@ struct LLMQContext {
     explicit LLMQContext(ChainstateManager& chainman, CDeterministicMNManager& dmnman, CEvoDB& evo_db,
                          CMasternodeMetaMan& mn_metaman, CMNHFManager& mnhfman, CSporkManager& sporkman,
                          CTxMemPool& mempool, const CActiveMasternodeManager* const mn_activeman,
-                         const CMasternodeSync& mn_sync, bool unit_tests, bool wipe);
+                         const CMasternodeSync& mn_sync, const util::DbWrapperParams& db_params);
     ~LLMQContext();
 
     void Interrupt();
diff --git a/src/llmq/dkgsessionmgr.cpp b/src/llmq/dkgsessionmgr.cpp
index af5f01ff8542..3c2fdc135fbc 100644
--- a/src/llmq/dkgsessionmgr.cpp
+++ b/src/llmq/dkgsessionmgr.cpp
@@ -33,8 +33,8 @@ CDKGSessionManager::CDKGSessionManager(CBLSWorker& _blsWorker, CChainState& chai
                                        CDKGDebugManager& _dkgDebugManager, CMasternodeMetaMan& mn_metaman,
                                        CQuorumBlockProcessor& _quorumBlockProcessor, CQuorumSnapshotManager& qsnapman,
                                        const CActiveMasternodeManager* const mn_activeman,
-                                       const CSporkManager& sporkman, bool unitTests, bool fWipe) :
-    db{std::make_unique<CDBWrapper>(unitTests ? "" : (gArgs.GetDataDirNet() / "llmq/dkgdb"), 1 << 20, unitTests, fWipe)},
+                                       const CSporkManager& sporkman, const util::DbWrapperParams& db_params) :
+    db{util::MakeDbWrapper({db_params.path / "llmq" / "dkgdb", db_params.memory, db_params.wipe, /*cache_size=*/1 << 20})},
     blsWorker{_blsWorker},
     m_chainstate{chainstate},
     m_dmnman{dmnman},
diff --git a/src/llmq/dkgsessionmgr.h b/src/llmq/dkgsessionmgr.h
index b4380de1e11a..806d82eabaae 100644
--- a/src/llmq/dkgsessionmgr.h
+++ b/src/llmq/dkgsessionmgr.h
@@ -33,6 +33,9 @@ class CDKGContribution;
 class CDKGComplaint;
 class CDKGJustification;
 class CDKGPrematureCommitment;
+namespace util {
+struct DbWrapperParams;
+} // namespace util
 
 class UniValue;
 
@@ -85,7 +88,7 @@ class CDKGSessionManager
                                 CDKGDebugManager& _dkgDebugManager, CMasternodeMetaMan& mn_metaman,
                                 CQuorumBlockProcessor& _quorumBlockProcessor, CQuorumSnapshotManager& qsnapman,
                                 const CActiveMasternodeManager* const mn_activeman, const CSporkManager& sporkman,
-                                bool unitTests, bool fWipe);
+                                const util::DbWrapperParams& db_params);
     ~CDKGSessionManager();
 
     void StartThreads(CConnman& connman, PeerManager& peerman);
diff --git a/src/llmq/quorums.cpp b/src/llmq/quorums.cpp
index b0207d2cc94a..023d4243cffd 100644
--- a/src/llmq/quorums.cpp
+++ b/src/llmq/quorums.cpp
@@ -211,9 +211,9 @@ CQuorumManager::CQuorumManager(CBLSWorker& _blsWorker, CChainState& chainstate,
                                CDKGSessionManager& _dkgManager, CEvoDB& _evoDb,
                                CQuorumBlockProcessor& _quorumBlockProcessor, CQuorumSnapshotManager& qsnapman,
                                const CActiveMasternodeManager* const mn_activeman, const CMasternodeSync& mn_sync,
-                               const CSporkManager& sporkman, bool unit_tests, bool wipe) :
-    db{std::make_unique<CDBWrapper>(unit_tests ? "" : (gArgs.GetDataDirNet() / "llmq" / "quorumdb"), 1 << 20,
-                                    unit_tests, wipe)},
+                               const CSporkManager& sporkman, const util::DbWrapperParams& db_params) :
+    db{util::MakeDbWrapper(
+        {db_params.path / "llmq" / "quorumdb", db_params.memory, db_params.wipe, /*cache_size=*/1 << 20})},
     blsWorker{_blsWorker},
     m_chainstate{chainstate},
     m_dmnman{dmnman},
diff --git a/src/llmq/quorums.h b/src/llmq/quorums.h
index fbe958fd65b8..4a68be18f597 100644
--- a/src/llmq/quorums.h
+++ b/src/llmq/quorums.h
@@ -37,6 +37,9 @@ class CEvoDB;
 class CMasternodeSync;
 class CNode;
 class CSporkManager;
+namespace util {
+struct DbWrapperParams;
+} // namespace util
 
 namespace llmq
 {
@@ -263,9 +266,10 @@ class CQuorumManager
     CQuorumManager(const CQuorumManager&) = delete;
     CQuorumManager& operator=(const CQuorumManager&) = delete;
     explicit CQuorumManager(CBLSWorker& _blsWorker, CChainState& chainstate, CDeterministicMNManager& dmnman,
-                            CDKGSessionManager& _dkgManager, CEvoDB& _evoDb, CQuorumBlockProcessor& _quorumBlockProcessor,
-                            CQuorumSnapshotManager& qsnapman, const CActiveMasternodeManager* const mn_activeman,
-                            const CMasternodeSync& mn_sync, const CSporkManager& sporkman, bool unit_tests, bool wipe);
+                            CDKGSessionManager& _dkgManager, CEvoDB& _evoDb,
+                            CQuorumBlockProcessor& _quorumBlockProcessor, CQuorumSnapshotManager& qsnapman,
+                            const CActiveMasternodeManager* const mn_activeman, const CMasternodeSync& mn_sync,
+                            const CSporkManager& sporkman, const util::DbWrapperParams& db_params);
     ~CQuorumManager();
 
     void Start();
diff --git a/src/llmq/signing.cpp b/src/llmq/signing.cpp
index d1e47a297ec6..2511c1026a79 100644
--- a/src/llmq/signing.cpp
+++ b/src/llmq/signing.cpp
@@ -27,8 +27,8 @@
 
 namespace llmq
 {
-CRecoveredSigsDb::CRecoveredSigsDb(bool fMemory, bool fWipe) :
-        db(std::make_unique<CDBWrapper>(fMemory ? "" : (gArgs.GetDataDirNet() / "llmq/recsigdb"), 8 << 20, fMemory, fWipe))
+CRecoveredSigsDb::CRecoveredSigsDb(const util::DbWrapperParams& db_params) :
+    db{util::MakeDbWrapper({db_params.path / "llmq" / "recsigdb", db_params.memory, db_params.wipe, /*cache_size=*/8 << 20})}
 {
 }
 
@@ -332,8 +332,9 @@ void CRecoveredSigsDb::CleanupOldVotes(int64_t maxAge)
 
 //////////////////
 
-CSigningManager::CSigningManager(const CChainState& chainstate, const CQuorumManager& _qman, bool fMemory, bool fWipe) :
-    db{fMemory, fWipe},
+CSigningManager::CSigningManager(const CChainState& chainstate, const CQuorumManager& _qman,
+                                 const util::DbWrapperParams& db_params) :
+    db{db_params},
     m_chainstate{chainstate},
     qman{_qman}
 {
diff --git a/src/llmq/signing.h b/src/llmq/signing.h
index d436b94a26b8..2950a3d60dc4 100644
--- a/src/llmq/signing.h
+++ b/src/llmq/signing.h
@@ -32,6 +32,9 @@ class CDBWrapper;
 class CInv;
 class PeerManager;
 struct RPCResult;
+namespace util {
+struct DbWrapperParams;
+} // namespace util
 
 class UniValue;
 
@@ -124,7 +127,7 @@ class CRecoveredSigsDb
     mutable Uint256LruHashMap<bool, 30000> hasSigForHashCache GUARDED_BY(cs_cache);
 
 public:
-    explicit CRecoveredSigsDb(bool fMemory, bool fWipe);
+    explicit CRecoveredSigsDb(const util::DbWrapperParams& db_params);
     ~CRecoveredSigsDb();
 
     bool HasRecoveredSig(Consensus::LLMQType llmqType, const uint256& id, const uint256& msgHash) const;
@@ -183,7 +186,8 @@ class CSigningManager
     CSigningManager() = delete;
     CSigningManager(const CSigningManager&) = delete;
     CSigningManager& operator=(const CSigningManager&) = delete;
-    explicit CSigningManager(const CChainState& chainstate, const CQuorumManager& _qman, bool fMemory, bool fWipe);
+    explicit CSigningManager(const CChainState& chainstate, const CQuorumManager& _qman,
+                             const util::DbWrapperParams& db_params);
     ~CSigningManager();
 
     bool AlreadyHave(const CInv& inv) const EXCLUSIVE_LOCKS_REQUIRED(!cs_pending);
diff --git a/src/node/chainstate.cpp b/src/node/chainstate.cpp
index 8e651d3bff78..cb3efc17e475 100644
--- a/src/node/chainstate.cpp
+++ b/src/node/chainstate.cpp
@@ -48,6 +48,7 @@ std::optional<ChainstateLoadingError> LoadChainstate(bool fReset,
                                                      std::unique_ptr<CMNHFManager>& mnhf_manager,
                                                      std::unique_ptr<LLMQContext>& llmq_ctx,
                                                      CTxMemPool* mempool,
+                                                     const fs::path& data_dir,
                                                      bool fPruneMode,
                                                      bool is_addrindex_enabled,
                                                      bool is_governance_enabled,
@@ -72,7 +73,7 @@ std::optional<ChainstateLoadingError> LoadChainstate(bool fReset,
     LOCK(cs_main);
 
     evodb.reset();
-    evodb = std::make_unique<CEvoDB>(/*fMemory=*/false, /*fWipe=*/fReset || fReindexChainState);
+    evodb = std::make_unique<CEvoDB>(util::DbWrapperParams{.path = data_dir, .memory = false, .wipe = fReset || fReindexChainState});
 
     mnhf_manager.reset();
     mnhf_manager = std::make_unique<CMNHFManager>(*evodb);
@@ -88,7 +89,7 @@ std::optional<ChainstateLoadingError> LoadChainstate(bool fReset,
     pblocktree.reset(new CBlockTreeDB(nBlockTreeDBCache, block_tree_db_in_memory, fReset));
 
     DashChainstateSetup(chainman, govman, mn_metaman, mn_sync, sporkman, mn_activeman, chain_helper, cpoolman,
-                        dmnman, evodb, mnhf_manager, llmq_ctx, mempool, fReset, fReindexChainState,
+                        dmnman, evodb, mnhf_manager, llmq_ctx, mempool, data_dir, fReset, fReindexChainState,
                         consensus_params);
 
     if (fReset) {
@@ -228,6 +229,7 @@ void DashChainstateSetup(ChainstateManager& chainman,
                          std::unique_ptr<CMNHFManager>& mnhf_manager,
                          std::unique_ptr<LLMQContext>& llmq_ctx,
                          CTxMemPool* mempool,
+                         const fs::path& data_dir,
                          bool fReset,
                          bool fReindexChainState,
                          const Consensus::Params& consensus_params)
@@ -245,7 +247,8 @@ void DashChainstateSetup(ChainstateManager& chainman,
     }
     llmq_ctx.reset();
     llmq_ctx = std::make_unique<LLMQContext>(chainman, *dmnman, *evodb, mn_metaman, *mnhf_manager, sporkman,
-                                             *mempool, mn_activeman.get(), mn_sync, /*unit_tests=*/false, /*wipe=*/fReset || fReindexChainState);
+                                             *mempool, mn_activeman.get(), mn_sync,
+                                             util::DbWrapperParams{.path = data_dir, .memory = false, .wipe = fReset || fReindexChainState});
     mempool->ConnectManagers(dmnman.get(), llmq_ctx->isman.get());
     // Enable CMNHFManager::{Process, Undo}Block
     mnhf_manager->ConnectManagers(&chainman, llmq_ctx->qman.get());
diff --git a/src/node/chainstate.h b/src/node/chainstate.h
index 3279d52b90ec..090eea260cf3 100644
--- a/src/node/chainstate.h
+++ b/src/node/chainstate.h
@@ -27,7 +27,10 @@ struct LLMQContext;
 
 namespace Consensus {
 struct Params;
-}
+} // namespace Consensus
+namespace fs {
+class path;
+} // namespace fs
 
 namespace node {
 enum class ChainstateLoadingError {
@@ -90,6 +93,7 @@ std::optional<ChainstateLoadingError> LoadChainstate(bool fReset,
                                                      std::unique_ptr<CMNHFManager>& mnhf_manager,
                                                      std::unique_ptr<LLMQContext>& llmq_ctx,
                                                      CTxMemPool* mempool,
+                                                     const fs::path& data_dir,
                                                      bool fPruneMode,
                                                      bool is_addrindex_enabled,
                                                      bool is_governance_enabled,
@@ -121,6 +125,7 @@ void DashChainstateSetup(ChainstateManager& chainman,
                          std::unique_ptr<CMNHFManager>& mnhf_manager,
                          std::unique_ptr<LLMQContext>& llmq_ctx,
                          CTxMemPool* mempool,
+                         const fs::path& data_dir,
                          bool fReset,
                          bool fReindexChainState,
                          const Consensus::Params& consensus_params);
diff --git a/src/test/util/setup_common.cpp b/src/test/util/setup_common.cpp
index 6cece8274664..9b12c34e3684 100644
--- a/src/test/util/setup_common.cpp
+++ b/src/test/util/setup_common.cpp
@@ -131,8 +131,8 @@ void DashChainstateSetup(ChainstateManager& chainman,
 {
     DashChainstateSetup(chainman, *Assert(node.govman.get()), *Assert(node.mn_metaman.get()), *Assert(node.mn_sync.get()),
                         *Assert(node.sporkman.get()), node.mn_activeman, node.chain_helper, node.cpoolman, node.dmnman,
-                        node.evodb, node.mnhf_manager, node.llmq_ctx, Assert(node.mempool.get()), fReset, fReindexChainState,
-                        consensus_params);
+                        node.evodb, node.mnhf_manager, node.llmq_ctx, Assert(node.mempool.get()), node.args->GetDataDirNet(),
+                        fReset, fReindexChainState, consensus_params);
 }
 
 void DashChainstateSetupClose(NodeContext& node)
@@ -214,7 +214,7 @@ BasicTestingSetup::BasicTestingSetup(const std::string& chainName, const std::ve
     m_node.connman = std::make_unique<ConnmanTestMsg>(0x1337, 0x1337, *m_node.addrman, *m_node.netgroupman); // Deterministic randomness for tests.
 
     fCheckBlockIndex = true;
-    m_node.evodb = std::make_unique<CEvoDB>(/*fMemory=*/true, /*fWipe=*/true);
+    m_node.evodb = std::make_unique<CEvoDB>(util::DbWrapperParams{.path = m_node.args->GetDataDirNet(), .memory = true, .wipe = true});
     m_node.mnhf_manager = std::make_unique<CMNHFManager>(*m_node.evodb);
     m_node.cpoolman = std::make_unique<CCreditPoolManager>(*m_node.evodb);
     static bool noui_connected = false;
@@ -311,6 +311,7 @@ TestingSetup::TestingSetup(const std::string& chainName, const std::vector<const
                                            m_node.mnhf_manager,
                                            m_node.llmq_ctx,
                                            Assert(m_node.mempool.get()),
+                                           Assert(m_node.args)->GetDataDirNet(),
                                            fPruneMode,
                                            m_args.GetBoolArg("-addressindex", DEFAULT_ADDRESSINDEX),
                                            !m_args.GetBoolArg("-disablegovernance", !DEFAULT_GOVERNANCE_ENABLE),

From 8763104768317d33172dc15584941a508013c5e7 Mon Sep 17 00:00:00 2001
From: Kittywhiskers Van Gogh <63189531+kwvg@users.noreply.github.com>
Date: Sun, 19 Oct 2025 23:52:04 +0530
Subject: [PATCH 317/656] refactor: clean up {c,d}tor for `TestingSetup`s

---
 src/test/util/setup_common.cpp | 40 +++++++++++++++++++---------------
 1 file changed, 23 insertions(+), 17 deletions(-)

diff --git a/src/test/util/setup_common.cpp b/src/test/util/setup_common.cpp
index 9b12c34e3684..51e2a460dfb8 100644
--- a/src/test/util/setup_common.cpp
+++ b/src/test/util/setup_common.cpp
@@ -189,8 +189,8 @@ BasicTestingSetup::BasicTestingSetup(const std::string& chainName, const std::ve
     SetupNetworking();
     InitSignatureCache();
     InitScriptExecutionCache();
-    m_node.chain = interfaces::MakeChain(m_node);
 
+    m_node.chain = interfaces::MakeChain(m_node);
     m_node.netgroupman = std::make_unique<NetGroupManager>(/*asmap=*/std::vector<bool>());
     m_node.addrman = std::make_unique<AddrMan>(*m_node.netgroupman,
                                                /*deterministic=*/false,
@@ -203,6 +203,7 @@ BasicTestingSetup::BasicTestingSetup(const std::string& chainName, const std::ve
             strprintf("Invalid -socketevents ('%s') specified. Only these modes are supported: %s",
                       sem_str, GetSupportedSocketEventsStr()));
     }
+
     {
         auto stats_client = StatsdClient::make(*m_node.args);
         if (!stats_client) {
@@ -214,32 +215,43 @@ BasicTestingSetup::BasicTestingSetup(const std::string& chainName, const std::ve
     m_node.connman = std::make_unique<ConnmanTestMsg>(0x1337, 0x1337, *m_node.addrman, *m_node.netgroupman); // Deterministic randomness for tests.
 
     fCheckBlockIndex = true;
+
+    m_node.mn_metaman = std::make_unique<CMasternodeMetaMan>();
+    m_node.netfulfilledman = std::make_unique<CNetFulfilledRequestManager>();
+    m_node.sporkman = std::make_unique<CSporkManager>();
     m_node.evodb = std::make_unique<CEvoDB>(util::DbWrapperParams{.path = m_node.args->GetDataDirNet(), .memory = true, .wipe = true});
-    m_node.mnhf_manager = std::make_unique<CMNHFManager>(*m_node.evodb);
     m_node.cpoolman = std::make_unique<CCreditPoolManager>(*m_node.evodb);
+    m_node.mnhf_manager = std::make_unique<CMNHFManager>(*m_node.evodb);
+
     static bool noui_connected = false;
     if (!noui_connected) {
         noui_connect();
         noui_connected = true;
     }
+
     bls::bls_legacy_scheme.store(true);
 }
 
 BasicTestingSetup::~BasicTestingSetup()
 {
     SetMockTime(0s); // Reset mocktime for following tests
-    m_node.cpoolman.reset();
+    LogInstance().DisconnectTestLogger();
+    fs::remove_all(m_path_root);
+    gArgs.ClearArgs();
+
     m_node.mnhf_manager.reset();
+    m_node.cpoolman.reset();
     m_node.evodb.reset();
-    ::g_socket_events_mode = SocketEventsMode::Unknown;
+    m_node.sporkman.reset();
+    m_node.netfulfilledman.reset();
+    m_node.mn_metaman.reset();
     m_node.connman.reset();
+    ::g_stats_client.reset();
+    ::g_socket_events_mode = SocketEventsMode::Unknown;
     m_node.addrman.reset();
     m_node.netgroupman.reset();
-    ::g_stats_client.reset();
+    m_node.args = nullptr;
 
-    LogInstance().DisconnectTestLogger();
-    fs::remove_all(m_path_root);
-    gArgs.ClearArgs();
     ECC_Stop();
 }
 
@@ -260,9 +272,6 @@ ChainTestingSetup::ChainTestingSetup(const std::string& chainName, const std::ve
     m_node.chainman = std::make_unique<ChainstateManager>();
     m_node.chainman->m_blockman.m_block_tree_db = std::make_unique<CBlockTreeDB>(m_cache_sizes.block_tree_db, true);
 
-    m_node.mn_metaman = std::make_unique<CMasternodeMetaMan>();
-    m_node.netfulfilledman = std::make_unique<CNetFulfilledRequestManager>();
-    m_node.sporkman = std::make_unique<CSporkManager>();
     m_node.mn_sync = std::make_unique<CMasternodeSync>(*m_node.connman, *m_node.netfulfilledman);
     m_node.govman = std::make_unique<CGovernanceManager>(*m_node.mn_metaman, *m_node.netfulfilledman, *m_node.chainman, m_node.dmnman, *m_node.mn_sync);
 
@@ -278,15 +287,12 @@ ChainTestingSetup::~ChainTestingSetup()
     StopScriptCheckWorkerThreads();
     GetMainSignals().FlushBackgroundCallbacks();
     GetMainSignals().UnregisterBackgroundSignalScheduler();
-    m_node.mn_sync.reset();
     m_node.govman.reset();
-    m_node.sporkman.reset();
-    m_node.netfulfilledman.reset();
-    m_node.mn_metaman.reset();
-    m_node.args = nullptr;
+    m_node.mn_sync.reset();
+    m_node.chainman.reset();
     m_node.mempool.reset();
+    m_node.fee_estimator.reset();
     m_node.scheduler.reset();
-    m_node.chainman.reset();
 }
 
 TestingSetup::TestingSetup(const std::string& chainName, const std::vector<const char*>& extra_args)

From 3c85563754ee59c770445cc9f497c80fead87357 Mon Sep 17 00:00:00 2001
From: Kittywhiskers Van Gogh <63189531+kwvg@users.noreply.github.com>
Date: Mon, 27 Oct 2025 01:57:36 +0530
Subject: [PATCH 318/656] fix: keep databases in memory if running unit tests

---
 src/init.cpp                                    |  1 +
 src/node/chainstate.cpp                         | 13 +++++++------
 src/node/chainstate.h                           |  5 +++--
 src/test/util/setup_common.cpp                  |  9 +++++----
 src/test/util/setup_common.h                    |  4 ++--
 src/test/validation_chainstatemanager_tests.cpp |  4 ++--
 6 files changed, 20 insertions(+), 16 deletions(-)

diff --git a/src/init.cpp b/src/init.cpp
index 7779a773f390..ffc64fe710cf 100644
--- a/src/init.cpp
+++ b/src/init.cpp
@@ -1996,6 +1996,7 @@ bool AppInitMain(NodeContext& node, interfaces::BlockAndHeaderTipInfo* tip_info)
                                               cache_sizes.coins,
                                               /*block_tree_db_in_memory=*/false,
                                               /*coins_db_in_memory=*/false,
+                                              /*dash_dbs_in_memory=*/false,
                                               /*shutdown_requested=*/ShutdownRequested,
                                               /*coins_error_cb=*/[]() {
                                                   uiInterface.ThreadSafeMessageBox(
diff --git a/src/node/chainstate.cpp b/src/node/chainstate.cpp
index cb3efc17e475..8812f7b64829 100644
--- a/src/node/chainstate.cpp
+++ b/src/node/chainstate.cpp
@@ -63,6 +63,7 @@ std::optional<ChainstateLoadingError> LoadChainstate(bool fReset,
                                                      int64_t nCoinCacheUsage,
                                                      bool block_tree_db_in_memory,
                                                      bool coins_db_in_memory,
+                                                     bool dash_dbs_in_memory,
                                                      std::function<bool()> shutdown_requested,
                                                      std::function<void()> coins_error_cb)
 {
@@ -73,7 +74,7 @@ std::optional<ChainstateLoadingError> LoadChainstate(bool fReset,
     LOCK(cs_main);
 
     evodb.reset();
-    evodb = std::make_unique<CEvoDB>(util::DbWrapperParams{.path = data_dir, .memory = false, .wipe = fReset || fReindexChainState});
+    evodb = std::make_unique<CEvoDB>(util::DbWrapperParams{.path = data_dir, .memory = dash_dbs_in_memory, .wipe = fReset || fReindexChainState});
 
     mnhf_manager.reset();
     mnhf_manager = std::make_unique<CMNHFManager>(*evodb);
@@ -89,8 +90,8 @@ std::optional<ChainstateLoadingError> LoadChainstate(bool fReset,
     pblocktree.reset(new CBlockTreeDB(nBlockTreeDBCache, block_tree_db_in_memory, fReset));
 
     DashChainstateSetup(chainman, govman, mn_metaman, mn_sync, sporkman, mn_activeman, chain_helper, cpoolman,
-                        dmnman, evodb, mnhf_manager, llmq_ctx, mempool, data_dir, fReset, fReindexChainState,
-                        consensus_params);
+                        dmnman, evodb, mnhf_manager, llmq_ctx, mempool, data_dir, dash_dbs_in_memory,
+                        /*llmq_dbs_wipe=*/fReset || fReindexChainState, consensus_params);
 
     if (fReset) {
         pblocktree->WriteReindexing(true);
@@ -230,8 +231,8 @@ void DashChainstateSetup(ChainstateManager& chainman,
                          std::unique_ptr<LLMQContext>& llmq_ctx,
                          CTxMemPool* mempool,
                          const fs::path& data_dir,
-                         bool fReset,
-                         bool fReindexChainState,
+                         bool llmq_dbs_in_memory,
+                         bool llmq_dbs_wipe,
                          const Consensus::Params& consensus_params)
 {
     // Same logic as pblocktree
@@ -248,7 +249,7 @@ void DashChainstateSetup(ChainstateManager& chainman,
     llmq_ctx.reset();
     llmq_ctx = std::make_unique<LLMQContext>(chainman, *dmnman, *evodb, mn_metaman, *mnhf_manager, sporkman,
                                              *mempool, mn_activeman.get(), mn_sync,
-                                             util::DbWrapperParams{.path = data_dir, .memory = false, .wipe = fReset || fReindexChainState});
+                                             util::DbWrapperParams{.path = data_dir, .memory = llmq_dbs_in_memory, .wipe = llmq_dbs_wipe});
     mempool->ConnectManagers(dmnman.get(), llmq_ctx->isman.get());
     // Enable CMNHFManager::{Process, Undo}Block
     mnhf_manager->ConnectManagers(&chainman, llmq_ctx->qman.get());
diff --git a/src/node/chainstate.h b/src/node/chainstate.h
index 090eea260cf3..aba1ccaa5fc6 100644
--- a/src/node/chainstate.h
+++ b/src/node/chainstate.h
@@ -108,6 +108,7 @@ std::optional<ChainstateLoadingError> LoadChainstate(bool fReset,
                                                      int64_t nCoinCacheUsage,
                                                      bool block_tree_db_in_memory,
                                                      bool coins_db_in_memory,
+                                                     bool dash_dbs_in_memory,
                                                      std::function<bool()> shutdown_requested = nullptr,
                                                      std::function<void()> coins_error_cb = nullptr);
 
@@ -126,8 +127,8 @@ void DashChainstateSetup(ChainstateManager& chainman,
                          std::unique_ptr<LLMQContext>& llmq_ctx,
                          CTxMemPool* mempool,
                          const fs::path& data_dir,
-                         bool fReset,
-                         bool fReindexChainState,
+                         bool llmq_dbs_in_memory,
+                         bool llmq_dbs_wipe,
                          const Consensus::Params& consensus_params);
 
 void DashChainstateSetupClose(std::unique_ptr<CChainstateHelper>& chain_helper,
diff --git a/src/test/util/setup_common.cpp b/src/test/util/setup_common.cpp
index 51e2a460dfb8..c45177f82ba3 100644
--- a/src/test/util/setup_common.cpp
+++ b/src/test/util/setup_common.cpp
@@ -125,14 +125,14 @@ std::ostream& operator<<(std::ostream& os, const uint256& num)
 
 void DashChainstateSetup(ChainstateManager& chainman,
                          NodeContext& node,
-                         bool fReset,
-                         bool fReindexChainState,
+                         bool llmq_dbs_in_memory,
+                         bool llmq_dbs_wipe,
                          const Consensus::Params& consensus_params)
 {
     DashChainstateSetup(chainman, *Assert(node.govman.get()), *Assert(node.mn_metaman.get()), *Assert(node.mn_sync.get()),
                         *Assert(node.sporkman.get()), node.mn_activeman, node.chain_helper, node.cpoolman, node.dmnman,
                         node.evodb, node.mnhf_manager, node.llmq_ctx, Assert(node.mempool.get()), node.args->GetDataDirNet(),
-                        fReset, fReindexChainState, consensus_params);
+                        llmq_dbs_in_memory, llmq_dbs_wipe, consensus_params);
 }
 
 void DashChainstateSetupClose(NodeContext& node)
@@ -331,7 +331,8 @@ TestingSetup::TestingSetup(const std::string& chainName, const std::vector<const
                                            m_cache_sizes.coins_db,
                                            m_cache_sizes.coins,
                                            /*block_tree_db_in_memory=*/true,
-                                           /*coins_db_in_memory=*/true);
+                                           /*coins_db_in_memory=*/true,
+                                           /*dash_dbs_in_memory=*/true);
     assert(!maybe_load_error.has_value());
 
     auto maybe_verify_error = VerifyLoadedChainstate(
diff --git a/src/test/util/setup_common.h b/src/test/util/setup_common.h
index 0f2ce36d2433..ae4896c764ac 100644
--- a/src/test/util/setup_common.h
+++ b/src/test/util/setup_common.h
@@ -87,8 +87,8 @@ static constexpr CAmount CENT{1000000};
 /** Initialize Dash-specific components during chainstate initialization (NodeContext-friendly aliases) */
 void DashChainstateSetup(ChainstateManager& chainman,
                          node::NodeContext& node,
-                         bool fReset,
-                         bool fReindexChainState,
+                         bool llmq_dbs_in_memory,
+                         bool llmq_dbs_wipe,
                          const Consensus::Params& consensus_params);
 void DashChainstateSetupClose(node::NodeContext& node);
 
diff --git a/src/test/validation_chainstatemanager_tests.cpp b/src/test/validation_chainstatemanager_tests.cpp
index 0900bf53a558..e3c7fb38dfe4 100644
--- a/src/test/validation_chainstatemanager_tests.cpp
+++ b/src/test/validation_chainstatemanager_tests.cpp
@@ -51,7 +51,7 @@ BOOST_AUTO_TEST_CASE(chainstatemanager)
         /*cache_size_bytes=*/1 << 23, /*in_memory=*/true, /*should_wipe=*/false);
     WITH_LOCK(::cs_main, c1.InitCoinsCache(1 << 23));
 
-    DashChainstateSetup(manager, m_node, /*fReset=*/false, /*fReindexChainState=*/false, consensus_params);
+    DashChainstateSetup(manager, m_node, /*llmq_dbs_in_memory=*/true, /*llmq_dbs_wipe=*/false, consensus_params);
 
     BOOST_CHECK(!manager.IsSnapshotActive());
     BOOST_CHECK(WITH_LOCK(::cs_main, return !manager.IsSnapshotValidated()));
@@ -84,7 +84,7 @@ BOOST_AUTO_TEST_CASE(chainstatemanager)
     );
     chainstates.push_back(&c2);
 
-    DashChainstateSetup(manager, m_node, /*fReset=*/false, /*fReindexChainState=*/false, consensus_params);
+    DashChainstateSetup(manager, m_node, /*llmq_dbs_in_memory=*/true, /*llmq_dbs_wipe=*/false, consensus_params);
 
     BOOST_CHECK_EQUAL(manager.SnapshotBlockhash().value(), snapshot_blockhash);
 

From fdf564596464024d0be45f8650bc97768656e31f Mon Sep 17 00:00:00 2001
From: UdjinM6 <UdjinM6@users.noreply.github.com>
Date: Thu, 23 Oct 2025 00:55:08 +0300
Subject: [PATCH 319/656] ru

---
 src/qt/locale/dash_ru.ts | 806 +++++++++++++++++++++++++++++----------
 1 file changed, 600 insertions(+), 206 deletions(-)

diff --git a/src/qt/locale/dash_ru.ts b/src/qt/locale/dash_ru.ts
index 2fb7a706af2a..76dcb8119ce4 100644
--- a/src/qt/locale/dash_ru.ts
+++ b/src/qt/locale/dash_ru.ts
@@ -65,14 +65,6 @@
         <source>C&amp;hoose</source>
         <translation>&amp;Выбрать</translation>
     </message>
-    <message>
-        <source>Sending addresses</source>
-        <translation>Адреса отправки</translation>
-    </message>
-    <message>
-        <source>Receiving addresses</source>
-        <translation>Адреса получения</translation>
-    </message>
     <message>
         <source>These are your Dash addresses for sending payments. Always check the amount and the receiving address before sending coins.</source>
         <translation>Это ваши адреса Dash для отправки платежей. Всегда проверяйте количество и адрес получателя перед отправкой перевода.</translation>
@@ -115,6 +107,14 @@
         <extracomment>An error message. %1 is a stand-in argument for the name of the file we attempted to save to.</extracomment>
         <translation>Произошла ошибка при сохранении адресной книги в %1. Пожалуйста, попробуйте еще раз.</translation>
     </message>
+    <message>
+        <source>Sending addresses - %1</source>
+        <translation>Адреса отправки - %1</translation>
+    </message>
+    <message>
+        <source>Receiving addresses - %1</source>
+        <translation>Адреса получения - %1</translation>
+    </message>
     <message>
         <source>Exporting Failed</source>
         <translation>Экспорт не удался</translation>
@@ -282,12 +282,24 @@
     </message>
     <message>
         <source>The passphrase entered for the wallet decryption was incorrect.</source>
-        <translation>Указанный пароль не подходит.</translation>
+        <translation>Введённая парольная фраза для расшифровки кошелька неверна.</translation>
+    </message>
+    <message>
+        <source>The passphrase entered for the wallet decryption is incorrect. It contains a null character (ie - a zero byte). If the passphrase was set with a version of this software prior to 23.0, please try again with only the characters up to — but not including — the first null character. If this is successful, please set a new passphrase to avoid this issue in the future.</source>
+        <translation>Введённая парольная фраза для расшифровки кошелька неверна. Она содержит нулевой символ (т.е. нулевой байт). Если парольная фраза была установлена в версии этого программного обеспечения до 23.0, попробуйте еще раз, используя только символы до первого нулевого символа, не включая его. Если это сработает, установите новую парольную фразу, чтобы избежать этой проблемы в будущем.</translation>
     </message>
     <message>
         <source>Wallet passphrase was successfully changed.</source>
         <translation>Пароль кошелька успешно изменён.</translation>
     </message>
+    <message>
+        <source>Passphrase change failed</source>
+        <translation>Не удалось сменить пароль</translation>
+    </message>
+    <message>
+        <source>The old passphrase entered for the wallet decryption is incorrect. It contains a null character (ie - a zero byte). If the passphrase was set with a version of this software prior to 23.0, please try again with only the characters up to — but not including — the first null character.</source>
+        <translation>Введённая старая парольная фраза для расшифровки кошелька неверна. Она содержит нулевой символ (т.е. нулевой байт). Если парольная фраза была установлена в версии этого программного обеспечения до 23.0, попробуйте еще раз, используя только символы до первого нулевого символа, не включая его.</translation>
+    </message>
     <message>
         <source>Warning: The Caps Lock key is on!</source>
         <translation>Внимание: включен Caps Lock!</translation>
@@ -392,10 +404,6 @@
         <source>&amp;Load PSBT from file…</source>
         <translation>&amp;Загрузить PSBT из файла…</translation>
     </message>
-    <message>
-        <source>Load PSBT from clipboard…</source>
-        <translation>Загрузить PSBT из буфера обмена…</translation>
-    </message>
     <message>
         <source>&amp;Sending addresses</source>
         <translation>Адреса &amp;отправки</translation>
@@ -428,10 +436,6 @@
         <source>&amp;Window</source>
         <translation>&amp;Окно</translation>
     </message>
-    <message>
-        <source>Minimize</source>
-        <translation>Свернуть</translation>
-    </message>
     <message>
         <source>Zoom</source>
         <translation>Увеличить</translation>
@@ -484,14 +488,6 @@
         <source>Modify configuration options for %1</source>
         <translation>Изменить параметры конфигурации %1</translation>
     </message>
-    <message>
-        <source>&amp;Show / Hide</source>
-        <translation>&amp;Показать / Скрыть</translation>
-    </message>
-    <message>
-        <source>Show or hide the main Window</source>
-        <translation>Показать или скрыть главное окно</translation>
-    </message>
     <message>
         <source>Encrypt the private keys that belong to your wallet</source>
         <translation>Зашифровать закрытые ключи, содержащиеся в вашем кошельке</translation>
@@ -556,10 +552,6 @@
         <source>Show wallet repair options</source>
         <translation>Показать варианты ремонта кошелька</translation>
     </message>
-    <message>
-        <source>Open Wallet &amp;Configuration File</source>
-        <translation>Открыть файл &amp;настроек кошелька</translation>
-    </message>
     <message>
         <source>Open configuration file</source>
         <translation>Открыть файл настроек</translation>
@@ -614,10 +606,18 @@
         <source>Show information about %1</source>
         <translation>Показать информацию о %1</translation>
     </message>
+    <message>
+        <source>Load PSBT from &amp;clipboard…</source>
+        <translation>Загрузить PSBT из &amp;буфера обмена…</translation>
+    </message>
     <message>
         <source>Open debugging and diagnostic console</source>
         <translation>Открыть консоль отладки и диагностики</translation>
     </message>
+    <message>
+        <source>Open &amp;wallet configuration file</source>
+        <translation>Открыть файл &amp;настроек кошелька</translation>
+    </message>
     <message>
         <source>Open a dash: URI</source>
         <translation>Открыть dash: URI</translation>
@@ -626,6 +626,16 @@
         <source>Create a new wallet</source>
         <translation>Создать новый кошелёк</translation>
     </message>
+    <message>
+        <source>Restore Wallet…</source>
+        <extracomment>Name of the menu item that restores wallet from a backup file.</extracomment>
+        <translation>Восстановить кошелёк…</translation>
+    </message>
+    <message>
+        <source>Restore a wallet from a backup file</source>
+        <extracomment>Status tip for Restore Wallet menu item</extracomment>
+        <translation>Восстановить кошелёк из резервной копии</translation>
+    </message>
     <message>
         <source>Close all wallets</source>
         <translation>Закрыть все кошельки</translation>
@@ -646,10 +656,34 @@
         <source>Mask the values in the Overview tab</source>
         <translation>Скрыть суммы на вкладке Обзор</translation>
     </message>
+    <message>
+        <source>Wallet Data</source>
+        <extracomment>Name of the wallet data file format.</extracomment>
+        <translation>Данные кошелька</translation>
+    </message>
+    <message>
+        <source>Load Wallet Backup</source>
+        <extracomment>The title for Restore Wallet File Windows</extracomment>
+        <translation>Загрузить кошелёк из резервной копии</translation>
+    </message>
+    <message>
+        <source>Restore Wallet</source>
+        <extracomment>Title of pop-up window shown when the user is attempting to restore a wallet.</extracomment>
+        <translation>Восстановить кошелёк</translation>
+    </message>
+    <message>
+        <source>Wallet Name</source>
+        <extracomment>Label of the input field where the name of the wallet is entered.</extracomment>
+        <translation>Имя кошелька</translation>
+    </message>
     <message>
         <source>&amp;Settings</source>
         <translation>&amp;Настройки</translation>
     </message>
+    <message>
+        <source>&amp;Minimize</source>
+        <translation>&amp;Свернуть</translation>
+    </message>
     <message>
         <source>&amp;Help</source>
         <translation>&amp;Помощь</translation>
@@ -666,6 +700,14 @@
         <source>View Governance Proposals</source>
         <translation>Посмотреть предложения по Управлению</translation>
     </message>
+    <message>
+        <source>&amp;Hide</source>
+        <translation>С&amp;крыть</translation>
+    </message>
+    <message>
+        <source>S&amp;how</source>
+        <translation>&amp;Показать</translation>
+    </message>
     <message numerus="yes">
         <source>%n active connection(s) to Dash network</source>
         <extracomment>A substring of the tooltip.</extracomment>
@@ -747,10 +789,6 @@
         <source>Processing blocks on disk…</source>
         <translation>Обработка блоков на диске…</translation>
     </message>
-    <message>
-        <source>Reindexing blocks on disk…</source>
-        <translation>Идёт переиндексация блоков на диске…</translation>
-    </message>
     <message>
         <source>Connecting to peers…</source>
         <translation>Подключение к пирам…</translation>
@@ -904,10 +942,6 @@
         <source>Coin Selection</source>
         <translation>Выбор монет</translation>
     </message>
-    <message>
-        <source>Dust:</source>
-        <translation>Пыль:</translation>
-    </message>
     <message>
         <source>After Fee:</source>
         <translation>После комиссии:</translation>
@@ -1008,10 +1042,6 @@
         <source>Copy bytes</source>
         <translation>Копировать байты</translation>
     </message>
-    <message>
-        <source>Copy dust</source>
-        <translation>Скопировать пыль</translation>
-    </message>
     <message>
         <source>Copy change</source>
         <translation>Копировать сдачу</translation>
@@ -1024,18 +1054,6 @@
         <source>(%1 locked)</source>
         <translation>(%1 заблокировано)</translation>
     </message>
-    <message>
-        <source>yes</source>
-        <translation>да</translation>
-    </message>
-    <message>
-        <source>no</source>
-        <translation>нет</translation>
-    </message>
-    <message>
-        <source>This label turns red if any recipient receives an amount smaller than the current dust threshold.</source>
-        <translation>Эта метка становится красной, если какой-либо из адресатов получает сумму меньше, чем "пыль".</translation>
-    </message>
     <message>
         <source>Can vary +/- %1 duff(s) per input.</source>
         <translation>Может отличаться на +/- %1 duff(ов) на каждый вход.</translation>
@@ -1249,18 +1267,102 @@
         <source>Filter proposal list</source>
         <translation>Фильтровать список предложений</translation>
     </message>
+    <message>
+        <source>Masternode Count:</source>
+        <translation>Количество мастернод:</translation>
+    </message>
+    <message>
+        <source>Number of masternodes this wallet can vote with (masternodes for which this wallet holds the voting key)</source>
+        <translation>Количество мастернод, с которыми этот кошелек может голосовать (мастерноды, для которых этот кошелек хранит ключ для голосования)</translation>
+    </message>
     <message>
         <source>Proposal Count:</source>
         <translation>Количество предложений:</translation>
     </message>
+    <message>
+        <source>Create Proposal</source>
+        <translation>Создать предложение</translation>
+    </message>
     <message>
         <source>Filter by Title</source>
-        <translation>Сортировать по названию</translation>
+        <translation>Фильтровать по названию</translation>
+    </message>
+    <message>
+        <source>Unavailable</source>
+        <translation>Недоступно</translation>
+    </message>
+    <message>
+        <source>A synced node and an unlocked wallet are required.</source>
+        <translation>Требуется синхронизированная нода и разблокированный кошелек.</translation>
+    </message>
+    <message>
+        <source>Vote Yes</source>
+        <translation>Голосовать За</translation>
+    </message>
+    <message>
+        <source>Vote No</source>
+        <translation>Голосовать Против</translation>
+    </message>
+    <message>
+        <source>Vote Abstain</source>
+        <translation>Голосовать Воздержался</translation>
     </message>
     <message>
         <source>Proposal Info: %1</source>
         <translation>Информация о предложении: %1</translation>
     </message>
+    <message>
+        <source>Voting Failed</source>
+        <translation>Голосование не удалось</translation>
+    </message>
+    <message>
+        <source>No wallet available.</source>
+        <translation>Нет доступного кошелька</translation>
+    </message>
+    <message>
+        <source>No masternode voting keys found in wallet.</source>
+        <translation>Ключи для голосования мастернод не найдены в кошельке.</translation>
+    </message>
+    <message>
+        <source>Please select a proposal to vote on.</source>
+        <translation>Пожалуйста, выберите предложение для голосования.</translation>
+    </message>
+    <message>
+        <source>Unable to unlock wallet.</source>
+        <translation>Не удается разблокировать кошелёк.</translation>
+    </message>
+    <message>
+        <source>Unable to get masternode list. Please try again later.</source>
+        <translation>Невозможно получить список мастернод. Пожалуйста, попробуйте позже.</translation>
+    </message>
+    <message>
+        <source>Masternode %1 not found</source>
+        <translation>Мастернода %1 не найдена</translation>
+    </message>
+    <message>
+        <source>Failed to sign vote for masternode %1</source>
+        <translation>Ошибка подписи голоса за мастерноду %1</translation>
+    </message>
+    <message>
+        <source>Masternode %1: %2</source>
+        <translation>Мастернода %1: %2</translation>
+    </message>
+    <message numerus="yes">
+        <source>Voted successfully %n time(s)</source>
+        <translation><numerusform>Проголосовано успешно %n раз</numerusform><numerusform>Проголосовано успешно %n раза</numerusform><numerusform>Проголосовано успешно %n раз</numerusform><numerusform>Проголосовано успешно %n раз</numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <source>Failed to vote %n time(s)</source>
+        <translation><numerusform>Не удалось проголосовать %n раз</numerusform><numerusform>Не удалось проголосовать %n раза</numerusform><numerusform>Не удалось проголосовать %n раз</numerusform><numerusform>Не удалось проголосовать %n раз</numerusform></translation>
+    </message>
+    <message>
+        <source>Errors:</source>
+        <translation>Ошибки:</translation>
+    </message>
+    <message>
+        <source>Voting Results</source>
+        <translation>Результаты голосования</translation>
+    </message>
 </context>
 <context>
     <name>HelpMessageDialog</name>
@@ -1331,17 +1433,17 @@
         <source>Use a custom data directory:</source>
         <translation>Использовать другой каталог данных:</translation>
     </message>
-    <message>
-        <source>%1 GB of space available</source>
-        <translation>доступно %1 ГБ</translation>
+    <message numerus="yes">
+        <source>%n GB of space available</source>
+        <translation><numerusform>Доступно %n ГБ</numerusform><numerusform>Доступно %n ГБ</numerusform><numerusform>Доступно %n ГБ</numerusform><numerusform>Доступно %n ГБ</numerusform></translation>
     </message>
-    <message>
-        <source>(of %1 GB needed)</source>
-        <translation>(из требующихся %1 ГБ)</translation>
+    <message numerus="yes">
+        <source>(of %n GB needed)</source>
+        <translation><numerusform>(из требующихся %n ГБ)</numerusform><numerusform>(из требующихся %n ГБ)</numerusform><numerusform>(из требующихся %n ГБ)</numerusform><numerusform>(из требующихся %n ГБ)</numerusform></translation>
     </message>
-    <message>
-        <source>(%1 GB needed for full chain)</source>
-        <translation>(из %1 ГБ, требующихся для полной цепочки блоков)</translation>
+    <message numerus="yes">
+        <source>(%n GB needed for full chain)</source>
+        <translation><numerusform>(для полной цепочки блоков требуется %n ГБ)</numerusform><numerusform>(для полной цепочки блоков требуется %n ГБ)</numerusform><numerusform>(для полной цепочки блоков требуется %n ГБ)</numerusform><numerusform>(для полной цепочки блоков требуется %n ГБ)</numerusform></translation>
     </message>
     <message>
         <source>At least %1 GB of data will be stored in this directory, and it will grow over time.</source>
@@ -1373,6 +1475,13 @@
         <translation>Ошибка</translation>
     </message>
 </context>
+<context>
+    <name>LoadWalletsActivity</name>
+    <message>
+        <source>Loading wallets…</source>
+        <translation>Загрузка кошельков…</translation>
+    </message>
+</context>
 <context>
     <name>MasternodeList</name>
     <message>
@@ -1565,6 +1674,11 @@
         <source>URI:</source>
         <translation>URI:</translation>
     </message>
+    <message>
+        <source>Paste address from clipboard</source>
+        <extracomment>Tooltip text for button that allows you to paste an address that is in your clipboard.</extracomment>
+        <translation>Вставить адрес из буфера обмена</translation>
+    </message>
 </context>
 <context>
     <name>OpenWalletActivity</name>
@@ -1675,6 +1789,16 @@
         <extracomment>An Options window setting to set subtracting the fee from a sending amount as default.</extracomment>
         <translation>Вычесть &amp;комиссию из суммы по умолчанию</translation>
     </message>
+    <message>
+        <source>Enable &amp;PSBT controls</source>
+        <extracomment>An options window setting to enable PSBT controls.</extracomment>
+        <translation>Включить функции работы с &amp;PSBT</translation>
+    </message>
+    <message>
+        <source>Whether to show PSBT controls.</source>
+        <extracomment>Tooltip text for options window setting that enables PSBT controls.</extracomment>
+        <translation>Показывать ли кнопки для работы с PSBT или нет.</translation>
+    </message>
     <message>
         <source>Whether to keep the specified custom change address or not.</source>
         <translation>Сохранять указанный свой адрес для сдачи или нет.</translation>
@@ -1818,20 +1942,20 @@ https://explore.transifex.com/dash/dash/</source>
 https://explore.transifex.com/dash/dash/</translation>
     </message>
     <message>
-        <source>Options set in this dialog are overridden by the command line or in the configuration file:</source>
-        <translation>Настройки, указанные в этом диалоге, перекрываются командной строкой либо файлом настроек:</translation>
+        <source>Third-party URLs (e.g. a block explorer) that appear in the transactions tab as context menu items.&lt;br/&gt;%s in the URL is replaced by transaction hash. Multiple URLs are separated by vertical bar |.</source>
+        <translation>Сторонние URL (например, block explorer), которые отображаются на вкладке транзакций как пункты контекстного меню.&lt;br/&gt;%s в URL заменяется хешем транзакции. URL отделяются друг от друга вертикальной чертой |.</translation>
     </message>
     <message>
-        <source>Minimize instead of exit the application when the window is closed. When this option is enabled, the application will be closed only after selecting Exit in the menu.</source>
-        <translation>Сворачивать вместо закрытия. Если данная настройка будет выбрана, то приложение закроется только после выбора пункта меню Завершить.</translation>
+        <source>&amp;Third-party transaction URLs</source>
+        <translation>&amp;Сторонние URL для транзакций</translation>
     </message>
     <message>
-        <source>Third party URLs (e.g. a block explorer) that appear in the transactions tab as context menu items.&lt;br/&gt;%s in the URL is replaced by transaction hash. Multiple URLs are separated by vertical bar |.</source>
-        <translation>Сторонние URL (например, block explorer), которые отображаются на вкладке транзакций как пункты контекстного меню.&lt;br/&gt;%s в URL заменяется хешем транзакции. URL отделяются друг от друга вертикальной чертой |.</translation>
+        <source>Options set in this dialog are overridden by the command line or in the configuration file:</source>
+        <translation>Настройки, указанные в этом диалоге, перекрываются командной строкой либо файлом настроек:</translation>
     </message>
     <message>
-        <source>&amp;Third party transaction URLs</source>
-        <translation>&amp;Сторонние URL для транзакций</translation>
+        <source>Minimize instead of exit the application when the window is closed. When this option is enabled, the application will be closed only after selecting Exit in the menu.</source>
+        <translation>Сворачивать вместо закрытия. Если данная настройка будет выбрана, то приложение закроется только после выбора пункта меню Завершить.</translation>
     </message>
     <message>
         <source>Whether to show coin control features or not.</source>
@@ -1975,14 +2099,22 @@ https://explore.transifex.com/dash/dash/</translation>
     </message>
     <message>
         <source>Confirm options reset</source>
+        <extracomment>Window title text of pop-up window shown when the user has chosen to reset options.</extracomment>
         <translation>Подтвердите сброс настроек</translation>
     </message>
     <message>
         <source>Client restart required to activate changes.</source>
+        <extracomment>Text explaining that the settings changed will not come into effect until the client is restarted.</extracomment>
         <translation>Для применения изменений требуется перезапуск клиента.</translation>
     </message>
+    <message>
+        <source>Current settings will be backed up at "%1".</source>
+        <extracomment>Text explaining to the user that the client's current settings will be backed up at a specific location. %1 is a stand-in argument for the backup location's path.</extracomment>
+        <translation>Текущие настройки будут сохранены в "%1".</translation>
+    </message>
     <message>
         <source>Client will be shut down. Do you want to proceed?</source>
+        <extracomment>Text asking the user to confirm if they would like to proceed with a client shutdown.</extracomment>
         <translation>Клиент будет выключен. Продолжить?</translation>
     </message>
     <message>
@@ -2503,6 +2635,181 @@ Due to discontinued support, you should request the merchant to provide you with
         <translation>Статус</translation>
     </message>
 </context>
+<context>
+    <name>ProposalWizard</name>
+    <message>
+        <source>Create Governance Proposal</source>
+        <translation>Создать предложение по Управлению</translation>
+    </message>
+    <message>
+        <source>Enter proposal details</source>
+        <translation>Введите сведения о предложении</translation>
+    </message>
+    <message>
+        <source>A fee will be burned when you prepare the proposal.</source>
+        <translation>При подготовке предложения будет сожжена комиссия.</translation>
+    </message>
+    <message>
+        <source>Proposal &amp;name</source>
+        <translation>&amp;Название предложения</translation>
+    </message>
+    <message>
+        <source>&amp;Description URL</source>
+        <translation>&amp;Ссылка с описанием</translation>
+    </message>
+    <message>
+        <source>Payment &amp;address</source>
+        <translation>&amp;Адрес оплаты</translation>
+    </message>
+    <message>
+        <source>Payment &amp;amount</source>
+        <translation>Сумма &amp;оплаты</translation>
+    </message>
+    <message>
+        <source>The amount to request in a single payment</source>
+        <translation>Сумма для запроса в одном платеже</translation>
+    </message>
+    <message>
+        <source>&amp;First payment</source>
+        <translation>&amp;Первый платёж</translation>
+    </message>
+    <message>
+        <source>Pa&amp;yments</source>
+        <translation>П&amp;латежи</translation>
+    </message>
+    <message>
+        <source>To&amp;tal amount</source>
+        <translation>По&amp;лная сумма</translation>
+    </message>
+    <message>
+        <source>Proposal &amp;fee</source>
+        <translation>Ко&amp;миссия</translation>
+    </message>
+    <message>
+        <source>Next</source>
+        <translation>Дальше</translation>
+    </message>
+    <message>
+        <source>Review proposal JSON and validate.</source>
+        <translation>Просмотрите JSON предложения и проверьте.</translation>
+    </message>
+    <message>
+        <source>Hex-encoded JSON</source>
+        <translation>JSON в шестнадцатеричной кодировке</translation>
+    </message>
+    <message>
+        <source>Back</source>
+        <translation>Назад</translation>
+    </message>
+    <message>
+        <source>Validate</source>
+        <translation>Проверить</translation>
+    </message>
+    <message>
+        <source>Prepare (burn fee) and wait for confirmations.</source>
+        <translation>Подготовьте (сожгите комиссию) и ждите подтверждений.</translation>
+    </message>
+    <message>
+        <source>Copy</source>
+        <translation>&amp;Копировать</translation>
+    </message>
+    <message>
+        <source>At 1/6 confirmations: can be relayed and queued. At 6/6: accepted and processed.</source>
+        <translation>При 1/6 подтверждениях: может быть передано и поставлено в очередь. При 6/6: принято и обработано.</translation>
+    </message>
+    <message>
+        <source>Confirmations progress</source>
+        <translation>Прогресс подтверждения:</translation>
+    </message>
+    <message>
+        <source>Shows progress toward the required number of confirmations for the proposal fee transaction.</source>
+        <translation>Показывает прогресс к необходимому количеству подтверждений для транзакции комиссии предложения.</translation>
+    </message>
+    <message>
+        <source>Estimated time remaining: -</source>
+        <translation>Оставшееся время, приблизительно: -</translation>
+    </message>
+    <message>
+        <source>Prepare Proposal</source>
+        <translation>Подготовить предложение</translation>
+    </message>
+    <message>
+        <source>You can submit after 1 confirmation. At 6 confirmations it is accepted and processed.</source>
+        <translation>Вы можете отправить после 1 подтверждения. При 6 подтверждениях оно принимается и обрабатывается.</translation>
+    </message>
+    <message>
+        <source>Proposal ID:</source>
+        <translation>ID предложения:</translation>
+    </message>
+    <message>
+        <source>Submit Proposal</source>
+        <translation>Отправить предложение</translation>
+    </message>
+    <message>
+        <source>Close</source>
+        <translation>Закрыть</translation>
+    </message>
+    <message>
+        <source>Valid</source>
+        <translation>Действительно</translation>
+    </message>
+    <message>
+        <source>Invalid: %1</source>
+        <translation>Недействительно: %1</translation>
+    </message>
+    <message>
+        <source>Burn %1</source>
+        <translation>Сжечь %1</translation>
+    </message>
+    <message>
+        <source>Burn %1 to create the fee transaction?</source>
+        <translation>Сжечь %1 для создания транзакции комиссии?</translation>
+    </message>
+    <message>
+        <source>Prepare failed</source>
+        <translation>Не удалось подготовить</translation>
+    </message>
+    <message>
+        <source>Confirmations: %1 / %2 required</source>
+        <translation>Подтверждения: %1 / %2 необходимых</translation>
+    </message>
+    <message>
+        <source>Estimated time remaining: Ready</source>
+        <translation>Оставшееся время, приблизительно: готово</translation>
+    </message>
+    <message numerus="yes">
+        <source>Estimated time remaining: %n minute(s)</source>
+        <translation><numerusform>Оставшееся время, приблизительно: %n минута</numerusform><numerusform>Оставшееся время, приблизительно: %n минуты</numerusform><numerusform>Оставшееся время, приблизительно: %n минут</numerusform><numerusform>Оставшееся время, приблизительно: %n минут</numerusform></translation>
+    </message>
+    <message>
+        <source>Your proposal was submitted successfully.</source>
+        <translation>Ваше предложение успешно отправлено.</translation>
+    </message>
+    <message>
+        <source>Already submitted</source>
+        <translation>Уже отправлено</translation>
+    </message>
+    <message>
+        <source>This proposal has already been submitted.</source>
+        <translation>Это предложение уже отправлено.</translation>
+    </message>
+    <message>
+        <source>Submission failed</source>
+        <translation>Отправка предложения закончилась неудачно</translation>
+    </message>
+    <message>
+        <source>Proposal submitted</source>
+        <translation>Предложение отправлено</translation>
+    </message>
+    <message>
+        <source>A fee of %1 will be burned when you prepare the proposal.</source>
+        <translation>При подготовке предложения будет сожжена комиссия %1.</translation>
+    </message>
+    <message>
+        <source>Prepare (burn %1) and wait for %2 confirmations.</source>
+        <translation>Подготовьте (сожгите %1) и ждите %2 подтверждений.</translation>
+    </message>
+</context>
 <context>
     <name>QObject</name>
     <message>
@@ -2557,7 +2864,7 @@ Due to discontinued support, you should request the merchant to provide you with
     </message>
     <message>
         <source>Error: Cannot parse configuration file: %1.</source>
-        <translation>Ошибка: не могу прочитать файл настроек: %1.</translation>
+        <translation>Ошибка: не могу разобрать файл настроек: %1.</translation>
     </message>
     <message>
         <source>Error: %1</source>
@@ -2892,14 +3199,6 @@ Due to discontinued support, you should request the merchant to provide you with
         <source>Version</source>
         <translation>Версия</translation>
     </message>
-    <message>
-        <source>Whether the peer requested us to relay transactions.</source>
-        <translation>Запрашивал ли пир ретрансляцию транзакций.</translation>
-    </message>
-    <message>
-        <source>Wants Tx Relay</source>
-        <translation>Хочет ретрансляцию Tx</translation>
-    </message>
     <message>
         <source>High bandwidth BIP152 compact block relay: %1</source>
         <translation>Компактное блочное реле BIP152 с высокой пропускной способностью: %1</translation>
@@ -3005,6 +3304,14 @@ Due to discontinued support, you should request the merchant to provide you with
         <source>To specify a non-default location of the blocks directory use the '%1' option.</source>
         <translation>Чтобы указать нестандартное расположение папки с блоками, используйте опцию '%1'.</translation>
     </message>
+    <message>
+        <source>Local Addresses</source>
+        <translation>Локальные адреса</translation>
+    </message>
+    <message>
+        <source>Network addresses that your Dash node is currently using to communicate with other nodes.</source>
+        <translation>Сетевые адреса, которые ваша нода Dash в настоящее время использует для связи с другими нодами.</translation>
+    </message>
     <message>
         <source>Number of regular Masternodes</source>
         <translation>Количество обычных Мастернод</translation>
@@ -3097,6 +3404,14 @@ Due to discontinued support, you should request the merchant to provide you with
         <source>Services</source>
         <translation>Сервисы</translation>
     </message>
+    <message>
+        <source>Whether we relay transactions to this peer.</source>
+        <translation>Будем ли мы передавать транзакции этому пиру.</translation>
+    </message>
+    <message>
+        <source>Transaction Relay</source>
+        <translation>Пересылка транзакций</translation>
+    </message>
     <message>
         <source>Connection Time</source>
         <translation>Время соединения</translation>
@@ -3245,6 +3560,10 @@ Due to discontinued support, you should request the merchant to provide you with
         <source>Network activity disabled</source>
         <translation>Сетевая активность отключена</translation>
     </message>
+    <message>
+        <source>None</source>
+        <translation>Нет</translation>
+    </message>
     <message>
         <source>Total: %1 (Enabled: %2)</source>
         <translation>Всего: %1 (Активных: %2)</translation>
@@ -3566,6 +3885,34 @@ For more information on using this console, type %6.
         <translation>Запрошено</translation>
     </message>
 </context>
+<context>
+    <name>RestoreWalletActivity</name>
+    <message>
+        <source>Restore Wallet</source>
+        <extracomment>Title of progress window which is displayed when wallets are being restored.</extracomment>
+        <translation>Восстановить кошелёк</translation>
+    </message>
+    <message>
+        <source>Restoring Wallet &lt;b&gt;%1&lt;/b&gt;…</source>
+        <extracomment>Descriptive text of the restore wallets progress window which indicates to the user that wallets are currently being restored.</extracomment>
+        <translation>Восстанавливается кошелёк&lt;b&gt;%1&lt;/b&gt;…</translation>
+    </message>
+    <message>
+        <source>Restore wallet failed</source>
+        <extracomment>Title of message box which is displayed when the wallet could not be restored.</extracomment>
+        <translation>Не удалось восстановить кошелёк</translation>
+    </message>
+    <message>
+        <source>Restore wallet warning</source>
+        <extracomment>Title of message box which is displayed when the wallet is restored with some warning.</extracomment>
+        <translation>Предупреждение при восстановлении кошелька</translation>
+    </message>
+    <message>
+        <source>Restore wallet message</source>
+        <extracomment>Title of message box which is displayed when the wallet is successfully restored.</extracomment>
+        <translation>Сообщение при восстановлении кошелька</translation>
+    </message>
+</context>
 <context>
     <name>SendCoinsDialog</name>
     <message>
@@ -3600,10 +3947,6 @@ For more information on using this console, type %6.
         <source>Fee:</source>
         <translation>Комиссия:</translation>
     </message>
-    <message>
-        <source>Dust:</source>
-        <translation>Пыль:</translation>
-    </message>
     <message>
         <source>Inputs…</source>
         <translation>Входы…</translation>
@@ -3728,10 +4071,6 @@ For more information on using this console, type %6.
         <source>Copy bytes</source>
         <translation>Копировать байты</translation>
     </message>
-    <message>
-        <source>Copy dust</source>
-        <translation>Скопировать пыль</translation>
-    </message>
     <message>
         <source>Copy change</source>
         <translation>Копировать сдачу</translation>
@@ -3740,10 +4079,6 @@ For more information on using this console, type %6.
         <source>%1 (%2 blocks)</source>
         <translation>%1 (блоков: %2)</translation>
     </message>
-    <message>
-        <source>This will produce a Partially Signed Transaction (PSBT) which you can save or copy and then sign with e.g. an offline %1 wallet, or a PSBT-compatible hardware wallet.</source>
-        <translation>В результате будет создана частично подписанная транзакция (PSBT), которую можно сохранить или скопировать и затем подписать, например, на офлайн-кошельке %1 или на аппаратном кошельке, совместимом с PSBT.</translation>
-    </message>
     <message>
         <source>using</source>
         <translation>используя</translation>
@@ -3752,10 +4087,6 @@ For more information on using this console, type %6.
         <source>%1 to %2</source>
         <translation>%1 на %2</translation>
     </message>
-    <message>
-        <source>Are you sure you want to send?</source>
-        <translation>Вы уверены, что хотите отправить?</translation>
-    </message>
     <message>
         <source>&lt;b&gt;(%1 of %2 entries displayed)&lt;/b&gt;</source>
         <translation>&lt;b&gt;(показано записей: %1 из %2)&lt;/b&gt;</translation>
@@ -3780,10 +4111,6 @@ For more information on using this console, type %6.
         <source>%1 to '%2'</source>
         <translation>%1 на '%2'</translation>
     </message>
-    <message>
-        <source>Do you want to draft this transaction?</source>
-        <translation>Вы хотите создать шаблон данной транзакции?</translation>
-    </message>
     <message>
         <source>%1 funds only</source>
         <translation>только средства %1</translation>
@@ -3832,14 +4159,6 @@ For more information on using this console, type %6.
         <source>Confirm send coins</source>
         <translation>Подтвердите отправку монет</translation>
     </message>
-    <message>
-        <source>Confirm transaction proposal</source>
-        <translation>Подтвердить предложение по сделке</translation>
-    </message>
-    <message>
-        <source>Create Unsigned</source>
-        <translation>Создать неподписанную</translation>
-    </message>
     <message>
         <source>Save Transaction Data</source>
         <translation>Сохранить данные транзакции</translation>
@@ -3852,14 +4171,30 @@ For more information on using this console, type %6.
         <source>Watch-only balance:</source>
         <translation>Баланс только для просмотра:</translation>
     </message>
-    <message>
-        <source>Send</source>
-        <translation>Отправить</translation>
-    </message>
     <message>
         <source>Creates a Partially Signed Blockchain Transaction (PSBT) for use with e.g. an offline %1 wallet, or a PSBT-compatible hardware wallet.</source>
         <translation>Создает частично подписанную блокчейн транзакцию (PSBT) для использования, например, с автономным кошельком %1 или аппаратным кошельком, совместимым с PSBT.</translation>
     </message>
+    <message>
+        <source>Do you want to create this transaction?</source>
+        <extracomment>Message displayed when attempting to create a transaction. Cautionary text to prompt the user to verify that the displayed transaction details represent the transaction the user intends to create.</extracomment>
+        <translation>Вы хотите создать данную транзакцию?</translation>
+    </message>
+    <message>
+        <source>Please, review your transaction proposal. This will produce a Partially Signed Blockchain Transaction (PSBT) which you can save or copy and then sign with e.g. an offline %1 wallet, or a PSBT-compatible hardware wallet.</source>
+        <extracomment>Text to inform a user attempting to create a transaction of their current options. At this stage, a user can only create a PSBT. This string is displayed when private keys are disabled and an external signer is not available.</extracomment>
+        <translation>Пожалуйста, проверьте ваше предложение транзакции. Это создаст частично подписанную блокчейн-транзакцию (PSBT), которую вы можете сохранить или скопировать, а затем подписать, например, с помощью оффлайн-кошелька %1 или аппаратного кошелька, совместимого с PSBT.</translation>
+    </message>
+    <message>
+        <source>Please, review your transaction. You can create and send this transaction or create a Partially Signed Blockchain Transaction (PSBT), which you can save or copy and then sign with, e.g., an offline %1 wallet, or a PSBT-compatible hardware wallet.</source>
+        <extracomment>Text to inform a user attempting to create a transaction of their current options. At this stage, a user can send their transaction or create a PSBT. This string is displayed when both private keys and PSBT controls are enabled.</extracomment>
+        <translation>Пожалуйста, проверьте вашу транзакцию. Вы можете создать и отправить эту транзакцию или создать частично подписанную блокчейн-транзакцию (PSBT), которую вы можете сохранить или скопировать, а затем подписать, например, с помощью оффлайн-кошелька %1 или аппаратного кошелька, совместимого с PSBT.</translation>
+    </message>
+    <message>
+        <source>Please, review your transaction.</source>
+        <extracomment>Text to prompt a user to review the details of the transaction they are attempting to send.</extracomment>
+        <translation>Пожалуйста, проверьте вашу транзакцию.</translation>
+    </message>
     <message>
         <source>To review recipient list click "Show Details…"</source>
         <translation>Для просмотра списка получателей нажмите кнопку "Show Details…".</translation>
@@ -3988,21 +4323,16 @@ For more information on using this console, type %6.
         <source>A message that was attached to the dash: URI which will be stored with the transaction for your reference. Note: This message will not be sent over the Dash network.</source>
         <translation>К dash: URI было прикреплено сообщение, которое будет сохранено вместе с транзакцией для вашего сведения. Обратите внимание: сообщение не будет отправлено через сеть Dash.</translation>
     </message>
+</context>
+<context>
+    <name>SendConfirmationDialog</name>
     <message>
-        <source>This is an unauthenticated payment request.</source>
-        <translation>Этот запрос платежа неаутентифицирован.</translation>
-    </message>
-    <message>
-        <source>This is an authenticated payment request.</source>
-        <translation>Этот запрос платежа аутентифицирован.</translation>
-    </message>
-    <message>
-        <source>Pay To:</source>
-        <translation>Получатель:</translation>
+        <source>Send</source>
+        <translation>Отправить</translation>
     </message>
     <message>
-        <source>Memo:</source>
-        <translation>Примечание:</translation>
+        <source>Create Unsigned</source>
+        <translation>Создать неподписанную</translation>
     </message>
 </context>
 <context>
@@ -4211,20 +4541,9 @@ For more information on using this console, type %6.
 </context>
 <context>
     <name>TransactionDesc</name>
-    <message numerus="yes">
-        <source>Open for %n more block(s)</source>
-        <translation><numerusform>Будет открыто ещё %n блок</numerusform><numerusform>Будет открыто ещё %n блока</numerusform><numerusform>Будет открыто ещё %n блоков</numerusform><numerusform>Будет открыто ещё %n блоков</numerusform></translation>
-    </message>
-    <message>
-        <source>Open until %1</source>
-        <translation>Открыто до %1</translation>
-    </message>
-    <message>
-        <source>conflicted</source>
-        <translation>в противоречии</translation>
-    </message>
     <message>
         <source>0/unconfirmed, %1</source>
+        <extracomment>Text explaining the current status of a transaction, shown in the status field of the details window for this transaction. This status represents an unconfirmed transaction that is in the memory pool.</extracomment>
         <translation>0/не подтверждено, %1</translation>
     </message>
     <message>
@@ -4237,22 +4556,32 @@ For more information on using this console, type %6.
     </message>
     <message>
         <source>abandoned</source>
+        <extracomment>Text explaining the current status of a transaction, shown in the status field of the details window for this transaction. This status represents an abandoned transaction.</extracomment>
         <translation>сброшена</translation>
     </message>
+    <message>
+        <source>conflicted with a transaction with %1 confirmations</source>
+        <extracomment>Text explaining the current status of a transaction, shown in the status field of the details window for this transaction. This status represents an unconfirmed transaction that conflicts with a confirmed transaction.</extracomment>
+        <translation>конфликт с транзакцией с %1 подтверждениями</translation>
+    </message>
     <message>
         <source>%1/unconfirmed</source>
+        <extracomment>Text explaining the current status of a transaction, shown in the status field of the details window for this transaction. This status represents a transaction confirmed in at least one block, but less than 6 blocks, and still not locked via ChainLocks.</extracomment>
         <translation>%1/не подтверждено</translation>
     </message>
     <message>
         <source>%1 confirmations</source>
+        <extracomment>Text explaining the current status of a transaction, shown in the status field of the details window for this transaction. This status represents a transaction confirmed in 6 or more blocks or locked via ChainLocks.</extracomment>
         <translation>%1 подтверждений</translation>
     </message>
     <message>
         <source>locked via ChainLocks</source>
+        <extracomment>Text explaining the current status of a transaction, shown in the status field of the details window for this transaction. This status represents a transaction confirmed in at least one block and has been locked by ChainLocks.</extracomment>
         <translation>зафиксировано с помощью ChainLocks</translation>
     </message>
     <message>
         <source>verified via InstantSend</source>
+        <extracomment>Text explaining the current status of a transaction, shown in the status field of the details window for this transaction. This status represents an unconfirmed transaction that has been locked by InstantSend.</extracomment>
         <translation>проверено с помощью InstantSend</translation>
     </message>
     <message>
@@ -4405,14 +4734,6 @@ For more information on using this console, type %6.
         <source>Address / Label</source>
         <translation>Адрес / Метка</translation>
     </message>
-    <message numerus="yes">
-        <source>Open for %n more block(s)</source>
-        <translation><numerusform>Будет открыто ещё %n блок</numerusform><numerusform>Будет открыто ещё %n блока</numerusform><numerusform>Будет открыто ещё %n блоков</numerusform><numerusform>Будет открыто ещё %n блоков</numerusform></translation>
-    </message>
-    <message>
-        <source>Open until %1</source>
-        <translation>Открыто до %1</translation>
-    </message>
     <message>
         <source>Unconfirmed</source>
         <translation>Неподтверждено</translation>
@@ -4664,6 +4985,11 @@ For more information on using this console, type %6.
         <source>Show address &amp;QR code</source>
         <translation>Показать QR-&amp;код адреса</translation>
     </message>
+    <message>
+        <source>Show in %1</source>
+        <extracomment>Transactions table context menu action to show the selected transaction in a third-party block explorer. %1 is a stand-in argument for the URL of the explorer.</extracomment>
+        <translation>Показать в %1</translation>
+    </message>
     <message>
         <source>Export Transaction History</source>
         <translation>Экспортировать историю транзакций</translation>
@@ -4856,10 +5182,6 @@ Go to File &gt; Open Wallet to load a wallet.
 </context>
 <context>
     <name>dash-core</name>
-    <message>
-        <source>Fee estimation failed. Fallbackfee is disabled. Wait a few blocks or enable -fallbackfee.</source>
-        <translation>Расчет комиссии невозможен. Комиссия по умолчанию не установлена. подождите пару блоков либо укажите -fallbackfee.</translation>
-    </message>
     <message>
         <source>This error could occur if this wallet was not shutdown cleanly and was last loaded using a build with a newer version of Berkeley DB. If so, please use the software that last loaded this wallet</source>
         <translation>Эта ошибка может появляться, если кошелёк был закрыт некорректно либо был ранее открыт через приложение с более новой версией Berkeley DB. Если так, то, пожалуйста, используйте то же приложение, которым вы открывали кошелёк в прошлый раз</translation>
@@ -4922,7 +5244,7 @@ Go to File &gt; Open Wallet to load a wallet.
     </message>
     <message>
         <source>Error: Unable to parse version %u as a uint32_t</source>
-        <translation>Ошибка: Не удалось проанализировать версию %u как uint32_t</translation>
+        <translation>Ошибка: Не удалось разобрать версию %u как uint32_t</translation>
     </message>
     <message>
         <source>Error: Unable to write record to new wallet</source>
@@ -4932,10 +5254,6 @@ Go to File &gt; Open Wallet to load a wallet.
         <source>Failed to listen on any port. Use -listen=0 if you want this.</source>
         <translation>Не удалось начать прослушивание на порту. Используйте -listen=0, если вас это устраивает.</translation>
     </message>
-    <message>
-        <source>-maxtxfee is set very high! Fees this large could be paid on a single transaction.</source>
-        <translation>установлено очень большое значение -maxtxfee! Комиссия такого размера может быть уплачена при проведении отдельной транзакции.</translation>
-    </message>
     <message>
         <source>Found unconfirmed denominated outputs, will wait till they confirm to continue.</source>
         <translation>Найдены неподтверждённые номиналы, процесс продолжится после их подтверждения.</translation>
@@ -4944,22 +5262,18 @@ Go to File &gt; Open Wallet to load a wallet.
         <source>Invalid -socketevents ('%s') specified. Only these modes are supported: %s</source>
         <translation>Указан некорректный параметр -socketevents ('%s'). Поддерживаются только следующие режимы: %s</translation>
     </message>
-    <message>
-        <source>Invalid amount for -maxtxfee=&lt;amount&gt;: '%s' (must be at least the minrelay fee of %s to prevent stuck transactions)</source>
-        <translation>Некорректная сумма для -maxtxfee=&lt;amount&gt;: '%s' (должна быть минимум как комиссия minrelay - %s, чтобы предотвратить застревание транзакций)</translation>
-    </message>
     <message>
         <source>SQLiteDatabase: Unknown sqlite wallet schema version %d. Only version %d is supported</source>
         <translation>SQLiteDatabase: Неизвестная версия %d схемы кошелька sqlite. Поддерживается только версия %d</translation>
     </message>
-    <message>
-        <source>The -txindex upgrade started by a previous version cannot be completed. Restart with the previous version or run a full -reindex.</source>
-        <translation>Обновление -txindex, начатое предыдущей версией, не может быть завершено. Перезапустите с предыдущей версией или выполните полный -reindex.</translation>
-    </message>
     <message>
         <source>Transaction index can't be disabled with governance validation enabled. Either start with -disablegovernance command line switch or enable transaction index.</source>
         <translation>Индексирование транзакций нельзя отключить в режиме проверки данных управления. Либо запустите кошелек с опцией -disablegovernance, либо включите индексирование транзакций.</translation>
     </message>
+    <message>
+        <source>Unsupported category-specific logging level -loglevel=%s. Expected -loglevel=&lt;category&gt;:&lt;loglevel&gt;. Valid categories: %s. Valid loglevels: %s.</source>
+        <translation>Неподдерживаемый уровень логирования для категории -loglevel=%s. Ожидается -loglevel=&lt;category&gt;:&lt;loglevel&gt;. Допустимые категории: %s. Допустимые уровни: %s.</translation>
+    </message>
     <message>
         <source>Can't mix: no compatible inputs found!</source>
         <translation>Перемешивание невозможно: подходящие монеты не найдены!</translation>
@@ -4968,10 +5282,6 @@ Go to File &gt; Open Wallet to load a wallet.
         <source>Entry exceeds maximum size.</source>
         <translation>Запись превышает максимально допустимый размер.</translation>
     </message>
-    <message>
-        <source>Error upgrading Evo database</source>
-        <translation>Ошибка обновления базы данных Evo</translation>
-    </message>
     <message>
         <source>Error upgrading evo database for EHF</source>
         <translation>Ошибка обновления базы данных Evo в части EHF</translation>
@@ -5004,14 +5314,6 @@ Go to File &gt; Open Wallet to load a wallet.
         <source>Insufficient funds.</source>
         <translation>Недостаточно средств.</translation>
     </message>
-    <message>
-        <source>Invalid amount for -discardfee=&lt;amount&gt;: '%s'</source>
-        <translation>Неверная сумма в параметре -discardfee=&lt;amount&gt;: '%s'</translation>
-    </message>
-    <message>
-        <source>Invalid amount for -paytxfee=&lt;amount&gt;: '%s' (must be at least %s)</source>
-        <translation>Неверная сумма в параметре -paytxfee=&lt;amount&gt;: '%s' (должна быть минимум %s)</translation>
-    </message>
     <message>
         <source>Invalid minimum number of spork signers specified with -minsporkkeys</source>
         <translation>Некорректное минимальное количество подписантов спорков, указанное в -minsporkkeys</translation>
@@ -5088,6 +5390,10 @@ Go to File &gt; Open Wallet to load a wallet.
         <source>Unknown response.</source>
         <translation>Неизвестный ответ.</translation>
     </message>
+    <message>
+        <source>Unsupported global logging level -loglevel=%s. Valid values: %s.</source>
+        <translation>Неподдерживаемый глобальный уровень логирования -loglevel=%s. Допустимые значения: %s.</translation>
+    </message>
     <message>
         <source>User Agent comment (%s) contains unsafe characters.</source>
         <translation>Комментарий User Agent  (%s) содержит небезопасные символы.</translation>
@@ -5152,10 +5458,6 @@ Go to File &gt; Open Wallet to load a wallet.
         <source>Total length of network version string (%i) exceeds maximum length (%i). Reduce the number or size of uacomments.</source>
         <translation>Длина строки сетевой версии (%i) превышает максимально допустимую (%i). Уменьшите количество или размер строк uacomment.</translation>
     </message>
-    <message>
-        <source>Transaction needs a change address, but we can't generate it. Please call keypoolrefill first.</source>
-        <translation>Транзакции нужен адрес сдачи, но мы не можем его сгенерировать. Пожалуйста, сначала выполните команду keypoolrefill.</translation>
-    </message>
     <message>
         <source>WARNING! Failed to replenish keypool, please unlock your wallet to do so.</source>
         <translation>ВНИМАНИЕ! Ну удалось обновить пул ключей, пожалуйста, разблокируйте кошелек.</translation>
@@ -5194,7 +5496,7 @@ Go to File &gt; Open Wallet to load a wallet.
     </message>
     <message>
         <source>Could not parse asmap file %s</source>
-        <translation>Не удалось прочитать файл asmap %s</translation>
+        <translation>Не удалось разобрать файл asmap %s</translation>
     </message>
     <message>
         <source>ERROR! Failed to create automatic backup</source>
@@ -5232,10 +5534,6 @@ Go to File &gt; Open Wallet to load a wallet.
         <source>Error: No addresses available.</source>
         <translation>Ошибка: Нет доступных адресов.</translation>
     </message>
-    <message>
-        <source>Exceeded max tries.</source>
-        <translation>Превышено максимальное количество попыток.</translation>
-    </message>
     <message>
         <source>Failed to create backup %s!</source>
         <translation>Не удалось создать резервную копию %s!</translation>
@@ -5276,10 +5574,6 @@ Go to File &gt; Open Wallet to load a wallet.
         <source>Invalid P2P permission: '%s'</source>
         <translation>Некорректные разрешения P2P : '%s'</translation>
     </message>
-    <message>
-        <source>Invalid amount for -fallbackfee=&lt;amount&gt;: '%s'</source>
-        <translation>Неверная сумма в параметре -fallbackfee=&lt;amount&gt;: '%s'</translation>
-    </message>
     <message>
         <source>Invalid masternodeblsprivkey. Please see documentation.</source>
         <translation>Некорректный masternodeblsprivkey. Пожалуйста, ознакомьтесь с документацией.</translation>
@@ -5416,10 +5710,6 @@ Go to File &gt; Open Wallet to load a wallet.
         <source>Unable to open %s for writing</source>
         <translation>Невозможно открыть %s для записи</translation>
     </message>
-    <message>
-        <source>Unable to parse -maxuploadtarget: '%s' (possible integer overflow?)</source>
-        <translation>Невозможно пропарсить -maxuploadtarget: '%s' (возможно integer overflow?)</translation>
-    </message>
     <message>
         <source>Unknown -blockfilterindex value %s.</source>
         <translation>Неизвестное значение -blockfilterindex %s.</translation>
@@ -5428,10 +5718,6 @@ Go to File &gt; Open Wallet to load a wallet.
         <source>Unknown new rules activated (versionbit %i)</source>
         <translation>Вступили в силу неизвестные правила (versionbit %i)</translation>
     </message>
-    <message>
-        <source>Upgrading UTXO database</source>
-        <translation>Обновление базы UTXO</translation>
-    </message>
     <message>
         <source>Verifying blocks…</source>
         <translation>Проверка блоков…</translation>
@@ -5492,10 +5778,6 @@ Go to File &gt; Open Wallet to load a wallet.
         <source>Cannot obtain a lock on data directory %s. %s is probably already running.</source>
         <translation>Не удалось установить блокировку на каталог данных %s. Возможно, %s уже запущен.</translation>
     </message>
-    <message>
-        <source>Cannot upgrade a non HD wallet from version %i to version %i which is non-HD wallet. Use upgradetohd RPC</source>
-        <translation>Невозможно обновить не-HD кошелек с версии %i до версии %i, которая также является не-HD кошельком. Используйте команду upgradetohd RPC.</translation>
-    </message>
     <message>
         <source>Distributed under the MIT software license, see the accompanying file %s or %s</source>
         <translation>Распространяется под лицензией на программное обеспечение MIT, смотрите прилагаемый файл %s или %s.</translation>
@@ -5528,6 +5810,10 @@ Go to File &gt; Open Wallet to load a wallet.
         <source>Failed to rename invalid peers.dat file. Please move or delete it and try again.</source>
         <translation>Не удалось переименовать некорректный файл peers.dat. Пожалуйста, переместите или удалите его и повторите попытку.</translation>
     </message>
+    <message>
+        <source>Fee estimation failed. Fallbackfee is disabled. Wait a few blocks or enable %s.</source>
+        <translation>Расчет комиссии невозможен. Комиссия по умолчанию не установлена. Подождите пару блоков либо включите %s.</translation>
+    </message>
     <message>
         <source>File %s already exists. If you are sure this is what you want, move it out of the way first.</source>
         <translation>Файл %s уже существует. Если вы уверены, что это необходимо, сначала переместите его в другое место.</translation>
@@ -5540,6 +5826,10 @@ Go to File &gt; Open Wallet to load a wallet.
         <source>Incorrect or no devnet genesis block found. Wrong datadir for devnet specified?</source>
         <translation>Неверный или отсутствующий начальный блок devnet. Неправильный каталог данных для devnet?</translation>
     </message>
+    <message>
+        <source>Invalid amount for %s=&lt;amount&gt;: '%s' (must be at least the minrelay fee of %s to prevent stuck transactions)</source>
+        <translation>Некорректная сумма для %s=&lt;amount&gt;: '%s' (должна быть минимум как комиссия minrelay - %s, чтобы предотвратить застревание транзакций)</translation>
+    </message>
     <message>
         <source>Invalid or corrupt peers.dat (%s). If you believe this is a bug, please report it to %s. As a workaround, you can move the file (%s) out of the way (rename, move, or delete) to have a new one created on the next start.</source>
         <translation>Некорректный или поврежденный файл peers.dat (%s). Если вы считаете, что это ошибка, пожалуйста, сообщите об этом на %s. В качестве временного решения вы можете переместить файл (%s) (переименовать, переместить или удалить), чтобы при следующем запуске был создан новый файл.</translation>
@@ -5556,6 +5846,10 @@ Go to File &gt; Open Wallet to load a wallet.
         <source>No wallet file format provided. To use createfromdump, -format=&lt;format&gt; must be provided.</source>
         <translation>Формат файла кошелька не указан. Для использования команды createfromdump необходимо задать параметр -format=&lt;format&gt;.</translation>
     </message>
+    <message>
+        <source>Outbound connections restricted to CJDNS (-onlynet=cjdns) but -cjdnsreachable is not provided</source>
+        <translation>Исходящие подключения ограничены сетью CJDNS (-onlynet=cjdns), но -cjdnsreachable не включен.</translation>
+    </message>
     <message>
         <source>Outbound connections restricted to Tor (-onlynet=onion) but the proxy for reaching the Tor network is explicitly forbidden: -onion=0</source>
         <translation>Исходящие подключения ограничены сетью Tor (-onlynet=onion), но прокси для подключения к сети Tor явно запрещен: -onion=0.</translation>
@@ -5564,6 +5858,10 @@ Go to File &gt; Open Wallet to load a wallet.
         <source>Outbound connections restricted to Tor (-onlynet=onion) but the proxy for reaching the Tor network is not provided: none of -proxy, -onion or -listenonion is given</source>
         <translation>Исходящие подключения ограничены сетью Tor (-onlynet=onion), но прокси для подключения к сети Tor не указан: отсутствуют параметры -proxy, -onion или -listenonion.</translation>
     </message>
+    <message>
+        <source>Outbound connections restricted to i2p (-onlynet=i2p) but -i2psam is not provided</source>
+        <translation>Исходящие подключения ограничены сетью i2p (-onlynet=i2p), но -i2psam не включен.</translation>
+    </message>
     <message>
         <source>Please check that your computer's date and time are correct! If your clock is wrong, %s will not work properly.</source>
         <translation>Пожалуйста, убедитесь что дата и время на Вашем компьютере выставлены правильно! %s не сможет работать корректно, если часы настроены неверно.</translation>
@@ -5576,10 +5874,6 @@ Go to File &gt; Open Wallet to load a wallet.
         <source>Prune mode is incompatible with -reindex-chainstate. Use full -reindex instead.</source>
         <translation>Режим prune несовместим с параметром -reindex-chainstate. Используйте полный параметр -reindex вместо этого.</translation>
     </message>
-    <message>
-        <source>The block index db contains a legacy 'txindex'. To clear the occupied disk space, run a full -reindex, otherwise ignore this error. This error message will not be displayed again.</source>
-        <translation>База данных индекса блоков содержит устаревший 'txindex'. Чтобы освободить занятое дисковое пространство, выполните полный -reindex, в противном случае игнорируйте эту ошибку. Это сообщение об ошибке больше не будет отображаться.</translation>
-    </message>
     <message>
         <source>This is the maximum transaction fee you pay (in addition to the normal fee) to prioritize partial spend avoidance over regular coin selection.</source>
         <translation>Это максимальная комиссия за транзакцию, которую вы платите (в дополнение к обычной комиссии), чтобы отдать приоритет частичному избеганию траты монет по сравнению с обычным выбором монет.</translation>
@@ -5592,6 +5886,10 @@ Go to File &gt; Open Wallet to load a wallet.
         <source>This is the transaction fee you may pay when fee estimates are not available.</source>
         <translation>Это комиссия, которую Вы заплатите при отправке транзакции, если расчет комиссии не доступен.</translation>
     </message>
+    <message>
+        <source>Transaction requires one destination of non-0 value, a non-0 feerate, or a pre-selected input</source>
+        <translation>Транзакция требует одного получателя с ненулевым значением, ненулевой ставки комиссии или предварительно выбранного входа</translation>
+    </message>
     <message>
         <source>Unable to replay blocks. You will need to rebuild the database using -reindex-chainstate.</source>
         <translation>Невозможно повторить блоки. Необходимо перестроить базы даных с помощью -reindex-chainstate.</translation>
@@ -5600,6 +5898,10 @@ Go to File &gt; Open Wallet to load a wallet.
         <source>Unknown wallet file format "%s" provided. Please provide one of "bdb" or "sqlite".</source>
         <translation>Указан неизвестный формат файла кошелька "%s". Пожалуйста, укажите один из следующих: "bdb" или "sqlite".</translation>
     </message>
+    <message>
+        <source>Unsupported chainstate database format found. Please restart with -reindex-chainstate. This will rebuild the chainstate database.</source>
+        <translation>Обнаружен неподдерживаемый формат базы данных состояния цепи. Пожалуйста, перезапустите с -reindex-chainstate. Это перестроит базу данных состояния цепи.</translation>
+    </message>
     <message>
         <source>Warning: Dumpfile wallet format "%s" does not match command line specified format "%s".</source>
         <translation>Предупреждение: формат кошелька в файле дампа "%s" не соответствует указанному в командной строке формату "%s".</translation>
@@ -5640,10 +5942,30 @@ Go to File &gt; Open Wallet to load a wallet.
         <source>-rpcport must be specified when -devnet and -server are specified</source>
         <translation>Необходимо указать -rpcport, если указаны -devnet и -server</translation>
     </message>
+    <message>
+        <source>-statsbatchsize cannot be configured with a negative value.</source>
+        <translation>-statsbatchsize не может использовать отрицательное значение.</translation>
+    </message>
+    <message>
+        <source>-statsduration cannot be configured with a negative value.</source>
+        <translation>-statsduration не может использовать отрицательное значение.</translation>
+    </message>
     <message>
         <source>A fatal internal error occurred, see debug.log for details</source>
         <translation>Произошла критическая ошибка, подробности смотрите в файле debug.log</translation>
     </message>
+    <message>
+        <source>Cannot create socket (socket() returned error %s)</source>
+        <translation>Ошибка: не удалось создать сокет (socket() вернул ошибку %s)</translation>
+    </message>
+    <message>
+        <source>Cannot get socket address for %s</source>
+        <translation>Не удалось получить адрес сокета для %s</translation>
+    </message>
+    <message>
+        <source>Cannot init Statsd client</source>
+        <translation>Не удалось инициализировать клиент Statsd</translation>
+    </message>
     <message>
         <source>Cannot resolve -%s address: '%s'</source>
         <translation>Не удаётся разрешить адрес в параметре -%s: '%s'</translation>
@@ -5688,10 +6010,6 @@ Go to File &gt; Open Wallet to load a wallet.
         <source>Error reading next record from wallet database</source>
         <translation>Ошибка чтения следующей записи из базы данных кошелька.</translation>
     </message>
-    <message>
-        <source>Error upgrading chainstate database</source>
-        <translation>Ошибка обновления базы данных состояний цепочки</translation>
-    </message>
     <message>
         <source>Loading P2P addresses…</source>
         <translation>Загрузка P2P адресов…</translation>
@@ -5812,14 +6130,70 @@ Go to File &gt; Open Wallet to load a wallet.
         <source>%s corrupt. Try using the wallet tool dash-wallet to salvage or restoring a backup.</source>
         <translation>%s поврежден. Попробуете воспользоваться утилитой dash-wallet для восстановления.</translation>
     </message>
+    <message>
+        <source>%s is set very high! Fees this large could be paid on a single transaction.</source>
+        <translation>Установлено очень большое значение %s! Комиссия такого размера может быть уплачена при проведении отдельной транзакции.</translation>
+    </message>
+    <message>
+        <source>%s request to listen on port %u. This port is considered "bad" and thus it is unlikely that any Dash Core peers connect to it. See doc/p2p-bad-ports.md for details and a full list.</source>
+        <translation>%s запрашивает прослушивание на порту %u. Этот порт считается «плохим», поэтому маловероятно, что к нему подключатся какие-либо пиры Dash Core. Подробности и полный список смотрите в doc/p2p-bad-ports.md</translation>
+    </message>
     <message>
         <source>Cannot provide specific connections and have addrman find outgoing connections at the same time.</source>
         <translation>Одновременное указание конкретных соединений и использование addrman для поиска исходящих соединений не допускается.</translation>
     </message>
+    <message>
+        <source>Failed to upgrade Evo database</source>
+        <translation>Ошибка обновления базы данных Evo</translation>
+    </message>
+    <message>
+        <source>Fee needed &gt; fee paid</source>
+        <translation>Требуемая комиссия &gt; уплаченная комиссия</translation>
+    </message>
+    <message>
+        <source>Host %s on unsupported network</source>
+        <translation>Хост %s в неподдерживаемой сети</translation>
+    </message>
+    <message>
+        <source>Invalid amount for %s=&lt;amount&gt;: '%s' (must be at least %s)</source>
+        <translation>Неверная сумма в параметре %s=&lt;amount&gt;: '%s' (должна быть минимум %s)</translation>
+    </message>
+    <message>
+        <source>Invalid amount for %s=&lt;amount&gt;: '%s'</source>
+        <translation>Некорректное значение в параметре %s=&lt;amount&gt;: '%s'</translation>
+    </message>
+    <message>
+        <source>Invalid port specified in %s: '%s'</source>
+        <translation>Указан некорректный порт в %s: '%s'</translation>
+    </message>
     <message>
         <source>Last successful action was too recent.</source>
         <translation>Последнее успешное действие было слишком недавно.</translation>
     </message>
+    <message>
+        <source>Missing solving data for estimating transaction size</source>
+        <translation>Отсутствуют данные для оценки размера транзакции</translation>
+    </message>
+    <message>
+        <source>No host specified</source>
+        <translation>Хост не указан</translation>
+    </message>
+    <message>
+        <source>No host specified, malformed URL</source>
+        <translation>Хост не указан, неправильный формат URL</translation>
+    </message>
+    <message>
+        <source>No text before the scheme delimiter, malformed URL</source>
+        <translation>Нет текста перед разделителем схемы, неправильный формат URL</translation>
+    </message>
+    <message>
+        <source>Port must be between %d and %d, supplied %d</source>
+        <translation>Порт должен быть между %d и %d, указан %d</translation>
+    </message>
+    <message>
+        <source>Socket not initialized, cannot send message</source>
+        <translation>Сокет не инициализирован, невозможно отправить сообщение</translation>
+    </message>
     <message>
         <source>The source code is available from %s.</source>
         <translation>Исходный код доступен по адресу %s.</translation>
@@ -5848,6 +6222,10 @@ Go to File &gt; Open Wallet to load a wallet.
         <source>Transaction fees are too high.</source>
         <translation>Комиссия по транзакции слишком большая.</translation>
     </message>
+    <message>
+        <source>Transaction needs a change address, but we can't generate it.</source>
+        <translation>Транзакции нужен адрес сдачи, но мы не можем его сгенерировать.</translation>
+    </message>
     <message>
         <source>Transaction not valid.</source>
         <translation>Транзакция некорректна.</translation>
@@ -5868,6 +6246,18 @@ Go to File &gt; Open Wallet to load a wallet.
         <source>Unable to locate enough non-denominated funds for this transaction.</source>
         <translation>Не удалось обнаружить достаточных для выполнения этой транзакции неденоминированных средств.</translation>
     </message>
+    <message>
+        <source>Unable to lookup host %s</source>
+        <translation>Невозможно найти хост %s</translation>
+    </message>
+    <message>
+        <source>Unable to parse -maxuploadtarget: '%s'</source>
+        <translation>Невозможно разобрать -maxuploadtarget: '%s'</translation>
+    </message>
+    <message>
+        <source>Unable to send message to %s (::sendto() returned error %s)</source>
+        <translation>Невозможно отправить сообщение на %s (::sendto() вернула ошибку %s)</translation>
+    </message>
     <message>
         <source>Unable to sign spork message, wrong key?</source>
         <translation>Не удалось подписать spork-сообщение. Неправильный ключ?</translation>
@@ -5880,6 +6270,10 @@ Go to File &gt; Open Wallet to load a wallet.
         <source>Unknown state: id = %u</source>
         <translation>Неизвестное состояние: id = %u</translation>
     </message>
+    <message>
+        <source>Unsupported URL scheme, must begin with udp://</source>
+        <translation>Неподдерживаемая схема URL, должна начинаться с udp://</translation>
+    </message>
     <message>
         <source>Unsupported logging category %s=%s.</source>
         <translation>Неподдерживаемая категория отладочной информации %s=%s.</translation>

From fbbf013f5decc6e71b49eacb0d6df97164db4b9f Mon Sep 17 00:00:00 2001
From: UdjinM6 <UdjinM6@users.noreply.github.com>
Date: Thu, 23 Oct 2025 12:12:39 +0300
Subject: [PATCH 320/656] de

---
 src/qt/locale/dash_de.ts | 848 +++++++++++++++++++++++++++++----------
 1 file changed, 645 insertions(+), 203 deletions(-)

diff --git a/src/qt/locale/dash_de.ts b/src/qt/locale/dash_de.ts
index 6a4ba46464e1..e1fb5e70d8e0 100644
--- a/src/qt/locale/dash_de.ts
+++ b/src/qt/locale/dash_de.ts
@@ -65,14 +65,6 @@
         <source>C&amp;hoose</source>
         <translation>&amp;Auswählen</translation>
     </message>
-    <message>
-        <source>Sending addresses</source>
-        <translation>Zahlungsadressen</translation>
-    </message>
-    <message>
-        <source>Receiving addresses</source>
-        <translation>Empfangsadressen</translation>
-    </message>
     <message>
         <source>These are your Dash addresses for sending payments. Always check the amount and the receiving address before sending coins.</source>
         <translation>Dies sind ihre Dash-Adressen zum Tätigen von Überweisungen. Bitte prüfen Sie den Betrag und die Empfangsadresse, bevor Sie Dash überweisen.</translation>
@@ -115,6 +107,14 @@
         <extracomment>An error message. %1 is a stand-in argument for the name of the file we attempted to save to.</extracomment>
         <translation>Beim Speichern der Adressliste nach %1 ist ein Fehler aufgetreten. Bitte noch einmal versuchen.</translation>
     </message>
+    <message>
+        <source>Sending addresses - %1</source>
+        <translation>Sendeadressen - %1</translation>
+    </message>
+    <message>
+        <source>Receiving addresses - %1</source>
+        <translation>Empfangsadressen - %1</translation>
+    </message>
     <message>
         <source>Exporting Failed</source>
         <translation>Exportieren fehlgeschlagen</translation>
@@ -178,23 +178,23 @@
     <name>AskPassphraseDialog</name>
     <message>
         <source>Passphrase Dialog</source>
-        <translation>Passphrasendialog</translation>
+        <translation>Passwort-Dialog</translation>
     </message>
     <message>
         <source>Enter passphrase</source>
-        <translation>Passphrase eingeben</translation>
+        <translation>Passwort eingeben</translation>
     </message>
     <message>
         <source>New passphrase</source>
-        <translation>Neue Passphrase</translation>
+        <translation>Neues Passwort eingeben</translation>
     </message>
     <message>
         <source>Repeat new passphrase</source>
-        <translation>Neue Passphrase wiederholen</translation>
+        <translation>Neues Passwort wiederholen</translation>
     </message>
     <message>
         <source>Show passphrase</source>
-        <translation>Passphrase anzeigen</translation>
+        <translation>Passwort anzeigen</translation>
     </message>
     <message>
         <source>Encrypt wallet</source>
@@ -202,7 +202,7 @@
     </message>
     <message>
         <source>This operation needs your wallet passphrase to unlock the wallet.</source>
-        <translation>Dieser Vorgang benötigt ihre Passphrase, um die Wallet zu entsperren.</translation>
+        <translation>Dieser Vorgang benötigt ihr Passwort, um die Wallet zu entsperren.</translation>
     </message>
     <message>
         <source>Unlock wallet for mixing only</source>
@@ -214,7 +214,7 @@
     </message>
     <message>
         <source>Change passphrase</source>
-        <translation>Passphrase ändern</translation>
+        <translation>Passwort ändern</translation>
     </message>
     <message>
         <source>Confirm wallet encryption</source>
@@ -222,7 +222,7 @@
     </message>
     <message>
         <source>Warning: If you encrypt your wallet and lose your passphrase, you will &lt;b&gt;LOSE ALL OF YOUR DASH&lt;/b&gt;!</source>
-        <translation>Warnung: Wenn Sie ihre Wallet verschlüsseln und ihre Passphrase verlieren werden Sie &lt;b&gt;alle ihre Dash verlieren&lt;/b&gt;!</translation>
+        <translation>Warnung: Wenn Sie ihre Wallet verschlüsseln und ihre Passwort verlieren werden Sie &lt;b&gt;alle ihre Dash verlieren&lt;/b&gt;!</translation>
     </message>
     <message>
         <source>Are you sure you wish to encrypt your wallet?</source>
@@ -234,11 +234,11 @@
     </message>
     <message>
         <source>Enter the new passphrase for the wallet.&lt;br/&gt;Please use a passphrase of &lt;b&gt;ten or more random characters&lt;/b&gt;, or &lt;b&gt;eight or more words&lt;/b&gt;.</source>
-        <translation>Gib die neue Passphrase für die Wallet ein.&lt;br/&gt;Bitte nutze eine Passphrase mit &lt;b&gt;zehn oder mehr zufälligen Zeichen&lt;/b&gt;, oder &lt;b&gt;acht oder mehr Wörtern&lt;/b&gt;.</translation>
+        <translation>Gib die neue Passphrase für die Wallet ein.&lt;br/&gt;Bitte nutze ein Passwort mit &lt;b&gt;zehn oder mehr zufälligen Zeichen&lt;/b&gt;, oder eine Passphrase mit &lt;b&gt;acht oder mehr Wörtern&lt;/b&gt;.</translation>
     </message>
     <message>
         <source>Enter the old passphrase and new passphrase for the wallet.</source>
-        <translation>Gib nun sowhl die bisherige Passphrase als auch die neue Passphrase für die Wallet ein.</translation>
+        <translation>Gib nun sowohl das bisherige Passwort als auch die neue Passwort für die Wallet ein.</translation>
     </message>
     <message>
         <source>Remember that encrypting your wallet cannot fully protect your funds from being stolen by malware infecting your computer.</source>
@@ -282,11 +282,23 @@
     </message>
     <message>
         <source>The passphrase entered for the wallet decryption was incorrect.</source>
-        <translation>Die eingegebene Passphrase zur Wallet-Entschlüsselung war nicht korrekt.</translation>
+        <translation>Das eingegebene Passwort zur Wallet-Entschlüsselung war nicht korrekt.</translation>
+    </message>
+    <message>
+        <source>The passphrase entered for the wallet decryption is incorrect. It contains a null character (ie - a zero byte). If the passphrase was set with a version of this software prior to 23.0, please try again with only the characters up to — but not including — the first null character. If this is successful, please set a new passphrase to avoid this issue in the future.</source>
+        <translation>Das eingegebene Passwort zur Wallet-Entschlüsselung ist fehlerhaft. Es enthält ein Null-Zeichen (d.h. ein Null-Byte). Wenn das Passwort mit einer Version dieser Software vor 23.0 gesetzt wurde, versuchen Sie es bitte erneut mit nur den Zeichen bis zum — aber nicht einschließlich — dem ersten Null-Zeichen. Wenn dies erfolgreich ist, setzen Sie bitte ein neues Passwort, um dieses Problem in Zukunft zu vermeiden.</translation>
     </message>
     <message>
         <source>Wallet passphrase was successfully changed.</source>
-        <translation>Die Wallet-Passphrase wurde erfolgreich geändert.</translation>
+        <translation>Das Wallet-Passwort wurde erfolgreich geändert.</translation>
+    </message>
+    <message>
+        <source>Passphrase change failed</source>
+        <translation>Passwortänderung fehlgeschlagen</translation>
+    </message>
+    <message>
+        <source>The old passphrase entered for the wallet decryption is incorrect. It contains a null character (ie - a zero byte). If the passphrase was set with a version of this software prior to 23.0, please try again with only the characters up to — but not including — the first null character.</source>
+        <translation>Das alte Passwort zur Wallet-Entschlüsselung ist fehlerhaft. Es enthält ein Null-Zeichen (d.h. ein Null-Byte). Wenn das Passwort mit einer Version dieser Software vor 23.0 gesetzt wurde, versuchen Sie es bitte erneut mit nur den Zeichen bis zum — aber nicht einschließlich — dem ersten Null-Zeichen.</translation>
     </message>
     <message>
         <source>Warning: The Caps Lock key is on!</source>
@@ -374,7 +386,7 @@
     </message>
     <message>
         <source>&amp;Change Passphrase…</source>
-        <translation>Passphrase &amp;ändern…</translation>
+        <translation>Passwort &amp;ändern…</translation>
     </message>
     <message>
         <source>&amp;Unlock Wallet…</source>
@@ -392,10 +404,6 @@
         <source>&amp;Load PSBT from file…</source>
         <translation>&amp;lade PSBT aus Datei...</translation>
     </message>
-    <message>
-        <source>Load PSBT from clipboard…</source>
-        <translation>Lade PSBT aus der Zwischenablage...</translation>
-    </message>
     <message>
         <source>&amp;Sending addresses</source>
         <translation>&amp;Absendeadressen</translation>
@@ -428,10 +436,6 @@
         <source>&amp;Window</source>
         <translation>&amp;Fenster</translation>
     </message>
-    <message>
-        <source>Minimize</source>
-        <translation>Minimieren</translation>
-    </message>
     <message>
         <source>Zoom</source>
         <translation>Zoom</translation>
@@ -484,14 +488,6 @@
         <source>Modify configuration options for %1</source>
         <translation>Konfiguration von %1 bearbeiten</translation>
     </message>
-    <message>
-        <source>&amp;Show / Hide</source>
-        <translation>&amp;Anzeigen / Verstecken</translation>
-    </message>
-    <message>
-        <source>Show or hide the main Window</source>
-        <translation>Das Hauptfenster anzeigen oder verstecken</translation>
-    </message>
     <message>
         <source>Encrypt the private keys that belong to your wallet</source>
         <translation>Verschlüsselt die zu ihrer Wallet gehörenden privaten Schlüssel</translation>
@@ -502,7 +498,7 @@
     </message>
     <message>
         <source>Change the passphrase used for wallet encryption</source>
-        <translation>Ändert die Passphrase, die für die Wallet-Verschlüsselung benutzt wird</translation>
+        <translation>Ändert das Passwort, die für die Wallet-Verschlüsselung benutzt wird</translation>
     </message>
     <message>
         <source>Unlock wallet</source>
@@ -556,10 +552,6 @@
         <source>Show wallet repair options</source>
         <translation>Optionen zur Wallet-Reparatur anzeigen</translation>
     </message>
-    <message>
-        <source>Open Wallet &amp;Configuration File</source>
-        <translation>&amp;Konfigurationsdatei öffnen</translation>
-    </message>
     <message>
         <source>Open configuration file</source>
         <translation>Konfigurationsdatei öffnen</translation>
@@ -614,10 +606,18 @@
         <source>Show information about %1</source>
         <translation>Zeige Informationen über %1</translation>
     </message>
+    <message>
+        <source>Load PSBT from &amp;clipboard…</source>
+        <translation>PSBT aus &amp;Zwischenablage laden…</translation>
+    </message>
     <message>
         <source>Open debugging and diagnostic console</source>
         <translation>Debugging- und Diagnose-Konsole öffnen</translation>
     </message>
+    <message>
+        <source>Open &amp;wallet configuration file</source>
+        <translation>&amp;Wallet-Konfigurationsdatei öffnen</translation>
+    </message>
     <message>
         <source>Open a dash: URI</source>
         <translation>Ein Dash öffnen: URI</translation>
@@ -626,6 +626,16 @@
         <source>Create a new wallet</source>
         <translation>Eine neue Wallet erstellen</translation>
     </message>
+    <message>
+        <source>Restore Wallet…</source>
+        <extracomment>Name of the menu item that restores wallet from a backup file.</extracomment>
+        <translation>Wallet wiederherstellen…</translation>
+    </message>
+    <message>
+        <source>Restore a wallet from a backup file</source>
+        <extracomment>Status tip for Restore Wallet menu item</extracomment>
+        <translation>Eine Wallet aus einer Sicherungsdatei wiederherstellen</translation>
+    </message>
     <message>
         <source>Close all wallets</source>
         <translation>Alle Wallets schließen</translation>
@@ -646,10 +656,34 @@
         <source>Mask the values in the Overview tab</source>
         <translation>Werte im Tab "Übersicht" verbergen</translation>
     </message>
+    <message>
+        <source>Wallet Data</source>
+        <extracomment>Name of the wallet data file format.</extracomment>
+        <translation>Wallet-Daten</translation>
+    </message>
+    <message>
+        <source>Load Wallet Backup</source>
+        <extracomment>The title for Restore Wallet File Windows</extracomment>
+        <translation>Wallet-Sicherung laden</translation>
+    </message>
+    <message>
+        <source>Restore Wallet</source>
+        <extracomment>Title of pop-up window shown when the user is attempting to restore a wallet.</extracomment>
+        <translation>Wallet wiederherstellen</translation>
+    </message>
+    <message>
+        <source>Wallet Name</source>
+        <extracomment>Label of the input field where the name of the wallet is entered.</extracomment>
+        <translation>Wallet-Name</translation>
+    </message>
     <message>
         <source>&amp;Settings</source>
         <translation>&amp;Einstellungen</translation>
     </message>
+    <message>
+        <source>&amp;Minimize</source>
+        <translation>&amp;Minimieren</translation>
+    </message>
     <message>
         <source>&amp;Help</source>
         <translation>&amp;Hilfe</translation>
@@ -666,6 +700,14 @@
         <source>View Governance Proposals</source>
         <translation>Zeige Governance Proposals</translation>
     </message>
+    <message>
+        <source>&amp;Hide</source>
+        <translation>&amp;Verbergen</translation>
+    </message>
+    <message>
+        <source>S&amp;how</source>
+        <translation>&amp;Anzeigen</translation>
+    </message>
     <message numerus="yes">
         <source>%n active connection(s) to Dash network</source>
         <extracomment>A substring of the tooltip.</extracomment>
@@ -687,6 +729,14 @@
         <source>Close Wallet…</source>
         <translation>Wallet schließen…</translation>
     </message>
+    <message>
+        <source>Load Partially Signed Blockchain Transaction</source>
+        <translation>Lade Partially Signed Blockchain Transaction</translation>
+    </message>
+    <message>
+        <source>Load Partially Signed Blockchain Transaction from clipboard</source>
+        <translation>Lade Partially Signed Blockchain Transaction aus der Zwischenablage </translation>
+    </message>
     <message>
         <source>Create Wallet…</source>
         <translation>Wallet erstellen…</translation>
@@ -739,10 +789,6 @@
         <source>Processing blocks on disk…</source>
         <translation>Verarbeite Blöcke auf Datenträger…</translation>
     </message>
-    <message>
-        <source>Reindexing blocks on disk…</source>
-        <translation>Reindiziere Blöcke auf Datenträger…</translation>
-    </message>
     <message>
         <source>Connecting to peers…</source>
         <translation>Verbinde mit Peers…</translation>
@@ -896,10 +942,6 @@
         <source>Coin Selection</source>
         <translation>"Coin Control"-Auswahl</translation>
     </message>
-    <message>
-        <source>Dust:</source>
-        <translation>"Dust"</translation>
-    </message>
     <message>
         <source>After Fee:</source>
         <translation>Abzüglich Gebühr:</translation>
@@ -1000,10 +1042,6 @@
         <source>Copy bytes</source>
         <translation>Byte kopieren</translation>
     </message>
-    <message>
-        <source>Copy dust</source>
-        <translation>"Dust" Betrag kopieren</translation>
-    </message>
     <message>
         <source>Copy change</source>
         <translation>Wechselgeld kopieren</translation>
@@ -1016,18 +1054,6 @@
         <source>(%1 locked)</source>
         <translation>(%1 gesperrt)</translation>
     </message>
-    <message>
-        <source>yes</source>
-        <translation>ja</translation>
-    </message>
-    <message>
-        <source>no</source>
-        <translation>nein</translation>
-    </message>
-    <message>
-        <source>This label turns red if any recipient receives an amount smaller than the current dust threshold.</source>
-        <translation>Diese Bezeichnung wird rot, wenn ein Empfänger einen Betrag kleiner als die gegenwärtige Schwelle für Dust erhält.</translation>
-    </message>
     <message>
         <source>Can vary +/- %1 duff(s) per input.</source>
         <translation>Kann um +/- %1 duff(s) pro Eingabe variieren.</translation>
@@ -1106,7 +1132,7 @@
     </message>
     <message>
         <source>Encrypt the wallet. The wallet will be encrypted with a passphrase of your choice.</source>
-        <translation>Verschlüssele die Wallet. Die Wallet wird mit einer Passphrase deiner Wahl verschlüsselt.</translation>
+        <translation>Verschlüssele die Wallet. Die Wallet wird mit einem Passwort deiner Wahl verschlüsselt.</translation>
     </message>
     <message>
         <source>Encrypt Wallet</source>
@@ -1241,18 +1267,102 @@
         <source>Filter proposal list</source>
         <translation>Proposal-List filtern</translation>
     </message>
+    <message>
+        <source>Masternode Count:</source>
+        <translation>Masternode-Anzahl:</translation>
+    </message>
+    <message>
+        <source>Number of masternodes this wallet can vote with (masternodes for which this wallet holds the voting key)</source>
+        <translation>Anzahl der Masternodes, mit denen diese Wallet abstimmen kann (Masternodes, für die diese Wallet den Abstimmungsschlüssel hält)</translation>
+    </message>
     <message>
         <source>Proposal Count:</source>
         <translation>Proposal Zahl:</translation>
     </message>
+    <message>
+        <source>Create Proposal</source>
+        <translation>Proposal erstellen</translation>
+    </message>
     <message>
         <source>Filter by Title</source>
         <translation>Filter nach Titel</translation>
     </message>
+    <message>
+        <source>Unavailable</source>
+        <translation>Nicht verfügbar</translation>
+    </message>
+    <message>
+        <source>A synced node and an unlocked wallet are required.</source>
+        <translation>Ein synchronisierter Knoten und eine entsperrte Wallet sind erforderlich.</translation>
+    </message>
+    <message>
+        <source>Vote Yes</source>
+        <translation>Ja stimmen</translation>
+    </message>
+    <message>
+        <source>Vote No</source>
+        <translation>Nein stimmen</translation>
+    </message>
+    <message>
+        <source>Vote Abstain</source>
+        <translation>Enthaltung</translation>
+    </message>
     <message>
         <source>Proposal Info: %1</source>
         <translation>Proposal Info: %1</translation>
     </message>
+    <message>
+        <source>Voting Failed</source>
+        <translation>Abstimmung fehlgeschlagen</translation>
+    </message>
+    <message>
+        <source>No wallet available.</source>
+        <translation>Keine Wallet verfügbar.</translation>
+    </message>
+    <message>
+        <source>No masternode voting keys found in wallet.</source>
+        <translation>Keine Masternode-Abstimmungsschlüssel in der Wallet gefunden.</translation>
+    </message>
+    <message>
+        <source>Please select a proposal to vote on.</source>
+        <translation>Bitte wählen Sie einen Proposal aus, über den abgestimmt werden soll.</translation>
+    </message>
+    <message>
+        <source>Unable to unlock wallet.</source>
+        <translation>Wallet kann nicht entsperrt werden.</translation>
+    </message>
+    <message>
+        <source>Unable to get masternode list. Please try again later.</source>
+        <translation>Masternode-Liste kann nicht abgerufen werden. Bitte versuchen Sie es später erneut.</translation>
+    </message>
+    <message>
+        <source>Masternode %1 not found</source>
+        <translation>Masternode %1 nicht gefunden</translation>
+    </message>
+    <message>
+        <source>Failed to sign vote for masternode %1</source>
+        <translation>Signierung der Abstimmung für Masternode %1 fehlgeschlagen</translation>
+    </message>
+    <message>
+        <source>Masternode %1: %2</source>
+        <translation>Masternode %1: %2</translation>
+    </message>
+    <message numerus="yes">
+        <source>Voted successfully %n time(s)</source>
+        <translation><numerusform>%n Mal erfolgreich abgestimmt</numerusform><numerusform>%n Mal erfolgreich abgestimmt</numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <source>Failed to vote %n time(s)</source>
+        <translation><numerusform>%n Mal fehlgeschlagen abzustimmen</numerusform><numerusform>%n Mal fehlgeschlagen abzustimmen</numerusform></translation>
+    </message>
+    <message>
+        <source>Errors:</source>
+        <translation>Fehler:</translation>
+    </message>
+    <message>
+        <source>Voting Results</source>
+        <translation>Abstimmungsergebnisse</translation>
+    </message>
 </context>
 <context>
     <name>HelpMessageDialog</name>
@@ -1323,13 +1433,17 @@
         <source>Use a custom data directory:</source>
         <translation>Ein benutzerdefiniertes Datenverzeichnis verwenden:</translation>
     </message>
-    <message>
-        <source>(of %1 GB needed)</source>
-        <translation>(von benötigten %1 GB)</translation>
+    <message numerus="yes">
+        <source>%n GB of space available</source>
+        <translation><numerusform>%n GB Speicherplatz verfügbar</numerusform><numerusform>%n GB Speicherplatz verfügbar</numerusform></translation>
     </message>
-    <message>
-        <source>(%1 GB needed for full chain)</source>
-        <translation>(%1 GB für die gesamte Blockchain benötigt)</translation>
+    <message numerus="yes">
+        <source>(of %n GB needed)</source>
+        <translation><numerusform>(von %n GB benötigt)</numerusform><numerusform>(von %n GB benötigt)</numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <source>(%n GB needed for full chain)</source>
+        <translation><numerusform>(%n GB für die vollständige Blockchain benötigt)</numerusform><numerusform>(%n GB für die vollständige Blockchain benötigt)</numerusform></translation>
     </message>
     <message>
         <source>At least %1 GB of data will be stored in this directory, and it will grow over time.</source>
@@ -1361,6 +1475,13 @@
         <translation>Fehler</translation>
     </message>
 </context>
+<context>
+    <name>LoadWalletsActivity</name>
+    <message>
+        <source>Loading wallets…</source>
+        <translation>Wallets werden geladen…</translation>
+    </message>
+</context>
 <context>
     <name>MasternodeList</name>
     <message>
@@ -1553,6 +1674,11 @@
         <source>URI:</source>
         <translation>URI:</translation>
     </message>
+    <message>
+        <source>Paste address from clipboard</source>
+        <extracomment>Tooltip text for button that allows you to paste an address that is in your clipboard.</extracomment>
+        <translation>Adresse aus Zwischenablage einfügen</translation>
+    </message>
 </context>
 <context>
     <name>OpenWalletActivity</name>
@@ -1663,6 +1789,16 @@
         <extracomment>An Options window setting to set subtracting the fee from a sending amount as default.</extracomment>
         <translation>&amp;Gebühr vom Gesamtbetrag standardmäßig abziehen</translation>
     </message>
+    <message>
+        <source>Enable &amp;PSBT controls</source>
+        <extracomment>An options window setting to enable PSBT controls.</extracomment>
+        <translation>&amp;PSBT-Steuerelemente aktivieren</translation>
+    </message>
+    <message>
+        <source>Whether to show PSBT controls.</source>
+        <extracomment>Tooltip text for options window setting that enables PSBT controls.</extracomment>
+        <translation>Ob PSBT-Steuerelemente angezeigt werden sollen.</translation>
+    </message>
     <message>
         <source>Whether to keep the specified custom change address or not.</source>
         <translation>Ob die benutzerdefinierte Wechselgeld-Adresse beibehalten wird oder nicht.</translation>
@@ -1806,20 +1942,20 @@ https://explore.transifex.com/dash/dash/</source>
 https://explore.transifex.com/dash/dash/</translation>
     </message>
     <message>
-        <source>Options set in this dialog are overridden by the command line or in the configuration file:</source>
-        <translation>In diesem Dialog eingestellte Optionen werden in der Kommandozeile oder in der Konfigurationsdatei überschrieben:</translation>
+        <source>Third-party URLs (e.g. a block explorer) that appear in the transactions tab as context menu items.&lt;br/&gt;%s in the URL is replaced by transaction hash. Multiple URLs are separated by vertical bar |.</source>
+        <translation>Drittanbieter-URLs (z.B. ein Block-Explorer), die im Transaktions-Tab als Kontextmenü-Einträge erscheinen.&lt;br/&gt;%s in der URL wird durch den Transaktions-Hash ersetzt. Mehrere URLs werden durch senkrechten Strich | getrennt.</translation>
     </message>
     <message>
-        <source>Minimize instead of exit the application when the window is closed. When this option is enabled, the application will be closed only after selecting Exit in the menu.</source>
-        <translation>Minimiert die Anwendung anstatt sie zu beenden wenn das Fenster geschlossen wird. Wenn dies aktiviert ist, müssen Sie das Programm über "Beenden" im Menü schließen.</translation>
+        <source>&amp;Third-party transaction URLs</source>
+        <translation>&amp;Drittanbieter-Transaktions-URLs</translation>
     </message>
     <message>
-        <source>Third party URLs (e.g. a block explorer) that appear in the transactions tab as context menu items.&lt;br/&gt;%s in the URL is replaced by transaction hash. Multiple URLs are separated by vertical bar |.</source>
-        <translation>Externe URLs (z.B. ein Block-Explorer), die im Kontextmenü des Transaktionsverlaufs eingefügt werden. In der URL wird %s durch den Transaktionshash ersetzt. Bei Angabe mehrerer URLs müssen diese durch "|" voneinander getrennt werden.</translation>
+        <source>Options set in this dialog are overridden by the command line or in the configuration file:</source>
+        <translation>In diesem Dialog eingestellte Optionen werden in der Kommandozeile oder in der Konfigurationsdatei überschrieben:</translation>
     </message>
     <message>
-        <source>&amp;Third party transaction URLs</source>
-        <translation>&amp;Externe Transaktions-URLs</translation>
+        <source>Minimize instead of exit the application when the window is closed. When this option is enabled, the application will be closed only after selecting Exit in the menu.</source>
+        <translation>Minimiert die Anwendung anstatt sie zu beenden wenn das Fenster geschlossen wird. Wenn dies aktiviert ist, müssen Sie das Programm über "Beenden" im Menü schließen.</translation>
     </message>
     <message>
         <source>Whether to show coin control features or not.</source>
@@ -1963,14 +2099,22 @@ https://explore.transifex.com/dash/dash/</translation>
     </message>
     <message>
         <source>Confirm options reset</source>
+        <extracomment>Window title text of pop-up window shown when the user has chosen to reset options.</extracomment>
         <translation>Zurücksetzen der Konfiguration bestätigen</translation>
     </message>
     <message>
         <source>Client restart required to activate changes.</source>
+        <extracomment>Text explaining that the settings changed will not come into effect until the client is restarted.</extracomment>
         <translation>Clientneustart nötig, um die Änderungen zu aktivieren.</translation>
     </message>
+    <message>
+        <source>Current settings will be backed up at "%1".</source>
+        <extracomment>Text explaining to the user that the client's current settings will be backed up at a specific location. %1 is a stand-in argument for the backup location's path.</extracomment>
+        <translation>Die aktuellen Einstellungen werden unter "%1" gesichert.</translation>
+    </message>
     <message>
         <source>Client will be shut down. Do you want to proceed?</source>
+        <extracomment>Text asking the user to confirm if they would like to proceed with a client shutdown.</extracomment>
         <translation>Client wird beendet, wollen Sie fortfahren?</translation>
     </message>
     <message>
@@ -2243,6 +2387,10 @@ https://explore.transifex.com/dash/dash/</translation>
         <source>Failed to sign transaction: %1</source>
         <translation>Fehler beim Signieren der Transaktion: %1</translation>
     </message>
+    <message>
+        <source>Cannot sign inputs while wallet is locked.</source>
+        <translation>Inputs können nicht signiert werden, weil die Wallet gesperrt ist.</translation>
+    </message>
     <message>
         <source>Could not sign any more inputs.</source>
         <translation>Es konnten keine weiteren Inputs mehr signiert werden.</translation>
@@ -2487,6 +2635,181 @@ Da die Unterstützung eingestellt wurde, sollten Sie den Händler bitten, Ihnen
         <translation>Status</translation>
     </message>
 </context>
+<context>
+    <name>ProposalWizard</name>
+    <message>
+        <source>Create Governance Proposal</source>
+        <translation>Governance-Proposal erstellen</translation>
+    </message>
+    <message>
+        <source>Enter proposal details</source>
+        <translation>Proposal-Details eingeben</translation>
+    </message>
+    <message>
+        <source>A fee will be burned when you prepare the proposal.</source>
+        <translation>Eine Gebühr wird verbrannt, wenn Sie den Proposal vorbereiten.</translation>
+    </message>
+    <message>
+        <source>Proposal &amp;name</source>
+        <translation>Proposal-&amp;Name</translation>
+    </message>
+    <message>
+        <source>&amp;Description URL</source>
+        <translation>&amp;Beschreibungs-URL</translation>
+    </message>
+    <message>
+        <source>Payment &amp;address</source>
+        <translation>Zahlungs&amp;adresse</translation>
+    </message>
+    <message>
+        <source>Payment &amp;amount</source>
+        <translation>Zahlungs&amp;betrag</translation>
+    </message>
+    <message>
+        <source>The amount to request in a single payment</source>
+        <translation>Der Betrag, der in einer einzelnen Zahlung angefordert werden soll</translation>
+    </message>
+    <message>
+        <source>&amp;First payment</source>
+        <translation>&amp;Erste Zahlung</translation>
+    </message>
+    <message>
+        <source>Pa&amp;yments</source>
+        <translation>&amp;Zahlungen</translation>
+    </message>
+    <message>
+        <source>To&amp;tal amount</source>
+        <translation>&amp;Gesamtbetrag</translation>
+    </message>
+    <message>
+        <source>Proposal &amp;fee</source>
+        <translation>Proposal-&amp;Gebühr</translation>
+    </message>
+    <message>
+        <source>Next</source>
+        <translation>Weiter</translation>
+    </message>
+    <message>
+        <source>Review proposal JSON and validate.</source>
+        <translation>Proposal-JSON überprüfen und validieren.</translation>
+    </message>
+    <message>
+        <source>Hex-encoded JSON</source>
+        <translation>Hex-kodiertes JSON</translation>
+    </message>
+    <message>
+        <source>Back</source>
+        <translation>Zurück</translation>
+    </message>
+    <message>
+        <source>Validate</source>
+        <translation>Validieren</translation>
+    </message>
+    <message>
+        <source>Prepare (burn fee) and wait for confirmations.</source>
+        <translation>Vorbereiten (Gebühr verbrennen) und auf Bestätigungen warten.</translation>
+    </message>
+    <message>
+        <source>Copy</source>
+        <translation>Kopieren</translation>
+    </message>
+    <message>
+        <source>At 1/6 confirmations: can be relayed and queued. At 6/6: accepted and processed.</source>
+        <translation>Bei 1/6 Bestätigungen: kann weitergeleitet und in die Warteschlange gestellt werden. Bei 6/6: akzeptiert und verarbeitet.</translation>
+    </message>
+    <message>
+        <source>Confirmations progress</source>
+        <translation>Bestätigungsfortschritt</translation>
+    </message>
+    <message>
+        <source>Shows progress toward the required number of confirmations for the proposal fee transaction.</source>
+        <translation>Zeigt den Fortschritt zur erforderlichen Anzahl von Bestätigungen für die Proposal-Gebührentransaktion an.</translation>
+    </message>
+    <message>
+        <source>Estimated time remaining: -</source>
+        <translation>Geschätzte verbleibende Zeit: -</translation>
+    </message>
+    <message>
+        <source>Prepare Proposal</source>
+        <translation>Proposal vorbereiten</translation>
+    </message>
+    <message>
+        <source>You can submit after 1 confirmation. At 6 confirmations it is accepted and processed.</source>
+        <translation>Sie können nach 1 Bestätigung einreichen. Bei 6 Bestätigungen wird es akzeptiert und verarbeitet.</translation>
+    </message>
+    <message>
+        <source>Proposal ID:</source>
+        <translation>Proposal-ID:</translation>
+    </message>
+    <message>
+        <source>Submit Proposal</source>
+        <translation>Proposal einreichen</translation>
+    </message>
+    <message>
+        <source>Close</source>
+        <translation>Schließen</translation>
+    </message>
+    <message>
+        <source>Valid</source>
+        <translation>Gültig</translation>
+    </message>
+    <message>
+        <source>Invalid: %1</source>
+        <translation>Ungültig: %1</translation>
+    </message>
+    <message>
+        <source>Burn %1</source>
+        <translation>%1 verbrennen</translation>
+    </message>
+    <message>
+        <source>Burn %1 to create the fee transaction?</source>
+        <translation>%1 verbrennen, um die Gebührentransaktion zu erstellen?</translation>
+    </message>
+    <message>
+        <source>Prepare failed</source>
+        <translation>Vorbereitung fehlgeschlagen</translation>
+    </message>
+    <message>
+        <source>Confirmations: %1 / %2 required</source>
+        <translation>Bestätigungen: %1 / %2 erforderlich</translation>
+    </message>
+    <message>
+        <source>Estimated time remaining: Ready</source>
+        <translation>Geschätzte verbleibende Zeit: Bereit</translation>
+    </message>
+    <message numerus="yes">
+        <source>Estimated time remaining: %n minute(s)</source>
+        <translation><numerusform>Geschätzte verbleibende Zeit: %n Minute</numerusform><numerusform>Geschätzte verbleibende Zeit: %n Minuten</numerusform></translation>
+    </message>
+    <message>
+        <source>Your proposal was submitted successfully.</source>
+        <translation>Ihr Proposal wurde erfolgreich eingereicht.</translation>
+    </message>
+    <message>
+        <source>Already submitted</source>
+        <translation>Bereits eingereicht</translation>
+    </message>
+    <message>
+        <source>This proposal has already been submitted.</source>
+        <translation>Dieser Proposal wurde bereits eingereicht.</translation>
+    </message>
+    <message>
+        <source>Submission failed</source>
+        <translation>Einreichung fehlgeschlagen</translation>
+    </message>
+    <message>
+        <source>Proposal submitted</source>
+        <translation>Proposal eingereicht</translation>
+    </message>
+    <message>
+        <source>A fee of %1 will be burned when you prepare the proposal.</source>
+        <translation>Eine Gebühr von %1 wird verbrannt, wenn Sie den Proposal vorbereiten.</translation>
+    </message>
+    <message>
+        <source>Prepare (burn %1) and wait for %2 confirmations.</source>
+        <translation>Vorbereiten (%1 verbrennen) und auf %2 Bestätigungen warten.</translation>
+    </message>
+</context>
 <context>
     <name>QObject</name>
     <message>
@@ -2876,14 +3199,6 @@ Da die Unterstützung eingestellt wurde, sollten Sie den Händler bitten, Ihnen
         <source>Version</source>
         <translation>Version</translation>
     </message>
-    <message>
-        <source>Whether the peer requested us to relay transactions.</source>
-        <translation>Ob der Peer uns gebeten hat, Transaktionen weiterzuleiten.</translation>
-    </message>
-    <message>
-        <source>Wants Tx Relay</source>
-        <translation>Möchte Transaktionsweiterleitung</translation>
-    </message>
     <message>
         <source>High bandwidth BIP152 compact block relay: %1</source>
         <translation>Kompaktes Blockrelais BIP152 mit hoher Bandbreite: %1</translation>
@@ -2989,6 +3304,14 @@ Da die Unterstützung eingestellt wurde, sollten Sie den Händler bitten, Ihnen
         <source>To specify a non-default location of the blocks directory use the '%1' option.</source>
         <translation>Wenn du einen anderen Ort als das Standardverzeichnis für die Blöcke angeben möchtest, verwende die Option "%1".</translation>
     </message>
+    <message>
+        <source>Local Addresses</source>
+        <translation>Lokale Adressen</translation>
+    </message>
+    <message>
+        <source>Network addresses that your Dash node is currently using to communicate with other nodes.</source>
+        <translation>Netzwerkadressen, die Ihr Dash-Knoten derzeit zur Kommunikation mit anderen Knoten verwendet.</translation>
+    </message>
     <message>
         <source>Number of regular Masternodes</source>
         <translation>Anzahl regulärer Masternodes</translation>
@@ -3081,6 +3404,14 @@ Da die Unterstützung eingestellt wurde, sollten Sie den Händler bitten, Ihnen
         <source>Services</source>
         <translation>Dienste</translation>
     </message>
+    <message>
+        <source>Whether we relay transactions to this peer.</source>
+        <translation>Ob wir Transaktionen an diesen Peer weiterleiten.</translation>
+    </message>
+    <message>
+        <source>Transaction Relay</source>
+        <translation>Transaktionsweiterleitung</translation>
+    </message>
     <message>
         <source>Connection Time</source>
         <translation>Verbindungszeit</translation>
@@ -3229,6 +3560,10 @@ Da die Unterstützung eingestellt wurde, sollten Sie den Händler bitten, Ihnen
         <source>Network activity disabled</source>
         <translation>Netzwerk-Aktivität deaktiviert</translation>
     </message>
+    <message>
+        <source>None</source>
+        <translation>Keine</translation>
+    </message>
     <message>
         <source>Total: %1 (Enabled: %2)</source>
         <translation>Insgesamt: %1 (Aktiv: %2)</translation>
@@ -3550,6 +3885,34 @@ Für mehr Information, wie diese Konsole zu nutzen ist, %6 tippen.
         <translation>Angefordert</translation>
     </message>
 </context>
+<context>
+    <name>RestoreWalletActivity</name>
+    <message>
+        <source>Restore Wallet</source>
+        <extracomment>Title of progress window which is displayed when wallets are being restored.</extracomment>
+        <translation>Wallet wiederherstellen</translation>
+    </message>
+    <message>
+        <source>Restoring Wallet &lt;b&gt;%1&lt;/b&gt;…</source>
+        <extracomment>Descriptive text of the restore wallets progress window which indicates to the user that wallets are currently being restored.</extracomment>
+        <translation>Wallet &lt;b&gt;%1&lt;/b&gt; wird wiederhergestellt…</translation>
+    </message>
+    <message>
+        <source>Restore wallet failed</source>
+        <extracomment>Title of message box which is displayed when the wallet could not be restored.</extracomment>
+        <translation>Wallet-Wiederherstellung fehlgeschlagen</translation>
+    </message>
+    <message>
+        <source>Restore wallet warning</source>
+        <extracomment>Title of message box which is displayed when the wallet is restored with some warning.</extracomment>
+        <translation>Wallet-Wiederherstellungswarnung</translation>
+    </message>
+    <message>
+        <source>Restore wallet message</source>
+        <extracomment>Title of message box which is displayed when the wallet is successfully restored.</extracomment>
+        <translation>Wallet-Wiederherstellungsmeldung</translation>
+    </message>
+</context>
 <context>
     <name>SendCoinsDialog</name>
     <message>
@@ -3584,10 +3947,6 @@ Für mehr Information, wie diese Konsole zu nutzen ist, %6 tippen.
         <source>Fee:</source>
         <translation>Gebühr:</translation>
     </message>
-    <message>
-        <source>Dust:</source>
-        <translation>"Dust"</translation>
-    </message>
     <message>
         <source>Inputs…</source>
         <translation>Inputs…</translation>
@@ -3712,10 +4071,6 @@ Für mehr Information, wie diese Konsole zu nutzen ist, %6 tippen.
         <source>Copy bytes</source>
         <translation>Byte kopieren</translation>
     </message>
-    <message>
-        <source>Copy dust</source>
-        <translation>"Dust" Betrag kopieren</translation>
-    </message>
     <message>
         <source>Copy change</source>
         <translation>Wechselgeld kopieren</translation>
@@ -3724,10 +4079,6 @@ Für mehr Information, wie diese Konsole zu nutzen ist, %6 tippen.
         <source>%1 (%2 blocks)</source>
         <translation>%1 (%2 blocks)</translation>
     </message>
-    <message>
-        <source>This will produce a Partially Signed Transaction (PSBT) which you can save or copy and then sign with e.g. an offline %1 wallet, or a PSBT-compatible hardware wallet.</source>
-        <translation>Dies wird eine Partially Signed Transaction (PSBT) erstellen, die Sie sichern oder kopieren und mit einer z.B. Offline-%1Wallet oder PSBT kompatiblen Hardware-Wallet signieren können.</translation>
-    </message>
     <message>
         <source>using</source>
         <translation>mittels</translation>
@@ -3736,10 +4087,6 @@ Für mehr Information, wie diese Konsole zu nutzen ist, %6 tippen.
         <source>%1 to %2</source>
         <translation>%1 an %2</translation>
     </message>
-    <message>
-        <source>Are you sure you want to send?</source>
-        <translation>Wollen Sie die Überweisung ausführen?</translation>
-    </message>
     <message>
         <source>&lt;b&gt;(%1 of %2 entries displayed)&lt;/b&gt;</source>
         <translation>&lt;b&gt;(%1 von %2 Einträgen angezeigt)&lt;/b&gt;</translation>
@@ -3764,10 +4111,6 @@ Für mehr Information, wie diese Konsole zu nutzen ist, %6 tippen.
         <source>%1 to '%2'</source>
         <translation>%1 zu '%2'</translation>
     </message>
-    <message>
-        <source>Do you want to draft this transaction?</source>
-        <translation>Möchtest du diese Transaktion erstellen?</translation>
-    </message>
     <message>
         <source>%1 funds only</source>
         <translation>Nur %1-Guthaben</translation>
@@ -3816,14 +4159,6 @@ Für mehr Information, wie diese Konsole zu nutzen ist, %6 tippen.
         <source>Confirm send coins</source>
         <translation>Überweisung bestätigen</translation>
     </message>
-    <message>
-        <source>Confirm transaction proposal</source>
-        <translation>Transaktionsvorschlag erstellen</translation>
-    </message>
-    <message>
-        <source>Create Unsigned</source>
-        <translation>Ohne Signatur erstellen</translation>
-    </message>
     <message>
         <source>Save Transaction Data</source>
         <translation>Transaktionsdaten speichern</translation>
@@ -3837,8 +4172,28 @@ Für mehr Information, wie diese Konsole zu nutzen ist, %6 tippen.
         <translation>Watch-Only Guthaben:</translation>
     </message>
     <message>
-        <source>Send</source>
-        <translation>Senden</translation>
+        <source>Creates a Partially Signed Blockchain Transaction (PSBT) for use with e.g. an offline %1 wallet, or a PSBT-compatible hardware wallet.</source>
+        <translation>Erstellt eine Partially Signed Blockchain Transaction (PSBT) um z.B. mit einer Offline-%1Wallet oder einer PSBT kompatiblen Hardware-Wallet genutzt werden zu können.</translation>
+    </message>
+    <message>
+        <source>Do you want to create this transaction?</source>
+        <extracomment>Message displayed when attempting to create a transaction. Cautionary text to prompt the user to verify that the displayed transaction details represent the transaction the user intends to create.</extracomment>
+        <translation>Möchten Sie diese Transaktion erstellen?</translation>
+    </message>
+    <message>
+        <source>Please, review your transaction proposal. This will produce a Partially Signed Blockchain Transaction (PSBT) which you can save or copy and then sign with e.g. an offline %1 wallet, or a PSBT-compatible hardware wallet.</source>
+        <extracomment>Text to inform a user attempting to create a transaction of their current options. At this stage, a user can only create a PSBT. This string is displayed when private keys are disabled and an external signer is not available.</extracomment>
+        <translation>Bitte überprüfen Sie Ihren Transaktionsvorschlag. Dies erzeugt eine Partially Signed Blockchain Transaction (PSBT), die Sie speichern oder kopieren und dann z.B. mit einer Offline-%1-Wallet oder einer PSBT-kompatiblen Hardware-Wallet signieren können.</translation>
+    </message>
+    <message>
+        <source>Please, review your transaction. You can create and send this transaction or create a Partially Signed Blockchain Transaction (PSBT), which you can save or copy and then sign with, e.g., an offline %1 wallet, or a PSBT-compatible hardware wallet.</source>
+        <extracomment>Text to inform a user attempting to create a transaction of their current options. At this stage, a user can send their transaction or create a PSBT. This string is displayed when both private keys and PSBT controls are enabled.</extracomment>
+        <translation>Bitte überprüfen Sie Ihre Transaktion. Sie können diese Transaktion erstellen und senden oder eine Partially Signed Blockchain Transaction (PSBT) erstellen, die Sie speichern oder kopieren und dann z.B. mit einer Offline-%1-Wallet oder einer PSBT-kompatiblen Hardware-Wallet signieren können.</translation>
+    </message>
+    <message>
+        <source>Please, review your transaction.</source>
+        <extracomment>Text to prompt a user to review the details of the transaction they are attempting to send.</extracomment>
+        <translation>Bitte überprüfen Sie Ihre Transaktion.</translation>
     </message>
     <message>
         <source>To review recipient list click "Show Details…"</source>
@@ -3968,21 +4323,16 @@ Für mehr Information, wie diese Konsole zu nutzen ist, %6 tippen.
         <source>A message that was attached to the dash: URI which will be stored with the transaction for your reference. Note: This message will not be sent over the Dash network.</source>
         <translation>Eine an die "dash:"-URI angefügte Nachricht, die zusammen mit der Transaktion gespeichert wird. Hinweis: Diese Nachricht wird nicht über das Dash-Netzwerk gesendet.</translation>
     </message>
+</context>
+<context>
+    <name>SendConfirmationDialog</name>
     <message>
-        <source>This is an unauthenticated payment request.</source>
-        <translation>Dies ist eine unverifizierte Zahlungsanforderung.</translation>
-    </message>
-    <message>
-        <source>This is an authenticated payment request.</source>
-        <translation>Dies ist eine verifizierte Zahlungsanforderung.</translation>
-    </message>
-    <message>
-        <source>Pay To:</source>
-        <translation>Empfänger:</translation>
+        <source>Send</source>
+        <translation>Senden</translation>
     </message>
     <message>
-        <source>Memo:</source>
-        <translation>Memo:</translation>
+        <source>Create Unsigned</source>
+        <translation>Unsigniert erstellen</translation>
     </message>
 </context>
 <context>
@@ -4191,20 +4541,9 @@ Für mehr Information, wie diese Konsole zu nutzen ist, %6 tippen.
 </context>
 <context>
     <name>TransactionDesc</name>
-    <message numerus="yes">
-        <source>Open for %n more block(s)</source>
-        <translation><numerusform>Geöffnet für %n weiteren Block</numerusform><numerusform>Geöffnet für %n weitere Blöcke</numerusform></translation>
-    </message>
-    <message>
-        <source>Open until %1</source>
-        <translation>Offen bis %1</translation>
-    </message>
-    <message>
-        <source>conflicted</source>
-        <translation>in Konflikt stehend</translation>
-    </message>
     <message>
         <source>0/unconfirmed, %1</source>
+        <extracomment>Text explaining the current status of a transaction, shown in the status field of the details window for this transaction. This status represents an unconfirmed transaction that is in the memory pool.</extracomment>
         <translation>0/unbestätigt, %1</translation>
     </message>
     <message>
@@ -4217,22 +4556,32 @@ Für mehr Information, wie diese Konsole zu nutzen ist, %6 tippen.
     </message>
     <message>
         <source>abandoned</source>
+        <extracomment>Text explaining the current status of a transaction, shown in the status field of the details window for this transaction. This status represents an abandoned transaction.</extracomment>
         <translation>aufgegeben</translation>
     </message>
+    <message>
+        <source>conflicted with a transaction with %1 confirmations</source>
+        <extracomment>Text explaining the current status of a transaction, shown in the status field of the details window for this transaction. This status represents an unconfirmed transaction that conflicts with a confirmed transaction.</extracomment>
+        <translation>steht im Konflikt mit einer Transaktion mit %1 Bestätigungen</translation>
+    </message>
     <message>
         <source>%1/unconfirmed</source>
+        <extracomment>Text explaining the current status of a transaction, shown in the status field of the details window for this transaction. This status represents a transaction confirmed in at least one block, but less than 6 blocks, and still not locked via ChainLocks.</extracomment>
         <translation>%1/unbestätigt</translation>
     </message>
     <message>
         <source>%1 confirmations</source>
+        <extracomment>Text explaining the current status of a transaction, shown in the status field of the details window for this transaction. This status represents a transaction confirmed in 6 or more blocks or locked via ChainLocks.</extracomment>
         <translation>%1 Bestätigungen</translation>
     </message>
     <message>
         <source>locked via ChainLocks</source>
+        <extracomment>Text explaining the current status of a transaction, shown in the status field of the details window for this transaction. This status represents a transaction confirmed in at least one block and has been locked by ChainLocks.</extracomment>
         <translation>Via ChainLocks gesperrt</translation>
     </message>
     <message>
         <source>verified via InstantSend</source>
+        <extracomment>Text explaining the current status of a transaction, shown in the status field of the details window for this transaction. This status represents an unconfirmed transaction that has been locked by InstantSend.</extracomment>
         <translation>Verifiziert via InstantSend</translation>
     </message>
     <message>
@@ -4385,14 +4734,6 @@ Für mehr Information, wie diese Konsole zu nutzen ist, %6 tippen.
         <source>Address / Label</source>
         <translation>Adresse / Label</translation>
     </message>
-    <message numerus="yes">
-        <source>Open for %n more block(s)</source>
-        <translation><numerusform>Geöffnet für %n weiteren Block</numerusform><numerusform>Geöffnet für %n weitere Blöcke</numerusform></translation>
-    </message>
-    <message>
-        <source>Open until %1</source>
-        <translation>Offen bis %1</translation>
-    </message>
     <message>
         <source>Unconfirmed</source>
         <translation>Unbestätigt</translation>
@@ -4644,6 +4985,11 @@ Für mehr Information, wie diese Konsole zu nutzen ist, %6 tippen.
         <source>Show address &amp;QR code</source>
         <translation>Adresse und &amp;QR-Code anzeigen</translation>
     </message>
+    <message>
+        <source>Show in %1</source>
+        <extracomment>Transactions table context menu action to show the selected transaction in a third-party block explorer. %1 is a stand-in argument for the URL of the explorer.</extracomment>
+        <translation>In %1 anzeigen</translation>
+    </message>
     <message>
         <source>Export Transaction History</source>
         <translation>Transaktionsverlauf exportieren</translation>
@@ -4836,10 +5182,6 @@ Gehen Sie zu "Datei" &gt; "Wallet öffnen" um Wallet zu laden
 </context>
 <context>
     <name>dash-core</name>
-    <message>
-        <source>Fee estimation failed. Fallbackfee is disabled. Wait a few blocks or enable -fallbackfee.</source>
-        <translation>Gebührenberechnung fehlgeschlagen. Fallbackfee ist deaktiviert. Warte ein paar Blöcke oder aktiviere -fallbackfee.</translation>
-    </message>
     <message>
         <source>This error could occur if this wallet was not shutdown cleanly and was last loaded using a build with a newer version of Berkeley DB. If so, please use the software that last loaded this wallet</source>
         <translation>Die Fehlermeldung kann auftreten, wenn diese Wallet nicht sauber heruntergefahren wurde und zuletzt mit einem Build mit einer neueren Version von Berkeley DB geladen wurde. In diesem Fall verwende bitte die Software, mit der diese Wallet zuletzt geladen wurde</translation>
@@ -4912,10 +5254,6 @@ Gehen Sie zu "Datei" &gt; "Wallet öffnen" um Wallet zu laden
         <source>Failed to listen on any port. Use -listen=0 if you want this.</source>
         <translation>Fehler, es konnte kein Port abgehört werden. Wenn dies so gewünscht wird -listen=0 verwenden.</translation>
     </message>
-    <message>
-        <source>-maxtxfee is set very high! Fees this large could be paid on a single transaction.</source>
-        <translation>Warnung: -maxtxfee ist auf einen sehr hohen Wert gesetzt! Diese Gebühr könnte schon beim Senden einer einzelnen Transaktion fällig werden.</translation>
-    </message>
     <message>
         <source>Found unconfirmed denominated outputs, will wait till they confirm to continue.</source>
         <translation>Unbestätigte für PrivateSend vorbereitete Ausgabebeträge gefunden, warte bis sie bestätigt sind bevor weitergemacht wird.</translation>
@@ -4924,10 +5262,6 @@ Gehen Sie zu "Datei" &gt; "Wallet öffnen" um Wallet zu laden
         <source>Invalid -socketevents ('%s') specified. Only these modes are supported: %s</source>
         <translation>Ungültige -socketevents ('%s') spezifiziert. Nur diese Modi werden unterstützt: %s</translation>
     </message>
-    <message>
-        <source>Invalid amount for -maxtxfee=&lt;amount&gt;: '%s' (must be at least the minrelay fee of %s to prevent stuck transactions)</source>
-        <translation>Ungültiger Betrag für -maxtxfee=&lt;amount&gt;: '%s' (Betrag muss mindestens minrelay von %s Gebühren sein um "hängende" Transaktionen zu vermeiden)</translation>
-    </message>
     <message>
         <source>SQLiteDatabase: Unknown sqlite wallet schema version %d. Only version %d is supported</source>
         <translation>SQLite-Datenbank: Unbekannte Version des Sqlite-Wallet-Schemas %d. Nur Version %d wird unterstützt</translation>
@@ -4936,6 +5270,10 @@ Gehen Sie zu "Datei" &gt; "Wallet öffnen" um Wallet zu laden
         <source>Transaction index can't be disabled with governance validation enabled. Either start with -disablegovernance command line switch or enable transaction index.</source>
         <translation>Der Transaktionsindex nicht deaktiviert werden, solange die Governance-Validierung aktiviert ist. Der Transaktionsindex muss entweder aktiviert sein oder der Knoten muss mit dem Befehl -disablegovernance gestartet werden.</translation>
     </message>
+    <message>
+        <source>Unsupported category-specific logging level -loglevel=%s. Expected -loglevel=&lt;category&gt;:&lt;loglevel&gt;. Valid categories: %s. Valid loglevels: %s.</source>
+        <translation>Nicht unterstütze Kategorie: -specific logging level -loglevel=%s. Erwartet -loglevel=&lt;category&gt;:&lt;loglevel&gt;. Gültige Kategorien: %s. Gültige Log-Levels : %s.</translation>
+    </message>
     <message>
         <source>Can't mix: no compatible inputs found!</source>
         <translation>Mixen nicht möglich: Keine kompatiblen Inputs gefunden!</translation>
@@ -4944,6 +5282,14 @@ Gehen Sie zu "Datei" &gt; "Wallet öffnen" um Wallet zu laden
         <source>Entry exceeds maximum size.</source>
         <translation>Eingabe überschreitet maximale Größe.</translation>
     </message>
+    <message>
+        <source>Error upgrading evo database for EHF</source>
+        <translation>Fehler bei der Aktualisierung der Datenbank für EHF</translation>
+    </message>
+    <message>
+        <source>Failed to commit Evo database</source>
+        <translation>Evo-Datenbank konnte nicht übertragen werden</translation>
+    </message>
     <message>
         <source>Found enough users, signing ( waiting %s )</source>
         <translation>Genug Partner gefunden, signiere ( warte %s )</translation>
@@ -4968,18 +5314,14 @@ Gehen Sie zu "Datei" &gt; "Wallet öffnen" um Wallet zu laden
         <source>Insufficient funds.</source>
         <translation>Unzureichender Kontostand.</translation>
     </message>
-    <message>
-        <source>Invalid amount for -discardfee=&lt;amount&gt;: '%s'</source>
-        <translation>Ungültiger Betrag für -discardfee=&lt;amount&gt;: '%s'</translation>
-    </message>
-    <message>
-        <source>Invalid amount for -paytxfee=&lt;amount&gt;: '%s' (must be at least %s)</source>
-        <translation>Ungültiger Betrag für -paytxfee=&lt;amount&gt;: '%s' (Betrag muss mindestens %s sein)</translation>
-    </message>
     <message>
         <source>Invalid minimum number of spork signers specified with -minsporkkeys</source>
         <translation>Ungültige minimale Anzahl an Spork-Unterzeichnern durch -minsporkkeys spezifiziert</translation>
     </message>
+    <message>
+        <source>Listening for incoming connections failed (listen returned error %s)</source>
+        <translation>Fehler: Listening nach eingehenden Verbindungen fehlgeschlagen (Listening produziert Fehler %s)</translation>
+    </message>
     <message>
         <source>Lock is already in place.</source>
         <translation>Schon gesperrt.</translation>
@@ -5036,6 +5378,10 @@ Gehen Sie zu "Datei" &gt; "Wallet öffnen" um Wallet zu laden
         <source>Synchronizing governance objects…</source>
         <translation>Synchronisiere Governance Objekte…</translation>
     </message>
+    <message>
+        <source>Transaction change output index out of range</source>
+        <translation>Output-Index der Transaktionsänderung außerhalb des Bereichs</translation>
+    </message>
     <message>
         <source>Unable to start HTTP server. See debug log for details.</source>
         <translation>Interner HTTP-Server konnte nicht gestartet werden. Details finden Sie in debug.log</translation>
@@ -5044,6 +5390,10 @@ Gehen Sie zu "Datei" &gt; "Wallet öffnen" um Wallet zu laden
         <source>Unknown response.</source>
         <translation>Unbekannte Rückantwort.</translation>
     </message>
+    <message>
+        <source>Unsupported global logging level -loglevel=%s. Valid values: %s.</source>
+        <translation>Nicht unterstütztes globales Logging-Level -loglevel=%s. Gültige Werte: %s.</translation>
+    </message>
     <message>
         <source>User Agent comment (%s) contains unsafe characters.</source>
         <translation>Der "User Agent"-Text (%s) enthält unsichere Zeichen.</translation>
@@ -5108,10 +5458,6 @@ Gehen Sie zu "Datei" &gt; "Wallet öffnen" um Wallet zu laden
         <source>Total length of network version string (%i) exceeds maximum length (%i). Reduce the number or size of uacomments.</source>
         <translation>Die Gesamtlänge des Versions-Namens (%i) überschreitet die erlaubte Maximallänge (%i). Bitte verringern Sie Anzahl oder Größe der Eingaben für die Kommandozeilenoption -uacomments.</translation>
     </message>
-    <message>
-        <source>Transaction needs a change address, but we can't generate it. Please call keypoolrefill first.</source>
-        <translation>Transaktion benötigt eine Wechselgeld-Adresse. Diese kann aber nicht erstellt werden. Bitte vorher keypoolrefill aufrufen.</translation>
-    </message>
     <message>
         <source>WARNING! Failed to replenish keypool, please unlock your wallet to do so.</source>
         <translation>WARNUNG! Erzeugen neuer Schlüssel ist fehlgeschlagen, bitte entsperren Sie Ihre Wallet  um dies zu ermöglichen.</translation>
@@ -5188,10 +5534,6 @@ Gehen Sie zu "Datei" &gt; "Wallet öffnen" um Wallet zu laden
         <source>Error: No addresses available.</source>
         <translation>Fehler: Keine Adresse verfügbar.</translation>
     </message>
-    <message>
-        <source>Exceeded max tries.</source>
-        <translation>Maximale Zahl an Versuchen überschritten.</translation>
-    </message>
     <message>
         <source>Failed to create backup %s!</source>
         <translation>Datensicherung %s ist fehlgeschlagen!</translation>
@@ -5232,10 +5574,6 @@ Gehen Sie zu "Datei" &gt; "Wallet öffnen" um Wallet zu laden
         <source>Invalid P2P permission: '%s'</source>
         <translation>Ungültige P2P-Erlaubnis: '%s'</translation>
     </message>
-    <message>
-        <source>Invalid amount for -fallbackfee=&lt;amount&gt;: '%s'</source>
-        <translation>Ungültiger Betrag für -fallbackfee=&lt;amount&gt;: '%s'</translation>
-    </message>
     <message>
         <source>Invalid masternodeblsprivkey. Please see documentation.</source>
         <translation>Ungültiger masternodeblsprivkey. Weitere Informationen befinden sich in der Dokumentation.</translation>
@@ -5372,10 +5710,6 @@ Gehen Sie zu "Datei" &gt; "Wallet öffnen" um Wallet zu laden
         <source>Unable to open %s for writing</source>
         <translation>Es ist nicht möglich %s zum Beschreiben zu öffnen</translation>
     </message>
-    <message>
-        <source>Unable to parse -maxuploadtarget: '%s' (possible integer overflow?)</source>
-        <translation>Nicht möglich zu parsen -maxuploadtarget: '%s' (möglicher Integer-Overflow?)</translation>
-    </message>
     <message>
         <source>Unknown -blockfilterindex value %s.</source>
         <translation>Nicht bekannter -blockfilterindex Wert %s.</translation>
@@ -5384,10 +5718,6 @@ Gehen Sie zu "Datei" &gt; "Wallet öffnen" um Wallet zu laden
         <source>Unknown new rules activated (versionbit %i)</source>
         <translation>Unbekannte neue Regeln aktiviert (versionbit %i)</translation>
     </message>
-    <message>
-        <source>Upgrading UTXO database</source>
-        <translation>Aktualisierung der UTXO Datenbank</translation>
-    </message>
     <message>
         <source>Verifying blocks…</source>
         <translation>Verifiziere Blöcke…</translation>
@@ -5448,10 +5778,6 @@ Gehen Sie zu "Datei" &gt; "Wallet öffnen" um Wallet zu laden
         <source>Cannot obtain a lock on data directory %s. %s is probably already running.</source>
         <translation>Datenverzeichnis %s kann nicht gesperrt werden. Evtl. wurde %s bereits gestartet.</translation>
     </message>
-    <message>
-        <source>Cannot upgrade a non HD wallet from version %i to version %i which is non-HD wallet. Use upgradetohd RPC</source>
-        <translation>Non-HD-Wallet kann nicht von Version %i zu Version %i geupgradet werden, die eine Nicht-HD-Wallet ist. upgradetohd RPC benutzten.</translation>
-    </message>
     <message>
         <source>Distributed under the MIT software license, see the accompanying file %s or %s</source>
         <translation>Veröffentlicht unter der MIT-Softwarelizenz, siehe beiligende Datei %s oder %s.</translation>
@@ -5484,6 +5810,10 @@ Gehen Sie zu "Datei" &gt; "Wallet öffnen" um Wallet zu laden
         <source>Failed to rename invalid peers.dat file. Please move or delete it and try again.</source>
         <translation>Ungültige Datei peers.dat konnte nicht umbenannt werden. Bitte verschieben oder löschen Sie sie und versuchen Sie es erneut.</translation>
     </message>
+    <message>
+        <source>Fee estimation failed. Fallbackfee is disabled. Wait a few blocks or enable %s.</source>
+        <translation>Gebührenschätzung fehlgeschlagen. Fallback-Gebühr ist deaktiviert. Warten Sie einige Blöcke oder aktivieren Sie %s.</translation>
+    </message>
     <message>
         <source>File %s already exists. If you are sure this is what you want, move it out of the way first.</source>
         <translation>Datei %s existiert bereits. Wenn Sie sicher sind, müssen Sie diese Datei vorher beseitigen.</translation>
@@ -5496,6 +5826,10 @@ Gehen Sie zu "Datei" &gt; "Wallet öffnen" um Wallet zu laden
         <source>Incorrect or no devnet genesis block found. Wrong datadir for devnet specified?</source>
         <translation>Fehlerhafter oder kein Genesis-Block gefunden. Falsches Datenverzeichnis für devnet ausgewählt? </translation>
     </message>
+    <message>
+        <source>Invalid amount for %s=&lt;amount&gt;: '%s' (must be at least the minrelay fee of %s to prevent stuck transactions)</source>
+        <translation>Ungültiger Betrag für %s=&lt;amount&gt;: '%s' (muss mindestens die Mindestrelay-Gebühr von %s betragen, um festsitzende Transaktionen zu vermeiden)</translation>
+    </message>
     <message>
         <source>Invalid or corrupt peers.dat (%s). If you believe this is a bug, please report it to %s. As a workaround, you can move the file (%s) out of the way (rename, move, or delete) to have a new one created on the next start.</source>
         <translation>Ungültige oder beschädigte peers.dat (%s). Wenn Sie glauben, dass dies ein Bug ist, melden Sie ihn bitte an %s. Als Abhilfe können Sie die Datei (%s) beseitigen (umbenennen, verschieben oder löschen), damit beim nächsten Start eine neue Datei erstellt wird.</translation>
@@ -5512,6 +5846,10 @@ Gehen Sie zu "Datei" &gt; "Wallet öffnen" um Wallet zu laden
         <source>No wallet file format provided. To use createfromdump, -format=&lt;format&gt; must be provided.</source>
         <translation>Kein Wallet-Format bereits gestellt. Um createfromdump zu nutzen, muss -format=&lt;format&gt; must geliefert werden.</translation>
     </message>
+    <message>
+        <source>Outbound connections restricted to CJDNS (-onlynet=cjdns) but -cjdnsreachable is not provided</source>
+        <translation>Ausgehende Verbindungen sind auf CJDNS beschränkt (-onlynet=cjdns), aber -cjdnsreachable wurde nicht angegeben</translation>
+    </message>
     <message>
         <source>Outbound connections restricted to Tor (-onlynet=onion) but the proxy for reaching the Tor network is explicitly forbidden: -onion=0</source>
         <translation>Ausgehende Verbindungen sind auf Tor beschränkt (-onlynet=onion), aber der Proxy zum Erreichen des Tor-Netzwerks ist explizit verboten: -onion=0</translation>
@@ -5520,6 +5858,10 @@ Gehen Sie zu "Datei" &gt; "Wallet öffnen" um Wallet zu laden
         <source>Outbound connections restricted to Tor (-onlynet=onion) but the proxy for reaching the Tor network is not provided: none of -proxy, -onion or -listenonion is given</source>
         <translation>Ausgehende Verbindungen sind auf Tor beschränkt (-onlynet=onion), aber der Proxy zum Erreichen des Tor-Netzwerks wurde nicht bereit gestellt: keine der -proxy, -onion oder -listenonion wurde angegeben.</translation>
     </message>
+    <message>
+        <source>Outbound connections restricted to i2p (-onlynet=i2p) but -i2psam is not provided</source>
+        <translation>Ausgehende Verbindungen sind auf i2p beschränkt (-onlynet=i2p), aber -i2psam wurde nicht angegeben</translation>
+    </message>
     <message>
         <source>Please check that your computer's date and time are correct! If your clock is wrong, %s will not work properly.</source>
         <translation>Bitte korrigieren Sie die Datums- und Uhrzeiteinstellungen Ihres Computers, da %s ansonsten nicht ordnungsgemäß funktionieren wird.</translation>
@@ -5532,10 +5874,6 @@ Gehen Sie zu "Datei" &gt; "Wallet öffnen" um Wallet zu laden
         <source>Prune mode is incompatible with -reindex-chainstate. Use full -reindex instead.</source>
         <translation>Prune Mode ist mit -reindex-chainstate nicht kompatibel. Stattdessen -reindex nutzen.</translation>
     </message>
-    <message>
-        <source>The block index db contains a legacy 'txindex'. To clear the occupied disk space, run a full -reindex, otherwise ignore this error. This error message will not be displayed again.</source>
-        <translation>Der Blockindex db enthält einen veralteten 'txindex'. Um den belegten Speicherplatz zu löschen, führen Sie einen vollständigen -reindex aus, andernfalls ignorieren Sie diesen Fehler. Diese Fehlermeldung wird nicht mehr angezeigt.</translation>
-    </message>
     <message>
         <source>This is the maximum transaction fee you pay (in addition to the normal fee) to prioritize partial spend avoidance over regular coin selection.</source>
         <translation>Dies ist die maximale Transaktionsgebühr (zusätzliche zur normalen Gebühr) die du zahlst, um dein die Vermeidung von Partial Spend gegenüber der normalen Coin-Auswahl zu priorisieren.</translation>
@@ -5548,6 +5886,10 @@ Gehen Sie zu "Datei" &gt; "Wallet öffnen" um Wallet zu laden
         <source>This is the transaction fee you may pay when fee estimates are not available.</source>
         <translation>Das ist die Transaktionsgebühr, welche du zahlen müsstest, wenn die Gebührenschätzungen nicht verfügbar sind.</translation>
     </message>
+    <message>
+        <source>Transaction requires one destination of non-0 value, a non-0 feerate, or a pre-selected input</source>
+        <translation>Transaktion erfordert ein Ziel mit Nicht-Null-Wert, einen Nicht-Null-Gebührensatz oder eine vorausgewählte Eingabe</translation>
+    </message>
     <message>
         <source>Unable to replay blocks. You will need to rebuild the database using -reindex-chainstate.</source>
         <translation>Blöcke können nicht wiederholt werden. Sie müssen die Datenbank mit Hilfe von -reindex-chainstate neu aufbauen.</translation>
@@ -5556,6 +5898,10 @@ Gehen Sie zu "Datei" &gt; "Wallet öffnen" um Wallet zu laden
         <source>Unknown wallet file format "%s" provided. Please provide one of "bdb" or "sqlite".</source>
         <translation>Unbekanntes Wallet-Dateiformat "%s" angegeben. Bitte entweder "bdb" oder "sqlite" nutzen</translation>
     </message>
+    <message>
+        <source>Unsupported chainstate database format found. Please restart with -reindex-chainstate. This will rebuild the chainstate database.</source>
+        <translation>Nicht unterstütztes Chainstate-Datenbankformat gefunden. Bitte starten Sie mit -reindex-chainstate neu. Dies wird die Chainstate-Datenbank neu aufbauen.</translation>
+    </message>
     <message>
         <source>Warning: Dumpfile wallet format "%s" does not match command line specified format "%s".</source>
         <translation>Warnung: Dumpfile-Wallet-Format "%s" stimmt nicht mit dem in der Befehlszeile angegebenen Format "%s" überein.</translation>
@@ -5596,10 +5942,30 @@ Gehen Sie zu "Datei" &gt; "Wallet öffnen" um Wallet zu laden
         <source>-rpcport must be specified when -devnet and -server are specified</source>
         <translation>-rpcport muss angegeben werden, wenn -devnet und -server angeben wurden </translation>
     </message>
+    <message>
+        <source>-statsbatchsize cannot be configured with a negative value.</source>
+        <translation>-statsbatchsize kann nicht mit einem negativen Wert konfiguriert werden.</translation>
+    </message>
+    <message>
+        <source>-statsduration cannot be configured with a negative value.</source>
+        <translation>-statsduration kann nicht mit einem negativen Wert konfiguriert werden.</translation>
+    </message>
     <message>
         <source>A fatal internal error occurred, see debug.log for details</source>
         <translation>Schwerwiegender interner Fehler aufgetreten, siehe debug.log für Details</translation>
     </message>
+    <message>
+        <source>Cannot create socket (socket() returned error %s)</source>
+        <translation>Socket kann nicht erstellt werden (socket() gab Fehler %s zurück)</translation>
+    </message>
+    <message>
+        <source>Cannot get socket address for %s</source>
+        <translation>Socket-Adresse für %s kann nicht ermittelt werden</translation>
+    </message>
+    <message>
+        <source>Cannot init Statsd client</source>
+        <translation>Statsd-Client kann nicht initialisiert werden</translation>
+    </message>
     <message>
         <source>Cannot resolve -%s address: '%s'</source>
         <translation>Kann Adresse in -%s nicht auflösen: '%s'</translation>
@@ -5644,10 +6010,6 @@ Gehen Sie zu "Datei" &gt; "Wallet öffnen" um Wallet zu laden
         <source>Error reading next record from wallet database</source>
         <translation>Fehler beim Auslesen des nächsten Datensatzes aus der Wallet-Datenbank</translation>
     </message>
-    <message>
-        <source>Error upgrading chainstate database</source>
-        <translation>Fehler bei der Aktualisierung einer Kettenstatus-Datenbank</translation>
-    </message>
     <message>
         <source>Loading P2P addresses…</source>
         <translation>Lade P2P-Adressen…</translation>
@@ -5768,10 +6130,70 @@ Gehen Sie zu "Datei" &gt; "Wallet öffnen" um Wallet zu laden
         <source>%s corrupt. Try using the wallet tool dash-wallet to salvage or restoring a backup.</source>
         <translation>%s korrumpiert. Verwende das Wallet-Tool dash-wallet, um es zu retten, oder stelle ein Backup wieder her.</translation>
     </message>
+    <message>
+        <source>%s is set very high! Fees this large could be paid on a single transaction.</source>
+        <translation>%s ist sehr hoch eingestellt! Gebühren dieser Höhe könnten bei einer einzelnen Transaktion bezahlt werden.</translation>
+    </message>
+    <message>
+        <source>%s request to listen on port %u. This port is considered "bad" and thus it is unlikely that any Dash Core peers connect to it. See doc/p2p-bad-ports.md for details and a full list.</source>
+        <translation>%s Anfrage zum Abhören von Port %u. Dieser Port wird als "schlecht" angesehen. Es ist unwahrscheinlich, dass andere Dash-Core-Peers sich mit diesem verbinden. Siehe See doc/p2p-bad-ports.md für Details und die gesamte Liste.</translation>
+    </message>
+    <message>
+        <source>Cannot provide specific connections and have addrman find outgoing connections at the same time.</source>
+        <translation>Es ist nicht möglich, bestimmte Verbindungen anzubieten und addrman gleichzeitig ausgehende Verbindungen finden zu lassen.</translation>
+    </message>
+    <message>
+        <source>Failed to upgrade Evo database</source>
+        <translation>Upgrade der Evo-Datenbank fehlgeschlagen</translation>
+    </message>
+    <message>
+        <source>Fee needed &gt; fee paid</source>
+        <translation>Benötigte Gebühr &gt; bezahlte Gebühr</translation>
+    </message>
+    <message>
+        <source>Host %s on unsupported network</source>
+        <translation>Host %s im nicht unterstützten Netzwerk</translation>
+    </message>
+    <message>
+        <source>Invalid amount for %s=&lt;amount&gt;: '%s' (must be at least %s)</source>
+        <translation>Ungültiger Betrag für %s=&lt;amount&gt;: '%s' (muss mindestens %s sein)</translation>
+    </message>
+    <message>
+        <source>Invalid amount for %s=&lt;amount&gt;: '%s'</source>
+        <translation>Ungültiger Betrag für %s=&lt;amount&gt;: '%s'</translation>
+    </message>
+    <message>
+        <source>Invalid port specified in %s: '%s'</source>
+        <translation>Ungültiger Port in %s angegeben: '%s'</translation>
+    </message>
     <message>
         <source>Last successful action was too recent.</source>
         <translation>Letzte erfolgreiche Transaktion ist noch zu neu.</translation>
     </message>
+    <message>
+        <source>Missing solving data for estimating transaction size</source>
+        <translation>Fehlende Lösungsdaten zur Schätzung der Transaktionsgröße</translation>
+    </message>
+    <message>
+        <source>No host specified</source>
+        <translation>Kein Host angegeben</translation>
+    </message>
+    <message>
+        <source>No host specified, malformed URL</source>
+        <translation>Kein Host angegeben, fehlerhafte URL</translation>
+    </message>
+    <message>
+        <source>No text before the scheme delimiter, malformed URL</source>
+        <translation>Kein Text vor dem Schema-Trennzeichen, fehlerhafte URL</translation>
+    </message>
+    <message>
+        <source>Port must be between %d and %d, supplied %d</source>
+        <translation>Port muss zwischen %d und %d liegen, angegeben wurde %d</translation>
+    </message>
+    <message>
+        <source>Socket not initialized, cannot send message</source>
+        <translation>Socket nicht initialisiert, kann Nachricht nicht senden</translation>
+    </message>
     <message>
         <source>The source code is available from %s.</source>
         <translation>Der Quellcode ist von %s verfügbar.</translation>
@@ -5800,6 +6222,10 @@ Gehen Sie zu "Datei" &gt; "Wallet öffnen" um Wallet zu laden
         <source>Transaction fees are too high.</source>
         <translation>Transaktionsgebühren sind zu hoch.</translation>
     </message>
+    <message>
+        <source>Transaction needs a change address, but we can't generate it.</source>
+        <translation>Transaktion benötigt eine Wechselgeld-Adresse, aber wir können sie nicht generieren.</translation>
+    </message>
     <message>
         <source>Transaction not valid.</source>
         <translation>Transaktion ungültig.</translation>
@@ -5820,6 +6246,18 @@ Gehen Sie zu "Datei" &gt; "Wallet öffnen" um Wallet zu laden
         <source>Unable to locate enough non-denominated funds for this transaction.</source>
         <translation>Für diese Transaktion konnten nicht genug nicht mit gestückelte Beträge gefunden werden.</translation>
     </message>
+    <message>
+        <source>Unable to lookup host %s</source>
+        <translation>Host %s kann nicht aufgelöst werden</translation>
+    </message>
+    <message>
+        <source>Unable to parse -maxuploadtarget: '%s'</source>
+        <translation>-maxuploadtarget kann nicht geparst werden: '%s'</translation>
+    </message>
+    <message>
+        <source>Unable to send message to %s (::sendto() returned error %s)</source>
+        <translation>Nachricht kann nicht an %s gesendet werden (::sendto() gab Fehler %s zurück)</translation>
+    </message>
     <message>
         <source>Unable to sign spork message, wrong key?</source>
         <translation>Die Spork-Nachricht konnte nicht signiert werden. Wurde der Key falsch gesetzt?</translation>
@@ -5832,6 +6270,10 @@ Gehen Sie zu "Datei" &gt; "Wallet öffnen" um Wallet zu laden
         <source>Unknown state: id = %u</source>
         <translation>Unbekannter Status: id = %u</translation>
     </message>
+    <message>
+        <source>Unsupported URL scheme, must begin with udp://</source>
+        <translation>Nicht unterstütztes URL-Schema, muss mit udp:// beginnen</translation>
+    </message>
     <message>
         <source>Unsupported logging category %s=%s.</source>
         <translation>Nicht unterstützte Protokollkategorie %s=%s.</translation>

From 6bbb22256f23c22865f460c2f2e2cc951ba5b4b3 Mon Sep 17 00:00:00 2001
From: UdjinM6 <UdjinM6@users.noreply.github.com>
Date: Thu, 23 Oct 2025 13:09:04 +0300
Subject: [PATCH 321/656] es

---
 src/qt/locale/dash_es.ts | 2083 +++++++++++++++++++++++++++++++++-----
 1 file changed, 1832 insertions(+), 251 deletions(-)

diff --git a/src/qt/locale/dash_es.ts b/src/qt/locale/dash_es.ts
index b973388b87ac..db2a59fafc5d 100644
--- a/src/qt/locale/dash_es.ts
+++ b/src/qt/locale/dash_es.ts
@@ -65,14 +65,6 @@
         <source>C&amp;hoose</source>
         <translation>E&amp;scoger</translation>
     </message>
-    <message>
-        <source>Sending addresses</source>
-        <translation>Direcciones de envío</translation>
-    </message>
-    <message>
-        <source>Receiving addresses</source>
-        <translation>Direcciones de recepción</translation>
-    </message>
     <message>
         <source>These are your Dash addresses for sending payments. Always check the amount and the receiving address before sending coins.</source>
         <translation>Estas son sus direcciones Dash para enviar pagos. Compruebe siempre la cantidad y la dirección receptora antes de enviar monedas.</translation>
@@ -94,8 +86,8 @@
         <translation>&amp;Editar</translation>
     </message>
     <message>
-        <source>&amp;Show address QR code</source>
-        <translation>&amp;Mostrar dirección en QR</translation>
+        <source>Show address &amp;QR code</source>
+        <translation>Mostrar dirección y código QR</translation>
     </message>
     <message>
         <source>QR code</source>
@@ -105,6 +97,24 @@
         <source>Export Address List</source>
         <translation>Exportar la Lista de Direcciones </translation>
     </message>
+    <message>
+        <source>Comma separated file</source>
+        <extracomment>Expanded name of the CSV file format. See: https://en.wikipedia.org/wiki/Comma-separated_values.</extracomment>
+        <translation>Comma separated file</translation>
+    </message>
+    <message>
+        <source>There was an error trying to save the address list to %1. Please try again.</source>
+        <extracomment>An error message. %1 is a stand-in argument for the name of the file we attempted to save to.</extracomment>
+        <translation>Se produjo un error al intentar guardar la lista de direcciones en %1. Inténtalo de nuevo.</translation>
+    </message>
+    <message>
+        <source>Sending addresses - %1</source>
+        <translation>Direcciones de envío - %1</translation>
+    </message>
+    <message>
+        <source>Receiving addresses - %1</source>
+        <translation>Direcciones de recepción - %1</translation>
+    </message>
     <message>
         <source>Exporting Failed</source>
         <translation>Error al exportar</translation>
@@ -141,7 +151,7 @@
     </message>
     <message>
         <source>Smaller</source>
-        <translation>Mas pequeño</translation>
+        <translation>Más pequeño</translation>
     </message>
     <message>
         <source>Bigger</source>
@@ -274,10 +284,22 @@
         <source>The passphrase entered for the wallet decryption was incorrect.</source>
         <translation>La contraseña introducida para descifrar la billetera es incorrecta.</translation>
     </message>
+    <message>
+        <source>The passphrase entered for the wallet decryption is incorrect. It contains a null character (ie - a zero byte). If the passphrase was set with a version of this software prior to 23.0, please try again with only the characters up to — but not including — the first null character. If this is successful, please set a new passphrase to avoid this issue in the future.</source>
+        <translation>La contraseña introducida para el descifrado de la billetera es incorrecta. Contiene un carácter nulo (es decir, un byte cero). Si la contraseña se estableció con una versión de este software anterior a la 23.0, inténtalo de nuevo solo con los caracteres hasta —pero sin incluir— el primer carácter nulo. Si esto funciona, establece una nueva contraseña para evitar este problema en el futuro.</translation>
+    </message>
     <message>
         <source>Wallet passphrase was successfully changed.</source>
         <translation>Se ha cambiado correctamente la contraseña de la billetera</translation>
     </message>
+    <message>
+        <source>Passphrase change failed</source>
+        <translation>Error al cambiar la contraseña</translation>
+    </message>
+    <message>
+        <source>The old passphrase entered for the wallet decryption is incorrect. It contains a null character (ie - a zero byte). If the passphrase was set with a version of this software prior to 23.0, please try again with only the characters up to — but not including — the first null character.</source>
+        <translation>La contraseña antigua introducida para el descifrado de la billetera es incorrecta. Contiene un carácter nulo (es decir, un byte cero). Si la contraseña se estableció con una versión de este software anterior a la 23.0, inténtalo de nuevo solo con los caracteres hasta —pero sin incluir— el primer carácter nulo.</translation>
+    </message>
     <message>
         <source>Warning: The Caps Lock key is on!</source>
         <translation>Advertencia: ¡La tecla de bloqueo de mayúsculas está activada!</translation>
@@ -303,7 +325,23 @@
 </context>
 <context>
     <name>BitcoinApplication</name>
-    </context>
+    <message>
+        <source>Runaway exception</source>
+        <translation>Excepción fuera de control</translation>
+    </message>
+    <message>
+        <source>A fatal error occurred. %1 can no longer continue safely and will quit.</source>
+        <translation>Se ha producido un error fatal. %1 ya no puede continuar de forma segura y abandonará.</translation>
+    </message>
+    <message>
+        <source>Internal error</source>
+        <translation>Error interno</translation>
+    </message>
+    <message>
+        <source>An internal error occurred. %1 will attempt to continue safely. This is an unexpected bug which can be reported as described below.</source>
+        <translation>Se ha producido un error interno. %1 intentará continuar de forma segura. Se trata de un error inesperado que puede notificarse como se describe a continuación.</translation>
+    </message>
+</context>
 <context>
     <name>BitcoinGUI</name>
     <message>
@@ -330,6 +368,10 @@
         <source>Request payments (generates QR codes and dash: URIs)</source>
         <translation>Solicitar pagos (genera códigos QR y URIs de Dash)</translation>
     </message>
+    <message>
+        <source>Ctrl+Q</source>
+        <translation>Ctrl+Q</translation>
+    </message>
     <message>
         <source>&amp;Options…</source>
         <translation>&amp;Opciones…</translation>
@@ -358,6 +400,10 @@
         <source>&amp;Verify message…</source>
         <translation>&amp;Verificar mensaje…</translation>
     </message>
+    <message>
+        <source>&amp;Load PSBT from file…</source>
+        <translation>&amp;Cargar PSBT desde archivo...</translation>
+    </message>
     <message>
         <source>&amp;Sending addresses</source>
         <translation>&amp;Direcciones de envío</translation>
@@ -390,10 +436,6 @@
         <source>&amp;Window</source>
         <translation>&amp;Ventana</translation>
     </message>
-    <message>
-        <source>Minimize</source>
-        <translation>Minimizar</translation>
-    </message>
     <message>
         <source>Zoom</source>
         <translation>Zoom</translation>
@@ -446,14 +488,6 @@
         <source>Modify configuration options for %1</source>
         <translation>Modificar las opciones de configuración para %1</translation>
     </message>
-    <message>
-        <source>&amp;Show / Hide</source>
-        <translation>&amp;Mostrar / ocultar</translation>
-    </message>
-    <message>
-        <source>Show or hide the main Window</source>
-        <translation>Mostrar u ocultar la ventana principal</translation>
-    </message>
     <message>
         <source>Encrypt the private keys that belong to your wallet</source>
         <translation>Cifrar las llaves privadas que pertenezcan a su billetera</translation>
@@ -518,10 +552,6 @@
         <source>Show wallet repair options</source>
         <translation>Mostrar opciones para reparar billetera</translation>
     </message>
-    <message>
-        <source>Open Wallet &amp;Configuration File</source>
-        <translation>Abrir Archivo de &amp;Configuración de la billetera</translation>
-    </message>
     <message>
         <source>Open configuration file</source>
         <translation>Abrir archivo de configuración</translation>
@@ -576,10 +606,40 @@
         <source>Show information about %1</source>
         <translation>Mostrar información sobre %1</translation>
     </message>
+    <message>
+        <source>Load PSBT from &amp;clipboard…</source>
+        <translation>Cargar PSBT desde el &amp;portapapeles…</translation>
+    </message>
+    <message>
+        <source>Open debugging and diagnostic console</source>
+        <translation>Abrir la consola de depuración y diagnóstico</translation>
+    </message>
+    <message>
+        <source>Open &amp;wallet configuration file</source>
+        <translation>Abrir archivo de configuración de la &amp;billetera</translation>
+    </message>
+    <message>
+        <source>Open a dash: URI</source>
+        <translation>Abrir un guión: URI</translation>
+    </message>
     <message>
         <source>Create a new wallet</source>
         <translation>Crear una nueva billetera</translation>
     </message>
+    <message>
+        <source>Restore Wallet…</source>
+        <extracomment>Name of the menu item that restores wallet from a backup file.</extracomment>
+        <translation>Restaurar billetera…</translation>
+    </message>
+    <message>
+        <source>Restore a wallet from a backup file</source>
+        <extracomment>Status tip for Restore Wallet menu item</extracomment>
+        <translation>Restaurar una billetera desde un archivo de respaldo</translation>
+    </message>
+    <message>
+        <source>Close all wallets</source>
+        <translation>Cerrar todas las billeteras</translation>
+    </message>
     <message>
         <source>%1 &amp;information</source>
         <translation>%1 &amp;Información</translation>
@@ -588,10 +648,42 @@
         <source>Show the %1 basic information</source>
         <translation>Mostrar la información básica de %1</translation>
     </message>
+    <message>
+        <source>&amp;Discreet mode</source>
+        <translation>&amp;Modo discreto</translation>
+    </message>
+    <message>
+        <source>Mask the values in the Overview tab</source>
+        <translation>Ocultar los valores en la pestaña Descripción general</translation>
+    </message>
+    <message>
+        <source>Wallet Data</source>
+        <extracomment>Name of the wallet data file format.</extracomment>
+        <translation>Datos de billetera</translation>
+    </message>
+    <message>
+        <source>Load Wallet Backup</source>
+        <extracomment>The title for Restore Wallet File Windows</extracomment>
+        <translation>Cargar respaldo de billetera</translation>
+    </message>
+    <message>
+        <source>Restore Wallet</source>
+        <extracomment>Title of pop-up window shown when the user is attempting to restore a wallet.</extracomment>
+        <translation>Restaurar billetera</translation>
+    </message>
+    <message>
+        <source>Wallet Name</source>
+        <extracomment>Label of the input field where the name of the wallet is entered.</extracomment>
+        <translation>Nombre de la billetera</translation>
+    </message>
     <message>
         <source>&amp;Settings</source>
         <translation>&amp;Configuración</translation>
     </message>
+    <message>
+        <source>&amp;Minimize</source>
+        <translation>&amp;Minimizar</translation>
+    </message>
     <message>
         <source>&amp;Help</source>
         <translation>&amp;Ayuda</translation>
@@ -608,8 +700,17 @@
         <source>View Governance Proposals</source>
         <translation>Ver propuestas de gobernanza</translation>
     </message>
+    <message>
+        <source>&amp;Hide</source>
+        <translation>&amp;Ocultar</translation>
+    </message>
+    <message>
+        <source>S&amp;how</source>
+        <translation>&amp;Mostrar</translation>
+    </message>
     <message numerus="yes">
         <source>%n active connection(s) to Dash network</source>
+        <extracomment>A substring of the tooltip.</extracomment>
         <translation><numerusform>%n conexion(es) activa a la red Dash</numerusform><numerusform>%n conexion(es) activas a la red Dash</numerusform><numerusform>%n conexion(es) activas a la red Dash</numerusform></translation>
     </message>
     <message>
@@ -628,10 +729,50 @@
         <source>Close Wallet…</source>
         <translation>Cerrar billetera…</translation>
     </message>
+    <message>
+        <source>Load Partially Signed Blockchain Transaction</source>
+        <translation>Cargar transacción de blockchain parcialmente firmada</translation>
+    </message>
+    <message>
+        <source>Load Partially Signed Blockchain Transaction from clipboard</source>
+        <translation>Cargar transacción de blockchain parcialmente firmada desde el portapapeles</translation>
+    </message>
     <message>
         <source>Create Wallet…</source>
         <translation>Crear billetera…</translation>
     </message>
+    <message>
+        <source>Close All Wallets…</source>
+        <translation>Cerrar todas las billeteras…</translation>
+    </message>
+    <message>
+        <source>Ctrl+Shift+D</source>
+        <translation>Ctrl+Shift+D</translation>
+    </message>
+    <message>
+        <source>Ctrl+M</source>
+        <translation>Ctrl+M</translation>
+    </message>
+    <message>
+        <source>Click for more actions.</source>
+        <extracomment>A substring of the tooltip. "More actions" are available via the context menu.</extracomment>
+        <translation>Haz clic para más acciones.</translation>
+    </message>
+    <message>
+        <source>Show Peers tab</source>
+        <extracomment>A context menu item. The "Peers tab" is an element of the "Node window".</extracomment>
+        <translation>Mostrar pestaña de pares</translation>
+    </message>
+    <message>
+        <source>Disable network activity</source>
+        <extracomment>A context menu item.</extracomment>
+        <translation>Deshabilitar la actividad de red</translation>
+    </message>
+    <message>
+        <source>Enable network activity</source>
+        <extracomment>A context menu item. The network activity was disabled previously.</extracomment>
+        <translation>Habilitar la actividad de red</translation>
+    </message>
     <message>
         <source>Syncing Headers (%1%)…</source>
         <translation>Sincronizando encabezados (%1)…</translation>
@@ -648,10 +789,6 @@
         <source>Processing blocks on disk…</source>
         <translation>Procesando los bloques en el disco…</translation>
     </message>
-    <message>
-        <source>Reindexing blocks on disk…</source>
-        <translation>Reindexando bloques en disco…</translation>
-    </message>
     <message>
         <source>Connecting to peers…</source>
         <translation>Conectando con los pares…</translation>
@@ -805,10 +942,6 @@
         <source>Coin Selection</source>
         <translation>Selección de monedas</translation>
     </message>
-    <message>
-        <source>Dust:</source>
-        <translation>Polvo:</translation>
-    </message>
     <message>
         <source>After Fee:</source>
         <translation>Después de comisiones:</translation>
@@ -866,28 +999,32 @@
         <translation>Confirmado</translation>
     </message>
     <message>
-        <source>Copy address</source>
-        <translation>Copiar dirección</translation>
+        <source>Copy amount</source>
+        <translation>Copiar cantidad</translation>
+    </message>
+    <message>
+        <source>&amp;Copy address</source>
+        <translation>&amp;Copiar dirección</translation>
     </message>
     <message>
-        <source>Copy label</source>
-        <translation>Copiar etiqueta</translation>
+        <source>Copy &amp;label</source>
+        <translation>Copiar &amp;etiquetar</translation>
     </message>
     <message>
-        <source>Copy amount</source>
-        <translation>Copiar cantidad</translation>
+        <source>Copy &amp;amount</source>
+        <translation>Copiar &amp;cantidad</translation>
     </message>
     <message>
-        <source>Copy transaction ID</source>
-        <translation>Copiar ID de transacción</translation>
+        <source>Copy transaction &amp;ID and output index</source>
+        <translation>Copiar transacción &amp;ID y generar índice</translation>
     </message>
     <message>
-        <source>Lock unspent</source>
-        <translation>Bloquear lo no gastado</translation>
+        <source>L&amp;ock unspent</source>
+        <translation>L&amp;ock sin gastar</translation>
     </message>
     <message>
-        <source>Unlock unspent</source>
-        <translation>Desbloquear lo no gastado</translation>
+        <source>&amp;Unlock unspent</source>
+        <translation>&amp;Desbloquea lo no gastado</translation>
     </message>
     <message>
         <source>Copy quantity</source>
@@ -905,10 +1042,6 @@
         <source>Copy bytes</source>
         <translation>Copiar bytes</translation>
     </message>
-    <message>
-        <source>Copy dust</source>
-        <translation>Copiar polvo</translation>
-    </message>
     <message>
         <source>Copy change</source>
         <translation>Copiar cambio</translation>
@@ -921,18 +1054,6 @@
         <source>(%1 locked)</source>
         <translation>(%1 bloqueadas)</translation>
     </message>
-    <message>
-        <source>yes</source>
-        <translation>si</translation>
-    </message>
-    <message>
-        <source>no</source>
-        <translation>no</translation>
-    </message>
-    <message>
-        <source>This label turns red if any recipient receives an amount smaller than the current dust threshold.</source>
-        <translation>Esta etiqueta se vuelve roja si cualquier receptor recibe una cantidad mas pequeña que el límite, mínimo actual de polvo.</translation>
-    </message>
     <message>
         <source>Can vary +/- %1 duff(s) per input.</source>
         <translation>Puede variar +/- %1 duff(s) por entrada.</translation>
@@ -976,8 +1097,14 @@
 </context>
 <context>
     <name>CreateWalletActivity</name>
+    <message>
+        <source>Create Wallet</source>
+        <extracomment>Title of window indicating the progress of creation of a new wallet.</extracomment>
+        <translation>Crear billetera</translation>
+    </message>
     <message>
         <source>Creating Wallet &lt;b&gt;%1&lt;/b&gt;…</source>
+        <extracomment>Descriptive text of the create wallet progress window which indicates to the user which wallet is currently being created.</extracomment>
         <translation>Creando billetera &lt;b&gt;%1&lt;/b&gt;…</translation>
     </message>
     <message>
@@ -999,6 +1126,10 @@
         <source>Wallet Name</source>
         <translation>Nombre de la billetera</translation>
     </message>
+    <message>
+        <source>Wallet</source>
+        <translation>Billetera</translation>
+    </message>
     <message>
         <source>Encrypt the wallet. The wallet will be encrypted with a passphrase of your choice.</source>
         <translation>Encriptar la billetera. La billetera se encriptará con una frase de contraseña de tu elección.</translation>
@@ -1007,6 +1138,10 @@
         <source>Encrypt Wallet</source>
         <translation>Encriptar billetera</translation>
     </message>
+    <message>
+        <source>Advanced Options</source>
+        <translation>Opciones avanzadas</translation>
+    </message>
     <message>
         <source>Disable private keys for this wallet. Wallets with private keys disabled will have no private keys and cannot have an HD seed or imported private keys. This is ideal for watch-only wallets.</source>
         <translation>Deshabilita las llaves privadas para esta billetera. Las billeteras con llaves privadas deshabilitadas no tendrán llaves privadas y no pueden tener una semilla HD o llaves privadas importadas. Esto es ideal para carteras de vigilancia</translation>
@@ -1023,11 +1158,23 @@
         <source>Make Blank Wallet</source>
         <translation>Hacer una billetera en blanco</translation>
     </message>
+    <message>
+        <source>Use descriptors for scriptPubKey management. This feature is well-tested but still considered experimental and not recommended for use yet.</source>
+        <translation>Utiliza descriptores para la gestión de scriptPubKey. Esta función está bien probada, pero aún se considera experimental y no se recomienda su uso todavía.</translation>
+    </message>
+    <message>
+        <source>Descriptor Wallet (EXPERIMENTAL)</source>
+        <translation>Billetera descriptora (EXPERIMENTAL)</translation>
+    </message>
     <message>
         <source>Create</source>
         <translation>Crear</translation>
     </message>
-    </context>
+    <message>
+        <source>Compiled without sqlite support (required for descriptor wallets)</source>
+        <translation>Compilado sin soporte para sqlite (requerido para billeteras de descriptores)</translation>
+    </message>
+</context>
 <context>
     <name>EditAddressDialog</name>
     <message>
@@ -1116,18 +1263,106 @@
         <source>Filter List:</source>
         <translation>Lista de filtros:</translation>
     </message>
+    <message>
+        <source>Filter proposal list</source>
+        <translation>Filtrar lista de propuestas</translation>
+    </message>
+    <message>
+        <source>Masternode Count:</source>
+        <translation>Cantidad de masternodos:</translation>
+    </message>
+    <message>
+        <source>Number of masternodes this wallet can vote with (masternodes for which this wallet holds the voting key)</source>
+        <translation>Número de masternodos con los que esta billetera puede votar (masternodos para los que esta billetera tiene la clave de votación)</translation>
+    </message>
     <message>
         <source>Proposal Count:</source>
         <translation>Número de propuestas:</translation>
     </message>
+    <message>
+        <source>Create Proposal</source>
+        <translation>Crear propuesta</translation>
+    </message>
     <message>
         <source>Filter by Title</source>
         <translation>Filtrar por título</translation>
     </message>
+    <message>
+        <source>Unavailable</source>
+        <translation>No disponible</translation>
+    </message>
+    <message>
+        <source>A synced node and an unlocked wallet are required.</source>
+        <translation>Se requiere un nodo sincronizado y una billetera desbloqueada.</translation>
+    </message>
+    <message>
+        <source>Vote Yes</source>
+        <translation>Votar Sí</translation>
+    </message>
+    <message>
+        <source>Vote No</source>
+        <translation>Votar No</translation>
+    </message>
+    <message>
+        <source>Vote Abstain</source>
+        <translation>Votar Abstención</translation>
+    </message>
     <message>
         <source>Proposal Info: %1</source>
         <translation>Información de la propuesta: %1</translation>
     </message>
+    <message>
+        <source>Voting Failed</source>
+        <translation>Votación fallida</translation>
+    </message>
+    <message>
+        <source>No wallet available.</source>
+        <translation>No hay billetera disponible.</translation>
+    </message>
+    <message>
+        <source>No masternode voting keys found in wallet.</source>
+        <translation>No se encontraron claves de votación de masternodos en la billetera.</translation>
+    </message>
+    <message>
+        <source>Please select a proposal to vote on.</source>
+        <translation>Por favor selecciona una propuesta para votar.</translation>
+    </message>
+    <message>
+        <source>Unable to unlock wallet.</source>
+        <translation>No se puede desbloquear la billetera.</translation>
+    </message>
+    <message>
+        <source>Unable to get masternode list. Please try again later.</source>
+        <translation>No se puede obtener la lista de masternodos. Por favor inténtalo de nuevo más tarde.</translation>
+    </message>
+    <message>
+        <source>Masternode %1 not found</source>
+        <translation>Masternodo %1 no encontrado</translation>
+    </message>
+    <message>
+        <source>Failed to sign vote for masternode %1</source>
+        <translation>Error al firmar voto para el masternodo %1</translation>
+    </message>
+    <message>
+        <source>Masternode %1: %2</source>
+        <translation>Masternodo %1: %2</translation>
+    </message>
+    <message numerus="yes">
+        <source>Voted successfully %n time(s)</source>
+        <translation><numerusform>Votado exitosamente %n vez</numerusform><numerusform>Votado exitosamente %n veces</numerusform><numerusform>Votado exitosamente %n veces</numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <source>Failed to vote %n time(s)</source>
+        <translation><numerusform>Error al votar %n vez</numerusform><numerusform>Error al votar %n veces</numerusform><numerusform>Error al votar %n veces</numerusform></translation>
+    </message>
+    <message>
+        <source>Errors:</source>
+        <translation>Errores:</translation>
+    </message>
+    <message>
+        <source>Voting Results</source>
+        <translation>Resultados de votación</translation>
+    </message>
 </context>
 <context>
     <name>HelpMessageDialog</name>
@@ -1149,7 +1384,7 @@
     </message>
     <message>
         <source>&lt;h3&gt;%1 Basics&lt;/h3&gt; %1 gives you true financial privacy by obscuring the origins of your funds. All the Dash in your wallet is comprised of different "inputs" which you can think of as separate, discrete coins.&lt;br&gt; %1 uses an innovative process to mix your inputs with the inputs of two or more other people, without having your coins ever leave your wallet. You retain control of your money at all times.&lt;hr&gt; &lt;b&gt;The %1 process works like this:&lt;/b&gt;&lt;ol type="1"&gt; &lt;li&gt;%1 begins by breaking your transaction inputs down into standard denominations. These denominations are 0.001 DASH, 0.01 DASH, 0.1 DASH, 1 DASH and 10 DASH -- sort of like the paper money you use every day.&lt;/li&gt; &lt;li&gt;Your wallet then sends requests to specially configured software nodes on the network, called "masternodes." These masternodes are informed then that you are interested in mixing a certain denomination. No identifiable information is sent to the masternodes, so they never know "who" you are.&lt;/li&gt; &lt;li&gt;When two or more other people send similar messages, indicating that they wish to mix the same denomination, a mixing session begins. The masternode mixes up the inputs and instructs all three users' wallets to pay the now-transformed input back to themselves. Your wallet pays that denomination directly to itself, but in a different address (called a change address).&lt;/li&gt; &lt;li&gt;In order to fully obscure your funds, your wallet must repeat this process a number of times with each denomination. Each time the process is completed, it's called a "round." Each round of %1 makes it exponentially more difficult to determine where your funds originated.&lt;/li&gt; &lt;li&gt;This mixing process happens in the background without any intervention on your part. When you wish to make a transaction, your funds will already be mixed. No additional waiting is required.&lt;/li&gt; &lt;/ol&gt; &lt;hr&gt;&lt;b&gt;IMPORTANT:&lt;/b&gt; Your wallet only contains 1000 of these "change addresses." Every time a mixing event happens, up to 9 of your addresses are used up. This means those 1000 addresses last for about 100 mixing events. When 900 of them are used, your wallet must create more addresses. It can only do this, however, if you have automatic backups enabled.&lt;br&gt; Consequently, users who have backups disabled will also have %1 disabled. &lt;hr&gt;For more information, see the &lt;a style="%2" href="%3"&gt;%1 documentation&lt;/a&gt;.</source>
-        <translation>&lt;h3&gt;Conceptos básico de %1&lt;/h3&gt;%1 te da verdadera privacidad financiera al ocultar los orígenes de tus fondos. Todos los Dash en tu billetera están compuestos por diferentes "entradas" en las que puedes pensar como monedas separadas discretas.&lt;br&gt;%1 utiliza un proceso innovador que mezcla tus entradas con las entradas de otras dos personas, sin que tus monedas salgan de la billetera. Tu retienes el control de tu dinero en todo momento.&lt;hr&gt;&lt;b&gt;El proceso de %1 funciona así:&lt;/b&gt;&lt;ol type="1"&gt;&lt;li&gt;%1 comienza dividiendo las entradas de tus transacciones en denominaciones estándares. Éstas denominaciones son 0.001 DASH, 0.01 DASH, 0.1 DASH, 1 DASH y 10 DASH - algo así como el papel moneda que usas todos los días.&lt;/li&gt;&lt;li&gt;Entonces, tu billetera envía solicitudes a nodos de software especialmente configurados en la red, llamados "masternodes". Estos masternodes son informados que estás interesado en mezclar una cierta denominación. Información no identificable es enviada a los masternodes, por lo que nunca saben "quién" eres tu.&lt;/li&gt;&lt;li&gt;Cuando otras dos personas envían mensajes similares, indicando que desean mezclar la misma denominación, comienza una sesión de mezclado. El masternode mezcla loas entradas e instruye a las billeteras de los tres usuarios para que paguen la entrada ahora transformada a si mismos. Tu billetera paga esa denominación directamente a sí misma, pero en una dirección diferente (llamada dirección de cambio).&lt;/li&gt; &lt;li&gt;En orden de ocultar totalmente tus fondos, st billetera debe repetir este proceso varias veces con cada denominación. Cada vez que se completa el proceso, se denomina una "ronda". Cada ronda de %1 hace que sea exponencialmente más difícil determinar de dónde provienen los fondos.&lt;/li&gt;&lt;li&gt;Este proceso de mezclado ocurre en segundo plano sin ninguna intervención de tu parte. Cuando desees realizar una transacción, tus fondos ya serán anónimos. No se requiere tiempo de espera adicional.&lt;/li&gt;&lt;/ol&gt;&lt;hr&gt;&lt;b&gt;IMPORTATE:&lt;/b&gt;Tu billetera solo contiene 1000 de estas "direcciones de cambio". Cada vez que ocurre un evento de mezclado, hasta 9 de tus direcciones son usadas. Esto significa que esas 1000 direcciones duran alrededor de 100 eventos de mezclado. Cuando 900 de ellas sean usadas, tu billetera debe crear más direcciones. Sin embargo, solo podrá hacer esto si tiene las copias de seguridad automáticas habilitadas.&lt;br&gt;En consecuencia, los usuarios que tengan las copias de seguridad deshabilitadas también tendrán %1 deshabilitado.&lt;hr&gt;Para mas información, consulta la &lt;a style="%2" href="%3"&gt;documentación de %1&lt;/a&gt;.</translation>
+        <translation>&lt;h3&gt;Conceptos básico de %1&lt;/h3&gt;%1 te da verdadera privacidad financiera al ocultar los orígenes de tus fondos. Todos los Dash en tu billetera están compuestos por diferentes "entradas" en las que puedes pensar como monedas separadas discretas.&lt;br&gt;%1 utiliza un proceso innovador que mezcla tus entradas con las entradas de otras dos personas, sin que tus monedas salgan de la billetera. Tu retienes el control de tu dinero en todo momento.&lt;hr&gt;&lt;b&gt;El proceso de %1 funciona así:&lt;/b&gt;&lt;ol type="1"&gt;&lt;li&gt;%1 comienza dividiendo las entradas de tus transacciones en denominaciones estándares. Éstas denominaciones son 0.001 DASH, 0.01 DASH, 0.1 DASH, 1 DASH y 10 DASH - algo así como el papel moneda que usas todos los días.&lt;/li&gt;&lt;li&gt;Entonces, tu billetera envía solicitudes a nodos de software especialmente configurados en la red, llamados "masternodes". Estos masternodes son informados que estás interesado en mezclar una cierta denominación. Información no identificable es enviada a los masternodes, por lo que nunca saben "quién" eres tu.&lt;/li&gt;&lt;li&gt;Cuando otras dos personas envían mensajes similares, indicando que desean mezclar la misma denominación, comienza una sesión de mezclado. El masternode mezcla loas entradas e instruye a las billeteras de los tres usuarios para que paguen la entrada ahora transformada a si mismos. Tu billetera paga esa denominación directamente a sí misma, pero en una dirección diferente (llamada dirección de cambio).&lt;/li&gt; &lt;li&gt;En orden de ocultar totalmente tus fondos, st billetera debe repetir este proceso varias veces con cada denominación. Cada vez que se completa el proceso, se denomina una "ronda". Cada ronda de %1 hace que sea exponencialmente más difícil determinar de dónde provienen los fondos.&lt;/li&gt;&lt;li&gt;Este proceso de mezclado ocurre en segundo plano sin ninguna intervención de tu parte. Cuando desees realizar una transacción, tus fondos ya serán anónimos. No se requiere tiempo de espera adicional.&lt;/li&gt;&lt;/ol&gt;&lt;hr&gt;&lt;b&gt;IMPORTATE:&lt;/b&gt;Tu billetera solo contiene 1000 de estas "direcciones de cambio". Cada vez que ocurre un evento de mezclado, hasta 9 de tus direcciones son usadas. Esto significa que esas 1000 direcciones duran alrededor de 100 eventos de mezclado. Cuando 900 de ellas sean usadas, tu billetera debe crear más direcciones. Sin embargo, solo podrá hacer esto si tiene las copias de seguridad automáticas habilitadas.&lt;br&gt;En consecuencia, los usuarios que tengan las copias de seguridad deshabilitadas también tendrán %1 deshabilitado.&lt;hr&gt;Para más información, consulta la &lt;a style="%2" href="%3"&gt;documentación de %1&lt;/a&gt;.</translation>
     </message>
 </context>
 <context>
@@ -1166,10 +1401,26 @@
         <source>As this is the first time the program is launched, you can choose where %1 will store its data.</source>
         <translation>Al ser la primera vez que se ejecuta el programa, puede elegir donde %1 almacenará sus datos.</translation>
     </message>
+    <message>
+        <source>Limit block chain storage to</source>
+        <translation>Limitar el almacenamiento de la cadena de bloques a</translation>
+    </message>
+    <message>
+        <source>Reverting this setting requires re-downloading the entire blockchain. It is faster to download the full chain first and prune it later. Disables some advanced features.</source>
+        <translation>Para revertir esta configuración es necesario volver a descargar toda la cadena de bloques. Es más rápido descargar primero la cadena completa y podarla después. Desactiva algunas funciones avanzadas.</translation>
+    </message>
+    <message>
+        <source> GB</source>
+        <translation> GB</translation>
+    </message>
     <message>
         <source>This initial synchronisation is very demanding, and may expose hardware problems with your computer that had previously gone unnoticed. Each time you run %1, it will continue downloading where it left off.</source>
         <translation>La sincronización inicial demanda muchos recursos y podría revelar problemas de hardware que no se han notado previamente. Cada vez que ejecuta %1, continuará descargando a partir del punto anterior.</translation>
     </message>
+    <message>
+        <source>When you click OK, %1 will begin to download and process the full %4 block chain (%2 GB) starting with the earliest transactions in %3 when %4 initially launched.</source>
+        <translation>Al hacer clic en OK, %1 comenzará a descargar y procesar la cadena de bloques %4 completa (%2 GB) comenzando con las primeras transacciones en %3 cuando %4 se lanzó inicialmente.</translation>
+    </message>
     <message>
         <source>If you have chosen to limit block chain storage (pruning), the historical data must still be downloaded and processed, but will be deleted afterward to keep your disk usage low.</source>
         <translation>Si ha elegido limitar el almacenamiento de la cadena de bloques ("prunning"), se descargarán y procesarán los datos históricos igualmente, sin embargo, estos se eliminarán después para mantener un bajo uso del disco.</translation>
@@ -1182,6 +1433,18 @@
         <source>Use a custom data directory:</source>
         <translation>Utilizar un directorio de datos personalizado:</translation>
     </message>
+    <message numerus="yes">
+        <source>%n GB of space available</source>
+        <translation><numerusform>%n GB de espacio disponible</numerusform><numerusform>%n GB de espacio disponible</numerusform><numerusform>%n GB de espacio disponible</numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <source>(of %n GB needed)</source>
+        <translation><numerusform>(de %n GB necesario)</numerusform><numerusform>(de %n GB necesarios)</numerusform><numerusform>(de %n GB necesarios)</numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <source>(%n GB needed for full chain)</source>
+        <translation><numerusform>(%n GB necesario para la cadena completa)</numerusform><numerusform>(%n GB necesarios para la cadena completa)</numerusform><numerusform>(%n GB necesarios para la cadena completa)</numerusform></translation>
+    </message>
     <message>
         <source>At least %1 GB of data will be stored in this directory, and it will grow over time.</source>
         <translation>Se almacenará cuanto menos %1 GB de datos en este directorio, y crecerá con el transcurso del tiempo.</translation>
@@ -1190,6 +1453,11 @@
         <source>Approximately %1 GB of data will be stored in this directory.</source>
         <translation>Se almacenará aproximadamente %1 GB de datos en este directorio.</translation>
     </message>
+    <message numerus="yes">
+        <source>(sufficient to restore backups %n day(s) old)</source>
+        <extracomment>Explanatory text on the capability of the current prune target.</extracomment>
+        <translation><numerusform>(suficiente para restaurar copias de seguridad de %n día de antigüedad)</numerusform><numerusform>(suficiente para restaurar copias de seguridad de %n días de antigüedad)</numerusform><numerusform>(suficiente para restaurar copias de seguridad de %n días de antigüedad)</numerusform></translation>
+    </message>
     <message>
         <source>%1 will download and store a copy of the Dash block chain.</source>
         <translation>%1 descargará y almacenará una copia de la cadena de bloques de Dash.</translation>
@@ -1207,6 +1475,13 @@
         <translation>Error</translation>
     </message>
 </context>
+<context>
+    <name>LoadWalletsActivity</name>
+    <message>
+        <source>Loading wallets…</source>
+        <translation>Cargando billeteras…</translation>
+    </message>
+</context>
 <context>
     <name>MasternodeList</name>
     <message>
@@ -1241,6 +1516,10 @@
         <source>Service</source>
         <translation>Servicio</translation>
     </message>
+    <message>
+        <source>Type</source>
+        <translation>Tipo</translation>
+    </message>
     <message>
         <source>PoSe Score</source>
         <translation>PoSe Marcador</translation>
@@ -1376,6 +1655,10 @@
         <source>Hide</source>
         <translation>Ocultar</translation>
     </message>
+    <message>
+        <source>%1 is currently syncing.  It will download headers and blocks from peers and validate them until reaching the tip of the block chain.</source>
+        <translation>%1 se está sincronizando actualmente. Descargará encabezados y bloques de los pares y los validará hasta llegar a la punta de la cadena de bloques.</translation>
+    </message>
     <message>
         <source>Unknown. Syncing Headers (%1, %2%)…</source>
         <translation>Desconocido. Sincronización de encabezados (%1, %2%)…</translation>
@@ -1391,6 +1674,11 @@
         <source>URI:</source>
         <translation>URI:</translation>
     </message>
+    <message>
+        <source>Paste address from clipboard</source>
+        <extracomment>Tooltip text for button that allows you to paste an address that is in your clipboard.</extracomment>
+        <translation>Pegar dirección desde el portapapeles</translation>
+    </message>
 </context>
 <context>
     <name>OpenWalletActivity</name>
@@ -1406,8 +1694,14 @@
         <source>default wallet</source>
         <translation>billetera predeterminada</translation>
     </message>
+    <message>
+        <source>Open Wallet</source>
+        <extracomment>Title of window indicating the progress of opening of a wallet.</extracomment>
+        <translation>Billetera abierta</translation>
+    </message>
     <message>
         <source>Opening Wallet &lt;b&gt;%1&lt;/b&gt;…</source>
+        <extracomment>Descriptive text of the open wallet progress window which indicates to the user which wallet is currently being opened.</extracomment>
         <translation>Abriendo billetera &lt;b&gt;%1&lt;/b&gt;…</translation>
     </message>
 </context>
@@ -1441,6 +1735,14 @@
         <source>&amp;Appearance</source>
         <translation>&amp;Apariencia</translation>
     </message>
+    <message>
+        <source>Show the icon in the system tray.</source>
+        <translation>Mostrar el icono en la bandeja del sistema.</translation>
+    </message>
+    <message>
+        <source>&amp;Show tray icon</source>
+        <translation>&amp;Mostrar icono de la bandeja</translation>
+    </message>
     <message>
         <source>Prune &amp;block storage to</source>
         <translation>Despeja y bloquea el almacenamiento para</translation>
@@ -1453,10 +1755,58 @@
         <source>Reverting this setting requires re-downloading the entire blockchain.</source>
         <translation>Revertir esta configuración requiere volver a descargar toda la cadena de bloques.</translation>
     </message>
+    <message>
+        <source>Maximum database cache size. A larger cache can contribute to faster sync, after which the benefit is less pronounced for most use cases. Lowering the cache size will reduce memory usage. Unused mempool memory is shared for this cache.</source>
+        <extracomment>Tooltip text for Options window setting that sets the size of the database cache. Explains the corresponding effects of increasing/decreasing this value.</extracomment>
+        <translation>Tamaño máximo de caché de la base de datos. Una caché más grande puede contribuir a una sincronización más rápida, después de lo cual el beneficio es menos pronunciado para la mayoría de los casos de uso. Reducir el tamaño de la caché reducirá el uso de memoria. La memoria de mempool no utilizada se comparte para esta caché.</translation>
+    </message>
     <message>
         <source>MiB</source>
         <translation>MiB</translation>
     </message>
+    <message>
+        <source>Set the number of script verification threads. Negative values correspond to the number of cores you want to leave free to the system.</source>
+        <extracomment>Tooltip text for Options window setting that sets the number of script verification threads. Explains that negative values mean to leave these many cores free to the system.</extracomment>
+        <translation>Establece la cantidad de subprocesos de verificación de scripts. Los valores negativos corresponden a la cantidad de núcleos que deseas dejar libres en el sistema.</translation>
+    </message>
+    <message>
+        <source>This allows you or a third party tool to communicate with the node through command-line and JSON-RPC commands.</source>
+        <extracomment>Tooltip text for Options window setting that enables the RPC server.</extracomment>
+        <translation>Esto te permite a ti o a una herramienta de terceros comunicarse con el nodo a través de la línea de comandos y comandos JSON-RPC.</translation>
+    </message>
+    <message>
+        <source>Enable R&amp;PC server</source>
+        <extracomment>An Options window setting to enable the RPC server.</extracomment>
+        <translation>Habilitar servidor R&amp;PC</translation>
+    </message>
+    <message>
+        <source>Whether to set subtract fee from amount as default or not.</source>
+        <extracomment>Tooltip text for Options window setting that sets subtracting the fee from a sending amount as default.</extracomment>
+        <translation>Si establecer o no la deducción de la comisión del monto como predeterminada.</translation>
+    </message>
+    <message>
+        <source>Subtract &amp;fee from amount by default</source>
+        <extracomment>An Options window setting to set subtracting the fee from a sending amount as default.</extracomment>
+        <translation>Deducir &amp;comisión del monto de manera predeterminada</translation>
+    </message>
+    <message>
+        <source>Enable &amp;PSBT controls</source>
+        <extracomment>An options window setting to enable PSBT controls.</extracomment>
+        <translation>Activar controles de &amp;PSBT</translation>
+    </message>
+    <message>
+        <source>Whether to show PSBT controls.</source>
+        <extracomment>Tooltip text for options window setting that enables PSBT controls.</extracomment>
+        <translation>Si se deben mostrar los controles de PSBT.</translation>
+    </message>
+    <message>
+        <source>Whether to keep the specified custom change address or not.</source>
+        <translation>Si se debe mantener o no la dirección de cambio personalizada especificada.</translation>
+    </message>
+    <message>
+        <source>Keep custom change &amp;address</source>
+        <translation>Mantener la &amp;dirección de cambio personalizada</translation>
+    </message>
     <message>
         <source>Show additional tab listing all your masternodes in first sub-tab&lt;br/&gt;and all masternodes on the network in second sub-tab.</source>
         <translation>Mostrar una pestaña adicional listando todos sus masternodes en la primera sub-pestaña&lt;br/&gt; y todos los masternodos en la red en la segunda sub-pestaña.</translation>
@@ -1513,6 +1863,14 @@
         <source>Enable &amp;multi-session</source>
         <translation>Habilitar &amp;multisesión</translation>
     </message>
+    <message>
+        <source>Use this many separate masternodes in parallel to mix funds.&lt;br/&gt;Note: You must use this feature carefully.&lt;br/&gt;Make sure you always have recent wallet (auto)backup in a safe place!</source>
+        <translation>Utiliza estos muchos masternodes separados en paralelo para mezclar fondos.&lt;br/&gt;Nota: Debes utilizar esta función con cuidado.&lt;br/&gt;¡Asegúrate de tener siempre una copia de seguridad (automática) reciente de tu billetera en un lugar seguro!</translation>
+    </message>
+    <message>
+        <source>Parallel sessions</source>
+        <translation>Sesiones paralelas</translation>
+    </message>
     <message>
         <source>Mixing rounds</source>
         <translation>Rondas de mezcla</translation>
@@ -1525,6 +1883,30 @@
         <source>Target balance</source>
         <translation>Saldo objetivo</translation>
     </message>
+    <message>
+        <source>How many inputs of each denominated amount are created.&lt;br/&gt;Lower these numbers if you want fewer smaller denominations.</source>
+        <translation>¿Cuántas entradas de cada monto denominado se crean?.&lt;br/&gt;Disminuye estos números si deseas menos denominaciones más pequeñas.</translation>
+    </message>
+    <message>
+        <source>Inputs per denomination</source>
+        <translation>Entradas por denominación</translation>
+    </message>
+    <message>
+        <source>Try to create at least this many inputs for each denominated amount.&lt;br/&gt;Lower this number if you want fewer smaller denominations.</source>
+        <translation>Intenta crear al menos esta cantidad de entradas para cada monto denominado.&lt;br/&gt;Disminuye este número si deseas menos denominaciones más pequeñas.</translation>
+    </message>
+    <message>
+        <source>Target</source>
+        <translation>Objetivo</translation>
+    </message>
+    <message>
+        <source>Create up to this many inputs for each denominated amount.&lt;br/&gt;Lower this number if you want fewer smaller denominations.</source>
+        <translation>Crea hasta esta cantidad de entradas para cada monto denominado.&lt;br/&gt;Disminuye este número si deseas menos denominaciones más pequeñas.</translation>
+    </message>
+    <message>
+        <source>Maximum</source>
+        <translation>Máximo</translation>
+    </message>
     <message>
         <source>Automatically open the Dash Core client port on the router. This only works when your router supports UPnP and it is enabled.</source>
         <translation>Abrir automáticamente el puerto del cliente Dash Core en el enrutador. Esto solo funciona cuando su enrutador admite UPnP y está habilitado.</translation>
@@ -1554,20 +1936,26 @@
         <translation>Mostrar si el proxy SOCKS5 predeterminado suministrado se utiliza para llegar a los pares a través de este tipo de red.</translation>
     </message>
     <message>
-        <source>Options set in this dialog are overridden by the command line or in the configuration file:</source>
-        <translation>Las opciones configuradas en este cuadro de diálogo se reemplazan por la línea de comando o en el archivo de configuración:</translation>
+        <source>Language missing or translation incomplete? Help contributing translations here:
+https://explore.transifex.com/dash/dash/</source>
+        <translation>¿Falta el idioma o la traducción está incompleta? Ayuda a contribuir con traducciones aquí:
+https://explore.transifex.com/dash/dash/</translation>
     </message>
     <message>
-        <source>Minimize instead of exit the application when the window is closed. When this option is enabled, the application will be closed only after selecting Exit in the menu.</source>
-        <translation>Minimizar en lugar de salir de la aplicación cuando la ventana esté cerrada. Cuando esta opción está habilitada, la aplicación se cerrará solo después de seleccionar Salir en el menú.</translation>
+        <source>Third-party URLs (e.g. a block explorer) that appear in the transactions tab as context menu items.&lt;br/&gt;%s in the URL is replaced by transaction hash. Multiple URLs are separated by vertical bar |.</source>
+        <translation>URLs de terceros (por ejemplo, un explorador de bloques) que aparecen en la pestaña de transacciones como elementos del menú contextual.&lt;br/&gt;%s en la URL se reemplaza por el hash de la transacción. Múltiples URLs se separan por barra vertical |.</translation>
     </message>
     <message>
-        <source>Third party URLs (e.g. a block explorer) that appear in the transactions tab as context menu items.&lt;br/&gt;%s in the URL is replaced by transaction hash. Multiple URLs are separated by vertical bar |.</source>
-        <translation>URL de terceros (por ejemplo, un explorador de bloques) que aparecen en la pestaña de transacciones como elementos del menú contextual.&lt;br/&gt;%s en la URL se reemplaza por hash de transacción. Varias URL están separadas por una barra vertical |.</translation>
+        <source>&amp;Third-party transaction URLs</source>
+        <translation>URLs de transacciones de &amp;terceros</translation>
+    </message>
+    <message>
+        <source>Options set in this dialog are overridden by the command line or in the configuration file:</source>
+        <translation>Las opciones configuradas en este cuadro de diálogo se reemplazan por la línea de comando o en el archivo de configuración:</translation>
     </message>
     <message>
-        <source>&amp;Third party transaction URLs</source>
-        <translation>&amp;URL de transacciones de terceros</translation>
+        <source>Minimize instead of exit the application when the window is closed. When this option is enabled, the application will be closed only after selecting Exit in the menu.</source>
+        <translation>Minimizar en lugar de salir de la aplicación cuando la ventana esté cerrada. Cuando esta opción está habilitada, la aplicación se cerrará solo después de seleccionar Salir en el menú.</translation>
     </message>
     <message>
         <source>Whether to show coin control features or not.</source>
@@ -1605,6 +1993,10 @@
         <source>Map port using &amp;UPnP</source>
         <translation>Mapear puerto usando &amp;UPnP</translation>
     </message>
+    <message>
+        <source>Automatically open the Dash Core client port on the router. This only works when your router supports NAT-PMP and it is enabled. The external port could be random.</source>
+        <translation>Abre automáticamente el puerto del cliente Dash Core en el enrutador. Esto solo funciona cuando el enrutador admite NAT-PMP y está habilitado. El puerto externo puede ser aleatorio.</translation>
+    </message>
     <message>
         <source>Proxy &amp;IP:</source>
         <translation>Dirección &amp;IP del proxy:</translation>
@@ -1653,6 +2045,14 @@
         <source>&amp;Display</source>
         <translation>&amp;Interfaz</translation>
     </message>
+    <message>
+        <source>Connect to the Dash network through a separate SOCKS5 proxy for Tor onion services.</source>
+        <translation>Conéctate a la red Dash a través de un proxy SOCKS5 separado para los servicios de Tor onion.</translation>
+    </message>
+    <message>
+        <source>Use separate SOCKS&amp;5 proxy to reach peers via Tor onion services:</source>
+        <translation>Utiliza un proxy SOCKS&amp;5 independiente para comunicarte con tus pares a través de los servicios de Tor onion:</translation>
+    </message>
     <message>
         <source>User Interface &amp;language:</source>
         <translation>&amp;Idioma de la interfaz de usuario</translation>
@@ -1699,14 +2099,22 @@
     </message>
     <message>
         <source>Confirm options reset</source>
+        <extracomment>Window title text of pop-up window shown when the user has chosen to reset options.</extracomment>
         <translation>Confirme el restablecimiento de las opciones</translation>
     </message>
     <message>
         <source>Client restart required to activate changes.</source>
+        <extracomment>Text explaining that the settings changed will not come into effect until the client is restarted.</extracomment>
         <translation>Se necesita reiniciar el cliente para activar los cambios.</translation>
     </message>
+    <message>
+        <source>Current settings will be backed up at "%1".</source>
+        <extracomment>Text explaining to the user that the client's current settings will be backed up at a specific location. %1 is a stand-in argument for the backup location's path.</extracomment>
+        <translation>La configuración actual se respaldará en "%1".</translation>
+    </message>
     <message>
         <source>Client will be shut down. Do you want to proceed?</source>
+        <extracomment>Text asking the user to confirm if they would like to proceed with a client shutdown.</extracomment>
         <translation>El cliente se cerrará. ¿Desea proceder?</translation>
     </message>
     <message>
@@ -1844,6 +2252,10 @@
         <source>%1 Balance</source>
         <translation>%1 Saldo</translation>
     </message>
+    <message>
+        <source>Discreet mode activated for the Overview tab. To unmask the values, uncheck Settings-&gt;Discreet mode.</source>
+        <translation>Modo discreto activado para la pestaña Descripción general. Para desenmascarar los valores, desmarque Configuración-&gt;Modo discreto.</translation>
+    </message>
     <message numerus="yes">
         <source>%n Rounds</source>
         <translation><numerusform>%n Ronda</numerusform><numerusform>%n Rondas</numerusform><numerusform>%n Rondas</numerusform></translation>
@@ -1943,7 +2355,140 @@
 </context>
 <context>
     <name>PSBTOperationsDialog</name>
-    </context>
+    <message>
+        <source>Dialog</source>
+        <translation>Diálogo</translation>
+    </message>
+    <message>
+        <source>Sign Tx</source>
+        <translation>Firmar transacción</translation>
+    </message>
+    <message>
+        <source>Broadcast Tx</source>
+        <translation>Transmisión de transacción</translation>
+    </message>
+    <message>
+        <source>Copy to Clipboard</source>
+        <translation>Copiar al portapapeles</translation>
+    </message>
+    <message>
+        <source>Save…</source>
+        <translation>Guardar…</translation>
+    </message>
+    <message>
+        <source>Close</source>
+        <translation>Cerrar</translation>
+    </message>
+    <message>
+        <source>Failed to load transaction: %1</source>
+        <translation>Error al cargar la transacción: %1</translation>
+    </message>
+    <message>
+        <source>Failed to sign transaction: %1</source>
+        <translation>Error al firmar la transacción: %1</translation>
+    </message>
+    <message>
+        <source>Cannot sign inputs while wallet is locked.</source>
+        <translation>No se pueden firmar entradas mientras la billetera esté bloqueada.</translation>
+    </message>
+    <message>
+        <source>Could not sign any more inputs.</source>
+        <translation>No se pudieron firmar más entradas.</translation>
+    </message>
+    <message>
+        <source>Signed %1 inputs, but more signatures are still required.</source>
+        <translation>Se firmaron %1 entradas, pero aún se requieren más firmas.</translation>
+    </message>
+    <message>
+        <source>Signed transaction successfully. Transaction is ready to broadcast.</source>
+        <translation>La transacción se firmó correctamente. La transacción está lista para transmitirse.</translation>
+    </message>
+    <message>
+        <source>Unknown error processing transaction.</source>
+        <translation>Error desconocido al procesar transacción.</translation>
+    </message>
+    <message>
+        <source>Transaction broadcast successfully! Transaction ID: %1</source>
+        <translation>¡Transacción transmitida con éxito! ID de transacción: %1</translation>
+    </message>
+    <message>
+        <source>Transaction broadcast failed: %1</source>
+        <translation>Error en la transmisión de la transacción: %1</translation>
+    </message>
+    <message>
+        <source>PSBT copied to clipboard.</source>
+        <translation>PSBT copiado al portapapeles.</translation>
+    </message>
+    <message>
+        <source>Save Transaction Data</source>
+        <translation>Guardar datos de transacción</translation>
+    </message>
+    <message>
+        <source>Partially Signed Transaction (Binary)</source>
+        <extracomment>Expanded name of the binary PSBT file format. See: BIP 174.</extracomment>
+        <translation>Transacción parcialmente firmada (binaria)</translation>
+    </message>
+    <message>
+        <source>PSBT saved to disk.</source>
+        <translation>PSBT guardado en el disco.</translation>
+    </message>
+    <message>
+        <source> * Sends %1 to %2</source>
+        <translation>* Envía %1 a %2</translation>
+    </message>
+    <message>
+        <source>own address</source>
+        <translation>Dirección propia</translation>
+    </message>
+    <message>
+        <source>Unable to calculate transaction fee or total transaction amount.</source>
+        <translation>No se puede calcular la comisión de transacción ni el monto total de la transacción.</translation>
+    </message>
+    <message>
+        <source>Pays transaction fee: </source>
+        <translation>Paga comisión de transacción:</translation>
+    </message>
+    <message>
+        <source>Total Amount</source>
+        <translation>Monto total</translation>
+    </message>
+    <message>
+        <source>or</source>
+        <translation>o</translation>
+    </message>
+    <message>
+        <source>Transaction has %1 unsigned inputs.</source>
+        <translation>La transacción tiene %1 entradas sin firmar.</translation>
+    </message>
+    <message>
+        <source>Transaction is missing some information about inputs.</source>
+        <translation>A la transacción le falta información sobre las entradas.</translation>
+    </message>
+    <message>
+        <source>Transaction still needs signature(s).</source>
+        <translation>La transacción aún necesita firma(s).</translation>
+    </message>
+    <message>
+        <source>(But no wallet is loaded.)</source>
+        <translation>(Pero no hay ninguna billetera cargada.)</translation>
+    </message>
+    <message>
+        <source>(But this wallet cannot sign transactions.)</source>
+        <translation>(Pero esta billetera no puede firmar transacciones).</translation>
+    </message>
+    <message>
+        <source>(But this wallet does not have the right keys.)</source>
+        <translation>(Pero esta billetera no tiene las llaves correctas.)</translation>
+    </message>
+    <message>
+        <source>Transaction is fully signed and ready for broadcast.</source>
+        <translation>La transacción está completamente firmada y lista para transmitirse.</translation>
+    </message>
+    <message>
+        <source>Transaction status is unknown.</source>
+        <translation>El estado de la transacción es desconocido.</translation>
+    </message>
+</context>
 <context>
     <name>PaymentServer</name>
     <message>
@@ -1962,6 +2507,12 @@
         <source>'dash://' is not a valid URI. Use 'dash:' instead.</source>
         <translation>'dash://' no es un URI válido. Usa 'dash:'.</translation>
     </message>
+    <message>
+        <source>Cannot process payment request as BIP70 is no longer supported.
+Due to discontinued support, you should request the merchant to provide you with a BIP21 compatible URI or use a wallet that does continue to support BIP70.</source>
+        <translation>No se puede procesar la solicitud de pago porque BIP70 ya no es compatible.
+Debido a que se ha interrumpido el soporte, debes solicitarle al comerciante que te proporcione una URI compatible con BIP21 o utilizar una billetera que continúe admitiendo BIP70.</translation>
+    </message>
     <message>
         <source>URI cannot be parsed! This can be caused by an invalid Dash address or malformed URI parameters.</source>
         <translation>¡No se puede interpretar la URI! Esto puede deberse a una dirección Dash inválida o a parámetros de URI mal formados.</translation>
@@ -1983,6 +2534,26 @@
         <extracomment>Title of Peers Table column which indicates the current latency of the connection with the peer.</extracomment>
         <translation>Ping</translation>
     </message>
+    <message>
+        <source>Peer</source>
+        <extracomment>Title of Peers Table column which contains a unique number used to identify a connection.</extracomment>
+        <translation>Par</translation>
+    </message>
+    <message>
+        <source>Age</source>
+        <extracomment>Title of Peers Table column which indicates the duration (length of time) since the peer connection started.</extracomment>
+        <translation>Edad</translation>
+    </message>
+    <message>
+        <source>Direction</source>
+        <extracomment>Title of Peers Table column which indicates the direction the peer connection was initiated from.</extracomment>
+        <translation>Dirección</translation>
+    </message>
+    <message>
+        <source>Type</source>
+        <extracomment>Title of Peers Table column which describes the type of peer connection. The "type" describes why the connection exists.</extracomment>
+        <translation>Tipo</translation>
+    </message>
     <message>
         <source>Sent</source>
         <extracomment>Title of Peers Table column which indicates the total amount of network information we have sent to the peer.</extracomment>
@@ -1993,7 +2564,27 @@
         <extracomment>Title of Peers Table column which indicates the total amount of network information we have received from the peer.</extracomment>
         <translation>Recibido</translation>
     </message>
-    </context>
+    <message>
+        <source>Address</source>
+        <extracomment>Title of Peers Table column which contains the IP/Onion/I2P address of the connected peer.</extracomment>
+        <translation>Dirección</translation>
+    </message>
+    <message>
+        <source>Network</source>
+        <extracomment>Title of Peers Table column which states the network the peer connected through.</extracomment>
+        <translation>Red</translation>
+    </message>
+    <message>
+        <source>Inbound</source>
+        <extracomment>An Inbound Connection from a Peer.</extracomment>
+        <translation>Entrante</translation>
+    </message>
+    <message>
+        <source>Outbound</source>
+        <extracomment>An Outbound Connection to a Peer.</extracomment>
+        <translation>Saliente</translation>
+    </message>
+</context>
 <context>
     <name>Proposal</name>
     <message>
@@ -2044,8 +2635,193 @@
         <translation>Estado</translation>
     </message>
 </context>
+<context>
+    <name>ProposalWizard</name>
+    <message>
+        <source>Create Governance Proposal</source>
+        <translation>Crear propuesta de gobernanza</translation>
+    </message>
+    <message>
+        <source>Enter proposal details</source>
+        <translation>Ingresar detalles de la propuesta</translation>
+    </message>
+    <message>
+        <source>A fee will be burned when you prepare the proposal.</source>
+        <translation>Se quemará una tarifa cuando prepares la propuesta.</translation>
+    </message>
+    <message>
+        <source>Proposal &amp;name</source>
+        <translation>&amp;Nombre de la propuesta</translation>
+    </message>
+    <message>
+        <source>&amp;Description URL</source>
+        <translation>URL de &amp;descripción</translation>
+    </message>
+    <message>
+        <source>Payment &amp;address</source>
+        <translation>&amp;Dirección de pago</translation>
+    </message>
+    <message>
+        <source>Payment &amp;amount</source>
+        <translation>&amp;Monto de pago</translation>
+    </message>
+    <message>
+        <source>The amount to request in a single payment</source>
+        <translation>El monto a solicitar en un solo pago</translation>
+    </message>
+    <message>
+        <source>&amp;First payment</source>
+        <translation>&amp;Primer pago</translation>
+    </message>
+    <message>
+        <source>Pa&amp;yments</source>
+        <translation>&amp;Pagos</translation>
+    </message>
+    <message>
+        <source>To&amp;tal amount</source>
+        <translation>Monto &amp;total</translation>
+    </message>
+    <message>
+        <source>Proposal &amp;fee</source>
+        <translation>&amp;Tarifa de propuesta</translation>
+    </message>
+    <message>
+        <source>Next</source>
+        <translation>Siguiente</translation>
+    </message>
+    <message>
+        <source>Review proposal JSON and validate.</source>
+        <translation>Revisar JSON de la propuesta y validar.</translation>
+    </message>
+    <message>
+        <source>Hex-encoded JSON</source>
+        <translation>JSON codificado en hexadecimal</translation>
+    </message>
+    <message>
+        <source>Back</source>
+        <translation>Atrás</translation>
+    </message>
+    <message>
+        <source>Validate</source>
+        <translation>Validar</translation>
+    </message>
+    <message>
+        <source>Prepare (burn fee) and wait for confirmations.</source>
+        <translation>Preparar (quemar tarifa) y esperar confirmaciones.</translation>
+    </message>
+    <message>
+        <source>Copy</source>
+        <translation>Copiar</translation>
+    </message>
+    <message>
+        <source>At 1/6 confirmations: can be relayed and queued. At 6/6: accepted and processed.</source>
+        <translation>En 1/6 confirmaciones: se puede retransmitir y poner en cola. En 6/6: aceptado y procesado.</translation>
+    </message>
+    <message>
+        <source>Confirmations progress</source>
+        <translation>Progreso de confirmaciones</translation>
+    </message>
+    <message>
+        <source>Shows progress toward the required number of confirmations for the proposal fee transaction.</source>
+        <translation>Muestra el progreso hacia el número requerido de confirmaciones para la transacción de tarifa de la propuesta.</translation>
+    </message>
+    <message>
+        <source>Estimated time remaining: -</source>
+        <translation>Tiempo estimado restante: -</translation>
+    </message>
+    <message>
+        <source>Prepare Proposal</source>
+        <translation>Preparar propuesta</translation>
+    </message>
+    <message>
+        <source>You can submit after 1 confirmation. At 6 confirmations it is accepted and processed.</source>
+        <translation>Puedes enviar después de 1 confirmación. Con 6 confirmaciones se acepta y procesa.</translation>
+    </message>
+    <message>
+        <source>Proposal ID:</source>
+        <translation>ID de propuesta:</translation>
+    </message>
+    <message>
+        <source>Submit Proposal</source>
+        <translation>Enviar propuesta</translation>
+    </message>
+    <message>
+        <source>Close</source>
+        <translation>Cerrar</translation>
+    </message>
+    <message>
+        <source>Valid</source>
+        <translation>Válido</translation>
+    </message>
+    <message>
+        <source>Invalid: %1</source>
+        <translation>Inválido: %1</translation>
+    </message>
+    <message>
+        <source>Burn %1</source>
+        <translation>Quemar %1</translation>
+    </message>
+    <message>
+        <source>Burn %1 to create the fee transaction?</source>
+        <translation>¿Quemar %1 para crear la transacción de tarifa?</translation>
+    </message>
+    <message>
+        <source>Prepare failed</source>
+        <translation>Preparación fallida</translation>
+    </message>
+    <message>
+        <source>Confirmations: %1 / %2 required</source>
+        <translation>Confirmaciones: %1 / %2 requeridas</translation>
+    </message>
+    <message>
+        <source>Estimated time remaining: Ready</source>
+        <translation>Tiempo estimado restante: Listo</translation>
+    </message>
+    <message numerus="yes">
+        <source>Estimated time remaining: %n minute(s)</source>
+        <translation><numerusform>Tiempo estimado restante: %n minuto</numerusform><numerusform>Tiempo estimado restante: %n minutos</numerusform><numerusform>Tiempo estimado restante: %n minutos</numerusform></translation>
+    </message>
+    <message>
+        <source>Your proposal was submitted successfully.</source>
+        <translation>Tu propuesta se envió exitosamente.</translation>
+    </message>
+    <message>
+        <source>Already submitted</source>
+        <translation>Ya enviado</translation>
+    </message>
+    <message>
+        <source>This proposal has already been submitted.</source>
+        <translation>Esta propuesta ya ha sido enviada.</translation>
+    </message>
+    <message>
+        <source>Submission failed</source>
+        <translation>Envío fallido</translation>
+    </message>
+    <message>
+        <source>Proposal submitted</source>
+        <translation>Propuesta enviada</translation>
+    </message>
+    <message>
+        <source>A fee of %1 will be burned when you prepare the proposal.</source>
+        <translation>Se quemará una tarifa de %1 cuando prepares la propuesta.</translation>
+    </message>
+    <message>
+        <source>Prepare (burn %1) and wait for %2 confirmations.</source>
+        <translation>Preparar (quemar %1) y esperar %2 confirmaciones.</translation>
+    </message>
+</context>
 <context>
     <name>QObject</name>
+    <message>
+        <source>Do you want to reset settings to default values, or to abort without making changes?</source>
+        <extracomment>Explanatory text shown on startup when the settings file cannot be read. Prompts user to make a choice between resetting or aborting.</extracomment>
+        <translation>¿Deseas restablecer la configuración a los valores predeterminados o cancelar la operación sin realizar cambios?</translation>
+    </message>
+    <message>
+        <source>A fatal error occurred. Check that settings file is writable, or try running with -nosettings.</source>
+        <extracomment>Explanatory text shown on startup when the settings file could not be written. Prompts user to check that we have the ability to write to the file. Explains that the user has the option of running without a settings file.</extracomment>
+        <translation>Se produjo un error fatal. Verifica que el archivo de configuración tenga permisos de escritura o intenta ejecutarlo con -nosettings.</translation>
+    </message>
     <message>
         <source>Choose data directory on startup (default: %u)</source>
         <translation>Escoger el directorio de datos al iniciar (predeterminado: %u)</translation>
@@ -2146,6 +2922,53 @@
         <source>This can also be adjusted later in the "Appearance" tab of the preferences.</source>
         <translation>Esto también se puede ajustar más adelante en la pestaña "Apariencia" de las preferencias.</translation>
     </message>
+    <message>
+        <source>Ctrl+W</source>
+        <translation>Ctrl+W</translation>
+    </message>
+    <message>
+        <source>Unroutable</source>
+        <translation>No enrutable</translation>
+    </message>
+    <message>
+        <source>Internal</source>
+        <translation>Interno</translation>
+    </message>
+    <message>
+        <source>Inbound</source>
+        <extracomment>An inbound connection from a peer. An inbound connection is a connection initiated by a peer.</extracomment>
+        <translation>Entrante</translation>
+    </message>
+    <message>
+        <source>Outbound</source>
+        <extracomment>An outbound connection to a peer. An outbound connection is a connection initiated by us.</extracomment>
+        <translation>Saliente</translation>
+    </message>
+    <message>
+        <source>Full Relay</source>
+        <extracomment>Peer connection type that relays all network information.</extracomment>
+        <translation>Relevo completo</translation>
+    </message>
+    <message>
+        <source>Block Relay</source>
+        <extracomment>Peer connection type that relays network information about blocks and not transactions or addresses.</extracomment>
+        <translation>Relé de bloque</translation>
+    </message>
+    <message>
+        <source>Manual</source>
+        <extracomment>Peer connection type established manually through one of several methods.</extracomment>
+        <translation>Manual</translation>
+    </message>
+    <message>
+        <source>Feeler</source>
+        <extracomment>Short-lived peer connection type that tests the aliveness of known addresses.</extracomment>
+        <translation>Antena</translation>
+    </message>
+    <message>
+        <source>Address Fetch</source>
+        <extracomment>Short-lived peer connection type that solicits known addresses from a peer.</extracomment>
+        <translation>Obtención de dirección</translation>
+    </message>
     <message>
         <source>%1 d</source>
         <translation>%1 d</translation>
@@ -2207,8 +3030,8 @@
         <translation>%1 B</translation>
     </message>
     <message>
-        <source>%1 KB</source>
-        <translation>%1 KB</translation>
+        <source>%1 kB</source>
+        <translation>%1 kB</translation>
     </message>
     <message>
         <source>%1 MB</source>
@@ -2264,7 +3087,12 @@
         <source>Save QR Code</source>
         <translation>Guardar código QR</translation>
     </message>
-    </context>
+    <message>
+        <source>PNG Image</source>
+        <extracomment>Expanded name of the PNG file format. See: https://en.wikipedia.org/wiki/Portable_Network_Graphics.</extracomment>
+        <translation>Imagen PNG </translation>
+    </message>
+</context>
 <context>
     <name>RPCConsole</name>
     <message>
@@ -2371,6 +3199,14 @@
         <source>Version</source>
         <translation>Versión</translation>
     </message>
+    <message>
+        <source>High bandwidth BIP152 compact block relay: %1</source>
+        <translation>Relevo de bloque compacto BIP152 de alto ancho de banda: %1</translation>
+    </message>
+    <message>
+        <source>High Bandwidth</source>
+        <translation>Gran ancho de banda</translation>
+    </message>
     <message>
         <source>Starting Block</source>
         <translation>Bloque de inicio</translation>
@@ -2383,6 +3219,51 @@
         <source>Synced Blocks</source>
         <translation>Bloques sincronizados</translation>
     </message>
+    <message>
+        <source>Elapsed time since a novel block passing initial validity checks was received from this peer.</source>
+        <translation>Tiempo transcurrido desde que se recibió un nuevo bloque que pasó las comprobaciones de validez iniciales de este par.</translation>
+    </message>
+    <message>
+        <source>Last Block</source>
+        <translation>Último bloque</translation>
+    </message>
+    <message>
+        <source>Elapsed time since a novel transaction accepted into our mempool was received from this peer.</source>
+        <extracomment>Tooltip text for the Last Transaction field in the peer details area.</extracomment>
+        <translation>Tiempo transcurrido desde que se recibió una nueva transacción aceptada en nuestro mempool desde este par.</translation>
+    </message>
+    <message>
+        <source>Last Transaction</source>
+        <translation>Última transacción</translation>
+    </message>
+    <message>
+        <source>The mapped Autonomous System used for diversifying peer selection.</source>
+        <translation>El Sistema Autónomo mapeado utilizado para diversificar la selección de pares.</translation>
+    </message>
+    <message>
+        <source>Mapped AS</source>
+        <translation>AS Mapeado</translation>
+    </message>
+    <message>
+        <source>Whether we relay addresses to this peer.</source>
+        <extracomment>Tooltip text for the Address Relay field in the peer details area, which displays whether we relay addresses to this peer (Yes/No).</extracomment>
+        <translation>Si retransmitimos direcciones a este par.</translation>
+    </message>
+    <message>
+        <source>Address Relay</source>
+        <extracomment>Text title for the Address Relay field in the peer details area, which displays whether we relay addresses to this peer (Yes/No).</extracomment>
+        <translation>Relevo de dirección</translation>
+    </message>
+    <message>
+        <source>Addresses Processed</source>
+        <extracomment>Text title for the Addresses Processed field in the peer details area, which displays the total number of addresses received from this peer that were processed (excludes addresses that were dropped due to rate-limiting).</extracomment>
+        <translation>Direcciones procesadas</translation>
+    </message>
+    <message>
+        <source>Addresses Rate-Limited</source>
+        <extracomment>Text title for the Addresses Rate-Limited field in the peer details area, which displays the total number of addresses received from this peer that were dropped (not processed) due to rate-limiting.</extracomment>
+        <translation>Direcciones de tarifa limitada</translation>
+    </message>
     <message>
         <source>Rescan blockchain files 1</source>
         <translation>Reexplorar la cadena de bloques 1</translation>
@@ -2423,6 +3304,22 @@
         <source>To specify a non-default location of the blocks directory use the '%1' option.</source>
         <translation>Para especificar una ubicación no predeterminada del directorio de bloques, usa la opción '%1'.</translation>
     </message>
+    <message>
+        <source>Local Addresses</source>
+        <translation>Direcciones locales</translation>
+    </message>
+    <message>
+        <source>Network addresses that your Dash node is currently using to communicate with other nodes.</source>
+        <translation>Direcciones de red que tu nodo Dash está usando actualmente para comunicarse con otros nodos.</translation>
+    </message>
+    <message>
+        <source>Number of regular Masternodes</source>
+        <translation>Número de Masternodes regulares</translation>
+    </message>
+    <message>
+        <source>Number of EvoNodes</source>
+        <translation>Número de EvoNodes</translation>
+    </message>
     <message>
         <source>Current block height</source>
         <translation>Altura de bloque actual</translation>
@@ -2471,10 +3368,50 @@
         <source>PoSe Score</source>
         <translation>PoSe Marcador</translation>
     </message>
+    <message>
+        <source>The transport layer version: %1</source>
+        <translation>La versión de la capa de transporte: %1</translation>
+    </message>
+    <message>
+        <source>Transport</source>
+        <translation>Transporte</translation>
+    </message>
+    <message>
+        <source>The BIP324 session ID string in hex.</source>
+        <translation>La cadena de identificación de sesión BIP324 en hexadecimal.</translation>
+    </message>
+    <message>
+        <source>Session ID</source>
+        <translation>Sesión ID</translation>
+    </message>
+    <message>
+        <source>The network protocol this peer is connected through: IPv4, IPv6, Onion, I2P, or CJDNS.</source>
+        <translation>El protocolo de red a través del cual está conectado este par: IPv4, IPv6, Onion, I2P o CJDNS.</translation>
+    </message>
+    <message>
+        <source>Permissions</source>
+        <translation>Permisos</translation>
+    </message>
+    <message>
+        <source>The direction and type of peer connection: %1</source>
+        <translation>La dirección y el tipo de conexión entre pares: %1</translation>
+    </message>
+    <message>
+        <source>Direction/Type</source>
+        <translation>Dirección/Tipo</translation>
+    </message>
     <message>
         <source>Services</source>
         <translation>Servicios</translation>
     </message>
+    <message>
+        <source>Whether we relay transactions to this peer.</source>
+        <translation>Si retransmitimos transacciones a este par.</translation>
+    </message>
+    <message>
+        <source>Transaction Relay</source>
+        <translation>Retransmisión de transacciones</translation>
+    </message>
     <message>
         <source>Connection Time</source>
         <translation>Tiempo de Conexión</translation>
@@ -2511,6 +3448,16 @@
         <source>&amp;Wallet Repair</source>
         <translation>&amp;Reparar Billetera</translation>
     </message>
+    <message>
+        <source>The total number of addresses received from this peer that were processed (excludes addresses that were dropped due to rate-limiting).</source>
+        <extracomment>Tooltip text for the Addresses Processed field in the peer details area, which displays the total number of addresses received from this peer that were processed (excludes addresses that were dropped due to rate-limiting).</extracomment>
+        <translation>La cantidad total de direcciones recibidas de este par que fueron procesadas (excluye las direcciones que se descartaron debido a la limitación de velocidad).</translation>
+    </message>
+    <message>
+        <source>The total number of addresses received from this peer that were dropped (not processed) due to rate-limiting.</source>
+        <extracomment>Tooltip text for the Addresses Rate-Limited field in the peer details area, which displays the total number of addresses received from this peer that were dropped (not processed) due to rate-limiting.</extracomment>
+        <translation>La cantidad total de direcciones recibidas de este par que se descartaron (no se procesaron) debido a la limitación de velocidad.</translation>
+    </message>
     <message>
         <source>Wallet repair options.</source>
         <translation>Opciones de reparación de la billetera</translation>
@@ -2524,52 +3471,82 @@
         <translation>-reindex: Reconstruir el índice de la cadena de bloques a partir de los archivos blk000??.dat actuales.</translation>
     </message>
     <message>
-        <source>&amp;Disconnect</source>
-        <translation>&amp;Desconectar</translation>
+        <source>Inbound: initiated by peer</source>
+        <extracomment>Explanatory text for an inbound peer connection.</extracomment>
+        <translation>Entrante: iniciado por pares</translation>
     </message>
     <message>
-        <source>Ban for</source>
-        <translation>Prohibido por</translation>
+        <source>Outbound Full Relay: default</source>
+        <extracomment>Explanatory text for an outbound peer connection that relays all network information. This is the default behavior for outbound connections.</extracomment>
+        <translation>Retransmisión completa de salida: predeterminada</translation>
     </message>
     <message>
-        <source>1 &amp;hour</source>
-        <translation>1 &amp;hora</translation>
+        <source>Outbound Block Relay: does not relay transactions or addresses</source>
+        <extracomment>Explanatory text for an outbound peer connection that relays network information about blocks and not transactions or addresses.</extracomment>
+        <translation>Retransmisión de bloque saliente: no retransmite transacciones ni direcciones</translation>
     </message>
     <message>
-        <source>1 &amp;day</source>
-        <translation>1 &amp;día</translation>
+        <source>Outbound Manual: added using RPC %1 or %2/%3 configuration options</source>
+        <extracomment>Explanatory text for an outbound peer connection that was established manually through one of several methods. The numbered arguments are stand-ins for the methods available to establish manual connections.</extracomment>
+        <translation>Manual de salida: agregado mediante las opciones de configuración RPC %1 o %2/%3</translation>
     </message>
     <message>
-        <source>1 &amp;week</source>
-        <translation>1 &amp;semana</translation>
+        <source>Outbound Feeler: short-lived, for testing addresses</source>
+        <extracomment>Explanatory text for a short-lived outbound peer connection that is used to test the aliveness of known addresses.</extracomment>
+        <translation>Sensor de salida: de corta duración, para probar direcciones</translation>
     </message>
     <message>
-        <source>1 &amp;year</source>
-        <translation>1 &amp;año</translation>
+        <source>Outbound Address Fetch: short-lived, for soliciting addresses</source>
+        <extracomment>Explanatory text for a short-lived outbound peer connection that is used to request addresses from a peer.</extracomment>
+        <translation>Obtención de direcciones salientes: de corta duración, para solicitar direcciones</translation>
     </message>
     <message>
-        <source>&amp;Unban</source>
-        <translation>&amp;Levantar prohibición</translation>
+        <source>To</source>
+        <translation>Para</translation>
+    </message>
+    <message>
+        <source>we selected the peer for high bandwidth relay</source>
+        <translation>Seleccionamos el par para la retransmisión de alto ancho de banda</translation>
     </message>
     <message>
-        <source>Welcome to the %1 RPC console.</source>
-        <translation>Bienvenido a la consola RPC %1.</translation>
+        <source>From</source>
+        <translation>Desde</translation>
     </message>
     <message>
-        <source>Use up and down arrows to navigate history, and %1 to clear screen.</source>
-        <translation>Use las flechas arriba y abajo para navegar por el historial y %1 para vaciar la pantalla.</translation>
+        <source>the peer selected us for high bandwidth relay</source>
+        <translation>El par nos seleccionó para la retransmisión de alto ancho de banda</translation>
     </message>
     <message>
-        <source>Type %1 for an overview of available commands.</source>
-        <translation>Tipo %1 para obtener una descripción general de los comandos disponibles.</translation>
+        <source>No</source>
+        <translation>No</translation>
     </message>
     <message>
-        <source>For more information on using this console type %1.</source>
-        <translation>Para obtener más información sobre el uso de este tipo de consola %1.</translation>
+        <source>no high bandwidth relay selected</source>
+        <translation>No se ha seleccionado ningún relevo de alto ancho de banda</translation>
+    </message>
+    <message>
+        <source>&amp;Disconnect</source>
+        <translation>&amp;Desconectar</translation>
+    </message>
+    <message>
+        <source>Ban for</source>
+        <translation>Prohibido por</translation>
     </message>
     <message>
-        <source>WARNING: Scammers have been active, telling users to type commands here, stealing their wallet contents. Do not use this console without fully understanding the ramifications of a command.</source>
-        <translation>ADVERTENCIA: Estafadores han estado activos, diciendo a los usuarios que escriban comandos aquí, robando el contenido de su billetera. No use esta consola sin un completo entendimiento de las ramificaciones de un comando.</translation>
+        <source>1 &amp;hour</source>
+        <translation>1 &amp;hora</translation>
+    </message>
+    <message>
+        <source>1 &amp;week</source>
+        <translation>1 &amp;semana</translation>
+    </message>
+    <message>
+        <source>1 &amp;year</source>
+        <translation>1 &amp;año</translation>
+    </message>
+    <message>
+        <source>&amp;Unban</source>
+        <translation>&amp;Levantar prohibición</translation>
     </message>
     <message>
         <source>In:</source>
@@ -2583,6 +3560,10 @@
         <source>Network activity disabled</source>
         <translation>Actividad de red deshabilitada</translation>
     </message>
+    <message>
+        <source>None</source>
+        <translation>Ninguno</translation>
+    </message>
     <message>
         <source>Total: %1 (Enabled: %2)</source>
         <translation>Total: %1 (Enabled: %2)</translation>
@@ -2591,10 +3572,105 @@
         <source>Executing command without any wallet</source>
         <translation>Ejecutando comando sin billetera</translation>
     </message>
+    <message>
+        <source>Ctrl++</source>
+        <extracomment>Main shortcut to increase the RPC console font size.</extracomment>
+        <translation>Ctrl++</translation>
+    </message>
+    <message>
+        <source>Ctrl+=</source>
+        <extracomment>Secondary shortcut to increase the RPC console font size.</extracomment>
+        <translation>Ctrl+=</translation>
+    </message>
+    <message>
+        <source>Ctrl+-</source>
+        <extracomment>Main shortcut to decrease the RPC console font size.</extracomment>
+        <translation>Ctrl+-</translation>
+    </message>
+    <message>
+        <source>Ctrl+_</source>
+        <extracomment>Secondary shortcut to decrease the RPC console font size.</extracomment>
+        <translation>Ctrl+_</translation>
+    </message>
+    <message>
+        <source>Ctrl+Shift+I</source>
+        <translation>Ctrl+Shift+I</translation>
+    </message>
+    <message>
+        <source>Ctrl+Shift+C</source>
+        <translation>Ctrl+Shift+C</translation>
+    </message>
+    <message>
+        <source>Ctrl+Shift+G</source>
+        <translation>Ctrl+Shift+G</translation>
+    </message>
+    <message>
+        <source>Ctrl+Shift+P</source>
+        <translation>Ctrl+Shift+P</translation>
+    </message>
+    <message>
+        <source>Ctrl+Shift+R</source>
+        <translation>Ctrl+Shift+R</translation>
+    </message>
     <message>
         <source>Executing command using "%1" wallet</source>
         <translation>Ejecutando comando usando "%1" billetera</translation>
     </message>
+    <message>
+        <source>detecting: peer could be v1 or v2</source>
+        <extracomment>Explanatory text for "detecting" transport type.</extracomment>
+        <translation>Detectando: el par podría ser v1 o v2</translation>
+    </message>
+    <message>
+        <source>v1: unencrypted, plaintext transport protocol</source>
+        <extracomment>Explanatory text for v1 transport type.</extracomment>
+        <translation>v1: protocolo de transporte de texto simple y sin cifrar</translation>
+    </message>
+    <message>
+        <source>v2: BIP324 encrypted transport protocol</source>
+        <extracomment>Explanatory text for v2 transport type.</extracomment>
+        <translation>v2: Protocolo de transporte cifrado BIP324</translation>
+    </message>
+    <message>
+        <source>&amp;Copy address</source>
+        <extracomment>Context menu action to copy the address of a peer</extracomment>
+        <translation>&amp;Copiar dirección</translation>
+    </message>
+    <message>
+        <source>1 d&amp;ay</source>
+        <translation>1 d&amp;ay</translation>
+    </message>
+    <message>
+        <source>&amp;Copy IP/Netmask</source>
+        <extracomment>Context menu action to copy the IP/Netmask of a banned peer. IP/Netmask is the combination of a peer's IP address and its Netmask. For IP address see: https://en.wikipedia.org/wiki/IP_address</extracomment>
+        <translation>&amp;Copiar IP/Máscara de red</translation>
+    </message>
+    <message>
+        <source>Welcome to the %1 RPC console.
+Use up and down arrows to navigate history, and %2 to clear screen.
+Use %3 and %4 to increase or decrease the font size.
+Type %5 for an overview of available commands.
+For more information on using this console, type %6.
+
+%7WARNING: Scammers have been active, telling users to type commands here, stealing their wallet contents. Do not use this console without fully understanding the ramifications of a command.%8</source>
+        <extracomment>RPC console welcome message. Placeholders %7 and %8 are style tags for the warning content, and they are not space separated from the rest of the text intentionally.</extracomment>
+        <translation>Bienvenido a la consola RPC %1.
+Utiliza las flechas hacia arriba y hacia abajo para navegar por el historial y %2 para borrar la pantalla..
+Utiliza %3 y %4 para aumentar o disminuir el tamaño de la fuente.
+Escribe %5 para obtener una descripción general de los comandos disponibles.
+Para obtener más información sobre el uso de esta consola, escribe %6.
+
+%7ADVERTENCIA: Los estafadores han estado activos, pidiendo a los usuarios que escriban comandos aquí, robando el contenido de sus billeteras. No use esta consola sin comprender completamente las ramificaciones de un comando.%8</translation>
+    </message>
+    <message>
+        <source>Executing…</source>
+        <extracomment>A console message indicating an entered command is currently being executed.</extracomment>
+        <translation>Ejecutando…</translation>
+    </message>
+    <message>
+        <source>(peer: %1)</source>
+        <translation>(par: %1)</translation>
+    </message>
     <message>
         <source>via %1</source>
         <translation>vía %1</translation>
@@ -2611,11 +3687,19 @@
         <source>Verified Masternode</source>
         <translation>Masternodo verificado</translation>
     </message>
+    <message>
+        <source>Yes</source>
+        <translation>Si</translation>
+    </message>
     <message>
         <source>Unknown</source>
         <translation>Desconocido</translation>
     </message>
-    </context>
+    <message>
+        <source>Never</source>
+        <translation>Nunca</translation>
+    </message>
+</context>
 <context>
     <name>ReceiveCoinsDialog</name>
     <message>
@@ -2634,6 +3718,10 @@
         <source>An optional message to attach to the payment request, which will be displayed when the request is opened.&lt;br&gt;Note: The message will not be sent with the payment over the Dash network.</source>
         <translation>Un mensaje opcional para adjuntar con la solicitud de pago, el cual aparecerá cuando ésta sea abierta.&lt;br&gt;Nota: El mensaje no se enviará con el pago a la red Dash.</translation>
     </message>
+    <message>
+        <source>An optional label to associate with the new receiving address (used by you to identify an invoice).  It is also attached to the payment request.</source>
+        <translation>Etiqueta opcional que se asocia a la nueva dirección de recepción (utilizada por ti para identificar una factura). También se adjunta a la solicitud de pago.</translation>
+    </message>
     <message>
         <source>Use this form to request payments. All fields are &lt;b&gt;optional&lt;/b&gt;.</source>
         <translation>Utilice este formulario para solicitar pagos. Todos los campos son &lt;b&gt;opcionales&lt;/b&gt;.</translation>
@@ -2691,28 +3779,60 @@
         <translation>Ingresa un mensaje para adjuntar a la solicitud de pago</translation>
     </message>
     <message>
-        <source>Copy URI</source>
-        <translation>Copiar URI</translation>
+        <source>Copy &amp;URI</source>
+        <translation>Copiar &amp;URI</translation>
+    </message>
+    <message>
+        <source>&amp;Copy address</source>
+        <translation>&amp;Copiar dirección</translation>
     </message>
     <message>
-        <source>Copy address</source>
-        <translation>Copiar dirección</translation>
+        <source>Copy &amp;label</source>
+        <translation>Copiar &amp;etiqueta</translation>
     </message>
     <message>
-        <source>Copy label</source>
-        <translation>Copiar etiqueta</translation>
+        <source>Copy &amp;message</source>
+        <translation>Copiar &amp;mensaje</translation>
     </message>
     <message>
-        <source>Copy message</source>
-        <translation>Copiar mensaje</translation>
+        <source>Copy &amp;amount</source>
+        <translation>Copiar &amp;monto</translation>
     </message>
     <message>
-        <source>Copy amount</source>
-        <translation>Copiar cantidad</translation>
+        <source>Could not unlock wallet.</source>
+        <translation>No se pudo desbloquear la billetera.</translation>
     </message>
-    </context>
+    <message>
+        <source>Could not generate new address</source>
+        <translation>No se pudo generar una nueva dirección</translation>
+    </message>
+</context>
 <context>
     <name>ReceiveRequestDialog</name>
+    <message>
+        <source>Request payment to …</source>
+        <translation>Solicitar pago a…</translation>
+    </message>
+    <message>
+        <source>Address:</source>
+        <translation>Dirección:</translation>
+    </message>
+    <message>
+        <source>Amount:</source>
+        <translation>Monto:</translation>
+    </message>
+    <message>
+        <source>Label:</source>
+        <translation>Etiqueta:</translation>
+    </message>
+    <message>
+        <source>Message:</source>
+        <translation>Mensaje:</translation>
+    </message>
+    <message>
+        <source>Wallet:</source>
+        <translation>Billetera:</translation>
+    </message>
     <message>
         <source>Copy &amp;URI</source>
         <translation>Copiar &amp;URI</translation>
@@ -2765,6 +3885,34 @@
         <translation>Solicitado</translation>
     </message>
 </context>
+<context>
+    <name>RestoreWalletActivity</name>
+    <message>
+        <source>Restore Wallet</source>
+        <extracomment>Title of progress window which is displayed when wallets are being restored.</extracomment>
+        <translation>Restaurar billetera</translation>
+    </message>
+    <message>
+        <source>Restoring Wallet &lt;b&gt;%1&lt;/b&gt;…</source>
+        <extracomment>Descriptive text of the restore wallets progress window which indicates to the user that wallets are currently being restored.</extracomment>
+        <translation>Restaurando billetera &lt;b&gt;%1&lt;/b&gt;…</translation>
+    </message>
+    <message>
+        <source>Restore wallet failed</source>
+        <extracomment>Title of message box which is displayed when the wallet could not be restored.</extracomment>
+        <translation>Error al restaurar billetera</translation>
+    </message>
+    <message>
+        <source>Restore wallet warning</source>
+        <extracomment>Title of message box which is displayed when the wallet is restored with some warning.</extracomment>
+        <translation>Advertencia al restaurar billetera</translation>
+    </message>
+    <message>
+        <source>Restore wallet message</source>
+        <extracomment>Title of message box which is displayed when the wallet is successfully restored.</extracomment>
+        <translation>Mensaje de restauración de billetera</translation>
+    </message>
+</context>
 <context>
     <name>SendCoinsDialog</name>
     <message>
@@ -2799,10 +3947,6 @@
         <source>Fee:</source>
         <translation>Comisión:</translation>
     </message>
-    <message>
-        <source>Dust:</source>
-        <translation>Polvo:</translation>
-    </message>
     <message>
         <source>Inputs…</source>
         <translation>Entradas…</translation>
@@ -2827,6 +3971,14 @@
         <source>Transaction Fee:</source>
         <translation>Comisión por Transacción:</translation>
     </message>
+    <message>
+        <source>When there is less transaction volume than space in the blocks, miners as well as relaying nodes may enforce a minimum fee. Paying only this minimum fee is just fine, but be aware that this can result in a never confirming transaction once there is more demand for dash transactions than the network can process.</source>
+        <translation>Cuando el volumen de transacciones es menor que el espacio disponible en los bloques, los mineros y los nodos de retransmisión pueden imponer una comisión mínima. Pagar solo esta tarifa mínima está bien, pero ten en cuenta que esto puede provocar que la transacción nunca se confirme una vez que haya más demanda de transacciones de Dash de las que la red puede procesar.</translation>
+    </message>
+    <message>
+        <source>A too low fee might result in a never confirming transaction (read the tooltip)</source>
+        <translation>Una comisión demasiado baja puede provocar que una transacción nunca se confirme (lee la información sobre herramientas)</translation>
+    </message>
     <message>
         <source>(Smart fee not initialized yet. This usually takes a few blocks…)</source>
         <translation>(La comisión inteligente no está aún inicializada. Esto habitualmente tarda unos pocos bloques…)</translation>
@@ -2919,10 +4071,6 @@
         <source>Copy bytes</source>
         <translation>Copiar bytes</translation>
     </message>
-    <message>
-        <source>Copy dust</source>
-        <translation>Copiar polvo</translation>
-    </message>
     <message>
         <source>Copy change</source>
         <translation>Copiar cambio</translation>
@@ -2939,10 +4087,6 @@
         <source>%1 to %2</source>
         <translation>%1 a %2</translation>
     </message>
-    <message>
-        <source>Are you sure you want to send?</source>
-        <translation>¿Está seguro que desea enviar?</translation>
-    </message>
     <message>
         <source>&lt;b&gt;(%1 of %2 entries displayed)&lt;/b&gt;</source>
         <translation>&lt;b&gt;(%1 de %2 registros mostrados)&lt;/b&gt;</translation>
@@ -2955,6 +4099,18 @@
         <source>Confirm the %1 send action</source>
         <translation>Confirma la acción de envío %1</translation>
     </message>
+    <message>
+        <source>Cr&amp;eate Unsigned</source>
+        <translation>Cr&amp;eate Sin firmar</translation>
+    </message>
+    <message>
+        <source> from wallet '%1'</source>
+        <translation>desde billetera '%1'</translation>
+    </message>
+    <message>
+        <source>%1 to '%2'</source>
+        <translation>%1 para '%2'</translation>
+    </message>
     <message>
         <source>%1 funds only</source>
         <translation>Fondos de %1 solamente</translation>
@@ -2989,7 +4145,7 @@
     </message>
     <message>
         <source>Click to learn more</source>
-        <translation>Haz click para aprender mas</translation>
+        <translation>Haz clic para aprender más</translation>
     </message>
     <message>
         <source>Total Amount</source>
@@ -3003,6 +4159,51 @@
         <source>Confirm send coins</source>
         <translation>Confirmar el envío de monedas</translation>
     </message>
+    <message>
+        <source>Save Transaction Data</source>
+        <translation>Guardar datos de transacción</translation>
+    </message>
+    <message>
+        <source>PSBT saved</source>
+        <translation>PSBT guardado</translation>
+    </message>
+    <message>
+        <source>Watch-only balance:</source>
+        <translation>Saldo de solo revisión:</translation>
+    </message>
+    <message>
+        <source>Creates a Partially Signed Blockchain Transaction (PSBT) for use with e.g. an offline %1 wallet, or a PSBT-compatible hardware wallet.</source>
+        <translation>Crea una transacción de cadena de bloques parcialmente firmada (PSBT) para usar, por ejemplo, con una billetera %1 fuera de línea o una billetera de hardware compatible con PSBT.</translation>
+    </message>
+    <message>
+        <source>Do you want to create this transaction?</source>
+        <extracomment>Message displayed when attempting to create a transaction. Cautionary text to prompt the user to verify that the displayed transaction details represent the transaction the user intends to create.</extracomment>
+        <translation>¿Quieres crear esta transacción?</translation>
+    </message>
+    <message>
+        <source>Please, review your transaction proposal. This will produce a Partially Signed Blockchain Transaction (PSBT) which you can save or copy and then sign with e.g. an offline %1 wallet, or a PSBT-compatible hardware wallet.</source>
+        <extracomment>Text to inform a user attempting to create a transaction of their current options. At this stage, a user can only create a PSBT. This string is displayed when private keys are disabled and an external signer is not available.</extracomment>
+        <translation>Por favor, revisa tu propuesta de transacción. Esto producirá una Transacción de Cadena de Bloques Parcialmente Firmada (PSBT) que puedes guardar o copiar y luego firmar con, por ejemplo, una billetera %1 fuera de línea o una billetera de hardware compatible con PSBT.</translation>
+    </message>
+    <message>
+        <source>Please, review your transaction. You can create and send this transaction or create a Partially Signed Blockchain Transaction (PSBT), which you can save or copy and then sign with, e.g., an offline %1 wallet, or a PSBT-compatible hardware wallet.</source>
+        <extracomment>Text to inform a user attempting to create a transaction of their current options. At this stage, a user can send their transaction or create a PSBT. This string is displayed when both private keys and PSBT controls are enabled.</extracomment>
+        <translation>Por favor, revisa tu transacción. Puedes crear y enviar esta transacción o crear una Transacción de Cadena de Bloques Parcialmente Firmada (PSBT), que puedes guardar o copiar y luego firmar con, por ejemplo, una billetera %1 fuera de línea o una billetera de hardware compatible con PSBT.</translation>
+    </message>
+    <message>
+        <source>Please, review your transaction.</source>
+        <extracomment>Text to prompt a user to review the details of the transaction they are attempting to send.</extracomment>
+        <translation>Por favor, revisa tu transacción.</translation>
+    </message>
+    <message>
+        <source>To review recipient list click "Show Details…"</source>
+        <translation>Para revisar la lista de destinatarios, haz clic en "Mostrar detalles..."</translation>
+    </message>
+    <message>
+        <source>Partially Signed Transaction (Binary)</source>
+        <extracomment>Expanded name of the binary PSBT file format. See: BIP 174.</extracomment>
+        <translation>Transacción parcialmente firmada (binaria)</translation>
+    </message>
     <message>
         <source>The recipient address is not valid. Please recheck.</source>
         <translation>La dirección del destinatario no es válida. Por favor, verifíquela nuevamente.</translation>
@@ -3122,21 +4323,16 @@
         <source>A message that was attached to the dash: URI which will be stored with the transaction for your reference. Note: This message will not be sent over the Dash network.</source>
         <translation>Un mensaje que se adjuntó al Dash: URI que será almacenada con la transacción para su referencia. Nota: Este mensaje no se enviará a través de la red Dash.</translation>
     </message>
+</context>
+<context>
+    <name>SendConfirmationDialog</name>
     <message>
-        <source>This is an unauthenticated payment request.</source>
-        <translation>Esta es una solicitud de pago no autenticada.</translation>
-    </message>
-    <message>
-        <source>This is an authenticated payment request.</source>
-        <translation>Esta es una solicitud de pago autenticada.</translation>
-    </message>
-    <message>
-        <source>Pay To:</source>
-        <translation>Pagar a:</translation>
+        <source>Send</source>
+        <translation>Enviar</translation>
     </message>
     <message>
-        <source>Memo:</source>
-        <translation>Memo:</translation>
+        <source>Create Unsigned</source>
+        <translation>Crear sin firmar</translation>
     </message>
 </context>
 <context>
@@ -3276,6 +4472,10 @@
         <source>Wallet unlock was cancelled.</source>
         <translation>Se ha cancelado el desbloqueo de la billetera.</translation>
     </message>
+    <message>
+        <source>No error</source>
+        <translation>No hay error</translation>
+    </message>
     <message>
         <source>Private key for the entered address is not available.</source>
         <translation>No se dispone de la llave privada para la dirección introducida.</translation>
@@ -3301,19 +4501,30 @@
         <translation>La firma no coincide con el resumen del mensaje.</translation>
     </message>
     <message>
-        <source>Message verification failed.</source>
-        <translation>Ha fallado la verificación del mensaje.</translation>
+        <source>Message verification failed.</source>
+        <translation>Ha fallado la verificación del mensaje.</translation>
+    </message>
+    <message>
+        <source>Message verified.</source>
+        <translation>Mensaje verificado.</translation>
+    </message>
+</context>
+<context>
+    <name>SplashScreen</name>
+    <message>
+        <source>(press q to shutdown and continue later)</source>
+        <translation>(presiona q para apagar y continuar más tarde)</translation>
     </message>
     <message>
-        <source>Message verified.</source>
-        <translation>Mensaje verificado.</translation>
+        <source>press q to shutdown</source>
+        <translation>Presiona q para apagar</translation>
     </message>
 </context>
 <context>
     <name>TrafficGraphWidget</name>
     <message>
-        <source>KB/s</source>
-        <translation>KB/s</translation>
+        <source>kB/s</source>
+        <translation>kB/s</translation>
     </message>
     <message>
         <source>Total</source>
@@ -3330,20 +4541,9 @@
 </context>
 <context>
     <name>TransactionDesc</name>
-    <message numerus="yes">
-        <source>Open for %n more block(s)</source>
-        <translation><numerusform>Abrir para %n bloque más</numerusform><numerusform>Abrir para %n bloques más</numerusform><numerusform>Abrir para %n bloques más</numerusform></translation>
-    </message>
-    <message>
-        <source>Open until %1</source>
-        <translation>Abierto hasta %1</translation>
-    </message>
-    <message>
-        <source>conflicted</source>
-        <translation>en conflicto</translation>
-    </message>
     <message>
         <source>0/unconfirmed, %1</source>
+        <extracomment>Text explaining the current status of a transaction, shown in the status field of the details window for this transaction. This status represents an unconfirmed transaction that is in the memory pool.</extracomment>
         <translation>0/no confirmado, %1</translation>
     </message>
     <message>
@@ -3356,22 +4556,32 @@
     </message>
     <message>
         <source>abandoned</source>
+        <extracomment>Text explaining the current status of a transaction, shown in the status field of the details window for this transaction. This status represents an abandoned transaction.</extracomment>
         <translation>Abandonado</translation>
     </message>
+    <message>
+        <source>conflicted with a transaction with %1 confirmations</source>
+        <extracomment>Text explaining the current status of a transaction, shown in the status field of the details window for this transaction. This status represents an unconfirmed transaction that conflicts with a confirmed transaction.</extracomment>
+        <translation>en conflicto con una transacción con %1 confirmaciones</translation>
+    </message>
     <message>
         <source>%1/unconfirmed</source>
+        <extracomment>Text explaining the current status of a transaction, shown in the status field of the details window for this transaction. This status represents a transaction confirmed in at least one block, but less than 6 blocks, and still not locked via ChainLocks.</extracomment>
         <translation>%1/no confirmado</translation>
     </message>
     <message>
         <source>%1 confirmations</source>
+        <extracomment>Text explaining the current status of a transaction, shown in the status field of the details window for this transaction. This status represents a transaction confirmed in 6 or more blocks or locked via ChainLocks.</extracomment>
         <translation>%1 confirmaciones</translation>
     </message>
     <message>
         <source>locked via ChainLocks</source>
+        <extracomment>Text explaining the current status of a transaction, shown in the status field of the details window for this transaction. This status represents a transaction confirmed in at least one block and has been locked by ChainLocks.</extracomment>
         <translation>bloqueado por cerraduras de cadena</translation>
     </message>
     <message>
         <source>verified via InstantSend</source>
+        <extracomment>Text explaining the current status of a transaction, shown in the status field of the details window for this transaction. This status represents an unconfirmed transaction that has been locked by InstantSend.</extracomment>
         <translation>verificado a través de InstantSend</translation>
     </message>
     <message>
@@ -3390,6 +4600,10 @@
         <source>Generated</source>
         <translation>Generado</translation>
     </message>
+    <message>
+        <source>Platform Transfer</source>
+        <translation>Transferencia de plataforma</translation>
+    </message>
     <message>
         <source>From</source>
         <translation>De</translation>
@@ -3520,14 +4734,6 @@
         <source>Address / Label</source>
         <translation>Direccion / Etiqueta</translation>
     </message>
-    <message numerus="yes">
-        <source>Open for %n more block(s)</source>
-        <translation><numerusform>Abrir para %n bloque más</numerusform><numerusform>Abrir para %n bloques más</numerusform><numerusform>Abrir para %n bloques más</numerusform></translation>
-    </message>
-    <message>
-        <source>Open until %1</source>
-        <translation>Abierto hasta %1</translation>
-    </message>
     <message>
         <source>Unconfirmed</source>
         <translation>Sin confirmar</translation>
@@ -3588,6 +4794,10 @@
         <source>Mined</source>
         <translation>Minado</translation>
     </message>
+    <message>
+        <source>Platform Transfer</source>
+        <translation>Transferencia de plataforma</translation>
+    </message>
     <message>
         <source>%1 Mixing</source>
         <translation>Mezclar %1</translation>
@@ -3715,6 +4925,10 @@
         <source>Mined</source>
         <translation>Minado</translation>
     </message>
+    <message>
+        <source>Platform Transfer</source>
+        <translation>Transferencia de plataforma</translation>
+    </message>
     <message>
         <source>Other</source>
         <translation>Otra</translation>
@@ -3728,49 +4942,63 @@
         <translation>Cantidad mínima</translation>
     </message>
     <message>
-        <source>Abandon transaction</source>
-        <translation>Transacción abandonada</translation>
+        <source>&amp;Copy address</source>
+        <translation>&amp;Copiar dirección</translation>
     </message>
     <message>
-        <source>Copy address</source>
-        <translation>Copiar dirección</translation>
+        <source>Copy &amp;label</source>
+        <translation>Copiar &amp;etiqueta</translation>
     </message>
     <message>
-        <source>Copy label</source>
-        <translation>Copiar etiqueta</translation>
+        <source>Copy &amp;amount</source>
+        <translation>Copiar &amp;monto</translation>
     </message>
     <message>
-        <source>Copy amount</source>
-        <translation>Copiar cantidad</translation>
+        <source>Copy transaction &amp;ID</source>
+        <translation>Copiar transacción &amp;ID</translation>
     </message>
     <message>
-        <source>Copy transaction ID</source>
-        <translation>Copiar ID de transacción</translation>
+        <source>Copy &amp;raw transaction</source>
+        <translation>Copiar &amp;procesar transacción</translation>
     </message>
     <message>
-        <source>Copy raw transaction</source>
-        <translation>Copiar transacción raw</translation>
+        <source>Copy full transaction &amp;details</source>
+        <translation>Copiar la transacción completa &amp;detalles</translation>
     </message>
     <message>
-        <source>Copy full transaction details</source>
-        <translation>Copiar todos los detalles de la transacción</translation>
+        <source>&amp;Show transaction details</source>
+        <translation>&amp;Mostrar detalles de la transacción</translation>
     </message>
     <message>
-        <source>Edit address label</source>
-        <translation>Editar etiqueta de dirección</translation>
+        <source>A&amp;bandon transaction</source>
+        <translation>Transacción A&amp;bandon</translation>
     </message>
     <message>
-        <source>Show transaction details</source>
-        <translation>Mostrar detalles de la transacción</translation>
+        <source>Rese&amp;nd transaction</source>
+        <translation>Rese&amp;nd transacción</translation>
     </message>
     <message>
-        <source>Show address QR code</source>
-        <translation>Mostrar dirección en QR</translation>
+        <source>&amp;Edit address label</source>
+        <translation>&amp;Editar etiqueta de dirección</translation>
+    </message>
+    <message>
+        <source>Show address &amp;QR code</source>
+        <translation>Mostrar dirección &amp;código QR</translation>
+    </message>
+    <message>
+        <source>Show in %1</source>
+        <extracomment>Transactions table context menu action to show the selected transaction in a third-party block explorer. %1 is a stand-in argument for the URL of the explorer.</extracomment>
+        <translation>Mostrar en %1</translation>
     </message>
     <message>
         <source>Export Transaction History</source>
         <translation>Exportar historial de transacciones</translation>
     </message>
+    <message>
+        <source>Comma separated file</source>
+        <extracomment>Expanded name of the CSV file format. See: https://en.wikipedia.org/wiki/Comma-separated_values.</extracomment>
+        <translation>Archivo separado por comas</translation>
+    </message>
     <message>
         <source>Confirmed</source>
         <translation>Confirmado</translation>
@@ -3849,10 +5077,54 @@
         <source>Closing the wallet for too long can result in having to resync the entire chain if pruning is enabled.</source>
         <translation>Cerrar la billetera por mucho tiempo puede resultar en tener que volver a sincronizar toda la cadena si el despeje está habilitado.</translation>
     </message>
-    </context>
+    <message>
+        <source>Close all wallets</source>
+        <translation>Cerrar todas las billeteras</translation>
+    </message>
+    <message>
+        <source>Are you sure you wish to close all wallets?</source>
+        <translation>¿Estás seguro de que deseas cerrar todas las billeteras?</translation>
+    </message>
+</context>
 <context>
     <name>WalletFrame</name>
-    </context>
+    <message>
+        <source>No wallet has been loaded.
+Go to File &gt; Open Wallet to load a wallet.
+- OR -</source>
+        <translation>No se ha cargado ninguna billetera.
+Ve a Archivo &gt; Abrir billetera para cargar una billetera.
+- OR -</translation>
+    </message>
+    <message>
+        <source>Create a new wallet</source>
+        <translation>Crear una nueva billetera</translation>
+    </message>
+    <message>
+        <source>Error</source>
+        <translation>Error</translation>
+    </message>
+    <message>
+        <source>Unable to decode PSBT from clipboard (invalid base64)</source>
+        <translation>No se puede decodificar PSBT desde el portapapeles (base64 no válido)</translation>
+    </message>
+    <message>
+        <source>Load Transaction Data</source>
+        <translation>Cargar datos de transacción</translation>
+    </message>
+    <message>
+        <source>Partially Signed Transaction (*.psbt)</source>
+        <translation>Transacción parcialmente firmada (*.psbt)</translation>
+    </message>
+    <message>
+        <source>PSBT file must be smaller than 100 MiB</source>
+        <translation>El archivo PSBT debe ser menor a 100 MiB</translation>
+    </message>
+    <message>
+        <source>Unable to decode PSBT</source>
+        <translation>No se puede decodificar PSBT</translation>
+    </message>
+</context>
 <context>
     <name>WalletModel</name>
     <message>
@@ -3878,6 +5150,11 @@
         <source>Selected amount:</source>
         <translation>Cantidad seleccionada:</translation>
     </message>
+    <message>
+        <source>Wallet Data</source>
+        <extracomment>Name of the wallet data file format.</extracomment>
+        <translation>Datos de la billetera</translation>
+    </message>
     <message>
         <source>Backup Wallet</source>
         <translation>Copia de Seguridad de la billetera</translation>
@@ -3905,14 +5182,6 @@
 </context>
 <context>
     <name>dash-core</name>
-    <message>
-        <source>Error: Listening for incoming connections failed (listen returned error %s)</source>
-        <translation>Error: Ha fallado la "escucha" de conexiones entrantes ("Escucha" ha devuelto el error %s)</translation>
-    </message>
-    <message>
-        <source>Fee estimation failed. Fallbackfee is disabled. Wait a few blocks or enable -fallbackfee.</source>
-        <translation>No se ha podido calcular la comisión. La comisión alternativa está deshabilitada. Espera unos bloques o habilitea -fallbackfee.</translation>
-    </message>
     <message>
         <source>This error could occur if this wallet was not shutdown cleanly and was last loaded using a build with a newer version of Berkeley DB. If so, please use the software that last loaded this wallet</source>
         <translation>Este error podría ocurrir si esta billetera no se cerró correctamente y se cargó por última vez usando una compilación con una versión más nueva de Berkeley DB. Si es así, utiliza el software que cargaste por última vez en esta billetera</translation>
@@ -3970,16 +5239,20 @@
         <translation>Error leyendo la base de datos, cerrando.</translation>
     </message>
     <message>
-        <source>Failed to listen on any port. Use -listen=0 if you want this.</source>
-        <translation>Error al escuchar cualquier puerto. Use -listen=0 si desea esto.</translation>
+        <source>Error: Missing checksum</source>
+        <translation>Error: falta suma de comprobación</translation>
     </message>
     <message>
-        <source>-maxtxfee is set very high! Fees this large could be paid on a single transaction.</source>
-        <translation>-maxtxfee tiene un ajuste muy elevado! Comisiones muy grandes podrían ser pagadas en una única transaccion.</translation>
+        <source>Error: Unable to parse version %u as a uint32_t</source>
+        <translation>Error: No se puede analizar la versión %u como uint32_t</translation>
     </message>
     <message>
-        <source>Cannot provide specific connections and have addrman find outgoing connections at the same.</source>
-        <translation>No se pueden proporcionar conexiones específicas y hacer que addrman encuentre conexiones salientes al mismo tiempo.</translation>
+        <source>Error: Unable to write record to new wallet</source>
+        <translation>Error: No se puede escribir el registro en la nueva billetera</translation>
+    </message>
+    <message>
+        <source>Failed to listen on any port. Use -listen=0 if you want this.</source>
+        <translation>Error al escuchar cualquier puerto. Use -listen=0 si desea esto.</translation>
     </message>
     <message>
         <source>Found unconfirmed denominated outputs, will wait till they confirm to continue.</source>
@@ -3990,13 +5263,17 @@
         <translation>Inválido -socketevents ('%s') especificado. Solo se admiten estos modos: %s</translation>
     </message>
     <message>
-        <source>Invalid amount for -maxtxfee=&lt;amount&gt;: '%s' (must be at least the minrelay fee of %s to prevent stuck transactions)</source>
-        <translation>Cantidad inválida para -maxtxfee=&lt;amount&gt;: '%s' (debe de ser al menos la comisión mínima de %s para evitar transacciones atascadas)</translation>
+        <source>SQLiteDatabase: Unknown sqlite wallet schema version %d. Only version %d is supported</source>
+        <translation>SQLiteDatabase: Se desconoce la versión %d del esquema de billetera SQLite. Solo se admite la versión %d</translation>
     </message>
     <message>
         <source>Transaction index can't be disabled with governance validation enabled. Either start with -disablegovernance command line switch or enable transaction index.</source>
         <translation>El índice de transacciones no se puede deshabilitar con la validación de gobernanza habilitada. Empieza con el interruptor de línea de comando -disablegovernance o habilita el índice de transacciones.</translation>
     </message>
+    <message>
+        <source>Unsupported category-specific logging level -loglevel=%s. Expected -loglevel=&lt;category&gt;:&lt;loglevel&gt;. Valid categories: %s. Valid loglevels: %s.</source>
+        <translation>Nivel de registro específico de categoría no compatible -loglevel=%s. se espera -loglevel=&lt;category&gt;:&lt;loglevel&gt;. Categorías válidas: %s. Valid loglevels: %s.</translation>
+    </message>
     <message>
         <source>Can't mix: no compatible inputs found!</source>
         <translation>No se puede mezclar: ¡fondos de entrada no compatibles!</translation>
@@ -4005,6 +5282,14 @@
         <source>Entry exceeds maximum size.</source>
         <translation>Entrada exceden el tamaño máximo.</translation>
     </message>
+    <message>
+        <source>Error upgrading evo database for EHF</source>
+        <translation>Error al actualizar la base de datos de Evo para EHF</translation>
+    </message>
+    <message>
+        <source>Failed to commit Evo database</source>
+        <translation>No se pudo confirmar la base de datos de Evo</translation>
+    </message>
     <message>
         <source>Found enough users, signing ( waiting %s )</source>
         <translation>Se encontraron suficientes usuarios, firmando (esperando %s)</translation>
@@ -4029,18 +5314,14 @@
         <source>Insufficient funds.</source>
         <translation>Fondos insuficientes.</translation>
     </message>
-    <message>
-        <source>Invalid amount for -discardfee=&lt;amount&gt;: '%s'</source>
-        <translation>Cuantía inválida para -discardfee=&lt;amount&gt;: '%s'</translation>
-    </message>
-    <message>
-        <source>Invalid amount for -paytxfee=&lt;amount&gt;: '%s' (must be at least %s)</source>
-        <translation>Cantidad inválida para -paytxfee=&lt;amount&gt;: '%s' (debe ser al menos %s)</translation>
-    </message>
     <message>
         <source>Invalid minimum number of spork signers specified with -minsporkkeys</source>
         <translation>Número mínimo inválido de firmantes de spork especificados con -minsporkkeys</translation>
     </message>
+    <message>
+        <source>Listening for incoming connections failed (listen returned error %s)</source>
+        <translation>Error al escuchar conexiones entrantes (la escucha devolvió el error %s)</translation>
+    </message>
     <message>
         <source>Lock is already in place.</source>
         <translation>El bloqueo ya está activo.</translation>
@@ -4097,6 +5378,10 @@
         <source>Synchronizing governance objects…</source>
         <translation>Sincronizando objetos de gobernanza…</translation>
     </message>
+    <message>
+        <source>Transaction change output index out of range</source>
+        <translation>El índice de salida del cambio de transacción está fuera de rango</translation>
+    </message>
     <message>
         <source>Unable to start HTTP server. See debug log for details.</source>
         <translation>No se ha podido iniciar el servidor HTTP. Ver registro de depuración para detalles.</translation>
@@ -4105,6 +5390,10 @@
         <source>Unknown response.</source>
         <translation>Respuesta desconocida.</translation>
     </message>
+    <message>
+        <source>Unsupported global logging level -loglevel=%s. Valid values: %s.</source>
+        <translation>Nivel de registro global no compatible: -loglevel=%s. Valores válidos: %s.</translation>
+    </message>
     <message>
         <source>User Agent comment (%s) contains unsafe characters.</source>
         <translation>El comentario del Agente de Usuario (%s) contiene caracteres inseguros.</translation>
@@ -4145,17 +5434,21 @@
         <source>Make sure to encrypt your wallet and delete all non-encrypted backups after you have verified that the wallet works!</source>
         <translation>¡Asegúrate de encriptar tu billetera y eliminar todas las copias de seguridad no encriptadas después de haber verificado que la billetera funciona!</translation>
     </message>
+    <message>
+        <source>More than one onion bind address is provided. Using %s for the automatically created Tor onion service.</source>
+        <translation>Se proporciona más de una dirección de enlace Onion. Se utiliza %s para el servicio Onion de Tor creado automáticamente.</translation>
+    </message>
     <message>
         <source>Prune configured below the minimum of %d MiB.  Please use a higher number.</source>
-        <translation>La Poda se ha configurado por debajo del minimo de %d MiB. Por favor utiliza un valor mas alto.</translation>
+        <translation>La Poda se ha configurado por debajo del mínimo de %d MiB. Por favor utiliza un valor más alto.</translation>
     </message>
     <message>
         <source>Prune: last wallet synchronisation goes beyond pruned data. You need to -reindex (download the whole blockchain again in case of pruned node)</source>
-        <translation>Poda: la ultima sincronizacion de la billetera sobrepasa los datos podados. Necesitas reindexar con -reindex (o descargar la cadena de bloques de nuevo en el caso de un nodo podado)</translation>
+        <translation>Poda: la última sincronización de la billetera sobrepasa los datos podados. Necesitas reindexar con -reindex (o descargar la cadena de bloques de nuevo en el caso de un nodo podado)</translation>
     </message>
     <message>
         <source>The block database contains a block which appears to be from the future. This may be due to your computer's date and time being set incorrectly. Only rebuild the block database if you are sure that your computer's date and time are correct</source>
-        <translation>La base de datos de bloques contiene un bloque que parece ser del futuro. Esto puede ser porque la fecha y hora de tu ordenador están mal ajustados. Reconstruye la base de datos de bloques solo si estas seguro de que la fecha y hora de tu ordenador estan ajustados correctamente.</translation>
+        <translation>La base de datos de bloques contiene un bloque que parece ser del futuro. Esto puede ser porque la fecha y hora de tu ordenador están mal ajustados. Reconstruye la base de datos de bloques solo si estas seguro de que la fecha y hora de tu ordenador están ajustados correctamente.</translation>
     </message>
     <message>
         <source>The transaction amount is too small to send after the fee has been deducted</source>
@@ -4173,10 +5466,6 @@
         <source>Wallet is locked, can't replenish keypool! Automatic backups and mixing are disabled, please unlock your wallet to replenish keypool.</source>
         <translation>¡La billetera esta bloqueado, no se puede reponer keypool! Copias de seguridad automáticas y mezclado están deshabilitados, por favor desbloquee su billetera para reponer keypool.</translation>
     </message>
-    <message>
-        <source>You need to rebuild the database using -reindex to change -timestampindex</source>
-        <translation>Necesitas reconstruir la base de datos usando -reindex para cambiar -timestampindex</translation>
-    </message>
     <message>
         <source>You need to rebuild the database using -reindex to go back to unpruned mode.  This will redownload the entire blockchain</source>
         <translation>Necesitas reconstruir la base de datos utilizando -reindex para volver al modo sin poda. Esto volverá a descargar toda la cadena de bloques</translation>
@@ -4218,20 +5507,32 @@
         <translation>Error al cargar %s: las claves privadas solo se pueden deshabilitar durante la creación</translation>
     </message>
     <message>
-        <source>Error upgrading evo database</source>
-        <translation>Error al actualizar la base de datos evo</translation>
+        <source>Error: Couldn't create cursor into database</source>
+        <translation>Error: No se pudo crear el cursor en la base de datos</translation>
     </message>
     <message>
         <source>Error: Disk space is low for %s</source>
         <translation>Error: el espacio en disco es bajo para %s</translation>
     </message>
     <message>
-        <source>Exceeded max tries.</source>
-        <translation>Se superó el máximo de intentos.</translation>
+        <source>Error: Dumpfile checksum does not match. Computed %s, expected %s</source>
+        <translation>Error: la suma de comprobación del archivo de volcado no coincide. Se ha calculado %s, se esperaba %s</translation>
+    </message>
+    <message>
+        <source>Error: Got key that was not hex: %s</source>
+        <translation>Error: Obtuve una clave que no era hexadecimal: %s</translation>
+    </message>
+    <message>
+        <source>Error: Got value that was not hex: %s</source>
+        <translation>Error: Obtuve un valor que no era hexadecimal: %s</translation>
+    </message>
+    <message>
+        <source>Error: Keypool ran out, please call keypoolrefill first</source>
+        <translation>Error: Keypool se agotó, llama primero a keypoolrefill</translation>
     </message>
     <message>
-        <source>Failed to commit EvoDB</source>
-        <translation>No se pudo cometer EvoDB</translation>
+        <source>Error: No addresses available.</source>
+        <translation>Error: No hay direcciones disponibles.</translation>
     </message>
     <message>
         <source>Failed to create backup %s!</source>
@@ -4249,17 +5550,29 @@
         <source>Failed to rescan the wallet during initialization</source>
         <translation>No se pudo volver a escanear la billetera durante la inicialización</translation>
     </message>
+    <message>
+        <source>Failed to verify database</source>
+        <translation>No se pudo verificar la base de datos</translation>
+    </message>
+    <message>
+        <source>Fee rate (%s) is lower than the minimum fee rate setting (%s)</source>
+        <translation>La tasa de comisión (%s) es inferior a la configuración de la tasa de comisión mínima (%s)</translation>
+    </message>
     <message>
         <source>Found enough users, signing…</source>
         <translation>Se encontraron suficientes usuarios, firmando…</translation>
     </message>
     <message>
-        <source>Invalid P2P permission: '%s'</source>
-        <translation>Permiso P2P no válido: '%s'</translation>
+        <source>Ignoring duplicate -wallet %s.</source>
+        <translation>Ignorando el duplicado -wallet %s.</translation>
+    </message>
+    <message>
+        <source>Input not found or already spent</source>
+        <translation>Entrada no encontrada o ya gastada</translation>
     </message>
     <message>
-        <source>Invalid amount for -fallbackfee=&lt;amount&gt;: '%s'</source>
-        <translation>Cantidad inválida para -fallbackfee=&lt;amount&gt;: '%s'</translation>
+        <source>Invalid P2P permission: '%s'</source>
+        <translation>Permiso P2P no válido: '%s'</translation>
     </message>
     <message>
         <source>Invalid masternodeblsprivkey. Please see documentation.</source>
@@ -4281,6 +5594,10 @@
         <source>Mixing in progress…</source>
         <translation>Mezclado en curso…</translation>
     </message>
+    <message>
+        <source>No addresses available</source>
+        <translation>No hay direcciones disponibles</translation>
+    </message>
     <message>
         <source>No errors detected.</source>
         <translation>No hay errores detectados.</translation>
@@ -4309,6 +5626,22 @@
         <source>Prune mode is incompatible with -txindex.</source>
         <translation>El modo recorte es incompatible con -txindex.</translation>
     </message>
+    <message>
+        <source>SQLiteDatabase: Failed to execute statement to verify database: %s</source>
+        <translation>SQLiteDatabase: No se pudo ejecutar la declaración para verificar la base de datos: %s</translation>
+    </message>
+    <message>
+        <source>SQLiteDatabase: Failed to prepare statement to verify database: %s</source>
+        <translation>SQLiteDatabase: No se pudo preparar la declaración para verificar la base de datos: %s</translation>
+    </message>
+    <message>
+        <source>SQLiteDatabase: Failed to read database verification error: %s</source>
+        <translation>SQLiteDatabase: Error al leer la verificación de la base de datos: %s</translation>
+    </message>
+    <message>
+        <source>SQLiteDatabase: Unexpected application id. Expected %u, got %u</source>
+        <translation>SQLiteDatabase: ID de aplicación inesperada. Se esperaba %u, se obtuvo %u</translation>
+    </message>
     <message>
         <source>Section [%s] is not recognized.</source>
         <translation>La sección [%s] no se reconoce</translation>
@@ -4341,6 +5674,10 @@
         <source>This is the transaction fee you will pay if you send a transaction.</source>
         <translation>Esta es la cuota de transacción que pagará si envía una transacción.</translation>
     </message>
+    <message>
+        <source>Topping up keypool…</source>
+        <translation>Recargando el pool de claves…</translation>
+    </message>
     <message>
         <source>Transaction amounts must not be negative</source>
         <translation>Los montos de transacción no deben ser negativos</translation>
@@ -4369,13 +5706,17 @@
         <source>Unable to generate initial keys</source>
         <translation>No se pueden generar llaves iniciales</translation>
     </message>
+    <message>
+        <source>Unable to open %s for writing</source>
+        <translation>No se puede abrir %s para escribir</translation>
+    </message>
     <message>
         <source>Unknown -blockfilterindex value %s.</source>
         <translation>Valor -blockfilterindex desconocido %s.</translation>
     </message>
     <message>
-        <source>Upgrading UTXO database</source>
-        <translation>Actualizando la base de datos UTXO</translation>
+        <source>Unknown new rules activated (versionbit %i)</source>
+        <translation>Nuevas reglas desconocidas activadas (versionbit %i)</translation>
     </message>
     <message>
         <source>Verifying blocks…</source>
@@ -4394,16 +5735,12 @@
         <translation>¡No es posible crear carpeta de copia de seguridad de la billetera %s!</translation>
     </message>
     <message>
-        <source>You can not start a masternode with wallet enabled.</source>
-        <translation>No puedes iniciar un masternode con billetera habilitada.</translation>
-    </message>
-    <message>
-        <source>You need to rebuild the database using -reindex to change -addressindex</source>
-        <translation>Necesita reconstruir la base de datos usando -reindex para cambiar -addressindex</translation>
+        <source>Wiping wallet transactions…</source>
+        <translation>Borrando transacciones de billetera…</translation>
     </message>
     <message>
-        <source>You need to rebuild the database using -reindex to change -spentindex</source>
-        <translation>Necesita reconstruir la base de datos usando -reindex para cambiar -spentindex</translation>
+        <source>You can not start a masternode with wallet enabled.</source>
+        <translation>No puedes iniciar un masternode con billetera habilitada.</translation>
     </message>
     <message>
         <source>no mixing available.</source>
@@ -4421,6 +5758,22 @@
         <source>%s uses exact denominated amounts to send funds, you might simply need to mix some more coins.</source>
         <translation>%s usa cantidades denominadas exactas para enviar fondos, probablemente solo tengas que mezclar algunas otras monedas.</translation>
     </message>
+    <message>
+        <source>-reindex-chainstate option is not compatible with -blockfilterindex. Please temporarily disable blockfilterindex while using -reindex-chainstate, or replace -reindex-chainstate with -reindex to fully rebuild all indexes.</source>
+        <translation>La opción -reindex-chainstate no es compatible con -blockfilterindex. Desactiva temporalmente blockfilterindex mientras utilizas -reindex-chainstate o reemplaza -reindex-chainstate con -reindex para reconstruir por completo todos los índices.</translation>
+    </message>
+    <message>
+        <source>-reindex-chainstate option is not compatible with -coinstatsindex. Please temporarily disable coinstatsindex while using -reindex-chainstate, or replace -reindex-chainstate with -reindex to fully rebuild all indexes.</source>
+        <translation>La opción -reindex-chainstate no es compatible con -coinstatsindex. Desactiva temporalmente coinstatsindex mientras usas -reindex-chainstate o reemplaza -reindex-chainstate con -reindex para reconstruir por completo todos los índices.</translation>
+    </message>
+    <message>
+        <source>-reindex-chainstate option is not compatible with -txindex. Please temporarily disable txindex while using -reindex-chainstate, or replace -reindex-chainstate with -reindex to fully rebuild all indexes.</source>
+        <translation>La opción -reindex-chainstate no es compatible con -txindex. Desactiva temporalmente txindex mientras utilizas -reindex-chainstate o reemplaza -reindex-chainstate por -reindex para reconstruir por completo todos los índices.</translation>
+    </message>
+    <message>
+        <source>Cannot downgrade wallet from version %i to version %i. Wallet version unchanged.</source>
+        <translation>No se puede degradar la billetera de la versión %i a la versión %i. La versión de la billetera no ha cambiado.</translation>
+    </message>
     <message>
         <source>Cannot obtain a lock on data directory %s. %s is probably already running.</source>
         <translation>No se puede bloquear el directorio %s. %s ya se está ejecutando.</translation>
@@ -4433,21 +5786,97 @@
         <source>Error loading %s: You can't enable HD on an already existing non-HD wallet</source>
         <translation>Error cargando %s: No puede habilitar HD en una billetera non-HD existente.</translation>
     </message>
+    <message>
+        <source>Error loading wallet. Wallet requires blocks to be downloaded, and software does not currently support loading wallets while blocks are being downloaded out of order when using assumeutxo snapshots. Wallet should be able to load successfully after node sync reaches height %s</source>
+        <translation>Error al cargar la billetera. La billetera requiere que se descarguen bloques y el software actualmente no admite la carga de billeteras mientras se descargan bloques fuera de orden al usar snapshots de supposedutxo. La billetera debería poder cargarse correctamente después de que la sincronización de nodos alcance la altura %s</translation>
+    </message>
     <message>
         <source>Error reading %s! All keys read correctly, but transaction data or address book entries might be missing or incorrect.</source>
         <translation>Error leyendo %s!. Todas las llaves se han leído correctamente, pero los datos de transacciones o la libreta de direcciones pueden faltar o ser incorrectos.</translation>
     </message>
+    <message>
+        <source>Error: Dumpfile format record is incorrect. Got "%s", expected "format".</source>
+        <translation>Error: el registro de formato del archivo de volcado es incorrecto. Se obtuvo "%s", se esperaba "formato".</translation>
+    </message>
+    <message>
+        <source>Error: Dumpfile identifier record is incorrect. Got "%s", expected "%s".</source>
+        <translation>Error: el registro del identificador del archivo de volcado es incorrecto. Se obtuvo "%s", se esperaba "%s".</translation>
+    </message>
+    <message>
+        <source>Error: Dumpfile version is not supported. This version of bitcoin-wallet only supports version 1 dumpfiles. Got dumpfile with version %s</source>
+        <translation>Error: La versión del archivo de volcado no es compatible. Esta versión de la billetera de bitcoin solo admite archivos de volcado de la versión 1. Se obtuvo un archivo de volcado con la versión %s</translation>
+    </message>
+    <message>
+        <source>Failed to rename invalid peers.dat file. Please move or delete it and try again.</source>
+        <translation>No se pudo cambiar el nombre del archivo peers.dat no válido. Muévelo o elimínalo y vuelve a intentarlo.</translation>
+    </message>
+    <message>
+        <source>Fee estimation failed. Fallbackfee is disabled. Wait a few blocks or enable %s.</source>
+        <translation>La estimación de tarifa falló. Fallbackfee está deshabilitado. Espera unos bloques o habilita %s.</translation>
+    </message>
+    <message>
+        <source>File %s already exists. If you are sure this is what you want, move it out of the way first.</source>
+        <translation>El archivo %s ya existe. Si estás seguro de que es lo que quieres, quítalo primero.</translation>
+    </message>
+    <message>
+        <source>Incompatible options: -dnsseed=1 was explicitly specified, but -onlynet forbids connections to IPv4/IPv6</source>
+        <translation>Opciones incompatibles: -dnsseed=1 se especificó explícitamente, pero -onlynet prohíbe las conexiones a IPv4/IPv6</translation>
+    </message>
     <message>
         <source>Incorrect or no devnet genesis block found. Wrong datadir for devnet specified?</source>
         <translation>Bloque génesis de devnet incorrecto o no encontrado. ¿Datadir equivocado para devnet?</translation>
     </message>
+    <message>
+        <source>Invalid amount for %s=&lt;amount&gt;: '%s' (must be at least the minrelay fee of %s to prevent stuck transactions)</source>
+        <translation>Monto inválido para %s=&lt;amount&gt;: '%s' (debe ser al menos la tarifa minrelay de %s para evitar transacciones atascadas)</translation>
+    </message>
+    <message>
+        <source>Invalid or corrupt peers.dat (%s). If you believe this is a bug, please report it to %s. As a workaround, you can move the file (%s) out of the way (rename, move, or delete) to have a new one created on the next start.</source>
+        <translation>Peers.dat no válido o dañado (%s). Si crees que se trata de un error, infórmalo a %s. Como solución alternativa, puedes mover el archivo (%s) (renombrar, mover o eliminar) para que se cree uno nuevo en el próximo inicio.</translation>
+    </message>
+    <message>
+        <source>No dump file provided. To use createfromdump, -dumpfile=&lt;filename&gt; must be provided.</source>
+        <translation>No se proporcionó ningún archivo de volcado. Para utilizar createfromdump, -archivo de volcado=&lt;filename&gt; debe proporcionarse.</translation>
+    </message>
+    <message>
+        <source>No dump file provided. To use dump, -dumpfile=&lt;filename&gt; must be provided.</source>
+        <translation>No se proporcionó ningún archivo de volcado. Para utilizar el archivo de volcado, -dumpfile=&lt;filename&gt; debe proporcionarse.</translation>
+    </message>
+    <message>
+        <source>No wallet file format provided. To use createfromdump, -format=&lt;format&gt; must be provided.</source>
+        <translation>No se proporciona ningún formato de archivo de billetera. Para usar createfromdump, -formato=&lt;format&gt; debe proporcionarse.</translation>
+    </message>
+    <message>
+        <source>Outbound connections restricted to CJDNS (-onlynet=cjdns) but -cjdnsreachable is not provided</source>
+        <translation>Las conexiones salientes están restringidas a CJDNS (-onlynet=cjdns) pero no se proporciona -cjdnsreachable</translation>
+    </message>
+    <message>
+        <source>Outbound connections restricted to Tor (-onlynet=onion) but the proxy for reaching the Tor network is explicitly forbidden: -onion=0</source>
+        <translation>Las conexiones salientes están restringidas a Tor (-onlynet=onion) pero el proxy para acceder a la red Tor está explícitamente prohibido: -onion=0</translation>
+    </message>
+    <message>
+        <source>Outbound connections restricted to Tor (-onlynet=onion) but the proxy for reaching the Tor network is not provided: none of -proxy, -onion or -listenonion is given</source>
+        <translation>Las conexiones salientes están restringidas a Tor (-onlynet=onion) pero no se proporciona el proxy para llegar a la red Tor: no se proporciona ninguno de los dos: -proxy, -onion o -listenonion</translation>
+    </message>
+    <message>
+        <source>Outbound connections restricted to i2p (-onlynet=i2p) but -i2psam is not provided</source>
+        <translation>Las conexiones salientes están restringidas a i2p (-onlynet=i2p) pero no se proporciona -i2psam</translation>
+    </message>
     <message>
         <source>Please check that your computer's date and time are correct! If your clock is wrong, %s will not work properly.</source>
         <translation>Por favor, compruebe si la fecha y hora en su computadora son correctas! Si su reloj esta mal, %s no trabajara correctamente. </translation>
     </message>
     <message>
         <source>Please contribute if you find %s useful. Visit %s for further information about the software.</source>
-        <translation>Contribuya si encuentra %s de utilidad. Visite %s para mas información acerca del programa.</translation>
+        <translation>Contribuya si encuentra %s de utilidad. Visite %s para más información acerca del programa.</translation>
+    </message>
+    <message>
+        <source>Prune mode is incompatible with -reindex-chainstate. Use full -reindex instead.</source>
+        <translation>El modo de poda no es compatible con -reindex-chainstate. En su lugar, utiliza -reindex completo.</translation>
+    </message>
+    <message>
+        <source>This is the maximum transaction fee you pay (in addition to the normal fee) to prioritize partial spend avoidance over regular coin selection.</source>
+        <translation>Esta es la comisión de transacción máxima que pagas (además de la comisión normal) para priorizar la evitación del gasto parcial sobre la selección regular de monedas.</translation>
     </message>
     <message>
         <source>This is the transaction fee you may discard if change is smaller than dust at this level</source>
@@ -4457,14 +5886,38 @@
         <source>This is the transaction fee you may pay when fee estimates are not available.</source>
         <translation>Esta es la tarifa de cuota que debe pagar cuando las estimaciones de tarifas no estén disponibles.</translation>
     </message>
+    <message>
+        <source>Transaction requires one destination of non-0 value, a non-0 feerate, or a pre-selected input</source>
+        <translation>La transacción requiere un destino de valor distinto de 0, una tasa de tarifa distinta de 0 o una entrada preseleccionada</translation>
+    </message>
     <message>
         <source>Unable to replay blocks. You will need to rebuild the database using -reindex-chainstate.</source>
         <translation>No se pueden reproducir bloques. Deberás reconstruir la base de datos utilizando -reindex-chainstate.</translation>
     </message>
+    <message>
+        <source>Unknown wallet file format "%s" provided. Please provide one of "bdb" or "sqlite".</source>
+        <translation>Se proporcionó un formato de archivo de billetera desconocido "%s". Proporciona uno de los siguientes "bdb" o "sqlite".</translation>
+    </message>
+    <message>
+        <source>Unsupported chainstate database format found. Please restart with -reindex-chainstate. This will rebuild the chainstate database.</source>
+        <translation>Se encontró un formato de base de datos chainstate no compatible. Reinicie con -reindex-chainstate. Esto reconstruirá la base de datos chainstate.</translation>
+    </message>
+    <message>
+        <source>Warning: Dumpfile wallet format "%s" does not match command line specified format "%s".</source>
+        <translation>Advertencia: el formato de billetera del archivo de volcado "%s" no coincide con el formato especificado en la línea de comando "%s".</translation>
+    </message>
     <message>
         <source>Warning: Private keys detected in wallet {%s} with disabled private keys</source>
         <translation>Advertencia: claves privadas detectadas en la billetera {%s} con claves privadas deshabilitadas</translation>
     </message>
+    <message>
+        <source>You need to rebuild the database using -reindex to enable -timestampindex</source>
+        <translation>Debes reconstruir la base de datos usando -reindex para habilitar -timestampindex</translation>
+    </message>
+    <message>
+        <source>%s -- Incorrect seed, it should be a hex string</source>
+        <translation>%s - Semilla incorrecta, debería ser una cadena hexadecimal</translation>
+    </message>
     <message>
         <source>%s is not a valid backup folder!</source>
         <translation>¡%s no es una carpeta de copia de seguridad valida!</translation>
@@ -4489,10 +5942,30 @@
         <source>-rpcport must be specified when -devnet and -server are specified</source>
         <translation>-rpcport solo se debe especificar cuando -devnet y -server son especificados</translation>
     </message>
+    <message>
+        <source>-statsbatchsize cannot be configured with a negative value.</source>
+        <translation>-statsbatchsize no se puede configurar con un valor negativo.</translation>
+    </message>
+    <message>
+        <source>-statsduration cannot be configured with a negative value.</source>
+        <translation>-statsduration no se puede configurar con un valor negativo.</translation>
+    </message>
     <message>
         <source>A fatal internal error occurred, see debug.log for details</source>
         <translation>Ocurrió un error interno fatal, ver debug.log para más detalles</translation>
     </message>
+    <message>
+        <source>Cannot create socket (socket() returned error %s)</source>
+        <translation>No se puede crear el socket (socket() devolvió el error %s)</translation>
+    </message>
+    <message>
+        <source>Cannot get socket address for %s</source>
+        <translation>No se puede obtener la dirección de socket para %s</translation>
+    </message>
+    <message>
+        <source>Cannot init Statsd client</source>
+        <translation>No se puede inicializar el cliente Statsd</translation>
+    </message>
     <message>
         <source>Cannot resolve -%s address: '%s'</source>
         <translation>No se puede resolver -%s direccion: '%s'</translation>
@@ -4501,10 +5974,6 @@
         <source>Cannot write to data directory '%s'; check permissions.</source>
         <translation>No se puede escribir en el directorio de datos '%s'; comprobar los permisos.</translation>
     </message>
-    <message>
-        <source>Change index out of range</source>
-        <translation>Cambio de indice fuera de rango</translation>
-    </message>
     <message>
         <source>Copyright (C)</source>
         <translation>Copyright (C)</translation>
@@ -4513,6 +5982,14 @@
         <source>Disk space is too low!</source>
         <translation>¡El espacio en disco es demasiado bajo!</translation>
     </message>
+    <message>
+        <source>Dump file %s does not exist.</source>
+        <translation>El archivo de volcado %s no existe.</translation>
+    </message>
+    <message>
+        <source>Error creating %s</source>
+        <translation>Error al crear %s</translation>
+    </message>
     <message>
         <source>Error loading %s</source>
         <translation>Error cargando %s</translation>
@@ -4523,15 +6000,15 @@
     </message>
     <message>
         <source>Error loading %s: Wallet requires newer version of %s</source>
-        <translation>Error cargando %s: La billetera requiere una versión mas reciente de %s</translation>
+        <translation>Error cargando %s: La billetera requiere una versión más reciente de %s</translation>
     </message>
     <message>
         <source>Error loading %s: You can't disable HD on an already existing HD wallet</source>
         <translation>Error cargando %s: No puede deshabilitar HD en una billetera HD existente</translation>
     </message>
     <message>
-        <source>Error upgrading chainstate database</source>
-        <translation>Error actualizando la base de datos chainstate</translation>
+        <source>Error reading next record from wallet database</source>
+        <translation>Error al leer el siguiente registro de la base de datos de la billetera</translation>
     </message>
     <message>
         <source>Loading P2P addresses…</source>
@@ -4601,6 +6078,14 @@
         <source>Inputs vs outputs size mismatch.</source>
         <translation>El tamaño de las entradas frente vs las salidas no coincide.</translation>
     </message>
+    <message>
+        <source>Invalid '%s'. Allowed values: 128, 160, 192, 224, 256.</source>
+        <translation>'%s' no válido. Valores permitidos: 128, 160, 192, 224, 256.</translation>
+    </message>
+    <message>
+        <source>Invalid -i2psam address or hostname: '%s'</source>
+        <translation>Dirección -i2psam o nombre de host no válidos: '%s'</translation>
+    </message>
     <message>
         <source>Invalid -onion address or hostname: '%s'</source>
         <translation>Dirección -onion o nombre de host inválido: '%s'</translation>
@@ -4645,14 +6130,78 @@
         <source>%s corrupt. Try using the wallet tool dash-wallet to salvage or restoring a backup.</source>
         <translation>%s corrupto. Intenta usar la herramienta de billetera dash-wallet para recuperar o restaurar una copia de seguridad.</translation>
     </message>
+    <message>
+        <source>%s is set very high! Fees this large could be paid on a single transaction.</source>
+        <translation>¡%s está configurado muy alto! Tarifas tan grandes podrían pagarse en una sola transacción.</translation>
+    </message>
+    <message>
+        <source>%s request to listen on port %u. This port is considered "bad" and thus it is unlikely that any Dash Core peers connect to it. See doc/p2p-bad-ports.md for details and a full list.</source>
+        <translation>%s solicita escuchar en el puerto %u. Este puerto se considera "malo" y, por lo tanto, es poco probable que algún par de Dash Core se conecte a él. Consulta doc/p2p-bad-ports.md para obtener más detalles y una lista completa.</translation>
+    </message>
+    <message>
+        <source>Cannot provide specific connections and have addrman find outgoing connections at the same time.</source>
+        <translation>No se pueden proporcionar conexiones específicas y hacer que addrman encuentre conexiones salientes al mismo tiempo.</translation>
+    </message>
+    <message>
+        <source>Failed to upgrade Evo database</source>
+        <translation>Error al actualizar la base de datos Evo</translation>
+    </message>
+    <message>
+        <source>Fee needed &gt; fee paid</source>
+        <translation>Tarifa necesaria &gt; tarifa pagada</translation>
+    </message>
+    <message>
+        <source>Host %s on unsupported network</source>
+        <translation>Host %s en red no compatible</translation>
+    </message>
+    <message>
+        <source>Invalid amount for %s=&lt;amount&gt;: '%s' (must be at least %s)</source>
+        <translation>Cantidad no válida para %s=&lt;cantidad&gt;: '%s' (debe ser al menos %s)</translation>
+    </message>
+    <message>
+        <source>Invalid amount for %s=&lt;amount&gt;: '%s'</source>
+        <translation>Cantidad no válida para %s=&lt;cantidad&gt;: '%s'</translation>
+    </message>
+    <message>
+        <source>Invalid port specified in %s: '%s'</source>
+        <translation>Puerto no válido especificado en %s: '%s'</translation>
+    </message>
     <message>
         <source>Last successful action was too recent.</source>
         <translation>La última acción exitosa era demasiado reciente.</translation>
     </message>
+    <message>
+        <source>Missing solving data for estimating transaction size</source>
+        <translation>Faltan datos de resolución para estimar el tamaño de la transacción</translation>
+    </message>
+    <message>
+        <source>No host specified</source>
+        <translation>No se especificó host</translation>
+    </message>
+    <message>
+        <source>No host specified, malformed URL</source>
+        <translation>No se especificó host, URL mal formada</translation>
+    </message>
+    <message>
+        <source>No text before the scheme delimiter, malformed URL</source>
+        <translation>No hay texto antes del delimitador de esquema, URL mal formada</translation>
+    </message>
+    <message>
+        <source>Port must be between %d and %d, supplied %d</source>
+        <translation>El puerto debe estar entre %d y %d, se proporcionó %d</translation>
+    </message>
+    <message>
+        <source>Socket not initialized, cannot send message</source>
+        <translation>Socket no inicializado, no se puede enviar el mensaje</translation>
+    </message>
     <message>
         <source>The source code is available from %s.</source>
         <translation>El código fuente esta disponible desde %s.</translation>
     </message>
+    <message>
+        <source>The specified config file %s does not exist</source>
+        <translation>El archivo de configuración especificado %s no existe</translation>
+    </message>
     <message>
         <source>The transaction amount is too small to pay the fee</source>
         <translation>El monto de la transacción es demasiado pequeño para pagar la comisión</translation>
@@ -4673,6 +6222,10 @@
         <source>Transaction fees are too high.</source>
         <translation>Las comisiones por transacción son demasiado elevadas.</translation>
     </message>
+    <message>
+        <source>Transaction needs a change address, but we can't generate it.</source>
+        <translation>La transacción necesita una dirección de cambio, pero no podemos generarla.</translation>
+    </message>
     <message>
         <source>Transaction not valid.</source>
         <translation>La transacción no es válida.</translation>
@@ -4693,6 +6246,18 @@
         <source>Unable to locate enough non-denominated funds for this transaction.</source>
         <translation>No se pueden localizar fondos no denominados suficientes para esta transacción.</translation>
     </message>
+    <message>
+        <source>Unable to lookup host %s</source>
+        <translation>No se puede buscar el host %s</translation>
+    </message>
+    <message>
+        <source>Unable to parse -maxuploadtarget: '%s'</source>
+        <translation>No se puede analizar -maxuploadtarget: '%s'</translation>
+    </message>
+    <message>
+        <source>Unable to send message to %s (::sendto() returned error %s)</source>
+        <translation>No se puede enviar el mensaje a %s (::sendto() devolvió el error %s)</translation>
+    </message>
     <message>
         <source>Unable to sign spork message, wrong key?</source>
         <translation>No fue posible firmar el mensaje de spork, ¿llave incorrecta?</translation>
@@ -4706,12 +6271,12 @@
         <translation>Estado desconocido: id = %u</translation>
     </message>
     <message>
-        <source>Unsupported logging category %s=%s.</source>
-        <translation>Categoría de registro no compatible %s=%s.</translation>
+        <source>Unsupported URL scheme, must begin with udp://</source>
+        <translation>Esquema de URL no compatible, debe comenzar con udp://</translation>
     </message>
     <message>
-        <source>Upgrading txindex database</source>
-        <translation>Actualización de la base de datos txindex</translation>
+        <source>Unsupported logging category %s=%s.</source>
+        <translation>Categoría de registro no compatible %s=%s.</translation>
     </message>
     <message>
         <source>Very low number of keys left: %d</source>
@@ -4741,9 +6306,25 @@
         <source>You can not disable governance validation on a masternode.</source>
         <translation>No puede deshabilitar la validación de gobernanza en un masternode.</translation>
     </message>
+    <message>
+        <source>You need to rebuild the database using -reindex to enable -addressindex</source>
+        <translation>Debes reconstruir la base de datos usando -reindex para habilitar -addressindex</translation>
+    </message>
+    <message>
+        <source>You need to rebuild the database using -reindex to enable -spentindex</source>
+        <translation>Debes reconstruir la base de datos usando -reindex para habilitar -spentindex</translation>
+    </message>
     <message>
         <source>Your entries added successfully.</source>
         <translation>Sus registros se agregaron con éxito.</translation>
     </message>
+    <message>
+        <source>Settings file could not be read</source>
+        <translation>No se pudo leer el archivo de configuración</translation>
+    </message>
+    <message>
+        <source>Settings file could not be written</source>
+        <translation>No se pudo escribir el archivo de configuración</translation>
+    </message>
 </context>
 </TS>
\ No newline at end of file

From bc58127d7bf798c65d2e4a15c38a88a331cd4caf Mon Sep 17 00:00:00 2001
From: UdjinM6 <UdjinM6@users.noreply.github.com>
Date: Thu, 23 Oct 2025 13:46:37 +0300
Subject: [PATCH 322/656] fr

---
 src/qt/locale/dash_fr.ts | 818 ++++++++++++++++++++++++++++++---------
 1 file changed, 630 insertions(+), 188 deletions(-)

diff --git a/src/qt/locale/dash_fr.ts b/src/qt/locale/dash_fr.ts
index 7e5197adf01a..0aa91fd2dca1 100644
--- a/src/qt/locale/dash_fr.ts
+++ b/src/qt/locale/dash_fr.ts
@@ -65,14 +65,6 @@
         <source>C&amp;hoose</source>
         <translation>C&amp;hoisir</translation>
     </message>
-    <message>
-        <source>Sending addresses</source>
-        <translation>Adresses d'envoi</translation>
-    </message>
-    <message>
-        <source>Receiving addresses</source>
-        <translation>Adresses de réception</translation>
-    </message>
     <message>
         <source>These are your Dash addresses for sending payments. Always check the amount and the receiving address before sending coins.</source>
         <translation>Voici vos adresses Dash pour l'envoi de paiements. Vérifiez toujours le montant et l'adresse de réception avant d'envoyer de l'argent.</translation>
@@ -115,6 +107,14 @@
         <extracomment>An error message. %1 is a stand-in argument for the name of the file we attempted to save to.</extracomment>
         <translation>Une erreur s'est produite en essayant de sauvegarder la liste d'adresses sur %1. Veuillez réessayer.</translation>
     </message>
+    <message>
+        <source>Sending addresses - %1</source>
+        <translation>Adresses d'envoi - %1</translation>
+    </message>
+    <message>
+        <source>Receiving addresses - %1</source>
+        <translation>Adresses de réception - %1</translation>
+    </message>
     <message>
         <source>Exporting Failed</source>
         <translation>L'exportation a échoué</translation>
@@ -284,10 +284,22 @@
         <source>The passphrase entered for the wallet decryption was incorrect.</source>
         <translation>La phrase de passe saisie pour déchiffrer le portefeuille est incorrecte.</translation>
     </message>
+    <message>
+        <source>The passphrase entered for the wallet decryption is incorrect. It contains a null character (ie - a zero byte). If the passphrase was set with a version of this software prior to 23.0, please try again with only the characters up to — but not including — the first null character. If this is successful, please set a new passphrase to avoid this issue in the future.</source>
+        <translation>La phrase de passe saisie pour le déchiffrement du portefeuille est incorrecte. Elle contient un caractère nul (c'est-à-dire un octet zéro). Si la phrase de passe a été définie avec une version de ce logiciel antérieure à 23.0, veuillez réessayer avec uniquement les caractères jusqu'au — mais sans inclure — le premier caractère nul. Si cela fonctionne, veuillez définir une nouvelle phrase de passe pour éviter ce problème à l'avenir.</translation>
+    </message>
     <message>
         <source>Wallet passphrase was successfully changed.</source>
         <translation>La phrase de passe du portefeuille a été modifiée avec succès.</translation>
     </message>
+    <message>
+        <source>Passphrase change failed</source>
+        <translation>Échec du changement de phrase de passe</translation>
+    </message>
+    <message>
+        <source>The old passphrase entered for the wallet decryption is incorrect. It contains a null character (ie - a zero byte). If the passphrase was set with a version of this software prior to 23.0, please try again with only the characters up to — but not including — the first null character.</source>
+        <translation>L'ancienne phrase de passe saisie pour le déchiffrement du portefeuille est incorrecte. Elle contient un caractère nul (c'est-à-dire un octet zéro). Si la phrase de passe a été définie avec une version de ce logiciel antérieure à 23.0, veuillez réessayer avec uniquement les caractères jusqu'au — mais sans inclure — le premier caractère nul.</translation>
+    </message>
     <message>
         <source>Warning: The Caps Lock key is on!</source>
         <translation>Attention : la touche Verr. Maj. est activée !</translation>
@@ -392,10 +404,6 @@
         <source>&amp;Load PSBT from file…</source>
         <translation>Charger PSBT depuis fichier…</translation>
     </message>
-    <message>
-        <source>Load PSBT from clipboard…</source>
-        <translation>Charger PSBT depuis le presse-papiers…</translation>
-    </message>
     <message>
         <source>&amp;Sending addresses</source>
         <translation>Envoyer des adresses</translation>
@@ -428,10 +436,6 @@
         <source>&amp;Window</source>
         <translation>Fenêtre</translation>
     </message>
-    <message>
-        <source>Minimize</source>
-        <translation>Minimiser</translation>
-    </message>
     <message>
         <source>Zoom</source>
         <translation>Zoom</translation>
@@ -484,14 +488,6 @@
         <source>Modify configuration options for %1</source>
         <translation>Modifier les options de configuration de %1</translation>
     </message>
-    <message>
-        <source>&amp;Show / Hide</source>
-        <translation>&amp;Afficher / Cacher</translation>
-    </message>
-    <message>
-        <source>Show or hide the main Window</source>
-        <translation>Afficher ou masquer la fenêtre principale</translation>
-    </message>
     <message>
         <source>Encrypt the private keys that belong to your wallet</source>
         <translation>Chiffrer les clefs privées de votre portefeuille</translation>
@@ -556,10 +552,6 @@
         <source>Show wallet repair options</source>
         <translation>Afficher les options de réparation du  portefeuille</translation>
     </message>
-    <message>
-        <source>Open Wallet &amp;Configuration File</source>
-        <translation>Ouvrir le fichier de &amp;configuration du portefeuille</translation>
-    </message>
     <message>
         <source>Open configuration file</source>
         <translation>Ouvrir le fichier de configuration</translation>
@@ -614,10 +606,18 @@
         <source>Show information about %1</source>
         <translation>Afficher les informations sur %1</translation>
     </message>
+    <message>
+        <source>Load PSBT from &amp;clipboard…</source>
+        <translation>Charger une PSBT depuis le presse-papiers…</translation>
+    </message>
     <message>
         <source>Open debugging and diagnostic console</source>
         <translation>Ouvrir la console de débogage et de diagnostic</translation>
     </message>
+    <message>
+        <source>Open &amp;wallet configuration file</source>
+        <translation>Ouvrir le fichier de configuration du portefeuille</translation>
+    </message>
     <message>
         <source>Open a dash: URI</source>
         <translation>Ouvrir une URI dash:</translation>
@@ -626,6 +626,16 @@
         <source>Create a new wallet</source>
         <translation>Créer un nouveau portefeuille</translation>
     </message>
+    <message>
+        <source>Restore Wallet…</source>
+        <extracomment>Name of the menu item that restores wallet from a backup file.</extracomment>
+        <translation>Restaurer le portefeuille…</translation>
+    </message>
+    <message>
+        <source>Restore a wallet from a backup file</source>
+        <extracomment>Status tip for Restore Wallet menu item</extracomment>
+        <translation>Restaurer un portefeuille à partir d'un fichier de sauvegarde</translation>
+    </message>
     <message>
         <source>Close all wallets</source>
         <translation>Fermer tous les portefeuilles</translation>
@@ -646,10 +656,34 @@
         <source>Mask the values in the Overview tab</source>
         <translation>Masquer les valeurs dans l'onglet Vue d'ensemble</translation>
     </message>
+    <message>
+        <source>Wallet Data</source>
+        <extracomment>Name of the wallet data file format.</extracomment>
+        <translation>Données du portefeuille</translation>
+    </message>
+    <message>
+        <source>Load Wallet Backup</source>
+        <extracomment>The title for Restore Wallet File Windows</extracomment>
+        <translation>Charger la sauvegarde du portefeuille</translation>
+    </message>
+    <message>
+        <source>Restore Wallet</source>
+        <extracomment>Title of pop-up window shown when the user is attempting to restore a wallet.</extracomment>
+        <translation>Restaurer le portefeuille</translation>
+    </message>
+    <message>
+        <source>Wallet Name</source>
+        <extracomment>Label of the input field where the name of the wallet is entered.</extracomment>
+        <translation>Nom du portefeuille</translation>
+    </message>
     <message>
         <source>&amp;Settings</source>
         <translation>&amp;Réglages</translation>
     </message>
+    <message>
+        <source>&amp;Minimize</source>
+        <translation>&amp;Réduire</translation>
+    </message>
     <message>
         <source>&amp;Help</source>
         <translation>&amp;Aide</translation>
@@ -666,6 +700,14 @@
         <source>View Governance Proposals</source>
         <translation>Voir les propositions de gouvernance</translation>
     </message>
+    <message>
+        <source>&amp;Hide</source>
+        <translation>&amp;Masquer</translation>
+    </message>
+    <message>
+        <source>S&amp;how</source>
+        <translation>&amp;Afficher</translation>
+    </message>
     <message numerus="yes">
         <source>%n active connection(s) to Dash network</source>
         <extracomment>A substring of the tooltip.</extracomment>
@@ -687,6 +729,14 @@
         <source>Close Wallet…</source>
         <translation>Fermer le portefeuille…</translation>
     </message>
+    <message>
+        <source>Load Partially Signed Blockchain Transaction</source>
+        <translation>Charger transaction de blockchain partiellement signée</translation>
+    </message>
+    <message>
+        <source>Load Partially Signed Blockchain Transaction from clipboard</source>
+        <translation>Charger transaction de blockchain partiellement signée depuis le presse-papier</translation>
+    </message>
     <message>
         <source>Create Wallet…</source>
         <translation>Créer un portefeuille…</translation>
@@ -739,10 +789,6 @@
         <source>Processing blocks on disk…</source>
         <translation>Traitement des blocs sur le disque…</translation>
     </message>
-    <message>
-        <source>Reindexing blocks on disk…</source>
-        <translation>Réindexation des blocs sur le disque…</translation>
-    </message>
     <message>
         <source>Connecting to peers…</source>
         <translation>Connexion aux pairs…</translation>
@@ -896,10 +942,6 @@
         <source>Coin Selection</source>
         <translation>Sélection des pièces</translation>
     </message>
-    <message>
-        <source>Dust:</source>
-        <translation>Poussière :</translation>
-    </message>
     <message>
         <source>After Fee:</source>
         <translation>Avec les frais déduits :</translation>
@@ -1000,10 +1042,6 @@
         <source>Copy bytes</source>
         <translation>Copier les octets</translation>
     </message>
-    <message>
-        <source>Copy dust</source>
-        <translation>Copier la poussière</translation>
-    </message>
     <message>
         <source>Copy change</source>
         <translation>Copier la monnaie rendue</translation>
@@ -1016,18 +1054,6 @@
         <source>(%1 locked)</source>
         <translation>(%1 verrouillés)</translation>
     </message>
-    <message>
-        <source>yes</source>
-        <translation>oui</translation>
-    </message>
-    <message>
-        <source>no</source>
-        <translation>non</translation>
-    </message>
-    <message>
-        <source>This label turns red if any recipient receives an amount smaller than the current dust threshold.</source>
-        <translation>Cette étiquette devient rouge si l'un des destinataires reçoit un montant inférieur au niveau de "poussière".</translation>
-    </message>
     <message>
         <source>Can vary +/- %1 duff(s) per input.</source>
         <translation>Peut varier de ± %1 duff(s) par entrée.</translation>
@@ -1241,18 +1267,102 @@
         <source>Filter proposal list</source>
         <translation>Filtrer la liste des propositions</translation>
     </message>
+    <message>
+        <source>Masternode Count:</source>
+        <translation>Nombre de masternodes :</translation>
+    </message>
+    <message>
+        <source>Number of masternodes this wallet can vote with (masternodes for which this wallet holds the voting key)</source>
+        <translation>Nombre de masternodes avec lesquels ce portefeuille peut voter (masternodes pour lesquels ce portefeuille détient la clé de vote)</translation>
+    </message>
     <message>
         <source>Proposal Count:</source>
         <translation>Nombre de propositions :</translation>
     </message>
+    <message>
+        <source>Create Proposal</source>
+        <translation>Créer une proposition</translation>
+    </message>
     <message>
         <source>Filter by Title</source>
         <translation>Filtrer par titre</translation>
     </message>
+    <message>
+        <source>Unavailable</source>
+        <translation>Indisponible</translation>
+    </message>
+    <message>
+        <source>A synced node and an unlocked wallet are required.</source>
+        <translation>Un nœud synchronisé et un portefeuille déverrouillé sont requis.</translation>
+    </message>
+    <message>
+        <source>Vote Yes</source>
+        <translation>Voter Oui</translation>
+    </message>
+    <message>
+        <source>Vote No</source>
+        <translation>Voter Non</translation>
+    </message>
+    <message>
+        <source>Vote Abstain</source>
+        <translation>Voter Abstention</translation>
+    </message>
     <message>
         <source>Proposal Info: %1</source>
         <translation>Information sur proposition : %1</translation>
     </message>
+    <message>
+        <source>Voting Failed</source>
+        <translation>Échec du vote</translation>
+    </message>
+    <message>
+        <source>No wallet available.</source>
+        <translation>Aucun portefeuille disponible.</translation>
+    </message>
+    <message>
+        <source>No masternode voting keys found in wallet.</source>
+        <translation>Aucune clé de vote de masternode trouvée dans le portefeuille.</translation>
+    </message>
+    <message>
+        <source>Please select a proposal to vote on.</source>
+        <translation>Veuillez sélectionner une proposition sur laquelle voter.</translation>
+    </message>
+    <message>
+        <source>Unable to unlock wallet.</source>
+        <translation>Impossible de déverrouiller le portefeuille.</translation>
+    </message>
+    <message>
+        <source>Unable to get masternode list. Please try again later.</source>
+        <translation>Impossible d'obtenir la liste des masternodes. Veuillez réessayer plus tard.</translation>
+    </message>
+    <message>
+        <source>Masternode %1 not found</source>
+        <translation>Masternode %1 introuvable</translation>
+    </message>
+    <message>
+        <source>Failed to sign vote for masternode %1</source>
+        <translation>Échec de la signature du vote pour le masternode %1</translation>
+    </message>
+    <message>
+        <source>Masternode %1: %2</source>
+        <translation>Masternode %1 : %2</translation>
+    </message>
+    <message numerus="yes">
+        <source>Voted successfully %n time(s)</source>
+        <translation><numerusform>Voté avec succès %n fois</numerusform><numerusform>Voté avec succès %n fois</numerusform><numerusform>Voté avec succès %n fois</numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <source>Failed to vote %n time(s)</source>
+        <translation><numerusform>Échec du vote %n fois</numerusform><numerusform>Échec du vote %n fois</numerusform><numerusform>Échec du vote %n fois</numerusform></translation>
+    </message>
+    <message>
+        <source>Errors:</source>
+        <translation>Erreurs :</translation>
+    </message>
+    <message>
+        <source>Voting Results</source>
+        <translation>Résultats du vote</translation>
+    </message>
 </context>
 <context>
     <name>HelpMessageDialog</name>
@@ -1323,13 +1433,17 @@
         <source>Use a custom data directory:</source>
         <translation>Utiliser un répertoire de données personnalisé :</translation>
     </message>
-    <message>
-        <source>(of %1 GB needed)</source>
-        <translation>(de %1 Go nécessaire)</translation>
+    <message numerus="yes">
+        <source>%n GB of space available</source>
+        <translation><numerusform>%n Go d'espace disponible</numerusform><numerusform>%n Go d'espace disponible</numerusform><numerusform>%n Go d'espace disponible</numerusform></translation>
     </message>
-    <message>
-        <source>(%1 GB needed for full chain)</source>
-        <translation>(%1 Go nécessaires pour la chaîne entière)</translation>
+    <message numerus="yes">
+        <source>(of %n GB needed)</source>
+        <translation><numerusform>(sur %n Go nécessaire)</numerusform><numerusform>(sur %n Go nécessaires)</numerusform><numerusform>(sur %n Go nécessaires)</numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <source>(%n GB needed for full chain)</source>
+        <translation><numerusform>(%n Go nécessaire pour la chaîne complète)</numerusform><numerusform>(%n Go nécessaires pour la chaîne complète)</numerusform><numerusform>(%n Go nécessaires pour la chaîne complète)</numerusform></translation>
     </message>
     <message>
         <source>At least %1 GB of data will be stored in this directory, and it will grow over time.</source>
@@ -1361,6 +1475,13 @@
         <translation>Erreur</translation>
     </message>
 </context>
+<context>
+    <name>LoadWalletsActivity</name>
+    <message>
+        <source>Loading wallets…</source>
+        <translation>Chargement des portefeuilles…</translation>
+    </message>
+</context>
 <context>
     <name>MasternodeList</name>
     <message>
@@ -1553,6 +1674,11 @@
         <source>URI:</source>
         <translation>URI :</translation>
     </message>
+    <message>
+        <source>Paste address from clipboard</source>
+        <extracomment>Tooltip text for button that allows you to paste an address that is in your clipboard.</extracomment>
+        <translation>Coller l'adresse depuis le presse-papiers</translation>
+    </message>
 </context>
 <context>
     <name>OpenWalletActivity</name>
@@ -1663,6 +1789,16 @@
         <extracomment>An Options window setting to set subtracting the fee from a sending amount as default.</extracomment>
         <translation>&amp;Frais soustraits au total par défaut</translation>
     </message>
+    <message>
+        <source>Enable &amp;PSBT controls</source>
+        <extracomment>An options window setting to enable PSBT controls.</extracomment>
+        <translation>Activer les contrôles &amp;PSBT</translation>
+    </message>
+    <message>
+        <source>Whether to show PSBT controls.</source>
+        <extracomment>Tooltip text for options window setting that enables PSBT controls.</extracomment>
+        <translation>S'il faut afficher ou non les contrôles PSBT.</translation>
+    </message>
     <message>
         <source>Whether to keep the specified custom change address or not.</source>
         <translation>S'il faut garder ou non l'adresse personnalisée de monnaie spécifiée.</translation>
@@ -1806,20 +1942,20 @@ https://explore.transifex.com/dash/dash/</source>
 https://explore.transifex.com/dash/dash/</translation>
     </message>
     <message>
-        <source>Options set in this dialog are overridden by the command line or in the configuration file:</source>
-        <translation>Les options choisies dans ce dialogue sont remplacées par la ligne de commande ou dans le fichier de configuration :</translation>
+        <source>Third-party URLs (e.g. a block explorer) that appear in the transactions tab as context menu items.&lt;br/&gt;%s in the URL is replaced by transaction hash. Multiple URLs are separated by vertical bar |.</source>
+        <translation>URL tierces (par ex. un explorateur de blocs) qui apparaissent dans l'onglet des transactions comme éléments de menu contextuel.&lt;br/&gt;%s dans l'URL est remplacé par le hachage de transaction. Plusieurs URL sont séparées par une barre verticale |.</translation>
     </message>
     <message>
-        <source>Minimize instead of exit the application when the window is closed. When this option is enabled, the application will be closed only after selecting Exit in the menu.</source>
-        <translation>Minimiser l'application (au lieu de la quitter) quand la fenêtre est fermée. Si cette option est activée, l'application se fermera uniquement en passant par le menu Quitter.</translation>
+        <source>&amp;Third-party transaction URLs</source>
+        <translation>URL de &amp;transaction tierces</translation>
     </message>
     <message>
-        <source>Third party URLs (e.g. a block explorer) that appear in the transactions tab as context menu items.&lt;br/&gt;%s in the URL is replaced by transaction hash. Multiple URLs are separated by vertical bar |.</source>
-        <translation>URLs de tierce partie (par ex. : un explorateur de blocs) affichées dans l'onglet Transactions comme menu contextuel.&lt;br/&gt;%s dans l'URL est remplacé par le hash de transaction. Les URLs multiples sont séparées par une barre verticale |.</translation>
+        <source>Options set in this dialog are overridden by the command line or in the configuration file:</source>
+        <translation>Les options choisies dans ce dialogue sont remplacées par la ligne de commande ou dans le fichier de configuration :</translation>
     </message>
     <message>
-        <source>&amp;Third party transaction URLs</source>
-        <translation>URLs de transaction &amp;Tierces</translation>
+        <source>Minimize instead of exit the application when the window is closed. When this option is enabled, the application will be closed only after selecting Exit in the menu.</source>
+        <translation>Minimiser l'application (au lieu de la quitter) quand la fenêtre est fermée. Si cette option est activée, l'application se fermera uniquement en passant par le menu Quitter.</translation>
     </message>
     <message>
         <source>Whether to show coin control features or not.</source>
@@ -1963,14 +2099,22 @@ https://explore.transifex.com/dash/dash/</translation>
     </message>
     <message>
         <source>Confirm options reset</source>
+        <extracomment>Window title text of pop-up window shown when the user has chosen to reset options.</extracomment>
         <translation>Confirmer la réinitialisation des options</translation>
     </message>
     <message>
         <source>Client restart required to activate changes.</source>
+        <extracomment>Text explaining that the settings changed will not come into effect until the client is restarted.</extracomment>
         <translation>Le redémarrage du client est nécessaire pour activer les changements.</translation>
     </message>
+    <message>
+        <source>Current settings will be backed up at "%1".</source>
+        <extracomment>Text explaining to the user that the client's current settings will be backed up at a specific location. %1 is a stand-in argument for the backup location's path.</extracomment>
+        <translation>Les paramètres actuels seront sauvegardés dans "%1".</translation>
+    </message>
     <message>
         <source>Client will be shut down. Do you want to proceed?</source>
+        <extracomment>Text asking the user to confirm if they would like to proceed with a client shutdown.</extracomment>
         <translation>Le logiciel va être fermé. Voulez-vous continuer ?</translation>
     </message>
     <message>
@@ -2243,6 +2387,10 @@ https://explore.transifex.com/dash/dash/</translation>
         <source>Failed to sign transaction: %1</source>
         <translation>Échec de la signature de la transaction : %1</translation>
     </message>
+    <message>
+        <source>Cannot sign inputs while wallet is locked.</source>
+        <translation>Impossible de signer des entrées quand le portefeuille est verrouillé.</translation>
+    </message>
     <message>
         <source>Could not sign any more inputs.</source>
         <translation>Impossible de signer plus d'entrées.</translation>
@@ -2487,6 +2635,181 @@ En raison d'un support interrompu, vous devriez demander au vendeur de vous comm
         <translation>État</translation>
     </message>
 </context>
+<context>
+    <name>ProposalWizard</name>
+    <message>
+        <source>Create Governance Proposal</source>
+        <translation>Créer une proposition de gouvernance</translation>
+    </message>
+    <message>
+        <source>Enter proposal details</source>
+        <translation>Entrer les détails de la proposition</translation>
+    </message>
+    <message>
+        <source>A fee will be burned when you prepare the proposal.</source>
+        <translation>Des frais seront brûlés lorsque vous préparerez la proposition.</translation>
+    </message>
+    <message>
+        <source>Proposal &amp;name</source>
+        <translation>&amp;Nom de la proposition</translation>
+    </message>
+    <message>
+        <source>&amp;Description URL</source>
+        <translation>URL de &amp;description</translation>
+    </message>
+    <message>
+        <source>Payment &amp;address</source>
+        <translation>&amp;Adresse de paiement</translation>
+    </message>
+    <message>
+        <source>Payment &amp;amount</source>
+        <translation>&amp;Montant du paiement</translation>
+    </message>
+    <message>
+        <source>The amount to request in a single payment</source>
+        <translation>Le montant à demander en un seul paiement</translation>
+    </message>
+    <message>
+        <source>&amp;First payment</source>
+        <translation>&amp;Premier paiement</translation>
+    </message>
+    <message>
+        <source>Pa&amp;yments</source>
+        <translation>Pa&amp;iements</translation>
+    </message>
+    <message>
+        <source>To&amp;tal amount</source>
+        <translation>Montant to&amp;tal</translation>
+    </message>
+    <message>
+        <source>Proposal &amp;fee</source>
+        <translation>&amp;Frais de proposition</translation>
+    </message>
+    <message>
+        <source>Next</source>
+        <translation>Suivant</translation>
+    </message>
+    <message>
+        <source>Review proposal JSON and validate.</source>
+        <translation>Examiner le JSON de la proposition et valider.</translation>
+    </message>
+    <message>
+        <source>Hex-encoded JSON</source>
+        <translation>JSON encodé en hexadécimal</translation>
+    </message>
+    <message>
+        <source>Back</source>
+        <translation>Retour</translation>
+    </message>
+    <message>
+        <source>Validate</source>
+        <translation>Valider</translation>
+    </message>
+    <message>
+        <source>Prepare (burn fee) and wait for confirmations.</source>
+        <translation>Préparer (brûler les frais) et attendre les confirmations.</translation>
+    </message>
+    <message>
+        <source>Copy</source>
+        <translation>Copier</translation>
+    </message>
+    <message>
+        <source>At 1/6 confirmations: can be relayed and queued. At 6/6: accepted and processed.</source>
+        <translation>À 1/6 confirmations : peut être relayé et mis en file d'attente. À 6/6 : accepté et traité.</translation>
+    </message>
+    <message>
+        <source>Confirmations progress</source>
+        <translation>Progression des confirmations</translation>
+    </message>
+    <message>
+        <source>Shows progress toward the required number of confirmations for the proposal fee transaction.</source>
+        <translation>Affiche la progression vers le nombre requis de confirmations pour la transaction de frais de proposition.</translation>
+    </message>
+    <message>
+        <source>Estimated time remaining: -</source>
+        <translation>Temps restant estimé : -</translation>
+    </message>
+    <message>
+        <source>Prepare Proposal</source>
+        <translation>Préparer la proposition</translation>
+    </message>
+    <message>
+        <source>You can submit after 1 confirmation. At 6 confirmations it is accepted and processed.</source>
+        <translation>Vous pouvez soumettre après 1 confirmation. À 6 confirmations, elle est acceptée et traitée.</translation>
+    </message>
+    <message>
+        <source>Proposal ID:</source>
+        <translation>ID de proposition :</translation>
+    </message>
+    <message>
+        <source>Submit Proposal</source>
+        <translation>Soumettre la proposition</translation>
+    </message>
+    <message>
+        <source>Close</source>
+        <translation>Fermer</translation>
+    </message>
+    <message>
+        <source>Valid</source>
+        <translation>Valide</translation>
+    </message>
+    <message>
+        <source>Invalid: %1</source>
+        <translation>Invalide : %1</translation>
+    </message>
+    <message>
+        <source>Burn %1</source>
+        <translation>Brûler %1</translation>
+    </message>
+    <message>
+        <source>Burn %1 to create the fee transaction?</source>
+        <translation>Brûler %1 pour créer la transaction de frais ?</translation>
+    </message>
+    <message>
+        <source>Prepare failed</source>
+        <translation>Échec de la préparation</translation>
+    </message>
+    <message>
+        <source>Confirmations: %1 / %2 required</source>
+        <translation>Confirmations : %1 / %2 requises</translation>
+    </message>
+    <message>
+        <source>Estimated time remaining: Ready</source>
+        <translation>Temps restant estimé : Prêt</translation>
+    </message>
+    <message numerus="yes">
+        <source>Estimated time remaining: %n minute(s)</source>
+        <translation><numerusform>Temps restant estimé : %n minute</numerusform><numerusform>Temps restant estimé : %n minutes</numerusform><numerusform>Temps restant estimé : %n minutes</numerusform></translation>
+    </message>
+    <message>
+        <source>Your proposal was submitted successfully.</source>
+        <translation>Votre proposition a été soumise avec succès.</translation>
+    </message>
+    <message>
+        <source>Already submitted</source>
+        <translation>Déjà soumise</translation>
+    </message>
+    <message>
+        <source>This proposal has already been submitted.</source>
+        <translation>Cette proposition a déjà été soumise.</translation>
+    </message>
+    <message>
+        <source>Submission failed</source>
+        <translation>Échec de la soumission</translation>
+    </message>
+    <message>
+        <source>Proposal submitted</source>
+        <translation>Proposition soumise</translation>
+    </message>
+    <message>
+        <source>A fee of %1 will be burned when you prepare the proposal.</source>
+        <translation>Des frais de %1 seront brûlés lorsque vous préparerez la proposition.</translation>
+    </message>
+    <message>
+        <source>Prepare (burn %1) and wait for %2 confirmations.</source>
+        <translation>Préparer (brûler %1) et attendre %2 confirmations.</translation>
+    </message>
+</context>
 <context>
     <name>QObject</name>
     <message>
@@ -2876,14 +3199,6 @@ En raison d'un support interrompu, vous devriez demander au vendeur de vous comm
         <source>Version</source>
         <translation>Version</translation>
     </message>
-    <message>
-        <source>Whether the peer requested us to relay transactions.</source>
-        <translation>Si le pair nous a demandés de relayer des transactions.</translation>
-    </message>
-    <message>
-        <source>Wants Tx Relay</source>
-        <translation>Souhaite un relais de transaction</translation>
-    </message>
     <message>
         <source>High bandwidth BIP152 compact block relay: %1</source>
         <translation>Relais de bloc compact BIP152 haute bande passante : %1</translation>
@@ -2989,6 +3304,14 @@ En raison d'un support interrompu, vous devriez demander au vendeur de vous comm
         <source>To specify a non-default location of the blocks directory use the '%1' option.</source>
         <translation>Pour indiquer une localisation non-défaut du répertoire de blocs, utilisez l'option '%1'.</translation>
     </message>
+    <message>
+        <source>Local Addresses</source>
+        <translation>Adresses locales</translation>
+    </message>
+    <message>
+        <source>Network addresses that your Dash node is currently using to communicate with other nodes.</source>
+        <translation>Adresses réseau que votre nœud Dash utilise actuellement pour communiquer avec d'autres nœuds.</translation>
+    </message>
     <message>
         <source>Number of regular Masternodes</source>
         <translation>Nombre de masternodes standard</translation>
@@ -3081,6 +3404,14 @@ En raison d'un support interrompu, vous devriez demander au vendeur de vous comm
         <source>Services</source>
         <translation>Services</translation>
     </message>
+    <message>
+        <source>Whether we relay transactions to this peer.</source>
+        <translation>Si nous relayons les transactions vers ce pair.</translation>
+    </message>
+    <message>
+        <source>Transaction Relay</source>
+        <translation>Relais de transaction</translation>
+    </message>
     <message>
         <source>Connection Time</source>
         <translation>Temps de connexion</translation>
@@ -3229,6 +3560,10 @@ En raison d'un support interrompu, vous devriez demander au vendeur de vous comm
         <source>Network activity disabled</source>
         <translation>Activité réseau désactivée</translation>
     </message>
+    <message>
+        <source>None</source>
+        <translation>Aucun</translation>
+    </message>
     <message>
         <source>Total: %1 (Enabled: %2)</source>
         <translation>Total : %1 (Activé : %2)</translation>
@@ -3550,6 +3885,34 @@ Pour plus d'informations sur l'utilisation de cette console, tapez %6.
         <translation>Demandée</translation>
     </message>
 </context>
+<context>
+    <name>RestoreWalletActivity</name>
+    <message>
+        <source>Restore Wallet</source>
+        <extracomment>Title of progress window which is displayed when wallets are being restored.</extracomment>
+        <translation>Restaurer le portefeuille</translation>
+    </message>
+    <message>
+        <source>Restoring Wallet &lt;b&gt;%1&lt;/b&gt;…</source>
+        <extracomment>Descriptive text of the restore wallets progress window which indicates to the user that wallets are currently being restored.</extracomment>
+        <translation>Restauration du portefeuille &lt;b&gt;%1&lt;/b&gt;…</translation>
+    </message>
+    <message>
+        <source>Restore wallet failed</source>
+        <extracomment>Title of message box which is displayed when the wallet could not be restored.</extracomment>
+        <translation>Échec de la restauration du portefeuille</translation>
+    </message>
+    <message>
+        <source>Restore wallet warning</source>
+        <extracomment>Title of message box which is displayed when the wallet is restored with some warning.</extracomment>
+        <translation>Avertissement de restauration du portefeuille</translation>
+    </message>
+    <message>
+        <source>Restore wallet message</source>
+        <extracomment>Title of message box which is displayed when the wallet is successfully restored.</extracomment>
+        <translation>Message de restauration du portefeuille</translation>
+    </message>
+</context>
 <context>
     <name>SendCoinsDialog</name>
     <message>
@@ -3584,10 +3947,6 @@ Pour plus d'informations sur l'utilisation de cette console, tapez %6.
         <source>Fee:</source>
         <translation>Frais :</translation>
     </message>
-    <message>
-        <source>Dust:</source>
-        <translation>Poussière:</translation>
-    </message>
     <message>
         <source>Inputs…</source>
         <translation>Entrées…</translation>
@@ -3712,10 +4071,6 @@ Pour plus d'informations sur l'utilisation de cette console, tapez %6.
         <source>Copy bytes</source>
         <translation>Copier les octets</translation>
     </message>
-    <message>
-        <source>Copy dust</source>
-        <translation>Copier poussière</translation>
-    </message>
     <message>
         <source>Copy change</source>
         <translation>Copier la monnaie</translation>
@@ -3724,10 +4079,6 @@ Pour plus d'informations sur l'utilisation de cette console, tapez %6.
         <source>%1 (%2 blocks)</source>
         <translation>%1 (%2 blocs)</translation>
     </message>
-    <message>
-        <source>This will produce a Partially Signed Transaction (PSBT) which you can save or copy and then sign with e.g. an offline %1 wallet, or a PSBT-compatible hardware wallet.</source>
-        <translation>Cela produira une transaction partiellement signée (PSBT) que vous pouvez enregistrer ou copier, puis signer avec (par exemple) un portefeuille %1 hors ligne, ou un portefeuille matériel compatible PSBT.</translation>
-    </message>
     <message>
         <source>using</source>
         <translation>utiliser</translation>
@@ -3736,10 +4087,6 @@ Pour plus d'informations sur l'utilisation de cette console, tapez %6.
         <source>%1 to %2</source>
         <translation>%1 à %2</translation>
     </message>
-    <message>
-        <source>Are you sure you want to send?</source>
-        <translation>Êtes-vous sûr de vouloir envoyer ?</translation>
-    </message>
     <message>
         <source>&lt;b&gt;(%1 of %2 entries displayed)&lt;/b&gt;</source>
         <translation>&lt;b&gt;(%1 sur %2 entrées affichées)&lt;/b&gt;</translation>
@@ -3764,10 +4111,6 @@ Pour plus d'informations sur l'utilisation de cette console, tapez %6.
         <source>%1 to '%2'</source>
         <translation>%1 à '%2'</translation>
     </message>
-    <message>
-        <source>Do you want to draft this transaction?</source>
-        <translation>Voulez-vous créer un brouillon de cette transaction ?</translation>
-    </message>
     <message>
         <source>%1 funds only</source>
         <translation>Fonds %1 seulement</translation>
@@ -3816,14 +4159,6 @@ Pour plus d'informations sur l'utilisation de cette console, tapez %6.
         <source>Confirm send coins</source>
         <translation>Confirmer l’envoi des fonds</translation>
     </message>
-    <message>
-        <source>Confirm transaction proposal</source>
-        <translation>Confirmer la proposition de transaction</translation>
-    </message>
-    <message>
-        <source>Create Unsigned</source>
-        <translation>Créer non-signée</translation>
-    </message>
     <message>
         <source>Save Transaction Data</source>
         <translation>Enregistrer les données de transaction</translation>
@@ -3837,8 +4172,28 @@ Pour plus d'informations sur l'utilisation de cette console, tapez %6.
         <translation>Solde à consultation seule :</translation>
     </message>
     <message>
-        <source>Send</source>
-        <translation>Envoyer</translation>
+        <source>Creates a Partially Signed Blockchain Transaction (PSBT) for use with e.g. an offline %1 wallet, or a PSBT-compatible hardware wallet.</source>
+        <translation>Crée une transaction de blockchain partiellement signée (PSBT) pour utilisation avec, par ex., un portefeuille %1 hors ligne, ou un portefeuille matériel compatible PSBT.</translation>
+    </message>
+    <message>
+        <source>Do you want to create this transaction?</source>
+        <extracomment>Message displayed when attempting to create a transaction. Cautionary text to prompt the user to verify that the displayed transaction details represent the transaction the user intends to create.</extracomment>
+        <translation>Voulez-vous créer cette transaction ?</translation>
+    </message>
+    <message>
+        <source>Please, review your transaction proposal. This will produce a Partially Signed Blockchain Transaction (PSBT) which you can save or copy and then sign with e.g. an offline %1 wallet, or a PSBT-compatible hardware wallet.</source>
+        <extracomment>Text to inform a user attempting to create a transaction of their current options. At this stage, a user can only create a PSBT. This string is displayed when private keys are disabled and an external signer is not available.</extracomment>
+        <translation>Veuillez examiner votre proposition de transaction. Cela produira une transaction de blockchain partiellement signée (PSBT) que vous pouvez enregistrer ou copier puis signer avec par ex. un portefeuille %1 hors ligne, ou un portefeuille matériel compatible PSBT.</translation>
+    </message>
+    <message>
+        <source>Please, review your transaction. You can create and send this transaction or create a Partially Signed Blockchain Transaction (PSBT), which you can save or copy and then sign with, e.g., an offline %1 wallet, or a PSBT-compatible hardware wallet.</source>
+        <extracomment>Text to inform a user attempting to create a transaction of their current options. At this stage, a user can send their transaction or create a PSBT. This string is displayed when both private keys and PSBT controls are enabled.</extracomment>
+        <translation>Veuillez examiner votre transaction. Vous pouvez créer et envoyer cette transaction ou créer une transaction de blockchain partiellement signée (PSBT), que vous pouvez enregistrer ou copier puis signer avec, par ex., un portefeuille %1 hors ligne, ou un portefeuille matériel compatible PSBT.</translation>
+    </message>
+    <message>
+        <source>Please, review your transaction.</source>
+        <extracomment>Text to prompt a user to review the details of the transaction they are attempting to send.</extracomment>
+        <translation>Veuillez examiner votre transaction.</translation>
     </message>
     <message>
         <source>To review recipient list click "Show Details…"</source>
@@ -3968,21 +4323,16 @@ Pour plus d'informations sur l'utilisation de cette console, tapez %6.
         <source>A message that was attached to the dash: URI which will be stored with the transaction for your reference. Note: This message will not be sent over the Dash network.</source>
         <translation>Un message joint à l'URI Dash qui sera sauvegardé avec la transaction pour référence. Note : ce message ne sera pas envoyé à travers le réseau Dash.</translation>
     </message>
+</context>
+<context>
+    <name>SendConfirmationDialog</name>
     <message>
-        <source>This is an unauthenticated payment request.</source>
-        <translation>Ceci est une demande de paiement non authentifiée.</translation>
-    </message>
-    <message>
-        <source>This is an authenticated payment request.</source>
-        <translation>Ceci est une demande de paiement authentifiée.</translation>
-    </message>
-    <message>
-        <source>Pay To:</source>
-        <translation>Payer à :</translation>
+        <source>Send</source>
+        <translation>Envoyer</translation>
     </message>
     <message>
-        <source>Memo:</source>
-        <translation>Mémo :</translation>
+        <source>Create Unsigned</source>
+        <translation>Créer non signée</translation>
     </message>
 </context>
 <context>
@@ -4191,20 +4541,9 @@ Pour plus d'informations sur l'utilisation de cette console, tapez %6.
 </context>
 <context>
     <name>TransactionDesc</name>
-    <message numerus="yes">
-        <source>Open for %n more block(s)</source>
-        <translation><numerusform>Ouvert pour %n bloc de plus</numerusform><numerusform>Ouvert pour %n blocs de plus</numerusform><numerusform>Ouvert pour %n blocs de plus</numerusform></translation>
-    </message>
-    <message>
-        <source>Open until %1</source>
-        <translation>Ouvert jusqu'à %1</translation>
-    </message>
-    <message>
-        <source>conflicted</source>
-        <translation>en conflit</translation>
-    </message>
     <message>
         <source>0/unconfirmed, %1</source>
+        <extracomment>Text explaining the current status of a transaction, shown in the status field of the details window for this transaction. This status represents an unconfirmed transaction that is in the memory pool.</extracomment>
         <translation>0/non confirmée, %1</translation>
     </message>
     <message>
@@ -4217,22 +4556,32 @@ Pour plus d'informations sur l'utilisation de cette console, tapez %6.
     </message>
     <message>
         <source>abandoned</source>
+        <extracomment>Text explaining the current status of a transaction, shown in the status field of the details window for this transaction. This status represents an abandoned transaction.</extracomment>
         <translation>abandonné</translation>
     </message>
+    <message>
+        <source>conflicted with a transaction with %1 confirmations</source>
+        <extracomment>Text explaining the current status of a transaction, shown in the status field of the details window for this transaction. This status represents an unconfirmed transaction that conflicts with a confirmed transaction.</extracomment>
+        <translation>en conflit avec une transaction avec %1 confirmations</translation>
+    </message>
     <message>
         <source>%1/unconfirmed</source>
+        <extracomment>Text explaining the current status of a transaction, shown in the status field of the details window for this transaction. This status represents a transaction confirmed in at least one block, but less than 6 blocks, and still not locked via ChainLocks.</extracomment>
         <translation>%1/non confirmée</translation>
     </message>
     <message>
         <source>%1 confirmations</source>
+        <extracomment>Text explaining the current status of a transaction, shown in the status field of the details window for this transaction. This status represents a transaction confirmed in 6 or more blocks or locked via ChainLocks.</extracomment>
         <translation>%1 confirmations</translation>
     </message>
     <message>
         <source>locked via ChainLocks</source>
+        <extracomment>Text explaining the current status of a transaction, shown in the status field of the details window for this transaction. This status represents a transaction confirmed in at least one block and has been locked by ChainLocks.</extracomment>
         <translation>verrouillé avec ChainLocks</translation>
     </message>
     <message>
         <source>verified via InstantSend</source>
+        <extracomment>Text explaining the current status of a transaction, shown in the status field of the details window for this transaction. This status represents an unconfirmed transaction that has been locked by InstantSend.</extracomment>
         <translation>vérifié avec InstantSend</translation>
     </message>
     <message>
@@ -4385,14 +4734,6 @@ Pour plus d'informations sur l'utilisation de cette console, tapez %6.
         <source>Address / Label</source>
         <translation>Adresse / Étiquette</translation>
     </message>
-    <message numerus="yes">
-        <source>Open for %n more block(s)</source>
-        <translation><numerusform>Ouvert pour %n bloc de plus</numerusform><numerusform>Ouvert pour %n blocs de plus</numerusform><numerusform>Ouvert pour %n blocs de plus</numerusform></translation>
-    </message>
-    <message>
-        <source>Open until %1</source>
-        <translation>Ouvert jusqu'à %1</translation>
-    </message>
     <message>
         <source>Unconfirmed</source>
         <translation>Non confirmé</translation>
@@ -4644,6 +4985,11 @@ Pour plus d'informations sur l'utilisation de cette console, tapez %6.
         <source>Show address &amp;QR code</source>
         <translation>Afficher le &amp;QR-code de l'adresse</translation>
     </message>
+    <message>
+        <source>Show in %1</source>
+        <extracomment>Transactions table context menu action to show the selected transaction in a third-party block explorer. %1 is a stand-in argument for the URL of the explorer.</extracomment>
+        <translation>Afficher dans %1</translation>
+    </message>
     <message>
         <source>Export Transaction History</source>
         <translation>Exporter l'historique des transactions</translation>
@@ -4836,10 +5182,6 @@ Allez à Fichier &gt; Ouvrir le portefeuille pour charger un portefeuille.
 </context>
 <context>
     <name>dash-core</name>
-    <message>
-        <source>Fee estimation failed. Fallbackfee is disabled. Wait a few blocks or enable -fallbackfee.</source>
-        <translation>Échec de l'estimation des frais. Les frais de secours sont désactivés. Laissez passer quelques blocs ou activez -fallbackfee.</translation>
-    </message>
     <message>
         <source>This error could occur if this wallet was not shutdown cleanly and was last loaded using a build with a newer version of Berkeley DB. If so, please use the software that last loaded this wallet</source>
         <translation>Cette erreur pourrait survenir si le portefeuille n'était pas proprement fermé et avait été dernièrement chargé depuis une version plus récente de Berkeley DB. Si c'est le cas, veuillez utiliser le logiciel qui a été le plus récent à charger ce portefeuille</translation>
@@ -4912,10 +5254,6 @@ Allez à Fichier &gt; Ouvrir le portefeuille pour charger un portefeuille.
         <source>Failed to listen on any port. Use -listen=0 if you want this.</source>
         <translation>Échec de l'écoute sur un port quelconque. Utilisez -listen=0 si vous voulez ceci.</translation>
     </message>
-    <message>
-        <source>-maxtxfee is set very high! Fees this large could be paid on a single transaction.</source>
-        <translation>-maxtxfee est réglée sur un montant très élevé ! Ces frais aussi élevés peuvent être payés sur une transaction unique.</translation>
-    </message>
     <message>
         <source>Found unconfirmed denominated outputs, will wait till they confirm to continue.</source>
         <translation>Détection de sorties de coupures non confirmées, attente de leur confirmation pour continuer.</translation>
@@ -4924,10 +5262,6 @@ Allez à Fichier &gt; Ouvrir le portefeuille pour charger un portefeuille.
         <source>Invalid -socketevents ('%s') specified. Only these modes are supported: %s</source>
         <translation>Les -socketevents ('%s') spécifiés ne sont pas valides. Seuls ces modes sont compatibles : %s</translation>
     </message>
-    <message>
-        <source>Invalid amount for -maxtxfee=&lt;amount&gt;: '%s' (must be at least the minrelay fee of %s to prevent stuck transactions)</source>
-        <translation>Montant invalide pour -maxtxfee=&lt;montant&gt; : « %s » (doit être au moins du montant de frais minrelay de %s pour éviter des transactions bloquées)</translation>
-    </message>
     <message>
         <source>SQLiteDatabase: Unknown sqlite wallet schema version %d. Only version %d is supported</source>
         <translation>SQLiteDatabase : version %d de portefeuille sqlite inconnue. Seule la version %d est supportée</translation>
@@ -4936,6 +5270,10 @@ Allez à Fichier &gt; Ouvrir le portefeuille pour charger un portefeuille.
         <source>Transaction index can't be disabled with governance validation enabled. Either start with -disablegovernance command line switch or enable transaction index.</source>
         <translation>L'index de transaction ne peut pas être désactivé lorsque la validation de gouvernance est activée. Démarrez en ligne de commande avec l'argument -disablegovernance, ou bien activez l'index de transaction.</translation>
     </message>
+    <message>
+        <source>Unsupported category-specific logging level -loglevel=%s. Expected -loglevel=&lt;category&gt;:&lt;loglevel&gt;. Valid categories: %s. Valid loglevels: %s.</source>
+        <translation>Niveau de journal (spécifique à une catégorie) non supporté : -loglevel=%s. Attendu : -loglevel=&lt;category&gt;:&lt;loglevel&gt;. Catégories valides : %s. Niveaux de journal valides : %s.</translation>
+    </message>
     <message>
         <source>Can't mix: no compatible inputs found!</source>
         <translation>Impossible de mélanger : pas d'entrées compatibles trouvées !</translation>
@@ -4944,6 +5282,14 @@ Allez à Fichier &gt; Ouvrir le portefeuille pour charger un portefeuille.
         <source>Entry exceeds maximum size.</source>
         <translation>L'entrée dépasse la taille maximale.</translation>
     </message>
+    <message>
+        <source>Error upgrading evo database for EHF</source>
+        <translation>Erreur lors de la mise à jour de la base de données Evo pour EHF</translation>
+    </message>
+    <message>
+        <source>Failed to commit Evo database</source>
+        <translation>Échec de la validation de la base de données Evo</translation>
+    </message>
     <message>
         <source>Found enough users, signing ( waiting %s )</source>
         <translation>Nombre suffisant d'utilisateurs trouvé, signature ( attente %s )</translation>
@@ -4968,18 +5314,14 @@ Allez à Fichier &gt; Ouvrir le portefeuille pour charger un portefeuille.
         <source>Insufficient funds.</source>
         <translation>Fonds insuffisants</translation>
     </message>
-    <message>
-        <source>Invalid amount for -discardfee=&lt;amount&gt;: '%s'</source>
-        <translation>Montant invalide pour -discardfee=&lt;montant&gt; : « %s »</translation>
-    </message>
-    <message>
-        <source>Invalid amount for -paytxfee=&lt;amount&gt;: '%s' (must be at least %s)</source>
-        <translation>Montant invalide pour -paytxfee=&lt;montant&gt; : « %s » (minimum possible: %s)</translation>
-    </message>
     <message>
         <source>Invalid minimum number of spork signers specified with -minsporkkeys</source>
         <translation>Le nombre minimal de signataires spork spécifié avec -minsporkkeys est invalide</translation>
     </message>
+    <message>
+        <source>Listening for incoming connections failed (listen returned error %s)</source>
+        <translation>Échec de l'écoute des connexions entrantes (erreur retournée : %s)</translation>
+    </message>
     <message>
         <source>Lock is already in place.</source>
         <translation>Verrou déjà en place.</translation>
@@ -5036,6 +5378,10 @@ Allez à Fichier &gt; Ouvrir le portefeuille pour charger un portefeuille.
         <source>Synchronizing governance objects…</source>
         <translation>Synchronisation des objets de gouvernance…</translation>
     </message>
+    <message>
+        <source>Transaction change output index out of range</source>
+        <translation>Index de sortie de monnaie de transaction hors de la gamme</translation>
+    </message>
     <message>
         <source>Unable to start HTTP server. See debug log for details.</source>
         <translation>Impossible de démarrer le serveur HTTP. Voir le journal de déboguage pour les détails.</translation>
@@ -5044,6 +5390,10 @@ Allez à Fichier &gt; Ouvrir le portefeuille pour charger un portefeuille.
         <source>Unknown response.</source>
         <translation>Réponse inconnue.</translation>
     </message>
+    <message>
+        <source>Unsupported global logging level -loglevel=%s. Valid values: %s.</source>
+        <translation>Niveau de journal global non supporté : -loglevel=%s. Valeurs valides : %s.</translation>
+    </message>
     <message>
         <source>User Agent comment (%s) contains unsafe characters.</source>
         <translation>Le commentaire User Agent (%s) contient des caractères dangereux.</translation>
@@ -5108,10 +5458,6 @@ Allez à Fichier &gt; Ouvrir le portefeuille pour charger un portefeuille.
         <source>Total length of network version string (%i) exceeds maximum length (%i). Reduce the number or size of uacomments.</source>
         <translation>La taille totale de la chaîne de version réseau (%i) dépasse la taille maximum (%i). Réduisez le nombre ou la taille des uacomments.</translation>
     </message>
-    <message>
-        <source>Transaction needs a change address, but we can't generate it. Please call keypoolrefill first.</source>
-        <translation>La transaction nécessite une adresse de monnaie rendue, mais nous ne pouvons pas la générer. Veuillez appeler d'abord keypoolrefill.</translation>
-    </message>
     <message>
         <source>WARNING! Failed to replenish keypool, please unlock your wallet to do so.</source>
         <translation>ATTENTION ! Impossible de réalimenter la série de clefs. Veuillez déverrouiller votre portefeuille pour cela.</translation>
@@ -5188,10 +5534,6 @@ Allez à Fichier &gt; Ouvrir le portefeuille pour charger un portefeuille.
         <source>Error: No addresses available.</source>
         <translation>Erreur : aucune adresse disponible.</translation>
     </message>
-    <message>
-        <source>Exceeded max tries.</source>
-        <translation>Le nombre maximal d'essais est dépassé.</translation>
-    </message>
     <message>
         <source>Failed to create backup %s!</source>
         <translation>La création de la sauvegarde %s a échoué !</translation>
@@ -5232,10 +5574,6 @@ Allez à Fichier &gt; Ouvrir le portefeuille pour charger un portefeuille.
         <source>Invalid P2P permission: '%s'</source>
         <translation>Autorisation P2P invalide : '%s'</translation>
     </message>
-    <message>
-        <source>Invalid amount for -fallbackfee=&lt;amount&gt;: '%s'</source>
-        <translation>Montant invalide pour -fallbackfee=&lt;montant&gt; : « %s »</translation>
-    </message>
     <message>
         <source>Invalid masternodeblsprivkey. Please see documentation.</source>
         <translation>masternodeblsprivkey invalide. Veuillez vous référer à la documentation.</translation>
@@ -5372,10 +5710,6 @@ Allez à Fichier &gt; Ouvrir le portefeuille pour charger un portefeuille.
         <source>Unable to open %s for writing</source>
         <translation>Impossible d'ouvrir %s pour y écrire</translation>
     </message>
-    <message>
-        <source>Unable to parse -maxuploadtarget: '%s' (possible integer overflow?)</source>
-        <translation>Impossible de traiter -maxuploadtarge : '%s' (débordement d'entier ?)</translation>
-    </message>
     <message>
         <source>Unknown -blockfilterindex value %s.</source>
         <translation>Valeur inconnue de -blockfilterindex %s.</translation>
@@ -5384,10 +5718,6 @@ Allez à Fichier &gt; Ouvrir le portefeuille pour charger un portefeuille.
         <source>Unknown new rules activated (versionbit %i)</source>
         <translation>Nouvelles règles inconnues activées (versionbit %i)</translation>
     </message>
-    <message>
-        <source>Upgrading UTXO database</source>
-        <translation>Mise à niveau de la base de données UTXO</translation>
-    </message>
     <message>
         <source>Verifying blocks…</source>
         <translation>Vérification des blocs en cours…</translation>
@@ -5448,10 +5778,6 @@ Allez à Fichier &gt; Ouvrir le portefeuille pour charger un portefeuille.
         <source>Cannot obtain a lock on data directory %s. %s is probably already running.</source>
         <translation>Impossible d’obtenir un verrou sur le répertoire de données %s. %s fonctionne probablement déjà.</translation>
     </message>
-    <message>
-        <source>Cannot upgrade a non HD wallet from version %i to version %i which is non-HD wallet. Use upgradetohd RPC</source>
-        <translation>Impossible de monter un portefeuille non-HD de la version %i à la version %i qui est un portefeuille non-HD. Utilisez RPC upgradetohd</translation>
-    </message>
     <message>
         <source>Distributed under the MIT software license, see the accompanying file %s or %s</source>
         <translation>Distribué sous la licence MIT d’utilisation d’un logiciel. Consulter le fichier joint %s ou %s</translation>
@@ -5484,6 +5810,10 @@ Allez à Fichier &gt; Ouvrir le portefeuille pour charger un portefeuille.
         <source>Failed to rename invalid peers.dat file. Please move or delete it and try again.</source>
         <translation>Impossible de renommer le fichier invalide peers.dat. Veuillez le déplacer, ou bien effacez-le et réessayez.</translation>
     </message>
+    <message>
+        <source>Fee estimation failed. Fallbackfee is disabled. Wait a few blocks or enable %s.</source>
+        <translation>L'estimation des frais a échoué. Fallbackfee est désactivé. Attendez quelques blocs ou activez %s.</translation>
+    </message>
     <message>
         <source>File %s already exists. If you are sure this is what you want, move it out of the way first.</source>
         <translation>Le fichier %s existe déjà. Si vous êtes sûr que c'est ce que vous souhaitez, sortez-le d'abord.</translation>
@@ -5496,6 +5826,10 @@ Allez à Fichier &gt; Ouvrir le portefeuille pour charger un portefeuille.
         <source>Incorrect or no devnet genesis block found. Wrong datadir for devnet specified?</source>
         <translation>Le bloc de genèse devnet est incorrect ou introuvable. Mauvais répertoire de données pour devnet ?</translation>
     </message>
+    <message>
+        <source>Invalid amount for %s=&lt;amount&gt;: '%s' (must be at least the minrelay fee of %s to prevent stuck transactions)</source>
+        <translation>Montant invalide pour %s=&lt;montant&gt; : '%s' (doit être au moins les frais minrelay de %s pour éviter les transactions bloquées)</translation>
+    </message>
     <message>
         <source>Invalid or corrupt peers.dat (%s). If you believe this is a bug, please report it to %s. As a workaround, you can move the file (%s) out of the way (rename, move, or delete) to have a new one created on the next start.</source>
         <translation>peers.dat invalide ou corrompu (%s). Si vous pensez que c'est un bug, veuillez le signaler à %s. Comme contournement, vous pouvez déplacer ailleurs le fichier %s (renommez-le, déplacez-le ou effacez-le) pour qu'un nouveau soit créé au prochain démarrage.</translation>
@@ -5512,6 +5846,10 @@ Allez à Fichier &gt; Ouvrir le portefeuille pour charger un portefeuille.
         <source>No wallet file format provided. To use createfromdump, -format=&lt;format&gt; must be provided.</source>
         <translation>Aucun format de fichier portefeuille fourni. Pour utiliser createfromdump, -format=&lt;format&gt; doit être fourni.</translation>
     </message>
+    <message>
+        <source>Outbound connections restricted to CJDNS (-onlynet=cjdns) but -cjdnsreachable is not provided</source>
+        <translation>Connexions sortantes restreintes à CJDNS (-onlynet=cjdns) mais -cjdnsreachable n'est pas fourni</translation>
+    </message>
     <message>
         <source>Outbound connections restricted to Tor (-onlynet=onion) but the proxy for reaching the Tor network is explicitly forbidden: -onion=0</source>
         <translation>Connexions sortantes restreintes à Tor (-onlynet=onion) mais le proxy pour atteindre le réseau Tor est explicitement interdit : -onion=0</translation>
@@ -5520,6 +5858,10 @@ Allez à Fichier &gt; Ouvrir le portefeuille pour charger un portefeuille.
         <source>Outbound connections restricted to Tor (-onlynet=onion) but the proxy for reaching the Tor network is not provided: none of -proxy, -onion or -listenonion is given</source>
         <translation>Connexions sortantes restreintes à Tor (-onlynet=onion) mais le proxy pour atteindre le réseau Tor n'est pas indiqué : aucun -proxy, -onion ou -listenonion n'est fourni</translation>
     </message>
+    <message>
+        <source>Outbound connections restricted to i2p (-onlynet=i2p) but -i2psam is not provided</source>
+        <translation>Connexions sortantes restreintes à i2p (-onlynet=i2p) mais -i2psam n'est pas fourni</translation>
+    </message>
     <message>
         <source>Please check that your computer's date and time are correct! If your clock is wrong, %s will not work properly.</source>
         <translation>Veuillez vérifier que l’heure et la date de votre ordinateur sont justes ! Si votre horloge n’est pas à l’heure, %s ne fonctionnera pas correctement.</translation>
@@ -5532,10 +5874,6 @@ Allez à Fichier &gt; Ouvrir le portefeuille pour charger un portefeuille.
         <source>Prune mode is incompatible with -reindex-chainstate. Use full -reindex instead.</source>
         <translation>Le mode prune est incompatible avec -reindex-chainstate. Utilisez à la place -reindex.</translation>
     </message>
-    <message>
-        <source>The block index db contains a legacy 'txindex'. To clear the occupied disk space, run a full -reindex, otherwise ignore this error. This error message will not be displayed again.</source>
-        <translation>La base de données d'index de blocs comporte un ancien 'txindex'. Pour vider l'espace-disque occupé, lancez un -reindex intégral, ou bien ignorez cette erreur. Ce message d'erreur ne sera plus affiché.</translation>
-    </message>
     <message>
         <source>This is the maximum transaction fee you pay (in addition to the normal fee) to prioritize partial spend avoidance over regular coin selection.</source>
         <translation>Ceci sont les frais de transaction maximaux que vous payez (en addition des frais normaux) pour prioriser l'évitement de dépense partielle sur le choix normal de pièces.</translation>
@@ -5548,6 +5886,10 @@ Allez à Fichier &gt; Ouvrir le portefeuille pour charger un portefeuille.
         <source>This is the transaction fee you may pay when fee estimates are not available.</source>
         <translation>Il s’agit des frais de transaction que vous pourriez payer si aucune estimation de frais n’est proposée.</translation>
     </message>
+    <message>
+        <source>Transaction requires one destination of non-0 value, a non-0 feerate, or a pre-selected input</source>
+        <translation>La transaction nécessite une destination de valeur non nulle, un taux de frais non nul, ou une entrée présélectionnée</translation>
+    </message>
     <message>
         <source>Unable to replay blocks. You will need to rebuild the database using -reindex-chainstate.</source>
         <translation>Impossible de repasser les blocs. Vous devez reconstruire la base de données en utilisant -reindex-chainstate.</translation>
@@ -5556,6 +5898,10 @@ Allez à Fichier &gt; Ouvrir le portefeuille pour charger un portefeuille.
         <source>Unknown wallet file format "%s" provided. Please provide one of "bdb" or "sqlite".</source>
         <translation>Format de fichier portefeuille "%s" inconnu. Veuillez fournir "bdb" ou "sqlite".</translation>
     </message>
+    <message>
+        <source>Unsupported chainstate database format found. Please restart with -reindex-chainstate. This will rebuild the chainstate database.</source>
+        <translation>Format de base de données chainstate non pris en charge trouvé. Veuillez redémarrer avec -reindex-chainstate. Cela reconstruira la base de données chainstate.</translation>
+    </message>
     <message>
         <source>Warning: Dumpfile wallet format "%s" does not match command line specified format "%s".</source>
         <translation>Avertissement : le format de portefeuille dumpfile "%s" ne correspond pas au format "%s" spécifié en ligne de commande.</translation>
@@ -5596,10 +5942,30 @@ Allez à Fichier &gt; Ouvrir le portefeuille pour charger un portefeuille.
         <source>-rpcport must be specified when -devnet and -server are specified</source>
         <translation>-rpcport doit être spécifié si -devnet et -server le sont déjà</translation>
     </message>
+    <message>
+        <source>-statsbatchsize cannot be configured with a negative value.</source>
+        <translation>-statsbatchsize ne peut pas être configuré avec une valeur négative.</translation>
+    </message>
+    <message>
+        <source>-statsduration cannot be configured with a negative value.</source>
+        <translation>-statsduration ne peut pas être configuré avec une valeur négative.</translation>
+    </message>
     <message>
         <source>A fatal internal error occurred, see debug.log for details</source>
         <translation>Une erreur interne fatale s'est produite. Voir debug.log pour les détails</translation>
     </message>
+    <message>
+        <source>Cannot create socket (socket() returned error %s)</source>
+        <translation>Impossible de créer le socket (socket() a renvoyé l'erreur %s)</translation>
+    </message>
+    <message>
+        <source>Cannot get socket address for %s</source>
+        <translation>Impossible d'obtenir l'adresse du socket pour %s</translation>
+    </message>
+    <message>
+        <source>Cannot init Statsd client</source>
+        <translation>Impossible d'initialiser le client Statsd</translation>
+    </message>
     <message>
         <source>Cannot resolve -%s address: '%s'</source>
         <translation>Impossible de résoudre l’adresse -%s : « %s »</translation>
@@ -5644,10 +6010,6 @@ Allez à Fichier &gt; Ouvrir le portefeuille pour charger un portefeuille.
         <source>Error reading next record from wallet database</source>
         <translation>Erreur à la lecture de l'enregistrement suivant sur la base de données du portefeuille</translation>
     </message>
-    <message>
-        <source>Error upgrading chainstate database</source>
-        <translation>Erreur de mise à niveau de la base de données d’état de la chaîne</translation>
-    </message>
     <message>
         <source>Loading P2P addresses…</source>
         <translation>Chargement des adresses P2P…</translation>
@@ -5768,10 +6130,70 @@ Allez à Fichier &gt; Ouvrir le portefeuille pour charger un portefeuille.
         <source>%s corrupt. Try using the wallet tool dash-wallet to salvage or restoring a backup.</source>
         <translation>%s corrompu. Essayez d'utiliser l'outil de portefeuille dash-wallet pour réparer, ou restaurer une sauvegarde.</translation>
     </message>
+    <message>
+        <source>%s is set very high! Fees this large could be paid on a single transaction.</source>
+        <translation>%s est défini très haut ! Des frais aussi importants pourraient être payés sur une seule transaction.</translation>
+    </message>
+    <message>
+        <source>%s request to listen on port %u. This port is considered "bad" and thus it is unlikely that any Dash Core peers connect to it. See doc/p2p-bad-ports.md for details and a full list.</source>
+        <translation>Requête %s pour écouter le port %u. Ce port est considéré "mauvais" et il est donc improbable que des pairs Dash Core s'y connectent. Voir doc/p2p-bad-ports.md pour détails et liste.</translation>
+    </message>
+    <message>
+        <source>Cannot provide specific connections and have addrman find outgoing connections at the same time.</source>
+        <translation>Impossible de fournir des connexions spécifiques pendant que addrman trouve des connexions de sortie.</translation>
+    </message>
+    <message>
+        <source>Failed to upgrade Evo database</source>
+        <translation>Échec de la mise à niveau de la base de données Evo</translation>
+    </message>
+    <message>
+        <source>Fee needed &gt; fee paid</source>
+        <translation>Frais nécessaires &gt; frais payés</translation>
+    </message>
+    <message>
+        <source>Host %s on unsupported network</source>
+        <translation>Hôte %s sur un réseau non pris en charge</translation>
+    </message>
+    <message>
+        <source>Invalid amount for %s=&lt;amount&gt;: '%s' (must be at least %s)</source>
+        <translation>Montant invalide pour %s=&lt;montant&gt; : '%s' (doit être au moins %s)</translation>
+    </message>
+    <message>
+        <source>Invalid amount for %s=&lt;amount&gt;: '%s'</source>
+        <translation>Montant invalide pour %s=&lt;montant&gt; : '%s'</translation>
+    </message>
+    <message>
+        <source>Invalid port specified in %s: '%s'</source>
+        <translation>Port invalide spécifié dans %s : '%s'</translation>
+    </message>
     <message>
         <source>Last successful action was too recent.</source>
         <translation>La dernière action réussie est trop récente.</translation>
     </message>
+    <message>
+        <source>Missing solving data for estimating transaction size</source>
+        <translation>Données de résolution manquantes pour estimer la taille de la transaction</translation>
+    </message>
+    <message>
+        <source>No host specified</source>
+        <translation>Aucun hôte spécifié</translation>
+    </message>
+    <message>
+        <source>No host specified, malformed URL</source>
+        <translation>Aucun hôte spécifié, URL mal formée</translation>
+    </message>
+    <message>
+        <source>No text before the scheme delimiter, malformed URL</source>
+        <translation>Aucun texte avant le délimiteur de schéma, URL mal formée</translation>
+    </message>
+    <message>
+        <source>Port must be between %d and %d, supplied %d</source>
+        <translation>Le port doit être entre %d et %d, fourni %d</translation>
+    </message>
+    <message>
+        <source>Socket not initialized, cannot send message</source>
+        <translation>Socket non initialisé, impossible d'envoyer le message</translation>
+    </message>
     <message>
         <source>The source code is available from %s.</source>
         <translation>Le code source se trouve sur %s.</translation>
@@ -5800,6 +6222,10 @@ Allez à Fichier &gt; Ouvrir le portefeuille pour charger un portefeuille.
         <source>Transaction fees are too high.</source>
         <translation>Les frais de transaction sont trop élevés.</translation>
     </message>
+    <message>
+        <source>Transaction needs a change address, but we can't generate it.</source>
+        <translation>La transaction nécessite une adresse de monnaie, mais nous ne pouvons pas la générer.</translation>
+    </message>
     <message>
         <source>Transaction not valid.</source>
         <translation>Transaction invalide.</translation>
@@ -5820,6 +6246,18 @@ Allez à Fichier &gt; Ouvrir le portefeuille pour charger un portefeuille.
         <source>Unable to locate enough non-denominated funds for this transaction.</source>
         <translation>Impossible de trouver pour cette transaction suffisamment de fonds hors coupures.</translation>
     </message>
+    <message>
+        <source>Unable to lookup host %s</source>
+        <translation>Impossible de rechercher l'hôte %s</translation>
+    </message>
+    <message>
+        <source>Unable to parse -maxuploadtarget: '%s'</source>
+        <translation>Impossible d'analyser -maxuploadtarget : '%s'</translation>
+    </message>
+    <message>
+        <source>Unable to send message to %s (::sendto() returned error %s)</source>
+        <translation>Impossible d'envoyer le message à %s (::sendto() a renvoyé l'erreur %s)</translation>
+    </message>
     <message>
         <source>Unable to sign spork message, wrong key?</source>
         <translation>Impossible de signer le message spork, mauvaise clef ?</translation>
@@ -5832,6 +6270,10 @@ Allez à Fichier &gt; Ouvrir le portefeuille pour charger un portefeuille.
         <source>Unknown state: id = %u</source>
         <translation>État inconnu : id = %u</translation>
     </message>
+    <message>
+        <source>Unsupported URL scheme, must begin with udp://</source>
+        <translation>Schéma d'URL non pris en charge, doit commencer par udp://</translation>
+    </message>
     <message>
         <source>Unsupported logging category %s=%s.</source>
         <translation>Catégorie de journalisation non supportée %s=%s.</translation>

From 00c7afe813f3f8fd077d891b544d55a8380c35b6 Mon Sep 17 00:00:00 2001
From: UdjinM6 <UdjinM6@users.noreply.github.com>
Date: Thu, 23 Oct 2025 20:44:19 +0300
Subject: [PATCH 323/656] it

---
 src/qt/locale/dash_it.ts | 818 ++++++++++++++++++++++++++++++---------
 1 file changed, 630 insertions(+), 188 deletions(-)

diff --git a/src/qt/locale/dash_it.ts b/src/qt/locale/dash_it.ts
index e769b3ba2ae6..5d2781416b10 100644
--- a/src/qt/locale/dash_it.ts
+++ b/src/qt/locale/dash_it.ts
@@ -65,14 +65,6 @@
         <source>C&amp;hoose</source>
         <translation>Sc&amp;egli</translation>
     </message>
-    <message>
-        <source>Sending addresses</source>
-        <translation>Indirizzi d'invio</translation>
-    </message>
-    <message>
-        <source>Receiving addresses</source>
-        <translation>Indirizzi di ricezione</translation>
-    </message>
     <message>
         <source>These are your Dash addresses for sending payments. Always check the amount and the receiving address before sending coins.</source>
         <translation>Questi sono i tuoi indirizzi Dash per inviare i pagamenti. Controlla sempre l'ammontare e l'indirizzo di destinazione prima di inviare i dash.</translation>
@@ -115,6 +107,14 @@
         <extracomment>An error message. %1 is a stand-in argument for the name of the file we attempted to save to.</extracomment>
         <translation>Si è verificato un errore durante il tentativo di salvare l'elenco di indirizzi in %1. Per favore riprova.</translation>
     </message>
+    <message>
+        <source>Sending addresses - %1</source>
+        <translation>Indirizzi di invio - %1</translation>
+    </message>
+    <message>
+        <source>Receiving addresses - %1</source>
+        <translation>Indirizzi di ricezione - %1</translation>
+    </message>
     <message>
         <source>Exporting Failed</source>
         <translation>Esportazione Fallita.</translation>
@@ -284,10 +284,22 @@
         <source>The passphrase entered for the wallet decryption was incorrect.</source>
         <translation>La passphrase inserita per la decrittazione del portafoglio è errata.</translation>
     </message>
+    <message>
+        <source>The passphrase entered for the wallet decryption is incorrect. It contains a null character (ie - a zero byte). If the passphrase was set with a version of this software prior to 23.0, please try again with only the characters up to — but not including — the first null character. If this is successful, please set a new passphrase to avoid this issue in the future.</source>
+        <translation>La passphrase inserita per la decrittazione del portafoglio non è corretta. Contiene un carattere nullo (cioè un byte zero). Se la passphrase è stata impostata con una versione di questo software precedente alla 23.0, riprova con solo i caratteri fino a — ma senza includere — il primo carattere nullo. Se ha successo, imposta una nuova passphrase per evitare questo problema in futuro.</translation>
+    </message>
     <message>
         <source>Wallet passphrase was successfully changed.</source>
         <translation>Passphrases del portafoglio modificata con successo.</translation>
     </message>
+    <message>
+        <source>Passphrase change failed</source>
+        <translation>Modifica passphrase fallita</translation>
+    </message>
+    <message>
+        <source>The old passphrase entered for the wallet decryption is incorrect. It contains a null character (ie - a zero byte). If the passphrase was set with a version of this software prior to 23.0, please try again with only the characters up to — but not including — the first null character.</source>
+        <translation>La vecchia passphrase inserita per la decrittazione del portafoglio non è corretta. Contiene un carattere nullo (cioè un byte zero). Se la passphrase è stata impostata con una versione di questo software precedente alla 23.0, riprova con solo i caratteri fino a — ma senza includere — il primo carattere nullo.</translation>
+    </message>
     <message>
         <source>Warning: The Caps Lock key is on!</source>
         <translation>Attenzione: il tasto Blocco maiuscole è attivo!</translation>
@@ -392,10 +404,6 @@
         <source>&amp;Load PSBT from file…</source>
         <translation>&amp;Carica PSBT dal file…</translation>
     </message>
-    <message>
-        <source>Load PSBT from clipboard…</source>
-        <translation>Carica PSBT dagli appunti…</translation>
-    </message>
     <message>
         <source>&amp;Sending addresses</source>
         <translation>&amp;Indirizzi di invio</translation>
@@ -428,10 +436,6 @@
         <source>&amp;Window</source>
         <translation>&amp;Finestra</translation>
     </message>
-    <message>
-        <source>Minimize</source>
-        <translation>Minimizzare</translation>
-    </message>
     <message>
         <source>Zoom</source>
         <translation>Ingrandisci</translation>
@@ -484,14 +488,6 @@
         <source>Modify configuration options for %1</source>
         <translation>Modifica le opzioni di configurazione per %1</translation>
     </message>
-    <message>
-        <source>&amp;Show / Hide</source>
-        <translation>&amp;Mostra / Nascondi</translation>
-    </message>
-    <message>
-        <source>Show or hide the main Window</source>
-        <translation>Mostra o nascondi la Finestra principale</translation>
-    </message>
     <message>
         <source>Encrypt the private keys that belong to your wallet</source>
         <translation>Cifra le chiavi private che appartengono al tuo portafoglio</translation>
@@ -556,10 +552,6 @@
         <source>Show wallet repair options</source>
         <translation>Mostrare le opzioni per riparare il portafoglio</translation>
     </message>
-    <message>
-        <source>Open Wallet &amp;Configuration File</source>
-        <translation>Apri il &amp;Configuration File del Portafoglio</translation>
-    </message>
     <message>
         <source>Open configuration file</source>
         <translation>Apri il file di configurazione</translation>
@@ -614,10 +606,18 @@
         <source>Show information about %1</source>
         <translation>Mostra informazioni %1</translation>
     </message>
+    <message>
+        <source>Load PSBT from &amp;clipboard…</source>
+        <translation>Carica PSBT dagli appunti…</translation>
+    </message>
     <message>
         <source>Open debugging and diagnostic console</source>
         <translation>Aprire la console di debug e diagnostica</translation>
     </message>
+    <message>
+        <source>Open &amp;wallet configuration file</source>
+        <translation>Apri file di configurazione del portafoglio</translation>
+    </message>
     <message>
         <source>Open a dash: URI</source>
         <translation>Apri un dash: URI</translation>
@@ -626,6 +626,16 @@
         <source>Create a new wallet</source>
         <translation>Crea un nuovo portafoglio</translation>
     </message>
+    <message>
+        <source>Restore Wallet…</source>
+        <extracomment>Name of the menu item that restores wallet from a backup file.</extracomment>
+        <translation>Ripristina portafoglio…</translation>
+    </message>
+    <message>
+        <source>Restore a wallet from a backup file</source>
+        <extracomment>Status tip for Restore Wallet menu item</extracomment>
+        <translation>Ripristina un portafoglio da un file di backup</translation>
+    </message>
     <message>
         <source>Close all wallets</source>
         <translation>Chiudi tutti i Wallet…</translation>
@@ -646,10 +656,34 @@
         <source>Mask the values in the Overview tab</source>
         <translation>Maschera i valori nella scheda Panoramica</translation>
     </message>
+    <message>
+        <source>Wallet Data</source>
+        <extracomment>Name of the wallet data file format.</extracomment>
+        <translation>Dati portafoglio</translation>
+    </message>
+    <message>
+        <source>Load Wallet Backup</source>
+        <extracomment>The title for Restore Wallet File Windows</extracomment>
+        <translation>Carica backup portafoglio</translation>
+    </message>
+    <message>
+        <source>Restore Wallet</source>
+        <extracomment>Title of pop-up window shown when the user is attempting to restore a wallet.</extracomment>
+        <translation>Ripristina portafoglio</translation>
+    </message>
+    <message>
+        <source>Wallet Name</source>
+        <extracomment>Label of the input field where the name of the wallet is entered.</extracomment>
+        <translation>Nome portafoglio</translation>
+    </message>
     <message>
         <source>&amp;Settings</source>
         <translation>&amp;Impostazioni</translation>
     </message>
+    <message>
+        <source>&amp;Minimize</source>
+        <translation>&amp;Riduci a icona</translation>
+    </message>
     <message>
         <source>&amp;Help</source>
         <translation>&amp;Aiuto</translation>
@@ -666,6 +700,14 @@
         <source>View Governance Proposals</source>
         <translation>Visualizza le Proposte di Governance</translation>
     </message>
+    <message>
+        <source>&amp;Hide</source>
+        <translation>&amp;Nascondi</translation>
+    </message>
+    <message>
+        <source>S&amp;how</source>
+        <translation>&amp;Mostra</translation>
+    </message>
     <message numerus="yes">
         <source>%n active connection(s) to Dash network</source>
         <extracomment>A substring of the tooltip.</extracomment>
@@ -687,6 +729,14 @@
         <source>Close Wallet…</source>
         <translation>Chiudi Portafoglio…</translation>
     </message>
+    <message>
+        <source>Load Partially Signed Blockchain Transaction</source>
+        <translation>Carica Transazione Blockchain Parzialmente Firmata</translation>
+    </message>
+    <message>
+        <source>Load Partially Signed Blockchain Transaction from clipboard</source>
+        <translation>Carica la Transazione Blockchain Parzialmente Firmata dagli appunti</translation>
+    </message>
     <message>
         <source>Create Wallet…</source>
         <translation>Crea portafoglio…</translation>
@@ -739,10 +789,6 @@
         <source>Processing blocks on disk…</source>
         <translation>Elaborazione dei blocchi su disco…</translation>
     </message>
-    <message>
-        <source>Reindexing blocks on disk…</source>
-        <translation>Re-indicizzazione blocchi su disco…</translation>
-    </message>
     <message>
         <source>Connecting to peers…</source>
         <translation>Connessione ai peers</translation>
@@ -896,10 +942,6 @@
         <source>Coin Selection</source>
         <translation>Selezione Moneta</translation>
     </message>
-    <message>
-        <source>Dust:</source>
-        <translation>Infinitesimale:</translation>
-    </message>
     <message>
         <source>After Fee:</source>
         <translation>Dopo Commissione:</translation>
@@ -1000,10 +1042,6 @@
         <source>Copy bytes</source>
         <translation>Copia byte</translation>
     </message>
-    <message>
-        <source>Copy dust</source>
-        <translation>Copia infinitesimale</translation>
-    </message>
     <message>
         <source>Copy change</source>
         <translation>Copia resto</translation>
@@ -1016,18 +1054,6 @@
         <source>(%1 locked)</source>
         <translation>(%1 bloccato)</translation>
     </message>
-    <message>
-        <source>yes</source>
-        <translation>sì</translation>
-    </message>
-    <message>
-        <source>no</source>
-        <translation>no</translation>
-    </message>
-    <message>
-        <source>This label turns red if any recipient receives an amount smaller than the current dust threshold.</source>
-        <translation>Questa etichetta diventerà rossa se uno qualsiasi dei destinatari riceverà un importo inferiore alla corrente soglia minima per la movimentazione della valuta.</translation>
-    </message>
     <message>
         <source>Can vary +/- %1 duff(s) per input.</source>
         <translation>Può variare di +/- %1 duff per input.</translation>
@@ -1241,18 +1267,102 @@
         <source>Filter proposal list</source>
         <translation>Filtra l'elenco delle proposal</translation>
     </message>
+    <message>
+        <source>Masternode Count:</source>
+        <translation>Conteggio Masternode:</translation>
+    </message>
+    <message>
+        <source>Number of masternodes this wallet can vote with (masternodes for which this wallet holds the voting key)</source>
+        <translation>Numero di masternode con cui questo portafoglio può votare (masternode per i quali questo portafoglio detiene la chiave di voto)</translation>
+    </message>
     <message>
         <source>Proposal Count:</source>
         <translation>Conteggio delle proposte:</translation>
     </message>
+    <message>
+        <source>Create Proposal</source>
+        <translation>Crea proposta</translation>
+    </message>
     <message>
         <source>Filter by Title</source>
         <translation>Filtra per Titolo</translation>
     </message>
+    <message>
+        <source>Unavailable</source>
+        <translation>Non disponibile</translation>
+    </message>
+    <message>
+        <source>A synced node and an unlocked wallet are required.</source>
+        <translation>È richiesto un nodo sincronizzato e un portafoglio sbloccato.</translation>
+    </message>
+    <message>
+        <source>Vote Yes</source>
+        <translation>Vota Sì</translation>
+    </message>
+    <message>
+        <source>Vote No</source>
+        <translation>Vota No</translation>
+    </message>
+    <message>
+        <source>Vote Abstain</source>
+        <translation>Vota Astenuto</translation>
+    </message>
     <message>
         <source>Proposal Info: %1</source>
         <translation>Informazioni sulla proposta: %1</translation>
     </message>
+    <message>
+        <source>Voting Failed</source>
+        <translation>Votazione fallita</translation>
+    </message>
+    <message>
+        <source>No wallet available.</source>
+        <translation>Nessun portafoglio disponibile.</translation>
+    </message>
+    <message>
+        <source>No masternode voting keys found in wallet.</source>
+        <translation>Nessuna chiave di voto masternode trovata nel portafoglio.</translation>
+    </message>
+    <message>
+        <source>Please select a proposal to vote on.</source>
+        <translation>Seleziona una proposta su cui votare.</translation>
+    </message>
+    <message>
+        <source>Unable to unlock wallet.</source>
+        <translation>Impossibile sbloccare il portafoglio.</translation>
+    </message>
+    <message>
+        <source>Unable to get masternode list. Please try again later.</source>
+        <translation>Impossibile ottenere l'elenco dei masternode. Riprova più tardi.</translation>
+    </message>
+    <message>
+        <source>Masternode %1 not found</source>
+        <translation>Masternode %1 non trovato</translation>
+    </message>
+    <message>
+        <source>Failed to sign vote for masternode %1</source>
+        <translation>Impossibile firmare il voto per il masternode %1</translation>
+    </message>
+    <message>
+        <source>Masternode %1: %2</source>
+        <translation>Masternode %1: %2</translation>
+    </message>
+    <message numerus="yes">
+        <source>Voted successfully %n time(s)</source>
+        <translation><numerusform>Votato con successo %n volta</numerusform><numerusform>Votato con successo %n volte</numerusform><numerusform>Votato con successo %n volte</numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <source>Failed to vote %n time(s)</source>
+        <translation><numerusform>Impossibile votare %n volta</numerusform><numerusform>Impossibile votare %n volte</numerusform><numerusform>Impossibile votare %n volte</numerusform></translation>
+    </message>
+    <message>
+        <source>Errors:</source>
+        <translation>Errori:</translation>
+    </message>
+    <message>
+        <source>Voting Results</source>
+        <translation>Risultati della votazione</translation>
+    </message>
 </context>
 <context>
     <name>HelpMessageDialog</name>
@@ -1323,13 +1433,17 @@
         <source>Use a custom data directory:</source>
         <translation>Usa una cartella dati personalizzata:</translation>
     </message>
-    <message>
-        <source>(of %1 GB needed)</source>
-        <translation>(di %1 GB necessari)</translation>
+    <message numerus="yes">
+        <source>%n GB of space available</source>
+        <translation><numerusform>%n GB di spazio disponibile</numerusform><numerusform>%n GB di spazio disponibili</numerusform><numerusform>%n GB di spazio disponibili</numerusform></translation>
     </message>
-    <message>
-        <source>(%1 GB needed for full chain)</source>
-        <translation>(%1 GB necessario per la catena completa)</translation>
+    <message numerus="yes">
+        <source>(of %n GB needed)</source>
+        <translation><numerusform>(di %n GB necessario)</numerusform><numerusform>(di %n GB necessari)</numerusform><numerusform>(di %n GB necessari)</numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <source>(%n GB needed for full chain)</source>
+        <translation><numerusform>(%n GB necessario per la catena completa)</numerusform><numerusform>(%n GB necessari per la catena completa)</numerusform><numerusform>(%n GB necessari per la catena completa)</numerusform></translation>
     </message>
     <message>
         <source>At least %1 GB of data will be stored in this directory, and it will grow over time.</source>
@@ -1361,6 +1475,13 @@
         <translation>Errore</translation>
     </message>
 </context>
+<context>
+    <name>LoadWalletsActivity</name>
+    <message>
+        <source>Loading wallets…</source>
+        <translation>Caricamento portafogli…</translation>
+    </message>
+</context>
 <context>
     <name>MasternodeList</name>
     <message>
@@ -1553,6 +1674,11 @@
         <source>URI:</source>
         <translation>URI:</translation>
     </message>
+    <message>
+        <source>Paste address from clipboard</source>
+        <extracomment>Tooltip text for button that allows you to paste an address that is in your clipboard.</extracomment>
+        <translation>Incolla l'indirizzo dagli appunti</translation>
+    </message>
 </context>
 <context>
     <name>OpenWalletActivity</name>
@@ -1663,6 +1789,16 @@
         <extracomment>An Options window setting to set subtracting the fee from a sending amount as default.</extracomment>
         <translation>Sottrai &amp;commissione dall'importo per impostazione predefinita</translation>
     </message>
+    <message>
+        <source>Enable &amp;PSBT controls</source>
+        <extracomment>An options window setting to enable PSBT controls.</extracomment>
+        <translation>Abilita controlli &amp;PSBT</translation>
+    </message>
+    <message>
+        <source>Whether to show PSBT controls.</source>
+        <extracomment>Tooltip text for options window setting that enables PSBT controls.</extracomment>
+        <translation>Se mostrare i controlli PSBT.</translation>
+    </message>
     <message>
         <source>Whether to keep the specified custom change address or not.</source>
         <translation>Indica se mantenere o meno l'indirizzo di modifica personalizzato specificato.</translation>
@@ -1806,20 +1942,20 @@ https://explore.transifex.com/dash/dash/</source>
 https://explore.transifex.com/dash/dash/</translation>
     </message>
     <message>
-        <source>Options set in this dialog are overridden by the command line or in the configuration file:</source>
-        <translation>Le opzioni impostate in questa finestra di dialogo sono sovrascritte dalla riga di comando o nel file di configurazione:</translation>
+        <source>Third-party URLs (e.g. a block explorer) that appear in the transactions tab as context menu items.&lt;br/&gt;%s in the URL is replaced by transaction hash. Multiple URLs are separated by vertical bar |.</source>
+        <translation>URL di terze parti (ad es. un block explorer) che appaiono nella scheda transazioni come voci del menu contestuale.&lt;br/&gt;%s nell'URL viene sostituito dall'hash della transazione. URL multipli sono separati da barra verticale |.</translation>
     </message>
     <message>
-        <source>Minimize instead of exit the application when the window is closed. When this option is enabled, the application will be closed only after selecting Exit in the menu.</source>
-        <translation>Riduci ad icona invece di uscire dall'applicazione quando la finestra viene chiusa. Attivando questa opzione l'applicazione terminerà solo dopo aver selezionato Esci dal menu File.</translation>
+        <source>&amp;Third-party transaction URLs</source>
+        <translation>URL di &amp;transazione di terze parti</translation>
     </message>
     <message>
-        <source>Third party URLs (e.g. a block explorer) that appear in the transactions tab as context menu items.&lt;br/&gt;%s in the URL is replaced by transaction hash. Multiple URLs are separated by vertical bar |.</source>
-        <translation>URL di terze parti (es: un block explorer) che appaiono nella tabella delle transazioni come voci nel menu contestuale. &lt;br/&gt;%s nell'URL è sostituito dall'hash della transazione. Più URL vengono separati da una barra verticale |.</translation>
+        <source>Options set in this dialog are overridden by the command line or in the configuration file:</source>
+        <translation>Le opzioni impostate in questa finestra di dialogo sono sovrascritte dalla riga di comando o nel file di configurazione:</translation>
     </message>
     <message>
-        <source>&amp;Third party transaction URLs</source>
-        <translation>&amp;URL transazioni di terze parti</translation>
+        <source>Minimize instead of exit the application when the window is closed. When this option is enabled, the application will be closed only after selecting Exit in the menu.</source>
+        <translation>Riduci ad icona invece di uscire dall'applicazione quando la finestra viene chiusa. Attivando questa opzione l'applicazione terminerà solo dopo aver selezionato Esci dal menu File.</translation>
     </message>
     <message>
         <source>Whether to show coin control features or not.</source>
@@ -1963,14 +2099,22 @@ https://explore.transifex.com/dash/dash/</translation>
     </message>
     <message>
         <source>Confirm options reset</source>
+        <extracomment>Window title text of pop-up window shown when the user has chosen to reset options.</extracomment>
         <translation>Conferma ripristino opzioni</translation>
     </message>
     <message>
         <source>Client restart required to activate changes.</source>
+        <extracomment>Text explaining that the settings changed will not come into effect until the client is restarted.</extracomment>
         <translation>È necessario un riavvio del client per rendere attivi i cambiamenti.</translation>
     </message>
+    <message>
+        <source>Current settings will be backed up at "%1".</source>
+        <extracomment>Text explaining to the user that the client's current settings will be backed up at a specific location. %1 is a stand-in argument for the backup location's path.</extracomment>
+        <translation>Le impostazioni correnti verranno salvate in "%1".</translation>
+    </message>
     <message>
         <source>Client will be shut down. Do you want to proceed?</source>
+        <extracomment>Text asking the user to confirm if they would like to proceed with a client shutdown.</extracomment>
         <translation>Il client sarà arrestato. Si desidera procedere?</translation>
     </message>
     <message>
@@ -2243,6 +2387,10 @@ https://explore.transifex.com/dash/dash/</translation>
         <source>Failed to sign transaction: %1</source>
         <translation>Impossibile firmare la transazione: %1</translation>
     </message>
+    <message>
+        <source>Cannot sign inputs while wallet is locked.</source>
+        <translation>Impossibile firmare gli input mentre il wallet è bloccato.</translation>
+    </message>
     <message>
         <source>Could not sign any more inputs.</source>
         <translation>Impossibile firmare altri input.</translation>
@@ -2487,6 +2635,181 @@ A causa dell'interruzione del supporto, dovresti richiedere al commerciante di f
         <translation>Stato</translation>
     </message>
 </context>
+<context>
+    <name>ProposalWizard</name>
+    <message>
+        <source>Create Governance Proposal</source>
+        <translation>Crea proposta di governance</translation>
+    </message>
+    <message>
+        <source>Enter proposal details</source>
+        <translation>Inserisci i dettagli della proposta</translation>
+    </message>
+    <message>
+        <source>A fee will be burned when you prepare the proposal.</source>
+        <translation>Una commissione verrà bruciata quando prepari la proposta.</translation>
+    </message>
+    <message>
+        <source>Proposal &amp;name</source>
+        <translation>&amp;Nome proposta</translation>
+    </message>
+    <message>
+        <source>&amp;Description URL</source>
+        <translation>URL &amp;descrizione</translation>
+    </message>
+    <message>
+        <source>Payment &amp;address</source>
+        <translation>&amp;Indirizzo di pagamento</translation>
+    </message>
+    <message>
+        <source>Payment &amp;amount</source>
+        <translation>I&amp;mporto del pagamento</translation>
+    </message>
+    <message>
+        <source>The amount to request in a single payment</source>
+        <translation>L'importo da richiedere in un singolo pagamento</translation>
+    </message>
+    <message>
+        <source>&amp;First payment</source>
+        <translation>&amp;Primo pagamento</translation>
+    </message>
+    <message>
+        <source>Pa&amp;yments</source>
+        <translation>Paga&amp;menti</translation>
+    </message>
+    <message>
+        <source>To&amp;tal amount</source>
+        <translation>Importo to&amp;tale</translation>
+    </message>
+    <message>
+        <source>Proposal &amp;fee</source>
+        <translation>&amp;Commissione della proposta</translation>
+    </message>
+    <message>
+        <source>Next</source>
+        <translation>Avanti</translation>
+    </message>
+    <message>
+        <source>Review proposal JSON and validate.</source>
+        <translation>Rivedi il JSON della proposta e convalida.</translation>
+    </message>
+    <message>
+        <source>Hex-encoded JSON</source>
+        <translation>JSON codificato in esadecimale</translation>
+    </message>
+    <message>
+        <source>Back</source>
+        <translation>Indietro</translation>
+    </message>
+    <message>
+        <source>Validate</source>
+        <translation>Convalida</translation>
+    </message>
+    <message>
+        <source>Prepare (burn fee) and wait for confirmations.</source>
+        <translation>Prepara (brucia commissione) e attendi le conferme.</translation>
+    </message>
+    <message>
+        <source>Copy</source>
+        <translation>Copia</translation>
+    </message>
+    <message>
+        <source>At 1/6 confirmations: can be relayed and queued. At 6/6: accepted and processed.</source>
+        <translation>A 1/6 conferme: può essere inoltrato e accodato. A 6/6: accettato ed elaborato.</translation>
+    </message>
+    <message>
+        <source>Confirmations progress</source>
+        <translation>Progresso delle conferme</translation>
+    </message>
+    <message>
+        <source>Shows progress toward the required number of confirmations for the proposal fee transaction.</source>
+        <translation>Mostra il progresso verso il numero richiesto di conferme per la transazione della commissione della proposta.</translation>
+    </message>
+    <message>
+        <source>Estimated time remaining: -</source>
+        <translation>Tempo stimato rimanente: -</translation>
+    </message>
+    <message>
+        <source>Prepare Proposal</source>
+        <translation>Prepara proposta</translation>
+    </message>
+    <message>
+        <source>You can submit after 1 confirmation. At 6 confirmations it is accepted and processed.</source>
+        <translation>Puoi inviare dopo 1 conferma. A 6 conferme viene accettato ed elaborato.</translation>
+    </message>
+    <message>
+        <source>Proposal ID:</source>
+        <translation>ID proposta:</translation>
+    </message>
+    <message>
+        <source>Submit Proposal</source>
+        <translation>Invia proposta</translation>
+    </message>
+    <message>
+        <source>Close</source>
+        <translation>Chiudi</translation>
+    </message>
+    <message>
+        <source>Valid</source>
+        <translation>Valido</translation>
+    </message>
+    <message>
+        <source>Invalid: %1</source>
+        <translation>Non valido: %1</translation>
+    </message>
+    <message>
+        <source>Burn %1</source>
+        <translation>Brucia %1</translation>
+    </message>
+    <message>
+        <source>Burn %1 to create the fee transaction?</source>
+        <translation>Bruciare %1 per creare la transazione della commissione?</translation>
+    </message>
+    <message>
+        <source>Prepare failed</source>
+        <translation>Preparazione fallita</translation>
+    </message>
+    <message>
+        <source>Confirmations: %1 / %2 required</source>
+        <translation>Conferme: %1 / %2 richieste</translation>
+    </message>
+    <message>
+        <source>Estimated time remaining: Ready</source>
+        <translation>Tempo stimato rimanente: Pronto</translation>
+    </message>
+    <message numerus="yes">
+        <source>Estimated time remaining: %n minute(s)</source>
+        <translation><numerusform>Tempo stimato rimanente: %n minuto</numerusform><numerusform>Tempo stimato rimanente: %n minuti</numerusform><numerusform>Tempo stimato rimanente: %n minuti</numerusform></translation>
+    </message>
+    <message>
+        <source>Your proposal was submitted successfully.</source>
+        <translation>La tua proposta è stata inviata con successo.</translation>
+    </message>
+    <message>
+        <source>Already submitted</source>
+        <translation>Già inviato</translation>
+    </message>
+    <message>
+        <source>This proposal has already been submitted.</source>
+        <translation>Questa proposta è già stata inviata.</translation>
+    </message>
+    <message>
+        <source>Submission failed</source>
+        <translation>Invio fallito</translation>
+    </message>
+    <message>
+        <source>Proposal submitted</source>
+        <translation>Proposta inviata</translation>
+    </message>
+    <message>
+        <source>A fee of %1 will be burned when you prepare the proposal.</source>
+        <translation>Una commissione di %1 verrà bruciata quando prepari la proposta.</translation>
+    </message>
+    <message>
+        <source>Prepare (burn %1) and wait for %2 confirmations.</source>
+        <translation>Prepara (brucia %1) e attendi %2 conferme.</translation>
+    </message>
+</context>
 <context>
     <name>QObject</name>
     <message>
@@ -2876,14 +3199,6 @@ A causa dell'interruzione del supporto, dovresti richiedere al commerciante di f
         <source>Version</source>
         <translation>Versione</translation>
     </message>
-    <message>
-        <source>Whether the peer requested us to relay transactions.</source>
-        <translation>Se il peer ci ha richiesto di inoltrare le transazioni.</translation>
-    </message>
-    <message>
-        <source>Wants Tx Relay</source>
-        <translation>Necessario il relè Tx</translation>
-    </message>
     <message>
         <source>High bandwidth BIP152 compact block relay: %1</source>
         <translation>Relè a blocco compatto BIP152 a larghezza di banda elevata: %1</translation>
@@ -2989,6 +3304,14 @@ A causa dell'interruzione del supporto, dovresti richiedere al commerciante di f
         <source>To specify a non-default location of the blocks directory use the '%1' option.</source>
         <translation>Per specificare una posizione non predefinita della directory dei blocchi, utilizzare l'opzione '%1'.</translation>
     </message>
+    <message>
+        <source>Local Addresses</source>
+        <translation>Indirizzi locali</translation>
+    </message>
+    <message>
+        <source>Network addresses that your Dash node is currently using to communicate with other nodes.</source>
+        <translation>Indirizzi di rete che il tuo nodo Dash sta attualmente utilizzando per comunicare con altri nodi.</translation>
+    </message>
     <message>
         <source>Number of regular Masternodes</source>
         <translation>Numero di Masternode regolari</translation>
@@ -3081,6 +3404,14 @@ A causa dell'interruzione del supporto, dovresti richiedere al commerciante di f
         <source>Services</source>
         <translation>Servizi</translation>
     </message>
+    <message>
+        <source>Whether we relay transactions to this peer.</source>
+        <translation>Se inoltriamo le transazioni a questo peer.</translation>
+    </message>
+    <message>
+        <source>Transaction Relay</source>
+        <translation>Inoltro delle transazioni</translation>
+    </message>
     <message>
         <source>Connection Time</source>
         <translation>Tempo di connessione</translation>
@@ -3229,6 +3560,10 @@ A causa dell'interruzione del supporto, dovresti richiedere al commerciante di f
         <source>Network activity disabled</source>
         <translation>Attività di rete disabilitata</translation>
     </message>
+    <message>
+        <source>None</source>
+        <translation>Nessuno</translation>
+    </message>
     <message>
         <source>Total: %1 (Enabled: %2)</source>
         <translation>Totale: %1 (Abilitato: %2)</translation>
@@ -3550,6 +3885,34 @@ Per ulteriori informazioni sull'utilizzo di questa console, digitare %6.
         <translation>Richiesto</translation>
     </message>
 </context>
+<context>
+    <name>RestoreWalletActivity</name>
+    <message>
+        <source>Restore Wallet</source>
+        <extracomment>Title of progress window which is displayed when wallets are being restored.</extracomment>
+        <translation>Ripristina portafoglio</translation>
+    </message>
+    <message>
+        <source>Restoring Wallet &lt;b&gt;%1&lt;/b&gt;…</source>
+        <extracomment>Descriptive text of the restore wallets progress window which indicates to the user that wallets are currently being restored.</extracomment>
+        <translation>Ripristino portafoglio &lt;b&gt;%1&lt;/b&gt;…</translation>
+    </message>
+    <message>
+        <source>Restore wallet failed</source>
+        <extracomment>Title of message box which is displayed when the wallet could not be restored.</extracomment>
+        <translation>Ripristino portafoglio fallito</translation>
+    </message>
+    <message>
+        <source>Restore wallet warning</source>
+        <extracomment>Title of message box which is displayed when the wallet is restored with some warning.</extracomment>
+        <translation>Avviso ripristino portafoglio</translation>
+    </message>
+    <message>
+        <source>Restore wallet message</source>
+        <extracomment>Title of message box which is displayed when the wallet is successfully restored.</extracomment>
+        <translation>Messaggio ripristino portafoglio</translation>
+    </message>
+</context>
 <context>
     <name>SendCoinsDialog</name>
     <message>
@@ -3584,10 +3947,6 @@ Per ulteriori informazioni sull'utilizzo di questa console, digitare %6.
         <source>Fee:</source>
         <translation>Commissione:</translation>
     </message>
-    <message>
-        <source>Dust:</source>
-        <translation>Infinitesimale:</translation>
-    </message>
     <message>
         <source>Inputs…</source>
         <translation>Input…</translation>
@@ -3712,10 +4071,6 @@ Per ulteriori informazioni sull'utilizzo di questa console, digitare %6.
         <source>Copy bytes</source>
         <translation>Copia byte</translation>
     </message>
-    <message>
-        <source>Copy dust</source>
-        <translation>Copia infinitesimale</translation>
-    </message>
     <message>
         <source>Copy change</source>
         <translation>Copia resto</translation>
@@ -3724,10 +4079,6 @@ Per ulteriori informazioni sull'utilizzo di questa console, digitare %6.
         <source>%1 (%2 blocks)</source>
         <translation>%1 (%2 bloccare)</translation>
     </message>
-    <message>
-        <source>This will produce a Partially Signed Transaction (PSBT) which you can save or copy and then sign with e.g. an offline %1 wallet, or a PSBT-compatible hardware wallet.</source>
-        <translation>Ciò produrrà una transazione parzialmente firmata (PSBT) che potrai salvare o copiare e quindi firmare con, ad es., un wallet %1 offline o un wallet hardware compatibile con PSBT.</translation>
-    </message>
     <message>
         <source>using</source>
         <translation>utilizzando</translation>
@@ -3736,10 +4087,6 @@ Per ulteriori informazioni sull'utilizzo di questa console, digitare %6.
         <source>%1 to %2</source>
         <translation>%1 a %2</translation>
     </message>
-    <message>
-        <source>Are you sure you want to send?</source>
-        <translation>Sei sicuro di voler inviare?</translation>
-    </message>
     <message>
         <source>&lt;b&gt;(%1 of %2 entries displayed)&lt;/b&gt;</source>
         <translation>&lt;b&gt;(%1 of %2 entries displayed)&lt;/b&gt;</translation>
@@ -3764,10 +4111,6 @@ Per ulteriori informazioni sull'utilizzo di questa console, digitare %6.
         <source>%1 to '%2'</source>
         <translation>%1 a '%2'</translation>
     </message>
-    <message>
-        <source>Do you want to draft this transaction?</source>
-        <translation>Vuoi la bozza di questa transazione?</translation>
-    </message>
     <message>
         <source>%1 funds only</source>
         <translation>Solo fondi %1</translation>
@@ -3816,14 +4159,6 @@ Per ulteriori informazioni sull'utilizzo di questa console, digitare %6.
         <source>Confirm send coins</source>
         <translation>Conferma l'invio di dash</translation>
     </message>
-    <message>
-        <source>Confirm transaction proposal</source>
-        <translation>Conferma la proposta di transazione</translation>
-    </message>
-    <message>
-        <source>Create Unsigned</source>
-        <translation>Crea senza Firma</translation>
-    </message>
     <message>
         <source>Save Transaction Data</source>
         <translation>Salva i Dati della Transazione</translation>
@@ -3837,8 +4172,28 @@ Per ulteriori informazioni sull'utilizzo di questa console, digitare %6.
         <translation>Watch-only saldo:</translation>
     </message>
     <message>
-        <source>Send</source>
-        <translation>Invia</translation>
+        <source>Creates a Partially Signed Blockchain Transaction (PSBT) for use with e.g. an offline %1 wallet, or a PSBT-compatible hardware wallet.</source>
+        <translation>Crea una Transazione Blockchain Parzialmente Firmata (PSBT - Partially Signed Blockchain Transaction) da utilizzare, ad esempio, con un wallet %1 offline o un wallet hardware compatibile con PSBT.</translation>
+    </message>
+    <message>
+        <source>Do you want to create this transaction?</source>
+        <extracomment>Message displayed when attempting to create a transaction. Cautionary text to prompt the user to verify that the displayed transaction details represent the transaction the user intends to create.</extracomment>
+        <translation>Vuoi creare questa transazione?</translation>
+    </message>
+    <message>
+        <source>Please, review your transaction proposal. This will produce a Partially Signed Blockchain Transaction (PSBT) which you can save or copy and then sign with e.g. an offline %1 wallet, or a PSBT-compatible hardware wallet.</source>
+        <extracomment>Text to inform a user attempting to create a transaction of their current options. At this stage, a user can only create a PSBT. This string is displayed when private keys are disabled and an external signer is not available.</extracomment>
+        <translation>Rivedi la tua proposta di transazione. Questo produrrà una Transazione Blockchain Parzialmente Firmata (PSBT) che puoi salvare o copiare e poi firmare con ad es. un portafoglio %1 offline o un portafoglio hardware compatibile con PSBT.</translation>
+    </message>
+    <message>
+        <source>Please, review your transaction. You can create and send this transaction or create a Partially Signed Blockchain Transaction (PSBT), which you can save or copy and then sign with, e.g., an offline %1 wallet, or a PSBT-compatible hardware wallet.</source>
+        <extracomment>Text to inform a user attempting to create a transaction of their current options. At this stage, a user can send their transaction or create a PSBT. This string is displayed when both private keys and PSBT controls are enabled.</extracomment>
+        <translation>Rivedi la tua transazione. Puoi creare e inviare questa transazione o creare una Transazione Blockchain Parzialmente Firmata (PSBT), che puoi salvare o copiare e poi firmare con, ad es., un portafoglio %1 offline o un portafoglio hardware compatibile con PSBT.</translation>
+    </message>
+    <message>
+        <source>Please, review your transaction.</source>
+        <extracomment>Text to prompt a user to review the details of the transaction they are attempting to send.</extracomment>
+        <translation>Rivedi la tua transazione.</translation>
     </message>
     <message>
         <source>To review recipient list click "Show Details…"</source>
@@ -3968,21 +4323,16 @@ Per ulteriori informazioni sull'utilizzo di questa console, digitare %6.
         <source>A message that was attached to the dash: URI which will be stored with the transaction for your reference. Note: This message will not be sent over the Dash network.</source>
         <translation>Un messaggio allegato con l'URI dash che verrà memorizzato nella transazione per il tuo referente. Nota: questo messaggio non verrà inviato attraverso il network Dash.</translation>
     </message>
+</context>
+<context>
+    <name>SendConfirmationDialog</name>
     <message>
-        <source>This is an unauthenticated payment request.</source>
-        <translation>Questa è una richiesta di pagamento non autenticata.</translation>
-    </message>
-    <message>
-        <source>This is an authenticated payment request.</source>
-        <translation>Questa è una richiesta di pagamento autenticata.</translation>
-    </message>
-    <message>
-        <source>Pay To:</source>
-        <translation>Pagare a:</translation>
+        <source>Send</source>
+        <translation>Invia</translation>
     </message>
     <message>
-        <source>Memo:</source>
-        <translation>Memo:</translation>
+        <source>Create Unsigned</source>
+        <translation>Crea non firmato</translation>
     </message>
 </context>
 <context>
@@ -4191,20 +4541,9 @@ Per ulteriori informazioni sull'utilizzo di questa console, digitare %6.
 </context>
 <context>
     <name>TransactionDesc</name>
-    <message numerus="yes">
-        <source>Open for %n more block(s)</source>
-        <translation><numerusform>Aperto per %n blocco in piú</numerusform><numerusform>Aperto per %n blocchi in piú</numerusform><numerusform>Aperto per %n blocchi in piú</numerusform></translation>
-    </message>
-    <message>
-        <source>Open until %1</source>
-        <translation>Aperto fino a %1</translation>
-    </message>
-    <message>
-        <source>conflicted</source>
-        <translation>in conflitto</translation>
-    </message>
     <message>
         <source>0/unconfirmed, %1</source>
+        <extracomment>Text explaining the current status of a transaction, shown in the status field of the details window for this transaction. This status represents an unconfirmed transaction that is in the memory pool.</extracomment>
         <translation>0/non confermati, %1</translation>
     </message>
     <message>
@@ -4217,22 +4556,32 @@ Per ulteriori informazioni sull'utilizzo di questa console, digitare %6.
     </message>
     <message>
         <source>abandoned</source>
+        <extracomment>Text explaining the current status of a transaction, shown in the status field of the details window for this transaction. This status represents an abandoned transaction.</extracomment>
         <translation>Abbandonato</translation>
     </message>
+    <message>
+        <source>conflicted with a transaction with %1 confirmations</source>
+        <extracomment>Text explaining the current status of a transaction, shown in the status field of the details window for this transaction. This status represents an unconfirmed transaction that conflicts with a confirmed transaction.</extracomment>
+        <translation>in conflitto con una transazione con %1 conferme</translation>
+    </message>
     <message>
         <source>%1/unconfirmed</source>
+        <extracomment>Text explaining the current status of a transaction, shown in the status field of the details window for this transaction. This status represents a transaction confirmed in at least one block, but less than 6 blocks, and still not locked via ChainLocks.</extracomment>
         <translation>%1/non confermato</translation>
     </message>
     <message>
         <source>%1 confirmations</source>
+        <extracomment>Text explaining the current status of a transaction, shown in the status field of the details window for this transaction. This status represents a transaction confirmed in 6 or more blocks or locked via ChainLocks.</extracomment>
         <translation>%1 conferme</translation>
     </message>
     <message>
         <source>locked via ChainLocks</source>
+        <extracomment>Text explaining the current status of a transaction, shown in the status field of the details window for this transaction. This status represents a transaction confirmed in at least one block and has been locked by ChainLocks.</extracomment>
         <translation>bloccati tramite ChainLocks</translation>
     </message>
     <message>
         <source>verified via InstantSend</source>
+        <extracomment>Text explaining the current status of a transaction, shown in the status field of the details window for this transaction. This status represents an unconfirmed transaction that has been locked by InstantSend.</extracomment>
         <translation>verificati tramite InstantSend</translation>
     </message>
     <message>
@@ -4385,14 +4734,6 @@ Per ulteriori informazioni sull'utilizzo di questa console, digitare %6.
         <source>Address / Label</source>
         <translation>Indirizzo / Etichetta</translation>
     </message>
-    <message numerus="yes">
-        <source>Open for %n more block(s)</source>
-        <translation><numerusform>Aperto per %n blocco in piú</numerusform><numerusform>Aperto per %n blocchi in piú</numerusform><numerusform>Aperto per %n blocchi in piú</numerusform></translation>
-    </message>
-    <message>
-        <source>Open until %1</source>
-        <translation>Aperto fino a %1</translation>
-    </message>
     <message>
         <source>Unconfirmed</source>
         <translation>Non confermato</translation>
@@ -4644,6 +4985,11 @@ Per ulteriori informazioni sull'utilizzo di questa console, digitare %6.
         <source>Show address &amp;QR code</source>
         <translation>Mostra indirizzo e codice &amp;QR</translation>
     </message>
+    <message>
+        <source>Show in %1</source>
+        <extracomment>Transactions table context menu action to show the selected transaction in a third-party block explorer. %1 is a stand-in argument for the URL of the explorer.</extracomment>
+        <translation>Mostra in %1</translation>
+    </message>
     <message>
         <source>Export Transaction History</source>
         <translation>Esporta lo storico delle transazioni</translation>
@@ -4836,10 +5182,6 @@ Vai su File &gt; Apri Wallet per caricare un Wallet.
 </context>
 <context>
     <name>dash-core</name>
-    <message>
-        <source>Fee estimation failed. Fallbackfee is disabled. Wait a few blocks or enable -fallbackfee.</source>
-        <translation>Stima della tariffa non riuscita. La commissione di riserva è disabilitata. Attendi qualche blocco o abilita -fallbackfee.</translation>
-    </message>
     <message>
         <source>This error could occur if this wallet was not shutdown cleanly and was last loaded using a build with a newer version of Berkeley DB. If so, please use the software that last loaded this wallet</source>
         <translation>Questo errore potrebbe verificarsi se questo portafoglio non è stato arrestato in modo corretto ed è stato caricato l'ultima volta utilizzando una build con una versione più recente di Berkeley DB. In tal caso, utilizzare l'ultimo software che ha caricato questo portafoglio</translation>
@@ -4912,10 +5254,6 @@ Vai su File &gt; Apri Wallet per caricare un Wallet.
         <source>Failed to listen on any port. Use -listen=0 if you want this.</source>
         <translation>Nessuna porta disponibile per l'ascolto. Usa -listen=0 se vuoi procedere comunque.</translation>
     </message>
-    <message>
-        <source>-maxtxfee is set very high! Fees this large could be paid on a single transaction.</source>
-        <translation>-maxtxfee è impostato a molto alto! Commissioni così alte possono venir pagate anche su una singola transazione.</translation>
-    </message>
     <message>
         <source>Found unconfirmed denominated outputs, will wait till they confirm to continue.</source>
         <translation>Trovati output denominati non confermati, in attesa delle conferme per continuare.</translation>
@@ -4924,10 +5262,6 @@ Vai su File &gt; Apri Wallet per caricare un Wallet.
         <source>Invalid -socketevents ('%s') specified. Only these modes are supported: %s</source>
         <translation>Specificato -socketevents ('%s') non valido. Sono supportate solo queste modalità: %s</translation>
     </message>
-    <message>
-        <source>Invalid amount for -maxtxfee=&lt;amount&gt;: '%s' (must be at least the minrelay fee of %s to prevent stuck transactions)</source>
-        <translation>Importo non valido per -maxtxfee=&lt;amount&gt;: '%s' (deve essere almeno pari alla commissione 'minrelay fee' di %s per prevenire transazioni bloccate)</translation>
-    </message>
     <message>
         <source>SQLiteDatabase: Unknown sqlite wallet schema version %d. Only version %d is supported</source>
         <translation>SQLiteDatabase: schema del wallet sqlite alla versione sconosciuta %d. È supportata solo la versione %d</translation>
@@ -4936,6 +5270,10 @@ Vai su File &gt; Apri Wallet per caricare un Wallet.
         <source>Transaction index can't be disabled with governance validation enabled. Either start with -disablegovernance command line switch or enable transaction index.</source>
         <translation>L'indice di transazione non può essere disabilitato con la convalida della governance abilitata. Inizia con l'opzione della riga di comando -disablegovernance o abilita l'indice delle transazioni.</translation>
     </message>
+    <message>
+        <source>Unsupported category-specific logging level -loglevel=%s. Expected -loglevel=&lt;category&gt;:&lt;loglevel&gt;. Valid categories: %s. Valid loglevels: %s.</source>
+        <translation>Livello di registrazione specifico della categoria non supportato -loglevel=%s. Previsto -loglevel=&lt;category&gt;:&lt;loglevel&gt;. Categorie valide: %s. Livelli di registrazione validi: %s.</translation>
+    </message>
     <message>
         <source>Can't mix: no compatible inputs found!</source>
         <translation>Impossibile effettuare il mixing: nessun input compatibile trovato!</translation>
@@ -4944,6 +5282,14 @@ Vai su File &gt; Apri Wallet per caricare un Wallet.
         <source>Entry exceeds maximum size.</source>
         <translation>L'ingresso supera la dimensione massima.</translation>
     </message>
+    <message>
+        <source>Error upgrading evo database for EHF</source>
+        <translation>Errore durante l'aggiornamento del database evo per EHF</translation>
+    </message>
+    <message>
+        <source>Failed to commit Evo database</source>
+        <translation>Impossibile eseguire il database Evo</translation>
+    </message>
     <message>
         <source>Found enough users, signing ( waiting %s )</source>
         <translation>Trovati utenti sufficienti, firma (in attesa di %s)</translation>
@@ -4968,18 +5314,14 @@ Vai su File &gt; Apri Wallet per caricare un Wallet.
         <source>Insufficient funds.</source>
         <translation>Fondi insufficienti.</translation>
     </message>
-    <message>
-        <source>Invalid amount for -discardfee=&lt;amount&gt;: '%s'</source>
-        <translation>Importo non valido per -discardfee=&lt;amount&gt;: '%s'</translation>
-    </message>
-    <message>
-        <source>Invalid amount for -paytxfee=&lt;amount&gt;: '%s' (must be at least %s)</source>
-        <translation>Importo non valido per -paytxfee=&lt;amount&gt;: '%s' (deve essere almeno %s)</translation>
-    </message>
     <message>
         <source>Invalid minimum number of spork signers specified with -minsporkkeys</source>
         <translation>Numero minimo non valido di firmatari di spork specificato con -minsporkkeys</translation>
     </message>
+    <message>
+        <source>Listening for incoming connections failed (listen returned error %s)</source>
+        <translation>L'ascolto delle connessioni in arrivo non è riuscito (l'ascolto ha restituito l'errore %s)</translation>
+    </message>
     <message>
         <source>Lock is already in place.</source>
         <translation>Il blocco è già presente.</translation>
@@ -5036,6 +5378,10 @@ Vai su File &gt; Apri Wallet per caricare un Wallet.
         <source>Synchronizing governance objects…</source>
         <translation>Sincronizzazione degli oggetti di governance …</translation>
     </message>
+    <message>
+        <source>Transaction change output index out of range</source>
+        <translation>Indice di output della modifica della transazione fuori intervallo</translation>
+    </message>
     <message>
         <source>Unable to start HTTP server. See debug log for details.</source>
         <translation>Impossibile avviare il server HTTP. Dettagli nel log di debug.</translation>
@@ -5044,6 +5390,10 @@ Vai su File &gt; Apri Wallet per caricare un Wallet.
         <source>Unknown response.</source>
         <translation>Risposta sconosciuta.</translation>
     </message>
+    <message>
+        <source>Unsupported global logging level -loglevel=%s. Valid values: %s.</source>
+        <translation>Livello di registrazione globale non supportato -loglevel=%s. Valori validi: %s.</translation>
+    </message>
     <message>
         <source>User Agent comment (%s) contains unsafe characters.</source>
         <translation>Il commento del User Agent (%s) contiene caratteri non sicuri.</translation>
@@ -5108,10 +5458,6 @@ Vai su File &gt; Apri Wallet per caricare un Wallet.
         <source>Total length of network version string (%i) exceeds maximum length (%i). Reduce the number or size of uacomments.</source>
         <translation>La lunghezza totale della stringa di network version (%i) eccede la lunghezza massima (%i). Ridurre il numero o la dimensione di uacomments.</translation>
     </message>
-    <message>
-        <source>Transaction needs a change address, but we can't generate it. Please call keypoolrefill first.</source>
-        <translation>La transazione richiede un indirizzo di modifica, ma non possiamo generarlo. Per favore chiama prima KeypoolRefill.</translation>
-    </message>
     <message>
         <source>WARNING! Failed to replenish keypool, please unlock your wallet to do so.</source>
         <translation>ATTENZIONE! Impossibile riempire il keypool, per favore sblocca il tuo portafoglio per farlo ..</translation>
@@ -5188,10 +5534,6 @@ Vai su File &gt; Apri Wallet per caricare un Wallet.
         <source>Error: No addresses available.</source>
         <translation>Errore: nessun indirizzo disponibile.</translation>
     </message>
-    <message>
-        <source>Exceeded max tries.</source>
-        <translation>Numero massimo di tentativi superato.</translation>
-    </message>
     <message>
         <source>Failed to create backup %s!</source>
         <translation>Impossibile creare il backup %s!</translation>
@@ -5232,10 +5574,6 @@ Vai su File &gt; Apri Wallet per caricare un Wallet.
         <source>Invalid P2P permission: '%s'</source>
         <translation>Autorizzazione P2P non valida: '%s'</translation>
     </message>
-    <message>
-        <source>Invalid amount for -fallbackfee=&lt;amount&gt;: '%s'</source>
-        <translation>Importo non valido per -fallbackfee=&lt;amount&gt;: '%s'</translation>
-    </message>
     <message>
         <source>Invalid masternodeblsprivkey. Please see documentation.</source>
         <translation>Invalid masternodeblsprivkey. Per favore vedi documentazione.</translation>
@@ -5372,10 +5710,6 @@ Vai su File &gt; Apri Wallet per caricare un Wallet.
         <source>Unable to open %s for writing</source>
         <translation>Impossibile aprire %s in scrittura</translation>
     </message>
-    <message>
-        <source>Unable to parse -maxuploadtarget: '%s' (possible integer overflow?)</source>
-        <translation>Impossibile analizzare -maxuploadtarget: '%s' (possibile overflow del numero intero?)</translation>
-    </message>
     <message>
         <source>Unknown -blockfilterindex value %s.</source>
         <translation>Sconosciuto - valore blockfilterindex %s.</translation>
@@ -5384,10 +5718,6 @@ Vai su File &gt; Apri Wallet per caricare un Wallet.
         <source>Unknown new rules activated (versionbit %i)</source>
         <translation>Nuove regole sconosciute attivate (versione bit %i)</translation>
     </message>
-    <message>
-        <source>Upgrading UTXO database</source>
-        <translation>Aggiornamento del database UTXO</translation>
-    </message>
     <message>
         <source>Verifying blocks…</source>
         <translation>Verifica blocchi…</translation>
@@ -5448,10 +5778,6 @@ Vai su File &gt; Apri Wallet per caricare un Wallet.
         <source>Cannot obtain a lock on data directory %s. %s is probably already running.</source>
         <translation>Non è possibile ottenere i dati sulla cartella %s. Probabilmente %s è già in esecuzione.</translation>
     </message>
-    <message>
-        <source>Cannot upgrade a non HD wallet from version %i to version %i which is non-HD wallet. Use upgradetohd RPC</source>
-        <translation>Impossibile aggiornare un portafoglio non HD dalla versione %i alla versione %i che è un portafoglio non HD. Utilizza l'RPC upgradetohd</translation>
-    </message>
     <message>
         <source>Distributed under the MIT software license, see the accompanying file %s or %s</source>
         <translation>Distribuito sotto licenza MIT del software, si veda il file %s o %s incluso</translation>
@@ -5484,6 +5810,10 @@ Vai su File &gt; Apri Wallet per caricare un Wallet.
         <source>Failed to rename invalid peers.dat file. Please move or delete it and try again.</source>
         <translation>Impossibile rinominare il file peers.dat non valido. Spostalo o eliminalo e riprova.</translation>
     </message>
+    <message>
+        <source>Fee estimation failed. Fallbackfee is disabled. Wait a few blocks or enable %s.</source>
+        <translation>Stima della commissione fallita. Fallbackfee è disabilitato. Attendi alcuni blocchi o abilita %s.</translation>
+    </message>
     <message>
         <source>File %s already exists. If you are sure this is what you want, move it out of the way first.</source>
         <translation>Il file %s esiste già. Se sei sicuro che questo sia ciò che desideri, spostalo prima di mezzo.</translation>
@@ -5496,6 +5826,10 @@ Vai su File &gt; Apri Wallet per caricare un Wallet.
         <source>Incorrect or no devnet genesis block found. Wrong datadir for devnet specified?</source>
         <translation>Rilevato blocco genesi di devnet errato o inesistente. È stato specificato un datadir errato per devnet?</translation>
     </message>
+    <message>
+        <source>Invalid amount for %s=&lt;amount&gt;: '%s' (must be at least the minrelay fee of %s to prevent stuck transactions)</source>
+        <translation>Importo non valido per %s=&lt;amount&gt;: '%s' (deve essere almeno la commissione minrelay di %s per evitare transazioni bloccate)</translation>
+    </message>
     <message>
         <source>Invalid or corrupt peers.dat (%s). If you believe this is a bug, please report it to %s. As a workaround, you can move the file (%s) out of the way (rename, move, or delete) to have a new one created on the next start.</source>
         <translation>Peers.dat (%s) non valido o danneggiato. Se ritieni che questo sia un bug, segnalalo a %s. Come soluzione alternativa, è possibile spostare il file (%s) da parte (rinominarlo, spostarlo o eliminarlo) per crearne uno nuovo al successivo avvio.</translation>
@@ -5512,6 +5846,10 @@ Vai su File &gt; Apri Wallet per caricare un Wallet.
         <source>No wallet file format provided. To use createfromdump, -format=&lt;format&gt; must be provided.</source>
         <translation>Nessun formato di file del portafoglio fornito. Per utilizzare createfromdump, -format=&lt;format&gt; deve essere fornito.</translation>
     </message>
+    <message>
+        <source>Outbound connections restricted to CJDNS (-onlynet=cjdns) but -cjdnsreachable is not provided</source>
+        <translation>Connessioni in uscita limitate a CJDNS (-onlynet=cjdns) ma -cjdnsreachable non è fornito</translation>
+    </message>
     <message>
         <source>Outbound connections restricted to Tor (-onlynet=onion) but the proxy for reaching the Tor network is explicitly forbidden: -onion=0</source>
         <translation>Connessioni in uscita limitate a Tor (-onlynet=onion) ma il proxy per raggiungere la rete Tor è esplicitamente vietato: -onion=0</translation>
@@ -5520,6 +5858,10 @@ Vai su File &gt; Apri Wallet per caricare un Wallet.
         <source>Outbound connections restricted to Tor (-onlynet=onion) but the proxy for reaching the Tor network is not provided: none of -proxy, -onion or -listenonion is given</source>
         <translation>Connessioni in uscita limitate a Tor (-onlynet=onion) ma non viene fornito il proxy per raggiungere la rete Tor: non viene fornito nessuno tra -proxy, -onion o -listenonion</translation>
     </message>
+    <message>
+        <source>Outbound connections restricted to i2p (-onlynet=i2p) but -i2psam is not provided</source>
+        <translation>Connessioni in uscita limitate a i2p (-onlynet=i2p) ma -i2psam non è fornito</translation>
+    </message>
     <message>
         <source>Please check that your computer's date and time are correct! If your clock is wrong, %s will not work properly.</source>
         <translation>Per favore controllare che la data del computer e l'ora siano corrette! Se il vostro orologio è sbagliato %s non funzionerà correttamente.</translation>
@@ -5532,10 +5874,6 @@ Vai su File &gt; Apri Wallet per caricare un Wallet.
         <source>Prune mode is incompatible with -reindex-chainstate. Use full -reindex instead.</source>
         <translation>La modalità Prune è incompatibile con -reindex-chainstate. Utilizzare invece full -reindex.</translation>
     </message>
-    <message>
-        <source>The block index db contains a legacy 'txindex'. To clear the occupied disk space, run a full -reindex, otherwise ignore this error. This error message will not be displayed again.</source>
-        <translation>Il database dell'indice del blocco contiene un "txindex" legacy. Per liberare lo spazio su disco occupato, esegui un -reindex completo, altrimenti ignora questo errore. Questo messaggio di errore non verrà più visualizzato.</translation>
-    </message>
     <message>
         <source>This is the maximum transaction fee you pay (in addition to the normal fee) to prioritize partial spend avoidance over regular coin selection.</source>
         <translation>Questa è la commissione di transazione massima che paghi (in aggiunta alla commissione normale) per dare priorità all'elusione della spesa parziale rispetto alla normale selezione delle monete.</translation>
@@ -5548,6 +5886,10 @@ Vai su File &gt; Apri Wallet per caricare un Wallet.
         <source>This is the transaction fee you may pay when fee estimates are not available.</source>
         <translation>Questo è il costo di transazione che potresti pagare quando le stime della fee non sono disponibili.</translation>
     </message>
+    <message>
+        <source>Transaction requires one destination of non-0 value, a non-0 feerate, or a pre-selected input</source>
+        <translation>La transazione richiede una destinazione di valore diverso da 0, una feerate diversa da 0 o un input preselezionato</translation>
+    </message>
     <message>
         <source>Unable to replay blocks. You will need to rebuild the database using -reindex-chainstate.</source>
         <translation>Impossibile riprodurre i blocchi. Dovrai ricostruire il database usando -reindex-chainstate.</translation>
@@ -5556,6 +5898,10 @@ Vai su File &gt; Apri Wallet per caricare un Wallet.
         <source>Unknown wallet file format "%s" provided. Please provide one of "bdb" or "sqlite".</source>
         <translation>Formato file portafoglio sconosciuto "%s" fornito. Fornisci uno tra "bdb" o "sqlite".</translation>
     </message>
+    <message>
+        <source>Unsupported chainstate database format found. Please restart with -reindex-chainstate. This will rebuild the chainstate database.</source>
+        <translation>Trovato formato database chainstate non supportato. Riavvia con -reindex-chainstate. Questo ricostruirà il database chainstate.</translation>
+    </message>
     <message>
         <source>Warning: Dumpfile wallet format "%s" does not match command line specified format "%s".</source>
         <translation>Avviso: il formato del portafoglio dumpfile "%s" non corrisponde al formato "%s" specificato dalla riga di comando.</translation>
@@ -5596,10 +5942,30 @@ Vai su File &gt; Apri Wallet per caricare un Wallet.
         <source>-rpcport must be specified when -devnet and -server are specified</source>
         <translation>-rpcport deve essere specificato quando -devnet e -server sono specificati</translation>
     </message>
+    <message>
+        <source>-statsbatchsize cannot be configured with a negative value.</source>
+        <translation>-statsbatchsize non può essere configurato con un valore negativo.</translation>
+    </message>
+    <message>
+        <source>-statsduration cannot be configured with a negative value.</source>
+        <translation>-statsduration non può essere configurato con un valore negativo.</translation>
+    </message>
     <message>
         <source>A fatal internal error occurred, see debug.log for details</source>
         <translation>Si è verificato un errore interno irreversibile, vedere debug.log per i dettagli</translation>
     </message>
+    <message>
+        <source>Cannot create socket (socket() returned error %s)</source>
+        <translation>Impossibile creare socket (socket() ha restituito l'errore %s)</translation>
+    </message>
+    <message>
+        <source>Cannot get socket address for %s</source>
+        <translation>Impossibile ottenere l'indirizzo socket per %s</translation>
+    </message>
+    <message>
+        <source>Cannot init Statsd client</source>
+        <translation>Impossibile inizializzare il client Statsd</translation>
+    </message>
     <message>
         <source>Cannot resolve -%s address: '%s'</source>
         <translation>Impossobile risolvere l'indirizzo -%s: '%s'</translation>
@@ -5644,10 +6010,6 @@ Vai su File &gt; Apri Wallet per caricare un Wallet.
         <source>Error reading next record from wallet database</source>
         <translation>Errore durante la lettura del record successivo dal database del portafoglio</translation>
     </message>
-    <message>
-        <source>Error upgrading chainstate database</source>
-        <translation>Errore durante l'aggiornamento del database chainstate</translation>
-    </message>
     <message>
         <source>Loading P2P addresses…</source>
         <translation>Caricamento indirizzi P2P…</translation>
@@ -5768,10 +6130,70 @@ Vai su File &gt; Apri Wallet per caricare un Wallet.
         <source>%s corrupt. Try using the wallet tool dash-wallet to salvage or restoring a backup.</source>
         <translation>%s danneggiato. Prova a utilizzare lo strumento portafoglio dash-wallet per salvare o ripristinare un backup.</translation>
     </message>
+    <message>
+        <source>%s is set very high! Fees this large could be paid on a single transaction.</source>
+        <translation>%s è impostato molto alto! Commissioni così elevate potrebbero essere pagate in una singola transazione.</translation>
+    </message>
+    <message>
+        <source>%s request to listen on port %u. This port is considered "bad" and thus it is unlikely that any Dash Core peers connect to it. See doc/p2p-bad-ports.md for details and a full list.</source>
+        <translation>%s richiesta di ascolto sulla porta %u. Questa porta è considerata "cattiva" e quindi è improbabile che qualsiasi peer di Dash Core vi si connetta. Consultare doc/p2p-bad-ports.md per i dettagli e un elenco completo.</translation>
+    </message>
+    <message>
+        <source>Cannot provide specific connections and have addrman find outgoing connections at the same time.</source>
+        <translation>Non è possibile fornire connessioni specifiche e far sì che addrman trovi contemporaneamente le connessioni in uscita.</translation>
+    </message>
+    <message>
+        <source>Failed to upgrade Evo database</source>
+        <translation>Impossibile aggiornare il database Evo</translation>
+    </message>
+    <message>
+        <source>Fee needed &gt; fee paid</source>
+        <translation>Commissione necessaria &gt; commissione pagata</translation>
+    </message>
+    <message>
+        <source>Host %s on unsupported network</source>
+        <translation>Host %s su rete non supportata</translation>
+    </message>
+    <message>
+        <source>Invalid amount for %s=&lt;amount&gt;: '%s' (must be at least %s)</source>
+        <translation>Importo non valido per %s=&lt;amount&gt;: '%s' (deve essere almeno %s)</translation>
+    </message>
+    <message>
+        <source>Invalid amount for %s=&lt;amount&gt;: '%s'</source>
+        <translation>Importo non valido per %s=&lt;amount&gt;: '%s'</translation>
+    </message>
+    <message>
+        <source>Invalid port specified in %s: '%s'</source>
+        <translation>Porta non valida specificata in %s: '%s'</translation>
+    </message>
     <message>
         <source>Last successful action was too recent.</source>
         <translation>Ultima azione successo era troppo recente.</translation>
     </message>
+    <message>
+        <source>Missing solving data for estimating transaction size</source>
+        <translation>Dati di risoluzione mancanti per la stima della dimensione della transazione</translation>
+    </message>
+    <message>
+        <source>No host specified</source>
+        <translation>Nessun host specificato</translation>
+    </message>
+    <message>
+        <source>No host specified, malformed URL</source>
+        <translation>Nessun host specificato, URL malformato</translation>
+    </message>
+    <message>
+        <source>No text before the scheme delimiter, malformed URL</source>
+        <translation>Nessun testo prima del delimitatore dello schema, URL malformato</translation>
+    </message>
+    <message>
+        <source>Port must be between %d and %d, supplied %d</source>
+        <translation>La porta deve essere tra %d e %d, fornito %d</translation>
+    </message>
+    <message>
+        <source>Socket not initialized, cannot send message</source>
+        <translation>Socket non inizializzato, impossibile inviare il messaggio</translation>
+    </message>
     <message>
         <source>The source code is available from %s.</source>
         <translation>Il codice sorgente è disponibile in %s</translation>
@@ -5800,6 +6222,10 @@ Vai su File &gt; Apri Wallet per caricare un Wallet.
         <source>Transaction fees are too high.</source>
         <translation>Le commissioni della transazione sono troppo alte.</translation>
     </message>
+    <message>
+        <source>Transaction needs a change address, but we can't generate it.</source>
+        <translation>La transazione necessita di un indirizzo di resto, ma non possiamo generarlo.</translation>
+    </message>
     <message>
         <source>Transaction not valid.</source>
         <translation>Transazione non valida</translation>
@@ -5820,6 +6246,18 @@ Vai su File &gt; Apri Wallet per caricare un Wallet.
         <source>Unable to locate enough non-denominated funds for this transaction.</source>
         <translation>Impossibile trovare fondi non denominati sufficienti per questa transazione.</translation>
     </message>
+    <message>
+        <source>Unable to lookup host %s</source>
+        <translation>Impossibile cercare l'host %s</translation>
+    </message>
+    <message>
+        <source>Unable to parse -maxuploadtarget: '%s'</source>
+        <translation>Impossibile analizzare -maxuploadtarget: '%s'</translation>
+    </message>
+    <message>
+        <source>Unable to send message to %s (::sendto() returned error %s)</source>
+        <translation>Impossibile inviare il messaggio a %s (::sendto() ha restituito l'errore %s)</translation>
+    </message>
     <message>
         <source>Unable to sign spork message, wrong key?</source>
         <translation>Impossibile firmare messaggio Spork, chiave sbagliata?</translation>
@@ -5832,6 +6270,10 @@ Vai su File &gt; Apri Wallet per caricare un Wallet.
         <source>Unknown state: id = %u</source>
         <translation>Stato sconosciuto: id =%u</translation>
     </message>
+    <message>
+        <source>Unsupported URL scheme, must begin with udp://</source>
+        <translation>Schema URL non supportato, deve iniziare con udp://</translation>
+    </message>
     <message>
         <source>Unsupported logging category %s=%s.</source>
         <translation>Categoria di registrazione non supportata %s=%s.</translation>

From ddc40a922e4d12d1da1f1d7182e45cd68ccc9872 Mon Sep 17 00:00:00 2001
From: UdjinM6 <UdjinM6@users.noreply.github.com>
Date: Thu, 23 Oct 2025 21:22:24 +0300
Subject: [PATCH 324/656] nl

---
 src/qt/locale/dash_nl.ts | 2070 +++++++++++++++++++++++++++++++++-----
 1 file changed, 1825 insertions(+), 245 deletions(-)

diff --git a/src/qt/locale/dash_nl.ts b/src/qt/locale/dash_nl.ts
index 6f8f58daec6c..ec5ad79ee741 100644
--- a/src/qt/locale/dash_nl.ts
+++ b/src/qt/locale/dash_nl.ts
@@ -65,14 +65,6 @@
         <source>C&amp;hoose</source>
         <translation>K&amp;iezen</translation>
     </message>
-    <message>
-        <source>Sending addresses</source>
-        <translation>Verzendadressen</translation>
-    </message>
-    <message>
-        <source>Receiving addresses</source>
-        <translation>Ontvangstadressen</translation>
-    </message>
     <message>
         <source>These are your Dash addresses for sending payments. Always check the amount and the receiving address before sending coins.</source>
         <translation>Dit zijn uw Dash adressen om betalingen mee uit te voeren. Controleer altijd het bedrag en ontvangstadres voordat u uw Dash verzendt.</translation>
@@ -94,8 +86,8 @@
         <translation>&amp;Bewerken</translation>
     </message>
     <message>
-        <source>&amp;Show address QR code</source>
-        <translation>Toon adres QR-code</translation>
+        <source>Show address &amp;QR code</source>
+        <translation>Toon adres in &amp;QR-code</translation>
     </message>
     <message>
         <source>QR code</source>
@@ -105,6 +97,24 @@
         <source>Export Address List</source>
         <translation>Exporteer adressenlijst</translation>
     </message>
+    <message>
+        <source>Comma separated file</source>
+        <extracomment>Expanded name of the CSV file format. See: https://en.wikipedia.org/wiki/Comma-separated_values.</extracomment>
+        <translation>Komma-gescheiden bestand</translation>
+    </message>
+    <message>
+        <source>There was an error trying to save the address list to %1. Please try again.</source>
+        <extracomment>An error message. %1 is a stand-in argument for the name of the file we attempted to save to.</extracomment>
+        <translation>Er is een fout is opgetreden tijdens het opslaan van deze adreslijst naar %1. Probeer het opnieuw.</translation>
+    </message>
+    <message>
+        <source>Sending addresses - %1</source>
+        <translation>Verzendadressen - %1</translation>
+    </message>
+    <message>
+        <source>Receiving addresses - %1</source>
+        <translation>Ontvangstadressen - %1</translation>
+    </message>
     <message>
         <source>Exporting Failed</source>
         <translation>Exporteren mislukt</translation>
@@ -274,10 +284,22 @@
         <source>The passphrase entered for the wallet decryption was incorrect.</source>
         <translation>Het ingevoerde wachtwoord om de portemonnee te ontsleutelen was incorrect.</translation>
     </message>
+    <message>
+        <source>The passphrase entered for the wallet decryption is incorrect. It contains a null character (ie - a zero byte). If the passphrase was set with a version of this software prior to 23.0, please try again with only the characters up to — but not including — the first null character. If this is successful, please set a new passphrase to avoid this issue in the future.</source>
+        <translation>De ingevoerde wachtwoordzin voor de portemonnee-ontsleuteling is onjuist. Het bevat een null-teken (d.w.z. een nul-byte). Als de wachtwoordzin is ingesteld met een versie van deze software vóór 23.0, probeer het dan opnieuw met alleen de tekens tot — maar niet inclusief — het eerste null-teken. Als dit lukt, stel dan een nieuwe wachtwoordzin in om dit probleem in de toekomst te voorkomen.</translation>
+    </message>
     <message>
         <source>Wallet passphrase was successfully changed.</source>
         <translation>Het wachtwoord van de portemonnee is succesvol gewijzigd.</translation>
     </message>
+    <message>
+        <source>Passphrase change failed</source>
+        <translation>Wachtwoordzin wijzigen mislukt</translation>
+    </message>
+    <message>
+        <source>The old passphrase entered for the wallet decryption is incorrect. It contains a null character (ie - a zero byte). If the passphrase was set with a version of this software prior to 23.0, please try again with only the characters up to — but not including — the first null character.</source>
+        <translation>De oude wachtwoordzin die is ingevoerd voor de portemonnee-ontsleuteling is onjuist. Het bevat een null-teken (d.w.z. een nul-byte). Als de wachtwoordzin is ingesteld met een versie van deze software vóór 23.0, probeer het dan opnieuw met alleen de tekens tot — maar niet inclusief — het eerste null-teken.</translation>
+    </message>
     <message>
         <source>Warning: The Caps Lock key is on!</source>
         <translation>Waarschuwing: Caps-lock staat aan!</translation>
@@ -303,7 +325,23 @@
 </context>
 <context>
     <name>BitcoinApplication</name>
-    </context>
+    <message>
+        <source>Runaway exception</source>
+        <translation>Runaway exception</translation>
+    </message>
+    <message>
+        <source>A fatal error occurred. %1 can no longer continue safely and will quit.</source>
+        <translation>Er is een fatale fout opgetreden. %1 kan niet langer veilig doorgaan en zal stoppen.</translation>
+    </message>
+    <message>
+        <source>Internal error</source>
+        <translation>Interne fout</translation>
+    </message>
+    <message>
+        <source>An internal error occurred. %1 will attempt to continue safely. This is an unexpected bug which can be reported as described below.</source>
+        <translation>Er is een interne fout opgetreden. %1 zal proberen veilig door te gaan. Dit is een onverwachte fout die gemeld kan worden zoals hieronder beschreven.</translation>
+    </message>
+</context>
 <context>
     <name>BitcoinGUI</name>
     <message>
@@ -330,6 +368,10 @@
         <source>Request payments (generates QR codes and dash: URIs)</source>
         <translation>Vraag betaling aan (genereert QR-codes en Dash: URI's)</translation>
     </message>
+    <message>
+        <source>Ctrl+Q</source>
+        <translation>Ctrl+Q</translation>
+    </message>
     <message>
         <source>&amp;Options…</source>
         <translation>&amp;Opties…</translation>
@@ -358,6 +400,10 @@
         <source>&amp;Verify message…</source>
         <translation>&amp;Verifieer handtekening</translation>
     </message>
+    <message>
+        <source>&amp;Load PSBT from file…</source>
+        <translation>&amp;Laad PSBT van bestand…</translation>
+    </message>
     <message>
         <source>&amp;Sending addresses</source>
         <translation>&amp;Verzendadressen</translation>
@@ -390,10 +436,6 @@
         <source>&amp;Window</source>
         <translation>&amp;Scherm</translation>
     </message>
-    <message>
-        <source>Minimize</source>
-        <translation>Minimaliseer </translation>
-    </message>
     <message>
         <source>Zoom</source>
         <translation>Zoom</translation>
@@ -446,14 +488,6 @@
         <source>Modify configuration options for %1</source>
         <translation>Wijzig configuratieopties voor %1</translation>
     </message>
-    <message>
-        <source>&amp;Show / Hide</source>
-        <translation>&amp;Toon / Verberg</translation>
-    </message>
-    <message>
-        <source>Show or hide the main Window</source>
-        <translation>Toon of verberg het hoofdscherm</translation>
-    </message>
     <message>
         <source>Encrypt the private keys that belong to your wallet</source>
         <translation>Versleutel de geheime sleutels die behoren tot uw portemonnee</translation>
@@ -518,10 +552,6 @@
         <source>Show wallet repair options</source>
         <translation>Toon reparatie opties voor de portemonnee</translation>
     </message>
-    <message>
-        <source>Open Wallet &amp;Configuration File</source>
-        <translation>Open portemonnee &amp;configuratie bestand</translation>
-    </message>
     <message>
         <source>Open configuration file</source>
         <translation>Open configuratie bestand</translation>
@@ -576,10 +606,40 @@
         <source>Show information about %1</source>
         <translation>Toon informatie over %1</translation>
     </message>
+    <message>
+        <source>Load PSBT from &amp;clipboard…</source>
+        <translation>Laad PSBT van &amp;klembord…</translation>
+    </message>
+    <message>
+        <source>Open debugging and diagnostic console</source>
+        <translation>Open console voor foutopsporing en diagnose</translation>
+    </message>
+    <message>
+        <source>Open &amp;wallet configuration file</source>
+        <translation>Open &amp;portemonnee configuratiebestand</translation>
+    </message>
+    <message>
+        <source>Open a dash: URI</source>
+        <translation>Open een dash: URI</translation>
+    </message>
     <message>
         <source>Create a new wallet</source>
         <translation>Maak een nieuwe portemonnee aan</translation>
     </message>
+    <message>
+        <source>Restore Wallet…</source>
+        <extracomment>Name of the menu item that restores wallet from a backup file.</extracomment>
+        <translation>Portemonnee herstellen…</translation>
+    </message>
+    <message>
+        <source>Restore a wallet from a backup file</source>
+        <extracomment>Status tip for Restore Wallet menu item</extracomment>
+        <translation>Herstel een portemonnee van een back-upbestand</translation>
+    </message>
+    <message>
+        <source>Close all wallets</source>
+        <translation>Sluit alle portemonnees</translation>
+    </message>
     <message>
         <source>%1 &amp;information</source>
         <translation>%1 &amp;Informatie</translation>
@@ -588,10 +648,42 @@
         <source>Show the %1 basic information</source>
         <translation>Toon de %1 basis informatie</translation>
     </message>
+    <message>
+        <source>&amp;Discreet mode</source>
+        <translation>&amp;Discreet modus</translation>
+    </message>
+    <message>
+        <source>Mask the values in the Overview tab</source>
+        <translation>Verberg waarden op het Overzicht tabblad</translation>
+    </message>
+    <message>
+        <source>Wallet Data</source>
+        <extracomment>Name of the wallet data file format.</extracomment>
+        <translation>Portemonneegegevens</translation>
+    </message>
+    <message>
+        <source>Load Wallet Backup</source>
+        <extracomment>The title for Restore Wallet File Windows</extracomment>
+        <translation>Laad portemonnee-back-up</translation>
+    </message>
+    <message>
+        <source>Restore Wallet</source>
+        <extracomment>Title of pop-up window shown when the user is attempting to restore a wallet.</extracomment>
+        <translation>Portemonnee herstellen</translation>
+    </message>
+    <message>
+        <source>Wallet Name</source>
+        <extracomment>Label of the input field where the name of the wallet is entered.</extracomment>
+        <translation>Portemonnee naam</translation>
+    </message>
     <message>
         <source>&amp;Settings</source>
         <translation>&amp;Instellingen</translation>
     </message>
+    <message>
+        <source>&amp;Minimize</source>
+        <translation>&amp;Minimaliseren</translation>
+    </message>
     <message>
         <source>&amp;Help</source>
         <translation>&amp;Help</translation>
@@ -608,8 +700,17 @@
         <source>View Governance Proposals</source>
         <translation>Governance voorstellen bekijken</translation>
     </message>
+    <message>
+        <source>&amp;Hide</source>
+        <translation>&amp;Verbergen</translation>
+    </message>
+    <message>
+        <source>S&amp;how</source>
+        <translation>T&amp;onen</translation>
+    </message>
     <message numerus="yes">
         <source>%n active connection(s) to Dash network</source>
+        <extracomment>A substring of the tooltip.</extracomment>
         <translation><numerusform>%n actieve verbinding met het Dash netwerk</numerusform><numerusform>%n actieve verbindingen met het Dash netwerk</numerusform></translation>
     </message>
     <message>
@@ -628,10 +729,50 @@
         <source>Close Wallet…</source>
         <translation>Portemonnee sluiten…</translation>
     </message>
+    <message>
+        <source>Load Partially Signed Blockchain Transaction</source>
+        <translation>Laad Gedeeltelijk Ondertekende Blockchain Transactie</translation>
+    </message>
+    <message>
+        <source>Load Partially Signed Blockchain Transaction from clipboard</source>
+        <translation>Laad Gedeeltelijk Ondertekende Blockchain Transactie van klembord</translation>
+    </message>
     <message>
         <source>Create Wallet…</source>
         <translation>Portemonnee aanmaken…</translation>
     </message>
+    <message>
+        <source>Close All Wallets…</source>
+        <translation>Sluit alle portemonnees…</translation>
+    </message>
+    <message>
+        <source>Ctrl+Shift+D</source>
+        <translation>Ctrl+Shift+D</translation>
+    </message>
+    <message>
+        <source>Ctrl+M</source>
+        <translation>Ctrl+M</translation>
+    </message>
+    <message>
+        <source>Click for more actions.</source>
+        <extracomment>A substring of the tooltip. "More actions" are available via the context menu.</extracomment>
+        <translation>Klik voor meer acties.</translation>
+    </message>
+    <message>
+        <source>Show Peers tab</source>
+        <extracomment>A context menu item. The "Peers tab" is an element of the "Node window".</extracomment>
+        <translation>Toon Peers tabblad</translation>
+    </message>
+    <message>
+        <source>Disable network activity</source>
+        <extracomment>A context menu item.</extracomment>
+        <translation>Zet netwerkactiviteit uit</translation>
+    </message>
+    <message>
+        <source>Enable network activity</source>
+        <extracomment>A context menu item. The network activity was disabled previously.</extracomment>
+        <translation>Zet netwerkactiviteit aan</translation>
+    </message>
     <message>
         <source>Syncing Headers (%1%)…</source>
         <translation>Kopteksten synchroniseren (%1%)…</translation>
@@ -648,10 +789,6 @@
         <source>Processing blocks on disk…</source>
         <translation>Bezig met verwerken van blocks op harde schijf…</translation>
     </message>
-    <message>
-        <source>Reindexing blocks on disk…</source>
-        <translation>Bezig met herindexeren van blocks op harde schijf…</translation>
-    </message>
     <message>
         <source>Connecting to peers…</source>
         <translation>Verbinden met peers…</translation>
@@ -805,10 +942,6 @@
         <source>Coin Selection</source>
         <translation>Munt selectie</translation>
     </message>
-    <message>
-        <source>Dust:</source>
-        <translation>Stof</translation>
-    </message>
     <message>
         <source>After Fee:</source>
         <translation>Na vergoeding:</translation>
@@ -866,28 +999,32 @@
         <translation>Bevestigd</translation>
     </message>
     <message>
-        <source>Copy address</source>
-        <translation>Kopieer adres</translation>
+        <source>Copy amount</source>
+        <translation>Kopieer bedrag</translation>
+    </message>
+    <message>
+        <source>&amp;Copy address</source>
+        <translation>&amp;Kopieer adres</translation>
     </message>
     <message>
-        <source>Copy label</source>
-        <translation>Kopieer Label</translation>
+        <source>Copy &amp;label</source>
+        <translation>Kopieer &amp;label</translation>
     </message>
     <message>
-        <source>Copy amount</source>
-        <translation>Kopieer bedrag</translation>
+        <source>Copy &amp;amount</source>
+        <translation>Kopieer &amp;bedrag</translation>
     </message>
     <message>
-        <source>Copy transaction ID</source>
-        <translation>Kopieer transactie-ID</translation>
+        <source>Copy transaction &amp;ID and output index</source>
+        <translation>Kopieer transactie &amp;ID en output index</translation>
     </message>
     <message>
-        <source>Lock unspent</source>
-        <translation>Blokeer ongebruikte</translation>
+        <source>L&amp;ock unspent</source>
+        <translation>&amp;Vergrendel onuitgegeven</translation>
     </message>
     <message>
-        <source>Unlock unspent</source>
-        <translation>Deblokkeer ongebruikte</translation>
+        <source>&amp;Unlock unspent</source>
+        <translation>&amp;Ontgrendel onuitgegeven</translation>
     </message>
     <message>
         <source>Copy quantity</source>
@@ -905,10 +1042,6 @@
         <source>Copy bytes</source>
         <translation>Kopieer bytes</translation>
     </message>
-    <message>
-        <source>Copy dust</source>
-        <translation>Kopieer stof</translation>
-    </message>
     <message>
         <source>Copy change</source>
         <translation>Kopieer wisselgeld</translation>
@@ -921,18 +1054,6 @@
         <source>(%1 locked)</source>
         <translation>(%1 geblokeerd)</translation>
     </message>
-    <message>
-        <source>yes</source>
-        <translation>ja</translation>
-    </message>
-    <message>
-        <source>no</source>
-        <translation>nee</translation>
-    </message>
-    <message>
-        <source>This label turns red if any recipient receives an amount smaller than the current dust threshold.</source>
-        <translation>Deze label wordt rood als een ontvanger een hoeveelheid kleiner dan de huidige dust-drempel krijgt.</translation>
-    </message>
     <message>
         <source>Can vary +/- %1 duff(s) per input.</source>
         <translation>Kan +/- %1 duff(s) per invoer variëren.</translation>
@@ -976,8 +1097,14 @@
 </context>
 <context>
     <name>CreateWalletActivity</name>
+    <message>
+        <source>Create Wallet</source>
+        <extracomment>Title of window indicating the progress of creation of a new wallet.</extracomment>
+        <translation>Maak Portemonnee</translation>
+    </message>
     <message>
         <source>Creating Wallet &lt;b&gt;%1&lt;/b&gt;…</source>
+        <extracomment>Descriptive text of the create wallet progress window which indicates to the user which wallet is currently being created.</extracomment>
         <translation>Portemonnee &lt;b&gt;%1&lt;/b&gt; wordt aangemaakt…</translation>
     </message>
     <message>
@@ -999,6 +1126,10 @@
         <source>Wallet Name</source>
         <translation>Portemonnee naam</translation>
     </message>
+    <message>
+        <source>Wallet</source>
+        <translation>Portemonnee</translation>
+    </message>
     <message>
         <source>Encrypt the wallet. The wallet will be encrypted with a passphrase of your choice.</source>
         <translation>Versleutel de portemonnee. De portemonnee wordt versleuteld met een wachtwoordzin naar keuze.</translation>
@@ -1007,6 +1138,10 @@
         <source>Encrypt Wallet</source>
         <translation>Portemonnee versleutelen</translation>
     </message>
+    <message>
+        <source>Advanced Options</source>
+        <translation>Geavanceerde Opties</translation>
+    </message>
     <message>
         <source>Disable private keys for this wallet. Wallets with private keys disabled will have no private keys and cannot have an HD seed or imported private keys. This is ideal for watch-only wallets.</source>
         <translation>Schakel privésleutels voor deze portemonnee uit. Portemonnees met uitgeschakelde privésleutels hebben geen privésleutels en kunnen geen HD-seed of geïmporteerde privésleutels hebben. Dit is ideaal voor watch-only portemonnees.</translation>
@@ -1023,11 +1158,23 @@
         <source>Make Blank Wallet</source>
         <translation>Maak lege portemonnee</translation>
     </message>
+    <message>
+        <source>Use descriptors for scriptPubKey management. This feature is well-tested but still considered experimental and not recommended for use yet.</source>
+        <translation>Gebruik descriptors voor scriptPubKey beheer. Deze functie is goed getest, maar wordt nog steeds als experimenteel beschouwd en wordt voorlopig niet aanbevolen voor gebruik.</translation>
+    </message>
+    <message>
+        <source>Descriptor Wallet (EXPERIMENTAL)</source>
+        <translation>Descriptor Portemonnee (EXPERIMENTEEL)</translation>
+    </message>
     <message>
         <source>Create</source>
         <translation>Aanmaken</translation>
     </message>
-    </context>
+    <message>
+        <source>Compiled without sqlite support (required for descriptor wallets)</source>
+        <translation>Gecompileerd zonder sqlite ondersteuning (vereist voor descriptor portemonnees)</translation>
+    </message>
+</context>
 <context>
     <name>EditAddressDialog</name>
     <message>
@@ -1116,18 +1263,106 @@
         <source>Filter List:</source>
         <translation>Filter Lijst:</translation>
     </message>
+    <message>
+        <source>Filter proposal list</source>
+        <translation>Filter proposal lijst</translation>
+    </message>
+    <message>
+        <source>Masternode Count:</source>
+        <translation>Masternode aantal:</translation>
+    </message>
+    <message>
+        <source>Number of masternodes this wallet can vote with (masternodes for which this wallet holds the voting key)</source>
+        <translation>Aantal masternodes waarmee deze portemonnee kan stemmen (masternodes waarvoor deze portemonnee de stemsleutel heeft)</translation>
+    </message>
     <message>
         <source>Proposal Count:</source>
         <translation>Proposal aantal:</translation>
     </message>
+    <message>
+        <source>Create Proposal</source>
+        <translation>Voorstel maken</translation>
+    </message>
     <message>
         <source>Filter by Title</source>
         <translation>Filter op titel</translation>
     </message>
+    <message>
+        <source>Unavailable</source>
+        <translation>Niet beschikbaar</translation>
+    </message>
+    <message>
+        <source>A synced node and an unlocked wallet are required.</source>
+        <translation>Een gesynchroniseerde node en een ontgrendelde portemonnee zijn vereist.</translation>
+    </message>
+    <message>
+        <source>Vote Yes</source>
+        <translation>Stem Ja</translation>
+    </message>
+    <message>
+        <source>Vote No</source>
+        <translation>Stem Nee</translation>
+    </message>
+    <message>
+        <source>Vote Abstain</source>
+        <translation>Onthouding</translation>
+    </message>
     <message>
         <source>Proposal Info: %1</source>
         <translation>Proposal Info: %1</translation>
     </message>
+    <message>
+        <source>Voting Failed</source>
+        <translation>Stemmen mislukt</translation>
+    </message>
+    <message>
+        <source>No wallet available.</source>
+        <translation>Geen portemonnee beschikbaar.</translation>
+    </message>
+    <message>
+        <source>No masternode voting keys found in wallet.</source>
+        <translation>Geen masternode stemsleutels gevonden in portemonnee.</translation>
+    </message>
+    <message>
+        <source>Please select a proposal to vote on.</source>
+        <translation>Selecteer een voorstel om op te stemmen.</translation>
+    </message>
+    <message>
+        <source>Unable to unlock wallet.</source>
+        <translation>Kan portemonnee niet ontgrendelen.</translation>
+    </message>
+    <message>
+        <source>Unable to get masternode list. Please try again later.</source>
+        <translation>Kan masternode lijst niet ophalen. Probeer het later opnieuw.</translation>
+    </message>
+    <message>
+        <source>Masternode %1 not found</source>
+        <translation>Masternode %1 niet gevonden</translation>
+    </message>
+    <message>
+        <source>Failed to sign vote for masternode %1</source>
+        <translation>Kan stem voor masternode %1 niet ondertekenen</translation>
+    </message>
+    <message>
+        <source>Masternode %1: %2</source>
+        <translation>Masternode %1: %2</translation>
+    </message>
+    <message numerus="yes">
+        <source>Voted successfully %n time(s)</source>
+        <translation><numerusform>Succesvol gestemd %n keer</numerusform><numerusform>Succesvol gestemd %n keer</numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <source>Failed to vote %n time(s)</source>
+        <translation><numerusform>Stemmen mislukt %n keer</numerusform><numerusform>Stemmen mislukt %n keer</numerusform></translation>
+    </message>
+    <message>
+        <source>Errors:</source>
+        <translation>Fouten:</translation>
+    </message>
+    <message>
+        <source>Voting Results</source>
+        <translation>Stemresultaten</translation>
+    </message>
 </context>
 <context>
     <name>HelpMessageDialog</name>
@@ -1166,10 +1401,26 @@
         <source>As this is the first time the program is launched, you can choose where %1 will store its data.</source>
         <translation>Omdat dit de eerste keer is dat het programma gestart is, kunt u nu kiezen waar %1 de data moet opslaan.</translation>
     </message>
+    <message>
+        <source>Limit block chain storage to</source>
+        <translation>Beperk blockchain opslag tot</translation>
+    </message>
+    <message>
+        <source>Reverting this setting requires re-downloading the entire blockchain. It is faster to download the full chain first and prune it later. Disables some advanced features.</source>
+        <translation>Het terugzetten van deze instelling vereist het opnieuw downloaden van de gehele blockchain. Het is sneller om eerst de volledige keten te downloaden en later te prunen. Schakelt sommige geavanceerde functies uit.</translation>
+    </message>
+    <message>
+        <source> GB</source>
+        <translation> GB</translation>
+    </message>
     <message>
         <source>This initial synchronisation is very demanding, and may expose hardware problems with your computer that had previously gone unnoticed. Each time you run %1, it will continue downloading where it left off.</source>
         <translation>Deze initiële synchronisatie is heel veeleisend, en kan hardware problemen met uw computer blootleggen die voorheen onopgemerkt bleven. Elke keer dat %1 gebruikt word, zal verdergegaan worden waar gebleven is.</translation>
     </message>
+    <message>
+        <source>When you click OK, %1 will begin to download and process the full %4 block chain (%2 GB) starting with the earliest transactions in %3 when %4 initially launched.</source>
+        <translation>Zodra je op OK drukt, zal %1 beginnen met het downloaden en verwerken van de volledige %4 blockchain (%2 GB), beginnend met de vroegste transacties in %3 %4 initieel werd gelanceerd.</translation>
+    </message>
     <message>
         <source>If you have chosen to limit block chain storage (pruning), the historical data must still be downloaded and processed, but will be deleted afterward to keep your disk usage low.</source>
         <translation>Als u gekozen heeft om de blokketenopslag te beperken (pruning), dan moet de historische data nog steeds gedownload en verwerkt worden, maar zal verwijderd worden naderhand om schijf gebruik zo laag mogelijk te houden.</translation>
@@ -1182,6 +1433,18 @@
         <source>Use a custom data directory:</source>
         <translation>Gebruik een persoonlijke gegevensmap:</translation>
     </message>
+    <message numerus="yes">
+        <source>%n GB of space available</source>
+        <translation><numerusform>%n GB aan vrije ruimte beschikbaar</numerusform><numerusform>%n GB aan vrije ruimte beschikbaar</numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <source>(of %n GB needed)</source>
+        <translation><numerusform>(van %n GB benodigd)</numerusform><numerusform>(van %n GB benodigd)</numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <source>(%n GB needed for full chain)</source>
+        <translation><numerusform>(%n GB benodigd voor volledige keten)</numerusform><numerusform>(%n GB benodigd voor volledige keten)</numerusform></translation>
+    </message>
     <message>
         <source>At least %1 GB of data will be stored in this directory, and it will grow over time.</source>
         <translation>Tenminste %1 GB aan data zal worden opgeslagen in deze map, en dit zal naarmate de tijd voortschrijdt groeien.</translation>
@@ -1190,6 +1453,11 @@
         <source>Approximately %1 GB of data will be stored in this directory.</source>
         <translation>Gemiddeld %1 GB aan data zal worden opgeslagen in deze map.</translation>
     </message>
+    <message numerus="yes">
+        <source>(sufficient to restore backups %n day(s) old)</source>
+        <extracomment>Explanatory text on the capability of the current prune target.</extracomment>
+        <translation><numerusform>(voldoende om back-ups van %n dag oud te herstellen)</numerusform><numerusform>(voldoende om back-ups van %n dagen oud te herstellen)</numerusform></translation>
+    </message>
     <message>
         <source>%1 will download and store a copy of the Dash block chain.</source>
         <translation>%1 zal een kopie van de blokketen van Dash downloaden en opslaan.</translation>
@@ -1207,6 +1475,13 @@
         <translation>Fout</translation>
     </message>
 </context>
+<context>
+    <name>LoadWalletsActivity</name>
+    <message>
+        <source>Loading wallets…</source>
+        <translation>Portemonnees laden…</translation>
+    </message>
+</context>
 <context>
     <name>MasternodeList</name>
     <message>
@@ -1241,6 +1516,10 @@
         <source>Service</source>
         <translation>Service</translation>
     </message>
+    <message>
+        <source>Type</source>
+        <translation>Type</translation>
+    </message>
     <message>
         <source>PoSe Score</source>
         <translation>PoSe Score</translation>
@@ -1376,6 +1655,10 @@
         <source>Hide</source>
         <translation>Verbergen</translation>
     </message>
+    <message>
+        <source>%1 is currently syncing.  It will download headers and blocks from peers and validate them until reaching the tip of the block chain.</source>
+        <translation>%1 is momenteel aan het synchroniseren. Het zal kopteksten en blocks van peers downloaden en deze valideren totdat het het einde van de blockchain heeft bereikt.</translation>
+    </message>
     <message>
         <source>Unknown. Syncing Headers (%1, %2%)…</source>
         <translation>Onbekend. Kopteksten synchroniseren (%1, %2%)…</translation>
@@ -1391,6 +1674,11 @@
         <source>URI:</source>
         <translation>URI:</translation>
     </message>
+    <message>
+        <source>Paste address from clipboard</source>
+        <extracomment>Tooltip text for button that allows you to paste an address that is in your clipboard.</extracomment>
+        <translation>Plak adres van klembord</translation>
+    </message>
 </context>
 <context>
     <name>OpenWalletActivity</name>
@@ -1406,8 +1694,14 @@
         <source>default wallet</source>
         <translation>standaard portemonnee</translation>
     </message>
+    <message>
+        <source>Open Wallet</source>
+        <extracomment>Title of window indicating the progress of opening of a wallet.</extracomment>
+        <translation>portemonnee openen</translation>
+    </message>
     <message>
         <source>Opening Wallet &lt;b&gt;%1&lt;/b&gt;…</source>
+        <extracomment>Descriptive text of the open wallet progress window which indicates to the user which wallet is currently being opened.</extracomment>
         <translation>Portemonnee &lt;b&gt;%1&lt;/b&gt; wordt geopend…</translation>
     </message>
 </context>
@@ -1441,6 +1735,14 @@
         <source>&amp;Appearance</source>
         <translation>&amp;Uiterlijk</translation>
     </message>
+    <message>
+        <source>Show the icon in the system tray.</source>
+        <translation>Toon het pictogram in het systeemvak.</translation>
+    </message>
+    <message>
+        <source>&amp;Show tray icon</source>
+        <translation>&amp;Toon systeemvakpictogram</translation>
+    </message>
     <message>
         <source>Prune &amp;block storage to</source>
         <translation>Prune &amp;blokopslag naar</translation>
@@ -1453,10 +1755,58 @@
         <source>Reverting this setting requires re-downloading the entire blockchain.</source>
         <translation>Deze instelling terugdraaien vereist het opnieuw downloaden van de complete blokketen.</translation>
     </message>
+    <message>
+        <source>Maximum database cache size. A larger cache can contribute to faster sync, after which the benefit is less pronounced for most use cases. Lowering the cache size will reduce memory usage. Unused mempool memory is shared for this cache.</source>
+        <extracomment>Tooltip text for Options window setting that sets the size of the database cache. Explains the corresponding effects of increasing/decreasing this value.</extracomment>
+        <translation>Maximale grootte van de database cache. Een grotere cache kan bijdragen aan snellere synchronisatie, waarna het voordeel voor de meeste toepassingen minder merkbaar is. Het verlagen van de cachegrootte vermindert het geheugengebruik. Ongebruikt mempool geheugen wordt gedeeld voor deze cache.</translation>
+    </message>
     <message>
         <source>MiB</source>
         <translation>MiB</translation>
     </message>
+    <message>
+        <source>Set the number of script verification threads. Negative values correspond to the number of cores you want to leave free to the system.</source>
+        <extracomment>Tooltip text for Options window setting that sets the number of script verification threads. Explains that negative values mean to leave these many cores free to the system.</extracomment>
+        <translation>Stel het aantal scriptverificatie threads in. Negatieve waarden komen overeen met het aantal cores dat je vrij wilt laten voor het systeem.</translation>
+    </message>
+    <message>
+        <source>This allows you or a third party tool to communicate with the node through command-line and JSON-RPC commands.</source>
+        <extracomment>Tooltip text for Options window setting that enables the RPC server.</extracomment>
+        <translation>Dit stelt jou of een tool van een derde partij in staat om via commandoregels  en JSON-RPC opdrachten te communiceren met de node.</translation>
+    </message>
+    <message>
+        <source>Enable R&amp;PC server</source>
+        <extracomment>An Options window setting to enable the RPC server.</extracomment>
+        <translation>Schakel R&amp;PC server in</translation>
+    </message>
+    <message>
+        <source>Whether to set subtract fee from amount as default or not.</source>
+        <extracomment>Tooltip text for Options window setting that sets subtracting the fee from a sending amount as default.</extracomment>
+        <translation>Of het de standaardinstelling moet zijn om de kosten van het bedrag af te trekken of niet.</translation>
+    </message>
+    <message>
+        <source>Subtract &amp;fee from amount by default</source>
+        <extracomment>An Options window setting to set subtracting the fee from a sending amount as default.</extracomment>
+        <translation>Trek &amp;vergoeding standaard af van het bedrag</translation>
+    </message>
+    <message>
+        <source>Enable &amp;PSBT controls</source>
+        <extracomment>An options window setting to enable PSBT controls.</extracomment>
+        <translation>&amp;PSBT-besturing inschakelen</translation>
+    </message>
+    <message>
+        <source>Whether to show PSBT controls.</source>
+        <extracomment>Tooltip text for options window setting that enables PSBT controls.</extracomment>
+        <translation>Of PSBT-besturing getoond moet worden.</translation>
+    </message>
+    <message>
+        <source>Whether to keep the specified custom change address or not.</source>
+        <translation>Of het opgegeven aangepaste wisselgeld adres behouden moet blijven of niet.</translation>
+    </message>
+    <message>
+        <source>Keep custom change &amp;address</source>
+        <translation>Houd aangepast wisselgeld&amp;adres</translation>
+    </message>
     <message>
         <source>Show additional tab listing all your masternodes in first sub-tab&lt;br/&gt;and all masternodes on the network in second sub-tab.</source>
         <translation>Toon extra tabblad waarin je al jouw masternodes toont in de eerste sub-tab&lt;br/&gt; en alle masternodes op het netwerk in het tweede sub-tabblad.</translation>
@@ -1513,6 +1863,14 @@
         <source>Enable &amp;multi-session</source>
         <translation>Schakel &amp;multi-sessie in</translation>
     </message>
+    <message>
+        <source>Use this many separate masternodes in parallel to mix funds.&lt;br/&gt;Note: You must use this feature carefully.&lt;br/&gt;Make sure you always have recent wallet (auto)backup in a safe place!</source>
+        <translation>Gebruik dit aantal masternodes parallel om saldo te mixen.&lt;br/&gt; Opmerking: Gebruik deze functie voorzichtig. &lt;br/&gt;Zorg ervoor dat je altijd een recente portemonnee (auto)back-up op een veilige plek hebt!</translation>
+    </message>
+    <message>
+        <source>Parallel sessions</source>
+        <translation>Parallelle sessies</translation>
+    </message>
     <message>
         <source>Mixing rounds</source>
         <translation>Mixrondes</translation>
@@ -1525,6 +1883,30 @@
         <source>Target balance</source>
         <translation>Target Saldo</translation>
     </message>
+    <message>
+        <source>How many inputs of each denominated amount are created.&lt;br/&gt;Lower these numbers if you want fewer smaller denominations.</source>
+        <translation>Hoeveel inputs van elk gedenomineerd bedrag worden aangemaakt. &lt;br/&gt;Verlaag deze nummers als je minder kleinere denominaties wilt.</translation>
+    </message>
+    <message>
+        <source>Inputs per denomination</source>
+        <translation>Invoeren per denominatie</translation>
+    </message>
+    <message>
+        <source>Try to create at least this many inputs for each denominated amount.&lt;br/&gt;Lower this number if you want fewer smaller denominations.</source>
+        <translation>Probeer minimaal dit aantal invoeren te creëren voor elk gedenomineerd bedrag. &lt;br/&gt; Verlaag dit nummer als je minder kleinere denominaties wilt.</translation>
+    </message>
+    <message>
+        <source>Target</source>
+        <translation>Doel</translation>
+    </message>
+    <message>
+        <source>Create up to this many inputs for each denominated amount.&lt;br/&gt;Lower this number if you want fewer smaller denominations.</source>
+        <translation>Creëer tot dit aantal inputs voor elk gedenomineerd bedrag. &lt;br/&gt; Verlaag dit nummer als je minder kleinere denominaties wilt.</translation>
+    </message>
+    <message>
+        <source>Maximum</source>
+        <translation>Maximum</translation>
+    </message>
     <message>
         <source>Automatically open the Dash Core client port on the router. This only works when your router supports UPnP and it is enabled.</source>
         <translation>Open automatisch de Dash client poort op de router. Dit werkt alleen als uw router UPnP ondersteunt en dit is ingeschakeld.</translation>
@@ -1554,20 +1936,26 @@
         <translation>Toont of de opgegeven standaard SOCK5 proxy gebruikt is om peers via dit netwerk type te bereiken.</translation>
     </message>
     <message>
-        <source>Options set in this dialog are overridden by the command line or in the configuration file:</source>
-        <translation>Opties die in dit dialoogvenster worden ingesteld, worden overschreven door de opdrachtregel(CLI) of in het configuratiebestand:</translation>
+        <source>Language missing or translation incomplete? Help contributing translations here:
+https://explore.transifex.com/dash/dash/</source>
+        <translation>Taal ontbreekt of vertaling incompleet? Help mee met het bijdragen van vertalingen hier:
+https://explore.transifex.com/dash/dash/</translation>
     </message>
     <message>
-        <source>Minimize instead of exit the application when the window is closed. When this option is enabled, the application will be closed only after selecting Exit in the menu.</source>
-        <translation>Minimaliseren in plaats van de applicatie af te sluiten wanneer het venster is afgesloten. Als deze optie is ingeschakeld, zal de toepassing pas worden afgesloten na het selecteren van Exit in het menu.</translation>
+        <source>Third-party URLs (e.g. a block explorer) that appear in the transactions tab as context menu items.&lt;br/&gt;%s in the URL is replaced by transaction hash. Multiple URLs are separated by vertical bar |.</source>
+        <translation>URL's van derden (bijvoorbeeld een block explorer) die verschijnen in het transactietabblad als contextmenu-items.&lt;br/&gt;%s in de URL wordt vervangen door transactiehash. Meerdere URL's worden gescheiden door verticale streep |.</translation>
     </message>
     <message>
-        <source>Third party URLs (e.g. a block explorer) that appear in the transactions tab as context menu items.&lt;br/&gt;%s in the URL is replaced by transaction hash. Multiple URLs are separated by vertical bar |.</source>
-        <translation>Derde partij URL's (bijvoorbeeld block explorer) dat in de transacties tab verschijnen als contextmenu elementen. %s in de URL is vervangen door transactie hash. Verscheidene URL's zijn gescheiden met een verticale streep |.  </translation>
+        <source>&amp;Third-party transaction URLs</source>
+        <translation>&amp;Transactie-URL's van derden</translation>
     </message>
     <message>
-        <source>&amp;Third party transaction URLs</source>
-        <translation>&amp;Transactie-URL's van derden</translation>
+        <source>Options set in this dialog are overridden by the command line or in the configuration file:</source>
+        <translation>Opties die in dit dialoogvenster worden ingesteld, worden overschreven door de opdrachtregel(CLI) of in het configuratiebestand:</translation>
+    </message>
+    <message>
+        <source>Minimize instead of exit the application when the window is closed. When this option is enabled, the application will be closed only after selecting Exit in the menu.</source>
+        <translation>Minimaliseren in plaats van de applicatie af te sluiten wanneer het venster is afgesloten. Als deze optie is ingeschakeld, zal de toepassing pas worden afgesloten na het selecteren van Exit in het menu.</translation>
     </message>
     <message>
         <source>Whether to show coin control features or not.</source>
@@ -1605,6 +1993,10 @@
         <source>Map port using &amp;UPnP</source>
         <translation>Portmapping via &amp;UPnP</translation>
     </message>
+    <message>
+        <source>Automatically open the Dash Core client port on the router. This only works when your router supports NAT-PMP and it is enabled. The external port could be random.</source>
+        <translation>Open automatisch de Dash Core poort op de router. Dit werkt alleen wanneer je router NAT-PMP ondersteunt en ingeschakeld is. De externe poort kan willekeurig zijn.</translation>
+    </message>
     <message>
         <source>Proxy &amp;IP:</source>
         <translation>Proxy &amp;IP:</translation>
@@ -1654,8 +2046,16 @@
         <translation>&amp;Interface</translation>
     </message>
     <message>
-        <source>User Interface &amp;language:</source>
-        <translation>Taal &amp;Gebruikersinterface:</translation>
+        <source>Connect to the Dash network through a separate SOCKS5 proxy for Tor onion services.</source>
+        <translation>Verbind met het Dash netwerk via een aparte SOCKS5 proxy voor Tor Onion diensten.</translation>
+    </message>
+    <message>
+        <source>Use separate SOCKS&amp;5 proxy to reach peers via Tor onion services:</source>
+        <translation>Gebruik een afzonderlijke SOCKS&amp;5 proxy om peers te bereiken via Tor Onion services:</translation>
+    </message>
+    <message>
+        <source>User Interface &amp;language:</source>
+        <translation>Taal &amp;Gebruikersinterface:</translation>
     </message>
     <message>
         <source>The user interface language can be set here. This setting will take effect after restarting %1.</source>
@@ -1699,14 +2099,22 @@
     </message>
     <message>
         <source>Confirm options reset</source>
+        <extracomment>Window title text of pop-up window shown when the user has chosen to reset options.</extracomment>
         <translation>Bevestig reset van alle instellingen</translation>
     </message>
     <message>
         <source>Client restart required to activate changes.</source>
+        <extracomment>Text explaining that the settings changed will not come into effect until the client is restarted.</extracomment>
         <translation>Herstart van de client is vereist om aanpassingen door te voeren.</translation>
     </message>
+    <message>
+        <source>Current settings will be backed up at "%1".</source>
+        <extracomment>Text explaining to the user that the client's current settings will be backed up at a specific location. %1 is a stand-in argument for the backup location's path.</extracomment>
+        <translation>Huidige instellingen worden opgeslagen in "%1".</translation>
+    </message>
     <message>
         <source>Client will be shut down. Do you want to proceed?</source>
+        <extracomment>Text asking the user to confirm if they would like to proceed with a client shutdown.</extracomment>
         <translation>De client zal worden afgesloten, wilt u doorgaan?</translation>
     </message>
     <message>
@@ -1845,6 +2253,10 @@ Om te mixen moeten andere gebruikers exact dezelfde denominaties inbrengen.</tra
         <source>%1 Balance</source>
         <translation>%1 Saldo</translation>
     </message>
+    <message>
+        <source>Discreet mode activated for the Overview tab. To unmask the values, uncheck Settings-&gt;Discreet mode.</source>
+        <translation>Discrete modus geactiveerd voor het Overzicht-tabblad. Om de waarden zichtbaar te maken, maak optie Instellingen-&gt;Discrete modus ongedaan.</translation>
+    </message>
     <message numerus="yes">
         <source>%n Rounds</source>
         <translation><numerusform>%n Ronde</numerusform><numerusform>%n Rondes</numerusform></translation>
@@ -1944,7 +2356,140 @@ Om te mixen moeten andere gebruikers exact dezelfde denominaties inbrengen.</tra
 </context>
 <context>
     <name>PSBTOperationsDialog</name>
-    </context>
+    <message>
+        <source>Dialog</source>
+        <translation>Dialoog</translation>
+    </message>
+    <message>
+        <source>Sign Tx</source>
+        <translation>Sign Tx</translation>
+    </message>
+    <message>
+        <source>Broadcast Tx</source>
+        <translation>Broadcast Tx</translation>
+    </message>
+    <message>
+        <source>Copy to Clipboard</source>
+        <translation>Kopieer naar klembord</translation>
+    </message>
+    <message>
+        <source>Save…</source>
+        <translation>Opslaan...</translation>
+    </message>
+    <message>
+        <source>Close</source>
+        <translation>Sluiten</translation>
+    </message>
+    <message>
+        <source>Failed to load transaction: %1</source>
+        <translation>Fout bij het laden van de transactie: %1</translation>
+    </message>
+    <message>
+        <source>Failed to sign transaction: %1</source>
+        <translation>Fout bij het ondertekenen van de transactie: %1</translation>
+    </message>
+    <message>
+        <source>Cannot sign inputs while wallet is locked.</source>
+        <translation>Kan de input niet ondertekenen terwijl de portemonnee vergrendeld is.</translation>
+    </message>
+    <message>
+        <source>Could not sign any more inputs.</source>
+        <translation>Kon geen extra inputs ondertekenen.</translation>
+    </message>
+    <message>
+        <source>Signed %1 inputs, but more signatures are still required.</source>
+        <translation>%1 inputs ondertekend, maar er zijn nog steeds meer handtekeningen vereist.</translation>
+    </message>
+    <message>
+        <source>Signed transaction successfully. Transaction is ready to broadcast.</source>
+        <translation>Transactie succesvol ondertekend. Transactie is klaar om uit te zenden.</translation>
+    </message>
+    <message>
+        <source>Unknown error processing transaction.</source>
+        <translation>Onbekende fout bij het verwerken van de transactie.</translation>
+    </message>
+    <message>
+        <source>Transaction broadcast successfully! Transaction ID: %1</source>
+        <translation>Transactie succesvol vergezonden! Transactie ID: %1</translation>
+    </message>
+    <message>
+        <source>Transaction broadcast failed: %1</source>
+        <translation>Transactie verzending mislukt: %1</translation>
+    </message>
+    <message>
+        <source>PSBT copied to clipboard.</source>
+        <translation>PSBT gekopieerd naar klembord.</translation>
+    </message>
+    <message>
+        <source>Save Transaction Data</source>
+        <translation>Transactiegegevens opslaan</translation>
+    </message>
+    <message>
+        <source>Partially Signed Transaction (Binary)</source>
+        <extracomment>Expanded name of the binary PSBT file format. See: BIP 174.</extracomment>
+        <translation>Deels ondertekende transactie (Binair)</translation>
+    </message>
+    <message>
+        <source>PSBT saved to disk.</source>
+        <translation>PSBT opgeslagen op schijf.</translation>
+    </message>
+    <message>
+        <source> * Sends %1 to %2</source>
+        <translation>* Stuurt %1 naar %2</translation>
+    </message>
+    <message>
+        <source>own address</source>
+        <translation>eigen adres</translation>
+    </message>
+    <message>
+        <source>Unable to calculate transaction fee or total transaction amount.</source>
+        <translation>Kan de transactie fee of het totale transactiebedrag niet berekenen.</translation>
+    </message>
+    <message>
+        <source>Pays transaction fee: </source>
+        <translation>Betaalt transactie fee:</translation>
+    </message>
+    <message>
+        <source>Total Amount</source>
+        <translation>Totaalbedrag</translation>
+    </message>
+    <message>
+        <source>or</source>
+        <translation>of</translation>
+    </message>
+    <message>
+        <source>Transaction has %1 unsigned inputs.</source>
+        <translation>Transactie heeft %1 niet-ondertekende inputs.</translation>
+    </message>
+    <message>
+        <source>Transaction is missing some information about inputs.</source>
+        <translation>Transactie mist wat informatie over inputs.</translation>
+    </message>
+    <message>
+        <source>Transaction still needs signature(s).</source>
+        <translation>Transactie heeft nog handtekening(en) nodig.</translation>
+    </message>
+    <message>
+        <source>(But no wallet is loaded.)</source>
+        <translation>(Maar er is geen portemonnee geladen.)</translation>
+    </message>
+    <message>
+        <source>(But this wallet cannot sign transactions.)</source>
+        <translation>(Maar deze portemonnee kan geen transacties ondertekenen.)</translation>
+    </message>
+    <message>
+        <source>(But this wallet does not have the right keys.)</source>
+        <translation>(Maar deze portemonnee heeft de juiste sleutels niet.)</translation>
+    </message>
+    <message>
+        <source>Transaction is fully signed and ready for broadcast.</source>
+        <translation>Transactie is volledig ondertekend en klaar voor verzending.</translation>
+    </message>
+    <message>
+        <source>Transaction status is unknown.</source>
+        <translation>Transactiestatus is onbekend.</translation>
+    </message>
+</context>
 <context>
     <name>PaymentServer</name>
     <message>
@@ -1963,6 +2508,11 @@ Om te mixen moeten andere gebruikers exact dezelfde denominaties inbrengen.</tra
         <source>'dash://' is not a valid URI. Use 'dash:' instead.</source>
         <translation>'dash://' is geen geldige URI. Gebruik in plaats daarvan 'dash:'.</translation>
     </message>
+    <message>
+        <source>Cannot process payment request as BIP70 is no longer supported.
+Due to discontinued support, you should request the merchant to provide you with a BIP21 compatible URI or use a wallet that does continue to support BIP70.</source>
+        <translation>Kan de betalingsverzoek niet verwerken omdat BIP70 niet langer wordt ondersteund. Door het stopzetten van de ondersteuning, moet je de verkoper vragen om je een BIP21-compatibele URI te verstrekken of een portemonnee te gebruiken die BIP70 nog steeds ondersteunt.</translation>
+    </message>
     <message>
         <source>URI cannot be parsed! This can be caused by an invalid Dash address or malformed URI parameters.</source>
         <translation>URI kan niet verwerkt worden! Dit kan het gevolg zijn van een ongeldig Dash adres of misvormde URI parameters.</translation>
@@ -1984,6 +2534,26 @@ Om te mixen moeten andere gebruikers exact dezelfde denominaties inbrengen.</tra
         <extracomment>Title of Peers Table column which indicates the current latency of the connection with the peer.</extracomment>
         <translation>Ping</translation>
     </message>
+    <message>
+        <source>Peer</source>
+        <extracomment>Title of Peers Table column which contains a unique number used to identify a connection.</extracomment>
+        <translation>Peer</translation>
+    </message>
+    <message>
+        <source>Age</source>
+        <extracomment>Title of Peers Table column which indicates the duration (length of time) since the peer connection started.</extracomment>
+        <translation>Leeftijd</translation>
+    </message>
+    <message>
+        <source>Direction</source>
+        <extracomment>Title of Peers Table column which indicates the direction the peer connection was initiated from.</extracomment>
+        <translation>Richting</translation>
+    </message>
+    <message>
+        <source>Type</source>
+        <extracomment>Title of Peers Table column which describes the type of peer connection. The "type" describes why the connection exists.</extracomment>
+        <translation>Type</translation>
+    </message>
     <message>
         <source>Sent</source>
         <extracomment>Title of Peers Table column which indicates the total amount of network information we have sent to the peer.</extracomment>
@@ -1994,7 +2564,27 @@ Om te mixen moeten andere gebruikers exact dezelfde denominaties inbrengen.</tra
         <extracomment>Title of Peers Table column which indicates the total amount of network information we have received from the peer.</extracomment>
         <translation>Ontvangen</translation>
     </message>
-    </context>
+    <message>
+        <source>Address</source>
+        <extracomment>Title of Peers Table column which contains the IP/Onion/I2P address of the connected peer.</extracomment>
+        <translation>Adres</translation>
+    </message>
+    <message>
+        <source>Network</source>
+        <extracomment>Title of Peers Table column which states the network the peer connected through.</extracomment>
+        <translation>Netwerk</translation>
+    </message>
+    <message>
+        <source>Inbound</source>
+        <extracomment>An Inbound Connection from a Peer.</extracomment>
+        <translation>Inkomend</translation>
+    </message>
+    <message>
+        <source>Outbound</source>
+        <extracomment>An Outbound Connection to a Peer.</extracomment>
+        <translation>Uitgaand</translation>
+    </message>
+</context>
 <context>
     <name>Proposal</name>
     <message>
@@ -2045,8 +2635,193 @@ Om te mixen moeten andere gebruikers exact dezelfde denominaties inbrengen.</tra
         <translation>Status</translation>
     </message>
 </context>
+<context>
+    <name>ProposalWizard</name>
+    <message>
+        <source>Create Governance Proposal</source>
+        <translation>Governance-voorstel maken</translation>
+    </message>
+    <message>
+        <source>Enter proposal details</source>
+        <translation>Voer voorsteldetails in</translation>
+    </message>
+    <message>
+        <source>A fee will be burned when you prepare the proposal.</source>
+        <translation>Er wordt een vergoeding verbrand wanneer u het voorstel voorbereidt.</translation>
+    </message>
+    <message>
+        <source>Proposal &amp;name</source>
+        <translation>Voorstel&amp;naam</translation>
+    </message>
+    <message>
+        <source>&amp;Description URL</source>
+        <translation>&amp;Beschrijvings-URL</translation>
+    </message>
+    <message>
+        <source>Payment &amp;address</source>
+        <translation>Betalings&amp;adres</translation>
+    </message>
+    <message>
+        <source>Payment &amp;amount</source>
+        <translation>Betalings&amp;bedrag</translation>
+    </message>
+    <message>
+        <source>The amount to request in a single payment</source>
+        <translation>Het bedrag om aan te vragen in een enkele betaling</translation>
+    </message>
+    <message>
+        <source>&amp;First payment</source>
+        <translation>&amp;Eerste betaling</translation>
+    </message>
+    <message>
+        <source>Pa&amp;yments</source>
+        <translation>Bet&amp;alingen</translation>
+    </message>
+    <message>
+        <source>To&amp;tal amount</source>
+        <translation>To&amp;taal bedrag</translation>
+    </message>
+    <message>
+        <source>Proposal &amp;fee</source>
+        <translation>Voorstel&amp;vergoeding</translation>
+    </message>
+    <message>
+        <source>Next</source>
+        <translation>Volgende</translation>
+    </message>
+    <message>
+        <source>Review proposal JSON and validate.</source>
+        <translation>Bekijk voorstel-JSON en valideer.</translation>
+    </message>
+    <message>
+        <source>Hex-encoded JSON</source>
+        <translation>Hex-gecodeerde JSON</translation>
+    </message>
+    <message>
+        <source>Back</source>
+        <translation>Terug</translation>
+    </message>
+    <message>
+        <source>Validate</source>
+        <translation>Valideren</translation>
+    </message>
+    <message>
+        <source>Prepare (burn fee) and wait for confirmations.</source>
+        <translation>Voorbereiden (vergoeding verbranden) en wachten op bevestigingen.</translation>
+    </message>
+    <message>
+        <source>Copy</source>
+        <translation>Kopiëren</translation>
+    </message>
+    <message>
+        <source>At 1/6 confirmations: can be relayed and queued. At 6/6: accepted and processed.</source>
+        <translation>Bij 1/6 bevestigingen: kan worden doorgestuurd en in de wachtrij geplaatst. Bij 6/6: geaccepteerd en verwerkt.</translation>
+    </message>
+    <message>
+        <source>Confirmations progress</source>
+        <translation>Bevestigingsvoortgang</translation>
+    </message>
+    <message>
+        <source>Shows progress toward the required number of confirmations for the proposal fee transaction.</source>
+        <translation>Toont de voortgang naar het vereiste aantal bevestigingen voor de voorstelvergoedingstransactie.</translation>
+    </message>
+    <message>
+        <source>Estimated time remaining: -</source>
+        <translation>Geschatte resterende tijd: -</translation>
+    </message>
+    <message>
+        <source>Prepare Proposal</source>
+        <translation>Voorstel voorbereiden</translation>
+    </message>
+    <message>
+        <source>You can submit after 1 confirmation. At 6 confirmations it is accepted and processed.</source>
+        <translation>U kunt indienen na 1 bevestiging. Bij 6 bevestigingen wordt het geaccepteerd en verwerkt.</translation>
+    </message>
+    <message>
+        <source>Proposal ID:</source>
+        <translation>Voorstel-ID:</translation>
+    </message>
+    <message>
+        <source>Submit Proposal</source>
+        <translation>Voorstel indienen</translation>
+    </message>
+    <message>
+        <source>Close</source>
+        <translation>Sluiten</translation>
+    </message>
+    <message>
+        <source>Valid</source>
+        <translation>Geldig</translation>
+    </message>
+    <message>
+        <source>Invalid: %1</source>
+        <translation>Ongeldig: %1</translation>
+    </message>
+    <message>
+        <source>Burn %1</source>
+        <translation>Verbranden %1</translation>
+    </message>
+    <message>
+        <source>Burn %1 to create the fee transaction?</source>
+        <translation>%1 verbranden om de vergoedingstransactie aan te maken?</translation>
+    </message>
+    <message>
+        <source>Prepare failed</source>
+        <translation>Voorbereiden mislukt</translation>
+    </message>
+    <message>
+        <source>Confirmations: %1 / %2 required</source>
+        <translation>Bevestigingen: %1 / %2 vereist</translation>
+    </message>
+    <message>
+        <source>Estimated time remaining: Ready</source>
+        <translation>Geschatte resterende tijd: Gereed</translation>
+    </message>
+    <message numerus="yes">
+        <source>Estimated time remaining: %n minute(s)</source>
+        <translation><numerusform>Geschatte resterende tijd: %n minuut</numerusform><numerusform>Geschatte resterende tijd: %n minuten</numerusform></translation>
+    </message>
+    <message>
+        <source>Your proposal was submitted successfully.</source>
+        <translation>Uw voorstel is succesvol ingediend.</translation>
+    </message>
+    <message>
+        <source>Already submitted</source>
+        <translation>Reeds ingediend</translation>
+    </message>
+    <message>
+        <source>This proposal has already been submitted.</source>
+        <translation>Dit voorstel is al ingediend.</translation>
+    </message>
+    <message>
+        <source>Submission failed</source>
+        <translation>Indienen mislukt</translation>
+    </message>
+    <message>
+        <source>Proposal submitted</source>
+        <translation>Voorstel ingediend</translation>
+    </message>
+    <message>
+        <source>A fee of %1 will be burned when you prepare the proposal.</source>
+        <translation>Een vergoeding van %1 wordt verbrand wanneer u het voorstel voorbereidt.</translation>
+    </message>
+    <message>
+        <source>Prepare (burn %1) and wait for %2 confirmations.</source>
+        <translation>Voorbereiden (verbranden %1) en wachten op %2 bevestigingen.</translation>
+    </message>
+</context>
 <context>
     <name>QObject</name>
+    <message>
+        <source>Do you want to reset settings to default values, or to abort without making changes?</source>
+        <extracomment>Explanatory text shown on startup when the settings file cannot be read. Prompts user to make a choice between resetting or aborting.</extracomment>
+        <translation>Wil je de instellingen terugzetten naar de standaardwaarden, of annuleren zonder wijzigingen aan te brengen?</translation>
+    </message>
+    <message>
+        <source>A fatal error occurred. Check that settings file is writable, or try running with -nosettings.</source>
+        <extracomment>Explanatory text shown on startup when the settings file could not be written. Prompts user to check that we have the ability to write to the file. Explains that the user has the option of running without a settings file.</extracomment>
+        <translation>Er is een fatale fout opgetreden. Controleer of het instellingenbestand beschrijfbaar is, of probeer het uit te voeren met -nosettings.</translation>
+    </message>
     <message>
         <source>Choose data directory on startup (default: %u)</source>
         <translation>Kies data map bij opstarten (standaard: %u)</translation>
@@ -2147,6 +2922,53 @@ Om te mixen moeten andere gebruikers exact dezelfde denominaties inbrengen.</tra
         <source>This can also be adjusted later in the "Appearance" tab of the preferences.</source>
         <translation>Dit kan later ook worden aangepast in het tabblad "Uiterlijk" van de voorkeuren.</translation>
     </message>
+    <message>
+        <source>Ctrl+W</source>
+        <translation>Ctrl+W</translation>
+    </message>
+    <message>
+        <source>Unroutable</source>
+        <translation>Onbereikbaar</translation>
+    </message>
+    <message>
+        <source>Internal</source>
+        <translation>Intern</translation>
+    </message>
+    <message>
+        <source>Inbound</source>
+        <extracomment>An inbound connection from a peer. An inbound connection is a connection initiated by a peer.</extracomment>
+        <translation>Inkomend</translation>
+    </message>
+    <message>
+        <source>Outbound</source>
+        <extracomment>An outbound connection to a peer. An outbound connection is a connection initiated by us.</extracomment>
+        <translation>Uitgaand</translation>
+    </message>
+    <message>
+        <source>Full Relay</source>
+        <extracomment>Peer connection type that relays all network information.</extracomment>
+        <translation>Volledige Relay</translation>
+    </message>
+    <message>
+        <source>Block Relay</source>
+        <extracomment>Peer connection type that relays network information about blocks and not transactions or addresses.</extracomment>
+        <translation>Block Relay</translation>
+    </message>
+    <message>
+        <source>Manual</source>
+        <extracomment>Peer connection type established manually through one of several methods.</extracomment>
+        <translation>Handmatig</translation>
+    </message>
+    <message>
+        <source>Feeler</source>
+        <extracomment>Short-lived peer connection type that tests the aliveness of known addresses.</extracomment>
+        <translation>Feeler</translation>
+    </message>
+    <message>
+        <source>Address Fetch</source>
+        <extracomment>Short-lived peer connection type that solicits known addresses from a peer.</extracomment>
+        <translation>Adres Ophalen</translation>
+    </message>
     <message>
         <source>%1 d</source>
         <translation>%1 d</translation>
@@ -2208,8 +3030,8 @@ Om te mixen moeten andere gebruikers exact dezelfde denominaties inbrengen.</tra
         <translation>%1 B</translation>
     </message>
     <message>
-        <source>%1 KB</source>
-        <translation>%1 KB</translation>
+        <source>%1 kB</source>
+        <translation>%1 kB</translation>
     </message>
     <message>
         <source>%1 MB</source>
@@ -2265,7 +3087,12 @@ Om te mixen moeten andere gebruikers exact dezelfde denominaties inbrengen.</tra
         <source>Save QR Code</source>
         <translation>Sla QR-code op</translation>
     </message>
-    </context>
+    <message>
+        <source>PNG Image</source>
+        <extracomment>Expanded name of the PNG file format. See: https://en.wikipedia.org/wiki/Portable_Network_Graphics.</extracomment>
+        <translation>PNG Afbeelding</translation>
+    </message>
+</context>
 <context>
     <name>RPCConsole</name>
     <message>
@@ -2372,6 +3199,14 @@ Om te mixen moeten andere gebruikers exact dezelfde denominaties inbrengen.</tra
         <source>Version</source>
         <translation>Versie</translation>
     </message>
+    <message>
+        <source>High bandwidth BIP152 compact block relay: %1</source>
+        <translation>Hoge Bandbreedte BIP152 compact block relay: %1</translation>
+    </message>
+    <message>
+        <source>High Bandwidth</source>
+        <translation>Hoge Bandbreedte</translation>
+    </message>
     <message>
         <source>Starting Block</source>
         <translation>Start Blok</translation>
@@ -2384,6 +3219,51 @@ Om te mixen moeten andere gebruikers exact dezelfde denominaties inbrengen.</tra
         <source>Synced Blocks</source>
         <translation>Gesynchroniseerde blocks </translation>
     </message>
+    <message>
+        <source>Elapsed time since a novel block passing initial validity checks was received from this peer.</source>
+        <translation>Verstreken tijd sinds een nieuw block dat de initiële geldigheidscontroles doorstond, werd ontvangen van deze peer.</translation>
+    </message>
+    <message>
+        <source>Last Block</source>
+        <translation>Laatste Block</translation>
+    </message>
+    <message>
+        <source>Elapsed time since a novel transaction accepted into our mempool was received from this peer.</source>
+        <extracomment>Tooltip text for the Last Transaction field in the peer details area.</extracomment>
+        <translation>Verstreken tijd sinds een nieuwe transactie die werd geaccepteerd in onze mempool, werd ontvangen van deze peer.</translation>
+    </message>
+    <message>
+        <source>Last Transaction</source>
+        <translation>Laatste Transactie</translation>
+    </message>
+    <message>
+        <source>The mapped Autonomous System used for diversifying peer selection.</source>
+        <translation>Het gemapte Autonomous System dat wordt gebruikt voor het diversifiëren van peerselectie.</translation>
+    </message>
+    <message>
+        <source>Mapped AS</source>
+        <translation>Gemapte AS</translation>
+    </message>
+    <message>
+        <source>Whether we relay addresses to this peer.</source>
+        <extracomment>Tooltip text for the Address Relay field in the peer details area, which displays whether we relay addresses to this peer (Yes/No).</extracomment>
+        <translation>Of we adressen doorsturen naar deze peer.</translation>
+    </message>
+    <message>
+        <source>Address Relay</source>
+        <extracomment>Text title for the Address Relay field in the peer details area, which displays whether we relay addresses to this peer (Yes/No).</extracomment>
+        <translation>Adres Relay</translation>
+    </message>
+    <message>
+        <source>Addresses Processed</source>
+        <extracomment>Text title for the Addresses Processed field in the peer details area, which displays the total number of addresses received from this peer that were processed (excludes addresses that were dropped due to rate-limiting).</extracomment>
+        <translation>Verwerkte Adressen</translation>
+    </message>
+    <message>
+        <source>Addresses Rate-Limited</source>
+        <extracomment>Text title for the Addresses Rate-Limited field in the peer details area, which displays the total number of addresses received from this peer that were dropped (not processed) due to rate-limiting.</extracomment>
+        <translation>Rate-Limited Adressen </translation>
+    </message>
     <message>
         <source>Rescan blockchain files 1</source>
         <translation>Herscan blokketenbestanden 1</translation>
@@ -2424,6 +3304,22 @@ Om te mixen moeten andere gebruikers exact dezelfde denominaties inbrengen.</tra
         <source>To specify a non-default location of the blocks directory use the '%1' option.</source>
         <translation>Om een niet-standaardlocatie van de blocks map op te geven, gebruik de optie '%1'. </translation>
     </message>
+    <message>
+        <source>Local Addresses</source>
+        <translation>Lokale adressen</translation>
+    </message>
+    <message>
+        <source>Network addresses that your Dash node is currently using to communicate with other nodes.</source>
+        <translation>Netwerkadressen die uw Dash-node momenteel gebruikt om met andere nodes te communiceren.</translation>
+    </message>
+    <message>
+        <source>Number of regular Masternodes</source>
+        <translation>Aantal reguliere Masternodes</translation>
+    </message>
+    <message>
+        <source>Number of EvoNodes</source>
+        <translation>Aantal EvoNodes</translation>
+    </message>
     <message>
         <source>Current block height</source>
         <translation>Huidige block hoogte</translation>
@@ -2472,10 +3368,50 @@ Om te mixen moeten andere gebruikers exact dezelfde denominaties inbrengen.</tra
         <source>PoSe Score</source>
         <translation>PoSe Score</translation>
     </message>
+    <message>
+        <source>The transport layer version: %1</source>
+        <translation>De versie van de transportlaag: %1</translation>
+    </message>
+    <message>
+        <source>Transport</source>
+        <translation>Transport</translation>
+    </message>
+    <message>
+        <source>The BIP324 session ID string in hex.</source>
+        <translation>De BIP324 sessie ID in hex.</translation>
+    </message>
+    <message>
+        <source>Session ID</source>
+        <translation>Sessie ID</translation>
+    </message>
+    <message>
+        <source>The network protocol this peer is connected through: IPv4, IPv6, Onion, I2P, or CJDNS.</source>
+        <translation>Het netwerkprotocol waarmee deze peer verbonden is: IPv4, IPv6, Onion, I2P of CJDNS.</translation>
+    </message>
+    <message>
+        <source>Permissions</source>
+        <translation>Machtigingen</translation>
+    </message>
+    <message>
+        <source>The direction and type of peer connection: %1</source>
+        <translation>De richting en het type verbinding van peer: %1</translation>
+    </message>
+    <message>
+        <source>Direction/Type</source>
+        <translation>Richting/Type</translation>
+    </message>
     <message>
         <source>Services</source>
         <translation>Services</translation>
     </message>
+    <message>
+        <source>Whether we relay transactions to this peer.</source>
+        <translation>Of we transacties doorgeven aan deze peer.</translation>
+    </message>
+    <message>
+        <source>Transaction Relay</source>
+        <translation>Transactiedoorgifte</translation>
+    </message>
     <message>
         <source>Connection Time</source>
         <translation>Verbindingstijd</translation>
@@ -2512,6 +3448,16 @@ Om te mixen moeten andere gebruikers exact dezelfde denominaties inbrengen.</tra
         <source>&amp;Wallet Repair</source>
         <translation>&amp;Portemonnee Herstel</translation>
     </message>
+    <message>
+        <source>The total number of addresses received from this peer that were processed (excludes addresses that were dropped due to rate-limiting).</source>
+        <extracomment>Tooltip text for the Addresses Processed field in the peer details area, which displays the total number of addresses received from this peer that were processed (excludes addresses that were dropped due to rate-limiting).</extracomment>
+        <translation>Het totale aantal verwerkte adressen ontvangen van deze peer (exclusief verworpen adressen vanwege snelheidsbeperkingen).</translation>
+    </message>
+    <message>
+        <source>The total number of addresses received from this peer that were dropped (not processed) due to rate-limiting.</source>
+        <extracomment>Tooltip text for the Addresses Rate-Limited field in the peer details area, which displays the total number of addresses received from this peer that were dropped (not processed) due to rate-limiting.</extracomment>
+        <translation>Het totale aantal ontvangen adressen van deze peer die zijn verworpen (niet verwerkt) vanwege snelheidsbeperkingen.</translation>
+    </message>
     <message>
         <source>Wallet repair options.</source>
         <translation>Portemonneeherstelopties</translation>
@@ -2525,52 +3471,82 @@ Om te mixen moeten andere gebruikers exact dezelfde denominaties inbrengen.</tra
         <translation>-herbouw index: Herbouw de blokketen index vanuit de huidige blk000???.dat bestanden.</translation>
     </message>
     <message>
-        <source>&amp;Disconnect</source>
-        <translation>&amp;Verbreek verbinding</translation>
+        <source>Inbound: initiated by peer</source>
+        <extracomment>Explanatory text for an inbound peer connection.</extracomment>
+        <translation>Inkomend: geïnitieerd door peer</translation>
     </message>
     <message>
-        <source>Ban for</source>
-        <translation>Ban Node voor</translation>
+        <source>Outbound Full Relay: default</source>
+        <extracomment>Explanatory text for an outbound peer connection that relays all network information. This is the default behavior for outbound connections.</extracomment>
+        <translation>Uitgaande Volledige Relay: standaard</translation>
     </message>
     <message>
-        <source>1 &amp;hour</source>
-        <translation>1 &amp;uur</translation>
+        <source>Outbound Block Relay: does not relay transactions or addresses</source>
+        <extracomment>Explanatory text for an outbound peer connection that relays network information about blocks and not transactions or addresses.</extracomment>
+        <translation>Uitgaande Block Relay: stuurt geen transacties of adressen door</translation>
     </message>
     <message>
-        <source>1 &amp;day</source>
-        <translation>1 &amp;dag</translation>
+        <source>Outbound Manual: added using RPC %1 or %2/%3 configuration options</source>
+        <extracomment>Explanatory text for an outbound peer connection that was established manually through one of several methods. The numbered arguments are stand-ins for the methods available to establish manual connections.</extracomment>
+        <translation>Uitgaand Handmatig: toegevoegd met RPC %1 of %2/%3 configuratieopties</translation>
     </message>
     <message>
-        <source>1 &amp;week</source>
-        <translation>1 &amp;week</translation>
+        <source>Outbound Feeler: short-lived, for testing addresses</source>
+        <extracomment>Explanatory text for a short-lived outbound peer connection that is used to test the aliveness of known addresses.</extracomment>
+        <translation>Uitgaande Feeler: kortdurend, voor het testen van adressen</translation>
     </message>
     <message>
-        <source>1 &amp;year</source>
-        <translation>1 &amp;jaar</translation>
+        <source>Outbound Address Fetch: short-lived, for soliciting addresses</source>
+        <extracomment>Explanatory text for a short-lived outbound peer connection that is used to request addresses from a peer.</extracomment>
+        <translation>Uitgaand Adres Ophalen: kortdurend, voor het opvragen van adressen</translation>
     </message>
     <message>
-        <source>&amp;Unban</source>
-        <translation>&amp;Maak ban voor Node ongedaan</translation>
+        <source>To</source>
+        <translation>Naar</translation>
+    </message>
+    <message>
+        <source>we selected the peer for high bandwidth relay</source>
+        <translation>Wij selecteerden de peer vanwege hoge bandbreedte van de relay.</translation>
     </message>
     <message>
-        <source>Welcome to the %1 RPC console.</source>
-        <translation>Welkom bij de %1 RPC-console.</translation>
+        <source>From</source>
+        <translation>Van</translation>
     </message>
     <message>
-        <source>Use up and down arrows to navigate history, and %1 to clear screen.</source>
-        <translation>Gebruik de pijl toetsen om door de geschiedenis te navigeren, en %1 om het scherm te wissen.</translation>
+        <source>the peer selected us for high bandwidth relay</source>
+        <translation>De peer geselecteerde ons vanwege hoge bandbreedte van de relay</translation>
     </message>
     <message>
-        <source>Type %1 for an overview of available commands.</source>
-        <translation>Typ %1 voor een overzicht van beschikbare opdrachten.</translation>
+        <source>No</source>
+        <translation>Nee</translation>
+    </message>
+    <message>
+        <source>no high bandwidth relay selected</source>
+        <translation>Geen hoge bandbreedte relay geselecteerd.</translation>
+    </message>
+    <message>
+        <source>&amp;Disconnect</source>
+        <translation>&amp;Verbreek verbinding</translation>
     </message>
     <message>
-        <source>For more information on using this console type %1.</source>
-        <translation>Typ %1 voor meer informatie over het gebruik van deze console.</translation>
+        <source>Ban for</source>
+        <translation>Ban Node voor</translation>
+    </message>
+    <message>
+        <source>1 &amp;hour</source>
+        <translation>1 &amp;uur</translation>
+    </message>
+    <message>
+        <source>1 &amp;week</source>
+        <translation>1 &amp;week</translation>
+    </message>
+    <message>
+        <source>1 &amp;year</source>
+        <translation>1 &amp;jaar</translation>
     </message>
     <message>
-        <source>WARNING: Scammers have been active, telling users to type commands here, stealing their wallet contents. Do not use this console without fully understanding the ramifications of a command.</source>
-        <translation>PAS OP: Oplichters zijn actief, die proberen om gebruikers hier opdrachten te typen, waardoor de inhoud van de portemonnee gestolen kan worden. Gebruik deze console niet zonder de consequenties van een opdracht volledig te begrijpen.</translation>
+        <source>&amp;Unban</source>
+        <translation>&amp;Maak ban voor Node ongedaan</translation>
     </message>
     <message>
         <source>In:</source>
@@ -2584,6 +3560,10 @@ Om te mixen moeten andere gebruikers exact dezelfde denominaties inbrengen.</tra
         <source>Network activity disabled</source>
         <translation>Netwerkactiviteit is uitgeschakeld</translation>
     </message>
+    <message>
+        <source>None</source>
+        <translation>Geen</translation>
+    </message>
     <message>
         <source>Total: %1 (Enabled: %2)</source>
         <translation>Totaal: %1 (Ingeschakeld: %2)</translation>
@@ -2592,10 +3572,105 @@ Om te mixen moeten andere gebruikers exact dezelfde denominaties inbrengen.</tra
         <source>Executing command without any wallet</source>
         <translation>Opdracht uitvoeren zonder portemonnee</translation>
     </message>
+    <message>
+        <source>Ctrl++</source>
+        <extracomment>Main shortcut to increase the RPC console font size.</extracomment>
+        <translation>Ctrl++</translation>
+    </message>
+    <message>
+        <source>Ctrl+=</source>
+        <extracomment>Secondary shortcut to increase the RPC console font size.</extracomment>
+        <translation>Ctrl+=</translation>
+    </message>
+    <message>
+        <source>Ctrl+-</source>
+        <extracomment>Main shortcut to decrease the RPC console font size.</extracomment>
+        <translation>Ctrl+-</translation>
+    </message>
+    <message>
+        <source>Ctrl+_</source>
+        <extracomment>Secondary shortcut to decrease the RPC console font size.</extracomment>
+        <translation>Ctrl+_</translation>
+    </message>
+    <message>
+        <source>Ctrl+Shift+I</source>
+        <translation>Ctrl+Shift+I</translation>
+    </message>
+    <message>
+        <source>Ctrl+Shift+C</source>
+        <translation>Ctrl+Shift+C</translation>
+    </message>
+    <message>
+        <source>Ctrl+Shift+G</source>
+        <translation>Ctrl+Shift+G</translation>
+    </message>
+    <message>
+        <source>Ctrl+Shift+P</source>
+        <translation>Ctrl+Shift+P</translation>
+    </message>
+    <message>
+        <source>Ctrl+Shift+R</source>
+        <translation>Ctrl+Shift+R</translation>
+    </message>
     <message>
         <source>Executing command using "%1" wallet</source>
         <translation>Opdracht uitvoeren met portemonnee "%1" </translation>
     </message>
+    <message>
+        <source>detecting: peer could be v1 or v2</source>
+        <extracomment>Explanatory text for "detecting" transport type.</extracomment>
+        <translation>Detecteren: peer zou v1 of v2 kunnen zijn</translation>
+    </message>
+    <message>
+        <source>v1: unencrypted, plaintext transport protocol</source>
+        <extracomment>Explanatory text for v1 transport type.</extracomment>
+        <translation>v1: onversleuteld, platte tekst transportprotocol</translation>
+    </message>
+    <message>
+        <source>v2: BIP324 encrypted transport protocol</source>
+        <extracomment>Explanatory text for v2 transport type.</extracomment>
+        <translation>v2: BIP324 versleuteld transportprotocol</translation>
+    </message>
+    <message>
+        <source>&amp;Copy address</source>
+        <extracomment>Context menu action to copy the address of a peer</extracomment>
+        <translation>&amp;Kopieer adres</translation>
+    </message>
+    <message>
+        <source>1 d&amp;ay</source>
+        <translation>1 d&amp;ag</translation>
+    </message>
+    <message>
+        <source>&amp;Copy IP/Netmask</source>
+        <extracomment>Context menu action to copy the IP/Netmask of a banned peer. IP/Netmask is the combination of a peer's IP address and its Netmask. For IP address see: https://en.wikipedia.org/wiki/IP_address</extracomment>
+        <translation>&amp;Kopieer IP/Netmask</translation>
+    </message>
+    <message>
+        <source>Welcome to the %1 RPC console.
+Use up and down arrows to navigate history, and %2 to clear screen.
+Use %3 and %4 to increase or decrease the font size.
+Type %5 for an overview of available commands.
+For more information on using this console, type %6.
+
+%7WARNING: Scammers have been active, telling users to type commands here, stealing their wallet contents. Do not use this console without fully understanding the ramifications of a command.%8</source>
+        <extracomment>RPC console welcome message. Placeholders %7 and %8 are style tags for the warning content, and they are not space separated from the rest of the text intentionally.</extracomment>
+        <translation>Welkom bij de %1 RPC console.
+Gebruik de omhoog en omlaag pijltjestoetsen om door de geschiedenis te navigeren, en %2 om het scherm te wissen.
+Gebruik %3 en %4 om de lettergrootte te vergroten of te verkleinen.
+%5 voor een overzicht van de beschikbare commando's.
+Voor meer informatie over het gebruik van deze console, typ %6.
+
+%7WAARSCHUWING: Oplichters zijn actief en vertellen gebruikers om hier commando's in te voeren, waardoor ze de inhoud van de portemonnee stelen. Gebruik deze console niet zonder volledig te begrijpen wat de gevolgen zijn van een commando.%8</translation>
+    </message>
+    <message>
+        <source>Executing…</source>
+        <extracomment>A console message indicating an entered command is currently being executed.</extracomment>
+        <translation>Uitvoeren…</translation>
+    </message>
+    <message>
+        <source>(peer: %1)</source>
+        <translation>(peer: %1)</translation>
+    </message>
     <message>
         <source>via %1</source>
         <translation>via %1</translation>
@@ -2612,11 +3687,19 @@ Om te mixen moeten andere gebruikers exact dezelfde denominaties inbrengen.</tra
         <source>Verified Masternode</source>
         <translation>geverifieerde Masternode</translation>
     </message>
+    <message>
+        <source>Yes</source>
+        <translation>Ja</translation>
+    </message>
     <message>
         <source>Unknown</source>
         <translation>onbekend</translation>
     </message>
-    </context>
+    <message>
+        <source>Never</source>
+        <translation>Nooit</translation>
+    </message>
+</context>
 <context>
     <name>ReceiveCoinsDialog</name>
     <message>
@@ -2636,6 +3719,10 @@ Om te mixen moeten andere gebruikers exact dezelfde denominaties inbrengen.</tra
         <translation>Een optioneel bericht om aan het betalingsverzoek toe te voegen, die zal worden getoond wanneer het verzoek wordt geopend. &lt;br&gt;
 Nota: Het bericht zal niet verzonden worden met de betaling over het Dash netwerk.</translation>
     </message>
+    <message>
+        <source>An optional label to associate with the new receiving address (used by you to identify an invoice).  It is also attached to the payment request.</source>
+        <translation>Een optioneel label om toe te voegen aan het nieuwe ontvangstadres (bv. voor een factuur). Het wordt ook toegevoegd aan het betalingsverzoek.</translation>
+    </message>
     <message>
         <source>Use this form to request payments. All fields are &lt;b&gt;optional&lt;/b&gt;.</source>
         <translation>Gebruik dit formulier om te verzoeken tot betaling. Alle velden zijn &lt;b&gt;optioneel&lt;/b&gt;.</translation>
@@ -2693,28 +3780,60 @@ Nota: Het bericht zal niet verzonden worden met de betaling over het Dash netwer
         <translation>Voeg een bericht toe om bij het betalingsverzoek te voegen</translation>
     </message>
     <message>
-        <source>Copy URI</source>
-        <translation>Kopieer URI</translation>
+        <source>Copy &amp;URI</source>
+        <translation>Kopieer &amp;URI</translation>
     </message>
     <message>
-        <source>Copy address</source>
-        <translation>Kopiëer adres</translation>
+        <source>&amp;Copy address</source>
+        <translation>&amp;Kopieer adres</translation>
     </message>
     <message>
-        <source>Copy label</source>
-        <translation>Kopieer label</translation>
+        <source>Copy &amp;label</source>
+        <translation>Kopieer &amp;label</translation>
     </message>
     <message>
-        <source>Copy message</source>
-        <translation>Kopieer bericht</translation>
+        <source>Copy &amp;message</source>
+        <translation>Kopieer &amp;bericht</translation>
     </message>
     <message>
-        <source>Copy amount</source>
-        <translation>Kopieer bedrag</translation>
+        <source>Copy &amp;amount</source>
+        <translation>Kopieer &amp;bedrag</translation>
+    </message>
+    <message>
+        <source>Could not unlock wallet.</source>
+        <translation>Kon de portemonnee niet ontgrendelen.</translation>
     </message>
-    </context>
+    <message>
+        <source>Could not generate new address</source>
+        <translation>Kon geen nieuw adres genereren.</translation>
+    </message>
+</context>
 <context>
     <name>ReceiveRequestDialog</name>
+    <message>
+        <source>Request payment to …</source>
+        <translation>Vraag betaling aan voor …</translation>
+    </message>
+    <message>
+        <source>Address:</source>
+        <translation>Adres:</translation>
+    </message>
+    <message>
+        <source>Amount:</source>
+        <translation>Bedrag:</translation>
+    </message>
+    <message>
+        <source>Label:</source>
+        <translation>Label:</translation>
+    </message>
+    <message>
+        <source>Message:</source>
+        <translation>Bericht:</translation>
+    </message>
+    <message>
+        <source>Wallet:</source>
+        <translation>Portemonnee:</translation>
+    </message>
     <message>
         <source>Copy &amp;URI</source>
         <translation>Kopieer &amp;URI</translation>
@@ -2767,6 +3886,34 @@ Nota: Het bericht zal niet verzonden worden met de betaling over het Dash netwer
         <translation>Verzoek ingediend</translation>
     </message>
 </context>
+<context>
+    <name>RestoreWalletActivity</name>
+    <message>
+        <source>Restore Wallet</source>
+        <extracomment>Title of progress window which is displayed when wallets are being restored.</extracomment>
+        <translation>Portemonnee herstellen</translation>
+    </message>
+    <message>
+        <source>Restoring Wallet &lt;b&gt;%1&lt;/b&gt;…</source>
+        <extracomment>Descriptive text of the restore wallets progress window which indicates to the user that wallets are currently being restored.</extracomment>
+        <translation>Portemonnee &lt;b&gt;%1&lt;/b&gt; herstellen…</translation>
+    </message>
+    <message>
+        <source>Restore wallet failed</source>
+        <extracomment>Title of message box which is displayed when the wallet could not be restored.</extracomment>
+        <translation>Portemonnee herstellen mislukt</translation>
+    </message>
+    <message>
+        <source>Restore wallet warning</source>
+        <extracomment>Title of message box which is displayed when the wallet is restored with some warning.</extracomment>
+        <translation>Waarschuwing bij herstellen portemonnee</translation>
+    </message>
+    <message>
+        <source>Restore wallet message</source>
+        <extracomment>Title of message box which is displayed when the wallet is successfully restored.</extracomment>
+        <translation>Bericht bij herstellen portemonnee</translation>
+    </message>
+</context>
 <context>
     <name>SendCoinsDialog</name>
     <message>
@@ -2801,10 +3948,6 @@ Nota: Het bericht zal niet verzonden worden met de betaling over het Dash netwer
         <source>Fee:</source>
         <translation>Vergoeding:</translation>
     </message>
-    <message>
-        <source>Dust:</source>
-        <translation>Stof:</translation>
-    </message>
     <message>
         <source>Inputs…</source>
         <translation>Inputs…</translation>
@@ -2829,6 +3972,14 @@ Nota: Het bericht zal niet verzonden worden met de betaling over het Dash netwer
         <source>Transaction Fee:</source>
         <translation>Transactiekosten</translation>
     </message>
+    <message>
+        <source>When there is less transaction volume than space in the blocks, miners as well as relaying nodes may enforce a minimum fee. Paying only this minimum fee is just fine, but be aware that this can result in a never confirming transaction once there is more demand for dash transactions than the network can process.</source>
+        <translation>Wanneer er minder transactievolume is dan ruimte in de blocks, kunnen miners en relay nodes een minimumvergoeding afdwingen. Alleen deze minimumvergoeding betalen is prima, maar wees ervan bewust dat dit kan leiden tot een transactie die nooit wordt bevestigd zodra er meer vraag is naar transacties dan het netwerk kan verwerken.</translation>
+    </message>
+    <message>
+        <source>A too low fee might result in a never confirming transaction (read the tooltip)</source>
+        <translation>Een te lage vergoeding kan leiden tot een transactie die nooit wordt bevestigd (lees de tooltip)</translation>
+    </message>
     <message>
         <source>(Smart fee not initialized yet. This usually takes a few blocks…)</source>
         <translation>(Slimme kosten zijn nog niet geïnitialiseerd Dit duurt meestal een paar blocks …)</translation>
@@ -2921,10 +4072,6 @@ Nota: Het bericht zal niet verzonden worden met de betaling over het Dash netwer
         <source>Copy bytes</source>
         <translation>Kopieer bytes</translation>
     </message>
-    <message>
-        <source>Copy dust</source>
-        <translation>Kopieer stof</translation>
-    </message>
     <message>
         <source>Copy change</source>
         <translation>Kopieer wijziging</translation>
@@ -2941,10 +4088,6 @@ Nota: Het bericht zal niet verzonden worden met de betaling over het Dash netwer
         <source>%1 to %2</source>
         <translation>%1 tot %2</translation>
     </message>
-    <message>
-        <source>Are you sure you want to send?</source>
-        <translation>Weet u zeker dat u wilt verzenden?</translation>
-    </message>
     <message>
         <source>&lt;b&gt;(%1 of %2 entries displayed)&lt;/b&gt;</source>
         <translation>&lt;b&gt;(%1 van de %2 items weergegeven)&lt;/b&gt;</translation>
@@ -2957,6 +4100,18 @@ Nota: Het bericht zal niet verzonden worden met de betaling over het Dash netwer
         <source>Confirm the %1 send action</source>
         <translation>Bevestig de %1 verstuuractie</translation>
     </message>
+    <message>
+        <source>Cr&amp;eate Unsigned</source>
+        <translation>Maak &amp;ongetekend aan</translation>
+    </message>
+    <message>
+        <source> from wallet '%1'</source>
+        <translation>van portemonnee '%1'</translation>
+    </message>
+    <message>
+        <source>%1 to '%2'</source>
+        <translation>%1 naar '%2'</translation>
+    </message>
     <message>
         <source>%1 funds only</source>
         <translation>alleen %1 saldo</translation>
@@ -3005,6 +4160,51 @@ Nota: Het bericht zal niet verzonden worden met de betaling over het Dash netwer
         <source>Confirm send coins</source>
         <translation>Bevestig versturen munten</translation>
     </message>
+    <message>
+        <source>Save Transaction Data</source>
+        <translation>Sla transactiegegevens op</translation>
+    </message>
+    <message>
+        <source>PSBT saved</source>
+        <translation>PSBT opgeslagen</translation>
+    </message>
+    <message>
+        <source>Watch-only balance:</source>
+        <translation>Watch-only saldo:</translation>
+    </message>
+    <message>
+        <source>Creates a Partially Signed Blockchain Transaction (PSBT) for use with e.g. an offline %1 wallet, or a PSBT-compatible hardware wallet.</source>
+        <translation>Maakt een Partially Signed Blockchain Transaction (PSBT) aan voor gebruik met bijvoorbeeld een offline %1 portemonnee of een PSBT compatibele hardware portemonnee .</translation>
+    </message>
+    <message>
+        <source>Do you want to create this transaction?</source>
+        <extracomment>Message displayed when attempting to create a transaction. Cautionary text to prompt the user to verify that the displayed transaction details represent the transaction the user intends to create.</extracomment>
+        <translation>Wilt u deze transactie aanmaken?</translation>
+    </message>
+    <message>
+        <source>Please, review your transaction proposal. This will produce a Partially Signed Blockchain Transaction (PSBT) which you can save or copy and then sign with e.g. an offline %1 wallet, or a PSBT-compatible hardware wallet.</source>
+        <extracomment>Text to inform a user attempting to create a transaction of their current options. At this stage, a user can only create a PSBT. This string is displayed when private keys are disabled and an external signer is not available.</extracomment>
+        <translation>Controleer uw transactievoorstel. Dit zal een Partially Signed Blockchain Transaction (PSBT) produceren die u kunt opslaan of kopiëren en vervolgens ondertekenen met bijvoorbeeld een offline %1-portemonnee of een PSBT-compatibele hardware-portemonnee.</translation>
+    </message>
+    <message>
+        <source>Please, review your transaction. You can create and send this transaction or create a Partially Signed Blockchain Transaction (PSBT), which you can save or copy and then sign with, e.g., an offline %1 wallet, or a PSBT-compatible hardware wallet.</source>
+        <extracomment>Text to inform a user attempting to create a transaction of their current options. At this stage, a user can send their transaction or create a PSBT. This string is displayed when both private keys and PSBT controls are enabled.</extracomment>
+        <translation>Controleer uw transactie. U kunt deze transactie aanmaken en verzenden of een Partially Signed Blockchain Transaction (PSBT) aanmaken, die u kunt opslaan of kopiëren en vervolgens ondertekenen met bijvoorbeeld een offline %1-portemonnee of een PSBT-compatibele hardware-portemonnee.</translation>
+    </message>
+    <message>
+        <source>Please, review your transaction.</source>
+        <extracomment>Text to prompt a user to review the details of the transaction they are attempting to send.</extracomment>
+        <translation>Controleer uw transactie.</translation>
+    </message>
+    <message>
+        <source>To review recipient list click "Show Details…"</source>
+        <translation>Klik op "Toon Details..." om de ontvangerslijst te bekijken</translation>
+    </message>
+    <message>
+        <source>Partially Signed Transaction (Binary)</source>
+        <extracomment>Expanded name of the binary PSBT file format. See: BIP 174.</extracomment>
+        <translation>Deels ondertekende transactie (Binair)</translation>
+    </message>
     <message>
         <source>The recipient address is not valid. Please recheck.</source>
         <translation>Het adres van de ontvanger is niet geldig. Gelieve opnieuw te controleren.</translation>
@@ -3124,21 +4324,16 @@ Nota: Het bericht zal niet verzonden worden met de betaling over het Dash netwer
         <source>A message that was attached to the dash: URI which will be stored with the transaction for your reference. Note: This message will not be sent over the Dash network.</source>
         <translation>Een boodschap die was bijgevoegd aan de dash: URI die met de transactie voor uw referentie wordt opgeslagen. Opmerking: Dit bericht zal niet over het Dash netwerk worden verzonden.</translation>
     </message>
+</context>
+<context>
+    <name>SendConfirmationDialog</name>
     <message>
-        <source>This is an unauthenticated payment request.</source>
-        <translation>Dit is een niet-geverifieerd betalingsverzoek.</translation>
-    </message>
-    <message>
-        <source>This is an authenticated payment request.</source>
-        <translation>Dit is een geverifieerd betalingsverzoek.</translation>
-    </message>
-    <message>
-        <source>Pay To:</source>
-        <translation>Betaal Aan:</translation>
+        <source>Send</source>
+        <translation>Verzenden</translation>
     </message>
     <message>
-        <source>Memo:</source>
-        <translation>Memo:</translation>
+        <source>Create Unsigned</source>
+        <translation>Ongetekende aanmaken</translation>
     </message>
 </context>
 <context>
@@ -3278,6 +4473,10 @@ Nota: Het bericht zal niet verzonden worden met de betaling over het Dash netwer
         <source>Wallet unlock was cancelled.</source>
         <translation>Portemonnee-ontsleuteling is geannuleerd.</translation>
     </message>
+    <message>
+        <source>No error</source>
+        <translation>Geen fout</translation>
+    </message>
     <message>
         <source>Private key for the entered address is not available.</source>
         <translation>Geheime sleutel voor het ingevoerde adres is niet beschikbaar.</translation>
@@ -3303,19 +4502,30 @@ Nota: Het bericht zal niet verzonden worden met de betaling over het Dash netwer
         <translation>De handtekening hoort niet bij het bericht.</translation>
     </message>
     <message>
-        <source>Message verification failed.</source>
-        <translation>Berichtverificatie mislukt.</translation>
+        <source>Message verification failed.</source>
+        <translation>Berichtverificatie mislukt.</translation>
+    </message>
+    <message>
+        <source>Message verified.</source>
+        <translation>Bericht geverifiëerd.</translation>
+    </message>
+</context>
+<context>
+    <name>SplashScreen</name>
+    <message>
+        <source>(press q to shutdown and continue later)</source>
+        <translation>(druk op q om af te sluiten en later verder te gaan)</translation>
     </message>
     <message>
-        <source>Message verified.</source>
-        <translation>Bericht geverifiëerd.</translation>
+        <source>press q to shutdown</source>
+        <translation>druk op q om af te sluiten</translation>
     </message>
 </context>
 <context>
     <name>TrafficGraphWidget</name>
     <message>
-        <source>KB/s</source>
-        <translation>KB/s</translation>
+        <source>kB/s</source>
+        <translation>kB/s</translation>
     </message>
     <message>
         <source>Total</source>
@@ -3332,20 +4542,9 @@ Nota: Het bericht zal niet verzonden worden met de betaling over het Dash netwer
 </context>
 <context>
     <name>TransactionDesc</name>
-    <message numerus="yes">
-        <source>Open for %n more block(s)</source>
-        <translation><numerusform>Open voor nog %n blok</numerusform><numerusform>Open voor nog %n blocks</numerusform></translation>
-    </message>
-    <message>
-        <source>Open until %1</source>
-        <translation>Open tot %1</translation>
-    </message>
-    <message>
-        <source>conflicted</source>
-        <translation>Conflicterend</translation>
-    </message>
     <message>
         <source>0/unconfirmed, %1</source>
+        <extracomment>Text explaining the current status of a transaction, shown in the status field of the details window for this transaction. This status represents an unconfirmed transaction that is in the memory pool.</extracomment>
         <translation>0/onbevestigd, %1</translation>
     </message>
     <message>
@@ -3358,22 +4557,32 @@ Nota: Het bericht zal niet verzonden worden met de betaling over het Dash netwer
     </message>
     <message>
         <source>abandoned</source>
+        <extracomment>Text explaining the current status of a transaction, shown in the status field of the details window for this transaction. This status represents an abandoned transaction.</extracomment>
         <translation>Opgegeven</translation>
     </message>
+    <message>
+        <source>conflicted with a transaction with %1 confirmations</source>
+        <extracomment>Text explaining the current status of a transaction, shown in the status field of the details window for this transaction. This status represents an unconfirmed transaction that conflicts with a confirmed transaction.</extracomment>
+        <translation>conflicteert met een transactie met %1 bevestigingen</translation>
+    </message>
     <message>
         <source>%1/unconfirmed</source>
+        <extracomment>Text explaining the current status of a transaction, shown in the status field of the details window for this transaction. This status represents a transaction confirmed in at least one block, but less than 6 blocks, and still not locked via ChainLocks.</extracomment>
         <translation>%1/onbevestigd</translation>
     </message>
     <message>
         <source>%1 confirmations</source>
+        <extracomment>Text explaining the current status of a transaction, shown in the status field of the details window for this transaction. This status represents a transaction confirmed in 6 or more blocks or locked via ChainLocks.</extracomment>
         <translation>%1 bevestigingen</translation>
     </message>
     <message>
         <source>locked via ChainLocks</source>
+        <extracomment>Text explaining the current status of a transaction, shown in the status field of the details window for this transaction. This status represents a transaction confirmed in at least one block and has been locked by ChainLocks.</extracomment>
         <translation>op slot via ChainLocks</translation>
     </message>
     <message>
         <source>verified via InstantSend</source>
+        <extracomment>Text explaining the current status of a transaction, shown in the status field of the details window for this transaction. This status represents an unconfirmed transaction that has been locked by InstantSend.</extracomment>
         <translation>geverifieerd via InstantSend</translation>
     </message>
     <message>
@@ -3392,6 +4601,10 @@ Nota: Het bericht zal niet verzonden worden met de betaling over het Dash netwer
         <source>Generated</source>
         <translation>Gegenereerd</translation>
     </message>
+    <message>
+        <source>Platform Transfer</source>
+        <translation>Platform overdracht</translation>
+    </message>
     <message>
         <source>From</source>
         <translation>Van</translation>
@@ -3522,14 +4735,6 @@ Nota: Het bericht zal niet verzonden worden met de betaling over het Dash netwer
         <source>Address / Label</source>
         <translation>Adres / Label</translation>
     </message>
-    <message numerus="yes">
-        <source>Open for %n more block(s)</source>
-        <translation><numerusform>Open voor nog %n blok</numerusform><numerusform>Open voor nog %n blocks</numerusform></translation>
-    </message>
-    <message>
-        <source>Open until %1</source>
-        <translation>Open tot %1</translation>
-    </message>
     <message>
         <source>Unconfirmed</source>
         <translation>Onbevestigd</translation>
@@ -3590,6 +4795,10 @@ Nota: Het bericht zal niet verzonden worden met de betaling over het Dash netwer
         <source>Mined</source>
         <translation>Gedolven</translation>
     </message>
+    <message>
+        <source>Platform Transfer</source>
+        <translation>Platform overdracht</translation>
+    </message>
     <message>
         <source>%1 Mixing</source>
         <translation>%1 Mixen</translation>
@@ -3717,6 +4926,10 @@ Nota: Het bericht zal niet verzonden worden met de betaling over het Dash netwer
         <source>Mined</source>
         <translation>Gedolven</translation>
     </message>
+    <message>
+        <source>Platform Transfer</source>
+        <translation>Platform overdracht</translation>
+    </message>
     <message>
         <source>Other</source>
         <translation>Anders</translation>
@@ -3730,49 +4943,63 @@ Nota: Het bericht zal niet verzonden worden met de betaling over het Dash netwer
         <translation>Min. bedrag</translation>
     </message>
     <message>
-        <source>Abandon transaction</source>
-        <translation>Doe afstand van transactie</translation>
+        <source>&amp;Copy address</source>
+        <translation>&amp;Kopieer adres</translation>
     </message>
     <message>
-        <source>Copy address</source>
-        <translation>Kopieer adres</translation>
+        <source>Copy &amp;label</source>
+        <translation>Kopieer &amp;label</translation>
     </message>
     <message>
-        <source>Copy label</source>
-        <translation>Kopieer label</translation>
+        <source>Copy &amp;amount</source>
+        <translation>Kopieer &amp;bedrag</translation>
     </message>
     <message>
-        <source>Copy amount</source>
-        <translation>Kopieer bedrag</translation>
+        <source>Copy transaction &amp;ID</source>
+        <translation>Kopieer transactie &amp;ID</translation>
+    </message>
+    <message>
+        <source>Copy &amp;raw transaction</source>
+        <translation>Kopieer &amp;ruwe transactie</translation>
     </message>
     <message>
-        <source>Copy transaction ID</source>
-        <translation>Kopieer transactie-ID</translation>
+        <source>Copy full transaction &amp;details</source>
+        <translation>Kopieer volledige transactie &amp;details</translation>
     </message>
     <message>
-        <source>Copy raw transaction</source>
-        <translation>Kopieer ruwe transactie</translation>
+        <source>&amp;Show transaction details</source>
+        <translation>&amp;Toon transactiedetails</translation>
     </message>
     <message>
-        <source>Copy full transaction details</source>
-        <translation>Kopieer volledige transactiedetials</translation>
+        <source>A&amp;bandon transaction</source>
+        <translation>&amp;Annuleer transactie</translation>
     </message>
     <message>
-        <source>Edit address label</source>
-        <translation>Bewerk adres label</translation>
+        <source>Rese&amp;nd transaction</source>
+        <translation>Transactie &amp;opnieuw versturen</translation>
     </message>
     <message>
-        <source>Show transaction details</source>
-        <translation>Toon transactiedetails</translation>
+        <source>&amp;Edit address label</source>
+        <translation>&amp;Bewerk adres label</translation>
     </message>
     <message>
-        <source>Show address QR code</source>
-        <translation>Toon adres QR-code</translation>
+        <source>Show address &amp;QR code</source>
+        <translation>Toon adres in &amp;QR-code</translation>
+    </message>
+    <message>
+        <source>Show in %1</source>
+        <extracomment>Transactions table context menu action to show the selected transaction in a third-party block explorer. %1 is a stand-in argument for the URL of the explorer.</extracomment>
+        <translation>Toon in %1</translation>
     </message>
     <message>
         <source>Export Transaction History</source>
         <translation>Exporteer transactiegeschiedenis</translation>
     </message>
+    <message>
+        <source>Comma separated file</source>
+        <extracomment>Expanded name of the CSV file format. See: https://en.wikipedia.org/wiki/Comma-separated_values.</extracomment>
+        <translation>Komma gescheiden bestand</translation>
+    </message>
     <message>
         <source>Confirmed</source>
         <translation>Bevestigd</translation>
@@ -3851,10 +5078,54 @@ Nota: Het bericht zal niet verzonden worden met de betaling over het Dash netwer
         <source>Closing the wallet for too long can result in having to resync the entire chain if pruning is enabled.</source>
         <translation>Als u de portemonnee te afgesloten laat met terugsnoeien ingeschakeld, kan dit ertoe leiden dat de hele blockchain opnieuw moet worden gesynchroniseerd.</translation>
     </message>
-    </context>
+    <message>
+        <source>Close all wallets</source>
+        <translation>Sluit alle portemonnees</translation>
+    </message>
+    <message>
+        <source>Are you sure you wish to close all wallets?</source>
+        <translation>Weet je zeker dat je alles portemonnees wilt sluiten?</translation>
+    </message>
+</context>
 <context>
     <name>WalletFrame</name>
-    </context>
+    <message>
+        <source>No wallet has been loaded.
+Go to File &gt; Open Wallet to load a wallet.
+- OR -</source>
+        <translation>Er is geen portemonnee geladen.
+Ga naar Bestand &gt; Open portemonnee om een wallet te openen.
+- OF -</translation>
+    </message>
+    <message>
+        <source>Create a new wallet</source>
+        <translation>Maak een nieuwe portemonnee aan</translation>
+    </message>
+    <message>
+        <source>Error</source>
+        <translation>Fout</translation>
+    </message>
+    <message>
+        <source>Unable to decode PSBT from clipboard (invalid base64)</source>
+        <translation>Kan PSBT van het klembord niet decoderen (ongeldige base64)</translation>
+    </message>
+    <message>
+        <source>Load Transaction Data</source>
+        <translation>Laad transactiegegevens</translation>
+    </message>
+    <message>
+        <source>Partially Signed Transaction (*.psbt)</source>
+        <translation>Partially Signed Blockchain Transaction (*.psbt)</translation>
+    </message>
+    <message>
+        <source>PSBT file must be smaller than 100 MiB</source>
+        <translation>PSBT-bestand moet kleiner zijn dan 100 MiB</translation>
+    </message>
+    <message>
+        <source>Unable to decode PSBT</source>
+        <translation>Kan PSBT niet decoderen</translation>
+    </message>
+</context>
 <context>
     <name>WalletModel</name>
     <message>
@@ -3880,6 +5151,11 @@ Nota: Het bericht zal niet verzonden worden met de betaling over het Dash netwer
         <source>Selected amount:</source>
         <translation>Gekozen bedrag:</translation>
     </message>
+    <message>
+        <source>Wallet Data</source>
+        <extracomment>Name of the wallet data file format.</extracomment>
+        <translation>Portemonnee gegevens</translation>
+    </message>
     <message>
         <source>Backup Wallet</source>
         <translation>Portemonnee backuppen</translation>
@@ -3907,14 +5183,6 @@ Nota: Het bericht zal niet verzonden worden met de betaling over het Dash netwer
 </context>
 <context>
     <name>dash-core</name>
-    <message>
-        <source>Error: Listening for incoming connections failed (listen returned error %s)</source>
-        <translation>Fout: luisteren naar binnenkomende verbindingen mislukt (luisteren gaf foutmelding %s)</translation>
-    </message>
-    <message>
-        <source>Fee estimation failed. Fallbackfee is disabled. Wait a few blocks or enable -fallbackfee.</source>
-        <translation>Vergoedingskosten raming mislukt. Fallbackfee is uitgeschakeld. Wacht een paar blocks of schakel -fallbackfee in.</translation>
-    </message>
     <message>
         <source>This error could occur if this wallet was not shutdown cleanly and was last loaded using a build with a newer version of Berkeley DB. If so, please use the software that last loaded this wallet</source>
         <translation>Deze fout kan optreden als deze portemonnee niet correct is afgesloten of voor het laatst is geladen met een nieuwere buildversie  van Berkeley DB. Als dit het geval is, gebruik dan de software waarmee deze portemonnee voor het laatst is geladen</translation>
@@ -3972,16 +5240,20 @@ Nota: Het bericht zal niet verzonden worden met de betaling over het Dash netwer
         <translation>Fout bij het lezen van de database, programma wordt beëindigd.</translation>
     </message>
     <message>
-        <source>Failed to listen on any port. Use -listen=0 if you want this.</source>
-        <translation>Het is mislukt om naar gelijk welke poort te luisteren. Gebruik -listen=0 als je dit wil</translation>
+        <source>Error: Missing checksum</source>
+        <translation>Fout: Checksum ontbreekt</translation>
+    </message>
+    <message>
+        <source>Error: Unable to parse version %u as a uint32_t</source>
+        <translation>Fout: Kan versie %u niet parsen als een uint32_t</translation>
     </message>
     <message>
-        <source>-maxtxfee is set very high! Fees this large could be paid on a single transaction.</source>
-        <translation>-maxtxfee staat zeer hoog! Transactiekosten van deze grootte kunnen worden gebruikt in een enkele transactie.</translation>
+        <source>Error: Unable to write record to new wallet</source>
+        <translation>Fout: Kan record niet naar nieuwe portemonnee schrijven</translation>
     </message>
     <message>
-        <source>Cannot provide specific connections and have addrman find outgoing connections at the same.</source>
-        <translation>Kan geen verbindingen bieden en addrman tegelijkertijd uitgaande verbindingen laten zoeken.</translation>
+        <source>Failed to listen on any port. Use -listen=0 if you want this.</source>
+        <translation>Het is mislukt om naar gelijk welke poort te luisteren. Gebruik -listen=0 als je dit wil</translation>
     </message>
     <message>
         <source>Found unconfirmed denominated outputs, will wait till they confirm to continue.</source>
@@ -3992,13 +5264,17 @@ Nota: Het bericht zal niet verzonden worden met de betaling over het Dash netwer
         <translation>Ongeldige -socketevents ('%s') opgegeven. Alleen deze modi worden ondersteund: %s</translation>
     </message>
     <message>
-        <source>Invalid amount for -maxtxfee=&lt;amount&gt;: '%s' (must be at least the minrelay fee of %s to prevent stuck transactions)</source>
-        <translation>ongeldig bedrag voor -maxtxfee=&lt;bedrag&gt;: '%s' (moet ten minste de minimale doorgeefvergoeding van %s zijn om vastgelopen transacties te voorkomen)</translation>
+        <source>SQLiteDatabase: Unknown sqlite wallet schema version %d. Only version %d is supported</source>
+        <translation>SQLiteDatabase: Onbekend sqlite wallet schema versie %d. Alleen versie %d wordt ondersteund</translation>
     </message>
     <message>
         <source>Transaction index can't be disabled with governance validation enabled. Either start with -disablegovernance command line switch or enable transaction index.</source>
         <translation>Transactieindex kan niet worden uitgeschakeld als validatie van governance is ingeschakeld. Begin met -disablegovernance command line switch of schakel transactieindex in.</translation>
     </message>
+    <message>
+        <source>Unsupported category-specific logging level -loglevel=%s. Expected -loglevel=&lt;category&gt;:&lt;loglevel&gt;. Valid categories: %s. Valid loglevels: %s.</source>
+        <translation>Niet ondersteunde categorie specifieke logniveau -loglevel=%s. Verwacht -loglevel=&lt;category&gt;:&lt;loglevel&gt; . Geldige categorieën: %s. Geldige logniveaus: %s.</translation>
+    </message>
     <message>
         <source>Can't mix: no compatible inputs found!</source>
         <translation>Kan niet mixen: geen compatibele inputs gevonden!</translation>
@@ -4007,6 +5283,14 @@ Nota: Het bericht zal niet verzonden worden met de betaling over het Dash netwer
         <source>Entry exceeds maximum size.</source>
         <translation>Invoer overschrijdt de maximale grootte.</translation>
     </message>
+    <message>
+        <source>Error upgrading evo database for EHF</source>
+        <translation>Fout bij het upgraden van de Evo database voor EHF</translation>
+    </message>
+    <message>
+        <source>Failed to commit Evo database</source>
+        <translation>Het is niet gelukt om de Evo database vast te leggen</translation>
+    </message>
     <message>
         <source>Found enough users, signing ( waiting %s )</source>
         <translation>Voldoende gebruikers gevonden, aan het ondertekenen ( wacht %s )</translation>
@@ -4031,18 +5315,14 @@ Nota: Het bericht zal niet verzonden worden met de betaling over het Dash netwer
         <source>Insufficient funds.</source>
         <translation>Ontoereikend saldo.</translation>
     </message>
-    <message>
-        <source>Invalid amount for -discardfee=&lt;amount&gt;: '%s'</source>
-        <translation>Ongeldig bedrag voor -discardfee = &lt;amount&gt;: '%s'</translation>
-    </message>
-    <message>
-        <source>Invalid amount for -paytxfee=&lt;amount&gt;: '%s' (must be at least %s)</source>
-        <translation>Ongeldig bedrag voor -paytxfee=&lt;bedrag&gt;: '%s' (Minimum %s)</translation>
-    </message>
     <message>
         <source>Invalid minimum number of spork signers specified with -minsporkkeys</source>
         <translation>Ongeldig minumum aantal spork ondertekenaars zoals ingesteld met -minsporkkeys</translation>
     </message>
+    <message>
+        <source>Listening for incoming connections failed (listen returned error %s)</source>
+        <translation>Luisteren naar inkomende verbindingen is mislukt (fout %s)</translation>
+    </message>
     <message>
         <source>Lock is already in place.</source>
         <translation>Vergrendeling is al op zijn plaats.</translation>
@@ -4099,6 +5379,10 @@ Nota: Het bericht zal niet verzonden worden met de betaling over het Dash netwer
         <source>Synchronizing governance objects…</source>
         <translation>Synchroniseren governance objecten…</translation>
     </message>
+    <message>
+        <source>Transaction change output index out of range</source>
+        <translation>Transactie wisselgeld output index buiten bereik</translation>
+    </message>
     <message>
         <source>Unable to start HTTP server. See debug log for details.</source>
         <translation>Niet mogelijk ok HTTP-server te starten. Zie debuglogboek voor details.</translation>
@@ -4107,6 +5391,10 @@ Nota: Het bericht zal niet verzonden worden met de betaling over het Dash netwer
         <source>Unknown response.</source>
         <translation>Onbekend reactie.</translation>
     </message>
+    <message>
+        <source>Unsupported global logging level -loglevel=%s. Valid values: %s.</source>
+        <translation>Niet ondersteund globaal logniveau -loglevel=%s. Geldige waarden: %s.</translation>
+    </message>
     <message>
         <source>User Agent comment (%s) contains unsafe characters.</source>
         <translation>User Agentcommentaar (%s) bevat onveilige karakters.</translation>
@@ -4147,6 +5435,10 @@ Nota: Het bericht zal niet verzonden worden met de betaling over het Dash netwer
         <source>Make sure to encrypt your wallet and delete all non-encrypted backups after you have verified that the wallet works!</source>
         <translation>Zorg ervoor dat u uw portefeuille codeert en alle niet-gecodeerde back-ups verwijdert nadat u hebt geverifieerd dat de portefeuille werkt!</translation>
     </message>
+    <message>
+        <source>More than one onion bind address is provided. Using %s for the automatically created Tor onion service.</source>
+        <translation>Meer dan één onion bind-adres opgegeven. Gebruik %s voor de automatisch aangemaakte Tor onion service.</translation>
+    </message>
     <message>
         <source>Prune configured below the minimum of %d MiB.  Please use a higher number.</source>
         <translation>Prune is ingesteld op minder dan het minimum van %d MiB. Gebruik a.u.b. een hoger aantal.</translation>
@@ -4175,10 +5467,6 @@ Nota: Het bericht zal niet verzonden worden met de betaling over het Dash netwer
         <source>Wallet is locked, can't replenish keypool! Automatic backups and mixing are disabled, please unlock your wallet to replenish keypool.</source>
         <translation>Wallet is vergrendeld, niet instaat om keypool aan te vullen! Automatische backups en mixen zijn uitgeschakeld, ontgrendel alstublieft uw wallet om de keypool aan te vullen.</translation>
     </message>
-    <message>
-        <source>You need to rebuild the database using -reindex to change -timestampindex</source>
-        <translation>U moet de database opnieuw opbouwen met behulp van -reindex om -timestampindex te wijzigen</translation>
-    </message>
     <message>
         <source>You need to rebuild the database using -reindex to go back to unpruned mode.  This will redownload the entire blockchain</source>
         <translation>U moet de database herbouwen met -reindex om terug te gaan naar de niet-prune modus. Dit zal de gehele blockchain opnieuw downloaden.</translation>
@@ -4220,20 +5508,32 @@ Nota: Het bericht zal niet verzonden worden met de betaling over het Dash netwer
         <translation>Fout bij laden %s: privésleutels kunnen alleen worden uitgeschakeld tijdens aanmaken</translation>
     </message>
     <message>
-        <source>Error upgrading evo database</source>
-        <translation>Fout bij het upgraden van de evo database</translation>
+        <source>Error: Couldn't create cursor into database</source>
+        <translation>Fout: Kon geen cursor in de database aanmaken</translation>
     </message>
     <message>
         <source>Error: Disk space is low for %s</source>
         <translation>Fout: Schijfruimte is laag voor %s</translation>
     </message>
     <message>
-        <source>Exceeded max tries.</source>
-        <translation>Maximum aantal pogingen overschreden.</translation>
+        <source>Error: Dumpfile checksum does not match. Computed %s, expected %s</source>
+        <translation>Fout: Dumpbestand checksum komt niet overeen. Gecalculeerd %s, verwacht %s</translation>
+    </message>
+    <message>
+        <source>Error: Got key that was not hex: %s</source>
+        <translation>Fout: Ontvangen sleutel is niet in hex: %s</translation>
+    </message>
+    <message>
+        <source>Error: Got value that was not hex: %s</source>
+        <translation>Fout: Ontvangen waarde is geen hex: %s</translation>
+    </message>
+    <message>
+        <source>Error: Keypool ran out, please call keypoolrefill first</source>
+        <translation>Fout: Keypool is leeg, voer eerst keypoolrefill uit</translation>
     </message>
     <message>
-        <source>Failed to commit EvoDB</source>
-        <translation>EvoDB kan niet worden vastgelegd</translation>
+        <source>Error: No addresses available.</source>
+        <translation>Fout: Geen adressen beschikbaar.</translation>
     </message>
     <message>
         <source>Failed to create backup %s!</source>
@@ -4251,17 +5551,29 @@ Nota: Het bericht zal niet verzonden worden met de betaling over het Dash netwer
         <source>Failed to rescan the wallet during initialization</source>
         <translation>Het herscannen van de portemonnee is mislukt tijdens het initialiseren</translation>
     </message>
+    <message>
+        <source>Failed to verify database</source>
+        <translation>Verifiëren van database mislukt</translation>
+    </message>
+    <message>
+        <source>Fee rate (%s) is lower than the minimum fee rate setting (%s)</source>
+        <translation>Transactiefee (%s) is lager dan de minimuminstelling voor transactiefees (%s)</translation>
+    </message>
     <message>
         <source>Found enough users, signing…</source>
         <translation>Voldoende gebruikers gevonden, aan het ondertekenen…</translation>
     </message>
     <message>
-        <source>Invalid P2P permission: '%s'</source>
-        <translation>Ongeldige P2P machtiging: '%s'</translation>
+        <source>Ignoring duplicate -wallet %s.</source>
+        <translation>Dubbele -wallet %s wordt genegeerd.</translation>
+    </message>
+    <message>
+        <source>Input not found or already spent</source>
+        <translation>Input niet gevonden of al besteed</translation>
     </message>
     <message>
-        <source>Invalid amount for -fallbackfee=&lt;amount&gt;: '%s'</source>
-        <translation>Ongeldig bedrag voor -fallbackfee=&lt;bedrag&gt;: '%s'</translation>
+        <source>Invalid P2P permission: '%s'</source>
+        <translation>Ongeldige P2P machtiging: '%s'</translation>
     </message>
     <message>
         <source>Invalid masternodeblsprivkey. Please see documentation.</source>
@@ -4283,6 +5595,10 @@ Nota: Het bericht zal niet verzonden worden met de betaling over het Dash netwer
         <source>Mixing in progress…</source>
         <translation>Bezig met mixen…</translation>
     </message>
+    <message>
+        <source>No addresses available</source>
+        <translation>Geen adressen beschikbaar</translation>
+    </message>
     <message>
         <source>No errors detected.</source>
         <translation>Geen fouten gevonden</translation>
@@ -4311,6 +5627,22 @@ Nota: Het bericht zal niet verzonden worden met de betaling over het Dash netwer
         <source>Prune mode is incompatible with -txindex.</source>
         <translation>Terugsnoeimodus is niet compatibel met -txindex.</translation>
     </message>
+    <message>
+        <source>SQLiteDatabase: Failed to execute statement to verify database: %s</source>
+        <translation>SQLiteDatabase: Fout bij het uitvoeren van de statement om de database te verifiëren: %s</translation>
+    </message>
+    <message>
+        <source>SQLiteDatabase: Failed to prepare statement to verify database: %s</source>
+        <translation>SQLiteDatabase: Fout bij het voorbereiden van de statement om de database te verifiëren: %s</translation>
+    </message>
+    <message>
+        <source>SQLiteDatabase: Failed to read database verification error: %s</source>
+        <translation>SQLiteDatabase: Fout bij het lezen van de database verificatiefout: %s</translation>
+    </message>
+    <message>
+        <source>SQLiteDatabase: Unexpected application id. Expected %u, got %u</source>
+        <translation>SQLiteDatabase: Onverwachte applicatie ID. Verwacht %u, ontvangen %u</translation>
+    </message>
     <message>
         <source>Section [%s] is not recognized.</source>
         <translation>Sectie [%s] wordt niet herkend.</translation>
@@ -4343,6 +5675,10 @@ Nota: Het bericht zal niet verzonden worden met de betaling over het Dash netwer
         <source>This is the transaction fee you will pay if you send a transaction.</source>
         <translation>Dit is de transactievergoeding dat je betaalt wanneer je een transactie verstuurt.</translation>
     </message>
+    <message>
+        <source>Topping up keypool…</source>
+        <translation>Bijvullen van de keypool…</translation>
+    </message>
     <message>
         <source>Transaction amounts must not be negative</source>
         <translation>Transactiebedragen moeten positief zijn</translation>
@@ -4371,13 +5707,17 @@ Nota: Het bericht zal niet verzonden worden met de betaling over het Dash netwer
         <source>Unable to generate initial keys</source>
         <translation>Kan eerste sleutels niet genereren</translation>
     </message>
+    <message>
+        <source>Unable to open %s for writing</source>
+        <translation>Kan %s niet openen om te schrijven</translation>
+    </message>
     <message>
         <source>Unknown -blockfilterindex value %s.</source>
         <translation>Onbekende -blockfilterindex waarde %s.</translation>
     </message>
     <message>
-        <source>Upgrading UTXO database</source>
-        <translation>Upgraden UTXO-database</translation>
+        <source>Unknown new rules activated (versionbit %i)</source>
+        <translation>Onbekende nieuwe regels geactiveerd (versionbit %i)</translation>
     </message>
     <message>
         <source>Verifying blocks…</source>
@@ -4396,16 +5736,12 @@ Nota: Het bericht zal niet verzonden worden met de betaling over het Dash netwer
         <translation>Was niet in staat om de back-up folder aan te maken %s!</translation>
     </message>
     <message>
-        <source>You can not start a masternode with wallet enabled.</source>
-        <translation>U kunt geen masternode starten met portemennee ingeschakeld.</translation>
-    </message>
-    <message>
-        <source>You need to rebuild the database using -reindex to change -addressindex</source>
-        <translation>U moet de database opnieuw opbouwen met behulp van -reindex om -addressindex te wijzigen</translation>
+        <source>Wiping wallet transactions…</source>
+        <translation>Portemonnee transacties wissen…</translation>
     </message>
     <message>
-        <source>You need to rebuild the database using -reindex to change -spentindex</source>
-        <translation>U moet de database opnieuw opbouwen met behulp van -reindex om -spentindex te wijzigen</translation>
+        <source>You can not start a masternode with wallet enabled.</source>
+        <translation>U kunt geen masternode starten met portemennee ingeschakeld.</translation>
     </message>
     <message>
         <source>no mixing available.</source>
@@ -4423,6 +5759,22 @@ Nota: Het bericht zal niet verzonden worden met de betaling over het Dash netwer
         <source>%s uses exact denominated amounts to send funds, you might simply need to mix some more coins.</source>
         <translation>%s gebruikt exact genoemde bedragen om geld te verzenden. Wellicht moet u gewoon wat meer munten mixen.</translation>
     </message>
+    <message>
+        <source>-reindex-chainstate option is not compatible with -blockfilterindex. Please temporarily disable blockfilterindex while using -reindex-chainstate, or replace -reindex-chainstate with -reindex to fully rebuild all indexes.</source>
+        <translation>-reindex-chainstate optie is niet compatibel met -blockfilterindex. Schakel tijdelijk blockfilterindex uit tijdens het gebruik van -reindex-chainstate, of vervang -reindex-chainstate door -reindex om alle indexen volledig opnieuw op te bouwen.</translation>
+    </message>
+    <message>
+        <source>-reindex-chainstate option is not compatible with -coinstatsindex. Please temporarily disable coinstatsindex while using -reindex-chainstate, or replace -reindex-chainstate with -reindex to fully rebuild all indexes.</source>
+        <translation>-reindex-chainstate optie is niet compatibel met -coinstatsindex. Schakel tijdelijk coinstatsindex uit tijdens het gebruik van -reindex-chainstate, of vervang -reindex-chainstate door -reindex om alle indexen volledig opnieuw op te bouwen.</translation>
+    </message>
+    <message>
+        <source>-reindex-chainstate option is not compatible with -txindex. Please temporarily disable txindex while using -reindex-chainstate, or replace -reindex-chainstate with -reindex to fully rebuild all indexes.</source>
+        <translation>-reindex-chainstate optie is niet compatibel met -txindex. Schakel tijdelijk txindex uit tijdens het gebruik van -reindex-chainstate, of vervang -reindex-chainstate door -reindex om alle indexen volledig opnieuw op te bouwen.</translation>
+    </message>
+    <message>
+        <source>Cannot downgrade wallet from version %i to version %i. Wallet version unchanged.</source>
+        <translation>Kan portemonnee niet downgraden van versie %i naar versie %i. portemonnee versie is niet gewijzigd.</translation>
+    </message>
     <message>
         <source>Cannot obtain a lock on data directory %s. %s is probably already running.</source>
         <translation>Kan geen lock verkrijgen op gegevensmap %s. %s draait waarschijnlijk al.</translation>
@@ -4435,14 +5787,82 @@ Nota: Het bericht zal niet verzonden worden met de betaling over het Dash netwer
         <source>Error loading %s: You can't enable HD on an already existing non-HD wallet</source>
         <translation>Fout bij laden %s: HD kan niet worden geactiveerd bij een bestaande non-HD portemonnee.</translation>
     </message>
+    <message>
+        <source>Error loading wallet. Wallet requires blocks to be downloaded, and software does not currently support loading wallets while blocks are being downloaded out of order when using assumeutxo snapshots. Wallet should be able to load successfully after node sync reaches height %s</source>
+        <translation>Fout bij het laden van portemonnee. Portemonnee vereist dat blocks  worden gedownload, en de software ondersteunt momenteel het laden van portefeuilles niet terwijl blocks niet op volgorde worden gedownload wanneer gebruik wordt gemaakt van assumeutxo snapshots. De portemonnee zou succesvol moeten kunnen laden nadat de node synchronisatie de hoogte %s heeft bereikt.</translation>
+    </message>
     <message>
         <source>Error reading %s! All keys read correctly, but transaction data or address book entries might be missing or incorrect.</source>
         <translation>Waarschuwing: Fout bij het lezen van %s! Alle sleutels zijn in goede orde uitgelezen, maar transactiedata of adresboeklemma's zouden kunnen ontbreken of fouten bevatten.</translation>
     </message>
+    <message>
+        <source>Error: Dumpfile format record is incorrect. Got "%s", expected "format".</source>
+        <translation>Fout: Dumpfile record formaat is onjuist. Ontvangen "%s", verwacht "format".</translation>
+    </message>
+    <message>
+        <source>Error: Dumpfile identifier record is incorrect. Got "%s", expected "%s".</source>
+        <translation>Fout: Dumpfile identificaterecord is onjuist. Ontvangen "%s", verwacht "%s".</translation>
+    </message>
+    <message>
+        <source>Error: Dumpfile version is not supported. This version of bitcoin-wallet only supports version 1 dumpfiles. Got dumpfile with version %s</source>
+        <translation>Fout: Dumpfile versie wordt niet ondersteund. Deze versie van bitcoin wallet ondersteunt alleen versie 1 dumpfiles. Ontvangen dumpfile is versie %s.</translation>
+    </message>
+    <message>
+        <source>Failed to rename invalid peers.dat file. Please move or delete it and try again.</source>
+        <translation>Fout bij het hernoemen van ongeldig peers.dat bestand. Verplaats of verwijder het en probeer het opnieuw.</translation>
+    </message>
+    <message>
+        <source>Fee estimation failed. Fallbackfee is disabled. Wait a few blocks or enable %s.</source>
+        <translation>Vergoedingsschatting mislukt. Fallbackfee is uitgeschakeld. Wacht een paar blokken of schakel %s in.</translation>
+    </message>
+    <message>
+        <source>File %s already exists. If you are sure this is what you want, move it out of the way first.</source>
+        <translation>Bestand %s bestaat al. Als je zeker weet dat dit is wat je wilt, verplaats het dan eerst.</translation>
+    </message>
+    <message>
+        <source>Incompatible options: -dnsseed=1 was explicitly specified, but -onlynet forbids connections to IPv4/IPv6</source>
+        <translation>Incompatibele opties: -dnsseed=1 was expliciet opgegeven, maar -onlynet staat verbindingen met IPv4/IPv6 niet toe.</translation>
+    </message>
     <message>
         <source>Incorrect or no devnet genesis block found. Wrong datadir for devnet specified?</source>
         <translation>Onjuiste of geen devnet genesisblok gevonden. Verkeerde devnet gegevensmap opgegeven?</translation>
     </message>
+    <message>
+        <source>Invalid amount for %s=&lt;amount&gt;: '%s' (must be at least the minrelay fee of %s to prevent stuck transactions)</source>
+        <translation>Ongeldig bedrag voor %s=&lt;amount&gt;: '%s' (moet minimaal de minrelay-vergoeding van %s zijn om vastgelopen transacties te voorkomen)</translation>
+    </message>
+    <message>
+        <source>Invalid or corrupt peers.dat (%s). If you believe this is a bug, please report it to %s. As a workaround, you can move the file (%s) out of the way (rename, move, or delete) to have a new one created on the next start.</source>
+        <translation>Ongeldig of beschadigd peers.dat (%s). Als je denkt dat dit een bug is, meld dit dan bij %s. Als tijdelijke oplossing kan je het bestand (%s) hernoemen, verplaatsen of verwijderen, zodat er een nieuw bestand wordt aangemaakt bij de volgende start.</translation>
+    </message>
+    <message>
+        <source>No dump file provided. To use createfromdump, -dumpfile=&lt;filename&gt; must be provided.</source>
+        <translation>Geen dump bestand opgegeven. Om createfromdump te gebruiken, moet -dumpfile=&lt;filename&gt; worden opgegeven.</translation>
+    </message>
+    <message>
+        <source>No dump file provided. To use dump, -dumpfile=&lt;filename&gt; must be provided.</source>
+        <translation>Geen dump bestand opgegeven. Om dump te gebruiken, moet -dumpfile=&lt;filename&gt; worden opgegeven.</translation>
+    </message>
+    <message>
+        <source>No wallet file format provided. To use createfromdump, -format=&lt;format&gt; must be provided.</source>
+        <translation>Geen portemonnee bestandsformaat opgegeven. Om createfromdump te gebruiken, moet -format=&lt;format&gt; worden opgegeven.</translation>
+    </message>
+    <message>
+        <source>Outbound connections restricted to CJDNS (-onlynet=cjdns) but -cjdnsreachable is not provided</source>
+        <translation>Uitgaande verbindingen beperkt tot CJDNS (-onlynet=cjdns) maar -cjdnsreachable is niet opgegeven</translation>
+    </message>
+    <message>
+        <source>Outbound connections restricted to Tor (-onlynet=onion) but the proxy for reaching the Tor network is explicitly forbidden: -onion=0</source>
+        <translation>Uitgaande verbindingen zijn beperkt tot Tor (-onlynet=onion), maar de proxy om verbinding te maken met het Tor netwerk is expliciet verboden: -onion=0</translation>
+    </message>
+    <message>
+        <source>Outbound connections restricted to Tor (-onlynet=onion) but the proxy for reaching the Tor network is not provided: none of -proxy, -onion or -listenonion is given</source>
+        <translation>Uitgaande verbindingen zijn beperkt tot Tor (-onlynet=onion), maar de proxy om verbinding te maken met het Tor netwerk is niet opgegeven: geen enkele -proxy, -onion of -listenonion is opgegeven.</translation>
+    </message>
+    <message>
+        <source>Outbound connections restricted to i2p (-onlynet=i2p) but -i2psam is not provided</source>
+        <translation>Uitgaande verbindingen beperkt tot i2p (-onlynet=i2p) maar -i2psam is niet opgegeven</translation>
+    </message>
     <message>
         <source>Please check that your computer's date and time are correct! If your clock is wrong, %s will not work properly.</source>
         <translation>Waarschuwing: Controleer dat de datum en tijd van uw computer correct zijn ingesteld! Bij een onjuist ingestelde klok zal %s niet goed werken.</translation>
@@ -4451,6 +5871,14 @@ Nota: Het bericht zal niet verzonden worden met de betaling over het Dash netwer
         <source>Please contribute if you find %s useful. Visit %s for further information about the software.</source>
         <translation>Gelieve bij te dragen als je %s nuttig vindt. Bezoek %s voor meer informatie over de software.</translation>
     </message>
+    <message>
+        <source>Prune mode is incompatible with -reindex-chainstate. Use full -reindex instead.</source>
+        <translation>Prune modus is incompatibel met -reindex-chainstate. Gebruik in plaats daarvan een volledige -reindex.</translation>
+    </message>
+    <message>
+        <source>This is the maximum transaction fee you pay (in addition to the normal fee) to prioritize partial spend avoidance over regular coin selection.</source>
+        <translation>Dit is de maximale transactie fee die je betaalt (naast de normale fee) om het vermijden van gedeeltelijke besteding te prioriteren boven de reguliere muntenselectie.</translation>
+    </message>
     <message>
         <source>This is the transaction fee you may discard if change is smaller than dust at this level</source>
         <translation>Dit is de transactievergoeding die u kunt negeren als het wisselgeld kleiner is dan het restantbedrag</translation>
@@ -4459,14 +5887,38 @@ Nota: Het bericht zal niet verzonden worden met de betaling over het Dash netwer
         <source>This is the transaction fee you may pay when fee estimates are not available.</source>
         <translation>Dit is de transactievergoeding die je mogelijk betaalt indien geschatte tarief niet beschikbaar is</translation>
     </message>
+    <message>
+        <source>Transaction requires one destination of non-0 value, a non-0 feerate, or a pre-selected input</source>
+        <translation>Transactie vereist één bestemming met niet-0 waarde, een niet-0 vergoedingspercentage, of een vooraf geselecteerde invoer</translation>
+    </message>
     <message>
         <source>Unable to replay blocks. You will need to rebuild the database using -reindex-chainstate.</source>
         <translation>Kan blokken niet nalopen. U moet de database opnieuw opbouwen met behulp van -reindex-chainstate.</translation>
     </message>
+    <message>
+        <source>Unknown wallet file format "%s" provided. Please provide one of "bdb" or "sqlite".</source>
+        <translation>Onbekend portemonnee bestandsformaat "%s" opgegeven. Geef een van de formaten "bdb" of "sqlite" op.</translation>
+    </message>
+    <message>
+        <source>Unsupported chainstate database format found. Please restart with -reindex-chainstate. This will rebuild the chainstate database.</source>
+        <translation>Niet-ondersteund chainstate-databaseformaat gevonden. Herstart met -reindex-chainstate. Dit zal de chainstate-database opnieuw opbouwen.</translation>
+    </message>
+    <message>
+        <source>Warning: Dumpfile wallet format "%s" does not match command line specified format "%s".</source>
+        <translation>Waarschuwing: Dump bestand portemonnee formaat "%s" komt niet overeen met het opgegeven formaat op de opdrachtregel "%s".</translation>
+    </message>
     <message>
         <source>Warning: Private keys detected in wallet {%s} with disabled private keys</source>
         <translation>Waarschuwing: privésleutels gedetecteerd in portemonnee {%s} terwijl privésleutels zijn uitgeschakeld</translation>
     </message>
+    <message>
+        <source>You need to rebuild the database using -reindex to enable -timestampindex</source>
+        <translation>Je moet de database opnieuw opbouwen met -reindex om -timestampindex in te schakelen.</translation>
+    </message>
+    <message>
+        <source>%s -- Incorrect seed, it should be a hex string</source>
+        <translation>%s -- Onjuiste seed, het zou een hex-string moeten zijn.</translation>
+    </message>
     <message>
         <source>%s is not a valid backup folder!</source>
         <translation>%s is geen geldige back-up map!</translation>
@@ -4491,10 +5943,30 @@ Nota: Het bericht zal niet verzonden worden met de betaling over het Dash netwer
         <source>-rpcport must be specified when -devnet and -server are specified</source>
         <translation>-rpcport moet worden opgegeven wanneer -devnet en -server worden gebruikt</translation>
     </message>
+    <message>
+        <source>-statsbatchsize cannot be configured with a negative value.</source>
+        <translation>-statsbatchsize kan niet worden geconfigureerd met een negatieve waarde.</translation>
+    </message>
+    <message>
+        <source>-statsduration cannot be configured with a negative value.</source>
+        <translation>-statsduration kan niet worden geconfigureerd met een negatieve waarde.</translation>
+    </message>
     <message>
         <source>A fatal internal error occurred, see debug.log for details</source>
         <translation>Er is een fatale interne fout opgetreden, zie debug.log voor details</translation>
     </message>
+    <message>
+        <source>Cannot create socket (socket() returned error %s)</source>
+        <translation>Kan socket niet aanmaken (socket() gaf fout %s)</translation>
+    </message>
+    <message>
+        <source>Cannot get socket address for %s</source>
+        <translation>Kan socket-adres voor %s niet verkrijgen</translation>
+    </message>
+    <message>
+        <source>Cannot init Statsd client</source>
+        <translation>Kan Statsd-client niet initialiseren</translation>
+    </message>
     <message>
         <source>Cannot resolve -%s address: '%s'</source>
         <translation>Kan -%s adres niet herleiden: '%s'</translation>
@@ -4503,10 +5975,6 @@ Nota: Het bericht zal niet verzonden worden met de betaling over het Dash netwer
         <source>Cannot write to data directory '%s'; check permissions.</source>
         <translation>Kan niet schrijven naar data map '%s'; controleer rechten.</translation>
     </message>
-    <message>
-        <source>Change index out of range</source>
-        <translation>Wijzigingsindex buiten bereik</translation>
-    </message>
     <message>
         <source>Copyright (C)</source>
         <translation>Copyright (C)</translation>
@@ -4515,6 +5983,14 @@ Nota: Het bericht zal niet verzonden worden met de betaling over het Dash netwer
         <source>Disk space is too low!</source>
         <translation>Schijfruimte is te laag!</translation>
     </message>
+    <message>
+        <source>Dump file %s does not exist.</source>
+        <translation>Dump bestand %s bestaat niet.</translation>
+    </message>
+    <message>
+        <source>Error creating %s</source>
+        <translation>Fout bij het maken van %s</translation>
+    </message>
     <message>
         <source>Error loading %s</source>
         <translation>Fout bij het laden van %s</translation>
@@ -4532,8 +6008,8 @@ Nota: Het bericht zal niet verzonden worden met de betaling over het Dash netwer
         <translation>Fout bij laden %s. HD kan niet worden uitgeschakeld bij een HD portemonnee.</translation>
     </message>
     <message>
-        <source>Error upgrading chainstate database</source>
-        <translation>Fout bij het upgraden van de ketenstaat database</translation>
+        <source>Error reading next record from wallet database</source>
+        <translation>Fout bij het lezen van het volgende record uit de portemonnee database</translation>
     </message>
     <message>
         <source>Loading P2P addresses…</source>
@@ -4603,6 +6079,14 @@ Nota: Het bericht zal niet verzonden worden met de betaling over het Dash netwer
         <source>Inputs vs outputs size mismatch.</source>
         <translation>Invoer versus uitvoer komt niet overeen.</translation>
     </message>
+    <message>
+        <source>Invalid '%s'. Allowed values: 128, 160, 192, 224, 256.</source>
+        <translation>Ongeldige '%s'. Toegestane waarden: 128, 160, 192, 224, 256.</translation>
+    </message>
+    <message>
+        <source>Invalid -i2psam address or hostname: '%s'</source>
+        <translation>Ongeldig -i2psam adres of hostnaam: '%s'</translation>
+    </message>
     <message>
         <source>Invalid -onion address or hostname: '%s'</source>
         <translation>Ongeldig -onion adress of hostnaam: '%s'</translation>
@@ -4647,14 +6131,78 @@ Nota: Het bericht zal niet verzonden worden met de betaling over het Dash netwer
         <source>%s corrupt. Try using the wallet tool dash-wallet to salvage or restoring a backup.</source>
         <translation>%s corrupt. Probeer de portemonnee tool te gebruiken om een back-up te redden of te herstellen.</translation>
     </message>
+    <message>
+        <source>%s is set very high! Fees this large could be paid on a single transaction.</source>
+        <translation>%s is zeer hoog ingesteld! Vergoedingen van deze grootte kunnen betaald worden op een enkele transactie.</translation>
+    </message>
+    <message>
+        <source>%s request to listen on port %u. This port is considered "bad" and thus it is unlikely that any Dash Core peers connect to it. See doc/p2p-bad-ports.md for details and a full list.</source>
+        <translation>%s verzoek om te luisteren op poort %u. Deze poort wordt als "slecht" beschouwd, waardoor het onwaarschijnlijk is dat Dash Core peers er mee verbinden. Zie doc/p2p-bad-ports.md voor details en een volledige lijst.</translation>
+    </message>
+    <message>
+        <source>Cannot provide specific connections and have addrman find outgoing connections at the same time.</source>
+        <translation>Het is niet mogelijk om specifieke verbindingen te bieden en tegelijkertijd addrman te laten zoeken naar uitgaande verbindingen.</translation>
+    </message>
+    <message>
+        <source>Failed to upgrade Evo database</source>
+        <translation>Upgraden van Evo-database mislukt</translation>
+    </message>
+    <message>
+        <source>Fee needed &gt; fee paid</source>
+        <translation>Benodigde vergoeding &gt; betaalde vergoeding</translation>
+    </message>
+    <message>
+        <source>Host %s on unsupported network</source>
+        <translation>Host %s op niet-ondersteund netwerk</translation>
+    </message>
+    <message>
+        <source>Invalid amount for %s=&lt;amount&gt;: '%s' (must be at least %s)</source>
+        <translation>Ongeldig bedrag voor %s=&lt;amount&gt;: '%s' (moet minimaal %s zijn)</translation>
+    </message>
+    <message>
+        <source>Invalid amount for %s=&lt;amount&gt;: '%s'</source>
+        <translation>Ongeldig bedrag voor %s=&lt;amount&gt;: '%s'</translation>
+    </message>
+    <message>
+        <source>Invalid port specified in %s: '%s'</source>
+        <translation>Ongeldige poort opgegeven in %s: '%s'</translation>
+    </message>
     <message>
         <source>Last successful action was too recent.</source>
         <translation>Vorige succesvolle actie is te recent.</translation>
     </message>
+    <message>
+        <source>Missing solving data for estimating transaction size</source>
+        <translation>Ontbrekende oplosgegevens voor het schatten van transactiegrootte</translation>
+    </message>
+    <message>
+        <source>No host specified</source>
+        <translation>Geen host opgegeven</translation>
+    </message>
+    <message>
+        <source>No host specified, malformed URL</source>
+        <translation>Geen host opgegeven, ongeldige URL</translation>
+    </message>
+    <message>
+        <source>No text before the scheme delimiter, malformed URL</source>
+        <translation>Geen tekst voor het schema-scheidingsteken, ongeldige URL</translation>
+    </message>
+    <message>
+        <source>Port must be between %d and %d, supplied %d</source>
+        <translation>Poort moet tussen %d en %d liggen, opgegeven %d</translation>
+    </message>
+    <message>
+        <source>Socket not initialized, cannot send message</source>
+        <translation>Socket niet geïnitialiseerd, kan bericht niet verzenden</translation>
+    </message>
     <message>
         <source>The source code is available from %s.</source>
         <translation>De broncode is beschikbaar van %s.</translation>
     </message>
+    <message>
+        <source>The specified config file %s does not exist</source>
+        <translation>Het opgegeven configuratiebestand %s bestaat niet</translation>
+    </message>
     <message>
         <source>The transaction amount is too small to pay the fee</source>
         <translation>Het transactiebedrag is te klein om transactiekosten in rekening te brengen</translation>
@@ -4675,6 +6223,10 @@ Nota: Het bericht zal niet verzonden worden met de betaling over het Dash netwer
         <source>Transaction fees are too high.</source>
         <translation>Transactiekosten zijn te hoog.</translation>
     </message>
+    <message>
+        <source>Transaction needs a change address, but we can't generate it.</source>
+        <translation>Transactie heeft een wisselgeldadres nodig, maar we kunnen het niet genereren.</translation>
+    </message>
     <message>
         <source>Transaction not valid.</source>
         <translation>Transactie is niet geldig.</translation>
@@ -4695,6 +6247,18 @@ Nota: Het bericht zal niet verzonden worden met de betaling over het Dash netwer
         <source>Unable to locate enough non-denominated funds for this transaction.</source>
         <translation>Kan onvoldoende met niet-gedenomineerd geld vinden voor deze transactie.</translation>
     </message>
+    <message>
+        <source>Unable to lookup host %s</source>
+        <translation>Kan host %s niet opzoeken</translation>
+    </message>
+    <message>
+        <source>Unable to parse -maxuploadtarget: '%s'</source>
+        <translation>Kan -maxuploadtarget niet ontleden: '%s'</translation>
+    </message>
+    <message>
+        <source>Unable to send message to %s (::sendto() returned error %s)</source>
+        <translation>Kan bericht niet verzenden naar %s (::sendto() gaf fout %s)</translation>
+    </message>
     <message>
         <source>Unable to sign spork message, wrong key?</source>
         <translation>Niet in staat om het sporkbericht te ondertekenen, verkeerde sleutel?</translation>
@@ -4708,12 +6272,12 @@ Nota: Het bericht zal niet verzonden worden met de betaling over het Dash netwer
         <translation>Onbekende staat: id = %u</translation>
     </message>
     <message>
-        <source>Unsupported logging category %s=%s.</source>
-        <translation>Niet-ondersteunde logboekcategorie %s=%s.</translation>
+        <source>Unsupported URL scheme, must begin with udp://</source>
+        <translation>Niet-ondersteund URL-schema, moet beginnen met udp://</translation>
     </message>
     <message>
-        <source>Upgrading txindex database</source>
-        <translation>Upgraden txindex database</translation>
+        <source>Unsupported logging category %s=%s.</source>
+        <translation>Niet-ondersteunde logboekcategorie %s=%s.</translation>
     </message>
     <message>
         <source>Very low number of keys left: %d</source>
@@ -4743,9 +6307,25 @@ Nota: Het bericht zal niet verzonden worden met de betaling over het Dash netwer
         <source>You can not disable governance validation on a masternode.</source>
         <translation>U kunt governance-validatie op een masternode niet uitschakelen.</translation>
     </message>
+    <message>
+        <source>You need to rebuild the database using -reindex to enable -addressindex</source>
+        <translation>Je moet de database opnieuw opbouwen met -reindex om -addressindex in te schakelen</translation>
+    </message>
+    <message>
+        <source>You need to rebuild the database using -reindex to enable -spentindex</source>
+        <translation>Je moet de database opnieuw opbouwen met -reindex om -spentindex in te schakelen</translation>
+    </message>
     <message>
         <source>Your entries added successfully.</source>
         <translation>Uw gegevens zijn succesvol toegevoegd.</translation>
     </message>
+    <message>
+        <source>Settings file could not be read</source>
+        <translation>Instellingen bestand kon niet worden gelezen</translation>
+    </message>
+    <message>
+        <source>Settings file could not be written</source>
+        <translation>Instellingen bestand kon niet worden geschreven</translation>
+    </message>
 </context>
 </TS>
\ No newline at end of file

From 236f2ce27ee6a4d4cae4ff254eb1136493832b43 Mon Sep 17 00:00:00 2001
From: UdjinM6 <UdjinM6@users.noreply.github.com>
Date: Thu, 23 Oct 2025 21:52:41 +0300
Subject: [PATCH 325/656] pl

---
 src/qt/locale/dash_pl.ts | 1086 ++++++++++++++++++++++++++++++++------
 1 file changed, 910 insertions(+), 176 deletions(-)

diff --git a/src/qt/locale/dash_pl.ts b/src/qt/locale/dash_pl.ts
index fff84bb7ba7e..4e8777d0623a 100644
--- a/src/qt/locale/dash_pl.ts
+++ b/src/qt/locale/dash_pl.ts
@@ -65,14 +65,6 @@
         <source>C&amp;hoose</source>
         <translation>W&amp;ybierz</translation>
     </message>
-    <message>
-        <source>Sending addresses</source>
-        <translation>Adres do wysyłania</translation>
-    </message>
-    <message>
-        <source>Receiving addresses</source>
-        <translation>Adres odbiorczy</translation>
-    </message>
     <message>
         <source>These are your Dash addresses for sending payments. Always check the amount and the receiving address before sending coins.</source>
         <translation>To są twoje adresy Dash, na które wysyłasz płatności. Zanim wyślesz środki, zawsze upewnij się, że kwota i adres są prawidłowe.</translation>
@@ -115,6 +107,14 @@
         <extracomment>An error message. %1 is a stand-in argument for the name of the file we attempted to save to.</extracomment>
         <translation>Wystąpił błąd podczas próby zapisania listy adresów do %1. Spróbuj ponownie.</translation>
     </message>
+    <message>
+        <source>Sending addresses - %1</source>
+        <translation>Adresy wysyłania - %1</translation>
+    </message>
+    <message>
+        <source>Receiving addresses - %1</source>
+        <translation>Adresy odbioru - %1</translation>
+    </message>
     <message>
         <source>Exporting Failed</source>
         <translation>Próba eksportu nie powiodła się</translation>
@@ -284,10 +284,22 @@
         <source>The passphrase entered for the wallet decryption was incorrect.</source>
         <translation>Wprowadzone hasło do odszyfrowania portfela jest niepoprawne.</translation>
     </message>
+    <message>
+        <source>The passphrase entered for the wallet decryption is incorrect. It contains a null character (ie - a zero byte). If the passphrase was set with a version of this software prior to 23.0, please try again with only the characters up to — but not including — the first null character. If this is successful, please set a new passphrase to avoid this issue in the future.</source>
+        <translation>Wprowadzone hasło do odszyfrowania portfela jest nieprawidłowe. Zawiera znak null (tj. bajt zerowy). Jeśli hasło zostało ustawione w wersji tego oprogramowania wcześniejszej niż 23.0, spróbuj ponownie używając tylko znaków do — ale nie włączając — pierwszego znaku null. Jeśli to się powiedzie, ustaw nowe hasło, aby uniknąć tego problemu w przyszłości.</translation>
+    </message>
     <message>
         <source>Wallet passphrase was successfully changed.</source>
         <translation>Hasło portfela zostało pomyślnie zmienione.</translation>
     </message>
+    <message>
+        <source>Passphrase change failed</source>
+        <translation>Zmiana hasła nie powiodła się</translation>
+    </message>
+    <message>
+        <source>The old passphrase entered for the wallet decryption is incorrect. It contains a null character (ie - a zero byte). If the passphrase was set with a version of this software prior to 23.0, please try again with only the characters up to — but not including — the first null character.</source>
+        <translation>Stare hasło wprowadzone do odszyfrowania portfela jest nieprawidłowe. Zawiera znak null (tj. bajt zerowy). Jeśli hasło zostało ustawione w wersji tego oprogramowania wcześniejszej niż 23.0, spróbuj ponownie używając tylko znaków do — ale nie włączając — pierwszego znaku null.</translation>
+    </message>
     <message>
         <source>Warning: The Caps Lock key is on!</source>
         <translation>Uwaga: Klawisz Caps Lock jest włączony!</translation>
@@ -392,10 +404,6 @@
         <source>&amp;Load PSBT from file…</source>
         <translation>&amp;Załaduj PSBT z pliku…</translation>
     </message>
-    <message>
-        <source>Load PSBT from clipboard…</source>
-        <translation>&amp;Załaduj PSBT ze schowka…</translation>
-    </message>
     <message>
         <source>&amp;Sending addresses</source>
         <translation>&amp;Adresy wysyłające</translation>
@@ -428,10 +436,6 @@
         <source>&amp;Window</source>
         <translation>&amp;Okno</translation>
     </message>
-    <message>
-        <source>Minimize</source>
-        <translation>Zminimalizuj</translation>
-    </message>
     <message>
         <source>Zoom</source>
         <translation>Powiększenie</translation>
@@ -484,14 +488,6 @@
         <source>Modify configuration options for %1</source>
         <translation>Zmień opcje konfiguracji dla %1</translation>
     </message>
-    <message>
-        <source>&amp;Show / Hide</source>
-        <translation>&amp;Pokaż / Ukryj</translation>
-    </message>
-    <message>
-        <source>Show or hide the main Window</source>
-        <translation>Pokazuje lub ukrywa główne okno</translation>
-    </message>
     <message>
         <source>Encrypt the private keys that belong to your wallet</source>
         <translation>Szyfruj klucze prywatne, dla twojego portfela</translation>
@@ -556,10 +552,6 @@
         <source>Show wallet repair options</source>
         <translation>Pokaż opcje naprawy portfela</translation>
     </message>
-    <message>
-        <source>Open Wallet &amp;Configuration File</source>
-        <translation>Otwórz Plik &amp;Konfiguracyjny Portfela</translation>
-    </message>
     <message>
         <source>Open configuration file</source>
         <translation>Otworz plik konfiguracji </translation>
@@ -614,10 +606,18 @@
         <source>Show information about %1</source>
         <translation>Pokaż informacje o %1</translation>
     </message>
+    <message>
+        <source>Load PSBT from &amp;clipboard…</source>
+        <translation>Załaduj PSBT ze &amp;schowka…</translation>
+    </message>
     <message>
         <source>Open debugging and diagnostic console</source>
         <translation>Otwórz debugowanie i konsolę diagnostyczną</translation>
     </message>
+    <message>
+        <source>Open &amp;wallet configuration file</source>
+        <translation>Otwórz plik &amp;konfiguracyjny portfela</translation>
+    </message>
     <message>
         <source>Open a dash: URI</source>
         <translation>Otwórz dash: URI</translation>
@@ -626,6 +626,16 @@
         <source>Create a new wallet</source>
         <translation>Stwórz nowy portfel</translation>
     </message>
+    <message>
+        <source>Restore Wallet…</source>
+        <extracomment>Name of the menu item that restores wallet from a backup file.</extracomment>
+        <translation>Przywróć portfel…</translation>
+    </message>
+    <message>
+        <source>Restore a wallet from a backup file</source>
+        <extracomment>Status tip for Restore Wallet menu item</extracomment>
+        <translation>Przywróć portfel z pliku kopii zapasowej</translation>
+    </message>
     <message>
         <source>Close all wallets</source>
         <translation>Zamknij wszystkie portfele</translation>
@@ -646,10 +656,34 @@
         <source>Mask the values in the Overview tab</source>
         <translation>Zamaskuj wartości na karcie Przegląd</translation>
     </message>
+    <message>
+        <source>Wallet Data</source>
+        <extracomment>Name of the wallet data file format.</extracomment>
+        <translation>Dane portfela</translation>
+    </message>
+    <message>
+        <source>Load Wallet Backup</source>
+        <extracomment>The title for Restore Wallet File Windows</extracomment>
+        <translation>Załaduj kopię zapasową portfela</translation>
+    </message>
+    <message>
+        <source>Restore Wallet</source>
+        <extracomment>Title of pop-up window shown when the user is attempting to restore a wallet.</extracomment>
+        <translation>Przywróć portfel</translation>
+    </message>
+    <message>
+        <source>Wallet Name</source>
+        <extracomment>Label of the input field where the name of the wallet is entered.</extracomment>
+        <translation>Nazwa portfela</translation>
+    </message>
     <message>
         <source>&amp;Settings</source>
         <translation>P&amp;referencje</translation>
     </message>
+    <message>
+        <source>&amp;Minimize</source>
+        <translation>&amp;Minimalizuj</translation>
+    </message>
     <message>
         <source>&amp;Help</source>
         <translation>Pomo&amp;c</translation>
@@ -666,6 +700,14 @@
         <source>View Governance Proposals</source>
         <translation>Zobacz wnioski dla nad którymi masternody mogą głosować</translation>
     </message>
+    <message>
+        <source>&amp;Hide</source>
+        <translation>&amp;Ukryj</translation>
+    </message>
+    <message>
+        <source>S&amp;how</source>
+        <translation>&amp;Pokaż</translation>
+    </message>
     <message numerus="yes">
         <source>%n active connection(s) to Dash network</source>
         <extracomment>A substring of the tooltip.</extracomment>
@@ -687,6 +729,14 @@
         <source>Close Wallet…</source>
         <translation>Zamknij Portfel…</translation>
     </message>
+    <message>
+        <source>Load Partially Signed Blockchain Transaction</source>
+        <translation>Ładuj Częściowo Podpisaną Transakcję Łańcucha Bloków</translation>
+    </message>
+    <message>
+        <source>Load Partially Signed Blockchain Transaction from clipboard</source>
+        <translation>Ładuj częściowo podpisaną transakcję łańcucha bloków z schowka</translation>
+    </message>
     <message>
         <source>Create Wallet…</source>
         <translation>Stwórz Portfel…</translation>
@@ -739,10 +789,6 @@
         <source>Processing blocks on disk…</source>
         <translation>Przetwarzanie bloków na dysku…</translation>
     </message>
-    <message>
-        <source>Reindexing blocks on disk…</source>
-        <translation>Ponowne indeksowanie bloków na dysku…</translation>
-    </message>
     <message>
         <source>Connecting to peers…</source>
         <translation>Łączenie z peerami</translation>
@@ -896,10 +942,6 @@
         <source>Coin Selection</source>
         <translation>Wybór Monet</translation>
     </message>
-    <message>
-        <source>Dust:</source>
-        <translation>Pył:</translation>
-    </message>
     <message>
         <source>After Fee:</source>
         <translation>Po opłacie:</translation>
@@ -1000,10 +1042,6 @@
         <source>Copy bytes</source>
         <translation>Skopiuj ilość bajtów</translation>
     </message>
-    <message>
-        <source>Copy dust</source>
-        <translation>Kopiuj pył (kwota poniżej 5460 duffów)</translation>
-    </message>
     <message>
         <source>Copy change</source>
         <translation>Skopiuj resztę</translation>
@@ -1016,18 +1054,6 @@
         <source>(%1 locked)</source>
         <translation>(%1 zablokowane)</translation>
     </message>
-    <message>
-        <source>yes</source>
-        <translation>tak</translation>
-    </message>
-    <message>
-        <source>no</source>
-        <translation>nie</translation>
-    </message>
-    <message>
-        <source>This label turns red if any recipient receives an amount smaller than the current dust threshold.</source>
-        <translation>Etykieta staje się czerwona, jeżeli któryś z odbiorców otrzymuje kwotę mniejszą niż obecna granica pyłu.</translation>
-    </message>
     <message>
         <source>Can vary +/- %1 duff(s) per input.</source>
         <translation>Może się różnić około +/- %1 duff(ów) na transację.</translation>
@@ -1241,18 +1267,102 @@
         <source>Filter proposal list</source>
         <translation>Filtruj listę wniosków</translation>
     </message>
+    <message>
+        <source>Masternode Count:</source>
+        <translation>Liczba masternodów:</translation>
+    </message>
+    <message>
+        <source>Number of masternodes this wallet can vote with (masternodes for which this wallet holds the voting key)</source>
+        <translation>Liczba masternodów, za pomocą których ten portfel może głosować (masternody, dla których ten portfel przechowuje klucz głosowania)</translation>
+    </message>
     <message>
         <source>Proposal Count:</source>
         <translation>Liczba Wniosków:</translation>
     </message>
+    <message>
+        <source>Create Proposal</source>
+        <translation>Utwórz wniosek</translation>
+    </message>
     <message>
         <source>Filter by Title</source>
         <translation>Filtruj Według Tytułu</translation>
     </message>
+    <message>
+        <source>Unavailable</source>
+        <translation>Niedostępne</translation>
+    </message>
+    <message>
+        <source>A synced node and an unlocked wallet are required.</source>
+        <translation>Wymagany jest zsynchronizowany węzeł i odblokowany portfel.</translation>
+    </message>
+    <message>
+        <source>Vote Yes</source>
+        <translation>Głosuj Za</translation>
+    </message>
+    <message>
+        <source>Vote No</source>
+        <translation>Głosuj Przeciw</translation>
+    </message>
+    <message>
+        <source>Vote Abstain</source>
+        <translation>Wstrzymaj się od głosu</translation>
+    </message>
     <message>
         <source>Proposal Info: %1</source>
         <translation>Informacje dotyczące wniosku: %1</translation>
     </message>
+    <message>
+        <source>Voting Failed</source>
+        <translation>Głosowanie nie powiodło się</translation>
+    </message>
+    <message>
+        <source>No wallet available.</source>
+        <translation>Brak dostępnego portfela.</translation>
+    </message>
+    <message>
+        <source>No masternode voting keys found in wallet.</source>
+        <translation>Nie znaleziono kluczy głosowania masternoda w portfelu.</translation>
+    </message>
+    <message>
+        <source>Please select a proposal to vote on.</source>
+        <translation>Wybierz wniosek do głosowania.</translation>
+    </message>
+    <message>
+        <source>Unable to unlock wallet.</source>
+        <translation>Nie można odblokować portfela.</translation>
+    </message>
+    <message>
+        <source>Unable to get masternode list. Please try again later.</source>
+        <translation>Nie można pobrać listy masternodów. Spróbuj ponownie później.</translation>
+    </message>
+    <message>
+        <source>Masternode %1 not found</source>
+        <translation>Nie znaleziono masternoda %1</translation>
+    </message>
+    <message>
+        <source>Failed to sign vote for masternode %1</source>
+        <translation>Nie udało się podpisać głosu dla masternoda %1</translation>
+    </message>
+    <message>
+        <source>Masternode %1: %2</source>
+        <translation>Masternode %1: %2</translation>
+    </message>
+    <message numerus="yes">
+        <source>Voted successfully %n time(s)</source>
+        <translation><numerusform>Pomyślnie zagłosowano %n raz</numerusform><numerusform>Pomyślnie zagłosowano %n razy</numerusform><numerusform>Pomyślnie zagłosowano %n razy</numerusform><numerusform>Pomyślnie zagłosowano %n razy</numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <source>Failed to vote %n time(s)</source>
+        <translation><numerusform>Nie udało się zagłosować %n raz</numerusform><numerusform>Nie udało się zagłosować %n razy</numerusform><numerusform>Nie udało się zagłosować %n razy</numerusform><numerusform>Nie udało się zagłosować %n razy</numerusform></translation>
+    </message>
+    <message>
+        <source>Errors:</source>
+        <translation>Błędy:</translation>
+    </message>
+    <message>
+        <source>Voting Results</source>
+        <translation>Wyniki głosowania</translation>
+    </message>
 </context>
 <context>
     <name>HelpMessageDialog</name>
@@ -1323,13 +1433,17 @@
         <source>Use a custom data directory:</source>
         <translation>Użyj wybranego folderu dla danych</translation>
     </message>
-    <message>
-        <source>(of %1 GB needed)</source>
-        <translation>(z %1 GB potrzebnych)</translation>
+    <message numerus="yes">
+        <source>%n GB of space available</source>
+        <translation><numerusform>%n GB dostępnego miejsca</numerusform><numerusform>%n GB dostępnego miejsca</numerusform><numerusform>%n GB dostępnego miejsca</numerusform><numerusform>%n GB dostępnego miejsca</numerusform></translation>
     </message>
-    <message>
-        <source>(%1 GB needed for full chain)</source>
-        <translation>(%1 GB potrzebne do pełnego łańcucha)</translation>
+    <message numerus="yes">
+        <source>(of %n GB needed)</source>
+        <translation><numerusform>(z %n GB potrzebnego)</numerusform><numerusform>(z %n GB potrzebnych)</numerusform><numerusform>(z %n GB potrzebnych)</numerusform><numerusform>(z %n GB potrzebnych)</numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <source>(%n GB needed for full chain)</source>
+        <translation><numerusform>(%n GB potrzebny dla pełnego łańcucha)</numerusform><numerusform>(%n GB potrzebne dla pełnego łańcucha)</numerusform><numerusform>(%n GB potrzebnych dla pełnego łańcucha)</numerusform><numerusform>(%n GB potrzebnych dla pełnego łańcucha)</numerusform></translation>
     </message>
     <message>
         <source>At least %1 GB of data will be stored in this directory, and it will grow over time.</source>
@@ -1361,6 +1475,13 @@
         <translation>Błąd</translation>
     </message>
 </context>
+<context>
+    <name>LoadWalletsActivity</name>
+    <message>
+        <source>Loading wallets…</source>
+        <translation>Ładowanie portfeli…</translation>
+    </message>
+</context>
 <context>
     <name>MasternodeList</name>
     <message>
@@ -1553,6 +1674,11 @@
         <source>URI:</source>
         <translation>URI:</translation>
     </message>
+    <message>
+        <source>Paste address from clipboard</source>
+        <extracomment>Tooltip text for button that allows you to paste an address that is in your clipboard.</extracomment>
+        <translation>Wklej adres ze schowka</translation>
+    </message>
 </context>
 <context>
     <name>OpenWalletActivity</name>
@@ -1663,6 +1789,16 @@
         <extracomment>An Options window setting to set subtracting the fee from a sending amount as default.</extracomment>
         <translation>Domyślnie odejmij &amp;opłatę od kwoty</translation>
     </message>
+    <message>
+        <source>Enable &amp;PSBT controls</source>
+        <extracomment>An options window setting to enable PSBT controls.</extracomment>
+        <translation>Włącz kontrole &amp;PSBT</translation>
+    </message>
+    <message>
+        <source>Whether to show PSBT controls.</source>
+        <extracomment>Tooltip text for options window setting that enables PSBT controls.</extracomment>
+        <translation>Czy pokazywać kontrole PSBT.</translation>
+    </message>
     <message>
         <source>Whether to keep the specified custom change address or not.</source>
         <translation>Czy zachować określony niestandardowy adres zmiany, czy nie.</translation>
@@ -1806,20 +1942,20 @@ https://explore.transifex.com/dash/dash/</source>
 https://explore.transifex.com/dash/dash/</translation>
     </message>
     <message>
-        <source>Options set in this dialog are overridden by the command line or in the configuration file:</source>
-        <translation>Opcje ustawione w tym oknie są zastępowane przez wiersz poleceń lub w pliku konfiguracyjnym:</translation>
+        <source>Third-party URLs (e.g. a block explorer) that appear in the transactions tab as context menu items.&lt;br/&gt;%s in the URL is replaced by transaction hash. Multiple URLs are separated by vertical bar |.</source>
+        <translation>Adresy URL stron trzecich (np. eksplorator bloków), które pojawiają się w zakładce transakcji jako elementy menu kontekstowego.&lt;br/&gt;%s w adresie URL jest zastępowane skrótem transakcji. Wiele adresów URL jest oddzielonych pionową kreską |.</translation>
     </message>
     <message>
-        <source>Minimize instead of exit the application when the window is closed. When this option is enabled, the application will be closed only after selecting Exit in the menu.</source>
-        <translation>Minimalizuje zamiast zakończyć działanie programu przy zamknięciu okna. Kiedy ta opcja jest włączona, program zakończy działanie po wybraniu Zamknij w menu.</translation>
+        <source>&amp;Third-party transaction URLs</source>
+        <translation>Adresy URL transakcji &amp;stron trzecich</translation>
     </message>
     <message>
-        <source>Third party URLs (e.g. a block explorer) that appear in the transactions tab as context menu items.&lt;br/&gt;%s in the URL is replaced by transaction hash. Multiple URLs are separated by vertical bar |.</source>
-        <translation>URL do zewnętrznych seriwsó(np. eksplorator bloków), które pojawiają się w zakładce transakcji jako pozycje w menu kontekstowym.&lt;br/&gt; %s w URL jest zastąpione przez hash transakcji. Wielokrotne URL są oddzielane przez pionową poprzeczkę |.</translation>
+        <source>Options set in this dialog are overridden by the command line or in the configuration file:</source>
+        <translation>Opcje ustawione w tym oknie są zastępowane przez wiersz poleceń lub w pliku konfiguracyjnym:</translation>
     </message>
     <message>
-        <source>&amp;Third party transaction URLs</source>
-        <translation>URL transakcji osób trzecich</translation>
+        <source>Minimize instead of exit the application when the window is closed. When this option is enabled, the application will be closed only after selecting Exit in the menu.</source>
+        <translation>Minimalizuje zamiast zakończyć działanie programu przy zamknięciu okna. Kiedy ta opcja jest włączona, program zakończy działanie po wybraniu Zamknij w menu.</translation>
     </message>
     <message>
         <source>Whether to show coin control features or not.</source>
@@ -1963,14 +2099,22 @@ https://explore.transifex.com/dash/dash/</translation>
     </message>
     <message>
         <source>Confirm options reset</source>
+        <extracomment>Window title text of pop-up window shown when the user has chosen to reset options.</extracomment>
         <translation>Potwierdź reset ustawień</translation>
     </message>
     <message>
         <source>Client restart required to activate changes.</source>
+        <extracomment>Text explaining that the settings changed will not come into effect until the client is restarted.</extracomment>
         <translation>Wymagany restart programu, aby uaktywnić zmiany.</translation>
     </message>
+    <message>
+        <source>Current settings will be backed up at "%1".</source>
+        <extracomment>Text explaining to the user that the client's current settings will be backed up at a specific location. %1 is a stand-in argument for the backup location's path.</extracomment>
+        <translation>Bieżące ustawienia zostaną utworzone jako kopia zapasowa w "%1".</translation>
+    </message>
     <message>
         <source>Client will be shut down. Do you want to proceed?</source>
+        <extracomment>Text asking the user to confirm if they would like to proceed with a client shutdown.</extracomment>
         <translation>Klient zostanie zamknięty. Kontynuować?</translation>
     </message>
     <message>
@@ -2243,6 +2387,10 @@ https://explore.transifex.com/dash/dash/</translation>
         <source>Failed to sign transaction: %1</source>
         <translation>Nie udało się podpisać transakcji: %1</translation>
     </message>
+    <message>
+        <source>Cannot sign inputs while wallet is locked.</source>
+        <translation>Nie można podpisać wejść, gdy portfel jest zablokowany.</translation>
+    </message>
     <message>
         <source>Could not sign any more inputs.</source>
         <translation>Nie można podpisać kolejnych wejść.</translation>
@@ -2487,6 +2635,181 @@ Z powodu zaniechania obsługi należy poprosić sprzedawcę o dostarczenie adres
         <translation>Status</translation>
     </message>
 </context>
+<context>
+    <name>ProposalWizard</name>
+    <message>
+        <source>Create Governance Proposal</source>
+        <translation>Utwórz wniosek governance</translation>
+    </message>
+    <message>
+        <source>Enter proposal details</source>
+        <translation>Wprowadź szczegóły wniosku</translation>
+    </message>
+    <message>
+        <source>A fee will be burned when you prepare the proposal.</source>
+        <translation>Opłata zostanie spalona podczas przygotowywania wniosku.</translation>
+    </message>
+    <message>
+        <source>Proposal &amp;name</source>
+        <translation>&amp;Nazwa wniosku</translation>
+    </message>
+    <message>
+        <source>&amp;Description URL</source>
+        <translation>URL &amp;opisu</translation>
+    </message>
+    <message>
+        <source>Payment &amp;address</source>
+        <translation>&amp;Adres płatności</translation>
+    </message>
+    <message>
+        <source>Payment &amp;amount</source>
+        <translation>&amp;Kwota płatności</translation>
+    </message>
+    <message>
+        <source>The amount to request in a single payment</source>
+        <translation>Kwota do zażądania w pojedynczej płatności</translation>
+    </message>
+    <message>
+        <source>&amp;First payment</source>
+        <translation>&amp;Pierwsza płatność</translation>
+    </message>
+    <message>
+        <source>Pa&amp;yments</source>
+        <translation>P&amp;łatności</translation>
+    </message>
+    <message>
+        <source>To&amp;tal amount</source>
+        <translation>Łączna &amp;kwota</translation>
+    </message>
+    <message>
+        <source>Proposal &amp;fee</source>
+        <translation>&amp;Opłata za wniosek</translation>
+    </message>
+    <message>
+        <source>Next</source>
+        <translation>Dalej</translation>
+    </message>
+    <message>
+        <source>Review proposal JSON and validate.</source>
+        <translation>Przejrzyj JSON wniosku i zwaliduj.</translation>
+    </message>
+    <message>
+        <source>Hex-encoded JSON</source>
+        <translation>JSON zakodowany w hex</translation>
+    </message>
+    <message>
+        <source>Back</source>
+        <translation>Wstecz</translation>
+    </message>
+    <message>
+        <source>Validate</source>
+        <translation>Zwaliduj</translation>
+    </message>
+    <message>
+        <source>Prepare (burn fee) and wait for confirmations.</source>
+        <translation>Przygotuj (spal opłatę) i poczekaj na potwierdzenia.</translation>
+    </message>
+    <message>
+        <source>Copy</source>
+        <translation>Kopiuj</translation>
+    </message>
+    <message>
+        <source>At 1/6 confirmations: can be relayed and queued. At 6/6: accepted and processed.</source>
+        <translation>Przy 1/6 potwierdzeniach: może być przekazany i umieszczony w kolejce. Przy 6/6: zaakceptowany i przetworzony.</translation>
+    </message>
+    <message>
+        <source>Confirmations progress</source>
+        <translation>Postęp potwierdzeń</translation>
+    </message>
+    <message>
+        <source>Shows progress toward the required number of confirmations for the proposal fee transaction.</source>
+        <translation>Pokazuje postęp w kierunku wymaganej liczby potwierdzeń dla transakcji opłaty wniosku.</translation>
+    </message>
+    <message>
+        <source>Estimated time remaining: -</source>
+        <translation>Szacowany pozostały czas: -</translation>
+    </message>
+    <message>
+        <source>Prepare Proposal</source>
+        <translation>Przygotuj wniosek</translation>
+    </message>
+    <message>
+        <source>You can submit after 1 confirmation. At 6 confirmations it is accepted and processed.</source>
+        <translation>Możesz przesłać po 1 potwierdzeniu. Przy 6 potwierdzeniach jest zaakceptowany i przetworzony.</translation>
+    </message>
+    <message>
+        <source>Proposal ID:</source>
+        <translation>ID wniosku:</translation>
+    </message>
+    <message>
+        <source>Submit Proposal</source>
+        <translation>Prześlij wniosek</translation>
+    </message>
+    <message>
+        <source>Close</source>
+        <translation>Zamknij</translation>
+    </message>
+    <message>
+        <source>Valid</source>
+        <translation>Ważny</translation>
+    </message>
+    <message>
+        <source>Invalid: %1</source>
+        <translation>Nieprawidłowy: %1</translation>
+    </message>
+    <message>
+        <source>Burn %1</source>
+        <translation>Spal %1</translation>
+    </message>
+    <message>
+        <source>Burn %1 to create the fee transaction?</source>
+        <translation>Spalić %1, aby utworzyć transakcję opłaty?</translation>
+    </message>
+    <message>
+        <source>Prepare failed</source>
+        <translation>Przygotowanie nie powiodło się</translation>
+    </message>
+    <message>
+        <source>Confirmations: %1 / %2 required</source>
+        <translation>Potwierdzenia: %1 / %2 wymagane</translation>
+    </message>
+    <message>
+        <source>Estimated time remaining: Ready</source>
+        <translation>Szacowany pozostały czas: Gotowe</translation>
+    </message>
+    <message numerus="yes">
+        <source>Estimated time remaining: %n minute(s)</source>
+        <translation><numerusform>Szacowany pozostały czas: %n minuta</numerusform><numerusform>Szacowany pozostały czas: %n minuty</numerusform><numerusform>Szacowany pozostały czas: %n minut</numerusform><numerusform>Szacowany pozostały czas: %n minut</numerusform></translation>
+    </message>
+    <message>
+        <source>Your proposal was submitted successfully.</source>
+        <translation>Twój wniosek został pomyślnie przesłany.</translation>
+    </message>
+    <message>
+        <source>Already submitted</source>
+        <translation>Już przesłano</translation>
+    </message>
+    <message>
+        <source>This proposal has already been submitted.</source>
+        <translation>Ten wniosek został już przesłany.</translation>
+    </message>
+    <message>
+        <source>Submission failed</source>
+        <translation>Przesłanie nie powiodło się</translation>
+    </message>
+    <message>
+        <source>Proposal submitted</source>
+        <translation>Wniosek przesłany</translation>
+    </message>
+    <message>
+        <source>A fee of %1 will be burned when you prepare the proposal.</source>
+        <translation>Opłata w wysokości %1 zostanie spalona podczas przygotowywania wniosku.</translation>
+    </message>
+    <message>
+        <source>Prepare (burn %1) and wait for %2 confirmations.</source>
+        <translation>Przygotuj (spal %1) i poczekaj na %2 potwierdzeń.</translation>
+    </message>
+</context>
 <context>
     <name>QObject</name>
     <message>
@@ -2877,8 +3200,12 @@ Z powodu zaniechania obsługi należy poprosić sprzedawcę o dostarczenie adres
         <translation>Wersja</translation>
     </message>
     <message>
-        <source>Whether the peer requested us to relay transactions.</source>
-        <translation>Czy peer zażądał przekazywania transakcji</translation>
+        <source>High bandwidth BIP152 compact block relay: %1</source>
+        <translation>Kompaktowy przekaźnik blokowy BIP152 o dużej przepustowości: %1</translation>
+    </message>
+    <message>
+        <source>High Bandwidth</source>
+        <translation>Duża Przepustowość</translation>
     </message>
     <message>
         <source>Starting Block</source>
@@ -2900,10 +3227,23 @@ Z powodu zaniechania obsługi należy poprosić sprzedawcę o dostarczenie adres
         <source>Last Block</source>
         <translation>Ostatni Blok</translation>
     </message>
+    <message>
+        <source>Elapsed time since a novel transaction accepted into our mempool was received from this peer.</source>
+        <extracomment>Tooltip text for the Last Transaction field in the peer details area.</extracomment>
+        <translation>Czas, który upłynął od momentu odebrania od tego partnera nowej transakcji zaakceptowanej do naszej puli pamięci.</translation>
+    </message>
     <message>
         <source>Last Transaction</source>
         <translation>Ostatnia Transakcja</translation>
     </message>
+    <message>
+        <source>The mapped Autonomous System used for diversifying peer selection.</source>
+        <translation>Zmapowany Autonomiczny System służący do zróżnicowania doboru peerów.</translation>
+    </message>
+    <message>
+        <source>Mapped AS</source>
+        <translation>Zmapowane AS</translation>
+    </message>
     <message>
         <source>Whether we relay addresses to this peer.</source>
         <extracomment>Tooltip text for the Address Relay field in the peer details area, which displays whether we relay addresses to this peer (Yes/No).</extracomment>
@@ -2964,6 +3304,14 @@ Z powodu zaniechania obsługi należy poprosić sprzedawcę o dostarczenie adres
         <source>To specify a non-default location of the blocks directory use the '%1' option.</source>
         <translation>Aby określić inną niż domyślną lokalizację katalogu bloków, użyj opcji "%1".</translation>
     </message>
+    <message>
+        <source>Local Addresses</source>
+        <translation>Adresy lokalne</translation>
+    </message>
+    <message>
+        <source>Network addresses that your Dash node is currently using to communicate with other nodes.</source>
+        <translation>Adresy sieciowe, których węzeł Dash aktualnie używa do komunikacji z innymi węzłami.</translation>
+    </message>
     <message>
         <source>Number of regular Masternodes</source>
         <translation>Liczba zwykłych Masternodów</translation>
@@ -3036,14 +3384,34 @@ Z powodu zaniechania obsługi należy poprosić sprzedawcę o dostarczenie adres
         <source>Session ID</source>
         <translation>Sesja ID</translation>
     </message>
+    <message>
+        <source>The network protocol this peer is connected through: IPv4, IPv6, Onion, I2P, or CJDNS.</source>
+        <translation>Protokół sieciowy, przez który ten węzeł jest połączony: IPv4, IPv6, Onion, I2P lub CJDNS.</translation>
+    </message>
     <message>
         <source>Permissions</source>
         <translation>Pozwolenia</translation>
     </message>
+    <message>
+        <source>The direction and type of peer connection: %1</source>
+        <translation>Kierunek i typ połączenia z węzłem: %1</translation>
+    </message>
+    <message>
+        <source>Direction/Type</source>
+        <translation>Kierunek/Rodzaj</translation>
+    </message>
     <message>
         <source>Services</source>
         <translation>Usługi</translation>
     </message>
+    <message>
+        <source>Whether we relay transactions to this peer.</source>
+        <translation>Czy przekazujemy transakcje do tego peera.</translation>
+    </message>
+    <message>
+        <source>Transaction Relay</source>
+        <translation>Przekazywanie transakcji</translation>
+    </message>
     <message>
         <source>Connection Time</source>
         <translation>Czas Połączenia</translation>
@@ -3080,6 +3448,16 @@ Z powodu zaniechania obsługi należy poprosić sprzedawcę o dostarczenie adres
         <source>&amp;Wallet Repair</source>
         <translation>&amp;Naprawa portfela</translation>
     </message>
+    <message>
+        <source>The total number of addresses received from this peer that were processed (excludes addresses that were dropped due to rate-limiting).</source>
+        <extracomment>Tooltip text for the Addresses Processed field in the peer details area, which displays the total number of addresses received from this peer that were processed (excludes addresses that were dropped due to rate-limiting).</extracomment>
+        <translation>Łączna liczba adresów otrzymanych od tego węzła, które zostały przetworzone (wyklucza adresy, które zostały odrzucone z powodu ograniczania).</translation>
+    </message>
+    <message>
+        <source>The total number of addresses received from this peer that were dropped (not processed) due to rate-limiting.</source>
+        <extracomment>Tooltip text for the Addresses Rate-Limited field in the peer details area, which displays the total number of addresses received from this peer that were dropped (not processed) due to rate-limiting.</extracomment>
+        <translation>Łączna liczba adresów otrzymanych od tego węzła, które zostały odrzucone (nieprzetworzone) z powodu ograniczania.</translation>
+    </message>
     <message>
         <source>Wallet repair options.</source>
         <translation>Opcje naprawy portfela.</translation>
@@ -3093,17 +3471,59 @@ Z powodu zaniechania obsługi należy poprosić sprzedawcę o dostarczenie adres
         <translation>reindex: Odtwórz index łańcucha bloków z najnowszego pliku blk000??.dat </translation>
     </message>
     <message>
-        <source>To</source>
-        <translation>Do</translation>
+        <source>Inbound: initiated by peer</source>
+        <extracomment>Explanatory text for an inbound peer connection.</extracomment>
+        <translation>Przychodzące: zainicjowane przez węzeł</translation>
     </message>
     <message>
-        <source>From</source>
-        <translation>Z</translation>
+        <source>Outbound Full Relay: default</source>
+        <extracomment>Explanatory text for an outbound peer connection that relays all network information. This is the default behavior for outbound connections.</extracomment>
+        <translation>Pełne przekazywanie wychodzące: domyślne</translation>
     </message>
     <message>
-        <source>No</source>
+        <source>Outbound Block Relay: does not relay transactions or addresses</source>
+        <extracomment>Explanatory text for an outbound peer connection that relays network information about blocks and not transactions or addresses.</extracomment>
+        <translation>Wysyłanie bloków wychodzących: nie przekazuje transakcji ani adresów</translation>
+    </message>
+    <message>
+        <source>Outbound Manual: added using RPC %1 or %2/%3 configuration options</source>
+        <extracomment>Explanatory text for an outbound peer connection that was established manually through one of several methods. The numbered arguments are stand-ins for the methods available to establish manual connections.</extracomment>
+        <translation>Ręczne wysyłanie wychodzące: dodane za pomocą RPC %1 lub opcji konfiguracyjnych %2/%3</translation>
+    </message>
+    <message>
+        <source>Outbound Feeler: short-lived, for testing addresses</source>
+        <extracomment>Explanatory text for a short-lived outbound peer connection that is used to test the aliveness of known addresses.</extracomment>
+        <translation>Testowanie połączenia wychodzącego: krótkotrwałe, do testowania adresów</translation>
+    </message>
+    <message>
+        <source>Outbound Address Fetch: short-lived, for soliciting addresses</source>
+        <extracomment>Explanatory text for a short-lived outbound peer connection that is used to request addresses from a peer.</extracomment>
+        <translation>Pobieranie adresów wychodzących: krótkotrwałe, do pobierania adresów</translation>
+    </message>
+    <message>
+        <source>To</source>
+        <translation>Do</translation>
+    </message>
+    <message>
+        <source>we selected the peer for high bandwidth relay</source>
+        <translation>wybraliśmy peer'a dla przekazu o dużej przepustowości</translation>
+    </message>
+    <message>
+        <source>From</source>
+        <translation>Z</translation>
+    </message>
+    <message>
+        <source>the peer selected us for high bandwidth relay</source>
+        <translation>peer wybrał nas do przekazu o dużej przepustowości</translation>
+    </message>
+    <message>
+        <source>No</source>
         <translation>Nie</translation>
     </message>
+    <message>
+        <source>no high bandwidth relay selected</source>
+        <translation>nie wybrano przekazu o dużej przepustowości</translation>
+    </message>
     <message>
         <source>&amp;Disconnect</source>
         <translation>&amp;Rozłącz</translation>
@@ -3140,6 +3560,10 @@ Z powodu zaniechania obsługi należy poprosić sprzedawcę o dostarczenie adres
         <source>Network activity disabled</source>
         <translation>Aktywność sieci jest wyłączona</translation>
     </message>
+    <message>
+        <source>None</source>
+        <translation>Brak</translation>
+    </message>
     <message>
         <source>Total: %1 (Enabled: %2)</source>
         <translation>Wszystkich: %1 (Włączonych: %2)</translation>
@@ -3192,6 +3616,21 @@ Z powodu zaniechania obsługi należy poprosić sprzedawcę o dostarczenie adres
         <source>Executing command using "%1" wallet</source>
         <translation>Wykonywanie polecenia używając portfel "%1"</translation>
     </message>
+    <message>
+        <source>detecting: peer could be v1 or v2</source>
+        <extracomment>Explanatory text for "detecting" transport type.</extracomment>
+        <translation>wykrywanie: peer może być w wersji v1 lub v2</translation>
+    </message>
+    <message>
+        <source>v1: unencrypted, plaintext transport protocol</source>
+        <extracomment>Explanatory text for v1 transport type.</extracomment>
+        <translation>v1: niezaszyfrowany, protokół transportu w postaci tekstu</translation>
+    </message>
+    <message>
+        <source>v2: BIP324 encrypted transport protocol</source>
+        <extracomment>Explanatory text for v2 transport type.</extracomment>
+        <translation>v2: zaszyfrowany protokół transportu zgodny z BIP324</translation>
+    </message>
     <message>
         <source>&amp;Copy address</source>
         <extracomment>Context menu action to copy the address of a peer</extracomment>
@@ -3201,11 +3640,36 @@ Z powodu zaniechania obsługi należy poprosić sprzedawcę o dostarczenie adres
         <source>1 d&amp;ay</source>
         <translation>1 d&amp;zień</translation>
     </message>
+    <message>
+        <source>&amp;Copy IP/Netmask</source>
+        <extracomment>Context menu action to copy the IP/Netmask of a banned peer. IP/Netmask is the combination of a peer's IP address and its Netmask. For IP address see: https://en.wikipedia.org/wiki/IP_address</extracomment>
+        <translation>&amp;Skopiuj IP/Maskę sieci</translation>
+    </message>
+    <message>
+        <source>Welcome to the %1 RPC console.
+Use up and down arrows to navigate history, and %2 to clear screen.
+Use %3 and %4 to increase or decrease the font size.
+Type %5 for an overview of available commands.
+For more information on using this console, type %6.
+
+%7WARNING: Scammers have been active, telling users to type commands here, stealing their wallet contents. Do not use this console without fully understanding the ramifications of a command.%8</source>
+        <extracomment>RPC console welcome message. Placeholders %7 and %8 are style tags for the warning content, and they are not space separated from the rest of the text intentionally.</extracomment>
+        <translation>Witaj w konsoli RPC %1.
+Użyj strzałek w górę i w dół, aby nawigować po historii, oraz %2, aby wyczyścić ekran.
+Użyj %3 i %4, aby zwiększyć lub zmniejszyć rozmiar czcionki.
+Wpisz %5, aby uzyskać przegląd dostępnych poleceń.
+Aby uzyskać więcej informacji na temat korzystania z tej konsoli, wpisz %6.
+%7OSTRZEŻENIE: Oszuści byli aktywni, mówiąc użytkownikom, aby wpisywali polecenia tutaj, kradnąc zawartość ich portfeli. Nie używaj tej konsoli, bez pełnego zrozumienia konsekwencji polecenia.%8</translation>
+    </message>
     <message>
         <source>Executing…</source>
         <extracomment>A console message indicating an entered command is currently being executed.</extracomment>
         <translation>Wykonuje...</translation>
     </message>
+    <message>
+        <source>(peer: %1)</source>
+        <translation>(peer: %1)</translation>
+    </message>
     <message>
         <source>via %1</source>
         <translation>przez %1</translation>
@@ -3344,6 +3808,10 @@ Z powodu zaniechania obsługi należy poprosić sprzedawcę o dostarczenie adres
 </context>
 <context>
     <name>ReceiveRequestDialog</name>
+    <message>
+        <source>Request payment to …</source>
+        <translation>Żądanie płatności do …</translation>
+    </message>
     <message>
         <source>Address:</source>
         <translation>Adres:</translation>
@@ -3416,6 +3884,34 @@ Z powodu zaniechania obsługi należy poprosić sprzedawcę o dostarczenie adres
         <translation>Zażądano</translation>
     </message>
 </context>
+<context>
+    <name>RestoreWalletActivity</name>
+    <message>
+        <source>Restore Wallet</source>
+        <extracomment>Title of progress window which is displayed when wallets are being restored.</extracomment>
+        <translation>Przywróć portfel</translation>
+    </message>
+    <message>
+        <source>Restoring Wallet &lt;b&gt;%1&lt;/b&gt;…</source>
+        <extracomment>Descriptive text of the restore wallets progress window which indicates to the user that wallets are currently being restored.</extracomment>
+        <translation>Przywracanie portfela &lt;b&gt;%1&lt;/b&gt;…</translation>
+    </message>
+    <message>
+        <source>Restore wallet failed</source>
+        <extracomment>Title of message box which is displayed when the wallet could not be restored.</extracomment>
+        <translation>Przywracanie portfela nie powiodło się</translation>
+    </message>
+    <message>
+        <source>Restore wallet warning</source>
+        <extracomment>Title of message box which is displayed when the wallet is restored with some warning.</extracomment>
+        <translation>Ostrzeżenie przywracania portfela</translation>
+    </message>
+    <message>
+        <source>Restore wallet message</source>
+        <extracomment>Title of message box which is displayed when the wallet is successfully restored.</extracomment>
+        <translation>Komunikat przywracania portfela</translation>
+    </message>
+</context>
 <context>
     <name>SendCoinsDialog</name>
     <message>
@@ -3450,10 +3946,6 @@ Z powodu zaniechania obsługi należy poprosić sprzedawcę o dostarczenie adres
         <source>Fee:</source>
         <translation>Opłata:</translation>
     </message>
-    <message>
-        <source>Dust:</source>
-        <translation>Pył</translation>
-    </message>
     <message>
         <source>Inputs…</source>
         <translation>Wejścia…</translation>
@@ -3578,10 +4070,6 @@ Z powodu zaniechania obsługi należy poprosić sprzedawcę o dostarczenie adres
         <source>Copy bytes</source>
         <translation>Skopiuj ilość bajtów</translation>
     </message>
-    <message>
-        <source>Copy dust</source>
-        <translation>skopiuj drobne (poniżej 5460 duffów)</translation>
-    </message>
     <message>
         <source>Copy change</source>
         <translation>Skopiuj resztę</translation>
@@ -3598,10 +4086,6 @@ Z powodu zaniechania obsługi należy poprosić sprzedawcę o dostarczenie adres
         <source>%1 to %2</source>
         <translation>%1 do %2</translation>
     </message>
-    <message>
-        <source>Are you sure you want to send?</source>
-        <translation>Czy na pewno chcesz wysłać?</translation>
-    </message>
     <message>
         <source>&lt;b&gt;(%1 of %2 entries displayed)&lt;/b&gt;</source>
         <translation>&lt;b&gt;(%1 z %2 wyświetlonych wpisów)&lt;/b&gt;</translation>
@@ -3626,10 +4110,6 @@ Z powodu zaniechania obsługi należy poprosić sprzedawcę o dostarczenie adres
         <source>%1 to '%2'</source>
         <translation>%1 do '%2'</translation>
     </message>
-    <message>
-        <source>Do you want to draft this transaction?</source>
-        <translation>Czy chcesz sporządzić projekt tej transakcji?</translation>
-    </message>
     <message>
         <source>%1 funds only</source>
         <translation>Tylko fundusze %1</translation>
@@ -3679,25 +4159,50 @@ Z powodu zaniechania obsługi należy poprosić sprzedawcę o dostarczenie adres
         <translation>Potwierdź wysyłanie monet</translation>
     </message>
     <message>
-        <source>Confirm transaction proposal</source>
-        <translation>Potwierdź propozycję transakcji</translation>
+        <source>Save Transaction Data</source>
+        <translation>Zapisz Dane Transakcji</translation>
     </message>
     <message>
-        <source>Create Unsigned</source>
-        <translation>Stwórz Niepodpisany</translation>
+        <source>PSBT saved</source>
+        <translation>PSBT zapisany</translation>
     </message>
     <message>
-        <source>Save Transaction Data</source>
-        <translation>Zapisz Dane Transakcji</translation>
+        <source>Watch-only balance:</source>
+        <translation>Saldo tylko do odczytu:</translation>
     </message>
     <message>
-        <source>Send</source>
-        <translation>Wyślij</translation>
+        <source>Creates a Partially Signed Blockchain Transaction (PSBT) for use with e.g. an offline %1 wallet, or a PSBT-compatible hardware wallet.</source>
+        <translation>Tworzy Częściowo Podpisaną Transakcję Blockchain (PSBT) do użycia z np. portfelem offline %1 lub zgodnym z PSBT portfelem sprzętowym.</translation>
+    </message>
+    <message>
+        <source>Do you want to create this transaction?</source>
+        <extracomment>Message displayed when attempting to create a transaction. Cautionary text to prompt the user to verify that the displayed transaction details represent the transaction the user intends to create.</extracomment>
+        <translation>Czy chcesz utworzyć tę transakcję?</translation>
+    </message>
+    <message>
+        <source>Please, review your transaction proposal. This will produce a Partially Signed Blockchain Transaction (PSBT) which you can save or copy and then sign with e.g. an offline %1 wallet, or a PSBT-compatible hardware wallet.</source>
+        <extracomment>Text to inform a user attempting to create a transaction of their current options. At this stage, a user can only create a PSBT. This string is displayed when private keys are disabled and an external signer is not available.</extracomment>
+        <translation>Proszę przejrzeć propozycję transakcji. Spowoduje to utworzenie Częściowo Podpisanej Transakcji Blockchain (PSBT), którą możesz zapisać lub skopiować, a następnie podpisać np. za pomocą portfela offline %1 lub portfela sprzętowego zgodnego z PSBT.</translation>
+    </message>
+    <message>
+        <source>Please, review your transaction. You can create and send this transaction or create a Partially Signed Blockchain Transaction (PSBT), which you can save or copy and then sign with, e.g., an offline %1 wallet, or a PSBT-compatible hardware wallet.</source>
+        <extracomment>Text to inform a user attempting to create a transaction of their current options. At this stage, a user can send their transaction or create a PSBT. This string is displayed when both private keys and PSBT controls are enabled.</extracomment>
+        <translation>Proszę przejrzeć transakcję. Możesz utworzyć i wysłać tę transakcję lub utworzyć Częściowo Podpisaną Transakcję Blockchain (PSBT), którą możesz zapisać lub skopiować, a następnie podpisać np. za pomocą portfela offline %1 lub portfela sprzętowego zgodnego z PSBT.</translation>
+    </message>
+    <message>
+        <source>Please, review your transaction.</source>
+        <extracomment>Text to prompt a user to review the details of the transaction they are attempting to send.</extracomment>
+        <translation>Proszę przejrzeć transakcję.</translation>
     </message>
     <message>
         <source>To review recipient list click "Show Details…"</source>
         <translation>Aby przejrzeć listę odbiorców, kliknij „Pokaż szczegóły…”</translation>
     </message>
+    <message>
+        <source>Partially Signed Transaction (Binary)</source>
+        <extracomment>Expanded name of the binary PSBT file format. See: BIP 174.</extracomment>
+        <translation>Częściowo Podpisana Transakcja (Binarna)</translation>
+    </message>
     <message>
         <source>The recipient address is not valid. Please recheck.</source>
         <translation>Adres odbiorcy jest nieprawidłowy, proszę poprawić.</translation>
@@ -3817,21 +4322,16 @@ Z powodu zaniechania obsługi należy poprosić sprzedawcę o dostarczenie adres
         <source>A message that was attached to the dash: URI which will be stored with the transaction for your reference. Note: This message will not be sent over the Dash network.</source>
         <translation>Wiadomość, która została dołączona do dash: Link, który zostanie zapisany wraz z transakcją do wglądu w przyszłości. Zauważ, że sama wiadomość nie zostanie wysłana przez sieć Dash.</translation>
     </message>
+</context>
+<context>
+    <name>SendConfirmationDialog</name>
     <message>
-        <source>This is an unauthenticated payment request.</source>
-        <translation>To żądane zapłaty nie zostało uwierzytelnione.</translation>
-    </message>
-    <message>
-        <source>This is an authenticated payment request.</source>
-        <translation>To żądanie zapłaty jest uwierzytelnione.</translation>
-    </message>
-    <message>
-        <source>Pay To:</source>
-        <translation>Wpłać do:</translation>
+        <source>Send</source>
+        <translation>Wyślij</translation>
     </message>
     <message>
-        <source>Memo:</source>
-        <translation>Notatka:</translation>
+        <source>Create Unsigned</source>
+        <translation>Utwórz niepodpisaną</translation>
     </message>
 </context>
 <context>
@@ -4010,6 +4510,10 @@ Z powodu zaniechania obsługi należy poprosić sprzedawcę o dostarczenie adres
 </context>
 <context>
     <name>SplashScreen</name>
+    <message>
+        <source>(press q to shutdown and continue later)</source>
+        <translation>(wciśnij q aby zamknąć i kontynuować później)</translation>
+    </message>
     <message>
         <source>press q to shutdown</source>
         <translation>Wciśnij q aby zamknąć</translation>
@@ -4036,20 +4540,9 @@ Z powodu zaniechania obsługi należy poprosić sprzedawcę o dostarczenie adres
 </context>
 <context>
     <name>TransactionDesc</name>
-    <message numerus="yes">
-        <source>Open for %n more block(s)</source>
-        <translation><numerusform>Otwórz na %n dodatkowy blok</numerusform><numerusform>Otwórz na %n dodatkowe bloki</numerusform><numerusform>Otwórz na %n dodatkowych bloków</numerusform><numerusform>Otwórz na %n dodatkowych bloków</numerusform></translation>
-    </message>
-    <message>
-        <source>Open until %1</source>
-        <translation>Otwórz do %1</translation>
-    </message>
-    <message>
-        <source>conflicted</source>
-        <translation>konflikt</translation>
-    </message>
     <message>
         <source>0/unconfirmed, %1</source>
+        <extracomment>Text explaining the current status of a transaction, shown in the status field of the details window for this transaction. This status represents an unconfirmed transaction that is in the memory pool.</extracomment>
         <translation>0/niepotwierdzone, %1</translation>
     </message>
     <message>
@@ -4062,22 +4555,32 @@ Z powodu zaniechania obsługi należy poprosić sprzedawcę o dostarczenie adres
     </message>
     <message>
         <source>abandoned</source>
+        <extracomment>Text explaining the current status of a transaction, shown in the status field of the details window for this transaction. This status represents an abandoned transaction.</extracomment>
         <translation>porzucony</translation>
     </message>
+    <message>
+        <source>conflicted with a transaction with %1 confirmations</source>
+        <extracomment>Text explaining the current status of a transaction, shown in the status field of the details window for this transaction. This status represents an unconfirmed transaction that conflicts with a confirmed transaction.</extracomment>
+        <translation>konflikt z transakcją z %1 potwierdzeniami</translation>
+    </message>
     <message>
         <source>%1/unconfirmed</source>
+        <extracomment>Text explaining the current status of a transaction, shown in the status field of the details window for this transaction. This status represents a transaction confirmed in at least one block, but less than 6 blocks, and still not locked via ChainLocks.</extracomment>
         <translation>%1/niezatwierdzone</translation>
     </message>
     <message>
         <source>%1 confirmations</source>
+        <extracomment>Text explaining the current status of a transaction, shown in the status field of the details window for this transaction. This status represents a transaction confirmed in 6 or more blocks or locked via ChainLocks.</extracomment>
         <translation>%1 potwierdzeń</translation>
     </message>
     <message>
         <source>locked via ChainLocks</source>
-        <translation>zablokowane przez ChainLocs</translation>
+        <extracomment>Text explaining the current status of a transaction, shown in the status field of the details window for this transaction. This status represents a transaction confirmed in at least one block and has been locked by ChainLocks.</extracomment>
+        <translation>zablokowane przez ChainLocks</translation>
     </message>
     <message>
         <source>verified via InstantSend</source>
+        <extracomment>Text explaining the current status of a transaction, shown in the status field of the details window for this transaction. This status represents an unconfirmed transaction that has been locked by InstantSend.</extracomment>
         <translation>zweryfikowane przez InstantSend</translation>
     </message>
     <message>
@@ -4230,14 +4733,6 @@ Z powodu zaniechania obsługi należy poprosić sprzedawcę o dostarczenie adres
         <source>Address / Label</source>
         <translation>Adres / Etykieta</translation>
     </message>
-    <message numerus="yes">
-        <source>Open for %n more block(s)</source>
-        <translation><numerusform>Otwórz na %n dodatkowy blok</numerusform><numerusform>Otwórz na %n dodatkowe bloki</numerusform><numerusform>Otwórz na %n dodatkowych bloków</numerusform><numerusform>Otwórz na %n dodatkowych bloków</numerusform></translation>
-    </message>
-    <message>
-        <source>Open until %1</source>
-        <translation>Otwórz do %1</translation>
-    </message>
     <message>
         <source>Unconfirmed</source>
         <translation>Niepotwierdzone:</translation>
@@ -4272,7 +4767,7 @@ Z powodu zaniechania obsługi należy poprosić sprzedawcę o dostarczenie adres
     </message>
     <message>
         <source>locked via ChainLocks</source>
-        <translation>zablokowane przez ChainLocs</translation>
+        <translation>zablokowane przez ChainLocks</translation>
     </message>
     <message>
         <source>Received with</source>
@@ -4489,10 +4984,20 @@ Z powodu zaniechania obsługi należy poprosić sprzedawcę o dostarczenie adres
         <source>Show address &amp;QR code</source>
         <translation>Pokaż &amp;QR kod adresu</translation>
     </message>
+    <message>
+        <source>Show in %1</source>
+        <extracomment>Transactions table context menu action to show the selected transaction in a third-party block explorer. %1 is a stand-in argument for the URL of the explorer.</extracomment>
+        <translation>Pokaż w %1</translation>
+    </message>
     <message>
         <source>Export Transaction History</source>
         <translation>Eksport historii transakcji</translation>
     </message>
+    <message>
+        <source>Comma separated file</source>
+        <extracomment>Expanded name of the CSV file format. See: https://en.wikipedia.org/wiki/Comma-separated_values.</extracomment>
+        <translation>Plik rozdzielony przecinkami</translation>
+    </message>
     <message>
         <source>Confirmed</source>
         <translation>Potwierdzony</translation>
@@ -4598,6 +5103,10 @@ Przejdź do Plik &gt; Otwórz portfel, aby załadować portfel.
         <source>Error</source>
         <translation>Błąd</translation>
     </message>
+    <message>
+        <source>Unable to decode PSBT from clipboard (invalid base64)</source>
+        <translation>Nie można odkodować PSBT ze schowka (nieprawidłowy base64)</translation>
+    </message>
     <message>
         <source>Load Transaction Data</source>
         <translation>Załaduj Dane Transakcji</translation>
@@ -4606,7 +5115,15 @@ Przejdź do Plik &gt; Otwórz portfel, aby załadować portfel.
         <source>Partially Signed Transaction (*.psbt)</source>
         <translation>Częściowo Podpisana Transakcja (.psbt)</translation>
     </message>
-    </context>
+    <message>
+        <source>PSBT file must be smaller than 100 MiB</source>
+        <translation>Plik PSBT musi być mniejszy niż 100 MiB</translation>
+    </message>
+    <message>
+        <source>Unable to decode PSBT</source>
+        <translation>Nie można odkodować PSBT</translation>
+    </message>
+</context>
 <context>
     <name>WalletModel</name>
     <message>
@@ -4632,6 +5149,11 @@ Przejdź do Plik &gt; Otwórz portfel, aby załadować portfel.
         <source>Selected amount:</source>
         <translation>Zaznaczona ilość:</translation>
     </message>
+    <message>
+        <source>Wallet Data</source>
+        <extracomment>Name of the wallet data file format.</extracomment>
+        <translation>Dane portfela</translation>
+    </message>
     <message>
         <source>Backup Wallet</source>
         <translation>Kopia Zapasowa Portfela</translation>
@@ -4659,10 +5181,6 @@ Przejdź do Plik &gt; Otwórz portfel, aby załadować portfel.
 </context>
 <context>
     <name>dash-core</name>
-    <message>
-        <source>Fee estimation failed. Fallbackfee is disabled. Wait a few blocks or enable -fallbackfee.</source>
-        <translation>Oszacowanie opłaty nie powiodło się. Opłata domyślna jest wyłączona. Poczekaj kilka bloków lub włącz -fallbackfee.</translation>
-    </message>
     <message>
         <source>This error could occur if this wallet was not shutdown cleanly and was last loaded using a build with a newer version of Berkeley DB. If so, please use the software that last loaded this wallet</source>
         <translation>Ten błąd mógł wystąpić, jeśli portfel nie został poprawnie zamknięty i został ostatnio załadowany przy użyciu kompilacji z nowszą wersją Berkeley DB. Jeśli tak, użyj oprogramowania, które ostatnio załadowało ten portfel</translation>
@@ -4720,12 +5238,20 @@ Przejdź do Plik &gt; Otwórz portfel, aby załadować portfel.
         <translation>Błąd odczytu bazy danych, następuje zamknięcie.</translation>
     </message>
     <message>
-        <source>Failed to listen on any port. Use -listen=0 if you want this.</source>
-        <translation>Nie powiódł się nasłuch żadnego z portów. Użyj -listen=0 jeśli chcesz.</translation>
+        <source>Error: Missing checksum</source>
+        <translation>Błąd: Brak sumy kontrolnej</translation>
+    </message>
+    <message>
+        <source>Error: Unable to parse version %u as a uint32_t</source>
+        <translation>Błąd: Nie można przeanalizować wersji %u jako uint32_t</translation>
+    </message>
+    <message>
+        <source>Error: Unable to write record to new wallet</source>
+        <translation>Błąd: Nie można zapisać rekordu do nowego portfela</translation>
     </message>
     <message>
-        <source>-maxtxfee is set very high! Fees this large could be paid on a single transaction.</source>
-        <translation>-maxtxfee jest bardzo wysoka! Tak duże opłaty mogą być uiszczone przy wysłaniu jednej transakcji.</translation>
+        <source>Failed to listen on any port. Use -listen=0 if you want this.</source>
+        <translation>Nie powiódł się nasłuch żadnego z portów. Użyj -listen=0 jeśli chcesz.</translation>
     </message>
     <message>
         <source>Found unconfirmed denominated outputs, will wait till they confirm to continue.</source>
@@ -4735,10 +5261,6 @@ Przejdź do Plik &gt; Otwórz portfel, aby załadować portfel.
         <source>Invalid -socketevents ('%s') specified. Only these modes are supported: %s</source>
         <translation>Niewłaściwe wybrane -socetevents ('%s'). Tylko te tryby są wspierane: %s</translation>
     </message>
-    <message>
-        <source>Invalid amount for -maxtxfee=&lt;amount&gt;: '%s' (must be at least the minrelay fee of %s to prevent stuck transactions)</source>
-        <translation>Nieprawidłowa kwota za -maxtxfee=&lt;amount&gt;: '%s' (musi ona wynosić co najmniej tyle co minimalna opłata za retransmisje %s aby zapobiec utknięciu transakcji)</translation>
-    </message>
     <message>
         <source>SQLiteDatabase: Unknown sqlite wallet schema version %d. Only version %d is supported</source>
         <translation>SQLiteDatabase: Nieznana wersja schematu portfela sqlite %d. Obsługiwana jest tylko wersja %d</translation>
@@ -4747,6 +5269,10 @@ Przejdź do Plik &gt; Otwórz portfel, aby załadować portfel.
         <source>Transaction index can't be disabled with governance validation enabled. Either start with -disablegovernance command line switch or enable transaction index.</source>
         <translation>Indeks transakcji nie może zostać wyłączony jeśli walidacja zarządzania jest włączona. Albo uruchom z komendą  -dsiablegovernance lub włącz indeks transakcji. </translation>
     </message>
+    <message>
+        <source>Unsupported category-specific logging level -loglevel=%s. Expected -loglevel=&lt;category&gt;:&lt;loglevel&gt;. Valid categories: %s. Valid loglevels: %s.</source>
+        <translation>Niewspierany kategoryzowany poziom logowania -loglevel=%s. Oczekiwane -loglevel=&lt;category&gt;:&lt;loglevel&gt;. Poprawne kategorie: %s. Poprawne poziomy logowania: %s.</translation>
+    </message>
     <message>
         <source>Can't mix: no compatible inputs found!</source>
         <translation>Mieszanie jest niemożliwe: nie znaleziono odpowiednich wartości wejściowych.</translation>
@@ -4755,6 +5281,14 @@ Przejdź do Plik &gt; Otwórz portfel, aby załadować portfel.
         <source>Entry exceeds maximum size.</source>
         <translation>Przekracza maksymalny rozmiar.</translation>
     </message>
+    <message>
+        <source>Error upgrading evo database for EHF</source>
+        <translation>Błąd podczas uaktualniania bazy danych evo dla EHF</translation>
+    </message>
+    <message>
+        <source>Failed to commit Evo database</source>
+        <translation>Niepowodzenie podczas zatwierdzania bazy danych Evo</translation>
+    </message>
     <message>
         <source>Found enough users, signing ( waiting %s )</source>
         <translation>Znaleziono wystarczającą ilość użytkowników, trwa podoposywanie ( poczekaj %s )</translation>
@@ -4779,18 +5313,14 @@ Przejdź do Plik &gt; Otwórz portfel, aby załadować portfel.
         <source>Insufficient funds.</source>
         <translation>Niewystarczające środki</translation>
     </message>
-    <message>
-        <source>Invalid amount for -discardfee=&lt;amount&gt;: '%s'</source>
-        <translation>Nieprawidłowa kwota dla -discardfee=&lt;amount&gt;: '%s'</translation>
-    </message>
-    <message>
-        <source>Invalid amount for -paytxfee=&lt;amount&gt;: '%s' (must be at least %s)</source>
-        <translation>Nieprawidłowa kwota dla -paytxfee=&lt;amount&gt;: '%s' (musi wynosić co najmniej %s)</translation>
-    </message>
     <message>
         <source>Invalid minimum number of spork signers specified with -minsporkkeys</source>
         <translation>Nieważna  minimalna liczba osób podpisujących sporka ustawiona z -minsporkkeys</translation>
     </message>
+    <message>
+        <source>Listening for incoming connections failed (listen returned error %s)</source>
+        <translation>Nasłuchiwanie połączeń przychodzących nie powiodło się (funkcja listen zwróciła błąd %s)</translation>
+    </message>
     <message>
         <source>Lock is already in place.</source>
         <translation>Transakcja została już zamknięta.</translation>
@@ -4847,6 +5377,10 @@ Przejdź do Plik &gt; Otwórz portfel, aby załadować portfel.
         <source>Synchronizing governance objects…</source>
         <translation>Synchronizuję obiekty zarządzania…</translation>
     </message>
+    <message>
+        <source>Transaction change output index out of range</source>
+        <translation>Indeks wyjścia transakcji spoza zakresu</translation>
+    </message>
     <message>
         <source>Unable to start HTTP server. See debug log for details.</source>
         <translation>Uruchomienie serwera HTTP nieudane. Szczegóły znajdziesz w dzienniku debugowania.</translation>
@@ -4855,6 +5389,10 @@ Przejdź do Plik &gt; Otwórz portfel, aby załadować portfel.
         <source>Unknown response.</source>
         <translation>Nieznana odpowiedź.</translation>
     </message>
+    <message>
+        <source>Unsupported global logging level -loglevel=%s. Valid values: %s.</source>
+        <translation>Niewspierany globalny poziom logowania -loglevel=%s. Poprawne wartości: %s.</translation>
+    </message>
     <message>
         <source>User Agent comment (%s) contains unsafe characters.</source>
         <translation>Komentarz agenta użytkownika (%s) zawiera znaki które nie są bezpieczne.</translation>
@@ -4895,6 +5433,10 @@ Przejdź do Plik &gt; Otwórz portfel, aby załadować portfel.
         <source>Make sure to encrypt your wallet and delete all non-encrypted backups after you have verified that the wallet works!</source>
         <translation>Jeśli już zweryfikowałeś że porfel działa jak należy, to nie zapomnij zaszyfrować porfel oraz usunąć wszystkie niezaszyfrowane kopie zapasowe.</translation>
     </message>
+    <message>
+        <source>More than one onion bind address is provided. Using %s for the automatically created Tor onion service.</source>
+        <translation>Podano więcej niż jeden adres wiązania onion. Używany jest %s dla automatycznie utworzonej usługi Tor onion.</translation>
+    </message>
     <message>
         <source>Prune configured below the minimum of %d MiB.  Please use a higher number.</source>
         <translation>Czyszczenie starych danych ustawiono poniżej minimum %d MiB.  Ustaw wyższą wartość.</translation>
@@ -4915,10 +5457,6 @@ Przejdź do Plik &gt; Otwórz portfel, aby załadować portfel.
         <source>Total length of network version string (%i) exceeds maximum length (%i). Reduce the number or size of uacomments.</source>
         <translation>Całkowita długość sieciowej wersji struny (%i) przekracza maksymalną długość (%i). Zredukuj liczbę lub rozmiar uacomments.</translation>
     </message>
-    <message>
-        <source>Transaction needs a change address, but we can't generate it. Please call keypoolrefill first.</source>
-        <translation>Transakcja wymaga adresu zmiany, ale nie możemy go wygenerować. Najpierw wywołaj funkcję keypoolrefill.</translation>
-    </message>
     <message>
         <source>WARNING! Failed to replenish keypool, please unlock your wallet to do so.</source>
         <translation>OSTRZEŻENIE! Nie udało się uzupełnić puli kluczy. W tym celu musisz odblokować portfel.</translation>
@@ -4967,10 +5505,22 @@ Przejdź do Plik &gt; Otwórz portfel, aby załadować portfel.
         <source>Error loading %s: Private keys can only be disabled during creation</source>
         <translation>Błąd podczas ładowania %s: Klucze prywatne można wyłączyć tylko podczas tworzenia nowego portfela</translation>
     </message>
+    <message>
+        <source>Error: Couldn't create cursor into database</source>
+        <translation>Błąd: Nie można utworzyć kursora do bazy danych</translation>
+    </message>
     <message>
         <source>Error: Disk space is low for %s</source>
         <translation>Błąd: Nie ma wystarczająco miejsca na dysku dla %s</translation>
     </message>
+    <message>
+        <source>Error: Dumpfile checksum does not match. Computed %s, expected %s</source>
+        <translation>Błąd: Suma kontrolna pliku wyjściowego nie zgadza się. Obliczono %s, oczekiwano %s</translation>
+    </message>
+    <message>
+        <source>Error: Got key that was not hex: %s</source>
+        <translation>Błąd: Otrzymano klucz, który nie jest w formacie szesnastkowym: %s</translation>
+    </message>
     <message>
         <source>Error: Got value that was not hex: %s</source>
         <translation>Błąd: Otrzymano wartość, która nie jest wartością hex: %s</translation>
@@ -4983,10 +5533,6 @@ Przejdź do Plik &gt; Otwórz portfel, aby załadować portfel.
         <source>Error: No addresses available.</source>
         <translation>Błąd: Brak dostępnych adresów.</translation>
     </message>
-    <message>
-        <source>Exceeded max tries.</source>
-        <translation>Przekroczona została maksymalna liczba prób</translation>
-    </message>
     <message>
         <source>Failed to create backup %s!</source>
         <translation>Nie powiodło się tworzenie kopii zapasowej %s!</translation>
@@ -5007,6 +5553,10 @@ Przejdź do Plik &gt; Otwórz portfel, aby załadować portfel.
         <source>Failed to verify database</source>
         <translation>Nie udało się zweryfikować bazy danych</translation>
     </message>
+    <message>
+        <source>Fee rate (%s) is lower than the minimum fee rate setting (%s)</source>
+        <translation>Stawka opłaty (%s) jest niższa niż minimalna ustawiona stawka opłaty (%s)</translation>
+    </message>
     <message>
         <source>Found enough users, signing…</source>
         <translation>Znaleziono wystarczającą ilość użytkowników, zapisuje…</translation>
@@ -5023,10 +5573,6 @@ Przejdź do Plik &gt; Otwórz portfel, aby załadować portfel.
         <source>Invalid P2P permission: '%s'</source>
         <translation>Nieprawidłowe uprawnienie P2P: '%s'</translation>
     </message>
-    <message>
-        <source>Invalid amount for -fallbackfee=&lt;amount&gt;: '%s'</source>
-        <translation>Błędna ilość -fallbackfee=&lt;amount&gt;: '%s'</translation>
-    </message>
     <message>
         <source>Invalid masternodeblsprivkey. Please see documentation.</source>
         <translation>Niewłaściwy masternodeblsprivkey. Sprawdź dokumentacje.</translation>
@@ -5163,10 +5709,6 @@ Przejdź do Plik &gt; Otwórz portfel, aby załadować portfel.
         <source>Unable to open %s for writing</source>
         <translation>Nie można otworzyć %s do zapisu</translation>
     </message>
-    <message>
-        <source>Unable to parse -maxuploadtarget: '%s' (possible integer overflow?)</source>
-        <translation>Nie można przeanalizować -maxuploadtarget: '%s' (możliwe przepełnienie liczby całkowitej?)</translation>
-    </message>
     <message>
         <source>Unknown -blockfilterindex value %s.</source>
         <translation>Nieznana wartość -blockfilterindex %s.</translation>
@@ -5175,10 +5717,6 @@ Przejdź do Plik &gt; Otwórz portfel, aby załadować portfel.
         <source>Unknown new rules activated (versionbit %i)</source>
         <translation>Aktywowano nieznane nowe reguły (wersja bit %i)</translation>
     </message>
-    <message>
-        <source>Upgrading UTXO database</source>
-        <translation>Aktualizowanie bazy danych UTXO</translation>
-    </message>
     <message>
         <source>Verifying blocks…</source>
         <translation>Weryfikacja bloków…</translation>
@@ -5219,6 +5757,22 @@ Przejdź do Plik &gt; Otwórz portfel, aby załadować portfel.
         <source>%s uses exact denominated amounts to send funds, you might simply need to mix some more coins.</source>
         <translation>%s używa dokładnie zdenominowanych kwot, możliwe że musisz zmiksować więcej monet. </translation>
     </message>
+    <message>
+        <source>-reindex-chainstate option is not compatible with -blockfilterindex. Please temporarily disable blockfilterindex while using -reindex-chainstate, or replace -reindex-chainstate with -reindex to fully rebuild all indexes.</source>
+        <translation>Opcja -reindex-chainstate nie jest kompatybilna z -blockfilterindex. Wyłącz tymczasowo -blockfilterindex podczas korzystania z -reindex-chainstate lub zastąp -reindex-chainstate opcją -reindex aby odbudować wszystkie indeksy.</translation>
+    </message>
+    <message>
+        <source>-reindex-chainstate option is not compatible with -coinstatsindex. Please temporarily disable coinstatsindex while using -reindex-chainstate, or replace -reindex-chainstate with -reindex to fully rebuild all indexes.</source>
+        <translation>Opcja -reindex-chainstate nie jest kompatybilna z -coinstatsindex. Proszę tymczasowo wyłączyć coinstatsindex podczas korzystania z -reindex-chainstate lub zastąpić -reindex-chainstate opcją -reindex, aby odbudować wszystkie indeksy.</translation>
+    </message>
+    <message>
+        <source>-reindex-chainstate option is not compatible with -txindex. Please temporarily disable txindex while using -reindex-chainstate, or replace -reindex-chainstate with -reindex to fully rebuild all indexes.</source>
+        <translation>Opcja -reindex-chainstate nie jest kompatybilna z -txindex. Proszę tymczasowo wyłączyć txindex podczas korzystania z -reindex-chainstate lub zastąpić -reindex-chainstate opcją -reindex, aby odbudować wszystkie indeksy.</translation>
+    </message>
+    <message>
+        <source>Cannot downgrade wallet from version %i to version %i. Wallet version unchanged.</source>
+        <translation>Nie można zaktualizować portfela z wersji %i do wersji %i. Wersja portfela pozostaje niezmieniona.</translation>
+    </message>
     <message>
         <source>Cannot obtain a lock on data directory %s. %s is probably already running.</source>
         <translation>Nie można uzyskać blokady na katalogu z danymi %s. %s najprawdopodobniej jest już uruchomiony.</translation>
@@ -5231,14 +5785,82 @@ Przejdź do Plik &gt; Otwórz portfel, aby załadować portfel.
         <source>Error loading %s: You can't enable HD on an already existing non-HD wallet</source>
         <translation>Błąd ładowania %s: Nie możesz włączyć HD na już istniejącym portfelu innym niż HD</translation>
     </message>
+    <message>
+        <source>Error loading wallet. Wallet requires blocks to be downloaded, and software does not currently support loading wallets while blocks are being downloaded out of order when using assumeutxo snapshots. Wallet should be able to load successfully after node sync reaches height %s</source>
+        <translation>Błąd podczas ładowania portfela. Portfel wymaga pobrania bloków, a oprogramowanie nie obsługuje wgrania portfela podczas pobierania bloków w nieprawidłowej kolejności przy użyciu migawek assumeutxo. Portfel powinien być w stanie załadować się pomyślnie po synchronizacji węzła do poziomu %s.</translation>
+    </message>
     <message>
         <source>Error reading %s! All keys read correctly, but transaction data or address book entries might be missing or incorrect.</source>
         <translation>Błąd odczytu %s! Wszystkie klucze zostały odczytane poprawnie, ale może brakować  danych transakcji lub wpisów w książce adresowej, lub mogą one być nieprawidłowe.</translation>
     </message>
+    <message>
+        <source>Error: Dumpfile format record is incorrect. Got "%s", expected "format".</source>
+        <translation>Błąd: Nagłówek formatu pliku dump jest nieprawidłowy. Otrzymano "%s", oczekiwano "format".</translation>
+    </message>
+    <message>
+        <source>Error: Dumpfile identifier record is incorrect. Got "%s", expected "%s".</source>
+        <translation>Błąd: Nagłówek identyfikatora pliku dump jest nieprawidłowy. Otrzymano "%s", oczekiwano "%s".</translation>
+    </message>
+    <message>
+        <source>Error: Dumpfile version is not supported. This version of bitcoin-wallet only supports version 1 dumpfiles. Got dumpfile with version %s</source>
+        <translation>Błąd: Wersja pliku dump nie jest obsługiwana. Ta wersja bitcoin-wallet obsługuje tylko wersję 1 plików dump. Otrzymano plik dump z wersją %s.</translation>
+    </message>
+    <message>
+        <source>Failed to rename invalid peers.dat file. Please move or delete it and try again.</source>
+        <translation>Niepowodzenie podczas próby przemianowania nieprawidłowego pliku peers.dat. Przenieś lub usuń plik i spróbuj ponownie.</translation>
+    </message>
+    <message>
+        <source>Fee estimation failed. Fallbackfee is disabled. Wait a few blocks or enable %s.</source>
+        <translation>Szacowanie opłaty nie powiodło się. Fallbackfee jest wyłączona. Poczekaj kilka bloków lub włącz %s.</translation>
+    </message>
+    <message>
+        <source>File %s already exists. If you are sure this is what you want, move it out of the way first.</source>
+        <translation>Plik %s już istnieje. Jeśli jesteś pewien, że chcesz to zrobić, przenieś najpierw plik.</translation>
+    </message>
+    <message>
+        <source>Incompatible options: -dnsseed=1 was explicitly specified, but -onlynet forbids connections to IPv4/IPv6</source>
+        <translation>Niezgodne opcje: -dnsseed=1 zostało jawnie określone, ale -onlynet zabrania połączeń z IPv4/IPv6.</translation>
+    </message>
     <message>
         <source>Incorrect or no devnet genesis block found. Wrong datadir for devnet specified?</source>
         <translation>Znaleziono błędny lub nie istniejący pierwszy blog devnet. Wybrano zły datadir dla devnet? </translation>
     </message>
+    <message>
+        <source>Invalid amount for %s=&lt;amount&gt;: '%s' (must be at least the minrelay fee of %s to prevent stuck transactions)</source>
+        <translation>Nieprawidłowa kwota dla %s=&lt;amount&gt;: '%s' (musi wynosić co najmniej opłatę minrelay %s, aby zapobiec utknięciu transakcji)</translation>
+    </message>
+    <message>
+        <source>Invalid or corrupt peers.dat (%s). If you believe this is a bug, please report it to %s. As a workaround, you can move the file (%s) out of the way (rename, move, or delete) to have a new one created on the next start.</source>
+        <translation>Nieprawidłowy lub uszkodzony plik peers.dat (%s). Jeśli uważasz, że jest to błąd, proszę zgłoś to do %s. Jako rozwiązanie tymczasowe, możesz przenieść plik (%s) i (zamień, przenieś lub usuń), aby utworzyć nowy plik podczas następnego uruchomienia.</translation>
+    </message>
+    <message>
+        <source>No dump file provided. To use createfromdump, -dumpfile=&lt;filename&gt; must be provided.</source>
+        <translation>Nie podano pliku dump. Aby użyć createfromdump, należy podać -dumpfile=&lt;filename&gt;.</translation>
+    </message>
+    <message>
+        <source>No dump file provided. To use dump, -dumpfile=&lt;filename&gt; must be provided.</source>
+        <translation>Nie podano pliku dump. Aby użyć dump, należy podać -dumpfile=&lt;filename&gt;.</translation>
+    </message>
+    <message>
+        <source>No wallet file format provided. To use createfromdump, -format=&lt;format&gt; must be provided.</source>
+        <translation>Nie podano formatu pliku portfela. Aby użyć createfromdump, należy podać -format=&lt;format&gt;.</translation>
+    </message>
+    <message>
+        <source>Outbound connections restricted to CJDNS (-onlynet=cjdns) but -cjdnsreachable is not provided</source>
+        <translation>Połączenia wychodzące ograniczone do CJDNS (-onlynet=cjdns), ale -cjdnsreachable nie jest podany</translation>
+    </message>
+    <message>
+        <source>Outbound connections restricted to Tor (-onlynet=onion) but the proxy for reaching the Tor network is explicitly forbidden: -onion=0</source>
+        <translation>Połączenia wychodzące są ograniczone do Tor (-onlynet=onion), ale serwer proxy do sieci Tor jest jawnie zabroniony: -onion=0.</translation>
+    </message>
+    <message>
+        <source>Outbound connections restricted to Tor (-onlynet=onion) but the proxy for reaching the Tor network is not provided: none of -proxy, -onion or -listenonion is given</source>
+        <translation>Połączenia wychodzące ograniczone do Tor (-onlynet=onion), ale serwer proxy do sieci Tor nie jest podany: żaden z -proxy, -onion lub -listenonion nie jest podany.</translation>
+    </message>
+    <message>
+        <source>Outbound connections restricted to i2p (-onlynet=i2p) but -i2psam is not provided</source>
+        <translation>Połączenia wychodzące ograniczone do i2p (-onlynet=i2p), ale -i2psam nie jest podany</translation>
+    </message>
     <message>
         <source>Please check that your computer's date and time are correct! If your clock is wrong, %s will not work properly.</source>
         <translation>Proszę sprawdzić czy data i czas na Twoim komputerze są poprawne! Jeżeli ustawienia zegara będą złe, %s nie będzie działał prawidłowo.</translation>
@@ -5247,6 +5869,14 @@ Przejdź do Plik &gt; Otwórz portfel, aby załadować portfel.
         <source>Please contribute if you find %s useful. Visit %s for further information about the software.</source>
         <translation>Jeśli %s przydatne dla ciebie, wesprzyj nas. Odwiedź %s po więcej informacj na temat tego programu. </translation>
     </message>
+    <message>
+        <source>Prune mode is incompatible with -reindex-chainstate. Use full -reindex instead.</source>
+        <translation>Tryb prune nie jest zgodny z -reindex-chainstate. Zamias tego użyj pełnego -reindex.</translation>
+    </message>
+    <message>
+        <source>This is the maximum transaction fee you pay (in addition to the normal fee) to prioritize partial spend avoidance over regular coin selection.</source>
+        <translation>Jest to maksymalna opłata transakcyjna, którą płacisz (oprócz normalnej opłaty) w celu priorytetowego uniknięcia częściowego wydatku ponad regularny wybór monety.</translation>
+    </message>
     <message>
         <source>This is the transaction fee you may discard if change is smaller than dust at this level</source>
         <translation>Jest to opłata transakcyjna, którą możesz odrzucić, jeśli reszta jest mniejsza niż pył na tym poziomie</translation>
@@ -5255,6 +5885,10 @@ Przejdź do Plik &gt; Otwórz portfel, aby załadować portfel.
         <source>This is the transaction fee you may pay when fee estimates are not available.</source>
         <translation>To jest prawdopodobny koszt transakcj jeśli szacunki opłat są niedostępne. </translation>
     </message>
+    <message>
+        <source>Transaction requires one destination of non-0 value, a non-0 feerate, or a pre-selected input</source>
+        <translation>Transakcja wymaga jednego celu o wartości niezerowej, niezerowej stawki opłaty lub wstępnie wybranego wejścia</translation>
+    </message>
     <message>
         <source>Unable to replay blocks. You will need to rebuild the database using -reindex-chainstate.</source>
         <translation>Nie można odtworzyć bloków. Będziesz musiał odbudować bazę danych przy użyciu -reindex-chainstate.</translation>
@@ -5263,6 +5897,10 @@ Przejdź do Plik &gt; Otwórz portfel, aby załadować portfel.
         <source>Unknown wallet file format "%s" provided. Please provide one of "bdb" or "sqlite".</source>
         <translation>Podano nieznany format pliku portfela „%s”. Podaj jeden z „bdb” lub „sqlite”.</translation>
     </message>
+    <message>
+        <source>Unsupported chainstate database format found. Please restart with -reindex-chainstate. This will rebuild the chainstate database.</source>
+        <translation>Znaleziono nieobsługiwany format bazy danych chainstate. Uruchom ponownie z -reindex-chainstate. Spowoduje to przebudowanie bazy danych chainstate.</translation>
+    </message>
     <message>
         <source>Warning: Dumpfile wallet format "%s" does not match command line specified format "%s".</source>
         <translation>Ostrzeżenie: Format portfela Dumpfile "%s" nie pasuje do formatu "%s" określonego w wierszu poleceń.</translation>
@@ -5303,10 +5941,30 @@ Przejdź do Plik &gt; Otwórz portfel, aby załadować portfel.
         <source>-rpcport must be specified when -devnet and -server are specified</source>
         <translation>kiedy -devnet oraz -server są ustawione -rpcport też musi być ustawiony</translation>
     </message>
+    <message>
+        <source>-statsbatchsize cannot be configured with a negative value.</source>
+        <translation>-statsbatchsize nie może być skonfigurowany z wartością ujemną.</translation>
+    </message>
+    <message>
+        <source>-statsduration cannot be configured with a negative value.</source>
+        <translation>-statsduration nie może być skonfigurowany z wartością ujemną.</translation>
+    </message>
     <message>
         <source>A fatal internal error occurred, see debug.log for details</source>
         <translation>Błąd: Wystąpił wewnętrzny błąd krytyczny, szczegóły znajdziesz w pliku debug.log</translation>
     </message>
+    <message>
+        <source>Cannot create socket (socket() returned error %s)</source>
+        <translation>Nie można utworzyć gniazda (socket() zwrócił błąd %s)</translation>
+    </message>
+    <message>
+        <source>Cannot get socket address for %s</source>
+        <translation>Nie można uzyskać adresu gniazda dla %s</translation>
+    </message>
+    <message>
+        <source>Cannot init Statsd client</source>
+        <translation>Nie można zainicjować klienta Statsd</translation>
+    </message>
     <message>
         <source>Cannot resolve -%s address: '%s'</source>
         <translation>Nie można rozpoznać -%s adresu: '%s'</translation>
@@ -5351,10 +6009,6 @@ Przejdź do Plik &gt; Otwórz portfel, aby załadować portfel.
         <source>Error reading next record from wallet database</source>
         <translation>Błąd podczas odczytu następnego rekordu z bazy danych portfela</translation>
     </message>
-    <message>
-        <source>Error upgrading chainstate database</source>
-        <translation>Błąd ładowania bazy bloków</translation>
-    </message>
     <message>
         <source>Loading P2P addresses…</source>
         <translation>Wczytywanie adresów P2P…</translation>
@@ -5475,10 +6129,70 @@ Przejdź do Plik &gt; Otwórz portfel, aby załadować portfel.
         <source>%s corrupt. Try using the wallet tool dash-wallet to salvage or restoring a backup.</source>
         <translation>%s uszkodzony. Spróbuj użyć narzędzia dash-wallet aby odzyskać lub odbudować portfel z kopi zapasowej.</translation>
     </message>
+    <message>
+        <source>%s is set very high! Fees this large could be paid on a single transaction.</source>
+        <translation>%s jest ustawiony bardzo wysoko! Opłaty tej wielkości mogą zostać zapłacone w jednej transakcji.</translation>
+    </message>
+    <message>
+        <source>%s request to listen on port %u. This port is considered "bad" and thus it is unlikely that any Dash Core peers connect to it. See doc/p2p-bad-ports.md for details and a full list.</source>
+        <translation>%s żądanie nasłuchiwania na porcie %u. Port ten jest uważany za "zły" i dlatego jest mało prawdopodobne, że dowolny węzeł Dash Core połączy się z nim. Zobacz doc/p2p-bad-ports.md, aby uzyskać więcej informacji i pełną listę.</translation>
+    </message>
+    <message>
+        <source>Cannot provide specific connections and have addrman find outgoing connections at the same time.</source>
+        <translation>Nie można zapewnić określonych połączeń i jednocześnie obsługiwać połączenia wychodzące za pomocą addrman.</translation>
+    </message>
+    <message>
+        <source>Failed to upgrade Evo database</source>
+        <translation>Nie udało się zaktualizować bazy danych Evo</translation>
+    </message>
+    <message>
+        <source>Fee needed &gt; fee paid</source>
+        <translation>Potrzebna opłata &gt; zapłacona opłata</translation>
+    </message>
+    <message>
+        <source>Host %s on unsupported network</source>
+        <translation>Host %s w nieobsługiwanej sieci</translation>
+    </message>
+    <message>
+        <source>Invalid amount for %s=&lt;amount&gt;: '%s' (must be at least %s)</source>
+        <translation>Nieprawidłowa kwota dla %s=&lt;amount&gt;: '%s' (musi wynosić co najmniej %s)</translation>
+    </message>
+    <message>
+        <source>Invalid amount for %s=&lt;amount&gt;: '%s'</source>
+        <translation>Nieprawidłowa kwota dla %s=&lt;amount&gt;: '%s'</translation>
+    </message>
+    <message>
+        <source>Invalid port specified in %s: '%s'</source>
+        <translation>Nieprawidłowy port określony w %s: '%s'</translation>
+    </message>
     <message>
         <source>Last successful action was too recent.</source>
         <translation>Za mało czasu upłynęło od ostatniej udanej transakcji.</translation>
     </message>
+    <message>
+        <source>Missing solving data for estimating transaction size</source>
+        <translation>Brak danych do oszacowania rozmiaru transakcji</translation>
+    </message>
+    <message>
+        <source>No host specified</source>
+        <translation>Nie określono hosta</translation>
+    </message>
+    <message>
+        <source>No host specified, malformed URL</source>
+        <translation>Nie określono hosta, nieprawidłowy URL</translation>
+    </message>
+    <message>
+        <source>No text before the scheme delimiter, malformed URL</source>
+        <translation>Brak tekstu przed ogranicznikiem schematu, nieprawidłowy URL</translation>
+    </message>
+    <message>
+        <source>Port must be between %d and %d, supplied %d</source>
+        <translation>Port musi być pomiędzy %d a %d, podano %d</translation>
+    </message>
+    <message>
+        <source>Socket not initialized, cannot send message</source>
+        <translation>Gniazdo nie zainicjowane, nie można wysłać wiadomości</translation>
+    </message>
     <message>
         <source>The source code is available from %s.</source>
         <translation>Kod źródłowy dostępny jest z %s.</translation>
@@ -5507,6 +6221,10 @@ Przejdź do Plik &gt; Otwórz portfel, aby załadować portfel.
         <source>Transaction fees are too high.</source>
         <translation>Opłaty za transakcję są zbyt wysokie.</translation>
     </message>
+    <message>
+        <source>Transaction needs a change address, but we can't generate it.</source>
+        <translation>Transakcja wymaga adresu reszty, ale nie można go wygenerować.</translation>
+    </message>
     <message>
         <source>Transaction not valid.</source>
         <translation>Transakcja niewłaściwa.</translation>
@@ -5527,6 +6245,18 @@ Przejdź do Plik &gt; Otwórz portfel, aby załadować portfel.
         <source>Unable to locate enough non-denominated funds for this transaction.</source>
         <translation>Nie znaleziono wystarczającej ilości zdenominowanych środków dla tej transakcji.</translation>
     </message>
+    <message>
+        <source>Unable to lookup host %s</source>
+        <translation>Nie można wyszukać hosta %s</translation>
+    </message>
+    <message>
+        <source>Unable to parse -maxuploadtarget: '%s'</source>
+        <translation>Nie można przetworzyć -maxuploadtarget: '%s'</translation>
+    </message>
+    <message>
+        <source>Unable to send message to %s (::sendto() returned error %s)</source>
+        <translation>Nie można wysłać wiadomości do %s (::sendto() zwrócił błąd %s)</translation>
+    </message>
     <message>
         <source>Unable to sign spork message, wrong key?</source>
         <translation>Niemożliwe podpisanie wiadomości spork, nieprawidłowy klucz?</translation>
@@ -5539,6 +6269,10 @@ Przejdź do Plik &gt; Otwórz portfel, aby załadować portfel.
         <source>Unknown state: id = %u</source>
         <translation>Status nieznany: id = %u</translation>
     </message>
+    <message>
+        <source>Unsupported URL scheme, must begin with udp://</source>
+        <translation>Nieobsługiwany schemat URL, musi zaczynać się od udp://</translation>
+    </message>
     <message>
         <source>Unsupported logging category %s=%s.</source>
         <translation>Nieobsługiwana kategoria rejestrowania %s=%s.</translation>

From 6c3c62826df93aa5791bdd1a3159a8e7c6544ce8 Mon Sep 17 00:00:00 2001
From: UdjinM6 <UdjinM6@users.noreply.github.com>
Date: Thu, 23 Oct 2025 22:30:55 +0300
Subject: [PATCH 326/656] pt

---
 src/qt/locale/dash_pt.ts | 2087 +++++++++++++++++++++++++++++++++-----
 1 file changed, 1834 insertions(+), 253 deletions(-)

diff --git a/src/qt/locale/dash_pt.ts b/src/qt/locale/dash_pt.ts
index f412e616b47a..a016b3e21bdf 100644
--- a/src/qt/locale/dash_pt.ts
+++ b/src/qt/locale/dash_pt.ts
@@ -65,14 +65,6 @@
         <source>C&amp;hoose</source>
         <translation>E&amp;scolha</translation>
     </message>
-    <message>
-        <source>Sending addresses</source>
-        <translation>Endereços de envio</translation>
-    </message>
-    <message>
-        <source>Receiving addresses</source>
-        <translation>Endereços de recebimento</translation>
-    </message>
     <message>
         <source>These are your Dash addresses for sending payments. Always check the amount and the receiving address before sending coins.</source>
         <translation>Esses são os seus endereços para enviar pagamentos. Sempre cheque a quantia e o endereço de recebimento antes de enviar moedas,</translation>
@@ -94,8 +86,8 @@
         <translation>&amp;Editar</translation>
     </message>
     <message>
-        <source>&amp;Show address QR code</source>
-        <translation>&amp;Mostrar endereço QR code</translation>
+        <source>Show address &amp;QR code</source>
+        <translation>Mostrar endereço &amp;QR code</translation>
     </message>
     <message>
         <source>QR code</source>
@@ -105,6 +97,24 @@
         <source>Export Address List</source>
         <translation>Exportar lista de endereço</translation>
     </message>
+    <message>
+        <source>Comma separated file</source>
+        <extracomment>Expanded name of the CSV file format. See: https://en.wikipedia.org/wiki/Comma-separated_values.</extracomment>
+        <translation>Arquivo separado por vírgulas</translation>
+    </message>
+    <message>
+        <source>There was an error trying to save the address list to %1. Please try again.</source>
+        <extracomment>An error message. %1 is a stand-in argument for the name of the file we attempted to save to.</extracomment>
+        <translation>Houve um erro ao tentar salvar a lista de endereços em %1. Por favor, tente novamente.</translation>
+    </message>
+    <message>
+        <source>Sending addresses - %1</source>
+        <translation>Endereços de envio - %1</translation>
+    </message>
+    <message>
+        <source>Receiving addresses - %1</source>
+        <translation>Endereços de recebimento - %1</translation>
+    </message>
     <message>
         <source>Exporting Failed</source>
         <translation>Falha ao exportar</translation>
@@ -274,10 +284,22 @@
         <source>The passphrase entered for the wallet decryption was incorrect.</source>
         <translation>A senha inserida para descriptografar a carteira está incorreta.</translation>
     </message>
+    <message>
+        <source>The passphrase entered for the wallet decryption is incorrect. It contains a null character (ie - a zero byte). If the passphrase was set with a version of this software prior to 23.0, please try again with only the characters up to — but not including — the first null character. If this is successful, please set a new passphrase to avoid this issue in the future.</source>
+        <translation>A senha inserida para descriptografar a carteira está incorreta. Ela contém um caractere nulo (ou seja - um byte zero). Se a senha foi definida com uma versão deste software anterior à 23.0, tente novamente usando apenas os caracteres até — mas não incluindo — o primeiro caractere nulo. Se isso funcionar, defina uma nova senha para evitar este problema no futuro.</translation>
+    </message>
     <message>
         <source>Wallet passphrase was successfully changed.</source>
         <translation>A frase de segurança da carteira foi alterada com êxito.</translation>
     </message>
+    <message>
+        <source>Passphrase change failed</source>
+        <translation>Falha ao alterar a senha</translation>
+    </message>
+    <message>
+        <source>The old passphrase entered for the wallet decryption is incorrect. It contains a null character (ie - a zero byte). If the passphrase was set with a version of this software prior to 23.0, please try again with only the characters up to — but not including — the first null character.</source>
+        <translation>A senha antiga inserida para descriptografar a carteira está incorreta. Ela contém um caractere nulo (ou seja - um byte zero). Se a senha foi definida com uma versão deste software anterior à 23.0, tente novamente usando apenas os caracteres até — mas não incluindo — o primeiro caractere nulo.</translation>
+    </message>
     <message>
         <source>Warning: The Caps Lock key is on!</source>
         <translation>Atenção: A tecla Caps Lock está ligada!</translation>
@@ -298,12 +320,28 @@
     <name>BitcoinAmountField</name>
     <message>
         <source>Amount in %1</source>
-        <translation>Quantidade em %1</translation>
+        <translation>Valor em %1</translation>
     </message>
 </context>
 <context>
     <name>BitcoinApplication</name>
-    </context>
+    <message>
+        <source>Runaway exception</source>
+        <translation>Erro de execução</translation>
+    </message>
+    <message>
+        <source>A fatal error occurred. %1 can no longer continue safely and will quit.</source>
+        <translation>Ocorreu um erro fatal. %1 não pode continuar com segurança e será encerrado.</translation>
+    </message>
+    <message>
+        <source>Internal error</source>
+        <translation>Erro interno</translation>
+    </message>
+    <message>
+        <source>An internal error occurred. %1 will attempt to continue safely. This is an unexpected bug which can be reported as described below.</source>
+        <translation>Ocorreu um erro interno. %1 tentará continuar com segurança. Este é um erro inesperado que pode ser reportado conforme descrito abaixo.</translation>
+    </message>
+</context>
 <context>
     <name>BitcoinGUI</name>
     <message>
@@ -330,6 +368,10 @@
         <source>Request payments (generates QR codes and dash: URIs)</source>
         <translation>Solicitações de pagamentos (gera códigos QR e Dash: URIs)</translation>
     </message>
+    <message>
+        <source>Ctrl+Q</source>
+        <translation>Ctrl+Q</translation>
+    </message>
     <message>
         <source>&amp;Options…</source>
         <translation>&amp;Opções…</translation>
@@ -358,6 +400,10 @@
         <source>&amp;Verify message…</source>
         <translation>&amp;Verificar mensagem…</translation>
     </message>
+    <message>
+        <source>&amp;Load PSBT from file…</source>
+        <translation>&amp;Carregar PSBT do arquivo…</translation>
+    </message>
     <message>
         <source>&amp;Sending addresses</source>
         <translation>&amp;Endereços de envio</translation>
@@ -390,10 +436,6 @@
         <source>&amp;Window</source>
         <translation>&amp;Janela</translation>
     </message>
-    <message>
-        <source>Minimize</source>
-        <translation>Minimizar</translation>
-    </message>
     <message>
         <source>Zoom</source>
         <translation>Zoom</translation>
@@ -446,14 +488,6 @@
         <source>Modify configuration options for %1</source>
         <translation>Modificar opções de configuração para o %1</translation>
     </message>
-    <message>
-        <source>&amp;Show / Hide</source>
-        <translation>&amp;Exibir/Ocultar</translation>
-    </message>
-    <message>
-        <source>Show or hide the main Window</source>
-        <translation>Mostrar ou esconder a Janela Principal.</translation>
-    </message>
     <message>
         <source>Encrypt the private keys that belong to your wallet</source>
         <translation>Criptografar as chaves privadas que pertencem à sua carteira</translation>
@@ -518,10 +552,6 @@
         <source>Show wallet repair options</source>
         <translation>Mostrar opções de reparação da carteira</translation>
     </message>
-    <message>
-        <source>Open Wallet &amp;Configuration File</source>
-        <translation>Abrir arquivo de &amp;Configuração da carteira</translation>
-    </message>
     <message>
         <source>Open configuration file</source>
         <translation>Abrir arquivo de configuração</translation>
@@ -576,10 +606,40 @@
         <source>Show information about %1</source>
         <translation>Mostrar informação sobre %1</translation>
     </message>
+    <message>
+        <source>Load PSBT from &amp;clipboard…</source>
+        <translation>Carregar PSBT da área de trans&amp;ferência…</translation>
+    </message>
+    <message>
+        <source>Open debugging and diagnostic console</source>
+        <translation>Abrir painel de depuração e diagnóstico</translation>
+    </message>
+    <message>
+        <source>Open &amp;wallet configuration file</source>
+        <translation>Abrir arquivo de configuração da c&amp;arteira</translation>
+    </message>
+    <message>
+        <source>Open a dash: URI</source>
+        <translation>Abrir dash: URI</translation>
+    </message>
     <message>
         <source>Create a new wallet</source>
         <translation>Criar uma nova carteira</translation>
     </message>
+    <message>
+        <source>Restore Wallet…</source>
+        <extracomment>Name of the menu item that restores wallet from a backup file.</extracomment>
+        <translation>Restaurar carteira…</translation>
+    </message>
+    <message>
+        <source>Restore a wallet from a backup file</source>
+        <extracomment>Status tip for Restore Wallet menu item</extracomment>
+        <translation>Restaurar uma carteira de um arquivo de backup</translation>
+    </message>
+    <message>
+        <source>Close all wallets</source>
+        <translation>Fechar todas as carteiras</translation>
+    </message>
     <message>
         <source>%1 &amp;information</source>
         <translation>%1 &amp;Informação</translation>
@@ -588,10 +648,42 @@
         <source>Show the %1 basic information</source>
         <translation>Mostrar as informações básicas %1</translation>
     </message>
+    <message>
+        <source>&amp;Discreet mode</source>
+        <translation>Modo &amp;Discreto</translation>
+    </message>
+    <message>
+        <source>Mask the values in the Overview tab</source>
+        <translation>Mascarar os valores na aba Visão Geral</translation>
+    </message>
+    <message>
+        <source>Wallet Data</source>
+        <extracomment>Name of the wallet data file format.</extracomment>
+        <translation>Dados da carteira</translation>
+    </message>
+    <message>
+        <source>Load Wallet Backup</source>
+        <extracomment>The title for Restore Wallet File Windows</extracomment>
+        <translation>Carregar backup da carteira</translation>
+    </message>
+    <message>
+        <source>Restore Wallet</source>
+        <extracomment>Title of pop-up window shown when the user is attempting to restore a wallet.</extracomment>
+        <translation>Restaurar carteira</translation>
+    </message>
+    <message>
+        <source>Wallet Name</source>
+        <extracomment>Label of the input field where the name of the wallet is entered.</extracomment>
+        <translation>Nome da carteira</translation>
+    </message>
     <message>
         <source>&amp;Settings</source>
         <translation>&amp;Configurações</translation>
     </message>
+    <message>
+        <source>&amp;Minimize</source>
+        <translation>&amp;Minimizar</translation>
+    </message>
     <message>
         <source>&amp;Help</source>
         <translation>&amp;Ajuda</translation>
@@ -608,8 +700,17 @@
         <source>View Governance Proposals</source>
         <translation>Ver Propostas de Governança</translation>
     </message>
+    <message>
+        <source>&amp;Hide</source>
+        <translation>&amp;Ocultar</translation>
+    </message>
+    <message>
+        <source>S&amp;how</source>
+        <translation>E&amp;xibir</translation>
+    </message>
     <message numerus="yes">
         <source>%n active connection(s) to Dash network</source>
+        <extracomment>A substring of the tooltip.</extracomment>
         <translation><numerusform>%n conexões ativas com a rede Dash</numerusform><numerusform>%n conexões ativas com a rede Dash</numerusform><numerusform>%n conexões ativas com a rede Dash</numerusform></translation>
     </message>
     <message>
@@ -628,10 +729,50 @@
         <source>Close Wallet…</source>
         <translation>Fechar Carteira…</translation>
     </message>
+    <message>
+        <source>Load Partially Signed Blockchain Transaction</source>
+        <translation>Carregar Transação de Blockchain Parcialmente Assinada</translation>
+    </message>
+    <message>
+        <source>Load Partially Signed Blockchain Transaction from clipboard</source>
+        <translation>Carregar Transação de Blockchain Parcialmente Assinada da área de transferência</translation>
+    </message>
     <message>
         <source>Create Wallet…</source>
         <translation>Criar Carteira…</translation>
     </message>
+    <message>
+        <source>Close All Wallets…</source>
+        <translation>Fechar todas as carteiras...</translation>
+    </message>
+    <message>
+        <source>Ctrl+Shift+D</source>
+        <translation>Ctrl+Shift+D</translation>
+    </message>
+    <message>
+        <source>Ctrl+M</source>
+        <translation>Ctrl+M</translation>
+    </message>
+    <message>
+        <source>Click for more actions.</source>
+        <extracomment>A substring of the tooltip. "More actions" are available via the context menu.</extracomment>
+        <translation>Clique para mais ações.</translation>
+    </message>
+    <message>
+        <source>Show Peers tab</source>
+        <extracomment>A context menu item. The "Peers tab" is an element of the "Node window".</extracomment>
+        <translation>Mostrar aba de Pares </translation>
+    </message>
+    <message>
+        <source>Disable network activity</source>
+        <extracomment>A context menu item.</extracomment>
+        <translation>Desabilitar atividade de rede</translation>
+    </message>
+    <message>
+        <source>Enable network activity</source>
+        <extracomment>A context menu item. The network activity was disabled previously.</extracomment>
+        <translation>Habilitar atividade de rede</translation>
+    </message>
     <message>
         <source>Syncing Headers (%1%)…</source>
         <translation>Sincronizando cabeçahos (%1%)…</translation>
@@ -648,10 +789,6 @@
         <source>Processing blocks on disk…</source>
         <translation>Processando blocos no disco…</translation>
     </message>
-    <message>
-        <source>Reindexing blocks on disk…</source>
-        <translation>Reindexando blocos no disco…</translation>
-    </message>
     <message>
         <source>Connecting to peers…</source>
         <translation>Conectando…</translation>
@@ -729,7 +866,7 @@
     <message>
         <source>Amount: %1
 </source>
-        <translation>Quantia: %1
+        <translation>Valor: %1
 </translation>
     </message>
     <message>
@@ -795,7 +932,7 @@
     </message>
     <message>
         <source>Amount:</source>
-        <translation>Quantia:</translation>
+        <translation>Valor:</translation>
     </message>
     <message>
         <source>Fee:</source>
@@ -805,10 +942,6 @@
         <source>Coin Selection</source>
         <translation>Seleção da Moeda</translation>
     </message>
-    <message>
-        <source>Dust:</source>
-        <translation>Poeira:</translation>
-    </message>
     <message>
         <source>After Fee:</source>
         <translation>Depois da taxa:</translation>
@@ -839,7 +972,7 @@
     </message>
     <message>
         <source>Amount</source>
-        <translation>Quantidade</translation>
+        <translation>Valor</translation>
     </message>
     <message>
         <source>Received with label</source>
@@ -866,28 +999,32 @@
         <translation>Confirmado</translation>
     </message>
     <message>
-        <source>Copy address</source>
-        <translation>Copie endereço</translation>
+        <source>Copy amount</source>
+        <translation>Copie quantia</translation>
+    </message>
+    <message>
+        <source>&amp;Copy address</source>
+        <translation>&amp;Copiar endereço</translation>
     </message>
     <message>
-        <source>Copy label</source>
-        <translation>Copiar rótulo</translation>
+        <source>Copy &amp;label</source>
+        <translation>Copiar &amp;identificador</translation>
     </message>
     <message>
-        <source>Copy amount</source>
-        <translation>Copie quantia</translation>
+        <source>Copy &amp;amount</source>
+        <translation>Copiar &amp;valor</translation>
     </message>
     <message>
-        <source>Copy transaction ID</source>
-        <translation>Copie ID da transação</translation>
+        <source>Copy transaction &amp;ID and output index</source>
+        <translation>Copiar &amp;ID da transação e índice de saída</translation>
     </message>
     <message>
-        <source>Lock unspent</source>
-        <translation>Bloquear não gasto</translation>
+        <source>L&amp;ock unspent</source>
+        <translation>&amp;Bloquear fundos não gastos</translation>
     </message>
     <message>
-        <source>Unlock unspent</source>
-        <translation>Desbloquear não gasto</translation>
+        <source>&amp;Unlock unspent</source>
+        <translation>&amp;Desbloquear fundos não gastos</translation>
     </message>
     <message>
         <source>Copy quantity</source>
@@ -905,10 +1042,6 @@
         <source>Copy bytes</source>
         <translation>Copiar bytes</translation>
     </message>
-    <message>
-        <source>Copy dust</source>
-        <translation>Copiar poeira</translation>
-    </message>
     <message>
         <source>Copy change</source>
         <translation>Copiar troco</translation>
@@ -921,18 +1054,6 @@
         <source>(%1 locked)</source>
         <translation>(%1 bloqueado)</translation>
     </message>
-    <message>
-        <source>yes</source>
-        <translation>sim</translation>
-    </message>
-    <message>
-        <source>no</source>
-        <translation>não</translation>
-    </message>
-    <message>
-        <source>This label turns red if any recipient receives an amount smaller than the current dust threshold.</source>
-        <translation>Este texto fica vermelho se qualquer destinatário receber uma quantidade menor que que o dust.</translation>
-    </message>
     <message>
         <source>Can vary +/- %1 duff(s) per input.</source>
         <translation>Pode variar +/- %1 duff(s) por entrada.</translation>
@@ -976,8 +1097,14 @@
 </context>
 <context>
     <name>CreateWalletActivity</name>
+    <message>
+        <source>Create Wallet</source>
+        <extracomment>Title of window indicating the progress of creation of a new wallet.</extracomment>
+        <translation>Criar carteira</translation>
+    </message>
     <message>
         <source>Creating Wallet &lt;b&gt;%1&lt;/b&gt;…</source>
+        <extracomment>Descriptive text of the create wallet progress window which indicates to the user which wallet is currently being created.</extracomment>
         <translation>Criando Carteira &lt;b&gt;%1&lt;/b&gt;…</translation>
     </message>
     <message>
@@ -999,6 +1126,10 @@
         <source>Wallet Name</source>
         <translation>Nome da Carteira</translation>
     </message>
+    <message>
+        <source>Wallet</source>
+        <translation>Carteira</translation>
+    </message>
     <message>
         <source>Encrypt the wallet. The wallet will be encrypted with a passphrase of your choice.</source>
         <translation>Criptografar a carteira. A carteira será criptografada com uma frase de segurança de sua escolha.</translation>
@@ -1007,6 +1138,10 @@
         <source>Encrypt Wallet</source>
         <translation>Criptografar Carteira</translation>
     </message>
+    <message>
+        <source>Advanced Options</source>
+        <translation>Opções avançadas</translation>
+    </message>
     <message>
         <source>Disable private keys for this wallet. Wallets with private keys disabled will have no private keys and cannot have an HD seed or imported private keys. This is ideal for watch-only wallets.</source>
         <translation>Desativar as chaves privadas para esta carteira. Carteiras com chaves privadas desabilitadas não terão chaves privadas e não podem ter uma "HD seed" ou chaves privadas importadas. Isso é ideal para carteiras apenas para relógios.</translation>
@@ -1023,11 +1158,23 @@
         <source>Make Blank Wallet</source>
         <translation>Fazer Carteira em Branco</translation>
     </message>
+    <message>
+        <source>Use descriptors for scriptPubKey management. This feature is well-tested but still considered experimental and not recommended for use yet.</source>
+        <translation>Use descritores para o gerenciamento de scriptPubKey. Essa funcionalidade é bem testada, mas ainda é considerada experimental e não recomendada para uso.</translation>
+    </message>
+    <message>
+        <source>Descriptor Wallet (EXPERIMENTAL)</source>
+        <translation>Carteira de Descritores (EXPERIMENTAL)</translation>
+    </message>
     <message>
         <source>Create</source>
         <translation>Criar</translation>
     </message>
-    </context>
+    <message>
+        <source>Compiled without sqlite support (required for descriptor wallets)</source>
+        <translation>Compilado sem suporte a sqlite (necessário para carteiras com descritores)</translation>
+    </message>
+</context>
 <context>
     <name>EditAddressDialog</name>
     <message>
@@ -1116,18 +1263,106 @@
         <source>Filter List:</source>
         <translation>Filtrar Lista:</translation>
     </message>
+    <message>
+        <source>Filter proposal list</source>
+        <translation>Filtrar a lista de propostas</translation>
+    </message>
+    <message>
+        <source>Masternode Count:</source>
+        <translation>Contagem de masternodes:</translation>
+    </message>
+    <message>
+        <source>Number of masternodes this wallet can vote with (masternodes for which this wallet holds the voting key)</source>
+        <translation>Número de masternodes com os quais esta carteira pode votar (masternodes para os quais esta carteira possui a chave de votação)</translation>
+    </message>
     <message>
         <source>Proposal Count:</source>
         <translation>Contagem de Propostas:</translation>
     </message>
+    <message>
+        <source>Create Proposal</source>
+        <translation>Criar proposta</translation>
+    </message>
     <message>
         <source>Filter by Title</source>
         <translation>Filtrar por Título</translation>
     </message>
+    <message>
+        <source>Unavailable</source>
+        <translation>Indisponível</translation>
+    </message>
+    <message>
+        <source>A synced node and an unlocked wallet are required.</source>
+        <translation>Um nó sincronizado e uma carteira desbloqueada são necessários.</translation>
+    </message>
+    <message>
+        <source>Vote Yes</source>
+        <translation>Votar a favor</translation>
+    </message>
+    <message>
+        <source>Vote No</source>
+        <translation>Votar contra</translation>
+    </message>
+    <message>
+        <source>Vote Abstain</source>
+        <translation>Votar abstenção</translation>
+    </message>
     <message>
         <source>Proposal Info: %1</source>
         <translation>Informações da proposta: %1</translation>
     </message>
+    <message>
+        <source>Voting Failed</source>
+        <translation>Falha na votação</translation>
+    </message>
+    <message>
+        <source>No wallet available.</source>
+        <translation>Nenhuma carteira disponível.</translation>
+    </message>
+    <message>
+        <source>No masternode voting keys found in wallet.</source>
+        <translation>Nenhuma chave de votação de masternode encontrada na carteira.</translation>
+    </message>
+    <message>
+        <source>Please select a proposal to vote on.</source>
+        <translation>Por favor, selecione uma proposta para votar.</translation>
+    </message>
+    <message>
+        <source>Unable to unlock wallet.</source>
+        <translation>Não foi possível desbloquear a carteira.</translation>
+    </message>
+    <message>
+        <source>Unable to get masternode list. Please try again later.</source>
+        <translation>Não foi possível obter a lista de masternodes. Por favor, tente novamente mais tarde.</translation>
+    </message>
+    <message>
+        <source>Masternode %1 not found</source>
+        <translation>Masternode %1 não encontrado</translation>
+    </message>
+    <message>
+        <source>Failed to sign vote for masternode %1</source>
+        <translation>Falha ao assinar voto para masternode %1</translation>
+    </message>
+    <message>
+        <source>Masternode %1: %2</source>
+        <translation>Masternode %1: %2</translation>
+    </message>
+    <message numerus="yes">
+        <source>Voted successfully %n time(s)</source>
+        <translation><numerusform>Votado com sucesso %n vez</numerusform><numerusform>Votado com sucesso %n vezes</numerusform><numerusform>Votado com sucesso %n vezes</numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <source>Failed to vote %n time(s)</source>
+        <translation><numerusform>Falha ao votar %n vez</numerusform><numerusform>Falha ao votar %n vezes</numerusform><numerusform>Falha ao votar %n vezes</numerusform></translation>
+    </message>
+    <message>
+        <source>Errors:</source>
+        <translation>Erros:</translation>
+    </message>
+    <message>
+        <source>Voting Results</source>
+        <translation>Resultados da votação</translation>
+    </message>
 </context>
 <context>
     <name>HelpMessageDialog</name>
@@ -1166,10 +1401,26 @@
         <source>As this is the first time the program is launched, you can choose where %1 will store its data.</source>
         <translation>Como essa é a primeira vez que o programa é executado, você pode escolher onde %1 armazenará seus dados.</translation>
     </message>
+    <message>
+        <source>Limit block chain storage to</source>
+        <translation>Limitar o armazenamento da blockchain a</translation>
+    </message>
+    <message>
+        <source>Reverting this setting requires re-downloading the entire blockchain. It is faster to download the full chain first and prune it later. Disables some advanced features.</source>
+        <translation>Reverter essa configuração requer o re-download de toda a blockchain. É mais rápido baixar a cadeia completa primeiro e podá-la depois. Desativa alguns recursos avançados.</translation>
+    </message>
+    <message>
+        <source> GB</source>
+        <translation> GB</translation>
+    </message>
     <message>
         <source>This initial synchronisation is very demanding, and may expose hardware problems with your computer that had previously gone unnoticed. Each time you run %1, it will continue downloading where it left off.</source>
         <translation>Esta sincronização inicial é muito exigente, e pode expor problemas com o seu computador que previamente podem ter passado despercebidos. Cada vez que corre %1, este vai continuar a descarregar de onde deixou. </translation>
     </message>
+    <message>
+        <source>When you click OK, %1 will begin to download and process the full %4 block chain (%2 GB) starting with the earliest transactions in %3 when %4 initially launched.</source>
+        <translation>Quando você clicar em OK, %1 começará a baixar e processar a blockchain completa de %4 (%2 GB), começando pelas transações mais antigas em %3, quando %4 foi lançado inicialmente.</translation>
+    </message>
     <message>
         <source>If you have chosen to limit block chain storage (pruning), the historical data must still be downloaded and processed, but will be deleted afterward to keep your disk usage low.</source>
         <translation>Se escolheu limitar o armazenamento da cadeia de blocos (modo pruning), a data histórica ainda tem de ser descarregada e processada, mas irá ser apagada no final para manter uma utilização baixa do espaço de disco.</translation>
@@ -1182,6 +1433,18 @@
         <source>Use a custom data directory:</source>
         <translation>Use um diretório de dados personalizado:</translation>
     </message>
+    <message numerus="yes">
+        <source>%n GB of space available</source>
+        <translation><numerusform>%n GB de espaço disponível</numerusform><numerusform>%n GB de espaço disponível</numerusform><numerusform>%n GB de espaço disponível</numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <source>(of %n GB needed)</source>
+        <translation><numerusform>(de %n GB necessário)</numerusform><numerusform>(de %n GB necessários)</numerusform><numerusform>(de %n GB necessários)</numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <source>(%n GB needed for full chain)</source>
+        <translation><numerusform>(%n GB necessário para cadeia completa)</numerusform><numerusform>(%n GB necessários para cadeia completa)</numerusform><numerusform>(%n GB necessários para cadeia completa)</numerusform></translation>
+    </message>
     <message>
         <source>At least %1 GB of data will be stored in this directory, and it will grow over time.</source>
         <translation>No mínimo %1 GB de dados irão ser armazenados nesta pasta. </translation>
@@ -1190,6 +1453,11 @@
         <source>Approximately %1 GB of data will be stored in this directory.</source>
         <translation>Aproximadamente %1 GB de dados irão ser guardados nesta pasta. </translation>
     </message>
+    <message numerus="yes">
+        <source>(sufficient to restore backups %n day(s) old)</source>
+        <extracomment>Explanatory text on the capability of the current prune target.</extracomment>
+        <translation><numerusform>(suficiente para restaurar backups de %n dia atrás)</numerusform><numerusform>(suficiente para restaurar backups de %n dias atrás)</numerusform><numerusform>(suficiente para restaurar backups de %n dias atrás)</numerusform></translation>
+    </message>
     <message>
         <source>%1 will download and store a copy of the Dash block chain.</source>
         <translation>%1 irá descarregar e armazenar uma cópia da cadeia de blocos da Dash.</translation>
@@ -1207,6 +1475,13 @@
         <translation>Erro</translation>
     </message>
 </context>
+<context>
+    <name>LoadWalletsActivity</name>
+    <message>
+        <source>Loading wallets…</source>
+        <translation>Carregando carteiras…</translation>
+    </message>
+</context>
 <context>
     <name>MasternodeList</name>
     <message>
@@ -1241,6 +1516,10 @@
         <source>Service</source>
         <translation>Serviço</translation>
     </message>
+    <message>
+        <source>Type</source>
+        <translation>Tipo</translation>
+    </message>
     <message>
         <source>PoSe Score</source>
         <translation>Contagem PoSe</translation>
@@ -1376,6 +1655,10 @@
         <source>Hide</source>
         <translation>Esconder</translation>
     </message>
+    <message>
+        <source>%1 is currently syncing.  It will download headers and blocks from peers and validate them until reaching the tip of the block chain.</source>
+        <translation>%1 está atualmente sincronizando. Ele fará o download de cabeçalhos e blocos dos pares e os validará até alcançar o topo da blockchain.</translation>
+    </message>
     <message>
         <source>Unknown. Syncing Headers (%1, %2%)…</source>
         <translation>Desconhecido. Sincronizando cabeçalhos (%1, %2%)…</translation>
@@ -1391,6 +1674,11 @@
         <source>URI:</source>
         <translation>URI:</translation>
     </message>
+    <message>
+        <source>Paste address from clipboard</source>
+        <extracomment>Tooltip text for button that allows you to paste an address that is in your clipboard.</extracomment>
+        <translation>Colar endereço da área de transferência</translation>
+    </message>
 </context>
 <context>
     <name>OpenWalletActivity</name>
@@ -1406,8 +1694,14 @@
         <source>default wallet</source>
         <translation>carteira padrão</translation>
     </message>
+    <message>
+        <source>Open Wallet</source>
+        <extracomment>Title of window indicating the progress of opening of a wallet.</extracomment>
+        <translation>Abrir Carteira</translation>
+    </message>
     <message>
         <source>Opening Wallet &lt;b&gt;%1&lt;/b&gt;…</source>
+        <extracomment>Descriptive text of the open wallet progress window which indicates to the user which wallet is currently being opened.</extracomment>
         <translation>Abrindo Carteira&lt;b&gt;%1&lt;/b&gt;…</translation>
     </message>
 </context>
@@ -1441,6 +1735,14 @@
         <source>&amp;Appearance</source>
         <translation>&amp;Aparência</translation>
     </message>
+    <message>
+        <source>Show the icon in the system tray.</source>
+        <translation>Exibir o ícone na bandeja do sistema.</translation>
+    </message>
+    <message>
+        <source>&amp;Show tray icon</source>
+        <translation>&amp;Exibir ícone na bandeja</translation>
+    </message>
     <message>
         <source>Prune &amp;block storage to</source>
         <translation>Podar e bloquear o armazenamento para</translation>
@@ -1453,10 +1755,58 @@
         <source>Reverting this setting requires re-downloading the entire blockchain.</source>
         <translation>Reverter essa configuração requer realizar o download novamente de todo o blockchain.</translation>
     </message>
+    <message>
+        <source>Maximum database cache size. A larger cache can contribute to faster sync, after which the benefit is less pronounced for most use cases. Lowering the cache size will reduce memory usage. Unused mempool memory is shared for this cache.</source>
+        <extracomment>Tooltip text for Options window setting that sets the size of the database cache. Explains the corresponding effects of increasing/decreasing this value.</extracomment>
+        <translation>Tamanho máximo do cache do banco de dados. Um cache maior pode contribuir para uma sincronização mais rápida, embora o benefício se torne menos perceptível após a conclusão. Reduzir o tamanho do cache diminuirá o uso de memória. A memória não utilizada do mempool é compartilhada com esse cache.</translation>
+    </message>
     <message>
         <source>MiB</source>
         <translation>MiB</translation>
     </message>
+    <message>
+        <source>Set the number of script verification threads. Negative values correspond to the number of cores you want to leave free to the system.</source>
+        <extracomment>Tooltip text for Options window setting that sets the number of script verification threads. Explains that negative values mean to leave these many cores free to the system.</extracomment>
+        <translation>Defina o número de threads de verificação de scripts. Valores negativos correspondem ao número de núcleos que você deseja deixar livres para o sistema.</translation>
+    </message>
+    <message>
+        <source>This allows you or a third party tool to communicate with the node through command-line and JSON-RPC commands.</source>
+        <extracomment>Tooltip text for Options window setting that enables the RPC server.</extracomment>
+        <translation>Isso permite que você ou uma ferramenta de terceiros se comuniquem com o nó por meio de comandos de linha de comando e JSON-RPC.</translation>
+    </message>
+    <message>
+        <source>Enable R&amp;PC server</source>
+        <extracomment>An Options window setting to enable the RPC server.</extracomment>
+        <translation>Habilitar servidor R&amp;PC</translation>
+    </message>
+    <message>
+        <source>Whether to set subtract fee from amount as default or not.</source>
+        <extracomment>Tooltip text for Options window setting that sets subtracting the fee from a sending amount as default.</extracomment>
+        <translation>Definir se a taxa deve ser subtraída ou não do valor por padrão.</translation>
+    </message>
+    <message>
+        <source>Subtract &amp;fee from amount by default</source>
+        <extracomment>An Options window setting to set subtracting the fee from a sending amount as default.</extracomment>
+        <translation>Subtrair &amp;taxa do valor por padrão</translation>
+    </message>
+    <message>
+        <source>Enable &amp;PSBT controls</source>
+        <extracomment>An options window setting to enable PSBT controls.</extracomment>
+        <translation>Ativar controles &amp;PSBT</translation>
+    </message>
+    <message>
+        <source>Whether to show PSBT controls.</source>
+        <extracomment>Tooltip text for options window setting that enables PSBT controls.</extracomment>
+        <translation>Se deve mostrar controles PSBT.</translation>
+    </message>
+    <message>
+        <source>Whether to keep the specified custom change address or not.</source>
+        <translation>Definir se o endereço de troco personalizado especificado será mantido.</translation>
+    </message>
+    <message>
+        <source>Keep custom change &amp;address</source>
+        <translation>Manter &amp;endereço de troco personalizado</translation>
+    </message>
     <message>
         <source>Show additional tab listing all your masternodes in first sub-tab&lt;br/&gt;and all masternodes on the network in second sub-tab.</source>
         <translation>Mostre uma guia adicional listando todos os seus masternodes na primeira subposição &lt;br/&gt; e todos os masternodes na rede na segunda sub-guia.</translation>
@@ -1513,6 +1863,14 @@
         <source>Enable &amp;multi-session</source>
         <translation>Ativar &amp;multi-sessão</translation>
     </message>
+    <message>
+        <source>Use this many separate masternodes in parallel to mix funds.&lt;br/&gt;Note: You must use this feature carefully.&lt;br/&gt;Make sure you always have recent wallet (auto)backup in a safe place!</source>
+        <translation>Usar esta quantidade de masternodes separados em paralelo para misturar fundos. &lt;br/&gt;Nota: Use este recurso com cuidado. &lt;br/&gt;Certifique-se de sempre ter um backup (automático) recente da carteira em um local seguro!</translation>
+    </message>
+    <message>
+        <source>Parallel sessions</source>
+        <translation>Sessões paralelas</translation>
+    </message>
     <message>
         <source>Mixing rounds</source>
         <translation>Rodadas de Anonimização</translation>
@@ -1525,6 +1883,30 @@
         <source>Target balance</source>
         <translation>Escolher saldo</translation>
     </message>
+    <message>
+        <source>How many inputs of each denominated amount are created.&lt;br/&gt;Lower these numbers if you want fewer smaller denominations.</source>
+        <translation>Quantas entradas de cada valor denominado são criadas. &lt;br/&gt;Diminua esses números se quiser menos denominações de valor reduzido.</translation>
+    </message>
+    <message>
+        <source>Inputs per denomination</source>
+        <translation>Entradas por denominação</translation>
+    </message>
+    <message>
+        <source>Try to create at least this many inputs for each denominated amount.&lt;br/&gt;Lower this number if you want fewer smaller denominations.</source>
+        <translation>Tente criar pelo menos esta quantidade de entradas para cada denominação. &lt;br/&gt;Diminua esses números se quiser menos denominações de valor reduzido.</translation>
+    </message>
+    <message>
+        <source>Target</source>
+        <translation>Alvo</translation>
+    </message>
+    <message>
+        <source>Create up to this many inputs for each denominated amount.&lt;br/&gt;Lower this number if you want fewer smaller denominations.</source>
+        <translation>Crie até esta quantidade de entradas para cada denominação. &lt;br/&gt;Diminua esses números se quiser menos denominações de valor reduzido.</translation>
+    </message>
+    <message>
+        <source>Maximum</source>
+        <translation>Máximo</translation>
+    </message>
     <message>
         <source>Automatically open the Dash Core client port on the router. This only works when your router supports UPnP and it is enabled.</source>
         <translation>Abre automaticamente a porta para o cliente Dash Core no roteador. Essa função apenas funciona se o seu roteador oferece suporte a UPnP e a opção estiver habilitada.</translation>
@@ -1554,20 +1936,26 @@
         <translation>Mostra se o proxy SOCKS5 padrão fornecido for usado para alcançar pares através deste tipo de rede.</translation>
     </message>
     <message>
-        <source>Options set in this dialog are overridden by the command line or in the configuration file:</source>
-        <translation>As opções definidas nesta caixa de diálogo são substituídas pela linha de comando ou no arquivo de configuração:</translation>
+        <source>Language missing or translation incomplete? Help contributing translations here:
+https://explore.transifex.com/dash/dash/</source>
+        <translation>Idioma ausente ou tradução incompleta? Ajude a contribuir com traduções aqui:
+https://explore.transifex.com/dash/dash/</translation>
     </message>
     <message>
-        <source>Minimize instead of exit the application when the window is closed. When this option is enabled, the application will be closed only after selecting Exit in the menu.</source>
-        <translation>Minimizar em vez de sair do aplicativo quando a janela for fechada. Quando esta opção está ativada, o aplicativo só será fechado selecionando Sair no menu.</translation>
+        <source>Third-party URLs (e.g. a block explorer) that appear in the transactions tab as context menu items.&lt;br/&gt;%s in the URL is replaced by transaction hash. Multiple URLs are separated by vertical bar |.</source>
+        <translation>URLs de terceiros (por exemplo, um explorador de blocos) que aparecem na aba de transações como itens do menu de contexto.&lt;br/&gt;%s na URL é substituído pelo hash da transação. Múltiplas URLs são separadas por barra vertical |.</translation>
+    </message>
+    <message>
+        <source>&amp;Third-party transaction URLs</source>
+        <translation>URLs de transação de &amp;terceiros</translation>
     </message>
     <message>
-        <source>Third party URLs (e.g. a block explorer) that appear in the transactions tab as context menu items.&lt;br/&gt;%s in the URL is replaced by transaction hash. Multiple URLs are separated by vertical bar |.</source>
-        <translation>As URLs de terceiros (por exemplo, um explorador de blocos) que aparecem na guia de transações como itens de menu de contexto. &lt;br/&gt;%s na URL são substituídos por hash de transação. Vários URLs são separados pela barra vertical |.</translation>
+        <source>Options set in this dialog are overridden by the command line or in the configuration file:</source>
+        <translation>As opções definidas nesta caixa de diálogo são substituídas pela linha de comando ou no arquivo de configuração:</translation>
     </message>
     <message>
-        <source>&amp;Third party transaction URLs</source>
-        <translation>&amp;URLs de transações de terceiros</translation>
+        <source>Minimize instead of exit the application when the window is closed. When this option is enabled, the application will be closed only after selecting Exit in the menu.</source>
+        <translation>Minimizar em vez de sair do aplicativo quando a janela for fechada. Quando esta opção está ativada, o aplicativo só será fechado selecionando Sair no menu.</translation>
     </message>
     <message>
         <source>Whether to show coin control features or not.</source>
@@ -1605,6 +1993,10 @@
         <source>Map port using &amp;UPnP</source>
         <translation>Mapear porta usando &amp;UPnP</translation>
     </message>
+    <message>
+        <source>Automatically open the Dash Core client port on the router. This only works when your router supports NAT-PMP and it is enabled. The external port could be random.</source>
+        <translation>Abrir automaticamente a porta do cliente Dash Core no roteador. Isso só funciona se o seu roteador for compatível com NAT-PMP e essa opção estiver ativada. A porta externa pode ser aleatória.</translation>
+    </message>
     <message>
         <source>Proxy &amp;IP:</source>
         <translation>&amp;IP do proxy:</translation>
@@ -1654,8 +2046,16 @@
         <translation>&amp;Mostrar</translation>
     </message>
     <message>
-        <source>User Interface &amp;language:</source>
-        <translation>&amp;Língua da interface com usuário:</translation>
+        <source>Connect to the Dash network through a separate SOCKS5 proxy for Tor onion services.</source>
+        <translation>Conectar à rede Dash por meio de um proxy SOCKS5 separado para serviços Tor onion.</translation>
+    </message>
+    <message>
+        <source>Use separate SOCKS&amp;5 proxy to reach peers via Tor onion services:</source>
+        <translation>Use um SOCKS&amp;5 separado para alcançar pares através de serviços Tor onion:</translation>
+    </message>
+    <message>
+        <source>User Interface &amp;language:</source>
+        <translation>&amp;Língua da interface com usuário:</translation>
     </message>
     <message>
         <source>The user interface language can be set here. This setting will take effect after restarting %1.</source>
@@ -1699,14 +2099,22 @@
     </message>
     <message>
         <source>Confirm options reset</source>
+        <extracomment>Window title text of pop-up window shown when the user has chosen to reset options.</extracomment>
         <translation>Confirmar redefinição de opções</translation>
     </message>
     <message>
         <source>Client restart required to activate changes.</source>
+        <extracomment>Text explaining that the settings changed will not come into effect until the client is restarted.</extracomment>
         <translation>Reinicialização do aplicativo necessária para efetivar alterações.</translation>
     </message>
+    <message>
+        <source>Current settings will be backed up at "%1".</source>
+        <extracomment>Text explaining to the user that the client's current settings will be backed up at a specific location. %1 is a stand-in argument for the backup location's path.</extracomment>
+        <translation>As configurações atuais serão copiadas em "%1".</translation>
+    </message>
     <message>
         <source>Client will be shut down. Do you want to proceed?</source>
+        <extracomment>Text asking the user to confirm if they would like to proceed with a client shutdown.</extracomment>
         <translation>O programa será encerrado. Deseja continuar?</translation>
     </message>
     <message>
@@ -1844,6 +2252,10 @@
         <source>%1 Balance</source>
         <translation>%1 Saldo</translation>
     </message>
+    <message>
+        <source>Discreet mode activated for the Overview tab. To unmask the values, uncheck Settings-&gt;Discreet mode.</source>
+        <translation>O modo discreto foi ativado para a aba Visão Geral. Para desmascarar os valores, desmarque Configurações-&gt;Modo discreto.</translation>
+    </message>
     <message numerus="yes">
         <source>%n Rounds</source>
         <translation><numerusform>%n Rodadas</numerusform><numerusform>%n Rodadas</numerusform><numerusform>%n Rodadas</numerusform></translation>
@@ -1943,7 +2355,140 @@
 </context>
 <context>
     <name>PSBTOperationsDialog</name>
-    </context>
+    <message>
+        <source>Dialog</source>
+        <translation>Diálogo</translation>
+    </message>
+    <message>
+        <source>Sign Tx</source>
+        <translation>Assinar transação</translation>
+    </message>
+    <message>
+        <source>Broadcast Tx</source>
+        <translation>Transmitir transação</translation>
+    </message>
+    <message>
+        <source>Copy to Clipboard</source>
+        <translation>Copiar para a área de transferência</translation>
+    </message>
+    <message>
+        <source>Save…</source>
+        <translation>Salvar...</translation>
+    </message>
+    <message>
+        <source>Close</source>
+        <translation>Fechar</translation>
+    </message>
+    <message>
+        <source>Failed to load transaction: %1</source>
+        <translation>Falha ao carregar a transação: %1</translation>
+    </message>
+    <message>
+        <source>Failed to sign transaction: %1</source>
+        <translation>Falha ao assinar transação: %1</translation>
+    </message>
+    <message>
+        <source>Cannot sign inputs while wallet is locked.</source>
+        <translation>Não é possível assinar as entradas enquanto a carteira estiver bloqueada.</translation>
+    </message>
+    <message>
+        <source>Could not sign any more inputs.</source>
+        <translation>Não foi possível assinar mais entradas.</translation>
+    </message>
+    <message>
+        <source>Signed %1 inputs, but more signatures are still required.</source>
+        <translation>Assinadas %1 entradas, mas ainda são necessárias mais assinaturas.</translation>
+    </message>
+    <message>
+        <source>Signed transaction successfully. Transaction is ready to broadcast.</source>
+        <translation>Transação assinada com sucesso. A transação está pronta para ser transmitida.</translation>
+    </message>
+    <message>
+        <source>Unknown error processing transaction.</source>
+        <translation>Erro desconhecido ao processar transação</translation>
+    </message>
+    <message>
+        <source>Transaction broadcast successfully! Transaction ID: %1</source>
+        <translation>Transação transmitida com sucesso! ID da transação: %1</translation>
+    </message>
+    <message>
+        <source>Transaction broadcast failed: %1</source>
+        <translation>A transmissão da transação falhou: %1</translation>
+    </message>
+    <message>
+        <source>PSBT copied to clipboard.</source>
+        <translation>PSBT copiado para área de transferência</translation>
+    </message>
+    <message>
+        <source>Save Transaction Data</source>
+        <translation>Salvar Dados da Transação</translation>
+    </message>
+    <message>
+        <source>Partially Signed Transaction (Binary)</source>
+        <extracomment>Expanded name of the binary PSBT file format. See: BIP 174.</extracomment>
+        <translation>Transação assinada parcialmente (binário)</translation>
+    </message>
+    <message>
+        <source>PSBT saved to disk.</source>
+        <translation>PSBT salvo no disco.</translation>
+    </message>
+    <message>
+        <source> * Sends %1 to %2</source>
+        <translation> * Envia %1 de %2</translation>
+    </message>
+    <message>
+        <source>own address</source>
+        <translation>endereço próprio</translation>
+    </message>
+    <message>
+        <source>Unable to calculate transaction fee or total transaction amount.</source>
+        <translation>Não foi possível calcular a taxa de transação ou o valor total da transação.</translation>
+    </message>
+    <message>
+        <source>Pays transaction fee: </source>
+        <translation>Paga a taxa de transação:</translation>
+    </message>
+    <message>
+        <source>Total Amount</source>
+        <translation>Valor total</translation>
+    </message>
+    <message>
+        <source>or</source>
+        <translation>ou</translation>
+    </message>
+    <message>
+        <source>Transaction has %1 unsigned inputs.</source>
+        <translation>A transação possui %1 entradas não assinadas.</translation>
+    </message>
+    <message>
+        <source>Transaction is missing some information about inputs.</source>
+        <translation>Está faltando na transação algumas informações sobre as entradas.</translation>
+    </message>
+    <message>
+        <source>Transaction still needs signature(s).</source>
+        <translation>A transação ainda precisa de assinatura(s).</translation>
+    </message>
+    <message>
+        <source>(But no wallet is loaded.)</source>
+        <translation>(Mas nenhuma carteira está carregada.)</translation>
+    </message>
+    <message>
+        <source>(But this wallet cannot sign transactions.)</source>
+        <translation>(Mas esta carteira não pode assinar transações.)</translation>
+    </message>
+    <message>
+        <source>(But this wallet does not have the right keys.)</source>
+        <translation>(Mas esta carteira não possui as chaves corretas.)</translation>
+    </message>
+    <message>
+        <source>Transaction is fully signed and ready for broadcast.</source>
+        <translation>A transação está completamente assinada e está pronta para transmissão</translation>
+    </message>
+    <message>
+        <source>Transaction status is unknown.</source>
+        <translation>O estado da transação é desconhecido.</translation>
+    </message>
+</context>
 <context>
     <name>PaymentServer</name>
     <message>
@@ -1962,6 +2507,12 @@
         <source>'dash://' is not a valid URI. Use 'dash:' instead.</source>
         <translation>'dash://' não é uma URL válida. Use 'dash:' como alternativa.</translation>
     </message>
+    <message>
+        <source>Cannot process payment request as BIP70 is no longer supported.
+Due to discontinued support, you should request the merchant to provide you with a BIP21 compatible URI or use a wallet that does continue to support BIP70.</source>
+        <translation>Não é possível processar o pedido de pagamento, pois o BIP70 não é mais suportado.
+Devido ao suporte descontinuado, você deve solicitar ao comerciante que forneça um URI compatível com BIP21 ou usar uma carteira que continue a suportar o BIP70.</translation>
+    </message>
     <message>
         <source>URI cannot be parsed! This can be caused by an invalid Dash address or malformed URI parameters.</source>
         <translation>A URI não pode ser analisada! Isto pode ser causado por um endereço inválido ou um parâmetro URI malformado.</translation>
@@ -1983,6 +2534,26 @@
         <extracomment>Title of Peers Table column which indicates the current latency of the connection with the peer.</extracomment>
         <translation>Ping</translation>
     </message>
+    <message>
+        <source>Peer</source>
+        <extracomment>Title of Peers Table column which contains a unique number used to identify a connection.</extracomment>
+        <translation>Par</translation>
+    </message>
+    <message>
+        <source>Age</source>
+        <extracomment>Title of Peers Table column which indicates the duration (length of time) since the peer connection started.</extracomment>
+        <translation>Duração</translation>
+    </message>
+    <message>
+        <source>Direction</source>
+        <extracomment>Title of Peers Table column which indicates the direction the peer connection was initiated from.</extracomment>
+        <translation>Direção</translation>
+    </message>
+    <message>
+        <source>Type</source>
+        <extracomment>Title of Peers Table column which describes the type of peer connection. The "type" describes why the connection exists.</extracomment>
+        <translation>Tipo</translation>
+    </message>
     <message>
         <source>Sent</source>
         <extracomment>Title of Peers Table column which indicates the total amount of network information we have sent to the peer.</extracomment>
@@ -1993,7 +2564,27 @@
         <extracomment>Title of Peers Table column which indicates the total amount of network information we have received from the peer.</extracomment>
         <translation>Recebido</translation>
     </message>
-    </context>
+    <message>
+        <source>Address</source>
+        <extracomment>Title of Peers Table column which contains the IP/Onion/I2P address of the connected peer.</extracomment>
+        <translation>Endereço</translation>
+    </message>
+    <message>
+        <source>Network</source>
+        <extracomment>Title of Peers Table column which states the network the peer connected through.</extracomment>
+        <translation>Rede</translation>
+    </message>
+    <message>
+        <source>Inbound</source>
+        <extracomment>An Inbound Connection from a Peer.</extracomment>
+        <translation>Entrada</translation>
+    </message>
+    <message>
+        <source>Outbound</source>
+        <extracomment>An Outbound Connection to a Peer.</extracomment>
+        <translation>Saída</translation>
+    </message>
+</context>
 <context>
     <name>Proposal</name>
     <message>
@@ -2033,7 +2624,7 @@
     </message>
     <message>
         <source>Amount</source>
-        <translation>Quantidade</translation>
+        <translation>Valor</translation>
     </message>
     <message>
         <source>Active</source>
@@ -2044,8 +2635,193 @@
         <translation>Status</translation>
     </message>
 </context>
+<context>
+    <name>ProposalWizard</name>
+    <message>
+        <source>Create Governance Proposal</source>
+        <translation>Criar proposta de governança</translation>
+    </message>
+    <message>
+        <source>Enter proposal details</source>
+        <translation>Digite os detalhes da proposta</translation>
+    </message>
+    <message>
+        <source>A fee will be burned when you prepare the proposal.</source>
+        <translation>Uma taxa será queimada quando você preparar a proposta.</translation>
+    </message>
+    <message>
+        <source>Proposal &amp;name</source>
+        <translation>&amp;Nome da proposta</translation>
+    </message>
+    <message>
+        <source>&amp;Description URL</source>
+        <translation>URL da &amp;descrição</translation>
+    </message>
+    <message>
+        <source>Payment &amp;address</source>
+        <translation>&amp;Endereço de pagamento</translation>
+    </message>
+    <message>
+        <source>Payment &amp;amount</source>
+        <translation>V&amp;alor do pagamento</translation>
+    </message>
+    <message>
+        <source>The amount to request in a single payment</source>
+        <translation>O valor a solicitar em um único pagamento</translation>
+    </message>
+    <message>
+        <source>&amp;First payment</source>
+        <translation>&amp;Primeiro pagamento</translation>
+    </message>
+    <message>
+        <source>Pa&amp;yments</source>
+        <translation>Pa&amp;gamentos</translation>
+    </message>
+    <message>
+        <source>To&amp;tal amount</source>
+        <translation>Valor to&amp;tal</translation>
+    </message>
+    <message>
+        <source>Proposal &amp;fee</source>
+        <translation>&amp;Taxa da proposta</translation>
+    </message>
+    <message>
+        <source>Next</source>
+        <translation>Próximo</translation>
+    </message>
+    <message>
+        <source>Review proposal JSON and validate.</source>
+        <translation>Revisar JSON da proposta e validar.</translation>
+    </message>
+    <message>
+        <source>Hex-encoded JSON</source>
+        <translation>JSON codificado em Hex</translation>
+    </message>
+    <message>
+        <source>Back</source>
+        <translation>Voltar</translation>
+    </message>
+    <message>
+        <source>Validate</source>
+        <translation>Validar</translation>
+    </message>
+    <message>
+        <source>Prepare (burn fee) and wait for confirmations.</source>
+        <translation>Preparar (queimar taxa) e aguardar confirmações.</translation>
+    </message>
+    <message>
+        <source>Copy</source>
+        <translation>Copiar</translation>
+    </message>
+    <message>
+        <source>At 1/6 confirmations: can be relayed and queued. At 6/6: accepted and processed.</source>
+        <translation>Em 1/6 confirmações: pode ser retransmitida e enfileirada. Em 6/6: aceita e processada.</translation>
+    </message>
+    <message>
+        <source>Confirmations progress</source>
+        <translation>Progresso das confirmações</translation>
+    </message>
+    <message>
+        <source>Shows progress toward the required number of confirmations for the proposal fee transaction.</source>
+        <translation>Mostra o progresso em direção ao número necessário de confirmações para a transação de taxa da proposta.</translation>
+    </message>
+    <message>
+        <source>Estimated time remaining: -</source>
+        <translation>Tempo estimado restante: -</translation>
+    </message>
+    <message>
+        <source>Prepare Proposal</source>
+        <translation>Preparar proposta</translation>
+    </message>
+    <message>
+        <source>You can submit after 1 confirmation. At 6 confirmations it is accepted and processed.</source>
+        <translation>Você pode enviar após 1 confirmação. Em 6 confirmações é aceita e processada.</translation>
+    </message>
+    <message>
+        <source>Proposal ID:</source>
+        <translation>ID da proposta:</translation>
+    </message>
+    <message>
+        <source>Submit Proposal</source>
+        <translation>Enviar proposta</translation>
+    </message>
+    <message>
+        <source>Close</source>
+        <translation>Fechar</translation>
+    </message>
+    <message>
+        <source>Valid</source>
+        <translation>Válido</translation>
+    </message>
+    <message>
+        <source>Invalid: %1</source>
+        <translation>Inválido: %1</translation>
+    </message>
+    <message>
+        <source>Burn %1</source>
+        <translation>Queimar %1</translation>
+    </message>
+    <message>
+        <source>Burn %1 to create the fee transaction?</source>
+        <translation>Queimar %1 para criar a transação de taxa?</translation>
+    </message>
+    <message>
+        <source>Prepare failed</source>
+        <translation>Falha ao preparar</translation>
+    </message>
+    <message>
+        <source>Confirmations: %1 / %2 required</source>
+        <translation>Confirmações: %1 / %2 necessárias</translation>
+    </message>
+    <message>
+        <source>Estimated time remaining: Ready</source>
+        <translation>Tempo estimado restante: Pronto</translation>
+    </message>
+    <message numerus="yes">
+        <source>Estimated time remaining: %n minute(s)</source>
+        <translation><numerusform>Tempo estimado restante: %n minuto</numerusform><numerusform>Tempo estimado restante: %n minutos</numerusform><numerusform>Tempo estimado restante: %n minutos</numerusform></translation>
+    </message>
+    <message>
+        <source>Your proposal was submitted successfully.</source>
+        <translation>Sua proposta foi enviada com sucesso.</translation>
+    </message>
+    <message>
+        <source>Already submitted</source>
+        <translation>Já enviada</translation>
+    </message>
+    <message>
+        <source>This proposal has already been submitted.</source>
+        <translation>Esta proposta já foi enviada.</translation>
+    </message>
+    <message>
+        <source>Submission failed</source>
+        <translation>Falha no envio</translation>
+    </message>
+    <message>
+        <source>Proposal submitted</source>
+        <translation>Proposta enviada</translation>
+    </message>
+    <message>
+        <source>A fee of %1 will be burned when you prepare the proposal.</source>
+        <translation>Uma taxa de %1 será queimada quando você preparar a proposta.</translation>
+    </message>
+    <message>
+        <source>Prepare (burn %1) and wait for %2 confirmations.</source>
+        <translation>Preparar (queimar %1) e aguardar %2 confirmações.</translation>
+    </message>
+</context>
 <context>
     <name>QObject</name>
+    <message>
+        <source>Do you want to reset settings to default values, or to abort without making changes?</source>
+        <extracomment>Explanatory text shown on startup when the settings file cannot be read. Prompts user to make a choice between resetting or aborting.</extracomment>
+        <translation>Você deseja redefinir as configurações para os valores padrão ou abortar sem fazer alterações? </translation>
+    </message>
+    <message>
+        <source>A fatal error occurred. Check that settings file is writable, or try running with -nosettings.</source>
+        <extracomment>Explanatory text shown on startup when the settings file could not be written. Prompts user to check that we have the ability to write to the file. Explains that the user has the option of running without a settings file.</extracomment>
+        <translation>Ocorreu um erro fatal. Verifique se o arquivo de configurações é gravável ou tente executar com a opção com -nosettings</translation>
+    </message>
     <message>
         <source>Choose data directory on startup (default: %u)</source>
         <translation>Escolher diretório de dados na inicialização (padrão: %u)</translation>
@@ -2128,7 +2904,7 @@
     </message>
     <message>
         <source>Amount</source>
-        <translation>Quantia</translation>
+        <translation>Valor</translation>
     </message>
     <message>
         <source>Enter a Dash address (e.g. %1)</source>
@@ -2146,6 +2922,53 @@
         <source>This can also be adjusted later in the "Appearance" tab of the preferences.</source>
         <translation>Isso também pode ser ajustado posteriormente na aba "Aparência" nas preferências.</translation>
     </message>
+    <message>
+        <source>Ctrl+W</source>
+        <translation>Ctrl+W</translation>
+    </message>
+    <message>
+        <source>Unroutable</source>
+        <translation>Não roteável</translation>
+    </message>
+    <message>
+        <source>Internal</source>
+        <translation>Interno</translation>
+    </message>
+    <message>
+        <source>Inbound</source>
+        <extracomment>An inbound connection from a peer. An inbound connection is a connection initiated by a peer.</extracomment>
+        <translation>Entrada</translation>
+    </message>
+    <message>
+        <source>Outbound</source>
+        <extracomment>An outbound connection to a peer. An outbound connection is a connection initiated by us.</extracomment>
+        <translation>Saída</translation>
+    </message>
+    <message>
+        <source>Full Relay</source>
+        <extracomment>Peer connection type that relays all network information.</extracomment>
+        <translation>Retransmissão Completa</translation>
+    </message>
+    <message>
+        <source>Block Relay</source>
+        <extracomment>Peer connection type that relays network information about blocks and not transactions or addresses.</extracomment>
+        <translation>Retransmissão de Blocos</translation>
+    </message>
+    <message>
+        <source>Manual</source>
+        <extracomment>Peer connection type established manually through one of several methods.</extracomment>
+        <translation>Manual</translation>
+    </message>
+    <message>
+        <source>Feeler</source>
+        <extracomment>Short-lived peer connection type that tests the aliveness of known addresses.</extracomment>
+        <translation>Sondagem</translation>
+    </message>
+    <message>
+        <source>Address Fetch</source>
+        <extracomment>Short-lived peer connection type that solicits known addresses from a peer.</extracomment>
+        <translation>Busca de endereço</translation>
+    </message>
     <message>
         <source>%1 d</source>
         <translation>%1 d</translation>
@@ -2207,8 +3030,8 @@
         <translation>%1 B</translation>
     </message>
     <message>
-        <source>%1 KB</source>
-        <translation>%1 KB</translation>
+        <source>%1 kB</source>
+        <translation>%1 kB</translation>
     </message>
     <message>
         <source>%1 MB</source>
@@ -2264,7 +3087,12 @@
         <source>Save QR Code</source>
         <translation>Salvar código QR</translation>
     </message>
-    </context>
+    <message>
+        <source>PNG Image</source>
+        <extracomment>Expanded name of the PNG file format. See: https://en.wikipedia.org/wiki/Portable_Network_Graphics.</extracomment>
+        <translation>Imagem PNG</translation>
+    </message>
+</context>
 <context>
     <name>RPCConsole</name>
     <message>
@@ -2371,6 +3199,14 @@
         <source>Version</source>
         <translation>Versão</translation>
     </message>
+    <message>
+        <source>High bandwidth BIP152 compact block relay: %1</source>
+        <translation>Retransmissão de blocos compactos BIP152 de alta largura de banda: %1</translation>
+    </message>
+    <message>
+        <source>High Bandwidth</source>
+        <translation>Alta largura de banda</translation>
+    </message>
     <message>
         <source>Starting Block</source>
         <translation>Bloco inicial</translation>
@@ -2383,6 +3219,51 @@
         <source>Synced Blocks</source>
         <translation>Blocos Sincronizados</translation>
     </message>
+    <message>
+        <source>Elapsed time since a novel block passing initial validity checks was received from this peer.</source>
+        <translation>Tempo decorrido desde que um novo bloco, passando nas verificações iniciais de validade, foi recebido deste par.</translation>
+    </message>
+    <message>
+        <source>Last Block</source>
+        <translation>Último bloqueio</translation>
+    </message>
+    <message>
+        <source>Elapsed time since a novel transaction accepted into our mempool was received from this peer.</source>
+        <extracomment>Tooltip text for the Last Transaction field in the peer details area.</extracomment>
+        <translation>Tempo decorrido desde que uma nova transação aceita em nosso mempool foi recebida deste par.</translation>
+    </message>
+    <message>
+        <source>Last Transaction</source>
+        <translation>Última transação</translation>
+    </message>
+    <message>
+        <source>The mapped Autonomous System used for diversifying peer selection.</source>
+        <translation>Sistema Autônomo mapeado usado para diversificar a seleção de pares.</translation>
+    </message>
+    <message>
+        <source>Mapped AS</source>
+        <translation>Sistema Autônomo Mapeado</translation>
+    </message>
+    <message>
+        <source>Whether we relay addresses to this peer.</source>
+        <extracomment>Tooltip text for the Address Relay field in the peer details area, which displays whether we relay addresses to this peer (Yes/No).</extracomment>
+        <translation>Se retransmitimos endereços para este par.</translation>
+    </message>
+    <message>
+        <source>Address Relay</source>
+        <extracomment>Text title for the Address Relay field in the peer details area, which displays whether we relay addresses to this peer (Yes/No).</extracomment>
+        <translation>Retransmissão de endereço</translation>
+    </message>
+    <message>
+        <source>Addresses Processed</source>
+        <extracomment>Text title for the Addresses Processed field in the peer details area, which displays the total number of addresses received from this peer that were processed (excludes addresses that were dropped due to rate-limiting).</extracomment>
+        <translation>Endereço Processado</translation>
+    </message>
+    <message>
+        <source>Addresses Rate-Limited</source>
+        <extracomment>Text title for the Addresses Rate-Limited field in the peer details area, which displays the total number of addresses received from this peer that were dropped (not processed) due to rate-limiting.</extracomment>
+        <translation>Endereços com Limite de Taxa</translation>
+    </message>
     <message>
         <source>Rescan blockchain files 1</source>
         <translation>Reescanear o blockchain 1</translation>
@@ -2423,6 +3304,22 @@
         <source>To specify a non-default location of the blocks directory use the '%1' option.</source>
         <translation>Para especificar um local fora do padrão do diretório de blocos, use a opção '%1'.</translation>
     </message>
+    <message>
+        <source>Local Addresses</source>
+        <translation>Endereços locais</translation>
+    </message>
+    <message>
+        <source>Network addresses that your Dash node is currently using to communicate with other nodes.</source>
+        <translation>Endereços de rede que seu nó Dash está usando atualmente para se comunicar com outros nós.</translation>
+    </message>
+    <message>
+        <source>Number of regular Masternodes</source>
+        <translation>Número de Masternodes regulares</translation>
+    </message>
+    <message>
+        <source>Number of EvoNodes</source>
+        <translation>Número de EvoNodes</translation>
+    </message>
     <message>
         <source>Current block height</source>
         <translation>Altura do bloco atual</translation>
@@ -2471,10 +3368,50 @@
         <source>PoSe Score</source>
         <translation>Contagem PoSe</translation>
     </message>
+    <message>
+        <source>The transport layer version: %1</source>
+        <translation>A versão da camada de transporte: %1</translation>
+    </message>
+    <message>
+        <source>Transport</source>
+        <translation>Transporte</translation>
+    </message>
+    <message>
+        <source>The BIP324 session ID string in hex.</source>
+        <translation>A string ID da sessão BIP324 em hexadecimal.</translation>
+    </message>
+    <message>
+        <source>Session ID</source>
+        <translation>ID da sessão</translation>
+    </message>
+    <message>
+        <source>The network protocol this peer is connected through: IPv4, IPv6, Onion, I2P, or CJDNS.</source>
+        <translation>O protocolo de rede através do qual este par está conectado: IPv4, IPv6, Onion, I2P ou CJDNS.</translation>
+    </message>
+    <message>
+        <source>Permissions</source>
+        <translation>Permissões</translation>
+    </message>
+    <message>
+        <source>The direction and type of peer connection: %1</source>
+        <translation>A direção e o tipo de conexão do par: %1</translation>
+    </message>
+    <message>
+        <source>Direction/Type</source>
+        <translation>Direção/Tipo</translation>
+    </message>
     <message>
         <source>Services</source>
         <translation>Serviços</translation>
     </message>
+    <message>
+        <source>Whether we relay transactions to this peer.</source>
+        <translation>Se retransmitimos transações para este par.</translation>
+    </message>
+    <message>
+        <source>Transaction Relay</source>
+        <translation>Retransmissão de transação</translation>
+    </message>
     <message>
         <source>Connection Time</source>
         <translation>Tempo de conexão</translation>
@@ -2511,6 +3448,16 @@
         <source>&amp;Wallet Repair</source>
         <translation>&amp;Reparar carteira</translation>
     </message>
+    <message>
+        <source>The total number of addresses received from this peer that were processed (excludes addresses that were dropped due to rate-limiting).</source>
+        <extracomment>Tooltip text for the Addresses Processed field in the peer details area, which displays the total number of addresses received from this peer that were processed (excludes addresses that were dropped due to rate-limiting).</extracomment>
+        <translation>O número total de endereços recebidos deste par que foram processados (exclui endereços que foram descartados devido à limitação de taxa).</translation>
+    </message>
+    <message>
+        <source>The total number of addresses received from this peer that were dropped (not processed) due to rate-limiting.</source>
+        <extracomment>Tooltip text for the Addresses Rate-Limited field in the peer details area, which displays the total number of addresses received from this peer that were dropped (not processed) due to rate-limiting.</extracomment>
+        <translation>O número total de endereços recebidos deste par que foram descartados (não processados) devido à limitação de taxa.</translation>
+    </message>
     <message>
         <source>Wallet repair options.</source>
         <translation>Opções de reparação da carteira.</translation>
@@ -2524,52 +3471,82 @@
         <translation>-reindex: Reconstrói o índice de cadeia de blocos a partir dos arquivos atuais de dados blk000??.dat .</translation>
     </message>
     <message>
-        <source>&amp;Disconnect</source>
-        <translation>&amp;Desconectar</translation>
+        <source>Inbound: initiated by peer</source>
+        <extracomment>Explanatory text for an inbound peer connection.</extracomment>
+        <translation>Entrada: iniciada pelo par</translation>
     </message>
     <message>
-        <source>Ban for</source>
-        <translation>Banir por</translation>
+        <source>Outbound Full Relay: default</source>
+        <extracomment>Explanatory text for an outbound peer connection that relays all network information. This is the default behavior for outbound connections.</extracomment>
+        <translation>Saída Retransmissão Completa: padrão</translation>
     </message>
     <message>
-        <source>1 &amp;hour</source>
-        <translation>1 &amp;hora</translation>
+        <source>Outbound Block Relay: does not relay transactions or addresses</source>
+        <extracomment>Explanatory text for an outbound peer connection that relays network information about blocks and not transactions or addresses.</extracomment>
+        <translation>Saída Retransmissão de Blocos: não retransmite transações ou endereços</translation>
     </message>
     <message>
-        <source>1 &amp;day</source>
-        <translation>1 &amp;dia</translation>
+        <source>Outbound Manual: added using RPC %1 or %2/%3 configuration options</source>
+        <extracomment>Explanatory text for an outbound peer connection that was established manually through one of several methods. The numbered arguments are stand-ins for the methods available to establish manual connections.</extracomment>
+        <translation>Saída Manual: adicionada usando as opções de configuração RPC %1 ou %2/%3</translation>
     </message>
     <message>
-        <source>1 &amp;week</source>
-        <translation>1 &amp;semana</translation>
+        <source>Outbound Feeler: short-lived, for testing addresses</source>
+        <extracomment>Explanatory text for a short-lived outbound peer connection that is used to test the aliveness of known addresses.</extracomment>
+        <translation>Saída de sondagem: de curta duração, para testar endereços</translation>
     </message>
     <message>
-        <source>1 &amp;year</source>
-        <translation>1 &amp;ano</translation>
+        <source>Outbound Address Fetch: short-lived, for soliciting addresses</source>
+        <extracomment>Explanatory text for a short-lived outbound peer connection that is used to request addresses from a peer.</extracomment>
+        <translation>Saída para busca de endereços: de curta duração, para solicitar endereços</translation>
     </message>
     <message>
-        <source>&amp;Unban</source>
-        <translation>&amp;Desbanir</translation>
+        <source>To</source>
+        <translation>Para</translation>
+    </message>
+    <message>
+        <source>we selected the peer for high bandwidth relay</source>
+        <translation>nós selecionamos o par para retransmissão de alta largura de banda</translation>
     </message>
     <message>
-        <source>Welcome to the %1 RPC console.</source>
-        <translation>Bem-vindo ao console RPC do %1.</translation>
+        <source>From</source>
+        <translation>De</translation>
     </message>
     <message>
-        <source>Use up and down arrows to navigate history, and %1 to clear screen.</source>
-        <translation>Use as setas para cima e para baixo para navegar pelo histórico, e %1 para limpar a tela.</translation>
+        <source>the peer selected us for high bandwidth relay</source>
+        <translation>o par nos selecionou para retransmissão de alta largura de banda</translation>
     </message>
     <message>
-        <source>Type %1 for an overview of available commands.</source>
-        <translation>Digite %1 para obter uma visão geral dos comandos disponíveis.</translation>
+        <source>No</source>
+        <translation>Não</translation>
+    </message>
+    <message>
+        <source>no high bandwidth relay selected</source>
+        <translation>nenhuma retransmissão de alta largura de banda selecionada</translation>
+    </message>
+    <message>
+        <source>&amp;Disconnect</source>
+        <translation>&amp;Desconectar</translation>
     </message>
     <message>
-        <source>For more information on using this console type %1.</source>
-        <translation>Para mais informações sobre como usar este painel, digite %1.</translation>
+        <source>Ban for</source>
+        <translation>Banir por</translation>
+    </message>
+    <message>
+        <source>1 &amp;hour</source>
+        <translation>1 &amp;hora</translation>
+    </message>
+    <message>
+        <source>1 &amp;week</source>
+        <translation>1 &amp;semana</translation>
+    </message>
+    <message>
+        <source>1 &amp;year</source>
+        <translation>1 &amp;ano</translation>
     </message>
     <message>
-        <source>WARNING: Scammers have been active, telling users to type commands here, stealing their wallet contents. Do not use this console without fully understanding the ramifications of a command.</source>
-        <translation>AVISO: Os golpistas estão ativos, dizendo aos usuários para digitar comandos aqui, roubando o conteúdo da carteira. Não use este console sem compreender totalmente o contexto de um comando.</translation>
+        <source>&amp;Unban</source>
+        <translation>&amp;Desbanir</translation>
     </message>
     <message>
         <source>In:</source>
@@ -2583,6 +3560,10 @@
         <source>Network activity disabled</source>
         <translation>Atividade da rede disativada</translation>
     </message>
+    <message>
+        <source>None</source>
+        <translation>Nenhum</translation>
+    </message>
     <message>
         <source>Total: %1 (Enabled: %2)</source>
         <translation>Total: %1 (Habilitado: %2)</translation>
@@ -2591,10 +3572,105 @@
         <source>Executing command without any wallet</source>
         <translation>Execução de comando sem nenhuma carteira</translation>
     </message>
+    <message>
+        <source>Ctrl++</source>
+        <extracomment>Main shortcut to increase the RPC console font size.</extracomment>
+        <translation>Ctrl++</translation>
+    </message>
+    <message>
+        <source>Ctrl+=</source>
+        <extracomment>Secondary shortcut to increase the RPC console font size.</extracomment>
+        <translation>Ctrl+=</translation>
+    </message>
+    <message>
+        <source>Ctrl+-</source>
+        <extracomment>Main shortcut to decrease the RPC console font size.</extracomment>
+        <translation>Ctrl+-</translation>
+    </message>
+    <message>
+        <source>Ctrl+_</source>
+        <extracomment>Secondary shortcut to decrease the RPC console font size.</extracomment>
+        <translation>Ctrl+_</translation>
+    </message>
+    <message>
+        <source>Ctrl+Shift+I</source>
+        <translation>Ctrl+Shift+I</translation>
+    </message>
+    <message>
+        <source>Ctrl+Shift+C</source>
+        <translation>Ctrl+Shift+C</translation>
+    </message>
+    <message>
+        <source>Ctrl+Shift+G</source>
+        <translation>Ctrl+Shift+G</translation>
+    </message>
+    <message>
+        <source>Ctrl+Shift+P</source>
+        <translation>Ctrl+Shift+P</translation>
+    </message>
+    <message>
+        <source>Ctrl+Shift+R</source>
+        <translation>Ctrl+Shift+R</translation>
+    </message>
     <message>
         <source>Executing command using "%1" wallet</source>
         <translation>Execução de comando usando a carteira "%1"</translation>
     </message>
+    <message>
+        <source>detecting: peer could be v1 or v2</source>
+        <extracomment>Explanatory text for "detecting" transport type.</extracomment>
+        <translation>detectando: o par pode ser v1 ou v2</translation>
+    </message>
+    <message>
+        <source>v1: unencrypted, plaintext transport protocol</source>
+        <extracomment>Explanatory text for v1 transport type.</extracomment>
+        <translation>v1: não criptografado, protocolo de transporte de texto simples</translation>
+    </message>
+    <message>
+        <source>v2: BIP324 encrypted transport protocol</source>
+        <extracomment>Explanatory text for v2 transport type.</extracomment>
+        <translation>v2: protocolo de transporte criptografado BIP324</translation>
+    </message>
+    <message>
+        <source>&amp;Copy address</source>
+        <extracomment>Context menu action to copy the address of a peer</extracomment>
+        <translation>&amp;Copiar endereço</translation>
+    </message>
+    <message>
+        <source>1 d&amp;ay</source>
+        <translation>1 &amp;dia</translation>
+    </message>
+    <message>
+        <source>&amp;Copy IP/Netmask</source>
+        <extracomment>Context menu action to copy the IP/Netmask of a banned peer. IP/Netmask is the combination of a peer's IP address and its Netmask. For IP address see: https://en.wikipedia.org/wiki/IP_address</extracomment>
+        <translation>&amp;Copiar IP/Netmask</translation>
+    </message>
+    <message>
+        <source>Welcome to the %1 RPC console.
+Use up and down arrows to navigate history, and %2 to clear screen.
+Use %3 and %4 to increase or decrease the font size.
+Type %5 for an overview of available commands.
+For more information on using this console, type %6.
+
+%7WARNING: Scammers have been active, telling users to type commands here, stealing their wallet contents. Do not use this console without fully understanding the ramifications of a command.%8</source>
+        <extracomment>RPC console welcome message. Placeholders %7 and %8 are style tags for the warning content, and they are not space separated from the rest of the text intentionally.</extracomment>
+        <translation>Bem-vindo ao painel RPC %1.
+Use as setas para cima e para baixo para navegar pelo histórico e %2 para limpar a tela.
+Use %3 e %4 para aumentar ou diminuir o tamanho da fonte.
+Digite %5 para uma visão geral dos comandos disponíveis.
+Para obter mais informações sobre como usar este console, digite %6.
+
+%7AVISO: Golpistas estão ativos, dizendo aos usuários para digitarem comandos aqui, roubando o conteúdo de suas carteiras. Não use este painel sem entender completamente as ramificações de um comando.%8</translation>
+    </message>
+    <message>
+        <source>Executing…</source>
+        <extracomment>A console message indicating an entered command is currently being executed.</extracomment>
+        <translation>Executando...</translation>
+    </message>
+    <message>
+        <source>(peer: %1)</source>
+        <translation>(par: %1)</translation>
+    </message>
     <message>
         <source>via %1</source>
         <translation>por %1</translation>
@@ -2611,11 +3687,19 @@
         <source>Verified Masternode</source>
         <translation>Masternode verificado</translation>
     </message>
+    <message>
+        <source>Yes</source>
+        <translation>Sim</translation>
+    </message>
     <message>
         <source>Unknown</source>
         <translation>Desconhecido</translation>
     </message>
-    </context>
+    <message>
+        <source>Never</source>
+        <translation>Nunca</translation>
+    </message>
+</context>
 <context>
     <name>ReceiveCoinsDialog</name>
     <message>
@@ -2634,6 +3718,10 @@
         <source>An optional message to attach to the payment request, which will be displayed when the request is opened.&lt;br&gt;Note: The message will not be sent with the payment over the Dash network.</source>
         <translation>Uma mensagem opcional para anexar à solicitação de pagamento, que será exibida quando a solicitação for aberta. &lt;br&gt;Observação: a mensagem não será enviada com o pagamento pela rede do Dash.</translation>
     </message>
+    <message>
+        <source>An optional label to associate with the new receiving address (used by you to identify an invoice).  It is also attached to the payment request.</source>
+        <translation>Um rótulo opcional para associar ao novo endereço de recebimento (usado por você para identificar uma fatura). Também é anexado à solicitação de pagamento.</translation>
+    </message>
     <message>
         <source>Use this form to request payments. All fields are &lt;b&gt;optional&lt;/b&gt;.</source>
         <translation>Use esse formulário para fazer cobranças. Todos os campos são &lt;b&gt;opcionais&lt;/b&gt;.</translation>
@@ -2691,28 +3779,60 @@
         <translation>Insira uma mensagem para anexar à solicitação de pagamento</translation>
     </message>
     <message>
-        <source>Copy URI</source>
-        <translation>Copiar URI</translation>
+        <source>Copy &amp;URI</source>
+        <translation>Copiar &amp;URI</translation>
     </message>
     <message>
-        <source>Copy address</source>
-        <translation>Copiar endereço</translation>
+        <source>&amp;Copy address</source>
+        <translation>&amp;Copiar endereço</translation>
     </message>
     <message>
-        <source>Copy label</source>
-        <translation>Copiar rótulo</translation>
+        <source>Copy &amp;label</source>
+        <translation>Copiar &amp;Identificador</translation>
     </message>
     <message>
-        <source>Copy message</source>
-        <translation>Copiar mensagem</translation>
+        <source>Copy &amp;message</source>
+        <translation>Copiar &amp;mensagem</translation>
     </message>
     <message>
-        <source>Copy amount</source>
-        <translation>Copiar quantia</translation>
+        <source>Copy &amp;amount</source>
+        <translation>Copiar &amp;valor</translation>
+    </message>
+    <message>
+        <source>Could not unlock wallet.</source>
+        <translation>Não foi possível desbloquear carteira.</translation>
+    </message>
+    <message>
+        <source>Could not generate new address</source>
+        <translation>Não foi possível gerar novo endereço</translation>
     </message>
-    </context>
+</context>
 <context>
     <name>ReceiveRequestDialog</name>
+    <message>
+        <source>Request payment to …</source>
+        <translation>Solicitar pagamento para ...</translation>
+    </message>
+    <message>
+        <source>Address:</source>
+        <translation>Endereço:</translation>
+    </message>
+    <message>
+        <source>Amount:</source>
+        <translation>Valor:</translation>
+    </message>
+    <message>
+        <source>Label:</source>
+        <translation>Identificador:</translation>
+    </message>
+    <message>
+        <source>Message:</source>
+        <translation>Mensagem:</translation>
+    </message>
+    <message>
+        <source>Wallet:</source>
+        <translation>Carteira:</translation>
+    </message>
     <message>
         <source>Copy &amp;URI</source>
         <translation>Copiar &amp;URI</translation>
@@ -2765,6 +3885,34 @@
         <translation>Solicitado</translation>
     </message>
 </context>
+<context>
+    <name>RestoreWalletActivity</name>
+    <message>
+        <source>Restore Wallet</source>
+        <extracomment>Title of progress window which is displayed when wallets are being restored.</extracomment>
+        <translation>Restaurar carteira</translation>
+    </message>
+    <message>
+        <source>Restoring Wallet &lt;b&gt;%1&lt;/b&gt;…</source>
+        <extracomment>Descriptive text of the restore wallets progress window which indicates to the user that wallets are currently being restored.</extracomment>
+        <translation>Restaurando carteira &lt;b&gt;%1&lt;/b&gt;…</translation>
+    </message>
+    <message>
+        <source>Restore wallet failed</source>
+        <extracomment>Title of message box which is displayed when the wallet could not be restored.</extracomment>
+        <translation>Falha ao restaurar carteira</translation>
+    </message>
+    <message>
+        <source>Restore wallet warning</source>
+        <extracomment>Title of message box which is displayed when the wallet is restored with some warning.</extracomment>
+        <translation>Aviso de restauração de carteira</translation>
+    </message>
+    <message>
+        <source>Restore wallet message</source>
+        <extracomment>Title of message box which is displayed when the wallet is successfully restored.</extracomment>
+        <translation>Mensagem de restauração de carteira</translation>
+    </message>
+</context>
 <context>
     <name>SendCoinsDialog</name>
     <message>
@@ -2799,10 +3947,6 @@
         <source>Fee:</source>
         <translation>Taxa:</translation>
     </message>
-    <message>
-        <source>Dust:</source>
-        <translation>Poeira:</translation>
-    </message>
     <message>
         <source>Inputs…</source>
         <translation>Entradas…</translation>
@@ -2827,9 +3971,17 @@
         <source>Transaction Fee:</source>
         <translation>Taxa de transação</translation>
     </message>
+    <message>
+        <source>When there is less transaction volume than space in the blocks, miners as well as relaying nodes may enforce a minimum fee. Paying only this minimum fee is just fine, but be aware that this can result in a never confirming transaction once there is more demand for dash transactions than the network can process.</source>
+        <translation>Quando o volume de transações é menor do que o espaço nos blocos, mineradores e nós de retransmissão podem impor uma taxa mínima. Pagar apenas essa taxa mínima é perfeitamente aceitável, mas esteja ciente de que isso pode resultar em uma transação que nunca será confirmada, uma vez que houver mais demanda por transações Dash do que a rede pode processar.</translation>
+    </message>
+    <message>
+        <source>A too low fee might result in a never confirming transaction (read the tooltip)</source>
+        <translation>Uma taxa muito baixa pode resultar em uma transação que nunca será confirmada (leia a dica de ferramenta)</translation>
+    </message>
     <message>
         <source>(Smart fee not initialized yet. This usually takes a few blocks…)</source>
-        <translation>(Smart fee não iniciado. Isso requer alguns blocos…)</translation>
+        <translation>(Taxa inteligente ainda não inicializada. Isso normalmente requer alguns blocos…)</translation>
     </message>
     <message>
         <source>Confirmation time target:</source>
@@ -2919,10 +4071,6 @@
         <source>Copy bytes</source>
         <translation>Copiar bytes</translation>
     </message>
-    <message>
-        <source>Copy dust</source>
-        <translation>Copiar poeira</translation>
-    </message>
     <message>
         <source>Copy change</source>
         <translation>Copiar troco</translation>
@@ -2939,10 +4087,6 @@
         <source>%1 to %2</source>
         <translation>%1 a %2</translation>
     </message>
-    <message>
-        <source>Are you sure you want to send?</source>
-        <translation>Você tem certeza que deseja enviar?</translation>
-    </message>
     <message>
         <source>&lt;b&gt;(%1 of %2 entries displayed)&lt;/b&gt;</source>
         <translation>&lt;b&gt;(%1 de %2 entradas exibidas)&lt;/b&gt;</translation>
@@ -2955,6 +4099,18 @@
         <source>Confirm the %1 send action</source>
         <translation>Confirmar o envio %1</translation>
     </message>
+    <message>
+        <source>Cr&amp;eate Unsigned</source>
+        <translation>&amp;Criar não assinado</translation>
+    </message>
+    <message>
+        <source> from wallet '%1'</source>
+        <translation>da carteira '%1'</translation>
+    </message>
+    <message>
+        <source>%1 to '%2'</source>
+        <translation>%1 para '%2'</translation>
+    </message>
     <message>
         <source>%1 funds only</source>
         <translation>Apenas saldo %1</translation>
@@ -2993,7 +4149,7 @@
     </message>
     <message>
         <source>Total Amount</source>
-        <translation>Quantidade Total</translation>
+        <translation>Valor Total</translation>
     </message>
     <message>
         <source>or</source>
@@ -3003,6 +4159,51 @@
         <source>Confirm send coins</source>
         <translation>Confirme o envio de moedas</translation>
     </message>
+    <message>
+        <source>Save Transaction Data</source>
+        <translation>Salvar Dados da Transação</translation>
+    </message>
+    <message>
+        <source>PSBT saved</source>
+        <translation>PSBT salvo</translation>
+    </message>
+    <message>
+        <source>Watch-only balance:</source>
+        <translation>Saldo somente para visualização:</translation>
+    </message>
+    <message>
+        <source>Creates a Partially Signed Blockchain Transaction (PSBT) for use with e.g. an offline %1 wallet, or a PSBT-compatible hardware wallet.</source>
+        <translation>Cria uma Transação Parcialmente Assinada em Blockchain (PSBT) para uso com, por exemplo, uma carteira %1 offline ou uma carteira de hardware compatível com PSBT.</translation>
+    </message>
+    <message>
+        <source>Do you want to create this transaction?</source>
+        <extracomment>Message displayed when attempting to create a transaction. Cautionary text to prompt the user to verify that the displayed transaction details represent the transaction the user intends to create.</extracomment>
+        <translation>Você deseja criar esta transação?</translation>
+    </message>
+    <message>
+        <source>Please, review your transaction proposal. This will produce a Partially Signed Blockchain Transaction (PSBT) which you can save or copy and then sign with e.g. an offline %1 wallet, or a PSBT-compatible hardware wallet.</source>
+        <extracomment>Text to inform a user attempting to create a transaction of their current options. At this stage, a user can only create a PSBT. This string is displayed when private keys are disabled and an external signer is not available.</extracomment>
+        <translation>Por favor, revise sua proposta de transação. Isto produzirá uma Transação Parcialmente Assinada em Blockchain (PSBT) que você pode salvar ou copiar e então assinar com, por exemplo, uma carteira %1 offline ou uma carteira de hardware compatível com PSBT.</translation>
+    </message>
+    <message>
+        <source>Please, review your transaction. You can create and send this transaction or create a Partially Signed Blockchain Transaction (PSBT), which you can save or copy and then sign with, e.g., an offline %1 wallet, or a PSBT-compatible hardware wallet.</source>
+        <extracomment>Text to inform a user attempting to create a transaction of their current options. At this stage, a user can send their transaction or create a PSBT. This string is displayed when both private keys and PSBT controls are enabled.</extracomment>
+        <translation>Por favor, revise sua transação. Você pode criar e enviar esta transação ou criar uma Transação Parcialmente Assinada em Blockchain (PSBT), que você pode salvar ou copiar e então assinar com, por exemplo, uma carteira %1 offline ou uma carteira de hardware compatível com PSBT.</translation>
+    </message>
+    <message>
+        <source>Please, review your transaction.</source>
+        <extracomment>Text to prompt a user to review the details of the transaction they are attempting to send.</extracomment>
+        <translation>Por favor, revise sua transação.</translation>
+    </message>
+    <message>
+        <source>To review recipient list click "Show Details…"</source>
+        <translation>Para analisar a lista de destinatários, clique em "Mostrar Detalhes..."</translation>
+    </message>
+    <message>
+        <source>Partially Signed Transaction (Binary)</source>
+        <extracomment>Expanded name of the binary PSBT file format. See: BIP 174.</extracomment>
+        <translation>Transação assinada parcialmente (binário)</translation>
+    </message>
     <message>
         <source>The recipient address is not valid. Please recheck.</source>
         <translation>Endereço de envio inváido. Favor checar.</translation>
@@ -3122,21 +4323,16 @@
         <source>A message that was attached to the dash: URI which will be stored with the transaction for your reference. Note: This message will not be sent over the Dash network.</source>
         <translation>A mensagem que foi anexada ao Dash: URI na qual será gravada na transação para sua referência. Nota: Essa mensagem não será gravada publicamente na rede Dash.</translation>
     </message>
+</context>
+<context>
+    <name>SendConfirmationDialog</name>
     <message>
-        <source>This is an unauthenticated payment request.</source>
-        <translation>Esta é uma cobrança não autenticada.</translation>
-    </message>
-    <message>
-        <source>This is an authenticated payment request.</source>
-        <translation>Esta é uma cobrança autenticada.</translation>
-    </message>
-    <message>
-        <source>Pay To:</source>
-        <translation>Pague Para:</translation>
+        <source>Send</source>
+        <translation>Enviar</translation>
     </message>
     <message>
-        <source>Memo:</source>
-        <translation>Memorizar:</translation>
+        <source>Create Unsigned</source>
+        <translation>Criar não assinada</translation>
     </message>
 </context>
 <context>
@@ -3276,6 +4472,10 @@
         <source>Wallet unlock was cancelled.</source>
         <translation>O desbloqueio da carteira foi cancelado</translation>
     </message>
+    <message>
+        <source>No error</source>
+        <translation>Sem erro</translation>
+    </message>
     <message>
         <source>Private key for the entered address is not available.</source>
         <translation>A chave privada para o endereço disponibilizado não está disponível.</translation>
@@ -3301,19 +4501,30 @@
         <translation>A assinatura não corresponde a mensagem</translation>
     </message>
     <message>
-        <source>Message verification failed.</source>
-        <translation>Falha na verificação da mensagem</translation>
+        <source>Message verification failed.</source>
+        <translation>Falha na verificação da mensagem</translation>
+    </message>
+    <message>
+        <source>Message verified.</source>
+        <translation>Mensagem verificada</translation>
+    </message>
+</context>
+<context>
+    <name>SplashScreen</name>
+    <message>
+        <source>(press q to shutdown and continue later)</source>
+        <translation>(pressione q para desligar e continuar depois)</translation>
     </message>
     <message>
-        <source>Message verified.</source>
-        <translation>Mensagem verificada</translation>
+        <source>press q to shutdown</source>
+        <translation>pressione q para desligar</translation>
     </message>
 </context>
 <context>
     <name>TrafficGraphWidget</name>
     <message>
-        <source>KB/s</source>
-        <translation>KB/s</translation>
+        <source>kB/s</source>
+        <translation>kB/s</translation>
     </message>
     <message>
         <source>Total</source>
@@ -3330,20 +4541,9 @@
 </context>
 <context>
     <name>TransactionDesc</name>
-    <message numerus="yes">
-        <source>Open for %n more block(s)</source>
-        <translation><numerusform>Aberto para %n mais blocos</numerusform><numerusform>Aberto para %n mais blocos</numerusform><numerusform>Aberto para %n mais blocos</numerusform></translation>
-    </message>
-    <message>
-        <source>Open until %1</source>
-        <translation>Aberto até %1</translation>
-    </message>
-    <message>
-        <source>conflicted</source>
-        <translation>Conflitado</translation>
-    </message>
     <message>
         <source>0/unconfirmed, %1</source>
+        <extracomment>Text explaining the current status of a transaction, shown in the status field of the details window for this transaction. This status represents an unconfirmed transaction that is in the memory pool.</extracomment>
         <translation>0/não confirmado, %1</translation>
     </message>
     <message>
@@ -3356,22 +4556,32 @@
     </message>
     <message>
         <source>abandoned</source>
+        <extracomment>Text explaining the current status of a transaction, shown in the status field of the details window for this transaction. This status represents an abandoned transaction.</extracomment>
         <translation>abandonado</translation>
     </message>
+    <message>
+        <source>conflicted with a transaction with %1 confirmations</source>
+        <extracomment>Text explaining the current status of a transaction, shown in the status field of the details window for this transaction. This status represents an unconfirmed transaction that conflicts with a confirmed transaction.</extracomment>
+        <translation>conflitou com uma transação com %1 confirmações</translation>
+    </message>
     <message>
         <source>%1/unconfirmed</source>
+        <extracomment>Text explaining the current status of a transaction, shown in the status field of the details window for this transaction. This status represents a transaction confirmed in at least one block, but less than 6 blocks, and still not locked via ChainLocks.</extracomment>
         <translation>%1/não confirmado</translation>
     </message>
     <message>
         <source>%1 confirmations</source>
+        <extracomment>Text explaining the current status of a transaction, shown in the status field of the details window for this transaction. This status represents a transaction confirmed in 6 or more blocks or locked via ChainLocks.</extracomment>
         <translation>%1 confirmações</translation>
     </message>
     <message>
         <source>locked via ChainLocks</source>
+        <extracomment>Text explaining the current status of a transaction, shown in the status field of the details window for this transaction. This status represents a transaction confirmed in at least one block and has been locked by ChainLocks.</extracomment>
         <translation>bloqueado via ChainLocks</translation>
     </message>
     <message>
         <source>verified via InstantSend</source>
+        <extracomment>Text explaining the current status of a transaction, shown in the status field of the details window for this transaction. This status represents an unconfirmed transaction that has been locked by InstantSend.</extracomment>
         <translation>verificado via EnvioInstantâneo</translation>
     </message>
     <message>
@@ -3390,6 +4600,10 @@
         <source>Generated</source>
         <translation>Gerado</translation>
     </message>
+    <message>
+        <source>Platform Transfer</source>
+        <translation>Transferência de Plataforma</translation>
+    </message>
     <message>
         <source>From</source>
         <translation>De</translation>
@@ -3520,14 +4734,6 @@
         <source>Address / Label</source>
         <translation>Endereço / Etiqueta</translation>
     </message>
-    <message numerus="yes">
-        <source>Open for %n more block(s)</source>
-        <translation><numerusform>Aberto para %n mais blocos</numerusform><numerusform>Aberto para %n mais blocos</numerusform><numerusform>Aberto para %n mais blocos</numerusform></translation>
-    </message>
-    <message>
-        <source>Open until %1</source>
-        <translation>Aberto até %1</translation>
-    </message>
     <message>
         <source>Unconfirmed</source>
         <translation>Não confirmado</translation>
@@ -3588,6 +4794,10 @@
         <source>Mined</source>
         <translation>Minerado</translation>
     </message>
+    <message>
+        <source>Platform Transfer</source>
+        <translation>Transferência de Plataforma</translation>
+    </message>
     <message>
         <source>%1 Mixing</source>
         <translation>%1 o Mixing</translation>
@@ -3715,6 +4925,10 @@
         <source>Mined</source>
         <translation>Minerado</translation>
     </message>
+    <message>
+        <source>Platform Transfer</source>
+        <translation>Transferência de Plataforma</translation>
+    </message>
     <message>
         <source>Other</source>
         <translation>Outro</translation>
@@ -3728,49 +4942,63 @@
         <translation>Quantia mínima</translation>
     </message>
     <message>
-        <source>Abandon transaction</source>
-        <translation>Abandonar transação</translation>
+        <source>&amp;Copy address</source>
+        <translation>&amp;Copiar endereço</translation>
     </message>
     <message>
-        <source>Copy address</source>
-        <translation>Copiar endereço</translation>
+        <source>Copy &amp;label</source>
+        <translation>Copiar &amp;identificador</translation>
     </message>
     <message>
-        <source>Copy label</source>
-        <translation>Copiar rótulo</translation>
+        <source>Copy &amp;amount</source>
+        <translation>Copiar &amp;valor</translation>
     </message>
     <message>
-        <source>Copy amount</source>
-        <translation>Copias quantia</translation>
+        <source>Copy transaction &amp;ID</source>
+        <translation>Copiar &amp;ID da transação</translation>
     </message>
     <message>
-        <source>Copy transaction ID</source>
-        <translation>Copiar ID da transação</translation>
+        <source>Copy &amp;raw transaction</source>
+        <translation>Copiar transação &amp;original</translation>
     </message>
     <message>
-        <source>Copy raw transaction</source>
-        <translation>Copiar o raw da transação</translation>
+        <source>Copy full transaction &amp;details</source>
+        <translation>Copiar &amp;detalhes completos da transação</translation>
     </message>
     <message>
-        <source>Copy full transaction details</source>
-        <translation>Copiar dados completos da transação</translation>
+        <source>&amp;Show transaction details</source>
+        <translation>&amp;Mostrar detalhes da transação</translation>
     </message>
     <message>
-        <source>Edit address label</source>
-        <translation>Editar etiqueta de endereço</translation>
+        <source>A&amp;bandon transaction</source>
+        <translation>&amp;Abandonar transação</translation>
     </message>
     <message>
-        <source>Show transaction details</source>
-        <translation>Mostrar detalhes da transação</translation>
+        <source>Rese&amp;nd transaction</source>
+        <translation>&amp;Reenviar transação</translation>
     </message>
     <message>
-        <source>Show address QR code</source>
-        <translation>Mostrar endereço QR code</translation>
+        <source>&amp;Edit address label</source>
+        <translation>&amp;Editar rótulo de endereço</translation>
+    </message>
+    <message>
+        <source>Show address &amp;QR code</source>
+        <translation>Mostrar endereço &amp;QR code</translation>
+    </message>
+    <message>
+        <source>Show in %1</source>
+        <extracomment>Transactions table context menu action to show the selected transaction in a third-party block explorer. %1 is a stand-in argument for the URL of the explorer.</extracomment>
+        <translation>Mostrar em %1</translation>
     </message>
     <message>
         <source>Export Transaction History</source>
         <translation>Exportar histórico de transações</translation>
     </message>
+    <message>
+        <source>Comma separated file</source>
+        <extracomment>Expanded name of the CSV file format. See: https://en.wikipedia.org/wiki/Comma-separated_values.</extracomment>
+        <translation>Arquivo separado por vírgulas</translation>
+    </message>
     <message>
         <source>Confirmed</source>
         <translation>Confirmado</translation>
@@ -3849,10 +5077,54 @@
         <source>Closing the wallet for too long can result in having to resync the entire chain if pruning is enabled.</source>
         <translation>Fechar a carteira por muito tempo pode resultar em ter que sincronizar novamente toda a cadeia se o modo pruning estiver habilitado.</translation>
     </message>
-    </context>
+    <message>
+        <source>Close all wallets</source>
+        <translation>Fechar todas as carteiras</translation>
+    </message>
+    <message>
+        <source>Are you sure you wish to close all wallets?</source>
+        <translation>Tem certeza de que deseja fechar todas as carteiras?</translation>
+    </message>
+</context>
 <context>
     <name>WalletFrame</name>
-    </context>
+    <message>
+        <source>No wallet has been loaded.
+Go to File &gt; Open Wallet to load a wallet.
+- OR -</source>
+        <translation>Nenhuma carteira for carregada.
+Acesse: Arquivo &gt; Abrir Carteira para carregar a carteira.
+- OU -</translation>
+    </message>
+    <message>
+        <source>Create a new wallet</source>
+        <translation>Criar uma nova carteira</translation>
+    </message>
+    <message>
+        <source>Error</source>
+        <translation>Erro</translation>
+    </message>
+    <message>
+        <source>Unable to decode PSBT from clipboard (invalid base64)</source>
+        <translation>Não foi possível decodificar o PSBT da área de transferência (base64 inválido)</translation>
+    </message>
+    <message>
+        <source>Load Transaction Data</source>
+        <translation>Carregar Dados da Transação</translation>
+    </message>
+    <message>
+        <source>Partially Signed Transaction (*.psbt)</source>
+        <translation>Transação Parcialmente Assinada (*.psbt)</translation>
+    </message>
+    <message>
+        <source>PSBT file must be smaller than 100 MiB</source>
+        <translation>Arquivo PSBT deve ser menor que 100 MiB</translation>
+    </message>
+    <message>
+        <source>Unable to decode PSBT</source>
+        <translation>Não foi possível decodificar o PSBT</translation>
+    </message>
+</context>
 <context>
     <name>WalletModel</name>
     <message>
@@ -3878,6 +5150,11 @@
         <source>Selected amount:</source>
         <translation>Quantidade selecionada:</translation>
     </message>
+    <message>
+        <source>Wallet Data</source>
+        <extracomment>Name of the wallet data file format.</extracomment>
+        <translation>Dados da Carteira</translation>
+    </message>
     <message>
         <source>Backup Wallet</source>
         <translation>Backup da carteira</translation>
@@ -3905,14 +5182,6 @@
 </context>
 <context>
     <name>dash-core</name>
-    <message>
-        <source>Error: Listening for incoming connections failed (listen returned error %s)</source>
-        <translation>Erro: Aceitar conexões de entrada falhou (retornou erro %s)</translation>
-    </message>
-    <message>
-        <source>Fee estimation failed. Fallbackfee is disabled. Wait a few blocks or enable -fallbackfee.</source>
-        <translation>Falha na estimativa de taxa. A taxa de retorno está desabilitada. Aguarde alguns blocos ou habilite -fallbackfee.</translation>
-    </message>
     <message>
         <source>This error could occur if this wallet was not shutdown cleanly and was last loaded using a build with a newer version of Berkeley DB. If so, please use the software that last loaded this wallet</source>
         <translation>Este erro pode ocorrer se esta carteira não foi encerrada corretamente e foi carregada pela última vez usando uma compilação com uma versão mais recente do Berkeley DB. Em caso afirmativo, por favor, use o software que carregou esta carteira pela última vez</translation>
@@ -3970,16 +5239,20 @@
         <translation>Erro ao ler o banco de dados. Finalizando.</translation>
     </message>
     <message>
-        <source>Failed to listen on any port. Use -listen=0 if you want this.</source>
-        <translation>Falha ao escutar em qualquer porta. Use -listen=0 se você quiser isso.</translation>
+        <source>Error: Missing checksum</source>
+        <translation>Erro: Checksum ausente</translation>
     </message>
     <message>
-        <source>-maxtxfee is set very high! Fees this large could be paid on a single transaction.</source>
-        <translation>-maxtxfee é muito alto! Essa quantia poderia ser paga em uma única transação.</translation>
+        <source>Error: Unable to parse version %u as a uint32_t</source>
+        <translation>Erro: Não foi possível analisar a versão %u como um uint32_t</translation>
     </message>
     <message>
-        <source>Cannot provide specific connections and have addrman find outgoing connections at the same.</source>
-        <translation>Não é possível fornecer conexões específicas e fazer com que o addrman encontre conexões de saída ao mesmo tempo.</translation>
+        <source>Error: Unable to write record to new wallet</source>
+        <translation>Erro: Não foi possível gravar o registro na nova carteira</translation>
+    </message>
+    <message>
+        <source>Failed to listen on any port. Use -listen=0 if you want this.</source>
+        <translation>Falha ao escutar em qualquer porta. Use -listen=0 se você quiser isso.</translation>
     </message>
     <message>
         <source>Found unconfirmed denominated outputs, will wait till they confirm to continue.</source>
@@ -3990,13 +5263,17 @@
         <translation>-socketevents ('%s') inválido. Apenas esses modos são suportados: %s</translation>
     </message>
     <message>
-        <source>Invalid amount for -maxtxfee=&lt;amount&gt;: '%s' (must be at least the minrelay fee of %s to prevent stuck transactions)</source>
-        <translation>Valor inválido para -maxtxfee=&lt;valor&gt;: '%s' (precisa ser pelo menos a taxa mínima de %s para prevenir que a transação nunca seja confirmada)</translation>
+        <source>SQLiteDatabase: Unknown sqlite wallet schema version %d. Only version %d is supported</source>
+        <translation>SQLiteDatabase: Esquema de carteira sqlite desconhecido versão %d. Apenas a versão %d é suportada</translation>
     </message>
     <message>
         <source>Transaction index can't be disabled with governance validation enabled. Either start with -disablegovernance command line switch or enable transaction index.</source>
         <translation>O índice de transação não pode ser desabilitado com a validação de governança habilitada. Comece com o comando -disablegovernance ou ative o índice de transação.</translation>
     </message>
+    <message>
+        <source>Unsupported category-specific logging level -loglevel=%s. Expected -loglevel=&lt;category&gt;:&lt;loglevel&gt;. Valid categories: %s. Valid loglevels: %s.</source>
+        <translation>Nível de registro específico da categoria não suportado -loglevel=%s. Esperado -loglevel=&lt;category&gt;:&lt;loglevel&gt;. Categorias válidas: %s. Níveis de registro válidos: %s.</translation>
+    </message>
     <message>
         <source>Can't mix: no compatible inputs found!</source>
         <translation>Não é possível misturar: não foram encontradas entradas compatíveis!</translation>
@@ -4005,6 +5282,14 @@
         <source>Entry exceeds maximum size.</source>
         <translation>Entrada excede o tamanho máximo.</translation>
     </message>
+    <message>
+        <source>Error upgrading evo database for EHF</source>
+        <translation>Erro ao atualizar o banco de dados evo para EHF</translation>
+    </message>
+    <message>
+        <source>Failed to commit Evo database</source>
+        <translation>Falhou ao confirmar o banco de dados Evo</translation>
+    </message>
     <message>
         <source>Found enough users, signing ( waiting %s )</source>
         <translation>Encontrou usuários suficientes, assinando ( esperando %s )</translation>
@@ -4029,18 +5314,14 @@
         <source>Insufficient funds.</source>
         <translation>Saldo insuficiente. </translation>
     </message>
-    <message>
-        <source>Invalid amount for -discardfee=&lt;amount&gt;: '%s'</source>
-        <translation>Quantidade inválida para -discardfee=&lt;amount&gt;: '%s'</translation>
-    </message>
-    <message>
-        <source>Invalid amount for -paytxfee=&lt;amount&gt;: '%s' (must be at least %s)</source>
-        <translation>Valor inválido para -paytxfee=&lt;amount&gt;: '%s' (precisa ser no mínimo %s)</translation>
-    </message>
     <message>
         <source>Invalid minimum number of spork signers specified with -minsporkkeys</source>
         <translation>Número mínimo inválido de assinantes do spork especificados com -minsporkkeys</translation>
     </message>
+    <message>
+        <source>Listening for incoming connections failed (listen returned error %s)</source>
+        <translation>Falha ao aguardar conexões de entrada (escuta retornou erro %s)</translation>
+    </message>
     <message>
         <source>Lock is already in place.</source>
         <translation>Bloqueio já está no lugar.</translation>
@@ -4097,6 +5378,10 @@
         <source>Synchronizing governance objects…</source>
         <translation>Sincronizando objetos de governança ….</translation>
     </message>
+    <message>
+        <source>Transaction change output index out of range</source>
+        <translation>Índice de saída de alteração de transação fora do alcance</translation>
+    </message>
     <message>
         <source>Unable to start HTTP server. See debug log for details.</source>
         <translation>Não foi possível iniciar o servidor HTTP. Veja o log de debug para detalhes.</translation>
@@ -4105,6 +5390,10 @@
         <source>Unknown response.</source>
         <translation>Resposta desconhecida.</translation>
     </message>
+    <message>
+        <source>Unsupported global logging level -loglevel=%s. Valid values: %s.</source>
+        <translation>Nível de registro global não suportado -loglevel=%s. Valores válidos: %s.</translation>
+    </message>
     <message>
         <source>User Agent comment (%s) contains unsafe characters.</source>
         <translation>Comentário User Agent (%s) contém caracteres inseguros.</translation>
@@ -4145,6 +5434,10 @@
         <source>Make sure to encrypt your wallet and delete all non-encrypted backups after you have verified that the wallet works!</source>
         <translation>Certifique-se de criptografar sua carteira e excluir todos os backups não criptografados depois de verificar se a carteira funciona!</translation>
     </message>
+    <message>
+        <source>More than one onion bind address is provided. Using %s for the automatically created Tor onion service.</source>
+        <translation>Mais de um endereço de vínculo onion foi fornecido. Usando %s para o serviço Tor onion criado automaticamente.</translation>
+    </message>
     <message>
         <source>Prune configured below the minimum of %d MiB.  Please use a higher number.</source>
         <translation>Prune configurado abaixo do mínimo de %d MiB. Por favor use um número mais alto.</translation>
@@ -4173,10 +5466,6 @@
         <source>Wallet is locked, can't replenish keypool! Automatic backups and mixing are disabled, please unlock your wallet to replenish keypool.</source>
         <translation>Carteira travada, impossível reabastecer o keypool. Backups e misturas automáticas estão desabilitadas, por favor, destrave sua carteira para reabastecer o keypool. </translation>
     </message>
-    <message>
-        <source>You need to rebuild the database using -reindex to change -timestampindex</source>
-        <translation>Você precisa reconstruir o banco de dados usando -reindex para alterar -timestampindex</translation>
-    </message>
     <message>
         <source>You need to rebuild the database using -reindex to go back to unpruned mode.  This will redownload the entire blockchain</source>
         <translation>Você precisa reconstruir o banco de dados usando -reindex para sair do modo prune. Isso irá rebaixar todo o blockchain.</translation>
@@ -4218,20 +5507,32 @@
         <translation>Erro ao carregar %s: As chaves privadas só podem ser desativadas durante a criação</translation>
     </message>
     <message>
-        <source>Error upgrading evo database</source>
-        <translation>Erro de upgrade na base de dados evo</translation>
+        <source>Error: Couldn't create cursor into database</source>
+        <translation>Erro: Não foi possível criar um cursor no banco de dados</translation>
     </message>
     <message>
         <source>Error: Disk space is low for %s</source>
         <translation>Erro: Espaço em disco está pequeno para %s</translation>
     </message>
     <message>
-        <source>Exceeded max tries.</source>
-        <translation>Tentativas máximas excedidas.</translation>
+        <source>Error: Dumpfile checksum does not match. Computed %s, expected %s</source>
+        <translation>Erro: A soma de verificação do arquivo de dump não corresponde. Calculado %s, esperado %s.</translation>
+    </message>
+    <message>
+        <source>Error: Got key that was not hex: %s</source>
+        <translation>Erro: Chave recebida não estava em hexadecimal: %s</translation>
+    </message>
+    <message>
+        <source>Error: Got value that was not hex: %s</source>
+        <translation>Erro: Valor recebido não estava em hexadecimal: %s</translation>
+    </message>
+    <message>
+        <source>Error: Keypool ran out, please call keypoolrefill first</source>
+        <translation>Erro: O pool de chaves acabou, por favor, chame keypoolrefill primeiro</translation>
     </message>
     <message>
-        <source>Failed to commit EvoDB</source>
-        <translation>Falha ao enviar dados para EvoDB</translation>
+        <source>Error: No addresses available.</source>
+        <translation>Erro: Nenhum endereço disponível.</translation>
     </message>
     <message>
         <source>Failed to create backup %s!</source>
@@ -4249,17 +5550,29 @@
         <source>Failed to rescan the wallet during initialization</source>
         <translation>Falha ao verificar novamente a carteira durante a inicialização</translation>
     </message>
+    <message>
+        <source>Failed to verify database</source>
+        <translation>Falha ao verificar base de dados</translation>
+    </message>
+    <message>
+        <source>Fee rate (%s) is lower than the minimum fee rate setting (%s)</source>
+        <translation>A taxa de comissão (%s) é inferior à configuração de taxa de comissão mínima (%s)</translation>
+    </message>
     <message>
         <source>Found enough users, signing…</source>
         <translation>Encontrou usuários suficientes, assinando…</translation>
     </message>
     <message>
-        <source>Invalid P2P permission: '%s'</source>
-        <translation>Permissão P2P inválida: '%s'</translation>
+        <source>Ignoring duplicate -wallet %s.</source>
+        <translation>Ignorando -carteira duplicada %s.</translation>
+    </message>
+    <message>
+        <source>Input not found or already spent</source>
+        <translation>Entrada não encontrada ou já gasta</translation>
     </message>
     <message>
-        <source>Invalid amount for -fallbackfee=&lt;amount&gt;: '%s'</source>
-        <translation>Valor inválido para -fallbackfee=&lt;amount&gt;: '%s'</translation>
+        <source>Invalid P2P permission: '%s'</source>
+        <translation>Permissão P2P inválida: '%s'</translation>
     </message>
     <message>
         <source>Invalid masternodeblsprivkey. Please see documentation.</source>
@@ -4281,6 +5594,10 @@
         <source>Mixing in progress…</source>
         <translation>Mixing em progresso…</translation>
     </message>
+    <message>
+        <source>No addresses available</source>
+        <translation>Nenhum endereço disponível</translation>
+    </message>
     <message>
         <source>No errors detected.</source>
         <translation>Nenhum erro detectado.</translation>
@@ -4309,6 +5626,22 @@
         <source>Prune mode is incompatible with -txindex.</source>
         <translation>O modo prune é incompatível com -txindex.</translation>
     </message>
+    <message>
+        <source>SQLiteDatabase: Failed to execute statement to verify database: %s</source>
+        <translation>SQLiteDatabase: Falhou ao executar a declaração para verificar o banco de dados: %s</translation>
+    </message>
+    <message>
+        <source>SQLiteDatabase: Failed to prepare statement to verify database: %s</source>
+        <translation>SQLiteDatabase: Falhou ao preparar a declaração para verificar o banco de dados: %s</translation>
+    </message>
+    <message>
+        <source>SQLiteDatabase: Failed to read database verification error: %s</source>
+        <translation>SQLiteDatabase: Falhou ao ler o erro de verificação do banco de dados: %s</translation>
+    </message>
+    <message>
+        <source>SQLiteDatabase: Unexpected application id. Expected %u, got %u</source>
+        <translation>SQLiteDatabase: ID de aplicativo inesperado. Esperado %u, obtido %u</translation>
+    </message>
     <message>
         <source>Section [%s] is not recognized.</source>
         <translation>A seção [%s] não é reconhecida.</translation>
@@ -4341,6 +5674,10 @@
         <source>This is the transaction fee you will pay if you send a transaction.</source>
         <translation>Esta é a taxa que você irá pagar se enviar uma transação.</translation>
     </message>
+    <message>
+        <source>Topping up keypool…</source>
+        <translation>Completando o pool de chaves...</translation>
+    </message>
     <message>
         <source>Transaction amounts must not be negative</source>
         <translation>As quantidades nas transações não podem ser negativas.</translation>
@@ -4369,13 +5706,17 @@
         <source>Unable to generate initial keys</source>
         <translation>Incapaz de gerar chaves iniciais</translation>
     </message>
+    <message>
+        <source>Unable to open %s for writing</source>
+        <translation>Não foi possível abrir %s para escrita</translation>
+    </message>
     <message>
         <source>Unknown -blockfilterindex value %s.</source>
         <translation>Valor desconhecido -blockfilterindex %s.</translation>
     </message>
     <message>
-        <source>Upgrading UTXO database</source>
-        <translation>Atualizando banco de dados UTXO</translation>
+        <source>Unknown new rules activated (versionbit %i)</source>
+        <translation>Novas regras desconhecidas ativadas (versionbit %i)</translation>
     </message>
     <message>
         <source>Verifying blocks…</source>
@@ -4394,16 +5735,12 @@
         <translation>Não foi possível criar a pasta para backup da carteira %s!</translation>
     </message>
     <message>
-        <source>You can not start a masternode with wallet enabled.</source>
-        <translation>Você não pode iniciar um masternode com a carteira habilitada.</translation>
-    </message>
-    <message>
-        <source>You need to rebuild the database using -reindex to change -addressindex</source>
-        <translation>Você precisa reconstruir o banco de dados usando -reindex para alterar -addressindex</translation>
+        <source>Wiping wallet transactions…</source>
+        <translation>Limpando as transações da carteira...</translation>
     </message>
     <message>
-        <source>You need to rebuild the database using -reindex to change -spentindex</source>
-        <translation>Você precisa reconstruir o banco de dados usando -reindex para alterar -spentindex</translation>
+        <source>You can not start a masternode with wallet enabled.</source>
+        <translation>Você não pode iniciar um masternode com a carteira habilitada.</translation>
     </message>
     <message>
         <source>no mixing available.</source>
@@ -4421,6 +5758,22 @@
         <source>%s uses exact denominated amounts to send funds, you might simply need to mix some more coins.</source>
         <translation>%s usa denominações exatas para enviar fundos; talvez seja necessário misturar mais algumas moedas.</translation>
     </message>
+    <message>
+        <source>-reindex-chainstate option is not compatible with -blockfilterindex. Please temporarily disable blockfilterindex while using -reindex-chainstate, or replace -reindex-chainstate with -reindex to fully rebuild all indexes.</source>
+        <translation>A opção -reindex-chainstate não é compatível com -blockfilterindex. Por favor, desabilite temporariamente blockfilterindex enquanto usar -reindex-chainstate, ou substitua -reindex-chainstate por -reindex para reconstruir totalmente todos os índices.</translation>
+    </message>
+    <message>
+        <source>-reindex-chainstate option is not compatible with -coinstatsindex. Please temporarily disable coinstatsindex while using -reindex-chainstate, or replace -reindex-chainstate with -reindex to fully rebuild all indexes.</source>
+        <translation>A opção -reindex-chainstate não é compatível com -coinstatsindex. Por favor, desabilite temporariamente coinstatsindex enquanto usar -reindex-chainstate, ou substitua -reindex-chainstate por -reindex para reconstruir totalmente todos os índices. </translation>
+    </message>
+    <message>
+        <source>-reindex-chainstate option is not compatible with -txindex. Please temporarily disable txindex while using -reindex-chainstate, or replace -reindex-chainstate with -reindex to fully rebuild all indexes.</source>
+        <translation>A opção -reindex-chainstate não é compatível com -txindex. Por favor, desabilite temporariamente txindex enquanto usar -reindex-chainstate, ou substitua -reindex-chainstate por -reindex para reconstruir totalmente todos os índices.</translation>
+    </message>
+    <message>
+        <source>Cannot downgrade wallet from version %i to version %i. Wallet version unchanged.</source>
+        <translation>Não é possível fazer downgrade da carteira da versão %i para a versão %i. Versão da carteira não alterada.</translation>
+    </message>
     <message>
         <source>Cannot obtain a lock on data directory %s. %s is probably already running.</source>
         <translation>Não foi possível obter exclusividade de escrita no endereço %s. O %s provavelmente já está sendo executado.</translation>
@@ -4433,14 +5786,82 @@
         <source>Error loading %s: You can't enable HD on an already existing non-HD wallet</source>
         <translation>Erro ao carregar %s: você não pode ativar o HD em uma carteira não HD já existente</translation>
     </message>
+    <message>
+        <source>Error loading wallet. Wallet requires blocks to be downloaded, and software does not currently support loading wallets while blocks are being downloaded out of order when using assumeutxo snapshots. Wallet should be able to load successfully after node sync reaches height %s</source>
+        <translation>Erro ao carregar a carteira. A carteira requer que os blocos sejam baixados, e o software não oferece suporte ao carregamento de carteiras enquanto os blocos estão sendo baixados fora de ordem ao usar snapshots assumeutxo. A carteira deverá carregar com sucesso após a sincronização do nó atingir a altura %s.</translation>
+    </message>
     <message>
         <source>Error reading %s! All keys read correctly, but transaction data or address book entries might be missing or incorrect.</source>
         <translation>Erro ao ler arquivo %s! Todas as chaves privadas foram lidas corretamente, mas os dados de transação ou o livro de endereços podem estar faltando ou incorretos.</translation>
     </message>
+    <message>
+        <source>Error: Dumpfile format record is incorrect. Got "%s", expected "format".</source>
+        <translation>Erro: Registro de formato do arquivo de dump está incorreto. Recebido "%s", esperado "format".</translation>
+    </message>
+    <message>
+        <source>Error: Dumpfile identifier record is incorrect. Got "%s", expected "%s".</source>
+        <translation>Erro: Registro de identificador do arquivo de dump está incorreto. Recebido "%s", esperado "%s".</translation>
+    </message>
+    <message>
+        <source>Error: Dumpfile version is not supported. This version of bitcoin-wallet only supports version 1 dumpfiles. Got dumpfile with version %s</source>
+        <translation>Erro: Versão do arquivo de dump não suportada. Esta versão do bitcoin-wallet suporta apenas arquivos de dump versão 1. Arquivo de dump recebido com versão %s.</translation>
+    </message>
+    <message>
+        <source>Failed to rename invalid peers.dat file. Please move or delete it and try again.</source>
+        <translation>Falhou ao renomear o arquivo peers.dat. Por favor, mova ou exclua-o e tente novamente.</translation>
+    </message>
+    <message>
+        <source>Fee estimation failed. Fallbackfee is disabled. Wait a few blocks or enable %s.</source>
+        <translation>Estimativa de taxa falhou. Fallbackfee está desabilitada. Aguarde alguns blocos ou habilite %s.</translation>
+    </message>
+    <message>
+        <source>File %s already exists. If you are sure this is what you want, move it out of the way first.</source>
+        <translation>O arquivo %s já existe. Se você tem certeza de que é isso que deseja, remova-o primeiro.</translation>
+    </message>
+    <message>
+        <source>Incompatible options: -dnsseed=1 was explicitly specified, but -onlynet forbids connections to IPv4/IPv6</source>
+        <translation>Opções incompatíveis: -dnsseed=1 foi explicitamente especificado, mas -onlynet proíbe conexões com IPv4/IPv6.</translation>
+    </message>
     <message>
         <source>Incorrect or no devnet genesis block found. Wrong datadir for devnet specified?</source>
         <translation>Bloco gênese incorreto ou não encontrado. Datadir errado para a devnet rede?</translation>
     </message>
+    <message>
+        <source>Invalid amount for %s=&lt;amount&gt;: '%s' (must be at least the minrelay fee of %s to prevent stuck transactions)</source>
+        <translation>Valor inválido para %s=&lt;amount&gt;: '%s' (deve ser pelo menos a taxa minrelay de %s para prevenir transações travadas)</translation>
+    </message>
+    <message>
+        <source>Invalid or corrupt peers.dat (%s). If you believe this is a bug, please report it to %s. As a workaround, you can move the file (%s) out of the way (rename, move, or delete) to have a new one created on the next start.</source>
+        <translation>Peers.dat (%s) inválido ou corrompido. Se você acredita que isso é um bug, por favor, reporte-o para %s. Como solução alternativa, você pode remover o arquivo (%s) (renomear, mover ou excluir) para que um novo seja criado na próxima inicialização.</translation>
+    </message>
+    <message>
+        <source>No dump file provided. To use createfromdump, -dumpfile=&lt;filename&gt; must be provided.</source>
+        <translation>Nenhum arquivo de dump fornecido. Para usar createfromdump, -dumpfile=&lt;filename&gt; deve ser fornecido.</translation>
+    </message>
+    <message>
+        <source>No dump file provided. To use dump, -dumpfile=&lt;filename&gt; must be provided.</source>
+        <translation>Nenhum arquivo de dump fornecido. Para usar dump, -dumpfile=&lt;filename&gt; deve ser fornecido.</translation>
+    </message>
+    <message>
+        <source>No wallet file format provided. To use createfromdump, -format=&lt;format&gt; must be provided.</source>
+        <translation>Nenhum formato de arquivo de carteira fornecido. Para usar createfromdump, -format=&lt;format&gt; deve ser fornecido.</translation>
+    </message>
+    <message>
+        <source>Outbound connections restricted to CJDNS (-onlynet=cjdns) but -cjdnsreachable is not provided</source>
+        <translation>Conexões de saída restritas a CJDNS (-onlynet=cjdns), mas -cjdnsreachable não foi fornecido</translation>
+    </message>
+    <message>
+        <source>Outbound connections restricted to Tor (-onlynet=onion) but the proxy for reaching the Tor network is explicitly forbidden: -onion=0</source>
+        <translation>Conexões de saída restritas ao Tor (-onlynet=onion), mas o proxy para alcançar a rede Tor está explicitamente proibido: -onion=0</translation>
+    </message>
+    <message>
+        <source>Outbound connections restricted to Tor (-onlynet=onion) but the proxy for reaching the Tor network is not provided: none of -proxy, -onion or -listenonion is given</source>
+        <translation>Conexões de saída restritas ao Tor (-onlynet=onion), mas o proxy para acessar a rede Tor não foi fornecido: nenhum de -proxy, -onion ou -listenonion foi dado.</translation>
+    </message>
+    <message>
+        <source>Outbound connections restricted to i2p (-onlynet=i2p) but -i2psam is not provided</source>
+        <translation>Conexões de saída restritas a i2p (-onlynet=i2p), mas -i2psam não foi fornecido</translation>
+    </message>
     <message>
         <source>Please check that your computer's date and time are correct! If your clock is wrong, %s will not work properly.</source>
         <translation>Por favor verifique se a data e o horário de seu computador estão corretos. Se o relógio de seu computador estiver incorreto, %s não funcionará corretamente.</translation>
@@ -4449,6 +5870,14 @@
         <source>Please contribute if you find %s useful. Visit %s for further information about the software.</source>
         <translation>Por favor contribua se você entender que %s é útil. Visite %s para mais informações sobre o software.</translation>
     </message>
+    <message>
+        <source>Prune mode is incompatible with -reindex-chainstate. Use full -reindex instead.</source>
+        <translation>O modo prune é incompatível com -reindex-chainstate. Use -reindex completo em vez disso.</translation>
+    </message>
+    <message>
+        <source>This is the maximum transaction fee you pay (in addition to the normal fee) to prioritize partial spend avoidance over regular coin selection.</source>
+        <translation>Essa é a taxa máxima de transação que você paga (além da taxa normal) para priorizar a prevenção de gastos parciais em relação à seleção regular de moedas.</translation>
+    </message>
     <message>
         <source>This is the transaction fee you may discard if change is smaller than dust at this level</source>
         <translation>Essa é a taxa de transação que você pode descartar se a alteração for menor que o mínimo neste nível</translation>
@@ -4457,14 +5886,38 @@
         <source>This is the transaction fee you may pay when fee estimates are not available.</source>
         <translation>Esta é a taxa que você deve pagar quando a taxa estimada não está disponível.</translation>
     </message>
+    <message>
+        <source>Transaction requires one destination of non-0 value, a non-0 feerate, or a pre-selected input</source>
+        <translation>A transação requer um destino de valor diferente de zero, uma taxa diferente de zero ou uma entrada pré-selecionada</translation>
+    </message>
     <message>
         <source>Unable to replay blocks. You will need to rebuild the database using -reindex-chainstate.</source>
         <translation>Não foi possível reproduzir os blocos. Você precisará reconstruir o banco de dados usando -reindex-chainstate.</translation>
     </message>
+    <message>
+        <source>Unknown wallet file format "%s" provided. Please provide one of "bdb" or "sqlite".</source>
+        <translation>Formato de arquivo de carteira desconhecido "%s" fornecido. Forneça um dos formatos "bdb" ou "sqlite".</translation>
+    </message>
+    <message>
+        <source>Unsupported chainstate database format found. Please restart with -reindex-chainstate. This will rebuild the chainstate database.</source>
+        <translation>Formato de banco de dados chainstate não suportado encontrado. Por favor, reinicie com -reindex-chainstate. Isto reconstruirá o banco de dados chainstate.</translation>
+    </message>
+    <message>
+        <source>Warning: Dumpfile wallet format "%s" does not match command line specified format "%s".</source>
+        <translation>Aviso: O formato de arquivo de dump da carteira "%s" não corresponde ao formato especificado na linha de comando "%s".</translation>
+    </message>
     <message>
         <source>Warning: Private keys detected in wallet {%s} with disabled private keys</source>
         <translation>Aviso: Chaves privadas detectadas na carteira {%s} com chaves privadas desativadas</translation>
     </message>
+    <message>
+        <source>You need to rebuild the database using -reindex to enable -timestampindex</source>
+        <translation>Você precisa reconstruir o banco de dados usando -reindex para habilitar -timestampindex</translation>
+    </message>
+    <message>
+        <source>%s -- Incorrect seed, it should be a hex string</source>
+        <translation>%s -- Semente incorreta, deve ser uma string hexadecimal</translation>
+    </message>
     <message>
         <source>%s is not a valid backup folder!</source>
         <translation>%s não é uma pasta de backup válida!</translation>
@@ -4489,10 +5942,30 @@
         <source>-rpcport must be specified when -devnet and -server are specified</source>
         <translation>-rpcport deve ser especificado quando -devnet e -server são especificados</translation>
     </message>
+    <message>
+        <source>-statsbatchsize cannot be configured with a negative value.</source>
+        <translation>-statsbatchsize não pode ser configurado com um valor negativo.</translation>
+    </message>
+    <message>
+        <source>-statsduration cannot be configured with a negative value.</source>
+        <translation>-statsduration não pode ser configurado com um valor negativo.</translation>
+    </message>
     <message>
         <source>A fatal internal error occurred, see debug.log for details</source>
         <translation>Ocorreu um erro interno fatal, veja o debug.log para mais detalhes</translation>
     </message>
+    <message>
+        <source>Cannot create socket (socket() returned error %s)</source>
+        <translation>Não é possível criar socket (socket() retornou erro %s)</translation>
+    </message>
+    <message>
+        <source>Cannot get socket address for %s</source>
+        <translation>Não é possível obter endereço de socket para %s</translation>
+    </message>
+    <message>
+        <source>Cannot init Statsd client</source>
+        <translation>Não é possível inicializar cliente Statsd</translation>
+    </message>
     <message>
         <source>Cannot resolve -%s address: '%s'</source>
         <translation>Não foi possível encontrar o endereço de -%s: '%s'</translation>
@@ -4501,10 +5974,6 @@
         <source>Cannot write to data directory '%s'; check permissions.</source>
         <translation>Não é possível escrever no diretório de dados '%s'; verifique as permissões.</translation>
     </message>
-    <message>
-        <source>Change index out of range</source>
-        <translation>Índice de mudança fora do intervalo</translation>
-    </message>
     <message>
         <source>Copyright (C)</source>
         <translation>Copyright</translation>
@@ -4513,6 +5982,14 @@
         <source>Disk space is too low!</source>
         <translation>O espaço em disco está muito pequeno!</translation>
     </message>
+    <message>
+        <source>Dump file %s does not exist.</source>
+        <translation>O arquivo de dump %s não existe.</translation>
+    </message>
+    <message>
+        <source>Error creating %s</source>
+        <translation>Erro ao criar %s</translation>
+    </message>
     <message>
         <source>Error loading %s</source>
         <translation>Erro ao carregar %s</translation>
@@ -4530,8 +6007,8 @@
         <translation>Erro ao carregar %s: você não pode desativar o HD em uma carteira HD já existente</translation>
     </message>
     <message>
-        <source>Error upgrading chainstate database</source>
-        <translation>Erro ao atualizar banco de dados do chainstate</translation>
+        <source>Error reading next record from wallet database</source>
+        <translation>Erro ao ler o próximo registro do banco de dados da carteira</translation>
     </message>
     <message>
         <source>Loading P2P addresses…</source>
@@ -4601,6 +6078,14 @@
         <source>Inputs vs outputs size mismatch.</source>
         <translation>Incompatibilidade de tamanho de entradas x saídas.</translation>
     </message>
+    <message>
+        <source>Invalid '%s'. Allowed values: 128, 160, 192, 224, 256.</source>
+        <translation>'%s' inválido. Os valores permitidos são: 128, 160, 192, 224, 256.</translation>
+    </message>
+    <message>
+        <source>Invalid -i2psam address or hostname: '%s'</source>
+        <translation>Endereço ou nome de host -i2psam inválido: '%s'</translation>
+    </message>
     <message>
         <source>Invalid -onion address or hostname: '%s'</source>
         <translation>Endereço -onion ou hostname inválido: '%s'</translation>
@@ -4645,14 +6130,78 @@
         <source>%s corrupt. Try using the wallet tool dash-wallet to salvage or restoring a backup.</source>
         <translation>%s corrompido. Tente usar a ferramenta da carteira dash-wallet para salvar ou restaurar um backup.</translation>
     </message>
+    <message>
+        <source>%s is set very high! Fees this large could be paid on a single transaction.</source>
+        <translation>%s está configurado muito alto! Taxas tão grandes podem ser pagas em uma única transação.</translation>
+    </message>
+    <message>
+        <source>%s request to listen on port %u. This port is considered "bad" and thus it is unlikely that any Dash Core peers connect to it. See doc/p2p-bad-ports.md for details and a full list.</source>
+        <translation>Solicitação %s para escutar na porta %u. Esta porta é considerada "ruim" e, portanto, é improvável que quaisquer pares do Dash Core se conectem a ela. Consulte doc/p2p-bad-ports.md para obter detalhes e uma lista completa.</translation>
+    </message>
+    <message>
+        <source>Cannot provide specific connections and have addrman find outgoing connections at the same time.</source>
+        <translation>Não é possível fornecer conexões específicas e fazer com que o addrman encontre conexões de saída ao mesmo tempo.</translation>
+    </message>
+    <message>
+        <source>Failed to upgrade Evo database</source>
+        <translation>Falha ao atualizar banco de dados Evo</translation>
+    </message>
+    <message>
+        <source>Fee needed &gt; fee paid</source>
+        <translation>Taxa necessária &gt; taxa paga</translation>
+    </message>
+    <message>
+        <source>Host %s on unsupported network</source>
+        <translation>Host %s em rede não suportada</translation>
+    </message>
+    <message>
+        <source>Invalid amount for %s=&lt;amount&gt;: '%s' (must be at least %s)</source>
+        <translation>Valor inválido para %s=&lt;amount&gt;: '%s' (deve ser pelo menos %s)</translation>
+    </message>
+    <message>
+        <source>Invalid amount for %s=&lt;amount&gt;: '%s'</source>
+        <translation>Valor inválido para %s=&lt;amount&gt;: '%s'</translation>
+    </message>
+    <message>
+        <source>Invalid port specified in %s: '%s'</source>
+        <translation>Porta inválida especificada em %s: '%s'</translation>
+    </message>
     <message>
         <source>Last successful action was too recent.</source>
         <translation>A última acção é muito recente.</translation>
     </message>
+    <message>
+        <source>Missing solving data for estimating transaction size</source>
+        <translation>Faltando dados de resolução para estimar o tamanho da transação</translation>
+    </message>
+    <message>
+        <source>No host specified</source>
+        <translation>Nenhum host especificado</translation>
+    </message>
+    <message>
+        <source>No host specified, malformed URL</source>
+        <translation>Nenhum host especificado, URL mal formada</translation>
+    </message>
+    <message>
+        <source>No text before the scheme delimiter, malformed URL</source>
+        <translation>Nenhum texto antes do delimitador de esquema, URL mal formada</translation>
+    </message>
+    <message>
+        <source>Port must be between %d and %d, supplied %d</source>
+        <translation>A porta deve estar entre %d e %d, fornecido %d</translation>
+    </message>
+    <message>
+        <source>Socket not initialized, cannot send message</source>
+        <translation>Socket não inicializado, não é possível enviar mensagem</translation>
+    </message>
     <message>
         <source>The source code is available from %s.</source>
         <translation>O código fonte está disponível pelo %s.</translation>
     </message>
+    <message>
+        <source>The specified config file %s does not exist</source>
+        <translation>O arquivo config especificado %s não existe</translation>
+    </message>
     <message>
         <source>The transaction amount is too small to pay the fee</source>
         <translation>O valor da transação é muito pequeno para pagar a taxa</translation>
@@ -4673,6 +6222,10 @@
         <source>Transaction fees are too high.</source>
         <translation>Taxa de transação muito alta.</translation>
     </message>
+    <message>
+        <source>Transaction needs a change address, but we can't generate it.</source>
+        <translation>A transação precisa de um endereço de troco, mas não podemos gerá-lo.</translation>
+    </message>
     <message>
         <source>Transaction not valid.</source>
         <translation>Transação inválida.</translation>
@@ -4693,6 +6246,18 @@
         <source>Unable to locate enough non-denominated funds for this transaction.</source>
         <translation>Não foi possível localizar fundos não denominados suficientes para esta transacção.</translation>
     </message>
+    <message>
+        <source>Unable to lookup host %s</source>
+        <translation>Não é possível pesquisar o host %s</translation>
+    </message>
+    <message>
+        <source>Unable to parse -maxuploadtarget: '%s'</source>
+        <translation>Não é possível analisar -maxuploadtarget: '%s'</translation>
+    </message>
+    <message>
+        <source>Unable to send message to %s (::sendto() returned error %s)</source>
+        <translation>Não é possível enviar mensagem para %s (::sendto() retornou erro %s)</translation>
+    </message>
     <message>
         <source>Unable to sign spork message, wrong key?</source>
         <translation>Impossível assinar mensagem spork, chave incorreta?</translation>
@@ -4706,12 +6271,12 @@
         <translation>Estado desconhecido: id = %u</translation>
     </message>
     <message>
-        <source>Unsupported logging category %s=%s.</source>
-        <translation>Categoria de log não suportada %s=%s.</translation>
+        <source>Unsupported URL scheme, must begin with udp://</source>
+        <translation>Esquema de URL não suportado, deve começar com udp://</translation>
     </message>
     <message>
-        <source>Upgrading txindex database</source>
-        <translation>Atualizando o banco de dados txindex</translation>
+        <source>Unsupported logging category %s=%s.</source>
+        <translation>Categoria de log não suportada %s=%s.</translation>
     </message>
     <message>
         <source>Very low number of keys left: %d</source>
@@ -4741,9 +6306,25 @@
         <source>You can not disable governance validation on a masternode.</source>
         <translation>Você não pode desabilitar a validação de governança em um masternode.</translation>
     </message>
+    <message>
+        <source>You need to rebuild the database using -reindex to enable -addressindex</source>
+        <translation>Você precisa reconstruir o banco de dados usando -reindex para habilitar -addressindex</translation>
+    </message>
+    <message>
+        <source>You need to rebuild the database using -reindex to enable -spentindex</source>
+        <translation>Você precisa reconstruir o banco de dados usando -reindex para habilitar -spentindex</translation>
+    </message>
     <message>
         <source>Your entries added successfully.</source>
         <translation>Suas entradas foram adicionadas com êxito.</translation>
     </message>
+    <message>
+        <source>Settings file could not be read</source>
+        <translation>Arquivo de configurações não pôde ser lido</translation>
+    </message>
+    <message>
+        <source>Settings file could not be written</source>
+        <translation>Arquivo de configurações não pôde ser gravado</translation>
+    </message>
 </context>
 </TS>
\ No newline at end of file

From 517954464a0e20aa50d0f7989c5a945b4a65afc0 Mon Sep 17 00:00:00 2001
From: UdjinM6 <UdjinM6@users.noreply.github.com>
Date: Fri, 24 Oct 2025 09:21:28 +0300
Subject: [PATCH 327/656] fi

---
 src/qt/locale/dash_fi.ts | 2065 +++++++++++++++++++++++++++++++++-----
 1 file changed, 1823 insertions(+), 242 deletions(-)

diff --git a/src/qt/locale/dash_fi.ts b/src/qt/locale/dash_fi.ts
index ec221f8b1fcf..a1c3d9566523 100644
--- a/src/qt/locale/dash_fi.ts
+++ b/src/qt/locale/dash_fi.ts
@@ -65,14 +65,6 @@
         <source>C&amp;hoose</source>
         <translation>V&amp;alitse</translation>
     </message>
-    <message>
-        <source>Sending addresses</source>
-        <translation>Lähettävä osoite</translation>
-    </message>
-    <message>
-        <source>Receiving addresses</source>
-        <translation>Vastaanottava osoite</translation>
-    </message>
     <message>
         <source>These are your Dash addresses for sending payments. Always check the amount and the receiving address before sending coins.</source>
         <translation>Nämä ovat Dash osoitteesi maksujen lähetykseen. Tarkista aina lähetettävä määrä ja vastaanottajan osoite ennen kuin lähetät kolikoita.</translation>
@@ -94,8 +86,8 @@
         <translation>&amp;Muokkaa</translation>
     </message>
     <message>
-        <source>&amp;Show address QR code</source>
-        <translation>&amp;Näytä osoitteen QR koodi</translation>
+        <source>Show address &amp;QR code</source>
+        <translation>Näytä osoitteen &amp;QR-koodi</translation>
     </message>
     <message>
         <source>QR code</source>
@@ -105,6 +97,24 @@
         <source>Export Address List</source>
         <translation>Vie osoitekirja</translation>
     </message>
+    <message>
+        <source>Comma separated file</source>
+        <extracomment>Expanded name of the CSV file format. See: https://en.wikipedia.org/wiki/Comma-separated_values.</extracomment>
+        <translation>Pilkulla erotettu tiedosto</translation>
+    </message>
+    <message>
+        <source>There was an error trying to save the address list to %1. Please try again.</source>
+        <extracomment>An error message. %1 is a stand-in argument for the name of the file we attempted to save to.</extracomment>
+        <translation>Virhe tallennettaessa osoiteluetteloa tiedostoon %1. Yritä uudelleen.</translation>
+    </message>
+    <message>
+        <source>Sending addresses - %1</source>
+        <translation>Lähetysosoitteet - %1</translation>
+    </message>
+    <message>
+        <source>Receiving addresses - %1</source>
+        <translation>Vastaanotto-osoitteet - %1</translation>
+    </message>
     <message>
         <source>Exporting Failed</source>
         <translation>Vienti epäonnistui</translation>
@@ -274,10 +284,22 @@
         <source>The passphrase entered for the wallet decryption was incorrect.</source>
         <translation>Annettu salasana oli väärin.</translation>
     </message>
+    <message>
+        <source>The passphrase entered for the wallet decryption is incorrect. It contains a null character (ie - a zero byte). If the passphrase was set with a version of this software prior to 23.0, please try again with only the characters up to — but not including — the first null character. If this is successful, please set a new passphrase to avoid this issue in the future.</source>
+        <translation>Lompakon salauksen purkuun annettu salasana on virheellinen. Se sisältää null-merkin (eli nollatavun). Jos salasana asetettiin tämän ohjelmiston versiolla ennen 23.0, yritä uudelleen vain merkeillä ensimmäiseen null-merkkiin asti — mutta ei sitä mukaan lukien. Jos tämä onnistuu, aseta uusi salasana välttääksesi tämän ongelman tulevaisuudessa.</translation>
+    </message>
     <message>
         <source>Wallet passphrase was successfully changed.</source>
         <translation>Lompakon salasana vaihdettiin onnistuneesti.</translation>
     </message>
+    <message>
+        <source>Passphrase change failed</source>
+        <translation>Salasanan vaihto epäonnistui</translation>
+    </message>
+    <message>
+        <source>The old passphrase entered for the wallet decryption is incorrect. It contains a null character (ie - a zero byte). If the passphrase was set with a version of this software prior to 23.0, please try again with only the characters up to — but not including — the first null character.</source>
+        <translation>Lompakon salauksen purkuun annettu vanha salasana on virheellinen. Se sisältää null-merkin (eli nollatavun). Jos salasana asetettiin tämän ohjelmiston versiolla ennen 23.0, yritä uudelleen vain merkeillä ensimmäiseen null-merkkiin asti — mutta ei sitä mukaan lukien.</translation>
+    </message>
     <message>
         <source>Warning: The Caps Lock key is on!</source>
         <translation>Varoitus: Caps Lock on käytössä!</translation>
@@ -303,7 +325,23 @@
 </context>
 <context>
     <name>BitcoinApplication</name>
-    </context>
+    <message>
+        <source>Runaway exception</source>
+        <translation>Hallitsematon poikkeus</translation>
+    </message>
+    <message>
+        <source>A fatal error occurred. %1 can no longer continue safely and will quit.</source>
+        <translation>Kriittinen virhe tapahtui. %1 ei voi enää jatkaa turvallisesti ja sulkeutuu.</translation>
+    </message>
+    <message>
+        <source>Internal error</source>
+        <translation>Sisäinen virhe</translation>
+    </message>
+    <message>
+        <source>An internal error occurred. %1 will attempt to continue safely. This is an unexpected bug which can be reported as described below.</source>
+        <translation>Sisäinen virhe tapahtui. %1 yrittää jatkaa turvallisesti. Tämä on odottamaton virhe, joka voidaan raportoida alla kuvatulla tavalla.</translation>
+    </message>
+</context>
 <context>
     <name>BitcoinGUI</name>
     <message>
@@ -330,6 +368,10 @@
         <source>Request payments (generates QR codes and dash: URIs)</source>
         <translation>Pyydä maksuja (Luo QR koodit ja Dash: URIt)</translation>
     </message>
+    <message>
+        <source>Ctrl+Q</source>
+        <translation>Ctrl+Q</translation>
+    </message>
     <message>
         <source>&amp;Options…</source>
         <translation>&amp;Asetukset…</translation>
@@ -358,6 +400,10 @@
         <source>&amp;Verify message…</source>
         <translation>&amp;Tarkista Viesti…</translation>
     </message>
+    <message>
+        <source>&amp;Load PSBT from file…</source>
+        <translation>&amp;Lataa PSBT tiedostosta…</translation>
+    </message>
     <message>
         <source>&amp;Sending addresses</source>
         <translation>&amp;Lähettävät Osoitteet</translation>
@@ -390,10 +436,6 @@
         <source>&amp;Window</source>
         <translation>&amp;Ikkuna</translation>
     </message>
-    <message>
-        <source>Minimize</source>
-        <translation>Pienennä</translation>
-    </message>
     <message>
         <source>Zoom</source>
         <translation>Suurenna</translation>
@@ -446,14 +488,6 @@
         <source>Modify configuration options for %1</source>
         <translation>Muuta %1 asetuksia</translation>
     </message>
-    <message>
-        <source>&amp;Show / Hide</source>
-        <translation>&amp;Näytä / Piilota</translation>
-    </message>
-    <message>
-        <source>Show or hide the main Window</source>
-        <translation>Näytä tai piilota pääikkuna</translation>
-    </message>
     <message>
         <source>Encrypt the private keys that belong to your wallet</source>
         <translation>Salaa yksityiset avaimet jotka kuuluvat lompakkoosi</translation>
@@ -518,10 +552,6 @@
         <source>Show wallet repair options</source>
         <translation>Näytä lompakon korjausvalinnat</translation>
     </message>
-    <message>
-        <source>Open Wallet &amp;Configuration File</source>
-        <translation>Avaa &amp;Asetustiedosto</translation>
-    </message>
     <message>
         <source>Open configuration file</source>
         <translation>Avaa asetustiedosto</translation>
@@ -576,10 +606,40 @@
         <source>Show information about %1</source>
         <translation>Näytä tietoja %1</translation>
     </message>
+    <message>
+        <source>Load PSBT from &amp;clipboard…</source>
+        <translation>Lataa PSBT &amp;leikepöydältä…</translation>
+    </message>
+    <message>
+        <source>Open debugging and diagnostic console</source>
+        <translation>Avaa virheenkorjaus- ja diagnoosikonsoli</translation>
+    </message>
+    <message>
+        <source>Open &amp;wallet configuration file</source>
+        <translation>Avaa &amp;lompakon asetustiedosto</translation>
+    </message>
+    <message>
+        <source>Open a dash: URI</source>
+        <translation>Avaa dash: URI</translation>
+    </message>
     <message>
         <source>Create a new wallet</source>
         <translation>Luo uusi lompakko</translation>
     </message>
+    <message>
+        <source>Restore Wallet…</source>
+        <extracomment>Name of the menu item that restores wallet from a backup file.</extracomment>
+        <translation>Palauta lompakko…</translation>
+    </message>
+    <message>
+        <source>Restore a wallet from a backup file</source>
+        <extracomment>Status tip for Restore Wallet menu item</extracomment>
+        <translation>Palauta lompakko varmuuskopiotiedostosta</translation>
+    </message>
+    <message>
+        <source>Close all wallets</source>
+        <translation>Sulje kaikki lompakot</translation>
+    </message>
     <message>
         <source>%1 &amp;information</source>
         <translation>%1 T&amp;ietoja</translation>
@@ -588,10 +648,42 @@
         <source>Show the %1 basic information</source>
         <translation>Näytä %1 perustietoja</translation>
     </message>
+    <message>
+        <source>&amp;Discreet mode</source>
+        <translation>&amp;Huomaamaton tila</translation>
+    </message>
+    <message>
+        <source>Mask the values in the Overview tab</source>
+        <translation>Peitä arvot Yleiskatsaus-välilehdellä</translation>
+    </message>
+    <message>
+        <source>Wallet Data</source>
+        <extracomment>Name of the wallet data file format.</extracomment>
+        <translation>Lompakon tiedot</translation>
+    </message>
+    <message>
+        <source>Load Wallet Backup</source>
+        <extracomment>The title for Restore Wallet File Windows</extracomment>
+        <translation>Lataa lompakon varmuuskopio</translation>
+    </message>
+    <message>
+        <source>Restore Wallet</source>
+        <extracomment>Title of pop-up window shown when the user is attempting to restore a wallet.</extracomment>
+        <translation>Palauta lompakko</translation>
+    </message>
+    <message>
+        <source>Wallet Name</source>
+        <extracomment>Label of the input field where the name of the wallet is entered.</extracomment>
+        <translation>Lompakon nimi</translation>
+    </message>
     <message>
         <source>&amp;Settings</source>
         <translation>&amp;Asetukset</translation>
     </message>
+    <message>
+        <source>&amp;Minimize</source>
+        <translation>&amp;Pienennä</translation>
+    </message>
     <message>
         <source>&amp;Help</source>
         <translation>&amp;Apua</translation>
@@ -608,8 +700,17 @@
         <source>View Governance Proposals</source>
         <translation>Näytä hallinnon ehdotukset</translation>
     </message>
+    <message>
+        <source>&amp;Hide</source>
+        <translation>&amp;Piilota</translation>
+    </message>
+    <message>
+        <source>S&amp;how</source>
+        <translation>&amp;Näytä</translation>
+    </message>
     <message numerus="yes">
         <source>%n active connection(s) to Dash network</source>
+        <extracomment>A substring of the tooltip.</extracomment>
         <translation><numerusform>%n aktiivinen yhteys Dash verkkoon</numerusform><numerusform>%n aktiivista yhteyttä Dash verkkoon</numerusform></translation>
     </message>
     <message>
@@ -628,10 +729,50 @@
         <source>Close Wallet…</source>
         <translation>Sulje Lompakko…</translation>
     </message>
+    <message>
+        <source>Load Partially Signed Blockchain Transaction</source>
+        <translation>Lataa osittain allekirjoitettu lohkoketjutapahtuma</translation>
+    </message>
+    <message>
+        <source>Load Partially Signed Blockchain Transaction from clipboard</source>
+        <translation>Lataa osittain allekirjoitettu lohkoketjutapahtuma leikepöydältä</translation>
+    </message>
     <message>
         <source>Create Wallet…</source>
         <translation>Luo Lompakko…</translation>
     </message>
+    <message>
+        <source>Close All Wallets…</source>
+        <translation>Sulje kaikki lompakot…</translation>
+    </message>
+    <message>
+        <source>Ctrl+Shift+D</source>
+        <translation>Ctrl+Shift+D</translation>
+    </message>
+    <message>
+        <source>Ctrl+M</source>
+        <translation>Ctrl+M</translation>
+    </message>
+    <message>
+        <source>Click for more actions.</source>
+        <extracomment>A substring of the tooltip. "More actions" are available via the context menu.</extracomment>
+        <translation>Napsauta nähdäksesi lisää toimintoja.</translation>
+    </message>
+    <message>
+        <source>Show Peers tab</source>
+        <extracomment>A context menu item. The "Peers tab" is an element of the "Node window".</extracomment>
+        <translation>Näytä Peers-välilehti</translation>
+    </message>
+    <message>
+        <source>Disable network activity</source>
+        <extracomment>A context menu item.</extracomment>
+        <translation>Poista verkkotoiminnot käytöstä</translation>
+    </message>
+    <message>
+        <source>Enable network activity</source>
+        <extracomment>A context menu item. The network activity was disabled previously.</extracomment>
+        <translation>Ota verkkotoiminnot käyttöön</translation>
+    </message>
     <message>
         <source>Syncing Headers (%1%)…</source>
         <translation>Synkronoidaan otsikoita (%1%)…</translation>
@@ -648,10 +789,6 @@
         <source>Processing blocks on disk…</source>
         <translation>Käsitellään lohkoja levyllä…</translation>
     </message>
-    <message>
-        <source>Reindexing blocks on disk…</source>
-        <translation>Uudelleen indeksoidaan lohkoja…</translation>
-    </message>
     <message>
         <source>Connecting to peers…</source>
         <translation>Kytkeydytään peers…</translation>
@@ -805,10 +942,6 @@
         <source>Coin Selection</source>
         <translation>Kolikko Valinta</translation>
     </message>
-    <message>
-        <source>Dust:</source>
-        <translation>Tomu:</translation>
-    </message>
     <message>
         <source>After Fee:</source>
         <translation>Siirtomaksun jälkeen:</translation>
@@ -866,28 +999,32 @@
         <translation>Vahvistettu</translation>
     </message>
     <message>
-        <source>Copy address</source>
-        <translation>Kopioi osoite</translation>
+        <source>Copy amount</source>
+        <translation>Kopioi määrä</translation>
+    </message>
+    <message>
+        <source>&amp;Copy address</source>
+        <translation>&amp;Kopioi osoite</translation>
     </message>
     <message>
-        <source>Copy label</source>
-        <translation>Kopioi nimi</translation>
+        <source>Copy &amp;label</source>
+        <translation>Kopioi &amp;nimi</translation>
     </message>
     <message>
-        <source>Copy amount</source>
-        <translation>Kopioi määrä</translation>
+        <source>Copy &amp;amount</source>
+        <translation>Kopioi &amp;määrä</translation>
     </message>
     <message>
-        <source>Copy transaction ID</source>
-        <translation>Kopioi siirtotunnus</translation>
+        <source>Copy transaction &amp;ID and output index</source>
+        <translation>Kopioi tapahtuman &amp;ID ja lähtöindeksi</translation>
     </message>
     <message>
-        <source>Lock unspent</source>
-        <translation>Lukitse käyttämättömät</translation>
+        <source>L&amp;ock unspent</source>
+        <translation>L&amp;ukitse käyttämätön</translation>
     </message>
     <message>
-        <source>Unlock unspent</source>
-        <translation>Avaa lukitus käyttämättömistä</translation>
+        <source>&amp;Unlock unspent</source>
+        <translation>&amp;Avaa käyttämättömän lukitus</translation>
     </message>
     <message>
         <source>Copy quantity</source>
@@ -905,10 +1042,6 @@
         <source>Copy bytes</source>
         <translation>Kopioi tavut</translation>
     </message>
-    <message>
-        <source>Copy dust</source>
-        <translation>Kopioi tomu</translation>
-    </message>
     <message>
         <source>Copy change</source>
         <translation>Kopioi vaihtoraha</translation>
@@ -921,18 +1054,6 @@
         <source>(%1 locked)</source>
         <translation>(%1 lukittu)</translation>
     </message>
-    <message>
-        <source>yes</source>
-        <translation>kyllä</translation>
-    </message>
-    <message>
-        <source>no</source>
-        <translation>ei</translation>
-    </message>
-    <message>
-        <source>This label turns red if any recipient receives an amount smaller than the current dust threshold.</source>
-        <translation>Tämä nimi vaihtuu punaiseksi jos yksikään vastaanottaja saa pienemmän määrän kuin nykyinen tomun määritelty raja-arvo.</translation>
-    </message>
     <message>
         <source>Can vary +/- %1 duff(s) per input.</source>
         <translation>Voi vaihdella +/- %1 duffs per syöte.</translation>
@@ -976,8 +1097,14 @@
 </context>
 <context>
     <name>CreateWalletActivity</name>
+    <message>
+        <source>Create Wallet</source>
+        <extracomment>Title of window indicating the progress of creation of a new wallet.</extracomment>
+        <translation>Luo lompakko</translation>
+    </message>
     <message>
         <source>Creating Wallet &lt;b&gt;%1&lt;/b&gt;…</source>
+        <extracomment>Descriptive text of the create wallet progress window which indicates to the user which wallet is currently being created.</extracomment>
         <translation>Luodaan Lompakko &lt;b&gt;%1&lt;/b&gt;…</translation>
     </message>
     <message>
@@ -999,6 +1126,10 @@
         <source>Wallet Name</source>
         <translation>Lompakon Nimi</translation>
     </message>
+    <message>
+        <source>Wallet</source>
+        <translation>Lompakko</translation>
+    </message>
     <message>
         <source>Encrypt the wallet. The wallet will be encrypted with a passphrase of your choice.</source>
         <translation>Salaa lompakko. Lompakko salataan haluamallasi salasanallasi.</translation>
@@ -1007,6 +1138,10 @@
         <source>Encrypt Wallet</source>
         <translation>Salaa Lompakko</translation>
     </message>
+    <message>
+        <source>Advanced Options</source>
+        <translation>Edistyneet asetukset</translation>
+    </message>
     <message>
         <source>Disable private keys for this wallet. Wallets with private keys disabled will have no private keys and cannot have an HD seed or imported private keys. This is ideal for watch-only wallets.</source>
         <translation>Poista tämän lompakon yksityisavaimet käytöstä. Lompakoissa joissa yksityisavaimet on poistettu käytöstä, ei ole yksityisiä avaimia, eikä niissä voi olla HD-siementä tai tuotuja yksityisavaimia Tämä sopii hyvin katso-vain lompakoille.</translation>
@@ -1023,11 +1158,23 @@
         <source>Make Blank Wallet</source>
         <translation>Luo Tyhjä Lompakko</translation>
     </message>
+    <message>
+        <source>Use descriptors for scriptPubKey management. This feature is well-tested but still considered experimental and not recommended for use yet.</source>
+        <translation>Käytä deskriptoreja scriptPubKey-hallintaan. Tämä ominaisuus on hyvin testattu, mutta sitä pidetään edelleen kokeellisena, eikä sen käyttöä suositella vielä.</translation>
+    </message>
+    <message>
+        <source>Descriptor Wallet (EXPERIMENTAL)</source>
+        <translation>Deskriptorilompakko (KOKEELLINEN)</translation>
+    </message>
     <message>
         <source>Create</source>
         <translation>Luo</translation>
     </message>
-    </context>
+    <message>
+        <source>Compiled without sqlite support (required for descriptor wallets)</source>
+        <translation>Käännetty ilman sqlite-tukea (vaaditaan deskriptorilompakoille)</translation>
+    </message>
+</context>
 <context>
     <name>EditAddressDialog</name>
     <message>
@@ -1116,18 +1263,106 @@
         <source>Filter List:</source>
         <translation>SuodatusLista:</translation>
     </message>
+    <message>
+        <source>Filter proposal list</source>
+        <translation>Suodata ehdotusluettelo</translation>
+    </message>
+    <message>
+        <source>Masternode Count:</source>
+        <translation>Masternoden määrä:</translation>
+    </message>
+    <message>
+        <source>Number of masternodes this wallet can vote with (masternodes for which this wallet holds the voting key)</source>
+        <translation>Masternodejen määrä, joilla tämä lompakko voi äänestää (masternodes, joiden äänestysavainta tämä lompakko hallitsee)</translation>
+    </message>
     <message>
         <source>Proposal Count:</source>
         <translation>Ehdotuksien Määrä:</translation>
     </message>
+    <message>
+        <source>Create Proposal</source>
+        <translation>Luo ehdotus</translation>
+    </message>
     <message>
         <source>Filter by Title</source>
         <translation>Suodata Otsikolla</translation>
     </message>
+    <message>
+        <source>Unavailable</source>
+        <translation>Ei saatavilla</translation>
+    </message>
+    <message>
+        <source>A synced node and an unlocked wallet are required.</source>
+        <translation>Synkronoitu node ja lukitsematon lompakko vaaditaan.</translation>
+    </message>
+    <message>
+        <source>Vote Yes</source>
+        <translation>Äänestä Kyllä</translation>
+    </message>
+    <message>
+        <source>Vote No</source>
+        <translation>Äänestä Ei</translation>
+    </message>
+    <message>
+        <source>Vote Abstain</source>
+        <translation>Tyhjää</translation>
+    </message>
     <message>
         <source>Proposal Info: %1</source>
         <translation>Ehdotus Info: %1</translation>
     </message>
+    <message>
+        <source>Voting Failed</source>
+        <translation>Äänestys epäonnistui</translation>
+    </message>
+    <message>
+        <source>No wallet available.</source>
+        <translation>Lompaakkoa ei saatavilla.</translation>
+    </message>
+    <message>
+        <source>No masternode voting keys found in wallet.</source>
+        <translation>Masternoden äänestysavaimia ei löytynyt lompakosta.</translation>
+    </message>
+    <message>
+        <source>Please select a proposal to vote on.</source>
+        <translation>Valitse ehdotus, josta äänestää.</translation>
+    </message>
+    <message>
+        <source>Unable to unlock wallet.</source>
+        <translation>Lompakon lukitusta ei voitu avata.</translation>
+    </message>
+    <message>
+        <source>Unable to get masternode list. Please try again later.</source>
+        <translation>Masternode-luetteloa ei voitu hakea. Yritä myöhemmin uudelleen.</translation>
+    </message>
+    <message>
+        <source>Masternode %1 not found</source>
+        <translation>Masternodea %1 ei löytynyt</translation>
+    </message>
+    <message>
+        <source>Failed to sign vote for masternode %1</source>
+        <translation>Äänen allekirjoitus masternodelle %1 epäonnistui</translation>
+    </message>
+    <message>
+        <source>Masternode %1: %2</source>
+        <translation>Masternode %1: %2</translation>
+    </message>
+    <message numerus="yes">
+        <source>Voted successfully %n time(s)</source>
+        <translation><numerusform>Äänestys onnistui %n kerran</numerusform><numerusform>Äänestys onnistui %n kertaa</numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <source>Failed to vote %n time(s)</source>
+        <translation><numerusform>Äänestys epäonnistui %n kerran</numerusform><numerusform>Äänestys epäonnistui %n kertaa</numerusform></translation>
+    </message>
+    <message>
+        <source>Errors:</source>
+        <translation>Virheet:</translation>
+    </message>
+    <message>
+        <source>Voting Results</source>
+        <translation>Äänestystulokset</translation>
+    </message>
 </context>
 <context>
     <name>HelpMessageDialog</name>
@@ -1166,10 +1401,26 @@
         <source>As this is the first time the program is launched, you can choose where %1 will store its data.</source>
         <translation>Tämä on ensimmäinen kerta, kun %1 on käynnistetty, joten voit valita datahakemiston paikan.</translation>
     </message>
+    <message>
+        <source>Limit block chain storage to</source>
+        <translation>Rajoita lohkoketjun tallennustilaa</translation>
+    </message>
+    <message>
+        <source>Reverting this setting requires re-downloading the entire blockchain. It is faster to download the full chain first and prune it later. Disables some advanced features.</source>
+        <translation>Tämän asetuksen palauttaminen edellyttää koko lohkoketjun uudelleenlataamista. On nopeampaa ladata ensin koko ketju ja karsia se myöhemmin. Poistaa käytöstä joitakin edistyneitä ominaisuuksia.</translation>
+    </message>
+    <message>
+        <source> GB</source>
+        <translation> GB</translation>
+    </message>
     <message>
         <source>This initial synchronisation is very demanding, and may expose hardware problems with your computer that had previously gone unnoticed. Each time you run %1, it will continue downloading where it left off.</source>
         <translation>Tämä ensimmäinen synkronointi on vaativa, ja saattaa paljastaa laitteisto-ongelmia tietokoneessasi joita ei aikaisemmin ole huomattu. Aina kun käynnistät %1, jatkuu latautuminen siitä mihin se jäi aikaisemmin.</translation>
     </message>
+    <message>
+        <source>When you click OK, %1 will begin to download and process the full %4 block chain (%2 GB) starting with the earliest transactions in %3 when %4 initially launched.</source>
+        <translation>Kun napsautat OK, %1 aloittaa koko %4-lohkoketjun (%2 GB) lataamisen ja käsittelyn alkaen varhaisimmista tapahtumista %3:ssä, jolloin %4 alun perin käynnistettiin.</translation>
+    </message>
     <message>
         <source>If you have chosen to limit block chain storage (pruning), the historical data must still be downloaded and processed, but will be deleted afterward to keep your disk usage low.</source>
         <translation>Jos olet valinnut rajoitetun lohkoketjun levytilan (karsimalla), historialliset tiedot täytyy silti ladata ja prosessoida, mutta ne poistetaan jälkeenpäin jotta levytilaa säästyy.</translation>
@@ -1182,6 +1433,18 @@
         <source>Use a custom data directory:</source>
         <translation>Määritä oma datahakemisto:</translation>
     </message>
+    <message numerus="yes">
+        <source>%n GB of space available</source>
+        <translation><numerusform>%n GB tilaa saatavilla</numerusform><numerusform>%n GB tilaa saatavilla</numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <source>(of %n GB needed)</source>
+        <translation><numerusform>(%n GB tarvitaan)</numerusform><numerusform>(%n GB tarvitaan)</numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <source>(%n GB needed for full chain)</source>
+        <translation><numerusform>(%n GB tarvitaan koko ketjuun)</numerusform><numerusform>(%n GB tarvitaan koko ketjuun)</numerusform></translation>
+    </message>
     <message>
         <source>At least %1 GB of data will be stored in this directory, and it will grow over time.</source>
         <translation>Vähintään %1 GB dataa tallennetaan tähän hakemistoon, ja se kasvaa ajan kuluessa.</translation>
@@ -1190,6 +1453,11 @@
         <source>Approximately %1 GB of data will be stored in this directory.</source>
         <translation>Arviolta %1 GB dataa tallennetaan tähän hakemistoon.</translation>
     </message>
+    <message numerus="yes">
+        <source>(sufficient to restore backups %n day(s) old)</source>
+        <extracomment>Explanatory text on the capability of the current prune target.</extracomment>
+        <translation><numerusform>(riittävä palauttamaan %n päivän vanhat varmuuskopiot)</numerusform><numerusform>(riittävä palauttamaan %n päivän vanhat varmuuskopiot)</numerusform></translation>
+    </message>
     <message>
         <source>%1 will download and store a copy of the Dash block chain.</source>
         <translation>%1 lataa ja tallentaa kopion Dash lohkoketjusta.</translation>
@@ -1207,6 +1475,13 @@
         <translation>Virhe</translation>
     </message>
 </context>
+<context>
+    <name>LoadWalletsActivity</name>
+    <message>
+        <source>Loading wallets…</source>
+        <translation>Ladataan lompakoita…</translation>
+    </message>
+</context>
 <context>
     <name>MasternodeList</name>
     <message>
@@ -1241,6 +1516,10 @@
         <source>Service</source>
         <translation>Palvelu</translation>
     </message>
+    <message>
+        <source>Type</source>
+        <translation>Tyyppi</translation>
+    </message>
     <message>
         <source>PoSe Score</source>
         <translation>PoSe Pisteet</translation>
@@ -1376,6 +1655,10 @@
         <source>Hide</source>
         <translation>Piilota</translation>
     </message>
+    <message>
+        <source>%1 is currently syncing.  It will download headers and blocks from peers and validate them until reaching the tip of the block chain.</source>
+        <translation>%1 synkronoi parhaillaan. Se lataa otsikoita ja lohkoja vertaisverkosta ja validoi ne kunnes saavuttaa lohkoketjun kärjen.</translation>
+    </message>
     <message>
         <source>Unknown. Syncing Headers (%1, %2%)…</source>
         <translation>Tuntematon. Synkronoidaan otsikoita (%1, %2%)…</translation>
@@ -1391,6 +1674,11 @@
         <source>URI:</source>
         <translation>URI:</translation>
     </message>
+    <message>
+        <source>Paste address from clipboard</source>
+        <extracomment>Tooltip text for button that allows you to paste an address that is in your clipboard.</extracomment>
+        <translation>Liitä osoite leikepöydältä</translation>
+    </message>
 </context>
 <context>
     <name>OpenWalletActivity</name>
@@ -1406,8 +1694,14 @@
         <source>default wallet</source>
         <translation>oletus lompakko</translation>
     </message>
+    <message>
+        <source>Open Wallet</source>
+        <extracomment>Title of window indicating the progress of opening of a wallet.</extracomment>
+        <translation>Avaa lompakko</translation>
+    </message>
     <message>
         <source>Opening Wallet &lt;b&gt;%1&lt;/b&gt;…</source>
+        <extracomment>Descriptive text of the open wallet progress window which indicates to the user which wallet is currently being opened.</extracomment>
         <translation>Avataan Lompakko &lt;b&gt;%1&lt;/b&gt;…</translation>
     </message>
 </context>
@@ -1441,6 +1735,14 @@
         <source>&amp;Appearance</source>
         <translation>&amp;Ulkoasu</translation>
     </message>
+    <message>
+        <source>Show the icon in the system tray.</source>
+        <translation>Näytä kuvake ilmoitusalueella.</translation>
+    </message>
+    <message>
+        <source>&amp;Show tray icon</source>
+        <translation>&amp;Näytä ilmoitusalueen kuvake</translation>
+    </message>
     <message>
         <source>Prune &amp;block storage to</source>
         <translation>Karsi &amp;lohko levytila</translation>
@@ -1453,10 +1755,58 @@
         <source>Reverting this setting requires re-downloading the entire blockchain.</source>
         <translation>Tämän asetuksen takaisin käyttöönottaminen edellyttää koko lohkoketjun uudelleen latausta.</translation>
     </message>
+    <message>
+        <source>Maximum database cache size. A larger cache can contribute to faster sync, after which the benefit is less pronounced for most use cases. Lowering the cache size will reduce memory usage. Unused mempool memory is shared for this cache.</source>
+        <extracomment>Tooltip text for Options window setting that sets the size of the database cache. Explains the corresponding effects of increasing/decreasing this value.</extracomment>
+        <translation>Tietokannan välimuistin enimmäiskoko. Suurempi välimuisti voi nopeuttaa synkronointia, jonka jälkeen hyöty on vähäisempi useimmissa käyttötapauksissa. Välimuistin koon pienentäminen vähentää muistin käyttöä. Käyttämätön mempool-muisti jaetaan tälle välimuistille.</translation>
+    </message>
     <message>
         <source>MiB</source>
         <translation>MiB</translation>
     </message>
+    <message>
+        <source>Set the number of script verification threads. Negative values correspond to the number of cores you want to leave free to the system.</source>
+        <extracomment>Tooltip text for Options window setting that sets the number of script verification threads. Explains that negative values mean to leave these many cores free to the system.</extracomment>
+        <translation>Aseta skriptivarmennussäikeiden määrä. Negatiiviset arvot vastaavat niiden ytimien määrää, jotka haluat jättää järjestelmälle vapaaksi.</translation>
+    </message>
+    <message>
+        <source>This allows you or a third party tool to communicate with the node through command-line and JSON-RPC commands.</source>
+        <extracomment>Tooltip text for Options window setting that enables the RPC server.</extracomment>
+        <translation>Tämä mahdollistaa sinun tai kolmannen osapuolen työkalun kommunikoinnin noden kanssa komentorivin ja JSON-RPC-komentojen kautta.</translation>
+    </message>
+    <message>
+        <source>Enable R&amp;PC server</source>
+        <extracomment>An Options window setting to enable the RPC server.</extracomment>
+        <translation>Ota R&amp;PC-palvelin käyttöön</translation>
+    </message>
+    <message>
+        <source>Whether to set subtract fee from amount as default or not.</source>
+        <extracomment>Tooltip text for Options window setting that sets subtracting the fee from a sending amount as default.</extracomment>
+        <translation>Asetetaanko siirtomaksun vähentäminen summasta oletusarvoisesti vai ei.</translation>
+    </message>
+    <message>
+        <source>Subtract &amp;fee from amount by default</source>
+        <extracomment>An Options window setting to set subtracting the fee from a sending amount as default.</extracomment>
+        <translation>Vähennä &amp;siirtomaksu summasta oletuksena</translation>
+    </message>
+    <message>
+        <source>Enable &amp;PSBT controls</source>
+        <extracomment>An options window setting to enable PSBT controls.</extracomment>
+        <translation>Ota &amp;PSBT-hallinta käyttöön</translation>
+    </message>
+    <message>
+        <source>Whether to show PSBT controls.</source>
+        <extracomment>Tooltip text for options window setting that enables PSBT controls.</extracomment>
+        <translation>Näytetäänkö PSBT-hallinta.</translation>
+    </message>
+    <message>
+        <source>Whether to keep the specified custom change address or not.</source>
+        <translation>Säilytetäänkö määritetty mukautettu vaihto-osoite vai ei.</translation>
+    </message>
+    <message>
+        <source>Keep custom change &amp;address</source>
+        <translation>Säilytä mukautettu vaihto-&amp;osoite</translation>
+    </message>
     <message>
         <source>Show additional tab listing all your masternodes in first sub-tab&lt;br/&gt;and all masternodes on the network in second sub-tab.</source>
         <translation>Näytä lisävälilehti jonka ensimmäisellä alivälilehdellä näkyvät sinun masternodet&lt;br/&gt;ja toisella alivälilehdellä näkyvät verkon kaikki masternodet.</translation>
@@ -1513,6 +1863,14 @@
         <source>Enable &amp;multi-session</source>
         <translation>Ota käyttöön &amp;multisessio</translation>
     </message>
+    <message>
+        <source>Use this many separate masternodes in parallel to mix funds.&lt;br/&gt;Note: You must use this feature carefully.&lt;br/&gt;Make sure you always have recent wallet (auto)backup in a safe place!</source>
+        <translation>Käytä näin montaa erillistä masternodea rinnakkain varojen sekoittamiseen.&lt;br/&gt;Huom: Sinun täytyy käyttää tätä ominaisuutta varoen.&lt;br/&gt;Varmista että sinulla on aina tuore lompakon (auto)varmuuskopio turvallisessa paikassa!</translation>
+    </message>
+    <message>
+        <source>Parallel sessions</source>
+        <translation>Rinnakkaiset istunnot</translation>
+    </message>
     <message>
         <source>Mixing rounds</source>
         <translation>Sekoitus Kierrokset</translation>
@@ -1525,6 +1883,30 @@
         <source>Target balance</source>
         <translation>Haluttu saldo</translation>
     </message>
+    <message>
+        <source>How many inputs of each denominated amount are created.&lt;br/&gt;Lower these numbers if you want fewer smaller denominations.</source>
+        <translation>Kuinka monta syötettä kustakin nimellismäärästä luodaan.&lt;br/&gt;Laske näitä lukuja jos haluat vähemmän pienempiä nimellisarvoja.</translation>
+    </message>
+    <message>
+        <source>Inputs per denomination</source>
+        <translation>Syötteet nimellisarvoa kohti</translation>
+    </message>
+    <message>
+        <source>Try to create at least this many inputs for each denominated amount.&lt;br/&gt;Lower this number if you want fewer smaller denominations.</source>
+        <translation>Yritä luoda vähintään näin monta syötettä kullekin nimellismäärälle.&lt;br/&gt;Laske tätä lukua jos haluat vähemmän pienempiä nimellisarvoja.</translation>
+    </message>
+    <message>
+        <source>Target</source>
+        <translation>Tavoite</translation>
+    </message>
+    <message>
+        <source>Create up to this many inputs for each denominated amount.&lt;br/&gt;Lower this number if you want fewer smaller denominations.</source>
+        <translation>Luo enintään näin monta syötettä kullekin nimellismäärälle.&lt;br/&gt;Laske tätä lukua jos haluat vähemmän pienempiä nimellisarvoja.</translation>
+    </message>
+    <message>
+        <source>Maximum</source>
+        <translation>Maksimi</translation>
+    </message>
     <message>
         <source>Automatically open the Dash Core client port on the router. This only works when your router supports UPnP and it is enabled.</source>
         <translation>Avaa automaattisesti Dash Core asiakasohjelmalle portti reitittimeen. Tämä toimii vain jos reitittimesi tukee UPnP:tä ja se on käytössä.</translation>
@@ -1554,20 +1936,26 @@
         <translation>Näyttää onko oletus SOCKS5 proxy käytössä peers:ien tavoittamiseen tämän verkkotyypin kautta.</translation>
     </message>
     <message>
-        <source>Options set in this dialog are overridden by the command line or in the configuration file:</source>
-        <translation>Asetukset tässä dialogissa ylikirjoitetaan joko komentorivin tai asetustiedostosta:</translation>
+        <source>Language missing or translation incomplete? Help contributing translations here:
+https://explore.transifex.com/dash/dash/</source>
+        <translation>Kieli puuttuu tai käännös on keskeneräinen? Auta käännösten tekemisessä täällä:
+https://explore.transifex.com/dash/dash/</translation>
     </message>
     <message>
-        <source>Minimize instead of exit the application when the window is closed. When this option is enabled, the application will be closed only after selecting Exit in the menu.</source>
-        <translation>Ikkunaa suljettaessa pienennä ohjelman ikkuna lopettamatta itse ohjelmaa. Kun tämä asetus on valittuna, ohjelman voi sulkea vain valitsemalla Lopeta ohjelman valikosta.</translation>
+        <source>Third-party URLs (e.g. a block explorer) that appear in the transactions tab as context menu items.&lt;br/&gt;%s in the URL is replaced by transaction hash. Multiple URLs are separated by vertical bar |.</source>
+        <translation>Kolmannen osapuolen URL:t (esim. lohkoselain), jotka näkyvät tapahtumat-välilehdellä kontekstivalikon kohteina.&lt;br/&gt;%s URL:ssa korvataan tapahtuman hajautusarvolla. Useat URL:t erotetaan pystyviivalla |.</translation>
+    </message>
+    <message>
+        <source>&amp;Third-party transaction URLs</source>
+        <translation>&amp;Kolmannen osapuolen tapahtuma-URL:t</translation>
     </message>
     <message>
-        <source>Third party URLs (e.g. a block explorer) that appear in the transactions tab as context menu items.&lt;br/&gt;%s in the URL is replaced by transaction hash. Multiple URLs are separated by vertical bar |.</source>
-        <translation>Ulkopuoliset URL-osoitteet (esim. lohkoselain) jotka esiintyvät tapahtumat-välilehdellä valikossa.&lt;br/&gt;%s URL osoitteessa korvataan siirtotunnuksen tarkisteella. Useampi URL osoite on eroteltu pystyviivalla |.</translation>
+        <source>Options set in this dialog are overridden by the command line or in the configuration file:</source>
+        <translation>Asetukset tässä dialogissa ylikirjoitetaan joko komentorivin tai asetustiedostosta:</translation>
     </message>
     <message>
-        <source>&amp;Third party transaction URLs</source>
-        <translation>&amp;Kolmannen osapuolen siirtotapahtuma URL:t</translation>
+        <source>Minimize instead of exit the application when the window is closed. When this option is enabled, the application will be closed only after selecting Exit in the menu.</source>
+        <translation>Ikkunaa suljettaessa pienennä ohjelman ikkuna lopettamatta itse ohjelmaa. Kun tämä asetus on valittuna, ohjelman voi sulkea vain valitsemalla Lopeta ohjelman valikosta.</translation>
     </message>
     <message>
         <source>Whether to show coin control features or not.</source>
@@ -1605,6 +1993,10 @@
         <source>Map port using &amp;UPnP</source>
         <translation>Kartoita portti käyttäen &amp;UPnP:tä</translation>
     </message>
+    <message>
+        <source>Automatically open the Dash Core client port on the router. This only works when your router supports NAT-PMP and it is enabled. The external port could be random.</source>
+        <translation>Avaa Dash Core -asiakasportti reitittimessä automaattisesti. Tämä toimii vain jos reitittimesi tukee NAT-PMP:tä ja se on käytössä. Ulkoinen portti voi olla satunnainen.</translation>
+    </message>
     <message>
         <source>Proxy &amp;IP:</source>
         <translation>Proxy &amp;IP</translation>
@@ -1654,11 +2046,19 @@
         <translation>&amp;Käyttöliittymä</translation>
     </message>
     <message>
-        <source>User Interface &amp;language:</source>
-        <translation>&amp;Käyttöliittymän kieli</translation>
+        <source>Connect to the Dash network through a separate SOCKS5 proxy for Tor onion services.</source>
+        <translation>Yhdistä Dash-verkkoon erillisen SOCKS5-välityspalvelimen kautta Tor onion -palveluita varten.</translation>
     </message>
     <message>
-        <source>The user interface language can be set here. This setting will take effect after restarting %1.</source>
+        <source>Use separate SOCKS&amp;5 proxy to reach peers via Tor onion services:</source>
+        <translation>Käytä erillistä SOCKS&amp;5-välityspalvelinta tavoittaaksesi vertaisverkon kautta Tor onion -palvelut:</translation>
+    </message>
+    <message>
+        <source>User Interface &amp;language:</source>
+        <translation>&amp;Käyttöliittymän kieli</translation>
+    </message>
+    <message>
+        <source>The user interface language can be set here. This setting will take effect after restarting %1.</source>
         <translation>Tässä voit määritellä käyttöliittymän kielen. Muutokset astuvat voimaan seuraavan kerran, kun %1 käynnistetään.</translation>
     </message>
     <message>
@@ -1699,14 +2099,22 @@
     </message>
     <message>
         <source>Confirm options reset</source>
+        <extracomment>Window title text of pop-up window shown when the user has chosen to reset options.</extracomment>
         <translation>Vahvista asetusten palautus</translation>
     </message>
     <message>
         <source>Client restart required to activate changes.</source>
+        <extracomment>Text explaining that the settings changed will not come into effect until the client is restarted.</extracomment>
         <translation>Ohjelman uudelleen käynnistys aktivoi muutokset käyttöön.</translation>
     </message>
+    <message>
+        <source>Current settings will be backed up at "%1".</source>
+        <extracomment>Text explaining to the user that the client's current settings will be backed up at a specific location. %1 is a stand-in argument for the backup location's path.</extracomment>
+        <translation>Nykyiset asetukset varmuuskopioidaan sijaintiin "%1".</translation>
+    </message>
     <message>
         <source>Client will be shut down. Do you want to proceed?</source>
+        <extracomment>Text asking the user to confirm if they would like to proceed with a client shutdown.</extracomment>
         <translation>Ohjelma suljetaan, haluatko jatkaa?</translation>
     </message>
     <message>
@@ -1844,6 +2252,10 @@
         <source>%1 Balance</source>
         <translation>%1 Saldo</translation>
     </message>
+    <message>
+        <source>Discreet mode activated for the Overview tab. To unmask the values, uncheck Settings-&gt;Discreet mode.</source>
+        <translation>Huomaamaton tila aktivoitu Yhteenveto-välilehdelle. Poistaaksesi arvojen peittämisen, poista valinta Asetukset-&gt;Huomaamaton tila.</translation>
+    </message>
     <message numerus="yes">
         <source>%n Rounds</source>
         <translation><numerusform>%n Kierros</numerusform><numerusform>%n Kierrosta</numerusform></translation>
@@ -1943,7 +2355,140 @@
 </context>
 <context>
     <name>PSBTOperationsDialog</name>
-    </context>
+    <message>
+        <source>Dialog</source>
+        <translation>Dialogi</translation>
+    </message>
+    <message>
+        <source>Sign Tx</source>
+        <translation>Allekirjoita tapahtuma</translation>
+    </message>
+    <message>
+        <source>Broadcast Tx</source>
+        <translation>Lähetä tapahtuma</translation>
+    </message>
+    <message>
+        <source>Copy to Clipboard</source>
+        <translation>Kopioi leikepöydälle</translation>
+    </message>
+    <message>
+        <source>Save…</source>
+        <translation>Tallenna…</translation>
+    </message>
+    <message>
+        <source>Close</source>
+        <translation>Sulje</translation>
+    </message>
+    <message>
+        <source>Failed to load transaction: %1</source>
+        <translation>Tapahtuman lataaminen epäonnistui: %1</translation>
+    </message>
+    <message>
+        <source>Failed to sign transaction: %1</source>
+        <translation>Tapahtuman allekirjoitus epäonnistui: %1</translation>
+    </message>
+    <message>
+        <source>Cannot sign inputs while wallet is locked.</source>
+        <translation>Syötteitä ei voida allekirjoittaa kun lompakko on lukittu.</translation>
+    </message>
+    <message>
+        <source>Could not sign any more inputs.</source>
+        <translation>Enempää syötteitä ei voitu allekirjoittaa.</translation>
+    </message>
+    <message>
+        <source>Signed %1 inputs, but more signatures are still required.</source>
+        <translation>Allekirjoitettiin %1 syötettä, mutta lisää allekirjoituksia vaaditaan vielä.</translation>
+    </message>
+    <message>
+        <source>Signed transaction successfully. Transaction is ready to broadcast.</source>
+        <translation>Tapahtuma allekirjoitettiin onnistuneesti. Tapahtuma on valmis lähetettäväksi.</translation>
+    </message>
+    <message>
+        <source>Unknown error processing transaction.</source>
+        <translation>Tuntematon virhe käsiteltäessä tapahtumaa.</translation>
+    </message>
+    <message>
+        <source>Transaction broadcast successfully! Transaction ID: %1</source>
+        <translation>Tapahtuma lähetetty onnistuneesti! Tapahtuma ID: %1</translation>
+    </message>
+    <message>
+        <source>Transaction broadcast failed: %1</source>
+        <translation>Tapahtuman lähettäminen epäonnistui: %1</translation>
+    </message>
+    <message>
+        <source>PSBT copied to clipboard.</source>
+        <translation>PSBT kopioitu leikepöydälle.</translation>
+    </message>
+    <message>
+        <source>Save Transaction Data</source>
+        <translation>Tallenna tapahtumatiedot</translation>
+    </message>
+    <message>
+        <source>Partially Signed Transaction (Binary)</source>
+        <extracomment>Expanded name of the binary PSBT file format. See: BIP 174.</extracomment>
+        <translation>Osittain allekirjoitettu tapahtuma (binääri)</translation>
+    </message>
+    <message>
+        <source>PSBT saved to disk.</source>
+        <translation>PSBT tallennettu levylle.</translation>
+    </message>
+    <message>
+        <source> * Sends %1 to %2</source>
+        <translation> * Lähettää %1 osoitteeseen %2</translation>
+    </message>
+    <message>
+        <source>own address</source>
+        <translation>oma osoite</translation>
+    </message>
+    <message>
+        <source>Unable to calculate transaction fee or total transaction amount.</source>
+        <translation>Siirtomaksua tai tapahtuman kokonaismäärää ei voida laskea.</translation>
+    </message>
+    <message>
+        <source>Pays transaction fee: </source>
+        <translation>Maksaa siirtomaksun: </translation>
+    </message>
+    <message>
+        <source>Total Amount</source>
+        <translation>Kokonaismäärä</translation>
+    </message>
+    <message>
+        <source>or</source>
+        <translation>tai</translation>
+    </message>
+    <message>
+        <source>Transaction has %1 unsigned inputs.</source>
+        <translation>Tapahtumalla on %1 allekirjoittamatonta syötettä.</translation>
+    </message>
+    <message>
+        <source>Transaction is missing some information about inputs.</source>
+        <translation>Tapahtumasta puuttuu joitakin tietoja syötteistä.</translation>
+    </message>
+    <message>
+        <source>Transaction still needs signature(s).</source>
+        <translation>Tapahtuma tarvitsee vielä allekirjoituksen/allekirjoituksia.</translation>
+    </message>
+    <message>
+        <source>(But no wallet is loaded.)</source>
+        <translation>(Mutta lompakkoa ei ole ladattu.)</translation>
+    </message>
+    <message>
+        <source>(But this wallet cannot sign transactions.)</source>
+        <translation>(Mutta tämä lompakko ei voi allekirjoittaa tapahtumia.)</translation>
+    </message>
+    <message>
+        <source>(But this wallet does not have the right keys.)</source>
+        <translation>(Mutta tällä lompakolla ei ole oikeita avaimia.)</translation>
+    </message>
+    <message>
+        <source>Transaction is fully signed and ready for broadcast.</source>
+        <translation>Tapahtuma on täysin allekirjoitettu ja valmis lähetettäväksi.</translation>
+    </message>
+    <message>
+        <source>Transaction status is unknown.</source>
+        <translation>Tapahtuman tila on tuntematon.</translation>
+    </message>
+</context>
 <context>
     <name>PaymentServer</name>
     <message>
@@ -1962,6 +2507,12 @@
         <source>'dash://' is not a valid URI. Use 'dash:' instead.</source>
         <translation>'dash://' ei ole validi URI. Käytä sen sijaan 'dash:'.</translation>
     </message>
+    <message>
+        <source>Cannot process payment request as BIP70 is no longer supported.
+Due to discontinued support, you should request the merchant to provide you with a BIP21 compatible URI or use a wallet that does continue to support BIP70.</source>
+        <translation>Maksupyyntöä ei voida käsitellä, koska BIP70:ää ei enää tueta.
+Tuen lopettamisen vuoksi sinun tulisi pyytää kauppiasta toimittamaan sinulle BIP21-yhteensopiva URI tai käyttää lompakkoa, joka edelleen tukee BIP70:ää.</translation>
+    </message>
     <message>
         <source>URI cannot be parsed! This can be caused by an invalid Dash address or malformed URI parameters.</source>
         <translation>URI:a ei voida jäsentää! Tämä voi johtua virheellisestä Dash osoitteesta tai virheellisestä URI:n muuttujasta. </translation>
@@ -1983,6 +2534,26 @@
         <extracomment>Title of Peers Table column which indicates the current latency of the connection with the peer.</extracomment>
         <translation>Ping</translation>
     </message>
+    <message>
+        <source>Peer</source>
+        <extracomment>Title of Peers Table column which contains a unique number used to identify a connection.</extracomment>
+        <translation>Vertaisverto</translation>
+    </message>
+    <message>
+        <source>Age</source>
+        <extracomment>Title of Peers Table column which indicates the duration (length of time) since the peer connection started.</extracomment>
+        <translation>Ikä</translation>
+    </message>
+    <message>
+        <source>Direction</source>
+        <extracomment>Title of Peers Table column which indicates the direction the peer connection was initiated from.</extracomment>
+        <translation>Suunta</translation>
+    </message>
+    <message>
+        <source>Type</source>
+        <extracomment>Title of Peers Table column which describes the type of peer connection. The "type" describes why the connection exists.</extracomment>
+        <translation>Tyyppi</translation>
+    </message>
     <message>
         <source>Sent</source>
         <extracomment>Title of Peers Table column which indicates the total amount of network information we have sent to the peer.</extracomment>
@@ -1993,7 +2564,27 @@
         <extracomment>Title of Peers Table column which indicates the total amount of network information we have received from the peer.</extracomment>
         <translation>Vastaanotettu</translation>
     </message>
-    </context>
+    <message>
+        <source>Address</source>
+        <extracomment>Title of Peers Table column which contains the IP/Onion/I2P address of the connected peer.</extracomment>
+        <translation>Osoite</translation>
+    </message>
+    <message>
+        <source>Network</source>
+        <extracomment>Title of Peers Table column which states the network the peer connected through.</extracomment>
+        <translation>Verkko</translation>
+    </message>
+    <message>
+        <source>Inbound</source>
+        <extracomment>An Inbound Connection from a Peer.</extracomment>
+        <translation>Saapuva</translation>
+    </message>
+    <message>
+        <source>Outbound</source>
+        <extracomment>An Outbound Connection to a Peer.</extracomment>
+        <translation>Lähtevä</translation>
+    </message>
+</context>
 <context>
     <name>Proposal</name>
     <message>
@@ -2044,8 +2635,193 @@
         <translation>Tila</translation>
     </message>
 </context>
+<context>
+    <name>ProposalWizard</name>
+    <message>
+        <source>Create Governance Proposal</source>
+        <translation>Luo hallintoehdotus</translation>
+    </message>
+    <message>
+        <source>Enter proposal details</source>
+        <translation>Syötä ehdotuksen tiedot</translation>
+    </message>
+    <message>
+        <source>A fee will be burned when you prepare the proposal.</source>
+        <translation>Maksu poltetaan kun valmistat ehdotuksen.</translation>
+    </message>
+    <message>
+        <source>Proposal &amp;name</source>
+        <translation>Ehdotuksen &amp;nimi</translation>
+    </message>
+    <message>
+        <source>&amp;Description URL</source>
+        <translation>&amp;Kuvaus URL</translation>
+    </message>
+    <message>
+        <source>Payment &amp;address</source>
+        <translation>Maksu&amp;osoite</translation>
+    </message>
+    <message>
+        <source>Payment &amp;amount</source>
+        <translation>Maksun &amp;määrä</translation>
+    </message>
+    <message>
+        <source>The amount to request in a single payment</source>
+        <translation>Yhdessä maksussa pyydettävä määrä</translation>
+    </message>
+    <message>
+        <source>&amp;First payment</source>
+        <translation>&amp;Ensimmäinen maksu</translation>
+    </message>
+    <message>
+        <source>Pa&amp;yments</source>
+        <translation>Ma&amp;ksut</translation>
+    </message>
+    <message>
+        <source>To&amp;tal amount</source>
+        <translation>Kokona&amp;ismäärä</translation>
+    </message>
+    <message>
+        <source>Proposal &amp;fee</source>
+        <translation>Ehdotuksen &amp;maksu</translation>
+    </message>
+    <message>
+        <source>Next</source>
+        <translation>Seuraava</translation>
+    </message>
+    <message>
+        <source>Review proposal JSON and validate.</source>
+        <translation>Tarkista ehdotuksen JSON ja vahvista.</translation>
+    </message>
+    <message>
+        <source>Hex-encoded JSON</source>
+        <translation>Hex-koodattu JSON</translation>
+    </message>
+    <message>
+        <source>Back</source>
+        <translation>Takaisin</translation>
+    </message>
+    <message>
+        <source>Validate</source>
+        <translation>Vahvista</translation>
+    </message>
+    <message>
+        <source>Prepare (burn fee) and wait for confirmations.</source>
+        <translation>Valmistele (polta maksu) ja odota vahvistuksia.</translation>
+    </message>
+    <message>
+        <source>Copy</source>
+        <translation>Kopioi</translation>
+    </message>
+    <message>
+        <source>At 1/6 confirmations: can be relayed and queued. At 6/6: accepted and processed.</source>
+        <translation>1/6 vahvistuksella: voidaan välittää ja jonottaa. 6/6: hyväksytty ja käsitelty.</translation>
+    </message>
+    <message>
+        <source>Confirmations progress</source>
+        <translation>Vahvistusten edistyminen</translation>
+    </message>
+    <message>
+        <source>Shows progress toward the required number of confirmations for the proposal fee transaction.</source>
+        <translation>Näyttää edistymisen kohti vaadittujen vahvistusten määrää ehdotusmaksutapahtumalle.</translation>
+    </message>
+    <message>
+        <source>Estimated time remaining: -</source>
+        <translation>Arvioitu jäljellä oleva aika: -</translation>
+    </message>
+    <message>
+        <source>Prepare Proposal</source>
+        <translation>Valmistele ehdotus</translation>
+    </message>
+    <message>
+        <source>You can submit after 1 confirmation. At 6 confirmations it is accepted and processed.</source>
+        <translation>Voit lähettää 1 vahvistuksen jälkeen. 6 vahvistuksella se hyväksytään ja käsitellään.</translation>
+    </message>
+    <message>
+        <source>Proposal ID:</source>
+        <translation>Ehdotus ID:</translation>
+    </message>
+    <message>
+        <source>Submit Proposal</source>
+        <translation>Lähetä ehdotus</translation>
+    </message>
+    <message>
+        <source>Close</source>
+        <translation>Sulje</translation>
+    </message>
+    <message>
+        <source>Valid</source>
+        <translation>Kelvollinen</translation>
+    </message>
+    <message>
+        <source>Invalid: %1</source>
+        <translation>Virheellinen: %1</translation>
+    </message>
+    <message>
+        <source>Burn %1</source>
+        <translation>Polta %1</translation>
+    </message>
+    <message>
+        <source>Burn %1 to create the fee transaction?</source>
+        <translation>Poltetaanko %1 maksutapahtuman luomiseksi?</translation>
+    </message>
+    <message>
+        <source>Prepare failed</source>
+        <translation>Valmistelu epäonnistui</translation>
+    </message>
+    <message>
+        <source>Confirmations: %1 / %2 required</source>
+        <translation>Vahvistukset: %1 / %2 vaaditaan</translation>
+    </message>
+    <message>
+        <source>Estimated time remaining: Ready</source>
+        <translation>Arvioitu jäljellä oleva aika: Valmis</translation>
+    </message>
+    <message numerus="yes">
+        <source>Estimated time remaining: %n minute(s)</source>
+        <translation><numerusform>Arvioitu jäljellä oleva aika: %n minuutti</numerusform><numerusform>Arvioitu jäljellä oleva aika: %n minuuttia</numerusform></translation>
+    </message>
+    <message>
+        <source>Your proposal was submitted successfully.</source>
+        <translation>Ehdotuksesi lähetettiin onnistuneesti.</translation>
+    </message>
+    <message>
+        <source>Already submitted</source>
+        <translation>Jo lähetetty</translation>
+    </message>
+    <message>
+        <source>This proposal has already been submitted.</source>
+        <translation>Tämä ehdotus on jo lähetetty.</translation>
+    </message>
+    <message>
+        <source>Submission failed</source>
+        <translation>Lähetys epäonnistui</translation>
+    </message>
+    <message>
+        <source>Proposal submitted</source>
+        <translation>Ehdotus lähetetty</translation>
+    </message>
+    <message>
+        <source>A fee of %1 will be burned when you prepare the proposal.</source>
+        <translation>Maksu %1 poltetaan kun valmistat ehdotuksen.</translation>
+    </message>
+    <message>
+        <source>Prepare (burn %1) and wait for %2 confirmations.</source>
+        <translation>Valmistele (polta %1) ja odota %2 vahvistusta.</translation>
+    </message>
+</context>
 <context>
     <name>QObject</name>
+    <message>
+        <source>Do you want to reset settings to default values, or to abort without making changes?</source>
+        <extracomment>Explanatory text shown on startup when the settings file cannot be read. Prompts user to make a choice between resetting or aborting.</extracomment>
+        <translation>Haluatko palauttaa asetukset oletusarvoihin vai keskeyttää tekemättä muutoksia?</translation>
+    </message>
+    <message>
+        <source>A fatal error occurred. Check that settings file is writable, or try running with -nosettings.</source>
+        <extracomment>Explanatory text shown on startup when the settings file could not be written. Prompts user to check that we have the ability to write to the file. Explains that the user has the option of running without a settings file.</extracomment>
+        <translation>Kriittinen virhe tapahtui. Tarkista että asetustiedosto on kirjoitettavissa, tai yritä ajaa -nosettings-valinnalla.</translation>
+    </message>
     <message>
         <source>Choose data directory on startup (default: %u)</source>
         <translation>Valitse datahakemisto käynnistyksessä (oletus: %u)</translation>
@@ -2146,6 +2922,53 @@
         <source>This can also be adjusted later in the "Appearance" tab of the preferences.</source>
         <translation>Tätä voidaan säätää myös myöhemmin asetusten "Ulkoasu" välilehdellä.</translation>
     </message>
+    <message>
+        <source>Ctrl+W</source>
+        <translation>Ctrl+W</translation>
+    </message>
+    <message>
+        <source>Unroutable</source>
+        <translation>Ei reititetty</translation>
+    </message>
+    <message>
+        <source>Internal</source>
+        <translation>Sisäinen</translation>
+    </message>
+    <message>
+        <source>Inbound</source>
+        <extracomment>An inbound connection from a peer. An inbound connection is a connection initiated by a peer.</extracomment>
+        <translation>Saapuva</translation>
+    </message>
+    <message>
+        <source>Outbound</source>
+        <extracomment>An outbound connection to a peer. An outbound connection is a connection initiated by us.</extracomment>
+        <translation>Lähtevä</translation>
+    </message>
+    <message>
+        <source>Full Relay</source>
+        <extracomment>Peer connection type that relays all network information.</extracomment>
+        <translation>Täysi välitys</translation>
+    </message>
+    <message>
+        <source>Block Relay</source>
+        <extracomment>Peer connection type that relays network information about blocks and not transactions or addresses.</extracomment>
+        <translation>Lohkovälitys</translation>
+    </message>
+    <message>
+        <source>Manual</source>
+        <extracomment>Peer connection type established manually through one of several methods.</extracomment>
+        <translation>Manuaalinen</translation>
+    </message>
+    <message>
+        <source>Feeler</source>
+        <extracomment>Short-lived peer connection type that tests the aliveness of known addresses.</extracomment>
+        <translation>Tunnustelija</translation>
+    </message>
+    <message>
+        <source>Address Fetch</source>
+        <extracomment>Short-lived peer connection type that solicits known addresses from a peer.</extracomment>
+        <translation>Osoitehaku</translation>
+    </message>
     <message>
         <source>%1 d</source>
         <translation>%1 d</translation>
@@ -2207,8 +3030,8 @@
         <translation>%1 B</translation>
     </message>
     <message>
-        <source>%1 KB</source>
-        <translation>%1 KB</translation>
+        <source>%1 kB</source>
+        <translation>%1 kB</translation>
     </message>
     <message>
         <source>%1 MB</source>
@@ -2264,7 +3087,12 @@
         <source>Save QR Code</source>
         <translation>Tallenna QR Koodi</translation>
     </message>
-    </context>
+    <message>
+        <source>PNG Image</source>
+        <extracomment>Expanded name of the PNG file format. See: https://en.wikipedia.org/wiki/Portable_Network_Graphics.</extracomment>
+        <translation>PNG-kuva</translation>
+    </message>
+</context>
 <context>
     <name>RPCConsole</name>
     <message>
@@ -2371,6 +3199,14 @@
         <source>Version</source>
         <translation>Versio</translation>
     </message>
+    <message>
+        <source>High bandwidth BIP152 compact block relay: %1</source>
+        <translation>Korkea kaistanleveys BIP152 tiivistetty lohkovälitys: %1</translation>
+    </message>
+    <message>
+        <source>High Bandwidth</source>
+        <translation>Korkea kaistanleveys</translation>
+    </message>
     <message>
         <source>Starting Block</source>
         <translation>Aloituslohko</translation>
@@ -2383,6 +3219,51 @@
         <source>Synced Blocks</source>
         <translation>Synkronoidut lohkot</translation>
     </message>
+    <message>
+        <source>Elapsed time since a novel block passing initial validity checks was received from this peer.</source>
+        <translation>Kulunut aika siitä kun uusi lohko, joka läpäisi alustavat kelpoisuustarkistukset, vastaanotettiin tältä vertaiselta.</translation>
+    </message>
+    <message>
+        <source>Last Block</source>
+        <translation>Viimeisin lohko</translation>
+    </message>
+    <message>
+        <source>Elapsed time since a novel transaction accepted into our mempool was received from this peer.</source>
+        <extracomment>Tooltip text for the Last Transaction field in the peer details area.</extracomment>
+        <translation>Kulunut aika siitä kun uusi tapahtuma, joka hyväksyttiin mempooliimme, vastaanotettiin tältä vertaiselta.</translation>
+    </message>
+    <message>
+        <source>Last Transaction</source>
+        <translation>Viimeisin tapahtuma</translation>
+    </message>
+    <message>
+        <source>The mapped Autonomous System used for diversifying peer selection.</source>
+        <translation>Kartoitettu autonominen järjestelmä, jota käytetään vertaisvalinnan monipuolistamiseen.</translation>
+    </message>
+    <message>
+        <source>Mapped AS</source>
+        <translation>Kartoitettu AS</translation>
+    </message>
+    <message>
+        <source>Whether we relay addresses to this peer.</source>
+        <extracomment>Tooltip text for the Address Relay field in the peer details area, which displays whether we relay addresses to this peer (Yes/No).</extracomment>
+        <translation>Välitetäänkö osoitteita tälle vertaiselle.</translation>
+    </message>
+    <message>
+        <source>Address Relay</source>
+        <extracomment>Text title for the Address Relay field in the peer details area, which displays whether we relay addresses to this peer (Yes/No).</extracomment>
+        <translation>Osoitevälitys</translation>
+    </message>
+    <message>
+        <source>Addresses Processed</source>
+        <extracomment>Text title for the Addresses Processed field in the peer details area, which displays the total number of addresses received from this peer that were processed (excludes addresses that were dropped due to rate-limiting).</extracomment>
+        <translation>Käsitellyt osoitteet</translation>
+    </message>
+    <message>
+        <source>Addresses Rate-Limited</source>
+        <extracomment>Text title for the Addresses Rate-Limited field in the peer details area, which displays the total number of addresses received from this peer that were dropped (not processed) due to rate-limiting.</extracomment>
+        <translation>Nopeusrajoitetut osoitteet</translation>
+    </message>
     <message>
         <source>Rescan blockchain files 1</source>
         <translation>Skannaa lohkoketju tiedostot 1 uudelleen</translation>
@@ -2423,6 +3304,22 @@
         <source>To specify a non-default location of the blocks directory use the '%1' option.</source>
         <translation>Määrittääksesi ei oletus hakemiston sijainnin lohkoille käytä '%1' asetusta.</translation>
     </message>
+    <message>
+        <source>Local Addresses</source>
+        <translation>Paikalliset osoitteet</translation>
+    </message>
+    <message>
+        <source>Network addresses that your Dash node is currently using to communicate with other nodes.</source>
+        <translation>Verkko-osoitteet, joita Dash-solmusi käyttää tällä hetkellä kommunikoidakseen muiden solmujen kanssa.</translation>
+    </message>
+    <message>
+        <source>Number of regular Masternodes</source>
+        <translation>Tavallisten Masternodejen määrä</translation>
+    </message>
+    <message>
+        <source>Number of EvoNodes</source>
+        <translation>EvoNodejen määrä</translation>
+    </message>
     <message>
         <source>Current block height</source>
         <translation>Nykyinen lohkomäärä</translation>
@@ -2471,10 +3368,50 @@
         <source>PoSe Score</source>
         <translation>PoSe Pisteet</translation>
     </message>
+    <message>
+        <source>The transport layer version: %1</source>
+        <translation>Kuljetuskerroksen versio: %1</translation>
+    </message>
+    <message>
+        <source>Transport</source>
+        <translation>Kuljetuskerros</translation>
+    </message>
+    <message>
+        <source>The BIP324 session ID string in hex.</source>
+        <translation>BIP324-istunnon ID-merkkijono heksana.</translation>
+    </message>
+    <message>
+        <source>Session ID</source>
+        <translation>Istunto ID</translation>
+    </message>
+    <message>
+        <source>The network protocol this peer is connected through: IPv4, IPv6, Onion, I2P, or CJDNS.</source>
+        <translation>Verkkoprotokolla, jonka kautta tämä vertainen on yhteydessä: IPv4, IPv6, Onion, I2P tai CJDNS.</translation>
+    </message>
+    <message>
+        <source>Permissions</source>
+        <translation>Käyttöoikeudet</translation>
+    </message>
+    <message>
+        <source>The direction and type of peer connection: %1</source>
+        <translation>Vertaisyhteyden suunta ja tyyppi: %1</translation>
+    </message>
+    <message>
+        <source>Direction/Type</source>
+        <translation>Suunta/Tyyppi</translation>
+    </message>
     <message>
         <source>Services</source>
         <translation>Palvelut</translation>
     </message>
+    <message>
+        <source>Whether we relay transactions to this peer.</source>
+        <translation>Välitetäänkö tapahtumia tälle vertaiselle.</translation>
+    </message>
+    <message>
+        <source>Transaction Relay</source>
+        <translation>Tapahtumien välitys</translation>
+    </message>
     <message>
         <source>Connection Time</source>
         <translation>Yhteysaika</translation>
@@ -2511,6 +3448,16 @@
         <source>&amp;Wallet Repair</source>
         <translation>&amp;Lompakon Korjaus</translation>
     </message>
+    <message>
+        <source>The total number of addresses received from this peer that were processed (excludes addresses that were dropped due to rate-limiting).</source>
+        <extracomment>Tooltip text for the Addresses Processed field in the peer details area, which displays the total number of addresses received from this peer that were processed (excludes addresses that were dropped due to rate-limiting).</extracomment>
+        <translation>Tältä vertaiselta vastaanotettujen osoitteiden kokonaismäärä, jotka käsiteltiin (ei sisällä osoitteita, jotka hylättiin nopeusrajoituksen vuoksi).</translation>
+    </message>
+    <message>
+        <source>The total number of addresses received from this peer that were dropped (not processed) due to rate-limiting.</source>
+        <extracomment>Tooltip text for the Addresses Rate-Limited field in the peer details area, which displays the total number of addresses received from this peer that were dropped (not processed) due to rate-limiting.</extracomment>
+        <translation>Tältä vertaiselta vastaanotettujen osoitteiden kokonaismäärä, jotka hylättiin (ei käsitelty) nopeusrajoituksen vuoksi.</translation>
+    </message>
     <message>
         <source>Wallet repair options.</source>
         <translation>Lompakon korjausvalinnat</translation>
@@ -2524,52 +3471,82 @@
         <translation>-reindex: Rakenna uudelleen lohkoketjun indeksi nykyisistä blk000??.dat tiedostoista.</translation>
     </message>
     <message>
-        <source>&amp;Disconnect</source>
-        <translation>&amp;Katkaise yhteys</translation>
+        <source>Inbound: initiated by peer</source>
+        <extracomment>Explanatory text for an inbound peer connection.</extracomment>
+        <translation>Saapuva: vertaisen aloittama</translation>
     </message>
     <message>
-        <source>Ban for</source>
-        <translation>Estolistaan</translation>
+        <source>Outbound Full Relay: default</source>
+        <extracomment>Explanatory text for an outbound peer connection that relays all network information. This is the default behavior for outbound connections.</extracomment>
+        <translation>Lähtevä täysi välitys: oletus</translation>
     </message>
     <message>
-        <source>1 &amp;hour</source>
-        <translation>1 &amp;tunniksi</translation>
+        <source>Outbound Block Relay: does not relay transactions or addresses</source>
+        <extracomment>Explanatory text for an outbound peer connection that relays network information about blocks and not transactions or addresses.</extracomment>
+        <translation>Lähtevä lohkovälitys: ei välitä tapahtumia tai osoitteita</translation>
     </message>
     <message>
-        <source>1 &amp;day</source>
-        <translation>1 &amp;päiväksi</translation>
+        <source>Outbound Manual: added using RPC %1 or %2/%3 configuration options</source>
+        <extracomment>Explanatory text for an outbound peer connection that was established manually through one of several methods. The numbered arguments are stand-ins for the methods available to establish manual connections.</extracomment>
+        <translation>Lähtevä manuaalinen: lisätty käyttäen RPC %1 tai %2/%3 konfigurointiasetuksia</translation>
     </message>
     <message>
-        <source>1 &amp;week</source>
-        <translation>1 &amp;viikoksi</translation>
+        <source>Outbound Feeler: short-lived, for testing addresses</source>
+        <extracomment>Explanatory text for a short-lived outbound peer connection that is used to test the aliveness of known addresses.</extracomment>
+        <translation>Lähtevä tunnustelija: lyhytikäinen, osoitteiden testaamiseen</translation>
     </message>
     <message>
-        <source>1 &amp;year</source>
-        <translation>1 &amp;vuodeksi</translation>
+        <source>Outbound Address Fetch: short-lived, for soliciting addresses</source>
+        <extracomment>Explanatory text for a short-lived outbound peer connection that is used to request addresses from a peer.</extracomment>
+        <translation>Lähtevä osoitehaku: lyhytikäinen, osoitteiden pyytämiseen</translation>
     </message>
     <message>
-        <source>&amp;Unban</source>
-        <translation>&amp;Poista estolistalta</translation>
+        <source>To</source>
+        <translation>Kohteeseen</translation>
     </message>
     <message>
-        <source>Welcome to the %1 RPC console.</source>
-        <translation>Tervetuloa %1 RPC konsoliin.</translation>
+        <source>we selected the peer for high bandwidth relay</source>
+        <translation>valitsimme vertaisen korkeakaistaiseen välitykseen</translation>
     </message>
     <message>
-        <source>Use up and down arrows to navigate history, and %1 to clear screen.</source>
-        <translation>Ylös- ja alas-nuolet selaavat historiaa ja %1 tyhjentää ruudun.</translation>
+        <source>From</source>
+        <translation>Lähteestä</translation>
     </message>
     <message>
-        <source>Type %1 for an overview of available commands.</source>
-        <translation>Kirjoita %1 saadaksesi yleiskuvan käytettävissä olevista komennoista.</translation>
+        <source>the peer selected us for high bandwidth relay</source>
+        <translation>vertainen valitsi meidät korkeakaistaiseen välitykseen</translation>
     </message>
     <message>
-        <source>For more information on using this console type %1.</source>
-        <translation>Saadaksesi lisätietoja konsolin käytöstä kirjoita %1.</translation>
+        <source>No</source>
+        <translation>Ei</translation>
     </message>
     <message>
-        <source>WARNING: Scammers have been active, telling users to type commands here, stealing their wallet contents. Do not use this console without fully understanding the ramifications of a command.</source>
-        <translation>VAROITUS: Huijarit ovat olleet aktiivisia, kertoen käyttäjille komentoja tänne varastaen lompakon sisällön. Älä käytä tätä konsolia ymmärtämättä täysin komennon vaikutuksia.</translation>
+        <source>no high bandwidth relay selected</source>
+        <translation>ei korkeakaistaista välitystä valittuna</translation>
+    </message>
+    <message>
+        <source>&amp;Disconnect</source>
+        <translation>&amp;Katkaise yhteys</translation>
+    </message>
+    <message>
+        <source>Ban for</source>
+        <translation>Estolistaan</translation>
+    </message>
+    <message>
+        <source>1 &amp;hour</source>
+        <translation>1 &amp;tunniksi</translation>
+    </message>
+    <message>
+        <source>1 &amp;week</source>
+        <translation>1 &amp;viikoksi</translation>
+    </message>
+    <message>
+        <source>1 &amp;year</source>
+        <translation>1 &amp;vuodeksi</translation>
+    </message>
+    <message>
+        <source>&amp;Unban</source>
+        <translation>&amp;Poista estolistalta</translation>
     </message>
     <message>
         <source>In:</source>
@@ -2583,6 +3560,10 @@
         <source>Network activity disabled</source>
         <translation>Verkkotoiminnot ei käytössä</translation>
     </message>
+    <message>
+        <source>None</source>
+        <translation>Ei mitään</translation>
+    </message>
     <message>
         <source>Total: %1 (Enabled: %2)</source>
         <translation>Yhteensä: %1 (Käytössä: %2)</translation>
@@ -2591,10 +3572,105 @@
         <source>Executing command without any wallet</source>
         <translation>Suoritetaan komento ilman lompakkoa</translation>
     </message>
+    <message>
+        <source>Ctrl++</source>
+        <extracomment>Main shortcut to increase the RPC console font size.</extracomment>
+        <translation>Ctrl++</translation>
+    </message>
+    <message>
+        <source>Ctrl+=</source>
+        <extracomment>Secondary shortcut to increase the RPC console font size.</extracomment>
+        <translation>Ctrl+=</translation>
+    </message>
+    <message>
+        <source>Ctrl+-</source>
+        <extracomment>Main shortcut to decrease the RPC console font size.</extracomment>
+        <translation>Ctrl+-</translation>
+    </message>
+    <message>
+        <source>Ctrl+_</source>
+        <extracomment>Secondary shortcut to decrease the RPC console font size.</extracomment>
+        <translation>Ctrl+_</translation>
+    </message>
+    <message>
+        <source>Ctrl+Shift+I</source>
+        <translation>Ctrl+Shift+I</translation>
+    </message>
+    <message>
+        <source>Ctrl+Shift+C</source>
+        <translation>Ctrl+Shift+C</translation>
+    </message>
+    <message>
+        <source>Ctrl+Shift+G</source>
+        <translation>Ctrl+Shift+G</translation>
+    </message>
+    <message>
+        <source>Ctrl+Shift+P</source>
+        <translation>Ctrl+Shift+P</translation>
+    </message>
+    <message>
+        <source>Ctrl+Shift+R</source>
+        <translation>Ctrl+Shift+R</translation>
+    </message>
     <message>
         <source>Executing command using "%1" wallet</source>
         <translation>Suoritetaan komento käyttäen "%1" lompakkoa</translation>
     </message>
+    <message>
+        <source>detecting: peer could be v1 or v2</source>
+        <extracomment>Explanatory text for "detecting" transport type.</extracomment>
+        <translation>tunnistamassa: vertainen voi olla v1 tai v2</translation>
+    </message>
+    <message>
+        <source>v1: unencrypted, plaintext transport protocol</source>
+        <extracomment>Explanatory text for v1 transport type.</extracomment>
+        <translation>v1: salaamaton, selkotekstikuljetusprotokolla</translation>
+    </message>
+    <message>
+        <source>v2: BIP324 encrypted transport protocol</source>
+        <extracomment>Explanatory text for v2 transport type.</extracomment>
+        <translation>v2: BIP324 salattu kuljetusprotokolla</translation>
+    </message>
+    <message>
+        <source>&amp;Copy address</source>
+        <extracomment>Context menu action to copy the address of a peer</extracomment>
+        <translation>&amp;Kopioi osoite</translation>
+    </message>
+    <message>
+        <source>1 d&amp;ay</source>
+        <translation>1 p&amp;äiväksi</translation>
+    </message>
+    <message>
+        <source>&amp;Copy IP/Netmask</source>
+        <extracomment>Context menu action to copy the IP/Netmask of a banned peer. IP/Netmask is the combination of a peer's IP address and its Netmask. For IP address see: https://en.wikipedia.org/wiki/IP_address</extracomment>
+        <translation>&amp;Kopioi IP/Verkkopeite</translation>
+    </message>
+    <message>
+        <source>Welcome to the %1 RPC console.
+Use up and down arrows to navigate history, and %2 to clear screen.
+Use %3 and %4 to increase or decrease the font size.
+Type %5 for an overview of available commands.
+For more information on using this console, type %6.
+
+%7WARNING: Scammers have been active, telling users to type commands here, stealing their wallet contents. Do not use this console without fully understanding the ramifications of a command.%8</source>
+        <extracomment>RPC console welcome message. Placeholders %7 and %8 are style tags for the warning content, and they are not space separated from the rest of the text intentionally.</extracomment>
+        <translation>Tervetuloa %1 RPC-konsoliin.
+Käytä ylös ja alas nuolia selaamaan historiaa, ja %2 tyhjentääksesi näytön.
+Käytä %3 ja %4 suurentaaksesi tai pienentääksesi fonttikokoa.
+Kirjoita %5 saadaksesi yleiskatsauksen käytettävissä olevista komennoista.
+Lisätietoja tämän konsolin käytöstä saat kirjoittamalla %6.
+
+%7VAROITUS: Huijarit ovat olleet aktiivisia, käskien käyttäjiä kirjoittamaan komentoja tähän ja varastavat heidän lompakkonsa sisällön. Älä käytä tätä konsolia ymmärtämättä täysin komennon seurauksia.%8</translation>
+    </message>
+    <message>
+        <source>Executing…</source>
+        <extracomment>A console message indicating an entered command is currently being executed.</extracomment>
+        <translation>Suoritetaan…</translation>
+    </message>
+    <message>
+        <source>(peer: %1)</source>
+        <translation>(vertainen: %1)</translation>
+    </message>
     <message>
         <source>via %1</source>
         <translation>kautta %1</translation>
@@ -2611,11 +3687,19 @@
         <source>Verified Masternode</source>
         <translation>Vahvistettu Masternode</translation>
     </message>
+    <message>
+        <source>Yes</source>
+        <translation>Kyllä</translation>
+    </message>
     <message>
         <source>Unknown</source>
         <translation>Tuntematon</translation>
     </message>
-    </context>
+    <message>
+        <source>Never</source>
+        <translation>Ei koskaan</translation>
+    </message>
+</context>
 <context>
     <name>ReceiveCoinsDialog</name>
     <message>
@@ -2634,6 +3718,10 @@
         <source>An optional message to attach to the payment request, which will be displayed when the request is opened.&lt;br&gt;Note: The message will not be sent with the payment over the Dash network.</source>
         <translation>Valinnainen viesti liitettäväksi maksupyyntöön, joka näytetään kun pyyntö on avattu.&lt;br&gt;Huomio: Viestiä ei lähetetä maksun mukana Dash verkkoon.</translation>
     </message>
+    <message>
+        <source>An optional label to associate with the new receiving address (used by you to identify an invoice).  It is also attached to the payment request.</source>
+        <translation>Valinnainen nimike liitettäväksi uuteen vastaanotto-osoitteeseen (käytät sitä laskun tunnistamiseen). Se liitetään myös maksupyyntöön.</translation>
+    </message>
     <message>
         <source>Use this form to request payments. All fields are &lt;b&gt;optional&lt;/b&gt;.</source>
         <translation>Käytä tätä lomaketta maksupyyntöihin. Kaikki kentät ovat &lt;b&gt;valinnaisia&lt;/b&gt;.</translation>
@@ -2691,28 +3779,60 @@
         <translation>Kirjoita viesti jonka haluat liittää maksupyyntöön</translation>
     </message>
     <message>
-        <source>Copy URI</source>
-        <translation>Kopioi URI</translation>
+        <source>Copy &amp;URI</source>
+        <translation>Kopioi &amp;URI</translation>
     </message>
     <message>
-        <source>Copy address</source>
-        <translation>Kopioi osoite</translation>
+        <source>&amp;Copy address</source>
+        <translation>&amp;Kopioi osoite</translation>
     </message>
     <message>
-        <source>Copy label</source>
-        <translation>Kopioi nimi</translation>
+        <source>Copy &amp;label</source>
+        <translation>Kopioi &amp;nimike</translation>
     </message>
     <message>
-        <source>Copy message</source>
-        <translation>Kopioi viesti</translation>
+        <source>Copy &amp;message</source>
+        <translation>Kopioi &amp;viesti</translation>
     </message>
     <message>
-        <source>Copy amount</source>
-        <translation>Kopioi määrä</translation>
+        <source>Copy &amp;amount</source>
+        <translation>Kopioi &amp;määrä</translation>
+    </message>
+    <message>
+        <source>Could not unlock wallet.</source>
+        <translation>Lompakon avaaminen epäonnistui.</translation>
+    </message>
+    <message>
+        <source>Could not generate new address</source>
+        <translation>Uuden osoitteen luominen epäonnistui</translation>
     </message>
-    </context>
+</context>
 <context>
     <name>ReceiveRequestDialog</name>
+    <message>
+        <source>Request payment to …</source>
+        <translation>Pyydä maksua osoitteeseen …</translation>
+    </message>
+    <message>
+        <source>Address:</source>
+        <translation>Osoite:</translation>
+    </message>
+    <message>
+        <source>Amount:</source>
+        <translation>Määrä:</translation>
+    </message>
+    <message>
+        <source>Label:</source>
+        <translation>Nimike:</translation>
+    </message>
+    <message>
+        <source>Message:</source>
+        <translation>Viesti:</translation>
+    </message>
+    <message>
+        <source>Wallet:</source>
+        <translation>Lompakko:</translation>
+    </message>
     <message>
         <source>Copy &amp;URI</source>
         <translation>Kopioi &amp;URI</translation>
@@ -2765,6 +3885,34 @@
         <translation>Pyydetty</translation>
     </message>
 </context>
+<context>
+    <name>RestoreWalletActivity</name>
+    <message>
+        <source>Restore Wallet</source>
+        <extracomment>Title of progress window which is displayed when wallets are being restored.</extracomment>
+        <translation>Palauta lompakko</translation>
+    </message>
+    <message>
+        <source>Restoring Wallet &lt;b&gt;%1&lt;/b&gt;…</source>
+        <extracomment>Descriptive text of the restore wallets progress window which indicates to the user that wallets are currently being restored.</extracomment>
+        <translation>Palautetaan lompakkoa &lt;b&gt;%1&lt;/b&gt;…</translation>
+    </message>
+    <message>
+        <source>Restore wallet failed</source>
+        <extracomment>Title of message box which is displayed when the wallet could not be restored.</extracomment>
+        <translation>Lompakon palautus epäonnistui</translation>
+    </message>
+    <message>
+        <source>Restore wallet warning</source>
+        <extracomment>Title of message box which is displayed when the wallet is restored with some warning.</extracomment>
+        <translation>Lompakon palautusvaroitus</translation>
+    </message>
+    <message>
+        <source>Restore wallet message</source>
+        <extracomment>Title of message box which is displayed when the wallet is successfully restored.</extracomment>
+        <translation>Lompakon palautusviesti</translation>
+    </message>
+</context>
 <context>
     <name>SendCoinsDialog</name>
     <message>
@@ -2799,10 +3947,6 @@
         <source>Fee:</source>
         <translation>Siirtomaksu:</translation>
     </message>
-    <message>
-        <source>Dust:</source>
-        <translation>Tomu:</translation>
-    </message>
     <message>
         <source>Inputs…</source>
         <translation>Sisääntulot…</translation>
@@ -2827,6 +3971,14 @@
         <source>Transaction Fee:</source>
         <translation>Siirtomaksu:</translation>
     </message>
+    <message>
+        <source>When there is less transaction volume than space in the blocks, miners as well as relaying nodes may enforce a minimum fee. Paying only this minimum fee is just fine, but be aware that this can result in a never confirming transaction once there is more demand for dash transactions than the network can process.</source>
+        <translation>Kun siirtotapahtumien määrä on pienempi kuin lohkoissa oleva tila, louhijat ja välittävät solmut voivat pakottaa vähimmäismaksun. Vain tämän vähimmäismaksun maksaminen on ihan hyvä, mutta huomaa että tämä voi johtaa tapahtumaan jota ei koskaan vahvisteta, kun dash-tapahtumien kysyntä ylittää verkon kapasiteetin.</translation>
+    </message>
+    <message>
+        <source>A too low fee might result in a never confirming transaction (read the tooltip)</source>
+        <translation>Liian pieni maksu voi johtaa tapahtumaan jota ei koskaan vahvisteta (lue työkaluvihje)</translation>
+    </message>
     <message>
         <source>(Smart fee not initialized yet. This usually takes a few blocks…)</source>
         <translation>(Älykästä siirtomaksua ei ole alustettu vielä. Tämä kestää yleensä muutaman lohkon…)</translation>
@@ -2919,10 +4071,6 @@
         <source>Copy bytes</source>
         <translation>Kopioi tavut</translation>
     </message>
-    <message>
-        <source>Copy dust</source>
-        <translation>Kopioi tomu</translation>
-    </message>
     <message>
         <source>Copy change</source>
         <translation>Kopioi vaihtoraha</translation>
@@ -2939,10 +4087,6 @@
         <source>%1 to %2</source>
         <translation>%1 -&gt; %2</translation>
     </message>
-    <message>
-        <source>Are you sure you want to send?</source>
-        <translation>Haluatko varmasti lähettää?</translation>
-    </message>
     <message>
         <source>&lt;b&gt;(%1 of %2 entries displayed)&lt;/b&gt;</source>
         <translation>&lt;b&gt;(Näytetään %1 / %2 merkintää)&lt;/b&gt;</translation>
@@ -2955,6 +4099,18 @@
         <source>Confirm the %1 send action</source>
         <translation>Vahvista %1 lähetys</translation>
     </message>
+    <message>
+        <source>Cr&amp;eate Unsigned</source>
+        <translation>L&amp;uo allekirjoittamaton</translation>
+    </message>
+    <message>
+        <source> from wallet '%1'</source>
+        <translation> lompakosta '%1'</translation>
+    </message>
+    <message>
+        <source>%1 to '%2'</source>
+        <translation>%1 osoitteeseen '%2'</translation>
+    </message>
     <message>
         <source>%1 funds only</source>
         <translation>Vain %1 varat</translation>
@@ -3003,6 +4159,51 @@
         <source>Confirm send coins</source>
         <translation>Hyväksy lähettäminen</translation>
     </message>
+    <message>
+        <source>Save Transaction Data</source>
+        <translation>Tallenna tapahtumatiedot</translation>
+    </message>
+    <message>
+        <source>PSBT saved</source>
+        <translation>PSBT tallennettu</translation>
+    </message>
+    <message>
+        <source>Watch-only balance:</source>
+        <translation>Vain seuranta -saldo:</translation>
+    </message>
+    <message>
+        <source>Creates a Partially Signed Blockchain Transaction (PSBT) for use with e.g. an offline %1 wallet, or a PSBT-compatible hardware wallet.</source>
+        <translation>Luo osittain allekirjoitetun lohkoketjutapahtuman (PSBT) käytettäväksi esim. offline-%1-lompakon kanssa tai PSBT-yhteensopivan laitteistolompakon kanssa.</translation>
+    </message>
+    <message>
+        <source>Do you want to create this transaction?</source>
+        <extracomment>Message displayed when attempting to create a transaction. Cautionary text to prompt the user to verify that the displayed transaction details represent the transaction the user intends to create.</extracomment>
+        <translation>Haluatko luoda tämän tapahtuman?</translation>
+    </message>
+    <message>
+        <source>Please, review your transaction proposal. This will produce a Partially Signed Blockchain Transaction (PSBT) which you can save or copy and then sign with e.g. an offline %1 wallet, or a PSBT-compatible hardware wallet.</source>
+        <extracomment>Text to inform a user attempting to create a transaction of their current options. At this stage, a user can only create a PSBT. This string is displayed when private keys are disabled and an external signer is not available.</extracomment>
+        <translation>Tarkista tapahtumaehdotuksesi. Tämä luo osittain allekirjoitetun lohkoketjutapahtuman (PSBT), jonka voit tallentaa tai kopioida ja sitten allekirjoittaa esim. offline-%1-lompakolla tai PSBT-yhteensopivalla laitteistolompakolla.</translation>
+    </message>
+    <message>
+        <source>Please, review your transaction. You can create and send this transaction or create a Partially Signed Blockchain Transaction (PSBT), which you can save or copy and then sign with, e.g., an offline %1 wallet, or a PSBT-compatible hardware wallet.</source>
+        <extracomment>Text to inform a user attempting to create a transaction of their current options. At this stage, a user can send their transaction or create a PSBT. This string is displayed when both private keys and PSBT controls are enabled.</extracomment>
+        <translation>Tarkista tapahtumasi. Voit luoda ja lähettää tämän tapahtuman tai luoda osittain allekirjoitetun lohkoketjutapahtuman (PSBT), jonka voit tallentaa tai kopioida ja sitten allekirjoittaa esim. offline-%1-lompakolla tai PSBT-yhteensopivalla laitteistolompakolla.</translation>
+    </message>
+    <message>
+        <source>Please, review your transaction.</source>
+        <extracomment>Text to prompt a user to review the details of the transaction they are attempting to send.</extracomment>
+        <translation>Tarkista tapahtumasi.</translation>
+    </message>
+    <message>
+        <source>To review recipient list click "Show Details…"</source>
+        <translation>Vastaanottajaluettelon tarkastelemiseksi napsauta "Näytä yksityiskohdat…"</translation>
+    </message>
+    <message>
+        <source>Partially Signed Transaction (Binary)</source>
+        <extracomment>Expanded name of the binary PSBT file format. See: BIP 174.</extracomment>
+        <translation>Osittain allekirjoitettu tapahtuma (binääri)</translation>
+    </message>
     <message>
         <source>The recipient address is not valid. Please recheck.</source>
         <translation>Vastaanottajan osoite on virheellinen. Tarkista osoite.</translation>
@@ -3122,21 +4323,16 @@
         <source>A message that was attached to the dash: URI which will be stored with the transaction for your reference. Note: This message will not be sent over the Dash network.</source>
         <translation>Viesti joka liitettiin Dash: URI joka tallenetaan siirtotapahtuman kanssa viitteeksi sinulle. Huomio: Tätä viestiä ei lähetetä Dash verkkoon.</translation>
     </message>
+</context>
+<context>
+    <name>SendConfirmationDialog</name>
     <message>
-        <source>This is an unauthenticated payment request.</source>
-        <translation>Tämä on vahvistamaton maksupyyntö</translation>
-    </message>
-    <message>
-        <source>This is an authenticated payment request.</source>
-        <translation>Tämä on vahvistettu maksupyyntö.</translation>
-    </message>
-    <message>
-        <source>Pay To:</source>
-        <translation>Saaja:</translation>
+        <source>Send</source>
+        <translation>Lähetä</translation>
     </message>
     <message>
-        <source>Memo:</source>
-        <translation>Muistio:</translation>
+        <source>Create Unsigned</source>
+        <translation>Luo allekirjoittamaton</translation>
     </message>
 </context>
 <context>
@@ -3276,6 +4472,10 @@
         <source>Wallet unlock was cancelled.</source>
         <translation>Lompakon lukituksen avaus peruttiin.</translation>
     </message>
+    <message>
+        <source>No error</source>
+        <translation>Ei virhettä</translation>
+    </message>
     <message>
         <source>Private key for the entered address is not available.</source>
         <translation>Yksityistä avainta annetulle osoitteelle ei ole saatavilla.</translation>
@@ -3309,11 +4509,22 @@
         <translation>Viesti vahvistettu.</translation>
     </message>
 </context>
+<context>
+    <name>SplashScreen</name>
+    <message>
+        <source>(press q to shutdown and continue later)</source>
+        <translation>(paina q sammuttaaksesi ja jatkaaksesi myöhemmin)</translation>
+    </message>
+    <message>
+        <source>press q to shutdown</source>
+        <translation>paina q sammuttaaksesi</translation>
+    </message>
+</context>
 <context>
     <name>TrafficGraphWidget</name>
     <message>
-        <source>KB/s</source>
-        <translation>KB/s</translation>
+        <source>kB/s</source>
+        <translation>kB/s</translation>
     </message>
     <message>
         <source>Total</source>
@@ -3330,20 +4541,9 @@
 </context>
 <context>
     <name>TransactionDesc</name>
-    <message numerus="yes">
-        <source>Open for %n more block(s)</source>
-        <translation><numerusform>Avoinna %n lisälohkolle</numerusform><numerusform>Avoinna %n lisälohkolle</numerusform></translation>
-    </message>
-    <message>
-        <source>Open until %1</source>
-        <translation>Lukitsematta %1 asti</translation>
-    </message>
-    <message>
-        <source>conflicted</source>
-        <translation>ristiriitainen</translation>
-    </message>
     <message>
         <source>0/unconfirmed, %1</source>
+        <extracomment>Text explaining the current status of a transaction, shown in the status field of the details window for this transaction. This status represents an unconfirmed transaction that is in the memory pool.</extracomment>
         <translation>0/vahvistamaton, %1</translation>
     </message>
     <message>
@@ -3356,22 +4556,32 @@
     </message>
     <message>
         <source>abandoned</source>
+        <extracomment>Text explaining the current status of a transaction, shown in the status field of the details window for this transaction. This status represents an abandoned transaction.</extracomment>
         <translation>hylätty</translation>
     </message>
+    <message>
+        <source>conflicted with a transaction with %1 confirmations</source>
+        <extracomment>Text explaining the current status of a transaction, shown in the status field of the details window for this transaction. This status represents an unconfirmed transaction that conflicts with a confirmed transaction.</extracomment>
+        <translation>ristiriidassa tapahtuman kanssa, jolla on %1 vahvistusta</translation>
+    </message>
     <message>
         <source>%1/unconfirmed</source>
+        <extracomment>Text explaining the current status of a transaction, shown in the status field of the details window for this transaction. This status represents a transaction confirmed in at least one block, but less than 6 blocks, and still not locked via ChainLocks.</extracomment>
         <translation>%1/vahvistamaton</translation>
     </message>
     <message>
         <source>%1 confirmations</source>
+        <extracomment>Text explaining the current status of a transaction, shown in the status field of the details window for this transaction. This status represents a transaction confirmed in 6 or more blocks or locked via ChainLocks.</extracomment>
         <translation>%1 vahvistusta</translation>
     </message>
     <message>
         <source>locked via ChainLocks</source>
+        <extracomment>Text explaining the current status of a transaction, shown in the status field of the details window for this transaction. This status represents a transaction confirmed in at least one block and has been locked by ChainLocks.</extracomment>
         <translation>lukittu ChainLocks:illa</translation>
     </message>
     <message>
         <source>verified via InstantSend</source>
+        <extracomment>Text explaining the current status of a transaction, shown in the status field of the details window for this transaction. This status represents an unconfirmed transaction that has been locked by InstantSend.</extracomment>
         <translation>vahvistettu InstantSend:illä</translation>
     </message>
     <message>
@@ -3390,6 +4600,10 @@
         <source>Generated</source>
         <translation>Luotu</translation>
     </message>
+    <message>
+        <source>Platform Transfer</source>
+        <translation>Alustansiirto</translation>
+    </message>
     <message>
         <source>From</source>
         <translation>Lähettäjä</translation>
@@ -3520,14 +4734,6 @@
         <source>Address / Label</source>
         <translation>Osoite / Nimi</translation>
     </message>
-    <message numerus="yes">
-        <source>Open for %n more block(s)</source>
-        <translation><numerusform>Avoinna %n lisälohkolle</numerusform><numerusform>Avoinna %n lisälohkolle</numerusform></translation>
-    </message>
-    <message>
-        <source>Open until %1</source>
-        <translation>Lukitsematta %1 asti</translation>
-    </message>
     <message>
         <source>Unconfirmed</source>
         <translation>Vahvistamaton</translation>
@@ -3588,6 +4794,10 @@
         <source>Mined</source>
         <translation>Louhittu</translation>
     </message>
+    <message>
+        <source>Platform Transfer</source>
+        <translation>Alustansiirto</translation>
+    </message>
     <message>
         <source>%1 Mixing</source>
         <translation>%1 Sekoitus</translation>
@@ -3715,6 +4925,10 @@
         <source>Mined</source>
         <translation>Louhittu</translation>
     </message>
+    <message>
+        <source>Platform Transfer</source>
+        <translation>Alustansiirto</translation>
+    </message>
     <message>
         <source>Other</source>
         <translation>Muu</translation>
@@ -3728,49 +4942,63 @@
         <translation>Minimimäärä</translation>
     </message>
     <message>
-        <source>Abandon transaction</source>
-        <translation>Hylätty siirtotapahtuma</translation>
+        <source>&amp;Copy address</source>
+        <translation>&amp;Kopioi osoite</translation>
     </message>
     <message>
-        <source>Copy address</source>
-        <translation>Kopioi osoite</translation>
+        <source>Copy &amp;label</source>
+        <translation>Kopioi &amp;nimike</translation>
     </message>
     <message>
-        <source>Copy label</source>
-        <translation>Kopioi nimi</translation>
+        <source>Copy &amp;amount</source>
+        <translation>Kopioi &amp;määrä</translation>
     </message>
     <message>
-        <source>Copy amount</source>
-        <translation>Kopioi määrä</translation>
+        <source>Copy transaction &amp;ID</source>
+        <translation>Kopioi tapahtuman &amp;ID</translation>
+    </message>
+    <message>
+        <source>Copy &amp;raw transaction</source>
+        <translation>Kopioi &amp;raaka tapahtuma</translation>
     </message>
     <message>
-        <source>Copy transaction ID</source>
-        <translation>Kopioi siirtotunnus</translation>
+        <source>Copy full transaction &amp;details</source>
+        <translation>Kopioi tapahtuman täydet &amp;tiedot</translation>
     </message>
     <message>
-        <source>Copy raw transaction</source>
-        <translation>Kopioi käsittelemätön siirtotapahtuma</translation>
+        <source>&amp;Show transaction details</source>
+        <translation>&amp;Näytä tapahtuman tiedot</translation>
     </message>
     <message>
-        <source>Copy full transaction details</source>
-        <translation>Kopioi siirtotapahtuman yksityiskohdat</translation>
+        <source>A&amp;bandon transaction</source>
+        <translation>H&amp;ylkää tapahtuma</translation>
     </message>
     <message>
-        <source>Edit address label</source>
-        <translation>Muokkaa osoitteen nimeä</translation>
+        <source>Rese&amp;nd transaction</source>
+        <translation>Lähetä tapahtuma &amp;uudelleen</translation>
     </message>
     <message>
-        <source>Show transaction details</source>
-        <translation>Näytä siirtotapahtuman yksityiskohdat</translation>
+        <source>&amp;Edit address label</source>
+        <translation>&amp;Muokkaa osoitteen nimikettä</translation>
     </message>
     <message>
-        <source>Show address QR code</source>
-        <translation>Näytä osoitteen QR koodi</translation>
+        <source>Show address &amp;QR code</source>
+        <translation>Näytä osoitteen &amp;QR-koodi</translation>
+    </message>
+    <message>
+        <source>Show in %1</source>
+        <extracomment>Transactions table context menu action to show the selected transaction in a third-party block explorer. %1 is a stand-in argument for the URL of the explorer.</extracomment>
+        <translation>Näytä %1:ssä</translation>
     </message>
     <message>
         <source>Export Transaction History</source>
         <translation>Vie siirtotapahtumien historia</translation>
     </message>
+    <message>
+        <source>Comma separated file</source>
+        <extracomment>Expanded name of the CSV file format. See: https://en.wikipedia.org/wiki/Comma-separated_values.</extracomment>
+        <translation>Pilkuilla eroteltu tiedosto</translation>
+    </message>
     <message>
         <source>Confirmed</source>
         <translation>Vahvistettu</translation>
@@ -3849,10 +5077,54 @@
         <source>Closing the wallet for too long can result in having to resync the entire chain if pruning is enabled.</source>
         <translation>Lompakon sulkeminen liian pitkäksi ajaksi voi johtaa siihen, että koko ketju on synkronoitava uudelleen, jos karsiminen on käytössä. </translation>
     </message>
-    </context>
+    <message>
+        <source>Close all wallets</source>
+        <translation>Sulje kaikki lompakot</translation>
+    </message>
+    <message>
+        <source>Are you sure you wish to close all wallets?</source>
+        <translation>Haluatko varmasti sulkea kaikki lompakot?</translation>
+    </message>
+</context>
 <context>
     <name>WalletFrame</name>
-    </context>
+    <message>
+        <source>No wallet has been loaded.
+Go to File &gt; Open Wallet to load a wallet.
+- OR -</source>
+        <translation>Lompakkoa ei ole ladattu.
+Siirry Tiedosto &gt; Avaa lompakko ladataksesi lompakon.
+- TAI -</translation>
+    </message>
+    <message>
+        <source>Create a new wallet</source>
+        <translation>Luo uusi lompakko</translation>
+    </message>
+    <message>
+        <source>Error</source>
+        <translation>Virhe</translation>
+    </message>
+    <message>
+        <source>Unable to decode PSBT from clipboard (invalid base64)</source>
+        <translation>PSBT:n purkaminen leikepöydältä epäonnistui (virheellinen base64)</translation>
+    </message>
+    <message>
+        <source>Load Transaction Data</source>
+        <translation>Lataa tapahtumatiedot</translation>
+    </message>
+    <message>
+        <source>Partially Signed Transaction (*.psbt)</source>
+        <translation>Osittain allekirjoitettu tapahtuma (*.psbt)</translation>
+    </message>
+    <message>
+        <source>PSBT file must be smaller than 100 MiB</source>
+        <translation>PSBT-tiedoston on oltava pienempi kuin 100 MiB</translation>
+    </message>
+    <message>
+        <source>Unable to decode PSBT</source>
+        <translation>PSBT:n purkaminen epäonnistui</translation>
+    </message>
+</context>
 <context>
     <name>WalletModel</name>
     <message>
@@ -3878,6 +5150,11 @@
         <source>Selected amount:</source>
         <translation>Valittu määrä:</translation>
     </message>
+    <message>
+        <source>Wallet Data</source>
+        <extracomment>Name of the wallet data file format.</extracomment>
+        <translation>Lompakkodata</translation>
+    </message>
     <message>
         <source>Backup Wallet</source>
         <translation>Varmuuskopioi lompakko</translation>
@@ -3905,14 +5182,6 @@
 </context>
 <context>
     <name>dash-core</name>
-    <message>
-        <source>Error: Listening for incoming connections failed (listen returned error %s)</source>
-        <translation>Virhe: Sisääntulevien yhteyksien kuuntelu epäonnistui (kuuntelu palautti virheen %s)</translation>
-    </message>
-    <message>
-        <source>Fee estimation failed. Fallbackfee is disabled. Wait a few blocks or enable -fallbackfee.</source>
-        <translation>Siirtomaksun arvio epäonnistui. Varasiirtomaksu ei ole käytössä. Odota muutama lohko tai ota käyttöön -fallbackfee</translation>
-    </message>
     <message>
         <source>This error could occur if this wallet was not shutdown cleanly and was last loaded using a build with a newer version of Berkeley DB. If so, please use the software that last loaded this wallet</source>
         <translation>Tämä virhe saattaa ilmetä, jos tätä lompakkoa ei sammutettu kunnolla ja se ladattiin viimeksi Berkeley DB:n uudemmalla versiolla. Jos näin on, käytä ohjelmistoa joka latasi tämän lompakon viimeksi</translation>
@@ -3970,16 +5239,20 @@
         <translation>Virhe luettaessa tietokantaa, ohjelma suljetaan.</translation>
     </message>
     <message>
-        <source>Failed to listen on any port. Use -listen=0 if you want this.</source>
-        <translation>Ei onnistuttu kuuntelemaan mitään porttia. Käytä -listen=0 jos haluat tätä.</translation>
+        <source>Error: Missing checksum</source>
+        <translation>Virhe: Tarkistussumma puuttuu</translation>
+    </message>
+    <message>
+        <source>Error: Unable to parse version %u as a uint32_t</source>
+        <translation>Virhe: Versiota %u ei voitu jäsentää uint32_t:ksi</translation>
     </message>
     <message>
-        <source>-maxtxfee is set very high! Fees this large could be paid on a single transaction.</source>
-        <translation>-maxtxfee on asetettu erittäin korkeaksi! Näin isot siirtomaksut voitaisiin maksaa yhdessä siirtotapahtumassa.</translation>
+        <source>Error: Unable to write record to new wallet</source>
+        <translation>Virhe: Tietueen kirjoittaminen uuteen lompakkoon epäonnistui</translation>
     </message>
     <message>
-        <source>Cannot provide specific connections and have addrman find outgoing connections at the same.</source>
-        <translation>Ei voida tarjota tiettyjä yhteyksiä ja addrman voi löytää lähteviä yhteyksiä samaan aikaan.</translation>
+        <source>Failed to listen on any port. Use -listen=0 if you want this.</source>
+        <translation>Ei onnistuttu kuuntelemaan mitään porttia. Käytä -listen=0 jos haluat tätä.</translation>
     </message>
     <message>
         <source>Found unconfirmed denominated outputs, will wait till they confirm to continue.</source>
@@ -3990,13 +5263,17 @@
         <translation>Virheellinen -socketevents ('%s') määritelty. Vain nämä tilat ovat tuettuja: %s</translation>
     </message>
     <message>
-        <source>Invalid amount for -maxtxfee=&lt;amount&gt;: '%s' (must be at least the minrelay fee of %s to prevent stuck transactions)</source>
-        <translation>Virheellinen määrä -maxtxfee=&lt;amount&gt;: '%s' (oltava vähintään minimi välitysmaksun verran %s:sta välttääksesi jumissa olevia siirtotapahtumia)</translation>
+        <source>SQLiteDatabase: Unknown sqlite wallet schema version %d. Only version %d is supported</source>
+        <translation>SQLiteDatabase: Tuntematon sqlite-lompakkoskeeman versio %d. Vain versio %d on tuettu</translation>
     </message>
     <message>
         <source>Transaction index can't be disabled with governance validation enabled. Either start with -disablegovernance command line switch or enable transaction index.</source>
         <translation>Siirtotapahtumaindeksiä ei voi poistaa käytöstä jos hallinnon vahvistus on käytössä. Joko käynnistä -disablegovernance komentorivin valinnalla tai ota käyttöön siirtotapahtumaindeksi.</translation>
     </message>
+    <message>
+        <source>Unsupported category-specific logging level -loglevel=%s. Expected -loglevel=&lt;category&gt;:&lt;loglevel&gt;. Valid categories: %s. Valid loglevels: %s.</source>
+        <translation>Ei-tuettu kategoriakohtainen lokitaso -loglevel=%s. Odotettu -loglevel=&lt;category&gt;:&lt;loglevel&gt;. Kelvolliset kategoriat: %s. Kelvolliset lokitasot: %s.</translation>
+    </message>
     <message>
         <source>Can't mix: no compatible inputs found!</source>
         <translation>Ei voida sekoittaa: yhteensopivia syötteitä ei löytynyt!</translation>
@@ -4005,6 +5282,14 @@
         <source>Entry exceeds maximum size.</source>
         <translation>Merkintä ylittää maksimin.</translation>
     </message>
+    <message>
+        <source>Error upgrading evo database for EHF</source>
+        <translation>Virhe päivitettäessä evo-tietokantaa EHF:ää varten</translation>
+    </message>
+    <message>
+        <source>Failed to commit Evo database</source>
+        <translation>Evo-tietokannan tallentaminen epäonnistui</translation>
+    </message>
     <message>
         <source>Found enough users, signing ( waiting %s )</source>
         <translation>Löytyi tarpeeksi käyttäjiä, kirjaudutaan ( odotetaan %s )</translation>
@@ -4029,18 +5314,14 @@
         <source>Insufficient funds.</source>
         <translation>Saldo ei riitä.</translation>
     </message>
-    <message>
-        <source>Invalid amount for -discardfee=&lt;amount&gt;: '%s'</source>
-        <translation>Virheellinen määrä -discardfee=&lt;amount&gt;: '%s'</translation>
-    </message>
-    <message>
-        <source>Invalid amount for -paytxfee=&lt;amount&gt;: '%s' (must be at least %s)</source>
-        <translation>Virheellinen määrä -paytxfee=&lt;amount&gt;: '%s' (oltava vähintään %s)</translation>
-    </message>
     <message>
         <source>Invalid minimum number of spork signers specified with -minsporkkeys</source>
         <translation>Virheellinen minimi määrä spork allekirjoittajia määritelty -minsporkkeys</translation>
     </message>
+    <message>
+        <source>Listening for incoming connections failed (listen returned error %s)</source>
+        <translation>Saapuvien yhteyksien kuuntelu epäonnistui (listen palautti virheen %s)</translation>
+    </message>
     <message>
         <source>Lock is already in place.</source>
         <translation>On jo lukittu.</translation>
@@ -4097,6 +5378,10 @@
         <source>Synchronizing governance objects…</source>
         <translation>Ladataan hallinnon objekteja…</translation>
     </message>
+    <message>
+        <source>Transaction change output index out of range</source>
+        <translation>Tapahtuman vaihtorahalähdön indeksi on sallitun alueen ulkopuolella</translation>
+    </message>
     <message>
         <source>Unable to start HTTP server. See debug log for details.</source>
         <translation>HTTP palvelinta ei voitu käynnistää. Katso debug.log lisätietoja.</translation>
@@ -4105,6 +5390,10 @@
         <source>Unknown response.</source>
         <translation>Tuntematon vastaus.</translation>
     </message>
+    <message>
+        <source>Unsupported global logging level -loglevel=%s. Valid values: %s.</source>
+        <translation>Ei-tuettu globaali lokitaso -loglevel=%s. Kelvolliset arvot: %s.</translation>
+    </message>
     <message>
         <source>User Agent comment (%s) contains unsafe characters.</source>
         <translation>Käyttäjä toimijan kommentti (%s) sisältää ei suositeltuja merkkejä.</translation>
@@ -4145,6 +5434,10 @@
         <source>Make sure to encrypt your wallet and delete all non-encrypted backups after you have verified that the wallet works!</source>
         <translation>Muista salata lompakkosi ja poistaa kaikki salaamattomat varmistukset sen jälkeen kun olet todennut että lompakko toimii!</translation>
     </message>
+    <message>
+        <source>More than one onion bind address is provided. Using %s for the automatically created Tor onion service.</source>
+        <translation>Useampi kuin yksi onion-sidontaosoite on annettu. Käytetään %s automaattisesti luotua Tor onion -palvelua varten.</translation>
+    </message>
     <message>
         <source>Prune configured below the minimum of %d MiB.  Please use a higher number.</source>
         <translation>Karsinta asetettu alle minimin %d MiB. Käytä isompaa arvoa.</translation>
@@ -4174,10 +5467,6 @@ Vähennä uakommenttien määrää tai kokoa.</translation>
         <source>Wallet is locked, can't replenish keypool! Automatic backups and mixing are disabled, please unlock your wallet to replenish keypool.</source>
         <translation>Lompakko on lukittu, osoitevarannon täydentäminen ei onnistu! Automaattinen varmistus ja sekoitus ei ole käytössä, avaa lompakon lukitus täydentääksesi osoitevarannon.</translation>
     </message>
-    <message>
-        <source>You need to rebuild the database using -reindex to change -timestampindex</source>
-        <translation>Sinun tulee uudelleen rakentaa tietokanta käyttäen -reindex vaihtaen -timestampindex</translation>
-    </message>
     <message>
         <source>You need to rebuild the database using -reindex to go back to unpruned mode.  This will redownload the entire blockchain</source>
         <translation>Sinun tulee uudelleen rakentaa tietokanta käyttäen -reindex palataksesi takaisin 'ei karsita' tilaan. Tämä aiheuttaa koko lohkoketjun uudelleen lataamisen</translation>
@@ -4219,20 +5508,32 @@ Vähennä uakommenttien määrää tai kokoa.</translation>
         <translation>Virhe ladatessa %s: Yksityisavaimet voivat olla ainoastaan pois käytöstä luomisen aikana</translation>
     </message>
     <message>
-        <source>Error upgrading evo database</source>
-        <translation>Virhe evo tietokannan päivityksessä</translation>
+        <source>Error: Couldn't create cursor into database</source>
+        <translation>Virhe: Tietokantakursoria ei voitu luoda</translation>
     </message>
     <message>
         <source>Error: Disk space is low for %s</source>
         <translation>Virhe: Levytila on alhainen %s</translation>
     </message>
     <message>
-        <source>Exceeded max tries.</source>
-        <translation>Maksimi yritykset ylitetty.</translation>
+        <source>Error: Dumpfile checksum does not match. Computed %s, expected %s</source>
+        <translation>Virhe: Dump-tiedoston tarkistussumma ei täsmää. Laskettu %s, odotettu %s</translation>
+    </message>
+    <message>
+        <source>Error: Got key that was not hex: %s</source>
+        <translation>Virhe: Saatiin avain joka ei ollut heksadesimaali: %s</translation>
+    </message>
+    <message>
+        <source>Error: Got value that was not hex: %s</source>
+        <translation>Virhe: Saatiin arvo joka ei ollut heksadesimaali: %s</translation>
+    </message>
+    <message>
+        <source>Error: Keypool ran out, please call keypoolrefill first</source>
+        <translation>Virhe: Avainvaranto loppui, kutsu ensin keypoolrefill</translation>
     </message>
     <message>
-        <source>Failed to commit EvoDB</source>
-        <translation>EvoDB liitäntä epäonnistui</translation>
+        <source>Error: No addresses available.</source>
+        <translation>Virhe: Osoitteita ei saatavilla.</translation>
     </message>
     <message>
         <source>Failed to create backup %s!</source>
@@ -4250,17 +5551,29 @@ Vähennä uakommenttien määrää tai kokoa.</translation>
         <source>Failed to rescan the wallet during initialization</source>
         <translation>Lompakon uudelleen skannaaminen epäonnistui alustuksen aikana</translation>
     </message>
+    <message>
+        <source>Failed to verify database</source>
+        <translation>Tietokannan varmennus epäonnistui</translation>
+    </message>
+    <message>
+        <source>Fee rate (%s) is lower than the minimum fee rate setting (%s)</source>
+        <translation>Maksutaso (%s) on pienempi kuin vähimmäismaksutasoasetus (%s)</translation>
+    </message>
     <message>
         <source>Found enough users, signing…</source>
         <translation>Löytyi tarpeeksi käyttäjiä, kirjaudutaan…</translation>
     </message>
     <message>
-        <source>Invalid P2P permission: '%s'</source>
-        <translation>Virheellinen P2P oikeus: '%s'</translation>
+        <source>Ignoring duplicate -wallet %s.</source>
+        <translation>Ohitetaan duplikaatti -wallet %s.</translation>
+    </message>
+    <message>
+        <source>Input not found or already spent</source>
+        <translation>Syötettä ei löytynyt tai se on jo käytetty</translation>
     </message>
     <message>
-        <source>Invalid amount for -fallbackfee=&lt;amount&gt;: '%s'</source>
-        <translation>Virheellinen määrä -fallbackfee=&lt;amount&gt;: '%s'</translation>
+        <source>Invalid P2P permission: '%s'</source>
+        <translation>Virheellinen P2P oikeus: '%s'</translation>
     </message>
     <message>
         <source>Invalid masternodeblsprivkey. Please see documentation.</source>
@@ -4282,6 +5595,10 @@ Vähennä uakommenttien määrää tai kokoa.</translation>
         <source>Mixing in progress…</source>
         <translation>Sekoitus käynnissä…</translation>
     </message>
+    <message>
+        <source>No addresses available</source>
+        <translation>Osoitteita ei saatavilla</translation>
+    </message>
     <message>
         <source>No errors detected.</source>
         <translation>Virheitä ei havaittu.</translation>
@@ -4310,6 +5627,22 @@ Vähennä uakommenttien määrää tai kokoa.</translation>
         <source>Prune mode is incompatible with -txindex.</source>
         <translation>Karsintatila on epäyhteensopiva -txindex kanssa.</translation>
     </message>
+    <message>
+        <source>SQLiteDatabase: Failed to execute statement to verify database: %s</source>
+        <translation>SQLiteDatabase: Tietokannan varmennuslauseen suorittaminen epäonnistui: %s</translation>
+    </message>
+    <message>
+        <source>SQLiteDatabase: Failed to prepare statement to verify database: %s</source>
+        <translation>SQLiteDatabase: Tietokannan varmennuslauseen valmistelu epäonnistui: %s</translation>
+    </message>
+    <message>
+        <source>SQLiteDatabase: Failed to read database verification error: %s</source>
+        <translation>SQLiteDatabase: Tietokannan varmennusvirheen lukeminen epäonnistui: %s</translation>
+    </message>
+    <message>
+        <source>SQLiteDatabase: Unexpected application id. Expected %u, got %u</source>
+        <translation>SQLiteDatabase: Odottamaton sovellustunniste. Odotettu %u, saatu %u</translation>
+    </message>
     <message>
         <source>Section [%s] is not recognized.</source>
         <translation>Osio [%s] ei ole tunnistettavissa.</translation>
@@ -4342,6 +5675,10 @@ Vähennä uakommenttien määrää tai kokoa.</translation>
         <source>This is the transaction fee you will pay if you send a transaction.</source>
         <translation>Tämä on lähetyksestä maksettava maksu jonka maksat</translation>
     </message>
+    <message>
+        <source>Topping up keypool…</source>
+        <translation>Täydennetään avainvarantoa…</translation>
+    </message>
     <message>
         <source>Transaction amounts must not be negative</source>
         <translation>Lähetyksen määrä tulee olla positiivinen</translation>
@@ -4370,13 +5707,17 @@ Vähennä uakommenttien määrää tai kokoa.</translation>
         <source>Unable to generate initial keys</source>
         <translation>Aloitusavaimia ei voitu luoda</translation>
     </message>
+    <message>
+        <source>Unable to open %s for writing</source>
+        <translation>Tiedoston %s avaaminen kirjoittamista varten epäonnistui</translation>
+    </message>
     <message>
         <source>Unknown -blockfilterindex value %s.</source>
         <translation>Tuntematon -blockfilterindex arvo %s.</translation>
     </message>
     <message>
-        <source>Upgrading UTXO database</source>
-        <translation>Päivitetään UTXO tietokantaa</translation>
+        <source>Unknown new rules activated (versionbit %i)</source>
+        <translation>Tuntemattomat uudet säännöt aktivoitu (versiobitti %i)</translation>
     </message>
     <message>
         <source>Verifying blocks…</source>
@@ -4395,16 +5736,12 @@ Vähennä uakommenttien määrää tai kokoa.</translation>
         <translation>Varmistushakemiston luonti epäonnistui %s!</translation>
     </message>
     <message>
-        <source>You can not start a masternode with wallet enabled.</source>
-        <translation>Et voi käynnistää masternodea kun lompakko on käytössä.</translation>
-    </message>
-    <message>
-        <source>You need to rebuild the database using -reindex to change -addressindex</source>
-        <translation>Sinun tulee uudelleen rakentaa tietokanta käyttäen -reindex vaihtaen -addressindex</translation>
+        <source>Wiping wallet transactions…</source>
+        <translation>Pyyhitään lompakon tapahtumia…</translation>
     </message>
     <message>
-        <source>You need to rebuild the database using -reindex to change -spentindex</source>
-        <translation>Sinun tulee uudelleen rakentaa tietokanta käyttäen -reindex vaihtaen -spentindex</translation>
+        <source>You can not start a masternode with wallet enabled.</source>
+        <translation>Et voi käynnistää masternodea kun lompakko on käytössä.</translation>
     </message>
     <message>
         <source>no mixing available.</source>
@@ -4422,6 +5759,22 @@ Vähennä uakommenttien määrää tai kokoa.</translation>
         <source>%s uses exact denominated amounts to send funds, you might simply need to mix some more coins.</source>
         <translation>%s käyttää tarkalleen denominoituja määriä lähettäessään varoja, saatat tarvita sekoittaa lisää kolikoita.</translation>
     </message>
+    <message>
+        <source>-reindex-chainstate option is not compatible with -blockfilterindex. Please temporarily disable blockfilterindex while using -reindex-chainstate, or replace -reindex-chainstate with -reindex to fully rebuild all indexes.</source>
+        <translation>-reindex-chainstate-asetus ei ole yhteensopiva -blockfilterindex kanssa. Poista blockfilterindex väliaikaisesti käytöstä käyttäessäsi -reindex-chainstate, tai korvaa -reindex-chainstate -reindex:llä uudelleenrakentaaksesi kaikki indeksit täysin.</translation>
+    </message>
+    <message>
+        <source>-reindex-chainstate option is not compatible with -coinstatsindex. Please temporarily disable coinstatsindex while using -reindex-chainstate, or replace -reindex-chainstate with -reindex to fully rebuild all indexes.</source>
+        <translation>-reindex-chainstate-asetus ei ole yhteensopiva -coinstatsindex kanssa. Poista coinstatsindex väliaikaisesti käytöstä käyttäessäsi -reindex-chainstate, tai korvaa -reindex-chainstate -reindex:llä uudelleenrakentaaksesi kaikki indeksit täysin.</translation>
+    </message>
+    <message>
+        <source>-reindex-chainstate option is not compatible with -txindex. Please temporarily disable txindex while using -reindex-chainstate, or replace -reindex-chainstate with -reindex to fully rebuild all indexes.</source>
+        <translation>-reindex-chainstate-asetus ei ole yhteensopiva -txindex kanssa. Poista txindex väliaikaisesti käytöstä käyttäessäsi -reindex-chainstate, tai korvaa -reindex-chainstate -reindex:llä uudelleenrakentaaksesi kaikki indeksit täysin.</translation>
+    </message>
+    <message>
+        <source>Cannot downgrade wallet from version %i to version %i. Wallet version unchanged.</source>
+        <translation>Lompakon versiota ei voida alentaa versiosta %i versioon %i. Lompakon versio ei muuttunut.</translation>
+    </message>
     <message>
         <source>Cannot obtain a lock on data directory %s. %s is probably already running.</source>
         <translation>Ei voida lukita datahakemistoa %s. %s on luultavasti jo käynnissä.</translation>
@@ -4434,14 +5787,82 @@ Vähennä uakommenttien määrää tai kokoa.</translation>
         <source>Error loading %s: You can't enable HD on an already existing non-HD wallet</source>
         <translation>Virhe ladatessa %s: Et voi ottaa käyttöön HD:tä jo olemassa olevassa ei-HD lompakossa</translation>
     </message>
+    <message>
+        <source>Error loading wallet. Wallet requires blocks to be downloaded, and software does not currently support loading wallets while blocks are being downloaded out of order when using assumeutxo snapshots. Wallet should be able to load successfully after node sync reaches height %s</source>
+        <translation>Virhe ladattaessa lompakkoa. Lompakko vaatii lohkojen lataamista, eikä ohjelmisto tue tällä hetkellä lompakon lataamista kun lohkoja ladataan epäjärjestyksessä käytettäessä assumeutxo-tilannevedoksia. Lompakon pitäisi latautua onnistuneesti kun noden synkronointi saavuttaa korkeuden %s</translation>
+    </message>
     <message>
         <source>Error reading %s! All keys read correctly, but transaction data or address book entries might be missing or incorrect.</source>
         <translation>Virhe luettaessa %s! Avaimet luetttiin oikein, mutta rahansiirtotiedot tai osoitekirjan sisältö saattavat olla puutteellisia tai vääriä.</translation>
     </message>
+    <message>
+        <source>Error: Dumpfile format record is incorrect. Got "%s", expected "format".</source>
+        <translation>Virhe: Vedostiedoston muoto on virheellinen. Saatiin "%s", odotettiin "format".</translation>
+    </message>
+    <message>
+        <source>Error: Dumpfile identifier record is incorrect. Got "%s", expected "%s".</source>
+        <translation>Virhe: Vedostiedoston tunniste on virheellinen. Saatiin "%s", odotettiin "%s".</translation>
+    </message>
+    <message>
+        <source>Error: Dumpfile version is not supported. This version of bitcoin-wallet only supports version 1 dumpfiles. Got dumpfile with version %s</source>
+        <translation>Virhe: Vedostiedoston versiota ei tueta. Tämä bitcoin-wallet-versio tukee vain version 1 vedostiedostoja. Saatiin vedostiedosto versiolla %s</translation>
+    </message>
+    <message>
+        <source>Failed to rename invalid peers.dat file. Please move or delete it and try again.</source>
+        <translation>Virheellisen peers.dat-tiedoston nimeäminen epäonnistui. Siirrä tai poista se ja yritä uudelleen.</translation>
+    </message>
+    <message>
+        <source>Fee estimation failed. Fallbackfee is disabled. Wait a few blocks or enable %s.</source>
+        <translation>Siirtomaksun arviointi epäonnistui. Varamaksu on poistettu käytöstä. Odota muutama lohko tai ota %s käyttöön.</translation>
+    </message>
+    <message>
+        <source>File %s already exists. If you are sure this is what you want, move it out of the way first.</source>
+        <translation>Tiedosto %s on jo olemassa. Jos olet varma että tämä on mitä haluat, siirrä se ensin pois tieltä.</translation>
+    </message>
+    <message>
+        <source>Incompatible options: -dnsseed=1 was explicitly specified, but -onlynet forbids connections to IPv4/IPv6</source>
+        <translation>Yhteensopimattomat asetukset: -dnsseed=1 määritettiin selvästi, mutta -onlynet kieltää yhteydet IPv4/IPv6:een</translation>
+    </message>
     <message>
         <source>Incorrect or no devnet genesis block found. Wrong datadir for devnet specified?</source>
         <translation>Väärä tai ei devnet alkuperäinen lohko löydetty. Väärä data hakemisto devnet verkolle?</translation>
     </message>
+    <message>
+        <source>Invalid amount for %s=&lt;amount&gt;: '%s' (must be at least the minrelay fee of %s to prevent stuck transactions)</source>
+        <translation>Virheellinen määrä kohteelle %s=&lt;amount&gt;: '%s' (täytyy olla vähintään minrelay-maksu %s jumittuneiden tapahtumien estämiseksi)</translation>
+    </message>
+    <message>
+        <source>Invalid or corrupt peers.dat (%s). If you believe this is a bug, please report it to %s. As a workaround, you can move the file (%s) out of the way (rename, move, or delete) to have a new one created on the next start.</source>
+        <translation>Virheellinen tai vioittunut peers.dat (%s). Jos uskot tämän olevan bugi, ilmoita siitä osoitteeseen %s. Kiertotienä voit siirtää tiedoston (%s) pois tieltä (nimeä uudelleen, siirrä tai poista) jotta uusi luodaan seuraavassa käynnistyksessä.</translation>
+    </message>
+    <message>
+        <source>No dump file provided. To use createfromdump, -dumpfile=&lt;filename&gt; must be provided.</source>
+        <translation>Vedostiedostoa ei annettu. Käyttääksesi createfromdump, -dumpfile=&lt;filename&gt; täytyy antaa.</translation>
+    </message>
+    <message>
+        <source>No dump file provided. To use dump, -dumpfile=&lt;filename&gt; must be provided.</source>
+        <translation>Vedostiedostoa ei annettu. Käyttääksesi dump, -dumpfile=&lt;filename&gt; täytyy antaa.</translation>
+    </message>
+    <message>
+        <source>No wallet file format provided. To use createfromdump, -format=&lt;format&gt; must be provided.</source>
+        <translation>Lompakkotiedoston muotoa ei annettu. Käyttääksesi createfromdump, -format=&lt;format&gt; täytyy antaa.</translation>
+    </message>
+    <message>
+        <source>Outbound connections restricted to CJDNS (-onlynet=cjdns) but -cjdnsreachable is not provided</source>
+        <translation>Lähtevät yhteydet rajoitettu CJDNS:ään (-onlynet=cjdns) mutta -cjdnsreachable ei ole annettu</translation>
+    </message>
+    <message>
+        <source>Outbound connections restricted to Tor (-onlynet=onion) but the proxy for reaching the Tor network is explicitly forbidden: -onion=0</source>
+        <translation>Lähtevät yhteydet rajoitettu Toriin (-onlynet=onion) mutta välityspalvelin Tor-verkkoon pääsemiseksi on nimenomaisesti kielletty: -onion=0</translation>
+    </message>
+    <message>
+        <source>Outbound connections restricted to Tor (-onlynet=onion) but the proxy for reaching the Tor network is not provided: none of -proxy, -onion or -listenonion is given</source>
+        <translation>Lähtevät yhteydet rajoitettu Toriin (-onlynet=onion) mutta välityspalvelinta Tor-verkkoon pääsemiseksi ei ole annettu: yhtään -proxy, -onion tai -listenonion ei ole määritetty</translation>
+    </message>
+    <message>
+        <source>Outbound connections restricted to i2p (-onlynet=i2p) but -i2psam is not provided</source>
+        <translation>Lähtevät yhteydet rajoitettu i2p:hen (-onlynet=i2p) mutta -i2psam ei ole annettu</translation>
+    </message>
     <message>
         <source>Please check that your computer's date and time are correct! If your clock is wrong, %s will not work properly.</source>
         <translation>Tarkistathan että tietokoneesi päivämäärä ja kellonaika ovat oikeassa! Jos kellosi on väärässä, %s ei toimi oikein.</translation>
@@ -4450,6 +5871,14 @@ Vähennä uakommenttien määrää tai kokoa.</translation>
         <source>Please contribute if you find %s useful. Visit %s for further information about the software.</source>
         <translation>Ole hyvä ja avusta, jos %s on mielestäsi hyödyllinen. Vieraile %s saadaksesi lisää tietoa ohjelmistosta.</translation>
     </message>
+    <message>
+        <source>Prune mode is incompatible with -reindex-chainstate. Use full -reindex instead.</source>
+        <translation>Karsintatila on epäyhteensopiva -reindex-chainstate kanssa. Käytä täyttä -reindex sen sijaan.</translation>
+    </message>
+    <message>
+        <source>This is the maximum transaction fee you pay (in addition to the normal fee) to prioritize partial spend avoidance over regular coin selection.</source>
+        <translation>Tämä on maksimi siirtomaksu jonka maksat (normaalin maksun lisäksi) priorisoidaksesi osittaisen käytön välttämisen tavallisen kolikon valinnan sijaan.</translation>
+    </message>
     <message>
         <source>This is the transaction fee you may discard if change is smaller than dust at this level</source>
         <translation>Tämä on siirtomaksun määrä jonka saatat hylätä jos vaihtoraha on pienempi kuin tomu tällä tasolla</translation>
@@ -4458,14 +5887,38 @@ Vähennä uakommenttien määrää tai kokoa.</translation>
         <source>This is the transaction fee you may pay when fee estimates are not available.</source>
         <translation>Tämä on siirtomaksu jonka saatat maksaa jos siirtomaksun arviota ei ole mahdollista saada.</translation>
     </message>
+    <message>
+        <source>Transaction requires one destination of non-0 value, a non-0 feerate, or a pre-selected input</source>
+        <translation>Tapahtuma vaatii yhden kohteen, jolla on muu kuin 0 arvo, muun kuin 0 maksutason tai esivalitun syötteen</translation>
+    </message>
     <message>
         <source>Unable to replay blocks. You will need to rebuild the database using -reindex-chainstate.</source>
         <translation>Ei voitu toistaa lohkoja. Sinun tulee uudelleen rakentaa tietokanta käyttäen -reindex-chainstate.</translation>
     </message>
+    <message>
+        <source>Unknown wallet file format "%s" provided. Please provide one of "bdb" or "sqlite".</source>
+        <translation>Tuntematon lompakon tiedostomuoto "%s" annettu. Anna joko "bdb" tai "sqlite".</translation>
+    </message>
+    <message>
+        <source>Unsupported chainstate database format found. Please restart with -reindex-chainstate. This will rebuild the chainstate database.</source>
+        <translation>Havaittiin ei-tuettu ketjutilan tietokantamuoto. Käynnistä uudelleen -reindex-chainstate:lla. Tämä rakentaa ketjutilan tietokannan uudelleen.</translation>
+    </message>
+    <message>
+        <source>Warning: Dumpfile wallet format "%s" does not match command line specified format "%s".</source>
+        <translation>Varoitus: Dump-tiedoston lompakon muoto "%s" ei vastaa komentoriviltä määriteltyä muotoa "%s".</translation>
+    </message>
     <message>
         <source>Warning: Private keys detected in wallet {%s} with disabled private keys</source>
         <translation>Varoitus: Lompakossa {%s} havaittiin yksityisavaimet , jotka on poistettu käytöstä </translation>
     </message>
+    <message>
+        <source>You need to rebuild the database using -reindex to enable -timestampindex</source>
+        <translation>Sinun täytyy rakentaa tietokanta uudelleen käyttäen -reindex ottaaksesi -timestampindex käyttöön</translation>
+    </message>
+    <message>
+        <source>%s -- Incorrect seed, it should be a hex string</source>
+        <translation>%s -- Virheellinen siemen, sen pitäisi olla heksadesimaalimerkkijono</translation>
+    </message>
     <message>
         <source>%s is not a valid backup folder!</source>
         <translation>%s ei ole pätevä varmistus hakemisto!</translation>
@@ -4490,10 +5943,30 @@ Vähennä uakommenttien määrää tai kokoa.</translation>
         <source>-rpcport must be specified when -devnet and -server are specified</source>
         <translation>-rpcport täytyy määritellä kun -devnet ja -server on määritelty</translation>
     </message>
+    <message>
+        <source>-statsbatchsize cannot be configured with a negative value.</source>
+        <translation>-statsbatchsize ei voida määrittää negatiivisella arvolla.</translation>
+    </message>
+    <message>
+        <source>-statsduration cannot be configured with a negative value.</source>
+        <translation>-statsduration ei voida määrittää negatiivisella arvolla.</translation>
+    </message>
     <message>
         <source>A fatal internal error occurred, see debug.log for details</source>
         <translation>Vakava sisäinen virhe, katso debug.log lisätietoja</translation>
     </message>
+    <message>
+        <source>Cannot create socket (socket() returned error %s)</source>
+        <translation>Socketin luonti epäonnistui (socket() palautti virheen %s)</translation>
+    </message>
+    <message>
+        <source>Cannot get socket address for %s</source>
+        <translation>Socket-osoitetta ei saada %s:lle</translation>
+    </message>
+    <message>
+        <source>Cannot init Statsd client</source>
+        <translation>Statsd-asiakasta ei voida alustaa</translation>
+    </message>
     <message>
         <source>Cannot resolve -%s address: '%s'</source>
         <translation>-%s -osoitteen '%s' selvittäminen epäonnistui</translation>
@@ -4502,10 +5975,6 @@ Vähennä uakommenttien määrää tai kokoa.</translation>
         <source>Cannot write to data directory '%s'; check permissions.</source>
         <translation>Ei voida kirjoittaa datahakemistoon '%s'; tarkista oikeudet.</translation>
     </message>
-    <message>
-        <source>Change index out of range</source>
-        <translation>Vaihtoindeksi on rajojen ulkopuolella</translation>
-    </message>
     <message>
         <source>Copyright (C)</source>
         <translation>Tekijänoikeus (C)</translation>
@@ -4514,6 +5983,14 @@ Vähennä uakommenttien määrää tai kokoa.</translation>
         <source>Disk space is too low!</source>
         <translation>Levytila on alhainen!</translation>
     </message>
+    <message>
+        <source>Dump file %s does not exist.</source>
+        <translation>Dump-tiedostoa %s ei ole olemassa.</translation>
+    </message>
+    <message>
+        <source>Error creating %s</source>
+        <translation>Virhe luodessa %s</translation>
+    </message>
     <message>
         <source>Error loading %s</source>
         <translation>Virhe ladattaessa %s</translation>
@@ -4531,8 +6008,8 @@ Vähennä uakommenttien määrää tai kokoa.</translation>
         <translation>Virhe ladatessa %s: Et voi poistaa käytöstä HD:tä jo olemassa olevassa HD lompakossa</translation>
     </message>
     <message>
-        <source>Error upgrading chainstate database</source>
-        <translation>Virhe ketjutilan tietokannan päivityksessä</translation>
+        <source>Error reading next record from wallet database</source>
+        <translation>Virhe luettaessa seuraavaa tietuetta lompakon tietokannasta</translation>
     </message>
     <message>
         <source>Loading P2P addresses…</source>
@@ -4602,6 +6079,14 @@ Vähennä uakommenttien määrää tai kokoa.</translation>
         <source>Inputs vs outputs size mismatch.</source>
         <translation>Syötteet vs lähdöt koko ei täsmää.</translation>
     </message>
+    <message>
+        <source>Invalid '%s'. Allowed values: 128, 160, 192, 224, 256.</source>
+        <translation>Virheellinen '%s'. Sallitut arvot: 128, 160, 192, 224, 256.</translation>
+    </message>
+    <message>
+        <source>Invalid -i2psam address or hostname: '%s'</source>
+        <translation>Virheellinen -i2psam osoite tai isäntänimi: '%s'</translation>
+    </message>
     <message>
         <source>Invalid -onion address or hostname: '%s'</source>
         <translation>Virheellinen -onion osoite tai isäntänimi: '%s'</translation>
@@ -4646,14 +6131,78 @@ Vähennä uakommenttien määrää tai kokoa.</translation>
         <source>%s corrupt. Try using the wallet tool dash-wallet to salvage or restoring a backup.</source>
         <translation> %s vioittunut. Yritä käyttää lompakkotyökalua dash-wallet pelastaaksesi tai palauttaaksesi varmuuskopion.</translation>
     </message>
+    <message>
+        <source>%s is set very high! Fees this large could be paid on a single transaction.</source>
+        <translation>%s on asetettu erittäin korkeaksi! Näin suuret maksut voidaan maksaa yhdellä tapahtumalla.</translation>
+    </message>
+    <message>
+        <source>%s request to listen on port %u. This port is considered "bad" and thus it is unlikely that any Dash Core peers connect to it. See doc/p2p-bad-ports.md for details and a full list.</source>
+        <translation>%s pyyntö kuunnella portissa %u. Tätä porttia pidetään "huonona" ja siksi on epätodennäköistä että mikään Dash Core -vertainen yhdistää siihen. Katso doc/p2p-bad-ports.md yksityiskohtia ja täydellistä listaa varten.</translation>
+    </message>
+    <message>
+        <source>Cannot provide specific connections and have addrman find outgoing connections at the same time.</source>
+        <translation>Ei voida tarjota tiettyjä yhteyksiä ja antaa addrmanin etsiä lähteviä yhteyksiä samanaikaisesti.</translation>
+    </message>
+    <message>
+        <source>Failed to upgrade Evo database</source>
+        <translation>Evo-tietokannan päivittäminen epäonnistui</translation>
+    </message>
+    <message>
+        <source>Fee needed &gt; fee paid</source>
+        <translation>Tarvittava maksu &gt; maksettu maksu</translation>
+    </message>
+    <message>
+        <source>Host %s on unsupported network</source>
+        <translation>Isäntä %s ei-tuetussa verkossa</translation>
+    </message>
+    <message>
+        <source>Invalid amount for %s=&lt;amount&gt;: '%s' (must be at least %s)</source>
+        <translation>Virheellinen määrä %s=&lt;amount&gt;: '%s' (on oltava vähintään %s)</translation>
+    </message>
+    <message>
+        <source>Invalid amount for %s=&lt;amount&gt;: '%s'</source>
+        <translation>Virheellinen määrä %s=&lt;amount&gt;: '%s'</translation>
+    </message>
+    <message>
+        <source>Invalid port specified in %s: '%s'</source>
+        <translation>Virheellinen portti määritelty %s: '%s'</translation>
+    </message>
     <message>
         <source>Last successful action was too recent.</source>
         <translation>Viimeinen onnistunut tapahtuma oli liian äskettäin.</translation>
     </message>
+    <message>
+        <source>Missing solving data for estimating transaction size</source>
+        <translation>Ratkaisutiedot puuttuvat tapahtuman koon arvioimiseksi</translation>
+    </message>
+    <message>
+        <source>No host specified</source>
+        <translation>Isäntää ei määritelty</translation>
+    </message>
+    <message>
+        <source>No host specified, malformed URL</source>
+        <translation>Isäntää ei määritelty, virheellinen URL</translation>
+    </message>
+    <message>
+        <source>No text before the scheme delimiter, malformed URL</source>
+        <translation>Ei tekstiä ennen kaavaerotinta, virheellinen URL</translation>
+    </message>
+    <message>
+        <source>Port must be between %d and %d, supplied %d</source>
+        <translation>Portin on oltava välillä %d ja %d, annettu %d</translation>
+    </message>
+    <message>
+        <source>Socket not initialized, cannot send message</source>
+        <translation>Sockettia ei ole alustettu, viestiä ei voida lähettää</translation>
+    </message>
     <message>
         <source>The source code is available from %s.</source>
         <translation>Lähdekoodi löytyy %s.</translation>
     </message>
+    <message>
+        <source>The specified config file %s does not exist</source>
+        <translation>Määriteltyä konfigurointitiedostoa %s ei ole olemassa</translation>
+    </message>
     <message>
         <source>The transaction amount is too small to pay the fee</source>
         <translation>Siirtomäärä on liian pieni siirtomaksun maksamiseen</translation>
@@ -4674,6 +6223,10 @@ Vähennä uakommenttien määrää tai kokoa.</translation>
         <source>Transaction fees are too high.</source>
         <translation>Siirtotapahtuman siirtomaksu on liian iso.</translation>
     </message>
+    <message>
+        <source>Transaction needs a change address, but we can't generate it.</source>
+        <translation>Tapahtuma tarvitsee vaihtoraha-osoitteen, mutta emme voi luoda sitä.</translation>
+    </message>
     <message>
         <source>Transaction not valid.</source>
         <translation>Siirtotapahtuma ei ole voimassa.</translation>
@@ -4694,6 +6247,18 @@ Vähennä uakommenttien määrää tai kokoa.</translation>
         <source>Unable to locate enough non-denominated funds for this transaction.</source>
         <translation>Ei tarpeeksi ei-denominoituja varoja tälle siirtotapahtumalle.</translation>
     </message>
+    <message>
+        <source>Unable to lookup host %s</source>
+        <translation>Ei voida hakea isäntää %s</translation>
+    </message>
+    <message>
+        <source>Unable to parse -maxuploadtarget: '%s'</source>
+        <translation>Ei voida jäsentää -maxuploadtarget: '%s'</translation>
+    </message>
+    <message>
+        <source>Unable to send message to %s (::sendto() returned error %s)</source>
+        <translation>Ei voida lähettää viestiä kohteeseen %s (::sendto() palautti virheen %s)</translation>
+    </message>
     <message>
         <source>Unable to sign spork message, wrong key?</source>
         <translation>En voida allekirjoittaa spork viestiä, väärä avain?</translation>
@@ -4707,12 +6272,12 @@ Vähennä uakommenttien määrää tai kokoa.</translation>
         <translation>Tuntematon tila: id = %u</translation>
     </message>
     <message>
-        <source>Unsupported logging category %s=%s.</source>
-        <translation>Ei tuettu lokikategoria %s=%s.</translation>
+        <source>Unsupported URL scheme, must begin with udp://</source>
+        <translation>Ei-tuettu URL-kaava, täytyy alkaa udp://</translation>
     </message>
     <message>
-        <source>Upgrading txindex database</source>
-        <translation>Päivitetään txindex tietokantaa</translation>
+        <source>Unsupported logging category %s=%s.</source>
+        <translation>Ei tuettu lokikategoria %s=%s.</translation>
     </message>
     <message>
         <source>Very low number of keys left: %d</source>
@@ -4742,9 +6307,25 @@ Vähennä uakommenttien määrää tai kokoa.</translation>
         <source>You can not disable governance validation on a masternode.</source>
         <translation>Et voi poistaa käytöstä hallinnon vahvistusta masternodesta.</translation>
     </message>
+    <message>
+        <source>You need to rebuild the database using -reindex to enable -addressindex</source>
+        <translation>Sinun täytyy rakentaa tietokanta uudelleen käyttämällä -reindex ottaaksesi käyttöön -addressindex</translation>
+    </message>
+    <message>
+        <source>You need to rebuild the database using -reindex to enable -spentindex</source>
+        <translation>Sinun täytyy rakentaa tietokanta uudelleen käyttämällä -reindex ottaaksesi käyttöön -spentindex</translation>
+    </message>
     <message>
         <source>Your entries added successfully.</source>
         <translation>Merkinnnät lisätty onnistuneesti.</translation>
     </message>
+    <message>
+        <source>Settings file could not be read</source>
+        <translation>Asetustiedostoa ei voitu lukea</translation>
+    </message>
+    <message>
+        <source>Settings file could not be written</source>
+        <translation>Asetustiedostoa ei voitu kirjoittaa</translation>
+    </message>
 </context>
 </TS>
\ No newline at end of file

From b609d38b00c4e155950065e3a8c99786693f57ce Mon Sep 17 00:00:00 2001
From: UdjinM6 <UdjinM6@users.noreply.github.com>
Date: Fri, 24 Oct 2025 13:24:27 +0300
Subject: [PATCH 328/656] sk

---
 src/qt/locale/dash_sk.ts | 2067 +++++++++++++++++++++++++++++++++-----
 1 file changed, 1824 insertions(+), 243 deletions(-)

diff --git a/src/qt/locale/dash_sk.ts b/src/qt/locale/dash_sk.ts
index 62096499888f..c83a25f0aaba 100644
--- a/src/qt/locale/dash_sk.ts
+++ b/src/qt/locale/dash_sk.ts
@@ -65,14 +65,6 @@
         <source>C&amp;hoose</source>
         <translation>&amp;Vybrať</translation>
     </message>
-    <message>
-        <source>Sending addresses</source>
-        <translation>Adresa odoslania</translation>
-    </message>
-    <message>
-        <source>Receiving addresses</source>
-        <translation>Adresa prijatia</translation>
-    </message>
     <message>
         <source>These are your Dash addresses for sending payments. Always check the amount and the receiving address before sending coins.</source>
         <translation>Toto sú vaše Dash adresy pre posielanie platieb. Pred poslaním mincí vždy overte sumu a doručovaciu adresu.</translation>
@@ -94,8 +86,8 @@
         <translation>&amp;Upraviť</translation>
     </message>
     <message>
-        <source>&amp;Show address QR code</source>
-        <translation>&amp;Zobraziť adresový QR kód</translation>
+        <source>Show address &amp;QR code</source>
+        <translation>Zobraziť &amp;QR kód adresy</translation>
     </message>
     <message>
         <source>QR code</source>
@@ -105,6 +97,24 @@
         <source>Export Address List</source>
         <translation>Exportovať zoznam adries</translation>
     </message>
+    <message>
+        <source>Comma separated file</source>
+        <extracomment>Expanded name of the CSV file format. See: https://en.wikipedia.org/wiki/Comma-separated_values.</extracomment>
+        <translation>Súbor s čiarkou oddelenými hodnotami</translation>
+    </message>
+    <message>
+        <source>There was an error trying to save the address list to %1. Please try again.</source>
+        <extracomment>An error message. %1 is a stand-in argument for the name of the file we attempted to save to.</extracomment>
+        <translation>Nastala chyba pri pokuse uložiť zoznam adries do %1. Prosím, skúste znova.</translation>
+    </message>
+    <message>
+        <source>Sending addresses - %1</source>
+        <translation>Odosielacie adresy - %1</translation>
+    </message>
+    <message>
+        <source>Receiving addresses - %1</source>
+        <translation>Prijímacie adresy - %1</translation>
+    </message>
     <message>
         <source>Exporting Failed</source>
         <translation>Export zlyhal</translation>
@@ -274,10 +284,22 @@
         <source>The passphrase entered for the wallet decryption was incorrect.</source>
         <translation>Zadané heslo pre dešifrovanie peňaženky bolo nesprávne.</translation>
     </message>
+    <message>
+        <source>The passphrase entered for the wallet decryption is incorrect. It contains a null character (ie - a zero byte). If the passphrase was set with a version of this software prior to 23.0, please try again with only the characters up to — but not including — the first null character. If this is successful, please set a new passphrase to avoid this issue in the future.</source>
+        <translation>Zadané heslo pre dešifrovanie peňaženky je nesprávne. Obsahuje nulový znak (t.j. nulový bajt). Ak bolo heslo nastavené verziou tohto softvéru pred 23.0, skúste to znova iba so znakmi až po — ale bez — prvý nulový znak. Ak je to úspešné, nastavte si nové heslo, aby ste sa tomuto problému v budúcnosti vyhli.</translation>
+    </message>
     <message>
         <source>Wallet passphrase was successfully changed.</source>
         <translation>Heslo k peňaženke bolo úspešne zmenené.</translation>
     </message>
+    <message>
+        <source>Passphrase change failed</source>
+        <translation>Zmena hesla zlyhala</translation>
+    </message>
+    <message>
+        <source>The old passphrase entered for the wallet decryption is incorrect. It contains a null character (ie - a zero byte). If the passphrase was set with a version of this software prior to 23.0, please try again with only the characters up to — but not including — the first null character.</source>
+        <translation>Staré heslo zadané pre dešifrovanie peňaženky je nesprávne. Obsahuje nulový znak (t.j. nulový bajt). Ak bolo heslo nastavené verziou tohto softvéru pred 23.0, skúste to znova iba so znakmi až po — ale bez — prvý nulový znak.</translation>
+    </message>
     <message>
         <source>Warning: The Caps Lock key is on!</source>
         <translation>Upozornenie: Caps Lock je zapnutý</translation>
@@ -303,7 +325,23 @@
 </context>
 <context>
     <name>BitcoinApplication</name>
-    </context>
+    <message>
+        <source>Runaway exception</source>
+        <translation>Neodchytená výnimka</translation>
+    </message>
+    <message>
+        <source>A fatal error occurred. %1 can no longer continue safely and will quit.</source>
+        <translation>Vyskytla sa fatálna chyba. %1 nemôže bezpečne pokračovať a ukončí sa.</translation>
+    </message>
+    <message>
+        <source>Internal error</source>
+        <translation>Vnútorná chyba</translation>
+    </message>
+    <message>
+        <source>An internal error occurred. %1 will attempt to continue safely. This is an unexpected bug which can be reported as described below.</source>
+        <translation>Vyskytla sa vnútorná chyba. %1 sa pokúsi bezpečne pokračovať. Toto je neočakávaná chyba, ktorú je možné nahlásiť podľa popisu nižšie.</translation>
+    </message>
+</context>
 <context>
     <name>BitcoinGUI</name>
     <message>
@@ -330,6 +368,10 @@
         <source>Request payments (generates QR codes and dash: URIs)</source>
         <translation>Vyžiadať platby (vygeneruje QR kódy a Dash: URI)</translation>
     </message>
+    <message>
+        <source>Ctrl+Q</source>
+        <translation>Ctrl+Q</translation>
+    </message>
     <message>
         <source>&amp;Options…</source>
         <translation>&amp;Možnosti…</translation>
@@ -358,6 +400,10 @@
         <source>&amp;Verify message…</source>
         <translation>&amp;Overiť správu…</translation>
     </message>
+    <message>
+        <source>&amp;Load PSBT from file…</source>
+        <translation>&amp;Načítať PSBT zo súboru…</translation>
+    </message>
     <message>
         <source>&amp;Sending addresses</source>
         <translation>&amp;Odosielacie adresy</translation>
@@ -390,10 +436,6 @@
         <source>&amp;Window</source>
         <translation>&amp;Okno</translation>
     </message>
-    <message>
-        <source>Minimize</source>
-        <translation>Minimalizovať</translation>
-    </message>
     <message>
         <source>Zoom</source>
         <translation>Priblížiť</translation>
@@ -446,14 +488,6 @@
         <source>Modify configuration options for %1</source>
         <translation>Upraviť nastavenia pre %1</translation>
     </message>
-    <message>
-        <source>&amp;Show / Hide</source>
-        <translation>&amp;Zobraziť / Skryť</translation>
-    </message>
-    <message>
-        <source>Show or hide the main Window</source>
-        <translation>Zobraziť alebo skryť hlavné okno</translation>
-    </message>
     <message>
         <source>Encrypt the private keys that belong to your wallet</source>
         <translation>Zašifruj súkromné kľúče ktoré patria do vašej peňaženky</translation>
@@ -518,10 +552,6 @@
         <source>Show wallet repair options</source>
         <translation>Zobraziť možnosti opravy peňaženky</translation>
     </message>
-    <message>
-        <source>Open Wallet &amp;Configuration File</source>
-        <translation>Otvoriť &amp;konfiguračný súbor peňaženky</translation>
-    </message>
     <message>
         <source>Open configuration file</source>
         <translation>Otvoriť konfiguračný súbor </translation>
@@ -576,10 +606,40 @@
         <source>Show information about %1</source>
         <translation>Zobraziť informácie o %1</translation>
     </message>
+    <message>
+        <source>Load PSBT from &amp;clipboard…</source>
+        <translation>Načítať PSBT zo &amp;schránky…</translation>
+    </message>
+    <message>
+        <source>Open debugging and diagnostic console</source>
+        <translation>Otvoriť ladiaca a diagnostická konzola</translation>
+    </message>
+    <message>
+        <source>Open &amp;wallet configuration file</source>
+        <translation>Otvoriť konfiguračný súbor &amp;peňaženky</translation>
+    </message>
+    <message>
+        <source>Open a dash: URI</source>
+        <translation>Otvoriť dash: URI</translation>
+    </message>
     <message>
         <source>Create a new wallet</source>
         <translation>Vytvoriť novú peňaženku</translation>
     </message>
+    <message>
+        <source>Restore Wallet…</source>
+        <extracomment>Name of the menu item that restores wallet from a backup file.</extracomment>
+        <translation>Obnoviť peňaženku…</translation>
+    </message>
+    <message>
+        <source>Restore a wallet from a backup file</source>
+        <extracomment>Status tip for Restore Wallet menu item</extracomment>
+        <translation>Obnoviť peňaženku zo záložného súboru</translation>
+    </message>
+    <message>
+        <source>Close all wallets</source>
+        <translation>Zavrieť všetky peňaženky</translation>
+    </message>
     <message>
         <source>%1 &amp;information</source>
         <translation>%1 &amp;Informácie</translation>
@@ -588,10 +648,42 @@
         <source>Show the %1 basic information</source>
         <translation>Ukázať základné Informácie o %1</translation>
     </message>
+    <message>
+        <source>&amp;Discreet mode</source>
+        <translation>&amp;Diskrétny režim</translation>
+    </message>
+    <message>
+        <source>Mask the values in the Overview tab</source>
+        <translation>Skryť hodnoty na záložke Prehľad</translation>
+    </message>
+    <message>
+        <source>Wallet Data</source>
+        <extracomment>Name of the wallet data file format.</extracomment>
+        <translation>Dáta peňaženky</translation>
+    </message>
+    <message>
+        <source>Load Wallet Backup</source>
+        <extracomment>The title for Restore Wallet File Windows</extracomment>
+        <translation>Načítať zálohu peňaženky</translation>
+    </message>
+    <message>
+        <source>Restore Wallet</source>
+        <extracomment>Title of pop-up window shown when the user is attempting to restore a wallet.</extracomment>
+        <translation>Obnoviť peňaženku</translation>
+    </message>
+    <message>
+        <source>Wallet Name</source>
+        <extracomment>Label of the input field where the name of the wallet is entered.</extracomment>
+        <translation>Názov peňaženky</translation>
+    </message>
     <message>
         <source>&amp;Settings</source>
         <translation>&amp;Nastavenia</translation>
     </message>
+    <message>
+        <source>&amp;Minimize</source>
+        <translation>&amp;Minimalizovať</translation>
+    </message>
     <message>
         <source>&amp;Help</source>
         <translation>&amp;Pomoc</translation>
@@ -608,8 +700,17 @@
         <source>View Governance Proposals</source>
         <translation>Zobraziť návrhy dozoru</translation>
     </message>
+    <message>
+        <source>&amp;Hide</source>
+        <translation>&amp;Skryť</translation>
+    </message>
+    <message>
+        <source>S&amp;how</source>
+        <translation>&amp;Zobraziť</translation>
+    </message>
     <message numerus="yes">
         <source>%n active connection(s) to Dash network</source>
+        <extracomment>A substring of the tooltip.</extracomment>
         <translation><numerusform>%n aktívne spojenie so sieťou Dash</numerusform><numerusform>%n aktívne spojenia so sieťou Dash</numerusform><numerusform>%n aktívnych spojení so sieťou Dash</numerusform><numerusform>%n aktívnych spojení so sieťou Dash</numerusform></translation>
     </message>
     <message>
@@ -628,10 +729,50 @@
         <source>Close Wallet…</source>
         <translation>Zatvoriť Peňaženku…</translation>
     </message>
+    <message>
+        <source>Load Partially Signed Blockchain Transaction</source>
+        <translation>Načítať čiastočne podpísanú blockchainovú transakciu</translation>
+    </message>
+    <message>
+        <source>Load Partially Signed Blockchain Transaction from clipboard</source>
+        <translation>Načítať čiastočne podpísanú blockchainovú transakciu zo schránky</translation>
+    </message>
     <message>
         <source>Create Wallet…</source>
         <translation>Vytvoriť peňaženku…</translation>
     </message>
+    <message>
+        <source>Close All Wallets…</source>
+        <translation>Zatvoriť všetky peňaženky…</translation>
+    </message>
+    <message>
+        <source>Ctrl+Shift+D</source>
+        <translation>Ctrl+Shift+D</translation>
+    </message>
+    <message>
+        <source>Ctrl+M</source>
+        <translation>Ctrl+M</translation>
+    </message>
+    <message>
+        <source>Click for more actions.</source>
+        <extracomment>A substring of the tooltip. "More actions" are available via the context menu.</extracomment>
+        <translation>Kliknite pre ďalšie akcie.</translation>
+    </message>
+    <message>
+        <source>Show Peers tab</source>
+        <extracomment>A context menu item. The "Peers tab" is an element of the "Node window".</extracomment>
+        <translation>Zobraziť kartu Peerov</translation>
+    </message>
+    <message>
+        <source>Disable network activity</source>
+        <extracomment>A context menu item.</extracomment>
+        <translation>Zakázať sieťovú aktivitu</translation>
+    </message>
+    <message>
+        <source>Enable network activity</source>
+        <extracomment>A context menu item. The network activity was disabled previously.</extracomment>
+        <translation>Povoliť sieťovú aktivitu</translation>
+    </message>
     <message>
         <source>Syncing Headers (%1%)…</source>
         <translation>Synchronizujú sa hlavičky (%1%)…</translation>
@@ -648,10 +789,6 @@
         <source>Processing blocks on disk…</source>
         <translation>Spracovávam bloky na disku…</translation>
     </message>
-    <message>
-        <source>Reindexing blocks on disk…</source>
-        <translation>Reindexujú sa bloky na disku…</translation>
-    </message>
     <message>
         <source>Connecting to peers…</source>
         <translation>Pripája sa k partnerom…</translation>
@@ -805,10 +942,6 @@
         <source>Coin Selection</source>
         <translation>Výber mince</translation>
     </message>
-    <message>
-        <source>Dust:</source>
-        <translation>Prach:</translation>
-    </message>
     <message>
         <source>After Fee:</source>
         <translation>Po poplatku:</translation>
@@ -866,28 +999,32 @@
         <translation>Potvrdené</translation>
     </message>
     <message>
-        <source>Copy address</source>
-        <translation>Kopírovať adresu</translation>
+        <source>Copy amount</source>
+        <translation>Kopírovať sumu</translation>
+    </message>
+    <message>
+        <source>&amp;Copy address</source>
+        <translation>&amp;Kopírovať adresu</translation>
     </message>
     <message>
-        <source>Copy label</source>
-        <translation>Kopírovať popis</translation>
+        <source>Copy &amp;label</source>
+        <translation>Kopírovať &amp;popis</translation>
     </message>
     <message>
-        <source>Copy amount</source>
-        <translation>Kopírovať sumu</translation>
+        <source>Copy &amp;amount</source>
+        <translation>Kopírovať &amp;sumu</translation>
     </message>
     <message>
-        <source>Copy transaction ID</source>
-        <translation>Kopírovať ID transakcie</translation>
+        <source>Copy transaction &amp;ID and output index</source>
+        <translation>Kopírovať &amp;ID transakcie a index výstupu</translation>
     </message>
     <message>
-        <source>Lock unspent</source>
-        <translation>Uzamknúť neminuté</translation>
+        <source>L&amp;ock unspent</source>
+        <translation>&amp;Uzamknúť neutratené</translation>
     </message>
     <message>
-        <source>Unlock unspent</source>
-        <translation>Odomknúť neminuté</translation>
+        <source>&amp;Unlock unspent</source>
+        <translation>&amp;Odomknúť neutratené</translation>
     </message>
     <message>
         <source>Copy quantity</source>
@@ -905,10 +1042,6 @@
         <source>Copy bytes</source>
         <translation>Kopírovať bajty</translation>
     </message>
-    <message>
-        <source>Copy dust</source>
-        <translation>Kopírovať prach</translation>
-    </message>
     <message>
         <source>Copy change</source>
         <translation>Kopírovať zmenu</translation>
@@ -921,18 +1054,6 @@
         <source>(%1 locked)</source>
         <translation>(%1 zamknutých)</translation>
     </message>
-    <message>
-        <source>yes</source>
-        <translation>áno</translation>
-    </message>
-    <message>
-        <source>no</source>
-        <translation>nie</translation>
-    </message>
-    <message>
-        <source>This label turns red if any recipient receives an amount smaller than the current dust threshold.</source>
-        <translation>Tento popis sčervenie ak ktorýkoľvek príjemca dostane sumu menšiu ako súčasný limit pre "prach".</translation>
-    </message>
     <message>
         <source>Can vary +/- %1 duff(s) per input.</source>
         <translation>Môže sa pohybovať +/- %1 duff(y) pre vstup.</translation>
@@ -976,8 +1097,14 @@
 </context>
 <context>
     <name>CreateWalletActivity</name>
+    <message>
+        <source>Create Wallet</source>
+        <extracomment>Title of window indicating the progress of creation of a new wallet.</extracomment>
+        <translation>Vytvoriť peňaženku</translation>
+    </message>
     <message>
         <source>Creating Wallet &lt;b&gt;%1&lt;/b&gt;…</source>
+        <extracomment>Descriptive text of the create wallet progress window which indicates to the user which wallet is currently being created.</extracomment>
         <translation>Vytvára sa peňaženka &lt;b&gt;%1&lt;/b&gt;…</translation>
     </message>
     <message>
@@ -999,6 +1126,10 @@
         <source>Wallet Name</source>
         <translation>Názov peňaženky</translation>
     </message>
+    <message>
+        <source>Wallet</source>
+        <translation>Peňaženka</translation>
+    </message>
     <message>
         <source>Encrypt the wallet. The wallet will be encrypted with a passphrase of your choice.</source>
         <translation>Zašifruje peňaženku. Peňaženka bude zašifrovaná pomocou prístupovej frázy podľa vášho výberu.</translation>
@@ -1007,6 +1138,10 @@
         <source>Encrypt Wallet</source>
         <translation>Zašifrovať peňaženku</translation>
     </message>
+    <message>
+        <source>Advanced Options</source>
+        <translation>Pokročilé možnosti</translation>
+    </message>
     <message>
         <source>Disable private keys for this wallet. Wallets with private keys disabled will have no private keys and cannot have an HD seed or imported private keys. This is ideal for watch-only wallets.</source>
         <translation>Zakázať súkromné kľúče pre túto peňaženku. Peňaženky so zakázanými súkromnými kľúčmi nebudú mať žiadne súkromné kľúče a nemôžu mať HD pôvod ani importované súkromné kľúče. Toto je ideálne pre peňaženky, ktoré len sledujete.</translation>
@@ -1023,11 +1158,23 @@
         <source>Make Blank Wallet</source>
         <translation>Vytvoriť prázdnu peňaženku</translation>
     </message>
+    <message>
+        <source>Use descriptors for scriptPubKey management. This feature is well-tested but still considered experimental and not recommended for use yet.</source>
+        <translation>Použiť deskriptory pre správu scriptPubKey. Táto funkcia je dobre otestovaná, ale stále sa považuje za experimentálnu a zatiaľ sa neodporúča na použitie.</translation>
+    </message>
+    <message>
+        <source>Descriptor Wallet (EXPERIMENTAL)</source>
+        <translation>Deskriptorová peňaženka (EXPERIMENTÁLNE)</translation>
+    </message>
     <message>
         <source>Create</source>
         <translation>Vytvoriť</translation>
     </message>
-    </context>
+    <message>
+        <source>Compiled without sqlite support (required for descriptor wallets)</source>
+        <translation>Skompilované bez podpory sqlite (vyžadované pre deskriptorové peňaženky)</translation>
+    </message>
+</context>
 <context>
     <name>EditAddressDialog</name>
     <message>
@@ -1116,18 +1263,106 @@
         <source>Filter List:</source>
         <translation>Filtrovať zoznam:</translation>
     </message>
+    <message>
+        <source>Filter proposal list</source>
+        <translation>Filtrovať zoznam návrhov</translation>
+    </message>
+    <message>
+        <source>Masternode Count:</source>
+        <translation>Počet masternodov:</translation>
+    </message>
+    <message>
+        <source>Number of masternodes this wallet can vote with (masternodes for which this wallet holds the voting key)</source>
+        <translation>Počet masternodov, ktorými môže táto peňaženka hlasovať (masternody, pre ktoré táto peňaženka drží hlasovací kľúč)</translation>
+    </message>
     <message>
         <source>Proposal Count:</source>
         <translation>Počet návrhov:</translation>
     </message>
+    <message>
+        <source>Create Proposal</source>
+        <translation>Vytvoriť návrh</translation>
+    </message>
     <message>
         <source>Filter by Title</source>
         <translation>Filtrovať podľa názvu</translation>
     </message>
+    <message>
+        <source>Unavailable</source>
+        <translation>Nedostupné</translation>
+    </message>
+    <message>
+        <source>A synced node and an unlocked wallet are required.</source>
+        <translation>Vyžaduje sa synchronizovaný uzol a odomknutá peňaženka.</translation>
+    </message>
+    <message>
+        <source>Vote Yes</source>
+        <translation>Hlasovať áno</translation>
+    </message>
+    <message>
+        <source>Vote No</source>
+        <translation>Hlasovať nie</translation>
+    </message>
+    <message>
+        <source>Vote Abstain</source>
+        <translation>Zdržať sa hlasovania</translation>
+    </message>
     <message>
         <source>Proposal Info: %1</source>
         <translation>Informácie o návrhu: %1</translation>
     </message>
+    <message>
+        <source>Voting Failed</source>
+        <translation>Hlasovanie zlyhalo</translation>
+    </message>
+    <message>
+        <source>No wallet available.</source>
+        <translation>Žiadna peňaženka nie je k dispozícii.</translation>
+    </message>
+    <message>
+        <source>No masternode voting keys found in wallet.</source>
+        <translation>V peňaženke sa nenašli žiadne hlasovacie kľúče masternodov.</translation>
+    </message>
+    <message>
+        <source>Please select a proposal to vote on.</source>
+        <translation>Prosím, vyberte návrh na hlasovanie.</translation>
+    </message>
+    <message>
+        <source>Unable to unlock wallet.</source>
+        <translation>Nie je možné odomknúť peňaženku.</translation>
+    </message>
+    <message>
+        <source>Unable to get masternode list. Please try again later.</source>
+        <translation>Nie je možné získať zoznam masternodov. Prosím, skúste to neskôr.</translation>
+    </message>
+    <message>
+        <source>Masternode %1 not found</source>
+        <translation>Masternód %1 sa nenašiel</translation>
+    </message>
+    <message>
+        <source>Failed to sign vote for masternode %1</source>
+        <translation>Nepodarilo sa podpísať hlasovanie pre masternód %1</translation>
+    </message>
+    <message>
+        <source>Masternode %1: %2</source>
+        <translation>Masternód %1: %2</translation>
+    </message>
+    <message numerus="yes">
+        <source>Voted successfully %n time(s)</source>
+        <translation><numerusform>Úspešne hlasované %n krát</numerusform><numerusform>Úspešne hlasované %n krát</numerusform><numerusform>Úspešne hlasované %n krát</numerusform><numerusform>Úspešne hlasované %n krát</numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <source>Failed to vote %n time(s)</source>
+        <translation><numerusform>Nepodarilo sa hlasovať %n krát</numerusform><numerusform>Nepodarilo sa hlasovať %n krát</numerusform><numerusform>Nepodarilo sa hlasovať %n krát</numerusform><numerusform>Nepodarilo sa hlasovať %n krát</numerusform></translation>
+    </message>
+    <message>
+        <source>Errors:</source>
+        <translation>Chyby:</translation>
+    </message>
+    <message>
+        <source>Voting Results</source>
+        <translation>Výsledky hlasovania</translation>
+    </message>
 </context>
 <context>
     <name>HelpMessageDialog</name>
@@ -1166,10 +1401,26 @@
         <source>As this is the first time the program is launched, you can choose where %1 will store its data.</source>
         <translation>Keďže toto je prvé spustenie programu, môžete si vybrať, kam %1 bude ukladať vaše údaje.</translation>
     </message>
+    <message>
+        <source>Limit block chain storage to</source>
+        <translation>Obmedziť úložisko blockchainu na</translation>
+    </message>
+    <message>
+        <source>Reverting this setting requires re-downloading the entire blockchain. It is faster to download the full chain first and prune it later. Disables some advanced features.</source>
+        <translation>Vrátenie tohto nastavenia vyžaduje opätovné stiahnutie celého blockchainu. Je rýchlejšie najprv stiahnuť celý reťazec a neskôr ho orezať. Zakáže niektoré pokročilé funkcie.</translation>
+    </message>
+    <message>
+        <source> GB</source>
+        <translation> GB</translation>
+    </message>
     <message>
         <source>This initial synchronisation is very demanding, and may expose hardware problems with your computer that had previously gone unnoticed. Each time you run %1, it will continue downloading where it left off.</source>
         <translation>Počiatočná synchronizácia je veľmi náročná a môže odhaliť hardvérové problémy vo vašom počítači o ktorých ste do teraz nevedeli. Vždy keď zapnete %1 tak sa sťahovanie začne presne tam kde bolo pred vypnutím.</translation>
     </message>
+    <message>
+        <source>When you click OK, %1 will begin to download and process the full %4 block chain (%2 GB) starting with the earliest transactions in %3 when %4 initially launched.</source>
+        <translation>Keď kliknete na OK, %1 začne sťahovať a spracovávať úplný %4 blockchain (%2 GB), počnúc najstaršími transakciami v %3, keď bol %4 pôvodne spustený.</translation>
+    </message>
     <message>
         <source>If you have chosen to limit block chain storage (pruning), the historical data must still be downloaded and processed, but will be deleted afterward to keep your disk usage low.</source>
         <translation>Keď ste si vybrali limit na uloženie blockchainu (zmenšenie) tak sa historické dáta budú musieť aj tak stiahnuť a spracovať, ale potom budú zmazané aby sa používanie disku znížilo.</translation>
@@ -1182,6 +1433,18 @@
         <source>Use a custom data directory:</source>
         <translation>Použiť vlastný dátový adresár:</translation>
     </message>
+    <message numerus="yes">
+        <source>%n GB of space available</source>
+        <translation><numerusform>%n GB dostupného miesta</numerusform><numerusform>%n GB dostupného miesta</numerusform><numerusform>%n GB dostupného miesta</numerusform><numerusform>%n GB dostupného miesta</numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <source>(of %n GB needed)</source>
+        <translation><numerusform>(z %n GB potrebného)</numerusform><numerusform>(z %n GB potrebných)</numerusform><numerusform>(z %n GB potrebných)</numerusform><numerusform>(z %n GB potrebných)</numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <source>(%n GB needed for full chain)</source>
+        <translation><numerusform>(%n GB potrebný pre úplný reťazec)</numerusform><numerusform>(%n GB potrebné pre úplný reťazec)</numerusform><numerusform>(%n GB potrebných pre úplný reťazec)</numerusform><numerusform>(%n GB potrebných pre úplný reťazec)</numerusform></translation>
+    </message>
     <message>
         <source>At least %1 GB of data will be stored in this directory, and it will grow over time.</source>
         <translation>V tomto adresári bude uložené minimálne %1 GB dát, časom sa využité dáta zvýšia.</translation>
@@ -1190,6 +1453,11 @@
         <source>Approximately %1 GB of data will be stored in this directory.</source>
         <translation>V tomto adresári bude uložených približne %1 GB dát.</translation>
     </message>
+    <message numerus="yes">
+        <source>(sufficient to restore backups %n day(s) old)</source>
+        <extracomment>Explanatory text on the capability of the current prune target.</extracomment>
+        <translation><numerusform>(dostačujúce na obnovenie %n deň starých záloh)</numerusform><numerusform>(dostačujúce na obnovenie %n dni starých záloh)</numerusform><numerusform>(dostačujúce na obnovenie %n dní starých záloh)</numerusform><numerusform>(dostačujúce na obnovenie %n dní starých záloh)</numerusform></translation>
+    </message>
     <message>
         <source>%1 will download and store a copy of the Dash block chain.</source>
         <translation>%1 stiahne a bude uchovávať kópiu Dash blockchainu.</translation>
@@ -1207,6 +1475,13 @@
         <translation>Chyba</translation>
     </message>
 </context>
+<context>
+    <name>LoadWalletsActivity</name>
+    <message>
+        <source>Loading wallets…</source>
+        <translation>Načítavanie peňaženiek…</translation>
+    </message>
+</context>
 <context>
     <name>MasternodeList</name>
     <message>
@@ -1241,6 +1516,10 @@
         <source>Service</source>
         <translation>Služba</translation>
     </message>
+    <message>
+        <source>Type</source>
+        <translation>Typ</translation>
+    </message>
     <message>
         <source>PoSe Score</source>
         <translation>PoSe skóre</translation>
@@ -1376,6 +1655,10 @@
         <source>Hide</source>
         <translation>Skryť</translation>
     </message>
+    <message>
+        <source>%1 is currently syncing.  It will download headers and blocks from peers and validate them until reaching the tip of the block chain.</source>
+        <translation>%1 sa momentálne synchronizuje. Sťahuje hlavičky a bloky od peerov a overuje ich, kým nedosiahne koniec blockchainu.</translation>
+    </message>
     <message>
         <source>Unknown. Syncing Headers (%1, %2%)…</source>
         <translation>Neznáme. Synchronizujú sa hlavičky (%1, %2%)…</translation>
@@ -1391,6 +1674,11 @@
         <source>URI:</source>
         <translation>URI:</translation>
     </message>
+    <message>
+        <source>Paste address from clipboard</source>
+        <extracomment>Tooltip text for button that allows you to paste an address that is in your clipboard.</extracomment>
+        <translation>Vložiť adresu zo schránky</translation>
+    </message>
 </context>
 <context>
     <name>OpenWalletActivity</name>
@@ -1406,8 +1694,14 @@
         <source>default wallet</source>
         <translation>predvolená peňaženka</translation>
     </message>
+    <message>
+        <source>Open Wallet</source>
+        <extracomment>Title of window indicating the progress of opening of a wallet.</extracomment>
+        <translation>Otvoriť peňaženku</translation>
+    </message>
     <message>
         <source>Opening Wallet &lt;b&gt;%1&lt;/b&gt;…</source>
+        <extracomment>Descriptive text of the open wallet progress window which indicates to the user which wallet is currently being opened.</extracomment>
         <translation>Otvára sa peňaženka &lt;b&gt;%1&lt;/b&gt;…</translation>
     </message>
 </context>
@@ -1441,6 +1735,14 @@
         <source>&amp;Appearance</source>
         <translation>&amp;Vzhľad</translation>
     </message>
+    <message>
+        <source>Show the icon in the system tray.</source>
+        <translation>Zobraziť ikonu v systémovej lište.</translation>
+    </message>
+    <message>
+        <source>&amp;Show tray icon</source>
+        <translation>&amp;Zobraziť ikonu v lište</translation>
+    </message>
     <message>
         <source>Prune &amp;block storage to</source>
         <translation>Orezať blok úložiska na</translation>
@@ -1453,10 +1755,58 @@
         <source>Reverting this setting requires re-downloading the entire blockchain.</source>
         <translation>Vrátenie tohto nastavenia si vyžaduje opätovné stiahnutie celého blockchainu.</translation>
     </message>
+    <message>
+        <source>Maximum database cache size. A larger cache can contribute to faster sync, after which the benefit is less pronounced for most use cases. Lowering the cache size will reduce memory usage. Unused mempool memory is shared for this cache.</source>
+        <extracomment>Tooltip text for Options window setting that sets the size of the database cache. Explains the corresponding effects of increasing/decreasing this value.</extracomment>
+        <translation>Maximálna veľkosť cache databázy. Väčšia cache môže prispieť k rýchlejšej synchronizácii, po ktorej je prínos pre väčšinu prípadov použitia menej výrazný. Zníženie veľkosti cache zníži využitie pamäte. Nepoužitá pamäť mempoolu je zdieľaná pre túto cache.</translation>
+    </message>
     <message>
         <source>MiB</source>
         <translation>MiB</translation>
     </message>
+    <message>
+        <source>Set the number of script verification threads. Negative values correspond to the number of cores you want to leave free to the system.</source>
+        <extracomment>Tooltip text for Options window setting that sets the number of script verification threads. Explains that negative values mean to leave these many cores free to the system.</extracomment>
+        <translation>Nastavte počet vlákien na overovanie skriptov. Záporné hodnoty zodpovedajú počtu jadier, ktoré chcete ponechať voľné pre systém.</translation>
+    </message>
+    <message>
+        <source>This allows you or a third party tool to communicate with the node through command-line and JSON-RPC commands.</source>
+        <extracomment>Tooltip text for Options window setting that enables the RPC server.</extracomment>
+        <translation>Toto umožňuje vám alebo nástroju tretej strany komunikovať s uzlom prostredníctvom príkazového riadku a JSON-RPC príkazov.</translation>
+    </message>
+    <message>
+        <source>Enable R&amp;PC server</source>
+        <extracomment>An Options window setting to enable the RPC server.</extracomment>
+        <translation>Povoliť R&amp;PC server</translation>
+    </message>
+    <message>
+        <source>Whether to set subtract fee from amount as default or not.</source>
+        <extracomment>Tooltip text for Options window setting that sets subtracting the fee from a sending amount as default.</extracomment>
+        <translation>Či nastaviť odpočítanie poplatku zo sumy ako predvolené alebo nie.</translation>
+    </message>
+    <message>
+        <source>Subtract &amp;fee from amount by default</source>
+        <extracomment>An Options window setting to set subtracting the fee from a sending amount as default.</extracomment>
+        <translation>Predvolene odpočítať &amp;poplatok zo sumy</translation>
+    </message>
+    <message>
+        <source>Enable &amp;PSBT controls</source>
+        <extracomment>An options window setting to enable PSBT controls.</extracomment>
+        <translation>Povoliť ovládacie prvky &amp;PSBT</translation>
+    </message>
+    <message>
+        <source>Whether to show PSBT controls.</source>
+        <extracomment>Tooltip text for options window setting that enables PSBT controls.</extracomment>
+        <translation>Či zobraziť ovládacie prvky PSBT.</translation>
+    </message>
+    <message>
+        <source>Whether to keep the specified custom change address or not.</source>
+        <translation>Či ponechať zadanú vlastnú adresu pre výdavok alebo nie.</translation>
+    </message>
+    <message>
+        <source>Keep custom change &amp;address</source>
+        <translation>Ponechať vlastnú &amp;adresu pre výdavok</translation>
+    </message>
     <message>
         <source>Show additional tab listing all your masternodes in first sub-tab&lt;br/&gt;and all masternodes on the network in second sub-tab.</source>
         <translation>Zobraziť dodatočnú záložku, ktorá vypíše všetky vaše masternódy v prvej pod-zložke&lt;br/&gt;- a všetky masternódy v druhej pod-zložke. </translation>
@@ -1513,6 +1863,14 @@
         <source>Enable &amp;multi-session</source>
         <translation>Zapnúť &amp;multi-sekciové</translation>
     </message>
+    <message>
+        <source>Use this many separate masternodes in parallel to mix funds.&lt;br/&gt;Note: You must use this feature carefully.&lt;br/&gt;Make sure you always have recent wallet (auto)backup in a safe place!</source>
+        <translation>Použite toľko oddelených masternódov paralelne na miešanie prostriedkov.&lt;br/&gt;Poznámka: Túto funkciu musíte používať opatrne.&lt;br/&gt;Uistite sa, že máte vždy aktuálnu (automatickú) zálohu peňaženky na bezpečnom mieste!</translation>
+    </message>
+    <message>
+        <source>Parallel sessions</source>
+        <translation>Paralelné relácie</translation>
+    </message>
     <message>
         <source>Mixing rounds</source>
         <translation>Miešacie kolá</translation>
@@ -1525,6 +1883,30 @@
         <source>Target balance</source>
         <translation>Cieľový zostatok</translation>
     </message>
+    <message>
+        <source>How many inputs of each denominated amount are created.&lt;br/&gt;Lower these numbers if you want fewer smaller denominations.</source>
+        <translation>Koľko vstupov každej denominovanej čiastky sa vytvorí.&lt;br/&gt;Znížte tieto čísla, ak chcete menej menších denominácií.</translation>
+    </message>
+    <message>
+        <source>Inputs per denomination</source>
+        <translation>Vstupy na denomináciu</translation>
+    </message>
+    <message>
+        <source>Try to create at least this many inputs for each denominated amount.&lt;br/&gt;Lower this number if you want fewer smaller denominations.</source>
+        <translation>Pokúsiť sa vytvoriť aspoň toľko vstupov pre každú denominovanú čiastku.&lt;br/&gt;Znížte toto číslo, ak chcete menej menších denominácií.</translation>
+    </message>
+    <message>
+        <source>Target</source>
+        <translation>Cieľ</translation>
+    </message>
+    <message>
+        <source>Create up to this many inputs for each denominated amount.&lt;br/&gt;Lower this number if you want fewer smaller denominations.</source>
+        <translation>Vytvoriť až toľko vstupov pre každú denominovanú čiastku.&lt;br/&gt;Znížte toto číslo, ak chcete menej menších denominácií.</translation>
+    </message>
+    <message>
+        <source>Maximum</source>
+        <translation>Maximum</translation>
+    </message>
     <message>
         <source>Automatically open the Dash Core client port on the router. This only works when your router supports UPnP and it is enabled.</source>
         <translation>Automaticky otvoriť na smerovači port pre Dash Core klient. Toto funguje iba ak váš smerovač  podporuje UPnP a je povolené</translation>
@@ -1554,20 +1936,26 @@
         <translation>Zobrazuje či je poskytované predvolené SOCKS5 proxy používané pre získavanie peerov cez tento typ siete.</translation>
     </message>
     <message>
-        <source>Options set in this dialog are overridden by the command line or in the configuration file:</source>
-        <translation>Možnosti nastavené v tomto dialógovom okne sú prepísané príkazovým riadkom alebo v konfiguračnom súbore:</translation>
+        <source>Language missing or translation incomplete? Help contributing translations here:
+https://explore.transifex.com/dash/dash/</source>
+        <translation>Chýba jazyk alebo je preklad neúplný? Pomôžte s prekladom tu:
+https://explore.transifex.com/dash/dash/</translation>
     </message>
     <message>
-        <source>Minimize instead of exit the application when the window is closed. When this option is enabled, the application will be closed only after selecting Exit in the menu.</source>
-        <translation>Minimalizovať namiesto ukončenia aplikácie keď sa okno zavrie. Keď je zvolená táto možnosť, aplikácia sa zavrie len po zvolení Ukončiť v menu.</translation>
+        <source>Third-party URLs (e.g. a block explorer) that appear in the transactions tab as context menu items.&lt;br/&gt;%s in the URL is replaced by transaction hash. Multiple URLs are separated by vertical bar |.</source>
+        <translation>URL adresy tretích strán (napr. prehliadač blokov), ktoré sa zobrazujú na záložke transakcií ako položky kontextového menu.&lt;br/&gt;%s v URL sa nahrádza hašom transakcie. Viacero URL je oddelených zvislou čiarou |.</translation>
     </message>
     <message>
-        <source>Third party URLs (e.g. a block explorer) that appear in the transactions tab as context menu items.&lt;br/&gt;%s in the URL is replaced by transaction hash. Multiple URLs are separated by vertical bar |.</source>
-        <translation>URL tretích strán (napr. prehliadač blockchain) ktoré sa zobrazujú v záložke transakcií ako položky kontextového menu.&lt;br/&gt; %s v URL je nahradené hash-om transakcie. Viaceré URL sú oddelené zvislou čiarou |.</translation>
+        <source>&amp;Third-party transaction URLs</source>
+        <translation>&amp;URL adresy transakcií tretích strán</translation>
     </message>
     <message>
-        <source>&amp;Third party transaction URLs</source>
-        <translation>&amp;URL transakcií s tretími stranami</translation>
+        <source>Options set in this dialog are overridden by the command line or in the configuration file:</source>
+        <translation>Možnosti nastavené v tomto dialógovom okne sú prepísané príkazovým riadkom alebo v konfiguračnom súbore:</translation>
+    </message>
+    <message>
+        <source>Minimize instead of exit the application when the window is closed. When this option is enabled, the application will be closed only after selecting Exit in the menu.</source>
+        <translation>Minimalizovať namiesto ukončenia aplikácie keď sa okno zavrie. Keď je zvolená táto možnosť, aplikácia sa zavrie len po zvolení Ukončiť v menu.</translation>
     </message>
     <message>
         <source>Whether to show coin control features or not.</source>
@@ -1605,6 +1993,10 @@
         <source>Map port using &amp;UPnP</source>
         <translation>Mapovať port pomocou &amp;UPnP</translation>
     </message>
+    <message>
+        <source>Automatically open the Dash Core client port on the router. This only works when your router supports NAT-PMP and it is enabled. The external port could be random.</source>
+        <translation>Automaticky otvoriť na smerovači port pre Dash Core klient. Toto funguje iba ak váš smerovač podporuje NAT-PMP a je povolené. Externý port môže byť náhodný.</translation>
+    </message>
     <message>
         <source>Proxy &amp;IP:</source>
         <translation>Proxy &amp;IP:</translation>
@@ -1653,6 +2045,14 @@
         <source>&amp;Display</source>
         <translation>&amp;Zobrazenie</translation>
     </message>
+    <message>
+        <source>Connect to the Dash network through a separate SOCKS5 proxy for Tor onion services.</source>
+        <translation>Pripojiť sa k sieti Dash cez samostatné SOCKS5 proxy pre Tor onion služby.</translation>
+    </message>
+    <message>
+        <source>Use separate SOCKS&amp;5 proxy to reach peers via Tor onion services:</source>
+        <translation>Použiť samostatné SOCKS&amp;5 proxy pre dosiahnutie peerov cez Tor onion služby:</translation>
+    </message>
     <message>
         <source>User Interface &amp;language:</source>
         <translation>&amp;Jazyk užívateľského rozhrania:</translation>
@@ -1699,14 +2099,22 @@
     </message>
     <message>
         <source>Confirm options reset</source>
+        <extracomment>Window title text of pop-up window shown when the user has chosen to reset options.</extracomment>
         <translation>Potvrdiť obnovenie možností</translation>
     </message>
     <message>
         <source>Client restart required to activate changes.</source>
+        <extracomment>Text explaining that the settings changed will not come into effect until the client is restarted.</extracomment>
         <translation>Reštart klienta potrebný pre aktivovanie zmien.</translation>
     </message>
+    <message>
+        <source>Current settings will be backed up at "%1".</source>
+        <extracomment>Text explaining to the user that the client's current settings will be backed up at a specific location. %1 is a stand-in argument for the backup location's path.</extracomment>
+        <translation>Aktuálne nastavenia budú zálohované v "%1".</translation>
+    </message>
     <message>
         <source>Client will be shut down. Do you want to proceed?</source>
+        <extracomment>Text asking the user to confirm if they would like to proceed with a client shutdown.</extracomment>
         <translation>Klient bude vypnutý, chcete pokračovať?</translation>
     </message>
     <message>
@@ -1844,6 +2252,10 @@
         <source>%1 Balance</source>
         <translation>%1 Zostatok</translation>
     </message>
+    <message>
+        <source>Discreet mode activated for the Overview tab. To unmask the values, uncheck Settings-&gt;Discreet mode.</source>
+        <translation>Diskrétny režim aktivovaný pre záložku Prehľad. Ak chcete zobraziť hodnoty, zrušte začiarknutie Nastavenia-&gt;Diskrétny režim.</translation>
+    </message>
     <message numerus="yes">
         <source>%n Rounds</source>
         <translation><numerusform>%n kolo</numerusform><numerusform>%n kolá</numerusform><numerusform>%n kôl</numerusform><numerusform>%n kôl</numerusform></translation>
@@ -1943,7 +2355,140 @@
 </context>
 <context>
     <name>PSBTOperationsDialog</name>
-    </context>
+    <message>
+        <source>Dialog</source>
+        <translation>Dialóg</translation>
+    </message>
+    <message>
+        <source>Sign Tx</source>
+        <translation>Podpísať Tx</translation>
+    </message>
+    <message>
+        <source>Broadcast Tx</source>
+        <translation>Vysielať Tx</translation>
+    </message>
+    <message>
+        <source>Copy to Clipboard</source>
+        <translation>Kopírovať do schránky</translation>
+    </message>
+    <message>
+        <source>Save…</source>
+        <translation>Uložiť…</translation>
+    </message>
+    <message>
+        <source>Close</source>
+        <translation>Zavrieť</translation>
+    </message>
+    <message>
+        <source>Failed to load transaction: %1</source>
+        <translation>Nepodarilo sa načítať transakciu: %1</translation>
+    </message>
+    <message>
+        <source>Failed to sign transaction: %1</source>
+        <translation>Nepodarilo sa podpísať transakciu: %1</translation>
+    </message>
+    <message>
+        <source>Cannot sign inputs while wallet is locked.</source>
+        <translation>Nie je možné podpísať vstupy, kým je peňaženka zamknutá.</translation>
+    </message>
+    <message>
+        <source>Could not sign any more inputs.</source>
+        <translation>Nie je možné podpísať viac vstupov.</translation>
+    </message>
+    <message>
+        <source>Signed %1 inputs, but more signatures are still required.</source>
+        <translation>Podpísané %1 vstupy, ale stále sú potrebné ďalšie podpisy.</translation>
+    </message>
+    <message>
+        <source>Signed transaction successfully. Transaction is ready to broadcast.</source>
+        <translation>Transakcia úspešne podpísaná. Transakcia je pripravená na vysielanie.</translation>
+    </message>
+    <message>
+        <source>Unknown error processing transaction.</source>
+        <translation>Neznáma chyba pri spracovaní transakcie.</translation>
+    </message>
+    <message>
+        <source>Transaction broadcast successfully! Transaction ID: %1</source>
+        <translation>Transakcia úspešne vysielaná! ID transakcie: %1</translation>
+    </message>
+    <message>
+        <source>Transaction broadcast failed: %1</source>
+        <translation>Vysielanie transakcie zlyhalo: %1</translation>
+    </message>
+    <message>
+        <source>PSBT copied to clipboard.</source>
+        <translation>PSBT skopírované do schránky.</translation>
+    </message>
+    <message>
+        <source>Save Transaction Data</source>
+        <translation>Uložiť údaje transakcie</translation>
+    </message>
+    <message>
+        <source>Partially Signed Transaction (Binary)</source>
+        <extracomment>Expanded name of the binary PSBT file format. See: BIP 174.</extracomment>
+        <translation>Čiastočne podpísaná transakcia (binárna)</translation>
+    </message>
+    <message>
+        <source>PSBT saved to disk.</source>
+        <translation>PSBT uložené na disk.</translation>
+    </message>
+    <message>
+        <source> * Sends %1 to %2</source>
+        <translation> * Posiela %1 na %2</translation>
+    </message>
+    <message>
+        <source>own address</source>
+        <translation>vlastná adresa</translation>
+    </message>
+    <message>
+        <source>Unable to calculate transaction fee or total transaction amount.</source>
+        <translation>Nie je možné vypočítať transakčný poplatok alebo celkovú sumu transakcie.</translation>
+    </message>
+    <message>
+        <source>Pays transaction fee: </source>
+        <translation>Platí transakčný poplatok: </translation>
+    </message>
+    <message>
+        <source>Total Amount</source>
+        <translation>Celková suma</translation>
+    </message>
+    <message>
+        <source>or</source>
+        <translation>alebo</translation>
+    </message>
+    <message>
+        <source>Transaction has %1 unsigned inputs.</source>
+        <translation>Transakcia má %1 nepodpísaných vstupov.</translation>
+    </message>
+    <message>
+        <source>Transaction is missing some information about inputs.</source>
+        <translation>V transakcii chýbajú niektoré informácie o vstupoch.</translation>
+    </message>
+    <message>
+        <source>Transaction still needs signature(s).</source>
+        <translation>Transakcia stále potrebuje podpis(y).</translation>
+    </message>
+    <message>
+        <source>(But no wallet is loaded.)</source>
+        <translation>(Ale nie je načítaná žiadna peňaženka.)</translation>
+    </message>
+    <message>
+        <source>(But this wallet cannot sign transactions.)</source>
+        <translation>(Ale táto peňaženka nemôže podpisovať transakcie.)</translation>
+    </message>
+    <message>
+        <source>(But this wallet does not have the right keys.)</source>
+        <translation>(Ale táto peňaženka nemá správne kľúče.)</translation>
+    </message>
+    <message>
+        <source>Transaction is fully signed and ready for broadcast.</source>
+        <translation>Transakcia je úplne podpísaná a pripravená na vysielanie.</translation>
+    </message>
+    <message>
+        <source>Transaction status is unknown.</source>
+        <translation>Stav transakcie je neznámy.</translation>
+    </message>
+</context>
 <context>
     <name>PaymentServer</name>
     <message>
@@ -1962,6 +2507,12 @@
         <source>'dash://' is not a valid URI. Use 'dash:' instead.</source>
         <translation>„dash://“ nie je platný URI. Namiesto toho použite „dash:“.</translation>
     </message>
+    <message>
+        <source>Cannot process payment request as BIP70 is no longer supported.
+Due to discontinued support, you should request the merchant to provide you with a BIP21 compatible URI or use a wallet that does continue to support BIP70.</source>
+        <translation>Nie je možné spracovať požiadavku na platbu, pretože BIP70 už nie je podporovaný.
+Kvôli ukončeniu podpory by ste mali požiadať obchodníka, aby vám poskytol URI kompatibilné s BIP21, alebo použite peňaženku, ktorá naďalej podporuje BIP70.</translation>
+    </message>
     <message>
         <source>URI cannot be parsed! This can be caused by an invalid Dash address or malformed URI parameters.</source>
         <translation>URI sa nedá analyzovať! Toto môže byť spôsobené neplatnou Dash adresou, alebo nesprávnym tvarom URI parametrov.</translation>
@@ -1983,6 +2534,26 @@
         <extracomment>Title of Peers Table column which indicates the current latency of the connection with the peer.</extracomment>
         <translation>Odozva</translation>
     </message>
+    <message>
+        <source>Peer</source>
+        <extracomment>Title of Peers Table column which contains a unique number used to identify a connection.</extracomment>
+        <translation>Peer</translation>
+    </message>
+    <message>
+        <source>Age</source>
+        <extracomment>Title of Peers Table column which indicates the duration (length of time) since the peer connection started.</extracomment>
+        <translation>Vek</translation>
+    </message>
+    <message>
+        <source>Direction</source>
+        <extracomment>Title of Peers Table column which indicates the direction the peer connection was initiated from.</extracomment>
+        <translation>Smer</translation>
+    </message>
+    <message>
+        <source>Type</source>
+        <extracomment>Title of Peers Table column which describes the type of peer connection. The "type" describes why the connection exists.</extracomment>
+        <translation>Typ</translation>
+    </message>
     <message>
         <source>Sent</source>
         <extracomment>Title of Peers Table column which indicates the total amount of network information we have sent to the peer.</extracomment>
@@ -1993,7 +2564,27 @@
         <extracomment>Title of Peers Table column which indicates the total amount of network information we have received from the peer.</extracomment>
         <translation>Prijaté</translation>
     </message>
-    </context>
+    <message>
+        <source>Address</source>
+        <extracomment>Title of Peers Table column which contains the IP/Onion/I2P address of the connected peer.</extracomment>
+        <translation>Adresa</translation>
+    </message>
+    <message>
+        <source>Network</source>
+        <extracomment>Title of Peers Table column which states the network the peer connected through.</extracomment>
+        <translation>Sieť</translation>
+    </message>
+    <message>
+        <source>Inbound</source>
+        <extracomment>An Inbound Connection from a Peer.</extracomment>
+        <translation>Prichádzajúce</translation>
+    </message>
+    <message>
+        <source>Outbound</source>
+        <extracomment>An Outbound Connection to a Peer.</extracomment>
+        <translation>Odchádzajúce</translation>
+    </message>
+</context>
 <context>
     <name>Proposal</name>
     <message>
@@ -2044,8 +2635,193 @@
         <translation>Stav</translation>
     </message>
 </context>
+<context>
+    <name>ProposalWizard</name>
+    <message>
+        <source>Create Governance Proposal</source>
+        <translation>Vytvoriť návrh správy</translation>
+    </message>
+    <message>
+        <source>Enter proposal details</source>
+        <translation>Zadajte podrobnosti návrhu</translation>
+    </message>
+    <message>
+        <source>A fee will be burned when you prepare the proposal.</source>
+        <translation>Pri príprave návrhu bude spálený poplatok.</translation>
+    </message>
+    <message>
+        <source>Proposal &amp;name</source>
+        <translation>&amp;Názov návrhu</translation>
+    </message>
+    <message>
+        <source>&amp;Description URL</source>
+        <translation>&amp;URL s popisom</translation>
+    </message>
+    <message>
+        <source>Payment &amp;address</source>
+        <translation>Platobná &amp;adresa</translation>
+    </message>
+    <message>
+        <source>Payment &amp;amount</source>
+        <translation>&amp;Suma platby</translation>
+    </message>
+    <message>
+        <source>The amount to request in a single payment</source>
+        <translation>Suma, ktorú chcete požiadať v jednej platbe</translation>
+    </message>
+    <message>
+        <source>&amp;First payment</source>
+        <translation>&amp;Prvá platba</translation>
+    </message>
+    <message>
+        <source>Pa&amp;yments</source>
+        <translation>Pla&amp;tby</translation>
+    </message>
+    <message>
+        <source>To&amp;tal amount</source>
+        <translation>Cel&amp;ková suma</translation>
+    </message>
+    <message>
+        <source>Proposal &amp;fee</source>
+        <translation>Poplatok za &amp;návrh</translation>
+    </message>
+    <message>
+        <source>Next</source>
+        <translation>Ďalej</translation>
+    </message>
+    <message>
+        <source>Review proposal JSON and validate.</source>
+        <translation>Skontrolujte JSON návrhu a overte.</translation>
+    </message>
+    <message>
+        <source>Hex-encoded JSON</source>
+        <translation>Hex-kódovaný JSON</translation>
+    </message>
+    <message>
+        <source>Back</source>
+        <translation>Späť</translation>
+    </message>
+    <message>
+        <source>Validate</source>
+        <translation>Overiť</translation>
+    </message>
+    <message>
+        <source>Prepare (burn fee) and wait for confirmations.</source>
+        <translation>Pripraviť (spáliť poplatok) a čakať na potvrdenia.</translation>
+    </message>
+    <message>
+        <source>Copy</source>
+        <translation>Kopírovať</translation>
+    </message>
+    <message>
+        <source>At 1/6 confirmations: can be relayed and queued. At 6/6: accepted and processed.</source>
+        <translation>Pri 1/6 potvrdeniach: môže byť preposlaný a zaradený do fronty. Pri 6/6: akceptovaný a spracovaný.</translation>
+    </message>
+    <message>
+        <source>Confirmations progress</source>
+        <translation>Priebeh potvrdení</translation>
+    </message>
+    <message>
+        <source>Shows progress toward the required number of confirmations for the proposal fee transaction.</source>
+        <translation>Zobrazuje pokrok smerom k požadovanému počtu potvrdení pre transakciu poplatku návrhu.</translation>
+    </message>
+    <message>
+        <source>Estimated time remaining: -</source>
+        <translation>Odhadovaný zostávajúci čas: -</translation>
+    </message>
+    <message>
+        <source>Prepare Proposal</source>
+        <translation>Pripraviť návrh</translation>
+    </message>
+    <message>
+        <source>You can submit after 1 confirmation. At 6 confirmations it is accepted and processed.</source>
+        <translation>Môžete odoslať po 1 potvrdení. Pri 6 potvrdeniach je akceptovaný a spracovaný.</translation>
+    </message>
+    <message>
+        <source>Proposal ID:</source>
+        <translation>ID návrhu:</translation>
+    </message>
+    <message>
+        <source>Submit Proposal</source>
+        <translation>Odoslať návrh</translation>
+    </message>
+    <message>
+        <source>Close</source>
+        <translation>Zavrieť</translation>
+    </message>
+    <message>
+        <source>Valid</source>
+        <translation>Platný</translation>
+    </message>
+    <message>
+        <source>Invalid: %1</source>
+        <translation>Neplatný: %1</translation>
+    </message>
+    <message>
+        <source>Burn %1</source>
+        <translation>Spáliť %1</translation>
+    </message>
+    <message>
+        <source>Burn %1 to create the fee transaction?</source>
+        <translation>Spáliť %1 na vytvorenie transakcie poplatku?</translation>
+    </message>
+    <message>
+        <source>Prepare failed</source>
+        <translation>Príprava zlyhala</translation>
+    </message>
+    <message>
+        <source>Confirmations: %1 / %2 required</source>
+        <translation>Potvrdenia: %1 / %2 požadovaných</translation>
+    </message>
+    <message>
+        <source>Estimated time remaining: Ready</source>
+        <translation>Odhadovaný zostávajúci čas: Pripravené</translation>
+    </message>
+    <message numerus="yes">
+        <source>Estimated time remaining: %n minute(s)</source>
+        <translation><numerusform>Odhadovaný zostávajúci čas: %n minúta</numerusform><numerusform>Odhadovaný zostávajúci čas: %n minúty</numerusform><numerusform>Odhadovaný zostávajúci čas: %n minút</numerusform><numerusform>Odhadovaný zostávajúci čas: %n minúty</numerusform></translation>
+    </message>
+    <message>
+        <source>Your proposal was submitted successfully.</source>
+        <translation>Váš návrh bol úspešne odoslaný.</translation>
+    </message>
+    <message>
+        <source>Already submitted</source>
+        <translation>Už odoslaný</translation>
+    </message>
+    <message>
+        <source>This proposal has already been submitted.</source>
+        <translation>Tento návrh už bol odoslaný.</translation>
+    </message>
+    <message>
+        <source>Submission failed</source>
+        <translation>Odoslanie zlyhalo</translation>
+    </message>
+    <message>
+        <source>Proposal submitted</source>
+        <translation>Návrh odoslaný</translation>
+    </message>
+    <message>
+        <source>A fee of %1 will be burned when you prepare the proposal.</source>
+        <translation>Pri príprave návrhu bude spálený poplatok vo výške %1.</translation>
+    </message>
+    <message>
+        <source>Prepare (burn %1) and wait for %2 confirmations.</source>
+        <translation>Pripraviť (spáliť %1) a čakať na %2 potvrdení.</translation>
+    </message>
+</context>
 <context>
     <name>QObject</name>
+    <message>
+        <source>Do you want to reset settings to default values, or to abort without making changes?</source>
+        <extracomment>Explanatory text shown on startup when the settings file cannot be read. Prompts user to make a choice between resetting or aborting.</extracomment>
+        <translation>Chcete obnoviť nastavenia na predvolené hodnoty alebo prerušiť bez vykonania zmien?</translation>
+    </message>
+    <message>
+        <source>A fatal error occurred. Check that settings file is writable, or try running with -nosettings.</source>
+        <extracomment>Explanatory text shown on startup when the settings file could not be written. Prompts user to check that we have the ability to write to the file. Explains that the user has the option of running without a settings file.</extracomment>
+        <translation>Vyskytla sa fatálna chyba. Skontrolujte, či je súbor nastavení zapisovateľný, alebo skúste spustiť s -nosettings.</translation>
+    </message>
     <message>
         <source>Choose data directory on startup (default: %u)</source>
         <translation>Vyberte dátový priečinok pri štarte (predvolené: %u)</translation>
@@ -2146,6 +2922,53 @@
         <source>This can also be adjusted later in the "Appearance" tab of the preferences.</source>
         <translation>Toto je tiež možné upraviť neskôr na karte „Vzhľad“ v predvoľbách.</translation>
     </message>
+    <message>
+        <source>Ctrl+W</source>
+        <translation>Ctrl+W</translation>
+    </message>
+    <message>
+        <source>Unroutable</source>
+        <translation>Nesmerovateľné</translation>
+    </message>
+    <message>
+        <source>Internal</source>
+        <translation>Interné</translation>
+    </message>
+    <message>
+        <source>Inbound</source>
+        <extracomment>An inbound connection from a peer. An inbound connection is a connection initiated by a peer.</extracomment>
+        <translation>Prichádzajúce</translation>
+    </message>
+    <message>
+        <source>Outbound</source>
+        <extracomment>An outbound connection to a peer. An outbound connection is a connection initiated by us.</extracomment>
+        <translation>Odchádzajúce</translation>
+    </message>
+    <message>
+        <source>Full Relay</source>
+        <extracomment>Peer connection type that relays all network information.</extracomment>
+        <translation>Úplné preposielanie</translation>
+    </message>
+    <message>
+        <source>Block Relay</source>
+        <extracomment>Peer connection type that relays network information about blocks and not transactions or addresses.</extracomment>
+        <translation>Preposielanie blokov</translation>
+    </message>
+    <message>
+        <source>Manual</source>
+        <extracomment>Peer connection type established manually through one of several methods.</extracomment>
+        <translation>Manuálne</translation>
+    </message>
+    <message>
+        <source>Feeler</source>
+        <extracomment>Short-lived peer connection type that tests the aliveness of known addresses.</extracomment>
+        <translation>Testovací</translation>
+    </message>
+    <message>
+        <source>Address Fetch</source>
+        <extracomment>Short-lived peer connection type that solicits known addresses from a peer.</extracomment>
+        <translation>Získanie adries</translation>
+    </message>
     <message>
         <source>%1 d</source>
         <translation>%1 d</translation>
@@ -2207,8 +3030,8 @@
         <translation>%1 B</translation>
     </message>
     <message>
-        <source>%1 KB</source>
-        <translation>%1 KB</translation>
+        <source>%1 kB</source>
+        <translation>%1 kB</translation>
     </message>
     <message>
         <source>%1 MB</source>
@@ -2264,7 +3087,12 @@
         <source>Save QR Code</source>
         <translation>Uložiť QR kód</translation>
     </message>
-    </context>
+    <message>
+        <source>PNG Image</source>
+        <extracomment>Expanded name of the PNG file format. See: https://en.wikipedia.org/wiki/Portable_Network_Graphics.</extracomment>
+        <translation>PNG obrázok</translation>
+    </message>
+</context>
 <context>
     <name>RPCConsole</name>
     <message>
@@ -2371,6 +3199,14 @@
         <source>Version</source>
         <translation>Verzia</translation>
     </message>
+    <message>
+        <source>High bandwidth BIP152 compact block relay: %1</source>
+        <translation>Vysokorýchlostné preposielanie kompaktných blokov BIP152: %1</translation>
+    </message>
+    <message>
+        <source>High Bandwidth</source>
+        <translation>Vysoká šírka pásma</translation>
+    </message>
     <message>
         <source>Starting Block</source>
         <translation>Počiatočný Blok</translation>
@@ -2383,6 +3219,51 @@
         <source>Synced Blocks</source>
         <translation>Synchronizované bloky</translation>
     </message>
+    <message>
+        <source>Elapsed time since a novel block passing initial validity checks was received from this peer.</source>
+        <translation>Uplynulý čas od prijatia nového bloku, ktorý prešiel počiatočnými kontrolami platnosti, od tohto peera.</translation>
+    </message>
+    <message>
+        <source>Last Block</source>
+        <translation>Posledný blok</translation>
+    </message>
+    <message>
+        <source>Elapsed time since a novel transaction accepted into our mempool was received from this peer.</source>
+        <extracomment>Tooltip text for the Last Transaction field in the peer details area.</extracomment>
+        <translation>Uplynulý čas od prijatia novej transakcie akceptovanej do nášho mempoolu od tohto peera.</translation>
+    </message>
+    <message>
+        <source>Last Transaction</source>
+        <translation>Posledná transakcia</translation>
+    </message>
+    <message>
+        <source>The mapped Autonomous System used for diversifying peer selection.</source>
+        <translation>Mapovaný autonómny systém používaný na diverzifikáciu výberu peerov.</translation>
+    </message>
+    <message>
+        <source>Mapped AS</source>
+        <translation>Mapovaný AS</translation>
+    </message>
+    <message>
+        <source>Whether we relay addresses to this peer.</source>
+        <extracomment>Tooltip text for the Address Relay field in the peer details area, which displays whether we relay addresses to this peer (Yes/No).</extracomment>
+        <translation>Či preposielame adresy tomuto peerovi.</translation>
+    </message>
+    <message>
+        <source>Address Relay</source>
+        <extracomment>Text title for the Address Relay field in the peer details area, which displays whether we relay addresses to this peer (Yes/No).</extracomment>
+        <translation>Preposielanie adries</translation>
+    </message>
+    <message>
+        <source>Addresses Processed</source>
+        <extracomment>Text title for the Addresses Processed field in the peer details area, which displays the total number of addresses received from this peer that were processed (excludes addresses that were dropped due to rate-limiting).</extracomment>
+        <translation>Spracované adresy</translation>
+    </message>
+    <message>
+        <source>Addresses Rate-Limited</source>
+        <extracomment>Text title for the Addresses Rate-Limited field in the peer details area, which displays the total number of addresses received from this peer that were dropped (not processed) due to rate-limiting.</extracomment>
+        <translation>Adresy obmedzené rýchlosťou</translation>
+    </message>
     <message>
         <source>Rescan blockchain files 1</source>
         <translation>Znova prehľadať blockchain 1</translation>
@@ -2423,6 +3304,22 @@
         <source>To specify a non-default location of the blocks directory use the '%1' option.</source>
         <translation>Ak chcete zadať iné ako predvolené umiestnenie adresára blokov, použite voľbu '%1'.</translation>
     </message>
+    <message>
+        <source>Local Addresses</source>
+        <translation>Lokálne adresy</translation>
+    </message>
+    <message>
+        <source>Network addresses that your Dash node is currently using to communicate with other nodes.</source>
+        <translation>Sieťové adresy, ktoré váš Dash uzol momentálne používa na komunikáciu s ostatnými uzlami.</translation>
+    </message>
+    <message>
+        <source>Number of regular Masternodes</source>
+        <translation>Počet bežných masternodov</translation>
+    </message>
+    <message>
+        <source>Number of EvoNodes</source>
+        <translation>Počet EvoNodov</translation>
+    </message>
     <message>
         <source>Current block height</source>
         <translation>Aktuálna výška bloku</translation>
@@ -2471,10 +3368,50 @@
         <source>PoSe Score</source>
         <translation>PoSe skóre</translation>
     </message>
+    <message>
+        <source>The transport layer version: %1</source>
+        <translation>Verzia transportnej vrstvy: %1</translation>
+    </message>
+    <message>
+        <source>Transport</source>
+        <translation>Transport</translation>
+    </message>
+    <message>
+        <source>The BIP324 session ID string in hex.</source>
+        <translation>Reťazec ID relácie BIP324 v hex.</translation>
+    </message>
+    <message>
+        <source>Session ID</source>
+        <translation>ID relácie</translation>
+    </message>
+    <message>
+        <source>The network protocol this peer is connected through: IPv4, IPv6, Onion, I2P, or CJDNS.</source>
+        <translation>Sieťový protokol, cez ktorý je tento peer pripojený: IPv4, IPv6, Onion, I2P alebo CJDNS.</translation>
+    </message>
+    <message>
+        <source>Permissions</source>
+        <translation>Oprávnenia</translation>
+    </message>
+    <message>
+        <source>The direction and type of peer connection: %1</source>
+        <translation>Smer a typ peer pripojenia: %1</translation>
+    </message>
+    <message>
+        <source>Direction/Type</source>
+        <translation>Smer/Typ</translation>
+    </message>
     <message>
         <source>Services</source>
         <translation>Služby</translation>
     </message>
+    <message>
+        <source>Whether we relay transactions to this peer.</source>
+        <translation>Či preposielame transakcie tomuto peerovi.</translation>
+    </message>
+    <message>
+        <source>Transaction Relay</source>
+        <translation>Preposielanie transakcií</translation>
+    </message>
     <message>
         <source>Connection Time</source>
         <translation>Čas pripojenia</translation>
@@ -2511,6 +3448,16 @@
         <source>&amp;Wallet Repair</source>
         <translation>&amp;Oprava peňaženky</translation>
     </message>
+    <message>
+        <source>The total number of addresses received from this peer that were processed (excludes addresses that were dropped due to rate-limiting).</source>
+        <extracomment>Tooltip text for the Addresses Processed field in the peer details area, which displays the total number of addresses received from this peer that were processed (excludes addresses that were dropped due to rate-limiting).</extracomment>
+        <translation>Celkový počet adries prijatých od tohto peera, ktoré boli spracované (nezahŕňa adresy, ktoré boli zahodené kvôli obmedzeniu rýchlosti).</translation>
+    </message>
+    <message>
+        <source>The total number of addresses received from this peer that were dropped (not processed) due to rate-limiting.</source>
+        <extracomment>Tooltip text for the Addresses Rate-Limited field in the peer details area, which displays the total number of addresses received from this peer that were dropped (not processed) due to rate-limiting.</extracomment>
+        <translation>Celkový počet adries prijatých od tohto peera, ktoré boli zahodené (nespracované) kvôli obmedzeniu rýchlosti.</translation>
+    </message>
     <message>
         <source>Wallet repair options.</source>
         <translation>Možnosti opravy peňaženky.</translation>
@@ -2524,52 +3471,82 @@
         <translation>-reindex: Znovu vytvoriť index reťazca blokov zo súčastného blk000??.dat súboru.</translation>
     </message>
     <message>
-        <source>&amp;Disconnect</source>
-        <translation>&amp;Odpojiť</translation>
+        <source>Inbound: initiated by peer</source>
+        <extracomment>Explanatory text for an inbound peer connection.</extracomment>
+        <translation>Prichádzajúce: iniciované peerom</translation>
     </message>
     <message>
-        <source>Ban for</source>
-        <translation>Zakázať na</translation>
+        <source>Outbound Full Relay: default</source>
+        <extracomment>Explanatory text for an outbound peer connection that relays all network information. This is the default behavior for outbound connections.</extracomment>
+        <translation>Odchádzajúce úplné preposielanie: predvolené</translation>
     </message>
     <message>
-        <source>1 &amp;hour</source>
-        <translation>1 &amp;hodina</translation>
+        <source>Outbound Block Relay: does not relay transactions or addresses</source>
+        <extracomment>Explanatory text for an outbound peer connection that relays network information about blocks and not transactions or addresses.</extracomment>
+        <translation>Odchádzajúce preposielanie blokov: nepreposiela transakcie ani adresy</translation>
     </message>
     <message>
-        <source>1 &amp;day</source>
-        <translation>1 &amp;deň</translation>
+        <source>Outbound Manual: added using RPC %1 or %2/%3 configuration options</source>
+        <extracomment>Explanatory text for an outbound peer connection that was established manually through one of several methods. The numbered arguments are stand-ins for the methods available to establish manual connections.</extracomment>
+        <translation>Odchádzajúce manuálne: pridané pomocou RPC %1 alebo %2/%3 konfiguračných možností</translation>
     </message>
     <message>
-        <source>1 &amp;week</source>
-        <translation>1 &amp;týždeň</translation>
+        <source>Outbound Feeler: short-lived, for testing addresses</source>
+        <extracomment>Explanatory text for a short-lived outbound peer connection that is used to test the aliveness of known addresses.</extracomment>
+        <translation>Odchádzajúce kontrolné: krátkodobé, na testovanie adries</translation>
     </message>
     <message>
-        <source>1 &amp;year</source>
-        <translation>1 &amp;rok</translation>
+        <source>Outbound Address Fetch: short-lived, for soliciting addresses</source>
+        <extracomment>Explanatory text for a short-lived outbound peer connection that is used to request addresses from a peer.</extracomment>
+        <translation>Odchádzajúce získavanie adries: krátkodobé, na získavanie adries</translation>
     </message>
     <message>
-        <source>&amp;Unban</source>
-        <translation>&amp;Zrušiť zákaz</translation>
+        <source>To</source>
+        <translation>Do</translation>
     </message>
     <message>
-        <source>Welcome to the %1 RPC console.</source>
-        <translation>Vitajte v %1 RPC konzole</translation>
+        <source>we selected the peer for high bandwidth relay</source>
+        <translation>vybrali sme peera pre vysokorýchlostné preposielanie</translation>
     </message>
     <message>
-        <source>Use up and down arrows to navigate history, and %1 to clear screen.</source>
-        <translation>Použi šipky hore a dolu pre navigáciu históriou a %1 pre vyčistenie obrazovky.</translation>
+        <source>From</source>
+        <translation>Od</translation>
     </message>
     <message>
-        <source>Type %1 for an overview of available commands.</source>
-        <translation>Zadajte %1 a získate prehľad dostupných príkazov.</translation>
+        <source>the peer selected us for high bandwidth relay</source>
+        <translation>peer nás vybral pre vysokorýchlostné preposielanie</translation>
     </message>
     <message>
-        <source>For more information on using this console type %1.</source>
-        <translation>Ďalšie informácie o používaní tejto konzoly získate zadaním %1.</translation>
+        <source>No</source>
+        <translation>Nie</translation>
+    </message>
+    <message>
+        <source>no high bandwidth relay selected</source>
+        <translation>nebolo vybrané žiadne vysokorýchlostné preposielanie</translation>
     </message>
     <message>
-        <source>WARNING: Scammers have been active, telling users to type commands here, stealing their wallet contents. Do not use this console without fully understanding the ramifications of a command.</source>
-        <translation>UPOZORNENIE: Podvodníci sú aktívni a hovoria používateľom, aby sem zadávali príkazy pričom kradnú obsah peňaženky. Nepoužívajte túto konzolu bez úplného pochopenia dopadov takýchto príkazov.</translation>
+        <source>&amp;Disconnect</source>
+        <translation>&amp;Odpojiť</translation>
+    </message>
+    <message>
+        <source>Ban for</source>
+        <translation>Zakázať na</translation>
+    </message>
+    <message>
+        <source>1 &amp;hour</source>
+        <translation>1 &amp;hodina</translation>
+    </message>
+    <message>
+        <source>1 &amp;week</source>
+        <translation>1 &amp;týždeň</translation>
+    </message>
+    <message>
+        <source>1 &amp;year</source>
+        <translation>1 &amp;rok</translation>
+    </message>
+    <message>
+        <source>&amp;Unban</source>
+        <translation>&amp;Zrušiť zákaz</translation>
     </message>
     <message>
         <source>In:</source>
@@ -2583,6 +3560,10 @@
         <source>Network activity disabled</source>
         <translation>Sieťová aktivita zakázaná</translation>
     </message>
+    <message>
+        <source>None</source>
+        <translation>Žiadne</translation>
+    </message>
     <message>
         <source>Total: %1 (Enabled: %2)</source>
         <translation>Celkovo: %1 (Povolené: %2)</translation>
@@ -2591,10 +3572,105 @@
         <source>Executing command without any wallet</source>
         <translation>Vykonávanie príkazu bez akejkoľvek peňaženky</translation>
     </message>
+    <message>
+        <source>Ctrl++</source>
+        <extracomment>Main shortcut to increase the RPC console font size.</extracomment>
+        <translation>Ctrl++</translation>
+    </message>
+    <message>
+        <source>Ctrl+=</source>
+        <extracomment>Secondary shortcut to increase the RPC console font size.</extracomment>
+        <translation>Ctrl+=</translation>
+    </message>
+    <message>
+        <source>Ctrl+-</source>
+        <extracomment>Main shortcut to decrease the RPC console font size.</extracomment>
+        <translation>Ctrl+-</translation>
+    </message>
+    <message>
+        <source>Ctrl+_</source>
+        <extracomment>Secondary shortcut to decrease the RPC console font size.</extracomment>
+        <translation>Ctrl+_</translation>
+    </message>
+    <message>
+        <source>Ctrl+Shift+I</source>
+        <translation>Ctrl+Shift+I</translation>
+    </message>
+    <message>
+        <source>Ctrl+Shift+C</source>
+        <translation>Ctrl+Shift+C</translation>
+    </message>
+    <message>
+        <source>Ctrl+Shift+G</source>
+        <translation>Ctrl+Shift+G</translation>
+    </message>
+    <message>
+        <source>Ctrl+Shift+P</source>
+        <translation>Ctrl+Shift+P</translation>
+    </message>
+    <message>
+        <source>Ctrl+Shift+R</source>
+        <translation>Ctrl+Shift+R</translation>
+    </message>
     <message>
         <source>Executing command using "%1" wallet</source>
         <translation>Vykonávanie príkazu použitím peňaženky "%1"</translation>
     </message>
+    <message>
+        <source>detecting: peer could be v1 or v2</source>
+        <extracomment>Explanatory text for "detecting" transport type.</extracomment>
+        <translation>detekuje sa: peer môže byť v1 alebo v2</translation>
+    </message>
+    <message>
+        <source>v1: unencrypted, plaintext transport protocol</source>
+        <extracomment>Explanatory text for v1 transport type.</extracomment>
+        <translation>v1: nešifrovaný, textový transportný protokol</translation>
+    </message>
+    <message>
+        <source>v2: BIP324 encrypted transport protocol</source>
+        <extracomment>Explanatory text for v2 transport type.</extracomment>
+        <translation>v2: šifrovaný transportný protokol BIP324</translation>
+    </message>
+    <message>
+        <source>&amp;Copy address</source>
+        <extracomment>Context menu action to copy the address of a peer</extracomment>
+        <translation>&amp;Kopírovať adresu</translation>
+    </message>
+    <message>
+        <source>1 d&amp;ay</source>
+        <translation>1 &amp;deň</translation>
+    </message>
+    <message>
+        <source>&amp;Copy IP/Netmask</source>
+        <extracomment>Context menu action to copy the IP/Netmask of a banned peer. IP/Netmask is the combination of a peer's IP address and its Netmask. For IP address see: https://en.wikipedia.org/wiki/IP_address</extracomment>
+        <translation>&amp;Kopírovať IP/sieťovú masku</translation>
+    </message>
+    <message>
+        <source>Welcome to the %1 RPC console.
+Use up and down arrows to navigate history, and %2 to clear screen.
+Use %3 and %4 to increase or decrease the font size.
+Type %5 for an overview of available commands.
+For more information on using this console, type %6.
+
+%7WARNING: Scammers have been active, telling users to type commands here, stealing their wallet contents. Do not use this console without fully understanding the ramifications of a command.%8</source>
+        <extracomment>RPC console welcome message. Placeholders %7 and %8 are style tags for the warning content, and they are not space separated from the rest of the text intentionally.</extracomment>
+        <translation>Vitajte v %1 RPC konzole.
+Použite šípky hore a dolu na navigáciu históriou a %2 na vymazanie obrazovky.
+Použite %3 a %4 na zväčšenie alebo zmenšenie veľkosti písma.
+Zadajte %5 pre prehľad dostupných príkazov.
+Pre viac informácií o používaní tejto konzoly zadajte %6.
+
+%7UPOZORNENIE: Podvodníci boli aktívni, hovorili používateľom, aby tu zadávali príkazy, a kradli obsah ich peňaženky. Nepoužívajte túto konzolu bez úplného pochopenia dôsledkov príkazu.%8</translation>
+    </message>
+    <message>
+        <source>Executing…</source>
+        <extracomment>A console message indicating an entered command is currently being executed.</extracomment>
+        <translation>Vykonáva sa…</translation>
+    </message>
+    <message>
+        <source>(peer: %1)</source>
+        <translation>(peer: %1)</translation>
+    </message>
     <message>
         <source>via %1</source>
         <translation>cez %1</translation>
@@ -2611,11 +3687,19 @@
         <source>Verified Masternode</source>
         <translation>Overený masternód</translation>
     </message>
+    <message>
+        <source>Yes</source>
+        <translation>Áno</translation>
+    </message>
     <message>
         <source>Unknown</source>
         <translation>Neznáme</translation>
     </message>
-    </context>
+    <message>
+        <source>Never</source>
+        <translation>Nikdy</translation>
+    </message>
+</context>
 <context>
     <name>ReceiveCoinsDialog</name>
     <message>
@@ -2634,6 +3718,10 @@
         <source>An optional message to attach to the payment request, which will be displayed when the request is opened.&lt;br&gt;Note: The message will not be sent with the payment over the Dash network.</source>
         <translation>Pripojiť ku vyžiadanej platbe voliteľnú správu, ktorá sa zobrazí, keď bude žiadosť otvorená. &lt;br&gt;Poznámka: Správa nebude poslaná spolu s platbou cez sieť Dash.</translation>
     </message>
+    <message>
+        <source>An optional label to associate with the new receiving address (used by you to identify an invoice).  It is also attached to the payment request.</source>
+        <translation>Voliteľný popis, ktorý sa priradí k novej prijímacej adrese (používate ho na identifikáciu faktúry). Tiež sa pripojí k žiadosti o platbu.</translation>
+    </message>
     <message>
         <source>Use this form to request payments. All fields are &lt;b&gt;optional&lt;/b&gt;.</source>
         <translation>Použite tento formulár pre vyžiadanie platby. Všetky polia sú &lt;b&gt;voliteľné&lt;/b&gt;.</translation>
@@ -2691,28 +3779,60 @@
         <translation>Zadajte správu, ktorá sa má priložiť k žiadosti o platbu</translation>
     </message>
     <message>
-        <source>Copy URI</source>
-        <translation>Kopírovať URI</translation>
+        <source>Copy &amp;URI</source>
+        <translation>Kopírovať &amp;URI</translation>
+    </message>
+    <message>
+        <source>&amp;Copy address</source>
+        <translation>&amp;Kopírovať adresu</translation>
     </message>
     <message>
-        <source>Copy address</source>
-        <translation>Kopírovať adresu</translation>
+        <source>Copy &amp;label</source>
+        <translation>Kopírovať &amp;popis</translation>
     </message>
     <message>
-        <source>Copy label</source>
-        <translation>Kopírovať popis</translation>
+        <source>Copy &amp;message</source>
+        <translation>Kopírovať &amp;správu</translation>
     </message>
     <message>
-        <source>Copy message</source>
-        <translation>Kopírovať správu</translation>
+        <source>Copy &amp;amount</source>
+        <translation>Kopírovať &amp;sumu</translation>
     </message>
     <message>
-        <source>Copy amount</source>
-        <translation>Kopírovať sumu</translation>
+        <source>Could not unlock wallet.</source>
+        <translation>Nepodarilo sa odomknúť peňaženku.</translation>
     </message>
-    </context>
+    <message>
+        <source>Could not generate new address</source>
+        <translation>Nepodarilo sa vygenerovať novú adresu</translation>
+    </message>
+</context>
 <context>
     <name>ReceiveRequestDialog</name>
+    <message>
+        <source>Request payment to …</source>
+        <translation>Vyžiadať platbu na …</translation>
+    </message>
+    <message>
+        <source>Address:</source>
+        <translation>Adresa:</translation>
+    </message>
+    <message>
+        <source>Amount:</source>
+        <translation>Suma:</translation>
+    </message>
+    <message>
+        <source>Label:</source>
+        <translation>Popis:</translation>
+    </message>
+    <message>
+        <source>Message:</source>
+        <translation>Správa:</translation>
+    </message>
+    <message>
+        <source>Wallet:</source>
+        <translation>Peňaženka:</translation>
+    </message>
     <message>
         <source>Copy &amp;URI</source>
         <translation>Kopírovať &amp;URI</translation>
@@ -2765,6 +3885,34 @@
         <translation>Požadované</translation>
     </message>
 </context>
+<context>
+    <name>RestoreWalletActivity</name>
+    <message>
+        <source>Restore Wallet</source>
+        <extracomment>Title of progress window which is displayed when wallets are being restored.</extracomment>
+        <translation>Obnoviť peňaženku</translation>
+    </message>
+    <message>
+        <source>Restoring Wallet &lt;b&gt;%1&lt;/b&gt;…</source>
+        <extracomment>Descriptive text of the restore wallets progress window which indicates to the user that wallets are currently being restored.</extracomment>
+        <translation>Obnovuje sa peňaženka &lt;b&gt;%1&lt;/b&gt;…</translation>
+    </message>
+    <message>
+        <source>Restore wallet failed</source>
+        <extracomment>Title of message box which is displayed when the wallet could not be restored.</extracomment>
+        <translation>Obnovenie peňaženky zlyhalo</translation>
+    </message>
+    <message>
+        <source>Restore wallet warning</source>
+        <extracomment>Title of message box which is displayed when the wallet is restored with some warning.</extracomment>
+        <translation>Upozornenie pri obnovení peňaženky</translation>
+    </message>
+    <message>
+        <source>Restore wallet message</source>
+        <extracomment>Title of message box which is displayed when the wallet is successfully restored.</extracomment>
+        <translation>Správa obnovy peňaženky</translation>
+    </message>
+</context>
 <context>
     <name>SendCoinsDialog</name>
     <message>
@@ -2799,10 +3947,6 @@
         <source>Fee:</source>
         <translation>Poplatok:</translation>
     </message>
-    <message>
-        <source>Dust:</source>
-        <translation>Prach:</translation>
-    </message>
     <message>
         <source>Inputs…</source>
         <translation>Vstupy…</translation>
@@ -2827,6 +3971,14 @@
         <source>Transaction Fee:</source>
         <translation>Transakčný poplatok</translation>
     </message>
+    <message>
+        <source>When there is less transaction volume than space in the blocks, miners as well as relaying nodes may enforce a minimum fee. Paying only this minimum fee is just fine, but be aware that this can result in a never confirming transaction once there is more demand for dash transactions than the network can process.</source>
+        <translation>Keď je objem transakcií menší ako priestor v blokoch, ťažiari a preposielajúce uzly môžu vynucovať minimálny poplatok. Platenie iba tohto minimálneho poplatku je v poriadku, ale uvedomte si, že to môže viesť k nikdy nepotvrdenej transakcii, ak bude väčší dopyt po dash transakciách, než sieť dokáže spracovať.</translation>
+    </message>
+    <message>
+        <source>A too low fee might result in a never confirming transaction (read the tooltip)</source>
+        <translation>Príliš nízky poplatok môže viesť k nikdy nepotvrdenej transakcii (prečítajte tooltip)</translation>
+    </message>
     <message>
         <source>(Smart fee not initialized yet. This usually takes a few blocks…)</source>
         <translation>(Inteligentný poplatok nebol ešte inicializovaný. Obvykle to trvá nekoľko blokov…)</translation>
@@ -2919,10 +4071,6 @@
         <source>Copy bytes</source>
         <translation>Kopírovať bajty</translation>
     </message>
-    <message>
-        <source>Copy dust</source>
-        <translation>Kopírovať prach</translation>
-    </message>
     <message>
         <source>Copy change</source>
         <translation>Kopírovať zmenu</translation>
@@ -2939,10 +4087,6 @@
         <source>%1 to %2</source>
         <translation>%1 do %2</translation>
     </message>
-    <message>
-        <source>Are you sure you want to send?</source>
-        <translation>Určite chcete odoslať transakciu?</translation>
-    </message>
     <message>
         <source>&lt;b&gt;(%1 of %2 entries displayed)&lt;/b&gt;</source>
         <translation>&lt;b&gt;(%1 z %2 zobrazených položiek)&lt;/b&gt;</translation>
@@ -2955,6 +4099,18 @@
         <source>Confirm the %1 send action</source>
         <translation>Potvrďte akciu pre poslanie %1</translation>
     </message>
+    <message>
+        <source>Cr&amp;eate Unsigned</source>
+        <translation>&amp;Vytvoriť nepodpísané</translation>
+    </message>
+    <message>
+        <source> from wallet '%1'</source>
+        <translation> z peňaženky '%1'</translation>
+    </message>
+    <message>
+        <source>%1 to '%2'</source>
+        <translation>%1 do '%2'</translation>
+    </message>
     <message>
         <source>%1 funds only</source>
         <translation>Iba %1 prostriedky</translation>
@@ -3003,6 +4159,51 @@
         <source>Confirm send coins</source>
         <translation>Potvrdiť odoslanie mincí</translation>
     </message>
+    <message>
+        <source>Save Transaction Data</source>
+        <translation>Uložiť údaje transakcie</translation>
+    </message>
+    <message>
+        <source>PSBT saved</source>
+        <translation>PSBT uložené</translation>
+    </message>
+    <message>
+        <source>Watch-only balance:</source>
+        <translation>Zostatok iba na sledovanie:</translation>
+    </message>
+    <message>
+        <source>Creates a Partially Signed Blockchain Transaction (PSBT) for use with e.g. an offline %1 wallet, or a PSBT-compatible hardware wallet.</source>
+        <translation>Vytvorí čiastočne podpísanú blockchainovú transakciu (PSBT) na použitie napr. s offline %1 peňaženkou alebo s PSBT-kompatibilnou hardvérovou peňaženkou.</translation>
+    </message>
+    <message>
+        <source>Do you want to create this transaction?</source>
+        <extracomment>Message displayed when attempting to create a transaction. Cautionary text to prompt the user to verify that the displayed transaction details represent the transaction the user intends to create.</extracomment>
+        <translation>Chcete vytvoriť túto transakciu?</translation>
+    </message>
+    <message>
+        <source>Please, review your transaction proposal. This will produce a Partially Signed Blockchain Transaction (PSBT) which you can save or copy and then sign with e.g. an offline %1 wallet, or a PSBT-compatible hardware wallet.</source>
+        <extracomment>Text to inform a user attempting to create a transaction of their current options. At this stage, a user can only create a PSBT. This string is displayed when private keys are disabled and an external signer is not available.</extracomment>
+        <translation>Prosím, skontrolujte svoj návrh transakcie. Toto vytvorí čiastočne podpísanú blockchainovú transakciu (PSBT), ktorú môžete uložiť alebo skopírovať a potom podpísať napr. offline %1 peňaženkou alebo PSBT-kompatibilnou hardvérovou peňaženkou.</translation>
+    </message>
+    <message>
+        <source>Please, review your transaction. You can create and send this transaction or create a Partially Signed Blockchain Transaction (PSBT), which you can save or copy and then sign with, e.g., an offline %1 wallet, or a PSBT-compatible hardware wallet.</source>
+        <extracomment>Text to inform a user attempting to create a transaction of their current options. At this stage, a user can send their transaction or create a PSBT. This string is displayed when both private keys and PSBT controls are enabled.</extracomment>
+        <translation>Prosím, skontrolujte svoju transakciu. Môžete vytvoriť a odoslať túto transakciu alebo vytvoriť čiastočne podpísanú blockchainovú transakciu (PSBT), ktorú môžete uložiť alebo skopírovať a potom podpísať napr. offline %1 peňaženkou alebo PSBT-kompatibilnou hardvérovou peňaženkou.</translation>
+    </message>
+    <message>
+        <source>Please, review your transaction.</source>
+        <extracomment>Text to prompt a user to review the details of the transaction they are attempting to send.</extracomment>
+        <translation>Prosím, skontrolujte svoju transakciu.</translation>
+    </message>
+    <message>
+        <source>To review recipient list click "Show Details…"</source>
+        <translation>Ak chcete skontrolovať zoznam príjemcov, kliknite na „Zobraziť podrobnosti…"</translation>
+    </message>
+    <message>
+        <source>Partially Signed Transaction (Binary)</source>
+        <extracomment>Expanded name of the binary PSBT file format. See: BIP 174.</extracomment>
+        <translation>Čiastočne podpísaná transakcia (binárna)</translation>
+    </message>
     <message>
         <source>The recipient address is not valid. Please recheck.</source>
         <translation>Adresa príjemcu je neplatná. Prosím, overte ju.</translation>
@@ -3122,21 +4323,16 @@
         <source>A message that was attached to the dash: URI which will be stored with the transaction for your reference. Note: This message will not be sent over the Dash network.</source>
         <translation>Správa ktorá bola pripojená ku dash: URI ktorá sa uchová spolu s transakciou pre vašu referenciu. Poznámka: Táto správa nebude poslaná cez sieť Dash.</translation>
     </message>
+</context>
+<context>
+    <name>SendConfirmationDialog</name>
     <message>
-        <source>This is an unauthenticated payment request.</source>
-        <translation>Toto je neoverená výzva k platbe.</translation>
-    </message>
-    <message>
-        <source>This is an authenticated payment request.</source>
-        <translation>Toto je overená výzva k platbe.</translation>
-    </message>
-    <message>
-        <source>Pay To:</source>
-        <translation>Platba pre:</translation>
+        <source>Send</source>
+        <translation>Odoslať</translation>
     </message>
     <message>
-        <source>Memo:</source>
-        <translation>Poznámka:</translation>
+        <source>Create Unsigned</source>
+        <translation>Vytvoriť nepodpísané</translation>
     </message>
 </context>
 <context>
@@ -3276,6 +4472,10 @@
         <source>Wallet unlock was cancelled.</source>
         <translation>Odomknutie peňaženky bolo zrušené.</translation>
     </message>
+    <message>
+        <source>No error</source>
+        <translation>Žiadna chyba</translation>
+    </message>
     <message>
         <source>Private key for the entered address is not available.</source>
         <translation>Súkromný kľúč pre vložená adresu nieje k dispozícii.</translation>
@@ -3301,19 +4501,30 @@
         <translation>Podpis sa nezhoduje so zhrnutím správy</translation>
     </message>
     <message>
-        <source>Message verification failed.</source>
-        <translation>Overenie správy zlyhalo.</translation>
+        <source>Message verification failed.</source>
+        <translation>Overenie správy zlyhalo.</translation>
+    </message>
+    <message>
+        <source>Message verified.</source>
+        <translation>Správa overená.</translation>
+    </message>
+</context>
+<context>
+    <name>SplashScreen</name>
+    <message>
+        <source>(press q to shutdown and continue later)</source>
+        <translation>(stlačte q pre vypnutie a pokračovanie neskôr)</translation>
     </message>
     <message>
-        <source>Message verified.</source>
-        <translation>Správa overená.</translation>
+        <source>press q to shutdown</source>
+        <translation>stlačte q pre vypnutie</translation>
     </message>
 </context>
 <context>
     <name>TrafficGraphWidget</name>
     <message>
-        <source>KB/s</source>
-        <translation>KB/s</translation>
+        <source>kB/s</source>
+        <translation>kB/s</translation>
     </message>
     <message>
         <source>Total</source>
@@ -3330,20 +4541,9 @@
 </context>
 <context>
     <name>TransactionDesc</name>
-    <message numerus="yes">
-        <source>Open for %n more block(s)</source>
-        <translation><numerusform>Otvoriť pre %n ďalší blok</numerusform><numerusform>Otvoriť pre %n ďalšie bloky</numerusform><numerusform>Otvoriť pre %n ďalších blokov</numerusform><numerusform>Otvoriť pre %n ďalších blokov</numerusform></translation>
-    </message>
-    <message>
-        <source>Open until %1</source>
-        <translation>Otvorené do %1</translation>
-    </message>
-    <message>
-        <source>conflicted</source>
-        <translation>sporné</translation>
-    </message>
     <message>
         <source>0/unconfirmed, %1</source>
+        <extracomment>Text explaining the current status of a transaction, shown in the status field of the details window for this transaction. This status represents an unconfirmed transaction that is in the memory pool.</extracomment>
         <translation>0/nepotvrdené, %1</translation>
     </message>
     <message>
@@ -3356,22 +4556,32 @@
     </message>
     <message>
         <source>abandoned</source>
+        <extracomment>Text explaining the current status of a transaction, shown in the status field of the details window for this transaction. This status represents an abandoned transaction.</extracomment>
         <translation>opustené</translation>
     </message>
+    <message>
+        <source>conflicted with a transaction with %1 confirmations</source>
+        <extracomment>Text explaining the current status of a transaction, shown in the status field of the details window for this transaction. This status represents an unconfirmed transaction that conflicts with a confirmed transaction.</extracomment>
+        <translation>v konflikte s transakciou s %1 potvrdeniami</translation>
+    </message>
     <message>
         <source>%1/unconfirmed</source>
+        <extracomment>Text explaining the current status of a transaction, shown in the status field of the details window for this transaction. This status represents a transaction confirmed in at least one block, but less than 6 blocks, and still not locked via ChainLocks.</extracomment>
         <translation>%1/nepotvrdené</translation>
     </message>
     <message>
         <source>%1 confirmations</source>
+        <extracomment>Text explaining the current status of a transaction, shown in the status field of the details window for this transaction. This status represents a transaction confirmed in 6 or more blocks or locked via ChainLocks.</extracomment>
         <translation>%1 potvrdení</translation>
     </message>
     <message>
         <source>locked via ChainLocks</source>
+        <extracomment>Text explaining the current status of a transaction, shown in the status field of the details window for this transaction. This status represents a transaction confirmed in at least one block and has been locked by ChainLocks.</extracomment>
         <translation>zamknuté pomocou ChainLocks</translation>
     </message>
     <message>
         <source>verified via InstantSend</source>
+        <extracomment>Text explaining the current status of a transaction, shown in the status field of the details window for this transaction. This status represents an unconfirmed transaction that has been locked by InstantSend.</extracomment>
         <translation>overené cez InstantSend</translation>
     </message>
     <message>
@@ -3390,6 +4600,10 @@
         <source>Generated</source>
         <translation>Vygenerované</translation>
     </message>
+    <message>
+        <source>Platform Transfer</source>
+        <translation>Prevod platformy</translation>
+    </message>
     <message>
         <source>From</source>
         <translation>Od</translation>
@@ -3520,14 +4734,6 @@
         <source>Address / Label</source>
         <translation>Adresa / Popis</translation>
     </message>
-    <message numerus="yes">
-        <source>Open for %n more block(s)</source>
-        <translation><numerusform>Otvoriť pre %n ďalší blok</numerusform><numerusform>Otvoriť pre %n ďalšie bloky</numerusform><numerusform>Otvoriť pre %n ďalších blokov</numerusform><numerusform>Otvoriť pre %n ďalších blokov</numerusform></translation>
-    </message>
-    <message>
-        <source>Open until %1</source>
-        <translation>Otvorené do %1</translation>
-    </message>
     <message>
         <source>Unconfirmed</source>
         <translation>Nepotvrdené</translation>
@@ -3588,6 +4794,10 @@
         <source>Mined</source>
         <translation>Vyťažené</translation>
     </message>
+    <message>
+        <source>Platform Transfer</source>
+        <translation>Prevod platformy</translation>
+    </message>
     <message>
         <source>%1 Mixing</source>
         <translation>%1 miešanie</translation>
@@ -3715,6 +4925,10 @@
         <source>Mined</source>
         <translation>Vyťažené</translation>
     </message>
+    <message>
+        <source>Platform Transfer</source>
+        <translation>Prevod platformy</translation>
+    </message>
     <message>
         <source>Other</source>
         <translation>Iné</translation>
@@ -3728,49 +4942,63 @@
         <translation>Minimálna suma</translation>
     </message>
     <message>
-        <source>Abandon transaction</source>
-        <translation>Opustené transakcie</translation>
+        <source>&amp;Copy address</source>
+        <translation>&amp;Kopírovať adresu</translation>
+    </message>
+    <message>
+        <source>Copy &amp;label</source>
+        <translation>Kopírovať &amp;popis</translation>
     </message>
     <message>
-        <source>Copy address</source>
-        <translation>Kopírovať adresu</translation>
+        <source>Copy &amp;amount</source>
+        <translation>Kopírovať &amp;sumu</translation>
     </message>
     <message>
-        <source>Copy label</source>
-        <translation>Kopírovať popis</translation>
+        <source>Copy transaction &amp;ID</source>
+        <translation>Kopírovať &amp;ID transakcie</translation>
     </message>
     <message>
-        <source>Copy amount</source>
-        <translation>Kopírovať sumu</translation>
+        <source>Copy &amp;raw transaction</source>
+        <translation>Kopírovať &amp;nespracovanú transakciu</translation>
     </message>
     <message>
-        <source>Copy transaction ID</source>
-        <translation>Kopírovať ID transakcie</translation>
+        <source>Copy full transaction &amp;details</source>
+        <translation>Kopírovať úplné &amp;podrobnosti transakcie</translation>
     </message>
     <message>
-        <source>Copy raw transaction</source>
-        <translation>Skopírovať neupravenú transakciu</translation>
+        <source>&amp;Show transaction details</source>
+        <translation>&amp;Zobraziť podrobnosti transakcie</translation>
     </message>
     <message>
-        <source>Copy full transaction details</source>
-        <translation>Kopírovať všetky podrobnosti o transakcii</translation>
+        <source>A&amp;bandon transaction</source>
+        <translation>&amp;Opustiť transakciu</translation>
     </message>
     <message>
-        <source>Edit address label</source>
-        <translation>Upraviť štítok s adresou</translation>
+        <source>Rese&amp;nd transaction</source>
+        <translation>Znova o&amp;doslať transakciu</translation>
     </message>
     <message>
-        <source>Show transaction details</source>
-        <translation>Zobraziť podrobnosti transakcie</translation>
+        <source>&amp;Edit address label</source>
+        <translation>&amp;Upraviť popis adresy</translation>
     </message>
     <message>
-        <source>Show address QR code</source>
-        <translation>Zobraziť adresový QR kód</translation>
+        <source>Show address &amp;QR code</source>
+        <translation>Zobraziť &amp;QR kód adresy</translation>
+    </message>
+    <message>
+        <source>Show in %1</source>
+        <extracomment>Transactions table context menu action to show the selected transaction in a third-party block explorer. %1 is a stand-in argument for the URL of the explorer.</extracomment>
+        <translation>Zobraziť v %1</translation>
     </message>
     <message>
         <source>Export Transaction History</source>
         <translation>Exportovať históriu transakcií</translation>
     </message>
+    <message>
+        <source>Comma separated file</source>
+        <extracomment>Expanded name of the CSV file format. See: https://en.wikipedia.org/wiki/Comma-separated_values.</extracomment>
+        <translation>Súbor s čiarkou oddelenými hodnotami</translation>
+    </message>
     <message>
         <source>Confirmed</source>
         <translation>Potvrdené</translation>
@@ -3849,10 +5077,54 @@
         <source>Closing the wallet for too long can result in having to resync the entire chain if pruning is enabled.</source>
         <translation>Príliš dlhé zatvorenie peňaženky môže viesť k nutnosti opätovnej synchronizácie celého reťazca, ak je povolené orezávanie.</translation>
     </message>
-    </context>
+    <message>
+        <source>Close all wallets</source>
+        <translation>Zavrieť všetky peňaženky</translation>
+    </message>
+    <message>
+        <source>Are you sure you wish to close all wallets?</source>
+        <translation>Naozaj chcete zavrieť všetky peňaženky?</translation>
+    </message>
+</context>
 <context>
     <name>WalletFrame</name>
-    </context>
+    <message>
+        <source>No wallet has been loaded.
+Go to File &gt; Open Wallet to load a wallet.
+- OR -</source>
+        <translation>Nebola načítaná žiadna peňaženka.
+Prejdite na Súbor &gt; Otvoriť peňaženku a načítajte peňaženku.
+- ALEBO -</translation>
+    </message>
+    <message>
+        <source>Create a new wallet</source>
+        <translation>Vytvoriť novú peňaženku</translation>
+    </message>
+    <message>
+        <source>Error</source>
+        <translation>Chyba</translation>
+    </message>
+    <message>
+        <source>Unable to decode PSBT from clipboard (invalid base64)</source>
+        <translation>Nie je možné dekódovať PSBT zo schránky (neplatný base64)</translation>
+    </message>
+    <message>
+        <source>Load Transaction Data</source>
+        <translation>Načítať údaje transakcie</translation>
+    </message>
+    <message>
+        <source>Partially Signed Transaction (*.psbt)</source>
+        <translation>Čiastočne podpísaná transakcia (*.psbt)</translation>
+    </message>
+    <message>
+        <source>PSBT file must be smaller than 100 MiB</source>
+        <translation>PSBT súbor musí byť menší ako 100 MiB</translation>
+    </message>
+    <message>
+        <source>Unable to decode PSBT</source>
+        <translation>Nie je možné dekódovať PSBT</translation>
+    </message>
+</context>
 <context>
     <name>WalletModel</name>
     <message>
@@ -3878,6 +5150,11 @@
         <source>Selected amount:</source>
         <translation>Označená suma:</translation>
     </message>
+    <message>
+        <source>Wallet Data</source>
+        <extracomment>Name of the wallet data file format.</extracomment>
+        <translation>Dáta peňaženky</translation>
+    </message>
     <message>
         <source>Backup Wallet</source>
         <translation>Zálohovať peňaženku</translation>
@@ -3905,14 +5182,6 @@
 </context>
 <context>
     <name>dash-core</name>
-    <message>
-        <source>Error: Listening for incoming connections failed (listen returned error %s)</source>
-        <translation>Chyba: Počúvanie prichádzajúcich spojení zlyhalo (vrátená chyba je %s)</translation>
-    </message>
-    <message>
-        <source>Fee estimation failed. Fallbackfee is disabled. Wait a few blocks or enable -fallbackfee.</source>
-        <translation>Odhad poplatku zlyhal. Fallbackfee je zakázaný. Počkajte niekoľko blokov alebo povoľte -fallbackfee.</translation>
-    </message>
     <message>
         <source>This error could occur if this wallet was not shutdown cleanly and was last loaded using a build with a newer version of Berkeley DB. If so, please use the software that last loaded this wallet</source>
         <translation>Táto chyba sa môže vyskytnúť, ak táto peňaženka nebola vypnutá čisto a bola naposledy načítaná pomocou zostavy s novšou verziou Berkeley DB. Ak áno, použite softvér, ktorý naposledy načítal túto peňaženku</translation>
@@ -3970,16 +5239,20 @@
         <translation>Chyba pri načítaní z databázy, ukončuje sa.</translation>
     </message>
     <message>
-        <source>Failed to listen on any port. Use -listen=0 if you want this.</source>
-        <translation>Nepodarilo sa počúvať na žiadnom porte. Použite -listen=0 ak to takto chcete.</translation>
+        <source>Error: Missing checksum</source>
+        <translation>Chyba: Chýba kontrolný súčet</translation>
+    </message>
+    <message>
+        <source>Error: Unable to parse version %u as a uint32_t</source>
+        <translation>Chyba: Nie je možné analyzovať verziu %u ako uint32_t</translation>
     </message>
     <message>
-        <source>-maxtxfee is set very high! Fees this large could be paid on a single transaction.</source>
-        <translation>-maxtxfee je nastavené veľmi vysoko! Takto vysoký poplatok môže byť zaplatebý v jednej transakcii.</translation>
+        <source>Error: Unable to write record to new wallet</source>
+        <translation>Chyba: Nie je možné zapísať záznam do novej peňaženky</translation>
     </message>
     <message>
-        <source>Cannot provide specific connections and have addrman find outgoing connections at the same.</source>
-        <translation>Nedajú sa poskytnúť konkrétne spojenia a nechať súčasne addrman nájsť odchádzajúce spojenia.</translation>
+        <source>Failed to listen on any port. Use -listen=0 if you want this.</source>
+        <translation>Nepodarilo sa počúvať na žiadnom porte. Použite -listen=0 ak to takto chcete.</translation>
     </message>
     <message>
         <source>Found unconfirmed denominated outputs, will wait till they confirm to continue.</source>
@@ -3990,13 +5263,17 @@
         <translation>Zadané neplatné -socketevents ('%s'). Podporované sú iba tieto režimy: %s</translation>
     </message>
     <message>
-        <source>Invalid amount for -maxtxfee=&lt;amount&gt;: '%s' (must be at least the minrelay fee of %s to prevent stuck transactions)</source>
-        <translation>Neplatná suma pre -maxtxfee=&lt;amount&gt;: '%s' (aby sa transakcia nezasekla, minimálny prenosový poplatok musí byť aspoň %s)</translation>
+        <source>SQLiteDatabase: Unknown sqlite wallet schema version %d. Only version %d is supported</source>
+        <translation>SQLiteDatabase: Neznáma verzia schémy peňaženky sqlite %d. Podporovaná je iba verzia %d</translation>
     </message>
     <message>
         <source>Transaction index can't be disabled with governance validation enabled. Either start with -disablegovernance command line switch or enable transaction index.</source>
         <translation>Transakčný index nie je možné zakázať, ak je povolené overenie riadenia. Začnite buď prepínačom príkazového riadku -disablegovernance, alebo povolte index transakcií.</translation>
     </message>
+    <message>
+        <source>Unsupported category-specific logging level -loglevel=%s. Expected -loglevel=&lt;category&gt;:&lt;loglevel&gt;. Valid categories: %s. Valid loglevels: %s.</source>
+        <translation>Nepodporovaná úroveň protokolovania pre kategóriu -loglevel=%s. Očakávané -loglevel=&lt;kategória&gt;:&lt;úroveň_logovania&gt;. Platné kategórie: %s. Platné úrovne logovania: %s.</translation>
+    </message>
     <message>
         <source>Can't mix: no compatible inputs found!</source>
         <translation>Nedá sa miešať: nezostávajú žiadne kompatibilné zdroje.</translation>
@@ -4005,6 +5282,14 @@
         <source>Entry exceeds maximum size.</source>
         <translation>Vstup prekračuje maximálnu veľkosť.</translation>
     </message>
+    <message>
+        <source>Error upgrading evo database for EHF</source>
+        <translation>Chyba pri aktualizácii databázy evo pre EHF</translation>
+    </message>
+    <message>
+        <source>Failed to commit Evo database</source>
+        <translation>Nepodarilo sa zapísať databázu Evo</translation>
+    </message>
     <message>
         <source>Found enough users, signing ( waiting %s )</source>
         <translation>Nájdený dostatok používateľov, pospisuje sa ( čakanie %s )</translation>
@@ -4029,18 +5314,14 @@
         <source>Insufficient funds.</source>
         <translation>Nedostatok prostriedkov.</translation>
     </message>
-    <message>
-        <source>Invalid amount for -discardfee=&lt;amount&gt;: '%s'</source>
-        <translation>Neplatná suma pre -discardfee=&lt;amount&gt;: '%s'</translation>
-    </message>
-    <message>
-        <source>Invalid amount for -paytxfee=&lt;amount&gt;: '%s' (must be at least %s)</source>
-        <translation>Neplatná suma pre -paytxfee=&lt;amount&gt;: '%s' (musí byť aspoň %s)</translation>
-    </message>
     <message>
         <source>Invalid minimum number of spork signers specified with -minsporkkeys</source>
         <translation>Neplatný minimálny počet spork podpisovateľov určených pomocou -minsporkkeys</translation>
     </message>
+    <message>
+        <source>Listening for incoming connections failed (listen returned error %s)</source>
+        <translation>Počúvanie prichádzajúcich spojení zlyhalo (listen vrátil chybu %s)</translation>
+    </message>
     <message>
         <source>Lock is already in place.</source>
         <translation>Zámok je už na mieste.</translation>
@@ -4097,6 +5378,10 @@
         <source>Synchronizing governance objects…</source>
         <translation>Synchronizujú sa objekty správy…</translation>
     </message>
+    <message>
+        <source>Transaction change output index out of range</source>
+        <translation>Index výstupu transakčného výdavku je mimo rozsahu</translation>
+    </message>
     <message>
         <source>Unable to start HTTP server. See debug log for details.</source>
         <translation>Nepodarilo sa spustiť HTTP server. Pre viac detailov zobrazte debug log.</translation>
@@ -4105,6 +5390,10 @@
         <source>Unknown response.</source>
         <translation>Neznáma odpoveď.</translation>
     </message>
+    <message>
+        <source>Unsupported global logging level -loglevel=%s. Valid values: %s.</source>
+        <translation>Nepodporovaná globálna úroveň logovania -loglevel=%s. Platné hodnoty: %s.</translation>
+    </message>
     <message>
         <source>User Agent comment (%s) contains unsafe characters.</source>
         <translation>Komentár u typu klienta (%s) obsahuje riskantné znaky.</translation>
@@ -4145,6 +5434,10 @@
         <source>Make sure to encrypt your wallet and delete all non-encrypted backups after you have verified that the wallet works!</source>
         <translation>Uistite sa, že máte vašu peňaženku zašifrovanú a zmazané všetky nezašifrované zálohy potom ako ste overili, že peňaženka funguje!</translation>
     </message>
+    <message>
+        <source>More than one onion bind address is provided. Using %s for the automatically created Tor onion service.</source>
+        <translation>Bola poskytnutá viac ako jedna onion bind adresa. Používa sa %s pre automaticky vytvorenú službu Tor onion.</translation>
+    </message>
     <message>
         <source>Prune configured below the minimum of %d MiB.  Please use a higher number.</source>
         <translation>Orezanie nastavené pod minimálnu hodnotu %d MiB. Prosím použite vyššiu hodnotu.</translation>
@@ -4173,10 +5466,6 @@
         <source>Wallet is locked, can't replenish keypool! Automatic backups and mixing are disabled, please unlock your wallet to replenish keypool.</source>
         <translation>Peňaženka je zamknutá takže sa nedá doplniť zásobník kľúčov. Automatické zálohy a miešanie sú vypnuté. Pre doplnenie musíte odomknúť vašu peňaženku.</translation>
     </message>
-    <message>
-        <source>You need to rebuild the database using -reindex to change -timestampindex</source>
-        <translation>Potrebujete prebudovať databázu použitím -reindex zmeniť -timestampindex</translation>
-    </message>
     <message>
         <source>You need to rebuild the database using -reindex to go back to unpruned mode.  This will redownload the entire blockchain</source>
         <translation>K návratu k neorezanému režimu je treba prestavať databázu použitím -reindex. Tiež sa znova stiahne celý blockchain</translation>
@@ -4218,20 +5507,32 @@
         <translation>Chyba pri načítavaní %s: Súkromné kľúče je možné deaktivovať iba počas vytvárania</translation>
     </message>
     <message>
-        <source>Error upgrading evo database</source>
-        <translation>Chyba pri aktualizácii databázy evo</translation>
+        <source>Error: Couldn't create cursor into database</source>
+        <translation>Chyba: Nepodarilo sa vytvoriť kurzor do databázy</translation>
     </message>
     <message>
         <source>Error: Disk space is low for %s</source>
         <translation>Chyba: Miesta na disku pre %s je málo</translation>
     </message>
     <message>
-        <source>Exceeded max tries.</source>
-        <translation>Prekročený maximálny počet pokusov.</translation>
+        <source>Error: Dumpfile checksum does not match. Computed %s, expected %s</source>
+        <translation>Chyba: Kontrolný súčet súboru výpisu sa nezhoduje. Vypočítané %s, očakávané %s</translation>
+    </message>
+    <message>
+        <source>Error: Got key that was not hex: %s</source>
+        <translation>Chyba: Získaný kľúč nebol hex: %s</translation>
+    </message>
+    <message>
+        <source>Error: Got value that was not hex: %s</source>
+        <translation>Chyba: Získaná hodnota nebola hex: %s</translation>
+    </message>
+    <message>
+        <source>Error: Keypool ran out, please call keypoolrefill first</source>
+        <translation>Chyba: Zásobník kľúčov sa vyčerpal, najprv zavolajte keypoolrefill</translation>
     </message>
     <message>
-        <source>Failed to commit EvoDB</source>
-        <translation>Nepodarilo sa vykonať EvoDB</translation>
+        <source>Error: No addresses available.</source>
+        <translation>Chyba: Nie sú dostupné žiadne adresy.</translation>
     </message>
     <message>
         <source>Failed to create backup %s!</source>
@@ -4249,17 +5550,29 @@
         <source>Failed to rescan the wallet during initialization</source>
         <translation>Počas inicializácie sa nepodarilo znova naskenovať peňaženku</translation>
     </message>
+    <message>
+        <source>Failed to verify database</source>
+        <translation>Nepodarilo sa overiť databázu</translation>
+    </message>
+    <message>
+        <source>Fee rate (%s) is lower than the minimum fee rate setting (%s)</source>
+        <translation>Sadzba poplatku (%s) je nižšia ako minimálne nastavenie sadzby poplatku (%s)</translation>
+    </message>
     <message>
         <source>Found enough users, signing…</source>
         <translation>Nájdený dostatok používateľov, pospisuje sa…</translation>
     </message>
     <message>
-        <source>Invalid P2P permission: '%s'</source>
-        <translation>Neplatné povolenie P2P: '%s'</translation>
+        <source>Ignoring duplicate -wallet %s.</source>
+        <translation>Ignoruje sa duplicitná -wallet %s.</translation>
+    </message>
+    <message>
+        <source>Input not found or already spent</source>
+        <translation>Vstup nebol nájdený alebo už bol utratený</translation>
     </message>
     <message>
-        <source>Invalid amount for -fallbackfee=&lt;amount&gt;: '%s'</source>
-        <translation>Neplatná suma pre -fallbackfee=&lt;amount&gt;: '%s'</translation>
+        <source>Invalid P2P permission: '%s'</source>
+        <translation>Neplatné povolenie P2P: '%s'</translation>
     </message>
     <message>
         <source>Invalid masternodeblsprivkey. Please see documentation.</source>
@@ -4281,6 +5594,10 @@
         <source>Mixing in progress…</source>
         <translation>Prebieha miešanie…</translation>
     </message>
+    <message>
+        <source>No addresses available</source>
+        <translation>Nie sú dostupné žiadne adresy</translation>
+    </message>
     <message>
         <source>No errors detected.</source>
         <translation>Nezistená žiadna chyba.</translation>
@@ -4309,6 +5626,22 @@
         <source>Prune mode is incompatible with -txindex.</source>
         <translation>Orezávanie nie je kompatibilné s -txindex.</translation>
     </message>
+    <message>
+        <source>SQLiteDatabase: Failed to execute statement to verify database: %s</source>
+        <translation>SQLiteDatabase: Nepodarilo sa vykonať príkaz na overenie databázy: %s</translation>
+    </message>
+    <message>
+        <source>SQLiteDatabase: Failed to prepare statement to verify database: %s</source>
+        <translation>SQLiteDatabase: Nepodarilo sa pripraviť príkaz na overenie databázy: %s</translation>
+    </message>
+    <message>
+        <source>SQLiteDatabase: Failed to read database verification error: %s</source>
+        <translation>SQLiteDatabase: Nepodarilo sa prečítať chybu overenia databázy: %s</translation>
+    </message>
+    <message>
+        <source>SQLiteDatabase: Unexpected application id. Expected %u, got %u</source>
+        <translation>SQLiteDatabase: Neočakávané ID aplikácie. Očakávané %u, získané %u</translation>
+    </message>
     <message>
         <source>Section [%s] is not recognized.</source>
         <translation>Sekcia [%s] nie je rozpoznaná.</translation>
@@ -4341,6 +5674,10 @@
         <source>This is the transaction fee you will pay if you send a transaction.</source>
         <translation>Toto je poplatok za transakciu pri odoslaní transakcie.</translation>
     </message>
+    <message>
+        <source>Topping up keypool…</source>
+        <translation>Dopĺňa sa zásobník kľúčov…</translation>
+    </message>
     <message>
         <source>Transaction amounts must not be negative</source>
         <translation>Sumy transakcií nesmú byť záporné</translation>
@@ -4369,13 +5706,17 @@
         <source>Unable to generate initial keys</source>
         <translation>Nie je možné vygenerovať počiatočné kľúče</translation>
     </message>
+    <message>
+        <source>Unable to open %s for writing</source>
+        <translation>Nie je možné otvoriť %s na zápis</translation>
+    </message>
     <message>
         <source>Unknown -blockfilterindex value %s.</source>
         <translation>Neznáma -blockfilterindex hodnota %s.</translation>
     </message>
     <message>
-        <source>Upgrading UTXO database</source>
-        <translation>Vylepšuje sa databáza neminutých výstupov (UTXO)</translation>
+        <source>Unknown new rules activated (versionbit %i)</source>
+        <translation>Aktivované neznáme nové pravidlá (versionbit %i)</translation>
     </message>
     <message>
         <source>Verifying blocks…</source>
@@ -4394,16 +5735,12 @@
         <translation>Nepodarilo sa vytvorenie priečinku pre zálohu %s!</translation>
     </message>
     <message>
-        <source>You can not start a masternode with wallet enabled.</source>
-        <translation>Nie je možné spustiť masternód s povolenou peňaženkou.</translation>
-    </message>
-    <message>
-        <source>You need to rebuild the database using -reindex to change -addressindex</source>
-        <translation>Potrebujete prebudovať databázu použitím -reindex zmeniť -addressindex</translation>
+        <source>Wiping wallet transactions…</source>
+        <translation>Vymazávajú sa transakcie peňaženky…</translation>
     </message>
     <message>
-        <source>You need to rebuild the database using -reindex to change -spentindex</source>
-        <translation>Potrebujete prebudovať databázu použitím -reindex zmeniť -spentindex</translation>
+        <source>You can not start a masternode with wallet enabled.</source>
+        <translation>Nie je možné spustiť masternód s povolenou peňaženkou.</translation>
     </message>
     <message>
         <source>no mixing available.</source>
@@ -4421,6 +5758,22 @@
         <source>%s uses exact denominated amounts to send funds, you might simply need to mix some more coins.</source>
         <translation>Pre poslanie zdrojov používa %s presné denominované sumy, možno iba potrebujete zmiešať viac mincí. </translation>
     </message>
+    <message>
+        <source>-reindex-chainstate option is not compatible with -blockfilterindex. Please temporarily disable blockfilterindex while using -reindex-chainstate, or replace -reindex-chainstate with -reindex to fully rebuild all indexes.</source>
+        <translation>Voľba -reindex-chainstate nie je kompatibilná s -blockfilterindex. Prosím dočasne zakážte blockfilterindex pri používaní -reindex-chainstate, alebo nahraďte -reindex-chainstate s -reindex pre úplné prebudovanie všetkých indexov.</translation>
+    </message>
+    <message>
+        <source>-reindex-chainstate option is not compatible with -coinstatsindex. Please temporarily disable coinstatsindex while using -reindex-chainstate, or replace -reindex-chainstate with -reindex to fully rebuild all indexes.</source>
+        <translation>Voľba -reindex-chainstate nie je kompatibilná s -coinstatsindex. Prosím dočasne zakážte coinstatsindex pri používaní -reindex-chainstate, alebo nahraďte -reindex-chainstate s -reindex pre úplné prebudovanie všetkých indexov.</translation>
+    </message>
+    <message>
+        <source>-reindex-chainstate option is not compatible with -txindex. Please temporarily disable txindex while using -reindex-chainstate, or replace -reindex-chainstate with -reindex to fully rebuild all indexes.</source>
+        <translation>Voľba -reindex-chainstate nie je kompatibilná s -txindex. Prosím dočasne zakážte txindex pri používaní -reindex-chainstate, alebo nahraďte -reindex-chainstate s -reindex pre úplné prebudovanie všetkých indexov.</translation>
+    </message>
+    <message>
+        <source>Cannot downgrade wallet from version %i to version %i. Wallet version unchanged.</source>
+        <translation>Nie je možné prejsť na nižšiu verziu peňaženky z verzie %i na verziu %i. Verzia peňaženky nezmenená.</translation>
+    </message>
     <message>
         <source>Cannot obtain a lock on data directory %s. %s is probably already running.</source>
         <translation>Nedá sa uzamknúť zložka %s. %s pravdepodobne už beží.</translation>
@@ -4433,14 +5786,82 @@
         <source>Error loading %s: You can't enable HD on an already existing non-HD wallet</source>
         <translation>Chyba pri načítaní %s: Nemôžete zapnúť HD na už existujúcej nie-HD peňaženke</translation>
     </message>
+    <message>
+        <source>Error loading wallet. Wallet requires blocks to be downloaded, and software does not currently support loading wallets while blocks are being downloaded out of order when using assumeutxo snapshots. Wallet should be able to load successfully after node sync reaches height %s</source>
+        <translation>Chyba pri načítaní peňaženky. Peňaženka vyžaduje stiahnutie blokov a softvér v súčasnosti nepodporuje načítanie peňaženiek, keď sa bloky sťahujú v nesprávnom poradí pri používaní assumeutxo snímok. Peňaženka by sa mala úspešne načítať po dosiahnutí výšky %s synchronizácie uzla</translation>
+    </message>
     <message>
         <source>Error reading %s! All keys read correctly, but transaction data or address book entries might be missing or incorrect.</source>
         <translation>Nastala chyba pri čítaní súboru %s! Všetky kľúče sa prečítali správne, ale dáta o transakciách alebo záznamy v adresári môžu chýbať alebo byť nesprávne.</translation>
     </message>
+    <message>
+        <source>Error: Dumpfile format record is incorrect. Got "%s", expected "format".</source>
+        <translation>Chyba: Záznam formátu súboru výpisu je nesprávny. Získané "%s", očakávané "format".</translation>
+    </message>
+    <message>
+        <source>Error: Dumpfile identifier record is incorrect. Got "%s", expected "%s".</source>
+        <translation>Chyba: Záznam identifikátora súboru výpisu je nesprávny. Získané "%s", očakávané "%s".</translation>
+    </message>
+    <message>
+        <source>Error: Dumpfile version is not supported. This version of bitcoin-wallet only supports version 1 dumpfiles. Got dumpfile with version %s</source>
+        <translation>Chyba: Verzia súboru výpisu nie je podporovaná. Táto verzia bitcoin-wallet podporuje iba súbory výpisu verzie 1. Získaný súbor výpisu s verziou %s</translation>
+    </message>
+    <message>
+        <source>Failed to rename invalid peers.dat file. Please move or delete it and try again.</source>
+        <translation>Nepodarilo sa premenovať neplatný súbor peers.dat. Prosím presuňte ho alebo vymažte a skúste to znova.</translation>
+    </message>
+    <message>
+        <source>Fee estimation failed. Fallbackfee is disabled. Wait a few blocks or enable %s.</source>
+        <translation>Odhad poplatku zlyhal. Fallbackfee je zakázaný. Počkajte niekoľko blokov alebo povoľte %s.</translation>
+    </message>
+    <message>
+        <source>File %s already exists. If you are sure this is what you want, move it out of the way first.</source>
+        <translation>Súbor %s už existuje. Ak ste si istý, že to je to, čo chcete, najprv ho presuňte preč.</translation>
+    </message>
+    <message>
+        <source>Incompatible options: -dnsseed=1 was explicitly specified, but -onlynet forbids connections to IPv4/IPv6</source>
+        <translation>Nekompatibilné voľby: -dnsseed=1 bolo výslovne zadané, ale -onlynet zakazuje pripojenia k IPv4/IPv6</translation>
+    </message>
     <message>
         <source>Incorrect or no devnet genesis block found. Wrong datadir for devnet specified?</source>
         <translation>Nebol nájdený správny, prípadne žiadny základný blok. Nezadali ste nesprávny dátový priečinok alebo vývojársku sieť?</translation>
     </message>
+    <message>
+        <source>Invalid amount for %s=&lt;amount&gt;: '%s' (must be at least the minrelay fee of %s to prevent stuck transactions)</source>
+        <translation>Neplatná suma pre %s=&lt;suma&gt;: '%s' (musí byť aspoň minrelay poplatok %s, aby sa zabránilo zaseknuť transakciám)</translation>
+    </message>
+    <message>
+        <source>Invalid or corrupt peers.dat (%s). If you believe this is a bug, please report it to %s. As a workaround, you can move the file (%s) out of the way (rename, move, or delete) to have a new one created on the next start.</source>
+        <translation>Neplatný alebo poškodený peers.dat (%s). Ak si myslíte, že je to chyba, nahláste ju na %s. Ako dočasné riešenie môžete presunúť súbor (%s) preč (premenovať, presunúť alebo vymazať), aby sa pri ďalšom štarte vytvoril nový.</translation>
+    </message>
+    <message>
+        <source>No dump file provided. To use createfromdump, -dumpfile=&lt;filename&gt; must be provided.</source>
+        <translation>Nebol poskytnutý súbor výpisu. Na použitie createfromdump musí byť zadané -dumpfile=&lt;názov_súboru&gt;.</translation>
+    </message>
+    <message>
+        <source>No dump file provided. To use dump, -dumpfile=&lt;filename&gt; must be provided.</source>
+        <translation>Nebol poskytnutý súbor výpisu. Na použitie výpisu musí byť zadané -dumpfile=&lt;názov_súboru&gt;.</translation>
+    </message>
+    <message>
+        <source>No wallet file format provided. To use createfromdump, -format=&lt;format&gt; must be provided.</source>
+        <translation>Nebol poskytnutý formát súboru peňaženky. Na použitie createfromdump musí byť zadané -format=&lt;formát&gt;.</translation>
+    </message>
+    <message>
+        <source>Outbound connections restricted to CJDNS (-onlynet=cjdns) but -cjdnsreachable is not provided</source>
+        <translation>Odchádzajúce pripojenia obmedzené na CJDNS (-onlynet=cjdns), ale -cjdnsreachable nie je poskytnuté</translation>
+    </message>
+    <message>
+        <source>Outbound connections restricted to Tor (-onlynet=onion) but the proxy for reaching the Tor network is explicitly forbidden: -onion=0</source>
+        <translation>Odchádzajúce pripojenia obmedzené na Tor (-onlynet=onion), ale proxy pre dosiahnutie siete Tor je výslovne zakázané: -onion=0</translation>
+    </message>
+    <message>
+        <source>Outbound connections restricted to Tor (-onlynet=onion) but the proxy for reaching the Tor network is not provided: none of -proxy, -onion or -listenonion is given</source>
+        <translation>Odchádzajúce pripojenia obmedzené na Tor (-onlynet=onion), ale proxy pre dosiahnutie siete Tor nie je poskytnuté: nie je zadané ani -proxy, -onion alebo -listenonion</translation>
+    </message>
+    <message>
+        <source>Outbound connections restricted to i2p (-onlynet=i2p) but -i2psam is not provided</source>
+        <translation>Odchádzajúce pripojenia obmedzené na i2p (-onlynet=i2p), ale -i2psam nie je poskytnuté</translation>
+    </message>
     <message>
         <source>Please check that your computer's date and time are correct! If your clock is wrong, %s will not work properly.</source>
         <translation>Prosím skontrolujte systémový čas a dátum. Keď je váš čas nesprávny, %s nebude fungovať správne.</translation>
@@ -4449,6 +5870,14 @@
         <source>Please contribute if you find %s useful. Visit %s for further information about the software.</source>
         <translation>Keď si myslíte, že %s je užitočný, podporte nás. Pre viac informácií o software navštívte %s.</translation>
     </message>
+    <message>
+        <source>Prune mode is incompatible with -reindex-chainstate. Use full -reindex instead.</source>
+        <translation>Režim orezávania nie je kompatibilný s -reindex-chainstate. Použite namiesto toho úplný -reindex.</translation>
+    </message>
+    <message>
+        <source>This is the maximum transaction fee you pay (in addition to the normal fee) to prioritize partial spend avoidance over regular coin selection.</source>
+        <translation>Toto je maximálny transakčný poplatok, ktorý zaplatíte (okrem bežného poplatku), aby ste uprednostnili vyhýbanie sa čiastočným výdavkom pred bežným výberom mincí.</translation>
+    </message>
     <message>
         <source>This is the transaction fee you may discard if change is smaller than dust at this level</source>
         <translation>Toto je transakčný poplatok, ktorý môžete zahodiť, ak je výdavok menší ako prach pri tejto úrovni</translation>
@@ -4457,14 +5886,38 @@
         <source>This is the transaction fee you may pay when fee estimates are not available.</source>
         <translation>Toto je poplatok za transakciu keď odhad poplatkov ešte nie je k dispozícii.</translation>
     </message>
+    <message>
+        <source>Transaction requires one destination of non-0 value, a non-0 feerate, or a pre-selected input</source>
+        <translation>Transakcia vyžaduje jeden cieľ s hodnotou inou ako 0, sadzbu poplatku inú ako 0 alebo vopred vybraný vstup</translation>
+    </message>
     <message>
         <source>Unable to replay blocks. You will need to rebuild the database using -reindex-chainstate.</source>
         <translation>Bloky nie je možné prehrať. Potrebujete prebudovať databázu použitím -reindex-chainstate.</translation>
     </message>
+    <message>
+        <source>Unknown wallet file format "%s" provided. Please provide one of "bdb" or "sqlite".</source>
+        <translation>Poskytnutý neznámy formát súboru peňaženky "%s". Prosím, poskytnite jeden z "bdb" alebo "sqlite".</translation>
+    </message>
+    <message>
+        <source>Unsupported chainstate database format found. Please restart with -reindex-chainstate. This will rebuild the chainstate database.</source>
+        <translation>Našiel sa nepodporovaný formát databázy chainstate. Prosím, reštartujte s -reindex-chainstate. Toto znovu vytvorí databázu chainstate.</translation>
+    </message>
+    <message>
+        <source>Warning: Dumpfile wallet format "%s" does not match command line specified format "%s".</source>
+        <translation>Upozornenie: Formát výpisového súboru peňaženky "%s" nezodpovedá formátu zadanému v príkazovom riadku "%s".</translation>
+    </message>
     <message>
         <source>Warning: Private keys detected in wallet {%s} with disabled private keys</source>
         <translation>Upozornenie: Boli zistené súkromné kľúče v peňaženke {%s} so zakázanými súkromnými kľúčmi</translation>
     </message>
+    <message>
+        <source>You need to rebuild the database using -reindex to enable -timestampindex</source>
+        <translation>Musíte prebudovať databázu pomocou -reindex, aby ste povolili -timestampindex</translation>
+    </message>
+    <message>
+        <source>%s -- Incorrect seed, it should be a hex string</source>
+        <translation>%s -- Nesprávny seed, mal by to byť hex reťazec</translation>
+    </message>
     <message>
         <source>%s is not a valid backup folder!</source>
         <translation>%s nie je platný priečinok pre zálohu!</translation>
@@ -4489,10 +5942,30 @@
         <source>-rpcport must be specified when -devnet and -server are specified</source>
         <translation>-rpcport musí byť zadaný, keď sú špecifikované -devnet a -server</translation>
     </message>
+    <message>
+        <source>-statsbatchsize cannot be configured with a negative value.</source>
+        <translation>-statsbatchsize nemôže byť nastavené so zápornou hodnotou.</translation>
+    </message>
+    <message>
+        <source>-statsduration cannot be configured with a negative value.</source>
+        <translation>-statsduration nemôže byť nastavené so zápornou hodnotou.</translation>
+    </message>
     <message>
         <source>A fatal internal error occurred, see debug.log for details</source>
         <translation>Vyskytla sa závažná interná chyba, podrobnosti nájdete v debug.log</translation>
     </message>
+    <message>
+        <source>Cannot create socket (socket() returned error %s)</source>
+        <translation>Nie je možné vytvoriť socket (socket() vrátil chybu %s)</translation>
+    </message>
+    <message>
+        <source>Cannot get socket address for %s</source>
+        <translation>Nie je možné získať adresu socketu pre %s</translation>
+    </message>
+    <message>
+        <source>Cannot init Statsd client</source>
+        <translation>Nie je možné inicializovať Statsd klienta</translation>
+    </message>
     <message>
         <source>Cannot resolve -%s address: '%s'</source>
         <translation>Nedá preložiť -%s adresu: '%s'</translation>
@@ -4501,10 +5974,6 @@
         <source>Cannot write to data directory '%s'; check permissions.</source>
         <translation>Nie je možné zapisovať do dátového adresára '%s'. Skontrolujte povolenia.</translation>
     </message>
-    <message>
-        <source>Change index out of range</source>
-        <translation>Menný index mimo rozsah</translation>
-    </message>
     <message>
         <source>Copyright (C)</source>
         <translation>Autorské práva (C)</translation>
@@ -4513,6 +5982,14 @@
         <source>Disk space is too low!</source>
         <translation>Príliš málo miesta na disku!</translation>
     </message>
+    <message>
+        <source>Dump file %s does not exist.</source>
+        <translation>Súbor výpisu %s neexistuje.</translation>
+    </message>
+    <message>
+        <source>Error creating %s</source>
+        <translation>Chyba pri vytváraní %s</translation>
+    </message>
     <message>
         <source>Error loading %s</source>
         <translation>Chyba načítania %s</translation>
@@ -4530,8 +6007,8 @@
         <translation>Chyba pri načítaní %s: Nemôžete vypnúť HD na už existujúcej HD peňaženke</translation>
     </message>
     <message>
-        <source>Error upgrading chainstate database</source>
-        <translation>Chyba pri vylepšení databáze reťzcov blokov</translation>
+        <source>Error reading next record from wallet database</source>
+        <translation>Chyba pri čítaní ďalšieho záznamu z databázy peňaženky</translation>
     </message>
     <message>
         <source>Loading P2P addresses…</source>
@@ -4601,6 +6078,14 @@
         <source>Inputs vs outputs size mismatch.</source>
         <translation>Nesúlad veľkosti vstupov a výstupov.</translation>
     </message>
+    <message>
+        <source>Invalid '%s'. Allowed values: 128, 160, 192, 224, 256.</source>
+        <translation>Neplatné '%s'. Povolené hodnoty: 128, 160, 192, 224, 256.</translation>
+    </message>
+    <message>
+        <source>Invalid -i2psam address or hostname: '%s'</source>
+        <translation>Neplatná adresa -i2psam alebo názov hostiteľa: '%s'</translation>
+    </message>
     <message>
         <source>Invalid -onion address or hostname: '%s'</source>
         <translation>Neplatná -onion adresa alebo hostiteľ: '%s'</translation>
@@ -4645,14 +6130,78 @@
         <source>%s corrupt. Try using the wallet tool dash-wallet to salvage or restoring a backup.</source>
         <translation>%s poškodený. Skúste použiť nástroj peňaženky dash-wallet na záchranu alebo obnovenie zálohy.</translation>
     </message>
+    <message>
+        <source>%s is set very high! Fees this large could be paid on a single transaction.</source>
+        <translation>%s je nastavené veľmi vysoko! Takto veľké poplatky by mohli byť zaplatené v jednej transakcii.</translation>
+    </message>
+    <message>
+        <source>%s request to listen on port %u. This port is considered "bad" and thus it is unlikely that any Dash Core peers connect to it. See doc/p2p-bad-ports.md for details and a full list.</source>
+        <translation>%s požiadavka na počúvanie na porte %u. Tento port je považovaný za "zlý", a preto je nepravdepodobné, že sa k nemu pripoja peery Dash Core. Pozrite doc/p2p-bad-ports.md pre detaily a úplný zoznam.</translation>
+    </message>
+    <message>
+        <source>Cannot provide specific connections and have addrman find outgoing connections at the same time.</source>
+        <translation>Nie je možné poskytnúť špecifické pripojenia a zároveň nechať addrman vyhľadávať odchádzajúce pripojenia.</translation>
+    </message>
+    <message>
+        <source>Failed to upgrade Evo database</source>
+        <translation>Zlyhala aktualizácia Evo databázy</translation>
+    </message>
+    <message>
+        <source>Fee needed &gt; fee paid</source>
+        <translation>Potrebný poplatok &gt; zaplatený poplatok</translation>
+    </message>
+    <message>
+        <source>Host %s on unsupported network</source>
+        <translation>Hostiteľ %s na nepodporovanej sieti</translation>
+    </message>
+    <message>
+        <source>Invalid amount for %s=&lt;amount&gt;: '%s' (must be at least %s)</source>
+        <translation>Neplatná suma pre %s=&lt;amount&gt;: '%s' (musí byť aspoň %s)</translation>
+    </message>
+    <message>
+        <source>Invalid amount for %s=&lt;amount&gt;: '%s'</source>
+        <translation>Neplatná suma pre %s=&lt;amount&gt;: '%s'</translation>
+    </message>
+    <message>
+        <source>Invalid port specified in %s: '%s'</source>
+        <translation>Neplatný port zadaný v %s: '%s'</translation>
+    </message>
     <message>
         <source>Last successful action was too recent.</source>
         <translation>Posledná akcia bola pred chvíľou.</translation>
     </message>
+    <message>
+        <source>Missing solving data for estimating transaction size</source>
+        <translation>Chýbajúce údaje pre odhad veľkosti transakcie</translation>
+    </message>
+    <message>
+        <source>No host specified</source>
+        <translation>Nebol určený hostiteľ</translation>
+    </message>
+    <message>
+        <source>No host specified, malformed URL</source>
+        <translation>Nebol určený hostiteľ, nesprávne formátovaná URL</translation>
+    </message>
+    <message>
+        <source>No text before the scheme delimiter, malformed URL</source>
+        <translation>Žiadny text pred oddeľovačom schémy, nesprávne formátovaná URL</translation>
+    </message>
+    <message>
+        <source>Port must be between %d and %d, supplied %d</source>
+        <translation>Port musí byť medzi %d a %d, zadané %d</translation>
+    </message>
+    <message>
+        <source>Socket not initialized, cannot send message</source>
+        <translation>Socket nie je inicializovaný, nie je možné odoslať správu</translation>
+    </message>
     <message>
         <source>The source code is available from %s.</source>
         <translation>Zdrojový kód je dostupný z %s</translation>
     </message>
+    <message>
+        <source>The specified config file %s does not exist</source>
+        <translation>Zadaný konfiguračný súbor %s neexistuje</translation>
+    </message>
     <message>
         <source>The transaction amount is too small to pay the fee</source>
         <translation>Suma transakcie je príliš malá na zaplatenie poplatku</translation>
@@ -4673,6 +6222,10 @@
         <source>Transaction fees are too high.</source>
         <translation>Transakčné poplatky sú príliš vysoké</translation>
     </message>
+    <message>
+        <source>Transaction needs a change address, but we can't generate it.</source>
+        <translation>Transakcia potrebuje adresu pre výdavok, ale nie je možné ju vygenerovať.</translation>
+    </message>
     <message>
         <source>Transaction not valid.</source>
         <translation>Neplatná transakcia.</translation>
@@ -4693,6 +6246,18 @@
         <source>Unable to locate enough non-denominated funds for this transaction.</source>
         <translation>Pre túto transakciu sa nepodarilo nájsť dostatok ne-denominovaných finančných prostriedkov.</translation>
     </message>
+    <message>
+        <source>Unable to lookup host %s</source>
+        <translation>Nie je možné vyhľadať hostiteľa %s</translation>
+    </message>
+    <message>
+        <source>Unable to parse -maxuploadtarget: '%s'</source>
+        <translation>Nie je možné analyzovať -maxuploadtarget: '%s'</translation>
+    </message>
+    <message>
+        <source>Unable to send message to %s (::sendto() returned error %s)</source>
+        <translation>Nie je možné odoslať správu na %s (::sendto() vrátila chybu %s)</translation>
+    </message>
     <message>
         <source>Unable to sign spork message, wrong key?</source>
         <translation>Nedá sa podpísať spork správa, žeby zlý kľúč?</translation>
@@ -4706,12 +6271,12 @@
         <translation>Neznámy stav: id = %u</translation>
     </message>
     <message>
-        <source>Unsupported logging category %s=%s.</source>
-        <translation>Nepodporovaná záznamová kategória %s =%s.</translation>
+        <source>Unsupported URL scheme, must begin with udp://</source>
+        <translation>Nepodporovaná schéma URL, musí začínať udp://</translation>
     </message>
     <message>
-        <source>Upgrading txindex database</source>
-        <translation>Aktualizácia databázy txindex</translation>
+        <source>Unsupported logging category %s=%s.</source>
+        <translation>Nepodporovaná záznamová kategória %s =%s.</translation>
     </message>
     <message>
         <source>Very low number of keys left: %d</source>
@@ -4741,9 +6306,25 @@
         <source>You can not disable governance validation on a masternode.</source>
         <translation>Overenie riadenia nemôžete na masternóde deaktivovať.</translation>
     </message>
+    <message>
+        <source>You need to rebuild the database using -reindex to enable -addressindex</source>
+        <translation>Musíte prebudovať databázu pomocou -reindex pre povolenie -addressindex</translation>
+    </message>
+    <message>
+        <source>You need to rebuild the database using -reindex to enable -spentindex</source>
+        <translation>Musíte prebudovať databázu pomocou -reindex pre povolenie -spentindex</translation>
+    </message>
     <message>
         <source>Your entries added successfully.</source>
         <translation>Vaše položky boli úspešne pridané.</translation>
     </message>
+    <message>
+        <source>Settings file could not be read</source>
+        <translation>Súbor nastavení sa nepodarilo načítať</translation>
+    </message>
+    <message>
+        <source>Settings file could not be written</source>
+        <translation>Súbor nastavení sa nepodarilo zapísať</translation>
+    </message>
 </context>
 </TS>
\ No newline at end of file

From 3b5f27a43fff9a11286475f43d13d1392d44b016 Mon Sep 17 00:00:00 2001
From: UdjinM6 <UdjinM6@users.noreply.github.com>
Date: Fri, 24 Oct 2025 21:25:52 +0300
Subject: [PATCH 329/656] tr

---
 src/qt/locale/dash_tr.ts | 2057 +++++++++++++++++++++++++++++++++-----
 1 file changed, 1817 insertions(+), 240 deletions(-)

diff --git a/src/qt/locale/dash_tr.ts b/src/qt/locale/dash_tr.ts
index 5b441cfb3d9f..bdbb5c17770a 100644
--- a/src/qt/locale/dash_tr.ts
+++ b/src/qt/locale/dash_tr.ts
@@ -65,14 +65,6 @@
         <source>C&amp;hoose</source>
         <translation>S&amp;eçiniz</translation>
     </message>
-    <message>
-        <source>Sending addresses</source>
-        <translation>Gönderilen adresler</translation>
-    </message>
-    <message>
-        <source>Receiving addresses</source>
-        <translation>Alım adresleri</translation>
-    </message>
     <message>
         <source>These are your Dash addresses for sending payments. Always check the amount and the receiving address before sending coins.</source>
         <translation>Bunlar ödemeleri göndermek için kullanacağınız Dash adreslerinizdir. Dash yollamadan önce tutarı ve alıcının alım adresini her zaman kontrol ediniz.</translation>
@@ -94,8 +86,8 @@
         <translation>&amp;Değiştir</translation>
     </message>
     <message>
-        <source>&amp;Show address QR code</source>
-        <translation>&amp;Adresin QR kodunu göster</translation>
+        <source>Show address &amp;QR code</source>
+        <translation>Adres &amp;QR kodunu göster</translation>
     </message>
     <message>
         <source>QR code</source>
@@ -105,6 +97,24 @@
         <source>Export Address List</source>
         <translation>Adres Listesini Dışarı Aktar</translation>
     </message>
+    <message>
+        <source>Comma separated file</source>
+        <extracomment>Expanded name of the CSV file format. See: https://en.wikipedia.org/wiki/Comma-separated_values.</extracomment>
+        <translation>Virgülle ayrılmış dosya</translation>
+    </message>
+    <message>
+        <source>There was an error trying to save the address list to %1. Please try again.</source>
+        <extracomment>An error message. %1 is a stand-in argument for the name of the file we attempted to save to.</extracomment>
+        <translation>Adres listesini %1 konumuna kaydederken bir hata oluştu. Lütfen tekrar deneyin.</translation>
+    </message>
+    <message>
+        <source>Sending addresses - %1</source>
+        <translation>Gönderme adresleri - %1</translation>
+    </message>
+    <message>
+        <source>Receiving addresses - %1</source>
+        <translation>Alma adresleri - %1</translation>
+    </message>
     <message>
         <source>Exporting Failed</source>
         <translation>Dışarı aktarmada hata</translation>
@@ -274,10 +284,22 @@
         <source>The passphrase entered for the wallet decryption was incorrect.</source>
         <translation>Cüzdan şifresinin açılması için girilen parola yanlıştı.</translation>
     </message>
+    <message>
+        <source>The passphrase entered for the wallet decryption is incorrect. It contains a null character (ie - a zero byte). If the passphrase was set with a version of this software prior to 23.0, please try again with only the characters up to — but not including — the first null character. If this is successful, please set a new passphrase to avoid this issue in the future.</source>
+        <translation>Cüzdan şifresinin açılması için girilen parola yanlış. Null karakter içeriyor (yani - sıfır bayt). Parola bu yazılımın 23.0 öncesi bir sürümüyle ayarlandıysa, lütfen yalnızca ilk null karaktere kadarki karakterlerle tekrar deneyin (ilk null karakter hariç). Bu başarılı olursa, gelecekte bu sorundan kaçınmak için lütfen yeni bir parola belirleyin.</translation>
+    </message>
     <message>
         <source>Wallet passphrase was successfully changed.</source>
         <translation>Cüzdan parolası başarılı bir şekilde değiştirildi.</translation>
     </message>
+    <message>
+        <source>Passphrase change failed</source>
+        <translation>Parola değiştirme başarısız oldu</translation>
+    </message>
+    <message>
+        <source>The old passphrase entered for the wallet decryption is incorrect. It contains a null character (ie - a zero byte). If the passphrase was set with a version of this software prior to 23.0, please try again with only the characters up to — but not including — the first null character.</source>
+        <translation>Cüzdan şifresinin açılması için girilen eski parola yanlış. Null karakter içeriyor (yani - sıfır bayt). Parola bu yazılımın 23.0 öncesi bir sürümüyle ayarlandıysa, lütfen yalnızca ilk null karaktere kadarki karakterlerle tekrar deneyin (ilk null karakter hariç).</translation>
+    </message>
     <message>
         <source>Warning: The Caps Lock key is on!</source>
         <translation>Uyarı: Caps Lock tuşu etkin durumda!</translation>
@@ -303,7 +325,23 @@
 </context>
 <context>
     <name>BitcoinApplication</name>
-    </context>
+    <message>
+        <source>Runaway exception</source>
+        <translation>Kontrolsüz istisna</translation>
+    </message>
+    <message>
+        <source>A fatal error occurred. %1 can no longer continue safely and will quit.</source>
+        <translation>Kritik bir hata oluştu. %1 artık güvenli bir şekilde devam edemez ve kapanacak.</translation>
+    </message>
+    <message>
+        <source>Internal error</source>
+        <translation>Dahili hata</translation>
+    </message>
+    <message>
+        <source>An internal error occurred. %1 will attempt to continue safely. This is an unexpected bug which can be reported as described below.</source>
+        <translation>Dahili bir hata oluştu. %1 güvenli bir şekilde devam etmeye çalışacak. Bu beklenmeyen bir hata olup aşağıda açıklandığı gibi raporlanabilir.</translation>
+    </message>
+</context>
 <context>
     <name>BitcoinGUI</name>
     <message>
@@ -330,6 +368,10 @@
         <source>Request payments (generates QR codes and dash: URIs)</source>
         <translation>Ödeme talep et (QR kodu ve Dash URI'si oluşturur)</translation>
     </message>
+    <message>
+        <source>Ctrl+Q</source>
+        <translation>Ctrl+Q</translation>
+    </message>
     <message>
         <source>&amp;Options…</source>
         <translation>&amp;Seçenekler…</translation>
@@ -358,6 +400,10 @@
         <source>&amp;Verify message…</source>
         <translation>İletiyi &amp;kontrol et…</translation>
     </message>
+    <message>
+        <source>&amp;Load PSBT from file…</source>
+        <translation>PSBT'yi dosyadan &amp;yükle…</translation>
+    </message>
     <message>
         <source>&amp;Sending addresses</source>
         <translation>&amp;Gönderilen adresler</translation>
@@ -390,10 +436,6 @@
         <source>&amp;Window</source>
         <translation>&amp;Pencere</translation>
     </message>
-    <message>
-        <source>Minimize</source>
-        <translation>Küçült</translation>
-    </message>
     <message>
         <source>Zoom</source>
         <translation>Yakınlaştır</translation>
@@ -446,14 +488,6 @@
         <source>Modify configuration options for %1</source>
         <translation>%1 için yapılandırma ayarlarını değiştir</translation>
     </message>
-    <message>
-        <source>&amp;Show / Hide</source>
-        <translation>&amp;Göster / Gizle</translation>
-    </message>
-    <message>
-        <source>Show or hide the main Window</source>
-        <translation>Ana pencereyi göster ya da gizle</translation>
-    </message>
     <message>
         <source>Encrypt the private keys that belong to your wallet</source>
         <translation>Cüzdanınıza ait özel anahtarları şifreleyin</translation>
@@ -518,10 +552,6 @@
         <source>Show wallet repair options</source>
         <translation>Cüzdan tamir seçeneklerini göster</translation>
     </message>
-    <message>
-        <source>Open Wallet &amp;Configuration File</source>
-        <translation>Cüzdan &amp;Ayar Dosyasını Aç</translation>
-    </message>
     <message>
         <source>Open configuration file</source>
         <translation>Yapılandırma Dosyasını Aç</translation>
@@ -576,10 +606,40 @@
         <source>Show information about %1</source>
         <translation>%1 ile ilgili bilgileri göster</translation>
     </message>
+    <message>
+        <source>Load PSBT from &amp;clipboard…</source>
+        <translation>PSBT'yi &amp;panodan yükle…</translation>
+    </message>
+    <message>
+        <source>Open debugging and diagnostic console</source>
+        <translation>Hata ayıklama ve tanı konsolunu aç</translation>
+    </message>
+    <message>
+        <source>Open &amp;wallet configuration file</source>
+        <translation>&amp;Cüzdan yapılandırma dosyasını aç</translation>
+    </message>
+    <message>
+        <source>Open a dash: URI</source>
+        <translation>Bir dash: URI aç</translation>
+    </message>
     <message>
         <source>Create a new wallet</source>
         <translation>Yeni bir cüzdan oluştur</translation>
     </message>
+    <message>
+        <source>Restore Wallet…</source>
+        <extracomment>Name of the menu item that restores wallet from a backup file.</extracomment>
+        <translation>Cüzdanı Geri Yükle…</translation>
+    </message>
+    <message>
+        <source>Restore a wallet from a backup file</source>
+        <extracomment>Status tip for Restore Wallet menu item</extracomment>
+        <translation>Yedekleme dosyasından bir cüzdanı geri yükle</translation>
+    </message>
+    <message>
+        <source>Close all wallets</source>
+        <translation>Tüm cüzdanları kapat</translation>
+    </message>
     <message>
         <source>%1 &amp;information</source>
         <translation>%1 &amp;Bilgi</translation>
@@ -588,10 +648,42 @@
         <source>Show the %1 basic information</source>
         <translation>%1 temel bilgilerini göster</translation>
     </message>
+    <message>
+        <source>&amp;Discreet mode</source>
+        <translation>&amp;Gizli mod</translation>
+    </message>
+    <message>
+        <source>Mask the values in the Overview tab</source>
+        <translation>Genel Bakış sekmesindeki değerleri gizle</translation>
+    </message>
+    <message>
+        <source>Wallet Data</source>
+        <extracomment>Name of the wallet data file format.</extracomment>
+        <translation>Cüzdan Verisi</translation>
+    </message>
+    <message>
+        <source>Load Wallet Backup</source>
+        <extracomment>The title for Restore Wallet File Windows</extracomment>
+        <translation>Cüzdan Yedeğini Yükle</translation>
+    </message>
+    <message>
+        <source>Restore Wallet</source>
+        <extracomment>Title of pop-up window shown when the user is attempting to restore a wallet.</extracomment>
+        <translation>Cüzdanı Geri Yükle</translation>
+    </message>
+    <message>
+        <source>Wallet Name</source>
+        <extracomment>Label of the input field where the name of the wallet is entered.</extracomment>
+        <translation>Cüzdan Adı</translation>
+    </message>
     <message>
         <source>&amp;Settings</source>
         <translation>&amp;Ayarlar</translation>
     </message>
+    <message>
+        <source>&amp;Minimize</source>
+        <translation>&amp;Küçült</translation>
+    </message>
     <message>
         <source>&amp;Help</source>
         <translation>&amp;Yardım</translation>
@@ -608,8 +700,17 @@
         <source>View Governance Proposals</source>
         <translation>Yönetim Tekliflerini Görüntüle</translation>
     </message>
+    <message>
+        <source>&amp;Hide</source>
+        <translation>&amp;Gizle</translation>
+    </message>
+    <message>
+        <source>S&amp;how</source>
+        <translation>&amp;Göster</translation>
+    </message>
     <message numerus="yes">
         <source>%n active connection(s) to Dash network</source>
+        <extracomment>A substring of the tooltip.</extracomment>
         <translation><numerusform>Dash ağına %n aktif bağlantı</numerusform><numerusform>Dash ağına %n aktif bağlantı</numerusform></translation>
     </message>
     <message>
@@ -628,10 +729,50 @@
         <source>Close Wallet…</source>
         <translation>Kapalı Cüzdan…</translation>
     </message>
+    <message>
+        <source>Load Partially Signed Blockchain Transaction</source>
+        <translation>Kısmen İmzalanmış Blokzincir İşlemini Yükle</translation>
+    </message>
+    <message>
+        <source>Load Partially Signed Blockchain Transaction from clipboard</source>
+        <translation>Panodan Kısmen İmzalanmış Blokzincir İşlemini Yükle</translation>
+    </message>
     <message>
         <source>Create Wallet…</source>
         <translation>Cüzdan Oluştur…</translation>
     </message>
+    <message>
+        <source>Close All Wallets…</source>
+        <translation>Tüm Cüzdanları Kapat…</translation>
+    </message>
+    <message>
+        <source>Ctrl+Shift+D</source>
+        <translation>Ctrl+Shift+D</translation>
+    </message>
+    <message>
+        <source>Ctrl+M</source>
+        <translation>Ctrl+M</translation>
+    </message>
+    <message>
+        <source>Click for more actions.</source>
+        <extracomment>A substring of the tooltip. "More actions" are available via the context menu.</extracomment>
+        <translation>Daha fazla eylem için tıklayın.</translation>
+    </message>
+    <message>
+        <source>Show Peers tab</source>
+        <extracomment>A context menu item. The "Peers tab" is an element of the "Node window".</extracomment>
+        <translation>Eşler sekmesini göster</translation>
+    </message>
+    <message>
+        <source>Disable network activity</source>
+        <extracomment>A context menu item.</extracomment>
+        <translation>Ağ etkinliğini devre dışı bırak</translation>
+    </message>
+    <message>
+        <source>Enable network activity</source>
+        <extracomment>A context menu item. The network activity was disabled previously.</extracomment>
+        <translation>Ağ etkinliğini etkinleştir</translation>
+    </message>
     <message>
         <source>Syncing Headers (%1%)…</source>
         <translation>Üstbilgiler Senkronize Ediliyor (%1%)…</translation>
@@ -648,10 +789,6 @@
         <source>Processing blocks on disk…</source>
         <translation>Bloklar diske işleniyor…</translation>
     </message>
-    <message>
-        <source>Reindexing blocks on disk…</source>
-        <translation>Diskteki bloklar yeniden indeksleniyor…</translation>
-    </message>
     <message>
         <source>Connecting to peers…</source>
         <translation>Eşlere bağlanılıyor…</translation>
@@ -805,10 +942,6 @@
         <source>Coin Selection</source>
         <translation>Bitcoin Seçimi</translation>
     </message>
-    <message>
-        <source>Dust:</source>
-        <translation>Toz:</translation>
-    </message>
     <message>
         <source>After Fee:</source>
         <translation>Ücretten sonra:</translation>
@@ -866,28 +999,32 @@
         <translation>Doğrulandı</translation>
     </message>
     <message>
-        <source>Copy address</source>
-        <translation>Adres kopyala</translation>
+        <source>Copy amount</source>
+        <translation>Tutarı kopyala</translation>
+    </message>
+    <message>
+        <source>&amp;Copy address</source>
+        <translation>&amp;Adresi kopyala</translation>
     </message>
     <message>
-        <source>Copy label</source>
-        <translation>Etiket kopyala</translation>
+        <source>Copy &amp;label</source>
+        <translation>&amp;Etiketi kopyala</translation>
     </message>
     <message>
-        <source>Copy amount</source>
-        <translation>Tutarı kopyala</translation>
+        <source>Copy &amp;amount</source>
+        <translation>&amp;Miktarı kopyala</translation>
     </message>
     <message>
-        <source>Copy transaction ID</source>
-        <translation>İşlem ID'sini kopyala</translation>
+        <source>Copy transaction &amp;ID and output index</source>
+        <translation>İşlem &amp;kimliğini ve çıktı dizinini kopyala</translation>
     </message>
     <message>
-        <source>Lock unspent</source>
-        <translation>Harcanmamışı kilitle</translation>
+        <source>L&amp;ock unspent</source>
+        <translation>Harcanmamışı &amp;kilitle</translation>
     </message>
     <message>
-        <source>Unlock unspent</source>
-        <translation>Harcanmamışın kilidini aç</translation>
+        <source>&amp;Unlock unspent</source>
+        <translation>Harcanmamışın &amp;kilidini aç</translation>
     </message>
     <message>
         <source>Copy quantity</source>
@@ -905,10 +1042,6 @@
         <source>Copy bytes</source>
         <translation>Baytları kopyala</translation>
     </message>
-    <message>
-        <source>Copy dust</source>
-        <translation>Tozu kopyala</translation>
-    </message>
     <message>
         <source>Copy change</source>
         <translation>Para üstünü kopyala</translation>
@@ -921,18 +1054,6 @@
         <source>(%1 locked)</source>
         <translation>(%1 kilitlendi)</translation>
     </message>
-    <message>
-        <source>yes</source>
-        <translation>Evet</translation>
-    </message>
-    <message>
-        <source>no</source>
-        <translation>Hayır</translation>
-    </message>
-    <message>
-        <source>This label turns red if any recipient receives an amount smaller than the current dust threshold.</source>
-        <translation>Eğer herhangi bir alıcı mevcut toz eşiğinden daha düşük bir tutar alırsa bu etiket kırmızıya dönüşür.</translation>
-    </message>
     <message>
         <source>Can vary +/- %1 duff(s) per input.</source>
         <translation>Girdi başına +/- %1 duff değişebilir.</translation>
@@ -976,8 +1097,14 @@
 </context>
 <context>
     <name>CreateWalletActivity</name>
+    <message>
+        <source>Create Wallet</source>
+        <extracomment>Title of window indicating the progress of creation of a new wallet.</extracomment>
+        <translation>Cüzdan Oluştur</translation>
+    </message>
     <message>
         <source>Creating Wallet &lt;b&gt;%1&lt;/b&gt;…</source>
+        <extracomment>Descriptive text of the create wallet progress window which indicates to the user which wallet is currently being created.</extracomment>
         <translation>&lt;b&gt;%1&lt;/b&gt; Cüzdan Oluşturuluyor…</translation>
     </message>
     <message>
@@ -999,6 +1126,10 @@
         <source>Wallet Name</source>
         <translation>Cüzdan Adı</translation>
     </message>
+    <message>
+        <source>Wallet</source>
+        <translation>Cüzdan</translation>
+    </message>
     <message>
         <source>Encrypt the wallet. The wallet will be encrypted with a passphrase of your choice.</source>
         <translation>Cüzdanı şifreleyin. Cüzdan, seçtiğiniz parola ile şifrelenecektir.</translation>
@@ -1007,6 +1138,10 @@
         <source>Encrypt Wallet</source>
         <translation>Cüzdanı Şifrele</translation>
     </message>
+    <message>
+        <source>Advanced Options</source>
+        <translation>Gelişmiş Seçenekler</translation>
+    </message>
     <message>
         <source>Disable private keys for this wallet. Wallets with private keys disabled will have no private keys and cannot have an HD seed or imported private keys. This is ideal for watch-only wallets.</source>
         <translation>Bu cüzdan için özel anahtarları devre dışı bırakın. Özel anahtarların devre dışı bırakıldığı cüzdanlarda özel anahtar bulunmaz ve HD tohum veya içe aktarılan özel anahtarlar olamaz. Bu, yalnızca izlenebilen cüzdanlar için idealdir.</translation>
@@ -1023,11 +1158,23 @@
         <source>Make Blank Wallet</source>
         <translation>Boş Bir Cüzdan Oluşturun</translation>
     </message>
+    <message>
+        <source>Use descriptors for scriptPubKey management. This feature is well-tested but still considered experimental and not recommended for use yet.</source>
+        <translation>scriptPubKey yönetimi için tanımlayıcıları kullanın. Bu özellik iyi test edilmiştir ancak hala deneysel olarak kabul edilir ve henüz kullanımı önerilmez.</translation>
+    </message>
+    <message>
+        <source>Descriptor Wallet (EXPERIMENTAL)</source>
+        <translation>Tanımlayıcı Cüzdan (DENEYSEL)</translation>
+    </message>
     <message>
         <source>Create</source>
         <translation>Oluştur</translation>
     </message>
-    </context>
+    <message>
+        <source>Compiled without sqlite support (required for descriptor wallets)</source>
+        <translation>SQLite desteği olmadan derlenmiş (tanımlayıcı cüzdanlar için gerekli)</translation>
+    </message>
+</context>
 <context>
     <name>EditAddressDialog</name>
     <message>
@@ -1116,18 +1263,106 @@
         <source>Filter List:</source>
         <translation>Filtre Listesi:</translation>
     </message>
+    <message>
+        <source>Filter proposal list</source>
+        <translation>Teklif listesini filtrele</translation>
+    </message>
+    <message>
+        <source>Masternode Count:</source>
+        <translation>Masternode Sayısı:</translation>
+    </message>
+    <message>
+        <source>Number of masternodes this wallet can vote with (masternodes for which this wallet holds the voting key)</source>
+        <translation>Bu cüzdanın oy verebileceği masternode sayısı (bu cüzdanın oy anahtarını tuttuğu masternodelar)</translation>
+    </message>
     <message>
         <source>Proposal Count:</source>
         <translation>Teklif Sayısı:</translation>
     </message>
+    <message>
+        <source>Create Proposal</source>
+        <translation>Teklif Oluştur</translation>
+    </message>
     <message>
         <source>Filter by Title</source>
         <translation>Başlığa göre filtrele</translation>
     </message>
+    <message>
+        <source>Unavailable</source>
+        <translation>Kullanılamıyor</translation>
+    </message>
+    <message>
+        <source>A synced node and an unlocked wallet are required.</source>
+        <translation>Senkronize edilmiş bir düğüm ve kilidi açılmış bir cüzdan gereklidir.</translation>
+    </message>
+    <message>
+        <source>Vote Yes</source>
+        <translation>Evet Oyu</translation>
+    </message>
+    <message>
+        <source>Vote No</source>
+        <translation>Hayır Oyu</translation>
+    </message>
+    <message>
+        <source>Vote Abstain</source>
+        <translation>Çekimser Oy</translation>
+    </message>
     <message>
         <source>Proposal Info: %1</source>
         <translation>Teklif Bilgisi: %1</translation>
     </message>
+    <message>
+        <source>Voting Failed</source>
+        <translation>Oylama Başarısız</translation>
+    </message>
+    <message>
+        <source>No wallet available.</source>
+        <translation>Kullanılabilir cüzdan yok.</translation>
+    </message>
+    <message>
+        <source>No masternode voting keys found in wallet.</source>
+        <translation>Cüzdanda masternode oylama anahtarı bulunamadı.</translation>
+    </message>
+    <message>
+        <source>Please select a proposal to vote on.</source>
+        <translation>Lütfen oy verilecek bir teklif seçin.</translation>
+    </message>
+    <message>
+        <source>Unable to unlock wallet.</source>
+        <translation>Cüzdanın kilidi açılamıyor.</translation>
+    </message>
+    <message>
+        <source>Unable to get masternode list. Please try again later.</source>
+        <translation>Masternode listesi alınamıyor. Lütfen daha sonra tekrar deneyin.</translation>
+    </message>
+    <message>
+        <source>Masternode %1 not found</source>
+        <translation>Masternode %1 bulunamadı</translation>
+    </message>
+    <message>
+        <source>Failed to sign vote for masternode %1</source>
+        <translation>Masternode %1 için oy imzalanamadı</translation>
+    </message>
+    <message>
+        <source>Masternode %1: %2</source>
+        <translation>Masternode %1: %2</translation>
+    </message>
+    <message numerus="yes">
+        <source>Voted successfully %n time(s)</source>
+        <translation><numerusform>%n kez başarıyla oy verildi</numerusform><numerusform>%n kez başarıyla oy verildi</numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <source>Failed to vote %n time(s)</source>
+        <translation><numerusform>%n kez oy verilemedi</numerusform><numerusform>%n kez oy verilemedi</numerusform></translation>
+    </message>
+    <message>
+        <source>Errors:</source>
+        <translation>Hatalar:</translation>
+    </message>
+    <message>
+        <source>Voting Results</source>
+        <translation>Oylama Sonuçları</translation>
+    </message>
 </context>
 <context>
     <name>HelpMessageDialog</name>
@@ -1166,10 +1401,26 @@
         <source>As this is the first time the program is launched, you can choose where %1 will store its data.</source>
         <translation>Bu programın ilk kez başlatılmasından dolayı %1 yazılımının verilerini nerede saklayacağını seçebilirsiniz.</translation>
     </message>
+    <message>
+        <source>Limit block chain storage to</source>
+        <translation>Blok zinciri depolamasını sınırla</translation>
+    </message>
+    <message>
+        <source>Reverting this setting requires re-downloading the entire blockchain. It is faster to download the full chain first and prune it later. Disables some advanced features.</source>
+        <translation>Bu ayarı geri almak tüm blok zincirinin yeniden indirilmesini gerektirir. Önce tam zinciri indirip daha sonra budamak daha hızlıdır. Bazı gelişmiş özellikleri devre dışı bırakır.</translation>
+    </message>
+    <message>
+        <source> GB</source>
+        <translation> GB</translation>
+    </message>
     <message>
         <source>This initial synchronisation is very demanding, and may expose hardware problems with your computer that had previously gone unnoticed. Each time you run %1, it will continue downloading where it left off.</source>
         <translation>Bu başlangıç senkronizasyonu çok zorlayıcıdır ve bilgisayarınızdaki daha önce fark edilmemiş olan donanım sorunlarını ortaya çıkarabilir. %1'i her çalıştırdığınızda, kaldığı yerden devam edecektir.</translation>
     </message>
+    <message>
+        <source>When you click OK, %1 will begin to download and process the full %4 block chain (%2 GB) starting with the earliest transactions in %3 when %4 initially launched.</source>
+        <translation>Tamam'a tıkladığınızda, %1, %4 ilk başlatıldığında %3'teki en eski işlemlerden başlayarak tam %4 blok zincirini (%2 GB) indirmeye ve işlemeye başlayacaktır.</translation>
+    </message>
     <message>
         <source>If you have chosen to limit block chain storage (pruning), the historical data must still be downloaded and processed, but will be deleted afterward to keep your disk usage low.</source>
         <translation>Blok zinciri saklamayı sınırlamayı seçtiyseniz (budama), geçmiş veriler yine de indirilmeli ve işlenmelidir, ancak disk kullanımınızı düşük tutmak için daha sonra silinmelidir.</translation>
@@ -1182,6 +1433,18 @@
         <source>Use a custom data directory:</source>
         <translation>Özel bir veri klasörü kullan:</translation>
     </message>
+    <message numerus="yes">
+        <source>%n GB of space available</source>
+        <translation><numerusform>%n GB alan mevcut</numerusform><numerusform>%n GB alan mevcut</numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <source>(of %n GB needed)</source>
+        <translation><numerusform>(%n GB gerekli)</numerusform><numerusform>(%n GB gerekli)</numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <source>(%n GB needed for full chain)</source>
+        <translation><numerusform>(tam zincir için %n GB gerekli)</numerusform><numerusform>(tam zincir için %n GB gerekli)</numerusform></translation>
+    </message>
     <message>
         <source>At least %1 GB of data will be stored in this directory, and it will grow over time.</source>
         <translation>Bu dizinde en az %1 GB lık veri depolanacak ve zamanla büyüyecek.</translation>
@@ -1190,6 +1453,11 @@
         <source>Approximately %1 GB of data will be stored in this directory.</source>
         <translation>Yaklaşık %1 GB veri bu dizinde depolanacak.</translation>
     </message>
+    <message numerus="yes">
+        <source>(sufficient to restore backups %n day(s) old)</source>
+        <extracomment>Explanatory text on the capability of the current prune target.</extracomment>
+        <translation><numerusform>(%n gün önceki yedekleri geri yüklemek için yeterli)</numerusform><numerusform>(%n gün önceki yedekleri geri yüklemek için yeterli)</numerusform></translation>
+    </message>
     <message>
         <source>%1 will download and store a copy of the Dash block chain.</source>
         <translation>%1 lik Dash blok zinciri nin bir kopyasını indirecek ve depolayacak.</translation>
@@ -1207,6 +1475,13 @@
         <translation>Hata</translation>
     </message>
 </context>
+<context>
+    <name>LoadWalletsActivity</name>
+    <message>
+        <source>Loading wallets…</source>
+        <translation>Cüzdanlar yükleniyor…</translation>
+    </message>
+</context>
 <context>
     <name>MasternodeList</name>
     <message>
@@ -1241,6 +1516,10 @@
         <source>Service</source>
         <translation>Hizmet</translation>
     </message>
+    <message>
+        <source>Type</source>
+        <translation>Tür</translation>
+    </message>
     <message>
         <source>PoSe Score</source>
         <translation>PoSe Puanı</translation>
@@ -1376,6 +1655,10 @@
         <source>Hide</source>
         <translation>Gizle</translation>
     </message>
+    <message>
+        <source>%1 is currently syncing.  It will download headers and blocks from peers and validate them until reaching the tip of the block chain.</source>
+        <translation>%1 şu anda senkronize oluyor. Eşlerden başlıkları ve blokları indirecek ve blok zincirinin ucuna ulaşana kadar bunları doğrulayacak.</translation>
+    </message>
     <message>
         <source>Unknown. Syncing Headers (%1, %2%)…</source>
         <translation>Bilinmeyen. Başlıklar Senkronize Ediliyor (%1, %2%)…</translation>
@@ -1391,6 +1674,11 @@
         <source>URI:</source>
         <translation>URI:</translation>
     </message>
+    <message>
+        <source>Paste address from clipboard</source>
+        <extracomment>Tooltip text for button that allows you to paste an address that is in your clipboard.</extracomment>
+        <translation>Panodan adresi yapıştır</translation>
+    </message>
 </context>
 <context>
     <name>OpenWalletActivity</name>
@@ -1406,8 +1694,14 @@
         <source>default wallet</source>
         <translation>varsayılan cüzdan</translation>
     </message>
+    <message>
+        <source>Open Wallet</source>
+        <extracomment>Title of window indicating the progress of opening of a wallet.</extracomment>
+        <translation>Cüzdan Aç</translation>
+    </message>
     <message>
         <source>Opening Wallet &lt;b&gt;%1&lt;/b&gt;…</source>
+        <extracomment>Descriptive text of the open wallet progress window which indicates to the user which wallet is currently being opened.</extracomment>
         <translation>&lt;b&gt;%1&lt;/b&gt; Cüzdan Açılıyor…</translation>
     </message>
 </context>
@@ -1441,6 +1735,14 @@
         <source>&amp;Appearance</source>
         <translation>&amp;Görünüm</translation>
     </message>
+    <message>
+        <source>Show the icon in the system tray.</source>
+        <translation>Sistem tepsisinde simgeyi göster.</translation>
+    </message>
+    <message>
+        <source>&amp;Show tray icon</source>
+        <translation>&amp;Tepsi simgesini göster</translation>
+    </message>
     <message>
         <source>Prune &amp;block storage to</source>
         <translation>Depolamak için buda &amp;engelle</translation>
@@ -1453,10 +1755,58 @@
         <source>Reverting this setting requires re-downloading the entire blockchain.</source>
         <translation>Bu ayarın geri alınması, tüm blok zincirinin yeniden indirilmesini gerektirir.</translation>
     </message>
+    <message>
+        <source>Maximum database cache size. A larger cache can contribute to faster sync, after which the benefit is less pronounced for most use cases. Lowering the cache size will reduce memory usage. Unused mempool memory is shared for this cache.</source>
+        <extracomment>Tooltip text for Options window setting that sets the size of the database cache. Explains the corresponding effects of increasing/decreasing this value.</extracomment>
+        <translation>Maksimum veritabanı önbellek boyutu. Daha büyük bir önbellek daha hızlı senkronizasyona katkıda bulunabilir, bundan sonra fayda çoğu kullanım durumunda daha az belirgindir. Önbellek boyutunu düşürmek bellek kullanımını azaltacaktır. Kullanılmayan mempool belleği bu önbellek için paylaşılır.</translation>
+    </message>
     <message>
         <source>MiB</source>
         <translation>MiB</translation>
     </message>
+    <message>
+        <source>Set the number of script verification threads. Negative values correspond to the number of cores you want to leave free to the system.</source>
+        <extracomment>Tooltip text for Options window setting that sets the number of script verification threads. Explains that negative values mean to leave these many cores free to the system.</extracomment>
+        <translation>Betik doğrulama iş parçacığı sayısını ayarlayın. Negatif değerler, sisteme boş bırakmak istediğiniz çekirdek sayısına karşılık gelir.</translation>
+    </message>
+    <message>
+        <source>This allows you or a third party tool to communicate with the node through command-line and JSON-RPC commands.</source>
+        <extracomment>Tooltip text for Options window setting that enables the RPC server.</extracomment>
+        <translation>Bu, sizin veya üçüncü taraf bir aracın komut satırı ve JSON-RPC komutları aracılığıyla düğümle iletişim kurmasına olanak tanır.</translation>
+    </message>
+    <message>
+        <source>Enable R&amp;PC server</source>
+        <extracomment>An Options window setting to enable the RPC server.</extracomment>
+        <translation>R&amp;PC sunucusunu etkinleştir</translation>
+    </message>
+    <message>
+        <source>Whether to set subtract fee from amount as default or not.</source>
+        <extracomment>Tooltip text for Options window setting that sets subtracting the fee from a sending amount as default.</extracomment>
+        <translation>Varsayılan olarak ücreti tutardan çıkarma ayarının yapılıp yapılmayacağı.</translation>
+    </message>
+    <message>
+        <source>Subtract &amp;fee from amount by default</source>
+        <extracomment>An Options window setting to set subtracting the fee from a sending amount as default.</extracomment>
+        <translation>Varsayılan olarak tutardan &amp;ücreti çıkar</translation>
+    </message>
+    <message>
+        <source>Enable &amp;PSBT controls</source>
+        <extracomment>An options window setting to enable PSBT controls.</extracomment>
+        <translation>&amp;PSBT kontrollerini etkinleştir</translation>
+    </message>
+    <message>
+        <source>Whether to show PSBT controls.</source>
+        <extracomment>Tooltip text for options window setting that enables PSBT controls.</extracomment>
+        <translation>PSBT kontrollerinin gösterilip gösterilmeyeceği.</translation>
+    </message>
+    <message>
+        <source>Whether to keep the specified custom change address or not.</source>
+        <translation>Belirtilen özel para üstü adresinin tutulup tutulmayacağı.</translation>
+    </message>
+    <message>
+        <source>Keep custom change &amp;address</source>
+        <translation>Özel para üstü &amp;adresini tut</translation>
+    </message>
     <message>
         <source>Show additional tab listing all your masternodes in first sub-tab&lt;br/&gt;and all masternodes on the network in second sub-tab.</source>
         <translation>İlk alt sekmede tüm ana düğümlerinizi gösteren ve&lt;br/&gt;ikinci alt sekmede tüm ana düğümleri gösteren ek bir sekme göster.</translation>
@@ -1513,6 +1863,14 @@
         <source>Enable &amp;multi-session</source>
         <translation>&amp;Çoklu oturumu etkinleştir</translation>
     </message>
+    <message>
+        <source>Use this many separate masternodes in parallel to mix funds.&lt;br/&gt;Note: You must use this feature carefully.&lt;br/&gt;Make sure you always have recent wallet (auto)backup in a safe place!</source>
+        <translation>Fonları karıştırmak için paralel olarak bu kadar ayrı masternode kullanın.&lt;br/&gt;Not: Bu özelliği dikkatli kullanmalısınız.&lt;br/&gt;Cüzdanınızın güncel (otomatik) yedeğinin güvenli bir yerde olduğundan her zaman emin olun!</translation>
+    </message>
+    <message>
+        <source>Parallel sessions</source>
+        <translation>Paralel oturumlar</translation>
+    </message>
     <message>
         <source>Mixing rounds</source>
         <translation>Karıştırma Turları</translation>
@@ -1525,6 +1883,30 @@
         <source>Target balance</source>
         <translation>Bakiyesi hedefle</translation>
     </message>
+    <message>
+        <source>How many inputs of each denominated amount are created.&lt;br/&gt;Lower these numbers if you want fewer smaller denominations.</source>
+        <translation>Her bir değerden kaç adet girdi oluşturulacağı.&lt;br/&gt;Daha az küçük değer istiyorsanız bu sayıları düşürün.</translation>
+    </message>
+    <message>
+        <source>Inputs per denomination</source>
+        <translation>Değer başına girdiler</translation>
+    </message>
+    <message>
+        <source>Try to create at least this many inputs for each denominated amount.&lt;br/&gt;Lower this number if you want fewer smaller denominations.</source>
+        <translation>Her bir değer için en az bu kadar girdi oluşturmayı deneyin.&lt;br/&gt;Daha az küçük değer istiyorsanız bu sayıyı düşürün.</translation>
+    </message>
+    <message>
+        <source>Target</source>
+        <translation>Hedef</translation>
+    </message>
+    <message>
+        <source>Create up to this many inputs for each denominated amount.&lt;br/&gt;Lower this number if you want fewer smaller denominations.</source>
+        <translation>Her bir değer için en fazla bu kadar girdi oluşturun.&lt;br/&gt;Daha az küçük değer istiyorsanız bu sayıyı düşürün.</translation>
+    </message>
+    <message>
+        <source>Maximum</source>
+        <translation>Maksimum</translation>
+    </message>
     <message>
         <source>Automatically open the Dash Core client port on the router. This only works when your router supports UPnP and it is enabled.</source>
         <translation>Router'da otomatik olarak Dash Core istemcisi portu aç. Bu sadece router'ınız UPnP destekliyorsa ve etkinse çalışır.</translation>
@@ -1554,20 +1936,26 @@
         <translation>Bu ağ türünde eşlere ulaşmak için varsayılan SOCKS5 proxy'nin kullanılıp kullanılmadığını gösterir.</translation>
     </message>
     <message>
-        <source>Options set in this dialog are overridden by the command line or in the configuration file:</source>
-        <translation>Bu iletişim kutusunda ayarlanan seçenekler, komut satırı veya yapılandırma dosyası tarafından geçersiz kılınır:</translation>
+        <source>Language missing or translation incomplete? Help contributing translations here:
+https://explore.transifex.com/dash/dash/</source>
+        <translation>Dil eksik veya çeviri tamamlanmamış mı? Çevirilere katkıda bulunmak için buraya bakın:
+https://explore.transifex.com/dash/dash/</translation>
     </message>
     <message>
-        <source>Minimize instead of exit the application when the window is closed. When this option is enabled, the application will be closed only after selecting Exit in the menu.</source>
-        <translation>Pencere kapatıldığında uygulamadan çıkmak yerine uygulamayı küçültür. Bu seçenek etkinleştirildiğinde, uygulama sadece menüden çıkış seçildiğinde kapanacaktır.</translation>
+        <source>Third-party URLs (e.g. a block explorer) that appear in the transactions tab as context menu items.&lt;br/&gt;%s in the URL is replaced by transaction hash. Multiple URLs are separated by vertical bar |.</source>
+        <translation>İşlemler sekmesinde bağlam menüsü öğeleri olarak görünen üçüncü taraf URL'ler (örneğin bir blok gezgini).&lt;br/&gt;URL'deki %s, işlem hash'i ile değiştirilir. Birden fazla URL dikey çubuk | ile ayrılır.</translation>
+    </message>
+    <message>
+        <source>&amp;Third-party transaction URLs</source>
+        <translation>&amp;Üçüncü taraf işlem URL'leri</translation>
     </message>
     <message>
-        <source>Third party URLs (e.g. a block explorer) that appear in the transactions tab as context menu items.&lt;br/&gt;%s in the URL is replaced by transaction hash. Multiple URLs are separated by vertical bar |.</source>
-        <translation>İşlemler sekmesinde bağlam menüsü ögeleri gibi görünen  üçüncü parti URLleri (ör. bir blok tarayıcısı).&lt;br/&gt;URL'deki %s işlem hashi ile değiştirilir. Birden fazla URL dikey çizgi | ile ayrılır.</translation>
+        <source>Options set in this dialog are overridden by the command line or in the configuration file:</source>
+        <translation>Bu iletişim kutusunda ayarlanan seçenekler, komut satırı veya yapılandırma dosyası tarafından geçersiz kılınır:</translation>
     </message>
     <message>
-        <source>&amp;Third party transaction URLs</source>
-        <translation>&amp;Üçüncü taraf işlem URL'leri</translation>
+        <source>Minimize instead of exit the application when the window is closed. When this option is enabled, the application will be closed only after selecting Exit in the menu.</source>
+        <translation>Pencere kapatıldığında uygulamadan çıkmak yerine uygulamayı küçültür. Bu seçenek etkinleştirildiğinde, uygulama sadece menüden çıkış seçildiğinde kapanacaktır.</translation>
     </message>
     <message>
         <source>Whether to show coin control features or not.</source>
@@ -1606,7 +1994,11 @@
         <translation>Portları &amp;UPnP kullanarak haritala</translation>
     </message>
     <message>
-        <source>Proxy &amp;IP:</source>
+        <source>Automatically open the Dash Core client port on the router. This only works when your router supports NAT-PMP and it is enabled. The external port could be random.</source>
+        <translation>Yönlendiricide Dash Core istemci portunu otomatik olarak açın. Bu yalnızca yönlendiriciniz NAT-PMP'yi desteklediğinde ve etkinleştirildiğinde çalışır. Harici port rastgele olabilir.</translation>
+    </message>
+    <message>
+        <source>Proxy &amp;IP:</source>
         <translation>Vekil &amp;İP:</translation>
     </message>
     <message>
@@ -1653,6 +2045,14 @@
         <source>&amp;Display</source>
         <translation>&amp;Görünüm</translation>
     </message>
+    <message>
+        <source>Connect to the Dash network through a separate SOCKS5 proxy for Tor onion services.</source>
+        <translation>Tor onion servisleri için ayrı bir SOCKS5 proxy üzerinden Dash ağına bağlanın.</translation>
+    </message>
+    <message>
+        <source>Use separate SOCKS&amp;5 proxy to reach peers via Tor onion services:</source>
+        <translation>Tor onion servisleri üzerinden eşlere ulaşmak için ayrı SOCKS&amp;5 proxy kullanın:</translation>
+    </message>
     <message>
         <source>User Interface &amp;language:</source>
         <translation>Kullanıcı arayüzü &amp;lisanı:</translation>
@@ -1699,14 +2099,22 @@
     </message>
     <message>
         <source>Confirm options reset</source>
+        <extracomment>Window title text of pop-up window shown when the user has chosen to reset options.</extracomment>
         <translation>Seçeneklerin sıfırlanmasını teyit et</translation>
     </message>
     <message>
         <source>Client restart required to activate changes.</source>
+        <extracomment>Text explaining that the settings changed will not come into effect until the client is restarted.</extracomment>
         <translation>Değişikliklerin uygulanması için istemcinin yeniden başlatılması lazımdır.</translation>
     </message>
+    <message>
+        <source>Current settings will be backed up at "%1".</source>
+        <extracomment>Text explaining to the user that the client's current settings will be backed up at a specific location. %1 is a stand-in argument for the backup location's path.</extracomment>
+        <translation>Mevcut ayarlar "%1" konumunda yedeklenecektir.</translation>
+    </message>
     <message>
         <source>Client will be shut down. Do you want to proceed?</source>
+        <extracomment>Text asking the user to confirm if they would like to proceed with a client shutdown.</extracomment>
         <translation>İstemci kapanacaktır. Devam etmek istiyor musunuz?</translation>
     </message>
     <message>
@@ -1844,6 +2252,10 @@
         <source>%1 Balance</source>
         <translation>%1 Bakiye</translation>
     </message>
+    <message>
+        <source>Discreet mode activated for the Overview tab. To unmask the values, uncheck Settings-&gt;Discreet mode.</source>
+        <translation>Genel Bakış sekmesi için gizli mod etkinleştirildi. Değerleri göstermek için Ayarlar-&gt;Gizli mod işaretini kaldırın.</translation>
+    </message>
     <message numerus="yes">
         <source>%n Rounds</source>
         <translation><numerusform>%n Tur</numerusform><numerusform>%n Tur</numerusform></translation>
@@ -1943,7 +2355,140 @@
 </context>
 <context>
     <name>PSBTOperationsDialog</name>
-    </context>
+    <message>
+        <source>Dialog</source>
+        <translation>Diyalog</translation>
+    </message>
+    <message>
+        <source>Sign Tx</source>
+        <translation>İşlemi İmzala</translation>
+    </message>
+    <message>
+        <source>Broadcast Tx</source>
+        <translation>İşlemi Yayınla</translation>
+    </message>
+    <message>
+        <source>Copy to Clipboard</source>
+        <translation>Panoya Kopyala</translation>
+    </message>
+    <message>
+        <source>Save…</source>
+        <translation>Kaydet…</translation>
+    </message>
+    <message>
+        <source>Close</source>
+        <translation>Kapat</translation>
+    </message>
+    <message>
+        <source>Failed to load transaction: %1</source>
+        <translation>İşlem yüklenemedi: %1</translation>
+    </message>
+    <message>
+        <source>Failed to sign transaction: %1</source>
+        <translation>İşlem imzalanamadı: %1</translation>
+    </message>
+    <message>
+        <source>Cannot sign inputs while wallet is locked.</source>
+        <translation>Cüzdan kilitliyken girdiler imzalanamaz.</translation>
+    </message>
+    <message>
+        <source>Could not sign any more inputs.</source>
+        <translation>Daha fazla girdi imzalanamadı.</translation>
+    </message>
+    <message>
+        <source>Signed %1 inputs, but more signatures are still required.</source>
+        <translation>%1 girdi imzalandı, ancak daha fazla imza gerekiyor.</translation>
+    </message>
+    <message>
+        <source>Signed transaction successfully. Transaction is ready to broadcast.</source>
+        <translation>İşlem başarıyla imzalandı. İşlem yayınlanmaya hazır.</translation>
+    </message>
+    <message>
+        <source>Unknown error processing transaction.</source>
+        <translation>İşlem işlenirken bilinmeyen hata.</translation>
+    </message>
+    <message>
+        <source>Transaction broadcast successfully! Transaction ID: %1</source>
+        <translation>İşlem başarıyla yayınlandı! İşlem ID: %1</translation>
+    </message>
+    <message>
+        <source>Transaction broadcast failed: %1</source>
+        <translation>İşlem yayını başarısız: %1</translation>
+    </message>
+    <message>
+        <source>PSBT copied to clipboard.</source>
+        <translation>PSBT panoya kopyalandı.</translation>
+    </message>
+    <message>
+        <source>Save Transaction Data</source>
+        <translation>İşlem Verisini Kaydet</translation>
+    </message>
+    <message>
+        <source>Partially Signed Transaction (Binary)</source>
+        <extracomment>Expanded name of the binary PSBT file format. See: BIP 174.</extracomment>
+        <translation>Kısmen İmzalanmış İşlem (İkili)</translation>
+    </message>
+    <message>
+        <source>PSBT saved to disk.</source>
+        <translation>PSBT diske kaydedildi.</translation>
+    </message>
+    <message>
+        <source> * Sends %1 to %2</source>
+        <translation> * %1'i %2'ye gönderir</translation>
+    </message>
+    <message>
+        <source>own address</source>
+        <translation>kendi adres</translation>
+    </message>
+    <message>
+        <source>Unable to calculate transaction fee or total transaction amount.</source>
+        <translation>İşlem ücreti veya toplam işlem tutarı hesaplanamıyor.</translation>
+    </message>
+    <message>
+        <source>Pays transaction fee: </source>
+        <translation>İşlem ücretini öder: </translation>
+    </message>
+    <message>
+        <source>Total Amount</source>
+        <translation>Toplam Tutar</translation>
+    </message>
+    <message>
+        <source>or</source>
+        <translation>veya</translation>
+    </message>
+    <message>
+        <source>Transaction has %1 unsigned inputs.</source>
+        <translation>İşlemde %1 imzalanmamış girdi var.</translation>
+    </message>
+    <message>
+        <source>Transaction is missing some information about inputs.</source>
+        <translation>İşlemde girdiler hakkında bazı bilgiler eksik.</translation>
+    </message>
+    <message>
+        <source>Transaction still needs signature(s).</source>
+        <translation>İşlem hala imza(lar) gerektiriyor.</translation>
+    </message>
+    <message>
+        <source>(But no wallet is loaded.)</source>
+        <translation>(Ancak hiçbir cüzdan yüklenmemiş.)</translation>
+    </message>
+    <message>
+        <source>(But this wallet cannot sign transactions.)</source>
+        <translation>(Ancak bu cüzdan işlemleri imzalayamaz.)</translation>
+    </message>
+    <message>
+        <source>(But this wallet does not have the right keys.)</source>
+        <translation>(Ancak bu cüzdanda doğru anahtarlar yok.)</translation>
+    </message>
+    <message>
+        <source>Transaction is fully signed and ready for broadcast.</source>
+        <translation>İşlem tamamen imzalanmış ve yayınlanmaya hazır.</translation>
+    </message>
+    <message>
+        <source>Transaction status is unknown.</source>
+        <translation>İşlem durumu bilinmiyor.</translation>
+    </message>
+</context>
 <context>
     <name>PaymentServer</name>
     <message>
@@ -1962,6 +2507,12 @@
         <source>'dash://' is not a valid URI. Use 'dash:' instead.</source>
         <translation>'dash://' geçerli bir URI değil. Bunun yerine 'dash:' kullanın.</translation>
     </message>
+    <message>
+        <source>Cannot process payment request as BIP70 is no longer supported.
+Due to discontinued support, you should request the merchant to provide you with a BIP21 compatible URI or use a wallet that does continue to support BIP70.</source>
+        <translation>BIP70 artık desteklenmediği için ödeme talebi işlenemiyor.
+Desteğin sonlandırılması nedeniyle, satıcıdan size BIP21 uyumlu bir URI sağlamasını istemelisiniz veya BIP70'i desteklemeye devam eden bir cüzdan kullanmalısınız.</translation>
+    </message>
     <message>
         <source>URI cannot be parsed! This can be caused by an invalid Dash address or malformed URI parameters.</source>
         <translation>URI ayrıştırılamıyor! Bunun nedeni geçersiz bir Dash adresi veya hatalı biçimlendirilmiş URI değişkenleri olabilir.</translation>
@@ -1983,6 +2534,26 @@
         <extracomment>Title of Peers Table column which indicates the current latency of the connection with the peer.</extracomment>
         <translation>Ping</translation>
     </message>
+    <message>
+        <source>Peer</source>
+        <extracomment>Title of Peers Table column which contains a unique number used to identify a connection.</extracomment>
+        <translation>Eş</translation>
+    </message>
+    <message>
+        <source>Age</source>
+        <extracomment>Title of Peers Table column which indicates the duration (length of time) since the peer connection started.</extracomment>
+        <translation>Yaş</translation>
+    </message>
+    <message>
+        <source>Direction</source>
+        <extracomment>Title of Peers Table column which indicates the direction the peer connection was initiated from.</extracomment>
+        <translation>Yön</translation>
+    </message>
+    <message>
+        <source>Type</source>
+        <extracomment>Title of Peers Table column which describes the type of peer connection. The "type" describes why the connection exists.</extracomment>
+        <translation>Tür</translation>
+    </message>
     <message>
         <source>Sent</source>
         <extracomment>Title of Peers Table column which indicates the total amount of network information we have sent to the peer.</extracomment>
@@ -1993,7 +2564,27 @@
         <extracomment>Title of Peers Table column which indicates the total amount of network information we have received from the peer.</extracomment>
         <translation>Alındı</translation>
     </message>
-    </context>
+    <message>
+        <source>Address</source>
+        <extracomment>Title of Peers Table column which contains the IP/Onion/I2P address of the connected peer.</extracomment>
+        <translation>Adres</translation>
+    </message>
+    <message>
+        <source>Network</source>
+        <extracomment>Title of Peers Table column which states the network the peer connected through.</extracomment>
+        <translation>Ağ</translation>
+    </message>
+    <message>
+        <source>Inbound</source>
+        <extracomment>An Inbound Connection from a Peer.</extracomment>
+        <translation>Gelen</translation>
+    </message>
+    <message>
+        <source>Outbound</source>
+        <extracomment>An Outbound Connection to a Peer.</extracomment>
+        <translation>Giden</translation>
+    </message>
+</context>
 <context>
     <name>Proposal</name>
     <message>
@@ -2044,8 +2635,193 @@
         <translation>Durum</translation>
     </message>
 </context>
+<context>
+    <name>ProposalWizard</name>
+    <message>
+        <source>Create Governance Proposal</source>
+        <translation>Yönetim Teklifi Oluştur</translation>
+    </message>
+    <message>
+        <source>Enter proposal details</source>
+        <translation>Teklif detaylarını girin</translation>
+    </message>
+    <message>
+        <source>A fee will be burned when you prepare the proposal.</source>
+        <translation>Teklifi hazırladığınızda bir ücret yakılacaktır.</translation>
+    </message>
+    <message>
+        <source>Proposal &amp;name</source>
+        <translation>Teklif &amp;adı</translation>
+    </message>
+    <message>
+        <source>&amp;Description URL</source>
+        <translation>&amp;Açıklama URL'si</translation>
+    </message>
+    <message>
+        <source>Payment &amp;address</source>
+        <translation>Ödeme &amp;adresi</translation>
+    </message>
+    <message>
+        <source>Payment &amp;amount</source>
+        <translation>Ödeme &amp;tutarı</translation>
+    </message>
+    <message>
+        <source>The amount to request in a single payment</source>
+        <translation>Tek bir ödemede talep edilecek tutar</translation>
+    </message>
+    <message>
+        <source>&amp;First payment</source>
+        <translation>&amp;İlk ödeme</translation>
+    </message>
+    <message>
+        <source>Pa&amp;yments</source>
+        <translation>Ö&amp;demeler</translation>
+    </message>
+    <message>
+        <source>To&amp;tal amount</source>
+        <translation>Top&amp;lam tutar</translation>
+    </message>
+    <message>
+        <source>Proposal &amp;fee</source>
+        <translation>Teklif &amp;ücreti</translation>
+    </message>
+    <message>
+        <source>Next</source>
+        <translation>İleri</translation>
+    </message>
+    <message>
+        <source>Review proposal JSON and validate.</source>
+        <translation>Teklif JSON'unu inceleyin ve doğrulayın.</translation>
+    </message>
+    <message>
+        <source>Hex-encoded JSON</source>
+        <translation>Hex-kodlu JSON</translation>
+    </message>
+    <message>
+        <source>Back</source>
+        <translation>Geri</translation>
+    </message>
+    <message>
+        <source>Validate</source>
+        <translation>Doğrula</translation>
+    </message>
+    <message>
+        <source>Prepare (burn fee) and wait for confirmations.</source>
+        <translation>Hazırlayın (ücreti yakın) ve onayları bekleyin.</translation>
+    </message>
+    <message>
+        <source>Copy</source>
+        <translation>Kopyala</translation>
+    </message>
+    <message>
+        <source>At 1/6 confirmations: can be relayed and queued. At 6/6: accepted and processed.</source>
+        <translation>1/6 onayda: aktarılabilir ve kuyruğa alınabilir. 6/6'da: kabul edilir ve işlenir.</translation>
+    </message>
+    <message>
+        <source>Confirmations progress</source>
+        <translation>Onay ilerlemesi</translation>
+    </message>
+    <message>
+        <source>Shows progress toward the required number of confirmations for the proposal fee transaction.</source>
+        <translation>Teklif ücreti işlemi için gereken onay sayısına doğru ilerlemeyi gösterir.</translation>
+    </message>
+    <message>
+        <source>Estimated time remaining: -</source>
+        <translation>Tahmini kalan süre: -</translation>
+    </message>
+    <message>
+        <source>Prepare Proposal</source>
+        <translation>Teklifi Hazırla</translation>
+    </message>
+    <message>
+        <source>You can submit after 1 confirmation. At 6 confirmations it is accepted and processed.</source>
+        <translation>1 onaydan sonra gönderebilirsiniz. 6 onayda kabul edilir ve işlenir.</translation>
+    </message>
+    <message>
+        <source>Proposal ID:</source>
+        <translation>Teklif ID:</translation>
+    </message>
+    <message>
+        <source>Submit Proposal</source>
+        <translation>Teklifi Gönder</translation>
+    </message>
+    <message>
+        <source>Close</source>
+        <translation>Kapat</translation>
+    </message>
+    <message>
+        <source>Valid</source>
+        <translation>Geçerli</translation>
+    </message>
+    <message>
+        <source>Invalid: %1</source>
+        <translation>Geçersiz: %1</translation>
+    </message>
+    <message>
+        <source>Burn %1</source>
+        <translation>%1 Yak</translation>
+    </message>
+    <message>
+        <source>Burn %1 to create the fee transaction?</source>
+        <translation>Ücret işlemini oluşturmak için %1 yakılsın mı?</translation>
+    </message>
+    <message>
+        <source>Prepare failed</source>
+        <translation>Hazırlama başarısız</translation>
+    </message>
+    <message>
+        <source>Confirmations: %1 / %2 required</source>
+        <translation>Onaylar: %1 / %2 gerekli</translation>
+    </message>
+    <message>
+        <source>Estimated time remaining: Ready</source>
+        <translation>Tahmini kalan süre: Hazır</translation>
+    </message>
+    <message numerus="yes">
+        <source>Estimated time remaining: %n minute(s)</source>
+        <translation><numerusform>Tahmini kalan süre: %n dakika</numerusform><numerusform>Tahmini kalan süre: %n dakika</numerusform></translation>
+    </message>
+    <message>
+        <source>Your proposal was submitted successfully.</source>
+        <translation>Teklifiniz başarıyla gönderildi.</translation>
+    </message>
+    <message>
+        <source>Already submitted</source>
+        <translation>Zaten gönderildi</translation>
+    </message>
+    <message>
+        <source>This proposal has already been submitted.</source>
+        <translation>Bu teklif zaten gönderilmiş.</translation>
+    </message>
+    <message>
+        <source>Submission failed</source>
+        <translation>Gönderim başarısız</translation>
+    </message>
+    <message>
+        <source>Proposal submitted</source>
+        <translation>Teklif gönderildi</translation>
+    </message>
+    <message>
+        <source>A fee of %1 will be burned when you prepare the proposal.</source>
+        <translation>Teklifi hazırladığınızda %1 tutarında bir ücret yakılacaktır.</translation>
+    </message>
+    <message>
+        <source>Prepare (burn %1) and wait for %2 confirmations.</source>
+        <translation>Hazırlayın (%1 yakın) ve %2 onay bekleyin.</translation>
+    </message>
+</context>
 <context>
     <name>QObject</name>
+    <message>
+        <source>Do you want to reset settings to default values, or to abort without making changes?</source>
+        <extracomment>Explanatory text shown on startup when the settings file cannot be read. Prompts user to make a choice between resetting or aborting.</extracomment>
+        <translation>Ayarları varsayılan değerlere sıfırlamak mı, yoksa değişiklik yapmadan iptal etmek mi istiyorsunuz?</translation>
+    </message>
+    <message>
+        <source>A fatal error occurred. Check that settings file is writable, or try running with -nosettings.</source>
+        <extracomment>Explanatory text shown on startup when the settings file could not be written. Prompts user to check that we have the ability to write to the file. Explains that the user has the option of running without a settings file.</extracomment>
+        <translation>Ölümcül bir hata oluştu. Ayarlar dosyasının yazılabilir olduğunu kontrol edin veya -nosettings ile çalıştırmayı deneyin.</translation>
+    </message>
     <message>
         <source>Choose data directory on startup (default: %u)</source>
         <translation>Başlangıçta veri klasörü seç (varsayılan: %u)</translation>
@@ -2146,6 +2922,53 @@
         <source>This can also be adjusted later in the "Appearance" tab of the preferences.</source>
         <translation>Bu, daha sonra tercihlerin "Görünüm" sekmesinden de ayarlanabilir.</translation>
     </message>
+    <message>
+        <source>Ctrl+W</source>
+        <translation>Ctrl+W</translation>
+    </message>
+    <message>
+        <source>Unroutable</source>
+        <translation>Yönlendirilemiyor</translation>
+    </message>
+    <message>
+        <source>Internal</source>
+        <translation>Dahili</translation>
+    </message>
+    <message>
+        <source>Inbound</source>
+        <extracomment>An inbound connection from a peer. An inbound connection is a connection initiated by a peer.</extracomment>
+        <translation>Gelen</translation>
+    </message>
+    <message>
+        <source>Outbound</source>
+        <extracomment>An outbound connection to a peer. An outbound connection is a connection initiated by us.</extracomment>
+        <translation>Giden</translation>
+    </message>
+    <message>
+        <source>Full Relay</source>
+        <extracomment>Peer connection type that relays all network information.</extracomment>
+        <translation>Tam Aktarım</translation>
+    </message>
+    <message>
+        <source>Block Relay</source>
+        <extracomment>Peer connection type that relays network information about blocks and not transactions or addresses.</extracomment>
+        <translation>Blok Aktarımı</translation>
+    </message>
+    <message>
+        <source>Manual</source>
+        <extracomment>Peer connection type established manually through one of several methods.</extracomment>
+        <translation>Manuel</translation>
+    </message>
+    <message>
+        <source>Feeler</source>
+        <extracomment>Short-lived peer connection type that tests the aliveness of known addresses.</extracomment>
+        <translation>Yoklayıcı</translation>
+    </message>
+    <message>
+        <source>Address Fetch</source>
+        <extracomment>Short-lived peer connection type that solicits known addresses from a peer.</extracomment>
+        <translation>Adres Getirme</translation>
+    </message>
     <message>
         <source>%1 d</source>
         <translation>%1 g</translation>
@@ -2207,8 +3030,8 @@
         <translation>%1 B</translation>
     </message>
     <message>
-        <source>%1 KB</source>
-        <translation>%1 KB</translation>
+        <source>%1 kB</source>
+        <translation>%1 kB</translation>
     </message>
     <message>
         <source>%1 MB</source>
@@ -2264,7 +3087,12 @@
         <source>Save QR Code</source>
         <translation>QR Kodu Kaydet</translation>
     </message>
-    </context>
+    <message>
+        <source>PNG Image</source>
+        <extracomment>Expanded name of the PNG file format. See: https://en.wikipedia.org/wiki/Portable_Network_Graphics.</extracomment>
+        <translation>PNG Görüntü</translation>
+    </message>
+</context>
 <context>
     <name>RPCConsole</name>
     <message>
@@ -2371,6 +3199,14 @@
         <source>Version</source>
         <translation>Sürüm</translation>
     </message>
+    <message>
+        <source>High bandwidth BIP152 compact block relay: %1</source>
+        <translation>Yüksek bant genişliği BIP152 kompakt blok aktarımı: %1</translation>
+    </message>
+    <message>
+        <source>High Bandwidth</source>
+        <translation>Yüksek Bant Genişliği</translation>
+    </message>
     <message>
         <source>Starting Block</source>
         <translation>Başlangıç Bloku</translation>
@@ -2383,6 +3219,51 @@
         <source>Synced Blocks</source>
         <translation>Eşleşmiş Bloklar</translation>
     </message>
+    <message>
+        <source>Elapsed time since a novel block passing initial validity checks was received from this peer.</source>
+        <translation>Bu eşten ilk geçerlilik kontrollerini geçen yeni bir bloğun alınmasından bu yana geçen süre.</translation>
+    </message>
+    <message>
+        <source>Last Block</source>
+        <translation>Son Blok</translation>
+    </message>
+    <message>
+        <source>Elapsed time since a novel transaction accepted into our mempool was received from this peer.</source>
+        <extracomment>Tooltip text for the Last Transaction field in the peer details area.</extracomment>
+        <translation>Bu eşten mempool'umuza kabul edilen yeni bir işlemin alınmasından bu yana geçen süre.</translation>
+    </message>
+    <message>
+        <source>Last Transaction</source>
+        <translation>Son İşlem</translation>
+    </message>
+    <message>
+        <source>The mapped Autonomous System used for diversifying peer selection.</source>
+        <translation>Eş seçimini çeşitlendirmek için kullanılan eşlenmiş Otonom Sistem.</translation>
+    </message>
+    <message>
+        <source>Mapped AS</source>
+        <translation>Eşlenmiş AS</translation>
+    </message>
+    <message>
+        <source>Whether we relay addresses to this peer.</source>
+        <extracomment>Tooltip text for the Address Relay field in the peer details area, which displays whether we relay addresses to this peer (Yes/No).</extracomment>
+        <translation>Bu eşe adresleri aktarıp aktarmadığımız.</translation>
+    </message>
+    <message>
+        <source>Address Relay</source>
+        <extracomment>Text title for the Address Relay field in the peer details area, which displays whether we relay addresses to this peer (Yes/No).</extracomment>
+        <translation>Adres Aktarımı</translation>
+    </message>
+    <message>
+        <source>Addresses Processed</source>
+        <extracomment>Text title for the Addresses Processed field in the peer details area, which displays the total number of addresses received from this peer that were processed (excludes addresses that were dropped due to rate-limiting).</extracomment>
+        <translation>İşlenen Adresler</translation>
+    </message>
+    <message>
+        <source>Addresses Rate-Limited</source>
+        <extracomment>Text title for the Addresses Rate-Limited field in the peer details area, which displays the total number of addresses received from this peer that were dropped (not processed) due to rate-limiting.</extracomment>
+        <translation>Hız Sınırlı Adresler</translation>
+    </message>
     <message>
         <source>Rescan blockchain files 1</source>
         <translation>Blok zinciri dosyalarını yeniden tara 1</translation>
@@ -2423,6 +3304,22 @@
         <source>To specify a non-default location of the blocks directory use the '%1' option.</source>
         <translation>Bloklar dizininin varsayılan olmayan bir konumunu belirtmek için '%1' seçeneğini kullanın.</translation>
     </message>
+    <message>
+        <source>Local Addresses</source>
+        <translation>Yerel Adresler</translation>
+    </message>
+    <message>
+        <source>Network addresses that your Dash node is currently using to communicate with other nodes.</source>
+        <translation>Dash düğümünüzün diğer düğümlerle iletişim kurmak için şu anda kullandığı ağ adresleri.</translation>
+    </message>
+    <message>
+        <source>Number of regular Masternodes</source>
+        <translation>Normal Masternode sayısı</translation>
+    </message>
+    <message>
+        <source>Number of EvoNodes</source>
+        <translation>EvoNode sayısı</translation>
+    </message>
     <message>
         <source>Current block height</source>
         <translation>Mevcut blok yüksekliği</translation>
@@ -2471,10 +3368,50 @@
         <source>PoSe Score</source>
         <translation>PoSe Puanı</translation>
     </message>
+    <message>
+        <source>The transport layer version: %1</source>
+        <translation>Taşıma katmanı sürümü: %1</translation>
+    </message>
+    <message>
+        <source>Transport</source>
+        <translation>Taşıma</translation>
+    </message>
+    <message>
+        <source>The BIP324 session ID string in hex.</source>
+        <translation>Onaltılık sistemde BIP324 oturum kimliği dizesi.</translation>
+    </message>
+    <message>
+        <source>Session ID</source>
+        <translation>Oturum Kimliği</translation>
+    </message>
+    <message>
+        <source>The network protocol this peer is connected through: IPv4, IPv6, Onion, I2P, or CJDNS.</source>
+        <translation>Bu eşin bağlandığı ağ protokolü: IPv4, IPv6, Onion, I2P veya CJDNS.</translation>
+    </message>
+    <message>
+        <source>Permissions</source>
+        <translation>İzinler</translation>
+    </message>
+    <message>
+        <source>The direction and type of peer connection: %1</source>
+        <translation>Eş bağlantısının yönü ve türü: %1</translation>
+    </message>
+    <message>
+        <source>Direction/Type</source>
+        <translation>Yön/Tür</translation>
+    </message>
     <message>
         <source>Services</source>
         <translation>Servisler</translation>
     </message>
+    <message>
+        <source>Whether we relay transactions to this peer.</source>
+        <translation>Bu eşe işlemleri aktarıp aktarmadığımız.</translation>
+    </message>
+    <message>
+        <source>Transaction Relay</source>
+        <translation>İşlem Aktarımı</translation>
+    </message>
     <message>
         <source>Connection Time</source>
         <translation>Bağlantı Süresi</translation>
@@ -2511,6 +3448,16 @@
         <source>&amp;Wallet Repair</source>
         <translation>&amp;Cüzdan Tamiri</translation>
     </message>
+    <message>
+        <source>The total number of addresses received from this peer that were processed (excludes addresses that were dropped due to rate-limiting).</source>
+        <extracomment>Tooltip text for the Addresses Processed field in the peer details area, which displays the total number of addresses received from this peer that were processed (excludes addresses that were dropped due to rate-limiting).</extracomment>
+        <translation>Bu eşten alınan ve işlenen adreslerin toplam sayısı (hız sınırlaması nedeniyle bırakılan adresler hariç).</translation>
+    </message>
+    <message>
+        <source>The total number of addresses received from this peer that were dropped (not processed) due to rate-limiting.</source>
+        <extracomment>Tooltip text for the Addresses Rate-Limited field in the peer details area, which displays the total number of addresses received from this peer that were dropped (not processed) due to rate-limiting.</extracomment>
+        <translation>Bu eşten alınan ve hız sınırlaması nedeniyle bırakılan (işlenmeyen) adreslerin toplam sayısı.</translation>
+    </message>
     <message>
         <source>Wallet repair options.</source>
         <translation>Cüzdan tamir seçenekleri.</translation>
@@ -2524,52 +3471,82 @@
         <translation>-reindex: Blok zinciri dizinini mevcut blk000??.dat dosyalarından yeniden oluşturma.</translation>
     </message>
     <message>
-        <source>&amp;Disconnect</source>
-        <translation>&amp;Bağlantıyı Kes</translation>
+        <source>Inbound: initiated by peer</source>
+        <extracomment>Explanatory text for an inbound peer connection.</extracomment>
+        <translation>Gelen: eş tarafından başlatıldı</translation>
     </message>
     <message>
-        <source>Ban for</source>
-        <translation>Yasakla</translation>
+        <source>Outbound Full Relay: default</source>
+        <extracomment>Explanatory text for an outbound peer connection that relays all network information. This is the default behavior for outbound connections.</extracomment>
+        <translation>Giden Tam Aktarım: varsayılan</translation>
     </message>
     <message>
-        <source>1 &amp;hour</source>
-        <translation>1 &amp;saat</translation>
+        <source>Outbound Block Relay: does not relay transactions or addresses</source>
+        <extracomment>Explanatory text for an outbound peer connection that relays network information about blocks and not transactions or addresses.</extracomment>
+        <translation>Giden Blok Aktarımı: işlemleri veya adresleri aktarmaz</translation>
     </message>
     <message>
-        <source>1 &amp;day</source>
-        <translation>1 &amp;gün</translation>
+        <source>Outbound Manual: added using RPC %1 or %2/%3 configuration options</source>
+        <extracomment>Explanatory text for an outbound peer connection that was established manually through one of several methods. The numbered arguments are stand-ins for the methods available to establish manual connections.</extracomment>
+        <translation>Giden Manuel: RPC %1 veya %2/%3 yapılandırma seçenekleri kullanılarak eklendi</translation>
     </message>
     <message>
-        <source>1 &amp;week</source>
-        <translation>1 &amp;hafta</translation>
+        <source>Outbound Feeler: short-lived, for testing addresses</source>
+        <extracomment>Explanatory text for a short-lived outbound peer connection that is used to test the aliveness of known addresses.</extracomment>
+        <translation>Giden Yoklayıcı: kısa ömürlü, adresleri test etmek için</translation>
     </message>
     <message>
-        <source>1 &amp;year</source>
-        <translation>1 &amp;yıl</translation>
+        <source>Outbound Address Fetch: short-lived, for soliciting addresses</source>
+        <extracomment>Explanatory text for a short-lived outbound peer connection that is used to request addresses from a peer.</extracomment>
+        <translation>Giden Adres Getirme: kısa ömürlü, adres talep etmek için</translation>
     </message>
     <message>
-        <source>&amp;Unban</source>
-        <translation>&amp;Yasaklamayı Kaldır</translation>
+        <source>To</source>
+        <translation>Kime</translation>
+    </message>
+    <message>
+        <source>we selected the peer for high bandwidth relay</source>
+        <translation>yüksek bant genişliği aktarımı için eşi seçtik</translation>
+    </message>
+    <message>
+        <source>From</source>
+        <translation>Kimden</translation>
+    </message>
+    <message>
+        <source>the peer selected us for high bandwidth relay</source>
+        <translation>eş yüksek bant genişliği aktarımı için bizi seçti</translation>
     </message>
     <message>
-        <source>Welcome to the %1 RPC console.</source>
-        <translation>%1 RPC konsoluna hoş geldiniz.</translation>
+        <source>No</source>
+        <translation>Hayır</translation>
+    </message>
+    <message>
+        <source>no high bandwidth relay selected</source>
+        <translation>yüksek bant genişliği aktarımı seçilmedi</translation>
+    </message>
+    <message>
+        <source>&amp;Disconnect</source>
+        <translation>&amp;Bağlantıyı Kes</translation>
     </message>
     <message>
-        <source>Use up and down arrows to navigate history, and %1 to clear screen.</source>
-        <translation>Tarihçede gezinmek için imleç tuşlarını kullanınız, %1 ile de ekranı temizleyebilirsiniz.</translation>
+        <source>Ban for</source>
+        <translation>Yasakla</translation>
+    </message>
+    <message>
+        <source>1 &amp;hour</source>
+        <translation>1 &amp;saat</translation>
     </message>
     <message>
-        <source>Type %1 for an overview of available commands.</source>
-        <translation>Kullanılabilir komutlara genel bakış için %1 yazın.</translation>
+        <source>1 &amp;week</source>
+        <translation>1 &amp;hafta</translation>
     </message>
     <message>
-        <source>For more information on using this console type %1.</source>
-        <translation>Bu konsolun kullanımı hakkında daha fazla bilgi için %1 yazın.</translation>
+        <source>1 &amp;year</source>
+        <translation>1 &amp;yıl</translation>
     </message>
     <message>
-        <source>WARNING: Scammers have been active, telling users to type commands here, stealing their wallet contents. Do not use this console without fully understanding the ramifications of a command.</source>
-        <translation>UYARI: Kullanıcıların cüzdan içeriğini çalmak için buraya komut girmenizi söyleyen dolandırıcılar olabilir. Bir komutun ne anlama geldiğini tam olarak bilmiyorsanız bu konsolu kullanmayın.</translation>
+        <source>&amp;Unban</source>
+        <translation>&amp;Yasaklamayı Kaldır</translation>
     </message>
     <message>
         <source>In:</source>
@@ -2583,6 +3560,10 @@
         <source>Network activity disabled</source>
         <translation>Ağ etkinliği devre dışı bırakıldı</translation>
     </message>
+    <message>
+        <source>None</source>
+        <translation>Yok</translation>
+    </message>
     <message>
         <source>Total: %1 (Enabled: %2)</source>
         <translation>Toplam: %1 (Etkinleştirilen: %2)</translation>
@@ -2591,10 +3572,105 @@
         <source>Executing command without any wallet</source>
         <translation>Cüzdan olmaksızın komut yürütme</translation>
     </message>
+    <message>
+        <source>Ctrl++</source>
+        <extracomment>Main shortcut to increase the RPC console font size.</extracomment>
+        <translation>Ctrl++</translation>
+    </message>
+    <message>
+        <source>Ctrl+=</source>
+        <extracomment>Secondary shortcut to increase the RPC console font size.</extracomment>
+        <translation>Ctrl+=</translation>
+    </message>
+    <message>
+        <source>Ctrl+-</source>
+        <extracomment>Main shortcut to decrease the RPC console font size.</extracomment>
+        <translation>Ctrl+-</translation>
+    </message>
+    <message>
+        <source>Ctrl+_</source>
+        <extracomment>Secondary shortcut to decrease the RPC console font size.</extracomment>
+        <translation>Ctrl+_</translation>
+    </message>
+    <message>
+        <source>Ctrl+Shift+I</source>
+        <translation>Ctrl+Shift+I</translation>
+    </message>
+    <message>
+        <source>Ctrl+Shift+C</source>
+        <translation>Ctrl+Shift+C</translation>
+    </message>
+    <message>
+        <source>Ctrl+Shift+G</source>
+        <translation>Ctrl+Shift+G</translation>
+    </message>
+    <message>
+        <source>Ctrl+Shift+P</source>
+        <translation>Ctrl+Shift+P</translation>
+    </message>
+    <message>
+        <source>Ctrl+Shift+R</source>
+        <translation>Ctrl+Shift+R</translation>
+    </message>
     <message>
         <source>Executing command using "%1" wallet</source>
         <translation>"%1" cüzdanı kullanılarak komut yürütülüyor</translation>
     </message>
+    <message>
+        <source>detecting: peer could be v1 or v2</source>
+        <extracomment>Explanatory text for "detecting" transport type.</extracomment>
+        <translation>tespit ediliyor: eş v1 veya v2 olabilir</translation>
+    </message>
+    <message>
+        <source>v1: unencrypted, plaintext transport protocol</source>
+        <extracomment>Explanatory text for v1 transport type.</extracomment>
+        <translation>v1: şifrelenmemiş, düz metin taşıma protokolü</translation>
+    </message>
+    <message>
+        <source>v2: BIP324 encrypted transport protocol</source>
+        <extracomment>Explanatory text for v2 transport type.</extracomment>
+        <translation>v2: BIP324 şifreli taşıma protokolü</translation>
+    </message>
+    <message>
+        <source>&amp;Copy address</source>
+        <extracomment>Context menu action to copy the address of a peer</extracomment>
+        <translation>&amp;Adresi kopyala</translation>
+    </message>
+    <message>
+        <source>1 d&amp;ay</source>
+        <translation>1 g&amp;ün</translation>
+    </message>
+    <message>
+        <source>&amp;Copy IP/Netmask</source>
+        <extracomment>Context menu action to copy the IP/Netmask of a banned peer. IP/Netmask is the combination of a peer's IP address and its Netmask. For IP address see: https://en.wikipedia.org/wiki/IP_address</extracomment>
+        <translation>&amp;IP/Netmask'i kopyala</translation>
+    </message>
+    <message>
+        <source>Welcome to the %1 RPC console.
+Use up and down arrows to navigate history, and %2 to clear screen.
+Use %3 and %4 to increase or decrease the font size.
+Type %5 for an overview of available commands.
+For more information on using this console, type %6.
+
+%7WARNING: Scammers have been active, telling users to type commands here, stealing their wallet contents. Do not use this console without fully understanding the ramifications of a command.%8</source>
+        <extracomment>RPC console welcome message. Placeholders %7 and %8 are style tags for the warning content, and they are not space separated from the rest of the text intentionally.</extracomment>
+        <translation>%1 RPC konsoluna hoş geldiniz.
+Geçmişte gezinmek için yukarı ve aşağı okları, ekranı temizlemek için %2 kullanın.
+Yazı tipi boyutunu büyütmek veya küçültmek için %3 ve %4 kullanın.
+Kullanılabilir komutlara genel bakış için %5 yazın.
+Bu konsolu kullanma hakkında daha fazla bilgi için %6 yazın.
+
+%7UYARI: Dolandırıcılar aktif olarak kullanıcılara buraya komutlar yazmalarını söyleyerek cüzdan içeriklerini çalıyorlar. Bir komutun sonuçlarını tam olarak anlamadan bu konsolu kullanmayın.%8</translation>
+    </message>
+    <message>
+        <source>Executing…</source>
+        <extracomment>A console message indicating an entered command is currently being executed.</extracomment>
+        <translation>Yürütülüyor…</translation>
+    </message>
+    <message>
+        <source>(peer: %1)</source>
+        <translation>(eş: %1)</translation>
+    </message>
     <message>
         <source>via %1</source>
         <translation>%1 vasıtasıyla</translation>
@@ -2611,11 +3687,19 @@
         <source>Verified Masternode</source>
         <translation>Doğrulanmış Ana Düğüm</translation>
     </message>
+    <message>
+        <source>Yes</source>
+        <translation>Evet</translation>
+    </message>
     <message>
         <source>Unknown</source>
         <translation>bilinmiyor</translation>
     </message>
-    </context>
+    <message>
+        <source>Never</source>
+        <translation>Asla</translation>
+    </message>
+</context>
 <context>
     <name>ReceiveCoinsDialog</name>
     <message>
@@ -2634,6 +3718,10 @@
         <source>An optional message to attach to the payment request, which will be displayed when the request is opened.&lt;br&gt;Note: The message will not be sent with the payment over the Dash network.</source>
         <translation>Ödeme talebine eklenecek isteğe bağlı bir mesaj, talep açıldığında gösterilecektir.&lt;br&gt;Not: Mesaj ödeme ile birlikte Dash ağı üzerinden gönderilmez.</translation>
     </message>
+    <message>
+        <source>An optional label to associate with the new receiving address (used by you to identify an invoice).  It is also attached to the payment request.</source>
+        <translation>Yeni alıcı adresiyle ilişkilendirilecek seçime bağlı etiket (bir faturayı tanımlamak için kullanılır). Ödeme talebine de eklenir.</translation>
+    </message>
     <message>
         <source>Use this form to request payments. All fields are &lt;b&gt;optional&lt;/b&gt;.</source>
         <translation>Ödeme talep etmek için bu formu kullanın. Tüm alanlar &lt;b&gt;seçime dayalıdır&lt;/b&gt;.</translation>
@@ -2691,28 +3779,60 @@
         <translation>Ödeme talebine eklemek için bir mesaj girin</translation>
     </message>
     <message>
-        <source>Copy URI</source>
-        <translation>URI'yi kopyala</translation>
+        <source>Copy &amp;URI</source>
+        <translation>&amp;URI'yi kopyala</translation>
+    </message>
+    <message>
+        <source>&amp;Copy address</source>
+        <translation>&amp;Adresi kopyala</translation>
     </message>
     <message>
-        <source>Copy address</source>
-        <translation>Adresi kopyala</translation>
+        <source>Copy &amp;label</source>
+        <translation>&amp;Etiketi kopyala</translation>
     </message>
     <message>
-        <source>Copy label</source>
-        <translation>Etiket kopyala</translation>
+        <source>Copy &amp;message</source>
+        <translation>&amp;Mesajı kopyala</translation>
     </message>
     <message>
-        <source>Copy message</source>
-        <translation>İletiyi kopyala</translation>
+        <source>Copy &amp;amount</source>
+        <translation>&amp;Miktarı kopyala</translation>
     </message>
     <message>
-        <source>Copy amount</source>
-        <translation>Tutarı kopyala</translation>
+        <source>Could not unlock wallet.</source>
+        <translation>Cüzdanın kilidi açılamadı.</translation>
     </message>
-    </context>
+    <message>
+        <source>Could not generate new address</source>
+        <translation>Yeni adres oluşturulamadı</translation>
+    </message>
+</context>
 <context>
     <name>ReceiveRequestDialog</name>
+    <message>
+        <source>Request payment to …</source>
+        <translation>Ödeme talep et …</translation>
+    </message>
+    <message>
+        <source>Address:</source>
+        <translation>Adres:</translation>
+    </message>
+    <message>
+        <source>Amount:</source>
+        <translation>Miktar:</translation>
+    </message>
+    <message>
+        <source>Label:</source>
+        <translation>Etiket:</translation>
+    </message>
+    <message>
+        <source>Message:</source>
+        <translation>Mesaj:</translation>
+    </message>
+    <message>
+        <source>Wallet:</source>
+        <translation>Cüzdan:</translation>
+    </message>
     <message>
         <source>Copy &amp;URI</source>
         <translation>&amp;URI'yi kopyala</translation>
@@ -2765,6 +3885,34 @@
         <translation>Talep edilen</translation>
     </message>
 </context>
+<context>
+    <name>RestoreWalletActivity</name>
+    <message>
+        <source>Restore Wallet</source>
+        <extracomment>Title of progress window which is displayed when wallets are being restored.</extracomment>
+        <translation>Cüzdanı Geri Yükle</translation>
+    </message>
+    <message>
+        <source>Restoring Wallet &lt;b&gt;%1&lt;/b&gt;…</source>
+        <extracomment>Descriptive text of the restore wallets progress window which indicates to the user that wallets are currently being restored.</extracomment>
+        <translation>&lt;b&gt;%1&lt;/b&gt; Cüzdanı Geri Yükleniyor…</translation>
+    </message>
+    <message>
+        <source>Restore wallet failed</source>
+        <extracomment>Title of message box which is displayed when the wallet could not be restored.</extracomment>
+        <translation>Cüzdan geri yükleme başarısız</translation>
+    </message>
+    <message>
+        <source>Restore wallet warning</source>
+        <extracomment>Title of message box which is displayed when the wallet is restored with some warning.</extracomment>
+        <translation>Cüzdan geri yükleme uyarısı</translation>
+    </message>
+    <message>
+        <source>Restore wallet message</source>
+        <extracomment>Title of message box which is displayed when the wallet is successfully restored.</extracomment>
+        <translation>Cüzdan geri yükleme mesajı</translation>
+    </message>
+</context>
 <context>
     <name>SendCoinsDialog</name>
     <message>
@@ -2799,10 +3947,6 @@
         <source>Fee:</source>
         <translation>Ücret:</translation>
     </message>
-    <message>
-        <source>Dust:</source>
-        <translation>Toz:</translation>
-    </message>
     <message>
         <source>Inputs…</source>
         <translation>Girdiler…</translation>
@@ -2827,6 +3971,14 @@
         <source>Transaction Fee:</source>
         <translation>İşlem ücreti:</translation>
     </message>
+    <message>
+        <source>When there is less transaction volume than space in the blocks, miners as well as relaying nodes may enforce a minimum fee. Paying only this minimum fee is just fine, but be aware that this can result in a never confirming transaction once there is more demand for dash transactions than the network can process.</source>
+        <translation>Blokların boşluğundan daha az işlem hacmi olduğunda, madenciler ve aktarıcı düğümler minimum bir ücret uygulayabilir. Sadece bu minimum ücreti ödemek sorun değildir, ancak ağın işleyebileceğinden daha fazla dash işlemi talebi olduğunda bunun asla onaylanmayan bir işlemle sonuçlanabileceğini unutmayın.</translation>
+    </message>
+    <message>
+        <source>A too low fee might result in a never confirming transaction (read the tooltip)</source>
+        <translation>Çok düşük bir ücret asla onaylanmayan bir işlemle sonuçlanabilir (araç ipucunu okuyun)</translation>
+    </message>
     <message>
         <source>(Smart fee not initialized yet. This usually takes a few blocks…)</source>
         <translation>(Zeki ücret henüz başlatılmadı. Bu genelde birkaç blok alır…)</translation>
@@ -2919,10 +4071,6 @@
         <source>Copy bytes</source>
         <translation>Baytları kopyala</translation>
     </message>
-    <message>
-        <source>Copy dust</source>
-        <translation>Tozu kopyala</translation>
-    </message>
     <message>
         <source>Copy change</source>
         <translation>Para üstünü kopyala</translation>
@@ -2939,10 +4087,6 @@
         <source>%1 to %2</source>
         <translation>%1 ögesinden %2 unsuruna</translation>
     </message>
-    <message>
-        <source>Are you sure you want to send?</source>
-        <translation>Göndermek istediğinizden emin misiniz?</translation>
-    </message>
     <message>
         <source>&lt;b&gt;(%1 of %2 entries displayed)&lt;/b&gt;</source>
         <translation>&lt;b&gt;(%1 / %2 girdi gösteriliyor)&lt;/b&gt;</translation>
@@ -2955,6 +4099,18 @@
         <source>Confirm the %1 send action</source>
         <translation>%1 Gönderme işlemini onaylayın</translation>
     </message>
+    <message>
+        <source>Cr&amp;eate Unsigned</source>
+        <translation>İmzasız &amp;Oluştur</translation>
+    </message>
+    <message>
+        <source> from wallet '%1'</source>
+        <translation> '%1' cüzdanından</translation>
+    </message>
+    <message>
+        <source>%1 to '%2'</source>
+        <translation>%1 '%2' adresine</translation>
+    </message>
     <message>
         <source>%1 funds only</source>
         <translation>Yalnızca %1 fonları</translation>
@@ -3003,6 +4159,51 @@
         <source>Confirm send coins</source>
         <translation>Bitcoin gönderimini onaylayın</translation>
     </message>
+    <message>
+        <source>Save Transaction Data</source>
+        <translation>İşlem Verilerini Kaydet</translation>
+    </message>
+    <message>
+        <source>PSBT saved</source>
+        <translation>PSBT kaydedildi</translation>
+    </message>
+    <message>
+        <source>Watch-only balance:</source>
+        <translation>Sadece-izleme bakiyesi:</translation>
+    </message>
+    <message>
+        <source>Creates a Partially Signed Blockchain Transaction (PSBT) for use with e.g. an offline %1 wallet, or a PSBT-compatible hardware wallet.</source>
+        <translation>Örneğin çevrimdışı %1 cüzdanı veya PSBT uyumlu bir donanım cüzdanı ile kullanmak için Kısmen İmzalanmış Blokzincir İşlemi (PSBT) oluşturur.</translation>
+    </message>
+    <message>
+        <source>Do you want to create this transaction?</source>
+        <extracomment>Message displayed when attempting to create a transaction. Cautionary text to prompt the user to verify that the displayed transaction details represent the transaction the user intends to create.</extracomment>
+        <translation>Bu işlemi oluşturmak istiyor musunuz?</translation>
+    </message>
+    <message>
+        <source>Please, review your transaction proposal. This will produce a Partially Signed Blockchain Transaction (PSBT) which you can save or copy and then sign with e.g. an offline %1 wallet, or a PSBT-compatible hardware wallet.</source>
+        <extracomment>Text to inform a user attempting to create a transaction of their current options. At this stage, a user can only create a PSBT. This string is displayed when private keys are disabled and an external signer is not available.</extracomment>
+        <translation>Lütfen işlem önerinizi gözden geçirin. Bu, kaydedebileceğiniz veya kopyalayabileceğiniz ve ardından örneğin çevrimdışı %1 cüzdanı veya PSBT uyumlu bir donanım cüzdanı ile imzalayabileceğiniz Kısmen İmzalanmış Blokzincir İşlemi (PSBT) üretecektir.</translation>
+    </message>
+    <message>
+        <source>Please, review your transaction. You can create and send this transaction or create a Partially Signed Blockchain Transaction (PSBT), which you can save or copy and then sign with, e.g., an offline %1 wallet, or a PSBT-compatible hardware wallet.</source>
+        <extracomment>Text to inform a user attempting to create a transaction of their current options. At this stage, a user can send their transaction or create a PSBT. This string is displayed when both private keys and PSBT controls are enabled.</extracomment>
+        <translation>Lütfen işleminizi gözden geçirin. Bu işlemi oluşturup gönderebilir veya kaydedebileceğiniz veya kopyalayabileceğiniz ve ardından örneğin çevrimdışı %1 cüzdanı veya PSBT uyumlu bir donanım cüzdanı ile imzalayabileceğiniz Kısmen İmzalanmış Blokzincir İşlemi (PSBT) oluşturabilirsiniz.</translation>
+    </message>
+    <message>
+        <source>Please, review your transaction.</source>
+        <extracomment>Text to prompt a user to review the details of the transaction they are attempting to send.</extracomment>
+        <translation>Lütfen işleminizi gözden geçirin.</translation>
+    </message>
+    <message>
+        <source>To review recipient list click "Show Details…"</source>
+        <translation>Alıcı listesini gözden geçirmek için "Detayları Göster…" öğesine tıklayın</translation>
+    </message>
+    <message>
+        <source>Partially Signed Transaction (Binary)</source>
+        <extracomment>Expanded name of the binary PSBT file format. See: BIP 174.</extracomment>
+        <translation>Kısmen İmzalanmış İşlem (İkili)</translation>
+    </message>
     <message>
         <source>The recipient address is not valid. Please recheck.</source>
         <translation>Alıcı adresi geçerli değildir. Lütfen tekrar kontrol ediniz.</translation>
@@ -3122,21 +4323,16 @@
         <source>A message that was attached to the dash: URI which will be stored with the transaction for your reference. Note: This message will not be sent over the Dash network.</source>
         <translation>Referans için Dash: URI'siyle iliştirilmiş işlemle birlikte depolanacak bir ileti. Not: Bu mesaj Dash ağı üzerinden gönderilmeyecektir.</translation>
     </message>
+</context>
+<context>
+    <name>SendConfirmationDialog</name>
     <message>
-        <source>This is an unauthenticated payment request.</source>
-        <translation>Bu, kimliği doğrulanmamış bir ödeme talebidir.</translation>
-    </message>
-    <message>
-        <source>This is an authenticated payment request.</source>
-        <translation>Bu, kimliği doğrulanmış bir ödeme talebidir.</translation>
-    </message>
-    <message>
-        <source>Pay To:</source>
-        <translation>Şu adrese öde:</translation>
+        <source>Send</source>
+        <translation>Gönder</translation>
     </message>
     <message>
-        <source>Memo:</source>
-        <translation>Not:</translation>
+        <source>Create Unsigned</source>
+        <translation>İmzasız Oluştur</translation>
     </message>
 </context>
 <context>
@@ -3276,6 +4472,10 @@
         <source>Wallet unlock was cancelled.</source>
         <translation>Cüzdan kilidinin açılması iptal edildi.</translation>
     </message>
+    <message>
+        <source>No error</source>
+        <translation>Hata yok</translation>
+    </message>
     <message>
         <source>Private key for the entered address is not available.</source>
         <translation>Girilen adres için özel anahtar mevcut değildir.</translation>
@@ -3309,11 +4509,22 @@
         <translation>İleti doğrulandı.</translation>
     </message>
 </context>
+<context>
+    <name>SplashScreen</name>
+    <message>
+        <source>(press q to shutdown and continue later)</source>
+        <translation>(kapatmak ve daha sonra devam etmek için q tuşuna basın)</translation>
+    </message>
+    <message>
+        <source>press q to shutdown</source>
+        <translation>kapatmak için q tuşuna basın</translation>
+    </message>
+</context>
 <context>
     <name>TrafficGraphWidget</name>
     <message>
-        <source>KB/s</source>
-        <translation>KB/s</translation>
+        <source>kB/s</source>
+        <translation>kB/s</translation>
     </message>
     <message>
         <source>Total</source>
@@ -3330,20 +4541,9 @@
 </context>
 <context>
     <name>TransactionDesc</name>
-    <message numerus="yes">
-        <source>Open for %n more block(s)</source>
-        <translation><numerusform>%n daha blok için açık</numerusform><numerusform>%n daha blok için açık</numerusform></translation>
-    </message>
-    <message>
-        <source>Open until %1</source>
-        <translation>%1 değerine dek açık</translation>
-    </message>
-    <message>
-        <source>conflicted</source>
-        <translation>Uyuşmadı</translation>
-    </message>
     <message>
         <source>0/unconfirmed, %1</source>
+        <extracomment>Text explaining the current status of a transaction, shown in the status field of the details window for this transaction. This status represents an unconfirmed transaction that is in the memory pool.</extracomment>
         <translation>0/doğrulanmamış, %1</translation>
     </message>
     <message>
@@ -3356,22 +4556,32 @@
     </message>
     <message>
         <source>abandoned</source>
+        <extracomment>Text explaining the current status of a transaction, shown in the status field of the details window for this transaction. This status represents an abandoned transaction.</extracomment>
         <translation>Terk edilmiş</translation>
     </message>
+    <message>
+        <source>conflicted with a transaction with %1 confirmations</source>
+        <extracomment>Text explaining the current status of a transaction, shown in the status field of the details window for this transaction. This status represents an unconfirmed transaction that conflicts with a confirmed transaction.</extracomment>
+        <translation>%1 doğrulamalı bir işlemle çakıştı</translation>
+    </message>
     <message>
         <source>%1/unconfirmed</source>
+        <extracomment>Text explaining the current status of a transaction, shown in the status field of the details window for this transaction. This status represents a transaction confirmed in at least one block, but less than 6 blocks, and still not locked via ChainLocks.</extracomment>
         <translation>%1/doğrulanmadı</translation>
     </message>
     <message>
         <source>%1 confirmations</source>
+        <extracomment>Text explaining the current status of a transaction, shown in the status field of the details window for this transaction. This status represents a transaction confirmed in 6 or more blocks or locked via ChainLocks.</extracomment>
         <translation>%1 doğrulama</translation>
     </message>
     <message>
         <source>locked via ChainLocks</source>
+        <extracomment>Text explaining the current status of a transaction, shown in the status field of the details window for this transaction. This status represents a transaction confirmed in at least one block and has been locked by ChainLocks.</extracomment>
         <translation>ZincirKilidi ile kilitli</translation>
     </message>
     <message>
         <source>verified via InstantSend</source>
+        <extracomment>Text explaining the current status of a transaction, shown in the status field of the details window for this transaction. This status represents an unconfirmed transaction that has been locked by InstantSend.</extracomment>
         <translation>AnındaGönder ile onaylandı</translation>
     </message>
     <message>
@@ -3390,6 +4600,10 @@
         <source>Generated</source>
         <translation>Oluşturuldu</translation>
     </message>
+    <message>
+        <source>Platform Transfer</source>
+        <translation>Platform Transferi</translation>
+    </message>
     <message>
         <source>From</source>
         <translation>Gönderen</translation>
@@ -3520,14 +4734,6 @@
         <source>Address / Label</source>
         <translation>Adres / Etiket</translation>
     </message>
-    <message numerus="yes">
-        <source>Open for %n more block(s)</source>
-        <translation><numerusform>%n daha blok için açık</numerusform><numerusform>%n daha blok için açık</numerusform></translation>
-    </message>
-    <message>
-        <source>Open until %1</source>
-        <translation>%1 değerine dek açık</translation>
-    </message>
     <message>
         <source>Unconfirmed</source>
         <translation>Doğrulanmamış</translation>
@@ -3588,6 +4794,10 @@
         <source>Mined</source>
         <translation>Madenden çıkarılan</translation>
     </message>
+    <message>
+        <source>Platform Transfer</source>
+        <translation>Platform Transferi</translation>
+    </message>
     <message>
         <source>%1 Mixing</source>
         <translation>%1 Karıştırma</translation>
@@ -3715,6 +4925,10 @@
         <source>Mined</source>
         <translation>Madenden çıkarılan</translation>
     </message>
+    <message>
+        <source>Platform Transfer</source>
+        <translation>Platform Transferi</translation>
+    </message>
     <message>
         <source>Other</source>
         <translation>Diğer</translation>
@@ -3728,49 +4942,63 @@
         <translation>En düşük tutar</translation>
     </message>
     <message>
-        <source>Abandon transaction</source>
-        <translation>İşlemden vazgeç</translation>
+        <source>&amp;Copy address</source>
+        <translation>&amp;Adresi kopyala</translation>
     </message>
     <message>
-        <source>Copy address</source>
-        <translation>Adres kopyala</translation>
+        <source>Copy &amp;label</source>
+        <translation>&amp;Etiketi kopyala</translation>
     </message>
     <message>
-        <source>Copy label</source>
-        <translation>Etiket kopyala</translation>
+        <source>Copy &amp;amount</source>
+        <translation>&amp;Miktarı kopyala</translation>
     </message>
     <message>
-        <source>Copy amount</source>
-        <translation>Tutarı kopyala</translation>
+        <source>Copy transaction &amp;ID</source>
+        <translation>İşlem &amp;ID'sini kopyala</translation>
+    </message>
+    <message>
+        <source>Copy &amp;raw transaction</source>
+        <translation>&amp;Ham işlemi kopyala</translation>
+    </message>
+    <message>
+        <source>Copy full transaction &amp;details</source>
+        <translation>Tüm işlem &amp;detaylarını kopyala</translation>
     </message>
     <message>
-        <source>Copy transaction ID</source>
-        <translation>İşlem ID'sini kopyala</translation>
+        <source>&amp;Show transaction details</source>
+        <translation>İşlem detaylarını &amp;göster</translation>
     </message>
     <message>
-        <source>Copy raw transaction</source>
-        <translation>Ham işlemi kopyala</translation>
+        <source>A&amp;bandon transaction</source>
+        <translation>İşlemi &amp;terk et</translation>
     </message>
     <message>
-        <source>Copy full transaction details</source>
-        <translation>Tüm işlem ayrıntılarını kopyala</translation>
+        <source>Rese&amp;nd transaction</source>
+        <translation>İşlemi yeniden &amp;gönder</translation>
     </message>
     <message>
-        <source>Edit address label</source>
-        <translation>Adres etiketini düzenle</translation>
+        <source>&amp;Edit address label</source>
+        <translation>Adres etiketini &amp;düzenle</translation>
     </message>
     <message>
-        <source>Show transaction details</source>
-        <translation>İşlem ayrıntılarını göster</translation>
+        <source>Show address &amp;QR code</source>
+        <translation>Adres &amp;QR kodunu göster</translation>
     </message>
     <message>
-        <source>Show address QR code</source>
-        <translation>Adresin QR kodunu göster</translation>
+        <source>Show in %1</source>
+        <extracomment>Transactions table context menu action to show the selected transaction in a third-party block explorer. %1 is a stand-in argument for the URL of the explorer.</extracomment>
+        <translation>%1 içinde göster</translation>
     </message>
     <message>
         <source>Export Transaction History</source>
         <translation>İşlem Tarihçesini Dışarı Aktar</translation>
     </message>
+    <message>
+        <source>Comma separated file</source>
+        <extracomment>Expanded name of the CSV file format. See: https://en.wikipedia.org/wiki/Comma-separated_values.</extracomment>
+        <translation>Virgülle ayrılmış dosya</translation>
+    </message>
     <message>
         <source>Confirmed</source>
         <translation>Doğrulandı</translation>
@@ -3849,10 +5077,54 @@
         <source>Closing the wallet for too long can result in having to resync the entire chain if pruning is enabled.</source>
         <translation>Budama etkinse cüzdanı çok uzun süre kapatmak tüm zinciri yeniden senkronize etmek zorunda kalmanıza neden olabilir.</translation>
     </message>
-    </context>
+    <message>
+        <source>Close all wallets</source>
+        <translation>Tüm cüzdanları kapat</translation>
+    </message>
+    <message>
+        <source>Are you sure you wish to close all wallets?</source>
+        <translation>Tüm cüzdanları kapatmak istediğinizden emin misiniz?</translation>
+    </message>
+</context>
 <context>
     <name>WalletFrame</name>
-    </context>
+    <message>
+        <source>No wallet has been loaded.
+Go to File &gt; Open Wallet to load a wallet.
+- OR -</source>
+        <translation>Hiçbir cüzdan yüklenmedi.
+Bir cüzdan yüklemek için Dosya &gt; Cüzdan Aç'a gidin.
+- VEYA -</translation>
+    </message>
+    <message>
+        <source>Create a new wallet</source>
+        <translation>Yeni bir cüzdan oluştur</translation>
+    </message>
+    <message>
+        <source>Error</source>
+        <translation>Hata</translation>
+    </message>
+    <message>
+        <source>Unable to decode PSBT from clipboard (invalid base64)</source>
+        <translation>Panodan PSBT kodu çözülemiyor (geçersiz base64)</translation>
+    </message>
+    <message>
+        <source>Load Transaction Data</source>
+        <translation>İşlem Verilerini Yükle</translation>
+    </message>
+    <message>
+        <source>Partially Signed Transaction (*.psbt)</source>
+        <translation>Kısmen İmzalanmış İşlem (*.psbt)</translation>
+    </message>
+    <message>
+        <source>PSBT file must be smaller than 100 MiB</source>
+        <translation>PSBT dosyası 100 MiB'den küçük olmalıdır</translation>
+    </message>
+    <message>
+        <source>Unable to decode PSBT</source>
+        <translation>PSBT kodu çözülemiyor</translation>
+    </message>
+</context>
 <context>
     <name>WalletModel</name>
     <message>
@@ -3878,6 +5150,11 @@
         <source>Selected amount:</source>
         <translation>Seçilen tutar:</translation>
     </message>
+    <message>
+        <source>Wallet Data</source>
+        <extracomment>Name of the wallet data file format.</extracomment>
+        <translation>Cüzdan Verisi</translation>
+    </message>
     <message>
         <source>Backup Wallet</source>
         <translation>Cüzdanı Yedekle</translation>
@@ -3905,14 +5182,6 @@
 </context>
 <context>
     <name>dash-core</name>
-    <message>
-        <source>Error: Listening for incoming connections failed (listen returned error %s)</source>
-        <translation>Hata: İçeri gelen bağlantıların dinlenmesi başarısız oldu (dinleme %s hatasını verdi)</translation>
-    </message>
-    <message>
-        <source>Fee estimation failed. Fallbackfee is disabled. Wait a few blocks or enable -fallbackfee.</source>
-        <translation>Ücret tahmini başarısız oldu. YedekÜcret devre dışı. Birkaç blok bekleyin veya -yedekücret'i etkinleştirin.</translation>
-    </message>
     <message>
         <source>This error could occur if this wallet was not shutdown cleanly and was last loaded using a build with a newer version of Berkeley DB. If so, please use the software that last loaded this wallet</source>
         <translation>Bu hata, bu cüzdan düzgün bir şekilde kapatılmamışsa ve en son Berkeley DB'nin daha yeni bir sürümüne sahip bir yapı kullanılarak yüklenmişse oluşabilir. Eğer öyleyse, lütfen bu cüzdanın en son yüklendiği yazılımı kullanın.</translation>
@@ -3970,16 +5239,20 @@
         <translation>Veritabanından okumada hata, kapatılıyor.</translation>
     </message>
     <message>
-        <source>Failed to listen on any port. Use -listen=0 if you want this.</source>
-        <translation>Herhangi bir portun dinlenmesi başarısız oldu. Bunu istiyorsanız -listen=0 seçeneğini kullanınız.</translation>
+        <source>Error: Missing checksum</source>
+        <translation>Hata: Sağlama toplamı eksik</translation>
     </message>
     <message>
-        <source>-maxtxfee is set very high! Fees this large could be paid on a single transaction.</source>
-        <translation>-maxtxfee çok yüksek bir değere ayarlanmış! Bu denli yüksek ücretler tek bir işlemde ödenebilir.</translation>
+        <source>Error: Unable to parse version %u as a uint32_t</source>
+        <translation>Hata: %u sürümü uint32_t olarak ayrıştırılamıyor</translation>
     </message>
     <message>
-        <source>Cannot provide specific connections and have addrman find outgoing connections at the same.</source>
-        <translation>Giden bağlantıları addrman araması ile aynı zamanda belirli bağlantılar sağlayamaz.</translation>
+        <source>Error: Unable to write record to new wallet</source>
+        <translation>Hata: Yeni cüzdana kayıt yazılamıyor</translation>
+    </message>
+    <message>
+        <source>Failed to listen on any port. Use -listen=0 if you want this.</source>
+        <translation>Herhangi bir portun dinlenmesi başarısız oldu. Bunu istiyorsanız -listen=0 seçeneğini kullanınız.</translation>
     </message>
     <message>
         <source>Found unconfirmed denominated outputs, will wait till they confirm to continue.</source>
@@ -3990,13 +5263,17 @@
         <translation>Geçersiz -socketevents ('%s') belirtildi. Yalnızca şu modlar desteklenir: %s</translation>
     </message>
     <message>
-        <source>Invalid amount for -maxtxfee=&lt;amount&gt;: '%s' (must be at least the minrelay fee of %s to prevent stuck transactions)</source>
-        <translation>-maxtxfee=&lt;tutar&gt; için geçersiz tutar: '%s' (Sıkışmış işlemleri önlemek için en az %s değerinde en düşük aktarım ücretine eşit olmalıdır)</translation>
+        <source>SQLiteDatabase: Unknown sqlite wallet schema version %d. Only version %d is supported</source>
+        <translation>SQLiteDatabase: Bilinmeyen sqlite cüzdan şema sürümü %d. Yalnızca %d sürümü destekleniyor</translation>
     </message>
     <message>
         <source>Transaction index can't be disabled with governance validation enabled. Either start with -disablegovernance command line switch or enable transaction index.</source>
         <translation>Yönetim doğrulaması etkinken işlem endeksi devre dışı bırakılamaz. Ya -disablegovernance komut satırı anahtarıyla başlayın ya da işlem endeksini etkinleştirin.</translation>
     </message>
+    <message>
+        <source>Unsupported category-specific logging level -loglevel=%s. Expected -loglevel=&lt;category&gt;:&lt;loglevel&gt;. Valid categories: %s. Valid loglevels: %s.</source>
+        <translation>Desteklenmeyen kategoriye özgü günlük kaydı seviyesi -loglevel=%s. Beklenen -loglevel=&lt;category&gt;:&lt;loglevel&gt;. Geçerli kategoriler: %s. Geçerli günlük seviyeleri: %s.</translation>
+    </message>
     <message>
         <source>Can't mix: no compatible inputs found!</source>
         <translation>Karıştırılamıyor: hiç uyumlu girdi bulunamadı!</translation>
@@ -4005,6 +5282,14 @@
         <source>Entry exceeds maximum size.</source>
         <translation>Girdi maksimum boyutu aşıyor.</translation>
     </message>
+    <message>
+        <source>Error upgrading evo database for EHF</source>
+        <translation>EHF için evo veritabanı yükseltilirken hata</translation>
+    </message>
+    <message>
+        <source>Failed to commit Evo database</source>
+        <translation>Evo veritabanı işlenemedi</translation>
+    </message>
     <message>
         <source>Found enough users, signing ( waiting %s )</source>
         <translation>Yeterli kullanıcı bulundu, imzalanıyor ( %s bekleniyor )</translation>
@@ -4029,18 +5314,14 @@
         <source>Insufficient funds.</source>
         <translation>Yetersiz bakiye.</translation>
     </message>
-    <message>
-        <source>Invalid amount for -discardfee=&lt;amount&gt;: '%s'</source>
-        <translation>-discardfee=&lt;meblağ&gt; için geçersiz meblağ: '%s'</translation>
-    </message>
-    <message>
-        <source>Invalid amount for -paytxfee=&lt;amount&gt;: '%s' (must be at least %s)</source>
-        <translation>-paytxfee=&lt;tutar&gt;:'%s' unsurunda geçersiz tutar (asgari %s olması lazımdır)</translation>
-    </message>
     <message>
         <source>Invalid minimum number of spork signers specified with -minsporkkeys</source>
         <translation>-minsporkkeys ile belirtilmiş geçersiz minimum spork imzacısı sayısı</translation>
     </message>
+    <message>
+        <source>Listening for incoming connections failed (listen returned error %s)</source>
+        <translation>Gelen bağlantıları dinleme başarısız oldu (dinleme %s hatası döndürdü)</translation>
+    </message>
     <message>
         <source>Lock is already in place.</source>
         <translation>Kilit zaten yerinde.</translation>
@@ -4097,6 +5378,10 @@
         <source>Synchronizing governance objects…</source>
         <translation>Yönetim nesneleri eşleniyor…</translation>
     </message>
+    <message>
+        <source>Transaction change output index out of range</source>
+        <translation>İşlem para üstü çıktı endeksi aralık dışında</translation>
+    </message>
     <message>
         <source>Unable to start HTTP server. See debug log for details.</source>
         <translation>HTTP sunucusu başlatılamadı. Ayrıntılar için debug.log dosyasına bakınız.</translation>
@@ -4105,6 +5390,10 @@
         <source>Unknown response.</source>
         <translation>Bilinmeyen cevap.</translation>
     </message>
+    <message>
+        <source>Unsupported global logging level -loglevel=%s. Valid values: %s.</source>
+        <translation>Desteklenmeyen genel günlük kaydı seviyesi -loglevel=%s. Geçerli değerler: %s.</translation>
+    </message>
     <message>
         <source>User Agent comment (%s) contains unsafe characters.</source>
         <translation>Kullanıcı Aracı açıklaması (%s) güvensiz karakterler içermektedir.</translation>
@@ -4145,6 +5434,10 @@
         <source>Make sure to encrypt your wallet and delete all non-encrypted backups after you have verified that the wallet works!</source>
         <translation>Cüzdanın çalıştığından emin olduktan sonra mutlaka cüzdanınızı şifreleyip şifrelenmemiş tüm yedekleri silin!</translation>
     </message>
+    <message>
+        <source>More than one onion bind address is provided. Using %s for the automatically created Tor onion service.</source>
+        <translation>Birden fazla onion bağlama adresi sağlandı. Otomatik olarak oluşturulan Tor onion servisi için %s kullanılıyor.</translation>
+    </message>
     <message>
         <source>Prune configured below the minimum of %d MiB.  Please use a higher number.</source>
         <translation>Budama, en düşük değer olan %d MiB'den düşük olarak ayarlanmıştır. Lütfen daha yüksek bir sayı kullanınız.</translation>
@@ -4173,10 +5466,6 @@
         <source>Wallet is locked, can't replenish keypool! Automatic backups and mixing are disabled, please unlock your wallet to replenish keypool.</source>
         <translation>Cüzdanınız kilitli, anahtar havuzu yenilenemiyor! Otomatik yedekleme ve karışım kapalı, anahtar havuzunu yenilemek için lütfen cüzdanınızın kilidini açın.</translation>
     </message>
-    <message>
-        <source>You need to rebuild the database using -reindex to change -timestampindex</source>
-        <translation>-timestampindex'i değiştirmek için -reindex'i kullanarak veritabanını baştan kurmalısınız</translation>
-    </message>
     <message>
         <source>You need to rebuild the database using -reindex to go back to unpruned mode.  This will redownload the entire blockchain</source>
         <translation>Budama olmayan kipe dönmek için veritabanını -reindex ile tekrar derlemeniz gerekir. Bu, tüm blok zincirini tekrar indirecektir</translation>
@@ -4218,20 +5507,32 @@
         <translation>%s yüklenirken hata oluştu: Özel anahtarlar yalnızca oluşturma sırasında devre dışı bırakılabilir</translation>
     </message>
     <message>
-        <source>Error upgrading evo database</source>
-        <translation>Evo veritabanını yükseltirken hata oluştu</translation>
+        <source>Error: Couldn't create cursor into database</source>
+        <translation>Hata: Veritabanında imleç oluşturulamadı</translation>
     </message>
     <message>
         <source>Error: Disk space is low for %s</source>
         <translation>Hata: %s için disk alanı yetersiz</translation>
     </message>
     <message>
-        <source>Exceeded max tries.</source>
-        <translation>Maksimum deneme aşıldı.</translation>
+        <source>Error: Dumpfile checksum does not match. Computed %s, expected %s</source>
+        <translation>Hata: Döküm dosyası sağlama toplamı eşleşmiyor. Hesaplanan %s, beklenen %s</translation>
+    </message>
+    <message>
+        <source>Error: Got key that was not hex: %s</source>
+        <translation>Hata: Onaltılık olmayan anahtar alındı: %s</translation>
+    </message>
+    <message>
+        <source>Error: Got value that was not hex: %s</source>
+        <translation>Hata: Onaltılık olmayan değer alındı: %s</translation>
     </message>
     <message>
-        <source>Failed to commit EvoDB</source>
-        <translation>EvoDB gerçekleştirilemedi</translation>
+        <source>Error: Keypool ran out, please call keypoolrefill first</source>
+        <translation>Hata: Anahtar havuzu tükendi, lütfen önce keypoolrefill çağırın</translation>
+    </message>
+    <message>
+        <source>Error: No addresses available.</source>
+        <translation>Hata: Kullanılabilir adres yok.</translation>
     </message>
     <message>
         <source>Failed to create backup %s!</source>
@@ -4249,17 +5550,29 @@
         <source>Failed to rescan the wallet during initialization</source>
         <translation>Başlatma sırasında cüzdan yeniden taranamadı</translation>
     </message>
+    <message>
+        <source>Failed to verify database</source>
+        <translation>Veritabanı doğrulanamadı</translation>
+    </message>
+    <message>
+        <source>Fee rate (%s) is lower than the minimum fee rate setting (%s)</source>
+        <translation>Ücret oranı (%s) minimum ücret oranı ayarından (%s) düşük</translation>
+    </message>
     <message>
         <source>Found enough users, signing…</source>
         <translation>Yeterli kullanıcı bulundu, imzalanıyor…</translation>
     </message>
     <message>
-        <source>Invalid P2P permission: '%s'</source>
-        <translation>Geçersiz P2P izni: '%s'</translation>
+        <source>Ignoring duplicate -wallet %s.</source>
+        <translation>Yinelenen -wallet %s yoksayılıyor.</translation>
     </message>
     <message>
-        <source>Invalid amount for -fallbackfee=&lt;amount&gt;: '%s'</source>
-        <translation> -fallbackfee=&lt;tutar&gt; için geçersiz tutar: '%s'</translation>
+        <source>Input not found or already spent</source>
+        <translation>Girdi bulunamadı veya zaten harcanmış</translation>
+    </message>
+    <message>
+        <source>Invalid P2P permission: '%s'</source>
+        <translation>Geçersiz P2P izni: '%s'</translation>
     </message>
     <message>
         <source>Invalid masternodeblsprivkey. Please see documentation.</source>
@@ -4281,6 +5594,10 @@
         <source>Mixing in progress…</source>
         <translation>Karışım devam ediyor…</translation>
     </message>
+    <message>
+        <source>No addresses available</source>
+        <translation>Kullanılabilir adres yok</translation>
+    </message>
     <message>
         <source>No errors detected.</source>
         <translation>Hata tespit edilmedi.</translation>
@@ -4309,6 +5626,22 @@
         <source>Prune mode is incompatible with -txindex.</source>
         <translation>Budama kipi -txindex ile uyumsuzdur.</translation>
     </message>
+    <message>
+        <source>SQLiteDatabase: Failed to execute statement to verify database: %s</source>
+        <translation>SQLiteDatabase: Veritabanını doğrulama ifadesi yürütülemedi: %s</translation>
+    </message>
+    <message>
+        <source>SQLiteDatabase: Failed to prepare statement to verify database: %s</source>
+        <translation>SQLiteDatabase: Veritabanını doğrulama ifadesi hazırlanamadı: %s</translation>
+    </message>
+    <message>
+        <source>SQLiteDatabase: Failed to read database verification error: %s</source>
+        <translation>SQLiteDatabase: Veritabanı doğrulama hatası okunamadı: %s</translation>
+    </message>
+    <message>
+        <source>SQLiteDatabase: Unexpected application id. Expected %u, got %u</source>
+        <translation>SQLiteDatabase: Beklenmeyen uygulama kimliği. Beklenen %u, alınan %u</translation>
+    </message>
     <message>
         <source>Section [%s] is not recognized.</source>
         <translation>[%s] bölümü tanınmadı.</translation>
@@ -4341,6 +5674,10 @@
         <source>This is the transaction fee you will pay if you send a transaction.</source>
         <translation>Eğer bir gönderme işlemi yaparsanız bu ödeyeceğiniz işlem ücretidir.</translation>
     </message>
+    <message>
+        <source>Topping up keypool…</source>
+        <translation>Anahtar havuzu doldruluyor…</translation>
+    </message>
     <message>
         <source>Transaction amounts must not be negative</source>
         <translation>İşlem tutarı negatif olmamalıdır</translation>
@@ -4369,13 +5706,17 @@
         <source>Unable to generate initial keys</source>
         <translation>Başlangıç anahtarları oluşturulamıyor</translation>
     </message>
+    <message>
+        <source>Unable to open %s for writing</source>
+        <translation>Yazmak için %s açılamıyor</translation>
+    </message>
     <message>
         <source>Unknown -blockfilterindex value %s.</source>
         <translation>Bilinmeyen -blokfiltresiindeksi değeri %s.</translation>
     </message>
     <message>
-        <source>Upgrading UTXO database</source>
-        <translation>UTXO veritabanı yükseltiliyor</translation>
+        <source>Unknown new rules activated (versionbit %i)</source>
+        <translation>Bilinmeyen yeni kurallar etkinleştirildi (versionbit %i)</translation>
     </message>
     <message>
         <source>Verifying blocks…</source>
@@ -4394,16 +5735,12 @@
         <translation>Cüzdan yedeği klasörü %s oluşturulamadı!</translation>
     </message>
     <message>
-        <source>You can not start a masternode with wallet enabled.</source>
-        <translation>Cüzdan etkinleştirilmişken bir ana düğüm başlatamazsınız.</translation>
-    </message>
-    <message>
-        <source>You need to rebuild the database using -reindex to change -addressindex</source>
-        <translation>-addressindex'i değiştirmek için -reindex'i kullanarak veritabanını baştan kurmalısınız</translation>
+        <source>Wiping wallet transactions…</source>
+        <translation>Cüzdan işlemleri siliniyor…</translation>
     </message>
     <message>
-        <source>You need to rebuild the database using -reindex to change -spentindex</source>
-        <translation>-spentindex'i değiştirmek için -spentindex'i kullanarak veritabanını baştan kurmalısınız</translation>
+        <source>You can not start a masternode with wallet enabled.</source>
+        <translation>Cüzdan etkinleştirilmişken bir ana düğüm başlatamazsınız.</translation>
     </message>
     <message>
         <source>no mixing available.</source>
@@ -4421,6 +5758,22 @@
         <source>%s uses exact denominated amounts to send funds, you might simply need to mix some more coins.</source>
         <translation>%s para göndermek için tam olarak birimlendirilmiş meblağlar kullanır, sadece biraz daha fazla parayı anonim hale getirmeniz gerekiyor.</translation>
     </message>
+    <message>
+        <source>-reindex-chainstate option is not compatible with -blockfilterindex. Please temporarily disable blockfilterindex while using -reindex-chainstate, or replace -reindex-chainstate with -reindex to fully rebuild all indexes.</source>
+        <translation>-reindex-chainstate seçeneği -blockfilterindex ile uyumlu değil. Lütfen -reindex-chainstate kullanırken blockfilterindex'i geçici olarak devre dışı bırakın veya tüm indeksleri tamamen yeniden oluşturmak için -reindex-chainstate yerine -reindex kullanın.</translation>
+    </message>
+    <message>
+        <source>-reindex-chainstate option is not compatible with -coinstatsindex. Please temporarily disable coinstatsindex while using -reindex-chainstate, or replace -reindex-chainstate with -reindex to fully rebuild all indexes.</source>
+        <translation>-reindex-chainstate seçeneği -coinstatsindex ile uyumlu değil. Lütfen -reindex-chainstate kullanırken coinstatsindex'i geçici olarak devre dışı bırakın veya tüm indeksleri tamamen yeniden oluşturmak için -reindex-chainstate yerine -reindex kullanın.</translation>
+    </message>
+    <message>
+        <source>-reindex-chainstate option is not compatible with -txindex. Please temporarily disable txindex while using -reindex-chainstate, or replace -reindex-chainstate with -reindex to fully rebuild all indexes.</source>
+        <translation>-reindex-chainstate seçeneği -txindex ile uyumlu değil. Lütfen -reindex-chainstate kullanırken txindex'i geçici olarak devre dışı bırakın veya tüm indeksleri tamamen yeniden oluşturmak için -reindex-chainstate yerine -reindex kullanın.</translation>
+    </message>
+    <message>
+        <source>Cannot downgrade wallet from version %i to version %i. Wallet version unchanged.</source>
+        <translation>Cüzdan %i sürümünden %i sürümüne düşürülemiyor. Cüzdan sürümü değişmedi.</translation>
+    </message>
     <message>
         <source>Cannot obtain a lock on data directory %s. %s is probably already running.</source>
         <translation>%s veri dizininde kilit elde edilemedi. %s muhtemelen hâlihazırda çalışmaktadır.</translation>
@@ -4433,14 +5786,82 @@
         <source>Error loading %s: You can't enable HD on an already existing non-HD wallet</source>
         <translation>%s yüklenirken hata: Zaten var olan bir HD olmayan cüzdanda HD etkinleştiremezsiniz</translation>
     </message>
+    <message>
+        <source>Error loading wallet. Wallet requires blocks to be downloaded, and software does not currently support loading wallets while blocks are being downloaded out of order when using assumeutxo snapshots. Wallet should be able to load successfully after node sync reaches height %s</source>
+        <translation>Cüzdan yüklenirken hata. Cüzdan blokların indirilmesini gerektiriyor ve yazılım şu anda assumeutxo anlık görüntüleri kullanılırken bloklar sıra dışı indirilirken cüzdanları yüklemeyi desteklemiyor. Düğüm senkronizasyonu %s yüksekliğine ulaştıktan sonra cüzdan başarıyla yüklenebilmelidir</translation>
+    </message>
     <message>
         <source>Error reading %s! All keys read correctly, but transaction data or address book entries might be missing or incorrect.</source>
         <translation>%s dosyasının okunması sırasında bir hata meydana geldi! Tüm anahtarlar doğru bir şekilde okundu, ancak işlem verileri ya da adres defteri ögeleri hatalı veya eksik olabilir.</translation>
     </message>
+    <message>
+        <source>Error: Dumpfile format record is incorrect. Got "%s", expected "format".</source>
+        <translation>Hata: Döküm dosyası format kaydı yanlış. Alınan "%s", beklenen "format".</translation>
+    </message>
+    <message>
+        <source>Error: Dumpfile identifier record is incorrect. Got "%s", expected "%s".</source>
+        <translation>Hata: Döküm dosyası tanımlayıcı kaydı yanlış. Alınan "%s", beklenen "%s".</translation>
+    </message>
+    <message>
+        <source>Error: Dumpfile version is not supported. This version of bitcoin-wallet only supports version 1 dumpfiles. Got dumpfile with version %s</source>
+        <translation>Hata: Döküm dosyası sürümü desteklenmiyor. Bitcoin-wallet'ın bu sürümü yalnızca sürüm 1 döküm dosyalarını destekler. Alınan döküm dosyası sürümü %s</translation>
+    </message>
+    <message>
+        <source>Failed to rename invalid peers.dat file. Please move or delete it and try again.</source>
+        <translation>Geçersiz peers.dat dosyası yeniden adlandırılamadı. Lütfen taşıyın veya silin ve tekrar deneyin.</translation>
+    </message>
+    <message>
+        <source>Fee estimation failed. Fallbackfee is disabled. Wait a few blocks or enable %s.</source>
+        <translation>Ücret tahmini başarısız oldu. Fallbackfee devre dışı. Birkaç blok bekleyin veya %s'yi etkinleştirin.</translation>
+    </message>
+    <message>
+        <source>File %s already exists. If you are sure this is what you want, move it out of the way first.</source>
+        <translation>%s dosyası zaten mevcut. Bunu istediğinizden eminseniz, önce dosyayı başka bir yere taşıyın.</translation>
+    </message>
+    <message>
+        <source>Incompatible options: -dnsseed=1 was explicitly specified, but -onlynet forbids connections to IPv4/IPv6</source>
+        <translation>Uyumsuz seçenekler: -dnsseed=1 açıkça belirtildi, ancak -onlynet IPv4/IPv6 bağlantılarını yasaklıyor</translation>
+    </message>
     <message>
         <source>Incorrect or no devnet genesis block found. Wrong datadir for devnet specified?</source>
         <translation>Geçersiz veya sıfır devnet genesis bloğu bulundu. Devnet için belirtilen datadir yanlış mı?</translation>
     </message>
+    <message>
+        <source>Invalid amount for %s=&lt;amount&gt;: '%s' (must be at least the minrelay fee of %s to prevent stuck transactions)</source>
+        <translation>%s=&lt;amount&gt; için geçersiz miktar: '%s' (takılan işlemleri önlemek için en az %s minrelay ücreti olmalıdır)</translation>
+    </message>
+    <message>
+        <source>Invalid or corrupt peers.dat (%s). If you believe this is a bug, please report it to %s. As a workaround, you can move the file (%s) out of the way (rename, move, or delete) to have a new one created on the next start.</source>
+        <translation>Geçersiz veya bozuk peers.dat (%s). Bunun bir hata olduğuna inanıyorsanız, lütfen %s'ye bildirin. Geçici çözüm olarak, bir sonraki başlatmada yeni bir tane oluşturulmak için dosyayı (%s) yoldan çıkarabilirsiniz (yeniden adlandırın, taşıyın veya silin).</translation>
+    </message>
+    <message>
+        <source>No dump file provided. To use createfromdump, -dumpfile=&lt;filename&gt; must be provided.</source>
+        <translation>Döküm dosyası sağlanmadı. createfromdump kullanmak için -dumpfile=&lt;filename&gt; sağlanmalıdır.</translation>
+    </message>
+    <message>
+        <source>No dump file provided. To use dump, -dumpfile=&lt;filename&gt; must be provided.</source>
+        <translation>Döküm dosyası sağlanmadı. dump kullanmak için -dumpfile=&lt;filename&gt; sağlanmalıdır.</translation>
+    </message>
+    <message>
+        <source>No wallet file format provided. To use createfromdump, -format=&lt;format&gt; must be provided.</source>
+        <translation>Cüzdan dosya formatı sağlanmadı. createfromdump kullanmak için -format=&lt;format&gt; sağlanmalıdır.</translation>
+    </message>
+    <message>
+        <source>Outbound connections restricted to CJDNS (-onlynet=cjdns) but -cjdnsreachable is not provided</source>
+        <translation>Giden bağlantılar CJDNS ile sınırlı (-onlynet=cjdns) ancak -cjdnsreachable sağlanmadı</translation>
+    </message>
+    <message>
+        <source>Outbound connections restricted to Tor (-onlynet=onion) but the proxy for reaching the Tor network is explicitly forbidden: -onion=0</source>
+        <translation>Giden bağlantılar Tor ile sınırlı (-onlynet=onion) ancak Tor ağına ulaşmak için proxy açıkça yasaklandı: -onion=0</translation>
+    </message>
+    <message>
+        <source>Outbound connections restricted to Tor (-onlynet=onion) but the proxy for reaching the Tor network is not provided: none of -proxy, -onion or -listenonion is given</source>
+        <translation>Giden bağlantılar Tor ile sınırlı (-onlynet=onion) ancak Tor ağına ulaşmak için proxy sağlanmadı: -proxy, -onion veya -listenonion'dan hiçbiri verilmedi</translation>
+    </message>
+    <message>
+        <source>Outbound connections restricted to i2p (-onlynet=i2p) but -i2psam is not provided</source>
+        <translation>Giden bağlantılar i2p ile sınırlı (-onlynet=i2p) ancak -i2psam sağlanmadı</translation>
+    </message>
     <message>
         <source>Please check that your computer's date and time are correct! If your clock is wrong, %s will not work properly.</source>
         <translation>Lütfen bilgisayarınızın saat ve tarihinin doğru olduğunu kontrol ediniz! Saatinizde gecikme varsa %s doğru şekilde çalışamaz.</translation>
@@ -4449,6 +5870,14 @@
         <source>Please contribute if you find %s useful. Visit %s for further information about the software.</source>
         <translation>%s programını faydalı buluyorsanız lütfen katkıda bulununuz. Yazılım hakkında daha fazla bilgi için %s adresini ziyaret ediniz.</translation>
     </message>
+    <message>
+        <source>Prune mode is incompatible with -reindex-chainstate. Use full -reindex instead.</source>
+        <translation>Budama modu -reindex-chainstate ile uyumlu değil. Bunun yerine tam -reindex kullanın.</translation>
+    </message>
+    <message>
+        <source>This is the maximum transaction fee you pay (in addition to the normal fee) to prioritize partial spend avoidance over regular coin selection.</source>
+        <translation>Bu, normal coin seçimi yerine kısmi harcama önlemeye öncelik vermek için ödediğiniz maksimum işlem ücretidir (normal ücrete ek olarak).</translation>
+    </message>
     <message>
         <source>This is the transaction fee you may discard if change is smaller than dust at this level</source>
         <translation>Bu, para üstü seviyesi tozdan daha küçükse, iptal edebileceğiniz işlem ücretidir.</translation>
@@ -4457,14 +5886,38 @@
         <source>This is the transaction fee you may pay when fee estimates are not available.</source>
         <translation>İşlem ücret tahminleri mevcut olmadığında ödeyebileceğiniz işlem ücreti budur.</translation>
     </message>
+    <message>
+        <source>Transaction requires one destination of non-0 value, a non-0 feerate, or a pre-selected input</source>
+        <translation>İşlem, sıfır olmayan değerli bir hedef, sıfır olmayan bir ücret oranı veya önceden seçilmiş bir girdi gerektirir</translation>
+    </message>
     <message>
         <source>Unable to replay blocks. You will need to rebuild the database using -reindex-chainstate.</source>
         <translation>Bloklar tekrarlanamıyor. -Reindex-chainstate kullanarak veritabanını yeniden kurmanız gerekecek.</translation>
     </message>
+    <message>
+        <source>Unknown wallet file format "%s" provided. Please provide one of "bdb" or "sqlite".</source>
+        <translation>Bilinmeyen cüzdan dosya formatı "%s" sağlandı. Lütfen "bdb" veya "sqlite"'den birini sağlayın.</translation>
+    </message>
+    <message>
+        <source>Unsupported chainstate database format found. Please restart with -reindex-chainstate. This will rebuild the chainstate database.</source>
+        <translation>Desteklenmeyen chainstate veritabanı formatı bulundu. Lütfen -reindex-chainstate ile yeniden başlatın. Bu, chainstate veritabanını yeniden oluşturacaktır.</translation>
+    </message>
+    <message>
+        <source>Warning: Dumpfile wallet format "%s" does not match command line specified format "%s".</source>
+        <translation>Uyarı: Döküm dosyası cüzdan formatı "%s" komut satırında belirtilen format "%s" ile eşleşmiyor.</translation>
+    </message>
     <message>
         <source>Warning: Private keys detected in wallet {%s} with disabled private keys</source>
         <translation>Uyarı: Özel anahtarların devre dışı bırakıldığı {%s} cüzdanında özel anahtarlar algılandı</translation>
     </message>
+    <message>
+        <source>You need to rebuild the database using -reindex to enable -timestampindex</source>
+        <translation>-timestampindex etkinleştirmek için -reindex kullanarak veritabanını yeniden oluşturmanız gerekiyor</translation>
+    </message>
+    <message>
+        <source>%s -- Incorrect seed, it should be a hex string</source>
+        <translation>%s -- Yanlış seed, onaltılık bir dize olmalı</translation>
+    </message>
     <message>
         <source>%s is not a valid backup folder!</source>
         <translation>%s geçerli bir yedek klasörü değil!</translation>
@@ -4489,10 +5942,30 @@
         <source>-rpcport must be specified when -devnet and -server are specified</source>
         <translation>-devnet ve -server belirtildiğinde -rpcport da belirtilmelidir</translation>
     </message>
+    <message>
+        <source>-statsbatchsize cannot be configured with a negative value.</source>
+        <translation>-statsbatchsize negatif bir değerle yapılandırılamaz.</translation>
+    </message>
+    <message>
+        <source>-statsduration cannot be configured with a negative value.</source>
+        <translation>-statsduration negatif bir değerle yapılandırılamaz.</translation>
+    </message>
     <message>
         <source>A fatal internal error occurred, see debug.log for details</source>
         <translation>Önemli bir dahili hata oluştu, ayrıntılar için debug.log'a bakın</translation>
     </message>
+    <message>
+        <source>Cannot create socket (socket() returned error %s)</source>
+        <translation>Soket oluşturulamıyor (socket() %s hatası döndürdü)</translation>
+    </message>
+    <message>
+        <source>Cannot get socket address for %s</source>
+        <translation>%s için soket adresi alınamıyor</translation>
+    </message>
+    <message>
+        <source>Cannot init Statsd client</source>
+        <translation>Statsd istemcisi başlatılamıyor</translation>
+    </message>
     <message>
         <source>Cannot resolve -%s address: '%s'</source>
         <translation>Çözümlenemedi - %s adres: '%s'</translation>
@@ -4501,10 +5974,6 @@
         <source>Cannot write to data directory '%s'; check permissions.</source>
         <translation>'%s' veri dizinine yazılamıyor; izinleri kontrol edin.</translation>
     </message>
-    <message>
-        <source>Change index out of range</source>
-        <translation>Aralık dışında değişiklik indeksi</translation>
-    </message>
     <message>
         <source>Copyright (C)</source>
         <translation>Copyright (C)</translation>
@@ -4513,6 +5982,14 @@
         <source>Disk space is too low!</source>
         <translation>Disk alanı çok düşük!</translation>
     </message>
+    <message>
+        <source>Dump file %s does not exist.</source>
+        <translation>Döküm dosyası %s mevcut değil.</translation>
+    </message>
+    <message>
+        <source>Error creating %s</source>
+        <translation>%s oluşturulurken hata</translation>
+    </message>
     <message>
         <source>Error loading %s</source>
         <translation>%s unsurunun yüklenmesinde hata oluştu</translation>
@@ -4530,8 +6007,8 @@
         <translation>%s yüklenirken hata: Zaten var olan bir HD cüzdanda HD'yi kapatamazsınız.</translation>
     </message>
     <message>
-        <source>Error upgrading chainstate database</source>
-        <translation>Zincirdurumu veritabanı yükseltme hatası</translation>
+        <source>Error reading next record from wallet database</source>
+        <translation>Cüzdan veritabanından sonraki kayıt okunurken hata</translation>
     </message>
     <message>
         <source>Loading P2P addresses…</source>
@@ -4601,6 +6078,14 @@
         <source>Inputs vs outputs size mismatch.</source>
         <translation>Girdi ve çıktı boyutları tutarsız.</translation>
     </message>
+    <message>
+        <source>Invalid '%s'. Allowed values: 128, 160, 192, 224, 256.</source>
+        <translation>Geçersiz '%s'. İzin verilen değerler: 128, 160, 192, 224, 256.</translation>
+    </message>
+    <message>
+        <source>Invalid -i2psam address or hostname: '%s'</source>
+        <translation>Geçersiz -i2psam adresi veya ana makine adı: '%s'</translation>
+    </message>
     <message>
         <source>Invalid -onion address or hostname: '%s'</source>
         <translation>Geçersiz -onion adresi veya ana makine adı: '%s'</translation>
@@ -4645,14 +6130,74 @@
         <source>%s corrupt. Try using the wallet tool dash-wallet to salvage or restoring a backup.</source>
         <translation>%s bozuk. Bir yedeği kurtarmak veya geri yüklemek için cüzdan aracı dash-wallet'ı kullanmayı deneyin.</translation>
     </message>
+    <message>
+        <source>%s is set very high! Fees this large could be paid on a single transaction.</source>
+        <translation>%s çok yüksek ayarlanmış! Bu kadar büyük ücretler tek bir işlemde ödenebilir.</translation>
+    </message>
+    <message>
+        <source>Cannot provide specific connections and have addrman find outgoing connections at the same time.</source>
+        <translation>Belirli bağlantılar sağlanamaz ve addrman aynı anda giden bağlantıları bulamaz.</translation>
+    </message>
+    <message>
+        <source>Failed to upgrade Evo database</source>
+        <translation>Evo veritabanı yükseltilemedi</translation>
+    </message>
+    <message>
+        <source>Fee needed &gt; fee paid</source>
+        <translation>Gereken ücret &gt; ödenen ücret</translation>
+    </message>
+    <message>
+        <source>Host %s on unsupported network</source>
+        <translation>Desteklenmeyen ağda %s ana bilgisayarı</translation>
+    </message>
+    <message>
+        <source>Invalid amount for %s=&lt;amount&gt;: '%s' (must be at least %s)</source>
+        <translation>%s=&lt;amount&gt; için geçersiz miktar: '%s' (en az %s olmalıdır)</translation>
+    </message>
+    <message>
+        <source>Invalid amount for %s=&lt;amount&gt;: '%s'</source>
+        <translation>%s=&lt;amount&gt; için geçersiz miktar: '%s'</translation>
+    </message>
+    <message>
+        <source>Invalid port specified in %s: '%s'</source>
+        <translation>%s içinde geçersiz port belirtildi: '%s'</translation>
+    </message>
     <message>
         <source>Last successful action was too recent.</source>
         <translation>Son başarılı eylemi çok yakında yapıldı.</translation>
     </message>
+    <message>
+        <source>Missing solving data for estimating transaction size</source>
+        <translation>İşlem boyutunu tahmin etmek için çözme verileri eksik</translation>
+    </message>
+    <message>
+        <source>No host specified</source>
+        <translation>Ana bilgisayar belirtilmedi</translation>
+    </message>
+    <message>
+        <source>No host specified, malformed URL</source>
+        <translation>Ana bilgisayar belirtilmedi, bozuk URL</translation>
+    </message>
+    <message>
+        <source>No text before the scheme delimiter, malformed URL</source>
+        <translation>Şema sınırlayıcısından önce metin yok, bozuk URL</translation>
+    </message>
+    <message>
+        <source>Port must be between %d and %d, supplied %d</source>
+        <translation>Port %d ile %d arasında olmalıdır, sağlanan %d</translation>
+    </message>
+    <message>
+        <source>Socket not initialized, cannot send message</source>
+        <translation>Soket başlatılmadı, mesaj gönderilemiyor</translation>
+    </message>
     <message>
         <source>The source code is available from %s.</source>
         <translation>Kaynak kod şuradan elde edilebilir: %s.</translation>
     </message>
+    <message>
+        <source>The specified config file %s does not exist</source>
+        <translation>Belirtilen yapılandırma dosyası %s mevcut değil</translation>
+    </message>
     <message>
         <source>The transaction amount is too small to pay the fee</source>
         <translation>İşlemdeki bitcoin tutarı ücreti ödemek için çok düşük</translation>
@@ -4673,6 +6218,10 @@
         <source>Transaction fees are too high.</source>
         <translation>İşlem ücretleri çok yüksek.</translation>
     </message>
+    <message>
+        <source>Transaction needs a change address, but we can't generate it.</source>
+        <translation>İşlem bir para üstü adresi gerektiriyor, ancak oluşturamıyoruz.</translation>
+    </message>
     <message>
         <source>Transaction not valid.</source>
         <translation>İşlem geçerli değil.</translation>
@@ -4693,6 +6242,18 @@
         <source>Unable to locate enough non-denominated funds for this transaction.</source>
         <translation>Bu işlem için yeterli cinsten olmayan bakiye bulunamadı.</translation>
     </message>
+    <message>
+        <source>Unable to lookup host %s</source>
+        <translation>Ana bilgisayar %s aranamıyor</translation>
+    </message>
+    <message>
+        <source>Unable to parse -maxuploadtarget: '%s'</source>
+        <translation>-maxuploadtarget ayrıştırılamıyor: '%s'</translation>
+    </message>
+    <message>
+        <source>Unable to send message to %s (::sendto() returned error %s)</source>
+        <translation>%s'ye mesaj gönderilemiyor (::sendto() %s hatası döndürdü)</translation>
+    </message>
     <message>
         <source>Unable to sign spork message, wrong key?</source>
         <translation>Spork mesajı imzalanamadı, anahtar mı yanlış?</translation>
@@ -4706,12 +6267,12 @@
         <translation>Bilinmeyen durum: id = %u</translation>
     </message>
     <message>
-        <source>Unsupported logging category %s=%s.</source>
-        <translation>Desteklenmeyen günlük kaydı kategorisi %s=%s.</translation>
+        <source>Unsupported URL scheme, must begin with udp://</source>
+        <translation>Desteklenmeyen URL şeması, udp:// ile başlamalıdır</translation>
     </message>
     <message>
-        <source>Upgrading txindex database</source>
-        <translation>txindex veritabanını yükseltme</translation>
+        <source>Unsupported logging category %s=%s.</source>
+        <translation>Desteklenmeyen günlük kaydı kategorisi %s=%s.</translation>
     </message>
     <message>
         <source>Very low number of keys left: %d</source>
@@ -4741,9 +6302,25 @@
         <source>You can not disable governance validation on a masternode.</source>
         <translation>Bir anadüğümde yönetim doğrulamasını devre dışı bırakamazsınız.</translation>
     </message>
+    <message>
+        <source>You need to rebuild the database using -reindex to enable -addressindex</source>
+        <translation>-addressindex etkinleştirmek için -reindex kullanarak veritabanını yeniden oluşturmanız gerekiyor</translation>
+    </message>
+    <message>
+        <source>You need to rebuild the database using -reindex to enable -spentindex</source>
+        <translation>-spentindex etkinleştirmek için -reindex kullanarak veritabanını yeniden oluşturmanız gerekiyor</translation>
+    </message>
     <message>
         <source>Your entries added successfully.</source>
         <translation>Girdileriniz başarıyla eklendi.</translation>
     </message>
+    <message>
+        <source>Settings file could not be read</source>
+        <translation>Ayarlar dosyası okunamadı</translation>
+    </message>
+    <message>
+        <source>Settings file could not be written</source>
+        <translation>Ayarlar dosyası yazılamadı</translation>
+    </message>
 </context>
 </TS>
\ No newline at end of file

From 6e243b2449588fa5c453741119e667e33ab1378f Mon Sep 17 00:00:00 2001
From: UdjinM6 <UdjinM6@users.noreply.github.com>
Date: Fri, 24 Oct 2025 21:51:10 +0300
Subject: [PATCH 330/656] zh_CN

---
 src/qt/locale/dash_zh_CN.ts | 818 +++++++++++++++++++++++++++---------
 1 file changed, 630 insertions(+), 188 deletions(-)

diff --git a/src/qt/locale/dash_zh_CN.ts b/src/qt/locale/dash_zh_CN.ts
index 076e9cc55e27..1c14e62cec94 100644
--- a/src/qt/locale/dash_zh_CN.ts
+++ b/src/qt/locale/dash_zh_CN.ts
@@ -65,14 +65,6 @@
         <source>C&amp;hoose</source>
         <translation>选择(&amp;H)</translation>
     </message>
-    <message>
-        <source>Sending addresses</source>
-        <translation>正在发送地址</translation>
-    </message>
-    <message>
-        <source>Receiving addresses</source>
-        <translation>正在接收地址</translation>
-    </message>
     <message>
         <source>These are your Dash addresses for sending payments. Always check the amount and the receiving address before sending coins.</source>
         <translation>这些是您要付款过去的Dash地址。在付款之前，务必要检查金额和收款地址是否正确。</translation>
@@ -115,6 +107,14 @@
         <extracomment>An error message. %1 is a stand-in argument for the name of the file we attempted to save to.</extracomment>
         <translation>尝试保存地址列表至 %1 时发生错误. 请重新执行操作.</translation>
     </message>
+    <message>
+        <source>Sending addresses - %1</source>
+        <translation>发送地址 - %1</translation>
+    </message>
+    <message>
+        <source>Receiving addresses - %1</source>
+        <translation>接收地址 - %1</translation>
+    </message>
     <message>
         <source>Exporting Failed</source>
         <translation>导出失败</translation>
@@ -284,10 +284,22 @@
         <source>The passphrase entered for the wallet decryption was incorrect.</source>
         <translation>用于解密钱包的密码不正确。</translation>
     </message>
+    <message>
+        <source>The passphrase entered for the wallet decryption is incorrect. It contains a null character (ie - a zero byte). If the passphrase was set with a version of this software prior to 23.0, please try again with only the characters up to — but not including — the first null character. If this is successful, please set a new passphrase to avoid this issue in the future.</source>
+        <translation>用于解密钱包的密码不正确。其中包含空字符（即零字节）。如果密码是使用 23.0 之前版本的软件设置的，请仅使用第一个空字符之前（但不包括）的字符重试。如果成功，请设置新密码以避免将来出现此问题。</translation>
+    </message>
     <message>
         <source>Wallet passphrase was successfully changed.</source>
         <translation>修改钱包密码成功。</translation>
     </message>
+    <message>
+        <source>Passphrase change failed</source>
+        <translation>密码修改失败</translation>
+    </message>
+    <message>
+        <source>The old passphrase entered for the wallet decryption is incorrect. It contains a null character (ie - a zero byte). If the passphrase was set with a version of this software prior to 23.0, please try again with only the characters up to — but not including — the first null character.</source>
+        <translation>用于解密钱包的旧密码不正确。其中包含空字符（即零字节）。如果密码是使用 23.0 之前版本的软件设置的，请仅使用第一个空字符之前（但不包括）的字符重试。</translation>
+    </message>
     <message>
         <source>Warning: The Caps Lock key is on!</source>
         <translation>警告：大写锁定键处于打开状态！</translation>
@@ -392,10 +404,6 @@
         <source>&amp;Load PSBT from file…</source>
         <translation>&amp;从文件读取 PSBT…</translation>
     </message>
-    <message>
-        <source>Load PSBT from clipboard…</source>
-        <translation>从剪切板读取 PSBT...</translation>
-    </message>
     <message>
         <source>&amp;Sending addresses</source>
         <translation>&amp;发送地址</translation>
@@ -428,10 +436,6 @@
         <source>&amp;Window</source>
         <translation>&amp;窗口</translation>
     </message>
-    <message>
-        <source>Minimize</source>
-        <translation>最小化</translation>
-    </message>
     <message>
         <source>Zoom</source>
         <translation>放大</translation>
@@ -484,14 +488,6 @@
         <source>Modify configuration options for %1</source>
         <translation>修改%1配置选项</translation>
     </message>
-    <message>
-        <source>&amp;Show / Hide</source>
-        <translation>显示 / 隐藏(&amp;S)</translation>
-    </message>
-    <message>
-        <source>Show or hide the main Window</source>
-        <translation>显示或隐藏主窗口</translation>
-    </message>
     <message>
         <source>Encrypt the private keys that belong to your wallet</source>
         <translation>对钱包中的私钥加密</translation>
@@ -556,10 +552,6 @@
         <source>Show wallet repair options</source>
         <translation>显示钱包修复选项</translation>
     </message>
-    <message>
-        <source>Open Wallet &amp;Configuration File</source>
-        <translation>打开钱包 &amp;配置文件</translation>
-    </message>
     <message>
         <source>Open configuration file</source>
         <translation>打开配置文件</translation>
@@ -614,10 +606,18 @@
         <source>Show information about %1</source>
         <translation>显示有关%1的相关信息</translation>
     </message>
+    <message>
+        <source>Load PSBT from &amp;clipboard…</source>
+        <translation>从剪贴板加载 PSBT…</translation>
+    </message>
     <message>
         <source>Open debugging and diagnostic console</source>
         <translation>打开调试和诊断控制台</translation>
     </message>
+    <message>
+        <source>Open &amp;wallet configuration file</source>
+        <translation>打开钱包配置文件(&amp;W)</translation>
+    </message>
     <message>
         <source>Open a dash: URI</source>
         <translation>打开一个dash: URI</translation>
@@ -626,6 +626,16 @@
         <source>Create a new wallet</source>
         <translation>创建一个新钱包</translation>
     </message>
+    <message>
+        <source>Restore Wallet…</source>
+        <extracomment>Name of the menu item that restores wallet from a backup file.</extracomment>
+        <translation>恢复钱包…</translation>
+    </message>
+    <message>
+        <source>Restore a wallet from a backup file</source>
+        <extracomment>Status tip for Restore Wallet menu item</extracomment>
+        <translation>从备份文件恢复钱包</translation>
+    </message>
     <message>
         <source>Close all wallets</source>
         <translation>关闭所有钱包</translation>
@@ -646,10 +656,34 @@
         <source>Mask the values in the Overview tab</source>
         <translation>遮盖总览选项卡中的数值</translation>
     </message>
+    <message>
+        <source>Wallet Data</source>
+        <extracomment>Name of the wallet data file format.</extracomment>
+        <translation>钱包数据</translation>
+    </message>
+    <message>
+        <source>Load Wallet Backup</source>
+        <extracomment>The title for Restore Wallet File Windows</extracomment>
+        <translation>加载钱包备份</translation>
+    </message>
+    <message>
+        <source>Restore Wallet</source>
+        <extracomment>Title of pop-up window shown when the user is attempting to restore a wallet.</extracomment>
+        <translation>恢复钱包</translation>
+    </message>
+    <message>
+        <source>Wallet Name</source>
+        <extracomment>Label of the input field where the name of the wallet is entered.</extracomment>
+        <translation>钱包名称</translation>
+    </message>
     <message>
         <source>&amp;Settings</source>
         <translation>设置(&amp;S)</translation>
     </message>
+    <message>
+        <source>&amp;Minimize</source>
+        <translation>最小化(&amp;M)</translation>
+    </message>
     <message>
         <source>&amp;Help</source>
         <translation>帮助(&amp;H)</translation>
@@ -666,6 +700,14 @@
         <source>View Governance Proposals</source>
         <translation>查看治理提案</translation>
     </message>
+    <message>
+        <source>&amp;Hide</source>
+        <translation>隐藏(&amp;H)</translation>
+    </message>
+    <message>
+        <source>S&amp;how</source>
+        <translation>显示(&amp;H)</translation>
+    </message>
     <message numerus="yes">
         <source>%n active connection(s) to Dash network</source>
         <extracomment>A substring of the tooltip.</extracomment>
@@ -687,6 +729,14 @@
         <source>Close Wallet…</source>
         <translation>关闭钱包…</translation>
     </message>
+    <message>
+        <source>Load Partially Signed Blockchain Transaction</source>
+        <translation>读取部分签名的区块链交易</translation>
+    </message>
+    <message>
+        <source>Load Partially Signed Blockchain Transaction from clipboard</source>
+        <translation>从剪贴板读取部分签名的区块链交易</translation>
+    </message>
     <message>
         <source>Create Wallet…</source>
         <translation>创建钱包…</translation>
@@ -739,10 +789,6 @@
         <source>Processing blocks on disk…</source>
         <translation>正在处理硬盘中的区块…</translation>
     </message>
-    <message>
-        <source>Reindexing blocks on disk…</source>
-        <translation>正在为硬盘中的区块重建索引…</translation>
-    </message>
     <message>
         <source>Connecting to peers…</source>
         <translation>正在连接到节点……</translation>
@@ -896,10 +942,6 @@
         <source>Coin Selection</source>
         <translation>选择币</translation>
     </message>
-    <message>
-        <source>Dust:</source>
-        <translation>零散金额：</translation>
-    </message>
     <message>
         <source>After Fee:</source>
         <translation>加上交易费用后：</translation>
@@ -1000,10 +1042,6 @@
         <source>Copy bytes</source>
         <translation>复制字节</translation>
     </message>
-    <message>
-        <source>Copy dust</source>
-        <translation>复制零钱金额</translation>
-    </message>
     <message>
         <source>Copy change</source>
         <translation>复制零钱</translation>
@@ -1016,18 +1054,6 @@
         <source>(%1 locked)</source>
         <translation>(%1 锁定)</translation>
     </message>
-    <message>
-        <source>yes</source>
-        <translation>是</translation>
-    </message>
-    <message>
-        <source>no</source>
-        <translation>否</translation>
-    </message>
-    <message>
-        <source>This label turns red if any recipient receives an amount smaller than the current dust threshold.</source>
-        <translation>当任何一个收款金额小于目前的零散金额上限时，文字会变红色。</translation>
-    </message>
     <message>
         <source>Can vary +/- %1 duff(s) per input.</source>
         <translation>每笔输入可能会有 +/- %1个duff(s)的偏差.</translation>
@@ -1241,18 +1267,102 @@
         <source>Filter proposal list</source>
         <translation>筛选提案列表</translation>
     </message>
+    <message>
+        <source>Masternode Count:</source>
+        <translation>主节点数量：</translation>
+    </message>
+    <message>
+        <source>Number of masternodes this wallet can vote with (masternodes for which this wallet holds the voting key)</source>
+        <translation>此钱包可投票的主节点数量（此钱包持有投票密钥的主节点）</translation>
+    </message>
     <message>
         <source>Proposal Count:</source>
         <translation>提案数量:</translation>
     </message>
+    <message>
+        <source>Create Proposal</source>
+        <translation>创建提案</translation>
+    </message>
     <message>
         <source>Filter by Title</source>
         <translation>按标题筛选</translation>
     </message>
+    <message>
+        <source>Unavailable</source>
+        <translation>不可用</translation>
+    </message>
+    <message>
+        <source>A synced node and an unlocked wallet are required.</source>
+        <translation>需要已同步的节点和已解锁的钱包。</translation>
+    </message>
+    <message>
+        <source>Vote Yes</source>
+        <translation>投赞成票</translation>
+    </message>
+    <message>
+        <source>Vote No</source>
+        <translation>投反对票</translation>
+    </message>
+    <message>
+        <source>Vote Abstain</source>
+        <translation>投弃权票</translation>
+    </message>
     <message>
         <source>Proposal Info: %1</source>
         <translation>提案信息: %1</translation>
     </message>
+    <message>
+        <source>Voting Failed</source>
+        <translation>投票失败</translation>
+    </message>
+    <message>
+        <source>No wallet available.</source>
+        <translation>没有可用的钱包。</translation>
+    </message>
+    <message>
+        <source>No masternode voting keys found in wallet.</source>
+        <translation>在钱包中未找到主节点投票密钥。</translation>
+    </message>
+    <message>
+        <source>Please select a proposal to vote on.</source>
+        <translation>请选择要投票的提案。</translation>
+    </message>
+    <message>
+        <source>Unable to unlock wallet.</source>
+        <translation>无法解锁钱包。</translation>
+    </message>
+    <message>
+        <source>Unable to get masternode list. Please try again later.</source>
+        <translation>无法获取主节点列表。请稍后重试。</translation>
+    </message>
+    <message>
+        <source>Masternode %1 not found</source>
+        <translation>未找到主节点 %1</translation>
+    </message>
+    <message>
+        <source>Failed to sign vote for masternode %1</source>
+        <translation>为主节点 %1 签署投票失败</translation>
+    </message>
+    <message>
+        <source>Masternode %1: %2</source>
+        <translation>主节点 %1：%2</translation>
+    </message>
+    <message numerus="yes">
+        <source>Voted successfully %n time(s)</source>
+        <translation><numerusform>成功投票 %n 次</numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <source>Failed to vote %n time(s)</source>
+        <translation><numerusform>投票失败 %n 次</numerusform></translation>
+    </message>
+    <message>
+        <source>Errors:</source>
+        <translation>错误：</translation>
+    </message>
+    <message>
+        <source>Voting Results</source>
+        <translation>投票结果</translation>
+    </message>
 </context>
 <context>
     <name>HelpMessageDialog</name>
@@ -1323,13 +1433,17 @@
         <source>Use a custom data directory:</source>
         <translation>使用自定义的数据目录：</translation>
     </message>
-    <message>
-        <source>(of %1 GB needed)</source>
-        <translation>(需要 %1 GB的空间)</translation>
+    <message numerus="yes">
+        <source>%n GB of space available</source>
+        <translation><numerusform>可用空间 %n GB</numerusform></translation>
     </message>
-    <message>
-        <source>(%1 GB needed for full chain)</source>
-        <translation>(完整区块链需要 %1 GB)</translation>
+    <message numerus="yes">
+        <source>(of %n GB needed)</source>
+        <translation><numerusform>（需要 %n GB）</numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <source>(%n GB needed for full chain)</source>
+        <translation><numerusform>（完整区块链需要 %n GB）</numerusform></translation>
     </message>
     <message>
         <source>At least %1 GB of data will be stored in this directory, and it will grow over time.</source>
@@ -1361,6 +1475,13 @@
         <translation>错误</translation>
     </message>
 </context>
+<context>
+    <name>LoadWalletsActivity</name>
+    <message>
+        <source>Loading wallets…</source>
+        <translation>正在加载钱包…</translation>
+    </message>
+</context>
 <context>
     <name>MasternodeList</name>
     <message>
@@ -1553,6 +1674,11 @@
         <source>URI:</source>
         <translation>URI:</translation>
     </message>
+    <message>
+        <source>Paste address from clipboard</source>
+        <extracomment>Tooltip text for button that allows you to paste an address that is in your clipboard.</extracomment>
+        <translation>从剪贴板粘贴地址</translation>
+    </message>
 </context>
 <context>
     <name>OpenWalletActivity</name>
@@ -1663,6 +1789,16 @@
         <extracomment>An Options window setting to set subtracting the fee from a sending amount as default.</extracomment>
         <translation>默认从金额中扣除 &amp;手续费</translation>
     </message>
+    <message>
+        <source>Enable &amp;PSBT controls</source>
+        <extracomment>An options window setting to enable PSBT controls.</extracomment>
+        <translation>启用 PSBT 控件(&amp;P)</translation>
+    </message>
+    <message>
+        <source>Whether to show PSBT controls.</source>
+        <extracomment>Tooltip text for options window setting that enables PSBT controls.</extracomment>
+        <translation>是否显示 PSBT 控件。</translation>
+    </message>
     <message>
         <source>Whether to keep the specified custom change address or not.</source>
         <translation>是否保留指定的自定义找零地址.</translation>
@@ -1806,20 +1942,20 @@ https://explore.transifex.com/dash/dash/</source>
 https://explore.transifex.com/dash/dash/</translation>
     </message>
     <message>
-        <source>Options set in this dialog are overridden by the command line or in the configuration file:</source>
-        <translation>此对话框中设置的选项被命令行或配置文件覆盖:</translation>
+        <source>Third-party URLs (e.g. a block explorer) that appear in the transactions tab as context menu items.&lt;br/&gt;%s in the URL is replaced by transaction hash. Multiple URLs are separated by vertical bar |.</source>
+        <translation>在交易选项卡中以上下文菜单项出现的第三方 URL（例如区块浏览器）。&lt;br/&gt;URL 中的 %s 将替换为交易哈希。多个 URL 用竖线 | 分隔。</translation>
     </message>
     <message>
-        <source>Minimize instead of exit the application when the window is closed. When this option is enabled, the application will be closed only after selecting Exit in the menu.</source>
-        <translation>窗口被关闭时最小化而不是退出应用程序。当此选项启用时，应用程序只会在菜单中选择退出时退出。</translation>
+        <source>&amp;Third-party transaction URLs</source>
+        <translation>第三方交易 URL(&amp;T)</translation>
     </message>
     <message>
-        <source>Third party URLs (e.g. a block explorer) that appear in the transactions tab as context menu items.&lt;br/&gt;%s in the URL is replaced by transaction hash. Multiple URLs are separated by vertical bar |.</source>
-        <translation>出现在交易的选项卡的上下文菜单项的第三方URL（例如，区块链查询网站）。&lt;br/&gt;URL中的 %s被替换为交易哈希。多个URL需用竖线 | 分隔。</translation>
+        <source>Options set in this dialog are overridden by the command line or in the configuration file:</source>
+        <translation>此对话框中设置的选项被命令行或配置文件覆盖:</translation>
     </message>
     <message>
-        <source>&amp;Third party transaction URLs</source>
-        <translation>&amp;第三方交易链接</translation>
+        <source>Minimize instead of exit the application when the window is closed. When this option is enabled, the application will be closed only after selecting Exit in the menu.</source>
+        <translation>窗口被关闭时最小化而不是退出应用程序。当此选项启用时，应用程序只会在菜单中选择退出时退出。</translation>
     </message>
     <message>
         <source>Whether to show coin control features or not.</source>
@@ -1963,14 +2099,22 @@ https://explore.transifex.com/dash/dash/</translation>
     </message>
     <message>
         <source>Confirm options reset</source>
+        <extracomment>Window title text of pop-up window shown when the user has chosen to reset options.</extracomment>
         <translation>确认恢复缺省设置</translation>
     </message>
     <message>
         <source>Client restart required to activate changes.</source>
+        <extracomment>Text explaining that the settings changed will not come into effect until the client is restarted.</extracomment>
         <translation>更改生效需要重启客户端。</translation>
     </message>
+    <message>
+        <source>Current settings will be backed up at "%1".</source>
+        <extracomment>Text explaining to the user that the client's current settings will be backed up at a specific location. %1 is a stand-in argument for the backup location's path.</extracomment>
+        <translation>当前设置将备份到"%1"。</translation>
+    </message>
     <message>
         <source>Client will be shut down. Do you want to proceed?</source>
+        <extracomment>Text asking the user to confirm if they would like to proceed with a client shutdown.</extracomment>
         <translation>客户端即将关闭，您想继续吗？</translation>
     </message>
     <message>
@@ -2243,6 +2387,10 @@ https://explore.transifex.com/dash/dash/</translation>
         <source>Failed to sign transaction: %1</source>
         <translation>无法签名交易: %1</translation>
     </message>
+    <message>
+        <source>Cannot sign inputs while wallet is locked.</source>
+        <translation>钱包被锁定时无法签署输入。</translation>
+    </message>
     <message>
         <source>Could not sign any more inputs.</source>
         <translation>无法签名更多输入.</translation>
@@ -2487,6 +2635,181 @@ Due to discontinued support, you should request the merchant to provide you with
         <translation>状态</translation>
     </message>
 </context>
+<context>
+    <name>ProposalWizard</name>
+    <message>
+        <source>Create Governance Proposal</source>
+        <translation>创建治理提案</translation>
+    </message>
+    <message>
+        <source>Enter proposal details</source>
+        <translation>输入提案详情</translation>
+    </message>
+    <message>
+        <source>A fee will be burned when you prepare the proposal.</source>
+        <translation>准备提案时将销毁一笔费用。</translation>
+    </message>
+    <message>
+        <source>Proposal &amp;name</source>
+        <translation>提案名称(&amp;N)</translation>
+    </message>
+    <message>
+        <source>&amp;Description URL</source>
+        <translation>描述 URL(&amp;D)</translation>
+    </message>
+    <message>
+        <source>Payment &amp;address</source>
+        <translation>支付地址(&amp;A)</translation>
+    </message>
+    <message>
+        <source>Payment &amp;amount</source>
+        <translation>支付金额(&amp;A)</translation>
+    </message>
+    <message>
+        <source>The amount to request in a single payment</source>
+        <translation>单次支付中请求的金额</translation>
+    </message>
+    <message>
+        <source>&amp;First payment</source>
+        <translation>首次支付(&amp;F)</translation>
+    </message>
+    <message>
+        <source>Pa&amp;yments</source>
+        <translation>支付次数(&amp;Y)</translation>
+    </message>
+    <message>
+        <source>To&amp;tal amount</source>
+        <translation>总金额(&amp;T)</translation>
+    </message>
+    <message>
+        <source>Proposal &amp;fee</source>
+        <translation>提案费用(&amp;F)</translation>
+    </message>
+    <message>
+        <source>Next</source>
+        <translation>下一步</translation>
+    </message>
+    <message>
+        <source>Review proposal JSON and validate.</source>
+        <translation>检查提案 JSON 并验证。</translation>
+    </message>
+    <message>
+        <source>Hex-encoded JSON</source>
+        <translation>十六进制编码的 JSON</translation>
+    </message>
+    <message>
+        <source>Back</source>
+        <translation>返回</translation>
+    </message>
+    <message>
+        <source>Validate</source>
+        <translation>验证</translation>
+    </message>
+    <message>
+        <source>Prepare (burn fee) and wait for confirmations.</source>
+        <translation>准备（销毁费用）并等待确认。</translation>
+    </message>
+    <message>
+        <source>Copy</source>
+        <translation>复制</translation>
+    </message>
+    <message>
+        <source>At 1/6 confirmations: can be relayed and queued. At 6/6: accepted and processed.</source>
+        <translation>1/6 确认时：可以中继和排队。6/6 时：接受并处理。</translation>
+    </message>
+    <message>
+        <source>Confirmations progress</source>
+        <translation>确认进度</translation>
+    </message>
+    <message>
+        <source>Shows progress toward the required number of confirmations for the proposal fee transaction.</source>
+        <translation>显示提案费用交易所需确认数的进度。</translation>
+    </message>
+    <message>
+        <source>Estimated time remaining: -</source>
+        <translation>预计剩余时间：-</translation>
+    </message>
+    <message>
+        <source>Prepare Proposal</source>
+        <translation>准备提案</translation>
+    </message>
+    <message>
+        <source>You can submit after 1 confirmation. At 6 confirmations it is accepted and processed.</source>
+        <translation>1 次确认后即可提交。6 次确认后将被接受并处理。</translation>
+    </message>
+    <message>
+        <source>Proposal ID:</source>
+        <translation>提案 ID：</translation>
+    </message>
+    <message>
+        <source>Submit Proposal</source>
+        <translation>提交提案</translation>
+    </message>
+    <message>
+        <source>Close</source>
+        <translation>关闭</translation>
+    </message>
+    <message>
+        <source>Valid</source>
+        <translation>有效</translation>
+    </message>
+    <message>
+        <source>Invalid: %1</source>
+        <translation>无效：%1</translation>
+    </message>
+    <message>
+        <source>Burn %1</source>
+        <translation>销毁 %1</translation>
+    </message>
+    <message>
+        <source>Burn %1 to create the fee transaction?</source>
+        <translation>销毁 %1 以创建费用交易？</translation>
+    </message>
+    <message>
+        <source>Prepare failed</source>
+        <translation>准备失败</translation>
+    </message>
+    <message>
+        <source>Confirmations: %1 / %2 required</source>
+        <translation>确认数：%1 / 需要 %2</translation>
+    </message>
+    <message>
+        <source>Estimated time remaining: Ready</source>
+        <translation>预计剩余时间：就绪</translation>
+    </message>
+    <message numerus="yes">
+        <source>Estimated time remaining: %n minute(s)</source>
+        <translation><numerusform>预计剩余时间：%n 分钟</numerusform></translation>
+    </message>
+    <message>
+        <source>Your proposal was submitted successfully.</source>
+        <translation>您的提案已成功提交。</translation>
+    </message>
+    <message>
+        <source>Already submitted</source>
+        <translation>已提交</translation>
+    </message>
+    <message>
+        <source>This proposal has already been submitted.</source>
+        <translation>此提案已经提交。</translation>
+    </message>
+    <message>
+        <source>Submission failed</source>
+        <translation>提交失败</translation>
+    </message>
+    <message>
+        <source>Proposal submitted</source>
+        <translation>提案已提交</translation>
+    </message>
+    <message>
+        <source>A fee of %1 will be burned when you prepare the proposal.</source>
+        <translation>准备提案时将销毁 %1 的费用。</translation>
+    </message>
+    <message>
+        <source>Prepare (burn %1) and wait for %2 confirmations.</source>
+        <translation>准备（销毁 %1）并等待 %2 次确认。</translation>
+    </message>
+</context>
 <context>
     <name>QObject</name>
     <message>
@@ -2876,14 +3199,6 @@ Due to discontinued support, you should request the merchant to provide you with
         <source>Version</source>
         <translation>版本</translation>
     </message>
-    <message>
-        <source>Whether the peer requested us to relay transactions.</source>
-        <translation>节点是否要求进行中继交易.</translation>
-    </message>
-    <message>
-        <source>Wants Tx Relay</source>
-        <translation>想要交易中继</translation>
-    </message>
     <message>
         <source>High bandwidth BIP152 compact block relay: %1</source>
         <translation>高带宽 BIP152 紧凑区块中继: %1</translation>
@@ -2989,6 +3304,14 @@ Due to discontinued support, you should request the merchant to provide you with
         <source>To specify a non-default location of the blocks directory use the '%1' option.</source>
         <translation>要指定的区块目录不是默认路径, 请使用 '%1' 选项.</translation>
     </message>
+    <message>
+        <source>Local Addresses</source>
+        <translation>本地地址</translation>
+    </message>
+    <message>
+        <source>Network addresses that your Dash node is currently using to communicate with other nodes.</source>
+        <translation>您的 Dash 节点当前用于与其他节点通信的网络地址。</translation>
+    </message>
     <message>
         <source>Number of regular Masternodes</source>
         <translation>常规主节点数量</translation>
@@ -3081,6 +3404,14 @@ Due to discontinued support, you should request the merchant to provide you with
         <source>Services</source>
         <translation>服务</translation>
     </message>
+    <message>
+        <source>Whether we relay transactions to this peer.</source>
+        <translation>是否向此对等节点中继交易。</translation>
+    </message>
+    <message>
+        <source>Transaction Relay</source>
+        <translation>交易中继</translation>
+    </message>
     <message>
         <source>Connection Time</source>
         <translation>连接时间</translation>
@@ -3229,6 +3560,10 @@ Due to discontinued support, you should request the merchant to provide you with
         <source>Network activity disabled</source>
         <translation>网络活动已禁用</translation>
     </message>
+    <message>
+        <source>None</source>
+        <translation>无</translation>
+    </message>
     <message>
         <source>Total: %1 (Enabled: %2)</source>
         <translation>总计: %1 (已激活的: %2)</translation>
@@ -3550,6 +3885,34 @@ For more information on using this console, type %6.
         <translation>总额</translation>
     </message>
 </context>
+<context>
+    <name>RestoreWalletActivity</name>
+    <message>
+        <source>Restore Wallet</source>
+        <extracomment>Title of progress window which is displayed when wallets are being restored.</extracomment>
+        <translation>恢复钱包</translation>
+    </message>
+    <message>
+        <source>Restoring Wallet &lt;b&gt;%1&lt;/b&gt;…</source>
+        <extracomment>Descriptive text of the restore wallets progress window which indicates to the user that wallets are currently being restored.</extracomment>
+        <translation>正在恢复钱包 &lt;b&gt;%1&lt;/b&gt;…</translation>
+    </message>
+    <message>
+        <source>Restore wallet failed</source>
+        <extracomment>Title of message box which is displayed when the wallet could not be restored.</extracomment>
+        <translation>恢复钱包失败</translation>
+    </message>
+    <message>
+        <source>Restore wallet warning</source>
+        <extracomment>Title of message box which is displayed when the wallet is restored with some warning.</extracomment>
+        <translation>恢复钱包警告</translation>
+    </message>
+    <message>
+        <source>Restore wallet message</source>
+        <extracomment>Title of message box which is displayed when the wallet is successfully restored.</extracomment>
+        <translation>恢复钱包消息</translation>
+    </message>
+</context>
 <context>
     <name>SendCoinsDialog</name>
     <message>
@@ -3584,10 +3947,6 @@ For more information on using this console, type %6.
         <source>Fee:</source>
         <translation>费用：</translation>
     </message>
-    <message>
-        <source>Dust:</source>
-        <translation>零散金额：</translation>
-    </message>
     <message>
         <source>Inputs…</source>
         <translation>输入…</translation>
@@ -3712,10 +4071,6 @@ For more information on using this console, type %6.
         <source>Copy bytes</source>
         <translation>复制字节</translation>
     </message>
-    <message>
-        <source>Copy dust</source>
-        <translation>复制零散金额</translation>
-    </message>
     <message>
         <source>Copy change</source>
         <translation>复制找零金额</translation>
@@ -3724,10 +4079,6 @@ For more information on using this console, type %6.
         <source>%1 (%2 blocks)</source>
         <translation>%1 (%2 区块)</translation>
     </message>
-    <message>
-        <source>This will produce a Partially Signed Transaction (PSBT) which you can save or copy and then sign with e.g. an offline %1 wallet, or a PSBT-compatible hardware wallet.</source>
-        <translation>它将生成一个部分签名交易 (PSBT), 您可以将其保存或复制, 然后使用例如离线的 %1 钱包, 或兼容 PSBT 的硬件钱包进行签名.</translation>
-    </message>
     <message>
         <source>using</source>
         <translation>使用</translation>
@@ -3736,10 +4087,6 @@ For more information on using this console, type %6.
         <source>%1 to %2</source>
         <translation>%1 到 %2</translation>
     </message>
-    <message>
-        <source>Are you sure you want to send?</source>
-        <translation>您确定要发出吗？</translation>
-    </message>
     <message>
         <source>&lt;b&gt;(%1 of %2 entries displayed)&lt;/b&gt;</source>
         <translation>&lt;b&gt;（在%2中%1个项目显示出来）&lt;/b&gt;</translation>
@@ -3764,10 +4111,6 @@ For more information on using this console, type %6.
         <source>%1 to '%2'</source>
         <translation>%1 到 '%2'</translation>
     </message>
-    <message>
-        <source>Do you want to draft this transaction?</source>
-        <translation>您想要起草这笔交易吗?</translation>
-    </message>
     <message>
         <source>%1 funds only</source>
         <translation>仅支持%1资金</translation>
@@ -3816,14 +4159,6 @@ For more information on using this console, type %6.
         <source>Confirm send coins</source>
         <translation>确认发送货币</translation>
     </message>
-    <message>
-        <source>Confirm transaction proposal</source>
-        <translation>确认交易提案</translation>
-    </message>
-    <message>
-        <source>Create Unsigned</source>
-        <translation>创建未签名的</translation>
-    </message>
     <message>
         <source>Save Transaction Data</source>
         <translation>保存交易数据</translation>
@@ -3837,8 +4172,28 @@ For more information on using this console, type %6.
         <translation>仅可见余额:</translation>
     </message>
     <message>
-        <source>Send</source>
-        <translation>发送</translation>
+        <source>Creates a Partially Signed Blockchain Transaction (PSBT) for use with e.g. an offline %1 wallet, or a PSBT-compatible hardware wallet.</source>
+        <translation>创建一个部分签名的区块链交易（PSBT），以与例如离线 %1 钱包或与PSBT兼容的硬件钱包。</translation>
+    </message>
+    <message>
+        <source>Do you want to create this transaction?</source>
+        <extracomment>Message displayed when attempting to create a transaction. Cautionary text to prompt the user to verify that the displayed transaction details represent the transaction the user intends to create.</extracomment>
+        <translation>您想创建这笔交易吗？</translation>
+    </message>
+    <message>
+        <source>Please, review your transaction proposal. This will produce a Partially Signed Blockchain Transaction (PSBT) which you can save or copy and then sign with e.g. an offline %1 wallet, or a PSBT-compatible hardware wallet.</source>
+        <extracomment>Text to inform a user attempting to create a transaction of their current options. At this stage, a user can only create a PSBT. This string is displayed when private keys are disabled and an external signer is not available.</extracomment>
+        <translation>请检查您的交易提案。这将生成一个部分签名区块链交易（PSBT），您可以保存或复制它，然后使用例如离线 %1 钱包或兼容 PSBT 的硬件钱包进行签名。</translation>
+    </message>
+    <message>
+        <source>Please, review your transaction. You can create and send this transaction or create a Partially Signed Blockchain Transaction (PSBT), which you can save or copy and then sign with, e.g., an offline %1 wallet, or a PSBT-compatible hardware wallet.</source>
+        <extracomment>Text to inform a user attempting to create a transaction of their current options. At this stage, a user can send their transaction or create a PSBT. This string is displayed when both private keys and PSBT controls are enabled.</extracomment>
+        <translation>请检查您的交易。您可以创建并发送此交易，或创建一个部分签名区块链交易（PSBT），您可以保存或复制它，然后使用例如离线 %1 钱包或兼容 PSBT 的硬件钱包进行签名。</translation>
+    </message>
+    <message>
+        <source>Please, review your transaction.</source>
+        <extracomment>Text to prompt a user to review the details of the transaction they are attempting to send.</extracomment>
+        <translation>请检查您的交易。</translation>
     </message>
     <message>
         <source>To review recipient list click "Show Details…"</source>
@@ -3968,21 +4323,16 @@ For more information on using this console, type %6.
         <source>A message that was attached to the dash: URI which will be stored with the transaction for your reference. Note: This message will not be sent over the Dash network.</source>
         <translation>附加在Dash付款协议URI中的信息，会和交易内容一并存储，可供您参考。提示：此信息不会发送到Dash网络上。</translation>
     </message>
+</context>
+<context>
+    <name>SendConfirmationDialog</name>
     <message>
-        <source>This is an unauthenticated payment request.</source>
-        <translation>这是一个未经验证的支付请求。</translation>
-    </message>
-    <message>
-        <source>This is an authenticated payment request.</source>
-        <translation>这是一个已经验证的支付请求。</translation>
-    </message>
-    <message>
-        <source>Pay To:</source>
-        <translation>支付给：</translation>
+        <source>Send</source>
+        <translation>发送</translation>
     </message>
     <message>
-        <source>Memo:</source>
-        <translation>便条：</translation>
+        <source>Create Unsigned</source>
+        <translation>创建未签名交易</translation>
     </message>
 </context>
 <context>
@@ -4191,20 +4541,9 @@ For more information on using this console, type %6.
 </context>
 <context>
     <name>TransactionDesc</name>
-    <message numerus="yes">
-        <source>Open for %n more block(s)</source>
-        <translation><numerusform>到下%n个区块产生前可修改</numerusform></translation>
-    </message>
-    <message>
-        <source>Open until %1</source>
-        <translation>至 %1 个区块时开启</translation>
-    </message>
-    <message>
-        <source>conflicted</source>
-        <translation>发现冲突</translation>
-    </message>
     <message>
         <source>0/unconfirmed, %1</source>
+        <extracomment>Text explaining the current status of a transaction, shown in the status field of the details window for this transaction. This status represents an unconfirmed transaction that is in the memory pool.</extracomment>
         <translation>0/未确认，%1</translation>
     </message>
     <message>
@@ -4217,22 +4556,32 @@ For more information on using this console, type %6.
     </message>
     <message>
         <source>abandoned</source>
+        <extracomment>Text explaining the current status of a transaction, shown in the status field of the details window for this transaction. This status represents an abandoned transaction.</extracomment>
         <translation>已丢弃</translation>
     </message>
+    <message>
+        <source>conflicted with a transaction with %1 confirmations</source>
+        <extracomment>Text explaining the current status of a transaction, shown in the status field of the details window for this transaction. This status represents an unconfirmed transaction that conflicts with a confirmed transaction.</extracomment>
+        <translation>与有 %1 次确认的交易冲突</translation>
+    </message>
     <message>
         <source>%1/unconfirmed</source>
+        <extracomment>Text explaining the current status of a transaction, shown in the status field of the details window for this transaction. This status represents a transaction confirmed in at least one block, but less than 6 blocks, and still not locked via ChainLocks.</extracomment>
         <translation>%1/未确认</translation>
     </message>
     <message>
         <source>%1 confirmations</source>
+        <extracomment>Text explaining the current status of a transaction, shown in the status field of the details window for this transaction. This status represents a transaction confirmed in 6 or more blocks or locked via ChainLocks.</extracomment>
         <translation>确认%1次</translation>
     </message>
     <message>
         <source>locked via ChainLocks</source>
+        <extracomment>Text explaining the current status of a transaction, shown in the status field of the details window for this transaction. This status represents a transaction confirmed in at least one block and has been locked by ChainLocks.</extracomment>
         <translation>经链锁锁定</translation>
     </message>
     <message>
         <source>verified via InstantSend</source>
+        <extracomment>Text explaining the current status of a transaction, shown in the status field of the details window for this transaction. This status represents an unconfirmed transaction that has been locked by InstantSend.</extracomment>
         <translation>经即时支付验证</translation>
     </message>
     <message>
@@ -4385,14 +4734,6 @@ For more information on using this console, type %6.
         <source>Address / Label</source>
         <translation>地址/标签</translation>
     </message>
-    <message numerus="yes">
-        <source>Open for %n more block(s)</source>
-        <translation><numerusform>到下%n个区块产生前可修改</numerusform></translation>
-    </message>
-    <message>
-        <source>Open until %1</source>
-        <translation>至 %1 个区块时开启</translation>
-    </message>
     <message>
         <source>Unconfirmed</source>
         <translation>未确认的 </translation>
@@ -4644,6 +4985,11 @@ For more information on using this console, type %6.
         <source>Show address &amp;QR code</source>
         <translation>显示地址 &amp;二维码</translation>
     </message>
+    <message>
+        <source>Show in %1</source>
+        <extracomment>Transactions table context menu action to show the selected transaction in a third-party block explorer. %1 is a stand-in argument for the URL of the explorer.</extracomment>
+        <translation>在 %1 中显示</translation>
+    </message>
     <message>
         <source>Export Transaction History</source>
         <translation>导出交易历史</translation>
@@ -4836,10 +5182,6 @@ Go to File &gt; Open Wallet to load a wallet.
 </context>
 <context>
     <name>dash-core</name>
-    <message>
-        <source>Fee estimation failed. Fallbackfee is disabled. Wait a few blocks or enable -fallbackfee.</source>
-        <translation>费用估算失败. 备用费用已禁用. 请等待几个区块或启用-fallbackfee。</translation>
-    </message>
     <message>
         <source>This error could occur if this wallet was not shutdown cleanly and was last loaded using a build with a newer version of Berkeley DB. If so, please use the software that last loaded this wallet</source>
         <translation>如果此前包未完全关闭并且上次使用较新版本的Berkeley DB的构建加载, 则可能发生此错误. 如果是这样, 请使用上次加载此钱包的软件.</translation>
@@ -4912,10 +5254,6 @@ Go to File &gt; Open Wallet to load a wallet.
         <source>Failed to listen on any port. Use -listen=0 if you want this.</source>
         <translation>监听端口失败。如果想使用此项，可设定-listen=0。</translation>
     </message>
-    <message>
-        <source>-maxtxfee is set very high! Fees this large could be paid on a single transaction.</source>
-        <translation>-maxtxfee 设定了很高的金额！这是您一次交易就有可能付出的手续费。</translation>
-    </message>
     <message>
         <source>Found unconfirmed denominated outputs, will wait till they confirm to continue.</source>
         <translation>未确认的面额化输出，将等待他们确认后继续。</translation>
@@ -4924,10 +5262,6 @@ Go to File &gt; Open Wallet to load a wallet.
         <source>Invalid -socketevents ('%s') specified. Only these modes are supported: %s</source>
         <translation>指定的 -socketevents ('%s') 无效. 仅支持以下模式: %s</translation>
     </message>
-    <message>
-        <source>Invalid amount for -maxtxfee=&lt;amount&gt;: '%s' (must be at least the minrelay fee of %s to prevent stuck transactions)</source>
-        <translation>设定 -maxtxfee=&lt;金额&gt;  的金额无效&lt;amount&gt;：'%s' (必须大于等于最低中继手续费%s 以避免交易无法被确认)</translation>
-    </message>
     <message>
         <source>SQLiteDatabase: Unknown sqlite wallet schema version %d. Only version %d is supported</source>
         <translation>SQLite数据库: 未知的sqlite钱包架构版本 %d. 仅支持 %d 版本</translation>
@@ -4936,6 +5270,10 @@ Go to File &gt; Open Wallet to load a wallet.
         <source>Transaction index can't be disabled with governance validation enabled. Either start with -disablegovernance command line switch or enable transaction index.</source>
         <translation>管理验证启动后不能禁用交易索引. 可以使用-disablegovernance命令行选项进行关闭, 或者启用交易索引.</translation>
     </message>
+    <message>
+        <source>Unsupported category-specific logging level -loglevel=%s. Expected -loglevel=&lt;category&gt;:&lt;loglevel&gt;. Valid categories: %s. Valid loglevels: %s.</source>
+        <translation>未支撑的类别记录级别 -loglevel=%s. Expected -loglevel=&lt;category&gt;:&lt;loglevel&gt;. 有效的 类别: %s. 有效的记录级别: %s.</translation>
+    </message>
     <message>
         <source>Can't mix: no compatible inputs found!</source>
         <translation>无法混合：没有找到兼容的输入！</translation>
@@ -4944,6 +5282,14 @@ Go to File &gt; Open Wallet to load a wallet.
         <source>Entry exceeds maximum size.</source>
         <translation>条目超过最大值。</translation>
     </message>
+    <message>
+        <source>Error upgrading evo database for EHF</source>
+        <translation>升级EHF的 evo 数据库时出错</translation>
+    </message>
+    <message>
+        <source>Failed to commit Evo database</source>
+        <translation>无法提交资料到 Evo 数据库</translation>
+    </message>
     <message>
         <source>Found enough users, signing ( waiting %s )</source>
         <translation>用户数已满足，开始签名 (等待 %s)</translation>
@@ -4968,18 +5314,14 @@ Go to File &gt; Open Wallet to load a wallet.
         <source>Insufficient funds.</source>
         <translation>余额不足。</translation>
     </message>
-    <message>
-        <source>Invalid amount for -discardfee=&lt;amount&gt;: '%s'</source>
-        <translation>设定 -discardfee=&lt;金额&gt; 的金额无效：'%s'</translation>
-    </message>
-    <message>
-        <source>Invalid amount for -paytxfee=&lt;amount&gt;: '%s' (must be at least %s)</source>
-        <translation>设定 -paytxfee=&lt;金额&gt;  的金额无效：'%s' (至少要有%s)</translation>
-    </message>
     <message>
         <source>Invalid minimum number of spork signers specified with -minsporkkeys</source>
         <translation>无效的最少数叉勺签名人以  -minsporkkeys 标识</translation>
     </message>
+    <message>
+        <source>Listening for incoming connections failed (listen returned error %s)</source>
+        <translation>监听外来连接失败（侦听返回错误%s）</translation>
+    </message>
     <message>
         <source>Lock is already in place.</source>
         <translation>已锁定。</translation>
@@ -5036,6 +5378,10 @@ Go to File &gt; Open Wallet to load a wallet.
         <source>Synchronizing governance objects…</source>
         <translation>正在同步治理对象…</translation>
     </message>
+    <message>
+        <source>Transaction change output index out of range</source>
+        <translation>交易变更输出索引超出范围</translation>
+    </message>
     <message>
         <source>Unable to start HTTP server. See debug log for details.</source>
         <translation>无法启动HTTP服务，查看日志获取更多信息。</translation>
@@ -5044,6 +5390,10 @@ Go to File &gt; Open Wallet to load a wallet.
         <source>Unknown response.</source>
         <translation>未知响应。</translation>
     </message>
+    <message>
+        <source>Unsupported global logging level -loglevel=%s. Valid values: %s.</source>
+        <translation>不支持的全局记录级别 -loglevel=%s. 有效值: %s.</translation>
+    </message>
     <message>
         <source>User Agent comment (%s) contains unsafe characters.</source>
         <translation>用户代理评论(%s)包含不安全的字符。</translation>
@@ -5108,10 +5458,6 @@ Go to File &gt; Open Wallet to load a wallet.
         <source>Total length of network version string (%i) exceeds maximum length (%i). Reduce the number or size of uacomments.</source>
         <translation>网络版本字符串的总长度 (%i) 超过最大长度 (%i) 了。请减少 uacomment 参数的数量或大小。</translation>
     </message>
-    <message>
-        <source>Transaction needs a change address, but we can't generate it. Please call keypoolrefill first.</source>
-        <translation>交易需要一个零钱地址, 但我们无法生成它. 请先联系 keypoolrefill.</translation>
-    </message>
     <message>
         <source>WARNING! Failed to replenish keypool, please unlock your wallet to do so.</source>
         <translation>警告！无法补充公钥池，请解锁您的钱包。</translation>
@@ -5188,10 +5534,6 @@ Go to File &gt; Open Wallet to load a wallet.
         <source>Error: No addresses available.</source>
         <translation>错误: 没有可用地址.</translation>
     </message>
-    <message>
-        <source>Exceeded max tries.</source>
-        <translation>超过最大尝试次数.</translation>
-    </message>
     <message>
         <source>Failed to create backup %s!</source>
         <translation>无法创建备份%s！</translation>
@@ -5232,10 +5574,6 @@ Go to File &gt; Open Wallet to load a wallet.
         <source>Invalid P2P permission: '%s'</source>
         <translation>无效的 P2P 权限: '%s'</translation>
     </message>
-    <message>
-        <source>Invalid amount for -fallbackfee=&lt;amount&gt;: '%s'</source>
-        <translation>设定-fallbackfee=&lt;amount&gt;的金额无效：'%s'</translation>
-    </message>
     <message>
         <source>Invalid masternodeblsprivkey. Please see documentation.</source>
         <translation>无效的 masternodeblsprivkey。请阅读文档。</translation>
@@ -5372,10 +5710,6 @@ Go to File &gt; Open Wallet to load a wallet.
         <source>Unable to open %s for writing</source>
         <translation>无法打开 %s 来写入</translation>
     </message>
-    <message>
-        <source>Unable to parse -maxuploadtarget: '%s' (possible integer overflow?)</source>
-        <translation>无法解析 -maxuploadtarget: '%s' (可能整数溢出?)</translation>
-    </message>
     <message>
         <source>Unknown -blockfilterindex value %s.</source>
         <translation>未知 -blockfilterindex 值 %s.</translation>
@@ -5384,10 +5718,6 @@ Go to File &gt; Open Wallet to load a wallet.
         <source>Unknown new rules activated (versionbit %i)</source>
         <translation>未知的新规则被激活(versionbit %i)</translation>
     </message>
-    <message>
-        <source>Upgrading UTXO database</source>
-        <translation>升级UTXO数据库</translation>
-    </message>
     <message>
         <source>Verifying blocks…</source>
         <translation>验证区块中…</translation>
@@ -5448,10 +5778,6 @@ Go to File &gt; Open Wallet to load a wallet.
         <source>Cannot obtain a lock on data directory %s. %s is probably already running.</source>
         <translation>无法锁定数据目录 %s。%s 可能已经在运行。</translation>
     </message>
-    <message>
-        <source>Cannot upgrade a non HD wallet from version %i to version %i which is non-HD wallet. Use upgradetohd RPC</source>
-        <translation>无法将非 HD 钱包从版本 %i 升级到版本 %i, 后者非 HD 钱包. 请使用 upgradetohd RPC</translation>
-    </message>
     <message>
         <source>Distributed under the MIT software license, see the accompanying file %s or %s</source>
         <translation>在MIT协议下分发，参见附带的 %s 文件或 %s</translation>
@@ -5484,6 +5810,10 @@ Go to File &gt; Open Wallet to load a wallet.
         <source>Failed to rename invalid peers.dat file. Please move or delete it and try again.</source>
         <translation>无法重命名无效的 peers.dat 文件. 请移动或删除它后再尝试.</translation>
     </message>
+    <message>
+        <source>Fee estimation failed. Fallbackfee is disabled. Wait a few blocks or enable %s.</source>
+        <translation>手续费估算失败。备用费用已禁用。请等待几个区块或启用 %s。</translation>
+    </message>
     <message>
         <source>File %s already exists. If you are sure this is what you want, move it out of the way first.</source>
         <translation>文件 %s 已经存在. 如果您确定这是您想要, 请先将其移走.</translation>
@@ -5496,6 +5826,10 @@ Go to File &gt; Open Wallet to load a wallet.
         <source>Incorrect or no devnet genesis block found. Wrong datadir for devnet specified?</source>
         <translation>devnet的创世区块错误或未找到. devnet的数据目录错误?</translation>
     </message>
+    <message>
+        <source>Invalid amount for %s=&lt;amount&gt;: '%s' (must be at least the minrelay fee of %s to prevent stuck transactions)</source>
+        <translation>%s=&lt;amount&gt; 的金额无效：'%s'（必须至少为最小中继费用 %s 以防止交易卡住）</translation>
+    </message>
     <message>
         <source>Invalid or corrupt peers.dat (%s). If you believe this is a bug, please report it to %s. As a workaround, you can move the file (%s) out of the way (rename, move, or delete) to have a new one created on the next start.</source>
         <translation>无效或损坏的 peers.dat 文件 (%s). 如果您认为这是一个 bug, 请报告给 %s. 作为替代方法, 您可以将文件 (%s) 移走(重命名、移动或删除), 以便在下次启动时创建一个新的文件.</translation>
@@ -5512,6 +5846,10 @@ Go to File &gt; Open Wallet to load a wallet.
         <source>No wallet file format provided. To use createfromdump, -format=&lt;format&gt; must be provided.</source>
         <translation>没有提供钱包文件格式. 要使用 createfromdump, 必须提供 -format=&lt;format&gt;.</translation>
     </message>
+    <message>
+        <source>Outbound connections restricted to CJDNS (-onlynet=cjdns) but -cjdnsreachable is not provided</source>
+        <translation>出站连接限制为 CJDNS (-onlynet=cjdns)，但未提供 -cjdnsreachable</translation>
+    </message>
     <message>
         <source>Outbound connections restricted to Tor (-onlynet=onion) but the proxy for reaching the Tor network is explicitly forbidden: -onion=0</source>
         <translation>出站连接限制为 Tor 网络 (-onlynet=onion), 但用于访问 Tor 网络的代理被明确禁用: -onion=0.</translation>
@@ -5520,6 +5858,10 @@ Go to File &gt; Open Wallet to load a wallet.
         <source>Outbound connections restricted to Tor (-onlynet=onion) but the proxy for reaching the Tor network is not provided: none of -proxy, -onion or -listenonion is given</source>
         <translation>出站连接限制为 Tor 网络 (-onlynet=onion), 但未提供访问 Tor 网络的代理: 没有指定 -proxy, -onion 或 -listenonion 参数</translation>
     </message>
+    <message>
+        <source>Outbound connections restricted to i2p (-onlynet=i2p) but -i2psam is not provided</source>
+        <translation>出站连接限制为 i2p (-onlynet=i2p)，但未提供 -i2psam</translation>
+    </message>
     <message>
         <source>Please check that your computer's date and time are correct! If your clock is wrong, %s will not work properly.</source>
         <translation>请检查电脑的日期时间设置是否正确！时间错误可能会导致 %s 运行异常。</translation>
@@ -5532,10 +5874,6 @@ Go to File &gt; Open Wallet to load a wallet.
         <source>Prune mode is incompatible with -reindex-chainstate. Use full -reindex instead.</source>
         <translation>修剪模式与 -reindex-chainstate 不兼容. 使用完整的 -reindex.</translation>
     </message>
-    <message>
-        <source>The block index db contains a legacy 'txindex'. To clear the occupied disk space, run a full -reindex, otherwise ignore this error. This error message will not be displayed again.</source>
-        <translation>区块索引数据库包含一个遗留的 'txindex'. 要清理占用的磁盘空间, 请执行完整的 -reindex, 否则忽略此错误. 此错误信息将不会再显示.</translation>
-    </message>
     <message>
         <source>This is the maximum transaction fee you pay (in addition to the normal fee) to prioritize partial spend avoidance over regular coin selection.</source>
         <translation>这是您能支付的最大交易手续费(除正常费用外), 用于避开部分交易优先处理, 而非常规的选择.</translation>
@@ -5548,6 +5886,10 @@ Go to File &gt; Open Wallet to load a wallet.
         <source>This is the transaction fee you may pay when fee estimates are not available.</source>
         <translation>这是在费用估计不可用时您可能会支付的交易费。</translation>
     </message>
+    <message>
+        <source>Transaction requires one destination of non-0 value, a non-0 feerate, or a pre-selected input</source>
+        <translation>交易需要一个非零值的目标地址、非零的费率或预先选定的输入</translation>
+    </message>
     <message>
         <source>Unable to replay blocks. You will need to rebuild the database using -reindex-chainstate.</source>
         <translation>无法重播区块. 您需要使用 -reindex-chainstate命令来重建数据库.</translation>
@@ -5556,6 +5898,10 @@ Go to File &gt; Open Wallet to load a wallet.
         <source>Unknown wallet file format "%s" provided. Please provide one of "bdb" or "sqlite".</source>
         <translation>提供了未知的钱包文件格式 "%s". 请提供  "bdb" 或 "sqlite"中的一个.</translation>
     </message>
+    <message>
+        <source>Unsupported chainstate database format found. Please restart with -reindex-chainstate. This will rebuild the chainstate database.</source>
+        <translation>发现不支持的链状态数据库格式。请使用 -reindex-chainstate 重启。这将重建链状态数据库。</translation>
+    </message>
     <message>
         <source>Warning: Dumpfile wallet format "%s" does not match command line specified format "%s".</source>
         <translation>警告: 转储文件钱包格式 "%s" 与命令行指定的格式 "%s" 不匹配.</translation>
@@ -5596,10 +5942,30 @@ Go to File &gt; Open Wallet to load a wallet.
         <source>-rpcport must be specified when -devnet and -server are specified</source>
         <translation>当 -devnet 和 -server 被指定时, 必须指定 -rpcport</translation>
     </message>
+    <message>
+        <source>-statsbatchsize cannot be configured with a negative value.</source>
+        <translation>-statsbatchsize 不能配置为负值。</translation>
+    </message>
+    <message>
+        <source>-statsduration cannot be configured with a negative value.</source>
+        <translation>-statsduration 不能配置为负值。</translation>
+    </message>
     <message>
         <source>A fatal internal error occurred, see debug.log for details</source>
         <translation>发生了严重的内部错误, 请参阅debug.log了解详细信息</translation>
     </message>
+    <message>
+        <source>Cannot create socket (socket() returned error %s)</source>
+        <translation>无法创建套接字（socket() 返回错误 %s）</translation>
+    </message>
+    <message>
+        <source>Cannot get socket address for %s</source>
+        <translation>无法获取 %s 的套接字地址</translation>
+    </message>
+    <message>
+        <source>Cannot init Statsd client</source>
+        <translation>无法初始化 Statsd 客户端</translation>
+    </message>
     <message>
         <source>Cannot resolve -%s address: '%s'</source>
         <translation>无法解析 - %s 地址： '%s'</translation>
@@ -5644,10 +6010,6 @@ Go to File &gt; Open Wallet to load a wallet.
         <source>Error reading next record from wallet database</source>
         <translation>从钱包数据库读取下个记录失败</translation>
     </message>
-    <message>
-        <source>Error upgrading chainstate database</source>
-        <translation>升级链状态数据库出错</translation>
-    </message>
     <message>
         <source>Loading P2P addresses…</source>
         <translation>正在加载P2P地址…</translation>
@@ -5768,10 +6130,70 @@ Go to File &gt; Open Wallet to load a wallet.
         <source>%s corrupt. Try using the wallet tool dash-wallet to salvage or restoring a backup.</source>
         <translation>%s 已损坏. 请尝试使用钱包工具 dash-wallet 来挽救或恢复备份.</translation>
     </message>
+    <message>
+        <source>%s is set very high! Fees this large could be paid on a single transaction.</source>
+        <translation>%s 设置得非常高！如此高的费用可能会在单笔交易中支付。</translation>
+    </message>
+    <message>
+        <source>%s request to listen on port %u. This port is considered "bad" and thus it is unlikely that any Dash Core peers connect to it. See doc/p2p-bad-ports.md for details and a full list.</source>
+        <translation>%s 请求在端口上监听 %u. 该端口被认为是"不良"，因此任何达世币核心程序的对等用户不太可能连接它。有关详细信息和完整列表，请参见 doc/p2p-bad-ports.md.</translation>
+    </message>
+    <message>
+        <source>Cannot provide specific connections and have addrman find outgoing connections at the same time.</source>
+        <translation>无法提供特定的连接，并让Addrman同时查找传出连接。</translation>
+    </message>
+    <message>
+        <source>Failed to upgrade Evo database</source>
+        <translation>升级 Evo 数据库失败</translation>
+    </message>
+    <message>
+        <source>Fee needed &gt; fee paid</source>
+        <translation>所需费用 &gt; 已付费用</translation>
+    </message>
+    <message>
+        <source>Host %s on unsupported network</source>
+        <translation>主机 %s 在不支持的网络上</translation>
+    </message>
+    <message>
+        <source>Invalid amount for %s=&lt;amount&gt;: '%s' (must be at least %s)</source>
+        <translation>%s=&lt;amount&gt; 的金额无效：'%s'（必须至少为 %s）</translation>
+    </message>
+    <message>
+        <source>Invalid amount for %s=&lt;amount&gt;: '%s'</source>
+        <translation>%s=&lt;amount&gt; 的金额无效：'%s'</translation>
+    </message>
+    <message>
+        <source>Invalid port specified in %s: '%s'</source>
+        <translation>在 %s 中指定的端口无效：'%s'</translation>
+    </message>
     <message>
         <source>Last successful action was too recent.</source>
         <translation>上一次成功操作才完成。</translation>
     </message>
+    <message>
+        <source>Missing solving data for estimating transaction size</source>
+        <translation>缺少用于估算交易大小的解决数据</translation>
+    </message>
+    <message>
+        <source>No host specified</source>
+        <translation>未指定主机</translation>
+    </message>
+    <message>
+        <source>No host specified, malformed URL</source>
+        <translation>未指定主机，格式错误的 URL</translation>
+    </message>
+    <message>
+        <source>No text before the scheme delimiter, malformed URL</source>
+        <translation>方案分隔符之前没有文本，格式错误的 URL</translation>
+    </message>
+    <message>
+        <source>Port must be between %d and %d, supplied %d</source>
+        <translation>端口必须在 %d 和 %d 之间，提供的是 %d</translation>
+    </message>
+    <message>
+        <source>Socket not initialized, cannot send message</source>
+        <translation>套接字未初始化，无法发送消息</translation>
+    </message>
     <message>
         <source>The source code is available from %s.</source>
         <translation>源代码可以在 %s 获得。</translation>
@@ -5800,6 +6222,10 @@ Go to File &gt; Open Wallet to load a wallet.
         <source>Transaction fees are too high.</source>
         <translation>交易费用过高。</translation>
     </message>
+    <message>
+        <source>Transaction needs a change address, but we can't generate it.</source>
+        <translation>交易需要找零地址，但我们无法生成它。</translation>
+    </message>
     <message>
         <source>Transaction not valid.</source>
         <translation>交易无效。</translation>
@@ -5820,6 +6246,18 @@ Go to File &gt; Open Wallet to load a wallet.
         <source>Unable to locate enough non-denominated funds for this transaction.</source>
         <translation>无法找到足够的未面额化资金来完成本次交易.</translation>
     </message>
+    <message>
+        <source>Unable to lookup host %s</source>
+        <translation>无法查找主机 %s</translation>
+    </message>
+    <message>
+        <source>Unable to parse -maxuploadtarget: '%s'</source>
+        <translation>无法解析 -maxuploadtarget：'%s'</translation>
+    </message>
+    <message>
+        <source>Unable to send message to %s (::sendto() returned error %s)</source>
+        <translation>无法向 %s 发送消息（::sendto() 返回错误 %s）</translation>
+    </message>
     <message>
         <source>Unable to sign spork message, wrong key?</source>
         <translation>无法签署交叉信息，错误的密钥？</translation>
@@ -5832,6 +6270,10 @@ Go to File &gt; Open Wallet to load a wallet.
         <source>Unknown state: id = %u</source>
         <translation>未知状态：id = %u</translation>
     </message>
+    <message>
+        <source>Unsupported URL scheme, must begin with udp://</source>
+        <translation>不支持的 URL 方案，必须以 udp:// 开头</translation>
+    </message>
     <message>
         <source>Unsupported logging category %s=%s.</source>
         <translation>不支持的日志记录类别 %s=%s.</translation>

From 7b5e6ee53110f2e6b06913aa7cd47b3cdd77e820 Mon Sep 17 00:00:00 2001
From: UdjinM6 <UdjinM6@users.noreply.github.com>
Date: Fri, 24 Oct 2025 22:23:05 +0300
Subject: [PATCH 331/656] zh_TW

---
 src/qt/locale/dash_zh_TW.ts | 818 +++++++++++++++++++++++++++---------
 1 file changed, 630 insertions(+), 188 deletions(-)

diff --git a/src/qt/locale/dash_zh_TW.ts b/src/qt/locale/dash_zh_TW.ts
index 324b39a67aac..644c48f573e7 100644
--- a/src/qt/locale/dash_zh_TW.ts
+++ b/src/qt/locale/dash_zh_TW.ts
@@ -65,14 +65,6 @@
         <source>C&amp;hoose</source>
         <translation>選取(&amp;C)</translation>
     </message>
-    <message>
-        <source>Sending addresses</source>
-        <translation>付款位址</translation>
-    </message>
-    <message>
-        <source>Receiving addresses</source>
-        <translation>收款位址</translation>
-    </message>
     <message>
         <source>These are your Dash addresses for sending payments. Always check the amount and the receiving address before sending coins.</source>
         <translation>這些是你要付款過去的達世幣位址。在付錢之前，務必要檢查金額和收款位址是否正確。</translation>
@@ -115,6 +107,14 @@
         <extracomment>An error message. %1 is a stand-in argument for the name of the file we attempted to save to.</extracomment>
         <translation>嘗試將位址清單儲存到 %1 時出錯，請重試。</translation>
     </message>
+    <message>
+        <source>Sending addresses - %1</source>
+        <translation>發送地址 - %1</translation>
+    </message>
+    <message>
+        <source>Receiving addresses - %1</source>
+        <translation>接收地址 - %1</translation>
+    </message>
     <message>
         <source>Exporting Failed</source>
         <translation>匯出失敗</translation>
@@ -284,10 +284,22 @@
         <source>The passphrase entered for the wallet decryption was incorrect.</source>
         <translation>輸入要用來解密錢包的密碼不對。</translation>
     </message>
+    <message>
+        <source>The passphrase entered for the wallet decryption is incorrect. It contains a null character (ie - a zero byte). If the passphrase was set with a version of this software prior to 23.0, please try again with only the characters up to — but not including — the first null character. If this is successful, please set a new passphrase to avoid this issue in the future.</source>
+        <translation>輸入用於錢包解密的密碼不正確。其中包含空字元（即零位元組）。如果密碼是使用 23.0 之前版本的軟體設定的，請僅使用第一個空字元之前（但不包括）的字元重試。如果成功，請設定新密碼以避免將來出現此問題。</translation>
+    </message>
     <message>
         <source>Wallet passphrase was successfully changed.</source>
         <translation>成功更改錢包的密碼。</translation>
     </message>
+    <message>
+        <source>Passphrase change failed</source>
+        <translation>密碼變更失敗</translation>
+    </message>
+    <message>
+        <source>The old passphrase entered for the wallet decryption is incorrect. It contains a null character (ie - a zero byte). If the passphrase was set with a version of this software prior to 23.0, please try again with only the characters up to — but not including — the first null character.</source>
+        <translation>輸入用於錢包解密的舊密碼不正確。其中包含空字元（即零位元組）。如果密碼是使用 23.0 之前版本的軟體設定的，請僅使用第一個空字元之前（但不包括）的字元重試。</translation>
+    </message>
     <message>
         <source>Warning: The Caps Lock key is on!</source>
         <translation>警告: 大寫字母鎖定作用中！</translation>
@@ -392,10 +404,6 @@
         <source>&amp;Load PSBT from file…</source>
         <translation>&amp;從檔案載入 PSBT…</translation>
     </message>
-    <message>
-        <source>Load PSBT from clipboard…</source>
-        <translation>從剪貼簿載入 PSBT...</translation>
-    </message>
     <message>
         <source>&amp;Sending addresses</source>
         <translation>發送位址(&amp;S)</translation>
@@ -428,10 +436,6 @@
         <source>&amp;Window</source>
         <translation>視窗(&amp;W)</translation>
     </message>
-    <message>
-        <source>Minimize</source>
-        <translation>最小化</translation>
-    </message>
     <message>
         <source>Zoom</source>
         <translation>放大</translation>
@@ -484,14 +488,6 @@
         <source>Modify configuration options for %1</source>
         <translation>修改 %1 的設定選項</translation>
     </message>
-    <message>
-        <source>&amp;Show / Hide</source>
-        <translation>顯示或隱藏(&amp;S)</translation>
-    </message>
-    <message>
-        <source>Show or hide the main Window</source>
-        <translation>顯示或隱藏主視窗</translation>
-    </message>
     <message>
         <source>Encrypt the private keys that belong to your wallet</source>
         <translation>把錢包中的密鑰加密</translation>
@@ -556,10 +552,6 @@
         <source>Show wallet repair options</source>
         <translation>顯示修復錢包選項</translation>
     </message>
-    <message>
-        <source>Open Wallet &amp;Configuration File</source>
-        <translation>開啟錢包配置文件(&amp;C)</translation>
-    </message>
     <message>
         <source>Open configuration file</source>
         <translation>開啟配置文件</translation>
@@ -614,10 +606,18 @@
         <source>Show information about %1</source>
         <translation>顯示有關%1 的相關信息</translation>
     </message>
+    <message>
+        <source>Load PSBT from &amp;clipboard…</source>
+        <translation>從剪貼簿載入 PSBT…</translation>
+    </message>
     <message>
         <source>Open debugging and diagnostic console</source>
         <translation>開啟偵錯和診斷控制台</translation>
     </message>
+    <message>
+        <source>Open &amp;wallet configuration file</source>
+        <translation>開啟錢包設定檔(&amp;W)</translation>
+    </message>
     <message>
         <source>Open a dash: URI</source>
         <translation>打開達世幣: URI</translation>
@@ -626,6 +626,16 @@
         <source>Create a new wallet</source>
         <translation>創建一個新錢包</translation>
     </message>
+    <message>
+        <source>Restore Wallet…</source>
+        <extracomment>Name of the menu item that restores wallet from a backup file.</extracomment>
+        <translation>還原錢包…</translation>
+    </message>
+    <message>
+        <source>Restore a wallet from a backup file</source>
+        <extracomment>Status tip for Restore Wallet menu item</extracomment>
+        <translation>從備份檔還原錢包</translation>
+    </message>
     <message>
         <source>Close all wallets</source>
         <translation>關閉所有錢包</translation>
@@ -646,10 +656,34 @@
         <source>Mask the values in the Overview tab</source>
         <translation>屏蔽「概覽」標籤中的值</translation>
     </message>
+    <message>
+        <source>Wallet Data</source>
+        <extracomment>Name of the wallet data file format.</extracomment>
+        <translation>錢包資料</translation>
+    </message>
+    <message>
+        <source>Load Wallet Backup</source>
+        <extracomment>The title for Restore Wallet File Windows</extracomment>
+        <translation>載入錢包備份</translation>
+    </message>
+    <message>
+        <source>Restore Wallet</source>
+        <extracomment>Title of pop-up window shown when the user is attempting to restore a wallet.</extracomment>
+        <translation>還原錢包</translation>
+    </message>
+    <message>
+        <source>Wallet Name</source>
+        <extracomment>Label of the input field where the name of the wallet is entered.</extracomment>
+        <translation>錢包名稱</translation>
+    </message>
     <message>
         <source>&amp;Settings</source>
         <translation>設定(&amp;S)</translation>
     </message>
+    <message>
+        <source>&amp;Minimize</source>
+        <translation>最小化(&amp;M)</translation>
+    </message>
     <message>
         <source>&amp;Help</source>
         <translation>說明(&amp;H)</translation>
@@ -666,6 +700,14 @@
         <source>View Governance Proposals</source>
         <translation>查看治理提案</translation>
     </message>
+    <message>
+        <source>&amp;Hide</source>
+        <translation>隱藏(&amp;H)</translation>
+    </message>
+    <message>
+        <source>S&amp;how</source>
+        <translation>顯示(&amp;H)</translation>
+    </message>
     <message numerus="yes">
         <source>%n active connection(s) to Dash network</source>
         <extracomment>A substring of the tooltip.</extracomment>
@@ -687,6 +729,14 @@
         <source>Close Wallet…</source>
         <translation>關閉錢包…</translation>
     </message>
+    <message>
+        <source>Load Partially Signed Blockchain Transaction</source>
+        <translation>讀取部分簽名的區塊鏈交易</translation>
+    </message>
+    <message>
+        <source>Load Partially Signed Blockchain Transaction from clipboard</source>
+        <translation>從剪貼板中讀取部分簽名的區塊鏈交易</translation>
+    </message>
     <message>
         <source>Create Wallet…</source>
         <translation>創建錢包…</translation>
@@ -739,10 +789,6 @@
         <source>Processing blocks on disk…</source>
         <translation>正在處理磁碟裡的區塊資料…</translation>
     </message>
-    <message>
-        <source>Reindexing blocks on disk…</source>
-        <translation>正在為磁碟裡的區塊重建索引…</translation>
-    </message>
     <message>
         <source>Connecting to peers…</source>
         <translation>正在連接其他對等用戶群…</translation>
@@ -896,10 +942,6 @@
         <source>Coin Selection</source>
         <translation>選擇錢幣</translation>
     </message>
-    <message>
-        <source>Dust:</source>
-        <translation>零散錢:</translation>
-    </message>
     <message>
         <source>After Fee:</source>
         <translation>計費後金額:</translation>
@@ -1000,10 +1042,6 @@
         <source>Copy bytes</source>
         <translation>複製位元組數</translation>
     </message>
-    <message>
-        <source>Copy dust</source>
-        <translation>複製零散金額</translation>
-    </message>
     <message>
         <source>Copy change</source>
         <translation>複製找零金額</translation>
@@ -1016,18 +1054,6 @@
         <source>(%1 locked)</source>
         <translation>(%1 鎖定)</translation>
     </message>
-    <message>
-        <source>yes</source>
-        <translation>是</translation>
-    </message>
-    <message>
-        <source>no</source>
-        <translation>否</translation>
-    </message>
-    <message>
-        <source>This label turns red if any recipient receives an amount smaller than the current dust threshold.</source>
-        <translation>如果任何一個收款人收到的金額比當前零散錢的閾值還小的話，這個標籤將變為紅色。</translation>
-    </message>
     <message>
         <source>Can vary +/- %1 duff(s) per input.</source>
         <translation>每組輸入可能有 +/- %1 個 duff(s) 的誤差。</translation>
@@ -1241,18 +1267,102 @@
         <source>Filter proposal list</source>
         <translation>過濾提案列表</translation>
     </message>
+    <message>
+        <source>Masternode Count:</source>
+        <translation>主節點數量：</translation>
+    </message>
+    <message>
+        <source>Number of masternodes this wallet can vote with (masternodes for which this wallet holds the voting key)</source>
+        <translation>此錢包可投票的主節點數量（此錢包持有投票金鑰的主節點）</translation>
+    </message>
     <message>
         <source>Proposal Count:</source>
         <translation>提案數量:</translation>
     </message>
+    <message>
+        <source>Create Proposal</source>
+        <translation>創建提案</translation>
+    </message>
     <message>
         <source>Filter by Title</source>
         <translation>按標題過濾</translation>
     </message>
+    <message>
+        <source>Unavailable</source>
+        <translation>不可用</translation>
+    </message>
+    <message>
+        <source>A synced node and an unlocked wallet are required.</source>
+        <translation>需要已同步的節點和已解鎖的錢包。</translation>
+    </message>
+    <message>
+        <source>Vote Yes</source>
+        <translation>投贊成票</translation>
+    </message>
+    <message>
+        <source>Vote No</source>
+        <translation>投反對票</translation>
+    </message>
+    <message>
+        <source>Vote Abstain</source>
+        <translation>投棄權票</translation>
+    </message>
     <message>
         <source>Proposal Info: %1</source>
         <translation>提案信息: %1</translation>
     </message>
+    <message>
+        <source>Voting Failed</source>
+        <translation>投票失敗</translation>
+    </message>
+    <message>
+        <source>No wallet available.</source>
+        <translation>沒有可用的錢包。</translation>
+    </message>
+    <message>
+        <source>No masternode voting keys found in wallet.</source>
+        <translation>在錢包中未找到主節點投票金鑰。</translation>
+    </message>
+    <message>
+        <source>Please select a proposal to vote on.</source>
+        <translation>請選擇要投票的提案。</translation>
+    </message>
+    <message>
+        <source>Unable to unlock wallet.</source>
+        <translation>無法解鎖錢包。</translation>
+    </message>
+    <message>
+        <source>Unable to get masternode list. Please try again later.</source>
+        <translation>無法取得主節點列表。請稍後重試。</translation>
+    </message>
+    <message>
+        <source>Masternode %1 not found</source>
+        <translation>未找到主節點 %1</translation>
+    </message>
+    <message>
+        <source>Failed to sign vote for masternode %1</source>
+        <translation>為主節點 %1 簽署投票失敗</translation>
+    </message>
+    <message>
+        <source>Masternode %1: %2</source>
+        <translation>主節點 %1：%2</translation>
+    </message>
+    <message numerus="yes">
+        <source>Voted successfully %n time(s)</source>
+        <translation><numerusform>成功投票 %n 次</numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <source>Failed to vote %n time(s)</source>
+        <translation><numerusform>投票失敗 %n 次</numerusform></translation>
+    </message>
+    <message>
+        <source>Errors:</source>
+        <translation>錯誤：</translation>
+    </message>
+    <message>
+        <source>Voting Results</source>
+        <translation>投票結果</translation>
+    </message>
 </context>
 <context>
     <name>HelpMessageDialog</name>
@@ -1323,13 +1433,17 @@
         <source>Use a custom data directory:</source>
         <translation>使用自定的資料目錄:</translation>
     </message>
-    <message>
-        <source>(of %1 GB needed)</source>
-        <translation>(需要額外 %1 GB)</translation>
+    <message numerus="yes">
+        <source>%n GB of space available</source>
+        <translation><numerusform>可用空間 %n GB</numerusform></translation>
     </message>
-    <message>
-        <source>(%1 GB needed for full chain)</source>
-        <translation>(完整區塊鏈需要%1 GB)</translation>
+    <message numerus="yes">
+        <source>(of %n GB needed)</source>
+        <translation><numerusform>（需要 %n GB）</numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <source>(%n GB needed for full chain)</source>
+        <translation><numerusform>（完整區塊鏈需要 %n GB）</numerusform></translation>
     </message>
     <message>
         <source>At least %1 GB of data will be stored in this directory, and it will grow over time.</source>
@@ -1361,6 +1475,13 @@
         <translation>錯誤</translation>
     </message>
 </context>
+<context>
+    <name>LoadWalletsActivity</name>
+    <message>
+        <source>Loading wallets…</source>
+        <translation>正在載入錢包…</translation>
+    </message>
+</context>
 <context>
     <name>MasternodeList</name>
     <message>
@@ -1553,6 +1674,11 @@
         <source>URI:</source>
         <translation>URI:</translation>
     </message>
+    <message>
+        <source>Paste address from clipboard</source>
+        <extracomment>Tooltip text for button that allows you to paste an address that is in your clipboard.</extracomment>
+        <translation>從剪貼簿貼上地址</translation>
+    </message>
 </context>
 <context>
     <name>OpenWalletActivity</name>
@@ -1663,6 +1789,16 @@
         <extracomment>An Options window setting to set subtracting the fee from a sending amount as default.</extracomment>
         <translation>預設把金額減去手續費(&amp;F)</translation>
     </message>
+    <message>
+        <source>Enable &amp;PSBT controls</source>
+        <extracomment>An options window setting to enable PSBT controls.</extracomment>
+        <translation>啟用 PSBT 控制項(&amp;P)</translation>
+    </message>
+    <message>
+        <source>Whether to show PSBT controls.</source>
+        <extracomment>Tooltip text for options window setting that enables PSBT controls.</extracomment>
+        <translation>是否顯示 PSBT 控制項。</translation>
+    </message>
     <message>
         <source>Whether to keep the specified custom change address or not.</source>
         <translation>是否保留指定的自訂找零位址。</translation>
@@ -1806,20 +1942,20 @@ https://explore.transifex.com/dash/dash/</source>
 https://explore.transifex.com/dash/dash/</translation>
     </message>
     <message>
-        <source>Options set in this dialog are overridden by the command line or in the configuration file:</source>
-        <translation>此對話框中設置的選項被命令行或配置文件覆蓋:</translation>
+        <source>Third-party URLs (e.g. a block explorer) that appear in the transactions tab as context menu items.&lt;br/&gt;%s in the URL is replaced by transaction hash. Multiple URLs are separated by vertical bar |.</source>
+        <translation>在交易分頁中以內容選單項目出現的第三方 URL（例如區塊瀏覽器）。&lt;br/&gt;URL 中的 %s 將替換為交易雜湊。多個 URL 用豎線 | 分隔。</translation>
     </message>
     <message>
-        <source>Minimize instead of exit the application when the window is closed. When this option is enabled, the application will be closed only after selecting Exit in the menu.</source>
-        <translation>當視窗關閉時，把應用程式縮到最小，而不是結束。當勾選這個選項時，只能夠用選單中的結束來關掉應用程式。</translation>
+        <source>&amp;Third-party transaction URLs</source>
+        <translation>第三方交易 URL(&amp;T)</translation>
     </message>
     <message>
-        <source>Third party URLs (e.g. a block explorer) that appear in the transactions tab as context menu items.&lt;br/&gt;%s in the URL is replaced by transaction hash. Multiple URLs are separated by vertical bar |.</source>
-        <translation>在交易頁籤的情境選單出現的第三方(比如說區塊探索網站)網址連結。&lt;br/&gt;網址中的 %s 會被取代為交易的雜湊值。可以用直線符號 | 來分隔多個連結。</translation>
+        <source>Options set in this dialog are overridden by the command line or in the configuration file:</source>
+        <translation>此對話框中設置的選項被命令行或配置文件覆蓋:</translation>
     </message>
     <message>
-        <source>&amp;Third party transaction URLs</source>
-        <translation>第三方交易網址(&amp;T)</translation>
+        <source>Minimize instead of exit the application when the window is closed. When this option is enabled, the application will be closed only after selecting Exit in the menu.</source>
+        <translation>當視窗關閉時，把應用程式縮到最小，而不是結束。當勾選這個選項時，只能夠用選單中的結束來關掉應用程式。</translation>
     </message>
     <message>
         <source>Whether to show coin control features or not.</source>
@@ -1963,14 +2099,22 @@ https://explore.transifex.com/dash/dash/</translation>
     </message>
     <message>
         <source>Confirm options reset</source>
+        <extracomment>Window title text of pop-up window shown when the user has chosen to reset options.</extracomment>
         <translation>確認重設選項</translation>
     </message>
     <message>
         <source>Client restart required to activate changes.</source>
+        <extracomment>Text explaining that the settings changed will not come into effect until the client is restarted.</extracomment>
         <translation>需要重新啟動客戶端軟體來讓改變生效。</translation>
     </message>
+    <message>
+        <source>Current settings will be backed up at "%1".</source>
+        <extracomment>Text explaining to the user that the client's current settings will be backed up at a specific location. %1 is a stand-in argument for the backup location's path.</extracomment>
+        <translation>目前設定將備份至「%1」。</translation>
+    </message>
     <message>
         <source>Client will be shut down. Do you want to proceed?</source>
+        <extracomment>Text asking the user to confirm if they would like to proceed with a client shutdown.</extracomment>
         <translation>客戶端軟體將會關閉，確定要繼續嗎?</translation>
     </message>
     <message>
@@ -2243,6 +2387,10 @@ https://explore.transifex.com/dash/dash/</translation>
         <source>Failed to sign transaction: %1</source>
         <translation>未能簽署交易: %1</translation>
     </message>
+    <message>
+        <source>Cannot sign inputs while wallet is locked.</source>
+        <translation>錢包被鎖定時無法簽署輸入。</translation>
+    </message>
     <message>
         <source>Could not sign any more inputs.</source>
         <translation>無法簽署更多輸入。</translation>
@@ -2487,6 +2635,181 @@ Due to discontinued support, you should request the merchant to provide you with
         <translation>狀態</translation>
     </message>
 </context>
+<context>
+    <name>ProposalWizard</name>
+    <message>
+        <source>Create Governance Proposal</source>
+        <translation>創建治理提案</translation>
+    </message>
+    <message>
+        <source>Enter proposal details</source>
+        <translation>輸入提案詳情</translation>
+    </message>
+    <message>
+        <source>A fee will be burned when you prepare the proposal.</source>
+        <translation>準備提案時將銷毀一筆費用。</translation>
+    </message>
+    <message>
+        <source>Proposal &amp;name</source>
+        <translation>提案名稱(&amp;N)</translation>
+    </message>
+    <message>
+        <source>&amp;Description URL</source>
+        <translation>描述 URL(&amp;D)</translation>
+    </message>
+    <message>
+        <source>Payment &amp;address</source>
+        <translation>支付地址(&amp;A)</translation>
+    </message>
+    <message>
+        <source>Payment &amp;amount</source>
+        <translation>支付金額(&amp;A)</translation>
+    </message>
+    <message>
+        <source>The amount to request in a single payment</source>
+        <translation>單次支付中請求的金額</translation>
+    </message>
+    <message>
+        <source>&amp;First payment</source>
+        <translation>首次支付(&amp;F)</translation>
+    </message>
+    <message>
+        <source>Pa&amp;yments</source>
+        <translation>支付次數(&amp;Y)</translation>
+    </message>
+    <message>
+        <source>To&amp;tal amount</source>
+        <translation>總金額(&amp;T)</translation>
+    </message>
+    <message>
+        <source>Proposal &amp;fee</source>
+        <translation>提案費用(&amp;F)</translation>
+    </message>
+    <message>
+        <source>Next</source>
+        <translation>下一步</translation>
+    </message>
+    <message>
+        <source>Review proposal JSON and validate.</source>
+        <translation>檢查提案 JSON 並驗證。</translation>
+    </message>
+    <message>
+        <source>Hex-encoded JSON</source>
+        <translation>十六進位編碼的 JSON</translation>
+    </message>
+    <message>
+        <source>Back</source>
+        <translation>返回</translation>
+    </message>
+    <message>
+        <source>Validate</source>
+        <translation>驗證</translation>
+    </message>
+    <message>
+        <source>Prepare (burn fee) and wait for confirmations.</source>
+        <translation>準備（銷毀費用）並等待確認。</translation>
+    </message>
+    <message>
+        <source>Copy</source>
+        <translation>複製</translation>
+    </message>
+    <message>
+        <source>At 1/6 confirmations: can be relayed and queued. At 6/6: accepted and processed.</source>
+        <translation>1/6 確認時：可以中繼和排隊。6/6 時：接受並處理。</translation>
+    </message>
+    <message>
+        <source>Confirmations progress</source>
+        <translation>確認進度</translation>
+    </message>
+    <message>
+        <source>Shows progress toward the required number of confirmations for the proposal fee transaction.</source>
+        <translation>顯示提案費用交易所需確認數的進度。</translation>
+    </message>
+    <message>
+        <source>Estimated time remaining: -</source>
+        <translation>預計剩餘時間：-</translation>
+    </message>
+    <message>
+        <source>Prepare Proposal</source>
+        <translation>準備提案</translation>
+    </message>
+    <message>
+        <source>You can submit after 1 confirmation. At 6 confirmations it is accepted and processed.</source>
+        <translation>1 次確認後即可提交。6 次確認後將被接受並處理。</translation>
+    </message>
+    <message>
+        <source>Proposal ID:</source>
+        <translation>提案 ID：</translation>
+    </message>
+    <message>
+        <source>Submit Proposal</source>
+        <translation>提交提案</translation>
+    </message>
+    <message>
+        <source>Close</source>
+        <translation>關閉</translation>
+    </message>
+    <message>
+        <source>Valid</source>
+        <translation>有效</translation>
+    </message>
+    <message>
+        <source>Invalid: %1</source>
+        <translation>無效：%1</translation>
+    </message>
+    <message>
+        <source>Burn %1</source>
+        <translation>銷毀 %1</translation>
+    </message>
+    <message>
+        <source>Burn %1 to create the fee transaction?</source>
+        <translation>銷毀 %1 以創建費用交易？</translation>
+    </message>
+    <message>
+        <source>Prepare failed</source>
+        <translation>準備失敗</translation>
+    </message>
+    <message>
+        <source>Confirmations: %1 / %2 required</source>
+        <translation>確認數：%1 / 需要 %2</translation>
+    </message>
+    <message>
+        <source>Estimated time remaining: Ready</source>
+        <translation>預計剩餘時間：就緒</translation>
+    </message>
+    <message numerus="yes">
+        <source>Estimated time remaining: %n minute(s)</source>
+        <translation><numerusform>預計剩餘時間：%n 分鐘</numerusform></translation>
+    </message>
+    <message>
+        <source>Your proposal was submitted successfully.</source>
+        <translation>您的提案已成功提交。</translation>
+    </message>
+    <message>
+        <source>Already submitted</source>
+        <translation>已提交</translation>
+    </message>
+    <message>
+        <source>This proposal has already been submitted.</source>
+        <translation>此提案已經提交。</translation>
+    </message>
+    <message>
+        <source>Submission failed</source>
+        <translation>提交失敗</translation>
+    </message>
+    <message>
+        <source>Proposal submitted</source>
+        <translation>提案已提交</translation>
+    </message>
+    <message>
+        <source>A fee of %1 will be burned when you prepare the proposal.</source>
+        <translation>準備提案時將銷毀 %1 的費用。</translation>
+    </message>
+    <message>
+        <source>Prepare (burn %1) and wait for %2 confirmations.</source>
+        <translation>準備（銷毀 %1）並等待 %2 次確認。</translation>
+    </message>
+</context>
 <context>
     <name>QObject</name>
     <message>
@@ -2876,14 +3199,6 @@ Due to discontinued support, you should request the merchant to provide you with
         <source>Version</source>
         <translation>版本</translation>
     </message>
-    <message>
-        <source>Whether the peer requested us to relay transactions.</source>
-        <translation>對方是否請求我們中繼交易。</translation>
-    </message>
-    <message>
-        <source>Wants Tx Relay</source>
-        <translation>想要交易中繼</translation>
-    </message>
     <message>
         <source>High bandwidth BIP152 compact block relay: %1</source>
         <translation>高頻寬 BIP152 緊湊區塊中繼器: %1</translation>
@@ -2989,6 +3304,14 @@ Due to discontinued support, you should request the merchant to provide you with
         <source>To specify a non-default location of the blocks directory use the '%1' option.</source>
         <translation>要指定區塊目錄的非預設位置，請使用“%1”選項。</translation>
     </message>
+    <message>
+        <source>Local Addresses</source>
+        <translation>本機地址</translation>
+    </message>
+    <message>
+        <source>Network addresses that your Dash node is currently using to communicate with other nodes.</source>
+        <translation>您的 Dash 節點目前用於與其他節點通訊的網路地址。</translation>
+    </message>
     <message>
         <source>Number of regular Masternodes</source>
         <translation>常規主節點數量</translation>
@@ -3081,6 +3404,14 @@ Due to discontinued support, you should request the merchant to provide you with
         <source>Services</source>
         <translation>服務</translation>
     </message>
+    <message>
+        <source>Whether we relay transactions to this peer.</source>
+        <translation>是否向此對等節點中繼交易。</translation>
+    </message>
+    <message>
+        <source>Transaction Relay</source>
+        <translation>交易中繼</translation>
+    </message>
     <message>
         <source>Connection Time</source>
         <translation>連線時間</translation>
@@ -3229,6 +3560,10 @@ Due to discontinued support, you should request the merchant to provide you with
         <source>Network activity disabled</source>
         <translation>被禁用的網絡活動</translation>
     </message>
+    <message>
+        <source>None</source>
+        <translation>無</translation>
+    </message>
     <message>
         <source>Total: %1 (Enabled: %2)</source>
         <translation>總計: %1 (已啟用: %2)</translation>
@@ -3550,6 +3885,34 @@ For more information on using this console, type %6.
         <translation>要求金額</translation>
     </message>
 </context>
+<context>
+    <name>RestoreWalletActivity</name>
+    <message>
+        <source>Restore Wallet</source>
+        <extracomment>Title of progress window which is displayed when wallets are being restored.</extracomment>
+        <translation>還原錢包</translation>
+    </message>
+    <message>
+        <source>Restoring Wallet &lt;b&gt;%1&lt;/b&gt;…</source>
+        <extracomment>Descriptive text of the restore wallets progress window which indicates to the user that wallets are currently being restored.</extracomment>
+        <translation>正在還原錢包 &lt;b&gt;%1&lt;/b&gt;…</translation>
+    </message>
+    <message>
+        <source>Restore wallet failed</source>
+        <extracomment>Title of message box which is displayed when the wallet could not be restored.</extracomment>
+        <translation>還原錢包失敗</translation>
+    </message>
+    <message>
+        <source>Restore wallet warning</source>
+        <extracomment>Title of message box which is displayed when the wallet is restored with some warning.</extracomment>
+        <translation>還原錢包警告</translation>
+    </message>
+    <message>
+        <source>Restore wallet message</source>
+        <extracomment>Title of message box which is displayed when the wallet is successfully restored.</extracomment>
+        <translation>還原錢包訊息</translation>
+    </message>
+</context>
 <context>
     <name>SendCoinsDialog</name>
     <message>
@@ -3584,10 +3947,6 @@ For more information on using this console, type %6.
         <source>Fee:</source>
         <translation>手續費:</translation>
     </message>
-    <message>
-        <source>Dust:</source>
-        <translation>零散錢:</translation>
-    </message>
     <message>
         <source>Inputs…</source>
         <translation>輸入…</translation>
@@ -3712,10 +4071,6 @@ For more information on using this console, type %6.
         <source>Copy bytes</source>
         <translation>複製位元組數</translation>
     </message>
-    <message>
-        <source>Copy dust</source>
-        <translation>複製零散錢</translation>
-    </message>
     <message>
         <source>Copy change</source>
         <translation>複製找零金額</translation>
@@ -3724,10 +4079,6 @@ For more information on using this console, type %6.
         <source>%1 (%2 blocks)</source>
         <translation>%1 (%2 個區塊)</translation>
     </message>
-    <message>
-        <source>This will produce a Partially Signed Transaction (PSBT) which you can save or copy and then sign with e.g. an offline %1 wallet, or a PSBT-compatible hardware wallet.</source>
-        <translation>這將產生一個部分簽名的交易（PSBT），您可以儲存或複製該交易，然後使用例如離線 %1 錢包，或 PSBT 相容的硬體錢包。</translation>
-    </message>
     <message>
         <source>using</source>
         <translation>使用</translation>
@@ -3736,10 +4087,6 @@ For more information on using this console, type %6.
         <source>%1 to %2</source>
         <translation>%1 到 %2</translation>
     </message>
-    <message>
-        <source>Are you sure you want to send?</source>
-        <translation>你確定要付錢出去嗎？</translation>
-    </message>
     <message>
         <source>&lt;b&gt;(%1 of %2 entries displayed)&lt;/b&gt;</source>
         <translation>&lt;b&gt;(在 %2 中 %1 個項目顯示出來)&lt;/b&gt;</translation>
@@ -3764,10 +4111,6 @@ For more information on using this console, type %6.
         <source>%1 to '%2'</source>
         <translation>%1 to '%2'</translation>
     </message>
-    <message>
-        <source>Do you want to draft this transaction?</source>
-        <translation>您想起草這筆交易嗎?</translation>
-    </message>
     <message>
         <source>%1 funds only</source>
         <translation>只限 %1 的資金</translation>
@@ -3816,14 +4159,6 @@ For more information on using this console, type %6.
         <source>Confirm send coins</source>
         <translation>確認發送資金</translation>
     </message>
-    <message>
-        <source>Confirm transaction proposal</source>
-        <translation>確認交易提案</translation>
-    </message>
-    <message>
-        <source>Create Unsigned</source>
-        <translation>建立未簽名的</translation>
-    </message>
     <message>
         <source>Save Transaction Data</source>
         <translation>保存交易數據</translation>
@@ -3837,8 +4172,28 @@ For more information on using this console, type %6.
         <translation>僅供查閱的餘額:</translation>
     </message>
     <message>
-        <source>Send</source>
-        <translation>發送</translation>
+        <source>Creates a Partially Signed Blockchain Transaction (PSBT) for use with e.g. an offline %1 wallet, or a PSBT-compatible hardware wallet.</source>
+        <translation>創建一個部分簽名的區塊鏈交易（PSBT），以與例如離線 %1 錢包或與PSBT兼容的硬件錢包。</translation>
+    </message>
+    <message>
+        <source>Do you want to create this transaction?</source>
+        <extracomment>Message displayed when attempting to create a transaction. Cautionary text to prompt the user to verify that the displayed transaction details represent the transaction the user intends to create.</extracomment>
+        <translation>您想創建這筆交易嗎？</translation>
+    </message>
+    <message>
+        <source>Please, review your transaction proposal. This will produce a Partially Signed Blockchain Transaction (PSBT) which you can save or copy and then sign with e.g. an offline %1 wallet, or a PSBT-compatible hardware wallet.</source>
+        <extracomment>Text to inform a user attempting to create a transaction of their current options. At this stage, a user can only create a PSBT. This string is displayed when private keys are disabled and an external signer is not available.</extracomment>
+        <translation>請檢查您的交易提案。這將生成一個部分簽名區塊鏈交易（PSBT），您可以儲存或複製它，然後使用例如離線 %1 錢包或相容 PSBT 的硬體錢包進行簽名。</translation>
+    </message>
+    <message>
+        <source>Please, review your transaction. You can create and send this transaction or create a Partially Signed Blockchain Transaction (PSBT), which you can save or copy and then sign with, e.g., an offline %1 wallet, or a PSBT-compatible hardware wallet.</source>
+        <extracomment>Text to inform a user attempting to create a transaction of their current options. At this stage, a user can send their transaction or create a PSBT. This string is displayed when both private keys and PSBT controls are enabled.</extracomment>
+        <translation>請檢查您的交易。您可以創建並發送此交易，或創建一個部分簽名區塊鏈交易（PSBT），您可以儲存或複製它，然後使用例如離線 %1 錢包或相容 PSBT 的硬體錢包進行簽名。</translation>
+    </message>
+    <message>
+        <source>Please, review your transaction.</source>
+        <extracomment>Text to prompt a user to review the details of the transaction they are attempting to send.</extracomment>
+        <translation>請檢查您的交易。</translation>
     </message>
     <message>
         <source>To review recipient list click "Show Details…"</source>
@@ -3968,21 +4323,16 @@ For more information on using this console, type %6.
         <source>A message that was attached to the dash: URI which will be stored with the transaction for your reference. Note: This message will not be sent over the Dash network.</source>
         <translation>附加在達世幣付款協議 URI 中的訊息，會和交易內容一起存起來，給你自己做參考。注意: 這個訊息不會送到達世幣網路上。</translation>
     </message>
+</context>
+<context>
+    <name>SendConfirmationDialog</name>
     <message>
-        <source>This is an unauthenticated payment request.</source>
-        <translation>這是一個未認證的付款請求。</translation>
-    </message>
-    <message>
-        <source>This is an authenticated payment request.</source>
-        <translation>這是一個已認證的付款請求。</translation>
-    </message>
-    <message>
-        <source>Pay To:</source>
-        <translation>付給:</translation>
+        <source>Send</source>
+        <translation>發送</translation>
     </message>
     <message>
-        <source>Memo:</source>
-        <translation>備註:</translation>
+        <source>Create Unsigned</source>
+        <translation>創建未簽名交易</translation>
     </message>
 </context>
 <context>
@@ -4191,20 +4541,9 @@ For more information on using this console, type %6.
 </context>
 <context>
     <name>TransactionDesc</name>
-    <message numerus="yes">
-        <source>Open for %n more block(s)</source>
-        <translation><numerusform>到下 %n 個區塊產生前可修改</numerusform></translation>
-    </message>
-    <message>
-        <source>Open until %1</source>
-        <translation>至 %1 個數據塊時開啟</translation>
-    </message>
-    <message>
-        <source>conflicted</source>
-        <translation>發生衝突</translation>
-    </message>
     <message>
         <source>0/unconfirmed, %1</source>
+        <extracomment>Text explaining the current status of a transaction, shown in the status field of the details window for this transaction. This status represents an unconfirmed transaction that is in the memory pool.</extracomment>
         <translation>0 /未確認, %1</translation>
     </message>
     <message>
@@ -4217,22 +4556,32 @@ For more information on using this console, type %6.
     </message>
     <message>
         <source>abandoned</source>
+        <extracomment>Text explaining the current status of a transaction, shown in the status field of the details window for this transaction. This status represents an abandoned transaction.</extracomment>
         <translation>放棄了</translation>
     </message>
+    <message>
+        <source>conflicted with a transaction with %1 confirmations</source>
+        <extracomment>Text explaining the current status of a transaction, shown in the status field of the details window for this transaction. This status represents an unconfirmed transaction that conflicts with a confirmed transaction.</extracomment>
+        <translation>與有 %1 次確認的交易衝突</translation>
+    </message>
     <message>
         <source>%1/unconfirmed</source>
+        <extracomment>Text explaining the current status of a transaction, shown in the status field of the details window for this transaction. This status represents a transaction confirmed in at least one block, but less than 6 blocks, and still not locked via ChainLocks.</extracomment>
         <translation>%1 次/未確認</translation>
     </message>
     <message>
         <source>%1 confirmations</source>
+        <extracomment>Text explaining the current status of a transaction, shown in the status field of the details window for this transaction. This status represents a transaction confirmed in 6 or more blocks or locked via ChainLocks.</extracomment>
         <translation>確認 %1 次</translation>
     </message>
     <message>
         <source>locked via ChainLocks</source>
+        <extracomment>Text explaining the current status of a transaction, shown in the status field of the details window for this transaction. This status represents a transaction confirmed in at least one block and has been locked by ChainLocks.</extracomment>
         <translation>通過 ChainLocks 鎖定的</translation>
     </message>
     <message>
         <source>verified via InstantSend</source>
+        <extracomment>Text explaining the current status of a transaction, shown in the status field of the details window for this transaction. This status represents an unconfirmed transaction that has been locked by InstantSend.</extracomment>
         <translation>經即時到帳系統核實</translation>
     </message>
     <message>
@@ -4385,14 +4734,6 @@ For more information on using this console, type %6.
         <source>Address / Label</source>
         <translation>位址 / 標籤</translation>
     </message>
-    <message numerus="yes">
-        <source>Open for %n more block(s)</source>
-        <translation><numerusform>到下 %n 個區塊產生前可修改</numerusform></translation>
-    </message>
-    <message>
-        <source>Open until %1</source>
-        <translation>至 %1 個數據塊時開啟</translation>
-    </message>
     <message>
         <source>Unconfirmed</source>
         <translation>未確認</translation>
@@ -4644,6 +4985,11 @@ For more information on using this console, type %6.
         <source>Show address &amp;QR code</source>
         <translation>顯示位址和二維碼(&amp;Q)</translation>
     </message>
+    <message>
+        <source>Show in %1</source>
+        <extracomment>Transactions table context menu action to show the selected transaction in a third-party block explorer. %1 is a stand-in argument for the URL of the explorer.</extracomment>
+        <translation>在 %1 中顯示</translation>
+    </message>
     <message>
         <source>Export Transaction History</source>
         <translation>匯出交易記錄</translation>
@@ -4836,10 +5182,6 @@ Go to File &gt; Open Wallet to load a wallet.
 </context>
 <context>
     <name>dash-core</name>
-    <message>
-        <source>Fee estimation failed. Fallbackfee is disabled. Wait a few blocks or enable -fallbackfee.</source>
-        <translation>費用估算失敗。 後備費用已禁用。 請等待幾個區塊或啟用-fallbackfee。</translation>
-    </message>
     <message>
         <source>This error could occur if this wallet was not shutdown cleanly and was last loaded using a build with a newer version of Berkeley DB. If so, please use the software that last loaded this wallet</source>
         <translation>如果此錢包未完全關閉並且上次使用具有較新版本的 Berkeley DB 的構建加載，則可能會發生此錯誤。 如果是這樣，請使用上次加載此錢包的軟件</translation>
@@ -4912,10 +5254,6 @@ Go to File &gt; Open Wallet to load a wallet.
         <source>Failed to listen on any port. Use -listen=0 if you want this.</source>
         <translation>在任意的通訊埠聽候失敗。如果你希望這樣的話，可以設定 -listen=0.</translation>
     </message>
-    <message>
-        <source>-maxtxfee is set very high! Fees this large could be paid on a single transaction.</source>
-        <translation>-maxtxfee設置得非常高! 這樣多的費用將在一筆交易中支付。</translation>
-    </message>
     <message>
         <source>Found unconfirmed denominated outputs, will wait till they confirm to continue.</source>
         <translation>找到未確認的己除名資金輸出，將等待，直到它們確認再繼續。</translation>
@@ -4924,10 +5262,6 @@ Go to File &gt; Open Wallet to load a wallet.
         <source>Invalid -socketevents ('%s') specified. Only these modes are supported: %s</source>
         <translation>指定的 -socketevents ('%s') 無效。僅支持以下模式: %s</translation>
     </message>
-    <message>
-        <source>Invalid amount for -maxtxfee=&lt;amount&gt;: '%s' (must be at least the minrelay fee of %s to prevent stuck transactions)</source>
-        <translation>-maxtxfee=&lt;amount&gt;: '%s' 的金額無效 (必須大於最低轉發手續費 %s 以避免交易無法確認)</translation>
-    </message>
     <message>
         <source>SQLiteDatabase: Unknown sqlite wallet schema version %d. Only version %d is supported</source>
         <translation>SQLiteDatabase：未知的 sqlite 錢包架構版本 %d。僅支援版本 %d</translation>
@@ -4936,6 +5270,10 @@ Go to File &gt; Open Wallet to load a wallet.
         <source>Transaction index can't be disabled with governance validation enabled. Either start with -disablegovernance command line switch or enable transaction index.</source>
         <translation>無法在治理驗證啟用的情況下禁用事務索引。要麼使用-disablegovernance命令行選項，否則就啟用事務索引。</translation>
     </message>
+    <message>
+        <source>Unsupported category-specific logging level -loglevel=%s. Expected -loglevel=&lt;category&gt;:&lt;loglevel&gt;. Valid categories: %s. Valid loglevels: %s.</source>
+        <translation>未支援的類別記錄級別 -loglevel=%s. Expected -loglevel=&lt;category&gt;:&lt;loglevel&gt;. 有效的 類別: %s. 有效的記錄級別: %s.</translation>
+    </message>
     <message>
         <source>Can't mix: no compatible inputs found!</source>
         <translation>無法開始混合:沒有找到相容的輸入!</translation>
@@ -4944,6 +5282,14 @@ Go to File &gt; Open Wallet to load a wallet.
         <source>Entry exceeds maximum size.</source>
         <translation>條目超過最大大小。</translation>
     </message>
+    <message>
+        <source>Error upgrading evo database for EHF</source>
+        <translation>升級EHF的 evo 數據庫時出錯</translation>
+    </message>
+    <message>
+        <source>Failed to commit Evo database</source>
+        <translation>無法提交資料到 Evo 數據庫</translation>
+    </message>
     <message>
         <source>Found enough users, signing ( waiting %s )</source>
         <translation>找到足夠多的用戶，簽署中 (等待  %s )</translation>
@@ -4968,18 +5314,14 @@ Go to File &gt; Open Wallet to load a wallet.
         <source>Insufficient funds.</source>
         <translation>餘額不足。</translation>
     </message>
-    <message>
-        <source>Invalid amount for -discardfee=&lt;amount&gt;: '%s'</source>
-        <translation>設定 -discardfee=&lt;金額&gt; 的金額無效: '%s'</translation>
-    </message>
-    <message>
-        <source>Invalid amount for -paytxfee=&lt;amount&gt;: '%s' (must be at least %s)</source>
-        <translation>設定 -paytxfee=&lt;金額&gt; 的金額無效: '%s' (至少要有 %s)</translation>
-    </message>
     <message>
         <source>Invalid minimum number of spork signers specified with -minsporkkeys</source>
         <translation>使用-minsporkkeys 指定的最低叉勺簽名者數目無效</translation>
     </message>
+    <message>
+        <source>Listening for incoming connections failed (listen returned error %s)</source>
+        <translation>監聽外來連接失敗（偵聽返回錯誤%s）</translation>
+    </message>
     <message>
         <source>Lock is already in place.</source>
         <translation>已經鎖定。</translation>
@@ -5036,6 +5378,10 @@ Go to File &gt; Open Wallet to load a wallet.
         <source>Synchronizing governance objects…</source>
         <translation>正在同步治理對象…</translation>
     </message>
+    <message>
+        <source>Transaction change output index out of range</source>
+        <translation>交易變更輸出指數超出範圍</translation>
+    </message>
     <message>
         <source>Unable to start HTTP server. See debug log for details.</source>
         <translation>無法啟動HTTP服務器。 詳細信息請參閱debug.log。</translation>
@@ -5044,6 +5390,10 @@ Go to File &gt; Open Wallet to load a wallet.
         <source>Unknown response.</source>
         <translation>未知回應。</translation>
     </message>
+    <message>
+        <source>Unsupported global logging level -loglevel=%s. Valid values: %s.</source>
+        <translation>不支持的全局記錄級別 -loglevel=%s. 有效值: %s.</translation>
+    </message>
     <message>
         <source>User Agent comment (%s) contains unsafe characters.</source>
         <translation>用戶代理註釋 (%s) 包含不安全的字符。</translation>
@@ -5108,10 +5458,6 @@ Go to File &gt; Open Wallet to load a wallet.
         <source>Total length of network version string (%i) exceeds maximum length (%i). Reduce the number or size of uacomments.</source>
         <translation>網絡版本字符串的總長度  (%i) 超過最大長度 (%i)。減少uacomments參數的數量或大小。</translation>
     </message>
-    <message>
-        <source>Transaction needs a change address, but we can't generate it. Please call keypoolrefill first.</source>
-        <translation>交易需要找零地址，但我們無法產生。請先聯系 keypoolrefill。</translation>
-    </message>
     <message>
         <source>WARNING! Failed to replenish keypool, please unlock your wallet to do so.</source>
         <translation>警告! 無法補充公鑰池，請解鎖您的錢包。</translation>
@@ -5188,10 +5534,6 @@ Go to File &gt; Open Wallet to load a wallet.
         <source>Error: No addresses available.</source>
         <translation>錯誤：沒有可用的位址。</translation>
     </message>
-    <message>
-        <source>Exceeded max tries.</source>
-        <translation>超過最大嘗試的次數。</translation>
-    </message>
     <message>
         <source>Failed to create backup %s!</source>
         <translation>無法創建備份 %s!</translation>
@@ -5232,10 +5574,6 @@ Go to File &gt; Open Wallet to load a wallet.
         <source>Invalid P2P permission: '%s'</source>
         <translation>無效的 P2P 權限: '%s'</translation>
     </message>
-    <message>
-        <source>Invalid amount for -fallbackfee=&lt;amount&gt;: '%s'</source>
-        <translation>設定 -fallbackfee=&lt;amount&gt; 的金額無效: '%s'</translation>
-    </message>
     <message>
         <source>Invalid masternodeblsprivkey. Please see documentation.</source>
         <translation>無效的masternodeblsprivkey。請參閱文檔。</translation>
@@ -5372,10 +5710,6 @@ Go to File &gt; Open Wallet to load a wallet.
         <source>Unable to open %s for writing</source>
         <translation>無法開啟 %s 進行寫入</translation>
     </message>
-    <message>
-        <source>Unable to parse -maxuploadtarget: '%s' (possible integer overflow?)</source>
-        <translation>無法解析-maxuploadtarget：「%s」（可能是整數溢出？）</translation>
-    </message>
     <message>
         <source>Unknown -blockfilterindex value %s.</source>
         <translation>未知 -blockfilterindex 值 %s。</translation>
@@ -5384,10 +5718,6 @@ Go to File &gt; Open Wallet to load a wallet.
         <source>Unknown new rules activated (versionbit %i)</source>
         <translation>啟動未知的新規則（版本位 %i）</translation>
     </message>
-    <message>
-        <source>Upgrading UTXO database</source>
-        <translation>正在升級 UTXO 資料庫</translation>
-    </message>
     <message>
         <source>Verifying blocks…</source>
         <translation>正在驗證區塊資料…</translation>
@@ -5448,10 +5778,6 @@ Go to File &gt; Open Wallet to load a wallet.
         <source>Cannot obtain a lock on data directory %s. %s is probably already running.</source>
         <translation>沒辦法鎖定資料目錄 %s。%s 可能已經在執行了。</translation>
     </message>
-    <message>
-        <source>Cannot upgrade a non HD wallet from version %i to version %i which is non-HD wallet. Use upgradetohd RPC</source>
-        <translation>無法將非 HD 錢包從版本 %i 升級到版本 %i 。請使用upgradetohd RPC</translation>
-    </message>
     <message>
         <source>Distributed under the MIT software license, see the accompanying file %s or %s</source>
         <translation>依據 MIT 軟體授權條款散布，詳情請見附帶的 %s 檔案或是 %s</translation>
@@ -5484,6 +5810,10 @@ Go to File &gt; Open Wallet to load a wallet.
         <source>Failed to rename invalid peers.dat file. Please move or delete it and try again.</source>
         <translation>無法重新命名無效的peers.dat 文件，請移動或刪除它，然後重試。</translation>
     </message>
+    <message>
+        <source>Fee estimation failed. Fallbackfee is disabled. Wait a few blocks or enable %s.</source>
+        <translation>手續費估計失敗。後備手續費已停用。請等待幾個區塊或啟用 %s。</translation>
+    </message>
     <message>
         <source>File %s already exists. If you are sure this is what you want, move it out of the way first.</source>
         <translation>文件 %s 已存在。如果您確定這就是您想要的，請先將其移開。</translation>
@@ -5496,6 +5826,10 @@ Go to File &gt; Open Wallet to load a wallet.
         <source>Incorrect or no devnet genesis block found. Wrong datadir for devnet specified?</source>
         <translation>devnet 的創世區塊不正確或找不到。devnet 的資料目錄錯了嗎?</translation>
     </message>
+    <message>
+        <source>Invalid amount for %s=&lt;amount&gt;: '%s' (must be at least the minrelay fee of %s to prevent stuck transactions)</source>
+        <translation>%s=&lt;amount&gt; 的金額無效：「%s」（必須至少為 %s 的最小轉發費用以防止交易卡住）</translation>
+    </message>
     <message>
         <source>Invalid or corrupt peers.dat (%s). If you believe this is a bug, please report it to %s. As a workaround, you can move the file (%s) out of the way (rename, move, or delete) to have a new one created on the next start.</source>
         <translation>無效或損壞的 peers.dat (%s) 如果您認為這是一個錯誤，請將其報告給 %s 作為解決方法，您可以將檔案 (%s) 移開（重新命名、移動或刪除）。以便在下次啟動時建立一個新的。</translation>
@@ -5512,6 +5846,10 @@ Go to File &gt; Open Wallet to load a wallet.
         <source>No wallet file format provided. To use createfromdump, -format=&lt;format&gt; must be provided.</source>
         <translation>未提供錢包文件格式。要使用 createfromdump，必須提供 -format=&lt;format&gt; </translation>
     </message>
+    <message>
+        <source>Outbound connections restricted to CJDNS (-onlynet=cjdns) but -cjdnsreachable is not provided</source>
+        <translation>出站連線僅限於 CJDNS (-onlynet=cjdns)，但未提供 -cjdnsreachable</translation>
+    </message>
     <message>
         <source>Outbound connections restricted to Tor (-onlynet=onion) but the proxy for reaching the Tor network is explicitly forbidden: -onion=0</source>
         <translation>出站連線僅限於 Tor (-onlynet=onion)，但明確禁止訪問 Tor 網路的代理：-onion=0</translation>
@@ -5520,6 +5858,10 @@ Go to File &gt; Open Wallet to load a wallet.
         <source>Outbound connections restricted to Tor (-onlynet=onion) but the proxy for reaching the Tor network is not provided: none of -proxy, -onion or -listenonion is given</source>
         <translation>出站連線僅限於 Tor (-onlynet=onion)，但未提供用於訪問 Tor 網路的代理：未給出 -proxy、-onion 或 -listenonion 中的任何一個參數</translation>
     </message>
+    <message>
+        <source>Outbound connections restricted to i2p (-onlynet=i2p) but -i2psam is not provided</source>
+        <translation>出站連線僅限於 i2p (-onlynet=i2p)，但未提供 -i2psam</translation>
+    </message>
     <message>
         <source>Please check that your computer's date and time are correct! If your clock is wrong, %s will not work properly.</source>
         <translation>請檢查電腦日期和時間是否正確！%s 沒辦法在時鐘不準的情況下正常運作。</translation>
@@ -5532,10 +5874,6 @@ Go to File &gt; Open Wallet to load a wallet.
         <source>Prune mode is incompatible with -reindex-chainstate. Use full -reindex instead.</source>
         <translation>修剪模式與 -reindex-chainstate 不相容。請改用 full -reindex。</translation>
     </message>
-    <message>
-        <source>The block index db contains a legacy 'txindex'. To clear the occupied disk space, run a full -reindex, otherwise ignore this error. This error message will not be displayed again.</source>
-        <translation>區塊索引資料庫包含遺留的“txindex”。若要清除已佔用的磁碟空間，請執行 full -reindex，否則忽略此錯誤。該錯誤訊息將不會再次顯示。</translation>
-    </message>
     <message>
         <source>This is the maximum transaction fee you pay (in addition to the normal fee) to prioritize partial spend avoidance over regular coin selection.</source>
         <translation>這是您支付的最高交易費用（除了正常費用之外），以優先考慮避免部分支出而不是常規資金的選擇。</translation>
@@ -5548,6 +5886,10 @@ Go to File &gt; Open Wallet to load a wallet.
         <source>This is the transaction fee you may pay when fee estimates are not available.</source>
         <translation>這是當預估手續費還沒計算出來時，付款交易預設會付的手續費。</translation>
     </message>
+    <message>
+        <source>Transaction requires one destination of non-0 value, a non-0 feerate, or a pre-selected input</source>
+        <translation>交易需要一個非零值的目的地、非零費率或預先選擇的輸入</translation>
+    </message>
     <message>
         <source>Unable to replay blocks. You will need to rebuild the database using -reindex-chainstate.</source>
         <translation>無法重播區塊。您將需要使用-reindex-chainstate來重建數據庫。</translation>
@@ -5556,6 +5898,10 @@ Go to File &gt; Open Wallet to load a wallet.
         <source>Unknown wallet file format "%s" provided. Please provide one of "bdb" or "sqlite".</source>
         <translation>提供了未知的錢包文件格式“%s”。請提供“bdb”或“sqlite”其中之一。</translation>
     </message>
+    <message>
+        <source>Unsupported chainstate database format found. Please restart with -reindex-chainstate. This will rebuild the chainstate database.</source>
+        <translation>發現不支援的鏈狀態資料庫格式。請使用 -reindex-chainstate 重新啟動。這將重建鏈狀態資料庫。</translation>
+    </message>
     <message>
         <source>Warning: Dumpfile wallet format "%s" does not match command line specified format "%s".</source>
         <translation>警告：轉儲檔案錢包格式「%s」與命令列指定的格式「%s」不符。</translation>
@@ -5596,10 +5942,30 @@ Go to File &gt; Open Wallet to load a wallet.
         <source>-rpcport must be specified when -devnet and -server are specified</source>
         <translation>當指定 -devnet 和 -server 時，必須指定 -rpcport</translation>
     </message>
+    <message>
+        <source>-statsbatchsize cannot be configured with a negative value.</source>
+        <translation>-statsbatchsize 不能配置為負值。</translation>
+    </message>
+    <message>
+        <source>-statsduration cannot be configured with a negative value.</source>
+        <translation>-statsduration 不能配置為負值。</translation>
+    </message>
     <message>
         <source>A fatal internal error occurred, see debug.log for details</source>
         <translation>發生致命的內部錯誤，請參閱 debug.log 了解詳細信息</translation>
     </message>
+    <message>
+        <source>Cannot create socket (socket() returned error %s)</source>
+        <translation>無法創建 socket (socket() 回傳錯誤 %s)</translation>
+    </message>
+    <message>
+        <source>Cannot get socket address for %s</source>
+        <translation>無法取得 %s 的 socket 位址</translation>
+    </message>
+    <message>
+        <source>Cannot init Statsd client</source>
+        <translation>無法初始化 Statsd 客戶端</translation>
+    </message>
     <message>
         <source>Cannot resolve -%s address: '%s'</source>
         <translation>沒辦法解析 -%s 參數指定的位址: '%s'</translation>
@@ -5644,10 +6010,6 @@ Go to File &gt; Open Wallet to load a wallet.
         <source>Error reading next record from wallet database</source>
         <translation>從錢包資料庫讀取下一筆記錄時出錯</translation>
     </message>
-    <message>
-        <source>Error upgrading chainstate database</source>
-        <translation>升級區塊鏈狀態資料庫時發生錯誤</translation>
-    </message>
     <message>
         <source>Loading P2P addresses…</source>
         <translation>正在載入 P2P 位址資料…</translation>
@@ -5768,10 +6130,70 @@ Go to File &gt; Open Wallet to load a wallet.
         <source>%s corrupt. Try using the wallet tool dash-wallet to salvage or restoring a backup.</source>
         <translation>%s 已損壞。 請嘗試使用錢包工具 dash-wallet 來挽救或恢復備份。</translation>
     </message>
+    <message>
+        <source>%s is set very high! Fees this large could be paid on a single transaction.</source>
+        <translation>%s 設定得非常高！如此高額的手續費可能在單筆交易中支付。</translation>
+    </message>
+    <message>
+        <source>%s request to listen on port %u. This port is considered "bad" and thus it is unlikely that any Dash Core peers connect to it. See doc/p2p-bad-ports.md for details and a full list.</source>
+        <translation>%s在port%u上監聽。該端口被認為是“不良”，因此任何達世幣核心的對等用戶都不太可能連接到它。有關詳細信息和完整列表，請參見doc/p2p-bad-ports.md 。</translation>
+    </message>
+    <message>
+        <source>Cannot provide specific connections and have addrman find outgoing connections at the same time.</source>
+        <translation>無法提供特定的連接，並讓Addrman同時查找傳出連接。</translation>
+    </message>
+    <message>
+        <source>Failed to upgrade Evo database</source>
+        <translation>升級 Evo 資料庫失敗</translation>
+    </message>
+    <message>
+        <source>Fee needed &gt; fee paid</source>
+        <translation>所需手續費 &gt; 已支付手續費</translation>
+    </message>
+    <message>
+        <source>Host %s on unsupported network</source>
+        <translation>主機 %s 位於不支援的網路上</translation>
+    </message>
+    <message>
+        <source>Invalid amount for %s=&lt;amount&gt;: '%s' (must be at least %s)</source>
+        <translation>%s=&lt;amount&gt; 的金額無效：「%s」（必須至少為 %s）</translation>
+    </message>
+    <message>
+        <source>Invalid amount for %s=&lt;amount&gt;: '%s'</source>
+        <translation>%s=&lt;amount&gt; 的金額無效：「%s」</translation>
+    </message>
+    <message>
+        <source>Invalid port specified in %s: '%s'</source>
+        <translation>在 %s 中指定的連接埠無效：「%s」</translation>
+    </message>
     <message>
         <source>Last successful action was too recent.</source>
         <translation>距離上一次成功執行的時間過短。</translation>
     </message>
+    <message>
+        <source>Missing solving data for estimating transaction size</source>
+        <translation>缺少估算交易大小的求解資料</translation>
+    </message>
+    <message>
+        <source>No host specified</source>
+        <translation>未指定主機</translation>
+    </message>
+    <message>
+        <source>No host specified, malformed URL</source>
+        <translation>未指定主機，URL 格式錯誤</translation>
+    </message>
+    <message>
+        <source>No text before the scheme delimiter, malformed URL</source>
+        <translation>協定分隔符號前無文字，URL 格式錯誤</translation>
+    </message>
+    <message>
+        <source>Port must be between %d and %d, supplied %d</source>
+        <translation>連接埠必須介於 %d 和 %d 之間，提供的是 %d</translation>
+    </message>
+    <message>
+        <source>Socket not initialized, cannot send message</source>
+        <translation>Socket 未初始化，無法發送訊息</translation>
+    </message>
     <message>
         <source>The source code is available from %s.</source>
         <translation>原始碼可以在 %s 取得。</translation>
@@ -5800,6 +6222,10 @@ Go to File &gt; Open Wallet to load a wallet.
         <source>Transaction fees are too high.</source>
         <translation>交易手續費過高。</translation>
     </message>
+    <message>
+        <source>Transaction needs a change address, but we can't generate it.</source>
+        <translation>交易需要找零地址，但我們無法生成。</translation>
+    </message>
     <message>
         <source>Transaction not valid.</source>
         <translation>交易無效。</translation>
@@ -5820,6 +6246,18 @@ Go to File &gt; Open Wallet to load a wallet.
         <source>Unable to locate enough non-denominated funds for this transaction.</source>
         <translation>無法為此交易找到足夠的未除名資金。</translation>
     </message>
+    <message>
+        <source>Unable to lookup host %s</source>
+        <translation>無法查詢主機 %s</translation>
+    </message>
+    <message>
+        <source>Unable to parse -maxuploadtarget: '%s'</source>
+        <translation>無法解析 -maxuploadtarget：「%s」</translation>
+    </message>
+    <message>
+        <source>Unable to send message to %s (::sendto() returned error %s)</source>
+        <translation>無法發送訊息到 %s (::sendto() 回傳錯誤 %s)</translation>
+    </message>
     <message>
         <source>Unable to sign spork message, wrong key?</source>
         <translation>無法簽署叉勺訊息訊息，錯誤的密鑰？</translation>
@@ -5832,6 +6270,10 @@ Go to File &gt; Open Wallet to load a wallet.
         <source>Unknown state: id = %u</source>
         <translation>未知狀態: id = %u</translation>
     </message>
+    <message>
+        <source>Unsupported URL scheme, must begin with udp://</source>
+        <translation>不支援的 URL 協定，必須以 udp:// 開頭</translation>
+    </message>
     <message>
         <source>Unsupported logging category %s=%s.</source>
         <translation>不支持的日誌記錄類別 %s=%s.</translation>

From 2c0bd3a22c6ba6f28665d0e26e5eee8845bf3b79 Mon Sep 17 00:00:00 2001
From: UdjinM6 <UdjinM6@users.noreply.github.com>
Date: Sat, 25 Oct 2025 01:09:30 +0300
Subject: [PATCH 332/656] ja

---
 src/qt/locale/dash_ja.ts | 2219 ++++++++++++++++++++++++++++++++------
 1 file changed, 1900 insertions(+), 319 deletions(-)

diff --git a/src/qt/locale/dash_ja.ts b/src/qt/locale/dash_ja.ts
index 3dd1da7d7d35..2417997daede 100644
--- a/src/qt/locale/dash_ja.ts
+++ b/src/qt/locale/dash_ja.ts
@@ -15,7 +15,7 @@
     </message>
     <message>
         <source>&amp;New</source>
-        <translation>新規(&amp;N)</translation>
+        <translation>新規 (&amp;N)</translation>
     </message>
     <message>
         <source>Copy the currently selected address to the system clipboard</source>
@@ -23,7 +23,7 @@
     </message>
     <message>
         <source>&amp;Copy</source>
-        <translation>コピー(&amp;C)</translation>
+        <translation>コピー (&amp;C)</translation>
     </message>
     <message>
         <source>Show QR code for the currently selected address</source>
@@ -31,7 +31,7 @@
     </message>
     <message>
         <source>&amp;Show QR code</source>
-        <translation>&amp;QRコードを表示</translation>
+        <translation>QRコードを表示する (&amp;S)</translation>
     </message>
     <message>
         <source>Delete the currently selected address from the list</source>
@@ -39,7 +39,7 @@
     </message>
     <message>
         <source>&amp;Delete</source>
-        <translation>削除(&amp;D)</translation>
+        <translation>削除 (&amp;D)</translation>
     </message>
     <message>
         <source>Export the data in the current tab to a file</source>
@@ -51,7 +51,7 @@
     </message>
     <message>
         <source>C&amp;lose</source>
-        <translation>閉じる(&amp;C)</translation>
+        <translation>閉じる (&amp;L)</translation>
     </message>
     <message>
         <source>Choose the address to send coins to</source>
@@ -63,15 +63,7 @@
     </message>
     <message>
         <source>C&amp;hoose</source>
-        <translation>選択(&amp;H)</translation>
-    </message>
-    <message>
-        <source>Sending addresses</source>
-        <translation>送金アドレス</translation>
-    </message>
-    <message>
-        <source>Receiving addresses</source>
-        <translation>受取アドレス</translation>
+        <translation>選択 (&amp;H)</translation>
     </message>
     <message>
         <source>These are your Dash addresses for sending payments. Always check the amount and the receiving address before sending coins.</source>
@@ -83,7 +75,7 @@
     </message>
     <message>
         <source>&amp;Copy Address</source>
-        <translation>アドレスをコピー (&amp;C)</translation>
+        <translation>アドレスをコピー (&amp;A)</translation>
     </message>
     <message>
         <source>Copy &amp;Label</source>
@@ -94,8 +86,8 @@
         <translation>編集 (&amp;E)</translation>
     </message>
     <message>
-        <source>&amp;Show address QR code</source>
-        <translation>&amp;アドレスのQRコードを表示</translation>
+        <source>Show address &amp;QR code</source>
+        <translation>アドレスとQRコードを表示する (&amp;Q)</translation>
     </message>
     <message>
         <source>QR code</source>
@@ -105,6 +97,24 @@
         <source>Export Address List</source>
         <translation>アドレスのリストをエクスポート</translation>
     </message>
+    <message>
+        <source>Comma separated file</source>
+        <extracomment>Expanded name of the CSV file format. See: https://en.wikipedia.org/wiki/Comma-separated_values.</extracomment>
+        <translation>カンマ区切りのファイル</translation>
+    </message>
+    <message>
+        <source>There was an error trying to save the address list to %1. Please try again.</source>
+        <extracomment>An error message. %1 is a stand-in argument for the name of the file we attempted to save to.</extracomment>
+        <translation>アドレスリストを%1に保存しようとした際にエラーが発生しました。もう一度お試しください。</translation>
+    </message>
+    <message>
+        <source>Sending addresses - %1</source>
+        <translation>送信アドレス - %1</translation>
+    </message>
+    <message>
+        <source>Receiving addresses - %1</source>
+        <translation>受信アドレス - %1</translation>
+    </message>
     <message>
         <source>Exporting Failed</source>
         <translation>エクスポート失敗</translation>
@@ -200,7 +210,7 @@
     </message>
     <message>
         <source>Unlock wallet</source>
-        <translation>ウォレットをアンロック</translation>
+        <translation>ウォレットをアンロックする</translation>
     </message>
     <message>
         <source>Change passphrase</source>
@@ -274,10 +284,22 @@
         <source>The passphrase entered for the wallet decryption was incorrect.</source>
         <translation>入力されたウォレットの暗号化解除のパスフレーズが正しくありません。</translation>
     </message>
+    <message>
+        <source>The passphrase entered for the wallet decryption is incorrect. It contains a null character (ie - a zero byte). If the passphrase was set with a version of this software prior to 23.0, please try again with only the characters up to — but not including — the first null character. If this is successful, please set a new passphrase to avoid this issue in the future.</source>
+        <translation>ウォレットの復号に入力されたパスフレーズが正しくありません。null文字（ゼロバイト）が含まれています。23.0より前のバージョンのソフトウェアでパスフレーズを設定した場合は、最初のnull文字の前まで（null文字は含めず）の文字のみで再試行してください。成功した場合は、今後この問題を回避するために新しいパスフレーズを設定してください。</translation>
+    </message>
     <message>
         <source>Wallet passphrase was successfully changed.</source>
         <translation>ウォレットのパスフレーズが変更されました。</translation>
     </message>
+    <message>
+        <source>Passphrase change failed</source>
+        <translation>パスフレーズの変更に失敗しました</translation>
+    </message>
+    <message>
+        <source>The old passphrase entered for the wallet decryption is incorrect. It contains a null character (ie - a zero byte). If the passphrase was set with a version of this software prior to 23.0, please try again with only the characters up to — but not including — the first null character.</source>
+        <translation>ウォレットの復号に入力された古いパスフレーズが正しくありません。null文字（ゼロバイト）が含まれています。23.0より前のバージョンのソフトウェアでパスフレーズを設定した場合は、最初のnull文字の前まで（null文字は含めず）の文字のみで再試行してください。</translation>
+    </message>
     <message>
         <source>Warning: The Caps Lock key is on!</source>
         <translation>警告：Caps Lockキーがオンになっています!</translation>
@@ -303,12 +325,28 @@
 </context>
 <context>
     <name>BitcoinApplication</name>
-    </context>
+    <message>
+        <source>Runaway exception</source>
+        <translation>ランナウェイの例外</translation>
+    </message>
+    <message>
+        <source>A fatal error occurred. %1 can no longer continue safely and will quit.</source>
+        <translation>重大なエラーが発生しました。%1は安全に継続できなくなったため、中止します。</translation>
+    </message>
+    <message>
+        <source>Internal error</source>
+        <translation>内部エラー</translation>
+    </message>
+    <message>
+        <source>An internal error occurred. %1 will attempt to continue safely. This is an unexpected bug which can be reported as described below.</source>
+        <translation>内部エラーが発生しました。%1が安全に続行できるよう試みます。これは想定外のバグであり、下記の手順で報告できます。</translation>
+    </message>
+</context>
 <context>
     <name>BitcoinGUI</name>
     <message>
         <source>&amp;Overview</source>
-        <translation>概要(&amp;O)</translation>
+        <translation>概要 (&amp;O)</translation>
     </message>
     <message>
         <source>Show general overview of wallet</source>
@@ -316,7 +354,7 @@
     </message>
     <message>
         <source>&amp;Send</source>
-        <translation>送金 (&amp;S)</translation>
+        <translation>送金する (&amp;S)</translation>
     </message>
     <message>
         <source>Send coins to a Dash address</source>
@@ -324,23 +362,27 @@
     </message>
     <message>
         <source>&amp;Receive</source>
-        <translation>受取 (&amp;R)</translation>
+        <translation>入金する (&amp;R)</translation>
     </message>
     <message>
         <source>Request payments (generates QR codes and dash: URIs)</source>
         <translation>送金を要求 (QRコードとdash:URIを生成)</translation>
     </message>
+    <message>
+        <source>Ctrl+Q</source>
+        <translation>Ctrl+Q</translation>
+    </message>
     <message>
         <source>&amp;Options…</source>
         <translation>オプション… (&amp;O)</translation>
     </message>
     <message>
         <source>&amp;Encrypt Wallet…</source>
-        <translation>ウォレットの暗号化… (&amp;E)</translation>
+        <translation>ウォレットを暗号化する… (&amp;E)</translation>
     </message>
     <message>
         <source>&amp;Backup Wallet…</source>
-        <translation>ウォレットのバックアップ… (&amp;B)</translation>
+        <translation>ウォレットをバックアップする… (&amp;B)</translation>
     </message>
     <message>
         <source>&amp;Change Passphrase…</source>
@@ -348,15 +390,19 @@
     </message>
     <message>
         <source>&amp;Unlock Wallet…</source>
-        <translation>ウォレットをアンロック…(&amp;U)</translation>
+        <translation>ウォレットをアンロックする… (&amp;U)</translation>
     </message>
     <message>
         <source>Sign &amp;message…</source>
-        <translation>メッセージの署名… (&amp;M)</translation>
+        <translation>メッセージを署名する… (&amp;M)</translation>
     </message>
     <message>
         <source>&amp;Verify message…</source>
-        <translation>メッセージの検証… (&amp;V)</translation>
+        <translation>メッセージを検証する… (&amp;V)</translation>
+    </message>
+    <message>
+        <source>&amp;Load PSBT from file…</source>
+        <translation>ファイルからPSBTをロード... (&amp;L)</translation>
     </message>
     <message>
         <source>&amp;Sending addresses</source>
@@ -390,10 +436,6 @@
         <source>&amp;Window</source>
         <translation>ウインドウ (&amp;W)</translation>
     </message>
-    <message>
-        <source>Minimize</source>
-        <translation>最小化する</translation>
-    </message>
     <message>
         <source>Zoom</source>
         <translation>ズーム</translation>
@@ -404,7 +446,7 @@
     </message>
     <message>
         <source>&amp;Transactions</source>
-        <translation>トランザクション(&amp;T)</translation>
+        <translation>トランザクション (&amp;T)</translation>
     </message>
     <message>
         <source>Browse transaction history</source>
@@ -412,7 +454,7 @@
     </message>
     <message>
         <source>&amp;Masternodes</source>
-        <translation>マスターノード(&amp;M)</translation>
+        <translation>マスターノード (&amp;M)</translation>
     </message>
     <message>
         <source>Browse masternodes</source>
@@ -420,7 +462,7 @@
     </message>
     <message>
         <source>E&amp;xit</source>
-        <translation>終了(&amp;X)</translation>
+        <translation>終了 (&amp;X)</translation>
     </message>
     <message>
         <source>Quit application</source>
@@ -428,7 +470,7 @@
     </message>
     <message>
         <source>About &amp;Qt</source>
-        <translation>Qtについて(&amp;Q)</translation>
+        <translation>Qtについて (&amp;Q)</translation>
     </message>
     <message>
         <source>Show information about Qt</source>
@@ -446,14 +488,6 @@
         <source>Modify configuration options for %1</source>
         <translation>%1 の設定を変更</translation>
     </message>
-    <message>
-        <source>&amp;Show / Hide</source>
-        <translation>表示/非表示 (&amp;S)</translation>
-    </message>
-    <message>
-        <source>Show or hide the main Window</source>
-        <translation>メインウインドウを表示または非表示</translation>
-    </message>
     <message>
         <source>Encrypt the private keys that belong to your wallet</source>
         <translation>あなたのウォレットの秘密鍵を暗号化</translation>
@@ -468,11 +502,11 @@
     </message>
     <message>
         <source>Unlock wallet</source>
-        <translation>ウォレットをアンロック</translation>
+        <translation>ウォレットをアンロックする</translation>
     </message>
     <message>
         <source>&amp;Lock Wallet</source>
-        <translation>ウォレットをロック(&amp;L)</translation>
+        <translation>ウォレットをロックする (&amp;L)</translation>
     </message>
     <message>
         <source>Sign messages with your Dash addresses to prove you own them</source>
@@ -492,11 +526,11 @@
     </message>
     <message>
         <source>&amp;Debug console</source>
-        <translation>デバッグコンソール(&amp;D)</translation>
+        <translation>デバッグコンソール (&amp;D)</translation>
     </message>
     <message>
         <source>&amp;Network Monitor</source>
-        <translation>ネットワークモニタ(&amp;N)</translation>
+        <translation>ネットワークモニター (&amp;N)</translation>
     </message>
     <message>
         <source>Show network monitor</source>
@@ -504,7 +538,7 @@
     </message>
     <message>
         <source>&amp;Peers list</source>
-        <translation>ネットワークのピアのリスト(&amp;P)</translation>
+        <translation>ピアのリスト (&amp;P)</translation>
     </message>
     <message>
         <source>Show peers info</source>
@@ -512,23 +546,19 @@
     </message>
     <message>
         <source>Wallet &amp;Repair</source>
-        <translation>ウォレットの修復(&amp;R)</translation>
+        <translation>ウォレットの修復 (&amp;R)</translation>
     </message>
     <message>
         <source>Show wallet repair options</source>
         <translation>ウォレットの修復オプションを表示</translation>
     </message>
-    <message>
-        <source>Open Wallet &amp;Configuration File</source>
-        <translation>ウォレット設定ファイルを開く(&amp;C)</translation>
-    </message>
     <message>
         <source>Open configuration file</source>
         <translation>設定ファイルを開く</translation>
     </message>
     <message>
         <source>Show Automatic &amp;Backups</source>
-        <translation>自動バックアップを表示(&amp;B)</translation>
+        <translation>自動バックアップを表示 (&amp;B)</translation>
     </message>
     <message>
         <source>Show automatically created wallet backups</source>
@@ -569,31 +599,93 @@
     </message>
     <message>
         <source>&amp;File</source>
-        <translation>ファイル(&amp;F)</translation>
+        <translation>ファイル (&amp;F)</translation>
     </message>
     <message>
         <source>Show information about %1</source>
         <translation>%1の情報を表示する</translation>
     </message>
+    <message>
+        <source>Load PSBT from &amp;clipboard…</source>
+        <translation>クリップボードからPSBTを読み込む(&amp;C)…</translation>
+    </message>
+    <message>
+        <source>Open debugging and diagnostic console</source>
+        <translation>デバッグおよび診断コンソールを開く</translation>
+    </message>
+    <message>
+        <source>Open &amp;wallet configuration file</source>
+        <translation>ウォレット設定ファイルを開く(&amp;W)</translation>
+    </message>
+    <message>
+        <source>Open a dash: URI</source>
+        <translation>dashを開く: URI</translation>
+    </message>
     <message>
         <source>Create a new wallet</source>
         <translation>新しいウォレットを作成する</translation>
     </message>
+    <message>
+        <source>Restore Wallet…</source>
+        <extracomment>Name of the menu item that restores wallet from a backup file.</extracomment>
+        <translation>ウォレットを復元…</translation>
+    </message>
+    <message>
+        <source>Restore a wallet from a backup file</source>
+        <extracomment>Status tip for Restore Wallet menu item</extracomment>
+        <translation>バックアップファイルからウォレットを復元する</translation>
+    </message>
+    <message>
+        <source>Close all wallets</source>
+        <translation>全てのウォレットを閉じる</translation>
+    </message>
     <message>
         <source>%1 &amp;information</source>
-        <translation>%1と情報</translation>
+        <translation>%1の情報 (&amp;I)</translation>
     </message>
     <message>
         <source>Show the %1 basic information</source>
         <translation>%1の基本情報を表示する</translation>
     </message>
+    <message>
+        <source>&amp;Discreet mode</source>
+        <translation>非表示モード (&amp;D)</translation>
+    </message>
+    <message>
+        <source>Mask the values in the Overview tab</source>
+        <translation>概要タブの値を非表示にする(&amp;M)</translation>
+    </message>
+    <message>
+        <source>Wallet Data</source>
+        <extracomment>Name of the wallet data file format.</extracomment>
+        <translation>ウォレットデータ</translation>
+    </message>
+    <message>
+        <source>Load Wallet Backup</source>
+        <extracomment>The title for Restore Wallet File Windows</extracomment>
+        <translation>ウォレットバックアップを読み込む</translation>
+    </message>
+    <message>
+        <source>Restore Wallet</source>
+        <extracomment>Title of pop-up window shown when the user is attempting to restore a wallet.</extracomment>
+        <translation>ウォレットを復元</translation>
+    </message>
+    <message>
+        <source>Wallet Name</source>
+        <extracomment>Label of the input field where the name of the wallet is entered.</extracomment>
+        <translation>ウォレット名</translation>
+    </message>
     <message>
         <source>&amp;Settings</source>
-        <translation>設定(&amp;S)</translation>
+        <translation>設定 (&amp;S)</translation>
+    </message>
+    <message>
+        <source>&amp;Minimize</source>
+        <translation>最小化(&amp;M)</translation>
     </message>
     <message>
         <source>&amp;Help</source>
-        <translation>ヘルプ(&amp;H)</translation>
+        <translation>ヘルプ (&amp;H)</translation>
     </message>
     <message>
         <source>Tabs toolbar</source>
@@ -601,14 +693,23 @@
     </message>
     <message>
         <source>&amp;Governance</source>
-        <translation>ガバナンス(&amp;G)</translation>
+        <translation>ガバナンス (&amp;G)</translation>
     </message>
     <message>
         <source>View Governance Proposals</source>
         <translation>ガバナンス提案を見る</translation>
     </message>
+    <message>
+        <source>&amp;Hide</source>
+        <translation>非表示(&amp;H)</translation>
+    </message>
+    <message>
+        <source>S&amp;how</source>
+        <translation>表示(&amp;H)</translation>
+    </message>
     <message numerus="yes">
         <source>%n active connection(s) to Dash network</source>
+        <extracomment>A substring of the tooltip.</extracomment>
         <translation><numerusform>%n アクティブコネクション</numerusform></translation>
     </message>
     <message>
@@ -625,12 +726,52 @@
     </message>
     <message>
         <source>Close Wallet…</source>
-        <translation>ウォレットを閉じる…</translation>
+        <translation>ウォレットを閉じます…</translation>
+    </message>
+    <message>
+        <source>Load Partially Signed Blockchain Transaction</source>
+        <translation>一部署名済みのブロックチェーン取引をロード</translation>
+    </message>
+    <message>
+        <source>Load Partially Signed Blockchain Transaction from clipboard</source>
+        <translation>クリップボードから一部署名済みのブロックチェーン取引をロード</translation>
     </message>
     <message>
         <source>Create Wallet…</source>
         <translation>ウォレットを作成する…</translation>
     </message>
+    <message>
+        <source>Close All Wallets…</source>
+        <translation>全てのウォレットを閉じます...</translation>
+    </message>
+    <message>
+        <source>Ctrl+Shift+D</source>
+        <translation>Ctrl+Shift+D</translation>
+    </message>
+    <message>
+        <source>Ctrl+M</source>
+        <translation>Ctrl+M</translation>
+    </message>
+    <message>
+        <source>Click for more actions.</source>
+        <extracomment>A substring of the tooltip. "More actions" are available via the context menu.</extracomment>
+        <translation>その他の操作を行う場合はクリックします。</translation>
+    </message>
+    <message>
+        <source>Show Peers tab</source>
+        <extracomment>A context menu item. The "Peers tab" is an element of the "Node window".</extracomment>
+        <translation>ピアのタブを表示する</translation>
+    </message>
+    <message>
+        <source>Disable network activity</source>
+        <extracomment>A context menu item.</extracomment>
+        <translation>ネットワーク接続を無効にする</translation>
+    </message>
+    <message>
+        <source>Enable network activity</source>
+        <extracomment>A context menu item. The network activity was disabled previously.</extracomment>
+        <translation>ネットワーク接続を有効にする</translation>
+    </message>
     <message>
         <source>Syncing Headers (%1%)…</source>
         <translation>ヘッダーを同期しています (%1%)…</translation>
@@ -647,10 +788,6 @@
         <source>Processing blocks on disk…</source>
         <translation>ディスク上のブロックを処理中…</translation>
     </message>
-    <message>
-        <source>Reindexing blocks on disk…</source>
-        <translation>ディスク上のブロックのインデックスを再作成中…</translation>
-    </message>
     <message>
         <source>Connecting to peers…</source>
         <translation>ピアに接続中…</translation>
@@ -804,10 +941,6 @@
         <source>Coin Selection</source>
         <translation>コイン選択</translation>
     </message>
-    <message>
-        <source>Dust:</source>
-        <translation>ダスト：</translation>
-    </message>
     <message>
         <source>After Fee:</source>
         <translation>手数料差引後：</translation>
@@ -865,28 +998,32 @@
         <translation>検証済み</translation>
     </message>
     <message>
-        <source>Copy address</source>
-        <translation>アドレスをコピー</translation>
+        <source>Copy amount</source>
+        <translation>金額をコピー</translation>
     </message>
     <message>
-        <source>Copy label</source>
-        <translation>ラベルをコピー</translation>
+        <source>&amp;Copy address</source>
+        <translation>アドレスをコピー (&amp;A)</translation>
     </message>
     <message>
-        <source>Copy amount</source>
-        <translation>金額をコピー</translation>
+        <source>Copy &amp;label</source>
+        <translation>ラベルをコピー (&amp;L)</translation>
+    </message>
+    <message>
+        <source>Copy &amp;amount</source>
+        <translation>金額をコピー (&amp;A)</translation>
     </message>
     <message>
-        <source>Copy transaction ID</source>
-        <translation>取引 ID をコピー</translation>
+        <source>Copy transaction &amp;ID and output index</source>
+        <translation>取引IDとアウトプットインデックスをコピー (&amp;I)</translation>
     </message>
     <message>
-        <source>Lock unspent</source>
-        <translation>未送金トランザクションをロック</translation>
+        <source>L&amp;ock unspent</source>
+        <translation>未使用分をロック (&amp;U)</translation>
     </message>
     <message>
-        <source>Unlock unspent</source>
-        <translation>未送金トランザクションをアンロック</translation>
+        <source>&amp;Unlock unspent</source>
+        <translation>未使用分をロック解除 (&amp;U)</translation>
     </message>
     <message>
         <source>Copy quantity</source>
@@ -904,10 +1041,6 @@
         <source>Copy bytes</source>
         <translation>バイト数をコピー</translation>
     </message>
-    <message>
-        <source>Copy dust</source>
-        <translation>ダストをコピー</translation>
-    </message>
     <message>
         <source>Copy change</source>
         <translation>チェンジアドレスをコピー</translation>
@@ -920,18 +1053,6 @@
         <source>(%1 locked)</source>
         <translation>(%1 がロック中)</translation>
     </message>
-    <message>
-        <source>yes</source>
-        <translation>はい</translation>
-    </message>
-    <message>
-        <source>no</source>
-        <translation>いいえ</translation>
-    </message>
-    <message>
-        <source>This label turns red if any recipient receives an amount smaller than the current dust threshold.</source>
-        <translation>受取額が現在のダスト閾値を下回る場合にはこのラベルは赤くなります。</translation>
-    </message>
     <message>
         <source>Can vary +/- %1 duff(s) per input.</source>
         <translation>インプットごとに +/- %1 duff(s) が変更可能 </translation>
@@ -975,8 +1096,14 @@
 </context>
 <context>
     <name>CreateWalletActivity</name>
+    <message>
+        <source>Create Wallet</source>
+        <extracomment>Title of window indicating the progress of creation of a new wallet.</extracomment>
+        <translation>ウォレットを作成する</translation>
+    </message>
     <message>
         <source>Creating Wallet &lt;b&gt;%1&lt;/b&gt;…</source>
+        <extracomment>Descriptive text of the create wallet progress window which indicates to the user which wallet is currently being created.</extracomment>
         <translation>ウォレット&lt;b&gt;%1&lt;/b&gt;を作成…</translation>
     </message>
     <message>
@@ -998,6 +1125,10 @@
         <source>Wallet Name</source>
         <translation>ウォレット名</translation>
     </message>
+    <message>
+        <source>Wallet</source>
+        <translation>ウォレット</translation>
+    </message>
     <message>
         <source>Encrypt the wallet. The wallet will be encrypted with a passphrase of your choice.</source>
         <translation>ウォレットを暗号化します。ウォレットは、お客様が選んだパスフレーズで暗号化されます。</translation>
@@ -1006,6 +1137,10 @@
         <source>Encrypt Wallet</source>
         <translation>ウォレットを暗号化する</translation>
     </message>
+    <message>
+        <source>Advanced Options</source>
+        <translation>高機能オプション</translation>
+    </message>
     <message>
         <source>Disable private keys for this wallet. Wallets with private keys disabled will have no private keys and cannot have an HD seed or imported private keys. This is ideal for watch-only wallets.</source>
         <translation>このウォレットのプライベートキーを無効にします。プライベートキーを無効にしたウォレットは、プライベートキーを持たず、HDシードやインポートされたプライベートキーを持つことができなくなります。これは時計専用のウォレットに最適です。</translation>
@@ -1022,11 +1157,23 @@
         <source>Make Blank Wallet</source>
         <translation>ブランクウォレットを作成する</translation>
     </message>
+    <message>
+        <source>Use descriptors for scriptPubKey management. This feature is well-tested but still considered experimental and not recommended for use yet.</source>
+        <translation>ScriptPubKeyの管理には、Descriptorを使用してください。この機能は十分にテストされていますが、まだ実験的なものと見なされており、現時点では使用は推奨されていません。</translation>
+    </message>
+    <message>
+        <source>Descriptor Wallet (EXPERIMENTAL)</source>
+        <translation>Descriptor Wallet (試験的)</translation>
+    </message>
     <message>
         <source>Create</source>
         <translation>作成</translation>
     </message>
-    </context>
+    <message>
+        <source>Compiled without sqlite support (required for descriptor wallets)</source>
+        <translation>SQLiteのサポートなしでコンパイル (Descriptor Walletには必須)</translation>
+    </message>
+</context>
 <context>
     <name>EditAddressDialog</name>
     <message>
@@ -1035,7 +1182,7 @@
     </message>
     <message>
         <source>&amp;Label</source>
-        <translation>ラベル(&amp;L)</translation>
+        <translation>ラベル (&amp;L)</translation>
     </message>
     <message>
         <source>The label associated with this address list entry</source>
@@ -1115,18 +1262,106 @@
         <source>Filter List:</source>
         <translation>フィルターリスト：</translation>
     </message>
+    <message>
+        <source>Filter proposal list</source>
+        <translation>提案リストを絞り込む</translation>
+    </message>
+    <message>
+        <source>Masternode Count:</source>
+        <translation>マスターノード数：</translation>
+    </message>
+    <message>
+        <source>Number of masternodes this wallet can vote with (masternodes for which this wallet holds the voting key)</source>
+        <translation>このウォレットで投票できるマスターノードの数（このウォレットが投票キーを保持しているマスターノード）</translation>
+    </message>
     <message>
         <source>Proposal Count:</source>
         <translation>提案回数：</translation>
     </message>
+    <message>
+        <source>Create Proposal</source>
+        <translation>提案を作成</translation>
+    </message>
     <message>
         <source>Filter by Title</source>
         <translation>タイトルで絞り込む</translation>
     </message>
+    <message>
+        <source>Unavailable</source>
+        <translation>利用不可</translation>
+    </message>
+    <message>
+        <source>A synced node and an unlocked wallet are required.</source>
+        <translation>同期されたノードとロック解除されたウォレットが必要です。</translation>
+    </message>
+    <message>
+        <source>Vote Yes</source>
+        <translation>賛成票を投じる</translation>
+    </message>
+    <message>
+        <source>Vote No</source>
+        <translation>反対票を投じる</translation>
+    </message>
+    <message>
+        <source>Vote Abstain</source>
+        <translation>棄権票を投じる</translation>
+    </message>
     <message>
         <source>Proposal Info: %1</source>
         <translation>提案情報：%1</translation>
     </message>
+    <message>
+        <source>Voting Failed</source>
+        <translation>投票に失敗しました</translation>
+    </message>
+    <message>
+        <source>No wallet available.</source>
+        <translation>ウォレットが利用できません。</translation>
+    </message>
+    <message>
+        <source>No masternode voting keys found in wallet.</source>
+        <translation>ウォレットにマスターノード投票キーが見つかりません。</translation>
+    </message>
+    <message>
+        <source>Please select a proposal to vote on.</source>
+        <translation>投票する提案を選択してください。</translation>
+    </message>
+    <message>
+        <source>Unable to unlock wallet.</source>
+        <translation>ウォレットのロックを解除できません。</translation>
+    </message>
+    <message>
+        <source>Unable to get masternode list. Please try again later.</source>
+        <translation>マスターノードリストを取得できません。後でもう一度お試しください。</translation>
+    </message>
+    <message>
+        <source>Masternode %1 not found</source>
+        <translation>マスターノード %1 が見つかりません</translation>
+    </message>
+    <message>
+        <source>Failed to sign vote for masternode %1</source>
+        <translation>マスターノード %1 の投票への署名に失敗しました</translation>
+    </message>
+    <message>
+        <source>Masternode %1: %2</source>
+        <translation>マスターノード %1: %2</translation>
+    </message>
+    <message numerus="yes">
+        <source>Voted successfully %n time(s)</source>
+        <translation><numerusform>%n 回の投票に成功しました</numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <source>Failed to vote %n time(s)</source>
+        <translation><numerusform>%n 回の投票に失敗しました</numerusform></translation>
+    </message>
+    <message>
+        <source>Errors:</source>
+        <translation>エラー：</translation>
+    </message>
+    <message>
+        <source>Voting Results</source>
+        <translation>投票結果</translation>
+    </message>
 </context>
 <context>
     <name>HelpMessageDialog</name>
@@ -1166,10 +1401,26 @@
         <source>As this is the first time the program is launched, you can choose where %1 will store its data.</source>
         <translation>これは本プログラムの最初の起動です。%1 がデータを保存する場所を選択して下さい。</translation>
     </message>
+    <message>
+        <source>Limit block chain storage to</source>
+        <translation>ブロックチェーンのストレージを制限する</translation>
+    </message>
+    <message>
+        <source>Reverting this setting requires re-downloading the entire blockchain. It is faster to download the full chain first and prune it later. Disables some advanced features.</source>
+        <translation>この設定を元に戻すには、ブロックチェーン全体を再ダウンロードする必要があります。最初にブロックチェーン全体をダウンロードし、その後で削除する方が早いです。一部の高度な機能を無効にします。</translation>
+    </message>
+    <message>
+        <source> GB</source>
+        <translation> GB</translation>
+    </message>
     <message>
         <source>This initial synchronisation is very demanding, and may expose hardware problems with your computer that had previously gone unnoticed. Each time you run %1, it will continue downloading where it left off.</source>
         <translation>この初期同期には多大なリソースを消費し、あなたのコンピュータでこれまで見つからなかったハードウェア上の問題が発生する場合があります。%1 を実行する度に、中断された時点からダウンロードを再開します。</translation>
     </message>
+    <message>
+        <source>When you click OK, %1 will begin to download and process the full %4 block chain (%2 GB) starting with the earliest transactions in %3 when %4 initially launched.</source>
+        <translation>OKをクリックすると、%4が最初にローンチされた際に、%3内の最も古い取引から始まり、%1が%4のブロックチェーン（%2GB）全体をダウンロードおよび処理します。</translation>
+    </message>
     <message>
         <source>If you have chosen to limit block chain storage (pruning), the historical data must still be downloaded and processed, but will be deleted afterward to keep your disk usage low.</source>
         <translation>ブロックチェーンの保存容量に制限を設けることを選択した場合 (剪定) にも、過去のデータのダウンロードおよび処理が必要になります。しかし、これらのデータはディスク使用量を低く抑えるために、後で削除されます。</translation>
@@ -1182,6 +1433,18 @@
         <source>Use a custom data directory:</source>
         <translation>任意のデータディレクトリを使用：</translation>
     </message>
+    <message numerus="yes">
+        <source>%n GB of space available</source>
+        <translation><numerusform>%n GB の空き容量があります</numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <source>(of %n GB needed)</source>
+        <translation><numerusform>（必要な %n GB のうち）</numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <source>(%n GB needed for full chain)</source>
+        <translation><numerusform>（完全なチェーンには %n GB が必要です）</numerusform></translation>
+    </message>
     <message>
         <source>At least %1 GB of data will be stored in this directory, and it will grow over time.</source>
         <translation>少なくとも%1GBのデータをこのディレクトリに保存する必要があります。またこのデータは時間とともに増加していきます。</translation>
@@ -1190,6 +1453,11 @@
         <source>Approximately %1 GB of data will be stored in this directory.</source>
         <translation>おおむね%1GBのデータがこのディレクトリに保存されます。</translation>
     </message>
+    <message numerus="yes">
+        <source>(sufficient to restore backups %n day(s) old)</source>
+        <extracomment>Explanatory text on the capability of the current prune target.</extracomment>
+        <translation><numerusform>(%n日前のバックアップを復元するのに十分)</numerusform></translation>
+    </message>
     <message>
         <source>%1 will download and store a copy of the Dash block chain.</source>
         <translation>%1はDashのブロックチェーンの複製をダウンロードし保存します。</translation>
@@ -1207,6 +1475,13 @@
         <translation>エラー</translation>
     </message>
 </context>
+<context>
+    <name>LoadWalletsActivity</name>
+    <message>
+        <source>Loading wallets…</source>
+        <translation>ウォレットを読み込んでいます…</translation>
+    </message>
+</context>
 <context>
     <name>MasternodeList</name>
     <message>
@@ -1241,6 +1516,10 @@
         <source>Service</source>
         <translation>サービス</translation>
     </message>
+    <message>
+        <source>Type</source>
+        <translation>タイプ</translation>
+    </message>
     <message>
         <source>PoSe Score</source>
         <translation>PoSeスコア</translation>
@@ -1376,6 +1655,10 @@
         <source>Hide</source>
         <translation>非表示</translation>
     </message>
+    <message>
+        <source>%1 is currently syncing.  It will download headers and blocks from peers and validate them until reaching the tip of the block chain.</source>
+        <translation>%1は現在同期中です。ピアからヘッダーとブロックをダウンロードし、ブロックチェーンの先端に到達するまでそれらを検証します。</translation>
+    </message>
     <message>
         <source>Unknown. Syncing Headers (%1, %2%)…</source>
         <translation>不明。ヘッダー(%1、%2%)を同期中…</translation>
@@ -1391,6 +1674,11 @@
         <source>URI:</source>
         <translation>URI:</translation>
     </message>
+    <message>
+        <source>Paste address from clipboard</source>
+        <extracomment>Tooltip text for button that allows you to paste an address that is in your clipboard.</extracomment>
+        <translation>クリップボードからアドレスを貼り付け</translation>
+    </message>
 </context>
 <context>
     <name>OpenWalletActivity</name>
@@ -1406,8 +1694,14 @@
         <source>default wallet</source>
         <translation>デフォルトのウォレット</translation>
     </message>
+    <message>
+        <source>Open Wallet</source>
+        <extracomment>Title of window indicating the progress of opening of a wallet.</extracomment>
+        <translation>ウォレットを開く</translation>
+    </message>
     <message>
         <source>Opening Wallet &lt;b&gt;%1&lt;/b&gt;…</source>
+        <extracomment>Descriptive text of the open wallet progress window which indicates to the user which wallet is currently being opened.</extracomment>
         <translation>&lt;b&gt;%1&lt;/b&gt;のウォレットを開封中…</translation>
     </message>
 </context>
@@ -1427,7 +1721,7 @@
     </message>
     <message>
         <source>Number of script &amp;verification threads</source>
-        <translation>スクリプト検証用スレッド数 (&amp;V)</translation>
+        <translation>スクリプト検証用スレッドの数 (&amp;V)</translation>
     </message>
     <message>
         <source>(0 = auto, &lt;0 = leave that many cores free)</source>
@@ -1439,7 +1733,15 @@
     </message>
     <message>
         <source>&amp;Appearance</source>
-        <translation>アピアランス(&amp;A)</translation>
+        <translation>アピアランス (&amp;A)</translation>
+    </message>
+    <message>
+        <source>Show the icon in the system tray.</source>
+        <translation>システムトレーにアイコンを表示します。</translation>
+    </message>
+    <message>
+        <source>&amp;Show tray icon</source>
+        <translation>トレーアイコンを表示 (&amp;T)</translation>
     </message>
     <message>
         <source>Prune &amp;block storage to</source>
@@ -1453,10 +1755,58 @@
         <source>Reverting this setting requires re-downloading the entire blockchain.</source>
         <translation>この設定を元に戻すには、ブロックチェーン全体を再ダウンロードする必要があります。</translation>
     </message>
+    <message>
+        <source>Maximum database cache size. A larger cache can contribute to faster sync, after which the benefit is less pronounced for most use cases. Lowering the cache size will reduce memory usage. Unused mempool memory is shared for this cache.</source>
+        <extracomment>Tooltip text for Options window setting that sets the size of the database cache. Explains the corresponding effects of increasing/decreasing this value.</extracomment>
+        <translation>データベースキャッシュのサイズが最大です。キャッシュを大きくするとより高速に同期できますが、ほとんどの使用事例ではその効果はあまり顕著ではありません。キャッシュサイズを小さくすると、メモリ使用量が減少します。未使用のメンプールのメモリは、このキャッシュと共有されます。</translation>
+    </message>
     <message>
         <source>MiB</source>
         <translation>MiB</translation>
     </message>
+    <message>
+        <source>Set the number of script verification threads. Negative values correspond to the number of cores you want to leave free to the system.</source>
+        <extracomment>Tooltip text for Options window setting that sets the number of script verification threads. Explains that negative values mean to leave these many cores free to the system.</extracomment>
+        <translation>スクリプト検証のスレッドの数を設定します。負の値は、システムに空けておきたいコアの数に相当します。</translation>
+    </message>
+    <message>
+        <source>This allows you or a third party tool to communicate with the node through command-line and JSON-RPC commands.</source>
+        <extracomment>Tooltip text for Options window setting that enables the RPC server.</extracomment>
+        <translation>これにより、お客様または第三者のツールがコマンドラインおよびJSON-RPCコマンドを通じてノードと通信できるようになります。</translation>
+    </message>
+    <message>
+        <source>Enable R&amp;PC server</source>
+        <extracomment>An Options window setting to enable the RPC server.</extracomment>
+        <translation>RPCサーバーを有効化 (&amp;R)</translation>
+    </message>
+    <message>
+        <source>Whether to set subtract fee from amount as default or not.</source>
+        <extracomment>Tooltip text for Options window setting that sets subtracting the fee from a sending amount as default.</extracomment>
+        <translation>金額から差し引く料金をデフォルトで設定するか。</translation>
+    </message>
+    <message>
+        <source>Subtract &amp;fee from amount by default</source>
+        <extracomment>An Options window setting to set subtracting the fee from a sending amount as default.</extracomment>
+        <translation>デフォルトで金額から手数料を差し引く (&amp;F)</translation>
+    </message>
+    <message>
+        <source>Enable &amp;PSBT controls</source>
+        <extracomment>An options window setting to enable PSBT controls.</extracomment>
+        <translation>PSBT コントロールを有効化(&amp;P)</translation>
+    </message>
+    <message>
+        <source>Whether to show PSBT controls.</source>
+        <extracomment>Tooltip text for options window setting that enables PSBT controls.</extracomment>
+        <translation>PSBT コントロールを表示するかどうか。</translation>
+    </message>
+    <message>
+        <source>Whether to keep the specified custom change address or not.</source>
+        <translation>指定したカスタム変更のアドレスを保存するか。</translation>
+    </message>
+    <message>
+        <source>Keep custom change &amp;address</source>
+        <translation>カスタム変更のアドレスを保存する (&amp;K)</translation>
+    </message>
     <message>
         <source>Show additional tab listing all your masternodes in first sub-tab&lt;br/&gt;and all masternodes on the network in second sub-tab.</source>
         <translation>あなたのすべてのマスターノードをリストしている追加のタブを最初のサブタブに表示し&lt;br/&gt;すべてのマスターノードを次のサブタブに表示</translation>
@@ -1511,7 +1861,15 @@
     </message>
     <message>
         <source>Enable &amp;multi-session</source>
-        <translation>マルチセッションを有効にする</translation>
+        <translation>マルチセッションを有効化する (&amp;M)</translation>
+    </message>
+    <message>
+        <source>Use this many separate masternodes in parallel to mix funds.&lt;br/&gt;Note: You must use this feature carefully.&lt;br/&gt;Make sure you always have recent wallet (auto)backup in a safe place!</source>
+        <translation>この多くの個別のマスターノードを並列で使用して資金をミキシングします。&lt;br/&gt;注意事項: この機能は慎重に使用してください。&lt;br/&gt;常に最新のウォレットの(自動)バックアップを安全な場所に保管してください。</translation>
+    </message>
+    <message>
+        <source>Parallel sessions</source>
+        <translation>パラレルセッション</translation>
     </message>
     <message>
         <source>Mixing rounds</source>
@@ -1525,13 +1883,37 @@
         <source>Target balance</source>
         <translation>対象残高</translation>
     </message>
+    <message>
+        <source>How many inputs of each denominated amount are created.&lt;br/&gt;Lower these numbers if you want fewer smaller denominations.</source>
+        <translation>各額面の金額の入力が作成された数です。&lt;br/&gt;小額のものを減らしたい場合は、この数値を下げてください。</translation>
+    </message>
+    <message>
+        <source>Inputs per denomination</source>
+        <translation>デノミネーションごとのインプット</translation>
+    </message>
+    <message>
+        <source>Try to create at least this many inputs for each denominated amount.&lt;br/&gt;Lower this number if you want fewer smaller denominations.</source>
+        <translation>各額面の金額に対して、最低でもこれだけ多くの入力を作成するようにしてください。&lt;br/&gt;小額のものを減らしたい場合は、この数値を下げてください。</translation>
+    </message>
+    <message>
+        <source>Target</source>
+        <translation>ターゲット</translation>
+    </message>
+    <message>
+        <source>Create up to this many inputs for each denominated amount.&lt;br/&gt;Lower this number if you want fewer smaller denominations.</source>
+        <translation>各額面の金額に対して、これだけ多くの入力を作成します。&lt;br/&gt;小額のものを減らしたい場合は、この数値を下げてください。</translation>
+    </message>
+    <message>
+        <source>Maximum</source>
+        <translation>最大</translation>
+    </message>
     <message>
         <source>Automatically open the Dash Core client port on the router. This only works when your router supports UPnP and it is enabled.</source>
         <translation>自動的にルーターのDash Core クライアントポートを開放します。これはルーターがUPnP機能をサポートしておりUPnP機能が有効な場合にのみ機能します。</translation>
     </message>
     <message>
         <source>Map port using NA&amp;T-PMP</source>
-        <translation>NA&amp;T-PMPを使用したマップポート</translation>
+        <translation>NAT-PMPを使用したマップポート (&amp;M)</translation>
     </message>
     <message>
         <source>Accept connections from outside.</source>
@@ -1539,7 +1921,7 @@
     </message>
     <message>
         <source>Allow incomin&amp;g connections</source>
-        <translation>受信接続を許可する</translation>
+        <translation>受信接続を許可する (&amp;I)</translation>
     </message>
     <message>
         <source>Connect to the Dash network through a SOCKS5 proxy.</source>
@@ -1547,12 +1929,26 @@
     </message>
     <message>
         <source>&amp;Connect through SOCKS5 proxy (default proxy):</source>
-        <translation>SOCKS5プロキシ（デフォルトプロキシ）経由で接続： (&amp;C)</translation>
+        <translation>SOCKS5プロキシ(デフォルトプロキシ)経由で接続: (&amp;C)</translation>
     </message>
     <message>
         <source>Shows if the supplied default SOCKS5 proxy is used to reach peers via this network type.</source>
         <translation>指定されたデフォルトのSOCKS5プロキシを使用して、このネットワークタイプ経由でピアに到達するかどうかを表示。</translation>
     </message>
+    <message>
+        <source>Language missing or translation incomplete? Help contributing translations here:
+https://explore.transifex.com/dash/dash/</source>
+        <translation>言語が抜けていたり、翻訳が不十分である場合、以下のリンクから翻訳の作成にご協力ください。
+https://explore.transifex.com/dash/dash/</translation>
+    </message>
+    <message>
+        <source>Third-party URLs (e.g. a block explorer) that appear in the transactions tab as context menu items.&lt;br/&gt;%s in the URL is replaced by transaction hash. Multiple URLs are separated by vertical bar |.</source>
+        <translation>トランザクションタブにコンテキストメニュー項目として表示されるサードパーティURL（例：ブロックエクスプローラー）。&lt;br/&gt;URLの %s はトランザクションハッシュに置き換えられます。複数のURLは縦棒 | で区切ります。</translation>
+    </message>
+    <message>
+        <source>&amp;Third-party transaction URLs</source>
+        <translation>サードパーティトランザクションURL(&amp;T)</translation>
+    </message>
     <message>
         <source>Options set in this dialog are overridden by the command line or in the configuration file:</source>
         <translation>このダイアログで設定されたオプションは、コマンドラインまたは設定ファイルによって上書きされます。</translation>
@@ -1562,16 +1958,8 @@
         <translation>ウィンドウを閉じる際にアプリケーションを終了するのではなく最小化します。このオプションが有効の場合、メニューから終了を選択した場合にのみアプリケーションは閉じられます。</translation>
     </message>
     <message>
-        <source>Third party URLs (e.g. a block explorer) that appear in the transactions tab as context menu items.&lt;br/&gt;%s in the URL is replaced by transaction hash. Multiple URLs are separated by vertical bar |.</source>
-        <translation>メニューアイテムとしてトランザクションタブに表示されるサードパーティのURL (例 ブロックエクスプローラー) :&lt;br/&gt;%s はトランザクションハッシュに置き換えられます。複数のURLは"|"によって区切られます。</translation>
-    </message>
-    <message>
-        <source>&amp;Third party transaction URLs</source>
-        <translation>サードパーティのトランザクションURL(&amp;T)</translation>
-    </message>
-    <message>
-        <source>Whether to show coin control features or not.</source>
-        <translation>コインコントロール機能の表示／非表示</translation>
+        <source>Whether to show coin control features or not.</source>
+        <translation>コインコントロール機能の表示／非表示</translation>
     </message>
     <message>
         <source>Automatically start %1 after logging in to the system.</source>
@@ -1579,15 +1967,15 @@
     </message>
     <message>
         <source>&amp;Start %1 on system login</source>
-        <translation>システムログイン時に %1 を起動 (&amp;S)</translation>
+        <translation>システムログイン時に%1を起動する (&amp;S)</translation>
     </message>
     <message>
         <source>Enable coin &amp;control features</source>
-        <translation>コインコントロール機能を有効化 (&amp;C)</translation>
+        <translation>コインコントロール機能を有効化する (&amp;C)</translation>
     </message>
     <message>
         <source>&amp;Spend unconfirmed change</source>
-        <translation>未検証のチェンジを使用 (&amp;S)</translation>
+        <translation>未検証の通貨を使用する (&amp;S)</translation>
     </message>
     <message>
         <source>This setting determines the amount of individual masternodes that an input will be mixed through.&lt;br/&gt;More rounds of mixing gives a higher degree of privacy, but also costs more in fees.</source>
@@ -1603,11 +1991,15 @@
     </message>
     <message>
         <source>Map port using &amp;UPnP</source>
-        <translation>UPnPを使ってポートを割り当て (&amp;U)</translation>
+        <translation>UPnPを使ってポートを割り当てる (&amp;U)</translation>
+    </message>
+    <message>
+        <source>Automatically open the Dash Core client port on the router. This only works when your router supports NAT-PMP and it is enabled. The external port could be random.</source>
+        <translation>ルーター上でDashコアのクライアントポートを自動的に開きます。これは、ルーターがNAT-PMPをサポートしており、有効になっている場合にのみ機能します。外部ポートはランダムになる可能性があります。</translation>
     </message>
     <message>
         <source>Proxy &amp;IP:</source>
-        <translation>プロキシの IP：(&amp;I) </translation>
+        <translation>プロキシのIP: (&amp;I)</translation>
     </message>
     <message>
         <source>IP address of the proxy (e.g. IPv4: 127.0.0.1 / IPv6: ::1)</source>
@@ -1615,7 +2007,7 @@
     </message>
     <message>
         <source>&amp;Port:</source>
-        <translation>ポート ：(&amp;P)</translation>
+        <translation>ポート: (&amp;P)</translation>
     </message>
     <message>
         <source>Port of the proxy (e.g. 9050)</source>
@@ -1643,7 +2035,7 @@
     </message>
     <message>
         <source>&amp;Minimize to the tray instead of the taskbar</source>
-        <translation>タスクバーの代わりにトレイに最小化 (&amp;M)</translation>
+        <translation>タスクバーの代わりにトレーに最小化 (&amp;M)</translation>
     </message>
     <message>
         <source>M&amp;inimize on close</source>
@@ -1653,9 +2045,17 @@
         <source>&amp;Display</source>
         <translation>表示 (&amp;D)</translation>
     </message>
+    <message>
+        <source>Connect to the Dash network through a separate SOCKS5 proxy for Tor onion services.</source>
+        <translation>Torオニオンサービス用の個別のSOCKS5プロキシを経由して、Dashネットワークに接続します。</translation>
+    </message>
+    <message>
+        <source>Use separate SOCKS&amp;5 proxy to reach peers via Tor onion services:</source>
+        <translation>別個のSOCKS5プロキシを使用して、Torオニオンサービス経由でピアに接続: (&amp;S)</translation>
+    </message>
     <message>
         <source>User Interface &amp;language:</source>
-        <translation>ユーザインターフェースの言語 ：(&amp;L)</translation>
+        <translation>ユーザーインターフェースの言語: (&amp;L)</translation>
     </message>
     <message>
         <source>The user interface language can be set here. This setting will take effect after restarting %1.</source>
@@ -1663,7 +2063,7 @@
     </message>
     <message>
         <source>&amp;Unit to show amounts in:</source>
-        <translation>表示する単位 ：(&amp;U)</translation>
+        <translation>表示する通貨単位: (&amp;U)</translation>
     </message>
     <message>
         <source>Choose the default subdivision unit to show in the interface and when sending coins.</source>
@@ -1683,7 +2083,7 @@
     </message>
     <message>
         <source>&amp;OK</source>
-        <translation>OK(&amp;O)</translation>
+        <translation>OK (&amp;O)</translation>
     </message>
     <message>
         <source>&amp;Cancel</source>
@@ -1699,14 +2099,22 @@
     </message>
     <message>
         <source>Confirm options reset</source>
+        <extracomment>Window title text of pop-up window shown when the user has chosen to reset options.</extracomment>
         <translation>オプションのリセットの確認</translation>
     </message>
     <message>
         <source>Client restart required to activate changes.</source>
+        <extracomment>Text explaining that the settings changed will not come into effect until the client is restarted.</extracomment>
         <translation>変更を有効にするにはクライアントを再起動する必要があります。</translation>
     </message>
+    <message>
+        <source>Current settings will be backed up at "%1".</source>
+        <extracomment>Text explaining to the user that the client's current settings will be backed up at a specific location. %1 is a stand-in argument for the backup location's path.</extracomment>
+        <translation>現在の設定は「%1」にバックアップされます。</translation>
+    </message>
     <message>
         <source>Client will be shut down. Do you want to proceed?</source>
+        <extracomment>Text asking the user to confirm if they would like to proceed with a client shutdown.</extracomment>
         <translation>クライアントを終了します。続行してもよろしいですか？</translation>
     </message>
     <message>
@@ -1844,6 +2252,10 @@
         <source>%1 Balance</source>
         <translation>%1の残額</translation>
     </message>
+    <message>
+        <source>Discreet mode activated for the Overview tab. To unmask the values, uncheck Settings-&gt;Discreet mode.</source>
+        <translation>概要タブでDiscreetモードが有効になっています。値のマスキングを解除するには、設定-&gt;Discreetモードのチェックを外します。</translation>
+    </message>
     <message numerus="yes">
         <source>%n Rounds</source>
         <translation><numerusform>%n ラウンド</numerusform></translation>
@@ -1943,7 +2355,140 @@
 </context>
 <context>
     <name>PSBTOperationsDialog</name>
-    </context>
+    <message>
+        <source>Dialog</source>
+        <translation>ダイアログ</translation>
+    </message>
+    <message>
+        <source>Sign Tx</source>
+        <translation>取引に署名</translation>
+    </message>
+    <message>
+        <source>Broadcast Tx</source>
+        <translation>取引を送信</translation>
+    </message>
+    <message>
+        <source>Copy to Clipboard</source>
+        <translation>クリップボードにコピー</translation>
+    </message>
+    <message>
+        <source>Save…</source>
+        <translation>保存中...</translation>
+    </message>
+    <message>
+        <source>Close</source>
+        <translation>閉じる</translation>
+    </message>
+    <message>
+        <source>Failed to load transaction: %1</source>
+        <translation>取引のロードに失敗しました: %1</translation>
+    </message>
+    <message>
+        <source>Failed to sign transaction: %1</source>
+        <translation>取引の署名に失敗しました: %1</translation>
+    </message>
+    <message>
+        <source>Cannot sign inputs while wallet is locked.</source>
+        <translation>ウォレットがロックされていると、インプットに署名できません。</translation>
+    </message>
+    <message>
+        <source>Could not sign any more inputs.</source>
+        <translation>これ以上のインプットに署名できませんでした。</translation>
+    </message>
+    <message>
+        <source>Signed %1 inputs, but more signatures are still required.</source>
+        <translation>%1のインプットに署名しましたが、その他の署名も必要です。</translation>
+    </message>
+    <message>
+        <source>Signed transaction successfully. Transaction is ready to broadcast.</source>
+        <translation>取引に正常に署名しました。取引を送信できます。</translation>
+    </message>
+    <message>
+        <source>Unknown error processing transaction.</source>
+        <translation>取引の処理中に、不明なエラーが発生しました。</translation>
+    </message>
+    <message>
+        <source>Transaction broadcast successfully! Transaction ID: %1</source>
+        <translation>取引を正常に送信しました。取引ID: %1</translation>
+    </message>
+    <message>
+        <source>Transaction broadcast failed: %1</source>
+        <translation>取引の送信に失敗しました: %1</translation>
+    </message>
+    <message>
+        <source>PSBT copied to clipboard.</source>
+        <translation>PSBTをクリップボードにコピーしました。</translation>
+    </message>
+    <message>
+        <source>Save Transaction Data</source>
+        <translation>取引データを保存</translation>
+    </message>
+    <message>
+        <source>Partially Signed Transaction (Binary)</source>
+        <extracomment>Expanded name of the binary PSBT file format. See: BIP 174.</extracomment>
+        <translation>一部署名された取引 (バイナリー)</translation>
+    </message>
+    <message>
+        <source>PSBT saved to disk.</source>
+        <translation>PSBTをディスクに保存しました。</translation>
+    </message>
+    <message>
+        <source> * Sends %1 to %2</source>
+        <translation>*%1を%2に送金する</translation>
+    </message>
+    <message>
+        <source>own address</source>
+        <translation>自分のアドレス</translation>
+    </message>
+    <message>
+        <source>Unable to calculate transaction fee or total transaction amount.</source>
+        <translation>取引手数料または取引総額を計算できません。</translation>
+    </message>
+    <message>
+        <source>Pays transaction fee: </source>
+        <translation>取引手数料を支払う:</translation>
+    </message>
+    <message>
+        <source>Total Amount</source>
+        <translation>総額</translation>
+    </message>
+    <message>
+        <source>or</source>
+        <translation>または</translation>
+    </message>
+    <message>
+        <source>Transaction has %1 unsigned inputs.</source>
+        <translation>取引には、%1の未署名のインプットがあります。</translation>
+    </message>
+    <message>
+        <source>Transaction is missing some information about inputs.</source>
+        <translation>取引には、インプットに関する情報が一部不足しています。</translation>
+    </message>
+    <message>
+        <source>Transaction still needs signature(s).</source>
+        <translation>取引にはさらに署名が必要です。</translation>
+    </message>
+    <message>
+        <source>(But no wallet is loaded.)</source>
+        <translation>(しかし、ウォレットがロードされていません。)</translation>
+    </message>
+    <message>
+        <source>(But this wallet cannot sign transactions.)</source>
+        <translation>(しかし、このウォレットでは取引に署名できません。)</translation>
+    </message>
+    <message>
+        <source>(But this wallet does not have the right keys.)</source>
+        <translation>(しかし、このウォレットには正しいキーがありません。)</translation>
+    </message>
+    <message>
+        <source>Transaction is fully signed and ready for broadcast.</source>
+        <translation>取引は全て署名済みで、送信できます。</translation>
+    </message>
+    <message>
+        <source>Transaction status is unknown.</source>
+        <translation>取引ステータスは不明です。</translation>
+    </message>
+</context>
 <context>
     <name>PaymentServer</name>
     <message>
@@ -1962,6 +2507,12 @@
         <source>'dash://' is not a valid URI. Use 'dash:' instead.</source>
         <translation>「dash://」は有効なURIではありません。代わりに「dash:」を使ってください。</translation>
     </message>
+    <message>
+        <source>Cannot process payment request as BIP70 is no longer supported.
+Due to discontinued support, you should request the merchant to provide you with a BIP21 compatible URI or use a wallet that does continue to support BIP70.</source>
+        <translation>BIP70がもうサポートされていないため、支払いリクエストを処理できません。
+サポートが終了したため、BIP21対応のURIを提示するよう販売者に要請するか、BIP70のサポートを継続しているウォレットを使用してください。</translation>
+    </message>
     <message>
         <source>URI cannot be parsed! This can be caused by an invalid Dash address or malformed URI parameters.</source>
         <translation>URI を解析できません! これは無効な Dash アドレスあるいは不正な形式の URI パラメーターによって引き起こされた可能性があります。</translation>
@@ -1983,6 +2534,26 @@
         <extracomment>Title of Peers Table column which indicates the current latency of the connection with the peer.</extracomment>
         <translation>Ping</translation>
     </message>
+    <message>
+        <source>Peer</source>
+        <extracomment>Title of Peers Table column which contains a unique number used to identify a connection.</extracomment>
+        <translation>ピア</translation>
+    </message>
+    <message>
+        <source>Age</source>
+        <extracomment>Title of Peers Table column which indicates the duration (length of time) since the peer connection started.</extracomment>
+        <translation>エイジ</translation>
+    </message>
+    <message>
+        <source>Direction</source>
+        <extracomment>Title of Peers Table column which indicates the direction the peer connection was initiated from.</extracomment>
+        <translation>動向</translation>
+    </message>
+    <message>
+        <source>Type</source>
+        <extracomment>Title of Peers Table column which describes the type of peer connection. The "type" describes why the connection exists.</extracomment>
+        <translation>タイプ</translation>
+    </message>
     <message>
         <source>Sent</source>
         <extracomment>Title of Peers Table column which indicates the total amount of network information we have sent to the peer.</extracomment>
@@ -1993,7 +2564,27 @@
         <extracomment>Title of Peers Table column which indicates the total amount of network information we have received from the peer.</extracomment>
         <translation>受け取りました</translation>
     </message>
-    </context>
+    <message>
+        <source>Address</source>
+        <extracomment>Title of Peers Table column which contains the IP/Onion/I2P address of the connected peer.</extracomment>
+        <translation>アドレス</translation>
+    </message>
+    <message>
+        <source>Network</source>
+        <extracomment>Title of Peers Table column which states the network the peer connected through.</extracomment>
+        <translation>ネットワーク</translation>
+    </message>
+    <message>
+        <source>Inbound</source>
+        <extracomment>An Inbound Connection from a Peer.</extracomment>
+        <translation>インバウンド</translation>
+    </message>
+    <message>
+        <source>Outbound</source>
+        <extracomment>An Outbound Connection to a Peer.</extracomment>
+        <translation>アウトバウンド</translation>
+    </message>
+</context>
 <context>
     <name>Proposal</name>
     <message>
@@ -2044,8 +2635,193 @@
         <translation>ステータス</translation>
     </message>
 </context>
+<context>
+    <name>ProposalWizard</name>
+    <message>
+        <source>Create Governance Proposal</source>
+        <translation>ガバナンス提案を作成</translation>
+    </message>
+    <message>
+        <source>Enter proposal details</source>
+        <translation>提案の詳細を入力</translation>
+    </message>
+    <message>
+        <source>A fee will be burned when you prepare the proposal.</source>
+        <translation>提案を準備する際に手数料がバーン（焼却）されます。</translation>
+    </message>
+    <message>
+        <source>Proposal &amp;name</source>
+        <translation>提案名(&amp;N)</translation>
+    </message>
+    <message>
+        <source>&amp;Description URL</source>
+        <translation>説明 URL(&amp;D)</translation>
+    </message>
+    <message>
+        <source>Payment &amp;address</source>
+        <translation>支払アドレス(&amp;A)</translation>
+    </message>
+    <message>
+        <source>Payment &amp;amount</source>
+        <translation>支払金額(&amp;A)</translation>
+    </message>
+    <message>
+        <source>The amount to request in a single payment</source>
+        <translation>1回の支払いで要求する金額</translation>
+    </message>
+    <message>
+        <source>&amp;First payment</source>
+        <translation>初回支払(&amp;F)</translation>
+    </message>
+    <message>
+        <source>Pa&amp;yments</source>
+        <translation>支払回数(&amp;Y)</translation>
+    </message>
+    <message>
+        <source>To&amp;tal amount</source>
+        <translation>合計金額(&amp;T)</translation>
+    </message>
+    <message>
+        <source>Proposal &amp;fee</source>
+        <translation>提案手数料(&amp;F)</translation>
+    </message>
+    <message>
+        <source>Next</source>
+        <translation>次へ</translation>
+    </message>
+    <message>
+        <source>Review proposal JSON and validate.</source>
+        <translation>提案JSONを確認して検証します。</translation>
+    </message>
+    <message>
+        <source>Hex-encoded JSON</source>
+        <translation>16進数エンコードされたJSON</translation>
+    </message>
+    <message>
+        <source>Back</source>
+        <translation>戻る</translation>
+    </message>
+    <message>
+        <source>Validate</source>
+        <translation>検証</translation>
+    </message>
+    <message>
+        <source>Prepare (burn fee) and wait for confirmations.</source>
+        <translation>準備（手数料をバーン）して承認を待ちます。</translation>
+    </message>
+    <message>
+        <source>Copy</source>
+        <translation>コピー</translation>
+    </message>
+    <message>
+        <source>At 1/6 confirmations: can be relayed and queued. At 6/6: accepted and processed.</source>
+        <translation>1/6承認時：リレーおよびキュー可能。6/6時：承認され処理されます。</translation>
+    </message>
+    <message>
+        <source>Confirmations progress</source>
+        <translation>承認の進行状況</translation>
+    </message>
+    <message>
+        <source>Shows progress toward the required number of confirmations for the proposal fee transaction.</source>
+        <translation>提案手数料トランザクションに必要な承認数への進行状況を表示します。</translation>
+    </message>
+    <message>
+        <source>Estimated time remaining: -</source>
+        <translation>推定残り時間: -</translation>
+    </message>
+    <message>
+        <source>Prepare Proposal</source>
+        <translation>提案を準備</translation>
+    </message>
+    <message>
+        <source>You can submit after 1 confirmation. At 6 confirmations it is accepted and processed.</source>
+        <translation>1承認後に提出できます。6承認で承認され処理されます。</translation>
+    </message>
+    <message>
+        <source>Proposal ID:</source>
+        <translation>提案 ID:</translation>
+    </message>
+    <message>
+        <source>Submit Proposal</source>
+        <translation>提案を提出</translation>
+    </message>
+    <message>
+        <source>Close</source>
+        <translation>閉じる</translation>
+    </message>
+    <message>
+        <source>Valid</source>
+        <translation>有効</translation>
+    </message>
+    <message>
+        <source>Invalid: %1</source>
+        <translation>無効: %1</translation>
+    </message>
+    <message>
+        <source>Burn %1</source>
+        <translation>%1 をバーン</translation>
+    </message>
+    <message>
+        <source>Burn %1 to create the fee transaction?</source>
+        <translation>手数料トランザクションを作成するために %1 をバーンしますか？</translation>
+    </message>
+    <message>
+        <source>Prepare failed</source>
+        <translation>準備に失敗しました</translation>
+    </message>
+    <message>
+        <source>Confirmations: %1 / %2 required</source>
+        <translation>承認: %1 / %2 必要</translation>
+    </message>
+    <message>
+        <source>Estimated time remaining: Ready</source>
+        <translation>推定残り時間: 準備完了</translation>
+    </message>
+    <message numerus="yes">
+        <source>Estimated time remaining: %n minute(s)</source>
+        <translation><numerusform>推定残り時間: %n 分</numerusform></translation>
+    </message>
+    <message>
+        <source>Your proposal was submitted successfully.</source>
+        <translation>提案が正常に提出されました。</translation>
+    </message>
+    <message>
+        <source>Already submitted</source>
+        <translation>すでに提出済み</translation>
+    </message>
+    <message>
+        <source>This proposal has already been submitted.</source>
+        <translation>この提案はすでに提出されています。</translation>
+    </message>
+    <message>
+        <source>Submission failed</source>
+        <translation>提出に失敗しました</translation>
+    </message>
+    <message>
+        <source>Proposal submitted</source>
+        <translation>提案が提出されました</translation>
+    </message>
+    <message>
+        <source>A fee of %1 will be burned when you prepare the proposal.</source>
+        <translation>提案を準備する際に %1 の手数料がバーンされます。</translation>
+    </message>
+    <message>
+        <source>Prepare (burn %1) and wait for %2 confirmations.</source>
+        <translation>準備（%1 をバーン）して %2 承認を待ちます。</translation>
+    </message>
+</context>
 <context>
     <name>QObject</name>
+    <message>
+        <source>Do you want to reset settings to default values, or to abort without making changes?</source>
+        <extracomment>Explanatory text shown on startup when the settings file cannot be read. Prompts user to make a choice between resetting or aborting.</extracomment>
+        <translation>設定をデフォルト値にリセットしますか、それとも変更せずに中止しますか。</translation>
+    </message>
+    <message>
+        <source>A fatal error occurred. Check that settings file is writable, or try running with -nosettings.</source>
+        <extracomment>Explanatory text shown on startup when the settings file could not be written. Prompts user to check that we have the ability to write to the file. Explains that the user has the option of running without a settings file.</extracomment>
+        <translation>重大なエラーが発生しました。設定ファイルが書き込み可能なことを確認するか、-nosettingsを追記して実行してください。</translation>
+    </message>
     <message>
         <source>Choose data directory on startup (default: %u)</source>
         <translation>起動時にデータディレクトリを選択する（デフォルト：%u）</translation>
@@ -2146,6 +2922,53 @@
         <source>This can also be adjusted later in the "Appearance" tab of the preferences.</source>
         <translation>これは、初期設定の「表示」タブで後で調整することも可能です。</translation>
     </message>
+    <message>
+        <source>Ctrl+W</source>
+        <translation>Ctrl+W</translation>
+    </message>
+    <message>
+        <source>Unroutable</source>
+        <translation>ルート化不可</translation>
+    </message>
+    <message>
+        <source>Internal</source>
+        <translation>内部</translation>
+    </message>
+    <message>
+        <source>Inbound</source>
+        <extracomment>An inbound connection from a peer. An inbound connection is a connection initiated by a peer.</extracomment>
+        <translation>インバウンド</translation>
+    </message>
+    <message>
+        <source>Outbound</source>
+        <extracomment>An outbound connection to a peer. An outbound connection is a connection initiated by us.</extracomment>
+        <translation>アウトバウンド</translation>
+    </message>
+    <message>
+        <source>Full Relay</source>
+        <extracomment>Peer connection type that relays all network information.</extracomment>
+        <translation>フルリレー</translation>
+    </message>
+    <message>
+        <source>Block Relay</source>
+        <extracomment>Peer connection type that relays network information about blocks and not transactions or addresses.</extracomment>
+        <translation>ブロックリレー</translation>
+    </message>
+    <message>
+        <source>Manual</source>
+        <extracomment>Peer connection type established manually through one of several methods.</extracomment>
+        <translation>マニュアル</translation>
+    </message>
+    <message>
+        <source>Feeler</source>
+        <extracomment>Short-lived peer connection type that tests the aliveness of known addresses.</extracomment>
+        <translation>フィーラー</translation>
+    </message>
+    <message>
+        <source>Address Fetch</source>
+        <extracomment>Short-lived peer connection type that solicits known addresses from a peer.</extracomment>
+        <translation>アドレスフェッチ</translation>
+    </message>
     <message>
         <source>%1 d</source>
         <translation>%1日</translation>
@@ -2207,8 +3030,8 @@
         <translation>%1 B</translation>
     </message>
     <message>
-        <source>%1 KB</source>
-        <translation>%1 KB</translation>
+        <source>%1 kB</source>
+        <translation>%1 kB</translation>
     </message>
     <message>
         <source>%1 MB</source>
@@ -2235,18 +3058,18 @@
     </message>
     <message>
         <source>&amp;Save Image…</source>
-        <translation>画像を保存…(&amp;S)</translation>
+        <translation>画像を保存する… (&amp;S)</translation>
     </message>
 </context>
 <context>
     <name>QRImageWidget</name>
     <message>
         <source>&amp;Save Image…</source>
-        <translation>画像を保存… (&amp;S)</translation>
+        <translation>画像を保存する… (&amp;S)</translation>
     </message>
     <message>
         <source>&amp;Copy Image</source>
-        <translation>画像をコピー(&amp;C)</translation>
+        <translation>画像をコピー (&amp;C)</translation>
     </message>
     <message>
         <source>Resulting URI too long, try to reduce the text for label / message.</source>
@@ -2264,7 +3087,12 @@
         <source>Save QR Code</source>
         <translation>QR コードの保存</translation>
     </message>
-    </context>
+    <message>
+        <source>PNG Image</source>
+        <extracomment>Expanded name of the PNG file format. See: https://en.wikipedia.org/wiki/Portable_Network_Graphics.</extracomment>
+        <translation>PNG画像</translation>
+    </message>
+</context>
 <context>
     <name>RPCConsole</name>
     <message>
@@ -2371,6 +3199,14 @@
         <source>Version</source>
         <translation>バージョン</translation>
     </message>
+    <message>
+        <source>High bandwidth BIP152 compact block relay: %1</source>
+        <translation>高帯域幅BIP152のコンパクトブロックリレー: %1</translation>
+    </message>
+    <message>
+        <source>High Bandwidth</source>
+        <translation>高帯域幅</translation>
+    </message>
     <message>
         <source>Starting Block</source>
         <translation>開始ブロック</translation>
@@ -2383,6 +3219,51 @@
         <source>Synced Blocks</source>
         <translation>同期済みブロック</translation>
     </message>
+    <message>
+        <source>Elapsed time since a novel block passing initial validity checks was received from this peer.</source>
+        <translation>新規ブロックが初期の有効性チェックをクリアした後に、このピアから受信した経過時間。</translation>
+    </message>
+    <message>
+        <source>Last Block</source>
+        <translation>最後のブロック</translation>
+    </message>
+    <message>
+        <source>Elapsed time since a novel transaction accepted into our mempool was received from this peer.</source>
+        <extracomment>Tooltip text for the Last Transaction field in the peer details area.</extracomment>
+        <translation>新規取引がメンプールで承認された後に、このピアから受信した経過時間</translation>
+    </message>
+    <message>
+        <source>Last Transaction</source>
+        <translation>前回の取引</translation>
+    </message>
+    <message>
+        <source>The mapped Autonomous System used for diversifying peer selection.</source>
+        <translation>マッピングされた自律システムは、ピア選択の分散化に使用されます。</translation>
+    </message>
+    <message>
+        <source>Mapped AS</source>
+        <translation>マッピングされた自律システム</translation>
+    </message>
+    <message>
+        <source>Whether we relay addresses to this peer.</source>
+        <extracomment>Tooltip text for the Address Relay field in the peer details area, which displays whether we relay addresses to this peer (Yes/No).</extracomment>
+        <translation>このピアにアドレスをリレーするか。</translation>
+    </message>
+    <message>
+        <source>Address Relay</source>
+        <extracomment>Text title for the Address Relay field in the peer details area, which displays whether we relay addresses to this peer (Yes/No).</extracomment>
+        <translation>アドレスリレー</translation>
+    </message>
+    <message>
+        <source>Addresses Processed</source>
+        <extracomment>Text title for the Addresses Processed field in the peer details area, which displays the total number of addresses received from this peer that were processed (excludes addresses that were dropped due to rate-limiting).</extracomment>
+        <translation>アドレスが処理されました</translation>
+    </message>
+    <message>
+        <source>Addresses Rate-Limited</source>
+        <extracomment>Text title for the Addresses Rate-Limited field in the peer details area, which displays the total number of addresses received from this peer that were dropped (not processed) due to rate-limiting.</extracomment>
+        <translation>アドレスはレートで制限されました</translation>
+    </message>
     <message>
         <source>Rescan blockchain files 1</source>
         <translation>ブロックチェーンファイル1の再スキャンをする</translation>
@@ -2423,6 +3304,22 @@
         <source>To specify a non-default location of the blocks directory use the '%1' option.</source>
         <translation>ブロックディレクトリのデフォルトでない場所を指定するには、「%1」のオプションを使用します。</translation>
     </message>
+    <message>
+        <source>Local Addresses</source>
+        <translation>ローカルアドレス</translation>
+    </message>
+    <message>
+        <source>Network addresses that your Dash node is currently using to communicate with other nodes.</source>
+        <translation>あなたの Dash ノードが他のノードとの通信に現在使用しているネットワークアドレス。</translation>
+    </message>
+    <message>
+        <source>Number of regular Masternodes</source>
+        <translation>レギュラーマスターノードの数</translation>
+    </message>
+    <message>
+        <source>Number of EvoNodes</source>
+        <translation>Evoノードの数</translation>
+    </message>
     <message>
         <source>Current block height</source>
         <translation>現在のブロックの高さ</translation>
@@ -2461,20 +3358,60 @@
     </message>
     <message>
         <source>&amp;Reset</source>
-        <translation>&amp;リセット</translation>
+        <translation>リセット (&amp;R)</translation>
     </message>
     <message>
         <source>Node Type</source>
-        <translation>ノードの種類</translation>
+        <translation>ノードのタイプ</translation>
     </message>
     <message>
         <source>PoSe Score</source>
         <translation>PoSeスコア</translation>
     </message>
+    <message>
+        <source>The transport layer version: %1</source>
+        <translation>トランスポートレイヤーのバージョン: %1</translation>
+    </message>
+    <message>
+        <source>Transport</source>
+        <translation>トランスポート</translation>
+    </message>
+    <message>
+        <source>The BIP324 session ID string in hex.</source>
+        <translation>BIP324のセッションIDの文字列(16進数)。</translation>
+    </message>
+    <message>
+        <source>Session ID</source>
+        <translation>セッションID</translation>
+    </message>
+    <message>
+        <source>The network protocol this peer is connected through: IPv4, IPv6, Onion, I2P, or CJDNS.</source>
+        <translation>このピアが接続しているネットワークプロトコル: IPv4、IPv6、Onion、I2P、またはCJDNS。</translation>
+    </message>
+    <message>
+        <source>Permissions</source>
+        <translation>許可</translation>
+    </message>
+    <message>
+        <source>The direction and type of peer connection: %1</source>
+        <translation>ピア接続の動向とタイプ: %1</translation>
+    </message>
+    <message>
+        <source>Direction/Type</source>
+        <translation>動向/タイプ</translation>
+    </message>
     <message>
         <source>Services</source>
         <translation>サービス</translation>
     </message>
+    <message>
+        <source>Whether we relay transactions to this peer.</source>
+        <translation>このピアにトランザクションをリレーするかどうか。</translation>
+    </message>
+    <message>
+        <source>Transaction Relay</source>
+        <translation>トランザクションリレー</translation>
+    </message>
     <message>
         <source>Connection Time</source>
         <translation>接続時間</translation>
@@ -2509,7 +3446,17 @@
     </message>
     <message>
         <source>&amp;Wallet Repair</source>
-        <translation>ウォレット修復（&amp;W)</translation>
+        <translation>ウォレットの修復 (&amp;W)</translation>
+    </message>
+    <message>
+        <source>The total number of addresses received from this peer that were processed (excludes addresses that were dropped due to rate-limiting).</source>
+        <extracomment>Tooltip text for the Addresses Processed field in the peer details area, which displays the total number of addresses received from this peer that were processed (excludes addresses that were dropped due to rate-limiting).</extracomment>
+        <translation>このピアから受信したアドレスのうち、処理されたアドレスの総数(レート制限によりドロップされたアドレスは除く)。</translation>
+    </message>
+    <message>
+        <source>The total number of addresses received from this peer that were dropped (not processed) due to rate-limiting.</source>
+        <extracomment>Tooltip text for the Addresses Rate-Limited field in the peer details area, which displays the total number of addresses received from this peer that were dropped (not processed) due to rate-limiting.</extracomment>
+        <translation>このピアから受信したアドレスのうち、レート制限によりドロップされた(処理されなかった)アドレスの総数。</translation>
     </message>
     <message>
         <source>Wallet repair options.</source>
@@ -2524,52 +3471,82 @@
         <translation>-reindex: 現在の blk000??.dat ファイルからブロックチェーンインデックスをリビルドします</translation>
     </message>
     <message>
-        <source>&amp;Disconnect</source>
-        <translation>切断 (&amp;D)</translation>
+        <source>Inbound: initiated by peer</source>
+        <extracomment>Explanatory text for an inbound peer connection.</extracomment>
+        <translation>インバウンド: ピアから発信</translation>
     </message>
     <message>
-        <source>Ban for</source>
-        <translation>Banする:</translation>
+        <source>Outbound Full Relay: default</source>
+        <extracomment>Explanatory text for an outbound peer connection that relays all network information. This is the default behavior for outbound connections.</extracomment>
+        <translation>アウトバウンドのフルリレー: デフォルト</translation>
     </message>
     <message>
-        <source>1 &amp;hour</source>
-        <translation>1時間 (&amp;H)</translation>
+        <source>Outbound Block Relay: does not relay transactions or addresses</source>
+        <extracomment>Explanatory text for an outbound peer connection that relays network information about blocks and not transactions or addresses.</extracomment>
+        <translation>アウトバウンドのブロックリレー: 取引やアドレスをリレーしない</translation>
     </message>
     <message>
-        <source>1 &amp;day</source>
-        <translation>1日 (&amp;D)</translation>
+        <source>Outbound Manual: added using RPC %1 or %2/%3 configuration options</source>
+        <extracomment>Explanatory text for an outbound peer connection that was established manually through one of several methods. The numbered arguments are stand-ins for the methods available to establish manual connections.</extracomment>
+        <translation>アウトバウンドのマニュアル: RPCの%1または%2と%3の構成オプションを使用して追加</translation>
     </message>
     <message>
-        <source>1 &amp;week</source>
-        <translation>1週間 (&amp;W)</translation>
+        <source>Outbound Feeler: short-lived, for testing addresses</source>
+        <extracomment>Explanatory text for a short-lived outbound peer connection that is used to test the aliveness of known addresses.</extracomment>
+        <translation>アウトバウンドのフィーラー: 一過性のもの、アドレスのテスト用</translation>
     </message>
     <message>
-        <source>1 &amp;year</source>
-        <translation>1年 (&amp;Y)</translation>
+        <source>Outbound Address Fetch: short-lived, for soliciting addresses</source>
+        <extracomment>Explanatory text for a short-lived outbound peer connection that is used to request addresses from a peer.</extracomment>
+        <translation>アウトバウンドのアドレスフェッチ: 一過性のもの、アドレスの勧誘用</translation>
     </message>
     <message>
-        <source>&amp;Unban</source>
-        <translation>Banを解除する (&amp;U)</translation>
+        <source>To</source>
+        <translation>に</translation>
+    </message>
+    <message>
+        <source>we selected the peer for high bandwidth relay</source>
+        <translation>高帯域幅のリレー用にピアを選択しました</translation>
+    </message>
+    <message>
+        <source>From</source>
+        <translation>から</translation>
+    </message>
+    <message>
+        <source>the peer selected us for high bandwidth relay</source>
+        <translation>高帯域幅のリレー用に選択されたピア</translation>
+    </message>
+    <message>
+        <source>No</source>
+        <translation>いいえ</translation>
     </message>
     <message>
-        <source>Welcome to the %1 RPC console.</source>
-        <translation>%1 RPCコンソールへようこそ。</translation>
+        <source>no high bandwidth relay selected</source>
+        <translation>高帯域幅のリレーが選択されていません</translation>
     </message>
     <message>
-        <source>Use up and down arrows to navigate history, and %1 to clear screen.</source>
-        <translation>上下の矢印を使用して履歴をナビゲートし、 %1 を使用して画面をクリアします。</translation>
+        <source>&amp;Disconnect</source>
+        <translation>切断する (&amp;D)</translation>
     </message>
     <message>
-        <source>Type %1 for an overview of available commands.</source>
-        <translation>利用可能なコマンドの概要については、%1と入力してください。</translation>
+        <source>Ban for</source>
+        <translation>Banする:</translation>
     </message>
     <message>
-        <source>For more information on using this console type %1.</source>
-        <translation>このコンソールの使用に関する詳細は、%1と入力してください。</translation>
+        <source>1 &amp;hour</source>
+        <translation>1時間 (&amp;H)</translation>
     </message>
     <message>
-        <source>WARNING: Scammers have been active, telling users to type commands here, stealing their wallet contents. Do not use this console without fully understanding the ramifications of a command.</source>
-        <translation>警告：詐欺師は常にアクティブであり、ユーザーにここへのコマンドを入力させ、ウォレットの中身を盗みます。 コマンドの影響を完全に理解せずにこのコンソールを使用しないでください。</translation>
+        <source>1 &amp;week</source>
+        <translation>1週間 (&amp;W)</translation>
+    </message>
+    <message>
+        <source>1 &amp;year</source>
+        <translation>1年 (&amp;Y)</translation>
+    </message>
+    <message>
+        <source>&amp;Unban</source>
+        <translation>Banを解除する (&amp;U)</translation>
     </message>
     <message>
         <source>In:</source>
@@ -2583,6 +3560,10 @@
         <source>Network activity disabled</source>
         <translation>ネットワーク活動は無効化されました</translation>
     </message>
+    <message>
+        <source>None</source>
+        <translation>なし</translation>
+    </message>
     <message>
         <source>Total: %1 (Enabled: %2)</source>
         <translation>合計: %1 (有効: %2)</translation>
@@ -2591,10 +3572,105 @@
         <source>Executing command without any wallet</source>
         <translation>ウォレットなしでコマンドを実行する</translation>
     </message>
+    <message>
+        <source>Ctrl++</source>
+        <extracomment>Main shortcut to increase the RPC console font size.</extracomment>
+        <translation>Ctrl++</translation>
+    </message>
+    <message>
+        <source>Ctrl+=</source>
+        <extracomment>Secondary shortcut to increase the RPC console font size.</extracomment>
+        <translation>Ctrl+=</translation>
+    </message>
+    <message>
+        <source>Ctrl+-</source>
+        <extracomment>Main shortcut to decrease the RPC console font size.</extracomment>
+        <translation>Ctrl+-</translation>
+    </message>
+    <message>
+        <source>Ctrl+_</source>
+        <extracomment>Secondary shortcut to decrease the RPC console font size.</extracomment>
+        <translation>Ctrl+_</translation>
+    </message>
+    <message>
+        <source>Ctrl+Shift+I</source>
+        <translation>Ctrl+Shift+I</translation>
+    </message>
+    <message>
+        <source>Ctrl+Shift+C</source>
+        <translation>Ctrl+Shift+C</translation>
+    </message>
+    <message>
+        <source>Ctrl+Shift+G</source>
+        <translation>Ctrl+Shift+G</translation>
+    </message>
+    <message>
+        <source>Ctrl+Shift+P</source>
+        <translation>Ctrl+Shift+P</translation>
+    </message>
+    <message>
+        <source>Ctrl+Shift+R</source>
+        <translation>Ctrl+Shift+R</translation>
+    </message>
     <message>
         <source>Executing command using "%1" wallet</source>
         <translation>「%1」のウォレットを使用してコマンドを実行する</translation>
     </message>
+    <message>
+        <source>detecting: peer could be v1 or v2</source>
+        <extracomment>Explanatory text for "detecting" transport type.</extracomment>
+        <translation>検出: ピアはバージョン1またはバージョン2の可能性があります</translation>
+    </message>
+    <message>
+        <source>v1: unencrypted, plaintext transport protocol</source>
+        <extracomment>Explanatory text for v1 transport type.</extracomment>
+        <translation>バージョン1: 暗号化されていないプレーンテキストのトランスポートプロトコル</translation>
+    </message>
+    <message>
+        <source>v2: BIP324 encrypted transport protocol</source>
+        <extracomment>Explanatory text for v2 transport type.</extracomment>
+        <translation>バージョン2: BIP324で暗号化されたトランスポートプロトコル</translation>
+    </message>
+    <message>
+        <source>&amp;Copy address</source>
+        <extracomment>Context menu action to copy the address of a peer</extracomment>
+        <translation>アドレスをコピー (&amp;A)</translation>
+    </message>
+    <message>
+        <source>1 d&amp;ay</source>
+        <translation>1日 (&amp;D)</translation>
+    </message>
+    <message>
+        <source>&amp;Copy IP/Netmask</source>
+        <extracomment>Context menu action to copy the IP/Netmask of a banned peer. IP/Netmask is the combination of a peer's IP address and its Netmask. For IP address see: https://en.wikipedia.org/wiki/IP_address</extracomment>
+        <translation>IP/Netmaskをコピー (&amp;C)</translation>
+    </message>
+    <message>
+        <source>Welcome to the %1 RPC console.
+Use up and down arrows to navigate history, and %2 to clear screen.
+Use %3 and %4 to increase or decrease the font size.
+Type %5 for an overview of available commands.
+For more information on using this console, type %6.
+
+%7WARNING: Scammers have been active, telling users to type commands here, stealing their wallet contents. Do not use this console without fully understanding the ramifications of a command.%8</source>
+        <extracomment>RPC console welcome message. Placeholders %7 and %8 are style tags for the warning content, and they are not space separated from the rest of the text intentionally.</extracomment>
+        <translation>%1のRPCコンソールへようこそ。
+上下の矢印で履歴を参照し、%2で画面をクリアします。
+%3と%4を使用して、フォントサイズを拡大または縮小します。
+%5を入力すると、利用可能なコマンドの概要が表示されます。
+このコンソールの使い方の詳細については、%6を入力してください。
+
+%7警告: 詐欺師が活動しており、ユーザーにここでコマンドを入力し、ウォレットの中身を盗むよう指示する手口があります。コマンドの内容を十分に理解しないまま、このコンソールを使用しないでください。%8</translation>
+    </message>
+    <message>
+        <source>Executing…</source>
+        <extracomment>A console message indicating an entered command is currently being executed.</extracomment>
+        <translation>実行中...</translation>
+    </message>
+    <message>
+        <source>(peer: %1)</source>
+        <translation>(ピア: %1)</translation>
+    </message>
     <message>
         <source>via %1</source>
         <translation>%1経由</translation>
@@ -2611,11 +3687,19 @@
         <source>Verified Masternode</source>
         <translation>認証済のマスターノード</translation>
     </message>
+    <message>
+        <source>Yes</source>
+        <translation>はい</translation>
+    </message>
     <message>
         <source>Unknown</source>
         <translation>不明</translation>
     </message>
-    </context>
+    <message>
+        <source>Never</source>
+        <translation>いいえ</translation>
+    </message>
+</context>
 <context>
     <name>ReceiveCoinsDialog</name>
     <message>
@@ -2634,13 +3718,17 @@
         <source>An optional message to attach to the payment request, which will be displayed when the request is opened.&lt;br&gt;Note: The message will not be sent with the payment over the Dash network.</source>
         <translation>支払いリクエストが開始された時に表示される、支払いリクエストに添付される任意のメッセージです。注意：このメッセージはDashネットワークを通じて支払いと共に送信されるわけではありません。</translation>
     </message>
+    <message>
+        <source>An optional label to associate with the new receiving address (used by you to identify an invoice).  It is also attached to the payment request.</source>
+        <translation>新しい受信アドレスに紐づけるオプションのラベル(請求書の識別に使用できます)。支払いリクエストにも添付されます。</translation>
+    </message>
     <message>
         <source>Use this form to request payments. All fields are &lt;b&gt;optional&lt;/b&gt;.</source>
         <translation>このフォームを使用して支払いのリクエストを行いましょう。すべての項目は&lt;b&gt;任意入力&lt;/b&gt;です。</translation>
     </message>
     <message>
         <source>&amp;Label:</source>
-        <translation>ラベル (&amp;L)</translation>
+        <translation>ラベル: (&amp;L)</translation>
     </message>
     <message>
         <source>An optional amount to request. Leave this empty or zero to not request a specific amount.</source>
@@ -2648,11 +3736,11 @@
     </message>
     <message>
         <source>&amp;Amount:</source>
-        <translation>総額 (&amp;A)</translation>
+        <translation>総額: (&amp;A)</translation>
     </message>
     <message>
         <source>&amp;Create new receiving address</source>
-        <translation>新しい受取アドレスを作成(&amp;C)</translation>
+        <translation>新しい受取アドレスを作成する (&amp;C)</translation>
     </message>
     <message>
         <source>Clear all fields of the form.</source>
@@ -2691,35 +3779,67 @@
         <translation>支払いリクエストに添付するメッセージを入力します</translation>
     </message>
     <message>
-        <source>Copy URI</source>
-        <translation>URI をコピー</translation>
+        <source>Copy &amp;URI</source>
+        <translation>URIをコピー (&amp;U)</translation>
     </message>
     <message>
-        <source>Copy address</source>
-        <translation>アドレスをコピー</translation>
+        <source>&amp;Copy address</source>
+        <translation>アドレスをコピー (&amp;A)</translation>
     </message>
     <message>
-        <source>Copy label</source>
-        <translation>ラベルをコピーする</translation>
+        <source>Copy &amp;label</source>
+        <translation>ラベルをコピー (&amp;L)</translation>
     </message>
     <message>
-        <source>Copy message</source>
-        <translation>メッセージをコピー</translation>
+        <source>Copy &amp;message</source>
+        <translation>メッセージをコピー (&amp;M)</translation>
     </message>
     <message>
-        <source>Copy amount</source>
-        <translation>総額のコピー</translation>
+        <source>Copy &amp;amount</source>
+        <translation>金額をコピー (&amp;A)</translation>
+    </message>
+    <message>
+        <source>Could not unlock wallet.</source>
+        <translation>ウォレットのロックを解除できませんでした</translation>
     </message>
-    </context>
+    <message>
+        <source>Could not generate new address</source>
+        <translation>新しいアドレスを作成できませんでした</translation>
+    </message>
+</context>
 <context>
     <name>ReceiveRequestDialog</name>
+    <message>
+        <source>Request payment to …</source>
+        <translation>支払いのリクエスト中...</translation>
+    </message>
+    <message>
+        <source>Address:</source>
+        <translation>アドレス:</translation>
+    </message>
+    <message>
+        <source>Amount:</source>
+        <translation>金額:</translation>
+    </message>
+    <message>
+        <source>Label:</source>
+        <translation>ラベル:</translation>
+    </message>
+    <message>
+        <source>Message:</source>
+        <translation>メッセージ:</translation>
+    </message>
+    <message>
+        <source>Wallet:</source>
+        <translation>ウォレット:</translation>
+    </message>
     <message>
         <source>Copy &amp;URI</source>
         <translation>URI をコピー (&amp;U)</translation>
     </message>
     <message>
         <source>Copy &amp;Address</source>
-        <translation>アドレスをコピー(&amp;A)</translation>
+        <translation>アドレスをコピー (&amp;A)</translation>
     </message>
     <message>
         <source>&amp;Save Image…</source>
@@ -2765,6 +3885,34 @@
         <translation>リクエスト完了</translation>
     </message>
 </context>
+<context>
+    <name>RestoreWalletActivity</name>
+    <message>
+        <source>Restore Wallet</source>
+        <extracomment>Title of progress window which is displayed when wallets are being restored.</extracomment>
+        <translation>ウォレットを復元</translation>
+    </message>
+    <message>
+        <source>Restoring Wallet &lt;b&gt;%1&lt;/b&gt;…</source>
+        <extracomment>Descriptive text of the restore wallets progress window which indicates to the user that wallets are currently being restored.</extracomment>
+        <translation>ウォレット &lt;b&gt;%1&lt;/b&gt; を復元中…</translation>
+    </message>
+    <message>
+        <source>Restore wallet failed</source>
+        <extracomment>Title of message box which is displayed when the wallet could not be restored.</extracomment>
+        <translation>ウォレットの復元に失敗しました</translation>
+    </message>
+    <message>
+        <source>Restore wallet warning</source>
+        <extracomment>Title of message box which is displayed when the wallet is restored with some warning.</extracomment>
+        <translation>ウォレット復元の警告</translation>
+    </message>
+    <message>
+        <source>Restore wallet message</source>
+        <extracomment>Title of message box which is displayed when the wallet is successfully restored.</extracomment>
+        <translation>ウォレット復元メッセージ</translation>
+    </message>
+</context>
 <context>
     <name>SendCoinsDialog</name>
     <message>
@@ -2799,10 +3947,6 @@
         <source>Fee:</source>
         <translation>手数料：</translation>
     </message>
-    <message>
-        <source>Dust:</source>
-        <translation>ダスト：</translation>
-    </message>
     <message>
         <source>Inputs…</source>
         <translation>インプット…</translation>
@@ -2827,6 +3971,14 @@
         <source>Transaction Fee:</source>
         <translation>トランザクション手数料：</translation>
     </message>
+    <message>
+        <source>When there is less transaction volume than space in the blocks, miners as well as relaying nodes may enforce a minimum fee. Paying only this minimum fee is just fine, but be aware that this can result in a never confirming transaction once there is more demand for dash transactions than the network can process.</source>
+        <translation>取引量がブロックの空き容量よりも少ない場合、マイナーや リレーするノードは最低手数料を強制することがあります。この最低手数料のみを支払うことは全く問題ありませんが、ネットワークが処理できる量よりもDashの取引の需要が多くなると、確認されない取引になる可能性があることに留意してください。</translation>
+    </message>
+    <message>
+        <source>A too low fee might result in a never confirming transaction (read the tooltip)</source>
+        <translation>手数料が低すぎると、取引が確定しない場合があります(ツールチップを参照してください)</translation>
+    </message>
     <message>
         <source>(Smart fee not initialized yet. This usually takes a few blocks…)</source>
         <translation>（スマート手数料はまだ初期化されていません。これには約数ブロックほどかかります…）</translation>
@@ -2877,7 +4029,7 @@
     </message>
     <message>
         <source>S&amp;end</source>
-        <translation>送金 (&amp;E)</translation>
+        <translation>送金 (&amp;S)</translation>
     </message>
     <message>
         <source>Clear all fields of the form.</source>
@@ -2893,7 +4045,7 @@
     </message>
     <message>
         <source>Add &amp;Recipient</source>
-        <translation>受取人を追加 (&amp;R)</translation>
+        <translation>受取人を追加する (&amp;R)</translation>
     </message>
     <message>
         <source>Balance:</source>
@@ -2905,11 +4057,11 @@
     </message>
     <message>
         <source>Copy amount</source>
-        <translation>総額のコピー</translation>
+        <translation>金額をコピー</translation>
     </message>
     <message>
         <source>Copy fee</source>
-        <translation>手数料をコピーす</translation>
+        <translation>手数料をコピー</translation>
     </message>
     <message>
         <source>Copy after fee</source>
@@ -2919,10 +4071,6 @@
         <source>Copy bytes</source>
         <translation>バイト数をコピー</translation>
     </message>
-    <message>
-        <source>Copy dust</source>
-        <translation>ダストをコピー</translation>
-    </message>
     <message>
         <source>Copy change</source>
         <translation>チェンジをコピー</translation>
@@ -2939,22 +4087,30 @@
         <source>%1 to %2</source>
         <translation>%1 から %2</translation>
     </message>
-    <message>
-        <source>Are you sure you want to send?</source>
-        <translation>送ってよろしいですか？</translation>
-    </message>
     <message>
         <source>&lt;b&gt;(%1 of %2 entries displayed)&lt;/b&gt;</source>
         <translation>&lt;b&gt;(%1 ／%2 項目を表示)&lt;/b&gt;</translation>
     </message>
     <message>
         <source>S&amp;end mixed funds</source>
-        <translation>ミックスファンドを送金する</translation>
+        <translation>ミックスファンドを送金する (&amp;S)</translation>
     </message>
     <message>
         <source>Confirm the %1 send action</source>
         <translation>%1の送金処理を確認</translation>
     </message>
+    <message>
+        <source>Cr&amp;eate Unsigned</source>
+        <translation>未署名を作成する (&amp;C)</translation>
+    </message>
+    <message>
+        <source> from wallet '%1'</source>
+        <translation>「%1」のウォレットから</translation>
+    </message>
+    <message>
+        <source>%1 to '%2'</source>
+        <translation>%1から「%2」へ</translation>
+    </message>
     <message>
         <source>%1 funds only</source>
         <translation>%1の資金のみ</translation>
@@ -3001,7 +4157,52 @@
     </message>
     <message>
         <source>Confirm send coins</source>
-        <translation>送金確認</translation>
+        <translation>送金を確認する</translation>
+    </message>
+    <message>
+        <source>Save Transaction Data</source>
+        <translation>取引データを保存する</translation>
+    </message>
+    <message>
+        <source>PSBT saved</source>
+        <translation>PSBTが保存されました</translation>
+    </message>
+    <message>
+        <source>Watch-only balance:</source>
+        <translation>閲覧のみの残高:</translation>
+    </message>
+    <message>
+        <source>Creates a Partially Signed Blockchain Transaction (PSBT) for use with e.g. an offline %1 wallet, or a PSBT-compatible hardware wallet.</source>
+        <translation>一部署名済みのブロックチェーン取引(PSBT)を生成し、オフラインの%1のウォレットやPSBT対応のハードウェアウォレットで使用します。</translation>
+    </message>
+    <message>
+        <source>Do you want to create this transaction?</source>
+        <extracomment>Message displayed when attempting to create a transaction. Cautionary text to prompt the user to verify that the displayed transaction details represent the transaction the user intends to create.</extracomment>
+        <translation>このトランザクションを作成しますか？</translation>
+    </message>
+    <message>
+        <source>Please, review your transaction proposal. This will produce a Partially Signed Blockchain Transaction (PSBT) which you can save or copy and then sign with e.g. an offline %1 wallet, or a PSBT-compatible hardware wallet.</source>
+        <extracomment>Text to inform a user attempting to create a transaction of their current options. At this stage, a user can only create a PSBT. This string is displayed when private keys are disabled and an external signer is not available.</extracomment>
+        <translation>トランザクション提案を確認してください。これにより部分署名ブロックチェーントランザクション（PSBT）が生成されます。保存またはコピーして、オフラインの %1 ウォレットやPSBT対応のハードウェアウォレットで署名できます。</translation>
+    </message>
+    <message>
+        <source>Please, review your transaction. You can create and send this transaction or create a Partially Signed Blockchain Transaction (PSBT), which you can save or copy and then sign with, e.g., an offline %1 wallet, or a PSBT-compatible hardware wallet.</source>
+        <extracomment>Text to inform a user attempting to create a transaction of their current options. At this stage, a user can send their transaction or create a PSBT. This string is displayed when both private keys and PSBT controls are enabled.</extracomment>
+        <translation>トランザクションを確認してください。このトランザクションを作成して送信するか、部分署名ブロックチェーントランザクション（PSBT）を作成できます。PSBTは保存またはコピーして、オフラインの %1 ウォレットやPSBT対応のハードウェアウォレットで署名できます。</translation>
+    </message>
+    <message>
+        <source>Please, review your transaction.</source>
+        <extracomment>Text to prompt a user to review the details of the transaction they are attempting to send.</extracomment>
+        <translation>トランザクションを確認してください。</translation>
+    </message>
+    <message>
+        <source>To review recipient list click "Show Details…"</source>
+        <translation>受取人リストを確認するには、「詳細を表示…」をクリックします</translation>
+    </message>
+    <message>
+        <source>Partially Signed Transaction (Binary)</source>
+        <extracomment>Expanded name of the binary PSBT file format. See: BIP 174.</extracomment>
+        <translation>一部署名された取引 (バイナリー)</translation>
     </message>
     <message>
         <source>The recipient address is not valid. Please recheck.</source>
@@ -3060,7 +4261,7 @@
     <name>SendCoinsEntry</name>
     <message>
         <source>Pay &amp;To:</source>
-        <translation>送り先: (&amp;T)</translation>
+        <translation>送金先: (&amp;T)</translation>
     </message>
     <message>
         <source>The Dash address to send the payment to</source>
@@ -3096,7 +4297,7 @@
     </message>
     <message>
         <source>A&amp;mount:</source>
-        <translation>金額： (&amp;M)</translation>
+        <translation>金額: (&amp;A)</translation>
     </message>
     <message>
         <source>The amount to send in the selected unit</source>
@@ -3108,7 +4309,7 @@
     </message>
     <message>
         <source>S&amp;ubtract fee from amount</source>
-        <translation>総額から手数料を差し引いて送金(&amp;U)</translation>
+        <translation>総額から手数料を差し引く (&amp;S)</translation>
     </message>
     <message>
         <source>Use available balance</source>
@@ -3122,21 +4323,16 @@
         <source>A message that was attached to the dash: URI which will be stored with the transaction for your reference. Note: This message will not be sent over the Dash network.</source>
         <translation>Dash: URIに添付されていたメッセージです。これは参照用としてトランザクションとともに保存されます。注意：このメッセージはDashネットワークを経由して送信されるわけではありません。</translation>
     </message>
+</context>
+<context>
+    <name>SendConfirmationDialog</name>
     <message>
-        <source>This is an unauthenticated payment request.</source>
-        <translation>これは未認証の支払いリクエストです。</translation>
-    </message>
-    <message>
-        <source>This is an authenticated payment request.</source>
-        <translation>これは認証済みの支払いリクエストです。</translation>
-    </message>
-    <message>
-        <source>Pay To:</source>
-        <translation>支払い先：</translation>
+        <source>Send</source>
+        <translation>送信</translation>
     </message>
     <message>
-        <source>Memo:</source>
-        <translation>メモ：</translation>
+        <source>Create Unsigned</source>
+        <translation>未署名を作成</translation>
     </message>
 </context>
 <context>
@@ -3158,7 +4354,7 @@
     </message>
     <message>
         <source>&amp;Sign Message</source>
-        <translation>メッセージの署名 (&amp;S)</translation>
+        <translation>メッセージを署名する (&amp;S)</translation>
     </message>
     <message>
         <source>You can sign messages/agreements with your addresses to prove you can receive Dash sent to them. Be careful not to sign anything vague or random, as phishing attacks may try to trick you into signing your identity over to them. Only sign fully-detailed statements you agree to.</source>
@@ -3202,7 +4398,7 @@
     </message>
     <message>
         <source>Sign &amp;Message</source>
-        <translation>メッセージの署名 (&amp;M)</translation>
+        <translation>メッセージを署名する (&amp;M)</translation>
     </message>
     <message>
         <source>Reset all sign message fields</source>
@@ -3214,7 +4410,7 @@
     </message>
     <message>
         <source>&amp;Verify Message</source>
-        <translation>メッセージの検証 (&amp;V)</translation>
+        <translation>メッセージを検証する (&amp;V)</translation>
     </message>
     <message>
         <source>Enter the receiver's address, message (ensure you copy line breaks, spaces, tabs, etc. exactly) and signature below to verify the message. Be careful not to read more into the signature than what is in the signed message itself, to avoid being tricked by a man-in-the-middle attack. Note that this only proves the signing party receives with the address, it cannot prove sendership of any transaction!</source>
@@ -3238,7 +4434,7 @@
     </message>
     <message>
         <source>Verify &amp;Message</source>
-        <translation>メッセージの検証 (&amp;M)</translation>
+        <translation>メッセージを検証する (&amp;M)</translation>
     </message>
     <message>
         <source>Reset all verify message fields</source>
@@ -3276,6 +4472,10 @@
         <source>Wallet unlock was cancelled.</source>
         <translation>ウォレットのアンロックはキャンセルされました。</translation>
     </message>
+    <message>
+        <source>No error</source>
+        <translation>エラーなし</translation>
+    </message>
     <message>
         <source>Private key for the entered address is not available.</source>
         <translation>入力されたアドレスのプライベートキーは利用できません。</translation>
@@ -3301,19 +4501,30 @@
         <translation>署名はメッセージダイジェストと一致しませんでした。</translation>
     </message>
     <message>
-        <source>Message verification failed.</source>
-        <translation>メッセージの検証に失敗しました。</translation>
+        <source>Message verification failed.</source>
+        <translation>メッセージの検証に失敗しました。</translation>
+    </message>
+    <message>
+        <source>Message verified.</source>
+        <translation>メッセージは検証されました。</translation>
+    </message>
+</context>
+<context>
+    <name>SplashScreen</name>
+    <message>
+        <source>(press q to shutdown and continue later)</source>
+        <translation>(Qを押してシャットダウンし、後で続ける)</translation>
     </message>
     <message>
-        <source>Message verified.</source>
-        <translation>メッセージは検証されました。</translation>
+        <source>press q to shutdown</source>
+        <translation>Qを押してシャットダウンする</translation>
     </message>
 </context>
 <context>
     <name>TrafficGraphWidget</name>
     <message>
-        <source>KB/s</source>
-        <translation>KB/秒</translation>
+        <source>kB/s</source>
+        <translation>kB/秒</translation>
     </message>
     <message>
         <source>Total</source>
@@ -3330,20 +4541,9 @@
 </context>
 <context>
     <name>TransactionDesc</name>
-    <message numerus="yes">
-        <source>Open for %n more block(s)</source>
-        <translation><numerusform>%n 以上のブロックをオープン</numerusform></translation>
-    </message>
-    <message>
-        <source>Open until %1</source>
-        <translation> %1 までオープン</translation>
-    </message>
-    <message>
-        <source>conflicted</source>
-        <translation>コンフリクト発生</translation>
-    </message>
     <message>
         <source>0/unconfirmed, %1</source>
+        <extracomment>Text explaining the current status of a transaction, shown in the status field of the details window for this transaction. This status represents an unconfirmed transaction that is in the memory pool.</extracomment>
         <translation>0/未確認、%1</translation>
     </message>
     <message>
@@ -3356,22 +4556,32 @@
     </message>
     <message>
         <source>abandoned</source>
+        <extracomment>Text explaining the current status of a transaction, shown in the status field of the details window for this transaction. This status represents an abandoned transaction.</extracomment>
         <translation>中止</translation>
     </message>
+    <message>
+        <source>conflicted with a transaction with %1 confirmations</source>
+        <extracomment>Text explaining the current status of a transaction, shown in the status field of the details window for this transaction. This status represents an unconfirmed transaction that conflicts with a confirmed transaction.</extracomment>
+        <translation>%1 承認のトランザクションと競合しています</translation>
+    </message>
     <message>
         <source>%1/unconfirmed</source>
+        <extracomment>Text explaining the current status of a transaction, shown in the status field of the details window for this transaction. This status represents a transaction confirmed in at least one block, but less than 6 blocks, and still not locked via ChainLocks.</extracomment>
         <translation>%1/未確認</translation>
     </message>
     <message>
         <source>%1 confirmations</source>
+        <extracomment>Text explaining the current status of a transaction, shown in the status field of the details window for this transaction. This status represents a transaction confirmed in 6 or more blocks or locked via ChainLocks.</extracomment>
         <translation>%1の確認</translation>
     </message>
     <message>
         <source>locked via ChainLocks</source>
+        <extracomment>Text explaining the current status of a transaction, shown in the status field of the details window for this transaction. This status represents a transaction confirmed in at least one block and has been locked by ChainLocks.</extracomment>
         <translation>チェーンロックでロック中</translation>
     </message>
     <message>
         <source>verified via InstantSend</source>
+        <extracomment>Text explaining the current status of a transaction, shown in the status field of the details window for this transaction. This status represents an unconfirmed transaction that has been locked by InstantSend.</extracomment>
         <translation>InstantSendで検証済み</translation>
     </message>
     <message>
@@ -3390,6 +4600,10 @@
         <source>Generated</source>
         <translation>生成済</translation>
     </message>
+    <message>
+        <source>Platform Transfer</source>
+        <translation>プラットフォーム送金</translation>
+    </message>
     <message>
         <source>From</source>
         <translation>送信元</translation>
@@ -3520,14 +4734,6 @@
         <source>Address / Label</source>
         <translation>アドレス / ラベル</translation>
     </message>
-    <message numerus="yes">
-        <source>Open for %n more block(s)</source>
-        <translation><numerusform>%n 以上のブロックをオープン</numerusform></translation>
-    </message>
-    <message>
-        <source>Open until %1</source>
-        <translation> %1 までオープン</translation>
-    </message>
     <message>
         <source>Unconfirmed</source>
         <translation>未検証</translation>
@@ -3588,6 +4794,10 @@
         <source>Mined</source>
         <translation>マイニング済</translation>
     </message>
+    <message>
+        <source>Platform Transfer</source>
+        <translation>プラットフォーム送金</translation>
+    </message>
     <message>
         <source>%1 Mixing</source>
         <translation>%1 ミキシング</translation>
@@ -3715,6 +4925,10 @@
         <source>Mined</source>
         <translation>採掘済</translation>
     </message>
+    <message>
+        <source>Platform Transfer</source>
+        <translation>プラットフォーム送金</translation>
+    </message>
     <message>
         <source>Other</source>
         <translation>その他</translation>
@@ -3728,49 +4942,63 @@
         <translation>最小の額</translation>
     </message>
     <message>
-        <source>Abandon transaction</source>
-        <translation>トランザクション中止</translation>
+        <source>&amp;Copy address</source>
+        <translation>アドレスをコピー (&amp;A)</translation>
     </message>
     <message>
-        <source>Copy address</source>
-        <translation>アドレスをコピー</translation>
+        <source>Copy &amp;label</source>
+        <translation>ラベルをコピー (&amp;L)</translation>
     </message>
     <message>
-        <source>Copy label</source>
-        <translation>ラベルをコピー</translation>
+        <source>Copy &amp;amount</source>
+        <translation>金額をコピー (&amp;A)</translation>
     </message>
     <message>
-        <source>Copy amount</source>
-        <translation>総額のコピー</translation>
+        <source>Copy transaction &amp;ID</source>
+        <translation>取引IDをコピー (&amp;T)</translation>
+    </message>
+    <message>
+        <source>Copy &amp;raw transaction</source>
+        <translation>RAW取引をコピー (&amp;R)</translation>
     </message>
     <message>
-        <source>Copy transaction ID</source>
-        <translation>トランザクションIDをコピー</translation>
+        <source>Copy full transaction &amp;details</source>
+        <translation>全ての取引詳細をコピー (&amp;F)</translation>
     </message>
     <message>
-        <source>Copy raw transaction</source>
-        <translation>原トランザクションをコピー</translation>
+        <source>&amp;Show transaction details</source>
+        <translation>取引明細を表示する (&amp;S)</translation>
     </message>
     <message>
-        <source>Copy full transaction details</source>
-        <translation>トランザクションの詳細すべてをコピー</translation>
+        <source>A&amp;bandon transaction</source>
+        <translation>取引を破棄する (&amp;A)</translation>
     </message>
     <message>
-        <source>Edit address label</source>
-        <translation>アドレスのラベルを編集</translation>
+        <source>Rese&amp;nd transaction</source>
+        <translation>取引を再送信する (&amp;R)</translation>
     </message>
     <message>
-        <source>Show transaction details</source>
-        <translation>トランザクションの詳細を表示</translation>
+        <source>&amp;Edit address label</source>
+        <translation>アドレスのラベルを編集する (&amp;E)</translation>
     </message>
     <message>
-        <source>Show address QR code</source>
-        <translation>アドレスのQRコードを表示</translation>
+        <source>Show address &amp;QR code</source>
+        <translation>アドレスのQRコードを表示する (&amp;Q)</translation>
+    </message>
+    <message>
+        <source>Show in %1</source>
+        <extracomment>Transactions table context menu action to show the selected transaction in a third-party block explorer. %1 is a stand-in argument for the URL of the explorer.</extracomment>
+        <translation>%1 で表示</translation>
     </message>
     <message>
         <source>Export Transaction History</source>
         <translation>トランザクション履歴をエクスポート</translation>
     </message>
+    <message>
+        <source>Comma separated file</source>
+        <extracomment>Expanded name of the CSV file format. See: https://en.wikipedia.org/wiki/Comma-separated_values.</extracomment>
+        <translation>カンマ区切りのファイル</translation>
+    </message>
     <message>
         <source>Confirmed</source>
         <translation>検証済</translation>
@@ -3849,10 +5077,54 @@
         <source>Closing the wallet for too long can result in having to resync the entire chain if pruning is enabled.</source>
         <translation>ウォレットを長時間閉じると、プルーニングが有効な場合、チェーン全体を再同期しなければならないことがあります。</translation>
     </message>
-    </context>
+    <message>
+        <source>Close all wallets</source>
+        <translation>全てのウォレットを閉じる</translation>
+    </message>
+    <message>
+        <source>Are you sure you wish to close all wallets?</source>
+        <translation>本当に全てのウォレットを閉じてよろしいですか。</translation>
+    </message>
+</context>
 <context>
     <name>WalletFrame</name>
-    </context>
+    <message>
+        <source>No wallet has been loaded.
+Go to File &gt; Open Wallet to load a wallet.
+- OR -</source>
+        <translation>ウォレットは読み込まれていません。
+ファイル &gt; ウォレットを開くからウォレットを読み込んでください。
+- または -</translation>
+    </message>
+    <message>
+        <source>Create a new wallet</source>
+        <translation>新しいウォレットを作成する</translation>
+    </message>
+    <message>
+        <source>Error</source>
+        <translation>エラー</translation>
+    </message>
+    <message>
+        <source>Unable to decode PSBT from clipboard (invalid base64)</source>
+        <translation>クリップボードからPSBTをデコードできません(無効なBase64)</translation>
+    </message>
+    <message>
+        <source>Load Transaction Data</source>
+        <translation>取引データをロードする</translation>
+    </message>
+    <message>
+        <source>Partially Signed Transaction (*.psbt)</source>
+        <translation>一部署名された取引 (バイナリー)</translation>
+    </message>
+    <message>
+        <source>PSBT file must be smaller than 100 MiB</source>
+        <translation>PSBTファイルは100MiB未満でなければなりません</translation>
+    </message>
+    <message>
+        <source>Unable to decode PSBT</source>
+        <translation>PSBTをデコードできません</translation>
+    </message>
+</context>
 <context>
     <name>WalletModel</name>
     <message>
@@ -3878,6 +5150,11 @@
         <source>Selected amount:</source>
         <translation>選択した額:</translation>
     </message>
+    <message>
+        <source>Wallet Data</source>
+        <extracomment>Name of the wallet data file format.</extracomment>
+        <translation>ウォレットのデータ</translation>
+    </message>
     <message>
         <source>Backup Wallet</source>
         <translation>ウォレットのバックアップ</translation>
@@ -3905,14 +5182,6 @@
 </context>
 <context>
     <name>dash-core</name>
-    <message>
-        <source>Error: Listening for incoming connections failed (listen returned error %s)</source>
-        <translation>エラー： 受信中の接続をリッスンするのに失敗しました (エラー %s )</translation>
-    </message>
-    <message>
-        <source>Fee estimation failed. Fallbackfee is disabled. Wait a few blocks or enable -fallbackfee.</source>
-        <translation>料金の見積もりに失敗しました。フォールバックフィーは無効です。数ブロック待つか、-fallbackfeeを有効にしてください。</translation>
-    </message>
     <message>
         <source>This error could occur if this wallet was not shutdown cleanly and was last loaded using a build with a newer version of Berkeley DB. If so, please use the software that last loaded this wallet</source>
         <translation>このエラーは、このウォレットが正常にシャットダウンされず、Berkeley DBの新しいバージョンを含むビルドを使用して直前にロードされた場合に発生する可能性があります。その場合は、このウォレットを直前にロードしたソフトウェアを使用してください。</translation>
@@ -3970,16 +5239,20 @@
         <translation>データベースの読み込みエラー。シャットダウンします。</translation>
     </message>
     <message>
-        <source>Failed to listen on any port. Use -listen=0 if you want this.</source>
-        <translation>ポートのリッスンに失敗しました。必要であれば -listen=0 を使用してください。</translation>
+        <source>Error: Missing checksum</source>
+        <translation>エラー: チェックサムがありません</translation>
+    </message>
+    <message>
+        <source>Error: Unable to parse version %u as a uint32_t</source>
+        <translation>エラー: バージョン%uをuint32_tとして解析できません</translation>
     </message>
     <message>
-        <source>-maxtxfee is set very high! Fees this large could be paid on a single transaction.</source>
-        <translation>-maxtxfee が非常に高く設定されています！ひとつのトランザクションでこの量の手数料が支払われてしまうことがあります。</translation>
+        <source>Error: Unable to write record to new wallet</source>
+        <translation>エラー: 新しいウォレットに記録を書き込めません</translation>
     </message>
     <message>
-        <source>Cannot provide specific connections and have addrman find outgoing connections at the same.</source>
-        <translation>特定の接続を提供し、同時にアドルマンに発信接続を探させることができません。</translation>
+        <source>Failed to listen on any port. Use -listen=0 if you want this.</source>
+        <translation>ポートのリッスンに失敗しました。必要であれば -listen=0 を使用してください。</translation>
     </message>
     <message>
         <source>Found unconfirmed denominated outputs, will wait till they confirm to continue.</source>
@@ -3990,13 +5263,17 @@
         <translation>無効な-socketevents（「%s」）が指定されました。これらのモード（%s）のみサポートされています。</translation>
     </message>
     <message>
-        <source>Invalid amount for -maxtxfee=&lt;amount&gt;: '%s' (must be at least the minrelay fee of %s to prevent stuck transactions)</source>
-        <translation>-maxtxfee=&lt;amount&gt; の数量の指定が無効です: '%s' (トランザクションが詰まってしまうのを防ぐため、少なくとも %s の最小中継手数料を指定しなければいけません)</translation>
+        <source>SQLiteDatabase: Unknown sqlite wallet schema version %d. Only version %d is supported</source>
+        <translation>SQLiteのデータベース: SQLiteのウォレットスキーマのバージョン%dが不明です。サポートされているのはバージョン%dのみです</translation>
     </message>
     <message>
         <source>Transaction index can't be disabled with governance validation enabled. Either start with -disablegovernance command line switch or enable transaction index.</source>
         <translation>ガバナンス検証を有効にした状態で、取引インデックスを無効化することはできません。-disablegovernanceのコマンドラインスイッチで開始するか、取引インデックスを有効にしてください。</translation>
     </message>
+    <message>
+        <source>Unsupported category-specific logging level -loglevel=%s. Expected -loglevel=&lt;category&gt;:&lt;loglevel&gt;. Valid categories: %s. Valid loglevels: %s.</source>
+        <translation>サポートされていないカテゴリ固有のログレベル: -loglevel=%s。想定されているものは、-loglevel=&lt;category&gt;:&lt;loglevel&gt;。有効なカテゴリ: %s。有効なログレベル: %s。</translation>
+    </message>
     <message>
         <source>Can't mix: no compatible inputs found!</source>
         <translation>ミキシング不可: 互換性のあるインプットが見つかりません</translation>
@@ -4005,6 +5282,14 @@
         <source>Entry exceeds maximum size.</source>
         <translation>エントリーが最大サイズを超えました。</translation>
     </message>
+    <message>
+        <source>Error upgrading evo database for EHF</source>
+        <translation>EHF用のEvoデータベースのアップグレードにエラーが発生しました</translation>
+    </message>
+    <message>
+        <source>Failed to commit Evo database</source>
+        <translation>Evoデータベースのコミットに失敗しました</translation>
+    </message>
     <message>
         <source>Found enough users, signing ( waiting %s )</source>
         <translation>充分なユーザーを発見しました、サインしています ( 待機中 %s )</translation>
@@ -4029,18 +5314,14 @@
         <source>Insufficient funds.</source>
         <translation>残高が不足しています</translation>
     </message>
-    <message>
-        <source>Invalid amount for -discardfee=&lt;amount&gt;: '%s'</source>
-        <translation>-ディスカードフィー=&lt;amount&gt;の額: '%s' が無効です</translation>
-    </message>
-    <message>
-        <source>Invalid amount for -paytxfee=&lt;amount&gt;: '%s' (must be at least %s)</source>
-        <translation>-paytxfee=&lt;amount&gt; に対する無効な数量です： '%s' (少なくとも %s でなければいけません)</translation>
-    </message>
     <message>
         <source>Invalid minimum number of spork signers specified with -minsporkkeys</source>
         <translation>-minsporkkeysで指定されたスポーク署名者の最小数が無効です</translation>
     </message>
+    <message>
+        <source>Listening for incoming connections failed (listen returned error %s)</source>
+        <translation>着信接続の受信に失敗しました(受信にエラー%sが返されました)</translation>
+    </message>
     <message>
         <source>Lock is already in place.</source>
         <translation>すでにロックされています</translation>
@@ -4097,6 +5378,10 @@
         <source>Synchronizing governance objects…</source>
         <translation>ガバナンスオブジェクトを同期中…</translation>
     </message>
+    <message>
+        <source>Transaction change output index out of range</source>
+        <translation>取引変更の出力インデックスが範囲外です</translation>
+    </message>
     <message>
         <source>Unable to start HTTP server. See debug log for details.</source>
         <translation>HTTPサーバを開始できませんでした。詳細はデバッグログをご確認ください。</translation>
@@ -4105,6 +5390,10 @@
         <source>Unknown response.</source>
         <translation>不明なレスポンス</translation>
     </message>
+    <message>
+        <source>Unsupported global logging level -loglevel=%s. Valid values: %s.</source>
+        <translation>-loglevel=%sのグローバルログレベルがサポートされていません。有効な値: %s。</translation>
+    </message>
     <message>
         <source>User Agent comment (%s) contains unsafe characters.</source>
         <translation>ユーザーエージェントのコメント (%s) には安全でない文字が含まれています。</translation>
@@ -4145,6 +5434,10 @@
         <source>Make sure to encrypt your wallet and delete all non-encrypted backups after you have verified that the wallet works!</source>
         <translation>ウォレットが動作することを確認したら、必ずウォレットを暗号化し、暗号化されていないバックアップをすべて削除してください！</translation>
     </message>
+    <message>
+        <source>More than one onion bind address is provided. Using %s for the automatically created Tor onion service.</source>
+        <translation>複数のTorオニオンバインドアドレスが提供されています。自動的に作成されたTorオニオンサービスには、%sを使用します。</translation>
+    </message>
     <message>
         <source>Prune configured below the minimum of %d MiB.  Please use a higher number.</source>
         <translation>剪定が最小値の %d MiB以下に設定されています。もっと大きな値を使用してください。</translation>
@@ -4173,10 +5466,6 @@
         <source>Wallet is locked, can't replenish keypool! Automatic backups and mixing are disabled, please unlock your wallet to replenish keypool.</source>
         <translation>ウォレットがロックされているのでキープールを補充できません!自動バックアップとミキシングが無効なので、ウォレットをアンロックしてキープールを補充してください。</translation>
     </message>
-    <message>
-        <source>You need to rebuild the database using -reindex to change -timestampindex</source>
-        <translation>-timestampindexを変更するには、-reindexを使用してデータベースを再構築する必要があります。</translation>
-    </message>
     <message>
         <source>You need to rebuild the database using -reindex to go back to unpruned mode.  This will redownload the entire blockchain</source>
         <translation>非剪定モードに戻るためには-reindexオプションを使用してデータベースを再構築する必要があります。これによりブロックチェーン全体の再ダウンロードが行われます。</translation>
@@ -4218,20 +5507,32 @@
         <translation>%sの読み込みエラー：プライベートキーは作成時にのみ無効化できます。</translation>
     </message>
     <message>
-        <source>Error upgrading evo database</source>
-        <translation>Evoデータベースのアップグレードエラー</translation>
+        <source>Error: Couldn't create cursor into database</source>
+        <translation>エラー: データベースにカーソルを作成できませんでした</translation>
     </message>
     <message>
         <source>Error: Disk space is low for %s</source>
         <translation>エラー：%sのディスク容量が不足しています</translation>
     </message>
     <message>
-        <source>Exceeded max tries.</source>
-        <translation>最大試行回数を超えました。</translation>
+        <source>Error: Dumpfile checksum does not match. Computed %s, expected %s</source>
+        <translation>エラー: ダンプファイルのチェックサムが一致しません。算出されたものは%s、一致するものは%sです</translation>
+    </message>
+    <message>
+        <source>Error: Got key that was not hex: %s</source>
+        <translation>エラー: 16進数ではないキーを検出しました: %s</translation>
+    </message>
+    <message>
+        <source>Error: Got value that was not hex: %s</source>
+        <translation>エラー: 16進数ではない値を検出しました: %s</translation>
+    </message>
+    <message>
+        <source>Error: Keypool ran out, please call keypoolrefill first</source>
+        <translation>エラー: キープールが切れました。まずは、keypoolrefillに連絡してください。</translation>
     </message>
     <message>
-        <source>Failed to commit EvoDB</source>
-        <translation>EvoDBのコミットに失敗しました</translation>
+        <source>Error: No addresses available.</source>
+        <translation>エラー: 利用可能なアドレスがありません。</translation>
     </message>
     <message>
         <source>Failed to create backup %s!</source>
@@ -4249,17 +5550,29 @@
         <source>Failed to rescan the wallet during initialization</source>
         <translation>初期化中にウォレットの再スキャンに失敗しました</translation>
     </message>
+    <message>
+        <source>Failed to verify database</source>
+        <translation>データベースの検証に失敗しました</translation>
+    </message>
+    <message>
+        <source>Fee rate (%s) is lower than the minimum fee rate setting (%s)</source>
+        <translation>料金レート(%s)が、最低料金レートの設定(%s)よりも低いです</translation>
+    </message>
     <message>
         <source>Found enough users, signing…</source>
         <translation>充分なユーザーを発見しました、サインしています </translation>
     </message>
     <message>
-        <source>Invalid P2P permission: '%s'</source>
-        <translation>無効なP2P許可：「%s」</translation>
+        <source>Ignoring duplicate -wallet %s.</source>
+        <translation>重複した-wallet %sを無視します。</translation>
+    </message>
+    <message>
+        <source>Input not found or already spent</source>
+        <translation>入力内容が見つからないか、すでに使用済みです</translation>
     </message>
     <message>
-        <source>Invalid amount for -fallbackfee=&lt;amount&gt;: '%s'</source>
-        <translation>無効な額 -fallbackfee=&lt;amount&gt;: '%s'</translation>
+        <source>Invalid P2P permission: '%s'</source>
+        <translation>無効なP2P許可：「%s」</translation>
     </message>
     <message>
         <source>Invalid masternodeblsprivkey. Please see documentation.</source>
@@ -4281,6 +5594,10 @@
         <source>Mixing in progress…</source>
         <translation>ミキシング中…</translation>
     </message>
+    <message>
+        <source>No addresses available</source>
+        <translation>利用可能なアドレスがありません</translation>
+    </message>
     <message>
         <source>No errors detected.</source>
         <translation>エラーは検出されていません。</translation>
@@ -4309,6 +5626,22 @@
         <source>Prune mode is incompatible with -txindex.</source>
         <translation>剪定モードは-txindexと互換性がありません。</translation>
     </message>
+    <message>
+        <source>SQLiteDatabase: Failed to execute statement to verify database: %s</source>
+        <translation>SQLiteのデータベース: データベースの検証文の実行に失敗しました: %s</translation>
+    </message>
+    <message>
+        <source>SQLiteDatabase: Failed to prepare statement to verify database: %s</source>
+        <translation>SQLiteのデータベース: データベースの検証文の準備に失敗しました: %s</translation>
+    </message>
+    <message>
+        <source>SQLiteDatabase: Failed to read database verification error: %s</source>
+        <translation>SQLiteのデータベース: データベースの検証エラーを読み取れませんでした: %s</translation>
+    </message>
+    <message>
+        <source>SQLiteDatabase: Unexpected application id. Expected %u, got %u</source>
+        <translation>SQLiteのデータベース: アプリケーションIDが一致しません。%uを想定していましたが、%uが入力されました。</translation>
+    </message>
     <message>
         <source>Section [%s] is not recognized.</source>
         <translation>[%s]のセクションは認識されません。</translation>
@@ -4341,6 +5674,10 @@
         <source>This is the transaction fee you will pay if you send a transaction.</source>
         <translation>これは取引を送信する場合に支払う取引手数料です。</translation>
     </message>
+    <message>
+        <source>Topping up keypool…</source>
+        <translation>キープールをチャージ中...</translation>
+    </message>
     <message>
         <source>Transaction amounts must not be negative</source>
         <translation>トランザクションの総額はマイナスではあってはいけません。。</translation>
@@ -4369,13 +5706,17 @@
         <source>Unable to generate initial keys</source>
         <translation>初期キーが生成できません</translation>
     </message>
+    <message>
+        <source>Unable to open %s for writing</source>
+        <translation>%sを書き込みで開けません</translation>
+    </message>
     <message>
         <source>Unknown -blockfilterindex value %s.</source>
         <translation>%sは、不明な-blockfilterindexの値です。</translation>
     </message>
     <message>
-        <source>Upgrading UTXO database</source>
-        <translation>UTXOデータベースを更新しています</translation>
+        <source>Unknown new rules activated (versionbit %i)</source>
+        <translation>不明な新しい規則が有効化されました（バージョンビット%i）</translation>
     </message>
     <message>
         <source>Verifying blocks…</source>
@@ -4394,16 +5735,12 @@
         <translation>ウォレットバックアップフォルダー作成不可 %s!</translation>
     </message>
     <message>
-        <source>You can not start a masternode with wallet enabled.</source>
-        <translation>ウォレットを有効にした状態でマスターノードを起動することはできません。</translation>
-    </message>
-    <message>
-        <source>You need to rebuild the database using -reindex to change -addressindex</source>
-        <translation>-addressindexを変更するために、-reindexを使用してデータベースを再構築する必要があります</translation>
+        <source>Wiping wallet transactions…</source>
+        <translation>ウォレットの取引履歴を消去中…</translation>
     </message>
     <message>
-        <source>You need to rebuild the database using -reindex to change -spentindex</source>
-        <translation>-spentindexを変更するために、-reindexを使用してデータベースを再構築する必要があります</translation>
+        <source>You can not start a masternode with wallet enabled.</source>
+        <translation>ウォレットを有効にした状態でマスターノードを起動することはできません。</translation>
     </message>
     <message>
         <source>no mixing available.</source>
@@ -4421,6 +5758,22 @@
         <source>%s uses exact denominated amounts to send funds, you might simply need to mix some more coins.</source>
         <translation>%sは正確に換算した金額を送金するため、単純にいくらかのコインをミキシングする必要があるかもしれません。</translation>
     </message>
+    <message>
+        <source>-reindex-chainstate option is not compatible with -blockfilterindex. Please temporarily disable blockfilterindex while using -reindex-chainstate, or replace -reindex-chainstate with -reindex to fully rebuild all indexes.</source>
+        <translation>-reindex-chainstateのオプションは-blockfilterindexと互換性がありません。-reindex-chainstateを使用する際は、一時的にblockfilterindexを無効にしてください。また、全てのインデックスを完全に再構築するには、-reindex-chainstateを-reindexに置き換えてください。</translation>
+    </message>
+    <message>
+        <source>-reindex-chainstate option is not compatible with -coinstatsindex. Please temporarily disable coinstatsindex while using -reindex-chainstate, or replace -reindex-chainstate with -reindex to fully rebuild all indexes.</source>
+        <translation>-reindex-chainstateのオプションは-coinstatsindexと互換性がありません。-reindex-chainstateを使用する際は、一時的にcoinstatsindexを無効にしてください。また、全てのインデックスを完全に再構築するには、-reindex-chainstateを-reindexに置き換えてください。</translation>
+    </message>
+    <message>
+        <source>-reindex-chainstate option is not compatible with -txindex. Please temporarily disable txindex while using -reindex-chainstate, or replace -reindex-chainstate with -reindex to fully rebuild all indexes.</source>
+        <translation>-reindex-chainstateのオプションは-txindexと互換性がありません。-reindex-chainstateを使用する際は、一時的にtxindexを無効にしてください。また、全てのインデックスを完全に再構築するには、-reindex-chainstateを-reindexに置き換えてください。</translation>
+    </message>
+    <message>
+        <source>Cannot downgrade wallet from version %i to version %i. Wallet version unchanged.</source>
+        <translation>ウォレットをバージョン%iからバージョン%iにダウングレードできません。ウォレットのバージョンは変更されません。</translation>
+    </message>
     <message>
         <source>Cannot obtain a lock on data directory %s. %s is probably already running.</source>
         <translation>データディレクトリ %s のロックを取得することができません。おそらく %s は実行中です。</translation>
@@ -4433,14 +5786,82 @@
         <source>Error loading %s: You can't enable HD on an already existing non-HD wallet</source>
         <translation>%s読み込みエラー: 既存の非HDウォレット上でHDを有効化できません</translation>
     </message>
+    <message>
+        <source>Error loading wallet. Wallet requires blocks to be downloaded, and software does not currently support loading wallets while blocks are being downloaded out of order when using assumeutxo snapshots. Wallet should be able to load successfully after node sync reaches height %s</source>
+        <translation>ウォレットのロード中にエラーが発生しました。ウォレットはブロックをダウンロードする必要があり、assumeutxoのスナップショットを使用している場合、ブロックが順番通りにダウンロードされていない状態でのウォレットのロードはソフトウェアで現在サポートされていません。ノードの同期が%sの高さに達すると、ウォレットは正常にロードできるようになります。</translation>
+    </message>
     <message>
         <source>Error reading %s! All keys read correctly, but transaction data or address book entries might be missing or incorrect.</source>
         <translation>%s の読み込みエラー! すべてのキーは正しく読み取れますが、トランザクションデータやアドレス帳のエントリが失われたか、正しくない可能性があります。</translation>
     </message>
+    <message>
+        <source>Error: Dumpfile format record is incorrect. Got "%s", expected "format".</source>
+        <translation>エラー: ダンプファイルの形式記録が正しくありません。「%s」を取得しましたが、「format」が求められています。</translation>
+    </message>
+    <message>
+        <source>Error: Dumpfile identifier record is incorrect. Got "%s", expected "%s".</source>
+        <translation>エラー: ダンプファイルの識別記録が正しくありません。「%s」を取得しましたが、「%s」が適切です。</translation>
+    </message>
+    <message>
+        <source>Error: Dumpfile version is not supported. This version of bitcoin-wallet only supports version 1 dumpfiles. Got dumpfile with version %s</source>
+        <translation>エラー: ダンプファイルのバージョンがサポートされていません。このバージョンのbitcoin-wallet は、バージョン1のダンプファイルのみをサポートしていますが、バージョン%sのダンプファイルを取得してしまいました。</translation>
+    </message>
+    <message>
+        <source>Failed to rename invalid peers.dat file. Please move or delete it and try again.</source>
+        <translation>無効なpeers.datファイルの名前を変更できませんでした。peers.datファイルを移動または削除してから、再度お試しください。</translation>
+    </message>
+    <message>
+        <source>Fee estimation failed. Fallbackfee is disabled. Wait a few blocks or enable %s.</source>
+        <translation>手数料の推定に失敗しました。フォールバック手数料が無効になっています。数ブロック待つか %s を有効にしてください。</translation>
+    </message>
+    <message>
+        <source>File %s already exists. If you are sure this is what you want, move it out of the way first.</source>
+        <translation>%sのファイルはすでに存在しています。本当にファイルを希望する場合は、先に既存のものを移動させてください。</translation>
+    </message>
+    <message>
+        <source>Incompatible options: -dnsseed=1 was explicitly specified, but -onlynet forbids connections to IPv4/IPv6</source>
+        <translation>互換性のないオプション: -dnsseed=1が明示的に指定されましたが、-onlynetがIPv4/IPv6への接続を禁止しています。</translation>
+    </message>
     <message>
         <source>Incorrect or no devnet genesis block found. Wrong datadir for devnet specified?</source>
         <translation>無効なdevnetジェネシスブロックが発見されたか、またはdevnetジェネシスブロックが発見されません。 特定のdevnet用のデータディレクトリが間違ってませんか?</translation>
     </message>
+    <message>
+        <source>Invalid amount for %s=&lt;amount&gt;: '%s' (must be at least the minrelay fee of %s to prevent stuck transactions)</source>
+        <translation>%s=&lt;amount&gt; の金額が無効です：「%s」（トランザクションのスタックを防ぐため、少なくとも %s の最小リレー手数料が必要です）</translation>
+    </message>
+    <message>
+        <source>Invalid or corrupt peers.dat (%s). If you believe this is a bug, please report it to %s. As a workaround, you can move the file (%s) out of the way (rename, move, or delete) to have a new one created on the next start.</source>
+        <translation>peers.dat(%s)が無効または破損しています。これがバグだと思われる場合は、%sに報告してください。対処法として、ファイル(%s)を移動(名前の変更、移動、または削除)して、次回起動する際に新しいファイルを作成できるようにします。</translation>
+    </message>
+    <message>
+        <source>No dump file provided. To use createfromdump, -dumpfile=&lt;filename&gt; must be provided.</source>
+        <translation>ダンプファイルは提供されていません。createfromdumpを使用するには、-dumpfile=&lt;filename&gt;を提示する必要があります。</translation>
+    </message>
+    <message>
+        <source>No dump file provided. To use dump, -dumpfile=&lt;filename&gt; must be provided.</source>
+        <translation>ダンプファイルは提供されていません。dumpを使用するには、-dumpfile=&lt;filename&gt;を提示する必要があります。</translation>
+    </message>
+    <message>
+        <source>No wallet file format provided. To use createfromdump, -format=&lt;format&gt; must be provided.</source>
+        <translation>ウォレットファイルのフォーマットは提供されていません。createfromdumpを使用するには、-format=&lt;format&gt;を提示する必要があります。</translation>
+    </message>
+    <message>
+        <source>Outbound connections restricted to CJDNS (-onlynet=cjdns) but -cjdnsreachable is not provided</source>
+        <translation>アウトバウンド接続はCJDNS(-onlynet=cjdns)に制限されていますが、-cjdnsreachableが指定されていません</translation>
+    </message>
+    <message>
+        <source>Outbound connections restricted to Tor (-onlynet=onion) but the proxy for reaching the Tor network is explicitly forbidden: -onion=0</source>
+        <translation>アウトバウンド接続はTor(-onlynet=onion)に制限されていますが、Torネットワークに接続するプロキシは明示的に禁止されています(-onion=0)。</translation>
+    </message>
+    <message>
+        <source>Outbound connections restricted to Tor (-onlynet=onion) but the proxy for reaching the Tor network is not provided: none of -proxy, -onion or -listenonion is given</source>
+        <translation>アウトバウンド接続はTor(-onlynet=onion)に制限されていますが、Torネットワークに接続するプロキシは提供されておらず、-proxy、-onion、-listenonionのいずれも指定されていません。</translation>
+    </message>
+    <message>
+        <source>Outbound connections restricted to i2p (-onlynet=i2p) but -i2psam is not provided</source>
+        <translation>アウトバウンド接続はi2p(-onlynet=i2p)に制限されていますが、-i2psamが指定されていません</translation>
+    </message>
     <message>
         <source>Please check that your computer's date and time are correct! If your clock is wrong, %s will not work properly.</source>
         <translation>あなたのPCの日付と時刻が正しいことを確認して下さい！ もしあなたの時計が正しくなければ %s が正確に動作しません。</translation>
@@ -4449,6 +5870,14 @@
         <source>Please contribute if you find %s useful. Visit %s for further information about the software.</source>
         <translation>%s が有用だと感じられた方はぜひプロジェクトへの貢献をお願いします。ソフトウェアのより詳細な情報については %s をご覧ください。</translation>
     </message>
+    <message>
+        <source>Prune mode is incompatible with -reindex-chainstate. Use full -reindex instead.</source>
+        <translation>Pruneモードは、-reindex-chainstateと互換性がありません。代わりに-reindexをフルで使用してください。</translation>
+    </message>
+    <message>
+        <source>This is the maximum transaction fee you pay (in addition to the normal fee) to prioritize partial spend avoidance over regular coin selection.</source>
+        <translation>これは、(通常の料金に加えて)支払うことになる最大の手数料であり、通常の硬貨の選択よりも部分使用の回避を優先する際に発生します。</translation>
+    </message>
     <message>
         <source>This is the transaction fee you may discard if change is smaller than dust at this level</source>
         <translation>これはこのレベルでお釣りがダストよりも少額の場合に破棄できる取引手数料です</translation>
@@ -4457,14 +5886,38 @@
         <source>This is the transaction fee you may pay when fee estimates are not available.</source>
         <translation>これは手数料の推定機能が利用できない場合に支払うトランザクション手数料です。</translation>
     </message>
+    <message>
+        <source>Transaction requires one destination of non-0 value, a non-0 feerate, or a pre-selected input</source>
+        <translation>トランザクションには、非ゼロ値の宛先、非ゼロの手数料率、または事前選択された入力のいずれかが必要です</translation>
+    </message>
     <message>
         <source>Unable to replay blocks. You will need to rebuild the database using -reindex-chainstate.</source>
         <translation>ブロックを再生できません。 -reindex-chainstateを使用してデータベースを再構築する必要があります。</translation>
     </message>
+    <message>
+        <source>Unknown wallet file format "%s" provided. Please provide one of "bdb" or "sqlite".</source>
+        <translation>不明なウォレットファイルの形式「%s」が提供されました。「bdb」または「sqlite」のいずれかを提供してください。</translation>
+    </message>
+    <message>
+        <source>Unsupported chainstate database format found. Please restart with -reindex-chainstate. This will rebuild the chainstate database.</source>
+        <translation>サポートされていないチェーンステートデータベース形式が見つかりました。-reindex-chainstateで再起動してください。これによりチェーンステートデータベースが再構築されます。</translation>
+    </message>
+    <message>
+        <source>Warning: Dumpfile wallet format "%s" does not match command line specified format "%s".</source>
+        <translation>警告: ダンプファイルのウォレット形式「%s」は、コマンドラインで指定された形式「%s」と一致しません。</translation>
+    </message>
     <message>
         <source>Warning: Private keys detected in wallet {%s} with disabled private keys</source>
         <translation>警告：プライベートキーが、無効化されたものと一緒にウォレット{%s}で検出されました</translation>
     </message>
+    <message>
+        <source>You need to rebuild the database using -reindex to enable -timestampindex</source>
+        <translation>-timestampindexを有効にするには、-reindexを使用してデータベースを再構築する必要があります</translation>
+    </message>
+    <message>
+        <source>%s -- Incorrect seed, it should be a hex string</source>
+        <translation>%s -- シードが正しくありません。16進数の文字列でなければなりません。</translation>
+    </message>
     <message>
         <source>%s is not a valid backup folder!</source>
         <translation>%s は無効なバックアップフォルダーです!</translation>
@@ -4489,10 +5942,30 @@
         <source>-rpcport must be specified when -devnet and -server are specified</source>
         <translation>-rpcport は、 -devnet と -server が指定されたとき指定しなければなりません。</translation>
     </message>
+    <message>
+        <source>-statsbatchsize cannot be configured with a negative value.</source>
+        <translation>-statsbatchsizeは負の値で設定できません。</translation>
+    </message>
+    <message>
+        <source>-statsduration cannot be configured with a negative value.</source>
+        <translation>-statsdurationは負の値で設定できません。</translation>
+    </message>
     <message>
         <source>A fatal internal error occurred, see debug.log for details</source>
         <translation>致命的な内部エラーが発生しました。詳細は、debug.logを参照してください。</translation>
     </message>
+    <message>
+        <source>Cannot create socket (socket() returned error %s)</source>
+        <translation>ソケットを作成できません（socket() がエラー %s を返しました）</translation>
+    </message>
+    <message>
+        <source>Cannot get socket address for %s</source>
+        <translation>%s のソケットアドレスを取得できません</translation>
+    </message>
+    <message>
+        <source>Cannot init Statsd client</source>
+        <translation>Statsd クライアントを初期化できません</translation>
+    </message>
     <message>
         <source>Cannot resolve -%s address: '%s'</source>
         <translation>-%s アドレス '%s' を解決できません</translation>
@@ -4501,10 +5974,6 @@
         <source>Cannot write to data directory '%s'; check permissions.</source>
         <translation>「%s」のデータディレクトリに書き込めません。権限を確認してください。</translation>
     </message>
-    <message>
-        <source>Change index out of range</source>
-        <translation>チェンジインデックスが範囲外です</translation>
-    </message>
     <message>
         <source>Copyright (C)</source>
         <translation>Copyright (C)</translation>
@@ -4513,9 +5982,17 @@
         <source>Disk space is too low!</source>
         <translation>ディスク容量が少なすぎます。</translation>
     </message>
+    <message>
+        <source>Dump file %s does not exist.</source>
+        <translation>%sのダンプファイルは存在しません。</translation>
+    </message>
+    <message>
+        <source>Error creating %s</source>
+        <translation>%sの作成にエラーが発生しました</translation>
+    </message>
     <message>
         <source>Error loading %s</source>
-        <translation>%s 読み込みエラー</translation>
+        <translation>%sの読み込みにエラーが発生しました</translation>
     </message>
     <message>
         <source>Error loading %s: Wallet corrupted</source>
@@ -4530,8 +6007,8 @@
         <translation>読み込みエラー %s: 既存のHDウォレット上のHDを無効化できません</translation>
     </message>
     <message>
-        <source>Error upgrading chainstate database</source>
-        <translation>チェーンステートデータベースのアップグレードエラー</translation>
+        <source>Error reading next record from wallet database</source>
+        <translation>ウォレットのデータベースから次の記録を読み込む際に、エラーが発生しました</translation>
     </message>
     <message>
         <source>Loading P2P addresses…</source>
@@ -4601,6 +6078,14 @@
         <source>Inputs vs outputs size mismatch.</source>
         <translation>インプットとアウトプットのサイズがミスマッチです。</translation>
     </message>
+    <message>
+        <source>Invalid '%s'. Allowed values: 128, 160, 192, 224, 256.</source>
+        <translation>無効な「%s」です。有効値は、128、160、192、224、256です。</translation>
+    </message>
+    <message>
+        <source>Invalid -i2psam address or hostname: '%s'</source>
+        <translation>無効な-i2psamアドレスまたはホスト名: 「%s」</translation>
+    </message>
     <message>
         <source>Invalid -onion address or hostname: '%s'</source>
         <translation>無効な -onion アドレスまたはホスト名: '%s'</translation>
@@ -4645,14 +6130,78 @@
         <source>%s corrupt. Try using the wallet tool dash-wallet to salvage or restoring a backup.</source>
         <translation>%sが破損しています。ウォレットツールのdash-walletを使用してサルベージするか、バックアップを復元してみてください。</translation>
     </message>
+    <message>
+        <source>%s is set very high! Fees this large could be paid on a single transaction.</source>
+        <translation>%s が非常に高く設定されています！このような高額な手数料は、単一のトランザクションで支払われる可能性があります。</translation>
+    </message>
+    <message>
+        <source>%s request to listen on port %u. This port is considered "bad" and thus it is unlikely that any Dash Core peers connect to it. See doc/p2p-bad-ports.md for details and a full list.</source>
+        <translation>%sは、ポート%uで受信するよう要求しています。このポートは「悪い」と見なされるため、Dashコアのピアが接続することはまずありません。詳細および全体リストについては、doc/p2p-bad-ports.mdを参照してください。</translation>
+    </message>
+    <message>
+        <source>Cannot provide specific connections and have addrman find outgoing connections at the same time.</source>
+        <translation>指定した接続を提供できない上、addrmanで送信接続を検出することもできません。</translation>
+    </message>
+    <message>
+        <source>Failed to upgrade Evo database</source>
+        <translation>Evo データベースのアップグレードに失敗しました</translation>
+    </message>
+    <message>
+        <source>Fee needed &gt; fee paid</source>
+        <translation>必要な手数料 &gt; 支払われた手数料</translation>
+    </message>
+    <message>
+        <source>Host %s on unsupported network</source>
+        <translation>ホスト %s はサポートされていないネットワーク上にあります</translation>
+    </message>
+    <message>
+        <source>Invalid amount for %s=&lt;amount&gt;: '%s' (must be at least %s)</source>
+        <translation>%s=&lt;amount&gt; の金額が無効です：「%s」（少なくとも %s が必要です）</translation>
+    </message>
+    <message>
+        <source>Invalid amount for %s=&lt;amount&gt;: '%s'</source>
+        <translation>%s=&lt;amount&gt; の金額が無効です：「%s」</translation>
+    </message>
+    <message>
+        <source>Invalid port specified in %s: '%s'</source>
+        <translation>%s で指定されたポートが無効です：「%s」</translation>
+    </message>
     <message>
         <source>Last successful action was too recent.</source>
         <translation>直近の成功したアクションが最新過ぎでした。</translation>
     </message>
+    <message>
+        <source>Missing solving data for estimating transaction size</source>
+        <translation>トランザクションサイズを推定するための解決データが不足しています</translation>
+    </message>
+    <message>
+        <source>No host specified</source>
+        <translation>ホストが指定されていません</translation>
+    </message>
+    <message>
+        <source>No host specified, malformed URL</source>
+        <translation>ホストが指定されていません、不正な形式のURL</translation>
+    </message>
+    <message>
+        <source>No text before the scheme delimiter, malformed URL</source>
+        <translation>スキーム区切り文字の前にテキストがありません、不正な形式のURL</translation>
+    </message>
+    <message>
+        <source>Port must be between %d and %d, supplied %d</source>
+        <translation>ポートは %d から %d の間でなければなりません、指定されたのは %d です</translation>
+    </message>
+    <message>
+        <source>Socket not initialized, cannot send message</source>
+        <translation>ソケットが初期化されていません、メッセージを送信できません</translation>
+    </message>
     <message>
         <source>The source code is available from %s.</source>
         <translation>ソースコードは %s より入手可能です。</translation>
     </message>
+    <message>
+        <source>The specified config file %s does not exist</source>
+        <translation>指定した%sという構成ファイルは存在しません</translation>
+    </message>
     <message>
         <source>The transaction amount is too small to pay the fee</source>
         <translation>トランザクションの金額が小さすぎて手数料を支払えません</translation>
@@ -4673,6 +6222,10 @@
         <source>Transaction fees are too high.</source>
         <translation>トランザクション手数料が高すぎます</translation>
     </message>
+    <message>
+        <source>Transaction needs a change address, but we can't generate it.</source>
+        <translation>トランザクションにはおつりアドレスが必要ですが、生成できません。</translation>
+    </message>
     <message>
         <source>Transaction not valid.</source>
         <translation>トランザクションが無効です</translation>
@@ -4693,6 +6246,18 @@
         <source>Unable to locate enough non-denominated funds for this transaction.</source>
         <translation>この取引に十分な外貨建ての資金を確保できません。</translation>
     </message>
+    <message>
+        <source>Unable to lookup host %s</source>
+        <translation>ホスト %s を検索できません</translation>
+    </message>
+    <message>
+        <source>Unable to parse -maxuploadtarget: '%s'</source>
+        <translation>-maxuploadtarget を解析できません：「%s」</translation>
+    </message>
+    <message>
+        <source>Unable to send message to %s (::sendto() returned error %s)</source>
+        <translation>%s にメッセージを送信できません（::sendto() がエラー %s を返しました）</translation>
+    </message>
     <message>
         <source>Unable to sign spork message, wrong key?</source>
         <translation>スポークメッセージに署名できません、キーが間違ってませんか?</translation>
@@ -4706,12 +6271,12 @@
         <translation>未知の状態: id = %u</translation>
     </message>
     <message>
-        <source>Unsupported logging category %s=%s.</source>
-        <translation>サポートされていないロギングカテゴリ %s=%s.</translation>
+        <source>Unsupported URL scheme, must begin with udp://</source>
+        <translation>サポートされていないURLスキームです、udp:// で始まる必要があります</translation>
     </message>
     <message>
-        <source>Upgrading txindex database</source>
-        <translation>txindexデータベースのアップグレード</translation>
+        <source>Unsupported logging category %s=%s.</source>
+        <translation>サポートされていないロギングカテゴリ %s=%s.</translation>
     </message>
     <message>
         <source>Very low number of keys left: %d</source>
@@ -4741,9 +6306,25 @@
         <source>You can not disable governance validation on a masternode.</source>
         <translation>マスターノードでガバナンスの検証を無効化することはできません。</translation>
     </message>
+    <message>
+        <source>You need to rebuild the database using -reindex to enable -addressindex</source>
+        <translation>-addressindexを有効にするには、-reindexを使用してデータベースを再構築する必要があります</translation>
+    </message>
+    <message>
+        <source>You need to rebuild the database using -reindex to enable -spentindex</source>
+        <translation>-spentindexを有効にするには、-reindexを使用してデータベースを再構築する必要があります</translation>
+    </message>
     <message>
         <source>Your entries added successfully.</source>
         <translation>あなたの追加エントリーは成功しました。</translation>
     </message>
+    <message>
+        <source>Settings file could not be read</source>
+        <translation>設定ファイルが読み込めませんでした</translation>
+    </message>
+    <message>
+        <source>Settings file could not be written</source>
+        <translation>設定ファイルが書き込めませんでした</translation>
+    </message>
 </context>
 </TS>
\ No newline at end of file

From 32651c7829be15fd54d32a990f4a37f213d3d2b9 Mon Sep 17 00:00:00 2001
From: UdjinM6 <UdjinM6@users.noreply.github.com>
Date: Sat, 25 Oct 2025 01:45:40 +0300
Subject: [PATCH 333/656] ko

---
 src/qt/locale/dash_ko.ts | 2063 +++++++++++++++++++++++++++++++++-----
 1 file changed, 1822 insertions(+), 241 deletions(-)

diff --git a/src/qt/locale/dash_ko.ts b/src/qt/locale/dash_ko.ts
index 42fc395f8406..b624d8d483f9 100644
--- a/src/qt/locale/dash_ko.ts
+++ b/src/qt/locale/dash_ko.ts
@@ -65,14 +65,6 @@
         <source>C&amp;hoose</source>
         <translation>선택 (&amp;H)</translation>
     </message>
-    <message>
-        <source>Sending addresses</source>
-        <translation>보내기 주소</translation>
-    </message>
-    <message>
-        <source>Receiving addresses</source>
-        <translation>받기 주소</translation>
-    </message>
     <message>
         <source>These are your Dash addresses for sending payments. Always check the amount and the receiving address before sending coins.</source>
         <translation>송금을 위한 대시 주소입니다. 코인을 보내기 전에 항상 금액과 받는 주소를 확인하세요.</translation>
@@ -94,8 +86,8 @@
         <translation>편집(&amp;E)</translation>
     </message>
     <message>
-        <source>&amp;Show address QR code</source>
-        <translation>주소 QR 코드(&amp;S)</translation>
+        <source>Show address &amp;QR code</source>
+        <translation>주소와 QR 코드 보기(&amp;Q)</translation>
     </message>
     <message>
         <source>QR code</source>
@@ -105,6 +97,24 @@
         <source>Export Address List</source>
         <translation>주소 목록 추출</translation>
     </message>
+    <message>
+        <source>Comma separated file</source>
+        <extracomment>Expanded name of the CSV file format. See: https://en.wikipedia.org/wiki/Comma-separated_values.</extracomment>
+        <translation>쉼표로 구분된 파일</translation>
+    </message>
+    <message>
+        <source>There was an error trying to save the address list to %1. Please try again.</source>
+        <extracomment>An error message. %1 is a stand-in argument for the name of the file we attempted to save to.</extracomment>
+        <translation>%1에 주소 목록을 저장하는 동안 오류가 발생했습니다. 다시 시도해주세요.</translation>
+    </message>
+    <message>
+        <source>Sending addresses - %1</source>
+        <translation>보내는 주소 - %1</translation>
+    </message>
+    <message>
+        <source>Receiving addresses - %1</source>
+        <translation>받는 주소 - %1</translation>
+    </message>
     <message>
         <source>Exporting Failed</source>
         <translation>추출에 실패하였습니다.</translation>
@@ -274,10 +284,22 @@
         <source>The passphrase entered for the wallet decryption was incorrect.</source>
         <translation>지갑 해독을 위해 입력한 암호문이 틀립니다.</translation>
     </message>
+    <message>
+        <source>The passphrase entered for the wallet decryption is incorrect. It contains a null character (ie - a zero byte). If the passphrase was set with a version of this software prior to 23.0, please try again with only the characters up to — but not including — the first null character. If this is successful, please set a new passphrase to avoid this issue in the future.</source>
+        <translation>지갑 복호화를 위해 입력한 암호가 올바르지 않습니다. null 문자(즉, 0바이트)가 포함되어 있습니다. 23.0 이전 버전의 소프트웨어에서 암호를 설정한 경우, 첫 번째 null 문자까지(null 문자는 포함하지 않음)의 문자만 사용하여 다시 시도하십시오. 성공하면 향후 이 문제를 방지하기 위해 새 암호를 설정하십시오.</translation>
+    </message>
     <message>
         <source>Wallet passphrase was successfully changed.</source>
         <translation>지갑 암호문이 성공적으로 변경되었습니다.</translation>
     </message>
+    <message>
+        <source>Passphrase change failed</source>
+        <translation>암호 변경 실패</translation>
+    </message>
+    <message>
+        <source>The old passphrase entered for the wallet decryption is incorrect. It contains a null character (ie - a zero byte). If the passphrase was set with a version of this software prior to 23.0, please try again with only the characters up to — but not including — the first null character.</source>
+        <translation>지갑 복호화를 위해 입력한 이전 암호가 올바르지 않습니다. null 문자(즉, 0바이트)가 포함되어 있습니다. 23.0 이전 버전의 소프트웨어에서 암호를 설정한 경우, 첫 번째 null 문자까지(null 문자는 포함하지 않음)의 문자만 사용하여 다시 시도하십시오.</translation>
+    </message>
     <message>
         <source>Warning: The Caps Lock key is on!</source>
         <translation>경고: Caps Lock키가 켜져있습니다!</translation>
@@ -303,7 +325,23 @@
 </context>
 <context>
     <name>BitcoinApplication</name>
-    </context>
+    <message>
+        <source>Runaway exception</source>
+        <translation>런어웨이 예외</translation>
+    </message>
+    <message>
+        <source>A fatal error occurred. %1 can no longer continue safely and will quit.</source>
+        <translation>치명적인 오류가 발생하였습니다. 더 이상  %1 가 안전하지 않을 수 있으며 곧 종료될 예정입니다.</translation>
+    </message>
+    <message>
+        <source>Internal error</source>
+        <translation>내부 오류</translation>
+    </message>
+    <message>
+        <source>An internal error occurred. %1 will attempt to continue safely. This is an unexpected bug which can be reported as described below.</source>
+        <translation>내부 오류가 발생했습니다. %1 는 계속해서 안전성을 유지하려 할 것입니다. 이는 예상하지 못한 버그로, 아래에 설명된 바와 같이 보고될 예정입니다.</translation>
+    </message>
+</context>
 <context>
     <name>BitcoinGUI</name>
     <message>
@@ -330,6 +368,10 @@
         <source>Request payments (generates QR codes and dash: URIs)</source>
         <translation>지불 요청하기 (QR코드와 대시 URI가 생성됩니다.)</translation>
     </message>
+    <message>
+        <source>Ctrl+Q</source>
+        <translation>Ctrl+Q</translation>
+    </message>
     <message>
         <source>&amp;Options…</source>
         <translation>옵션(&amp;O)</translation>
@@ -358,6 +400,10 @@
         <source>&amp;Verify message…</source>
         <translation>메시지 검증…(&amp;V)</translation>
     </message>
+    <message>
+        <source>&amp;Load PSBT from file…</source>
+        <translation>파일에서 PSBT 불러오기(&amp;L)...</translation>
+    </message>
     <message>
         <source>&amp;Sending addresses</source>
         <translation>보내기 주소(&amp;S)</translation>
@@ -390,10 +436,6 @@
         <source>&amp;Window</source>
         <translation>창(&amp;W)</translation>
     </message>
-    <message>
-        <source>Minimize</source>
-        <translation>최소화</translation>
-    </message>
     <message>
         <source>Zoom</source>
         <translation>줌</translation>
@@ -446,14 +488,6 @@
         <source>Modify configuration options for %1</source>
         <translation>%1 설정 옵션 수정</translation>
     </message>
-    <message>
-        <source>&amp;Show / Hide</source>
-        <translation>보이기 / 숨기기(&amp;S)</translation>
-    </message>
-    <message>
-        <source>Show or hide the main Window</source>
-        <translation>메인창 보이기 또는 숨기기</translation>
-    </message>
     <message>
         <source>Encrypt the private keys that belong to your wallet</source>
         <translation>지갑에 해당하는 개인 키 암호화하기</translation>
@@ -518,10 +552,6 @@
         <source>Show wallet repair options</source>
         <translation>지갑 복구 옵션을 표시합니다.</translation>
     </message>
-    <message>
-        <source>Open Wallet &amp;Configuration File</source>
-        <translation>지갑 설정 파일 열기(&amp;C)</translation>
-    </message>
     <message>
         <source>Open configuration file</source>
         <translation>설정 파일을 엽니다.</translation>
@@ -576,10 +606,40 @@
         <source>Show information about %1</source>
         <translation>%1에 관한 정보를 표시합니다</translation>
     </message>
+    <message>
+        <source>Load PSBT from &amp;clipboard…</source>
+        <translation>클립보드에서 PSBT 불러오기(&amp;C)…</translation>
+    </message>
+    <message>
+        <source>Open debugging and diagnostic console</source>
+        <translation>디버깅 및 진단 콘솔 열기</translation>
+    </message>
+    <message>
+        <source>Open &amp;wallet configuration file</source>
+        <translation>지갑 설정 파일 열기(&amp;W)</translation>
+    </message>
+    <message>
+        <source>Open a dash: URI</source>
+        <translation>대시: URI 열기</translation>
+    </message>
     <message>
         <source>Create a new wallet</source>
         <translation>새로운 지갑 생성하기</translation>
     </message>
+    <message>
+        <source>Restore Wallet…</source>
+        <extracomment>Name of the menu item that restores wallet from a backup file.</extracomment>
+        <translation>지갑 복원…</translation>
+    </message>
+    <message>
+        <source>Restore a wallet from a backup file</source>
+        <extracomment>Status tip for Restore Wallet menu item</extracomment>
+        <translation>백업 파일에서 지갑 복원</translation>
+    </message>
+    <message>
+        <source>Close all wallets</source>
+        <translation>모든 지갑 닫기</translation>
+    </message>
     <message>
         <source>%1 &amp;information</source>
         <translation>%1 정보</translation>
@@ -588,10 +648,42 @@
         <source>Show the %1 basic information</source>
         <translation>%1 기본 정보를 보여줍니다</translation>
     </message>
+    <message>
+        <source>&amp;Discreet mode</source>
+        <translation>비공개 모드(&amp;D)</translation>
+    </message>
+    <message>
+        <source>Mask the values in the Overview tab</source>
+        <translation>전체보기 탭에서 값 가리기</translation>
+    </message>
+    <message>
+        <source>Wallet Data</source>
+        <extracomment>Name of the wallet data file format.</extracomment>
+        <translation>지갑 데이터</translation>
+    </message>
+    <message>
+        <source>Load Wallet Backup</source>
+        <extracomment>The title for Restore Wallet File Windows</extracomment>
+        <translation>지갑 백업 불러오기</translation>
+    </message>
+    <message>
+        <source>Restore Wallet</source>
+        <extracomment>Title of pop-up window shown when the user is attempting to restore a wallet.</extracomment>
+        <translation>지갑 복원</translation>
+    </message>
+    <message>
+        <source>Wallet Name</source>
+        <extracomment>Label of the input field where the name of the wallet is entered.</extracomment>
+        <translation>지갑 이름</translation>
+    </message>
     <message>
         <source>&amp;Settings</source>
         <translation>설정(&amp;S)</translation>
     </message>
+    <message>
+        <source>&amp;Minimize</source>
+        <translation>최소화(&amp;M)</translation>
+    </message>
     <message>
         <source>&amp;Help</source>
         <translation>도움말(&amp;H)</translation>
@@ -608,8 +700,17 @@
         <source>View Governance Proposals</source>
         <translation>거버넌스 제안서 보기</translation>
     </message>
+    <message>
+        <source>&amp;Hide</source>
+        <translation>숨기기(&amp;H)</translation>
+    </message>
+    <message>
+        <source>S&amp;how</source>
+        <translation>표시(&amp;H)</translation>
+    </message>
     <message numerus="yes">
         <source>%n active connection(s) to Dash network</source>
+        <extracomment>A substring of the tooltip.</extracomment>
         <translation><numerusform>대시 네트워크의 활성 연결 수는 %n 입니다.</numerusform></translation>
     </message>
     <message>
@@ -628,10 +729,50 @@
         <source>Close Wallet…</source>
         <translation>지갑을 닫습니다…</translation>
     </message>
+    <message>
+        <source>Load Partially Signed Blockchain Transaction</source>
+        <translation>일부 서명된 블록체인 거래 불러오기</translation>
+    </message>
+    <message>
+        <source>Load Partially Signed Blockchain Transaction from clipboard</source>
+        <translation>클립보드에서 일부 서명된 블록체인 거래 불러오기</translation>
+    </message>
     <message>
         <source>Create Wallet…</source>
         <translation>지갑을 생성합니다…</translation>
     </message>
+    <message>
+        <source>Close All Wallets…</source>
+        <translation>모든 지갑을 닫습니다...</translation>
+    </message>
+    <message>
+        <source>Ctrl+Shift+D</source>
+        <translation>Ctrl+Shift+D</translation>
+    </message>
+    <message>
+        <source>Ctrl+M</source>
+        <translation>Ctrl+M</translation>
+    </message>
+    <message>
+        <source>Click for more actions.</source>
+        <extracomment>A substring of the tooltip. "More actions" are available via the context menu.</extracomment>
+        <translation>더 많은 동작을 원하면 클릭하세요.</translation>
+    </message>
+    <message>
+        <source>Show Peers tab</source>
+        <extracomment>A context menu item. The "Peers tab" is an element of the "Node window".</extracomment>
+        <translation>피어 탭 표시하기</translation>
+    </message>
+    <message>
+        <source>Disable network activity</source>
+        <extracomment>A context menu item.</extracomment>
+        <translation>네트워크 활동 사용 중지하기</translation>
+    </message>
+    <message>
+        <source>Enable network activity</source>
+        <extracomment>A context menu item. The network activity was disabled previously.</extracomment>
+        <translation>네트워크 활동 사용하기</translation>
+    </message>
     <message>
         <source>Syncing Headers (%1%)…</source>
         <translation>헤더 동기화중 (%1%)…</translation>
@@ -648,10 +789,6 @@
         <source>Processing blocks on disk…</source>
         <translation>디스크에서 블록 처리중…</translation>
     </message>
-    <message>
-        <source>Reindexing blocks on disk…</source>
-        <translation>디스크에서 블록 다시 색인중…</translation>
-    </message>
     <message>
         <source>Connecting to peers…</source>
         <translation>피어에 연결중…</translation>
@@ -805,10 +942,6 @@
         <source>Coin Selection</source>
         <translation>코인 선택</translation>
     </message>
-    <message>
-        <source>Dust:</source>
-        <translation>더스트:</translation>
-    </message>
     <message>
         <source>After Fee:</source>
         <translation>수수료 이후:</translation>
@@ -866,28 +999,32 @@
         <translation>확인됨</translation>
     </message>
     <message>
-        <source>Copy address</source>
-        <translation>주소 복사</translation>
+        <source>Copy amount</source>
+        <translation>거래액 복사</translation>
+    </message>
+    <message>
+        <source>&amp;Copy address</source>
+        <translation>주소 복사(&amp;C)</translation>
     </message>
     <message>
-        <source>Copy label</source>
-        <translation>라벨 복사</translation>
+        <source>Copy &amp;label</source>
+        <translation>라벨 복사(&amp;l)</translation>
     </message>
     <message>
-        <source>Copy amount</source>
-        <translation>거래액 복사</translation>
+        <source>Copy &amp;amount</source>
+        <translation>금액 복사(&amp;a)</translation>
     </message>
     <message>
-        <source>Copy transaction ID</source>
-        <translation>거래 아이디 복사</translation>
+        <source>Copy transaction &amp;ID and output index</source>
+        <translation>거래 아이디(&amp;ID) 및 아웃풋 인덱스 복사</translation>
     </message>
     <message>
-        <source>Lock unspent</source>
-        <translation>사용되지 않은 주소 잠금</translation>
+        <source>L&amp;ock unspent</source>
+        <translation>사용하지 않은 주소 잠금(&amp;L)</translation>
     </message>
     <message>
-        <source>Unlock unspent</source>
-        <translation>사용되지 않은 주소 잠금 해제</translation>
+        <source>&amp;Unlock unspent</source>
+        <translation>사용하지 않은 주소 잠금 해제(&amp;U)</translation>
     </message>
     <message>
         <source>Copy quantity</source>
@@ -905,10 +1042,6 @@
         <source>Copy bytes</source>
         <translation>바이트 복사</translation>
     </message>
-    <message>
-        <source>Copy dust</source>
-        <translation>더스트 복사</translation>
-    </message>
     <message>
         <source>Copy change</source>
         <translation>잔돈 복사</translation>
@@ -921,18 +1054,6 @@
         <source>(%1 locked)</source>
         <translation>(%1 잠금)</translation>
     </message>
-    <message>
-        <source>yes</source>
-        <translation>예</translation>
-    </message>
-    <message>
-        <source>no</source>
-        <translation>아니오</translation>
-    </message>
-    <message>
-        <source>This label turns red if any recipient receives an amount smaller than the current dust threshold.</source>
-        <translation>수령인이 현재 더스트 임계값보다 작은 양을 수신하면 이 라벨이 빨간색으로 변합니다.</translation>
-    </message>
     <message>
         <source>Can vary +/- %1 duff(s) per input.</source>
         <translation>입력당 +/- %1 더프가 달라질 수 있습니다.</translation>
@@ -976,8 +1097,14 @@
 </context>
 <context>
     <name>CreateWalletActivity</name>
+    <message>
+        <source>Create Wallet</source>
+        <extracomment>Title of window indicating the progress of creation of a new wallet.</extracomment>
+        <translation>지갑 생성하기</translation>
+    </message>
     <message>
         <source>Creating Wallet &lt;b&gt;%1&lt;/b&gt;…</source>
+        <extracomment>Descriptive text of the create wallet progress window which indicates to the user which wallet is currently being created.</extracomment>
         <translation>지갑 &lt;b&gt;%1&lt;/b&gt; 생성중…</translation>
     </message>
     <message>
@@ -999,6 +1126,10 @@
         <source>Wallet Name</source>
         <translation>지갑 이름</translation>
     </message>
+    <message>
+        <source>Wallet</source>
+        <translation>지갑</translation>
+    </message>
     <message>
         <source>Encrypt the wallet. The wallet will be encrypted with a passphrase of your choice.</source>
         <translation>지갑을 암호화합니다. 이 지갑은 귀하가 선택한 암호를 통해 암호화됩니다.</translation>
@@ -1007,6 +1138,10 @@
         <source>Encrypt Wallet</source>
         <translation>지갑 암호화</translation>
     </message>
+    <message>
+        <source>Advanced Options</source>
+        <translation>향상된 옵션</translation>
+    </message>
     <message>
         <source>Disable private keys for this wallet. Wallets with private keys disabled will have no private keys and cannot have an HD seed or imported private keys. This is ideal for watch-only wallets.</source>
         <translation>이 지갑에 대한 개인 키를 해제합니다. 개인 키가 해제된 지갑은 더이상 개인 키를 갖지 않게 되며 HD 시드나 불러온 개인 키를 가질 수 없습니다. 해당 기능은 읽기 전용 지갑에 적합합니다.</translation>
@@ -1023,11 +1158,23 @@
         <source>Make Blank Wallet</source>
         <translation>빈 지갑 만들기</translation>
     </message>
+    <message>
+        <source>Use descriptors for scriptPubKey management. This feature is well-tested but still considered experimental and not recommended for use yet.</source>
+        <translation>scriptPubKey 설정을 위해 설명자를 사용합니다. 이 기능은 테스트를 마쳤으나 실험적인 것으로 간주되어 아직 사용을 권장하지 않습니다.</translation>
+    </message>
+    <message>
+        <source>Descriptor Wallet (EXPERIMENTAL)</source>
+        <translation>설명자 지갑 (실험)</translation>
+    </message>
     <message>
         <source>Create</source>
         <translation>생성하기</translation>
     </message>
-    </context>
+    <message>
+        <source>Compiled without sqlite support (required for descriptor wallets)</source>
+        <translation>SQL라이트 지원 없이 컴파일 (설명자 지갑에 필요)</translation>
+    </message>
+</context>
 <context>
     <name>EditAddressDialog</name>
     <message>
@@ -1116,18 +1263,106 @@
         <source>Filter List:</source>
         <translation>필터 목록:</translation>
     </message>
+    <message>
+        <source>Filter proposal list</source>
+        <translation>제안서 목록 필터</translation>
+    </message>
+    <message>
+        <source>Masternode Count:</source>
+        <translation>마스터노드 수:</translation>
+    </message>
+    <message>
+        <source>Number of masternodes this wallet can vote with (masternodes for which this wallet holds the voting key)</source>
+        <translation>이 지갑으로 투표할 수 있는 마스터노드 수(이 지갑이 투표 키를 보유한 마스터노드)</translation>
+    </message>
     <message>
         <source>Proposal Count:</source>
         <translation>제안서 수:</translation>
     </message>
+    <message>
+        <source>Create Proposal</source>
+        <translation>제안서 작성</translation>
+    </message>
     <message>
         <source>Filter by Title</source>
         <translation>제목으로 필터</translation>
     </message>
+    <message>
+        <source>Unavailable</source>
+        <translation>사용 불가</translation>
+    </message>
+    <message>
+        <source>A synced node and an unlocked wallet are required.</source>
+        <translation>동기화된 노드와 잠금 해제된 지갑이 필요합니다.</translation>
+    </message>
+    <message>
+        <source>Vote Yes</source>
+        <translation>찬성 투표</translation>
+    </message>
+    <message>
+        <source>Vote No</source>
+        <translation>반대 투표</translation>
+    </message>
+    <message>
+        <source>Vote Abstain</source>
+        <translation>기권 투표</translation>
+    </message>
     <message>
         <source>Proposal Info: %1</source>
         <translation>제안서 정보: %1</translation>
     </message>
+    <message>
+        <source>Voting Failed</source>
+        <translation>투표 실패</translation>
+    </message>
+    <message>
+        <source>No wallet available.</source>
+        <translation>사용 가능한 지갑이 없습니다.</translation>
+    </message>
+    <message>
+        <source>No masternode voting keys found in wallet.</source>
+        <translation>지갑에서 마스터노드 투표 키를 찾을 수 없습니다.</translation>
+    </message>
+    <message>
+        <source>Please select a proposal to vote on.</source>
+        <translation>투표할 제안서를 선택하십시오.</translation>
+    </message>
+    <message>
+        <source>Unable to unlock wallet.</source>
+        <translation>지갑 잠금을 해제할 수 없습니다.</translation>
+    </message>
+    <message>
+        <source>Unable to get masternode list. Please try again later.</source>
+        <translation>마스터노드 목록을 가져올 수 없습니다. 나중에 다시 시도하십시오.</translation>
+    </message>
+    <message>
+        <source>Masternode %1 not found</source>
+        <translation>마스터노드 %1을 찾을 수 없습니다</translation>
+    </message>
+    <message>
+        <source>Failed to sign vote for masternode %1</source>
+        <translation>마스터노드 %1에 대한 투표 서명 실패</translation>
+    </message>
+    <message>
+        <source>Masternode %1: %2</source>
+        <translation>마스터노드 %1: %2</translation>
+    </message>
+    <message numerus="yes">
+        <source>Voted successfully %n time(s)</source>
+        <translation><numerusform>%n번 성공적으로 투표했습니다</numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <source>Failed to vote %n time(s)</source>
+        <translation><numerusform>%n번 투표 실패</numerusform></translation>
+    </message>
+    <message>
+        <source>Errors:</source>
+        <translation>오류:</translation>
+    </message>
+    <message>
+        <source>Voting Results</source>
+        <translation>투표 결과</translation>
+    </message>
 </context>
 <context>
     <name>HelpMessageDialog</name>
@@ -1166,10 +1401,26 @@
         <source>As this is the first time the program is launched, you can choose where %1 will store its data.</source>
         <translation>프로그램을 처음으로 실행합니다. 어디에 %1 데이터를 저장 할 지 선택할 수 있습니다. </translation>
     </message>
+    <message>
+        <source>Limit block chain storage to</source>
+        <translation>다음으로 블록체인 저장을 제한하기</translation>
+    </message>
+    <message>
+        <source>Reverting this setting requires re-downloading the entire blockchain. It is faster to download the full chain first and prune it later. Disables some advanced features.</source>
+        <translation>이 설정을 되돌리기 위해서는 전체 블록체인을 다시 다운받아야 합니다. 전체 블록체인을 다운받은 이후 정리하는 것이 더 빠릅니다. 일부 고급 기능을 비활성화합니다.</translation>
+    </message>
+    <message>
+        <source> GB</source>
+        <translation> GB</translation>
+    </message>
     <message>
         <source>This initial synchronisation is very demanding, and may expose hardware problems with your computer that had previously gone unnoticed. Each time you run %1, it will continue downloading where it left off.</source>
         <translation>초기 동기화는 매우 오래 걸리며 이전에는 본 적 없는  하드웨어 문제가 발생할 수 있습니다. %1을 실행할 때마다 중단 된 곳에서 다시 계속 다운로드 됩니다.</translation>
     </message>
+    <message>
+        <source>When you click OK, %1 will begin to download and process the full %4 block chain (%2 GB) starting with the earliest transactions in %3 when %4 initially launched.</source>
+        <translation>확인을 클릭하면 %1이 %4를 처음 시작할 때 %3의 가장 빠른 거래부터 전체 %4 블록 체인(%2GB)을 다운로드하고 처리하기 시작합니다.</translation>
+    </message>
     <message>
         <source>If you have chosen to limit block chain storage (pruning), the historical data must still be downloaded and processed, but will be deleted afterward to keep your disk usage low.</source>
         <translation>블록 체인 저장 영역 (블록축소)을 제한하도록 선택한 경우, 이력 데이터는 계속해서 다운로드 및 처리 되어야 하지만 차후 디스크 용량을 줄이기 위해 삭제됩니다.</translation>
@@ -1182,6 +1433,18 @@
         <source>Use a custom data directory:</source>
         <translation>사용자 설정 데이터 디렉토리 사용하기</translation>
     </message>
+    <message numerus="yes">
+        <source>%n GB of space available</source>
+        <translation><numerusform>%n GB의 공간 사용 가능</numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <source>(of %n GB needed)</source>
+        <translation><numerusform>(필요한 %n GB 중)</numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <source>(%n GB needed for full chain)</source>
+        <translation><numerusform>(전체 체인에 %n GB 필요)</numerusform></translation>
+    </message>
     <message>
         <source>At least %1 GB of data will be stored in this directory, and it will grow over time.</source>
         <translation>최소 %1 GB의 데이터가 이 디렉토리에 저장되며 시간이 지남에 따라 증가할 것입니다.</translation>
@@ -1190,6 +1453,11 @@
         <source>Approximately %1 GB of data will be stored in this directory.</source>
         <translation>약 %1 GB의 데이터가 이 디렉토리에 저장됩니다.</translation>
     </message>
+    <message numerus="yes">
+        <source>(sufficient to restore backups %n day(s) old)</source>
+        <extracomment>Explanatory text on the capability of the current prune target.</extracomment>
+        <translation><numerusform>(%n일 전 백업을 복원하기에 충분)</numerusform></translation>
+    </message>
     <message>
         <source>%1 will download and store a copy of the Dash block chain.</source>
         <translation>%1은 비트코인 블록체인의 사본을 다운로드하여 저장합니다.</translation>
@@ -1207,6 +1475,13 @@
         <translation>오류</translation>
     </message>
 </context>
+<context>
+    <name>LoadWalletsActivity</name>
+    <message>
+        <source>Loading wallets…</source>
+        <translation>지갑 불러오는 중…</translation>
+    </message>
+</context>
 <context>
     <name>MasternodeList</name>
     <message>
@@ -1241,6 +1516,10 @@
         <source>Service</source>
         <translation>서비스</translation>
     </message>
+    <message>
+        <source>Type</source>
+        <translation>유형</translation>
+    </message>
     <message>
         <source>PoSe Score</source>
         <translation>PoSe 스코어</translation>
@@ -1376,6 +1655,10 @@
         <source>Hide</source>
         <translation>숨기기</translation>
     </message>
+    <message>
+        <source>%1 is currently syncing.  It will download headers and blocks from peers and validate them until reaching the tip of the block chain.</source>
+        <translation>현지 %1이 동기화중입니다. 피어에서 헤더 및 블록을 다운로드하고 블록체인의 끝에 도달할 때까지 유효성을 검사합니다.</translation>
+    </message>
     <message>
         <source>Unknown. Syncing Headers (%1, %2%)…</source>
         <translation>알 수 없음. 헤더 동기화중 (%1, %2%)…</translation>
@@ -1391,6 +1674,11 @@
         <source>URI:</source>
         <translation>URI:</translation>
     </message>
+    <message>
+        <source>Paste address from clipboard</source>
+        <extracomment>Tooltip text for button that allows you to paste an address that is in your clipboard.</extracomment>
+        <translation>클립보드에서 주소 붙여넣기</translation>
+    </message>
 </context>
 <context>
     <name>OpenWalletActivity</name>
@@ -1406,8 +1694,14 @@
         <source>default wallet</source>
         <translation>기본 지갑</translation>
     </message>
+    <message>
+        <source>Open Wallet</source>
+        <extracomment>Title of window indicating the progress of opening of a wallet.</extracomment>
+        <translation>지갑 열기</translation>
+    </message>
     <message>
         <source>Opening Wallet &lt;b&gt;%1&lt;/b&gt;…</source>
+        <extracomment>Descriptive text of the open wallet progress window which indicates to the user which wallet is currently being opened.</extracomment>
         <translation>지갑 &lt;b&gt;%1&lt;/b&gt; 여는 중…</translation>
     </message>
 </context>
@@ -1441,6 +1735,14 @@
         <source>&amp;Appearance</source>
         <translation>외관(&amp;A)</translation>
     </message>
+    <message>
+        <source>Show the icon in the system tray.</source>
+        <translation>시스템 트레이에서 아이콘 보기</translation>
+    </message>
+    <message>
+        <source>&amp;Show tray icon</source>
+        <translation>트레이 아이콘 보기(&amp;S)</translation>
+    </message>
     <message>
         <source>Prune &amp;block storage to</source>
         <translation>블록 스토리지 정렬(&amp;b)</translation>
@@ -1453,10 +1755,58 @@
         <source>Reverting this setting requires re-downloading the entire blockchain.</source>
         <translation>이 설정을 되돌리면 전체 블록체인을 다시 다운받아야 합니다.</translation>
     </message>
+    <message>
+        <source>Maximum database cache size. A larger cache can contribute to faster sync, after which the benefit is less pronounced for most use cases. Lowering the cache size will reduce memory usage. Unused mempool memory is shared for this cache.</source>
+        <extracomment>Tooltip text for Options window setting that sets the size of the database cache. Explains the corresponding effects of increasing/decreasing this value.</extracomment>
+        <translation>최대 데이터베이스 캐시 크기. 캐시가 클 수록 더 빠른 동기화를 지원하지만, 대부분의 사용 사례에서 그 장점이 덜 부각됩니다. 캐시 크기를 줄이면 메모리 사용이 감소합니다. 사용되지 않은 멤풀 메모리는 이 캐시에 공유됩니다.</translation>
+    </message>
     <message>
         <source>MiB</source>
         <translation>MiB</translation>
     </message>
+    <message>
+        <source>Set the number of script verification threads. Negative values correspond to the number of cores you want to leave free to the system.</source>
+        <extracomment>Tooltip text for Options window setting that sets the number of script verification threads. Explains that negative values mean to leave these many cores free to the system.</extracomment>
+        <translation>스크립트 인증 스레드의 갯수 설정. 음수값은 시스템에 여유롭게 남기기를 원하는 코어의 숫자에 상응합니다.</translation>
+    </message>
+    <message>
+        <source>This allows you or a third party tool to communicate with the node through command-line and JSON-RPC commands.</source>
+        <extracomment>Tooltip text for Options window setting that enables the RPC server.</extracomment>
+        <translation>이로써 당신 혹은 제3자 도구가 명령줄 및 JSON-RPC 명령을 통해 노드와 커뮤니케이션할 수 있게 됩니다.</translation>
+    </message>
+    <message>
+        <source>Enable R&amp;PC server</source>
+        <extracomment>An Options window setting to enable the RPC server.</extracomment>
+        <translation>R&amp;PC 서버 활성화</translation>
+    </message>
+    <message>
+        <source>Whether to set subtract fee from amount as default or not.</source>
+        <extracomment>Tooltip text for Options window setting that sets subtracting the fee from a sending amount as default.</extracomment>
+        <translation>금액에서 수수료를 차감하는 것을 기본값으로 할 지의 여부</translation>
+    </message>
+    <message>
+        <source>Subtract &amp;fee from amount by default</source>
+        <extracomment>An Options window setting to set subtracting the fee from a sending amount as default.</extracomment>
+        <translation>기본값으로 금액에서 수수료를 차감(&amp;f)</translation>
+    </message>
+    <message>
+        <source>Enable &amp;PSBT controls</source>
+        <extracomment>An options window setting to enable PSBT controls.</extracomment>
+        <translation>PSBT 컨트롤 활성화(&amp;P)</translation>
+    </message>
+    <message>
+        <source>Whether to show PSBT controls.</source>
+        <extracomment>Tooltip text for options window setting that enables PSBT controls.</extracomment>
+        <translation>PSBT 컨트롤을 표시할지 여부.</translation>
+    </message>
+    <message>
+        <source>Whether to keep the specified custom change address or not.</source>
+        <translation>지정된 사용자 변경 주소를 유지할 지의 여부.</translation>
+    </message>
+    <message>
+        <source>Keep custom change &amp;address</source>
+        <translation>사용자 변경 주소 유지(&amp;a)</translation>
+    </message>
     <message>
         <source>Show additional tab listing all your masternodes in first sub-tab&lt;br/&gt;and all masternodes on the network in second sub-tab.</source>
         <translation>추가적인 탭 목록을 보여줍니다. 당신의 모든 마스터노드는 첫 번째 서브 탭에 표시되고,&lt;br/&gt; 네트워크상의 전체 마스터노드는 두 번째 서브 탭에 표시됩니다.</translation>
@@ -1513,6 +1863,14 @@
         <source>Enable &amp;multi-session</source>
         <translation>멀티 세션 활성화(&amp;m)</translation>
     </message>
+    <message>
+        <source>Use this many separate masternodes in parallel to mix funds.&lt;br/&gt;Note: You must use this feature carefully.&lt;br/&gt;Make sure you always have recent wallet (auto)backup in a safe place!</source>
+        <translation>이 숫자의 마스터노드를 병렬로 사용하여 자금을 믹싱합니다. &lt;br/&gt;주의: 이 기능을 사용할 때에는 주의하십시오. &lt;br/&gt;언제나 안전한 장소에 최신 지갑 (자동) 백업이 설정되어 있는지 확인하세요!</translation>
+    </message>
+    <message>
+        <source>Parallel sessions</source>
+        <translation>병렬 세션</translation>
+    </message>
     <message>
         <source>Mixing rounds</source>
         <translation>믹싱 라운드</translation>
@@ -1525,6 +1883,30 @@
         <source>Target balance</source>
         <translation>타깃 잔고</translation>
     </message>
+    <message>
+        <source>How many inputs of each denominated amount are created.&lt;br/&gt;Lower these numbers if you want fewer smaller denominations.</source>
+        <translation>각 단위 금액이 생성되는 입력 수. &lt;br/&gt;이 숫자가 줄어들 수록 작은 화폐 단위가 줄어듭니다.</translation>
+    </message>
+    <message>
+        <source>Inputs per denomination</source>
+        <translation>단위 금액당 입력수</translation>
+    </message>
+    <message>
+        <source>Try to create at least this many inputs for each denominated amount.&lt;br/&gt;Lower this number if you want fewer smaller denominations.</source>
+        <translation>각 화폐 단위 금액에 대해 최소한 이정도의 입력값을 생성하세요. &lt;br/&gt;이 숫자가 줄어들 수록 작은 화폐 단위가 줄어듭니다.</translation>
+    </message>
+    <message>
+        <source>Target</source>
+        <translation>타깃</translation>
+    </message>
+    <message>
+        <source>Create up to this many inputs for each denominated amount.&lt;br/&gt;Lower this number if you want fewer smaller denominations.</source>
+        <translation>각 화폐 단위 금액에 대해 최대 이 정도의 입력값을 생성하세요. &lt;br/&gt;이 숫자를 줄어들 수록 작은 화폐 단위가 줄어듭니다.</translation>
+    </message>
+    <message>
+        <source>Maximum</source>
+        <translation>최대</translation>
+    </message>
     <message>
         <source>Automatically open the Dash Core client port on the router. This only works when your router supports UPnP and it is enabled.</source>
         <translation>라우터에서 대시 코어 클라이언트를 자동으로 엽니다. 이 기능은 당신의 라우터가 UPnP를 지원하고 해당 기능이 작동하는 경우에만 가능합니다.</translation>
@@ -1554,20 +1936,26 @@
         <translation>선택된 기본 SOCKS5 프록시가 이 네트워크 유형을 통해 피어에 연결하는 경우에 보여주기</translation>
     </message>
     <message>
-        <source>Options set in this dialog are overridden by the command line or in the configuration file:</source>
-        <translation>이 대화의 옵션 세트는 명령줄에 의해, 혹은 설정 파일에서 중단됩니다:</translation>
+        <source>Language missing or translation incomplete? Help contributing translations here:
+https://explore.transifex.com/dash/dash/</source>
+        <translation>언어가 지원되지 않거나 번역이 불완전한가요? 이곳에서 번역에 참여하세요:
+https://explore.transifex.com/dash/dash/</translation>
     </message>
     <message>
-        <source>Minimize instead of exit the application when the window is closed. When this option is enabled, the application will be closed only after selecting Exit in the menu.</source>
-        <translation>창이 닫히는 경우 종료하지 않고 축소합니다. 이 옵션을 활성화하면 메뉴에서 종료를 선택하는 경우에만 어플리케이션이 종료됩니다.</translation>
+        <source>Third-party URLs (e.g. a block explorer) that appear in the transactions tab as context menu items.&lt;br/&gt;%s in the URL is replaced by transaction hash. Multiple URLs are separated by vertical bar |.</source>
+        <translation>거래 탭에서 컨텍스트 메뉴 항목으로 표시되는 서드파티 URL(예: 블록 탐색기).&lt;br/&gt;URL의 %s는 거래 해시로 대체됩니다. 여러 URL은 수직 바 |로 구분됩니다.</translation>
     </message>
     <message>
-        <source>Third party URLs (e.g. a block explorer) that appear in the transactions tab as context menu items.&lt;br/&gt;%s in the URL is replaced by transaction hash. Multiple URLs are separated by vertical bar |.</source>
-        <translation>거래 탭에 강조 표시된 메뉴 항목으로 나타나는 제3자 URL(예: 블록 탐색기). &lt;br/&gt;해당 URL의 %s 는 거래 해시에 의해 대체됩니다. 다중 URL은 수직 바 | 에 의해 분리됩니다.</translation>
+        <source>&amp;Third-party transaction URLs</source>
+        <translation>서드파티 거래 URL(&amp;T)</translation>
     </message>
     <message>
-        <source>&amp;Third party transaction URLs</source>
-        <translation>제3자 거래 URL(&amp;T)</translation>
+        <source>Options set in this dialog are overridden by the command line or in the configuration file:</source>
+        <translation>이 대화의 옵션 세트는 명령줄에 의해, 혹은 설정 파일에서 중단됩니다:</translation>
+    </message>
+    <message>
+        <source>Minimize instead of exit the application when the window is closed. When this option is enabled, the application will be closed only after selecting Exit in the menu.</source>
+        <translation>창이 닫히는 경우 종료하지 않고 축소합니다. 이 옵션을 활성화하면 메뉴에서 종료를 선택하는 경우에만 어플리케이션이 종료됩니다.</translation>
     </message>
     <message>
         <source>Whether to show coin control features or not.</source>
@@ -1605,6 +1993,10 @@
         <source>Map port using &amp;UPnP</source>
         <translation>UPnP를 사용하는 맵 포트(&amp;U)</translation>
     </message>
+    <message>
+        <source>Automatically open the Dash Core client port on the router. This only works when your router supports NAT-PMP and it is enabled. The external port could be random.</source>
+        <translation>라우터에서 대시 코어 클라이언트 포트를 자동으로 엽니다. 이 기능은 당신의 라우터가 NAT-PMP를 지원하고 활성화되어 있는 경우에만 작동합니다. 이 외부 포트는 무작위일 수 있습니다.</translation>
+    </message>
     <message>
         <source>Proxy &amp;IP:</source>
         <translation>프록시 IP:(&amp;i)</translation>
@@ -1653,6 +2045,14 @@
         <source>&amp;Display</source>
         <translation>디스플레이(&amp;D)</translation>
     </message>
+    <message>
+        <source>Connect to the Dash network through a separate SOCKS5 proxy for Tor onion services.</source>
+        <translation>Tor 어니언 서비스를 위한 별도의 SOCKS5 프록시를 통해 대시 네트워크에 연결합니다</translation>
+    </message>
+    <message>
+        <source>Use separate SOCKS&amp;5 proxy to reach peers via Tor onion services:</source>
+        <translation>Tor 어니언 서비스를 통해 피어에 도달하기 위해서는 별도의 SOCKS&amp;5 프록시를 사용하세요</translation>
+    </message>
     <message>
         <source>User Interface &amp;language:</source>
         <translation>사용자 인터페이스 언어:(&amp;l)</translation>
@@ -1699,14 +2099,22 @@
     </message>
     <message>
         <source>Confirm options reset</source>
+        <extracomment>Window title text of pop-up window shown when the user has chosen to reset options.</extracomment>
         <translation>옵션 초기화 확인</translation>
     </message>
     <message>
         <source>Client restart required to activate changes.</source>
+        <extracomment>Text explaining that the settings changed will not come into effect until the client is restarted.</extracomment>
         <translation>변경 사항을 적용하기 위해서는 프로그램 종료 후 재시작 하여야 합니다.</translation>
     </message>
+    <message>
+        <source>Current settings will be backed up at "%1".</source>
+        <extracomment>Text explaining to the user that the client's current settings will be backed up at a specific location. %1 is a stand-in argument for the backup location's path.</extracomment>
+        <translation>현재 설정이 "%1"에 백업됩니다.</translation>
+    </message>
     <message>
         <source>Client will be shut down. Do you want to proceed?</source>
+        <extracomment>Text asking the user to confirm if they would like to proceed with a client shutdown.</extracomment>
         <translation>클라이언트가 종료됩니다, 계속 진행하시겠습니까?</translation>
     </message>
     <message>
@@ -1844,6 +2252,10 @@
         <source>%1 Balance</source>
         <translation>%1 잔고</translation>
     </message>
+    <message>
+        <source>Discreet mode activated for the Overview tab. To unmask the values, uncheck Settings-&gt;Discreet mode.</source>
+        <translation>이 전체보기 탭을 위해 비공개 모드가 활성화되었습니다. 값을 보려면 설정-&gt;비공개 모드 설정을 해제하세요.</translation>
+    </message>
     <message numerus="yes">
         <source>%n Rounds</source>
         <translation><numerusform>&amp;n 라운드</numerusform></translation>
@@ -1943,7 +2355,140 @@
 </context>
 <context>
     <name>PSBTOperationsDialog</name>
-    </context>
+    <message>
+        <source>Dialog</source>
+        <translation>대화</translation>
+    </message>
+    <message>
+        <source>Sign Tx</source>
+        <translation>Tx 서명</translation>
+    </message>
+    <message>
+        <source>Broadcast Tx</source>
+        <translation>Tx 브로드캐스트</translation>
+    </message>
+    <message>
+        <source>Copy to Clipboard</source>
+        <translation>클립보드에 복사하기</translation>
+    </message>
+    <message>
+        <source>Save…</source>
+        <translation>저장합니다...</translation>
+    </message>
+    <message>
+        <source>Close</source>
+        <translation>닫기</translation>
+    </message>
+    <message>
+        <source>Failed to load transaction: %1</source>
+        <translation>거래를 불러오는 데 실패했습니다: %1</translation>
+    </message>
+    <message>
+        <source>Failed to sign transaction: %1</source>
+        <translation>거래에 서명하는 데 실패했습니다: %1</translation>
+    </message>
+    <message>
+        <source>Cannot sign inputs while wallet is locked.</source>
+        <translation>지갑이 잠긴 상태에서 입력값에 서명할 수 없습니다.</translation>
+    </message>
+    <message>
+        <source>Could not sign any more inputs.</source>
+        <translation>더 이상 입력값에 서명할 수 없습니다.</translation>
+    </message>
+    <message>
+        <source>Signed %1 inputs, but more signatures are still required.</source>
+        <translation>%1 입력값에 서명했으나, 더 많은 서명이 필요합니다.</translation>
+    </message>
+    <message>
+        <source>Signed transaction successfully. Transaction is ready to broadcast.</source>
+        <translation>성공적으로 거래에 서명했습니다. 거래를 브로드캐스트 할 준비를 마쳤습니다.</translation>
+    </message>
+    <message>
+        <source>Unknown error processing transaction.</source>
+        <translation>거래를 처리하는 도중 알 수 없는 오류</translation>
+    </message>
+    <message>
+        <source>Transaction broadcast successfully! Transaction ID: %1</source>
+        <translation>거래를 브로드캐스트하는 데 성공했습니다! 거래 ID: %1</translation>
+    </message>
+    <message>
+        <source>Transaction broadcast failed: %1</source>
+        <translation>거래 브로드캐스트 실패: %1</translation>
+    </message>
+    <message>
+        <source>PSBT copied to clipboard.</source>
+        <translation>PSBT가 클립보드에 복사되었습니다.</translation>
+    </message>
+    <message>
+        <source>Save Transaction Data</source>
+        <translation>거래 데이터 저장하기</translation>
+    </message>
+    <message>
+        <source>Partially Signed Transaction (Binary)</source>
+        <extracomment>Expanded name of the binary PSBT file format. See: BIP 174.</extracomment>
+        <translation>일부 서명된 거래 (2진수)</translation>
+    </message>
+    <message>
+        <source>PSBT saved to disk.</source>
+        <translation>PSBT가 디스크에 저장되었습니다.</translation>
+    </message>
+    <message>
+        <source> * Sends %1 to %2</source>
+        <translation>* %1을 %2에 보냅니다</translation>
+    </message>
+    <message>
+        <source>own address</source>
+        <translation>자신의 주소</translation>
+    </message>
+    <message>
+        <source>Unable to calculate transaction fee or total transaction amount.</source>
+        <translation>거래 수수료 혹은 전체 거래 금액을 계산할 수 없습니다.</translation>
+    </message>
+    <message>
+        <source>Pays transaction fee: </source>
+        <translation>거래 수수료 지불하기:</translation>
+    </message>
+    <message>
+        <source>Total Amount</source>
+        <translation>전체 금액</translation>
+    </message>
+    <message>
+        <source>or</source>
+        <translation>혹은</translation>
+    </message>
+    <message>
+        <source>Transaction has %1 unsigned inputs.</source>
+        <translation>거래에 %1개의 서명되지 않은 입력값이 있습니다.</translation>
+    </message>
+    <message>
+        <source>Transaction is missing some information about inputs.</source>
+        <translation>거래의 입력값에 대한 일부 정보가 누락되었습니다.</translation>
+    </message>
+    <message>
+        <source>Transaction still needs signature(s).</source>
+        <translation>거래에 아직 서명(들)이 필요합니다.</translation>
+    </message>
+    <message>
+        <source>(But no wallet is loaded.)</source>
+        <translation>(그러나 불러온 지갑이 없습니다.)</translation>
+    </message>
+    <message>
+        <source>(But this wallet cannot sign transactions.)</source>
+        <translation>(그러나 이 지갑은 거래에 서명할 수 없습니다.)</translation>
+    </message>
+    <message>
+        <source>(But this wallet does not have the right keys.)</source>
+        <translation>(그러나 이 지갑은 올바른 키가 없습니다.)</translation>
+    </message>
+    <message>
+        <source>Transaction is fully signed and ready for broadcast.</source>
+        <translation>거래가 모두 서명되어 브로드캐스트할 준비를 미쳤습니다.</translation>
+    </message>
+    <message>
+        <source>Transaction status is unknown.</source>
+        <translation>거래 상태를 알 수 없습니다.</translation>
+    </message>
+</context>
 <context>
     <name>PaymentServer</name>
     <message>
@@ -1962,6 +2507,12 @@
         <source>'dash://' is not a valid URI. Use 'dash:' instead.</source>
         <translation>'dash://' 는 유효하지 않은 URI 입니다. 'dash:' 를 사용하세요.</translation>
     </message>
+    <message>
+        <source>Cannot process payment request as BIP70 is no longer supported.
+Due to discontinued support, you should request the merchant to provide you with a BIP21 compatible URI or use a wallet that does continue to support BIP70.</source>
+        <translation>BIP70이 더이상 지원되지 않아 지불 요청을 처리할 수 없습니다.
+지원이 계속되지 않는 이유로, 판매자에게 BIP21 호환 가능한 URI의 제공 혹은 BIP70을 계속해서 지원하는 지갑을 사용하도록 요청해야 합니다.</translation>
+    </message>
     <message>
         <source>URI cannot be parsed! This can be caused by an invalid Dash address or malformed URI parameters.</source>
         <translation>URI를 분석할 수 없습니다! 대시 주소가 유효하지 않거나 URI 파라미터 구성에 오류가 존재할 수 있습니다.</translation>
@@ -1983,6 +2534,26 @@
         <extracomment>Title of Peers Table column which indicates the current latency of the connection with the peer.</extracomment>
         <translation>Ping</translation>
     </message>
+    <message>
+        <source>Peer</source>
+        <extracomment>Title of Peers Table column which contains a unique number used to identify a connection.</extracomment>
+        <translation>피어</translation>
+    </message>
+    <message>
+        <source>Age</source>
+        <extracomment>Title of Peers Table column which indicates the duration (length of time) since the peer connection started.</extracomment>
+        <translation>지속시간</translation>
+    </message>
+    <message>
+        <source>Direction</source>
+        <extracomment>Title of Peers Table column which indicates the direction the peer connection was initiated from.</extracomment>
+        <translation>방향</translation>
+    </message>
+    <message>
+        <source>Type</source>
+        <extracomment>Title of Peers Table column which describes the type of peer connection. The "type" describes why the connection exists.</extracomment>
+        <translation>유형</translation>
+    </message>
     <message>
         <source>Sent</source>
         <extracomment>Title of Peers Table column which indicates the total amount of network information we have sent to the peer.</extracomment>
@@ -1993,7 +2564,27 @@
         <extracomment>Title of Peers Table column which indicates the total amount of network information we have received from the peer.</extracomment>
         <translation>받음</translation>
     </message>
-    </context>
+    <message>
+        <source>Address</source>
+        <extracomment>Title of Peers Table column which contains the IP/Onion/I2P address of the connected peer.</extracomment>
+        <translation>주소</translation>
+    </message>
+    <message>
+        <source>Network</source>
+        <extracomment>Title of Peers Table column which states the network the peer connected through.</extracomment>
+        <translation>네트워크</translation>
+    </message>
+    <message>
+        <source>Inbound</source>
+        <extracomment>An Inbound Connection from a Peer.</extracomment>
+        <translation>인바운드</translation>
+    </message>
+    <message>
+        <source>Outbound</source>
+        <extracomment>An Outbound Connection to a Peer.</extracomment>
+        <translation>아웃바운드</translation>
+    </message>
+</context>
 <context>
     <name>Proposal</name>
     <message>
@@ -2044,8 +2635,193 @@
         <translation>상태</translation>
     </message>
 </context>
+<context>
+    <name>ProposalWizard</name>
+    <message>
+        <source>Create Governance Proposal</source>
+        <translation>거버넌스 제안서 작성</translation>
+    </message>
+    <message>
+        <source>Enter proposal details</source>
+        <translation>제안서 세부 정보 입력</translation>
+    </message>
+    <message>
+        <source>A fee will be burned when you prepare the proposal.</source>
+        <translation>제안서를 준비할 때 수수료가 소각됩니다.</translation>
+    </message>
+    <message>
+        <source>Proposal &amp;name</source>
+        <translation>제안서 이름(&amp;N)</translation>
+    </message>
+    <message>
+        <source>&amp;Description URL</source>
+        <translation>설명 URL(&amp;D)</translation>
+    </message>
+    <message>
+        <source>Payment &amp;address</source>
+        <translation>지급 주소(&amp;A)</translation>
+    </message>
+    <message>
+        <source>Payment &amp;amount</source>
+        <translation>지급 금액(&amp;A)</translation>
+    </message>
+    <message>
+        <source>The amount to request in a single payment</source>
+        <translation>단일 지급으로 요청할 금액</translation>
+    </message>
+    <message>
+        <source>&amp;First payment</source>
+        <translation>첫 번째 지급(&amp;F)</translation>
+    </message>
+    <message>
+        <source>Pa&amp;yments</source>
+        <translation>지급 횟수(&amp;Y)</translation>
+    </message>
+    <message>
+        <source>To&amp;tal amount</source>
+        <translation>총 금액(&amp;T)</translation>
+    </message>
+    <message>
+        <source>Proposal &amp;fee</source>
+        <translation>제안서 수수료(&amp;F)</translation>
+    </message>
+    <message>
+        <source>Next</source>
+        <translation>다음</translation>
+    </message>
+    <message>
+        <source>Review proposal JSON and validate.</source>
+        <translation>제안서 JSON을 검토하고 유효성을 검사합니다.</translation>
+    </message>
+    <message>
+        <source>Hex-encoded JSON</source>
+        <translation>16진수 인코딩 JSON</translation>
+    </message>
+    <message>
+        <source>Back</source>
+        <translation>뒤로</translation>
+    </message>
+    <message>
+        <source>Validate</source>
+        <translation>검증</translation>
+    </message>
+    <message>
+        <source>Prepare (burn fee) and wait for confirmations.</source>
+        <translation>준비(수수료 소각)하고 확인을 기다립니다.</translation>
+    </message>
+    <message>
+        <source>Copy</source>
+        <translation>복사</translation>
+    </message>
+    <message>
+        <source>At 1/6 confirmations: can be relayed and queued. At 6/6: accepted and processed.</source>
+        <translation>1/6 확인: 릴레이 및 대기열 가능. 6/6: 수락 및 처리됨.</translation>
+    </message>
+    <message>
+        <source>Confirmations progress</source>
+        <translation>확인 진행 상황</translation>
+    </message>
+    <message>
+        <source>Shows progress toward the required number of confirmations for the proposal fee transaction.</source>
+        <translation>제안서 수수료 거래에 필요한 확인 수에 대한 진행 상황을 표시합니다.</translation>
+    </message>
+    <message>
+        <source>Estimated time remaining: -</source>
+        <translation>예상 남은 시간: -</translation>
+    </message>
+    <message>
+        <source>Prepare Proposal</source>
+        <translation>제안서 준비</translation>
+    </message>
+    <message>
+        <source>You can submit after 1 confirmation. At 6 confirmations it is accepted and processed.</source>
+        <translation>1번 확인 후 제출할 수 있습니다. 6번 확인되면 수락 및 처리됩니다.</translation>
+    </message>
+    <message>
+        <source>Proposal ID:</source>
+        <translation>제안서 ID:</translation>
+    </message>
+    <message>
+        <source>Submit Proposal</source>
+        <translation>제안서 제출</translation>
+    </message>
+    <message>
+        <source>Close</source>
+        <translation>닫기</translation>
+    </message>
+    <message>
+        <source>Valid</source>
+        <translation>유효함</translation>
+    </message>
+    <message>
+        <source>Invalid: %1</source>
+        <translation>유효하지 않음: %1</translation>
+    </message>
+    <message>
+        <source>Burn %1</source>
+        <translation>%1 소각</translation>
+    </message>
+    <message>
+        <source>Burn %1 to create the fee transaction?</source>
+        <translation>수수료 거래를 생성하기 위해 %1을 소각하시겠습니까?</translation>
+    </message>
+    <message>
+        <source>Prepare failed</source>
+        <translation>준비 실패</translation>
+    </message>
+    <message>
+        <source>Confirmations: %1 / %2 required</source>
+        <translation>확인: %1 / %2 필요</translation>
+    </message>
+    <message>
+        <source>Estimated time remaining: Ready</source>
+        <translation>예상 남은 시간: 준비됨</translation>
+    </message>
+    <message numerus="yes">
+        <source>Estimated time remaining: %n minute(s)</source>
+        <translation><numerusform>예상 남은 시간: %n분</numerusform></translation>
+    </message>
+    <message>
+        <source>Your proposal was submitted successfully.</source>
+        <translation>제안서가 성공적으로 제출되었습니다.</translation>
+    </message>
+    <message>
+        <source>Already submitted</source>
+        <translation>이미 제출됨</translation>
+    </message>
+    <message>
+        <source>This proposal has already been submitted.</source>
+        <translation>이 제안서는 이미 제출되었습니다.</translation>
+    </message>
+    <message>
+        <source>Submission failed</source>
+        <translation>제출 실패</translation>
+    </message>
+    <message>
+        <source>Proposal submitted</source>
+        <translation>제안서 제출됨</translation>
+    </message>
+    <message>
+        <source>A fee of %1 will be burned when you prepare the proposal.</source>
+        <translation>제안서를 준비할 때 %1의 수수료가 소각됩니다.</translation>
+    </message>
+    <message>
+        <source>Prepare (burn %1) and wait for %2 confirmations.</source>
+        <translation>준비(%1 소각)하고 %2번 확인을 기다립니다.</translation>
+    </message>
+</context>
 <context>
     <name>QObject</name>
+    <message>
+        <source>Do you want to reset settings to default values, or to abort without making changes?</source>
+        <extracomment>Explanatory text shown on startup when the settings file cannot be read. Prompts user to make a choice between resetting or aborting.</extracomment>
+        <translation>설정을 기본값으로 재설정하시겠습니까, 혹은 변경 사항 없이 중단하시겠습니까?</translation>
+    </message>
+    <message>
+        <source>A fatal error occurred. Check that settings file is writable, or try running with -nosettings.</source>
+        <extracomment>Explanatory text shown on startup when the settings file could not be written. Prompts user to check that we have the ability to write to the file. Explains that the user has the option of running without a settings file.</extracomment>
+        <translation>치명적인 오류가 발생했습니다. 설정 파일이 쓰기 가능한지 확인하시거나, -nosetting으로 실행해보세요.</translation>
+    </message>
     <message>
         <source>Choose data directory on startup (default: %u)</source>
         <translation>실행시 데이터 디렉토리 선택하기 (기본값: %u)</translation>
@@ -2146,6 +2922,53 @@
         <source>This can also be adjusted later in the "Appearance" tab of the preferences.</source>
         <translation>이는 이후 "외관" 탭에서 선호에 따라 다시 조정할 수 있습니다.</translation>
     </message>
+    <message>
+        <source>Ctrl+W</source>
+        <translation>Ctrl+W</translation>
+    </message>
+    <message>
+        <source>Unroutable</source>
+        <translation>라우팅 할 수 없음</translation>
+    </message>
+    <message>
+        <source>Internal</source>
+        <translation>내부</translation>
+    </message>
+    <message>
+        <source>Inbound</source>
+        <extracomment>An inbound connection from a peer. An inbound connection is a connection initiated by a peer.</extracomment>
+        <translation>인바운드</translation>
+    </message>
+    <message>
+        <source>Outbound</source>
+        <extracomment>An outbound connection to a peer. An outbound connection is a connection initiated by us.</extracomment>
+        <translation>아웃바운드</translation>
+    </message>
+    <message>
+        <source>Full Relay</source>
+        <extracomment>Peer connection type that relays all network information.</extracomment>
+        <translation>전체 릴레이</translation>
+    </message>
+    <message>
+        <source>Block Relay</source>
+        <extracomment>Peer connection type that relays network information about blocks and not transactions or addresses.</extracomment>
+        <translation>블록 릴레이</translation>
+    </message>
+    <message>
+        <source>Manual</source>
+        <extracomment>Peer connection type established manually through one of several methods.</extracomment>
+        <translation>수동</translation>
+    </message>
+    <message>
+        <source>Feeler</source>
+        <extracomment>Short-lived peer connection type that tests the aliveness of known addresses.</extracomment>
+        <translation>필러</translation>
+    </message>
+    <message>
+        <source>Address Fetch</source>
+        <extracomment>Short-lived peer connection type that solicits known addresses from a peer.</extracomment>
+        <translation>주소 불러오기</translation>
+    </message>
     <message>
         <source>%1 d</source>
         <translation>%1 일</translation>
@@ -2207,8 +3030,8 @@
         <translation>%1 B</translation>
     </message>
     <message>
-        <source>%1 KB</source>
-        <translation>%1 KB</translation>
+        <source>%1 kB</source>
+        <translation>%1 kB</translation>
     </message>
     <message>
         <source>%1 MB</source>
@@ -2264,7 +3087,12 @@
         <source>Save QR Code</source>
         <translation>QR 코드 저장</translation>
     </message>
-    </context>
+    <message>
+        <source>PNG Image</source>
+        <extracomment>Expanded name of the PNG file format. See: https://en.wikipedia.org/wiki/Portable_Network_Graphics.</extracomment>
+        <translation>PNG 이미지</translation>
+    </message>
+</context>
 <context>
     <name>RPCConsole</name>
     <message>
@@ -2371,6 +3199,14 @@
         <source>Version</source>
         <translation>버전</translation>
     </message>
+    <message>
+        <source>High bandwidth BIP152 compact block relay: %1</source>
+        <translation>고 대역폭 BIP152 컴팩트 블록 릴레이: %1</translation>
+    </message>
+    <message>
+        <source>High Bandwidth</source>
+        <translation>고 대역폭</translation>
+    </message>
     <message>
         <source>Starting Block</source>
         <translation>블록 시작</translation>
@@ -2383,6 +3219,51 @@
         <source>Synced Blocks</source>
         <translation>동기화 된 블록</translation>
     </message>
+    <message>
+        <source>Elapsed time since a novel block passing initial validity checks was received from this peer.</source>
+        <translation>이 피어에서 초기 유효성 검사를 통과한 신규 블록을 받은 후 경과된 시간.</translation>
+    </message>
+    <message>
+        <source>Last Block</source>
+        <translation>마지막 블록</translation>
+    </message>
+    <message>
+        <source>Elapsed time since a novel transaction accepted into our mempool was received from this peer.</source>
+        <extracomment>Tooltip text for the Last Transaction field in the peer details area.</extracomment>
+        <translation> 피어로부터 멤풀에 수락된 새로운 트랜잭션이 수신된 후 경과된 시간.</translation>
+    </message>
+    <message>
+        <source>Last Transaction</source>
+        <translation>마지막 거래</translation>
+    </message>
+    <message>
+        <source>The mapped Autonomous System used for diversifying peer selection.</source>
+        <translation>매핑된 자율 시스템은 피어 선택을 다양화하기 위해 사용됩니다.</translation>
+    </message>
+    <message>
+        <source>Mapped AS</source>
+        <translation>매핑된 AS</translation>
+    </message>
+    <message>
+        <source>Whether we relay addresses to this peer.</source>
+        <extracomment>Tooltip text for the Address Relay field in the peer details area, which displays whether we relay addresses to this peer (Yes/No).</extracomment>
+        <translation>이 피어에 주소를 릴레이 할 지의 여부.</translation>
+    </message>
+    <message>
+        <source>Address Relay</source>
+        <extracomment>Text title for the Address Relay field in the peer details area, which displays whether we relay addresses to this peer (Yes/No).</extracomment>
+        <translation>주소 릴레이</translation>
+    </message>
+    <message>
+        <source>Addresses Processed</source>
+        <extracomment>Text title for the Addresses Processed field in the peer details area, which displays the total number of addresses received from this peer that were processed (excludes addresses that were dropped due to rate-limiting).</extracomment>
+        <translation>처리된 주소</translation>
+    </message>
+    <message>
+        <source>Addresses Rate-Limited</source>
+        <extracomment>Text title for the Addresses Rate-Limited field in the peer details area, which displays the total number of addresses received from this peer that were dropped (not processed) due to rate-limiting.</extracomment>
+        <translation>요율이 제한된 주소</translation>
+    </message>
     <message>
         <source>Rescan blockchain files 1</source>
         <translation>블록체인 파일 1 재스캔</translation>
@@ -2423,6 +3304,22 @@
         <source>To specify a non-default location of the blocks directory use the '%1' option.</source>
         <translation>블록 디렉토리의 지정되지 않은 로케이션을 특정하기 위해서는 '%1' 옵션을 사용하세요.</translation>
     </message>
+    <message>
+        <source>Local Addresses</source>
+        <translation>로컬 주소</translation>
+    </message>
+    <message>
+        <source>Network addresses that your Dash node is currently using to communicate with other nodes.</source>
+        <translation>귀하의 Dash 노드가 다른 노드와 통신하기 위해 현재 사용 중인 네트워크 주소입니다.</translation>
+    </message>
+    <message>
+        <source>Number of regular Masternodes</source>
+        <translation>일반 마스터노드 수</translation>
+    </message>
+    <message>
+        <source>Number of EvoNodes</source>
+        <translation>에보노드 수</translation>
+    </message>
     <message>
         <source>Current block height</source>
         <translation>현재의 블록 높이</translation>
@@ -2471,10 +3368,50 @@
         <source>PoSe Score</source>
         <translation>PoSe 스코어</translation>
     </message>
+    <message>
+        <source>The transport layer version: %1</source>
+        <translation>전송 레이어 버전: %1</translation>
+    </message>
+    <message>
+        <source>Transport</source>
+        <translation>전송</translation>
+    </message>
+    <message>
+        <source>The BIP324 session ID string in hex.</source>
+        <translation>16진수로 표현한 BIP324 세션 ID 스트링.</translation>
+    </message>
+    <message>
+        <source>Session ID</source>
+        <translation>세션 ID</translation>
+    </message>
+    <message>
+        <source>The network protocol this peer is connected through: IPv4, IPv6, Onion, I2P, or CJDNS.</source>
+        <translation>이 피어가 연결되는데 쓰인 네트워크 프로토콜: Pv4, IPv6, Onion, I2P, 혹은 CJDNS.</translation>
+    </message>
+    <message>
+        <source>Permissions</source>
+        <translation>허가</translation>
+    </message>
+    <message>
+        <source>The direction and type of peer connection: %1</source>
+        <translation>피어 연결의 방향 및 유형: %1</translation>
+    </message>
+    <message>
+        <source>Direction/Type</source>
+        <translation>방향/유형</translation>
+    </message>
     <message>
         <source>Services</source>
         <translation>서비스</translation>
     </message>
+    <message>
+        <source>Whether we relay transactions to this peer.</source>
+        <translation>이 피어에 거래를 릴레이하는지 여부.</translation>
+    </message>
+    <message>
+        <source>Transaction Relay</source>
+        <translation>거래 릴레이</translation>
+    </message>
     <message>
         <source>Connection Time</source>
         <translation>접속 시간</translation>
@@ -2511,6 +3448,16 @@
         <source>&amp;Wallet Repair</source>
         <translation>지갑 복구(&amp;W)</translation>
     </message>
+    <message>
+        <source>The total number of addresses received from this peer that were processed (excludes addresses that were dropped due to rate-limiting).</source>
+        <extracomment>Tooltip text for the Addresses Processed field in the peer details area, which displays the total number of addresses received from this peer that were processed (excludes addresses that were dropped due to rate-limiting).</extracomment>
+        <translation>이 피어에서 수신된 주소의 전체 처리된 수 (요율 제한으로 인해 삭제된 주소는 제외).</translation>
+    </message>
+    <message>
+        <source>The total number of addresses received from this peer that were dropped (not processed) due to rate-limiting.</source>
+        <extracomment>Tooltip text for the Addresses Rate-Limited field in the peer details area, which displays the total number of addresses received from this peer that were dropped (not processed) due to rate-limiting.</extracomment>
+        <translation>이 피어에서 수신된 주소 중 요율 제한으로 인해 (처리되지 않고) 취소된 전체 수.</translation>
+    </message>
     <message>
         <source>Wallet repair options.</source>
         <translation>지갑 복구 옵션</translation>
@@ -2524,52 +3471,82 @@
         <translation>-reindex: 현재의 blk000??.dat 파일로부터 블록체인 인덱스를 재구성합니다.</translation>
     </message>
     <message>
-        <source>&amp;Disconnect</source>
-        <translation>접속 끊기(&amp;D)</translation>
+        <source>Inbound: initiated by peer</source>
+        <extracomment>Explanatory text for an inbound peer connection.</extracomment>
+        <translation>인바운드: 피어에 의해 시작됨</translation>
     </message>
     <message>
-        <source>Ban for</source>
-        <translation>추방</translation>
+        <source>Outbound Full Relay: default</source>
+        <extracomment>Explanatory text for an outbound peer connection that relays all network information. This is the default behavior for outbound connections.</extracomment>
+        <translation>아웃바운드 전체 릴레이: 기본값</translation>
     </message>
     <message>
-        <source>1 &amp;hour</source>
-        <translation>1시간(&amp;h)</translation>
+        <source>Outbound Block Relay: does not relay transactions or addresses</source>
+        <extracomment>Explanatory text for an outbound peer connection that relays network information about blocks and not transactions or addresses.</extracomment>
+        <translation>아웃바운드 블록 릴레이: 거래 혹은 주소를 릴레이하지 않음</translation>
     </message>
     <message>
-        <source>1 &amp;day</source>
-        <translation>1일(&amp;d)</translation>
+        <source>Outbound Manual: added using RPC %1 or %2/%3 configuration options</source>
+        <extracomment>Explanatory text for an outbound peer connection that was established manually through one of several methods. The numbered arguments are stand-ins for the methods available to establish manual connections.</extracomment>
+        <translation>수동 아웃바운드: RPC %1 혹은 %2/%3 설정 옵션을 사용해 추가됨</translation>
     </message>
     <message>
-        <source>1 &amp;week</source>
-        <translation>1주(&amp;w)</translation>
+        <source>Outbound Feeler: short-lived, for testing addresses</source>
+        <extracomment>Explanatory text for a short-lived outbound peer connection that is used to test the aliveness of known addresses.</extracomment>
+        <translation>아웃바운드 필러: 주소 테스트를 위한 단기용</translation>
     </message>
     <message>
-        <source>1 &amp;year</source>
-        <translation>1년(&amp;y)</translation>
+        <source>Outbound Address Fetch: short-lived, for soliciting addresses</source>
+        <extracomment>Explanatory text for a short-lived outbound peer connection that is used to request addresses from a peer.</extracomment>
+        <translation>아웃바운드 주소 가져오기: 주소를 불러오기 위한 단기용</translation>
     </message>
     <message>
-        <source>&amp;Unban</source>
-        <translation>추방 취소(&amp;U)</translation>
+        <source>To</source>
+        <translation>다음에게</translation>
     </message>
     <message>
-        <source>Welcome to the %1 RPC console.</source>
-        <translation>%1 RPC 콘솔에 오신걸 환영합니다</translation>
+        <source>we selected the peer for high bandwidth relay</source>
+        <translation>고 대역폭 릴레이를 위해 피어를 선택하였습니다</translation>
     </message>
     <message>
-        <source>Use up and down arrows to navigate history, and %1 to clear screen.</source>
-        <translation>기록을 찾아보려면 위 아래 화살표 키를, 화면을 지우려면 %1 키를 사용하십시오.</translation>
+        <source>From</source>
+        <translation>다음으로부터</translation>
+    </message>
+    <message>
+        <source>the peer selected us for high bandwidth relay</source>
+        <translation>고 대역폭 릴레이를 위해 피어가 우리럴 선택사였습니다</translation>
     </message>
     <message>
-        <source>Type %1 for an overview of available commands.</source>
-        <translation>사용 가능한 명령을 둘러보시려면 %1을 입력하십시오.</translation>
+        <source>No</source>
+        <translation>아니오</translation>
     </message>
     <message>
-        <source>For more information on using this console type %1.</source>
-        <translation>이 콘솔을 사용하기 위한 더 많은 정보를 둘러보시려면 %1을 입력하십시오.</translation>
+        <source>no high bandwidth relay selected</source>
+        <translation>고 대역폭 릴레이가 선택되지 않았습니다</translation>
     </message>
     <message>
-        <source>WARNING: Scammers have been active, telling users to type commands here, stealing their wallet contents. Do not use this console without fully understanding the ramifications of a command.</source>
-        <translation>주의: 사기범들이 사용자들에게 이곳에 명령을 입력하도록 유도하면서 지갑의 내용물을 탈취할 수 있습니다. 명령의 결과에 관해 충분히 숙지하기 전에는 이 콘솔을 사용하지 마십시오.</translation>
+        <source>&amp;Disconnect</source>
+        <translation>접속 끊기(&amp;D)</translation>
+    </message>
+    <message>
+        <source>Ban for</source>
+        <translation>추방</translation>
+    </message>
+    <message>
+        <source>1 &amp;hour</source>
+        <translation>1시간(&amp;h)</translation>
+    </message>
+    <message>
+        <source>1 &amp;week</source>
+        <translation>1주(&amp;w)</translation>
+    </message>
+    <message>
+        <source>1 &amp;year</source>
+        <translation>1년(&amp;y)</translation>
+    </message>
+    <message>
+        <source>&amp;Unban</source>
+        <translation>추방 취소(&amp;U)</translation>
     </message>
     <message>
         <source>In:</source>
@@ -2583,6 +3560,10 @@
         <source>Network activity disabled</source>
         <translation>네트워크 활동 비활성화</translation>
     </message>
+    <message>
+        <source>None</source>
+        <translation>없음</translation>
+    </message>
     <message>
         <source>Total: %1 (Enabled: %2)</source>
         <translation>전체: %1 (가능: %2)</translation>
@@ -2591,10 +3572,105 @@
         <source>Executing command without any wallet</source>
         <translation>지갑 없이 명령 수행하기</translation>
     </message>
+    <message>
+        <source>Ctrl++</source>
+        <extracomment>Main shortcut to increase the RPC console font size.</extracomment>
+        <translation>Ctrl++</translation>
+    </message>
+    <message>
+        <source>Ctrl+=</source>
+        <extracomment>Secondary shortcut to increase the RPC console font size.</extracomment>
+        <translation>Ctrl+=</translation>
+    </message>
+    <message>
+        <source>Ctrl+-</source>
+        <extracomment>Main shortcut to decrease the RPC console font size.</extracomment>
+        <translation>Ctrl+-</translation>
+    </message>
+    <message>
+        <source>Ctrl+_</source>
+        <extracomment>Secondary shortcut to decrease the RPC console font size.</extracomment>
+        <translation>Ctrl+_</translation>
+    </message>
+    <message>
+        <source>Ctrl+Shift+I</source>
+        <translation>Ctrl+Shift+I</translation>
+    </message>
+    <message>
+        <source>Ctrl+Shift+C</source>
+        <translation>Ctrl+Shift+C</translation>
+    </message>
+    <message>
+        <source>Ctrl+Shift+G</source>
+        <translation>Ctrl+Shift+G</translation>
+    </message>
+    <message>
+        <source>Ctrl+Shift+P</source>
+        <translation>Ctrl+Shift+P</translation>
+    </message>
+    <message>
+        <source>Ctrl+Shift+R</source>
+        <translation>Ctrl+Shift+R</translation>
+    </message>
     <message>
         <source>Executing command using "%1" wallet</source>
         <translation>"%1" 지갑을 이용하여 명령 수행하기</translation>
     </message>
+    <message>
+        <source>detecting: peer could be v1 or v2</source>
+        <extracomment>Explanatory text for "detecting" transport type.</extracomment>
+        <translation>삭제중: 피어는 v1 혹은 v2일 수 있습니다</translation>
+    </message>
+    <message>
+        <source>v1: unencrypted, plaintext transport protocol</source>
+        <extracomment>Explanatory text for v1 transport type.</extracomment>
+        <translation>v1: 암호화되지 않음, 일반 텍스트 전송 프로토콜</translation>
+    </message>
+    <message>
+        <source>v2: BIP324 encrypted transport protocol</source>
+        <extracomment>Explanatory text for v2 transport type.</extracomment>
+        <translation>v2: BIP324 암호화된 전송 프로토콜</translation>
+    </message>
+    <message>
+        <source>&amp;Copy address</source>
+        <extracomment>Context menu action to copy the address of a peer</extracomment>
+        <translation>주소 복사(&amp;C)</translation>
+    </message>
+    <message>
+        <source>1 d&amp;ay</source>
+        <translation>1일 (&amp;d)</translation>
+    </message>
+    <message>
+        <source>&amp;Copy IP/Netmask</source>
+        <extracomment>Context menu action to copy the IP/Netmask of a banned peer. IP/Netmask is the combination of a peer's IP address and its Netmask. For IP address see: https://en.wikipedia.org/wiki/IP_address</extracomment>
+        <translation>IP/넷마스크 복사(&amp;C)</translation>
+    </message>
+    <message>
+        <source>Welcome to the %1 RPC console.
+Use up and down arrows to navigate history, and %2 to clear screen.
+Use %3 and %4 to increase or decrease the font size.
+Type %5 for an overview of available commands.
+For more information on using this console, type %6.
+
+%7WARNING: Scammers have been active, telling users to type commands here, stealing their wallet contents. Do not use this console without fully understanding the ramifications of a command.%8</source>
+        <extracomment>RPC console welcome message. Placeholders %7 and %8 are style tags for the warning content, and they are not space separated from the rest of the text intentionally.</extracomment>
+        <translation>%1 RPC 콘솔에 오신 것을 환영합니다.
+위 아래 화살표를 사용하여 내역을 탐색하시고, %2를 사용하여 화면을 지우세요.
+%3과 %4를 사용하여 폰트 사이즈를 줄이거나 늘릴 수 있습니다.
+%5를 입력하여 사용 가능한 명령어를 확인하세요.
+이 콘솔의 사용에 관한 더 많은 정보를 원하시는 경우 %6를 입력하세요.
+
+%7경고: 사기꾼들이 사용자에게 이곳에 명령어를 입력하도록 하여 지갑의 내용물을 훔치는 경우가 발생하고 있습니다. 명령의 결과를 완전히 이해하지 않은 경우 콘솔을 사용하지 마십시오.%8</translation>
+    </message>
+    <message>
+        <source>Executing…</source>
+        <extracomment>A console message indicating an entered command is currently being executed.</extracomment>
+        <translation>실행중...</translation>
+    </message>
+    <message>
+        <source>(peer: %1)</source>
+        <translation>(피어: %1)</translation>
+    </message>
     <message>
         <source>via %1</source>
         <translation>%1 경유</translation>
@@ -2611,11 +3687,19 @@
         <source>Verified Masternode</source>
         <translation>인증된 마스터노드</translation>
     </message>
+    <message>
+        <source>Yes</source>
+        <translation>예</translation>
+    </message>
     <message>
         <source>Unknown</source>
         <translation>알 수 없음</translation>
     </message>
-    </context>
+    <message>
+        <source>Never</source>
+        <translation>아니오</translation>
+    </message>
+</context>
 <context>
     <name>ReceiveCoinsDialog</name>
     <message>
@@ -2634,6 +3718,10 @@
         <source>An optional message to attach to the payment request, which will be displayed when the request is opened.&lt;br&gt;Note: The message will not be sent with the payment over the Dash network.</source>
         <translation>지불 요청에 메시지를 첨부할 지 선택할 수 있습니다. 해당 메세지는 지불 요청이 열릴 때 표시될 것 입니다. 메모: 이 메시지는 대시 네트워크로 전송되지 않습니다.</translation>
     </message>
+    <message>
+        <source>An optional label to associate with the new receiving address (used by you to identify an invoice).  It is also attached to the payment request.</source>
+        <translation>새로운 받기 주소와 연관된 레벨 옵션 (인보이스를 식별하기 위해 사용됨). 이는 또한 지불 요청에 첨부되어 있습니다.</translation>
+    </message>
     <message>
         <source>Use this form to request payments. All fields are &lt;b&gt;optional&lt;/b&gt;.</source>
         <translation>지급을 요청하기 위해 아래 형식을 사용하세요. 모든입력 값은 &lt;b&gt;선택 사항&lt;/b&gt; 입니다.</translation>
@@ -2691,28 +3779,60 @@
         <translation>지불 요청에 첨부되는 메시지를 입력하세요</translation>
     </message>
     <message>
-        <source>Copy URI</source>
-        <translation>URI 복사</translation>
+        <source>Copy &amp;URI</source>
+        <translation>URI 복사(&amp;U)</translation>
+    </message>
+    <message>
+        <source>&amp;Copy address</source>
+        <translation>주소 복사(&amp;C)</translation>
     </message>
     <message>
-        <source>Copy address</source>
-        <translation>주소 복사</translation>
+        <source>Copy &amp;label</source>
+        <translation>라벨 복사(&amp;l)</translation>
     </message>
     <message>
-        <source>Copy label</source>
-        <translation>라벨 복사</translation>
+        <source>Copy &amp;message</source>
+        <translation>메시지 복사(&amp;m)</translation>
     </message>
     <message>
-        <source>Copy message</source>
-        <translation>메시지 복사</translation>
+        <source>Copy &amp;amount</source>
+        <translation>금액 복사(&amp;a)</translation>
     </message>
     <message>
-        <source>Copy amount</source>
-        <translation>거래액 복사</translation>
+        <source>Could not unlock wallet.</source>
+        <translation>지갑을 잠금 해제 할 수 없습니다.</translation>
+    </message>
+    <message>
+        <source>Could not generate new address</source>
+        <translation>새 주소를 생성할 수 없습니다</translation>
     </message>
-    </context>
+</context>
 <context>
     <name>ReceiveRequestDialog</name>
+    <message>
+        <source>Request payment to …</source>
+        <translation>다음에 지불을 요청합니다</translation>
+    </message>
+    <message>
+        <source>Address:</source>
+        <translation>주소:</translation>
+    </message>
+    <message>
+        <source>Amount:</source>
+        <translation>금액:</translation>
+    </message>
+    <message>
+        <source>Label:</source>
+        <translation>라벨:</translation>
+    </message>
+    <message>
+        <source>Message:</source>
+        <translation>메시지:</translation>
+    </message>
+    <message>
+        <source>Wallet:</source>
+        <translation>지갑:</translation>
+    </message>
     <message>
         <source>Copy &amp;URI</source>
         <translation>URI 복사(&amp;U)</translation>
@@ -2765,6 +3885,34 @@
         <translation>요청됨</translation>
     </message>
 </context>
+<context>
+    <name>RestoreWalletActivity</name>
+    <message>
+        <source>Restore Wallet</source>
+        <extracomment>Title of progress window which is displayed when wallets are being restored.</extracomment>
+        <translation>지갑 복원</translation>
+    </message>
+    <message>
+        <source>Restoring Wallet &lt;b&gt;%1&lt;/b&gt;…</source>
+        <extracomment>Descriptive text of the restore wallets progress window which indicates to the user that wallets are currently being restored.</extracomment>
+        <translation>지갑 &lt;b&gt;%1&lt;/b&gt; 복원 중…</translation>
+    </message>
+    <message>
+        <source>Restore wallet failed</source>
+        <extracomment>Title of message box which is displayed when the wallet could not be restored.</extracomment>
+        <translation>지갑 복원 실패</translation>
+    </message>
+    <message>
+        <source>Restore wallet warning</source>
+        <extracomment>Title of message box which is displayed when the wallet is restored with some warning.</extracomment>
+        <translation>지갑 복원 경고</translation>
+    </message>
+    <message>
+        <source>Restore wallet message</source>
+        <extracomment>Title of message box which is displayed when the wallet is successfully restored.</extracomment>
+        <translation>지갑 복원 메시지</translation>
+    </message>
+</context>
 <context>
     <name>SendCoinsDialog</name>
     <message>
@@ -2799,10 +3947,6 @@
         <source>Fee:</source>
         <translation>수수료:</translation>
     </message>
-    <message>
-        <source>Dust:</source>
-        <translation>더스트:</translation>
-    </message>
     <message>
         <source>Inputs…</source>
         <translation>입력…</translation>
@@ -2827,6 +3971,14 @@
         <source>Transaction Fee:</source>
         <translation>거래 수수료:</translation>
     </message>
+    <message>
+        <source>When there is less transaction volume than space in the blocks, miners as well as relaying nodes may enforce a minimum fee. Paying only this minimum fee is just fine, but be aware that this can result in a never confirming transaction once there is more demand for dash transactions than the network can process.</source>
+        <translation>거래량이 블록 내 공간보다 적은 경우, 채굴자 및 노드 중계자가 최소 수수료를 실시할 수 있습니다. 이 최소 수수료를 지불하는 것은 괜찮지만, 네트워크가 처리할 수 있는 것보다 대시 거래에 대한 수요가 많으면 거래가 확인되지 않을 수 있다는 점에 유의하시기 바랍니다.</translation>
+    </message>
+    <message>
+        <source>A too low fee might result in a never confirming transaction (read the tooltip)</source>
+        <translation>수수료가 너무 적으면 거래 승인이 이루어지지 않을 수 있습니다 (도구팁을 확인하세요)</translation>
+    </message>
     <message>
         <source>(Smart fee not initialized yet. This usually takes a few blocks…)</source>
         <translation>(Smart fee가 아직 초기화 되지 않았습니다. 이 과정에는 수 블록이 소요됩니다…)</translation>
@@ -2919,10 +4071,6 @@
         <source>Copy bytes</source>
         <translation>bytes 복사</translation>
     </message>
-    <message>
-        <source>Copy dust</source>
-        <translation>더스트 복사</translation>
-    </message>
     <message>
         <source>Copy change</source>
         <translation>잔돈 복사</translation>
@@ -2939,10 +4087,6 @@
         <source>%1 to %2</source>
         <translation>%1을(를) %2(으)로</translation>
     </message>
-    <message>
-        <source>Are you sure you want to send?</source>
-        <translation>정말로 보내시겠습니까?</translation>
-    </message>
     <message>
         <source>&lt;b&gt;(%1 of %2 entries displayed)&lt;/b&gt;</source>
         <translation>&lt;b&gt;(%2 중 %1 입력값 표시됨)&lt;/b&gt;</translation>
@@ -2955,6 +4099,18 @@
         <source>Confirm the %1 send action</source>
         <translation>%1 전송 액션 확인</translation>
     </message>
+    <message>
+        <source>Cr&amp;eate Unsigned</source>
+        <translation>미서명 생성하기(&amp;e)</translation>
+    </message>
+    <message>
+        <source> from wallet '%1'</source>
+        <translation>지갑 '%1' 으로부터</translation>
+    </message>
+    <message>
+        <source>%1 to '%2'</source>
+        <translation>%1 를 '%2'로</translation>
+    </message>
     <message>
         <source>%1 funds only</source>
         <translation>%1 자금만</translation>
@@ -3003,6 +4159,51 @@
         <source>Confirm send coins</source>
         <translation>코인 전송 확인</translation>
     </message>
+    <message>
+        <source>Save Transaction Data</source>
+        <translation>거래 데이터 저장하기</translation>
+    </message>
+    <message>
+        <source>PSBT saved</source>
+        <translation>PSBT 저장됨</translation>
+    </message>
+    <message>
+        <source>Watch-only balance:</source>
+        <translation>읽기 전용 잔고:</translation>
+    </message>
+    <message>
+        <source>Creates a Partially Signed Blockchain Transaction (PSBT) for use with e.g. an offline %1 wallet, or a PSBT-compatible hardware wallet.</source>
+        <translation>오프라인 %1 지갑 혹은 PSBT-호환 가능한 하드웨어 지갑을 사용하여 일부 서명된 블록체인 거래(PSBT)를 생성합니다.</translation>
+    </message>
+    <message>
+        <source>Do you want to create this transaction?</source>
+        <extracomment>Message displayed when attempting to create a transaction. Cautionary text to prompt the user to verify that the displayed transaction details represent the transaction the user intends to create.</extracomment>
+        <translation>이 거래를 생성하시겠습니까?</translation>
+    </message>
+    <message>
+        <source>Please, review your transaction proposal. This will produce a Partially Signed Blockchain Transaction (PSBT) which you can save or copy and then sign with e.g. an offline %1 wallet, or a PSBT-compatible hardware wallet.</source>
+        <extracomment>Text to inform a user attempting to create a transaction of their current options. At this stage, a user can only create a PSBT. This string is displayed when private keys are disabled and an external signer is not available.</extracomment>
+        <translation>거래 제안서를 검토하십시오. 이는 부분 서명된 블록체인 거래(PSBT)를 생성하며, 저장하거나 복사한 후 오프라인 %1 지갑 또는 PSBT 호환 하드웨어 지갑으로 서명할 수 있습니다.</translation>
+    </message>
+    <message>
+        <source>Please, review your transaction. You can create and send this transaction or create a Partially Signed Blockchain Transaction (PSBT), which you can save or copy and then sign with, e.g., an offline %1 wallet, or a PSBT-compatible hardware wallet.</source>
+        <extracomment>Text to inform a user attempting to create a transaction of their current options. At this stage, a user can send their transaction or create a PSBT. This string is displayed when both private keys and PSBT controls are enabled.</extracomment>
+        <translation>거래를 검토하십시오. 이 거래를 생성하여 전송하거나 부분 서명된 블록체인 거래(PSBT)를 생성할 수 있습니다. PSBT는 저장하거나 복사한 후 오프라인 %1 지갑 또는 PSBT 호환 하드웨어 지갑으로 서명할 수 있습니다.</translation>
+    </message>
+    <message>
+        <source>Please, review your transaction.</source>
+        <extracomment>Text to prompt a user to review the details of the transaction they are attempting to send.</extracomment>
+        <translation>거래를 검토하십시오.</translation>
+    </message>
+    <message>
+        <source>To review recipient list click "Show Details…"</source>
+        <translation>영수증 리스트를 확인하려면 "세부 내역 보기..."를 클릭하세요</translation>
+    </message>
+    <message>
+        <source>Partially Signed Transaction (Binary)</source>
+        <extracomment>Expanded name of the binary PSBT file format. See: BIP 174.</extracomment>
+        <translation>일부 서명된 거래 (2진수)</translation>
+    </message>
     <message>
         <source>The recipient address is not valid. Please recheck.</source>
         <translation>수령인의 주소가 정확하지 않습니다. 다시 확인하세요.</translation>
@@ -3122,21 +4323,16 @@
         <source>A message that was attached to the dash: URI which will be stored with the transaction for your reference. Note: This message will not be sent over the Dash network.</source>
         <translation>대시: URI에 첨부된 메시지는 거래와 함께 참고용으로 저장됩니다. 주의: 이 메시지는 대시 네트워크로 전송되지 않습니다.</translation>
     </message>
+</context>
+<context>
+    <name>SendConfirmationDialog</name>
     <message>
-        <source>This is an unauthenticated payment request.</source>
-        <translation>인증 되지 않은 지급 요청입니다.</translation>
-    </message>
-    <message>
-        <source>This is an authenticated payment request.</source>
-        <translation>인증된 지급 요청 입니다.</translation>
-    </message>
-    <message>
-        <source>Pay To:</source>
-        <translation>송금 대상:</translation>
+        <source>Send</source>
+        <translation>보내기</translation>
     </message>
     <message>
-        <source>Memo:</source>
-        <translation>메모:</translation>
+        <source>Create Unsigned</source>
+        <translation>서명되지 않은 거래 생성</translation>
     </message>
 </context>
 <context>
@@ -3276,6 +4472,10 @@
         <source>Wallet unlock was cancelled.</source>
         <translation>지갑 잠금 해제를 취소했습니다.</translation>
     </message>
+    <message>
+        <source>No error</source>
+        <translation>오류 없음</translation>
+    </message>
     <message>
         <source>Private key for the entered address is not available.</source>
         <translation>입력한 주소에 대한 개인 키를 사용할 수 없습니다.</translation>
@@ -3305,15 +4505,26 @@
         <translation>메시지 검증에 실패했습니다.</translation>
     </message>
     <message>
-        <source>Message verified.</source>
-        <translation>메시지를 검증했습니다.</translation>
+        <source>Message verified.</source>
+        <translation>메시지를 검증했습니다.</translation>
+    </message>
+</context>
+<context>
+    <name>SplashScreen</name>
+    <message>
+        <source>(press q to shutdown and continue later)</source>
+        <translation>(q를 눌러 종료하고 나중에 계속하기)</translation>
+    </message>
+    <message>
+        <source>press q to shutdown</source>
+        <translation>q를 눌러 종료하기</translation>
     </message>
 </context>
 <context>
     <name>TrafficGraphWidget</name>
     <message>
-        <source>KB/s</source>
-        <translation>KB/s</translation>
+        <source>kB/s</source>
+        <translation>kB/s</translation>
     </message>
     <message>
         <source>Total</source>
@@ -3330,20 +4541,9 @@
 </context>
 <context>
     <name>TransactionDesc</name>
-    <message numerus="yes">
-        <source>Open for %n more block(s)</source>
-        <translation><numerusform>%n 개의 블록을 더 엽니다.</numerusform></translation>
-    </message>
-    <message>
-        <source>Open until %1</source>
-        <translation>%1 까지 열림</translation>
-    </message>
-    <message>
-        <source>conflicted</source>
-        <translation>충돌</translation>
-    </message>
     <message>
         <source>0/unconfirmed, %1</source>
+        <extracomment>Text explaining the current status of a transaction, shown in the status field of the details window for this transaction. This status represents an unconfirmed transaction that is in the memory pool.</extracomment>
         <translation>0/미승인, %1</translation>
     </message>
     <message>
@@ -3356,22 +4556,32 @@
     </message>
     <message>
         <source>abandoned</source>
+        <extracomment>Text explaining the current status of a transaction, shown in the status field of the details window for this transaction. This status represents an abandoned transaction.</extracomment>
         <translation>버려진</translation>
     </message>
+    <message>
+        <source>conflicted with a transaction with %1 confirmations</source>
+        <extracomment>Text explaining the current status of a transaction, shown in the status field of the details window for this transaction. This status represents an unconfirmed transaction that conflicts with a confirmed transaction.</extracomment>
+        <translation>%1번 확인된 거래와 충돌</translation>
+    </message>
     <message>
         <source>%1/unconfirmed</source>
+        <extracomment>Text explaining the current status of a transaction, shown in the status field of the details window for this transaction. This status represents a transaction confirmed in at least one block, but less than 6 blocks, and still not locked via ChainLocks.</extracomment>
         <translation>%1/미확인</translation>
     </message>
     <message>
         <source>%1 confirmations</source>
+        <extracomment>Text explaining the current status of a transaction, shown in the status field of the details window for this transaction. This status represents a transaction confirmed in 6 or more blocks or locked via ChainLocks.</extracomment>
         <translation>%1 확인</translation>
     </message>
     <message>
         <source>locked via ChainLocks</source>
+        <extracomment>Text explaining the current status of a transaction, shown in the status field of the details window for this transaction. This status represents a transaction confirmed in at least one block and has been locked by ChainLocks.</extracomment>
         <translation>체인락스로 잠김</translation>
     </message>
     <message>
         <source>verified via InstantSend</source>
+        <extracomment>Text explaining the current status of a transaction, shown in the status field of the details window for this transaction. This status represents an unconfirmed transaction that has been locked by InstantSend.</extracomment>
         <translation>인스턴트샌드를 통해 검증됨</translation>
     </message>
     <message>
@@ -3390,6 +4600,10 @@
         <source>Generated</source>
         <translation>생성됨</translation>
     </message>
+    <message>
+        <source>Platform Transfer</source>
+        <translation>플랫폼 전송</translation>
+    </message>
     <message>
         <source>From</source>
         <translation>으로부터</translation>
@@ -3520,14 +4734,6 @@
         <source>Address / Label</source>
         <translation>주소 / 라벨</translation>
     </message>
-    <message numerus="yes">
-        <source>Open for %n more block(s)</source>
-        <translation><numerusform>%n 개의 블록을 더 엽니다.</numerusform></translation>
-    </message>
-    <message>
-        <source>Open until %1</source>
-        <translation>%1 까지 열림</translation>
-    </message>
     <message>
         <source>Unconfirmed</source>
         <translation>미확인</translation>
@@ -3588,6 +4794,10 @@
         <source>Mined</source>
         <translation>채굴</translation>
     </message>
+    <message>
+        <source>Platform Transfer</source>
+        <translation>플랫폼 전송</translation>
+    </message>
     <message>
         <source>%1 Mixing</source>
         <translation>%1 믹싱</translation>
@@ -3715,6 +4925,10 @@
         <source>Mined</source>
         <translation>채굴</translation>
     </message>
+    <message>
+        <source>Platform Transfer</source>
+        <translation>플랫폼 전송</translation>
+    </message>
     <message>
         <source>Other</source>
         <translation>기타</translation>
@@ -3728,49 +4942,63 @@
         <translation>최소 거래액</translation>
     </message>
     <message>
-        <source>Abandon transaction</source>
-        <translation>중단된 거래</translation>
+        <source>&amp;Copy address</source>
+        <translation>주소 복사(&amp;C)</translation>
     </message>
     <message>
-        <source>Copy address</source>
-        <translation>주소 복사</translation>
+        <source>Copy &amp;label</source>
+        <translation>라벨 복사(&amp;l)</translation>
     </message>
     <message>
-        <source>Copy label</source>
-        <translation>라벨 복사</translation>
+        <source>Copy &amp;amount</source>
+        <translation>금액 복사(&amp;a)</translation>
     </message>
     <message>
-        <source>Copy amount</source>
-        <translation>거래액 복사</translation>
+        <source>Copy transaction &amp;ID</source>
+        <translation>거래 ID 복사(&amp;I)</translation>
     </message>
     <message>
-        <source>Copy transaction ID</source>
-        <translation>거래 아이디 복사</translation>
+        <source>Copy &amp;raw transaction</source>
+        <translation>원 거래 복사(&amp;r)</translation>
     </message>
     <message>
-        <source>Copy raw transaction</source>
-        <translation>원 거래 복사</translation>
+        <source>Copy full transaction &amp;details</source>
+        <translation>전체 거래 세부 내역 복사(&amp;d)</translation>
     </message>
     <message>
-        <source>Copy full transaction details</source>
-        <translation>거래 세부 내역 복사</translation>
+        <source>&amp;Show transaction details</source>
+        <translation>거래 세부내역 보기(&amp;S)</translation>
     </message>
     <message>
-        <source>Edit address label</source>
-        <translation>주소 라벨 편집</translation>
+        <source>A&amp;bandon transaction</source>
+        <translation>거래 중단하기(&amp;b)</translation>
     </message>
     <message>
-        <source>Show transaction details</source>
-        <translation>거래 세부 내역 보기</translation>
+        <source>Rese&amp;nd transaction</source>
+        <translation>거래 다시 전송하기(&amp;n)</translation>
     </message>
     <message>
-        <source>Show address QR code</source>
-        <translation>주소 QR 코드 보이기</translation>
+        <source>&amp;Edit address label</source>
+        <translation>주소 라벨 편집(&amp;E)</translation>
+    </message>
+    <message>
+        <source>Show address &amp;QR code</source>
+        <translation>주소 QR 코드 보기(&amp;Q)</translation>
+    </message>
+    <message>
+        <source>Show in %1</source>
+        <extracomment>Transactions table context menu action to show the selected transaction in a third-party block explorer. %1 is a stand-in argument for the URL of the explorer.</extracomment>
+        <translation>%1에서 표시</translation>
     </message>
     <message>
         <source>Export Transaction History</source>
         <translation>거래 기록 내보내기</translation>
     </message>
+    <message>
+        <source>Comma separated file</source>
+        <extracomment>Expanded name of the CSV file format. See: https://en.wikipedia.org/wiki/Comma-separated_values.</extracomment>
+        <translation>쉼표로 구분된 파일</translation>
+    </message>
     <message>
         <source>Confirmed</source>
         <translation>확인 완료</translation>
@@ -3849,10 +5077,54 @@
         <source>Closing the wallet for too long can result in having to resync the entire chain if pruning is enabled.</source>
         <translation>지갑을 닫는 데 너무 오랜 시간이 걸리는 경우 정리가 활성화될 때 전체 체인을 다시 동기화해야 할 수 있습니다.</translation>
     </message>
-    </context>
+    <message>
+        <source>Close all wallets</source>
+        <translation>모든 지갑 닫기</translation>
+    </message>
+    <message>
+        <source>Are you sure you wish to close all wallets?</source>
+        <translation>모든 지갑을 정말 닫으시겠습니까?</translation>
+    </message>
+</context>
 <context>
     <name>WalletFrame</name>
-    </context>
+    <message>
+        <source>No wallet has been loaded.
+Go to File &gt; Open Wallet to load a wallet.
+- OR -</source>
+        <translation>불러온 지갑이 없습니다.
+파일&gt;지갑 열기로 가서 지갑을 불러오세요.
+- 혹은 -</translation>
+    </message>
+    <message>
+        <source>Create a new wallet</source>
+        <translation>새로운 지갑 생성하기</translation>
+    </message>
+    <message>
+        <source>Error</source>
+        <translation>오류</translation>
+    </message>
+    <message>
+        <source>Unable to decode PSBT from clipboard (invalid base64)</source>
+        <translation>클립보드에서 PSBT 를 디코드할 수 없습니다 (유효하지 않은 base64)</translation>
+    </message>
+    <message>
+        <source>Load Transaction Data</source>
+        <translation>거래 데이터 불러오기</translation>
+    </message>
+    <message>
+        <source>Partially Signed Transaction (*.psbt)</source>
+        <translation>일부 서명된 거래 (*.psbt)</translation>
+    </message>
+    <message>
+        <source>PSBT file must be smaller than 100 MiB</source>
+        <translation>PSBT 파일은 100 MiB보다 작아야 합니다</translation>
+    </message>
+    <message>
+        <source>Unable to decode PSBT</source>
+        <translation>PSBT 디코드 할 수 없음</translation>
+    </message>
+</context>
 <context>
     <name>WalletModel</name>
     <message>
@@ -3878,6 +5150,11 @@
         <source>Selected amount:</source>
         <translation>선택된 금액:</translation>
     </message>
+    <message>
+        <source>Wallet Data</source>
+        <extracomment>Name of the wallet data file format.</extracomment>
+        <translation>지갑 데이터</translation>
+    </message>
     <message>
         <source>Backup Wallet</source>
         <translation>지갑 백업</translation>
@@ -3905,14 +5182,6 @@
 </context>
 <context>
     <name>dash-core</name>
-    <message>
-        <source>Error: Listening for incoming connections failed (listen returned error %s)</source>
-        <translation>오류: 들어오는 연결을 수신하는 데 실패했습니다 (수신 반환 오류 %s)</translation>
-    </message>
-    <message>
-        <source>Fee estimation failed. Fallbackfee is disabled. Wait a few blocks or enable -fallbackfee.</source>
-        <translation>수수료 측정에 실패했습니다. Fallbackfee가 비활성화 되었습니다. 수 블록을 기다리거나 Fallbackfee를 활성화하세요.</translation>
-    </message>
     <message>
         <source>This error could occur if this wallet was not shutdown cleanly and was last loaded using a build with a newer version of Berkeley DB. If so, please use the software that last loaded this wallet</source>
         <translation>이 오류는 이 지갑이 완전히 종료되지 않은 채 마지막으로 로딩하면서 최신 버전의 Berkeley DB로 빌드를 사용한 경우 발생할 수 있습니다. 이와 같은 경우 이 지갑을 마지막으로 로딩한 소프트웨어를 사용하십시오.</translation>
@@ -3970,16 +5239,20 @@
         <translation>데이터베이스를 불러오는 데 오류가 발생하였습니다. 곧 종료됩니다.</translation>
     </message>
     <message>
-        <source>Failed to listen on any port. Use -listen=0 if you want this.</source>
-        <translation>포트를 감지하는 데 실패하였습니다. 이를 진행하시려면 -listen=0 을 사용하세요.</translation>
+        <source>Error: Missing checksum</source>
+        <translation>오류: 체크섬 누락</translation>
     </message>
     <message>
-        <source>-maxtxfee is set very high! Fees this large could be paid on a single transaction.</source>
-        <translation>-maxtxfee 값이 너무 크게 설정 되었습니다!  이 거래에 너무 큰 수수료가 지불 됩니다.</translation>
+        <source>Error: Unable to parse version %u as a uint32_t</source>
+        <translation>오류: 파스 버전 %u를 uint32_t로 파스할 수 없음</translation>
     </message>
     <message>
-        <source>Cannot provide specific connections and have addrman find outgoing connections at the same.</source>
-        <translation>특정 연결을 제공하면서 addrman이 외부로 향하는 연결을 찾도록 동시에 설정할 수 없습니다.</translation>
+        <source>Error: Unable to write record to new wallet</source>
+        <translation>오류: 새로운 지갑에 기록을 쓸 수 없음</translation>
+    </message>
+    <message>
+        <source>Failed to listen on any port. Use -listen=0 if you want this.</source>
+        <translation>포트를 감지하는 데 실패하였습니다. 이를 진행하시려면 -listen=0 을 사용하세요.</translation>
     </message>
     <message>
         <source>Found unconfirmed denominated outputs, will wait till they confirm to continue.</source>
@@ -3990,13 +5263,17 @@
         <translation>유효하지 않은 -socketevent ('%s')가 지정되었습니다. 이들 모드만이 지원됩니다: %s </translation>
     </message>
     <message>
-        <source>Invalid amount for -maxtxfee=&lt;amount&gt;: '%s' (must be at least the minrelay fee of %s to prevent stuck transactions)</source>
-        <translation>다음을 위한 금액이 유효하지 않습니다 -maxtxfee=&lt;amount&gt;: '%s' (거래가 막히는 상황을 방지하게 위해 적어도 %s 의 최소 중계 수수료를 지정해야 합니다)</translation>
+        <source>SQLiteDatabase: Unknown sqlite wallet schema version %d. Only version %d is supported</source>
+        <translation>SQLiteDaraBase: 알 수 없는 sqlite 지갑 스키마 버전 %d. 버전 %d 지원만 가능합니다</translation>
     </message>
     <message>
         <source>Transaction index can't be disabled with governance validation enabled. Either start with -disablegovernance command line switch or enable transaction index.</source>
         <translation>거버넌스 유효성 검사가 활성화된 경우 거래 색인을 비활성화할 수 없습니다. -disablegovernance 명령어 스위치로 시작하거나 거래 인덱스를 활성화하여 시작하세요.</translation>
     </message>
+    <message>
+        <source>Unsupported category-specific logging level -loglevel=%s. Expected -loglevel=&lt;category&gt;:&lt;loglevel&gt;. Valid categories: %s. Valid loglevels: %s.</source>
+        <translation>지원하지 않는 카테고리별 로깅 수준 -loglevel=%s. 예상되는 -loglevel=&lt;category&gt;:&lt;loglevel&gt;. 유효한 카테고리: %s. 유효한 로그레벨: %s.</translation>
+    </message>
     <message>
         <source>Can't mix: no compatible inputs found!</source>
         <translation>믹스할 수 없습니다: 호환 가능한 입력값을 찾을 수 없습니다!</translation>
@@ -4005,6 +5282,14 @@
         <source>Entry exceeds maximum size.</source>
         <translation>입력값이 최대치를 초과하였습니다.</translation>
     </message>
+    <message>
+        <source>Error upgrading evo database for EHF</source>
+        <translation>EHF를 위한 에볼루션 데이터베이스 업그레이드 오류</translation>
+    </message>
+    <message>
+        <source>Failed to commit Evo database</source>
+        <translation>에볼루션 데이터베이스 커밋 실패</translation>
+    </message>
     <message>
         <source>Found enough users, signing ( waiting %s )</source>
         <translation>충분한 사용자를 감지하였습니다. 신호를 보내는 중입니다. ( %s 기다리기 )</translation>
@@ -4029,18 +5314,14 @@
         <source>Insufficient funds.</source>
         <translation>잔고가 충분하지 않습니다.</translation>
     </message>
-    <message>
-        <source>Invalid amount for -discardfee=&lt;amount&gt;: '%s'</source>
-        <translation>-discardfee=1: '%s' 에 대한 유효하지 않은 금액</translation>
-    </message>
-    <message>
-        <source>Invalid amount for -paytxfee=&lt;amount&gt;: '%s' (must be at least %s)</source>
-        <translation>유효하지 않은 금액입니다. -paytxfee=&lt;amount&gt;: '%s' (최소 %s 이상이어야 합니다)</translation>
-    </message>
     <message>
         <source>Invalid minimum number of spork signers specified with -minsporkkeys</source>
         <translation>-minsporkkeys로 지정된 스포크 서명자의 최소 숫자가 유효하지 않습니다.</translation>
     </message>
+    <message>
+        <source>Listening for incoming connections failed (listen returned error %s)</source>
+        <translation>들어오는 연결 수신 실패 (수신 반환 오류 %s)</translation>
+    </message>
     <message>
         <source>Lock is already in place.</source>
         <translation>이미 잠금 상태입니다.</translation>
@@ -4097,6 +5378,10 @@
         <source>Synchronizing governance objects…</source>
         <translation>거버넌스 객체 동기화중…</translation>
     </message>
+    <message>
+        <source>Transaction change output index out of range</source>
+        <translation>범위 밖의 거래 변경 아웃풋 인덱스</translation>
+    </message>
     <message>
         <source>Unable to start HTTP server. See debug log for details.</source>
         <translation>HTTP 서버를 시작할 수 없습니다. 자세한 사항은 디버그 로그를 확인 하세요.</translation>
@@ -4105,6 +5390,10 @@
         <source>Unknown response.</source>
         <translation>알 수 없는 반응.</translation>
     </message>
+    <message>
+        <source>Unsupported global logging level -loglevel=%s. Valid values: %s.</source>
+        <translation>지원되지 않는 글로벌 로깅 레벨 -loglevel=%s. 유효한 값: %s.</translation>
+    </message>
     <message>
         <source>User Agent comment (%s) contains unsafe characters.</source>
         <translation>사용자 정의 코멘트 (%s)에 안전하지 못한 글자가 포함되어 있습니다.</translation>
@@ -4145,6 +5434,10 @@
         <source>Make sure to encrypt your wallet and delete all non-encrypted backups after you have verified that the wallet works!</source>
         <translation>해당 지갑이 작동하는 지 여부를 확인한 이후에는 당신의 지갑을 암호화하고, 암호화하지 않은 지갑 백업은 지워야 한다는 점을 주의하세요!</translation>
     </message>
+    <message>
+        <source>More than one onion bind address is provided. Using %s for the automatically created Tor onion service.</source>
+        <translation>하나 이상의 어니언 바인드 주소가 제공됩니다. 토르 어니언 서버를 자동으로 생성하기위해 %s를 사용합니다.</translation>
+    </message>
     <message>
         <source>Prune configured below the minimum of %d MiB.  Please use a higher number.</source>
         <translation>축소 환경이 최소치인 %d MiB 이하로 설정되어 있습니다. 더 높은 값을 사용하십시오.</translation>
@@ -4173,10 +5466,6 @@
         <source>Wallet is locked, can't replenish keypool! Automatic backups and mixing are disabled, please unlock your wallet to replenish keypool.</source>
         <translation>지갑이 잠금 상태 입니다. 키풀을 보충할 수 없습니다! 자동 백업과 믹싱이 비활성화 됩니다. 키풀 보충을 위해서는 지갑을 잠금 해제 하세요.</translation>
     </message>
-    <message>
-        <source>You need to rebuild the database using -reindex to change -timestampindex</source>
-        <translation>-timestampindex를 변경하기 위해서는 -reindex 체인 상태를 사용하여 데이터를 재구성해야 합니다.</translation>
-    </message>
     <message>
         <source>You need to rebuild the database using -reindex to go back to unpruned mode.  This will redownload the entire blockchain</source>
         <translation>축소 모드를 해제하고 데이터베이스를 재구성 하기 위해 -reindex를 사용해야 합니다. 이 명령은 모든 블록체인을 다시 다운로드 할 것 입니다.</translation>
@@ -4218,20 +5507,32 @@
         <translation>%s 로딩 오류: 개인 키는 생성 중에만 해제될 수 있습니다</translation>
     </message>
     <message>
-        <source>Error upgrading evo database</source>
-        <translation>에볼루션 데이터베이스 업그레이드 중 오류가 발생했습니다</translation>
+        <source>Error: Couldn't create cursor into database</source>
+        <translation>오류: 데이터베이스에 커서를 생성할 수 없음</translation>
     </message>
     <message>
         <source>Error: Disk space is low for %s</source>
         <translation>에러: %s를 위한 디스크 공간이 부족합니다</translation>
     </message>
     <message>
-        <source>Exceeded max tries.</source>
-        <translation>최대 시도 횟수를 초과하였습니다.</translation>
+        <source>Error: Dumpfile checksum does not match. Computed %s, expected %s</source>
+        <translation>오류: 덤프파일 체크섬이 일치하지 않음. 계산된 %s, 예상된 %s</translation>
+    </message>
+    <message>
+        <source>Error: Got key that was not hex: %s</source>
+        <translation>오류: 16진수가 아닌 키를 얻음: %s</translation>
+    </message>
+    <message>
+        <source>Error: Got value that was not hex: %s</source>
+        <translation>오류: 16진수가 아닌 값을 얻음: %s</translation>
+    </message>
+    <message>
+        <source>Error: Keypool ran out, please call keypoolrefill first</source>
+        <translation>오류: 키풀이 소진되었습니다. 우선 키풀리필을 호출하세요</translation>
     </message>
     <message>
-        <source>Failed to commit EvoDB</source>
-        <translation>EvoDB를 수행하는 데 실패하였습니다</translation>
+        <source>Error: No addresses available.</source>
+        <translation>오류: 이용할 수 있는 주소가 없습니다.</translation>
     </message>
     <message>
         <source>Failed to create backup %s!</source>
@@ -4249,17 +5550,29 @@
         <source>Failed to rescan the wallet during initialization</source>
         <translation>초기치 설정 중 지갑을 재 스캔하는 데 실패하였습니다</translation>
     </message>
+    <message>
+        <source>Failed to verify database</source>
+        <translation>데이터 베이스 식별 실패</translation>
+    </message>
+    <message>
+        <source>Fee rate (%s) is lower than the minimum fee rate setting (%s)</source>
+        <translation>수수료 요율 (%s) 이 최소 수수료 설정 (%s) 보다 낮습니다</translation>
+    </message>
     <message>
         <source>Found enough users, signing…</source>
         <translation>충분한 사용자를 감지하였습니다. 신호를 보내는 중입니다…</translation>
     </message>
     <message>
-        <source>Invalid P2P permission: '%s'</source>
-        <translation>유효하지 않은 P2P 허용: '%s'</translation>
+        <source>Ignoring duplicate -wallet %s.</source>
+        <translation>중복 -wallet %s 를 무시합니다.</translation>
+    </message>
+    <message>
+        <source>Input not found or already spent</source>
+        <translation>입력을 찾을 수 없거나 이미 사용됨</translation>
     </message>
     <message>
-        <source>Invalid amount for -fallbackfee=&lt;amount&gt;: '%s'</source>
-        <translation>유효하지 않은 금액 -fallbackfee=&lt;amount&gt;: '%s'</translation>
+        <source>Invalid P2P permission: '%s'</source>
+        <translation>유효하지 않은 P2P 허용: '%s'</translation>
     </message>
     <message>
         <source>Invalid masternodeblsprivkey. Please see documentation.</source>
@@ -4281,6 +5594,10 @@
         <source>Mixing in progress…</source>
         <translation>믹싱이 진행 중입니다…</translation>
     </message>
+    <message>
+        <source>No addresses available</source>
+        <translation>사용 가능한 주소 없음</translation>
+    </message>
     <message>
         <source>No errors detected.</source>
         <translation>에러가 감지되지 않았습니다.</translation>
@@ -4309,6 +5626,22 @@
         <source>Prune mode is incompatible with -txindex.</source>
         <translation>블록 축소 모드는 -txindex와 호환되지 않습니다.</translation>
     </message>
+    <message>
+        <source>SQLiteDatabase: Failed to execute statement to verify database: %s</source>
+        <translation>SQLiteDatabase: 데이터베이스를 식별하기 위해 명령을 실행하는데 실패했습니다: %s</translation>
+    </message>
+    <message>
+        <source>SQLiteDatabase: Failed to prepare statement to verify database: %s</source>
+        <translation>SQLiteDatabase: 데이터베이스를 식별하기 위해 명령을 준비하는 데 실패했습니다: %s</translation>
+    </message>
+    <message>
+        <source>SQLiteDatabase: Failed to read database verification error: %s</source>
+        <translation>SQLiteDatabase: 데이터베이스 식별 에러를 읽는 데 실패했습니다: %s</translation>
+    </message>
+    <message>
+        <source>SQLiteDatabase: Unexpected application id. Expected %u, got %u</source>
+        <translation>SQLiteDatabase: 예상하지 못한 어플리케이션 id. 예상된 %u, 획득 %u</translation>
+    </message>
     <message>
         <source>Section [%s] is not recognized.</source>
         <translation>섹션 [%s]이 인식되지 않습니다.</translation>
@@ -4341,6 +5674,10 @@
         <source>This is the transaction fee you will pay if you send a transaction.</source>
         <translation>당신의 거래를 처리하는 데 필요한 거래 수수료입니다.</translation>
     </message>
+    <message>
+        <source>Topping up keypool…</source>
+        <translation>키풀 채우는 중...</translation>
+    </message>
     <message>
         <source>Transaction amounts must not be negative</source>
         <translation>거래 금액은 반드시 정수여야 합니다.</translation>
@@ -4369,13 +5706,17 @@
         <source>Unable to generate initial keys</source>
         <translation>초기 키를 생성할 수 없습니다.</translation>
     </message>
+    <message>
+        <source>Unable to open %s for writing</source>
+        <translation>작성을 위해 %s를 열 수 없음</translation>
+    </message>
     <message>
         <source>Unknown -blockfilterindex value %s.</source>
         <translation>알 수 없는 -blockfilterindex 값 %s.</translation>
     </message>
     <message>
-        <source>Upgrading UTXO database</source>
-        <translation>UTXO 데이터베이스 업그레이드</translation>
+        <source>Unknown new rules activated (versionbit %i)</source>
+        <translation>알 수 없는 새로운 규칙이 활성화됨 (versionbit %i)</translation>
     </message>
     <message>
         <source>Verifying blocks…</source>
@@ -4394,16 +5735,12 @@
         <translation>지갑 백업 폴더 %s 를 생성할 수 없었습니다!</translation>
     </message>
     <message>
-        <source>You can not start a masternode with wallet enabled.</source>
-        <translation>지갑이 활성화된 상태에서는 마스터노드를 실행할 수 없습니다.</translation>
-    </message>
-    <message>
-        <source>You need to rebuild the database using -reindex to change -addressindex</source>
-        <translation>-addressindex를 변경하기 위해서는 -reindex 체인 상태를 사용하여 데이터를 재구성해야 합니다.</translation>
+        <source>Wiping wallet transactions…</source>
+        <translation>지갑 거래 지우는 중...</translation>
     </message>
     <message>
-        <source>You need to rebuild the database using -reindex to change -spentindex</source>
-        <translation>-spentindex를 변경하기 위해서는 -reindex 체인 상태를 사용하여 데이터를 재구성해야 합니다.</translation>
+        <source>You can not start a masternode with wallet enabled.</source>
+        <translation>지갑이 활성화된 상태에서는 마스터노드를 실행할 수 없습니다.</translation>
     </message>
     <message>
         <source>no mixing available.</source>
@@ -4421,6 +5758,22 @@
         <source>%s uses exact denominated amounts to send funds, you might simply need to mix some more coins.</source>
         <translation>%s는 송금을 위하여 정확한 분할 단위 금액을 사용합니다. 단순히 더 많은 코인을 믹싱함으로써 문제를 해결할 수 있을 지도 모릅니다.</translation>
     </message>
+    <message>
+        <source>-reindex-chainstate option is not compatible with -blockfilterindex. Please temporarily disable blockfilterindex while using -reindex-chainstate, or replace -reindex-chainstate with -reindex to fully rebuild all indexes.</source>
+        <translation>-reindex-chainstate 옵션이 -blockfilterindex와 호환되지 않습니다. -reindex-chainstate를 사용하는 동안 일시적으로 blockfilterindex를 비활성화하거나, -reindex-chainstate를 -reindex로 대체하여 모든 인덱스를 완전히 재구성하십시오.</translation>
+    </message>
+    <message>
+        <source>-reindex-chainstate option is not compatible with -coinstatsindex. Please temporarily disable coinstatsindex while using -reindex-chainstate, or replace -reindex-chainstate with -reindex to fully rebuild all indexes.</source>
+        <translation>-reindex-chainstate 옵션이 -coinstatsindex와 호환되지 않습니다. -reindex-chainstate를 사용하는 동안 일시적으로 coinstatsindex를 비활성화하거나, -reindex-chainstate를 -reindex로 대체하여 모든 인덱스를 완전히 재구성하십시오.</translation>
+    </message>
+    <message>
+        <source>-reindex-chainstate option is not compatible with -txindex. Please temporarily disable txindex while using -reindex-chainstate, or replace -reindex-chainstate with -reindex to fully rebuild all indexes.</source>
+        <translation>-reindex-chainstate 옵션이 -txindex와 호환되지 않습니다. -reindex-chainstate를 사용하는 동안 일시적으로 txindex를 비활성화하거나, -reindex-chainstate를 -reindex로 대체하여 모든 인덱스를 완전히 재구성하십시오.</translation>
+    </message>
+    <message>
+        <source>Cannot downgrade wallet from version %i to version %i. Wallet version unchanged.</source>
+        <translation>지갑을 버전 %i에서 버전 %i로 다운그레이드 할 수 없습니다. 지갑 버전이 변경되지 않았습니다.</translation>
+    </message>
     <message>
         <source>Cannot obtain a lock on data directory %s. %s is probably already running.</source>
         <translation>%s 데이터 디렉토리에 잠금을 설정 할 수 없습니다. %s가 이미 실행 중인 것으로 보입니다.</translation>
@@ -4433,14 +5786,82 @@
         <source>Error loading %s: You can't enable HD on an already existing non-HD wallet</source>
         <translation>%s 로딩 에러: HD 지갑이 아닌 경우 HD를 활성화 할 수 없습니다.</translation>
     </message>
+    <message>
+        <source>Error loading wallet. Wallet requires blocks to be downloaded, and software does not currently support loading wallets while blocks are being downloaded out of order when using assumeutxo snapshots. Wallet should be able to load successfully after node sync reaches height %s</source>
+        <translation>지갑 로딩 오류. 지갑을 이용하려면 블록을 다운로드해야 하며, 현재 소프트웨어는 블록이 assumeutxo 스냅샷을 사용할 때 순서대로 다운로드 되는 동안 지갑 로딩을 지원하지 않습니다. 지갑은 노드 동기화가 높이 %s에 다다랐을 때 성공적으로 로딩할 수 있습니다.</translation>
+    </message>
     <message>
         <source>Error reading %s! All keys read correctly, but transaction data or address book entries might be missing or incorrect.</source>
         <translation>%s 불러오기 오류 입니다.  주소 키는 모두 정확하게 읽혔으나 거래 데이터 혹은 주소록에서 누락이나 오류가 존재할 수 있습니다.</translation>
     </message>
+    <message>
+        <source>Error: Dumpfile format record is incorrect. Got "%s", expected "format".</source>
+        <translation>오류: 덤프파일 포맷 기록이 정확하지 않습니다. "%s" 획득, 예상된 "format".</translation>
+    </message>
+    <message>
+        <source>Error: Dumpfile identifier record is incorrect. Got "%s", expected "%s".</source>
+        <translation>오류: 덤프파일 식별기 기록이 정확하지 않습니다. "%s" 획득, 예상된 "%s".</translation>
+    </message>
+    <message>
+        <source>Error: Dumpfile version is not supported. This version of bitcoin-wallet only supports version 1 dumpfiles. Got dumpfile with version %s</source>
+        <translation>오류: 덤프파일 버전이 지원되지 않습니다. 이 버전의 비트코인 지갑은 버전 1 덤프파일만을 지원합니다. 버전 %s 덤프파일 획득</translation>
+    </message>
+    <message>
+        <source>Failed to rename invalid peers.dat file. Please move or delete it and try again.</source>
+        <translation>유효하지 않은 피어의 이름 바꾸기에 실패하였습니다. 옮기거나 지운 후 다시 시도하세요.</translation>
+    </message>
+    <message>
+        <source>Fee estimation failed. Fallbackfee is disabled. Wait a few blocks or enable %s.</source>
+        <translation>수수료 추정 실패. Fallbackfee가 비활성화되었습니다. 몇 블록을 기다리거나 %s를 활성화하십시오.</translation>
+    </message>
+    <message>
+        <source>File %s already exists. If you are sure this is what you want, move it out of the way first.</source>
+        <translation>파일 %s 가 이미 존재합니다. 정말 이대로 실행하고자 하신다면, 먼저 다른 곳으로 옮겨주세요.</translation>
+    </message>
+    <message>
+        <source>Incompatible options: -dnsseed=1 was explicitly specified, but -onlynet forbids connections to IPv4/IPv6</source>
+        <translation>호환할 수 없는 옵션: -dnsseed=1 이 명시적으로 지정되었으나, -onlynet은 IPv4/IPv6 와의 연결을 금지합니다</translation>
+    </message>
     <message>
         <source>Incorrect or no devnet genesis block found. Wrong datadir for devnet specified?</source>
         <translation>올바르지 않거나 개발 네트워크 생성 블록을 찾을 수 없습니다. 개발 네트워크에 지정된 데이터 디렉토리가 잘못된 것일 수 있습니다.</translation>
     </message>
+    <message>
+        <source>Invalid amount for %s=&lt;amount&gt;: '%s' (must be at least the minrelay fee of %s to prevent stuck transactions)</source>
+        <translation>%s=&lt;amount&gt;에 대한 금액이 유효하지 않음: '%s' (거래가 막히는 것을 방지하려면 최소 %s의 최소 릴레이 수수료여야 함)</translation>
+    </message>
+    <message>
+        <source>Invalid or corrupt peers.dat (%s). If you believe this is a bug, please report it to %s. As a workaround, you can move the file (%s) out of the way (rename, move, or delete) to have a new one created on the next start.</source>
+        <translation>유효하지 않거나 손상된 peers.dat (%s). 이것이 버그라고 생각하신다면, %s에 보고해주십시오. 해결하기 위해서는, 이 파일 (%s) 을 다른 곳으로 이동해서 (이름 바꾸기, 옮기기 혹은 삭제) 다음 시작에 새 파일을 만들 수 있습니다.</translation>
+    </message>
+    <message>
+        <source>No dump file provided. To use createfromdump, -dumpfile=&lt;filename&gt; must be provided.</source>
+        <translation>덤프 파일이 제공되지 않습니다. createfromdump를 사용하기 위해서는, -dumpfile=&lt;filename&gt; 이 제공되어야 합니다.</translation>
+    </message>
+    <message>
+        <source>No dump file provided. To use dump, -dumpfile=&lt;filename&gt; must be provided.</source>
+        <translation>덤프 파일이 제공되지 않습니다. dump를 사용하기 위해서는, -dumpfile=&lt;filename&gt; 이 제공되어야 합니다.</translation>
+    </message>
+    <message>
+        <source>No wallet file format provided. To use createfromdump, -format=&lt;format&gt; must be provided.</source>
+        <translation>지갑 파일 포맷이 제공되지 않습니다. createfromdump를 사용하기 위해서는, -format=&lt;format&gt; 이 제공되어야 합니다.</translation>
+    </message>
+    <message>
+        <source>Outbound connections restricted to CJDNS (-onlynet=cjdns) but -cjdnsreachable is not provided</source>
+        <translation>아웃바운드 연결이 CJDNS (-onlynet=cjdns)로 제한되어 있으나 -cjdnsreachable이 제공되지 않음</translation>
+    </message>
+    <message>
+        <source>Outbound connections restricted to Tor (-onlynet=onion) but the proxy for reaching the Tor network is explicitly forbidden: -onion=0</source>
+        <translation>아웃바운드 연결이 토르 (-onlynet=onion) 로 제한되어 있으나 토르 네트워크에 도달하기 위한 프록시가 명시적으로 금지되어 있습니다: -onion=0</translation>
+    </message>
+    <message>
+        <source>Outbound connections restricted to Tor (-onlynet=onion) but the proxy for reaching the Tor network is not provided: none of -proxy, -onion or -listenonion is given</source>
+        <translation>아웃바운드 연결이 토르 (-onlynet=onion) 로 제한되어 있으나 토르 네트워크에 도달하기 위한 프록시가 제공되지 않았습니다: -proxy 혹은 -listenonion이 주어지지 않음</translation>
+    </message>
+    <message>
+        <source>Outbound connections restricted to i2p (-onlynet=i2p) but -i2psam is not provided</source>
+        <translation>아웃바운드 연결이 i2p (-onlynet=i2p)로 제한되어 있으나 -i2psam이 제공되지 않음</translation>
+    </message>
     <message>
         <source>Please check that your computer's date and time are correct! If your clock is wrong, %s will not work properly.</source>
         <translation>컴퓨터의 날짜와 시간이 올바른지 확인하십시오! 시간이 잘못되면 %s은 제대로 동작하지 않습니다.</translation>
@@ -4449,6 +5870,14 @@
         <source>Please contribute if you find %s useful. Visit %s for further information about the software.</source>
         <translation>%s이/가 유용하다고 생각한다면 프로젝트에 공헌해주세요. 이 소프트웨어에 대한 보다 자세한 정보는 %s를 방문해주십시오.</translation>
     </message>
+    <message>
+        <source>Prune mode is incompatible with -reindex-chainstate. Use full -reindex instead.</source>
+        <translation>블록 축소 모드가 -reindex-chainstate와 호환되지 않습니다. 대신 완전한 -reindex를 사용하십시오.</translation>
+    </message>
+    <message>
+        <source>This is the maximum transaction fee you pay (in addition to the normal fee) to prioritize partial spend avoidance over regular coin selection.</source>
+        <translation>이는 일반 코인 선택보다 부분 지출 회피를 우선하기 위해 (일반 거래 수수료에 더해) 지불하는 최대 거래 수수료입니다.</translation>
+    </message>
     <message>
         <source>This is the transaction fee you may discard if change is smaller than dust at this level</source>
         <translation>잔돈이 이 수준의 더스트보다 적은 경우 당신이 버려야 할 수도 있는 거래 수수료입니다</translation>
@@ -4457,14 +5886,38 @@
         <source>This is the transaction fee you may pay when fee estimates are not available.</source>
         <translation>이것은 수수료 견적을 이용할 수 없는 경우 당신이 지불 하게 될 것으로 예상되는 거래 수수료입니다.</translation>
     </message>
+    <message>
+        <source>Transaction requires one destination of non-0 value, a non-0 feerate, or a pre-selected input</source>
+        <translation>거래는 0이 아닌 값의 대상, 0이 아닌 수수료율 또는 사전 선택된 입력이 필요합니다</translation>
+    </message>
     <message>
         <source>Unable to replay blocks. You will need to rebuild the database using -reindex-chainstate.</source>
         <translation>블록을 재실행 할 수 없습니다. -reindex-chainstate를 이용해 데이터베이스를 재구성해야 합니다.</translation>
     </message>
+    <message>
+        <source>Unknown wallet file format "%s" provided. Please provide one of "bdb" or "sqlite".</source>
+        <translation>알 수 없는 지갑 파일 포맷 "%s" 이 입력되었습니다. "bdb" 혹은 "splite" 중 하나를 입력하세요.</translation>
+    </message>
+    <message>
+        <source>Unsupported chainstate database format found. Please restart with -reindex-chainstate. This will rebuild the chainstate database.</source>
+        <translation>지원되지 않는 체인상태 데이터베이스 형식이 발견되었습니다. -reindex-chainstate로 재시작하십시오. 이렇게 하면 체인상태 데이터베이스가 재구성됩니다.</translation>
+    </message>
+    <message>
+        <source>Warning: Dumpfile wallet format "%s" does not match command line specified format "%s".</source>
+        <translation>경고: 덤프파일 지갑 포맷 "%s" 이 명령줄에 지정된 포맷인 "%s" 과 일치하지 않습니다.</translation>
+    </message>
     <message>
         <source>Warning: Private keys detected in wallet {%s} with disabled private keys</source>
         <translation>경고: 비활성화된 개인 키가 있는 지갑 {%s}에서 개인 키가 감지되었습니다.</translation>
     </message>
+    <message>
+        <source>You need to rebuild the database using -reindex to enable -timestampindex</source>
+        <translation>-timestampindex를 활성화하기 위해서는 -reindex를 이용하여 데이터베이스를 재구성해야 합니다.</translation>
+    </message>
+    <message>
+        <source>%s -- Incorrect seed, it should be a hex string</source>
+        <translation>%s -- 올바르지 않은 시드, 16진수 문자열이어야 합니다</translation>
+    </message>
     <message>
         <source>%s is not a valid backup folder!</source>
         <translation>%s는 올바른 백업 폴더가 아닙니다!</translation>
@@ -4489,10 +5942,30 @@
         <source>-rpcport must be specified when -devnet and -server are specified</source>
         <translation>-devnet과 -server가 지정될 때에는 -rpcport도 지정되어야 합니다.</translation>
     </message>
+    <message>
+        <source>-statsbatchsize cannot be configured with a negative value.</source>
+        <translation>-statsbatchsize는 음수 값으로 구성할 수 없습니다.</translation>
+    </message>
+    <message>
+        <source>-statsduration cannot be configured with a negative value.</source>
+        <translation>-statsduration은 음수 값으로 구성할 수 없습니다.</translation>
+    </message>
     <message>
         <source>A fatal internal error occurred, see debug.log for details</source>
         <translation>치명적인 내부 오류가 발생했습니다. 자세한 내용은 debug.log 에서 확인하십시오.</translation>
     </message>
+    <message>
+        <source>Cannot create socket (socket() returned error %s)</source>
+        <translation>소켓을 생성할 수 없습니다 (socket()이 오류 %s를 반환함)</translation>
+    </message>
+    <message>
+        <source>Cannot get socket address for %s</source>
+        <translation>%s에 대한 소켓 주소를 가져올 수 없습니다</translation>
+    </message>
+    <message>
+        <source>Cannot init Statsd client</source>
+        <translation>Statsd 클라이언트를 초기화할 수 없습니다</translation>
+    </message>
     <message>
         <source>Cannot resolve -%s address: '%s'</source>
         <translation>%s주소: '%s'를 확인할 수 없습니다.</translation>
@@ -4501,10 +5974,6 @@
         <source>Cannot write to data directory '%s'; check permissions.</source>
         <translation>'%s' 데이터 디렉토리를 생성할 수 없습니다: 허용 내역을 확인하십시오.</translation>
     </message>
-    <message>
-        <source>Change index out of range</source>
-        <translation>범위 밖의 인덱스 변경</translation>
-    </message>
     <message>
         <source>Copyright (C)</source>
         <translation>Copyright (C)</translation>
@@ -4513,6 +5982,14 @@
         <source>Disk space is too low!</source>
         <translation>디스크 공간이 부족합니다!</translation>
     </message>
+    <message>
+        <source>Dump file %s does not exist.</source>
+        <translation>덤프파일 %s 가 존재하지 않습니다.</translation>
+    </message>
+    <message>
+        <source>Error creating %s</source>
+        <translation>%s 생성 오류</translation>
+    </message>
     <message>
         <source>Error loading %s</source>
         <translation>%s 불러오기 오류</translation>
@@ -4530,8 +6007,8 @@
         <translation>%s 로딩 에러: 이미 존재하는 HD 지갑에서 HD를 비활성화 할 수 없습니다.</translation>
     </message>
     <message>
-        <source>Error upgrading chainstate database</source>
-        <translation>체인 상태 데이터베이스 업그레이드 중 오류가 발생했습니다.</translation>
+        <source>Error reading next record from wallet database</source>
+        <translation>지갑 데이터베이스에서 다음 기록을 읽는데 오류 발생</translation>
     </message>
     <message>
         <source>Loading P2P addresses…</source>
@@ -4601,6 +6078,14 @@
         <source>Inputs vs outputs size mismatch.</source>
         <translation>입력값 vs 출력값 사이즈가 일치하지 않습니다.</translation>
     </message>
+    <message>
+        <source>Invalid '%s'. Allowed values: 128, 160, 192, 224, 256.</source>
+        <translation>유효하지 않은 '%s'. 허용된 값: 128, 160, 192, 224, 256.</translation>
+    </message>
+    <message>
+        <source>Invalid -i2psam address or hostname: '%s'</source>
+        <translation>유효하지 않은 -i2psam 주소 혹은 호스트이름: '%s'</translation>
+    </message>
     <message>
         <source>Invalid -onion address or hostname: '%s'</source>
         <translation>올바르지 않은 -onion 주소 또는 호스트 이름: '%s'</translation>
@@ -4645,14 +6130,78 @@
         <source>%s corrupt. Try using the wallet tool dash-wallet to salvage or restoring a backup.</source>
         <translation>%s이(가) 손상되었습니다. 지갑 도구 dash-wallet을 사용하여 백업을 복구하거나 복원하십시오.</translation>
     </message>
+    <message>
+        <source>%s is set very high! Fees this large could be paid on a single transaction.</source>
+        <translation>%s가 매우 높게 설정되었습니다! 이렇게 큰 수수료는 단일 거래에서 지불될 수 있습니다.</translation>
+    </message>
+    <message>
+        <source>%s request to listen on port %u. This port is considered "bad" and thus it is unlikely that any Dash Core peers connect to it. See doc/p2p-bad-ports.md for details and a full list.</source>
+        <translation>%s가 포트 %u에서 수신 대기를 요청했습니다. 이 포트는 "나쁜" 것으로 간주되며, 따라서 어떤 Dash Core 피어도 연결하지 않을 가능성이 높습니다. 자세한 내용 및 전체 목록은 doc/p2p-bad-ports.md를 참고하세요.</translation>
+    </message>
+    <message>
+        <source>Cannot provide specific connections and have addrman find outgoing connections at the same time.</source>
+        <translation>특정 연결을 제공하면서 addrman이 외부로 향하는 연결을 찾도록 동시에 설정할 수 없습니다.</translation>
+    </message>
+    <message>
+        <source>Failed to upgrade Evo database</source>
+        <translation>Evo 데이터베이스 업그레이드 실패</translation>
+    </message>
+    <message>
+        <source>Fee needed &gt; fee paid</source>
+        <translation>필요한 수수료 &gt; 지불한 수수료</translation>
+    </message>
+    <message>
+        <source>Host %s on unsupported network</source>
+        <translation>지원되지 않는 네트워크의 호스트 %s</translation>
+    </message>
+    <message>
+        <source>Invalid amount for %s=&lt;amount&gt;: '%s' (must be at least %s)</source>
+        <translation>%s=&lt;amount&gt;에 대한 금액이 유효하지 않음: '%s' (최소 %s여야 함)</translation>
+    </message>
+    <message>
+        <source>Invalid amount for %s=&lt;amount&gt;: '%s'</source>
+        <translation>%s=&lt;amount&gt;에 대한 금액이 유효하지 않음: '%s'</translation>
+    </message>
+    <message>
+        <source>Invalid port specified in %s: '%s'</source>
+        <translation>%s에 지정된 포트가 유효하지 않음: '%s'</translation>
+    </message>
     <message>
         <source>Last successful action was too recent.</source>
         <translation>지난 성공적 액션이 너무 최신입니다.</translation>
     </message>
+    <message>
+        <source>Missing solving data for estimating transaction size</source>
+        <translation>거래 크기를 추정하기 위한 해결 데이터 누락</translation>
+    </message>
+    <message>
+        <source>No host specified</source>
+        <translation>호스트가 지정되지 않음</translation>
+    </message>
+    <message>
+        <source>No host specified, malformed URL</source>
+        <translation>호스트가 지정되지 않음, 잘못된 형식의 URL</translation>
+    </message>
+    <message>
+        <source>No text before the scheme delimiter, malformed URL</source>
+        <translation>스킴 구분 기호 앞에 텍스트 없음, 잘못된 형식의 URL</translation>
+    </message>
+    <message>
+        <source>Port must be between %d and %d, supplied %d</source>
+        <translation>포트는 %d와 %d 사이여야 하며, %d가 제공됨</translation>
+    </message>
+    <message>
+        <source>Socket not initialized, cannot send message</source>
+        <translation>소켓이 초기화되지 않음, 메시지를 보낼 수 없습니다</translation>
+    </message>
     <message>
         <source>The source code is available from %s.</source>
         <translation>소스 코드는 %s 에서 확인하실 수 있습니다.</translation>
     </message>
+    <message>
+        <source>The specified config file %s does not exist</source>
+        <translation>선택된 설정 파일 %s가 존재하지 않습니다</translation>
+    </message>
     <message>
         <source>The transaction amount is too small to pay the fee</source>
         <translation>수수료를 지불하기에 거래 금액이 너무 작습니다.</translation>
@@ -4673,6 +6222,10 @@
         <source>Transaction fees are too high.</source>
         <translation>거래 수수료가 너무 높습니다.</translation>
     </message>
+    <message>
+        <source>Transaction needs a change address, but we can't generate it.</source>
+        <translation>거래에 잔액 주소가 필요하지만 생성할 수 없습니다.</translation>
+    </message>
     <message>
         <source>Transaction not valid.</source>
         <translation>거래가 유효하지 않습니다.</translation>
@@ -4693,6 +6246,18 @@
         <source>Unable to locate enough non-denominated funds for this transaction.</source>
         <translation>이 거래에 필요한 비 분할단위 자금을 찾을 수 없습니다.</translation>
     </message>
+    <message>
+        <source>Unable to lookup host %s</source>
+        <translation>호스트 %s를 조회할 수 없습니다</translation>
+    </message>
+    <message>
+        <source>Unable to parse -maxuploadtarget: '%s'</source>
+        <translation>-maxuploadtarget을 파싱할 수 없습니다: '%s'</translation>
+    </message>
+    <message>
+        <source>Unable to send message to %s (::sendto() returned error %s)</source>
+        <translation>%s로 메시지를 보낼 수 없습니다 (::sendto()가 오류 %s를 반환함)</translation>
+    </message>
     <message>
         <source>Unable to sign spork message, wrong key?</source>
         <translation>스포크 메시지에 사인할 수 없습니다. 키가 잘못된 것일 수 있습니다.</translation>
@@ -4706,12 +6271,12 @@
         <translation>알 수 없는 상태: id = %u</translation>
     </message>
     <message>
-        <source>Unsupported logging category %s=%s.</source>
-        <translation>지원되지 않는 로깅 카테고리 %s=%s.</translation>
+        <source>Unsupported URL scheme, must begin with udp://</source>
+        <translation>지원되지 않는 URL 스킴, udp://로 시작해야 함</translation>
     </message>
     <message>
-        <source>Upgrading txindex database</source>
-        <translation>txindex 데이터베이스 업그레이드</translation>
+        <source>Unsupported logging category %s=%s.</source>
+        <translation>지원되지 않는 로깅 카테고리 %s=%s.</translation>
     </message>
     <message>
         <source>Very low number of keys left: %d</source>
@@ -4741,9 +6306,25 @@
         <source>You can not disable governance validation on a masternode.</source>
         <translation>마스터노드에서 거버넌스 유효성 검사를 해제할 수 없습니다.</translation>
     </message>
+    <message>
+        <source>You need to rebuild the database using -reindex to enable -addressindex</source>
+        <translation>-addressindex를 활성화하기 위해서는 -reindex를 사용하여 데이터를 재구성해야 합니다</translation>
+    </message>
+    <message>
+        <source>You need to rebuild the database using -reindex to enable -spentindex</source>
+        <translation>-spentindex를 활성화하기 위해서는 -reindex를 사용하여 데이터를 재구성해야 합니다</translation>
+    </message>
     <message>
         <source>Your entries added successfully.</source>
         <translation>당신의 입력이 성공적으로 추가되었습니다.</translation>
     </message>
+    <message>
+        <source>Settings file could not be read</source>
+        <translation>설정 파일을 읽을 수 없습니다</translation>
+    </message>
+    <message>
+        <source>Settings file could not be written</source>
+        <translation>설정 파일을 작성할 수 없습니다</translation>
+    </message>
 </context>
 </TS>
\ No newline at end of file

From 04d9f0641b716056cc55b7c4600b41304dfd47cf Mon Sep 17 00:00:00 2001
From: UdjinM6 <UdjinM6@users.noreply.github.com>
Date: Sat, 25 Oct 2025 09:28:57 +0300
Subject: [PATCH 334/656] th

---
 src/qt/locale/dash_th.ts | 1935 ++++++++++++++++++++++++++++++++++----
 1 file changed, 1765 insertions(+), 170 deletions(-)

diff --git a/src/qt/locale/dash_th.ts b/src/qt/locale/dash_th.ts
index d51d06e07529..2532e7f01204 100644
--- a/src/qt/locale/dash_th.ts
+++ b/src/qt/locale/dash_th.ts
@@ -65,14 +65,6 @@
         <source>C&amp;hoose</source>
         <translation>เลือก</translation>
     </message>
-    <message>
-        <source>Sending addresses</source>
-        <translation>ส่งที่อยู่</translation>
-    </message>
-    <message>
-        <source>Receiving addresses</source>
-        <translation>ที่อยู่ผู้รับ</translation>
-    </message>
     <message>
         <source>These are your Dash addresses for sending payments. Always check the amount and the receiving address before sending coins.</source>
         <translation>นี่คือที่อยู่ Dash ของคุณสำหรับการส่งการชำระเงิน โปรดตรวจสอบจำนวนเงินและที่อยู่ผู้รับก่อนที่จะส่งเหรียญ</translation>
@@ -93,6 +85,10 @@
         <source>&amp;Edit</source>
         <translation>&amp;แก้ไข</translation>
     </message>
+    <message>
+        <source>Show address &amp;QR code</source>
+        <translation>แสดงรหัส &amp;QR ของที่อยู่</translation>
+    </message>
     <message>
         <source>QR code</source>
         <translation>โค้ด QR</translation>
@@ -101,6 +97,24 @@
         <source>Export Address List</source>
         <translation>ส่งออกรายการที่อยู่</translation>
     </message>
+    <message>
+        <source>Comma separated file</source>
+        <extracomment>Expanded name of the CSV file format. See: https://en.wikipedia.org/wiki/Comma-separated_values.</extracomment>
+        <translation>ไฟล์คั่นด้วยเครื่องหมายจุลภาค</translation>
+    </message>
+    <message>
+        <source>There was an error trying to save the address list to %1. Please try again.</source>
+        <extracomment>An error message. %1 is a stand-in argument for the name of the file we attempted to save to.</extracomment>
+        <translation>เกิดข้อผิดพลาดในการบันทึกรายการที่อยู่ไปยัง %1 โปรดลองอีกครั้ง</translation>
+    </message>
+    <message>
+        <source>Sending addresses - %1</source>
+        <translation>ที่อยู่สำหรับส่ง - %1</translation>
+    </message>
+    <message>
+        <source>Receiving addresses - %1</source>
+        <translation>ที่อยู่สำหรับรับ - %1</translation>
+    </message>
     <message>
         <source>Exporting Failed</source>
         <translation>การส่งออกล้มเหลว</translation>
@@ -270,10 +284,22 @@
         <source>The passphrase entered for the wallet decryption was incorrect.</source>
         <translation>รหัสผ่านของวลีสำหรับการเข้าถึงกระเป๋าสตางค์ไม่ถูกต้อง </translation>
     </message>
+    <message>
+        <source>The passphrase entered for the wallet decryption is incorrect. It contains a null character (ie - a zero byte). If the passphrase was set with a version of this software prior to 23.0, please try again with only the characters up to — but not including — the first null character. If this is successful, please set a new passphrase to avoid this issue in the future.</source>
+        <translation>วลีรหัสผ่านที่ป้อนสำหรับการถอดรหัสกระเป๋าสตางค์ไม่ถูกต้อง มันมีอักขระ null (เช่น ไบต์ศูนย์) หากวลีรหัสผ่านถูกตั้งค่าด้วยซอฟต์แวร์เวอร์ชันก่อน 23.0 โปรดลองอีกครั้งด้วยเฉพาะอักขระจนถึง — แต่ไม่รวม — อักขระ null ตัวแรก หากสำเร็จ โปรดตั้งวลีรหัสผ่านใหม่เพื่อหลีกเลี่ยงปัญหานี้ในอนาคต</translation>
+    </message>
     <message>
         <source>Wallet passphrase was successfully changed.</source>
         <translation>เปลี่ยนวลีรหัสผ่านเรียบร้อยแล้ว</translation>
     </message>
+    <message>
+        <source>Passphrase change failed</source>
+        <translation>การเปลี่ยนวลีรหัสผ่านล้มเหลว</translation>
+    </message>
+    <message>
+        <source>The old passphrase entered for the wallet decryption is incorrect. It contains a null character (ie - a zero byte). If the passphrase was set with a version of this software prior to 23.0, please try again with only the characters up to — but not including — the first null character.</source>
+        <translation>วลีรหัสผ่านเก่าที่ป้อนสำหรับการถอดรหัสกระเป๋าสตางค์ไม่ถูกต้อง มันมีอักขระ null (เช่น ไบต์ศูนย์) หากวลีรหัสผ่านถูกตั้งค่าด้วยซอฟต์แวร์เวอร์ชันก่อน 23.0 โปรดลองอีกครั้งด้วยเฉพาะอักขระจนถึง — แต่ไม่รวม — อักขระ null ตัวแรก</translation>
+    </message>
     <message>
         <source>Warning: The Caps Lock key is on!</source>
         <translation>คำเตือน: ปุ่มแป้นตรึงตัวอักษรใหญ่เปิดอยู่</translation>
@@ -299,7 +325,23 @@
 </context>
 <context>
     <name>BitcoinApplication</name>
-    </context>
+    <message>
+        <source>Runaway exception</source>
+        <translation>ข้อยกเว้นที่หนีควบคุม</translation>
+    </message>
+    <message>
+        <source>A fatal error occurred. %1 can no longer continue safely and will quit.</source>
+        <translation>เกิดข้อผิดพลาดร้ายแรง %1 ไม่สามารถดำเนินการต่อได้อย่างปลอดภัยและจะปิดโปรแกรม</translation>
+    </message>
+    <message>
+        <source>Internal error</source>
+        <translation>ข้อผิดพลาดภายใน</translation>
+    </message>
+    <message>
+        <source>An internal error occurred. %1 will attempt to continue safely. This is an unexpected bug which can be reported as described below.</source>
+        <translation>เกิดข้อผิดพลาดภายใน %1 จะพยายามดำเนินการต่อได้อย่างปลอดภัย นี่เป็นบั๊กที่ไม่คาดคิดซึ่งสามารถรายงานได้ตามที่อธิบายด้านล่าง</translation>
+    </message>
+</context>
 <context>
     <name>BitcoinGUI</name>
     <message>
@@ -326,6 +368,10 @@
         <source>Request payments (generates QR codes and dash: URIs)</source>
         <translation>เรียกเก็บการชำระเงิน (สร้างคิว อาร์ โค้ด QR codes และแหล่งที่มาของ Dash: URIs)</translation>
     </message>
+    <message>
+        <source>Ctrl+Q</source>
+        <translation>Ctrl+Q</translation>
+    </message>
     <message>
         <source>&amp;Options…</source>
         <translation>&amp;ตัวเลือก…</translation>
@@ -354,6 +400,10 @@
         <source>&amp;Verify message…</source>
         <translation>&amp;ยืนยันข้อความ…</translation>
     </message>
+    <message>
+        <source>&amp;Load PSBT from file…</source>
+        <translation>&amp;โหลด PSBT จากไฟล์…</translation>
+    </message>
     <message>
         <source>&amp;Sending addresses</source>
         <translation>&amp;ส่งที่อยู่</translation>
@@ -386,10 +436,6 @@
         <source>&amp;Window</source>
         <translation>&amp;หน้าต่าง</translation>
     </message>
-    <message>
-        <source>Minimize</source>
-        <translation>ย่อเล็กสุด</translation>
-    </message>
     <message>
         <source>Zoom</source>
         <translation>ขยาย</translation>
@@ -442,14 +488,6 @@
         <source>Modify configuration options for %1</source>
         <translation>ปรับปรุง ข้อมูลการตั้งค่าตัวเลือก สำหรับ %1</translation>
     </message>
-    <message>
-        <source>&amp;Show / Hide</source>
-        <translation>&amp;แสดง / ซ่อน</translation>
-    </message>
-    <message>
-        <source>Show or hide the main Window</source>
-        <translation>แสดง หรือ ซ่อน หน้าหลัก</translation>
-    </message>
     <message>
         <source>Encrypt the private keys that belong to your wallet</source>
         <translation>เข้ารหัส private keys สำหรับกระเป๋าสตางค์ของท่าน</translation>
@@ -514,10 +552,6 @@
         <source>Show wallet repair options</source>
         <translation>แสดงตัวเลือกการซ่อมแซมกระเป๋าสตางค์</translation>
     </message>
-    <message>
-        <source>Open Wallet &amp;Configuration File</source>
-        <translation>เปิดกระเป๋าสตางค์  &amp;การกำหนดค่าไฟล์</translation>
-    </message>
     <message>
         <source>Open configuration file</source>
         <translation>เปิดไฟล์การกำหนดค่า</translation>
@@ -572,10 +606,18 @@
         <source>Show information about %1</source>
         <translation>แสดงข้อมูลเกี่ยวกับ %1</translation>
     </message>
+    <message>
+        <source>Load PSBT from &amp;clipboard…</source>
+        <translation>โหลด PSBT จาก&amp;คลิปบอร์ด…</translation>
+    </message>
     <message>
         <source>Open debugging and diagnostic console</source>
         <translation>เปิดคอนโซลการตรวจแก้จุดบกพร่องและการวินิจฉัย</translation>
     </message>
+    <message>
+        <source>Open &amp;wallet configuration file</source>
+        <translation>เปิดไฟล์การกำหนดค่า&amp;กระเป๋าสตางค์</translation>
+    </message>
     <message>
         <source>Open a dash: URI</source>
         <translation>เปิด Dash: URI</translation>
@@ -584,6 +626,20 @@
         <source>Create a new wallet</source>
         <translation>สร้างกระเป๋าเงินใหม่</translation>
     </message>
+    <message>
+        <source>Restore Wallet…</source>
+        <extracomment>Name of the menu item that restores wallet from a backup file.</extracomment>
+        <translation>กู้คืนกระเป๋าสตางค์…</translation>
+    </message>
+    <message>
+        <source>Restore a wallet from a backup file</source>
+        <extracomment>Status tip for Restore Wallet menu item</extracomment>
+        <translation>กู้คืนกระเป๋าสตางค์จากไฟล์สำรองข้อมูล</translation>
+    </message>
+    <message>
+        <source>Close all wallets</source>
+        <translation>ปิดกระเป๋าสตางค์ทั้งหมด</translation>
+    </message>
     <message>
         <source>%1 &amp;information</source>
         <translation>%1 &amp;ข้อมูล</translation>
@@ -592,10 +648,42 @@
         <source>Show the %1 basic information</source>
         <translation>แสดงข้อมูลพื้นฐานของ %1</translation>
     </message>
+    <message>
+        <source>&amp;Discreet mode</source>
+        <translation>โหมด&amp;ปกปิด</translation>
+    </message>
+    <message>
+        <source>Mask the values in the Overview tab</source>
+        <translation>ซ่อนค่าในแท็บภาพรวม</translation>
+    </message>
+    <message>
+        <source>Wallet Data</source>
+        <extracomment>Name of the wallet data file format.</extracomment>
+        <translation>ข้อมูลกระเป๋าสตางค์</translation>
+    </message>
+    <message>
+        <source>Load Wallet Backup</source>
+        <extracomment>The title for Restore Wallet File Windows</extracomment>
+        <translation>โหลดข้อมูลสำรองกระเป๋าสตางค์</translation>
+    </message>
+    <message>
+        <source>Restore Wallet</source>
+        <extracomment>Title of pop-up window shown when the user is attempting to restore a wallet.</extracomment>
+        <translation>กู้คืนกระเป๋าสตางค์</translation>
+    </message>
+    <message>
+        <source>Wallet Name</source>
+        <extracomment>Label of the input field where the name of the wallet is entered.</extracomment>
+        <translation>ชื่อกระเป๋าสตางค์</translation>
+    </message>
     <message>
         <source>&amp;Settings</source>
         <translation>&amp;การตั้งค่า</translation>
     </message>
+    <message>
+        <source>&amp;Minimize</source>
+        <translation>&amp;ย่อเล็กสุด</translation>
+    </message>
     <message>
         <source>&amp;Help</source>
         <translation>&amp;ช่วยเหลือ</translation>
@@ -612,6 +700,14 @@
         <source>View Governance Proposals</source>
         <translation>ดูข้อเสนอการกำกับดูแล</translation>
     </message>
+    <message>
+        <source>&amp;Hide</source>
+        <translation>&amp;ซ่อน</translation>
+    </message>
+    <message>
+        <source>S&amp;how</source>
+        <translation>แ&amp;สดง</translation>
+    </message>
     <message numerus="yes">
         <source>%n active connection(s) to Dash network</source>
         <extracomment>A substring of the tooltip.</extracomment>
@@ -633,10 +729,50 @@
         <source>Close Wallet…</source>
         <translation>ปิดกระเป๋าสตางค์ …</translation>
     </message>
+    <message>
+        <source>Load Partially Signed Blockchain Transaction</source>
+        <translation>โหลดธุรกรรมบล็อกเชนที่ลงลายมือชื่อบางส่วน</translation>
+    </message>
+    <message>
+        <source>Load Partially Signed Blockchain Transaction from clipboard</source>
+        <translation>โหลดธุรกรรมบล็อกเชนที่ลงลายมือชื่อบางส่วนจากคลิปบอร์ด</translation>
+    </message>
     <message>
         <source>Create Wallet…</source>
         <translation>สร้างกระเป๋าสตางค์ …</translation>
     </message>
+    <message>
+        <source>Close All Wallets…</source>
+        <translation>ปิดกระเป๋าสตางค์ทั้งหมด…</translation>
+    </message>
+    <message>
+        <source>Ctrl+Shift+D</source>
+        <translation>Ctrl+Shift+D</translation>
+    </message>
+    <message>
+        <source>Ctrl+M</source>
+        <translation>Ctrl+M</translation>
+    </message>
+    <message>
+        <source>Click for more actions.</source>
+        <extracomment>A substring of the tooltip. "More actions" are available via the context menu.</extracomment>
+        <translation>คลิกเพื่อดำเนินการเพิ่มเติม</translation>
+    </message>
+    <message>
+        <source>Show Peers tab</source>
+        <extracomment>A context menu item. The "Peers tab" is an element of the "Node window".</extracomment>
+        <translation>แสดงแท็บเพียร์</translation>
+    </message>
+    <message>
+        <source>Disable network activity</source>
+        <extracomment>A context menu item.</extracomment>
+        <translation>ปิดใช้งานกิจกรรมเครือข่าย</translation>
+    </message>
+    <message>
+        <source>Enable network activity</source>
+        <extracomment>A context menu item. The network activity was disabled previously.</extracomment>
+        <translation>เปิดใช้งานกิจกรรมเครือข่าย</translation>
+    </message>
     <message>
         <source>Syncing Headers (%1%)…</source>
         <translation>กำลังซิงค์ส่วนหัว (%1%) …</translation>
@@ -653,10 +789,6 @@
         <source>Processing blocks on disk…</source>
         <translation>กำลังดำเนินการกับบล็อกในดิสก์…</translation>
     </message>
-    <message>
-        <source>Reindexing blocks on disk…</source>
-        <translation>กำลังทำดัชนี ที่เก็บบล็อก ใหม่ ในดิสก์…</translation>
-    </message>
     <message>
         <source>Connecting to peers…</source>
         <translation>เชื่อมต่อกับ Peers</translation>
@@ -810,10 +942,6 @@
         <source>Coin Selection</source>
         <translation>การเลือก Coin</translation>
     </message>
-    <message>
-        <source>Dust:</source>
-        <translation>เศษ:</translation>
-    </message>
     <message>
         <source>After Fee:</source>
         <translation>ส่วนที่เหลือจากค่าธรรมเนียม:</translation>
@@ -874,6 +1002,30 @@
         <source>Copy amount</source>
         <translation>คัดลอกจำนวน</translation>
     </message>
+    <message>
+        <source>&amp;Copy address</source>
+        <translation>&amp;คัดลอกที่อยู่</translation>
+    </message>
+    <message>
+        <source>Copy &amp;label</source>
+        <translation>คัดลอก&amp;ป้ายกำกับ</translation>
+    </message>
+    <message>
+        <source>Copy &amp;amount</source>
+        <translation>คัดลอก&amp;จำนวน</translation>
+    </message>
+    <message>
+        <source>Copy transaction &amp;ID and output index</source>
+        <translation>คัดลอก&amp;ID ธุรกรรมและดัชนีเอาต์พุต</translation>
+    </message>
+    <message>
+        <source>L&amp;ock unspent</source>
+        <translation>&amp;ล็อกที่ยังไม่ได้ใช้</translation>
+    </message>
+    <message>
+        <source>&amp;Unlock unspent</source>
+        <translation>&amp;ปลดล็อกที่ยังไม่ได้ใช้</translation>
+    </message>
     <message>
         <source>Copy quantity</source>
         <translation>ปริมาณการคัดลอก</translation>
@@ -890,10 +1042,6 @@
         <source>Copy bytes</source>
         <translation>คัดลอกหน่วยของข้อมูลคอมพิวเตอร์</translation>
     </message>
-    <message>
-        <source>Copy dust</source>
-        <translation>คัดลอก dust </translation>
-    </message>
     <message>
         <source>Copy change</source>
         <translation>คัดลอกการเปลี่ยนแปลง</translation>
@@ -906,18 +1054,6 @@
         <source>(%1 locked)</source>
         <translation>(%1 ล็อค)</translation>
     </message>
-    <message>
-        <source>yes</source>
-        <translation>ใช่</translation>
-    </message>
-    <message>
-        <source>no</source>
-        <translation>ไม่</translation>
-    </message>
-    <message>
-        <source>This label turns red if any recipient receives an amount smaller than the current dust threshold.</source>
-        <translation>ป้ายนี้จะเปลี่ยนเป็นสีแดงถ้าตัวรับใด ๆ ได้รับจำนวนเงินน้อยกว่าขั้นต่ำในปัจจุบัน</translation>
-    </message>
     <message>
         <source>Can vary +/- %1 duff(s) per input.</source>
         <translation>สามารถเปลี่ยนแปลงได้ + / - %1 duff (s) ต่อรายการ</translation>
@@ -961,6 +1097,11 @@
 </context>
 <context>
     <name>CreateWalletActivity</name>
+    <message>
+        <source>Create Wallet</source>
+        <extracomment>Title of window indicating the progress of creation of a new wallet.</extracomment>
+        <translation>สร้างกระเป๋าสตางค์</translation>
+    </message>
     <message>
         <source>Creating Wallet &lt;b&gt;%1&lt;/b&gt;…</source>
         <extracomment>Descriptive text of the create wallet progress window which indicates to the user which wallet is currently being created.</extracomment>
@@ -985,6 +1126,10 @@
         <source>Wallet Name</source>
         <translation>ชื่อกระเป๋าเงิน</translation>
     </message>
+    <message>
+        <source>Wallet</source>
+        <translation>กระเป๋าสตางค์</translation>
+    </message>
     <message>
         <source>Encrypt the wallet. The wallet will be encrypted with a passphrase of your choice.</source>
         <translation>เข้ารหัสกระเป๋าสตางค์กระเป๋าเงินจะถูกเข้ารหัสด้วยรหัสผ่านที่คุณเลือก</translation>
@@ -993,6 +1138,10 @@
         <source>Encrypt Wallet</source>
         <translation>เข้ารหัสกระเป๋าสตางค์</translation>
     </message>
+    <message>
+        <source>Advanced Options</source>
+        <translation>ตัวเลือกขั้นสูง</translation>
+    </message>
     <message>
         <source>Disable private keys for this wallet. Wallets with private keys disabled will have no private keys and cannot have an HD seed or imported private keys. This is ideal for watch-only wallets.</source>
         <translation>ปิดการใช้งานคีย์ส่วนตัวสำหรับกระเป๋าเงินนี้ กระเป๋าเงินที่ปิดการใช้งานคีย์ส่วนตัวและไม่มีคีย์ส่วนตัว HD seed หรือปุ่มส่วนตัวนำเข้าเหมาะสำหรับ จะเป็นเพียงกระเป๋าที่ไม่ได้ใช้งานเท่านั้น</translation>
@@ -1009,11 +1158,23 @@
         <source>Make Blank Wallet</source>
         <translation>ทำกระเป๋าเงินว่างเปล่า</translation>
     </message>
+    <message>
+        <source>Use descriptors for scriptPubKey management. This feature is well-tested but still considered experimental and not recommended for use yet.</source>
+        <translation>ใช้ตัวอธิบายสำหรับการจัดการ scriptPubKey คุณสมบัตินี้ผ่านการทดสอบมาอย่างดีแล้ว แต่ยังถือว่าเป็นการทดลองและยังไม่แนะนำให้ใช้</translation>
+    </message>
+    <message>
+        <source>Descriptor Wallet (EXPERIMENTAL)</source>
+        <translation>กระเป๋าสตางค์แบบตัวอธิบาย (ทดลอง)</translation>
+    </message>
     <message>
         <source>Create</source>
         <translation>สร้าง</translation>
     </message>
-    </context>
+    <message>
+        <source>Compiled without sqlite support (required for descriptor wallets)</source>
+        <translation>คอมไพล์โดยไม่มีการสนับสนุน sqlite (จำเป็นสำหรับกระเป๋าสตางค์แบบตัวอธิบาย)</translation>
+    </message>
+</context>
 <context>
     <name>EditAddressDialog</name>
     <message>
@@ -1106,18 +1267,102 @@
         <source>Filter proposal list</source>
         <translation>กรองรายการข้อเสนอ</translation>
     </message>
+    <message>
+        <source>Masternode Count:</source>
+        <translation>จำนวนมาสเตอร์โหนด:</translation>
+    </message>
+    <message>
+        <source>Number of masternodes this wallet can vote with (masternodes for which this wallet holds the voting key)</source>
+        <translation>จำนวนมาสเตอร์โหนดที่กระเป๋าสตางค์นี้สามารถลงคะแนนได้ (มาสเตอร์โหนดที่กระเป๋าสตางค์นี้ถือคีย์การลงคะแนน)</translation>
+    </message>
     <message>
         <source>Proposal Count:</source>
         <translation>จำนวนข้อเสนอ:</translation>
     </message>
+    <message>
+        <source>Create Proposal</source>
+        <translation>สร้างข้อเสนอ</translation>
+    </message>
     <message>
         <source>Filter by Title</source>
         <translation>กรองตามชื่อ</translation>
     </message>
+    <message>
+        <source>Unavailable</source>
+        <translation>ไม่พร้อมใช้งาน</translation>
+    </message>
+    <message>
+        <source>A synced node and an unlocked wallet are required.</source>
+        <translation>ต้องการโหนดที่ซิงค์แล้วและกระเป๋าสตางค์ที่ปลดล็อก</translation>
+    </message>
+    <message>
+        <source>Vote Yes</source>
+        <translation>ลงคะแนนเห็นด้วย</translation>
+    </message>
+    <message>
+        <source>Vote No</source>
+        <translation>ลงคะแนนไม่เห็นด้วย</translation>
+    </message>
+    <message>
+        <source>Vote Abstain</source>
+        <translation>งดออกเสียง</translation>
+    </message>
     <message>
         <source>Proposal Info: %1</source>
         <translation>ข้อมูลข้อเสนอ: %1</translation>
     </message>
+    <message>
+        <source>Voting Failed</source>
+        <translation>การลงคะแนนล้มเหลว</translation>
+    </message>
+    <message>
+        <source>No wallet available.</source>
+        <translation>ไม่มีกระเป๋าสตางค์ที่พร้อมใช้งาน</translation>
+    </message>
+    <message>
+        <source>No masternode voting keys found in wallet.</source>
+        <translation>ไม่พบคีย์การลงคะแนนมาสเตอร์โหนดในกระเป๋าสตางค์</translation>
+    </message>
+    <message>
+        <source>Please select a proposal to vote on.</source>
+        <translation>โปรดเลือกข้อเสนอเพื่อลงคะแนน</translation>
+    </message>
+    <message>
+        <source>Unable to unlock wallet.</source>
+        <translation>ไม่สามารถปลดล็อกกระเป๋าสตางค์</translation>
+    </message>
+    <message>
+        <source>Unable to get masternode list. Please try again later.</source>
+        <translation>ไม่สามารถรับรายการมาสเตอร์โหนด โปรดลองอีกครั้งในภายหลัง</translation>
+    </message>
+    <message>
+        <source>Masternode %1 not found</source>
+        <translation>ไม่พบมาสเตอร์โหนด %1</translation>
+    </message>
+    <message>
+        <source>Failed to sign vote for masternode %1</source>
+        <translation>ไม่สามารถลงลายมือชื่อการลงคะแนนสำหรับมาสเตอร์โหนด %1</translation>
+    </message>
+    <message>
+        <source>Masternode %1: %2</source>
+        <translation>มาสเตอร์โหนด %1: %2</translation>
+    </message>
+    <message numerus="yes">
+        <source>Voted successfully %n time(s)</source>
+        <translation><numerusform>ลงคะแนนสำเร็จ %n ครั้ง</numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <source>Failed to vote %n time(s)</source>
+        <translation><numerusform>การลงคะแนนล้มเหลว %n ครั้ง</numerusform></translation>
+    </message>
+    <message>
+        <source>Errors:</source>
+        <translation>ข้อผิดพลาด:</translation>
+    </message>
+    <message>
+        <source>Voting Results</source>
+        <translation>ผลการลงคะแนน</translation>
+    </message>
 </context>
 <context>
     <name>HelpMessageDialog</name>
@@ -1156,10 +1401,26 @@
         <source>As this is the first time the program is launched, you can choose where %1 will store its data.</source>
         <translation>นี่เป็นการรันโปรแกรมครั้งแรก ท่านสามารถเลือก ว่าจะเก็บข้อมูลไว้ที่ %1</translation>
     </message>
+    <message>
+        <source>Limit block chain storage to</source>
+        <translation>จำกัดพื้นที่เก็บข้อมูลบล็อกเชนเป็น</translation>
+    </message>
+    <message>
+        <source>Reverting this setting requires re-downloading the entire blockchain. It is faster to download the full chain first and prune it later. Disables some advanced features.</source>
+        <translation>การย้อนกลับการตั้งค่านี้ต้องดาวน์โหลดบล็อกเชนทั้งหมดใหม่ การดาวน์โหลดเชนทั้งหมดก่อนและตัดแต่งในภายหลังจะเร็วกว่า จะปิดการใช้งานคุณสมบัติขั้นสูงบางอย่าง</translation>
+    </message>
+    <message>
+        <source> GB</source>
+        <translation> GB</translation>
+    </message>
     <message>
         <source>This initial synchronisation is very demanding, and may expose hardware problems with your computer that had previously gone unnoticed. Each time you run %1, it will continue downloading where it left off.</source>
         <translation>การซิงโครไนซ์ในขั้นต้นนี้เป็นที่ต้องการอย่างมาก และอาจจะปรากฏปัญหาของฮ​าร์ดแวร์กับคอมพิวเตอร์ของคุณที่อาจจะไม่ได้สังเกตมาก่อน ในแต่ละครั้งคุณดำเนินการ %1 มันจะดำเนินการดาวน์โหลดที่ค้างไว้</translation>
     </message>
+    <message>
+        <source>When you click OK, %1 will begin to download and process the full %4 block chain (%2 GB) starting with the earliest transactions in %3 when %4 initially launched.</source>
+        <translation>เมื่อคุณคลิกตกลง %1 จะเริ่มดาวน์โหลดและประมวลผลบล็อกเชน %4 ทั้งหมด (%2 GB) โดยเริ่มจากธุรกรรมแรกสุดใน %3 เมื่อ %4 เปิดตัวครั้งแรก</translation>
+    </message>
     <message>
         <source>If you have chosen to limit block chain storage (pruning), the historical data must still be downloaded and processed, but will be deleted afterward to keep your disk usage low.</source>
         <translation>ถ้าคุณได้เลือกที่จะจำกัดตัวเก็บข้อมูลของ block chain (การตัดแต่ง) ข้อมูลในอดีตจะยังคงถูกดาวน์โหลดและดำเนินการ แต่จะถูกลบหลังจากนั้นเพื่อที่จะทำให้การใช้งานดิสก์ของคุณต่ำ</translation>
@@ -1172,6 +1433,18 @@
         <source>Use a custom data directory:</source>
         <translation>ใช้ไดเร็กทอรี่ข้อมูลที่ตั้งค่าเอง:</translation>
     </message>
+    <message numerus="yes">
+        <source>%n GB of space available</source>
+        <translation><numerusform>มีพื้นที่ว่าง %n GB</numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <source>(of %n GB needed)</source>
+        <translation><numerusform>(จาก %n GB ที่จำเป็น)</numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <source>(%n GB needed for full chain)</source>
+        <translation><numerusform>(จำเป็น %n GB สำหรับเชนเต็ม)</numerusform></translation>
+    </message>
     <message>
         <source>At least %1 GB of data will be stored in this directory, and it will grow over time.</source>
         <translation>อย่างน้อย %1 GB ของข้อมูลจะถูกเก็บในแฟ้มข้อมูล และมันจะเติบโตขึ้นเมื่อเวลาผ่านไป</translation>
@@ -1180,6 +1453,11 @@
         <source>Approximately %1 GB of data will be stored in this directory.</source>
         <translation>ประมาณ %1 GB ของข้อมูลจะถูกเก็บอยู่ในแฟ้มเอกสารนี้</translation>
     </message>
+    <message numerus="yes">
+        <source>(sufficient to restore backups %n day(s) old)</source>
+        <extracomment>Explanatory text on the capability of the current prune target.</extracomment>
+        <translation><numerusform>(เพียงพอสำหรับการกู้คืนข้อมูลสำรอง %n วัน)</numerusform></translation>
+    </message>
     <message>
         <source>%1 will download and store a copy of the Dash block chain.</source>
         <translation>%1 จะกดาวน์โหลดและเก็บสำเนาของ Dash block chain</translation>
@@ -1197,6 +1475,13 @@
         <translation>ข้อผิดพลาด</translation>
     </message>
 </context>
+<context>
+    <name>LoadWalletsActivity</name>
+    <message>
+        <source>Loading wallets…</source>
+        <translation>กำลังโหลดกระเป๋าสตางค์…</translation>
+    </message>
+</context>
 <context>
     <name>MasternodeList</name>
     <message>
@@ -1370,6 +1655,10 @@
         <source>Hide</source>
         <translation>ซ่อน</translation>
     </message>
+    <message>
+        <source>%1 is currently syncing.  It will download headers and blocks from peers and validate them until reaching the tip of the block chain.</source>
+        <translation>%1 กำลังซิงค์อยู่ จะดาวน์โหลดส่วนหัวและบลอกจากเพียร์และตรวจสอบจนกว่าจะถึงปลายสุดของบล็อกเชน</translation>
+    </message>
     <message>
         <source>Unknown. Syncing Headers (%1, %2%)…</source>
         <translation>ไม่ทราบการซิงค์ส่วนหัว (%1, %2%)…</translation>
@@ -1385,6 +1674,11 @@
         <source>URI:</source>
         <translation>URI:</translation>
     </message>
+    <message>
+        <source>Paste address from clipboard</source>
+        <extracomment>Tooltip text for button that allows you to paste an address that is in your clipboard.</extracomment>
+        <translation>วางที่อยู่จากคลิปบอร์ด</translation>
+    </message>
 </context>
 <context>
     <name>OpenWalletActivity</name>
@@ -1400,6 +1694,11 @@
         <source>default wallet</source>
         <translation>กระเป๋าเงินเริ่มต้น</translation>
     </message>
+    <message>
+        <source>Open Wallet</source>
+        <extracomment>Title of window indicating the progress of opening of a wallet.</extracomment>
+        <translation>เปิดกระเป๋าสตางค์</translation>
+    </message>
     <message>
         <source>Opening Wallet &lt;b&gt;%1&lt;/b&gt;…</source>
         <extracomment>Descriptive text of the open wallet progress window which indicates to the user which wallet is currently being opened.</extracomment>
@@ -1436,9 +1735,17 @@
         <source>&amp;Appearance</source>
         <translation>&amp;ลักษณะ</translation>
     </message>
+    <message>
+        <source>Show the icon in the system tray.</source>
+        <translation>แสดงไอคอนในถาดระบบ</translation>
+    </message>
+    <message>
+        <source>&amp;Show tray icon</source>
+        <translation>&amp;แสดงไอคอนถาดระบบ</translation>
+    </message>
     <message>
         <source>Prune &amp;block storage to</source>
-        <translation>Prune &amp; ที่เก็บข้อมูลบล็อก เพื่อ</translation>
+        <translation>Prune &amp;ที่เก็บข้อมูลบล็อก เพื่อ</translation>
     </message>
     <message>
         <source>GB</source>
@@ -1448,17 +1755,57 @@
         <source>Reverting this setting requires re-downloading the entire blockchain.</source>
         <translation>การคืนค่าการตั้งค่านี้ต้องดาวน์โหลดบล็อกเชนทั้งหมดอีกครั้ง</translation>
     </message>
+    <message>
+        <source>Maximum database cache size. A larger cache can contribute to faster sync, after which the benefit is less pronounced for most use cases. Lowering the cache size will reduce memory usage. Unused mempool memory is shared for this cache.</source>
+        <extracomment>Tooltip text for Options window setting that sets the size of the database cache. Explains the corresponding effects of increasing/decreasing this value.</extracomment>
+        <translation>ขนาดแคชฐานข้อมูลสูงสุด แคชที่ใหญ่กว่าสามารถช่วยให้ซิงค์เร็วขึ้น หลังจากนั้นประโยชน์จะน้อยลงสำหรับกรณีการใช้งานส่วนใหญ่ การลดขนาดแคชจะลดการใช้หน่วยความจำ หน่วยความจำ mempool ที่ไม่ได้ใช้จะถูกแบ่งปันสำหรับแคชนี้</translation>
+    </message>
     <message>
         <source>MiB</source>
         <translation>MiB</translation>
     </message>
+    <message>
+        <source>Set the number of script verification threads. Negative values correspond to the number of cores you want to leave free to the system.</source>
+        <extracomment>Tooltip text for Options window setting that sets the number of script verification threads. Explains that negative values mean to leave these many cores free to the system.</extracomment>
+        <translation>ตั้งค่าจำนวนเธรดการตรวจสอบสคริปต์ ค่าลบตรงกับจำนวนคอร์ที่คุณต้องการปล่อยให้เป็นอิสระกับระบบ</translation>
+    </message>
+    <message>
+        <source>This allows you or a third party tool to communicate with the node through command-line and JSON-RPC commands.</source>
+        <extracomment>Tooltip text for Options window setting that enables the RPC server.</extracomment>
+        <translation>สิ่งนี้ช่วยให้คุณหรือเครื่องมือบุคคลที่สามสามารถสื่อสารกับโหนดผ่านคำสั่งบรรทัดคำสั่งและ JSON-RPC</translation>
+    </message>
+    <message>
+        <source>Enable R&amp;PC server</source>
+        <extracomment>An Options window setting to enable the RPC server.</extracomment>
+        <translation>เปิดใช้งานเซิร์ฟเวอร์ R&amp;PC</translation>
+    </message>
+    <message>
+        <source>Whether to set subtract fee from amount as default or not.</source>
+        <extracomment>Tooltip text for Options window setting that sets subtracting the fee from a sending amount as default.</extracomment>
+        <translation>จะตั้งค่าให้หักค่าธรรมเนียมจากจำนวนเป็นค่าเริ่มต้นหรือไม่</translation>
+    </message>
+    <message>
+        <source>Subtract &amp;fee from amount by default</source>
+        <extracomment>An Options window setting to set subtracting the fee from a sending amount as default.</extracomment>
+        <translation>หัก&amp;ค่าธรรมเนียมจากจำนวนตามค่าเริ่มต้น</translation>
+    </message>
+    <message>
+        <source>Enable &amp;PSBT controls</source>
+        <extracomment>An options window setting to enable PSBT controls.</extracomment>
+        <translation>เปิดใช้งานการควบคุม &amp;PSBT</translation>
+    </message>
+    <message>
+        <source>Whether to show PSBT controls.</source>
+        <extracomment>Tooltip text for options window setting that enables PSBT controls.</extracomment>
+        <translation>จะแสดงการควบคุม PSBT หรือไม่</translation>
+    </message>
     <message>
         <source>Whether to keep the specified custom change address or not.</source>
         <translation>ว่าจะเก็บที่อยู่การเปลี่ยนแปลงที่กำหนดเองที่ระบุหรือไม่</translation>
     </message>
     <message>
         <source>Keep custom change &amp;address</source>
-        <translation>เก็บการเปลี่ยนแปลง &amp; ที่อยู่ที่กำหนดเอง</translation>
+        <translation>เก็บการเปลี่ยนแปลง &amp;ที่อยู่ที่กำหนดเอง</translation>
     </message>
     <message>
         <source>Show additional tab listing all your masternodes in first sub-tab&lt;br/&gt;and all masternodes on the network in second sub-tab.</source>
@@ -1516,6 +1863,14 @@
         <source>Enable &amp;multi-session</source>
         <translation>เปิดใช้งาน &amp;multi-session</translation>
     </message>
+    <message>
+        <source>Use this many separate masternodes in parallel to mix funds.&lt;br/&gt;Note: You must use this feature carefully.&lt;br/&gt;Make sure you always have recent wallet (auto)backup in a safe place!</source>
+        <translation>ใช้มาสเตอร์โหนดแยกจำนวนนี้แบบขนานเพื่อผสมเงิน&lt;br/&gt;หมายเหตุ: คุณต้องใช้คุณสมบัตินี้อย่างระมัดระวัง&lt;br/&gt;ตรวจสอบให้แน่ใจว่าคุณมีสำรองข้อมูล (อัตโนมัติ) กระเป๋าสตางค์ล่าสุดไว้ในที่ปลอดภัยเสมอ!</translation>
+    </message>
+    <message>
+        <source>Parallel sessions</source>
+        <translation>เซสชันแบบขนาน</translation>
+    </message>
     <message>
         <source>Mixing rounds</source>
         <translation>รอบผสม</translation>
@@ -1528,6 +1883,30 @@
         <source>Target balance</source>
         <translation>ยอดเงินคงเหลือที่กำหนดไว้ในการทำธุรกรรมแบบ</translation>
     </message>
+    <message>
+        <source>How many inputs of each denominated amount are created.&lt;br/&gt;Lower these numbers if you want fewer smaller denominations.</source>
+        <translation>จำนวนอินพุตของแต่ละจำนวนที่ระบุไว้ถูกสร้างขึ้น&lt;br/&gt;ลดตัวเลขเหล่านี้หากคุณต้องการหน่วยย่อยขนาดเล็กน้อยลง</translation>
+    </message>
+    <message>
+        <source>Inputs per denomination</source>
+        <translation>อินพุตต่อหน่วย</translation>
+    </message>
+    <message>
+        <source>Try to create at least this many inputs for each denominated amount.&lt;br/&gt;Lower this number if you want fewer smaller denominations.</source>
+        <translation>พยายามสร้างอินพุตอย่างน้อยจำนวนนี้สำหรับแต่ละจำนวนที่ระบุไว้&lt;br/&gt;ลดตัวเลขนี้หากคุณต้องการหน่วยย่อยขนาดเล็กน้อยลง</translation>
+    </message>
+    <message>
+        <source>Target</source>
+        <translation>เป้าหมาย</translation>
+    </message>
+    <message>
+        <source>Create up to this many inputs for each denominated amount.&lt;br/&gt;Lower this number if you want fewer smaller denominations.</source>
+        <translation>สร้างอินพุตได้มากถึงจำนวนนี้สำหรับแต่ละจำนวนที่ระบุไว้&lt;br/&gt;ลดตัวเลขนี้หากคุณต้องการหน่วยย่อยขนาดเล็กน้อยลง</translation>
+    </message>
+    <message>
+        <source>Maximum</source>
+        <translation>สูงสุด</translation>
+    </message>
     <message>
         <source>Automatically open the Dash Core client port on the router. This only works when your router supports UPnP and it is enabled.</source>
         <translation>เปิด port ลูกค้าของ Dash Core บนเราเตอร์โดยอัตโนมัติ การทำงานนี้ใช้ได้เฉพาะเมื่อเราเตอร์ของคุณรองรับ UPnP และเปิดใช้งานแล้ว</translation>
@@ -1557,20 +1936,26 @@
         <translation>แสดง หากพร็อกซี SOCKS5 เป็นค่าเริ่มต้นที่ใช้เพื่อเข้าถึง Peers ผ่านเครือข่ายประเภทนี้</translation>
     </message>
     <message>
-        <source>Options set in this dialog are overridden by the command line or in the configuration file:</source>
-        <translation>ตัวเลือกที่ตั้งไว้ในกล่องโต้ตอบนี้จะถูกแทนที่โดยบรรทัดคำสั่งหรือในไฟล์กำหนดค่า:</translation>
+        <source>Language missing or translation incomplete? Help contributing translations here:
+https://explore.transifex.com/dash/dash/</source>
+        <translation>ภาษาหายไปหรือแปลไม่สมบูรณ์? ช่วยสนับสนุนการแปลที่นี่:
+https://explore.transifex.com/dash/dash/</translation>
     </message>
     <message>
-        <source>Minimize instead of exit the application when the window is closed. When this option is enabled, the application will be closed only after selecting Exit in the menu.</source>
-        <translation>มินิไมซ์แอพ แทนการออกจากแอพพลิเคชั่น เมื่อวินโดว์ได้รับการปิด เมื่อเลือกตัวเลือกนี้ แอพพลิเคชั่น จะถูกปิด ก็ต่อเมื่อ มีการเลือกเมนู Exit/ออกจากระบบ เท่านั้น</translation>
+        <source>Third-party URLs (e.g. a block explorer) that appear in the transactions tab as context menu items.&lt;br/&gt;%s in the URL is replaced by transaction hash. Multiple URLs are separated by vertical bar |.</source>
+        <translation>URL ของบุคคลที่สาม (เช่น block explorer) ที่ปรากฏในแท็บธุรกรรมเป็นรายการเมนูบริบท&lt;br/&gt;%s ใน URL จะถูกแทนที่ด้วยแฮชธุรกรรม URL หลายรายการจะถูกคั่นด้วยแนวตั้ง |</translation>
+    </message>
+    <message>
+        <source>&amp;Third-party transaction URLs</source>
+        <translation>URL ธุรกรรมของบุคคลที่&amp;สาม</translation>
     </message>
     <message>
-        <source>Third party URLs (e.g. a block explorer) that appear in the transactions tab as context menu items.&lt;br/&gt;%s in the URL is replaced by transaction hash. Multiple URLs are separated by vertical bar |.</source>
-        <translation>URL ของบุคคลที่สาม (เช่น explorer บล็อก) ที่ปรากฏในแท็บธุรกรรมเป็นรายการในเมนู&lt;br/&gt; %s ใน URL ถูกแทนที่ด้วย hash การทำธุรกรรม หลาย URL ถูกแยกด้วยแถบแนวตั้ง </translation>
+        <source>Options set in this dialog are overridden by the command line or in the configuration file:</source>
+        <translation>ตัวเลือกที่ตั้งไว้ในกล่องโต้ตอบนี้จะถูกแทนที่โดยบรรทัดคำสั่งหรือในไฟล์กำหนดค่า:</translation>
     </message>
     <message>
-        <source>&amp;Third party transaction URLs</source>
-        <translation>&amp;URL ธุรกรรมของบุคคลที่สาม</translation>
+        <source>Minimize instead of exit the application when the window is closed. When this option is enabled, the application will be closed only after selecting Exit in the menu.</source>
+        <translation>มินิไมซ์แอพ แทนการออกจากแอพพลิเคชั่น เมื่อวินโดว์ได้รับการปิด เมื่อเลือกตัวเลือกนี้ แอพพลิเคชั่น จะถูกปิด ก็ต่อเมื่อ มีการเลือกเมนู Exit/ออกจากระบบ เท่านั้น</translation>
     </message>
     <message>
         <source>Whether to show coin control features or not.</source>
@@ -1660,6 +2045,14 @@
         <source>&amp;Display</source>
         <translation>&amp;แสดง</translation>
     </message>
+    <message>
+        <source>Connect to the Dash network through a separate SOCKS5 proxy for Tor onion services.</source>
+        <translation>เชื่อมต่อกับเครือข่าย Dash ผ่านพร็อกซี SOCKS5 แยกต่างหากสำหรับบริการ Tor onion</translation>
+    </message>
+    <message>
+        <source>Use separate SOCKS&amp;5 proxy to reach peers via Tor onion services:</source>
+        <translation>ใช้พร็อกซี SOCKS&amp;5 แยกต่างหากเพื่อเข้าถึงเพียร์ผ่านบริการ Tor onion:</translation>
+    </message>
     <message>
         <source>User Interface &amp;language:</source>
         <translation>หน้าจอผู้ใช้ &amp;ภาษา:</translation>
@@ -1706,14 +2099,22 @@
     </message>
     <message>
         <source>Confirm options reset</source>
+        <extracomment>Window title text of pop-up window shown when the user has chosen to reset options.</extracomment>
         <translation>ยืนยันการรีเซ็ตตัวเลือก</translation>
     </message>
     <message>
         <source>Client restart required to activate changes.</source>
+        <extracomment>Text explaining that the settings changed will not come into effect until the client is restarted.</extracomment>
         <translation>รีสตาร์ทเครื่องไคลเอ็นต์เพื่อเปิดใช้งานการเปลี่ยนแปลง</translation>
     </message>
+    <message>
+        <source>Current settings will be backed up at "%1".</source>
+        <extracomment>Text explaining to the user that the client's current settings will be backed up at a specific location. %1 is a stand-in argument for the backup location's path.</extracomment>
+        <translation>การตั้งค่าปัจจุบันจะถูกสำรองไว้ที่ "%1"</translation>
+    </message>
     <message>
         <source>Client will be shut down. Do you want to proceed?</source>
+        <extracomment>Text asking the user to confirm if they would like to proceed with a client shutdown.</extracomment>
         <translation>ไคลเอนต์จะถูกปิด คุณต้องการดำเนินการต่อหรือไม่?</translation>
     </message>
     <message>
@@ -1851,6 +2252,10 @@
         <source>%1 Balance</source>
         <translation>%1 ยอดคงเหลือ</translation>
     </message>
+    <message>
+        <source>Discreet mode activated for the Overview tab. To unmask the values, uncheck Settings-&gt;Discreet mode.</source>
+        <translation>เปิดใช้งานโหมดปกปิดสำหรับแท็บภาพรวม หากต้องการแสดงค่า ให้ยกเลิกการเลือก การตั้งค่า-&gt;โหมดปกปิด</translation>
+    </message>
     <message numerus="yes">
         <source>%n Rounds</source>
         <translation><numerusform>%n รอบ</numerusform></translation>
@@ -1950,8 +2355,141 @@
 </context>
 <context>
     <name>PSBTOperationsDialog</name>
-    </context>
-<context>
+    <message>
+        <source>Dialog</source>
+        <translation>กล่องโต้ตอบ</translation>
+    </message>
+    <message>
+        <source>Sign Tx</source>
+        <translation>ลงนามธุรกรรม</translation>
+    </message>
+    <message>
+        <source>Broadcast Tx</source>
+        <translation>ออกอากาศธุรกรรม</translation>
+    </message>
+    <message>
+        <source>Copy to Clipboard</source>
+        <translation>คัดลอกไปยังคลิปบอร์ด</translation>
+    </message>
+    <message>
+        <source>Save…</source>
+        <translation>บันทึก…</translation>
+    </message>
+    <message>
+        <source>Close</source>
+        <translation>ปิด</translation>
+    </message>
+    <message>
+        <source>Failed to load transaction: %1</source>
+        <translation>โหลดธุรกรรมล้มเหลว: %1</translation>
+    </message>
+    <message>
+        <source>Failed to sign transaction: %1</source>
+        <translation>ลงนามธุรกรรมล้มเหลว: %1</translation>
+    </message>
+    <message>
+        <source>Cannot sign inputs while wallet is locked.</source>
+        <translation>ไม่สามารถลงนามอินพุตขณะที่กระเป๋าสตางค์ถูกล็อก</translation>
+    </message>
+    <message>
+        <source>Could not sign any more inputs.</source>
+        <translation>ไม่สามารถลงนามอินพุตเพิ่มเติมได้</translation>
+    </message>
+    <message>
+        <source>Signed %1 inputs, but more signatures are still required.</source>
+        <translation>ลงนามอินพุต %1 แล้ว แต่ยังต้องการลายเซ็นเพิ่มเติม</translation>
+    </message>
+    <message>
+        <source>Signed transaction successfully. Transaction is ready to broadcast.</source>
+        <translation>ลงนามธุรกรรมสำเร็จ ธุรกรรมพร้อมที่จะออกอากาศ</translation>
+    </message>
+    <message>
+        <source>Unknown error processing transaction.</source>
+        <translation>ข้อผิดพลาดที่ไม่รู้จักในการประมวลผลธุรกรรม</translation>
+    </message>
+    <message>
+        <source>Transaction broadcast successfully! Transaction ID: %1</source>
+        <translation>ออกอากาศธุรกรรมสำเร็จ! รหัสธุรกรรม: %1</translation>
+    </message>
+    <message>
+        <source>Transaction broadcast failed: %1</source>
+        <translation>ออกอากาศธุรกรรมล้มเหลว: %1</translation>
+    </message>
+    <message>
+        <source>PSBT copied to clipboard.</source>
+        <translation>คัดลอก PSBT ไปยังคลิปบอร์ดแล้ว</translation>
+    </message>
+    <message>
+        <source>Save Transaction Data</source>
+        <translation>บันทึกข้อมูลธุรกรรม</translation>
+    </message>
+    <message>
+        <source>Partially Signed Transaction (Binary)</source>
+        <extracomment>Expanded name of the binary PSBT file format. See: BIP 174.</extracomment>
+        <translation>ธุรกรรมที่ลงนามบางส่วน (ไบนารี)</translation>
+    </message>
+    <message>
+        <source>PSBT saved to disk.</source>
+        <translation>บันทึก PSBT ลงดิสก์แล้ว</translation>
+    </message>
+    <message>
+        <source> * Sends %1 to %2</source>
+        <translation> * ส่ง %1 ไปยัง %2</translation>
+    </message>
+    <message>
+        <source>own address</source>
+        <translation>ที่อยู่ของตัวเอง</translation>
+    </message>
+    <message>
+        <source>Unable to calculate transaction fee or total transaction amount.</source>
+        <translation>ไม่สามารถคำนวณค่าธรรมเนียมธุรกรรมหรือจำนวนธุรกรรมทั้งหมด</translation>
+    </message>
+    <message>
+        <source>Pays transaction fee: </source>
+        <translation>จ่ายค่าธรรมเนียมธุรกรรม: </translation>
+    </message>
+    <message>
+        <source>Total Amount</source>
+        <translation>จำนวนทั้งหมด</translation>
+    </message>
+    <message>
+        <source>or</source>
+        <translation>หรือ</translation>
+    </message>
+    <message>
+        <source>Transaction has %1 unsigned inputs.</source>
+        <translation>ธุรกรรมมีอินพุตที่ไม่ได้ลงนาม %1 รายการ</translation>
+    </message>
+    <message>
+        <source>Transaction is missing some information about inputs.</source>
+        <translation>ธุรกรรมขาดข้อมูลบางอย่างเกี่ยวกับอินพุต</translation>
+    </message>
+    <message>
+        <source>Transaction still needs signature(s).</source>
+        <translation>ธุรกรรมยังต้องการลายเซ็น</translation>
+    </message>
+    <message>
+        <source>(But no wallet is loaded.)</source>
+        <translation>(แต่ไม่มีกระเป๋าสตางค์ที่โหลด)</translation>
+    </message>
+    <message>
+        <source>(But this wallet cannot sign transactions.)</source>
+        <translation>(แต่กระเป๋าสตางค์นี้ไม่สามารถลงนามธุรกรรม)</translation>
+    </message>
+    <message>
+        <source>(But this wallet does not have the right keys.)</source>
+        <translation>(แต่กระเป๋าสตางค์นี้ไม่มีคีย์ที่ถูกต้อง)</translation>
+    </message>
+    <message>
+        <source>Transaction is fully signed and ready for broadcast.</source>
+        <translation>ธุรกรรมถูกลงนามครบถ้วนและพร้อมสำหรับการออกอากาศ</translation>
+    </message>
+    <message>
+        <source>Transaction status is unknown.</source>
+        <translation>สถานะธุรกรรมไม่ทราบ</translation>
+    </message>
+</context>
+<context>
     <name>PaymentServer</name>
     <message>
         <source>Payment request error</source>
@@ -1969,6 +2507,12 @@
         <source>'dash://' is not a valid URI. Use 'dash:' instead.</source>
         <translation>'dash://' ไม่ใช่ URI ที่ถูกต้องใช้ 'dash:' แทน</translation>
     </message>
+    <message>
+        <source>Cannot process payment request as BIP70 is no longer supported.
+Due to discontinued support, you should request the merchant to provide you with a BIP21 compatible URI or use a wallet that does continue to support BIP70.</source>
+        <translation>ไม่สามารถประมวลผลคำขอชำระเงินได้เนื่องจาก BIP70 ไม่ได้รับการสนับสนุนอีกต่อไป
+เนื่องจากการยกเลิกการสนับสนุน คุณควรขอให้ผู้ขายจัดหา URI ที่เข้ากันได้กับ BIP21 หรือใช้กระเป๋าเงินที่ยังคงสนับสนุน BIP70</translation>
+    </message>
     <message>
         <source>URI cannot be parsed! This can be caused by an invalid Dash address or malformed URI parameters.</source>
         <translation>ไม่สามารถประมวลผล URI ได้สำเร็จ ! ซึ่งอาจเกิดจากที่อยู่ Dash ไม่ถูกต้องหรือพารามิเตอร์ URI ที่มีรูปแบบไม่ถูกต้อง</translation>
@@ -1990,6 +2534,26 @@
         <extracomment>Title of Peers Table column which indicates the current latency of the connection with the peer.</extracomment>
         <translation>Ping</translation>
     </message>
+    <message>
+        <source>Peer</source>
+        <extracomment>Title of Peers Table column which contains a unique number used to identify a connection.</extracomment>
+        <translation>เพียร์</translation>
+    </message>
+    <message>
+        <source>Age</source>
+        <extracomment>Title of Peers Table column which indicates the duration (length of time) since the peer connection started.</extracomment>
+        <translation>อายุ</translation>
+    </message>
+    <message>
+        <source>Direction</source>
+        <extracomment>Title of Peers Table column which indicates the direction the peer connection was initiated from.</extracomment>
+        <translation>ทิศทาง</translation>
+    </message>
+    <message>
+        <source>Type</source>
+        <extracomment>Title of Peers Table column which describes the type of peer connection. The "type" describes why the connection exists.</extracomment>
+        <translation>ประเภท</translation>
+    </message>
     <message>
         <source>Sent</source>
         <extracomment>Title of Peers Table column which indicates the total amount of network information we have sent to the peer.</extracomment>
@@ -2000,7 +2564,27 @@
         <extracomment>Title of Peers Table column which indicates the total amount of network information we have received from the peer.</extracomment>
         <translation>ได้รับ</translation>
     </message>
-    </context>
+    <message>
+        <source>Address</source>
+        <extracomment>Title of Peers Table column which contains the IP/Onion/I2P address of the connected peer.</extracomment>
+        <translation>ที่อยู่</translation>
+    </message>
+    <message>
+        <source>Network</source>
+        <extracomment>Title of Peers Table column which states the network the peer connected through.</extracomment>
+        <translation>เครือข่าย</translation>
+    </message>
+    <message>
+        <source>Inbound</source>
+        <extracomment>An Inbound Connection from a Peer.</extracomment>
+        <translation>ขาเข้า</translation>
+    </message>
+    <message>
+        <source>Outbound</source>
+        <extracomment>An Outbound Connection to a Peer.</extracomment>
+        <translation>ขาออก</translation>
+    </message>
+</context>
 <context>
     <name>Proposal</name>
     <message>
@@ -2051,8 +2635,193 @@
         <translation>สถานะ</translation>
     </message>
 </context>
+<context>
+    <name>ProposalWizard</name>
+    <message>
+        <source>Create Governance Proposal</source>
+        <translation>สร้างข้อเสนอการกำกับดูแล</translation>
+    </message>
+    <message>
+        <source>Enter proposal details</source>
+        <translation>ใส่รายละเอียดข้อเสนอ</translation>
+    </message>
+    <message>
+        <source>A fee will be burned when you prepare the proposal.</source>
+        <translation>ค่าธรรมเนียมจะถูกเผาเมื่อคุณเตรียมข้อเสนอ</translation>
+    </message>
+    <message>
+        <source>Proposal &amp;name</source>
+        <translation>&amp;ชื่อข้อเสนอ</translation>
+    </message>
+    <message>
+        <source>&amp;Description URL</source>
+        <translation>URL &amp;คำอธิบาย</translation>
+    </message>
+    <message>
+        <source>Payment &amp;address</source>
+        <translation>&amp;ที่อยู่การชำระเงิน</translation>
+    </message>
+    <message>
+        <source>Payment &amp;amount</source>
+        <translation>&amp;จำนวนการชำระเงิน</translation>
+    </message>
+    <message>
+        <source>The amount to request in a single payment</source>
+        <translation>จำนวนที่ขอในการชำระเงินครั้งเดียว</translation>
+    </message>
+    <message>
+        <source>&amp;First payment</source>
+        <translation>การชำระเงิน&amp;แรก</translation>
+    </message>
+    <message>
+        <source>Pa&amp;yments</source>
+        <translation>การ&amp;ชำระเงิน</translation>
+    </message>
+    <message>
+        <source>To&amp;tal amount</source>
+        <translation>จำนวน&amp;ทั้งหมด</translation>
+    </message>
+    <message>
+        <source>Proposal &amp;fee</source>
+        <translation>&amp;ค่าธรรมเนียมข้อเสนอ</translation>
+    </message>
+    <message>
+        <source>Next</source>
+        <translation>ถัดไป</translation>
+    </message>
+    <message>
+        <source>Review proposal JSON and validate.</source>
+        <translation>ตรวจสอบข้อเสนอ JSON และตรวจสอบความถูกต้อง</translation>
+    </message>
+    <message>
+        <source>Hex-encoded JSON</source>
+        <translation>JSON เข้ารหัส Hex</translation>
+    </message>
+    <message>
+        <source>Back</source>
+        <translation>ย้อนกลับ</translation>
+    </message>
+    <message>
+        <source>Validate</source>
+        <translation>ตรวจสอบความถูกต้อง</translation>
+    </message>
+    <message>
+        <source>Prepare (burn fee) and wait for confirmations.</source>
+        <translation>เตรียม (เผาค่าธรรมเนียม) และรอการยืนยัน</translation>
+    </message>
+    <message>
+        <source>Copy</source>
+        <translation>คัดลอก</translation>
+    </message>
+    <message>
+        <source>At 1/6 confirmations: can be relayed and queued. At 6/6: accepted and processed.</source>
+        <translation>ที่ 1/6 การยืนยัน: สามารถรีเลย์และจัดคิวได้ ที่ 6/6: ยอมรับและประมวลผล</translation>
+    </message>
+    <message>
+        <source>Confirmations progress</source>
+        <translation>ความคืบหน้าการยืนยัน</translation>
+    </message>
+    <message>
+        <source>Shows progress toward the required number of confirmations for the proposal fee transaction.</source>
+        <translation>แสดงความคืบหน้าไปสู่จำนวนการยืนยันที่ต้องการสำหรับธุรกรรมค่าธรรมเนียมข้อเสนอ</translation>
+    </message>
+    <message>
+        <source>Estimated time remaining: -</source>
+        <translation>เวลาโดยประมาณที่เหลืออยู่: -</translation>
+    </message>
+    <message>
+        <source>Prepare Proposal</source>
+        <translation>เตรียมข้อเสนอ</translation>
+    </message>
+    <message>
+        <source>You can submit after 1 confirmation. At 6 confirmations it is accepted and processed.</source>
+        <translation>คุณสามารถส่งหลังจาก 1 การยืนยัน ที่ 6 การยืนยันจะถูกยอมรับและประมวลผล</translation>
+    </message>
+    <message>
+        <source>Proposal ID:</source>
+        <translation>รหัสข้อเสนอ:</translation>
+    </message>
+    <message>
+        <source>Submit Proposal</source>
+        <translation>ส่งข้อเสนอ</translation>
+    </message>
+    <message>
+        <source>Close</source>
+        <translation>ปิด</translation>
+    </message>
+    <message>
+        <source>Valid</source>
+        <translation>ถูกต้อง</translation>
+    </message>
+    <message>
+        <source>Invalid: %1</source>
+        <translation>ไม่ถูกต้อง: %1</translation>
+    </message>
+    <message>
+        <source>Burn %1</source>
+        <translation>เผา %1</translation>
+    </message>
+    <message>
+        <source>Burn %1 to create the fee transaction?</source>
+        <translation>เผา %1 เพื่อสร้างธุรกรรมค่าธรรมเนียม?</translation>
+    </message>
+    <message>
+        <source>Prepare failed</source>
+        <translation>การเตรียมล้มเหลว</translation>
+    </message>
+    <message>
+        <source>Confirmations: %1 / %2 required</source>
+        <translation>การยืนยัน: %1 / จำเป็น %2</translation>
+    </message>
+    <message>
+        <source>Estimated time remaining: Ready</source>
+        <translation>เวลาโดยประมาณที่เหลืออยู่: พร้อม</translation>
+    </message>
+    <message numerus="yes">
+        <source>Estimated time remaining: %n minute(s)</source>
+        <translation><numerusform>เวลาโดยประมาณที่เหลืออยู่: %n นาที</numerusform></translation>
+    </message>
+    <message>
+        <source>Your proposal was submitted successfully.</source>
+        <translation>ข้อเสนอของคุณถูกส่งสำเร็จแล้ว</translation>
+    </message>
+    <message>
+        <source>Already submitted</source>
+        <translation>ส่งไปแล้ว</translation>
+    </message>
+    <message>
+        <source>This proposal has already been submitted.</source>
+        <translation>ข้อเสนอนี้ถูกส่งไปแล้ว</translation>
+    </message>
+    <message>
+        <source>Submission failed</source>
+        <translation>การส่งล้มเหลว</translation>
+    </message>
+    <message>
+        <source>Proposal submitted</source>
+        <translation>ส่งข้อเสนอแล้ว</translation>
+    </message>
+    <message>
+        <source>A fee of %1 will be burned when you prepare the proposal.</source>
+        <translation>ค่าธรรมเนียม %1 จะถูกเผาเมื่อคุณเตรียมข้อเสนอ</translation>
+    </message>
+    <message>
+        <source>Prepare (burn %1) and wait for %2 confirmations.</source>
+        <translation>เตรียม (เผา %1) และรอ %2 การยืนยัน</translation>
+    </message>
+</context>
 <context>
     <name>QObject</name>
+    <message>
+        <source>Do you want to reset settings to default values, or to abort without making changes?</source>
+        <extracomment>Explanatory text shown on startup when the settings file cannot be read. Prompts user to make a choice between resetting or aborting.</extracomment>
+        <translation>คุณต้องการรีเซ็ตการตั้งค่าเป็นค่าเริ่มต้น หรือยกเลิกโดยไม่ทำการเปลี่ยนแปลง?</translation>
+    </message>
+    <message>
+        <source>A fatal error occurred. Check that settings file is writable, or try running with -nosettings.</source>
+        <extracomment>Explanatory text shown on startup when the settings file could not be written. Prompts user to check that we have the ability to write to the file. Explains that the user has the option of running without a settings file.</extracomment>
+        <translation>เกิดข้อผิดพลาดร้ายแรง ตรวจสอบว่าไฟล์การตั้งค่าสามารถเขียนได้ หรือลองเรียกใช้ด้วย -nosettings</translation>
+    </message>
     <message>
         <source>Choose data directory on startup (default: %u)</source>
         <translation>เลือกไดเร็กทอรี่ข้อมูลตั้งแต่เริ่มต้นสตาร์ทอัพ (ค่าเริ่มต้น: %u)</translation>
@@ -2153,6 +2922,53 @@
         <source>This can also be adjusted later in the "Appearance" tab of the preferences.</source>
         <translation>นอกจากนี้ยังสามารถปรับเปลี่ยนได้ภายหลังในแท็บ "ลักษณะ" ของการตั้งค่า</translation>
     </message>
+    <message>
+        <source>Ctrl+W</source>
+        <translation>Ctrl+W</translation>
+    </message>
+    <message>
+        <source>Unroutable</source>
+        <translation>ไม่สามารถกำหนดเส้นทางได้</translation>
+    </message>
+    <message>
+        <source>Internal</source>
+        <translation>ภายใน</translation>
+    </message>
+    <message>
+        <source>Inbound</source>
+        <extracomment>An inbound connection from a peer. An inbound connection is a connection initiated by a peer.</extracomment>
+        <translation>ขาเข้า</translation>
+    </message>
+    <message>
+        <source>Outbound</source>
+        <extracomment>An outbound connection to a peer. An outbound connection is a connection initiated by us.</extracomment>
+        <translation>ขาออก</translation>
+    </message>
+    <message>
+        <source>Full Relay</source>
+        <extracomment>Peer connection type that relays all network information.</extracomment>
+        <translation>รีเลย์เต็มรูปแบบ</translation>
+    </message>
+    <message>
+        <source>Block Relay</source>
+        <extracomment>Peer connection type that relays network information about blocks and not transactions or addresses.</extracomment>
+        <translation>รีเลย์บลอก</translation>
+    </message>
+    <message>
+        <source>Manual</source>
+        <extracomment>Peer connection type established manually through one of several methods.</extracomment>
+        <translation>ด้วยตนเอง</translation>
+    </message>
+    <message>
+        <source>Feeler</source>
+        <extracomment>Short-lived peer connection type that tests the aliveness of known addresses.</extracomment>
+        <translation>ผู้สำรวจ</translation>
+    </message>
+    <message>
+        <source>Address Fetch</source>
+        <extracomment>Short-lived peer connection type that solicits known addresses from a peer.</extracomment>
+        <translation>ดึงที่อยู่</translation>
+    </message>
     <message>
         <source>%1 d</source>
         <translation>%1 d</translation>
@@ -2213,6 +3029,10 @@
         <source>%1 B</source>
         <translation>%1 B</translation>
     </message>
+    <message>
+        <source>%1 kB</source>
+        <translation>%1 kB</translation>
+    </message>
     <message>
         <source>%1 MB</source>
         <translation>%1 MB</translation>
@@ -2267,7 +3087,12 @@
         <source>Save QR Code</source>
         <translation>บันทึกโค้ด QR</translation>
     </message>
-    </context>
+    <message>
+        <source>PNG Image</source>
+        <extracomment>Expanded name of the PNG file format. See: https://en.wikipedia.org/wiki/Portable_Network_Graphics.</extracomment>
+        <translation>รูปภาพ PNG</translation>
+    </message>
+</context>
 <context>
     <name>RPCConsole</name>
     <message>
@@ -2374,6 +3199,14 @@
         <source>Version</source>
         <translation>เวอร์ชั่น</translation>
     </message>
+    <message>
+        <source>High bandwidth BIP152 compact block relay: %1</source>
+        <translation>การรีเลย์บลอกขนาดกะทัดรัด BIP152 แบนด์วิธสูง: %1</translation>
+    </message>
+    <message>
+        <source>High Bandwidth</source>
+        <translation>แบนด์วิธสูง</translation>
+    </message>
     <message>
         <source>Starting Block</source>
         <translation>เริ่มต้นบล็อค</translation>
@@ -2386,6 +3219,51 @@
         <source>Synced Blocks</source>
         <translation>บล็อคที่ซิงโครไนซ์</translation>
     </message>
+    <message>
+        <source>Elapsed time since a novel block passing initial validity checks was received from this peer.</source>
+        <translation>เวลาที่ผ่านไปตั้งแต่ได้รับบลอกใหม่ที่ผ่านการตรวจสอบความถูกต้องเบื้องต้นจากเพียร์นี้</translation>
+    </message>
+    <message>
+        <source>Last Block</source>
+        <translation>บลอกล่าสุด</translation>
+    </message>
+    <message>
+        <source>Elapsed time since a novel transaction accepted into our mempool was received from this peer.</source>
+        <extracomment>Tooltip text for the Last Transaction field in the peer details area.</extracomment>
+        <translation>เวลาที่ผ่านไปตั้งแต่ได้รับธุรกรรมใหม่ที่ยอมรับเข้าสู่ mempool ของเราจากเพียร์นี้</translation>
+    </message>
+    <message>
+        <source>Last Transaction</source>
+        <translation>ธุรกรรมล่าสุด</translation>
+    </message>
+    <message>
+        <source>The mapped Autonomous System used for diversifying peer selection.</source>
+        <translation>ระบบอัตโนมัติที่แมปซึ่งใช้สำหรับการกระจายการเลือกเพียร์</translation>
+    </message>
+    <message>
+        <source>Mapped AS</source>
+        <translation>แมป AS</translation>
+    </message>
+    <message>
+        <source>Whether we relay addresses to this peer.</source>
+        <extracomment>Tooltip text for the Address Relay field in the peer details area, which displays whether we relay addresses to this peer (Yes/No).</extracomment>
+        <translation>ว่าเรารีเลย์ที่อยู่ไปยังเพียร์นี้หรือไม่</translation>
+    </message>
+    <message>
+        <source>Address Relay</source>
+        <extracomment>Text title for the Address Relay field in the peer details area, which displays whether we relay addresses to this peer (Yes/No).</extracomment>
+        <translation>รีเลย์ที่อยู่</translation>
+    </message>
+    <message>
+        <source>Addresses Processed</source>
+        <extracomment>Text title for the Addresses Processed field in the peer details area, which displays the total number of addresses received from this peer that were processed (excludes addresses that were dropped due to rate-limiting).</extracomment>
+        <translation>ที่อยู่ที่ประมวลผล</translation>
+    </message>
+    <message>
+        <source>Addresses Rate-Limited</source>
+        <extracomment>Text title for the Addresses Rate-Limited field in the peer details area, which displays the total number of addresses received from this peer that were dropped (not processed) due to rate-limiting.</extracomment>
+        <translation>ที่อยู่ที่จำกัดอัตรา</translation>
+    </message>
     <message>
         <source>Rescan blockchain files 1</source>
         <translation>สแกน blockchain ไฟล์ 1</translation>
@@ -2426,6 +3304,22 @@
         <source>To specify a non-default location of the blocks directory use the '%1' option.</source>
         <translation>ในการระบุตำแหน่งที่ไม่ใช่ค่าเริ่มต้นของไดเร็กทอรีบล็อกใช้ตัวเลือก '%1'</translation>
     </message>
+    <message>
+        <source>Local Addresses</source>
+        <translation>ที่อยู่ท้องถิ่น</translation>
+    </message>
+    <message>
+        <source>Network addresses that your Dash node is currently using to communicate with other nodes.</source>
+        <translation>ที่อยู่เครือข่ายที่โหนด Dash ของคุณกำลังใช้เพื่อสื่อสารกับโหนดอื่น</translation>
+    </message>
+    <message>
+        <source>Number of regular Masternodes</source>
+        <translation>จำนวน Masternode ปกติ</translation>
+    </message>
+    <message>
+        <source>Number of EvoNodes</source>
+        <translation>จำนวน EvoNode</translation>
+    </message>
     <message>
         <source>Current block height</source>
         <translation>ความสูงบล็อกปัจจุบัน</translation>
@@ -2474,10 +3368,50 @@
         <source>PoSe Score</source>
         <translation>คะแนน PoSe</translation>
     </message>
+    <message>
+        <source>The transport layer version: %1</source>
+        <translation>เวอร์ชันชั้นการขนส่ง: %1</translation>
+    </message>
+    <message>
+        <source>Transport</source>
+        <translation>การขนส่ง</translation>
+    </message>
+    <message>
+        <source>The BIP324 session ID string in hex.</source>
+        <translation>สตริง ID เซสชัน BIP324 ในรูปแบบเลขฐานสิบหก</translation>
+    </message>
+    <message>
+        <source>Session ID</source>
+        <translation>ID เซสชัน</translation>
+    </message>
+    <message>
+        <source>The network protocol this peer is connected through: IPv4, IPv6, Onion, I2P, or CJDNS.</source>
+        <translation>โปรโตคอลเครือข่ายที่เพียร์นี้เชื่อมต่อผ่าน: IPv4, IPv6, Onion, I2P หรือ CJDNS</translation>
+    </message>
+    <message>
+        <source>Permissions</source>
+        <translation>สิทธิ์</translation>
+    </message>
+    <message>
+        <source>The direction and type of peer connection: %1</source>
+        <translation>ทิศทางและประเภทของการเชื่อมต่อเพียร์: %1</translation>
+    </message>
+    <message>
+        <source>Direction/Type</source>
+        <translation>ทิศทาง/ประเภท</translation>
+    </message>
     <message>
         <source>Services</source>
         <translation>บริการ</translation>
     </message>
+    <message>
+        <source>Whether we relay transactions to this peer.</source>
+        <translation>ว่าเรารีเลย์ธุรกรรมไปยังเพียร์นี้หรือไม่</translation>
+    </message>
+    <message>
+        <source>Transaction Relay</source>
+        <translation>รีเลย์ธุรกรรม</translation>
+    </message>
     <message>
         <source>Connection Time</source>
         <translation>เวลาในการเชื่อมต่อ</translation>
@@ -2514,6 +3448,16 @@
         <source>&amp;Wallet Repair</source>
         <translation>&amp;ซ่อมกระเป๋าสตางค์</translation>
     </message>
+    <message>
+        <source>The total number of addresses received from this peer that were processed (excludes addresses that were dropped due to rate-limiting).</source>
+        <extracomment>Tooltip text for the Addresses Processed field in the peer details area, which displays the total number of addresses received from this peer that were processed (excludes addresses that were dropped due to rate-limiting).</extracomment>
+        <translation>จำนวนที่อยู่ทั้งหมดที่ได้รับจากเพียร์นี้ที่ถูกประมวลผล (ไม่รวมที่อยู่ที่ถูกทิ้งเนื่องจากการจำกัดอัตรา)</translation>
+    </message>
+    <message>
+        <source>The total number of addresses received from this peer that were dropped (not processed) due to rate-limiting.</source>
+        <extracomment>Tooltip text for the Addresses Rate-Limited field in the peer details area, which displays the total number of addresses received from this peer that were dropped (not processed) due to rate-limiting.</extracomment>
+        <translation>จำนวนที่อยู่ทั้งหมดที่ได้รับจากเพียร์นี้ที่ถูกทิ้ง (ไม่ประมวลผล) เนื่องจากการจำกัดอัตรา</translation>
+    </message>
     <message>
         <source>Wallet repair options.</source>
         <translation>ตัวเลือกการซ่อมแซมกระเป๋าสตางค์</translation>
@@ -2526,6 +3470,60 @@
         <source>-reindex: Rebuild block chain index from current blk000??.dat files.</source>
         <translation>-reindex: สร้างดัชนี blockchain ใหม่จากไฟล์ blk000??.dat ปัจจุบัน</translation>
     </message>
+    <message>
+        <source>Inbound: initiated by peer</source>
+        <extracomment>Explanatory text for an inbound peer connection.</extracomment>
+        <translation>ขาเข้า: เริ่มต้นโดยเพียร์</translation>
+    </message>
+    <message>
+        <source>Outbound Full Relay: default</source>
+        <extracomment>Explanatory text for an outbound peer connection that relays all network information. This is the default behavior for outbound connections.</extracomment>
+        <translation>ขาออกรีเลย์เต็มรูปแบบ: ค่าเริ่มต้น</translation>
+    </message>
+    <message>
+        <source>Outbound Block Relay: does not relay transactions or addresses</source>
+        <extracomment>Explanatory text for an outbound peer connection that relays network information about blocks and not transactions or addresses.</extracomment>
+        <translation>ขาออกรีเลย์บลอก: ไม่รีเลย์ธุรกรรมหรือที่อยู่</translation>
+    </message>
+    <message>
+        <source>Outbound Manual: added using RPC %1 or %2/%3 configuration options</source>
+        <extracomment>Explanatory text for an outbound peer connection that was established manually through one of several methods. The numbered arguments are stand-ins for the methods available to establish manual connections.</extracomment>
+        <translation>ขาออกด้วยตนเอง: เพิ่มโดยใช้ RPC %1 หรือตัวเลือกการกำหนดค่า %2/%3</translation>
+    </message>
+    <message>
+        <source>Outbound Feeler: short-lived, for testing addresses</source>
+        <extracomment>Explanatory text for a short-lived outbound peer connection that is used to test the aliveness of known addresses.</extracomment>
+        <translation>ขาออกผู้สำรวจ: มีอายุสั้น สำหรับทดสอบที่อยู่</translation>
+    </message>
+    <message>
+        <source>Outbound Address Fetch: short-lived, for soliciting addresses</source>
+        <extracomment>Explanatory text for a short-lived outbound peer connection that is used to request addresses from a peer.</extracomment>
+        <translation>ขาออกดึงที่อยู่: มีอายุสั้น สำหรับขอที่อยู่</translation>
+    </message>
+    <message>
+        <source>To</source>
+        <translation>ถึง</translation>
+    </message>
+    <message>
+        <source>we selected the peer for high bandwidth relay</source>
+        <translation>เราเลือกเพียร์นี้สำหรับรีเลย์แบนด์วิดท์สูง</translation>
+    </message>
+    <message>
+        <source>From</source>
+        <translation>จาก</translation>
+    </message>
+    <message>
+        <source>the peer selected us for high bandwidth relay</source>
+        <translation>เพียร์เลือกเราสำหรับรีเลย์แบนด์วิดท์สูง</translation>
+    </message>
+    <message>
+        <source>No</source>
+        <translation>ไม่</translation>
+    </message>
+    <message>
+        <source>no high bandwidth relay selected</source>
+        <translation>ไม่ได้เลือกรีเลย์แบนด์วิดท์สูง</translation>
+    </message>
     <message>
         <source>&amp;Disconnect</source>
         <translation>&amp;ยกเลิกการเชื่อมต่อ</translation>
@@ -2562,6 +3560,10 @@
         <source>Network activity disabled</source>
         <translation>ปิดการใช้งานเครือข่ายแล้ว</translation>
     </message>
+    <message>
+        <source>None</source>
+        <translation>ไม่มี</translation>
+    </message>
     <message>
         <source>Total: %1 (Enabled: %2)</source>
         <translation>ทั้งหมด: %1 (เปิดใช้งาน: %2)</translation>
@@ -2570,10 +3572,105 @@
         <source>Executing command without any wallet</source>
         <translation>ปฎิบัติการคำสั่งโดยไม่ต้องใช้กระเป๋าสตางค์ใด ๆ</translation>
     </message>
+    <message>
+        <source>Ctrl++</source>
+        <extracomment>Main shortcut to increase the RPC console font size.</extracomment>
+        <translation>Ctrl++</translation>
+    </message>
+    <message>
+        <source>Ctrl+=</source>
+        <extracomment>Secondary shortcut to increase the RPC console font size.</extracomment>
+        <translation>Ctrl+=</translation>
+    </message>
+    <message>
+        <source>Ctrl+-</source>
+        <extracomment>Main shortcut to decrease the RPC console font size.</extracomment>
+        <translation>Ctrl+-</translation>
+    </message>
+    <message>
+        <source>Ctrl+_</source>
+        <extracomment>Secondary shortcut to decrease the RPC console font size.</extracomment>
+        <translation>Ctrl+_</translation>
+    </message>
+    <message>
+        <source>Ctrl+Shift+I</source>
+        <translation>Ctrl+Shift+I</translation>
+    </message>
+    <message>
+        <source>Ctrl+Shift+C</source>
+        <translation>Ctrl+Shift+C</translation>
+    </message>
+    <message>
+        <source>Ctrl+Shift+G</source>
+        <translation>Ctrl+Shift+G</translation>
+    </message>
+    <message>
+        <source>Ctrl+Shift+P</source>
+        <translation>Ctrl+Shift+P</translation>
+    </message>
+    <message>
+        <source>Ctrl+Shift+R</source>
+        <translation>Ctrl+Shift+R</translation>
+    </message>
     <message>
         <source>Executing command using "%1" wallet</source>
         <translation>ปฎิบัติการคำสั่งโดยใช้ "%1" กระเป๋าสตางค์</translation>
     </message>
+    <message>
+        <source>detecting: peer could be v1 or v2</source>
+        <extracomment>Explanatory text for "detecting" transport type.</extracomment>
+        <translation>กำลังตรวจจับ: เพียร์อาจเป็น v1 หรือ v2</translation>
+    </message>
+    <message>
+        <source>v1: unencrypted, plaintext transport protocol</source>
+        <extracomment>Explanatory text for v1 transport type.</extracomment>
+        <translation>v1: โปรโตคอลการส่งข้อมูลแบบไม่เข้ารหัส ข้อความธรรมดา</translation>
+    </message>
+    <message>
+        <source>v2: BIP324 encrypted transport protocol</source>
+        <extracomment>Explanatory text for v2 transport type.</extracomment>
+        <translation>v2: โปรโตคอลการส่งข้อมูลเข้ารหัส BIP324</translation>
+    </message>
+    <message>
+        <source>&amp;Copy address</source>
+        <extracomment>Context menu action to copy the address of a peer</extracomment>
+        <translation>&amp;คัดลอกที่อยู่</translation>
+    </message>
+    <message>
+        <source>1 d&amp;ay</source>
+        <translation>1 &amp;วัน</translation>
+    </message>
+    <message>
+        <source>&amp;Copy IP/Netmask</source>
+        <extracomment>Context menu action to copy the IP/Netmask of a banned peer. IP/Netmask is the combination of a peer's IP address and its Netmask. For IP address see: https://en.wikipedia.org/wiki/IP_address</extracomment>
+        <translation>&amp;คัดลอก IP/Netmask</translation>
+    </message>
+    <message>
+        <source>Welcome to the %1 RPC console.
+Use up and down arrows to navigate history, and %2 to clear screen.
+Use %3 and %4 to increase or decrease the font size.
+Type %5 for an overview of available commands.
+For more information on using this console, type %6.
+
+%7WARNING: Scammers have been active, telling users to type commands here, stealing their wallet contents. Do not use this console without fully understanding the ramifications of a command.%8</source>
+        <extracomment>RPC console welcome message. Placeholders %7 and %8 are style tags for the warning content, and they are not space separated from the rest of the text intentionally.</extracomment>
+        <translation>ยินดีต้อนรับสู่คอนโซล RPC %1
+ใช้ลูกศรขึ้นและลงเพื่อนำทางประวัติ และ %2 เพื่อล้างหน้าจอ
+ใช้ %3 และ %4 เพื่อเพิ่มหรือลดขนาดตัวอักษร
+พิมพ์ %5 เพื่อดูภาพรวมของคำสั่งที่มี
+สำหรับข้อมูลเพิ่มเติมเกี่ยวกับการใช้คอนโซลนี้ พิมพ์ %6
+
+%7คำเตือน: มีผู้หลอกลวงที่บอกให้ผู้ใช้พิมพ์คำสั่งที่นี่ เพื่อขโมยเนื้อหาในกระเป๋าสตางค์ของพวกเขา อย่าใช้คอนโซลนี้โดยไม่เข้าใจผลกระทบของคำสั่งอย่างเต็มที่%8</translation>
+    </message>
+    <message>
+        <source>Executing…</source>
+        <extracomment>A console message indicating an entered command is currently being executed.</extracomment>
+        <translation>กำลังดำเนินการ…</translation>
+    </message>
+    <message>
+        <source>(peer: %1)</source>
+        <translation>(เพียร์: %1)</translation>
+    </message>
     <message>
         <source>via %1</source>
         <translation>via %1</translation>
@@ -2590,11 +3687,19 @@
         <source>Verified Masternode</source>
         <translation>Masternode ที่ตรวจสอบแล้ว</translation>
     </message>
+    <message>
+        <source>Yes</source>
+        <translation>ใช่</translation>
+    </message>
     <message>
         <source>Unknown</source>
         <translation>ไม่ทราบ</translation>
     </message>
-    </context>
+    <message>
+        <source>Never</source>
+        <translation>ไม่เคย</translation>
+    </message>
+</context>
 <context>
     <name>ReceiveCoinsDialog</name>
     <message>
@@ -2673,9 +3778,61 @@
         <source>Enter a message to attach to the payment request</source>
         <translation>ป้อนข้อความที่จะแนบไปร้องขอการชำระเงิน</translation>
     </message>
-    </context>
+    <message>
+        <source>Copy &amp;URI</source>
+        <translation>คัดลอก &amp;URI</translation>
+    </message>
+    <message>
+        <source>&amp;Copy address</source>
+        <translation>&amp;คัดลอกที่อยู่</translation>
+    </message>
+    <message>
+        <source>Copy &amp;label</source>
+        <translation>คัดลอก&amp;ป้ายกำกับ</translation>
+    </message>
+    <message>
+        <source>Copy &amp;message</source>
+        <translation>คัดลอก&amp;ข้อความ</translation>
+    </message>
+    <message>
+        <source>Copy &amp;amount</source>
+        <translation>คัดลอก&amp;จำนวน</translation>
+    </message>
+    <message>
+        <source>Could not unlock wallet.</source>
+        <translation>ไม่สามารถปลดล็อกกระเป๋าเงินได้</translation>
+    </message>
+    <message>
+        <source>Could not generate new address</source>
+        <translation>ไม่สามารถสร้างที่อยู่ใหม่ได้</translation>
+    </message>
+</context>
 <context>
     <name>ReceiveRequestDialog</name>
+    <message>
+        <source>Request payment to …</source>
+        <translation>ขอการชำระเงินไปยัง …</translation>
+    </message>
+    <message>
+        <source>Address:</source>
+        <translation>ที่อยู่:</translation>
+    </message>
+    <message>
+        <source>Amount:</source>
+        <translation>จำนวน:</translation>
+    </message>
+    <message>
+        <source>Label:</source>
+        <translation>ป้ายกำกับ:</translation>
+    </message>
+    <message>
+        <source>Message:</source>
+        <translation>ข้อความ:</translation>
+    </message>
+    <message>
+        <source>Wallet:</source>
+        <translation>กระเป๋าเงิน:</translation>
+    </message>
     <message>
         <source>Copy &amp;URI</source>
         <translation>คัดลอก &amp;URI</translation>
@@ -2728,6 +3885,34 @@
         <translation>ร้องขอ</translation>
     </message>
 </context>
+<context>
+    <name>RestoreWalletActivity</name>
+    <message>
+        <source>Restore Wallet</source>
+        <extracomment>Title of progress window which is displayed when wallets are being restored.</extracomment>
+        <translation>กู้คืนกระเป๋าเงิน</translation>
+    </message>
+    <message>
+        <source>Restoring Wallet &lt;b&gt;%1&lt;/b&gt;…</source>
+        <extracomment>Descriptive text of the restore wallets progress window which indicates to the user that wallets are currently being restored.</extracomment>
+        <translation>กำลังกู้คืนกระเป๋าเงิน &lt;b&gt;%1&lt;/b&gt;…</translation>
+    </message>
+    <message>
+        <source>Restore wallet failed</source>
+        <extracomment>Title of message box which is displayed when the wallet could not be restored.</extracomment>
+        <translation>การกู้คืนกระเป๋าเงินล้มเหลว</translation>
+    </message>
+    <message>
+        <source>Restore wallet warning</source>
+        <extracomment>Title of message box which is displayed when the wallet is restored with some warning.</extracomment>
+        <translation>คำเตือนการกู้คืนกระเป๋าเงิน</translation>
+    </message>
+    <message>
+        <source>Restore wallet message</source>
+        <extracomment>Title of message box which is displayed when the wallet is successfully restored.</extracomment>
+        <translation>ข้อความการกู้คืนกระเป๋าเงิน</translation>
+    </message>
+</context>
 <context>
     <name>SendCoinsDialog</name>
     <message>
@@ -2762,10 +3947,6 @@
         <source>Fee:</source>
         <translation>ค่าธรรมเนียม:</translation>
     </message>
-    <message>
-        <source>Dust:</source>
-        <translation>เศษ:</translation>
-    </message>
     <message>
         <source>Inputs…</source>
         <translation>ปัจจัยการผลิต…</translation>
@@ -2890,10 +4071,6 @@
         <source>Copy bytes</source>
         <translation>คัดลอกไบต์</translation>
     </message>
-    <message>
-        <source>Copy dust</source>
-        <translation>คัดลอก dust</translation>
-    </message>
     <message>
         <source>Copy change</source>
         <translation>คัดลอกการเปลี่ยนแปลง</translation>
@@ -2910,10 +4087,6 @@
         <source>%1 to %2</source>
         <translation>%1 ถึง %2</translation>
     </message>
-    <message>
-        <source>Are you sure you want to send?</source>
-        <translation>คุณแน่ใจว่าคุณต้องการส่งใช่หรือไม่?</translation>
-    </message>
     <message>
         <source>&lt;b&gt;(%1 of %2 entries displayed)&lt;/b&gt;</source>
         <translation>&lt;b&gt;(%1 of %2 รายการที่แสดง)&lt;/b&gt;</translation>
@@ -2930,10 +4103,6 @@
         <source>Cr&amp;eate Unsigned</source>
         <translation>Cr&amp;eate ไม่ได้ลงนาม</translation>
     </message>
-    <message>
-        <source>Creates a Partially Signed Bitcoin Transaction (PSBT) for use with e.g. an offline %1 wallet, or a PSBT-compatible hardware wallet.</source>
-        <translation>สร้างธุรกรรม Bitcoin ที่ลงนามบางส่วน (PSBT) เพื่อใช้กับเช่น กระเป๋าเงิน %1 แบบออฟไลน์ หรือกระเป๋าเงินฮาร์ดแวร์ที่เข้ากันได้กับ PSBT</translation>
-    </message>
     <message>
         <source> from wallet '%1'</source>
         <translation>จากกระเป๋าเงิน '%1'</translation>
@@ -2942,10 +4111,6 @@
         <source>%1 to '%2'</source>
         <translation>%1 ถึง '%2'</translation>
     </message>
-    <message>
-        <source>Do you want to draft this transaction?</source>
-        <translation>คุณต้องการร่างธุรกรรมนี้หรือไม่?</translation>
-    </message>
     <message>
         <source>%1 funds only</source>
         <translation>ทำธุรกรรมแบบ %1 เฉพาะในกองทุนเท่านั้น</translation>
@@ -2995,17 +4160,50 @@
         <translation>ยืนยันการส่งเหรียญ</translation>
     </message>
     <message>
-        <source>Confirm transaction proposal</source>
-        <translation>ยืนยันข้อเสนอการทำธุรกรรม</translation>
+        <source>Save Transaction Data</source>
+        <translation>บันทึกข้อมูลธุรกรรม</translation>
     </message>
     <message>
-        <source>Send</source>
-        <translation>ส่ง</translation>
+        <source>PSBT saved</source>
+        <translation>บันทึก PSBT แล้ว</translation>
+    </message>
+    <message>
+        <source>Watch-only balance:</source>
+        <translation>ยอดคงเหลือเฉพาะดู:</translation>
+    </message>
+    <message>
+        <source>Creates a Partially Signed Blockchain Transaction (PSBT) for use with e.g. an offline %1 wallet, or a PSBT-compatible hardware wallet.</source>
+        <translation>สร้าง Partially Signed Blockchain Transaction (PSBT) สำหรับใช้กับกระเป๋าเงิน %1 แบบออฟไลน์ หรือกระเป๋าเงินฮาร์ดแวร์ที่รองรับ PSBT</translation>
+    </message>
+    <message>
+        <source>Do you want to create this transaction?</source>
+        <extracomment>Message displayed when attempting to create a transaction. Cautionary text to prompt the user to verify that the displayed transaction details represent the transaction the user intends to create.</extracomment>
+        <translation>คุณต้องการสร้างธุรกรรมนี้หรือไม่?</translation>
+    </message>
+    <message>
+        <source>Please, review your transaction proposal. This will produce a Partially Signed Blockchain Transaction (PSBT) which you can save or copy and then sign with e.g. an offline %1 wallet, or a PSBT-compatible hardware wallet.</source>
+        <extracomment>Text to inform a user attempting to create a transaction of their current options. At this stage, a user can only create a PSBT. This string is displayed when private keys are disabled and an external signer is not available.</extracomment>
+        <translation>โปรดตรวจสอบข้อเสนอธุรกรรมของคุณ จะสร้าง Partially Signed Blockchain Transaction (PSBT) ที่คุณสามารถบันทึกหรือคัดลอกแล้วลงนามด้วยกระเป๋าเงิน %1 แบบออฟไลน์ หรือกระเป๋าเงินฮาร์ดแวร์ที่รองรับ PSBT</translation>
+    </message>
+    <message>
+        <source>Please, review your transaction. You can create and send this transaction or create a Partially Signed Blockchain Transaction (PSBT), which you can save or copy and then sign with, e.g., an offline %1 wallet, or a PSBT-compatible hardware wallet.</source>
+        <extracomment>Text to inform a user attempting to create a transaction of their current options. At this stage, a user can send their transaction or create a PSBT. This string is displayed when both private keys and PSBT controls are enabled.</extracomment>
+        <translation>โปรดตรวจสอบธุรกรรมของคุณ คุณสามารถสร้างและส่งธุรกรรมนี้ หรือสร้าง Partially Signed Blockchain Transaction (PSBT) ที่คุณสามารถบันทึกหรือคัดลอกแล้วลงนามด้วยกระเป๋าเงิน %1 แบบออฟไลน์ หรือกระเป๋าเงินฮาร์ดแวร์ที่รองรับ PSBT</translation>
+    </message>
+    <message>
+        <source>Please, review your transaction.</source>
+        <extracomment>Text to prompt a user to review the details of the transaction they are attempting to send.</extracomment>
+        <translation>โปรดตรวจสอบธุรกรรมของคุณ</translation>
     </message>
     <message>
         <source>To review recipient list click "Show Details…"</source>
         <translation>หากต้องการตรวจสอบรายชื่อผู้รับ คลิก "แสดงรายละเอียด…"</translation>
     </message>
+    <message>
+        <source>Partially Signed Transaction (Binary)</source>
+        <extracomment>Expanded name of the binary PSBT file format. See: BIP 174.</extracomment>
+        <translation>ธุรกรรมที่ลงนามบางส่วน (ไบนารี)</translation>
+    </message>
     <message>
         <source>The recipient address is not valid. Please recheck.</source>
         <translation>ที่อยู่ผู้รับไม่ถูกต้อง โปรดตรวจสอบอีกครั้ง</translation>
@@ -3125,21 +4323,16 @@
         <source>A message that was attached to the dash: URI which will be stored with the transaction for your reference. Note: This message will not be sent over the Dash network.</source>
         <translation>ข้อความที่แนบมาไปยัง Dash: URI ซึ่งจะถูกเก็บไว้กับธุรกรรมเพื่อเป็นข้อมูลอ้างอิงของคุณ  หมายเหตุ: ข้อความนี้จะถูกส่งไปยังเครือข่าย Dash </translation>
     </message>
+</context>
+<context>
+    <name>SendConfirmationDialog</name>
     <message>
-        <source>This is an unauthenticated payment request.</source>
-        <translation>นี่คือคำขอชำระเงินที่ไม่ได้รับการพิสูจน์ตัวตน</translation>
-    </message>
-    <message>
-        <source>This is an authenticated payment request.</source>
-        <translation>นี่คือคำขอชำระเงินที่ได้รับการพิสูจน์ตัวตน</translation>
-    </message>
-    <message>
-        <source>Pay To:</source>
-        <translation>จ่ายไปยัง: </translation>
+        <source>Send</source>
+        <translation>ส่ง</translation>
     </message>
     <message>
-        <source>Memo:</source>
-        <translation>Memo:</translation>
+        <source>Create Unsigned</source>
+        <translation>สร้างแบบไม่ลงนาม</translation>
     </message>
 </context>
 <context>
@@ -3279,6 +4472,10 @@
         <source>Wallet unlock was cancelled.</source>
         <translation>ยกเลิกการปลดล็อกกระเป๋าสตางค์แล้ว</translation>
     </message>
+    <message>
+        <source>No error</source>
+        <translation>ไม่มีข้อผิดพลาด</translation>
+    </message>
     <message>
         <source>Private key for the entered address is not available.</source>
         <translation>คีย์ส่วนตัวสำหรับที่อยู่ที่ป้อนไปไม่สามารถใช้งานได้</translation>
@@ -3314,9 +4511,21 @@
 </context>
 <context>
     <name>SplashScreen</name>
-    </context>
+    <message>
+        <source>(press q to shutdown and continue later)</source>
+        <translation>(กด q เพื่อปิดและดำเนินการต่อในภายหลัง)</translation>
+    </message>
+    <message>
+        <source>press q to shutdown</source>
+        <translation>กด q เพื่อปิด</translation>
+    </message>
+</context>
 <context>
     <name>TrafficGraphWidget</name>
+    <message>
+        <source>kB/s</source>
+        <translation>กิโลไบต์/วินาที</translation>
+    </message>
     <message>
         <source>Total</source>
         <translation>ยอดรวม: </translation>
@@ -3332,20 +4541,9 @@
 </context>
 <context>
     <name>TransactionDesc</name>
-    <message numerus="yes">
-        <source>Open for %n more block(s)</source>
-        <translation><numerusform>เปิดสำหรับ  %n บล็อกเพิ่มเติม</numerusform></translation>
-    </message>
-    <message>
-        <source>Open until %1</source>
-        <translation>เปิดจนถึง %1</translation>
-    </message>
-    <message>
-        <source>conflicted</source>
-        <translation>ขัดแย้ง</translation>
-    </message>
     <message>
         <source>0/unconfirmed, %1</source>
+        <extracomment>Text explaining the current status of a transaction, shown in the status field of the details window for this transaction. This status represents an unconfirmed transaction that is in the memory pool.</extracomment>
         <translation>0 / ยังไม่ได้ยืนยัน %1</translation>
     </message>
     <message>
@@ -3358,22 +4556,32 @@
     </message>
     <message>
         <source>abandoned</source>
+        <extracomment>Text explaining the current status of a transaction, shown in the status field of the details window for this transaction. This status represents an abandoned transaction.</extracomment>
         <translation>ถูกละทิ้ง</translation>
     </message>
+    <message>
+        <source>conflicted with a transaction with %1 confirmations</source>
+        <extracomment>Text explaining the current status of a transaction, shown in the status field of the details window for this transaction. This status represents an unconfirmed transaction that conflicts with a confirmed transaction.</extracomment>
+        <translation>ขัดแย้งกับธุรกรรมที่มี %1 การยืนยัน</translation>
+    </message>
     <message>
         <source>%1/unconfirmed</source>
+        <extracomment>Text explaining the current status of a transaction, shown in the status field of the details window for this transaction. This status represents a transaction confirmed in at least one block, but less than 6 blocks, and still not locked via ChainLocks.</extracomment>
         <translation>%1 / ยังไม่ได้ยืนยัน</translation>
     </message>
     <message>
         <source>%1 confirmations</source>
+        <extracomment>Text explaining the current status of a transaction, shown in the status field of the details window for this transaction. This status represents a transaction confirmed in 6 or more blocks or locked via ChainLocks.</extracomment>
         <translation>%1 ยืนยัน</translation>
     </message>
     <message>
         <source>locked via ChainLocks</source>
+        <extracomment>Text explaining the current status of a transaction, shown in the status field of the details window for this transaction. This status represents a transaction confirmed in at least one block and has been locked by ChainLocks.</extracomment>
         <translation>ล็อกผ่าน Chainlocks</translation>
     </message>
     <message>
         <source>verified via InstantSend</source>
+        <extracomment>Text explaining the current status of a transaction, shown in the status field of the details window for this transaction. This status represents an unconfirmed transaction that has been locked by InstantSend.</extracomment>
         <translation>ยืนยันผ่าน InstantSend</translation>
     </message>
     <message>
@@ -3392,6 +4600,10 @@
         <source>Generated</source>
         <translation>สร้าง</translation>
     </message>
+    <message>
+        <source>Platform Transfer</source>
+        <translation>การโอนแพลตฟอร์ม</translation>
+    </message>
     <message>
         <source>From</source>
         <translation>จาก</translation>
@@ -3522,14 +4734,6 @@
         <source>Address / Label</source>
         <translation>ที่อยู่ / ป้ายชื่อ</translation>
     </message>
-    <message numerus="yes">
-        <source>Open for %n more block(s)</source>
-        <translation><numerusform>เปิดอีก %n  บล็อค</numerusform></translation>
-    </message>
-    <message>
-        <source>Open until %1</source>
-        <translation>เปิดจนถึง %1</translation>
-    </message>
     <message>
         <source>Unconfirmed</source>
         <translation>ไม่มีการยืนยัน</translation>
@@ -3590,6 +4794,10 @@
         <source>Mined</source>
         <translation>Mined</translation>
     </message>
+    <message>
+        <source>Platform Transfer</source>
+        <translation>การโอนแพลตฟอร์ม</translation>
+    </message>
     <message>
         <source>%1 Mixing</source>
         <translation>%1 ผสม</translation>
@@ -3717,6 +4925,10 @@
         <source>Mined</source>
         <translation>ขุด</translation>
     </message>
+    <message>
+        <source>Platform Transfer</source>
+        <translation>การโอนแพลตฟอร์ม</translation>
+    </message>
     <message>
         <source>Other</source>
         <translation>อื่นๆ</translation>
@@ -3729,10 +4941,64 @@
         <source>Min amount</source>
         <translation>จำนวนเงินขั้นต่ำ</translation>
     </message>
+    <message>
+        <source>&amp;Copy address</source>
+        <translation>&amp;คัดลอกที่อยู่</translation>
+    </message>
+    <message>
+        <source>Copy &amp;label</source>
+        <translation>คัดลอก&amp;ป้ายกำกับ</translation>
+    </message>
+    <message>
+        <source>Copy &amp;amount</source>
+        <translation>คัดลอก&amp;จำนวน</translation>
+    </message>
+    <message>
+        <source>Copy transaction &amp;ID</source>
+        <translation>คัดลอก&amp;ID ธุรกรรม</translation>
+    </message>
+    <message>
+        <source>Copy &amp;raw transaction</source>
+        <translation>คัดลอกธุรกรรม&amp;ดิบ</translation>
+    </message>
+    <message>
+        <source>Copy full transaction &amp;details</source>
+        <translation>คัดลอก&amp;รายละเอียดธุรกรรมทั้งหมด</translation>
+    </message>
+    <message>
+        <source>&amp;Show transaction details</source>
+        <translation>&amp;แสดงรายละเอียดธุรกรรม</translation>
+    </message>
+    <message>
+        <source>A&amp;bandon transaction</source>
+        <translation>ละ&amp;ทิ้งธุรกรรม</translation>
+    </message>
+    <message>
+        <source>Rese&amp;nd transaction</source>
+        <translation>ส่งธุรกรรมอีก&amp;ครั้ง</translation>
+    </message>
+    <message>
+        <source>&amp;Edit address label</source>
+        <translation>&amp;แก้ไขป้ายกำกับที่อยู่</translation>
+    </message>
+    <message>
+        <source>Show address &amp;QR code</source>
+        <translation>แสดงรหัส &amp;QR ของที่อยู่</translation>
+    </message>
+    <message>
+        <source>Show in %1</source>
+        <extracomment>Transactions table context menu action to show the selected transaction in a third-party block explorer. %1 is a stand-in argument for the URL of the explorer.</extracomment>
+        <translation>แสดงใน %1</translation>
+    </message>
     <message>
         <source>Export Transaction History</source>
         <translation>ส่งออกประวัติการทำธุรกรรม</translation>
     </message>
+    <message>
+        <source>Comma separated file</source>
+        <extracomment>Expanded name of the CSV file format. See: https://en.wikipedia.org/wiki/Comma-separated_values.</extracomment>
+        <translation>ไฟล์แยกด้วยจุลภาค</translation>
+    </message>
     <message>
         <source>Confirmed</source>
         <translation>ยืนยันแล้ว</translation>
@@ -3811,7 +5077,15 @@
         <source>Closing the wallet for too long can result in having to resync the entire chain if pruning is enabled.</source>
         <translation>การปิดกระเป๋าเงินค้างไว้นานเกินไปอาจส่งผลให้มีการเข้าถึงเชนทั้งหมดหากเปิดใช้งาน pruning</translation>
     </message>
-    </context>
+    <message>
+        <source>Close all wallets</source>
+        <translation>ปิดกระเป๋าเงินทั้งหมด</translation>
+    </message>
+    <message>
+        <source>Are you sure you wish to close all wallets?</source>
+        <translation>คุณแน่ใจหรือไม่ว่าต้องการปิดกระเป๋าเงินทั้งหมด?</translation>
+    </message>
+</context>
 <context>
     <name>WalletFrame</name>
     <message>
@@ -3826,7 +5100,31 @@ Go to File &gt; Open Wallet to load a wallet.
         <source>Create a new wallet</source>
         <translation>สร้างกระเป๋าเงินใหม่</translation>
     </message>
-    </context>
+    <message>
+        <source>Error</source>
+        <translation>ข้อผิดพลาด</translation>
+    </message>
+    <message>
+        <source>Unable to decode PSBT from clipboard (invalid base64)</source>
+        <translation>ไม่สามารถถอดรหัส PSBT จากคลิปบอร์ด (base64 ไม่ถูกต้อง)</translation>
+    </message>
+    <message>
+        <source>Load Transaction Data</source>
+        <translation>โหลดข้อมูลธุรกรรม</translation>
+    </message>
+    <message>
+        <source>Partially Signed Transaction (*.psbt)</source>
+        <translation>ธุรกรรมที่ลงนามบางส่วน (*.psbt)</translation>
+    </message>
+    <message>
+        <source>PSBT file must be smaller than 100 MiB</source>
+        <translation>ไฟล์ PSBT ต้องมีขนาดเล็กกว่า 100 MiB</translation>
+    </message>
+    <message>
+        <source>Unable to decode PSBT</source>
+        <translation>ไม่สามารถถอดรหัส PSBT</translation>
+    </message>
+</context>
 <context>
     <name>WalletModel</name>
     <message>
@@ -3852,6 +5150,11 @@ Go to File &gt; Open Wallet to load a wallet.
         <source>Selected amount:</source>
         <translation>จำนวนที่เลือก:</translation>
     </message>
+    <message>
+        <source>Wallet Data</source>
+        <extracomment>Name of the wallet data file format.</extracomment>
+        <translation>ข้อมูลกระเป๋าเงิน</translation>
+    </message>
     <message>
         <source>Backup Wallet</source>
         <translation>สำรองกระเป๋าสตางค์</translation>
@@ -3879,14 +5182,6 @@ Go to File &gt; Open Wallet to load a wallet.
 </context>
 <context>
     <name>dash-core</name>
-    <message>
-        <source>Error: Listening for incoming connections failed (listen returned error %s)</source>
-        <translation>ข้อผิดพลาด: ฟังการเชื่อมต่อขาเข้าล้มเหลว (ฟังข้อผิดพลาด %s)</translation>
-    </message>
-    <message>
-        <source>Fee estimation failed. Fallbackfee is disabled. Wait a few blocks or enable -fallbackfee.</source>
-        <translation>การประมาณค่าธรรมเนียมล้มเหลว Fallbackfee ถูกปิดการใช้งาน รอสองสามช่วงบล็อกหรือเปิดใช้งาน -fallbackfee</translation>
-    </message>
     <message>
         <source>This error could occur if this wallet was not shutdown cleanly and was last loaded using a build with a newer version of Berkeley DB. If so, please use the software that last loaded this wallet</source>
         <translation>ข้อผิดพลาดนี้อาจเกิดขึ้นหากกระเป๋าเงินนี้ไม่ได้ปิดระบบอย่างหมดจดและถูกโหลดครั้งสุดท้ายโดยใช้การสร้างที่มีรุ่นใหม่กว่าของ Berkeley DB ถ้าเป็นเช่นนั้นโปรดใช้ซอฟต์แวร์ที่โหลดล่าสุดกระเป๋าเงินนี้</translation>
@@ -3944,16 +5239,20 @@ Go to File &gt; Open Wallet to load a wallet.
         <translation>เกิดข้อผิดพลาดในการอ่านจากฐานข้อมูล, กำลังปิดเครื่อง</translation>
     </message>
     <message>
-        <source>Failed to listen on any port. Use -listen=0 if you want this.</source>
-        <translation>เกิดข้อผิดพลาดในการฟัง port ใด ๆ ใช้ -listen = 0 ถ้าต้องการ</translation>
+        <source>Error: Missing checksum</source>
+        <translation>ข้อผิดพลาด: ไม่มีเช็คซัม</translation>
+    </message>
+    <message>
+        <source>Error: Unable to parse version %u as a uint32_t</source>
+        <translation>ข้อผิดพลาด: ไม่สามารถแยกวิเคราะห์เวอร์ชัน %u เป็น uint32_t</translation>
     </message>
     <message>
-        <source>-maxtxfee is set very high! Fees this large could be paid on a single transaction.</source>
-        <translation>-maxtxfee ตั้งค่าไว้สูงมาก! ค่าธรรมเนียมที่มีขนาดใหญ่นี้สามารถจ่ายได้เมื่อทำธุรกรรมครั้งเดียว</translation>
+        <source>Error: Unable to write record to new wallet</source>
+        <translation>ข้อผิดพลาด: ไม่สามารถเขียนบันทึกไปยังกระเป๋าเงินใหม่</translation>
     </message>
     <message>
-        <source>Cannot provide specific connections and have addrman find outgoing connections at the same.</source>
-        <translation>ไม่สามารถให้การเชื่อมต่อที่เฉพาะเจาะจงและมี addrman พบการเชื่อมต่อขาออกในเวลาเดียวกัน</translation>
+        <source>Failed to listen on any port. Use -listen=0 if you want this.</source>
+        <translation>เกิดข้อผิดพลาดในการฟัง port ใด ๆ ใช้ -listen = 0 ถ้าต้องการ</translation>
     </message>
     <message>
         <source>Found unconfirmed denominated outputs, will wait till they confirm to continue.</source>
@@ -3963,10 +5262,6 @@ Go to File &gt; Open Wallet to load a wallet.
         <source>Invalid -socketevents ('%s') specified. Only these modes are supported: %s</source>
         <translation>-socketevents ไม่ถูกต้อง ('%s') ที่ระบุไว้ เฉพาะโหมดเหล่านี้ได้รับการสนับสนุน: %s</translation>
     </message>
-    <message>
-        <source>Invalid amount for -maxtxfee=&lt;amount&gt;: '%s' (must be at least the minrelay fee of %s to prevent stuck transactions)</source>
-        <translation>จำนวนเงินไม่ถูกต้องสำหรับ -maxtxfee = &lt;amount&gt;'%s' (ต้องมีอย่างน้อยค่าธรรมเนียงการส่งของ %s เพื่อป้องกันธุรกรรมที่ติดค้าง)</translation>
-    </message>
     <message>
         <source>SQLiteDatabase: Unknown sqlite wallet schema version %d. Only version %d is supported</source>
         <translation>SQLiteDatabase: ไม่รู้จัก sqlite wallet schema เวอร์ชัน %d. รองรับเฉพาะเวอร์ชัน %d เท่านั้น</translation>
@@ -3975,6 +5270,10 @@ Go to File &gt; Open Wallet to load a wallet.
         <source>Transaction index can't be disabled with governance validation enabled. Either start with -disablegovernance command line switch or enable transaction index.</source>
         <translation>ดัชนีการทำธุรกรรมไม่สามารถปิดการใช้งานกับการตรวจสอบการกำกับดูแลการเปิดใช้งาน ทั้งสองเริ่มต้นด้วย -disablegovernance command line switch หรือเปิดใช้งานดัชนีการทำธุรกรรม</translation>
     </message>
+    <message>
+        <source>Unsupported category-specific logging level -loglevel=%s. Expected -loglevel=&lt;category&gt;:&lt;loglevel&gt;. Valid categories: %s. Valid loglevels: %s.</source>
+        <translation>ระดับการบันทึกเฉพาะหมวดหมู่ที่ไม่รองรับ -loglevel=%s คาดว่า -loglevel=&lt;category&gt;:&lt;loglevel&gt; หมวดหมู่ที่ถูกต้อง: %s ระดับบันทึกที่ถูกต้อง: %s</translation>
+    </message>
     <message>
         <source>Can't mix: no compatible inputs found!</source>
         <translation>ไม่สามารถผสมได้: ไม่พบอินพุตที่เข้ากันได้!</translation>
@@ -3983,6 +5282,14 @@ Go to File &gt; Open Wallet to load a wallet.
         <source>Entry exceeds maximum size.</source>
         <translation>รายการมีขนาดสูงเกินไป</translation>
     </message>
+    <message>
+        <source>Error upgrading evo database for EHF</source>
+        <translation>ข้อผิดพลาดในการอัปเกรดฐานข้อมูล evo สำหรับ EHF</translation>
+    </message>
+    <message>
+        <source>Failed to commit Evo database</source>
+        <translation>ล้มเหลวในการคอมมิตฐานข้อมูล Evo</translation>
+    </message>
     <message>
         <source>Found enough users, signing ( waiting %s )</source>
         <translation>พบผู้ใช้เพียงพอ, กำลังลงนาม…  ( กำลังรอ %s )</translation>
@@ -4007,18 +5314,14 @@ Go to File &gt; Open Wallet to load a wallet.
         <source>Insufficient funds.</source>
         <translation>เงินทุนไม่เพียงพอ</translation>
     </message>
-    <message>
-        <source>Invalid amount for -discardfee=&lt;amount&gt;: '%s'</source>
-        <translation>จำนวนเงินไม่ถูกต้องสำหรับ -discardfee=&lt;amount&gt;: '%s'</translation>
-    </message>
-    <message>
-        <source>Invalid amount for -paytxfee=&lt;amount&gt;: '%s' (must be at least %s)</source>
-        <translation>จำนวนที่ไม่ถูกต้องสำหรับ -paytxfee = &lt;amount&gt;: '%s' (ต้องมีอย่างน้อย %s)</translation>
-    </message>
     <message>
         <source>Invalid minimum number of spork signers specified with -minsporkkeys</source>
         <translation>จำนวนขั้นต่ำ spork signers ไม่ถูกต้องระบุด้วย -minsporkkeys</translation>
     </message>
+    <message>
+        <source>Listening for incoming connections failed (listen returned error %s)</source>
+        <translation>การรอรับการเชื่อมต่อขาเข้าล้มเหลว (listen ส่งคืนข้อผิดพลาด %s)</translation>
+    </message>
     <message>
         <source>Lock is already in place.</source>
         <translation>ล็อกอยู่ในตำแหน่งแล้ว</translation>
@@ -4075,6 +5378,10 @@ Go to File &gt; Open Wallet to load a wallet.
         <source>Synchronizing governance objects…</source>
         <translation>กำลังปรับเทียบออบเจคการกำกับ …</translation>
     </message>
+    <message>
+        <source>Transaction change output index out of range</source>
+        <translation>ดัชนีเอาต์พุตเงินทอนของธุรกรรมอยู่นอกช่วง</translation>
+    </message>
     <message>
         <source>Unable to start HTTP server. See debug log for details.</source>
         <translation>ไม่สามารถเริ่มต้นเซิร์ฟเวอร์ HTTPได้  ดูบันทึกดีบักเพื่อดูรายละเอียด</translation>
@@ -4083,6 +5390,10 @@ Go to File &gt; Open Wallet to load a wallet.
         <source>Unknown response.</source>
         <translation>การตอบสนองที่ไม่รู้จัก</translation>
     </message>
+    <message>
+        <source>Unsupported global logging level -loglevel=%s. Valid values: %s.</source>
+        <translation>ระดับการบันทึกระดับโลกที่ไม่รองรับ -loglevel=%s ค่าที่ถูกต้อง: %s</translation>
+    </message>
     <message>
         <source>User Agent comment (%s) contains unsafe characters.</source>
         <translation>ตัวแทนผู้ใช้แสดงความคิดเห็น (%s) มีอักขระที่ไม่ปลอดภัย</translation>
@@ -4123,6 +5434,10 @@ Go to File &gt; Open Wallet to load a wallet.
         <source>Make sure to encrypt your wallet and delete all non-encrypted backups after you have verified that the wallet works!</source>
         <translation>ตรวจสอบให้แน่ใจว่าได้เข้ารหัสกระเป๋าสตางค์ของคุณและลบสำเนาสำรองที่ไม่ได้เข้ารหัสทั้งหมดหลังจากยืนยันว่า wallet ของคุณทำงานได้!  </translation>
     </message>
+    <message>
+        <source>More than one onion bind address is provided. Using %s for the automatically created Tor onion service.</source>
+        <translation>มีการระบุที่อยู่ผูกมัด onion มากกว่าหนึ่งรายการ ใช้ %s สำหรับบริการ Tor onion ที่สร้างขึ้นโดยอัตโนมัติ</translation>
+    </message>
     <message>
         <source>Prune configured below the minimum of %d MiB.  Please use a higher number.</source>
         <translation>Prune มีการกำหนดค่าขั้นต่ำ %d MiB   โปรดใช้หมายเลขที่สูงกว่า</translation>
@@ -4192,20 +5507,32 @@ Go to File &gt; Open Wallet to load a wallet.
         <translation>ข้อผิดพลาดในการโหลด %s: คีย์ส่วนตัวสามารถปิดการใช้งานได้ในระหว่างการสร้างเท่านั้น</translation>
     </message>
     <message>
-        <source>Error upgrading evo database</source>
-        <translation>ฐานข้อมูลข้อผิดพลาดในการอัพเกรด evo</translation>
+        <source>Error: Couldn't create cursor into database</source>
+        <translation>ข้อผิดพลาด: ไม่สามารถสร้างเคอร์เซอร์ในฐานข้อมูล</translation>
     </message>
     <message>
         <source>Error: Disk space is low for %s</source>
         <translation>ข้อผิดพลาด: พื้นที่ดิสก์ต่ำสำหรับ %s</translation>
     </message>
     <message>
-        <source>Exceeded max tries.</source>
-        <translation>เกินความพยายามสูงสุด</translation>
+        <source>Error: Dumpfile checksum does not match. Computed %s, expected %s</source>
+        <translation>ข้อผิดพลาด: เช็คซัมไฟล์ดัมป์ไม่ตรงกัน คำนวณได้ %s คาดว่า %s</translation>
+    </message>
+    <message>
+        <source>Error: Got key that was not hex: %s</source>
+        <translation>ข้อผิดพลาด: ได้รับคีย์ที่ไม่ใช่ hex: %s</translation>
+    </message>
+    <message>
+        <source>Error: Got value that was not hex: %s</source>
+        <translation>ข้อผิดพลาด: ได้รับค่าที่ไม่ใช่ hex: %s</translation>
+    </message>
+    <message>
+        <source>Error: Keypool ran out, please call keypoolrefill first</source>
+        <translation>ข้อผิดพลาด: คีย์พูลหมดแล้ว โปรดเรียก keypoolrefill ก่อน</translation>
     </message>
     <message>
-        <source>Failed to commit EvoDB</source>
-        <translation>ล้มเหลวในการกระทำ EvoDB</translation>
+        <source>Error: No addresses available.</source>
+        <translation>ข้อผิดพลาด: ไม่มีที่อยู่ที่ใช้งานได้</translation>
     </message>
     <message>
         <source>Failed to create backup %s!</source>
@@ -4227,6 +5554,10 @@ Go to File &gt; Open Wallet to load a wallet.
         <source>Failed to verify database</source>
         <translation>ตรวจสอบฐานข้อมูลไม่สำเร็จ</translation>
     </message>
+    <message>
+        <source>Fee rate (%s) is lower than the minimum fee rate setting (%s)</source>
+        <translation>อัตราค่าธรรมเนียม (%s) ต่ำกว่าการตั้งค่าอัตราค่าธรรมเนียมขั้นต่ำ (%s)</translation>
+    </message>
     <message>
         <source>Found enough users, signing…</source>
         <translation>พบผู้ใช้เพียงพอ, กำลังลงนาม…</translation>
@@ -4236,12 +5567,12 @@ Go to File &gt; Open Wallet to load a wallet.
         <translation>ละเว้น duplicate -wallet %s.</translation>
     </message>
     <message>
-        <source>Invalid P2P permission: '%s'</source>
-        <translation>การอนุญาต P2P ไม่ถูกต้อง: '%s'</translation>
+        <source>Input not found or already spent</source>
+        <translation>ไม่พบอินพุตหรือใช้จ่ายไปแล้ว</translation>
     </message>
     <message>
-        <source>Invalid amount for -fallbackfee=&lt;amount&gt;: '%s'</source>
-        <translation>จำนวนเงินที่ไม่ถูกต้องสำหรับ -fallbackfee = 1: '%s'</translation>
+        <source>Invalid P2P permission: '%s'</source>
+        <translation>การอนุญาต P2P ไม่ถูกต้อง: '%s'</translation>
     </message>
     <message>
         <source>Invalid masternodeblsprivkey. Please see documentation.</source>
@@ -4263,6 +5594,10 @@ Go to File &gt; Open Wallet to load a wallet.
         <source>Mixing in progress…</source>
         <translation>อยู่ระหว่างการผสม…</translation>
     </message>
+    <message>
+        <source>No addresses available</source>
+        <translation>ไม่มีที่อยู่ที่ใช้งานได้</translation>
+    </message>
     <message>
         <source>No errors detected.</source>
         <translation>ไม่พบข้อผิดพลาด</translation>
@@ -4339,6 +5674,10 @@ Go to File &gt; Open Wallet to load a wallet.
         <source>This is the transaction fee you will pay if you send a transaction.</source>
         <translation>นี่คือค่าธรรมเนียมการทำธุรกรรมที่คุณจะจ่ายหากคุณส่งธุรกรรม</translation>
     </message>
+    <message>
+        <source>Topping up keypool…</source>
+        <translation>กำลังเติมคีย์พูล…</translation>
+    </message>
     <message>
         <source>Transaction amounts must not be negative</source>
         <translation>ธุรกรรมจะต้องไม่เป็นลบ</translation>
@@ -4367,13 +5706,17 @@ Go to File &gt; Open Wallet to load a wallet.
         <source>Unable to generate initial keys</source>
         <translation>ไม่สามารถสร้างคีย์เริ่มต้น</translation>
     </message>
+    <message>
+        <source>Unable to open %s for writing</source>
+        <translation>ไม่สามารถเปิด %s เพื่อเขียน</translation>
+    </message>
     <message>
         <source>Unknown -blockfilterindex value %s.</source>
         <translation>ไม่ทราบค่า blockfilterindex %s</translation>
     </message>
     <message>
-        <source>Upgrading UTXO database</source>
-        <translation>การอัพเกรดฐานข้อมูล UTXO</translation>
+        <source>Unknown new rules activated (versionbit %i)</source>
+        <translation>กฎใหม่ที่ไม่รู้จักถูกเปิดใช้งาน (versionbit %i)</translation>
     </message>
     <message>
         <source>Verifying blocks…</source>
@@ -4391,6 +5734,10 @@ Go to File &gt; Open Wallet to load a wallet.
         <source>Wasn't able to create wallet backup folder %s!</source>
         <translation>ไม่สามารถสร้างโฟลเดอร์สำรองกระเป๋าสตางค์ได้ %s!</translation>
     </message>
+    <message>
+        <source>Wiping wallet transactions…</source>
+        <translation>กำลังลบธุรกรรมกระเป๋าเงิน…</translation>
+    </message>
     <message>
         <source>You can not start a masternode with wallet enabled.</source>
         <translation>คุณไม่สามารถเริ่มต้น masternode กับกระเป๋าสตางค์เปิดการใช้งาน</translation>
@@ -4411,6 +5758,22 @@ Go to File &gt; Open Wallet to load a wallet.
         <source>%s uses exact denominated amounts to send funds, you might simply need to mix some more coins.</source>
         <translation>การทำธุรกรรมแบบปกปิดข้อมูล %s ใช้จำนวนเงินตามสกุลเงินที่แน่นอน คุณอาจเพียงต้องผสมเหรียญเพิ่มเติม</translation>
     </message>
+    <message>
+        <source>-reindex-chainstate option is not compatible with -blockfilterindex. Please temporarily disable blockfilterindex while using -reindex-chainstate, or replace -reindex-chainstate with -reindex to fully rebuild all indexes.</source>
+        <translation>ตัวเลือก -reindex-chainstate ไม่สามารถใช้งานร่วมกับ -blockfilterindex ได้ โปรดปิดการใช้งาน blockfilterindex ชั่วคราวขณะใช้ -reindex-chainstate หรือแทนที่ -reindex-chainstate ด้วย -reindex เพื่อสร้างดัชนีทั้งหมดใหม่อย่างสมบูรณ์</translation>
+    </message>
+    <message>
+        <source>-reindex-chainstate option is not compatible with -coinstatsindex. Please temporarily disable coinstatsindex while using -reindex-chainstate, or replace -reindex-chainstate with -reindex to fully rebuild all indexes.</source>
+        <translation>ตัวเลือก -reindex-chainstate ไม่สามารถใช้งานร่วมกับ -coinstatsindex ได้ โปรดปิดการใช้งาน coinstatsindex ชั่วคราวขณะใช้ -reindex-chainstate หรือแทนที่ -reindex-chainstate ด้วย -reindex เพื่อสร้างดัชนีทั้งหมดใหม่อย่างสมบูรณ์</translation>
+    </message>
+    <message>
+        <source>-reindex-chainstate option is not compatible with -txindex. Please temporarily disable txindex while using -reindex-chainstate, or replace -reindex-chainstate with -reindex to fully rebuild all indexes.</source>
+        <translation>ตัวเลือก -reindex-chainstate ไม่สามารถใช้งานร่วมกับ -txindex ได้ โปรดปิดการใช้งาน txindex ชั่วคราวขณะใช้ -reindex-chainstate หรือแทนที่ -reindex-chainstate ด้วย -reindex เพื่อสร้างดัชนีทั้งหมดใหม่อย่างสมบูรณ์</translation>
+    </message>
+    <message>
+        <source>Cannot downgrade wallet from version %i to version %i. Wallet version unchanged.</source>
+        <translation>ไม่สามารถดาวน์เกรดกระเป๋าเงินจากเวอร์ชัน %i เป็นเวอร์ชัน %i ได้ เวอร์ชันกระเป๋าเงินไม่เปลี่ยนแปลง</translation>
+    </message>
     <message>
         <source>Cannot obtain a lock on data directory %s. %s is probably already running.</source>
         <translation>ไม่สามารถรับการล็อกไดเรกทอรี่ข้อมูล %s ได้ %s ซึ่งมันอาจทำงานอยู่แล้ว</translation>
@@ -4423,14 +5786,82 @@ Go to File &gt; Open Wallet to load a wallet.
         <source>Error loading %s: You can't enable HD on an already existing non-HD wallet</source>
         <translation>เกิดข้อผิดพลาดในการโหลด %s: คุณไม่สามารถเปิดใช้งาน HD บนกระเป๋าสตางค์ที่ไม่ใช่ของ HD ที่มีอยู่แล้ว</translation>
     </message>
+    <message>
+        <source>Error loading wallet. Wallet requires blocks to be downloaded, and software does not currently support loading wallets while blocks are being downloaded out of order when using assumeutxo snapshots. Wallet should be able to load successfully after node sync reaches height %s</source>
+        <translation>ข้อผิดพลาดในการโหลดกระเป๋าเงิน กระเป๋าเงินต้องการให้ดาวน์โหลดบล็อก และซอฟต์แวร์ปัจจุบันไม่รองรับการโหลดกระเป๋าเงินในขณะที่กำลังดาวน์โหลดบล็อกแบบไม่เป็นลำดับเมื่อใช้ assumeutxo snapshots กระเป๋าเงินควรสามารถโหลดได้สำเร็จหลังจากการซิงค์โหนดถึงความสูง %s</translation>
+    </message>
     <message>
         <source>Error reading %s! All keys read correctly, but transaction data or address book entries might be missing or incorrect.</source>
         <translation>เกิดข้อผิดพลาดในการอ่าน %s! คีย์ทั้งหมดอ่านได้อย่างถูกต้อง แต่ข้อมูลธุรกรรมหรือรายการสมุดที่อยู่อาจหายไปหรือไม่ถูกต้อง</translation>
     </message>
+    <message>
+        <source>Error: Dumpfile format record is incorrect. Got "%s", expected "format".</source>
+        <translation>ข้อผิดพลาด: บันทึกรูปแบบไฟล์ดัมป์ไม่ถูกต้อง ได้รับ "%s" คาดว่า "format"</translation>
+    </message>
+    <message>
+        <source>Error: Dumpfile identifier record is incorrect. Got "%s", expected "%s".</source>
+        <translation>ข้อผิดพลาด: บันทึกตัวระบุไฟล์ดัมป์ไม่ถูกต้อง ได้รับ "%s" คาดว่า "%s"</translation>
+    </message>
+    <message>
+        <source>Error: Dumpfile version is not supported. This version of bitcoin-wallet only supports version 1 dumpfiles. Got dumpfile with version %s</source>
+        <translation>ข้อผิดพลาด: ไม่รองรับเวอร์ชันไฟล์ดัมป์ เวอร์ชันนี้ของ bitcoin-wallet รองรับเฉพาะไฟล์ดัมป์เวอร์ชัน 1 ได้รับไฟล์ดัมป์เวอร์ชัน %s</translation>
+    </message>
+    <message>
+        <source>Failed to rename invalid peers.dat file. Please move or delete it and try again.</source>
+        <translation>ล้มเหลวในการเปลี่ยนชื่อไฟล์ peers.dat ที่ไม่ถูกต้อง โปรดย้ายหรือลบแล้วลองอีกครั้ง</translation>
+    </message>
+    <message>
+        <source>Fee estimation failed. Fallbackfee is disabled. Wait a few blocks or enable %s.</source>
+        <translation>การประมาณค่าธรรมเนียมล้มเหลว Fallbackfee ถูกปิดการใช้งาน รอสองสามบล็อกหรือเปิดใช้งาน %s</translation>
+    </message>
+    <message>
+        <source>File %s already exists. If you are sure this is what you want, move it out of the way first.</source>
+        <translation>ไฟล์ %s มีอยู่แล้ว ถ้าคุณแน่ใจว่านี่คือสิ่งที่คุณต้องการ ให้ย้ายออกจากทางก่อน</translation>
+    </message>
+    <message>
+        <source>Incompatible options: -dnsseed=1 was explicitly specified, but -onlynet forbids connections to IPv4/IPv6</source>
+        <translation>ตัวเลือกที่เข้ากันไม่ได้: -dnsseed=1 ถูกระบุอย่างชัดเจน แต่ -onlynet ห้ามการเชื่อมต่อกับ IPv4/IPv6</translation>
+    </message>
     <message>
         <source>Incorrect or no devnet genesis block found. Wrong datadir for devnet specified?</source>
         <translation>ไม่พบหรือไม่พบแหล่งกำเนิด devnet genesis  ระบุข้อมูลที่ผิดสำหรับ devnet  หรือไม่ ?</translation>
     </message>
+    <message>
+        <source>Invalid amount for %s=&lt;amount&gt;: '%s' (must be at least the minrelay fee of %s to prevent stuck transactions)</source>
+        <translation>จำนวนเงินไม่ถูกต้องสำหรับ %s=&lt;amount&gt;: '%s' (ต้องอย่างน้อยค่าธรรมเนียม minrelay %s เพื่อป้องกันธุรกรรมค้าง)</translation>
+    </message>
+    <message>
+        <source>Invalid or corrupt peers.dat (%s). If you believe this is a bug, please report it to %s. As a workaround, you can move the file (%s) out of the way (rename, move, or delete) to have a new one created on the next start.</source>
+        <translation>ไฟล์ peers.dat ไม่ถูกต้องหรือเสียหาย (%s) หากคุณเชื่อว่านี่เป็นบั๊ก โปรดรายงานไปที่ %s วิธีแก้ปัญหาชั่วคราว คุณสามารถย้ายไฟล์ (%s) ออกจากทาง (เปลี่ยนชื่อ ย้าย หรือลบ) เพื่อสร้างไฟล์ใหม่ในการเริ่มครั้งถัดไป</translation>
+    </message>
+    <message>
+        <source>No dump file provided. To use createfromdump, -dumpfile=&lt;filename&gt; must be provided.</source>
+        <translation>ไม่มีไฟล์ดัมป์ เพื่อใช้ createfromdump ต้องระบุ -dumpfile=&lt;filename&gt;</translation>
+    </message>
+    <message>
+        <source>No dump file provided. To use dump, -dumpfile=&lt;filename&gt; must be provided.</source>
+        <translation>ไม่มีไฟล์ดัมป์ เพื่อใช้ dump ต้องระบุ -dumpfile=&lt;filename&gt;</translation>
+    </message>
+    <message>
+        <source>No wallet file format provided. To use createfromdump, -format=&lt;format&gt; must be provided.</source>
+        <translation>ไม่ได้ระบุรูปแบบไฟล์กระเป๋าเงิน เพื่อใช้ createfromdump ต้องระบุ -format=&lt;format&gt;</translation>
+    </message>
+    <message>
+        <source>Outbound connections restricted to CJDNS (-onlynet=cjdns) but -cjdnsreachable is not provided</source>
+        <translation>การเชื่อมต่อขาออกจำกัดเฉพาะ CJDNS (-onlynet=cjdns) แต่ไม่ได้ระบุ -cjdnsreachable</translation>
+    </message>
+    <message>
+        <source>Outbound connections restricted to Tor (-onlynet=onion) but the proxy for reaching the Tor network is explicitly forbidden: -onion=0</source>
+        <translation>การเชื่อมต่อขาออกจำกัดเฉพาะ Tor (-onlynet=onion) แต่พร็อกซีสำหรับเข้าถึงเครือข่าย Tor ถูกห้ามอย่างชัดเจน: -onion=0</translation>
+    </message>
+    <message>
+        <source>Outbound connections restricted to Tor (-onlynet=onion) but the proxy for reaching the Tor network is not provided: none of -proxy, -onion or -listenonion is given</source>
+        <translation>การเชื่อมต่อขาออกจำกัดเฉพาะ Tor (-onlynet=onion) แต่ไม่ได้ระบุพร็อกซีสำหรับเข้าถึงเครือข่าย Tor: ไม่ได้ระบุ -proxy, -onion หรือ -listenonion</translation>
+    </message>
+    <message>
+        <source>Outbound connections restricted to i2p (-onlynet=i2p) but -i2psam is not provided</source>
+        <translation>การเชื่อมต่อขาออกจำกัดเฉพาะ i2p (-onlynet=i2p) แต่ไม่ได้ระบุ -i2psam</translation>
+    </message>
     <message>
         <source>Please check that your computer's date and time are correct! If your clock is wrong, %s will not work properly.</source>
         <translation>โปรดตรวจสอบว่าวันที่และเวลาของคอมพิวเตอร์ของคุณถูกต้อง! ถ้านาฬิกาของคุณไม่ตรง %s มันจะทำงานได้ไม่ถูกต้อง</translation>
@@ -4439,6 +5870,14 @@ Go to File &gt; Open Wallet to load a wallet.
         <source>Please contribute if you find %s useful. Visit %s for further information about the software.</source>
         <translation>โปรดให้การสนับสนุนหากคุณพบ %s ที่เป็นประโยชน์ ไปที่ %s เพื่อดูข้อมูลเพิ่มเติมเกี่ยวกับซอฟต์แวร์</translation>
     </message>
+    <message>
+        <source>Prune mode is incompatible with -reindex-chainstate. Use full -reindex instead.</source>
+        <translation>โหมด Prune ใช้งานร่วมกับ -reindex-chainstate ไม่ได้ ใช้ -reindex แบบเต็มแทน</translation>
+    </message>
+    <message>
+        <source>This is the maximum transaction fee you pay (in addition to the normal fee) to prioritize partial spend avoidance over regular coin selection.</source>
+        <translation>นี่คือค่าธรรมเนียมธุรกรรมสูงสุดที่คุณจ่าย (นอกเหนือจากค่าธรรมเนียมปกติ) เพื่อจัดลำดับความสำคัญการหลีกเลี่ยงการใช้จ่ายบางส่วนเหนือการเลือกเหรียญปกติ</translation>
+    </message>
     <message>
         <source>This is the transaction fee you may discard if change is smaller than dust at this level</source>
         <translation>นี่คือค่าธรรมเนียมการทำธุรกรรมที่คุณอาจจะละทิ้ง ถ้าการเปลี่ยนแปลงเล็กกว่า dust ในเลเวลนี้</translation>
@@ -4447,14 +5886,38 @@ Go to File &gt; Open Wallet to load a wallet.
         <source>This is the transaction fee you may pay when fee estimates are not available.</source>
         <translation>นี่คือค่าธรรมเนียมการทำธุรกรรมที่คุณอาจจะต้องจ่าย เมื่อประมาณการค่าบริการไม่พร้อมใช้งาน</translation>
     </message>
+    <message>
+        <source>Transaction requires one destination of non-0 value, a non-0 feerate, or a pre-selected input</source>
+        <translation>ธุรกรรมต้องการปลายทางหนึ่งที่มีค่าไม่เป็น 0 อัตราค่าธรรมเนียมที่ไม่เป็น 0 หรืออินพุตที่เลือกไว้ล่วงหน้า</translation>
+    </message>
     <message>
         <source>Unable to replay blocks. You will need to rebuild the database using -reindex-chainstate.</source>
         <translation>ไม่สามารถ replay blocks คุณจะต้องสร้างฐานข้อมูลโดยใช้ -reindex-chainstate</translation>
     </message>
+    <message>
+        <source>Unknown wallet file format "%s" provided. Please provide one of "bdb" or "sqlite".</source>
+        <translation>ระบุรูปแบบไฟล์กระเป๋าเงินที่ไม่รู้จัก "%s" โปรดระบุ "bdb" หรือ "sqlite"</translation>
+    </message>
+    <message>
+        <source>Unsupported chainstate database format found. Please restart with -reindex-chainstate. This will rebuild the chainstate database.</source>
+        <translation>พบรูปแบบฐานข้อมูล chainstate ที่ไม่รองรับ โปรดรีสตาร์ทด้วย -reindex-chainstate สิ่งนี้จะสร้างฐานข้อมูล chainstate ใหม่</translation>
+    </message>
+    <message>
+        <source>Warning: Dumpfile wallet format "%s" does not match command line specified format "%s".</source>
+        <translation>คำเตือน: รูปแบบกระเป๋าเงินไฟล์ดัมป์ "%s" ไม่ตรงกับรูปแบบที่ระบุในบรรทัดคำสั่ง "%s"</translation>
+    </message>
     <message>
         <source>Warning: Private keys detected in wallet {%s} with disabled private keys</source>
         <translation>คำเตือน: คีย์ส่วนตัวที่ตรวจพบในกระเป๋าเงิน {%s} พร้อมคีย์ส่วนตัวปิดใช้งาน</translation>
     </message>
+    <message>
+        <source>You need to rebuild the database using -reindex to enable -timestampindex</source>
+        <translation>คุณต้องสร้างฐานข้อมูลใหม่โดยใช้ -reindex เพื่อเปิดใช้งาน -timestampindex</translation>
+    </message>
+    <message>
+        <source>%s -- Incorrect seed, it should be a hex string</source>
+        <translation>%s -- Seed ไม่ถูกต้อง ควรเป็นสตริง hex</translation>
+    </message>
     <message>
         <source>%s is not a valid backup folder!</source>
         <translation>%s ไม่ใช่โฟลเดอร์สำรองที่ถูกต้อง!</translation>
@@ -4479,10 +5942,30 @@ Go to File &gt; Open Wallet to load a wallet.
         <source>-rpcport must be specified when -devnet and -server are specified</source>
         <translation>-rpcport ควรระบุเฉพาะเมื่อระบุ -devnet และ -server</translation>
     </message>
+    <message>
+        <source>-statsbatchsize cannot be configured with a negative value.</source>
+        <translation>-statsbatchsize ไม่สามารถกำหนดค่าเป็นค่าลบได้</translation>
+    </message>
+    <message>
+        <source>-statsduration cannot be configured with a negative value.</source>
+        <translation>-statsduration ไม่สามารถกำหนดค่าเป็นค่าลบได้</translation>
+    </message>
     <message>
         <source>A fatal internal error occurred, see debug.log for details</source>
         <translation>เกิดข้อผิดพลาดภายในที่ร้ายแรงให้ดูที่ debug.log สำหรับรายละเอียด</translation>
     </message>
+    <message>
+        <source>Cannot create socket (socket() returned error %s)</source>
+        <translation>ไม่สามารถสร้างซ็อกเก็ต (socket() ส่งคืนข้อผิดพลาด %s)</translation>
+    </message>
+    <message>
+        <source>Cannot get socket address for %s</source>
+        <translation>ไม่สามารถรับที่อยู่ซ็อกเก็ตสำหรับ %s</translation>
+    </message>
+    <message>
+        <source>Cannot init Statsd client</source>
+        <translation>ไม่สามารถเริ่มต้นไคลเอนต์ Statsd</translation>
+    </message>
     <message>
         <source>Cannot resolve -%s address: '%s'</source>
         <translation>ไม่สามารถแก้ไขได้ -%s ที่อยู่: '%s'</translation>
@@ -4491,10 +5974,6 @@ Go to File &gt; Open Wallet to load a wallet.
         <source>Cannot write to data directory '%s'; check permissions.</source>
         <translation>ไม่สามารถเขียนไปยังไดเรกทอรีข้อมูล '%s'; ตรวจสอบการอนุญาต</translation>
     </message>
-    <message>
-        <source>Change index out of range</source>
-        <translation>ปรับเปลี่ยนดัชนีนอกช่วง</translation>
-    </message>
     <message>
         <source>Copyright (C)</source>
         <translation>ลิขสิทธิ์ (C)</translation>
@@ -4503,6 +5982,14 @@ Go to File &gt; Open Wallet to load a wallet.
         <source>Disk space is too low!</source>
         <translation>พื้นที่ดิสก์ต่ำเกินไป!</translation>
     </message>
+    <message>
+        <source>Dump file %s does not exist.</source>
+        <translation>ไฟล์ดัมป์ %s ไม่มีอยู่</translation>
+    </message>
+    <message>
+        <source>Error creating %s</source>
+        <translation>ข้อผิดพลาดในการสร้าง %s</translation>
+    </message>
     <message>
         <source>Error loading %s</source>
         <translation>เกิดข้อผิดพลาดในการโหลด %s</translation>
@@ -4520,8 +6007,8 @@ Go to File &gt; Open Wallet to load a wallet.
         <translation>เกิดข้อผิดพลาดในการโหลด %s: คุณไม่สามารถปิดการใช้งาน HD บน HD wallet ที่มีอยู่แล้ว</translation>
     </message>
     <message>
-        <source>Error upgrading chainstate database</source>
-        <translation>เกิดข้อผิดพลาดในการอัพเกรดฐานข้อมูล chainstate</translation>
+        <source>Error reading next record from wallet database</source>
+        <translation>ข้อผิดพลาดในการอ่านบันทึกถัดไปจากฐานข้อมูลกระเป๋าเงิน</translation>
     </message>
     <message>
         <source>Loading P2P addresses…</source>
@@ -4591,6 +6078,14 @@ Go to File &gt; Open Wallet to load a wallet.
         <source>Inputs vs outputs size mismatch.</source>
         <translation>ขนาดของ inputs และ outputs ไม่สัมพันธ์กัน</translation>
     </message>
+    <message>
+        <source>Invalid '%s'. Allowed values: 128, 160, 192, 224, 256.</source>
+        <translation>'%s' ไม่ถูกต้อง ค่าที่อนุญาต: 128, 160, 192, 224, 256</translation>
+    </message>
+    <message>
+        <source>Invalid -i2psam address or hostname: '%s'</source>
+        <translation>ที่อยู่ -i2psam หรือชื่อโฮสต์ไม่ถูกต้อง: '%s'</translation>
+    </message>
     <message>
         <source>Invalid -onion address or hostname: '%s'</source>
         <translation>ที่อยู่ - onion หรือ hostname ไม่ถูกต้อง: '%s'</translation>
@@ -4635,14 +6130,78 @@ Go to File &gt; Open Wallet to load a wallet.
         <source>%s corrupt. Try using the wallet tool dash-wallet to salvage or restoring a backup.</source>
         <translation>%s ทุจริต ลองใช้ wallet tool dash-wallet เพื่อกอบกู้หรือกู้คืนการสำรองข้อมูล</translation>
     </message>
+    <message>
+        <source>%s is set very high! Fees this large could be paid on a single transaction.</source>
+        <translation>%s ถูกตั้งค่าสูงมาก! ค่าธรรมเนียมขนาดนี้อาจจ่ายในธุรกรรมเดียว</translation>
+    </message>
+    <message>
+        <source>%s request to listen on port %u. This port is considered "bad" and thus it is unlikely that any Dash Core peers connect to it. See doc/p2p-bad-ports.md for details and a full list.</source>
+        <translation>%s ขอให้รับฟังที่พอร์ต %u พอร์ตนี้ถือว่า "ไม่ดี" ดังนั้นไม่น่าจะมีเพียร์ Dash Core ใดเชื่อมต่อกับมัน ดูรายละเอียดและรายการทั้งหมดที่ doc/p2p-bad-ports.md</translation>
+    </message>
+    <message>
+        <source>Cannot provide specific connections and have addrman find outgoing connections at the same time.</source>
+        <translation>ไม่สามารถให้การเชื่อมต่อเฉพาะและให้ addrman ค้นหาการเชื่อมต่อขาออกในเวลาเดียวกัน</translation>
+    </message>
+    <message>
+        <source>Failed to upgrade Evo database</source>
+        <translation>ล้มเหลวในการอัปเกรดฐานข้อมูล Evo</translation>
+    </message>
+    <message>
+        <source>Fee needed &gt; fee paid</source>
+        <translation>ค่าธรรมเนียมที่ต้องการ &gt; ค่าธรรมเนียมที่จ่าย</translation>
+    </message>
+    <message>
+        <source>Host %s on unsupported network</source>
+        <translation>โฮสต์ %s บนเครือข่ายที่ไม่รองรับ</translation>
+    </message>
+    <message>
+        <source>Invalid amount for %s=&lt;amount&gt;: '%s' (must be at least %s)</source>
+        <translation>จำนวนเงินไม่ถูกต้องสำหรับ %s=&lt;amount&gt;: '%s' (ต้องอย่างน้อย %s)</translation>
+    </message>
+    <message>
+        <source>Invalid amount for %s=&lt;amount&gt;: '%s'</source>
+        <translation>จำนวนเงินไม่ถูกต้องสำหรับ %s=&lt;amount&gt;: '%s'</translation>
+    </message>
+    <message>
+        <source>Invalid port specified in %s: '%s'</source>
+        <translation>ระบุพอร์ตที่ไม่ถูกต้องใน %s: '%s'</translation>
+    </message>
     <message>
         <source>Last successful action was too recent.</source>
         <translation>การกระทำที่ประสบความสำเร็จล่าสุดเป็นข้อมูลล่าสุด</translation>
     </message>
+    <message>
+        <source>Missing solving data for estimating transaction size</source>
+        <translation>ขาดข้อมูลการแก้ปัญหาสำหรับการประมาณขนาดธุรกรรม</translation>
+    </message>
+    <message>
+        <source>No host specified</source>
+        <translation>ไม่ได้ระบุโฮสต์</translation>
+    </message>
+    <message>
+        <source>No host specified, malformed URL</source>
+        <translation>ไม่ได้ระบุโฮสต์ URL มีรูปแบบไม่ถูกต้อง</translation>
+    </message>
+    <message>
+        <source>No text before the scheme delimiter, malformed URL</source>
+        <translation>ไม่มีข้อความก่อนตัวคั่น scheme URL มีรูปแบบไม่ถูกต้อง</translation>
+    </message>
+    <message>
+        <source>Port must be between %d and %d, supplied %d</source>
+        <translation>พอร์ตต้องอยู่ระหว่าง %d และ %d ระบุ %d</translation>
+    </message>
+    <message>
+        <source>Socket not initialized, cannot send message</source>
+        <translation>ซ็อกเก็ตไม่เริ่มต้น ไม่สามารถส่งข้อความ</translation>
+    </message>
     <message>
         <source>The source code is available from %s.</source>
         <translation>ซอร์สโค้ดที่ใช้ได้จาก %s</translation>
     </message>
+    <message>
+        <source>The specified config file %s does not exist</source>
+        <translation>ไฟล์กำหนดค่าที่ระบุ %s ไม่มีอยู่</translation>
+    </message>
     <message>
         <source>The transaction amount is too small to pay the fee</source>
         <translation>จำนวนเงินที่ทำธุรกรรมมีน้อยเกินไปที่จะจ่ายค่าธรรมเนียม</translation>
@@ -4663,6 +6222,10 @@ Go to File &gt; Open Wallet to load a wallet.
         <source>Transaction fees are too high.</source>
         <translation>ค่าธรรมเนียมการทำธุรกรรมสูงเกินไป</translation>
     </message>
+    <message>
+        <source>Transaction needs a change address, but we can't generate it.</source>
+        <translation>ธุรกรรมต้องการที่อยู่เงินทอน แต่เราไม่สามารถสร้างได้</translation>
+    </message>
     <message>
         <source>Transaction not valid.</source>
         <translation>ธุรกรรมไม่ถูกต้อง</translation>
@@ -4683,6 +6246,18 @@ Go to File &gt; Open Wallet to load a wallet.
         <source>Unable to locate enough non-denominated funds for this transaction.</source>
         <translation>ไม่สามารถหาเงินทุนที่ไม่ใช่สกุลเงินที่ระบุได้มากพอสำหรับธุรกรรมนี้</translation>
     </message>
+    <message>
+        <source>Unable to lookup host %s</source>
+        <translation>ไม่สามารถค้นหาโฮสต์ %s</translation>
+    </message>
+    <message>
+        <source>Unable to parse -maxuploadtarget: '%s'</source>
+        <translation>ไม่สามารถแยกวิเคราะห์ -maxuploadtarget: '%s'</translation>
+    </message>
+    <message>
+        <source>Unable to send message to %s (::sendto() returned error %s)</source>
+        <translation>ไม่สามารถส่งข้อความไปยัง %s (::sendto() ส่งคืนข้อผิดพลาด %s)</translation>
+    </message>
     <message>
         <source>Unable to sign spork message, wrong key?</source>
         <translation>ไม่สามารถลงชื่อเข้าใช้ข้อความ spork ได้  คีย์ผิดหรือไม่?</translation>
@@ -4695,6 +6270,10 @@ Go to File &gt; Open Wallet to load a wallet.
         <source>Unknown state: id = %u</source>
         <translation>ไม่ทราบสถานะ : ไอดี = %u</translation>
     </message>
+    <message>
+        <source>Unsupported URL scheme, must begin with udp://</source>
+        <translation>โครงสร้าง URL ที่ไม่รองรับ ต้องเริ่มด้วย udp://</translation>
+    </message>
     <message>
         <source>Unsupported logging category %s=%s.</source>
         <translation>การบันทึกประเภทที่ไม่ได้รับการสนับสนุน %s=%s</translation>
@@ -4727,9 +6306,25 @@ Go to File &gt; Open Wallet to load a wallet.
         <source>You can not disable governance validation on a masternode.</source>
         <translation>คุณไม่สามารถตรวจสอบการกำกับดูแลปิดการใช้งานบน masternode</translation>
     </message>
+    <message>
+        <source>You need to rebuild the database using -reindex to enable -addressindex</source>
+        <translation>คุณต้องสร้างฐานข้อมูลใหม่โดยใช้ -reindex เพื่อเปิดใช้งาน -addressindex</translation>
+    </message>
+    <message>
+        <source>You need to rebuild the database using -reindex to enable -spentindex</source>
+        <translation>คุณต้องสร้างฐานข้อมูลใหม่โดยใช้ -reindex เพื่อเปิดใช้งาน -spentindex</translation>
+    </message>
     <message>
         <source>Your entries added successfully.</source>
         <translation>เพิ่มรายการของคุณเรียบร้อยแล้ว</translation>
     </message>
-    </context>
+    <message>
+        <source>Settings file could not be read</source>
+        <translation>ไม่สามารถอ่านไฟล์การตั้งค่า</translation>
+    </message>
+    <message>
+        <source>Settings file could not be written</source>
+        <translation>ไม่สามารถเขียนไฟล์การตั้งค่า</translation>
+    </message>
+</context>
 </TS>
\ No newline at end of file

From 0970d9bb459374024353652b973b4376983111f8 Mon Sep 17 00:00:00 2001
From: UdjinM6 <UdjinM6@users.noreply.github.com>
Date: Sat, 25 Oct 2025 15:23:59 +0300
Subject: [PATCH 335/656] ar

---
 src/qt/locale/dash_ar.ts | 2065 +++++++++++++++++++++++++++++++++-----
 1 file changed, 1823 insertions(+), 242 deletions(-)

diff --git a/src/qt/locale/dash_ar.ts b/src/qt/locale/dash_ar.ts
index 4eace44ef83b..74616178f2b5 100644
--- a/src/qt/locale/dash_ar.ts
+++ b/src/qt/locale/dash_ar.ts
@@ -65,14 +65,6 @@
         <source>C&amp;hoose</source>
         <translation>اختر </translation>
     </message>
-    <message>
-        <source>Sending addresses</source>
-        <translation>عناوين إرسال </translation>
-    </message>
-    <message>
-        <source>Receiving addresses</source>
-        <translation>عناوين الاستقبال </translation>
-    </message>
     <message>
         <source>These are your Dash addresses for sending payments. Always check the amount and the receiving address before sending coins.</source>
         <translation>هذه هي عناوين داش التابعة لك من أجل إرسال الدفعات. تحقق دائما من المبلغ و عنوان المرسل المستقبل قبل إرسال العملات </translation>
@@ -94,8 +86,8 @@
         <translation>تعديل </translation>
     </message>
     <message>
-        <source>&amp;Show address QR code</source>
-        <translation>&amp; إظهار رمز الاستجابة السريعة العنوان</translation>
+        <source>Show address &amp;QR code</source>
+        <translation>عرض رمز &amp;QR للعنوان</translation>
     </message>
     <message>
         <source>QR code</source>
@@ -105,6 +97,24 @@
         <source>Export Address List</source>
         <translation>تصدير قائمة العناوين</translation>
     </message>
+    <message>
+        <source>Comma separated file</source>
+        <extracomment>Expanded name of the CSV file format. See: https://en.wikipedia.org/wiki/Comma-separated_values.</extracomment>
+        <translation>ملف مفصول بفواصل</translation>
+    </message>
+    <message>
+        <source>There was an error trying to save the address list to %1. Please try again.</source>
+        <extracomment>An error message. %1 is a stand-in argument for the name of the file we attempted to save to.</extracomment>
+        <translation>حدث خطأ أثناء محاولة حفظ قائمة العناوين إلى %1. يرجى المحاولة مرة أخرى.</translation>
+    </message>
+    <message>
+        <source>Sending addresses - %1</source>
+        <translation>عناوين الإرسال - %1</translation>
+    </message>
+    <message>
+        <source>Receiving addresses - %1</source>
+        <translation>عناوين الاستقبال - %1</translation>
+    </message>
     <message>
         <source>Exporting Failed</source>
         <translation>فشل التصدير</translation>
@@ -274,10 +284,22 @@
         <source>The passphrase entered for the wallet decryption was incorrect.</source>
         <translation>كلمة المرور التي تم إدخالها لفك تشفير المحفظة غير صحيحة</translation>
     </message>
+    <message>
+        <source>The passphrase entered for the wallet decryption is incorrect. It contains a null character (ie - a zero byte). If the passphrase was set with a version of this software prior to 23.0, please try again with only the characters up to — but not including — the first null character. If this is successful, please set a new passphrase to avoid this issue in the future.</source>
+        <translation>عبارة المرور المدخلة لفك تشفير المحفظة غير صحيحة. تحتوي على حرف فارغ (أي بايت صفري). إذا تم تعيين عبارة المرور بإصدار من هذا البرنامج قبل 23.0، يرجى المحاولة مرة أخرى بالأحرف فقط حتى — ولكن ليس بما في ذلك — الحرف الفارغ الأول. إذا نجح هذا، يرجى تعيين عبارة مرور جديدة لتجنب هذه المشكلة في المستقبل.</translation>
+    </message>
     <message>
         <source>Wallet passphrase was successfully changed.</source>
         <translation>لقد تم تغير عبارة مرور المحفظة بنجاح</translation>
     </message>
+    <message>
+        <source>Passphrase change failed</source>
+        <translation>فشل تغيير عبارة المرور</translation>
+    </message>
+    <message>
+        <source>The old passphrase entered for the wallet decryption is incorrect. It contains a null character (ie - a zero byte). If the passphrase was set with a version of this software prior to 23.0, please try again with only the characters up to — but not including — the first null character.</source>
+        <translation>عبارة المرور القديمة المدخلة لفك تشفير المحفظة غير صحيحة. تحتوي على حرف فارغ (أي بايت صفري). إذا تم تعيين عبارة المرور بإصدار من هذا البرنامج قبل 23.0، يرجى المحاولة مرة أخرى بالأحرف فقط حتى — ولكن ليس بما في ذلك — الحرف الفارغ الأول.</translation>
+    </message>
     <message>
         <source>Warning: The Caps Lock key is on!</source>
         <translation>تحذير: مفتاح الحروف الكبيرة مفعل</translation>
@@ -303,7 +325,23 @@
 </context>
 <context>
     <name>BitcoinApplication</name>
-    </context>
+    <message>
+        <source>Runaway exception</source>
+        <translation>استثناء هارب</translation>
+    </message>
+    <message>
+        <source>A fatal error occurred. %1 can no longer continue safely and will quit.</source>
+        <translation>حدث خطأ فادح. لا يمكن لـ %1 المتابعة بأمان وسيتم الإنهاء.</translation>
+    </message>
+    <message>
+        <source>Internal error</source>
+        <translation>خطأ داخلي</translation>
+    </message>
+    <message>
+        <source>An internal error occurred. %1 will attempt to continue safely. This is an unexpected bug which can be reported as described below.</source>
+        <translation>حدث خطأ داخلي. سيحاول %1 المتابعة بأمان. هذا خطأ غير متوقع يمكن الإبلاغ عنه كما هو موضح أدناه.</translation>
+    </message>
+</context>
 <context>
     <name>BitcoinGUI</name>
     <message>
@@ -330,6 +368,10 @@
         <source>Request payments (generates QR codes and dash: URIs)</source>
         <translation>أطلب دفعات (يولد كودات الرمز المربع وبيت كوين: العناوين المعطاة)</translation>
     </message>
+    <message>
+        <source>Ctrl+Q</source>
+        <translation>Ctrl+Q</translation>
+    </message>
     <message>
         <source>&amp;Options…</source>
         <translation>خيارات</translation>
@@ -358,6 +400,10 @@
         <source>&amp;Verify message…</source>
         <translation>التحقق من الرسالة</translation>
     </message>
+    <message>
+        <source>&amp;Load PSBT from file…</source>
+        <translation>&amp;تحميل PSBT من ملف…</translation>
+    </message>
     <message>
         <source>&amp;Sending addresses</source>
         <translation>&amp;عناوين الإرسال</translation>
@@ -390,10 +436,6 @@
         <source>&amp;Window</source>
         <translation>&amp;نافذة</translation>
     </message>
-    <message>
-        <source>Minimize</source>
-        <translation>تصغير</translation>
-    </message>
     <message>
         <source>Zoom</source>
         <translation>تكبير</translation>
@@ -446,14 +488,6 @@
         <source>Modify configuration options for %1</source>
         <translation>تغيير خيارات الإعداد لأساس ل %1</translation>
     </message>
-    <message>
-        <source>&amp;Show / Hide</source>
-        <translation>عرض / اخفاء</translation>
-    </message>
-    <message>
-        <source>Show or hide the main Window</source>
-        <translation>عرض او اخفاء النافذة الرئيسية</translation>
-    </message>
     <message>
         <source>Encrypt the private keys that belong to your wallet</source>
         <translation>تشفير المفتاح الخاص بمحفظتك</translation>
@@ -518,10 +552,6 @@
         <source>Show wallet repair options</source>
         <translation>عرض خيارات إصلاح المحفظة</translation>
     </message>
-    <message>
-        <source>Open Wallet &amp;Configuration File</source>
-        <translation>فتح ملف المحفظة والتهيئة</translation>
-    </message>
     <message>
         <source>Open configuration file</source>
         <translation>افتح ملف التهيئة</translation>
@@ -576,10 +606,40 @@
         <source>Show information about %1</source>
         <translation>إظهار معلومات حول%1</translation>
     </message>
+    <message>
+        <source>Load PSBT from &amp;clipboard…</source>
+        <translation>تحميل PSBT من &amp;الحافظة…</translation>
+    </message>
+    <message>
+        <source>Open debugging and diagnostic console</source>
+        <translation>فتح وحدة تحكم التصحيح والتشخيص</translation>
+    </message>
+    <message>
+        <source>Open &amp;wallet configuration file</source>
+        <translation>فتح &amp;ملف تكوين المحفظة</translation>
+    </message>
+    <message>
+        <source>Open a dash: URI</source>
+        <translation>فتح dash: URI</translation>
+    </message>
     <message>
         <source>Create a new wallet</source>
         <translation>أنشئ محفظة جديدة</translation>
     </message>
+    <message>
+        <source>Restore Wallet…</source>
+        <extracomment>Name of the menu item that restores wallet from a backup file.</extracomment>
+        <translation>استعادة المحفظة…</translation>
+    </message>
+    <message>
+        <source>Restore a wallet from a backup file</source>
+        <extracomment>Status tip for Restore Wallet menu item</extracomment>
+        <translation>استعادة محفظة من ملف نسخ احتياطي</translation>
+    </message>
+    <message>
+        <source>Close all wallets</source>
+        <translation>إغلاق جميع المحافظ</translation>
+    </message>
     <message>
         <source>%1 &amp;information</source>
         <translation>%1 معلومات</translation>
@@ -588,10 +648,42 @@
         <source>Show the %1 basic information</source>
         <translation>عرض %1 المعلومات الرئيسية</translation>
     </message>
+    <message>
+        <source>&amp;Discreet mode</source>
+        <translation>&amp;الوضع السري</translation>
+    </message>
+    <message>
+        <source>Mask the values in the Overview tab</source>
+        <translation>إخفاء القيم في علامة التبويب نظرة عامة</translation>
+    </message>
+    <message>
+        <source>Wallet Data</source>
+        <extracomment>Name of the wallet data file format.</extracomment>
+        <translation>بيانات المحفظة</translation>
+    </message>
+    <message>
+        <source>Load Wallet Backup</source>
+        <extracomment>The title for Restore Wallet File Windows</extracomment>
+        <translation>تحميل نسخة احتياطية للمحفظة</translation>
+    </message>
+    <message>
+        <source>Restore Wallet</source>
+        <extracomment>Title of pop-up window shown when the user is attempting to restore a wallet.</extracomment>
+        <translation>استعادة المحفظة</translation>
+    </message>
+    <message>
+        <source>Wallet Name</source>
+        <extracomment>Label of the input field where the name of the wallet is entered.</extracomment>
+        <translation>اسم المحفظة</translation>
+    </message>
     <message>
         <source>&amp;Settings</source>
         <translation>الإعدادات</translation>
     </message>
+    <message>
+        <source>&amp;Minimize</source>
+        <translation>&amp;تصغير</translation>
+    </message>
     <message>
         <source>&amp;Help</source>
         <translation>مساعدة</translation>
@@ -608,8 +700,17 @@
         <source>View Governance Proposals</source>
         <translation>عرض مقترحات الحوكمة</translation>
     </message>
+    <message>
+        <source>&amp;Hide</source>
+        <translation>&amp;إخفاء</translation>
+    </message>
+    <message>
+        <source>S&amp;how</source>
+        <translation>إ&amp;ظهار</translation>
+    </message>
     <message numerus="yes">
         <source>%n active connection(s) to Dash network</source>
+        <extracomment>A substring of the tooltip.</extracomment>
         <translation><numerusform>%n اتصالات نشطة بشبكة داش</numerusform><numerusform>%n اتصالات نشطة بشبكة داش</numerusform><numerusform>%n اتصالات نشطة بشبكة داش</numerusform><numerusform>%n اتصالات نشطة بشبكة داش</numerusform><numerusform>%n اتصالات نشطة بشبكة داش</numerusform><numerusform>%n اتصالات نشطة بشبكة داش</numerusform></translation>
     </message>
     <message>
@@ -628,10 +729,50 @@
         <source>Close Wallet…</source>
         <translation>إغلاق المحفظة …</translation>
     </message>
+    <message>
+        <source>Load Partially Signed Blockchain Transaction</source>
+        <translation>تحميل معاملة بلوكتشين موقعة جزئياً</translation>
+    </message>
+    <message>
+        <source>Load Partially Signed Blockchain Transaction from clipboard</source>
+        <translation>تحميل معاملة بلوكتشين موقعة جزئياً من الحافظة</translation>
+    </message>
     <message>
         <source>Create Wallet…</source>
         <translation>إنشاء المحفظة …</translation>
     </message>
+    <message>
+        <source>Close All Wallets…</source>
+        <translation>إغلاق جميع المحافظ…</translation>
+    </message>
+    <message>
+        <source>Ctrl+Shift+D</source>
+        <translation>Ctrl+Shift+D</translation>
+    </message>
+    <message>
+        <source>Ctrl+M</source>
+        <translation>Ctrl+M</translation>
+    </message>
+    <message>
+        <source>Click for more actions.</source>
+        <extracomment>A substring of the tooltip. "More actions" are available via the context menu.</extracomment>
+        <translation>انقر للمزيد من الإجراءات.</translation>
+    </message>
+    <message>
+        <source>Show Peers tab</source>
+        <extracomment>A context menu item. The "Peers tab" is an element of the "Node window".</extracomment>
+        <translation>إظهار علامة تبويب النظراء</translation>
+    </message>
+    <message>
+        <source>Disable network activity</source>
+        <extracomment>A context menu item.</extracomment>
+        <translation>تعطيل نشاط الشبكة</translation>
+    </message>
+    <message>
+        <source>Enable network activity</source>
+        <extracomment>A context menu item. The network activity was disabled previously.</extracomment>
+        <translation>تفعيل نشاط الشبكة</translation>
+    </message>
     <message>
         <source>Syncing Headers (%1%)…</source>
         <translation>مزامنة الرؤوس (%1%) …</translation>
@@ -648,10 +789,6 @@
         <source>Processing blocks on disk…</source>
         <translation>معالجة الكتل على القرص…</translation>
     </message>
-    <message>
-        <source>Reindexing blocks on disk…</source>
-        <translation>إعادة الفهرسة الكتل على القرص …</translation>
-    </message>
     <message>
         <source>Connecting to peers…</source>
         <translation>اتصال إلي القرناء…</translation>
@@ -805,10 +942,6 @@
         <source>Coin Selection</source>
         <translation>اختيار عملة</translation>
     </message>
-    <message>
-        <source>Dust:</source>
-        <translation>غبار:</translation>
-    </message>
     <message>
         <source>After Fee:</source>
         <translation>بعد الرسوم:</translation>
@@ -866,28 +999,32 @@
         <translation>تم تأكيد</translation>
     </message>
     <message>
-        <source>Copy address</source>
-        <translation>نسخ عنوان</translation>
+        <source>Copy amount</source>
+        <translation>مبلغ النسخ</translation>
+    </message>
+    <message>
+        <source>&amp;Copy address</source>
+        <translation>&amp;نسخ العنوان</translation>
     </message>
     <message>
-        <source>Copy label</source>
-        <translation>نسخ التسمية</translation>
+        <source>Copy &amp;label</source>
+        <translation>نسخ &amp;التسمية</translation>
     </message>
     <message>
-        <source>Copy amount</source>
-        <translation>مبلغ النسخ</translation>
+        <source>Copy &amp;amount</source>
+        <translation>نسخ &amp;المبلغ</translation>
     </message>
     <message>
-        <source>Copy transaction ID</source>
-        <translation>نسخ معرف المعاملة</translation>
+        <source>Copy transaction &amp;ID and output index</source>
+        <translation>نسخ معرف &amp;المعاملة ومؤشر المخرجات</translation>
     </message>
     <message>
-        <source>Lock unspent</source>
-        <translation>قفل غير منفقة</translation>
+        <source>L&amp;ock unspent</source>
+        <translation>ق&amp;فل غير المنفق</translation>
     </message>
     <message>
-        <source>Unlock unspent</source>
-        <translation>إلغاء فتح</translation>
+        <source>&amp;Unlock unspent</source>
+        <translation>&amp;فتح قفل غير المنفق</translation>
     </message>
     <message>
         <source>Copy quantity</source>
@@ -905,10 +1042,6 @@
         <source>Copy bytes</source>
         <translation>نسخ وحدات البايت</translation>
     </message>
-    <message>
-        <source>Copy dust</source>
-        <translation>نسخ الغبار</translation>
-    </message>
     <message>
         <source>Copy change</source>
         <translation>نسخ التغيير</translation>
@@ -921,18 +1054,6 @@
         <source>(%1 locked)</source>
         <translation>(%1 مقفل)</translation>
     </message>
-    <message>
-        <source>yes</source>
-        <translation>نعم </translation>
-    </message>
-    <message>
-        <source>no</source>
-        <translation>لا</translation>
-    </message>
-    <message>
-        <source>This label turns red if any recipient receives an amount smaller than the current dust threshold.</source>
-        <translation>يتحول هذا التصنيف إلى اللون الأحمر إذا تلقى أي مستلم مبلغا أصغر من عتبة الغبار الحالية.</translation>
-    </message>
     <message>
         <source>Can vary +/- %1 duff(s) per input.</source>
         <translation>يمكن أن تختلف +/-%1 داف (ق) لكل مدخلات.</translation>
@@ -976,8 +1097,14 @@
 </context>
 <context>
     <name>CreateWalletActivity</name>
+    <message>
+        <source>Create Wallet</source>
+        <extracomment>Title of window indicating the progress of creation of a new wallet.</extracomment>
+        <translation>إنشاء المحفظة</translation>
+    </message>
     <message>
         <source>Creating Wallet &lt;b&gt;%1&lt;/b&gt;…</source>
+        <extracomment>Descriptive text of the create wallet progress window which indicates to the user which wallet is currently being created.</extracomment>
         <translation>جاري إنشاء المحفظة&lt;b&gt;%1&lt;/b&gt; …</translation>
     </message>
     <message>
@@ -999,6 +1126,10 @@
         <source>Wallet Name</source>
         <translation>اسم المحفظة</translation>
     </message>
+    <message>
+        <source>Wallet</source>
+        <translation>المحفظة</translation>
+    </message>
     <message>
         <source>Encrypt the wallet. The wallet will be encrypted with a passphrase of your choice.</source>
         <translation>تشفير المحفظة. سيتم تشفير المحفظة بعبارة مرور من اختيارك.</translation>
@@ -1007,6 +1138,10 @@
         <source>Encrypt Wallet</source>
         <translation>تشفير المحفظة</translation>
     </message>
+    <message>
+        <source>Advanced Options</source>
+        <translation>خيارات متقدمة</translation>
+    </message>
     <message>
         <source>Disable private keys for this wallet. Wallets with private keys disabled will have no private keys and cannot have an HD seed or imported private keys. This is ideal for watch-only wallets.</source>
         <translation>تعطيل المفاتيح الخاصة لهذه المحفظة. لن تحتوي المحافظ التي تحتوي على مفاتيح خاصة معطلة على مفاتيح خاصة ولا يمكن أن تحتوي على مفتاح HD أو مفاتيح خاصة مستوردة. هذا مثالي لمحافظ الساعات فقط.</translation>
@@ -1023,11 +1158,23 @@
         <source>Make Blank Wallet</source>
         <translation>اصنع محفظة فارغة</translation>
     </message>
+    <message>
+        <source>Use descriptors for scriptPubKey management. This feature is well-tested but still considered experimental and not recommended for use yet.</source>
+        <translation>استخدم الواصفات لإدارة scriptPubKey. هذه الميزة مختبرة جيدًا ولكنها لا تزال تعتبر تجريبية ولا يُنصح باستخدامها بعد.</translation>
+    </message>
+    <message>
+        <source>Descriptor Wallet (EXPERIMENTAL)</source>
+        <translation>محفظة الواصف (تجريبية)</translation>
+    </message>
     <message>
         <source>Create</source>
         <translation>انشاء</translation>
     </message>
-    </context>
+    <message>
+        <source>Compiled without sqlite support (required for descriptor wallets)</source>
+        <translation>تم التجميع بدون دعم sqlite (مطلوب لمحافظ الواصف)</translation>
+    </message>
+</context>
 <context>
     <name>EditAddressDialog</name>
     <message>
@@ -1116,18 +1263,106 @@
         <source>Filter List:</source>
         <translation>قائمة تصفية:</translation>
     </message>
+    <message>
+        <source>Filter proposal list</source>
+        <translation>تصفية قائمة المقترحات</translation>
+    </message>
+    <message>
+        <source>Masternode Count:</source>
+        <translation>عدد العقد الرئيسية:</translation>
+    </message>
+    <message>
+        <source>Number of masternodes this wallet can vote with (masternodes for which this wallet holds the voting key)</source>
+        <translation>عدد العقد الرئيسية التي يمكن لهذه المحفظة التصويت بها (العقد الرئيسية التي تحتفظ بها هذه المحفظة بمفتاح التصويت)</translation>
+    </message>
     <message>
         <source>Proposal Count:</source>
         <translation>عدد الاقتراح:</translation>
     </message>
+    <message>
+        <source>Create Proposal</source>
+        <translation>إنشاء مقترح</translation>
+    </message>
     <message>
         <source>Filter by Title</source>
         <translation>تصفية حسب العنوان</translation>
     </message>
+    <message>
+        <source>Unavailable</source>
+        <translation>غير متوفر</translation>
+    </message>
+    <message>
+        <source>A synced node and an unlocked wallet are required.</source>
+        <translation>مطلوب عقدة متزامنة ومحفظة غير مقفلة.</translation>
+    </message>
+    <message>
+        <source>Vote Yes</source>
+        <translation>صوت نعم</translation>
+    </message>
+    <message>
+        <source>Vote No</source>
+        <translation>صوت لا</translation>
+    </message>
+    <message>
+        <source>Vote Abstain</source>
+        <translation>صوت امتناع</translation>
+    </message>
     <message>
         <source>Proposal Info: %1</source>
         <translation>معلومات الاقتراح:%1</translation>
     </message>
+    <message>
+        <source>Voting Failed</source>
+        <translation>فشل التصويت</translation>
+    </message>
+    <message>
+        <source>No wallet available.</source>
+        <translation>لا توجد محفظة متاحة.</translation>
+    </message>
+    <message>
+        <source>No masternode voting keys found in wallet.</source>
+        <translation>لم يتم العثور على مفاتيح تصويت العقد الرئيسية في المحفظة.</translation>
+    </message>
+    <message>
+        <source>Please select a proposal to vote on.</source>
+        <translation>يرجى اختيار مقترح للتصويت عليه.</translation>
+    </message>
+    <message>
+        <source>Unable to unlock wallet.</source>
+        <translation>غير قادر على فتح قفل المحفظة.</translation>
+    </message>
+    <message>
+        <source>Unable to get masternode list. Please try again later.</source>
+        <translation>غير قادر على الحصول على قائمة العقد الرئيسية. يرجى المحاولة مرة أخرى لاحقًا.</translation>
+    </message>
+    <message>
+        <source>Masternode %1 not found</source>
+        <translation>لم يتم العثور على العقدة الرئيسية %1</translation>
+    </message>
+    <message>
+        <source>Failed to sign vote for masternode %1</source>
+        <translation>فشل توقيع التصويت للعقدة الرئيسية %1</translation>
+    </message>
+    <message>
+        <source>Masternode %1: %2</source>
+        <translation>العقدة الرئيسية %1: %2</translation>
+    </message>
+    <message numerus="yes">
+        <source>Voted successfully %n time(s)</source>
+        <translation><numerusform>تم التصويت بنجاح %n مرة</numerusform><numerusform>تم التصويت بنجاح %n مرة</numerusform><numerusform>تم التصويت بنجاح %n مرتين</numerusform><numerusform>تم التصويت بنجاح %n مرات</numerusform><numerusform>تم التصويت بنجاح %n مرة</numerusform><numerusform>تم التصويت بنجاح %n مرة</numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <source>Failed to vote %n time(s)</source>
+        <translation><numerusform>فشل التصويت %n مرة</numerusform><numerusform>فشل التصويت %n مرة</numerusform><numerusform>فشل التصويت %n مرتين</numerusform><numerusform>فشل التصويت %n مرات</numerusform><numerusform>فشل التصويت %n مرة</numerusform><numerusform>فشل التصويت %n مرة</numerusform></translation>
+    </message>
+    <message>
+        <source>Errors:</source>
+        <translation>الأخطاء:</translation>
+    </message>
+    <message>
+        <source>Voting Results</source>
+        <translation>نتائج التصويت</translation>
+    </message>
 </context>
 <context>
     <name>HelpMessageDialog</name>
@@ -1149,7 +1384,7 @@
     </message>
     <message>
         <source>&lt;h3&gt;%1 Basics&lt;/h3&gt; %1 gives you true financial privacy by obscuring the origins of your funds. All the Dash in your wallet is comprised of different "inputs" which you can think of as separate, discrete coins.&lt;br&gt; %1 uses an innovative process to mix your inputs with the inputs of two or more other people, without having your coins ever leave your wallet. You retain control of your money at all times.&lt;hr&gt; &lt;b&gt;The %1 process works like this:&lt;/b&gt;&lt;ol type="1"&gt; &lt;li&gt;%1 begins by breaking your transaction inputs down into standard denominations. These denominations are 0.001 DASH, 0.01 DASH, 0.1 DASH, 1 DASH and 10 DASH -- sort of like the paper money you use every day.&lt;/li&gt; &lt;li&gt;Your wallet then sends requests to specially configured software nodes on the network, called "masternodes." These masternodes are informed then that you are interested in mixing a certain denomination. No identifiable information is sent to the masternodes, so they never know "who" you are.&lt;/li&gt; &lt;li&gt;When two or more other people send similar messages, indicating that they wish to mix the same denomination, a mixing session begins. The masternode mixes up the inputs and instructs all three users' wallets to pay the now-transformed input back to themselves. Your wallet pays that denomination directly to itself, but in a different address (called a change address).&lt;/li&gt; &lt;li&gt;In order to fully obscure your funds, your wallet must repeat this process a number of times with each denomination. Each time the process is completed, it's called a "round." Each round of %1 makes it exponentially more difficult to determine where your funds originated.&lt;/li&gt; &lt;li&gt;This mixing process happens in the background without any intervention on your part. When you wish to make a transaction, your funds will already be mixed. No additional waiting is required.&lt;/li&gt; &lt;/ol&gt; &lt;hr&gt;&lt;b&gt;IMPORTANT:&lt;/b&gt; Your wallet only contains 1000 of these "change addresses." Every time a mixing event happens, up to 9 of your addresses are used up. This means those 1000 addresses last for about 100 mixing events. When 900 of them are used, your wallet must create more addresses. It can only do this, however, if you have automatic backups enabled.&lt;br&gt; Consequently, users who have backups disabled will also have %1 disabled. &lt;hr&gt;For more information, see the &lt;a style="%2" href="%3"&gt;%1 documentation&lt;/a&gt;.</source>
-        <translation>%1 يمنحك   &lt;h3&gt;%1 أساسيات&lt;/h3&gt; خصوصية مالية حقيقية من خلال حجب أصول أموالك. تتكون كل الداش في محفظتك من "مدخلات" مختلفة يمكنك التفكير فيها على أنها عملات معدنية منفصلة ومنفصلة.&lt;br&gt;  %1 يستخدم عملية مبتكرة لخلط مدخلاتك مع مدخلات شخصين آخرين أو أكثر ، دون أن تترك عملاتك محفظتك. أنت تحتفظ بالسيطرة على أموالك في جميع الأوقات.&lt;hr&gt;&lt;b&gt; تعمل  %1 عملية على النحو التالي:&lt;/b&gt;&lt;ol type="1"&gt;&lt;li&gt; يبدأ بتقسيم إدخالات معاملتك إلى فئات قياسية. هذه الفئات هي 0.001 داش و 0.01 داش و 0.1 داش و 1 داش و 10 داش - نوع من النقود الورقية التي تستخدمها كل يوم.&lt;/li&gt;&lt;li&gt; ثم ترسل محفظتك طلبات إلى عقد البرامج التي تم تكوينها خصيصًا على الشبكة ، والتي تسمى "العقد الرئيسية". يتم إبلاغ هذه الرموز الرئيسية بعد ذلك أنك مهتم بخلط فئة معينة. لا يتم إرسال أي معلومات يمكن التعرف عليها إلى رموز ماسترنود ، لذلك فهم لا يعرفون أبدًا "من أنت".&lt;/li&gt;&lt;li&gt; عندما يرسل شخصان آخران أو أكثر رسائل متشابهة ، للإشارة إلى رغبتهم في مزج نفس الفئة ، تبدأ جلسة خلط. يخلط الرمز الرئيسي بين المدخلات ويوجه جميع محافظ المستخدمين الثلاثة لدفع المدخلات التي تم تحويلها الآن لأنفسهم. تدفع محفظتك تلك الفئة مباشرة لنفسها ، ولكن في عنوان مختلف (يسمى تغيير العنوان). &lt;/li&gt;&lt;li&gt;من أجل إخفاء أموالك بالكامل ، يجب أن تكرر محفظتك هذه العملية عدة مرات مع كل فئة. في كل مرة يتم فيها الانتهاء من العملية ، يطلق عليها "جولة". كل جولة  1% تجعل تحديد مصدر أموالك أكثر صعوبة.&lt;/li&gt;&lt;li&gt; تحدث عملية الخلط هذه في الخلفية دون أي تدخل من جانبك. عندما ترغب في إجراء معاملة ، ستكون أموالك مختلطة بالفعل. لا حاجة إلى انتظار إضافي.&lt;/li&gt;&lt;/ol&gt;&lt;hr&gt;&lt;b&gt; هام: &lt;/b&gt;تحتوي محفظتك فقط على 1000 من "عناوين التغيير" هذه. في كل مرة يحدث فيها اختلاط ، يتم استخدام ما يصل إلى 9 عناوين. هذا يعني أن تلك العناوين الـ 1000 تدوم لحوالي 100 حدث خلط. عندما يتم استخدام 900 منهم ، يجب أن تنشئ محفظتك المزيد من العناوين. لا يمكنه القيام بذلك إلا إذا تم تمكين النسخ الاحتياطية التلقائية. &lt;br&gt;وبالتالي ، فإن المستخدمين الذين تم تعطيل النسخ الاحتياطية لديهم  %1 سيتم أيضًا تعطيل.&lt;hr&gt; لمزيد من المعلومات ، &lt;a style="%2" href="%3"&gt; %1 راجع وثائق&lt;/a&gt;.</translation>
+        <translation>%1 يمنحك   &lt;h3&gt;%1 أساسيات&lt;/h3&gt; خصوصية مالية حقيقية من خلال حجب أصول أموالك. تتكون كل الداش في محفظتك من "مدخلات" مختلفة يمكنك التفكير فيها على أنها عملات معدنية منفصلة ومنفصلة.&lt;br&gt;  %1 يستخدم عملية مبتكرة لخلط مدخلاتك مع مدخلات شخصين آخرين أو أكثر ، دون أن تترك عملاتك محفظتك. أنت تحتفظ بالسيطرة على أموالك في جميع الأوقات.&lt;hr&gt;&lt;b&gt; تعمل  %1 عملية على النحو التالي:&lt;/b&gt;&lt;ol type="1"&gt;&lt;li&gt; يبدأ بتقسيم إدخالات معاملتك إلى فئات قياسية. هذه الفئات هي 0.001 داش و 0.01 داش و 0.1 داش و 1 داش و 10 داش - نوع من النقود الورقية التي تستخدمها كل يوم.&lt;/li&gt;&lt;li&gt; ثم ترسل محفظتك طلبات إلى عقد البرامج التي تم تكوينها خصيصًا على الشبكة ، والتي تسمى "العقد الرئيسية". يتم إبلاغ هذه الرموز الرئيسية بعد ذلك أنك مهتم بخلط فئة معينة. لا يتم إرسال أي معلومات يمكن التعرف عليها إلى رموز ماسترنود ، لذلك فهم لا يعرفون أبدًا "من أنت".&lt;/li&gt;&lt;li&gt; عندما يرسل شخصان آخران أو أكثر رسائل متشابهة ، للإشارة إلى رغبتهم في مزج نفس الفئة ، تبدأ جلسة خلط. يخلط الرمز الرئيسي بين المدخلات ويوجه جميع محافظ المستخدمين الثلاثة لدفع المدخلات التي تم تحويلها الآن لأنفسهم. تدفع محفظتك تلك الفئة مباشرة لنفسها ، ولكن في عنوان مختلف (يسمى تغيير العنوان). &lt;/li&gt;&lt;li&gt;من أجل إخفاء أموالك بالكامل ، يجب أن تكرر محفظتك هذه العملية عدة مرات مع كل فئة. في كل مرة يتم فيها الانتهاء من العملية ، يطلق عليها "جولة". كل جولة  %1 تجعل تحديد مصدر أموالك أكثر صعوبة.&lt;/li&gt;&lt;li&gt; تحدث عملية الخلط هذه في الخلفية دون أي تدخل من جانبك. عندما ترغب في إجراء معاملة ، ستكون أموالك مختلطة بالفعل. لا حاجة إلى انتظار إضافي.&lt;/li&gt;&lt;/ol&gt;&lt;hr&gt;&lt;b&gt; هام: &lt;/b&gt;تحتوي محفظتك فقط على 1000 من "عناوين التغيير" هذه. في كل مرة يحدث فيها اختلاط ، يتم استخدام ما يصل إلى 9 عناوين. هذا يعني أن تلك العناوين الـ 1000 تدوم لحوالي 100 حدث خلط. عندما يتم استخدام 900 منهم ، يجب أن تنشئ محفظتك المزيد من العناوين. لا يمكنه القيام بذلك إلا إذا تم تمكين النسخ الاحتياطية التلقائية. &lt;br&gt;وبالتالي ، فإن المستخدمين الذين تم تعطيل النسخ الاحتياطية لديهم  %1 سيتم أيضًا تعطيل.&lt;hr&gt; لمزيد من المعلومات ، &lt;a style="%2" href="%3"&gt; %1 راجع وثائق&lt;/a&gt;.</translation>
     </message>
 </context>
 <context>
@@ -1166,10 +1401,26 @@
         <source>As this is the first time the program is launched, you can choose where %1 will store its data.</source>
         <translation>بما انه هذه اول مرة لانطلاق هذا البرنامج, فيمكنك ان تختار اين سيخزن %1 بياناته</translation>
     </message>
+    <message>
+        <source>Limit block chain storage to</source>
+        <translation>حد تخزين سلسلة الكتل إلى</translation>
+    </message>
+    <message>
+        <source>Reverting this setting requires re-downloading the entire blockchain. It is faster to download the full chain first and prune it later. Disables some advanced features.</source>
+        <translation>يتطلب التراجع عن هذا الإعداد إعادة تنزيل البلوكتشين بالكامل. من الأسرع تنزيل السلسلة الكاملة أولاً ثم تقليمها لاحقًا. يعطل بعض الميزات المتقدمة.</translation>
+    </message>
+    <message>
+        <source> GB</source>
+        <translation> جيجابايت</translation>
+    </message>
     <message>
         <source>This initial synchronisation is very demanding, and may expose hardware problems with your computer that had previously gone unnoticed. Each time you run %1, it will continue downloading where it left off.</source>
         <translation>تُعد هذه المزامنة الأولية أمرًا شاقًا للغاية، وقد تعرض جهاز الكمبيوتر الخاص بك للمشاكل الذي لم يلاحظها أحد سابقًا. في كل مرة تقوم فيها بتشغيل %1، سيتابع التحميل من حيث تم التوقف.</translation>
     </message>
+    <message>
+        <source>When you click OK, %1 will begin to download and process the full %4 block chain (%2 GB) starting with the earliest transactions in %3 when %4 initially launched.</source>
+        <translation>عند النقر فوق موافق، سيبدأ %1 في تنزيل ومعالجة سلسلة الكتل %4 الكاملة (%2 جيجابايت) بدءًا من أقدم المعاملات في %3 عند إطلاق %4 في البداية.</translation>
+    </message>
     <message>
         <source>If you have chosen to limit block chain storage (pruning), the historical data must still be downloaded and processed, but will be deleted afterward to keep your disk usage low.</source>
         <translation>إذا كنت قد اخترت تقييد تخزين سلسلة الكتل (التجريد)، فيجب تحميل البيانات القديمة ومعالجتها، ولكن سيتم حذفها بعد ذلك للحفاظ على انخفاض استخدام القرص.</translation>
@@ -1182,6 +1433,18 @@
         <source>Use a custom data directory:</source>
         <translation>استخدام دليل بيانات مخصص:</translation>
     </message>
+    <message numerus="yes">
+        <source>%n GB of space available</source>
+        <translation><numerusform>%n جيجابايت من المساحة المتاحة</numerusform><numerusform>%n جيجابايت من المساحة المتاحة</numerusform><numerusform>%n جيجابايت من المساحة المتاحة</numerusform><numerusform>%n جيجابايت من المساحة المتاحة</numerusform><numerusform>%n جيجابايت من المساحة المتاحة</numerusform><numerusform>%n جيجابايت من المساحة المتاحة</numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <source>(of %n GB needed)</source>
+        <translation><numerusform>(من %n جيجابايت مطلوب)</numerusform><numerusform>(من %n جيجابايت مطلوب)</numerusform><numerusform>(من %n جيجابايت مطلوب)</numerusform><numerusform>(من %n جيجابايت مطلوب)</numerusform><numerusform>(من %n جيجابايت مطلوب)</numerusform><numerusform>(من %n جيجابايت مطلوب)</numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <source>(%n GB needed for full chain)</source>
+        <translation><numerusform>(%n جيجابايت مطلوب للسلسلة الكاملة)</numerusform><numerusform>(%n جيجابايت مطلوب للسلسلة الكاملة)</numerusform><numerusform>(%n جيجابايت مطلوب للسلسلة الكاملة)</numerusform><numerusform>(%n جيجابايت مطلوب للسلسلة الكاملة)</numerusform><numerusform>(%n جيجابايت مطلوب للسلسلة الكاملة)</numerusform><numerusform>(%n جيجابايت مطلوب للسلسلة الكاملة)</numerusform></translation>
+    </message>
     <message>
         <source>At least %1 GB of data will be stored in this directory, and it will grow over time.</source>
         <translation>سيتم تخزين %1 جيجابايت على الأقل من البيانات في هذا الدليل، وستنمو مع الوقت.</translation>
@@ -1190,6 +1453,11 @@
         <source>Approximately %1 GB of data will be stored in this directory.</source>
         <translation>سيتم تخزين %1 جيجابايت تقريباً من البيانات في هذا الدليل.</translation>
     </message>
+    <message numerus="yes">
+        <source>(sufficient to restore backups %n day(s) old)</source>
+        <extracomment>Explanatory text on the capability of the current prune target.</extracomment>
+        <translation><numerusform>(كافٍ لاستعادة النسخ الاحتياطية القديمة بيوم واحد)</numerusform><numerusform>(كافٍ لاستعادة النسخ الاحتياطية القديمة بيوم واحد)</numerusform><numerusform>(كافٍ لاستعادة النسخ الاحتياطية القديمة بيومين)</numerusform><numerusform>(كافٍ لاستعادة النسخ الاحتياطية القديمة بـ %n أيام)</numerusform><numerusform>(كافٍ لاستعادة النسخ الاحتياطية القديمة بـ %n يوم)</numerusform><numerusform>(كافٍ لاستعادة النسخ الاحتياطية القديمة بـ %n يوم)</numerusform></translation>
+    </message>
     <message>
         <source>%1 will download and store a copy of the Dash block chain.</source>
         <translation>سيقوم %1 بتنزيل نسخة من سلسلة كتل بتكوين وتخزينها.</translation>
@@ -1207,6 +1475,13 @@
         <translation>خطأ</translation>
     </message>
 </context>
+<context>
+    <name>LoadWalletsActivity</name>
+    <message>
+        <source>Loading wallets…</source>
+        <translation>تحميل المحافظ…</translation>
+    </message>
+</context>
 <context>
     <name>MasternodeList</name>
     <message>
@@ -1241,6 +1516,10 @@
         <source>Service</source>
         <translation>الخدمات</translation>
     </message>
+    <message>
+        <source>Type</source>
+        <translation>النوع</translation>
+    </message>
     <message>
         <source>PoSe Score</source>
         <translation>نقاط PoSe</translation>
@@ -1376,6 +1655,10 @@
         <source>Hide</source>
         <translation>إخفاء</translation>
     </message>
+    <message>
+        <source>%1 is currently syncing.  It will download headers and blocks from peers and validate them until reaching the tip of the block chain.</source>
+        <translation>%1 تتم المزامنة حاليًا. سيقوم بتنزيل الرؤوس والكتل من النظراء والتحقق من صحتها حتى الوصول إلى طرف سلسلة الكتل.</translation>
+    </message>
     <message>
         <source>Unknown. Syncing Headers (%1, %2%)…</source>
         <translation>مجهول. مزامنة الرؤوس (%1،%2) …</translation>
@@ -1391,6 +1674,11 @@
         <source>URI:</source>
         <translation>العنوان:</translation>
     </message>
+    <message>
+        <source>Paste address from clipboard</source>
+        <extracomment>Tooltip text for button that allows you to paste an address that is in your clipboard.</extracomment>
+        <translation>لصق العنوان من الحافظة</translation>
+    </message>
 </context>
 <context>
     <name>OpenWalletActivity</name>
@@ -1406,8 +1694,14 @@
         <source>default wallet</source>
         <translation>المحفظة الافتراضية</translation>
     </message>
+    <message>
+        <source>Open Wallet</source>
+        <extracomment>Title of window indicating the progress of opening of a wallet.</extracomment>
+        <translation>فتح المحفظة</translation>
+    </message>
     <message>
         <source>Opening Wallet &lt;b&gt;%1&lt;/b&gt;…</source>
+        <extracomment>Descriptive text of the open wallet progress window which indicates to the user which wallet is currently being opened.</extracomment>
         <translation>جاري فتح المحفظة&lt;b&gt;%1&lt;/b&gt; …</translation>
     </message>
 </context>
@@ -1441,6 +1735,14 @@
         <source>&amp;Appearance</source>
         <translation>&amp;مظهر خارجي</translation>
     </message>
+    <message>
+        <source>Show the icon in the system tray.</source>
+        <translation>إظهار الرمز في علبة النظام.</translation>
+    </message>
+    <message>
+        <source>&amp;Show tray icon</source>
+        <translation>&amp;إظهار رمز الصينية</translation>
+    </message>
     <message>
         <source>Prune &amp;block storage to</source>
         <translation>تقليم وحظر التخزين إلى ملفات</translation>
@@ -1453,10 +1755,58 @@
         <source>Reverting this setting requires re-downloading the entire blockchain.</source>
         <translation>تتطلب العودة إلى هذا الإعداد إعادة تنزيل بلوكشين بالكامل.</translation>
     </message>
+    <message>
+        <source>Maximum database cache size. A larger cache can contribute to faster sync, after which the benefit is less pronounced for most use cases. Lowering the cache size will reduce memory usage. Unused mempool memory is shared for this cache.</source>
+        <extracomment>Tooltip text for Options window setting that sets the size of the database cache. Explains the corresponding effects of increasing/decreasing this value.</extracomment>
+        <translation>الحد الأقصى لحجم ذاكرة التخزين المؤقت لقاعدة البيانات. يمكن أن تساهم ذاكرة التخزين المؤقت الأكبر في مزامنة أسرع، وبعد ذلك تكون الفائدة أقل وضوحًا لمعظم حالات الاستخدام. سيؤدي خفض حجم ذاكرة التخزين المؤقت إلى تقليل استخدام الذاكرة. يتم مشاركة ذاكرة mempool غير المستخدمة لهذه الذاكرة المؤقتة.</translation>
+    </message>
     <message>
         <source>MiB</source>
         <translation>MiB</translation>
     </message>
+    <message>
+        <source>Set the number of script verification threads. Negative values correspond to the number of cores you want to leave free to the system.</source>
+        <extracomment>Tooltip text for Options window setting that sets the number of script verification threads. Explains that negative values mean to leave these many cores free to the system.</extracomment>
+        <translation>تعيين عدد مؤشرات ترابط التحقق من البرنامج النصي. تتوافق القيم السالبة مع عدد النوى التي تريد تركها حرة للنظام.</translation>
+    </message>
+    <message>
+        <source>This allows you or a third party tool to communicate with the node through command-line and JSON-RPC commands.</source>
+        <extracomment>Tooltip text for Options window setting that enables the RPC server.</extracomment>
+        <translation>يتيح لك هذا أو لأداة طرف ثالث التواصل مع العقدة من خلال سطر الأوامر وأوامر JSON-RPC.</translation>
+    </message>
+    <message>
+        <source>Enable R&amp;PC server</source>
+        <extracomment>An Options window setting to enable the RPC server.</extracomment>
+        <translation>تمكين خادم R&amp;PC</translation>
+    </message>
+    <message>
+        <source>Whether to set subtract fee from amount as default or not.</source>
+        <extracomment>Tooltip text for Options window setting that sets subtracting the fee from a sending amount as default.</extracomment>
+        <translation>ما إذا كان سيتم تعيين خصم الرسوم من المبلغ كإعداد افتراضي أم لا.</translation>
+    </message>
+    <message>
+        <source>Subtract &amp;fee from amount by default</source>
+        <extracomment>An Options window setting to set subtracting the fee from a sending amount as default.</extracomment>
+        <translation>خصم &amp;الرسوم من المبلغ افتراضياً</translation>
+    </message>
+    <message>
+        <source>Enable &amp;PSBT controls</source>
+        <extracomment>An options window setting to enable PSBT controls.</extracomment>
+        <translation>تمكين عناصر التحكم &amp;PSBT</translation>
+    </message>
+    <message>
+        <source>Whether to show PSBT controls.</source>
+        <extracomment>Tooltip text for options window setting that enables PSBT controls.</extracomment>
+        <translation>ما إذا كان سيتم إظهار عناصر تحكم PSBT.</translation>
+    </message>
+    <message>
+        <source>Whether to keep the specified custom change address or not.</source>
+        <translation>ما إذا كان سيتم الاحتفاظ بعنوان الفكة المخصص المحدد أم لا.</translation>
+    </message>
+    <message>
+        <source>Keep custom change &amp;address</source>
+        <translation>الاحتفاظ بعنوان &amp;الفكة المخصص</translation>
+    </message>
     <message>
         <source>Show additional tab listing all your masternodes in first sub-tab&lt;br/&gt;and all masternodes on the network in second sub-tab.</source>
         <translation>عرض علامة تبويب إضافية تسرد جميع رموزك في أول علامة تبويب فرعية &lt;br/&gt;وجميع ماسترنود على الشبكة في علامة التبويب الفرعية الثانية.</translation>
@@ -1513,6 +1863,14 @@
         <source>Enable &amp;multi-session</source>
         <translation>تمكين الإرسال متعدد الجلسات</translation>
     </message>
+    <message>
+        <source>Use this many separate masternodes in parallel to mix funds.&lt;br/&gt;Note: You must use this feature carefully.&lt;br/&gt;Make sure you always have recent wallet (auto)backup in a safe place!</source>
+        <translation>استخدم هذا العدد من العقد الرئيسية المنفصلة بالتوازي لخلط الأموال.&lt;br/&gt;ملاحظة: يجب عليك استخدام هذه الميزة بحذر.&lt;br/&gt;تأكد من أن لديك دائمًا نسخة احتياطية حديثة (تلقائية) للمحفظة في مكان آمن!</translation>
+    </message>
+    <message>
+        <source>Parallel sessions</source>
+        <translation>جلسات متوازية</translation>
+    </message>
     <message>
         <source>Mixing rounds</source>
         <translation>جولات الخلط</translation>
@@ -1525,6 +1883,30 @@
         <source>Target balance</source>
         <translation>الهدف رصيد</translation>
     </message>
+    <message>
+        <source>How many inputs of each denominated amount are created.&lt;br/&gt;Lower these numbers if you want fewer smaller denominations.</source>
+        <translation>كم عدد المدخلات من كل فئة يتم إنشاؤها.&lt;br/&gt;قلل هذه الأرقام إذا كنت تريد عددًا أقل من الفئات الصغيرة.</translation>
+    </message>
+    <message>
+        <source>Inputs per denomination</source>
+        <translation>مدخلات لكل فئة</translation>
+    </message>
+    <message>
+        <source>Try to create at least this many inputs for each denominated amount.&lt;br/&gt;Lower this number if you want fewer smaller denominations.</source>
+        <translation>حاول إنشاء هذا العدد على الأقل من المدخلات لكل فئة.&lt;br/&gt;قلل هذا الرقم إذا كنت تريد عددًا أقل من الفئات الصغيرة.</translation>
+    </message>
+    <message>
+        <source>Target</source>
+        <translation>الهدف</translation>
+    </message>
+    <message>
+        <source>Create up to this many inputs for each denominated amount.&lt;br/&gt;Lower this number if you want fewer smaller denominations.</source>
+        <translation>إنشاء ما يصل إلى هذا العدد من المدخلات لكل فئة.&lt;br/&gt;قلل هذا الرقم إذا كنت تريد عددًا أقل من الفئات الصغيرة.</translation>
+    </message>
+    <message>
+        <source>Maximum</source>
+        <translation>الحد الأقصى</translation>
+    </message>
     <message>
         <source>Automatically open the Dash Core client port on the router. This only works when your router supports UPnP and it is enabled.</source>
         <translation>فتح منفذ عميل داش كور تلقائيًا على جهاز التوجيه. هذا يعمل فقط عندما يدعم جهاز التوجيه الخاص بك UPnP وتمكينه.</translation>
@@ -1554,20 +1936,26 @@
         <translation>يظهر ما إذا كان وكيل SOCKS5 الافتراضي المقدم مستخدمًا للوصول إلى الأقران عبر هذا النوع من الشبكة.</translation>
     </message>
     <message>
-        <source>Options set in this dialog are overridden by the command line or in the configuration file:</source>
-        <translation>يتم تجاوز الخيارات المعينة في مربع الحوار هذا بواسطة سطر الأوامر أو في ملف التكوين:</translation>
+        <source>Language missing or translation incomplete? Help contributing translations here:
+https://explore.transifex.com/dash/dash/</source>
+        <translation>اللغة مفقودة أو الترجمة غير مكتملة؟ ساعد في المساهمة في الترجمات هنا:
+https://explore.transifex.com/dash/dash/</translation>
     </message>
     <message>
-        <source>Minimize instead of exit the application when the window is closed. When this option is enabled, the application will be closed only after selecting Exit in the menu.</source>
-        <translation>التصغير بدلاً من الخروج من التطبيق عند إغلاق النافذة. عند تفعيل هذا الخيار، سيتم إغلاق التطبيق فقط بعد اختيار الخروج من القائمة.</translation>
+        <source>Third-party URLs (e.g. a block explorer) that appear in the transactions tab as context menu items.&lt;br/&gt;%s in the URL is replaced by transaction hash. Multiple URLs are separated by vertical bar |.</source>
+        <translation>عناوين URL لجهات خارجية (مثل مستكشف الكتل) تظهر في علامة تبويب المعاملات كعناصر قائمة السياق.&lt;br/&gt; يتم استبدال %s في عنوان URL بتجزئة المعاملة. يتم فصل عناوين URL متعددة بشريط عمودي |.</translation>
+    </message>
+    <message>
+        <source>&amp;Third-party transaction URLs</source>
+        <translation>&amp;عناوين URL للمعاملات من جهات خارجية</translation>
     </message>
     <message>
-        <source>Third party URLs (e.g. a block explorer) that appear in the transactions tab as context menu items.&lt;br/&gt;%s in the URL is replaced by transaction hash. Multiple URLs are separated by vertical bar |.</source>
-        <translation>عناوين التابعة لجهات خارجية (مثل مستكشف كتلة) التي تظهر في علامة شريط المعاملات كعناصر قائمة السياق &lt;br/&gt; يتم استبدال %s في عنوان بتجزئة المعاملة. عناوين متعددة مفصولة بشريط عمودي.</translation>
+        <source>Options set in this dialog are overridden by the command line or in the configuration file:</source>
+        <translation>يتم تجاوز الخيارات المعينة في مربع الحوار هذا بواسطة سطر الأوامر أو في ملف التكوين:</translation>
     </message>
     <message>
-        <source>&amp;Third party transaction URLs</source>
-        <translation>&amp; عناوين URL لمعاملات الطرف الثالث</translation>
+        <source>Minimize instead of exit the application when the window is closed. When this option is enabled, the application will be closed only after selecting Exit in the menu.</source>
+        <translation>التصغير بدلاً من الخروج من التطبيق عند إغلاق النافذة. عند تفعيل هذا الخيار، سيتم إغلاق التطبيق فقط بعد اختيار الخروج من القائمة.</translation>
     </message>
     <message>
         <source>Whether to show coin control features or not.</source>
@@ -1605,6 +1993,10 @@
         <source>Map port using &amp;UPnP</source>
         <translation>ميناء الخريطة باستخدام UPnP</translation>
     </message>
+    <message>
+        <source>Automatically open the Dash Core client port on the router. This only works when your router supports NAT-PMP and it is enabled. The external port could be random.</source>
+        <translation>فتح منفذ عميل Dash Core تلقائيًا على جهاز التوجيه. هذا يعمل فقط عندما يدعم جهاز التوجيه الخاص بك NAT-PMP وتمكينه. قد يكون المنفذ الخارجي عشوائيًا.</translation>
+    </message>
     <message>
         <source>Proxy &amp;IP:</source>
         <translation>بروكسي &amp;اي بي:</translation>
@@ -1654,8 +2046,16 @@
         <translation>&amp;عرض</translation>
     </message>
     <message>
-        <source>User Interface &amp;language:</source>
-        <translation>لغة واجهة المستخدم:</translation>
+        <source>Connect to the Dash network through a separate SOCKS5 proxy for Tor onion services.</source>
+        <translation>الاتصال بشبكة Dash من خلال وكيل SOCKS5 منفصل لخدمات Tor onion.</translation>
+    </message>
+    <message>
+        <source>Use separate SOCKS&amp;5 proxy to reach peers via Tor onion services:</source>
+        <translation>استخدام وكيل SOCKS&amp;5 منفصل للوصول إلى الأقران عبر خدمات Tor onion:</translation>
+    </message>
+    <message>
+        <source>User Interface &amp;language:</source>
+        <translation>لغة واجهة المستخدم:</translation>
     </message>
     <message>
         <source>The user interface language can be set here. This setting will take effect after restarting %1.</source>
@@ -1699,14 +2099,22 @@
     </message>
     <message>
         <source>Confirm options reset</source>
+        <extracomment>Window title text of pop-up window shown when the user has chosen to reset options.</extracomment>
         <translation>تأكيد استعادة الخيارات</translation>
     </message>
     <message>
         <source>Client restart required to activate changes.</source>
+        <extracomment>Text explaining that the settings changed will not come into effect until the client is restarted.</extracomment>
         <translation>يتطلب إعادة تشغيل العميل لتفعيل التغييرات.</translation>
     </message>
+    <message>
+        <source>Current settings will be backed up at "%1".</source>
+        <extracomment>Text explaining to the user that the client's current settings will be backed up at a specific location. %1 is a stand-in argument for the backup location's path.</extracomment>
+        <translation>سيتم نسخ الإعدادات الحالية احتياطياً في "%1".</translation>
+    </message>
     <message>
         <source>Client will be shut down. Do you want to proceed?</source>
+        <extracomment>Text asking the user to confirm if they would like to proceed with a client shutdown.</extracomment>
         <translation>سوف يتم إيقاف العميل تماماً. هل تريد الإستمرار؟</translation>
     </message>
     <message>
@@ -1844,6 +2252,10 @@
         <source>%1 Balance</source>
         <translation>%1 الرصيد</translation>
     </message>
+    <message>
+        <source>Discreet mode activated for the Overview tab. To unmask the values, uncheck Settings-&gt;Discreet mode.</source>
+        <translation>تم تفعيل الوضع المخفي لعلامة التبويب النظرة العامة. لإظهار القيم، قم بإلغاء تحديد الإعدادات-&gt;الوضع المخفي.</translation>
+    </message>
     <message numerus="yes">
         <source>%n Rounds</source>
         <translation><numerusform>%n جولات</numerusform><numerusform>%n جولات</numerusform><numerusform>%n جولات</numerusform><numerusform>%n جولات</numerusform><numerusform>%n جولات</numerusform><numerusform>%n جولات</numerusform></translation>
@@ -1943,7 +2355,140 @@
 </context>
 <context>
     <name>PSBTOperationsDialog</name>
-    </context>
+    <message>
+        <source>Dialog</source>
+        <translation>حوار</translation>
+    </message>
+    <message>
+        <source>Sign Tx</source>
+        <translation>توقيع المعاملة</translation>
+    </message>
+    <message>
+        <source>Broadcast Tx</source>
+        <translation>بث المعاملة</translation>
+    </message>
+    <message>
+        <source>Copy to Clipboard</source>
+        <translation>نسخ إلى الحافظة</translation>
+    </message>
+    <message>
+        <source>Save…</source>
+        <translation>حفظ…</translation>
+    </message>
+    <message>
+        <source>Close</source>
+        <translation>إغلاق</translation>
+    </message>
+    <message>
+        <source>Failed to load transaction: %1</source>
+        <translation>فشل تحميل المعاملة: %1</translation>
+    </message>
+    <message>
+        <source>Failed to sign transaction: %1</source>
+        <translation>فشل توقيع المعاملة: %1</translation>
+    </message>
+    <message>
+        <source>Cannot sign inputs while wallet is locked.</source>
+        <translation>لا يمكن توقيع المدخلات أثناء قفل المحفظة.</translation>
+    </message>
+    <message>
+        <source>Could not sign any more inputs.</source>
+        <translation>لا يمكن توقيع المزيد من المدخلات.</translation>
+    </message>
+    <message>
+        <source>Signed %1 inputs, but more signatures are still required.</source>
+        <translation>تم توقيع %1 مدخلات، ولكن لا يزال يتطلب المزيد من التوقيعات.</translation>
+    </message>
+    <message>
+        <source>Signed transaction successfully. Transaction is ready to broadcast.</source>
+        <translation>تم توقيع المعاملة بنجاح. المعاملة جاهزة للبث.</translation>
+    </message>
+    <message>
+        <source>Unknown error processing transaction.</source>
+        <translation>خطأ غير معروف أثناء معالجة المعاملة.</translation>
+    </message>
+    <message>
+        <source>Transaction broadcast successfully! Transaction ID: %1</source>
+        <translation>تم بث المعاملة بنجاح! معرف المعاملة: %1</translation>
+    </message>
+    <message>
+        <source>Transaction broadcast failed: %1</source>
+        <translation>فشل بث المعاملة: %1</translation>
+    </message>
+    <message>
+        <source>PSBT copied to clipboard.</source>
+        <translation>تم نسخ PSBT إلى الحافظة.</translation>
+    </message>
+    <message>
+        <source>Save Transaction Data</source>
+        <translation>حفظ بيانات المعاملة</translation>
+    </message>
+    <message>
+        <source>Partially Signed Transaction (Binary)</source>
+        <extracomment>Expanded name of the binary PSBT file format. See: BIP 174.</extracomment>
+        <translation>معاملة موقعة جزئياً (ثنائية)</translation>
+    </message>
+    <message>
+        <source>PSBT saved to disk.</source>
+        <translation>تم حفظ PSBT على القرص.</translation>
+    </message>
+    <message>
+        <source> * Sends %1 to %2</source>
+        <translation> * يرسل %1 إلى %2</translation>
+    </message>
+    <message>
+        <source>own address</source>
+        <translation>عنوان خاص</translation>
+    </message>
+    <message>
+        <source>Unable to calculate transaction fee or total transaction amount.</source>
+        <translation>غير قادر على حساب رسوم المعاملة أو إجمالي مبلغ المعاملة.</translation>
+    </message>
+    <message>
+        <source>Pays transaction fee: </source>
+        <translation>يدفع رسوم المعاملة: </translation>
+    </message>
+    <message>
+        <source>Total Amount</source>
+        <translation>المبلغ الإجمالي</translation>
+    </message>
+    <message>
+        <source>or</source>
+        <translation>أو</translation>
+    </message>
+    <message>
+        <source>Transaction has %1 unsigned inputs.</source>
+        <translation>المعاملة لديها %1 مدخلات غير موقعة.</translation>
+    </message>
+    <message>
+        <source>Transaction is missing some information about inputs.</source>
+        <translation>المعاملة تفتقد بعض المعلومات حول المدخلات.</translation>
+    </message>
+    <message>
+        <source>Transaction still needs signature(s).</source>
+        <translation>المعاملة لا تزال بحاجة إلى توقيع (توقيعات).</translation>
+    </message>
+    <message>
+        <source>(But no wallet is loaded.)</source>
+        <translation>(ولكن لم يتم تحميل محفظة.)</translation>
+    </message>
+    <message>
+        <source>(But this wallet cannot sign transactions.)</source>
+        <translation>(ولكن هذه المحفظة لا يمكنها توقيع المعاملات.)</translation>
+    </message>
+    <message>
+        <source>(But this wallet does not have the right keys.)</source>
+        <translation>(ولكن هذه المحفظة لا تملك المفاتيح الصحيحة.)</translation>
+    </message>
+    <message>
+        <source>Transaction is fully signed and ready for broadcast.</source>
+        <translation>المعاملة موقعة بالكامل وجاهزة للبث.</translation>
+    </message>
+    <message>
+        <source>Transaction status is unknown.</source>
+        <translation>حالة المعاملة غير معروفة.</translation>
+    </message>
+</context>
 <context>
     <name>PaymentServer</name>
     <message>
@@ -1962,6 +2507,12 @@
         <source>'dash://' is not a valid URI. Use 'dash:' instead.</source>
         <translation>'dash: //' ليس URI صالحًا. استخدم "شرطة:" بدلاً من ذلك.</translation>
     </message>
+    <message>
+        <source>Cannot process payment request as BIP70 is no longer supported.
+Due to discontinued support, you should request the merchant to provide you with a BIP21 compatible URI or use a wallet that does continue to support BIP70.</source>
+        <translation>لا يمكن معالجة طلب الدفع لأن BIP70 لم يعد مدعومًا.
+بسبب التوقف عن الدعم، يجب عليك أن تطلب من التاجر أن يزودك بـ URI متوافق مع BIP21 أو استخدام محفظة تستمر في دعم BIP70.</translation>
+    </message>
     <message>
         <source>URI cannot be parsed! This can be caused by an invalid Dash address or malformed URI parameters.</source>
         <translation>لا يمكن تحليل العنوان! يمكن أن يكون ذلك بسبب عنوان داش غير صالح أو معلمات العنوان غير صحيحة.</translation>
@@ -1983,6 +2534,26 @@
         <extracomment>Title of Peers Table column which indicates the current latency of the connection with the peer.</extracomment>
         <translation>رنين</translation>
     </message>
+    <message>
+        <source>Peer</source>
+        <extracomment>Title of Peers Table column which contains a unique number used to identify a connection.</extracomment>
+        <translation>النظير</translation>
+    </message>
+    <message>
+        <source>Age</source>
+        <extracomment>Title of Peers Table column which indicates the duration (length of time) since the peer connection started.</extracomment>
+        <translation>العمر</translation>
+    </message>
+    <message>
+        <source>Direction</source>
+        <extracomment>Title of Peers Table column which indicates the direction the peer connection was initiated from.</extracomment>
+        <translation>الاتجاه</translation>
+    </message>
+    <message>
+        <source>Type</source>
+        <extracomment>Title of Peers Table column which describes the type of peer connection. The "type" describes why the connection exists.</extracomment>
+        <translation>النوع</translation>
+    </message>
     <message>
         <source>Sent</source>
         <extracomment>Title of Peers Table column which indicates the total amount of network information we have sent to the peer.</extracomment>
@@ -1993,7 +2564,27 @@
         <extracomment>Title of Peers Table column which indicates the total amount of network information we have received from the peer.</extracomment>
         <translation>وصلت</translation>
     </message>
-    </context>
+    <message>
+        <source>Address</source>
+        <extracomment>Title of Peers Table column which contains the IP/Onion/I2P address of the connected peer.</extracomment>
+        <translation>العنوان</translation>
+    </message>
+    <message>
+        <source>Network</source>
+        <extracomment>Title of Peers Table column which states the network the peer connected through.</extracomment>
+        <translation>الشبكة</translation>
+    </message>
+    <message>
+        <source>Inbound</source>
+        <extracomment>An Inbound Connection from a Peer.</extracomment>
+        <translation>وارد</translation>
+    </message>
+    <message>
+        <source>Outbound</source>
+        <extracomment>An Outbound Connection to a Peer.</extracomment>
+        <translation>صادر</translation>
+    </message>
+</context>
 <context>
     <name>Proposal</name>
     <message>
@@ -2044,8 +2635,193 @@
         <translation>الحالة.</translation>
     </message>
 </context>
+<context>
+    <name>ProposalWizard</name>
+    <message>
+        <source>Create Governance Proposal</source>
+        <translation>إنشاء مقترح الحوكمة</translation>
+    </message>
+    <message>
+        <source>Enter proposal details</source>
+        <translation>أدخل تفاصيل المقترح</translation>
+    </message>
+    <message>
+        <source>A fee will be burned when you prepare the proposal.</source>
+        <translation>سيتم حرق رسوم عند تحضير المقترح.</translation>
+    </message>
+    <message>
+        <source>Proposal &amp;name</source>
+        <translation>&amp;اسم المقترح</translation>
+    </message>
+    <message>
+        <source>&amp;Description URL</source>
+        <translation>&amp;رابط الوصف</translation>
+    </message>
+    <message>
+        <source>Payment &amp;address</source>
+        <translation>&amp;عنوان الدفع</translation>
+    </message>
+    <message>
+        <source>Payment &amp;amount</source>
+        <translation>&amp;مبلغ الدفع</translation>
+    </message>
+    <message>
+        <source>The amount to request in a single payment</source>
+        <translation>المبلغ المطلوب في دفعة واحدة</translation>
+    </message>
+    <message>
+        <source>&amp;First payment</source>
+        <translation>&amp;الدفعة الأولى</translation>
+    </message>
+    <message>
+        <source>Pa&amp;yments</source>
+        <translation>ال&amp;دفعات</translation>
+    </message>
+    <message>
+        <source>To&amp;tal amount</source>
+        <translation>المبلغ الإ&amp;جمالي</translation>
+    </message>
+    <message>
+        <source>Proposal &amp;fee</source>
+        <translation>&amp;رسوم المقترح</translation>
+    </message>
+    <message>
+        <source>Next</source>
+        <translation>التالي</translation>
+    </message>
+    <message>
+        <source>Review proposal JSON and validate.</source>
+        <translation>مراجعة JSON المقترح والتحقق من صحته.</translation>
+    </message>
+    <message>
+        <source>Hex-encoded JSON</source>
+        <translation>JSON مشفر بنظام ست عشري</translation>
+    </message>
+    <message>
+        <source>Back</source>
+        <translation>رجوع</translation>
+    </message>
+    <message>
+        <source>Validate</source>
+        <translation>التحقق</translation>
+    </message>
+    <message>
+        <source>Prepare (burn fee) and wait for confirmations.</source>
+        <translation>التحضير (حرق الرسوم) والانتظار للتأكيدات.</translation>
+    </message>
+    <message>
+        <source>Copy</source>
+        <translation>نسخ</translation>
+    </message>
+    <message>
+        <source>At 1/6 confirmations: can be relayed and queued. At 6/6: accepted and processed.</source>
+        <translation>عند 1/6 تأكيدات: يمكن الترحيل والانتظار في قائمة الانتظار. عند 6/6: مقبول ومعالج.</translation>
+    </message>
+    <message>
+        <source>Confirmations progress</source>
+        <translation>تقدم التأكيدات</translation>
+    </message>
+    <message>
+        <source>Shows progress toward the required number of confirmations for the proposal fee transaction.</source>
+        <translation>يظهر التقدم نحو العدد المطلوب من التأكيدات لمعاملة رسوم المقترح.</translation>
+    </message>
+    <message>
+        <source>Estimated time remaining: -</source>
+        <translation>الوقت المقدر المتبقي: -</translation>
+    </message>
+    <message>
+        <source>Prepare Proposal</source>
+        <translation>تحضير المقترح</translation>
+    </message>
+    <message>
+        <source>You can submit after 1 confirmation. At 6 confirmations it is accepted and processed.</source>
+        <translation>يمكنك الإرسال بعد تأكيد واحد. عند 6 تأكيدات يتم قبوله ومعالجته.</translation>
+    </message>
+    <message>
+        <source>Proposal ID:</source>
+        <translation>معرف المقترح:</translation>
+    </message>
+    <message>
+        <source>Submit Proposal</source>
+        <translation>إرسال المقترح</translation>
+    </message>
+    <message>
+        <source>Close</source>
+        <translation>إغلاق</translation>
+    </message>
+    <message>
+        <source>Valid</source>
+        <translation>صالح</translation>
+    </message>
+    <message>
+        <source>Invalid: %1</source>
+        <translation>غير صالح: %1</translation>
+    </message>
+    <message>
+        <source>Burn %1</source>
+        <translation>حرق %1</translation>
+    </message>
+    <message>
+        <source>Burn %1 to create the fee transaction?</source>
+        <translation>حرق %1 لإنشاء معاملة الرسوم؟</translation>
+    </message>
+    <message>
+        <source>Prepare failed</source>
+        <translation>فشل التحضير</translation>
+    </message>
+    <message>
+        <source>Confirmations: %1 / %2 required</source>
+        <translation>التأكيدات: %1 / %2 مطلوب</translation>
+    </message>
+    <message>
+        <source>Estimated time remaining: Ready</source>
+        <translation>الوقت المقدر المتبقي: جاهز</translation>
+    </message>
+    <message numerus="yes">
+        <source>Estimated time remaining: %n minute(s)</source>
+        <translation><numerusform>الوقت المقدر المتبقي: دقيقة واحدة</numerusform><numerusform>الوقت المقدر المتبقي: دقيقة واحدة</numerusform><numerusform>الوقت المقدر المتبقي: دقيقتان</numerusform><numerusform>الوقت المقدر المتبقي: %n دقائق</numerusform><numerusform>الوقت المقدر المتبقي: %n دقيقة</numerusform><numerusform>الوقت المقدر المتبقي: %n دقيقة</numerusform></translation>
+    </message>
+    <message>
+        <source>Your proposal was submitted successfully.</source>
+        <translation>تم إرسال مقترحك بنجاح.</translation>
+    </message>
+    <message>
+        <source>Already submitted</source>
+        <translation>تم الإرسال بالفعل</translation>
+    </message>
+    <message>
+        <source>This proposal has already been submitted.</source>
+        <translation>تم إرسال هذا المقترح بالفعل.</translation>
+    </message>
+    <message>
+        <source>Submission failed</source>
+        <translation>فشل الإرسال</translation>
+    </message>
+    <message>
+        <source>Proposal submitted</source>
+        <translation>تم إرسال المقترح</translation>
+    </message>
+    <message>
+        <source>A fee of %1 will be burned when you prepare the proposal.</source>
+        <translation>سيتم حرق رسوم %1 عندما تحضر المقترح.</translation>
+    </message>
+    <message>
+        <source>Prepare (burn %1) and wait for %2 confirmations.</source>
+        <translation>التحضير (حرق %1) والانتظار لـ %2 تأكيدات.</translation>
+    </message>
+</context>
 <context>
     <name>QObject</name>
+    <message>
+        <source>Do you want to reset settings to default values, or to abort without making changes?</source>
+        <extracomment>Explanatory text shown on startup when the settings file cannot be read. Prompts user to make a choice between resetting or aborting.</extracomment>
+        <translation>هل تريد إعادة تعيين الإعدادات إلى القيم الافتراضية، أم الإلغاء دون إجراء تغييرات؟</translation>
+    </message>
+    <message>
+        <source>A fatal error occurred. Check that settings file is writable, or try running with -nosettings.</source>
+        <extracomment>Explanatory text shown on startup when the settings file could not be written. Prompts user to check that we have the ability to write to the file. Explains that the user has the option of running without a settings file.</extracomment>
+        <translation>حدث خطأ فادح. تحقق من أن ملف الإعدادات قابل للكتابة، أو حاول التشغيل بـ -nosettings.</translation>
+    </message>
     <message>
         <source>Choose data directory on startup (default: %u)</source>
         <translation>اختر دليل البيانات عند بدء التشغير (افتراضي: %u)</translation>
@@ -2146,6 +2922,53 @@
         <source>This can also be adjusted later in the "Appearance" tab of the preferences.</source>
         <translation>يمكن أيضًا تعديل هذا لاحقًا في علامة التبويب "المظهر" في التفضيلات.</translation>
     </message>
+    <message>
+        <source>Ctrl+W</source>
+        <translation>Ctrl+W</translation>
+    </message>
+    <message>
+        <source>Unroutable</source>
+        <translation>غير قابل للتوجيه</translation>
+    </message>
+    <message>
+        <source>Internal</source>
+        <translation>داخلي</translation>
+    </message>
+    <message>
+        <source>Inbound</source>
+        <extracomment>An inbound connection from a peer. An inbound connection is a connection initiated by a peer.</extracomment>
+        <translation>وارد</translation>
+    </message>
+    <message>
+        <source>Outbound</source>
+        <extracomment>An outbound connection to a peer. An outbound connection is a connection initiated by us.</extracomment>
+        <translation>صادر</translation>
+    </message>
+    <message>
+        <source>Full Relay</source>
+        <extracomment>Peer connection type that relays all network information.</extracomment>
+        <translation>ترحيل كامل</translation>
+    </message>
+    <message>
+        <source>Block Relay</source>
+        <extracomment>Peer connection type that relays network information about blocks and not transactions or addresses.</extracomment>
+        <translation>ترحيل الكتل</translation>
+    </message>
+    <message>
+        <source>Manual</source>
+        <extracomment>Peer connection type established manually through one of several methods.</extracomment>
+        <translation>يدوي</translation>
+    </message>
+    <message>
+        <source>Feeler</source>
+        <extracomment>Short-lived peer connection type that tests the aliveness of known addresses.</extracomment>
+        <translation>مستشعر</translation>
+    </message>
+    <message>
+        <source>Address Fetch</source>
+        <extracomment>Short-lived peer connection type that solicits known addresses from a peer.</extracomment>
+        <translation>جلب العناوين</translation>
+    </message>
     <message>
         <source>%1 d</source>
         <translation>%1 يوم</translation>
@@ -2207,8 +3030,8 @@
         <translation>%1 B</translation>
     </message>
     <message>
-        <source>%1 KB</source>
-        <translation>%1 KB</translation>
+        <source>%1 kB</source>
+        <translation>%1 kB</translation>
     </message>
     <message>
         <source>%1 MB</source>
@@ -2264,7 +3087,12 @@
         <source>Save QR Code</source>
         <translation>حفظ رمز الاستجابة السريعة QR</translation>
     </message>
-    </context>
+    <message>
+        <source>PNG Image</source>
+        <extracomment>Expanded name of the PNG file format. See: https://en.wikipedia.org/wiki/Portable_Network_Graphics.</extracomment>
+        <translation>صورة PNG</translation>
+    </message>
+</context>
 <context>
     <name>RPCConsole</name>
     <message>
@@ -2371,6 +3199,14 @@
         <source>Version</source>
         <translation>الإصدار</translation>
     </message>
+    <message>
+        <source>High bandwidth BIP152 compact block relay: %1</source>
+        <translation>ترحيل الكتل المدمجة BIP152 بنطاق ترددي عالي: %1</translation>
+    </message>
+    <message>
+        <source>High Bandwidth</source>
+        <translation>نطاق ترددي عالي</translation>
+    </message>
     <message>
         <source>Starting Block</source>
         <translation>كتلة البداية</translation>
@@ -2383,6 +3219,51 @@
         <source>Synced Blocks</source>
         <translation>كتل متزامنة</translation>
     </message>
+    <message>
+        <source>Elapsed time since a novel block passing initial validity checks was received from this peer.</source>
+        <translation>الوقت المنقضي منذ استلام كتلة جديدة تجاوزت فحوصات الصلاحية الأولية من هذا النظير.</translation>
+    </message>
+    <message>
+        <source>Last Block</source>
+        <translation>آخر كتلة</translation>
+    </message>
+    <message>
+        <source>Elapsed time since a novel transaction accepted into our mempool was received from this peer.</source>
+        <extracomment>Tooltip text for the Last Transaction field in the peer details area.</extracomment>
+        <translation>الوقت المنقضي منذ استلام معاملة جديدة تم قبولها في مجمع الذاكرة من هذا النظير.</translation>
+    </message>
+    <message>
+        <source>Last Transaction</source>
+        <translation>آخر معاملة</translation>
+    </message>
+    <message>
+        <source>The mapped Autonomous System used for diversifying peer selection.</source>
+        <translation>النظام المستقل المعين المستخدم لتنويع اختيار الأقران.</translation>
+    </message>
+    <message>
+        <source>Mapped AS</source>
+        <translation>نظام مستقل معين</translation>
+    </message>
+    <message>
+        <source>Whether we relay addresses to this peer.</source>
+        <extracomment>Tooltip text for the Address Relay field in the peer details area, which displays whether we relay addresses to this peer (Yes/No).</extracomment>
+        <translation>ما إذا كنا نرحل العناوين إلى هذا النظير.</translation>
+    </message>
+    <message>
+        <source>Address Relay</source>
+        <extracomment>Text title for the Address Relay field in the peer details area, which displays whether we relay addresses to this peer (Yes/No).</extracomment>
+        <translation>ترحيل العنوان</translation>
+    </message>
+    <message>
+        <source>Addresses Processed</source>
+        <extracomment>Text title for the Addresses Processed field in the peer details area, which displays the total number of addresses received from this peer that were processed (excludes addresses that were dropped due to rate-limiting).</extracomment>
+        <translation>العناوين المعالجة</translation>
+    </message>
+    <message>
+        <source>Addresses Rate-Limited</source>
+        <extracomment>Text title for the Addresses Rate-Limited field in the peer details area, which displays the total number of addresses received from this peer that were dropped (not processed) due to rate-limiting.</extracomment>
+        <translation>العناوين المحدودة بالمعدل</translation>
+    </message>
     <message>
         <source>Rescan blockchain files 1</source>
         <translation>إعادة فحص ملفات بلوكشين1</translation>
@@ -2423,6 +3304,22 @@
         <source>To specify a non-default location of the blocks directory use the '%1' option.</source>
         <translation>لتحديد موقع غير افتراضي لدليل الكتل ، استخدم الخيار "%1".</translation>
     </message>
+    <message>
+        <source>Local Addresses</source>
+        <translation>العناوين المحلية</translation>
+    </message>
+    <message>
+        <source>Network addresses that your Dash node is currently using to communicate with other nodes.</source>
+        <translation>عناوين الشبكة التي تستخدمها عقدة Dash الخاصة بك حالياً للتواصل مع العقد الأخرى.</translation>
+    </message>
+    <message>
+        <source>Number of regular Masternodes</source>
+        <translation>عدد الماسترنود العادية</translation>
+    </message>
+    <message>
+        <source>Number of EvoNodes</source>
+        <translation>عدد العقد التطورية</translation>
+    </message>
     <message>
         <source>Current block height</source>
         <translation>ارتفاع الكتلة الحالي</translation>
@@ -2471,10 +3368,50 @@
         <source>PoSe Score</source>
         <translation>نقاط PoSe</translation>
     </message>
+    <message>
+        <source>The transport layer version: %1</source>
+        <translation>إصدار طبقة النقل: %1</translation>
+    </message>
+    <message>
+        <source>Transport</source>
+        <translation>النقل</translation>
+    </message>
+    <message>
+        <source>The BIP324 session ID string in hex.</source>
+        <translation>سلسلة معرف جلسة BIP324 بنظام ست عشري.</translation>
+    </message>
+    <message>
+        <source>Session ID</source>
+        <translation>معرف الجلسة</translation>
+    </message>
+    <message>
+        <source>The network protocol this peer is connected through: IPv4, IPv6, Onion, I2P, or CJDNS.</source>
+        <translation>بروتوكول الشبكة الذي يتصل من خلاله هذا النظير: IPv4 أو IPv6 أو Onion أو I2P أو CJDNS.</translation>
+    </message>
+    <message>
+        <source>Permissions</source>
+        <translation>الأذونات</translation>
+    </message>
+    <message>
+        <source>The direction and type of peer connection: %1</source>
+        <translation>اتجاه ونوع اتصال النظير: %1</translation>
+    </message>
+    <message>
+        <source>Direction/Type</source>
+        <translation>الاتجاه/النوع</translation>
+    </message>
     <message>
         <source>Services</source>
         <translation>خدمات</translation>
     </message>
+    <message>
+        <source>Whether we relay transactions to this peer.</source>
+        <translation>ما إذا كنا نرحل المعاملات إلى هذا النظير.</translation>
+    </message>
+    <message>
+        <source>Transaction Relay</source>
+        <translation>ترحيل المعاملات</translation>
+    </message>
     <message>
         <source>Connection Time</source>
         <translation>مدة الاتصال</translation>
@@ -2511,6 +3448,16 @@
         <source>&amp;Wallet Repair</source>
         <translation>إصلاح المحفظة</translation>
     </message>
+    <message>
+        <source>The total number of addresses received from this peer that were processed (excludes addresses that were dropped due to rate-limiting).</source>
+        <extracomment>Tooltip text for the Addresses Processed field in the peer details area, which displays the total number of addresses received from this peer that were processed (excludes addresses that were dropped due to rate-limiting).</extracomment>
+        <translation>العدد الإجمالي للعناوين المستلمة من هذا النظير التي تمت معالجتها (باستثناء العناوين التي تم إسقاطها بسبب تحديد المعدل).</translation>
+    </message>
+    <message>
+        <source>The total number of addresses received from this peer that were dropped (not processed) due to rate-limiting.</source>
+        <extracomment>Tooltip text for the Addresses Rate-Limited field in the peer details area, which displays the total number of addresses received from this peer that were dropped (not processed) due to rate-limiting.</extracomment>
+        <translation>العدد الإجمالي للعناوين المستلمة من هذا النظير التي تم إسقاطها (لم تتم معالجتها) بسبب تحديد المعدل.</translation>
+    </message>
     <message>
         <source>Wallet repair options.</source>
         <translation>خيارات إصلاح المحفظة.</translation>
@@ -2524,52 +3471,82 @@
         <translation>إعادة بناء فهرس سلسلة كتلة من الملفات الحالية blk000 ؟؟.</translation>
     </message>
     <message>
-        <source>&amp;Disconnect</source>
-        <translation>قطع الاتصال</translation>
+        <source>Inbound: initiated by peer</source>
+        <extracomment>Explanatory text for an inbound peer connection.</extracomment>
+        <translation>وارد: بدأه النظير</translation>
     </message>
     <message>
-        <source>Ban for</source>
-        <translation>حظر ل</translation>
+        <source>Outbound Full Relay: default</source>
+        <extracomment>Explanatory text for an outbound peer connection that relays all network information. This is the default behavior for outbound connections.</extracomment>
+        <translation>صادر بترحيل كامل: افتراضي</translation>
     </message>
     <message>
-        <source>1 &amp;hour</source>
-        <translation>1 &amp;ساعة</translation>
+        <source>Outbound Block Relay: does not relay transactions or addresses</source>
+        <extracomment>Explanatory text for an outbound peer connection that relays network information about blocks and not transactions or addresses.</extracomment>
+        <translation>صادر بترحيل الكتل: لا يرحل المعاملات أو العناوين</translation>
     </message>
     <message>
-        <source>1 &amp;day</source>
-        <translation>1 &amp; يوم</translation>
+        <source>Outbound Manual: added using RPC %1 or %2/%3 configuration options</source>
+        <extracomment>Explanatory text for an outbound peer connection that was established manually through one of several methods. The numbered arguments are stand-ins for the methods available to establish manual connections.</extracomment>
+        <translation>صادر يدوي: تمت الإضافة باستخدام RPC %1 أو خيارات التكوين %2/%3</translation>
     </message>
     <message>
-        <source>1 &amp;week</source>
-        <translation>1 &amp; اسبوع</translation>
+        <source>Outbound Feeler: short-lived, for testing addresses</source>
+        <extracomment>Explanatory text for a short-lived outbound peer connection that is used to test the aliveness of known addresses.</extracomment>
+        <translation>صادر مستشعر: قصير المدة، لاختبار العناوين</translation>
     </message>
     <message>
-        <source>1 &amp;year</source>
-        <translation>1 &amp; سنة</translation>
+        <source>Outbound Address Fetch: short-lived, for soliciting addresses</source>
+        <extracomment>Explanatory text for a short-lived outbound peer connection that is used to request addresses from a peer.</extracomment>
+        <translation>صادر لجلب العناوين: قصير المدة، لطلب العناوين</translation>
     </message>
     <message>
-        <source>&amp;Unban</source>
-        <translation>رفع الحظر</translation>
+        <source>To</source>
+        <translation>إلى</translation>
+    </message>
+    <message>
+        <source>we selected the peer for high bandwidth relay</source>
+        <translation>اخترنا النظير للترحيل بنطاق ترددي عالي</translation>
+    </message>
+    <message>
+        <source>From</source>
+        <translation>من</translation>
     </message>
     <message>
-        <source>Welcome to the %1 RPC console.</source>
-        <translation>مرحبًا بك في وحدة التحكم %1 RPC.</translation>
+        <source>the peer selected us for high bandwidth relay</source>
+        <translation>اختارنا النظير للترحيل بنطاق ترددي عالي</translation>
+    </message>
+    <message>
+        <source>No</source>
+        <translation>لا</translation>
+    </message>
+    <message>
+        <source>no high bandwidth relay selected</source>
+        <translation>لم يتم اختيار ترحيل بنطاق ترددي عالي</translation>
+    </message>
+    <message>
+        <source>&amp;Disconnect</source>
+        <translation>قطع الاتصال</translation>
+    </message>
+    <message>
+        <source>Ban for</source>
+        <translation>حظر ل</translation>
     </message>
     <message>
-        <source>Use up and down arrows to navigate history, and %1 to clear screen.</source>
-        <translation>استخدم السهمين لأعلى ولأسفل للتنقل في المحفوظات ، و%1 لمسح الشاشة.</translation>
+        <source>1 &amp;hour</source>
+        <translation>1 &amp;ساعة</translation>
     </message>
     <message>
-        <source>Type %1 for an overview of available commands.</source>
-        <translation>اكتب %1 للحصول على نظرة عامة حول الأوامر المتوفرة.</translation>
+        <source>1 &amp;week</source>
+        <translation>1 &amp; اسبوع</translation>
     </message>
     <message>
-        <source>For more information on using this console type %1.</source>
-        <translation>لمزيد من المعلومات حول استخدام نوع وحدة التحكم هذه %1.</translation>
+        <source>1 &amp;year</source>
+        <translation>1 &amp; سنة</translation>
     </message>
     <message>
-        <source>WARNING: Scammers have been active, telling users to type commands here, stealing their wallet contents. Do not use this console without fully understanding the ramifications of a command.</source>
-        <translation>تحذير: كان المحتالون نشطين ، ويخبرون المستخدمين بكتابة الأوامر هنا ، وسرقة محتويات محفظتهم. لا تستخدم وحدة التحكم هذه دون فهم تداعيات الأمر بشكل كامل.</translation>
+        <source>&amp;Unban</source>
+        <translation>رفع الحظر</translation>
     </message>
     <message>
         <source>In:</source>
@@ -2583,6 +3560,10 @@
         <source>Network activity disabled</source>
         <translation>تم إلغاء تفعيل الشبكه</translation>
     </message>
+    <message>
+        <source>None</source>
+        <translation>لا شيء</translation>
+    </message>
     <message>
         <source>Total: %1 (Enabled: %2)</source>
         <translation>الإجمالي: %1 (ممكّن: %2)</translation>
@@ -2591,10 +3572,105 @@
         <source>Executing command without any wallet</source>
         <translation>تنفيذ الأمر بدون أي محفظة</translation>
     </message>
+    <message>
+        <source>Ctrl++</source>
+        <extracomment>Main shortcut to increase the RPC console font size.</extracomment>
+        <translation>Ctrl++</translation>
+    </message>
+    <message>
+        <source>Ctrl+=</source>
+        <extracomment>Secondary shortcut to increase the RPC console font size.</extracomment>
+        <translation>Ctrl+=</translation>
+    </message>
+    <message>
+        <source>Ctrl+-</source>
+        <extracomment>Main shortcut to decrease the RPC console font size.</extracomment>
+        <translation>Ctrl+-</translation>
+    </message>
+    <message>
+        <source>Ctrl+_</source>
+        <extracomment>Secondary shortcut to decrease the RPC console font size.</extracomment>
+        <translation>Ctrl+_</translation>
+    </message>
+    <message>
+        <source>Ctrl+Shift+I</source>
+        <translation>Ctrl+Shift+I</translation>
+    </message>
+    <message>
+        <source>Ctrl+Shift+C</source>
+        <translation>Ctrl+Shift+C</translation>
+    </message>
+    <message>
+        <source>Ctrl+Shift+G</source>
+        <translation>Ctrl+Shift+G</translation>
+    </message>
+    <message>
+        <source>Ctrl+Shift+P</source>
+        <translation>Ctrl+Shift+P</translation>
+    </message>
+    <message>
+        <source>Ctrl+Shift+R</source>
+        <translation>Ctrl+Shift+R</translation>
+    </message>
     <message>
         <source>Executing command using "%1" wallet</source>
         <translation>تنفيذ الأمر باستخدام المحفظة "%1"</translation>
     </message>
+    <message>
+        <source>detecting: peer could be v1 or v2</source>
+        <extracomment>Explanatory text for "detecting" transport type.</extracomment>
+        <translation>الكشف: النظير يمكن أن يكون v1 أو v2</translation>
+    </message>
+    <message>
+        <source>v1: unencrypted, plaintext transport protocol</source>
+        <extracomment>Explanatory text for v1 transport type.</extracomment>
+        <translation>v1: بروتوكول نقل غير مشفر، نص عادي</translation>
+    </message>
+    <message>
+        <source>v2: BIP324 encrypted transport protocol</source>
+        <extracomment>Explanatory text for v2 transport type.</extracomment>
+        <translation>v2: بروتوكول نقل مشفر BIP324</translation>
+    </message>
+    <message>
+        <source>&amp;Copy address</source>
+        <extracomment>Context menu action to copy the address of a peer</extracomment>
+        <translation>&amp;نسخ العنوان</translation>
+    </message>
+    <message>
+        <source>1 d&amp;ay</source>
+        <translation>يوم &amp;واحد</translation>
+    </message>
+    <message>
+        <source>&amp;Copy IP/Netmask</source>
+        <extracomment>Context menu action to copy the IP/Netmask of a banned peer. IP/Netmask is the combination of a peer's IP address and its Netmask. For IP address see: https://en.wikipedia.org/wiki/IP_address</extracomment>
+        <translation>&amp;نسخ IP/Netmask</translation>
+    </message>
+    <message>
+        <source>Welcome to the %1 RPC console.
+Use up and down arrows to navigate history, and %2 to clear screen.
+Use %3 and %4 to increase or decrease the font size.
+Type %5 for an overview of available commands.
+For more information on using this console, type %6.
+
+%7WARNING: Scammers have been active, telling users to type commands here, stealing their wallet contents. Do not use this console without fully understanding the ramifications of a command.%8</source>
+        <extracomment>RPC console welcome message. Placeholders %7 and %8 are style tags for the warning content, and they are not space separated from the rest of the text intentionally.</extracomment>
+        <translation>مرحباً بك في وحدة تحكم %1 RPC.
+استخدم أسهم الأعلى والأسفل للتنقل في السجل، و %2 لمسح الشاشة.
+استخدم %3 و %4 لزيادة أو تقليل حجم الخط.
+اكتب %5 للحصول على نظرة عامة على الأوامر المتاحة.
+لمزيد من المعلومات حول استخدام وحدة التحكم هذه، اكتب %6.
+
+%7تحذير: المحتالون نشطون، يطلبون من المستخدمين كتابة أوامر هنا، لسرقة محتويات محفظتهم. لا تستخدم وحدة التحكم هذه دون فهم كامل لتبعات الأمر.%8</translation>
+    </message>
+    <message>
+        <source>Executing…</source>
+        <extracomment>A console message indicating an entered command is currently being executed.</extracomment>
+        <translation>جارٍ التنفيذ…</translation>
+    </message>
+    <message>
+        <source>(peer: %1)</source>
+        <translation>(نظير: %1)</translation>
+    </message>
     <message>
         <source>via %1</source>
         <translation>خلال %1</translation>
@@ -2611,11 +3687,19 @@
         <source>Verified Masternode</source>
         <translation>التحقق من Masternode</translation>
     </message>
+    <message>
+        <source>Yes</source>
+        <translation>نعم</translation>
+    </message>
     <message>
         <source>Unknown</source>
         <translation>غير معروف</translation>
     </message>
-    </context>
+    <message>
+        <source>Never</source>
+        <translation>أبداً</translation>
+    </message>
+</context>
 <context>
     <name>ReceiveCoinsDialog</name>
     <message>
@@ -2634,6 +3718,10 @@
         <source>An optional message to attach to the payment request, which will be displayed when the request is opened.&lt;br&gt;Note: The message will not be sent with the payment over the Dash network.</source>
         <translation>رسالة اختيارية لإرفاقها بطلب الدفع ، والتي سيتم عرضها عند فتح الطلب.&lt;br&gt; ملاحظة: لن يتم إرسال الرسالة مع الدفع عبر شبكة داش.</translation>
     </message>
+    <message>
+        <source>An optional label to associate with the new receiving address (used by you to identify an invoice).  It is also attached to the payment request.</source>
+        <translation>تسمية اختيارية لربطها بعنوان الاستلام الجديد (تستخدمها لتحديد الفاتورة). كما أنها مرفقة بطلب الدفع.</translation>
+    </message>
     <message>
         <source>Use this form to request payments. All fields are &lt;b&gt;optional&lt;/b&gt;.</source>
         <translation>استخدم هذا النموذج لطلب الدفعات. جميع الحقول &lt;b&gt;اختيارية&lt;/b&gt;.</translation>
@@ -2691,28 +3779,60 @@
         <translation>أدخل رسالة لإرفاقها بطلب الدفع</translation>
     </message>
     <message>
-        <source>Copy URI</source>
-        <translation>نسخ العنوان</translation>
+        <source>Copy &amp;URI</source>
+        <translation>نسخ &amp;URI</translation>
     </message>
     <message>
-        <source>Copy address</source>
-        <translation>  انسخ عنوان</translation>
+        <source>&amp;Copy address</source>
+        <translation>&amp;نسخ العنوان</translation>
     </message>
     <message>
-        <source>Copy label</source>
-        <translation> انسخ التسمية</translation>
+        <source>Copy &amp;label</source>
+        <translation>نسخ &amp;التسمية</translation>
     </message>
     <message>
-        <source>Copy message</source>
-        <translation>انسخ الرسالة</translation>
+        <source>Copy &amp;message</source>
+        <translation>نسخ &amp;الرسالة</translation>
     </message>
     <message>
-        <source>Copy amount</source>
-        <translation>نسخ الكمية</translation>
+        <source>Copy &amp;amount</source>
+        <translation>نسخ &amp;المبلغ</translation>
+    </message>
+    <message>
+        <source>Could not unlock wallet.</source>
+        <translation>تعذر فتح المحفظة.</translation>
     </message>
-    </context>
+    <message>
+        <source>Could not generate new address</source>
+        <translation>تعذر إنشاء عنوان جديد</translation>
+    </message>
+</context>
 <context>
     <name>ReceiveRequestDialog</name>
+    <message>
+        <source>Request payment to …</source>
+        <translation>طلب الدفع إلى …</translation>
+    </message>
+    <message>
+        <source>Address:</source>
+        <translation>العنوان:</translation>
+    </message>
+    <message>
+        <source>Amount:</source>
+        <translation>المبلغ:</translation>
+    </message>
+    <message>
+        <source>Label:</source>
+        <translation>التسمية:</translation>
+    </message>
+    <message>
+        <source>Message:</source>
+        <translation>الرسالة:</translation>
+    </message>
+    <message>
+        <source>Wallet:</source>
+        <translation>المحفظة:</translation>
+    </message>
     <message>
         <source>Copy &amp;URI</source>
         <translation>نسخ  &amp;URI</translation>
@@ -2765,6 +3885,34 @@
         <translation>تم الطلب</translation>
     </message>
 </context>
+<context>
+    <name>RestoreWalletActivity</name>
+    <message>
+        <source>Restore Wallet</source>
+        <extracomment>Title of progress window which is displayed when wallets are being restored.</extracomment>
+        <translation>استعادة المحفظة</translation>
+    </message>
+    <message>
+        <source>Restoring Wallet &lt;b&gt;%1&lt;/b&gt;…</source>
+        <extracomment>Descriptive text of the restore wallets progress window which indicates to the user that wallets are currently being restored.</extracomment>
+        <translation>جارٍ استعادة المحفظة &lt;b&gt;%1&lt;/b&gt;…</translation>
+    </message>
+    <message>
+        <source>Restore wallet failed</source>
+        <extracomment>Title of message box which is displayed when the wallet could not be restored.</extracomment>
+        <translation>فشلت استعادة المحفظة</translation>
+    </message>
+    <message>
+        <source>Restore wallet warning</source>
+        <extracomment>Title of message box which is displayed when the wallet is restored with some warning.</extracomment>
+        <translation>تحذير استعادة المحفظة</translation>
+    </message>
+    <message>
+        <source>Restore wallet message</source>
+        <extracomment>Title of message box which is displayed when the wallet is successfully restored.</extracomment>
+        <translation>رسالة استعادة المحفظة</translation>
+    </message>
+</context>
 <context>
     <name>SendCoinsDialog</name>
     <message>
@@ -2799,10 +3947,6 @@
         <source>Fee:</source>
         <translation>رسوم :</translation>
     </message>
-    <message>
-        <source>Dust:</source>
-        <translation>غبار:</translation>
-    </message>
     <message>
         <source>Inputs…</source>
         <translation>مدخلات…</translation>
@@ -2827,6 +3971,14 @@
         <source>Transaction Fee:</source>
         <translation>رسوم المعاملة:</translation>
     </message>
+    <message>
+        <source>When there is less transaction volume than space in the blocks, miners as well as relaying nodes may enforce a minimum fee. Paying only this minimum fee is just fine, but be aware that this can result in a never confirming transaction once there is more demand for dash transactions than the network can process.</source>
+        <translation>عندما يكون حجم المعاملات أقل من المساحة في الكتل، قد يفرض المعدنون وكذلك العقد المرحلة حداً أدنى من الرسوم. دفع هذا الحد الأدنى من الرسوم فقط أمر جيد، ولكن كن على دراية بأن هذا قد يؤدي إلى معاملة لن يتم تأكيدها أبداً بمجرد أن يكون هناك طلب أكبر على معاملات Dash مما يمكن للشبكة معالجته.</translation>
+    </message>
+    <message>
+        <source>A too low fee might result in a never confirming transaction (read the tooltip)</source>
+        <translation>قد تؤدي الرسوم المنخفضة جداً إلى معاملة لن يتم تأكيدها أبداً (اقرأ تلميح الأداة)</translation>
+    </message>
     <message>
         <source>(Smart fee not initialized yet. This usually takes a few blocks…)</source>
         <translation>(الرسوم الذكية لم يتم تهيئتها بعد. عادة ما يستغرق ذلك بضع كتل …)</translation>
@@ -2919,10 +4071,6 @@
         <source>Copy bytes</source>
         <translation>نسخ البايتات </translation>
     </message>
-    <message>
-        <source>Copy dust</source>
-        <translation>نسخ الغبار</translation>
-    </message>
     <message>
         <source>Copy change</source>
         <translation>نسخ التعديل</translation>
@@ -2939,10 +4087,6 @@
         <source>%1 to %2</source>
         <translation>%1 الى %2</translation>
     </message>
-    <message>
-        <source>Are you sure you want to send?</source>
-        <translation>هل أنت متأكد من أنك تريد أن ترسل؟</translation>
-    </message>
     <message>
         <source>&lt;b&gt;(%1 of %2 entries displayed)&lt;/b&gt;</source>
         <translation>&lt;b&gt;( %1 على %2 المداخلات المعروضة)&lt;/b&gt;</translation>
@@ -2955,6 +4099,18 @@
         <source>Confirm the %1 send action</source>
         <translation>قم بتأكيد إجراء إرسال%1</translation>
     </message>
+    <message>
+        <source>Cr&amp;eate Unsigned</source>
+        <translation>إ&amp;نشاء غير موقع</translation>
+    </message>
+    <message>
+        <source> from wallet '%1'</source>
+        <translation> من المحفظة '%1'</translation>
+    </message>
+    <message>
+        <source>%1 to '%2'</source>
+        <translation>%1 إلى '%2'</translation>
+    </message>
     <message>
         <source>%1 funds only</source>
         <translation>%1 أموال فقط</translation>
@@ -3003,6 +4159,51 @@
         <source>Confirm send coins</source>
         <translation>تأكيد الإرسال Coins</translation>
     </message>
+    <message>
+        <source>Save Transaction Data</source>
+        <translation>حفظ بيانات المعاملة</translation>
+    </message>
+    <message>
+        <source>PSBT saved</source>
+        <translation>تم حفظ PSBT</translation>
+    </message>
+    <message>
+        <source>Watch-only balance:</source>
+        <translation>رصيد المراقبة فقط:</translation>
+    </message>
+    <message>
+        <source>Creates a Partially Signed Blockchain Transaction (PSBT) for use with e.g. an offline %1 wallet, or a PSBT-compatible hardware wallet.</source>
+        <translation>ينشئ معاملة بلوكشين موقعة جزئياً (PSBT) للاستخدام مع محفظة %1 غير متصلة بالإنترنت على سبيل المثال، أو محفظة أجهزة متوافقة مع PSBT.</translation>
+    </message>
+    <message>
+        <source>Do you want to create this transaction?</source>
+        <extracomment>Message displayed when attempting to create a transaction. Cautionary text to prompt the user to verify that the displayed transaction details represent the transaction the user intends to create.</extracomment>
+        <translation>هل تريد إنشاء هذه المعاملة؟</translation>
+    </message>
+    <message>
+        <source>Please, review your transaction proposal. This will produce a Partially Signed Blockchain Transaction (PSBT) which you can save or copy and then sign with e.g. an offline %1 wallet, or a PSBT-compatible hardware wallet.</source>
+        <extracomment>Text to inform a user attempting to create a transaction of their current options. At this stage, a user can only create a PSBT. This string is displayed when private keys are disabled and an external signer is not available.</extracomment>
+        <translation>يرجى مراجعة مقترح المعاملة الخاص بك. سينتج عن هذا معاملة بلوكشين موقعة جزئياً (PSBT) يمكنك حفظها أو نسخها ثم التوقيع عليها باستخدام محفظة %1 غير متصلة بالإنترنت على سبيل المثال، أو محفظة أجهزة متوافقة مع PSBT.</translation>
+    </message>
+    <message>
+        <source>Please, review your transaction. You can create and send this transaction or create a Partially Signed Blockchain Transaction (PSBT), which you can save or copy and then sign with, e.g., an offline %1 wallet, or a PSBT-compatible hardware wallet.</source>
+        <extracomment>Text to inform a user attempting to create a transaction of their current options. At this stage, a user can send their transaction or create a PSBT. This string is displayed when both private keys and PSBT controls are enabled.</extracomment>
+        <translation>يرجى مراجعة معاملتك. يمكنك إنشاء هذه المعاملة وإرسالها أو إنشاء معاملة بلوكشين موقعة جزئياً (PSBT)، والتي يمكنك حفظها أو نسخها ثم التوقيع عليها باستخدام محفظة %1 غير متصلة بالإنترنت على سبيل المثال، أو محفظة أجهزة متوافقة مع PSBT.</translation>
+    </message>
+    <message>
+        <source>Please, review your transaction.</source>
+        <extracomment>Text to prompt a user to review the details of the transaction they are attempting to send.</extracomment>
+        <translation>يرجى مراجعة معاملتك.</translation>
+    </message>
+    <message>
+        <source>To review recipient list click "Show Details…"</source>
+        <translation>لمراجعة قائمة المستلمين انقر على "إظهار التفاصيل…"</translation>
+    </message>
+    <message>
+        <source>Partially Signed Transaction (Binary)</source>
+        <extracomment>Expanded name of the binary PSBT file format. See: BIP 174.</extracomment>
+        <translation>معاملة موقعة جزئياً (ثنائية)</translation>
+    </message>
     <message>
         <source>The recipient address is not valid. Please recheck.</source>
         <translation>عنوان المستلم غير صالح. يرجى إعادة الفحص.</translation>
@@ -3122,21 +4323,16 @@
         <source>A message that was attached to the dash: URI which will be stored with the transaction for your reference. Note: This message will not be sent over the Dash network.</source>
         <translation>رسالة تم إرفاقها بخط العطف: عنوان الذي سيتم تخزينه مع المعاملة كمرجع لك. ملاحظة: لن يتم إرسال هذه الرسالة عبر شبكة داش.</translation>
     </message>
+</context>
+<context>
+    <name>SendConfirmationDialog</name>
     <message>
-        <source>This is an unauthenticated payment request.</source>
-        <translation>هذا طلب دفع لم يتم مصادقته.</translation>
-    </message>
-    <message>
-        <source>This is an authenticated payment request.</source>
-        <translation>هذا طلب دفع تمت مصادقته.</translation>
-    </message>
-    <message>
-        <source>Pay To:</source>
-        <translation>ادفع &amp;الى :</translation>
+        <source>Send</source>
+        <translation>إرسال</translation>
     </message>
     <message>
-        <source>Memo:</source>
-        <translation>مذكرة:</translation>
+        <source>Create Unsigned</source>
+        <translation>إنشاء غير موقع</translation>
     </message>
 </context>
 <context>
@@ -3276,6 +4472,10 @@
         <source>Wallet unlock was cancelled.</source>
         <translation>تم الغاء عملية فتح المحفظة</translation>
     </message>
+    <message>
+        <source>No error</source>
+        <translation>لا يوجد خطأ</translation>
+    </message>
     <message>
         <source>Private key for the entered address is not available.</source>
         <translation>المفتاح الخاص للعنوان المدخل غير متاح.</translation>
@@ -3309,11 +4509,22 @@
         <translation>تم تأكيد الرسالة.</translation>
     </message>
 </context>
+<context>
+    <name>SplashScreen</name>
+    <message>
+        <source>(press q to shutdown and continue later)</source>
+        <translation>(اضغط q للإيقاف والمتابعة لاحقاً)</translation>
+    </message>
+    <message>
+        <source>press q to shutdown</source>
+        <translation>اضغط q للإيقاف</translation>
+    </message>
+</context>
 <context>
     <name>TrafficGraphWidget</name>
     <message>
-        <source>KB/s</source>
-        <translation>كيلوبايت/ث</translation>
+        <source>kB/s</source>
+        <translation>كيلوبايت/ثانية</translation>
     </message>
     <message>
         <source>Total</source>
@@ -3330,20 +4541,9 @@
 </context>
 <context>
     <name>TransactionDesc</name>
-    <message numerus="yes">
-        <source>Open for %n more block(s)</source>
-        <translation><numerusform>فتح لـ %n كتل إضافية</numerusform><numerusform>فتح لـ %n كتل إضافية</numerusform><numerusform>فتح لـ %n كتل إضافية</numerusform><numerusform>فتح لـ %n كتل إضافية</numerusform><numerusform>فتح لـ %n كتل إضافية</numerusform><numerusform>فتح لـ %n كتل إضافية</numerusform></translation>
-    </message>
-    <message>
-        <source>Open until %1</source>
-        <translation>مفتوح حتى %1</translation>
-    </message>
-    <message>
-        <source>conflicted</source>
-        <translation>يتعارض</translation>
-    </message>
     <message>
         <source>0/unconfirmed, %1</source>
+        <extracomment>Text explaining the current status of a transaction, shown in the status field of the details window for this transaction. This status represents an unconfirmed transaction that is in the memory pool.</extracomment>
         <translation>0/غير مؤكد ،%1</translation>
     </message>
     <message>
@@ -3356,22 +4556,32 @@
     </message>
     <message>
         <source>abandoned</source>
+        <extracomment>Text explaining the current status of a transaction, shown in the status field of the details window for this transaction. This status represents an abandoned transaction.</extracomment>
         <translation>مهجور</translation>
     </message>
+    <message>
+        <source>conflicted with a transaction with %1 confirmations</source>
+        <extracomment>Text explaining the current status of a transaction, shown in the status field of the details window for this transaction. This status represents an unconfirmed transaction that conflicts with a confirmed transaction.</extracomment>
+        <translation>تعارض مع معاملة لها %1 تأكيدات</translation>
+    </message>
     <message>
         <source>%1/unconfirmed</source>
+        <extracomment>Text explaining the current status of a transaction, shown in the status field of the details window for this transaction. This status represents a transaction confirmed in at least one block, but less than 6 blocks, and still not locked via ChainLocks.</extracomment>
         <translation>غير مؤكدة/%1</translation>
     </message>
     <message>
         <source>%1 confirmations</source>
+        <extracomment>Text explaining the current status of a transaction, shown in the status field of the details window for this transaction. This status represents a transaction confirmed in 6 or more blocks or locked via ChainLocks.</extracomment>
         <translation>تأكيد %1</translation>
     </message>
     <message>
         <source>locked via ChainLocks</source>
+        <extracomment>Text explaining the current status of a transaction, shown in the status field of the details window for this transaction. This status represents a transaction confirmed in at least one block and has been locked by ChainLocks.</extracomment>
         <translation>مغلق عبر ChainLocks</translation>
     </message>
     <message>
         <source>verified via InstantSend</source>
+        <extracomment>Text explaining the current status of a transaction, shown in the status field of the details window for this transaction. This status represents an unconfirmed transaction that has been locked by InstantSend.</extracomment>
         <translation>محقق من فبل الإرسال الفوري</translation>
     </message>
     <message>
@@ -3390,6 +4600,10 @@
         <source>Generated</source>
         <translation>تم اصداره.</translation>
     </message>
+    <message>
+        <source>Platform Transfer</source>
+        <translation>نقل المنصة</translation>
+    </message>
     <message>
         <source>From</source>
         <translation>من</translation>
@@ -3520,14 +4734,6 @@
         <source>Address / Label</source>
         <translation>تسمية / عنوان</translation>
     </message>
-    <message numerus="yes">
-        <source>Open for %n more block(s)</source>
-        <translation><numerusform>فتح لـ %n كتل إضافية</numerusform><numerusform>فتح لـ %n كتل إضافية</numerusform><numerusform>فتح لـ %n كتل إضافية</numerusform><numerusform>فتح لـ %n كتل إضافية</numerusform><numerusform>فتح لـ %n كتل إضافية</numerusform><numerusform>فتح لـ %n كتل إضافية</numerusform></translation>
-    </message>
-    <message>
-        <source>Open until %1</source>
-        <translation>مفتوح حتى %1</translation>
-    </message>
     <message>
         <source>Unconfirmed</source>
         <translation>غير مؤكد</translation>
@@ -3588,6 +4794,10 @@
         <source>Mined</source>
         <translation>Mined</translation>
     </message>
+    <message>
+        <source>Platform Transfer</source>
+        <translation>نقل المنصة</translation>
+    </message>
     <message>
         <source>%1 Mixing</source>
         <translation>%1 خلط</translation>
@@ -3715,6 +4925,10 @@
         <source>Mined</source>
         <translation>Mined</translation>
     </message>
+    <message>
+        <source>Platform Transfer</source>
+        <translation>نقل المنصة</translation>
+    </message>
     <message>
         <source>Other</source>
         <translation>اخرى</translation>
@@ -3728,49 +4942,63 @@
         <translation>الحد الأدنى</translation>
     </message>
     <message>
-        <source>Abandon transaction</source>
-        <translation>التخلي عن المعاملة</translation>
+        <source>&amp;Copy address</source>
+        <translation>&amp;نسخ العنوان</translation>
     </message>
     <message>
-        <source>Copy address</source>
-        <translation>  انسخ عنوان</translation>
+        <source>Copy &amp;label</source>
+        <translation>نسخ &amp;التسمية</translation>
     </message>
     <message>
-        <source>Copy label</source>
-        <translation> انسخ التسمية</translation>
+        <source>Copy &amp;amount</source>
+        <translation>نسخ &amp;المبلغ</translation>
     </message>
     <message>
-        <source>Copy amount</source>
-        <translation>نسخ الكمية</translation>
+        <source>Copy transaction &amp;ID</source>
+        <translation>نسخ &amp;معرف المعاملة</translation>
+    </message>
+    <message>
+        <source>Copy &amp;raw transaction</source>
+        <translation>نسخ المعاملة ال&amp;خام</translation>
+    </message>
+    <message>
+        <source>Copy full transaction &amp;details</source>
+        <translation>نسخ &amp;تفاصيل المعاملة الكاملة</translation>
     </message>
     <message>
-        <source>Copy transaction ID</source>
-        <translation>نسخ رقم العملية</translation>
+        <source>&amp;Show transaction details</source>
+        <translation>&amp;إظهار تفاصيل المعاملة</translation>
     </message>
     <message>
-        <source>Copy raw transaction</source>
-        <translation>نسخ المعاملة الخام</translation>
+        <source>A&amp;bandon transaction</source>
+        <translation>&amp;التخلي عن المعاملة</translation>
     </message>
     <message>
-        <source>Copy full transaction details</source>
-        <translation>نسخ كامل تفاصيل المعاملة</translation>
+        <source>Rese&amp;nd transaction</source>
+        <translation>إعا&amp;دة إرسال المعاملة</translation>
     </message>
     <message>
-        <source>Edit address label</source>
-        <translation>تحرير تسمية العنوان</translation>
+        <source>&amp;Edit address label</source>
+        <translation>&amp;تعديل تسمية العنوان</translation>
     </message>
     <message>
-        <source>Show transaction details</source>
-        <translation>عرض تفاصيل المعاملة</translation>
+        <source>Show address &amp;QR code</source>
+        <translation>عرض رمز &amp;QR للعنوان</translation>
     </message>
     <message>
-        <source>Show address QR code</source>
-        <translation>إظهار رمز الاستجابة السريعة العنوان</translation>
+        <source>Show in %1</source>
+        <extracomment>Transactions table context menu action to show the selected transaction in a third-party block explorer. %1 is a stand-in argument for the URL of the explorer.</extracomment>
+        <translation>عرض في %1</translation>
     </message>
     <message>
         <source>Export Transaction History</source>
         <translation>تصدير تفاصيل المعاملات</translation>
     </message>
+    <message>
+        <source>Comma separated file</source>
+        <extracomment>Expanded name of the CSV file format. See: https://en.wikipedia.org/wiki/Comma-separated_values.</extracomment>
+        <translation>ملف مفصول بفواصل</translation>
+    </message>
     <message>
         <source>Confirmed</source>
         <translation>تأكيد</translation>
@@ -3849,10 +5077,54 @@
         <source>Closing the wallet for too long can result in having to resync the entire chain if pruning is enabled.</source>
         <translation>قد يؤدي إغلاق المحفظة لفترة طويلة إلى الاضطرار إلى إعادة مزامنة السلسلة بأكملها إذا تم تمكين التقليم.</translation>
     </message>
-    </context>
+    <message>
+        <source>Close all wallets</source>
+        <translation>إغلاق جميع المحافظ</translation>
+    </message>
+    <message>
+        <source>Are you sure you wish to close all wallets?</source>
+        <translation>هل أنت متأكد من أنك تريد إغلاق جميع المحافظ؟</translation>
+    </message>
+</context>
 <context>
     <name>WalletFrame</name>
-    </context>
+    <message>
+        <source>No wallet has been loaded.
+Go to File &gt; Open Wallet to load a wallet.
+- OR -</source>
+        <translation>لم يتم تحميل أي محفظة.
+انتقل إلى ملف &gt; فتح محفظة لتحميل محفظة.
+- أو -</translation>
+    </message>
+    <message>
+        <source>Create a new wallet</source>
+        <translation>إنشاء محفظة جديدة</translation>
+    </message>
+    <message>
+        <source>Error</source>
+        <translation>خطأ</translation>
+    </message>
+    <message>
+        <source>Unable to decode PSBT from clipboard (invalid base64)</source>
+        <translation>غير قادر على فك تشفير PSBT من الحافظة (base64 غير صالح)</translation>
+    </message>
+    <message>
+        <source>Load Transaction Data</source>
+        <translation>تحميل بيانات المعاملة</translation>
+    </message>
+    <message>
+        <source>Partially Signed Transaction (*.psbt)</source>
+        <translation>معاملة موقعة جزئياً (*.psbt)</translation>
+    </message>
+    <message>
+        <source>PSBT file must be smaller than 100 MiB</source>
+        <translation>يجب أن يكون ملف PSBT أصغر من 100 ميبيبايت</translation>
+    </message>
+    <message>
+        <source>Unable to decode PSBT</source>
+        <translation>غير قادر على فك تشفير PSBT</translation>
+    </message>
+</context>
 <context>
     <name>WalletModel</name>
     <message>
@@ -3878,6 +5150,11 @@
         <source>Selected amount:</source>
         <translation>المبلغ المحدد:</translation>
     </message>
+    <message>
+        <source>Wallet Data</source>
+        <extracomment>Name of the wallet data file format.</extracomment>
+        <translation>بيانات المحفظة</translation>
+    </message>
     <message>
         <source>Backup Wallet</source>
         <translation>نسخ احتياط للمحفظة</translation>
@@ -3905,14 +5182,6 @@
 </context>
 <context>
     <name>dash-core</name>
-    <message>
-        <source>Error: Listening for incoming connections failed (listen returned error %s)</source>
-        <translation>خطأ: فشل الاستماع إلى الاتصالات الواردة (تم إرجاع الخطأ %s)</translation>
-    </message>
-    <message>
-        <source>Fee estimation failed. Fallbackfee is disabled. Wait a few blocks or enable -fallbackfee.</source>
-        <translation>فشل تقدير الرسوم. تم تعطيل الرسوم الاحتياطية. انتظر بضع كتل أو قم بتمكين -رسوم التراجع.</translation>
-    </message>
     <message>
         <source>This error could occur if this wallet was not shutdown cleanly and was last loaded using a build with a newer version of Berkeley DB. If so, please use the software that last loaded this wallet</source>
         <translation>يمكن أن يحدث هذا الخطأ إذا لم يتم إغلاق هذه المحفظة بشكل سليم وتم تحميلها مؤخرًا باستخدام إصدار أحدث من Berkeley DB. إذا كان الأمر كذلك ، فالرجاء استخدام البرنامج الذي تم تحميل هذه المحفظة آخر مرة</translation>
@@ -3970,16 +5239,20 @@
         <translation>خطأ في القراءة من قاعدة البيانات ، والتوقف.</translation>
     </message>
     <message>
-        <source>Failed to listen on any port. Use -listen=0 if you want this.</source>
-        <translation>فشل في الاستماع على أي منفذ. استخدام الاستماع = 0 إذا كنت تريد هذا.</translation>
+        <source>Error: Missing checksum</source>
+        <translation>خطأ: المجموع الاختباري مفقود</translation>
+    </message>
+    <message>
+        <source>Error: Unable to parse version %u as a uint32_t</source>
+        <translation>خطأ: غير قادر على تحليل الإصدار %u كـ uint32_t</translation>
     </message>
     <message>
-        <source>-maxtxfee is set very high! Fees this large could be paid on a single transaction.</source>
-        <translation>يتم تعيين maxtxfee عالية جدا! يمكن دفع هذه الرسوم في معاملة واحدة.</translation>
+        <source>Error: Unable to write record to new wallet</source>
+        <translation>خطأ: غير قادر على كتابة السجل إلى المحفظة الجديدة</translation>
     </message>
     <message>
-        <source>Cannot provide specific connections and have addrman find outgoing connections at the same.</source>
-        <translation>لا يمكن توفير اتصالات محددة ولديك addrman يجد الاتصالات الصادرة في نفس الوقت.</translation>
+        <source>Failed to listen on any port. Use -listen=0 if you want this.</source>
+        <translation>فشل في الاستماع على أي منفذ. استخدام الاستماع = 0 إذا كنت تريد هذا.</translation>
     </message>
     <message>
         <source>Found unconfirmed denominated outputs, will wait till they confirm to continue.</source>
@@ -3990,13 +5263,17 @@
         <translation>تم تحديد أحداث مأخذ توصيل غير صالحة ('%s'). يتم دعم هذه الأوضاع فقط: %s</translation>
     </message>
     <message>
-        <source>Invalid amount for -maxtxfee=&lt;amount&gt;: '%s' (must be at least the minrelay fee of %s to prevent stuck transactions)</source>
-        <translation>كمية غير صالحة لـ -maxtxfee = : '%s' &lt;amount&gt; (يجب أن تكون على الأقل رسوم minrelay %s لمنع المعاملات عالقة)</translation>
+        <source>SQLiteDatabase: Unknown sqlite wallet schema version %d. Only version %d is supported</source>
+        <translation>قاعدة بيانات SQLite: إصدار مخطط محفظة sqlite غير معروف %d. الإصدار %d فقط مدعوم</translation>
     </message>
     <message>
         <source>Transaction index can't be disabled with governance validation enabled. Either start with -disablegovernance command line switch or enable transaction index.</source>
         <translation>لا يمكن تعطيل فهرس المعاملات مع تمكين التحقق من صحة الحوكمة. إما أن تبدأ بمفتاح سطر الأوامر -disablegovernance أو تمكين فهرس المعاملات.</translation>
     </message>
+    <message>
+        <source>Unsupported category-specific logging level -loglevel=%s. Expected -loglevel=&lt;category&gt;:&lt;loglevel&gt;. Valid categories: %s. Valid loglevels: %s.</source>
+        <translation>مستوى تسجيل خاص بالفئة غير مدعوم -loglevel=%s. متوقع -loglevel=&lt;category&gt;:&lt;loglevel&gt;. الفئات الصالحة: %s. مستويات السجل الصالحة: %s.</translation>
+    </message>
     <message>
         <source>Can't mix: no compatible inputs found!</source>
         <translation>لا يمكن الجمع: لم يتم العثور على مدخلات متوافقة!</translation>
@@ -4005,6 +5282,14 @@
         <source>Entry exceeds maximum size.</source>
         <translation>يتجاوز الدخول الحد الأقصى للحجم.</translation>
     </message>
+    <message>
+        <source>Error upgrading evo database for EHF</source>
+        <translation>خطأ في ترقية قاعدة بيانات evo لـ EHF</translation>
+    </message>
+    <message>
+        <source>Failed to commit Evo database</source>
+        <translation>فشل في تنفيذ قاعدة بيانات Evo</translation>
+    </message>
     <message>
         <source>Found enough users, signing ( waiting %s )</source>
         <translation>العثور على عدد كافٍ من المستخدمين ، والتوقيع (الانتظار %s)</translation>
@@ -4029,18 +5314,14 @@
         <source>Insufficient funds.</source>
         <translation>رصيد غير كاف.</translation>
     </message>
-    <message>
-        <source>Invalid amount for -discardfee=&lt;amount&gt;: '%s'</source>
-        <translation>مبلغ غير صالح لـ -discardfee =&lt;amount&gt;: '%s'</translation>
-    </message>
-    <message>
-        <source>Invalid amount for -paytxfee=&lt;amount&gt;: '%s' (must be at least %s)</source>
-        <translation>مبلغ غير صالح لـ -paytxfee = : '%s' &lt;amount&gt; (يجب أن يكون على الأقل %s)</translation>
-    </message>
     <message>
         <source>Invalid minimum number of spork signers specified with -minsporkkeys</source>
         <translation>الحد الأدنى لعدد مميّزي مواقع السبط المحدد </translation>
     </message>
+    <message>
+        <source>Listening for incoming connections failed (listen returned error %s)</source>
+        <translation>فشل الاستماع للاتصالات الواردة (أرجع الاستماع خطأ %s)</translation>
+    </message>
     <message>
         <source>Lock is already in place.</source>
         <translation>قفل بالفعل في المكان.</translation>
@@ -4097,6 +5378,10 @@
         <source>Synchronizing governance objects…</source>
         <translation>مزامنة كائنات الحوكمة …</translation>
     </message>
+    <message>
+        <source>Transaction change output index out of range</source>
+        <translation>مؤشر مخرجات تغيير المعاملة خارج النطاق</translation>
+    </message>
     <message>
         <source>Unable to start HTTP server. See debug log for details.</source>
         <translation>غير قادر على بدء خادم ال HTTP. راجع سجل تصحيح الأخطاء للحصول على التفاصيل.</translation>
@@ -4105,6 +5390,10 @@
         <source>Unknown response.</source>
         <translation>استجابة غير معروفة.</translation>
     </message>
+    <message>
+        <source>Unsupported global logging level -loglevel=%s. Valid values: %s.</source>
+        <translation>مستوى تسجيل عام غير مدعوم -loglevel=%s. القيم الصالحة: %s.</translation>
+    </message>
     <message>
         <source>User Agent comment (%s) contains unsafe characters.</source>
         <translation>يحتوي تعليق وكيل المستخدم (%s) على أحرف غير آمنة.</translation>
@@ -4145,6 +5434,10 @@
         <source>Make sure to encrypt your wallet and delete all non-encrypted backups after you have verified that the wallet works!</source>
         <translation>تأكد من تشفير محفظتك وحذف جميع النسخ الاحتياطية غير المشفرة بعد التحقق من عمل المحفظة!</translation>
     </message>
+    <message>
+        <source>More than one onion bind address is provided. Using %s for the automatically created Tor onion service.</source>
+        <translation>تم توفير أكثر من عنوان ربط onion واحد. استخدام %s لخدمة Tor onion التي تم إنشاؤها تلقائياً.</translation>
+    </message>
     <message>
         <source>Prune configured below the minimum of %d MiB.  Please use a higher number.</source>
         <translation>تم تكوين Prune أسفل الحد الأدنى من %d MiB. يرجى استخدام عدد أكبر.</translation>
@@ -4173,10 +5466,6 @@
         <source>Wallet is locked, can't replenish keypool! Automatic backups and mixing are disabled, please unlock your wallet to replenish keypool.</source>
         <translation>المحفظة مؤمّنة ، ولا يمكن تجديد مفتاح keypool! تم تعطيل النسخ الاحتياطي التلقائي والاختلاط ، يرجى فتح محفظتك لتجديد keypool</translation>
     </message>
-    <message>
-        <source>You need to rebuild the database using -reindex to change -timestampindex</source>
-        <translation>تحتاج إلى إعادة بناء قاعدة البيانات باستخدام -reindex لتغيير -timestampindex</translation>
-    </message>
     <message>
         <source>You need to rebuild the database using -reindex to go back to unpruned mode.  This will redownload the entire blockchain</source>
         <translation>تحتاج إلى إعادة إنشاء قاعدة البيانات باستخدام -reindex للعودة إلى الوضعية الغير مجردة. هذا سوف يعيد تحميل سلسلة الكتل بأكملها</translation>
@@ -4218,20 +5507,32 @@
         <translation>خطأ في تحميل%s: لا يمكن تعطيل المفاتيح الخاصة إلا أثناء الإنشاء</translation>
     </message>
     <message>
-        <source>Error upgrading evo database</source>
-        <translation>خطأ في ترقية قاعدة بيانات evo</translation>
+        <source>Error: Couldn't create cursor into database</source>
+        <translation>خطأ: تعذر إنشاء مؤشر في قاعدة البيانات</translation>
     </message>
     <message>
         <source>Error: Disk space is low for %s</source>
         <translation>خطأ: مساحة القرص منخفضة لـ%s</translation>
     </message>
     <message>
-        <source>Exceeded max tries.</source>
-        <translation>تم تجاوز الحد الأقصى من المحاولات.</translation>
+        <source>Error: Dumpfile checksum does not match. Computed %s, expected %s</source>
+        <translation>خطأ: المجموع الاختباري لملف التفريغ لا يتطابق. محسوب %s، متوقع %s</translation>
+    </message>
+    <message>
+        <source>Error: Got key that was not hex: %s</source>
+        <translation>خطأ: تم الحصول على مفتاح ليس بصيغة ست عشرية: %s</translation>
+    </message>
+    <message>
+        <source>Error: Got value that was not hex: %s</source>
+        <translation>خطأ: تم الحصول على قيمة ليست بصيغة ست عشرية: %s</translation>
+    </message>
+    <message>
+        <source>Error: Keypool ran out, please call keypoolrefill first</source>
+        <translation>خطأ: نفد مجمع المفاتيح، يرجى استدعاء keypoolrefill أولاً</translation>
     </message>
     <message>
-        <source>Failed to commit EvoDB</source>
-        <translation>فشل الالتزام بـ EvoDB</translation>
+        <source>Error: No addresses available.</source>
+        <translation>خطأ: لا توجد عناوين متاحة.</translation>
     </message>
     <message>
         <source>Failed to create backup %s!</source>
@@ -4249,17 +5550,29 @@
         <source>Failed to rescan the wallet during initialization</source>
         <translation>فشل في إعادة فحص المحفظة أثناء التهيئة</translation>
     </message>
+    <message>
+        <source>Failed to verify database</source>
+        <translation>فشل في التحقق من قاعدة البيانات</translation>
+    </message>
+    <message>
+        <source>Fee rate (%s) is lower than the minimum fee rate setting (%s)</source>
+        <translation>معدل الرسوم (%s) أقل من إعداد الحد الأدنى لمعدل الرسوم (%s)</translation>
+    </message>
     <message>
         <source>Found enough users, signing…</source>
         <translation>العثور على عدد كافٍ من المستخدمين ، والتوقيع…</translation>
     </message>
     <message>
-        <source>Invalid P2P permission: '%s'</source>
-        <translation>إذن P2P غير صالح: '%s'</translation>
+        <source>Ignoring duplicate -wallet %s.</source>
+        <translation>تجاهل المحفظة المكررة -wallet %s.</translation>
+    </message>
+    <message>
+        <source>Input not found or already spent</source>
+        <translation>لم يتم العثور على المدخل أو تم إنفاقه بالفعل</translation>
     </message>
     <message>
-        <source>Invalid amount for -fallbackfee=&lt;amount&gt;: '%s'</source>
-        <translation>المبلغ غير صالح fallbackfee = &lt;amount&gt; :'%s-</translation>
+        <source>Invalid P2P permission: '%s'</source>
+        <translation>إذن P2P غير صالح: '%s'</translation>
     </message>
     <message>
         <source>Invalid masternodeblsprivkey. Please see documentation.</source>
@@ -4281,6 +5594,10 @@
         <source>Mixing in progress…</source>
         <translation>الدمج قيد التقدم …</translation>
     </message>
+    <message>
+        <source>No addresses available</source>
+        <translation>لا توجد عناوين متاحة</translation>
+    </message>
     <message>
         <source>No errors detected.</source>
         <translation>لم يتم اكتشاف أخطاء.</translation>
@@ -4309,6 +5626,22 @@
         <source>Prune mode is incompatible with -txindex.</source>
         <translation>وضع التجريد غير متوافق مع -txindex.</translation>
     </message>
+    <message>
+        <source>SQLiteDatabase: Failed to execute statement to verify database: %s</source>
+        <translation>قاعدة بيانات SQLite: فشل تنفيذ البيان للتحقق من قاعدة البيانات: %s</translation>
+    </message>
+    <message>
+        <source>SQLiteDatabase: Failed to prepare statement to verify database: %s</source>
+        <translation>قاعدة بيانات SQLite: فشل تحضير البيان للتحقق من قاعدة البيانات: %s</translation>
+    </message>
+    <message>
+        <source>SQLiteDatabase: Failed to read database verification error: %s</source>
+        <translation>قاعدة بيانات SQLite: فشل قراءة خطأ التحقق من قاعدة البيانات: %s</translation>
+    </message>
+    <message>
+        <source>SQLiteDatabase: Unexpected application id. Expected %u, got %u</source>
+        <translation>قاعدة بيانات SQLite: معرف تطبيق غير متوقع. متوقع %u، تم الحصول على %u</translation>
+    </message>
     <message>
         <source>Section [%s] is not recognized.</source>
         <translation>المقطع [%s] غير معروف.</translation>
@@ -4341,6 +5674,10 @@
         <source>This is the transaction fee you will pay if you send a transaction.</source>
         <translation>هذه هي رسوم المعاملة التي ستدفعها إذا أرسلت معاملة.</translation>
     </message>
+    <message>
+        <source>Topping up keypool…</source>
+        <translation>تعبئة مجمع المفاتيح…</translation>
+    </message>
     <message>
         <source>Transaction amounts must not be negative</source>
         <translation>يجب ألا تكون قيمة المعاملة سلبية</translation>
@@ -4369,13 +5706,17 @@
         <source>Unable to generate initial keys</source>
         <translation>تعذر إنشاء المفاتيح الأولية</translation>
     </message>
+    <message>
+        <source>Unable to open %s for writing</source>
+        <translation>غير قادر على فتح %s للكتابة</translation>
+    </message>
     <message>
         <source>Unknown -blockfilterindex value %s.</source>
         <translation>قيمة فهرس كتلة التصفية غير معروفة%s.</translation>
     </message>
     <message>
-        <source>Upgrading UTXO database</source>
-        <translation>ترقية قاعدة بيانات UTXO</translation>
+        <source>Unknown new rules activated (versionbit %i)</source>
+        <translation>تم تفعيل قواعد جديدة غير معروفة (بت الإصدار %i)</translation>
     </message>
     <message>
         <source>Verifying blocks…</source>
@@ -4394,16 +5735,12 @@
         <translation>لم يكن قادراً على إنشاء مجلد النسخ الاحتياطي المحفظة %s!</translation>
     </message>
     <message>
-        <source>You can not start a masternode with wallet enabled.</source>
-        <translation>لا يمكنك بدء Masternode مع محفظة ممكنة.</translation>
-    </message>
-    <message>
-        <source>You need to rebuild the database using -reindex to change -addressindex</source>
-        <translation>تحتاج إلى إعادة بناء قاعدة البيانات باستخدام -reindex لتغيير -addressindex</translation>
+        <source>Wiping wallet transactions…</source>
+        <translation>مسح معاملات المحفظة…</translation>
     </message>
     <message>
-        <source>You need to rebuild the database using -reindex to change -spentindex</source>
-        <translation>تحتاج إلى إعادة بناء قاعدة البيانات باستخدام -reindex لتغيير -spentindex</translation>
+        <source>You can not start a masternode with wallet enabled.</source>
+        <translation>لا يمكنك بدء Masternode مع محفظة ممكنة.</translation>
     </message>
     <message>
         <source>no mixing available.</source>
@@ -4421,6 +5758,22 @@
         <source>%s uses exact denominated amounts to send funds, you might simply need to mix some more coins.</source>
         <translation>يستخدم%s مبالغ محددة بدقة لإرسال الأموال ، قد تحتاج ببساطة إلى خلط بعض العملات المعدنية.</translation>
     </message>
+    <message>
+        <source>-reindex-chainstate option is not compatible with -blockfilterindex. Please temporarily disable blockfilterindex while using -reindex-chainstate, or replace -reindex-chainstate with -reindex to fully rebuild all indexes.</source>
+        <translation>خيار -reindex-chainstate غير متوافق مع -blockfilterindex. يرجى تعطيل blockfilterindex مؤقتاً أثناء استخدام -reindex-chainstate، أو استبدال -reindex-chainstate بـ -reindex لإعادة بناء جميع الفهارس بالكامل.</translation>
+    </message>
+    <message>
+        <source>-reindex-chainstate option is not compatible with -coinstatsindex. Please temporarily disable coinstatsindex while using -reindex-chainstate, or replace -reindex-chainstate with -reindex to fully rebuild all indexes.</source>
+        <translation>خيار -reindex-chainstate غير متوافق مع -coinstatsindex. يرجى تعطيل coinstatsindex مؤقتاً أثناء استخدام -reindex-chainstate، أو استبدال -reindex-chainstate بـ -reindex لإعادة بناء جميع الفهارس بالكامل.</translation>
+    </message>
+    <message>
+        <source>-reindex-chainstate option is not compatible with -txindex. Please temporarily disable txindex while using -reindex-chainstate, or replace -reindex-chainstate with -reindex to fully rebuild all indexes.</source>
+        <translation>خيار -reindex-chainstate غير متوافق مع -txindex. يرجى تعطيل txindex مؤقتاً أثناء استخدام -reindex-chainstate، أو استبدال -reindex-chainstate بـ -reindex لإعادة بناء جميع الفهارس بالكامل.</translation>
+    </message>
+    <message>
+        <source>Cannot downgrade wallet from version %i to version %i. Wallet version unchanged.</source>
+        <translation>لا يمكن تخفيض إصدار المحفظة من الإصدار %i إلى الإصدار %i. إصدار المحفظة دون تغيير.</translation>
+    </message>
     <message>
         <source>Cannot obtain a lock on data directory %s. %s is probably already running.</source>
         <translation>لا يمكن الحصول على قفل على دليل البيانات %s. من المحتمل أن %s يعمل بالفعل.</translation>
@@ -4433,14 +5786,82 @@
         <source>Error loading %s: You can't enable HD on an already existing non-HD wallet</source>
         <translation>خطأ في تحميل %s: لا يمكنك تمكين HD في محفظة موجودة بالفعل بخلاف HD</translation>
     </message>
+    <message>
+        <source>Error loading wallet. Wallet requires blocks to be downloaded, and software does not currently support loading wallets while blocks are being downloaded out of order when using assumeutxo snapshots. Wallet should be able to load successfully after node sync reaches height %s</source>
+        <translation>خطأ في تحميل المحفظة. تتطلب المحفظة تنزيل الكتل، ولا يدعم البرنامج حالياً تحميل المحافظ أثناء تنزيل الكتل خارج الترتيب عند استخدام لقطات assumeutxo. يجب أن تكون المحفظة قادرة على التحميل بنجاح بعد وصول مزامنة العقدة إلى الارتفاع %s</translation>
+    </message>
     <message>
         <source>Error reading %s! All keys read correctly, but transaction data or address book entries might be missing or incorrect.</source>
         <translation>خطأ في قراءة %s! قراءة كافة المفاتيح بشكل صحيح ، ولكن قد تكون بيانات المعاملة أو إدخالات دفتر العناوين مفقودة أو غير صحيحة.</translation>
     </message>
+    <message>
+        <source>Error: Dumpfile format record is incorrect. Got "%s", expected "format".</source>
+        <translation>خطأ: سجل تنسيق ملف التفريغ غير صحيح. تم الحصول على "%s"، متوقع "format".</translation>
+    </message>
+    <message>
+        <source>Error: Dumpfile identifier record is incorrect. Got "%s", expected "%s".</source>
+        <translation>خطأ: سجل معرف ملف التفريغ غير صحيح. تم الحصول على "%s"، متوقع "%s".</translation>
+    </message>
+    <message>
+        <source>Error: Dumpfile version is not supported. This version of bitcoin-wallet only supports version 1 dumpfiles. Got dumpfile with version %s</source>
+        <translation>خطأ: إصدار ملف التفريغ غير مدعوم. هذا الإصدار من bitcoin-wallet يدعم فقط ملفات التفريغ الإصدار 1. تم الحصول على ملف تفريغ بالإصدار %s</translation>
+    </message>
+    <message>
+        <source>Failed to rename invalid peers.dat file. Please move or delete it and try again.</source>
+        <translation>فشل في إعادة تسمية ملف peers.dat غير صالح. يرجى نقله أو حذفه والمحاولة مرة أخرى.</translation>
+    </message>
+    <message>
+        <source>Fee estimation failed. Fallbackfee is disabled. Wait a few blocks or enable %s.</source>
+        <translation>فشل تقدير الرسوم. تم تعطيل رسوم الاحتياط. انتظر بضع كتل أو قم بتمكين %s.</translation>
+    </message>
+    <message>
+        <source>File %s already exists. If you are sure this is what you want, move it out of the way first.</source>
+        <translation>الملف %s موجود بالفعل. إذا كنت متأكداً من أن هذا ما تريده، انقله بعيداً أولاً.</translation>
+    </message>
+    <message>
+        <source>Incompatible options: -dnsseed=1 was explicitly specified, but -onlynet forbids connections to IPv4/IPv6</source>
+        <translation>خيارات غير متوافقة: تم تحديد -dnsseed=1 صراحةً، لكن -onlynet يمنع الاتصالات بـ IPv4/IPv6</translation>
+    </message>
     <message>
         <source>Incorrect or no devnet genesis block found. Wrong datadir for devnet specified?</source>
         <translation>تم العثور على كتلة تكوين devnet غير صحيحة أو لا. datadir خاطئة ل devnet المحدد؟</translation>
     </message>
+    <message>
+        <source>Invalid amount for %s=&lt;amount&gt;: '%s' (must be at least the minrelay fee of %s to prevent stuck transactions)</source>
+        <translation>مبلغ غير صالح لـ %s=&lt;amount&gt;: '%s' (يجب أن يكون على الأقل رسوم الحد الأدنى للترحيل %s لمنع المعاملات العالقة)</translation>
+    </message>
+    <message>
+        <source>Invalid or corrupt peers.dat (%s). If you believe this is a bug, please report it to %s. As a workaround, you can move the file (%s) out of the way (rename, move, or delete) to have a new one created on the next start.</source>
+        <translation>ملف peers.dat (%s) غير صالح أو تالف. إذا كنت تعتقد أن هذا خطأ، يرجى الإبلاغ عنه إلى %s. كحل بديل، يمكنك نقل الملف (%s) بعيداً (إعادة تسمية أو نقل أو حذف) لإنشاء ملف جديد في البداية التالية.</translation>
+    </message>
+    <message>
+        <source>No dump file provided. To use createfromdump, -dumpfile=&lt;filename&gt; must be provided.</source>
+        <translation>لم يتم توفير ملف تفريغ. لاستخدام createfromdump، يجب توفير -dumpfile=&lt;filename&gt;.</translation>
+    </message>
+    <message>
+        <source>No dump file provided. To use dump, -dumpfile=&lt;filename&gt; must be provided.</source>
+        <translation>لم يتم توفير ملف تفريغ. لاستخدام dump، يجب توفير -dumpfile=&lt;filename&gt;.</translation>
+    </message>
+    <message>
+        <source>No wallet file format provided. To use createfromdump, -format=&lt;format&gt; must be provided.</source>
+        <translation>لم يتم توفير تنسيق ملف المحفظة. لاستخدام createfromdump، يجب توفير -format=&lt;format&gt;.</translation>
+    </message>
+    <message>
+        <source>Outbound connections restricted to CJDNS (-onlynet=cjdns) but -cjdnsreachable is not provided</source>
+        <translation>الاتصالات الصادرة مقيدة بـ CJDNS (-onlynet=cjdns) ولكن لم يتم توفير -cjdnsreachable</translation>
+    </message>
+    <message>
+        <source>Outbound connections restricted to Tor (-onlynet=onion) but the proxy for reaching the Tor network is explicitly forbidden: -onion=0</source>
+        <translation>الاتصالات الصادرة مقيدة بـ Tor (-onlynet=onion) ولكن الوكيل للوصول إلى شبكة Tor محظور صراحةً: -onion=0</translation>
+    </message>
+    <message>
+        <source>Outbound connections restricted to Tor (-onlynet=onion) but the proxy for reaching the Tor network is not provided: none of -proxy, -onion or -listenonion is given</source>
+        <translation>الاتصالات الصادرة مقيدة بـ Tor (-onlynet=onion) ولكن لم يتم توفير الوكيل للوصول إلى شبكة Tor: لم يتم تقديم أي من -proxy أو -onion أو -listenonion</translation>
+    </message>
+    <message>
+        <source>Outbound connections restricted to i2p (-onlynet=i2p) but -i2psam is not provided</source>
+        <translation>الاتصالات الصادرة مقيدة بـ i2p (-onlynet=i2p) ولكن لم يتم توفير -i2psam</translation>
+    </message>
     <message>
         <source>Please check that your computer's date and time are correct! If your clock is wrong, %s will not work properly.</source>
         <translation>يرجى التحقق من صحة تاريخ ووقت جهازك! إذا كانت ساعتك خاطئة ، فلن يعمل %s بشكل صحيح.</translation>
@@ -4449,6 +5870,14 @@
         <source>Please contribute if you find %s useful. Visit %s for further information about the software.</source>
         <translation>يرجى المساهمة إذا وجدت %s مفيداً. تفضل بزيارة %s لمزيد من المعلومات حول البرنامج.</translation>
     </message>
+    <message>
+        <source>Prune mode is incompatible with -reindex-chainstate. Use full -reindex instead.</source>
+        <translation>وضع التقليم غير متوافق مع -reindex-chainstate. استخدم -reindex كاملاً بدلاً من ذلك.</translation>
+    </message>
+    <message>
+        <source>This is the maximum transaction fee you pay (in addition to the normal fee) to prioritize partial spend avoidance over regular coin selection.</source>
+        <translation>هذه هي الحد الأقصى لرسوم المعاملة التي تدفعها (بالإضافة إلى الرسوم العادية) لإعطاء الأولوية لتجنب الإنفاق الجزئي على اختيار العملات العادي.</translation>
+    </message>
     <message>
         <source>This is the transaction fee you may discard if change is smaller than dust at this level</source>
         <translation>هذه هي رسوم المعاملة التي يمكنك تجاهلها إذا كان التغيير أصغر من الغبار عند هذا المستوى</translation>
@@ -4457,14 +5886,38 @@
         <source>This is the transaction fee you may pay when fee estimates are not available.</source>
         <translation>هذه هي رسوم المعاملة التي قد تدفعها عندما لا تكون تقديرات الرسوم متاح.</translation>
     </message>
+    <message>
+        <source>Transaction requires one destination of non-0 value, a non-0 feerate, or a pre-selected input</source>
+        <translation>تتطلب المعاملة وجهة واحدة بقيمة غير صفرية، أو معدل رسوم غير صفري، أو مدخل محدد مسبقاً</translation>
+    </message>
     <message>
         <source>Unable to replay blocks. You will need to rebuild the database using -reindex-chainstate.</source>
         <translation>غير قادر على إعادة الكتل. ستحتاج إلى إعادة بناء قاعدة البيانات باستخدام -reindex-chainstate.</translation>
     </message>
+    <message>
+        <source>Unknown wallet file format "%s" provided. Please provide one of "bdb" or "sqlite".</source>
+        <translation>تم توفير تنسيق ملف محفظة غير معروف "%s". يرجى توفير أحد "bdb" أو "sqlite".</translation>
+    </message>
+    <message>
+        <source>Unsupported chainstate database format found. Please restart with -reindex-chainstate. This will rebuild the chainstate database.</source>
+        <translation>تم العثور على تنسيق قاعدة بيانات chainstate غير مدعوم. يرجى إعادة التشغيل باستخدام -reindex-chainstate. سيؤدي هذا إلى إعادة بناء قاعدة بيانات chainstate.</translation>
+    </message>
+    <message>
+        <source>Warning: Dumpfile wallet format "%s" does not match command line specified format "%s".</source>
+        <translation>تحذير: تنسيق محفظة ملف التفريغ "%s" لا يتطابق مع التنسيق المحدد في سطر الأوامر "%s".</translation>
+    </message>
     <message>
         <source>Warning: Private keys detected in wallet {%s} with disabled private keys</source>
         <translation>تحذير: تم اكتشاف مفاتيح خاصة في المحفظة {%s} مع تعطيل المفاتيح الخاصة</translation>
     </message>
+    <message>
+        <source>You need to rebuild the database using -reindex to enable -timestampindex</source>
+        <translation>تحتاج إلى إعادة بناء قاعدة البيانات باستخدام -reindex لتمكين -timestampindex</translation>
+    </message>
+    <message>
+        <source>%s -- Incorrect seed, it should be a hex string</source>
+        <translation>%s -- البذرة غير صحيحة، يجب أن تكون سلسلة سداسية عشرية</translation>
+    </message>
     <message>
         <source>%s is not a valid backup folder!</source>
         <translation>%s ليس مجلد نسخ احتياطي صالح!</translation>
@@ -4489,10 +5942,30 @@
         <source>-rpcport must be specified when -devnet and -server are specified</source>
         <translation>يجب تحديد -ppcport عند تحديد -devnet و -server </translation>
     </message>
+    <message>
+        <source>-statsbatchsize cannot be configured with a negative value.</source>
+        <translation>لا يمكن تكوين -statsbatchsize بقيمة سالبة.</translation>
+    </message>
+    <message>
+        <source>-statsduration cannot be configured with a negative value.</source>
+        <translation>لا يمكن تكوين -statsduration بقيمة سالبة.</translation>
+    </message>
     <message>
         <source>A fatal internal error occurred, see debug.log for details</source>
         <translation>حدث خطأ داخلي فادح ، راجع debug.log للحصول على التفاصيل</translation>
     </message>
+    <message>
+        <source>Cannot create socket (socket() returned error %s)</source>
+        <translation>لا يمكن إنشاء مقبس (أرجع ()socket خطأ %s)</translation>
+    </message>
+    <message>
+        <source>Cannot get socket address for %s</source>
+        <translation>لا يمكن الحصول على عنوان المقبس لـ %s</translation>
+    </message>
+    <message>
+        <source>Cannot init Statsd client</source>
+        <translation>لا يمكن تهيئة عميل Statsd</translation>
+    </message>
     <message>
         <source>Cannot resolve -%s address: '%s'</source>
         <translation>لا يمكن حل - عنوان%s: '%s'</translation>
@@ -4501,10 +5974,6 @@
         <source>Cannot write to data directory '%s'; check permissions.</source>
         <translation>لا يمكن الكتابة إلى دليل البيانات '%s' ؛ تحقق من الأذونات.</translation>
     </message>
-    <message>
-        <source>Change index out of range</source>
-        <translation>فهرس الفكة خارج النطاق</translation>
-    </message>
     <message>
         <source>Copyright (C)</source>
         <translation>حقوق الطبع والنشر (C)</translation>
@@ -4513,6 +5982,14 @@
         <source>Disk space is too low!</source>
         <translation>مساحة القرص منخفضة جدًا!</translation>
     </message>
+    <message>
+        <source>Dump file %s does not exist.</source>
+        <translation>ملف التفريغ %s غير موجود.</translation>
+    </message>
+    <message>
+        <source>Error creating %s</source>
+        <translation>خطأ في إنشاء %s</translation>
+    </message>
     <message>
         <source>Error loading %s</source>
         <translation>خطأ في تحميل %s</translation>
@@ -4530,8 +6007,8 @@
         <translation>حدث خطأ أثناء تحميل %s: لا يمكنك تعطيل HD في محفظة HD موجودة بالفعل</translation>
     </message>
     <message>
-        <source>Error upgrading chainstate database</source>
-        <translation>خطأ في ترقية قاعدة بيانات chainstate</translation>
+        <source>Error reading next record from wallet database</source>
+        <translation>خطأ في قراءة السجل التالي من قاعدة بيانات المحفظة</translation>
     </message>
     <message>
         <source>Loading P2P addresses…</source>
@@ -4601,6 +6078,14 @@
         <source>Inputs vs outputs size mismatch.</source>
         <translation>عدم تطابق حجم المدخلات مقابل المخرجات.</translation>
     </message>
+    <message>
+        <source>Invalid '%s'. Allowed values: 128, 160, 192, 224, 256.</source>
+        <translation>'%s' غير صالح. القيم المسموح بها: 128، 160، 192، 224، 256.</translation>
+    </message>
+    <message>
+        <source>Invalid -i2psam address or hostname: '%s'</source>
+        <translation>عنوان أو اسم مضيف -i2psam غير صالح: '%s'</translation>
+    </message>
     <message>
         <source>Invalid -onion address or hostname: '%s'</source>
         <translation>عنوان أو اسم مضيف غير صالح: '%s'</translation>
@@ -4645,14 +6130,78 @@
         <source>%s corrupt. Try using the wallet tool dash-wallet to salvage or restoring a backup.</source>
         <translation>%s تالف. حاول استخدام dash-wallet لأداة المحفظة لإنقاذ أو استعادة نسخة احتياطية.</translation>
     </message>
+    <message>
+        <source>%s is set very high! Fees this large could be paid on a single transaction.</source>
+        <translation>تم تعيين %s مرتفعاً جداً! يمكن دفع رسوم بهذا الحجم على معاملة واحدة.</translation>
+    </message>
+    <message>
+        <source>%s request to listen on port %u. This port is considered "bad" and thus it is unlikely that any Dash Core peers connect to it. See doc/p2p-bad-ports.md for details and a full list.</source>
+        <translation>طلب %s للاستماع على المنفذ %u. يعتبر هذا المنفذ "سيئاً" وبالتالي من غير المحتمل أن يتصل به أي نظراء Dash Core. راجع doc/p2p-bad-ports.md للحصول على التفاصيل والقائمة الكاملة.</translation>
+    </message>
+    <message>
+        <source>Cannot provide specific connections and have addrman find outgoing connections at the same time.</source>
+        <translation>لا يمكن توفير اتصالات محددة وجعل addrman يجد اتصالات صادرة في نفس الوقت.</translation>
+    </message>
+    <message>
+        <source>Failed to upgrade Evo database</source>
+        <translation>فشل في ترقية قاعدة بيانات Evo</translation>
+    </message>
+    <message>
+        <source>Fee needed &gt; fee paid</source>
+        <translation>الرسوم المطلوبة &gt; الرسوم المدفوعة</translation>
+    </message>
+    <message>
+        <source>Host %s on unsupported network</source>
+        <translation>المضيف %s على شبكة غير مدعومة</translation>
+    </message>
+    <message>
+        <source>Invalid amount for %s=&lt;amount&gt;: '%s' (must be at least %s)</source>
+        <translation>مبلغ غير صالح لـ %s=&lt;amount&gt;: '%s' (يجب أن يكون على الأقل %s)</translation>
+    </message>
+    <message>
+        <source>Invalid amount for %s=&lt;amount&gt;: '%s'</source>
+        <translation>مبلغ غير صالح لـ %s=&lt;amount&gt;: '%s'</translation>
+    </message>
+    <message>
+        <source>Invalid port specified in %s: '%s'</source>
+        <translation>منفذ غير صالح محدد في %s: '%s'</translation>
+    </message>
     <message>
         <source>Last successful action was too recent.</source>
         <translation>آخر إجراء ناجح كان حديثًا جدًا.</translation>
     </message>
+    <message>
+        <source>Missing solving data for estimating transaction size</source>
+        <translation>بيانات الحل مفقودة لتقدير حجم المعاملة</translation>
+    </message>
+    <message>
+        <source>No host specified</source>
+        <translation>لم يتم تحديد مضيف</translation>
+    </message>
+    <message>
+        <source>No host specified, malformed URL</source>
+        <translation>لم يتم تحديد مضيف، عنوان URL مشوه</translation>
+    </message>
+    <message>
+        <source>No text before the scheme delimiter, malformed URL</source>
+        <translation>لا يوجد نص قبل محدد المخطط، عنوان URL مشوه</translation>
+    </message>
+    <message>
+        <source>Port must be between %d and %d, supplied %d</source>
+        <translation>يجب أن يكون المنفذ بين %d و %d، تم توفير %d</translation>
+    </message>
+    <message>
+        <source>Socket not initialized, cannot send message</source>
+        <translation>المقبس غير مهيأ، لا يمكن إرسال الرسالة</translation>
+    </message>
     <message>
         <source>The source code is available from %s.</source>
         <translation>شفرة المصدر متاح من %s.</translation>
     </message>
+    <message>
+        <source>The specified config file %s does not exist</source>
+        <translation>ملف التكوين المحدد %s غير موجود</translation>
+    </message>
     <message>
         <source>The transaction amount is too small to pay the fee</source>
         <translation>قيمة المعاملة صغيرة جدا لدفع الأجر</translation>
@@ -4673,6 +6222,10 @@
         <source>Transaction fees are too high.</source>
         <translation>رسوم المعاملات مرتفعة للغاية.</translation>
     </message>
+    <message>
+        <source>Transaction needs a change address, but we can't generate it.</source>
+        <translation>تحتاج المعاملة إلى عنوان تغيير، لكن لا يمكننا إنشاءه.</translation>
+    </message>
     <message>
         <source>Transaction not valid.</source>
         <translation>المعاملة غير صالحة.</translation>
@@ -4693,6 +6246,18 @@
         <source>Unable to locate enough non-denominated funds for this transaction.</source>
         <translation>غير قادر على تحديد موقع أموال كافية غير مقومة لهذه المعاملة.</translation>
     </message>
+    <message>
+        <source>Unable to lookup host %s</source>
+        <translation>غير قادر على البحث عن المضيف %s</translation>
+    </message>
+    <message>
+        <source>Unable to parse -maxuploadtarget: '%s'</source>
+        <translation>غير قادر على تحليل -maxuploadtarget: '%s'</translation>
+    </message>
+    <message>
+        <source>Unable to send message to %s (::sendto() returned error %s)</source>
+        <translation>غير قادر على إرسال رسالة إلى %s (أرجع ()::sendto خطأ %s)</translation>
+    </message>
     <message>
         <source>Unable to sign spork message, wrong key?</source>
         <translation>غير قادر على التوقيع على رسالة ورش ، مفتاح خاطئ؟</translation>
@@ -4706,12 +6271,12 @@
         <translation>حالة غير معروفة: id = %u</translation>
     </message>
     <message>
-        <source>Unsupported logging category %s=%s.</source>
-        <translation>فئة التسجيل غير المعتمدة%s=%s.</translation>
+        <source>Unsupported URL scheme, must begin with udp://</source>
+        <translation>مخطط URL غير مدعوم، يجب أن يبدأ بـ udp://</translation>
     </message>
     <message>
-        <source>Upgrading txindex database</source>
-        <translation>تحديث قاعدة بيانات txindex</translation>
+        <source>Unsupported logging category %s=%s.</source>
+        <translation>فئة التسجيل غير المعتمدة%s=%s.</translation>
     </message>
     <message>
         <source>Very low number of keys left: %d</source>
@@ -4741,9 +6306,25 @@
         <source>You can not disable governance validation on a masternode.</source>
         <translation>لا يمكنك تعطيل التحقق من الحوكمة على Masternode.</translation>
     </message>
+    <message>
+        <source>You need to rebuild the database using -reindex to enable -addressindex</source>
+        <translation>تحتاج إلى إعادة بناء قاعدة البيانات باستخدام -reindex لتمكين -addressindex</translation>
+    </message>
+    <message>
+        <source>You need to rebuild the database using -reindex to enable -spentindex</source>
+        <translation>تحتاج إلى إعادة بناء قاعدة البيانات باستخدام -reindex لتمكين -spentindex</translation>
+    </message>
     <message>
         <source>Your entries added successfully.</source>
         <translation>تمت إضافة إدخالاتك بنجاح.</translation>
     </message>
+    <message>
+        <source>Settings file could not be read</source>
+        <translation>تعذر قراءة ملف الإعدادات</translation>
+    </message>
+    <message>
+        <source>Settings file could not be written</source>
+        <translation>تعذر كتابة ملف الإعدادات</translation>
+    </message>
 </context>
 </TS>
\ No newline at end of file

From c0c1162267a790a7c485b9fdc976fe224d93df02 Mon Sep 17 00:00:00 2001
From: UdjinM6 <UdjinM6@users.noreply.github.com>
Date: Fri, 31 Oct 2025 01:03:39 +0300
Subject: [PATCH 336/656] vi

---
 src/qt/locale/dash_vi.ts | 3026 ++++++++++++++++++++++++++++++++++----
 1 file changed, 2726 insertions(+), 300 deletions(-)

diff --git a/src/qt/locale/dash_vi.ts b/src/qt/locale/dash_vi.ts
index c1e74f200373..1443591414d3 100644
--- a/src/qt/locale/dash_vi.ts
+++ b/src/qt/locale/dash_vi.ts
@@ -1,6 +1,10 @@
 <TS version="2.1" language="vi">
 <context>
     <name>AddressBookPage</name>
+    <message>
+        <source>Enter address or label to search</source>
+        <translation>Nhập địa chỉ hoặc nhãn để tìm kiếm</translation>
+    </message>
     <message>
         <source>Right-click to edit address or label</source>
         <translation>Bấm phải chuột để sửa địa chỉ hoặc nhãn</translation>
@@ -61,18 +65,14 @@
         <source>C&amp;hoose</source>
         <translation>C&amp;họn</translation>
     </message>
-    <message>
-        <source>Sending addresses</source>
-        <translation>Đia chỉ gửi</translation>
-    </message>
-    <message>
-        <source>Receiving addresses</source>
-        <translation>Địa chỉ nhận</translation>
-    </message>
     <message>
         <source>These are your Dash addresses for sending payments. Always check the amount and the receiving address before sending coins.</source>
         <translation>Đây là các địa chỉ Dash của bạn để gửi thanh toán. Luôn luôn kiểm tra số tiền và địa chỉ nhận trước khi bạn gửi tiền.</translation>
     </message>
+    <message>
+        <source>These are your Dash addresses for receiving payments. Use the 'Create new receiving address' button in the receive tab to create new addresses.</source>
+        <translation>Đây là các địa chỉ Dash của bạn để nhận thanh toán. Sử dụng nút 'Tạo địa chỉ nhận mới' trong tab nhận để tạo địa chỉ mới.</translation>
+    </message>
     <message>
         <source>&amp;Copy Address</source>
         <translation>&amp;Sao chép Địa chỉ</translation>
@@ -86,8 +86,8 @@
         <translation>&amp;Sửa</translation>
     </message>
     <message>
-        <source>&amp;Show address QR code</source>
-        <translation>&amp;Hiển thị mã QR của địa chỉ</translation>
+        <source>Show address &amp;QR code</source>
+        <translation>Hiển thị mã &amp;QR của địa chỉ</translation>
     </message>
     <message>
         <source>QR code</source>
@@ -97,11 +97,24 @@
         <source>Export Address List</source>
         <translation>Kết xuất danh sách Địa chỉ</translation>
     </message>
+    <message>
+        <source>Comma separated file</source>
+        <extracomment>Expanded name of the CSV file format. See: https://en.wikipedia.org/wiki/Comma-separated_values.</extracomment>
+        <translation>Tập tin giá trị được phân cách bằng dấu phẩy</translation>
+    </message>
     <message>
         <source>There was an error trying to save the address list to %1. Please try again.</source>
         <extracomment>An error message. %1 is a stand-in argument for the name of the file we attempted to save to.</extracomment>
         <translation>Có lỗi xảy ra khi lưu các địa chỉ vào %1. Hãy thử lại.</translation>
     </message>
+    <message>
+        <source>Sending addresses - %1</source>
+        <translation>Địa chỉ gửi - %1</translation>
+    </message>
+    <message>
+        <source>Receiving addresses - %1</source>
+        <translation>Địa chỉ nhận - %1</translation>
+    </message>
     <message>
         <source>Exporting Failed</source>
         <translation>Kết xuất không thành công</translation>
@@ -179,6 +192,10 @@
         <source>Repeat new passphrase</source>
         <translation>Nhập lại mật khẩu mới</translation>
     </message>
+    <message>
+        <source>Show passphrase</source>
+        <translation>Hiển thị mật khẩu</translation>
+    </message>
     <message>
         <source>Encrypt wallet</source>
         <translation>Mã hoá ví</translation>
@@ -215,6 +232,30 @@
         <source>Wallet encrypted</source>
         <translation>Ví đã được mã hoá.</translation>
     </message>
+    <message>
+        <source>Enter the new passphrase for the wallet.&lt;br/&gt;Please use a passphrase of &lt;b&gt;ten or more random characters&lt;/b&gt;, or &lt;b&gt;eight or more words&lt;/b&gt;.</source>
+        <translation>Nhập mật khẩu mới cho ví.&lt;br/&gt;Vui lòng sử dụng mật khẩu có &lt;b&gt;mười ký tự ngẫu nhiên trở lên&lt;/b&gt;, hoặc &lt;b&gt;tám từ trở lên&lt;/b&gt;.</translation>
+    </message>
+    <message>
+        <source>Enter the old passphrase and new passphrase for the wallet.</source>
+        <translation>Nhập mật khẩu cũ và mật khẩu mới cho ví.</translation>
+    </message>
+    <message>
+        <source>Remember that encrypting your wallet cannot fully protect your funds from being stolen by malware infecting your computer.</source>
+        <translation>Xin lưu ý rằng việc mã hóa ví của bạn không thể bảo vệ hoàn toàn tiền của bạn khỏi bị đánh cắp bởi phần mềm độc hại lây nhiễm máy tính của bạn.</translation>
+    </message>
+    <message>
+        <source>Wallet to be encrypted</source>
+        <translation>Ví sẽ được mã hóa</translation>
+    </message>
+    <message>
+        <source>Your wallet is about to be encrypted. </source>
+        <translation>Ví của bạn sắp được mã hóa. </translation>
+    </message>
+    <message>
+        <source>Your wallet is now encrypted. </source>
+        <translation>Ví của bạn bây giờ đã được mã hóa. </translation>
+    </message>
     <message>
         <source>IMPORTANT: Any previous backups you have made of your wallet file should be replaced with the newly generated, encrypted wallet file. Previous backups of the unencrypted wallet file contain the same HD seed and still have full access to all your funds just like the new, encrypted wallet.</source>
         <translation>QUAN TRỌNG: Bất cứ sao lưu nào bạn đã làm trước đó với ví của bạn thì nên thay thế bằng phiên bản sao lưu mới nhất đã được mã hoá. Những bản sao lưu trước mà không mã hoá mà chứa HD Seed thì vẫn có toàn quyền truy cập đến tiền trong ví của bạn giống y như phiên bản ví mới đã được mã hoá.</translation>
@@ -243,10 +284,22 @@
         <source>The passphrase entered for the wallet decryption was incorrect.</source>
         <translation>Mật khẩu bạn nhập để giải mã ví không chính xác.</translation>
     </message>
+    <message>
+        <source>The passphrase entered for the wallet decryption is incorrect. It contains a null character (ie - a zero byte). If the passphrase was set with a version of this software prior to 23.0, please try again with only the characters up to — but not including — the first null character. If this is successful, please set a new passphrase to avoid this issue in the future.</source>
+        <translation>Mật khẩu đã nhập để giải mã ví không chính xác. Nó chứa một ký tự null (tức là - một byte không). Nếu mật khẩu được đặt bằng phiên bản phần mềm này trước 23.0, vui lòng thử lại chỉ với các ký tự cho đến — nhưng không bao gồm — ký tự null đầu tiên. Nếu thành công, vui lòng đặt mật khẩu mới để tránh vấn đề này trong tương lai.</translation>
+    </message>
     <message>
         <source>Wallet passphrase was successfully changed.</source>
         <translation>Mật khẩu ví đã được đổi thành công.</translation>
     </message>
+    <message>
+        <source>Passphrase change failed</source>
+        <translation>Thay đổi mật khẩu thất bại</translation>
+    </message>
+    <message>
+        <source>The old passphrase entered for the wallet decryption is incorrect. It contains a null character (ie - a zero byte). If the passphrase was set with a version of this software prior to 23.0, please try again with only the characters up to — but not including — the first null character.</source>
+        <translation>Mật khẩu cũ đã nhập để giải mã ví không chính xác. Nó chứa một ký tự null (tức là - một byte không). Nếu mật khẩu được đặt bằng phiên bản phần mềm này trước 23.0, vui lòng thử lại chỉ với các ký tự cho đến — nhưng không bao gồm — ký tự null đầu tiên.</translation>
+    </message>
     <message>
         <source>Warning: The Caps Lock key is on!</source>
         <translation>Cảnh báo: Khoá Caps Lock đang được bật!</translation>
@@ -272,7 +325,23 @@
 </context>
 <context>
     <name>BitcoinApplication</name>
-    </context>
+    <message>
+        <source>Runaway exception</source>
+        <translation>Ngoại lệ không kiểm soát</translation>
+    </message>
+    <message>
+        <source>A fatal error occurred. %1 can no longer continue safely and will quit.</source>
+        <translation>Đã xảy ra lỗi nghiêm trọng. %1 không thể tiếp tục an toàn và sẽ thoát.</translation>
+    </message>
+    <message>
+        <source>Internal error</source>
+        <translation>Lỗi nội bộ</translation>
+    </message>
+    <message>
+        <source>An internal error occurred. %1 will attempt to continue safely. This is an unexpected bug which can be reported as described below.</source>
+        <translation>Đã xảy ra lỗi nội bộ. %1 sẽ cố gắng tiếp tục an toàn. Đây là một lỗi không mong đợi có thể được báo cáo như được mô tả bên dưới.</translation>
+    </message>
+</context>
 <context>
     <name>BitcoinGUI</name>
     <message>
@@ -299,6 +368,10 @@
         <source>Request payments (generates QR codes and dash: URIs)</source>
         <translation>Yêu cầu thanh toán (sinh mã QR và dash: URIs)</translation>
     </message>
+    <message>
+        <source>Ctrl+Q</source>
+        <translation>Ctrl+Q</translation>
+    </message>
     <message>
         <source>&amp;Options…</source>
         <translation>&amp;Tuỳ chọn…</translation>
@@ -327,10 +400,50 @@
         <source>&amp;Verify message…</source>
         <translation>&amp;Kiểm tra thông điệp…</translation>
     </message>
+    <message>
+        <source>&amp;Load PSBT from file…</source>
+        <translation>&amp;Tải PSBT từ tệp…</translation>
+    </message>
+    <message>
+        <source>&amp;Sending addresses</source>
+        <translation>&amp;Địa chỉ gửi</translation>
+    </message>
+    <message>
+        <source>&amp;Receiving addresses</source>
+        <translation>&amp;Địa chỉ nhận</translation>
+    </message>
     <message>
         <source>Open &amp;URI…</source>
         <translation>Mở &amp;URI…</translation>
     </message>
+    <message>
+        <source>Open Wallet</source>
+        <translation>Mở Ví</translation>
+    </message>
+    <message>
+        <source>Open a wallet</source>
+        <translation>Mở một ví</translation>
+    </message>
+    <message>
+        <source>Close wallet</source>
+        <translation>Đóng ví</translation>
+    </message>
+    <message>
+        <source>No wallets available</source>
+        <translation>Không có ví nào khả dụng</translation>
+    </message>
+    <message>
+        <source>&amp;Window</source>
+        <translation>&amp;Cửa sổ</translation>
+    </message>
+    <message>
+        <source>Zoom</source>
+        <translation>Thu phóng</translation>
+    </message>
+    <message>
+        <source>Main Window</source>
+        <translation>Cửa sổ chính</translation>
+    </message>
     <message>
         <source>&amp;Transactions</source>
         <translation>Các &amp;Giao dịch</translation>
@@ -368,16 +481,12 @@
         <translation>&amp;Khoảng %1</translation>
     </message>
     <message>
-        <source>Modify configuration options for %1</source>
-        <translation>Sửa đổi tùy chỉnh cấu hình cho %1</translation>
-    </message>
-    <message>
-        <source>&amp;Show / Hide</source>
-        <translation>Ẩ&amp;n / Hiện</translation>
+        <source>Send %1 funds to a Dash address</source>
+        <translation>Gửi %1 tiền đến một địa chỉ Dash</translation>
     </message>
     <message>
-        <source>Show or hide the main Window</source>
-        <translation>Hiển thị hoặc ẩn cửa sổ chính</translation>
+        <source>Modify configuration options for %1</source>
+        <translation>Sửa đổi tùy chỉnh cấu hình cho %1</translation>
     </message>
     <message>
         <source>Encrypt the private keys that belong to your wallet</source>
@@ -443,10 +552,6 @@
         <source>Show wallet repair options</source>
         <translation>Hiển thị các tuỳ chọn để sửa ví</translation>
     </message>
-    <message>
-        <source>Open Wallet &amp;Configuration File</source>
-        <translation>Mở ví và file &amp;Cấu hình</translation>
-    </message>
     <message>
         <source>Open configuration file</source>
         <translation>Mở tệp cấu hình</translation>
@@ -475,10 +580,20 @@
         <source>Show the %1 help message to get a list with possible Dash command-line options</source>
         <translation>Hiển thị %1 tin nhắn hỗ trợ để nhận được danh sách Dash command-line khả dụng</translation>
     </message>
+    <message>
+        <source>default wallet</source>
+        <translation>ví mặc định</translation>
+    </message>
     <message>
         <source>%1 client</source>
         <translation>%1 khách</translation>
     </message>
+    <message>
+        <source>Wallet: %1
+</source>
+        <translation>Ví: %1
+</translation>
+    </message>
     <message>
         <source>Wallet is &lt;b&gt;unencrypted&lt;/b&gt;</source>
         <translation>Ví được &lt;b&gt;mở mã hoá&lt;/b&gt;</translation>
@@ -487,10 +602,88 @@
         <source>&amp;File</source>
         <translation>&amp;Tệp</translation>
     </message>
+    <message>
+        <source>Show information about %1</source>
+        <translation>Hiển thị thông tin về %1</translation>
+    </message>
+    <message>
+        <source>Load PSBT from &amp;clipboard…</source>
+        <translation>Tải PSBT từ &amp;clipboard…</translation>
+    </message>
+    <message>
+        <source>Open debugging and diagnostic console</source>
+        <translation>Mở bảng điều khiển gỡ lỗi và chẩn đoán</translation>
+    </message>
+    <message>
+        <source>Open &amp;wallet configuration file</source>
+        <translation>Mở tệp cấu hình &amp;ví</translation>
+    </message>
+    <message>
+        <source>Open a dash: URI</source>
+        <translation>Mở một dash: URI</translation>
+    </message>
+    <message>
+        <source>Create a new wallet</source>
+        <translation>Tạo ví mới</translation>
+    </message>
+    <message>
+        <source>Restore Wallet…</source>
+        <extracomment>Name of the menu item that restores wallet from a backup file.</extracomment>
+        <translation>Khôi phục Ví…</translation>
+    </message>
+    <message>
+        <source>Restore a wallet from a backup file</source>
+        <extracomment>Status tip for Restore Wallet menu item</extracomment>
+        <translation>Khôi phục ví từ tệp sao lưu</translation>
+    </message>
+    <message>
+        <source>Close all wallets</source>
+        <translation>Đóng tất cả các ví</translation>
+    </message>
+    <message>
+        <source>%1 &amp;information</source>
+        <translation>%1 &amp;thông tin</translation>
+    </message>
+    <message>
+        <source>Show the %1 basic information</source>
+        <translation>Hiển thị thông tin cơ bản %1</translation>
+    </message>
+    <message>
+        <source>&amp;Discreet mode</source>
+        <translation>Chế độ &amp;Kín đáo</translation>
+    </message>
+    <message>
+        <source>Mask the values in the Overview tab</source>
+        <translation>Che giấu các giá trị trong tab Tổng quan</translation>
+    </message>
+    <message>
+        <source>Wallet Data</source>
+        <extracomment>Name of the wallet data file format.</extracomment>
+        <translation>Dữ liệu Ví</translation>
+    </message>
+    <message>
+        <source>Load Wallet Backup</source>
+        <extracomment>The title for Restore Wallet File Windows</extracomment>
+        <translation>Tải Bản sao lưu Ví</translation>
+    </message>
+    <message>
+        <source>Restore Wallet</source>
+        <extracomment>Title of pop-up window shown when the user is attempting to restore a wallet.</extracomment>
+        <translation>Khôi phục Ví</translation>
+    </message>
+    <message>
+        <source>Wallet Name</source>
+        <extracomment>Label of the input field where the name of the wallet is entered.</extracomment>
+        <translation>Tên Ví</translation>
+    </message>
     <message>
         <source>&amp;Settings</source>
         <translation>&amp;Thiết đặt</translation>
     </message>
+    <message>
+        <source>&amp;Minimize</source>
+        <translation>&amp;Thu nhỏ</translation>
+    </message>
     <message>
         <source>&amp;Help</source>
         <translation>&amp;Trợ giúp</translation>
@@ -499,8 +692,25 @@
         <source>Tabs toolbar</source>
         <translation>Bảng Thanh công cụ</translation>
     </message>
+    <message>
+        <source>&amp;Governance</source>
+        <translation>&amp;Quản trị</translation>
+    </message>
+    <message>
+        <source>View Governance Proposals</source>
+        <translation>Xem Đề xuất Quản trị</translation>
+    </message>
+    <message>
+        <source>&amp;Hide</source>
+        <translation>&amp;Ẩn</translation>
+    </message>
+    <message>
+        <source>S&amp;how</source>
+        <translation>&amp;Hiển thị</translation>
+    </message>
     <message numerus="yes">
         <source>%n active connection(s) to Dash network</source>
+        <extracomment>A substring of the tooltip.</extracomment>
         <translation><numerusform>%n kết nối hiện thời tới mạng lưới của Dash</numerusform></translation>
     </message>
     <message>
@@ -515,6 +725,54 @@
         <source>%1 behind</source>
         <translation>%1 đằng sau</translation>
     </message>
+    <message>
+        <source>Close Wallet…</source>
+        <translation>Đóng Ví…</translation>
+    </message>
+    <message>
+        <source>Load Partially Signed Blockchain Transaction</source>
+        <translation>Tải Giao dịch Blockchain Đã Ký Một phần</translation>
+    </message>
+    <message>
+        <source>Load Partially Signed Blockchain Transaction from clipboard</source>
+        <translation>Tải Giao dịch Blockchain Đã Ký Một phần từ clipboard</translation>
+    </message>
+    <message>
+        <source>Create Wallet…</source>
+        <translation>Tạo Ví…</translation>
+    </message>
+    <message>
+        <source>Close All Wallets…</source>
+        <translation>Đóng Tất cả Ví…</translation>
+    </message>
+    <message>
+        <source>Ctrl+Shift+D</source>
+        <translation>Ctrl+Shift+D</translation>
+    </message>
+    <message>
+        <source>Ctrl+M</source>
+        <translation>Ctrl+M</translation>
+    </message>
+    <message>
+        <source>Click for more actions.</source>
+        <extracomment>A substring of the tooltip. "More actions" are available via the context menu.</extracomment>
+        <translation>Nhấp để thực hiện thêm hành động.</translation>
+    </message>
+    <message>
+        <source>Show Peers tab</source>
+        <extracomment>A context menu item. The "Peers tab" is an element of the "Node window".</extracomment>
+        <translation>Hiển thị tab Máy ngang hàng</translation>
+    </message>
+    <message>
+        <source>Disable network activity</source>
+        <extracomment>A context menu item.</extracomment>
+        <translation>Tắt hoạt động mạng</translation>
+    </message>
+    <message>
+        <source>Enable network activity</source>
+        <extracomment>A context menu item. The network activity was disabled previously.</extracomment>
+        <translation>Bật hoạt động mạng</translation>
+    </message>
     <message>
         <source>Syncing Headers (%1%)…</source>
         <translation>Đang đồng bộ phần đầu (%1%)…</translation>
@@ -531,10 +789,6 @@
         <source>Processing blocks on disk…</source>
         <translation>Đang xử lý các khối trên đĩa…</translation>
     </message>
-    <message>
-        <source>Reindexing blocks on disk…</source>
-        <translation>Sắp xếp lại các khối trên đĩa…</translation>
-    </message>
     <message>
         <source>Connecting to peers…</source>
         <translation>Đang kết nối với các máy ngang hàng…</translation>
@@ -563,10 +817,18 @@
         <source>Error</source>
         <translation>Lỗi</translation>
     </message>
+    <message>
+        <source>Error: %1</source>
+        <translation>Lỗi: %1</translation>
+    </message>
     <message>
         <source>Warning</source>
         <translation>Cảnh báo</translation>
     </message>
+    <message>
+        <source>Warning: %1</source>
+        <translation>Cảnh báo: %1</translation>
+    </message>
     <message>
         <source>Information</source>
         <translation>Thông tin</translation>
@@ -649,7 +911,15 @@
         <source>Wallet is &lt;b&gt;encrypted&lt;/b&gt; and currently &lt;b&gt;locked&lt;/b&gt;</source>
         <translation>Ví &lt;b&gt;đã được mã hoá&lt;/b&gt; và hiện tại &lt;b&gt;đã được khoá&lt;/b&gt;</translation>
     </message>
-    </context>
+    <message>
+        <source>Proxy is &lt;b&gt;enabled&lt;/b&gt;: %1</source>
+        <translation>Proxy đã &lt;b&gt;được kích hoạt&lt;/b&gt;: %1</translation>
+    </message>
+    <message>
+        <source>Original message:</source>
+        <translation>Thông điệp gốc:</translation>
+    </message>
+</context>
 <context>
     <name>CoinControlDialog</name>
     <message>
@@ -672,10 +942,6 @@
         <source>Coin Selection</source>
         <translation>Chọn lựa coin</translation>
     </message>
-    <message>
-        <source>Dust:</source>
-        <translation>Bụi</translation>
-    </message>
     <message>
         <source>After Fee:</source>
         <translation>Phí sau:</translation>
@@ -733,28 +999,32 @@
         <translation>Đã được xác nhận</translation>
     </message>
     <message>
-        <source>Copy address</source>
-        <translation>Sao chép địa chỉ</translation>
+        <source>Copy amount</source>
+        <translation>Sao chép số tiền</translation>
+    </message>
+    <message>
+        <source>&amp;Copy address</source>
+        <translation>&amp;Sao chép địa chỉ</translation>
     </message>
     <message>
-        <source>Copy label</source>
-        <translation>Sao chép nhãn</translation>
+        <source>Copy &amp;label</source>
+        <translation>Sao chép &amp;nhãn</translation>
     </message>
     <message>
-        <source>Copy amount</source>
-        <translation>Sao chép số tiền</translation>
+        <source>Copy &amp;amount</source>
+        <translation>Sao chép &amp;số tiền</translation>
     </message>
     <message>
-        <source>Copy transaction ID</source>
-        <translation>Sao chép mã giao dịch</translation>
+        <source>Copy transaction &amp;ID and output index</source>
+        <translation>Sao chép &amp;ID giao dịch và chỉ số đầu ra</translation>
     </message>
     <message>
-        <source>Lock unspent</source>
-        <translation>Khoá khoản chưa tiêu</translation>
+        <source>L&amp;ock unspent</source>
+        <translation>K&amp;hóa chưa tiêu</translation>
     </message>
     <message>
-        <source>Unlock unspent</source>
-        <translation>Mở khoản chưa tiêu</translation>
+        <source>&amp;Unlock unspent</source>
+        <translation>&amp;Mở khóa chưa tiêu</translation>
     </message>
     <message>
         <source>Copy quantity</source>
@@ -772,10 +1042,6 @@
         <source>Copy bytes</source>
         <translation>Sao chép các bytes</translation>
     </message>
-    <message>
-        <source>Copy dust</source>
-        <translation>Sao chép bụi</translation>
-    </message>
     <message>
         <source>Copy change</source>
         <translation>Sao chép tiền trả lại</translation>
@@ -788,18 +1054,6 @@
         <source>(%1 locked)</source>
         <translation>(%1 được khoá)</translation>
     </message>
-    <message>
-        <source>yes</source>
-        <translation>có</translation>
-    </message>
-    <message>
-        <source>no</source>
-        <translation>không</translation>
-    </message>
-    <message>
-        <source>This label turns red if any recipient receives an amount smaller than the current dust threshold.</source>
-        <translation>Nhãn này sẽ chuyển sang đỏ nếu có địa chỉ nào nhận được một khoản nhỏ hơn ngưỡng nhỏ nhất định được gọi là bụi.</translation>
-    </message>
     <message>
         <source>Can vary +/- %1 duff(s) per input.</source>
         <translation>Có thể thay đổi +/- %1 duff(s) cho mỗi đầu vào.</translation>
@@ -812,6 +1066,14 @@
         <source>Show all coins</source>
         <translation>Hiển thị toàn bộ coin</translation>
     </message>
+    <message>
+        <source>Hide %1 coins</source>
+        <translation>Ẩn %1 coin</translation>
+    </message>
+    <message>
+        <source>Show all %1 coins</source>
+        <translation>Hiển thị tất cả %1 coin</translation>
+    </message>
     <message>
         <source>Show spendable coins only</source>
         <translation>Chỉ hiển thị những coin tiêu được</translation>
@@ -835,10 +1097,84 @@
 </context>
 <context>
     <name>CreateWalletActivity</name>
-    </context>
+    <message>
+        <source>Create Wallet</source>
+        <extracomment>Title of window indicating the progress of creation of a new wallet.</extracomment>
+        <translation>Tạo Ví</translation>
+    </message>
+    <message>
+        <source>Creating Wallet &lt;b&gt;%1&lt;/b&gt;…</source>
+        <extracomment>Descriptive text of the create wallet progress window which indicates to the user which wallet is currently being created.</extracomment>
+        <translation>Đang tạo Ví &lt;b&gt;%1&lt;/b&gt;…</translation>
+    </message>
+    <message>
+        <source>Create wallet failed</source>
+        <translation>Tạo ví thất bại</translation>
+    </message>
+    <message>
+        <source>Create wallet warning</source>
+        <translation>Cảnh báo tạo ví</translation>
+    </message>
+</context>
 <context>
     <name>CreateWalletDialog</name>
-    </context>
+    <message>
+        <source>Create Wallet</source>
+        <translation>Tạo Ví</translation>
+    </message>
+    <message>
+        <source>Wallet Name</source>
+        <translation>Tên Ví</translation>
+    </message>
+    <message>
+        <source>Wallet</source>
+        <translation>Ví</translation>
+    </message>
+    <message>
+        <source>Encrypt the wallet. The wallet will be encrypted with a passphrase of your choice.</source>
+        <translation>Mã hóa ví. Ví sẽ được mã hóa bằng cụm mật khẩu bạn chọn.</translation>
+    </message>
+    <message>
+        <source>Encrypt Wallet</source>
+        <translation>Mã hóa Ví</translation>
+    </message>
+    <message>
+        <source>Advanced Options</source>
+        <translation>Tùy chọn Nâng cao</translation>
+    </message>
+    <message>
+        <source>Disable private keys for this wallet. Wallets with private keys disabled will have no private keys and cannot have an HD seed or imported private keys. This is ideal for watch-only wallets.</source>
+        <translation>Vô hiệu hóa khóa riêng cho ví này. Ví có khóa riêng bị vô hiệu hóa sẽ không có khóa riêng và không thể có seed HD hoặc nhập khóa riêng. Điều này lý tưởng cho ví chỉ xem.</translation>
+    </message>
+    <message>
+        <source>Disable Private Keys</source>
+        <translation>Vô hiệu hóa Khóa Riêng</translation>
+    </message>
+    <message>
+        <source>Make a blank wallet. Blank wallets do not initially have private keys or scripts. Private keys and addresses can be imported, or an HD seed can be set, at a later time.</source>
+        <translation>Tạo ví trống. Ví trống ban đầu không có khóa riêng hoặc script. Khóa riêng và địa chỉ có thể được nhập, hoặc seed HD có thể được đặt sau.</translation>
+    </message>
+    <message>
+        <source>Make Blank Wallet</source>
+        <translation>Tạo Ví Trống</translation>
+    </message>
+    <message>
+        <source>Use descriptors for scriptPubKey management. This feature is well-tested but still considered experimental and not recommended for use yet.</source>
+        <translation>Sử dụng descriptor để quản lý scriptPubKey. Tính năng này đã được kiểm tra kỹ nhưng vẫn được coi là thử nghiệm và chưa được khuyến nghị sử dụng.</translation>
+    </message>
+    <message>
+        <source>Descriptor Wallet (EXPERIMENTAL)</source>
+        <translation>Ví Descriptor (THỬ NGHIỆM)</translation>
+    </message>
+    <message>
+        <source>Create</source>
+        <translation>Tạo</translation>
+    </message>
+    <message>
+        <source>Compiled without sqlite support (required for descriptor wallets)</source>
+        <translation>Được biên dịch mà không có hỗ trợ sqlite (cần thiết cho ví descriptor)</translation>
+    </message>
+</context>
 <context>
     <name>EditAddressDialog</name>
     <message>
@@ -877,6 +1213,14 @@
         <source>The entered address "%1" is not a valid Dash address.</source>
         <translation>Địa chỉ vừa nhập "%1" không phải địa chỉ Dash hợp lệ.</translation>
     </message>
+    <message>
+        <source>Address "%1" already exists as a receiving address with label "%2" and so cannot be added as a sending address.</source>
+        <translation>Địa chỉ "%1" đã tồn tại như một địa chỉ nhận với nhãn "%2" và do đó không thể được thêm như địa chỉ gửi.</translation>
+    </message>
+    <message>
+        <source>The entered address "%1" is already in the address book with label "%2".</source>
+        <translation>Địa chỉ vừa nhập "%1" đã có trong danh bạ với nhãn "%2".</translation>
+    </message>
     <message>
         <source>Could not unlock wallet.</source>
         <translation>Không thể mở khoá ví.</translation>
@@ -911,85 +1255,233 @@
 </context>
 <context>
     <name>GovernanceList</name>
-    </context>
-<context>
-    <name>HelpMessageDialog</name>
     <message>
-        <source>version</source>
-        <translation>phiên bản</translation>
+        <source>Form</source>
+        <translation>Biểu mẫu</translation>
     </message>
     <message>
-        <source>About %1</source>
-        <translation>About %1</translation>
+        <source>Filter List:</source>
+        <translation>Danh sách Lọc:</translation>
     </message>
     <message>
-        <source>Command-line options</source>
-        <translation>Các tuỳ chọn dòng lệnh</translation>
+        <source>Filter proposal list</source>
+        <translation>Lọc danh sách đề xuất</translation>
     </message>
-    </context>
-<context>
-    <name>Intro</name>
     <message>
-        <source>Welcome</source>
-        <translation>Chào mừng</translation>
+        <source>Masternode Count:</source>
+        <translation>Số lượng Masternode:</translation>
     </message>
     <message>
-        <source>Welcome to %1.</source>
-        <translation>Welcome to %1.</translation>
+        <source>Number of masternodes this wallet can vote with (masternodes for which this wallet holds the voting key)</source>
+        <translation>Số lượng masternode mà ví này có thể bỏ phiếu (các masternode mà ví này giữ khóa bỏ phiếu)</translation>
     </message>
     <message>
-        <source>As this is the first time the program is launched, you can choose where %1 will store its data.</source>
-        <translation>Đây là lần đầu chương trình khởi chạy, bạn có thể chọn nơi %1 sẽ lưu trữ data.</translation>
+        <source>Proposal Count:</source>
+        <translation>Số lượng Đề xuất:</translation>
     </message>
     <message>
-        <source>This initial synchronisation is very demanding, and may expose hardware problems with your computer that had previously gone unnoticed. Each time you run %1, it will continue downloading where it left off.</source>
-        <translation>Đồng bộ hóa ban đầu này rất đòi hỏi, và có thể phơi bày các sự cố về phần cứng với máy tính của bạn trước đó đã không được chú ý. Mỗi khi bạn chạy %1, nó sẽ tiếp tục tải về nơi nó dừng lại.</translation>
+        <source>Create Proposal</source>
+        <translation>Tạo Đề xuất</translation>
     </message>
     <message>
-        <source>If you have chosen to limit block chain storage (pruning), the historical data must still be downloaded and processed, but will be deleted afterward to keep your disk usage low.</source>
-        <translation>Nếu bạn đã chọn giới hạn block chain lưu trữ (pruning),dữ liệu lịch sử vẫn phải được tải xuống và xử lý, nhưng sẽ bị xóa sau đó để giữ cho việc sử dụng đĩa của bạn ở mức usage thấp.</translation>
+        <source>Filter by Title</source>
+        <translation>Lọc theo Tiêu đề</translation>
     </message>
     <message>
-        <source>Use the default data directory</source>
-        <translation>Sử dụng thư mục dữ liệu ngầm định</translation>
+        <source>Unavailable</source>
+        <translation>Không khả dụng</translation>
     </message>
     <message>
-        <source>Use a custom data directory:</source>
-        <translation>Sử dụng thư mục dữ liệu tuỳ chọn:</translation>
+        <source>A synced node and an unlocked wallet are required.</source>
+        <translation>Cần có một nút đã đồng bộ và ví đã mở khóa.</translation>
     </message>
     <message>
-        <source>%1 GB of free space available</source>
-        <translation>%1 GB còn trống </translation>
+        <source>Vote Yes</source>
+        <translation>Bỏ phiếu Có</translation>
     </message>
     <message>
-        <source>(of %1 GB needed)</source>
-        <translation>(của %1 GB cần đến)</translation>
+        <source>Vote No</source>
+        <translation>Bỏ phiếu Không</translation>
     </message>
     <message>
-        <source>At least %1 GB of data will be stored in this directory, and it will grow over time.</source>
-        <translation>Ít nhất %1 GB data sẽ được trữ tại danh mục này, và nó sẽ lớn theo thời gian.</translation>
+        <source>Vote Abstain</source>
+        <translation>Bỏ phiếu Trắng</translation>
     </message>
     <message>
-        <source>Approximately %1 GB of data will be stored in this directory.</source>
-        <translation>Gần đúng %1 GB of data sẽ được lưu giữ trong danh mục này.</translation>
+        <source>Proposal Info: %1</source>
+        <translation>Thông tin Đề xuất: %1</translation>
     </message>
     <message>
-        <source>%1 will download and store a copy of the Dash block chain.</source>
-        <translation>%1 sẽ download và lưu trữ một bản copy của Dash block chain.</translation>
+        <source>Voting Failed</source>
+        <translation>Bỏ phiếu Thất bại</translation>
     </message>
     <message>
-        <source>The wallet will also be stored in this directory.</source>
-        <translation>Wallet sẽ cùng được lưu giữ trong danh mục này.</translation>
+        <source>No wallet available.</source>
+        <translation>Không có ví khả dụng.</translation>
     </message>
     <message>
-        <source>Error: Specified data directory "%1" cannot be created.</source>
-        <translation>Lỗi: Thư mục bạn cọn "%1" không thể tạo được.</translation>
+        <source>No masternode voting keys found in wallet.</source>
+        <translation>Không tìm thấy khóa bỏ phiếu masternode trong ví.</translation>
+    </message>
+    <message>
+        <source>Please select a proposal to vote on.</source>
+        <translation>Vui lòng chọn một đề xuất để bỏ phiếu.</translation>
+    </message>
+    <message>
+        <source>Unable to unlock wallet.</source>
+        <translation>Không thể mở khóa ví.</translation>
+    </message>
+    <message>
+        <source>Unable to get masternode list. Please try again later.</source>
+        <translation>Không thể lấy danh sách masternode. Vui lòng thử lại sau.</translation>
+    </message>
+    <message>
+        <source>Masternode %1 not found</source>
+        <translation>Không tìm thấy Masternode %1</translation>
+    </message>
+    <message>
+        <source>Failed to sign vote for masternode %1</source>
+        <translation>Không thể ký phiếu bầu cho masternode %1</translation>
+    </message>
+    <message>
+        <source>Masternode %1: %2</source>
+        <translation>Masternode %1: %2</translation>
+    </message>
+    <message numerus="yes">
+        <source>Voted successfully %n time(s)</source>
+        <translation><numerusform>Đã bỏ phiếu thành công %n lần</numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <source>Failed to vote %n time(s)</source>
+        <translation><numerusform>Không thể bỏ phiếu %n lần</numerusform></translation>
+    </message>
+    <message>
+        <source>Errors:</source>
+        <translation>Lỗi:</translation>
+    </message>
+    <message>
+        <source>Voting Results</source>
+        <translation>Kết quả Bỏ phiếu</translation>
+    </message>
+</context>
+<context>
+    <name>HelpMessageDialog</name>
+    <message>
+        <source>version</source>
+        <translation>phiên bản</translation>
+    </message>
+    <message>
+        <source>About %1</source>
+        <translation>About %1</translation>
+    </message>
+    <message>
+        <source>Command-line options</source>
+        <translation>Các tuỳ chọn dòng lệnh</translation>
+    </message>
+    <message>
+        <source>%1 information</source>
+        <translation>Thông tin %1</translation>
+    </message>
+    <message>
+        <source>&lt;h3&gt;%1 Basics&lt;/h3&gt; %1 gives you true financial privacy by obscuring the origins of your funds. All the Dash in your wallet is comprised of different "inputs" which you can think of as separate, discrete coins.&lt;br&gt; %1 uses an innovative process to mix your inputs with the inputs of two or more other people, without having your coins ever leave your wallet. You retain control of your money at all times.&lt;hr&gt; &lt;b&gt;The %1 process works like this:&lt;/b&gt;&lt;ol type="1"&gt; &lt;li&gt;%1 begins by breaking your transaction inputs down into standard denominations. These denominations are 0.001 DASH, 0.01 DASH, 0.1 DASH, 1 DASH and 10 DASH -- sort of like the paper money you use every day.&lt;/li&gt; &lt;li&gt;Your wallet then sends requests to specially configured software nodes on the network, called "masternodes." These masternodes are informed then that you are interested in mixing a certain denomination. No identifiable information is sent to the masternodes, so they never know "who" you are.&lt;/li&gt; &lt;li&gt;When two or more other people send similar messages, indicating that they wish to mix the same denomination, a mixing session begins. The masternode mixes up the inputs and instructs all three users' wallets to pay the now-transformed input back to themselves. Your wallet pays that denomination directly to itself, but in a different address (called a change address).&lt;/li&gt; &lt;li&gt;In order to fully obscure your funds, your wallet must repeat this process a number of times with each denomination. Each time the process is completed, it's called a "round." Each round of %1 makes it exponentially more difficult to determine where your funds originated.&lt;/li&gt; &lt;li&gt;This mixing process happens in the background without any intervention on your part. When you wish to make a transaction, your funds will already be mixed. No additional waiting is required.&lt;/li&gt; &lt;/ol&gt; &lt;hr&gt;&lt;b&gt;IMPORTANT:&lt;/b&gt; Your wallet only contains 1000 of these "change addresses." Every time a mixing event happens, up to 9 of your addresses are used up. This means those 1000 addresses last for about 100 mixing events. When 900 of them are used, your wallet must create more addresses. It can only do this, however, if you have automatic backups enabled.&lt;br&gt; Consequently, users who have backups disabled will also have %1 disabled. &lt;hr&gt;For more information, see the &lt;a style="%2" href="%3"&gt;%1 documentation&lt;/a&gt;.</source>
+        <translation>&lt;h3&gt;Cơ bản về %1&lt;/h3&gt; %1 mang lại cho bạn sự riêng tư tài chính thực sự bằng cách che giấu nguồn gốc tiền của bạn. Tất cả Dash trong ví của bạn được tạo thành từ các "đầu vào" khác nhau mà bạn có thể coi như các đồng xu riêng biệt.&lt;br&gt; %1 sử dụng một quy trình sáng tạo để trộn đầu vào của bạn với đầu vào của hai hoặc nhiều người khác, mà không cần coin của bạn rời khỏi ví. Bạn giữ quyền kiểm soát tiền của mình mọi lúc.&lt;hr&gt; &lt;b&gt;Quy trình %1 hoạt động như sau:&lt;/b&gt;&lt;ol type="1"&gt; &lt;li&gt;%1 bắt đầu bằng cách chia nhỏ đầu vào giao dịch của bạn thành các mệnh giá tiêu chuẩn. Các mệnh giá này là 0.001 DASH, 0.01 DASH, 0.1 DASH, 1 DASH và 10 DASH -- giống như tiền giấy bạn sử dụng hàng ngày.&lt;/li&gt; &lt;li&gt;Ví của bạn sau đó gửi yêu cầu đến các nút phần mềm được cấu hình đặc biệt trên mạng, được gọi là "masternode". Các masternode này sau đó được thông báo rằng bạn quan tâm đến việc trộn một mệnh giá nhất định. Không có thông tin nhận dạng nào được gửi đến masternode, vì vậy chúng không bao giờ biết bạn "là ai".&lt;/li&gt; &lt;li&gt;Khi hai hoặc nhiều người khác gửi thông điệp tương tự, cho biết họ muốn trộn cùng một mệnh giá, một phiên trộn bắt đầu. Masternode trộn lẫn các đầu vào và hướng dẫn ví của cả ba người dùng trả đầu vào đã chuyển đổi về cho chính họ. Ví của bạn trả mệnh giá đó trực tiếp cho chính nó, nhưng ở một địa chỉ khác (được gọi là địa chỉ tiền thối).&lt;/li&gt; &lt;li&gt;Để che giấu hoàn toàn tiền của bạn, ví của bạn phải lặp lại quy trình này nhiều lần với mỗi mệnh giá. Mỗi lần quy trình hoàn thành, nó được gọi là một "vòng". Mỗi vòng %1 làm cho việc xác định nguồn gốc tiền của bạn trở nên khó khăn hơn theo cấp số nhân.&lt;/li&gt; &lt;li&gt;Quy trình trộn này diễn ra trong nền mà không cần sự can thiệp của bạn. Khi bạn muốn thực hiện giao dịch, tiền của bạn sẽ đã được trộn sẵn. Không cần chờ đợi thêm.&lt;/li&gt; &lt;/ol&gt; &lt;hr&gt;&lt;b&gt;QUAN TRỌNG:&lt;/b&gt; Ví của bạn chỉ chứa 1000 "địa chỉ tiền thối" này. Mỗi lần một sự kiện trộn xảy ra, tối đa 9 địa chỉ của bạn được sử dụng. Điều này có nghĩa là 1000 địa chỉ đó tồn tại cho khoảng 100 sự kiện trộn. Khi 900 trong số chúng được sử dụng, ví của bạn phải tạo thêm địa chỉ. Tuy nhiên, nó chỉ có thể làm điều này nếu bạn đã bật sao lưu tự động.&lt;br&gt; Do đó, người dùng tắt sao lưu cũng sẽ bị tắt %1. &lt;hr&gt;Để biết thêm thông tin, xem &lt;a style="%2" href="%3"&gt;tài liệu %1&lt;/a&gt;.</translation>
+    </message>
+</context>
+<context>
+    <name>Intro</name>
+    <message>
+        <source>Welcome</source>
+        <translation>Chào mừng</translation>
+    </message>
+    <message>
+        <source>Welcome to %1.</source>
+        <translation>Welcome to %1.</translation>
+    </message>
+    <message>
+        <source>As this is the first time the program is launched, you can choose where %1 will store its data.</source>
+        <translation>Đây là lần đầu chương trình khởi chạy, bạn có thể chọn nơi %1 sẽ lưu trữ data.</translation>
+    </message>
+    <message>
+        <source>Limit block chain storage to</source>
+        <translation>Giới hạn lưu trữ blockchain tới</translation>
+    </message>
+    <message>
+        <source>Reverting this setting requires re-downloading the entire blockchain. It is faster to download the full chain first and prune it later. Disables some advanced features.</source>
+        <translation>Hoàn nguyên cài đặt này yêu cầu tải lại toàn bộ blockchain. Tải xuống toàn bộ chuỗi trước và cắt tỉa sau sẽ nhanh hơn. Vô hiệu hóa một số tính năng nâng cao.</translation>
+    </message>
+    <message>
+        <source> GB</source>
+        <translation> GB</translation>
+    </message>
+    <message>
+        <source>This initial synchronisation is very demanding, and may expose hardware problems with your computer that had previously gone unnoticed. Each time you run %1, it will continue downloading where it left off.</source>
+        <translation>Đồng bộ hóa ban đầu này rất đòi hỏi, và có thể phơi bày các sự cố về phần cứng với máy tính của bạn trước đó đã không được chú ý. Mỗi khi bạn chạy %1, nó sẽ tiếp tục tải về nơi nó dừng lại.</translation>
+    </message>
+    <message>
+        <source>When you click OK, %1 will begin to download and process the full %4 block chain (%2 GB) starting with the earliest transactions in %3 when %4 initially launched.</source>
+        <translation>Khi bạn nhấp OK, %1 sẽ bắt đầu tải xuống và xử lý toàn bộ blockchain %4 (%2 GB) bắt đầu từ các giao dịch sớm nhất trong %3 khi %4 được khởi chạy lần đầu.</translation>
+    </message>
+    <message>
+        <source>If you have chosen to limit block chain storage (pruning), the historical data must still be downloaded and processed, but will be deleted afterward to keep your disk usage low.</source>
+        <translation>Nếu bạn đã chọn giới hạn block chain lưu trữ (pruning),dữ liệu lịch sử vẫn phải được tải xuống và xử lý, nhưng sẽ bị xóa sau đó để giữ cho việc sử dụng đĩa của bạn ở mức usage thấp.</translation>
+    </message>
+    <message>
+        <source>Use the default data directory</source>
+        <translation>Sử dụng thư mục dữ liệu ngầm định</translation>
+    </message>
+    <message>
+        <source>Use a custom data directory:</source>
+        <translation>Sử dụng thư mục dữ liệu tuỳ chọn:</translation>
+    </message>
+    <message numerus="yes">
+        <source>%n GB of space available</source>
+        <translation><numerusform>%n GB dung lượng khả dụng</numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <source>(of %n GB needed)</source>
+        <translation><numerusform>(trong số %n GB cần thiết)</numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <source>(%n GB needed for full chain)</source>
+        <translation><numerusform>(%n GB cần cho toàn bộ chuỗi)</numerusform></translation>
+    </message>
+    <message>
+        <source>At least %1 GB of data will be stored in this directory, and it will grow over time.</source>
+        <translation>Ít nhất %1 GB data sẽ được trữ tại danh mục này, và nó sẽ lớn theo thời gian.</translation>
+    </message>
+    <message>
+        <source>Approximately %1 GB of data will be stored in this directory.</source>
+        <translation>Gần đúng %1 GB of data sẽ được lưu giữ trong danh mục này.</translation>
+    </message>
+    <message numerus="yes">
+        <source>(sufficient to restore backups %n day(s) old)</source>
+        <extracomment>Explanatory text on the capability of the current prune target.</extracomment>
+        <translation><numerusform>(đủ để khôi phục bản sao lưu %n ngày tuổi)</numerusform></translation>
+    </message>
+    <message>
+        <source>%1 will download and store a copy of the Dash block chain.</source>
+        <translation>%1 sẽ download và lưu trữ một bản copy của Dash block chain.</translation>
+    </message>
+    <message>
+        <source>The wallet will also be stored in this directory.</source>
+        <translation>Wallet sẽ cùng được lưu giữ trong danh mục này.</translation>
+    </message>
+    <message>
+        <source>Error: Specified data directory "%1" cannot be created.</source>
+        <translation>Lỗi: Thư mục bạn cọn "%1" không thể tạo được.</translation>
     </message>
     <message>
         <source>Error</source>
         <translation>Lỗi</translation>
     </message>
 </context>
+<context>
+    <name>LoadWalletsActivity</name>
+    <message>
+        <source>Loading wallets…</source>
+        <translation>Đang tải ví…</translation>
+    </message>
+</context>
 <context>
     <name>MasternodeList</name>
     <message>
@@ -1024,6 +1516,10 @@
         <source>Service</source>
         <translation>Dịch vụ</translation>
     </message>
+    <message>
+        <source>Type</source>
+        <translation>Loại</translation>
+    </message>
     <message>
         <source>PoSe Score</source>
         <translation>Điểm PoSe</translation>
@@ -1159,7 +1655,15 @@
         <source>Hide</source>
         <translation>Ẩn</translation>
     </message>
-    </context>
+    <message>
+        <source>%1 is currently syncing.  It will download headers and blocks from peers and validate them until reaching the tip of the block chain.</source>
+        <translation>%1 hiện đang đồng bộ hóa. Nó sẽ tải xuống header và block từ các peer và xác thực chúng cho đến khi đạt đến đỉnh của blockchain.</translation>
+    </message>
+    <message>
+        <source>Unknown. Syncing Headers (%1, %2%)…</source>
+        <translation>Không xác định. Đang đồng bộ Header (%1, %2%)…</translation>
+    </message>
+</context>
 <context>
     <name>OpenURIDialog</name>
     <message>
@@ -1170,10 +1674,37 @@
         <source>URI:</source>
         <translation>URI:</translation>
     </message>
+    <message>
+        <source>Paste address from clipboard</source>
+        <extracomment>Tooltip text for button that allows you to paste an address that is in your clipboard.</extracomment>
+        <translation>Dán địa chỉ từ clipboard</translation>
+    </message>
 </context>
 <context>
     <name>OpenWalletActivity</name>
-    </context>
+    <message>
+        <source>Open wallet failed</source>
+        <translation>Mở ví thất bại</translation>
+    </message>
+    <message>
+        <source>Open wallet warning</source>
+        <translation>Cảnh báo mở ví</translation>
+    </message>
+    <message>
+        <source>default wallet</source>
+        <translation>ví mặc định</translation>
+    </message>
+    <message>
+        <source>Open Wallet</source>
+        <extracomment>Title of window indicating the progress of opening of a wallet.</extracomment>
+        <translation>Mở Ví</translation>
+    </message>
+    <message>
+        <source>Opening Wallet &lt;b&gt;%1&lt;/b&gt;…</source>
+        <extracomment>Descriptive text of the open wallet progress window which indicates to the user which wallet is currently being opened.</extracomment>
+        <translation>Đang mở Ví &lt;b&gt;%1&lt;/b&gt;…</translation>
+    </message>
+</context>
 <context>
     <name>OptionsDialog</name>
     <message>
@@ -1204,6 +1735,78 @@
         <source>&amp;Appearance</source>
         <translation>&amp;Giao diện</translation>
     </message>
+    <message>
+        <source>Show the icon in the system tray.</source>
+        <translation>Hiển thị biểu tượng trong khay hệ thống.</translation>
+    </message>
+    <message>
+        <source>&amp;Show tray icon</source>
+        <translation>&amp;Hiển thị biểu tượng khay</translation>
+    </message>
+    <message>
+        <source>Prune &amp;block storage to</source>
+        <translation>Cắt bớt dung lượng &amp;lưu trữ khối xuống</translation>
+    </message>
+    <message>
+        <source>GB</source>
+        <translation>GB</translation>
+    </message>
+    <message>
+        <source>Reverting this setting requires re-downloading the entire blockchain.</source>
+        <translation>Hoàn tác cài đặt này yêu cầu tải lại toàn bộ blockchain.</translation>
+    </message>
+    <message>
+        <source>Maximum database cache size. A larger cache can contribute to faster sync, after which the benefit is less pronounced for most use cases. Lowering the cache size will reduce memory usage. Unused mempool memory is shared for this cache.</source>
+        <extracomment>Tooltip text for Options window setting that sets the size of the database cache. Explains the corresponding effects of increasing/decreasing this value.</extracomment>
+        <translation>Kích thước bộ nhớ đệm cơ sở dữ liệu tối đa. Bộ nhớ đệm lớn hơn có thể giúp đồng bộ nhanh hơn, sau đó lợi ích ít rõ rệt hơn cho hầu hết trường hợp sử dụng. Giảm kích thước bộ nhớ đệm sẽ giảm mức sử dụng bộ nhớ. Bộ nhớ mempool chưa sử dụng được chia sẻ cho bộ nhớ đệm này.</translation>
+    </message>
+    <message>
+        <source>MiB</source>
+        <translation>MiB</translation>
+    </message>
+    <message>
+        <source>Set the number of script verification threads. Negative values correspond to the number of cores you want to leave free to the system.</source>
+        <extracomment>Tooltip text for Options window setting that sets the number of script verification threads. Explains that negative values mean to leave these many cores free to the system.</extracomment>
+        <translation>Đặt số lượng luồng xác minh script. Giá trị âm tương ứng với số lượng lõi bạn muốn để trống cho hệ thống.</translation>
+    </message>
+    <message>
+        <source>This allows you or a third party tool to communicate with the node through command-line and JSON-RPC commands.</source>
+        <extracomment>Tooltip text for Options window setting that enables the RPC server.</extracomment>
+        <translation>Điều này cho phép bạn hoặc công cụ của bên thứ ba giao tiếp với nút thông qua dòng lệnh và lệnh JSON-RPC.</translation>
+    </message>
+    <message>
+        <source>Enable R&amp;PC server</source>
+        <extracomment>An Options window setting to enable the RPC server.</extracomment>
+        <translation>Bật máy chủ R&amp;PC</translation>
+    </message>
+    <message>
+        <source>Whether to set subtract fee from amount as default or not.</source>
+        <extracomment>Tooltip text for Options window setting that sets subtracting the fee from a sending amount as default.</extracomment>
+        <translation>Có đặt trừ phí từ số tiền làm mặc định hay không.</translation>
+    </message>
+    <message>
+        <source>Subtract &amp;fee from amount by default</source>
+        <extracomment>An Options window setting to set subtracting the fee from a sending amount as default.</extracomment>
+        <translation>Trừ &amp;phí từ số tiền theo mặc định</translation>
+    </message>
+    <message>
+        <source>Enable &amp;PSBT controls</source>
+        <extracomment>An options window setting to enable PSBT controls.</extracomment>
+        <translation>Bật điều khiển &amp;PSBT</translation>
+    </message>
+    <message>
+        <source>Whether to show PSBT controls.</source>
+        <extracomment>Tooltip text for options window setting that enables PSBT controls.</extracomment>
+        <translation>Có hiển thị điều khiển PSBT hay không.</translation>
+    </message>
+    <message>
+        <source>Whether to keep the specified custom change address or not.</source>
+        <translation>Có giữ địa chỉ tiền lẻ tùy chỉnh đã chỉ định hay không.</translation>
+    </message>
+    <message>
+        <source>Keep custom change &amp;address</source>
+        <translation>Giữ &amp;địa chỉ tiền lẻ tùy chỉnh</translation>
+    </message>
     <message>
         <source>Show additional tab listing all your masternodes in first sub-tab&lt;br/&gt;and all masternodes on the network in second sub-tab.</source>
         <translation>Hiện thêm trang có danh sách tất cả các masternodes của bạn trong trang con thứ nhất &lt;br/&gt; và tất cả các masternode trên mạng trong trang con thứ hai.</translation>
@@ -1212,14 +1815,106 @@
         <source>Show Masternodes Tab</source>
         <translation>Hiển thị trang Masternodes</translation>
     </message>
+    <message>
+        <source>Show additional tab listing governance proposals.</source>
+        <translation>Hiển thị tab bổ sung liệt kê các đề xuất quản trị.</translation>
+    </message>
+    <message>
+        <source>Show Governance Tab</source>
+        <translation>Hiển thị Tab Quản trị</translation>
+    </message>
     <message>
         <source>If you disable the spending of unconfirmed change, the change from a transaction&lt;br/&gt;cannot be used until that transaction has at least one confirmation.&lt;br/&gt;This also affects how your balance is computed.</source>
         <translation>Nếu bạn vô hiệu hóa các chi tiêu của phần tiền lẻ chưa được xác nhận, phần tiền lẻ từ một giao dịch &lt;br/&gt;không thể được sử dụng đến khi giao dịch đó nhận được ít nhất một xác nhận. &lt;br/&gt;Điều này ảnh hưởng đến cách tính số dư của bạn.</translation>
     </message>
+    <message>
+        <source>Show mixing interface on Overview screen and reveal an additional screen which allows to spend fully mixed coins only.&lt;br/&gt;A new tab with more settings will also appear in this dialog, please make sure to check them before mixing your coins.</source>
+        <translation>Hiển thị giao diện trộn trên màn hình Tổng quan và hiển thị màn hình bổ sung cho phép chi tiêu chỉ các đồng coin đã trộn hoàn toàn.&lt;br/&gt;Tab mới với nhiều cài đặt hơn cũng sẽ xuất hiện trong hộp thoại này, vui lòng kiểm tra chúng trước khi trộn coin của bạn.</translation>
+    </message>
+    <message>
+        <source>Show additional information and buttons on overview screen.</source>
+        <translation>Hiển thị thông tin và nút bổ sung trên màn hình tổng quan.</translation>
+    </message>
+    <message>
+        <source>Enable advanced interface</source>
+        <translation>Bật giao diện nâng cao</translation>
+    </message>
+    <message>
+        <source>Show system popups for mixing transactions&lt;br/&gt;just like for all other transaction types.</source>
+        <translation>Hiển thị thông báo hệ thống cho giao dịch trộn&lt;br/&gt;giống như tất cả các loại giao dịch khác.</translation>
+    </message>
+    <message>
+        <source>Show popups for mixing transactions</source>
+        <translation>Hiển thị thông báo cho giao dịch trộn</translation>
+    </message>
+    <message>
+        <source>Show warning dialog when the wallet has very low number of keys left.</source>
+        <translation>Hiển thị hộp thoại cảnh báo khi ví còn rất ít khóa.</translation>
+    </message>
+    <message>
+        <source>Warn if the wallet is running out of keys</source>
+        <translation>Cảnh báo nếu ví sắp hết khóa</translation>
+    </message>
+    <message>
+        <source>Whether to use experimental mode with multiple mixing sessions per block.&lt;br/&gt;Note: You must use this feature carefully.&lt;br/&gt;Make sure you always have recent wallet (auto)backup in a safe place!</source>
+        <translation>Có sử dụng chế độ thử nghiệm với nhiều phiên trộn mỗi khối hay không.&lt;br/&gt;Lưu ý: Bạn phải sử dụng tính năng này một cách cẩn thận.&lt;br/&gt;Đảm bảo bạn luôn có bản sao lưu ví gần đây (tự động) ở nơi an toàn!</translation>
+    </message>
+    <message>
+        <source>Enable &amp;multi-session</source>
+        <translation>Bật &amp;đa phiên</translation>
+    </message>
+    <message>
+        <source>Use this many separate masternodes in parallel to mix funds.&lt;br/&gt;Note: You must use this feature carefully.&lt;br/&gt;Make sure you always have recent wallet (auto)backup in a safe place!</source>
+        <translation>Sử dụng nhiều masternode riêng biệt song song để trộn tiền.&lt;br/&gt;Lưu ý: Bạn phải sử dụng tính năng này một cách cẩn thận.&lt;br/&gt;Đảm bảo bạn luôn có bản sao lưu ví gần đây (tự động) ở nơi an toàn!</translation>
+    </message>
+    <message>
+        <source>Parallel sessions</source>
+        <translation>Phiên song song</translation>
+    </message>
+    <message>
+        <source>Mixing rounds</source>
+        <translation>Vòng trộn</translation>
+    </message>
+    <message>
+        <source>This amount acts as a threshold to turn off mixing once it's reached.</source>
+        <translation>Số tiền này đóng vai trò là ngưỡng để tắt trộn khi đạt được.</translation>
+    </message>
+    <message>
+        <source>Target balance</source>
+        <translation>Số dư mục tiêu</translation>
+    </message>
+    <message>
+        <source>How many inputs of each denominated amount are created.&lt;br/&gt;Lower these numbers if you want fewer smaller denominations.</source>
+        <translation>Có bao nhiêu đầu vào của mỗi mệnh giá được tạo ra.&lt;br/&gt;Giảm các số này nếu bạn muốn ít mệnh giá nhỏ hơn.</translation>
+    </message>
+    <message>
+        <source>Inputs per denomination</source>
+        <translation>Đầu vào mỗi mệnh giá</translation>
+    </message>
+    <message>
+        <source>Try to create at least this many inputs for each denominated amount.&lt;br/&gt;Lower this number if you want fewer smaller denominations.</source>
+        <translation>Cố gắng tạo ít nhất số lượng đầu vào này cho mỗi mệnh giá.&lt;br/&gt;Giảm số này nếu bạn muốn ít mệnh giá nhỏ hơn.</translation>
+    </message>
+    <message>
+        <source>Target</source>
+        <translation>Mục tiêu</translation>
+    </message>
+    <message>
+        <source>Create up to this many inputs for each denominated amount.&lt;br/&gt;Lower this number if you want fewer smaller denominations.</source>
+        <translation>Tạo tối đa số lượng đầu vào này cho mỗi mệnh giá.&lt;br/&gt;Giảm số này nếu bạn muốn ít mệnh giá nhỏ hơn.</translation>
+    </message>
+    <message>
+        <source>Maximum</source>
+        <translation>Tối đa</translation>
+    </message>
     <message>
         <source>Automatically open the Dash Core client port on the router. This only works when your router supports UPnP and it is enabled.</source>
         <translation>Tự động mở cổng cho phần mềm Dash Core trên rounter. Điều này chỉ hoạt động được khi rounter của bạn hỗ trợ UpnP và tính năng đó được bật lên.</translation>
     </message>
+    <message>
+        <source>Map port using NA&amp;T-PMP</source>
+        <translation>Ánh xạ cổng bằng NA&amp;T-PMP</translation>
+    </message>
     <message>
         <source>Accept connections from outside.</source>
         <translation>Chấp nhận các kết nối từ bên ngoài.</translation>
@@ -1241,16 +1936,26 @@
         <translation>Hiển thị nếu proxy SOCKS5 mặc định được cung cấp để dùng tiếp cận các thiết bị ngang hàng thông qua loại mạng này.</translation>
     </message>
     <message>
-        <source>Minimize instead of exit the application when the window is closed. When this option is enabled, the application will be closed only after selecting Exit in the menu.</source>
-        <translation>Thu nhỏ thay vì thoát khỏi ứng dụng khi cửa sổ được đóng lại. Khi tuỳ chọn này được bật, ứng dụng sẽ được đóng chỉ sau khi chọn chức năng Thoát trên menu.</translation>
+        <source>Language missing or translation incomplete? Help contributing translations here:
+https://explore.transifex.com/dash/dash/</source>
+        <translation>Thiếu ngôn ngữ hoặc bản dịch chưa hoàn chỉnh? Giúp đóng góp bản dịch tại đây:
+https://explore.transifex.com/dash/dash/</translation>
+    </message>
+    <message>
+        <source>Third-party URLs (e.g. a block explorer) that appear in the transactions tab as context menu items.&lt;br/&gt;%s in the URL is replaced by transaction hash. Multiple URLs are separated by vertical bar |.</source>
+        <translation>URL của bên thứ ba (ví dụ: trình khám phá khối) xuất hiện trong tab giao dịch dưới dạng mục menu ngữ cảnh.&lt;br/&gt;%s trong URL được thay thế bằng hash giao dịch. Nhiều URL được phân tách bằng dấu gạch dọc |.</translation>
+    </message>
+    <message>
+        <source>&amp;Third-party transaction URLs</source>
+        <translation>URL giao dịch của bên &amp;thứ ba</translation>
     </message>
     <message>
-        <source>Third party URLs (e.g. a block explorer) that appear in the transactions tab as context menu items.&lt;br/&gt;%s in the URL is replaced by transaction hash. Multiple URLs are separated by vertical bar |.</source>
-        <translation>Địa chỉ URL của bên thứ ba (ví dụ: một trang duyệt block) mà xuất hiện trong trang về các giao dịch giống như một mục trong menu ngữ cảnh.&lt;br/&gt;%s trong địa chỉ URL được thay thế bằng mã băm của giao dịch. Nhiều địa chỉ URL được phân cách với nhau bởi một đường thẳng dọc |.</translation>
+        <source>Options set in this dialog are overridden by the command line or in the configuration file:</source>
+        <translation>Các tùy chọn được đặt trong hộp thoại này bị ghi đè bởi dòng lệnh hoặc trong tệp cấu hình:</translation>
     </message>
     <message>
-        <source>&amp;Third party transaction URLs</source>
-        <translation>URL của giao dịch bên &amp;Thứ ba</translation>
+        <source>Minimize instead of exit the application when the window is closed. When this option is enabled, the application will be closed only after selecting Exit in the menu.</source>
+        <translation>Thu nhỏ thay vì thoát khỏi ứng dụng khi cửa sổ được đóng lại. Khi tuỳ chọn này được bật, ứng dụng sẽ được đóng chỉ sau khi chọn chức năng Thoát trên menu.</translation>
     </message>
     <message>
         <source>Whether to show coin control features or not.</source>
@@ -1280,10 +1985,18 @@
         <source>&amp;Network</source>
         <translation>&amp;Mạng</translation>
     </message>
+    <message>
+        <source>Enabling pruning significantly reduces the disk space required to store transactions. All blocks are still fully validated. Reverting this setting requires re-downloading the entire blockchain.</source>
+        <translation>Bật cắt tỉa giảm đáng kể dung lượng đĩa cần thiết để lưu trữ giao dịch. Tất cả các block vẫn được xác thực đầy đủ. Hoàn nguyên cài đặt này yêu cầu tải lại toàn bộ blockchain.</translation>
+    </message>
     <message>
         <source>Map port using &amp;UPnP</source>
         <translation>Ánh xạ cổng sử dụng &amp;UPnP</translation>
     </message>
+    <message>
+        <source>Automatically open the Dash Core client port on the router. This only works when your router supports NAT-PMP and it is enabled. The external port could be random.</source>
+        <translation>Tự động mở cổng ứng dụng Dash Core trên router. Điều này chỉ hoạt động khi router của bạn hỗ trợ NAT-PMP và được bật. Cổng ngoài có thể là ngẫu nhiên.</translation>
+    </message>
     <message>
         <source>Proxy &amp;IP:</source>
         <translation>Proxy &amp;IP:</translation>
@@ -1332,6 +2045,14 @@
         <source>&amp;Display</source>
         <translation>&amp;Hiển thị</translation>
     </message>
+    <message>
+        <source>Connect to the Dash network through a separate SOCKS5 proxy for Tor onion services.</source>
+        <translation>Kết nối với mạng Dash thông qua proxy SOCKS5 riêng cho dịch vụ Tor onion.</translation>
+    </message>
+    <message>
+        <source>Use separate SOCKS&amp;5 proxy to reach peers via Tor onion services:</source>
+        <translation>Sử dụng proxy SOCKS&amp;5 riêng để tiếp cận peer qua dịch vụ Tor onion:</translation>
+    </message>
     <message>
         <source>User Interface &amp;language:</source>
         <translation>&amp;Ngôn ngữ người dùng:</translation>
@@ -1368,20 +2089,32 @@
         <source>&amp;Cancel</source>
         <translation>&amp;Huỷ</translation>
     </message>
+    <message>
+        <source>Enable %1 features</source>
+        <translation>Bật tính năng %1</translation>
+    </message>
     <message>
         <source>default</source>
         <translation>ngầm định</translation>
     </message>
     <message>
         <source>Confirm options reset</source>
+        <extracomment>Window title text of pop-up window shown when the user has chosen to reset options.</extracomment>
         <translation>Xác nhận tái lập tuỳ chọn</translation>
     </message>
     <message>
         <source>Client restart required to activate changes.</source>
+        <extracomment>Text explaining that the settings changed will not come into effect until the client is restarted.</extracomment>
         <translation>Cần phải khởi động phần mềm để kích hoạt các thay đổi.</translation>
     </message>
+    <message>
+        <source>Current settings will be backed up at "%1".</source>
+        <extracomment>Text explaining to the user that the client's current settings will be backed up at a specific location. %1 is a stand-in argument for the backup location's path.</extracomment>
+        <translation>Các cài đặt hiện tại sẽ được sao lưu tại "%1".</translation>
+    </message>
     <message>
         <source>Client will be shut down. Do you want to proceed?</source>
+        <extracomment>Text asking the user to confirm if they would like to proceed with a client shutdown.</extracomment>
         <translation>Phần mềm sẽ được tắt. Bạn có muốn xử lý?</translation>
     </message>
     <message>
@@ -1515,6 +2248,14 @@
         <source>No inputs detected</source>
         <translation>Phát hiện không có đầu vào</translation>
     </message>
+    <message>
+        <source>%1 Balance</source>
+        <translation>Số dư %1</translation>
+    </message>
+    <message>
+        <source>Discreet mode activated for the Overview tab. To unmask the values, uncheck Settings-&gt;Discreet mode.</source>
+        <translation>Chế độ kín đáo đã được kích hoạt cho tab Tổng quan. Để bỏ ẩn các giá trị, bỏ chọn Cài đặt-&gt;Chế độ kín đáo.</translation>
+    </message>
     <message numerus="yes">
         <source>%n Rounds</source>
         <translation><numerusform>%n Vòng</numerusform></translation>
@@ -1551,6 +2292,26 @@
         <source>keys left: %1</source>
         <translation>số khoá còn lại: %1</translation>
     </message>
+    <message>
+        <source>Start %1</source>
+        <translation>Bắt đầu %1</translation>
+    </message>
+    <message>
+        <source>If you don't want to see internal %1 fees/transactions select "Most Common" as Type on the "Transactions" tab.</source>
+        <translation>Nếu bạn không muốn xem phí/giao dịch %1 nội bộ, hãy chọn "Phổ biến nhất" làm Loại trên tab "Giao dịch".</translation>
+    </message>
+    <message>
+        <source>%1 requires at least %2 to use.</source>
+        <translation>%1 yêu cầu ít nhất %2 để sử dụng.</translation>
+    </message>
+    <message>
+        <source>Wallet is locked and user declined to unlock. Disabling %1.</source>
+        <translation>Ví đã bị khoá và người dùng từ chối mở khoá. Đang tắt %1.</translation>
+    </message>
+    <message>
+        <source>Stop %1</source>
+        <translation>Dừng %1</translation>
+    </message>
     <message>
         <source>Disabled</source>
         <translation>Đã tắt</translation>
@@ -1594,23 +2355,166 @@
 </context>
 <context>
     <name>PSBTOperationsDialog</name>
-    </context>
-<context>
-    <name>PaymentServer</name>
     <message>
-        <source>Payment request error</source>
-        <translation>Yêu cầu thanh toán bị lỗi</translation>
+        <source>Dialog</source>
+        <translation>Hộp thoại</translation>
     </message>
     <message>
-        <source>Cannot start dash: click-to-pay handler</source>
-        <translation>Không thể khởi động dash: trình xử lý click-to-pay</translation>
+        <source>Sign Tx</source>
+        <translation>Ký Giao dịch</translation>
     </message>
     <message>
-        <source>URI handling</source>
-        <translation>xử lý URI</translation>
+        <source>Broadcast Tx</source>
+        <translation>Phát Giao dịch</translation>
     </message>
     <message>
-        <source>URI cannot be parsed! This can be caused by an invalid Dash address or malformed URI parameters.</source>
+        <source>Copy to Clipboard</source>
+        <translation>Sao chép vào Clipboard</translation>
+    </message>
+    <message>
+        <source>Save…</source>
+        <translation>Lưu…</translation>
+    </message>
+    <message>
+        <source>Close</source>
+        <translation>Đóng</translation>
+    </message>
+    <message>
+        <source>Failed to load transaction: %1</source>
+        <translation>Không thể tải giao dịch: %1</translation>
+    </message>
+    <message>
+        <source>Failed to sign transaction: %1</source>
+        <translation>Không thể ký giao dịch: %1</translation>
+    </message>
+    <message>
+        <source>Cannot sign inputs while wallet is locked.</source>
+        <translation>Không thể ký đầu vào khi ví bị khóa.</translation>
+    </message>
+    <message>
+        <source>Could not sign any more inputs.</source>
+        <translation>Không thể ký thêm đầu vào nào nữa.</translation>
+    </message>
+    <message>
+        <source>Signed %1 inputs, but more signatures are still required.</source>
+        <translation>Đã ký %1 đầu vào, nhưng vẫn cần thêm chữ ký.</translation>
+    </message>
+    <message>
+        <source>Signed transaction successfully. Transaction is ready to broadcast.</source>
+        <translation>Ký giao dịch thành công. Giao dịch đã sẵn sàng để phát.</translation>
+    </message>
+    <message>
+        <source>Unknown error processing transaction.</source>
+        <translation>Lỗi không xác định khi xử lý giao dịch.</translation>
+    </message>
+    <message>
+        <source>Transaction broadcast successfully! Transaction ID: %1</source>
+        <translation>Phát giao dịch thành công! ID Giao dịch: %1</translation>
+    </message>
+    <message>
+        <source>Transaction broadcast failed: %1</source>
+        <translation>Phát giao dịch thất bại: %1</translation>
+    </message>
+    <message>
+        <source>PSBT copied to clipboard.</source>
+        <translation>PSBT đã sao chép vào clipboard.</translation>
+    </message>
+    <message>
+        <source>Save Transaction Data</source>
+        <translation>Lưu Dữ liệu Giao dịch</translation>
+    </message>
+    <message>
+        <source>Partially Signed Transaction (Binary)</source>
+        <extracomment>Expanded name of the binary PSBT file format. See: BIP 174.</extracomment>
+        <translation>Giao dịch Đã Ký Một Phần (Nhị phân)</translation>
+    </message>
+    <message>
+        <source>PSBT saved to disk.</source>
+        <translation>PSBT đã lưu vào đĩa.</translation>
+    </message>
+    <message>
+        <source> * Sends %1 to %2</source>
+        <translation> * Gửi %1 đến %2</translation>
+    </message>
+    <message>
+        <source>own address</source>
+        <translation>địa chỉ riêng</translation>
+    </message>
+    <message>
+        <source>Unable to calculate transaction fee or total transaction amount.</source>
+        <translation>Không thể tính phí giao dịch hoặc tổng số tiền giao dịch.</translation>
+    </message>
+    <message>
+        <source>Pays transaction fee: </source>
+        <translation>Trả phí giao dịch: </translation>
+    </message>
+    <message>
+        <source>Total Amount</source>
+        <translation>Tổng số tiền</translation>
+    </message>
+    <message>
+        <source>or</source>
+        <translation>hoặc</translation>
+    </message>
+    <message>
+        <source>Transaction has %1 unsigned inputs.</source>
+        <translation>Giao dịch có %1 đầu vào chưa ký.</translation>
+    </message>
+    <message>
+        <source>Transaction is missing some information about inputs.</source>
+        <translation>Giao dịch thiếu một số thông tin về đầu vào.</translation>
+    </message>
+    <message>
+        <source>Transaction still needs signature(s).</source>
+        <translation>Giao dịch vẫn cần chữ ký.</translation>
+    </message>
+    <message>
+        <source>(But no wallet is loaded.)</source>
+        <translation>(Nhưng không có ví nào được tải.)</translation>
+    </message>
+    <message>
+        <source>(But this wallet cannot sign transactions.)</source>
+        <translation>(Nhưng ví này không thể ký giao dịch.)</translation>
+    </message>
+    <message>
+        <source>(But this wallet does not have the right keys.)</source>
+        <translation>(Nhưng ví này không có khoá đúng.)</translation>
+    </message>
+    <message>
+        <source>Transaction is fully signed and ready for broadcast.</source>
+        <translation>Giao dịch đã được ký đầy đủ và sẵn sàng để phát sóng.</translation>
+    </message>
+    <message>
+        <source>Transaction status is unknown.</source>
+        <translation>Trạng thái giao dịch không xác định.</translation>
+    </message>
+</context>
+<context>
+    <name>PaymentServer</name>
+    <message>
+        <source>Payment request error</source>
+        <translation>Yêu cầu thanh toán bị lỗi</translation>
+    </message>
+    <message>
+        <source>Cannot start dash: click-to-pay handler</source>
+        <translation>Không thể khởi động dash: trình xử lý click-to-pay</translation>
+    </message>
+    <message>
+        <source>URI handling</source>
+        <translation>xử lý URI</translation>
+    </message>
+    <message>
+        <source>'dash://' is not a valid URI. Use 'dash:' instead.</source>
+        <translation>'dash://' không phải là URI hợp lệ. Sử dụng 'dash:' thay thế.</translation>
+    </message>
+    <message>
+        <source>Cannot process payment request as BIP70 is no longer supported.
+Due to discontinued support, you should request the merchant to provide you with a BIP21 compatible URI or use a wallet that does continue to support BIP70.</source>
+        <translation>Không thể xử lý yêu cầu thanh toán vì BIP70 không còn được hỗ trợ.
+Do ngừng hỗ trợ, bạn nên yêu cầu người bán cung cấp cho bạn URI tương thích BIP21 hoặc sử dụng ví vẫn tiếp tục hỗ trợ BIP70.</translation>
+    </message>
+    <message>
+        <source>URI cannot be parsed! This can be caused by an invalid Dash address or malformed URI parameters.</source>
         <translation>URI không thể phân tích. Nó có thể bởi địa chỉ Dash không hợp lệ hoặc thông số URI dị hình.</translation>
     </message>
     <message>
@@ -1630,6 +2534,26 @@
         <extracomment>Title of Peers Table column which indicates the current latency of the connection with the peer.</extracomment>
         <translation>Ping</translation>
     </message>
+    <message>
+        <source>Peer</source>
+        <extracomment>Title of Peers Table column which contains a unique number used to identify a connection.</extracomment>
+        <translation>Peer</translation>
+    </message>
+    <message>
+        <source>Age</source>
+        <extracomment>Title of Peers Table column which indicates the duration (length of time) since the peer connection started.</extracomment>
+        <translation>Tuổi</translation>
+    </message>
+    <message>
+        <source>Direction</source>
+        <extracomment>Title of Peers Table column which indicates the direction the peer connection was initiated from.</extracomment>
+        <translation>Hướng</translation>
+    </message>
+    <message>
+        <source>Type</source>
+        <extracomment>Title of Peers Table column which describes the type of peer connection. The "type" describes why the connection exists.</extracomment>
+        <translation>Loại</translation>
+    </message>
     <message>
         <source>Sent</source>
         <extracomment>Title of Peers Table column which indicates the total amount of network information we have sent to the peer.</extracomment>
@@ -1640,15 +2564,340 @@
         <extracomment>Title of Peers Table column which indicates the total amount of network information we have received from the peer.</extracomment>
         <translation>Đã nhận</translation>
     </message>
-    </context>
+    <message>
+        <source>Address</source>
+        <extracomment>Title of Peers Table column which contains the IP/Onion/I2P address of the connected peer.</extracomment>
+        <translation>Địa chỉ</translation>
+    </message>
+    <message>
+        <source>Network</source>
+        <extracomment>Title of Peers Table column which states the network the peer connected through.</extracomment>
+        <translation>Mạng</translation>
+    </message>
+    <message>
+        <source>Inbound</source>
+        <extracomment>An Inbound Connection from a Peer.</extracomment>
+        <translation>Vào</translation>
+    </message>
+    <message>
+        <source>Outbound</source>
+        <extracomment>An Outbound Connection to a Peer.</extracomment>
+        <translation>Ra</translation>
+    </message>
+</context>
 <context>
     <name>Proposal</name>
-    </context>
+    <message>
+        <source>Passing +%1</source>
+        <translation>Đang vượt qua +%1</translation>
+    </message>
+    <message>
+        <source>Needs additional %1 votes</source>
+        <translation>Cần thêm %1 phiếu bầu</translation>
+    </message>
+</context>
 <context>
     <name>ProposalModel</name>
-    </context>
+    <message>
+        <source>Yes</source>
+        <translation>Có</translation>
+    </message>
+    <message>
+        <source>No</source>
+        <translation>Không</translation>
+    </message>
+    <message>
+        <source>Hash</source>
+        <translation>Hash</translation>
+    </message>
+    <message>
+        <source>Title</source>
+        <translation>Tiêu đề</translation>
+    </message>
+    <message>
+        <source>Start</source>
+        <translation>Bắt đầu</translation>
+    </message>
+    <message>
+        <source>End</source>
+        <translation>Kết thúc</translation>
+    </message>
+    <message>
+        <source>Amount</source>
+        <translation>Số lượng</translation>
+    </message>
+    <message>
+        <source>Active</source>
+        <translation>Hoạt động</translation>
+    </message>
+    <message>
+        <source>Status</source>
+        <translation>Trạng thái</translation>
+    </message>
+</context>
+<context>
+    <name>ProposalWizard</name>
+    <message>
+        <source>Create Governance Proposal</source>
+        <translation>Tạo Đề xuất Quản trị</translation>
+    </message>
+    <message>
+        <source>Enter proposal details</source>
+        <translation>Nhập chi tiết đề xuất</translation>
+    </message>
+    <message>
+        <source>A fee will be burned when you prepare the proposal.</source>
+        <translation>Một khoản phí sẽ bị đốt khi bạn chuẩn bị đề xuất.</translation>
+    </message>
+    <message>
+        <source>Proposal &amp;name</source>
+        <translation>&amp;Tên đề xuất</translation>
+    </message>
+    <message>
+        <source>&amp;Description URL</source>
+        <translation>URL &amp;Mô tả</translation>
+    </message>
+    <message>
+        <source>Payment &amp;address</source>
+        <translation>&amp;Địa chỉ thanh toán</translation>
+    </message>
+    <message>
+        <source>Payment &amp;amount</source>
+        <translation>&amp;Số tiền thanh toán</translation>
+    </message>
+    <message>
+        <source>The amount to request in a single payment</source>
+        <translation>Số tiền yêu cầu trong một lần thanh toán</translation>
+    </message>
+    <message>
+        <source>&amp;First payment</source>
+        <translation>Thanh toán &amp;đầu tiên</translation>
+    </message>
+    <message>
+        <source>Pa&amp;yments</source>
+        <translation>Các khoản thanh &amp;toán</translation>
+    </message>
+    <message>
+        <source>To&amp;tal amount</source>
+        <translation>Tổng &amp;số tiền</translation>
+    </message>
+    <message>
+        <source>Proposal &amp;fee</source>
+        <translation>&amp;Phí đề xuất</translation>
+    </message>
+    <message>
+        <source>Next</source>
+        <translation>Tiếp theo</translation>
+    </message>
+    <message>
+        <source>Review proposal JSON and validate.</source>
+        <translation>Xem lại JSON đề xuất và xác thực.</translation>
+    </message>
+    <message>
+        <source>Hex-encoded JSON</source>
+        <translation>JSON mã hóa Hex</translation>
+    </message>
+    <message>
+        <source>Back</source>
+        <translation>Quay lại</translation>
+    </message>
+    <message>
+        <source>Validate</source>
+        <translation>Xác thực</translation>
+    </message>
+    <message>
+        <source>Prepare (burn fee) and wait for confirmations.</source>
+        <translation>Chuẩn bị (đốt phí) và đợi xác nhận.</translation>
+    </message>
+    <message>
+        <source>Copy</source>
+        <translation>Sao chép</translation>
+    </message>
+    <message>
+        <source>At 1/6 confirmations: can be relayed and queued. At 6/6: accepted and processed.</source>
+        <translation>Tại 1/6 xác nhận: có thể được chuyển tiếp và xếp hàng. Tại 6/6: được chấp nhận và xử lý.</translation>
+    </message>
+    <message>
+        <source>Confirmations progress</source>
+        <translation>Tiến trình xác nhận</translation>
+    </message>
+    <message>
+        <source>Shows progress toward the required number of confirmations for the proposal fee transaction.</source>
+        <translation>Hiển thị tiến trình hướng tới số lượng xác nhận cần thiết cho giao dịch phí đề xuất.</translation>
+    </message>
+    <message>
+        <source>Estimated time remaining: -</source>
+        <translation>Thời gian ước tính còn lại: -</translation>
+    </message>
+    <message>
+        <source>Prepare Proposal</source>
+        <translation>Chuẩn bị Đề xuất</translation>
+    </message>
+    <message>
+        <source>You can submit after 1 confirmation. At 6 confirmations it is accepted and processed.</source>
+        <translation>Bạn có thể gửi sau 1 xác nhận. Tại 6 xác nhận nó sẽ được chấp nhận và xử lý.</translation>
+    </message>
+    <message>
+        <source>Proposal ID:</source>
+        <translation>ID Đề xuất:</translation>
+    </message>
+    <message>
+        <source>Submit Proposal</source>
+        <translation>Gửi Đề xuất</translation>
+    </message>
+    <message>
+        <source>Close</source>
+        <translation>Đóng</translation>
+    </message>
+    <message>
+        <source>Valid</source>
+        <translation>Hợp lệ</translation>
+    </message>
+    <message>
+        <source>Invalid: %1</source>
+        <translation>Không hợp lệ: %1</translation>
+    </message>
+    <message>
+        <source>Burn %1</source>
+        <translation>Đốt %1</translation>
+    </message>
+    <message>
+        <source>Burn %1 to create the fee transaction?</source>
+        <translation>Đốt %1 để tạo giao dịch phí?</translation>
+    </message>
+    <message>
+        <source>Prepare failed</source>
+        <translation>Chuẩn bị thất bại</translation>
+    </message>
+    <message>
+        <source>Confirmations: %1 / %2 required</source>
+        <translation>Xác nhận: %1 / %2 yêu cầu</translation>
+    </message>
+    <message>
+        <source>Estimated time remaining: Ready</source>
+        <translation>Thời gian ước tính còn lại: Sẵn sàng</translation>
+    </message>
+    <message numerus="yes">
+        <source>Estimated time remaining: %n minute(s)</source>
+        <translation><numerusform>Thời gian ước tính còn lại: %n phút</numerusform></translation>
+    </message>
+    <message>
+        <source>Your proposal was submitted successfully.</source>
+        <translation>Đề xuất của bạn đã được gửi thành công.</translation>
+    </message>
+    <message>
+        <source>Already submitted</source>
+        <translation>Đã gửi</translation>
+    </message>
+    <message>
+        <source>This proposal has already been submitted.</source>
+        <translation>Đề xuất này đã được gửi rồi.</translation>
+    </message>
+    <message>
+        <source>Submission failed</source>
+        <translation>Gửi thất bại</translation>
+    </message>
+    <message>
+        <source>Proposal submitted</source>
+        <translation>Đề xuất đã gửi</translation>
+    </message>
+    <message>
+        <source>A fee of %1 will be burned when you prepare the proposal.</source>
+        <translation>Phí %1 sẽ bị đốt khi bạn chuẩn bị đề xuất.</translation>
+    </message>
+    <message>
+        <source>Prepare (burn %1) and wait for %2 confirmations.</source>
+        <translation>Chuẩn bị (đốt %1) và đợi %2 xác nhận.</translation>
+    </message>
+</context>
 <context>
     <name>QObject</name>
+    <message>
+        <source>Do you want to reset settings to default values, or to abort without making changes?</source>
+        <extracomment>Explanatory text shown on startup when the settings file cannot be read. Prompts user to make a choice between resetting or aborting.</extracomment>
+        <translation>Bạn có muốn đặt lại cài đặt về giá trị mặc định, hay huỷ bỏ mà không thực hiện thay đổi?</translation>
+    </message>
+    <message>
+        <source>A fatal error occurred. Check that settings file is writable, or try running with -nosettings.</source>
+        <extracomment>Explanatory text shown on startup when the settings file could not be written. Prompts user to check that we have the ability to write to the file. Explains that the user has the option of running without a settings file.</extracomment>
+        <translation>Đã xảy ra lỗi nghiêm trọng. Kiểm tra rằng tệp cài đặt có thể ghi được, hoặc thử chạy với -nosettings.</translation>
+    </message>
+    <message>
+        <source>Choose data directory on startup (default: %u)</source>
+        <translation>Chọn thư mục dữ liệu khi khởi động (mặc định: %u)</translation>
+    </message>
+    <message>
+        <source>Set the font family. Possible values: %1. (default: %2)</source>
+        <translation>Đặt họ phông chữ. Các giá trị có thể: %1. (mặc định: %2)</translation>
+    </message>
+    <message>
+        <source>Set a scale factor which gets applied to the base font size. Possible range %1 (smallest fonts) to %2 (largest fonts). (default: %3)</source>
+        <translation>Đặt hệ số tỷ lệ được áp dụng cho kích thước phông chữ cơ sở. Phạm vi có thể %1 (phông chữ nhỏ nhất) đến %2 (phông chữ lớn nhất). (mặc định: %3)</translation>
+    </message>
+    <message>
+        <source>Set the font weight for bold texts. Possible range %1 to %2 (default: %3)</source>
+        <translation>Đặt độ đậm phông chữ cho văn bản in đậm. Phạm vi có thể %1 đến %2 (mặc định: %3)</translation>
+    </message>
+    <message>
+        <source>Set the font weight for normal texts. Possible range %1 to %2 (default: %3)</source>
+        <translation>Đặt độ đậm phông chữ cho văn bản thông thường. Phạm vi có thể %1 đến %2 (mặc định: %3)</translation>
+    </message>
+    <message>
+        <source>Set language, for example "de_DE" (default: system locale)</source>
+        <translation>Đặt ngôn ngữ, ví dụ "de_DE" (mặc định: ngôn ngữ hệ thống)</translation>
+    </message>
+    <message>
+        <source>Start minimized</source>
+        <translation>Bắt đầu ở dạng thu nhỏ</translation>
+    </message>
+    <message>
+        <source>Reset all settings changed in the GUI</source>
+        <translation>Đặt lại tất cả cài đặt đã thay đổi trong GUI</translation>
+    </message>
+    <message>
+        <source>Show splash screen on startup (default: %u)</source>
+        <translation>Hiển thị màn hình khởi động khi khởi động (mặc định: %u)</translation>
+    </message>
+    <message>
+        <source>Error: Specified data directory "%1" does not exist.</source>
+        <translation>Lỗi: Thư mục dữ liệu được chỉ định "%1" không tồn tại.</translation>
+    </message>
+    <message>
+        <source>Error: Cannot parse configuration file: %1.</source>
+        <translation>Lỗi: Không thể phân tích tệp cấu hình: %1.</translation>
+    </message>
+    <message>
+        <source>Error: %1</source>
+        <translation>Lỗi: %1</translation>
+    </message>
+    <message>
+        <source>Error: Failed to load application fonts.</source>
+        <translation>Lỗi: Không tải được phông chữ ứng dụng.</translation>
+    </message>
+    <message>
+        <source>Error: Specified font-family invalid. Valid values: %1.</source>
+        <translation>Lỗi: Họ phông chữ được chỉ định không hợp lệ. Giá trị hợp lệ: %1.</translation>
+    </message>
+    <message>
+        <source>Error: Specified font-weight-normal invalid. Valid range %1 to %2.</source>
+        <translation>Lỗi: Độ đậm phông chữ bình thường được chỉ định không hợp lệ. Phạm vi hợp lệ %1 đến %2.</translation>
+    </message>
+    <message>
+        <source>Error: Specified font-weight-bold invalid. Valid range %1 to %2.</source>
+        <translation>Lỗi: Độ đậm phông chữ in đậm được chỉ định không hợp lệ. Phạm vi hợp lệ %1 đến %2.</translation>
+    </message>
+    <message>
+        <source>Error: Specified font-scale invalid. Valid range %1 to %2.</source>
+        <translation>Lỗi: Tỷ lệ phông chữ được chỉ định không hợp lệ. Phạm vi hợp lệ %1 đến %2.</translation>
+    </message>
+    <message>
+        <source>Error: Invalid -custom-css-dir path.</source>
+        <translation>Lỗi: Đường dẫn -custom-css-dir không hợp lệ.</translation>
+    </message>
+    <message>
+        <source>Error: %1 CSS file(s) missing in -custom-css-dir path.</source>
+        <translation>Lỗi: %1 tệp CSS thiếu trong đường dẫn -custom-css-dir.</translation>
+    </message>
     <message>
         <source>%1 didn't yet exit safely…</source>
         <translation>%1 vẫn chưa thoát an toàn…</translation>
@@ -1673,6 +2922,53 @@
         <source>This can also be adjusted later in the "Appearance" tab of the preferences.</source>
         <translation>Cái này cũng có thể được điều chỉnh sau trong trang "Giao diện" của phần thiết lập tuỳ chọn.</translation>
     </message>
+    <message>
+        <source>Ctrl+W</source>
+        <translation>Ctrl+W</translation>
+    </message>
+    <message>
+        <source>Unroutable</source>
+        <translation>Không định tuyến được</translation>
+    </message>
+    <message>
+        <source>Internal</source>
+        <translation>Nội bộ</translation>
+    </message>
+    <message>
+        <source>Inbound</source>
+        <extracomment>An inbound connection from a peer. An inbound connection is a connection initiated by a peer.</extracomment>
+        <translation>Vào</translation>
+    </message>
+    <message>
+        <source>Outbound</source>
+        <extracomment>An outbound connection to a peer. An outbound connection is a connection initiated by us.</extracomment>
+        <translation>Ra</translation>
+    </message>
+    <message>
+        <source>Full Relay</source>
+        <extracomment>Peer connection type that relays all network information.</extracomment>
+        <translation>Chuyển tiếp đầy đủ</translation>
+    </message>
+    <message>
+        <source>Block Relay</source>
+        <extracomment>Peer connection type that relays network information about blocks and not transactions or addresses.</extracomment>
+        <translation>Chuyển tiếp Block</translation>
+    </message>
+    <message>
+        <source>Manual</source>
+        <extracomment>Peer connection type established manually through one of several methods.</extracomment>
+        <translation>Thủ công</translation>
+    </message>
+    <message>
+        <source>Feeler</source>
+        <extracomment>Short-lived peer connection type that tests the aliveness of known addresses.</extracomment>
+        <translation>Feeler</translation>
+    </message>
+    <message>
+        <source>Address Fetch</source>
+        <extracomment>Short-lived peer connection type that solicits known addresses from a peer.</extracomment>
+        <translation>Lấy địa chỉ</translation>
+    </message>
     <message>
         <source>%1 d</source>
         <translation>%1 giờ</translation>
@@ -1734,8 +3030,8 @@
         <translation>%1 B</translation>
     </message>
     <message>
-        <source>%1 KB</source>
-        <translation>%1 KB</translation>
+        <source>%1 kB</source>
+        <translation>%1 kB</translation>
     </message>
     <message>
         <source>%1 MB</source>
@@ -1775,11 +3071,28 @@
         <source>&amp;Copy Image</source>
         <translation>&amp;Sao chép ảnh</translation>
     </message>
+    <message>
+        <source>Resulting URI too long, try to reduce the text for label / message.</source>
+        <translation>URI kết quả quá dài, hãy thử giảm văn bản cho nhãn / thông điệp.</translation>
+    </message>
+    <message>
+        <source>Error encoding URI into QR Code.</source>
+        <translation>Lỗi mã hóa URI thành mã QR.</translation>
+    </message>
+    <message>
+        <source>QR code support not available.</source>
+        <translation>Hỗ trợ mã QR không khả dụng.</translation>
+    </message>
     <message>
         <source>Save QR Code</source>
         <translation>&amp;Lưu mã QR</translation>
     </message>
-    </context>
+    <message>
+        <source>PNG Image</source>
+        <extracomment>Expanded name of the PNG file format. See: https://en.wikipedia.org/wiki/Portable_Network_Graphics.</extracomment>
+        <translation>Ảnh PNG</translation>
+    </message>
+</context>
 <context>
     <name>RPCConsole</name>
     <message>
@@ -1870,6 +3183,10 @@
         <source>&amp;Peers</source>
         <translation>&amp;Máy ngang cấp</translation>
     </message>
+    <message>
+        <source>Wallet:</source>
+        <translation>Ví:</translation>
+    </message>
     <message>
         <source>Banned peers</source>
         <translation>Các nút ngang hàng đã bị khoá</translation>
@@ -1882,6 +3199,14 @@
         <source>Version</source>
         <translation>Phiên bản</translation>
     </message>
+    <message>
+        <source>High bandwidth BIP152 compact block relay: %1</source>
+        <translation>Chuyển tiếp khối nhỏ gọn BIP152 băng thông cao: %1</translation>
+    </message>
+    <message>
+        <source>High Bandwidth</source>
+        <translation>Băng thông cao</translation>
+    </message>
     <message>
         <source>Starting Block</source>
         <translation>Khởi động khối</translation>
@@ -1894,6 +3219,71 @@
         <source>Synced Blocks</source>
         <translation>Các khối đã đồng bộ</translation>
     </message>
+    <message>
+        <source>Elapsed time since a novel block passing initial validity checks was received from this peer.</source>
+        <translation>Thời gian trôi qua kể từ khi một khối mới vượt qua kiểm tra tính hợp lệ ban đầu được nhận từ peer này.</translation>
+    </message>
+    <message>
+        <source>Last Block</source>
+        <translation>Khối cuối cùng</translation>
+    </message>
+    <message>
+        <source>Elapsed time since a novel transaction accepted into our mempool was received from this peer.</source>
+        <extracomment>Tooltip text for the Last Transaction field in the peer details area.</extracomment>
+        <translation>Thời gian trôi qua kể từ khi một giao dịch mới được chấp nhận vào mempool của chúng tôi được nhận từ peer này.</translation>
+    </message>
+    <message>
+        <source>Last Transaction</source>
+        <translation>Giao dịch cuối cùng</translation>
+    </message>
+    <message>
+        <source>The mapped Autonomous System used for diversifying peer selection.</source>
+        <translation>Hệ thống tự trị được ánh xạ được sử dụng để đa dạng hóa lựa chọn peer.</translation>
+    </message>
+    <message>
+        <source>Mapped AS</source>
+        <translation>AS được ánh xạ</translation>
+    </message>
+    <message>
+        <source>Whether we relay addresses to this peer.</source>
+        <extracomment>Tooltip text for the Address Relay field in the peer details area, which displays whether we relay addresses to this peer (Yes/No).</extracomment>
+        <translation>Liệu chúng ta có chuyển tiếp địa chỉ đến peer này hay không.</translation>
+    </message>
+    <message>
+        <source>Address Relay</source>
+        <extracomment>Text title for the Address Relay field in the peer details area, which displays whether we relay addresses to this peer (Yes/No).</extracomment>
+        <translation>Chuyển tiếp địa chỉ</translation>
+    </message>
+    <message>
+        <source>Addresses Processed</source>
+        <extracomment>Text title for the Addresses Processed field in the peer details area, which displays the total number of addresses received from this peer that were processed (excludes addresses that were dropped due to rate-limiting).</extracomment>
+        <translation>Địa chỉ đã xử lý</translation>
+    </message>
+    <message>
+        <source>Addresses Rate-Limited</source>
+        <extracomment>Text title for the Addresses Rate-Limited field in the peer details area, which displays the total number of addresses received from this peer that were dropped (not processed) due to rate-limiting.</extracomment>
+        <translation>Địa chỉ bị giới hạn tốc độ</translation>
+    </message>
+    <message>
+        <source>Rescan blockchain files 1</source>
+        <translation>Quét lại các tệp blockchain 1</translation>
+    </message>
+    <message>
+        <source>Rescan blockchain files 2</source>
+        <translation>Quét lại các tệp blockchain 2</translation>
+    </message>
+    <message>
+        <source>The buttons below will restart the wallet with command-line options to repair the wallet, fix issues with corrupt blockchain files or missing/obsolete transactions.</source>
+        <translation>Các nút bên dưới sẽ khởi động lại ví với các tùy chọn dòng lệnh để sửa chữa ví, khắc phục sự cố với các tệp blockchain bị hỏng hoặc các giao dịch bị thiếu/lỗi thời.</translation>
+    </message>
+    <message>
+        <source>-rescan=1: Rescan the block chain for missing wallet transactions starting from wallet creation time.</source>
+        <translation>-rescan=1: Quét lại blockchain để tìm các giao dịch ví bị thiếu bắt đầu từ thời điểm tạo ví.</translation>
+    </message>
+    <message>
+        <source>-rescan=2: Rescan the block chain for missing wallet transactions starting from genesis block.</source>
+        <translation>-rescan=2: Quét lại blockchain để tìm các giao dịch ví bị thiếu bắt đầu từ khối genesis.</translation>
+    </message>
     <message>
         <source>User Agent</source>
         <translation>User Agent</translation>
@@ -1902,10 +3292,50 @@
         <source>Datadir</source>
         <translation>Thư mục dữ liệu</translation>
     </message>
+    <message>
+        <source>To specify a non-default location of the data directory use the '%1' option.</source>
+        <translation>Để chỉ định vị trí không mặc định của thư mục dữ liệu, hãy sử dụng tùy chọn '%1'.</translation>
+    </message>
+    <message>
+        <source>Blocksdir</source>
+        <translation>Thư mục khối</translation>
+    </message>
+    <message>
+        <source>To specify a non-default location of the blocks directory use the '%1' option.</source>
+        <translation>Để chỉ định vị trí không mặc định của thư mục khối, hãy sử dụng tùy chọn '%1'.</translation>
+    </message>
+    <message>
+        <source>Local Addresses</source>
+        <translation>Địa chỉ cục bộ</translation>
+    </message>
+    <message>
+        <source>Network addresses that your Dash node is currently using to communicate with other nodes.</source>
+        <translation>Các địa chỉ mạng mà node Dash của bạn hiện đang sử dụng để giao tiếp với các node khác.</translation>
+    </message>
+    <message>
+        <source>Number of regular Masternodes</source>
+        <translation>Số lượng Masternode thông thường</translation>
+    </message>
+    <message>
+        <source>Number of EvoNodes</source>
+        <translation>Số lượng EvoNode</translation>
+    </message>
+    <message>
+        <source>Current block height</source>
+        <translation>Chiều cao khối hiện tại</translation>
+    </message>
     <message>
         <source>Last block hash</source>
         <translation>Mã băm khối cuối</translation>
     </message>
+    <message>
+        <source>Latest ChainLocked block hash</source>
+        <translation>Hash khối ChainLocked mới nhất</translation>
+    </message>
+    <message>
+        <source>Latest ChainLocked block height</source>
+        <translation>Chiều cao khối ChainLocked mới nhất</translation>
+    </message>
     <message>
         <source>Open the %1 debug log file from the current data directory. This can take a few seconds for large log files.</source>
         <translation>Mở cái %1 debug log file từ danh mục dữ liệu hiện tại. Điều này cần vài giây cho large log files.</translation>
@@ -1914,6 +3344,10 @@
         <source>InstantSend locks</source>
         <translation>Khoá InstantSend</translation>
     </message>
+    <message>
+        <source>(none)</source>
+        <translation>(không có)</translation>
+    </message>
     <message>
         <source>Decrease font size</source>
         <translation>Giảm cỡ chữ</translation>
@@ -1926,10 +3360,58 @@
         <source>&amp;Reset</source>
         <translation>&amp;Reset</translation>
     </message>
+    <message>
+        <source>Node Type</source>
+        <translation>Loại Node</translation>
+    </message>
+    <message>
+        <source>PoSe Score</source>
+        <translation>Điểm PoSe</translation>
+    </message>
+    <message>
+        <source>The transport layer version: %1</source>
+        <translation>Phiên bản lớp truyền tải: %1</translation>
+    </message>
+    <message>
+        <source>Transport</source>
+        <translation>Truyền tải</translation>
+    </message>
+    <message>
+        <source>The BIP324 session ID string in hex.</source>
+        <translation>Chuỗi ID phiên BIP324 ở dạng hex.</translation>
+    </message>
+    <message>
+        <source>Session ID</source>
+        <translation>ID phiên</translation>
+    </message>
+    <message>
+        <source>The network protocol this peer is connected through: IPv4, IPv6, Onion, I2P, or CJDNS.</source>
+        <translation>Giao thức mạng mà peer này được kết nối qua: IPv4, IPv6, Onion, I2P hoặc CJDNS.</translation>
+    </message>
+    <message>
+        <source>Permissions</source>
+        <translation>Quyền</translation>
+    </message>
+    <message>
+        <source>The direction and type of peer connection: %1</source>
+        <translation>Hướng và loại kết nối peer: %1</translation>
+    </message>
+    <message>
+        <source>Direction/Type</source>
+        <translation>Hướng/Loại</translation>
+    </message>
     <message>
         <source>Services</source>
         <translation>Dịch vụ</translation>
     </message>
+    <message>
+        <source>Whether we relay transactions to this peer.</source>
+        <translation>Liệu chúng ta có chuyển tiếp giao dịch đến peer này hay không.</translation>
+    </message>
+    <message>
+        <source>Transaction Relay</source>
+        <translation>Chuyển tiếp giao dịch</translation>
+    </message>
     <message>
         <source>Connection Time</source>
         <translation>Thời gian kết nối</translation>
@@ -1947,114 +3429,277 @@
         <translation>Thời gian phản hồi</translation>
     </message>
     <message>
-        <source>The duration of a currently outstanding ping.</source>
-        <translation>Khoảng thời gian để chờ cho một ping hiện thời.</translation>
+        <source>The duration of a currently outstanding ping.</source>
+        <translation>Khoảng thời gian để chờ cho một ping hiện thời.</translation>
+    </message>
+    <message>
+        <source>Ping Wait</source>
+        <translation>Đợi Ping</translation>
+    </message>
+    <message>
+        <source>Min Ping</source>
+        <translation>Ping tối thiểu</translation>
+    </message>
+    <message>
+        <source>Time Offset</source>
+        <translation>Time Offset</translation>
+    </message>
+    <message>
+        <source>&amp;Wallet Repair</source>
+        <translation>Sửa &amp;Ví</translation>
+    </message>
+    <message>
+        <source>The total number of addresses received from this peer that were processed (excludes addresses that were dropped due to rate-limiting).</source>
+        <extracomment>Tooltip text for the Addresses Processed field in the peer details area, which displays the total number of addresses received from this peer that were processed (excludes addresses that were dropped due to rate-limiting).</extracomment>
+        <translation>Tổng số địa chỉ nhận được từ peer này đã được xử lý (không bao gồm các địa chỉ bị loại bỏ do giới hạn tốc độ).</translation>
+    </message>
+    <message>
+        <source>The total number of addresses received from this peer that were dropped (not processed) due to rate-limiting.</source>
+        <extracomment>Tooltip text for the Addresses Rate-Limited field in the peer details area, which displays the total number of addresses received from this peer that were dropped (not processed) due to rate-limiting.</extracomment>
+        <translation>Tổng số địa chỉ nhận được từ peer này đã bị loại bỏ (không được xử lý) do giới hạn tốc độ.</translation>
+    </message>
+    <message>
+        <source>Wallet repair options.</source>
+        <translation>Các tuỳ chọn sửa ví.</translation>
+    </message>
+    <message>
+        <source>Rebuild index</source>
+        <translation>Lập lại chỉ mục</translation>
+    </message>
+    <message>
+        <source>-reindex: Rebuild block chain index from current blk000??.dat files.</source>
+        <translation>-reindex: Tái lập lại chỉ mục cho chuỗi khối từ tệp hiện tại blk000??.dat</translation>
+    </message>
+    <message>
+        <source>Inbound: initiated by peer</source>
+        <extracomment>Explanatory text for an inbound peer connection.</extracomment>
+        <translation>Vào: được khởi tạo bởi peer</translation>
+    </message>
+    <message>
+        <source>Outbound Full Relay: default</source>
+        <extracomment>Explanatory text for an outbound peer connection that relays all network information. This is the default behavior for outbound connections.</extracomment>
+        <translation>Ra Chuyển tiếp đầy đủ: mặc định</translation>
+    </message>
+    <message>
+        <source>Outbound Block Relay: does not relay transactions or addresses</source>
+        <extracomment>Explanatory text for an outbound peer connection that relays network information about blocks and not transactions or addresses.</extracomment>
+        <translation>Ra Chuyển tiếp Block: không chuyển tiếp giao dịch hoặc địa chỉ</translation>
+    </message>
+    <message>
+        <source>Outbound Manual: added using RPC %1 or %2/%3 configuration options</source>
+        <extracomment>Explanatory text for an outbound peer connection that was established manually through one of several methods. The numbered arguments are stand-ins for the methods available to establish manual connections.</extracomment>
+        <translation>Ra Thủ công: được thêm bằng cách sử dụng tùy chọn cấu hình RPC %1 hoặc %2/%3</translation>
+    </message>
+    <message>
+        <source>Outbound Feeler: short-lived, for testing addresses</source>
+        <extracomment>Explanatory text for a short-lived outbound peer connection that is used to test the aliveness of known addresses.</extracomment>
+        <translation>Ra Feeler: tồn tại ngắn, để kiểm tra địa chỉ</translation>
+    </message>
+    <message>
+        <source>Outbound Address Fetch: short-lived, for soliciting addresses</source>
+        <extracomment>Explanatory text for a short-lived outbound peer connection that is used to request addresses from a peer.</extracomment>
+        <translation>Ra Lấy địa chỉ: tồn tại ngắn, để yêu cầu địa chỉ</translation>
+    </message>
+    <message>
+        <source>To</source>
+        <translation>Đến</translation>
+    </message>
+    <message>
+        <source>we selected the peer for high bandwidth relay</source>
+        <translation>chúng tôi đã chọn peer cho chuyển tiếp băng thông cao</translation>
+    </message>
+    <message>
+        <source>From</source>
+        <translation>Từ</translation>
+    </message>
+    <message>
+        <source>the peer selected us for high bandwidth relay</source>
+        <translation>peer đã chọn chúng tôi cho chuyển tiếp băng thông cao</translation>
+    </message>
+    <message>
+        <source>No</source>
+        <translation>Không đồng ý</translation>
+    </message>
+    <message>
+        <source>no high bandwidth relay selected</source>
+        <translation>không có chuyển tiếp băng thông cao được chọn</translation>
+    </message>
+    <message>
+        <source>&amp;Disconnect</source>
+        <translation>&amp;Ngắt kết nối</translation>
+    </message>
+    <message>
+        <source>Ban for</source>
+        <translation>Cấm</translation>
+    </message>
+    <message>
+        <source>1 &amp;hour</source>
+        <translation>1 &amp;giờ</translation>
+    </message>
+    <message>
+        <source>1 &amp;week</source>
+        <translation>1 &amp;tuần</translation>
+    </message>
+    <message>
+        <source>1 &amp;year</source>
+        <translation>1 &amp;năm</translation>
+    </message>
+    <message>
+        <source>&amp;Unban</source>
+        <translation>&amp;Bor</translation>
+    </message>
+    <message>
+        <source>In:</source>
+        <translation>Vào:</translation>
+    </message>
+    <message>
+        <source>Out:</source>
+        <translation>Ra:</translation>
+    </message>
+    <message>
+        <source>Network activity disabled</source>
+        <translation>Kết nối mạng bị tắt</translation>
+    </message>
+    <message>
+        <source>None</source>
+        <translation>Không có</translation>
+    </message>
+    <message>
+        <source>Total: %1 (Enabled: %2)</source>
+        <translation>Tổng số: %1 (Bật: %2)</translation>
     </message>
     <message>
-        <source>Ping Wait</source>
-        <translation>Đợi Ping</translation>
+        <source>Executing command without any wallet</source>
+        <translation>Thực thi lệnh mà không có ví nào</translation>
     </message>
     <message>
-        <source>Min Ping</source>
-        <translation>Ping tối thiểu</translation>
+        <source>Ctrl++</source>
+        <extracomment>Main shortcut to increase the RPC console font size.</extracomment>
+        <translation>Ctrl++</translation>
     </message>
     <message>
-        <source>Time Offset</source>
-        <translation>Time Offset</translation>
+        <source>Ctrl+=</source>
+        <extracomment>Secondary shortcut to increase the RPC console font size.</extracomment>
+        <translation>Ctrl+=</translation>
     </message>
     <message>
-        <source>&amp;Wallet Repair</source>
-        <translation>Sửa &amp;Ví</translation>
+        <source>Ctrl+-</source>
+        <extracomment>Main shortcut to decrease the RPC console font size.</extracomment>
+        <translation>Ctrl+-</translation>
     </message>
     <message>
-        <source>Wallet repair options.</source>
-        <translation>Các tuỳ chọn sửa ví.</translation>
+        <source>Ctrl+_</source>
+        <extracomment>Secondary shortcut to decrease the RPC console font size.</extracomment>
+        <translation>Ctrl+_</translation>
     </message>
     <message>
-        <source>Rebuild index</source>
-        <translation>Lập lại chỉ mục</translation>
+        <source>Ctrl+Shift+I</source>
+        <translation>Ctrl+Shift+I</translation>
     </message>
     <message>
-        <source>-reindex: Rebuild block chain index from current blk000??.dat files.</source>
-        <translation>-reindex: Tái lập lại chỉ mục cho chuỗi khối từ tệp hiện tại blk000??.dat</translation>
+        <source>Ctrl+Shift+C</source>
+        <translation>Ctrl+Shift+C</translation>
     </message>
     <message>
-        <source>No</source>
-        <translation>Không đồng ý</translation>
+        <source>Ctrl+Shift+G</source>
+        <translation>Ctrl+Shift+G</translation>
     </message>
     <message>
-        <source>&amp;Disconnect</source>
-        <translation>&amp;Ngắt kết nối</translation>
+        <source>Ctrl+Shift+P</source>
+        <translation>Ctrl+Shift+P</translation>
     </message>
     <message>
-        <source>Ban for</source>
-        <translation>Cấm</translation>
+        <source>Ctrl+Shift+R</source>
+        <translation>Ctrl+Shift+R</translation>
     </message>
     <message>
-        <source>1 &amp;hour</source>
-        <translation>1 &amp;giờ</translation>
+        <source>Executing command using "%1" wallet</source>
+        <translation>Thực thi lệnh bằng ví "%1"</translation>
     </message>
     <message>
-        <source>1 &amp;day</source>
-        <translation>1 ngà&amp;y</translation>
+        <source>detecting: peer could be v1 or v2</source>
+        <extracomment>Explanatory text for "detecting" transport type.</extracomment>
+        <translation>đang phát hiện: peer có thể là v1 hoặc v2</translation>
     </message>
     <message>
-        <source>1 &amp;week</source>
-        <translation>1 &amp;tuần</translation>
+        <source>v1: unencrypted, plaintext transport protocol</source>
+        <extracomment>Explanatory text for v1 transport type.</extracomment>
+        <translation>v1: giao thức truyền tải không mã hóa, văn bản rõ</translation>
     </message>
     <message>
-        <source>1 &amp;year</source>
-        <translation>1 &amp;năm</translation>
+        <source>v2: BIP324 encrypted transport protocol</source>
+        <extracomment>Explanatory text for v2 transport type.</extracomment>
+        <translation>v2: giao thức truyền tải mã hóa BIP324</translation>
     </message>
     <message>
-        <source>&amp;Unban</source>
-        <translation>&amp;Bor</translation>
+        <source>&amp;Copy address</source>
+        <extracomment>Context menu action to copy the address of a peer</extracomment>
+        <translation>&amp;Sao chép địa chỉ</translation>
     </message>
     <message>
-        <source>Welcome to the %1 RPC console.</source>
-        <translation>Welcome to the %1 RPC console.</translation>
+        <source>1 d&amp;ay</source>
+        <translation>1 ng&amp;ày</translation>
     </message>
     <message>
-        <source>Use up and down arrows to navigate history, and %1 to clear screen.</source>
-        <translation>Sử dụng các mũi tên lên và xuống để duyệt lịch sử, và %1 để xoá màn hình.</translation>
+        <source>&amp;Copy IP/Netmask</source>
+        <extracomment>Context menu action to copy the IP/Netmask of a banned peer. IP/Netmask is the combination of a peer's IP address and its Netmask. For IP address see: https://en.wikipedia.org/wiki/IP_address</extracomment>
+        <translation>&amp;Sao chép IP/Netmask</translation>
     </message>
     <message>
-        <source>Type %1 for an overview of available commands.</source>
-        <translation>Hãy nhập %1 để xem tổng thể những câu lệnh có thể dùng.</translation>
+        <source>Welcome to the %1 RPC console.
+Use up and down arrows to navigate history, and %2 to clear screen.
+Use %3 and %4 to increase or decrease the font size.
+Type %5 for an overview of available commands.
+For more information on using this console, type %6.
+
+%7WARNING: Scammers have been active, telling users to type commands here, stealing their wallet contents. Do not use this console without fully understanding the ramifications of a command.%8</source>
+        <extracomment>RPC console welcome message. Placeholders %7 and %8 are style tags for the warning content, and they are not space separated from the rest of the text intentionally.</extracomment>
+        <translation>Chào mừng đến với console RPC %1.
+Sử dụng các mũi tên lên và xuống để điều hướng lịch sử, và %2 để xóa màn hình.
+Sử dụng %3 và %4 để tăng hoặc giảm kích thước phông chữ.
+Nhập %5 để xem tổng quan về các lệnh có sẵn.
+Để biết thêm thông tin về việc sử dụng console này, hãy nhập %6.
+
+%7CẢNH BÁO: Kẻ lừa đảo đã hoạt động tích cực, yêu cầu người dùng nhập lệnh tại đây, đánh cắp nội dung ví của họ. Không sử dụng console này mà không hiểu rõ hậu quả của một lệnh.%8</translation>
     </message>
     <message>
-        <source>For more information on using this console type %1.</source>
-        <translation>Để có thêm thông tin về việc sử dụng console này thì hãy nhập %1.</translation>
+        <source>Executing…</source>
+        <extracomment>A console message indicating an entered command is currently being executed.</extracomment>
+        <translation>Đang thực thi…</translation>
     </message>
     <message>
-        <source>WARNING: Scammers have been active, telling users to type commands here, stealing their wallet contents. Do not use this console without fully understanding the ramifications of a command.</source>
-        <translation>CẢNH BÁO: Những kẻ lừa đảo đã rất tích cực, xúi mọi người gõ các lệnh ở đây và đánh cắp nội dung ví của họ. Không nên sử dụng cửa sổ lệnh mà không hiểu đầy đủ các câu lệnh.</translation>
+        <source>(peer: %1)</source>
+        <translation>(peer: %1)</translation>
     </message>
     <message>
-        <source>In:</source>
-        <translation>Vào:</translation>
+        <source>via %1</source>
+        <translation>theo %1</translation>
     </message>
     <message>
-        <source>Out:</source>
-        <translation>Ra:</translation>
+        <source>Regular</source>
+        <translation>Thông thường</translation>
     </message>
     <message>
-        <source>Network activity disabled</source>
-        <translation>Kết nối mạng bị tắt</translation>
+        <source>Masternode</source>
+        <translation>Masternode</translation>
     </message>
     <message>
-        <source>Total: %1 (Enabled: %2)</source>
-        <translation>Tổng số: %1 (Bật: %2)</translation>
+        <source>Verified Masternode</source>
+        <translation>Masternode đã xác minh</translation>
     </message>
     <message>
-        <source>via %1</source>
-        <translation>theo %1</translation>
+        <source>Yes</source>
+        <translation>Có</translation>
     </message>
     <message>
         <source>Unknown</source>
         <translation>Không xác định</translation>
     </message>
-    </context>
+    <message>
+        <source>Never</source>
+        <translation>Không bao giờ</translation>
+    </message>
+</context>
 <context>
     <name>ReceiveCoinsDialog</name>
     <message>
@@ -2073,6 +3718,10 @@
         <source>An optional message to attach to the payment request, which will be displayed when the request is opened.&lt;br&gt;Note: The message will not be sent with the payment over the Dash network.</source>
         <translation>Một thông điệp tuỳ chọn để đính vào yêu cầu thanh toán, nó sẽ hiển thị khi yêu cầu được mở.&lt;br&gt;Chú ý: Thông điệp sẽ không được gửi thông qua mạng lưới Dash.</translation>
     </message>
+    <message>
+        <source>An optional label to associate with the new receiving address (used by you to identify an invoice).  It is also attached to the payment request.</source>
+        <translation>Một nhãn tuỳ chọn để liên kết với địa chỉ nhận mới (được bạn sử dụng để xác định hóa đơn). Nó cũng được đính kèm vào yêu cầu thanh toán.</translation>
+    </message>
     <message>
         <source>Use this form to request payments. All fields are &lt;b&gt;optional&lt;/b&gt;.</source>
         <translation>Sử dụng biểu mẫu này để yêu cầu thanh toán. Tất cả các trường đều là &lt;b&gt;không bắt buộc&lt;/b&gt;.</translation>
@@ -2089,6 +3738,10 @@
         <source>&amp;Amount:</source>
         <translation>&amp;Số tiền:</translation>
     </message>
+    <message>
+        <source>&amp;Create new receiving address</source>
+        <translation>&amp;Tạo địa chỉ nhận mới</translation>
+    </message>
     <message>
         <source>Clear all fields of the form.</source>
         <translation>Xoá tất cả các ô.</translation>
@@ -2126,24 +3779,60 @@
         <translation>Hãy nhâpn một thông điệp để đính kèm với yêu cầu thanh toán</translation>
     </message>
     <message>
-        <source>Copy URI</source>
-        <translation>Copy URI</translation>
+        <source>Copy &amp;URI</source>
+        <translation>Sao chép &amp;URI</translation>
     </message>
     <message>
-        <source>Copy label</source>
-        <translation>Sao chép nhãn</translation>
+        <source>&amp;Copy address</source>
+        <translation>&amp;Sao chép địa chỉ</translation>
     </message>
     <message>
-        <source>Copy message</source>
-        <translation>Sao chép thông điệp</translation>
+        <source>Copy &amp;label</source>
+        <translation>Sao chép &amp;nhãn</translation>
     </message>
     <message>
-        <source>Copy amount</source>
-        <translation>Sao chép số tiền</translation>
+        <source>Copy &amp;message</source>
+        <translation>Sao chép &amp;thông điệp</translation>
+    </message>
+    <message>
+        <source>Copy &amp;amount</source>
+        <translation>Sao chép &amp;số tiền</translation>
+    </message>
+    <message>
+        <source>Could not unlock wallet.</source>
+        <translation>Không thể mở khoá ví.</translation>
+    </message>
+    <message>
+        <source>Could not generate new address</source>
+        <translation>Không thể tạo địa chỉ mới</translation>
     </message>
-    </context>
+</context>
 <context>
     <name>ReceiveRequestDialog</name>
+    <message>
+        <source>Request payment to …</source>
+        <translation>Yêu cầu thanh toán đến …</translation>
+    </message>
+    <message>
+        <source>Address:</source>
+        <translation>Địa chỉ:</translation>
+    </message>
+    <message>
+        <source>Amount:</source>
+        <translation>Số tiền:</translation>
+    </message>
+    <message>
+        <source>Label:</source>
+        <translation>Nhãn:</translation>
+    </message>
+    <message>
+        <source>Message:</source>
+        <translation>Thông điệp:</translation>
+    </message>
+    <message>
+        <source>Wallet:</source>
+        <translation>Ví:</translation>
+    </message>
     <message>
         <source>Copy &amp;URI</source>
         <translation>Copy &amp;URI</translation>
@@ -2196,6 +3885,34 @@
         <translation>Đã yêu cầu</translation>
     </message>
 </context>
+<context>
+    <name>RestoreWalletActivity</name>
+    <message>
+        <source>Restore Wallet</source>
+        <extracomment>Title of progress window which is displayed when wallets are being restored.</extracomment>
+        <translation>Khôi phục Ví</translation>
+    </message>
+    <message>
+        <source>Restoring Wallet &lt;b&gt;%1&lt;/b&gt;…</source>
+        <extracomment>Descriptive text of the restore wallets progress window which indicates to the user that wallets are currently being restored.</extracomment>
+        <translation>Đang khôi phục Ví &lt;b&gt;%1&lt;/b&gt;…</translation>
+    </message>
+    <message>
+        <source>Restore wallet failed</source>
+        <extracomment>Title of message box which is displayed when the wallet could not be restored.</extracomment>
+        <translation>Khôi phục ví thất bại</translation>
+    </message>
+    <message>
+        <source>Restore wallet warning</source>
+        <extracomment>Title of message box which is displayed when the wallet is restored with some warning.</extracomment>
+        <translation>Cảnh báo khôi phục ví</translation>
+    </message>
+    <message>
+        <source>Restore wallet message</source>
+        <extracomment>Title of message box which is displayed when the wallet is successfully restored.</extracomment>
+        <translation>Thông điệp khôi phục ví</translation>
+    </message>
+</context>
 <context>
     <name>SendCoinsDialog</name>
     <message>
@@ -2230,10 +3947,6 @@
         <source>Fee:</source>
         <translation>Phí:</translation>
     </message>
-    <message>
-        <source>Dust:</source>
-        <translation>Bụi</translation>
-    </message>
     <message>
         <source>Inputs…</source>
         <translation>Đầu vào…</translation>
@@ -2258,6 +3971,14 @@
         <source>Transaction Fee:</source>
         <translation>Phí giao dịch</translation>
     </message>
+    <message>
+        <source>When there is less transaction volume than space in the blocks, miners as well as relaying nodes may enforce a minimum fee. Paying only this minimum fee is just fine, but be aware that this can result in a never confirming transaction once there is more demand for dash transactions than the network can process.</source>
+        <translation>Khi có ít giao dịch hơn không gian trong các khối, thợ đào cũng như các nút chuyển tiếp có thể áp dụng mức phí tối thiểu. Chỉ trả mức phí tối thiểu này là được, nhưng hãy lưu ý rằng điều này có thể dẫn đến giao dịch không bao giờ được xác nhận khi có nhiều nhu cầu giao dịch dash hơn mức mạng có thể xử lý.</translation>
+    </message>
+    <message>
+        <source>A too low fee might result in a never confirming transaction (read the tooltip)</source>
+        <translation>Phí quá thấp có thể dẫn đến giao dịch không bao giờ được xác nhận (đọc chú thích)</translation>
+    </message>
     <message>
         <source>(Smart fee not initialized yet. This usually takes a few blocks…)</source>
         <translation>(Phí khởi tạo thông minh chưa được khởi tạo. Thường thì sẽ mất vài block…)</translation>
@@ -2286,6 +4007,10 @@
         <source>Note: Not enough data for fee estimation, using the fallback fee instead.</source>
         <translation>Chú ý: Không đủ dữ liệu cho việc ước lượng chi phí, thay vào đó sử dụng mức phí dự phòng.</translation>
     </message>
+    <message>
+        <source>Hide transaction fee settings</source>
+        <translation>Ẩn cài đặt phí giao dịch</translation>
+    </message>
     <message>
         <source>Hide</source>
         <translation>Ẩn</translation>
@@ -2346,10 +4071,6 @@
         <source>Copy bytes</source>
         <translation>Sao chép bytes</translation>
     </message>
-    <message>
-        <source>Copy dust</source>
-        <translation>Sao chép bụi</translation>
-    </message>
     <message>
         <source>Copy change</source>
         <translation>Sao chép tiền trả lại</translation>
@@ -2366,18 +4087,46 @@
         <source>%1 to %2</source>
         <translation>%1 đến %2</translation>
     </message>
-    <message>
-        <source>Are you sure you want to send?</source>
-        <translation>Bạn có chắc mình muốn gửi?</translation>
-    </message>
     <message>
         <source>&lt;b&gt;(%1 of %2 entries displayed)&lt;/b&gt;</source>
         <translation>&lt;b&gt;(%1 của %2 các thành phần được hiển thị)&lt;/b&gt;</translation>
     </message>
+    <message>
+        <source>S&amp;end mixed funds</source>
+        <translation>&amp;Gửi tiền đã trộn</translation>
+    </message>
+    <message>
+        <source>Confirm the %1 send action</source>
+        <translation>Xác nhận hành động gửi %1</translation>
+    </message>
+    <message>
+        <source>Cr&amp;eate Unsigned</source>
+        <translation>&amp;Tạo Chưa ký</translation>
+    </message>
+    <message>
+        <source> from wallet '%1'</source>
+        <translation> từ ví '%1'</translation>
+    </message>
+    <message>
+        <source>%1 to '%2'</source>
+        <translation>%1 đến '%2'</translation>
+    </message>
+    <message>
+        <source>%1 funds only</source>
+        <translation>Chỉ tiền %1</translation>
+    </message>
     <message>
         <source>any available funds</source>
         <translation>bất kỳ nguồn cung nào còn</translation>
     </message>
+    <message>
+        <source>Transaction fee</source>
+        <translation>Phí giao dịch</translation>
+    </message>
+    <message>
+        <source>(%1 transactions have higher fees usually due to no change output being allowed)</source>
+        <translation>(Giao dịch %1 thường có phí cao hơn do không cho phép đầu ra tiền lẻ)</translation>
+    </message>
     <message>
         <source>Transaction size: %1</source>
         <translation>Kích thước giao dịch: %1</translation>
@@ -2390,10 +4139,71 @@
         <source>This transaction will consume %n input(s)</source>
         <translation><numerusform>Giao dịch này sẽ dùng đến %n đầu vào</numerusform></translation>
     </message>
+    <message>
+        <source>Warning: Using %1 with %2 or more inputs can harm your privacy and is not recommended</source>
+        <translation>Cảnh báo: Sử dụng %1 với %2 hoặc nhiều đầu vào hơn có thể làm tổn hại quyền riêng tư của bạn và không được khuyến nghị</translation>
+    </message>
+    <message>
+        <source>Click to learn more</source>
+        <translation>Nhấp để tìm hiểu thêm</translation>
+    </message>
+    <message>
+        <source>Total Amount</source>
+        <translation>Tổng số tiền</translation>
+    </message>
+    <message>
+        <source>or</source>
+        <translation>hoặc</translation>
+    </message>
     <message>
         <source>Confirm send coins</source>
         <translation>Xác nhận việc gửi tiền</translation>
     </message>
+    <message>
+        <source>Save Transaction Data</source>
+        <translation>Lưu Dữ liệu Giao dịch</translation>
+    </message>
+    <message>
+        <source>PSBT saved</source>
+        <translation>PSBT đã lưu</translation>
+    </message>
+    <message>
+        <source>Watch-only balance:</source>
+        <translation>Số dư chỉ xem:</translation>
+    </message>
+    <message>
+        <source>Creates a Partially Signed Blockchain Transaction (PSBT) for use with e.g. an offline %1 wallet, or a PSBT-compatible hardware wallet.</source>
+        <translation>Tạo Giao dịch Blockchain Được Ký Một Phần (PSBT) để sử dụng với ví %1 ngoại tuyến hoặc ví phần cứng tương thích PSBT.</translation>
+    </message>
+    <message>
+        <source>Do you want to create this transaction?</source>
+        <extracomment>Message displayed when attempting to create a transaction. Cautionary text to prompt the user to verify that the displayed transaction details represent the transaction the user intends to create.</extracomment>
+        <translation>Bạn có muốn tạo giao dịch này không?</translation>
+    </message>
+    <message>
+        <source>Please, review your transaction proposal. This will produce a Partially Signed Blockchain Transaction (PSBT) which you can save or copy and then sign with e.g. an offline %1 wallet, or a PSBT-compatible hardware wallet.</source>
+        <extracomment>Text to inform a user attempting to create a transaction of their current options. At this stage, a user can only create a PSBT. This string is displayed when private keys are disabled and an external signer is not available.</extracomment>
+        <translation>Vui lòng xem xét đề xuất giao dịch của bạn. Điều này sẽ tạo ra Giao dịch Blockchain Được Ký Một Phần (PSBT) mà bạn có thể lưu hoặc sao chép và sau đó ký bằng ví %1 ngoại tuyến hoặc ví phần cứng tương thích PSBT.</translation>
+    </message>
+    <message>
+        <source>Please, review your transaction. You can create and send this transaction or create a Partially Signed Blockchain Transaction (PSBT), which you can save or copy and then sign with, e.g., an offline %1 wallet, or a PSBT-compatible hardware wallet.</source>
+        <extracomment>Text to inform a user attempting to create a transaction of their current options. At this stage, a user can send their transaction or create a PSBT. This string is displayed when both private keys and PSBT controls are enabled.</extracomment>
+        <translation>Vui lòng xem xét giao dịch của bạn. Bạn có thể tạo và gửi giao dịch này hoặc tạo Giao dịch Blockchain Được Ký Một Phần (PSBT), mà bạn có thể lưu hoặc sao chép và sau đó ký bằng ví %1 ngoại tuyến hoặc ví phần cứng tương thích PSBT.</translation>
+    </message>
+    <message>
+        <source>Please, review your transaction.</source>
+        <extracomment>Text to prompt a user to review the details of the transaction they are attempting to send.</extracomment>
+        <translation>Vui lòng xem xét giao dịch của bạn.</translation>
+    </message>
+    <message>
+        <source>To review recipient list click "Show Details…"</source>
+        <translation>Để xem xét danh sách người nhận, nhấp vào "Hiển thị Chi tiết…"</translation>
+    </message>
+    <message>
+        <source>Partially Signed Transaction (Binary)</source>
+        <extracomment>Expanded name of the binary PSBT file format. See: BIP 174.</extracomment>
+        <translation>Giao dịch Được Ký Một Phần (Nhị phân)</translation>
+    </message>
     <message>
         <source>The recipient address is not valid. Please recheck.</source>
         <translation>Địa chỉ nhận không hợp lệ. Hãy kiểm tra lại xem.</translation>
@@ -2489,6 +4299,10 @@
         <source>A&amp;mount:</source>
         <translation>&amp;Số tiền:</translation>
     </message>
+    <message>
+        <source>The amount to send in the selected unit</source>
+        <translation>Số tiền gửi trong đơn vị đã chọn</translation>
+    </message>
     <message>
         <source>The fee will be deducted from the amount being sent. The recipient will receive a lower amount of Dash than you enter in the amount field. If multiple recipients are selected, the fee is split equally.</source>
         <translation>Phí sẽ được trừ trong khoản tiền mà bạn gửi. Bên nhận sẽ nhận được một khoản nhỏ hơn số Dash mà bạn nhập vào ở trong trường số lượng. Nếu có nhiều người nhận được chọn, phí được chia đều cho mọi người.</translation>
@@ -2509,21 +4323,16 @@
         <source>A message that was attached to the dash: URI which will be stored with the transaction for your reference. Note: This message will not be sent over the Dash network.</source>
         <translation>Một thông điệp được đính với dash: URI đó sẽ được lưu trữ với các giao dịch cho các bạn tham khảo. Lưu ý: Thông điệp này sẽ không được gửi qua mạng Dash. </translation>
     </message>
+</context>
+<context>
+    <name>SendConfirmationDialog</name>
     <message>
-        <source>This is an unauthenticated payment request.</source>
-        <translation>Đây là một yêu cầu thanh toán không được kiểm chứng.</translation>
-    </message>
-    <message>
-        <source>This is an authenticated payment request.</source>
-        <translation>Đây là một yêu cầu thanh toán đã được kiểm chứng.</translation>
-    </message>
-    <message>
-        <source>Pay To:</source>
-        <translation>Trả cho:</translation>
+        <source>Send</source>
+        <translation>Gửi</translation>
     </message>
     <message>
-        <source>Memo:</source>
-        <translation>Ghi nhớ:</translation>
+        <source>Create Unsigned</source>
+        <translation>Tạo chưa ký</translation>
     </message>
 </context>
 <context>
@@ -2611,6 +4420,14 @@
         <source>The Dash address the message was signed with</source>
         <translation>Địa chỉ Dash mà thông điệp được ký bởi</translation>
     </message>
+    <message>
+        <source>The signed message to verify</source>
+        <translation>Thông điệp đã ký để xác minh</translation>
+    </message>
+    <message>
+        <source>The signature given when the message was signed</source>
+        <translation>Chữ ký được đưa ra khi thông điệp được ký</translation>
+    </message>
     <message>
         <source>Verify the message to ensure it was signed with the specified Dash address</source>
         <translation>Kiểm tra lại thông điệp để đảm bảo rằng nó được ký với địa chỉ Dash cụ thể</translation>
@@ -2655,6 +4472,10 @@
         <source>Wallet unlock was cancelled.</source>
         <translation>Mở khoá ví bị huỷ bỏ.</translation>
     </message>
+    <message>
+        <source>No error</source>
+        <translation>Không có lỗi</translation>
+    </message>
     <message>
         <source>Private key for the entered address is not available.</source>
         <translation>Khoá riêng cho địa chỉ vừa nhập không có.</translation>
@@ -2688,11 +4509,26 @@
         <translation>Thông điệp đã được xác thực.</translation>
     </message>
 </context>
+<context>
+    <name>SplashScreen</name>
+    <message>
+        <source>(press q to shutdown and continue later)</source>
+        <translation>(nhấn q để tắt và tiếp tục sau)</translation>
+    </message>
+    <message>
+        <source>press q to shutdown</source>
+        <translation>nhấn q để tắt</translation>
+    </message>
+</context>
 <context>
     <name>TrafficGraphWidget</name>
     <message>
-        <source>KB/s</source>
-        <translation>KB/s</translation>
+        <source>kB/s</source>
+        <translation>kB/s</translation>
+    </message>
+    <message>
+        <source>Total</source>
+        <translation>Tổng</translation>
     </message>
     <message>
         <source>Received</source>
@@ -2705,20 +4541,9 @@
 </context>
 <context>
     <name>TransactionDesc</name>
-    <message numerus="yes">
-        <source>Open for %n more block(s)</source>
-        <translation><numerusform>Mở cho %n khối nữa</numerusform></translation>
-    </message>
-    <message>
-        <source>Open until %1</source>
-        <translation>Mở đến khi %1</translation>
-    </message>
-    <message>
-        <source>conflicted</source>
-        <translation>xung đột</translation>
-    </message>
     <message>
         <source>0/unconfirmed, %1</source>
+        <extracomment>Text explaining the current status of a transaction, shown in the status field of the details window for this transaction. This status represents an unconfirmed transaction that is in the memory pool.</extracomment>
         <translation>0/chưa xác thực, %1</translation>
     </message>
     <message>
@@ -2731,22 +4556,32 @@
     </message>
     <message>
         <source>abandoned</source>
+        <extracomment>Text explaining the current status of a transaction, shown in the status field of the details window for this transaction. This status represents an abandoned transaction.</extracomment>
         <translation>bị từ chối</translation>
     </message>
+    <message>
+        <source>conflicted with a transaction with %1 confirmations</source>
+        <extracomment>Text explaining the current status of a transaction, shown in the status field of the details window for this transaction. This status represents an unconfirmed transaction that conflicts with a confirmed transaction.</extracomment>
+        <translation>xung đột với giao dịch có %1 xác nhận</translation>
+    </message>
     <message>
         <source>%1/unconfirmed</source>
+        <extracomment>Text explaining the current status of a transaction, shown in the status field of the details window for this transaction. This status represents a transaction confirmed in at least one block, but less than 6 blocks, and still not locked via ChainLocks.</extracomment>
         <translation>%1/chưa xác nhận</translation>
     </message>
     <message>
         <source>%1 confirmations</source>
+        <extracomment>Text explaining the current status of a transaction, shown in the status field of the details window for this transaction. This status represents a transaction confirmed in 6 or more blocks or locked via ChainLocks.</extracomment>
         <translation>%1 xác nhận</translation>
     </message>
     <message>
         <source>locked via ChainLocks</source>
+        <extracomment>Text explaining the current status of a transaction, shown in the status field of the details window for this transaction. This status represents a transaction confirmed in at least one block and has been locked by ChainLocks.</extracomment>
         <translation>được khoá với ChainLocks</translation>
     </message>
     <message>
         <source>verified via InstantSend</source>
+        <extracomment>Text explaining the current status of a transaction, shown in the status field of the details window for this transaction. This status represents an unconfirmed transaction that has been locked by InstantSend.</extracomment>
         <translation>đã được xác minh với InstantSend</translation>
     </message>
     <message>
@@ -2765,6 +4600,10 @@
         <source>Generated</source>
         <translation>Đã được sinh</translation>
     </message>
+    <message>
+        <source>Platform Transfer</source>
+        <translation>Chuyển nền tảng</translation>
+    </message>
     <message>
         <source>From</source>
         <translation>Từ</translation>
@@ -2895,14 +4734,6 @@
         <source>Address / Label</source>
         <translation>Địa chỉ / Nhãn</translation>
     </message>
-    <message numerus="yes">
-        <source>Open for %n more block(s)</source>
-        <translation><numerusform>Mở cho %n khối nữa</numerusform></translation>
-    </message>
-    <message>
-        <source>Open until %1</source>
-        <translation>Mở đến khi %1</translation>
-    </message>
     <message>
         <source>Unconfirmed</source>
         <translation>Chưa xác thực</translation>
@@ -2947,6 +4778,10 @@
         <source>Received from</source>
         <translation>Nhận từ</translation>
     </message>
+    <message>
+        <source>Received via %1</source>
+        <translation>Đã nhận qua %1</translation>
+    </message>
     <message>
         <source>Sent to</source>
         <translation>Gửi đến</translation>
@@ -2959,6 +4794,30 @@
         <source>Mined</source>
         <translation>Được đào</translation>
     </message>
+    <message>
+        <source>Platform Transfer</source>
+        <translation>Chuyển nền tảng</translation>
+    </message>
+    <message>
+        <source>%1 Mixing</source>
+        <translation>%1 Trộn</translation>
+    </message>
+    <message>
+        <source>%1 Collateral Payment</source>
+        <translation>%1 Thanh toán ký quỹ</translation>
+    </message>
+    <message>
+        <source>%1 Make Collateral Inputs</source>
+        <translation>%1 Tạo đầu vào ký quỹ</translation>
+    </message>
+    <message>
+        <source>%1 Create Denominations</source>
+        <translation>%1 Tạo mệnh giá</translation>
+    </message>
+    <message>
+        <source>%1 Send</source>
+        <translation>%1 Gửi</translation>
+    </message>
     <message>
         <source>watch-only</source>
         <translation>chỉ theo dõi</translation>
@@ -3038,6 +4897,26 @@
         <source>Sent to</source>
         <translation>Gửi đến</translation>
     </message>
+    <message>
+        <source>%1 Send</source>
+        <translation>%1 Gửi</translation>
+    </message>
+    <message>
+        <source>%1 Make Collateral Inputs</source>
+        <translation>%1 Tạo đầu vào ký quỹ</translation>
+    </message>
+    <message>
+        <source>%1 Create Denominations</source>
+        <translation>%1 Tạo mệnh giá</translation>
+    </message>
+    <message>
+        <source>%1 Mixing</source>
+        <translation>%1 Trộn</translation>
+    </message>
+    <message>
+        <source>%1 Collateral Payment</source>
+        <translation>%1 Thanh toán ký quỹ</translation>
+    </message>
     <message>
         <source>To yourself</source>
         <translation>Đến bản thân bạn</translation>
@@ -3046,6 +4925,10 @@
         <source>Mined</source>
         <translation>Được đào</translation>
     </message>
+    <message>
+        <source>Platform Transfer</source>
+        <translation>Chuyển nền tảng</translation>
+    </message>
     <message>
         <source>Other</source>
         <translation>Khác</translation>
@@ -3059,45 +4942,63 @@
         <translation>Số tiền tối thiểu</translation>
     </message>
     <message>
-        <source>Abandon transaction</source>
-        <translation>Từ bỏ giao dịch</translation>
+        <source>&amp;Copy address</source>
+        <translation>&amp;Sao chép địa chỉ</translation>
     </message>
     <message>
-        <source>Copy address</source>
-        <translation>Sao chép địa chỉ</translation>
+        <source>Copy &amp;label</source>
+        <translation>Sao chép &amp;nhãn</translation>
     </message>
     <message>
-        <source>Copy label</source>
-        <translation>Sao chép nhãn</translation>
+        <source>Copy &amp;amount</source>
+        <translation>Sao chép &amp;số tiền</translation>
     </message>
     <message>
-        <source>Copy amount</source>
-        <translation>Sao chép số tiền</translation>
+        <source>Copy transaction &amp;ID</source>
+        <translation>Sao chép &amp;ID giao dịch</translation>
+    </message>
+    <message>
+        <source>Copy &amp;raw transaction</source>
+        <translation>Sao chép giao dịch &amp;thô</translation>
     </message>
     <message>
-        <source>Copy transaction ID</source>
-        <translation>Sao chép mã giao dịch</translation>
+        <source>Copy full transaction &amp;details</source>
+        <translation>Sao chép &amp;chi tiết giao dịch đầy đủ</translation>
     </message>
     <message>
-        <source>Copy raw transaction</source>
-        <translation>Sao chép giao dịch thô</translation>
+        <source>&amp;Show transaction details</source>
+        <translation>&amp;Hiển thị chi tiết giao dịch</translation>
     </message>
     <message>
-        <source>Copy full transaction details</source>
-        <translation>Sao chép chi tiết đầy đủ về giao dịch</translation>
+        <source>A&amp;bandon transaction</source>
+        <translation>&amp;Bỏ giao dịch</translation>
     </message>
     <message>
-        <source>Show transaction details</source>
-        <translation>Xem chi tiết giao dịch</translation>
+        <source>Rese&amp;nd transaction</source>
+        <translation>Gửi &amp;lại giao dịch</translation>
     </message>
     <message>
-        <source>Show address QR code</source>
-        <translation>Hiển thị mã QR của địa chỉ</translation>
+        <source>&amp;Edit address label</source>
+        <translation>&amp;Chỉnh sửa nhãn địa chỉ</translation>
+    </message>
+    <message>
+        <source>Show address &amp;QR code</source>
+        <translation>Hiển thị mã &amp;QR địa chỉ</translation>
+    </message>
+    <message>
+        <source>Show in %1</source>
+        <extracomment>Transactions table context menu action to show the selected transaction in a third-party block explorer. %1 is a stand-in argument for the URL of the explorer.</extracomment>
+        <translation>Hiển thị trong %1</translation>
     </message>
     <message>
         <source>Export Transaction History</source>
         <translation>Kết xuất Lịch sử Giao dịch</translation>
     </message>
+    <message>
+        <source>Comma separated file</source>
+        <extracomment>Expanded name of the CSV file format. See: https://en.wikipedia.org/wiki/Comma-separated_values.</extracomment>
+        <translation>Tập tin giá trị được phân cách bằng dấu phẩy</translation>
+    </message>
     <message>
         <source>Confirmed</source>
         <translation>Đã được xác nhận</translation>
@@ -3164,17 +5065,77 @@
 </context>
 <context>
     <name>WalletController</name>
-    </context>
+    <message>
+        <source>Close wallet</source>
+        <translation>Đóng ví</translation>
+    </message>
+    <message>
+        <source>Are you sure you wish to close the wallet &lt;i&gt;%1&lt;/i&gt;?</source>
+        <translation>Bạn có chắc chắn muốn đóng ví &lt;i&gt;%1&lt;/i&gt; không?</translation>
+    </message>
+    <message>
+        <source>Closing the wallet for too long can result in having to resync the entire chain if pruning is enabled.</source>
+        <translation>Đóng ví quá lâu có thể dẫn đến phải đồng bộ lại toàn bộ chuỗi nếu cắt tỉa được bật.</translation>
+    </message>
+    <message>
+        <source>Close all wallets</source>
+        <translation>Đóng tất cả ví</translation>
+    </message>
+    <message>
+        <source>Are you sure you wish to close all wallets?</source>
+        <translation>Bạn có chắc chắn muốn đóng tất cả ví không?</translation>
+    </message>
+</context>
 <context>
     <name>WalletFrame</name>
-    </context>
+    <message>
+        <source>No wallet has been loaded.
+Go to File &gt; Open Wallet to load a wallet.
+- OR -</source>
+        <translation>Chưa có ví nào được tải.
+Vào File &gt; Mở Ví để tải một ví.
+- HOẶC -</translation>
+    </message>
+    <message>
+        <source>Create a new wallet</source>
+        <translation>Tạo một ví mới</translation>
+    </message>
+    <message>
+        <source>Error</source>
+        <translation>Lỗi</translation>
+    </message>
+    <message>
+        <source>Unable to decode PSBT from clipboard (invalid base64)</source>
+        <translation>Không thể giải mã PSBT từ clipboard (base64 không hợp lệ)</translation>
+    </message>
+    <message>
+        <source>Load Transaction Data</source>
+        <translation>Tải dữ liệu giao dịch</translation>
+    </message>
+    <message>
+        <source>Partially Signed Transaction (*.psbt)</source>
+        <translation>Giao dịch được ký một phần (*.psbt)</translation>
+    </message>
+    <message>
+        <source>PSBT file must be smaller than 100 MiB</source>
+        <translation>Tệp PSBT phải nhỏ hơn 100 MiB</translation>
+    </message>
+    <message>
+        <source>Unable to decode PSBT</source>
+        <translation>Không thể giải mã PSBT</translation>
+    </message>
+</context>
 <context>
     <name>WalletModel</name>
     <message>
         <source>Send Coins</source>
         <translation>Gửi tiền</translation>
     </message>
-    </context>
+    <message>
+        <source>default wallet</source>
+        <translation>ví mặc định</translation>
+    </message>
+</context>
 <context>
     <name>WalletView</name>
     <message>
@@ -3189,6 +5150,11 @@
         <source>Selected amount:</source>
         <translation>Chọn số lượng:</translation>
     </message>
+    <message>
+        <source>Wallet Data</source>
+        <extracomment>Name of the wallet data file format.</extracomment>
+        <translation>Dữ liệu ví</translation>
+    </message>
     <message>
         <source>Backup Wallet</source>
         <translation>Sao lưu Ví</translation>
@@ -3209,12 +5175,16 @@
         <source>The wallet data was successfully saved to %1.</source>
         <translation>Dữ liệu ví đã được lưu thành công vào %1.</translation>
     </message>
-    </context>
+    <message>
+        <source>Cancel</source>
+        <translation>Huỷ</translation>
+    </message>
+</context>
 <context>
     <name>dash-core</name>
     <message>
-        <source>Error: Listening for incoming connections failed (listen returned error %s)</source>
-        <translation>Lỗi: Lắng nghe để nhận kết nối bị lỗi (lỗi trả về %s)</translation>
+        <source>This error could occur if this wallet was not shutdown cleanly and was last loaded using a build with a newer version of Berkeley DB. If so, please use the software that last loaded this wallet</source>
+        <translation>Lỗi này có thể xảy ra nếu ví không được tắt đúng cách và được tải lần cuối bằng phiên bản mới hơn của Berkeley DB. Nếu vậy, vui lòng sử dụng phần mềm đã tải ví này lần cuối</translation>
     </message>
     <message>
         <source>This is a pre-release test build - use at your own risk - do not use for mining or merchant applications</source>
@@ -3269,16 +5239,20 @@
         <translation>Lỗi đọc từ cơ sở dữ liệu, đang tắt phần mềm.</translation>
     </message>
     <message>
-        <source>Failed to listen on any port. Use -listen=0 if you want this.</source>
-        <translation>Không thành công khi lắng nghe trên các cổng. Sử dụng -listen=0 nếu bạn muốn nó.</translation>
+        <source>Error: Missing checksum</source>
+        <translation>Lỗi: Thiếu checksum</translation>
+    </message>
+    <message>
+        <source>Error: Unable to parse version %u as a uint32_t</source>
+        <translation>Lỗi: Không thể phân tích phiên bản %u dưới dạng uint32_t</translation>
     </message>
     <message>
-        <source>-maxtxfee is set very high! Fees this large could be paid on a single transaction.</source>
-        <translation>-maxtxfee được thiết lập rất cao! Mức phí cao này có thể được trả chỉ cho một giao dịch.</translation>
+        <source>Error: Unable to write record to new wallet</source>
+        <translation>Lỗi: Không thể ghi bản ghi vào ví mới</translation>
     </message>
     <message>
-        <source>Cannot provide specific connections and have addrman find outgoing connections at the same.</source>
-        <translation>Không thể cung cấp những kết nối cụ thể và nhờ addrman tìm những kết nối tại cùng một thời điểm.</translation>
+        <source>Failed to listen on any port. Use -listen=0 if you want this.</source>
+        <translation>Không thành công khi lắng nghe trên các cổng. Sử dụng -listen=0 nếu bạn muốn nó.</translation>
     </message>
     <message>
         <source>Found unconfirmed denominated outputs, will wait till they confirm to continue.</source>
@@ -3289,13 +5263,17 @@
         <translation>Thông số -socketevents ('%s') được chỉ định không hợp lệ. Chỉ có những chế độ được hỗ hỗ trợ sau: %s</translation>
     </message>
     <message>
-        <source>Invalid amount for -maxtxfee=&lt;amount&gt;: '%s' (must be at least the minrelay fee of %s to prevent stuck transactions)</source>
-        <translation>Số lượng không phù hợp cho -maxtxfee=&lt;số lượng&gt;: '%s' (phải bằng ít nhất mức phí chuyển tiếp tối thiểu %s để tránh tình trạng tắc các giao dịch)</translation>
+        <source>SQLiteDatabase: Unknown sqlite wallet schema version %d. Only version %d is supported</source>
+        <translation>SQLiteDatabase: Phiên bản lược đồ ví sqlite không xác định %d. Chỉ phiên bản %d được hỗ trợ</translation>
     </message>
     <message>
         <source>Transaction index can't be disabled with governance validation enabled. Either start with -disablegovernance command line switch or enable transaction index.</source>
         <translation>Chỉ mục giao dịch không thể tắt với tính năng xác thực quản trị đã được bật. Thay vào đó hãy khởi động với câu lệnh -disablegovernance hoặc bật chế độ chỉ mục giao dịch.</translation>
     </message>
+    <message>
+        <source>Unsupported category-specific logging level -loglevel=%s. Expected -loglevel=&lt;category&gt;:&lt;loglevel&gt;. Valid categories: %s. Valid loglevels: %s.</source>
+        <translation>Mức ghi nhật ký theo danh mục không được hỗ trợ -loglevel=%s. Mong đợi -loglevel=&lt;category&gt;:&lt;loglevel&gt;. Danh mục hợp lệ: %s. Mức ghi nhật ký hợp lệ: %s.</translation>
+    </message>
     <message>
         <source>Can't mix: no compatible inputs found!</source>
         <translation>Không thể trộn: không thấy đầu vào tương thích!</translation>
@@ -3304,6 +5282,14 @@
         <source>Entry exceeds maximum size.</source>
         <translation>Đầu vào vượt ngưỡng tối đa. </translation>
     </message>
+    <message>
+        <source>Error upgrading evo database for EHF</source>
+        <translation>Lỗi nâng cấp cơ sở dữ liệu evo cho EHF</translation>
+    </message>
+    <message>
+        <source>Failed to commit Evo database</source>
+        <translation>Không thể commit cơ sở dữ liệu Evo</translation>
+    </message>
     <message>
         <source>Found enough users, signing ( waiting %s )</source>
         <translation>Đã tìm đủ người dùng, đang ký (vui lòng đợi %s)</translation>
@@ -3328,18 +5314,14 @@
         <source>Insufficient funds.</source>
         <translation>Không đủ tiền.</translation>
     </message>
-    <message>
-        <source>Invalid amount for -discardfee=&lt;amount&gt;: '%s'</source>
-        <translation>Số tiền không hợp lệ cho -discardfee=&lt;amount&gt;:'%s'</translation>
-    </message>
-    <message>
-        <source>Invalid amount for -paytxfee=&lt;amount&gt;: '%s' (must be at least %s)</source>
-        <translation>Số tiền không hợp lệ cho -paytxfee=&lt;số tiền&gt;: '%s' (ít nhất phải bằng %s)</translation>
-    </message>
     <message>
         <source>Invalid minimum number of spork signers specified with -minsporkkeys</source>
         <translation>Số lượng người ký tối thiểu cho spork được chỉ bởi -minsporkkeys không hợp lệ</translation>
     </message>
+    <message>
+        <source>Listening for incoming connections failed (listen returned error %s)</source>
+        <translation>Lắng nghe kết nối đến thất bại (listen trả về lỗi %s)</translation>
+    </message>
     <message>
         <source>Lock is already in place.</source>
         <translation>Khoá đã sẵn sàng.</translation>
@@ -3396,6 +5378,10 @@
         <source>Synchronizing governance objects…</source>
         <translation>Đang đồng bộ các đối tượng quản trị…</translation>
     </message>
+    <message>
+        <source>Transaction change output index out of range</source>
+        <translation>Chỉ số đầu ra tiền lẻ giao dịch ngoài phạm vi</translation>
+    </message>
     <message>
         <source>Unable to start HTTP server. See debug log for details.</source>
         <translation>Không thể khởi động máy chủ HTTP. Hãy xem nhật ký lỗi để biết thêm chi tiết.</translation>
@@ -3404,6 +5390,10 @@
         <source>Unknown response.</source>
         <translation>Trả lời không xác định.</translation>
     </message>
+    <message>
+        <source>Unsupported global logging level -loglevel=%s. Valid values: %s.</source>
+        <translation>Mức ghi nhật ký toàn cục không được hỗ trợ -loglevel=%s. Giá trị hợp lệ: %s.</translation>
+    </message>
     <message>
         <source>User Agent comment (%s) contains unsafe characters.</source>
         <translation>Bình luận User Agent (%s) có chứa những ký tự không an toàn.</translation>
@@ -3412,6 +5402,14 @@
         <source>Can't find random Masternode.</source>
         <translation>Không tìm thấy Masternode ngẫu nhiên.</translation>
     </message>
+    <message>
+        <source>%s can't be lower than %s</source>
+        <translation>%s không thể thấp hơn %s</translation>
+    </message>
+    <message>
+        <source>%s is idle.</source>
+        <translation>%s đang rảnh.</translation>
+    </message>
     <message>
         <source>Can't mix while sync in progress.</source>
         <translation>Không thể trộn trong quá trình đồng bộ.</translation>
@@ -3436,6 +5434,10 @@
         <source>Make sure to encrypt your wallet and delete all non-encrypted backups after you have verified that the wallet works!</source>
         <translation>Hãy chắc chắn rằng bạn sẽ mã hoá ví của bạn và xoá đi tất cả các bản sao lưu của ví mà không có mã hoá sau kiểm tra ví đã hoạt động tốt!</translation>
     </message>
+    <message>
+        <source>More than one onion bind address is provided. Using %s for the automatically created Tor onion service.</source>
+        <translation>Nhiều hơn một địa chỉ gắn kết onion được cung cấp. Sử dụng %s cho dịch vụ Tor onion được tạo tự động.</translation>
+    </message>
     <message>
         <source>Prune configured below the minimum of %d MiB.  Please use a higher number.</source>
         <translation>Cấu hình xén tỉa dưới mức tối thiểu của %d MiB. Hãy sử dụng một số lớn hơn.</translation>
@@ -3464,14 +5466,14 @@
         <source>Wallet is locked, can't replenish keypool! Automatic backups and mixing are disabled, please unlock your wallet to replenish keypool.</source>
         <translation>Ví đã được khoá, không thể bổ sung keypool! Tự động backups và trộn đã bị tắt, hãy mở khoá ví của bạn để bổ sung keypool.</translation>
     </message>
-    <message>
-        <source>You need to rebuild the database using -reindex to change -timestampindex</source>
-        <translation>Bạn cần phải tái lập lại cơ sở dữ liệu sử dụng tham số -reindex để thay đổi -timestampindex</translation>
-    </message>
     <message>
         <source>You need to rebuild the database using -reindex to go back to unpruned mode.  This will redownload the entire blockchain</source>
         <translation>Bạn cần tái lập lại cơ sở dữ liệu sử dụng -reindex để quay trở lại chế độ không bị xén tỉa. Điều này sẽ làm tải lại toàn bộ blockchain</translation>
     </message>
+    <message>
+        <source>%s failed</source>
+        <translation>%s thất bại</translation>
+    </message>
     <message>
         <source>-maxmempool must be at least %d MB</source>
         <translation>-maxmempool phải ít nhất %d MB</translation>
@@ -3480,21 +5482,57 @@
         <source>Automatic backups disabled</source>
         <translation>Tự động backup đã bị tắt</translation>
     </message>
+    <message>
+        <source>Cannot set -peerblockfilters without -blockfilterindex.</source>
+        <translation>Không thể đặt -peerblockfilters mà không có -blockfilterindex.</translation>
+    </message>
+    <message>
+        <source>Config setting for %s only applied on %s network when in [%s] section.</source>
+        <translation>Cài đặt cấu hình cho %s chỉ được áp dụng trên mạng %s khi trong phần [%s].</translation>
+    </message>
+    <message>
+        <source>Could not find asmap file %s</source>
+        <translation>Không tìm thấy file asmap %s</translation>
+    </message>
+    <message>
+        <source>Could not parse asmap file %s</source>
+        <translation>Không thể phân tích file asmap %s</translation>
+    </message>
     <message>
         <source>ERROR! Failed to create automatic backup</source>
         <translation>LỖI: Thất bại trong việc backup tự động</translation>
     </message>
     <message>
-        <source>Error upgrading evo database</source>
-        <translation>Lỗi nâng cấp cơ sở dữ liệu evo</translation>
+        <source>Error loading %s: Private keys can only be disabled during creation</source>
+        <translation>Lỗi tải %s: Khóa riêng chỉ có thể bị vô hiệu hóa trong quá trình tạo</translation>
+    </message>
+    <message>
+        <source>Error: Couldn't create cursor into database</source>
+        <translation>Lỗi: Không thể tạo con trỏ vào cơ sở dữ liệu</translation>
+    </message>
+    <message>
+        <source>Error: Disk space is low for %s</source>
+        <translation>Lỗi: Dung lượng đĩa thấp cho %s</translation>
     </message>
     <message>
-        <source>Exceeded max tries.</source>
-        <translation>Vượt quá số lần thử tối đa.</translation>
+        <source>Error: Dumpfile checksum does not match. Computed %s, expected %s</source>
+        <translation>Lỗi: Checksum file dump không khớp. Tính toán được %s, mong đợi %s</translation>
     </message>
     <message>
-        <source>Failed to commit EvoDB</source>
-        <translation>Không thể cập nhật vào EvoDB</translation>
+        <source>Error: Got key that was not hex: %s</source>
+        <translation>Lỗi: Nhận được khóa không phải hex: %s</translation>
+    </message>
+    <message>
+        <source>Error: Got value that was not hex: %s</source>
+        <translation>Lỗi: Nhận được giá trị không phải hex: %s</translation>
+    </message>
+    <message>
+        <source>Error: Keypool ran out, please call keypoolrefill first</source>
+        <translation>Lỗi: Keypool đã hết, vui lòng gọi keypoolrefill trước</translation>
+    </message>
+    <message>
+        <source>Error: No addresses available.</source>
+        <translation>Lỗi: Không có địa chỉ khả dụng.</translation>
     </message>
     <message>
         <source>Failed to create backup %s!</source>
@@ -3512,13 +5550,29 @@
         <source>Failed to rescan the wallet during initialization</source>
         <translation>Không thể quét lại ví trong quá trình khởi tạo</translation>
     </message>
+    <message>
+        <source>Failed to verify database</source>
+        <translation>Không thể xác minh cơ sở dữ liệu</translation>
+    </message>
+    <message>
+        <source>Fee rate (%s) is lower than the minimum fee rate setting (%s)</source>
+        <translation>Tỷ lệ phí (%s) thấp hơn cài đặt tỷ lệ phí tối thiểu (%s)</translation>
+    </message>
     <message>
         <source>Found enough users, signing…</source>
         <translation>Đã kiếm đủ người dùng, đang ký…</translation>
     </message>
     <message>
-        <source>Invalid amount for -fallbackfee=&lt;amount&gt;: '%s'</source>
-        <translation>Số lượng không hợp lệ cho -fallbackfee=&lt;amount&gt;: '%s'</translation>
+        <source>Ignoring duplicate -wallet %s.</source>
+        <translation>Bỏ qua -wallet %s trùng lặp.</translation>
+    </message>
+    <message>
+        <source>Input not found or already spent</source>
+        <translation>Không tìm thấy đầu vào hoặc đã chi tiêu</translation>
+    </message>
+    <message>
+        <source>Invalid P2P permission: '%s'</source>
+        <translation>Quyền P2P không hợp lệ: '%s'</translation>
     </message>
     <message>
         <source>Invalid masternodeblsprivkey. Please see documentation.</source>
@@ -3540,6 +5594,10 @@
         <source>Mixing in progress…</source>
         <translation>Đang trong quá trình trộn…</translation>
     </message>
+    <message>
+        <source>No addresses available</source>
+        <translation>Không có địa chỉ khả dụng</translation>
+    </message>
     <message>
         <source>No errors detected.</source>
         <translation>Không phát hiện ra các lỗi.</translation>
@@ -3568,6 +5626,26 @@
         <source>Prune mode is incompatible with -txindex.</source>
         <translation>Chế độ Xén-tỉa không tương thích với -txindex.</translation>
     </message>
+    <message>
+        <source>SQLiteDatabase: Failed to execute statement to verify database: %s</source>
+        <translation>SQLiteDatabase: Không thể thực thi câu lệnh để xác minh cơ sở dữ liệu: %s</translation>
+    </message>
+    <message>
+        <source>SQLiteDatabase: Failed to prepare statement to verify database: %s</source>
+        <translation>SQLiteDatabase: Không thể chuẩn bị câu lệnh để xác minh cơ sở dữ liệu: %s</translation>
+    </message>
+    <message>
+        <source>SQLiteDatabase: Failed to read database verification error: %s</source>
+        <translation>SQLiteDatabase: Không thể đọc lỗi xác minh cơ sở dữ liệu: %s</translation>
+    </message>
+    <message>
+        <source>SQLiteDatabase: Unexpected application id. Expected %u, got %u</source>
+        <translation>SQLiteDatabase: ID ứng dụng không mong đợi. Mong đợi %u, nhận được %u</translation>
+    </message>
+    <message>
+        <source>Section [%s] is not recognized.</source>
+        <translation>Phần [%s] không được nhận diện.</translation>
+    </message>
     <message>
         <source>Specified -walletdir "%s" does not exist</source>
         <translation>Thư mục được chỉ ra -walletdir "%s" không tồn tại</translation>
@@ -3596,6 +5674,10 @@
         <source>This is the transaction fee you will pay if you send a transaction.</source>
         <translation>Đây là transaction fee bạn sẽ pay nếu gửi transaction.</translation>
     </message>
+    <message>
+        <source>Topping up keypool…</source>
+        <translation>Đang nạp thêm keypool…</translation>
+    </message>
     <message>
         <source>Transaction amounts must not be negative</source>
         <translation>Transaction amounts phải không âm</translation>
@@ -3616,13 +5698,25 @@
         <source>Unable to bind to %s on this computer. %s is probably already running.</source>
         <translation>Unable to bind to %s on this computer. %s is probably already running.</translation>
     </message>
+    <message>
+        <source>Unable to create the PID file '%s': %s</source>
+        <translation>Không thể tạo tệp PID '%s': %s</translation>
+    </message>
     <message>
         <source>Unable to generate initial keys</source>
         <translation>Không thể sinh các khoá khởi tạo</translation>
     </message>
     <message>
-        <source>Upgrading UTXO database</source>
-        <translation>Upgrading UTXO database</translation>
+        <source>Unable to open %s for writing</source>
+        <translation>Không thể mở %s để ghi</translation>
+    </message>
+    <message>
+        <source>Unknown -blockfilterindex value %s.</source>
+        <translation>Giá trị -blockfilterindex không xác định %s.</translation>
+    </message>
+    <message>
+        <source>Unknown new rules activated (versionbit %i)</source>
+        <translation>Quy tắc mới không xác định đã được kích hoạt (versionbit %i)</translation>
     </message>
     <message>
         <source>Verifying blocks…</source>
@@ -3641,16 +5735,12 @@
         <translation>Không thể tạo được thư mục backup ví %s!</translation>
     </message>
     <message>
-        <source>You can not start a masternode with wallet enabled.</source>
-        <translation>Bạn không thể khởi động một masternode với ví được kích hoạt.</translation>
-    </message>
-    <message>
-        <source>You need to rebuild the database using -reindex to change -addressindex</source>
-        <translation>Bạn cần tái lập lại cơ sở dữ liệu sử dụng -reindex để thay đổi -addressindex</translation>
+        <source>Wiping wallet transactions…</source>
+        <translation>Đang xóa các giao dịch ví…</translation>
     </message>
     <message>
-        <source>You need to rebuild the database using -reindex to change -spentindex</source>
-        <translation>Bạn cần tái lập lại cơ sở dữ liệu sử dụng -reindex để thay đổi -spentindex</translation>
+        <source>You can not start a masternode with wallet enabled.</source>
+        <translation>Bạn không thể khởi động một masternode với ví được kích hoạt.</translation>
     </message>
     <message>
         <source>no mixing available.</source>
@@ -3664,6 +5754,26 @@
         <source>The %s developers</source>
         <translation>The %s developers</translation>
     </message>
+    <message>
+        <source>%s uses exact denominated amounts to send funds, you might simply need to mix some more coins.</source>
+        <translation>%s sử dụng các mệnh giá chính xác để gửi tiền, bạn có thể chỉ cần trộn thêm một số coin.</translation>
+    </message>
+    <message>
+        <source>-reindex-chainstate option is not compatible with -blockfilterindex. Please temporarily disable blockfilterindex while using -reindex-chainstate, or replace -reindex-chainstate with -reindex to fully rebuild all indexes.</source>
+        <translation>Tùy chọn -reindex-chainstate không tương thích với -blockfilterindex. Vui lòng tạm thời vô hiệu hóa blockfilterindex khi sử dụng -reindex-chainstate, hoặc thay -reindex-chainstate bằng -reindex để xây dựng lại tất cả các chỉ mục.</translation>
+    </message>
+    <message>
+        <source>-reindex-chainstate option is not compatible with -coinstatsindex. Please temporarily disable coinstatsindex while using -reindex-chainstate, or replace -reindex-chainstate with -reindex to fully rebuild all indexes.</source>
+        <translation>Tùy chọn -reindex-chainstate không tương thích với -coinstatsindex. Vui lòng tạm thời vô hiệu hóa coinstatsindex khi sử dụng -reindex-chainstate, hoặc thay -reindex-chainstate bằng -reindex để xây dựng lại tất cả các chỉ mục.</translation>
+    </message>
+    <message>
+        <source>-reindex-chainstate option is not compatible with -txindex. Please temporarily disable txindex while using -reindex-chainstate, or replace -reindex-chainstate with -reindex to fully rebuild all indexes.</source>
+        <translation>Tùy chọn -reindex-chainstate không tương thích với -txindex. Vui lòng tạm thời vô hiệu hóa txindex khi sử dụng -reindex-chainstate, hoặc thay -reindex-chainstate bằng -reindex để xây dựng lại tất cả các chỉ mục.</translation>
+    </message>
+    <message>
+        <source>Cannot downgrade wallet from version %i to version %i. Wallet version unchanged.</source>
+        <translation>Không thể hạ cấp ví từ phiên bản %i xuống phiên bản %i. Phiên bản ví không thay đổi.</translation>
+    </message>
     <message>
         <source>Cannot obtain a lock on data directory %s. %s is probably already running.</source>
         <translation>Cannot obtain a lock on data directory %s. %s is probably already running.</translation>
@@ -3676,14 +5786,82 @@
         <source>Error loading %s: You can't enable HD on an already existing non-HD wallet</source>
         <translation>Lỗi khi tải %s: Bạn không thể bật HD trên một ví không HD</translation>
     </message>
+    <message>
+        <source>Error loading wallet. Wallet requires blocks to be downloaded, and software does not currently support loading wallets while blocks are being downloaded out of order when using assumeutxo snapshots. Wallet should be able to load successfully after node sync reaches height %s</source>
+        <translation>Lỗi khi tải ví. Ví yêu cầu các khối được tải xuống, và phần mềm hiện tại không hỗ trợ tải ví trong khi các khối đang được tải xuống không theo thứ tự khi sử dụng assumeutxo snapshots. Ví sẽ có thể tải thành công sau khi node đồng bộ đạt chiều cao %s</translation>
+    </message>
     <message>
         <source>Error reading %s! All keys read correctly, but transaction data or address book entries might be missing or incorrect.</source>
         <translation>Error reading %s! All keys read correctly, but transaction data or address book entries might be missing or incorrect.</translation>
     </message>
+    <message>
+        <source>Error: Dumpfile format record is incorrect. Got "%s", expected "format".</source>
+        <translation>Lỗi: Bản ghi định dạng dumpfile không chính xác. Nhận được "%s", mong đợi "format".</translation>
+    </message>
+    <message>
+        <source>Error: Dumpfile identifier record is incorrect. Got "%s", expected "%s".</source>
+        <translation>Lỗi: Bản ghi định danh dumpfile không chính xác. Nhận được "%s", mong đợi "%s".</translation>
+    </message>
+    <message>
+        <source>Error: Dumpfile version is not supported. This version of bitcoin-wallet only supports version 1 dumpfiles. Got dumpfile with version %s</source>
+        <translation>Lỗi: Phiên bản dumpfile không được hỗ trợ. Phiên bản bitcoin-wallet này chỉ hỗ trợ dumpfile phiên bản 1. Nhận được dumpfile với phiên bản %s</translation>
+    </message>
+    <message>
+        <source>Failed to rename invalid peers.dat file. Please move or delete it and try again.</source>
+        <translation>Không thể đổi tên tệp peers.dat không hợp lệ. Vui lòng di chuyển hoặc xóa nó và thử lại.</translation>
+    </message>
+    <message>
+        <source>Fee estimation failed. Fallbackfee is disabled. Wait a few blocks or enable %s.</source>
+        <translation>Ước tính phí không thành công. Fallbackfee bị vô hiệu hóa. Đợi một vài khối hoặc bật %s.</translation>
+    </message>
+    <message>
+        <source>File %s already exists. If you are sure this is what you want, move it out of the way first.</source>
+        <translation>Tệp %s đã tồn tại. Nếu bạn chắc chắn đây là điều bạn muốn, hãy di chuyển nó ra khỏi đường dẫn trước.</translation>
+    </message>
+    <message>
+        <source>Incompatible options: -dnsseed=1 was explicitly specified, but -onlynet forbids connections to IPv4/IPv6</source>
+        <translation>Tùy chọn không tương thích: -dnsseed=1 đã được chỉ định rõ ràng, nhưng -onlynet cấm các kết nối tới IPv4/IPv6</translation>
+    </message>
     <message>
         <source>Incorrect or no devnet genesis block found. Wrong datadir for devnet specified?</source>
         <translation>Không chính xác hoặc không tìm thấy khối ban đầu của devnet. Thư mục dữ liệu devnet được cung cấp không chính xác?</translation>
     </message>
+    <message>
+        <source>Invalid amount for %s=&lt;amount&gt;: '%s' (must be at least the minrelay fee of %s to prevent stuck transactions)</source>
+        <translation>Số tiền không hợp lệ cho %s=&lt;amount&gt;: '%s' (phải ít nhất là phí minrelay %s để ngăn chặn giao dịch bị kẹt)</translation>
+    </message>
+    <message>
+        <source>Invalid or corrupt peers.dat (%s). If you believe this is a bug, please report it to %s. As a workaround, you can move the file (%s) out of the way (rename, move, or delete) to have a new one created on the next start.</source>
+        <translation>peers.dat không hợp lệ hoặc bị hỏng (%s). Nếu bạn tin đây là lỗi, vui lòng báo cáo cho %s. Để khắc phục, bạn có thể di chuyển tệp (%s) ra khỏi đường dẫn (đổi tên, di chuyển hoặc xóa) để tạo một tệp mới khi khởi động lại.</translation>
+    </message>
+    <message>
+        <source>No dump file provided. To use createfromdump, -dumpfile=&lt;filename&gt; must be provided.</source>
+        <translation>Không có tệp dump được cung cấp. Để sử dụng createfromdump, phải cung cấp -dumpfile=&lt;filename&gt;.</translation>
+    </message>
+    <message>
+        <source>No dump file provided. To use dump, -dumpfile=&lt;filename&gt; must be provided.</source>
+        <translation>Không có tệp dump được cung cấp. Để sử dụng dump, phải cung cấp -dumpfile=&lt;filename&gt;.</translation>
+    </message>
+    <message>
+        <source>No wallet file format provided. To use createfromdump, -format=&lt;format&gt; must be provided.</source>
+        <translation>Không có định dạng tệp ví được cung cấp. Để sử dụng createfromdump, phải cung cấp -format=&lt;format&gt;.</translation>
+    </message>
+    <message>
+        <source>Outbound connections restricted to CJDNS (-onlynet=cjdns) but -cjdnsreachable is not provided</source>
+        <translation>Kết nối ra ngoài bị giới hạn đối với CJDNS (-onlynet=cjdns) nhưng -cjdnsreachable không được cung cấp</translation>
+    </message>
+    <message>
+        <source>Outbound connections restricted to Tor (-onlynet=onion) but the proxy for reaching the Tor network is explicitly forbidden: -onion=0</source>
+        <translation>Kết nối ra ngoài bị giới hạn đối với Tor (-onlynet=onion) nhưng proxy để truy cập mạng Tor bị cấm rõ ràng: -onion=0</translation>
+    </message>
+    <message>
+        <source>Outbound connections restricted to Tor (-onlynet=onion) but the proxy for reaching the Tor network is not provided: none of -proxy, -onion or -listenonion is given</source>
+        <translation>Kết nối ra ngoài bị giới hạn đối với Tor (-onlynet=onion) nhưng proxy để truy cập mạng Tor không được cung cấp: không có -proxy, -onion hoặc -listenonion được đưa ra</translation>
+    </message>
+    <message>
+        <source>Outbound connections restricted to i2p (-onlynet=i2p) but -i2psam is not provided</source>
+        <translation>Kết nối ra ngoài bị giới hạn đối với i2p (-onlynet=i2p) nhưng -i2psam không được cung cấp</translation>
+    </message>
     <message>
         <source>Please check that your computer's date and time are correct! If your clock is wrong, %s will not work properly.</source>
         <translation>Please check that your computer's date and time are correct! If your clock is wrong, %s will not work properly.</translation>
@@ -3692,6 +5870,14 @@
         <source>Please contribute if you find %s useful. Visit %s for further information about the software.</source>
         <translation>Please contribute if you find %s useful. Visit %s for further information about the software.</translation>
     </message>
+    <message>
+        <source>Prune mode is incompatible with -reindex-chainstate. Use full -reindex instead.</source>
+        <translation>Chế độ cắt tỉa không tương thích với -reindex-chainstate. Hãy sử dụng -reindex đầy đủ thay thế.</translation>
+    </message>
+    <message>
+        <source>This is the maximum transaction fee you pay (in addition to the normal fee) to prioritize partial spend avoidance over regular coin selection.</source>
+        <translation>Đây là phí giao dịch tối đa bạn trả (ngoài phí thông thường) để ưu tiên tránh chi tiêu một phần hơn lựa chọn coin thông thường.</translation>
+    </message>
     <message>
         <source>This is the transaction fee you may discard if change is smaller than dust at this level</source>
         <translation>Đây là phí giao dịch bạn có thể bỏ qua nếu phần trả lại nhỏ hơn bụi ở cấp độ này</translation>
@@ -3700,10 +5886,38 @@
         <source>This is the transaction fee you may pay when fee estimates are not available.</source>
         <translation>This is the transaction fee you may pay when fee estimates are not available.</translation>
     </message>
+    <message>
+        <source>Transaction requires one destination of non-0 value, a non-0 feerate, or a pre-selected input</source>
+        <translation>Giao dịch yêu cầu một đích có giá trị khác 0, tỷ lệ phí khác 0, hoặc một đầu vào đã được chọn trước</translation>
+    </message>
     <message>
         <source>Unable to replay blocks. You will need to rebuild the database using -reindex-chainstate.</source>
         <translation>Không thể phát lại các khối. Bạn sẽ cần xây dựng lại cơ sở dữ liệu bằng cách sử dụng -reindex-chainstate.</translation>
     </message>
+    <message>
+        <source>Unknown wallet file format "%s" provided. Please provide one of "bdb" or "sqlite".</source>
+        <translation>Định dạng tệp ví không xác định "%s" được cung cấp. Vui lòng cung cấp một trong "bdb" hoặc "sqlite".</translation>
+    </message>
+    <message>
+        <source>Unsupported chainstate database format found. Please restart with -reindex-chainstate. This will rebuild the chainstate database.</source>
+        <translation>Đã tìm thấy định dạng cơ sở dữ liệu chainstate không được hỗ trợ. Vui lòng khởi động lại với -reindex-chainstate. Điều này sẽ xây dựng lại cơ sở dữ liệu chainstate.</translation>
+    </message>
+    <message>
+        <source>Warning: Dumpfile wallet format "%s" does not match command line specified format "%s".</source>
+        <translation>Cảnh báo: Định dạng ví dumpfile "%s" không khớp với định dạng được chỉ định trong dòng lệnh "%s".</translation>
+    </message>
+    <message>
+        <source>Warning: Private keys detected in wallet {%s} with disabled private keys</source>
+        <translation>Cảnh báo: Phát hiện khóa riêng trong ví {%s} với khóa riêng bị vô hiệu hóa</translation>
+    </message>
+    <message>
+        <source>You need to rebuild the database using -reindex to enable -timestampindex</source>
+        <translation>Bạn cần xây dựng lại cơ sở dữ liệu bằng cách sử dụng -reindex để bật -timestampindex</translation>
+    </message>
+    <message>
+        <source>%s -- Incorrect seed, it should be a hex string</source>
+        <translation>%s -- Seed không chính xác, nó phải là một chuỗi hex</translation>
+    </message>
     <message>
         <source>%s is not a valid backup folder!</source>
         <translation>%s không phải là thư mục sao lưu dự phòng hợp lệ!</translation>
@@ -3712,6 +5926,10 @@
         <source>%s is set very high!</source>
         <translation>%s is set very high!</translation>
     </message>
+    <message>
+        <source>%s request incomplete:</source>
+        <translation>Yêu cầu %s không đầy đủ:</translation>
+    </message>
     <message>
         <source>-devnet can only be specified once</source>
         <translation>-devnet chỉ có thể chỉ ra một lần duy nhất</translation>
@@ -3724,18 +5942,54 @@
         <source>-rpcport must be specified when -devnet and -server are specified</source>
         <translation>-rpcport phải được chỉ rõ khi -devnet và -server được sử dụng</translation>
     </message>
+    <message>
+        <source>-statsbatchsize cannot be configured with a negative value.</source>
+        <translation>-statsbatchsize không thể được cấu hình với giá trị âm.</translation>
+    </message>
+    <message>
+        <source>-statsduration cannot be configured with a negative value.</source>
+        <translation>-statsduration không thể được cấu hình với giá trị âm.</translation>
+    </message>
+    <message>
+        <source>A fatal internal error occurred, see debug.log for details</source>
+        <translation>Đã xảy ra lỗi nội bộ nghiêm trọng, xem debug.log để biết chi tiết</translation>
+    </message>
+    <message>
+        <source>Cannot create socket (socket() returned error %s)</source>
+        <translation>Không thể tạo socket (socket() trả về lỗi %s)</translation>
+    </message>
+    <message>
+        <source>Cannot get socket address for %s</source>
+        <translation>Không thể lấy địa chỉ socket cho %s</translation>
+    </message>
+    <message>
+        <source>Cannot init Statsd client</source>
+        <translation>Không thể khởi tạo Statsd client</translation>
+    </message>
     <message>
         <source>Cannot resolve -%s address: '%s'</source>
         <translation>Cannot resolve -%s address: '%s'</translation>
     </message>
     <message>
-        <source>Change index out of range</source>
-        <translation>Change index out of range</translation>
+        <source>Cannot write to data directory '%s'; check permissions.</source>
+        <translation>Không thể ghi vào thư mục dữ liệu '%s'; kiểm tra quyền truy cập.</translation>
     </message>
     <message>
         <source>Copyright (C)</source>
         <translation>Bản quyền (C)</translation>
     </message>
+    <message>
+        <source>Disk space is too low!</source>
+        <translation>Dung lượng đĩa quá thấp!</translation>
+    </message>
+    <message>
+        <source>Dump file %s does not exist.</source>
+        <translation>Tệp dump %s không tồn tại.</translation>
+    </message>
+    <message>
+        <source>Error creating %s</source>
+        <translation>Lỗi khi tạo %s</translation>
+    </message>
     <message>
         <source>Error loading %s</source>
         <translation>Error loading %s</translation>
@@ -3753,8 +6007,8 @@
         <translation>Lỗi tải %s: Bạn không thể tắt HD trên một ví đã có HD</translation>
     </message>
     <message>
-        <source>Error upgrading chainstate database</source>
-        <translation>Error upgrading chainstate database</translation>
+        <source>Error reading next record from wallet database</source>
+        <translation>Lỗi khi đọc bản ghi tiếp theo từ cơ sở dữ liệu ví</translation>
     </message>
     <message>
         <source>Loading P2P addresses…</source>
@@ -3772,10 +6026,38 @@
         <source>Loading wallet…</source>
         <translation>Đang tải ví…</translation>
     </message>
+    <message>
+        <source>Failed to clear fulfilled requests cache at %s</source>
+        <translation>Không thể xóa bộ nhớ đệm yêu cầu đã thực hiện tại %s</translation>
+    </message>
+    <message>
+        <source>Failed to clear governance cache at %s</source>
+        <translation>Không thể xóa bộ nhớ đệm quản trị tại %s</translation>
+    </message>
+    <message>
+        <source>Failed to clear masternode cache at %s</source>
+        <translation>Không thể xóa bộ nhớ đệm masternode tại %s</translation>
+    </message>
     <message>
         <source>Failed to find mixing queue to join</source>
         <translation>Không tìm thấy hàng đợi trộn để tham gia</translation>
     </message>
+    <message>
+        <source>Failed to load fulfilled requests cache from %s</source>
+        <translation>Không thể tải bộ nhớ đệm yêu cầu đã thực hiện từ %s</translation>
+    </message>
+    <message>
+        <source>Failed to load governance cache from %s</source>
+        <translation>Không thể tải bộ nhớ đệm quản trị từ %s</translation>
+    </message>
+    <message>
+        <source>Failed to load masternode cache from %s</source>
+        <translation>Không thể tải bộ nhớ đệm masternode từ %s</translation>
+    </message>
+    <message>
+        <source>Failed to load sporks cache from %s</source>
+        <translation>Không thể tải bộ nhớ đệm sporks từ %s</translation>
+    </message>
     <message>
         <source>Failed to start a new mixing queue</source>
         <translation>Không thể khởi động được một hàng đợi trộn mới</translation>
@@ -3784,6 +6066,10 @@
         <source>Importing…</source>
         <translation>Đang nạp…</translation>
     </message>
+    <message>
+        <source>Incorrect -rescan mode, falling back to default value</source>
+        <translation>Chế độ -rescan không chính xác, quay lại giá trị mặc định</translation>
+    </message>
     <message>
         <source>Initialization sanity check failed. %s is shutting down.</source>
         <translation>Initialization sanity check failed. %s is shutting down.</translation>
@@ -3792,6 +6078,14 @@
         <source>Inputs vs outputs size mismatch.</source>
         <translation>Kích thước của đầu vào với đầu ra không tương xứng.</translation>
     </message>
+    <message>
+        <source>Invalid '%s'. Allowed values: 128, 160, 192, 224, 256.</source>
+        <translation>'%s' không hợp lệ. Giá trị cho phép: 128, 160, 192, 224, 256.</translation>
+    </message>
+    <message>
+        <source>Invalid -i2psam address or hostname: '%s'</source>
+        <translation>Địa chỉ hoặc tên máy chủ -i2psam không hợp lệ: '%s'</translation>
+    </message>
     <message>
         <source>Invalid -onion address or hostname: '%s'</source>
         <translation>Invalid -onion address or hostname: '%s'</translation>
@@ -3824,10 +6118,90 @@
         <source>Signing transaction failed</source>
         <translation>Thất bại khi ký giao dịch</translation>
     </message>
+    <message>
+        <source>Specified blocks directory "%s" does not exist.</source>
+        <translation>Thư mục khối được chỉ định "%s" không tồn tại.</translation>
+    </message>
+    <message>
+        <source>Last queue was created too recently.</source>
+        <translation>Hàng đợi cuối cùng được tạo quá gần đây.</translation>
+    </message>
+    <message>
+        <source>%s corrupt. Try using the wallet tool dash-wallet to salvage or restoring a backup.</source>
+        <translation>%s bị hỏng. Hãy thử sử dụng công cụ ví dash-wallet để cứu hộ hoặc khôi phục từ bản sao lưu.</translation>
+    </message>
+    <message>
+        <source>%s is set very high! Fees this large could be paid on a single transaction.</source>
+        <translation>%s được đặt rất cao! Phí lớn như vậy có thể được trả cho một giao dịch duy nhất.</translation>
+    </message>
+    <message>
+        <source>%s request to listen on port %u. This port is considered "bad" and thus it is unlikely that any Dash Core peers connect to it. See doc/p2p-bad-ports.md for details and a full list.</source>
+        <translation>%s yêu cầu lắng nghe trên cổng %u. Cổng này được coi là "xấu" và do đó khó có khả năng bất kỳ peer Dash Core nào kết nối với nó. Xem doc/p2p-bad-ports.md để biết chi tiết và danh sách đầy đủ.</translation>
+    </message>
+    <message>
+        <source>Cannot provide specific connections and have addrman find outgoing connections at the same time.</source>
+        <translation>Không thể cung cấp các kết nối cụ thể và để addrman tìm các kết nối ra ngoài cùng một lúc.</translation>
+    </message>
+    <message>
+        <source>Failed to upgrade Evo database</source>
+        <translation>Không thể nâng cấp cơ sở dữ liệu Evo</translation>
+    </message>
+    <message>
+        <source>Fee needed &gt; fee paid</source>
+        <translation>Phí cần thiết &gt; phí đã trả</translation>
+    </message>
+    <message>
+        <source>Host %s on unsupported network</source>
+        <translation>Máy chủ %s trên mạng không được hỗ trợ</translation>
+    </message>
+    <message>
+        <source>Invalid amount for %s=&lt;amount&gt;: '%s' (must be at least %s)</source>
+        <translation>Số tiền không hợp lệ cho %s=&lt;amount&gt;: '%s' (phải ít nhất %s)</translation>
+    </message>
+    <message>
+        <source>Invalid amount for %s=&lt;amount&gt;: '%s'</source>
+        <translation>Số tiền không hợp lệ cho %s=&lt;amount&gt;: '%s'</translation>
+    </message>
+    <message>
+        <source>Invalid port specified in %s: '%s'</source>
+        <translation>Cổng không hợp lệ được chỉ định trong %s: '%s'</translation>
+    </message>
+    <message>
+        <source>Last successful action was too recent.</source>
+        <translation>Hành động thành công cuối cùng quá gần đây.</translation>
+    </message>
+    <message>
+        <source>Missing solving data for estimating transaction size</source>
+        <translation>Thiếu dữ liệu giải quyết để ước tính kích thước giao dịch</translation>
+    </message>
+    <message>
+        <source>No host specified</source>
+        <translation>Không có máy chủ được chỉ định</translation>
+    </message>
+    <message>
+        <source>No host specified, malformed URL</source>
+        <translation>Không có máy chủ được chỉ định, URL không đúng định dạng</translation>
+    </message>
+    <message>
+        <source>No text before the scheme delimiter, malformed URL</source>
+        <translation>Không có văn bản trước dấu phân cách scheme, URL không đúng định dạng</translation>
+    </message>
+    <message>
+        <source>Port must be between %d and %d, supplied %d</source>
+        <translation>Cổng phải nằm giữa %d và %d, đã cung cấp %d</translation>
+    </message>
+    <message>
+        <source>Socket not initialized, cannot send message</source>
+        <translation>Socket chưa được khởi tạo, không thể gửi tin nhắn</translation>
+    </message>
     <message>
         <source>The source code is available from %s.</source>
         <translation>The source code is available from %s.</translation>
     </message>
+    <message>
+        <source>The specified config file %s does not exist</source>
+        <translation>Tệp cấu hình được chỉ định %s không tồn tại</translation>
+    </message>
     <message>
         <source>The transaction amount is too small to pay the fee</source>
         <translation>Giá trị giao dịch quá nhỏ để trả phí</translation>
@@ -3848,6 +6222,10 @@
         <source>Transaction fees are too high.</source>
         <translation>Phí giao dịch quá cao.</translation>
     </message>
+    <message>
+        <source>Transaction needs a change address, but we can't generate it.</source>
+        <translation>Giao dịch cần một địa chỉ tiền thối, nhưng chúng tôi không thể tạo nó.</translation>
+    </message>
     <message>
         <source>Transaction not valid.</source>
         <translation>Giao dịch không hợp lệ.</translation>
@@ -3860,6 +6238,26 @@
         <source>Unable to bind to %s on this computer (bind returned error %s)</source>
         <translation>Không thể để ràng buộc vào %s trên máy tính này (bind trả lại lỗi %s)</translation>
     </message>
+    <message>
+        <source>Unable to locate enough mixed funds for this transaction.</source>
+        <translation>Không thể tìm đủ tiền đã trộn cho giao dịch này.</translation>
+    </message>
+    <message>
+        <source>Unable to locate enough non-denominated funds for this transaction.</source>
+        <translation>Không thể tìm đủ tiền chưa định mệnh giá cho giao dịch này.</translation>
+    </message>
+    <message>
+        <source>Unable to lookup host %s</source>
+        <translation>Không thể tra cứu máy chủ %s</translation>
+    </message>
+    <message>
+        <source>Unable to parse -maxuploadtarget: '%s'</source>
+        <translation>Không thể phân tích -maxuploadtarget: '%s'</translation>
+    </message>
+    <message>
+        <source>Unable to send message to %s (::sendto() returned error %s)</source>
+        <translation>Không thể gửi tin nhắn tới %s (::sendto() trả về lỗi %s)</translation>
+    </message>
     <message>
         <source>Unable to sign spork message, wrong key?</source>
         <translation>Không thể ký vào thông điệp phân nhánh, sai khoá?</translation>
@@ -3872,6 +6270,10 @@
         <source>Unknown state: id = %u</source>
         <translation>Trạng thái không xác định: id = %u</translation>
     </message>
+    <message>
+        <source>Unsupported URL scheme, must begin with udp://</source>
+        <translation>Scheme URL không được hỗ trợ, phải bắt đầu bằng udp://</translation>
+    </message>
     <message>
         <source>Unsupported logging category %s=%s.</source>
         <translation>Danh mục ghi nhật ký không được hỗ trợ %s=%s.</translation>
@@ -3884,6 +6286,14 @@
         <source>Wallet is locked.</source>
         <translation>Ví đã bị khoá.</translation>
     </message>
+    <message>
+        <source>Warning: can't use %s and %s together, will prefer %s</source>
+        <translation>Cảnh báo: không thể sử dụng %s và %s cùng nhau, sẽ ưu tiên %s</translation>
+    </message>
+    <message>
+        <source>Warning: incorrect parameter %s, path must exist! Using default path.</source>
+        <translation>Cảnh báo: tham số %s không chính xác, đường dẫn phải tồn tại! Sử dụng đường dẫn mặc định.</translation>
+    </message>
     <message>
         <source>Will retry…</source>
         <translation>Sẽ thử lại…</translation>
@@ -3896,9 +6306,25 @@
         <source>You can not disable governance validation on a masternode.</source>
         <translation>Bạn không thể tắt chế độ xác thực quản trị trên một masternode.</translation>
     </message>
+    <message>
+        <source>You need to rebuild the database using -reindex to enable -addressindex</source>
+        <translation>Bạn cần xây dựng lại cơ sở dữ liệu bằng cách sử dụng -reindex để bật -addressindex</translation>
+    </message>
+    <message>
+        <source>You need to rebuild the database using -reindex to enable -spentindex</source>
+        <translation>Bạn cần xây dựng lại cơ sở dữ liệu bằng cách sử dụng -reindex để bật -spentindex</translation>
+    </message>
     <message>
         <source>Your entries added successfully.</source>
         <translation>Các đầu vào của bạn đã được thêm vào một cách thành công.</translation>
     </message>
+    <message>
+        <source>Settings file could not be read</source>
+        <translation>Không thể đọc tệp cài đặt</translation>
+    </message>
+    <message>
+        <source>Settings file could not be written</source>
+        <translation>Không thể ghi tệp cài đặt</translation>
+    </message>
 </context>
 </TS>
\ No newline at end of file

From c3cc47a9ef0c33043e926c03cf2f96cf7aaf8c7c Mon Sep 17 00:00:00 2001
From: UdjinM6 <UdjinM6@users.noreply.github.com>
Date: Fri, 31 Oct 2025 09:15:31 +0300
Subject: [PATCH 337/656] bg

---
 src/qt/locale/dash_bg.ts | 2499 ++++++++++++++++++++++++++++++++++----
 1 file changed, 2232 insertions(+), 267 deletions(-)

diff --git a/src/qt/locale/dash_bg.ts b/src/qt/locale/dash_bg.ts
index b517fef2dc28..106e18adbe81 100644
--- a/src/qt/locale/dash_bg.ts
+++ b/src/qt/locale/dash_bg.ts
@@ -65,14 +65,6 @@
         <source>C&amp;hoose</source>
         <translation>Избери</translation>
     </message>
-    <message>
-        <source>Sending addresses</source>
-        <translation>Адреси за изпращане</translation>
-    </message>
-    <message>
-        <source>Receiving addresses</source>
-        <translation>Адреси за получаване</translation>
-    </message>
     <message>
         <source>These are your Dash addresses for sending payments. Always check the amount and the receiving address before sending coins.</source>
         <translation>Това са вашите Dash адреси за изпращане на плащания. Преди изпращане винаги проверявайте количеството и адреса за получаване на монетите.</translation>
@@ -94,8 +86,8 @@
         <translation>&amp;Редактирай</translation>
     </message>
     <message>
-        <source>&amp;Show address QR code</source>
-        <translation>&amp;Покажи QR код на адреса</translation>
+        <source>Show address &amp;QR code</source>
+        <translation>Покажи &amp;QR код на адреса</translation>
     </message>
     <message>
         <source>QR code</source>
@@ -105,6 +97,24 @@
         <source>Export Address List</source>
         <translation>Експортиране на списъка с адреси</translation>
     </message>
+    <message>
+        <source>Comma separated file</source>
+        <extracomment>Expanded name of the CSV file format. See: https://en.wikipedia.org/wiki/Comma-separated_values.</extracomment>
+        <translation>Файл със стойности разделени със запетая</translation>
+    </message>
+    <message>
+        <source>There was an error trying to save the address list to %1. Please try again.</source>
+        <extracomment>An error message. %1 is a stand-in argument for the name of the file we attempted to save to.</extracomment>
+        <translation>Възникна грешка при опит за запазване на списъка с адреси в %1. Моля, опитайте отново.</translation>
+    </message>
+    <message>
+        <source>Sending addresses - %1</source>
+        <translation>Адреси за изпращане - %1</translation>
+    </message>
+    <message>
+        <source>Receiving addresses - %1</source>
+        <translation>Адреси за получаване - %1</translation>
+    </message>
     <message>
         <source>Exporting Failed</source>
         <translation>Грешка при експортирането</translation>
@@ -274,10 +284,22 @@
         <source>The passphrase entered for the wallet decryption was incorrect.</source>
         <translation>Паролата въведена за дешифриране на портфейла е грешна.</translation>
     </message>
+    <message>
+        <source>The passphrase entered for the wallet decryption is incorrect. It contains a null character (ie - a zero byte). If the passphrase was set with a version of this software prior to 23.0, please try again with only the characters up to — but not including — the first null character. If this is successful, please set a new passphrase to avoid this issue in the future.</source>
+        <translation>Паролата въведена за дешифриране на портфейла е грешна. Тя съдържа нулев символ (т.е. - нулев байт). Ако паролата е зададена с версия на този софтуер преди 23.0, моля опитайте отново само със символите до — но без да включвате — първия нулев символ. Ако това е успешно, моля задайте нова парола, за да избегнете този проблем в бъдеще.</translation>
+    </message>
     <message>
         <source>Wallet passphrase was successfully changed.</source>
         <translation>Паролата на портфейла беше променена успешно.</translation>
     </message>
+    <message>
+        <source>Passphrase change failed</source>
+        <translation>Грешка при смяна на паролата</translation>
+    </message>
+    <message>
+        <source>The old passphrase entered for the wallet decryption is incorrect. It contains a null character (ie - a zero byte). If the passphrase was set with a version of this software prior to 23.0, please try again with only the characters up to — but not including — the first null character.</source>
+        <translation>Старата парола въведена за дешифриране на портфейла е грешна. Тя съдържа нулев символ (т.е. - нулев байт). Ако паролата е зададена с версия на този софтуер преди 23.0, моля опитайте отново само със символите до — но без да включвате — първия нулев символ.</translation>
+    </message>
     <message>
         <source>Warning: The Caps Lock key is on!</source>
         <translation>Внимание: Caps Lock (главни букви) е включен.</translation>
@@ -303,7 +325,23 @@
 </context>
 <context>
     <name>BitcoinApplication</name>
-    </context>
+    <message>
+        <source>Runaway exception</source>
+        <translation>Неконтролирано изключение</translation>
+    </message>
+    <message>
+        <source>A fatal error occurred. %1 can no longer continue safely and will quit.</source>
+        <translation>Възникна фатална грешка. %1 не може повече да продължи безопасно и ще се затвори.</translation>
+    </message>
+    <message>
+        <source>Internal error</source>
+        <translation>Вътрешна грешка</translation>
+    </message>
+    <message>
+        <source>An internal error occurred. %1 will attempt to continue safely. This is an unexpected bug which can be reported as described below.</source>
+        <translation>Възникна вътрешна грешка. %1 ще се опита да продължи безопасно. Това е неочакван бъг, който може да бъде докладван, както е описано по-долу.</translation>
+    </message>
+</context>
 <context>
     <name>BitcoinGUI</name>
     <message>
@@ -330,6 +368,10 @@
         <source>Request payments (generates QR codes and dash: URIs)</source>
         <translation>Заявка за плащане (генерира QR кодове и Dash: URI)</translation>
     </message>
+    <message>
+        <source>Ctrl+Q</source>
+        <translation>Ctrl+Q</translation>
+    </message>
     <message>
         <source>&amp;Options…</source>
         <translation>&amp;Опции…</translation>
@@ -358,6 +400,10 @@
         <source>&amp;Verify message…</source>
         <translation>&amp;Проверка на съобщение…</translation>
     </message>
+    <message>
+        <source>&amp;Load PSBT from file…</source>
+        <translation>&amp;Зареди PSBT от файл…</translation>
+    </message>
     <message>
         <source>&amp;Sending addresses</source>
         <translation>&amp;Адреси за изпращане</translation>
@@ -390,10 +436,6 @@
         <source>&amp;Window</source>
         <translation>&amp;Прозорец</translation>
     </message>
-    <message>
-        <source>Minimize</source>
-        <translation>Минимизирай</translation>
-    </message>
     <message>
         <source>Zoom</source>
         <translation>Увеличи</translation>
@@ -446,14 +488,6 @@
         <source>Modify configuration options for %1</source>
         <translation>Промяна на опциите за конфигурация на %1</translation>
     </message>
-    <message>
-        <source>&amp;Show / Hide</source>
-        <translation>&amp;Показване / Скриване</translation>
-    </message>
-    <message>
-        <source>Show or hide the main Window</source>
-        <translation>Показване и скриване на основния прозорец</translation>
-    </message>
     <message>
         <source>Encrypt the private keys that belong to your wallet</source>
         <translation>Криптирай частните ключове принадлежащи към твоя портфейл</translation>
@@ -518,10 +552,6 @@
         <source>Show wallet repair options</source>
         <translation>Покажи опции за възстановяване на портфейла</translation>
     </message>
-    <message>
-        <source>Open Wallet &amp;Configuration File</source>
-        <translation>Отвори Портфейл &amp;Конфигурационен файл</translation>
-    </message>
     <message>
         <source>Open configuration file</source>
         <translation>Отвори конфигурационния файл</translation>
@@ -577,13 +607,17 @@
         <translation>Показване на информация за %1 </translation>
     </message>
     <message>
-        <source>Load Partially Signed Dash Transaction</source>
-        <translation>Зареждане на частично подписана Dash трансакция </translation>
+        <source>Load PSBT from &amp;clipboard…</source>
+        <translation>Зареди PSBT от &amp;клипборда…</translation>
     </message>
     <message>
         <source>Open debugging and diagnostic console</source>
         <translation>Отвори конзолата за отстраняване на грешки и диагностика</translation>
     </message>
+    <message>
+        <source>Open &amp;wallet configuration file</source>
+        <translation>Отвори &amp;конфигурационен файл на портфейла</translation>
+    </message>
     <message>
         <source>Open a dash: URI</source>
         <translation>Отвори dash: URI</translation>
@@ -592,6 +626,20 @@
         <source>Create a new wallet</source>
         <translation>Създай нов портфейл</translation>
     </message>
+    <message>
+        <source>Restore Wallet…</source>
+        <extracomment>Name of the menu item that restores wallet from a backup file.</extracomment>
+        <translation>Възстанови портфейл…</translation>
+    </message>
+    <message>
+        <source>Restore a wallet from a backup file</source>
+        <extracomment>Status tip for Restore Wallet menu item</extracomment>
+        <translation>Възстановяване на портфейл от резервен файл</translation>
+    </message>
+    <message>
+        <source>Close all wallets</source>
+        <translation>Затвори всички портфейли</translation>
+    </message>
     <message>
         <source>%1 &amp;information</source>
         <translation>%1 &amp;информация</translation>
@@ -600,10 +648,42 @@
         <source>Show the %1 basic information</source>
         <translation>Покажи %1 основната информация</translation>
     </message>
+    <message>
+        <source>&amp;Discreet mode</source>
+        <translation>&amp;Дискретен режим</translation>
+    </message>
+    <message>
+        <source>Mask the values in the Overview tab</source>
+        <translation>Скрий стойностите в раздела Общ преглед</translation>
+    </message>
+    <message>
+        <source>Wallet Data</source>
+        <extracomment>Name of the wallet data file format.</extracomment>
+        <translation>Данни на портфейла</translation>
+    </message>
+    <message>
+        <source>Load Wallet Backup</source>
+        <extracomment>The title for Restore Wallet File Windows</extracomment>
+        <translation>Зареди резервно копие на портфейла</translation>
+    </message>
+    <message>
+        <source>Restore Wallet</source>
+        <extracomment>Title of pop-up window shown when the user is attempting to restore a wallet.</extracomment>
+        <translation>Възстанови портфейл</translation>
+    </message>
+    <message>
+        <source>Wallet Name</source>
+        <extracomment>Label of the input field where the name of the wallet is entered.</extracomment>
+        <translation>Име на портфейла</translation>
+    </message>
     <message>
         <source>&amp;Settings</source>
         <translation>&amp;Настройки</translation>
     </message>
+    <message>
+        <source>&amp;Minimize</source>
+        <translation>&amp;Минимизиране</translation>
+    </message>
     <message>
         <source>&amp;Help</source>
         <translation>&amp;Помощ</translation>
@@ -620,8 +700,17 @@
         <source>View Governance Proposals</source>
         <translation>Преглед на предложенията за управление </translation>
     </message>
+    <message>
+        <source>&amp;Hide</source>
+        <translation>&amp;Скрий</translation>
+    </message>
+    <message>
+        <source>S&amp;how</source>
+        <translation>П&amp;окажи</translation>
+    </message>
     <message numerus="yes">
         <source>%n active connection(s) to Dash network</source>
+        <extracomment>A substring of the tooltip.</extracomment>
         <translation><numerusform>%n активни връзки към Dash мрежата</numerusform><numerusform>%n активни връзки към Dash мрежата</numerusform></translation>
     </message>
     <message>
@@ -640,10 +729,50 @@
         <source>Close Wallet…</source>
         <translation>Затваряне на портфейла…</translation>
     </message>
+    <message>
+        <source>Load Partially Signed Blockchain Transaction</source>
+        <translation>Зареди частично подписана блокчейн транзакция</translation>
+    </message>
+    <message>
+        <source>Load Partially Signed Blockchain Transaction from clipboard</source>
+        <translation>Зареди частично подписана блокчейн транзакция от клипборда</translation>
+    </message>
     <message>
         <source>Create Wallet…</source>
         <translation>Създай портфейл…</translation>
     </message>
+    <message>
+        <source>Close All Wallets…</source>
+        <translation>Затвори всички портфейли…</translation>
+    </message>
+    <message>
+        <source>Ctrl+Shift+D</source>
+        <translation>Ctrl+Shift+D</translation>
+    </message>
+    <message>
+        <source>Ctrl+M</source>
+        <translation>Ctrl+M</translation>
+    </message>
+    <message>
+        <source>Click for more actions.</source>
+        <extracomment>A substring of the tooltip. "More actions" are available via the context menu.</extracomment>
+        <translation>Кликнете за повече действия.</translation>
+    </message>
+    <message>
+        <source>Show Peers tab</source>
+        <extracomment>A context menu item. The "Peers tab" is an element of the "Node window".</extracomment>
+        <translation>Покажи раздел Пиъри</translation>
+    </message>
+    <message>
+        <source>Disable network activity</source>
+        <extracomment>A context menu item.</extracomment>
+        <translation>Изключи мрежова активност</translation>
+    </message>
+    <message>
+        <source>Enable network activity</source>
+        <extracomment>A context menu item. The network activity was disabled previously.</extracomment>
+        <translation>Включи мрежова активност</translation>
+    </message>
     <message>
         <source>Syncing Headers (%1%)…</source>
         <translation>Синхронизиране на Headers (%1%)…</translation>
@@ -660,10 +789,6 @@
         <source>Processing blocks on disk…</source>
         <translation>Обработване блоковете на диска…</translation>
     </message>
-    <message>
-        <source>Reindexing blocks on disk…</source>
-        <translation>Преиндексиране на блокове на диска…</translation>
-    </message>
     <message>
         <source>Connecting to peers…</source>
         <translation>Свързване към пиъри…</translation>
@@ -817,10 +942,6 @@
         <source>Coin Selection</source>
         <translation>Избор на монети</translation>
     </message>
-    <message>
-        <source>Dust:</source>
-        <translation>Незначителен остатък:</translation>
-    </message>
     <message>
         <source>After Fee:</source>
         <translation>След таксата:</translation>
@@ -878,28 +999,32 @@
         <translation>Потвърдени</translation>
     </message>
     <message>
-        <source>Copy address</source>
-        <translation>Копирай адрес</translation>
+        <source>Copy amount</source>
+        <translation>Копирай сума</translation>
     </message>
     <message>
-        <source>Copy label</source>
-        <translation>Копирай наименование</translation>
+        <source>&amp;Copy address</source>
+        <translation>&amp;Копирай адрес</translation>
     </message>
     <message>
-        <source>Copy amount</source>
-        <translation>Копирай сума</translation>
+        <source>Copy &amp;label</source>
+        <translation>Копирай &amp;наименование</translation>
+    </message>
+    <message>
+        <source>Copy &amp;amount</source>
+        <translation>Копирай &amp;сума</translation>
     </message>
     <message>
-        <source>Copy transaction ID</source>
-        <translation>Копирай транзакция с ID</translation>
+        <source>Copy transaction &amp;ID and output index</source>
+        <translation>Копирай &amp;ID на транзакцията и изходен индекс</translation>
     </message>
     <message>
-        <source>Lock unspent</source>
-        <translation>Заключи неизхарченото</translation>
+        <source>L&amp;ock unspent</source>
+        <translation>З&amp;аключи непохарчени</translation>
     </message>
     <message>
-        <source>Unlock unspent</source>
-        <translation>Отключи неизхарченото</translation>
+        <source>&amp;Unlock unspent</source>
+        <translation>&amp;Отключи непохарчени</translation>
     </message>
     <message>
         <source>Copy quantity</source>
@@ -917,10 +1042,6 @@
         <source>Copy bytes</source>
         <translation>Копирай байтовете</translation>
     </message>
-    <message>
-        <source>Copy dust</source>
-        <translation>Копирай остатъка</translation>
-    </message>
     <message>
         <source>Copy change</source>
         <translation>Копирай рестото</translation>
@@ -933,18 +1054,6 @@
         <source>(%1 locked)</source>
         <translation>(%1 заключен)</translation>
     </message>
-    <message>
-        <source>yes</source>
-        <translation>да</translation>
-    </message>
-    <message>
-        <source>no</source>
-        <translation>не</translation>
-    </message>
-    <message>
-        <source>This label turns red if any recipient receives an amount smaller than the current dust threshold.</source>
-        <translation>Този етикет става червен, ако получателят получи сума, по-малка от прага за незначителен остатък.</translation>
-    </message>
     <message>
         <source>Can vary +/- %1 duff(s) per input.</source>
         <translation>Може да варира +/- %1 duff(s) за вход.</translation>
@@ -988,8 +1097,14 @@
 </context>
 <context>
     <name>CreateWalletActivity</name>
+    <message>
+        <source>Create Wallet</source>
+        <extracomment>Title of window indicating the progress of creation of a new wallet.</extracomment>
+        <translation>Създай портфейл</translation>
+    </message>
     <message>
         <source>Creating Wallet &lt;b&gt;%1&lt;/b&gt;…</source>
+        <extracomment>Descriptive text of the create wallet progress window which indicates to the user which wallet is currently being created.</extracomment>
         <translation>Създаване на портфейл &lt;b&gt;%1&lt;/b&gt;…</translation>
     </message>
     <message>
@@ -1015,7 +1130,51 @@
         <source>Wallet</source>
         <translation>Портфейл</translation>
     </message>
-    </context>
+    <message>
+        <source>Encrypt the wallet. The wallet will be encrypted with a passphrase of your choice.</source>
+        <translation>Шифрирай портфейла. Портфейлът ще бъде шифриран с парола по ваш избор.</translation>
+    </message>
+    <message>
+        <source>Encrypt Wallet</source>
+        <translation>Шифриране на портфейла</translation>
+    </message>
+    <message>
+        <source>Advanced Options</source>
+        <translation>Допълнителни опции</translation>
+    </message>
+    <message>
+        <source>Disable private keys for this wallet. Wallets with private keys disabled will have no private keys and cannot have an HD seed or imported private keys. This is ideal for watch-only wallets.</source>
+        <translation>Деактивирай частните ключове за този портфейл. Портфейлите с деактивирани частни ключове няма да имат частни ключове и не могат да имат HD seed или импортирани частни ключове. Това е идеално за портфейли само за наблюдение.</translation>
+    </message>
+    <message>
+        <source>Disable Private Keys</source>
+        <translation>Деактивирай частните ключове</translation>
+    </message>
+    <message>
+        <source>Make a blank wallet. Blank wallets do not initially have private keys or scripts. Private keys and addresses can be imported, or an HD seed can be set, at a later time.</source>
+        <translation>Създай празен портфейл. Празните портфейли първоначално нямат частни ключове или скриптове. Частните ключове и адреси могат да бъдат импортирани или HD seed може да бъде зададен по-късно.</translation>
+    </message>
+    <message>
+        <source>Make Blank Wallet</source>
+        <translation>Създай празен портфейл</translation>
+    </message>
+    <message>
+        <source>Use descriptors for scriptPubKey management. This feature is well-tested but still considered experimental and not recommended for use yet.</source>
+        <translation>Използвай дескриптори за управление на scriptPubKey. Тази функция е добре тествана, но все още се счита за експериментална и не се препоръчва за употреба засега.</translation>
+    </message>
+    <message>
+        <source>Descriptor Wallet (EXPERIMENTAL)</source>
+        <translation>Дескрипторен портфейл (ЕКСПЕРИМЕНТАЛЕН)</translation>
+    </message>
+    <message>
+        <source>Create</source>
+        <translation>Създай</translation>
+    </message>
+    <message>
+        <source>Compiled without sqlite support (required for descriptor wallets)</source>
+        <translation>Компилиран без sqlite поддръжка (необходима за дескрипторни портфейли)</translation>
+    </message>
+</context>
 <context>
     <name>EditAddressDialog</name>
     <message>
@@ -1054,6 +1213,14 @@
         <source>The entered address "%1" is not a valid Dash address.</source>
         <translation>Въведеният адрес "%1" не е валиден Dash адрес.</translation>
     </message>
+    <message>
+        <source>Address "%1" already exists as a receiving address with label "%2" and so cannot be added as a sending address.</source>
+        <translation>Адресът "%1" вече съществува като адрес за получаване с наименование "%2" и затова не може да бъде добавен като адрес за изпращане.</translation>
+    </message>
+    <message>
+        <source>The entered address "%1" is already in the address book with label "%2".</source>
+        <translation>Въведеният адрес "%1" вече е в адресната книга с наименование "%2".</translation>
+    </message>
     <message>
         <source>Could not unlock wallet.</source>
         <translation>Отключването на портфейла беше неуспешно.</translation>
@@ -1088,7 +1255,115 @@
 </context>
 <context>
     <name>GovernanceList</name>
-    </context>
+    <message>
+        <source>Form</source>
+        <translation>Формуляр</translation>
+    </message>
+    <message>
+        <source>Filter List:</source>
+        <translation>Филтрирай списъка:</translation>
+    </message>
+    <message>
+        <source>Filter proposal list</source>
+        <translation>Филтрирай списъка с предложения</translation>
+    </message>
+    <message>
+        <source>Masternode Count:</source>
+        <translation>Брой Masternodes:</translation>
+    </message>
+    <message>
+        <source>Number of masternodes this wallet can vote with (masternodes for which this wallet holds the voting key)</source>
+        <translation>Брой masternodes с които този портфейл може да гласува (masternodes за които този портфейл държи гласуващия ключ)</translation>
+    </message>
+    <message>
+        <source>Proposal Count:</source>
+        <translation>Брой предложения:</translation>
+    </message>
+    <message>
+        <source>Create Proposal</source>
+        <translation>Създай предложение</translation>
+    </message>
+    <message>
+        <source>Filter by Title</source>
+        <translation>Филтрирай по заглавие</translation>
+    </message>
+    <message>
+        <source>Unavailable</source>
+        <translation>Недостъпен</translation>
+    </message>
+    <message>
+        <source>A synced node and an unlocked wallet are required.</source>
+        <translation>Изисква се синхронизиран възел и отключен портфейл.</translation>
+    </message>
+    <message>
+        <source>Vote Yes</source>
+        <translation>Гласувай ДА</translation>
+    </message>
+    <message>
+        <source>Vote No</source>
+        <translation>Гласувай НЕ</translation>
+    </message>
+    <message>
+        <source>Vote Abstain</source>
+        <translation>Гласувай ВЪЗДЪРЖАЛ СЕ</translation>
+    </message>
+    <message>
+        <source>Proposal Info: %1</source>
+        <translation>Информация за предложението: %1</translation>
+    </message>
+    <message>
+        <source>Voting Failed</source>
+        <translation>Гласуването се провали</translation>
+    </message>
+    <message>
+        <source>No wallet available.</source>
+        <translation>Няма наличен портфейл.</translation>
+    </message>
+    <message>
+        <source>No masternode voting keys found in wallet.</source>
+        <translation>Не са намерени гласуващи ключове за masternode в портфейла.</translation>
+    </message>
+    <message>
+        <source>Please select a proposal to vote on.</source>
+        <translation>Моля изберете предложение за гласуване.</translation>
+    </message>
+    <message>
+        <source>Unable to unlock wallet.</source>
+        <translation>Невъзможно отключване на портфейла.</translation>
+    </message>
+    <message>
+        <source>Unable to get masternode list. Please try again later.</source>
+        <translation>Невъзможно е да се вземе списъкът с masternodes. Моля опитайте отново по-късно.</translation>
+    </message>
+    <message>
+        <source>Masternode %1 not found</source>
+        <translation>Masternode %1 не е намерен</translation>
+    </message>
+    <message>
+        <source>Failed to sign vote for masternode %1</source>
+        <translation>Неуспешно подписване на глас за masternode %1</translation>
+    </message>
+    <message>
+        <source>Masternode %1: %2</source>
+        <translation>Masternode %1: %2</translation>
+    </message>
+    <message numerus="yes">
+        <source>Voted successfully %n time(s)</source>
+        <translation><numerusform>Гласувано успешно %n път</numerusform><numerusform>Гласувано успешно %n пъти</numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <source>Failed to vote %n time(s)</source>
+        <translation><numerusform>Неуспешно гласуване %n път</numerusform><numerusform>Неуспешно гласуване %n пъти</numerusform></translation>
+    </message>
+    <message>
+        <source>Errors:</source>
+        <translation>Грешки:</translation>
+    </message>
+    <message>
+        <source>Voting Results</source>
+        <translation>Резултати от гласуването</translation>
+    </message>
+</context>
 <context>
     <name>HelpMessageDialog</name>
     <message>
@@ -1126,10 +1401,26 @@
         <source>As this is the first time the program is launched, you can choose where %1 will store its data.</source>
         <translation>Тъй като това е първият път, когато програмата се стартира, можете да изберете къде %1 да съхранява данните си.</translation>
     </message>
+    <message>
+        <source>Limit block chain storage to</source>
+        <translation>Ограничи хранилището на блокчейна до</translation>
+    </message>
+    <message>
+        <source>Reverting this setting requires re-downloading the entire blockchain. It is faster to download the full chain first and prune it later. Disables some advanced features.</source>
+        <translation>Връщането на тази настройка изисква повторно изтегляне на целия блокчейн. По-бързо е първо да изтеглите пълната верига и после да я подрежете. Деактивира някои разширени функции.</translation>
+    </message>
+    <message>
+        <source> GB</source>
+        <translation> GB</translation>
+    </message>
     <message>
         <source>This initial synchronisation is very demanding, and may expose hardware problems with your computer that had previously gone unnoticed. Each time you run %1, it will continue downloading where it left off.</source>
         <translation>Тази първоначална синхронизация изисква много ресурси и може да покаже хардуерните проблеми с компютъра, които преди това не сте забелязали. Всеки път, когато стартирате %1, той ще продължи да се изтегля там, където е спрял.</translation>
     </message>
+    <message>
+        <source>When you click OK, %1 will begin to download and process the full %4 block chain (%2 GB) starting with the earliest transactions in %3 when %4 initially launched.</source>
+        <translation>Когато кликнете OK, %1 ще започне да изтегля и обработва пълния %4 блокчейн (%2 GB), започвайки с най-ранните транзакции в %3, когато %4 е стартиран първоначално.</translation>
+    </message>
     <message>
         <source>If you have chosen to limit block chain storage (pruning), the historical data must still be downloaded and processed, but will be deleted afterward to keep your disk usage low.</source>
         <translation>Ако сте избрали да ограничите пространството за съхранение на блок веригата(съкращаване), историческите данни ще трябва да се изтеглят и обработят, но след това ще бъдат изтрити, за да се запази използването на по-малко пространство на диска.</translation>
@@ -1142,6 +1433,18 @@
         <source>Use a custom data directory:</source>
         <translation>Определете папка по ваш избор:</translation>
     </message>
+    <message numerus="yes">
+        <source>%n GB of space available</source>
+        <translation><numerusform>%n GB налично пространство</numerusform><numerusform>%n GB налично пространство</numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <source>(of %n GB needed)</source>
+        <translation><numerusform>(от %n GB необходими)</numerusform><numerusform>(от %n GB необходими)</numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <source>(%n GB needed for full chain)</source>
+        <translation><numerusform>(%n GB необходими за пълна верига)</numerusform><numerusform>(%n GB необходими за пълна верига)</numerusform></translation>
+    </message>
     <message>
         <source>At least %1 GB of data will be stored in this directory, and it will grow over time.</source>
         <translation>Най малко %1 GB данни ще бъдат запаметени в тази директория, и ще нарастват през времето.</translation>
@@ -1150,6 +1453,11 @@
         <source>Approximately %1 GB of data will be stored in this directory.</source>
         <translation>Около %1 GB данни ще бъдат запаметени в тази директория.</translation>
     </message>
+    <message numerus="yes">
+        <source>(sufficient to restore backups %n day(s) old)</source>
+        <extracomment>Explanatory text on the capability of the current prune target.</extracomment>
+        <translation><numerusform>(достатъчно за възстановяване на резервни копия на %n ден)</numerusform><numerusform>(достатъчно за възстановяване на резервни копия на %n дни)</numerusform></translation>
+    </message>
     <message>
         <source>%1 will download and store a copy of the Dash block chain.</source>
         <translation>%1 ще изтегли и съхрани копие на  Dash блок веригата.</translation>
@@ -1167,6 +1475,13 @@
         <translation>Грешка</translation>
     </message>
 </context>
+<context>
+    <name>LoadWalletsActivity</name>
+    <message>
+        <source>Loading wallets…</source>
+        <translation>Зареждане на портфейли…</translation>
+    </message>
+</context>
 <context>
     <name>MasternodeList</name>
     <message>
@@ -1201,6 +1516,10 @@
         <source>Service</source>
         <translation>Услуга</translation>
     </message>
+    <message>
+        <source>Type</source>
+        <translation>Тип</translation>
+    </message>
     <message>
         <source>PoSe Score</source>
         <translation>PoSe резултат</translation>
@@ -1336,7 +1655,15 @@
         <source>Hide</source>
         <translation>Скрий</translation>
     </message>
-    </context>
+    <message>
+        <source>%1 is currently syncing.  It will download headers and blocks from peers and validate them until reaching the tip of the block chain.</source>
+        <translation>%1 в момента се синхронизира. Ще изтегли хедъри и блокове от пиъри и ще ги валидира докато достигне върха на блокчейна.</translation>
+    </message>
+    <message>
+        <source>Unknown. Syncing Headers (%1, %2%)…</source>
+        <translation>Неизвестно. Синхронизиране на хедъри (%1, %2%)…</translation>
+    </message>
+</context>
 <context>
     <name>OpenURIDialog</name>
     <message>
@@ -1347,10 +1674,37 @@
         <source>URI:</source>
         <translation>URI:</translation>
     </message>
+    <message>
+        <source>Paste address from clipboard</source>
+        <extracomment>Tooltip text for button that allows you to paste an address that is in your clipboard.</extracomment>
+        <translation>Постави адрес от клипборда</translation>
+    </message>
 </context>
 <context>
     <name>OpenWalletActivity</name>
-    </context>
+    <message>
+        <source>Open wallet failed</source>
+        <translation>Неуспешно отваряне на портфейл</translation>
+    </message>
+    <message>
+        <source>Open wallet warning</source>
+        <translation>Предупреждение при отваряне на портфейл</translation>
+    </message>
+    <message>
+        <source>default wallet</source>
+        <translation>портфейл по подразбиране</translation>
+    </message>
+    <message>
+        <source>Open Wallet</source>
+        <extracomment>Title of window indicating the progress of opening of a wallet.</extracomment>
+        <translation>Отвори портфейл</translation>
+    </message>
+    <message>
+        <source>Opening Wallet &lt;b&gt;%1&lt;/b&gt;…</source>
+        <extracomment>Descriptive text of the open wallet progress window which indicates to the user which wallet is currently being opened.</extracomment>
+        <translation>Отваряне на портфейл &lt;b&gt;%1&lt;/b&gt;…</translation>
+    </message>
+</context>
 <context>
     <name>OptionsDialog</name>
     <message>
@@ -1382,36 +1736,116 @@
         <translation>&amp;Външен вид</translation>
     </message>
     <message>
-        <source>Show additional tab listing all your masternodes in first sub-tab&lt;br/&gt;and all masternodes on the network in second sub-tab.</source>
-        <translation>Показване на допълнителен раздел показваш всичките Ви masternodes  в първият подраздел&lt;br/&gt;и всички masternodes в мрежата във вторият подраздел.</translation>
+        <source>Show the icon in the system tray.</source>
+        <translation>Покажи иконата в системния трей.</translation>
     </message>
     <message>
-        <source>Show Masternodes Tab</source>
-        <translation>Показване на раздел Masternodes </translation>
+        <source>&amp;Show tray icon</source>
+        <translation>&amp;Покажи икона в трея</translation>
     </message>
     <message>
-        <source>If you disable the spending of unconfirmed change, the change from a transaction&lt;br/&gt;cannot be used until that transaction has at least one confirmation.&lt;br/&gt;This also affects how your balance is computed.</source>
-        <translation>Ако деактивирате харченето на непотвърдено ресто, рестото от транзакция&lt;br/&gt; няма да може да се използва преди да бъде получено поне едно потвърждение. &lt;br/&gt;Това се отразява и на начина на изчисление на баланса ви.</translation>
+        <source>Prune &amp;block storage to</source>
+        <translation>Подрежи &amp;хранилището на блокове до</translation>
     </message>
     <message>
-        <source>Show mixing interface on Overview screen and reveal an additional screen which allows to spend fully mixed coins only.&lt;br/&gt;A new tab with more settings will also appear in this dialog, please make sure to check them before mixing your coins.</source>
-        <translation>Показване на интерфейса за смесване  в основния прозорец и показване на допълнителен процорез, който позволява да се харчат само напълно смесени монети.&lt;br/&gt; В този диалогов прозорец ще се появи и нов раздел с повече настройки, моля не забравяйте да ги проверите, преди да смесите монетите си. </translation>
+        <source>GB</source>
+        <translation>GB</translation>
     </message>
     <message>
-        <source>Show additional information and buttons on overview screen.</source>
-        <translation>Показване на допълнителна информация и бутони на основния екран.</translation>
+        <source>Reverting this setting requires re-downloading the entire blockchain.</source>
+        <translation>Връщането на тази настройка изисква повторно изтегляне на целия блокчейн.</translation>
     </message>
     <message>
-        <source>Enable advanced interface</source>
-        <translation>Включване на интерфейс за напреднали</translation>
+        <source>Maximum database cache size. A larger cache can contribute to faster sync, after which the benefit is less pronounced for most use cases. Lowering the cache size will reduce memory usage. Unused mempool memory is shared for this cache.</source>
+        <extracomment>Tooltip text for Options window setting that sets the size of the database cache. Explains the corresponding effects of increasing/decreasing this value.</extracomment>
+        <translation>Максимален размер на кеша на базата данни. По-голям кеш може да допринесе за по-бърза синхронизация, след което ползата е по-малко изразена за повечето случаи на употреба. Намаляването на размера на кеша ще намали използването на паметта. Неизползваната mempool памет се споделя за този кеш.</translation>
     </message>
     <message>
-        <source>Show system popups for mixing transactions&lt;br/&gt;just like for all other transaction types.</source>
-        <translation>Показване на изскачащи прозорци за смесване на транзакции&lt;br/&gt;също както за всички други видове транзакции.</translation>
+        <source>MiB</source>
+        <translation>MiB</translation>
     </message>
     <message>
-        <source>Show popups for mixing transactions</source>
-        <translation>Показване на изскачащи прозорци за смесените транзакции</translation>
+        <source>Set the number of script verification threads. Negative values correspond to the number of cores you want to leave free to the system.</source>
+        <extracomment>Tooltip text for Options window setting that sets the number of script verification threads. Explains that negative values mean to leave these many cores free to the system.</extracomment>
+        <translation>Задайте броя нишки за проверка на скриптове. Отрицателните стойности съответстват на броя ядра, които искате да оставите свободни за системата.</translation>
+    </message>
+    <message>
+        <source>This allows you or a third party tool to communicate with the node through command-line and JSON-RPC commands.</source>
+        <extracomment>Tooltip text for Options window setting that enables the RPC server.</extracomment>
+        <translation>Това позволява на вас или на инструмент на трета страна да комуникирате с възела чрез командната линия и JSON-RPC команди.</translation>
+    </message>
+    <message>
+        <source>Enable R&amp;PC server</source>
+        <extracomment>An Options window setting to enable the RPC server.</extracomment>
+        <translation>Активирай R&amp;PC сървър</translation>
+    </message>
+    <message>
+        <source>Whether to set subtract fee from amount as default or not.</source>
+        <extracomment>Tooltip text for Options window setting that sets subtracting the fee from a sending amount as default.</extracomment>
+        <translation>Дали да се задава изваждане на таксата от сумата по подразбиране или не.</translation>
+    </message>
+    <message>
+        <source>Subtract &amp;fee from amount by default</source>
+        <extracomment>An Options window setting to set subtracting the fee from a sending amount as default.</extracomment>
+        <translation>Извади &amp;таксата от сумата по подразбиране</translation>
+    </message>
+    <message>
+        <source>Enable &amp;PSBT controls</source>
+        <extracomment>An options window setting to enable PSBT controls.</extracomment>
+        <translation>Активирай &amp;PSBT контроли</translation>
+    </message>
+    <message>
+        <source>Whether to show PSBT controls.</source>
+        <extracomment>Tooltip text for options window setting that enables PSBT controls.</extracomment>
+        <translation>Дали да се показват PSBT контроли.</translation>
+    </message>
+    <message>
+        <source>Whether to keep the specified custom change address or not.</source>
+        <translation>Дали да се запази посоченият персонализиран адрес за ресто или не.</translation>
+    </message>
+    <message>
+        <source>Keep custom change &amp;address</source>
+        <translation>Запази персонализиран &amp;адрес за ресто</translation>
+    </message>
+    <message>
+        <source>Show additional tab listing all your masternodes in first sub-tab&lt;br/&gt;and all masternodes on the network in second sub-tab.</source>
+        <translation>Показване на допълнителен раздел показваш всичките Ви masternodes  в първият подраздел&lt;br/&gt;и всички masternodes в мрежата във вторият подраздел.</translation>
+    </message>
+    <message>
+        <source>Show Masternodes Tab</source>
+        <translation>Показване на раздел Masternodes </translation>
+    </message>
+    <message>
+        <source>Show additional tab listing governance proposals.</source>
+        <translation>Покажи допълнителен раздел със списък на предложенията за управление.</translation>
+    </message>
+    <message>
+        <source>Show Governance Tab</source>
+        <translation>Покажи раздел Управление</translation>
+    </message>
+    <message>
+        <source>If you disable the spending of unconfirmed change, the change from a transaction&lt;br/&gt;cannot be used until that transaction has at least one confirmation.&lt;br/&gt;This also affects how your balance is computed.</source>
+        <translation>Ако деактивирате харченето на непотвърдено ресто, рестото от транзакция&lt;br/&gt; няма да може да се използва преди да бъде получено поне едно потвърждение. &lt;br/&gt;Това се отразява и на начина на изчисление на баланса ви.</translation>
+    </message>
+    <message>
+        <source>Show mixing interface on Overview screen and reveal an additional screen which allows to spend fully mixed coins only.&lt;br/&gt;A new tab with more settings will also appear in this dialog, please make sure to check them before mixing your coins.</source>
+        <translation>Показване на интерфейса за смесване  в основния прозорец и показване на допълнителен процорез, който позволява да се харчат само напълно смесени монети.&lt;br/&gt; В този диалогов прозорец ще се появи и нов раздел с повече настройки, моля не забравяйте да ги проверите, преди да смесите монетите си. </translation>
+    </message>
+    <message>
+        <source>Show additional information and buttons on overview screen.</source>
+        <translation>Показване на допълнителна информация и бутони на основния екран.</translation>
+    </message>
+    <message>
+        <source>Enable advanced interface</source>
+        <translation>Включване на интерфейс за напреднали</translation>
+    </message>
+    <message>
+        <source>Show system popups for mixing transactions&lt;br/&gt;just like for all other transaction types.</source>
+        <translation>Показване на изскачащи прозорци за смесване на транзакции&lt;br/&gt;също както за всички други видове транзакции.</translation>
+    </message>
+    <message>
+        <source>Show popups for mixing transactions</source>
+        <translation>Показване на изскачащи прозорци за смесените транзакции</translation>
     </message>
     <message>
         <source>Show warning dialog when the wallet has very low number of keys left.</source>
@@ -1429,6 +1863,14 @@
         <source>Enable &amp;multi-session</source>
         <translation>Включи  &amp;мулти-сесия</translation>
     </message>
+    <message>
+        <source>Use this many separate masternodes in parallel to mix funds.&lt;br/&gt;Note: You must use this feature carefully.&lt;br/&gt;Make sure you always have recent wallet (auto)backup in a safe place!</source>
+        <translation>Използвай толкова отделни masternodes паралелно за смесване на средства.&lt;br/&gt;Забележка: Трябва да използвате тази функция внимателно.&lt;br/&gt;Уверете се, че винаги имате скорошно (авто)резервно копие на портфейла на безопасно място!</translation>
+    </message>
+    <message>
+        <source>Parallel sessions</source>
+        <translation>Паралелни сесии</translation>
+    </message>
     <message>
         <source>Mixing rounds</source>
         <translation>Цикли на смесване</translation>
@@ -1441,10 +1883,38 @@
         <source>Target balance</source>
         <translation>Желан баланс</translation>
     </message>
+    <message>
+        <source>How many inputs of each denominated amount are created.&lt;br/&gt;Lower these numbers if you want fewer smaller denominations.</source>
+        <translation>Колко входа от всяка деноминирана сума се създават.&lt;br/&gt;Намалете тези числа, ако искате по-малко по-малки деноминации.</translation>
+    </message>
+    <message>
+        <source>Inputs per denomination</source>
+        <translation>Входове на деноминация</translation>
+    </message>
+    <message>
+        <source>Try to create at least this many inputs for each denominated amount.&lt;br/&gt;Lower this number if you want fewer smaller denominations.</source>
+        <translation>Опитайте се да създадете поне толкова входа за всяка деноминирана сума.&lt;br/&gt;Намалете това число, ако искате по-малко по-малки деноминации.</translation>
+    </message>
+    <message>
+        <source>Target</source>
+        <translation>Цел</translation>
+    </message>
+    <message>
+        <source>Create up to this many inputs for each denominated amount.&lt;br/&gt;Lower this number if you want fewer smaller denominations.</source>
+        <translation>Създайте до толкова входа за всяка деноминирана сума.&lt;br/&gt;Намалете това число, ако искате по-малко по-малки деноминации.</translation>
+    </message>
+    <message>
+        <source>Maximum</source>
+        <translation>Максимум</translation>
+    </message>
     <message>
         <source>Automatically open the Dash Core client port on the router. This only works when your router supports UPnP and it is enabled.</source>
         <translation>Автоматично отваря порта за Dash Core клиента в маршрутизатора. Това работи само когато вашият маршрутизатор поддържа UPnP и той е разрешен.</translation>
     </message>
+    <message>
+        <source>Map port using NA&amp;T-PMP</source>
+        <translation>Мапвай порт използвайки NA&amp;T-PMP</translation>
+    </message>
     <message>
         <source>Accept connections from outside.</source>
         <translation>Приеми връзки отвън</translation>
@@ -1466,16 +1936,26 @@
         <translation>Показва ако зададеното по подразбиране SOCKS5 proxy се използва за намиране на пиъри чрез тази мрежа.</translation>
     </message>
     <message>
-        <source>Minimize instead of exit the application when the window is closed. When this option is enabled, the application will be closed only after selecting Exit in the menu.</source>
-        <translation>При затваряне на прозореца приложението остава минимизирано. Ако изберете тази опция, приложението може да се затвори само чрез Изход в менюто.</translation>
+        <source>Language missing or translation incomplete? Help contributing translations here:
+https://explore.transifex.com/dash/dash/</source>
+        <translation>Липсва език или преводът е непълен? Помогнете с принос за преводи тук:
+https://explore.transifex.com/dash/dash/</translation>
     </message>
     <message>
-        <source>Third party URLs (e.g. a block explorer) that appear in the transactions tab as context menu items.&lt;br/&gt;%s in the URL is replaced by transaction hash. Multiple URLs are separated by vertical bar |.</source>
-        <translation>URL адреси на трети страни (например block Explorer), които се появяват в раздела с транзакции, като елементи от контекстното меню. %s в URL е заменен с хеша на транзакцията. Отделните URL адреси са разделени с вертикална линия |.</translation>
+        <source>Third-party URLs (e.g. a block explorer) that appear in the transactions tab as context menu items.&lt;br/&gt;%s in the URL is replaced by transaction hash. Multiple URLs are separated by vertical bar |.</source>
+        <translation>URL адреси на трети страни (напр. block explorer), които се появяват в раздела транзакции като елементи от контекстното меню.&lt;br/&gt;%s в URL адреса се заменя с хеш на транзакцията. Множество URL адреси се разделят с вертикална черта |.</translation>
     </message>
     <message>
-        <source>&amp;Third party transaction URLs</source>
-        <translation>&amp;URL транзакции на трети страни</translation>
+        <source>&amp;Third-party transaction URLs</source>
+        <translation>&amp;URL адреси на транзакции на трети страни</translation>
+    </message>
+    <message>
+        <source>Options set in this dialog are overridden by the command line or in the configuration file:</source>
+        <translation>Опциите зададени в този диалог се заменят от командния ред или в конфигурационния файл:</translation>
+    </message>
+    <message>
+        <source>Minimize instead of exit the application when the window is closed. When this option is enabled, the application will be closed only after selecting Exit in the menu.</source>
+        <translation>При затваряне на прозореца приложението остава минимизирано. Ако изберете тази опция, приложението може да се затвори само чрез Изход в менюто.</translation>
     </message>
     <message>
         <source>Whether to show coin control features or not.</source>
@@ -1505,13 +1985,21 @@
         <source>&amp;Network</source>
         <translation>&amp;Мрежа</translation>
     </message>
+    <message>
+        <source>Enabling pruning significantly reduces the disk space required to store transactions. All blocks are still fully validated. Reverting this setting requires re-downloading the entire blockchain.</source>
+        <translation>Активирането на подрязването значително намалява дисковото пространство необходимо за съхранение на транзакции. Всички блокове все още са напълно валидирани. Връщането на тази настройка изисква повторно изтегляне на целия блокчейн.</translation>
+    </message>
     <message>
         <source>Map port using &amp;UPnP</source>
         <translation>Отваряне на входящия порт чрез &amp;UPnP</translation>
     </message>
+    <message>
+        <source>Automatically open the Dash Core client port on the router. This only works when your router supports NAT-PMP and it is enabled. The external port could be random.</source>
+        <translation>Автоматично отвори порта на Dash Core клиента на рутера. Това работи само когато рутерът ви поддържа NAT-PMP и е активиран. Външният порт може да бъде случаен.</translation>
+    </message>
     <message>
         <source>Proxy &amp;IP:</source>
-        <translation>Прокси &amp; IP:</translation>
+        <translation>Прокси &amp;IP:</translation>
     </message>
     <message>
         <source>IP address of the proxy (e.g. IPv4: 127.0.0.1 / IPv6: ::1)</source>
@@ -1557,6 +2045,14 @@
         <source>&amp;Display</source>
         <translation>&amp;Интерфейс</translation>
     </message>
+    <message>
+        <source>Connect to the Dash network through a separate SOCKS5 proxy for Tor onion services.</source>
+        <translation>Свържи се към Dash мрежата чрез отделен SOCKS5 прокси за Tor onion услуги.</translation>
+    </message>
+    <message>
+        <source>Use separate SOCKS&amp;5 proxy to reach peers via Tor onion services:</source>
+        <translation>Използвай отделен SOCKS&amp;5 прокси за достигане до пиъри чрез Tor onion услуги:</translation>
+    </message>
     <message>
         <source>User Interface &amp;language:</source>
         <translation>Език на потребителски &amp;изглед :</translation>
@@ -1603,14 +2099,22 @@
     </message>
     <message>
         <source>Confirm options reset</source>
+        <extracomment>Window title text of pop-up window shown when the user has chosen to reset options.</extracomment>
         <translation>Потвърди изчистване на настройките</translation>
     </message>
     <message>
         <source>Client restart required to activate changes.</source>
+        <extracomment>Text explaining that the settings changed will not come into effect until the client is restarted.</extracomment>
         <translation>За да влязат в сила промените е необходим рестарт на клиента.</translation>
     </message>
+    <message>
+        <source>Current settings will be backed up at "%1".</source>
+        <extracomment>Text explaining to the user that the client's current settings will be backed up at a specific location. %1 is a stand-in argument for the backup location's path.</extracomment>
+        <translation>Текущите настройки ще бъдат архивирани в "%1".</translation>
+    </message>
     <message>
         <source>Client will be shut down. Do you want to proceed?</source>
+        <extracomment>Text asking the user to confirm if they would like to proceed with a client shutdown.</extracomment>
         <translation>Клиентът ще бъде изключен, искате ли да продължите?</translation>
     </message>
     <message>
@@ -1748,6 +2252,10 @@
         <source>%1 Balance</source>
         <translation>%1 Баланс</translation>
     </message>
+    <message>
+        <source>Discreet mode activated for the Overview tab. To unmask the values, uncheck Settings-&gt;Discreet mode.</source>
+        <translation>Дискретен режим активиран за раздела Общ преглед. За да покажете стойностите, премахнете отметката от Настройки-&gt;Дискретен режим.</translation>
+    </message>
     <message numerus="yes">
         <source>%n Rounds</source>
         <translation><numerusform>%n Цикли</numerusform><numerusform>%n Цикли</numerusform></translation>
@@ -1847,7 +2355,140 @@
 </context>
 <context>
     <name>PSBTOperationsDialog</name>
-    </context>
+    <message>
+        <source>Dialog</source>
+        <translation>Диалог</translation>
+    </message>
+    <message>
+        <source>Sign Tx</source>
+        <translation>Подпиши транзакция</translation>
+    </message>
+    <message>
+        <source>Broadcast Tx</source>
+        <translation>Разпрати транзакция</translation>
+    </message>
+    <message>
+        <source>Copy to Clipboard</source>
+        <translation>Копирай в клипборда</translation>
+    </message>
+    <message>
+        <source>Save…</source>
+        <translation>Запази…</translation>
+    </message>
+    <message>
+        <source>Close</source>
+        <translation>Затвори</translation>
+    </message>
+    <message>
+        <source>Failed to load transaction: %1</source>
+        <translation>Неуспешно зареждане на транзакция: %1</translation>
+    </message>
+    <message>
+        <source>Failed to sign transaction: %1</source>
+        <translation>Неуспешно подписване на транзакция: %1</translation>
+    </message>
+    <message>
+        <source>Cannot sign inputs while wallet is locked.</source>
+        <translation>Не могат да се подпишат входове докато портфейлът е заключен.</translation>
+    </message>
+    <message>
+        <source>Could not sign any more inputs.</source>
+        <translation>Не могат да се подпишат повече входове.</translation>
+    </message>
+    <message>
+        <source>Signed %1 inputs, but more signatures are still required.</source>
+        <translation>Подписани %1 входа, но все още са необходими повече подписи.</translation>
+    </message>
+    <message>
+        <source>Signed transaction successfully. Transaction is ready to broadcast.</source>
+        <translation>Транзакцията е подписана успешно. Транзакцията е готова за разпращане.</translation>
+    </message>
+    <message>
+        <source>Unknown error processing transaction.</source>
+        <translation>Неизвестна грешка при обработка на транзакцията.</translation>
+    </message>
+    <message>
+        <source>Transaction broadcast successfully! Transaction ID: %1</source>
+        <translation>Транзакцията е разпратена успешно! ID на транзакцията: %1</translation>
+    </message>
+    <message>
+        <source>Transaction broadcast failed: %1</source>
+        <translation>Разпращането на транзакцията се провали: %1</translation>
+    </message>
+    <message>
+        <source>PSBT copied to clipboard.</source>
+        <translation>PSBT е копиран в клипборда.</translation>
+    </message>
+    <message>
+        <source>Save Transaction Data</source>
+        <translation>Запази данни за транзакцията</translation>
+    </message>
+    <message>
+        <source>Partially Signed Transaction (Binary)</source>
+        <extracomment>Expanded name of the binary PSBT file format. See: BIP 174.</extracomment>
+        <translation>Частично подписана транзакция (двоична)</translation>
+    </message>
+    <message>
+        <source>PSBT saved to disk.</source>
+        <translation>PSBT запазен на диска.</translation>
+    </message>
+    <message>
+        <source> * Sends %1 to %2</source>
+        <translation> * Изпраща %1 до %2</translation>
+    </message>
+    <message>
+        <source>own address</source>
+        <translation>собствен адрес</translation>
+    </message>
+    <message>
+        <source>Unable to calculate transaction fee or total transaction amount.</source>
+        <translation>Невъзможно е да се изчисли таксата на транзакцията или общата сума на транзакцията.</translation>
+    </message>
+    <message>
+        <source>Pays transaction fee: </source>
+        <translation>Плаща такса за транзакция: </translation>
+    </message>
+    <message>
+        <source>Total Amount</source>
+        <translation>Обща сума</translation>
+    </message>
+    <message>
+        <source>or</source>
+        <translation>или</translation>
+    </message>
+    <message>
+        <source>Transaction has %1 unsigned inputs.</source>
+        <translation>Транзакцията има %1 неподписани входа.</translation>
+    </message>
+    <message>
+        <source>Transaction is missing some information about inputs.</source>
+        <translation>На транзакцията липсва информация за входовете.</translation>
+    </message>
+    <message>
+        <source>Transaction still needs signature(s).</source>
+        <translation>Транзакцията все още се нуждае от подпис(и).</translation>
+    </message>
+    <message>
+        <source>(But no wallet is loaded.)</source>
+        <translation>(Но не е зареден портфейл.)</translation>
+    </message>
+    <message>
+        <source>(But this wallet cannot sign transactions.)</source>
+        <translation>(Но този портфейл не може да подписва транзакции.)</translation>
+    </message>
+    <message>
+        <source>(But this wallet does not have the right keys.)</source>
+        <translation>(Но този портфейл няма правилните ключове.)</translation>
+    </message>
+    <message>
+        <source>Transaction is fully signed and ready for broadcast.</source>
+        <translation>Транзакцията е напълно подписана и готова за разпращане.</translation>
+    </message>
+    <message>
+        <source>Transaction status is unknown.</source>
+        <translation>Статусът на транзакцията е неизвестен.</translation>
+    </message>
+</context>
 <context>
     <name>PaymentServer</name>
     <message>
@@ -1866,6 +2507,12 @@
         <source>'dash://' is not a valid URI. Use 'dash:' instead.</source>
         <translation>'dash://' не е валиден URI. Използвайте 'dash:' вместо това.</translation>
     </message>
+    <message>
+        <source>Cannot process payment request as BIP70 is no longer supported.
+Due to discontinued support, you should request the merchant to provide you with a BIP21 compatible URI or use a wallet that does continue to support BIP70.</source>
+        <translation>Не може да се обработи заявка за плащане, тъй като BIP70 вече не се поддържа.
+Поради прекратената поддръжка, трябва да поискате от търговеца да ви предостави BIP21 съвместимо URI или да използвате портфейл, който продължава да поддържа BIP70.</translation>
+    </message>
     <message>
         <source>URI cannot be parsed! This can be caused by an invalid Dash address or malformed URI parameters.</source>
         <translation>Грешка при анализ на URI! Това може да е следствие от неправилен Dash адрес или неправилно зададени URI параметри.</translation>
@@ -1887,6 +2534,26 @@
         <extracomment>Title of Peers Table column which indicates the current latency of the connection with the peer.</extracomment>
         <translation>Пинг</translation>
     </message>
+    <message>
+        <source>Peer</source>
+        <extracomment>Title of Peers Table column which contains a unique number used to identify a connection.</extracomment>
+        <translation>Клиентът ще бъде изключен. Искате ли да продължите?</translation>
+    </message>
+    <message>
+        <source>Age</source>
+        <extracomment>Title of Peers Table column which indicates the duration (length of time) since the peer connection started.</extracomment>
+        <translation>Възраст</translation>
+    </message>
+    <message>
+        <source>Direction</source>
+        <extracomment>Title of Peers Table column which indicates the direction the peer connection was initiated from.</extracomment>
+        <translation>Посока</translation>
+    </message>
+    <message>
+        <source>Type</source>
+        <extracomment>Title of Peers Table column which describes the type of peer connection. The "type" describes why the connection exists.</extracomment>
+        <translation>Тип</translation>
+    </message>
     <message>
         <source>Sent</source>
         <extracomment>Title of Peers Table column which indicates the total amount of network information we have sent to the peer.</extracomment>
@@ -1897,15 +2564,264 @@
         <extracomment>Title of Peers Table column which indicates the total amount of network information we have received from the peer.</extracomment>
         <translation>Получени</translation>
     </message>
-    </context>
+    <message>
+        <source>Address</source>
+        <extracomment>Title of Peers Table column which contains the IP/Onion/I2P address of the connected peer.</extracomment>
+        <translation>Тип</translation>
+    </message>
+    <message>
+        <source>Network</source>
+        <extracomment>Title of Peers Table column which states the network the peer connected through.</extracomment>
+        <translation>Мрежа</translation>
+    </message>
+    <message>
+        <source>Inbound</source>
+        <extracomment>An Inbound Connection from a Peer.</extracomment>
+        <translation>Входящ</translation>
+    </message>
+    <message>
+        <source>Outbound</source>
+        <extracomment>An Outbound Connection to a Peer.</extracomment>
+        <translation>Изходящ</translation>
+    </message>
+</context>
 <context>
     <name>Proposal</name>
-    </context>
+    <message>
+        <source>Passing +%1</source>
+        <translation>Преминаващ +%1</translation>
+    </message>
+    <message>
+        <source>Needs additional %1 votes</source>
+        <translation>Нужда от допълнителни %1 гласа</translation>
+    </message>
+</context>
 <context>
     <name>ProposalModel</name>
-    </context>
+    <message>
+        <source>Yes</source>
+        <translation>Да</translation>
+    </message>
+    <message>
+        <source>No</source>
+        <translation>Не</translation>
+    </message>
+    <message>
+        <source>Hash</source>
+        <translation>Хеш</translation>
+    </message>
+    <message>
+        <source>Title</source>
+        <translation>Заглавие</translation>
+    </message>
+    <message>
+        <source>Start</source>
+        <translation>Начало</translation>
+    </message>
+    <message>
+        <source>End</source>
+        <translation>Край</translation>
+    </message>
+    <message>
+        <source>Amount</source>
+        <translation>Сума</translation>
+    </message>
+    <message>
+        <source>Active</source>
+        <translation>Активен</translation>
+    </message>
+    <message>
+        <source>Status</source>
+        <translation>Статус</translation>
+    </message>
+</context>
+<context>
+    <name>ProposalWizard</name>
+    <message>
+        <source>Create Governance Proposal</source>
+        <translation>Създай предложение за управление</translation>
+    </message>
+    <message>
+        <source>Enter proposal details</source>
+        <translation>Въведете детайли за предложението</translation>
+    </message>
+    <message>
+        <source>A fee will be burned when you prepare the proposal.</source>
+        <translation>Такса ще бъде изгорена когато подготвите предложението.</translation>
+    </message>
+    <message>
+        <source>Proposal &amp;name</source>
+        <translation>Име на &amp;предложението</translation>
+    </message>
+    <message>
+        <source>&amp;Description URL</source>
+        <translation>URL за &amp;описание</translation>
+    </message>
+    <message>
+        <source>Payment &amp;address</source>
+        <translation>&amp;Адрес за плащане</translation>
+    </message>
+    <message>
+        <source>Payment &amp;amount</source>
+        <translation>&amp;Сума за плащане</translation>
+    </message>
+    <message>
+        <source>The amount to request in a single payment</source>
+        <translation>Сумата за заявка в едно плащане</translation>
+    </message>
+    <message>
+        <source>&amp;First payment</source>
+        <translation>&amp;Първо плащане</translation>
+    </message>
+    <message>
+        <source>Pa&amp;yments</source>
+        <translation>Пла&amp;щания</translation>
+    </message>
+    <message>
+        <source>To&amp;tal amount</source>
+        <translation>Об&amp;ща сума</translation>
+    </message>
+    <message>
+        <source>Proposal &amp;fee</source>
+        <translation>&amp;Такса на предложението</translation>
+    </message>
+    <message>
+        <source>Next</source>
+        <translation>Напред</translation>
+    </message>
+    <message>
+        <source>Review proposal JSON and validate.</source>
+        <translation>Прегледайте JSON на предложението и валидирайте.</translation>
+    </message>
+    <message>
+        <source>Hex-encoded JSON</source>
+        <translation>Hex-кодиран JSON</translation>
+    </message>
+    <message>
+        <source>Back</source>
+        <translation>Назад</translation>
+    </message>
+    <message>
+        <source>Validate</source>
+        <translation>Валидирай</translation>
+    </message>
+    <message>
+        <source>Prepare (burn fee) and wait for confirmations.</source>
+        <translation>Подгответе (изгорете такса) и изчакайте потвърждения.</translation>
+    </message>
+    <message>
+        <source>Copy</source>
+        <translation>Копирай</translation>
+    </message>
+    <message>
+        <source>At 1/6 confirmations: can be relayed and queued. At 6/6: accepted and processed.</source>
+        <translation>При 1/6 потвърждения: може да се препрати и добави в опашката. При 6/6: приета и обработена.</translation>
+    </message>
+    <message>
+        <source>Confirmations progress</source>
+        <translation>Напредък на потвържденията</translation>
+    </message>
+    <message>
+        <source>Shows progress toward the required number of confirmations for the proposal fee transaction.</source>
+        <translation>Показва напредъка към необходимия брой потвърждения за транзакцията с таксата на предложението.</translation>
+    </message>
+    <message>
+        <source>Estimated time remaining: -</source>
+        <translation>Приблизително оставащо време: -</translation>
+    </message>
+    <message>
+        <source>Prepare Proposal</source>
+        <translation>Подгответе предложението</translation>
+    </message>
+    <message>
+        <source>You can submit after 1 confirmation. At 6 confirmations it is accepted and processed.</source>
+        <translation>Можете да подадете след 1 потвърждение. При 6 потвърждения се приема и обработва.</translation>
+    </message>
+    <message>
+        <source>Proposal ID:</source>
+        <translation>ID на предложението:</translation>
+    </message>
+    <message>
+        <source>Submit Proposal</source>
+        <translation>Подайте предложение</translation>
+    </message>
+    <message>
+        <source>Close</source>
+        <translation>Затвори</translation>
+    </message>
+    <message>
+        <source>Valid</source>
+        <translation>Валиден</translation>
+    </message>
+    <message>
+        <source>Invalid: %1</source>
+        <translation>Невалиден: %1</translation>
+    </message>
+    <message>
+        <source>Burn %1</source>
+        <translation>Изгори %1</translation>
+    </message>
+    <message>
+        <source>Burn %1 to create the fee transaction?</source>
+        <translation>Изгори %1 за създаване на транзакция за такса?</translation>
+    </message>
+    <message>
+        <source>Prepare failed</source>
+        <translation>Подготовката се провали</translation>
+    </message>
+    <message>
+        <source>Confirmations: %1 / %2 required</source>
+        <translation>Потвърждения: %1 / %2 необходими</translation>
+    </message>
+    <message>
+        <source>Estimated time remaining: Ready</source>
+        <translation>Оценено оставащо време: Готово</translation>
+    </message>
+    <message numerus="yes">
+        <source>Estimated time remaining: %n minute(s)</source>
+        <translation><numerusform>Оценено оставащо време: %n минута</numerusform><numerusform>Оценено оставащо време: %n минути</numerusform></translation>
+    </message>
+    <message>
+        <source>Your proposal was submitted successfully.</source>
+        <translation>Вашето предложение е подадено успешно.</translation>
+    </message>
+    <message>
+        <source>Already submitted</source>
+        <translation>Вече подадено</translation>
+    </message>
+    <message>
+        <source>This proposal has already been submitted.</source>
+        <translation>Това предложение вече е подадено.</translation>
+    </message>
+    <message>
+        <source>Submission failed</source>
+        <translation>Подаването се провали</translation>
+    </message>
+    <message>
+        <source>Proposal submitted</source>
+        <translation>Предложението е подадено</translation>
+    </message>
+    <message>
+        <source>A fee of %1 will be burned when you prepare the proposal.</source>
+        <translation>Такса от %1 ще бъде изгорена, когато подготвите предложението.</translation>
+    </message>
+    <message>
+        <source>Prepare (burn %1) and wait for %2 confirmations.</source>
+        <translation>Подготви (изгори %1) и изчакай %2 потвърждения.</translation>
+    </message>
+</context>
 <context>
     <name>QObject</name>
+    <message>
+        <source>Do you want to reset settings to default values, or to abort without making changes?</source>
+        <extracomment>Explanatory text shown on startup when the settings file cannot be read. Prompts user to make a choice between resetting or aborting.</extracomment>
+        <translation>Искате ли да възстановите настройките до стойностите по подразбиране или да прекратите без да правите промени?</translation>
+    </message>
+    <message>
+        <source>A fatal error occurred. Check that settings file is writable, or try running with -nosettings.</source>
+        <extracomment>Explanatory text shown on startup when the settings file could not be written. Prompts user to check that we have the ability to write to the file. Explains that the user has the option of running without a settings file.</extracomment>
+        <translation>Възраст</translation>
+    </message>
     <message>
         <source>Choose data directory on startup (default: %u)</source>
         <translation>Изберете папка за данни при стартиране (по подразбиране: %u)</translation>
@@ -1942,6 +2858,46 @@
         <source>Show splash screen on startup (default: %u)</source>
         <translation>Покажи начален екран при стартиране (по подразбиране: %u)</translation>
     </message>
+    <message>
+        <source>Error: Specified data directory "%1" does not exist.</source>
+        <translation>Грешка: Посочената директория за данни "%1" не съществува.</translation>
+    </message>
+    <message>
+        <source>Error: Cannot parse configuration file: %1.</source>
+        <translation>Грешка: Не може да се анализира конфигурационен файл: %1.</translation>
+    </message>
+    <message>
+        <source>Error: %1</source>
+        <translation>Грешка: %1</translation>
+    </message>
+    <message>
+        <source>Error: Failed to load application fonts.</source>
+        <translation>Грешка: Неуспешно зареждане на шрифтовете на приложението.</translation>
+    </message>
+    <message>
+        <source>Error: Specified font-family invalid. Valid values: %1.</source>
+        <translation>Грешка: Посоченото семейство шрифтове е невалидно. Валидни стойности: %1.</translation>
+    </message>
+    <message>
+        <source>Error: Specified font-weight-normal invalid. Valid range %1 to %2.</source>
+        <translation>Грешка: Посочената font-weight-normal е невалидна. Валиден обхват %1 до %2.</translation>
+    </message>
+    <message>
+        <source>Error: Specified font-weight-bold invalid. Valid range %1 to %2.</source>
+        <translation>Грешка: Посочената font-weight-bold е невалидна. Валиден обхват %1 до %2.</translation>
+    </message>
+    <message>
+        <source>Error: Specified font-scale invalid. Valid range %1 to %2.</source>
+        <translation>Грешка: Посочената font-scale е невалидна. Валиден обхват %1 до %2.</translation>
+    </message>
+    <message>
+        <source>Error: Invalid -custom-css-dir path.</source>
+        <translation>Грешка: Невалиден път за -custom-css-dir.</translation>
+    </message>
+    <message>
+        <source>Error: %1 CSS file(s) missing in -custom-css-dir path.</source>
+        <translation>Грешка: %1 CSS файл(ове) липсват в пътя -custom-css-dir.</translation>
+    </message>
     <message>
         <source>%1 didn't yet exit safely…</source>
         <translation>%1 все още не е излязъл безопастно…</translation>
@@ -1966,6 +2922,53 @@
         <source>This can also be adjusted later in the "Appearance" tab of the preferences.</source>
         <translation>Това може да бъде настроено по-късно от "Изглед" таб в настройките.</translation>
     </message>
+    <message>
+        <source>Ctrl+W</source>
+        <translation>Ctrl+W</translation>
+    </message>
+    <message>
+        <source>Unroutable</source>
+        <translation>Немаршрутизируем</translation>
+    </message>
+    <message>
+        <source>Internal</source>
+        <translation>Вътрешен</translation>
+    </message>
+    <message>
+        <source>Inbound</source>
+        <extracomment>An inbound connection from a peer. An inbound connection is a connection initiated by a peer.</extracomment>
+        <translation>Входящ</translation>
+    </message>
+    <message>
+        <source>Outbound</source>
+        <extracomment>An outbound connection to a peer. An outbound connection is a connection initiated by us.</extracomment>
+        <translation>Изходящ</translation>
+    </message>
+    <message>
+        <source>Full Relay</source>
+        <extracomment>Peer connection type that relays all network information.</extracomment>
+        <translation>Входящ</translation>
+    </message>
+    <message>
+        <source>Block Relay</source>
+        <extracomment>Peer connection type that relays network information about blocks and not transactions or addresses.</extracomment>
+        <translation>Входящ</translation>
+    </message>
+    <message>
+        <source>Manual</source>
+        <extracomment>Peer connection type established manually through one of several methods.</extracomment>
+        <translation>Ръчен</translation>
+    </message>
+    <message>
+        <source>Feeler</source>
+        <extracomment>Short-lived peer connection type that tests the aliveness of known addresses.</extracomment>
+        <translation>Пробващ</translation>
+    </message>
+    <message>
+        <source>Address Fetch</source>
+        <extracomment>Short-lived peer connection type that solicits known addresses from a peer.</extracomment>
+        <translation>Взимане на адреси</translation>
+    </message>
     <message>
         <source>%1 d</source>
         <translation>%1 дни</translation>
@@ -2027,8 +3030,8 @@
         <translation>%1 Б</translation>
     </message>
     <message>
-        <source>%1 KB</source>
-        <translation>%1 КБ</translation>
+        <source>%1 kB</source>
+        <translation>%1 kB</translation>
     </message>
     <message>
         <source>%1 MB</source>
@@ -2068,11 +3071,28 @@
         <source>&amp;Copy Image</source>
         <translation>&amp;Копирай изображението</translation>
     </message>
+    <message>
+        <source>Resulting URI too long, try to reduce the text for label / message.</source>
+        <translation>Получените URI е твърде дълъг, опитайте се да намалите текста за наименование / съобщение.</translation>
+    </message>
+    <message>
+        <source>Error encoding URI into QR Code.</source>
+        <translation>Грешка при кодиране на URI в QR код.</translation>
+    </message>
+    <message>
+        <source>QR code support not available.</source>
+        <translation>Поддръжката на QR код не е налична.</translation>
+    </message>
     <message>
         <source>Save QR Code</source>
         <translation>Запази QR Кода</translation>
     </message>
-    </context>
+    <message>
+        <source>PNG Image</source>
+        <extracomment>Expanded name of the PNG file format. See: https://en.wikipedia.org/wiki/Portable_Network_Graphics.</extracomment>
+        <translation>Възраст</translation>
+    </message>
+</context>
 <context>
     <name>RPCConsole</name>
     <message>
@@ -2179,6 +3199,14 @@
         <source>Version</source>
         <translation>Версия</translation>
     </message>
+    <message>
+        <source>High bandwidth BIP152 compact block relay: %1</source>
+        <translation>Препращане на компактни блокове BIP152 с висока честотна лента: %1</translation>
+    </message>
+    <message>
+        <source>High Bandwidth</source>
+        <translation>Висока честотна лента</translation>
+    </message>
     <message>
         <source>Starting Block</source>
         <translation>Начален блок</translation>
@@ -2191,6 +3219,51 @@
         <source>Synced Blocks</source>
         <translation>Синхронизирани блокове</translation>
     </message>
+    <message>
+        <source>Elapsed time since a novel block passing initial validity checks was received from this peer.</source>
+        <translation>Изминало време откакто нов блок преминал първоначални проверки за валидност беше получен от този пиър.</translation>
+    </message>
+    <message>
+        <source>Last Block</source>
+        <translation>Последен блок</translation>
+    </message>
+    <message>
+        <source>Elapsed time since a novel transaction accepted into our mempool was received from this peer.</source>
+        <extracomment>Tooltip text for the Last Transaction field in the peer details area.</extracomment>
+        <translation>Изминало време от получаването на нова транзакция приета в нашия mempool от този пиър.</translation>
+    </message>
+    <message>
+        <source>Last Transaction</source>
+        <translation>Последна транзакция</translation>
+    </message>
+    <message>
+        <source>The mapped Autonomous System used for diversifying peer selection.</source>
+        <translation>Мапнатата автономна система използвана за диверсификация на избора на пиъри.</translation>
+    </message>
+    <message>
+        <source>Mapped AS</source>
+        <translation>Мапнат AS</translation>
+    </message>
+    <message>
+        <source>Whether we relay addresses to this peer.</source>
+        <extracomment>Tooltip text for the Address Relay field in the peer details area, which displays whether we relay addresses to this peer (Yes/No).</extracomment>
+        <translation>Дали препращаме адреси към този пиър.</translation>
+    </message>
+    <message>
+        <source>Address Relay</source>
+        <extracomment>Text title for the Address Relay field in the peer details area, which displays whether we relay addresses to this peer (Yes/No).</extracomment>
+        <translation>Дали препращаме адреси към този пиър.</translation>
+    </message>
+    <message>
+        <source>Addresses Processed</source>
+        <extracomment>Text title for the Addresses Processed field in the peer details area, which displays the total number of addresses received from this peer that were processed (excludes addresses that were dropped due to rate-limiting).</extracomment>
+        <translation>Обработени адреси</translation>
+    </message>
+    <message>
+        <source>Addresses Rate-Limited</source>
+        <extracomment>Text title for the Addresses Rate-Limited field in the peer details area, which displays the total number of addresses received from this peer that were dropped (not processed) due to rate-limiting.</extracomment>
+        <translation>Адреси с ограничена честота</translation>
+    </message>
     <message>
         <source>Rescan blockchain files 1</source>
         <translation>Повторно сканиране на блокчейн файловете 1</translation>
@@ -2199,6 +3272,10 @@
         <source>Rescan blockchain files 2</source>
         <translation>Повторно сканиране на блокчейн файловете 2</translation>
     </message>
+    <message>
+        <source>The buttons below will restart the wallet with command-line options to repair the wallet, fix issues with corrupt blockchain files or missing/obsolete transactions.</source>
+        <translation>Бутоните по-долу ще рестартират портфейла с опции от командния ред за поправка на портфейла, коригиране на проблеми с повредени блокчейн файлове или липсващи/остарели транзакции.</translation>
+    </message>
     <message>
         <source>-rescan=1: Rescan the block chain for missing wallet transactions starting from wallet creation time.</source>
         <translation>-rescan=1: Повторно сканиране на блокчейна за липсващи транзакции в портфейла, започвайки от времето на създаване на портфейла.</translation>
@@ -2215,10 +3292,50 @@
         <source>Datadir</source>
         <translation>Datadir</translation>
     </message>
+    <message>
+        <source>To specify a non-default location of the data directory use the '%1' option.</source>
+        <translation>За да посочите нестандартна локация на директорията за данни използвайте опцията '%1'.</translation>
+    </message>
+    <message>
+        <source>Blocksdir</source>
+        <translation>Директория за блокове</translation>
+    </message>
+    <message>
+        <source>To specify a non-default location of the blocks directory use the '%1' option.</source>
+        <translation>За да посочите нестандартна локация на директорията за блокове използвайте опцията '%1'.</translation>
+    </message>
+    <message>
+        <source>Local Addresses</source>
+        <translation>Локални адреси</translation>
+    </message>
+    <message>
+        <source>Network addresses that your Dash node is currently using to communicate with other nodes.</source>
+        <translation>Мрежови адреси, които вашият Dash възел в момента използва за комуникация с други възли.</translation>
+    </message>
+    <message>
+        <source>Number of regular Masternodes</source>
+        <translation>Брой обикновени Masternodes</translation>
+    </message>
+    <message>
+        <source>Number of EvoNodes</source>
+        <translation>Брой EvoNodes</translation>
+    </message>
+    <message>
+        <source>Current block height</source>
+        <translation>Текуща височина на блока</translation>
+    </message>
     <message>
         <source>Last block hash</source>
         <translation>Хеш на последният блок</translation>
     </message>
+    <message>
+        <source>Latest ChainLocked block hash</source>
+        <translation>Хеш на последния ChainLocked блок</translation>
+    </message>
+    <message>
+        <source>Latest ChainLocked block height</source>
+        <translation>Височина на последния ChainLocked блок</translation>
+    </message>
     <message>
         <source>Open the %1 debug log file from the current data directory. This can take a few seconds for large log files.</source>
         <translation>Отваря %1 файла за откриване на грешки от текущата папка. Това може да отнеме няколко секунди при по-големи файлове.</translation>
@@ -2251,10 +3368,50 @@
         <source>PoSe Score</source>
         <translation>PoSe точки</translation>
     </message>
+    <message>
+        <source>The transport layer version: %1</source>
+        <translation>Версия на транспортния слой: %1</translation>
+    </message>
+    <message>
+        <source>Transport</source>
+        <translation>Транспорт</translation>
+    </message>
+    <message>
+        <source>The BIP324 session ID string in hex.</source>
+        <translation>BIP324 session ID стринг в hex.</translation>
+    </message>
+    <message>
+        <source>Session ID</source>
+        <translation>ID на сесията</translation>
+    </message>
+    <message>
+        <source>The network protocol this peer is connected through: IPv4, IPv6, Onion, I2P, or CJDNS.</source>
+        <translation>Мрежовият протокол през който този пиър е свързан: IPv4, IPv6, Onion, I2P или CJDNS.</translation>
+    </message>
+    <message>
+        <source>Permissions</source>
+        <translation>Разрешения</translation>
+    </message>
+    <message>
+        <source>The direction and type of peer connection: %1</source>
+        <translation>Посоката и типа на връзката към пиъра: %1</translation>
+    </message>
+    <message>
+        <source>Direction/Type</source>
+        <translation>Посока/Тип</translation>
+    </message>
     <message>
         <source>Services</source>
         <translation>Услуги</translation>
     </message>
+    <message>
+        <source>Whether we relay transactions to this peer.</source>
+        <translation>Дали препращаме транзакции към този пиър.</translation>
+    </message>
+    <message>
+        <source>Transaction Relay</source>
+        <translation>Препращане на транзакции</translation>
+    </message>
     <message>
         <source>Connection Time</source>
         <translation>Време на връзката</translation>
@@ -2291,17 +3448,81 @@
         <source>&amp;Wallet Repair</source>
         <translation>&amp;Поправяне на портфейла</translation>
     </message>
+    <message>
+        <source>The total number of addresses received from this peer that were processed (excludes addresses that were dropped due to rate-limiting).</source>
+        <extracomment>Tooltip text for the Addresses Processed field in the peer details area, which displays the total number of addresses received from this peer that were processed (excludes addresses that were dropped due to rate-limiting).</extracomment>
+        <translation>Възраст</translation>
+    </message>
+    <message>
+        <source>The total number of addresses received from this peer that were dropped (not processed) due to rate-limiting.</source>
+        <extracomment>Tooltip text for the Addresses Rate-Limited field in the peer details area, which displays the total number of addresses received from this peer that were dropped (not processed) due to rate-limiting.</extracomment>
+        <translation>Общият брой адреси получени от този пиър, които са изпуснати (не обработени) поради ограничаване на честотата.</translation>
+    </message>
     <message>
         <source>Wallet repair options.</source>
         <translation>Опции за възстановяване на портфейла.</translation>
     </message>
     <message>
-        <source>Rebuild index</source>
-        <translation>Възстановяване на индекса</translation>
+        <source>Rebuild index</source>
+        <translation>Възстановяване на индекса</translation>
+    </message>
+    <message>
+        <source>-reindex: Rebuild block chain index from current blk000??.dat files.</source>
+        <translation>-reindex: Възстановява блок индекс веригата от настоящия blk000??.dat файл.</translation>
+    </message>
+    <message>
+        <source>Inbound: initiated by peer</source>
+        <extracomment>Explanatory text for an inbound peer connection.</extracomment>
+        <translation>Входяща: инициирана от пиър</translation>
+    </message>
+    <message>
+        <source>Outbound Full Relay: default</source>
+        <extracomment>Explanatory text for an outbound peer connection that relays all network information. This is the default behavior for outbound connections.</extracomment>
+        <translation>Изходящ пълно препращане: по подразбиране</translation>
+    </message>
+    <message>
+        <source>Outbound Block Relay: does not relay transactions or addresses</source>
+        <extracomment>Explanatory text for an outbound peer connection that relays network information about blocks and not transactions or addresses.</extracomment>
+        <translation>Изходящ препращане на блокове: не препраща транзакции или адреси</translation>
+    </message>
+    <message>
+        <source>Outbound Manual: added using RPC %1 or %2/%3 configuration options</source>
+        <extracomment>Explanatory text for an outbound peer connection that was established manually through one of several methods. The numbered arguments are stand-ins for the methods available to establish manual connections.</extracomment>
+        <translation>Изходящ ръчен: добавен чрез RPC %1 или %2/%3 конфигурационни опции</translation>
+    </message>
+    <message>
+        <source>Outbound Feeler: short-lived, for testing addresses</source>
+        <extracomment>Explanatory text for a short-lived outbound peer connection that is used to test the aliveness of known addresses.</extracomment>
+        <translation>Изходящ пробващ: краткотраен, за тестване на адреси</translation>
+    </message>
+    <message>
+        <source>Outbound Address Fetch: short-lived, for soliciting addresses</source>
+        <extracomment>Explanatory text for a short-lived outbound peer connection that is used to request addresses from a peer.</extracomment>
+        <translation>Изходящ взимане на адреси: краткотраен, за искане на адреси</translation>
+    </message>
+    <message>
+        <source>To</source>
+        <translation>До</translation>
+    </message>
+    <message>
+        <source>we selected the peer for high bandwidth relay</source>
+        <translation>избрахме пиъра за препращане с висока честотна лента</translation>
+    </message>
+    <message>
+        <source>From</source>
+        <translation>От</translation>
+    </message>
+    <message>
+        <source>the peer selected us for high bandwidth relay</source>
+        <translation>пиърът ни избра за препращане с висока честотна лента</translation>
+    </message>
+    <message>
+        <source>No</source>
+        <translation>Не</translation>
     </message>
     <message>
-        <source>-reindex: Rebuild block chain index from current blk000??.dat files.</source>
-        <translation>-reindex: Възстановява блок индекс веригата от настоящия blk000??.dat файл.</translation>
+        <source>no high bandwidth relay selected</source>
+        <translation>не е избран препращач с висока честотна лента</translation>
     </message>
     <message>
         <source>&amp;Disconnect</source>
@@ -2315,10 +3536,6 @@
         <source>1 &amp;hour</source>
         <translation>1 &amp;час</translation>
     </message>
-    <message>
-        <source>1 &amp;day</source>
-        <translation>1 &amp;ден</translation>
-    </message>
     <message>
         <source>1 &amp;week</source>
         <translation>1 &amp;седмица</translation>
@@ -2331,26 +3548,6 @@
         <source>&amp;Unban</source>
         <translation>&amp;Премахване на бан</translation>
     </message>
-    <message>
-        <source>Welcome to the %1 RPC console.</source>
-        <translation>Добре дошли в %1 RPC конзолата.</translation>
-    </message>
-    <message>
-        <source>Use up and down arrows to navigate history, and %1 to clear screen.</source>
-        <translation>Използвайте стрелките нагоре и надолу  за разглеждане на историята, и %1 за изчистване на екрана.</translation>
-    </message>
-    <message>
-        <source>Type %1 for an overview of available commands.</source>
-        <translation>Въведи %1 за преглед на наличните команди.</translation>
-    </message>
-    <message>
-        <source>For more information on using this console type %1.</source>
-        <translation>За повече информация при използването на тази конзола въведете %1.</translation>
-    </message>
-    <message>
-        <source>WARNING: Scammers have been active, telling users to type commands here, stealing their wallet contents. Do not use this console without fully understanding the ramifications of a command.</source>
-        <translation>ВНИМАНИЕ: Измамниците са били активни, казвайки на потребителите да въвеждат команди тук, като крадат съдържанието на портфейла им. Не използвайте тази конзола, без да разберете напълно значението на командата.</translation>
-    </message>
     <message>
         <source>In:</source>
         <translation>Вход:</translation>
@@ -2363,6 +3560,10 @@
         <source>Network activity disabled</source>
         <translation>Мрежова активност изключена</translation>
     </message>
+    <message>
+        <source>None</source>
+        <translation>Няма</translation>
+    </message>
     <message>
         <source>Total: %1 (Enabled: %2)</source>
         <translation>Общо: %1 (Включено: %2)</translation>
@@ -2371,10 +3572,105 @@
         <source>Executing command without any wallet</source>
         <translation>Изпълнение на команди без портфейл</translation>
     </message>
+    <message>
+        <source>Ctrl++</source>
+        <extracomment>Main shortcut to increase the RPC console font size.</extracomment>
+        <translation>Изходящ пълно препращане: по подразбиране</translation>
+    </message>
+    <message>
+        <source>Ctrl+=</source>
+        <extracomment>Secondary shortcut to increase the RPC console font size.</extracomment>
+        <translation>Ctrl+=</translation>
+    </message>
+    <message>
+        <source>Ctrl+-</source>
+        <extracomment>Main shortcut to decrease the RPC console font size.</extracomment>
+        <translation>Ctrl+-</translation>
+    </message>
+    <message>
+        <source>Ctrl+_</source>
+        <extracomment>Secondary shortcut to decrease the RPC console font size.</extracomment>
+        <translation>Ctrl+_</translation>
+    </message>
+    <message>
+        <source>Ctrl+Shift+I</source>
+        <translation>Ctrl+Shift+I</translation>
+    </message>
+    <message>
+        <source>Ctrl+Shift+C</source>
+        <translation>Ctrl+Shift+C</translation>
+    </message>
+    <message>
+        <source>Ctrl+Shift+G</source>
+        <translation>Ctrl+Shift+G</translation>
+    </message>
+    <message>
+        <source>Ctrl+Shift+P</source>
+        <translation>Ctrl+Shift+P</translation>
+    </message>
+    <message>
+        <source>Ctrl+Shift+R</source>
+        <translation>Ctrl+Shift+R</translation>
+    </message>
     <message>
         <source>Executing command using "%1" wallet</source>
         <translation>За изпълняване на команди използвайте "%1" портфейл</translation>
     </message>
+    <message>
+        <source>detecting: peer could be v1 or v2</source>
+        <extracomment>Explanatory text for "detecting" transport type.</extracomment>
+        <translation>Ctrl+=</translation>
+    </message>
+    <message>
+        <source>v1: unencrypted, plaintext transport protocol</source>
+        <extracomment>Explanatory text for v1 transport type.</extracomment>
+        <translation>v1: нешифрован, plaintext транспортен протокол</translation>
+    </message>
+    <message>
+        <source>v2: BIP324 encrypted transport protocol</source>
+        <extracomment>Explanatory text for v2 transport type.</extracomment>
+        <translation>v2: BIP324 шифрован транспортен протокол</translation>
+    </message>
+    <message>
+        <source>&amp;Copy address</source>
+        <extracomment>Context menu action to copy the address of a peer</extracomment>
+        <translation>&amp;Копирай адрес</translation>
+    </message>
+    <message>
+        <source>1 d&amp;ay</source>
+        <translation>1 д&amp;ен</translation>
+    </message>
+    <message>
+        <source>&amp;Copy IP/Netmask</source>
+        <extracomment>Context menu action to copy the IP/Netmask of a banned peer. IP/Netmask is the combination of a peer's IP address and its Netmask. For IP address see: https://en.wikipedia.org/wiki/IP_address</extracomment>
+        <translation>v1: нешифрован, plaintext транспортен протокол</translation>
+    </message>
+    <message>
+        <source>Welcome to the %1 RPC console.
+Use up and down arrows to navigate history, and %2 to clear screen.
+Use %3 and %4 to increase or decrease the font size.
+Type %5 for an overview of available commands.
+For more information on using this console, type %6.
+
+%7WARNING: Scammers have been active, telling users to type commands here, stealing their wallet contents. Do not use this console without fully understanding the ramifications of a command.%8</source>
+        <extracomment>RPC console welcome message. Placeholders %7 and %8 are style tags for the warning content, and they are not space separated from the rest of the text intentionally.</extracomment>
+        <translation>Добре дошли в %1 RPC конзолата.
+Използвайте стрелките нагоре и надолу за навигация в историята и %2 за изчистване на екрана.
+Използвайте %3 и %4 за увеличаване или намаляване на размера на шрифта.
+Въведете %5 за преглед на наличните команди.
+За повече информация относно използването на тази конзола, въведете %6.
+
+%7ВНИМАНИЕ: Измамниците са активни, казвайки на потребителите да въвеждат команди тук, крадейки съдържанието на портфейлите им. Не използвайте тази конзола без да разбирате напълно последиците от командата.%8</translation>
+    </message>
+    <message>
+        <source>Executing…</source>
+        <extracomment>A console message indicating an entered command is currently being executed.</extracomment>
+        <translation>Изпълняване…</translation>
+    </message>
+    <message>
+        <source>(peer: %1)</source>
+        <translation>(пиър: %1)</translation>
+    </message>
     <message>
         <source>via %1</source>
         <translation>чрез %1</translation>
@@ -2391,11 +3687,19 @@
         <source>Verified Masternode</source>
         <translation>Проверен Masternode</translation>
     </message>
+    <message>
+        <source>Yes</source>
+        <translation>Да</translation>
+    </message>
     <message>
         <source>Unknown</source>
         <translation>Неизвестни</translation>
     </message>
-    </context>
+    <message>
+        <source>Never</source>
+        <translation>Никога</translation>
+    </message>
+</context>
 <context>
     <name>ReceiveCoinsDialog</name>
     <message>
@@ -2414,6 +3718,10 @@
         <source>An optional message to attach to the payment request, which will be displayed when the request is opened.&lt;br&gt;Note: The message will not be sent with the payment over the Dash network.</source>
         <translation>Възможност  да се прикрепи съобщение към заявката за плащане, което да бъде показано при отваряне на заявката. &lt;br&gt;Забележка: съобщението няма да бъде изпратено с плащането по мрежата на Dash.</translation>
     </message>
+    <message>
+        <source>An optional label to associate with the new receiving address (used by you to identify an invoice).  It is also attached to the payment request.</source>
+        <translation>Незадължително наименование за асоцииране с новия адрес за получаване (използвано от вас за идентифициране на фактура). То също се прикача към заявката за плащане.</translation>
+    </message>
     <message>
         <source>Use this form to request payments. All fields are &lt;b&gt;optional&lt;/b&gt;.</source>
         <translation>Използвате този формуляр за заявяване на плащания. Всички полета са &lt;b&gt;незадължителни&lt;/b&gt;.</translation>
@@ -2430,6 +3738,10 @@
         <source>&amp;Amount:</source>
         <translation>&amp;Сума</translation>
     </message>
+    <message>
+        <source>&amp;Create new receiving address</source>
+        <translation>&amp;Създай нов адрес за получаване</translation>
+    </message>
     <message>
         <source>Clear all fields of the form.</source>
         <translation>Изчисти всички полета от формуляра.</translation>
@@ -2467,24 +3779,60 @@
         <translation>Въведете съобщение, което да прикачите към искането за плащане</translation>
     </message>
     <message>
-        <source>Copy URI</source>
-        <translation>Копирай URI</translation>
+        <source>Copy &amp;URI</source>
+        <translation>Копирай &amp;URI</translation>
     </message>
     <message>
-        <source>Copy label</source>
-        <translation>Копирай наименование</translation>
+        <source>&amp;Copy address</source>
+        <translation>&amp;Копирай адрес</translation>
     </message>
     <message>
-        <source>Copy message</source>
-        <translation>Копиране на съобщението</translation>
+        <source>Copy &amp;label</source>
+        <translation>Копирай &amp;наименование</translation>
     </message>
     <message>
-        <source>Copy amount</source>
-        <translation>Копирай сума</translation>
+        <source>Copy &amp;message</source>
+        <translation>Копирай &amp;съобщение</translation>
+    </message>
+    <message>
+        <source>Copy &amp;amount</source>
+        <translation>Копирай &amp;сума</translation>
+    </message>
+    <message>
+        <source>Could not unlock wallet.</source>
+        <translation>Не можа да се отключи портфейлът.</translation>
     </message>
-    </context>
+    <message>
+        <source>Could not generate new address</source>
+        <translation>Не може да се генерира нов адрес</translation>
+    </message>
+</context>
 <context>
     <name>ReceiveRequestDialog</name>
+    <message>
+        <source>Request payment to …</source>
+        <translation>Искане за плащане към …</translation>
+    </message>
+    <message>
+        <source>Address:</source>
+        <translation>Адрес:</translation>
+    </message>
+    <message>
+        <source>Amount:</source>
+        <translation>Сума:</translation>
+    </message>
+    <message>
+        <source>Label:</source>
+        <translation>Наименование:</translation>
+    </message>
+    <message>
+        <source>Message:</source>
+        <translation>Съобщение:</translation>
+    </message>
+    <message>
+        <source>Wallet:</source>
+        <translation>Портфейл:</translation>
+    </message>
     <message>
         <source>Copy &amp;URI</source>
         <translation>Копирай &amp;URI</translation>
@@ -2537,6 +3885,34 @@
         <translation>Заявени</translation>
     </message>
 </context>
+<context>
+    <name>RestoreWalletActivity</name>
+    <message>
+        <source>Restore Wallet</source>
+        <extracomment>Title of progress window which is displayed when wallets are being restored.</extracomment>
+        <translation>Изпълняване…</translation>
+    </message>
+    <message>
+        <source>Restoring Wallet &lt;b&gt;%1&lt;/b&gt;…</source>
+        <extracomment>Descriptive text of the restore wallets progress window which indicates to the user that wallets are currently being restored.</extracomment>
+        <translation>Възстановяване на портфейл &lt;b&gt;%1&lt;/b&gt;…</translation>
+    </message>
+    <message>
+        <source>Restore wallet failed</source>
+        <extracomment>Title of message box which is displayed when the wallet could not be restored.</extracomment>
+        <translation>Възраст</translation>
+    </message>
+    <message>
+        <source>Restore wallet warning</source>
+        <extracomment>Title of message box which is displayed when the wallet is restored with some warning.</extracomment>
+        <translation>Предупреждение при възстановяване на портфейл</translation>
+    </message>
+    <message>
+        <source>Restore wallet message</source>
+        <extracomment>Title of message box which is displayed when the wallet is successfully restored.</extracomment>
+        <translation>Съобщение при възстановяване на портфейл</translation>
+    </message>
+</context>
 <context>
     <name>SendCoinsDialog</name>
     <message>
@@ -2571,10 +3947,6 @@
         <source>Fee:</source>
         <translation>Такса:</translation>
     </message>
-    <message>
-        <source>Dust:</source>
-        <translation>Незначителен остатък:</translation>
-    </message>
     <message>
         <source>Inputs…</source>
         <translation>Входове…</translation>
@@ -2599,6 +3971,14 @@
         <source>Transaction Fee:</source>
         <translation>Такса транзакция:</translation>
     </message>
+    <message>
+        <source>When there is less transaction volume than space in the blocks, miners as well as relaying nodes may enforce a minimum fee. Paying only this minimum fee is just fine, but be aware that this can result in a never confirming transaction once there is more demand for dash transactions than the network can process.</source>
+        <translation>Когато има по-малък обем транзакции от пространството в блоковете, майнърите както и препращащите възли могат да наложат минимална такса. Плащането само на тази минимална такса е напълно добре, но имайте предвид, че това може да доведе до никога непотвърдена транзакция, щом има повече търсене на dash транзакции, отколкото мрежата може да обработи.</translation>
+    </message>
+    <message>
+        <source>A too low fee might result in a never confirming transaction (read the tooltip)</source>
+        <translation>Твърде ниска такса може да доведе до никога непотвърдена транзакция (прочетете подсказката)</translation>
+    </message>
     <message>
         <source>(Smart fee not initialized yet. This usually takes a few blocks…)</source>
         <translation>(Смарт таксата не е разпозната все още.Това ще отнеме няколко блока… )</translation>
@@ -2627,6 +4007,10 @@
         <source>Note: Not enough data for fee estimation, using the fallback fee instead.</source>
         <translation>Бележка: Няма достатъчно данни за оценка на таксата, вместо това използвайте резервната такса.</translation>
     </message>
+    <message>
+        <source>Hide transaction fee settings</source>
+        <translation>Скрий настройки за такса за транзакция</translation>
+    </message>
     <message>
         <source>Hide</source>
         <translation>Скрит</translation>
@@ -2687,10 +4071,6 @@
         <source>Copy bytes</source>
         <translation>Копирай байтовете</translation>
     </message>
-    <message>
-        <source>Copy dust</source>
-        <translation>Копирай остатъка</translation>
-    </message>
     <message>
         <source>Copy change</source>
         <translation>Копирай рестото</translation>
@@ -2707,10 +4087,6 @@
         <source>%1 to %2</source>
         <translation>%1 до %2</translation>
     </message>
-    <message>
-        <source>Are you sure you want to send?</source>
-        <translation>Наистина ли искате да изпратите?</translation>
-    </message>
     <message>
         <source>&lt;b&gt;(%1 of %2 entries displayed)&lt;/b&gt;</source>
         <translation>&lt;b&gt;(%1 of %2 показани записи)&lt;/b&gt;</translation>
@@ -2723,6 +4099,18 @@
         <source>Confirm the %1 send action</source>
         <translation>Потвърдете изпращането %1 </translation>
     </message>
+    <message>
+        <source>Cr&amp;eate Unsigned</source>
+        <translation>Съ&amp;здай неподписана</translation>
+    </message>
+    <message>
+        <source> from wallet '%1'</source>
+        <translation> от портфейл '%1'</translation>
+    </message>
+    <message>
+        <source>%1 to '%2'</source>
+        <translation>%1 до '%2'</translation>
+    </message>
     <message>
         <source>%1 funds only</source>
         <translation>%1 средства само</translation>
@@ -2731,6 +4119,10 @@
         <source>any available funds</source>
         <translation>всякакви налични средства</translation>
     </message>
+    <message>
+        <source>Transaction fee</source>
+        <translation>Такса за транзакция</translation>
+    </message>
     <message>
         <source>(%1 transactions have higher fees usually due to no change output being allowed)</source>
         <translation>(%1 транзакциите  имат по-високи такси, обикновено поради това, че не се допуска промяна на изхода)</translation>
@@ -2751,10 +4143,67 @@
         <source>Warning: Using %1 with %2 or more inputs can harm your privacy and is not recommended</source>
         <translation>Внимание: Използването %1 с %2 или повече входове могат да навредят на поверителността ви и не се препоръчва</translation>
     </message>
+    <message>
+        <source>Click to learn more</source>
+        <translation>Кликнете за да научите повече</translation>
+    </message>
+    <message>
+        <source>Total Amount</source>
+        <translation>Обща сума</translation>
+    </message>
+    <message>
+        <source>or</source>
+        <translation>или</translation>
+    </message>
     <message>
         <source>Confirm send coins</source>
         <translation>Потвърди изпращането на монетите</translation>
     </message>
+    <message>
+        <source>Save Transaction Data</source>
+        <translation>Запази данни за транзакцията</translation>
+    </message>
+    <message>
+        <source>PSBT saved</source>
+        <translation>PSBT е запазен</translation>
+    </message>
+    <message>
+        <source>Watch-only balance:</source>
+        <translation>Баланс само за наблюдение:</translation>
+    </message>
+    <message>
+        <source>Creates a Partially Signed Blockchain Transaction (PSBT) for use with e.g. an offline %1 wallet, or a PSBT-compatible hardware wallet.</source>
+        <translation>Създава частично подписана блокчейн транзакция (PSBT) за използване например с офлайн %1 портфейл или с хардуерен портфейл съвместим с PSBT.</translation>
+    </message>
+    <message>
+        <source>Do you want to create this transaction?</source>
+        <extracomment>Message displayed when attempting to create a transaction. Cautionary text to prompt the user to verify that the displayed transaction details represent the transaction the user intends to create.</extracomment>
+        <translation>Искате ли да създадете тази транзакция?</translation>
+    </message>
+    <message>
+        <source>Please, review your transaction proposal. This will produce a Partially Signed Blockchain Transaction (PSBT) which you can save or copy and then sign with e.g. an offline %1 wallet, or a PSBT-compatible hardware wallet.</source>
+        <extracomment>Text to inform a user attempting to create a transaction of their current options. At this stage, a user can only create a PSBT. This string is displayed when private keys are disabled and an external signer is not available.</extracomment>
+        <translation>Моля, прегледайте вашето предложение за транзакция. Това ще създаде частично подписана блокчейн транзакция (PSBT), която можете да запазите или копирате и след това да подпишете с например офлайн %1 портфейл или с хардуерен портфейл съвместим с PSBT.</translation>
+    </message>
+    <message>
+        <source>Please, review your transaction. You can create and send this transaction or create a Partially Signed Blockchain Transaction (PSBT), which you can save or copy and then sign with, e.g., an offline %1 wallet, or a PSBT-compatible hardware wallet.</source>
+        <extracomment>Text to inform a user attempting to create a transaction of their current options. At this stage, a user can send their transaction or create a PSBT. This string is displayed when both private keys and PSBT controls are enabled.</extracomment>
+        <translation>Моля, прегледайте вашата транзакция. Можете да създадете и изпратите тази транзакция или да създадете частично подписана блокчейн транзакция (PSBT), която можете да запазите или копирате и след това да подпишете с например офлайн %1 портфейл или с хардуерен портфейл съвместим с PSBT.</translation>
+    </message>
+    <message>
+        <source>Please, review your transaction.</source>
+        <extracomment>Text to prompt a user to review the details of the transaction they are attempting to send.</extracomment>
+        <translation>Моля, прегледайте вашата транзакция.</translation>
+    </message>
+    <message>
+        <source>To review recipient list click "Show Details…"</source>
+        <translation>За да прегледате списъка с получатели кликнете "Покажи детайли…"</translation>
+    </message>
+    <message>
+        <source>Partially Signed Transaction (Binary)</source>
+        <extracomment>Expanded name of the binary PSBT file format. See: BIP 174.</extracomment>
+        <translation>Частично подписана транзакция (двоична)</translation>
+    </message>
     <message>
         <source>The recipient address is not valid. Please recheck.</source>
         <translation>Адресът на получателя е невалиден. Моля проверете отново.</translation>
@@ -2850,6 +4299,10 @@
         <source>A&amp;mount:</source>
         <translation>С&amp;ума:</translation>
     </message>
+    <message>
+        <source>The amount to send in the selected unit</source>
+        <translation>Сумата за изпращане в избраната единица</translation>
+    </message>
     <message>
         <source>The fee will be deducted from the amount being sent. The recipient will receive a lower amount of Dash than you enter in the amount field. If multiple recipients are selected, the fee is split equally.</source>
         <translation>Таксата ще бъде приспадната от количеството за изпращане. Получателят ще получи по-малко количество Dash от това, което сте въвели в полето. Ако са избрани няколко получателя, таксата ще бъде разделена  по равно.</translation>
@@ -2870,21 +4323,16 @@
         <source>A message that was attached to the dash: URI which will be stored with the transaction for your reference. Note: This message will not be sent over the Dash network.</source>
         <translation>Съобщението което беше прикрепено към dash: URI ще бъде запазено с транзакцията за ваше сведение. Забележка: Това съобщение няма да бъде изпратено през Dash мрежата.</translation>
     </message>
+</context>
+<context>
+    <name>SendConfirmationDialog</name>
     <message>
-        <source>This is an unauthenticated payment request.</source>
-        <translation>Това  е не удостоверено искане за плащане.</translation>
-    </message>
-    <message>
-        <source>This is an authenticated payment request.</source>
-        <translation>Това  е удостоверено искане за плащане.</translation>
-    </message>
-    <message>
-        <source>Pay To:</source>
-        <translation>Плащане на:</translation>
+        <source>Send</source>
+        <translation>Изпрати</translation>
     </message>
     <message>
-        <source>Memo:</source>
-        <translation>Бележка:</translation>
+        <source>Create Unsigned</source>
+        <translation>Създай неподписана</translation>
     </message>
 </context>
 <context>
@@ -2972,6 +4420,14 @@
         <source>The Dash address the message was signed with</source>
         <translation>Dash адресът ,с който е подписано съобщението</translation>
     </message>
+    <message>
+        <source>The signed message to verify</source>
+        <translation>Подписаното съобщение за проверка</translation>
+    </message>
+    <message>
+        <source>The signature given when the message was signed</source>
+        <translation>Подписът даден когато съобщението беше подписано</translation>
+    </message>
     <message>
         <source>Verify the message to ensure it was signed with the specified Dash address</source>
         <translation>Проверете съобщението, за да сте сигурни че е подписано с определен Dash адрес</translation>
@@ -3016,6 +4472,10 @@
         <source>Wallet unlock was cancelled.</source>
         <translation>Отключването на портфейла беше отменено.</translation>
     </message>
+    <message>
+        <source>No error</source>
+        <translation>Няма грешка</translation>
+    </message>
     <message>
         <source>Private key for the entered address is not available.</source>
         <translation>Не е наличен частен ключ за въведеният адрес.</translation>
@@ -3049,11 +4509,22 @@
         <translation>Съобщението е потвърдено.</translation>
     </message>
 </context>
+<context>
+    <name>SplashScreen</name>
+    <message>
+        <source>(press q to shutdown and continue later)</source>
+        <translation>(натиснете q за изключване и продължаване по-късно)</translation>
+    </message>
+    <message>
+        <source>press q to shutdown</source>
+        <translation>натиснете q за изключване</translation>
+    </message>
+</context>
 <context>
     <name>TrafficGraphWidget</name>
     <message>
-        <source>KB/s</source>
-        <translation>КБ/с</translation>
+        <source>kB/s</source>
+        <translation>kB/s</translation>
     </message>
     <message>
         <source>Total</source>
@@ -3070,20 +4541,9 @@
 </context>
 <context>
     <name>TransactionDesc</name>
-    <message numerus="yes">
-        <source>Open for %n more block(s)</source>
-        <translation><numerusform>Отворен за още %n блока</numerusform><numerusform>Отворен за още %n блока</numerusform></translation>
-    </message>
-    <message>
-        <source>Open until %1</source>
-        <translation>Подлежи на промяна до %1</translation>
-    </message>
-    <message>
-        <source>conflicted</source>
-        <translation>конфликтно</translation>
-    </message>
     <message>
         <source>0/unconfirmed, %1</source>
+        <extracomment>Text explaining the current status of a transaction, shown in the status field of the details window for this transaction. This status represents an unconfirmed transaction that is in the memory pool.</extracomment>
         <translation>0/непотвърдени, %1</translation>
     </message>
     <message>
@@ -3096,22 +4556,32 @@
     </message>
     <message>
         <source>abandoned</source>
+        <extracomment>Text explaining the current status of a transaction, shown in the status field of the details window for this transaction. This status represents an abandoned transaction.</extracomment>
         <translation>изоставен</translation>
     </message>
+    <message>
+        <source>conflicted with a transaction with %1 confirmations</source>
+        <extracomment>Text explaining the current status of a transaction, shown in the status field of the details window for this transaction. This status represents an unconfirmed transaction that conflicts with a confirmed transaction.</extracomment>
+        <translation>конфликтираща с транзакция с %1 потвърждения</translation>
+    </message>
     <message>
         <source>%1/unconfirmed</source>
+        <extracomment>Text explaining the current status of a transaction, shown in the status field of the details window for this transaction. This status represents a transaction confirmed in at least one block, but less than 6 blocks, and still not locked via ChainLocks.</extracomment>
         <translation>%1/непотвърдени</translation>
     </message>
     <message>
         <source>%1 confirmations</source>
+        <extracomment>Text explaining the current status of a transaction, shown in the status field of the details window for this transaction. This status represents a transaction confirmed in 6 or more blocks or locked via ChainLocks.</extracomment>
         <translation>включена в %1 блока</translation>
     </message>
     <message>
         <source>locked via ChainLocks</source>
+        <extracomment>Text explaining the current status of a transaction, shown in the status field of the details window for this transaction. This status represents a transaction confirmed in at least one block and has been locked by ChainLocks.</extracomment>
         <translation>заключена чрез  ChainLocks</translation>
     </message>
     <message>
         <source>verified via InstantSend</source>
+        <extracomment>Text explaining the current status of a transaction, shown in the status field of the details window for this transaction. This status represents an unconfirmed transaction that has been locked by InstantSend.</extracomment>
         <translation>потвърдено чрез InstantSend</translation>
     </message>
     <message>
@@ -3130,6 +4600,10 @@
         <source>Generated</source>
         <translation>Издадени</translation>
     </message>
+    <message>
+        <source>Platform Transfer</source>
+        <translation>Трансфер на платформа</translation>
+    </message>
     <message>
         <source>From</source>
         <translation>От</translation>
@@ -3260,14 +4734,6 @@
         <source>Address / Label</source>
         <translation>Адрес / Етикет</translation>
     </message>
-    <message numerus="yes">
-        <source>Open for %n more block(s)</source>
-        <translation><numerusform>Отворен за още %n блока</numerusform><numerusform>Отворен за още %n блока</numerusform></translation>
-    </message>
-    <message>
-        <source>Open until %1</source>
-        <translation>Подлежи на промяна до %1</translation>
-    </message>
     <message>
         <source>Unconfirmed</source>
         <translation>Непотвърдено</translation>
@@ -3328,6 +4794,10 @@
         <source>Mined</source>
         <translation>Емитирани</translation>
     </message>
+    <message>
+        <source>Platform Transfer</source>
+        <translation>Трансфер на платформа</translation>
+    </message>
     <message>
         <source>%1 Mixing</source>
         <translation>%1 Смесване</translation>
@@ -3455,6 +4925,10 @@
         <source>Mined</source>
         <translation>Емитирани</translation>
     </message>
+    <message>
+        <source>Platform Transfer</source>
+        <translation>Трансфер на платформа</translation>
+    </message>
     <message>
         <source>Other</source>
         <translation>Други</translation>
@@ -3468,45 +4942,63 @@
         <translation>Минимална сума</translation>
     </message>
     <message>
-        <source>Abandon transaction</source>
-        <translation>Изоставена транзакция</translation>
+        <source>&amp;Copy address</source>
+        <translation>&amp;Копирай адрес</translation>
+    </message>
+    <message>
+        <source>Copy &amp;label</source>
+        <translation>Копирай &amp;наименование</translation>
     </message>
     <message>
-        <source>Copy address</source>
-        <translation>Копирай адрес</translation>
+        <source>Copy &amp;amount</source>
+        <translation>Копирай &amp;сума</translation>
     </message>
     <message>
-        <source>Copy label</source>
-        <translation>Копирай наименование</translation>
+        <source>Copy transaction &amp;ID</source>
+        <translation>Копирай &amp;ID на транзакцията</translation>
     </message>
     <message>
-        <source>Copy amount</source>
-        <translation>Копирай сума</translation>
+        <source>Copy &amp;raw transaction</source>
+        <translation>Копирай &amp;необработена транзакция</translation>
     </message>
     <message>
-        <source>Copy transaction ID</source>
-        <translation>Копирай транзакция с ID</translation>
+        <source>Copy full transaction &amp;details</source>
+        <translation>Копирай пълни &amp;детайли за транзакцията</translation>
     </message>
     <message>
-        <source>Copy raw transaction</source>
-        <translation>Копира необработена транзакция</translation>
+        <source>&amp;Show transaction details</source>
+        <translation>&amp;Покажи детайли за транзакцията</translation>
     </message>
     <message>
-        <source>Copy full transaction details</source>
-        <translation>Копирай всички детайли за транзакцията</translation>
+        <source>A&amp;bandon transaction</source>
+        <translation>Изо&amp;стави транзакция</translation>
     </message>
     <message>
-        <source>Show transaction details</source>
-        <translation>Подробности за транзакцията</translation>
+        <source>Rese&amp;nd transaction</source>
+        <translation>Препра&amp;ти транзакция</translation>
     </message>
     <message>
-        <source>Show address QR code</source>
-        <translation>Покажи QR код</translation>
+        <source>&amp;Edit address label</source>
+        <translation>&amp;Редактирай наименование на адрес</translation>
+    </message>
+    <message>
+        <source>Show address &amp;QR code</source>
+        <translation>Покажи &amp;QR код на адреса</translation>
+    </message>
+    <message>
+        <source>Show in %1</source>
+        <extracomment>Transactions table context menu action to show the selected transaction in a third-party block explorer. %1 is a stand-in argument for the URL of the explorer.</extracomment>
+        <translation>Покажи в %1</translation>
     </message>
     <message>
         <source>Export Transaction History</source>
         <translation>Изнасяне историята на транзакциите</translation>
     </message>
+    <message>
+        <source>Comma separated file</source>
+        <extracomment>Expanded name of the CSV file format. See: https://en.wikipedia.org/wiki/Comma-separated_values.</extracomment>
+        <translation>Частично подписана транзакция (двоична)</translation>
+    </message>
     <message>
         <source>Confirmed</source>
         <translation>Потвърдени</translation>
@@ -3548,42 +5040,102 @@
         <translation>Изнасянето е успешно</translation>
     </message>
     <message>
-        <source>The transaction history was successfully saved to %1.</source>
-        <translation>Направените транзакции са запазени до %1.</translation>
+        <source>The transaction history was successfully saved to %1.</source>
+        <translation>Направените транзакции са запазени до %1.</translation>
+    </message>
+    <message>
+        <source>QR code</source>
+        <translation>QR код</translation>
+    </message>
+    <message>
+        <source>Range:</source>
+        <translation>От:</translation>
+    </message>
+    <message>
+        <source>to</source>
+        <translation>до</translation>
+    </message>
+</context>
+<context>
+    <name>UnitDisplayStatusBarControl</name>
+    <message>
+        <source>Unit to show amounts in. Click to select another unit.</source>
+        <translation>Единица за показване на количеството.Клик за избиране на друга единица.</translation>
+    </message>
+</context>
+<context>
+    <name>WalletController</name>
+    <message>
+        <source>Close wallet</source>
+        <translation>Затвори портфейл</translation>
+    </message>
+    <message>
+        <source>Are you sure you wish to close the wallet &lt;i&gt;%1&lt;/i&gt;?</source>
+        <translation>Сигурни ли сте, че искате да затворите портфейла &lt;i&gt;%1&lt;/i&gt;?</translation>
+    </message>
+    <message>
+        <source>Closing the wallet for too long can result in having to resync the entire chain if pruning is enabled.</source>
+        <translation>Затварянето на портфейла за твърде дълго време може да доведе до необходимост от ресинхронизиране на цялата верига ако е активирано подрязването.</translation>
+    </message>
+    <message>
+        <source>Close all wallets</source>
+        <translation>Затвори всички портфейли</translation>
+    </message>
+    <message>
+        <source>Are you sure you wish to close all wallets?</source>
+        <translation>Сигурни ли сте, че искате да затворите всички портфейли?</translation>
+    </message>
+</context>
+<context>
+    <name>WalletFrame</name>
+    <message>
+        <source>No wallet has been loaded.
+Go to File &gt; Open Wallet to load a wallet.
+- OR -</source>
+        <translation>Не е зареден портфейл.
+Отидете на Файл &gt; Отвори портфейл за да заредите портфейл.
+- ИЛИ -</translation>
+    </message>
+    <message>
+        <source>Create a new wallet</source>
+        <translation>Създай нов портфейл</translation>
+    </message>
+    <message>
+        <source>Error</source>
+        <translation>Грешка</translation>
+    </message>
+    <message>
+        <source>Unable to decode PSBT from clipboard (invalid base64)</source>
+        <translation>Невъзможно декодиране на PSBT от клипборда (невалиден base64)</translation>
     </message>
     <message>
-        <source>QR code</source>
-        <translation>QR код</translation>
+        <source>Load Transaction Data</source>
+        <translation>Зареди данни за транзакцията</translation>
     </message>
     <message>
-        <source>Range:</source>
-        <translation>От:</translation>
+        <source>Partially Signed Transaction (*.psbt)</source>
+        <translation>Частично подписана транзакция (*.psbt)</translation>
     </message>
     <message>
-        <source>to</source>
-        <translation>до</translation>
+        <source>PSBT file must be smaller than 100 MiB</source>
+        <translation>PSBT файлът трябва да бъде по-малък от 100 MiB</translation>
     </message>
-</context>
-<context>
-    <name>UnitDisplayStatusBarControl</name>
     <message>
-        <source>Unit to show amounts in. Click to select another unit.</source>
-        <translation>Единица за показване на количеството.Клик за избиране на друга единица.</translation>
+        <source>Unable to decode PSBT</source>
+        <translation>Невъзможно декодиране на PSBT</translation>
     </message>
 </context>
-<context>
-    <name>WalletController</name>
-    </context>
-<context>
-    <name>WalletFrame</name>
-    </context>
 <context>
     <name>WalletModel</name>
     <message>
         <source>Send Coins</source>
         <translation>Изпращане</translation>
     </message>
-    </context>
+    <message>
+        <source>default wallet</source>
+        <translation>портфейл по подразбиране</translation>
+    </message>
+</context>
 <context>
     <name>WalletView</name>
     <message>
@@ -3598,6 +5150,11 @@
         <source>Selected amount:</source>
         <translation>Избрана сума:</translation>
     </message>
+    <message>
+        <source>Wallet Data</source>
+        <extracomment>Name of the wallet data file format.</extracomment>
+        <translation>Частично подписана транзакция (двоична)</translation>
+    </message>
     <message>
         <source>Backup Wallet</source>
         <translation>Запазване на портфейла</translation>
@@ -3626,8 +5183,8 @@
 <context>
     <name>dash-core</name>
     <message>
-        <source>Error: Listening for incoming connections failed (listen returned error %s)</source>
-        <translation>Грешка: Очакването на входящи връзки е неуспешно (върната грешка %s)</translation>
+        <source>This error could occur if this wallet was not shutdown cleanly and was last loaded using a build with a newer version of Berkeley DB. If so, please use the software that last loaded this wallet</source>
+        <translation>Тази грешка може да се появи, ако този портфейл не беше изключен правилно и беше последно зареден използвайки версия с по-нова версия на Berkeley DB. Ако е така, моля използвайте софтуера, който последно зареди този портфейл</translation>
     </message>
     <message>
         <source>This is a pre-release test build - use at your own risk - do not use for mining or merchant applications</source>
@@ -3682,16 +5239,20 @@
         <translation>Грешка при четене от базата данни, изключване.</translation>
     </message>
     <message>
-        <source>Failed to listen on any port. Use -listen=0 if you want this.</source>
-        <translation>Неуспешно "слушане" на всеки порт. Използвайте -listen=0 ако искате това.</translation>
+        <source>Error: Missing checksum</source>
+        <translation>Грешка: Липсва контролна сума</translation>
+    </message>
+    <message>
+        <source>Error: Unable to parse version %u as a uint32_t</source>
+        <translation>Грешка: Невъзможно анализиране на версия %u като uint32_t</translation>
     </message>
     <message>
-        <source>-maxtxfee is set very high! Fees this large could be paid on a single transaction.</source>
-        <translation>-maxtxfee  е с много голяма зададена стойност! Това е транзакционната такса, която ще платите ако направите единична транзакция.</translation>
+        <source>Error: Unable to write record to new wallet</source>
+        <translation>Грешка: Невъзможно записване на запис в нов портфейл</translation>
     </message>
     <message>
-        <source>Cannot provide specific connections and have addrman find outgoing connections at the same.</source>
-        <translation>Не може да осигури конкретни връзки и да накара addrman да намира изходящи връзки едновременно.</translation>
+        <source>Failed to listen on any port. Use -listen=0 if you want this.</source>
+        <translation>Неуспешно "слушане" на всеки порт. Използвайте -listen=0 ако искате това.</translation>
     </message>
     <message>
         <source>Found unconfirmed denominated outputs, will wait till they confirm to continue.</source>
@@ -3702,13 +5263,17 @@
         <translation>Невалидни -socketevents ('%s') . Само тези режим се поддържат: %s</translation>
     </message>
     <message>
-        <source>Invalid amount for -maxtxfee=&lt;amount&gt;: '%s' (must be at least the minrelay fee of %s to prevent stuck transactions)</source>
-        <translation>Невалидна сума за -maxtxfee=&lt;amount&gt;: '%s' (трябва да бъде най-малко от %s за да се избегне забиване на транзакциите)</translation>
+        <source>SQLiteDatabase: Unknown sqlite wallet schema version %d. Only version %d is supported</source>
+        <translation>SQLiteDatabase: Неизвестна sqlite wallet schema версия %d. Само версия %d се поддържа</translation>
     </message>
     <message>
         <source>Transaction index can't be disabled with governance validation enabled. Either start with -disablegovernance command line switch or enable transaction index.</source>
         <translation>Индексът на транзакциите не може да бъде деактивиран в пълен режим. Или започнете с -disablegovernanc от командния ред или активирайте индексиране на транзакциите.</translation>
     </message>
+    <message>
+        <source>Unsupported category-specific logging level -loglevel=%s. Expected -loglevel=&lt;category&gt;:&lt;loglevel&gt;. Valid categories: %s. Valid loglevels: %s.</source>
+        <translation>Неподдържано ниво на логване специфично за категория -loglevel=%s. Очаквано -loglevel=&lt;category&gt;:&lt;loglevel&gt;. Валидни категории: %s. Валидни loglevels: %s.</translation>
+    </message>
     <message>
         <source>Can't mix: no compatible inputs found!</source>
         <translation>Не може да бъде миксирано: няма останали съвместими входящи средства.</translation>
@@ -3717,6 +5282,14 @@
         <source>Entry exceeds maximum size.</source>
         <translation>Входа надвишава максималният размер.</translation>
     </message>
+    <message>
+        <source>Error upgrading evo database for EHF</source>
+        <translation>Грешка при надграждане на evo базата данни за EHF</translation>
+    </message>
+    <message>
+        <source>Failed to commit Evo database</source>
+        <translation>Неуспешно commit на Evo базата данни</translation>
+    </message>
     <message>
         <source>Found enough users, signing ( waiting %s )</source>
         <translation>Открити са достатъчно потребители, подписване ( изчаква %s )</translation>
@@ -3741,18 +5314,14 @@
         <source>Insufficient funds.</source>
         <translation>Недостатъчно средства.</translation>
     </message>
-    <message>
-        <source>Invalid amount for -discardfee=&lt;amount&gt;: '%s'</source>
-        <translation>Невалидно количество -discardfee=&lt;amount&gt;: '%s'</translation>
-    </message>
-    <message>
-        <source>Invalid amount for -paytxfee=&lt;amount&gt;: '%s' (must be at least %s)</source>
-        <translation>Невалидна сума за -paytxfee=&lt;amount&gt;: '%s' (трябва да бъде най-малко %s)</translation>
-    </message>
     <message>
         <source>Invalid minimum number of spork signers specified with -minsporkkeys</source>
         <translation>Невалиден минимален брой ауторизатори на spork определен с -minsporkkeys</translation>
     </message>
+    <message>
+        <source>Listening for incoming connections failed (listen returned error %s)</source>
+        <translation>Слушането за входящи връзки се провали (listen върна грешка %s)</translation>
+    </message>
     <message>
         <source>Lock is already in place.</source>
         <translation>Заключването е вече налично.</translation>
@@ -3809,6 +5378,10 @@
         <source>Synchronizing governance objects…</source>
         <translation>Синхронизиране на governance обектите…</translation>
     </message>
+    <message>
+        <source>Transaction change output index out of range</source>
+        <translation>Индексът на изхода за ресто на транзакцията е извън обхвата</translation>
+    </message>
     <message>
         <source>Unable to start HTTP server. See debug log for details.</source>
         <translation>Неуспешно стартиране на HTTP сървър. Виж debug log за подробности.</translation>
@@ -3817,6 +5390,10 @@
         <source>Unknown response.</source>
         <translation>Неизвестен отговор.</translation>
     </message>
+    <message>
+        <source>Unsupported global logging level -loglevel=%s. Valid values: %s.</source>
+        <translation>Неподдържано глобално ниво на логване -loglevel=%s. Валидни стойности: %s.</translation>
+    </message>
     <message>
         <source>User Agent comment (%s) contains unsafe characters.</source>
         <translation>User Agent comment (%s) съдържа опасни символи.</translation>
@@ -3857,6 +5434,10 @@
         <source>Make sure to encrypt your wallet and delete all non-encrypted backups after you have verified that the wallet works!</source>
         <translation>Уверете се, че криптирате портфейла си и изтривате всички незашифровани резервни копия, след като сте се уверили, че портфейлът Ви работи!</translation>
     </message>
+    <message>
+        <source>More than one onion bind address is provided. Using %s for the automatically created Tor onion service.</source>
+        <translation>Предоставени са повече от един onion bind адрес. Използва се %s за автоматично създадената Tor onion услуга.</translation>
+    </message>
     <message>
         <source>Prune configured below the minimum of %d MiB.  Please use a higher number.</source>
         <translation>Изчистването е конфигурирано под минимума от %d MiB.  Моля задайте по висока цифра.</translation>
@@ -3885,14 +5466,14 @@
         <source>Wallet is locked, can't replenish keypool! Automatic backups and mixing are disabled, please unlock your wallet to replenish keypool.</source>
         <translation>Портфейлът е заключен, невъзможно е попълването на keypool! Автоматичното архивиране са изключени, моля отключете вашият портфейл за попълване на keypool.</translation>
     </message>
-    <message>
-        <source>You need to rebuild the database using -reindex to change -timestampindex</source>
-        <translation>Трябва да възстановите базата данни, като използвате -reindex за да промените -timestampindex</translation>
-    </message>
     <message>
         <source>You need to rebuild the database using -reindex to go back to unpruned mode.  This will redownload the entire blockchain</source>
         <translation>Необходимо е повторно изграждане на базата данни използвайки -reindex за да се върнете в неизчистен режим.Това ще изтегли отново съществуващата блок-верига</translation>
     </message>
+    <message>
+        <source>%s failed</source>
+        <translation>%s се провали</translation>
+    </message>
     <message>
         <source>-maxmempool must be at least %d MB</source>
         <translation>-maxmempoolтрябва да бъде поне %d MB</translation>
@@ -3901,21 +5482,57 @@
         <source>Automatic backups disabled</source>
         <translation>Автоматичното архивиране е изключено</translation>
     </message>
+    <message>
+        <source>Cannot set -peerblockfilters without -blockfilterindex.</source>
+        <translation>Не може да се зададе -peerblockfilters без -blockfilterindex.</translation>
+    </message>
+    <message>
+        <source>Config setting for %s only applied on %s network when in [%s] section.</source>
+        <translation>Настройката на конфигурацията за %s се прилага само в %s мрежа когато е в секция [%s].</translation>
+    </message>
+    <message>
+        <source>Could not find asmap file %s</source>
+        <translation>Не може да се намери asmap файл %s</translation>
+    </message>
+    <message>
+        <source>Could not parse asmap file %s</source>
+        <translation>Не може да се анализира asmap файл %s</translation>
+    </message>
     <message>
         <source>ERROR! Failed to create automatic backup</source>
         <translation>ГРЕШКА! Неуспешно създаване на автоматичен архив</translation>
     </message>
     <message>
-        <source>Error upgrading evo database</source>
-        <translation>Грешка при надстройката на базата данни evo</translation>
+        <source>Error loading %s: Private keys can only be disabled during creation</source>
+        <translation>Грешка при зареждане на %s: Частните ключове могат да бъдат деактивирани само при създаване</translation>
+    </message>
+    <message>
+        <source>Error: Couldn't create cursor into database</source>
+        <translation>Грешка: Не можа да се създаде курсор в базата данни</translation>
+    </message>
+    <message>
+        <source>Error: Disk space is low for %s</source>
+        <translation>Грешка: Дисковото пространство е малко за %s</translation>
     </message>
     <message>
-        <source>Exceeded max tries.</source>
-        <translation>Надвишен брой опити.</translation>
+        <source>Error: Dumpfile checksum does not match. Computed %s, expected %s</source>
+        <translation>Грешка: Контролната сума на дъмп файла не съвпада. Изчислена %s, очаквана %s</translation>
     </message>
     <message>
-        <source>Failed to commit EvoDB</source>
-        <translation>Неуспешно фиксиране на EvoDB</translation>
+        <source>Error: Got key that was not hex: %s</source>
+        <translation>Грешка: Получен ключ, който не е hex: %s</translation>
+    </message>
+    <message>
+        <source>Error: Got value that was not hex: %s</source>
+        <translation>Грешка: Получена стойност, която не е hex: %s</translation>
+    </message>
+    <message>
+        <source>Error: Keypool ran out, please call keypoolrefill first</source>
+        <translation>Грешка: Keypool свърши, моля извикайте keypoolrefill първо</translation>
+    </message>
+    <message>
+        <source>Error: No addresses available.</source>
+        <translation>Грешка: Няма налични адреси.</translation>
     </message>
     <message>
         <source>Failed to create backup %s!</source>
@@ -3933,13 +5550,29 @@
         <source>Failed to rescan the wallet during initialization</source>
         <translation>Неуспешно сканиране на портфейла по време на инициализация</translation>
     </message>
+    <message>
+        <source>Failed to verify database</source>
+        <translation>Неуспешна проверка на базата данни</translation>
+    </message>
+    <message>
+        <source>Fee rate (%s) is lower than the minimum fee rate setting (%s)</source>
+        <translation>Процентът на таксата (%s) е по-нисък от настройката за минимален процент на таксата (%s)</translation>
+    </message>
     <message>
         <source>Found enough users, signing…</source>
         <translation>Открити са достатъчно потребители, подписва…</translation>
     </message>
     <message>
-        <source>Invalid amount for -fallbackfee=&lt;amount&gt;: '%s'</source>
-        <translation>Невалидно количество за -fallbackfee=&lt;amount&gt;: '%s'</translation>
+        <source>Ignoring duplicate -wallet %s.</source>
+        <translation>Игнориране на дублиран -wallet %s.</translation>
+    </message>
+    <message>
+        <source>Input not found or already spent</source>
+        <translation>Входът не е намерен или вече е похарчен</translation>
+    </message>
+    <message>
+        <source>Invalid P2P permission: '%s'</source>
+        <translation>Невалидно P2P разрешение: '%s'</translation>
     </message>
     <message>
         <source>Invalid masternodeblsprivkey. Please see documentation.</source>
@@ -3961,6 +5594,10 @@
         <source>Mixing in progress…</source>
         <translation>В процес на смесване…</translation>
     </message>
+    <message>
+        <source>No addresses available</source>
+        <translation>Няма налични адреси</translation>
+    </message>
     <message>
         <source>No errors detected.</source>
         <translation>Не са открити грешки.</translation>
@@ -3989,6 +5626,26 @@
         <source>Prune mode is incompatible with -txindex.</source>
         <translation>Изчистен режим е несъвместим с  -txindex.</translation>
     </message>
+    <message>
+        <source>SQLiteDatabase: Failed to execute statement to verify database: %s</source>
+        <translation>SQLiteDatabase: Неуспешно изпълнение на израз за проверка на базата данни: %s</translation>
+    </message>
+    <message>
+        <source>SQLiteDatabase: Failed to prepare statement to verify database: %s</source>
+        <translation>SQLiteDatabase: Неуспешна подготовка на израз за проверка на базата данни: %s</translation>
+    </message>
+    <message>
+        <source>SQLiteDatabase: Failed to read database verification error: %s</source>
+        <translation>SQLiteDatabase: Неуспешно четене на грешка при проверка на базата данни: %s</translation>
+    </message>
+    <message>
+        <source>SQLiteDatabase: Unexpected application id. Expected %u, got %u</source>
+        <translation>SQLiteDatabase: Неочаквано application id. Очаквано %u, получено %u</translation>
+    </message>
+    <message>
+        <source>Section [%s] is not recognized.</source>
+        <translation>Секция [%s] не е разпозната.</translation>
+    </message>
     <message>
         <source>Specified -walletdir "%s" does not exist</source>
         <translation>Посоченият -walletdir "%s" не съществува</translation>
@@ -4017,6 +5674,10 @@
         <source>This is the transaction fee you will pay if you send a transaction.</source>
         <translation>Това е таксата за транзакцията, която ще платите ако изпратите транзакция.</translation>
     </message>
+    <message>
+        <source>Topping up keypool…</source>
+        <translation>Попълване на keypool…</translation>
+    </message>
     <message>
         <source>Transaction amounts must not be negative</source>
         <translation>Сумите на транзакциите не трябва да бъдат отрицателни</translation>
@@ -4037,13 +5698,25 @@
         <source>Unable to bind to %s on this computer. %s is probably already running.</source>
         <translation>Невъзможно да се свърже към %s на този компютър. %s вероятно  вече работи.</translation>
     </message>
+    <message>
+        <source>Unable to create the PID file '%s': %s</source>
+        <translation>Невъзможно създаване на PID файл '%s': %s</translation>
+    </message>
     <message>
         <source>Unable to generate initial keys</source>
         <translation>Не може да се генерират първоначални ключове</translation>
     </message>
     <message>
-        <source>Upgrading UTXO database</source>
-        <translation>Обновяване на UTXO база данни</translation>
+        <source>Unable to open %s for writing</source>
+        <translation>Невъзможно отваряне на %s за писане</translation>
+    </message>
+    <message>
+        <source>Unknown -blockfilterindex value %s.</source>
+        <translation>Неизвестна стойност на -blockfilterindex %s.</translation>
+    </message>
+    <message>
+        <source>Unknown new rules activated (versionbit %i)</source>
+        <translation>Активирани неизвестни нови правила (versionbit %i)</translation>
     </message>
     <message>
         <source>Verifying blocks…</source>
@@ -4062,16 +5735,12 @@
         <translation>Не е в състояние да създаде архивираща папка за портфейла %s!</translation>
     </message>
     <message>
-        <source>You can not start a masternode with wallet enabled.</source>
-        <translation>Не може да стартирате masternode с включен портфейл.</translation>
-    </message>
-    <message>
-        <source>You need to rebuild the database using -reindex to change -addressindex</source>
-        <translation>Необходимо е повторно изграждане на базата данни използвайки -reindex, за да промените -addressindex</translation>
+        <source>Wiping wallet transactions…</source>
+        <translation>Изтриване на транзакциите на портфейла…</translation>
     </message>
     <message>
-        <source>You need to rebuild the database using -reindex to change -spentindex</source>
-        <translation>Необходимо е повторно изграждане на базата данни използвайки -reindex, за да промените  -spentindex</translation>
+        <source>You can not start a masternode with wallet enabled.</source>
+        <translation>Не може да стартирате masternode с включен портфейл.</translation>
     </message>
     <message>
         <source>no mixing available.</source>
@@ -4089,6 +5758,22 @@
         <source>%s uses exact denominated amounts to send funds, you might simply need to mix some more coins.</source>
         <translation>%s използва точно деноминирани суми за изпращане на средства, може просто да се наложи да смесите още няколко монети.</translation>
     </message>
+    <message>
+        <source>-reindex-chainstate option is not compatible with -blockfilterindex. Please temporarily disable blockfilterindex while using -reindex-chainstate, or replace -reindex-chainstate with -reindex to fully rebuild all indexes.</source>
+        <translation>Опцията -reindex-chainstate не е съвместима с -blockfilterindex. Моля, временно деактивирайте blockfilterindex докато използвате -reindex-chainstate, или заменете -reindex-chainstate с -reindex за да възстановите напълно всички индекси.</translation>
+    </message>
+    <message>
+        <source>-reindex-chainstate option is not compatible with -coinstatsindex. Please temporarily disable coinstatsindex while using -reindex-chainstate, or replace -reindex-chainstate with -reindex to fully rebuild all indexes.</source>
+        <translation>Опцията -reindex-chainstate не е съвместима с -coinstatsindex. Моля, временно деактивирайте coinstatsindex докато използвате -reindex-chainstate, или заменете -reindex-chainstate с -reindex за да възстановите напълно всички индекси.</translation>
+    </message>
+    <message>
+        <source>-reindex-chainstate option is not compatible with -txindex. Please temporarily disable txindex while using -reindex-chainstate, or replace -reindex-chainstate with -reindex to fully rebuild all indexes.</source>
+        <translation>Опцията -reindex-chainstate не е съвместима с -txindex. Моля, временно деактивирайте txindex докато използвате -reindex-chainstate, или заменете -reindex-chainstate с -reindex за да възстановите напълно всички индекси.</translation>
+    </message>
+    <message>
+        <source>Cannot downgrade wallet from version %i to version %i. Wallet version unchanged.</source>
+        <translation>Не може да се занижи версията на портфейла от версия %i до версия %i. Версията на портфейла е непроменена.</translation>
+    </message>
     <message>
         <source>Cannot obtain a lock on data directory %s. %s is probably already running.</source>
         <translation>Не може да се заключи дата директорията %s.%s вероятно вече работи.</translation>
@@ -4101,14 +5786,82 @@
         <source>Error loading %s: You can't enable HD on an already existing non-HD wallet</source>
         <translation>Грешка при зареждане %s: Не можете да активирате HD във вече съществуващ не-HD портфейл</translation>
     </message>
+    <message>
+        <source>Error loading wallet. Wallet requires blocks to be downloaded, and software does not currently support loading wallets while blocks are being downloaded out of order when using assumeutxo snapshots. Wallet should be able to load successfully after node sync reaches height %s</source>
+        <translation>Грешка при зареждане на портфейл. Портфейлът изисква блоковете да бъдат изтеглени, а софтуерът в момента не поддържа зареждане на портфейли докато блоковете се изтеглят в неправилен ред при използване на assumeutxo snapshots. Портфейлът трябва да може да се зареди успешно след като синхронизацията на възела достигне височина %s</translation>
+    </message>
     <message>
         <source>Error reading %s! All keys read correctly, but transaction data or address book entries might be missing or incorrect.</source>
         <translation>Грешка при четене на  %s! Всички ключове са прочетени коректно, но данните за транзакциите или записите в адресната книга може да липсват или са некоректни.</translation>
     </message>
+    <message>
+        <source>Error: Dumpfile format record is incorrect. Got "%s", expected "format".</source>
+        <translation>Грешка: Записът на формата на дъмп файла е неправилен. Получен "%s", очакван "format".</translation>
+    </message>
+    <message>
+        <source>Error: Dumpfile identifier record is incorrect. Got "%s", expected "%s".</source>
+        <translation>Грешка: Записът на идентификатора на дъмп файла е неправилен. Получен "%s", очакван "%s".</translation>
+    </message>
+    <message>
+        <source>Error: Dumpfile version is not supported. This version of bitcoin-wallet only supports version 1 dumpfiles. Got dumpfile with version %s</source>
+        <translation>Грешка: Версията на дъмп файла не се поддържа. Тази версия на bitcoin-wallet поддържа само версия 1 дъмп файлове. Получен дъмп файл с версия %s</translation>
+    </message>
+    <message>
+        <source>Failed to rename invalid peers.dat file. Please move or delete it and try again.</source>
+        <translation>Неуспешно преименуване на невалиден peers.dat файл. Моля, преместете или изтрийте го и опитайте отново.</translation>
+    </message>
+    <message>
+        <source>Fee estimation failed. Fallbackfee is disabled. Wait a few blocks or enable %s.</source>
+        <translation>Оценката на таксата се провали. Fallbackfee е деактивирана. Изчакайте няколко блока или активирайте %s.</translation>
+    </message>
+    <message>
+        <source>File %s already exists. If you are sure this is what you want, move it out of the way first.</source>
+        <translation>Файлът %s вече съществува. Ако сте сигурни, че това искате, първо го преместете встрани.</translation>
+    </message>
+    <message>
+        <source>Incompatible options: -dnsseed=1 was explicitly specified, but -onlynet forbids connections to IPv4/IPv6</source>
+        <translation>Несъвместими опции: -dnsseed=1 е изрично посочена, но -onlynet забранява връзки към IPv4/IPv6</translation>
+    </message>
     <message>
         <source>Incorrect or no devnet genesis block found. Wrong datadir for devnet specified?</source>
         <translation>Намерен е неправилен или не devnet блок. Грешно зададена data директория за devnet мрежата?</translation>
     </message>
+    <message>
+        <source>Invalid amount for %s=&lt;amount&gt;: '%s' (must be at least the minrelay fee of %s to prevent stuck transactions)</source>
+        <translation>Невалидна сума за %s=&lt;amount&gt;: '%s' (трябва да бъде поне минималната minrelay такса от %s за да се предотвратят блокирани транзакции)</translation>
+    </message>
+    <message>
+        <source>Invalid or corrupt peers.dat (%s). If you believe this is a bug, please report it to %s. As a workaround, you can move the file (%s) out of the way (rename, move, or delete) to have a new one created on the next start.</source>
+        <translation>Невалиден или повреден peers.dat (%s). Ако смятате, че това е бъг, моля докладвайте го на %s. Като временно решение, можете да преместите файла (%s) встрани (преименувайте, преместете или изтрийте) за да се създаде нов при следващото стартиране.</translation>
+    </message>
+    <message>
+        <source>No dump file provided. To use createfromdump, -dumpfile=&lt;filename&gt; must be provided.</source>
+        <translation>Не е предоставен дъмп файл. За да използвате createfromdump, -dumpfile=&lt;filename&gt; трябва да бъде предоставен.</translation>
+    </message>
+    <message>
+        <source>No dump file provided. To use dump, -dumpfile=&lt;filename&gt; must be provided.</source>
+        <translation>Не е предоставен дъмп файл. За да използвате dump, -dumpfile=&lt;filename&gt; трябва да бъде предоставен.</translation>
+    </message>
+    <message>
+        <source>No wallet file format provided. To use createfromdump, -format=&lt;format&gt; must be provided.</source>
+        <translation>Не е предоставен формат на файл на портфейл. За да използвате createfromdump, -format=&lt;format&gt; трябва да бъде предоставен.</translation>
+    </message>
+    <message>
+        <source>Outbound connections restricted to CJDNS (-onlynet=cjdns) but -cjdnsreachable is not provided</source>
+        <translation>Изходящите връзки са ограничени до CJDNS (-onlynet=cjdns), но -cjdnsreachable не е предоставен</translation>
+    </message>
+    <message>
+        <source>Outbound connections restricted to Tor (-onlynet=onion) but the proxy for reaching the Tor network is explicitly forbidden: -onion=0</source>
+        <translation>Изходящите връзки са ограничени до Tor (-onlynet=onion), но проксито за достигане до Tor мрежата е изрично забранено: -onion=0</translation>
+    </message>
+    <message>
+        <source>Outbound connections restricted to Tor (-onlynet=onion) but the proxy for reaching the Tor network is not provided: none of -proxy, -onion or -listenonion is given</source>
+        <translation>Изходящите връзки са ограничени до Tor (-onlynet=onion), но проксито за достигане до Tor мрежата не е предоставено: нито -proxy, нито -onion, нито -listenonion са дадени</translation>
+    </message>
+    <message>
+        <source>Outbound connections restricted to i2p (-onlynet=i2p) but -i2psam is not provided</source>
+        <translation>Изходящите връзки са ограничени до i2p (-onlynet=i2p), но -i2psam не е предоставен</translation>
+    </message>
     <message>
         <source>Please check that your computer's date and time are correct! If your clock is wrong, %s will not work properly.</source>
         <translation>Моля проверете дали датата и часът на вашият компютър са верни! Ако часовникът ви не е сверен, %s няма да работи правилно.</translation>
@@ -4117,6 +5870,14 @@
         <source>Please contribute if you find %s useful. Visit %s for further information about the software.</source>
         <translation>Моля помогнете ако намерите %s полезен. Посетете %s за допълнителна информация за софтуера.</translation>
     </message>
+    <message>
+        <source>Prune mode is incompatible with -reindex-chainstate. Use full -reindex instead.</source>
+        <translation>Режимът на подрязване е несъвместим с -reindex-chainstate. Използвайте пълен -reindex вместо това.</translation>
+    </message>
+    <message>
+        <source>This is the maximum transaction fee you pay (in addition to the normal fee) to prioritize partial spend avoidance over regular coin selection.</source>
+        <translation>Това е максималната такса за транзакция, която плащате (в допълнение към нормалната такса) за приоритизиране на избягване на частично харчене спрямо редовния подбор на монети.</translation>
+    </message>
     <message>
         <source>This is the transaction fee you may discard if change is smaller than dust at this level</source>
         <translation>Това е таксата за транзакцията, която можете да отхвърлите, ако промяната е по-малка от незначителната стойност на това ниво</translation>
@@ -4125,10 +5886,38 @@
         <source>This is the transaction fee you may pay when fee estimates are not available.</source>
         <translation>Това е таксата за транзакция, която можете да платите, когато не са налице оценки на таксите.</translation>
     </message>
+    <message>
+        <source>Transaction requires one destination of non-0 value, a non-0 feerate, or a pre-selected input</source>
+        <translation>Транзакцията изисква една дестинация с ненулева стойност, ненулев feerate или предварително избран вход</translation>
+    </message>
     <message>
         <source>Unable to replay blocks. You will need to rebuild the database using -reindex-chainstate.</source>
         <translation>Блокове не могат да се възпроизведат. Ще трябва да възстановите базата данни с помощта на -reindex-chainstate.</translation>
     </message>
+    <message>
+        <source>Unknown wallet file format "%s" provided. Please provide one of "bdb" or "sqlite".</source>
+        <translation>Предоставен неизвестен формат на файл на портфейл "%s". Моля, предоставете един от "bdb" или "sqlite".</translation>
+    </message>
+    <message>
+        <source>Unsupported chainstate database format found. Please restart with -reindex-chainstate. This will rebuild the chainstate database.</source>
+        <translation>Намерен неподдържан формат на chainstate база данни. Моля, рестартирайте с -reindex-chainstate. Това ще възстанови chainstate базата данни.</translation>
+    </message>
+    <message>
+        <source>Warning: Dumpfile wallet format "%s" does not match command line specified format "%s".</source>
+        <translation>Предупреждение: Форматът на дъмп файла на портфейла "%s" не съвпада със зададения формат в командния ред "%s".</translation>
+    </message>
+    <message>
+        <source>Warning: Private keys detected in wallet {%s} with disabled private keys</source>
+        <translation>Предупреждение: Открити са частни ключове в портфейл {%s} с деактивирани частни ключове</translation>
+    </message>
+    <message>
+        <source>You need to rebuild the database using -reindex to enable -timestampindex</source>
+        <translation>Трябва да възстановите базата данни използвайки -reindex за да активирате -timestampindex</translation>
+    </message>
+    <message>
+        <source>%s -- Incorrect seed, it should be a hex string</source>
+        <translation>%s -- Неправилен seed, трябва да бъде hex стринг</translation>
+    </message>
     <message>
         <source>%s is not a valid backup folder!</source>
         <translation>%s не е валидна папка за архиви!</translation>
@@ -4137,6 +5926,10 @@
         <source>%s is set very high!</source>
         <translation>%s е зададен твърде високо!</translation>
     </message>
+    <message>
+        <source>%s request incomplete:</source>
+        <translation>%s заявката непълна:</translation>
+    </message>
     <message>
         <source>-devnet can only be specified once</source>
         <translation>-devnet може да се зададе само веднъж</translation>
@@ -4149,6 +5942,30 @@
         <source>-rpcport must be specified when -devnet and -server are specified</source>
         <translation>-rpcport трябва да се зададе когато -devnet и  -server са зададени</translation>
     </message>
+    <message>
+        <source>-statsbatchsize cannot be configured with a negative value.</source>
+        <translation>-statsbatchsize не може да се конфигурира с отрицателна стойност.</translation>
+    </message>
+    <message>
+        <source>-statsduration cannot be configured with a negative value.</source>
+        <translation>-statsduration не може да се конфигурира с отрицателна стойност.</translation>
+    </message>
+    <message>
+        <source>A fatal internal error occurred, see debug.log for details</source>
+        <translation>Възникна фатална вътрешна грешка, вижте debug.log за детайли</translation>
+    </message>
+    <message>
+        <source>Cannot create socket (socket() returned error %s)</source>
+        <translation>Не може да се създаде socket (socket() върна грешка %s)</translation>
+    </message>
+    <message>
+        <source>Cannot get socket address for %s</source>
+        <translation>Не може да се вземе socket адрес за %s</translation>
+    </message>
+    <message>
+        <source>Cannot init Statsd client</source>
+        <translation>Не може да се инициализира Statsd клиент</translation>
+    </message>
     <message>
         <source>Cannot resolve -%s address: '%s'</source>
         <translation>Не може да установи -%s адрес: '%s'</translation>
@@ -4157,14 +5974,22 @@
         <source>Cannot write to data directory '%s'; check permissions.</source>
         <translation>Не може да се записва в data папката '%s'; проверете правата.</translation>
     </message>
-    <message>
-        <source>Change index out of range</source>
-        <translation>Изместете индекса извън обхвата</translation>
-    </message>
     <message>
         <source>Copyright (C)</source>
         <translation>Авторски права (C)</translation>
     </message>
+    <message>
+        <source>Disk space is too low!</source>
+        <translation>Дисковото пространство е твърде малко!</translation>
+    </message>
+    <message>
+        <source>Dump file %s does not exist.</source>
+        <translation>Дъмп файлът %s не съществува.</translation>
+    </message>
+    <message>
+        <source>Error creating %s</source>
+        <translation>Грешка при създаване на %s</translation>
+    </message>
     <message>
         <source>Error loading %s</source>
         <translation>Грешка при зареждане на %s</translation>
@@ -4182,8 +6007,8 @@
         <translation>Грешка при зареждане %s: Не можете да деактивирате HD във вече съществуващ HD портфейл</translation>
     </message>
     <message>
-        <source>Error upgrading chainstate database</source>
-        <translation>Грешка при надграждане на верижната база данни </translation>
+        <source>Error reading next record from wallet database</source>
+        <translation>Грешка при четене на следващ запис от базата данни на портфейла</translation>
     </message>
     <message>
         <source>Loading P2P addresses…</source>
@@ -4201,10 +6026,38 @@
         <source>Loading wallet…</source>
         <translation>Зареждане на портфейла…</translation>
     </message>
+    <message>
+        <source>Failed to clear fulfilled requests cache at %s</source>
+        <translation>Неуспешно изчистване на кеша на изпълнени заявки в %s</translation>
+    </message>
+    <message>
+        <source>Failed to clear governance cache at %s</source>
+        <translation>Неуспешно изчистване на кеша на управлението в %s</translation>
+    </message>
+    <message>
+        <source>Failed to clear masternode cache at %s</source>
+        <translation>Неуспешно изчистване на кеша на masternode в %s</translation>
+    </message>
     <message>
         <source>Failed to find mixing queue to join</source>
         <translation>Неуспех при намиране на опашка за миксиране</translation>
     </message>
+    <message>
+        <source>Failed to load fulfilled requests cache from %s</source>
+        <translation>Неуспешно зареждане на кеша на изпълнени заявки от %s</translation>
+    </message>
+    <message>
+        <source>Failed to load governance cache from %s</source>
+        <translation>Неуспешно зареждане на кеша на управлението от %s</translation>
+    </message>
+    <message>
+        <source>Failed to load masternode cache from %s</source>
+        <translation>Неуспешно зареждане на кеша на masternode от %s</translation>
+    </message>
+    <message>
+        <source>Failed to load sporks cache from %s</source>
+        <translation>Неуспешно зареждане на кеша на sporks от %s</translation>
+    </message>
     <message>
         <source>Failed to start a new mixing queue</source>
         <translation>Неуспешно стартиране на нова опашка за миксиране</translation>
@@ -4225,6 +6078,14 @@
         <source>Inputs vs outputs size mismatch.</source>
         <translation>Несъответствие на размера на входовете и изходите.</translation>
     </message>
+    <message>
+        <source>Invalid '%s'. Allowed values: 128, 160, 192, 224, 256.</source>
+        <translation>Невалиден '%s'. Разрешени стойности: 128, 160, 192, 224, 256.</translation>
+    </message>
+    <message>
+        <source>Invalid -i2psam address or hostname: '%s'</source>
+        <translation>Невалиден -i2psam адрес или име на хост: '%s'</translation>
+    </message>
     <message>
         <source>Invalid -onion address or hostname: '%s'</source>
         <translation>Невалиден -onion адрес или хост: '%s'</translation>
@@ -4265,14 +6126,82 @@
         <source>Last queue was created too recently.</source>
         <translation>Последната опашка беше твърде скоро.</translation>
     </message>
+    <message>
+        <source>%s corrupt. Try using the wallet tool dash-wallet to salvage or restoring a backup.</source>
+        <translation>%s повреден. Опитайте използвайки инструмента за портфейл dash-wallet за спасяване или възстановяване на резервно копие.</translation>
+    </message>
+    <message>
+        <source>%s is set very high! Fees this large could be paid on a single transaction.</source>
+        <translation>%s е зададен много високо! Такси толкова големи могат да бъдат платени в една транзакция.</translation>
+    </message>
+    <message>
+        <source>%s request to listen on port %u. This port is considered "bad" and thus it is unlikely that any Dash Core peers connect to it. See doc/p2p-bad-ports.md for details and a full list.</source>
+        <translation>%s искане за слушане на порт %u. Този порт се счита за "лош" и следователно е малко вероятно Dash Core пиъри да се свържат към него. Вижте doc/p2p-bad-ports.md за детайли и пълен списък.</translation>
+    </message>
+    <message>
+        <source>Cannot provide specific connections and have addrman find outgoing connections at the same time.</source>
+        <translation>Не могат да се предоставят специфични връзки и addrman да търси изходящи връзки едновременно.</translation>
+    </message>
+    <message>
+        <source>Failed to upgrade Evo database</source>
+        <translation>Неуспешно надграждане на Evo базата данни</translation>
+    </message>
+    <message>
+        <source>Fee needed &gt; fee paid</source>
+        <translation>Необходима такса &gt; платена такса</translation>
+    </message>
+    <message>
+        <source>Host %s on unsupported network</source>
+        <translation>Хост %s на неподдържана мрежа</translation>
+    </message>
+    <message>
+        <source>Invalid amount for %s=&lt;amount&gt;: '%s' (must be at least %s)</source>
+        <translation>Невалидна сума за %s=&lt;amount&gt;: '%s' (трябва да е поне %s)</translation>
+    </message>
+    <message>
+        <source>Invalid amount for %s=&lt;amount&gt;: '%s'</source>
+        <translation>Невалидна сума за %s=&lt;amount&gt;: '%s'</translation>
+    </message>
+    <message>
+        <source>Invalid port specified in %s: '%s'</source>
+        <translation>Невалиден порт посочен в %s: '%s'</translation>
+    </message>
     <message>
         <source>Last successful action was too recent.</source>
         <translation>Последното успешно действие беше твърде скоро.</translation>
     </message>
+    <message>
+        <source>Missing solving data for estimating transaction size</source>
+        <translation>Липсват данни за разрешаване за оценка на размера на транзакцията</translation>
+    </message>
+    <message>
+        <source>No host specified</source>
+        <translation>Не е посочен хост</translation>
+    </message>
+    <message>
+        <source>No host specified, malformed URL</source>
+        <translation>Не е посочен хост, невалиден URL</translation>
+    </message>
+    <message>
+        <source>No text before the scheme delimiter, malformed URL</source>
+        <translation>Няма текст преди разделителя на схемата, невалиден URL</translation>
+    </message>
+    <message>
+        <source>Port must be between %d and %d, supplied %d</source>
+        <translation>Портът трябва да бъде между %d и %d, предоставен е %d</translation>
+    </message>
+    <message>
+        <source>Socket not initialized, cannot send message</source>
+        <translation>Сокетът не е инициализиран, не може да се изпрати съобщение</translation>
+    </message>
     <message>
         <source>The source code is available from %s.</source>
         <translation>Изходният код е достъпен от %s.</translation>
     </message>
+    <message>
+        <source>The specified config file %s does not exist</source>
+        <translation>Посоченият конфигурационен файл %s не съществува</translation>
+    </message>
     <message>
         <source>The transaction amount is too small to pay the fee</source>
         <translation>Сумата на транзакцията е твърде малка за плащане на таксата</translation>
@@ -4293,6 +6222,10 @@
         <source>Transaction fees are too high.</source>
         <translation>Таксите за транзакция са твърде високи.</translation>
     </message>
+    <message>
+        <source>Transaction needs a change address, but we can't generate it.</source>
+        <translation>Транзакцията се нуждае от адрес за ресто, но не можем да го генерираме.</translation>
+    </message>
     <message>
         <source>Transaction not valid.</source>
         <translation>Транзакцията е невалидна.</translation>
@@ -4313,6 +6246,18 @@
         <source>Unable to locate enough non-denominated funds for this transaction.</source>
         <translation>Не са намерени достатъчно  неденоминирани средства за тази транзакция.</translation>
     </message>
+    <message>
+        <source>Unable to lookup host %s</source>
+        <translation>Невъзможно намиране на хост %s</translation>
+    </message>
+    <message>
+        <source>Unable to parse -maxuploadtarget: '%s'</source>
+        <translation>Невъзможно анализиране на -maxuploadtarget: '%s'</translation>
+    </message>
+    <message>
+        <source>Unable to send message to %s (::sendto() returned error %s)</source>
+        <translation>Невъзможно изпращане на съобщение до %s (::sendto() върна грешка %s)</translation>
+    </message>
     <message>
         <source>Unable to sign spork message, wrong key?</source>
         <translation>Неуспешно подписване на spork-съобщение. Грешен ключ?</translation>
@@ -4325,6 +6270,10 @@
         <source>Unknown state: id = %u</source>
         <translation>Неизвестно състояние: id = %u</translation>
     </message>
+    <message>
+        <source>Unsupported URL scheme, must begin with udp://</source>
+        <translation>Неподдържана URL схема, трябва да започва с udp://</translation>
+    </message>
     <message>
         <source>Unsupported logging category %s=%s.</source>
         <translation>Неподдържана категория на журналиране %s=%s.</translation>
@@ -4357,9 +6306,25 @@
         <source>You can not disable governance validation on a masternode.</source>
         <translation>Не можете да деактивирате валидирането на управлението на masternode.</translation>
     </message>
+    <message>
+        <source>You need to rebuild the database using -reindex to enable -addressindex</source>
+        <translation>Трябва да възстановите базата данни използвайки -reindex за да активирате -addressindex</translation>
+    </message>
+    <message>
+        <source>You need to rebuild the database using -reindex to enable -spentindex</source>
+        <translation>Трябва да възстановите базата данни използвайки -reindex за да активирате -spentindex</translation>
+    </message>
     <message>
         <source>Your entries added successfully.</source>
         <translation>Вашите записи са добавени успешно.</translation>
     </message>
+    <message>
+        <source>Settings file could not be read</source>
+        <translation>Файлът с настройки не може да бъде прочетен</translation>
+    </message>
+    <message>
+        <source>Settings file could not be written</source>
+        <translation>Файлът с настройки не може да бъде записан</translation>
+    </message>
 </context>
 </TS>
\ No newline at end of file

From b01440d59d42ff8e774367ceb34ea450303329dc Mon Sep 17 00:00:00 2001
From: Kittywhiskers Van Gogh <63189531+kwvg@users.noreply.github.com>
Date: Fri, 17 Nov 2023 10:54:52 +0000
Subject: [PATCH 338/656] merge bitcoin#28900: remove mingw-w64 install for
 "older" systems

---
 doc/build-windows.md | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/doc/build-windows.md b/doc/build-windows.md
index 3670b59cf71f..91d1b86cef54 100644
--- a/doc/build-windows.md
+++ b/doc/build-windows.md
@@ -39,16 +39,9 @@ See [dependencies.md](dependencies.md) for a complete overview.
 ## Building for 64-bit Windows
 
 The first step is to install the mingw-w64 cross-compilation tool chain:
-  - on modern systems (Ubuntu 21.04 Hirsute Hippo or newer, Debian 11 Bullseye or newer):
 
 ```sh
 sudo apt install g++-mingw-w64-x86-64-posix
-```
-
-  - on older systems:
-
-```sh
-sudo apt install g++-mingw-w64-x86-64
 ```
 
 Once the toolchain is installed the build steps are common:

From 13e1bfe2089cc303e5f649f3aa7a5b6115975fe2 Mon Sep 17 00:00:00 2001
From: Kittywhiskers Van Gogh <63189531+kwvg@users.noreply.github.com>
Date: Sat, 25 Oct 2025 15:06:54 +0530
Subject: [PATCH 339/656] refactor: move `windres` fix to `hosts/mingw32.mk`

The current fix applies only to one package and assumes a fixed HOST,
neither is ideal. Propagate the fix instead.
---
 depends/Makefile           | 1 +
 depends/config.site.in     | 7 +++++++
 depends/hosts/default.mk   | 2 +-
 depends/hosts/mingw32.mk   | 2 ++
 depends/packages/zeromq.mk | 1 -
 src/Makefile.am            | 2 +-
 6 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/depends/Makefile b/depends/Makefile
index 2bbf40297530..f3d53f064c0e 100644
--- a/depends/Makefile
+++ b/depends/Makefile
@@ -231,6 +231,7 @@ $(host_prefix)/share/config.site : config.site.in $(host_prefix)/.stamp_$(final_
             -e 's|@STRIP@|$(host_STRIP)|' \
             -e 's|@OBJDUMP@|$(host_OBJDUMP)|' \
             -e 's|@DSYMUTIL@|$(host_DSYMUTIL)|' \
+            -e 's|@WINDRES@|$(host_WINDRES)|' \
             -e 's|@build_os@|$(build_os)|' \
             -e 's|@host_os@|$(host_os)|' \
             -e 's|@CFLAGS@|$(strip $(host_CFLAGS) $(host_$(release_type)_CFLAGS))|' \
diff --git a/depends/config.site.in b/depends/config.site.in
index 832c9c68caeb..398a09b74c63 100644
--- a/depends/config.site.in
+++ b/depends/config.site.in
@@ -131,6 +131,13 @@ if test "@host_os@" = darwin; then
   fi
 fi
 
+if test "@host_os@" = mingw32; then
+  if test -n "@WINDRES@"; then
+    WINDRES="@WINDRES@"
+    ac_cv_path_WINDRES="${WINDRES}"
+  fi
+fi
+
 if test -n "@debug@"; then
   enable_reduce_exports=no
 fi
diff --git a/depends/hosts/default.mk b/depends/hosts/default.mk
index d82c33f29ce0..54c12c818024 100644
--- a/depends/hosts/default.mk
+++ b/depends/hosts/default.mk
@@ -38,5 +38,5 @@ host_$1 = $$($(host_arch)_$(host_os)_$1)
 host_$(release_type)_$1 = $$($(host_arch)_$(host_os)_$(release_type)_$1)
 endef
 
-$(foreach tool,CC CXX AR RANLIB STRIP NM OBJCOPY OBJDUMP DSYMUTIL,$(eval $(call add_host_tool_func,$(tool))))
+$(foreach tool,CC CXX AR RANLIB STRIP NM OBJCOPY OBJDUMP DSYMUTIL WINDRES,$(eval $(call add_host_tool_func,$(tool))))
 $(foreach flags,CFLAGS CXXFLAGS CPPFLAGS LDFLAGS, $(eval $(call add_host_flags_func,$(flags))))
diff --git a/depends/hosts/mingw32.mk b/depends/hosts/mingw32.mk
index 4c657358f6a5..e324fd2fffe6 100644
--- a/depends/hosts/mingw32.mk
+++ b/depends/hosts/mingw32.mk
@@ -11,6 +11,8 @@ mingw32_NM = $(host_toolchain)gcc-nm
 mingw32_RANLIB = $(host_toolchain)gcc-ranlib
 endif
 
+mingw32_WINDRES = $(host_toolchain)windres
+
 mingw32_release_CFLAGS=-O2
 mingw32_release_CXXFLAGS=$(mingw32_release_CFLAGS)
 
diff --git a/depends/packages/zeromq.mk b/depends/packages/zeromq.mk
index 21e162c792b5..67a0dd88e5de 100644
--- a/depends/packages/zeromq.mk
+++ b/depends/packages/zeromq.mk
@@ -21,7 +21,6 @@ define $(package)_set_vars
   $(package)_config_opts += -DENABLE_DRAFTS=OFF -DZMQ_BUILD_TESTS=OFF
   $(package)_cxxflags += -ffile-prefix-map=$($(package)_extract_dir)=/usr
   $(package)_config_opts_mingw32 += -DZMQ_WIN32_WINNT=0x0601 -DZMQ_HAVE_IPC=OFF
-  $(package)_config_opts_mingw32 += -DCMAKE_RC_COMPILER=x86_64-w64-mingw32-windres
 endef
 
 define $(package)_preprocess_cmds
diff --git a/src/Makefile.am b/src/Makefile.am
index 7b5c4ca68402..1965c10b8ba3 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1162,7 +1162,7 @@ clean-local:
 	-rm -rf *.dSYM test/*.dSYM bench/*.dSYM qt/*.dSYM qt/test/*.dSYM
 
 .rc.o:
-	@test -f $(WINDRES) || (echo "windres $(WINDRES) not found, but is required to compile windows resource files"; exit 1)
+	@command -v $(WINDRES) || (echo "windres $(WINDRES) not found, but is required to compile windows resource files"; exit 1)
 	## FIXME: How to get the appropriate modulename_CPPFLAGS in here?
 	$(AM_V_GEN) $(WINDRES) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(CPPFLAGS) -DWINDRES_PREPROC -i $< -o $@
 

From dc24acb55c6db586bd3ddb76560c4968b89df774 Mon Sep 17 00:00:00 2001
From: Kittywhiskers Van Gogh <63189531+kwvg@users.noreply.github.com>
Date: Sat, 25 Oct 2025 04:01:25 +0530
Subject: [PATCH 340/656] refactor: point Qt URL to `archives` subdirectory

As of this commit, Qt <6.5 are considered historical versions, which
are located at a different path. Adjust accordingly.
---
 depends/packages/qt.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/depends/packages/qt.mk b/depends/packages/qt.mk
index 5e0e20aa38df..c8d1e7693405 100644
--- a/depends/packages/qt.mk
+++ b/depends/packages/qt.mk
@@ -1,6 +1,6 @@
 package=qt
 $(package)_version=5.15.14
-$(package)_download_path=https://download.qt.io/official_releases/qt/5.15/$($(package)_version)/submodules
+$(package)_download_path=https://download.qt.io/archive/qt/5.15/$($(package)_version)/submodules
 $(package)_suffix=everywhere-opensource-src-$($(package)_version).tar.xz
 $(package)_file_name=qtbase-$($(package)_suffix)
 $(package)_sha256_hash=500d3b390048e9538c28b5f523dfea6936f9c2e10d24ab46580ff57d430b98be

From 86004c5db2e45b7a75f77efe78a4bf697791c46a Mon Sep 17 00:00:00 2001
From: Kittywhiskers Van Gogh <63189531+kwvg@users.noreply.github.com>
Date: Sat, 25 Oct 2025 03:22:11 +0530
Subject: [PATCH 341/656] merge bitcoin#29249: add NM output to gen_id

---
 depends/Makefile | 4 ++--
 depends/gen_id   | 7 ++++++-
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/depends/Makefile b/depends/Makefile
index f3d53f064c0e..64f86440ccff 100644
--- a/depends/Makefile
+++ b/depends/Makefile
@@ -147,8 +147,8 @@ include packages/packages.mk
 #     2. Before including packages/*.mk (excluding packages/packages.mk), since
 #        they rely on the build_id variables
 #
-build_id:=$(shell env CC='$(build_CC)' C_STANDARD='$(C_STANDARD)' CXX='$(build_CXX)' CXX_STANDARD='$(CXX_STANDARD)' AR='$(build_AR)' RANLIB='$(build_RANLIB)' STRIP='$(build_STRIP)' SHA256SUM='$(build_SHA256SUM)' DEBUG='$(DEBUG)' LTO='$(LTO)' NO_HARDEN='$(NO_HARDEN)' ./gen_id '$(BUILD_ID_SALT)' 'GUIX_ENVIRONMENT=$(realpath $(GUIX_ENVIRONMENT))')
-$(host_arch)_$(host_os)_id:=$(shell env CC='$(host_CC)' C_STANDARD='$(C_STANDARD)' CXX='$(host_CXX)' CXX_STANDARD='$(CXX_STANDARD)' AR='$(host_AR)' RANLIB='$(host_RANLIB)' STRIP='$(host_STRIP)' SHA256SUM='$(build_SHA256SUM)' DEBUG='$(DEBUG)' LTO='$(LTO)' NO_HARDEN='$(NO_HARDEN)' ./gen_id '$(HOST_ID_SALT)' 'GUIX_ENVIRONMENT=$(realpath $(GUIX_ENVIRONMENT))')
+build_id:=$(shell env CC='$(build_CC)' C_STANDARD='$(C_STANDARD)' CXX='$(build_CXX)' CXX_STANDARD='$(CXX_STANDARD)' AR='$(build_AR) 'NM='$(build_NM)' RANLIB='$(build_RANLIB)' STRIP='$(build_STRIP)' SHA256SUM='$(build_SHA256SUM)' DEBUG='$(DEBUG)' LTO='$(LTO)' NO_HARDEN='$(NO_HARDEN)' ./gen_id '$(BUILD_ID_SALT)' 'GUIX_ENVIRONMENT=$(realpath $(GUIX_ENVIRONMENT))')
+$(host_arch)_$(host_os)_id:=$(shell env CC='$(host_CC)' C_STANDARD='$(C_STANDARD)' CXX='$(host_CXX)' CXX_STANDARD='$(CXX_STANDARD)' AR='$(host_AR)' NM='$(host_NM)' RANLIB='$(host_RANLIB)' STRIP='$(host_STRIP)' SHA256SUM='$(build_SHA256SUM)' DEBUG='$(DEBUG)' LTO='$(LTO)' NO_HARDEN='$(NO_HARDEN)' ./gen_id '$(HOST_ID_SALT)' 'GUIX_ENVIRONMENT=$(realpath $(GUIX_ENVIRONMENT))')
 
 boost_packages_$(NO_BOOST) = $(boost_packages)
 
diff --git a/depends/gen_id b/depends/gen_id
index 67c43616d68b..e2e2273b2d67 100755
--- a/depends/gen_id
+++ b/depends/gen_id
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 
 # Usage: env [ CC=... ] [ C_STANDARD=...] [ CXX=... ] [CXX_STANDARD=...] \
-#            [ AR=... ] [ RANLIB=... ] [ STRIP=... ] [ DEBUG=... ] \
+#            [ AR=... ] [ NM=... ] [ RANLIB=... ] [ STRIP=... ] [ DEBUG=... ] \
 #            [ LTO=... ] [ NO_HARDEN=... ] ./build-id [ID_SALT]...
 #
 # Prints to stdout a SHA256 hash representing the current toolset, used by
@@ -55,6 +55,11 @@
     env | grep '^AR_'
     echo "END AR"
 
+    echo "BEGIN NM"
+    bash -c "${NM} --version"
+    env | grep '^NM_'
+    echo "END NM"
+
     echo "BEGIN RANLIB"
     bash -c "${RANLIB} --version"
     env | grep '^RANLIB_'

From 9ae459ff67d2220a9a1e347de90b5512a0ef31af Mon Sep 17 00:00:00 2001
From: UdjinM6 <UdjinM6@users.noreply.github.com>
Date: Sat, 1 Nov 2025 01:39:00 +0300
Subject: [PATCH 342/656] ro

---
 src/qt/locale/dash_ro.ts | 3222 ++++++++++++++++++++++++++++++++++----
 1 file changed, 2953 insertions(+), 269 deletions(-)

diff --git a/src/qt/locale/dash_ro.ts b/src/qt/locale/dash_ro.ts
index a0ebf6d29d4b..817f4d55e6f5 100644
--- a/src/qt/locale/dash_ro.ts
+++ b/src/qt/locale/dash_ro.ts
@@ -1,6 +1,10 @@
 <TS version="2.1" language="ro">
 <context>
     <name>AddressBookPage</name>
+    <message>
+        <source>Enter address or label to search</source>
+        <translation>Introduceți adresa sau eticheta pentru căutare</translation>
+    </message>
     <message>
         <source>Right-click to edit address or label</source>
         <translation>Click-dreapta pentru a edita adresa sau eticheta</translation>
@@ -61,18 +65,14 @@
         <source>C&amp;hoose</source>
         <translation>A&amp;lege</translation>
     </message>
-    <message>
-        <source>Sending addresses</source>
-        <translation>Adresa de trimitere</translation>
-    </message>
-    <message>
-        <source>Receiving addresses</source>
-        <translation>Adresa de primire</translation>
-    </message>
     <message>
         <source>These are your Dash addresses for sending payments. Always check the amount and the receiving address before sending coins.</source>
         <translation>Acestea sunt adresele tale Dash pentru efectuarea platilor. Intotdeauna verifica atent suma de plata si adresa beneficiarului inainte de a trimite monede.</translation>
     </message>
+    <message>
+        <source>These are your Dash addresses for receiving payments. Use the 'Create new receiving address' button in the receive tab to create new addresses.</source>
+        <translation>Acestea sunt adresele dumneavoastră Dash pentru primirea plăților. Folosiți butonul 'Creează o nouă adresă de primire' în tab-ul de primire pentru a crea adrese noi.</translation>
+    </message>
     <message>
         <source>&amp;Copy Address</source>
         <translation>&amp;Copiază adresa</translation>
@@ -86,8 +86,8 @@
         <translation>&amp;Editare</translation>
     </message>
     <message>
-        <source>&amp;Show address QR code</source>
-        <translation>&amp;Afișează codul QR al adresei</translation>
+        <source>Show address &amp;QR code</source>
+        <translation>Arată codul &amp;QR al adresei</translation>
     </message>
     <message>
         <source>QR code</source>
@@ -97,11 +97,24 @@
         <source>Export Address List</source>
         <translation>Exportă listă de adrese</translation>
     </message>
+    <message>
+        <source>Comma separated file</source>
+        <extracomment>Expanded name of the CSV file format. See: https://en.wikipedia.org/wiki/Comma-separated_values.</extracomment>
+        <translation>Fișier cu valori separate prin virgulă</translation>
+    </message>
     <message>
         <source>There was an error trying to save the address list to %1. Please try again.</source>
         <extracomment>An error message. %1 is a stand-in argument for the name of the file we attempted to save to.</extracomment>
         <translation>A apărut o eroare la salvarea listei de adrese la %1. Vă rugăm să încercaţi din nou.</translation>
     </message>
+    <message>
+        <source>Sending addresses - %1</source>
+        <translation>Adrese de trimitere - %1</translation>
+    </message>
+    <message>
+        <source>Receiving addresses - %1</source>
+        <translation>Adrese de primire - %1</translation>
+    </message>
     <message>
         <source>Exporting Failed</source>
         <translation>Export nereusit</translation>
@@ -124,7 +137,43 @@
 </context>
 <context>
     <name>AppearanceWidget</name>
-    </context>
+    <message>
+        <source>Lighter</source>
+        <translation>Mai deschis</translation>
+    </message>
+    <message>
+        <source>Bolder</source>
+        <translation>Mai îngroșat</translation>
+    </message>
+    <message>
+        <source>Font Weight Normal:</source>
+        <translation>Grosime font normal:</translation>
+    </message>
+    <message>
+        <source>Smaller</source>
+        <translation>Mai mic</translation>
+    </message>
+    <message>
+        <source>Bigger</source>
+        <translation>Mai mare</translation>
+    </message>
+    <message>
+        <source>Font Scale:</source>
+        <translation>Scală font:</translation>
+    </message>
+    <message>
+        <source>Font Family:</source>
+        <translation>Familie font:</translation>
+    </message>
+    <message>
+        <source>Theme:</source>
+        <translation>Temă:</translation>
+    </message>
+    <message>
+        <source>Font Weight Bold:</source>
+        <translation>Grosime font îngroșat:</translation>
+    </message>
+</context>
 <context>
     <name>AskPassphraseDialog</name>
     <message>
@@ -143,6 +192,10 @@
         <source>Repeat new passphrase</source>
         <translation>Repetaţi noua frază de acces</translation>
     </message>
+    <message>
+        <source>Show passphrase</source>
+        <translation>Arată parola</translation>
+    </message>
     <message>
         <source>Encrypt wallet</source>
         <translation>Criptare portofel</translation>
@@ -179,6 +232,30 @@
         <source>Wallet encrypted</source>
         <translation>Portofel criptat</translation>
     </message>
+    <message>
+        <source>Enter the new passphrase for the wallet.&lt;br/&gt;Please use a passphrase of &lt;b&gt;ten or more random characters&lt;/b&gt;, or &lt;b&gt;eight or more words&lt;/b&gt;.</source>
+        <translation>Introduceți noua parolă pentru portofel.&lt;br/&gt;Vă rugăm să folosiți o parolă de &lt;b&gt;zece sau mai multe caractere aleatorii&lt;/b&gt;, sau &lt;b&gt;opt sau mai multe cuvinte&lt;/b&gt;.</translation>
+    </message>
+    <message>
+        <source>Enter the old passphrase and new passphrase for the wallet.</source>
+        <translation>Introduceți vechea frază de acces și noua frază de acces pentru portofel.</translation>
+    </message>
+    <message>
+        <source>Remember that encrypting your wallet cannot fully protect your funds from being stolen by malware infecting your computer.</source>
+        <translation>Rețineți că criptarea portofelului nu poate proteja complet fondurile dumneavoastră de a fi furate de malware care infectează calculatorul.</translation>
+    </message>
+    <message>
+        <source>Wallet to be encrypted</source>
+        <translation>Portofel de criptat</translation>
+    </message>
+    <message>
+        <source>Your wallet is about to be encrypted. </source>
+        <translation>Portofelul tău este pe cale să fie criptat. </translation>
+    </message>
+    <message>
+        <source>Your wallet is now encrypted. </source>
+        <translation>Portofelul tău este acum criptat. </translation>
+    </message>
     <message>
         <source>IMPORTANT: Any previous backups you have made of your wallet file should be replaced with the newly generated, encrypted wallet file. Previous backups of the unencrypted wallet file contain the same HD seed and still have full access to all your funds just like the new, encrypted wallet.</source>
         <translation>IMPORTANT: Toate backup-urile anterioare pe care le-ai realizat pentru fișierul portofelului tău ar trebui înlocuite cu fișierul portofelului criptat nou generat. Backup-urile anterioare ale fișierului portofelului necriptat conțin aceleași semințe HD și încă mai au acces deplin la toate fondurile tale la fel ca noul portofel criptat.</translation>
@@ -207,10 +284,22 @@
         <source>The passphrase entered for the wallet decryption was incorrect.</source>
         <translation>Fraza de acces introdusă pentru decriptarea portofelului a fost incorectă.</translation>
     </message>
+    <message>
+        <source>The passphrase entered for the wallet decryption is incorrect. It contains a null character (ie - a zero byte). If the passphrase was set with a version of this software prior to 23.0, please try again with only the characters up to — but not including — the first null character. If this is successful, please set a new passphrase to avoid this issue in the future.</source>
+        <translation>Fraza de acces introdusă pentru decriptarea portofelului este incorectă. Aceasta conține un caracter nul (adică - un octet zero). Dacă fraza de acces a fost setată cu o versiune a acestui software anterioară 23.0, vă rugăm să încercați din nou doar cu caracterele până la - dar fără a include - primul caracter nul. Dacă aceasta are succes, vă rugăm să setați o nouă frază de acces pentru a evita această problemă în viitor.</translation>
+    </message>
     <message>
         <source>Wallet passphrase was successfully changed.</source>
         <translation>Parola portofelului a fost schimbata.</translation>
     </message>
+    <message>
+        <source>Passphrase change failed</source>
+        <translation>Schimbarea parolei a eșuat</translation>
+    </message>
+    <message>
+        <source>The old passphrase entered for the wallet decryption is incorrect. It contains a null character (ie - a zero byte). If the passphrase was set with a version of this software prior to 23.0, please try again with only the characters up to — but not including — the first null character.</source>
+        <translation>Vechea frază de acces introdusă pentru decriptarea portofelului este incorectă. Aceasta conține un caracter nul (adică - un octet zero). Dacă fraza de acces a fost setată cu o versiune a acestui software anterioară 23.0, vă rugăm să încercați din nou doar cu caracterele până la - dar fără a include - primul caracter nul.</translation>
+    </message>
     <message>
         <source>Warning: The Caps Lock key is on!</source>
         <translation>Atentie! Caps Lock este pornit</translation>
@@ -229,10 +318,30 @@
 </context>
 <context>
     <name>BitcoinAmountField</name>
-    </context>
+    <message>
+        <source>Amount in %1</source>
+        <translation>Sumă în %1</translation>
+    </message>
+</context>
 <context>
     <name>BitcoinApplication</name>
-    </context>
+    <message>
+        <source>Runaway exception</source>
+        <translation>Excepție scăpată de sub control</translation>
+    </message>
+    <message>
+        <source>A fatal error occurred. %1 can no longer continue safely and will quit.</source>
+        <translation>A apărut o eroare fatală. %1 nu mai poate continua în siguranță și se va închide.</translation>
+    </message>
+    <message>
+        <source>Internal error</source>
+        <translation>Eroare internă</translation>
+    </message>
+    <message>
+        <source>An internal error occurred. %1 will attempt to continue safely. This is an unexpected bug which can be reported as described below.</source>
+        <translation>A apărut o eroare internă. %1 va încerca să continue în siguranță. Acesta este un bug neașteptat care poate fi raportat așa cum este descris mai jos.</translation>
+    </message>
+</context>
 <context>
     <name>BitcoinGUI</name>
     <message>
@@ -259,6 +368,10 @@
         <source>Request payments (generates QR codes and dash: URIs)</source>
         <translation>Cereţi plăţi (generează coduri QR şi Dash-uri: URls)</translation>
     </message>
+    <message>
+        <source>Ctrl+Q</source>
+        <translation>Ctrl+Q</translation>
+    </message>
     <message>
         <source>&amp;Options…</source>
         <translation>&amp;Opţiuni…</translation>
@@ -287,10 +400,50 @@
         <source>&amp;Verify message…</source>
         <translation>&amp;Verifică mesaj…</translation>
     </message>
+    <message>
+        <source>&amp;Load PSBT from file…</source>
+        <translation>&amp;Încarcă PSBT din fișier…</translation>
+    </message>
+    <message>
+        <source>&amp;Sending addresses</source>
+        <translation>Adrese de &amp;trimitere</translation>
+    </message>
+    <message>
+        <source>&amp;Receiving addresses</source>
+        <translation>Adrese de &amp;primire</translation>
+    </message>
     <message>
         <source>Open &amp;URI…</source>
         <translation>Deschide &amp;URI…</translation>
     </message>
+    <message>
+        <source>Open Wallet</source>
+        <translation>Deschide portofel</translation>
+    </message>
+    <message>
+        <source>Open a wallet</source>
+        <translation>Deschide un portofel</translation>
+    </message>
+    <message>
+        <source>Close wallet</source>
+        <translation>Închide portofel</translation>
+    </message>
+    <message>
+        <source>No wallets available</source>
+        <translation>Niciun portofel disponibil</translation>
+    </message>
+    <message>
+        <source>&amp;Window</source>
+        <translation>&amp;Fereastră</translation>
+    </message>
+    <message>
+        <source>Zoom</source>
+        <translation>Zoom</translation>
+    </message>
+    <message>
+        <source>Main Window</source>
+        <translation>Fereastra principală</translation>
+    </message>
     <message>
         <source>&amp;Transactions</source>
         <translation>&amp;Tranzacţii</translation>
@@ -328,16 +481,12 @@
         <translation>&amp;Despre %1</translation>
     </message>
     <message>
-        <source>Modify configuration options for %1</source>
-        <translation>Modifică opţiunile de configurare pentru %1</translation>
-    </message>
-    <message>
-        <source>&amp;Show / Hide</source>
-        <translation>Arata/Ascunde</translation>
+        <source>Send %1 funds to a Dash address</source>
+        <translation>Trimite fonduri %1 către o adresă Dash</translation>
     </message>
     <message>
-        <source>Show or hide the main Window</source>
-        <translation>Arată sau ascunde fereastra principală</translation>
+        <source>Modify configuration options for %1</source>
+        <translation>Modifică opţiunile de configurare pentru %1</translation>
     </message>
     <message>
         <source>Encrypt the private keys that belong to your wallet</source>
@@ -397,23 +546,19 @@
     </message>
     <message>
         <source>Wallet &amp;Repair</source>
-        <translation>Portofel &amp; Reparare</translation>
+        <translation>Portofel &amp;Reparare</translation>
     </message>
     <message>
         <source>Show wallet repair options</source>
         <translation>Afișează opțiunile de reparare a portofelului</translation>
     </message>
-    <message>
-        <source>Open Wallet &amp;Configuration File</source>
-        <translation>Deschide Fișierul Portofel &amp; Configurare</translation>
-    </message>
     <message>
         <source>Open configuration file</source>
         <translation>Deschide fisierul de configurare.</translation>
     </message>
     <message>
         <source>Show Automatic &amp;Backups</source>
-        <translation>Afișează Automat &amp; Backup-uri</translation>
+        <translation>Afișează Automat &amp;Backup-uri</translation>
     </message>
     <message>
         <source>Show automatically created wallet backups</source>
@@ -435,18 +580,110 @@
         <source>Show the %1 help message to get a list with possible Dash command-line options</source>
         <translation>Arată mesajul de ajutor %1 pentru a obţine o listă cu opţiunile posibile de linii de comandă Dash</translation>
     </message>
+    <message>
+        <source>default wallet</source>
+        <translation>portofel implicit</translation>
+    </message>
     <message>
         <source>%1 client</source>
         <translation>Client %1</translation>
     </message>
+    <message>
+        <source>Wallet: %1
+</source>
+        <translation>Portofel: %1
+</translation>
+    </message>
+    <message>
+        <source>Wallet is &lt;b&gt;unencrypted&lt;/b&gt;</source>
+        <translation>Portofelul este &lt;b&gt;necriptat&lt;/b&gt;</translation>
+    </message>
     <message>
         <source>&amp;File</source>
         <translation>&amp;Fişier</translation>
     </message>
+    <message>
+        <source>Show information about %1</source>
+        <translation>Arată informații despre %1</translation>
+    </message>
+    <message>
+        <source>Load PSBT from &amp;clipboard…</source>
+        <translation>Încarcă PSBT din &amp;clipboard…</translation>
+    </message>
+    <message>
+        <source>Open debugging and diagnostic console</source>
+        <translation>Deschide consola de debugging și diagnostic</translation>
+    </message>
+    <message>
+        <source>Open &amp;wallet configuration file</source>
+        <translation>Deschide fișierul de configurare al &amp;portofelului</translation>
+    </message>
+    <message>
+        <source>Open a dash: URI</source>
+        <translation>Deschide un URI dash:</translation>
+    </message>
+    <message>
+        <source>Create a new wallet</source>
+        <translation>Creează un portofel nou</translation>
+    </message>
+    <message>
+        <source>Restore Wallet…</source>
+        <extracomment>Name of the menu item that restores wallet from a backup file.</extracomment>
+        <translation>Restaurează portofel…</translation>
+    </message>
+    <message>
+        <source>Restore a wallet from a backup file</source>
+        <extracomment>Status tip for Restore Wallet menu item</extracomment>
+        <translation>Restaurează un portofel dintr-un fișier de backup</translation>
+    </message>
+    <message>
+        <source>Close all wallets</source>
+        <translation>Închide toate portofelele</translation>
+    </message>
+    <message>
+        <source>%1 &amp;information</source>
+        <translation>%1 &amp;informații</translation>
+    </message>
+    <message>
+        <source>Show the %1 basic information</source>
+        <translation>Arată informațiile de bază despre %1</translation>
+    </message>
+    <message>
+        <source>&amp;Discreet mode</source>
+        <translation>Mod &amp;discret</translation>
+    </message>
+    <message>
+        <source>Mask the values in the Overview tab</source>
+        <translation>Ascunde valorile în tab-ul Prezentare generală</translation>
+    </message>
+    <message>
+        <source>Wallet Data</source>
+        <extracomment>Name of the wallet data file format.</extracomment>
+        <translation>Date portofel</translation>
+    </message>
+    <message>
+        <source>Load Wallet Backup</source>
+        <extracomment>The title for Restore Wallet File Windows</extracomment>
+        <translation>Încarcă backup portofel</translation>
+    </message>
+    <message>
+        <source>Restore Wallet</source>
+        <extracomment>Title of pop-up window shown when the user is attempting to restore a wallet.</extracomment>
+        <translation>Restaurează portofel</translation>
+    </message>
+    <message>
+        <source>Wallet Name</source>
+        <extracomment>Label of the input field where the name of the wallet is entered.</extracomment>
+        <translation>Nume portofel</translation>
+    </message>
     <message>
         <source>&amp;Settings</source>
         <translation>&amp;Setări</translation>
     </message>
+    <message>
+        <source>&amp;Minimize</source>
+        <translation>&amp;Minimizează</translation>
+    </message>
     <message>
         <source>&amp;Help</source>
         <translation>A&amp;jutor</translation>
@@ -455,8 +692,25 @@
         <source>Tabs toolbar</source>
         <translation>Bara de file</translation>
     </message>
+    <message>
+        <source>&amp;Governance</source>
+        <translation>&amp;Guvernare</translation>
+    </message>
+    <message>
+        <source>View Governance Proposals</source>
+        <translation>Vizualizează propunerile de guvernare</translation>
+    </message>
+    <message>
+        <source>&amp;Hide</source>
+        <translation>&amp;Ascunde</translation>
+    </message>
+    <message>
+        <source>S&amp;how</source>
+        <translation>A&amp;rată</translation>
+    </message>
     <message numerus="yes">
         <source>%n active connection(s) to Dash network</source>
+        <extracomment>A substring of the tooltip.</extracomment>
         <translation><numerusform>%n conexiune activă la rețeaua Dash</numerusform><numerusform>%n conexiuni active la rețeaua Dash</numerusform><numerusform>%n conexiuni active la rețeaua Dash </numerusform></translation>
     </message>
     <message>
@@ -471,6 +725,54 @@
         <source>%1 behind</source>
         <translation>%1 în urmă</translation>
     </message>
+    <message>
+        <source>Close Wallet…</source>
+        <translation>Închide portofel…</translation>
+    </message>
+    <message>
+        <source>Load Partially Signed Blockchain Transaction</source>
+        <translation>Încarcă tranzacție blockchain parțial semnată</translation>
+    </message>
+    <message>
+        <source>Load Partially Signed Blockchain Transaction from clipboard</source>
+        <translation>Încarcă tranzacție blockchain parțial semnată din clipboard</translation>
+    </message>
+    <message>
+        <source>Create Wallet…</source>
+        <translation>Creează portofel…</translation>
+    </message>
+    <message>
+        <source>Close All Wallets…</source>
+        <translation>Închide toate portofelele…</translation>
+    </message>
+    <message>
+        <source>Ctrl+Shift+D</source>
+        <translation>Ctrl+Shift+D</translation>
+    </message>
+    <message>
+        <source>Ctrl+M</source>
+        <translation>Ctrl+M</translation>
+    </message>
+    <message>
+        <source>Click for more actions.</source>
+        <extracomment>A substring of the tooltip. "More actions" are available via the context menu.</extracomment>
+        <translation>Click pentru mai multe acțiuni.</translation>
+    </message>
+    <message>
+        <source>Show Peers tab</source>
+        <extracomment>A context menu item. The "Peers tab" is an element of the "Node window".</extracomment>
+        <translation>Arată tab-ul Peers</translation>
+    </message>
+    <message>
+        <source>Disable network activity</source>
+        <extracomment>A context menu item.</extracomment>
+        <translation>Dezactivează activitatea rețelei</translation>
+    </message>
+    <message>
+        <source>Enable network activity</source>
+        <extracomment>A context menu item. The network activity was disabled previously.</extracomment>
+        <translation>Activează activitatea rețelei</translation>
+    </message>
     <message>
         <source>Syncing Headers (%1%)…</source>
         <translation>Se sincronizeaza Header-ele (%1%)…</translation>
@@ -487,10 +789,6 @@
         <source>Processing blocks on disk…</source>
         <translation>Se proceseaza blocurile pe disc…</translation>
     </message>
-    <message>
-        <source>Reindexing blocks on disk…</source>
-        <translation>Se reindexează blocurile pe disc…</translation>
-    </message>
     <message>
         <source>Connecting to peers…</source>
         <translation>Se conecteaza cu alte noduri…</translation>
@@ -519,10 +817,18 @@
         <source>Error</source>
         <translation>Eroare</translation>
     </message>
+    <message>
+        <source>Error: %1</source>
+        <translation>Eroare: %1</translation>
+    </message>
     <message>
         <source>Warning</source>
         <translation>Avertisment</translation>
     </message>
+    <message>
+        <source>Warning: %1</source>
+        <translation>Avertisment: %1</translation>
+    </message>
     <message>
         <source>Information</source>
         <translation>Informaţie</translation>
@@ -605,7 +911,15 @@
         <source>Wallet is &lt;b&gt;encrypted&lt;/b&gt; and currently &lt;b&gt;locked&lt;/b&gt;</source>
         <translation>Portofelul este &lt;b&gt;criptat&lt;/b&gt; iar în momentul de faţă este &lt;b&gt;blocat&lt;/b&gt;</translation>
     </message>
-    </context>
+    <message>
+        <source>Proxy is &lt;b&gt;enabled&lt;/b&gt;: %1</source>
+        <translation>Proxy este &lt;b&gt;activat&lt;/b&gt;: %1</translation>
+    </message>
+    <message>
+        <source>Original message:</source>
+        <translation>Mesaj original:</translation>
+    </message>
+</context>
 <context>
     <name>CoinControlDialog</name>
     <message>
@@ -628,10 +942,6 @@
         <source>Coin Selection</source>
         <translation>Selectarea monedei</translation>
     </message>
-    <message>
-        <source>Dust:</source>
-        <translation>Praf:</translation>
-    </message>
     <message>
         <source>After Fee:</source>
         <translation>După taxe:</translation>
@@ -672,6 +982,10 @@
         <source>Received with address</source>
         <translation>Primite cu adresa</translation>
     </message>
+    <message>
+        <source>Mixing Rounds</source>
+        <translation>Runde de amestecare</translation>
+    </message>
     <message>
         <source>Date</source>
         <translation>Data</translation>
@@ -685,28 +999,32 @@
         <translation>Confirmat</translation>
     </message>
     <message>
-        <source>Copy address</source>
-        <translation>Copiază adresa</translation>
+        <source>Copy amount</source>
+        <translation>Copiază suma</translation>
     </message>
     <message>
-        <source>Copy label</source>
-        <translation>Copiază eticheta</translation>
+        <source>&amp;Copy address</source>
+        <translation>&amp;Copiază adresa</translation>
     </message>
     <message>
-        <source>Copy amount</source>
-        <translation>Copiază suma</translation>
+        <source>Copy &amp;label</source>
+        <translation>Copiază &amp;eticheta</translation>
+    </message>
+    <message>
+        <source>Copy &amp;amount</source>
+        <translation>Copiază &amp;suma</translation>
     </message>
     <message>
-        <source>Copy transaction ID</source>
-        <translation>Copiază ID tranzacţie</translation>
+        <source>Copy transaction &amp;ID and output index</source>
+        <translation>Copiază &amp;ID-ul tranzacției și indexul ieșirii</translation>
     </message>
     <message>
-        <source>Lock unspent</source>
-        <translation>Blocare necheltuiţi</translation>
+        <source>L&amp;ock unspent</source>
+        <translation>B&amp;lochează necheltuite</translation>
     </message>
     <message>
-        <source>Unlock unspent</source>
-        <translation>Deblocare necheltuiţi</translation>
+        <source>&amp;Unlock unspent</source>
+        <translation>&amp;Deblochează necheltuite</translation>
     </message>
     <message>
         <source>Copy quantity</source>
@@ -724,10 +1042,6 @@
         <source>Copy bytes</source>
         <translation>Copiază bytes</translation>
     </message>
-    <message>
-        <source>Copy dust</source>
-        <translation>Copiază praf</translation>
-    </message>
     <message>
         <source>Copy change</source>
         <translation>Copiază rest</translation>
@@ -741,20 +1055,28 @@
         <translation>(%1 blocat)</translation>
     </message>
     <message>
-        <source>yes</source>
-        <translation>Da</translation>
+        <source>Can vary +/- %1 duff(s) per input.</source>
+        <translation>Poate varia +/- %1 duff(i) per intrare.</translation>
     </message>
     <message>
-        <source>no</source>
-        <translation>Nu</translation>
+        <source>Some coins were unselected because they were spent.</source>
+        <translation>Unele monede au fost deselectate deoarece au fost cheltuite.</translation>
     </message>
     <message>
-        <source>This label turns red if any recipient receives an amount smaller than the current dust threshold.</source>
-        <translation>Această etichetă devine roşie, dacă orice beneficiar primeşte o sumă mai mică decât pragul curent pentru praf.</translation>
+        <source>Show all coins</source>
+        <translation>Arată toate monedele</translation>
     </message>
     <message>
-        <source>Can vary +/- %1 duff(s) per input.</source>
-        <translation>Poate varia +/- %1 duff(i) per intrare.</translation>
+        <source>Hide %1 coins</source>
+        <translation>Ascunde monedele %1</translation>
+    </message>
+    <message>
+        <source>Show all %1 coins</source>
+        <translation>Arată toate monedele %1</translation>
+    </message>
+    <message>
+        <source>Show spendable coins only</source>
+        <translation>Arată doar monedele cheltuibile</translation>
     </message>
     <message>
         <source>(no label)</source>
@@ -775,10 +1097,84 @@
 </context>
 <context>
     <name>CreateWalletActivity</name>
-    </context>
+    <message>
+        <source>Create Wallet</source>
+        <extracomment>Title of window indicating the progress of creation of a new wallet.</extracomment>
+        <translation>Creează portofel</translation>
+    </message>
+    <message>
+        <source>Creating Wallet &lt;b&gt;%1&lt;/b&gt;…</source>
+        <extracomment>Descriptive text of the create wallet progress window which indicates to the user which wallet is currently being created.</extracomment>
+        <translation>Creare portofel &lt;b&gt;%1&lt;/b&gt;…</translation>
+    </message>
+    <message>
+        <source>Create wallet failed</source>
+        <translation>Crearea portofelului a eșuat</translation>
+    </message>
+    <message>
+        <source>Create wallet warning</source>
+        <translation>Avertisment creare portofel</translation>
+    </message>
+</context>
 <context>
     <name>CreateWalletDialog</name>
-    </context>
+    <message>
+        <source>Create Wallet</source>
+        <translation>Creează portofel</translation>
+    </message>
+    <message>
+        <source>Wallet Name</source>
+        <translation>Nume portofel</translation>
+    </message>
+    <message>
+        <source>Wallet</source>
+        <translation>Portofel</translation>
+    </message>
+    <message>
+        <source>Encrypt the wallet. The wallet will be encrypted with a passphrase of your choice.</source>
+        <translation>Criptează portofelul. Portofelul va fi criptat cu o parolă la alegerea ta.</translation>
+    </message>
+    <message>
+        <source>Encrypt Wallet</source>
+        <translation>Criptează portofel</translation>
+    </message>
+    <message>
+        <source>Advanced Options</source>
+        <translation>Opțiuni avansate</translation>
+    </message>
+    <message>
+        <source>Disable private keys for this wallet. Wallets with private keys disabled will have no private keys and cannot have an HD seed or imported private keys. This is ideal for watch-only wallets.</source>
+        <translation>Dezactivează cheile private pentru acest portofel. Portofelele cu chei private dezactivate nu vor avea chei private și nu pot avea o sămânță HD sau chei private importate. Acest lucru este ideal pentru portofelele doar-vizualizare.</translation>
+    </message>
+    <message>
+        <source>Disable Private Keys</source>
+        <translation>Dezactivează cheile private</translation>
+    </message>
+    <message>
+        <source>Make a blank wallet. Blank wallets do not initially have private keys or scripts. Private keys and addresses can be imported, or an HD seed can be set, at a later time.</source>
+        <translation>Creează un portofel gol. Portofelele goale nu au inițial chei private sau scripturi. Cheile private și adresele pot fi importate, sau o sămânță HD poate fi setată, ulterior.</translation>
+    </message>
+    <message>
+        <source>Make Blank Wallet</source>
+        <translation>Creează portofel gol</translation>
+    </message>
+    <message>
+        <source>Use descriptors for scriptPubKey management. This feature is well-tested but still considered experimental and not recommended for use yet.</source>
+        <translation>Folosește descriptori pentru gestionarea scriptPubKey. Această funcție este bine testată, dar este încă considerată experimentală și nu este recomandată pentru utilizare încă.</translation>
+    </message>
+    <message>
+        <source>Descriptor Wallet (EXPERIMENTAL)</source>
+        <translation>Portofel cu descriptori (EXPERIMENTAL)</translation>
+    </message>
+    <message>
+        <source>Create</source>
+        <translation>Creează</translation>
+    </message>
+    <message>
+        <source>Compiled without sqlite support (required for descriptor wallets)</source>
+        <translation>Compilat fără suport sqlite (necesar pentru portofelele cu descriptori)</translation>
+    </message>
+</context>
 <context>
     <name>EditAddressDialog</name>
     <message>
@@ -817,6 +1213,14 @@
         <source>The entered address "%1" is not a valid Dash address.</source>
         <translation>Adresa introdusă "%1" nu este o adresă Dash validă</translation>
     </message>
+    <message>
+        <source>Address "%1" already exists as a receiving address with label "%2" and so cannot be added as a sending address.</source>
+        <translation>Adresa "%1" există deja ca adresă de primire cu eticheta "%2" și prin urmare nu poate fi adăugată ca adresă de trimitere.</translation>
+    </message>
+    <message>
+        <source>The entered address "%1" is already in the address book with label "%2".</source>
+        <translation>Adresa introdusă "%1" este deja în agenda de adrese cu eticheta "%2".</translation>
+    </message>
     <message>
         <source>Could not unlock wallet.</source>
         <translation>Portofelul nu a putut fi deblocat.</translation>
@@ -851,22 +1255,138 @@
 </context>
 <context>
     <name>GovernanceList</name>
-    </context>
-<context>
-    <name>HelpMessageDialog</name>
     <message>
-        <source>version</source>
-        <translation>versiune</translation>
+        <source>Form</source>
+        <translation>Formular</translation>
     </message>
     <message>
-        <source>About %1</source>
-        <translation>Despre %1</translation>
+        <source>Filter List:</source>
+        <translation>Listă filtrare:</translation>
     </message>
     <message>
-        <source>Command-line options</source>
-        <translation>Optiuni linie de comanda</translation>
+        <source>Filter proposal list</source>
+        <translation>Filtrează lista de propuneri</translation>
     </message>
-    </context>
+    <message>
+        <source>Masternode Count:</source>
+        <translation>Număr Masternode:</translation>
+    </message>
+    <message>
+        <source>Number of masternodes this wallet can vote with (masternodes for which this wallet holds the voting key)</source>
+        <translation>Numărul de masternoduri cu care acest portofel poate vota (masternoduri pentru care acest portofel deține cheia de vot)</translation>
+    </message>
+    <message>
+        <source>Proposal Count:</source>
+        <translation>Număr propuneri:</translation>
+    </message>
+    <message>
+        <source>Create Proposal</source>
+        <translation>Creează propunere</translation>
+    </message>
+    <message>
+        <source>Filter by Title</source>
+        <translation>Filtrează după titlu</translation>
+    </message>
+    <message>
+        <source>Unavailable</source>
+        <translation>Indisponibil</translation>
+    </message>
+    <message>
+        <source>A synced node and an unlocked wallet are required.</source>
+        <translation>Este necesar un nod sincronizat și un portofel deblocat.</translation>
+    </message>
+    <message>
+        <source>Vote Yes</source>
+        <translation>Votează Da</translation>
+    </message>
+    <message>
+        <source>Vote No</source>
+        <translation>Votează Nu</translation>
+    </message>
+    <message>
+        <source>Vote Abstain</source>
+        <translation>Votează Abținere</translation>
+    </message>
+    <message>
+        <source>Proposal Info: %1</source>
+        <translation>Informații propunere: %1</translation>
+    </message>
+    <message>
+        <source>Voting Failed</source>
+        <translation>Votul a eșuat</translation>
+    </message>
+    <message>
+        <source>No wallet available.</source>
+        <translation>Niciun portofel disponibil.</translation>
+    </message>
+    <message>
+        <source>No masternode voting keys found in wallet.</source>
+        <translation>Nu s-au găsit chei de vot masternode în portofel.</translation>
+    </message>
+    <message>
+        <source>Please select a proposal to vote on.</source>
+        <translation>Vă rugăm să selectați o propunere pentru a vota.</translation>
+    </message>
+    <message>
+        <source>Unable to unlock wallet.</source>
+        <translation>Imposibil de deblocat portofelul.</translation>
+    </message>
+    <message>
+        <source>Unable to get masternode list. Please try again later.</source>
+        <translation>Imposibil de obținut lista masternode. Vă rugăm să încercați din nou mai târziu.</translation>
+    </message>
+    <message>
+        <source>Masternode %1 not found</source>
+        <translation>Masternode-ul %1 nu a fost găsit</translation>
+    </message>
+    <message>
+        <source>Failed to sign vote for masternode %1</source>
+        <translation>Eșec la semnarea votului pentru masternode-ul %1</translation>
+    </message>
+    <message>
+        <source>Masternode %1: %2</source>
+        <translation>Masternode %1: %2</translation>
+    </message>
+    <message numerus="yes">
+        <source>Voted successfully %n time(s)</source>
+        <translation><numerusform>A votat cu succes de %n ori</numerusform><numerusform>A votat cu succes de %n ori</numerusform><numerusform>A votat cu succes de %n ori</numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <source>Failed to vote %n time(s)</source>
+        <translation><numerusform>Eșec la vot de %n ori</numerusform><numerusform>Eșec la vot de %n ori</numerusform><numerusform>Eșec la vot de %n ori</numerusform></translation>
+    </message>
+    <message>
+        <source>Errors:</source>
+        <translation>Erori:</translation>
+    </message>
+    <message>
+        <source>Voting Results</source>
+        <translation>Rezultate vot</translation>
+    </message>
+</context>
+<context>
+    <name>HelpMessageDialog</name>
+    <message>
+        <source>version</source>
+        <translation>versiune</translation>
+    </message>
+    <message>
+        <source>About %1</source>
+        <translation>Despre %1</translation>
+    </message>
+    <message>
+        <source>Command-line options</source>
+        <translation>Optiuni linie de comanda</translation>
+    </message>
+    <message>
+        <source>%1 information</source>
+        <translation>Informații %1</translation>
+    </message>
+    <message>
+        <source>&lt;h3&gt;%1 Basics&lt;/h3&gt; %1 gives you true financial privacy by obscuring the origins of your funds. All the Dash in your wallet is comprised of different "inputs" which you can think of as separate, discrete coins.&lt;br&gt; %1 uses an innovative process to mix your inputs with the inputs of two or more other people, without having your coins ever leave your wallet. You retain control of your money at all times.&lt;hr&gt; &lt;b&gt;The %1 process works like this:&lt;/b&gt;&lt;ol type="1"&gt; &lt;li&gt;%1 begins by breaking your transaction inputs down into standard denominations. These denominations are 0.001 DASH, 0.01 DASH, 0.1 DASH, 1 DASH and 10 DASH -- sort of like the paper money you use every day.&lt;/li&gt; &lt;li&gt;Your wallet then sends requests to specially configured software nodes on the network, called "masternodes." These masternodes are informed then that you are interested in mixing a certain denomination. No identifiable information is sent to the masternodes, so they never know "who" you are.&lt;/li&gt; &lt;li&gt;When two or more other people send similar messages, indicating that they wish to mix the same denomination, a mixing session begins. The masternode mixes up the inputs and instructs all three users' wallets to pay the now-transformed input back to themselves. Your wallet pays that denomination directly to itself, but in a different address (called a change address).&lt;/li&gt; &lt;li&gt;In order to fully obscure your funds, your wallet must repeat this process a number of times with each denomination. Each time the process is completed, it's called a "round." Each round of %1 makes it exponentially more difficult to determine where your funds originated.&lt;/li&gt; &lt;li&gt;This mixing process happens in the background without any intervention on your part. When you wish to make a transaction, your funds will already be mixed. No additional waiting is required.&lt;/li&gt; &lt;/ol&gt; &lt;hr&gt;&lt;b&gt;IMPORTANT:&lt;/b&gt; Your wallet only contains 1000 of these "change addresses." Every time a mixing event happens, up to 9 of your addresses are used up. This means those 1000 addresses last for about 100 mixing events. When 900 of them are used, your wallet must create more addresses. It can only do this, however, if you have automatic backups enabled.&lt;br&gt; Consequently, users who have backups disabled will also have %1 disabled. &lt;hr&gt;For more information, see the &lt;a style="%2" href="%3"&gt;%1 documentation&lt;/a&gt;.</source>
+        <translation>&lt;h3&gt;Noțiuni de bază %1&lt;/h3&gt; %1 vă oferă adevărată confidențialitate financiară prin ascunderea originii fondurilor dumneavoastră. Toate monedele Dash din portofelul dumneavoastră sunt compuse din diferite "intrări" pe care le puteți considera ca monede separate, discrete.&lt;br&gt; %1 folosește un proces inovator pentru a amesteca intrările dumneavoastră cu intrările a două sau mai multe alte persoane, fără ca monedele dumneavoastră să părăsească vreodată portofelul. Rețineți controlul banilor dumneavoastră în orice moment.&lt;hr&gt; &lt;b&gt;Procesul %1 funcționează astfel:&lt;/b&gt;&lt;ol type="1"&gt; &lt;li&gt;%1 începe prin defalcarea intrărilor de tranzacție în denominații standard. Aceste denominații sunt 0.001 DASH, 0.01 DASH, 0.1 DASH, 1 DASH și 10 DASH -- similar cu bancnotele pe care le folosiți în fiecare zi.&lt;/li&gt; &lt;li&gt;Portofelul dumneavoastră trimite apoi cereri către noduri software special configurate în rețea, numite "masternode-uri." Aceste masternode-uri sunt informate că sunteți interesat să amestecați o anumită denominație. Nicio informație identificabilă nu este trimisă către masternode-uri, astfel încât acestea nu știu niciodată "cine" sunteți.&lt;/li&gt; &lt;li&gt;Când două sau mai multe persoane trimit mesaje similare, indicând că doresc să amestece aceeași denominație, începe o sesiune de amestecare. Masternode-ul amestecă intrările și instruiește portofelele tuturor celor trei utilizatori să plătească intrarea acum transformată înapoi către ei înșiși. Portofelul dumneavoastră plătește acea denominație direct către sine, dar la o adresă diferită (numită adresă de rest).&lt;/li&gt; &lt;li&gt;Pentru a ascunde complet fondurile dumneavoastră, portofelul trebuie să repete acest proces de mai multe ori cu fiecare denominație. De fiecare dată când procesul este finalizat, se numește o "rundă." Fiecare rundă de %1 face exponențial mai dificil de determinat de unde au provenit fondurile dumneavoastră.&lt;/li&gt; &lt;li&gt;Acest proces de amestecare se întâmplă în fundal fără nicio intervenție din partea dumneavoastră. Când doriți să faceți o tranzacție, fondurile dumneavoastră vor fi deja amestecate. Nu este necesară nicio așteptare suplimentară.&lt;/li&gt; &lt;/ol&gt; &lt;hr&gt;&lt;b&gt;IMPORTANT:&lt;/b&gt; Portofelul dumneavoastră conține doar 1000 dintre aceste "adrese de rest." De fiecare dată când are loc un eveniment de amestecare, până la 9 dintre adresele dumneavoastră sunt folosite. Aceasta înseamnă că cele 1000 de adrese durează pentru aproximativ 100 de evenimente de amestecare. Când 900 dintre ele sunt folosite, portofelul trebuie să creeze mai multe adrese. Cu toate acestea, poate face acest lucru doar dacă aveți activat backup-urile automate.&lt;br&gt; În consecință, utilizatorii care au backup-urile dezactivate vor avea și %1 dezactivat. &lt;hr&gt;Pentru mai multe informații, consultați &lt;a style="%2" href="%3"&gt;documentația %1&lt;/a&gt;.</translation>
+    </message>
+</context>
 <context>
     <name>Intro</name>
     <message>
@@ -881,10 +1401,26 @@
         <source>As this is the first time the program is launched, you can choose where %1 will store its data.</source>
         <translation>Deoarece este prima lansare a programului poți alege unde %1 va stoca datele sale.</translation>
     </message>
+    <message>
+        <source>Limit block chain storage to</source>
+        <translation>Limitează stocarea blockchain la</translation>
+    </message>
+    <message>
+        <source>Reverting this setting requires re-downloading the entire blockchain. It is faster to download the full chain first and prune it later. Disables some advanced features.</source>
+        <translation>Revenirea la această setare necesită re-descărcarea întregului blockchain. Este mai rapid să descărcați mai întâi lanțul complet și să îl reduceți ulterior. Dezactivează unele funcții avansate.</translation>
+    </message>
+    <message>
+        <source> GB</source>
+        <translation> GB</translation>
+    </message>
     <message>
         <source>This initial synchronisation is very demanding, and may expose hardware problems with your computer that had previously gone unnoticed. Each time you run %1, it will continue downloading where it left off.</source>
         <translation>Sincronizarea initiala necesita foarte multe resurse, si poate releva probleme de hardware ale computerului care anterior au trecut neobservate. De fiecare data cand rulati %1, descarcarea va continua de unde a fost intrerupta.</translation>
     </message>
+    <message>
+        <source>When you click OK, %1 will begin to download and process the full %4 block chain (%2 GB) starting with the earliest transactions in %3 when %4 initially launched.</source>
+        <translation>Când dați click pe OK, %1 va începe să descarce și să proceseze întregul blockchain %4 (%2 GB) începând cu cele mai vechi tranzacții din %3 când %4 a fost lansat inițial.</translation>
+    </message>
     <message>
         <source>If you have chosen to limit block chain storage (pruning), the historical data must still be downloaded and processed, but will be deleted afterward to keep your disk usage low.</source>
         <translation>Daca ati ales o limita pentru capacitatea de stocare a blockchainului (pruning), datele mai vechi tot trebuie sa fie descarcate si procesate, insa vor fi sterse ulterior pentru a reduce utilizarea harddiskului.</translation>
@@ -897,13 +1433,17 @@
         <source>Use a custom data directory:</source>
         <translation>Foloseşte un dosar de date personalizat:</translation>
     </message>
-    <message>
-        <source>%1 GB of free space available</source>
-        <translation>%1 GB de spațiu liber disponibil</translation>
+    <message numerus="yes">
+        <source>%n GB of space available</source>
+        <translation><numerusform>%n GB de spațiu disponibil</numerusform><numerusform>%n GB de spațiu disponibil</numerusform><numerusform>%n GB de spațiu disponibil</numerusform></translation>
     </message>
-    <message>
-        <source>(of %1 GB needed)</source>
-        <translation>(din %1 GB necesar)</translation>
+    <message numerus="yes">
+        <source>(of %n GB needed)</source>
+        <translation><numerusform>(din %n GB necesari)</numerusform><numerusform>(din %n GB necesari)</numerusform><numerusform>(din %n GB necesari)</numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <source>(%n GB needed for full chain)</source>
+        <translation><numerusform>(%n GB necesari pentru lanțul complet)</numerusform><numerusform>(%n GB necesari pentru lanțul complet)</numerusform><numerusform>(%n GB necesari pentru lanțul complet)</numerusform></translation>
     </message>
     <message>
         <source>At least %1 GB of data will be stored in this directory, and it will grow over time.</source>
@@ -913,6 +1453,11 @@
         <source>Approximately %1 GB of data will be stored in this directory.</source>
         <translation>Aproximativ %1 GB de date vor fi stocate in acest director.</translation>
     </message>
+    <message numerus="yes">
+        <source>(sufficient to restore backups %n day(s) old)</source>
+        <extracomment>Explanatory text on the capability of the current prune target.</extracomment>
+        <translation><numerusform>(suficient pentru a restaura backup-uri vechi de %n zile)</numerusform><numerusform>(suficient pentru a restaura backup-uri vechi de %n zile)</numerusform><numerusform>(suficient pentru a restaura backup-uri vechi de %n zile)</numerusform></translation>
+    </message>
     <message>
         <source>%1 will download and store a copy of the Dash block chain.</source>
         <translation>%1 va descarca si stoca o copie a blockchainului Dash</translation>
@@ -930,6 +1475,13 @@
         <translation>Eroare</translation>
     </message>
 </context>
+<context>
+    <name>LoadWalletsActivity</name>
+    <message>
+        <source>Loading wallets…</source>
+        <translation>Se încarcă portofele…</translation>
+    </message>
+</context>
 <context>
     <name>MasternodeList</name>
     <message>
@@ -964,6 +1516,10 @@
         <source>Service</source>
         <translation>Serviciu</translation>
     </message>
+    <message>
+        <source>Type</source>
+        <translation>Tip</translation>
+    </message>
     <message>
         <source>PoSe Score</source>
         <translation>Scorul PoSe</translation>
@@ -1008,6 +1564,14 @@
         <source>Copy Collateral Outpoint</source>
         <translation>Copiază Collateral Outpoint</translation>
     </message>
+    <message>
+        <source>Please wait…</source>
+        <translation>Vă rugăm așteptați…</translation>
+    </message>
+    <message>
+        <source>Updating…</source>
+        <translation>Actualizare…</translation>
+    </message>
     <message>
         <source>ENABLED</source>
         <translation>ACTIVAT</translation>
@@ -1036,6 +1600,10 @@
         <source>NONE</source>
         <translation>Niciuna</translation>
     </message>
+    <message>
+        <source>Filter by any property (e.g. address or protx hash)</source>
+        <translation>Filtrează după orice proprietate (de ex. adresă sau hash protx)</translation>
+    </message>
     <message>
         <source>Additional information for DIP3 Masternode %1</source>
         <translation>Informații suplimentare pentru Masternode DIP3 %1</translation>
@@ -1087,7 +1655,15 @@
         <source>Hide</source>
         <translation>Ascunde</translation>
     </message>
-    </context>
+    <message>
+        <source>%1 is currently syncing.  It will download headers and blocks from peers and validate them until reaching the tip of the block chain.</source>
+        <translation>%1 se sincronizează în prezent. Va descărca header-ele și blocurile de la peers și le va valida până la atingerea vârfului blockchain-ului.</translation>
+    </message>
+    <message>
+        <source>Unknown. Syncing Headers (%1, %2%)…</source>
+        <translation>Necunoscut. Sincronizare anteturi (%1, %2%)…</translation>
+    </message>
+</context>
 <context>
     <name>OpenURIDialog</name>
     <message>
@@ -1098,10 +1674,37 @@
         <source>URI:</source>
         <translation>URI:</translation>
     </message>
+    <message>
+        <source>Paste address from clipboard</source>
+        <extracomment>Tooltip text for button that allows you to paste an address that is in your clipboard.</extracomment>
+        <translation>Lipește adresa din clipboard</translation>
+    </message>
 </context>
 <context>
     <name>OpenWalletActivity</name>
-    </context>
+    <message>
+        <source>Open wallet failed</source>
+        <translation>Deschiderea portofelului a eșuat</translation>
+    </message>
+    <message>
+        <source>Open wallet warning</source>
+        <translation>Avertisment deschidere portofel</translation>
+    </message>
+    <message>
+        <source>default wallet</source>
+        <translation>portofel implicit</translation>
+    </message>
+    <message>
+        <source>Open Wallet</source>
+        <extracomment>Title of window indicating the progress of opening of a wallet.</extracomment>
+        <translation>Deschide portofel</translation>
+    </message>
+    <message>
+        <source>Opening Wallet &lt;b&gt;%1&lt;/b&gt;…</source>
+        <extracomment>Descriptive text of the open wallet progress window which indicates to the user which wallet is currently being opened.</extracomment>
+        <translation>Deschidere portofel &lt;b&gt;%1&lt;/b&gt;…</translation>
+    </message>
+</context>
 <context>
     <name>OptionsDialog</name>
     <message>
@@ -1128,6 +1731,82 @@
         <source>W&amp;allet</source>
         <translation>Portofel</translation>
     </message>
+    <message>
+        <source>&amp;Appearance</source>
+        <translation>&amp;Aspect</translation>
+    </message>
+    <message>
+        <source>Show the icon in the system tray.</source>
+        <translation>Arată iconița în bara de sistem.</translation>
+    </message>
+    <message>
+        <source>&amp;Show tray icon</source>
+        <translation>&amp;Arată iconița în tray</translation>
+    </message>
+    <message>
+        <source>Prune &amp;block storage to</source>
+        <translation>Reduce &amp;stocarea blocurilor la</translation>
+    </message>
+    <message>
+        <source>GB</source>
+        <translation> GB</translation>
+    </message>
+    <message>
+        <source>Reverting this setting requires re-downloading the entire blockchain.</source>
+        <translation>Revenirea la această setare necesită re-descărcarea întregului blockchain.</translation>
+    </message>
+    <message>
+        <source>Maximum database cache size. A larger cache can contribute to faster sync, after which the benefit is less pronounced for most use cases. Lowering the cache size will reduce memory usage. Unused mempool memory is shared for this cache.</source>
+        <extracomment>Tooltip text for Options window setting that sets the size of the database cache. Explains the corresponding effects of increasing/decreasing this value.</extracomment>
+        <translation>Dimensiunea maximă a cache-ului bazei de date. Un cache mai mare poate contribui la o sincronizare mai rapidă, după care beneficiul este mai puțin pronunțat pentru majoritatea cazurilor de utilizare. Reducerea dimensiunii cache-ului va reduce utilizarea memoriei. Memoria mempool nefolosită este partajată pentru acest cache.</translation>
+    </message>
+    <message>
+        <source>MiB</source>
+        <translation>MiB</translation>
+    </message>
+    <message>
+        <source>Set the number of script verification threads. Negative values correspond to the number of cores you want to leave free to the system.</source>
+        <extracomment>Tooltip text for Options window setting that sets the number of script verification threads. Explains that negative values mean to leave these many cores free to the system.</extracomment>
+        <translation>Setează numărul de thread-uri de verificare a scripturilor. Valorile negative corespund numărului de nuclee pe care doriți să le lăsați libere pentru sistem.</translation>
+    </message>
+    <message>
+        <source>This allows you or a third party tool to communicate with the node through command-line and JSON-RPC commands.</source>
+        <extracomment>Tooltip text for Options window setting that enables the RPC server.</extracomment>
+        <translation>Acest lucru vă permite dumneavoastră sau unui instrument terț să comunicați cu nodul prin comenzi command-line și JSON-RPC.</translation>
+    </message>
+    <message>
+        <source>Enable R&amp;PC server</source>
+        <extracomment>An Options window setting to enable the RPC server.</extracomment>
+        <translation>Activează serverul R&amp;PC</translation>
+    </message>
+    <message>
+        <source>Whether to set subtract fee from amount as default or not.</source>
+        <extracomment>Tooltip text for Options window setting that sets subtracting the fee from a sending amount as default.</extracomment>
+        <translation>Dacă să setați sau nu scăderea taxei din sumă ca implicit.</translation>
+    </message>
+    <message>
+        <source>Subtract &amp;fee from amount by default</source>
+        <extracomment>An Options window setting to set subtracting the fee from a sending amount as default.</extracomment>
+        <translation>Scade &amp;taxa din sumă implicit</translation>
+    </message>
+    <message>
+        <source>Enable &amp;PSBT controls</source>
+        <extracomment>An options window setting to enable PSBT controls.</extracomment>
+        <translation>Activează controalele &amp;PSBT</translation>
+    </message>
+    <message>
+        <source>Whether to show PSBT controls.</source>
+        <extracomment>Tooltip text for options window setting that enables PSBT controls.</extracomment>
+        <translation>Dacă să afișeze controalele PSBT.</translation>
+    </message>
+    <message>
+        <source>Whether to keep the specified custom change address or not.</source>
+        <translation>Dacă să păstrați sau nu adresa de rest personalizată specificată.</translation>
+    </message>
+    <message>
+        <source>Keep custom change &amp;address</source>
+        <translation>Păstrează &amp;adresa de rest personalizată</translation>
+    </message>
     <message>
         <source>Show additional tab listing all your masternodes in first sub-tab&lt;br/&gt;and all masternodes on the network in second sub-tab.</source>
         <translation>Afișează o pagină suplimentară care conține lista tuturor masternode-urilor în prima sub-pagină&lt;br/&gt;și toate masternode-urile din rețea în a sub-pagină.</translation>
@@ -1136,14 +1815,114 @@
         <source>Show Masternodes Tab</source>
         <translation>Arată Pagina Masternode-urilor</translation>
     </message>
+    <message>
+        <source>Show additional tab listing governance proposals.</source>
+        <translation>Arată un tab suplimentar care listează propunerile de guvernare.</translation>
+    </message>
+    <message>
+        <source>Show Governance Tab</source>
+        <translation>Arată tab-ul guvernare</translation>
+    </message>
     <message>
         <source>If you disable the spending of unconfirmed change, the change from a transaction&lt;br/&gt;cannot be used until that transaction has at least one confirmation.&lt;br/&gt;This also affects how your balance is computed.</source>
         <translation>Dacă dezactivezi cheltuirea restului neconfirmat, restul dintr-o tranzacție&lt;br/&gt;nu poate fi utilizat până când tranzacția nu are cel puțin o confirmare.&lt;br/&gt;Acest lucru afectează de asemenea modul în care se calculează soldul tău.</translation>
     </message>
+    <message>
+        <source>Show mixing interface on Overview screen and reveal an additional screen which allows to spend fully mixed coins only.&lt;br/&gt;A new tab with more settings will also appear in this dialog, please make sure to check them before mixing your coins.</source>
+        <translation>Arată interfața de amestecare pe ecranul Overview și dezvăluie un ecran suplimentar care permite cheltuirea doar a monedelor complet amestecate.&lt;br/&gt;Un nou tab cu mai multe setări va apărea de asemenea în acest dialog, vă rugăm să vă asigurați că le verificați înainte de a vă amesteca monedele.</translation>
+    </message>
+    <message>
+        <source>Show additional information and buttons on overview screen.</source>
+        <translation>Arată informații suplimentare și butoane pe ecranul de prezentare generală.</translation>
+    </message>
+    <message>
+        <source>Enable advanced interface</source>
+        <translation>Activează interfața avansată</translation>
+    </message>
+    <message>
+        <source>Show system popups for mixing transactions&lt;br/&gt;just like for all other transaction types.</source>
+        <translation>Arată popup-uri de sistem pentru tranzacțiile de amestecare&lt;br/&gt;la fel ca pentru toate celelalte tipuri de tranzacții.</translation>
+    </message>
+    <message>
+        <source>Show popups for mixing transactions</source>
+        <translation>Arată popup-uri pentru tranzacțiile de amestecare</translation>
+    </message>
+    <message>
+        <source>Show warning dialog when the wallet has very low number of keys left.</source>
+        <translation>Arată dialogul de avertizare când portofelul are un număr foarte mic de chei rămase.</translation>
+    </message>
+    <message>
+        <source>Warn if the wallet is running out of keys</source>
+        <translation>Avertizează dacă portofelul rămâne fără chei</translation>
+    </message>
+    <message>
+        <source>Whether to use experimental mode with multiple mixing sessions per block.&lt;br/&gt;Note: You must use this feature carefully.&lt;br/&gt;Make sure you always have recent wallet (auto)backup in a safe place!</source>
+        <translation>Dacă să folosiți sau nu modul experimental cu mai multe sesiuni de amestecare pe bloc.&lt;br/&gt;Notă: Trebuie să folosiți această funcție cu atenție.&lt;br/&gt;Asigurați-vă că aveți întotdeauna un backup (auto) recent al portofelului într-un loc sigur!</translation>
+    </message>
+    <message>
+        <source>Enable &amp;multi-session</source>
+        <translation>Activează &amp;multi-sesiune</translation>
+    </message>
+    <message>
+        <source>Use this many separate masternodes in parallel to mix funds.&lt;br/&gt;Note: You must use this feature carefully.&lt;br/&gt;Make sure you always have recent wallet (auto)backup in a safe place!</source>
+        <translation>Folosiți atât de multe masternode-uri separate în paralel pentru a amesteca fonduri.&lt;br/&gt;Notă: Trebuie să folosiți această funcție cu atenție.&lt;br/&gt;Asigurați-vă că aveți întotdeauna un backup (auto) recent al portofelului într-un loc sigur!</translation>
+    </message>
+    <message>
+        <source>Parallel sessions</source>
+        <translation>Sesiuni paralele</translation>
+    </message>
+    <message>
+        <source>Mixing rounds</source>
+        <translation>Runde amestecare</translation>
+    </message>
+    <message>
+        <source>This amount acts as a threshold to turn off mixing once it's reached.</source>
+        <translation>Această sumă acționează ca un prag pentru a opri amestecarea odată ce este atinsă.</translation>
+    </message>
+    <message>
+        <source>Target balance</source>
+        <translation>Balanță țintă</translation>
+    </message>
+    <message>
+        <source>How many inputs of each denominated amount are created.&lt;br/&gt;Lower these numbers if you want fewer smaller denominations.</source>
+        <translation>Câte input-uri ale fiecărei sume denominate sunt create.&lt;br/&gt;Reduceți aceste numere dacă doriți mai puține denominații mai mici.</translation>
+    </message>
+    <message>
+        <source>Inputs per denomination</source>
+        <translation>Input-uri per denominație</translation>
+    </message>
+    <message>
+        <source>Try to create at least this many inputs for each denominated amount.&lt;br/&gt;Lower this number if you want fewer smaller denominations.</source>
+        <translation>Încercați să creați cel puțin atât de multe intrări pentru fiecare sumă denominată.&lt;br/&gt;Reduceți acest număr dacă doriți mai puține denominații mai mici.</translation>
+    </message>
+    <message>
+        <source>Target</source>
+        <translation>Țintă</translation>
+    </message>
+    <message>
+        <source>Create up to this many inputs for each denominated amount.&lt;br/&gt;Lower this number if you want fewer smaller denominations.</source>
+        <translation>Creați până la atât de multe input-uri pentru fiecare sumă denominată.&lt;br/&gt;Reduceți acest număr dacă doriți mai puține denominații mai mici.</translation>
+    </message>
+    <message>
+        <source>Maximum</source>
+        <translation>Maxim</translation>
+    </message>
     <message>
         <source>Automatically open the Dash Core client port on the router. This only works when your router supports UPnP and it is enabled.</source>
         <translation>Deschide automat portul client Dash Core de pe router. Asta funcționează numai atunci când routerul dvs. acceptă UPnP și este activat.</translation>
     </message>
+    <message>
+        <source>Map port using NA&amp;T-PMP</source>
+        <translation>Mapează portul folosind NA&amp;T-PMP</translation>
+    </message>
+    <message>
+        <source>Accept connections from outside.</source>
+        <translation>Acceptă conexiuni din exterior.</translation>
+    </message>
+    <message>
+        <source>Allow incomin&amp;g connections</source>
+        <translation>Permite conexiuni de &amp;intrare</translation>
+    </message>
     <message>
         <source>Connect to the Dash network through a SOCKS5 proxy.</source>
         <translation>Conectare la reţeaua Dash printr-un proxy SOCKS.</translation>
@@ -1157,12 +1936,26 @@
         <translation>Afișează dacă proxy-ul implicit SOCKS5 furnizat este utilizat pentru a ajunge la peers prin intermediul acestui tip de rețea.</translation>
     </message>
     <message>
-        <source>Minimize instead of exit the application when the window is closed. When this option is enabled, the application will be closed only after selecting Exit in the menu.</source>
-        <translation>Minimizează fereastra în locul părăsirii programului în momentul închiderii ferestrei. Cînd acestă opţiune e activă, aplicaţia se va opri doar în momentul selectării comenzii 'Închide aplicaţia' din menu.</translation>
+        <source>Language missing or translation incomplete? Help contributing translations here:
+https://explore.transifex.com/dash/dash/</source>
+        <translation>Limba lipsește sau traducerea este incompletă? Ajutați contribuind la traduceri aici:
+https://explore.transifex.com/dash/dash/</translation>
+    </message>
+    <message>
+        <source>Third-party URLs (e.g. a block explorer) that appear in the transactions tab as context menu items.&lt;br/&gt;%s in the URL is replaced by transaction hash. Multiple URLs are separated by vertical bar |.</source>
+        <translation>URL-uri terțe (de ex. un explorator de blocuri) care apar în tab-ul de tranzacții ca elemente de meniu contextual.&lt;br/&gt;%s în URL este înlocuit cu hash-ul tranzacției. Mai multe URL-uri sunt separate prin bară verticală |.</translation>
+    </message>
+    <message>
+        <source>&amp;Third-party transaction URLs</source>
+        <translation>URL-uri de tranzacții &amp;terțe</translation>
+    </message>
+    <message>
+        <source>Options set in this dialog are overridden by the command line or in the configuration file:</source>
+        <translation>Opțiunile setate în acest dialog sunt suprascrise de linia de comandă sau în fișierul de configurare:</translation>
     </message>
     <message>
-        <source>Third party URLs (e.g. a block explorer) that appear in the transactions tab as context menu items.&lt;br/&gt;%s in the URL is replaced by transaction hash. Multiple URLs are separated by vertical bar |.</source>
-        <translation>Adresele URL ale unor terțe părți (de exemplu, un explorator block) care apar în tab-ul de tranzacții ca elemente de meniu contextual.&lt;br/&gt;%s în URL este înlocuit de hash-ul tranzacției. Adresele URL multiple sunt separate prin bara verticală |.</translation>
+        <source>Minimize instead of exit the application when the window is closed. When this option is enabled, the application will be closed only after selecting Exit in the menu.</source>
+        <translation>Minimizează fereastra în locul părăsirii programului în momentul închiderii ferestrei. Cînd acestă opţiune e activă, aplicaţia se va opri doar în momentul selectării comenzii 'Închide aplicaţia' din menu.</translation>
     </message>
     <message>
         <source>Whether to show coin control features or not.</source>
@@ -1192,10 +1985,18 @@
         <source>&amp;Network</source>
         <translation>&amp;Retea</translation>
     </message>
+    <message>
+        <source>Enabling pruning significantly reduces the disk space required to store transactions. All blocks are still fully validated. Reverting this setting requires re-downloading the entire blockchain.</source>
+        <translation>Activarea tăierii (pruning) reduce semnificativ spațiul de disc necesar pentru stocarea tranzacțiilor. Toate blocurile sunt încă validate complet. Revenirea acestei setări necesită re-descărcarea întregului blockchain.</translation>
+    </message>
     <message>
         <source>Map port using &amp;UPnP</source>
         <translation>Mapare port folosind &amp;UPnP</translation>
     </message>
+    <message>
+        <source>Automatically open the Dash Core client port on the router. This only works when your router supports NAT-PMP and it is enabled. The external port could be random.</source>
+        <translation>Deschide automat portul clientului Dash Core pe router. Aceasta funcționează doar când routerul dvs. suportă NAT-PMP și este activat. Portul extern poate fi aleatoriu.</translation>
+    </message>
     <message>
         <source>Proxy &amp;IP:</source>
         <translation>Proxy &amp;IP:</translation>
@@ -1244,6 +2045,14 @@
         <source>&amp;Display</source>
         <translation>&amp;Afişare</translation>
     </message>
+    <message>
+        <source>Connect to the Dash network through a separate SOCKS5 proxy for Tor onion services.</source>
+        <translation>Conectați-vă la rețeaua Dash printr-un proxy SOCKS5 separat pentru serviciile Tor onion.</translation>
+    </message>
+    <message>
+        <source>Use separate SOCKS&amp;5 proxy to reach peers via Tor onion services:</source>
+        <translation>Folosește proxy SOCKS&amp;5 separat pentru a ajunge la peer-uri prin servicii Tor onion:</translation>
+    </message>
     <message>
         <source>User Interface &amp;language:</source>
         <translation>Interfaţă utilizator &amp;Limbă</translation>
@@ -1258,7 +2067,7 @@
     </message>
     <message>
         <source>Choose the default subdivision unit to show in the interface and when sending coins.</source>
-        <translation>Alege subdiviziunea folosită la afişarea interfeţei şi la trimiterea de bitcoin.</translation>
+        <translation>Alegeți unitatea de subdiviziune implicită de afișat în interfață și la trimiterea de monede.</translation>
     </message>
     <message>
         <source>Decimal digits</source>
@@ -1274,11 +2083,15 @@
     </message>
     <message>
         <source>&amp;OK</source>
-        <translation>&amp; OK</translation>
+        <translation>&amp;OK</translation>
     </message>
     <message>
         <source>&amp;Cancel</source>
-        <translation>&amp; Renunta</translation>
+        <translation>&amp;Renunta</translation>
+    </message>
+    <message>
+        <source>Enable %1 features</source>
+        <translation>Activează funcțiile %1</translation>
     </message>
     <message>
         <source>default</source>
@@ -1286,14 +2099,22 @@
     </message>
     <message>
         <source>Confirm options reset</source>
+        <extracomment>Window title text of pop-up window shown when the user has chosen to reset options.</extracomment>
         <translation>Confirmă resetarea opţiunilor</translation>
     </message>
     <message>
         <source>Client restart required to activate changes.</source>
+        <extracomment>Text explaining that the settings changed will not come into effect until the client is restarted.</extracomment>
         <translation>Este necesară repornirea clientului pentru a activa schimbările.</translation>
     </message>
+    <message>
+        <source>Current settings will be backed up at "%1".</source>
+        <extracomment>Text explaining to the user that the client's current settings will be backed up at a specific location. %1 is a stand-in argument for the backup location's path.</extracomment>
+        <translation>Setările curente vor fi salvate la "%1".</translation>
+    </message>
     <message>
         <source>Client will be shut down. Do you want to proceed?</source>
+        <extracomment>Text asking the user to confirm if they would like to proceed with a client shutdown.</extracomment>
         <translation>Clientul va fi închis. Doriţi să continuaţi?</translation>
     </message>
     <message>
@@ -1302,7 +2123,7 @@
     </message>
     <message>
         <source>The supplied proxy address is invalid.</source>
-        <translation>Adresa bitcoin pe care a-ti specificat-o este invalida</translation>
+        <translation>Adresa proxy furnizată este invalidă.</translation>
     </message>
 </context>
 <context>
@@ -1427,10 +2248,26 @@
         <source>No inputs detected</source>
         <translation>Nu au fost detectate intrări</translation>
     </message>
+    <message>
+        <source>%1 Balance</source>
+        <translation>Balanță %1</translation>
+    </message>
+    <message>
+        <source>Discreet mode activated for the Overview tab. To unmask the values, uncheck Settings-&gt;Discreet mode.</source>
+        <translation>Mod discret activat pentru tab-ul Prezentare generală. Pentru a demasca valorile, debifați Setări-&gt;Mod discret.</translation>
+    </message>
     <message numerus="yes">
         <source>%n Rounds</source>
         <translation><numerusform>%n Rundă</numerusform><numerusform>%n Runde</numerusform><numerusform>%n Runde</numerusform></translation>
     </message>
+    <message>
+        <source>Found enough compatible inputs to mix %1</source>
+        <translation>S-au găsit suficiente input-uri compatibile pentru a amesteca %1</translation>
+    </message>
+    <message>
+        <source>Not enough compatible inputs to mix &lt;span style='%1'&gt;%2&lt;/span&gt;,&lt;br&gt;will mix &lt;span style='%1'&gt;%3&lt;/span&gt; instead</source>
+        <translation>Nu sunt suficiente input-uri compatibile pentru a amesteca &lt;span style='%1'&gt;%2&lt;/span&gt;,&lt;br&gt;în schimb se va amesteca &lt;span style='%1'&gt;%3&lt;/span&gt;</translation>
+    </message>
     <message>
         <source>Overall progress</source>
         <translation>Progres general</translation>
@@ -1455,6 +2292,26 @@
         <source>keys left: %1</source>
         <translation>chei rămase: %1</translation>
     </message>
+    <message>
+        <source>Start %1</source>
+        <translation>Pornește %1</translation>
+    </message>
+    <message>
+        <source>If you don't want to see internal %1 fees/transactions select "Most Common" as Type on the "Transactions" tab.</source>
+        <translation>Dacă nu doriți să vedeți taxele/tranzacțiile interne %1, selectați "Cele mai comune" ca Tip în tab-ul "Tranzacții".</translation>
+    </message>
+    <message>
+        <source>%1 requires at least %2 to use.</source>
+        <translation>%1 necesită cel puțin %2 pentru a fi folosit.</translation>
+    </message>
+    <message>
+        <source>Wallet is locked and user declined to unlock. Disabling %1.</source>
+        <translation>Portofelul este blocat și utilizatorul a refuzat să-l deblocheze. Se dezactivează %1.</translation>
+    </message>
+    <message>
+        <source>Stop %1</source>
+        <translation>Oprește %1</translation>
+    </message>
     <message>
         <source>Disabled</source>
         <translation>Dezactivat</translation>
@@ -1498,62 +2355,619 @@
 </context>
 <context>
     <name>PSBTOperationsDialog</name>
-    </context>
-<context>
-    <name>PaymentServer</name>
     <message>
-        <source>Payment request error</source>
-        <translation>Eroare la cererea de plată</translation>
+        <source>Dialog</source>
+        <translation>Dialog</translation>
     </message>
     <message>
-        <source>Cannot start dash: click-to-pay handler</source>
-        <translation>Dash nu poate porni: click-to-pay handler</translation>
+        <source>Sign Tx</source>
+        <translation>Semnează Tx</translation>
     </message>
     <message>
-        <source>URI handling</source>
-        <translation>Gestionare URI</translation>
+        <source>Broadcast Tx</source>
+        <translation>Difuzează Tx</translation>
     </message>
     <message>
-        <source>URI cannot be parsed! This can be caused by an invalid Dash address or malformed URI parameters.</source>
-        <translation>URI nu poate fi analizat! Acest lucru poate fi cauzat de o adresă Dash invalidă sau parametri URI deformaţi.</translation>
+        <source>Copy to Clipboard</source>
+        <translation>Copiază în clipboard</translation>
     </message>
     <message>
-        <source>Payment request file handling</source>
-        <translation>Manipulare fişier cerere de plată</translation>
+        <source>Save…</source>
+        <translation>Salvează…</translation>
     </message>
-</context>
-<context>
-    <name>PeerTableModel</name>
+    <message>
+        <source>Close</source>
+        <translation>Închide</translation>
+    </message>
+    <message>
+        <source>Failed to load transaction: %1</source>
+        <translation>Nu s-a reușit încărcarea tranzacției: %1</translation>
+    </message>
+    <message>
+        <source>Failed to sign transaction: %1</source>
+        <translation>Nu s-a reușit semnarea tranzacției: %1</translation>
+    </message>
+    <message>
+        <source>Cannot sign inputs while wallet is locked.</source>
+        <translation>Nu se pot semna intrări în timp ce portofelul este blocat.</translation>
+    </message>
+    <message>
+        <source>Could not sign any more inputs.</source>
+        <translation>Nu s-au putut semna mai multe intrări.</translation>
+    </message>
+    <message>
+        <source>Signed %1 inputs, but more signatures are still required.</source>
+        <translation>S-au semnat %1 intrări, dar mai sunt necesare semnături.</translation>
+    </message>
+    <message>
+        <source>Signed transaction successfully. Transaction is ready to broadcast.</source>
+        <translation>Tranzacție semnată cu succes. Tranzacția este pregătită pentru difuzare.</translation>
+    </message>
+    <message>
+        <source>Unknown error processing transaction.</source>
+        <translation>Eroare necunoscută la procesarea tranzacției.</translation>
+    </message>
+    <message>
+        <source>Transaction broadcast successfully! Transaction ID: %1</source>
+        <translation>Tranzacție difuzată cu succes! ID tranzacție: %1</translation>
+    </message>
+    <message>
+        <source>Transaction broadcast failed: %1</source>
+        <translation>Difuzarea tranzacției a eșuat: %1</translation>
+    </message>
+    <message>
+        <source>PSBT copied to clipboard.</source>
+        <translation>PSBT copiat în clipboard.</translation>
+    </message>
+    <message>
+        <source>Save Transaction Data</source>
+        <translation>Salvează datele tranzacției</translation>
+    </message>
+    <message>
+        <source>Partially Signed Transaction (Binary)</source>
+        <extracomment>Expanded name of the binary PSBT file format. See: BIP 174.</extracomment>
+        <translation>Tranzacție parțial semnată (binară)</translation>
+    </message>
+    <message>
+        <source>PSBT saved to disk.</source>
+        <translation>PSBT salvat pe disc.</translation>
+    </message>
+    <message>
+        <source> * Sends %1 to %2</source>
+        <translation> * Trimite %1 către %2</translation>
+    </message>
+    <message>
+        <source>own address</source>
+        <translation>propria adresă</translation>
+    </message>
+    <message>
+        <source>Unable to calculate transaction fee or total transaction amount.</source>
+        <translation>Imposibil de calculat taxa tranzacției sau suma totală a tranzacției.</translation>
+    </message>
+    <message>
+        <source>Pays transaction fee: </source>
+        <translation>Plătește taxa de tranzacție: </translation>
+    </message>
+    <message>
+        <source>Total Amount</source>
+        <translation>Suma totală</translation>
+    </message>
+    <message>
+        <source>or</source>
+        <translation>sau</translation>
+    </message>
+    <message>
+        <source>Transaction has %1 unsigned inputs.</source>
+        <translation>Tranzacția are %1 intrări nesemnate.</translation>
+    </message>
+    <message>
+        <source>Transaction is missing some information about inputs.</source>
+        <translation>Tranzacției îi lipsesc unele informații despre intrări.</translation>
+    </message>
+    <message>
+        <source>Transaction still needs signature(s).</source>
+        <translation>Tranzacția încă necesită semnătură(i).</translation>
+    </message>
+    <message>
+        <source>(But no wallet is loaded.)</source>
+        <translation>(Dar niciun portofel nu este încărcat.)</translation>
+    </message>
+    <message>
+        <source>(But this wallet cannot sign transactions.)</source>
+        <translation>(Dar acest portofel nu poate semna tranzacții.)</translation>
+    </message>
+    <message>
+        <source>(But this wallet does not have the right keys.)</source>
+        <translation>(Dar acest portofel nu are cheile potrivite.)</translation>
+    </message>
+    <message>
+        <source>Transaction is fully signed and ready for broadcast.</source>
+        <translation>Tranzacția este complet semnată și pregătită pentru difuzare.</translation>
+    </message>
+    <message>
+        <source>Transaction status is unknown.</source>
+        <translation>Starea tranzacției este necunoscută.</translation>
+    </message>
+</context>
+<context>
+    <name>PaymentServer</name>
+    <message>
+        <source>Payment request error</source>
+        <translation>Eroare la cererea de plată</translation>
+    </message>
+    <message>
+        <source>Cannot start dash: click-to-pay handler</source>
+        <translation>Dash nu poate porni: click-to-pay handler</translation>
+    </message>
+    <message>
+        <source>URI handling</source>
+        <translation>Gestionare URI</translation>
+    </message>
+    <message>
+        <source>'dash://' is not a valid URI. Use 'dash:' instead.</source>
+        <translation>'dash://' nu este un URI valid. Folosiți 'dash:' în schimb.</translation>
+    </message>
+    <message>
+        <source>Cannot process payment request as BIP70 is no longer supported.
+Due to discontinued support, you should request the merchant to provide you with a BIP21 compatible URI or use a wallet that does continue to support BIP70.</source>
+        <translation>Nu se poate procesa cererea de plată deoarece BIP70 nu mai este suportat.
+Din cauza încetării suportului, ar trebui să cereți comerciantului să vă furnizeze un URI compatibil BIP21 sau să folosiți un portofel care continuă să suporte BIP70.</translation>
+    </message>
+    <message>
+        <source>URI cannot be parsed! This can be caused by an invalid Dash address or malformed URI parameters.</source>
+        <translation>URI nu poate fi analizat! Acest lucru poate fi cauzat de o adresă Dash invalidă sau parametri URI deformaţi.</translation>
+    </message>
+    <message>
+        <source>Payment request file handling</source>
+        <translation>Manipulare fişier cerere de plată</translation>
+    </message>
+</context>
+<context>
+    <name>PeerTableModel</name>
     <message>
         <source>User Agent</source>
         <extracomment>Title of Peers Table column which contains the peer's User Agent string.</extracomment>
         <translation>Agent utilizator</translation>
     </message>
     <message>
-        <source>Ping</source>
-        <extracomment>Title of Peers Table column which indicates the current latency of the connection with the peer.</extracomment>
-        <translation>Ping</translation>
+        <source>Ping</source>
+        <extracomment>Title of Peers Table column which indicates the current latency of the connection with the peer.</extracomment>
+        <translation>Ping</translation>
+    </message>
+    <message>
+        <source>Peer</source>
+        <extracomment>Title of Peers Table column which contains a unique number used to identify a connection.</extracomment>
+        <translation>Peer</translation>
+    </message>
+    <message>
+        <source>Age</source>
+        <extracomment>Title of Peers Table column which indicates the duration (length of time) since the peer connection started.</extracomment>
+        <translation>Vârstă</translation>
+    </message>
+    <message>
+        <source>Direction</source>
+        <extracomment>Title of Peers Table column which indicates the direction the peer connection was initiated from.</extracomment>
+        <translation>Direcție</translation>
+    </message>
+    <message>
+        <source>Type</source>
+        <extracomment>Title of Peers Table column which describes the type of peer connection. The "type" describes why the connection exists.</extracomment>
+        <translation>Tip</translation>
+    </message>
+    <message>
+        <source>Sent</source>
+        <extracomment>Title of Peers Table column which indicates the total amount of network information we have sent to the peer.</extracomment>
+        <translation>Trimis</translation>
+    </message>
+    <message>
+        <source>Received</source>
+        <extracomment>Title of Peers Table column which indicates the total amount of network information we have received from the peer.</extracomment>
+        <translation>Primit</translation>
+    </message>
+    <message>
+        <source>Address</source>
+        <extracomment>Title of Peers Table column which contains the IP/Onion/I2P address of the connected peer.</extracomment>
+        <translation>Adresă</translation>
+    </message>
+    <message>
+        <source>Network</source>
+        <extracomment>Title of Peers Table column which states the network the peer connected through.</extracomment>
+        <translation>Rețea</translation>
+    </message>
+    <message>
+        <source>Inbound</source>
+        <extracomment>An Inbound Connection from a Peer.</extracomment>
+        <translation>Intrare</translation>
+    </message>
+    <message>
+        <source>Outbound</source>
+        <extracomment>An Outbound Connection to a Peer.</extracomment>
+        <translation>Ieșire</translation>
+    </message>
+</context>
+<context>
+    <name>Proposal</name>
+    <message>
+        <source>Passing +%1</source>
+        <translation>Se trece +%1</translation>
+    </message>
+    <message>
+        <source>Needs additional %1 votes</source>
+        <translation>Necesită %1 voturi suplimentare</translation>
+    </message>
+</context>
+<context>
+    <name>ProposalModel</name>
+    <message>
+        <source>Yes</source>
+        <translation>Da</translation>
+    </message>
+    <message>
+        <source>No</source>
+        <translation>Nu</translation>
+    </message>
+    <message>
+        <source>Hash</source>
+        <translation>Hash</translation>
+    </message>
+    <message>
+        <source>Title</source>
+        <translation>Titlu</translation>
+    </message>
+    <message>
+        <source>Start</source>
+        <translation>Start</translation>
+    </message>
+    <message>
+        <source>End</source>
+        <translation>Final</translation>
+    </message>
+    <message>
+        <source>Amount</source>
+        <translation>Sumă</translation>
+    </message>
+    <message>
+        <source>Active</source>
+        <translation>Activ</translation>
+    </message>
+    <message>
+        <source>Status</source>
+        <translation>Status</translation>
+    </message>
+</context>
+<context>
+    <name>ProposalWizard</name>
+    <message>
+        <source>Create Governance Proposal</source>
+        <translation>Creează propunere de guvernare</translation>
+    </message>
+    <message>
+        <source>Enter proposal details</source>
+        <translation>Introduceți detaliile propunerii</translation>
+    </message>
+    <message>
+        <source>A fee will be burned when you prepare the proposal.</source>
+        <translation>O taxă va fi arsă când pregătiți propunerea.</translation>
+    </message>
+    <message>
+        <source>Proposal &amp;name</source>
+        <translation>&amp;Nume propunere</translation>
+    </message>
+    <message>
+        <source>&amp;Description URL</source>
+        <translation>URL &amp;descriere</translation>
+    </message>
+    <message>
+        <source>Payment &amp;address</source>
+        <translation>&amp;Adresă de plată</translation>
+    </message>
+    <message>
+        <source>Payment &amp;amount</source>
+        <translation>S&amp;umă de plată</translation>
+    </message>
+    <message>
+        <source>The amount to request in a single payment</source>
+        <translation>Suma de solicitat într-o singură plată</translation>
+    </message>
+    <message>
+        <source>&amp;First payment</source>
+        <translation>&amp;Prima plată</translation>
+    </message>
+    <message>
+        <source>Pa&amp;yments</source>
+        <translation>Pl&amp;ăți</translation>
+    </message>
+    <message>
+        <source>To&amp;tal amount</source>
+        <translation>Suma to&amp;tală</translation>
+    </message>
+    <message>
+        <source>Proposal &amp;fee</source>
+        <translation>&amp;Taxă propunere</translation>
+    </message>
+    <message>
+        <source>Next</source>
+        <translation>Următorul</translation>
+    </message>
+    <message>
+        <source>Review proposal JSON and validate.</source>
+        <translation>Revizuiți JSON-ul propunerii și validați.</translation>
+    </message>
+    <message>
+        <source>Hex-encoded JSON</source>
+        <translation>JSON codificat în hex</translation>
+    </message>
+    <message>
+        <source>Back</source>
+        <translation>Înapoi</translation>
+    </message>
+    <message>
+        <source>Validate</source>
+        <translation>Validează</translation>
+    </message>
+    <message>
+        <source>Prepare (burn fee) and wait for confirmations.</source>
+        <translation>Pregătiți (ardeți taxa) și așteptați confirmări.</translation>
+    </message>
+    <message>
+        <source>Copy</source>
+        <translation>Copiază</translation>
+    </message>
+    <message>
+        <source>At 1/6 confirmations: can be relayed and queued. At 6/6: accepted and processed.</source>
+        <translation>La 1/6 confirmări: poate fi transmis și pus în coadă. La 6/6: acceptat și procesat.</translation>
+    </message>
+    <message>
+        <source>Confirmations progress</source>
+        <translation>Progres confirmări</translation>
+    </message>
+    <message>
+        <source>Shows progress toward the required number of confirmations for the proposal fee transaction.</source>
+        <translation>Arată progresul către numărul necesar de confirmări pentru tranzacția taxei de propunere.</translation>
+    </message>
+    <message>
+        <source>Estimated time remaining: -</source>
+        <translation>Timp estimat rămas: -</translation>
+    </message>
+    <message>
+        <source>Prepare Proposal</source>
+        <translation>Pregătește propunere</translation>
+    </message>
+    <message>
+        <source>You can submit after 1 confirmation. At 6 confirmations it is accepted and processed.</source>
+        <translation>Puteți trimite după 1 confirmare. La 6 confirmări este acceptată și procesată.</translation>
+    </message>
+    <message>
+        <source>Proposal ID:</source>
+        <translation>ID propunere:</translation>
+    </message>
+    <message>
+        <source>Submit Proposal</source>
+        <translation>Trimite propunerea</translation>
+    </message>
+    <message>
+        <source>Close</source>
+        <translation>Închide</translation>
+    </message>
+    <message>
+        <source>Valid</source>
+        <translation>Valid</translation>
+    </message>
+    <message>
+        <source>Invalid: %1</source>
+        <translation>Invalid: %1</translation>
+    </message>
+    <message>
+        <source>Burn %1</source>
+        <translation>Arde %1</translation>
+    </message>
+    <message>
+        <source>Burn %1 to create the fee transaction?</source>
+        <translation>Ardeți %1 pentru a crea tranzacția de taxă?</translation>
+    </message>
+    <message>
+        <source>Prepare failed</source>
+        <translation>Pregătirea a eșuat</translation>
+    </message>
+    <message>
+        <source>Confirmations: %1 / %2 required</source>
+        <translation>Confirmări: %1 / %2 necesare</translation>
+    </message>
+    <message>
+        <source>Estimated time remaining: Ready</source>
+        <translation>Timp estimat rămas: Gata</translation>
+    </message>
+    <message numerus="yes">
+        <source>Estimated time remaining: %n minute(s)</source>
+        <translation><numerusform>Timp estimat rămas: %n minute</numerusform><numerusform>Timp estimat rămas: %n minute</numerusform><numerusform>Timp estimat rămas: %n minute</numerusform></translation>
+    </message>
+    <message>
+        <source>Your proposal was submitted successfully.</source>
+        <translation>Propunerea dvs. a fost trimisă cu succes.</translation>
+    </message>
+    <message>
+        <source>Already submitted</source>
+        <translation>Deja trimis</translation>
+    </message>
+    <message>
+        <source>This proposal has already been submitted.</source>
+        <translation>Această propunere a fost deja trimisă.</translation>
+    </message>
+    <message>
+        <source>Submission failed</source>
+        <translation>Trimiterea a eșuat</translation>
+    </message>
+    <message>
+        <source>Proposal submitted</source>
+        <translation>Propunere trimisă</translation>
+    </message>
+    <message>
+        <source>A fee of %1 will be burned when you prepare the proposal.</source>
+        <translation>O taxă de %1 va fi arsă când pregătiți propunerea.</translation>
+    </message>
+    <message>
+        <source>Prepare (burn %1) and wait for %2 confirmations.</source>
+        <translation>Pregătiți (ardeți %1) și așteptați %2 confirmări.</translation>
+    </message>
+</context>
+<context>
+    <name>QObject</name>
+    <message>
+        <source>Do you want to reset settings to default values, or to abort without making changes?</source>
+        <extracomment>Explanatory text shown on startup when the settings file cannot be read. Prompts user to make a choice between resetting or aborting.</extracomment>
+        <translation>Doriți să resetați setările la valorile implicite sau să anulați fără a face modificări?</translation>
+    </message>
+    <message>
+        <source>A fatal error occurred. Check that settings file is writable, or try running with -nosettings.</source>
+        <extracomment>Explanatory text shown on startup when the settings file could not be written. Prompts user to check that we have the ability to write to the file. Explains that the user has the option of running without a settings file.</extracomment>
+        <translation>A apărut o eroare fatală. Verificați că fișierul de setări este inscriptibil sau încercați să rulați cu -nosettings.</translation>
+    </message>
+    <message>
+        <source>Choose data directory on startup (default: %u)</source>
+        <translation>Alegeți directorul de date la pornire (implicit: %u)</translation>
+    </message>
+    <message>
+        <source>Set the font family. Possible values: %1. (default: %2)</source>
+        <translation>Setați familia de font. Valori posibile: %1. (implicit: %2)</translation>
+    </message>
+    <message>
+        <source>Set a scale factor which gets applied to the base font size. Possible range %1 (smallest fonts) to %2 (largest fonts). (default: %3)</source>
+        <translation>Setați un factor de scalare care se aplică la dimensiunea de bază a fontului. Interval posibil %1 (cele mai mici fonturi) până la %2 (cele mai mari fonturi). (implicit: %3)</translation>
+    </message>
+    <message>
+        <source>Set the font weight for bold texts. Possible range %1 to %2 (default: %3)</source>
+        <translation>Setați grosimea fontului pentru textele îngroșate. Interval posibil %1 până la %2 (implicit: %3)</translation>
+    </message>
+    <message>
+        <source>Set the font weight for normal texts. Possible range %1 to %2 (default: %3)</source>
+        <translation>Setați grosimea fontului pentru textele normale. Interval posibil %1 până la %2 (implicit: %3)</translation>
+    </message>
+    <message>
+        <source>Set language, for example "de_DE" (default: system locale)</source>
+        <translation>Setați limba, de exemplu "de_DE" (implicit: limba sistemului)</translation>
+    </message>
+    <message>
+        <source>Start minimized</source>
+        <translation>Pornește minimizat</translation>
+    </message>
+    <message>
+        <source>Reset all settings changed in the GUI</source>
+        <translation>Resetează toate setările modificate în GUI</translation>
+    </message>
+    <message>
+        <source>Show splash screen on startup (default: %u)</source>
+        <translation>Arată ecranul de pornire la startup (implicit: %u)</translation>
+    </message>
+    <message>
+        <source>Error: Specified data directory "%1" does not exist.</source>
+        <translation>Eroare: Directorul de date specificat "%1" nu există.</translation>
+    </message>
+    <message>
+        <source>Error: Cannot parse configuration file: %1.</source>
+        <translation>Eroare: Nu se poate analiza fișierul de configurare: %1.</translation>
+    </message>
+    <message>
+        <source>Error: %1</source>
+        <translation>Eroare: %1</translation>
+    </message>
+    <message>
+        <source>Error: Failed to load application fonts.</source>
+        <translation>Eroare: Eșec la încărcarea fonturilor aplicației.</translation>
+    </message>
+    <message>
+        <source>Error: Specified font-family invalid. Valid values: %1.</source>
+        <translation>Eroare: Font-family specificat invalid. Valori valide: %1.</translation>
+    </message>
+    <message>
+        <source>Error: Specified font-weight-normal invalid. Valid range %1 to %2.</source>
+        <translation>Eroare: Font-weight-normal specificat invalid. Interval valid %1 până la %2.</translation>
+    </message>
+    <message>
+        <source>Error: Specified font-weight-bold invalid. Valid range %1 to %2.</source>
+        <translation>Eroare: Font-weight-bold specificat invalid. Interval valid %1 până la %2.</translation>
+    </message>
+    <message>
+        <source>Error: Specified font-scale invalid. Valid range %1 to %2.</source>
+        <translation>Eroare: Font-scale specificat invalid. Interval valid %1 până la %2.</translation>
+    </message>
+    <message>
+        <source>Error: Invalid -custom-css-dir path.</source>
+        <translation>Eroare: Cale -custom-css-dir invalidă.</translation>
+    </message>
+    <message>
+        <source>Error: %1 CSS file(s) missing in -custom-css-dir path.</source>
+        <translation>Eroare: %1 fișier(e) CSS lipsesc în calea -custom-css-dir.</translation>
+    </message>
+    <message>
+        <source>%1 didn't yet exit safely…</source>
+        <translation>%1 nu a fost inchis in siguranta…</translation>
+    </message>
+    <message>
+        <source>Amount</source>
+        <translation>Cantitate</translation>
+    </message>
+    <message>
+        <source>Enter a Dash address (e.g. %1)</source>
+        <translation>Introduceţi o adresă Dash (de exemplu %1)</translation>
+    </message>
+    <message>
+        <source>Appearance Setup</source>
+        <translation>Configurare aspect</translation>
+    </message>
+    <message>
+        <source>Please choose your preferred settings for the appearance of %1</source>
+        <translation>Vă rugăm să alegeți setările preferate pentru aspectul %1</translation>
+    </message>
+    <message>
+        <source>This can also be adjusted later in the "Appearance" tab of the preferences.</source>
+        <translation>Aceasta poate fi ajustată și mai târziu în tab-ul "Aspect" al preferințelor.</translation>
+    </message>
+    <message>
+        <source>Ctrl+W</source>
+        <translation>Ctrl+W</translation>
+    </message>
+    <message>
+        <source>Unroutable</source>
+        <translation>Nemarsrutabil</translation>
+    </message>
+    <message>
+        <source>Internal</source>
+        <translation>Intern</translation>
+    </message>
+    <message>
+        <source>Inbound</source>
+        <extracomment>An inbound connection from a peer. An inbound connection is a connection initiated by a peer.</extracomment>
+        <translation>Intrare</translation>
+    </message>
+    <message>
+        <source>Outbound</source>
+        <extracomment>An outbound connection to a peer. An outbound connection is a connection initiated by us.</extracomment>
+        <translation>Ieșire</translation>
+    </message>
+    <message>
+        <source>Full Relay</source>
+        <extracomment>Peer connection type that relays all network information.</extracomment>
+        <translation>Relay complet</translation>
+    </message>
+    <message>
+        <source>Block Relay</source>
+        <extracomment>Peer connection type that relays network information about blocks and not transactions or addresses.</extracomment>
+        <translation>Relay de blocuri</translation>
     </message>
-    </context>
-<context>
-    <name>Proposal</name>
-    </context>
-<context>
-    <name>ProposalModel</name>
-    </context>
-<context>
-    <name>QObject</name>
     <message>
-        <source>%1 didn't yet exit safely…</source>
-        <translation>%1 nu a fost inchis in siguranta…</translation>
+        <source>Manual</source>
+        <extracomment>Peer connection type established manually through one of several methods.</extracomment>
+        <translation>Manual</translation>
     </message>
     <message>
-        <source>Amount</source>
-        <translation>Cantitate</translation>
+        <source>Feeler</source>
+        <extracomment>Short-lived peer connection type that tests the aliveness of known addresses.</extracomment>
+        <translation>Feeler</translation>
     </message>
     <message>
-        <source>Enter a Dash address (e.g. %1)</source>
-        <translation>Introduceţi o adresă Dash (de exemplu %1)</translation>
+        <source>Address Fetch</source>
+        <extracomment>Short-lived peer connection type that solicits known addresses from a peer.</extracomment>
+        <translation>Preluare adrese</translation>
     </message>
     <message>
         <source>%1 d</source>
@@ -1611,6 +3025,22 @@
         <source>%1 and %2</source>
         <translation>%1 şi %2</translation>
     </message>
+    <message>
+        <source>%1 B</source>
+        <translation>%1 B</translation>
+    </message>
+    <message>
+        <source>%1 kB</source>
+        <translation>%1 kB</translation>
+    </message>
+    <message>
+        <source>%1 MB</source>
+        <translation>%1 MB</translation>
+    </message>
+    <message>
+        <source>%1 GB</source>
+        <translation>%1 GB</translation>
+    </message>
     <message>
         <source>unknown</source>
         <translation>necunoscut</translation>
@@ -1641,11 +3071,28 @@
         <source>&amp;Copy Image</source>
         <translation>&amp;Copiaza Imaginea</translation>
     </message>
+    <message>
+        <source>Resulting URI too long, try to reduce the text for label / message.</source>
+        <translation>URI rezultat prea lung, încercați să reduceți textul pentru etichetă / mesaj.</translation>
+    </message>
+    <message>
+        <source>Error encoding URI into QR Code.</source>
+        <translation>Eroare la codificarea URI în cod QR.</translation>
+    </message>
+    <message>
+        <source>QR code support not available.</source>
+        <translation>Suport pentru cod QR indisponibil.</translation>
+    </message>
     <message>
         <source>Save QR Code</source>
         <translation>Salvează codul QR</translation>
     </message>
-    </context>
+    <message>
+        <source>PNG Image</source>
+        <extracomment>Expanded name of the PNG file format. See: https://en.wikipedia.org/wiki/Portable_Network_Graphics.</extracomment>
+        <translation>Imagine PNG</translation>
+    </message>
+</context>
 <context>
     <name>RPCConsole</name>
     <message>
@@ -1736,6 +3183,10 @@
         <source>&amp;Peers</source>
         <translation>&amp;Parteneri</translation>
     </message>
+    <message>
+        <source>Wallet:</source>
+        <translation>Portofel:</translation>
+    </message>
     <message>
         <source>Banned peers</source>
         <translation>Terti banati</translation>
@@ -1748,6 +3199,14 @@
         <source>Version</source>
         <translation>versiune</translation>
     </message>
+    <message>
+        <source>High bandwidth BIP152 compact block relay: %1</source>
+        <translation>Releu bloc compact BIP152 cu lățime de bandă mare: %1</translation>
+    </message>
+    <message>
+        <source>High Bandwidth</source>
+        <translation>Lățime de bandă mare</translation>
+    </message>
     <message>
         <source>Starting Block</source>
         <translation>Bloc de început</translation>
@@ -1760,6 +3219,71 @@
         <source>Synced Blocks</source>
         <translation>Blocuri Sincronizate</translation>
     </message>
+    <message>
+        <source>Elapsed time since a novel block passing initial validity checks was received from this peer.</source>
+        <translation>Timp scurs de când un bloc nou care a trecut verificările inițiale de validitate a fost primit de la acest peer.</translation>
+    </message>
+    <message>
+        <source>Last Block</source>
+        <translation>Ultimul bloc</translation>
+    </message>
+    <message>
+        <source>Elapsed time since a novel transaction accepted into our mempool was received from this peer.</source>
+        <extracomment>Tooltip text for the Last Transaction field in the peer details area.</extracomment>
+        <translation>Timp scurs de la primirea unei tranzacții noi acceptate în mempool-ul nostru de la acest peer.</translation>
+    </message>
+    <message>
+        <source>Last Transaction</source>
+        <translation>Ultima tranzacție</translation>
+    </message>
+    <message>
+        <source>The mapped Autonomous System used for diversifying peer selection.</source>
+        <translation>Sistemul autonom mapitat folosit pentru diversificarea selecției peer-urilor.</translation>
+    </message>
+    <message>
+        <source>Mapped AS</source>
+        <translation>AS mapitat</translation>
+    </message>
+    <message>
+        <source>Whether we relay addresses to this peer.</source>
+        <extracomment>Tooltip text for the Address Relay field in the peer details area, which displays whether we relay addresses to this peer (Yes/No).</extracomment>
+        <translation>Dacă transmitem adrese către acest peer.</translation>
+    </message>
+    <message>
+        <source>Address Relay</source>
+        <extracomment>Text title for the Address Relay field in the peer details area, which displays whether we relay addresses to this peer (Yes/No).</extracomment>
+        <translation>Releu adrese</translation>
+    </message>
+    <message>
+        <source>Addresses Processed</source>
+        <extracomment>Text title for the Addresses Processed field in the peer details area, which displays the total number of addresses received from this peer that were processed (excludes addresses that were dropped due to rate-limiting).</extracomment>
+        <translation>Adrese procesate</translation>
+    </message>
+    <message>
+        <source>Addresses Rate-Limited</source>
+        <extracomment>Text title for the Addresses Rate-Limited field in the peer details area, which displays the total number of addresses received from this peer that were dropped (not processed) due to rate-limiting.</extracomment>
+        <translation>Adrese limitate de rată</translation>
+    </message>
+    <message>
+        <source>Rescan blockchain files 1</source>
+        <translation>Rescanează fișierele blockchain 1</translation>
+    </message>
+    <message>
+        <source>Rescan blockchain files 2</source>
+        <translation>Rescanează fișierele blockchain 2</translation>
+    </message>
+    <message>
+        <source>The buttons below will restart the wallet with command-line options to repair the wallet, fix issues with corrupt blockchain files or missing/obsolete transactions.</source>
+        <translation>Butoanele de mai jos vor reporni portofelul cu opțiuni din linia de comandă pentru a repara portofelul, a remedia problemele cu fișierele blockchain corupte sau tranzacțiile lipsă/învechite.</translation>
+    </message>
+    <message>
+        <source>-rescan=1: Rescan the block chain for missing wallet transactions starting from wallet creation time.</source>
+        <translation>-rescan=1: Rescanează blockchain-ul pentru tranzacții lipsă din portofel începând de la momentul creării portofelului.</translation>
+    </message>
+    <message>
+        <source>-rescan=2: Rescan the block chain for missing wallet transactions starting from genesis block.</source>
+        <translation>-rescan=2: Rescanează blockchain-ul pentru tranzacții lipsă din portofel începând de la blocul geneză.</translation>
+    </message>
     <message>
         <source>User Agent</source>
         <translation>Agent utilizator</translation>
@@ -1768,6 +3292,50 @@
         <source>Datadir</source>
         <translation>Dirdate</translation>
     </message>
+    <message>
+        <source>To specify a non-default location of the data directory use the '%1' option.</source>
+        <translation>Pentru a specifica o locație ne-implicită a directorului de date folosiți opțiunea '%1'.</translation>
+    </message>
+    <message>
+        <source>Blocksdir</source>
+        <translation>Director blocuri</translation>
+    </message>
+    <message>
+        <source>To specify a non-default location of the blocks directory use the '%1' option.</source>
+        <translation>Pentru a specifica o locație ne-implicită a directorului de blocuri folosiți opțiunea '%1'.</translation>
+    </message>
+    <message>
+        <source>Local Addresses</source>
+        <translation>Adrese locale</translation>
+    </message>
+    <message>
+        <source>Network addresses that your Dash node is currently using to communicate with other nodes.</source>
+        <translation>Adresele de rețea pe care nodul dvs. Dash le folosește în prezent pentru a comunica cu alte noduri.</translation>
+    </message>
+    <message>
+        <source>Number of regular Masternodes</source>
+        <translation>Număr Masternode-uri obișnuite</translation>
+    </message>
+    <message>
+        <source>Number of EvoNodes</source>
+        <translation>Număr EvoNode-uri</translation>
+    </message>
+    <message>
+        <source>Current block height</source>
+        <translation>Înălțimea blocului curent</translation>
+    </message>
+    <message>
+        <source>Last block hash</source>
+        <translation>Hash-ul ultimului bloc</translation>
+    </message>
+    <message>
+        <source>Latest ChainLocked block hash</source>
+        <translation>Hash-ul ultimului bloc ChainLocked</translation>
+    </message>
+    <message>
+        <source>Latest ChainLocked block height</source>
+        <translation>Înălțimea ultimului bloc ChainLocked</translation>
+    </message>
     <message>
         <source>Open the %1 debug log file from the current data directory. This can take a few seconds for large log files.</source>
         <translation>Deschide fişierul jurnal depanare %1 din directorul curent. Aceasta poate dura cateva secunde pentru fişierele mai mari.</translation>
@@ -1776,6 +3344,10 @@
         <source>InstantSend locks</source>
         <translation>Chei TrimiteInstant</translation>
     </message>
+    <message>
+        <source>(none)</source>
+        <translation>(niciunul)</translation>
+    </message>
     <message>
         <source>Decrease font size</source>
         <translation>Micsoreaza fontul</translation>
@@ -1788,10 +3360,58 @@
         <source>&amp;Reset</source>
         <translation>&amp;Resetează</translation>
     </message>
+    <message>
+        <source>Node Type</source>
+        <translation>Tip nod</translation>
+    </message>
+    <message>
+        <source>PoSe Score</source>
+        <translation>Scor PoSe</translation>
+    </message>
+    <message>
+        <source>The transport layer version: %1</source>
+        <translation>Versiunea stratului de transport: %1</translation>
+    </message>
+    <message>
+        <source>Transport</source>
+        <translation>Transport</translation>
+    </message>
+    <message>
+        <source>The BIP324 session ID string in hex.</source>
+        <translation>String-ul ID de sesiune BIP324 în hex.</translation>
+    </message>
+    <message>
+        <source>Session ID</source>
+        <translation>ID sesiune</translation>
+    </message>
+    <message>
+        <source>The network protocol this peer is connected through: IPv4, IPv6, Onion, I2P, or CJDNS.</source>
+        <translation>Protocolul de rețea prin care acest peer este conectat: IPv4, IPv6, Onion, I2P sau CJDNS.</translation>
+    </message>
+    <message>
+        <source>Permissions</source>
+        <translation>Permisiuni</translation>
+    </message>
+    <message>
+        <source>The direction and type of peer connection: %1</source>
+        <translation>Direcția și tipul conexiunii peer: %1</translation>
+    </message>
+    <message>
+        <source>Direction/Type</source>
+        <translation>Direcție/Tip</translation>
+    </message>
     <message>
         <source>Services</source>
         <translation>Servicii</translation>
     </message>
+    <message>
+        <source>Whether we relay transactions to this peer.</source>
+        <translation>Dacă preprimăm tranzacții către acest peer.</translation>
+    </message>
+    <message>
+        <source>Transaction Relay</source>
+        <translation>Releu tranzacții</translation>
+    </message>
     <message>
         <source>Connection Time</source>
         <translation>Timp conexiune</translation>
@@ -1828,6 +3448,16 @@
         <source>&amp;Wallet Repair</source>
         <translation>&amp;Repararea Portofelului</translation>
     </message>
+    <message>
+        <source>The total number of addresses received from this peer that were processed (excludes addresses that were dropped due to rate-limiting).</source>
+        <extracomment>Tooltip text for the Addresses Processed field in the peer details area, which displays the total number of addresses received from this peer that were processed (excludes addresses that were dropped due to rate-limiting).</extracomment>
+        <translation>Numărul total de adrese primite de la acest peer care au fost procesate (exclude adresele care au fost eliminate din cauza limitării ratei).</translation>
+    </message>
+    <message>
+        <source>The total number of addresses received from this peer that were dropped (not processed) due to rate-limiting.</source>
+        <extracomment>Tooltip text for the Addresses Rate-Limited field in the peer details area, which displays the total number of addresses received from this peer that were dropped (not processed) due to rate-limiting.</extracomment>
+        <translation>Numărul total de adrese primite de la acest peer care au fost eliminate (neprocesate) din cauza limitării ratei.</translation>
+    </message>
     <message>
         <source>Wallet repair options.</source>
         <translation>Opțiuni de reparație a portofelului</translation>
@@ -1840,10 +3470,60 @@
         <source>-reindex: Rebuild block chain index from current blk000??.dat files.</source>
         <translation>-reindexează: Reconstruiește index-ul block chain din fișierele curente blk000??.dat.</translation>
     </message>
+    <message>
+        <source>Inbound: initiated by peer</source>
+        <extracomment>Explanatory text for an inbound peer connection.</extracomment>
+        <translation>Intrare: inițiat de peer</translation>
+    </message>
+    <message>
+        <source>Outbound Full Relay: default</source>
+        <extracomment>Explanatory text for an outbound peer connection that relays all network information. This is the default behavior for outbound connections.</extracomment>
+        <translation>Outbound Full Relay: implicit</translation>
+    </message>
+    <message>
+        <source>Outbound Block Relay: does not relay transactions or addresses</source>
+        <extracomment>Explanatory text for an outbound peer connection that relays network information about blocks and not transactions or addresses.</extracomment>
+        <translation>Outbound Block Relay: nu retransmite tranzacții sau adrese</translation>
+    </message>
+    <message>
+        <source>Outbound Manual: added using RPC %1 or %2/%3 configuration options</source>
+        <extracomment>Explanatory text for an outbound peer connection that was established manually through one of several methods. The numbered arguments are stand-ins for the methods available to establish manual connections.</extracomment>
+        <translation>Outbound Manual: adăugat folosind RPC %1 sau opțiunile de configurare %2/%3</translation>
+    </message>
+    <message>
+        <source>Outbound Feeler: short-lived, for testing addresses</source>
+        <extracomment>Explanatory text for a short-lived outbound peer connection that is used to test the aliveness of known addresses.</extracomment>
+        <translation>Outbound Feeler: de scurtă durată, pentru testarea adreselor</translation>
+    </message>
+    <message>
+        <source>Outbound Address Fetch: short-lived, for soliciting addresses</source>
+        <extracomment>Explanatory text for a short-lived outbound peer connection that is used to request addresses from a peer.</extracomment>
+        <translation>Outbound Address Fetch: de scurtă durată, pentru solicitarea adreselor</translation>
+    </message>
+    <message>
+        <source>To</source>
+        <translation>Către</translation>
+    </message>
+    <message>
+        <source>we selected the peer for high bandwidth relay</source>
+        <translation>am selectat peer-ul pentru relay cu lățime de bandă mare</translation>
+    </message>
+    <message>
+        <source>From</source>
+        <translation>De la</translation>
+    </message>
+    <message>
+        <source>the peer selected us for high bandwidth relay</source>
+        <translation>peer-ul ne-a selectat pentru relay cu lățime de bandă mare</translation>
+    </message>
     <message>
         <source>No</source>
         <translation>Nu</translation>
     </message>
+    <message>
+        <source>no high bandwidth relay selected</source>
+        <translation>niciun relay cu lățime de bandă mare selectat</translation>
+    </message>
     <message>
         <source>&amp;Disconnect</source>
         <translation>&amp;Deconectare</translation>
@@ -1856,10 +3536,6 @@
         <source>1 &amp;hour</source>
         <translation>1 &amp;oră</translation>
     </message>
-    <message>
-        <source>1 &amp;day</source>
-        <translation>1 &amp;zi</translation>
-    </message>
     <message>
         <source>1 &amp;week</source>
         <translation>1 &amp;săptămână</translation>
@@ -1872,18 +3548,6 @@
         <source>&amp;Unban</source>
         <translation>&amp;Unban</translation>
     </message>
-    <message>
-        <source>Welcome to the %1 RPC console.</source>
-        <translation>Bun venit la consola %1 RPC.</translation>
-    </message>
-    <message>
-        <source>Use up and down arrows to navigate history, and %1 to clear screen.</source>
-        <translation>Foloseste sagetile sus si jos pentru a naviga in istoric si %1 pentru a curata.</translation>
-    </message>
-    <message>
-        <source>WARNING: Scammers have been active, telling users to type commands here, stealing their wallet contents. Do not use this console without fully understanding the ramifications of a command.</source>
-        <translation>AVERTIZARE: scamerii au fost si sunt activi, spunându-le utilizatorilor să tasteze aici comenzile, furându-le conținutul portofelului. Nu folosiți această consolă fără să înțelegeți complet ramificările unei comenzi.</translation>
-    </message>
     <message>
         <source>In:</source>
         <translation>Intrare:</translation>
@@ -1896,19 +3560,146 @@
         <source>Network activity disabled</source>
         <translation>Activitatea retelei a fost oprita.</translation>
     </message>
+    <message>
+        <source>None</source>
+        <translation>Niciunul</translation>
+    </message>
     <message>
         <source>Total: %1 (Enabled: %2)</source>
         <translation>Total: %1 (Activat: %2)</translation>
     </message>
+    <message>
+        <source>Executing command without any wallet</source>
+        <translation>Se execută comanda fără niciun portofel</translation>
+    </message>
+    <message>
+        <source>Ctrl++</source>
+        <extracomment>Main shortcut to increase the RPC console font size.</extracomment>
+        <translation>Ctrl++</translation>
+    </message>
+    <message>
+        <source>Ctrl+=</source>
+        <extracomment>Secondary shortcut to increase the RPC console font size.</extracomment>
+        <translation>Ctrl+=</translation>
+    </message>
+    <message>
+        <source>Ctrl+-</source>
+        <extracomment>Main shortcut to decrease the RPC console font size.</extracomment>
+        <translation>Ctrl+-</translation>
+    </message>
+    <message>
+        <source>Ctrl+_</source>
+        <extracomment>Secondary shortcut to decrease the RPC console font size.</extracomment>
+        <translation>Ctrl+_</translation>
+    </message>
+    <message>
+        <source>Ctrl+Shift+I</source>
+        <translation>Ctrl+Shift+I</translation>
+    </message>
+    <message>
+        <source>Ctrl+Shift+C</source>
+        <translation>Ctrl+Shift+C</translation>
+    </message>
+    <message>
+        <source>Ctrl+Shift+G</source>
+        <translation>Ctrl+Shift+G</translation>
+    </message>
+    <message>
+        <source>Ctrl+Shift+P</source>
+        <translation>Ctrl+Shift+P</translation>
+    </message>
+    <message>
+        <source>Ctrl+Shift+R</source>
+        <translation>Ctrl+Shift+R</translation>
+    </message>
+    <message>
+        <source>Executing command using "%1" wallet</source>
+        <translation>Execută comanda folosind portofelul "%1"</translation>
+    </message>
+    <message>
+        <source>detecting: peer could be v1 or v2</source>
+        <extracomment>Explanatory text for "detecting" transport type.</extracomment>
+        <translation>detectare: peer-ul ar putea fi v1 sau v2</translation>
+    </message>
+    <message>
+        <source>v1: unencrypted, plaintext transport protocol</source>
+        <extracomment>Explanatory text for v1 transport type.</extracomment>
+        <translation>v1: protocol de transport necriptat, text simplu</translation>
+    </message>
+    <message>
+        <source>v2: BIP324 encrypted transport protocol</source>
+        <extracomment>Explanatory text for v2 transport type.</extracomment>
+        <translation>v2: protocol de transport criptat BIP324</translation>
+    </message>
+    <message>
+        <source>&amp;Copy address</source>
+        <extracomment>Context menu action to copy the address of a peer</extracomment>
+        <translation>&amp;Copiază adresa</translation>
+    </message>
+    <message>
+        <source>1 d&amp;ay</source>
+        <translation>1 &amp;zi</translation>
+    </message>
+    <message>
+        <source>&amp;Copy IP/Netmask</source>
+        <extracomment>Context menu action to copy the IP/Netmask of a banned peer. IP/Netmask is the combination of a peer's IP address and its Netmask. For IP address see: https://en.wikipedia.org/wiki/IP_address</extracomment>
+        <translation>&amp;Copiază IP/Mască rețea</translation>
+    </message>
+    <message>
+        <source>Welcome to the %1 RPC console.
+Use up and down arrows to navigate history, and %2 to clear screen.
+Use %3 and %4 to increase or decrease the font size.
+Type %5 for an overview of available commands.
+For more information on using this console, type %6.
+
+%7WARNING: Scammers have been active, telling users to type commands here, stealing their wallet contents. Do not use this console without fully understanding the ramifications of a command.%8</source>
+        <extracomment>RPC console welcome message. Placeholders %7 and %8 are style tags for the warning content, and they are not space separated from the rest of the text intentionally.</extracomment>
+        <translation>Bun venit la consola RPC %1.
+Folosiți săgețile sus și jos pentru a naviga în istoric și %2 pentru a curăța ecranul.
+Folosiți %3 și %4 pentru a mări sau micșora dimensiunea fontului.
+Tastați %5 pentru o prezentare generală a comenzilor disponibile.
+Pentru mai multe informații despre utilizarea acestei console, tastați %6.
+
+%7AVERTISMENT: Escrocii au fost activi, spunând utilizatorilor să tasteze comenzi aici, furând conținutul portofelelor lor. Nu folosiți această consolă fără a înțelege pe deplin ramificațiile unei comenzi.%8</translation>
+    </message>
+    <message>
+        <source>Executing…</source>
+        <extracomment>A console message indicating an entered command is currently being executed.</extracomment>
+        <translation>Se execută…</translation>
+    </message>
+    <message>
+        <source>(peer: %1)</source>
+        <translation>(peer: %1)</translation>
+    </message>
     <message>
         <source>via %1</source>
         <translation>via %1</translation>
     </message>
+    <message>
+        <source>Regular</source>
+        <translation>Regulat</translation>
+    </message>
+    <message>
+        <source>Masternode</source>
+        <translation>Masternode</translation>
+    </message>
+    <message>
+        <source>Verified Masternode</source>
+        <translation>Masternode verificat</translation>
+    </message>
+    <message>
+        <source>Yes</source>
+        <translation>Da</translation>
+    </message>
     <message>
         <source>Unknown</source>
         <translation>necunoscut</translation>
     </message>
-    </context>
+    <message>
+        <source>Never</source>
+        <translation>Niciodată</translation>
+    </message>
+</context>
 <context>
     <name>ReceiveCoinsDialog</name>
     <message>
@@ -1927,6 +3718,10 @@
         <source>An optional message to attach to the payment request, which will be displayed when the request is opened.&lt;br&gt;Note: The message will not be sent with the payment over the Dash network.</source>
         <translation>Un mesaj opțional pentru a atașa solicitării de plată, care va fi afișat la deschiderea cererii.&lt;br&gt;Notă: mesajul nu va fi trimis cu plata prin rețeaua Dash.</translation>
     </message>
+    <message>
+        <source>An optional label to associate with the new receiving address (used by you to identify an invoice).  It is also attached to the payment request.</source>
+        <translation>O etichetă opțională de asociat cu noua adresă de primire (folosită de dvs. pentru a identifica o factură). Este de asemenea atașată la cererea de plată.</translation>
+    </message>
     <message>
         <source>Use this form to request payments. All fields are &lt;b&gt;optional&lt;/b&gt;.</source>
         <translation>Foloseşte acest formular pentru a solicita plăţi. Toate cîmpurile sînt &lt;b&gt;opţionale&lt;/b&gt;.</translation>
@@ -1940,56 +3735,104 @@
         <translation>O sumă opţională de cerut. Lăsaţi gol sau zero pentru a nu cere o sumă anume.</translation>
     </message>
     <message>
-        <source>&amp;Amount:</source>
-        <translation>Sum&amp;a:</translation>
+        <source>&amp;Amount:</source>
+        <translation>Sum&amp;a:</translation>
+    </message>
+    <message>
+        <source>&amp;Create new receiving address</source>
+        <translation>&amp;Creează o nouă adresă de primire</translation>
+    </message>
+    <message>
+        <source>Clear all fields of the form.</source>
+        <translation>Curăţă toate cîmpurile formularului.</translation>
+    </message>
+    <message>
+        <source>Clear</source>
+        <translation>Curăţă</translation>
+    </message>
+    <message>
+        <source>Requested payments history</source>
+        <translation>Istoricul plăţilor cerute</translation>
+    </message>
+    <message>
+        <source>Show the selected request (does the same as double clicking an entry)</source>
+        <translation>Arată cererea selectată (acelaşi lucru ca şi dublu-clic pe o înregistrare)</translation>
+    </message>
+    <message>
+        <source>Show</source>
+        <translation>Arată</translation>
+    </message>
+    <message>
+        <source>Remove the selected entries from the list</source>
+        <translation>Înlătură intrările selectate din listă</translation>
+    </message>
+    <message>
+        <source>Remove</source>
+        <translation>Înlătură</translation>
+    </message>
+    <message>
+        <source>Enter a label to associate with the new receiving address</source>
+        <translation>Introduceți o etichetă de asociat cu noua adresă de primire</translation>
+    </message>
+    <message>
+        <source>Enter a message to attach to the payment request</source>
+        <translation>Introduceți un mesaj de atașat la cererea de plată</translation>
+    </message>
+    <message>
+        <source>Copy &amp;URI</source>
+        <translation>Copiază &amp;URI</translation>
+    </message>
+    <message>
+        <source>&amp;Copy address</source>
+        <translation>&amp;Copiază adresa</translation>
     </message>
     <message>
-        <source>Clear all fields of the form.</source>
-        <translation>Curăţă toate cîmpurile formularului.</translation>
+        <source>Copy &amp;label</source>
+        <translation>Copiază &amp;eticheta</translation>
     </message>
     <message>
-        <source>Clear</source>
-        <translation>Curăţă</translation>
+        <source>Copy &amp;message</source>
+        <translation>Copiază &amp;mesajul</translation>
     </message>
     <message>
-        <source>Requested payments history</source>
-        <translation>Istoricul plăţilor cerute</translation>
+        <source>Copy &amp;amount</source>
+        <translation>Copiază &amp;suma</translation>
     </message>
     <message>
-        <source>Show the selected request (does the same as double clicking an entry)</source>
-        <translation>Arată cererea selectată (acelaşi lucru ca şi dublu-clic pe o înregistrare)</translation>
+        <source>Could not unlock wallet.</source>
+        <translation>Nu s-a putut debloca portofelul.</translation>
     </message>
     <message>
-        <source>Show</source>
-        <translation>Arată</translation>
+        <source>Could not generate new address</source>
+        <translation>Nu s-a putut genera o nouă adresă</translation>
     </message>
+</context>
+<context>
+    <name>ReceiveRequestDialog</name>
     <message>
-        <source>Remove the selected entries from the list</source>
-        <translation>Înlătură intrările selectate din listă</translation>
+        <source>Request payment to …</source>
+        <translation>Solicită plată către …</translation>
     </message>
     <message>
-        <source>Remove</source>
-        <translation>Înlătură</translation>
+        <source>Address:</source>
+        <translation>Adresă:</translation>
     </message>
     <message>
-        <source>Copy URI</source>
-        <translation>Copiază URl</translation>
+        <source>Amount:</source>
+        <translation>Sumă:</translation>
     </message>
     <message>
-        <source>Copy label</source>
-        <translation>Copiază eticheta</translation>
+        <source>Label:</source>
+        <translation>Etichetă:</translation>
     </message>
     <message>
-        <source>Copy message</source>
-        <translation>Copiază mesajul</translation>
+        <source>Message:</source>
+        <translation>Mesaj:</translation>
     </message>
     <message>
-        <source>Copy amount</source>
-        <translation>Copiază suma</translation>
+        <source>Wallet:</source>
+        <translation>Portofel:</translation>
     </message>
-    </context>
-<context>
-    <name>ReceiveRequestDialog</name>
     <message>
         <source>Copy &amp;URI</source>
         <translation>Copiază &amp;URl</translation>
@@ -2042,6 +3885,34 @@
         <translation>Ceruta</translation>
     </message>
 </context>
+<context>
+    <name>RestoreWalletActivity</name>
+    <message>
+        <source>Restore Wallet</source>
+        <extracomment>Title of progress window which is displayed when wallets are being restored.</extracomment>
+        <translation>Restaurează portofel</translation>
+    </message>
+    <message>
+        <source>Restoring Wallet &lt;b&gt;%1&lt;/b&gt;…</source>
+        <extracomment>Descriptive text of the restore wallets progress window which indicates to the user that wallets are currently being restored.</extracomment>
+        <translation>Restaurare portofel &lt;b&gt;%1&lt;/b&gt;…</translation>
+    </message>
+    <message>
+        <source>Restore wallet failed</source>
+        <extracomment>Title of message box which is displayed when the wallet could not be restored.</extracomment>
+        <translation>Restaurarea portofelului a eșuat</translation>
+    </message>
+    <message>
+        <source>Restore wallet warning</source>
+        <extracomment>Title of message box which is displayed when the wallet is restored with some warning.</extracomment>
+        <translation>Avertisment restaurare portofel</translation>
+    </message>
+    <message>
+        <source>Restore wallet message</source>
+        <extracomment>Title of message box which is displayed when the wallet is successfully restored.</extracomment>
+        <translation>Mesaj restaurare portofel</translation>
+    </message>
+</context>
 <context>
     <name>SendCoinsDialog</name>
     <message>
@@ -2076,10 +3947,6 @@
         <source>Fee:</source>
         <translation>Comision:</translation>
     </message>
-    <message>
-        <source>Dust:</source>
-        <translation>Praf:</translation>
-    </message>
     <message>
         <source>Inputs…</source>
         <translation>Intrări</translation>
@@ -2104,6 +3971,14 @@
         <source>Transaction Fee:</source>
         <translation>Taxă tranzacţie:</translation>
     </message>
+    <message>
+        <source>When there is less transaction volume than space in the blocks, miners as well as relaying nodes may enforce a minimum fee. Paying only this minimum fee is just fine, but be aware that this can result in a never confirming transaction once there is more demand for dash transactions than the network can process.</source>
+        <translation>Când există mai puțin volum de tranzacții decât spațiu în blocuri, minerii precum și nodurile de relay pot impune o taxă minimă. Plata doar a acestei taxe minime este perfect în regulă, dar fiți conștienți că acest lucru poate duce la o tranzacție care nu se va confirma niciodată odată ce există mai multă cerere de tranzacții dash decât poate procesa rețeaua.</translation>
+    </message>
+    <message>
+        <source>A too low fee might result in a never confirming transaction (read the tooltip)</source>
+        <translation>O taxă prea mică poate rezulta într-o tranzacție care nu se confirmă niciodată (citiți tooltip-ul)</translation>
+    </message>
     <message>
         <source>(Smart fee not initialized yet. This usually takes a few blocks…)</source>
         <translation>(Taxa smart nu este inca initializata. Aceasta poate dura cateva blocuri…)</translation>
@@ -2132,6 +4007,10 @@
         <source>Note: Not enough data for fee estimation, using the fallback fee instead.</source>
         <translation>Notă: Nu sunt suficiente date pentru estimarea comisionului, folosind în schimb taxa de recuperare.</translation>
     </message>
+    <message>
+        <source>Hide transaction fee settings</source>
+        <translation>Ascunde setările taxei de tranzacție</translation>
+    </message>
     <message>
         <source>Hide</source>
         <translation>Ascunde</translation>
@@ -2192,10 +4071,6 @@
         <source>Copy bytes</source>
         <translation>Copiază octeţi</translation>
     </message>
-    <message>
-        <source>Copy dust</source>
-        <translation>Copiază praf</translation>
-    </message>
     <message>
         <source>Copy change</source>
         <translation>Copiază rest</translation>
@@ -2212,18 +4087,46 @@
         <source>%1 to %2</source>
         <translation>%1 la %2</translation>
     </message>
-    <message>
-        <source>Are you sure you want to send?</source>
-        <translation>Sigur doriţi să trimiteţi?</translation>
-    </message>
     <message>
         <source>&lt;b&gt;(%1 of %2 entries displayed)&lt;/b&gt;</source>
         <translation>&lt;b&gt;(%1 of %2 înregistrările afișate)&lt;/b&gt;</translation>
     </message>
+    <message>
+        <source>S&amp;end mixed funds</source>
+        <translation>Trimite fonduri a&amp;mestecate</translation>
+    </message>
+    <message>
+        <source>Confirm the %1 send action</source>
+        <translation>Confirmă acțiunea de trimitere %1</translation>
+    </message>
+    <message>
+        <source>Cr&amp;eate Unsigned</source>
+        <translation>Cr&amp;eează nesemnat</translation>
+    </message>
+    <message>
+        <source> from wallet '%1'</source>
+        <translation> din portofelul '%1'</translation>
+    </message>
+    <message>
+        <source>%1 to '%2'</source>
+        <translation>%1 către '%2'</translation>
+    </message>
+    <message>
+        <source>%1 funds only</source>
+        <translation>Doar fonduri %1</translation>
+    </message>
     <message>
         <source>any available funds</source>
         <translation>orice fonduri disponibile</translation>
     </message>
+    <message>
+        <source>Transaction fee</source>
+        <translation>Taxă tranzacție</translation>
+    </message>
+    <message>
+        <source>(%1 transactions have higher fees usually due to no change output being allowed)</source>
+        <translation>(%1 tranzacții au taxe mai mari de obicei din cauza faptului că nu este permisă ieșirea de rest)</translation>
+    </message>
     <message>
         <source>Transaction size: %1</source>
         <translation>Marimea tranzactiei: %1</translation>
@@ -2236,10 +4139,71 @@
         <source>This transaction will consume %n input(s)</source>
         <translation><numerusform>Aceasta tranzactie va consuma %n din intrari</numerusform><numerusform>Aceasta tranzactie va consuma %n din intrari</numerusform><numerusform>Aceasta tranzactie va consuma %n din intrari</numerusform></translation>
     </message>
+    <message>
+        <source>Warning: Using %1 with %2 or more inputs can harm your privacy and is not recommended</source>
+        <translation>Avertisment: Folosirea %1 cu %2 sau mai multe input-uri poate dăuna confidențialității dvs. și nu este recomandat</translation>
+    </message>
+    <message>
+        <source>Click to learn more</source>
+        <translation>Clic pentru a afla mai multe</translation>
+    </message>
+    <message>
+        <source>Total Amount</source>
+        <translation>Suma totală</translation>
+    </message>
+    <message>
+        <source>or</source>
+        <translation>sau</translation>
+    </message>
     <message>
         <source>Confirm send coins</source>
         <translation>Confirmă trimiterea de monede</translation>
     </message>
+    <message>
+        <source>Save Transaction Data</source>
+        <translation>Salvează datele tranzacției</translation>
+    </message>
+    <message>
+        <source>PSBT saved</source>
+        <translation>PSBT salvat</translation>
+    </message>
+    <message>
+        <source>Watch-only balance:</source>
+        <translation>Sold doar-vizualizare:</translation>
+    </message>
+    <message>
+        <source>Creates a Partially Signed Blockchain Transaction (PSBT) for use with e.g. an offline %1 wallet, or a PSBT-compatible hardware wallet.</source>
+        <translation>Creează o tranzacție blockchain parțial semnată (PSBT) pentru utilizare cu de ex. un portofel %1 offline sau un portofel hardware compatibil PSBT.</translation>
+    </message>
+    <message>
+        <source>Do you want to create this transaction?</source>
+        <extracomment>Message displayed when attempting to create a transaction. Cautionary text to prompt the user to verify that the displayed transaction details represent the transaction the user intends to create.</extracomment>
+        <translation>Doriți să creați această tranzacție?</translation>
+    </message>
+    <message>
+        <source>Please, review your transaction proposal. This will produce a Partially Signed Blockchain Transaction (PSBT) which you can save or copy and then sign with e.g. an offline %1 wallet, or a PSBT-compatible hardware wallet.</source>
+        <extracomment>Text to inform a user attempting to create a transaction of their current options. At this stage, a user can only create a PSBT. This string is displayed when private keys are disabled and an external signer is not available.</extracomment>
+        <translation>Vă rugăm să revizuiți propunerea de tranzacție. Aceasta va produce o Tranzacție Blockchain Parțial Semnată (PSBT) pe care o puteți salva sau copia și apoi semna cu de exemplu un portofel %1 offline sau un portofel hardware compatibil PSBT.</translation>
+    </message>
+    <message>
+        <source>Please, review your transaction. You can create and send this transaction or create a Partially Signed Blockchain Transaction (PSBT), which you can save or copy and then sign with, e.g., an offline %1 wallet, or a PSBT-compatible hardware wallet.</source>
+        <extracomment>Text to inform a user attempting to create a transaction of their current options. At this stage, a user can send their transaction or create a PSBT. This string is displayed when both private keys and PSBT controls are enabled.</extracomment>
+        <translation>Vă rugăm să revizuiți tranzacția. Puteți crea și trimite această tranzacție sau puteți crea o Tranzacție Blockchain Parțial Semnată (PSBT), pe care o puteți salva sau copia și apoi semna cu, de exemplu, un portofel %1 offline sau un portofel hardware compatibil PSBT.</translation>
+    </message>
+    <message>
+        <source>Please, review your transaction.</source>
+        <extracomment>Text to prompt a user to review the details of the transaction they are attempting to send.</extracomment>
+        <translation>Vă rugăm să revizuiți tranzacția.</translation>
+    </message>
+    <message>
+        <source>To review recipient list click "Show Details…"</source>
+        <translation>Pentru a revizui lista destinatarilor faceți clic pe "Arată detalii…"</translation>
+    </message>
+    <message>
+        <source>Partially Signed Transaction (Binary)</source>
+        <extracomment>Expanded name of the binary PSBT file format. See: BIP 174.</extracomment>
+        <translation>Tranzacție parțial semnată (binară)</translation>
+    </message>
     <message>
         <source>The recipient address is not valid. Please recheck.</source>
         <translation>Adresa destinatarului nu este validă. Rugăm să reverificaţi.</translation>
@@ -2335,6 +4299,10 @@
         <source>A&amp;mount:</source>
         <translation>Su&amp;mă:</translation>
     </message>
+    <message>
+        <source>The amount to send in the selected unit</source>
+        <translation>Suma de trimis în unitatea selectată</translation>
+    </message>
     <message>
         <source>The fee will be deducted from the amount being sent. The recipient will receive a lower amount of Dash than you enter in the amount field. If multiple recipients are selected, the fee is split equally.</source>
         <translation>Taxa va fi dedusă din suma trimisă. Destinatarul va primi o sumă mai mică de Dash decât introduci în câmpul pentru suma. Dacă sunt selectați mai mulți destinatari, taxa este împărțită în mod egal.</translation>
@@ -2343,6 +4311,10 @@
         <source>S&amp;ubtract fee from amount</source>
         <translation>S&amp;cade taxa din suma</translation>
     </message>
+    <message>
+        <source>Use available balance</source>
+        <translation>Folosește balanța disponibilă</translation>
+    </message>
     <message>
         <source>Message:</source>
         <translation>Mesaj:</translation>
@@ -2351,21 +4323,16 @@
         <source>A message that was attached to the dash: URI which will be stored with the transaction for your reference. Note: This message will not be sent over the Dash network.</source>
         <translation>un mesaj a fost ataşat la Dash: URI care va fi stocat cu tranzacţia pentru referinţa dvs. Notă: Acest mesaj nu va fi trimis către reţeaua Dash.</translation>
     </message>
+</context>
+<context>
+    <name>SendConfirmationDialog</name>
     <message>
-        <source>This is an unauthenticated payment request.</source>
-        <translation>Aceasta este o cerere de plata neautentificata.</translation>
-    </message>
-    <message>
-        <source>This is an authenticated payment request.</source>
-        <translation>Aceasta este o cerere de plata autentificata.</translation>
-    </message>
-    <message>
-        <source>Pay To:</source>
-        <translation>Plăteşte către:</translation>
+        <source>Send</source>
+        <translation>Trimite</translation>
     </message>
     <message>
-        <source>Memo:</source>
-        <translation>Memo:</translation>
+        <source>Create Unsigned</source>
+        <translation>Creează nesemnat</translation>
     </message>
 </context>
 <context>
@@ -2453,6 +4420,14 @@
         <source>The Dash address the message was signed with</source>
         <translation>Introduceţi o adresă Dash</translation>
     </message>
+    <message>
+        <source>The signed message to verify</source>
+        <translation>Mesajul semnat de verificat</translation>
+    </message>
+    <message>
+        <source>The signature given when the message was signed</source>
+        <translation>Semnătura furnizată când mesajul a fost semnat</translation>
+    </message>
     <message>
         <source>Verify the message to ensure it was signed with the specified Dash address</source>
         <translation>Verificaţi mesajul pentru a vă asigura că a fost semnat cu adresa Dash specificată</translation>
@@ -2465,10 +4440,22 @@
         <source>Reset all verify message fields</source>
         <translation>Reseteaza toate spatiile mesajelor semnate.</translation>
     </message>
+    <message>
+        <source>Enter a message to be signed</source>
+        <translation>Introduceți un mesaj de semnat</translation>
+    </message>
     <message>
         <source>Click "Sign Message" to generate signature</source>
         <translation>Click "Semneaza msajul" pentru a genera semnatura</translation>
     </message>
+    <message>
+        <source>Enter a message to be verified</source>
+        <translation>Introduceți un mesaj de verificat</translation>
+    </message>
+    <message>
+        <source>Enter a signature for the message to be verified</source>
+        <translation>Introduceți o semnătură pentru mesajul de verificat</translation>
+    </message>
     <message>
         <source>The entered address is invalid.</source>
         <translation>Adresa introdusa nu este valida</translation>
@@ -2485,6 +4472,10 @@
         <source>Wallet unlock was cancelled.</source>
         <translation>Blocarea portofelului a fost intrerupta</translation>
     </message>
+    <message>
+        <source>No error</source>
+        <translation>Nicio eroare</translation>
+    </message>
     <message>
         <source>Private key for the entered address is not available.</source>
         <translation>Cheia privata pentru adresa introdusa nu este valida.</translation>
@@ -2519,28 +4510,40 @@
     </message>
 </context>
 <context>
-    <name>TrafficGraphWidget</name>
+    <name>SplashScreen</name>
+    <message>
+        <source>(press q to shutdown and continue later)</source>
+        <translation>(apăsați q pentru a opri și a continua mai târziu)</translation>
+    </message>
     <message>
-        <source>KB/s</source>
-        <translation>KB/s</translation>
+        <source>press q to shutdown</source>
+        <translation>apăsați q pentru a opri</translation>
     </message>
-    </context>
+</context>
 <context>
-    <name>TransactionDesc</name>
-    <message numerus="yes">
-        <source>Open for %n more block(s)</source>
-        <translation><numerusform>Deschis pentru %n block în plus</numerusform><numerusform>Deschis pentru %n block-uri în plus</numerusform><numerusform>Deschis pentru %n block-uri în plus</numerusform></translation>
+    <name>TrafficGraphWidget</name>
+    <message>
+        <source>kB/s</source>
+        <translation>kB/s</translation>
     </message>
     <message>
-        <source>Open until %1</source>
-        <translation>Deschis până la %1</translation>
+        <source>Total</source>
+        <translation>Total</translation>
     </message>
     <message>
-        <source>conflicted</source>
-        <translation>conflictual</translation>
+        <source>Received</source>
+        <translation>Primit</translation>
+    </message>
+    <message>
+        <source>Sent</source>
+        <translation>Trimis</translation>
     </message>
+</context>
+<context>
+    <name>TransactionDesc</name>
     <message>
         <source>0/unconfirmed, %1</source>
+        <extracomment>Text explaining the current status of a transaction, shown in the status field of the details window for this transaction. This status represents an unconfirmed transaction that is in the memory pool.</extracomment>
         <translation>0/neconfirmat, %1</translation>
     </message>
     <message>
@@ -2553,16 +4556,34 @@
     </message>
     <message>
         <source>abandoned</source>
+        <extracomment>Text explaining the current status of a transaction, shown in the status field of the details window for this transaction. This status represents an abandoned transaction.</extracomment>
         <translation>Abandonat</translation>
     </message>
+    <message>
+        <source>conflicted with a transaction with %1 confirmations</source>
+        <extracomment>Text explaining the current status of a transaction, shown in the status field of the details window for this transaction. This status represents an unconfirmed transaction that conflicts with a confirmed transaction.</extracomment>
+        <translation>în conflict cu o tranzacție cu %1 confirmări</translation>
+    </message>
     <message>
         <source>%1/unconfirmed</source>
+        <extracomment>Text explaining the current status of a transaction, shown in the status field of the details window for this transaction. This status represents a transaction confirmed in at least one block, but less than 6 blocks, and still not locked via ChainLocks.</extracomment>
         <translation>%1/neconfirmat</translation>
     </message>
     <message>
         <source>%1 confirmations</source>
+        <extracomment>Text explaining the current status of a transaction, shown in the status field of the details window for this transaction. This status represents a transaction confirmed in 6 or more blocks or locked via ChainLocks.</extracomment>
         <translation>%1 confirmări</translation>
     </message>
+    <message>
+        <source>locked via ChainLocks</source>
+        <extracomment>Text explaining the current status of a transaction, shown in the status field of the details window for this transaction. This status represents a transaction confirmed in at least one block and has been locked by ChainLocks.</extracomment>
+        <translation>blocat prin ChainLocks</translation>
+    </message>
+    <message>
+        <source>verified via InstantSend</source>
+        <extracomment>Text explaining the current status of a transaction, shown in the status field of the details window for this transaction. This status represents an unconfirmed transaction that has been locked by InstantSend.</extracomment>
+        <translation>verificat prin InstantSend</translation>
+    </message>
     <message>
         <source>Status</source>
         <translation>Stare</translation>
@@ -2579,6 +4600,10 @@
         <source>Generated</source>
         <translation>Generat</translation>
     </message>
+    <message>
+        <source>Platform Transfer</source>
+        <translation>Transfer platformă</translation>
+    </message>
     <message>
         <source>From</source>
         <translation>De la</translation>
@@ -2709,14 +4734,6 @@
         <source>Address / Label</source>
         <translation>Adresă / Etichetă</translation>
     </message>
-    <message numerus="yes">
-        <source>Open for %n more block(s)</source>
-        <translation><numerusform>Deschis pentru %n block în plus </numerusform><numerusform>Deschis pentru %n block-uri în plus </numerusform><numerusform>Deschis pentru %n block-uri în plus </numerusform></translation>
-    </message>
-    <message>
-        <source>Open until %1</source>
-        <translation>Deschis până la %1</translation>
-    </message>
     <message>
         <source>Unconfirmed</source>
         <translation>Neconfirmat</translation>
@@ -2745,6 +4762,14 @@
         <source>Generated but not accepted</source>
         <translation>Generat dar neacceptat</translation>
     </message>
+    <message>
+        <source>verified via InstantSend</source>
+        <translation>verificat prin InstantSend</translation>
+    </message>
+    <message>
+        <source>locked via ChainLocks</source>
+        <translation>blocat prin ChainLocks</translation>
+    </message>
     <message>
         <source>Received with</source>
         <translation>Recepţionat cu</translation>
@@ -2753,6 +4778,10 @@
         <source>Received from</source>
         <translation>Primit de la</translation>
     </message>
+    <message>
+        <source>Received via %1</source>
+        <translation>Primit prin %1</translation>
+    </message>
     <message>
         <source>Sent to</source>
         <translation>Trimis către</translation>
@@ -2765,6 +4794,30 @@
         <source>Mined</source>
         <translation>Minat</translation>
     </message>
+    <message>
+        <source>Platform Transfer</source>
+        <translation>Transfer platformă</translation>
+    </message>
+    <message>
+        <source>%1 Mixing</source>
+        <translation>Amestecare %1</translation>
+    </message>
+    <message>
+        <source>%1 Collateral Payment</source>
+        <translation>Plată colateral %1</translation>
+    </message>
+    <message>
+        <source>%1 Make Collateral Inputs</source>
+        <translation>%1 Creează intrări colaterale</translation>
+    </message>
+    <message>
+        <source>%1 Create Denominations</source>
+        <translation>%1 Creează denominații</translation>
+    </message>
+    <message>
+        <source>%1 Send</source>
+        <translation>Trimitere %1</translation>
+    </message>
     <message>
         <source>watch-only</source>
         <translation>doar-supraveghere</translation>
@@ -2844,6 +4897,26 @@
         <source>Sent to</source>
         <translation>Trimis către</translation>
     </message>
+    <message>
+        <source>%1 Send</source>
+        <translation>Trimitere %1</translation>
+    </message>
+    <message>
+        <source>%1 Make Collateral Inputs</source>
+        <translation>%1 Creează intrări colaterale</translation>
+    </message>
+    <message>
+        <source>%1 Create Denominations</source>
+        <translation>%1 Creează denominații</translation>
+    </message>
+    <message>
+        <source>%1 Mixing</source>
+        <translation>Amestecare %1</translation>
+    </message>
+    <message>
+        <source>%1 Collateral Payment</source>
+        <translation>Plată colateral %1</translation>
+    </message>
     <message>
         <source>To yourself</source>
         <translation>Către dvs.</translation>
@@ -2852,54 +4925,80 @@
         <source>Mined</source>
         <translation>Minat</translation>
     </message>
+    <message>
+        <source>Platform Transfer</source>
+        <translation>Transfer platformă</translation>
+    </message>
     <message>
         <source>Other</source>
         <translation>Altele</translation>
     </message>
+    <message>
+        <source>Enter address, transaction id, or label to search</source>
+        <translation>Introduceți adresa, ID-ul tranzacției sau eticheta pentru căutare</translation>
+    </message>
     <message>
         <source>Min amount</source>
         <translation>Cantitatea minimă</translation>
     </message>
     <message>
-        <source>Abandon transaction</source>
-        <translation>Abandoneaza tranzacţia</translation>
+        <source>&amp;Copy address</source>
+        <translation>&amp;Copiază adresa</translation>
     </message>
     <message>
-        <source>Copy address</source>
-        <translation>Copiază adresa</translation>
+        <source>Copy &amp;label</source>
+        <translation>Copiază &amp;eticheta</translation>
     </message>
     <message>
-        <source>Copy label</source>
-        <translation>Copiază eticheta</translation>
+        <source>Copy &amp;amount</source>
+        <translation>Copiază &amp;suma</translation>
     </message>
     <message>
-        <source>Copy amount</source>
-        <translation>Copiază suma</translation>
+        <source>Copy transaction &amp;ID</source>
+        <translation>Copiază &amp;ID-ul tranzacției</translation>
     </message>
     <message>
-        <source>Copy transaction ID</source>
-        <translation>Copiază ID tranzacţie</translation>
+        <source>Copy &amp;raw transaction</source>
+        <translation>Copiază tranzacția &amp;brută</translation>
     </message>
     <message>
-        <source>Copy raw transaction</source>
-        <translation>Copiază tranzacţia bruta</translation>
+        <source>Copy full transaction &amp;details</source>
+        <translation>Copiază &amp;detaliile complete ale tranzacției</translation>
     </message>
     <message>
-        <source>Copy full transaction details</source>
-        <translation>Copiaza toate detaliile tranzacţiei</translation>
+        <source>&amp;Show transaction details</source>
+        <translation>&amp;Arată detaliile tranzacției</translation>
     </message>
     <message>
-        <source>Show transaction details</source>
-        <translation>Arată detaliile tranzacţiei</translation>
+        <source>A&amp;bandon transaction</source>
+        <translation>A&amp;bandonează tranzacția</translation>
     </message>
     <message>
-        <source>Show address QR code</source>
-        <translation>Afișează codul QR al adresei</translation>
+        <source>Rese&amp;nd transaction</source>
+        <translation>Retri&amp;mite tranzacția</translation>
+    </message>
+    <message>
+        <source>&amp;Edit address label</source>
+        <translation>&amp;Editează eticheta adresei</translation>
+    </message>
+    <message>
+        <source>Show address &amp;QR code</source>
+        <translation>Arată codul &amp;QR al adresei</translation>
+    </message>
+    <message>
+        <source>Show in %1</source>
+        <extracomment>Transactions table context menu action to show the selected transaction in a third-party block explorer. %1 is a stand-in argument for the URL of the explorer.</extracomment>
+        <translation>Arată în %1</translation>
     </message>
     <message>
         <source>Export Transaction History</source>
         <translation>Export istoric tranzacţii</translation>
     </message>
+    <message>
+        <source>Comma separated file</source>
+        <extracomment>Expanded name of the CSV file format. See: https://en.wikipedia.org/wiki/Comma-separated_values.</extracomment>
+        <translation>Fișier cu valori separate prin virgulă</translation>
+    </message>
     <message>
         <source>Confirmed</source>
         <translation>Confirmat</translation>
@@ -2966,17 +5065,77 @@
 </context>
 <context>
     <name>WalletController</name>
-    </context>
+    <message>
+        <source>Close wallet</source>
+        <translation>Închide portofel</translation>
+    </message>
+    <message>
+        <source>Are you sure you wish to close the wallet &lt;i&gt;%1&lt;/i&gt;?</source>
+        <translation>Sigur doriți să închideți portofelul &lt;i&gt;%1&lt;/i&gt;?</translation>
+    </message>
+    <message>
+        <source>Closing the wallet for too long can result in having to resync the entire chain if pruning is enabled.</source>
+        <translation>Închiderea portofelului pentru prea mult timp poate duce la necesitatea de a resincroniza întregul lanț dacă reducerea este activată.</translation>
+    </message>
+    <message>
+        <source>Close all wallets</source>
+        <translation>Închide toate portofelele</translation>
+    </message>
+    <message>
+        <source>Are you sure you wish to close all wallets?</source>
+        <translation>Sigur doriți să închideți toate portofele?</translation>
+    </message>
+</context>
 <context>
     <name>WalletFrame</name>
-    </context>
+    <message>
+        <source>No wallet has been loaded.
+Go to File &gt; Open Wallet to load a wallet.
+- OR -</source>
+        <translation>Niciun portofel nu a fost încărcat.
+Mergeți la Fișier &gt; Deschide portofel pentru a încărca un portofel.
+- SAU -</translation>
+    </message>
+    <message>
+        <source>Create a new wallet</source>
+        <translation>Creează un portofel nou</translation>
+    </message>
+    <message>
+        <source>Error</source>
+        <translation>Eroare</translation>
+    </message>
+    <message>
+        <source>Unable to decode PSBT from clipboard (invalid base64)</source>
+        <translation>Imposibil de decodat PSBT din clipboard (base64 invalid)</translation>
+    </message>
+    <message>
+        <source>Load Transaction Data</source>
+        <translation>Încarcă datele tranzacției</translation>
+    </message>
+    <message>
+        <source>Partially Signed Transaction (*.psbt)</source>
+        <translation>Tranzacție parțial semnată (*.psbt)</translation>
+    </message>
+    <message>
+        <source>PSBT file must be smaller than 100 MiB</source>
+        <translation>Fișierul PSBT trebuie să fie mai mic de 100 MiB</translation>
+    </message>
+    <message>
+        <source>Unable to decode PSBT</source>
+        <translation>Imposibil de decodat PSBT</translation>
+    </message>
+</context>
 <context>
     <name>WalletModel</name>
     <message>
         <source>Send Coins</source>
         <translation>Trimite monede</translation>
     </message>
-    </context>
+    <message>
+        <source>default wallet</source>
+        <translation>portofel implicit</translation>
+    </message>
+</context>
 <context>
     <name>WalletView</name>
     <message>
@@ -2991,6 +5150,11 @@
         <source>Selected amount:</source>
         <translation>Suma selectată:</translation>
     </message>
+    <message>
+        <source>Wallet Data</source>
+        <extracomment>Name of the wallet data file format.</extracomment>
+        <translation>Date portofel</translation>
+    </message>
     <message>
         <source>Backup Wallet</source>
         <translation>Backup portofelul electronic</translation>
@@ -3011,12 +5175,16 @@
         <source>The wallet data was successfully saved to %1.</source>
         <translation>Datele portofelului s-au salvat cu succes la %1.</translation>
     </message>
-    </context>
+    <message>
+        <source>Cancel</source>
+        <translation>Anulează</translation>
+    </message>
+</context>
 <context>
     <name>dash-core</name>
     <message>
-        <source>Error: Listening for incoming connections failed (listen returned error %s)</source>
-        <translation>Eroare: Ascultarea conexiunilor de intrare nu a reuşit (ascultarea a reurnat eroarea %s)</translation>
+        <source>This error could occur if this wallet was not shutdown cleanly and was last loaded using a build with a newer version of Berkeley DB. If so, please use the software that last loaded this wallet</source>
+        <translation>Această eroare ar putea apărea dacă acest portofel nu a fost închis corect și a fost încărcat ultima dată folosind o versiune cu o versiune mai nouă de Berkeley DB. Dacă este așa, vă rugăm să folosiți software-ul care a încărcat ultima dată acest portofel</translation>
     </message>
     <message>
         <source>This is a pre-release test build - use at your own risk - do not use for mining or merchant applications</source>
@@ -3071,20 +5239,40 @@
         <translation>Eroare la citirea bazei de date. Oprire.</translation>
     </message>
     <message>
-        <source>Failed to listen on any port. Use -listen=0 if you want this.</source>
-        <translation>Am esuat ascultarea pe orice port. Folositi -listen=0 daca vreti asta.</translation>
+        <source>Error: Missing checksum</source>
+        <translation>Eroare: Checksum lipsește</translation>
     </message>
     <message>
-        <source>-maxtxfee is set very high! Fees this large could be paid on a single transaction.</source>
-        <translation>-maxtxfee este setata foarte sus! Se pot plati taxe de aceasta marime pe o singura tranzactie.</translation>
+        <source>Error: Unable to parse version %u as a uint32_t</source>
+        <translation>Eroare: Imposibil de analizat versiunea %u ca uint32_t</translation>
+    </message>
+    <message>
+        <source>Error: Unable to write record to new wallet</source>
+        <translation>Eroare: Imposibil de scris înregistrare în noul portofel</translation>
+    </message>
+    <message>
+        <source>Failed to listen on any port. Use -listen=0 if you want this.</source>
+        <translation>Am esuat ascultarea pe orice port. Folositi -listen=0 daca vreti asta.</translation>
     </message>
     <message>
         <source>Found unconfirmed denominated outputs, will wait till they confirm to continue.</source>
         <translation>S-au găsit rezultate denominate neconfirmate, vom aștepta până se confirmă continuarea.</translation>
     </message>
     <message>
-        <source>Invalid amount for -maxtxfee=&lt;amount&gt;: '%s' (must be at least the minrelay fee of %s to prevent stuck transactions)</source>
-        <translation>Sumă nevalidă pentru -maxtxfee=&lt;amount&gt;: '%s' (trebuie să fie cel puţin taxa minrelay de %s pentru a preveni blocarea tranzactiilor)</translation>
+        <source>Invalid -socketevents ('%s') specified. Only these modes are supported: %s</source>
+        <translation>Parametru -socketevents ('%s') invalid. Doar aceste moduri sunt suportate: %s</translation>
+    </message>
+    <message>
+        <source>SQLiteDatabase: Unknown sqlite wallet schema version %d. Only version %d is supported</source>
+        <translation>SQLiteDatabase: Versiune schemă portofel sqlite necunoscută %d. Doar versiunea %d este suportată</translation>
+    </message>
+    <message>
+        <source>Transaction index can't be disabled with governance validation enabled. Either start with -disablegovernance command line switch or enable transaction index.</source>
+        <translation>Indexul de tranzacții nu poate fi dezactivat cu validarea guvernării activată. Fie porniți cu parametrul -disablegovernance fie activați indexul de tranzacții.</translation>
+    </message>
+    <message>
+        <source>Unsupported category-specific logging level -loglevel=%s. Expected -loglevel=&lt;category&gt;:&lt;loglevel&gt;. Valid categories: %s. Valid loglevels: %s.</source>
+        <translation>Nivel de jurnalizare specific categoriei nesuportat -loglevel=%s. Așteptat -loglevel=&lt;category&gt;:&lt;loglevel&gt;. Categorii valide: %s. Loglevels valide: %s.</translation>
     </message>
     <message>
         <source>Can't mix: no compatible inputs found!</source>
@@ -3094,6 +5282,14 @@
         <source>Entry exceeds maximum size.</source>
         <translation>Intrarea depășește dimensiunea maximă.</translation>
     </message>
+    <message>
+        <source>Error upgrading evo database for EHF</source>
+        <translation>Eroare la actualizarea bazei de date evo pentru EHF</translation>
+    </message>
+    <message>
+        <source>Failed to commit Evo database</source>
+        <translation>Eșec la commit-ul bazei de date Evo</translation>
+    </message>
     <message>
         <source>Found enough users, signing ( waiting %s )</source>
         <translation>S-au găsit suficienți utilizatori, semnând (așteptând %s )</translation>
@@ -3118,18 +5314,14 @@
         <source>Insufficient funds.</source>
         <translation>Fonduri insuficiente.</translation>
     </message>
-    <message>
-        <source>Invalid amount for -discardfee=&lt;amount&gt;: '%s'</source>
-        <translation>Suma nevalidă pentru -discardfee=&lt;amount&gt;: '%s'</translation>
-    </message>
-    <message>
-        <source>Invalid amount for -paytxfee=&lt;amount&gt;: '%s' (must be at least %s)</source>
-        <translation>Sumă nevalidă pentru -paytxfee=&lt;suma&gt;: '%s' (trebuie să fie cel puţin %s)</translation>
-    </message>
     <message>
         <source>Invalid minimum number of spork signers specified with -minsporkkeys</source>
         <translation>Număr minim de semnatari spork specificat cu -minsporkkeys nu este valabil. </translation>
     </message>
+    <message>
+        <source>Listening for incoming connections failed (listen returned error %s)</source>
+        <translation>Ascultarea conexiunilor de intrare a eșuat (listen a returnat eroarea %s)</translation>
+    </message>
     <message>
         <source>Lock is already in place.</source>
         <translation>Blocarea este deja în vigoare.</translation>
@@ -3186,6 +5378,10 @@
         <source>Synchronizing governance objects…</source>
         <translation>Sincronizarea obiectelor de guvernare…</translation>
     </message>
+    <message>
+        <source>Transaction change output index out of range</source>
+        <translation>Indexul de ieșire pentru rest al tranzacției este în afara intervalului</translation>
+    </message>
     <message>
         <source>Unable to start HTTP server. See debug log for details.</source>
         <translation>Imposibil de pornit serverul HTTP. Pentru detalii vezi logul de depanare.</translation>
@@ -3194,6 +5390,10 @@
         <source>Unknown response.</source>
         <translation>Răspuns necunoscut.</translation>
     </message>
+    <message>
+        <source>Unsupported global logging level -loglevel=%s. Valid values: %s.</source>
+        <translation>Nivel global de logging nesuportat -loglevel=%s. Valori valide: %s.</translation>
+    </message>
     <message>
         <source>User Agent comment (%s) contains unsafe characters.</source>
         <translation>Comentariul (%s) al Agentului Utilizator contine caractere nesigure.</translation>
@@ -3202,6 +5402,14 @@
         <source>Can't find random Masternode.</source>
         <translation>Nu se găseşte un Masternode aleatoariu.</translation>
     </message>
+    <message>
+        <source>%s can't be lower than %s</source>
+        <translation>%s nu poate fi mai mic decât %s</translation>
+    </message>
+    <message>
+        <source>%s is idle.</source>
+        <translation>%s este inactiv.</translation>
+    </message>
     <message>
         <source>Can't mix while sync in progress.</source>
         <translation>Nu se poate amesteca în timp ce sincronizarea este în desfășurare.</translation>
@@ -3226,6 +5434,10 @@
         <source>Make sure to encrypt your wallet and delete all non-encrypted backups after you have verified that the wallet works!</source>
         <translation>Fii sigur sa criptezi portofelul tau si sa stergi toate backup-urile non-criptate dupa ce ai verificat ca portofelul functioneaza!</translation>
     </message>
+    <message>
+        <source>More than one onion bind address is provided. Using %s for the automatically created Tor onion service.</source>
+        <translation>Mai mult de o adresă onion bind este furnizată. Se folosește %s pentru serviciul Tor onion creat automat.</translation>
+    </message>
     <message>
         <source>Prune configured below the minimum of %d MiB.  Please use a higher number.</source>
         <translation>Reductia e configurata sub minimul de %d MiB. Rugam folositi un numar mai mare.</translation>
@@ -3254,14 +5466,14 @@
         <source>Wallet is locked, can't replenish keypool! Automatic backups and mixing are disabled, please unlock your wallet to replenish keypool.</source>
         <translation>Portofelul este blocat, nu poate fi completat keypool-ul! Backupurile automate și amestecarea sunt dezactivate, deblochează portofelul pentru a completa keypool-ul.</translation>
     </message>
-    <message>
-        <source>You need to rebuild the database using -reindex to change -timestampindex</source>
-        <translation>Trebuie să reconstruiești baza de date utilizând -reindex pentru a schimba -timestampindex</translation>
-    </message>
     <message>
         <source>You need to rebuild the database using -reindex to go back to unpruned mode.  This will redownload the entire blockchain</source>
         <translation>Trebuie reconstruita intreaga baza de date folosind -reindex pentru a va intoarce la modul non-redus. Aceasta va determina descarcarea din nou a intregului blockchain</translation>
     </message>
+    <message>
+        <source>%s failed</source>
+        <translation>%s a eșuat</translation>
+    </message>
     <message>
         <source>-maxmempool must be at least %d MB</source>
         <translation>-maxmempool trebuie sa fie macar %d MB</translation>
@@ -3270,10 +5482,58 @@
         <source>Automatic backups disabled</source>
         <translation>Backup-urile automate sunt dezactivate</translation>
     </message>
+    <message>
+        <source>Cannot set -peerblockfilters without -blockfilterindex.</source>
+        <translation>Nu se poate seta -peerblockfilters fără -blockfilterindex.</translation>
+    </message>
+    <message>
+        <source>Config setting for %s only applied on %s network when in [%s] section.</source>
+        <translation>Setarea de configurare pentru %s este aplicată doar pe rețeaua %s când este în secțiunea [%s].</translation>
+    </message>
+    <message>
+        <source>Could not find asmap file %s</source>
+        <translation>Nu s-a putut găsi fișierul asmap %s</translation>
+    </message>
+    <message>
+        <source>Could not parse asmap file %s</source>
+        <translation>Nu s-a putut analiza fișierul asmap %s</translation>
+    </message>
     <message>
         <source>ERROR! Failed to create automatic backup</source>
         <translation>EROARE! Backup-ul automat a eșuat</translation>
     </message>
+    <message>
+        <source>Error loading %s: Private keys can only be disabled during creation</source>
+        <translation>Eroare la încărcarea %s: Cheile private pot fi dezactivate doar în timpul creării</translation>
+    </message>
+    <message>
+        <source>Error: Couldn't create cursor into database</source>
+        <translation>Eroare: Nu s-a putut crea cursor în baza de date</translation>
+    </message>
+    <message>
+        <source>Error: Disk space is low for %s</source>
+        <translation>Eroare: Spațiu pe disc scăzut pentru %s</translation>
+    </message>
+    <message>
+        <source>Error: Dumpfile checksum does not match. Computed %s, expected %s</source>
+        <translation>Eroare: Checksum-ul fișierului de dump nu se potrivește. Calculat %s, așteptat %s</translation>
+    </message>
+    <message>
+        <source>Error: Got key that was not hex: %s</source>
+        <translation>Eroare: Am primit cheie care nu era hex: %s</translation>
+    </message>
+    <message>
+        <source>Error: Got value that was not hex: %s</source>
+        <translation>Eroare: S-a primit o valoare care nu este hex: %s</translation>
+    </message>
+    <message>
+        <source>Error: Keypool ran out, please call keypoolrefill first</source>
+        <translation>Eroare: Keypool epuizat, vă rugăm să apelați mai întâi keypoolrefill</translation>
+    </message>
+    <message>
+        <source>Error: No addresses available.</source>
+        <translation>Eroare: Nicio adresă disponibilă.</translation>
+    </message>
     <message>
         <source>Failed to create backup %s!</source>
         <translation>Crearea backup-ului a eșuat %s!</translation>
@@ -3286,13 +5546,33 @@
         <source>Failed to delete backup, error: %s</source>
         <translation>Ștergerea backup-ului a eșuat, eroare: %s</translation>
     </message>
+    <message>
+        <source>Failed to rescan the wallet during initialization</source>
+        <translation>Eșec la rescanarea portofelului în timpul inițializării</translation>
+    </message>
+    <message>
+        <source>Failed to verify database</source>
+        <translation>Eșec la verificarea bazei de date</translation>
+    </message>
+    <message>
+        <source>Fee rate (%s) is lower than the minimum fee rate setting (%s)</source>
+        <translation>Rata de taxă (%s) este mai mică decât setarea minimă de rată de taxă (%s)</translation>
+    </message>
     <message>
         <source>Found enough users, signing…</source>
         <translation>S-au găsit suficienți utilizatori, semnând…</translation>
     </message>
     <message>
-        <source>Invalid amount for -fallbackfee=&lt;amount&gt;: '%s'</source>
-        <translation>Suma nevalidă pentru -fallbackfee=&lt;amount&gt;: '%s'</translation>
+        <source>Ignoring duplicate -wallet %s.</source>
+        <translation>Se ignoră duplicatul -wallet %s.</translation>
+    </message>
+    <message>
+        <source>Input not found or already spent</source>
+        <translation>Input-ul nu a fost găsit sau a fost deja cheltuit</translation>
+    </message>
+    <message>
+        <source>Invalid P2P permission: '%s'</source>
+        <translation>Permisiune P2P invalidă: '%s'</translation>
     </message>
     <message>
         <source>Invalid masternodeblsprivkey. Please see documentation.</source>
@@ -3314,6 +5594,10 @@
         <source>Mixing in progress…</source>
         <translation>Amestecare în curs …</translation>
     </message>
+    <message>
+        <source>No addresses available</source>
+        <translation>Nicio adresă disponibilă</translation>
+    </message>
     <message>
         <source>No errors detected.</source>
         <translation>Nu au fost detectate erori.</translation>
@@ -3334,14 +5618,54 @@
         <source>Prune cannot be configured with a negative value.</source>
         <translation>Reductia nu poate fi configurata cu o valoare negativa.</translation>
     </message>
+    <message>
+        <source>Prune mode is incompatible with -disablegovernance=false.</source>
+        <translation>Modul prune este incompatibil cu -disablegovernance=false.</translation>
+    </message>
     <message>
         <source>Prune mode is incompatible with -txindex.</source>
         <translation>Modul redus este incompatibil cu -txindex.</translation>
     </message>
+    <message>
+        <source>SQLiteDatabase: Failed to execute statement to verify database: %s</source>
+        <translation>SQLiteDatabase: Eșec la executarea instrucțiunii de verificare a bazei de date: %s</translation>
+    </message>
+    <message>
+        <source>SQLiteDatabase: Failed to prepare statement to verify database: %s</source>
+        <translation>SQLiteDatabase: Eșec la pregătirea instrucțiunii de verificare a bazei de date: %s</translation>
+    </message>
+    <message>
+        <source>SQLiteDatabase: Failed to read database verification error: %s</source>
+        <translation>SQLiteDatabase: Eșec la citirea erorii de verificare a bazei de date: %s</translation>
+    </message>
+    <message>
+        <source>SQLiteDatabase: Unexpected application id. Expected %u, got %u</source>
+        <translation>SQLiteDatabase: ID de aplicație neașteptat. Se aștepta %u, s-a primit %u</translation>
+    </message>
+    <message>
+        <source>Section [%s] is not recognized.</source>
+        <translation>Secțiunea [%s] nu este recunoscută.</translation>
+    </message>
+    <message>
+        <source>Specified -walletdir "%s" does not exist</source>
+        <translation>Directorul -walletdir "%s" specificat nu există</translation>
+    </message>
+    <message>
+        <source>Specified -walletdir "%s" is a relative path</source>
+        <translation>Directorul -walletdir "%s" specificat este o cale relativă</translation>
+    </message>
+    <message>
+        <source>Specified -walletdir "%s" is not a directory</source>
+        <translation>Directorul -walletdir "%s" specificat nu este un director</translation>
+    </message>
     <message>
         <source>The wallet will avoid paying less than the minimum relay fee.</source>
         <translation>Portofelul va evita sa plateasca mai putin decat minimul taxei de retransmisie.</translation>
     </message>
+    <message>
+        <source>This is expected because you are running a pruned node.</source>
+        <translation>Acest lucru este așteptat deoarece rulați un nod tăiat (pruned).</translation>
+    </message>
     <message>
         <source>This is the minimum transaction fee you pay on every transaction.</source>
         <translation>Acesta este minimum de taxa de tranzactie care va fi platit la fiecare tranzactie.</translation>
@@ -3350,6 +5674,10 @@
         <source>This is the transaction fee you will pay if you send a transaction.</source>
         <translation>Aceasta este taxa de tranzactie pe care o platiti cand trimiteti o tranzactie.</translation>
     </message>
+    <message>
+        <source>Topping up keypool…</source>
+        <translation>Se completează keypool…</translation>
+    </message>
     <message>
         <source>Transaction amounts must not be negative</source>
         <translation>Sumele tranzactionate nu pot fi negative</translation>
@@ -3371,8 +5699,24 @@
         <translation>Nu se poate efectua legatura la %s pe acest computer. %s probabil ruleaza deja.</translation>
     </message>
     <message>
-        <source>Upgrading UTXO database</source>
-        <translation>Actualizarea bazei de date UTXO</translation>
+        <source>Unable to create the PID file '%s': %s</source>
+        <translation>Nu se poate crea fișierul PID '%s': %s</translation>
+    </message>
+    <message>
+        <source>Unable to generate initial keys</source>
+        <translation>Nu se pot genera cheile inițiale</translation>
+    </message>
+    <message>
+        <source>Unable to open %s for writing</source>
+        <translation>Imposibil de deschis %s pentru scriere</translation>
+    </message>
+    <message>
+        <source>Unknown -blockfilterindex value %s.</source>
+        <translation>Valoare -blockfilterindex necunoscută %s.</translation>
+    </message>
+    <message>
+        <source>Unknown new rules activated (versionbit %i)</source>
+        <translation>Reguli noi necunoscute activate (versionbit %i)</translation>
     </message>
     <message>
         <source>Verifying blocks…</source>
@@ -3391,16 +5735,12 @@
         <translation>Nu s-a putut creea un backup folder pentru portofel %s!</translation>
     </message>
     <message>
-        <source>You can not start a masternode with wallet enabled.</source>
-        <translation>Nu poți porni un masternode cu portofelul activat.</translation>
-    </message>
-    <message>
-        <source>You need to rebuild the database using -reindex to change -addressindex</source>
-        <translation>Trebuie să reconstruiești baza de date utilizând -reindex pentru a schimba -addressindex</translation>
+        <source>Wiping wallet transactions…</source>
+        <translation>Se șterg tranzacțiile portofelului…</translation>
     </message>
     <message>
-        <source>You need to rebuild the database using -reindex to change -spentindex</source>
-        <translation>Trebuie să reconstruiești baza de date utilizând -reindex pentru a schimba -spentindex</translation>
+        <source>You can not start a masternode with wallet enabled.</source>
+        <translation>Nu poți porni un masternode cu portofelul activat.</translation>
     </message>
     <message>
         <source>no mixing available.</source>
@@ -3414,6 +5754,26 @@
         <source>The %s developers</source>
         <translation>Dezvoltatorii %s</translation>
     </message>
+    <message>
+        <source>%s uses exact denominated amounts to send funds, you might simply need to mix some more coins.</source>
+        <translation>%s folosește sume exact denominate pentru a trimite fonduri, s-ar putea să fie nevoie pur și simplu să amestecați mai multe monede.</translation>
+    </message>
+    <message>
+        <source>-reindex-chainstate option is not compatible with -blockfilterindex. Please temporarily disable blockfilterindex while using -reindex-chainstate, or replace -reindex-chainstate with -reindex to fully rebuild all indexes.</source>
+        <translation>Opțiunea -reindex-chainstate nu este compatibilă cu -blockfilterindex. Vă rugăm să dezactivați temporar blockfilterindex în timp ce folosiți -reindex-chainstate, sau înlocuiți -reindex-chainstate cu -reindex pentru a reconstrui complet toate indexurile.</translation>
+    </message>
+    <message>
+        <source>-reindex-chainstate option is not compatible with -coinstatsindex. Please temporarily disable coinstatsindex while using -reindex-chainstate, or replace -reindex-chainstate with -reindex to fully rebuild all indexes.</source>
+        <translation>Opțiunea -reindex-chainstate nu este compatibilă cu -coinstatsindex. Vă rugăm să dezactivați temporar coinstatsindex în timp ce folosiți -reindex-chainstate, sau înlocuiți -reindex-chainstate cu -reindex pentru a reconstrui complet toate indexurile.</translation>
+    </message>
+    <message>
+        <source>-reindex-chainstate option is not compatible with -txindex. Please temporarily disable txindex while using -reindex-chainstate, or replace -reindex-chainstate with -reindex to fully rebuild all indexes.</source>
+        <translation>Opțiunea -reindex-chainstate nu este compatibilă cu -txindex. Vă rugăm să dezactivați temporar txindex în timp ce folosiți -reindex-chainstate, sau înlocuiți -reindex-chainstate cu -reindex pentru a reconstrui complet toate indexurile.</translation>
+    </message>
+    <message>
+        <source>Cannot downgrade wallet from version %i to version %i. Wallet version unchanged.</source>
+        <translation>Nu se poate retrograda portofelul de la versiunea %i la versiunea %i. Versiunea portofelului nemodificată.</translation>
+    </message>
     <message>
         <source>Cannot obtain a lock on data directory %s. %s is probably already running.</source>
         <translation>Nu se poate obține o blocare a directorului de date %s. %s probabil rulează deja.</translation>
@@ -3426,14 +5786,82 @@
         <source>Error loading %s: You can't enable HD on an already existing non-HD wallet</source>
         <translation>Eroare la încărcare %s: Nu poți activa HD pe un portofel non-HD deja existent</translation>
     </message>
+    <message>
+        <source>Error loading wallet. Wallet requires blocks to be downloaded, and software does not currently support loading wallets while blocks are being downloaded out of order when using assumeutxo snapshots. Wallet should be able to load successfully after node sync reaches height %s</source>
+        <translation>Eroare la încărcarea portofelului. Portofelul necesită descărcarea blocurilor, iar software-ul nu suportă în prezent încărcarea portofelelor în timp ce blocurile sunt descărcate în afara ordinii atunci când se folosesc snapshot-uri assumeutxo. Portofelul ar trebui să se poată încărca cu succes după ce sincronizarea nodului atinge înălțimea %s</translation>
+    </message>
     <message>
         <source>Error reading %s! All keys read correctly, but transaction data or address book entries might be missing or incorrect.</source>
         <translation>Eroare la citirea %s! Toate cheile sînt citite corect, dar datele tranzactiei sau anumite intrări din agenda sînt incorecte sau lipsesc.</translation>
     </message>
+    <message>
+        <source>Error: Dumpfile format record is incorrect. Got "%s", expected "format".</source>
+        <translation>Eroare: Înregistrarea formatului fișierului dump este incorectă. S-a primit "%s", se aștepta "format".</translation>
+    </message>
+    <message>
+        <source>Error: Dumpfile identifier record is incorrect. Got "%s", expected "%s".</source>
+        <translation>Eroare: Înregistrarea identificatorului fișierului dump este incorectă. S-a primit "%s", se aștepta "%s".</translation>
+    </message>
+    <message>
+        <source>Error: Dumpfile version is not supported. This version of bitcoin-wallet only supports version 1 dumpfiles. Got dumpfile with version %s</source>
+        <translation>Eroare: Versiunea fișierului dump nu este suportată. Această versiune de bitcoin-wallet suportă doar fișiere dump versiunea 1. S-a primit fișier dump cu versiunea %s</translation>
+    </message>
+    <message>
+        <source>Failed to rename invalid peers.dat file. Please move or delete it and try again.</source>
+        <translation>Nu s-a reușit redenumirea fișierului peers.dat invalid. Vă rugăm să îl mutați sau ștergeți și să încercați din nou.</translation>
+    </message>
+    <message>
+        <source>Fee estimation failed. Fallbackfee is disabled. Wait a few blocks or enable %s.</source>
+        <translation>Estimarea taxei a eșuat. Fallbackfee este dezactivată. Așteptați câteva blocuri sau activați %s.</translation>
+    </message>
+    <message>
+        <source>File %s already exists. If you are sure this is what you want, move it out of the way first.</source>
+        <translation>Fișierul %s există deja. Dacă sunteți sigur că aceasta este ceea ce doriți, mutați-l mai întâi.</translation>
+    </message>
+    <message>
+        <source>Incompatible options: -dnsseed=1 was explicitly specified, but -onlynet forbids connections to IPv4/IPv6</source>
+        <translation>Opțiuni incompatibile: -dnsseed=1 a fost specificat explicit, dar -onlynet interzice conexiunile către IPv4/IPv6</translation>
+    </message>
     <message>
         <source>Incorrect or no devnet genesis block found. Wrong datadir for devnet specified?</source>
         <translation>Incorect sau nici un block de geneză devnet nu a fost găsit. Datadir greșit pentru specificarea devnet-ului?</translation>
     </message>
+    <message>
+        <source>Invalid amount for %s=&lt;amount&gt;: '%s' (must be at least the minrelay fee of %s to prevent stuck transactions)</source>
+        <translation>Sumă invalidă pentru %s=&lt;amount&gt;: '%s' (trebuie să fie cel puțin taxa minrelay de %s pentru a preveni tranzacții blocate)</translation>
+    </message>
+    <message>
+        <source>Invalid or corrupt peers.dat (%s). If you believe this is a bug, please report it to %s. As a workaround, you can move the file (%s) out of the way (rename, move, or delete) to have a new one created on the next start.</source>
+        <translation>Fișier peers.dat invalid sau corupt (%s). Dacă credeți că este un bug, vă rugăm să îl raportați la %s. Ca soluție de rezolvare, puteți muta fișierul (%s) din cale (redenumire, mutare sau ștergere) pentru a avea unul nou creat la următoarea pornire.</translation>
+    </message>
+    <message>
+        <source>No dump file provided. To use createfromdump, -dumpfile=&lt;filename&gt; must be provided.</source>
+        <translation>Niciun fișier dump furnizat. Pentru a folosi createfromdump, trebuie furnizat -dumpfile=&lt;filename&gt;.</translation>
+    </message>
+    <message>
+        <source>No dump file provided. To use dump, -dumpfile=&lt;filename&gt; must be provided.</source>
+        <translation>Niciun fișier dump furnizat. Pentru a folosi dump, trebuie furnizat -dumpfile=&lt;filename&gt;.</translation>
+    </message>
+    <message>
+        <source>No wallet file format provided. To use createfromdump, -format=&lt;format&gt; must be provided.</source>
+        <translation>Niciun format de fișier portofel furnizat. Pentru a folosi createfromdump, trebuie furnizat -format=&lt;format&gt;.</translation>
+    </message>
+    <message>
+        <source>Outbound connections restricted to CJDNS (-onlynet=cjdns) but -cjdnsreachable is not provided</source>
+        <translation>Conexiuni de ieșire restricționate la CJDNS (-onlynet=cjdns) dar -cjdnsreachable nu este furnizat</translation>
+    </message>
+    <message>
+        <source>Outbound connections restricted to Tor (-onlynet=onion) but the proxy for reaching the Tor network is explicitly forbidden: -onion=0</source>
+        <translation>Conexiuni de ieșire restricționate la Tor (-onlynet=onion) dar proxy-ul pentru accesarea rețelei Tor este interzis explicit: -onion=0</translation>
+    </message>
+    <message>
+        <source>Outbound connections restricted to Tor (-onlynet=onion) but the proxy for reaching the Tor network is not provided: none of -proxy, -onion or -listenonion is given</source>
+        <translation>Conexiuni de ieșire restricționate la Tor (-onlynet=onion) dar proxy-ul pentru accesarea rețelei Tor nu este furnizat: niciuna dintre -proxy, -onion sau -listenonion nu este furnizată</translation>
+    </message>
+    <message>
+        <source>Outbound connections restricted to i2p (-onlynet=i2p) but -i2psam is not provided</source>
+        <translation>Conexiuni de ieșire restricționate la i2p (-onlynet=i2p) dar -i2psam nu este furnizat</translation>
+    </message>
     <message>
         <source>Please check that your computer's date and time are correct! If your clock is wrong, %s will not work properly.</source>
         <translation>Vă rugăm verificaţi dacă data/timpul calculatorului dvs. sînt corecte! Dacă ceasul calcultorului este gresit, %s nu va funcţiona corect.</translation>
@@ -3442,6 +5870,14 @@
         <source>Please contribute if you find %s useful. Visit %s for further information about the software.</source>
         <translation>Va rugam sa contribuiti daca apreciati ca %s va este util. Vizitati %s pentru mai multe informatii despre software.</translation>
     </message>
+    <message>
+        <source>Prune mode is incompatible with -reindex-chainstate. Use full -reindex instead.</source>
+        <translation>Modul prune este incompatibil cu -reindex-chainstate. Folosiți -reindex complet în schimb.</translation>
+    </message>
+    <message>
+        <source>This is the maximum transaction fee you pay (in addition to the normal fee) to prioritize partial spend avoidance over regular coin selection.</source>
+        <translation>Aceasta este taxa maximă de tranzacție pe care o plătiți (în plus față de taxa normală) pentru a prioritiza evitarea cheltuirii parțiale față de selecția obișnuită a monedelor.</translation>
+    </message>
     <message>
         <source>This is the transaction fee you may discard if change is smaller than dust at this level</source>
         <translation>Aceasta este taxa de tranzacție pe care o puteți elimina dacă schimbarea este mai mică decât dust la acest nivel</translation>
@@ -3450,10 +5886,38 @@
         <source>This is the transaction fee you may pay when fee estimates are not available.</source>
         <translation>Aceasta este taxa de tranzactie pe care este posibil sa o platiti daca estimarile de taxe nu sunt disponibile.</translation>
     </message>
+    <message>
+        <source>Transaction requires one destination of non-0 value, a non-0 feerate, or a pre-selected input</source>
+        <translation>Tranzacția necesită o destinație cu valoare diferită de 0, un feerate diferit de 0, sau un input pre-selectat</translation>
+    </message>
     <message>
         <source>Unable to replay blocks. You will need to rebuild the database using -reindex-chainstate.</source>
         <translation>Imposibil de redat block-urile. Va trebui să reconstruiți baza de date folosind -reindex-chainstate.</translation>
     </message>
+    <message>
+        <source>Unknown wallet file format "%s" provided. Please provide one of "bdb" or "sqlite".</source>
+        <translation>Format de fișier portofel necunoscut "%s" furnizat. Vă rugăm să furnizați unul dintre "bdb" sau "sqlite".</translation>
+    </message>
+    <message>
+        <source>Unsupported chainstate database format found. Please restart with -reindex-chainstate. This will rebuild the chainstate database.</source>
+        <translation>Format de bază de date chainstate nesuportat găsit. Vă rugăm să reporniți cu -reindex-chainstate. Acest lucru va reconstrui baza de date chainstate.</translation>
+    </message>
+    <message>
+        <source>Warning: Dumpfile wallet format "%s" does not match command line specified format "%s".</source>
+        <translation>Avertisment: Formatul portofelului fișierului dump "%s" nu se potrivește cu formatul specificat în linia de comandă "%s".</translation>
+    </message>
+    <message>
+        <source>Warning: Private keys detected in wallet {%s} with disabled private keys</source>
+        <translation>Avertisment: Chei private detectate în portofelul {%s} cu chei private dezactivate</translation>
+    </message>
+    <message>
+        <source>You need to rebuild the database using -reindex to enable -timestampindex</source>
+        <translation>Trebuie să reconstruiți baza de date folosind -reindex pentru a activa -timestampindex</translation>
+    </message>
+    <message>
+        <source>%s -- Incorrect seed, it should be a hex string</source>
+        <translation>%s -- Sămânță incorectă, ar trebui să fie un string hex</translation>
+    </message>
     <message>
         <source>%s is not a valid backup folder!</source>
         <translation>%s nu este un folder de backup valid!</translation>
@@ -3462,6 +5926,10 @@
         <source>%s is set very high!</source>
         <translation>%s este setata foarte sus!</translation>
     </message>
+    <message>
+        <source>%s request incomplete:</source>
+        <translation>Cerere %s incompletă:</translation>
+    </message>
     <message>
         <source>-devnet can only be specified once</source>
         <translation>-devnet poate fi specificat o singură dată</translation>
@@ -3474,18 +5942,54 @@
         <source>-rpcport must be specified when -devnet and -server are specified</source>
         <translation>-rpcport trebuie specificat când -devnet și -server sunt specificate</translation>
     </message>
+    <message>
+        <source>-statsbatchsize cannot be configured with a negative value.</source>
+        <translation>-statsbatchsize nu poate fi configurat cu o valoare negativă.</translation>
+    </message>
+    <message>
+        <source>-statsduration cannot be configured with a negative value.</source>
+        <translation>-statsduration nu poate fi configurat cu o valoare negativă.</translation>
+    </message>
+    <message>
+        <source>A fatal internal error occurred, see debug.log for details</source>
+        <translation>A apărut o eroare internă fatală, vezi debug.log pentru detalii</translation>
+    </message>
+    <message>
+        <source>Cannot create socket (socket() returned error %s)</source>
+        <translation>Nu se poate crea socket (socket() a returnat eroarea %s)</translation>
+    </message>
+    <message>
+        <source>Cannot get socket address for %s</source>
+        <translation>Nu se poate obține adresa socket pentru %s</translation>
+    </message>
+    <message>
+        <source>Cannot init Statsd client</source>
+        <translation>Nu se poate inițializa clientul Statsd</translation>
+    </message>
     <message>
         <source>Cannot resolve -%s address: '%s'</source>
         <translation>Nu se poate rezolva adresa -%s: '%s'</translation>
     </message>
     <message>
-        <source>Change index out of range</source>
-        <translation>Indexul de schimbare este iesit din parametrii</translation>
+        <source>Cannot write to data directory '%s'; check permissions.</source>
+        <translation>Nu se poate scrie în directorul de date '%s'; verificați permisiunile.</translation>
     </message>
     <message>
         <source>Copyright (C)</source>
         <translation>Copyright (C)</translation>
     </message>
+    <message>
+        <source>Disk space is too low!</source>
+        <translation>Spațiul pe disc este prea mic!</translation>
+    </message>
+    <message>
+        <source>Dump file %s does not exist.</source>
+        <translation>Fișierul dump %s nu există.</translation>
+    </message>
+    <message>
+        <source>Error creating %s</source>
+        <translation>Eroare la crearea %s</translation>
+    </message>
     <message>
         <source>Error loading %s</source>
         <translation>Eroare la încărcarea %s</translation>
@@ -3503,8 +6007,8 @@
         <translation>Eroare la încărcare %s: Nu poți dezactiva HD pe un portofel HD deja existent</translation>
     </message>
     <message>
-        <source>Error upgrading chainstate database</source>
-        <translation>Eroare la actualizarea bazei de date chainstate</translation>
+        <source>Error reading next record from wallet database</source>
+        <translation>Eroare la citirea înregistrării următoare din baza de date a portofelului</translation>
     </message>
     <message>
         <source>Loading P2P addresses…</source>
@@ -3522,10 +6026,38 @@
         <source>Loading wallet…</source>
         <translation>Încarc portofel…</translation>
     </message>
+    <message>
+        <source>Failed to clear fulfilled requests cache at %s</source>
+        <translation>Eșec la ștergerea cache-ului de cereri îndeplinite la %s</translation>
+    </message>
+    <message>
+        <source>Failed to clear governance cache at %s</source>
+        <translation>Eșec la ștergerea cache-ului de guvernare la %s</translation>
+    </message>
+    <message>
+        <source>Failed to clear masternode cache at %s</source>
+        <translation>Eșec la ștergerea cache-ului de masternode la %s</translation>
+    </message>
     <message>
         <source>Failed to find mixing queue to join</source>
         <translation>Nu a reușit să găsească și să se alăture unui nou queue de amestecare </translation>
     </message>
+    <message>
+        <source>Failed to load fulfilled requests cache from %s</source>
+        <translation>Eșec la încărcarea cache-ului de cereri îndeplinite de la %s</translation>
+    </message>
+    <message>
+        <source>Failed to load governance cache from %s</source>
+        <translation>Eșec la încărcarea cache-ului de guvernare de la %s</translation>
+    </message>
+    <message>
+        <source>Failed to load masternode cache from %s</source>
+        <translation>Eșec la încărcarea cache-ului de masternode de la %s</translation>
+    </message>
+    <message>
+        <source>Failed to load sporks cache from %s</source>
+        <translation>Eșec la încărcarea cache-ului de sporks de la %s</translation>
+    </message>
     <message>
         <source>Failed to start a new mixing queue</source>
         <translation>Nu a reușit să pornească un nou queue de amestecare</translation>
@@ -3534,6 +6066,10 @@
         <source>Importing…</source>
         <translation>Import…</translation>
     </message>
+    <message>
+        <source>Incorrect -rescan mode, falling back to default value</source>
+        <translation>Mod -rescan incorect, se revine la valoarea implicită</translation>
+    </message>
     <message>
         <source>Initialization sanity check failed. %s is shutting down.</source>
         <translation>Nu s-a reuşit iniţierea verificării sănătăţii. %s se inchide.</translation>
@@ -3542,6 +6078,14 @@
         <source>Inputs vs outputs size mismatch.</source>
         <translation>Nepotriviri în mărime între intrări și ieșiri.</translation>
     </message>
+    <message>
+        <source>Invalid '%s'. Allowed values: 128, 160, 192, 224, 256.</source>
+        <translation>Invalid '%s'. Valori permise: 128, 160, 192, 224, 256.</translation>
+    </message>
+    <message>
+        <source>Invalid -i2psam address or hostname: '%s'</source>
+        <translation>Adresă -i2psam sau hostname invalid: '%s'</translation>
+    </message>
     <message>
         <source>Invalid -onion address or hostname: '%s'</source>
         <translation>Adresa sau hostname -onion invalide: '%s'</translation>
@@ -3574,10 +6118,90 @@
         <source>Signing transaction failed</source>
         <translation>Nu s-a reuşit semnarea tranzacţiei</translation>
     </message>
+    <message>
+        <source>Specified blocks directory "%s" does not exist.</source>
+        <translation>Directorul de blocuri specificat "%s" nu există.</translation>
+    </message>
+    <message>
+        <source>Last queue was created too recently.</source>
+        <translation>Ultima coadă a fost creată prea recent.</translation>
+    </message>
+    <message>
+        <source>%s corrupt. Try using the wallet tool dash-wallet to salvage or restoring a backup.</source>
+        <translation>%s corupt. Încercați să folosiți instrumentul portofel dash-wallet pentru a salva sau a restaura o copie de siguranță.</translation>
+    </message>
+    <message>
+        <source>%s is set very high! Fees this large could be paid on a single transaction.</source>
+        <translation>%s este setat foarte mare! Taxe atât de mari ar putea fi plătite pe o singură tranzacție.</translation>
+    </message>
+    <message>
+        <source>%s request to listen on port %u. This port is considered "bad" and thus it is unlikely that any Dash Core peers connect to it. See doc/p2p-bad-ports.md for details and a full list.</source>
+        <translation>%s cere ascultarea pe portul %u. Acest port este considerat "rău" și astfel este puțin probabil ca vreun peer Dash Core să se conecteze la el. Vezi doc/p2p-bad-ports.md pentru detalii și o listă completă.</translation>
+    </message>
+    <message>
+        <source>Cannot provide specific connections and have addrman find outgoing connections at the same time.</source>
+        <translation>Nu se pot furniza conexiuni specifice și să aibă addrman să găsească conexiuni de ieșire în același timp.</translation>
+    </message>
+    <message>
+        <source>Failed to upgrade Evo database</source>
+        <translation>Eșec la actualizarea bazei de date Evo</translation>
+    </message>
+    <message>
+        <source>Fee needed &gt; fee paid</source>
+        <translation>Taxa necesară &gt; taxa plătită</translation>
+    </message>
+    <message>
+        <source>Host %s on unsupported network</source>
+        <translation>Host %s pe rețea nesuportată</translation>
+    </message>
+    <message>
+        <source>Invalid amount for %s=&lt;amount&gt;: '%s' (must be at least %s)</source>
+        <translation>Sumă invalidă pentru %s=&lt;amount&gt;: '%s' (trebuie să fie cel puțin %s)</translation>
+    </message>
+    <message>
+        <source>Invalid amount for %s=&lt;amount&gt;: '%s'</source>
+        <translation>Sumă invalidă pentru %s=&lt;amount&gt;: '%s'</translation>
+    </message>
+    <message>
+        <source>Invalid port specified in %s: '%s'</source>
+        <translation>Port invalid specificat în %s: '%s'</translation>
+    </message>
+    <message>
+        <source>Last successful action was too recent.</source>
+        <translation>Ultima acțiune reușită a fost prea recentă.</translation>
+    </message>
+    <message>
+        <source>Missing solving data for estimating transaction size</source>
+        <translation>Date de rezolvare lipsă pentru estimarea dimensiunii tranzacției</translation>
+    </message>
+    <message>
+        <source>No host specified</source>
+        <translation>Niciun host specificat</translation>
+    </message>
+    <message>
+        <source>No host specified, malformed URL</source>
+        <translation>Niciun host specificat, URL malformat</translation>
+    </message>
+    <message>
+        <source>No text before the scheme delimiter, malformed URL</source>
+        <translation>Niciun text înainte de delimitatorul de schemă, URL malformat</translation>
+    </message>
+    <message>
+        <source>Port must be between %d and %d, supplied %d</source>
+        <translation>Portul trebuie să fie între %d și %d, furnizat %d</translation>
+    </message>
+    <message>
+        <source>Socket not initialized, cannot send message</source>
+        <translation>Socket-ul nu este inițializat, nu se poate trimite mesajul</translation>
+    </message>
     <message>
         <source>The source code is available from %s.</source>
         <translation>Codul sursa este disponibil la %s.</translation>
     </message>
+    <message>
+        <source>The specified config file %s does not exist</source>
+        <translation>Fișierul de configurare specificat %s nu există</translation>
+    </message>
     <message>
         <source>The transaction amount is too small to pay the fee</source>
         <translation>Suma tranzactiei este prea mica pentru plata taxei</translation>
@@ -3598,6 +6222,10 @@
         <source>Transaction fees are too high.</source>
         <translation>Taxele de tranzacție sunt prea mari.</translation>
     </message>
+    <message>
+        <source>Transaction needs a change address, but we can't generate it.</source>
+        <translation>Tranzacția necesită o adresă de rest, dar nu o putem genera.</translation>
+    </message>
     <message>
         <source>Transaction not valid.</source>
         <translation>Tranzacția nu este validă.</translation>
@@ -3610,6 +6238,26 @@
         <source>Unable to bind to %s on this computer (bind returned error %s)</source>
         <translation>Nu se poate lega la %s pe acest calculator. (Legarea a întors eroarea %s)</translation>
     </message>
+    <message>
+        <source>Unable to locate enough mixed funds for this transaction.</source>
+        <translation>Imposibil de localizat suficiente fonduri amestecate pentru această tranzacție.</translation>
+    </message>
+    <message>
+        <source>Unable to locate enough non-denominated funds for this transaction.</source>
+        <translation>Imposibil de localizat suficiente fonduri ne-denominate pentru această tranzacție.</translation>
+    </message>
+    <message>
+        <source>Unable to lookup host %s</source>
+        <translation>Imposibil de găsit host-ul %s</translation>
+    </message>
+    <message>
+        <source>Unable to parse -maxuploadtarget: '%s'</source>
+        <translation>Imposibil de analizat -maxuploadtarget: '%s'</translation>
+    </message>
+    <message>
+        <source>Unable to send message to %s (::sendto() returned error %s)</source>
+        <translation>Imposibil de trimis mesaj către %s (::sendto() a returnat eroarea %s)</translation>
+    </message>
     <message>
         <source>Unable to sign spork message, wrong key?</source>
         <translation>Imposibil de semnat mesajul spork, cheia greșită?</translation>
@@ -3622,6 +6270,10 @@
         <source>Unknown state: id = %u</source>
         <translation>Status necunoscut: id = %u</translation>
     </message>
+    <message>
+        <source>Unsupported URL scheme, must begin with udp://</source>
+        <translation>Schemă URL nesuportată, trebuie să înceapă cu udp://</translation>
+    </message>
     <message>
         <source>Unsupported logging category %s=%s.</source>
         <translation>Categorie de înregistrare neacceptată %s=%s.</translation>
@@ -3634,13 +6286,45 @@
         <source>Wallet is locked.</source>
         <translation>Portofel blocat.</translation>
     </message>
+    <message>
+        <source>Warning: can't use %s and %s together, will prefer %s</source>
+        <translation>Avertisment: nu se pot folosi %s și %s împreună, se va prefera %s</translation>
+    </message>
+    <message>
+        <source>Warning: incorrect parameter %s, path must exist! Using default path.</source>
+        <translation>Avertisment: parametru incorect %s, calea trebuie să existe! Se folosește calea implicită.</translation>
+    </message>
     <message>
         <source>Will retry…</source>
         <translation>Se va reîncerca…</translation>
     </message>
+    <message>
+        <source>You are starting with governance validation disabled.</source>
+        <translation>Porniți cu validarea guvernării dezactivată.</translation>
+    </message>
+    <message>
+        <source>You can not disable governance validation on a masternode.</source>
+        <translation>Nu puteți dezactiva validarea guvernării pe un masternode.</translation>
+    </message>
+    <message>
+        <source>You need to rebuild the database using -reindex to enable -addressindex</source>
+        <translation>Trebuie să reconstruiți baza de date folosind -reindex pentru a activa -addressindex</translation>
+    </message>
+    <message>
+        <source>You need to rebuild the database using -reindex to enable -spentindex</source>
+        <translation>Trebuie să reconstruiți baza de date folosind -reindex pentru a activa -spentindex</translation>
+    </message>
     <message>
         <source>Your entries added successfully.</source>
         <translation>Intrările tale au fost adăugate cu succes.</translation>
     </message>
+    <message>
+        <source>Settings file could not be read</source>
+        <translation>Fișierul de setări nu a putut fi citit</translation>
+    </message>
+    <message>
+        <source>Settings file could not be written</source>
+        <translation>Fișierul de setări nu a putut fi scris</translation>
+    </message>
 </context>
 </TS>
\ No newline at end of file

From 43e2a19f1bbff53f5f653bb7cb858a2a6184328c Mon Sep 17 00:00:00 2001
From: Kittywhiskers Van Gogh <63189531+kwvg@users.noreply.github.com>
Date: Fri, 17 Oct 2025 07:57:40 +0530
Subject: [PATCH 343/656] merge bitcoin#23345: Drop unneeded dependencies for
 bitcoin-wallet tool

---
 configure.ac    |  6 ++++++
 src/Makefile.am | 16 +++++++++++++++-
 2 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/configure.ac b/configure.ac
index dec5c94755c3..8497088f01bc 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1503,6 +1503,12 @@ if test "$use_usdt" != "no"; then
 fi
 AM_CONDITIONAL([ENABLE_USDT_TRACEPOINTS], [test "$use_usdt" = "yes"])
 
+if test "$build_bitcoin_cli$build_bitcoin_tx$build_bitcoin_util$build_bitcoind$bitcoin_enable_qt$use_bench$use_tests" = "nonononononono"; then
+  use_upnp=no
+  use_natpmp=no
+  use_zmq=no
+fi
+
 dnl Check for libminiupnpc (optional)
 if test "$use_upnp" != "no"; then
   TEMP_CPPFLAGS="$CPPFLAGS"
diff --git a/src/Makefile.am b/src/Makefile.am
index 7b5c4ca68402..76afd3ebb401 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1087,7 +1087,21 @@ dash_wallet_SOURCES = bitcoin-wallet.cpp
 dash_wallet_CPPFLAGS = $(bitcoin_bin_cppflags)
 dash_wallet_CXXFLAGS = $(bitcoin_bin_cxxflags)
 dash_wallet_LDFLAGS = $(bitcoin_bin_ldflags)
-dash_wallet_LDADD = $(LIBBITCOIN_WALLET_TOOL) $(bitcoin_bin_ldadd)
+dash_wallet_LDADD = \
+  $(LIBBITCOIN_WALLET_TOOL) \
+  $(LIBBITCOIN_WALLET) \
+  $(LIBBITCOIN_COMMON) \
+  $(LIBBITCOIN_UTIL) \
+  $(LIBUNIVALUE) \
+  $(LIBBITCOIN_CONSENSUS) \
+  $(LIBBITCOIN_CRYPTO) \
+  $(LIBDASHBLS) \
+  $(LIBSECP256K1) \
+  $(BACKTRACE_LIB) \
+  $(BOOST_LIBS) \
+  $(BDB_LIBS) \
+  $(SQLITE_LIBS) \
+  $(GMP_LIBS)
 
 if TARGET_WINDOWS
 dash_wallet_SOURCES += dash-wallet-res.rc

From bdf5e92dd91cc2a8f56942c65585320932085380 Mon Sep 17 00:00:00 2001
From: Kittywhiskers Van Gogh <63189531+kwvg@users.noreply.github.com>
Date: Wed, 22 Oct 2025 00:09:33 +0530
Subject: [PATCH 344/656] merge bitcoin#24410: Split hashing/index
 `GetUTXOStats` codepaths, decouple from `coinstatsindex`

---
 src/Makefile.am                         |  4 +-
 src/index/coinstatsindex.cpp            | 44 +++++++++-------
 src/index/coinstatsindex.h              |  4 +-
 src/init.cpp                            | 22 ++++----
 src/{node => kernel}/coinstats.cpp      | 70 +++++++++++++------------
 src/{node => kernel}/coinstats.h        | 28 ++++------
 src/rpc/blockchain.cpp                  | 67 ++++++++++++++++-------
 src/rpc/blockchain.h                    | 23 +++++++-
 src/rpc/util.h                          |  1 -
 src/test/coinstatsindex_tests.cpp       | 14 +++--
 src/test/fuzz/coins_view.cpp            | 14 -----
 src/validation.cpp                      | 19 ++++---
 test/lint/lint-circular-dependencies.py |  3 +-
 13 files changed, 174 insertions(+), 139 deletions(-)
 rename src/{node => kernel}/coinstats.cpp (74%)
 rename src/{node => kernel}/coinstats.h (75%)

diff --git a/src/Makefile.am b/src/Makefile.am
index 76afd3ebb401..313bc926866b 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -259,6 +259,7 @@ BITCOIN_CORE_H = \
   instantsend/instantsend.h \
   instantsend/lock.h \
   instantsend/signing.h \
+  kernel/coinstats.h \
   key.h \
   key_io.h \
   limitedmap.h \
@@ -306,7 +307,6 @@ BITCOIN_CORE_H = \
   node/caches.h \
   node/chainstate.h \
   node/coin.h \
-  node/coinstats.h \
   node/connection_types.h \
   node/context.h \
   node/eviction.h \
@@ -530,6 +530,7 @@ libbitcoin_node_a_SOURCES = \
   instantsend/instantsend.cpp \
   instantsend/lock.cpp \
   instantsend/signing.cpp \
+  kernel/coinstats.cpp \
   llmq/blockprocessor.cpp \
   llmq/commitment.cpp \
   llmq/context.cpp \
@@ -561,7 +562,6 @@ libbitcoin_node_a_SOURCES = \
   node/caches.cpp \
   node/chainstate.cpp \
   node/coin.cpp \
-  node/coinstats.cpp \
   node/connection_types.cpp \
   node/context.cpp \
   node/eviction.cpp \
diff --git a/src/index/coinstatsindex.cpp b/src/index/coinstatsindex.cpp
index 6bf43e28f7db..49c81ba1efbc 100644
--- a/src/index/coinstatsindex.cpp
+++ b/src/index/coinstatsindex.cpp
@@ -14,10 +14,11 @@
 #include <validation.h>
 #include <util/check.h>
 
-using node::CCoinsStats;
-using node::GetBogoSize;
+using kernel::CCoinsStats;
+using kernel::GetBogoSize;
+using kernel::TxOutSer;
+
 using node::ReadBlockFromDisk;
-using node::TxOutSer;
 using node::UndoReadFromDisk;
 
 static constexpr uint8_t DB_BLOCK_HASH{'s'};
@@ -316,28 +317,31 @@ static bool LookUpOne(const CDBWrapper& db, const CBlockIndex* block_index, DBVa
     return db.Read(DBHashKey(block_index->GetBlockHash()), result);
 }
 
-bool CoinStatsIndex::LookUpStats(const CBlockIndex* block_index, CCoinsStats& coins_stats) const
+std::optional<CCoinsStats> CoinStatsIndex::LookUpStats(const CBlockIndex* block_index) const
 {
+    CCoinsStats stats{Assert(block_index)->nHeight, block_index->GetBlockHash()};
+    stats.index_used = true;
+
     DBVal entry;
     if (!LookUpOne(*m_db, block_index, entry)) {
-        return false;
+        return std::nullopt;
     }
 
-    coins_stats.hashSerialized = entry.muhash;
-    coins_stats.nTransactionOutputs = entry.transaction_output_count;
-    coins_stats.nBogoSize = entry.bogo_size;
-    coins_stats.total_amount = entry.total_amount;
-    coins_stats.total_subsidy = entry.total_subsidy;
-    coins_stats.total_unspendable_amount = entry.total_unspendable_amount;
-    coins_stats.total_prevout_spent_amount = entry.total_prevout_spent_amount;
-    coins_stats.total_new_outputs_ex_coinbase_amount = entry.total_new_outputs_ex_coinbase_amount;
-    coins_stats.total_coinbase_amount = entry.total_coinbase_amount;
-    coins_stats.total_unspendables_genesis_block = entry.total_unspendables_genesis_block;
-    coins_stats.total_unspendables_bip30 = entry.total_unspendables_bip30;
-    coins_stats.total_unspendables_scripts = entry.total_unspendables_scripts;
-    coins_stats.total_unspendables_unclaimed_rewards = entry.total_unspendables_unclaimed_rewards;
-
-    return true;
+    stats.hashSerialized = entry.muhash;
+    stats.nTransactionOutputs = entry.transaction_output_count;
+    stats.nBogoSize = entry.bogo_size;
+    stats.total_amount = entry.total_amount;
+    stats.total_subsidy = entry.total_subsidy;
+    stats.total_unspendable_amount = entry.total_unspendable_amount;
+    stats.total_prevout_spent_amount = entry.total_prevout_spent_amount;
+    stats.total_new_outputs_ex_coinbase_amount = entry.total_new_outputs_ex_coinbase_amount;
+    stats.total_coinbase_amount = entry.total_coinbase_amount;
+    stats.total_unspendables_genesis_block = entry.total_unspendables_genesis_block;
+    stats.total_unspendables_bip30 = entry.total_unspendables_bip30;
+    stats.total_unspendables_scripts = entry.total_unspendables_scripts;
+    stats.total_unspendables_unclaimed_rewards = entry.total_unspendables_unclaimed_rewards;
+
+    return stats;
 }
 
 bool CoinStatsIndex::Init()
diff --git a/src/index/coinstatsindex.h b/src/index/coinstatsindex.h
index 0eb42b1ca35d..40b19ca9315c 100644
--- a/src/index/coinstatsindex.h
+++ b/src/index/coinstatsindex.h
@@ -9,7 +9,7 @@
 #include <crypto/muhash.h>
 #include <flatfile.h>
 #include <index/base.h>
-#include <node/coinstats.h>
+#include <kernel/coinstats.h>
 
 /**
  * CoinStatsIndex maintains statistics on the UTXO set.
@@ -56,7 +56,7 @@ class CoinStatsIndex final : public BaseIndex
     explicit CoinStatsIndex(size_t n_cache_size, bool f_memory = false, bool f_wipe = false);
 
     // Look up stats for a specific block using CBlockIndex
-    bool LookUpStats(const CBlockIndex* block_index, node::CCoinsStats& coins_stats) const;
+    std::optional<kernel::CCoinsStats> LookUpStats(const CBlockIndex* block_index) const;
 };
 
 /// The global UTXO set hash object.
diff --git a/src/init.cpp b/src/init.cpp
index 18d1cafe92c8..f150759d463f 100644
--- a/src/init.cpp
+++ b/src/init.cpp
@@ -19,7 +19,6 @@
 #include <context.h>
 #include <consensus/amount.h>
 #include <deploymentstatus.h>
-#include <node/coinstats.h>
 #include <fs.h>
 #include <hash.h>
 #include <httpserver.h>
@@ -32,6 +31,7 @@
 #include <interfaces/init.h>
 #include <interfaces/node.h>
 #include <interfaces/wallet.h>
+#include <kernel/coinstats.h>
 #include <mapport.h>
 #include <node/miner.h>
 #include <net.h>
@@ -134,10 +134,10 @@
 #include <zmq/zmqrpc.h>
 #endif
 
+using kernel::CoinStatsHashType;
+
 using node::CacheSizes;
 using node::CalculateCacheSizes;
-using node::CCoinsStats;
-using node::CoinStatsHashType;
 using node::ChainstateLoadingError;
 using node::ChainstateLoadVerifyError;
 using node::DashChainstateSetupClose;
@@ -840,15 +840,15 @@ static void PeriodicStats(NodeContext& node)
     ChainstateManager& chainman = *Assert(node.chainman);
     const CTxMemPool& mempool = *Assert(node.mempool);
     const llmq::CInstantSendManager& isman = *Assert(node.llmq_ctx->isman);
-    CCoinsStats stats{CoinStatsHashType::NONE};
     chainman.ActiveChainstate().ForceFlushStateToDisk();
-    if (WITH_LOCK(cs_main, return GetUTXOStats(&chainman.ActiveChainstate().CoinsDB(), chainman.m_blockman, stats, node.rpc_interruption_point, chainman.ActiveChain().Tip()))) {
-        ::g_stats_client->gauge("utxoset.tx", stats.nTransactions, 1.0f);
-        ::g_stats_client->gauge("utxoset.txOutputs", stats.nTransactionOutputs, 1.0f);
-        ::g_stats_client->gauge("utxoset.dbSizeBytes", stats.nDiskSize, 1.0f);
-        ::g_stats_client->gauge("utxoset.blockHeight", stats.nHeight, 1.0f);
-        if (stats.total_amount.has_value()) {
-            ::g_stats_client->gauge("utxoset.totalAmount", (double)stats.total_amount.value() / (double)COIN, 1.0f);
+    const auto maybe_stats = WITH_LOCK(::cs_main, return GetUTXOStats(&chainman.ActiveChainstate().CoinsDB(), chainman.m_blockman, /*hash_type=*/CoinStatsHashType::NONE, node.rpc_interruption_point, chainman.ActiveChain().Tip(), /*index_requested=*/true));
+    if (maybe_stats.has_value()) {
+        ::g_stats_client->gauge("utxoset.tx", maybe_stats->nTransactions, 1.0f);
+        ::g_stats_client->gauge("utxoset.txOutputs", maybe_stats->nTransactionOutputs, 1.0f);
+        ::g_stats_client->gauge("utxoset.dbSizeBytes", maybe_stats->nDiskSize, 1.0f);
+        ::g_stats_client->gauge("utxoset.blockHeight", maybe_stats->nHeight, 1.0f);
+        if (maybe_stats->total_amount.has_value()) {
+            ::g_stats_client->gauge("utxoset.totalAmount", (double)maybe_stats->total_amount.value() / (double)COIN, 1.0f);
         }
     } else {
         // something went wrong
diff --git a/src/node/coinstats.cpp b/src/kernel/coinstats.cpp
similarity index 74%
rename from src/node/coinstats.cpp
rename to src/kernel/coinstats.cpp
index d824bf563de6..217ac9e810ec 100644
--- a/src/node/coinstats.cpp
+++ b/src/kernel/coinstats.cpp
@@ -1,14 +1,12 @@
-// Copyright (c) 2010 Satoshi Nakamoto
-// Copyright (c) 2009-2021 The Bitcoin Core developers
+// Copyright (c) 2022 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 <node/coinstats.h>
+#include <kernel/coinstats.h>
 
 #include <coins.h>
 #include <crypto/muhash.h>
 #include <hash.h>
-#include <index/coinstatsindex.h>
 #include <serialize.h>
 #include <uint256.h>
 #include <util/check.h>
@@ -18,7 +16,12 @@
 
 #include <map>
 
-namespace node {
+namespace kernel {
+
+CCoinsStats::CCoinsStats(int block_height, const uint256& block_hash)
+    : nHeight(block_height),
+      hashBlock(block_hash) {}
+
 // Database-independent metric indicating the UTXO set size
 uint64_t GetBogoSize(const CScript& script_pub_key)
 {
@@ -94,24 +97,11 @@ static void ApplyStats(CCoinsStats& stats, const uint256& hash, const std::map<u
 
 //! Calculate statistics about the unspent transaction output set
 template <typename T>
-static bool GetUTXOStats(CCoinsView* view, BlockManager& blockman, CCoinsStats& stats, T hash_obj, const std::function<void()>& interruption_point, const CBlockIndex* pindex)
+static bool ComputeUTXOStats(CCoinsView* view, CCoinsStats& stats, T hash_obj, const std::function<void()>& interruption_point)
 {
     std::unique_ptr<CCoinsViewCursor> pcursor(view->Cursor());
     assert(pcursor);
 
-    if (!pindex) {
-        LOCK(cs_main);
-        pindex = blockman.LookupBlockIndex(view->GetBestBlock());
-    }
-    stats.nHeight = Assert(pindex)->nHeight;
-    stats.hashBlock = pindex->GetBlockHash();
-
-    // Use CoinStatsIndex if it is requested and available and a hash_type of Muhash or None was requested
-    if ((stats.m_hash_type == CoinStatsHashType::MUHASH || stats.m_hash_type == CoinStatsHashType::NONE) && g_coin_stats_index && stats.index_requested) {
-        stats.index_used = true;
-        return g_coin_stats_index->LookUpStats(pindex, stats);
-    }
-
     PrepareHash(hash_obj, stats);
 
     uint256 prevkey;
@@ -142,25 +132,36 @@ static bool GetUTXOStats(CCoinsView* view, BlockManager& blockman, CCoinsStats&
     FinalizeHash(hash_obj, stats);
 
     stats.nDiskSize = view->EstimateSize();
+
     return true;
 }
 
-bool GetUTXOStats(CCoinsView* view, BlockManager& blockman, CCoinsStats& stats, const std::function<void()>& interruption_point, const CBlockIndex* pindex)
+std::optional<CCoinsStats> ComputeUTXOStats(CoinStatsHashType hash_type, CCoinsView* view, node::BlockManager& blockman, const std::function<void()>& interruption_point)
 {
-    switch (stats.m_hash_type) {
-    case(CoinStatsHashType::HASH_SERIALIZED): {
-        HashWriter ss{};
-        return GetUTXOStats(view, blockman, stats, ss, interruption_point, pindex);
-    }
-    case(CoinStatsHashType::MUHASH): {
-        MuHash3072 muhash;
-        return GetUTXOStats(view, blockman, stats, muhash, interruption_point, pindex);
-    }
-    case(CoinStatsHashType::NONE): {
-        return GetUTXOStats(view, blockman, stats, nullptr, interruption_point, pindex);
+    CBlockIndex* pindex = WITH_LOCK(::cs_main, return blockman.LookupBlockIndex(view->GetBestBlock()));
+    CCoinsStats stats{Assert(pindex)->nHeight, pindex->GetBlockHash()};
+
+    bool success = [&]() -> bool {
+        switch (hash_type) {
+        case(CoinStatsHashType::HASH_SERIALIZED): {
+            HashWriter ss{};
+            return ComputeUTXOStats(view, stats, ss, interruption_point);
+        }
+        case(CoinStatsHashType::MUHASH): {
+            MuHash3072 muhash;
+            return ComputeUTXOStats(view, stats, muhash, interruption_point);
+        }
+        case(CoinStatsHashType::NONE): {
+            return ComputeUTXOStats(view, stats, nullptr, interruption_point);
+        }
+        } // no default case, so the compiler can warn about missing cases
+        assert(false);
+    }();
+
+    if (!success) {
+        return std::nullopt;
     }
-    } // no default case, so the compiler can warn about missing cases
-    assert(false);
+    return stats;
 }
 
 // The legacy hash serializes the hashBlock
@@ -183,4 +184,5 @@ static void FinalizeHash(MuHash3072& muhash, CCoinsStats& stats)
     stats.hashSerialized = out;
 }
 static void FinalizeHash(std::nullptr_t, CCoinsStats& stats) {}
-} // namespace node
+
+} // namespace kernel
diff --git a/src/node/coinstats.h b/src/kernel/coinstats.h
similarity index 75%
rename from src/node/coinstats.h
rename to src/kernel/coinstats.h
index 4ca9274db35f..c103966568f2 100644
--- a/src/node/coinstats.h
+++ b/src/kernel/coinstats.h
@@ -1,10 +1,9 @@
-// Copyright (c) 2010 Satoshi Nakamoto
-// Copyright (c) 2009-2021 The Bitcoin Core developers
+// Copyright (c) 2022 The Bitcoin Core developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-#ifndef BITCOIN_NODE_COINSTATS_H
-#define BITCOIN_NODE_COINSTATS_H
+#ifndef BITCOIN_KERNEL_COINSTATS_H
+#define BITCOIN_KERNEL_COINSTATS_H
 
 #include <chain.h>
 #include <coins.h>
@@ -21,17 +20,14 @@ namespace node {
 class BlockManager;
 } // namespace node
 
-namespace node {
-enum class CoinStatsHashType {
+namespace kernel {
+enum class CoinStatsHashType : uint8_t {
     HASH_SERIALIZED,
     MUHASH,
     NONE,
 };
 
 struct CCoinsStats {
-    //! Which hash type to use
-    const CoinStatsHashType m_hash_type;
-
     int nHeight{0};
     uint256 hashBlock{};
     uint64_t nTransactions{0};
@@ -45,8 +41,6 @@ struct CCoinsStats {
     //! The number of coins contained.
     uint64_t coins_count{0};
 
-    //! Signals if the coinstatsindex should be used (when available).
-    bool index_requested{true};
     //! Signals if the coinstatsindex was used to retrieve the statistics.
     bool index_used{false};
 
@@ -71,15 +65,15 @@ struct CCoinsStats {
     //! Total cumulative amount of coins lost due to unclaimed miner rewards up to and including this block
     CAmount total_unspendables_unclaimed_rewards{0};
 
-    CCoinsStats(CoinStatsHashType hash_type) : m_hash_type(hash_type) {}
+    CCoinsStats() = default;
+    CCoinsStats(int block_height, const uint256& block_hash);
 };
 
-//! Calculate statistics about the unspent transaction output set
-bool GetUTXOStats(CCoinsView* view, node::BlockManager& blockman, CCoinsStats& stats, const std::function<void()>& interruption_point = {}, const CBlockIndex* pindex = nullptr);
-
 uint64_t GetBogoSize(const CScript& script_pub_key);
 
 CDataStream TxOutSer(const COutPoint& outpoint, const Coin& coin);
-} // namespace node
 
-#endif // BITCOIN_NODE_COINSTATS_H
+std::optional<CCoinsStats> ComputeUTXOStats(CoinStatsHashType hash_type, CCoinsView* view, node::BlockManager& blockman, const std::function<void()>& interruption_point = {});
+} // namespace kernel
+
+#endif // BITCOIN_KERNEL_COINSTATS_H
diff --git a/src/rpc/blockchain.cpp b/src/rpc/blockchain.cpp
index 9d27a2b8d0f5..6432ba835f51 100644
--- a/src/rpc/blockchain.cpp
+++ b/src/rpc/blockchain.cpp
@@ -20,9 +20,9 @@
 #include <index/blockfilterindex.h>
 #include <index/coinstatsindex.h>
 #include <index/txindex.h>
+#include <kernel/coinstats.h>
 #include <logging/timer.h>
 #include <node/blockstorage.h>
-#include <node/coinstats.h>
 #include <net.h>
 #include <net_processing.h>
 #include <node/context.h>
@@ -63,9 +63,10 @@
 #include <condition_variable>
 #include <mutex>
 
+using kernel::CCoinsStats;
+using kernel::CoinStatsHashType;
+
 using node::BlockManager;
-using node::CCoinsStats;
-using node::CoinStatsHashType;
 using node::NodeContext;
 using node::ReadBlockFromDisk;
 using node::SnapshotMetadata;
@@ -1103,6 +1104,31 @@ CoinStatsHashType ParseHashType(const std::string& hash_type_input)
     }
 }
 
+std::optional<kernel::CCoinsStats> GetUTXOStats(CCoinsView* view, node::BlockManager& blockman,
+                                                kernel::CoinStatsHashType hash_type,
+                                                const std::function<void()>& interruption_point,
+                                                const CBlockIndex* pindex,
+                                                bool index_requested)
+{
+    // Use CoinStatsIndex if it is requested and available and a hash_type of Muhash or None was requested
+    if ((hash_type == kernel::CoinStatsHashType::MUHASH || hash_type == kernel::CoinStatsHashType::NONE) && g_coin_stats_index && index_requested) {
+        if (pindex) {
+            return g_coin_stats_index->LookUpStats(pindex);
+        } else {
+            CBlockIndex* block_index = WITH_LOCK(::cs_main, return blockman.LookupBlockIndex(view->GetBestBlock()));
+            return g_coin_stats_index->LookUpStats(block_index);
+        }
+    }
+
+    // If the coinstats index isn't requested or is otherwise not usable, the
+    // pindex should either be null or equal to the view's best block. This is
+    // because without the coinstats index we can only get coinstats about the
+    // best block.
+    CHECK_NONFATAL(!pindex || pindex->GetBlockHash() == view->GetBestBlock());
+
+    return kernel::ComputeUTXOStats(hash_type, view, blockman, interruption_point);
+}
+
 static RPCHelpMan gettxoutsetinfo()
 {
     return RPCHelpMan{"gettxoutsetinfo",
@@ -1158,8 +1184,7 @@ static RPCHelpMan gettxoutsetinfo()
 
     const CBlockIndex* pindex{nullptr};
     const CoinStatsHashType hash_type{request.params[0].isNull() ? CoinStatsHashType::HASH_SERIALIZED : ParseHashType(request.params[0].get_str())};
-    CCoinsStats stats{hash_type};
-    stats.index_requested = request.params[2].isNull() || request.params[2].get_bool();
+    bool index_requested = request.params[2].isNull() || request.params[2].get_bool();
 
     const NodeContext& node = EnsureAnyNodeContext(request.context);
     ChainstateManager& chainman = EnsureChainman(node);
@@ -1180,17 +1205,17 @@ static RPCHelpMan gettxoutsetinfo()
             throw JSONRPCError(RPC_INVALID_PARAMETER, "Querying specific block heights requires coinstatsindex");
         }
 
-        if (stats.m_hash_type == CoinStatsHashType::HASH_SERIALIZED) {
+        if (hash_type == CoinStatsHashType::HASH_SERIALIZED) {
             throw JSONRPCError(RPC_INVALID_PARAMETER, "hash_serialized_2 hash type cannot be queried for a specific block");
         }
 
-        if (!stats.index_requested) {
+        if (!index_requested) {
             throw JSONRPCError(RPC_INVALID_PARAMETER, "Cannot set use_index to false when querying for a specific block");
         }
         pindex = ParseHashOrHeight(request.params[1], chainman);
     }
 
-    if (stats.index_requested && g_coin_stats_index) {
+    if (index_requested && g_coin_stats_index) {
         if (!g_coin_stats_index->BlockUntilSyncedToCurrentChain()) {
             const IndexSummary summary{g_coin_stats_index->GetSummary()};
 
@@ -1202,7 +1227,9 @@ static RPCHelpMan gettxoutsetinfo()
         }
     }
 
-    if (GetUTXOStats(coins_view, *blockman, stats, node.rpc_interruption_point, pindex)) {
+    const std::optional<CCoinsStats> maybe_stats = GetUTXOStats(coins_view, *blockman, hash_type, node.rpc_interruption_point, pindex, index_requested);
+    if (maybe_stats.has_value()) {
+        const CCoinsStats& stats = maybe_stats.value();
         ret.pushKV("height", (int64_t)stats.nHeight);
         ret.pushKV("bestblock", stats.hashBlock.GetHex());
         ret.pushKV("txouts", (int64_t)stats.nTransactionOutputs);
@@ -1221,10 +1248,13 @@ static RPCHelpMan gettxoutsetinfo()
         } else {
             ret.pushKV("total_unspendable_amount", ValueFromAmount(stats.total_unspendable_amount));
 
-            CCoinsStats prev_stats{hash_type};
-
+            CCoinsStats prev_stats{};
             if (pindex->nHeight > 0) {
-                GetUTXOStats(coins_view, *blockman, prev_stats, node.rpc_interruption_point, pindex->pprev);
+                const std::optional<CCoinsStats> maybe_prev_stats = GetUTXOStats(coins_view, *blockman, hash_type, node.rpc_interruption_point, pindex->pprev, index_requested);
+                if (!maybe_prev_stats) {
+                    throw JSONRPCError(RPC_INTERNAL_ERROR, "Unable to read UTXO set");
+                }
+                prev_stats = maybe_prev_stats.value();
             }
 
             UniValue block_info(UniValue::VOBJ);
@@ -2701,7 +2731,7 @@ UniValue CreateUTXOSnapshot(
     const fs::path& temppath)
 {
     std::unique_ptr<CCoinsViewCursor> pcursor;
-    CCoinsStats stats{CoinStatsHashType::HASH_SERIALIZED};
+    std::optional<CCoinsStats> maybe_stats;
     const CBlockIndex* tip;
 
     {
@@ -2721,19 +2751,20 @@ UniValue CreateUTXOSnapshot(
 
         chainstate.ForceFlushStateToDisk();
 
-        if (!GetUTXOStats(&chainstate.CoinsDB(), chainstate.m_blockman, stats, node.rpc_interruption_point)) {
+        maybe_stats = GetUTXOStats(&chainstate.CoinsDB(), chainstate.m_blockman, CoinStatsHashType::HASH_SERIALIZED, node.rpc_interruption_point);
+        if (!maybe_stats) {
             throw JSONRPCError(RPC_INTERNAL_ERROR, "Unable to read UTXO set");
         }
 
         pcursor = chainstate.CoinsDB().Cursor();
-        tip = CHECK_NONFATAL(chainstate.m_blockman.LookupBlockIndex(stats.hashBlock));
+        tip = CHECK_NONFATAL(chainstate.m_blockman.LookupBlockIndex(maybe_stats->hashBlock));
     }
 
     LOG_TIME_SECONDS(strprintf("writing UTXO snapshot at height %s (%s) to file %s (via %s)",
         tip->nHeight, tip->GetBlockHash().ToString(),
         fs::PathToString(path), fs::PathToString(temppath)));
 
-    SnapshotMetadata metadata{tip->GetBlockHash(), stats.coins_count, tip->nChainTx};
+    SnapshotMetadata metadata{tip->GetBlockHash(), maybe_stats->coins_count, tip->nChainTx};
 
     afile << metadata;
 
@@ -2755,11 +2786,11 @@ UniValue CreateUTXOSnapshot(
     afile.fclose();
 
     UniValue result(UniValue::VOBJ);
-    result.pushKV("coins_written", stats.coins_count);
+    result.pushKV("coins_written", maybe_stats->coins_count);
     result.pushKV("base_hash", tip->GetBlockHash().ToString());
     result.pushKV("base_height", tip->nHeight);
     result.pushKV("path", path.utf8string());
-    result.pushKV("txoutset_hash", stats.hashSerialized.ToString());
+    result.pushKV("txoutset_hash", maybe_stats->hashSerialized.ToString());
     // Cast required because univalue doesn't have serialization specified for
     // `unsigned int`, nChainTx's type.
     result.pushKV("nchaintx", uint64_t{tip->nChainTx});
diff --git a/src/rpc/blockchain.h b/src/rpc/blockchain.h
index 824c9d70ba74..0ef7c2bd30e6 100644
--- a/src/rpc/blockchain.h
+++ b/src/rpc/blockchain.h
@@ -8,10 +8,13 @@
 #include <consensus/amount.h>
 #include <core_io.h>
 #include <fs.h>
+#include <kernel/coinstats.h>
 #include <streams.h>
 #include <sync.h>
 
-#include <stdint.h>
+#include <cstdint>
+#include <functional>
+#include <optional>
 #include <vector>
 
 extern RecursiveMutex cs_main;
@@ -19,7 +22,10 @@ extern RecursiveMutex cs_main;
 class CBlock;
 class CBlockIndex;
 class CChainState;
-class UniValue;
+class CCoinsView;
+namespace kernel {
+enum class CoinStatsHashType : uint8_t;
+}
 namespace llmq {
 class CChainLocksHandler;
 class CInstantSendManager;
@@ -29,6 +35,8 @@ class BlockManager;
 struct NodeContext;
 } // namespace node
 
+class UniValue;
+
 static constexpr int NUM_GETBLOCKSTATS_PERCENTILES = 5;
 
 /**
@@ -62,4 +70,15 @@ UniValue CreateUTXOSnapshot(
     const fs::path& path,
     const fs::path& tmppath);
 
+/**
+ * Calculate statistics about the unspent transaction output set
+ *
+ * @param[in] index_requested Signals if the coinstatsindex should be used (when available).
+ */
+std::optional<kernel::CCoinsStats> GetUTXOStats(CCoinsView* view, node::BlockManager& blockman,
+                                                kernel::CoinStatsHashType hash_type,
+                                                const std::function<void()>& interruption_point = {},
+                                                const CBlockIndex* pindex = nullptr,
+                                                bool index_requested = true);
+
 #endif // BITCOIN_RPC_BLOCKCHAIN_H
diff --git a/src/rpc/util.h b/src/rpc/util.h
index a9f5d6246fd1..ef19b689377b 100644
--- a/src/rpc/util.h
+++ b/src/rpc/util.h
@@ -5,7 +5,6 @@
 #ifndef BITCOIN_RPC_UTIL_H
 #define BITCOIN_RPC_UTIL_H
 
-#include <node/coinstats.h>
 #include <node/transaction.h>
 #include <protocol.h>
 #include <pubkey.h>
diff --git a/src/test/coinstatsindex_tests.cpp b/src/test/coinstatsindex_tests.cpp
index 769935c284e0..e3335373231f 100644
--- a/src/test/coinstatsindex_tests.cpp
+++ b/src/test/coinstatsindex_tests.cpp
@@ -12,8 +12,8 @@
 
 #include <boost/test/unit_test.hpp>
 
-using node::CCoinsStats;
-using node::CoinStatsHashType;
+using kernel::CCoinsStats;
+using kernel::CoinStatsHashType;
 
 BOOST_AUTO_TEST_SUITE(coinstatsindex_tests)
 
@@ -21,7 +21,6 @@ BOOST_FIXTURE_TEST_CASE(coinstatsindex_initial_sync, TestChain100Setup)
 {
     CoinStatsIndex coin_stats_index{1 << 20, true};
 
-    CCoinsStats coin_stats{CoinStatsHashType::MUHASH};
     const CBlockIndex* block_index;
     {
         LOCK(cs_main);
@@ -29,7 +28,7 @@ BOOST_FIXTURE_TEST_CASE(coinstatsindex_initial_sync, TestChain100Setup)
     }
 
     // CoinStatsIndex should not be found before it is started.
-    BOOST_CHECK(!coin_stats_index.LookUpStats(block_index, coin_stats));
+    BOOST_CHECK(!coin_stats_index.LookUpStats(block_index));
 
     // BlockUntilSyncedToCurrentChain should return false before CoinStatsIndex
     // is started.
@@ -45,10 +44,10 @@ BOOST_FIXTURE_TEST_CASE(coinstatsindex_initial_sync, TestChain100Setup)
         LOCK(cs_main);
         genesis_block_index = m_node.chainman->ActiveChain().Genesis();
     }
-    BOOST_CHECK(coin_stats_index.LookUpStats(genesis_block_index, coin_stats));
+    BOOST_CHECK(coin_stats_index.LookUpStats(genesis_block_index));
 
     // Check that CoinStatsIndex updates with new blocks.
-    coin_stats_index.LookUpStats(block_index, coin_stats);
+    BOOST_CHECK(coin_stats_index.LookUpStats(block_index));
 
     const CScript script_pub_key{CScript() << ToByteVector(coinbaseKey.GetPubKey()) << OP_CHECKSIG};
     std::vector<CMutableTransaction> noTxns;
@@ -57,13 +56,12 @@ BOOST_FIXTURE_TEST_CASE(coinstatsindex_initial_sync, TestChain100Setup)
     // Let the CoinStatsIndex to catch up again.
     BOOST_CHECK(coin_stats_index.BlockUntilSyncedToCurrentChain());
 
-    CCoinsStats new_coin_stats{CoinStatsHashType::MUHASH};
     const CBlockIndex* new_block_index;
     {
         LOCK(cs_main);
         new_block_index = m_node.chainman->ActiveChain().Tip();
     }
-    coin_stats_index.LookUpStats(new_block_index, new_coin_stats);
+    BOOST_CHECK(coin_stats_index.LookUpStats(new_block_index));
 
     BOOST_CHECK(block_index != new_block_index);
 
diff --git a/src/test/fuzz/coins_view.cpp b/src/test/fuzz/coins_view.cpp
index a8ba484f610d..b8f68fc76e42 100644
--- a/src/test/fuzz/coins_view.cpp
+++ b/src/test/fuzz/coins_view.cpp
@@ -10,7 +10,6 @@
 #include <consensus/tx_verify.h>
 #include <consensus/validation.h>
 #include <key.h>
-#include <node/coinstats.h>
 #include <policy/policy.h>
 #include <primitives/transaction.h>
 #include <pubkey.h>
@@ -27,9 +26,6 @@
 #include <string>
 #include <vector>
 
-using node::CCoinsStats;
-using node::CoinStatsHashType;
-
 namespace {
 const TestingSetup* g_setup;
 const Coin EMPTY_COIN{};
@@ -274,16 +270,6 @@ FUZZ_TARGET(coins_view, .init = initialize_coins_view)
                     return;
                 }
                 (void)GetTransactionSigOpCount(transaction, coins_view_cache, flags);
-            },
-            [&] {
-                CCoinsStats stats{CoinStatsHashType::HASH_SERIALIZED};
-                bool expected_code_path = false;
-                try {
-                    (void)GetUTXOStats(&coins_view_cache, g_setup->m_node.chainman->m_blockman, stats);
-                } catch (const std::logic_error&) {
-                    expected_code_path = true;
-                }
-                assert(expected_code_path);
             });
     }
 }
diff --git a/src/validation.cpp b/src/validation.cpp
index 3f511f2181d3..080b7bd9c7f3 100644
--- a/src/validation.cpp
+++ b/src/validation.cpp
@@ -20,10 +20,10 @@
 #include <deploymentstatus.h>
 #include <flatfile.h>
 #include <hash.h>
+#include <kernel/coinstats.h>
 #include <logging.h>
 #include <logging/timer.h>
 #include <node/blockstorage.h>
-#include <node/coinstats.h>
 #include <node/interface_ui.h>
 #include <node/utxo_snapshot.h>
 #include <policy/policy.h>
@@ -67,12 +67,14 @@
 #include <ranges>
 #include <string>
 
+using kernel::CCoinsStats;
+using kernel::CoinStatsHashType;
+using kernel::ComputeUTXOStats;
+
 using node::BlockManager;
 using node::BlockMap;
 using node::CBlockIndexHeightOnlyComparator;
 using node::CBlockIndexWorkComparator;
-using node::CCoinsStats;
-using node::CoinStatsHashType;
 using node::DEFAULT_ADDRESSINDEX;
 using node::DEFAULT_SPENTINDEX;
 using node::DEFAULT_TIMESTAMPINDEX;
@@ -5825,7 +5827,8 @@ bool ChainstateManager::PopulateAndValidateSnapshot(
     CBlockIndex* snapshot_start_block = WITH_LOCK(::cs_main, return m_blockman.LookupBlockIndex(base_blockhash));
 
     if (!snapshot_start_block) {
-        // Needed for GetUTXOStats and ExpectedAssumeutxo to determine the height and to avoid a crash when base_blockhash.IsNull()
+        // Needed for ComputeUTXOStats and ExpectedAssumeutxo to determine the
+        // height and to avoid a crash when base_blockhash.IsNull()
         LogPrintf("[snapshot] Did not find snapshot start blockheader %s\n",
                   base_blockhash.ToString());
         return false;
@@ -5933,22 +5936,22 @@ bool ChainstateManager::PopulateAndValidateSnapshot(
 
     assert(coins_cache.GetBestBlock() == base_blockhash);
 
-    CCoinsStats stats{CoinStatsHashType::HASH_SERIALIZED};
     auto breakpoint_fnc = [] { /* TODO insert breakpoint here? */ };
 
     // As above, okay to immediately release cs_main here since no other context knows
     // about the snapshot_chainstate.
     CCoinsViewDB* snapshot_coinsdb = WITH_LOCK(::cs_main, return &snapshot_chainstate.CoinsDB());
 
-    if (!GetUTXOStats(snapshot_coinsdb, m_blockman, stats, breakpoint_fnc)) {
+    const std::optional<CCoinsStats> maybe_stats = ComputeUTXOStats(CoinStatsHashType::HASH_SERIALIZED, snapshot_coinsdb, m_blockman, breakpoint_fnc);
+    if (!maybe_stats.has_value()) {
         LogPrintf("[snapshot] failed to generate coins stats\n");
         return false;
     }
 
     // Assert that the deserialized chainstate contents match the expected assumeutxo value.
-    if (AssumeutxoHash{stats.hashSerialized} != au_data.hash_serialized) {
+    if (AssumeutxoHash{maybe_stats->hashSerialized} != au_data.hash_serialized) {
         LogPrintf("[snapshot] bad snapshot content hash: expected %s, got %s\n",
-            au_data.hash_serialized.ToString(), stats.hashSerialized.ToString());
+            au_data.hash_serialized.ToString(), maybe_stats->hashSerialized.ToString());
         return false;
     }
 
diff --git a/test/lint/lint-circular-dependencies.py b/test/lint/lint-circular-dependencies.py
index 00073f64865e..4127d5a7df16 100755
--- a/test/lint/lint-circular-dependencies.py
+++ b/test/lint/lint-circular-dependencies.py
@@ -14,13 +14,12 @@
 EXPECTED_CIRCULAR_DEPENDENCIES = (
     "chainparamsbase -> util/system -> chainparamsbase",
     "node/blockstorage -> validation -> node/blockstorage",
-    "index/coinstatsindex -> node/coinstats -> index/coinstatsindex",
     "policy/fees -> txmempool -> policy/fees",
     "qt/addresstablemodel -> qt/walletmodel -> qt/addresstablemodel",
     "qt/recentrequeststablemodel -> qt/walletmodel -> qt/recentrequeststablemodel",
     "qt/transactiontablemodel -> qt/walletmodel -> qt/transactiontablemodel",
     "wallet/wallet -> wallet/walletdb -> wallet/wallet",
-    "node/coinstats -> validation -> node/coinstats",
+    "kernel/coinstats -> validation -> kernel/coinstats",
     # Dash
     "banman -> common/bloom -> evo/assetlocktx -> llmq/quorums -> net -> banman",
     "chainlock/chainlock -> instantsend/instantsend -> chainlock/chainlock",

From 5d69d18924cbe45d99984d2bf4d646e1eaa5c227 Mon Sep 17 00:00:00 2001
From: Kittywhiskers Van Gogh <63189531+kwvg@users.noreply.github.com>
Date: Wed, 22 Oct 2025 00:08:33 +0530
Subject: [PATCH 345/656] merge bitcoin#15936: Expose settings.json methods to
 GUI

---
 src/init.cpp                |  1 -
 src/interfaces/node.h       | 29 ++++++++++++++++++++++-----
 src/node/interfaces.cpp     | 40 +++++++++++++++++++++++++++++++++++++
 src/test/settings_tests.cpp |  8 ++++----
 src/util/settings.cpp       |  4 ++++
 src/util/settings.h         |  6 ++++++
 src/util/system.cpp         | 35 ++++++++++++++++++++++++++++----
 src/util/system.h           | 17 +++++++++++++---
 8 files changed, 123 insertions(+), 17 deletions(-)

diff --git a/src/init.cpp b/src/init.cpp
index f150759d463f..24a1062974ba 100644
--- a/src/init.cpp
+++ b/src/init.cpp
@@ -439,7 +439,6 @@ void Shutdown(NodeContext& node)
         LogPrintf("%s: Unable to remove PID file: %s\n", __func__, fsbridge::get_filesystem_error_message(e));
     }
 
-    node.args = nullptr;
     LogPrintf("%s: done\n", __func__);
 }
 
diff --git a/src/interfaces/node.h b/src/interfaces/node.h
index 5a7414b84fa0..7646fc7f1ea1 100644
--- a/src/interfaces/node.h
+++ b/src/interfaces/node.h
@@ -5,13 +5,14 @@
 #ifndef BITCOIN_INTERFACES_NODE_H
 #define BITCOIN_INTERFACES_NODE_H
 
-#include <consensus/amount.h> // For CAmount
-#include <net.h>        // For NodeId
-#include <net_types.h>  // For banmap_t
-#include <netaddress.h> // For Network
-#include <netbase.h>    // For ConnectionDirection
+#include <consensus/amount.h>          // For CAmount
+#include <net.h>                       // For NodeId
+#include <net_types.h>                 // For banmap_t
+#include <netaddress.h>                // For Network
+#include <netbase.h>                   // For ConnectionDirection
 #include <support/allocators/secure.h> // For SecureString
 #include <uint256.h>
+#include <util/settings.h>             // For util::SettingsValue
 #include <util/translation.h>
 
 #include <functional>
@@ -193,6 +194,24 @@ class Node
     //! Return whether shutdown was requested.
     virtual bool shutdownRequested() = 0;
 
+    //! Return whether a particular setting in <datadir>/settings.json is or
+    //! would be ignored because it is also specified in the command line.
+    virtual bool isSettingIgnored(const std::string& name) = 0;
+
+    //! Return setting value from <datadir>/settings.json or dash.conf.
+    virtual util::SettingsValue getPersistentSetting(const std::string& name) = 0;
+
+    //! Update a setting in <datadir>/settings.json.
+    virtual void updateRwSetting(const std::string& name, const util::SettingsValue& value) = 0;
+
+    //! Force a setting value to be applied, overriding any other configuration
+    //! source, but not being persisted.
+    virtual void forceSetting(const std::string& name, const util::SettingsValue& value) = 0;
+
+    //! Clear all settings in <datadir>/settings.json and store a backup of
+    //! previous settings in <datadir>/settings.json.bak.
+    virtual void resetSettings() = 0;
+
     //! Map port.
     virtual void mapPort(bool use_upnp, bool use_natpmp) = 0;
 
diff --git a/src/node/interfaces.cpp b/src/node/interfaces.cpp
index f090523b238d..8d8579b62e2f 100644
--- a/src/node/interfaces.cpp
+++ b/src/node/interfaces.cpp
@@ -444,6 +444,46 @@ class NodeImpl : public Node
         }
     }
     bool shutdownRequested() override { return ShutdownRequested(); }
+    bool isSettingIgnored(const std::string& name) override
+    {
+        bool ignored = false;
+        gArgs.LockSettings([&](util::Settings& settings) {
+            if (auto* options = util::FindKey(settings.command_line_options, name)) {
+                ignored = !options->empty();
+            }
+        });
+        return ignored;
+    }
+    util::SettingsValue getPersistentSetting(const std::string& name) override { return gArgs.GetPersistentSetting(name); }
+    void updateRwSetting(const std::string& name, const util::SettingsValue& value) override
+    {
+        gArgs.LockSettings([&](util::Settings& settings) {
+            if (value.isNull()) {
+                settings.rw_settings.erase(name);
+            } else {
+                settings.rw_settings[name] = value;
+            }
+        });
+        gArgs.WriteSettingsFile();
+    }
+    void forceSetting(const std::string& name, const util::SettingsValue& value) override
+    {
+        gArgs.LockSettings([&](util::Settings& settings) {
+            if (value.isNull()) {
+                settings.forced_settings.erase(name);
+            } else {
+                settings.forced_settings[name] = value;
+            }
+        });
+    }
+    void resetSettings() override
+    {
+        gArgs.WriteSettingsFile(/*errors=*/nullptr, /*backup=*/true);
+        gArgs.LockSettings([&](util::Settings& settings) {
+            settings.rw_settings.clear();
+        });
+        gArgs.WriteSettingsFile();
+    }
     void mapPort(bool use_upnp, bool use_natpmp) override { StartMapPort(use_upnp, use_natpmp); }
     bool getProxy(Network net, Proxy& proxy_info) override { return GetProxy(net, proxy_info); }
     size_t getNodeCount(ConnectionDirection flags) override
diff --git a/src/test/settings_tests.cpp b/src/test/settings_tests.cpp
index 2e5eb5424751..ad12c4656106 100644
--- a/src/test/settings_tests.cpp
+++ b/src/test/settings_tests.cpp
@@ -106,7 +106,7 @@ BOOST_AUTO_TEST_CASE(ReadWrite)
 //! Check settings struct contents against expected json strings.
 static void CheckValues(const util::Settings& settings, const std::string& single_val, const std::string& list_val)
 {
-    util::SettingsValue single_value = GetSetting(settings, "section", "name", false, false);
+    util::SettingsValue single_value = GetSetting(settings, "section", "name", false, false, false);
     util::SettingsValue list_value(util::SettingsValue::VARR);
     for (const auto& item : GetSettingsList(settings, "section", "name", false)) {
         list_value.push_back(item);
@@ -142,9 +142,9 @@ BOOST_AUTO_TEST_CASE(NullOverride)
 {
     util::Settings settings;
     settings.command_line_options["name"].push_back("value");
-    BOOST_CHECK_EQUAL(R"("value")", GetSetting(settings, "section", "name", false, false).write().c_str());
+    BOOST_CHECK_EQUAL(R"("value")", GetSetting(settings, "section", "name", false, false, false).write().c_str());
     settings.forced_settings["name"] = {};
-    BOOST_CHECK_EQUAL(R"(null)", GetSetting(settings, "section", "name", false, false).write().c_str());
+    BOOST_CHECK_EQUAL(R"(null)", GetSetting(settings, "section", "name", false, false, false).write().c_str());
 }
 
 // Test different ways settings can be merged, and verify results. This test can
@@ -225,7 +225,7 @@ BOOST_FIXTURE_TEST_CASE(Merge, MergeTestingSetup)
         }
 
         desc += " || ";
-        desc += GetSetting(settings, network, name, ignore_default_section_config, /* get_chain_name= */ false).write();
+        desc += GetSetting(settings, network, name, ignore_default_section_config, /*ignore_nonpersistent=*/false, /*get_chain_name=*/false).write();
         desc += " |";
         for (const auto& s : GetSettingsList(settings, network, name, ignore_default_section_config)) {
             desc += " ";
diff --git a/src/util/settings.cpp b/src/util/settings.cpp
index 5e4f80b9aad2..421b2be4623c 100644
--- a/src/util/settings.cpp
+++ b/src/util/settings.cpp
@@ -141,6 +141,7 @@ SettingsValue GetSetting(const Settings& settings,
     const std::string& section,
     const std::string& name,
     bool ignore_default_section_config,
+    bool ignore_nonpersistent,
     bool get_chain_name)
 {
     SettingsValue result;
@@ -176,6 +177,9 @@ SettingsValue GetSetting(const Settings& settings,
             return;
         }
 
+        // Ignore nonpersistent settings if requested.
+        if (ignore_nonpersistent && (source == Source::COMMAND_LINE || source == Source::FORCED)) return;
+
         // Skip negated command line settings.
         if (skip_negated_command_line && span.last_negated()) return;
 
diff --git a/src/util/settings.h b/src/util/settings.h
index 261a0a032f5e..e97158dc0919 100644
--- a/src/util/settings.h
+++ b/src/util/settings.h
@@ -55,12 +55,18 @@ bool WriteSettings(const fs::path& path,
 //! @param ignore_default_section_config - ignore values in the default section
 //!                                        of the config file (part before any
 //!                                        [section] keywords)
+//! @param ignore_nonpersistent - ignore non-persistent settings values (forced
+//!                               settings values and values specified on the
+//!                               command line). Only return settings in the
+//!                               read-only config and read-write settings
+//!                               files.
 //! @param get_chain_name - enable special backwards compatible behavior
 //!                         for GetChainName
 SettingsValue GetSetting(const Settings& settings,
     const std::string& section,
     const std::string& name,
     bool ignore_default_section_config,
+    bool ignore_nonpersistent,
     bool get_chain_name);
 
 //! Get combined setting value similar to GetSetting(), except if setting was
diff --git a/src/util/system.cpp b/src/util/system.cpp
index 95dfa9c6511c..1b79ef2a1832 100644
--- a/src/util/system.cpp
+++ b/src/util/system.cpp
@@ -559,12 +559,15 @@ bool ArgsManager::InitSettings(std::string& error)
     return true;
 }
 
-bool ArgsManager::GetSettingsPath(fs::path* filepath, bool temp) const
+bool ArgsManager::GetSettingsPath(fs::path* filepath, bool temp, bool backup) const
 {
     fs::path settings = GetPathArg("-settings", BITCOIN_SETTINGS_FILENAME);
     if (settings.empty()) {
         return false;
     }
+    if (backup) {
+        settings += ".bak";
+    }
     if (filepath) {
         *filepath = fsbridge::AbsPathJoin(GetDataDirNet(), temp ? settings + ".tmp" : settings);
     }
@@ -605,10 +608,10 @@ bool ArgsManager::ReadSettingsFile(std::vector<std::string>* errors)
     return true;
 }
 
-bool ArgsManager::WriteSettingsFile(std::vector<std::string>* errors) const
+bool ArgsManager::WriteSettingsFile(std::vector<std::string>* errors, bool backup) const
 {
     fs::path path, path_tmp;
-    if (!GetSettingsPath(&path, /* temp= */ false) || !GetSettingsPath(&path_tmp, /* temp= */ true)) {
+    if (!GetSettingsPath(&path, /*temp=*/false, backup) || !GetSettingsPath(&path_tmp, /*temp=*/true, backup)) {
         throw std::logic_error("Attempt to write settings file when dynamic settings are disabled.");
     }
 
@@ -625,6 +628,13 @@ bool ArgsManager::WriteSettingsFile(std::vector<std::string>* errors) const
     return true;
 }
 
+util::SettingsValue ArgsManager::GetPersistentSetting(const std::string& name) const
+{
+    LOCK(cs_args);
+    return util::GetSetting(m_settings, m_network, name, !UseDefaultSection("-" + name),
+        /*ignore_nonpersistent=*/true, /*get_chain_name=*/false);
+}
+
 bool ArgsManager::IsArgNegated(const std::string& strArg) const
 {
     return GetSetting(strArg).isFalse();
@@ -633,18 +643,33 @@ bool ArgsManager::IsArgNegated(const std::string& strArg) const
 std::string ArgsManager::GetArg(const std::string& strArg, const std::string& strDefault) const
 {
     const util::SettingsValue value = GetSetting(strArg);
+    return SettingToString(value, strDefault);
+}
+
+std::string SettingToString(const util::SettingsValue& value, const std::string& strDefault)
+{
     return value.isNull() ? strDefault : value.isFalse() ? "0" : value.isTrue() ? "1" : value.isNum() ? value.getValStr() : value.get_str();
 }
 
 int64_t ArgsManager::GetIntArg(const std::string& strArg, int64_t nDefault) const
 {
     const util::SettingsValue value = GetSetting(strArg);
+    return SettingToInt(value, nDefault);
+}
+
+int64_t SettingToInt(const util::SettingsValue& value, int64_t nDefault)
+{
     return value.isNull() ? nDefault : value.isFalse() ? 0 : value.isTrue() ? 1 : value.isNum() ? value.getInt<int64_t>() : LocaleIndependentAtoi<int64_t>(value.get_str());
 }
 
 bool ArgsManager::GetBoolArg(const std::string& strArg, bool fDefault) const
 {
     const util::SettingsValue value = GetSetting(strArg);
+    return SettingToBool(value, fDefault);
+}
+
+bool SettingToBool(const util::SettingsValue& value, bool fDefault)
+{
     return value.isNull() ? fDefault : value.isBool() ? value.get_bool() : InterpretBool(value.get_str());
 }
 
@@ -1086,6 +1111,7 @@ std::string ArgsManager::GetChainName() const
         LOCK(cs_args);
         util::SettingsValue value = util::GetSetting(m_settings, /* section= */ "", SettingName(arg),
             /* ignore_default_section_config= */ false,
+            /*ignore_nonpersistent=*/false,
             /* get_chain_name= */ true);
         return value.isNull() ? false : value.isBool() ? value.get_bool() : (!interpret_bool || InterpretBool(value.get_str()));
     };
@@ -1154,7 +1180,8 @@ util::SettingsValue ArgsManager::GetSetting(const std::string& arg) const
 {
     LOCK(cs_args);
     return util::GetSetting(
-        m_settings, m_network, SettingName(arg), !UseDefaultSection(arg), /* get_chain_name= */ false);
+        m_settings, m_network, SettingName(arg), !UseDefaultSection(arg),
+        /*ignore_nonpersistent=*/false, /*get_chain_name=*/false);
 }
 
 std::vector<util::SettingsValue> ArgsManager::GetSettingsList(const std::string& arg) const
diff --git a/src/util/system.h b/src/util/system.h
index 53675ccf4cb8..bcf9ba0865cf 100644
--- a/src/util/system.h
+++ b/src/util/system.h
@@ -174,6 +174,10 @@ struct SectionInfo
     int m_line;
 };
 
+std::string SettingToString(const util::SettingsValue&, const std::string&);
+int64_t SettingToInt(const util::SettingsValue&, int64_t);
+bool SettingToBool(const util::SettingsValue&, bool);
+
 class ArgsManager
 {
 public:
@@ -468,7 +472,7 @@ class ArgsManager
      * Get settings file path, or return false if read-write settings were
      * disabled with -nosettings.
      */
-    bool GetSettingsPath(fs::path* filepath = nullptr, bool temp = false) const;
+    bool GetSettingsPath(fs::path* filepath = nullptr, bool temp = false, bool backup = false) const;
 
     /**
      * Read settings file. Push errors to vector, or log them if null.
@@ -476,9 +480,16 @@ class ArgsManager
     bool ReadSettingsFile(std::vector<std::string>* errors = nullptr);
 
     /**
-     * Write settings file. Push errors to vector, or log them if null.
+     * Write settings file or backup settings file. Push errors to vector, or
+     * log them if null.
+     */
+    bool WriteSettingsFile(std::vector<std::string>* errors = nullptr, bool backup = false) const;
+
+    /**
+     * Get current setting from config file or read/write settings file,
+     * ignoring nonpersistent command line or forced settings values.
      */
-    bool WriteSettingsFile(std::vector<std::string>* errors = nullptr) const;
+    util::SettingsValue GetPersistentSetting(const std::string& name) const;
 
     /**
      * Access settings with lock held.

From 65299a0dbaff2cd03796cf65fcb38463dca6a621 Mon Sep 17 00:00:00 2001
From: Kittywhiskers Van Gogh <63189531+kwvg@users.noreply.github.com>
Date: Sat, 30 Jul 2022 14:27:47 +0200
Subject: [PATCH 346/656] merge bitcoin#25748: Avoid copies in
 FlatSigningProvider Merge

---
 src/script/descriptor.cpp      |  2 +-
 src/script/signingprovider.cpp | 19 +++++++------------
 src/script/signingprovider.h   |  5 +++--
 src/test/descriptor_tests.cpp  |  4 ++--
 src/wallet/rpc/spend.cpp       |  2 +-
 src/wallet/scriptpubkeyman.cpp |  8 ++++----
 6 files changed, 18 insertions(+), 22 deletions(-)

diff --git a/src/script/descriptor.cpp b/src/script/descriptor.cpp
index c6d2c5a82a15..9e8968538c10 100644
--- a/src/script/descriptor.cpp
+++ b/src/script/descriptor.cpp
@@ -620,7 +620,7 @@ class DescriptorImpl : public Descriptor
             assert(outscripts.size() == 1);
             subscripts.emplace_back(std::move(outscripts[0]));
         }
-        out = Merge(std::move(out), std::move(subprovider));
+        out.Merge(std::move(subprovider));
 
         std::vector<CPubKey> pubkeys;
         pubkeys.reserve(entries.size());
diff --git a/src/script/signingprovider.cpp b/src/script/signingprovider.cpp
index ab147e55a585..3f6c9c2ad7c8 100644
--- a/src/script/signingprovider.cpp
+++ b/src/script/signingprovider.cpp
@@ -55,18 +55,13 @@ bool FlatSigningProvider::GetKeyOrigin(const CKeyID& keyid, KeyOriginInfo& info)
 }
 bool FlatSigningProvider::GetKey(const CKeyID& keyid, CKey& key) const { return LookupHelper(keys, keyid, key); }
 
-FlatSigningProvider Merge(const FlatSigningProvider& a, const FlatSigningProvider& b)
-{
-    FlatSigningProvider ret;
-    ret.scripts = a.scripts;
-    ret.scripts.insert(b.scripts.begin(), b.scripts.end());
-    ret.pubkeys = a.pubkeys;
-    ret.pubkeys.insert(b.pubkeys.begin(), b.pubkeys.end());
-    ret.keys = a.keys;
-    ret.keys.insert(b.keys.begin(), b.keys.end());
-    ret.origins = a.origins;
-    ret.origins.insert(b.origins.begin(), b.origins.end());
-    return ret;
+FlatSigningProvider& FlatSigningProvider::Merge(FlatSigningProvider&& b)
+{
+    scripts.merge(b.scripts);
+    pubkeys.merge(b.pubkeys);
+    keys.merge(b.keys);
+    origins.merge(b.origins);
+    return *this;
 }
 
 bool FillableSigningProvider::GetPubKey(const CKeyID &address, CPubKey &vchPubKeyOut) const
diff --git a/src/script/signingprovider.h b/src/script/signingprovider.h
index c231fb0c6544..f06cb47bb14c 100644
--- a/src/script/signingprovider.h
+++ b/src/script/signingprovider.h
@@ -6,6 +6,7 @@
 #ifndef BITCOIN_SCRIPT_SIGNINGPROVIDER_H
 #define BITCOIN_SCRIPT_SIGNINGPROVIDER_H
 
+#include <attributes.h>
 #include <key.h>
 #include <pubkey.h>
 #include <script/keyorigin.h>
@@ -54,9 +55,9 @@ struct FlatSigningProvider final : public SigningProvider
     bool GetPubKey(const CKeyID& keyid, CPubKey& pubkey) const override;
     bool GetKeyOrigin(const CKeyID& keyid, KeyOriginInfo& info) const override;
     bool GetKey(const CKeyID& keyid, CKey& key) const override;
-};
 
-FlatSigningProvider Merge(const FlatSigningProvider& a, const FlatSigningProvider& b);
+    FlatSigningProvider& Merge(FlatSigningProvider&& b) LIFETIMEBOUND;
+};
 
 /** Fillable signing provider that keeps keys in an address->secret map */
 class FillableSigningProvider : public SigningProvider
diff --git a/src/test/descriptor_tests.cpp b/src/test/descriptor_tests.cpp
index b3e45c2c4c06..3bf7ddc90f11 100644
--- a/src/test/descriptor_tests.cpp
+++ b/src/test/descriptor_tests.cpp
@@ -234,13 +234,13 @@ void DoCheck(const std::string& prv, const std::string& pub, const std::string&
             // For each of the produced scripts, verify solvability, and when possible, try to sign a transaction spending it.
             for (size_t n = 0; n < spks.size(); ++n) {
                 BOOST_CHECK_EQUAL(ref[n], HexStr(spks[n]));
-                BOOST_CHECK_EQUAL(IsSolvable(Merge(key_provider, script_provider), spks[n]), (flags & UNSOLVABLE) == 0);
+                BOOST_CHECK_EQUAL(IsSolvable(FlatSigningProvider{key_provider}.Merge(FlatSigningProvider{script_provider}), spks[n]), (flags & UNSOLVABLE) == 0);
 
                 if (flags & SIGNABLE) {
                     CMutableTransaction spend;
                     spend.vin.resize(1);
                     spend.vout.resize(1);
-                    BOOST_CHECK_MESSAGE(SignSignature(Merge(keys_priv, script_provider), spks[n], spend, 0, 1, SIGHASH_ALL), prv);
+                    BOOST_CHECK_MESSAGE(SignSignature(FlatSigningProvider{keys_priv}.Merge(FlatSigningProvider{script_provider}), spks[n], spend, 0, 1, SIGHASH_ALL), prv);
                 }
 
                 /* Infer a descriptor from the generated script, and verify its solvability and that it roundtrips. */
diff --git a/src/wallet/rpc/spend.cpp b/src/wallet/rpc/spend.cpp
index 309da88bff3a..746dfc4bcdb3 100644
--- a/src/wallet/rpc/spend.cpp
+++ b/src/wallet/rpc/spend.cpp
@@ -496,7 +496,7 @@ void FundTransaction(CWallet& wallet, CMutableTransaction& tx, CAmount& fee_out,
                     throw JSONRPCError(RPC_INVALID_PARAMETER, strprintf("Unable to parse descriptor '%s': %s", desc_str, error));
                 }
                 desc->Expand(0, desc_out, scripts_temp, desc_out);
-                coinControl.m_external_provider = Merge(coinControl.m_external_provider, desc_out);
+                coinControl.m_external_provider.Merge(std::move(desc_out));
             }
         }
     }
diff --git a/src/wallet/scriptpubkeyman.cpp b/src/wallet/scriptpubkeyman.cpp
index 28c354dd6997..37cf86672cde 100644
--- a/src/wallet/scriptpubkeyman.cpp
+++ b/src/wallet/scriptpubkeyman.cpp
@@ -2209,7 +2209,7 @@ std::unique_ptr<FlatSigningProvider> DescriptorScriptPubKeyMan::GetSigningProvid
     // Fetch SigningProvider from cache to avoid re-deriving
     auto it = m_map_signing_providers.find(index);
     if (it != m_map_signing_providers.end()) {
-        *out_keys = Merge(*out_keys, it->second);
+        out_keys->Merge(FlatSigningProvider{it->second});
     } else {
         // Get the scripts, keys, and key origins for this script
         std::vector<CScript> scripts_temp;
@@ -2246,7 +2246,7 @@ bool DescriptorScriptPubKeyMan::SignTransaction(CMutableTransaction& tx, const s
         if (!coin_keys) {
             continue;
         }
-        *keys = Merge(*keys, *coin_keys);
+        keys->Merge(std::move(*coin_keys));
     }
 
     return ::SignTransaction(tx, keys.get(), coins, sighash, input_errors);
@@ -2318,7 +2318,7 @@ TransactionError DescriptorScriptPubKeyMan::FillPSBT(PartiallySignedTransaction&
         std::unique_ptr<FlatSigningProvider> keys = std::make_unique<FlatSigningProvider>();
         std::unique_ptr<FlatSigningProvider> script_keys = GetSigningProvider(script, sign);
         if (script_keys) {
-            *keys = Merge(*keys, *script_keys);
+            keys->Merge(std::move(*script_keys));
         } else {
             // Maybe there are pubkeys listed that we can sign for
             script_keys = std::make_unique<FlatSigningProvider>();
@@ -2326,7 +2326,7 @@ TransactionError DescriptorScriptPubKeyMan::FillPSBT(PartiallySignedTransaction&
                 const CPubKey& pubkey = pk_pair.first;
                 std::unique_ptr<FlatSigningProvider> pk_keys = GetSigningProvider(pubkey);
                 if (pk_keys) {
-                    *keys = Merge(*keys, *pk_keys);
+                    keys->Merge(std::move(*pk_keys));
                 }
             }
         }

From 55a474fc8c761228454bb1b2af931c766fa67e6e Mon Sep 17 00:00:00 2001
From: Kittywhiskers Van Gogh <63189531+kwvg@users.noreply.github.com>
Date: Fri, 17 Oct 2025 19:19:37 +0530
Subject: [PATCH 347/656] merge bitcoin#25863: remove unused norm_prv parameter
 in `descriptor_tests.cpp`

---
 src/test/descriptor_tests.cpp | 52 +++++++++++++++++------------------
 1 file changed, 26 insertions(+), 26 deletions(-)

diff --git a/src/test/descriptor_tests.cpp b/src/test/descriptor_tests.cpp
index 3bf7ddc90f11..5b7161277470 100644
--- a/src/test/descriptor_tests.cpp
+++ b/src/test/descriptor_tests.cpp
@@ -75,7 +75,7 @@ std::string UseHInsteadOfApostrophe(const std::string& desc)
 
 const std::set<std::vector<uint32_t>> ONLY_EMPTY{{}};
 
-void DoCheck(const std::string& prv, const std::string& pub, const std::string& norm_prv, const std::string& norm_pub, int flags, const std::vector<std::vector<std::string>>& scripts, const std::optional<OutputType>& type, const std::set<std::vector<uint32_t>>& paths = ONLY_EMPTY,
+void DoCheck(const std::string& prv, const std::string& pub, const std::string& norm_pub, int flags, const std::vector<std::vector<std::string>>& scripts, const std::optional<OutputType>& type, const std::set<std::vector<uint32_t>>& paths = ONLY_EMPTY,
     bool replace_apostrophe_with_h_in_prv=false, bool replace_apostrophe_with_h_in_pub=false)
 {
     FlatSigningProvider keys_priv, keys_pub;
@@ -268,29 +268,29 @@ void DoCheck(const std::string& prv, const std::string& pub, const std::string&
     BOOST_CHECK_MESSAGE(left_paths.empty(), "Not all expected key paths found: " + prv);
 }
 
-void Check(const std::string& prv, const std::string& pub, const std::string& norm_prv, const std::string& norm_pub, int flags, const std::vector<std::vector<std::string>>& scripts, const std::optional<OutputType>& type, const std::set<std::vector<uint32_t>>& paths = ONLY_EMPTY)
+void Check(const std::string& prv, const std::string& pub, const std::string& norm_pub, int flags, const std::vector<std::vector<std::string>>& scripts, const std::optional<OutputType>& type, const std::set<std::vector<uint32_t>>& paths = ONLY_EMPTY)
 {
     bool found_apostrophes_in_prv = false;
     bool found_apostrophes_in_pub = false;
 
     // Do not replace apostrophes with 'h' in prv and pub
-    DoCheck(prv, pub, norm_prv, norm_pub, flags, scripts, type, paths);
+    DoCheck(prv, pub, norm_pub, flags, scripts, type, paths);
 
     // Replace apostrophes with 'h' in prv but not in pub, if apostrophes are found in prv
     if (prv.find('\'') != std::string::npos) {
         found_apostrophes_in_prv = true;
-        DoCheck(prv, pub, norm_prv, norm_pub, flags, scripts, type, paths, /* replace_apostrophe_with_h_in_prv = */true, /*replace_apostrophe_with_h_in_pub = */false);
+        DoCheck(prv, pub, norm_pub, flags, scripts, type, paths, /* replace_apostrophe_with_h_in_prv = */true, /*replace_apostrophe_with_h_in_pub = */false);
     }
 
     // Replace apostrophes with 'h' in pub but not in prv, if apostrophes are found in pub
     if (pub.find('\'') != std::string::npos) {
         found_apostrophes_in_pub = true;
-        DoCheck(prv, pub, norm_prv, norm_pub, flags, scripts, type, paths, /* replace_apostrophe_with_h_in_prv = */false, /*replace_apostrophe_with_h_in_pub = */true);
+        DoCheck(prv, pub, norm_pub, flags, scripts, type, paths, /* replace_apostrophe_with_h_in_prv = */false, /*replace_apostrophe_with_h_in_pub = */true);
     }
 
     // Replace apostrophes with 'h' both in prv and in pub, if apostrophes are found in both
     if (found_apostrophes_in_prv && found_apostrophes_in_pub) {
-        DoCheck(prv, pub, norm_prv, norm_pub, flags, scripts, type, paths, /* replace_apostrophe_with_h_in_prv = */true, /*replace_apostrophe_with_h_in_pub = */true);
+        DoCheck(prv, pub, norm_pub, flags, scripts, type, paths, /* replace_apostrophe_with_h_in_prv = */true, /*replace_apostrophe_with_h_in_pub = */true);
     }
 }
 
@@ -301,36 +301,36 @@ BOOST_FIXTURE_TEST_SUITE(descriptor_tests, BasicTestingSetup)
 BOOST_AUTO_TEST_CASE(descriptor_test)
 {
     // Basic single-key compressed
-    Check("pk(XJvEUEcFWCHCyruc8ZX5exPZaGe4UR7gC5FHrhwPnQGDs1uWCsT2)", "pk(03a34b99f22c790c4e36b2b3c2c35a36db06226e41c692fc82b8b56ac1c540c5bd)", "pk(XJvEUEcFWCHCyruc8ZX5exPZaGe4UR7gC5FHrhwPnQGDs1uWCsT2)", "pk(03a34b99f22c790c4e36b2b3c2c35a36db06226e41c692fc82b8b56ac1c540c5bd)", SIGNABLE, {{"2103a34b99f22c790c4e36b2b3c2c35a36db06226e41c692fc82b8b56ac1c540c5bdac"}}, OutputType::LEGACY);
-    Check("pkh([deadbeef/1/2'/3/4']XJvEUEcFWCHCyruc8ZX5exPZaGe4UR7gC5FHrhwPnQGDs1uWCsT2)", "pkh([deadbeef/1/2'/3/4']03a34b99f22c790c4e36b2b3c2c35a36db06226e41c692fc82b8b56ac1c540c5bd)", "pkh([deadbeef/1/2'/3/4']XJvEUEcFWCHCyruc8ZX5exPZaGe4UR7gC5FHrhwPnQGDs1uWCsT2)", "pkh([deadbeef/1/2'/3/4']03a34b99f22c790c4e36b2b3c2c35a36db06226e41c692fc82b8b56ac1c540c5bd)", SIGNABLE, {{"76a9149a1c78a507689f6f54b847ad1cef1e614ee23f1e88ac"}}, OutputType::LEGACY, {{1, 0x80000002UL, 3, 0x80000004UL}});
-    Check("combo(XJvEUEcFWCHCyruc8ZX5exPZaGe4UR7gC5FHrhwPnQGDs1uWCsT2)", "combo(03a34b99f22c790c4e36b2b3c2c35a36db06226e41c692fc82b8b56ac1c540c5bd)", "combo(XJvEUEcFWCHCyruc8ZX5exPZaGe4UR7gC5FHrhwPnQGDs1uWCsT2)", "combo(03a34b99f22c790c4e36b2b3c2c35a36db06226e41c692fc82b8b56ac1c540c5bd)", SIGNABLE, {{"2103a34b99f22c790c4e36b2b3c2c35a36db06226e41c692fc82b8b56ac1c540c5bdac", "76a9149a1c78a507689f6f54b847ad1cef1e614ee23f1e88ac", "a9141a31ad23bf49c247dd531a623c2ef57da3c400c587"}}, OutputType::LEGACY);
+    Check("pk(XJvEUEcFWCHCyruc8ZX5exPZaGe4UR7gC5FHrhwPnQGDs1uWCsT2)", "pk(03a34b99f22c790c4e36b2b3c2c35a36db06226e41c692fc82b8b56ac1c540c5bd)", "pk(03a34b99f22c790c4e36b2b3c2c35a36db06226e41c692fc82b8b56ac1c540c5bd)", SIGNABLE, {{"2103a34b99f22c790c4e36b2b3c2c35a36db06226e41c692fc82b8b56ac1c540c5bdac"}}, OutputType::LEGACY);
+    Check("pkh([deadbeef/1/2'/3/4']XJvEUEcFWCHCyruc8ZX5exPZaGe4UR7gC5FHrhwPnQGDs1uWCsT2)", "pkh([deadbeef/1/2'/3/4']03a34b99f22c790c4e36b2b3c2c35a36db06226e41c692fc82b8b56ac1c540c5bd)", "pkh([deadbeef/1/2'/3/4']03a34b99f22c790c4e36b2b3c2c35a36db06226e41c692fc82b8b56ac1c540c5bd)", SIGNABLE, {{"76a9149a1c78a507689f6f54b847ad1cef1e614ee23f1e88ac"}}, OutputType::LEGACY, {{1, 0x80000002UL, 3, 0x80000004UL}});
+    Check("combo(XJvEUEcFWCHCyruc8ZX5exPZaGe4UR7gC5FHrhwPnQGDs1uWCsT2)", "combo(03a34b99f22c790c4e36b2b3c2c35a36db06226e41c692fc82b8b56ac1c540c5bd)", "combo(03a34b99f22c790c4e36b2b3c2c35a36db06226e41c692fc82b8b56ac1c540c5bd)", SIGNABLE, {{"2103a34b99f22c790c4e36b2b3c2c35a36db06226e41c692fc82b8b56ac1c540c5bdac", "76a9149a1c78a507689f6f54b847ad1cef1e614ee23f1e88ac", "a9141a31ad23bf49c247dd531a623c2ef57da3c400c587"}}, OutputType::LEGACY);
     CheckUnparsable("pkh(deadbeef/1/2'/3/4']L4rK1yDtCWekvXuE6oXD9jCYfFNV2cWRpVuPLBcCU2z8TrisoyY1)", "pkh(deadbeef/1/2'/3/4']03a34b99f22c790c4e36b2b3c2c35a36db06226e41c692fc82b8b56ac1c540c5bd)", "Key origin start '[ character expected but not found, got 'd' instead"); // Missing start bracket in key origin
     CheckUnparsable("pkh([deadbeef]/1/2'/3/4']L4rK1yDtCWekvXuE6oXD9jCYfFNV2cWRpVuPLBcCU2z8TrisoyY1)", "pkh([deadbeef]/1/2'/3/4']03a34b99f22c790c4e36b2b3c2c35a36db06226e41c692fc82b8b56ac1c540c5bd)", "Multiple ']' characters found for a single pubkey"); // Multiple end brackets in key origin
     // Basic single-key uncompressed
-    Check("pk(7sH936MDoVPFVk2VoaCM5yW8P3BfPyffnZECyaHrZwfLgWpS13e)", "pk(04a34b99f22c790c4e36b2b3c2c35a36db06226e41c692fc82b8b56ac1c540c5bd5b8dec5235a0fa8722476c7709c02559e3aa73aa03918ba2d492eea75abea235)", "pk(7sH936MDoVPFVk2VoaCM5yW8P3BfPyffnZECyaHrZwfLgWpS13e)", "pk(04a34b99f22c790c4e36b2b3c2c35a36db06226e41c692fc82b8b56ac1c540c5bd5b8dec5235a0fa8722476c7709c02559e3aa73aa03918ba2d492eea75abea235)", SIGNABLE, {{"4104a34b99f22c790c4e36b2b3c2c35a36db06226e41c692fc82b8b56ac1c540c5bd5b8dec5235a0fa8722476c7709c02559e3aa73aa03918ba2d492eea75abea235ac"}}, OutputType::LEGACY);
-    Check("pkh(7sH936MDoVPFVk2VoaCM5yW8P3BfPyffnZECyaHrZwfLgWpS13e)", "pkh(04a34b99f22c790c4e36b2b3c2c35a36db06226e41c692fc82b8b56ac1c540c5bd5b8dec5235a0fa8722476c7709c02559e3aa73aa03918ba2d492eea75abea235)", "pkh(7sH936MDoVPFVk2VoaCM5yW8P3BfPyffnZECyaHrZwfLgWpS13e)", "pkh(04a34b99f22c790c4e36b2b3c2c35a36db06226e41c692fc82b8b56ac1c540c5bd5b8dec5235a0fa8722476c7709c02559e3aa73aa03918ba2d492eea75abea235)", SIGNABLE, {{"76a914b5bd079c4d57cc7fc28ecf8213a6b791625b818388ac"}}, OutputType::LEGACY);
-    Check("combo(7sH936MDoVPFVk2VoaCM5yW8P3BfPyffnZECyaHrZwfLgWpS13e)", "combo(04a34b99f22c790c4e36b2b3c2c35a36db06226e41c692fc82b8b56ac1c540c5bd5b8dec5235a0fa8722476c7709c02559e3aa73aa03918ba2d492eea75abea235)", "combo(7sH936MDoVPFVk2VoaCM5yW8P3BfPyffnZECyaHrZwfLgWpS13e)", "combo(04a34b99f22c790c4e36b2b3c2c35a36db06226e41c692fc82b8b56ac1c540c5bd5b8dec5235a0fa8722476c7709c02559e3aa73aa03918ba2d492eea75abea235)", SIGNABLE, {{"4104a34b99f22c790c4e36b2b3c2c35a36db06226e41c692fc82b8b56ac1c540c5bd5b8dec5235a0fa8722476c7709c02559e3aa73aa03918ba2d492eea75abea235ac"}}, OutputType::LEGACY);
+    Check("pk(7sH936MDoVPFVk2VoaCM5yW8P3BfPyffnZECyaHrZwfLgWpS13e)", "pk(04a34b99f22c790c4e36b2b3c2c35a36db06226e41c692fc82b8b56ac1c540c5bd5b8dec5235a0fa8722476c7709c02559e3aa73aa03918ba2d492eea75abea235)", "pk(04a34b99f22c790c4e36b2b3c2c35a36db06226e41c692fc82b8b56ac1c540c5bd5b8dec5235a0fa8722476c7709c02559e3aa73aa03918ba2d492eea75abea235)", SIGNABLE, {{"4104a34b99f22c790c4e36b2b3c2c35a36db06226e41c692fc82b8b56ac1c540c5bd5b8dec5235a0fa8722476c7709c02559e3aa73aa03918ba2d492eea75abea235ac"}}, OutputType::LEGACY);
+    Check("pkh(7sH936MDoVPFVk2VoaCM5yW8P3BfPyffnZECyaHrZwfLgWpS13e)", "pkh(04a34b99f22c790c4e36b2b3c2c35a36db06226e41c692fc82b8b56ac1c540c5bd5b8dec5235a0fa8722476c7709c02559e3aa73aa03918ba2d492eea75abea235)", "pkh(04a34b99f22c790c4e36b2b3c2c35a36db06226e41c692fc82b8b56ac1c540c5bd5b8dec5235a0fa8722476c7709c02559e3aa73aa03918ba2d492eea75abea235)", SIGNABLE, {{"76a914b5bd079c4d57cc7fc28ecf8213a6b791625b818388ac"}}, OutputType::LEGACY);
+    Check("combo(7sH936MDoVPFVk2VoaCM5yW8P3BfPyffnZECyaHrZwfLgWpS13e)", "combo(04a34b99f22c790c4e36b2b3c2c35a36db06226e41c692fc82b8b56ac1c540c5bd5b8dec5235a0fa8722476c7709c02559e3aa73aa03918ba2d492eea75abea235)", "combo(04a34b99f22c790c4e36b2b3c2c35a36db06226e41c692fc82b8b56ac1c540c5bd5b8dec5235a0fa8722476c7709c02559e3aa73aa03918ba2d492eea75abea235)", SIGNABLE, {{"4104a34b99f22c790c4e36b2b3c2c35a36db06226e41c692fc82b8b56ac1c540c5bd5b8dec5235a0fa8722476c7709c02559e3aa73aa03918ba2d492eea75abea235ac"}}, OutputType::LEGACY);
 
     // Some unconventional single-key constructions
-    Check("sh(pk(XJvEUEcFWCHCyruc8ZX5exPZaGe4UR7gC5FHrhwPnQGDs1uWCsT2))", "sh(pk(03a34b99f22c790c4e36b2b3c2c35a36db06226e41c692fc82b8b56ac1c540c5bd))", "sh(pk(XJvEUEcFWCHCyruc8ZX5exPZaGe4UR7gC5FHrhwPnQGDs1uWCsT2))", "sh(pk(03a34b99f22c790c4e36b2b3c2c35a36db06226e41c692fc82b8b56ac1c540c5bd))", SIGNABLE, {{"a9141857af51a5e516552b3086430fd8ce55f7c1a52487"}}, OutputType::LEGACY);
-    Check("sh(pkh(XJvEUEcFWCHCyruc8ZX5exPZaGe4UR7gC5FHrhwPnQGDs1uWCsT2))", "sh(pkh(03a34b99f22c790c4e36b2b3c2c35a36db06226e41c692fc82b8b56ac1c540c5bd))", "sh(pkh(XJvEUEcFWCHCyruc8ZX5exPZaGe4UR7gC5FHrhwPnQGDs1uWCsT2))", "sh(pkh(03a34b99f22c790c4e36b2b3c2c35a36db06226e41c692fc82b8b56ac1c540c5bd))", SIGNABLE, {{"a9141a31ad23bf49c247dd531a623c2ef57da3c400c587"}}, OutputType::LEGACY);
+    Check("sh(pk(XJvEUEcFWCHCyruc8ZX5exPZaGe4UR7gC5FHrhwPnQGDs1uWCsT2))", "sh(pk(03a34b99f22c790c4e36b2b3c2c35a36db06226e41c692fc82b8b56ac1c540c5bd))", "sh(pk(03a34b99f22c790c4e36b2b3c2c35a36db06226e41c692fc82b8b56ac1c540c5bd))", SIGNABLE, {{"a9141857af51a5e516552b3086430fd8ce55f7c1a52487"}}, OutputType::LEGACY);
+    Check("sh(pkh(XJvEUEcFWCHCyruc8ZX5exPZaGe4UR7gC5FHrhwPnQGDs1uWCsT2))", "sh(pkh(03a34b99f22c790c4e36b2b3c2c35a36db06226e41c692fc82b8b56ac1c540c5bd))", "sh(pkh(03a34b99f22c790c4e36b2b3c2c35a36db06226e41c692fc82b8b56ac1c540c5bd))", SIGNABLE, {{"a9141a31ad23bf49c247dd531a623c2ef57da3c400c587"}}, OutputType::LEGACY);
 
     // Versions with BIP32 derivations
-    Check("pk(xprv9uPDJpEQgRQfDcW7BkF7eTya6RPxXeJCqCJGHuCJ4GiRVLzkTXBAJMu2qaMWPrS7AANYqdq6vcBcBUdJCVVFceUvJFjaPdGZ2y9WACViL4L/0)", "pk(xpub68NZiKmJWnxxS6aaHmn81bvJeTESw724CRDs6HbuccFQN9Ku14VQrADWgqbhhTHBaohPX4CjNLf9fq9MYo6oDaPPLPxSb7gwQN3ih19Zm4Y/0)", "pk(xprv9uPDJpEQgRQfDcW7BkF7eTya6RPxXeJCqCJGHuCJ4GiRVLzkTXBAJMu2qaMWPrS7AANYqdq6vcBcBUdJCVVFceUvJFjaPdGZ2y9WACViL4L/0)", "pk(xpub68NZiKmJWnxxS6aaHmn81bvJeTESw724CRDs6HbuccFQN9Ku14VQrADWgqbhhTHBaohPX4CjNLf9fq9MYo6oDaPPLPxSb7gwQN3ih19Zm4Y/0)", DEFAULT, {{"210379e45b3cf75f9c5f9befd8e9506fb962f6a9d185ac87001ec44a8d3df8d4a9e3ac"}}, OutputType::LEGACY, {{0}});
+    Check("pk(xprv9uPDJpEQgRQfDcW7BkF7eTya6RPxXeJCqCJGHuCJ4GiRVLzkTXBAJMu2qaMWPrS7AANYqdq6vcBcBUdJCVVFceUvJFjaPdGZ2y9WACViL4L/0)", "pk(xpub68NZiKmJWnxxS6aaHmn81bvJeTESw724CRDs6HbuccFQN9Ku14VQrADWgqbhhTHBaohPX4CjNLf9fq9MYo6oDaPPLPxSb7gwQN3ih19Zm4Y/0)", "pk(xpub68NZiKmJWnxxS6aaHmn81bvJeTESw724CRDs6HbuccFQN9Ku14VQrADWgqbhhTHBaohPX4CjNLf9fq9MYo6oDaPPLPxSb7gwQN3ih19Zm4Y/0)", DEFAULT, {{"210379e45b3cf75f9c5f9befd8e9506fb962f6a9d185ac87001ec44a8d3df8d4a9e3ac"}}, OutputType::LEGACY, {{0}});
     /* --- it fails!!! */
-    Check("pkh(xprv9s21ZrQH143K31xYSDQpPDxsXRTUcvj2iNHm5NUtrGiGG5e2DtALGdso3pGz6ssrdK4PFmM8NSpSBHNqPqm55Qn3LqFtT2emdEXVYsCzC2U/2147483647'/0)", "pkh(xpub661MyMwAqRbcFW31YEwpkMuc5THy2PSt5bDMsktWQcFF8syAmRUapSCGu8ED9W6oDMSgv6Zz8idoc4a6mr8BDzTJY47LJhkJ8UB7WEGuduB/2147483647'/0)", "pkh([bd16bee5/2147483647']xprv9vHkqa6XAPwKqSKSEJMcAB3yoCZhaSVsGZbSkFY5L3Lfjjk8sjZucbsbvEw5o3QrSA69nPfZDCgFnNnLhQ2ohpZuwummndnPasDw2Qr6dC2/0)", "pkh([bd16bee5/2147483647']xpub69H7F5dQzmVd3vPuLKtcXJziMEQByuDidnX3YdwgtNsecY5HRGtAAQC5mXTt4dsv9RzyjgDjAQs9VGVV6ydYCHnprc9vvaA5YtqWyL6hyds/0)", HARDENED, {{"76a914ebdc90806a9c4356c1c88e42216611e1cb4c1c1788ac"}}, OutputType::LEGACY, {{0xFFFFFFFFUL,0}});
-    Check("combo([01234567]xprvA1RpRA33e1JQ7ifknakTFpgNXPmW2YvmhqLQYMmrj4xJXXWYpDPS3xz7iAxn8L39njGVyuoseXzU6rcxFLJ8HFsTjSyQbLYnMpCqE2VbFWc)", "combo([01234567]xpub6ERApfZwUNrhLCkDtcHTcxd75RbzS1ed54G1LkBUHQVHQKqhMkhgbmJbZRkrgZw4koxb5JaHWkY4ALHY2grBGRjaDMzQLcgJvLJuZZvRcEL)", "combo([01234567]xprvA1RpRA33e1JQ7ifknakTFpgNXPmW2YvmhqLQYMmrj4xJXXWYpDPS3xz7iAxn8L39njGVyuoseXzU6rcxFLJ8HFsTjSyQbLYnMpCqE2VbFWc)", "combo([01234567]xpub6ERApfZwUNrhLCkDtcHTcxd75RbzS1ed54G1LkBUHQVHQKqhMkhgbmJbZRkrgZw4koxb5JaHWkY4ALHY2grBGRjaDMzQLcgJvLJuZZvRcEL)", SIGNABLE, {{"2102d2b36900396c9282fa14628566582f206a5dd0bcc8d5e892611806cafb0301f0ac", "76a91431a507b815593dfc51ffc7245ae7e5aee304246e88ac", "a914330e2d4d29686cf671043c5157a42b9532ac168587"}}, OutputType::LEGACY);
-    Check("combo(xprvA2JDeKCSNNZky6uBCviVfJSKyQ1mDYahRjijr5idH2WwLsEd4Hsb2Tyh8RfQMuPh7f7RtyzTtdrbdqqsunu5Mm3wDvUAKRHSC34sJ7in334/*)", "combo(xpub6FHa3pjLCk84BayeJxFW2SP4XRrFd1JYnxeLeU8EqN3vDfZmbqBqaGJAyiLjTAwm6ZLRQUMv1ZACTj37sR62cfN7fe5JnJ7dh8zL4fiyLHV/*)", "combo(xprvA2JDeKCSNNZky6uBCviVfJSKyQ1mDYahRjijr5idH2WwLsEd4Hsb2Tyh8RfQMuPh7f7RtyzTtdrbdqqsunu5Mm3wDvUAKRHSC34sJ7in334/*)", "combo(xpub6FHa3pjLCk84BayeJxFW2SP4XRrFd1JYnxeLeU8EqN3vDfZmbqBqaGJAyiLjTAwm6ZLRQUMv1ZACTj37sR62cfN7fe5JnJ7dh8zL4fiyLHV/*)", RANGE, {{"2102df12b7035bdac8e3bab862a3a83d06ea6b17b6753d52edecba9be46f5d09e076ac", "76a914f90e3178ca25f2c808dc76624032d352fdbdfaf288ac", "a914ebb09774a2d3ebe7cbad02bcec49e3971b75b51787"}, {"21032869a233c9adff9a994e4966e5b821fd5bac066da6c3112488dc52383b4a98ecac", "76a914a8409d1b6dfb1ed2a3e8aa5e0ef2ff26b15b75b788ac", "a91441b8fc4592be2987caa8706d0567cccd18431c1387"}}, OutputType::LEGACY, {{0}, {1}});
+    Check("pkh(xprv9s21ZrQH143K31xYSDQpPDxsXRTUcvj2iNHm5NUtrGiGG5e2DtALGdso3pGz6ssrdK4PFmM8NSpSBHNqPqm55Qn3LqFtT2emdEXVYsCzC2U/2147483647'/0)", "pkh(xpub661MyMwAqRbcFW31YEwpkMuc5THy2PSt5bDMsktWQcFF8syAmRUapSCGu8ED9W6oDMSgv6Zz8idoc4a6mr8BDzTJY47LJhkJ8UB7WEGuduB/2147483647'/0)", "pkh([bd16bee5/2147483647']xpub69H7F5dQzmVd3vPuLKtcXJziMEQByuDidnX3YdwgtNsecY5HRGtAAQC5mXTt4dsv9RzyjgDjAQs9VGVV6ydYCHnprc9vvaA5YtqWyL6hyds/0)", HARDENED, {{"76a914ebdc90806a9c4356c1c88e42216611e1cb4c1c1788ac"}}, OutputType::LEGACY, {{0xFFFFFFFFUL,0}});
+    Check("combo([01234567]xprvA1RpRA33e1JQ7ifknakTFpgNXPmW2YvmhqLQYMmrj4xJXXWYpDPS3xz7iAxn8L39njGVyuoseXzU6rcxFLJ8HFsTjSyQbLYnMpCqE2VbFWc)", "combo([01234567]xpub6ERApfZwUNrhLCkDtcHTcxd75RbzS1ed54G1LkBUHQVHQKqhMkhgbmJbZRkrgZw4koxb5JaHWkY4ALHY2grBGRjaDMzQLcgJvLJuZZvRcEL)", "combo([01234567]xpub6ERApfZwUNrhLCkDtcHTcxd75RbzS1ed54G1LkBUHQVHQKqhMkhgbmJbZRkrgZw4koxb5JaHWkY4ALHY2grBGRjaDMzQLcgJvLJuZZvRcEL)", SIGNABLE, {{"2102d2b36900396c9282fa14628566582f206a5dd0bcc8d5e892611806cafb0301f0ac", "76a91431a507b815593dfc51ffc7245ae7e5aee304246e88ac", "a914330e2d4d29686cf671043c5157a42b9532ac168587"}}, OutputType::LEGACY);
+    Check("combo(xprvA2JDeKCSNNZky6uBCviVfJSKyQ1mDYahRjijr5idH2WwLsEd4Hsb2Tyh8RfQMuPh7f7RtyzTtdrbdqqsunu5Mm3wDvUAKRHSC34sJ7in334/*)", "combo(xpub6FHa3pjLCk84BayeJxFW2SP4XRrFd1JYnxeLeU8EqN3vDfZmbqBqaGJAyiLjTAwm6ZLRQUMv1ZACTj37sR62cfN7fe5JnJ7dh8zL4fiyLHV/*)", "combo(xpub6FHa3pjLCk84BayeJxFW2SP4XRrFd1JYnxeLeU8EqN3vDfZmbqBqaGJAyiLjTAwm6ZLRQUMv1ZACTj37sR62cfN7fe5JnJ7dh8zL4fiyLHV/*)", RANGE, {{"2102df12b7035bdac8e3bab862a3a83d06ea6b17b6753d52edecba9be46f5d09e076ac", "76a914f90e3178ca25f2c808dc76624032d352fdbdfaf288ac", "a914ebb09774a2d3ebe7cbad02bcec49e3971b75b51787"}, {"21032869a233c9adff9a994e4966e5b821fd5bac066da6c3112488dc52383b4a98ecac", "76a914a8409d1b6dfb1ed2a3e8aa5e0ef2ff26b15b75b788ac", "a91441b8fc4592be2987caa8706d0567cccd18431c1387"}}, OutputType::LEGACY, {{0}, {1}});
     CheckUnparsable("combo([012345678]xprvA1RpRA33e1JQ7ifknakTFpgNXPmW2YvmhqLQYMmrj4xJXXWYpDPS3xz7iAxn8L39njGVyuoseXzU6rcxFLJ8HFsTjSyQbLYnMpCqE2VbFWc)", "combo([012345678]xpub6ERApfZwUNrhLCkDtcHTcxd75RbzS1ed54G1LkBUHQVHQKqhMkhgbmJbZRkrgZw4koxb5JaHWkY4ALHY2grBGRjaDMzQLcgJvLJuZZvRcEL)", "Fingerprint is not 4 bytes (9 characters instead of 8 characters)"); // Too long key fingerprint
     CheckUnparsable("pkh(xprv9s21ZrQH143K31xYSDQpPDxsXRTUcvj2iNHm5NUtrGiGG5e2DtALGdso3pGz6ssrdK4PFmM8NSpSBHNqPqm55Qn3LqFtT2emdEXVYsCzC2U/2147483648)", "pkh(xpub661MyMwAqRbcFW31YEwpkMuc5THy2PSt5bDMsktWQcFF8syAmRUapSCGu8ED9W6oDMSgv6Zz8idoc4a6mr8BDzTJY47LJhkJ8UB7WEGuduB/2147483648)", "Key path value 2147483648 is out of range"); // BIP 32 path element overflow
     CheckUnparsable("pkh(xprv9s21ZrQH143K31xYSDQpPDxsXRTUcvj2iNHm5NUtrGiGG5e2DtALGdso3pGz6ssrdK4PFmM8NSpSBHNqPqm55Qn3LqFtT2emdEXVYsCzC2U/1aa)", "pkh(xpub661MyMwAqRbcFW31YEwpkMuc5THy2PSt5bDMsktWQcFF8syAmRUapSCGu8ED9W6oDMSgv6Zz8idoc4a6mr8BDzTJY47LJhkJ8UB7WEGuduB/1aa)", "Key path value '1aa' is not a valid uint32"); // Path is not valid uint
-    Check("pkh([01234567/10/20]xprv9s21ZrQH143K31xYSDQpPDxsXRTUcvj2iNHm5NUtrGiGG5e2DtALGdso3pGz6ssrdK4PFmM8NSpSBHNqPqm55Qn3LqFtT2emdEXVYsCzC2U/2147483647'/0)", "pkh([01234567/10/20]xpub661MyMwAqRbcFW31YEwpkMuc5THy2PSt5bDMsktWQcFF8syAmRUapSCGu8ED9W6oDMSgv6Zz8idoc4a6mr8BDzTJY47LJhkJ8UB7WEGuduB/2147483647'/0)", "pkh([01234567/10/20/2147483647']xprv9vHkqa6XAPwKqSKSEJMcAB3yoCZhaSVsGZbSkFY5L3Lfjjk8sjZucbsbvEw5o3QrSA69nPfZDCgFnNnLhQ2ohpZuwummndnPasDw2Qr6dC2/0)", "pkh([01234567/10/20/2147483647']xpub69H7F5dQzmVd3vPuLKtcXJziMEQByuDidnX3YdwgtNsecY5HRGtAAQC5mXTt4dsv9RzyjgDjAQs9VGVV6ydYCHnprc9vvaA5YtqWyL6hyds/0)", HARDENED, {{"76a914ebdc90806a9c4356c1c88e42216611e1cb4c1c1788ac"}}, OutputType::LEGACY, {{10, 20, 0xFFFFFFFFUL, 0}});
+    Check("pkh([01234567/10/20]xprv9s21ZrQH143K31xYSDQpPDxsXRTUcvj2iNHm5NUtrGiGG5e2DtALGdso3pGz6ssrdK4PFmM8NSpSBHNqPqm55Qn3LqFtT2emdEXVYsCzC2U/2147483647'/0)", "pkh([01234567/10/20]xpub661MyMwAqRbcFW31YEwpkMuc5THy2PSt5bDMsktWQcFF8syAmRUapSCGu8ED9W6oDMSgv6Zz8idoc4a6mr8BDzTJY47LJhkJ8UB7WEGuduB/2147483647'/0)", "pkh([01234567/10/20/2147483647']xpub69H7F5dQzmVd3vPuLKtcXJziMEQByuDidnX3YdwgtNsecY5HRGtAAQC5mXTt4dsv9RzyjgDjAQs9VGVV6ydYCHnprc9vvaA5YtqWyL6hyds/0)", HARDENED, {{"76a914ebdc90806a9c4356c1c88e42216611e1cb4c1c1788ac"}}, OutputType::LEGACY, {{10, 20, 0xFFFFFFFFUL, 0}});
     // Multisig constructions
-    Check("multi(1,XJvEUEcFWCHCyruc8ZX5exPZaGe4UR7gC5FHrhwPnQGDs1uWCsT2,7sH936MDoVPFVk2VoaCM5yW8P3BfPyffnZECyaHrZwfLgWpS13e)", "multi(1,03a34b99f22c790c4e36b2b3c2c35a36db06226e41c692fc82b8b56ac1c540c5bd,04a34b99f22c790c4e36b2b3c2c35a36db06226e41c692fc82b8b56ac1c540c5bd5b8dec5235a0fa8722476c7709c02559e3aa73aa03918ba2d492eea75abea235)", "multi(1,XJvEUEcFWCHCyruc8ZX5exPZaGe4UR7gC5FHrhwPnQGDs1uWCsT2,7sH936MDoVPFVk2VoaCM5yW8P3BfPyffnZECyaHrZwfLgWpS13e)", "multi(1,03a34b99f22c790c4e36b2b3c2c35a36db06226e41c692fc82b8b56ac1c540c5bd,04a34b99f22c790c4e36b2b3c2c35a36db06226e41c692fc82b8b56ac1c540c5bd5b8dec5235a0fa8722476c7709c02559e3aa73aa03918ba2d492eea75abea235)", SIGNABLE, {{"512103a34b99f22c790c4e36b2b3c2c35a36db06226e41c692fc82b8b56ac1c540c5bd4104a34b99f22c790c4e36b2b3c2c35a36db06226e41c692fc82b8b56ac1c540c5bd5b8dec5235a0fa8722476c7709c02559e3aa73aa03918ba2d492eea75abea23552ae"}}, std::nullopt);
-    Check("sortedmulti(1,XJvEUEcFWCHCyruc8ZX5exPZaGe4UR7gC5FHrhwPnQGDs1uWCsT2,7sH936MDoVPFVk2VoaCM5yW8P3BfPyffnZECyaHrZwfLgWpS13e)", "sortedmulti(1,03a34b99f22c790c4e36b2b3c2c35a36db06226e41c692fc82b8b56ac1c540c5bd,04a34b99f22c790c4e36b2b3c2c35a36db06226e41c692fc82b8b56ac1c540c5bd5b8dec5235a0fa8722476c7709c02559e3aa73aa03918ba2d492eea75abea235)", "sortedmulti(1,XJvEUEcFWCHCyruc8ZX5exPZaGe4UR7gC5FHrhwPnQGDs1uWCsT2,7sH936MDoVPFVk2VoaCM5yW8P3BfPyffnZECyaHrZwfLgWpS13e)", "sortedmulti(1,03a34b99f22c790c4e36b2b3c2c35a36db06226e41c692fc82b8b56ac1c540c5bd,04a34b99f22c790c4e36b2b3c2c35a36db06226e41c692fc82b8b56ac1c540c5bd5b8dec5235a0fa8722476c7709c02559e3aa73aa03918ba2d492eea75abea235)", SIGNABLE, {{"512103a34b99f22c790c4e36b2b3c2c35a36db06226e41c692fc82b8b56ac1c540c5bd4104a34b99f22c790c4e36b2b3c2c35a36db06226e41c692fc82b8b56ac1c540c5bd5b8dec5235a0fa8722476c7709c02559e3aa73aa03918ba2d492eea75abea23552ae"}}, std::nullopt);
-    Check("sortedmulti(1,7sH936MDoVPFVk2VoaCM5yW8P3BfPyffnZECyaHrZwfLgWpS13e,XJvEUEcFWCHCyruc8ZX5exPZaGe4UR7gC5FHrhwPnQGDs1uWCsT2)", "sortedmulti(1,04a34b99f22c790c4e36b2b3c2c35a36db06226e41c692fc82b8b56ac1c540c5bd5b8dec5235a0fa8722476c7709c02559e3aa73aa03918ba2d492eea75abea235,03a34b99f22c790c4e36b2b3c2c35a36db06226e41c692fc82b8b56ac1c540c5bd)", "sortedmulti(1,7sH936MDoVPFVk2VoaCM5yW8P3BfPyffnZECyaHrZwfLgWpS13e,XJvEUEcFWCHCyruc8ZX5exPZaGe4UR7gC5FHrhwPnQGDs1uWCsT2)", "sortedmulti(1,04a34b99f22c790c4e36b2b3c2c35a36db06226e41c692fc82b8b56ac1c540c5bd5b8dec5235a0fa8722476c7709c02559e3aa73aa03918ba2d492eea75abea235,03a34b99f22c790c4e36b2b3c2c35a36db06226e41c692fc82b8b56ac1c540c5bd)", SIGNABLE, {{"512103a34b99f22c790c4e36b2b3c2c35a36db06226e41c692fc82b8b56ac1c540c5bd4104a34b99f22c790c4e36b2b3c2c35a36db06226e41c692fc82b8b56ac1c540c5bd5b8dec5235a0fa8722476c7709c02559e3aa73aa03918ba2d492eea75abea23552ae"}}, std::nullopt);
-    Check("sh(multi(2,[00000000/111'/222]xprvA1RpRA33e1JQ7ifknakTFpgNXPmW2YvmhqLQYMmrj4xJXXWYpDPS3xz7iAxn8L39njGVyuoseXzU6rcxFLJ8HFsTjSyQbLYnMpCqE2VbFWc,xprv9uPDJpEQgRQfDcW7BkF7eTya6RPxXeJCqCJGHuCJ4GiRVLzkTXBAJMu2qaMWPrS7AANYqdq6vcBcBUdJCVVFceUvJFjaPdGZ2y9WACViL4L/0))", "sh(multi(2,[00000000/111'/222]xpub6ERApfZwUNrhLCkDtcHTcxd75RbzS1ed54G1LkBUHQVHQKqhMkhgbmJbZRkrgZw4koxb5JaHWkY4ALHY2grBGRjaDMzQLcgJvLJuZZvRcEL,xpub68NZiKmJWnxxS6aaHmn81bvJeTESw724CRDs6HbuccFQN9Ku14VQrADWgqbhhTHBaohPX4CjNLf9fq9MYo6oDaPPLPxSb7gwQN3ih19Zm4Y/0))", "sh(multi(2,[00000000/111'/222]xprvA1RpRA33e1JQ7ifknakTFpgNXPmW2YvmhqLQYMmrj4xJXXWYpDPS3xz7iAxn8L39njGVyuoseXzU6rcxFLJ8HFsTjSyQbLYnMpCqE2VbFWc,xprv9uPDJpEQgRQfDcW7BkF7eTya6RPxXeJCqCJGHuCJ4GiRVLzkTXBAJMu2qaMWPrS7AANYqdq6vcBcBUdJCVVFceUvJFjaPdGZ2y9WACViL4L/0))", "sh(multi(2,[00000000/111'/222]xpub6ERApfZwUNrhLCkDtcHTcxd75RbzS1ed54G1LkBUHQVHQKqhMkhgbmJbZRkrgZw4koxb5JaHWkY4ALHY2grBGRjaDMzQLcgJvLJuZZvRcEL,xpub68NZiKmJWnxxS6aaHmn81bvJeTESw724CRDs6HbuccFQN9Ku14VQrADWgqbhhTHBaohPX4CjNLf9fq9MYo6oDaPPLPxSb7gwQN3ih19Zm4Y/0))", DEFAULT, {{"a91445a9a622a8b0a1269944be477640eedc447bbd8487"}}, OutputType::LEGACY, {{0x8000006FUL,222},{0}});
-    Check("sortedmulti(2,xprvA1RpRA33e1JQ7ifknakTFpgNXPmW2YvmhqLQYMmrj4xJXXWYpDPS3xz7iAxn8L39njGVyuoseXzU6rcxFLJ8HFsTjSyQbLYnMpCqE2VbFWc/*,xprv9uPDJpEQgRQfDcW7BkF7eTya6RPxXeJCqCJGHuCJ4GiRVLzkTXBAJMu2qaMWPrS7AANYqdq6vcBcBUdJCVVFceUvJFjaPdGZ2y9WACViL4L/0/0/*)", "sortedmulti(2,xpub6ERApfZwUNrhLCkDtcHTcxd75RbzS1ed54G1LkBUHQVHQKqhMkhgbmJbZRkrgZw4koxb5JaHWkY4ALHY2grBGRjaDMzQLcgJvLJuZZvRcEL/*,xpub68NZiKmJWnxxS6aaHmn81bvJeTESw724CRDs6HbuccFQN9Ku14VQrADWgqbhhTHBaohPX4CjNLf9fq9MYo6oDaPPLPxSb7gwQN3ih19Zm4Y/0/0/*)", "sortedmulti(2,xprvA1RpRA33e1JQ7ifknakTFpgNXPmW2YvmhqLQYMmrj4xJXXWYpDPS3xz7iAxn8L39njGVyuoseXzU6rcxFLJ8HFsTjSyQbLYnMpCqE2VbFWc/*,xprv9uPDJpEQgRQfDcW7BkF7eTya6RPxXeJCqCJGHuCJ4GiRVLzkTXBAJMu2qaMWPrS7AANYqdq6vcBcBUdJCVVFceUvJFjaPdGZ2y9WACViL4L/0/0/*)", "sortedmulti(2,xpub6ERApfZwUNrhLCkDtcHTcxd75RbzS1ed54G1LkBUHQVHQKqhMkhgbmJbZRkrgZw4koxb5JaHWkY4ALHY2grBGRjaDMzQLcgJvLJuZZvRcEL/*,xpub68NZiKmJWnxxS6aaHmn81bvJeTESw724CRDs6HbuccFQN9Ku14VQrADWgqbhhTHBaohPX4CjNLf9fq9MYo6oDaPPLPxSb7gwQN3ih19Zm4Y/0/0/*)", RANGE, {{"5221025d5fc65ebb8d44a5274b53bac21ff8307fec2334a32df05553459f8b1f7fe1b62102fbd47cc8034098f0e6a94c6aeee8528abf0a2153a5d8e46d325b7284c046784652ae"}, {"52210264fd4d1f5dea8ded94c61e9641309349b62f27fbffe807291f664e286bfbe6472103f4ece6dfccfa37b211eb3d0af4d0c61dba9ef698622dc17eecdf764beeb005a652ae"}, {"5221022ccabda84c30bad578b13c89eb3b9544ce149787e5b538175b1d1ba259cbb83321024d902e1a2fc7a8755ab5b694c575fce742c48d9ff192e63df5193e4c7afe1f9c52ae"}}, std::nullopt, {{0}, {1}, {2}, {0, 0, 0}, {0, 0, 1}, {0, 0, 2}});
+    Check("multi(1,XJvEUEcFWCHCyruc8ZX5exPZaGe4UR7gC5FHrhwPnQGDs1uWCsT2,7sH936MDoVPFVk2VoaCM5yW8P3BfPyffnZECyaHrZwfLgWpS13e)", "multi(1,03a34b99f22c790c4e36b2b3c2c35a36db06226e41c692fc82b8b56ac1c540c5bd,04a34b99f22c790c4e36b2b3c2c35a36db06226e41c692fc82b8b56ac1c540c5bd5b8dec5235a0fa8722476c7709c02559e3aa73aa03918ba2d492eea75abea235)", "multi(1,03a34b99f22c790c4e36b2b3c2c35a36db06226e41c692fc82b8b56ac1c540c5bd,04a34b99f22c790c4e36b2b3c2c35a36db06226e41c692fc82b8b56ac1c540c5bd5b8dec5235a0fa8722476c7709c02559e3aa73aa03918ba2d492eea75abea235)", SIGNABLE, {{"512103a34b99f22c790c4e36b2b3c2c35a36db06226e41c692fc82b8b56ac1c540c5bd4104a34b99f22c790c4e36b2b3c2c35a36db06226e41c692fc82b8b56ac1c540c5bd5b8dec5235a0fa8722476c7709c02559e3aa73aa03918ba2d492eea75abea23552ae"}}, std::nullopt);
+    Check("sortedmulti(1,XJvEUEcFWCHCyruc8ZX5exPZaGe4UR7gC5FHrhwPnQGDs1uWCsT2,7sH936MDoVPFVk2VoaCM5yW8P3BfPyffnZECyaHrZwfLgWpS13e)", "sortedmulti(1,03a34b99f22c790c4e36b2b3c2c35a36db06226e41c692fc82b8b56ac1c540c5bd,04a34b99f22c790c4e36b2b3c2c35a36db06226e41c692fc82b8b56ac1c540c5bd5b8dec5235a0fa8722476c7709c02559e3aa73aa03918ba2d492eea75abea235)", "sortedmulti(1,03a34b99f22c790c4e36b2b3c2c35a36db06226e41c692fc82b8b56ac1c540c5bd,04a34b99f22c790c4e36b2b3c2c35a36db06226e41c692fc82b8b56ac1c540c5bd5b8dec5235a0fa8722476c7709c02559e3aa73aa03918ba2d492eea75abea235)", SIGNABLE, {{"512103a34b99f22c790c4e36b2b3c2c35a36db06226e41c692fc82b8b56ac1c540c5bd4104a34b99f22c790c4e36b2b3c2c35a36db06226e41c692fc82b8b56ac1c540c5bd5b8dec5235a0fa8722476c7709c02559e3aa73aa03918ba2d492eea75abea23552ae"}}, std::nullopt);
+    Check("sortedmulti(1,7sH936MDoVPFVk2VoaCM5yW8P3BfPyffnZECyaHrZwfLgWpS13e,XJvEUEcFWCHCyruc8ZX5exPZaGe4UR7gC5FHrhwPnQGDs1uWCsT2)", "sortedmulti(1,04a34b99f22c790c4e36b2b3c2c35a36db06226e41c692fc82b8b56ac1c540c5bd5b8dec5235a0fa8722476c7709c02559e3aa73aa03918ba2d492eea75abea235,03a34b99f22c790c4e36b2b3c2c35a36db06226e41c692fc82b8b56ac1c540c5bd)", "sortedmulti(1,04a34b99f22c790c4e36b2b3c2c35a36db06226e41c692fc82b8b56ac1c540c5bd5b8dec5235a0fa8722476c7709c02559e3aa73aa03918ba2d492eea75abea235,03a34b99f22c790c4e36b2b3c2c35a36db06226e41c692fc82b8b56ac1c540c5bd)", SIGNABLE, {{"512103a34b99f22c790c4e36b2b3c2c35a36db06226e41c692fc82b8b56ac1c540c5bd4104a34b99f22c790c4e36b2b3c2c35a36db06226e41c692fc82b8b56ac1c540c5bd5b8dec5235a0fa8722476c7709c02559e3aa73aa03918ba2d492eea75abea23552ae"}}, std::nullopt);
+    Check("sh(multi(2,[00000000/111'/222]xprvA1RpRA33e1JQ7ifknakTFpgNXPmW2YvmhqLQYMmrj4xJXXWYpDPS3xz7iAxn8L39njGVyuoseXzU6rcxFLJ8HFsTjSyQbLYnMpCqE2VbFWc,xprv9uPDJpEQgRQfDcW7BkF7eTya6RPxXeJCqCJGHuCJ4GiRVLzkTXBAJMu2qaMWPrS7AANYqdq6vcBcBUdJCVVFceUvJFjaPdGZ2y9WACViL4L/0))", "sh(multi(2,[00000000/111'/222]xpub6ERApfZwUNrhLCkDtcHTcxd75RbzS1ed54G1LkBUHQVHQKqhMkhgbmJbZRkrgZw4koxb5JaHWkY4ALHY2grBGRjaDMzQLcgJvLJuZZvRcEL,xpub68NZiKmJWnxxS6aaHmn81bvJeTESw724CRDs6HbuccFQN9Ku14VQrADWgqbhhTHBaohPX4CjNLf9fq9MYo6oDaPPLPxSb7gwQN3ih19Zm4Y/0))", "sh(multi(2,[00000000/111'/222]xpub6ERApfZwUNrhLCkDtcHTcxd75RbzS1ed54G1LkBUHQVHQKqhMkhgbmJbZRkrgZw4koxb5JaHWkY4ALHY2grBGRjaDMzQLcgJvLJuZZvRcEL,xpub68NZiKmJWnxxS6aaHmn81bvJeTESw724CRDs6HbuccFQN9Ku14VQrADWgqbhhTHBaohPX4CjNLf9fq9MYo6oDaPPLPxSb7gwQN3ih19Zm4Y/0))", DEFAULT, {{"a91445a9a622a8b0a1269944be477640eedc447bbd8487"}}, OutputType::LEGACY, {{0x8000006FUL,222},{0}});
+    Check("sortedmulti(2,xprvA1RpRA33e1JQ7ifknakTFpgNXPmW2YvmhqLQYMmrj4xJXXWYpDPS3xz7iAxn8L39njGVyuoseXzU6rcxFLJ8HFsTjSyQbLYnMpCqE2VbFWc/*,xprv9uPDJpEQgRQfDcW7BkF7eTya6RPxXeJCqCJGHuCJ4GiRVLzkTXBAJMu2qaMWPrS7AANYqdq6vcBcBUdJCVVFceUvJFjaPdGZ2y9WACViL4L/0/0/*)", "sortedmulti(2,xpub6ERApfZwUNrhLCkDtcHTcxd75RbzS1ed54G1LkBUHQVHQKqhMkhgbmJbZRkrgZw4koxb5JaHWkY4ALHY2grBGRjaDMzQLcgJvLJuZZvRcEL/*,xpub68NZiKmJWnxxS6aaHmn81bvJeTESw724CRDs6HbuccFQN9Ku14VQrADWgqbhhTHBaohPX4CjNLf9fq9MYo6oDaPPLPxSb7gwQN3ih19Zm4Y/0/0/*)", "sortedmulti(2,xpub6ERApfZwUNrhLCkDtcHTcxd75RbzS1ed54G1LkBUHQVHQKqhMkhgbmJbZRkrgZw4koxb5JaHWkY4ALHY2grBGRjaDMzQLcgJvLJuZZvRcEL/*,xpub68NZiKmJWnxxS6aaHmn81bvJeTESw724CRDs6HbuccFQN9Ku14VQrADWgqbhhTHBaohPX4CjNLf9fq9MYo6oDaPPLPxSb7gwQN3ih19Zm4Y/0/0/*)", RANGE, {{"5221025d5fc65ebb8d44a5274b53bac21ff8307fec2334a32df05553459f8b1f7fe1b62102fbd47cc8034098f0e6a94c6aeee8528abf0a2153a5d8e46d325b7284c046784652ae"}, {"52210264fd4d1f5dea8ded94c61e9641309349b62f27fbffe807291f664e286bfbe6472103f4ece6dfccfa37b211eb3d0af4d0c61dba9ef698622dc17eecdf764beeb005a652ae"}, {"5221022ccabda84c30bad578b13c89eb3b9544ce149787e5b538175b1d1ba259cbb83321024d902e1a2fc7a8755ab5b694c575fce742c48d9ff192e63df5193e4c7afe1f9c52ae"}}, std::nullopt, {{0}, {1}, {2}, {0, 0, 0}, {0, 0, 1}, {0, 0, 2}});
     CheckUnparsable("sh(multi(16,KzoAz5CanayRKex3fSLQ2BwJpN7U52gZvxMyk78nDMHuqrUxuSJy,KwGNz6YCCQtYvFzMtrC6D3tKTKdBBboMrLTsjr2NYVBwapCkn7Mr,KxogYhiNfwxuswvXV66eFyKcCpm7dZ7TqHVqujHAVUjJxyivxQ9X,L2BUNduTSyZwZjwNHynQTF14mv2uz2NRq5n5sYWTb4FkkmqgEE9f,L1okJGHGn1kFjdXHKxXjwVVtmCMR2JA5QsbKCSpSb7ReQjezKeoD,KxDCNSST75HFPaW5QKpzHtAyaCQC7p9Vo3FYfi2u4dXD1vgMiboK,L5edQjFtnkcf5UWURn6UuuoFrabgDQUHdheKCziwN42aLwS3KizU,KzF8UWFcEC7BYTq8Go1xVimMkDmyNYVmXV5PV7RuDicvAocoPB8i,L3nHUboKG2w4VSJ5jYZ5CBM97oeK6YuKvfZxrefdShECcjEYKMWZ,KyjHo36dWkYhimKmVVmQTq3gERv3pnqA4xFCpvUgbGDJad7eS8WE,KwsfyHKRUTZPQtysN7M3tZ4GXTnuov5XRgjdF2XCG8faAPmFruRF,KzCUbGhN9LJhdeFfL9zQgTJMjqxdBKEekRGZX24hXdgCNCijkkap,KzgpMBwwsDLwkaC5UrmBgCYaBD2WgZ7PBoGYXR8KT7gCA9UTN5a3,KyBXTPy4T7YG4q9tcAM3LkvfRpD1ybHMvcJ2ehaWXaSqeGUxEdkP,KzJDe9iwJRPtKP2F2AoN6zBgzS7uiuAwhWCfGdNeYJ3PC1HNJ8M8,L1xbHrxynrqLKkoYc4qtoQPx6uy5qYXR5ZDYVYBSRmCV5piU3JG9))","sh(multi(16,03669b8afcec803a0d323e9a17f3ea8e68e8abe5a278020a929adbec52421adbd0,0260b2003c386519fc9eadf2b5cf124dd8eea4c4e68d5e154050a9346ea98ce600,0362a74e399c39ed5593852a30147f2959b56bb827dfa3e60e464b02ccf87dc5e8,0261345b53de74a4d721ef877c255429961b7e43714171ac06168d7e08c542a8b8,02da72e8b46901a65d4374fe6315538d8f368557dda3a1dcf9ea903f3afe7314c8,0318c82dd0b53fd3a932d16e0ba9e278fcc937c582d5781be626ff16e201f72286,0297ccef1ef99f9d73dec9ad37476ddb232f1238aff877af19e72ba04493361009,02e502cfd5c3f972fe9a3e2a18827820638f96b6f347e54d63deb839011fd5765d,03e687710f0e3ebe81c1037074da939d409c0025f17eb86adb9427d28f0f7ae0e9,02c04d3a5274952acdbc76987f3184b346a483d43be40874624b29e3692c1df5af,02ed06e0f418b5b43a7ec01d1d7d27290fa15f75771cb69b642a51471c29c84acd,036d46073cbb9ffee90473f3da429abc8de7f8751199da44485682a989a4bebb24,02f5d1ff7c9029a80a4e36b9a5497027ef7f3e73384a4a94fbfe7c4e9164eec8bc,02e41deffd1b7cce11cde209a781adcffdabd1b91c0ba0375857a2bfd9302419f3,02d76625f7956a7fc505ab02556c23ee72d832f1bac391bcd2d3abce5710a13d06,0399eb0a5487515802dc14544cf10b3666623762fbed2ec38a3975716e2c29c232))", "P2SH script is too large, 547 bytes is larger than 520 bytes"); // P2SH does not fit 16 compressed pubkeys in a redeemscript
     CheckUnparsable("multi(a,L4rK1yDtCWekvXuE6oXD9jCYfFNV2cWRpVuPLBcCU2z8TrisoyY1,5KYZdUEo39z3FPrtuX2QbbwGnNP5zTd7yyr2SC1j299sBCnWjss)", "multi(a,03a34b99f22c790c4e36b2b3c2c35a36db06226e41c692fc82b8b56ac1c540c5bd,04a34b99f22c790c4e36b2b3c2c35a36db06226e41c692fc82b8b56ac1c540c5bd5b8dec5235a0fa8722476c7709c02559e3aa73aa03918ba2d492eea75abea235)", "Multi threshold 'a' is not valid"); // Invalid threshold
     CheckUnparsable("multi(0,L4rK1yDtCWekvXuE6oXD9jCYfFNV2cWRpVuPLBcCU2z8TrisoyY1,5KYZdUEo39z3FPrtuX2QbbwGnNP5zTd7yyr2SC1j299sBCnWjss)", "multi(0,03a34b99f22c790c4e36b2b3c2c35a36db06226e41c692fc82b8b56ac1c540c5bd,04a34b99f22c790c4e36b2b3c2c35a36db06226e41c692fc82b8b56ac1c540c5bd5b8dec5235a0fa8722476c7709c02559e3aa73aa03918ba2d492eea75abea235)", "Multisig threshold cannot be 0, must be at least 1"); // Threshold of 0
@@ -342,8 +342,8 @@ BOOST_AUTO_TEST_CASE(descriptor_test)
     CheckUnparsable("sh(sh(pk(XJvEUEcFWCHCyruc8ZX5exPZaGe4UR7gC5FHrhwPnQGDs1uWCsT2)))", "sh(sh(pk(03a34b99f22c790c4e36b2b3c2c35a36db06226e41c692fc82b8b56ac1c540c5bd)))", "Can only have sh() at top level"); // Cannot embed P2SH inside P2SH
     CheckUnparsable("sh(combo(XJvEUEcFWCHCyruc8ZX5exPZaGe4UR7gC5FHrhwPnQGDs1uWCsT2))", "sh(combo(03a34b99f22c790c4e36b2b3c2c35a36db06226e41c692fc82b8b56ac1c540c5bd))", "Can only have combo() at top level"); // Old must be top level
     // Checksums
-    Check("sh(multi(2,[00000000/111'/222]xprvA1RpRA33e1JQ7ifknakTFpgNXPmW2YvmhqLQYMmrj4xJXXWYpDPS3xz7iAxn8L39njGVyuoseXzU6rcxFLJ8HFsTjSyQbLYnMpCqE2VbFWc,xprv9uPDJpEQgRQfDcW7BkF7eTya6RPxXeJCqCJGHuCJ4GiRVLzkTXBAJMu2qaMWPrS7AANYqdq6vcBcBUdJCVVFceUvJFjaPdGZ2y9WACViL4L/0))#ggrsrxfy", "sh(multi(2,[00000000/111'/222]xpub6ERApfZwUNrhLCkDtcHTcxd75RbzS1ed54G1LkBUHQVHQKqhMkhgbmJbZRkrgZw4koxb5JaHWkY4ALHY2grBGRjaDMzQLcgJvLJuZZvRcEL,xpub68NZiKmJWnxxS6aaHmn81bvJeTESw724CRDs6HbuccFQN9Ku14VQrADWgqbhhTHBaohPX4CjNLf9fq9MYo6oDaPPLPxSb7gwQN3ih19Zm4Y/0))#tjg09x5t", "sh(multi(2,[00000000/111'/222]xprvA1RpRA33e1JQ7ifknakTFpgNXPmW2YvmhqLQYMmrj4xJXXWYpDPS3xz7iAxn8L39njGVyuoseXzU6rcxFLJ8HFsTjSyQbLYnMpCqE2VbFWc,xprv9uPDJpEQgRQfDcW7BkF7eTya6RPxXeJCqCJGHuCJ4GiRVLzkTXBAJMu2qaMWPrS7AANYqdq6vcBcBUdJCVVFceUvJFjaPdGZ2y9WACViL4L/0))#ggrsrxfy", "sh(multi(2,[00000000/111'/222]xpub6ERApfZwUNrhLCkDtcHTcxd75RbzS1ed54G1LkBUHQVHQKqhMkhgbmJbZRkrgZw4koxb5JaHWkY4ALHY2grBGRjaDMzQLcgJvLJuZZvRcEL,xpub68NZiKmJWnxxS6aaHmn81bvJeTESw724CRDs6HbuccFQN9Ku14VQrADWgqbhhTHBaohPX4CjNLf9fq9MYo6oDaPPLPxSb7gwQN3ih19Zm4Y/0))#tjg09x5t", DEFAULT, {{"a91445a9a622a8b0a1269944be477640eedc447bbd8487"}}, OutputType::LEGACY, {{0x8000006FUL,222},{0}});
-    Check("sh(multi(2,[00000000/111'/222]xprvA1RpRA33e1JQ7ifknakTFpgNXPmW2YvmhqLQYMmrj4xJXXWYpDPS3xz7iAxn8L39njGVyuoseXzU6rcxFLJ8HFsTjSyQbLYnMpCqE2VbFWc,xprv9uPDJpEQgRQfDcW7BkF7eTya6RPxXeJCqCJGHuCJ4GiRVLzkTXBAJMu2qaMWPrS7AANYqdq6vcBcBUdJCVVFceUvJFjaPdGZ2y9WACViL4L/0))", "sh(multi(2,[00000000/111'/222]xpub6ERApfZwUNrhLCkDtcHTcxd75RbzS1ed54G1LkBUHQVHQKqhMkhgbmJbZRkrgZw4koxb5JaHWkY4ALHY2grBGRjaDMzQLcgJvLJuZZvRcEL,xpub68NZiKmJWnxxS6aaHmn81bvJeTESw724CRDs6HbuccFQN9Ku14VQrADWgqbhhTHBaohPX4CjNLf9fq9MYo6oDaPPLPxSb7gwQN3ih19Zm4Y/0))", "sh(multi(2,[00000000/111'/222]xprvA1RpRA33e1JQ7ifknakTFpgNXPmW2YvmhqLQYMmrj4xJXXWYpDPS3xz7iAxn8L39njGVyuoseXzU6rcxFLJ8HFsTjSyQbLYnMpCqE2VbFWc,xprv9uPDJpEQgRQfDcW7BkF7eTya6RPxXeJCqCJGHuCJ4GiRVLzkTXBAJMu2qaMWPrS7AANYqdq6vcBcBUdJCVVFceUvJFjaPdGZ2y9WACViL4L/0))", "sh(multi(2,[00000000/111'/222]xpub6ERApfZwUNrhLCkDtcHTcxd75RbzS1ed54G1LkBUHQVHQKqhMkhgbmJbZRkrgZw4koxb5JaHWkY4ALHY2grBGRjaDMzQLcgJvLJuZZvRcEL,xpub68NZiKmJWnxxS6aaHmn81bvJeTESw724CRDs6HbuccFQN9Ku14VQrADWgqbhhTHBaohPX4CjNLf9fq9MYo6oDaPPLPxSb7gwQN3ih19Zm4Y/0))", DEFAULT, {{"a91445a9a622a8b0a1269944be477640eedc447bbd8487"}}, OutputType::LEGACY, {{0x8000006FUL,222},{0}});
+    Check("sh(multi(2,[00000000/111'/222]xprvA1RpRA33e1JQ7ifknakTFpgNXPmW2YvmhqLQYMmrj4xJXXWYpDPS3xz7iAxn8L39njGVyuoseXzU6rcxFLJ8HFsTjSyQbLYnMpCqE2VbFWc,xprv9uPDJpEQgRQfDcW7BkF7eTya6RPxXeJCqCJGHuCJ4GiRVLzkTXBAJMu2qaMWPrS7AANYqdq6vcBcBUdJCVVFceUvJFjaPdGZ2y9WACViL4L/0))#ggrsrxfy", "sh(multi(2,[00000000/111'/222]xpub6ERApfZwUNrhLCkDtcHTcxd75RbzS1ed54G1LkBUHQVHQKqhMkhgbmJbZRkrgZw4koxb5JaHWkY4ALHY2grBGRjaDMzQLcgJvLJuZZvRcEL,xpub68NZiKmJWnxxS6aaHmn81bvJeTESw724CRDs6HbuccFQN9Ku14VQrADWgqbhhTHBaohPX4CjNLf9fq9MYo6oDaPPLPxSb7gwQN3ih19Zm4Y/0))#tjg09x5t", "sh(multi(2,[00000000/111'/222]xpub6ERApfZwUNrhLCkDtcHTcxd75RbzS1ed54G1LkBUHQVHQKqhMkhgbmJbZRkrgZw4koxb5JaHWkY4ALHY2grBGRjaDMzQLcgJvLJuZZvRcEL,xpub68NZiKmJWnxxS6aaHmn81bvJeTESw724CRDs6HbuccFQN9Ku14VQrADWgqbhhTHBaohPX4CjNLf9fq9MYo6oDaPPLPxSb7gwQN3ih19Zm4Y/0))#tjg09x5t", DEFAULT, {{"a91445a9a622a8b0a1269944be477640eedc447bbd8487"}}, OutputType::LEGACY, {{0x8000006FUL,222},{0}});
+    Check("sh(multi(2,[00000000/111'/222]xprvA1RpRA33e1JQ7ifknakTFpgNXPmW2YvmhqLQYMmrj4xJXXWYpDPS3xz7iAxn8L39njGVyuoseXzU6rcxFLJ8HFsTjSyQbLYnMpCqE2VbFWc,xprv9uPDJpEQgRQfDcW7BkF7eTya6RPxXeJCqCJGHuCJ4GiRVLzkTXBAJMu2qaMWPrS7AANYqdq6vcBcBUdJCVVFceUvJFjaPdGZ2y9WACViL4L/0))", "sh(multi(2,[00000000/111'/222]xpub6ERApfZwUNrhLCkDtcHTcxd75RbzS1ed54G1LkBUHQVHQKqhMkhgbmJbZRkrgZw4koxb5JaHWkY4ALHY2grBGRjaDMzQLcgJvLJuZZvRcEL,xpub68NZiKmJWnxxS6aaHmn81bvJeTESw724CRDs6HbuccFQN9Ku14VQrADWgqbhhTHBaohPX4CjNLf9fq9MYo6oDaPPLPxSb7gwQN3ih19Zm4Y/0))", "sh(multi(2,[00000000/111'/222]xpub6ERApfZwUNrhLCkDtcHTcxd75RbzS1ed54G1LkBUHQVHQKqhMkhgbmJbZRkrgZw4koxb5JaHWkY4ALHY2grBGRjaDMzQLcgJvLJuZZvRcEL,xpub68NZiKmJWnxxS6aaHmn81bvJeTESw724CRDs6HbuccFQN9Ku14VQrADWgqbhhTHBaohPX4CjNLf9fq9MYo6oDaPPLPxSb7gwQN3ih19Zm4Y/0))", DEFAULT, {{"a91445a9a622a8b0a1269944be477640eedc447bbd8487"}}, OutputType::LEGACY, {{0x8000006FUL,222},{0}});
     CheckUnparsable("sh(multi(2,[00000000/111'/222]xprvA1RpRA33e1JQ7ifknakTFpgNXPmW2YvmhqLQYMmrj4xJXXWYpDPS3xz7iAxn8L39njGVyuoseXzU6rcxFLJ8HFsTjSyQbLYnMpCqE2VbFWc,xprv9uPDJpEQgRQfDcW7BkF7eTya6RPxXeJCqCJGHuCJ4GiRVLzkTXBAJMu2qaMWPrS7AANYqdq6vcBcBUdJCVVFceUvJFjaPdGZ2y9WACViL4L/0))#", "sh(multi(2,[00000000/111'/222]xpub6ERApfZwUNrhLCkDtcHTcxd75RbzS1ed54G1LkBUHQVHQKqhMkhgbmJbZRkrgZw4koxb5JaHWkY4ALHY2grBGRjaDMzQLcgJvLJuZZvRcEL,xpub68NZiKmJWnxxS6aaHmn81bvJeTESw724CRDs6HbuccFQN9Ku14VQrADWgqbhhTHBaohPX4CjNLf9fq9MYo6oDaPPLPxSb7gwQN3ih19Zm4Y/0))#", "Expected 8 character checksum, not 0 characters"); // Empty checksum
     CheckUnparsable("sh(multi(2,[00000000/111'/222]xprvA1RpRA33e1JQ7ifknakTFpgNXPmW2YvmhqLQYMmrj4xJXXWYpDPS3xz7iAxn8L39njGVyuoseXzU6rcxFLJ8HFsTjSyQbLYnMpCqE2VbFWc,xprv9uPDJpEQgRQfDcW7BkF7eTya6RPxXeJCqCJGHuCJ4GiRVLzkTXBAJMu2qaMWPrS7AANYqdq6vcBcBUdJCVVFceUvJFjaPdGZ2y9WACViL4L/0))#ggrsrxfyq", "sh(multi(2,[00000000/111'/222]xpub6ERApfZwUNrhLCkDtcHTcxd75RbzS1ed54G1LkBUHQVHQKqhMkhgbmJbZRkrgZw4koxb5JaHWkY4ALHY2grBGRjaDMzQLcgJvLJuZZvRcEL,xpub68NZiKmJWnxxS6aaHmn81bvJeTESw724CRDs6HbuccFQN9Ku14VQrADWgqbhhTHBaohPX4CjNLf9fq9MYo6oDaPPLPxSb7gwQN3ih19Zm4Y/0))#tjg09x5tq", "Expected 8 character checksum, not 9 characters"); // Too long checksum
     CheckUnparsable("sh(multi(2,[00000000/111'/222]xprvA1RpRA33e1JQ7ifknakTFpgNXPmW2YvmhqLQYMmrj4xJXXWYpDPS3xz7iAxn8L39njGVyuoseXzU6rcxFLJ8HFsTjSyQbLYnMpCqE2VbFWc,xprv9uPDJpEQgRQfDcW7BkF7eTya6RPxXeJCqCJGHuCJ4GiRVLzkTXBAJMu2qaMWPrS7AANYqdq6vcBcBUdJCVVFceUvJFjaPdGZ2y9WACViL4L/0))#ggrsrxf", "sh(multi(2,[00000000/111'/222]xpub6ERApfZwUNrhLCkDtcHTcxd75RbzS1ed54G1LkBUHQVHQKqhMkhgbmJbZRkrgZw4koxb5JaHWkY4ALHY2grBGRjaDMzQLcgJvLJuZZvRcEL,xpub68NZiKmJWnxxS6aaHmn81bvJeTESw724CRDs6HbuccFQN9Ku14VQrADWgqbhhTHBaohPX4CjNLf9fq9MYo6oDaPPLPxSb7gwQN3ih19Zm4Y/0))#tjg09x5", "Expected 8 character checksum, not 7 characters"); // Too short checksum

From adeebb08597421381d4f67ce7c6b3184fc93fc90 Mon Sep 17 00:00:00 2001
From: Kittywhiskers Van Gogh <63189531+kwvg@users.noreply.github.com>
Date: Wed, 12 Jan 2022 22:02:21 +0000
Subject: [PATCH 348/656] merge bitcoin#24051: bitcoin-{cli,tx,util} don't need
 UPnP, NAT-PMP, or ZMQ

---
 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/configure.ac b/configure.ac
index 8497088f01bc..1a3d2066dd4f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1503,7 +1503,7 @@ if test "$use_usdt" != "no"; then
 fi
 AM_CONDITIONAL([ENABLE_USDT_TRACEPOINTS], [test "$use_usdt" = "yes"])
 
-if test "$build_bitcoin_cli$build_bitcoin_tx$build_bitcoin_util$build_bitcoind$bitcoin_enable_qt$use_bench$use_tests" = "nonononononono"; then
+if test "$build_bitcoind$bitcoin_enable_qt$use_bench$use_tests" = "nononono"; then
   use_upnp=no
   use_natpmp=no
   use_zmq=no

From 3a5853347f233e704a294b18e2f7cdc03f509145 Mon Sep 17 00:00:00 2001
From: Kittywhiskers Van Gogh <63189531+kwvg@users.noreply.github.com>
Date: Fri, 17 Oct 2025 22:05:49 +0530
Subject: [PATCH 349/656] merge bitcoin#25315: Add warning on first startup if
 free disk space is less than necessary

---
 src/init.cpp                           | 20 ++++++++++++++++++--
 test/functional/p2p_dos_header_tree.py |  6 +++++-
 test/functional/wallet_crosschain.py   |  8 ++++++--
 3 files changed, 29 insertions(+), 5 deletions(-)

diff --git a/src/init.cpp b/src/init.cpp
index 24a1062974ba..466101abac17 100644
--- a/src/init.cpp
+++ b/src/init.cpp
@@ -2303,6 +2303,24 @@ bool AppInitMain(NodeContext& node, interfaces::BlockAndHeaderTipInfo* tip_info)
         return false;
     }
 
+    int chain_active_height = WITH_LOCK(cs_main, return chainman.ActiveChain().Height());
+
+    // On first startup, warn on low block storage space
+    if (!fReindex && !fReindexChainState && chain_active_height <= 1) {
+        uint64_t additional_bytes_needed = fPruneMode ? nPruneTarget
+            : chainparams.AssumedBlockchainSize() * 1024 * 1024 * 1024;
+
+        if (!CheckDiskSpace(args.GetBlocksDirPath(), additional_bytes_needed)) {
+            InitWarning(strprintf(_(
+                    "Disk space for %s may not accommodate the block files. " \
+                    "Approximately %u GB of data will be stored in this directory."
+                ),
+                fs::quoted(fs::PathToString(args.GetBlocksDirPath())),
+                chainparams.AssumedBlockchainSize()
+            ));
+        }
+    }
+
     // Either install a handler to notify us when genesis activates, or set fHaveGenesis directly.
     // No locking, as this happens before any background thread is started.
     boost::signals2::connection block_notify_genesis_wait_connection;
@@ -2393,8 +2411,6 @@ bool AppInitMain(NodeContext& node, interfaces::BlockAndHeaderTipInfo* tip_info)
 
     // ********************************************************* Step 12: start node
 
-    int chain_active_height;
-
     //// debug print
     {
         LOCK(cs_main);
diff --git a/test/functional/p2p_dos_header_tree.py b/test/functional/p2p_dos_header_tree.py
index 9574f7dc8bf2..f3e855b24531 100755
--- a/test/functional/p2p_dos_header_tree.py
+++ b/test/functional/p2p_dos_header_tree.py
@@ -6,6 +6,7 @@
 
 from test_framework.blocktools import filter_tip_keys
 
+from test_framework.governance import EXPECTED_STDERR_NO_GOV_PRUNE
 from test_framework.messages import (
     CBlockHeader,
     from_hex,
@@ -23,6 +24,7 @@ def set_test_params(self):
         self.setup_clean_chain = True
         self.chain = 'testnet3'  # Use testnet chain because it has an early checkpoint
         self.num_nodes = 2
+        self.extra_args = [['-prune=945']] * self.num_nodes
 
     def add_options(self, parser):
         parser.add_argument(
@@ -64,7 +66,7 @@ def run_test(self):
 
         self.log.info("Feed all fork headers (succeeds without checkpoint)")
         # On node 0 it succeeds because checkpoints are disabled
-        self.restart_node(0, extra_args=['-nocheckpoints'])
+        self.restart_node(0, extra_args=['-nocheckpoints', '-prune=945'], expected_stderr=EXPECTED_STDERR_NO_GOV_PRUNE)
         peer_no_checkpoint = self.nodes[0].add_p2p_connection(P2PInterface())
         peer_no_checkpoint.send_and_ping(msg_headers(self.headers_fork))
         assert {
@@ -84,6 +86,8 @@ def run_test(self):
             "status": "headers-only",
         } in filter_tip_keys(self.nodes[0].getchaintips())
 
+        for idx in range(self.num_nodes):
+            self.nodes[idx].stop_node(expected_stderr=EXPECTED_STDERR_NO_GOV_PRUNE)
 
 if __name__ == '__main__':
     RejectLowDifficultyHeadersTest().main()
diff --git a/test/functional/wallet_crosschain.py b/test/functional/wallet_crosschain.py
index 7f0968d65824..f25b3ef88a60 100755
--- a/test/functional/wallet_crosschain.py
+++ b/test/functional/wallet_crosschain.py
@@ -5,6 +5,7 @@
 
 import os
 
+from test_framework.governance import EXPECTED_STDERR_NO_GOV_PRUNE
 from test_framework.test_framework import BitcoinTestFramework
 from test_framework.util import assert_raises_rpc_error
 
@@ -21,7 +22,7 @@ def setup_network(self):
 
         # Switch node 1 to testnet before starting it.
         self.nodes[1].chain = 'testnet3'
-        self.nodes[1].extra_args = ['-maxconnections=0'] # disable testnet sync
+        self.nodes[1].extra_args = ['-maxconnections=0', '-prune=945'] # disable testnet sync
         with open(self.nodes[1].bitcoinconf, 'r', encoding='utf8') as conf:
             conf_data = conf.read()
         with open (self.nodes[1].bitcoinconf, 'w', encoding='utf8') as conf:
@@ -58,11 +59,14 @@ def run_test(self):
 
         if not self.options.descriptors:
             self.log.info("Override cross-chain wallet load protection")
+            self.nodes[1].stop_node(expected_stderr=EXPECTED_STDERR_NO_GOV_PRUNE)
             self.stop_nodes()
-            self.start_nodes([['-walletcrosschain']] * self.num_nodes)
+            self.start_nodes([['-walletcrosschain', '-prune=945']] * self.num_nodes)
             self.nodes[0].loadwallet(node1_wallet)
             self.nodes[1].loadwallet(node0_wallet)
 
+        for idx in range(self.num_nodes):
+            self.nodes[idx].stop_node(expected_stderr=EXPECTED_STDERR_NO_GOV_PRUNE if not self.options.descriptors or (self.options.descriptors and idx == 1) else "")
 
 if __name__ == '__main__':
     WalletCrossChain().main()

From 2b3f9251e28defe7a81e6b0dc163871871a3289c Mon Sep 17 00:00:00 2001
From: Kittywhiskers Van Gogh <63189531+kwvg@users.noreply.github.com>
Date: Fri, 2 Dec 2022 11:25:35 +0000
Subject: [PATCH 350/656] merge bitcoin#26624: Rename local variable to
 distinguish it from type alias

---
 src/net_processing.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/net_processing.cpp b/src/net_processing.cpp
index 11578a3c7242..e9ce4a525ece 100644
--- a/src/net_processing.cpp
+++ b/src/net_processing.cpp
@@ -2760,9 +2760,9 @@ void PeerManagerImpl::ProcessGetData(CNode& pfrom, Peer& peer, const std::atomic
                 std::vector<uint256> parent_ids_to_add;
                 {
                     LOCK(m_mempool.cs);
-                    auto txiter = m_mempool.GetIter(tx->GetHash());
-                    if (txiter) {
-                        const CTxMemPoolEntry::Parents& parents = (*txiter)->GetMemPoolParentsConst();
+                    auto tx_iter = m_mempool.GetIter(tx->GetHash());
+                    if (tx_iter) {
+                        const CTxMemPoolEntry::Parents& parents = (*tx_iter)->GetMemPoolParentsConst();
                         parent_ids_to_add.reserve(parents.size());
                         for (const CTxMemPoolEntry& parent : parents) {
                             if (parent.GetTime() > now - UNCONDITIONAL_RELAY_DELAY) {

From 37ca4b4ceaff922c5d17035e836e3a70ea60eab8 Mon Sep 17 00:00:00 2001
From: Kittywhiskers Van Gogh <63189531+kwvg@users.noreply.github.com>
Date: Sun, 15 Jan 2023 17:10:01 -0700
Subject: [PATCH 351/656] merge bitcoin#26894: Remove redundant key_to_p2pkh
 call

---
 test/functional/wallet_importdescriptors.py | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/test/functional/wallet_importdescriptors.py b/test/functional/wallet_importdescriptors.py
index 77ba51769841..8c30b042ffb8 100755
--- a/test/functional/wallet_importdescriptors.py
+++ b/test/functional/wallet_importdescriptors.py
@@ -15,7 +15,6 @@
 - `test_address()` is called to call getaddressinfo for an address on node1
   and test the values returned."""
 
-from test_framework.address import key_to_p2pkh
 from test_framework.test_framework import BitcoinTestFramework
 from test_framework.descriptors import descsum_create
 from test_framework.util import (
@@ -125,12 +124,11 @@ def run_test(self):
 
         self.log.info("Internal addresses should be detected as such")
         key = get_generate_key()
-        addr = key_to_p2pkh(key.pubkey)
         self.test_importdesc({"desc": descsum_create("pkh(" + key.pubkey + ")"),
                               "timestamp": "now",
                               "internal": True},
                              success=True)
-        info = w1.getaddressinfo(addr)
+        info = w1.getaddressinfo(key.p2pkh_addr)
         assert_equal(info["ismine"], True)
         assert_equal(info["ischange"], True)
 

From 033e06076ec2880658d60961b15c1c26f9a87a88 Mon Sep 17 00:00:00 2001
From: Kittywhiskers Van Gogh <63189531+kwvg@users.noreply.github.com>
Date: Fri, 30 Sep 2022 15:05:35 +0200
Subject: [PATCH 352/656] merge bitcoin#26673: Remove confusing getBool method

---
 src/test/system_tests.cpp         | 4 ++--
 src/univalue/include/univalue.h   | 1 -
 src/univalue/lib/univalue_get.cpp | 2 +-
 src/univalue/test/object.cpp      | 4 ++--
 4 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/src/test/system_tests.cpp b/src/test/system_tests.cpp
index deef4f12b1b1..ae8b23e4a734 100644
--- a/src/test/system_tests.cpp
+++ b/src/test/system_tests.cpp
@@ -38,7 +38,7 @@ BOOST_AUTO_TEST_CASE(run_command)
         BOOST_CHECK(result.isObject());
         const UniValue& success = result.find_value("success");
         BOOST_CHECK(!success.isNull());
-        BOOST_CHECK_EQUAL(success.getBool(), true);
+        BOOST_CHECK_EQUAL(success.get_bool(), true);
     }
     {
         // An invalid command is handled by Boost
@@ -92,7 +92,7 @@ BOOST_AUTO_TEST_CASE(run_command)
         BOOST_CHECK(result.isObject());
         const UniValue& success = result.find_value("success");
         BOOST_CHECK(!success.isNull());
-        BOOST_CHECK_EQUAL(success.getBool(), true);
+        BOOST_CHECK_EQUAL(success.get_bool(), true);
     }
 #endif
 }
diff --git a/src/univalue/include/univalue.h b/src/univalue/include/univalue.h
index 372b0ed7c6f4..076fcfa43277 100644
--- a/src/univalue/include/univalue.h
+++ b/src/univalue/include/univalue.h
@@ -62,7 +62,6 @@ class UniValue {
 
     size_t size() const { return values.size(); }
 
-    bool getBool() const { return isTrue(); }
     void getObjMap(std::map<std::string,UniValue>& kv) const;
     bool checkObject(const std::map<std::string,UniValue::VType>& memberTypes) const;
     const UniValue& operator[](const std::string& key) const;
diff --git a/src/univalue/lib/univalue_get.cpp b/src/univalue/lib/univalue_get.cpp
index 5c58f388ddc5..037449ca08c7 100644
--- a/src/univalue/lib/univalue_get.cpp
+++ b/src/univalue/lib/univalue_get.cpp
@@ -60,7 +60,7 @@ const std::vector<UniValue>& UniValue::getValues() const
 bool UniValue::get_bool() const
 {
     checkType(VBOOL);
-    return getBool();
+    return isTrue();
 }
 
 const std::string& UniValue::get_str() const
diff --git a/src/univalue/test/object.cpp b/src/univalue/test/object.cpp
index ccb5024a1eca..b19977c1ddc0 100644
--- a/src/univalue/test/object.cpp
+++ b/src/univalue/test/object.cpp
@@ -193,13 +193,13 @@ void univalue_set()
     BOOST_CHECK_EQUAL(v.isBool(), true);
     BOOST_CHECK_EQUAL(v.isTrue(), false);
     BOOST_CHECK_EQUAL(v.isFalse(), true);
-    BOOST_CHECK_EQUAL(v.getBool(), false);
+    BOOST_CHECK_EQUAL(v.get_bool(), false);
 
     v.setBool(true);
     BOOST_CHECK_EQUAL(v.isBool(), true);
     BOOST_CHECK_EQUAL(v.isTrue(), true);
     BOOST_CHECK_EQUAL(v.isFalse(), false);
-    BOOST_CHECK_EQUAL(v.getBool(), true);
+    BOOST_CHECK_EQUAL(v.get_bool(), true);
 
     BOOST_CHECK_THROW(v.setNumStr("zombocom"), std::runtime_error);
 

From 945798c57111c7fd6e05e1a93cdc34a49faa9e7f Mon Sep 17 00:00:00 2001
From: Kittywhiskers Van Gogh <63189531+kwvg@users.noreply.github.com>
Date: Wed, 2 Mar 2022 16:38:41 +0000
Subject: [PATCH 353/656] merge bitcoin#24462: For descriptor pubkey parse
 errors, include context information

---
 src/script/descriptor.cpp     | 20 ++++++++++++++++----
 src/test/descriptor_tests.cpp | 10 +++++-----
 2 files changed, 21 insertions(+), 9 deletions(-)

diff --git a/src/script/descriptor.cpp b/src/script/descriptor.cpp
index 9e8968538c10..02b8236e6718 100644
--- a/src/script/descriptor.cpp
+++ b/src/script/descriptor.cpp
@@ -938,19 +938,28 @@ std::unique_ptr<DescriptorImpl> ParseScript(uint32_t& key_exp_index, Span<const
     bool sorted_multi = false;
     if (Func("pk", expr)) {
         auto pubkey = ParsePubkey(key_exp_index, expr, ctx, out, error);
-        if (!pubkey) return nullptr;
+        if (!pubkey) {
+            error = strprintf("pk(): %s", error);
+            return nullptr;
+        }
         ++key_exp_index;
         return std::make_unique<PKDescriptor>(std::move(pubkey));
     }
     if (Func("pkh", expr)) {
         auto pubkey = ParsePubkey(key_exp_index, expr, ctx, out, error);
-        if (!pubkey) return nullptr;
+        if (!pubkey) {
+            error = strprintf("pkh(): %s", error);
+            return nullptr;
+        }
         ++key_exp_index;
         return std::make_unique<PKHDescriptor>(std::move(pubkey));
     }
     if (ctx == ParseScriptContext::TOP && Func("combo", expr)) {
         auto pubkey = ParsePubkey(key_exp_index, expr, ctx, out, error);
-        if (!pubkey) return nullptr;
+        if (!pubkey) {
+            error = strprintf("combo(): %s", error);
+            return nullptr;
+        }
         ++key_exp_index;
         return std::make_unique<ComboDescriptor>(std::move(pubkey));
     } else if (Func("combo", expr)) {
@@ -973,7 +982,10 @@ std::unique_ptr<DescriptorImpl> ParseScript(uint32_t& key_exp_index, Span<const
             }
             auto arg = Expr(expr);
             auto pk = ParsePubkey(key_exp_index, arg, ctx, out, error);
-            if (!pk) return nullptr;
+            if (!pk) {
+                error = strprintf("Multi: %s", error);
+                return nullptr;
+            }
             script_size += pk->GetSize() + 1;
             providers.emplace_back(std::move(pk));
             key_exp_index++;
diff --git a/src/test/descriptor_tests.cpp b/src/test/descriptor_tests.cpp
index 5b7161277470..c84d4cf07b97 100644
--- a/src/test/descriptor_tests.cpp
+++ b/src/test/descriptor_tests.cpp
@@ -304,8 +304,8 @@ BOOST_AUTO_TEST_CASE(descriptor_test)
     Check("pk(XJvEUEcFWCHCyruc8ZX5exPZaGe4UR7gC5FHrhwPnQGDs1uWCsT2)", "pk(03a34b99f22c790c4e36b2b3c2c35a36db06226e41c692fc82b8b56ac1c540c5bd)", "pk(03a34b99f22c790c4e36b2b3c2c35a36db06226e41c692fc82b8b56ac1c540c5bd)", SIGNABLE, {{"2103a34b99f22c790c4e36b2b3c2c35a36db06226e41c692fc82b8b56ac1c540c5bdac"}}, OutputType::LEGACY);
     Check("pkh([deadbeef/1/2'/3/4']XJvEUEcFWCHCyruc8ZX5exPZaGe4UR7gC5FHrhwPnQGDs1uWCsT2)", "pkh([deadbeef/1/2'/3/4']03a34b99f22c790c4e36b2b3c2c35a36db06226e41c692fc82b8b56ac1c540c5bd)", "pkh([deadbeef/1/2'/3/4']03a34b99f22c790c4e36b2b3c2c35a36db06226e41c692fc82b8b56ac1c540c5bd)", SIGNABLE, {{"76a9149a1c78a507689f6f54b847ad1cef1e614ee23f1e88ac"}}, OutputType::LEGACY, {{1, 0x80000002UL, 3, 0x80000004UL}});
     Check("combo(XJvEUEcFWCHCyruc8ZX5exPZaGe4UR7gC5FHrhwPnQGDs1uWCsT2)", "combo(03a34b99f22c790c4e36b2b3c2c35a36db06226e41c692fc82b8b56ac1c540c5bd)", "combo(03a34b99f22c790c4e36b2b3c2c35a36db06226e41c692fc82b8b56ac1c540c5bd)", SIGNABLE, {{"2103a34b99f22c790c4e36b2b3c2c35a36db06226e41c692fc82b8b56ac1c540c5bdac", "76a9149a1c78a507689f6f54b847ad1cef1e614ee23f1e88ac", "a9141a31ad23bf49c247dd531a623c2ef57da3c400c587"}}, OutputType::LEGACY);
-    CheckUnparsable("pkh(deadbeef/1/2'/3/4']L4rK1yDtCWekvXuE6oXD9jCYfFNV2cWRpVuPLBcCU2z8TrisoyY1)", "pkh(deadbeef/1/2'/3/4']03a34b99f22c790c4e36b2b3c2c35a36db06226e41c692fc82b8b56ac1c540c5bd)", "Key origin start '[ character expected but not found, got 'd' instead"); // Missing start bracket in key origin
-    CheckUnparsable("pkh([deadbeef]/1/2'/3/4']L4rK1yDtCWekvXuE6oXD9jCYfFNV2cWRpVuPLBcCU2z8TrisoyY1)", "pkh([deadbeef]/1/2'/3/4']03a34b99f22c790c4e36b2b3c2c35a36db06226e41c692fc82b8b56ac1c540c5bd)", "Multiple ']' characters found for a single pubkey"); // Multiple end brackets in key origin
+    CheckUnparsable("pkh(deadbeef/1/2'/3/4']L4rK1yDtCWekvXuE6oXD9jCYfFNV2cWRpVuPLBcCU2z8TrisoyY1)", "pkh(deadbeef/1/2'/3/4']03a34b99f22c790c4e36b2b3c2c35a36db06226e41c692fc82b8b56ac1c540c5bd)", "pkh(): Key origin start '[ character expected but not found, got 'd' instead"); // Missing start bracket in key origin
+    CheckUnparsable("pkh([deadbeef]/1/2'/3/4']L4rK1yDtCWekvXuE6oXD9jCYfFNV2cWRpVuPLBcCU2z8TrisoyY1)", "pkh([deadbeef]/1/2'/3/4']03a34b99f22c790c4e36b2b3c2c35a36db06226e41c692fc82b8b56ac1c540c5bd)", "pkh(): Multiple ']' characters found for a single pubkey"); // Multiple end brackets in key origin
     // Basic single-key uncompressed
     Check("pk(7sH936MDoVPFVk2VoaCM5yW8P3BfPyffnZECyaHrZwfLgWpS13e)", "pk(04a34b99f22c790c4e36b2b3c2c35a36db06226e41c692fc82b8b56ac1c540c5bd5b8dec5235a0fa8722476c7709c02559e3aa73aa03918ba2d492eea75abea235)", "pk(04a34b99f22c790c4e36b2b3c2c35a36db06226e41c692fc82b8b56ac1c540c5bd5b8dec5235a0fa8722476c7709c02559e3aa73aa03918ba2d492eea75abea235)", SIGNABLE, {{"4104a34b99f22c790c4e36b2b3c2c35a36db06226e41c692fc82b8b56ac1c540c5bd5b8dec5235a0fa8722476c7709c02559e3aa73aa03918ba2d492eea75abea235ac"}}, OutputType::LEGACY);
     Check("pkh(7sH936MDoVPFVk2VoaCM5yW8P3BfPyffnZECyaHrZwfLgWpS13e)", "pkh(04a34b99f22c790c4e36b2b3c2c35a36db06226e41c692fc82b8b56ac1c540c5bd5b8dec5235a0fa8722476c7709c02559e3aa73aa03918ba2d492eea75abea235)", "pkh(04a34b99f22c790c4e36b2b3c2c35a36db06226e41c692fc82b8b56ac1c540c5bd5b8dec5235a0fa8722476c7709c02559e3aa73aa03918ba2d492eea75abea235)", SIGNABLE, {{"76a914b5bd079c4d57cc7fc28ecf8213a6b791625b818388ac"}}, OutputType::LEGACY);
@@ -321,9 +321,9 @@ BOOST_AUTO_TEST_CASE(descriptor_test)
     Check("pkh(xprv9s21ZrQH143K31xYSDQpPDxsXRTUcvj2iNHm5NUtrGiGG5e2DtALGdso3pGz6ssrdK4PFmM8NSpSBHNqPqm55Qn3LqFtT2emdEXVYsCzC2U/2147483647'/0)", "pkh(xpub661MyMwAqRbcFW31YEwpkMuc5THy2PSt5bDMsktWQcFF8syAmRUapSCGu8ED9W6oDMSgv6Zz8idoc4a6mr8BDzTJY47LJhkJ8UB7WEGuduB/2147483647'/0)", "pkh([bd16bee5/2147483647']xpub69H7F5dQzmVd3vPuLKtcXJziMEQByuDidnX3YdwgtNsecY5HRGtAAQC5mXTt4dsv9RzyjgDjAQs9VGVV6ydYCHnprc9vvaA5YtqWyL6hyds/0)", HARDENED, {{"76a914ebdc90806a9c4356c1c88e42216611e1cb4c1c1788ac"}}, OutputType::LEGACY, {{0xFFFFFFFFUL,0}});
     Check("combo([01234567]xprvA1RpRA33e1JQ7ifknakTFpgNXPmW2YvmhqLQYMmrj4xJXXWYpDPS3xz7iAxn8L39njGVyuoseXzU6rcxFLJ8HFsTjSyQbLYnMpCqE2VbFWc)", "combo([01234567]xpub6ERApfZwUNrhLCkDtcHTcxd75RbzS1ed54G1LkBUHQVHQKqhMkhgbmJbZRkrgZw4koxb5JaHWkY4ALHY2grBGRjaDMzQLcgJvLJuZZvRcEL)", "combo([01234567]xpub6ERApfZwUNrhLCkDtcHTcxd75RbzS1ed54G1LkBUHQVHQKqhMkhgbmJbZRkrgZw4koxb5JaHWkY4ALHY2grBGRjaDMzQLcgJvLJuZZvRcEL)", SIGNABLE, {{"2102d2b36900396c9282fa14628566582f206a5dd0bcc8d5e892611806cafb0301f0ac", "76a91431a507b815593dfc51ffc7245ae7e5aee304246e88ac", "a914330e2d4d29686cf671043c5157a42b9532ac168587"}}, OutputType::LEGACY);
     Check("combo(xprvA2JDeKCSNNZky6uBCviVfJSKyQ1mDYahRjijr5idH2WwLsEd4Hsb2Tyh8RfQMuPh7f7RtyzTtdrbdqqsunu5Mm3wDvUAKRHSC34sJ7in334/*)", "combo(xpub6FHa3pjLCk84BayeJxFW2SP4XRrFd1JYnxeLeU8EqN3vDfZmbqBqaGJAyiLjTAwm6ZLRQUMv1ZACTj37sR62cfN7fe5JnJ7dh8zL4fiyLHV/*)", "combo(xpub6FHa3pjLCk84BayeJxFW2SP4XRrFd1JYnxeLeU8EqN3vDfZmbqBqaGJAyiLjTAwm6ZLRQUMv1ZACTj37sR62cfN7fe5JnJ7dh8zL4fiyLHV/*)", RANGE, {{"2102df12b7035bdac8e3bab862a3a83d06ea6b17b6753d52edecba9be46f5d09e076ac", "76a914f90e3178ca25f2c808dc76624032d352fdbdfaf288ac", "a914ebb09774a2d3ebe7cbad02bcec49e3971b75b51787"}, {"21032869a233c9adff9a994e4966e5b821fd5bac066da6c3112488dc52383b4a98ecac", "76a914a8409d1b6dfb1ed2a3e8aa5e0ef2ff26b15b75b788ac", "a91441b8fc4592be2987caa8706d0567cccd18431c1387"}}, OutputType::LEGACY, {{0}, {1}});
-    CheckUnparsable("combo([012345678]xprvA1RpRA33e1JQ7ifknakTFpgNXPmW2YvmhqLQYMmrj4xJXXWYpDPS3xz7iAxn8L39njGVyuoseXzU6rcxFLJ8HFsTjSyQbLYnMpCqE2VbFWc)", "combo([012345678]xpub6ERApfZwUNrhLCkDtcHTcxd75RbzS1ed54G1LkBUHQVHQKqhMkhgbmJbZRkrgZw4koxb5JaHWkY4ALHY2grBGRjaDMzQLcgJvLJuZZvRcEL)", "Fingerprint is not 4 bytes (9 characters instead of 8 characters)"); // Too long key fingerprint
-    CheckUnparsable("pkh(xprv9s21ZrQH143K31xYSDQpPDxsXRTUcvj2iNHm5NUtrGiGG5e2DtALGdso3pGz6ssrdK4PFmM8NSpSBHNqPqm55Qn3LqFtT2emdEXVYsCzC2U/2147483648)", "pkh(xpub661MyMwAqRbcFW31YEwpkMuc5THy2PSt5bDMsktWQcFF8syAmRUapSCGu8ED9W6oDMSgv6Zz8idoc4a6mr8BDzTJY47LJhkJ8UB7WEGuduB/2147483648)", "Key path value 2147483648 is out of range"); // BIP 32 path element overflow
-    CheckUnparsable("pkh(xprv9s21ZrQH143K31xYSDQpPDxsXRTUcvj2iNHm5NUtrGiGG5e2DtALGdso3pGz6ssrdK4PFmM8NSpSBHNqPqm55Qn3LqFtT2emdEXVYsCzC2U/1aa)", "pkh(xpub661MyMwAqRbcFW31YEwpkMuc5THy2PSt5bDMsktWQcFF8syAmRUapSCGu8ED9W6oDMSgv6Zz8idoc4a6mr8BDzTJY47LJhkJ8UB7WEGuduB/1aa)", "Key path value '1aa' is not a valid uint32"); // Path is not valid uint
+    CheckUnparsable("combo([012345678]xprvA1RpRA33e1JQ7ifknakTFpgNXPmW2YvmhqLQYMmrj4xJXXWYpDPS3xz7iAxn8L39njGVyuoseXzU6rcxFLJ8HFsTjSyQbLYnMpCqE2VbFWc)", "combo([012345678]xpub6ERApfZwUNrhLCkDtcHTcxd75RbzS1ed54G1LkBUHQVHQKqhMkhgbmJbZRkrgZw4koxb5JaHWkY4ALHY2grBGRjaDMzQLcgJvLJuZZvRcEL)", "combo(): Fingerprint is not 4 bytes (9 characters instead of 8 characters)"); // Too long key fingerprint
+    CheckUnparsable("pkh(xprv9s21ZrQH143K31xYSDQpPDxsXRTUcvj2iNHm5NUtrGiGG5e2DtALGdso3pGz6ssrdK4PFmM8NSpSBHNqPqm55Qn3LqFtT2emdEXVYsCzC2U/2147483648)", "pkh(xpub661MyMwAqRbcFW31YEwpkMuc5THy2PSt5bDMsktWQcFF8syAmRUapSCGu8ED9W6oDMSgv6Zz8idoc4a6mr8BDzTJY47LJhkJ8UB7WEGuduB/2147483648)", "pkh(): Key path value 2147483648 is out of range"); // BIP 32 path element overflow
+    CheckUnparsable("pkh(xprv9s21ZrQH143K31xYSDQpPDxsXRTUcvj2iNHm5NUtrGiGG5e2DtALGdso3pGz6ssrdK4PFmM8NSpSBHNqPqm55Qn3LqFtT2emdEXVYsCzC2U/1aa)", "pkh(xpub661MyMwAqRbcFW31YEwpkMuc5THy2PSt5bDMsktWQcFF8syAmRUapSCGu8ED9W6oDMSgv6Zz8idoc4a6mr8BDzTJY47LJhkJ8UB7WEGuduB/1aa)", "pkh(): Key path value '1aa' is not a valid uint32"); // Path is not valid uint
     Check("pkh([01234567/10/20]xprv9s21ZrQH143K31xYSDQpPDxsXRTUcvj2iNHm5NUtrGiGG5e2DtALGdso3pGz6ssrdK4PFmM8NSpSBHNqPqm55Qn3LqFtT2emdEXVYsCzC2U/2147483647'/0)", "pkh([01234567/10/20]xpub661MyMwAqRbcFW31YEwpkMuc5THy2PSt5bDMsktWQcFF8syAmRUapSCGu8ED9W6oDMSgv6Zz8idoc4a6mr8BDzTJY47LJhkJ8UB7WEGuduB/2147483647'/0)", "pkh([01234567/10/20/2147483647']xpub69H7F5dQzmVd3vPuLKtcXJziMEQByuDidnX3YdwgtNsecY5HRGtAAQC5mXTt4dsv9RzyjgDjAQs9VGVV6ydYCHnprc9vvaA5YtqWyL6hyds/0)", HARDENED, {{"76a914ebdc90806a9c4356c1c88e42216611e1cb4c1c1788ac"}}, OutputType::LEGACY, {{10, 20, 0xFFFFFFFFUL, 0}});
     // Multisig constructions
     Check("multi(1,XJvEUEcFWCHCyruc8ZX5exPZaGe4UR7gC5FHrhwPnQGDs1uWCsT2,7sH936MDoVPFVk2VoaCM5yW8P3BfPyffnZECyaHrZwfLgWpS13e)", "multi(1,03a34b99f22c790c4e36b2b3c2c35a36db06226e41c692fc82b8b56ac1c540c5bd,04a34b99f22c790c4e36b2b3c2c35a36db06226e41c692fc82b8b56ac1c540c5bd5b8dec5235a0fa8722476c7709c02559e3aa73aa03918ba2d492eea75abea235)", "multi(1,03a34b99f22c790c4e36b2b3c2c35a36db06226e41c692fc82b8b56ac1c540c5bd,04a34b99f22c790c4e36b2b3c2c35a36db06226e41c692fc82b8b56ac1c540c5bd5b8dec5235a0fa8722476c7709c02559e3aa73aa03918ba2d492eea75abea235)", SIGNABLE, {{"512103a34b99f22c790c4e36b2b3c2c35a36db06226e41c692fc82b8b56ac1c540c5bd4104a34b99f22c790c4e36b2b3c2c35a36db06226e41c692fc82b8b56ac1c540c5bd5b8dec5235a0fa8722476c7709c02559e3aa73aa03918ba2d492eea75abea23552ae"}}, std::nullopt);

From 05fb9000461fa1f5a9417406dc6405912d130027 Mon Sep 17 00:00:00 2001
From: Kittywhiskers Van Gogh <63189531+kwvg@users.noreply.github.com>
Date: Fri, 15 Jul 2022 18:31:39 -0400
Subject: [PATCH 354/656] merge bitcoin#25815: Use existing
 {Chainstate,Block}Man

---
 src/test/validation_chainstate_tests.cpp |  5 ++---
 src/test/validation_flush_tests.cpp      | 11 ++---------
 2 files changed, 4 insertions(+), 12 deletions(-)

diff --git a/src/test/validation_chainstate_tests.cpp b/src/test/validation_chainstate_tests.cpp
index 928bc2f72154..d1a3fda4539f 100644
--- a/src/test/validation_chainstate_tests.cpp
+++ b/src/test/validation_chainstate_tests.cpp
@@ -18,14 +18,13 @@
 
 #include <boost/test/unit_test.hpp>
 
-BOOST_FIXTURE_TEST_SUITE(validation_chainstate_tests, TestingSetup)
+BOOST_FIXTURE_TEST_SUITE(validation_chainstate_tests, ChainTestingSetup)
 
 //! Test resizing coins-related CChainState caches during runtime.
 //!
 BOOST_AUTO_TEST_CASE(validation_chainstate_resize_caches)
 {
-    ChainstateManager manager;
-    WITH_LOCK(::cs_main, manager.m_blockman.m_block_tree_db = std::make_unique<CBlockTreeDB>(1 << 20, true));
+    ChainstateManager& manager = *Assert(m_node.chainman);
     CTxMemPool& mempool = *Assert(m_node.mempool);
 
     //! Create and add a Coin with DynamicMemoryUsage of 80 bytes to the given view.
diff --git a/src/test/validation_flush_tests.cpp b/src/test/validation_flush_tests.cpp
index b757d7c4757a..960dd2997baf 100644
--- a/src/test/validation_flush_tests.cpp
+++ b/src/test/validation_flush_tests.cpp
@@ -5,14 +5,11 @@
 #include <evo/evodb.h>
 #include <sync.h>
 #include <test/util/setup_common.h>
-#include <txmempool.h>
 #include <validation.h>
 
 #include <boost/test/unit_test.hpp>
 
-using node::BlockManager;
-
-BOOST_FIXTURE_TEST_SUITE(validation_flush_tests, ChainTestingSetup)
+BOOST_FIXTURE_TEST_SUITE(validation_flush_tests, TestingSetup)
 
 //! Test utilities for detecting when we need to flush the coins cache based
 //! on estimated memory usage.
@@ -21,11 +18,7 @@ BOOST_FIXTURE_TEST_SUITE(validation_flush_tests, ChainTestingSetup)
 //!
 BOOST_AUTO_TEST_CASE(getcoinscachesizestate)
 {
-    CTxMemPool& mempool = *Assert(m_node.mempool);
-    BlockManager blockman{};
-    CChainState chainstate(&mempool, blockman, *Assert(m_node.chainman), *m_node.evodb, m_node.chain_helper);
-    chainstate.InitCoinsDB(/*cache_size_bytes=*/1 << 10, /*in_memory=*/true, /*should_wipe=*/false);
-    WITH_LOCK(::cs_main, chainstate.InitCoinsCache(1 << 10));
+    CChainState& chainstate{m_node.chainman->ActiveChainstate()};
 
     constexpr bool is_64_bit = sizeof(void*) == 8;
 

From 25ecd50565bcec8f923abf17650617f8fa056426 Mon Sep 17 00:00:00 2001
From: Konstantin Akimov <knstqq@gmail.com>
Date: Mon, 3 Nov 2025 14:18:04 +0700
Subject: [PATCH 355/656] fix: follow-up for 6920 to update checkpoints for
 testnet in man pages

---
 doc/man/dash-qt.1 | 2 +-
 doc/man/dashd.1   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/doc/man/dash-qt.1 b/doc/man/dash-qt.1
index a4c005ee778d..653b59a47b4a 100644
--- a/doc/man/dash-qt.1
+++ b/doc/man/dash-qt.1
@@ -27,7 +27,7 @@ and potentially skip their script verification (0 to verify all,
 default:
 0000000000000009ba1e8f47851d036bb618a4f6565eb3c32d1f647d450ff195,
 testnet:
-000001d20827f1394354452ba2e836de387e4fbf2d1d35b3281adbb14adf89a1)
+00000107d42829a38e31c1a38c660d621e1ca376a880df1520e85e38af175d3a)
 .HP
 \fB\-blockfilterindex=\fR<type>
 .IP
diff --git a/doc/man/dashd.1 b/doc/man/dashd.1
index 5e15f90e8139..437f7b0c0017 100644
--- a/doc/man/dashd.1
+++ b/doc/man/dashd.1
@@ -25,7 +25,7 @@ and potentially skip their script verification (0 to verify all,
 default:
 0000000000000009ba1e8f47851d036bb618a4f6565eb3c32d1f647d450ff195,
 testnet:
-000001d20827f1394354452ba2e836de387e4fbf2d1d35b3281adbb14adf89a1)
+00000107d42829a38e31c1a38c660d621e1ca376a880df1520e85e38af175d3a)
 .HP
 \fB\-blockfilterindex=\fR<type>
 .IP

From 2c8b99401c1b554ce5579d004ad81b7184ff9827 Mon Sep 17 00:00:00 2001
From: glozow <gloriajzhao@gmail.com>
Date: Mon, 27 Feb 2023 13:17:33 +0000
Subject: [PATCH 356/656] Merge bitcoin/bitcoin#27058: contrib: Improve
 verify-commits.py to work with maintainers leaving

14fac808bd6c12bce121011bbf50501960c7326f verify-commits: Mention git v2.38.0 requirement (Andrew Chow)
bb86887527d817ee2a015863ddf3541dac42080f verify-commits: Skip checks for commits older than trusted roots (Andrew Chow)
5497c1483097a9b582ef78089a2ce1101b7d722e verify-commits: Use merge-tree in clean merge check (Andrew Chow)
76923bfa09397568fb8eb72142468a986fc6f790 verify-commits: Remove all allowed commit exceptions (Andrew Chow)
53b07b2b47aa3d4ca80fac74e432783a1e724df3 verify-commits: Move trusted-keys valid sig check into verify-commits itself (Andrew Chow)

Pull request description:

  Currently the `verify-commits.py` script does not work well with maintainers giving up their commit access. If a key is removed from `trusted-keys`, any commits it signed previously will fail to verify, however keys cannot be kept in the list as it would allow that person to continue to push new commits. Furthermore, the `trusted-keys` used depends on the working tree which `verify-commits.py` itself may be modifying. When the script is run, the `trusted-keys` may be the one that is intended to be used, but the script may change the tree to a different commit with a different `trusted-keys` and use that instead!

  To resolve these issues, I've updated `verify-commits.py` to load the `trusted-keys` file and check the keys itself rather than delegating that to `gpg.sh` (which previously read in `trusted-keys`). This avoids the issue with the tree changing.

  I've also updated the script so that it stops modifying the tree. It would do this for the clean merge check where it would checkout each individual commit and attempt to reapply the merges, and then checking out the commit given as a cli arg. `git merge-tree` lets us do basically that but without modifying the tree. It will give us the object id for the resulting tree which we can compare against the object id of the tree in the merge commit in question. This also appears to be quite a bit faster.

  Lastly I've removed all of the exception commits in `allow-revsig-commits`, `allow-incorrect-sha512-commits`, and `allow-unclean-merge-commits` since all of these predate the commits in `trusted-git-root` and `trusted-sha512-root`. I've also updated the script to skip verification of commits that predate `trusted-git-root`, and skip sha512 verification for those that predate `trusted-sha512-root`.

ACKs for top commit:
  Sjors:
    ACK 14fac808bd6c12bce121011bbf50501960c7326f
  glozow:
    Concept ACK 14fac808bd6c12bce121011bbf50501960c7326f

Tree-SHA512: f9b0c6e1f1aecb169cdd6c833b8871b15e31c2374dc589858df0523659b294220d327481cc36dd0f92e9040d868eee6a8a68502f3163e05fa751f9fc2fa8832a
---
 contrib/verify-commits/README.md         |  4 ++
 contrib/verify-commits/gpg.sh            | 42 +++-----------------
 contrib/verify-commits/verify-commits.py | 49 +++++++++++++++++-------
 3 files changed, 45 insertions(+), 50 deletions(-)

diff --git a/contrib/verify-commits/README.md b/contrib/verify-commits/README.md
index b8b15280bae2..020890c3660e 100644
--- a/contrib/verify-commits/README.md
+++ b/contrib/verify-commits/README.md
@@ -27,6 +27,10 @@ Note that the above isn't a good UI/UX yet, and needs significant improvements
 to make it more convenient and reduce the chance of errors; pull-reqs
 improving this process would be much appreciated.
 
+Unless `--clean-merge 0` is specified, `verify-commits.py` will attempt to verify that
+each merge commit applies cleanly (with some exceptions). This requires using at least
+git v2.38.0.
+
 Configuration files
 -------------------
 
diff --git a/contrib/verify-commits/gpg.sh b/contrib/verify-commits/gpg.sh
index db5bfce208ef..cfd68e45b8da 100755
--- a/contrib/verify-commits/gpg.sh
+++ b/contrib/verify-commits/gpg.sh
@@ -5,12 +5,9 @@
 
 export LC_ALL=C
 INPUT=$(cat /dev/stdin)
-VALID=false
-REVSIG=false
-IFS='
-'
 if [ "$BITCOIN_VERIFY_COMMITS_ALLOW_SHA1" = 1 ]; then
-	GPG_RES="$(printf '%s\n' "$INPUT" | gpg --trust-model always "$@" 2>/dev/null)"
+    printf '%s\n' "$INPUT" | gpg --trust-model always "$@" 2>/dev/null
+    exit $?
 else
 	# Note how we've disabled SHA1 with the --weak-digest option, disabling
 	# signatures - including selfsigs - that use SHA1. While you might think that
@@ -20,12 +17,12 @@ else
 	# an attacker could construct a pull-req that results in a commit object that
 	# they've created a collision for. Not the most likely attack, but preventing
 	# it is pretty easy so we do so as a "belt-and-suspenders" measure.
-	GPG_RES=""
 	for LINE in $(gpg --version); do
 		case "$LINE" in
 			"gpg (GnuPG) 1.4.1"*|"gpg (GnuPG) 2.0."*)
 				echo "Please upgrade to at least gpg 2.1.10 to check for weak signatures" > /dev/stderr
-				GPG_RES="$(printf '%s\n' "$INPUT" | gpg --trust-model always "$@" 2>/dev/null)"
+                                printf '%s\n' "$INPUT" | gpg --trust-model always "$@" 2>/dev/null
+                                exit $?
 				;;
 			# We assume if you're running 2.1+, you're probably running 2.1.10+
 			# gpg will fail otherwise
@@ -33,33 +30,6 @@ else
 			# gpg will fail otherwise
 		esac
 	done
-	[ "$GPG_RES" = "" ] && GPG_RES="$(printf '%s\n' "$INPUT" | gpg --trust-model always --weak-digest sha1 "$@" 2>/dev/null)"
-fi
-for LINE in $GPG_RES; do
-	case "$LINE" in
-	"[GNUPG:] VALIDSIG "*)
-		while read KEY; do
-			[ "${LINE#?GNUPG:? VALIDSIG * * * * * * * * * }" = "$KEY" ] && VALID=true
-		done < ./contrib/verify-commits/trusted-keys
-		;;
-	"[GNUPG:] REVKEYSIG "*)
-		[ "$BITCOIN_VERIFY_COMMITS_ALLOW_REVSIG" != 1 ] && exit 1
-		REVSIG=true
-		GOODREVSIG="[GNUPG:] GOODSIG ${LINE#* * *}"
-		;;
-	"[GNUPG:] EXPKEYSIG "*)
-		[ "$BITCOIN_VERIFY_COMMITS_ALLOW_REVSIG" != 1 ] && exit 1
-		REVSIG=true
-		GOODREVSIG="[GNUPG:] GOODSIG ${LINE#* * *}"
-		;;
-	esac
-done
-if ! $VALID; then
-	exit 1
-fi
-if $VALID && $REVSIG; then
-	printf '%s\n' "$INPUT" | gpg --trust-model always "$@" 2>/dev/null | grep "^\[GNUPG:\] \(NEWSIG\|SIG_ID\|VALIDSIG\)"
-	echo "$GOODREVSIG"
-else
-	printf '%s\n' "$INPUT" | gpg --trust-model always "$@" 2>/dev/null
+        printf '%s\n' "$INPUT" | gpg --trust-model always --weak-digest sha1 "$@" 2>/dev/null
+        exit $?
 fi
diff --git a/contrib/verify-commits/verify-commits.py b/contrib/verify-commits/verify-commits.py
index 51506a1a2746..d9c17a5998f8 100755
--- a/contrib/verify-commits/verify-commits.py
+++ b/contrib/verify-commits/verify-commits.py
@@ -92,8 +92,10 @@ def main():
         unclean_merge_allowed = f.read().splitlines()
     with open(dirname + "/allow-incorrect-sha512-commits", "r", encoding="utf8") as f:
         incorrect_sha512_allowed = f.read().splitlines()
+    with open(dirname + "/trusted-keys", "r", encoding="utf8") as f:
+        trusted_keys = f.read().splitlines()
 
-    # Set commit and branch and set variables
+    # Set commit and variables
     current_commit = args.commit
     if ' ' in current_commit:
         print("Commit must not contain spaces", file=sys.stderr)
@@ -102,7 +104,6 @@ def main():
     no_sha1 = True
     prev_commit = ""
     initial_commit = current_commit
-    branch = subprocess.check_output([GIT, 'show', '-s', '--format=%H', initial_commit]).decode('utf8').splitlines()[0]
 
     # Iterate through commits
     while True:
@@ -113,17 +114,41 @@ def main():
         if current_commit == verified_root:
             print('There is a valid path from "{}" to {} where all commits are signed!'.format(initial_commit, verified_root))
             sys.exit(0)
-        if current_commit == verified_sha512_root:
-            if verify_tree:
+        else:
+            # Make sure this commit isn't older than trusted roots
+            check_root_older_res = subprocess.run([GIT, "merge-base", "--is-ancestor", verified_root, current_commit])
+            if check_root_older_res.returncode != 0:
+                print(f"\"{current_commit}\" predates the trusted root, stopping!")
+                sys.exit(0)
+
+        if verify_tree:
+            if current_commit == verified_sha512_root:
                 print("All Tree-SHA512s matched up to {}".format(verified_sha512_root), file=sys.stderr)
-            verify_tree = False
-            no_sha1 = False
+                verify_tree = False
+                no_sha1 = False
+            else:
+                # Skip the tree check if we are older than the trusted root
+                check_root_older_res = subprocess.run([GIT, "merge-base", "--is-ancestor", verified_sha512_root, current_commit])
+                if check_root_older_res.returncode != 0:
+                    print(f"\"{current_commit}\" predates the trusted SHA512 root, disabling tree verification.")
+                    verify_tree = False
+                    no_sha1 = False
+
 
         os.environ['BITCOIN_VERIFY_COMMITS_ALLOW_SHA1'] = "0" if no_sha1 else "1"
-        os.environ['BITCOIN_VERIFY_COMMITS_ALLOW_REVSIG'] = "1" if current_commit in revsig_allowed else "0"
+        allow_revsig = current_commit in revsig_allowed
 
         # Check that the commit (and parents) was signed with a trusted key
-        if subprocess.call([GIT, '-c', 'gpg.program={}/gpg.sh'.format(dirname), 'verify-commit', current_commit], stdout=subprocess.DEVNULL):
+        valid_sig = False
+        verify_res = subprocess.run([GIT, '-c', 'gpg.program={}/gpg.sh'.format(dirname), 'verify-commit', "--raw", current_commit], capture_output=True)
+        for line in verify_res.stderr.decode().splitlines():
+            if line.startswith("[GNUPG:] VALIDSIG "):
+                key = line.split(" ")[-1]
+                valid_sig = key in trusted_keys
+            elif (line.startswith("[GNUPG:] REVKEYSIG ") or line.startswith("[GNUPG:] EXPKEYSIG ")) and not allow_revsig:
+                valid_sig = False
+                break
+        if not valid_sig:
             if prev_commit != "":
                 print("No parent of {} was signed with a trusted key!".format(prev_commit), file=sys.stderr)
                 print("Parents are:", file=sys.stderr)
@@ -153,15 +178,11 @@ def main():
         allow_unclean = current_commit in unclean_merge_allowed
         if len(parents) == 2 and check_merge and not allow_unclean:
             current_tree = subprocess.check_output([GIT, 'show', '--format=%T', current_commit]).decode('utf8').splitlines()[0]
-            subprocess.call([GIT, 'checkout', '--force', '--quiet', parents[0]])
-            subprocess.call([GIT, 'merge', '--no-ff', '--quiet', '--no-gpg-sign', parents[1]], stdout=subprocess.DEVNULL)
-            recreated_tree = subprocess.check_output([GIT, 'show', '--format=format:%T', 'HEAD']).decode('utf8').splitlines()[0]
+            recreated_tree = subprocess.check_output([GIT, "merge-tree", parents[0], parents[1]]).decode('utf8').splitlines()[0]
             if current_tree != recreated_tree:
                 print("Merge commit {} is not clean".format(current_commit), file=sys.stderr)
-                subprocess.call([GIT, 'diff', current_commit])
-                subprocess.call([GIT, 'checkout', '--force', '--quiet', branch])
+                subprocess.call([GIT, 'diff', recreated_tree, current_tree])
                 sys.exit(1)
-            subprocess.call([GIT, 'checkout', '--force', '--quiet', branch])
 
         prev_commit = current_commit
         current_commit = parents[0]

From 920d790d9f252427a90d20ab7cfd43029d8ebec7 Mon Sep 17 00:00:00 2001
From: fanquake <fanquake@gmail.com>
Date: Sat, 11 Mar 2023 10:57:56 +0100
Subject: [PATCH 357/656] Merge bitcoin/bitcoin#27220: doc: update broken str
 util reference links on developer-notes

da347de530242ead8f6a9718ee1440385bd3d44d doc: update broken links (pablomartin4btc)

Pull request description:

  References to `utilstrencodings` and `lint-locale-dependence.sh` where incorrect, updating them accordingly.

  Also, adding another reference to util function [`LocaleIndependentAtoi`](https://github.com/bitcoin/bitcoin/blob/master/src/util/strencodings.h#L108-L118), which is related with the updated section of the guide:

  ```
  // LocaleIndependentAtoi is provided for backwards compatibility reasons.
  //
  // New code should use ToIntegral or the ParseInt* functions
  // which provide parse error feedback.
  //
  // The goal of LocaleIndependentAtoi is to replicate the defined behaviour of
  // std::atoi as it behaves under the "C" locale, and remove some undefined
  // behavior. If the parsed value is bigger than the integer type's maximum
  // value, or smaller than the integer type's minimum value, std::atoi has
  // undefined behavior, while this function returns the maximum or minimum
  // values, respectively.
  ```

ACKs for top commit:
  MarcoFalke:
    lgtm ACK da347de530242ead8f6a9718ee1440385bd3d44d

Tree-SHA512: c8f4cd9cff1fb3ea367ac9dbe5aa45dc187fc60114f2e2106e02e0e17fea4ee34d6e0c408fe920c2d8765e06b4dc30c231f0454fa35469c4399e0cadbcd341ba
---
 doc/developer-notes.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/doc/developer-notes.md b/doc/developer-notes.md
index 843a4843736d..3fe03af70e2f 100644
--- a/doc/developer-notes.md
+++ b/doc/developer-notes.md
@@ -866,12 +866,12 @@ Strings and formatting
     buffer overflows, and surprises with `\0` characters. Also, some C string manipulations
     tend to act differently depending on platform, or even the user locale.
 
-- Use `ParseInt32`, `ParseInt64`, `ParseUInt32`, `ParseUInt64`, `ParseDouble` from `utilstrencodings.h` for number parsing.
+- Use `ToIntegral` from [`strencodings.h`](/src/util/strencodings.h) for number parsing. In legacy code you might also find `ParseInt*` family of functions, `ParseDouble` or `LocaleIndependentAtoi`.
 
   - *Rationale*: These functions do overflow checking and avoid pesky locale issues.
 
 - Avoid using locale dependent functions if possible. You can use the provided
-  [`lint-locale-dependence.sh`](/test/lint/lint-locale-dependence.sh)
+  [`lint-locale-dependence.py`](/test/lint/lint-locale-dependence.py)
   to check for accidental use of locale dependent functions.
 
   - *Rationale*: Unnecessary locale dependence can cause bugs that are very tricky to isolate and fix.

From 916aafb04b3dff5a80464696ece088d0c307a92e Mon Sep 17 00:00:00 2001
From: Andrew Chow <github@achow101.com>
Date: Fri, 14 Apr 2023 09:26:55 -0400
Subject: [PATCH 358/656] Merge bitcoin/bitcoin#27461: verify-commits: error
 and exit cleanly when git is too old.

1fefcf27edcac7ebb87c1d3c68bcd9870e3ae78a verify-commits: error and exit cleanly when git is too old. (Cory Fields)

Pull request description:

  Requested by fanquake. Rather than failing with a cryptic error with older git, fail gracefully and mention why.

  The new option semantics [are explained here](https://github.com/git/git/commit/1f0c3a29da3515d88537902cd267cc726020eea5).

  Note: my local git versions are currently too old to test the new functionality, so I've only verified the failure case.

ACKs for top commit:
  josibake:
    ACK https://github.com/bitcoin/bitcoin/pull/27461/commits/1fefcf27edcac7ebb87c1d3c68bcd9870e3ae78a
  achow101:
    ACK 1fefcf27edcac7ebb87c1d3c68bcd9870e3ae78a

Tree-SHA512: f3dc583edf6ff6ff9bf06f33de967e10b8423ce62e7370912ffdca8a4ca4bfe4c2e783e9ad76281ce9e6748a4643d187aa5cb4a6b9ec4c1582910f02b94b6e3c
---
 contrib/verify-commits/verify-commits.py | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/contrib/verify-commits/verify-commits.py b/contrib/verify-commits/verify-commits.py
index d9c17a5998f8..4d954cea1905 100755
--- a/contrib/verify-commits/verify-commits.py
+++ b/contrib/verify-commits/verify-commits.py
@@ -178,7 +178,20 @@ def main():
         allow_unclean = current_commit in unclean_merge_allowed
         if len(parents) == 2 and check_merge and not allow_unclean:
             current_tree = subprocess.check_output([GIT, 'show', '--format=%T', current_commit]).decode('utf8').splitlines()[0]
-            recreated_tree = subprocess.check_output([GIT, "merge-tree", parents[0], parents[1]]).decode('utf8').splitlines()[0]
+
+            # This merge-tree functionality requires git >= 2.38. The
+            # --write-tree option was added in order to opt-in to the new
+            # behavior. Older versions of git will not recognize the option and
+            # will instead exit with code 128.
+            try:
+                recreated_tree = subprocess.check_output([GIT, "merge-tree", "--write-tree", parents[0], parents[1]]).decode('utf8').splitlines()[0]
+            except subprocess.CalledProcessError as e:
+                if e.returncode == 128:
+                    print("git v2.38+ is required for this functionality.", file=sys.stderr)
+                    sys.exit(1)
+                else:
+                    raise e
+
             if current_tree != recreated_tree:
                 print("Merge commit {} is not clean".format(current_commit), file=sys.stderr)
                 subprocess.call([GIT, 'diff', recreated_tree, current_tree])

From 9382fc22d64246d346b3b0f1bbb5db78bc0f5108 Mon Sep 17 00:00:00 2001
From: Konstantin Akimov <knstqq@gmail.com>
Date: Mon, 3 Nov 2025 15:06:04 +0700
Subject: [PATCH 359/656] refactor: use GetRpcResult helper to avoid duplicated
 string literals for rpc help

---
 src/evo/core_write.cpp |  1 +
 src/rpc/quorums.cpp    | 15 ++++++---------
 2 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/src/evo/core_write.cpp b/src/evo/core_write.cpp
index 4e83e8bc4630..0779abe51893 100644
--- a/src/evo/core_write.cpp
+++ b/src/evo/core_write.cpp
@@ -58,6 +58,7 @@ const std::map<std::string, RPCResult> RPCRESULT_MAP{{
     RESULT_MAP_ENTRY("PoSeRevivedHeight", RPCResult::Type::NUM, "Height masternode recovered from Proof of Service violations"),
     RESULT_MAP_ENTRY("proTxHash", RPCResult::Type::STR_HEX, "Hash of the masternode's initial ProRegTx"),
     RESULT_MAP_ENTRY("pubKeyOperator", RPCResult::Type::STR, "BLS public key used for operator signing"),
+    RESULT_MAP_ENTRY("quorumIndex", RPCResult::Type::NUM, "Quorum index. Relevant for rotation quorums only, 0 for non-rotating quorums"),
     RESULT_MAP_ENTRY("quorumHash", RPCResult::Type::STR_HEX, "Hash of the quorum"),
     RESULT_MAP_ENTRY("quorumSig", RPCResult::Type::STR_HEX, "BLS recovered threshold signature of quorum"),
     RESULT_MAP_ENTRY("registeredHeight", RPCResult::Type::NUM, "Height masternode was registered"),
diff --git a/src/rpc/quorums.cpp b/src/rpc/quorums.cpp
index 99b2258162e9..540f8cfa46a1 100644
--- a/src/rpc/quorums.cpp
+++ b/src/rpc/quorums.cpp
@@ -248,7 +248,7 @@ static RPCHelpMan quorum_info()
             {
                 {RPCResult::Type::NUM, "height", "Quorum Height"},
                 {RPCResult::Type::STR, "type", "Quorum type"},
-                {RPCResult::Type::STR_HEX, "quorumHash", "Quorum hash"},
+                GetRpcResult("quorumHash"),
                 {RPCResult::Type::NUM, "quorumIndex", "Quorum index (applicable only to rotated quorums)."},
                 {RPCResult::Type::STR_HEX, "minedBlock", "Blockhash where the commitment was mined."},
                 {RPCResult::Type::NUM, "previousConsecutiveDKGFailures", "Number of previous consecutive DKG failures."},
@@ -256,13 +256,10 @@ static RPCHelpMan quorum_info()
                     {
                         {RPCResult::Type::OBJ, "", "",
                         {
-                            {RPCResult::Type::STR_HEX, "proTxHash", "ProTx of collaterial"},
-                            {RPCResult::Type::STR, "service", "Address of node. Legacy, will be deprecated in further versions. See `addresses` instead."},
-                            {RPCResult::Type::ARR, "addresses", "Addresses of node",
-                                // TODO - expand it when extended addresses are fully implemented
-                                {{RPCResult::Type::ELISION, "", ""}},
-                            },
-                            {RPCResult::Type::STR_HEX, "pubKeyOperator", "The operator BLS public key"},
+                            GetRpcResult("proTxHash"),
+                            GetRpcResult("service"),
+                            GetRpcResult("addresses"),
+                            GetRpcResult("pubKeyOperator"),
                             {RPCResult::Type::BOOL, "valid", "True is member valid for this DKG"}
                         }},
                     },
@@ -316,7 +313,7 @@ static RPCHelpMan quorum_dkgstatus()
                         {RPCResult::Type::OBJ, "", "",
                         {
                             {RPCResult::Type::NUM, "llmqType", "Name of quorum"},
-                            {RPCResult::Type::NUM, "quorumIndex", "Relevant for rotation quorums only, 0 for non-rotating quorums"},
+                            GetRpcResult("quorumIndex"),
                             {RPCResult::Type::OBJ, "status", "",
                             {
                                 // TODO: list fields of output for RPC help instead ELISION

From b91c5b93ef37c816fd561c3bca58f51207115c2b Mon Sep 17 00:00:00 2001
From: Kittywhiskers Van Gogh <63189531+kwvg@users.noreply.github.com>
Date: Mon, 3 Nov 2025 15:41:38 +0530
Subject: [PATCH 360/656] merge bitcoin#22949: Round up fee calculation to
 avoid a lower than expected feerate

---
 src/policy/feerate.cpp                    |  6 ++++-
 src/policy/feerate.h                      |  1 +
 src/test/amount_tests.cpp                 | 10 ++++----
 test/functional/rpc_fundrawtransaction.py | 30 +++++++++++++++++++++++
 test/functional/test_framework/util.py    | 18 +++++++++++---
 test/functional/wallet_keypool_hd.py      |  2 +-
 6 files changed, 57 insertions(+), 10 deletions(-)

diff --git a/src/policy/feerate.cpp b/src/policy/feerate.cpp
index bde00572071b..c05c02f423e7 100644
--- a/src/policy/feerate.cpp
+++ b/src/policy/feerate.cpp
@@ -7,6 +7,8 @@
 #include <policy/feerate.h>
 #include <tinyformat.h>
 
+#include <cmath>
+
 CFeeRate::CFeeRate(const CAmount& nFeePaid, uint32_t num_bytes)
 {
     const int64_t nSize{num_bytes};
@@ -22,7 +24,9 @@ CAmount CFeeRate::GetFee(uint32_t num_bytes) const
 {
     const int64_t nSize{num_bytes};
 
-    CAmount nFee = nSatoshisPerK * nSize / 1000;
+    // Be explicit that we're converting from a double to int64_t (CAmount) here.
+    // We've previously had issues with the silent double->int64_t conversion.
+    CAmount nFee{static_cast<CAmount>(std::ceil(nSatoshisPerK * nSize / 1000.0))};
 
     if (nFee == 0 && nSize != 0) {
         if (nSatoshisPerK > 0) nFee = CAmount(1);
diff --git a/src/policy/feerate.h b/src/policy/feerate.h
index 0fa18a1a2e6b..7b7e6c5d38dd 100644
--- a/src/policy/feerate.h
+++ b/src/policy/feerate.h
@@ -54,6 +54,7 @@ class CFeeRate
 
     /**
      * Return the fee in satoshis for the given size in vbytes.
+     * If the calculated fee would have fractional satoshis, then the returned fee will always be rounded up to the nearest satoshi.
      */
     CAmount GetFee(uint32_t num_bytes) const;
 
diff --git a/src/test/amount_tests.cpp b/src/test/amount_tests.cpp
index 8a194632ee3b..92c04852587f 100644
--- a/src/test/amount_tests.cpp
+++ b/src/test/amount_tests.cpp
@@ -48,13 +48,13 @@ BOOST_AUTO_TEST_CASE(GetFeeTest)
     BOOST_CHECK_EQUAL(feeRate.GetFee(9e3), CAmount(-9e3));
 
     feeRate = CFeeRate(123);
-    // Truncates the result, if not integer
+    // Rounds up the result, if not integer
     BOOST_CHECK_EQUAL(feeRate.GetFee(0), CAmount(0));
     BOOST_CHECK_EQUAL(feeRate.GetFee(8), CAmount(1)); // Special case: returns 1 instead of 0
-    BOOST_CHECK_EQUAL(feeRate.GetFee(9), CAmount(1));
-    BOOST_CHECK_EQUAL(feeRate.GetFee(121), CAmount(14));
-    BOOST_CHECK_EQUAL(feeRate.GetFee(122), CAmount(15));
-    BOOST_CHECK_EQUAL(feeRate.GetFee(999), CAmount(122));
+    BOOST_CHECK_EQUAL(feeRate.GetFee(9), CAmount(2));
+    BOOST_CHECK_EQUAL(feeRate.GetFee(121), CAmount(15));
+    BOOST_CHECK_EQUAL(feeRate.GetFee(122), CAmount(16));
+    BOOST_CHECK_EQUAL(feeRate.GetFee(999), CAmount(123));
     BOOST_CHECK_EQUAL(feeRate.GetFee(1e3), CAmount(123));
     BOOST_CHECK_EQUAL(feeRate.GetFee(9e3), CAmount(1107));
 
diff --git a/test/functional/rpc_fundrawtransaction.py b/test/functional/rpc_fundrawtransaction.py
index d0f720a51191..721eb3b055a2 100755
--- a/test/functional/rpc_fundrawtransaction.py
+++ b/test/functional/rpc_fundrawtransaction.py
@@ -132,6 +132,7 @@ def run_test(self):
         self.test_include_unsafe()
         self.test_external_inputs()
         self.test_22670()
+        self.test_feerate_rounding()
 
     def test_change_position(self):
         """Ensure setting changePosition in fundraw with an exact match is handled properly."""
@@ -1080,5 +1081,34 @@ def do_fund_send(target):
         do_fund_send(lower_bound)
         do_fund_send(upper_bound)
 
+        self.restart_node(0, [])
+        self.connect_nodes(0, 1)
+        self.connect_nodes(0, 2)
+        self.connect_nodes(0, 3)
+
+    def test_feerate_rounding(self):
+        self.log.info("Test that rounding of GetFee does not result in an assertion")
+
+        self.nodes[1].createwallet("roundtest")
+        w = self.nodes[1].get_wallet_rpc("roundtest")
+
+        addr = w.getnewaddress()
+        self.nodes[0].sendtoaddress(addr, 1)
+        self.generate(self.nodes[0], 1)
+        self.sync_all()
+
+        # A P2WPKH input costs 68 vbytes; With a single P2WPKH output, the rest of the tx is 42 vbytes for a total of 110 vbytes.
+        # At a feerate of 1.85 sat/vb, the input will need a fee of 125.8 sats and the rest 77.7 sats
+        # The entire tx fee should be 203.5 sats.
+        # Coin selection rounds the fee individually instead of at the end (due to how CFeeRate::GetFee works).
+        # If rounding down (which is the incorrect behavior), then the calculated fee will be 125 + 77 = 202.
+        # If rounding up, then the calculated fee will be 126 + 78 = 204.
+        # In the former case, the calculated needed fee is higher than the actual fee being paid, so an assertion is reached
+        # To test this does not happen, we subtract 202 sats from the input value. If working correctly, this should
+        # fail with insufficient funds rather than bitcoind asserting.
+        rawtx = w.createrawtransaction(inputs=[], outputs=[{self.nodes[0].getnewaddress(): 1 - 0.00000202}])
+        assert_raises_rpc_error(-4, "Insufficient funds", w.fundrawtransaction, rawtx, {"fee_rate": 1.85})
+
+
 if __name__ == '__main__':
     RawTransactionsTest().main()
diff --git a/test/functional/test_framework/util.py b/test/functional/test_framework/util.py
index 107bd72cc6c3..fad1187846db 100644
--- a/test/functional/test_framework/util.py
+++ b/test/functional/test_framework/util.py
@@ -43,12 +43,12 @@ def assert_approx(v, vexp, vspan=0.00001):
 
 def assert_fee_amount(fee, tx_size, feerate_DASH_kvB):
     """Assert the fee is in range."""
-    feerate_DASH_vB = feerate_DASH_kvB / 1000
-    target_fee = satoshi_round(tx_size * feerate_DASH_vB)
+    target_fee = get_fee(tx_size, feerate_DASH_kvB)
     if fee < target_fee:
         raise AssertionError("Fee of %s DASH too low! (Should be %s DASH)" % (str(fee), str(target_fee)))
     # allow the wallet's estimation to be at most 2 bytes off
-    if fee > (tx_size + 2) * feerate_DASH_vB:
+    high_fee = get_fee(tx_size + 2, feerate_DASH_kvB)
+    if fee > high_fee:
         raise AssertionError("Fee of %s DASH too high! (Should be %s DASH)" % (str(fee), str(target_fee)))
 
 
@@ -242,6 +242,18 @@ def random_bitflip(data):
     return bytes(data)
 
 
+def ceildiv(a, b):
+    """Divide 2 ints and round up to next int rather than round down"""
+    return -(-a // b)
+
+
+def get_fee(tx_size, feerate_dash_kvb):
+    """Calculate the fee in DASH given a feerate is DASH/kvB. Reflects CFeeRate::GetFee"""
+    feerate_sat_kvb = int(feerate_dash_kvb * Decimal(1e8)) # Fee in sat/kvb as an int to avoid float precision errors
+    target_fee_sat = ceildiv(feerate_sat_kvb * tx_size, 1000) # Round calculated fee up to nearest sat
+    return satoshi_round(target_fee_sat / Decimal(1e8)) # Truncate DASH result to nearest sat
+
+
 def satoshi_round(amount):
     return Decimal(amount).quantize(Decimal('0.00000001'), rounding=ROUND_DOWN)
 
diff --git a/test/functional/wallet_keypool_hd.py b/test/functional/wallet_keypool_hd.py
index 8a6cc31321a7..7892b4f2fb53 100755
--- a/test/functional/wallet_keypool_hd.py
+++ b/test/functional/wallet_keypool_hd.py
@@ -215,7 +215,7 @@ def run_test(self):
         assert_equal("psbt" in res, True)
 
         # create a transaction without change at the maximum fee rate, such that the output is still spendable:
-        res = w2.walletcreatefundedpsbt(inputs=[], outputs=[{destination: 0.00010000}], options={"subtractFeeFromOutputs": [0], "feeRate": 0.00008824})
+        res = w2.walletcreatefundedpsbt(inputs=[], outputs=[{destination: 0.00010000}], options={"subtractFeeFromOutputs": [0], "feeRate": 0.00008822})
         assert_equal("psbt" in res, True)
         assert_equal(res["fee"], Decimal("0.00001694"))
 

From af0e14d59e713d53b17fb8388fc8b99ccaded9f1 Mon Sep 17 00:00:00 2001
From: Kittywhiskers Van Gogh <63189531+kwvg@users.noreply.github.com>
Date: Mon, 3 Nov 2025 03:20:04 +0530
Subject: [PATCH 361/656] merge bitcoin#26723: call `keypoolrefill` with priv
 key disabled should throw an error

---
 test/functional/wallet_keypool_hd.py | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/test/functional/wallet_keypool_hd.py b/test/functional/wallet_keypool_hd.py
index 7892b4f2fb53..78f66161c419 100755
--- a/test/functional/wallet_keypool_hd.py
+++ b/test/functional/wallet_keypool_hd.py
@@ -223,5 +223,9 @@ def run_test(self):
         res = w2.walletcreatefundedpsbt(inputs=[], outputs=[{destination: 0.00010000}], options={"subtractFeeFromOutputs": [0], "feeRate": 0.000010, "changeAddress": addr.pop()})
         assert_equal("psbt" in res, True)
 
+        if not self.options.descriptors:
+            msg = "Error: Private keys are disabled for this wallet"
+            assert_raises_rpc_error(-4, msg, w2.keypoolrefill, 100)
+
 if __name__ == '__main__':
     KeyPoolTest().main()

From 51a9f24eed0b71006580b2704327d85347851431 Mon Sep 17 00:00:00 2001
From: Kittywhiskers Van Gogh <63189531+kwvg@users.noreply.github.com>
Date: Sat, 30 Oct 2021 22:22:40 +0800
Subject: [PATCH 362/656] merge bitcoin#23395: Add -shutdownnotify option

---
 doc/release-notes-6901.md                |  8 ++++++++
 src/init.cpp                             | 17 +++++++++++++++++
 test/functional/feature_notifications.py |  8 ++++++++
 3 files changed, 33 insertions(+)
 create mode 100644 doc/release-notes-6901.md

diff --git a/doc/release-notes-6901.md b/doc/release-notes-6901.md
new file mode 100644
index 000000000000..6efdf775b694
--- /dev/null
+++ b/doc/release-notes-6901.md
@@ -0,0 +1,8 @@
+Notable changes
+===============
+
+New settings
+------------
+
+- The `shutdownnotify` option is used to specify a command to execute synchronously
+before Dash Core has begun its shutdown sequence.
diff --git a/src/init.cpp b/src/init.cpp
index 466101abac17..e856e9bdeeca 100644
--- a/src/init.cpp
+++ b/src/init.cpp
@@ -224,8 +224,24 @@ static fs::path GetPidFile(const ArgsManager& args)
 // shutdown thing.
 //
 
+#if HAVE_SYSTEM
+static void ShutdownNotify(const ArgsManager& args)
+{
+    std::vector<std::thread> threads;
+    for (const auto& cmd : args.GetArgs("-shutdownnotify")) {
+        threads.emplace_back(runCommand, cmd);
+    }
+    for (auto& t : threads) {
+        t.join();
+    }
+}
+#endif
+
 void Interrupt(NodeContext& node)
 {
+#if HAVE_SYSTEM
+    ShutdownNotify(*node.args);
+#endif
     InterruptHTTPServer();
     InterruptHTTPRPC();
     InterruptRPC();
@@ -552,6 +568,7 @@ void SetupServerArgs(ArgsManager& argsman)
     argsman.AddArg("-syncmempool", strprintf("Sync mempool from other nodes on start (default: %u)", DEFAULT_SYNC_MEMPOOL), ArgsManager::ALLOW_ANY, OptionsCategory::OPTIONS);
 #if HAVE_SYSTEM
     argsman.AddArg("-startupnotify=<cmd>", "Execute command on startup.", ArgsManager::ALLOW_ANY, OptionsCategory::OPTIONS);
+    argsman.AddArg("-shutdownnotify=<cmd>", "Execute command immediately before beginning shutdown. The need for shutdown may be urgent, so be careful not to delay it long (if the command doesn't require interaction with the server, consider having it fork into the background).", ArgsManager::ALLOW_ANY, OptionsCategory::OPTIONS);
 #endif
 #ifndef WIN32
     argsman.AddArg("-sysperms", "Create new files with system default permissions, instead of umask 077 (only effective with disabled wallet functionality)", ArgsManager::ALLOW_ANY, OptionsCategory::OPTIONS);
diff --git a/test/functional/feature_notifications.py b/test/functional/feature_notifications.py
index bbee9f863f8c..07058f8ded64 100755
--- a/test/functional/feature_notifications.py
+++ b/test/functional/feature_notifications.py
@@ -34,11 +34,14 @@ def setup_network(self):
         self.alertnotify_dir = os.path.join(self.options.tmpdir, "alertnotify")
         self.blocknotify_dir = os.path.join(self.options.tmpdir, "blocknotify")
         self.walletnotify_dir = os.path.join(self.options.tmpdir, "walletnotify")
+        self.shutdownnotify_dir = os.path.join(self.options.tmpdir, "shutdownnotify")
+        self.shutdownnotify_file = os.path.join(self.shutdownnotify_dir, "shutdownnotify.txt")
         self.chainlocknotify_dir = os.path.join(self.options.tmpdir, "chainlocknotify")
         self.instantsendnotify_dir = os.path.join(self.options.tmpdir, "instantsendnotify")
         os.mkdir(self.alertnotify_dir)
         os.mkdir(self.blocknotify_dir)
         os.mkdir(self.walletnotify_dir)
+        os.mkdir(self.shutdownnotify_dir)
         os.mkdir(self.chainlocknotify_dir)
         os.mkdir(self.instantsendnotify_dir)
 
@@ -47,6 +50,7 @@ def setup_network(self):
         self.extra_args = [[
             f"-alertnotify=echo > {os.path.join(self.alertnotify_dir, '%s')}",
             f"-blocknotify=echo > {os.path.join(self.blocknotify_dir, '%s')}",
+            f"-shutdownnotify=echo > {self.shutdownnotify_file}",
             f"-chainlocknotify=echo > {os.path.join(self.chainlocknotify_dir, '%s')}",
         ], [
             "-rescan",
@@ -145,6 +149,10 @@ def run_test(self):
 
         # TODO: add test for `-alertnotify` large fork notifications
 
+        self.log.info("test -shutdownnotify")
+        self.stop_nodes()
+        self.wait_until(lambda: os.path.isfile(self.shutdownnotify_file), timeout=10)
+
     def expect_wallet_notify(self, tx_details):
         self.wait_until(lambda: len(os.listdir(self.walletnotify_dir)) >= len(tx_details), timeout=10)
         # Should have no more and no less files than expected

From 5bed6eadc226d2a2f416a0d150a3ade62c847256 Mon Sep 17 00:00:00 2001
From: Kittywhiskers Van Gogh <63189531+kwvg@users.noreply.github.com>
Date: Thu, 29 Jul 2021 15:57:45 +0800
Subject: [PATCH 363/656] merge bitcoin#27016: require miniupnpc API version 17
 or later

---
 configure.ac        |  9 +++++----
 doc/dependencies.md |  2 +-
 src/mapport.cpp     | 10 +++-------
 3 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/configure.ac b/configure.ac
index 1a3d2066dd4f..10898c110c8e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1518,14 +1518,15 @@ if test "$use_upnp" != "no"; then
     [AC_CHECK_LIB([miniupnpc], [upnpDiscover], [MINIUPNPC_LIBS="$MINIUPNPC_LIBS -lminiupnpc"], [have_miniupnpc=no], [$MINIUPNPC_LIBS])],
     [have_miniupnpc=no]
   )
-  dnl The minimum supported miniUPnPc API version is set to 10. This keeps compatibility
-  dnl with Ubuntu 16.04 LTS and Debian 8 libminiupnpc-dev packages.
+
+  dnl The minimum supported miniUPnPc API version is set to 17. This excludes
+  dnl versions with known vulnerabilities.
   if test "$have_miniupnpc" != "no"; then
     AC_MSG_CHECKING([whether miniUPnPc API version is supported])
     AC_PREPROC_IFELSE([AC_LANG_PROGRAM([[
         @%:@include <miniupnpc/miniupnpc.h>
       ]], [[
-        #if MINIUPNPC_API_VERSION >= 10
+        #if MINIUPNPC_API_VERSION >= 17
         // Everything is okay
         #else
         #  error miniUPnPc API version is too old
@@ -1534,7 +1535,7 @@ if test "$use_upnp" != "no"; then
         AC_MSG_RESULT([yes])
       ],[
       AC_MSG_RESULT([no])
-      AC_MSG_WARN([miniUPnPc API version < 10 is unsupported, disabling UPnP support.])
+      AC_MSG_WARN([miniUPnPc API version < 17 is unsupported, disabling UPnP support.])
       have_miniupnpc=no
     ])
   fi
diff --git a/doc/dependencies.md b/doc/dependencies.md
index e16bf1705095..aae6cd2b00fc 100644
--- a/doc/dependencies.md
+++ b/doc/dependencies.md
@@ -39,7 +39,7 @@ You can find installation instructions in the `build-*.md` file for your platfor
 | Dependency | Releases | Version used | Minimum required | Runtime |
 | --- | --- | --- | --- | --- |
 | [libnatpmp](../depends/packages/libnatpmp.mk) | [link](https://github.com/miniupnp/libnatpmp/) | commit [07004b9...](https://github.com/miniupnp/libnatpmp/tree/07004b97cf691774efebe70404cf22201e4d330d) | | No |
-| [MiniUPnPc](../depends/packages/miniupnpc.mk) | [link](https://miniupnp.tuxfamily.org/) | [2.2.2](https://github.com/bitcoin/bitcoin/pull/20421) | 1.9 | No |
+| [MiniUPnPc](../depends/packages/miniupnpc.mk) | [link](https://miniupnp.tuxfamily.org/) | [2.2.2](https://github.com/bitcoin/bitcoin/pull/20421) | 2.1 | No |
 
 ### Notifications
 | Dependency | Releases | Version used | Minimum required | Runtime |
diff --git a/src/mapport.cpp b/src/mapport.cpp
index 85d65e39c5c5..d45ff9b3bd4b 100644
--- a/src/mapport.cpp
+++ b/src/mapport.cpp
@@ -26,9 +26,9 @@
 #include <miniupnpc/miniupnpc.h>
 #include <miniupnpc/upnpcommands.h>
 #include <miniupnpc/upnperrors.h>
-// The minimum supported miniUPnPc API version is set to 10. This keeps compatibility
-// with Ubuntu 16.04 LTS and Debian 8 libminiupnpc-dev packages.
-static_assert(MINIUPNPC_API_VERSION >= 10, "miniUPnPc API version >= 10 assumed");
+// The minimum supported miniUPnPc API version is set to 17. This excludes
+// versions with known vulnerabilities.
+static_assert(MINIUPNPC_API_VERSION >= 17, "miniUPnPc API version >= 17 assumed");
 #endif // USE_UPNP
 
 #include <atomic>
@@ -158,11 +158,7 @@ static bool ProcessUpnp()
     char lanaddr[64];
 
     int error = 0;
-#if MINIUPNPC_API_VERSION < 14
-    devlist = upnpDiscover(2000, multicastif, minissdpdpath, 0, 0, &error);
-#else
     devlist = upnpDiscover(2000, multicastif, minissdpdpath, 0, 0, 2, &error);
-#endif
 
     struct UPNPUrls urls;
     struct IGDdatas data;

From de6c0ae51793d53293a36feaeef85b80efcf79c9 Mon Sep 17 00:00:00 2001
From: Kittywhiskers Van Gogh <63189531+kwvg@users.noreply.github.com>
Date: Thu, 2 Mar 2023 14:43:43 +0100
Subject: [PATCH 364/656] merge bitcoin#27189: Use steady clock in
 SeedStrengthen, FindBestImplementation, FlushStateToDisk

---
 ci/dash/lint-tidy.sh           |  2 ++
 src/node/minisketchwrapper.cpp |  8 ++++----
 src/random.cpp                 | 14 +++++++-------
 src/util/time.h                |  2 +-
 src/validation.cpp             |  8 ++++----
 src/validation.h               |  4 ++--
 6 files changed, 20 insertions(+), 18 deletions(-)

diff --git a/ci/dash/lint-tidy.sh b/ci/dash/lint-tidy.sh
index 9899718039e1..b186650db63e 100755
--- a/ci/dash/lint-tidy.sh
+++ b/ci/dash/lint-tidy.sh
@@ -24,10 +24,12 @@ iwyu_tool.py \
   "src/dbwrapper.cpp" \
   "src/init" \
   "src/node/chainstate.cpp" \
+  "src/node/minisketchwrapper.cpp" \
   "src/policy/feerate.cpp" \
   "src/policy/packages.cpp" \
   "src/policy/settings.cpp" \
   "src/primitives/transaction.cpp" \
+  "src/random.cpp" \
   "src/rpc/fees.cpp" \
   "src/rpc/signmessage.cpp" \
   "src/test/fuzz/txorphan.cpp" \
diff --git a/src/node/minisketchwrapper.cpp b/src/node/minisketchwrapper.cpp
index 67e823cb6827..96707f7a0a95 100644
--- a/src/node/minisketchwrapper.cpp
+++ b/src/node/minisketchwrapper.cpp
@@ -23,17 +23,17 @@ static constexpr uint32_t BITS = 32;
 
 uint32_t FindBestImplementation()
 {
-    std::optional<std::pair<int64_t, uint32_t>> best;
+    std::optional<std::pair<SteadyClock::duration, uint32_t>> best;
 
     uint32_t max_impl = Minisketch::MaxImplementation();
     for (uint32_t impl = 0; impl <= max_impl; ++impl) {
-        std::vector<int64_t> benches;
+        std::vector<SteadyClock::duration> benches;
         uint64_t offset = 0;
         /* Run a little benchmark with capacity 32, adding 184 entries, and decoding 11 of them once. */
         for (int b = 0; b < 11; ++b) {
             if (!Minisketch::ImplementationSupported(BITS, impl)) break;
             Minisketch sketch(BITS, impl, 32);
-            auto start = GetTimeMicros();
+            auto start = SteadyClock::now();
             for (uint64_t e = 0; e < 100; ++e) {
                 sketch.Add(e*1337 + b*13337 + offset);
             }
@@ -41,7 +41,7 @@ uint32_t FindBestImplementation()
                 sketch.Add(e*1337 + b*13337 + offset);
             }
             offset += (*sketch.Decode(32))[0];
-            auto stop = GetTimeMicros();
+            auto stop = SteadyClock::now();
             benches.push_back(stop - start);
         }
         /* Remember which implementation has the best median benchmark time. */
diff --git a/src/random.cpp b/src/random.cpp
index a7626224603b..8f565000d9d6 100644
--- a/src/random.cpp
+++ b/src/random.cpp
@@ -295,14 +295,14 @@ static void SeedHardwareSlow(CSHA512& hasher) noexcept {
 }
 
 /** Use repeated SHA512 to strengthen the randomness in seed32, and feed into hasher. */
-static void Strengthen(const unsigned char (&seed)[32], int microseconds, CSHA512& hasher) noexcept
+static void Strengthen(const unsigned char (&seed)[32], SteadyClock::duration dur, CSHA512& hasher) noexcept
 {
     CSHA512 inner_hasher;
     inner_hasher.Write(seed, sizeof(seed));
 
     // Hash loop
     unsigned char buffer[64];
-    int64_t stop = GetTimeMicros() + microseconds;
+    const auto stop{SteadyClock::now() + dur};
     do {
         for (int i = 0; i < 1000; ++i) {
             inner_hasher.Finalize(buffer);
@@ -312,7 +312,7 @@ static void Strengthen(const unsigned char (&seed)[32], int microseconds, CSHA51
         // Benchmark operation and feed it into outer hasher.
         int64_t perf = GetPerformanceCounter();
         hasher.Write((const unsigned char*)&perf, sizeof(perf));
-    } while (GetTimeMicros() < stop);
+    } while (SteadyClock::now() < stop);
 
     // Produce output from inner state and feed it to outer hasher.
     inner_hasher.Finalize(buffer);
@@ -566,13 +566,13 @@ static void SeedSlow(CSHA512& hasher, RNGState& rng) noexcept
 }
 
 /** Extract entropy from rng, strengthen it, and feed it into hasher. */
-static void SeedStrengthen(CSHA512& hasher, RNGState& rng, int microseconds) noexcept
+static void SeedStrengthen(CSHA512& hasher, RNGState& rng, SteadyClock::duration dur) noexcept
 {
     // Generate 32 bytes of entropy from the RNG, and a copy of the entropy already in hasher.
     unsigned char strengthen_seed[32];
     rng.MixExtract(strengthen_seed, sizeof(strengthen_seed), CSHA512(hasher), false);
     // Strengthen the seed, and feed it into hasher.
-    Strengthen(strengthen_seed, microseconds, hasher);
+    Strengthen(strengthen_seed, dur, hasher);
 }
 
 static void SeedPeriodic(CSHA512& hasher, RNGState& rng) noexcept
@@ -592,7 +592,7 @@ static void SeedPeriodic(CSHA512& hasher, RNGState& rng) noexcept
     LogPrint(BCLog::RANDOM, "Feeding %i bytes of dynamic environment data into RNG\n", hasher.Size() - old_size);
 
     // Strengthen for 10 ms
-    SeedStrengthen(hasher, rng, 10000);
+    SeedStrengthen(hasher, rng, 10ms);
 }
 
 static void SeedStartup(CSHA512& hasher, RNGState& rng) noexcept
@@ -612,7 +612,7 @@ static void SeedStartup(CSHA512& hasher, RNGState& rng) noexcept
     LogPrint(BCLog::RANDOM, "Feeding %i bytes of environment data into RNG\n", hasher.Size() - old_size);
 
     // Strengthen for 100 ms
-    SeedStrengthen(hasher, rng, 100000);
+    SeedStrengthen(hasher, rng, 100ms);
 }
 
 enum class RNGLevel {
diff --git a/src/util/time.h b/src/util/time.h
index 177e2e56dd7a..2e71818802c1 100644
--- a/src/util/time.h
+++ b/src/util/time.h
@@ -8,7 +8,7 @@
 
 #include <compat/compat.h>
 
-#include <chrono>
+#include <chrono> // IWYU pragma: export
 #include <cstdint>
 #include <string>
 
diff --git a/src/validation.cpp b/src/validation.cpp
index 080b7bd9c7f3..cb6214facd03 100644
--- a/src/validation.cpp
+++ b/src/validation.cpp
@@ -2815,12 +2815,12 @@ bool CChainState::FlushStateToDisk(
                 }
             }
         }
-        const auto nNow = GetTime<std::chrono::microseconds>();
+        const auto nNow{SteadyClock::now()};
         // Avoid writing/flushing immediately after startup.
-        if (m_last_write.count() == 0) {
+        if (m_last_write == decltype(m_last_write){}) {
             m_last_write = nNow;
         }
-        if (m_last_flush.count() == 0) {
+        if (m_last_flush == decltype(m_last_flush){}) {
             m_last_flush = nNow;
         }
         // The cache is large and we're within 10% and 10 MiB of the limit, but we have time now (not in the middle of a block processing).
@@ -2892,7 +2892,7 @@ bool CChainState::FlushStateToDisk(
             m_last_flush = nNow;
             full_flush_completed = true;
             TRACE5(utxocache, flush,
-                   (int64_t)(GetTimeMicros() - nNow.count()), // in microseconds (µs)
+                   int64_t{Ticks<std::chrono::microseconds>(SteadyClock::now() - nNow)},
                    (uint32_t)mode,
                    (uint64_t)coins_count,
                    (uint64_t)coins_mem_usage,
diff --git a/src/validation.h b/src/validation.h
index 4e7b2febe34f..21a57c25ecf2 100644
--- a/src/validation.h
+++ b/src/validation.h
@@ -818,8 +818,8 @@ class CChainState
     void UpdateTip(const CBlockIndex* pindexNew)
         EXCLUSIVE_LOCKS_REQUIRED(::cs_main);
 
-    std::chrono::microseconds m_last_write{0};
-    std::chrono::microseconds m_last_flush{0};
+    SteadyClock::time_point m_last_write{};
+    SteadyClock::time_point m_last_flush{};
 
     friend ChainstateManager;
 };

From 2eef89c0291b49ab73d680487347631bc4b4bc8a Mon Sep 17 00:00:00 2001
From: Kittywhiskers Van Gogh <63189531+kwvg@users.noreply.github.com>
Date: Thu, 23 Mar 2023 13:52:22 -0400
Subject: [PATCH 365/656] merge bitcoin#27317: Check that the timestamp string
 is non-empty to avoid undefined behavior

---
 src/logging.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/logging.cpp b/src/logging.cpp
index 1b8dc8a91ae4..293ac4463d34 100644
--- a/src/logging.cpp
+++ b/src/logging.cpp
@@ -395,7 +395,7 @@ std::string BCLog::Logger::LogTimestampStr(const std::string& str)
     if (m_started_new_line) {
         int64_t nTimeMicros = GetTimeMicros();
         strStamped = FormatISO8601DateTime(nTimeMicros/1000000);
-        if (m_log_time_micros) {
+        if (m_log_time_micros && !strStamped.empty()) {
             strStamped.pop_back();
             strStamped += strprintf(".%06dZ", nTimeMicros%1000000);
         }

From 485ee374b3b33b22f0d5d10ad026bd90e58a8d37 Mon Sep 17 00:00:00 2001
From: UdjinM6 <UdjinM6@users.noreply.github.com>
Date: Sun, 2 Nov 2025 22:55:02 +0300
Subject: [PATCH 366/656] fix: dashify error in dash-wallet tool

---
 src/wallet/dump.cpp            | 2 +-
 test/functional/tool_wallet.py | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/wallet/dump.cpp b/src/wallet/dump.cpp
index 9e36a864b3ac..8f86eb1b2ddc 100644
--- a/src/wallet/dump.cpp
+++ b/src/wallet/dump.cpp
@@ -153,7 +153,7 @@ bool CreateFromDump(const ArgsManager& args, const std::string& name, const fs::
         return false;
     }
     if (ver != DUMP_VERSION) {
-        error = strprintf(_("Error: Dumpfile version is not supported. This version of bitcoin-wallet only supports version 1 dumpfiles. Got dumpfile with version %s"), version_value);
+        error = strprintf(_("Error: Dumpfile version is not supported. This version of dash-wallet only supports version 1 dumpfiles. Got dumpfile with version %s"), version_value);
         dump_file.close();
         return false;
     }
diff --git a/test/functional/tool_wallet.py b/test/functional/tool_wallet.py
index 585a229d4d96..e7f9d6293f34 100755
--- a/test/functional/tool_wallet.py
+++ b/test/functional/tool_wallet.py
@@ -367,12 +367,12 @@ def test_dump_createfromdump(self):
         bad_ver_wallet_dump = os.path.join(self.nodes[0].datadir, "wallet-bad_ver1.dump")
         dump_data["BITCOIN_CORE_WALLET_DUMP"] = "0"
         self.write_dump(dump_data, bad_ver_wallet_dump)
-        self.assert_raises_tool_error('Error: Dumpfile version is not supported. This version of bitcoin-wallet only supports version 1 dumpfiles. Got dumpfile with version 0', '-wallet=badload', '-dumpfile={}'.format(bad_ver_wallet_dump), 'createfromdump')
+        self.assert_raises_tool_error('Error: Dumpfile version is not supported. This version of dash-wallet only supports version 1 dumpfiles. Got dumpfile with version 0', '-wallet=badload', '-dumpfile={}'.format(bad_ver_wallet_dump), 'createfromdump')
         assert not os.path.isdir(os.path.join(self.nodes[0].datadir, "regtest/wallets", "badload"))
         bad_ver_wallet_dump = os.path.join(self.nodes[0].datadir, "wallet-bad_ver2.dump")
         dump_data["BITCOIN_CORE_WALLET_DUMP"] = "2"
         self.write_dump(dump_data, bad_ver_wallet_dump)
-        self.assert_raises_tool_error('Error: Dumpfile version is not supported. This version of bitcoin-wallet only supports version 1 dumpfiles. Got dumpfile with version 2', '-wallet=badload', '-dumpfile={}'.format(bad_ver_wallet_dump), 'createfromdump')
+        self.assert_raises_tool_error('Error: Dumpfile version is not supported. This version of dash-wallet only supports version 1 dumpfiles. Got dumpfile with version 2', '-wallet=badload', '-dumpfile={}'.format(bad_ver_wallet_dump), 'createfromdump')
         assert not os.path.isdir(os.path.join(self.nodes[0].datadir, "regtest/wallets", "badload"))
         bad_magic_wallet_dump = os.path.join(self.nodes[0].datadir, "wallet-bad_magic.dump")
         del dump_data["BITCOIN_CORE_WALLET_DUMP"]

From 2883bdd5c5aef719108607a65013b8952b871e50 Mon Sep 17 00:00:00 2001
From: Konstantin Akimov <knstqq@gmail.com>
Date: Tue, 4 Nov 2025 02:58:55 +0700
Subject: [PATCH 367/656] fix: refactor one more missing `quorumIndex` usage to
 GetRpcResult

Co-authored-by: Kittywhiskers Van Gogh <63189531+kwvg@users.noreply.github.com>
---
 src/rpc/quorums.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/rpc/quorums.cpp b/src/rpc/quorums.cpp
index 540f8cfa46a1..92e578476b47 100644
--- a/src/rpc/quorums.cpp
+++ b/src/rpc/quorums.cpp
@@ -249,7 +249,7 @@ static RPCHelpMan quorum_info()
                 {RPCResult::Type::NUM, "height", "Quorum Height"},
                 {RPCResult::Type::STR, "type", "Quorum type"},
                 GetRpcResult("quorumHash"),
-                {RPCResult::Type::NUM, "quorumIndex", "Quorum index (applicable only to rotated quorums)."},
+                GetRpcResult("quorumIndex"),
                 {RPCResult::Type::STR_HEX, "minedBlock", "Blockhash where the commitment was mined."},
                 {RPCResult::Type::NUM, "previousConsecutiveDKGFailures", "Number of previous consecutive DKG failures."},
                 {RPCResult::Type::ARR, "members", "Members of quorum",

From 6531d8f42e79a49e3e2f6928829610cb9a74ae37 Mon Sep 17 00:00:00 2001
From: fanquake <fanquake@gmail.com>
Date: Wed, 17 Aug 2022 14:42:51 +0100
Subject: [PATCH 368/656] Merge bitcoin/bitcoin#25829: build: include
 share/rpcauth in release tarball

495caa9a0149a87c4148fbae1b622c998c019d40 build: add example bitcoin conf to win installer (fanquake)
0eac1f7ba49eacf7a87fcb25dff762c4d28a2509 build: include share/rpcauth in tarball & installer (fanquake)

Pull request description:

  Fixes #19081.
  Addresses: https://github.com/bitcoin/bitcoin/pull/22235#discussion_r946359661.

  Guix Build (x86_64):
  ```bash
  bdc14efe02553703f3f27438b17ee452fc0b08e37f626830857c60a7740ec990  guix-build-495caa9a0149/output/aarch64-linux-gnu/SHA256SUMS.part
  0c541efd8e2e52f1915cab13c935f165f906e46590175d568be34e026b5f0d9e  guix-build-495caa9a0149/output/aarch64-linux-gnu/bitcoin-495caa9a0149-aarch64-linux-gnu-debug.tar.gz
  5ee15e11e0d52d5a2df6b6a60e4ae5b3adc4b259294ad53452478f28efbe70c8  guix-build-495caa9a0149/output/aarch64-linux-gnu/bitcoin-495caa9a0149-aarch64-linux-gnu.tar.gz
  451152a282fd79db45a09e0ccb3491e3044ea5ad0931dfe2820bb5c45839a311  guix-build-495caa9a0149/output/arm-linux-gnueabihf/SHA256SUMS.part
  b88159ac78d427556e7f70e5da3b849da5491c98fa08c16c25adbfa8e3b44b58  guix-build-495caa9a0149/output/arm-linux-gnueabihf/bitcoin-495caa9a0149-arm-linux-gnueabihf-debug.tar.gz
  54b59e4d06144d18b97a0260330383dafdcf3473b560c71f6304a8d1b9ef0100  guix-build-495caa9a0149/output/arm-linux-gnueabihf/bitcoin-495caa9a0149-arm-linux-gnueabihf.tar.gz
  784f43a651ed6f9335117ca971c7c215eba536414792edf72a0dc372c901c3fa  guix-build-495caa9a0149/output/arm64-apple-darwin/SHA256SUMS.part
  ace525b20dc4789c931cf781027680e5fe35bd987c8d1908590cd83ce7e44495  guix-build-495caa9a0149/output/arm64-apple-darwin/bitcoin-495caa9a0149-arm64-apple-darwin-unsigned.dmg
  1ab6d5d91040567e4fccb4e2de49789f78bd1ce9b4a496486d837904591bfbc6  guix-build-495caa9a0149/output/arm64-apple-darwin/bitcoin-495caa9a0149-arm64-apple-darwin-unsigned.tar.gz
  a5cd681e67beda05cac83d133d6996699effb12b9830b269669057d02b0a4eef  guix-build-495caa9a0149/output/arm64-apple-darwin/bitcoin-495caa9a0149-arm64-apple-darwin.tar.gz
  01cc3a078a952ed9bbff38e79bad4885a5f8502906498f7b909cb2cc798ada64  guix-build-495caa9a0149/output/dist-archive/bitcoin-495caa9a0149.tar.gz
  d4652f912573d0c9ce11d7e84fad10ad03f67247f85b0a5d9c47db74508705ce  guix-build-495caa9a0149/output/powerpc64-linux-gnu/SHA256SUMS.part
  76facbb81819b2d81afd61e2234b65d99c9e28b28f2b1d3ee2d7119cf192ba60  guix-build-495caa9a0149/output/powerpc64-linux-gnu/bitcoin-495caa9a0149-powerpc64-linux-gnu-debug.tar.gz
  a75cef05abb05da4a1ba81669f6a66ecc790946b6b2fd3749bad0b462bb50219  guix-build-495caa9a0149/output/powerpc64-linux-gnu/bitcoin-495caa9a0149-powerpc64-linux-gnu.tar.gz
  2b2ac79848a643f025960cabca2694cb3537d72d83477ed1b53bcc6e2ee11ce4  guix-build-495caa9a0149/output/powerpc64le-linux-gnu/SHA256SUMS.part
  d0542623109fb72d72dcd06f8de30edefdd7e0f1bf46a7be7c262c0e631c49d8  guix-build-495caa9a0149/output/powerpc64le-linux-gnu/bitcoin-495caa9a0149-powerpc64le-linux-gnu-debug.tar.gz
  b85dbcbe4f50cbddcd167568d31326d62e786720cb237aaf3d11b69394f01983  guix-build-495caa9a0149/output/powerpc64le-linux-gnu/bitcoin-495caa9a0149-powerpc64le-linux-gnu.tar.gz
  a85a00d353338d2e72a4218782e05a816f21aea0637eb21742c55ee9a9ce1f7b  guix-build-495caa9a0149/output/riscv64-linux-gnu/SHA256SUMS.part
  e10561b08a91a22947ead27b6d4a07581fa566eb3e5d8161f97b2ff2708b85f4  guix-build-495caa9a0149/output/riscv64-linux-gnu/bitcoin-495caa9a0149-riscv64-linux-gnu-debug.tar.gz
  994aca800c2580349a436fb1fa8195cd943363dee5c3ee7c91d726cc95cd3068  guix-build-495caa9a0149/output/riscv64-linux-gnu/bitcoin-495caa9a0149-riscv64-linux-gnu.tar.gz
  5a063e6dbf64aca4a639fea10fcff2f7a533819607558cec25a9a88bc575c0dc  guix-build-495caa9a0149/output/x86_64-apple-darwin/SHA256SUMS.part
  e7f36749c3a48ce7173ee100abb275eb217eee2713d52d8b576f8c749e0c2e9e  guix-build-495caa9a0149/output/x86_64-apple-darwin/bitcoin-495caa9a0149-x86_64-apple-darwin-unsigned.dmg
  b0289c6caba5e092d8e287c9cb4f328844bce04fce74de91e76821423b7b8153  guix-build-495caa9a0149/output/x86_64-apple-darwin/bitcoin-495caa9a0149-x86_64-apple-darwin-unsigned.tar.gz
  2bf983abcfd0d782632ef7fb116ba169a0b282264774c032a50beca016468ed0  guix-build-495caa9a0149/output/x86_64-apple-darwin/bitcoin-495caa9a0149-x86_64-apple-darwin.tar.gz
  72705350ab34f8d33ef98e5563f36aa82f15e7b450e3914f591b9c88e8b385da  guix-build-495caa9a0149/output/x86_64-linux-gnu/SHA256SUMS.part
  7b5285bfd28acf8ae1471807962d31857afe70e13ae087a8aec83d5a8ac1a184  guix-build-495caa9a0149/output/x86_64-linux-gnu/bitcoin-495caa9a0149-x86_64-linux-gnu-debug.tar.gz
  6544591754607792b731fe630bf8235e78e08c7edb4d1d210b35d6328240acc1  guix-build-495caa9a0149/output/x86_64-linux-gnu/bitcoin-495caa9a0149-x86_64-linux-gnu.tar.gz
  bbd6490489ddfde06b6cde602d317d84c09495de3cf033016ea0ba5e60770fdb  guix-build-495caa9a0149/output/x86_64-w64-mingw32/SHA256SUMS.part
  f48f6efcf5822517a697d990eddbc03011b08c5e4be4886e25ab65c8a0951aaa  guix-build-495caa9a0149/output/x86_64-w64-mingw32/bitcoin-495caa9a0149-win64-debug.zip
  b1a83e58d7b316c4743ae16d552f615aa710a4985ded5834d1de6fe6437ca3b2  guix-build-495caa9a0149/output/x86_64-w64-mingw32/bitcoin-495caa9a0149-win64-setup-unsigned.exe
  0196abf8cb27f3cb03b4688a85a97c26975db4938f7a2dc0a09f11847f6530bb  guix-build-495caa9a0149/output/x86_64-w64-mingw32/bitcoin-495caa9a0149-win64-unsigned.tar.gz
  426994640e85f82b3d3bee25f07930f952edf4a60ecd7ba41f83c82cbbcc63d1  guix-build-495caa9a0149/output/x86_64-w64-mingw32/bitcoin-495caa9a0149-win64.zip
  ```

  Guix Build (arm64):
  ```bash
  506a2fade794398ec38cf9c59ca0b454fdcbb0080d7e40f1ace698a7b08eef77  guix-build-cf39913e5748/output/arm-linux-gnueabihf/SHA256SUMS.part
  8ec3686ba80709eb024ea02b7b493e70af82383d814b105f157c94a86cb7efd6  guix-build-cf39913e5748/output/arm-linux-gnueabihf/bitcoin-cf39913e5748-arm-linux-gnueabihf-debug.tar.gz
  4d9b3456c974f7f47dca64bcc994fa04888bf08518c902d12366798829a9100d  guix-build-cf39913e5748/output/arm-linux-gnueabihf/bitcoin-cf39913e5748-arm-linux-gnueabihf.tar.gz
  7c74610dcaa1dbb7fcadb2ad59520fdfa3fa02f26ceb88ada178ac35a0644840  guix-build-cf39913e5748/output/arm64-apple-darwin/SHA256SUMS.part
  fca59c367d2b5891186c546bd87ed66dcc4f0b11433b54c49ad72aa5e0e49978  guix-build-cf39913e5748/output/arm64-apple-darwin/bitcoin-cf39913e5748-arm64-apple-darwin-unsigned.dmg
  467e5c2eeaccac995d14b41f5418ba783b31ee7c63d76d5fce5e667bd6ef6683  guix-build-cf39913e5748/output/arm64-apple-darwin/bitcoin-cf39913e5748-arm64-apple-darwin-unsigned.tar.gz
  1f19caa059cd6b4adcc089f90ce33fe7f679b3a4beb970b3ef5c3292fe5841ee  guix-build-cf39913e5748/output/arm64-apple-darwin/bitcoin-cf39913e5748-arm64-apple-darwin.tar.gz
  ea07945bf21cbe306e8afc815ccb5f4a363fb7335239fe35b3668bdef43f735a  guix-build-cf39913e5748/output/dist-archive/bitcoin-cf39913e5748.tar.gz
  b699ae65b899192ad5afbe6a069d2113fda92b833f7db31a1487e7c4c04440f5  guix-build-cf39913e5748/output/powerpc64-linux-gnu/SHA256SUMS.part
  eeced64cd3e49ecd95ec29623f7cd3afe66ceffb8296af646ee4e1f3fe658ab0  guix-build-cf39913e5748/output/powerpc64-linux-gnu/bitcoin-cf39913e5748-powerpc64-linux-gnu-debug.tar.gz
  20181015752a5d7bfc0d173fefb554b785ca0e566ffef443da6673d6a63ef10d  guix-build-cf39913e5748/output/powerpc64-linux-gnu/bitcoin-cf39913e5748-powerpc64-linux-gnu.tar.gz
  59338187f551f1c043e80f63c897899365fca4872b4d793e71423c1aa7ff1358  guix-build-cf39913e5748/output/powerpc64le-linux-gnu/SHA256SUMS.part
  33d5d3113f176da881df06f5121d6003ae7f4e2d8124da805db1edab39161e81  guix-build-cf39913e5748/output/powerpc64le-linux-gnu/bitcoin-cf39913e5748-powerpc64le-linux-gnu-debug.tar.gz
  b5e9d3bf3e02aa6e3419c9f35118cb71323e0e01280b907e48fc335f8981cb6d  guix-build-cf39913e5748/output/powerpc64le-linux-gnu/bitcoin-cf39913e5748-powerpc64le-linux-gnu.tar.gz
  ef5d9f2449ad570221209194af4c4824fc70cfacbaa020da24b9186212b81c5f  guix-build-cf39913e5748/output/riscv64-linux-gnu/SHA256SUMS.part
  aafee42808b8bb2cdccbd919470bee2a1c9fcbb05daea32d15aa56288db7fc09  guix-build-cf39913e5748/output/riscv64-linux-gnu/bitcoin-cf39913e5748-riscv64-linux-gnu-debug.tar.gz
  72e2f3c9a48f8f3f14ecac2e6a8645253a32bfad8a857d13824aedd1796cad6f  guix-build-cf39913e5748/output/riscv64-linux-gnu/bitcoin-cf39913e5748-riscv64-linux-gnu.tar.gz
  8637b4e85eb2d7be803e813fbf15ee597aa35c9910b4b413d657fa69c4d4569d  guix-build-cf39913e5748/output/x86_64-apple-darwin/SHA256SUMS.part
  7b384d2734bfd650f3f8096aa32b2aa6bddfee137c3e27ac75736989f7e6740e  guix-build-cf39913e5748/output/x86_64-apple-darwin/bitcoin-cf39913e5748-x86_64-apple-darwin-unsigned.dmg
  06960637c9322c3b97bb58331b3282e770b02b7b4d95100866a96c31400a9bb9  guix-build-cf39913e5748/output/x86_64-apple-darwin/bitcoin-cf39913e5748-x86_64-apple-darwin-unsigned.tar.gz
  cc524e73d9441fc0e396c6ae5847d9b395d27f8bfe65703520792ea509191e2e  guix-build-cf39913e5748/output/x86_64-apple-darwin/bitcoin-cf39913e5748-x86_64-apple-darwin.tar.gz
  d99a7a48aa3a226d7f87c26dd4d6f12109e71fcb9f41052c0bcf5ba4bad1c408  guix-build-cf39913e5748/output/x86_64-linux-gnu/SHA256SUMS.part
  f2598fedf273244499f9481253f5114db2e299e132f5378c312f684d0a190f5f  guix-build-cf39913e5748/output/x86_64-linux-gnu/bitcoin-cf39913e5748-x86_64-linux-gnu-debug.tar.gz
  2151744dae55c460ad0c919101fcb845872060eef957d3ae0672f12098fa87b0  guix-build-cf39913e5748/output/x86_64-linux-gnu/bitcoin-cf39913e5748-x86_64-linux-gnu.tar.gz
  6087d880cced5f30d9b70b592c91efc5677f470f82cc9ed00e0fc112ff36ac43  guix-build-cf39913e5748/output/x86_64-w64-mingw32/SHA256SUMS.part
  e91e48edb8819cd25b6d6b5f5421473c56859dbb17cf32108e906877097d454d  guix-build-cf39913e5748/output/x86_64-w64-mingw32/bitcoin-cf39913e5748-win64-debug.zip
  ee4987cb94dcf4b5dfee65341a7a4f7b0865f1466c715c033a05591a749d43c3  guix-build-cf39913e5748/output/x86_64-w64-mingw32/bitcoin-cf39913e5748-win64-setup-unsigned.exe
  43001b416664ea227d3f07100d8a60bcd20c761770a332374a1466d7af734127  guix-build-cf39913e5748/output/x86_64-w64-mingw32/bitcoin-cf39913e5748-win64-unsigned.tar.gz
  bb9a56856800e7d6e5c602302ec90704cb5dd917f52d122d783deee3ab1f149d  guix-build-cf39913e5748/output/x86_64-w64-mingw32/bitcoin-cf39913e5748-win64.zip
  ```

ACKs for top commit:
  hebasto:
    ACK 495caa9a0149a87c4148fbae1b622c998c019d40, tested `bitcoin-495caa9a0149-win64-setup-unsigned.exe` on Windows 11 Pro:
  josibake:
    ACK https://github.com/bitcoin/bitcoin/pull/25829/commits/495caa9a0149a87c4148fbae1b622c998c019d40

Tree-SHA512: aca9101aec9b517defc915c213af7c2fec0c254c13374e13bff715e1ee771a20fc1b487457d48809af0b82321c0be8c23c5e02444fadfca53bc6bfe16c0f4239
---
 contrib/guix/libexec/build.sh | 2 ++
 share/setup.nsi.in            | 5 +++++
 2 files changed, 7 insertions(+)

diff --git a/contrib/guix/libexec/build.sh b/contrib/guix/libexec/build.sh
index 16e06fd22030..5f9b62e32cce 100755
--- a/contrib/guix/libexec/build.sh
+++ b/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
diff --git a/share/setup.nsi.in b/share/setup.nsi.in
index 58abe0e86a5e..ad6791c7868a 100644
--- a/share/setup.nsi.in
+++ b/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

From e378eebb865f6e7bcea41c193e0da132f192153c Mon Sep 17 00:00:00 2001
From: fanquake <fanquake@gmail.com>
Date: Thu, 9 Dec 2021 17:08:56 +0800
Subject: [PATCH 369/656] Merge bitcoin/bitcoin#23703: scripted-diff: Use named
 args in RPC docs

fa9aaf8694c63200ad01fd5659aba4f409b2c3b9 scripted-diff: Use named args in RPC docs (MarcoFalke)

Pull request description:

  Incorrect named args are source of bugs, like #22979.

  To allow them being checked by `clang-tidy`, use a format it can understand.

ACKs for top commit:
  fanquake:
    ACK fa9aaf8694c63200ad01fd5659aba4f409b2c3b9 - checked `clang-tidy` and it's fine here, (but throwing errors in other files. i.e `wallet/test/wallet_tests.cpp`).

Tree-SHA512: e09dae8ee999a5c4819e6f848c12139593ca0e915e645c8fabeb97c379188fb9104d286c02c71f590abc64cdec125f78026735f83e016111976baa49d588a9bc
---
 src/rpc/output_script.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/rpc/output_script.cpp b/src/rpc/output_script.cpp
index 2e238ecfbab9..ad26dd77c168 100644
--- a/src/rpc/output_script.cpp
+++ b/src/rpc/output_script.cpp
@@ -40,10 +40,10 @@ static RPCHelpMan validateaddress()
             RPCResult::Type::OBJ, "", "",
             {
                 {RPCResult::Type::BOOL, "isvalid", "If the address is valid or not"},
-                {RPCResult::Type::STR, "address", /* optional */ true, "The Dash address validated"},
-                {RPCResult::Type::STR_HEX, "scriptPubKey", /* optional */ true, "The hex-encoded scriptPubKey generated by the address"},
-                {RPCResult::Type::BOOL, "isscript", /* optional */ true, "If the key is a script"},
-                {RPCResult::Type::STR, "error", /* optional */ true, "Error message, if any"},
+                {RPCResult::Type::STR, "address", /*optional=*/true, "The Dash address validated"},
+                {RPCResult::Type::STR_HEX, "scriptPubKey", /*optional=*/true, "The hex-encoded scriptPubKey generated by the address"},
+                {RPCResult::Type::BOOL, "isscript", /*optional=*/true, "If the key is a script"},
+                {RPCResult::Type::STR, "error", /*optional=*/true, "Error message, if any"},
             }
         },
         RPCExamples{

From 46a187a2398109200204b4e2b4f9c9164507a77d Mon Sep 17 00:00:00 2001
From: MacroFake <falke.marco@gmail.com>
Date: Fri, 5 Aug 2022 10:49:12 +0200
Subject: [PATCH 370/656] Merge bitcoin/bitcoin#25650: script: default to
 necessary tags in `test/get_previous_releases.py`

BACKPORT NOTE:
removed also sources from list of hashes as they have no usage

21a9e94dbbc47939f19fbfe39d85cb8ff2ea206a ci: remove hardcoded tag list from ci scripts (josibake)
d530ba390e7703433d3a77673c9a2b52bc446901 doc: update test/README.md (josibake)
614d4682badaadac74b825a45aaee9c2309a3e81 script: default to necessary tags in get_previous_releases.py (josibake)

Pull request description:

  Almost every time I need to use this script, I forget the tag list is needed and that a specific set of tags is needed for the backwards compatibility tests to work. I end up wasting time reading through the script and googling to find the tag list before remembering it is in `test/README.md`

  I assume (hope) I'm not the only one this happens to, so I figured it would make more sense to have the script default to downloading/building the necessary tags. This has the added benefit of making the script the source of truth: the script already needs to be updated with the SHA256_SUM of the binary for every new tag that is added, so it makes sense to use `SHA256_SUMS` list as the necessary tag list. This means there is less risk of the README and the script drifting (i.e updating the readme with a new tag and forgetting to update the script, or updating the script and forgetting to update the README). Now all that needs to happen is to update the `SHA256_SUMS` list in the script and everything Just Works (TM)

ACKs for top commit:
  Sjors:
    re-tACK 21a9e94dbbc47939f19fbfe39d85cb8ff2ea206a

Tree-SHA512: 97b488227a89a6827584edd251820a7074fad75dfd7f26f1aa5f858e2521d2e02effd0f11e6dc4676e1155d3d5aba6ff94a4b58ffef80dc201376afd5927deb9
---
 ci/dash/test_integrationtests.sh   |   6 +-
 ci/test/00_setup_env_native_qt5.sh |   2 +-
 ci/test/05_before_script.sh        |   4 +-
 test/README.md                     |   6 +-
 test/get_previous_releases.py      | 166 ++++++++++++++---------------
 5 files changed, 92 insertions(+), 92 deletions(-)

diff --git a/ci/dash/test_integrationtests.sh b/ci/dash/test_integrationtests.sh
index 6fcca71fcf50..b4b0304b2ad8 100755
--- a/ci/dash/test_integrationtests.sh
+++ b/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"
diff --git a/ci/test/00_setup_env_native_qt5.sh b/ci/test/00_setup_env_native_qt5.sh
index a455569645a7..a2ff43d07e02 100755
--- a/ci/test/00_setup_env_native_qt5.sh
+++ b/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"
diff --git a/ci/test/05_before_script.sh b/ci/test/05_before_script.sh
index fa847fb0802b..e8043f65dfd7 100755
--- a/ci/test/05_before_script.sh
+++ b/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
diff --git a/test/README.md b/test/README.md
index 3e65cea21497..548d360afe32 100644
--- a/test/README.md
+++ b/test/README.md
@@ -100,12 +100,14 @@ Run all possible tests with
 test/functional/test_runner.py --extended
 ```
 
-In order to run backwards compatibility tests, download the previous node binaries:
+In order to run backwards compatibility tests, first run:
 
 ```
-test/get_previous_releases.py -b 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
+test/get_previous_releases.py -b
 ```
 
+to download the necessary previous release binaries.
+
 By default, up to 4 tests will be run in parallel by test_runner. To specify
 how many jobs to run, append `--jobs=n`
 
diff --git a/test/get_previous_releases.py b/test/get_previous_releases.py
index c1d19b2df0a8..6ffcf09803e9 100755
--- a/test/get_previous_releases.py
+++ b/test/get_previous_releases.py
@@ -20,95 +20,88 @@
 import hashlib
 
 SHA256_SUMS = {
-    "df54756e801d85d2e37ea76ff001692e897dd39b3479a5c7c4a6530da04ea4a5":  "dashcore-21.1.1-aarch64-linux-gnu.tar.gz",
-    "6f22cef0e4bc9411fbd134878efba5c53a946d5bf49aa322668c6c51191905fd":  "dashcore-21.1.1-arm-linux-gnueabihf.tar.gz",
-    "cd6543c015a6b811ae2efe33036516155940df836e871f9608b3e8869077dc71":  "dashcore-21.1.1-arm64-apple-darwin.dmg",
-    "389d7dc821b20151b7b1d48d254ece787f8d1a47f5e8e5b6c2219966c77cc88c":  "dashcore-21.1.1-arm64-apple-darwin.tar.gz",
-    "84f14a1029d663a93b025d2a048be48369179d68c2345475c4334366fbbc429c":  "dashcore-21.1.1-riscv64-linux-gnu.tar.gz",
-    "4f021df967029d154480df390f1c5d2d8252a6c3855df27bc0d63fb17ff8f1de":  "dashcore-21.1.1-win64-setup.exe",
-    "47b815bac18676b0640ee3347aee8220402d0b60d39446704e9b4d4b1e0fc117":  "dashcore-21.1.1-win64.zip",
-    "f232337045b54474769162c8c1ec6897eb5cefa4dfc084f92533febf92db867d":  "dashcore-21.1.1-x86_64-apple-darwin.dmg",
-    "0766aa341354e5e098975f1a530e9d15c4558b46c02dc356f02247c83165a0ef":  "dashcore-21.1.1-x86_64-apple-darwin.tar.gz",
-    "c3157d4a82a3cb7c904a68e827bd1e629854fefcc0dcaf1de4343a810a190bf5":  "dashcore-21.1.1-x86_64-linux-gnu.tar.gz",
-    "49ab5a9b71dd3e16afaf6b9ad0ccdedef23098b0cf9ab822336a7fbc033cc3e8":  "dashcore-21.1.1.tar.gz",
+    "df54756e801d85d2e37ea76ff001692e897dd39b3479a5c7c4a6530da04ea4a5": {"tag": "v21.1.1", "tarball": "dashcore-21.1.1-aarch64-linux-gnu.tar.gz"},
+    "6f22cef0e4bc9411fbd134878efba5c53a946d5bf49aa322668c6c51191905fd": {"tag": "v21.1.1", "tarball": "dashcore-21.1.1-arm-linux-gnueabihf.tar.gz"},
+    "cd6543c015a6b811ae2efe33036516155940df836e871f9608b3e8869077dc71": {"tag": "v21.1.1", "tarball": "dashcore-21.1.1-arm64-apple-darwin.dmg"},
+    "389d7dc821b20151b7b1d48d254ece787f8d1a47f5e8e5b6c2219966c77cc88c": {"tag": "v21.1.1", "tarball": "dashcore-21.1.1-arm64-apple-darwin.tar.gz"},
+    "84f14a1029d663a93b025d2a048be48369179d68c2345475c4334366fbbc429c": {"tag": "v21.1.1", "tarball": "dashcore-21.1.1-riscv64-linux-gnu.tar.gz"},
+    "4f021df967029d154480df390f1c5d2d8252a6c3855df27bc0d63fb17ff8f1de": {"tag": "v21.1.1", "tarball": "dashcore-21.1.1-win64-setup.exe"},
+    "47b815bac18676b0640ee3347aee8220402d0b60d39446704e9b4d4b1e0fc117": {"tag": "v21.1.1", "tarball": "dashcore-21.1.1-win64.zip"},
+    "f232337045b54474769162c8c1ec6897eb5cefa4dfc084f92533febf92db867d": {"tag": "v21.1.1", "tarball": "dashcore-21.1.1-x86_64-apple-darwin.dmg"},
+    "0766aa341354e5e098975f1a530e9d15c4558b46c02dc356f02247c83165a0ef": {"tag": "v21.1.1", "tarball": "dashcore-21.1.1-x86_64-apple-darwin.tar.gz"},
+    "c3157d4a82a3cb7c904a68e827bd1e629854fefcc0dcaf1de4343a810a190bf5": {"tag": "v21.1.1", "tarball": "dashcore-21.1.1-x86_64-linux-gnu.tar.gz"},
     #
-    "96e363f8042cd50f27c908d46fa8bf0b4ab928c6320df60fb4e16077fa95654f":  "dashcore-20.1.1-aarch64-linux-gnu.tar.gz",
-    "159fe58921a9ce731b0529c86dae14f8d2b5ea0522c5a605ce4e80c105b15b73":  "dashcore-20.1.1-arm-linux-gnueabihf.tar.gz",
-    "d6d87100363bf91c234fd010ef309c8d1240e2cf79caabebfe3ae3926772befb":  "dashcore-20.1.1-arm64-apple-darwin.dmg",
-    "62596a2537b74c1e17cb5c89ab45a662014a909f1dfd157c3a5c7cd85df69d6c":  "dashcore-20.1.1-arm64-apple-darwin.tar.gz",
-    "143b87ddcaa45e58c9fbd97d29d41cab3f2eb519a4fc89759857db1bc2fb3f19":  "dashcore-20.1.1-riscv64-linux-gnu.tar.gz",
-    "e66b83266e2361db6562501d9984c97cbcf249a5531c82228f5d7004178ec39e":  "dashcore-20.1.1-win64-setup.exe",
-    "e42c0273dd23652306b9b9c78040fe3dc9231680fb6aea2d7d88cc2794a534b1":  "dashcore-20.1.1-win64.zip",
-    "f8ce10ea2ba353260cf2b02ca308e7f0756525ae4966e7444d04096ccfbde886":  "dashcore-20.1.1-x86_64-apple-darwin.dmg",
-    "2ca3b24ad0008c789ee752eaae67105208ab2448c3bf1cc57b3ee84bf787bb27":  "dashcore-20.1.1-x86_64-apple-darwin.tar.gz",
-    "825e902373f2eb84301111b16899fbfe1b099f16dd6bbb460b51af2bab301872":  "dashcore-20.1.1-x86_64-linux-gnu.tar.gz",
-    "7cf315093a1d79a79837926e5eccd17c8d40b3ee124ad700484811a38e22fe78":  "dashcore-20.1.1.tar.gz",
+    "96e363f8042cd50f27c908d46fa8bf0b4ab928c6320df60fb4e16077fa95654f": {"tag": "v20.1.1", "tarball": "dashcore-20.1.1-aarch64-linux-gnu.tar.gz"},
+    "159fe58921a9ce731b0529c86dae14f8d2b5ea0522c5a605ce4e80c105b15b73": {"tag": "v20.1.1", "tarball": "dashcore-20.1.1-arm-linux-gnueabihf.tar.gz"},
+    "d6d87100363bf91c234fd010ef309c8d1240e2cf79caabebfe3ae3926772befb": {"tag": "v20.1.1", "tarball": "dashcore-20.1.1-arm64-apple-darwin.dmg"},
+    "62596a2537b74c1e17cb5c89ab45a662014a909f1dfd157c3a5c7cd85df69d6c": {"tag": "v20.1.1", "tarball": "dashcore-20.1.1-arm64-apple-darwin.tar.gz"},
+    "143b87ddcaa45e58c9fbd97d29d41cab3f2eb519a4fc89759857db1bc2fb3f19": {"tag": "v20.1.1", "tarball": "dashcore-20.1.1-riscv64-linux-gnu.tar.gz"},
+    "e66b83266e2361db6562501d9984c97cbcf249a5531c82228f5d7004178ec39e": {"tag": "v20.1.1", "tarball": "dashcore-20.1.1-win64-setup.exe"},
+    "e42c0273dd23652306b9b9c78040fe3dc9231680fb6aea2d7d88cc2794a534b1": {"tag": "v20.1.1", "tarball": "dashcore-20.1.1-win64.zip"},
+    "f8ce10ea2ba353260cf2b02ca308e7f0756525ae4966e7444d04096ccfbde886": {"tag": "v20.1.1", "tarball": "dashcore-20.1.1-x86_64-apple-darwin.dmg"},
+    "2ca3b24ad0008c789ee752eaae67105208ab2448c3bf1cc57b3ee84bf787bb27": {"tag": "v20.1.1", "tarball": "dashcore-20.1.1-x86_64-apple-darwin.tar.gz"},
+    "825e902373f2eb84301111b16899fbfe1b099f16dd6bbb460b51af2bab301872": {"tag": "v20.1.1", "tarball": "dashcore-20.1.1-x86_64-linux-gnu.tar.gz"},
     #
-    "a4b555b47f5f9a5a01fc5d3b543731088bd10a65dd7fa81fb552818146e424b5":  "dashcore-19.3.0-aarch64-linux-gnu.tar.gz",
-    "531bb188c1aea808ef6f3533d71182a51958136f6e43d9fcadaef1a5fcdd0468":  "dashcore-19.3.0-osx.dmg",
-    "1b4673a2bd71f9f2b593c2d71386e60f4744b59b57142707f0045ed49c92024b":  "dashcore-19.3.0-osx64.tar.gz",
-    "d23cd59ab3a230ebb9bd34fa6329e0d157ecfdbd133f171dfdfa08039d0b3983":  "dashcore-19.3.0-riscv64-linux-gnu.tar.gz",
-    "b5c1860440f97dbb79b1d79bcc48fb2dcc7f0915dd0c4f9fc77aba9cab0294f3":  "dashcore-19.3.0-win64-setup.exe",
-    "8a288189bd4b7c23bb1f917256290dd606d9d47a533dcede0c6190a8f4722e1a":  "dashcore-19.3.0-win64.zip",
-    "c2f3ff5631094abe16af8e476d1197be8685ee20601deda5cad0c34fc879c3de":  "dashcore-19.3.0-x86_64-linux-gnu.tar.gz",
-    "b4bb6bec21213e47586607657e69b0a53905e3c32e2e8e650e93db54dce572d8":  "dashcore-19.3.0.tar.gz",
+    "a4b555b47f5f9a5a01fc5d3b543731088bd10a65dd7fa81fb552818146e424b5": {"tag": "v19.3.0", "tarball": "dashcore-19.3.0-aarch64-linux-gnu.tar.gz"},
+    "531bb188c1aea808ef6f3533d71182a51958136f6e43d9fcadaef1a5fcdd0468": {"tag": "v19.3.0", "tarball": "dashcore-19.3.0-osx.dmg"},
+    "1b4673a2bd71f9f2b593c2d71386e60f4744b59b57142707f0045ed49c92024b": {"tag": "v19.3.0", "tarball": "dashcore-19.3.0-osx64.tar.gz"},
+    "d23cd59ab3a230ebb9bd34fa6329e0d157ecfdbd133f171dfdfa08039d0b3983": {"tag": "v19.3.0", "tarball": "dashcore-19.3.0-riscv64-linux-gnu.tar.gz"},
+    "b5c1860440f97dbb79b1d79bcc48fb2dcc7f0915dd0c4f9fc77aba9cab0294f3": {"tag": "v19.3.0", "tarball": "dashcore-19.3.0-win64-setup.exe"},
+    "8a288189bd4b7c23bb1f917256290dd606d9d47a533dcede0c6190a8f4722e1a": {"tag": "v19.3.0", "tarball": "dashcore-19.3.0-win64.zip"},
+    "c2f3ff5631094abe16af8e476d1197be8685ee20601deda5cad0c34fc879c3de": {"tag": "v19.3.0", "tarball": "dashcore-19.3.0-x86_64-linux-gnu.tar.gz"},
     #
-    "2870149fda49e731fdf67951408e8b9a1f21f4d91693add0287fe6abb7f8e5b4":  "dashcore-19.1.0-aarch64-linux-gnu.tar.gz",
-    "900f6209831f1a21be7ed51edd48a6312fdfb8759fac94b77b23d77484254356":  "dashcore-19.1.0-osx64.tar.gz",
-    "4ff370e904f08f9b31727535c5ccdde616d7cdee2fb9396aa887910fc87702ff":  "dashcore-19.1.0-osx.dmg",
-    "49fb6cc79429cd46e57b9b1197c863dac5ca56a17004596d9cc364f5fcf395f8":  "dashcore-19.1.0-riscv64-linux-gnu.tar.gz",
-    "4aad6aedd3b45ae8c5279ad6ee886e7d80a1faa59be9bae882bdd6df68992990":  "dashcore-19.1.0-x86_64-linux-gnu.tar.gz",
+    "2870149fda49e731fdf67951408e8b9a1f21f4d91693add0287fe6abb7f8e5b4": {"tag": "v19.1.0", "tarball": "dashcore-19.1.0-aarch64-linux-gnu.tar.gz"},
+    "900f6209831f1a21be7ed51edd48a6312fdfb8759fac94b77b23d77484254356": {"tag": "v19.1.0", "tarball": "dashcore-19.1.0-osx64.tar.gz"},
+    "4ff370e904f08f9b31727535c5ccdde616d7cdee2fb9396aa887910fc87702ff": {"tag": "v19.1.0", "tarball": "dashcore-19.1.0-osx.dmg"},
+    "49fb6cc79429cd46e57b9b1197c863dac5ca56a17004596d9cc364f5fcf395f8": {"tag": "v19.1.0", "tarball": "dashcore-19.1.0-riscv64-linux-gnu.tar.gz"},
+    "4aad6aedd3b45ae8c5279ad6ee886e7d80a1faa59be9bae882bdd6df68992990": {"tag": "v19.1.0", "tarball": "dashcore-19.1.0-x86_64-linux-gnu.tar.gz"},
     #
-    "d7907726666e9266f5eae830789a1c36cf8c84b43bc0c0fab907317a5cc03f09":  "dashcore-18.2.2-aarch64-linux-gnu.tar.gz",
-    "b70c5fb7c916f093840b9adb6f0287488843e0e69b403e99ed0bc93d34e24f85":  "dashcore-18.2.2-osx.dmg",
-    "9b376e99400a3b0cb8e777477cf07567c36ed65018e4becbd98eebfbcca3efee":  "dashcore-18.2.2-osx64.tar.gz",
-    "091d704b58e51171fcad7de24ea6d9db644834cfa5df610517a9528a70b9c4cf":  "dashcore-18.2.2-riscv64-linux-gnu.tar.gz",
-    "be3f3c7f3f98198837dc6739cc99126f9de6ddb38c0cf6d291068a65e3c6dede":  "dashcore-18.2.2-win64-setup.exe",
-    "ade7b79182443a04b101a4a51cdc402425e583873aafa44a136e4937f89bde61":  "dashcore-18.2.2-win64.zip",
-    "ebe3170835232c0a1e7456712fbb285d5749cbf3cfb5de29f8db3a2ad81be1cf":  "dashcore-18.2.2-x86_64-linux-gnu.tar.gz",
-    "76c5c44961d30d570c430325fe145fbd413c8038e88994dc6c93fa2da4dc2dd7":  "dashcore-18.2.2.tar.gz",
+    "d7907726666e9266f5eae830789a1c36cf8c84b43bc0c0fab907317a5cc03f09": {"tag": "v18.2.2", "tarball": "dashcore-18.2.2-aarch64-linux-gnu.tar.gz"},
+    "b70c5fb7c916f093840b9adb6f0287488843e0e69b403e99ed0bc93d34e24f85": {"tag": "v18.2.2", "tarball": "dashcore-18.2.2-osx.dmg"},
+    "9b376e99400a3b0cb8e777477cf07567c36ed65018e4becbd98eebfbcca3efee": {"tag": "v18.2.2", "tarball": "dashcore-18.2.2-osx64.tar.gz"},
+    "091d704b58e51171fcad7de24ea6d9db644834cfa5df610517a9528a70b9c4cf": {"tag": "v18.2.2", "tarball": "dashcore-18.2.2-riscv64-linux-gnu.tar.gz"},
+    "be3f3c7f3f98198837dc6739cc99126f9de6ddb38c0cf6d291068a65e3c6dede": {"tag": "v18.2.2", "tarball": "dashcore-18.2.2-win64-setup.exe"},
+    "ade7b79182443a04b101a4a51cdc402425e583873aafa44a136e4937f89bde61": {"tag": "v18.2.2", "tarball": "dashcore-18.2.2-win64.zip"},
+    "ebe3170835232c0a1e7456712fbb285d5749cbf3cfb5de29f8db3a2ad81be1cf": {"tag": "v18.2.2", "tarball": "dashcore-18.2.2-x86_64-linux-gnu.tar.gz"},
     #
-    "57b7b9a7939a726afc133229dbecc4f46394bf57d32bf3e936403ade2b2a8519":  "dashcore-0.17.0.3-aarch64-linux-gnu.tar.gz",
-    "024fa38c48925a684bac217c0915451a3f9d15a1048035ef41ca0c9ffa8c6801":  "dashcore-0.17.0.3-arm-linux-gnueabihf.tar.gz",
-    "349c65fb6c0d2d509d338b5bd8ca25b069b84c6d57b49a9d1bc830744e09926b":  "dashcore-0.17.0.3-osx64.tar.gz",
-    "5b6ce9f43fc07f5e73c0de6890929adcda31e29479f06605b4f7434e04348041":  "dashcore-0.17.0.3-osx.dmg",
-    "baf1e0e24c7d2a699898a33b10f4b9c2fb6059286a6c336fd4921a58a4e8eb80":  "dashcore-0.17.0.3.tar.gz",
-    "f46958c99a9d635dea81f7a76ab079f25816a428eecdb0db556bdec4c08b8418":  "dashcore-0.17.0.3-win32-setup.exe",
-    "3c02bbd6e8d232b24ab72789f91c5be7197f105ee4db03a597fd6a262098c713":  "dashcore-0.17.0.3-win32.zip",
-    "347cd9b1899274eef62fca55f9e0bc929dc48482866a89f2098671cf68e9ace6":  "dashcore-0.17.0.3-win64-setup.exe",
-    "e606767165adc16d2a02a510d029e2bb4fc47e0beca548fd4ef5be675d3635ab":  "dashcore-0.17.0.3-win64.zip",
-    "d4086b1271589e8d72e6ca151a1c8f12e4dc2878d60ec69532d0c48e99391996":  "dashcore-0.17.0.3-x86_64-linux-gnu.tar.gz",
+    "57b7b9a7939a726afc133229dbecc4f46394bf57d32bf3e936403ade2b2a8519": {"tag": "v0.17.0.3", "tarball": "dashcore-0.17.0.3-aarch64-linux-gnu.tar.gz"},
+    "024fa38c48925a684bac217c0915451a3f9d15a1048035ef41ca0c9ffa8c6801": {"tag": "v0.17.0.3", "tarball": "dashcore-0.17.0.3-arm-linux-gnueabihf.tar.gz"},
+    "349c65fb6c0d2d509d338b5bd8ca25b069b84c6d57b49a9d1bc830744e09926b": {"tag": "v0.17.0.3", "tarball": "dashcore-0.17.0.3-osx64.tar.gz"},
+    "5b6ce9f43fc07f5e73c0de6890929adcda31e29479f06605b4f7434e04348041": {"tag": "v0.17.0.3", "tarball": "dashcore-0.17.0.3-osx.dmg"},
+    "f46958c99a9d635dea81f7a76ab079f25816a428eecdb0db556bdec4c08b8418": {"tag": "v0.17.0.3", "tarball": "dashcore-0.17.0.3-win32-setup.exe"},
+    "3c02bbd6e8d232b24ab72789f91c5be7197f105ee4db03a597fd6a262098c713": {"tag": "v0.17.0.3", "tarball": "dashcore-0.17.0.3-win32.zip"},
+    "347cd9b1899274eef62fca55f9e0bc929dc48482866a89f2098671cf68e9ace6": {"tag": "v0.17.0.3", "tarball": "dashcore-0.17.0.3-win64-setup.exe"},
+    "e606767165adc16d2a02a510d029e2bb4fc47e0beca548fd4ef5be675d3635ab": {"tag": "v0.17.0.3", "tarball": "dashcore-0.17.0.3-win64.zip"},
+    "d4086b1271589e8d72e6ca151a1c8f12e4dc2878d60ec69532d0c48e99391996": {"tag": "v0.17.0.3", "tarball": "dashcore-0.17.0.3-x86_64-linux-gnu.tar.gz"},
     #
-    "b0fd7b1344701f6b96f6b6978fbce7fd5d3e0310a2993e17858573d80e2941c0":  "dashcore-0.16.1.1-aarch64-linux-gnu.tar.gz",
-    "6d829fb8a419db93d99f03a12d0a426292cfba916fa7173107f7a760e4d1cd56":  "dashcore-0.16.1.1-arm-linux-gnueabihf.tar.gz",
-    "3f26d7da7b3ea5ce1fabf34b4086a978324d5806481dc8470b15294a0807100d":  "dashcore-0.16.1.1-osx64.tar.gz",
-    "49a5ca7364b62f9908239e12da8181c9bbe8b7ca6508bc569f05907800af084c":  "dashcore-0.16.1.1-osx.dmg",
-    "8cd15db027b1745a9205c2067a2e5113772696535ec521a7fc9f6d7b2583e0ea":  "dashcore-0.16.1.1.tar.gz",
-    "dced7d9588e80d3d97d2c06fb2352e0ccb97e23698ed78f2db21d94c6550f2e4":  "dashcore-0.16.1.1-win32-setup.exe",
-    "1c6efe0f70702f4abd6ce42e0dffe9c311f3b71174ab497defc03cd69cebcfc4":  "dashcore-0.16.1.1-win32.zip",
-    "72daff27358d87c1154161e04bf4cb4091ef8cf506b196503c4e58f943913030":  "dashcore-0.16.1.1-win64-setup.exe",
-    "3f9bf89da1eb0354f06020d107926ebeb799625d792954d2b9d1436dfdea014e":  "dashcore-0.16.1.1-win64.zip",
-    "8803928bd18e9515f1254f97751eb6e537a084d66111ce7968eafb23e26bf3a5":  "dashcore-0.16.1.1-x86_64-linux-gnu.tar.gz",
+    "b0fd7b1344701f6b96f6b6978fbce7fd5d3e0310a2993e17858573d80e2941c0": {"tag": "v0.16.1.1", "tarball": "dashcore-0.16.1.1-aarch64-linux-gnu.tar.gz"},
+    "6d829fb8a419db93d99f03a12d0a426292cfba916fa7173107f7a760e4d1cd56": {"tag": "v0.16.1.1", "tarball": "dashcore-0.16.1.1-arm-linux-gnueabihf.tar.gz"},
+    "3f26d7da7b3ea5ce1fabf34b4086a978324d5806481dc8470b15294a0807100d": {"tag": "v0.16.1.1", "tarball": "dashcore-0.16.1.1-osx64.tar.gz"},
+    "49a5ca7364b62f9908239e12da8181c9bbe8b7ca6508bc569f05907800af084c": {"tag": "v0.16.1.1", "tarball": "dashcore-0.16.1.1-osx.dmg"},
+    "dced7d9588e80d3d97d2c06fb2352e0ccb97e23698ed78f2db21d94c6550f2e4": {"tag": "v0.16.1.1", "tarball": "dashcore-0.16.1.1-win32-setup.exe"},
+    "1c6efe0f70702f4abd6ce42e0dffe9c311f3b71174ab497defc03cd69cebcfc4": {"tag": "v0.16.1.1", "tarball": "dashcore-0.16.1.1-win32.zip"},
+    "72daff27358d87c1154161e04bf4cb4091ef8cf506b196503c4e58f943913030": {"tag": "v0.16.1.1", "tarball": "dashcore-0.16.1.1-win64-setup.exe"},
+    "3f9bf89da1eb0354f06020d107926ebeb799625d792954d2b9d1436dfdea014e": {"tag": "v0.16.1.1", "tarball": "dashcore-0.16.1.1-win64.zip"},
+    "8803928bd18e9515f1254f97751eb6e537a084d66111ce7968eafb23e26bf3a5": {"tag": "v0.16.1.1", "tarball": "dashcore-0.16.1.1-x86_64-linux-gnu.tar.gz"},
     #
-    "e2c7f2566e26420a54c8d08e1f8a8d5595bb22fba46d3a84ab931f5cd0efc7f9":  "dashcore-0.15.0.0-aarch64-linux-gnu.tar.gz",
-    "be3a2054eb39826bd416252ab3c9a233e90a27b545739b15fb4c9c399b0fbe68":  "dashcore-0.15.0.0-arm-linux-gnueabihf.tar.gz",
-    "f5e5d25df3d84a9e5dceef43d0bcf54fa697ea73f3e29ec39a8f9952ace8792c":  "dashcore-0.15.0.0-osx64.tar.gz",
-    "09f76396217eef6e5a7ba464d9b1f5abd78925b314f663bb709fdb02013899df":  "dashcore-0.15.0.0-osx.dmg",
-    "8a1088477198b3cd549017246ecbd4d03ddafae772a0344c92a0c4d9478d90b6":  "dashcore-0.15.0.0.tar.gz",
-    "a647e7ba87e8e31fba0683a61a02c578a967a58901784b9b96f0df1233293241":  "dashcore-0.15.0.0-win32-setup.exe",
-    "404d5451a782fabda43197d0608d7cfab1a51a02695c72cdada4507f1db5f99c":  "dashcore-0.15.0.0-win32.zip",
-    "f532bc7e0360e80908eb6b9c3aeec7e0037e70e25dee3b040dbbf7a124e05619":  "dashcore-0.15.0.0-win64-setup.exe",
-    "3ba6ff98113af30319fb1499d132d993633380476f9980443d630d21a40e0efb":  "dashcore-0.15.0.0-win64.zip",
-    "4cc0815ebd595f3d0134a8df9e6224cbe3d79398a5a899b60ca5f4ab8a576160":  "dashcore-0.15.0.0-x86_64-linux-gnu.tar.gz",
+    "e2c7f2566e26420a54c8d08e1f8a8d5595bb22fba46d3a84ab931f5cd0efc7f9": {"tag": "v0.15.0.0", "tarball": "dashcore-0.15.0.0-aarch64-linux-gnu.tar.gz"},
+    "be3a2054eb39826bd416252ab3c9a233e90a27b545739b15fb4c9c399b0fbe68": {"tag": "v0.15.0.0", "tarball": "dashcore-0.15.0.0-arm-linux-gnueabihf.tar.gz"},
+    "f5e5d25df3d84a9e5dceef43d0bcf54fa697ea73f3e29ec39a8f9952ace8792c": {"tag": "v0.15.0.0", "tarball": "dashcore-0.15.0.0-osx64.tar.gz"},
+    "09f76396217eef6e5a7ba464d9b1f5abd78925b314f663bb709fdb02013899df": {"tag": "v0.15.0.0", "tarball": "dashcore-0.15.0.0-osx.dmg"},
+    "a647e7ba87e8e31fba0683a61a02c578a967a58901784b9b96f0df1233293241": {"tag": "v0.15.0.0", "tarball": "dashcore-0.15.0.0-win32-setup.exe"},
+    "404d5451a782fabda43197d0608d7cfab1a51a02695c72cdada4507f1db5f99c": {"tag": "v0.15.0.0", "tarball": "dashcore-0.15.0.0-win32.zip"},
+    "f532bc7e0360e80908eb6b9c3aeec7e0037e70e25dee3b040dbbf7a124e05619": {"tag": "v0.15.0.0", "tarball": "dashcore-0.15.0.0-win64-setup.exe"},
+    "3ba6ff98113af30319fb1499d132d993633380476f9980443d630d21a40e0efb": {"tag": "v0.15.0.0", "tarball": "dashcore-0.15.0.0-win64.zip"},
+    "4cc0815ebd595f3d0134a8df9e6224cbe3d79398a5a899b60ca5f4ab8a576160": {"tag": "v0.15.0.0", "tarball": "dashcore-0.15.0.0-x86_64-linux-gnu.tar.gz"},
     #
-    "060c86587176ffcea5615ea46aa080152ea5ebd035d2a7e0340d312345c2eee0":  "dashcore-0.12.1.5-RPi2.tar.gz",
-    "369dee3e2ae8854592ca696fd5fd7314bc8bbdd865920407bc96d59acb06f81d":  "dashcore-0.12.1.5-linux32.tar.gz",
-    "81692699b99d64b50d1bb1db427f6a0d68c84b98d0e0152f854cfbe048c08fc4":  "dashcore-0.12.1.5-linux64.tar.gz",
-    "b4514d4a705cc1adb400ec0c69630612fe394508decd7bf3edef068021fc47b5":  "dashcore-0.12.1.5-osx.dmg",
-    "35eb7bd9f5883d986b32ae84ddd074566c9e01a438bddd0d147c4a1e96b81b02":  "dashcore-0.12.1.5-win32-setup.exe",
-    "2ea20e8671dcae6ed4f980b8b7dcaa1024961e0267956f4e8bd9eea31b0030e4":  "dashcore-0.12.1.5-win32.zip",
-    "db276b7697777203e98f93e1f498bdab0016f2a96f6454a56c51846120aae0b7":  "dashcore-0.12.1.5-win64-setup.exe",
-    "15ee0d8405609aaf70c31ff320b0468c86e7c6bc1f061ae90d6295a540576c39":  "dashcore-0.12.1.5-win64.zip",
+    "060c86587176ffcea5615ea46aa080152ea5ebd035d2a7e0340d312345c2eee0": {"tag": "v0.12.1.5", "tarball": "dashcore-0.12.1.5-RPi2.tar.gz"},
+    "369dee3e2ae8854592ca696fd5fd7314bc8bbdd865920407bc96d59acb06f81d": {"tag": "v0.12.1.5", "tarball": "dashcore-0.12.1.5-linux32.tar.gz"},
+    "81692699b99d64b50d1bb1db427f6a0d68c84b98d0e0152f854cfbe048c08fc4": {"tag": "v0.12.1.5", "tarball": "dashcore-0.12.1.5-linux64.tar.gz"},
+    "b4514d4a705cc1adb400ec0c69630612fe394508decd7bf3edef068021fc47b5": {"tag": "v0.12.1.5", "tarball": "dashcore-0.12.1.5-osx.dmg"},
+    "35eb7bd9f5883d986b32ae84ddd074566c9e01a438bddd0d147c4a1e96b81b02": {"tag": "v0.12.1.5", "tarball": "dashcore-0.12.1.5-win32-setup.exe"},
+    "2ea20e8671dcae6ed4f980b8b7dcaa1024961e0267956f4e8bd9eea31b0030e4": {"tag": "v0.12.1.5", "tarball": "dashcore-0.12.1.5-win32.zip"},
+    "db276b7697777203e98f93e1f498bdab0016f2a96f6454a56c51846120aae0b7": {"tag": "v0.12.1.5", "tarball": "dashcore-0.12.1.5-win64-setup.exe"},
+    "15ee0d8405609aaf70c31ff320b0468c86e7c6bc1f061ae90d6295a540576c39": {"tag": "v0.12.1.5", "tarball": "dashcore-0.12.1.5-win64.zip"},
 }
 
 
@@ -174,7 +167,7 @@ def download_binary(tag, args) -> int:
         hasher.update(afile.read())
     tarballHash = hasher.hexdigest()
 
-    if tarballHash not in SHA256_SUMS or SHA256_SUMS[tarballHash] != tarball:
+    if tarballHash not in SHA256_SUMS or SHA256_SUMS[tarballHash]['tarball'] != tarball:
         if tarball in SHA256_SUMS.values():
             print("Checksum did not match")
             return 1
@@ -327,7 +320,12 @@ def main(args) -> int:
                         help='download release binary.')
     parser.add_argument('-t', '--target-dir', action='store',
                         help='target directory.', default='releases')
-    parser.add_argument('tags', nargs='+',
-                        help="release tags. e.g.: v19.1.0 v19.0.0-rc.9")
+    parser.add_argument('tags', nargs='*', default=set(
+                            [v['tag'] for v in SHA256_SUMS.values()]
+                        ),
+                        help='release tags. e.g.: v19.1.0 v19.0.0-rc.9'
+                        '(if not specified, the full list needed for'
+                        'backwards compatibility tests will be used)'
+                        )
     args = parser.parse_args()
     sys.exit(main(args))

From 4d0373f5b041a850367e48f08f3dd16e4e59e621 Mon Sep 17 00:00:00 2001
From: MacroFake <falke.marco@gmail.com>
Date: Fri, 5 Aug 2022 16:43:23 +0200
Subject: [PATCH 371/656] Merge bitcoin/bitcoin#25760: rest: clean-up for
 `mempool` endpoints

acbea66589100fe6ef726f4b2a92ec26132ef17b rest: clean-up for `mempool` endpoints (brunoerg)

Pull request description:

  The functions `rest_mempool_info` and `rest_mempool_contents` are similar, the only difference between them is:
  `rest_mempool_info` uses `MempoolInfoToJSON` to get the mempool informations and `rest_mempool_contents` uses `MempoolToJSON`, for this reason this PR creates a new function to handle it and reduce duplicated code.

  Also,
  1. Rename `strURIPart` to `str_uri_part`.
  2. Rename `strJSON` to `str_json`.

ACKs for top commit:
  stickies-v:
    re-ACK acbea66589100fe6ef726f4b2a92ec26132ef17b - verified that just the error message was updated since https://github.com/bitcoin/bitcoin/commit/da0c612c3d69164da19332167c38bfcd1f9777a8
  theStack:
    re-ACK acbea66589100fe6ef726f4b2a92ec26132ef17b

Tree-SHA512: 35f6f0732a573fe8a6cdcc782f89ae3427a1de19f069a68c9c51bb525118c2b07e20303cbe19b9d4b7d1ad055d69c32def2d0fb8f886c851da562dd9ce33ad6a
---
 src/rest.cpp | 44 +++++++++++++-------------------------------
 1 file changed, 13 insertions(+), 31 deletions(-)

diff --git a/src/rest.cpp b/src/rest.cpp
index 5b6222724572..68f5fc79425d 100644
--- a/src/rest.cpp
+++ b/src/rest.cpp
@@ -620,51 +620,34 @@ static bool rest_chaininfo(const CoreContext& context, HTTPRequest* req, const s
     }
 }
 
-static bool rest_mempool_info(const CoreContext& context, HTTPRequest* req, const std::string& strURIPart)
+static bool rest_mempool(const CoreContext& context, HTTPRequest* req, const std::string& str_uri_part)
 {
     if (!CheckWarmup(req))
         return false;
-    const CTxMemPool* mempool = GetMemPool(context, req);
-    if (!mempool) return false;
-    std::string param;
-    const RESTResponseFormat rf = ParseDataFormat(param, strURIPart);
 
-    switch (rf) {
-    case RESTResponseFormat::JSON: {
-        const LLMQContext* llmq_ctx = GetLLMQContext(context, req);
-        if (!llmq_ctx) return false;
-
-        UniValue mempoolInfoObject = MempoolInfoToJSON(*mempool, *llmq_ctx->isman);
-
-        std::string strJSON = mempoolInfoObject.write() + "\n";
-        req->WriteHeader("Content-Type", "application/json");
-        req->WriteReply(HTTP_OK, strJSON);
-        return true;
-    }
-    default: {
-        return RESTERR(req, HTTP_NOT_FOUND, "output format not found (available: json)");
-    }
+    std::string param;
+    const RESTResponseFormat rf = ParseDataFormat(param, str_uri_part);
+    if (param != "contents" && param != "info") {
+        return RESTERR(req, HTTP_BAD_REQUEST, "Invalid URI format. Expected /rest/mempool/<info|contents>.json");
     }
-}
 
-static bool rest_mempool_contents(const CoreContext& context, HTTPRequest* req, const std::string& strURIPart)
-{
-    if (!CheckWarmup(req)) return false;
     const CTxMemPool* mempool = GetMemPool(context, req);
     if (!mempool) return false;
-    std::string param;
-    const RESTResponseFormat rf = ParseDataFormat(param, strURIPart);
 
     switch (rf) {
     case RESTResponseFormat::JSON: {
         const LLMQContext* llmq_ctx = GetLLMQContext(context, req);
         if (!llmq_ctx) return false;
 
-        UniValue mempoolObject = MempoolToJSON(*mempool, llmq_ctx->isman.get(), true);
+        std::string str_json;
+        if (param == "contents") {
+            str_json = MempoolToJSON(*mempool, llmq_ctx->isman.get(), true).write() + "\n";
+        } else {
+            str_json = MempoolInfoToJSON(*mempool, *llmq_ctx->isman).write() + "\n";
+        }
 
-        std::string strJSON = mempoolObject.write() + "\n";
         req->WriteHeader("Content-Type", "application/json");
-        req->WriteReply(HTTP_OK, strJSON);
+        req->WriteReply(HTTP_OK, str_json);
         return true;
     }
     default: {
@@ -982,8 +965,7 @@ static const struct {
       {"/rest/blockfilter/", rest_block_filter},
       {"/rest/blockfilterheaders/", rest_filter_header},
       {"/rest/chaininfo", rest_chaininfo},
-      {"/rest/mempool/info", rest_mempool_info},
-      {"/rest/mempool/contents", rest_mempool_contents},
+      {"/rest/mempool/", rest_mempool},
       {"/rest/headers/", rest_headers},
       {"/rest/getutxos", rest_getutxos},
       {"/rest/blockhashbyheight/", rest_blockhash_by_height},

From f09384349386ea0e05a2df83ab122493262d432d Mon Sep 17 00:00:00 2001
From: Andrew Chow <achow101-github@achow101.com>
Date: Wed, 10 Aug 2022 14:09:53 -0400
Subject: [PATCH 372/656] Merge bitcoin/bitcoin#25642: Don't wrap around when
 deriving an extended key at a too large depth
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

fb9faffae3a26b8aed8b671864ba679747163019 extended keys: fail to derive too large depth instead of wrapping around (Antoine Poinsot)
8dc6670ce159c2b080e9f735c6603a601d40b6ac descriptor: don't assert success of extended key derivation (Antoine Poinsot)
50cfc9e7613d6cf6b534df6e551238b80678c70d (pubk)key: mark Derive() as nodiscard (Antoine Poinsot)
0ca258a5ace798c4e54308aa8a09b1ab3302cd7e descriptor: never ignore the return value when deriving an extended key (Antoine Poinsot)
d3599c22bd4c6b3cfaaadd675e95ebe3b3cb1749 spkman: don't ignore the return value when deriving an extended key (Antoine Poinsot)

Pull request description:

  We would previously  silently wrap the derived child's depth back to `0`. Instead, explicitly fail when trying to derive an impossible depth, and handle the error in callers.

  An extended fuzzing corpus of `descriptor_parse` triggered this behaviour, which was reported by MarcoFalke.

  Fixes #25751.

ACKs for top commit:
  achow101:
    re-ACK fb9faffae3a26b8aed8b671864ba679747163019
  instagibbs:
    utACK  https://github.com/bitcoin/bitcoin/pull/25642/commits/fb9faffae3a26b8aed8b671864ba679747163019

Tree-SHA512: 9f75c23572ce847239bd15e5497df2960b6bd63c61ea72347959d968b5c4c9a4bfeee284e76bdcd7bacbf9eeb70feee85ffd3e316f353ca6eca30e93aafad343
---
 src/key.cpp                   |  1 +
 src/key.h                     |  4 ++--
 src/pubkey.cpp                |  1 +
 src/pubkey.h                  |  4 ++--
 src/script/descriptor.cpp     | 11 +++++------
 src/test/bip32_tests.cpp      | 18 ++++++++++++++++++
 src/test/descriptor_tests.cpp |  4 ++--
 src/wallet/hdchain.cpp        | 18 +++++++++++++-----
 8 files changed, 44 insertions(+), 17 deletions(-)

diff --git a/src/key.cpp b/src/key.cpp
index 947a799412eb..9f4b597d155d 100644
--- a/src/key.cpp
+++ b/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);
diff --git a/src/key.h b/src/key.h
index 00d3e1206dd9..babffd406b0a 100644
--- a/src/key.h
+++ b/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);
 };
diff --git a/src/pubkey.cpp b/src/pubkey.cpp
index a1c13e902a6f..8de5143dbb0b 100644
--- a/src/pubkey.cpp
+++ b/src/pubkey.cpp
@@ -309,6 +309,7 @@ void CExtPubKey::DecodeWithVersion(const unsigned char code[BIP32_EXTKEY_WITH_VE
 }
 
 bool CExtPubKey::Derive(CExtPubKey &out, unsigned int _nChild) const {
+    if (nDepth == std::numeric_limits<unsigned char>::max()) return false;
     out.nDepth = nDepth + 1;
     CKeyID id = pubkey.GetID();
     memcpy(out.vchFingerprint, &id, 4);
diff --git a/src/pubkey.h b/src/pubkey.h
index 09b53ead9f63..990a33ccef99 100644
--- a/src/pubkey.h
+++ b/src/pubkey.h
@@ -208,7 +208,7 @@ class CPubKey
     bool Decompress();
 
     //! Derive BIP32 child pubkey.
-    bool Derive(CPubKey& pubkeyChild, ChainCode &ccChild, unsigned int nChild, const ChainCode& cc) const;
+    [[nodiscard]] bool Derive(CPubKey& pubkeyChild, ChainCode &ccChild, unsigned int nChild, const ChainCode& cc) const;
 };
 
 /** An ElligatorSwift-encoded public key. */
@@ -281,7 +281,7 @@ struct CExtPubKey {
     void Decode(const unsigned char code[BIP32_EXTKEY_SIZE]);
     void EncodeWithVersion(unsigned char code[BIP32_EXTKEY_WITH_VERSION_SIZE]) const;
     void DecodeWithVersion(const unsigned char code[BIP32_EXTKEY_WITH_VERSION_SIZE]);
-    bool Derive(CExtPubKey& out, unsigned int nChild) const;
+    [[nodiscard]] bool Derive(CExtPubKey& out, unsigned int nChild) const;
 
     void Serialize(CSizeComputer& s) const
     {
diff --git a/src/script/descriptor.cpp b/src/script/descriptor.cpp
index c6d2c5a82a15..a2755003442e 100644
--- a/src/script/descriptor.cpp
+++ b/src/script/descriptor.cpp
@@ -304,7 +304,7 @@ class BIP32PubkeyProvider final : public PubkeyProvider
     {
         if (!GetExtKey(arg, xprv)) return false;
         for (auto entry : m_path) {
-            xprv.Derive(xprv, entry);
+            if (!xprv.Derive(xprv, entry)) return false;
             if (entry >> 31) {
                 last_hardened = xprv;
             }
@@ -364,14 +364,13 @@ class BIP32PubkeyProvider final : public PubkeyProvider
             }
         } else {
             for (auto entry : m_path) {
-                der = parent_extkey.Derive(parent_extkey, entry);
-                assert(der);
+                if (!parent_extkey.Derive(parent_extkey, entry)) return false;
             }
             final_extkey = parent_extkey;
             if (m_derive == DeriveType::UNHARDENED) der = parent_extkey.Derive(final_extkey, pos);
             assert(m_derive != DeriveType::HARDENED);
         }
-        assert(der);
+        if (!der) return false;
 
         final_info_out = final_info_out_tmp;
         key_out = final_extkey.pubkey;
@@ -474,8 +473,8 @@ class BIP32PubkeyProvider final : public PubkeyProvider
         CExtKey extkey;
         CExtKey dummy;
         if (!GetDerivedExtKey(arg, extkey, dummy)) return false;
-        if (m_derive == DeriveType::UNHARDENED) extkey.Derive(extkey, pos);
-        if (m_derive == DeriveType::HARDENED) extkey.Derive(extkey, pos | 0x80000000UL);
+        if (m_derive == DeriveType::UNHARDENED && !extkey.Derive(extkey, pos)) return false;
+        if (m_derive == DeriveType::HARDENED && !extkey.Derive(extkey, pos | 0x80000000UL)) return false;
         key = extkey.key;
         return true;
     }
diff --git a/src/test/bip32_tests.cpp b/src/test/bip32_tests.cpp
index 314e3ea0d8f8..3a52630a5d56 100644
--- a/src/test/bip32_tests.cpp
+++ b/src/test/bip32_tests.cpp
@@ -184,4 +184,22 @@ BOOST_AUTO_TEST_CASE(bip32_test5) {
     }
 }
 
+BOOST_AUTO_TEST_CASE(bip32_max_depth) {
+    CExtKey key_parent{DecodeExtKey(test1.vDerive[0].prv)}, key_child;
+    CExtPubKey pubkey_parent{DecodeExtPubKey(test1.vDerive[0].pub)}, pubkey_child;
+
+    // We can derive up to the 255th depth..
+    for (auto i = 0; i++ < 255;) {
+        BOOST_CHECK(key_parent.Derive(key_child, 0));
+        std::swap(key_parent, key_child);
+        BOOST_CHECK(pubkey_parent.Derive(pubkey_child, 0));
+        std::swap(pubkey_parent, pubkey_child);
+    }
+
+    // But trying to derive a non-existent 256th depth will fail!
+    BOOST_CHECK(key_parent.nDepth == 255 && pubkey_parent.nDepth == 255);
+    BOOST_CHECK(!key_parent.Derive(key_child, 0));
+    BOOST_CHECK(!pubkey_parent.Derive(pubkey_child, 0));
+}
+
 BOOST_AUTO_TEST_SUITE_END()
diff --git a/src/test/descriptor_tests.cpp b/src/test/descriptor_tests.cpp
index b3e45c2c4c06..696ce83840fa 100644
--- a/src/test/descriptor_tests.cpp
+++ b/src/test/descriptor_tests.cpp
@@ -180,7 +180,7 @@ void DoCheck(const std::string& prv, const std::string& pub, const std::string&
                 for (const auto& xpub_pair : parent_xpub_cache) {
                     const CExtPubKey& xpub = xpub_pair.second;
                     CExtPubKey der;
-                    xpub.Derive(der, i);
+                    BOOST_CHECK(xpub.Derive(der, i));
                     pubkeys.insert(der.pubkey);
                 }
                 for (const auto& origin_pair : script_provider_cached.origins) {
@@ -203,7 +203,7 @@ void DoCheck(const std::string& prv, const std::string& pub, const std::string&
                     const CExtPubKey& xpub = xpub_pair.second;
                     pubkeys.insert(xpub.pubkey);
                     CExtPubKey der;
-                    xpub.Derive(der, i);
+                    BOOST_CHECK(xpub.Derive(der, i));
                     pubkeys.insert(der.pubkey);
                 }
                 for (const auto& origin_pair : script_provider_cached.origins) {
diff --git a/src/wallet/hdchain.cpp b/src/wallet/hdchain.cpp
index 3f50b1415e45..79d5fdbae1b0 100644
--- a/src/wallet/hdchain.cpp
+++ b/src/wallet/hdchain.cpp
@@ -129,6 +129,14 @@ uint256 CHDChain::GetSeedHash()
     return Hash(vchSeed);
 }
 
+//! Try to derive an extended key, throw if it fails.
+static void DeriveExtKey(CExtKey& key_in, unsigned int index, CExtKey& key_out)
+{
+    if (!key_in.Derive(key_out, index)) {
+        throw std::runtime_error("Could not derive extended key");
+    }
+}
+
 void CHDChain::DeriveChildExtKey(uint32_t nAccountIndex, bool fInternal, uint32_t nChildIndex, CExtKey& extKeyRet, KeyOriginInfo& key_origin)
 {
     LOCK(cs);
@@ -146,15 +154,15 @@ void CHDChain::DeriveChildExtKey(uint32_t nAccountIndex, bool fInternal, uint32_
     // (keys >= 0x80000000 are hardened after bip32)
 
     // derive m/purpose'
-    masterKey.Derive(purposeKey, 44 | 0x80000000);
+    DeriveExtKey(masterKey, 44 | 0x80000000, purposeKey);
     // derive m/purpose'/coin_type'
-    purposeKey.Derive(cointypeKey, Params().ExtCoinType() | 0x80000000);
+    DeriveExtKey(purposeKey, Params().ExtCoinType() | 0x80000000, cointypeKey);
     // derive m/purpose'/coin_type'/account'
-    cointypeKey.Derive(accountKey, nAccountIndex | 0x80000000);
+    DeriveExtKey(cointypeKey, nAccountIndex | 0x80000000, accountKey);
     // derive m/purpose'/coin_type'/account'/change
-    accountKey.Derive(changeKey, fInternal ? 1 : 0);
+    DeriveExtKey(accountKey, fInternal ? 1 : 0, changeKey);
     // derive m/purpose'/coin_type'/account'/change/address_index
-    changeKey.Derive(extKeyRet, nChildIndex);
+    DeriveExtKey(changeKey, nChildIndex, extKeyRet);
 
 #ifdef ENABLE_WALLET
     // We should never ever update an already existing key_origin here

From b838b6063aebb7989803547483dcccec88836c16 Mon Sep 17 00:00:00 2001
From: Andrew Chow <achow101-github@achow101.com>
Date: Fri, 19 Aug 2022 11:47:41 -0400
Subject: [PATCH 373/656] Merge bitcoin/bitcoin#25869: wallet: remove UNKNOWN
 type from OUTPUT_TYPES array

5b4fdbbff527aef8288edb3bf21b478de1061221 wallet: remove UNKNOWN type from OUTPUT_TYPES array (furszy)

Pull request description:

  Fixing https://github.com/bitcoin/bitcoin/pull/25734#discussion_r949502998 ->  https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=50329

  The `OUTPUT_TYPES` array contain the known active output types only.
  And it's solely used to create/walk-through the active spkms.

  So, no need to add the `UNKNOWN` type here.

ACKs for top commit:
  achow101:
    ACK 5b4fdbbff527aef8288edb3bf21b478de1061221
  w0xlt:
    ACK https://github.com/bitcoin/bitcoin/pull/25869/commits/5b4fdbbff527aef8288edb3bf21b478de1061221
  LarryRuane:
    ACK 5b4fdbbff527aef8288edb3bf21b478de1061221

Tree-SHA512: dee2dc362a1b0c777555e5ee4d355a3351340591d0096f74e8c3a25f374cb2d9aef26145977ff4dd0f8cc940da9464eb5541eb2895bc19f8cbd6bb6d292ab9a9
---
 src/outputtype.cpp | 2 +-
 src/outputtype.h   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/outputtype.cpp b/src/outputtype.cpp
index 440372c0b5ea..2a48c1e3c776 100644
--- a/src/outputtype.cpp
+++ b/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)
 {
diff --git a/src/outputtype.h b/src/outputtype.h
index db05dd5ee7e3..5789f8a222c3 100644
--- a/src/outputtype.h
+++ b/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);

From 5db175239cc4429313e205418453e8d7c689c391 Mon Sep 17 00:00:00 2001
From: Andrew Chow <achow101-github@achow101.com>
Date: Mon, 8 Aug 2022 18:56:40 -0400
Subject: [PATCH 374/656] Merge bitcoin/bitcoin#25782: test: check that
 `verifymessage` RPC fails for non-P2PKH addresses

68006c10abbfec0f16b90efa69b7880a5e17f186 test: check that `verifymessage` RPC fails for non-P2PKH addresses (Sebastian Falbesoner)

Pull request description:

  This PR adds missing test coverage for the `verifymessage` RPC, for the case that a non-P2PKH (but otherwise valid) address is passed:
  https://github.com/bitcoin/bitcoin/blob/e09ad284c762a79d59417389e9056c18e25d9770/src/util/message.cpp#L38-L40
  https://github.com/bitcoin/bitcoin/blob/e09ad284c762a79d59417389e9056c18e25d9770/src/rpc/signmessage.cpp#L48-L49
  The passed addresses to trigger the error are of the types nested segwit (P2SH-P2WPKH) and native segwit (P2WPKH) and are created with a helper function `addresses_from_privkey` using descriptors and the `deriveaddresses` RPC. At some point in the future, if we have BIP322 support, all those will likely succeed and can then be moved from error-throwing to the succedding assert loop.

ACKs for top commit:
  achow101:
    ACK 68006c10abbfec0f16b90efa69b7880a5e17f186
  w0xlt:
    ACK https://github.com/bitcoin/bitcoin/pull/25782/commits/68006c10abbfec0f16b90efa69b7880a5e17f186

Tree-SHA512: fec4ed97460787c2ef3d04e3fce89c9365c87207c8358b59c41890f3738355c002e64f289ab4aef794ef4dfd5c867be8b67d736fb620489204f2c6bfb8d3363c
---
 test/functional/rpc_signmessagewithprivkey.py | 22 +++++++++++++++++--
 1 file changed, 20 insertions(+), 2 deletions(-)

diff --git a/test/functional/rpc_signmessagewithprivkey.py b/test/functional/rpc_signmessagewithprivkey.py
index 34df3bd4d4ab..d645036f390a 100755
--- a/test/functional/rpc_signmessagewithprivkey.py
+++ b/test/functional/rpc_signmessagewithprivkey.py
@@ -4,27 +4,44 @@
 # file COPYING or http://www.opensource.org/licenses/mit-license.php.
 """Test RPC commands for signing messages with private key."""
 
+from test_framework.descriptors import (
+    descsum_create,
+)
 from test_framework.test_framework import BitcoinTestFramework
 from test_framework.util import (
     assert_equal,
     assert_raises_rpc_error,
 )
 
+
 class SignMessagesWithPrivTest(BitcoinTestFramework):
     def set_test_params(self):
         self.setup_clean_chain = True
         self.num_nodes = 1
 
+    def addresses_from_privkey(self, priv_key):
+        '''Return addresses for a given WIF private key in legacy (P2PKH),
+           and script-to-hash (P2SH) forman.'''
+        descriptors = f'pkh({priv_key})' , f'sh(pkh({priv_key}))'
+        return [self.nodes[0].deriveaddresses(descsum_create(desc))[0] for desc in descriptors]
+
     def run_test(self):
         message = 'This is just a test message'
 
         self.log.info('test signing with priv_key')
         priv_key = 'cU4zhap7nPJAWeMFu4j6jLrfPmqakDAzy8zn8Fhb3oEevdm4e5Lc'
-        address = 'yeMpGzMj3rhtnz48XsfpB8itPHhHtgxLc3'
         expected_signature = 'ICzMhjIUmmXcPWy2+9nw01zQMawo+s5FIy6F7VMkL+TmIeNq1j3AMEuw075os29kh5KYLbysKkDlDD+EAqERBd4='
         signature = self.nodes[0].signmessagewithprivkey(priv_key, message)
         assert_equal(expected_signature, signature)
-        assert self.nodes[0].verifymessage(address, signature, message)
+
+        self.log.info('test that verifying with P2PKH address succeeds')
+        addresses = self.addresses_from_privkey(priv_key)
+        assert_equal(addresses[0], 'yeMpGzMj3rhtnz48XsfpB8itPHhHtgxLc3')
+        assert self.nodes[0].verifymessage(addresses[0], signature, message)
+
+        self.log.info('test that verifying with non-P2PKH addresses throws error')
+        for non_p2pkh_address in addresses[1:]:
+            assert_raises_rpc_error(-3, "Address does not refer to key", self.nodes[0].verifymessage, non_p2pkh_address, signature, message)
 
         self.log.info('test parameter validity and error codes')
         # signmessagewithprivkey has two required parameters
@@ -42,5 +59,6 @@ def run_test(self):
 
         assert_raises_rpc_error(-3, "Malformed base64 encoding", self.nodes[0].verifymessage, 'yeMpGzMj3rhtnz48XsfpB8itPHhHtgxLc3', "invalid_sig", message)
 
+
 if __name__ == '__main__':
     SignMessagesWithPrivTest().main()

From 2ff28c6d7106088a820433c7e4beefee0dcfef64 Mon Sep 17 00:00:00 2001
From: MarcoFalke <falke.marco@gmail.com>
Date: Mon, 28 Nov 2022 13:59:45 +0100
Subject: [PATCH 375/656] Merge bitcoin/bitcoin#26589: test: small
 fixups/improvements for get_previous_releases.py

9b5feb76bc9458eec806db677af6161b56b8b23f script: small fixups/improvements for get_previous_releases.py (Sebastian Falbesoner)

Pull request description:

  This is a small follow-up to #25650 (commit 614d4682badaadac74b825a45aaee9c2309a3e81) with three fixes/improvements:

  - fix "Checksum did not match" detection, which was not adapted to the new `SHA256_SUMS` structure and hence never executed (the list of tarball names isn't directly in the dictionary's values anymore, but has to be extracted from the `'tarball'` field of each value)
  - make both help text and default tag download order deterministic by sorting default tags
  - `--tags` argument help text: add missing space between "for" and "backwards"

ACKs for top commit:
  Sjors:
    tACK 9b5feb76bc9458eec806db677af6161b56b8b23f. Tested that if I change a checksum, or remove a release, it catches that.
  josibake:
    tested ACK https://github.com/bitcoin/bitcoin/pull/26589/commits/9b5feb76bc9458eec806db677af6161b56b8b23f

Tree-SHA512: 791fa693477eebbda7fd41f3f5ec78fe7eab57df06979aa907ab258a6945534bdc3b931ddfce0fb440c9666b98c88ce5e1b6dc353ed39e129e87d3634855165c
---
 test/get_previous_releases.py | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/test/get_previous_releases.py b/test/get_previous_releases.py
index 6ffcf09803e9..e900c5baeb29 100755
--- a/test/get_previous_releases.py
+++ b/test/get_previous_releases.py
@@ -168,7 +168,7 @@ def download_binary(tag, args) -> int:
     tarballHash = hasher.hexdigest()
 
     if tarballHash not in SHA256_SUMS or SHA256_SUMS[tarballHash]['tarball'] != tarball:
-        if tarball in SHA256_SUMS.values():
+        if tarball in [v['tarball'] for v in SHA256_SUMS.values()]:
             print("Checksum did not match")
             return 1
 
@@ -320,11 +320,10 @@ def main(args) -> int:
                         help='download release binary.')
     parser.add_argument('-t', '--target-dir', action='store',
                         help='target directory.', default='releases')
-    parser.add_argument('tags', nargs='*', default=set(
-                            [v['tag'] for v in SHA256_SUMS.values()]
-                        ),
-                        help='release tags. e.g.: v19.1.0 v19.0.0-rc.9'
-                        '(if not specified, the full list needed for'
+    all_tags = sorted([*set([v['tag'] for v in SHA256_SUMS.values()])])
+    parser.add_argument('tags', nargs='*', default=all_tags,
+                        help='release tags. e.g.: v19.1.0 v19.0.0-rc.9 '
+                        '(if not specified, the full list needed for '
                         'backwards compatibility tests will be used)'
                         )
     args = parser.parse_args()

From 44ec95aec727612fb193e73050a5d32d1de0ff4f Mon Sep 17 00:00:00 2001
From: Kittywhiskers Van Gogh <63189531+kwvg@users.noreply.github.com>
Date: Tue, 4 Nov 2025 02:50:28 +0530
Subject: [PATCH 376/656] merge bitcoin#29895: remove bzip2 from deps

---
 contrib/containers/guix/Dockerfile      | 1 -
 contrib/guix/manifest.scm               | 1 -
 depends/packages/boost.mk               | 4 ++--
 depends/packages/fontconfig.mk          | 4 ++--
 depends/packages/gmp.mk                 | 4 ++--
 depends/packages/libXau.mk              | 4 ++--
 depends/packages/libxcb_util.mk         | 4 ++--
 depends/packages/libxcb_util_image.mk   | 4 ++--
 depends/packages/libxcb_util_keysyms.mk | 4 ++--
 depends/packages/libxcb_util_render.mk  | 4 ++--
 depends/packages/libxcb_util_wm.mk      | 4 ++--
 depends/packages/qrencode.mk            | 4 ++--
 depends/packages/xproto.mk              | 4 ++--
 13 files changed, 22 insertions(+), 24 deletions(-)

diff --git a/contrib/containers/guix/Dockerfile b/contrib/containers/guix/Dockerfile
index c1d8b8d63b8d..6e83ca53b7b9 100644
--- a/contrib/containers/guix/Dockerfile
+++ b/contrib/containers/guix/Dockerfile
@@ -9,7 +9,6 @@ SHELL ["/bin/bash", "-c"]
 RUN apt-get update && \
     apt-get install -y --no-install-recommends --no-upgrade \
     build-essential \
-    bzip2 \
     ca-certificates \
     curl \
     git \
diff --git a/contrib/guix/manifest.scm b/contrib/guix/manifest.scm
index aa613f443f82..2f76f92167d5 100644
--- a/contrib/guix/manifest.scm
+++ b/contrib/guix/manifest.scm
@@ -517,7 +517,6 @@ inspecting signatures in Mach-O binaries.")
         moreutils
         ;; Compression and archiving
         tar
-        bzip2
         gzip
         xz
         ;; Build tools
diff --git a/depends/packages/boost.mk b/depends/packages/boost.mk
index 5e610362278e..a47fd1c691a2 100644
--- a/depends/packages/boost.mk
+++ b/depends/packages/boost.mk
@@ -1,8 +1,8 @@
 package=boost
 $(package)_version=1.81.0
 $(package)_download_path=https://archives.boost.io/release/$($(package)_version)/source/
-$(package)_file_name=boost_$(subst .,_,$($(package)_version)).tar.bz2
-$(package)_sha256_hash=71feeed900fbccca04a3b4f2f84a7c217186f28a940ed8b7ed4725986baf99fa
+$(package)_file_name=boost_$(subst .,_,$($(package)_version)).tar.gz
+$(package)_sha256_hash=205666dea9f6a7cfed87c7a6dfbeb52a2c1b9de55712c9c1a87735d7181452b6
 $(package)_patches=process_macos_sdk.patch
 
 define $(package)_preprocess_cmds
diff --git a/depends/packages/fontconfig.mk b/depends/packages/fontconfig.mk
index 444acfe36d74..6baaecc55a76 100644
--- a/depends/packages/fontconfig.mk
+++ b/depends/packages/fontconfig.mk
@@ -1,8 +1,8 @@
 package=fontconfig
 $(package)_version=2.12.6
 $(package)_download_path=https://www.freedesktop.org/software/fontconfig/release/
-$(package)_file_name=$(package)-$($(package)_version).tar.bz2
-$(package)_sha256_hash=cf0c30807d08f6a28ab46c61b8dbd55c97d2f292cf88f3a07d3384687f31f017
+$(package)_file_name=$(package)-$($(package)_version).tar.gz
+$(package)_sha256_hash=064b9ebf060c9e77011733ac9dc0e2ce92870b574cca2405e11f5353a683c334
 $(package)_dependencies=freetype expat
 $(package)_patches=gperf_header_regen.patch
 
diff --git a/depends/packages/gmp.mk b/depends/packages/gmp.mk
index 3d645cd02a69..03ec302caede 100644
--- a/depends/packages/gmp.mk
+++ b/depends/packages/gmp.mk
@@ -1,8 +1,8 @@
 package=gmp
 $(package)_version=6.3.0
 $(package)_download_path=https://ftp.gnu.org/gnu/gmp
-$(package)_file_name=gmp-$($(package)_version).tar.bz2
-$(package)_sha256_hash=ac28211a7cfb609bae2e2c8d6058d66c8fe96434f740cf6fe2e47b000d1c20cb
+$(package)_file_name=gmp-$($(package)_version).tar.gz
+$(package)_sha256_hash=e56fd59d76810932a0555aa15a14b61c16bed66110d3c75cc2ac49ddaa9ab24c
 $(package)_patches=include_ldflags_in_configure.patch
 
 define $(package)_set_vars
diff --git a/depends/packages/libXau.mk b/depends/packages/libXau.mk
index aeb14dcd6e8e..6bafc4f41a67 100644
--- a/depends/packages/libXau.mk
+++ b/depends/packages/libXau.mk
@@ -1,8 +1,8 @@
 package=libXau
 $(package)_version=1.0.9
 $(package)_download_path=https://xorg.freedesktop.org/releases/individual/lib/
-$(package)_file_name=$(package)-$($(package)_version).tar.bz2
-$(package)_sha256_hash=ccf8cbf0dbf676faa2ea0a6d64bcc3b6746064722b606c8c52917ed00dcb73ec
+$(package)_file_name=$(package)-$($(package)_version).tar.gz
+$(package)_sha256_hash=1f123d8304b082ad63a9e89376400a3b1d4c29e67e3ea07b3f659cccca690eea
 $(package)_dependencies=xproto
 
 # When updating this package, check the default value of
diff --git a/depends/packages/libxcb_util.mk b/depends/packages/libxcb_util.mk
index 6e4c7359b20e..dc4456f85c84 100644
--- a/depends/packages/libxcb_util.mk
+++ b/depends/packages/libxcb_util.mk
@@ -1,8 +1,8 @@
 package=libxcb_util
 $(package)_version=0.4.0
 $(package)_download_path=https://xcb.freedesktop.org/dist
-$(package)_file_name=xcb-util-$($(package)_version).tar.bz2
-$(package)_sha256_hash=46e49469cb3b594af1d33176cd7565def2be3fa8be4371d62271fabb5eae50e9
+$(package)_file_name=xcb-util-$($(package)_version).tar.gz
+$(package)_sha256_hash=0ed0934e2ef4ddff53fcc70fc64fb16fe766cd41ee00330312e20a985fd927a7
 $(package)_dependencies=libxcb
 
 define $(package)_set_vars
diff --git a/depends/packages/libxcb_util_image.mk b/depends/packages/libxcb_util_image.mk
index d12d67e8e888..2228250fecb1 100644
--- a/depends/packages/libxcb_util_image.mk
+++ b/depends/packages/libxcb_util_image.mk
@@ -1,8 +1,8 @@
 package=libxcb_util_image
 $(package)_version=0.4.0
 $(package)_download_path=https://xcb.freedesktop.org/dist
-$(package)_file_name=xcb-util-image-$($(package)_version).tar.bz2
-$(package)_sha256_hash=2db96a37d78831d643538dd1b595d7d712e04bdccf8896a5e18ce0f398ea2ffc
+$(package)_file_name=xcb-util-image-$($(package)_version).tar.gz
+$(package)_sha256_hash=cb2c86190cf6216260b7357a57d9100811bb6f78c24576a3a5bfef6ad3740a42
 $(package)_dependencies=libxcb libxcb_util
 
 define $(package)_set_vars
diff --git a/depends/packages/libxcb_util_keysyms.mk b/depends/packages/libxcb_util_keysyms.mk
index d4f72dedbea7..56bc33d258da 100644
--- a/depends/packages/libxcb_util_keysyms.mk
+++ b/depends/packages/libxcb_util_keysyms.mk
@@ -1,8 +1,8 @@
 package=libxcb_util_keysyms
 $(package)_version=0.4.0
 $(package)_download_path=https://xcb.freedesktop.org/dist
-$(package)_file_name=xcb-util-keysyms-$($(package)_version).tar.bz2
-$(package)_sha256_hash=0ef8490ff1dede52b7de533158547f8b454b241aa3e4dcca369507f66f216dd9
+$(package)_file_name=xcb-util-keysyms-$($(package)_version).tar.gz
+$(package)_sha256_hash=0807cf078fbe38489a41d755095c58239e1b67299f14460dec2ec811e96caa96
 $(package)_dependencies=libxcb xproto
 
 define $(package)_set_vars
diff --git a/depends/packages/libxcb_util_render.mk b/depends/packages/libxcb_util_render.mk
index 28f1fb073c68..ee2883fedaa1 100644
--- a/depends/packages/libxcb_util_render.mk
+++ b/depends/packages/libxcb_util_render.mk
@@ -1,8 +1,8 @@
 package=libxcb_util_render
 $(package)_version=0.3.9
 $(package)_download_path=https://xcb.freedesktop.org/dist
-$(package)_file_name=xcb-util-renderutil-$($(package)_version).tar.bz2
-$(package)_sha256_hash=c6e97e48fb1286d6394dddb1c1732f00227c70bd1bedb7d1acabefdd340bea5b
+$(package)_file_name=xcb-util-renderutil-$($(package)_version).tar.gz
+$(package)_sha256_hash=55eee797e3214fe39d0f3f4d9448cc53cffe06706d108824ea37bb79fcedcad5
 $(package)_dependencies=libxcb
 
 define $(package)_set_vars
diff --git a/depends/packages/libxcb_util_wm.mk b/depends/packages/libxcb_util_wm.mk
index 3b905ba4ec55..a68fd23f8a77 100644
--- a/depends/packages/libxcb_util_wm.mk
+++ b/depends/packages/libxcb_util_wm.mk
@@ -1,8 +1,8 @@
 package=libxcb_util_wm
 $(package)_version=0.4.1
 $(package)_download_path=https://xcb.freedesktop.org/dist
-$(package)_file_name=xcb-util-wm-$($(package)_version).tar.bz2
-$(package)_sha256_hash=28bf8179640eaa89276d2b0f1ce4285103d136be6c98262b6151aaee1d3c2a3f
+$(package)_file_name=xcb-util-wm-$($(package)_version).tar.gz
+$(package)_sha256_hash=038b39c4bdc04a792d62d163ba7908f4bb3373057208c07110be73c1b04b8334
 $(package)_dependencies=libxcb
 
 define $(package)_set_vars
diff --git a/depends/packages/qrencode.mk b/depends/packages/qrencode.mk
index c769ae078f12..e3f614091db0 100644
--- a/depends/packages/qrencode.mk
+++ b/depends/packages/qrencode.mk
@@ -1,8 +1,8 @@
 package=qrencode
 $(package)_version=4.1.1
 $(package)_download_path=https://fukuchi.org/works/qrencode/
-$(package)_file_name=$(package)-$($(package)_version).tar.bz2
-$(package)_sha256_hash=e455d9732f8041cf5b9c388e345a641fd15707860f928e94507b1961256a6923
+$(package)_file_name=$(package)-$($(package)_version).tar.gz
+$(package)_sha256_hash=da448ed4f52aba6bcb0cd48cac0dd51b8692bccc4cd127431402fca6f8171e8e
 $(package)_patches=cmake_fixups.patch
 
 define $(package)_set_vars
diff --git a/depends/packages/xproto.mk b/depends/packages/xproto.mk
index 7a43c52faf43..29c349a21b5b 100644
--- a/depends/packages/xproto.mk
+++ b/depends/packages/xproto.mk
@@ -1,8 +1,8 @@
 package=xproto
 $(package)_version=7.0.31
 $(package)_download_path=https://xorg.freedesktop.org/releases/individual/proto
-$(package)_file_name=$(package)-$($(package)_version).tar.bz2
-$(package)_sha256_hash=c6f9747da0bd3a95f86b17fb8dd5e717c8f3ab7f0ece3ba1b247899ec1ef7747
+$(package)_file_name=$(package)-$($(package)_version).tar.gz
+$(package)_sha256_hash=6d755eaae27b45c5cc75529a12855fed5de5969b367ed05003944cf901ed43c7
 
 define $(package)_set_vars
 $(package)_config_opts=--without-fop --without-xmlto --without-xsltproc --disable-specs

From f73021a3b171016c503db2c67ef96c0835064d32 Mon Sep 17 00:00:00 2001
From: Kittywhiskers Van Gogh <63189531+kwvg@users.noreply.github.com>
Date: Wed, 3 Jul 2024 19:38:01 +0000
Subject: [PATCH 377/656] merge bitcoin#30387: use c++ compiler rather than c
 compiler for binary checks

---
 Makefile.am                             | 12 ++--
 contrib/devtools/test-security-check.py | 88 ++++++++++++-------------
 contrib/devtools/test-symbol-check.py   | 50 +++++++-------
 3 files changed, 75 insertions(+), 75 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 0954e8fa895a..7bd3cc67bb71 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -319,14 +319,14 @@ clean-local: clean-docs
 
 test-security-check:
 if TARGET_DARWIN
-	$(AM_V_at) CC='$(CC)' CFLAGS='$(CFLAGS)' CPPFLAGS='$(CPPFLAGS)' LDFLAGS='$(LDFLAGS)' $(PYTHON) $(top_srcdir)/contrib/devtools/test-security-check.py TestSecurityChecks.test_MACHO
-	$(AM_V_at) CC='$(CC)' CFLAGS='$(CFLAGS)' CPPFLAGS='$(CPPFLAGS)' LDFLAGS='$(LDFLAGS)' $(PYTHON) $(top_srcdir)/contrib/devtools/test-symbol-check.py TestSymbolChecks.test_MACHO
+	$(AM_V_at) CXX='$(CXX)' CXXFLAGS='$(CXXFLAGS)' CPPFLAGS='$(CPPFLAGS)' LDFLAGS='$(LDFLAGS)' $(PYTHON) $(top_srcdir)/contrib/devtools/test-security-check.py TestSecurityChecks.test_MACHO
+	$(AM_V_at) CXX='$(CXX)' CXXFLAGS='$(CXXFLAGS)' CPPFLAGS='$(CPPFLAGS)' LDFLAGS='$(LDFLAGS)' $(PYTHON) $(top_srcdir)/contrib/devtools/test-symbol-check.py TestSymbolChecks.test_MACHO
 endif
 if TARGET_WINDOWS
-	$(AM_V_at) CC='$(CC)' CFLAGS='$(CFLAGS)' CPPFLAGS='$(CPPFLAGS)' LDFLAGS='$(LDFLAGS)' $(PYTHON) $(top_srcdir)/contrib/devtools/test-security-check.py TestSecurityChecks.test_PE
-	$(AM_V_at) CC='$(CC)' CFLAGS='$(CFLAGS)' CPPFLAGS='$(CPPFLAGS)' LDFLAGS='$(LDFLAGS)' $(PYTHON) $(top_srcdir)/contrib/devtools/test-symbol-check.py TestSymbolChecks.test_PE
+	$(AM_V_at) CXX='$(CXX)' CXXFLAGS='$(CXXFLAGS)' CPPFLAGS='$(CPPFLAGS)' LDFLAGS='$(LDFLAGS)' $(PYTHON) $(top_srcdir)/contrib/devtools/test-security-check.py TestSecurityChecks.test_PE
+	$(AM_V_at) CXX='$(CXX)' CXXFLAGS='$(CXXFLAGS)' CPPFLAGS='$(CPPFLAGS)' LDFLAGS='$(LDFLAGS)' $(PYTHON) $(top_srcdir)/contrib/devtools/test-symbol-check.py TestSymbolChecks.test_PE
 endif
 if TARGET_LINUX
-	$(AM_V_at) CC='$(CC)' CFLAGS='$(CFLAGS)' CPPFLAGS='$(CPPFLAGS)' LDFLAGS='$(LDFLAGS)' $(PYTHON) $(top_srcdir)/contrib/devtools/test-security-check.py TestSecurityChecks.test_ELF
-	$(AM_V_at) CC='$(CC)' CFLAGS='$(CFLAGS)' CPPFLAGS='$(CPPFLAGS)' LDFLAGS='$(LDFLAGS)' $(PYTHON) $(top_srcdir)/contrib/devtools/test-symbol-check.py TestSymbolChecks.test_ELF
+	$(AM_V_at) CXX='$(CXX)' CXXFLAGS='$(CXXFLAGS)' CPPFLAGS='$(CPPFLAGS)' LDFLAGS='$(LDFLAGS)' $(PYTHON) $(top_srcdir)/contrib/devtools/test-security-check.py TestSecurityChecks.test_ELF
+	$(AM_V_at) CXX='$(CXX)' CXXFLAGS='$(CXXFLAGS)' CPPFLAGS='$(CPPFLAGS)' LDFLAGS='$(LDFLAGS)' $(PYTHON) $(top_srcdir)/contrib/devtools/test-symbol-check.py TestSymbolChecks.test_ELF
 endif
diff --git a/contrib/devtools/test-security-check.py b/contrib/devtools/test-security-check.py
index 035a6e696877..d64d08fb732f 100755
--- a/contrib/devtools/test-security-check.py
+++ b/contrib/devtools/test-security-check.py
@@ -16,10 +16,10 @@
 def write_testcode(filename):
     with open(filename, 'w', encoding="utf8") as f:
         f.write('''
-    #include <stdio.h>
+    #include <cstdio>
     int main()
     {
-        printf("the quick brown fox jumps over the lazy god\\n");
+        std::printf("the quick brown fox jumps over the lazy god\\n");
         return 0;
     }
     ''')
@@ -35,17 +35,17 @@ def env_flags() -> List[str]:
     # See the definitions for ac_link in autoconf's lib/autoconf/c.m4 file for
     # reference.
     flags: List[str] = []
-    for var in ['CFLAGS', 'CPPFLAGS', 'LDFLAGS']:
+    for var in ['CXXFLAGS', 'CPPFLAGS', 'LDFLAGS']:
         flags += filter(None, os.environ.get(var, '').split(' '))
     return flags
 
-def call_security_check(cc, source, executable, options):
-    subprocess.run([*cc,source,'-o',executable] + env_flags() + options, check=True)
+def call_security_check(cxx, source, executable, options):
+    subprocess.run([*cxx,source,'-o',executable] + env_flags() + options, check=True)
     p = subprocess.run([os.path.join(os.path.dirname(__file__), 'security-check.py'), executable], stdout=subprocess.PIPE, universal_newlines=True)
     return (p.returncode, p.stdout.rstrip())
 
-def get_arch(cc, source, executable):
-    subprocess.run([*cc, source, '-o', executable] + env_flags(), check=True)
+def get_arch(cxx, source, executable):
+    subprocess.run([*cxx, source, '-o', executable] + env_flags(), check=True)
     binary = lief.parse(executable)
     arch = binary.abstract.header.architecture
     os.remove(executable)
@@ -53,93 +53,93 @@ def get_arch(cc, source, executable):
 
 class TestSecurityChecks(unittest.TestCase):
     def test_ELF(self):
-        source = 'test1.c'
+        source = 'test1.cpp'
         executable = 'test1'
-        cc = determine_wellknown_cmd('CC', 'gcc')
+        cxx = determine_wellknown_cmd('CXX', 'g++')
         write_testcode(source)
-        arch = get_arch(cc, source, executable)
+        arch = get_arch(cxx, source, executable)
 
         if arch == lief.ARCHITECTURES.X86:
-            self.assertEqual(call_security_check(cc, source, executable, ['-Wl,-zexecstack','-Wl,-znorelro','-no-pie','-fno-PIE', '-Wl,-z,separate-code']),
+            self.assertEqual(call_security_check(cxx, source, executable, ['-Wl,-zexecstack','-Wl,-znorelro','-no-pie','-fno-PIE', '-Wl,-z,separate-code']),
                     (1, executable+': failed PIE NX RELRO CONTROL_FLOW'))
-            self.assertEqual(call_security_check(cc, source, executable, ['-Wl,-znoexecstack','-Wl,-znorelro','-no-pie','-fno-PIE', '-Wl,-z,separate-code']),
+            self.assertEqual(call_security_check(cxx, source, executable, ['-Wl,-znoexecstack','-Wl,-znorelro','-no-pie','-fno-PIE', '-Wl,-z,separate-code']),
                     (1, executable+': failed PIE RELRO CONTROL_FLOW'))
-            self.assertEqual(call_security_check(cc, source, executable, ['-Wl,-znoexecstack','-Wl,-znorelro','-no-pie','-fno-PIE', '-Wl,-z,separate-code']),
+            self.assertEqual(call_security_check(cxx, source, executable, ['-Wl,-znoexecstack','-Wl,-znorelro','-no-pie','-fno-PIE', '-Wl,-z,separate-code']),
                     (1, executable+': failed PIE RELRO CONTROL_FLOW'))
-            self.assertEqual(call_security_check(cc, source, executable, ['-Wl,-znoexecstack','-Wl,-znorelro','-pie','-fPIE', '-Wl,-z,separate-code']),
+            self.assertEqual(call_security_check(cxx, source, executable, ['-Wl,-znoexecstack','-Wl,-znorelro','-pie','-fPIE', '-Wl,-z,separate-code']),
                     (1, executable+': failed RELRO CONTROL_FLOW'))
-            self.assertEqual(call_security_check(cc, source, executable, ['-Wl,-znoexecstack','-Wl,-zrelro','-Wl,-z,now','-pie','-fPIE', '-Wl,-z,noseparate-code']),
+            self.assertEqual(call_security_check(cxx, source, executable, ['-Wl,-znoexecstack','-Wl,-zrelro','-Wl,-z,now','-pie','-fPIE', '-Wl,-z,noseparate-code']),
                     (1, executable+': failed separate_code CONTROL_FLOW'))
-            self.assertEqual(call_security_check(cc, source, executable, ['-Wl,-znoexecstack','-Wl,-zrelro','-Wl,-z,now','-pie','-fPIE', '-Wl,-z,separate-code']),
+            self.assertEqual(call_security_check(cxx, source, executable, ['-Wl,-znoexecstack','-Wl,-zrelro','-Wl,-z,now','-pie','-fPIE', '-Wl,-z,separate-code']),
                     (1, executable+': failed CONTROL_FLOW'))
-            self.assertEqual(call_security_check(cc, source, executable, ['-Wl,-znoexecstack','-Wl,-zrelro','-Wl,-z,now','-pie','-fPIE', '-Wl,-z,separate-code', '-fcf-protection=full']),
+            self.assertEqual(call_security_check(cxx, source, executable, ['-Wl,-znoexecstack','-Wl,-zrelro','-Wl,-z,now','-pie','-fPIE', '-Wl,-z,separate-code', '-fcf-protection=full']),
                     (0, ''))
         else:
-            self.assertEqual(call_security_check(cc, source, executable, ['-Wl,-zexecstack','-Wl,-znorelro','-no-pie','-fno-PIE', '-Wl,-z,separate-code']),
+            self.assertEqual(call_security_check(cxx, source, executable, ['-Wl,-zexecstack','-Wl,-znorelro','-no-pie','-fno-PIE', '-Wl,-z,separate-code']),
                     (1, executable+': failed PIE NX RELRO'))
-            self.assertEqual(call_security_check(cc, source, executable, ['-Wl,-znoexecstack','-Wl,-znorelro','-no-pie','-fno-PIE', '-Wl,-z,separate-code']),
+            self.assertEqual(call_security_check(cxx, source, executable, ['-Wl,-znoexecstack','-Wl,-znorelro','-no-pie','-fno-PIE', '-Wl,-z,separate-code']),
                     (1, executable+': failed PIE RELRO'))
-            self.assertEqual(call_security_check(cc, source, executable, ['-Wl,-znoexecstack','-Wl,-znorelro','-no-pie','-fno-PIE', '-Wl,-z,separate-code']),
+            self.assertEqual(call_security_check(cxx, source, executable, ['-Wl,-znoexecstack','-Wl,-znorelro','-no-pie','-fno-PIE', '-Wl,-z,separate-code']),
                     (1, executable+': failed PIE RELRO'))
-            self.assertEqual(call_security_check(cc, source, executable, ['-Wl,-znoexecstack','-Wl,-znorelro','-pie','-fPIE', '-Wl,-z,separate-code']),
+            self.assertEqual(call_security_check(cxx, source, executable, ['-Wl,-znoexecstack','-Wl,-znorelro','-pie','-fPIE', '-Wl,-z,separate-code']),
                     (1, executable+': failed RELRO'))
-            self.assertEqual(call_security_check(cc, source, executable, ['-Wl,-znoexecstack','-Wl,-zrelro','-Wl,-z,now','-pie','-fPIE', '-Wl,-z,noseparate-code']),
+            self.assertEqual(call_security_check(cxx, source, executable, ['-Wl,-znoexecstack','-Wl,-zrelro','-Wl,-z,now','-pie','-fPIE', '-Wl,-z,noseparate-code']),
                     (1, executable+': failed separate_code'))
-            self.assertEqual(call_security_check(cc, source, executable, ['-Wl,-znoexecstack','-Wl,-zrelro','-Wl,-z,now','-pie','-fPIE', '-Wl,-z,separate-code']),
+            self.assertEqual(call_security_check(cxx, source, executable, ['-Wl,-znoexecstack','-Wl,-zrelro','-Wl,-z,now','-pie','-fPIE', '-Wl,-z,separate-code']),
                     (0, ''))
 
         clean_files(source, executable)
 
     def test_PE(self):
-        source = 'test1.c'
+        source = 'test1.cpp'
         executable = 'test1.exe'
-        cc = determine_wellknown_cmd('CC', 'x86_64-w64-mingw32-gcc')
+        cxx = determine_wellknown_cmd('CXX', 'x86_64-w64-mingw32-g++')
         write_testcode(source)
 
-        self.assertEqual(call_security_check(cc, source, executable, ['-Wl,--disable-nxcompat','-Wl,--disable-reloc-section','-Wl,--disable-dynamicbase','-Wl,--disable-high-entropy-va','-no-pie','-fno-PIE','-fno-stack-protector']),
+        self.assertEqual(call_security_check(cxx, source, executable, ['-Wl,--disable-nxcompat','-Wl,--disable-reloc-section','-Wl,--disable-dynamicbase','-Wl,--disable-high-entropy-va','-no-pie','-fno-PIE','-fno-stack-protector']),
             (1, executable+': failed PIE DYNAMIC_BASE HIGH_ENTROPY_VA NX RELOC_SECTION CONTROL_FLOW Canary'))
-        self.assertEqual(call_security_check(cc, source, executable, ['-Wl,--nxcompat','-Wl,--disable-reloc-section','-Wl,--disable-dynamicbase','-Wl,--disable-high-entropy-va','-no-pie','-fno-PIE','-fstack-protector-all', '-lssp']),
+        self.assertEqual(call_security_check(cxx, source, executable, ['-Wl,--nxcompat','-Wl,--disable-reloc-section','-Wl,--disable-dynamicbase','-Wl,--disable-high-entropy-va','-no-pie','-fno-PIE','-fstack-protector-all', '-lssp']),
             (1, executable+': failed PIE DYNAMIC_BASE HIGH_ENTROPY_VA RELOC_SECTION CONTROL_FLOW'))
-        self.assertEqual(call_security_check(cc, source, executable, ['-Wl,--nxcompat','-Wl,--enable-reloc-section','-Wl,--disable-dynamicbase','-Wl,--disable-high-entropy-va','-no-pie','-fno-PIE','-fstack-protector-all', '-lssp']),
+        self.assertEqual(call_security_check(cxx, source, executable, ['-Wl,--nxcompat','-Wl,--enable-reloc-section','-Wl,--disable-dynamicbase','-Wl,--disable-high-entropy-va','-no-pie','-fno-PIE','-fstack-protector-all', '-lssp']),
             (1, executable+': failed PIE DYNAMIC_BASE HIGH_ENTROPY_VA CONTROL_FLOW'))
-        self.assertEqual(call_security_check(cc, source, executable, ['-Wl,--nxcompat','-Wl,--enable-reloc-section','-Wl,--disable-dynamicbase','-Wl,--disable-high-entropy-va','-pie','-fPIE','-fstack-protector-all', '-lssp']),
+        self.assertEqual(call_security_check(cxx, source, executable, ['-Wl,--nxcompat','-Wl,--enable-reloc-section','-Wl,--disable-dynamicbase','-Wl,--disable-high-entropy-va','-pie','-fPIE','-fstack-protector-all', '-lssp']),
             (1, executable+': failed PIE DYNAMIC_BASE HIGH_ENTROPY_VA CONTROL_FLOW'))  # -pie -fPIE does nothing unless --dynamicbase is also supplied
-        self.assertEqual(call_security_check(cc, source, executable, ['-Wl,--nxcompat','-Wl,--enable-reloc-section','-Wl,--dynamicbase','-Wl,--disable-high-entropy-va','-pie','-fPIE','-fstack-protector-all', '-lssp']),
+        self.assertEqual(call_security_check(cxx, source, executable, ['-Wl,--nxcompat','-Wl,--enable-reloc-section','-Wl,--dynamicbase','-Wl,--disable-high-entropy-va','-pie','-fPIE','-fstack-protector-all', '-lssp']),
             (1, executable+': failed HIGH_ENTROPY_VA CONTROL_FLOW'))
-        self.assertEqual(call_security_check(cc, source, executable, ['-Wl,--nxcompat','-Wl,--enable-reloc-section','-Wl,--dynamicbase','-Wl,--high-entropy-va','-pie','-fPIE','-fstack-protector-all', '-lssp']),
+        self.assertEqual(call_security_check(cxx, source, executable, ['-Wl,--nxcompat','-Wl,--enable-reloc-section','-Wl,--dynamicbase','-Wl,--high-entropy-va','-pie','-fPIE','-fstack-protector-all', '-lssp']),
             (1, executable+': failed CONTROL_FLOW'))
-        self.assertEqual(call_security_check(cc, source, executable, ['-Wl,--nxcompat','-Wl,--enable-reloc-section','-Wl,--dynamicbase','-Wl,--high-entropy-va','-pie','-fPIE', '-fcf-protection=full','-fstack-protector-all', '-lssp']),
+        self.assertEqual(call_security_check(cxx, source, executable, ['-Wl,--nxcompat','-Wl,--enable-reloc-section','-Wl,--dynamicbase','-Wl,--high-entropy-va','-pie','-fPIE', '-fcf-protection=full','-fstack-protector-all', '-lssp']),
             (0, ''))
 
         clean_files(source, executable)
 
     def test_MACHO(self):
-        source = 'test1.c'
+        source = 'test1.cpp'
         executable = 'test1'
-        cc = determine_wellknown_cmd('CC', 'clang')
+        cxx = determine_wellknown_cmd('CXX', 'clang++')
         write_testcode(source)
-        arch = get_arch(cc, source, executable)
+        arch = get_arch(cxx, source, executable)
 
         if arch == lief.ARCHITECTURES.X86:
-            self.assertEqual(call_security_check(cc, source, executable, ['-Wl,-no_pie','-Wl,-flat_namespace','-fno-stack-protector', '-Wl,-no_fixup_chains']),
+            self.assertEqual(call_security_check(cxx, source, executable, ['-Wl,-no_pie','-Wl,-flat_namespace','-fno-stack-protector', '-Wl,-no_fixup_chains']),
                 (1, executable+': failed NOUNDEFS Canary FIXUP_CHAINS PIE CONTROL_FLOW'))
-            self.assertEqual(call_security_check(cc, source, executable, ['-Wl,-flat_namespace','-fno-stack-protector', '-Wl,-fixup_chains']),
+            self.assertEqual(call_security_check(cxx, source, executable, ['-Wl,-flat_namespace','-fno-stack-protector', '-Wl,-fixup_chains']),
                 (1, executable+': failed NOUNDEFS Canary CONTROL_FLOW'))
-            self.assertEqual(call_security_check(cc, source, executable, ['-Wl,-flat_namespace','-fstack-protector-all', '-Wl,-fixup_chains']),
+            self.assertEqual(call_security_check(cxx, source, executable, ['-Wl,-flat_namespace','-fstack-protector-all', '-Wl,-fixup_chains']),
                 (1, executable+': failed NOUNDEFS CONTROL_FLOW'))
-            self.assertEqual(call_security_check(cc, source, executable, ['-fstack-protector-all', '-Wl,-fixup_chains']),
+            self.assertEqual(call_security_check(cxx, source, executable, ['-fstack-protector-all', '-Wl,-fixup_chains']),
                 (1, executable+': failed CONTROL_FLOW'))
-            self.assertEqual(call_security_check(cc, source, executable, ['-fstack-protector-all', '-fcf-protection=full', '-Wl,-fixup_chains']),
+            self.assertEqual(call_security_check(cxx, source, executable, ['-fstack-protector-all', '-fcf-protection=full', '-Wl,-fixup_chains']),
                 (0, ''))
         else:
             # arm64 darwin doesn't support non-PIE binaries, control flow or executable stacks
-            self.assertEqual(call_security_check(cc, source, executable, ['-Wl,-flat_namespace','-fno-stack-protector', '-Wl,-no_fixup_chains']),
+            self.assertEqual(call_security_check(cxx, source, executable, ['-Wl,-flat_namespace','-fno-stack-protector', '-Wl,-no_fixup_chains']),
                 (1, executable+': failed NOUNDEFS Canary FIXUP_CHAINS BRANCH_PROTECTION'))
-            self.assertEqual(call_security_check(cc, source, executable, ['-Wl,-flat_namespace','-fno-stack-protector', '-Wl,-fixup_chains', '-mbranch-protection=bti']),
+            self.assertEqual(call_security_check(cxx, source, executable, ['-Wl,-flat_namespace','-fno-stack-protector', '-Wl,-fixup_chains', '-mbranch-protection=bti']),
                 (1, executable+': failed NOUNDEFS Canary'))
-            self.assertEqual(call_security_check(cc, source, executable, ['-Wl,-flat_namespace','-fstack-protector-all', '-Wl,-fixup_chains', '-mbranch-protection=bti']),
+            self.assertEqual(call_security_check(cxx, source, executable, ['-Wl,-flat_namespace','-fstack-protector-all', '-Wl,-fixup_chains', '-mbranch-protection=bti']),
                 (1, executable+': failed NOUNDEFS'))
-            self.assertEqual(call_security_check(cc, source, executable, ['-fstack-protector-all', '-Wl,-fixup_chains', '-mbranch-protection=bti']),
+            self.assertEqual(call_security_check(cxx, source, executable, ['-fstack-protector-all', '-Wl,-fixup_chains', '-mbranch-protection=bti']),
                 (0, ''))
 
 
diff --git a/contrib/devtools/test-symbol-check.py b/contrib/devtools/test-symbol-check.py
index 44482bc2f1ad..92966000406b 100755
--- a/contrib/devtools/test-symbol-check.py
+++ b/contrib/devtools/test-symbol-check.py
@@ -12,17 +12,17 @@
 
 from utils import determine_wellknown_cmd
 
-def call_symbol_check(cc: List[str], source, executable, options):
+def call_symbol_check(cxx: List[str], source, executable, options):
     # This should behave the same as AC_TRY_LINK, so arrange well-known flags
     # in the same order as autoconf would.
     #
     # See the definitions for ac_link in autoconf's lib/autoconf/c.m4 file for
     # reference.
     env_flags: List[str] = []
-    for var in ['CFLAGS', 'CPPFLAGS', 'LDFLAGS']:
+    for var in ['CXXFLAGS', 'CPPFLAGS', 'LDFLAGS']:
         env_flags += filter(None, os.environ.get(var, '').split(' '))
 
-    subprocess.run([*cc,source,'-o',executable] + env_flags + options, check=True)
+    subprocess.run([*cxx,source,'-o',executable] + env_flags + options, check=True)
     p = subprocess.run([os.path.join(os.path.dirname(__file__), 'symbol-check.py'), executable], stdout=subprocess.PIPE, universal_newlines=True)
     os.remove(source)
     os.remove(executable)
@@ -30,13 +30,13 @@ def call_symbol_check(cc: List[str], source, executable, options):
 
 class TestSymbolChecks(unittest.TestCase):
     def test_ELF(self):
-        source = 'test1.c'
+        source = 'test1.cpp'
         executable = 'test1'
-        cc = determine_wellknown_cmd('CC', 'gcc')
+        cxx = determine_wellknown_cmd('CXX', 'g++')
 
         # -lutil is part of the libc6 package so a safe bet that it's installed
         # it's also out of context enough that it's unlikely to ever become a real dependency
-        source = 'test2.c'
+        source = 'test2.cpp'
         executable = 'test2'
         with open(source, 'w', encoding="utf8") as f:
             f.write('''
@@ -49,31 +49,31 @@ def test_ELF(self):
                 }
         ''')
 
-        self.assertEqual(call_symbol_check(cc, source, executable, ['-lutil']),
+        self.assertEqual(call_symbol_check(cxx, source, executable, ['-lutil']),
                 (1, executable + ': libutil.so.1 is not in ALLOWED_LIBRARIES!\n' +
                     executable + ': failed LIBRARY_DEPENDENCIES'))
 
         # finally, check a simple conforming binary
-        source = 'test3.c'
+        source = 'test3.cpp'
         executable = 'test3'
         with open(source, 'w', encoding="utf8") as f:
             f.write('''
-                #include <stdio.h>
+                #include <cstdio>
 
                 int main()
                 {
-                    printf("42");
+                    std::printf("42");
                     return 0;
                 }
         ''')
 
-        self.assertEqual(call_symbol_check(cc, source, executable, []),
+        self.assertEqual(call_symbol_check(cxx, source, executable, []),
                 (0, ''))
 
     def test_MACHO(self):
-        source = 'test1.c'
+        source = 'test1.cpp'
         executable = 'test1'
-        cc = determine_wellknown_cmd('CC', 'clang')
+        cxx = determine_wellknown_cmd('CXX', 'clang++')
 
         with open(source, 'w', encoding="utf8") as f:
             f.write('''
@@ -87,11 +87,11 @@ def test_MACHO(self):
 
         ''')
 
-        self.assertEqual(call_symbol_check(cc, source, executable, ['-lexpat', '-Wl,-platform_version','-Wl,macos', '-Wl,11.4', '-Wl,11.4']),
+        self.assertEqual(call_symbol_check(cxx, source, executable, ['-lexpat', '-Wl,-platform_version','-Wl,macos', '-Wl,11.4', '-Wl,11.4']),
             (1, 'libexpat.1.dylib is not in ALLOWED_LIBRARIES!\n' +
                 f'{executable}: failed DYNAMIC_LIBRARIES MIN_OS SDK'))
 
-        source = 'test2.c'
+        source = 'test2.cpp'
         executable = 'test2'
         with open(source, 'w', encoding="utf8") as f:
             f.write('''
@@ -104,10 +104,10 @@ def test_MACHO(self):
                 }
         ''')
 
-        self.assertEqual(call_symbol_check(cc, source, executable, ['-framework', 'CoreGraphics', '-Wl,-platform_version','-Wl,macos', '-Wl,11.4', '-Wl,11.4']),
+        self.assertEqual(call_symbol_check(cxx, source, executable, ['-framework', 'CoreGraphics', '-Wl,-platform_version','-Wl,macos', '-Wl,11.4', '-Wl,11.4']),
                 (1, f'{executable}: failed MIN_OS SDK'))
 
-        source = 'test3.c'
+        source = 'test3.cpp'
         executable = 'test3'
         with open(source, 'w', encoding="utf8") as f:
             f.write('''
@@ -117,13 +117,13 @@ def test_MACHO(self):
                 }
         ''')
 
-        self.assertEqual(call_symbol_check(cc, source, executable, ['-Wl,-platform_version','-Wl,macos', '-Wl,11.0', '-Wl,11.4']),
+        self.assertEqual(call_symbol_check(cxx, source, executable, ['-Wl,-platform_version','-Wl,macos', '-Wl,11.0', '-Wl,11.4']),
                 (1, f'{executable}: failed SDK'))
 
     def test_PE(self):
-        source = 'test1.c'
+        source = 'test1.cpp'
         executable = 'test1.exe'
-        cc = determine_wellknown_cmd('CC', 'x86_64-w64-mingw32-gcc')
+        cxx = determine_wellknown_cmd('CXX', 'x86_64-w64-mingw32-g++')
 
         with open(source, 'w', encoding="utf8") as f:
             f.write('''
@@ -136,11 +136,11 @@ def test_PE(self):
                 }
         ''')
 
-        self.assertEqual(call_symbol_check(cc, source, executable, ['-lpdh', '-Wl,--major-subsystem-version', '-Wl,6', '-Wl,--minor-subsystem-version', '-Wl,1']),
+        self.assertEqual(call_symbol_check(cxx, source, executable, ['-lpdh', '-Wl,--major-subsystem-version', '-Wl,6', '-Wl,--minor-subsystem-version', '-Wl,1']),
             (1, 'pdh.dll is not in ALLOWED_LIBRARIES!\n' +
                  executable + ': failed DYNAMIC_LIBRARIES'))
 
-        source = 'test2.c'
+        source = 'test2.cpp'
         executable = 'test2.exe'
 
         with open(source, 'w', encoding="utf8") as f:
@@ -151,10 +151,10 @@ def test_PE(self):
                 }
         ''')
 
-        self.assertEqual(call_symbol_check(cc, source, executable, ['-Wl,--major-subsystem-version', '-Wl,9', '-Wl,--minor-subsystem-version', '-Wl,9']),
+        self.assertEqual(call_symbol_check(cxx, source, executable, ['-Wl,--major-subsystem-version', '-Wl,9', '-Wl,--minor-subsystem-version', '-Wl,9']),
             (1, executable + ': failed SUBSYSTEM_VERSION'))
 
-        source = 'test3.c'
+        source = 'test3.cpp'
         executable = 'test3.exe'
         with open(source, 'w', encoding="utf8") as f:
             f.write('''
@@ -167,7 +167,7 @@ def test_PE(self):
                 }
         ''')
 
-        self.assertEqual(call_symbol_check(cc, source, executable, ['-lole32', '-Wl,--major-subsystem-version', '-Wl,6', '-Wl,--minor-subsystem-version', '-Wl,1']),
+        self.assertEqual(call_symbol_check(cxx, source, executable, ['-lole32', '-Wl,--major-subsystem-version', '-Wl,6', '-Wl,--minor-subsystem-version', '-Wl,1']),
                 (0, ''))
 
 

From 31881e6776ab1ba3b829b4b20018f1b327e127c3 Mon Sep 17 00:00:00 2001
From: Kittywhiskers Van Gogh <63189531+kwvg@users.noreply.github.com>
Date: Mon, 23 Sep 2024 13:24:08 +0100
Subject: [PATCH 378/656] partial bitcoin#30940: Fix build with
 `MULTIPROCESS=1` in Guix environment

includes:
- 06b4c339e8
---
 depends/packages/capnp.mk           | 1 +
 depends/packages/libmultiprocess.mk | 1 +
 2 files changed, 2 insertions(+)

diff --git a/depends/packages/capnp.mk b/depends/packages/capnp.mk
index 6d792db71136..0c211cbc455d 100644
--- a/depends/packages/capnp.mk
+++ b/depends/packages/capnp.mk
@@ -9,6 +9,7 @@ define $(package)_set_vars :=
   $(package)_config_opts := -DBUILD_TESTING=OFF
   $(package)_config_opts += -DWITH_OPENSSL=OFF
   $(package)_config_opts += -DWITH_ZLIB=OFF
+  $(package)_cxxflags += -ffile-prefix-map=$$($(package)_extract_dir)=/usr
 endef
 
 define $(package)_config_cmds
diff --git a/depends/packages/libmultiprocess.mk b/depends/packages/libmultiprocess.mk
index c292c49bfbab..a181e05100bb 100644
--- a/depends/packages/libmultiprocess.mk
+++ b/depends/packages/libmultiprocess.mk
@@ -13,6 +13,7 @@ ifneq ($(host),$(build))
 $(package)_config_opts := -DCAPNP_EXECUTABLE="$$(native_capnp_prefixbin)/capnp"
 $(package)_config_opts += -DCAPNPC_CXX_EXECUTABLE="$$(native_capnp_prefixbin)/capnpc-c++"
 endif
+$(package)_cxxflags += -ffile-prefix-map=$$($(package)_extract_dir)=/usr
 endef
 
 define $(package)_config_cmds

From de2dc164c5acb4a1df1a659356af044625ce48e9 Mon Sep 17 00:00:00 2001
From: Kittywhiskers Van Gogh <63189531+kwvg@users.noreply.github.com>
Date: Tue, 10 Dec 2024 15:20:46 +0000
Subject: [PATCH 379/656] merge bitcoin#31461: add `-g` to *BSD_debug flags

---
 depends/hosts/freebsd.mk | 2 +-
 depends/hosts/netbsd.mk  | 2 +-
 depends/hosts/openbsd.mk | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/depends/hosts/freebsd.mk b/depends/hosts/freebsd.mk
index 055097b03ddc..3b265f647dc7 100644
--- a/depends/hosts/freebsd.mk
+++ b/depends/hosts/freebsd.mk
@@ -4,7 +4,7 @@ freebsd_CXXFLAGS=-pipe -std=$(CXX_STANDARD)
 freebsd_release_CFLAGS=-O2
 freebsd_release_CXXFLAGS=$(freebsd_release_CFLAGS)
 
-freebsd_debug_CFLAGS=-O1
+freebsd_debug_CFLAGS=-O1 -g
 freebsd_debug_CXXFLAGS=$(freebsd_debug_CFLAGS)
 
 ifeq (86,$(findstring 86,$(build_arch)))
diff --git a/depends/hosts/netbsd.mk b/depends/hosts/netbsd.mk
index 6e0fa9e12fb7..842c015ca30a 100644
--- a/depends/hosts/netbsd.mk
+++ b/depends/hosts/netbsd.mk
@@ -10,7 +10,7 @@ endif
 netbsd_release_CFLAGS=-O2
 netbsd_release_CXXFLAGS=$(netbsd_release_CFLAGS)
 
-netbsd_debug_CFLAGS=-O1
+netbsd_debug_CFLAGS=-O1 -g
 netbsd_debug_CXXFLAGS=$(netbsd_debug_CFLAGS)
 
 ifeq (86,$(findstring 86,$(build_arch)))
diff --git a/depends/hosts/openbsd.mk b/depends/hosts/openbsd.mk
index bdd36dc9b35d..b6db8575ff7a 100644
--- a/depends/hosts/openbsd.mk
+++ b/depends/hosts/openbsd.mk
@@ -4,7 +4,7 @@ openbsd_CXXFLAGS=-pipe -std=$(CXX_STANDARD)
 openbsd_release_CFLAGS=-O2
 openbsd_release_CXXFLAGS=$(openbsd_release_CFLAGS)
 
-openbsd_debug_CFLAGS=-O1
+openbsd_debug_CFLAGS=-O1 -g
 openbsd_debug_CXXFLAGS=$(openbsd_debug_CFLAGS)
 
 ifeq (86,$(findstring 86,$(build_arch)))

From aa28a1848b209d45600a49c071ca9d73561abce3 Mon Sep 17 00:00:00 2001
From: Kittywhiskers Van Gogh <63189531+kwvg@users.noreply.github.com>
Date: Thu, 12 Dec 2024 17:14:42 +0000
Subject: [PATCH 380/656] merge bitcoin#31484: update capnproto to 1.0.2

---
 depends/packages/native_capnp.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/depends/packages/native_capnp.mk b/depends/packages/native_capnp.mk
index 484e78d5d906..d6e6b4cadbd6 100644
--- a/depends/packages/native_capnp.mk
+++ b/depends/packages/native_capnp.mk
@@ -1,9 +1,9 @@
 package=native_capnp
-$(package)_version=1.0.1
+$(package)_version=1.0.2
 $(package)_download_path=https://capnproto.org/
 $(package)_download_file=capnproto-c++-$($(package)_version).tar.gz
 $(package)_file_name=capnproto-cxx-$($(package)_version).tar.gz
-$(package)_sha256_hash=0f7f4b8a76a2cdb284fddef20de8306450df6dd031a47a15ac95bc43c3358e09
+$(package)_sha256_hash=9057dbc0223366b74bbeca33a05de164a229b0377927f1b7ef3828cdd8cb1d7e
 
 define $(package)_set_vars
   $(package)_config_opts := -DBUILD_TESTING=OFF

From aac17f35ee380fe172fd5e492a5ddbc87b6d66af Mon Sep 17 00:00:00 2001
From: Kittywhiskers Van Gogh <63189531+kwvg@users.noreply.github.com>
Date: Sat, 14 Dec 2024 09:55:47 +0000
Subject: [PATCH 381/656] merge bitcoin#31498: Ignore prefix directory on
 OpenBSD

---
 depends/.gitignore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/depends/.gitignore b/depends/.gitignore
index 19c506ce5447..d65d8931eaf2 100644
--- a/depends/.gitignore
+++ b/depends/.gitignore
@@ -4,6 +4,7 @@ built/
 sources/
 config.site
 x86_64*
+amd64*
 i686*
 mips*
 arm*

From 78ccada5a83f318aec1986f6900346ebb3a0b0e5 Mon Sep 17 00:00:00 2001
From: Kittywhiskers Van Gogh <63189531+kwvg@users.noreply.github.com>
Date: Sat, 25 Oct 2025 00:09:38 +0530
Subject: [PATCH 382/656] merge bitcoin#31552: Update capnproto to 1.1.0

---
 depends/packages/native_capnp.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/depends/packages/native_capnp.mk b/depends/packages/native_capnp.mk
index d6e6b4cadbd6..e67b103716f4 100644
--- a/depends/packages/native_capnp.mk
+++ b/depends/packages/native_capnp.mk
@@ -1,9 +1,9 @@
 package=native_capnp
-$(package)_version=1.0.2
+$(package)_version=1.1.0
 $(package)_download_path=https://capnproto.org/
 $(package)_download_file=capnproto-c++-$($(package)_version).tar.gz
 $(package)_file_name=capnproto-cxx-$($(package)_version).tar.gz
-$(package)_sha256_hash=9057dbc0223366b74bbeca33a05de164a229b0377927f1b7ef3828cdd8cb1d7e
+$(package)_sha256_hash=07167580e563f5e821e3b2af1c238c16ec7181612650c5901330fa9a0da50939
 
 define $(package)_set_vars
   $(package)_config_opts := -DBUILD_TESTING=OFF

From 3dbc289c6664bf6807d9630a72ed1ef19c253576 Mon Sep 17 00:00:00 2001
From: Kittywhiskers Van Gogh <63189531+kwvg@users.noreply.github.com>
Date: Thu, 9 Jan 2025 13:36:19 +0000
Subject: [PATCH 383/656] merge bitcoin#31627: Fix spacing issue

---
 depends/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/depends/Makefile b/depends/Makefile
index 64f86440ccff..daca9b321d15 100644
--- a/depends/Makefile
+++ b/depends/Makefile
@@ -147,7 +147,7 @@ include packages/packages.mk
 #     2. Before including packages/*.mk (excluding packages/packages.mk), since
 #        they rely on the build_id variables
 #
-build_id:=$(shell env CC='$(build_CC)' C_STANDARD='$(C_STANDARD)' CXX='$(build_CXX)' CXX_STANDARD='$(CXX_STANDARD)' AR='$(build_AR) 'NM='$(build_NM)' RANLIB='$(build_RANLIB)' STRIP='$(build_STRIP)' SHA256SUM='$(build_SHA256SUM)' DEBUG='$(DEBUG)' LTO='$(LTO)' NO_HARDEN='$(NO_HARDEN)' ./gen_id '$(BUILD_ID_SALT)' 'GUIX_ENVIRONMENT=$(realpath $(GUIX_ENVIRONMENT))')
+build_id:=$(shell env CC='$(build_CC)' C_STANDARD='$(C_STANDARD)' CXX='$(build_CXX)' CXX_STANDARD='$(CXX_STANDARD)' AR='$(build_AR)' NM='$(build_NM)' RANLIB='$(build_RANLIB)' STRIP='$(build_STRIP)' SHA256SUM='$(build_SHA256SUM)' DEBUG='$(DEBUG)' LTO='$(LTO)' NO_HARDEN='$(NO_HARDEN)' ./gen_id '$(BUILD_ID_SALT)' 'GUIX_ENVIRONMENT=$(realpath $(GUIX_ENVIRONMENT))')
 $(host_arch)_$(host_os)_id:=$(shell env CC='$(host_CC)' C_STANDARD='$(C_STANDARD)' CXX='$(host_CXX)' CXX_STANDARD='$(CXX_STANDARD)' AR='$(host_AR)' NM='$(host_NM)' RANLIB='$(host_RANLIB)' STRIP='$(host_STRIP)' SHA256SUM='$(build_SHA256SUM)' DEBUG='$(DEBUG)' LTO='$(LTO)' NO_HARDEN='$(NO_HARDEN)' ./gen_id '$(HOST_ID_SALT)' 'GUIX_ENVIRONMENT=$(realpath $(GUIX_ENVIRONMENT))')
 
 boost_packages_$(NO_BOOST) = $(boost_packages)

From 29c3c0655727045905addd7818d371ce25bb293d Mon Sep 17 00:00:00 2001
From: Kittywhiskers Van Gogh <63189531+kwvg@users.noreply.github.com>
Date: Fri, 30 Aug 2024 14:16:28 +0100
Subject: [PATCH 384/656] merge bitcoin#30774: Qt 5.15.16

---
 depends/packages/qt.mk                    | 12 ++---
 depends/patches/qt/fix-macos-linker.patch | 55 -----------------------
 depends/patches/qt/memory_resource.patch  | 33 --------------
 depends/patches/qt/zlib-timebits64.patch  | 31 -------------
 doc/dependencies.md                       |  2 +-
 5 files changed, 5 insertions(+), 128 deletions(-)
 delete mode 100644 depends/patches/qt/fix-macos-linker.patch
 delete mode 100644 depends/patches/qt/zlib-timebits64.patch

diff --git a/depends/packages/qt.mk b/depends/packages/qt.mk
index c8d1e7693405..e34945c49b59 100644
--- a/depends/packages/qt.mk
+++ b/depends/packages/qt.mk
@@ -1,9 +1,9 @@
 package=qt
-$(package)_version=5.15.14
+$(package)_version=5.15.16
 $(package)_download_path=https://download.qt.io/archive/qt/5.15/$($(package)_version)/submodules
 $(package)_suffix=everywhere-opensource-src-$($(package)_version).tar.xz
 $(package)_file_name=qtbase-$($(package)_suffix)
-$(package)_sha256_hash=500d3b390048e9538c28b5f523dfea6936f9c2e10d24ab46580ff57d430b98be
+$(package)_sha256_hash=b04815058c18058b6ba837206756a2c87d1391f07a0dcb0dd314f970fd041592
 $(package)_linux_dependencies=freetype fontconfig libxcb libxkbcommon libxcb_util libxcb_util_render libxcb_util_keysyms libxcb_util_image libxcb_util_wm
 $(package)_qt_libs=corelib network widgets gui plugins testlib
 $(package)_linguist_tools = lrelease lupdate lconvert
@@ -19,19 +19,17 @@ $(package)_patches += no_warnings_for_symbols.patch
 $(package)_patches += rcc_hardcode_timestamp.patch
 $(package)_patches += duplicate_lcqpafonts.patch
 $(package)_patches += guix_cross_lib_path.patch
-$(package)_patches += fix-macos-linker.patch
 $(package)_patches += memory_resource.patch
 $(package)_patches += clang_18_libpng.patch
 $(package)_patches += utc_from_string_no_optimize.patch
 $(package)_patches += windows_lto.patch
 $(package)_patches += darwin_no_libm.patch
-$(package)_patches += zlib-timebits64.patch
 
 $(package)_qttranslations_file_name=qttranslations-$($(package)_suffix)
-$(package)_qttranslations_sha256_hash=5b94d1a11b566908622fcca2f8b799744d2f8a68da20be4caa5953ed63b10489
+$(package)_qttranslations_sha256_hash=415dbbb82a75dfc9a7be969e743bee54c0e6867be37bce4cf8f03da39f20112a
 
 $(package)_qttools_file_name=qttools-$($(package)_suffix)
-$(package)_qttools_sha256_hash=12061a85baf5f4de8fbc795e1d3872b706f340211b9e70962caeffc6f5e89563
+$(package)_qttools_sha256_hash=1cab11887faca54af59f4995ee435c9ad98d194e9e6889c846692c8b6815fc1c
 
 $(package)_extra_sources  = $($(package)_qttranslations_file_name)
 $(package)_extra_sources += $($(package)_qttools_file_name)
@@ -242,7 +240,6 @@ endef
 define $(package)_preprocess_cmds
   cp $($(package)_patch_dir)/qt.pro qt.pro && \
   cp $($(package)_patch_dir)/qttools_src.pro qttools/src/src.pro && \
-  patch -p1 -i $($(package)_patch_dir)/fix-macos-linker.patch && \
   patch -p1 -i $($(package)_patch_dir)/dont_hardcode_pwd.patch && \
   patch -p1 -i $($(package)_patch_dir)/fix_qt_pkgconfig.patch && \
   patch -p1 -i $($(package)_patch_dir)/fix_android_jni_static.patch && \
@@ -257,7 +254,6 @@ define $(package)_preprocess_cmds
   patch -p1 -i $($(package)_patch_dir)/guix_cross_lib_path.patch && \
   patch -p1 -i $($(package)_patch_dir)/windows_lto.patch && \
   patch -p1 -i $($(package)_patch_dir)/darwin_no_libm.patch && \
-  patch -p1 -i $($(package)_patch_dir)/zlib-timebits64.patch && \
   mkdir -p qtbase/mkspecs/macx-clang-linux &&\
   cp -f qtbase/mkspecs/macx-clang/qplatformdefs.h qtbase/mkspecs/macx-clang-linux/ &&\
   cp -f $($(package)_patch_dir)/mac-qmake.conf qtbase/mkspecs/macx-clang-linux/qmake.conf && \
diff --git a/depends/patches/qt/fix-macos-linker.patch b/depends/patches/qt/fix-macos-linker.patch
deleted file mode 100644
index e43968565655..000000000000
--- a/depends/patches/qt/fix-macos-linker.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-qmake: Don't error out if QMAKE_DEFAULT_LIBDIRS is empty on macOS
-
-The new linker in Xcode 15 doesn't provide any default linker or
-framework paths when requested via -v, but still seems to use the
-default paths documented in the ld man page.
-
-We trust that linker will do the right thing, even if we don't
-know of its default linker paths.
-
-We also need to opt out of the default fallback logic to
-set the libdirs to /lib and /usr/lib.
-
-This may result in UnixMakefileGenerator::findLibraries finding
-different libraries than expected, if additional paths are
-passed with -L, which will then take precedence for qmake,
-even if the linker itself will use the library from the
-SDK's default paths. This should hopefully not be an issue
-in practice, as we don't turn -lFoo into absolute paths in
-qmake, so the only risk is that we're picking up the wrong
-prl files and adding additional dependencies that the lib
-in the SDK doesn't have.
-
-Upstream commits:
- - Qt 5.15.16: Not yet publicly available.
- - Qt dev: cdf64b0e47115cc473e1afd1472b4b09e130b2a5
-
-For other Qt branches see
-https://codereview.qt-project.org/q/I2347b26e2df0828471373b0e15b8c9089274c65d
-
---- old/qtbase/mkspecs/features/toolchain.prf
-+++ new/qtbase/mkspecs/features/toolchain.prf
-@@ -288,9 +288,12 @@ isEmpty($${target_prefix}.INCDIRS) {
-                 }
-             }
-         }
--        isEmpty(QMAKE_DEFAULT_LIBDIRS)|isEmpty(QMAKE_DEFAULT_INCDIRS): \
-+        isEmpty(QMAKE_DEFAULT_INCDIRS): \
-             !integrity: \
--                error("failed to parse default search paths from compiler output")
-+                error("failed to parse default include paths from compiler output")
-+        isEmpty(QMAKE_DEFAULT_LIBDIRS): \
-+            !integrity:!darwin: \
-+                error("failed to parse default library paths from compiler output")
-         QMAKE_DEFAULT_LIBDIRS = $$unique(QMAKE_DEFAULT_LIBDIRS)
-     } else: ghs {
-         cmd = $$QMAKE_CXX $$QMAKE_CXXFLAGS -$${LITERAL_HASH} -o /tmp/fake_output /tmp/fake_input.cpp
-@@ -412,7 +415,7 @@ isEmpty($${target_prefix}.INCDIRS) {
-         QMAKE_DEFAULT_INCDIRS = $$split(INCLUDE, $$QMAKE_DIRLIST_SEP)
-     }
- 
--    unix:if(!cross_compile|host_build) {
-+    unix:!darwin:if(!cross_compile|host_build) {
-         isEmpty(QMAKE_DEFAULT_INCDIRS): QMAKE_DEFAULT_INCDIRS = /usr/include /usr/local/include
-         isEmpty(QMAKE_DEFAULT_LIBDIRS): QMAKE_DEFAULT_LIBDIRS = /lib /usr/lib
-     }
diff --git a/depends/patches/qt/memory_resource.patch b/depends/patches/qt/memory_resource.patch
index 312f0669f631..14e25121c00a 100644
--- a/depends/patches/qt/memory_resource.patch
+++ b/depends/patches/qt/memory_resource.patch
@@ -14,36 +14,3 @@ and https://bugreports.qt.io/browse/QTBUG-114316
  #  include <unordered_set>
  #  include <memory_resource>
  #else
-
---- a/qtbase/src/corelib/global/qcompilerdetection.h
-+++ b/qtbase/src/corelib/global/qcompilerdetection.h
-@@ -1055,16 +1055,22 @@
- #   endif // !_HAS_CONSTEXPR
- #  endif // !__GLIBCXX__ && !_LIBCPP_VERSION
- # endif // Q_OS_QNX
--# if (defined(Q_CC_CLANG) || defined(Q_CC_INTEL)) && defined(Q_OS_MAC) && defined(__GNUC_LIBSTD__) \
--    && ((__GNUC_LIBSTD__-0) * 100 + __GNUC_LIBSTD_MINOR__-0 <= 402)
-+# if (defined(Q_CC_CLANG) || defined(Q_CC_INTEL)) && defined(Q_OS_MAC)
-+#  if defined(__GNUC_LIBSTD__) && ((__GNUC_LIBSTD__-0) * 100 + __GNUC_LIBSTD_MINOR__-0 <= 402)
- // Apple has not updated libstdc++ since 2007, which means it does not have
- // <initializer_list> or std::move. Let's disable these features
--#  undef Q_COMPILER_INITIALIZER_LISTS
--#  undef Q_COMPILER_RVALUE_REFS
--#  undef Q_COMPILER_REF_QUALIFIERS
-+#   undef Q_COMPILER_INITIALIZER_LISTS
-+#   undef Q_COMPILER_RVALUE_REFS
-+#   undef Q_COMPILER_REF_QUALIFIERS
- // Also disable <atomic>, since it's clearly not there
--#  undef Q_COMPILER_ATOMICS
--# endif
-+#   undef Q_COMPILER_ATOMICS
-+#  endif
-+#  if defined(__cpp_lib_memory_resource) \
-+    && ((defined(__MAC_OS_X_VERSION_MIN_REQUIRED)  && __MAC_OS_X_VERSION_MIN_REQUIRED  < 140000) \
-+     || (defined(__IPHONE_OS_VERSION_MIN_REQUIRED) && __IPHONE_OS_VERSION_MIN_REQUIRED < 170000))
-+#   undef __cpp_lib_memory_resource // Only supported on macOS 14 and iOS 17
-+#  endif
-+# endif // (defined(Q_CC_CLANG) || defined(Q_CC_INTEL)) && defined(Q_OS_MAC)
- # if defined(Q_CC_CLANG) && defined(Q_CC_INTEL) && Q_CC_INTEL >= 1500
- // ICC 15.x and 16.0 have their own implementation of std::atomic, which is activated when in Clang mode
- // (probably because libc++'s <atomic> on OS X failed to compile), but they're missing some
diff --git a/depends/patches/qt/zlib-timebits64.patch b/depends/patches/qt/zlib-timebits64.patch
deleted file mode 100644
index 139c1dfa77f3..000000000000
--- a/depends/patches/qt/zlib-timebits64.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From a566e156b3fa07b566ddbf6801b517a9dba04fa3 Mon Sep 17 00:00:00 2001
-From: Mark Adler <madler@alumni.caltech.edu>
-Date: Sat, 29 Jul 2023 22:13:09 -0700
-Subject: [PATCH] Avoid compiler complaints if _TIME_BITS defined when building
- zlib.
-
-zlib does not use time_t, so _TIME_BITS is irrelevant. However it
-may be defined anyway as part of a sledgehammer indiscriminately
-applied to all builds.
-
-From https://github.com/madler/zlib/commit/a566e156b3fa07b566ddbf6801b517a9dba04fa3.patch
----
- qtbase/src/3rdparty/zlib/src/gzguts.h | 5 ++---
- 1 file changed, 2 insertions(+), 3 deletions(-)
-
-diff --git a/qtbase/src/3rdparty/zlib/src/gzguts.h b/qtbase/src/3rdparty/zlib/src/gzguts.h
-index e23f831f5..f9375047e 100644
---- a/qtbase/src/3rdparty/zlib/src/gzguts.h
-+++ b/qtbase/src/3rdparty/zlib/src/gzguts.h
-@@ -26,9 +26,8 @@
- #  ifndef _LARGEFILE_SOURCE
- #    define _LARGEFILE_SOURCE 1
- #  endif
--#  ifdef _FILE_OFFSET_BITS
--#    undef _FILE_OFFSET_BITS
--#  endif
-+#  undef _FILE_OFFSET_BITS
-+#  undef _TIME_BITS
- #endif
- 
- #ifdef HAVE_HIDDEN
diff --git a/doc/dependencies.md b/doc/dependencies.md
index e16bf1705095..77f4764bdc3d 100644
--- a/doc/dependencies.md
+++ b/doc/dependencies.md
@@ -33,7 +33,7 @@ You can find installation instructions in the `build-*.md` file for your platfor
 | [Fontconfig](../depends/packages/fontconfig.mk) | [link](https://www.freedesktop.org/wiki/Software/fontconfig/) | [2.12.6](https://github.com/bitcoin/bitcoin/pull/23495) | 2.6 | Yes |
 | [FreeType](../depends/packages/freetype.mk) | [link](https://freetype.org) | [2.11.0](https://github.com/bitcoin/bitcoin/commit/01544dd78ccc0b0474571da854e27adef97137fb) | 2.3.0 | Yes |
 | [qrencode](../depends/packages/qrencode.mk) | [link](https://fukuchi.org/works/qrencode/) | [4.1.1](https://github.com/bitcoin/bitcoin/pull/27312) | | No |
-| [Qt](../depends/packages/qt.mk) | [link](https://download.qt.io/official_releases/qt/) | [5.15.3](https://github.com/bitcoin/bitcoin/pull/24668) | [5.11.3](https://github.com/bitcoin/bitcoin/pull/24132) | No |
+| [Qt](../depends/packages/qt.mk) | [link](https://download.qt.io/official_releases/qt/) | [5.15.16](https://github.com/bitcoin/bitcoin/pull/30774) | [5.11.3](https://github.com/bitcoin/bitcoin/pull/24132) | No |
 
 ### Networking
 | Dependency | Releases | Version used | Minimum required | Runtime |

From 802232d4ece381db0dc67452b3832a31c1a6a464 Mon Sep 17 00:00:00 2001
From: Kittywhiskers Van Gogh <63189531+kwvg@users.noreply.github.com>
Date: Sat, 25 Oct 2025 03:35:06 +0530
Subject: [PATCH 385/656] merge bitcoin#31125: add *FLAGS to gen_id

---
 depends/Makefile | 12 ++++++++++--
 depends/gen_id   | 21 ++++++++++++++++++++-
 2 files changed, 30 insertions(+), 3 deletions(-)

diff --git a/depends/Makefile b/depends/Makefile
index daca9b321d15..53a5f23f1f79 100644
--- a/depends/Makefile
+++ b/depends/Makefile
@@ -147,8 +147,16 @@ include packages/packages.mk
 #     2. Before including packages/*.mk (excluding packages/packages.mk), since
 #        they rely on the build_id variables
 #
-build_id:=$(shell env CC='$(build_CC)' C_STANDARD='$(C_STANDARD)' CXX='$(build_CXX)' CXX_STANDARD='$(CXX_STANDARD)' AR='$(build_AR)' NM='$(build_NM)' RANLIB='$(build_RANLIB)' STRIP='$(build_STRIP)' SHA256SUM='$(build_SHA256SUM)' DEBUG='$(DEBUG)' LTO='$(LTO)' NO_HARDEN='$(NO_HARDEN)' ./gen_id '$(BUILD_ID_SALT)' 'GUIX_ENVIRONMENT=$(realpath $(GUIX_ENVIRONMENT))')
-$(host_arch)_$(host_os)_id:=$(shell env CC='$(host_CC)' C_STANDARD='$(C_STANDARD)' CXX='$(host_CXX)' CXX_STANDARD='$(CXX_STANDARD)' AR='$(host_AR)' NM='$(host_NM)' RANLIB='$(host_RANLIB)' STRIP='$(host_STRIP)' SHA256SUM='$(build_SHA256SUM)' DEBUG='$(DEBUG)' LTO='$(LTO)' NO_HARDEN='$(NO_HARDEN)' ./gen_id '$(HOST_ID_SALT)' 'GUIX_ENVIRONMENT=$(realpath $(GUIX_ENVIRONMENT))')
+build_id:=$(shell env CC='$(build_CC)' C_STANDARD='$(C_STANDARD)' CXX='$(build_CXX)' CXX_STANDARD='$(CXX_STANDARD)' \
+                      AR='$(build_AR)' NM='$(build_NM)' RANLIB='$(build_RANLIB)' STRIP='$(build_STRIP)' SHA256SUM='$(build_SHA256SUM)' \
+                      DEBUG='$(DEBUG)' NO_HARDEN='$(NO_HARDEN)' \
+                      ./gen_id '$(BUILD_ID_SALT)' 'GUIX_ENVIRONMENT=$(realpath $(GUIX_ENVIRONMENT))')
+
+$(host_arch)_$(host_os)_id:=$(shell env CC='$(host_CC)' C_STANDARD='$(C_STANDARD)' CXX='$(host_CXX)' CXX_STANDARD='$(CXX_STANDARD)' \
+                                        CPPFLAGS='$(CPPFLAGS)' CFLAGS='$(CFLAGS)' CXXFLAGS='$(CXXFLAGS)' LDFLAGS='$(LDFLAGS)' \
+                                        AR='$(host_AR)' NM='$(host_NM)' RANLIB='$(host_RANLIB)' STRIP='$(host_STRIP)' SHA256SUM='$(build_SHA256SUM)' \
+                                        DEBUG='$(DEBUG)' LTO='$(LTO)' NO_HARDEN='$(NO_HARDEN)' \
+                                        ./gen_id '$(HOST_ID_SALT)' 'GUIX_ENVIRONMENT=$(realpath $(GUIX_ENVIRONMENT))')
 
 boost_packages_$(NO_BOOST) = $(boost_packages)
 
diff --git a/depends/gen_id b/depends/gen_id
index e2e2273b2d67..fe6d163547ae 100755
--- a/depends/gen_id
+++ b/depends/gen_id
@@ -1,8 +1,9 @@
 #!/usr/bin/env bash
 
 # Usage: env [ CC=... ] [ C_STANDARD=...] [ CXX=... ] [CXX_STANDARD=...] \
+#            [ CPPFLAGS=... ] [CFLAGS=...] [CXXFLAGS=...] [LDFLAGS=...] \
 #            [ AR=... ] [ NM=... ] [ RANLIB=... ] [ STRIP=... ] [ DEBUG=... ] \
-#            [ LTO=... ] [ NO_HARDEN=... ] ./build-id [ID_SALT]...
+#            [ LTO=... ] [ NO_HARDEN=... ] ./gen_id [ID_SALT]...
 #
 # Prints to stdout a SHA256 hash representing the current toolset, used by
 # depends/Makefile as a build id for caching purposes (detecting when the
@@ -34,6 +35,13 @@
     echo "$@"
     echo "END ID SALT"
 
+    echo "BEGIN FLAGS"
+    echo "CPPFLAGS=${CPPFLAGS}"
+    echo "CFLAGS=${CFLAGS}"
+    echo "CXXFLAGS=${CXXFLAGS}"
+    echo "LDFLAGS=${LDFLAGS}"
+    echo "END FLAGS"
+
     # GCC only prints COLLECT_LTO_WRAPPER when invoked with just "-v", but we want
     # the information from "-v -E -" as well, so just include both.
     echo "BEGIN CC"
@@ -50,6 +58,17 @@
     echo "CXX_STANDARD=${CXX_STANDARD}"
     echo "END CXX"
 
+    # We use lld when cross-compiling for macOS, and it's version should
+    # be tied to LLVM. However someone compiling with GCC and -fuse-ld=lld
+    # would not see a cache bust if the LLVM toolchain was updated.
+    echo "BEGIN lld"
+    bash -c "ld.lld --version"
+    echo "END lld"
+
+    echo "BEGIN mold"
+    bash -c "mold --version"
+    echo "END mold"
+
     echo "BEGIN AR"
     bash -c "${AR} --version"
     env | grep '^AR_'

From 721da49433f014fd94fb1fabeaac566d3366cae5 Mon Sep 17 00:00:00 2001
From: Kittywhiskers Van Gogh <63189531+kwvg@users.noreply.github.com>
Date: Sat, 25 Oct 2025 03:35:27 +0530
Subject: [PATCH 386/656] merge bitcoin#31661: Override default build type for
 `libevent`

---
 depends/packages/libevent.mk | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/depends/packages/libevent.mk b/depends/packages/libevent.mk
index 4c05e8a0a742..8acb2bd895df 100644
--- a/depends/packages/libevent.mk
+++ b/depends/packages/libevent.mk
@@ -11,9 +11,10 @@ $(package)_build_subdir=build
 # version as we do in configure. Due to quirks in libevents build system, this
 # is also required to enable support for ipv6. See #19375.
 define $(package)_set_vars
-  $(package)_config_opts=-DEVENT__DISABLE_BENCHMARK=ON -DEVENT__DISABLE_OPENSSL=ON
+  $(package)_config_opts=-DCMAKE_BUILD_TYPE=None -DEVENT__DISABLE_BENCHMARK=ON -DEVENT__DISABLE_OPENSSL=ON
   $(package)_config_opts+=-DEVENT__DISABLE_SAMPLES=ON -DEVENT__DISABLE_REGRESS=ON
   $(package)_config_opts+=-DEVENT__DISABLE_TESTS=ON -DEVENT__LIBRARY_TYPE=STATIC
+  $(package)_cflags += -ffile-prefix-map=$($(package)_extract_dir)=/usr
   $(package)_cppflags += -D_GNU_SOURCE
   $(package)_cppflags_mingw32=-D_WIN32_WINNT=0x0601
 

From be4e49226b3957036c4a782d9b220479c4788c9e Mon Sep 17 00:00:00 2001
From: Kittywhiskers Van Gogh <63189531+kwvg@users.noreply.github.com>
Date: Sat, 25 Oct 2025 03:35:48 +0530
Subject: [PATCH 387/656] merge bitcoin#31800: Avoid using the
 `-ffile-prefix-map` compiler option

---
 depends/packages/capnp.mk           | 2 +-
 depends/packages/libevent.mk        | 2 +-
 depends/packages/libmultiprocess.mk | 2 +-
 depends/packages/zeromq.mk          | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/depends/packages/capnp.mk b/depends/packages/capnp.mk
index 0c211cbc455d..7f41d3b5a4ed 100644
--- a/depends/packages/capnp.mk
+++ b/depends/packages/capnp.mk
@@ -9,7 +9,7 @@ define $(package)_set_vars :=
   $(package)_config_opts := -DBUILD_TESTING=OFF
   $(package)_config_opts += -DWITH_OPENSSL=OFF
   $(package)_config_opts += -DWITH_ZLIB=OFF
-  $(package)_cxxflags += -ffile-prefix-map=$$($(package)_extract_dir)=/usr
+  $(package)_cxxflags += -fdebug-prefix-map=$($(package)_extract_dir)=/usr -fmacro-prefix-map=$($(package)_extract_dir)=/usr
 endef
 
 define $(package)_config_cmds
diff --git a/depends/packages/libevent.mk b/depends/packages/libevent.mk
index 8acb2bd895df..07bb0aca2806 100644
--- a/depends/packages/libevent.mk
+++ b/depends/packages/libevent.mk
@@ -14,7 +14,7 @@ define $(package)_set_vars
   $(package)_config_opts=-DCMAKE_BUILD_TYPE=None -DEVENT__DISABLE_BENCHMARK=ON -DEVENT__DISABLE_OPENSSL=ON
   $(package)_config_opts+=-DEVENT__DISABLE_SAMPLES=ON -DEVENT__DISABLE_REGRESS=ON
   $(package)_config_opts+=-DEVENT__DISABLE_TESTS=ON -DEVENT__LIBRARY_TYPE=STATIC
-  $(package)_cflags += -ffile-prefix-map=$($(package)_extract_dir)=/usr
+  $(package)_cflags += -fdebug-prefix-map=$($(package)_extract_dir)=/usr -fmacro-prefix-map=$($(package)_extract_dir)=/usr
   $(package)_cppflags += -D_GNU_SOURCE
   $(package)_cppflags_mingw32=-D_WIN32_WINNT=0x0601
 
diff --git a/depends/packages/libmultiprocess.mk b/depends/packages/libmultiprocess.mk
index a181e05100bb..afbd315e3880 100644
--- a/depends/packages/libmultiprocess.mk
+++ b/depends/packages/libmultiprocess.mk
@@ -13,7 +13,7 @@ ifneq ($(host),$(build))
 $(package)_config_opts := -DCAPNP_EXECUTABLE="$$(native_capnp_prefixbin)/capnp"
 $(package)_config_opts += -DCAPNPC_CXX_EXECUTABLE="$$(native_capnp_prefixbin)/capnpc-c++"
 endif
-$(package)_cxxflags += -ffile-prefix-map=$$($(package)_extract_dir)=/usr
+$(package)_cxxflags += -fdebug-prefix-map=$($(package)_extract_dir)=/usr -fmacro-prefix-map=$($(package)_extract_dir)=/usr
 endef
 
 define $(package)_config_cmds
diff --git a/depends/packages/zeromq.mk b/depends/packages/zeromq.mk
index 67a0dd88e5de..9cb0831d22cb 100644
--- a/depends/packages/zeromq.mk
+++ b/depends/packages/zeromq.mk
@@ -19,7 +19,7 @@ define $(package)_set_vars
   $(package)_config_opts += -DWITH_LIBBSD=OFF -DENABLE_CURVE=OFF -DENABLE_CPACK=OFF
   $(package)_config_opts += -DBUILD_SHARED=OFF -DBUILD_TESTS=OFF -DZMQ_BUILD_TESTS=OFF
   $(package)_config_opts += -DENABLE_DRAFTS=OFF -DZMQ_BUILD_TESTS=OFF
-  $(package)_cxxflags += -ffile-prefix-map=$($(package)_extract_dir)=/usr
+  $(package)_cxxflags += -fdebug-prefix-map=$($(package)_extract_dir)=/usr -fmacro-prefix-map=$($(package)_extract_dir)=/usr
   $(package)_config_opts_mingw32 += -DZMQ_WIN32_WINNT=0x0601 -DZMQ_HAVE_IPC=OFF
 endef
 

From 3dd5c1c4abc51d05caadcc6cedafc7fbe2537ce4 Mon Sep 17 00:00:00 2001
From: Kittywhiskers Van Gogh <63189531+kwvg@users.noreply.github.com>
Date: Mon, 3 Feb 2025 09:20:43 +0000
Subject: [PATCH 388/656] merge bitcoin#31500: Fix compiling `libevent` package
 on NetBSD

---
 depends/packages/libevent.mk                |  6 ++++--
 depends/patches/libevent/netbsd_fixup.patch | 23 +++++++++++++++++++++
 2 files changed, 27 insertions(+), 2 deletions(-)
 create mode 100644 depends/patches/libevent/netbsd_fixup.patch

diff --git a/depends/packages/libevent.mk b/depends/packages/libevent.mk
index 07bb0aca2806..4356c72129cc 100644
--- a/depends/packages/libevent.mk
+++ b/depends/packages/libevent.mk
@@ -4,7 +4,8 @@ $(package)_download_path=https://github.com/libevent/libevent/releases/download/
 $(package)_file_name=$(package)-$($(package)_version).tar.gz
 $(package)_sha256_hash=92e6de1be9ec176428fd2367677e61ceffc2ee1cb119035037a27d346b0403bb
 $(package)_patches=cmake_fixups.patch
-$(package)_patches+=fix_mingw_link.patch
+$(package)_patches += fix_mingw_link.patch
+$(package)_patches += netbsd_fixup.patch
 $(package)_build_subdir=build
 
 # When building for Windows, we set _WIN32_WINNT to target the same Windows
@@ -25,7 +26,8 @@ endef
 
 define $(package)_preprocess_cmds
   patch -p1 < $($(package)_patch_dir)/cmake_fixups.patch && \
-  patch -p1 < $($(package)_patch_dir)/fix_mingw_link.patch
+  patch -p1 < $($(package)_patch_dir)/fix_mingw_link.patch && \
+  patch -p1 < $($(package)_patch_dir)/netbsd_fixup.patch
 endef
 
 define $(package)_config_cmds
diff --git a/depends/patches/libevent/netbsd_fixup.patch b/depends/patches/libevent/netbsd_fixup.patch
new file mode 100644
index 000000000000..21d96aaf452c
--- /dev/null
+++ b/depends/patches/libevent/netbsd_fixup.patch
@@ -0,0 +1,23 @@
+Improve portability on NetBSD
+
+According to GCC documentation, "the various `-std` options disable
+certain keywords".
+This change adheres to GCC's recommendation by replacing the `typeof`
+keyword with its alternative, `__typeof__`.
+
+See https://github.com/libevent/libevent/commit/1759485e9a59147a47a674f5132fcfe764e7748c.
+
+
+--- a/kqueue.c
++++ b/kqueue.c
+@@ -52,8 +52,8 @@
+  * intptr_t, whereas others define it as void*.  There doesn't seem to be an
+  * easy way to tell them apart via autoconf, so we need to use OS macros. */
+ #if defined(__NetBSD__)
+-#define PTR_TO_UDATA(x) ((typeof(((struct kevent *)0)->udata))(x))
+-#define INT_TO_UDATA(x) ((typeof(((struct kevent *)0)->udata))(intptr_t)(x))
++#define PTR_TO_UDATA(x) ((__typeof__(((struct kevent *)0)->udata))(x))
++#define INT_TO_UDATA(x) ((__typeof__(((struct kevent *)0)->udata))(intptr_t)(x))
+ #elif defined(EVENT__HAVE_INTTYPES_H) && !defined(__OpenBSD__) && !defined(__FreeBSD__) && !defined(__darwin__) && !defined(__APPLE__) && !defined(__CloudABI__)
+ #define PTR_TO_UDATA(x)	((intptr_t)(x))
+ #define INT_TO_UDATA(x) ((intptr_t)(x))

From 8e07d3381f6bfbc48ef4ec2f37530cf5b99a8df9 Mon Sep 17 00:00:00 2001
From: Kittywhiskers Van Gogh <63189531+kwvg@users.noreply.github.com>
Date: Tue, 30 Sep 2025 11:20:12 +0100
Subject: [PATCH 389/656] merge bitcoin#33494: Update URL for `qrencode`
 package source tarball

---
 depends/funcs.mk             | 6 ++----
 depends/packages/qrencode.mk | 5 +++--
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/depends/funcs.mk b/depends/funcs.mk
index 3c0dc7a7fcab..93bd9a87fde9 100644
--- a/depends/funcs.mk
+++ b/depends/funcs.mk
@@ -34,9 +34,8 @@ define fetch_file_inner
 endef
 
 define fetch_file
-    ( test -f $$($(1)_source_dir)/$(4) || \
     ( $(call fetch_file_inner,$(1),$(2),$(3),$(4),$(5)) || \
-      $(call fetch_file_inner,$(1),$(FALLBACK_DOWNLOAD_PATH),$(3),$(4),$(5))))
+      $(call fetch_file_inner,$(1),$(FALLBACK_DOWNLOAD_PATH),$(3),$(4),$(5)))
 endef
 
 define int_get_build_recipe_hash
@@ -70,7 +69,7 @@ $(1)_build_log:=$(BASEDIR)/$(1)-$($(1)_version)-$($(1)_build_id).log
 $(1)_all_sources=$($(1)_file_name) $($(1)_extra_sources)
 
 #stamps
-$(1)_fetched=$(SOURCES_PATH)/download-stamps/.stamp_fetched-$(1)-$($(1)_file_name).hash
+$(1)_fetched=$(SOURCES_PATH)/download-stamps/.stamp_fetched-$(1)-$($(1)_version)-$($(1)_sha256_hash).hash
 $(1)_extracted=$$($(1)_extract_dir)/.stamp_extracted
 $(1)_preprocessed=$$($(1)_extract_dir)/.stamp_preprocessed
 $(1)_cleaned=$$($(1)_extract_dir)/.stamp_cleaned
@@ -206,7 +205,6 @@ endif
 $($(1)_fetched):
 	mkdir -p $$(@D) $(SOURCES_PATH)
 	rm -f $$@
-	touch $$@
 	cd $$(@D); $($(1)_fetch_cmds)
 	cd $($(1)_source_dir); $(foreach source,$($(1)_all_sources),$(build_SHA256SUM) $(source) >> $$(@);)
 	touch $$@
diff --git a/depends/packages/qrencode.mk b/depends/packages/qrencode.mk
index e3f614091db0..9aae62f01c1c 100644
--- a/depends/packages/qrencode.mk
+++ b/depends/packages/qrencode.mk
@@ -1,8 +1,9 @@
 package=qrencode
 $(package)_version=4.1.1
-$(package)_download_path=https://fukuchi.org/works/qrencode/
+$(package)_download_path=https://github.com/fukuchi/libqrencode/archive/refs/tags/
+$(package)_download_file=v$($(package)_version).tar.gz
 $(package)_file_name=$(package)-$($(package)_version).tar.gz
-$(package)_sha256_hash=da448ed4f52aba6bcb0cd48cac0dd51b8692bccc4cd127431402fca6f8171e8e
+$(package)_sha256_hash=5385bc1b8c2f20f3b91d258bf8ccc8cf62023935df2d2676b5b67049f31a049c
 $(package)_patches=cmake_fixups.patch
 
 define $(package)_set_vars

From 15445d326cda6a23686d29f473e173a93dfeda6d Mon Sep 17 00:00:00 2001
From: UdjinM6 <UdjinM6@users.noreply.github.com>
Date: Tue, 4 Nov 2025 01:56:55 +0300
Subject: [PATCH 390/656] fix: bump PORT_RANGE 5000->10000

---
 test/functional/test_framework/util.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/functional/test_framework/util.py b/test/functional/test_framework/util.py
index 107bd72cc6c3..10744eaffd0d 100644
--- a/test/functional/test_framework/util.py
+++ b/test/functional/test_framework/util.py
@@ -311,7 +311,7 @@ def random_bytes(n):
 # Don't assign rpc or p2p ports lower than this
 PORT_MIN = int(os.getenv('TEST_RUNNER_PORT_MIN', default=11000))
 # The number of ports to "reserve" for p2p and rpc, each
-PORT_RANGE = 5000
+PORT_RANGE = 10000
 
 
 class PortSeed:

From 9b22095c81e5d2b787e44bc1eb55695d5d3b4c62 Mon Sep 17 00:00:00 2001
From: UdjinM6 <UdjinM6@users.noreply.github.com>
Date: Wed, 29 Oct 2025 16:57:52 +0300
Subject: [PATCH 391/656] Various suggestions
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Major Improvements ✅

1. Simplified FindNode API

// REMOVED the complex FindNodeLocked/FindNodeLockedMutable distinction
- const CNode* FindNodeLocked(...) const SHARED_LOCKS_REQUIRED(m_nodes_mutex);
- CNode* FindNodeLockedMutable(...) EXCLUSIVE_LOCKS_REQUIRED(m_nodes_mutex);

// REPLACED with simple template-based approach
template<typename Key>
const CNode* FindNode(const Key& key, ...) const SHARED_LOCKS_REQUIRED(m_nodes_mutex);

template<typename Key>
CNode* FindNodeMutable(const Key& key, ...) SHARED_LOCKS_REQUIRED(m_nodes_mutex);

Analysis: ✅ Much better!
- Generic template handles all key types (CNetAddr, CService, NodeId, string)
- Both require only SHARED_LOCKS_REQUIRED - correctly reflects that finding in the vector only needs shared lock
- Mutable vs const is about pointer type, not lock type
- Eliminates ~80 lines of duplicate code

2. Fixed getPendingProbes Lock Annotation

// BEFORE: Incorrectly required m_nodes_mutex
- const auto getPendingProbes = [&]() EXCLUSIVE_LOCKS_REQUIRED(m_nodes_mutex, cs_vPendingMasternodes) {
-     AssertLockHeld(m_nodes_mutex);

// AFTER: Only requires cs_vPendingMasternodes (correct!)
+ const auto getPendingProbes = [&]() EXCLUSIVE_LOCKS_REQUIRED(cs_vPendingMasternodes) {

Analysis: ✅ Correct! This fixes the issue we identified - getPendingProbes doesn't access m_nodes.

3. Fixed getPendingQuorumNodes Lock Annotation

// BEFORE: Required exclusive lock
- const auto getPendingQuorumNodes = [&]() EXCLUSIVE_LOCKS_REQUIRED(m_nodes_mutex, cs_vPendingMasternodes) {
-     AssertLockHeld(m_nodes_mutex);

// AFTER: Only requires shared lock (correct!)
+ const auto getPendingQuorumNodes = [&]() SHARED_LOCKS_REQUIRED(m_nodes_mutex)
+                                          EXCLUSIVE_LOCKS_REQUIRED(cs_vPendingMasternodes) {
+     AssertSharedLockHeld(m_nodes_mutex);

Analysis: ✅ Correct!
- Now properly uses SHARED_LOCKS_REQUIRED since it only reads from m_nodes
- Uses AssertSharedLockHeld instead of AssertLockHeld
- Writes to pnode->fDisconnect are safe (atomic)

4. Simplified getConnectToDmn Locking

// BEFORE: Held exclusive lock
- LOCK2(m_nodes_mutex, cs_vPendingMasternodes);

// AFTER: Only holds shared lock for m_nodes
+ READ_LOCK(m_nodes_mutex);
+ LOCK(cs_vPendingMasternodes);

Analysis: ✅ Excellent optimization!
- Only needs shared lock since it's just reading from m_nodes
- Reduces contention significantly

5. Improved Logic in getPendingQuorumNodes

// BEFORE: Complex TOCTOU pattern
- if (const CNode* pnode = FindNodeLocked(addr2)) {
-     slowHandshake = pnode->nTimeFirstMessageReceived.load() != 0s && ...;
- }
- if (slowHandshake) {
-     if (CNode* p2 = FindNodeLockedMutable(addr2)) { p2->fDisconnect = true; }
- }

// AFTER: Simplified single lookup
+ CNode* pnode = FindNodeMutable(addr2);
+ if (pnode && pnode->m_masternode_connection) {
+     continue;
+ }
+ if (connectedNodes.count(addr2)) {
+     bool slow_handshake = pnode && pnode->nTimeFirstMessageReceived.load() != 0s && ...;
+     if (slow_handshake) {
+         pnode->fDisconnect = true;  // Direct access, no second lookup
+     }

Analysis: ✅ Much cleaner!
- Eliminates TOCTOU issue by using single pointer
- More readable logic flow
- Early connectedProRegTxHashes check avoids unnecessary work

6. Renamed Helper Methods for Clarity

// BEFORE: Confusing names
- WithNodeShared()
- WithNodeExclusive()
- ExistsNodeShared()

// AFTER: Clear intent
+ WithNodeMutable()  // Callback gets mutable CNode*
+ ExistsNode()       // Simple existence check

Analysis: ✅ Better naming!
- WithNodeMutable clearly indicates you get a mutable pointer
- No need for "Shared" suffix - the shared lock is an implementation detail
- The lock type is in the function signature for type safety

7. Proper AssertSharedLockHeld Implementation

// BEFORE: Hacky workaround with NO_THREAD_SAFETY_ANALYSIS
- inline void AssertSharedLockHeldInline(...) NO_THREAD_SAFETY_ANALYSIS {
-     AssertLockHeldInternal(...);
- }

// AFTER: Proper template specialization
+ template <typename MutexType>
+ void AssertSharedLockHeldInternal(...) SHARED_LOCKS_REQUIRED(cs) { ... }
+ template void AssertSharedLockHeldInternal(..., SharedMutex*);

Analysis: ✅ Much better!
- Proper template implementation
- Correct thread safety annotations
- No need for NO_THREAD_SAFETY_ANALYSIS hack

Remaining Observations

⚠️ FindNodeMutable with Shared Lock

template<typename Key>
CNode* FindNodeMutable(const Key& key, ...) SHARED_LOCKS_REQUIRED(m_nodes_mutex)

Question: This returns a mutable CNode* under shared lock. Is this intentional?

Answer: ✅ Yes, this is correct!
- The shared lock protects the m_nodes container, not the CNode objects
- CNode has internal thread safety
- Returning mutable pointer allows modifying atomic members like fDisconnect
- The "Mutable" in the name documents this is intentional

✅ IsMasternodeOrDisconnectRequested Now Const

- bool IsMasternodeOrDisconnectRequested(const CService& addr);
+ bool IsMasternodeOrDisconnectRequested(const CService& addr) const;

Analysis: ✅ Correct - it's a read-only operation.

Summary of Improvements

| Issue                                 | Status  | Notes                             |
|---------------------------------------|---------|-----------------------------------|
| Unnecessary FindNodeLocked variants   | ✅ Fixed | Replaced with clean templates     |
| getPendingProbes incorrect lock       | ✅ Fixed | Removed m_nodes_mutex requirement |
| getPendingQuorumNodes wrong lock type | ✅ Fixed | Changed to SHARED_LOCKS_REQUIRED  |
| TOCTOU in masternode connection       | ✅ Fixed | Single pointer lookup             |
| AssertSharedLockHeld hack             | ✅ Fixed | Proper template implementation    |
| Confusing method names                | ✅ Fixed | Better naming convention          |
| Over-locking in getConnectToDmn       | ✅ Fixed | Changed to READ_LOCK              |

Reviewed-by: Claude (Anthropic AI Assistant)
---
 src/net.cpp  | 195 +++++++++++++--------------------------------------
 src/net.h    |  43 +++++-------
 src/sync.cpp |   9 +++
 src/sync.h   |  10 +--
 4 files changed, 82 insertions(+), 175 deletions(-)

diff --git a/src/net.cpp b/src/net.cpp
index 9b4a07a55690..ea4f08246e13 100644
--- a/src/net.cpp
+++ b/src/net.cpp
@@ -338,88 +338,10 @@ bool IsLocal(const CService& addr)
     return mapLocalHost.count(addr) > 0;
 }
 
-// Internal FindNodeLocked - const versions do the actual work
-const CNode* CConnman::FindNodeLocked(const CNetAddr& ip, bool fExcludeDisconnecting) const
-{
-    for (const CNode* pnode : m_nodes) {
-        if (fExcludeDisconnecting && pnode->fDisconnect) {
-            continue;
-        }
-        if (static_cast<CNetAddr>(pnode->addr) == ip) {
-            return pnode;
-        }
-    }
-    return nullptr;
-}
-
-const CNode* CConnman::FindNodeLocked(const std::string& addrName, bool fExcludeDisconnecting) const
-{
-    for (const CNode* pnode : m_nodes) {
-        if (fExcludeDisconnecting && pnode->fDisconnect) {
-            continue;
-        }
-        if (pnode->m_addr_name == addrName) {
-            return pnode;
-        }
-    }
-    return nullptr;
-}
-
-const CNode* CConnman::FindNodeLocked(const CService& addr, bool fExcludeDisconnecting) const
-{
-    for (const CNode* pnode : m_nodes) {
-        if (fExcludeDisconnecting && pnode->fDisconnect) {
-            continue;
-        }
-        if (static_cast<CService>(pnode->addr) == addr) {
-            return pnode;
-        }
-    }
-    return nullptr;
-}
-
-const CNode* CConnman::FindNodeLocked(NodeId id, bool fExcludeDisconnecting) const
-{
-    for (const CNode* pnode : m_nodes) {
-        if (fExcludeDisconnecting && pnode->fDisconnect) {
-            continue;
-        }
-        if (pnode->GetId() == id) {
-            return pnode;
-        }
-    }
-    return nullptr;
-}
-
-CNode* CConnman::FindNodeLockedMutable(const CNetAddr& ip, bool fExcludeDisconnecting)
-{
-    AssertLockHeld(m_nodes_mutex);
-    return const_cast<CNode*>(FindNodeLocked(ip, fExcludeDisconnecting));
-}
-
-CNode* CConnman::FindNodeLockedMutable(const std::string& addrName, bool fExcludeDisconnecting)
-{
-    AssertLockHeld(m_nodes_mutex);
-    return const_cast<CNode*>(FindNodeLocked(addrName, fExcludeDisconnecting));
-}
-
-CNode* CConnman::FindNodeLockedMutable(const CService& addr, bool fExcludeDisconnecting)
-{
-    AssertLockHeld(m_nodes_mutex);
-    return const_cast<CNode*>(FindNodeLocked(addr, fExcludeDisconnecting));
-}
-
-CNode* CConnman::FindNodeLockedMutable(NodeId id, bool fExcludeDisconnecting)
-{
-    AssertLockHeld(m_nodes_mutex);
-    return const_cast<CNode*>(FindNodeLocked(id, fExcludeDisconnecting));
-}
-
-
 bool CConnman::AlreadyConnectedToAddress(const CAddress& addr) const
 {
     READ_LOCK(m_nodes_mutex);
-    return FindNodeLocked(static_cast<CService>(addr)) != nullptr;
+    return FindNode(static_cast<CService>(addr)) != nullptr;
 }
 
 bool CConnman::CheckIncomingNonce(uint64_t nonce) const
@@ -457,8 +379,7 @@ CNode* CConnman::ConnectNode(CAddress addrConnect, const char *pszDest, bool fCo
         }
 
         // Look for an existing connection
-        if (WithNodeShared(static_cast<CService>(addrConnect), [](const CNode*){ return true; }))
-        {
+        if (ExistsNode(static_cast<CService>(addrConnect))) {
             LogPrintf("Failed to open new connection, already connected\n");
             return nullptr;
         }
@@ -493,7 +414,7 @@ CNode* CConnman::ConnectNode(CAddress addrConnect, const char *pszDest, bool fCo
                 }
                 // It is possible that we already have a connection to the IP/port pszDest resolved to.
                 // In that case, drop the connection that was just created.
-                if (ExistsNodeShared(static_cast<CService>(addrConnect))) {
+                if (ExistsNode(static_cast<CService>(addrConnect))) {
                     LogPrintf("Not opening a connection to %s, already connected to %s\n", pszDest, addrConnect.ToStringAddrPort());
                     return nullptr;
                 }
@@ -1882,7 +1803,7 @@ bool CConnman::AttemptToEvictConnection()
     if (!node_id_to_evict) {
         return false;
     }
-    return WithNodeExclusive(*node_id_to_evict, [](CNode* pnode){
+    return WithNodeMutable(*node_id_to_evict, [](CNode* pnode){
         LogPrint(BCLog::NET_NETCONN, "selected %s connection for eviction peer=%d; disconnecting\n", pnode->ConnectionTypeAsString(), pnode->GetId());
         pnode->fDisconnect = true;
         return true;
@@ -3447,52 +3368,53 @@ void CConnman::ThreadOpenMasternodeConnections(CDeterministicMNManager& dmnman,
 
         MasternodeProbeConn isProbe = MasternodeProbeConn::IsNotConnection;
 
-        const auto getPendingQuorumNodes = [&]() EXCLUSIVE_LOCKS_REQUIRED(m_nodes_mutex, cs_vPendingMasternodes) {
-            AssertLockHeld(m_nodes_mutex);
+        const auto getPendingQuorumNodes = [&]() SHARED_LOCKS_REQUIRED(m_nodes_mutex) EXCLUSIVE_LOCKS_REQUIRED(cs_vPendingMasternodes) {
+            AssertSharedLockHeld(m_nodes_mutex);
             AssertLockHeld(cs_vPendingMasternodes);
             std::vector<CDeterministicMNCPtr> ret;
             for (const auto& group : masternodeQuorumNodes) {
                 for (const auto& proRegTxHash : group.second) {
+                    if (connectedProRegTxHashes.count(proRegTxHash)) {
+                        continue;
+                    }
                     auto dmn = mnList.GetMN(proRegTxHash);
                     if (!dmn) {
                         continue;
                     }
                     const auto addr2 = dmn->pdmnState->netInfo->GetPrimary();
-                    if (connectedNodes.count(addr2) && !connectedProRegTxHashes.count(proRegTxHash)) {
+                    CNode* pnode = FindNodeMutable(addr2);
+                    if (pnode && pnode->m_masternode_connection) {
+                        // node is masternode, skip it
+                        continue;
+                    }
+                    if (connectedNodes.count(addr2)) {
                         // we probably connected to it before it became a masternode
                         // or maybe we are still waiting for mnauth
-                        // Use shared access since we already hold m_nodes_mutex
-                        bool slowHandshake = false;
-                        if (const CNode* pnode = FindNodeLocked(addr2)) {
-                            slowHandshake = pnode->nTimeFirstMessageReceived.load() != 0s && GetTime<std::chrono::seconds>() - pnode->nTimeFirstMessageReceived.load() > 5s;
-                        }
-                        if (slowHandshake) {
+                        bool slow_handshake = pnode && pnode->nTimeFirstMessageReceived.load() != 0s &&
+                                             GetTime<std::chrono::seconds>() - pnode->nTimeFirstMessageReceived.load() > 5s;
+                        if (slow_handshake) {
                             // clearly not expecting mnauth to take that long even if it wasn't the first message
                             // we received (as it should normally), disconnect
-                            LogPrint(BCLog::NET_NETCONN, "CConnman::%s -- dropping non-mnauth connection to %s, service=%s\n", _func_, proRegTxHash.ToString(), addr2.ToStringAddrPort());
-                            if (CNode* p2 = FindNodeLockedMutable(addr2)) { p2->fDisconnect = true; }
+                            LogPrint(BCLog::NET_NETCONN, "CConnman::%s -- dropping non-mnauth connection to %s, service=%s\n",
+                                                         _func_, proRegTxHash.ToString(), addr2.ToStringAddrPort());
+                            pnode->fDisconnect = true;
                         }
                         // either way - it's not ready, skip it for now
                         continue;
                     }
-                    // Check if node is masternode or disconnect requested using FindNodeLocked
-                    const CNode* existingNode = FindNodeLocked(addr2);
-                    bool isDisconnectRequested = existingNode && (existingNode->m_masternode_connection || existingNode->fDisconnect);
-                    if (!connectedNodes.count(addr2) && !isDisconnectRequested && !connectedProRegTxHashes.count(proRegTxHash)) {
-                        int64_t lastAttempt = mn_metaman.GetMetaInfo(dmn->proTxHash)->GetLastOutboundAttempt();
-                        // back off trying connecting to an address if we already tried recently
-                        if (nANow - lastAttempt < chainParams.LLMQConnectionRetryTimeout()) {
-                            continue;
-                        }
-                        ret.emplace_back(dmn);
+                    // back off connecting to an address if we already tried recently
+                    int64_t last_attempt = mn_metaman.GetMetaInfo(dmn->proTxHash)->GetLastOutboundAttempt();
+                    if (nANow - last_attempt < chainParams.LLMQConnectionRetryTimeout()) {
+                        continue;
                     }
+                    // all checks passed
+                    ret.emplace_back(dmn);
                 }
             }
             return ret;
         };
 
-        const auto getPendingProbes = [&]() EXCLUSIVE_LOCKS_REQUIRED(m_nodes_mutex, cs_vPendingMasternodes) {
-            AssertLockHeld(m_nodes_mutex);
+        const auto getPendingProbes = [&]() EXCLUSIVE_LOCKS_REQUIRED(cs_vPendingMasternodes) {
             AssertLockHeld(cs_vPendingMasternodes);
             std::vector<CDeterministicMNCPtr> ret;
             for (auto it = masternodePendingProbes.begin(); it != masternodePendingProbes.end(); ) {
@@ -3523,24 +3445,23 @@ void CConnman::ThreadOpenMasternodeConnections(CDeterministicMNManager& dmnman,
 
         auto getConnectToDmn = [&]() -> CDeterministicMNCPtr {
             // don't hold lock while calling OpenMasternodeConnection as cs_main is locked deep inside
-            LOCK2(m_nodes_mutex, cs_vPendingMasternodes);
+            READ_LOCK(m_nodes_mutex);
+            LOCK(cs_vPendingMasternodes);
 
             if (!vPendingMasternodes.empty()) {
                 auto dmn = mnList.GetValidMN(vPendingMasternodes.front());
                 vPendingMasternodes.erase(vPendingMasternodes.begin());
                 // Check if we should connect to this masternode
-                // We already hold m_nodes_mutex here, so check fDisconnect and m_masternode_connection directly
-                bool shouldConnect = true;
+                // We already hold m_nodes_mutex here, so check m_masternode_connection directly
                 if (dmn && !connectedNodes.count(dmn->pdmnState->netInfo->GetPrimary())) {
-                    bool anyBad = false;
-                    if (const CNode* pnode = FindNodeLocked(dmn->pdmnState->netInfo->GetPrimary())) {
-                        anyBad = pnode->m_masternode_connection || pnode->fDisconnect;
+                    if (const CNode* pnode = FindNode(dmn->pdmnState->netInfo->GetPrimary())) {
+                        if (!pnode->m_masternode_connection) {
+                            LogPrint(BCLog::NET_NETCONN, "CConnman::%s -- opening pending masternode connection to %s, service=%s\n",
+                                                         _func_, dmn->proTxHash.ToString(),
+                                                         dmn->pdmnState->netInfo->GetPrimary().ToStringAddrPort());
+                            return dmn;
+                        }
                     }
-                    shouldConnect = !anyBad;
-                }
-                if (dmn && shouldConnect) {
-                    LogPrint(BCLog::NET_NETCONN, "CConnman::%s -- opening pending masternode connection to %s, service=%s\n", _func_, dmn->proTxHash.ToString(), dmn->pdmnState->netInfo->GetPrimary().ToStringAddrPort());
-                    return dmn;
                 }
             }
 
@@ -3626,8 +3547,9 @@ void CConnman::OpenNetworkConnection(const CAddress& addrConnect, bool fCountFai
         if (addrConnect.GetPort() == GetListenPort() && IsLocal(addrConnect)) {
             return;
         }
-    } else if (WithNodeShared(std::string(pszDest), [](const CNode*){ return true; }))
+    } else if (ExistsNode(std::string(pszDest))) {
         return;
+    }
 
     LogPrint(BCLog::NET_NETCONN, "CConnman::%s -- connecting to %s\n", __func__, getIpStr());
     CNode* pnode = ConnectNode(addrConnect, pszDest, fCountFailure, conn_type, use_v2transport);
@@ -4533,7 +4455,7 @@ void CConnman::GetNodeStats(std::vector<CNodeStats>& vstats) const
 
 bool CConnman::DisconnectNode(const std::string& strNode)
 {
-    return WithNodeExclusive(strNode, [&](CNode* pnode){
+    return WithNodeMutable(strNode, [&](CNode* pnode){
         LogPrint(BCLog::NET_NETCONN, "disconnect by address%s matched peer=%d; disconnecting\n", (fLogIPs ? strprintf("=%s", strNode) : ""), pnode->GetId());
         pnode->fDisconnect = true;
         return true;
@@ -4561,7 +4483,7 @@ bool CConnman::DisconnectNode(const CNetAddr& addr)
 
 bool CConnman::DisconnectNode(NodeId id)
 {
-    return WithNodeExclusive(id, [&](CNode* pnode){
+    return WithNodeMutable(id, [&](CNode* pnode){
         LogPrint(BCLog::NET_NETCONN, "disconnect by id peer=%d; disconnecting\n", pnode->GetId());
         pnode->fDisconnect = true;
         return true;
@@ -4816,50 +4738,33 @@ void CConnman::PushMessage(CNode* pnode, CSerializedNetMsg&& msg)
 bool CConnman::ForNode(const CService& addr, std::function<bool(const CNode* pnode)> cond, std::function<bool(CNode* pnode)> func)
 {
     READ_LOCK(m_nodes_mutex);
-    CNode* found = nullptr;
-    for (auto&& pnode : m_nodes) {
-        if((CService)pnode->addr == addr) {
-            found = pnode;
-            break;
-        }
-    }
+    CNode* found = FindNodeMutable(addr, false);
     return found != nullptr && cond(found) && func(found);
 }
 
 bool CConnman::ForNode(const CService& addr, std::function<bool(const CNode* pnode)> cond, std::function<bool(const CNode* pnode)> func) const
 {
     READ_LOCK(m_nodes_mutex);
-    const CNode* found = FindNodeLockedBy(addr, false);
+    const CNode* found = FindNode(addr, false);
     return found != nullptr && cond(found) && func(found);
 }
 
-bool CConnman::ForNode(NodeId id, std::function<bool(const CNode* pnode)> cond, std::function<bool(const CNode* pnode)> func) const
+bool CConnman::ForNode(NodeId id, std::function<bool(const CNode* pnode)> cond, std::function<bool(CNode* pnode)> func)
 {
-    CNode* found = nullptr;
     READ_LOCK(m_nodes_mutex);
-    for (auto&& pnode : m_nodes) {
-        if(pnode->GetId() == id) {
-            found = pnode;
-            break;
-        }
-    }
+    CNode* found = FindNodeMutable(id, false);
     return found != nullptr && cond(found) && func(found);
 }
 
-bool CConnman::ForNode(NodeId id, std::function<bool(const CNode* pnode)> cond, std::function<bool(CNode* pnode)> func)
+bool CConnman::ForNode(NodeId id, std::function<bool(const CNode* pnode)> cond, std::function<bool(const CNode* pnode)> func) const
 {
-    CNode* found = nullptr;
     READ_LOCK(m_nodes_mutex);
-    for (auto&& pnode : m_nodes) {
-        if(pnode->GetId() == id) {
-            found = pnode;
-            break;
-        }
-    }
+    const CNode* found = FindNode(id, false);
     return found != nullptr && cond(found) && func(found);
 }
 
-bool CConnman::IsMasternodeOrDisconnectRequested(const CService& addr) {
+bool CConnman::IsMasternodeOrDisconnectRequested(const CService& addr) const
+{
     return ForNode(addr, AllNodes, [](const CNode* pnode){
         return pnode->m_masternode_connection || pnode->fDisconnect;
     });
diff --git a/src/net.h b/src/net.h
index d06e0c845cf7..b2e457fef01d 100644
--- a/src/net.h
+++ b/src/net.h
@@ -1324,7 +1324,7 @@ friend class CNode;
         });
     }
 
-    bool IsMasternodeOrDisconnectRequested(const CService& addr) EXCLUSIVE_LOCKS_REQUIRED(!m_nodes_mutex);
+    bool IsMasternodeOrDisconnectRequested(const CService& addr) const EXCLUSIVE_LOCKS_REQUIRED(!m_nodes_mutex);
 
     void PushMessage(CNode* pnode, CSerializedNetMsg&& msg)
         EXCLUSIVE_LOCKS_REQUIRED(!mutexMsgProc, !m_total_bytes_sent_mutex);
@@ -1634,17 +1634,6 @@ friend class CNode;
 
     uint64_t CalculateKeyedNetGroup(const CAddress& ad) const;
 
-    const CNode* FindNodeLocked(const CNetAddr& ip, bool fExcludeDisconnecting = true) const SHARED_LOCKS_REQUIRED(m_nodes_mutex);
-    const CNode* FindNodeLocked(const std::string& addrName, bool fExcludeDisconnecting = true) const SHARED_LOCKS_REQUIRED(m_nodes_mutex);
-    const CNode* FindNodeLocked(const CService& addr, bool fExcludeDisconnecting = true) const SHARED_LOCKS_REQUIRED(m_nodes_mutex);
-    const CNode* FindNodeLocked(NodeId id, bool fExcludeDisconnecting = true) const SHARED_LOCKS_REQUIRED(m_nodes_mutex);
-
-    // Mutable find helpers for callers that already hold the exclusive lock
-    CNode* FindNodeLockedMutable(const CNetAddr& ip, bool fExcludeDisconnecting = true) EXCLUSIVE_LOCKS_REQUIRED(m_nodes_mutex);
-    CNode* FindNodeLockedMutable(const std::string& addrName, bool fExcludeDisconnecting = true) EXCLUSIVE_LOCKS_REQUIRED(m_nodes_mutex);
-    CNode* FindNodeLockedMutable(const CService& addr, bool fExcludeDisconnecting = true) EXCLUSIVE_LOCKS_REQUIRED(m_nodes_mutex);
-    CNode* FindNodeLockedMutable(NodeId id, bool fExcludeDisconnecting = true) EXCLUSIVE_LOCKS_REQUIRED(m_nodes_mutex);
-
     // Type-agnostic node matching helpers
     static inline bool NodeMatches(const CNode* p, const CService& addr)
     {
@@ -1664,8 +1653,9 @@ friend class CNode;
     }
 
     template<typename Key>
-    const CNode* FindNodeLockedBy(const Key& key, bool fExcludeDisconnecting = true) const SHARED_LOCKS_REQUIRED(m_nodes_mutex)
+    const CNode* FindNode(const Key& key, bool fExcludeDisconnecting = true) const SHARED_LOCKS_REQUIRED(m_nodes_mutex)
     {
+        AssertSharedLockHeld(m_nodes_mutex);
         for (const CNode* pnode : m_nodes) {
             if (fExcludeDisconnecting && pnode->fDisconnect) continue;
             if (NodeMatches(pnode, key)) return pnode;
@@ -1673,30 +1663,33 @@ friend class CNode;
         return nullptr;
     }
 
+    template<typename Key>
+    CNode* FindNodeMutable(const Key& key, bool fExcludeDisconnecting = true) SHARED_LOCKS_REQUIRED(m_nodes_mutex)
+    {
+        AssertSharedLockHeld(m_nodes_mutex);
+        for (CNode* pnode : m_nodes) {
+            if (fExcludeDisconnecting && pnode->fDisconnect) continue;
+            if (NodeMatches(pnode, key)) return pnode;
+        }
+        return nullptr;
+    }
+
     // Callback helpers with explicit lock semantics (templated on key type)
     // Lambda-based shared accessor returning optional result (nullopt = not found)
     template<typename Key, typename Callable>
-    std::optional<std::invoke_result_t<Callable, const CNode*>> WithNodeShared(const Key& key, Callable&& fn) EXCLUSIVE_LOCKS_REQUIRED(!m_nodes_mutex)
+    std::optional<std::invoke_result_t<Callable, CNode*>> WithNodeMutable(const Key& key, Callable&& fn) EXCLUSIVE_LOCKS_REQUIRED(!m_nodes_mutex)
     {
         READ_LOCK(m_nodes_mutex);
-        if (const CNode* p = FindNodeLockedBy(key)) return std::optional<std::invoke_result_t<Callable, const CNode*>>{fn(p)};
+        if (CNode* p = FindNodeMutable(key)) return std::optional<std::invoke_result_t<Callable, CNode*>>{fn(p)};
         return std::nullopt;
     }
 
     // Fast existence check under shared lock
     template<typename Key>
-    bool ExistsNodeShared(const Key& key) EXCLUSIVE_LOCKS_REQUIRED(!m_nodes_mutex)
-    {
-        READ_LOCK(m_nodes_mutex);
-        return FindNodeLockedBy(key) != nullptr;
-    }
-
-    template<typename Key, typename Callable>
-    std::optional<std::invoke_result_t<Callable, CNode*>> WithNodeExclusive(const Key& key, Callable&& fn) EXCLUSIVE_LOCKS_REQUIRED(!m_nodes_mutex)
+    bool ExistsNode(const Key& key) const EXCLUSIVE_LOCKS_REQUIRED(!m_nodes_mutex)
     {
         READ_LOCK(m_nodes_mutex);
-        if (const CNode* cp = FindNodeLockedBy(key)) return std::optional<std::invoke_result_t<Callable, CNode*>>{fn(const_cast<CNode*>(cp))};
-        return std::nullopt;
+        return FindNode(key) != nullptr;
     }
 
     /**
diff --git a/src/sync.cpp b/src/sync.cpp
index d1c06376dc0c..1747b69f6fee 100644
--- a/src/sync.cpp
+++ b/src/sync.cpp
@@ -287,6 +287,15 @@ template void AssertLockHeldInternal(const char*, const char*, int, Mutex*);
 template void AssertLockHeldInternal(const char*, const char*, int, RecursiveMutex*);
 template void AssertLockHeldInternal(const char*, const char*, int, SharedMutex*);
 
+template <typename MutexType>
+void AssertSharedLockHeldInternal(const char* pszName, const char* pszFile, int nLine, MutexType* cs)
+{
+    if (LockHeld(cs)) return;
+    tfm::format(std::cerr, "Assertion failed: shared lock %s not held in %s:%i; locks held:\n%s", pszName, pszFile, nLine, LocksHeld());
+    abort();
+}
+template void AssertSharedLockHeldInternal(const char*, const char*, int, SharedMutex*);
+
 template <typename MutexType>
 void AssertLockNotHeldInternal(const char* pszName, const char* pszFile, int nLine, MutexType* cs)
 {
diff --git a/src/sync.h b/src/sync.h
index e22fb3c62ad7..3a4220c40c35 100644
--- a/src/sync.h
+++ b/src/sync.h
@@ -61,6 +61,8 @@ void CheckLastCritical(void* cs, std::string& lockname, const char* guardname, c
 template <typename MutexType>
 void AssertLockHeldInternal(const char* pszName, const char* pszFile, int nLine, MutexType* cs) EXCLUSIVE_LOCKS_REQUIRED(cs);
 template <typename MutexType>
+void AssertSharedLockHeldInternal(const char* pszName, const char* pszFile, int nLine, MutexType* cs) SHARED_LOCKS_REQUIRED(cs);
+template <typename MutexType>
 void AssertLockNotHeldInternal(const char* pszName, const char* pszFile, int nLine, MutexType* cs) LOCKS_EXCLUDED(cs);
 void DeleteLock(void* cs);
 bool LockStackEmpty();
@@ -79,6 +81,8 @@ inline void CheckLastCritical(void* cs, std::string& lockname, const char* guard
 template <typename MutexType>
 inline void AssertLockHeldInternal(const char* pszName, const char* pszFile, int nLine, MutexType* cs) EXCLUSIVE_LOCKS_REQUIRED(cs) {}
 template <typename MutexType>
+inline void AssertSharedLockHeldInternal(const char* pszName, const char* pszFile, int nLine, MutexType* cs) SHARED_LOCKS_REQUIRED(cs) {};
+template <typename MutexType>
 void AssertLockNotHeldInternal(const char* pszName, const char* pszFile, int nLine, MutexType* cs) LOCKS_EXCLUDED(cs) {}
 inline void DeleteLock(void* cs) {}
 inline bool LockStackEmpty() { return true; }
@@ -160,11 +164,7 @@ class GlobalMutex : public Mutex { };
 using SharedMutex = SharedAnnotatedMixin<std::shared_mutex>;
 
 #define AssertLockHeld(cs) AssertLockHeldInternal(#cs, __FILE__, __LINE__, &cs)
-
-// For shared locks, we use the same internal function but disable thread safety analysis
-// because the function signature requires exclusive lock but we only have shared lock
-inline void AssertSharedLockHeldInline(const char* name, const char* file, int line, SharedMutex* cs) NO_THREAD_SAFETY_ANALYSIS { AssertLockHeldInternal(name, file, line, cs); }
-#define AssertSharedLockHeld(cs) (AssertSharedLockHeldInline(#cs, __FILE__, __LINE__, &cs))
+#define AssertSharedLockHeld(cs) AssertSharedLockHeldInternal(#cs, __FILE__, __LINE__, &cs)
 
 inline void AssertLockNotHeldInline(const char* name, const char* file, int line, Mutex* cs) EXCLUSIVE_LOCKS_REQUIRED(!cs) { AssertLockNotHeldInternal(name, file, line, cs); }
 inline void AssertLockNotHeldInline(const char* name, const char* file, int line, RecursiveMutex* cs) LOCKS_EXCLUDED(cs) { AssertLockNotHeldInternal(name, file, line, cs); }

From d89646d5fce0ceaa40c97b285cee95d0504af82c Mon Sep 17 00:00:00 2001
From: UdjinM6 <UdjinM6@users.noreply.github.com>
Date: Tue, 4 Nov 2025 11:12:19 +0300
Subject: [PATCH 392/656] fix: logic error in `CheckDecryptionKey`

---
 src/wallet/scriptpubkeyman.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/wallet/scriptpubkeyman.cpp b/src/wallet/scriptpubkeyman.cpp
index 28c354dd6997..db18ad9e6999 100644
--- a/src/wallet/scriptpubkeyman.cpp
+++ b/src/wallet/scriptpubkeyman.cpp
@@ -222,7 +222,7 @@ bool LegacyScriptPubKeyMan::CheckDecryptionKey(const CKeyingMaterial& master_key
             return false;
         }
 
-        if(!m_hd_chain.IsNull() && !m_hd_chain.IsCrypted()) {
+        if(!m_hd_chain.IsNull() && m_hd_chain.IsCrypted()) {
             // try to decrypt seed and make sure it matches
             CHDChain hdChainTmp;
             if (!DecryptHDChain(master_key, hdChainTmp) || (m_hd_chain.GetID() != hdChainTmp.GetSeedHash())) {

From 0e950e07979792e734e6637efbe5f9172b9071e2 Mon Sep 17 00:00:00 2001
From: UdjinM6 <UdjinM6@users.noreply.github.com>
Date: Tue, 4 Nov 2025 11:49:54 +0300
Subject: [PATCH 393/656] feat: error logging in `DecryptHDChain`

---
 src/wallet/scriptpubkeyman.cpp | 34 ++++++++++++++++++++++++++--------
 1 file changed, 26 insertions(+), 8 deletions(-)

diff --git a/src/wallet/scriptpubkeyman.cpp b/src/wallet/scriptpubkeyman.cpp
index 28c354dd6997..95e3d4e85b7a 100644
--- a/src/wallet/scriptpubkeyman.cpp
+++ b/src/wallet/scriptpubkeyman.cpp
@@ -544,25 +544,36 @@ bool LegacyScriptPubKeyMan::DecryptHDChain(const CKeyingMaterial& vMasterKeyIn,
     if (!m_storage.HasEncryptionKeys())
         return true;
 
-    if (m_hd_chain.IsNull())
+    if (m_hd_chain.IsNull()) {
+        WalletLogPrintf("%s: ERROR: no HD chain\n", __func__);
         return false;
+    }
 
-    if (!m_hd_chain.IsCrypted())
+    if (!m_hd_chain.IsCrypted()) {
+        WalletLogPrintf("%s: ERROR: HD chain is not encrypted\n", __func__);
         return false;
+    }
 
     SecureVector vchSecureSeed;
     SecureVector vchSecureCryptedSeed = m_hd_chain.GetSeed();
     std::vector<unsigned char> vchCryptedSeed(vchSecureCryptedSeed.begin(), vchSecureCryptedSeed.end());
-    if (!DecryptSecret(vMasterKeyIn, vchCryptedSeed, m_hd_chain.GetID(), vchSecureSeed))
+    if (!DecryptSecret(vMasterKeyIn, vchCryptedSeed, m_hd_chain.GetID(), vchSecureSeed)) {
+        WalletLogPrintf("%s: ERROR: DecryptSecret failed on seed decryption\n", __func__);
         return false;
+    }
 
     hdChainRet = m_hd_chain;
-    if (!hdChainRet.SetSeed(vchSecureSeed, false))
+    if (!hdChainRet.SetSeed(vchSecureSeed, false)) {
+        WalletLogPrintf("%s: ERROR: SetSeed failed\n", __func__);
         return false;
+    }
 
     // hash of decrypted seed must match chain id
-    if (hdChainRet.GetSeedHash() != m_hd_chain.GetID())
+    if (hdChainRet.GetSeedHash() != m_hd_chain.GetID()) {
+        WalletLogPrintf("%s: ERROR: hash of decrypted seed %s doesn't match chain ID %s\n",
+                        __func__, hdChainRet.GetSeedHash().ToString(), m_hd_chain.GetID().ToString());
         return false;
+    }
 
     SecureVector vchSecureCryptedMnemonic;
     SecureVector vchSecureCryptedMnemonicPassphrase;
@@ -575,13 +586,20 @@ bool LegacyScriptPubKeyMan::DecryptHDChain(const CKeyingMaterial& vMasterKeyIn,
         std::vector<unsigned char> vchCryptedMnemonic(vchSecureCryptedMnemonic.begin(), vchSecureCryptedMnemonic.end());
         std::vector<unsigned char> vchCryptedMnemonicPassphrase(vchSecureCryptedMnemonicPassphrase.begin(), vchSecureCryptedMnemonicPassphrase.end());
 
-        if (!vchCryptedMnemonic.empty() && !DecryptSecret(vMasterKeyIn, vchCryptedMnemonic, m_hd_chain.GetID(), vchSecureMnemonic))
+        if (!vchCryptedMnemonic.empty() && !DecryptSecret(vMasterKeyIn, vchCryptedMnemonic, m_hd_chain.GetID(), vchSecureMnemonic)) {
+            WalletLogPrintf("%s: ERROR: DecryptSecret failed on mnemonic decryption\n", __func__);
             return false;
-        if (!vchCryptedMnemonicPassphrase.empty() && !DecryptSecret(vMasterKeyIn, vchCryptedMnemonicPassphrase, m_hd_chain.GetID(), vchSecureMnemonicPassphrase))
+        }
+
+        if (!vchCryptedMnemonicPassphrase.empty() && !DecryptSecret(vMasterKeyIn, vchCryptedMnemonicPassphrase, m_hd_chain.GetID(), vchSecureMnemonicPassphrase)) {
+            WalletLogPrintf("%s: ERROR: DecryptSecret failed on mnemonic passphrase decryption\n", __func__);
             return false;
+        }
 
-        if (!hdChainRet.SetMnemonic(vchSecureMnemonic, vchSecureMnemonicPassphrase, false))
+        if (!hdChainRet.SetMnemonic(vchSecureMnemonic, vchSecureMnemonicPassphrase, false)) {
+            WalletLogPrintf("%s: ERROR: SetMnemonic failed\n", __func__);
             return false;
+        }
     }
 
     hdChainRet.SetCrypted(false);

From 98dc874791c62344760f8401a4b5ccddbb7f17c2 Mon Sep 17 00:00:00 2001
From: Kittywhiskers Van Gogh <63189531+kwvg@users.noreply.github.com>
Date: Tue, 4 Nov 2025 16:55:49 +0530
Subject: [PATCH 394/656] trivial: use `GetBestChainLockHeight()`

---
 src/evo/chainhelper.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/evo/chainhelper.cpp b/src/evo/chainhelper.cpp
index d4661d71b724..9c11fc4e6a3c 100644
--- a/src/evo/chainhelper.cpp
+++ b/src/evo/chainhelper.cpp
@@ -38,7 +38,7 @@ bool CChainstateHelper::HasChainLock(int nHeight, const uint256& blockHash) cons
     return clhandler.HasChainLock(nHeight, blockHash);
 }
 
-int32_t CChainstateHelper::GetBestChainLockHeight() const { return clhandler.GetBestChainLock().getHeight(); }
+int32_t CChainstateHelper::GetBestChainLockHeight() const { return clhandler.GetBestChainLockHeight(); }
 
 /** Passthrough functions to CInstantSendManager */
 std::optional<std::pair</*islock_hash=*/uint256, /*txid=*/uint256>> CChainstateHelper::ConflictingISLockIfAny(

From c0faae0ff5f6784ad9acf2f7b3a8b20a7b3bd425 Mon Sep 17 00:00:00 2001
From: Kittywhiskers Van Gogh <63189531+kwvg@users.noreply.github.com>
Date: Tue, 4 Nov 2025 17:52:36 +0530
Subject: [PATCH 395/656] fix: reuse best clsig to avoid potential race
 condition

---
 src/node/miner.cpp         | 2 +-
 src/rpc/rawtransaction.cpp | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/node/miner.cpp b/src/node/miner.cpp
index 8b2626570da1..d99aeb8aee74 100644
--- a/src/node/miner.cpp
+++ b/src/node/miner.cpp
@@ -173,7 +173,7 @@ static bool CalcCbTxBestChainlock(const llmq::CChainLocksHandler& chainlock_hand
 
         // Inserting our best CL
         bestCLHeightDiff = pindexPrev->nHeight - best_clsig.getHeight();
-        bestCLSignature = chainlock_handler.GetBestChainLock().getSig();
+        bestCLSignature = best_clsig.getSig();
 
         return true;
     }
diff --git a/src/rpc/rawtransaction.cpp b/src/rpc/rawtransaction.cpp
index 424b8cd064e2..c06a297ea3c5 100644
--- a/src/rpc/rawtransaction.cpp
+++ b/src/rpc/rawtransaction.cpp
@@ -667,8 +667,9 @@ static RPCHelpMan getassetunlockstatuses()
     }
     else {
         const auto pBlockIndexBestCL = [&]() -> const CBlockIndex* {
-            if (!llmq_ctx.clhandler->GetBestChainLock().IsNull()) {
-                return pTipBlockIndex->GetAncestor(llmq_ctx.clhandler->GetBestChainLock().getHeight());
+            const auto best_clsig = llmq_ctx.clhandler->GetBestChainLock();
+            if (!best_clsig.IsNull()) {
+                return pTipBlockIndex->GetAncestor(best_clsig.getHeight());
             }
             // If no CL info is available, try to use CbTx CL information
             if (const auto cbtx_best_cl = GetNonNullCoinbaseChainlock(pTipBlockIndex)) {

From 6cb2344a0090ce805777f5a72817bab0be79e9e6 Mon Sep 17 00:00:00 2001
From: Konstantin Akimov <knstqq@gmail.com>
Date: Sat, 11 Oct 2025 14:17:13 +0700
Subject: [PATCH 396/656] refactor: replace direct call of MetaInfo from
 rpc/evo code to helper

---
 src/masternode/meta.cpp | 8 ++++++++
 src/masternode/meta.h   | 1 +
 src/rpc/evo.cpp         | 3 +--
 3 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/src/masternode/meta.cpp b/src/masternode/meta.cpp
index dee9c08397dc..bced7fcfae04 100644
--- a/src/masternode/meta.cpp
+++ b/src/masternode/meta.cpp
@@ -66,6 +66,14 @@ void CMasternodeMetaInfo::RemoveGovernanceObject(const uint256& nGovernanceObjec
     mapGovernanceObjectsVotedOn.erase(nGovernanceObjectHash);
 }
 
+CMasternodeMetaInfo CMasternodeMetaMan::GetInfo(const uint256& proTxHash)
+{
+    const auto info = GetMetaInfo(proTxHash, false);
+    if (info == nullptr) return CMasternodeMetaInfo{};
+
+    return *info;
+}
+
 CMasternodeMetaInfoPtr CMasternodeMetaMan::GetMetaInfo(const uint256& proTxHash, bool fCreate)
 {
     LOCK(cs);
diff --git a/src/masternode/meta.h b/src/masternode/meta.h
index c74b9afe04c5..59f84ee20e1b 100644
--- a/src/masternode/meta.h
+++ b/src/masternode/meta.h
@@ -259,6 +259,7 @@ class CMasternodeMetaMan : public MasternodeMetaStore
 
     bool IsValid() const { return is_valid; }
 
+    CMasternodeMetaInfo GetInfo(const uint256& proTxHash) EXCLUSIVE_LOCKS_REQUIRED(!cs);
     CMasternodeMetaInfoPtr GetMetaInfo(const uint256& proTxHash, bool fCreate = true) EXCLUSIVE_LOCKS_REQUIRED(!cs);
 
     int64_t GetDsqCount() const { return nDsqCount; }
diff --git a/src/rpc/evo.cpp b/src/rpc/evo.cpp
index 1ddd1cfd9980..c4afbce2db75 100644
--- a/src/rpc/evo.cpp
+++ b/src/rpc/evo.cpp
@@ -1379,8 +1379,7 @@ static UniValue BuildDMNListEntry(const CWallet* const pwallet, const CDetermini
     }
 #endif
 
-    const auto metaInfo = mn_metaman.GetMetaInfo(dmn.proTxHash);
-    o.pushKV("metaInfo", metaInfo->ToJson());
+    o.pushKV("metaInfo", mn_metaman.GetInfo(dmn.proTxHash).ToJson());
 
     return o;
 }

From 16abbedce82d084a6d53790ced2ab4d2987ed166 Mon Sep 17 00:00:00 2001
From: Konstantin Akimov <knstqq@gmail.com>
Date: Sat, 11 Oct 2025 22:08:31 +0700
Subject: [PATCH 397/656] refactor: replace direct usages of GetMetaInfo while
 calculating dsq threshold

---
 src/coinjoin/client.cpp | 17 ++++-------------
 src/coinjoin/server.cpp |  9 ++-------
 src/masternode/meta.cpp | 25 ++++++++++++++-----------
 src/masternode/meta.h   |  7 +++++--
 4 files changed, 25 insertions(+), 33 deletions(-)

diff --git a/src/coinjoin/client.cpp b/src/coinjoin/client.cpp
index 0af6a36643b9..b79671e65439 100644
--- a/src/coinjoin/client.cpp
+++ b/src/coinjoin/client.cpp
@@ -124,17 +124,11 @@ MessageProcessingResult CCoinJoinClientQueueManager::ProcessMessage(NodeId from,
             LogPrint(BCLog::COINJOIN, "DSQUEUE -- CoinJoin queue is ready, masternode=%s, queue=%s\n", dmn->proTxHash.ToString(), dsq.ToString());
             return ret;
         } else {
-            int64_t nLastDsq = m_mn_metaman.GetMetaInfo(dmn->proTxHash)->GetLastDsq();
-            int64_t nDsqThreshold = m_mn_metaman.GetDsqThreshold(dmn->proTxHash, tip_mn_list.GetValidMNsCount());
-            LogPrint(BCLog::COINJOIN, "DSQUEUE -- nLastDsq: %d  nDsqThreshold: %d  nDsqCount: %d\n", nLastDsq,
-                     nDsqThreshold, m_mn_metaman.GetDsqCount());
-            // don't allow a few nodes to dominate the queuing process
-            if (nLastDsq != 0 && nDsqThreshold > m_mn_metaman.GetDsqCount()) {
+            if (m_mn_metaman.IsDsqOver(dmn->proTxHash, tip_mn_list.GetValidMNsCount())) {
                 LogPrint(BCLog::COINJOIN, "DSQUEUE -- Masternode %s is sending too many dsq messages\n",
                          dmn->proTxHash.ToString());
                 return ret;
             }
-
             m_mn_metaman.AllowMixing(dmn->proTxHash);
 
             LogPrint(BCLog::COINJOIN, "DSQUEUE -- new CoinJoin queue, masternode=%s, queue=%s\n", dmn->proTxHash.ToString(), dsq.ToString());
@@ -1180,13 +1174,10 @@ bool CCoinJoinClientSession::StartNewQueue(CAmount nBalanceNeedsAnonymized, CCon
             continue;
         }
 
-        int64_t nLastDsq = m_mn_metaman.GetMetaInfo(dmn->proTxHash)->GetLastDsq();
-        int64_t nDsqThreshold = m_mn_metaman.GetDsqThreshold(dmn->proTxHash, nMnCount);
-        if (nLastDsq != 0 && nDsqThreshold > m_mn_metaman.GetDsqCount()) {
+        if (m_mn_metaman.IsDsqOver(dmn->proTxHash, nMnCount)) {
             WalletCJLogPrint(m_wallet, /* Continued */
-                             "CCoinJoinClientSession::StartNewQueue -- too early to mix with node," /* Continued */
-                             " masternode=%s, nLastDsq=%d, nDsqThreshold=%d, nDsqCount=%d\n",
-                             dmn->proTxHash.ToString(), nLastDsq, nDsqThreshold, m_mn_metaman.GetDsqCount());
+                             "CCoinJoinClientSession::StartNewQueue -- too early to mix with node masternode=%s\n",
+                             dmn->proTxHash.ToString());
             nTries++;
             continue;
         }
diff --git a/src/coinjoin/server.cpp b/src/coinjoin/server.cpp
index 3beb5641677a..c666e1df5e22 100644
--- a/src/coinjoin/server.cpp
+++ b/src/coinjoin/server.cpp
@@ -99,9 +99,7 @@ void CCoinJoinServer::ProcessDSACCEPT(CNode& peer, CDataStream& vRecv)
             }
         }
 
-        int64_t nLastDsq = m_mn_metaman.GetMetaInfo(dmn->proTxHash)->GetLastDsq();
-        int64_t nDsqThreshold = m_mn_metaman.GetDsqThreshold(dmn->proTxHash, mnList.GetValidMNsCount());
-        if (nLastDsq != 0 && nDsqThreshold > m_mn_metaman.GetDsqCount()) {
+        if (m_mn_metaman.IsDsqOver(dmn->proTxHash, mnList.GetValidMNsCount())) {
             if (fLogIPs) {
                 LogPrint(BCLog::COINJOIN, "DSACCEPT -- last dsq too recent, must wait: peer=%d, addr=%s\n",
                          peer.GetId(), peer.addr.ToStringAddrPort());
@@ -194,11 +192,8 @@ MessageProcessingResult CCoinJoinServer::ProcessDSQUEUE(NodeId from, CDataStream
     }
 
     if (!dsq.fReady) {
-        int64_t nLastDsq = m_mn_metaman.GetMetaInfo(dmn->proTxHash)->GetLastDsq();
-        int64_t nDsqThreshold = m_mn_metaman.GetDsqThreshold(dmn->proTxHash, tip_mn_list.GetValidMNsCount());
-        LogPrint(BCLog::COINJOIN, "DSQUEUE -- nLastDsq: %d  nDsqThreshold: %d  nDsqCount: %d\n", nLastDsq, nDsqThreshold, m_mn_metaman.GetDsqCount());
         //don't allow a few nodes to dominate the queuing process
-        if (nLastDsq != 0 && nDsqThreshold > m_mn_metaman.GetDsqCount()) {
+        if (m_mn_metaman.IsDsqOver(dmn->proTxHash, tip_mn_list.GetValidMNsCount())) {
             LogPrint(BCLog::COINJOIN, "DSQUEUE -- node sending too many dsq messages, masternode=%s\n", dmn->proTxHash.ToString());
             return ret;
         }
diff --git a/src/masternode/meta.cpp b/src/masternode/meta.cpp
index bced7fcfae04..cde099d47512 100644
--- a/src/masternode/meta.cpp
+++ b/src/masternode/meta.cpp
@@ -88,18 +88,21 @@ CMasternodeMetaInfoPtr CMasternodeMetaMan::GetMetaInfo(const uint256& proTxHash,
     return it->second;
 }
 
-// We keep track of dsq (mixing queues) count to avoid using same masternodes for mixing too often.
-// This threshold is calculated as the last dsq count this specific masternode was used in a mixing
-// session plus a margin of 20% of masternode count. In other words we expect at least 20% of unique
-// masternodes before we ever see a masternode that we know already mixed someone's funds earlier.
-int64_t CMasternodeMetaMan::GetDsqThreshold(const uint256& proTxHash, int nMnCount)
-{
-    auto metaInfo = GetMetaInfo(proTxHash);
-    if (metaInfo == nullptr) {
-        // return a threshold which is slightly above nDsqCount i.e. a no-go
-        return nDsqCount + 1;
+bool CMasternodeMetaMan::IsDsqOver(const uint256& protx_hash, int mn_count) const
+{
+    LOCK(cs);
+    auto it = metaInfos.find(protx_hash);
+    if (it == metaInfos.end()) {
+        LogPrint(BCLog::COINJOIN, "DSQUEUE -- node %s is logged\n", protx_hash.ToString());
+        return false;
     }
-    return metaInfo->GetLastDsq() + nMnCount / 5;
+    const auto& meta_info = *it->second;
+    int64_t last_dsq = meta_info.GetLastDsq();
+    int64_t threshold = last_dsq + mn_count / 5;
+
+    LogPrint(BCLog::COINJOIN, "DSQUEUE -- mn: %s last_dsq: %d  dsq_threshold: %d  nDsqCount: %d\n",
+             protx_hash.ToString(), last_dsq, threshold, nDsqCount);
+    return last_dsq != 0 && threshold > nDsqCount;
 }
 
 void CMasternodeMetaMan::AllowMixing(const uint256& proTxHash)
diff --git a/src/masternode/meta.h b/src/masternode/meta.h
index 59f84ee20e1b..2ad873e8ef2f 100644
--- a/src/masternode/meta.h
+++ b/src/masternode/meta.h
@@ -262,8 +262,11 @@ class CMasternodeMetaMan : public MasternodeMetaStore
     CMasternodeMetaInfo GetInfo(const uint256& proTxHash) EXCLUSIVE_LOCKS_REQUIRED(!cs);
     CMasternodeMetaInfoPtr GetMetaInfo(const uint256& proTxHash, bool fCreate = true) EXCLUSIVE_LOCKS_REQUIRED(!cs);
 
-    int64_t GetDsqCount() const { return nDsqCount; }
-    int64_t GetDsqThreshold(const uint256& proTxHash, int nMnCount);
+    // We keep track of dsq (mixing queues) count to avoid using same masternodes for mixing too often.
+    // MN's threshold is calculated as the last dsq count this specific masternode was used in a mixing
+    // session plus a margin of 20% of masternode count. In other words we expect at least 20% of unique
+    // masternodes before we ever see a masternode that we know already mixed someone's funds earlier.
+    bool IsDsqOver(const uint256& protx_hash, int mn_count) const EXCLUSIVE_LOCKS_REQUIRED(!cs);
 
     void AllowMixing(const uint256& proTxHash);
     void DisallowMixing(const uint256& proTxHash);

From 7ec239bf3326bd53d2e1f9d5f8b3d4f1edcdd600 Mon Sep 17 00:00:00 2001
From: Konstantin Akimov <knstqq@gmail.com>
Date: Sat, 11 Oct 2025 22:19:05 +0700
Subject: [PATCH 398/656] refactor: replace direct usages of GetMetaInfo when
 platform unban node in mn-list

---
 src/evo/deterministicmns.cpp |  3 +--
 src/masternode/meta.cpp      | 10 ++++++++++
 src/masternode/meta.h        |  1 +
 3 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/src/evo/deterministicmns.cpp b/src/evo/deterministicmns.cpp
index d8140aa0db90..75678cb6c709 100644
--- a/src/evo/deterministicmns.cpp
+++ b/src/evo/deterministicmns.cpp
@@ -676,8 +676,7 @@ bool CDeterministicMNManager::ProcessBlock(const CBlock& block, gsl::not_null<co
             const auto opt_proTx = GetTxPayload<CProUpServTx>(tx);
             if (!opt_proTx) continue; // should not happen but does not matter
 
-            if (auto meta_info = m_mn_metaman.GetMetaInfo(opt_proTx->proTxHash, false);
-                !meta_info || !meta_info->SetPlatformBan(false, nHeight)) {
+            if (m_mn_metaman.ResetPlatformBan(opt_proTx->proTxHash, nHeight)) {
                 LogPrint(BCLog::LLMQ, "%s -- MN %s is failed to Platform revived at height %d\n", __func__,
                          opt_proTx->proTxHash.ToString(), nHeight);
             }
diff --git a/src/masternode/meta.cpp b/src/masternode/meta.cpp
index cde099d47512..f5aedf3447a1 100644
--- a/src/masternode/meta.cpp
+++ b/src/masternode/meta.cpp
@@ -141,6 +141,16 @@ std::vector<uint256> CMasternodeMetaMan::GetAndClearDirtyGovernanceObjectHashes(
     return vecTmp;
 }
 
+bool CMasternodeMetaMan::ResetPlatformBan(const uint256& protx_hash, int height)
+{
+    LOCK(cs);
+
+    auto it = metaInfos.find(protx_hash);
+    if (it == metaInfos.end()) return false;
+
+    return it->second->SetPlatformBan(false, height);
+}
+
 bool CMasternodeMetaMan::AlreadyHavePlatformBan(const uint256& inv_hash) const
 {
     LOCK(cs);
diff --git a/src/masternode/meta.h b/src/masternode/meta.h
index 2ad873e8ef2f..2f422a2f0b27 100644
--- a/src/masternode/meta.h
+++ b/src/masternode/meta.h
@@ -276,6 +276,7 @@ class CMasternodeMetaMan : public MasternodeMetaStore
 
     std::vector<uint256> GetAndClearDirtyGovernanceObjectHashes() EXCLUSIVE_LOCKS_REQUIRED(!cs);
 
+    bool ResetPlatformBan(const uint256& protx_hash, int height) EXCLUSIVE_LOCKS_REQUIRED(!cs);
     bool AlreadyHavePlatformBan(const uint256& inv_hash) const EXCLUSIVE_LOCKS_REQUIRED(!cs);
     std::optional<PlatformBanMessage> GetPlatformBan(const uint256& inv_hash) const EXCLUSIVE_LOCKS_REQUIRED(!cs);
     void RememberPlatformBan(const uint256& inv_hash, PlatformBanMessage&& msg) EXCLUSIVE_LOCKS_REQUIRED(!cs);

From 7ba51ec19f6813c1466edfb92346758ee02cdea0 Mon Sep 17 00:00:00 2001
From: Konstantin Akimov <knstqq@gmail.com>
Date: Sat, 11 Oct 2025 22:26:46 +0700
Subject: [PATCH 399/656] refactor: remove direct usages of GetMetaInfo for
 dkgsession

---
 src/llmq/dkgsession.cpp |  5 ++---
 src/masternode/meta.cpp | 20 ++++++++++++++++++++
 src/masternode/meta.h   |  2 ++
 3 files changed, 24 insertions(+), 3 deletions(-)

diff --git a/src/llmq/dkgsession.cpp b/src/llmq/dkgsession.cpp
index 062040a819a5..f7c6c4491771 100644
--- a/src/llmq/dkgsession.cpp
+++ b/src/llmq/dkgsession.cpp
@@ -492,12 +492,11 @@ void CDKGSession::VerifyConnectionAndMinProtoVersions(CConnman& connman) const
             m->badConnection = true;
             logger.Batch("%s does not have min proto version %d (has %d)", m->dmn->proTxHash.ToString(), MIN_MASTERNODE_PROTO_VERSION, it->second);
         }
-        const auto meta_info = m_mn_metaman.GetMetaInfo(m->dmn->proTxHash);
-        if (meta_info->OutboundFailedTooManyTimes()) {
+        if (m_mn_metaman.OutboundFailedTooManyTimes(m->dmn->proTxHash)) {
             m->badConnection = true;
             logger.Batch("%s failed to connect to it too many times", m->dmn->proTxHash.ToString());
         }
-        if (meta_info->IsPlatformBanned()) {
+        if (m_mn_metaman.IsPlatformBanned(m->dmn->proTxHash)) {
             m->badConnection = true;
             logger.Batch("%s is Platform PoSe banned", m->dmn->proTxHash.ToString());
         }
diff --git a/src/masternode/meta.cpp b/src/masternode/meta.cpp
index f5aedf3447a1..f1149fa3f26e 100644
--- a/src/masternode/meta.cpp
+++ b/src/masternode/meta.cpp
@@ -141,6 +141,26 @@ std::vector<uint256> CMasternodeMetaMan::GetAndClearDirtyGovernanceObjectHashes(
     return vecTmp;
 }
 
+bool CMasternodeMetaMan::OutboundFailedTooManyTimes(const uint256& protx_hash) const
+{
+    LOCK(cs);
+
+    auto it = metaInfos.find(protx_hash);
+    if (it == metaInfos.end()) return false;
+
+    return it->second->OutboundFailedTooManyTimes();
+}
+
+bool CMasternodeMetaMan::IsPlatformBanned(const uint256& protx_hash) const
+{
+    LOCK(cs);
+
+    auto it = metaInfos.find(protx_hash);
+    if (it == metaInfos.end()) return false;
+
+    return it->second->IsPlatformBanned();
+}
+
 bool CMasternodeMetaMan::ResetPlatformBan(const uint256& protx_hash, int height)
 {
     LOCK(cs);
diff --git a/src/masternode/meta.h b/src/masternode/meta.h
index 2f422a2f0b27..1a4c41f56db0 100644
--- a/src/masternode/meta.h
+++ b/src/masternode/meta.h
@@ -276,6 +276,8 @@ class CMasternodeMetaMan : public MasternodeMetaStore
 
     std::vector<uint256> GetAndClearDirtyGovernanceObjectHashes() EXCLUSIVE_LOCKS_REQUIRED(!cs);
 
+    bool OutboundFailedTooManyTimes(const uint256& protx_hash) const EXCLUSIVE_LOCKS_REQUIRED(!cs);
+    bool IsPlatformBanned(const uint256& protx_hash) const EXCLUSIVE_LOCKS_REQUIRED(!cs);
     bool ResetPlatformBan(const uint256& protx_hash, int height) EXCLUSIVE_LOCKS_REQUIRED(!cs);
     bool AlreadyHavePlatformBan(const uint256& inv_hash) const EXCLUSIVE_LOCKS_REQUIRED(!cs);
     std::optional<PlatformBanMessage> GetPlatformBan(const uint256& inv_hash) const EXCLUSIVE_LOCKS_REQUIRED(!cs);

From a40c418ee7afd8ccde5a0628b5c513647ba1d4c6 Mon Sep 17 00:00:00 2001
From: Konstantin Akimov <knstqq@gmail.com>
Date: Sat, 11 Oct 2025 22:32:09 +0700
Subject: [PATCH 400/656] refactor: hide direct calls of GetMetaInfo from
 llmq/utils

---
 src/llmq/utils.cpp      |  2 +-
 src/masternode/meta.cpp | 10 ++++++++++
 src/masternode/meta.h   |  1 +
 3 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/src/llmq/utils.cpp b/src/llmq/utils.cpp
index 09d2d4fddc7b..099f5f74c9b9 100644
--- a/src/llmq/utils.cpp
+++ b/src/llmq/utils.cpp
@@ -912,7 +912,7 @@ void AddQuorumProbeConnections(const Consensus::LLMQParams& llmqParams, CConnman
         if (dmn->proTxHash == myProTxHash) {
             continue;
         }
-        auto lastOutbound = mn_metaman.GetMetaInfo(dmn->proTxHash)->GetLastOutboundSuccess();
+        auto lastOutbound = mn_metaman.GetLastOutboundSuccess(dmn->proTxHash);
         if (curTime - lastOutbound < 10 * 60) {
             // avoid re-probing nodes too often
             continue;
diff --git a/src/masternode/meta.cpp b/src/masternode/meta.cpp
index f1149fa3f26e..7f687370291d 100644
--- a/src/masternode/meta.cpp
+++ b/src/masternode/meta.cpp
@@ -141,6 +141,16 @@ std::vector<uint256> CMasternodeMetaMan::GetAndClearDirtyGovernanceObjectHashes(
     return vecTmp;
 }
 
+int64_t CMasternodeMetaMan::GetLastOutboundSuccess(const uint256& protx_hash) const
+{
+    LOCK(cs);
+
+    auto it = metaInfos.find(protx_hash);
+    if (it == metaInfos.end()) return 0;
+
+    return it->second->GetLastOutboundSuccess();
+}
+
 bool CMasternodeMetaMan::OutboundFailedTooManyTimes(const uint256& protx_hash) const
 {
     LOCK(cs);
diff --git a/src/masternode/meta.h b/src/masternode/meta.h
index 1a4c41f56db0..451ec871ba13 100644
--- a/src/masternode/meta.h
+++ b/src/masternode/meta.h
@@ -276,6 +276,7 @@ class CMasternodeMetaMan : public MasternodeMetaStore
 
     std::vector<uint256> GetAndClearDirtyGovernanceObjectHashes() EXCLUSIVE_LOCKS_REQUIRED(!cs);
 
+    int64_t GetLastOutboundSuccess(const uint256& protx_hash) const EXCLUSIVE_LOCKS_REQUIRED(!cs);
     bool OutboundFailedTooManyTimes(const uint256& protx_hash) const EXCLUSIVE_LOCKS_REQUIRED(!cs);
     bool IsPlatformBanned(const uint256& protx_hash) const EXCLUSIVE_LOCKS_REQUIRED(!cs);
     bool ResetPlatformBan(const uint256& protx_hash, int height) EXCLUSIVE_LOCKS_REQUIRED(!cs);

From b1a03e6a471d341fb52002625e37c60502f58577 Mon Sep 17 00:00:00 2001
From: Konstantin Akimov <knstqq@gmail.com>
Date: Sat, 11 Oct 2025 22:44:45 +0700
Subject: [PATCH 401/656] refactor: hide direct usages of GetMetaInfo from net
 module

---
 src/evo/mnauth.cpp      |  2 +-
 src/masternode/meta.cpp | 34 ++++++++++++++++++++++++++++++++++
 src/masternode/meta.h   |  4 ++++
 src/net.cpp             | 10 +++++-----
 4 files changed, 44 insertions(+), 6 deletions(-)

diff --git a/src/evo/mnauth.cpp b/src/evo/mnauth.cpp
index 376c96ecfaf4..4d813ebbbf00 100644
--- a/src/evo/mnauth.cpp
+++ b/src/evo/mnauth.cpp
@@ -103,7 +103,7 @@ MessageProcessingResult CMNAuth::ProcessMessage(CNode& peer, ServiceFlags node_s
     }
 
     if (!peer.IsInboundConn()) {
-        mn_metaman.GetMetaInfo(mnauth.proRegTxHash)->SetLastOutboundSuccess(GetTime<std::chrono::seconds>().count());
+        mn_metaman.SetLastOutboundSuccess(mnauth.proRegTxHash, GetTime<std::chrono::seconds>().count());
         if (peer.m_masternode_probe_connection) {
             LogPrint(BCLog::NET_NETCONN, "CMNAuth::ProcessMessage -- Masternode probe successful for %s, disconnecting. peer=%d\n",
                      mnauth.proRegTxHash.ToString(), peer.GetId());
diff --git a/src/masternode/meta.cpp b/src/masternode/meta.cpp
index 7f687370291d..fb2dcd437425 100644
--- a/src/masternode/meta.cpp
+++ b/src/masternode/meta.cpp
@@ -141,6 +141,40 @@ std::vector<uint256> CMasternodeMetaMan::GetAndClearDirtyGovernanceObjectHashes(
     return vecTmp;
 }
 
+void CMasternodeMetaMan::SetLastOutboundAttempt(const uint256& protx_hash, int64_t t)
+{
+    LOCK(cs);
+
+    auto it = metaInfos.find(protx_hash);
+    if (it == metaInfos.end()) {
+        it = metaInfos.emplace(protx_hash, std::make_shared<CMasternodeMetaInfo>(protx_hash)).first;
+    }
+
+    return it->second->SetLastOutboundAttempt(t);
+}
+
+void CMasternodeMetaMan::SetLastOutboundSuccess(const uint256& protx_hash, int64_t t)
+{
+    LOCK(cs);
+
+    auto it = metaInfos.find(protx_hash);
+    if (it == metaInfos.end()) {
+        it = metaInfos.emplace(protx_hash, std::make_shared<CMasternodeMetaInfo>(protx_hash)).first;
+    }
+
+    return it->second->SetLastOutboundSuccess(t);
+}
+
+int64_t CMasternodeMetaMan::GetLastOutboundAttempt(const uint256& protx_hash) const
+{
+    LOCK(cs);
+
+    auto it = metaInfos.find(protx_hash);
+    if (it == metaInfos.end()) return 0;
+
+    return it->second->GetLastOutboundAttempt();
+}
+
 int64_t CMasternodeMetaMan::GetLastOutboundSuccess(const uint256& protx_hash) const
 {
     LOCK(cs);
diff --git a/src/masternode/meta.h b/src/masternode/meta.h
index 451ec871ba13..8eef35a85dde 100644
--- a/src/masternode/meta.h
+++ b/src/masternode/meta.h
@@ -276,8 +276,12 @@ class CMasternodeMetaMan : public MasternodeMetaStore
 
     std::vector<uint256> GetAndClearDirtyGovernanceObjectHashes() EXCLUSIVE_LOCKS_REQUIRED(!cs);
 
+    void SetLastOutboundAttempt(const uint256& protx_hash, int64_t t) EXCLUSIVE_LOCKS_REQUIRED(!cs);
+    void SetLastOutboundSuccess(const uint256& protx_hash, int64_t t) EXCLUSIVE_LOCKS_REQUIRED(!cs);
+    int64_t GetLastOutboundAttempt(const uint256& protx_hash) const EXCLUSIVE_LOCKS_REQUIRED(!cs);
     int64_t GetLastOutboundSuccess(const uint256& protx_hash) const EXCLUSIVE_LOCKS_REQUIRED(!cs);
     bool OutboundFailedTooManyTimes(const uint256& protx_hash) const EXCLUSIVE_LOCKS_REQUIRED(!cs);
+
     bool IsPlatformBanned(const uint256& protx_hash) const EXCLUSIVE_LOCKS_REQUIRED(!cs);
     bool ResetPlatformBan(const uint256& protx_hash, int height) EXCLUSIVE_LOCKS_REQUIRED(!cs);
     bool AlreadyHavePlatformBan(const uint256& inv_hash) const EXCLUSIVE_LOCKS_REQUIRED(!cs);
diff --git a/src/net.cpp b/src/net.cpp
index 7c120ff66833..f138362cc51f 100644
--- a/src/net.cpp
+++ b/src/net.cpp
@@ -3403,7 +3403,7 @@ void CConnman::ThreadOpenMasternodeConnections(CDeterministicMNManager& dmnman,
                         continue;
                     }
                     // back off connecting to an address if we already tried recently
-                    int64_t last_attempt = mn_metaman.GetMetaInfo(dmn->proTxHash)->GetLastOutboundAttempt();
+                    int64_t last_attempt = mn_metaman.GetLastOutboundAttempt(dmn->proTxHash);
                     if (nANow - last_attempt < chainParams.LLMQConnectionRetryTimeout()) {
                         continue;
                     }
@@ -3426,14 +3426,14 @@ void CConnman::ThreadOpenMasternodeConnections(CDeterministicMNManager& dmnman,
                 bool connectedAndOutbound = connectedProRegTxHashes.count(dmn->proTxHash) && !connectedProRegTxHashes[dmn->proTxHash];
                 if (connectedAndOutbound) {
                     // we already have an outbound connection to this MN so there is no theed to probe it again
-                    mn_metaman.GetMetaInfo(dmn->proTxHash)->SetLastOutboundSuccess(nANow);
+                    mn_metaman.SetLastOutboundSuccess(dmn->proTxHash, nANow);
                     it = masternodePendingProbes.erase(it);
                     continue;
                 }
 
                 ++it;
 
-                int64_t lastAttempt = mn_metaman.GetMetaInfo(dmn->proTxHash)->GetLastOutboundAttempt();
+                int64_t lastAttempt = mn_metaman.GetLastOutboundAttempt(dmn->proTxHash);
                 // back off trying connecting to an address if we already tried recently
                 if (nANow - lastAttempt < chainParams.LLMQConnectionRetryTimeout()) {
                     continue;
@@ -3493,7 +3493,7 @@ void CConnman::ThreadOpenMasternodeConnections(CDeterministicMNManager& dmnman,
 
         didConnect = true;
 
-        mn_metaman.GetMetaInfo(connectToDmn->proTxHash)->SetLastOutboundAttempt(nANow);
+        mn_metaman.SetLastOutboundAttempt(connectToDmn->proTxHash, nANow);
 
         OpenMasternodeConnection(CAddress(connectToDmn->pdmnState->netInfo->GetPrimary(), NODE_NETWORK), /*use_v2transport=*/GetLocalServices() & NODE_P2P_V2, isProbe);
         // should be in the list now if connection was opened
@@ -3506,7 +3506,7 @@ void CConnman::ThreadOpenMasternodeConnections(CDeterministicMNManager& dmnman,
         if (!connected) {
             LogPrint(BCLog::NET_NETCONN, "CConnman::%s -- connection failed for masternode  %s, service=%s\n", __func__, connectToDmn->proTxHash.ToString(), connectToDmn->pdmnState->netInfo->GetPrimary().ToStringAddrPort());
             // Will take a few consequent failed attempts to PoSe-punish a MN.
-            if (mn_metaman.GetMetaInfo(connectToDmn->proTxHash)->OutboundFailedTooManyTimes()) {
+            if (mn_metaman.OutboundFailedTooManyTimes(connectToDmn->proTxHash)) {
                 LogPrint(BCLog::NET_NETCONN, "CConnman::%s -- failed to connect to masternode %s too many times\n", __func__, connectToDmn->proTxHash.ToString());
             }
         }

From c0e146f74735bb767f1641622fcda9e7cb15525c Mon Sep 17 00:00:00 2001
From: Konstantin Akimov <knstqq@gmail.com>
Date: Sat, 11 Oct 2025 23:05:55 +0700
Subject: [PATCH 402/656] refactor: hide direct usages of GetMetaInfo for
 net_processing

---
 src/masternode/meta.cpp | 34 ++++++++++++++++++++++++++++------
 src/masternode/meta.h   |  3 ++-
 src/net_processing.cpp  |  8 +++-----
 3 files changed, 33 insertions(+), 12 deletions(-)

diff --git a/src/masternode/meta.cpp b/src/masternode/meta.cpp
index fb2dcd437425..452f79b21c22 100644
--- a/src/masternode/meta.cpp
+++ b/src/masternode/meta.cpp
@@ -119,6 +119,16 @@ void CMasternodeMetaMan::DisallowMixing(const uint256& proTxHash)
     mm->nMixingTxCount++;
 }
 
+bool CMasternodeMetaMan::IsValidForMixingTxes(const uint256& protx_hash) const
+{
+    LOCK(cs);
+
+    auto it = metaInfos.find(protx_hash);
+    if (it == metaInfos.end()) return true;
+
+    return it->second->IsValidForMixingTxes();
+}
+
 bool CMasternodeMetaMan::AddGovernanceVote(const uint256& proTxHash, const uint256& nGovernanceObjectHash)
 {
     auto mm = GetMetaInfo(proTxHash);
@@ -215,6 +225,24 @@ bool CMasternodeMetaMan::ResetPlatformBan(const uint256& protx_hash, int height)
     return it->second->SetPlatformBan(false, height);
 }
 
+bool CMasternodeMetaMan::SetPlatformBan(const uint256& inv_hash, PlatformBanMessage&& ban_msg)
+{
+    LOCK(cs);
+
+    const uint256& protx_hash = ban_msg.m_protx_hash;
+
+    auto it = metaInfos.find(protx_hash);
+    if (it == metaInfos.end()) {
+        it = metaInfos.emplace(protx_hash, std::make_shared<CMasternodeMetaInfo>(protx_hash)).first;
+    }
+
+    bool ret = it->second->SetPlatformBan(true, ban_msg.m_requested_height);
+    if (ret) {
+        m_seen_platform_bans.insert(inv_hash, std::move(ban_msg));
+    }
+    return ret;
+}
+
 bool CMasternodeMetaMan::AlreadyHavePlatformBan(const uint256& inv_hash) const
 {
     LOCK(cs);
@@ -232,12 +260,6 @@ std::optional<PlatformBanMessage> CMasternodeMetaMan::GetPlatformBan(const uint2
     return ret;
 }
 
-void CMasternodeMetaMan::RememberPlatformBan(const uint256& inv_hash, PlatformBanMessage&& msg)
-{
-    LOCK(cs);
-    m_seen_platform_bans.insert(inv_hash, std::move(msg));
-}
-
 void CMasternodeMetaMan::AddUsedMasternode(const uint256& proTxHash)
 {
     LOCK(cs);
diff --git a/src/masternode/meta.h b/src/masternode/meta.h
index 8eef35a85dde..64a2f0166680 100644
--- a/src/masternode/meta.h
+++ b/src/masternode/meta.h
@@ -270,6 +270,7 @@ class CMasternodeMetaMan : public MasternodeMetaStore
 
     void AllowMixing(const uint256& proTxHash);
     void DisallowMixing(const uint256& proTxHash);
+    bool IsValidForMixingTxes(const uint256& protx_hash) const EXCLUSIVE_LOCKS_REQUIRED(!cs);
 
     bool AddGovernanceVote(const uint256& proTxHash, const uint256& nGovernanceObjectHash);
     void RemoveGovernanceObject(const uint256& nGovernanceObjectHash) EXCLUSIVE_LOCKS_REQUIRED(!cs);
@@ -284,9 +285,9 @@ class CMasternodeMetaMan : public MasternodeMetaStore
 
     bool IsPlatformBanned(const uint256& protx_hash) const EXCLUSIVE_LOCKS_REQUIRED(!cs);
     bool ResetPlatformBan(const uint256& protx_hash, int height) EXCLUSIVE_LOCKS_REQUIRED(!cs);
+    bool SetPlatformBan(const uint256& inv_hash, PlatformBanMessage&& msg) EXCLUSIVE_LOCKS_REQUIRED(!cs);
     bool AlreadyHavePlatformBan(const uint256& inv_hash) const EXCLUSIVE_LOCKS_REQUIRED(!cs);
     std::optional<PlatformBanMessage> GetPlatformBan(const uint256& inv_hash) const EXCLUSIVE_LOCKS_REQUIRED(!cs);
-    void RememberPlatformBan(const uint256& inv_hash, PlatformBanMessage&& msg) EXCLUSIVE_LOCKS_REQUIRED(!cs);
 
     // CoinJoin masternode tracking
     void AddUsedMasternode(const uint256& proTxHash) EXCLUSIVE_LOCKS_REQUIRED(!cs);
diff --git a/src/net_processing.cpp b/src/net_processing.cpp
index cc5b427d5ce8..38a45d18478f 100644
--- a/src/net_processing.cpp
+++ b/src/net_processing.cpp
@@ -3471,7 +3471,7 @@ std::pair<bool /*ret*/, bool /*do_return*/> static ValidateDSTX(CDeterministicMN
         return {false, true};
     }
 
-    if (!mn_metaman.GetMetaInfo(dmn->proTxHash)->IsValidForMixingTxes()) {
+    if (!mn_metaman.IsValidForMixingTxes(dmn->proTxHash)) {
         LogPrint(BCLog::COINJOIN, "DSTX -- Masternode %s is sending too many transactions %s\n", dstx.masternodeOutpoint.ToStringShort(), hashTx.ToString());
         return {true, true};
         // TODO: Not an error? Could it be that someone is relaying old DSTXes
@@ -3602,10 +3602,8 @@ MessageProcessingResult PeerManagerImpl::ProcessPlatformBanMessage(NodeId node,
     }
 
     // At this point, the outgoing message serialization version can't change.
-    const auto meta_info = m_mn_metaman.GetMetaInfo(ban_msg.m_protx_hash);
-    if (meta_info->SetPlatformBan(true, ban_msg.m_requested_height)) {
-        LogPrintf("PLATFORMBAN -- forward message to other nodes\n");
-        m_mn_metaman.RememberPlatformBan(hash, std::move(ban_msg));
+    if (m_mn_metaman.SetPlatformBan(hash, std::move(ban_msg))) {
+        LogPrintf("PLATFORMBAN -- hash: %s forward message to other nodes\n", hash.ToString());
         ret.m_inventory.emplace_back(MSG_PLATFORM_BAN, hash);
     }
     return ret;

From d5e693fc7af0aa5aa16b140ae7c30612d9d5864e Mon Sep 17 00:00:00 2001
From: Konstantin Akimov <knstqq@gmail.com>
Date: Sat, 11 Oct 2025 23:14:44 +0700
Subject: [PATCH 403/656] refactor: drop shared_ptr from CMasternodeMetaMan and
 make GetMetaInfo a private member

---
 src/masternode/meta.cpp | 62 ++++++++++++++++++++---------------------
 src/masternode/meta.h   | 17 +++++------
 2 files changed, 38 insertions(+), 41 deletions(-)

diff --git a/src/masternode/meta.cpp b/src/masternode/meta.cpp
index 452f79b21c22..9c0f4fb7751a 100644
--- a/src/masternode/meta.cpp
+++ b/src/masternode/meta.cpp
@@ -68,23 +68,20 @@ void CMasternodeMetaInfo::RemoveGovernanceObject(const uint256& nGovernanceObjec
 
 CMasternodeMetaInfo CMasternodeMetaMan::GetInfo(const uint256& proTxHash)
 {
-    const auto info = GetMetaInfo(proTxHash, false);
-    if (info == nullptr) return CMasternodeMetaInfo{};
+    LOCK(cs);
+    auto it = metaInfos.find(proTxHash);
+    if (it == metaInfos.end()) return CMasternodeMetaInfo{};
 
-    return *info;
+    return it->second;
 }
 
-CMasternodeMetaInfoPtr CMasternodeMetaMan::GetMetaInfo(const uint256& proTxHash, bool fCreate)
+CMasternodeMetaInfo& CMasternodeMetaMan::GetMetaInfo(const uint256& proTxHash)
 {
-    LOCK(cs);
     auto it = metaInfos.find(proTxHash);
     if (it != metaInfos.end()) {
         return it->second;
     }
-    if (!fCreate) {
-        return nullptr;
-    }
-    it = metaInfos.emplace(proTxHash, std::make_shared<CMasternodeMetaInfo>(proTxHash)).first;
+    it = metaInfos.emplace(proTxHash, CMasternodeMetaInfo{proTxHash}).first;
     return it->second;
 }
 
@@ -96,7 +93,7 @@ bool CMasternodeMetaMan::IsDsqOver(const uint256& protx_hash, int mn_count) cons
         LogPrint(BCLog::COINJOIN, "DSQUEUE -- node %s is logged\n", protx_hash.ToString());
         return false;
     }
-    const auto& meta_info = *it->second;
+    const auto& meta_info = it->second;
     int64_t last_dsq = meta_info.GetLastDsq();
     int64_t threshold = last_dsq + mn_count / 5;
 
@@ -107,16 +104,18 @@ bool CMasternodeMetaMan::IsDsqOver(const uint256& protx_hash, int mn_count) cons
 
 void CMasternodeMetaMan::AllowMixing(const uint256& proTxHash)
 {
-    auto mm = GetMetaInfo(proTxHash);
+    LOCK(cs);
+    auto& mm = GetMetaInfo(proTxHash);
     nDsqCount++;
-    mm->nLastDsq = nDsqCount.load();
-    mm->nMixingTxCount = 0;
+    mm.nLastDsq = nDsqCount.load();
+    mm.nMixingTxCount = 0;
 }
 
 void CMasternodeMetaMan::DisallowMixing(const uint256& proTxHash)
 {
-    auto mm = GetMetaInfo(proTxHash);
-    mm->nMixingTxCount++;
+    LOCK(cs);
+    auto& mm = GetMetaInfo(proTxHash);
+    mm.nMixingTxCount++;
 }
 
 bool CMasternodeMetaMan::IsValidForMixingTxes(const uint256& protx_hash) const
@@ -126,21 +125,22 @@ bool CMasternodeMetaMan::IsValidForMixingTxes(const uint256& protx_hash) const
     auto it = metaInfos.find(protx_hash);
     if (it == metaInfos.end()) return true;
 
-    return it->second->IsValidForMixingTxes();
+    return it->second.IsValidForMixingTxes();
 }
 
 bool CMasternodeMetaMan::AddGovernanceVote(const uint256& proTxHash, const uint256& nGovernanceObjectHash)
 {
-    auto mm = GetMetaInfo(proTxHash);
-    mm->AddGovernanceVote(nGovernanceObjectHash);
+    LOCK(cs);
+    auto& mm = GetMetaInfo(proTxHash);
+    mm.AddGovernanceVote(nGovernanceObjectHash);
     return true;
 }
 
 void CMasternodeMetaMan::RemoveGovernanceObject(const uint256& nGovernanceObjectHash)
 {
     LOCK(cs);
-    for(const auto& p : metaInfos) {
-        p.second->RemoveGovernanceObject(nGovernanceObjectHash);
+    for (auto& p : metaInfos) {
+        p.second.RemoveGovernanceObject(nGovernanceObjectHash);
     }
 }
 
@@ -157,10 +157,10 @@ void CMasternodeMetaMan::SetLastOutboundAttempt(const uint256& protx_hash, int64
 
     auto it = metaInfos.find(protx_hash);
     if (it == metaInfos.end()) {
-        it = metaInfos.emplace(protx_hash, std::make_shared<CMasternodeMetaInfo>(protx_hash)).first;
+        it = metaInfos.emplace(protx_hash, CMasternodeMetaInfo{protx_hash}).first;
     }
 
-    return it->second->SetLastOutboundAttempt(t);
+    return it->second.SetLastOutboundAttempt(t);
 }
 
 void CMasternodeMetaMan::SetLastOutboundSuccess(const uint256& protx_hash, int64_t t)
@@ -169,10 +169,10 @@ void CMasternodeMetaMan::SetLastOutboundSuccess(const uint256& protx_hash, int64
 
     auto it = metaInfos.find(protx_hash);
     if (it == metaInfos.end()) {
-        it = metaInfos.emplace(protx_hash, std::make_shared<CMasternodeMetaInfo>(protx_hash)).first;
+        it = metaInfos.emplace(protx_hash, CMasternodeMetaInfo{protx_hash}).first;
     }
 
-    return it->second->SetLastOutboundSuccess(t);
+    return it->second.SetLastOutboundSuccess(t);
 }
 
 int64_t CMasternodeMetaMan::GetLastOutboundAttempt(const uint256& protx_hash) const
@@ -182,7 +182,7 @@ int64_t CMasternodeMetaMan::GetLastOutboundAttempt(const uint256& protx_hash) co
     auto it = metaInfos.find(protx_hash);
     if (it == metaInfos.end()) return 0;
 
-    return it->second->GetLastOutboundAttempt();
+    return it->second.GetLastOutboundAttempt();
 }
 
 int64_t CMasternodeMetaMan::GetLastOutboundSuccess(const uint256& protx_hash) const
@@ -192,7 +192,7 @@ int64_t CMasternodeMetaMan::GetLastOutboundSuccess(const uint256& protx_hash) co
     auto it = metaInfos.find(protx_hash);
     if (it == metaInfos.end()) return 0;
 
-    return it->second->GetLastOutboundSuccess();
+    return it->second.GetLastOutboundSuccess();
 }
 
 bool CMasternodeMetaMan::OutboundFailedTooManyTimes(const uint256& protx_hash) const
@@ -202,7 +202,7 @@ bool CMasternodeMetaMan::OutboundFailedTooManyTimes(const uint256& protx_hash) c
     auto it = metaInfos.find(protx_hash);
     if (it == metaInfos.end()) return false;
 
-    return it->second->OutboundFailedTooManyTimes();
+    return it->second.OutboundFailedTooManyTimes();
 }
 
 bool CMasternodeMetaMan::IsPlatformBanned(const uint256& protx_hash) const
@@ -212,7 +212,7 @@ bool CMasternodeMetaMan::IsPlatformBanned(const uint256& protx_hash) const
     auto it = metaInfos.find(protx_hash);
     if (it == metaInfos.end()) return false;
 
-    return it->second->IsPlatformBanned();
+    return it->second.IsPlatformBanned();
 }
 
 bool CMasternodeMetaMan::ResetPlatformBan(const uint256& protx_hash, int height)
@@ -222,7 +222,7 @@ bool CMasternodeMetaMan::ResetPlatformBan(const uint256& protx_hash, int height)
     auto it = metaInfos.find(protx_hash);
     if (it == metaInfos.end()) return false;
 
-    return it->second->SetPlatformBan(false, height);
+    return it->second.SetPlatformBan(false, height);
 }
 
 bool CMasternodeMetaMan::SetPlatformBan(const uint256& inv_hash, PlatformBanMessage&& ban_msg)
@@ -233,10 +233,10 @@ bool CMasternodeMetaMan::SetPlatformBan(const uint256& inv_hash, PlatformBanMess
 
     auto it = metaInfos.find(protx_hash);
     if (it == metaInfos.end()) {
-        it = metaInfos.emplace(protx_hash, std::make_shared<CMasternodeMetaInfo>(protx_hash)).first;
+        it = metaInfos.emplace(protx_hash, CMasternodeMetaInfo{protx_hash}).first;
     }
 
-    bool ret = it->second->SetPlatformBan(true, ban_msg.m_requested_height);
+    bool ret = it->second.SetPlatformBan(true, ban_msg.m_requested_height);
     if (ret) {
         m_seen_platform_bans.insert(inv_hash, std::move(ban_msg));
     }
diff --git a/src/masternode/meta.h b/src/masternode/meta.h
index 64a2f0166680..a0d3fd03e27c 100644
--- a/src/masternode/meta.h
+++ b/src/masternode/meta.h
@@ -16,7 +16,6 @@
 #include <atomic>
 #include <deque>
 #include <map>
-#include <memory>
 #include <optional>
 #include <vector>
 
@@ -129,7 +128,6 @@ class CMasternodeMetaInfo
         return m_platform_ban;
     }
 };
-using CMasternodeMetaInfoPtr = std::shared_ptr<CMasternodeMetaInfo>;
 
 class MasternodeMetaStore
 {
@@ -137,7 +135,7 @@ class MasternodeMetaStore
     static const std::string SERIALIZATION_VERSION_STRING;
 
     mutable Mutex cs;
-    std::map<uint256, CMasternodeMetaInfoPtr> metaInfos GUARDED_BY(cs);
+    std::map<uint256, CMasternodeMetaInfo> metaInfos GUARDED_BY(cs);
     // keep track of dsq count to prevent masternodes from gaming coinjoin queue
     std::atomic<int64_t> nDsqCount{0};
     // keep track of the used Masternodes for CoinJoin across all wallets
@@ -152,7 +150,7 @@ class MasternodeMetaStore
         LOCK(cs);
         std::vector<CMasternodeMetaInfo> tmpMetaInfo;
         for (const auto& p : metaInfos) {
-            tmpMetaInfo.emplace_back(*p.second);
+            tmpMetaInfo.emplace_back(p.second);
         }
         // Convert deque to vector for serialization - unordered_set will be rebuilt on deserialization
         std::vector<uint256> tmpUsedMasternodes(m_used_masternodes.begin(), m_used_masternodes.end());
@@ -162,9 +160,9 @@ class MasternodeMetaStore
     template<typename Stream>
     void Unserialize(Stream &s) EXCLUSIVE_LOCKS_REQUIRED(!cs)
     {
-        Clear();
-
         LOCK(cs);
+
+        metaInfos.clear();
         std::string strVersion;
         s >> strVersion;
         if (strVersion != SERIALIZATION_VERSION_STRING) {
@@ -173,10 +171,8 @@ class MasternodeMetaStore
         std::vector<CMasternodeMetaInfo> tmpMetaInfo;
         std::vector<uint256> tmpUsedMasternodes;
         s >> tmpMetaInfo >> nDsqCount >> tmpUsedMasternodes;
-
-        metaInfos.clear();
         for (auto& mm : tmpMetaInfo) {
-            metaInfos.emplace(mm.GetProTxHash(), std::make_shared<CMasternodeMetaInfo>(std::move(mm)));
+            metaInfos.emplace(mm.GetProTxHash(), CMasternodeMetaInfo{std::move(mm)});
         }
 
         // Convert vector to deque and build unordered_set for O(1) lookups
@@ -249,6 +245,8 @@ class CMasternodeMetaMan : public MasternodeMetaStore
     mutable unordered_lru_cache<uint256, PlatformBanMessage, StaticSaltedHasher> m_seen_platform_bans GUARDED_BY(cs){
         SeenBanInventorySize};
 
+    CMasternodeMetaInfo& GetMetaInfo(const uint256& proTxHash) EXCLUSIVE_LOCKS_REQUIRED(cs);
+
 public:
     CMasternodeMetaMan(const CMasternodeMetaMan&) = delete;
     CMasternodeMetaMan& operator=(const CMasternodeMetaMan&) = delete;
@@ -260,7 +258,6 @@ class CMasternodeMetaMan : public MasternodeMetaStore
     bool IsValid() const { return is_valid; }
 
     CMasternodeMetaInfo GetInfo(const uint256& proTxHash) EXCLUSIVE_LOCKS_REQUIRED(!cs);
-    CMasternodeMetaInfoPtr GetMetaInfo(const uint256& proTxHash, bool fCreate = true) EXCLUSIVE_LOCKS_REQUIRED(!cs);
 
     // We keep track of dsq (mixing queues) count to avoid using same masternodes for mixing too often.
     // MN's threshold is calculated as the last dsq count this specific masternode was used in a mixing

From 1bfd6ffc11deb636a64eb638130e3b5bb1bfc062 Mon Sep 17 00:00:00 2001
From: Konstantin Akimov <knstqq@gmail.com>
Date: Sat, 11 Oct 2025 23:28:47 +0700
Subject: [PATCH 404/656] refactor: drop mutex and atomics from
 CMasternodeMetaInfo

It is already guarded by CMasternodeMetaMan::cs
---
 src/masternode/meta.cpp | 27 ++++++++------------
 src/masternode/meta.h   | 56 +++++++++++------------------------------
 2 files changed, 25 insertions(+), 58 deletions(-)

diff --git a/src/masternode/meta.cpp b/src/masternode/meta.cpp
index 9c0f4fb7751a..2e32d79a47d1 100644
--- a/src/masternode/meta.cpp
+++ b/src/masternode/meta.cpp
@@ -30,29 +30,24 @@ bool CMasternodeMetaMan::LoadCache(bool load_cache)
 
 UniValue CMasternodeMetaInfo::ToJson() const
 {
-    UniValue ret(UniValue::VOBJ);
-
     int64_t now = GetTime<std::chrono::seconds>().count();
 
-    ret.pushKV("lastDSQ", nLastDsq.load());
-    ret.pushKV("mixingTxCount", nMixingTxCount.load());
-    ret.pushKV("outboundAttemptCount", outboundAttemptCount.load());
-    ret.pushKV("lastOutboundAttempt", lastOutboundAttempt.load());
-    ret.pushKV("lastOutboundAttemptElapsed", now - lastOutboundAttempt.load());
-    ret.pushKV("lastOutboundSuccess", lastOutboundSuccess.load());
-    ret.pushKV("lastOutboundSuccessElapsed", now - lastOutboundSuccess.load());
-    {
-        LOCK(cs);
-        ret.pushKV("is_platform_banned", m_platform_ban);
-        ret.pushKV("platform_ban_height_updated", m_platform_ban_updated);
-    }
+    UniValue ret(UniValue::VOBJ);
+    ret.pushKV("lastDSQ", nLastDsq);
+    ret.pushKV("mixingTxCount", nMixingTxCount);
+    ret.pushKV("outboundAttemptCount", outboundAttemptCount);
+    ret.pushKV("lastOutboundAttempt", lastOutboundAttempt);
+    ret.pushKV("lastOutboundAttemptElapsed", now - lastOutboundAttempt);
+    ret.pushKV("lastOutboundSuccess", lastOutboundSuccess);
+    ret.pushKV("lastOutboundSuccessElapsed", now - lastOutboundSuccess);
+    ret.pushKV("is_platform_banned", m_platform_ban);
+    ret.pushKV("platform_ban_height_updated", m_platform_ban_updated);
 
     return ret;
 }
 
 void CMasternodeMetaInfo::AddGovernanceVote(const uint256& nGovernanceObjectHash)
 {
-    LOCK(cs);
     // Insert a zero value, or not. Then increment the value regardless. This
     // ensures the value is in the map.
     const auto& pair = mapGovernanceObjectsVotedOn.emplace(nGovernanceObjectHash, 0);
@@ -61,14 +56,12 @@ void CMasternodeMetaInfo::AddGovernanceVote(const uint256& nGovernanceObjectHash
 
 void CMasternodeMetaInfo::RemoveGovernanceObject(const uint256& nGovernanceObjectHash)
 {
-    LOCK(cs);
     // Whether or not the govobj hash exists in the map first is irrelevant.
     mapGovernanceObjectsVotedOn.erase(nGovernanceObjectHash);
 }
 
 CMasternodeMetaInfo CMasternodeMetaMan::GetInfo(const uint256& proTxHash)
 {
-    LOCK(cs);
     auto it = metaInfos.find(proTxHash);
     if (it == metaInfos.end()) return CMasternodeMetaInfo{};
 
diff --git a/src/masternode/meta.h b/src/masternode/meta.h
index a0d3fd03e27c..81662b1d1e5b 100644
--- a/src/masternode/meta.h
+++ b/src/masternode/meta.h
@@ -32,58 +32,35 @@ static constexpr int MASTERNODE_MAX_FAILED_OUTBOUND_ATTEMPTS{5};
 // This is mostly local information, e.g. about mixing and governance
 class CMasternodeMetaInfo
 {
-    friend class CMasternodeMetaMan;
-
-private:
-    mutable Mutex cs;
-
-    uint256 proTxHash GUARDED_BY(cs);
+public:
+    uint256 proTxHash;
 
     //the dsq count from the last dsq broadcast of this node
-    std::atomic<int64_t> nLastDsq{0};
-    std::atomic<int> nMixingTxCount{0};
+    int64_t nLastDsq{0};
+    int nMixingTxCount{0};
 
     // KEEP TRACK OF GOVERNANCE ITEMS EACH MASTERNODE HAS VOTE UPON FOR RECALCULATION
-    std::map<uint256, int> mapGovernanceObjectsVotedOn GUARDED_BY(cs);
+    std::map<uint256, int> mapGovernanceObjectsVotedOn;
 
-    std::atomic<int> outboundAttemptCount{0};
-    std::atomic<int64_t> lastOutboundAttempt{0};
-    std::atomic<int64_t> lastOutboundSuccess{0};
+    int outboundAttemptCount{0};
+    int64_t lastOutboundAttempt{0};
+    int64_t lastOutboundSuccess{0};
 
     //! bool flag is node currently under platform ban by p2p message
-    bool m_platform_ban GUARDED_BY(cs){false};
+    bool m_platform_ban{false};
     //! height at which platform ban has been applied or removed
-    int m_platform_ban_updated GUARDED_BY(cs){0};
+    int m_platform_ban_updated{0};
 
 public:
     CMasternodeMetaInfo() = default;
     explicit CMasternodeMetaInfo(const uint256& _proTxHash) : proTxHash(_proTxHash) {}
-    CMasternodeMetaInfo(const CMasternodeMetaInfo& ref) :
-        proTxHash(ref.proTxHash),
-        nLastDsq(ref.nLastDsq.load()),
-        nMixingTxCount(ref.nMixingTxCount.load()),
-        mapGovernanceObjectsVotedOn(ref.mapGovernanceObjectsVotedOn),
-        lastOutboundAttempt(ref.lastOutboundAttempt.load()),
-        lastOutboundSuccess(ref.lastOutboundSuccess.load()),
-        m_platform_ban(ref.m_platform_ban),
-        m_platform_ban_updated(ref.m_platform_ban_updated)
-    {
-    }
+    CMasternodeMetaInfo(const CMasternodeMetaInfo& ref) = default;
 
-    template <typename Stream>
-    void Serialize(Stream& s) const EXCLUSIVE_LOCKS_REQUIRED(!cs)
+    SERIALIZE_METHODS(CMasternodeMetaInfo, obj)
     {
-        LOCK(cs);
-        s << proTxHash << nLastDsq << nMixingTxCount << mapGovernanceObjectsVotedOn << outboundAttemptCount
-          << lastOutboundAttempt << lastOutboundSuccess << m_platform_ban << m_platform_ban_updated;
-    }
-
-    template <typename Stream>
-    void Unserialize(Stream& s) EXCLUSIVE_LOCKS_REQUIRED(!cs)
-    {
-        LOCK(cs);
-        s >> proTxHash >> nLastDsq >> nMixingTxCount >> mapGovernanceObjectsVotedOn >> outboundAttemptCount >>
-            lastOutboundAttempt >> lastOutboundSuccess >> m_platform_ban >> m_platform_ban_updated;
+        READWRITE(obj.proTxHash, obj.nLastDsq, obj.nMixingTxCount, obj.mapGovernanceObjectsVotedOn,
+                  obj.outboundAttemptCount, obj.lastOutboundAttempt, obj.lastOutboundSuccess, obj.m_platform_ban,
+                  obj.m_platform_ban_updated);
     }
 
     UniValue ToJson() const EXCLUSIVE_LOCKS_REQUIRED(!cs);
@@ -91,7 +68,6 @@ class CMasternodeMetaInfo
 public:
     const uint256 GetProTxHash() const EXCLUSIVE_LOCKS_REQUIRED(!cs)
     {
-        LOCK(cs);
         return proTxHash;
     }
     int64_t GetLastDsq() const { return nLastDsq; }
@@ -111,7 +87,6 @@ class CMasternodeMetaInfo
     int64_t GetLastOutboundSuccess() const { return lastOutboundSuccess; }
     bool SetPlatformBan(bool is_banned, int height) EXCLUSIVE_LOCKS_REQUIRED(!cs)
     {
-        LOCK(cs);
         if (height < m_platform_ban_updated) {
             return false;
         }
@@ -124,7 +99,6 @@ class CMasternodeMetaInfo
     }
     bool IsPlatformBanned() const EXCLUSIVE_LOCKS_REQUIRED(!cs)
     {
-        LOCK(cs);
         return m_platform_ban;
     }
 };

From 69ed5f5293dd16df5a255d02e189d5c35f0cd0c0 Mon Sep 17 00:00:00 2001
From: Konstantin Akimov <knstqq@gmail.com>
Date: Sat, 11 Oct 2025 23:50:36 +0700
Subject: [PATCH 405/656] refactor: remove useless helpers of
 CMasternodeMetaInfo

---
 src/masternode/meta.cpp | 25 ++++++++++++++-----------
 src/masternode/meta.h   | 34 +++++++++-------------------------
 2 files changed, 23 insertions(+), 36 deletions(-)

diff --git a/src/masternode/meta.cpp b/src/masternode/meta.cpp
index 2e32d79a47d1..c7d802a0851a 100644
--- a/src/masternode/meta.cpp
+++ b/src/masternode/meta.cpp
@@ -10,6 +10,9 @@
 
 const std::string MasternodeMetaStore::SERIALIZATION_VERSION_STRING = "CMasternodeMetaMan-Version-5";
 
+static constexpr int MASTERNODE_MAX_FAILED_OUTBOUND_ATTEMPTS{5};
+static constexpr int MASTERNODE_MAX_MIXING_TXES{5};
+
 CMasternodeMetaMan::CMasternodeMetaMan() :
     m_db{std::make_unique<db_type>("mncache.dat", "magicMasternodeCache")}
 {
@@ -33,8 +36,8 @@ UniValue CMasternodeMetaInfo::ToJson() const
     int64_t now = GetTime<std::chrono::seconds>().count();
 
     UniValue ret(UniValue::VOBJ);
-    ret.pushKV("lastDSQ", nLastDsq);
-    ret.pushKV("mixingTxCount", nMixingTxCount);
+    ret.pushKV("lastDSQ", m_last_dsq);
+    ret.pushKV("mixingTxCount", m_mixing_tx_count);
     ret.pushKV("outboundAttemptCount", outboundAttemptCount);
     ret.pushKV("lastOutboundAttempt", lastOutboundAttempt);
     ret.pushKV("lastOutboundAttemptElapsed", now - lastOutboundAttempt);
@@ -87,7 +90,7 @@ bool CMasternodeMetaMan::IsDsqOver(const uint256& protx_hash, int mn_count) cons
         return false;
     }
     const auto& meta_info = it->second;
-    int64_t last_dsq = meta_info.GetLastDsq();
+    int64_t last_dsq = meta_info.m_last_dsq;
     int64_t threshold = last_dsq + mn_count / 5;
 
     LogPrint(BCLog::COINJOIN, "DSQUEUE -- mn: %s last_dsq: %d  dsq_threshold: %d  nDsqCount: %d\n",
@@ -100,15 +103,15 @@ void CMasternodeMetaMan::AllowMixing(const uint256& proTxHash)
     LOCK(cs);
     auto& mm = GetMetaInfo(proTxHash);
     nDsqCount++;
-    mm.nLastDsq = nDsqCount.load();
-    mm.nMixingTxCount = 0;
+    mm.m_last_dsq = nDsqCount.load();
+    mm.m_mixing_tx_count = 0;
 }
 
 void CMasternodeMetaMan::DisallowMixing(const uint256& proTxHash)
 {
     LOCK(cs);
     auto& mm = GetMetaInfo(proTxHash);
-    mm.nMixingTxCount++;
+    mm.m_mixing_tx_count++;
 }
 
 bool CMasternodeMetaMan::IsValidForMixingTxes(const uint256& protx_hash) const
@@ -118,7 +121,7 @@ bool CMasternodeMetaMan::IsValidForMixingTxes(const uint256& protx_hash) const
     auto it = metaInfos.find(protx_hash);
     if (it == metaInfos.end()) return true;
 
-    return it->second.IsValidForMixingTxes();
+    return it->second.m_mixing_tx_count <= MASTERNODE_MAX_MIXING_TXES;
 }
 
 bool CMasternodeMetaMan::AddGovernanceVote(const uint256& proTxHash, const uint256& nGovernanceObjectHash)
@@ -175,7 +178,7 @@ int64_t CMasternodeMetaMan::GetLastOutboundAttempt(const uint256& protx_hash) co
     auto it = metaInfos.find(protx_hash);
     if (it == metaInfos.end()) return 0;
 
-    return it->second.GetLastOutboundAttempt();
+    return it->second.lastOutboundAttempt;
 }
 
 int64_t CMasternodeMetaMan::GetLastOutboundSuccess(const uint256& protx_hash) const
@@ -185,7 +188,7 @@ int64_t CMasternodeMetaMan::GetLastOutboundSuccess(const uint256& protx_hash) co
     auto it = metaInfos.find(protx_hash);
     if (it == metaInfos.end()) return 0;
 
-    return it->second.GetLastOutboundSuccess();
+    return it->second.lastOutboundSuccess;
 }
 
 bool CMasternodeMetaMan::OutboundFailedTooManyTimes(const uint256& protx_hash) const
@@ -195,7 +198,7 @@ bool CMasternodeMetaMan::OutboundFailedTooManyTimes(const uint256& protx_hash) c
     auto it = metaInfos.find(protx_hash);
     if (it == metaInfos.end()) return false;
 
-    return it->second.OutboundFailedTooManyTimes();
+    return it->second.outboundAttemptCount > MASTERNODE_MAX_FAILED_OUTBOUND_ATTEMPTS;
 }
 
 bool CMasternodeMetaMan::IsPlatformBanned(const uint256& protx_hash) const
@@ -205,7 +208,7 @@ bool CMasternodeMetaMan::IsPlatformBanned(const uint256& protx_hash) const
     auto it = metaInfos.find(protx_hash);
     if (it == metaInfos.end()) return false;
 
-    return it->second.IsPlatformBanned();
+    return it->second.m_platform_ban;
 }
 
 bool CMasternodeMetaMan::ResetPlatformBan(const uint256& protx_hash, int height)
diff --git a/src/masternode/meta.h b/src/masternode/meta.h
index 81662b1d1e5b..838e6cd218e3 100644
--- a/src/masternode/meta.h
+++ b/src/masternode/meta.h
@@ -25,19 +25,16 @@ class UniValue;
 template<typename T>
 class CFlatDB;
 
-static constexpr int MASTERNODE_MAX_MIXING_TXES{5};
-static constexpr int MASTERNODE_MAX_FAILED_OUTBOUND_ATTEMPTS{5};
-
 // Holds extra (non-deterministic) information about masternodes
 // This is mostly local information, e.g. about mixing and governance
 class CMasternodeMetaInfo
 {
 public:
-    uint256 proTxHash;
+    uint256 m_protx_hash;
 
     //the dsq count from the last dsq broadcast of this node
-    int64_t nLastDsq{0};
-    int nMixingTxCount{0};
+    int64_t m_last_dsq{0};
+    int m_mixing_tx_count{0};
 
     // KEEP TRACK OF GOVERNANCE ITEMS EACH MASTERNODE HAS VOTE UPON FOR RECALCULATION
     std::map<uint256, int> mapGovernanceObjectsVotedOn;
@@ -53,12 +50,15 @@ class CMasternodeMetaInfo
 
 public:
     CMasternodeMetaInfo() = default;
-    explicit CMasternodeMetaInfo(const uint256& _proTxHash) : proTxHash(_proTxHash) {}
+    explicit CMasternodeMetaInfo(const uint256& protx_hash) :
+        m_protx_hash(protx_hash)
+    {
+    }
     CMasternodeMetaInfo(const CMasternodeMetaInfo& ref) = default;
 
     SERIALIZE_METHODS(CMasternodeMetaInfo, obj)
     {
-        READWRITE(obj.proTxHash, obj.nLastDsq, obj.nMixingTxCount, obj.mapGovernanceObjectsVotedOn,
+        READWRITE(obj.m_protx_hash, obj.m_last_dsq, obj.m_mixing_tx_count, obj.mapGovernanceObjectsVotedOn,
                   obj.outboundAttemptCount, obj.lastOutboundAttempt, obj.lastOutboundSuccess, obj.m_platform_ban,
                   obj.m_platform_ban_updated);
     }
@@ -66,25 +66,13 @@ class CMasternodeMetaInfo
     UniValue ToJson() const EXCLUSIVE_LOCKS_REQUIRED(!cs);
 
 public:
-    const uint256 GetProTxHash() const EXCLUSIVE_LOCKS_REQUIRED(!cs)
-    {
-        return proTxHash;
-    }
-    int64_t GetLastDsq() const { return nLastDsq; }
-    int GetMixingTxCount() const { return nMixingTxCount; }
-
-    bool IsValidForMixingTxes() const { return GetMixingTxCount() <= MASTERNODE_MAX_MIXING_TXES; }
-
     // KEEP TRACK OF EACH GOVERNANCE ITEM IN CASE THIS NODE GOES OFFLINE, SO WE CAN RECALCULATE THEIR STATUS
     void AddGovernanceVote(const uint256& nGovernanceObjectHash) EXCLUSIVE_LOCKS_REQUIRED(!cs);
 
     void RemoveGovernanceObject(const uint256& nGovernanceObjectHash) EXCLUSIVE_LOCKS_REQUIRED(!cs);
 
-    bool OutboundFailedTooManyTimes() const { return outboundAttemptCount > MASTERNODE_MAX_FAILED_OUTBOUND_ATTEMPTS; }
     void SetLastOutboundAttempt(int64_t t) { lastOutboundAttempt = t; ++outboundAttemptCount; }
-    int64_t GetLastOutboundAttempt() const { return lastOutboundAttempt; }
     void SetLastOutboundSuccess(int64_t t) { lastOutboundSuccess = t; outboundAttemptCount = 0; }
-    int64_t GetLastOutboundSuccess() const { return lastOutboundSuccess; }
     bool SetPlatformBan(bool is_banned, int height) EXCLUSIVE_LOCKS_REQUIRED(!cs)
     {
         if (height < m_platform_ban_updated) {
@@ -97,10 +85,6 @@ class CMasternodeMetaInfo
         m_platform_ban_updated = height;
         return true;
     }
-    bool IsPlatformBanned() const EXCLUSIVE_LOCKS_REQUIRED(!cs)
-    {
-        return m_platform_ban;
-    }
 };
 
 class MasternodeMetaStore
@@ -146,7 +130,7 @@ class MasternodeMetaStore
         std::vector<uint256> tmpUsedMasternodes;
         s >> tmpMetaInfo >> nDsqCount >> tmpUsedMasternodes;
         for (auto& mm : tmpMetaInfo) {
-            metaInfos.emplace(mm.GetProTxHash(), CMasternodeMetaInfo{std::move(mm)});
+            metaInfos.emplace(mm.m_protx_hash, CMasternodeMetaInfo{std::move(mm)});
         }
 
         // Convert vector to deque and build unordered_set for O(1) lookups

From b79dd900a9f739ef13eb16ccc0afb8d90945f7fd Mon Sep 17 00:00:00 2001
From: Konstantin Akimov <knstqq@gmail.com>
Date: Sun, 12 Oct 2025 00:00:32 +0700
Subject: [PATCH 406/656] refactor: use a helper GetMetaInfo and
 GetMetaInfoOrDefault internally

---
 src/masternode/meta.cpp | 34 ++++++++++++----------------------
 src/masternode/meta.h   |  1 +
 2 files changed, 13 insertions(+), 22 deletions(-)

diff --git a/src/masternode/meta.cpp b/src/masternode/meta.cpp
index c7d802a0851a..c6dcc9b42de9 100644
--- a/src/masternode/meta.cpp
+++ b/src/masternode/meta.cpp
@@ -13,6 +13,10 @@ const std::string MasternodeMetaStore::SERIALIZATION_VERSION_STRING = "CMasterno
 static constexpr int MASTERNODE_MAX_FAILED_OUTBOUND_ATTEMPTS{5};
 static constexpr int MASTERNODE_MAX_MIXING_TXES{5};
 
+namespace {
+static const CMasternodeMetaInfo default_meta_info_meta_info{};
+} // anonymous namespace
+
 CMasternodeMetaMan::CMasternodeMetaMan() :
     m_db{std::make_unique<db_type>("mncache.dat", "magicMasternodeCache")}
 {
@@ -63,14 +67,15 @@ void CMasternodeMetaInfo::RemoveGovernanceObject(const uint256& nGovernanceObjec
     mapGovernanceObjectsVotedOn.erase(nGovernanceObjectHash);
 }
 
-CMasternodeMetaInfo CMasternodeMetaMan::GetInfo(const uint256& proTxHash)
+const CMasternodeMetaInfo& CMasternodeMetaMan::GetMetaInfoOrDefault(const uint256& protx_hash) const
 {
-    auto it = metaInfos.find(proTxHash);
-    if (it == metaInfos.end()) return CMasternodeMetaInfo{};
-
+    const auto it = metaInfos.find(protx_hash);
+    if (it == metaInfos.end()) return default_meta_info_meta_info;
     return it->second;
 }
 
+CMasternodeMetaInfo CMasternodeMetaMan::GetInfo(const uint256& proTxHash) { return GetMetaInfoOrDefault(proTxHash); }
+
 CMasternodeMetaInfo& CMasternodeMetaMan::GetMetaInfo(const uint256& proTxHash)
 {
     auto it = metaInfos.find(proTxHash);
@@ -151,24 +156,14 @@ void CMasternodeMetaMan::SetLastOutboundAttempt(const uint256& protx_hash, int64
 {
     LOCK(cs);
 
-    auto it = metaInfos.find(protx_hash);
-    if (it == metaInfos.end()) {
-        it = metaInfos.emplace(protx_hash, CMasternodeMetaInfo{protx_hash}).first;
-    }
-
-    return it->second.SetLastOutboundAttempt(t);
+    GetMetaInfo(protx_hash).SetLastOutboundAttempt(t);
 }
 
 void CMasternodeMetaMan::SetLastOutboundSuccess(const uint256& protx_hash, int64_t t)
 {
     LOCK(cs);
 
-    auto it = metaInfos.find(protx_hash);
-    if (it == metaInfos.end()) {
-        it = metaInfos.emplace(protx_hash, CMasternodeMetaInfo{protx_hash}).first;
-    }
-
-    return it->second.SetLastOutboundSuccess(t);
+    GetMetaInfo(protx_hash).SetLastOutboundSuccess(t);
 }
 
 int64_t CMasternodeMetaMan::GetLastOutboundAttempt(const uint256& protx_hash) const
@@ -227,12 +222,7 @@ bool CMasternodeMetaMan::SetPlatformBan(const uint256& inv_hash, PlatformBanMess
 
     const uint256& protx_hash = ban_msg.m_protx_hash;
 
-    auto it = metaInfos.find(protx_hash);
-    if (it == metaInfos.end()) {
-        it = metaInfos.emplace(protx_hash, CMasternodeMetaInfo{protx_hash}).first;
-    }
-
-    bool ret = it->second.SetPlatformBan(true, ban_msg.m_requested_height);
+    bool ret = GetMetaInfo(protx_hash).SetPlatformBan(true, ban_msg.m_requested_height);
     if (ret) {
         m_seen_platform_bans.insert(inv_hash, std::move(ban_msg));
     }
diff --git a/src/masternode/meta.h b/src/masternode/meta.h
index 838e6cd218e3..82d318d11b27 100644
--- a/src/masternode/meta.h
+++ b/src/masternode/meta.h
@@ -204,6 +204,7 @@ class CMasternodeMetaMan : public MasternodeMetaStore
         SeenBanInventorySize};
 
     CMasternodeMetaInfo& GetMetaInfo(const uint256& proTxHash) EXCLUSIVE_LOCKS_REQUIRED(cs);
+    const CMasternodeMetaInfo& GetMetaInfoOrDefault(const uint256& proTxHash) const EXCLUSIVE_LOCKS_REQUIRED(cs);
 
 public:
     CMasternodeMetaMan(const CMasternodeMetaMan&) = delete;

From ed27d90f61bb9bd93f0913227858908f6385abd9 Mon Sep 17 00:00:00 2001
From: Konstantin Akimov <knstqq@gmail.com>
Date: Sun, 12 Oct 2025 00:06:03 +0700
Subject: [PATCH 407/656] refactor: use GetMetaInfoOrDefault widely, final

---
 src/masternode/meta.cpp | 41 +++++++++--------------------------------
 1 file changed, 9 insertions(+), 32 deletions(-)

diff --git a/src/masternode/meta.cpp b/src/masternode/meta.cpp
index c6dcc9b42de9..3b478327a1cc 100644
--- a/src/masternode/meta.cpp
+++ b/src/masternode/meta.cpp
@@ -105,9 +105,10 @@ bool CMasternodeMetaMan::IsDsqOver(const uint256& protx_hash, int mn_count) cons
 
 void CMasternodeMetaMan::AllowMixing(const uint256& proTxHash)
 {
+    nDsqCount++;
+
     LOCK(cs);
     auto& mm = GetMetaInfo(proTxHash);
-    nDsqCount++;
     mm.m_last_dsq = nDsqCount.load();
     mm.m_mixing_tx_count = 0;
 }
@@ -115,25 +116,19 @@ void CMasternodeMetaMan::AllowMixing(const uint256& proTxHash)
 void CMasternodeMetaMan::DisallowMixing(const uint256& proTxHash)
 {
     LOCK(cs);
-    auto& mm = GetMetaInfo(proTxHash);
-    mm.m_mixing_tx_count++;
+    GetMetaInfo(proTxHash).m_mixing_tx_count++;
 }
 
 bool CMasternodeMetaMan::IsValidForMixingTxes(const uint256& protx_hash) const
 {
     LOCK(cs);
-
-    auto it = metaInfos.find(protx_hash);
-    if (it == metaInfos.end()) return true;
-
-    return it->second.m_mixing_tx_count <= MASTERNODE_MAX_MIXING_TXES;
+    return GetMetaInfoOrDefault(protx_hash).m_mixing_tx_count <= MASTERNODE_MAX_MIXING_TXES;
 }
 
 bool CMasternodeMetaMan::AddGovernanceVote(const uint256& proTxHash, const uint256& nGovernanceObjectHash)
 {
     LOCK(cs);
-    auto& mm = GetMetaInfo(proTxHash);
-    mm.AddGovernanceVote(nGovernanceObjectHash);
+    GetMetaInfo(proTxHash).AddGovernanceVote(nGovernanceObjectHash);
     return true;
 }
 
@@ -155,55 +150,37 @@ std::vector<uint256> CMasternodeMetaMan::GetAndClearDirtyGovernanceObjectHashes(
 void CMasternodeMetaMan::SetLastOutboundAttempt(const uint256& protx_hash, int64_t t)
 {
     LOCK(cs);
-
     GetMetaInfo(protx_hash).SetLastOutboundAttempt(t);
 }
 
 void CMasternodeMetaMan::SetLastOutboundSuccess(const uint256& protx_hash, int64_t t)
 {
     LOCK(cs);
-
     GetMetaInfo(protx_hash).SetLastOutboundSuccess(t);
 }
 
 int64_t CMasternodeMetaMan::GetLastOutboundAttempt(const uint256& protx_hash) const
 {
     LOCK(cs);
-
-    auto it = metaInfos.find(protx_hash);
-    if (it == metaInfos.end()) return 0;
-
-    return it->second.lastOutboundAttempt;
+    return GetMetaInfoOrDefault(protx_hash).lastOutboundAttempt;
 }
 
 int64_t CMasternodeMetaMan::GetLastOutboundSuccess(const uint256& protx_hash) const
 {
     LOCK(cs);
-
-    auto it = metaInfos.find(protx_hash);
-    if (it == metaInfos.end()) return 0;
-
-    return it->second.lastOutboundSuccess;
+    return GetMetaInfoOrDefault(protx_hash).lastOutboundSuccess;
 }
 
 bool CMasternodeMetaMan::OutboundFailedTooManyTimes(const uint256& protx_hash) const
 {
     LOCK(cs);
-
-    auto it = metaInfos.find(protx_hash);
-    if (it == metaInfos.end()) return false;
-
-    return it->second.outboundAttemptCount > MASTERNODE_MAX_FAILED_OUTBOUND_ATTEMPTS;
+    return GetMetaInfoOrDefault(protx_hash).outboundAttemptCount > MASTERNODE_MAX_FAILED_OUTBOUND_ATTEMPTS;
 }
 
 bool CMasternodeMetaMan::IsPlatformBanned(const uint256& protx_hash) const
 {
     LOCK(cs);
-
-    auto it = metaInfos.find(protx_hash);
-    if (it == metaInfos.end()) return false;
-
-    return it->second.m_platform_ban;
+    return GetMetaInfoOrDefault(protx_hash).m_platform_ban;
 }
 
 bool CMasternodeMetaMan::ResetPlatformBan(const uint256& protx_hash, int height)

From 04ab976f70c74908ed5e0db1c2b5e3d21634f673 Mon Sep 17 00:00:00 2001
From: Konstantin Akimov <knstqq@gmail.com>
Date: Sun, 12 Oct 2025 00:11:16 +0700
Subject: [PATCH 408/656] refactor: remove unused CConnMan from meta.h

---
 src/masternode/meta.h | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/masternode/meta.h b/src/masternode/meta.h
index 82d318d11b27..788b310af2fe 100644
--- a/src/masternode/meta.h
+++ b/src/masternode/meta.h
@@ -19,7 +19,6 @@
 #include <optional>
 #include <vector>
 
-class CConnman;
 class UniValue;
 
 template<typename T>

From 969b84131dffc041381d2ebf6575395620851235 Mon Sep 17 00:00:00 2001
From: Konstantin Akimov <knstqq@gmail.com>
Date: Sun, 12 Oct 2025 00:17:55 +0700
Subject: [PATCH 409/656] refactor: drop return bool from AddGovernanceVote
 which is always true

---
 src/governance/object.cpp | 9 +--------
 src/masternode/meta.cpp   | 3 +--
 src/masternode/meta.h     | 2 +-
 3 files changed, 3 insertions(+), 11 deletions(-)

diff --git a/src/governance/object.cpp b/src/governance/object.cpp
index cc961d4d4d81..01b9135d34c6 100644
--- a/src/governance/object.cpp
+++ b/src/governance/object.cpp
@@ -147,14 +147,7 @@ bool CGovernanceObject::ProcessVote(CMasternodeMetaMan& mn_metaman, CGovernanceM
         return false;
     }
 
-    if (!mn_metaman.AddGovernanceVote(dmn->proTxHash, vote.GetParentHash())) {
-        std::string msg{strprintf("CGovernanceObject::%s -- Unable to add governance vote, MN outpoint = %s, "
-                                  "governance object hash = %s",
-            __func__, vote.GetMasternodeOutpoint().ToStringShort(), GetHash().ToString())};
-        LogPrint(BCLog::GOBJECT, "%s\n", msg);
-        exception = CGovernanceException(msg, GOVERNANCE_EXCEPTION_PERMANENT_ERROR);
-        return false;
-    }
+    mn_metaman.AddGovernanceVote(dmn->proTxHash, vote.GetParentHash());
 
     voteInstanceRef = vote_instance_t(vote.GetOutcome(), nVoteTimeUpdate, vote.GetTimestamp());
     fileVotes.AddVote(vote);
diff --git a/src/masternode/meta.cpp b/src/masternode/meta.cpp
index 3b478327a1cc..954e45ea397c 100644
--- a/src/masternode/meta.cpp
+++ b/src/masternode/meta.cpp
@@ -125,11 +125,10 @@ bool CMasternodeMetaMan::IsValidForMixingTxes(const uint256& protx_hash) const
     return GetMetaInfoOrDefault(protx_hash).m_mixing_tx_count <= MASTERNODE_MAX_MIXING_TXES;
 }
 
-bool CMasternodeMetaMan::AddGovernanceVote(const uint256& proTxHash, const uint256& nGovernanceObjectHash)
+void CMasternodeMetaMan::AddGovernanceVote(const uint256& proTxHash, const uint256& nGovernanceObjectHash)
 {
     LOCK(cs);
     GetMetaInfo(proTxHash).AddGovernanceVote(nGovernanceObjectHash);
-    return true;
 }
 
 void CMasternodeMetaMan::RemoveGovernanceObject(const uint256& nGovernanceObjectHash)
diff --git a/src/masternode/meta.h b/src/masternode/meta.h
index 788b310af2fe..22bceec51bba 100644
--- a/src/masternode/meta.h
+++ b/src/masternode/meta.h
@@ -227,7 +227,7 @@ class CMasternodeMetaMan : public MasternodeMetaStore
     void DisallowMixing(const uint256& proTxHash);
     bool IsValidForMixingTxes(const uint256& protx_hash) const EXCLUSIVE_LOCKS_REQUIRED(!cs);
 
-    bool AddGovernanceVote(const uint256& proTxHash, const uint256& nGovernanceObjectHash);
+    void AddGovernanceVote(const uint256& proTxHash, const uint256& nGovernanceObjectHash);
     void RemoveGovernanceObject(const uint256& nGovernanceObjectHash) EXCLUSIVE_LOCKS_REQUIRED(!cs);
 
     std::vector<uint256> GetAndClearDirtyGovernanceObjectHashes() EXCLUSIVE_LOCKS_REQUIRED(!cs);

From fe3966d7edaf039a990ad35ca95b76c501bbc1de Mon Sep 17 00:00:00 2001
From: Konstantin Akimov <knstqq@gmail.com>
Date: Thu, 16 Oct 2025 01:42:23 +0700
Subject: [PATCH 410/656] fix: removed leftover annotation, as follow-up
 conflict resolving with #6880

---
 src/masternode/meta.cpp |  6 +++++-
 src/masternode/meta.h   | 19 +++++++++----------
 2 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/src/masternode/meta.cpp b/src/masternode/meta.cpp
index 954e45ea397c..fa69d53eebd4 100644
--- a/src/masternode/meta.cpp
+++ b/src/masternode/meta.cpp
@@ -74,7 +74,11 @@ const CMasternodeMetaInfo& CMasternodeMetaMan::GetMetaInfoOrDefault(const uint25
     return it->second;
 }
 
-CMasternodeMetaInfo CMasternodeMetaMan::GetInfo(const uint256& proTxHash) { return GetMetaInfoOrDefault(proTxHash); }
+CMasternodeMetaInfo CMasternodeMetaMan::GetInfo(const uint256& proTxHash) const
+{
+    LOCK(cs);
+    return GetMetaInfoOrDefault(proTxHash);
+}
 
 CMasternodeMetaInfo& CMasternodeMetaMan::GetMetaInfo(const uint256& proTxHash)
 {
diff --git a/src/masternode/meta.h b/src/masternode/meta.h
index 22bceec51bba..ac031da49251 100644
--- a/src/masternode/meta.h
+++ b/src/masternode/meta.h
@@ -31,7 +31,7 @@ class CMasternodeMetaInfo
 public:
     uint256 m_protx_hash;
 
-    //the dsq count from the last dsq broadcast of this node
+    //! the dsq count from the last dsq broadcast of this node
     int64_t m_last_dsq{0};
     int m_mixing_tx_count{0};
 
@@ -62,17 +62,16 @@ class CMasternodeMetaInfo
                   obj.m_platform_ban_updated);
     }
 
-    UniValue ToJson() const EXCLUSIVE_LOCKS_REQUIRED(!cs);
+    UniValue ToJson() const;
 
-public:
     // KEEP TRACK OF EACH GOVERNANCE ITEM IN CASE THIS NODE GOES OFFLINE, SO WE CAN RECALCULATE THEIR STATUS
-    void AddGovernanceVote(const uint256& nGovernanceObjectHash) EXCLUSIVE_LOCKS_REQUIRED(!cs);
-
-    void RemoveGovernanceObject(const uint256& nGovernanceObjectHash) EXCLUSIVE_LOCKS_REQUIRED(!cs);
+    void AddGovernanceVote(const uint256& nGovernanceObjectHash);
+    void RemoveGovernanceObject(const uint256& nGovernanceObjectHash);
 
     void SetLastOutboundAttempt(int64_t t) { lastOutboundAttempt = t; ++outboundAttemptCount; }
     void SetLastOutboundSuccess(int64_t t) { lastOutboundSuccess = t; outboundAttemptCount = 0; }
-    bool SetPlatformBan(bool is_banned, int height) EXCLUSIVE_LOCKS_REQUIRED(!cs)
+
+    bool SetPlatformBan(bool is_banned, int height)
     {
         if (height < m_platform_ban_updated) {
             return false;
@@ -215,7 +214,7 @@ class CMasternodeMetaMan : public MasternodeMetaStore
 
     bool IsValid() const { return is_valid; }
 
-    CMasternodeMetaInfo GetInfo(const uint256& proTxHash) EXCLUSIVE_LOCKS_REQUIRED(!cs);
+    CMasternodeMetaInfo GetInfo(const uint256& proTxHash) const EXCLUSIVE_LOCKS_REQUIRED(!cs);
 
     // We keep track of dsq (mixing queues) count to avoid using same masternodes for mixing too often.
     // MN's threshold is calculated as the last dsq count this specific masternode was used in a mixing
@@ -223,8 +222,8 @@ class CMasternodeMetaMan : public MasternodeMetaStore
     // masternodes before we ever see a masternode that we know already mixed someone's funds earlier.
     bool IsDsqOver(const uint256& protx_hash, int mn_count) const EXCLUSIVE_LOCKS_REQUIRED(!cs);
 
-    void AllowMixing(const uint256& proTxHash);
-    void DisallowMixing(const uint256& proTxHash);
+    void AllowMixing(const uint256& proTxHash) EXCLUSIVE_LOCKS_REQUIRED(!cs);
+    void DisallowMixing(const uint256& proTxHash) EXCLUSIVE_LOCKS_REQUIRED(!cs);
     bool IsValidForMixingTxes(const uint256& protx_hash) const EXCLUSIVE_LOCKS_REQUIRED(!cs);
 
     void AddGovernanceVote(const uint256& proTxHash, const uint256& nGovernanceObjectHash);

From 74885215086c370439bc561712fb3623c30dfc42 Mon Sep 17 00:00:00 2001
From: pasta <pasta@dashboost.org>
Date: Tue, 4 Nov 2025 15:43:16 -0600
Subject: [PATCH 411/656] docs: update build instructions for Unix systems to
 include libbacktrace as a dependency

---
 doc/build-unix.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/doc/build-unix.md b/doc/build-unix.md
index 9d28ad8a16e3..944700c8ec8c 100644
--- a/doc/build-unix.md
+++ b/doc/build-unix.md
@@ -58,7 +58,7 @@ sudo apt-get install build-essential libtool autotools-dev automake pkg-config b
 Now, you can either build from self-compiled [depends](/depends/README.md) or install the required dependencies:
 
 ```sh
-sudo apt-get install libevent-dev libboost-dev
+sudo apt-get install libbacktrace-dev libevent-dev libboost-dev
 ```
 
 SQLite is required for the descriptor wallet:
@@ -139,7 +139,7 @@ sudo dnf install gcc-c++ libtool make autoconf automake python3
 Now, you can either build from self-compiled [depends](/depends/README.md) or install the required dependencies:
 
 ```sh
-sudo dnf install libevent-devel boost-devel
+sudo dnf install libbacktrace-devel libevent-devel boost-devel
 ```
 
 SQLite is required for the descriptor wallet:
@@ -279,7 +279,7 @@ Setup and Build Example: Arch Linux
 This example lists the steps necessary to setup and build a command line only distribution of the latest changes on Arch Linux:
 
 ```sh
-pacman --sync --needed autoconf automake boost gcc git libevent libtool make pkgconf python sqlite
+pacman --sync --needed autoconf automake boost gcc git libbacktrace libevent libtool make pkgconf python sqlite
 git clone https://github.com/dashpay/dash.git
 cd dash/
 ./autogen.sh

From f3219eef7d66e2e7a422435a4774dc01a1817a4e Mon Sep 17 00:00:00 2001
From: pasta <pasta@dashboost.org>
Date: Wed, 5 Nov 2025 20:34:06 -0600
Subject: [PATCH 412/656] qt: avoid modifying QString during regex iteration in
 GUIUtil::loadStyleSheet

Collect regex matches first, compute replacements using capturedStart/capturedEnd,
then apply in reverse order to prevent iterator invalidation and QString
corruption when processing <os=...></os> sections. Also include <algorithm> for
std::sort.
---
 src/qt/guiutil.cpp | 53 +++++++++++++++++++++++++++++-----------------
 1 file changed, 34 insertions(+), 19 deletions(-)

diff --git a/src/qt/guiutil.cpp b/src/qt/guiutil.cpp
index dbf4e33c7821..9ae4964330f2 100644
--- a/src/qt/guiutil.cpp
+++ b/src/qt/guiutil.cpp
@@ -71,6 +71,7 @@
 
 #include <chrono>
 #include <exception>
+#include <algorithm>
 #include <fstream>
 #include <string>
 #include <vector>
@@ -958,7 +959,6 @@ void loadStyleSheet(bool fForceUpdate)
 
                 QString strStyle = QLatin1String(qFile.readAll());
                 // Process all <os=...></os> groups in the stylesheet first
-                QRegularExpressionMatch osStyleMatch;
                 QRegularExpression osStyleExp(
                         "^"
                         "(<os=(?:'|\").+(?:'|\")>)" // group 1
@@ -966,29 +966,44 @@ void loadStyleSheet(bool fForceUpdate)
                         "(</os>?)"                  // group 3
                         "$");
                 osStyleExp.setPatternOptions(QRegularExpression::MultilineOption);
-                QRegularExpressionMatchIterator it = osStyleExp.globalMatch(strStyle);
 
-                // For all <os=...></os> sections
-                while (it.hasNext() && (osStyleMatch = it.next()).isValid()) {
-                    QStringList listMatches = osStyleMatch.capturedTexts();
-
-                    // Full match + 3 group matches
-                    if (listMatches.size() % 4) {
-                        throw std::runtime_error(strprintf("%s: Invalid <os=...></os> section in file %s", __func__, file.toStdString()));
+                // Collect matches first to avoid modifying the string while iterating
+                QList<QRegularExpressionMatch> matches;
+                {
+                    QRegularExpressionMatchIterator it = osStyleExp.globalMatch(strStyle);
+                    while (it.hasNext()) {
+                        QRegularExpressionMatch m = it.next();
+                        if (m.hasMatch()) {
+                            matches.append(m);
+                        }
                     }
+                }
 
-                    for (int i = 0; i < listMatches.size(); i += 4) {
-                        if (!listMatches[i + 1].contains(QString::fromStdString(platformName))) {
-                            // If os is not supported for this styles
-                            // just remove the full match
-                            strStyle.replace(listMatches[i], "");
-                        } else {
-                            // If its supported remove the <os=...></os> tags
-                            strStyle.replace(listMatches[i + 1], "");
-                            strStyle.replace(listMatches[i + 3], "");
-                        }
+                // Build replacement operations using absolute positions
+                struct Replacement { int start; int end; QString replacement; };
+                QVector<Replacement> replacements;
+                for (const auto& m : matches) {
+                    const QString openTag = m.captured(1);
+                    const QString inner = m.captured(2);
+                    Q_UNUSED(inner);
+                    // Remove entire block if OS doesn't match, otherwise drop only the tags
+                    if (!openTag.contains(QString::fromStdString(platformName))) {
+                        replacements.push_back({m.capturedStart(0), m.capturedEnd(0), QString()});
+                    } else {
+                        // Remove opening and closing tags, keep inner content
+                        replacements.push_back({m.capturedStart(1), m.capturedEnd(1), QString()});
+                        replacements.push_back({m.capturedStart(3), m.capturedEnd(3), QString()});
                     }
                 }
+
+                // Apply replacements from end to start so offsets stay valid
+                std::sort(replacements.begin(), replacements.end(), [](const Replacement& a, const Replacement& b) {
+                    return a.start > b.start;
+                });
+                for (const auto& r : replacements) {
+                    strStyle.replace(r.start, r.end - r.start, r.replacement);
+                }
+
                 stylesheet->append(strStyle);
             }
             return true;

From 77c3aeb128382ebff594f36aa32edd3ec5545cd4 Mon Sep 17 00:00:00 2001
From: pasta <pasta@dashboost.org>
Date: Wed, 5 Nov 2025 21:01:42 -0600
Subject: [PATCH 413/656] qt: Improve wallet creation UI flow

- Add collapsible advanced options toggle in CreateWalletDialog
- Add mnemonic verification dialog after wallet creation
- Implement getMnemonic() interface method for retrieving mnemonic phrases
- Add proper error handling for wallet lock state restoration
- Add styling for both light and dark themes
- Show verification dialog for HD wallets after creation
- Skip verification for blank wallets and wallets with disabled private keys
---
 src/Makefile.qt.include                    |   4 +
 src/interfaces/wallet.h                    |   3 +
 src/qt/createwalletdialog.cpp              |  12 +
 src/qt/forms/createwalletdialog.ui         |  48 ++-
 src/qt/forms/mnemonicverificationdialog.ui | 206 ++++++++++
 src/qt/mnemonicverificationdialog.cpp      | 428 +++++++++++++++++++++
 src/qt/mnemonicverificationdialog.h        |  59 +++
 src/qt/res/css/dark.css                    |  84 ++++
 src/qt/res/css/light.css                   |  84 ++++
 src/qt/walletcontroller.cpp                | 105 ++++-
 src/qt/walletcontroller.h                  |   1 +
 src/wallet/interfaces.cpp                  |  53 +++
 12 files changed, 1085 insertions(+), 2 deletions(-)
 create mode 100644 src/qt/forms/mnemonicverificationdialog.ui
 create mode 100644 src/qt/mnemonicverificationdialog.cpp
 create mode 100644 src/qt/mnemonicverificationdialog.h

diff --git a/src/Makefile.qt.include b/src/Makefile.qt.include
index f50ac4602bfb..932b7a2f64ac 100644
--- a/src/Makefile.qt.include
+++ b/src/Makefile.qt.include
@@ -27,6 +27,7 @@ QT_FORMS_UI = \
   qt/forms/intro.ui \
   qt/forms/modaloverlay.ui \
   qt/forms/masternodelist.ui \
+  qt/forms/mnemonicverificationdialog.ui \
   qt/forms/qrdialog.ui \
   qt/forms/openuridialog.ui \
   qt/forms/optionsdialog.ui \
@@ -66,6 +67,7 @@ QT_MOC_CPP = \
   qt/moc_macnotificationhandler.cpp \
   qt/moc_modaloverlay.cpp \
   qt/moc_masternodelist.cpp \
+  qt/moc_mnemonicverificationdialog.cpp \
   qt/moc_notificator.cpp \
   qt/moc_openuridialog.cpp \
   qt/moc_optionsdialog.cpp \
@@ -144,6 +146,7 @@ BITCOIN_QT_H = \
   qt/macos_appnap.h \
   qt/modaloverlay.h \
   qt/masternodelist.h \
+  qt/mnemonicverificationdialog.h \
   qt/networkstyle.h \
   qt/notificator.h \
   qt/openuridialog.h \
@@ -257,6 +260,7 @@ BITCOIN_QT_WALLET_CPP = \
   qt/governancelist.cpp \
   qt/proposalwizard.cpp \
   qt/masternodelist.cpp \
+  qt/mnemonicverificationdialog.cpp \
   qt/openuridialog.cpp \
   qt/overviewpage.cpp \
   qt/paymentserver.cpp \
diff --git a/src/interfaces/wallet.h b/src/interfaces/wallet.h
index f704bd197ef7..56a2f595e666 100644
--- a/src/interfaces/wallet.h
+++ b/src/interfaces/wallet.h
@@ -297,6 +297,9 @@ class Wallet
     //! Return whether is a legacy wallet
     virtual bool isLegacy() = 0;
 
+    //! Get mnemonic phrase from wallet.
+    virtual bool getMnemonic(SecureString& mnemonic_out, SecureString& mnemonic_passphrase_out) = 0;
+
     //! Register handler for unload message.
     using UnloadFn = std::function<void()>;
     virtual std::unique_ptr<Handler> handleUnload(UnloadFn fn) = 0;
diff --git a/src/qt/createwalletdialog.cpp b/src/qt/createwalletdialog.cpp
index 5b7a7b353b4b..e10eacfa3d5e 100644
--- a/src/qt/createwalletdialog.cpp
+++ b/src/qt/createwalletdialog.cpp
@@ -12,6 +12,7 @@
 #include <qt/guiutil.h>
 
 #include <QPushButton>
+#include <QToolButton>
 
 CreateWalletDialog::CreateWalletDialog(QWidget* parent) :
     QDialog(parent, GUIUtil::dialog_flags),
@@ -22,6 +23,17 @@ CreateWalletDialog::CreateWalletDialog(QWidget* parent) :
     ui->buttonBox->button(QDialogButtonBox::Ok)->setEnabled(false);
     ui->wallet_name_line_edit->setFocus(Qt::ActiveWindowFocusReason);
 
+    // Hide advanced options by default and provide a compact toggle control.
+    ui->groupBox->setVisible(false);
+    ui->groupBox->setTitle(QString());
+    ui->advanced_toggle_button->setChecked(false);
+    ui->advanced_toggle_button->setArrowType(Qt::RightArrow);
+    ui->advanced_toggle_button->setFocusPolicy(Qt::NoFocus);
+    connect(ui->advanced_toggle_button, &QToolButton::toggled, this, [this](bool checked) {
+        ui->groupBox->setVisible(checked);
+        ui->advanced_toggle_button->setArrowType(checked ? Qt::DownArrow : Qt::RightArrow);
+    });
+
     connect(ui->wallet_name_line_edit, &QLineEdit::textEdited, [this](const QString& text) {
         ui->buttonBox->button(QDialogButtonBox::Ok)->setEnabled(!text.isEmpty());
     });
diff --git a/src/qt/forms/createwalletdialog.ui b/src/qt/forms/createwalletdialog.ui
index 49f66c25e418..26c93d861838 100644
--- a/src/qt/forms/createwalletdialog.ui
+++ b/src/qt/forms/createwalletdialog.ui
@@ -17,6 +17,9 @@
    <bool>true</bool>
   </property>
   <layout class="QVBoxLayout" name="verticalLayout">
+   <property name="spacing">
+    <number>8</number>
+   </property>
    <item>
     <layout class="QHBoxLayout" name="horizontalLayout">
      <item>
@@ -71,11 +74,54 @@
     </spacer>
    </item>
    <item>
+   <widget class="QToolButton" name="advanced_toggle_button">
+    <property name="text">
+     <string>Advanced Options</string>
+    </property>
+    <property name="toolButtonStyle">
+     <enum>Qt::ToolButtonTextBesideIcon</enum>
+    </property>
+    <property name="autoRaise">
+     <bool>true</bool>
+    </property>
+    <property name="focusPolicy">
+     <enum>Qt::NoFocus</enum>
+    </property>
+    <property name="checkable">
+     <bool>true</bool>
+    </property>
+    <property name="checked">
+     <bool>false</bool>
+    </property>
+    <property name="arrowType">
+     <enum>Qt::RightArrow</enum>
+    </property>
+   </widget>
+  </item>
+  <item>
     <widget class="QGroupBox" name="groupBox">
      <property name="title">
-      <string>Advanced Options</string>
+      <string/>
+     </property>
+     <property name="visible">
+      <bool>false</bool>
      </property>
      <layout class="QVBoxLayout" name="verticalLayout_groupbox">
+      <property name="topMargin">
+       <number>0</number>
+      </property>
+      <property name="leftMargin">
+       <number>8</number>
+      </property>
+      <property name="rightMargin">
+       <number>8</number>
+      </property>
+      <property name="bottomMargin">
+       <number>8</number>
+      </property>
+      <property name="spacing">
+       <number>4</number>
+      </property>
       <item>
        <widget class="QCheckBox" name="disable_privkeys_checkbox">
         <property name="enabled">
diff --git a/src/qt/forms/mnemonicverificationdialog.ui b/src/qt/forms/mnemonicverificationdialog.ui
new file mode 100644
index 000000000000..af07af8b3299
--- /dev/null
+++ b/src/qt/forms/mnemonicverificationdialog.ui
@@ -0,0 +1,206 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>MnemonicVerificationDialog</class>
+ <widget class="QDialog" name="MnemonicVerificationDialog">
+  <property name="windowTitle">
+   <string>Save Your Mnemonic</string>
+  </property>
+  <layout class="QVBoxLayout" name="verticalLayout">
+   <item>
+    <widget class="QStackedWidget" name="stackedWidget">
+     <property name="currentIndex">
+      <number>0</number>
+     </property>
+     <widget class="QWidget" name="step1Page">
+      <layout class="QVBoxLayout" name="verticalLayout_step1">
+       <item>
+        <widget class="QLabel" name="warningLabel">
+         <property name="text">
+          <string>WARNING: If you lose your mnemonic seed phrase, you will lose access to your wallet forever.</string>
+         </property>
+         <property name="textFormat">
+          <enum>Qt::RichText</enum>
+         </property>
+         <property name="wordWrap">
+          <bool>true</bool>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <widget class="QLabel" name="instructionLabel">
+         <property name="text">
+          <string>Please write down these words in order. You will need them to restore your wallet.</string>
+         </property>
+         <property name="wordWrap">
+          <bool>true</bool>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <widget class="QScrollArea" name="mnemonicScroll">
+         <property name="frameShape">
+          <enum>QFrame::NoFrame</enum>
+         </property>
+         <property name="widgetResizable">
+          <bool>true</bool>
+         </property>
+         <widget class="QWidget" name="mnemonicGridWidget">
+          <layout class="QGridLayout" name="mnemonicGridLayout"/>
+         </widget>
+        </widget>
+       </item>
+       <item>
+        <layout class="QHBoxLayout" name="horizontalLayout_buttons">
+         <item>
+          <widget class="QPushButton" name="showMnemonicButton">
+           <property name="text">
+            <string>Show</string>
+           </property>
+          </widget>
+         </item>
+         <item>
+          <widget class="QPushButton" name="hideMnemonicButton">
+           <property name="text">
+            <string>Hide</string>
+           </property>
+          </widget>
+         </item>
+         <item>
+          <spacer name="horizontalSpacer_1">
+           <property name="orientation">
+            <enum>Qt::Horizontal</enum>
+           </property>
+           <property name="sizeHint" stdset="0">
+            <size>
+             <width>20</width>
+             <height>20</height>
+            </size>
+           </property>
+          </spacer>
+         </item>
+         <item>
+          <widget class="QCheckBox" name="writtenDownCheckbox">
+           <property name="text">
+            <string>I have written down my mnemonic</string>
+           </property>
+          </widget>
+         </item>
+        </layout>
+       </item>
+      </layout>
+     </widget>
+     <widget class="QWidget" name="step2Page">
+      <layout class="QVBoxLayout" name="verticalLayout_step2">
+       <item>
+        <widget class="QLabel" name="verificationLabel">
+         <property name="text">
+          <string>To verify you've saved your mnemonic, please enter the following words:</string>
+         </property>
+         <property name="wordWrap">
+          <bool>true</bool>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <layout class="QFormLayout" name="formLayout">
+         <item row="0" column="0">
+          <widget class="QLabel" name="word1Label">
+           <property name="text">
+            <string>Word #1:</string>
+           </property>
+          </widget>
+         </item>
+         <item row="0" column="1">
+          <layout class="QHBoxLayout" name="horizontalLayout_word1">
+           <item>
+            <widget class="QLineEdit" name="word1Edit"/>
+           </item>
+           <item>
+            <widget class="QLabel" name="word1Status"/>
+           </item>
+          </layout>
+         </item>
+         <item row="1" column="0">
+          <widget class="QLabel" name="word2Label">
+           <property name="text">
+            <string>Word #2:</string>
+           </property>
+          </widget>
+         </item>
+         <item row="1" column="1">
+          <layout class="QHBoxLayout" name="horizontalLayout_word2">
+           <item>
+            <widget class="QLineEdit" name="word2Edit"/>
+           </item>
+           <item>
+            <widget class="QLabel" name="word2Status"/>
+           </item>
+          </layout>
+         </item>
+         <item row="2" column="0">
+          <widget class="QLabel" name="word3Label">
+           <property name="text">
+            <string>Word #3:</string>
+           </property>
+          </widget>
+         </item>
+         <item row="2" column="1">
+          <layout class="QHBoxLayout" name="horizontalLayout_word3">
+           <item>
+            <widget class="QLineEdit" name="word3Edit"/>
+           </item>
+           <item>
+            <widget class="QLabel" name="word3Status"/>
+           </item>
+          </layout>
+         </item>
+        </layout>
+       </item>
+       <item>
+        <layout class="QHBoxLayout" name="horizontalLayout_actions">
+         <item>
+          <widget class="QPushButton" name="showMnemonicAgainButton">
+           <property name="text">
+            <string>Back</string>
+           </property>
+          </widget>
+         </item>
+         <item>
+          <spacer name="horizontalSpacer_2">
+           <property name="orientation">
+            <enum>Qt::Horizontal</enum>
+           </property>
+          </spacer>
+         </item>
+        </layout>
+       </item>
+      </layout>
+     </widget>
+    </widget>
+   </item>
+   <item>
+    <widget class="QDialogButtonBox" name="buttonBox">
+     <property name="standardButtons">
+      <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
+     </property>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <resources/>
+ <connections>
+  <connection>
+   <sender>buttonBox</sender>
+   <signal>accepted()</signal>
+   <receiver>MnemonicVerificationDialog</receiver>
+   <slot>accept()</slot>
+  </connection>
+  <connection>
+   <sender>buttonBox</sender>
+   <signal>rejected()</signal>
+   <receiver>MnemonicVerificationDialog</receiver>
+   <slot>reject()</slot>
+  </connection>
+ </connections>
+</ui>
+
diff --git a/src/qt/mnemonicverificationdialog.cpp b/src/qt/mnemonicverificationdialog.cpp
new file mode 100644
index 000000000000..86a58e0e358c
--- /dev/null
+++ b/src/qt/mnemonicverificationdialog.cpp
@@ -0,0 +1,428 @@
+// Copyright (c) 2024 The Dash Core developers
+// Distributed under the MIT software license, see the accompanying
+// file COPYING or http://www.opensource.org/licenses/mit-license.php.
+
+#if defined(HAVE_CONFIG_H)
+#include <config/bitcoin-config.h>
+#endif
+
+#include <qt/mnemonicverificationdialog.h>
+#include <qt/forms/ui_mnemonicverificationdialog.h>
+
+#include <qt/guiutil.h>
+
+#include <QDialogButtonBox>
+#include <QGridLayout>
+#include <QLabel>
+#include <QPushButton>
+#include <QRandomGenerator>
+#include <QRegularExpression>
+#include <QScrollArea>
+#include <QSet>
+#include <QMessageBox>
+
+MnemonicVerificationDialog::MnemonicVerificationDialog(const SecureString& mnemonic, QWidget *parent) :
+    QDialog(parent, GUIUtil::dialog_flags),
+    ui(new Ui::MnemonicVerificationDialog),
+    m_mnemonic(mnemonic),
+    m_mnemonic_revealed(false)
+{
+    ui->setupUi(this);
+
+    if (auto w = findChild<QWidget*>("mnemonicGridWidget")) {
+        m_gridLayout = qobject_cast<QGridLayout*>(w->layout());
+    }
+
+    // Keep minimum small so the page can compress when users scale down
+    setMinimumSize(QSize(550, 360));
+    resize(minimumSize());
+
+    setWindowTitle(tr("Save Your Mnemonic"));
+
+    // Words will be parsed on-demand to minimize exposure time in non-secure memory
+    // m_words is intentionally left empty initially
+
+    // Trim outer paddings and inter-item spacing to avoid over-padded look
+    if (auto mainLayout = findChild<QVBoxLayout*>("verticalLayout")) {
+        mainLayout->setContentsMargins(8, 4, 8, 6);
+        mainLayout->setSpacing(6);
+    }
+    if (auto s1 = findChild<QVBoxLayout*>("verticalLayout_step1")) {
+        s1->setContentsMargins(8, 4, 8, 6);
+        s1->setSpacing(6);
+    }
+    if (auto s2 = findChild<QVBoxLayout*>("verticalLayout_step2")) {
+        s2->setContentsMargins(8, 2, 8, 6);
+        s2->setSpacing(4);
+        s2->setAlignment(Qt::AlignTop);
+    }
+    if (ui->formLayout) {
+        ui->formLayout->setContentsMargins(0, 0, 0, 0);
+        ui->formLayout->setVerticalSpacing(3);
+        ui->formLayout->setHorizontalSpacing(8);
+    }
+    if (ui->buttonBox) {
+        ui->buttonBox->setContentsMargins(0, 0, 0, 0);
+        ui->buttonBox->setSizePolicy(QSizePolicy::Minimum, QSizePolicy::Minimum);
+    }
+
+    // Prefer compact default; we will adjust per-step to sizeHint
+    ui->stackedWidget->setSizePolicy(QSizePolicy::Minimum, QSizePolicy::Minimum);
+    // Ensure buttonBox is hidden initially (will be shown in step2)
+    ui->buttonBox->hide();
+    setupStep1();
+    adjustSize();
+    m_defaultSize = size();
+
+    // Connections
+    connect(ui->showMnemonicButton, &QPushButton::clicked, this, &MnemonicVerificationDialog::onShowMnemonicClicked);
+    connect(ui->hideMnemonicButton,  &QPushButton::clicked, this, &MnemonicVerificationDialog::onHideMnemonicClicked);
+    connect(ui->writtenDownCheckbox, &QCheckBox::toggled, this, [this](bool checked) {
+        if (checked && m_has_ever_revealed) setupStep2();
+    });
+    connect(ui->word1Edit, &QLineEdit::textChanged, this, &MnemonicVerificationDialog::onWord1Changed);
+    connect(ui->word2Edit, &QLineEdit::textChanged, this, &MnemonicVerificationDialog::onWord2Changed);
+    connect(ui->word3Edit, &QLineEdit::textChanged, this, &MnemonicVerificationDialog::onWord3Changed);
+    connect(ui->showMnemonicAgainButton, &QPushButton::clicked, this, &MnemonicVerificationDialog::onShowMnemonicAgainClicked);
+
+    // Button box
+    ui->buttonBox->button(QDialogButtonBox::Ok)->setText(tr("Continue"));
+    connect(ui->buttonBox, &QDialogButtonBox::accepted, this, &MnemonicVerificationDialog::accept);
+    connect(ui->buttonBox, &QDialogButtonBox::rejected, this, &MnemonicVerificationDialog::reject);
+
+    GUIUtil::handleCloseWindowShortcut(this);
+}
+
+MnemonicVerificationDialog::~MnemonicVerificationDialog()
+{
+    clearWordsSecurely();
+    clearMnemonic();
+    delete ui;
+}
+
+void MnemonicVerificationDialog::setupStep1()
+{
+    ui->stackedWidget->setCurrentIndex(0);
+    buildMnemonicGrid(false);
+    ui->hideMnemonicButton->hide();
+    ui->showMnemonicButton->show();
+    ui->writtenDownCheckbox->setEnabled(false);
+    ui->writtenDownCheckbox->setChecked(false);
+    m_mnemonic_revealed = false;
+    ui->buttonBox->hide();
+    // Compact to content
+    adjustSize();
+
+    // Match visual hierarchy and tone of the improved mock
+    QString warningStyle = QString("font-size:17px; font-weight:700; ") + GUIUtil::getThemedStyleQString(GUIUtil::ThemedStyle::TS_ERROR);
+    QString instructionStyle = QString("font-size:14px; ") + GUIUtil::getThemedStyleQString(GUIUtil::ThemedStyle::TS_PRIMARY);
+    ui->warningLabel->setText(
+        tr("<span style='%1'>WARNING: If you lose your mnemonic seed phrase, you will lose access to your wallet forever. Write it down in a safe place and never share it with anyone.</span>")
+        .arg(warningStyle)
+    );
+    ui->instructionLabel->setText(
+        tr("<span style='%1'>Please write down these words in order. You will need them to restore your wallet.</span>")
+        .arg(instructionStyle)
+    );
+
+    // Reduce extra padding to avoid an over-padded look
+    if (auto outer = findChild<QVBoxLayout*>("verticalLayout_step1")) {
+        outer->setContentsMargins(12, 6, 12, 6);
+        outer->setSpacing(6);
+    }
+    if (auto hb = findChild<QHBoxLayout*>("horizontalLayout_buttons")) {
+        hb->setContentsMargins(0, 4, 0, 0);
+        hb->setSpacing(10);
+    }
+}
+
+void MnemonicVerificationDialog::setupStep2()
+{
+    ui->stackedWidget->setCurrentIndex(1);
+    // Parse words for validation (needed in step 2)
+    parseWords();
+    generateRandomPositions();
+
+    ui->word1Edit->clear();
+    ui->word2Edit->clear();
+    ui->word3Edit->clear();
+    ui->word1Edit->setMaximumWidth(320);
+    ui->word2Edit->setMaximumWidth(320);
+    ui->word3Edit->setMaximumWidth(320);
+    ui->word1Status->setMinimumWidth(18);
+    ui->word2Status->setMinimumWidth(18);
+    ui->word3Status->setMinimumWidth(18);
+
+    ui->word1Label->setText(tr("Word #%1:").arg(m_selected_positions[0]));
+    ui->word2Label->setText(tr("Word #%1:").arg(m_selected_positions[1]));
+    ui->word3Label->setText(tr("Word #%1:").arg(m_selected_positions[2]));
+
+    ui->word1Status->clear();
+    ui->word2Status->clear();
+    ui->word3Status->clear();
+
+    ui->buttonBox->show();
+    if (QAbstractButton* cancel = ui->buttonBox->button(QDialogButtonBox::Cancel)) {
+        cancel->show();
+        cancel->setText(tr("Back"));
+        disconnect(cancel, nullptr, nullptr, nullptr);
+        connect(cancel, &QAbstractButton::clicked, this, &MnemonicVerificationDialog::onShowMnemonicAgainClicked);
+    }
+    if (QAbstractButton* cont = ui->buttonBox->button(QDialogButtonBox::Ok)) cont->setEnabled(false);
+    if (ui->showMnemonicAgainButton) ui->showMnemonicAgainButton->hide();
+
+    // Ensure verification label has minimal top spacing
+    if (ui->verificationLabel) {
+        ui->verificationLabel->setStyleSheet("QLabel { margin-top: 0px; margin-bottom: 4px; }");
+    }
+    
+    // Hide any existing title label if present
+    if (auto titleLabel = findChild<QLabel*>("verifyTitleLabel")) {
+        titleLabel->hide();
+    }
+
+    // Align content toward top and remove any layout spacers expanding height FIRST
+    if (auto v = findChild<QVBoxLayout*>("verticalLayout_step2")) {
+        v->setAlignment(Qt::AlignTop);
+        // Minimize top padding/margin to eliminate gap at top
+        QMargins m = v->contentsMargins();
+        v->setContentsMargins(m.left(), 2, m.right(), m.bottom());
+        for (int i = 0; i < v->count(); ++i) {
+            QLayoutItem* it = v->itemAt(i);
+            if (it && it->spacerItem()) it->spacerItem()->changeSize(0, 0, QSizePolicy::Fixed, QSizePolicy::Fixed);
+        }
+        // Force immediate layout update
+        v->invalidate();
+        v->update();
+    }
+    // Also ensure the main dialog layout has minimal top padding
+    if (auto mainLayout = findChild<QVBoxLayout*>("verticalLayout")) {
+        QMargins m = mainLayout->contentsMargins();
+        mainLayout->setContentsMargins(m.left(), 4, m.right(), m.bottom());
+        mainLayout->invalidate();
+        mainLayout->update();
+    }
+    // Force widget to recalculate layout immediately
+    updateGeometry();
+
+    // Reduce minimums for verify; open exactly at the minimum size AFTER layout is fixed
+    setMinimumSize(QSize(460, 280));
+    resize(minimumSize());
+    adjustSize();
+}
+
+void MnemonicVerificationDialog::generateRandomPositions()
+{
+    m_selected_positions.clear();
+    const int n = std::max(1, getWordCount());
+    QSet<int> used;
+    QRandomGenerator* rng = QRandomGenerator::global();
+    while (m_selected_positions.size() < 3) {
+        int pos = rng->bounded(1, n + 1);
+        if (!used.contains(pos)) { used.insert(pos); m_selected_positions.append(pos); }
+    }
+    std::sort(m_selected_positions.begin(), m_selected_positions.end());
+}
+
+void MnemonicVerificationDialog::onShowMnemonicClicked()
+{
+    buildMnemonicGrid(true);
+    ui->showMnemonicButton->hide();
+    ui->hideMnemonicButton->show();
+    ui->writtenDownCheckbox->setEnabled(true);
+    m_mnemonic_revealed = true;
+    m_has_ever_revealed = true;
+}
+
+void MnemonicVerificationDialog::onHideMnemonicClicked()
+{
+    buildMnemonicGrid(false);
+    ui->hideMnemonicButton->hide();
+    ui->showMnemonicButton->show();
+    m_mnemonic_revealed = false;
+    // Clear words from non-secure memory immediately when hiding
+    clearWordsSecurely();
+}
+
+void MnemonicVerificationDialog::onShowMnemonicAgainClicked()
+{
+    // Clear words when going back to step 1 (unless mnemonic is revealed)
+    if (!m_mnemonic_revealed) {
+        clearWordsSecurely();
+    }
+    setupStep1();
+}
+
+void MnemonicVerificationDialog::onWord1Changed() { updateWordValidation(); }
+void MnemonicVerificationDialog::onWord2Changed() { updateWordValidation(); }
+void MnemonicVerificationDialog::onWord3Changed() { updateWordValidation(); }
+
+bool MnemonicVerificationDialog::validateWord(const QString& word, int position)
+{
+    // Parse words on-demand for validation (minimizes exposure time)
+    // Words are kept in memory during step 2 (verification) and step 1 (when revealed)
+    // They are only cleared when explicitly hiding in step 1 or on dialog destruction
+    QStringList words = parseWords();
+    if (position < 1 || position > words.size()) {
+        return false;
+    }
+    return word == words[position - 1].toLower();
+}
+
+void MnemonicVerificationDialog::updateWordValidation()
+{
+    const QString t1 = ui->word1Edit->text().trimmed().toLower();
+    const QString t2 = ui->word2Edit->text().trimmed().toLower();
+    const QString t3 = ui->word3Edit->text().trimmed().toLower();
+
+    const bool ok1 = !t1.isEmpty() && validateWord(t1, m_selected_positions[0]);
+    const bool ok2 = !t2.isEmpty() && validateWord(t2, m_selected_positions[1]);
+    const bool ok3 = !t3.isEmpty() && validateWord(t3, m_selected_positions[2]);
+
+    auto setStatus = [](QLabel* lbl, bool filled, bool valid) {
+        if (!lbl) return;
+        if (!filled) { lbl->clear(); lbl->setStyleSheet(""); return; }
+        if (valid) {
+            lbl->setText("✓");
+            lbl->setStyleSheet(QString("QLabel { %1 font-weight: 700; }").arg(GUIUtil::getThemedStyleQString(GUIUtil::ThemedStyle::TS_SUCCESS)));
+        } else {
+            lbl->setText("✗");
+            lbl->setStyleSheet(QString("QLabel { %1 font-weight: 700; }").arg(GUIUtil::getThemedStyleQString(GUIUtil::ThemedStyle::TS_ERROR)));
+        }
+    };
+    setStatus(ui->word1Status, !t1.isEmpty(), ok1);
+    setStatus(ui->word2Status, !t2.isEmpty(), ok2);
+    setStatus(ui->word3Status, !t3.isEmpty(), ok3);
+    if (ui->buttonBox && ui->stackedWidget->currentIndex() == 1) {
+        ui->buttonBox->button(QDialogButtonBox::Ok)->setEnabled(ok1 && ok2 && ok3);
+    }
+}
+
+void MnemonicVerificationDialog::accept()
+{
+    if (!validateWord(ui->word1Edit->text().trimmed().toLower(), m_selected_positions[0]) ||
+        !validateWord(ui->word2Edit->text().trimmed().toLower(), m_selected_positions[1]) ||
+        !validateWord(ui->word3Edit->text().trimmed().toLower(), m_selected_positions[2])) {
+        QMessageBox::warning(this, tr("Verification Failed"), tr("One or more words are incorrect. Please try again."));
+        return;
+    }
+    QDialog::accept();
+}
+
+void MnemonicVerificationDialog::clearMnemonic()
+{
+    clearWordsSecurely();
+    m_mnemonic.assign(m_mnemonic.size(), 0);
+}
+
+QStringList MnemonicVerificationDialog::parseWords()
+{
+    // If words are already parsed, reuse them (for step 2 validation or step 1 display)
+    if (!m_words.isEmpty()) {
+        return m_words;
+    }
+    
+    // Parse words from secure mnemonic string
+    QString mnemonicStr = QString::fromStdString(std::string(m_mnemonic.begin(), m_mnemonic.end()));
+    m_words = mnemonicStr.split(QRegularExpression("\\s+"), Qt::SkipEmptyParts);
+    
+    // Clear the temporary QString immediately after parsing
+    mnemonicStr.clear();
+    mnemonicStr.squeeze(); // Release memory
+    
+    return m_words;
+}
+
+void MnemonicVerificationDialog::clearWordsSecurely()
+{
+    // Securely clear each word string by overwriting before clearing
+    for (QString& word : m_words) {
+        // Overwrite with zeros before clearing
+        word.fill(QChar(0));
+        word.clear();
+        word.squeeze(); // Release memory
+    }
+    m_words.clear();
+}
+
+int MnemonicVerificationDialog::getWordCount() const
+{
+    // Count words without parsing them into QStringList
+    // This avoids storing words in non-secure memory unnecessarily
+    if (m_words.isEmpty()) {
+        QString mnemonicStr = QString::fromStdString(std::string(m_mnemonic.begin(), m_mnemonic.end()));
+        QStringList words = mnemonicStr.split(QRegularExpression("\\s+"), Qt::SkipEmptyParts);
+        int count = words.size();
+        // Clear immediately
+        mnemonicStr.clear();
+        mnemonicStr.squeeze();
+        return count;
+    }
+    return m_words.size();
+}
+
+void MnemonicVerificationDialog::buildMnemonicGrid(bool reveal)
+{
+    if (!m_gridLayout) return;
+
+    QLayoutItem* child;
+    while ((child = m_gridLayout->takeAt(0)) != nullptr) {
+        if (child->widget()) child->widget()->deleteLater();
+        delete child;
+    }
+
+    // Parse words only when revealing (when needed for display)
+    QStringList words;
+    if (reveal) {
+        words = parseWords();
+    } else {
+        // For hidden view, just get count without parsing words
+        const int n = getWordCount();
+        const int columns = (n >= 24) ? 4 : 3;
+        const int rows = (n + columns - 1) / columns;
+
+        QFont mono; mono.setStyleHint(QFont::Monospace); mono.setFamily("Monospace"); mono.setPointSize(13);
+        m_gridLayout->setContentsMargins(6, 2, 6, 8);
+        m_gridLayout->setHorizontalSpacing(32);
+        m_gridLayout->setVerticalSpacing(7);
+
+        for (int r = 0; r < rows; ++r) {
+            for (int c = 0; c < columns; ++c) {
+                int idx = r * columns + c; if (idx >= n) break;
+                const QString text = QString("%1. •••••••").arg(idx + 1, 2);
+                QLabel* lbl = new QLabel(text);
+                lbl->setFont(mono);
+                lbl->setTextInteractionFlags(Qt::TextSelectableByMouse);
+                m_gridLayout->addWidget(lbl, r, c);
+            }
+        }
+
+        m_gridLayout->setRowMinimumHeight(rows, 12);
+        return;
+    }
+
+    // Revealed view - words are already parsed
+    const int n = words.size();
+    const int columns = (n >= 24) ? 4 : 3;
+    const int rows = (n + columns - 1) / columns;
+
+    QFont mono; mono.setStyleHint(QFont::Monospace); mono.setFamily("Monospace"); mono.setPointSize(13);
+    m_gridLayout->setContentsMargins(6, 2, 6, 8);
+    m_gridLayout->setHorizontalSpacing(32);
+    m_gridLayout->setVerticalSpacing(7);
+
+    for (int r = 0; r < rows; ++r) {
+        for (int c = 0; c < columns; ++c) {
+            int idx = r * columns + c; if (idx >= n) break;
+            const QString text = QString("%1. %2").arg(idx + 1, 2).arg(words[idx]);
+            QLabel* lbl = new QLabel(text);
+            lbl->setFont(mono);
+            lbl->setTextInteractionFlags(Qt::TextSelectableByMouse);
+            m_gridLayout->addWidget(lbl, r, c);
+        }
+    }
+
+    m_gridLayout->setRowMinimumHeight(rows, 12);
+}
+
+
diff --git a/src/qt/mnemonicverificationdialog.h b/src/qt/mnemonicverificationdialog.h
new file mode 100644
index 000000000000..c58b7529a2de
--- /dev/null
+++ b/src/qt/mnemonicverificationdialog.h
@@ -0,0 +1,59 @@
+// Copyright (c) 2024 The Dash Core developers
+// Distributed under the MIT software license, see the accompanying
+// file COPYING or http://www.opensource.org/licenses/mit-license.php.
+
+#ifndef BITCOIN_QT_MNEMONICVERIFICATIONDIALOG_H
+#define BITCOIN_QT_MNEMONICVERIFICATIONDIALOG_H
+
+#include <QDialog>
+#include <QStackedWidget>
+
+#include <support/allocators/secure.h>
+
+namespace Ui {
+    class MnemonicVerificationDialog;
+}
+
+/** Dialog to verify mnemonic seed phrase by asking user to enter 3 random word positions */
+class MnemonicVerificationDialog : public QDialog
+{
+    Q_OBJECT
+
+public:
+    explicit MnemonicVerificationDialog(const SecureString& mnemonic, QWidget *parent = nullptr);
+    ~MnemonicVerificationDialog();
+
+    void accept() override;
+
+private Q_SLOTS:
+    void onShowMnemonicClicked();
+    void onHideMnemonicClicked();
+    void onWord1Changed();
+    void onWord2Changed();
+    void onWord3Changed();
+    void onShowMnemonicAgainClicked();
+
+private:
+    void setupStep1();
+    void setupStep2();
+    void generateRandomPositions();
+    void updateWordValidation();
+    bool validateWord(const QString& word, int position);
+    void clearMnemonic();
+    void buildMnemonicGrid(bool reveal);
+    QStringList parseWords();
+    void clearWordsSecurely();
+    int getWordCount() const;
+
+    Ui::MnemonicVerificationDialog *ui;
+    SecureString m_mnemonic;
+    QStringList m_words;
+    QList<int> m_selected_positions;
+    bool m_mnemonic_revealed;
+    bool m_has_ever_revealed{false};
+    class QGridLayout* m_gridLayout{nullptr};
+    QSize m_defaultSize;
+};
+
+#endif // BITCOIN_QT_MNEMONICVERIFICATIONDIALOG_H
+
diff --git a/src/qt/res/css/dark.css b/src/qt/res/css/dark.css
index 0a534419fcff..9fe5b09762ed 100644
--- a/src/qt/res/css/dark.css
+++ b/src/qt/res/css/dark.css
@@ -1088,4 +1088,88 @@ QScrollBar:right-arrow:disabled {
     image: url(':/images/arrow_light_right_hover');
 }
 
+/**
+ * CreateWalletDialog (Dark Theme)
+ */
+
+QDialog#CreateWalletDialog QLabel,
+QDialog#CreateWalletDialog QCheckBox {
+    color: #bbbbbb; /* slightly lighter labels */
+}
+
+QDialog#CreateWalletDialog QToolButton#advanced_toggle_button {
+    color: #bdbdbd !important; /* lighter chevron/text */
+}
+
+QDialog#CreateWalletDialog QToolButton#advanced_toggle_button:hover {
+    color: #e0e0e0 !important; /* lighter on hover for better feedback */
+}
+
+QDialog#CreateWalletDialog QGroupBox#groupBox {
+    background-color: #2a2a2a; /* card background */
+    border: 1px solid #3c3c3c; /* subtle outline */
+    border-radius: 8px;
+    padding: 2px 12px 12px 12px; /* minimal top padding */
+    margin-top: 0px; /* remove extra gap above card */
+}
+
+QDialog#CreateWalletDialog QGroupBox#groupBox::title {
+    padding: 0px; /* ensure no extra space for (empty) title */
+}
+
+QDialog#CreateWalletDialog QLineEdit:focus {
+    border-color: #4da3ff; /* subtle macOS-like blue */
+}
+
+/**
+ * MnemonicVerificationDialog (Dark Theme)
+ */
+
+QDialog#MnemonicVerificationDialog QLabel {
+    color: #c7c7c7; /* light text for dark theme */
+}
+
+QDialog#MnemonicVerificationDialog QCheckBox {
+    color: #c7c7c7; /* light text for checkbox */
+}
+
+QDialog#MnemonicVerificationDialog QCheckBox#writtenDownCheckbox {
+    color: #c7c7c7; /* ensure checkbox text is visible */
+}
+
+QDialog#MnemonicVerificationDialog QScrollArea#mnemonicScroll {
+    background-color: #2d2d2e !important; /* dark background for scroll area */
+    border: 1px solid #3c3c3c !important; /* subtle border */
+    border-radius: 8px;
+}
+
+QDialog#MnemonicVerificationDialog QScrollArea#mnemonicScroll QWidget#mnemonicGridWidget {
+    background-color: #2d2d2e !important; /* dark background matching scroll area */
+}
+
+QDialog#MnemonicVerificationDialog QWidget#mnemonicGridWidget {
+    background-color: #2d2d2e !important; /* dark background matching scroll area */
+}
+
+QDialog#MnemonicVerificationDialog QScrollArea#mnemonicScroll QWidget#mnemonicGridWidget QLabel {
+    color: #c7c7c7 !important; /* ensure grid labels are visible */
+    background-color: transparent !important;
+}
+
+QDialog#MnemonicVerificationDialog QLineEdit {
+    background-color: #2d2d2e; /* dark background for input fields */
+    border-color: #00599a;
+    color: #c7c7c7;
+}
+
+QDialog#MnemonicVerificationDialog QLineEdit:focus {
+    border-color: #4da3ff; /* subtle macOS-like blue */
+}
+
+QDialog#MnemonicVerificationDialog QLabel#word1Status,
+QDialog#MnemonicVerificationDialog QLabel#word2Status,
+QDialog#MnemonicVerificationDialog QLabel#word3Status {
+    color: #c7c7c7; /* ensure status labels are visible */
+}
+
 </os>
diff --git a/src/qt/res/css/light.css b/src/qt/res/css/light.css
index 7d15950351bc..4657ff8e9902 100644
--- a/src/qt/res/css/light.css
+++ b/src/qt/res/css/light.css
@@ -1072,4 +1072,88 @@ QScrollBar:right-arrow:disabled {
     image: url(':/images/arrow_light_right_normal');
 }
 
+/**
+ * CreateWalletDialog (Light Theme)
+ */
+
+QDialog#CreateWalletDialog QLabel,
+QDialog#CreateWalletDialog QCheckBox {
+    color: #555; /* ensure contrast consistent with labels */
+}
+
+QDialog#CreateWalletDialog QToolButton#advanced_toggle_button {
+    color: #555 !important; /* ensure good contrast in light mode */
+}
+
+QDialog#CreateWalletDialog QToolButton#advanced_toggle_button:hover {
+    color: #333 !important; /* darker on hover for better feedback */
+}
+
+QDialog#CreateWalletDialog QGroupBox#groupBox {
+    background-color: #eaeaec; /* card background */
+    border: 1px solid #dcdcdc; /* subtle outline */
+    border-radius: 8px;
+    padding: 2px 12px 12px 12px; /* minimal top padding */
+    margin-top: 0px; /* remove extra gap above card */
+}
+
+QDialog#CreateWalletDialog QGroupBox#groupBox::title {
+    padding: 0px; /* ensure no extra space for (empty) title */
+}
+
+QDialog#CreateWalletDialog QLineEdit:focus {
+    border-color: #4da3ff; /* macOS-like blue */
+}
+
+/**
+ * MnemonicVerificationDialog (Light Theme)
+ */
+
+QDialog#MnemonicVerificationDialog QLabel {
+    color: #555; /* ensure good contrast for all labels */
+}
+
+QDialog#MnemonicVerificationDialog QCheckBox {
+    color: #555; /* ensure checkbox text is visible */
+}
+
+QDialog#MnemonicVerificationDialog QCheckBox#writtenDownCheckbox {
+    color: #555; /* ensure checkbox text has good contrast */
+}
+
+QDialog#MnemonicVerificationDialog QScrollArea#mnemonicScroll {
+    background-color: #eaeaec !important; /* light background for scroll area */
+    border: 1px solid #dcdcdc !important; /* subtle border */
+    border-radius: 8px;
+}
+
+QDialog#MnemonicVerificationDialog QScrollArea#mnemonicScroll QWidget#mnemonicGridWidget {
+    background-color: #eaeaec !important; /* light background matching scroll area */
+}
+
+QDialog#MnemonicVerificationDialog QWidget#mnemonicGridWidget {
+    background-color: #eaeaec !important; /* light background matching scroll area */
+}
+
+QDialog#MnemonicVerificationDialog QScrollArea#mnemonicScroll QWidget#mnemonicGridWidget QLabel {
+    color: #555 !important; /* ensure grid labels are visible */
+    background-color: transparent !important;
+}
+
+QDialog#MnemonicVerificationDialog QLineEdit {
+    background-color: #ffffff; /* white background for input fields */
+    border-color: #008de4;
+    color: #555;
+}
+
+QDialog#MnemonicVerificationDialog QLineEdit:focus {
+    border-color: #4da3ff; /* macOS-like blue */
+}
+
+QDialog#MnemonicVerificationDialog QLabel#word1Status,
+QDialog#MnemonicVerificationDialog QLabel#word2Status,
+QDialog#MnemonicVerificationDialog QLabel#word3Status {
+    color: #555; /* ensure status labels are visible */
+}
+
 </os>
diff --git a/src/qt/walletcontroller.cpp b/src/qt/walletcontroller.cpp
index eacb3ffc4832..5c71970cf20c 100644
--- a/src/qt/walletcontroller.cpp
+++ b/src/qt/walletcontroller.cpp
@@ -7,6 +7,7 @@
 #include <qt/askpassphrasedialog.h>
 #include <qt/clientmodel.h>
 #include <qt/createwalletdialog.h>
+#include <qt/mnemonicverificationdialog.h>
 #include <qt/guiconstants.h>
 #include <qt/guiutil.h>
 #include <qt/walletmodel.h>
@@ -279,11 +280,113 @@ void CreateWalletActivity::finish()
         QMessageBox::warning(m_parent_widget, tr("Create wallet warning"), QString::fromStdString(Join(m_warning_message, Untranslated("\n")).translated));
     }
 
-    if (m_wallet_model) Q_EMIT created(m_wallet_model);
+    if (m_wallet_model) {
+        // Check if wallet is HD-enabled (has mnemonic) and requires verification
+        // Skip verification for blank wallets or wallets with disabled private keys
+        if (!m_wallet_model->wallet().hdEnabled() || 
+            m_wallet_model->wallet().privateKeysDisabled() ||
+            !m_wallet_model->wallet().canGetAddresses()) {
+            // Not an HD wallet - skip verification
+            Q_EMIT created(m_wallet_model);
+            Q_EMIT finished();
+            return;
+        }
+        
+        // Unlock wallet if encrypted (needed to retrieve mnemonic)
+        bool was_locked = false;
+        bool was_unlocked_for_mixing = false;
+        WalletModel::EncryptionStatus enc_status = m_wallet_model->getEncryptionStatus();
+        if (enc_status == WalletModel::Locked || enc_status == WalletModel::UnlockedForMixingOnly) {
+            was_locked = (enc_status == WalletModel::Locked);
+            was_unlocked_for_mixing = (enc_status == WalletModel::UnlockedForMixingOnly);
+            // Unlock fully (not just for mixing) to retrieve mnemonic
+            if (!m_wallet_model->setWalletLocked(false, m_passphrase, false)) {
+                QMessageBox::warning(m_parent_widget, tr("Unlock failed"), 
+                    tr("Failed to unlock wallet for mnemonic verification. Wallet creation completed but verification skipped."));
+                Q_EMIT created(m_wallet_model);
+                Q_EMIT finished();
+                return;
+            }
+        }
+        
+        // Check if wallet has a mnemonic and requires verification
+        SecureString mnemonic;
+        SecureString mnemonic_passphrase;
+        bool has_mnemonic = m_wallet_model->wallet().getMnemonic(mnemonic, mnemonic_passphrase);
+        
+        if (!has_mnemonic || mnemonic.empty()) {
+            // No mnemonic found - log warning and skip verification
+            restoreWalletLockState(was_locked, was_unlocked_for_mixing);
+            // Clear sensitive data before showing message
+            mnemonic.assign(mnemonic.size(), 0);
+            mnemonic_passphrase.assign(mnemonic_passphrase.size(), 0);
+            QMessageBox::warning(m_parent_widget, tr("Mnemonic retrieval failed"),
+                tr("Could not retrieve mnemonic phrase from wallet. Wallet creation completed but verification skipped."));
+            Q_EMIT created(m_wallet_model);
+            Q_EMIT finished();
+            return;
+        }
+        
+        // Wallet has mnemonic - show verification dialog
+        MnemonicVerificationDialog verify_dialog(mnemonic, m_parent_widget);
+        verify_dialog.setWindowModality(Qt::ApplicationModal);
+        
+        // Clear mnemonic from local variables after dialog has copied it
+        // The dialog will manage its own copy securely
+        const size_t mnemonic_size = mnemonic.size();
+        const size_t passphrase_size = mnemonic_passphrase.size();
+        mnemonic.assign(mnemonic_size, 0);
+        mnemonic_passphrase.assign(passphrase_size, 0);
+        
+        if (verify_dialog.exec() == QDialog::Accepted) {
+            // Verification successful
+            restoreWalletLockState(was_locked, was_unlocked_for_mixing);
+            Q_EMIT created(m_wallet_model);
+        } else {
+            // User cancelled verification
+            restoreWalletLockState(was_locked, was_unlocked_for_mixing);
+            QMessageBox::warning(m_parent_widget, tr("Verification cancelled"),
+                tr("You cancelled mnemonic verification. Please make sure you have saved your mnemonic phrase safely."));
+            Q_EMIT created(m_wallet_model);
+        }
+    } else {
+        // Wallet creation failed - no wallet model
+        // Already showed error message above
+    }
 
     Q_EMIT finished();
 }
 
+void CreateWalletActivity::restoreWalletLockState(bool was_locked, bool was_unlocked_for_mixing)
+{
+    if (!was_locked && !was_unlocked_for_mixing) {
+        return; // Wallet was not locked, nothing to restore
+    }
+    
+    if (!m_wallet_model) {
+        return; // Safety check: wallet model not available
+    }
+    
+    if (was_unlocked_for_mixing) {
+        // Restore previous mixing-only unlock state
+        if (!m_wallet_model->setWalletLocked(true)) {
+            QMessageBox::warning(m_parent_widget, tr("Warning"),
+                tr("Failed to lock wallet. Please lock it manually."));
+            return;
+        }
+        if (!m_wallet_model->setWalletLocked(false, m_passphrase, true)) {
+            QMessageBox::warning(m_parent_widget, tr("Warning"),
+                tr("Failed to restore mixing unlock state."));
+        }
+    } else {
+        // Restore fully locked state
+        if (!m_wallet_model->setWalletLocked(true)) {
+            QMessageBox::warning(m_parent_widget, tr("Warning"),
+                tr("Failed to lock wallet. Please lock it manually."));
+        }
+    }
+}
+
 void CreateWalletActivity::create()
 {
     m_create_wallet_dialog = new CreateWalletDialog(m_parent_widget);
diff --git a/src/qt/walletcontroller.h b/src/qt/walletcontroller.h
index ccb7dbc62d51..6d269eda0afb 100644
--- a/src/qt/walletcontroller.h
+++ b/src/qt/walletcontroller.h
@@ -123,6 +123,7 @@ class CreateWalletActivity : public WalletControllerActivity
     void askPassphrase();
     void createWallet();
     void finish();
+    void restoreWalletLockState(bool was_locked, bool was_unlocked_for_mixing);
 
     SecureString m_passphrase;
     CreateWalletDialog* m_create_wallet_dialog{nullptr};
diff --git a/src/wallet/interfaces.cpp b/src/wallet/interfaces.cpp
index 4c134c76220e..a64fc66dd3f8 100644
--- a/src/wallet/interfaces.cpp
+++ b/src/wallet/interfaces.cpp
@@ -30,6 +30,8 @@
 #include <wallet/rpc/wallet.h>
 #include <wallet/spend.h>
 #include <wallet/wallet.h>
+#include <wallet/hdchain.h>
+#include <wallet/scriptpubkeyman.h>
 #include <governance/validators.h>
 #include <evo/deterministicmns.h>
 #include <masternode/sync.h>
@@ -523,6 +525,57 @@ class WalletImpl : public Wallet
         RemoveWallet(m_context, m_wallet, false /* load_on_start */);
     }
     bool isLegacy() override { return m_wallet->IsLegacy(); }
+    bool getMnemonic(SecureString& mnemonic_out, SecureString& mnemonic_passphrase_out) override
+    {
+        LOCK(m_wallet->cs_wallet);
+        
+        mnemonic_out.clear();
+        mnemonic_passphrase_out.clear();
+        
+        if (m_wallet->IsWalletFlagSet(WALLET_FLAG_DISABLE_PRIVATE_KEYS)) {
+            return false;
+        }
+        
+        if (m_wallet->IsWalletFlagSet(WALLET_FLAG_DESCRIPTORS)) {
+            // Descriptor wallet
+            for (auto spk_man : m_wallet->GetActiveScriptPubKeyMans()) {
+                if (auto desc_spk_man = dynamic_cast<DescriptorScriptPubKeyMan*>(spk_man)) {
+                    if (desc_spk_man->GetMnemonicString(mnemonic_out, mnemonic_passphrase_out)) {
+                        return true;
+                    }
+                }
+            }
+            return false;
+        } else {
+            // Legacy wallet
+            auto spk_man = m_wallet->GetLegacyScriptPubKeyMan();
+            if (!spk_man) {
+                return false;
+            }
+            
+            CHDChain hdChainCurrent;
+            if (!spk_man->GetHDChain(hdChainCurrent)) {
+                return false;
+            }
+            
+            // Get decrypted HD chain if wallet is encrypted
+            if (m_wallet->IsCrypted()) {
+                if (!spk_man->GetDecryptedHDChain(hdChainCurrent)) {
+                    return false;
+                }
+            }
+            
+            SecureString ssMnemonic;
+            SecureString ssMnemonicPassphrase;
+            if (!hdChainCurrent.GetMnemonic(ssMnemonic, ssMnemonicPassphrase)) {
+                return false;
+            }
+            
+            mnemonic_out = ssMnemonic;
+            mnemonic_passphrase_out = ssMnemonicPassphrase;
+            return true;
+        }
+    }
     std::unique_ptr<Handler> handleUnload(UnloadFn fn) override
     {
         return MakeHandler(m_wallet->NotifyUnload.connect(fn));

From e08e29f32b8a6ba2e57065b05db23e8661524096 Mon Sep 17 00:00:00 2001
From: pasta <pasta@dashboost.org>
Date: Wed, 5 Nov 2025 22:08:49 -0600
Subject: [PATCH 414/656] qt: Fix potential infinite loop and missing include
 in mnemonic verification

- Guard against short mnemonics (< 3 words) to prevent infinite loop
- Add validation in setupStep2() to check word count before proceeding
- Add safety check after generateRandomPositions() to ensure positions were generated
- Add missing #include <algorithm> for std::sort usage
---
 src/qt/mnemonicverificationdialog.cpp | 26 +++++++++++++++++++++++++-
 1 file changed, 25 insertions(+), 1 deletion(-)

diff --git a/src/qt/mnemonicverificationdialog.cpp b/src/qt/mnemonicverificationdialog.cpp
index 86a58e0e358c..10d2068284fa 100644
--- a/src/qt/mnemonicverificationdialog.cpp
+++ b/src/qt/mnemonicverificationdialog.cpp
@@ -21,6 +21,8 @@
 #include <QSet>
 #include <QMessageBox>
 
+#include <algorithm>
+
 MnemonicVerificationDialog::MnemonicVerificationDialog(const SecureString& mnemonic, QWidget *parent) :
     QDialog(parent, GUIUtil::dialog_flags),
     ui(new Ui::MnemonicVerificationDialog),
@@ -141,7 +143,25 @@ void MnemonicVerificationDialog::setupStep2()
     ui->stackedWidget->setCurrentIndex(1);
     // Parse words for validation (needed in step 2)
     parseWords();
+    
+    // Validate mnemonic has at least 3 words before proceeding
+    const int wordCount = getWordCount();
+    if (wordCount < 3) {
+        QMessageBox::critical(this, tr("Invalid Mnemonic"),
+            tr("Mnemonic phrase has fewer than 3 words (found %1). Verification cannot proceed.").arg(wordCount));
+        reject();
+        return;
+    }
+    
     generateRandomPositions();
+    
+    // Safety check: ensure positions were generated successfully
+    if (m_selected_positions.size() < 3) {
+        QMessageBox::critical(this, tr("Verification Error"),
+            tr("Failed to generate verification positions. Please try again."));
+        reject();
+        return;
+    }
 
     ui->word1Edit->clear();
     ui->word2Edit->clear();
@@ -214,7 +234,11 @@ void MnemonicVerificationDialog::setupStep2()
 void MnemonicVerificationDialog::generateRandomPositions()
 {
     m_selected_positions.clear();
-    const int n = std::max(1, getWordCount());
+    const int n = getWordCount();
+    if (n < 3) {
+        // Unable to verify; bail out so the dialog can surface an error message upstream.
+        return;
+    }
     QSet<int> used;
     QRandomGenerator* rng = QRandomGenerator::global();
     while (m_selected_positions.size() < 3) {

From 9894f47c3478ab4b156214e4baca8aab11efb21d Mon Sep 17 00:00:00 2001
From: pasta <pasta@dashboost.org>
Date: Wed, 5 Nov 2025 22:21:47 -0600
Subject: [PATCH 415/656] Fix trailing whitespace in wallet creation files

---
 src/qt/mnemonicverificationdialog.cpp | 14 +++++++-------
 src/qt/walletcontroller.cpp           | 20 ++++++++++----------
 src/wallet/interfaces.cpp             | 14 +++++++-------
 3 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/src/qt/mnemonicverificationdialog.cpp b/src/qt/mnemonicverificationdialog.cpp
index 10d2068284fa..418f72c3844f 100644
--- a/src/qt/mnemonicverificationdialog.cpp
+++ b/src/qt/mnemonicverificationdialog.cpp
@@ -143,7 +143,7 @@ void MnemonicVerificationDialog::setupStep2()
     ui->stackedWidget->setCurrentIndex(1);
     // Parse words for validation (needed in step 2)
     parseWords();
-    
+
     // Validate mnemonic has at least 3 words before proceeding
     const int wordCount = getWordCount();
     if (wordCount < 3) {
@@ -152,9 +152,9 @@ void MnemonicVerificationDialog::setupStep2()
         reject();
         return;
     }
-    
+
     generateRandomPositions();
-    
+
     // Safety check: ensure positions were generated successfully
     if (m_selected_positions.size() < 3) {
         QMessageBox::critical(this, tr("Verification Error"),
@@ -195,7 +195,7 @@ void MnemonicVerificationDialog::setupStep2()
     if (ui->verificationLabel) {
         ui->verificationLabel->setStyleSheet("QLabel { margin-top: 0px; margin-bottom: 4px; }");
     }
-    
+
     // Hide any existing title label if present
     if (auto titleLabel = findChild<QLabel*>("verifyTitleLabel")) {
         titleLabel->hide();
@@ -345,15 +345,15 @@ QStringList MnemonicVerificationDialog::parseWords()
     if (!m_words.isEmpty()) {
         return m_words;
     }
-    
+
     // Parse words from secure mnemonic string
     QString mnemonicStr = QString::fromStdString(std::string(m_mnemonic.begin(), m_mnemonic.end()));
     m_words = mnemonicStr.split(QRegularExpression("\\s+"), Qt::SkipEmptyParts);
-    
+
     // Clear the temporary QString immediately after parsing
     mnemonicStr.clear();
     mnemonicStr.squeeze(); // Release memory
-    
+
     return m_words;
 }
 
diff --git a/src/qt/walletcontroller.cpp b/src/qt/walletcontroller.cpp
index 5c71970cf20c..0a1e194d13a9 100644
--- a/src/qt/walletcontroller.cpp
+++ b/src/qt/walletcontroller.cpp
@@ -283,7 +283,7 @@ void CreateWalletActivity::finish()
     if (m_wallet_model) {
         // Check if wallet is HD-enabled (has mnemonic) and requires verification
         // Skip verification for blank wallets or wallets with disabled private keys
-        if (!m_wallet_model->wallet().hdEnabled() || 
+        if (!m_wallet_model->wallet().hdEnabled() ||
             m_wallet_model->wallet().privateKeysDisabled() ||
             !m_wallet_model->wallet().canGetAddresses()) {
             // Not an HD wallet - skip verification
@@ -291,7 +291,7 @@ void CreateWalletActivity::finish()
             Q_EMIT finished();
             return;
         }
-        
+
         // Unlock wallet if encrypted (needed to retrieve mnemonic)
         bool was_locked = false;
         bool was_unlocked_for_mixing = false;
@@ -301,19 +301,19 @@ void CreateWalletActivity::finish()
             was_unlocked_for_mixing = (enc_status == WalletModel::UnlockedForMixingOnly);
             // Unlock fully (not just for mixing) to retrieve mnemonic
             if (!m_wallet_model->setWalletLocked(false, m_passphrase, false)) {
-                QMessageBox::warning(m_parent_widget, tr("Unlock failed"), 
+                QMessageBox::warning(m_parent_widget, tr("Unlock failed"),
                     tr("Failed to unlock wallet for mnemonic verification. Wallet creation completed but verification skipped."));
                 Q_EMIT created(m_wallet_model);
                 Q_EMIT finished();
                 return;
             }
         }
-        
+
         // Check if wallet has a mnemonic and requires verification
         SecureString mnemonic;
         SecureString mnemonic_passphrase;
         bool has_mnemonic = m_wallet_model->wallet().getMnemonic(mnemonic, mnemonic_passphrase);
-        
+
         if (!has_mnemonic || mnemonic.empty()) {
             // No mnemonic found - log warning and skip verification
             restoreWalletLockState(was_locked, was_unlocked_for_mixing);
@@ -326,18 +326,18 @@ void CreateWalletActivity::finish()
             Q_EMIT finished();
             return;
         }
-        
+
         // Wallet has mnemonic - show verification dialog
         MnemonicVerificationDialog verify_dialog(mnemonic, m_parent_widget);
         verify_dialog.setWindowModality(Qt::ApplicationModal);
-        
+
         // Clear mnemonic from local variables after dialog has copied it
         // The dialog will manage its own copy securely
         const size_t mnemonic_size = mnemonic.size();
         const size_t passphrase_size = mnemonic_passphrase.size();
         mnemonic.assign(mnemonic_size, 0);
         mnemonic_passphrase.assign(passphrase_size, 0);
-        
+
         if (verify_dialog.exec() == QDialog::Accepted) {
             // Verification successful
             restoreWalletLockState(was_locked, was_unlocked_for_mixing);
@@ -362,11 +362,11 @@ void CreateWalletActivity::restoreWalletLockState(bool was_locked, bool was_unlo
     if (!was_locked && !was_unlocked_for_mixing) {
         return; // Wallet was not locked, nothing to restore
     }
-    
+
     if (!m_wallet_model) {
         return; // Safety check: wallet model not available
     }
-    
+
     if (was_unlocked_for_mixing) {
         // Restore previous mixing-only unlock state
         if (!m_wallet_model->setWalletLocked(true)) {
diff --git a/src/wallet/interfaces.cpp b/src/wallet/interfaces.cpp
index a64fc66dd3f8..2cd0177e0d88 100644
--- a/src/wallet/interfaces.cpp
+++ b/src/wallet/interfaces.cpp
@@ -528,14 +528,14 @@ class WalletImpl : public Wallet
     bool getMnemonic(SecureString& mnemonic_out, SecureString& mnemonic_passphrase_out) override
     {
         LOCK(m_wallet->cs_wallet);
-        
+
         mnemonic_out.clear();
         mnemonic_passphrase_out.clear();
-        
+
         if (m_wallet->IsWalletFlagSet(WALLET_FLAG_DISABLE_PRIVATE_KEYS)) {
             return false;
         }
-        
+
         if (m_wallet->IsWalletFlagSet(WALLET_FLAG_DESCRIPTORS)) {
             // Descriptor wallet
             for (auto spk_man : m_wallet->GetActiveScriptPubKeyMans()) {
@@ -552,25 +552,25 @@ class WalletImpl : public Wallet
             if (!spk_man) {
                 return false;
             }
-            
+
             CHDChain hdChainCurrent;
             if (!spk_man->GetHDChain(hdChainCurrent)) {
                 return false;
             }
-            
+
             // Get decrypted HD chain if wallet is encrypted
             if (m_wallet->IsCrypted()) {
                 if (!spk_man->GetDecryptedHDChain(hdChainCurrent)) {
                     return false;
                 }
             }
-            
+
             SecureString ssMnemonic;
             SecureString ssMnemonicPassphrase;
             if (!hdChainCurrent.GetMnemonic(ssMnemonic, ssMnemonicPassphrase)) {
                 return false;
             }
-            
+
             mnemonic_out = ssMnemonic;
             mnemonic_passphrase_out = ssMnemonicPassphrase;
             return true;

From fd3c1eb4b3d6fe06b2b453e10a64362cafec5330 Mon Sep 17 00:00:00 2001
From: pasta <pasta@dashboost.org>
Date: Thu, 6 Nov 2025 10:19:49 -0600
Subject: [PATCH 416/656] Simplify mnemonic retrieval

---
 src/wallet/interfaces.cpp | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/src/wallet/interfaces.cpp b/src/wallet/interfaces.cpp
index 2cd0177e0d88..a0f55c32fb2a 100644
--- a/src/wallet/interfaces.cpp
+++ b/src/wallet/interfaces.cpp
@@ -565,15 +565,7 @@ class WalletImpl : public Wallet
                 }
             }
 
-            SecureString ssMnemonic;
-            SecureString ssMnemonicPassphrase;
-            if (!hdChainCurrent.GetMnemonic(ssMnemonic, ssMnemonicPassphrase)) {
-                return false;
-            }
-
-            mnemonic_out = ssMnemonic;
-            mnemonic_passphrase_out = ssMnemonicPassphrase;
-            return true;
+            return hdChainCurrent.GetMnemonic(mnemonic_out, mnemonic_passphrase_out);
         }
     }
     std::unique_ptr<Handler> handleUnload(UnloadFn fn) override

From 6a13041f975316cee0171f2f34763a7652939b79 Mon Sep 17 00:00:00 2001
From: Konstantin Akimov <knstqq@gmail.com>
Date: Thu, 6 Nov 2025 23:51:00 +0700
Subject: [PATCH 417/656] test: generate block by batches when it's not
 important to go one-by-one

---
 test/functional/feature_governance.py | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/test/functional/feature_governance.py b/test/functional/feature_governance.py
index 4169b9a9edc2..c57738e7ed87 100755
--- a/test/functional/feature_governance.py
+++ b/test/functional/feature_governance.py
@@ -353,9 +353,8 @@ def sync_gov(node):
         assert n > 0
 
         self.log.info("Move remaining n blocks until the next maturity window")
-        for _ in range(n):
-            self.bump_mocktime(1)
-            self.generate(self.nodes[0], 1, sync_fun=self.sync_blocks())
+        self.bump_mocktime(n)
+        self.generate(self.nodes[0], n, sync_fun=self.sync_blocks())
 
         self.log.info("Move inside maturity window until the next Superblock")
         for _ in range(sb_maturity_window - 1):
@@ -373,9 +372,8 @@ def sync_gov(node):
         self.log.info("Mine and check a couple more superblocks")
         for i in range(2):
             sb_block_height = 180 + (i + 1) * sb_cycle
-            for _ in range(sb_immaturity_window):
-                self.bump_mocktime(1)
-                self.generate(self.nodes[0], 1, sync_fun=self.sync_blocks())
+            self.bump_mocktime(sb_immaturity_window)
+            self.generate(self.nodes[0], sb_immaturity_window, sync_fun=self.sync_blocks())
             for _ in range(sb_maturity_window - 1):
                 self.bump_mocktime(1)
                 self.generate(self.nodes[0], 1, sync_fun=self.sync_blocks())

From f79a750c52ae273587405ece7b594329c8ccc0e6 Mon Sep 17 00:00:00 2001
From: UdjinM6 <UdjinM6@users.noreply.github.com>
Date: Thu, 6 Nov 2025 13:18:34 +0300
Subject: [PATCH 418/656] refactor: Move wallet creation dialog styles from C++
 to CSS
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Move theme-independent styling from inline C++ code to general.css
following Dash Core CSS architecture (general.css for layout,
dark/light.css for colors).

Changes:
- Move font sizes, weights, and families to general.css
- Move widget size constraints to general.css
- Move label margins to general.css
- Remove inline HTML style attributes from translated strings
- Simplify C++ code to only handle dynamic theme colors via GUIUtil

Benefits:
- Better separation of concerns (styling vs logic)
- Easier theme customization without recompiling
- Consistent with Dash Core styling patterns
- Cleaner, more maintainable C++ code

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude <noreply@anthropic.com>
---
 src/qt/mnemonicverificationdialog.cpp | 46 +++++++++---------------
 src/qt/res/css/general.css            | 51 +++++++++++++++++++++++++++
 2 files changed, 67 insertions(+), 30 deletions(-)

diff --git a/src/qt/mnemonicverificationdialog.cpp b/src/qt/mnemonicverificationdialog.cpp
index 418f72c3844f..30bc6df15c38 100644
--- a/src/qt/mnemonicverificationdialog.cpp
+++ b/src/qt/mnemonicverificationdialog.cpp
@@ -115,17 +115,14 @@ void MnemonicVerificationDialog::setupStep1()
     // Compact to content
     adjustSize();
 
-    // Match visual hierarchy and tone of the improved mock
-    QString warningStyle = QString("font-size:17px; font-weight:700; ") + GUIUtil::getThemedStyleQString(GUIUtil::ThemedStyle::TS_ERROR);
-    QString instructionStyle = QString("font-size:14px; ") + GUIUtil::getThemedStyleQString(GUIUtil::ThemedStyle::TS_PRIMARY);
+    // Set warning and instruction text with themed colors
+    // Font sizes and weights are defined in general.css
     ui->warningLabel->setText(
-        tr("<span style='%1'>WARNING: If you lose your mnemonic seed phrase, you will lose access to your wallet forever. Write it down in a safe place and never share it with anyone.</span>")
-        .arg(warningStyle)
-    );
+        tr("WARNING: If you lose your mnemonic seed phrase, you will lose access to your wallet forever. Write it down in a safe place and never share it with anyone."));
+    ui->warningLabel->setStyleSheet(GUIUtil::getThemedStyleQString(GUIUtil::ThemedStyle::TS_ERROR));
+
     ui->instructionLabel->setText(
-        tr("<span style='%1'>Please write down these words in order. You will need them to restore your wallet.</span>")
-        .arg(instructionStyle)
-    );
+        tr("Please write down these words in order. You will need them to restore your wallet."));
 
     // Reduce extra padding to avoid an over-padded look
     if (auto outer = findChild<QVBoxLayout*>("verticalLayout_step1")) {
@@ -166,12 +163,7 @@ void MnemonicVerificationDialog::setupStep2()
     ui->word1Edit->clear();
     ui->word2Edit->clear();
     ui->word3Edit->clear();
-    ui->word1Edit->setMaximumWidth(320);
-    ui->word2Edit->setMaximumWidth(320);
-    ui->word3Edit->setMaximumWidth(320);
-    ui->word1Status->setMinimumWidth(18);
-    ui->word2Status->setMinimumWidth(18);
-    ui->word3Status->setMinimumWidth(18);
+    // Widget sizes are defined in general.css
 
     ui->word1Label->setText(tr("Word #%1:").arg(m_selected_positions[0]));
     ui->word2Label->setText(tr("Word #%1:").arg(m_selected_positions[1]));
@@ -191,10 +183,7 @@ void MnemonicVerificationDialog::setupStep2()
     if (QAbstractButton* cont = ui->buttonBox->button(QDialogButtonBox::Ok)) cont->setEnabled(false);
     if (ui->showMnemonicAgainButton) ui->showMnemonicAgainButton->hide();
 
-    // Ensure verification label has minimal top spacing
-    if (ui->verificationLabel) {
-        ui->verificationLabel->setStyleSheet("QLabel { margin-top: 0px; margin-bottom: 4px; }");
-    }
+    // Verification label styling is defined in general.css
 
     // Hide any existing title label if present
     if (auto titleLabel = findChild<QLabel*>("verifyTitleLabel")) {
@@ -303,16 +292,15 @@ void MnemonicVerificationDialog::updateWordValidation()
     const bool ok2 = !t2.isEmpty() && validateWord(t2, m_selected_positions[1]);
     const bool ok3 = !t3.isEmpty() && validateWord(t3, m_selected_positions[2]);
 
+    // Status labels show checkmarks/X marks with themed colors
+    // Font weight is defined in general.css
     auto setStatus = [](QLabel* lbl, bool filled, bool valid) {
         if (!lbl) return;
         if (!filled) { lbl->clear(); lbl->setStyleSheet(""); return; }
-        if (valid) {
-            lbl->setText("✓");
-            lbl->setStyleSheet(QString("QLabel { %1 font-weight: 700; }").arg(GUIUtil::getThemedStyleQString(GUIUtil::ThemedStyle::TS_SUCCESS)));
-        } else {
-            lbl->setText("✗");
-            lbl->setStyleSheet(QString("QLabel { %1 font-weight: 700; }").arg(GUIUtil::getThemedStyleQString(GUIUtil::ThemedStyle::TS_ERROR)));
-        }
+        lbl->setText(valid ? "✓" : "✗");
+        lbl->setStyleSheet(valid ?
+            GUIUtil::getThemedStyleQString(GUIUtil::ThemedStyle::TS_SUCCESS) :
+            GUIUtil::getThemedStyleQString(GUIUtil::ThemedStyle::TS_ERROR));
     };
     setStatus(ui->word1Status, !t1.isEmpty(), ok1);
     setStatus(ui->word2Status, !t2.isEmpty(), ok2);
@@ -405,7 +393,7 @@ void MnemonicVerificationDialog::buildMnemonicGrid(bool reveal)
         const int columns = (n >= 24) ? 4 : 3;
         const int rows = (n + columns - 1) / columns;
 
-        QFont mono; mono.setStyleHint(QFont::Monospace); mono.setFamily("Monospace"); mono.setPointSize(13);
+        // Font styling is defined in general.css
         m_gridLayout->setContentsMargins(6, 2, 6, 8);
         m_gridLayout->setHorizontalSpacing(32);
         m_gridLayout->setVerticalSpacing(7);
@@ -415,7 +403,6 @@ void MnemonicVerificationDialog::buildMnemonicGrid(bool reveal)
                 int idx = r * columns + c; if (idx >= n) break;
                 const QString text = QString("%1. •••••••").arg(idx + 1, 2);
                 QLabel* lbl = new QLabel(text);
-                lbl->setFont(mono);
                 lbl->setTextInteractionFlags(Qt::TextSelectableByMouse);
                 m_gridLayout->addWidget(lbl, r, c);
             }
@@ -430,7 +417,7 @@ void MnemonicVerificationDialog::buildMnemonicGrid(bool reveal)
     const int columns = (n >= 24) ? 4 : 3;
     const int rows = (n + columns - 1) / columns;
 
-    QFont mono; mono.setStyleHint(QFont::Monospace); mono.setFamily("Monospace"); mono.setPointSize(13);
+    // Font styling is defined in general.css
     m_gridLayout->setContentsMargins(6, 2, 6, 8);
     m_gridLayout->setHorizontalSpacing(32);
     m_gridLayout->setVerticalSpacing(7);
@@ -440,7 +427,6 @@ void MnemonicVerificationDialog::buildMnemonicGrid(bool reveal)
             int idx = r * columns + c; if (idx >= n) break;
             const QString text = QString("%1. %2").arg(idx + 1, 2).arg(words[idx]);
             QLabel* lbl = new QLabel(text);
-            lbl->setFont(mono);
             lbl->setTextInteractionFlags(Qt::TextSelectableByMouse);
             m_gridLayout->addWidget(lbl, r, c);
         }
diff --git a/src/qt/res/css/general.css b/src/qt/res/css/general.css
index c0444986d362..a04af4d4d805 100644
--- a/src/qt/res/css/general.css
+++ b/src/qt/res/css/general.css
@@ -1985,3 +1985,54 @@ QDialog#HelpMessageDialog QScrollBar:horizontal {
 }
 
 </os>
+
+/**
+ * CreateWalletDialog (Layout)
+ */
+
+QDialog#CreateWalletDialog QGroupBox#groupBox {
+    border-radius: 8px;
+    padding: 2px 12px 12px 12px;
+    margin-top: 0px;
+}
+
+QDialog#CreateWalletDialog QGroupBox#groupBox::title {
+    padding: 0px;
+}
+
+/**
+ * MnemonicVerificationDialog (Layout)
+ */
+
+QDialog#MnemonicVerificationDialog QLabel#warningLabel {
+    font-size: 17px;
+    font-weight: 700;
+}
+
+QDialog#MnemonicVerificationDialog QLabel#instructionLabel {
+    font-size: 14px;
+}
+
+QDialog#MnemonicVerificationDialog QLabel#verificationLabel {
+    margin-top: 0px;
+    margin-bottom: 4px;
+}
+
+QDialog#MnemonicVerificationDialog QLabel#word1Status,
+QDialog#MnemonicVerificationDialog QLabel#word2Status,
+QDialog#MnemonicVerificationDialog QLabel#word3Status {
+    font-weight: 700;
+    min-width: 18px;
+}
+
+QDialog#MnemonicVerificationDialog QScrollArea#mnemonicScroll QWidget#mnemonicGridWidget QLabel {
+    font-family: monospace;
+    font-size: 13pt;
+}
+
+QDialog#MnemonicVerificationDialog QLineEdit#word1Edit,
+QDialog#MnemonicVerificationDialog QLineEdit#word2Edit,
+QDialog#MnemonicVerificationDialog QLineEdit#word3Edit {
+    max-width: 320px;
+}
+

From 3b16a88504f46523a2c3e011d70e947f7bb3e62f Mon Sep 17 00:00:00 2001
From: UdjinM6 <UdjinM6@users.noreply.github.com>
Date: Thu, 6 Nov 2025 13:46:51 +0300
Subject: [PATCH 419/656] fix: Restore dialog size when going back from
 verification to word list
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

When clicking "Back" in the verification step (Step 2) to return to
the word list display (Step 1), restore the original dialog size.

Issue: Step 2 reduces minimum size to 460x280 for compact verification
form, but setupStep1() didn't restore the original 550x360 size, causing
the dialog to remain small when returning to the larger word list view.

Fix:
- Restore minimum size to 550x360 in setupStep1()
- Resize to m_defaultSize when returning from Step 2
- Keep adjustSize() only for initial setup

This ensures a consistent dialog size throughout the user flow.

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude <noreply@anthropic.com>
---
 src/qt/mnemonicverificationdialog.cpp | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/src/qt/mnemonicverificationdialog.cpp b/src/qt/mnemonicverificationdialog.cpp
index 30bc6df15c38..63cbf5b6374d 100644
--- a/src/qt/mnemonicverificationdialog.cpp
+++ b/src/qt/mnemonicverificationdialog.cpp
@@ -112,8 +112,16 @@ void MnemonicVerificationDialog::setupStep1()
     ui->writtenDownCheckbox->setChecked(false);
     m_mnemonic_revealed = false;
     ui->buttonBox->hide();
-    // Compact to content
-    adjustSize();
+    // Restore original minimum size (in case we came back from Step 2)
+    setMinimumSize(QSize(550, 360));
+
+    // Restore to default size if we have it (when coming back from Step 2)
+    if (m_defaultSize.isValid() && !m_defaultSize.isEmpty()) {
+        resize(m_defaultSize);
+    } else {
+        // Compact to content on first load
+        adjustSize();
+    }
 
     // Set warning and instruction text with themed colors
     // Font sizes and weights are defined in general.css

From 34914f10e4523cee8a15f4affb1c7bb88e534f63 Mon Sep 17 00:00:00 2001
From: UdjinM6 <UdjinM6@users.noreply.github.com>
Date: Thu, 6 Nov 2025 13:33:30 +0300
Subject: [PATCH 420/656] feat: Add menu option to show recovery phrase for
 existing wallets
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Add "Show Recovery Phrase" menu item under Settings that allows users
to view their mnemonic seed phrase for existing HD wallets with a
streamlined view-only interface.

Menu Integration:
- Added Settings → Show Recovery Phrase menu option
- Menu item positioned between "Change Passphrase" and "Unlock Wallet"
- Enabled for HD wallets with private keys
- Disabled for watch-only wallets (NoKeys status)

View-Only Dialog Mode:
- New optional viewOnly parameter in MnemonicVerificationDialog constructor
- Simplified interface without verification step for viewing existing mnemonics
- Window title: "Your Recovery Phrase" (vs "Save Your Mnemonic" for new wallets)
- Button: Single "Close" button (Cancel button hidden)
- Checkbox: "I have written down" checkbox hidden
- Flow: Single-step view without word verification requirement
- Adjusted warning text appropriate for viewing existing phrase

Security Features:
- Prompts for passphrase if wallet is encrypted (unlocks temporarily)
- Validates wallet capabilities (HD enabled, has private keys)
- Clears mnemonic from memory immediately after dialog creation
- Properly restores wallet lock state after viewing:
  * Returns to locked state if was locked
  * Returns to unlocked-for-mixing state if was in that mode
- Secure memory handling throughout with SecureString

Error Handling:
- Clear error messages for non-HD wallets
- Clear error messages for watch-only wallets
- Graceful handling of user cancellation during unlock
- Proper error recovery with lock state restoration

Backward Compatibility:
- viewOnly parameter defaults to false
- Original verification flow unchanged for new wallet creation
- Existing MnemonicVerificationDialog behavior preserved

This allows users to backup their recovery phrase after wallet creation
without needing to recreate the wallet, with a cleaner UX that skips
unnecessary verification steps when viewing an existing mnemonic.

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude <noreply@anthropic.com>
---
 src/qt/bitcoingui.cpp                 |  6 +++
 src/qt/bitcoingui.h                   |  1 +
 src/qt/mnemonicverificationdialog.cpp | 77 ++++++++++++++++++---------
 src/qt/mnemonicverificationdialog.h   |  3 +-
 src/qt/walletframe.cpp                |  7 +++
 src/qt/walletframe.h                  |  2 +
 src/qt/walletview.cpp                 | 50 +++++++++++++++++
 src/qt/walletview.h                   |  2 +
 8 files changed, 123 insertions(+), 25 deletions(-)

diff --git a/src/qt/bitcoingui.cpp b/src/qt/bitcoingui.cpp
index 18bf1be5b7e5..3921618469ea 100644
--- a/src/qt/bitcoingui.cpp
+++ b/src/qt/bitcoingui.cpp
@@ -394,6 +394,8 @@ void BitcoinGUI::createActions()
     backupWalletAction->setStatusTip(tr("Backup wallet to another location"));
     changePassphraseAction = new QAction(tr("&Change Passphrase…"), this);
     changePassphraseAction->setStatusTip(tr("Change the passphrase used for wallet encryption"));
+    showMnemonicAction = new QAction(tr("&Show Recovery Phrase…"), this);
+    showMnemonicAction->setStatusTip(tr("Show the recovery phrase (mnemonic seed) for this wallet"));
     unlockWalletAction = new QAction(tr("&Unlock Wallet…"), this);
     unlockWalletAction->setToolTip(tr("Unlock wallet"));
     lockWalletAction = new QAction(tr("&Lock Wallet"), this);
@@ -502,6 +504,7 @@ void BitcoinGUI::createActions()
         connect(encryptWalletAction, &QAction::triggered, walletFrame, &WalletFrame::encryptWallet);
         connect(backupWalletAction, &QAction::triggered, walletFrame, &WalletFrame::backupWallet);
         connect(changePassphraseAction, &QAction::triggered, walletFrame, &WalletFrame::changePassphrase);
+        connect(showMnemonicAction, &QAction::triggered, walletFrame, &WalletFrame::showMnemonic);
         connect(unlockWalletAction, &QAction::triggered, walletFrame, &WalletFrame::unlockWallet);
         connect(lockWalletAction, &QAction::triggered, walletFrame, &WalletFrame::lockWallet);
         connect(signMessageAction, &QAction::triggered, [this]{ showNormalIfMinimized(); });
@@ -620,6 +623,7 @@ void BitcoinGUI::createMenuBar()
     {
         settings->addAction(encryptWalletAction);
         settings->addAction(changePassphraseAction);
+        settings->addAction(showMnemonicAction);
         settings->addAction(unlockWalletAction);
         settings->addAction(lockWalletAction);
         settings->addSeparator();
@@ -1040,6 +1044,7 @@ void BitcoinGUI::setWalletActionsEnabled(bool enabled)
     encryptWalletAction->setEnabled(enabled);
     backupWalletAction->setEnabled(enabled);
     changePassphraseAction->setEnabled(enabled);
+    showMnemonicAction->setEnabled(enabled);
     unlockWalletAction->setEnabled(enabled);
     lockWalletAction->setEnabled(enabled);
     signMessageAction->setEnabled(enabled);
@@ -1936,6 +1941,7 @@ void BitcoinGUI::setEncryptionStatus(int status)
         encryptWalletAction->setChecked(false);
         changePassphraseAction->setEnabled(false);
         encryptWalletAction->setEnabled(false);
+        showMnemonicAction->setEnabled(false);
         break;
     case WalletModel::Unencrypted:
         labelWalletEncryptionIcon->show();
diff --git a/src/qt/bitcoingui.h b/src/qt/bitcoingui.h
index e165738a8a32..08543872943e 100644
--- a/src/qt/bitcoingui.h
+++ b/src/qt/bitcoingui.h
@@ -157,6 +157,7 @@ class BitcoinGUI : public QMainWindow
     QAction* encryptWalletAction = nullptr;
     QAction* backupWalletAction = nullptr;
     QAction* changePassphraseAction = nullptr;
+    QAction* showMnemonicAction = nullptr;
     QAction* unlockWalletAction = nullptr;
     QAction* lockWalletAction = nullptr;
     QAction* aboutQtAction = nullptr;
diff --git a/src/qt/mnemonicverificationdialog.cpp b/src/qt/mnemonicverificationdialog.cpp
index 63cbf5b6374d..a3b7249c3e28 100644
--- a/src/qt/mnemonicverificationdialog.cpp
+++ b/src/qt/mnemonicverificationdialog.cpp
@@ -23,11 +23,12 @@
 
 #include <algorithm>
 
-MnemonicVerificationDialog::MnemonicVerificationDialog(const SecureString& mnemonic, QWidget *parent) :
+MnemonicVerificationDialog::MnemonicVerificationDialog(const SecureString& mnemonic, QWidget *parent, bool viewOnly) :
     QDialog(parent, GUIUtil::dialog_flags),
     ui(new Ui::MnemonicVerificationDialog),
     m_mnemonic(mnemonic),
-    m_mnemonic_revealed(false)
+    m_mnemonic_revealed(false),
+    m_view_only(viewOnly)
 {
     ui->setupUi(this);
 
@@ -39,7 +40,7 @@ MnemonicVerificationDialog::MnemonicVerificationDialog(const SecureString& mnemo
     setMinimumSize(QSize(550, 360));
     resize(minimumSize());
 
-    setWindowTitle(tr("Save Your Mnemonic"));
+    setWindowTitle(m_view_only ? tr("Your Recovery Phrase") : tr("Save Your Mnemonic"));
 
     // Words will be parsed on-demand to minimize exposure time in non-secure memory
     // m_words is intentionally left empty initially
@@ -79,16 +80,19 @@ MnemonicVerificationDialog::MnemonicVerificationDialog(const SecureString& mnemo
     // Connections
     connect(ui->showMnemonicButton, &QPushButton::clicked, this, &MnemonicVerificationDialog::onShowMnemonicClicked);
     connect(ui->hideMnemonicButton,  &QPushButton::clicked, this, &MnemonicVerificationDialog::onHideMnemonicClicked);
-    connect(ui->writtenDownCheckbox, &QCheckBox::toggled, this, [this](bool checked) {
-        if (checked && m_has_ever_revealed) setupStep2();
-    });
-    connect(ui->word1Edit, &QLineEdit::textChanged, this, &MnemonicVerificationDialog::onWord1Changed);
-    connect(ui->word2Edit, &QLineEdit::textChanged, this, &MnemonicVerificationDialog::onWord2Changed);
-    connect(ui->word3Edit, &QLineEdit::textChanged, this, &MnemonicVerificationDialog::onWord3Changed);
-    connect(ui->showMnemonicAgainButton, &QPushButton::clicked, this, &MnemonicVerificationDialog::onShowMnemonicAgainClicked);
+
+    if (!m_view_only) {
+        connect(ui->writtenDownCheckbox, &QCheckBox::toggled, this, [this](bool checked) {
+            if (checked && m_has_ever_revealed) setupStep2();
+        });
+        connect(ui->word1Edit, &QLineEdit::textChanged, this, &MnemonicVerificationDialog::onWord1Changed);
+        connect(ui->word2Edit, &QLineEdit::textChanged, this, &MnemonicVerificationDialog::onWord2Changed);
+        connect(ui->word3Edit, &QLineEdit::textChanged, this, &MnemonicVerificationDialog::onWord3Changed);
+        connect(ui->showMnemonicAgainButton, &QPushButton::clicked, this, &MnemonicVerificationDialog::onShowMnemonicAgainClicked);
+    }
 
     // Button box
-    ui->buttonBox->button(QDialogButtonBox::Ok)->setText(tr("Continue"));
+    ui->buttonBox->button(QDialogButtonBox::Ok)->setText(m_view_only ? tr("Close") : tr("Continue"));
     connect(ui->buttonBox, &QDialogButtonBox::accepted, this, &MnemonicVerificationDialog::accept);
     connect(ui->buttonBox, &QDialogButtonBox::rejected, this, &MnemonicVerificationDialog::reject);
 
@@ -111,7 +115,20 @@ void MnemonicVerificationDialog::setupStep1()
     ui->writtenDownCheckbox->setEnabled(false);
     ui->writtenDownCheckbox->setChecked(false);
     m_mnemonic_revealed = false;
-    ui->buttonBox->hide();
+
+    // In view-only mode, hide the checkbox and show buttonBox immediately
+    if (m_view_only) {
+        ui->writtenDownCheckbox->hide();
+        ui->buttonBox->show();
+        // Hide Cancel button in view-only mode - only Close button is needed
+        if (QAbstractButton* cancelBtn = ui->buttonBox->button(QDialogButtonBox::Cancel)) {
+            cancelBtn->hide();
+        }
+    } else {
+        ui->writtenDownCheckbox->show();
+        ui->buttonBox->hide();
+    }
+
     // Restore original minimum size (in case we came back from Step 2)
     setMinimumSize(QSize(550, 360));
 
@@ -125,12 +142,19 @@ void MnemonicVerificationDialog::setupStep1()
 
     // Set warning and instruction text with themed colors
     // Font sizes and weights are defined in general.css
-    ui->warningLabel->setText(
-        tr("WARNING: If you lose your mnemonic seed phrase, you will lose access to your wallet forever. Write it down in a safe place and never share it with anyone."));
-    ui->warningLabel->setStyleSheet(GUIUtil::getThemedStyleQString(GUIUtil::ThemedStyle::TS_ERROR));
-
-    ui->instructionLabel->setText(
-        tr("Please write down these words in order. You will need them to restore your wallet."));
+    if (m_view_only) {
+        ui->warningLabel->setText(
+            tr("WARNING: Never share your recovery phrase with anyone. Store it securely offline."));
+        ui->warningLabel->setStyleSheet(GUIUtil::getThemedStyleQString(GUIUtil::ThemedStyle::TS_ERROR));
+        ui->instructionLabel->setText(
+            tr("These words can restore your wallet. Keep them safe and private."));
+    } else {
+        ui->warningLabel->setText(
+            tr("WARNING: If you lose your mnemonic seed phrase, you will lose access to your wallet forever. Write it down in a safe place and never share it with anyone."));
+        ui->warningLabel->setStyleSheet(GUIUtil::getThemedStyleQString(GUIUtil::ThemedStyle::TS_ERROR));
+        ui->instructionLabel->setText(
+            tr("Please write down these words in order. You will need them to restore your wallet."));
+    }
 
     // Reduce extra padding to avoid an over-padded look
     if (auto outer = findChild<QVBoxLayout*>("verticalLayout_step1")) {
@@ -250,7 +274,9 @@ void MnemonicVerificationDialog::onShowMnemonicClicked()
     buildMnemonicGrid(true);
     ui->showMnemonicButton->hide();
     ui->hideMnemonicButton->show();
-    ui->writtenDownCheckbox->setEnabled(true);
+    if (!m_view_only) {
+        ui->writtenDownCheckbox->setEnabled(true);
+    }
     m_mnemonic_revealed = true;
     m_has_ever_revealed = true;
 }
@@ -320,11 +346,14 @@ void MnemonicVerificationDialog::updateWordValidation()
 
 void MnemonicVerificationDialog::accept()
 {
-    if (!validateWord(ui->word1Edit->text().trimmed().toLower(), m_selected_positions[0]) ||
-        !validateWord(ui->word2Edit->text().trimmed().toLower(), m_selected_positions[1]) ||
-        !validateWord(ui->word3Edit->text().trimmed().toLower(), m_selected_positions[2])) {
-        QMessageBox::warning(this, tr("Verification Failed"), tr("One or more words are incorrect. Please try again."));
-        return;
+    // In view-only mode, skip verification
+    if (!m_view_only) {
+        if (!validateWord(ui->word1Edit->text().trimmed().toLower(), m_selected_positions[0]) ||
+            !validateWord(ui->word2Edit->text().trimmed().toLower(), m_selected_positions[1]) ||
+            !validateWord(ui->word3Edit->text().trimmed().toLower(), m_selected_positions[2])) {
+            QMessageBox::warning(this, tr("Verification Failed"), tr("One or more words are incorrect. Please try again."));
+            return;
+        }
     }
     QDialog::accept();
 }
diff --git a/src/qt/mnemonicverificationdialog.h b/src/qt/mnemonicverificationdialog.h
index c58b7529a2de..efc326f9cafd 100644
--- a/src/qt/mnemonicverificationdialog.h
+++ b/src/qt/mnemonicverificationdialog.h
@@ -20,7 +20,7 @@ class MnemonicVerificationDialog : public QDialog
     Q_OBJECT
 
 public:
-    explicit MnemonicVerificationDialog(const SecureString& mnemonic, QWidget *parent = nullptr);
+    explicit MnemonicVerificationDialog(const SecureString& mnemonic, QWidget *parent = nullptr, bool viewOnly = false);
     ~MnemonicVerificationDialog();
 
     void accept() override;
@@ -51,6 +51,7 @@ private Q_SLOTS:
     QList<int> m_selected_positions;
     bool m_mnemonic_revealed;
     bool m_has_ever_revealed{false};
+    bool m_view_only{false};
     class QGridLayout* m_gridLayout{nullptr};
     QSize m_defaultSize;
 };
diff --git a/src/qt/walletframe.cpp b/src/qt/walletframe.cpp
index 9373ab6119df..417847a6fe68 100644
--- a/src/qt/walletframe.cpp
+++ b/src/qt/walletframe.cpp
@@ -310,6 +310,13 @@ void WalletFrame::changePassphrase()
         walletView->changePassphrase();
 }
 
+void WalletFrame::showMnemonic()
+{
+    WalletView *walletView = currentWalletView();
+    if (walletView)
+        walletView->showMnemonic();
+}
+
 void WalletFrame::unlockWallet()
 {
     WalletView *walletView = currentWalletView();
diff --git a/src/qt/walletframe.h b/src/qt/walletframe.h
index f95000d68d2d..f2820c7dd410 100644
--- a/src/qt/walletframe.h
+++ b/src/qt/walletframe.h
@@ -100,6 +100,8 @@ public Q_SLOTS:
     void backupWallet();
     /** Change encrypted wallet passphrase */
     void changePassphrase();
+    /** Show wallet mnemonic/recovery phrase */
+    void showMnemonic();
     /** Ask for passphrase to unlock wallet temporarily */
     void unlockWallet();
     /** Lock wallet */
diff --git a/src/qt/walletview.cpp b/src/qt/walletview.cpp
index 813a2e01c226..89433046bb54 100644
--- a/src/qt/walletview.cpp
+++ b/src/qt/walletview.cpp
@@ -11,6 +11,7 @@
 #include <qt/askpassphrasedialog.h>
 #include <qt/clientmodel.h>
 #include <qt/guiutil.h>
+#include <qt/mnemonicverificationdialog.h>
 #include <qt/optionsmodel.h>
 #include <qt/overviewpage.h>
 #include <qt/receivecoinsdialog.h>
@@ -27,6 +28,7 @@
 
 #include <QHBoxLayout>
 #include <QLabel>
+#include <QMessageBox>
 #include <QProgressDialog>
 #include <QPushButton>
 #include <QSettings>
@@ -325,6 +327,54 @@ void WalletView::changePassphrase()
     GUIUtil::ShowModalDialogAsynchronously(dlg);
 }
 
+void WalletView::showMnemonic()
+{
+    // Check if wallet supports mnemonic retrieval
+    if (walletModel->wallet().privateKeysDisabled()) {
+        QMessageBox::warning(this, tr("No Recovery Phrase"),
+            tr("This wallet does not have private keys and therefore has no recovery phrase."));
+        return;
+    }
+
+    if (!walletModel->wallet().hdEnabled()) {
+        QMessageBox::warning(this, tr("No Recovery Phrase"),
+            tr("This wallet was not created with HD (Hierarchical Deterministic) mode and does not have a recovery phrase."));
+        return;
+    }
+
+    // Request unlock if needed - UnlockContext will restore lock state on destruction
+    WalletModel::UnlockContext ctx(walletModel->requestUnlock());
+    if (!ctx.isValid()) {
+        // User cancelled unlock
+        return;
+    }
+
+    // Retrieve mnemonic
+    SecureString mnemonic;
+    SecureString mnemonic_passphrase;
+    bool has_mnemonic = walletModel->wallet().getMnemonic(mnemonic, mnemonic_passphrase);
+
+    if (!has_mnemonic || mnemonic.empty()) {
+        QMessageBox::warning(this, tr("Mnemonic Retrieval Failed"),
+            tr("Could not retrieve the recovery phrase from this wallet."));
+        return;
+    }
+
+    // Show mnemonic verification dialog in view-only mode (no verification required)
+    MnemonicVerificationDialog verify_dialog(mnemonic, this, true);
+    verify_dialog.setWindowModality(Qt::ApplicationModal);
+
+    // Clear mnemonic from local variables after dialog has copied it
+    const size_t mnemonic_size = mnemonic.size();
+    const size_t passphrase_size = mnemonic_passphrase.size();
+    mnemonic.assign(mnemonic_size, 0);
+    mnemonic_passphrase.assign(passphrase_size, 0);
+
+    verify_dialog.exec();
+
+    // UnlockContext destructor will automatically restore the wallet lock state
+}
+
 void WalletView::unlockWallet(bool fForMixingOnly)
 {
     // Unlock wallet when requested by wallet model
diff --git a/src/qt/walletview.h b/src/qt/walletview.h
index 4ff82cbf4b8c..328b42821d06 100644
--- a/src/qt/walletview.h
+++ b/src/qt/walletview.h
@@ -107,6 +107,8 @@ public Q_SLOTS:
     void backupWallet();
     /** Change encrypted wallet passphrase */
     void changePassphrase();
+    /** Show wallet mnemonic/recovery phrase */
+    void showMnemonic();
     /** Ask for passphrase to unlock wallet temporarily */
     void unlockWallet(bool fAnonymizeOnly=false);
     /** Lock wallet */

From a0b15cfaed5515aafe242f410a64374cc98582e4 Mon Sep 17 00:00:00 2001
From: UdjinM6 <UdjinM6@users.noreply.github.com>
Date: Thu, 6 Nov 2025 17:23:48 +0300
Subject: [PATCH 421/656] refactor: Simplify wallet lock state handling in
 CreateWalletActivity
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Simplify the lock state tracking logic in CreateWalletActivity::finish()
since mixing-only unlock state is impossible for newly created wallets.

Changes:
- Use getEncryptionStatus() instead of tracking multiple state variables
- Replace was_locked and was_unlocked_for_mixing with single was_locked check
- Remove restoreWalletLockState() helper method - inline simple lock call
- Add comment explaining why mixing state is impossible at creation time

Before: Tracked both was_locked and was_unlocked_for_mixing states
After: Only track was_locked since new wallets can only be:
  * Unencrypted (unlocked)
  * Encrypted and locked (need to unlock to show mnemonic)

This is clearer and removes unnecessary complexity for an impossible state.

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude <noreply@anthropic.com>
---
 src/qt/walletcontroller.cpp | 54 ++++++++++---------------------------
 src/qt/walletcontroller.h   |  1 -
 2 files changed, 14 insertions(+), 41 deletions(-)

diff --git a/src/qt/walletcontroller.cpp b/src/qt/walletcontroller.cpp
index 0a1e194d13a9..79df868be617 100644
--- a/src/qt/walletcontroller.cpp
+++ b/src/qt/walletcontroller.cpp
@@ -293,13 +293,11 @@ void CreateWalletActivity::finish()
         }
 
         // Unlock wallet if encrypted (needed to retrieve mnemonic)
-        bool was_locked = false;
-        bool was_unlocked_for_mixing = false;
-        WalletModel::EncryptionStatus enc_status = m_wallet_model->getEncryptionStatus();
-        if (enc_status == WalletModel::Locked || enc_status == WalletModel::UnlockedForMixingOnly) {
-            was_locked = (enc_status == WalletModel::Locked);
-            was_unlocked_for_mixing = (enc_status == WalletModel::UnlockedForMixingOnly);
-            // Unlock fully (not just for mixing) to retrieve mnemonic
+        // Note: Newly created wallet can only be locked (if encrypted) or unencrypted.
+        // Mixing-only unlock state is not possible at wallet creation time.
+        const bool was_locked = (m_wallet_model->getEncryptionStatus() == WalletModel::Locked);
+        if (was_locked) {
+            // Unlock to retrieve mnemonic using passphrase from wallet creation
             if (!m_wallet_model->setWalletLocked(false, m_passphrase, false)) {
                 QMessageBox::warning(m_parent_widget, tr("Unlock failed"),
                     tr("Failed to unlock wallet for mnemonic verification. Wallet creation completed but verification skipped."));
@@ -316,7 +314,9 @@ void CreateWalletActivity::finish()
 
         if (!has_mnemonic || mnemonic.empty()) {
             // No mnemonic found - log warning and skip verification
-            restoreWalletLockState(was_locked, was_unlocked_for_mixing);
+            if (was_locked) {
+                m_wallet_model->setWalletLocked(true);
+            }
             // Clear sensitive data before showing message
             mnemonic.assign(mnemonic.size(), 0);
             mnemonic_passphrase.assign(mnemonic_passphrase.size(), 0);
@@ -340,11 +340,15 @@ void CreateWalletActivity::finish()
 
         if (verify_dialog.exec() == QDialog::Accepted) {
             // Verification successful
-            restoreWalletLockState(was_locked, was_unlocked_for_mixing);
+            if (was_locked) {
+                m_wallet_model->setWalletLocked(true);
+            }
             Q_EMIT created(m_wallet_model);
         } else {
             // User cancelled verification
-            restoreWalletLockState(was_locked, was_unlocked_for_mixing);
+            if (was_locked) {
+                m_wallet_model->setWalletLocked(true);
+            }
             QMessageBox::warning(m_parent_widget, tr("Verification cancelled"),
                 tr("You cancelled mnemonic verification. Please make sure you have saved your mnemonic phrase safely."));
             Q_EMIT created(m_wallet_model);
@@ -357,36 +361,6 @@ void CreateWalletActivity::finish()
     Q_EMIT finished();
 }
 
-void CreateWalletActivity::restoreWalletLockState(bool was_locked, bool was_unlocked_for_mixing)
-{
-    if (!was_locked && !was_unlocked_for_mixing) {
-        return; // Wallet was not locked, nothing to restore
-    }
-
-    if (!m_wallet_model) {
-        return; // Safety check: wallet model not available
-    }
-
-    if (was_unlocked_for_mixing) {
-        // Restore previous mixing-only unlock state
-        if (!m_wallet_model->setWalletLocked(true)) {
-            QMessageBox::warning(m_parent_widget, tr("Warning"),
-                tr("Failed to lock wallet. Please lock it manually."));
-            return;
-        }
-        if (!m_wallet_model->setWalletLocked(false, m_passphrase, true)) {
-            QMessageBox::warning(m_parent_widget, tr("Warning"),
-                tr("Failed to restore mixing unlock state."));
-        }
-    } else {
-        // Restore fully locked state
-        if (!m_wallet_model->setWalletLocked(true)) {
-            QMessageBox::warning(m_parent_widget, tr("Warning"),
-                tr("Failed to lock wallet. Please lock it manually."));
-        }
-    }
-}
-
 void CreateWalletActivity::create()
 {
     m_create_wallet_dialog = new CreateWalletDialog(m_parent_widget);
diff --git a/src/qt/walletcontroller.h b/src/qt/walletcontroller.h
index 6d269eda0afb..ccb7dbc62d51 100644
--- a/src/qt/walletcontroller.h
+++ b/src/qt/walletcontroller.h
@@ -123,7 +123,6 @@ class CreateWalletActivity : public WalletControllerActivity
     void askPassphrase();
     void createWallet();
     void finish();
-    void restoreWalletLockState(bool was_locked, bool was_unlocked_for_mixing);
 
     SecureString m_passphrase;
     CreateWalletDialog* m_create_wallet_dialog{nullptr};

From 5024589ccc8b2e2b8effa0d7fca4edfc8bdbc977 Mon Sep 17 00:00:00 2001
From: pasta <pasta@dashboost.org>
Date: Thu, 6 Nov 2025 22:21:33 -0600
Subject: [PATCH 422/656] doc: Add release notes for PR #6946

---
 doc/release-notes-6946.md | 6 ++++++
 1 file changed, 6 insertions(+)
 create mode 100644 doc/release-notes-6946.md

diff --git a/doc/release-notes-6946.md b/doc/release-notes-6946.md
new file mode 100644
index 000000000000..f522978dba54
--- /dev/null
+++ b/doc/release-notes-6946.md
@@ -0,0 +1,6 @@
+GUI changes
+--------
+
+- A mnemonic verification dialog is now shown after creating a new HD wallet, requiring users to verify they have written down their recovery phrase (#6946).
+- A new menu item "Show Recovery Phrase…" has been added to the Settings menu to view the recovery phrase for existing HD wallets (#6946).
+

From 9531028434fe729488610302aac46df1905f045a Mon Sep 17 00:00:00 2001
From: pasta <pasta@dashboost.org>
Date: Thu, 6 Nov 2025 22:25:26 -0600
Subject: [PATCH 423/656] security: Store mnemonic words in secure memory

Replace QStringList with std::vector<SecureString> for m_words member
to ensure mnemonic seed words are stored in secure memory that:
- Locks memory to prevent paging to disk
- Automatically zeros memory on deallocation
- Uses secure allocators throughout the lifetime of sensitive data

This addresses a security concern where mnemonic words were stored
in non-secure memory (QStringList) which does not guarantee secure
memory allocation or zeroing on deallocation.
---
 src/qt/mnemonicverificationdialog.cpp | 53 ++++++++++++++++++++-------
 src/qt/mnemonicverificationdialog.h   |  5 ++-
 2 files changed, 43 insertions(+), 15 deletions(-)

diff --git a/src/qt/mnemonicverificationdialog.cpp b/src/qt/mnemonicverificationdialog.cpp
index a3b7249c3e28..365b8e6e5dc1 100644
--- a/src/qt/mnemonicverificationdialog.cpp
+++ b/src/qt/mnemonicverificationdialog.cpp
@@ -309,11 +309,18 @@ bool MnemonicVerificationDialog::validateWord(const QString& word, int position)
     // Parse words on-demand for validation (minimizes exposure time)
     // Words are kept in memory during step 2 (verification) and step 1 (when revealed)
     // They are only cleared when explicitly hiding in step 1 or on dialog destruction
-    QStringList words = parseWords();
-    if (position < 1 || position > words.size()) {
+    std::vector<SecureString> words = parseWords();
+    if (position < 1 || position > static_cast<int>(words.size())) {
         return false;
     }
-    return word == words[position - 1].toLower();
+    // Convert SecureString to QString temporarily for comparison
+    QString secureWord = QString::fromStdString(std::string(words[position - 1].begin(), words[position - 1].end()));
+    bool result = word == secureWord.toLower();
+    // Clear temporary QString immediately
+    secureWord.fill(QChar(0));
+    secureWord.clear();
+    secureWord.squeeze();
+    return result;
 }
 
 void MnemonicVerificationDialog::updateWordValidation()
@@ -364,20 +371,34 @@ void MnemonicVerificationDialog::clearMnemonic()
     m_mnemonic.assign(m_mnemonic.size(), 0);
 }
 
-QStringList MnemonicVerificationDialog::parseWords()
+std::vector<SecureString> MnemonicVerificationDialog::parseWords()
 {
     // If words are already parsed, reuse them (for step 2 validation or step 1 display)
-    if (!m_words.isEmpty()) {
+    if (!m_words.empty()) {
         return m_words;
     }
 
     // Parse words from secure mnemonic string
     QString mnemonicStr = QString::fromStdString(std::string(m_mnemonic.begin(), m_mnemonic.end()));
-    m_words = mnemonicStr.split(QRegularExpression("\\s+"), Qt::SkipEmptyParts);
+    QStringList wordList = mnemonicStr.split(QRegularExpression("\\s+"), Qt::SkipEmptyParts);
+
+    // Convert to SecureString vector for secure storage
+    m_words.clear();
+    m_words.reserve(wordList.size());
+    for (const QString& word : wordList) {
+        std::string wordStd = word.toStdString();
+        SecureString secureWord;
+        secureWord.assign(std::string_view{wordStd});
+        m_words.push_back(secureWord);
+        // Clear temporary std::string
+        wordStd.assign(wordStd.size(), 0);
+    }
 
     // Clear the temporary QString immediately after parsing
+    mnemonicStr.fill(QChar(0));
     mnemonicStr.clear();
     mnemonicStr.squeeze(); // Release memory
+    wordList.clear();
 
     return m_words;
 }
@@ -385,26 +406,26 @@ QStringList MnemonicVerificationDialog::parseWords()
 void MnemonicVerificationDialog::clearWordsSecurely()
 {
     // Securely clear each word string by overwriting before clearing
-    for (QString& word : m_words) {
+    for (SecureString& word : m_words) {
         // Overwrite with zeros before clearing
-        word.fill(QChar(0));
+        word.assign(word.size(), 0);
         word.clear();
-        word.squeeze(); // Release memory
     }
     m_words.clear();
 }
 
 int MnemonicVerificationDialog::getWordCount() const
 {
-    // Count words without parsing them into QStringList
+    // Count words without parsing them into vector
     // This avoids storing words in non-secure memory unnecessarily
-    if (m_words.isEmpty()) {
+    if (m_words.empty()) {
         QString mnemonicStr = QString::fromStdString(std::string(m_mnemonic.begin(), m_mnemonic.end()));
         QStringList words = mnemonicStr.split(QRegularExpression("\\s+"), Qt::SkipEmptyParts);
         int count = words.size();
         // Clear immediately
         mnemonicStr.clear();
         mnemonicStr.squeeze();
+        words.clear();
         return count;
     }
     return m_words.size();
@@ -421,7 +442,7 @@ void MnemonicVerificationDialog::buildMnemonicGrid(bool reveal)
     }
 
     // Parse words only when revealing (when needed for display)
-    QStringList words;
+    std::vector<SecureString> words;
     if (reveal) {
         words = parseWords();
     } else {
@@ -462,10 +483,16 @@ void MnemonicVerificationDialog::buildMnemonicGrid(bool reveal)
     for (int r = 0; r < rows; ++r) {
         for (int c = 0; c < columns; ++c) {
             int idx = r * columns + c; if (idx >= n) break;
-            const QString text = QString("%1. %2").arg(idx + 1, 2).arg(words[idx]);
+            // Convert SecureString to QString temporarily for display
+            QString wordStr = QString::fromStdString(std::string(words[idx].begin(), words[idx].end()));
+            const QString text = QString("%1. %2").arg(idx + 1, 2).arg(wordStr);
             QLabel* lbl = new QLabel(text);
             lbl->setTextInteractionFlags(Qt::TextSelectableByMouse);
             m_gridLayout->addWidget(lbl, r, c);
+            // Clear temporary QString immediately after use
+            wordStr.fill(QChar(0));
+            wordStr.clear();
+            wordStr.squeeze();
         }
     }
 
diff --git a/src/qt/mnemonicverificationdialog.h b/src/qt/mnemonicverificationdialog.h
index efc326f9cafd..309912201c15 100644
--- a/src/qt/mnemonicverificationdialog.h
+++ b/src/qt/mnemonicverificationdialog.h
@@ -9,6 +9,7 @@
 #include <QStackedWidget>
 
 #include <support/allocators/secure.h>
+#include <vector>
 
 namespace Ui {
     class MnemonicVerificationDialog;
@@ -41,13 +42,13 @@ private Q_SLOTS:
     bool validateWord(const QString& word, int position);
     void clearMnemonic();
     void buildMnemonicGrid(bool reveal);
-    QStringList parseWords();
+    std::vector<SecureString> parseWords();
     void clearWordsSecurely();
     int getWordCount() const;
 
     Ui::MnemonicVerificationDialog *ui;
     SecureString m_mnemonic;
-    QStringList m_words;
+    std::vector<SecureString> m_words;
     QList<int> m_selected_positions;
     bool m_mnemonic_revealed;
     bool m_has_ever_revealed{false};

From a40b13228752db5202b364e83137f1c13f8c8b9f Mon Sep 17 00:00:00 2001
From: PastaPastaPasta <6443210+PastaPastaPasta@users.noreply.github.com>
Date: Fri, 7 Nov 2025 08:22:46 -0600
Subject: [PATCH 424/656] Update doc/build-unix.md

---
 doc/build-unix.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/build-unix.md b/doc/build-unix.md
index 944700c8ec8c..137073dbafa0 100644
--- a/doc/build-unix.md
+++ b/doc/build-unix.md
@@ -139,7 +139,7 @@ sudo dnf install gcc-c++ libtool make autoconf automake python3
 Now, you can either build from self-compiled [depends](/depends/README.md) or install the required dependencies:
 
 ```sh
-sudo dnf install libbacktrace-devel libevent-devel boost-devel
+sudo dnf install libevent-devel boost-devel
 ```
 
 SQLite is required for the descriptor wallet:

From 5978985b9f8bed1ec215a0a0189b01888400c544 Mon Sep 17 00:00:00 2001
From: Kittywhiskers Van Gogh <63189531+kwvg@users.noreply.github.com>
Date: Fri, 7 Nov 2025 20:30:48 +0530
Subject: [PATCH 425/656] fix: don't treat arrays/objects as string literals
 for composite methods

We currently do not process them as numbers or other non-string types
as this current fix aims to preserve the string representation as
expected by RPCs that support extended addresses. A future improvement
could allow for full integration but that is currently out of scope.
---
 src/rpc/client.cpp          |  90 ++++++++++++++++++++----
 src/rpc/client.h            |   4 +-
 src/test/rpc_tests.cpp      | 134 ++++++++++++++++++++++++++++++++++++
 test/functional/rpc_help.py |   4 +-
 4 files changed, 217 insertions(+), 15 deletions(-)

diff --git a/src/rpc/client.cpp b/src/rpc/client.cpp
index 92378a3455a7..9742b33fbc59 100644
--- a/src/rpc/client.cpp
+++ b/src/rpc/client.cpp
@@ -8,16 +8,17 @@
 #include <tinyformat.h>
 #include <util/system.h>
 
-#include <set>
+#include <map>
 #include <string>
 #include <string_view>
 
 class CRPCConvertParam
 {
 public:
-    std::string methodName; //!< method whose params want conversion
-    int paramIdx;           //!< 0-based idx of param to convert
-    std::string paramName;  //!< parameter name
+    std::string methodName;   //!< method whose params want conversion
+    int paramIdx;             //!< 0-based idx of param to convert
+    std::string paramName;    //!< parameter name
+    bool preserve_str{false}; //!< only parse if array or object
 };
 
 // clang-format off
@@ -253,14 +254,47 @@ static const CRPCConvertParam vRPCConvertParams[] =
     { "verifyislock", 3, "maxHeight" },
     { "submitchainlock", 2, "blockHeight" },
     { "mnauth", 0, "nodeId" },
+    { "protx register", 3, "coreP2PAddrs", true },
+    { "protx register_legacy", 3, "coreP2PAddrs", true },
+    { "protx register_evo", 3, "coreP2PAddrs", true },
+    { "protx register_evo", 10, "platformP2PAddrs", true },
+    { "protx register_evo", 11, "platformHTTPSAddrs", true },
+    { "protx register_fund", 2, "coreP2PAddrs", true },
+    { "protx register_fund_legacy", 2, "coreP2PAddrs", true },
+    { "protx register_fund_evo", 2, "coreP2PAddrs", true },
+    { "protx register_fund_evo", 9, "platformP2PAddrs", true },
+    { "protx register_fund_evo", 10, "platformHTTPSAddrs", true },
+    { "protx register_prepare", 3, "coreP2PAddrs", true },
+    { "protx register_prepare_legacy", 3, "coreP2PAddrs", true },
+    { "protx register_prepare_evo", 3, "coreP2PAddrs", true },
+    { "protx register_prepare_evo", 10, "platformP2PAddrs", true },
+    { "protx register_prepare_evo", 11, "platformHTTPSAddrs", true },
+    { "protx update_service", 2, "coreP2PAddrs", true },
+    { "protx update_service_evo", 2, "coreP2PAddrs", true },
+    { "protx update_service_evo", 5, "platformP2PAddrs", true },
+    { "protx update_service_evo", 6, "platformHTTPSAddrs", true },
 };
 // clang-format on
 
 class CRPCConvertTable
 {
 private:
-    std::set<std::pair<std::string, int>> members;
-    std::set<std::pair<std::string, std::string>> membersByName;
+    std::map<std::pair<std::string, int>, bool> members;
+    std::map<std::pair<std::string, std::string>, bool> membersByName;
+
+    std::string_view MaybeUnquoteString(std::string_view arg_value)
+    {
+        if (arg_value.size() >= 2 && ((arg_value.front() == '\'' && arg_value.back() == '\'') || (arg_value.front() == '\"' && arg_value.back() == '\"'))) {
+            return arg_value.substr(1, arg_value.size() - 2);
+        }
+        return arg_value;
+    }
+
+    bool LikelyJSONType(std::string_view arg_value)
+    {
+        arg_value = MaybeUnquoteString(arg_value);
+        return arg_value.size() >= 2 && ((arg_value.front() == '[' && arg_value.back() == ']') || (arg_value.front() == '{' && arg_value.back() == '}'));
+    }
 
 public:
     CRPCConvertTable();
@@ -268,21 +302,35 @@ class CRPCConvertTable
     /** Return arg_value as UniValue, and first parse it if it is a non-string parameter */
     UniValue ArgToUniValue(std::string_view arg_value, const std::string& method, int param_idx)
     {
-        return members.count({method, param_idx}) > 0 ? ParseNonRFCJSONValue(arg_value) : arg_value;
+        if (const auto it = members.find({method, param_idx}); it != members.end() && (!it->second || (it->second && LikelyJSONType(arg_value)))) {
+            return ParseNonRFCJSONValue(MaybeUnquoteString(arg_value));
+        }
+        return arg_value;
     }
 
     /** Return arg_value as UniValue, and first parse it if it is a non-string parameter */
     UniValue ArgToUniValue(std::string_view arg_value, const std::string& method, const std::string& param_name)
     {
-        return membersByName.count({method, param_name}) > 0 ? ParseNonRFCJSONValue(arg_value) : arg_value;
+        if (const auto it = membersByName.find({method, param_name}); it != membersByName.end() && (!it->second || (it->second && LikelyJSONType(arg_value)))) {
+            return ParseNonRFCJSONValue(MaybeUnquoteString(arg_value));
+        }
+        return arg_value;
+    }
+
+    /** Check if we have any conversion rules for this method */
+    bool IsDefined(const std::string& method, bool named) const
+    {
+        return named ?
+                  std::find_if(membersByName.begin(), membersByName.end(), [&method](const auto& kv) { return kv.first.first == method; }) != membersByName.end()
+                : std::find_if(members.begin(), members.end(), [&method](const auto& kv) { return kv.first.first == method; }) != members.end();
     }
 };
 
 CRPCConvertTable::CRPCConvertTable()
 {
     for (const auto& cp : vRPCConvertParams) {
-        members.emplace(cp.methodName, cp.paramIdx);
-        membersByName.emplace(cp.methodName, cp.paramName);
+        members.try_emplace({cp.methodName, cp.paramIdx}, cp.preserve_str);
+        membersByName.try_emplace({cp.methodName, cp.paramName}, cp.preserve_str);
     }
 }
 
@@ -298,10 +346,19 @@ UniValue ParseNonRFCJSONValue(std::string_view raw)
     return parsed;
 }
 
-UniValue RPCConvertValues(const std::string &strMethod, const std::vector<std::string> &strParams)
+UniValue RPCConvertValues(std::string strMethod, const std::vector<std::string> &strParams)
 {
     UniValue params(UniValue::VARR);
 
+    // If we are using a subcommand that is in the table, update the method name
+    strMethod = [&strMethod, &strParams]() {
+        if (!strParams.empty() && strMethod.find(' ') == std::string::npos) {
+            std::string candidate{strMethod + " " + strParams[0]};
+            return rpcCvtTable.IsDefined(candidate, /*named=*/false) ? candidate : strMethod;
+        }
+        return strMethod;
+    }();
+
     for (unsigned int idx = 0; idx < strParams.size(); idx++) {
         std::string_view value{strParams[idx]};
         params.push_back(rpcCvtTable.ArgToUniValue(value, strMethod, idx));
@@ -310,11 +367,20 @@ UniValue RPCConvertValues(const std::string &strMethod, const std::vector<std::s
     return params;
 }
 
-UniValue RPCConvertNamedValues(const std::string &strMethod, const std::vector<std::string> &strParams)
+UniValue RPCConvertNamedValues(std::string strMethod, const std::vector<std::string> &strParams)
 {
     UniValue params(UniValue::VOBJ);
     UniValue positional_args{UniValue::VARR};
 
+    // If we are using a subcommand that is in the table, update the method name
+    strMethod = [&strMethod, &strParams]() {
+        if (strMethod.find(' ') == std::string::npos && !strParams.empty() && strParams[0].find('=') == std::string::npos) {
+            std::string candidate{strMethod + " " + strParams[0]};
+            return rpcCvtTable.IsDefined(candidate, /*named=*/true) ? candidate : strMethod;
+        }
+        return strMethod;
+    }();
+
     for (std::string_view s: strParams) {
         size_t pos = s.find('=');
         if (pos == std::string::npos) {
diff --git a/src/rpc/client.h b/src/rpc/client.h
index a99d8611109d..60e118de084c 100644
--- a/src/rpc/client.h
+++ b/src/rpc/client.h
@@ -12,10 +12,10 @@
 #include <univalue.h>
 
 /** Convert positional arguments to command-specific RPC representation */
-UniValue RPCConvertValues(const std::string& strMethod, const std::vector<std::string>& strParams);
+UniValue RPCConvertValues(std::string strMethod, const std::vector<std::string>& strParams);
 
 /** Convert named arguments to command-specific RPC representation */
-UniValue RPCConvertNamedValues(const std::string& strMethod, const std::vector<std::string>& strParams);
+UniValue RPCConvertNamedValues(std::string strMethod, const std::vector<std::string>& strParams);
 
 /** Non-RFC4627 JSON parser, accepts internal values (such as numbers, true, false, null)
  * as well as objects and arrays.
diff --git a/src/test/rpc_tests.cpp b/src/test/rpc_tests.cpp
index 6a6bc9fbba34..4809b859bee6 100644
--- a/src/test/rpc_tests.cpp
+++ b/src/test/rpc_tests.cpp
@@ -596,4 +596,138 @@ BOOST_AUTO_TEST_CASE(rpc_bls)
     BOOST_CHECK_EQUAL(r.get_obj().find_value("public").get_str(), "b379c28e0f50546906fe733f1222c8f7e39574d513790034f1fec1476286eb652a350c8c0e630cd2cc60d10c26d6f6ee");
 }
 
+BOOST_AUTO_TEST_CASE(rpc_convert_composite_commands)
+{
+    UniValue result;
+
+    // Validate that array syntax is not interpreted as string literal
+    BOOST_CHECK_NO_THROW(result = RPCConvertValues("protx", {
+        "register_prepare",
+        "6fe28c0ab6f1b372c1a6a246ae63f74f931e8365e15a089c68d6190000000000",
+        "1",
+        "[\"1.1.1.1:19999\",\"1.0.0.1:19999\"]",
+        "yhq7ifNCtTKEpY4Yu5XPCcztQco6Fh6JsZ"
+    }));
+
+    BOOST_CHECK_EQUAL(result[0].get_str(), "register_prepare");
+    BOOST_CHECK_EQUAL(result[1].get_str(), "6fe28c0ab6f1b372c1a6a246ae63f74f931e8365e15a089c68d6190000000000");
+    BOOST_CHECK_EQUAL(result[2].get_str(), "1");
+    BOOST_CHECK(result[3].isArray());
+    BOOST_CHECK_EQUAL(result[3].size(), 2);
+    BOOST_CHECK_EQUAL(result[3][0].get_str(), "1.1.1.1:19999");
+    BOOST_CHECK_EQUAL(result[3][1].get_str(), "1.0.0.1:19999");
+    BOOST_CHECK_EQUAL(result[4].get_str(), "yhq7ifNCtTKEpY4Yu5XPCcztQco6Fh6JsZ");
+
+    // Validate that array syntax is not interpreted as string literal (named parameter)
+    BOOST_CHECK_NO_THROW(result = RPCConvertNamedValues("protx", {
+        "register_prepare",
+        "6fe28c0ab6f1b372c1a6a246ae63f74f931e8365e15a089c68d6190000000000",
+        "1",
+        "coreP2PAddrs=[\"1.1.1.1:19999\",\"1.0.0.1:19999\"]",
+        "ownerAddress=yhq7ifNCtTKEpY4Yu5XPCcztQco6Fh6JsZ"
+    }));
+
+    BOOST_CHECK(result.exists("coreP2PAddrs"));
+    BOOST_CHECK(result["coreP2PAddrs"].isArray());
+    BOOST_CHECK_EQUAL(result["coreP2PAddrs"].size(), 2);
+    BOOST_CHECK_EQUAL(result["coreP2PAddrs"][0].get_str(), "1.1.1.1:19999");
+    BOOST_CHECK_EQUAL(result["coreP2PAddrs"][1].get_str(), "1.0.0.1:19999");
+    BOOST_CHECK_EQUAL(result["ownerAddress"].get_str(), "yhq7ifNCtTKEpY4Yu5XPCcztQco6Fh6JsZ");
+
+    // Validate that array syntax is parsed for all recognized fields
+    BOOST_CHECK_NO_THROW(result = RPCConvertValues("protx", {
+        "register_evo",
+        "6fe28c0ab6f1b372c1a6a246ae63f74f931e8365e15a089c68d6190000000000",
+        "1",
+        "[\"1.1.1.1:19999\"]",
+        "yhq7ifNCtTKEpY4Yu5XPCcztQco6Fh6JsZ",
+        "93746e8731c57f87f79b3620a7982924e2931717d49540a85864bd543de11c43fb868fd63e501a1db37e19ed59ae6db4",
+        "yTretFTpoi3oQ3maZk5QadGaDWPiKnmDBc",
+        "0",
+        "yNbNZyCiTYSFtDwEXt7jChV7tZVYX862ua",
+        "f2dbd9b0a1f541a7c44d34a58674d0262f5feca5",
+        "[\"1.1.1.1:22000\"]",
+        "[\"1.1.1.1:22001\"]",
+        "yTG8jLL3MvteKXgbEcHyaN7JvTPCejQpSh"
+    }));
+
+    BOOST_CHECK(result[3].isArray());
+    BOOST_CHECK_EQUAL(result[3][0].get_str(), "1.1.1.1:19999");
+    BOOST_CHECK(result[10].isArray());
+    BOOST_CHECK_EQUAL(result[10][0].get_str(), "1.1.1.1:22000");
+    BOOST_CHECK(result[11].isArray());
+    BOOST_CHECK_EQUAL(result[11][0].get_str(), "1.1.1.1:22001");
+
+    // Validate that extra quotation doesn't cause string literal interpretation
+    BOOST_CHECK_NO_THROW(result = RPCConvertValues("protx", {
+        "register_prepare",
+        "6fe28c0ab6f1b372c1a6a246ae63f74f931e8365e15a089c68d6190000000000",
+        "1",
+        "\'[\"1.1.1.1:19999\",\"1.0.0.1:19999\"]\'",
+        "yhq7ifNCtTKEpY4Yu5XPCcztQco6Fh6JsZ"
+    }));
+    BOOST_CHECK(result[3].isArray());
+    BOOST_CHECK_EQUAL(result[3].size(), 2);
+    BOOST_CHECK_EQUAL(result[3][0].get_str(), "1.1.1.1:19999");
+    BOOST_CHECK_EQUAL(result[3][1].get_str(), "1.0.0.1:19999");
+
+    BOOST_CHECK_NO_THROW(result = RPCConvertValues("protx", {
+        "register_prepare",
+        "6fe28c0ab6f1b372c1a6a246ae63f74f931e8365e15a089c68d6190000000000",
+        "1",
+        "\"[\"1.1.1.1:19999\",\"1.0.0.1:19999\"]\"",
+        "yhq7ifNCtTKEpY4Yu5XPCcztQco6Fh6JsZ"
+    }));
+    BOOST_CHECK(result[3].isArray());
+    BOOST_CHECK_EQUAL(result[3].size(), 2);
+    BOOST_CHECK_EQUAL(result[3][0].get_str(), "1.1.1.1:19999");
+    BOOST_CHECK_EQUAL(result[3][1].get_str(), "1.0.0.1:19999");
+
+    // Validate parsing as string if *not* using array or object syntax
+    BOOST_CHECK_NO_THROW(result = RPCConvertValues("protx", {
+        "register_prepare",
+        "6fe28c0ab6f1b372c1a6a246ae63f74f931e8365e15a089c68d6190000000000",
+        "1",
+        "1.1.1.1:19999",
+        "yhq7ifNCtTKEpY4Yu5XPCcztQco6Fh6JsZ"
+    }));
+
+    BOOST_CHECK(!result[3].isArray());
+    BOOST_CHECK_EQUAL(result[3].get_str(), "1.1.1.1:19999");
+
+    // Empty arrays should be recognized as arrays
+    BOOST_CHECK_NO_THROW(result = RPCConvertValues("protx", {
+        "register_prepare",
+        "6fe28c0ab6f1b372c1a6a246ae63f74f931e8365e15a089c68d6190000000000",
+        "1",
+        "[]",
+        "yhq7ifNCtTKEpY4Yu5XPCcztQco6Fh6JsZ"
+    }));
+    BOOST_CHECK(result[3].isArray());
+    BOOST_CHECK(result[3].empty());
+
+    // Incomplete syntax should be interpreted as string
+    BOOST_CHECK_NO_THROW(result = RPCConvertValues("protx", {
+        "register_prepare",
+        "6fe28c0ab6f1b372c1a6a246ae63f74f931e8365e15a089c68d6190000000000",
+        "1",
+        "[",
+        "yhq7ifNCtTKEpY4Yu5XPCcztQco6Fh6JsZ"
+    }));
+    BOOST_CHECK(!result[3].isArray());
+    BOOST_CHECK_EQUAL(result[3].get_str(), "[");
+
+    // Sanity check to ensure that regular commands continue to behave as expected
+    BOOST_CHECK_NO_THROW(result = RPCConvertValues("getblockstats", {
+        "1000",
+        "[\"minfeerate\",\"avgfeerate\"]"
+    }));
+
+    BOOST_CHECK_EQUAL(result[0].getInt<int>(), 1000);
+    BOOST_CHECK(result[1].isArray());
+    BOOST_CHECK_EQUAL(result[1].size(), 2);
+    BOOST_CHECK_EQUAL(result[1][0].get_str(), "minfeerate");
+    BOOST_CHECK_EQUAL(result[1][1].get_str(), "avgfeerate");
+}
+
 BOOST_AUTO_TEST_SUITE_END()
diff --git a/test/functional/rpc_help.py b/test/functional/rpc_help.py
index 795f3856b78a..054e6a8b2e87 100755
--- a/test/functional/rpc_help.py
+++ b/test/functional/rpc_help.py
@@ -32,7 +32,7 @@ def process_mapping(fname):
                 if line.startswith('};'):
                     in_rpcs = False
                 elif '{' in line and '"' in line:
-                    m = re.search(r'{ *("[^"]*"), *([0-9]+) *, *("[^"]*") *},', line)
+                    m = re.search(r'{ *("[^"]*"), *([0-9]+) *, *("[^"]*")(?:, *(true|false))? *},', line)
                     assert m, 'No match to table expression: %s' % line
                     name = parse_string(m.group(1))
                     idx = int(m.group(2))
@@ -59,6 +59,8 @@ def test_client_conversion_table(self):
         mapping_client = process_mapping(file_conversion_table)
         # Ignore echojson in client table
         mapping_client = [m for m in mapping_client if m[0] != 'echojson']
+        # Filter out composite commands
+        mapping_client = [m for m in mapping_client if ' ' not in m[0]]
 
         mapping_server = self.nodes[0].help("dump_all_command_conversions")
         # Filter all RPCs whether they need conversion

From 0d461d19459e67ef206dc26c8ad6fb76b9a717a6 Mon Sep 17 00:00:00 2001
From: pasta <pasta@dashboost.org>
Date: Fri, 7 Nov 2025 09:16:01 -0600
Subject: [PATCH 426/656] Update FreeBSD build instructions to include
 libbacktrace as a dependency

---
 doc/build-freebsd.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/build-freebsd.md b/doc/build-freebsd.md
index 1c937f1583a9..d33629b551c8 100644
--- a/doc/build-freebsd.md
+++ b/doc/build-freebsd.md
@@ -10,7 +10,7 @@ This guide describes how to build dashd, command-line utilities, and GUI on Free
 Run the following as root to install the base dependencies for building.
 
 ```bash
-pkg install autoconf automake boost-libs git gmake libevent libtool pkgconf
+pkg install autoconf automake boost-libs git gmake libevent libtool pkgconf libbacktrace
 
 ```
 

From a30f51eda45198b258adcd3a30604113ff8a8f4e Mon Sep 17 00:00:00 2001
From: PastaPastaPasta <6443210+PastaPastaPasta@users.noreply.github.com>
Date: Fri, 7 Nov 2025 11:06:58 -0600
Subject: [PATCH 427/656] Update doc/build-unix.md

Co-authored-by: UdjinM6 <UdjinM6@users.noreply.github.com>
---
 doc/build-unix.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/doc/build-unix.md b/doc/build-unix.md
index 137073dbafa0..0489693fd5f0 100644
--- a/doc/build-unix.md
+++ b/doc/build-unix.md
@@ -61,6 +61,8 @@ Now, you can either build from self-compiled [depends](/depends/README.md) or in
 sudo apt-get install libbacktrace-dev libevent-dev libboost-dev
 ```
 
+Note: libbacktrace-dev is available in Debian 13 (Trixie) and Ubuntu 25.04+.
+For older releases, use the /depends/README.md which includes all required libraries.
 SQLite is required for the descriptor wallet:
 
 ```sh

From c31ec72352169ece01edb5e8b60134c0ba904d4a Mon Sep 17 00:00:00 2001
From: PastaPastaPasta <6443210+PastaPastaPasta@users.noreply.github.com>
Date: Fri, 7 Nov 2025 11:38:56 -0600
Subject: [PATCH 428/656] Update doc/build-unix.md

Co-authored-by: UdjinM6 <UdjinM6@users.noreply.github.com>
---
 doc/build-unix.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/doc/build-unix.md b/doc/build-unix.md
index 0489693fd5f0..d2c0b5518f23 100644
--- a/doc/build-unix.md
+++ b/doc/build-unix.md
@@ -63,6 +63,7 @@ sudo apt-get install libbacktrace-dev libevent-dev libboost-dev
 
 Note: libbacktrace-dev is available in Debian 13 (Trixie) and Ubuntu 25.04+.
 For older releases, use the /depends/README.md which includes all required libraries.
+
 SQLite is required for the descriptor wallet:
 
 ```sh

From bf07d2e85e2b14d57690ee0cf8f2da83cd857109 Mon Sep 17 00:00:00 2001
From: pasta <pasta@dashboost.org>
Date: Fri, 7 Nov 2025 11:43:41 -0600
Subject: [PATCH 429/656] Update build instructions in doc/build-unix.md to
 note the absence of libbacktrace in Fedora repositories and provide guidance
 on disabling stack traces during the build process.

---
 doc/build-unix.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/doc/build-unix.md b/doc/build-unix.md
index d2c0b5518f23..20e845a115e0 100644
--- a/doc/build-unix.md
+++ b/doc/build-unix.md
@@ -145,6 +145,8 @@ Now, you can either build from self-compiled [depends](/depends/README.md) or in
 sudo dnf install libevent-devel boost-devel
 ```
 
+Note: Fedora repositories do not include libbacktrace. To build Dash Core without stack trace support, configure with `--disable-stacktraces`.
+
 SQLite is required for the descriptor wallet:
 
 ```sh

From 8d77450bb720a9beecb8ad9adfa238ff563d04c1 Mon Sep 17 00:00:00 2001
From: pasta <pasta@dashboost.org>
Date: Sat, 8 Nov 2025 09:31:28 -0600
Subject: [PATCH 430/656] build: fix some errors when building on macOS w/o
 depends

---
 configure.ac    | 32 +++++++++++++++++++++++++++-----
 src/Makefile.am |  2 +-
 2 files changed, 28 insertions(+), 6 deletions(-)

diff --git a/configure.ac b/configure.ac
index 10898c110c8e..a4c5c4ccb92e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -396,6 +396,16 @@ fi
 
 if test "$enable_stacktraces" != no; then
   AC_CHECK_HEADERS([execinfo.h], [], [enable_stacktraces=no])
+  if test "$enable_stacktraces" != "no"; then
+    AC_CHECK_HEADERS([backtrace.h], [], [
+      if test "$enable_stacktraces" = "yes"; then
+        AC_MSG_ERROR([backtrace.h not found but --enable-stacktraces was specified. Install libbacktrace or use --disable-stacktraces.])
+      else
+        AC_MSG_WARN([backtrace.h not found. Stacktraces will be disabled.])
+        enable_stacktraces=no
+      fi
+    ])
+  fi
 fi
 
 AM_CONDITIONAL([ENABLE_STACKTRACES], [test "$enable_stacktraces" = "yes"])
@@ -892,11 +902,17 @@ case $host in
            export PKG_CONFIG_PATH="$($BREW --prefix qt@5 2>/dev/null)/lib/pkgconfig:$PKG_CONFIG_PATH"
          fi
 
-         gmp_prefix=$($BREW --prefix gmp 2>/dev/null)
-         if test "$gmp_prefix" != ""; then
-           CORE_CPPFLAGS="$CORE_CPPFLAGS -I$gmp_prefix/include"
-           CORE_LDFLAGS="$CORE_LDFLAGS -L$gmp_prefix/lib"
-         fi
+        gmp_prefix=$($BREW --prefix gmp 2>/dev/null)
+        if test "$gmp_prefix" != ""; then
+          if test "$suppress_external_warnings" != "no"; then
+            GMP_CPPFLAGS="-isystem $gmp_prefix/include"
+          else
+            GMP_CPPFLAGS="-I$gmp_prefix/include"
+          fi
+          GMP_LDFLAGS="-L$gmp_prefix/lib"
+          CORE_CPPFLAGS="$CORE_CPPFLAGS $GMP_CPPFLAGS"
+          CORE_LDFLAGS="$CORE_LDFLAGS $GMP_LDFLAGS"
+        fi
 
          case $host in
            *aarch64*)
@@ -1669,8 +1685,14 @@ if test "$use_zmq" = "yes"; then
 fi
 
 dnl check if libgmp is present
+TEMP_CPPFLAGS="$CPPFLAGS"
+TEMP_LDFLAGS="$LDFLAGS"
+CPPFLAGS="$CPPFLAGS $GMP_CPPFLAGS"
+LDFLAGS="$LDFLAGS $GMP_LDFLAGS"
 AC_CHECK_HEADER([gmp.h],, AC_MSG_ERROR(libgmp headers missing))
 AC_CHECK_LIB([gmp],  [__gmpz_init],GMP_LIBS=-lgmp, AC_MSG_ERROR(libgmp missing))
+CPPFLAGS="$TEMP_CPPFLAGS"
+LDFLAGS="$TEMP_LDFLAGS"
 
 AM_CONDITIONAL([ENABLE_ZMQ], [test "$use_zmq" = "yes"])
 
diff --git a/src/Makefile.am b/src/Makefile.am
index 9721e8e4f35e..bdfc08ce3662 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -892,7 +892,7 @@ libbitcoin_consensus_a_SOURCES = \
   version.h
 
 # common: shared between dashd, and dash-qt and non-server tools
-libbitcoin_common_a_CPPFLAGS = $(AM_CPPFLAGS) $(BITCOIN_INCLUDES)
+libbitcoin_common_a_CPPFLAGS = $(AM_CPPFLAGS) $(BITCOIN_INCLUDES) $(BOOST_CPPFLAGS)
 libbitcoin_common_a_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS)
 libbitcoin_common_a_SOURCES = \
   base58.cpp \

From 0286d78b91e1c830f8756bd5e09e348ff12b8249 Mon Sep 17 00:00:00 2001
From: Kittywhiskers Van Gogh <63189531+kwvg@users.noreply.github.com>
Date: Sat, 8 Nov 2025 03:46:04 +0530
Subject: [PATCH 431/656] depends: Qt 5.15.18

---
 depends/packages/qt.mk                   | 10 +++---
 depends/patches/qt/clang_18_libpng.patch | 40 ------------------------
 2 files changed, 4 insertions(+), 46 deletions(-)
 delete mode 100644 depends/patches/qt/clang_18_libpng.patch

diff --git a/depends/packages/qt.mk b/depends/packages/qt.mk
index e34945c49b59..fcd416ef571e 100644
--- a/depends/packages/qt.mk
+++ b/depends/packages/qt.mk
@@ -1,9 +1,9 @@
 package=qt
-$(package)_version=5.15.16
+$(package)_version=5.15.18
 $(package)_download_path=https://download.qt.io/archive/qt/5.15/$($(package)_version)/submodules
 $(package)_suffix=everywhere-opensource-src-$($(package)_version).tar.xz
 $(package)_file_name=qtbase-$($(package)_suffix)
-$(package)_sha256_hash=b04815058c18058b6ba837206756a2c87d1391f07a0dcb0dd314f970fd041592
+$(package)_sha256_hash=7b632550ea1048fc10c741e46e2e3b093e5ca94dfa6209e9e0848800e247023b
 $(package)_linux_dependencies=freetype fontconfig libxcb libxkbcommon libxcb_util libxcb_util_render libxcb_util_keysyms libxcb_util_image libxcb_util_wm
 $(package)_qt_libs=corelib network widgets gui plugins testlib
 $(package)_linguist_tools = lrelease lupdate lconvert
@@ -20,16 +20,15 @@ $(package)_patches += rcc_hardcode_timestamp.patch
 $(package)_patches += duplicate_lcqpafonts.patch
 $(package)_patches += guix_cross_lib_path.patch
 $(package)_patches += memory_resource.patch
-$(package)_patches += clang_18_libpng.patch
 $(package)_patches += utc_from_string_no_optimize.patch
 $(package)_patches += windows_lto.patch
 $(package)_patches += darwin_no_libm.patch
 
 $(package)_qttranslations_file_name=qttranslations-$($(package)_suffix)
-$(package)_qttranslations_sha256_hash=415dbbb82a75dfc9a7be969e743bee54c0e6867be37bce4cf8f03da39f20112a
+$(package)_qttranslations_sha256_hash=e5625757913caf66a9d702ba102ae92cb165d8dde17759b6de9fdea84a1f857f
 
 $(package)_qttools_file_name=qttools-$($(package)_suffix)
-$(package)_qttools_sha256_hash=1cab11887faca54af59f4995ee435c9ad98d194e9e6889c846692c8b6815fc1c
+$(package)_qttools_sha256_hash=931e0969d9f9d8f233e5e9bf9db0cea9ce9914d49982f1795fe6191010113568
 
 $(package)_extra_sources  = $($(package)_qttranslations_file_name)
 $(package)_extra_sources += $($(package)_qttools_file_name)
@@ -247,7 +246,6 @@ define $(package)_preprocess_cmds
   patch -p1 -i $($(package)_patch_dir)/qtbase-moc-ignore-gcc-macro.patch && \
   patch -p1 -i $($(package)_patch_dir)/memory_resource.patch && \
   patch -p1 -i $($(package)_patch_dir)/no_warnings_for_symbols.patch && \
-  patch -p1 -i $($(package)_patch_dir)/clang_18_libpng.patch && \
   patch -p1 -i $($(package)_patch_dir)/rcc_hardcode_timestamp.patch && \
   patch -p1 -i $($(package)_patch_dir)/duplicate_lcqpafonts.patch && \
   patch -p1 -i $($(package)_patch_dir)/utc_from_string_no_optimize.patch && \
diff --git a/depends/patches/qt/clang_18_libpng.patch b/depends/patches/qt/clang_18_libpng.patch
deleted file mode 100644
index e807905b321a..000000000000
--- a/depends/patches/qt/clang_18_libpng.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-fix Qt macOS build with Clang 18
-
-    See:
-    https://github.com/pnggroup/libpng/commit/893b8113f04d408cc6177c6de19c9889a48faa24.
-
-    In a similar manner as zlib (madler/zlib#895),
-    libpng contains a header configuration that's no longer valid and
-    hasn't been exercised for the macOS target.
-
-    - The target OS conditional macros are misused. Specifically
-      `TARGET_OS_MAC` covers all Apple targets, including iOS, and it
-      should not be checked with `#if defined` as they would always be
-      defined (to either 1 or 0) on Apple platforms.
-    - `#include <fp.h>` no longer works for the macOS target and results
-      in a compilation failure. macOS ships all required functions in
-      `math.h`, and clients should use `math.h` instead.
-
---- a/qtbase/src/3rdparty/libpng/pngpriv.h
-+++ b/qtbase/src/3rdparty/libpng/pngpriv.h
-@@ -514,18 +514,8 @@
-     */
- #  include <float.h>
- 
--#  if (defined(__MWERKS__) && defined(macintosh)) || defined(applec) || \
--    defined(THINK_C) || defined(__SC__) || defined(TARGET_OS_MAC)
--   /* We need to check that <math.h> hasn't already been included earlier
--    * as it seems it doesn't agree with <fp.h>, yet we should really use
--    * <fp.h> if possible.
--    */
--#    if !defined(__MATH_H__) && !defined(__MATH_H) && !defined(__cmath__)
--#      include <fp.h>
--#    endif
--#  else
--#    include <math.h>
--#  endif
-+#  include <math.h>
-+
- #  if defined(_AMIGA) && defined(__SASC) && defined(_M68881)
-    /* Amiga SAS/C: We must include builtin FPU functions when compiling using
-     * MATH=68881

From 5046964dbd34478e939eb0ea7592a4ea97214cb6 Mon Sep 17 00:00:00 2001
From: Kittywhiskers Van Gogh <63189531+kwvg@users.noreply.github.com>
Date: Sat, 8 Nov 2025 03:46:21 +0530
Subject: [PATCH 432/656] depends: add patches included with Qt 5.15.19

---
 depends/packages/qt.mk                        |   6 +
 .../qt/CVE-2025-30348-qtbase-5.15.patch       | 156 ++++++++++++++++++
 .../qt/CVE-2025-4211-qtbase-5.15.patch        |  61 +++++++
 .../qt/CVE-2025-5455-qtbase-5.15.patch        |  20 +++
 4 files changed, 243 insertions(+)
 create mode 100644 depends/patches/qt/CVE-2025-30348-qtbase-5.15.patch
 create mode 100644 depends/patches/qt/CVE-2025-4211-qtbase-5.15.patch
 create mode 100644 depends/patches/qt/CVE-2025-5455-qtbase-5.15.patch

diff --git a/depends/packages/qt.mk b/depends/packages/qt.mk
index fcd416ef571e..6c8eb44984f2 100644
--- a/depends/packages/qt.mk
+++ b/depends/packages/qt.mk
@@ -23,6 +23,9 @@ $(package)_patches += memory_resource.patch
 $(package)_patches += utc_from_string_no_optimize.patch
 $(package)_patches += windows_lto.patch
 $(package)_patches += darwin_no_libm.patch
+$(package)_patches += CVE-2025-4211-qtbase-5.15.patch
+$(package)_patches += CVE-2025-5455-qtbase-5.15.patch
+$(package)_patches += CVE-2025-30348-qtbase-5.15.patch
 
 $(package)_qttranslations_file_name=qttranslations-$($(package)_suffix)
 $(package)_qttranslations_sha256_hash=e5625757913caf66a9d702ba102ae92cb165d8dde17759b6de9fdea84a1f857f
@@ -252,6 +255,9 @@ define $(package)_preprocess_cmds
   patch -p1 -i $($(package)_patch_dir)/guix_cross_lib_path.patch && \
   patch -p1 -i $($(package)_patch_dir)/windows_lto.patch && \
   patch -p1 -i $($(package)_patch_dir)/darwin_no_libm.patch && \
+  patch -p1 -i $($(package)_patch_dir)/CVE-2025-4211-qtbase-5.15.patch && \
+  patch -p1 -i $($(package)_patch_dir)/CVE-2025-5455-qtbase-5.15.patch && \
+  patch -p1 -i $($(package)_patch_dir)/CVE-2025-30348-qtbase-5.15.patch && \
   mkdir -p qtbase/mkspecs/macx-clang-linux &&\
   cp -f qtbase/mkspecs/macx-clang/qplatformdefs.h qtbase/mkspecs/macx-clang-linux/ &&\
   cp -f $($(package)_patch_dir)/mac-qmake.conf qtbase/mkspecs/macx-clang-linux/qmake.conf && \
diff --git a/depends/patches/qt/CVE-2025-30348-qtbase-5.15.patch b/depends/patches/qt/CVE-2025-30348-qtbase-5.15.patch
new file mode 100644
index 000000000000..b13574f3ba27
--- /dev/null
+++ b/depends/patches/qt/CVE-2025-30348-qtbase-5.15.patch
@@ -0,0 +1,156 @@
+From 16918c1df3e709df2a97281e3825d94c84edb668 Mon Sep 17 00:00:00 2001
+From: Christian Ehrlicher <ch.ehrlicher@gmx.de>
+Date: Tue, 06 Aug 2024 22:39:44 +0200
+Subject: [PATCH] XML/QDom: speedup encodeText()
+
+The code copied the whole string, then replaced parts inline, at
+the cost of relocating everything beyond, at each replacement.
+Instead, copy character by character (in chunks where possible)
+and append replacements as we skip what they replace.
+
+Manual conflict resolution for 6.5:
+- This is a manual cherry-pick. The original change was only
+  picked to 6.8, but the quadratic behavior is present in Qt 5, too.
+- Changed Task-number to Fixes: because this is the real fix;
+  the QString change, 315210de916d060c044c01e53ff249d676122b1b,
+  was unrelated to the original QTBUG-127549.
+
+Manual conflcit resolution for 5.15:
+- Kept/re-added QTextCodec::canEncode() check
+- Ported from Qt 6 to 5, to wit:
+  - qsizetype -> int
+  - QStringView::first/sliced(n) -> left/mid(n)
+    (these functions are clearly called in-range, so the widened
+    contract of the Qt 5 functions doesn't matter)
+- Ported from C++17- and C++14-isms to C++11:
+  - replaced polymorphic lambda with a normal one (this requires
+    rewriting the !canEncode() branch to use QByteArray/QLatin1String
+    instead of QString)
+- As a drive-by, corrected the indentation of the case labels to
+  horizontally align existing code (and follow Qt style)
+
+Fixes: QTBUG-127549
+Change-Id: I368482859ed0c4127f1eec2919183711b5488ada
+Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
+(cherry picked from commit 2ce08e3671b8d18b0284447e5908ce15e6e8f80f)
+Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
+(cherry picked from commit 225e235cf966a44af23dbe9aaaa2fd20ab6430ee)
+Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
+(cherry picked from commit 905a5bd421efff6a1d90b6140500d134d32ca745)
+---
+
+diff --git a/qtbase/src/xml/dom/qdom.cpp b/qtbase/src/xml/dom/qdom.cpp
+index 872221c..bf70477 100644
+--- a/qtbase/src/xml/dom/qdom.cpp
++++ b/qtbase/src/xml/dom/qdom.cpp
+@@ -3676,59 +3676,67 @@
+     const QTextCodec *const codec = s.codec();
+     Q_ASSERT(codec);
+ #endif
+-    QString retval(str);
+-    int len = retval.length();
+-    int i = 0;
++    QString retval;
++    int start = 0;
++    auto appendToOutput = [&](int cur, QLatin1String replacement)
++    {
++        if (start < cur) {
++            retval.reserve(str.size() + replacement.size());
++            retval.append(QStringView(str).left(cur).mid(start));
++        }
++        // Skip over str[cur], replaced by replacement
++        start = cur + 1;
++        retval.append(replacement);
++    };
+ 
+-    while (i < len) {
+-        const QChar ati(retval.at(i));
+-
+-        if (ati == QLatin1Char('<')) {
+-            retval.replace(i, 1, QLatin1String("&lt;"));
+-            len += 3;
+-            i += 4;
+-        } else if (encodeQuotes && (ati == QLatin1Char('"'))) {
+-            retval.replace(i, 1, QLatin1String("&quot;"));
+-            len += 5;
+-            i += 6;
+-        } else if (ati == QLatin1Char('&')) {
+-            retval.replace(i, 1, QLatin1String("&amp;"));
+-            len += 4;
+-            i += 5;
+-        } else if (ati == QLatin1Char('>') && i >= 2 && retval[i - 1] == QLatin1Char(']') && retval[i - 2] == QLatin1Char(']')) {
+-            retval.replace(i, 1, QLatin1String("&gt;"));
+-            len += 3;
+-            i += 4;
+-        } else if (performAVN &&
+-                   (ati == QChar(0xA) ||
+-                    ati == QChar(0xD) ||
+-                    ati == QChar(0x9))) {
+-            const QString replacement(QLatin1String("&#x") + QString::number(ati.unicode(), 16) + QLatin1Char(';'));
+-            retval.replace(i, 1, replacement);
+-            i += replacement.length();
+-            len += replacement.length() - 1;
+-        } else if (encodeEOLs && ati == QChar(0xD)) {
+-            retval.replace(i, 1, QLatin1String("&#xd;")); // Replace a single 0xD with a ref for 0xD
+-            len += 4;
+-            i += 5;
+-        } else {
++    const int len = str.size();
++    for (int cur = 0; cur < len; ++cur) {
++        switch (const char16_t ati = str[cur].unicode()) {
++        case u'<':
++            appendToOutput(cur, QLatin1String("&lt;"));
++            break;
++        case u'"':
++            if (encodeQuotes)
++                appendToOutput(cur, QLatin1String("&quot;"));
++            break;
++        case u'&':
++            appendToOutput(cur, QLatin1String("&amp;"));
++            break;
++        case u'>':
++            if (cur >= 2 && str[cur - 1] == u']' && str[cur - 2] == u']')
++                appendToOutput(cur, QLatin1String("&gt;"));
++            break;
++        case u'\r':
++            if (performAVN || encodeEOLs)
++                appendToOutput(cur, QLatin1String("&#xd;"));    // \r == 0x0d
++            break;
++        case u'\n':
++            if (performAVN)
++                appendToOutput(cur, QLatin1String("&#xa;"));    // \n == 0x0a
++            break;
++        case u'\t':
++            if (performAVN)
++                appendToOutput(cur, QLatin1String("&#x9;"));    // \t == 0x09
++            break;
++        default:
+ #if QT_CONFIG(textcodec)
+             if(codec->canEncode(ati))
+-                ++i;
++                ; // continue
+             else
+ #endif
+             {
+                 // We have to use a character reference to get it through.
+-                const ushort codepoint(ati.unicode());
+-                const QString replacement(QLatin1String("&#x") + QString::number(codepoint, 16) + QLatin1Char(';'));
+-                retval.replace(i, 1, replacement);
+-                i += replacement.length();
+-                len += replacement.length() - 1;
++                const QByteArray replacement = "&#x" + QByteArray::number(uint{ati}, 16) + ';';
++                appendToOutput(cur, QLatin1String{replacement});
+             }
++            break;
+         }
+     }
+-
+-    return retval;
++    if (start > 0) {
++        retval.append(QStringView(str).left(len).mid(start));
++        return retval;
++    }
++    return str;
+ }
+ 
+ void QDomAttrPrivate::save(QTextStream& s, int, int) const
diff --git a/depends/patches/qt/CVE-2025-4211-qtbase-5.15.patch b/depends/patches/qt/CVE-2025-4211-qtbase-5.15.patch
new file mode 100644
index 000000000000..0682ed28b61c
--- /dev/null
+++ b/depends/patches/qt/CVE-2025-4211-qtbase-5.15.patch
@@ -0,0 +1,61 @@
+From 3d20cd0105c2ae06605c5078e7675e200f1a001a Mon Sep 17 00:00:00 2001
+From: Mårten Nordheim <marten.nordheim@qt.io>
+Date: Mon, 17 Mar 2025 14:22:11 +0100
+Subject: [PATCH] QFileSystemEngine/Win: Use GetTempPath2 when available
+
+Because the documentation for GetTempPath nows says apps should call
+GetTempPath2.[0]
+
+Starting with Windows 11[1], and recently Windows 10[2],
+GetTempPath2 was added. The difference being that elevated
+processes are returned a different directory. Usually
+'C:\Windows\SystemTemp'.
+
+Currently temporary files of an elevated process may be placed in a
+world write-able location. GetTempPath2, by default, but can be
+overridden, places it in a directory that's only accessible by SYSTEM
+and administrators.
+
+[0] https://learn.microsoft.com/en-us/windows/win32/api/fileapi/nf-fileapi-gettemppathw#remarks
+[1] https://learn.microsoft.com/en-us/windows/win32/api/fileapi/nf-fileapi-gettemppath2w
+(Minimum supported client - Windows 11 Build 22000)
+[2] https://blogs.windows.com/windows-insider/2025/03/13/releasing-windows-10-build-19045-5674-to-the-release-preview-channel/
+(This update enables system processes to store temporary files ...)
+
+[ChangeLog][QtCore][Important Behavior Changes] On
+Windows, generating temporary directories for processes with elevated
+privileges may now return a different path with a stricter
+set of permissions. Please consult Microsoft's documentation from when
+they made the same change for the .NET framework:
+https://support.microsoft.com/en-us/topic/gettemppath-changes-in-windows-february-cumulative-update-preview-4cc631fb-9d97-4118-ab6d-f643cd0a7259
+
+Change-Id: I5caf11151fb2f711bbc5599231f140598b3c9d03
+Reviewed-by: Marc Mutz <marc.mutz@qt.io>
+(cherry picked from commit 69633bcb58e681bac5bff3744e5a2352788dc36c)
+Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
+(cherry picked from commit 6a684a53b371ec483b27bf243af24819be63f85f)
+(cherry picked from commit bbeccc0c22e520f46f0b33e281fa5ac85ac9c727)
+(cherry picked from commit 59d7eb9bbb4f13cccbd9323fd995a8c108b56e60)
+---
+
+diff --git a/qtbase/src/corelib/io/qfilesystemengine_win.cpp b/qtbase/src/corelib/io/qfilesystemengine_win.cpp
+index 75c661f..37a400f 100644
+--- a/qtbase/src/corelib/io/qfilesystemengine_win.cpp
++++ b/qtbase/src/corelib/io/qfilesystemengine_win.cpp
+@@ -1390,7 +1390,15 @@
+     QString ret;
+ #ifndef Q_OS_WINRT
+     wchar_t tempPath[MAX_PATH];
+-    const DWORD len = GetTempPath(MAX_PATH, tempPath);
++    using GetTempPathPrototype = DWORD (WINAPI *)(DWORD, LPWSTR);
++    // We try to resolve GetTempPath2 and use that, otherwise fall back to GetTempPath:
++    static GetTempPathPrototype getTempPathW = []() {
++        const HMODULE kernel32 = GetModuleHandleW(L"kernel32.dll");
++        if (auto *func = QFunctionPointer(GetProcAddress(kernel32, "GetTempPath2W")))
++            return GetTempPathPrototype(func);
++        return GetTempPath;
++    }();
++    const DWORD len = getTempPathW(MAX_PATH, tempPath);
+     if (len) { // GetTempPath() can return short names, expand.
+         wchar_t longTempPath[MAX_PATH];
+         const DWORD longLen = GetLongPathName(tempPath, longTempPath, MAX_PATH);
diff --git a/depends/patches/qt/CVE-2025-5455-qtbase-5.15.patch b/depends/patches/qt/CVE-2025-5455-qtbase-5.15.patch
new file mode 100644
index 000000000000..352be5e20266
--- /dev/null
+++ b/depends/patches/qt/CVE-2025-5455-qtbase-5.15.patch
@@ -0,0 +1,20 @@
+diff --git a/qtbase/src/corelib/io/qdataurl.cpp b/qtbase/src/corelib/io/qdataurl.cpp
+index f14d399301f..83e59e3ac00 100644
+--- a/qtbase/src/corelib/io/qdataurl.cpp
++++ b/qtbase/src/corelib/io/qdataurl.cpp
+@@ -76,10 +76,11 @@ Q_CORE_EXPORT bool qDecodeDataUrl(const QUrl &uri, QString &mimeType, QByteArray
+         }
+ 
+         if (data.toLower().startsWith("charset")) {
+-            int i = 7;      // strlen("charset")
+-            while (data.at(i) == ' ')
+-                ++i;
+-            if (data.at(i) == '=')
++            int prefixSize = 7; // strlen("charset")
++            QLatin1String copy(data.constData() + prefixSize, data.size() - prefixSize);
++            while (copy.startsWith(QLatin1String(" ")))
++                copy = copy.mid(1);
++            if (copy.startsWith(QLatin1String("=")))
+                 data.prepend("text/plain;");
+         }
+ 

From 04b647f523c3218c7aa623deca23fe60beec1511 Mon Sep 17 00:00:00 2001
From: Kittywhiskers Van Gogh <63189531+kwvg@users.noreply.github.com>
Date: Mon, 10 Nov 2025 20:55:32 +0530
Subject: [PATCH 433/656] doc: update `dependencies.md`

---
 doc/dependencies.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/dependencies.md b/doc/dependencies.md
index 62bce5999fa1..6a55eaba416e 100644
--- a/doc/dependencies.md
+++ b/doc/dependencies.md
@@ -33,7 +33,7 @@ You can find installation instructions in the `build-*.md` file for your platfor
 | [Fontconfig](../depends/packages/fontconfig.mk) | [link](https://www.freedesktop.org/wiki/Software/fontconfig/) | [2.12.6](https://github.com/bitcoin/bitcoin/pull/23495) | 2.6 | Yes |
 | [FreeType](../depends/packages/freetype.mk) | [link](https://freetype.org) | [2.11.0](https://github.com/bitcoin/bitcoin/commit/01544dd78ccc0b0474571da854e27adef97137fb) | 2.3.0 | Yes |
 | [qrencode](../depends/packages/qrencode.mk) | [link](https://fukuchi.org/works/qrencode/) | [4.1.1](https://github.com/bitcoin/bitcoin/pull/27312) | | No |
-| [Qt](../depends/packages/qt.mk) | [link](https://download.qt.io/official_releases/qt/) | [5.15.16](https://github.com/bitcoin/bitcoin/pull/30774) | [5.11.3](https://github.com/bitcoin/bitcoin/pull/24132) | No |
+| [Qt](../depends/packages/qt.mk) | [link](https://download.qt.io/official_releases/qt/) | [5.15.18](https://github.com/dashpay/dash/pull/6949) | [5.11.3](https://github.com/bitcoin/bitcoin/pull/24132) | No |
 
 ### Networking
 | Dependency | Releases | Version used | Minimum required | Runtime |

From 2834aecf00a368f82b65de52714ba8a4a4557dbb Mon Sep 17 00:00:00 2001
From: PastaPastaPasta <6443210+PastaPastaPasta@users.noreply.github.com>
Date: Mon, 10 Nov 2025 09:55:46 -0600
Subject: [PATCH 434/656] fix: improve libbacktrace detection

Co-authored-by: UdjinM6 <UdjinM6@users.noreply.github.com>
---
 configure.ac | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/configure.ac b/configure.ac
index a4c5c4ccb92e..f6653d3ead04 100644
--- a/configure.ac
+++ b/configure.ac
@@ -394,18 +394,22 @@ else
     fi
 fi
 
-if test "$enable_stacktraces" != no; then
-  AC_CHECK_HEADERS([execinfo.h], [], [enable_stacktraces=no])
-  if test "$enable_stacktraces" != "no"; then
+if test "$enable_stacktraces" != "no"; then
+  AC_CHECK_HEADERS([execinfo.h], [
     AC_CHECK_HEADERS([backtrace.h], [], [
       if test "$enable_stacktraces" = "yes"; then
         AC_MSG_ERROR([backtrace.h not found but --enable-stacktraces was specified. Install libbacktrace or use --disable-stacktraces.])
-      else
-        AC_MSG_WARN([backtrace.h not found. Stacktraces will be disabled.])
-        enable_stacktraces=no
       fi
+      AC_MSG_WARN([backtrace.h not found. Stacktraces will be disabled.])
+      enable_stacktraces=no
     ])
-  fi
+  ], [
+    if test "$enable_stacktraces" = "yes"; then
+      AC_MSG_ERROR([execinfo.h not found but --enable-stacktraces was specified. Stacktraces require execinfo.h. Use --disable-stacktraces.])
+    fi
+    AC_MSG_WARN([execinfo.h not found. Stacktraces will be disabled.])
+    enable_stacktraces=no
+  ])
 fi
 
 AM_CONDITIONAL([ENABLE_STACKTRACES], [test "$enable_stacktraces" = "yes"])

From df6cc7628a5fc4ddc1e193c03267baff49562cd4 Mon Sep 17 00:00:00 2001
From: pasta <pasta@dashboost.org>
Date: Mon, 10 Nov 2025 13:58:34 -0600
Subject: [PATCH 435/656] feat: rework message processing in CNode to
 prioritize quorum messages

This update introduces a new queue for quorum-priority messages, allowing for better handling of critical network messages. The `MarkReceivedMsgsForProcessing` function now classifies incoming messages into quorum and normal queues, while the `PollMessage` function prioritizes messages from the quorum queue when available. This change enhances the efficiency of message processing and ensures that important messages are handled promptly.
---
 src/net.cpp | 47 +++++++++++++++++++++++++++++++++++++++--------
 src/net.h   | 22 ++++++++++++++++++++++
 2 files changed, 61 insertions(+), 8 deletions(-)

diff --git a/src/net.cpp b/src/net.cpp
index 7c120ff66833..2871e3bf605d 100644
--- a/src/net.cpp
+++ b/src/net.cpp
@@ -4652,31 +4652,62 @@ void CNode::MarkReceivedMsgsForProcessing()
 {
     AssertLockNotHeld(m_msg_process_queue_mutex);
 
-    size_t nSizeAdded = 0;
-    for (const auto& msg : vRecvMsg) {
+    size_t nQuorumSizeAdded = 0;
+    size_t nNormalSizeAdded = 0;
+    std::list<CNetMessage> quorumMsgs;
+    std::list<CNetMessage> normalMsgs;
+
+    // Classify messages into quorum-priority and normal queues
+    for (auto it = vRecvMsg.begin(); it != vRecvMsg.end();) {
+        auto& msg = *it;
         // vRecvMsg contains only completed CNetMessage
         // the single possible partially deserialized message are held by TransportDeserializer
-        nSizeAdded += msg.m_raw_message_size;
+        if (IsQuorumPriorityMessage(msg.m_type)) {
+            quorumMsgs.splice(quorumMsgs.end(), vRecvMsg, it++);
+            nQuorumSizeAdded += msg.m_raw_message_size;
+        } else {
+            normalMsgs.splice(normalMsgs.end(), vRecvMsg, it++);
+            nNormalSizeAdded += msg.m_raw_message_size;
+        }
     }
 
     LOCK(m_msg_process_queue_mutex);
-    m_msg_process_queue.splice(m_msg_process_queue.end(), vRecvMsg);
-    m_msg_process_queue_size += nSizeAdded;
-    fPauseRecv = m_msg_process_queue_size > m_recv_flood_size;
+    // Splice classified messages into appropriate queues
+    m_msg_quorum_queue.splice(m_msg_quorum_queue.end(), quorumMsgs);
+    m_msg_quorum_queue_size += nQuorumSizeAdded;
+    m_msg_process_queue.splice(m_msg_process_queue.end(), normalMsgs);
+    m_msg_process_queue_size += nNormalSizeAdded;
+    // Compute backpressure over combined size of both queues
+    fPauseRecv = (m_msg_quorum_queue_size + m_msg_process_queue_size) > m_recv_flood_size;
 }
 
 std::optional<std::pair<CNetMessage, bool>> CNode::PollMessage()
 {
     LOCK(m_msg_process_queue_mutex);
+    
+    // Prioritize quorum queue: pop from it first if non-empty
+    if (!m_msg_quorum_queue.empty()) {
+        std::list<CNetMessage> msgs;
+        // Just take one message from quorum queue
+        msgs.splice(msgs.begin(), m_msg_quorum_queue, m_msg_quorum_queue.begin());
+        m_msg_quorum_queue_size -= msgs.front().m_raw_message_size;
+        // Compute backpressure over combined size of both queues
+        fPauseRecv = (m_msg_quorum_queue_size + m_msg_process_queue_size) > m_recv_flood_size;
+        // Return true for 'more' if either queue has remaining messages
+        return std::make_pair(std::move(msgs.front()), !m_msg_quorum_queue.empty() || !m_msg_process_queue.empty());
+    }
+    
+    // Fall back to normal queue if quorum queue is empty
     if (m_msg_process_queue.empty()) return std::nullopt;
 
     std::list<CNetMessage> msgs;
     // Just take one message
     msgs.splice(msgs.begin(), m_msg_process_queue, m_msg_process_queue.begin());
     m_msg_process_queue_size -= msgs.front().m_raw_message_size;
-    fPauseRecv = m_msg_process_queue_size > m_recv_flood_size;
+    // Compute backpressure over combined size of both queues
+    fPauseRecv = (m_msg_quorum_queue_size + m_msg_process_queue_size) > m_recv_flood_size;
 
-    return std::make_pair(std::move(msgs.front()), !m_msg_process_queue.empty());
+    return std::make_pair(std::move(msgs.front()), !m_msg_quorum_queue.empty() || !m_msg_process_queue.empty());
 }
 
 bool CConnman::NodeFullyConnected(const CNode* pnode)
diff --git a/src/net.h b/src/net.h
index b2e457fef01d..7d2ed393494f 100644
--- a/src/net.h
+++ b/src/net.h
@@ -1094,6 +1094,8 @@ class CNode
     Mutex m_msg_process_queue_mutex;
     std::list<CNetMessage> m_msg_process_queue GUARDED_BY(m_msg_process_queue_mutex);
     size_t m_msg_process_queue_size GUARDED_BY(m_msg_process_queue_mutex){0};
+    std::list<CNetMessage> m_msg_quorum_queue GUARDED_BY(m_msg_process_queue_mutex);
+    size_t m_msg_quorum_queue_size GUARDED_BY(m_msg_process_queue_mutex){0};
 
     // Our address, as reported by the peer
     CService addrLocal GUARDED_BY(m_addr_local_mutex);
@@ -2002,4 +2004,24 @@ class CExplicitNetCleanup
     static void callCleanup();
 };
 
+// Helper function to determine if a message type should be prioritized in the quorum queue
+inline bool IsQuorumPriorityMessage(const std::string& msg_type)
+{
+    // LLMQ signing/data messages
+    if (msg_type == NetMsgType::QSIGSHARE ||
+        msg_type == NetMsgType::QBSIGSHARES ||
+        msg_type == NetMsgType::QSIGSHARESINV ||
+        msg_type == NetMsgType::QGETSIGSHARES ||
+        msg_type == NetMsgType::QSIGSESANN ||
+        msg_type == NetMsgType::QSIGREC) {
+        return true;
+    }
+    // High-level lock messages (ChainLocks, InstantSend locks)
+    if (msg_type == NetMsgType::CLSIG ||
+        msg_type == NetMsgType::ISDLOCK) {
+        return true;
+    }
+    return false;
+}
+
 #endif // BITCOIN_NET_H

From 6c955b7e698bf870abddd69d70b22903e2c6273d Mon Sep 17 00:00:00 2001
From: pasta <pasta@dashboost.org>
Date: Mon, 10 Nov 2025 14:02:41 -0600
Subject: [PATCH 436/656] fix: whitespace

---
 src/net.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/net.cpp b/src/net.cpp
index 2871e3bf605d..4c70bf9f2c37 100644
--- a/src/net.cpp
+++ b/src/net.cpp
@@ -4684,7 +4684,7 @@ void CNode::MarkReceivedMsgsForProcessing()
 std::optional<std::pair<CNetMessage, bool>> CNode::PollMessage()
 {
     LOCK(m_msg_process_queue_mutex);
-    
+
     // Prioritize quorum queue: pop from it first if non-empty
     if (!m_msg_quorum_queue.empty()) {
         std::list<CNetMessage> msgs;
@@ -4696,7 +4696,7 @@ std::optional<std::pair<CNetMessage, bool>> CNode::PollMessage()
         // Return true for 'more' if either queue has remaining messages
         return std::make_pair(std::move(msgs.front()), !m_msg_quorum_queue.empty() || !m_msg_process_queue.empty());
     }
-    
+
     // Fall back to normal queue if quorum queue is empty
     if (m_msg_process_queue.empty()) return std::nullopt;
 

From f860031130ad08f749fd48af21b844c5576af0a9 Mon Sep 17 00:00:00 2001
From: Konstantin Akimov <knstqq@gmail.com>
Date: Tue, 11 Nov 2025 02:54:41 +0700
Subject: [PATCH 437/656] refactoring: apply code review suggestions

Co-Authored-By: UdjinM6 <UdjinM6@users.noreply.github.com>
---
 src/masternode/meta.cpp | 12 +++++-------
 src/masternode/meta.h   |  3 +--
 2 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/src/masternode/meta.cpp b/src/masternode/meta.cpp
index fa69d53eebd4..a0b98b4d0591 100644
--- a/src/masternode/meta.cpp
+++ b/src/masternode/meta.cpp
@@ -14,7 +14,7 @@ static constexpr int MASTERNODE_MAX_FAILED_OUTBOUND_ATTEMPTS{5};
 static constexpr int MASTERNODE_MAX_MIXING_TXES{5};
 
 namespace {
-static const CMasternodeMetaInfo default_meta_info_meta_info{};
+static const CMasternodeMetaInfo default_meta_info{};
 } // anonymous namespace
 
 CMasternodeMetaMan::CMasternodeMetaMan() :
@@ -70,7 +70,7 @@ void CMasternodeMetaInfo::RemoveGovernanceObject(const uint256& nGovernanceObjec
 const CMasternodeMetaInfo& CMasternodeMetaMan::GetMetaInfoOrDefault(const uint256& protx_hash) const
 {
     const auto it = metaInfos.find(protx_hash);
-    if (it == metaInfos.end()) return default_meta_info_meta_info;
+    if (it == metaInfos.end()) return default_meta_info;
     return it->second;
 }
 
@@ -109,11 +109,9 @@ bool CMasternodeMetaMan::IsDsqOver(const uint256& protx_hash, int mn_count) cons
 
 void CMasternodeMetaMan::AllowMixing(const uint256& proTxHash)
 {
-    nDsqCount++;
-
     LOCK(cs);
     auto& mm = GetMetaInfo(proTxHash);
-    mm.m_last_dsq = nDsqCount.load();
+    mm.m_last_dsq = ++nDsqCount;
     mm.m_mixing_tx_count = 0;
 }
 
@@ -138,8 +136,8 @@ void CMasternodeMetaMan::AddGovernanceVote(const uint256& proTxHash, const uint2
 void CMasternodeMetaMan::RemoveGovernanceObject(const uint256& nGovernanceObjectHash)
 {
     LOCK(cs);
-    for (auto& p : metaInfos) {
-        p.second.RemoveGovernanceObject(nGovernanceObjectHash);
+    for (auto& [_, meta_info] : metaInfos) {
+        meta_info.RemoveGovernanceObject(nGovernanceObjectHash);
     }
 }
 
diff --git a/src/masternode/meta.h b/src/masternode/meta.h
index ac031da49251..7d82b3b21df4 100644
--- a/src/masternode/meta.h
+++ b/src/masternode/meta.h
@@ -13,7 +13,6 @@
 #include <uint256.h>
 #include <unordered_lru_cache.h>
 
-#include <atomic>
 #include <deque>
 #include <map>
 #include <optional>
@@ -93,7 +92,7 @@ class MasternodeMetaStore
     mutable Mutex cs;
     std::map<uint256, CMasternodeMetaInfo> metaInfos GUARDED_BY(cs);
     // keep track of dsq count to prevent masternodes from gaming coinjoin queue
-    std::atomic<int64_t> nDsqCount{0};
+    int64_t nDsqCount{0};
     // keep track of the used Masternodes for CoinJoin across all wallets
     // Using deque for efficient FIFO removal and unordered_set for O(1) lookups
     std::deque<uint256> m_used_masternodes GUARDED_BY(cs);

From 982b68e4c060dfc587433d77e902eaac3032a7c6 Mon Sep 17 00:00:00 2001
From: Konstantin Akimov <knstqq@gmail.com>
Date: Tue, 11 Nov 2025 03:11:48 +0700
Subject: [PATCH 438/656] fix: usage of ResetPlatformBan in
 CDeterministicMNList

Co-Authored-By: UdjinM6 <UdjinM6@users.noreply.github.com>
---
 src/evo/deterministicmns.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/evo/deterministicmns.cpp b/src/evo/deterministicmns.cpp
index 75678cb6c709..59c2182ce6fc 100644
--- a/src/evo/deterministicmns.cpp
+++ b/src/evo/deterministicmns.cpp
@@ -676,7 +676,7 @@ bool CDeterministicMNManager::ProcessBlock(const CBlock& block, gsl::not_null<co
             const auto opt_proTx = GetTxPayload<CProUpServTx>(tx);
             if (!opt_proTx) continue; // should not happen but does not matter
 
-            if (m_mn_metaman.ResetPlatformBan(opt_proTx->proTxHash, nHeight)) {
+            if (!m_mn_metaman.ResetPlatformBan(opt_proTx->proTxHash, nHeight)) {
                 LogPrint(BCLog::LLMQ, "%s -- MN %s is failed to Platform revived at height %d\n", __func__,
                          opt_proTx->proTxHash.ToString(), nHeight);
             }

From 88327756f6b750fe02eaa8d2207f8916b3afcd07 Mon Sep 17 00:00:00 2001
From: pasta <pasta@dashboost.org>
Date: Mon, 10 Nov 2025 16:37:57 -0600
Subject: [PATCH 439/656] feat: convert CSigSharesManager to use Mutex instead
 of RecursiveMutex

 update lock requirements for various methods. This change enhances thread safety and simplifies locking semantics throughout the class.
---
 src/llmq/signing_shares.h | 69 +++++++++++++++++++--------------------
 1 file changed, 33 insertions(+), 36 deletions(-)

diff --git a/src/llmq/signing_shares.h b/src/llmq/signing_shares.h
index 14e20edce459..bce6f07bf3fe 100644
--- a/src/llmq/signing_shares.h
+++ b/src/llmq/signing_shares.h
@@ -376,7 +376,7 @@ class CSigSharesManager : public CRecoveredSigsListener
     static constexpr int64_t MAX_SEND_FOR_RECOVERY_TIMEOUT{10000};
     static constexpr size_t MAX_MSGS_SIG_SHARES{32};
 
-    RecursiveMutex cs;
+    Mutex cs;
 
     std::thread workThread;
     CThreadInterrupt workInterrupt;
@@ -424,37 +424,37 @@ class CSigSharesManager : public CRecoveredSigsListener
                                const CQuorumManager& _qman, const CSporkManager& sporkman);
     ~CSigSharesManager() override;
 
-    void StartWorkerThread();
-    void StopWorkerThread();
-    void RegisterAsRecoveredSigsListener();
-    void UnregisterAsRecoveredSigsListener();
-    void InterruptWorkerThread();
+    void StartWorkerThread() EXCLUSIVE_LOCKS_REQUIRED(!cs);
+    void StopWorkerThread() EXCLUSIVE_LOCKS_REQUIRED(!cs);
+    void RegisterAsRecoveredSigsListener() EXCLUSIVE_LOCKS_REQUIRED(!cs);
+    void UnregisterAsRecoveredSigsListener() EXCLUSIVE_LOCKS_REQUIRED(!cs);
+    void InterruptWorkerThread() EXCLUSIVE_LOCKS_REQUIRED(!cs);
 
-    void ProcessMessage(const CNode& pnode, const std::string& msg_type, CDataStream& vRecv);
+    void ProcessMessage(const CNode& pnode, const std::string& msg_type, CDataStream& vRecv) EXCLUSIVE_LOCKS_REQUIRED(!cs);
 
     void AsyncSign(CQuorumCPtr quorum, const uint256& id, const uint256& msgHash)
-        EXCLUSIVE_LOCKS_REQUIRED(!cs_pendingSigns);
-    std::optional<CSigShare> CreateSigShare(const CQuorum& quorum, const uint256& id, const uint256& msgHash) const;
-    void ForceReAnnouncement(const CQuorum& quorum, Consensus::LLMQType llmqType, const uint256& id, const uint256& msgHash);
+        EXCLUSIVE_LOCKS_REQUIRED(!cs_pendingSigns, !cs);
+    std::optional<CSigShare> CreateSigShare(const CQuorum& quorum, const uint256& id, const uint256& msgHash) const EXCLUSIVE_LOCKS_REQUIRED(!cs);
+    void ForceReAnnouncement(const CQuorum& quorum, Consensus::LLMQType llmqType, const uint256& id, const uint256& msgHash) EXCLUSIVE_LOCKS_REQUIRED(!cs);
 
-    [[nodiscard]] MessageProcessingResult HandleNewRecoveredSig(const CRecoveredSig& recoveredSig) override;
+    [[nodiscard]] MessageProcessingResult HandleNewRecoveredSig(const CRecoveredSig& recoveredSig) override EXCLUSIVE_LOCKS_REQUIRED(!cs);
 
     static CDeterministicMNCPtr SelectMemberForRecovery(const CQuorum& quorum, const uint256& id, int attempt);
 
     bool AsyncSignIfMember(Consensus::LLMQType llmqType, CSigningManager& sigman, const uint256& id,
                            const uint256& msgHash, const uint256& quorumHash = uint256(), bool allowReSign = false,
                            bool allowDiffMsgHashSigning = false)
-        EXCLUSIVE_LOCKS_REQUIRED(!cs_pendingSigns);
+        EXCLUSIVE_LOCKS_REQUIRED(!cs_pendingSigns, !cs);
 
-    void NotifyRecoveredSig(const std::shared_ptr<const CRecoveredSig>& sig) const;
+    void NotifyRecoveredSig(const std::shared_ptr<const CRecoveredSig>& sig) const EXCLUSIVE_LOCKS_REQUIRED(!cs);
 
 private:
     // all of these return false when the currently processed message should be aborted (as each message actually contains multiple messages)
-    bool ProcessMessageSigSesAnn(const CNode& pfrom, const CSigSesAnn& ann);
-    bool ProcessMessageSigSharesInv(const CNode& pfrom, const CSigSharesInv& inv);
-    bool ProcessMessageGetSigShares(const CNode& pfrom, const CSigSharesInv& inv);
-    bool ProcessMessageBatchedSigShares(const CNode& pfrom, const CBatchedSigShares& batchedSigShares);
-    void ProcessMessageSigShare(NodeId fromId, const CSigShare& sigShare);
+    bool ProcessMessageSigSesAnn(const CNode& pfrom, const CSigSesAnn& ann) EXCLUSIVE_LOCKS_REQUIRED(!cs);
+    bool ProcessMessageSigSharesInv(const CNode& pfrom, const CSigSharesInv& inv) EXCLUSIVE_LOCKS_REQUIRED(!cs);
+    bool ProcessMessageGetSigShares(const CNode& pfrom, const CSigSharesInv& inv) EXCLUSIVE_LOCKS_REQUIRED(!cs);
+    bool ProcessMessageBatchedSigShares(const CNode& pfrom, const CBatchedSigShares& batchedSigShares) EXCLUSIVE_LOCKS_REQUIRED(!cs);
+    void ProcessMessageSigShare(NodeId fromId, const CSigShare& sigShare) EXCLUSIVE_LOCKS_REQUIRED(!cs);
 
     static bool VerifySigSharesInv(Consensus::LLMQType llmqType, const CSigSharesInv& inv);
     static bool PreVerifyBatchedSigShares(const CActiveMasternodeManager& mn_activeman, const CQuorumManager& quorum_manager,
@@ -462,35 +462,32 @@ class CSigSharesManager : public CRecoveredSigsListener
 
     bool CollectPendingSigSharesToVerify(
         size_t maxUniqueSessions, std::unordered_map<NodeId, std::vector<CSigShare>>& retSigShares,
-        std::unordered_map<std::pair<Consensus::LLMQType, uint256>, CQuorumCPtr, StaticSaltedHasher>& retQuorums);
-    bool ProcessPendingSigShares();
+        std::unordered_map<std::pair<Consensus::LLMQType, uint256>, CQuorumCPtr, StaticSaltedHasher>& retQuorums) EXCLUSIVE_LOCKS_REQUIRED(!cs);
+    bool ProcessPendingSigShares() EXCLUSIVE_LOCKS_REQUIRED(!cs);
 
     void ProcessPendingSigShares(
         const std::vector<CSigShare>& sigSharesToProcess,
-        const std::unordered_map<std::pair<Consensus::LLMQType, uint256>, CQuorumCPtr, StaticSaltedHasher>& quorums);
+        const std::unordered_map<std::pair<Consensus::LLMQType, uint256>, CQuorumCPtr, StaticSaltedHasher>& quorums) EXCLUSIVE_LOCKS_REQUIRED(!cs);
 
-    void ProcessSigShare(const CSigShare& sigShare, const CQuorumCPtr& quorum);
-    void TryRecoverSig(const CQuorum& quorum, const uint256& id, const uint256& msgHash);
+    void ProcessSigShare(const CSigShare& sigShare, const CQuorumCPtr& quorum) EXCLUSIVE_LOCKS_REQUIRED(!cs);
+    void TryRecoverSig(const CQuorum& quorum, const uint256& id, const uint256& msgHash) EXCLUSIVE_LOCKS_REQUIRED(!cs);
 
-    bool GetSessionInfoByRecvId(NodeId nodeId, uint32_t sessionId, CSigSharesNodeState::SessionInfo& retInfo);
+    bool GetSessionInfoByRecvId(NodeId nodeId, uint32_t sessionId, CSigSharesNodeState::SessionInfo& retInfo) EXCLUSIVE_LOCKS_REQUIRED(!cs);
     static CSigShare RebuildSigShare(const CSigSharesNodeState::SessionInfo& session, const std::pair<uint16_t, CBLSLazySignature>& in);
 
-    void Cleanup();
+    void Cleanup() EXCLUSIVE_LOCKS_REQUIRED(!cs);
     void RemoveSigSharesForSession(const uint256& signHash) EXCLUSIVE_LOCKS_REQUIRED(cs);
-    void RemoveBannedNodeStates();
+    void RemoveBannedNodeStates() EXCLUSIVE_LOCKS_REQUIRED(!cs);
 
-    void BanNode(NodeId nodeId);
+    void BanNode(NodeId nodeId) EXCLUSIVE_LOCKS_REQUIRED(!cs);
 
-    bool SendMessages();
-    void CollectSigSharesToRequest(std::unordered_map<NodeId, Uint256HashMap<CSigSharesInv>>& sigSharesToRequest)
-        EXCLUSIVE_LOCKS_REQUIRED(cs);
-    void CollectSigSharesToSend(std::unordered_map<NodeId, Uint256HashMap<CBatchedSigShares>>& sigSharesToSend)
-        EXCLUSIVE_LOCKS_REQUIRED(cs);
+    bool SendMessages() EXCLUSIVE_LOCKS_REQUIRED(!cs);
+    void CollectSigSharesToRequest(std::unordered_map<NodeId, Uint256HashMap<CSigSharesInv>>& sigSharesToRequest) EXCLUSIVE_LOCKS_REQUIRED(cs);
+    void CollectSigSharesToSend(std::unordered_map<NodeId, Uint256HashMap<CBatchedSigShares>>& sigSharesToSend) EXCLUSIVE_LOCKS_REQUIRED(cs);
     void CollectSigSharesToSendConcentrated(std::unordered_map<NodeId, std::vector<CSigShare>>& sigSharesToSend, const std::vector<CNode*>& vNodes) EXCLUSIVE_LOCKS_REQUIRED(cs);
-    void CollectSigSharesToAnnounce(std::unordered_map<NodeId, Uint256HashMap<CSigSharesInv>>& sigSharesToAnnounce)
-        EXCLUSIVE_LOCKS_REQUIRED(cs);
-    void SignPendingSigShares() EXCLUSIVE_LOCKS_REQUIRED(!cs_pendingSigns);
-    void WorkThreadMain() EXCLUSIVE_LOCKS_REQUIRED(!cs_pendingSigns);
+    void CollectSigSharesToAnnounce(std::unordered_map<NodeId, Uint256HashMap<CSigSharesInv>>& sigSharesToAnnounce) EXCLUSIVE_LOCKS_REQUIRED(cs);
+    void SignPendingSigShares() EXCLUSIVE_LOCKS_REQUIRED(!cs_pendingSigns, !cs);
+    void WorkThreadMain() EXCLUSIVE_LOCKS_REQUIRED(!cs_pendingSigns, !cs);
 };
 } // namespace llmq
 

From 582e6e4d8e1973bf3745e21028a2ec55ea99c16a Mon Sep 17 00:00:00 2001
From: pasta <pasta@dashboost.org>
Date: Mon, 10 Nov 2025 17:09:43 -0600
Subject: [PATCH 440/656] chore: run clang-format

---
 src/llmq/signing_shares.h | 33 +++++++++++++++++++++------------
 1 file changed, 21 insertions(+), 12 deletions(-)

diff --git a/src/llmq/signing_shares.h b/src/llmq/signing_shares.h
index bce6f07bf3fe..f49c927ed068 100644
--- a/src/llmq/signing_shares.h
+++ b/src/llmq/signing_shares.h
@@ -434,17 +434,19 @@ class CSigSharesManager : public CRecoveredSigsListener
 
     void AsyncSign(CQuorumCPtr quorum, const uint256& id, const uint256& msgHash)
         EXCLUSIVE_LOCKS_REQUIRED(!cs_pendingSigns, !cs);
-    std::optional<CSigShare> CreateSigShare(const CQuorum& quorum, const uint256& id, const uint256& msgHash) const EXCLUSIVE_LOCKS_REQUIRED(!cs);
-    void ForceReAnnouncement(const CQuorum& quorum, Consensus::LLMQType llmqType, const uint256& id, const uint256& msgHash) EXCLUSIVE_LOCKS_REQUIRED(!cs);
+    std::optional<CSigShare> CreateSigShare(const CQuorum& quorum, const uint256& id, const uint256& msgHash) const
+        EXCLUSIVE_LOCKS_REQUIRED(!cs);
+    void ForceReAnnouncement(const CQuorum& quorum, Consensus::LLMQType llmqType, const uint256& id,
+                             const uint256& msgHash) EXCLUSIVE_LOCKS_REQUIRED(!cs);
 
-    [[nodiscard]] MessageProcessingResult HandleNewRecoveredSig(const CRecoveredSig& recoveredSig) override EXCLUSIVE_LOCKS_REQUIRED(!cs);
+    [[nodiscard]] MessageProcessingResult HandleNewRecoveredSig(const CRecoveredSig& recoveredSig) override
+        EXCLUSIVE_LOCKS_REQUIRED(!cs);
 
     static CDeterministicMNCPtr SelectMemberForRecovery(const CQuorum& quorum, const uint256& id, int attempt);
 
     bool AsyncSignIfMember(Consensus::LLMQType llmqType, CSigningManager& sigman, const uint256& id,
                            const uint256& msgHash, const uint256& quorumHash = uint256(), bool allowReSign = false,
-                           bool allowDiffMsgHashSigning = false)
-        EXCLUSIVE_LOCKS_REQUIRED(!cs_pendingSigns, !cs);
+                           bool allowDiffMsgHashSigning = false) EXCLUSIVE_LOCKS_REQUIRED(!cs_pendingSigns, !cs);
 
     void NotifyRecoveredSig(const std::shared_ptr<const CRecoveredSig>& sig) const EXCLUSIVE_LOCKS_REQUIRED(!cs);
 
@@ -453,7 +455,8 @@ class CSigSharesManager : public CRecoveredSigsListener
     bool ProcessMessageSigSesAnn(const CNode& pfrom, const CSigSesAnn& ann) EXCLUSIVE_LOCKS_REQUIRED(!cs);
     bool ProcessMessageSigSharesInv(const CNode& pfrom, const CSigSharesInv& inv) EXCLUSIVE_LOCKS_REQUIRED(!cs);
     bool ProcessMessageGetSigShares(const CNode& pfrom, const CSigSharesInv& inv) EXCLUSIVE_LOCKS_REQUIRED(!cs);
-    bool ProcessMessageBatchedSigShares(const CNode& pfrom, const CBatchedSigShares& batchedSigShares) EXCLUSIVE_LOCKS_REQUIRED(!cs);
+    bool ProcessMessageBatchedSigShares(const CNode& pfrom, const CBatchedSigShares& batchedSigShares)
+        EXCLUSIVE_LOCKS_REQUIRED(!cs);
     void ProcessMessageSigShare(NodeId fromId, const CSigShare& sigShare) EXCLUSIVE_LOCKS_REQUIRED(!cs);
 
     static bool VerifySigSharesInv(Consensus::LLMQType llmqType, const CSigSharesInv& inv);
@@ -462,17 +465,20 @@ class CSigSharesManager : public CRecoveredSigsListener
 
     bool CollectPendingSigSharesToVerify(
         size_t maxUniqueSessions, std::unordered_map<NodeId, std::vector<CSigShare>>& retSigShares,
-        std::unordered_map<std::pair<Consensus::LLMQType, uint256>, CQuorumCPtr, StaticSaltedHasher>& retQuorums) EXCLUSIVE_LOCKS_REQUIRED(!cs);
+        std::unordered_map<std::pair<Consensus::LLMQType, uint256>, CQuorumCPtr, StaticSaltedHasher>& retQuorums)
+        EXCLUSIVE_LOCKS_REQUIRED(!cs);
     bool ProcessPendingSigShares() EXCLUSIVE_LOCKS_REQUIRED(!cs);
 
     void ProcessPendingSigShares(
         const std::vector<CSigShare>& sigSharesToProcess,
-        const std::unordered_map<std::pair<Consensus::LLMQType, uint256>, CQuorumCPtr, StaticSaltedHasher>& quorums) EXCLUSIVE_LOCKS_REQUIRED(!cs);
+        const std::unordered_map<std::pair<Consensus::LLMQType, uint256>, CQuorumCPtr, StaticSaltedHasher>& quorums)
+        EXCLUSIVE_LOCKS_REQUIRED(!cs);
 
     void ProcessSigShare(const CSigShare& sigShare, const CQuorumCPtr& quorum) EXCLUSIVE_LOCKS_REQUIRED(!cs);
     void TryRecoverSig(const CQuorum& quorum, const uint256& id, const uint256& msgHash) EXCLUSIVE_LOCKS_REQUIRED(!cs);
 
-    bool GetSessionInfoByRecvId(NodeId nodeId, uint32_t sessionId, CSigSharesNodeState::SessionInfo& retInfo) EXCLUSIVE_LOCKS_REQUIRED(!cs);
+    bool GetSessionInfoByRecvId(NodeId nodeId, uint32_t sessionId, CSigSharesNodeState::SessionInfo& retInfo)
+        EXCLUSIVE_LOCKS_REQUIRED(!cs);
     static CSigShare RebuildSigShare(const CSigSharesNodeState::SessionInfo& session, const std::pair<uint16_t, CBLSLazySignature>& in);
 
     void Cleanup() EXCLUSIVE_LOCKS_REQUIRED(!cs);
@@ -482,10 +488,13 @@ class CSigSharesManager : public CRecoveredSigsListener
     void BanNode(NodeId nodeId) EXCLUSIVE_LOCKS_REQUIRED(!cs);
 
     bool SendMessages() EXCLUSIVE_LOCKS_REQUIRED(!cs);
-    void CollectSigSharesToRequest(std::unordered_map<NodeId, Uint256HashMap<CSigSharesInv>>& sigSharesToRequest) EXCLUSIVE_LOCKS_REQUIRED(cs);
-    void CollectSigSharesToSend(std::unordered_map<NodeId, Uint256HashMap<CBatchedSigShares>>& sigSharesToSend) EXCLUSIVE_LOCKS_REQUIRED(cs);
+    void CollectSigSharesToRequest(std::unordered_map<NodeId, Uint256HashMap<CSigSharesInv>>& sigSharesToRequest)
+        EXCLUSIVE_LOCKS_REQUIRED(cs);
+    void CollectSigSharesToSend(std::unordered_map<NodeId, Uint256HashMap<CBatchedSigShares>>& sigSharesToSend)
+        EXCLUSIVE_LOCKS_REQUIRED(cs);
     void CollectSigSharesToSendConcentrated(std::unordered_map<NodeId, std::vector<CSigShare>>& sigSharesToSend, const std::vector<CNode*>& vNodes) EXCLUSIVE_LOCKS_REQUIRED(cs);
-    void CollectSigSharesToAnnounce(std::unordered_map<NodeId, Uint256HashMap<CSigSharesInv>>& sigSharesToAnnounce) EXCLUSIVE_LOCKS_REQUIRED(cs);
+    void CollectSigSharesToAnnounce(std::unordered_map<NodeId, Uint256HashMap<CSigSharesInv>>& sigSharesToAnnounce)
+        EXCLUSIVE_LOCKS_REQUIRED(cs);
     void SignPendingSigShares() EXCLUSIVE_LOCKS_REQUIRED(!cs_pendingSigns, !cs);
     void WorkThreadMain() EXCLUSIVE_LOCKS_REQUIRED(!cs_pendingSigns, !cs);
 };

From 5c6e98e66b699ad4556e37fe2c05c26627ce1acf Mon Sep 17 00:00:00 2001
From: pasta <pasta@dashboost.org>
Date: Fri, 17 Oct 2025 17:40:54 -0500
Subject: [PATCH 441/656] refactor: replace pair with structured
 PendingISLockFromPeer in CInstantSendManager

Updated the CInstantSendManager to use a new struct, PendingISLockFromPeer, for better clarity and type safety. This change replaces the use of std::pair for storing node ID and InstantSendLockPtr, enhancing code readability and maintainability across multiple functions handling instant send locks.
---
 src/instantsend/instantsend.cpp | 28 ++++++++++++++--------------
 src/instantsend/instantsend.h   | 11 ++++++++---
 2 files changed, 22 insertions(+), 17 deletions(-)

diff --git a/src/instantsend/instantsend.cpp b/src/instantsend/instantsend.cpp
index 2ddb6e80083e..c64c357ed59c 100644
--- a/src/instantsend/instantsend.cpp
+++ b/src/instantsend/instantsend.cpp
@@ -168,7 +168,7 @@ MessageProcessingResult CInstantSendManager::ProcessMessage(NodeId from, std::st
     }
 
     LOCK(cs_pendingLocks);
-    pendingInstantSendLocks.emplace(hash, std::make_pair(from, islock));
+    pendingInstantSendLocks.emplace(hash, instantsend::PendingISLockFromPeer{from, islock});
     return ret;
 }
 
@@ -239,7 +239,7 @@ instantsend::PendingState CInstantSendManager::ProcessPendingInstantSendLocks()
 
 Uint256HashSet CInstantSendManager::ProcessPendingInstantSendLocks(
     const Consensus::LLMQParams& llmq_params, int signOffset, bool ban,
-    const Uint256HashMap<std::pair<NodeId, instantsend::InstantSendLockPtr>>& pend,
+    const Uint256HashMap<instantsend::PendingISLockFromPeer>& pend,
     std::vector<std::pair<NodeId, MessageProcessingResult>>& peer_activity)
 {
     CBLSBatchVerifier<NodeId, uint256> batchVerifier(false, true, 8);
@@ -249,8 +249,8 @@ Uint256HashSet CInstantSendManager::ProcessPendingInstantSendLocks(
     size_t alreadyVerified = 0;
     for (const auto& p : pend) {
         const auto& hash = p.first;
-        auto nodeId = p.second.first;
-        const auto& islock = p.second.second;
+        auto nodeId = p.second.node_id;
+        const auto& islock = p.second.islock;
 
         if (batchVerifier.badSources.count(nodeId)) {
             continue;
@@ -321,8 +321,8 @@ Uint256HashSet CInstantSendManager::ProcessPendingInstantSendLocks(
     }
     for (const auto& p : pend) {
         const auto& hash = p.first;
-        auto nodeId = p.second.first;
-        const auto& islock = p.second.second;
+        auto nodeId = p.second.node_id;
+        const auto& islock = p.second.islock;
 
         if (batchVerifier.badMessages.count(hash)) {
             LogPrint(BCLog::INSTANTSEND, "CInstantSendManager::%s -- txid=%s, islock=%s: invalid sig in islock, peer=%d\n",
@@ -399,7 +399,7 @@ MessageProcessingResult CInstantSendManager::ProcessInstantSendLock(NodeId from,
     } else {
         // put it in a separate pending map and try again later
         LOCK(cs_pendingLocks);
-        pendingNoTxInstantSendLocks.try_emplace(hash, std::make_pair(from, islock));
+        pendingNoTxInstantSendLocks.try_emplace(hash, instantsend::PendingISLockFromPeer{from, islock});
     }
 
     // This will also add children TXs to pendingRetryTxs
@@ -442,11 +442,11 @@ void CInstantSendManager::TransactionAddedToMempool(const CTransactionRef& tx)
         LOCK(cs_pendingLocks);
         auto it = pendingNoTxInstantSendLocks.begin();
         while (it != pendingNoTxInstantSendLocks.end()) {
-            if (it->second.second->txid == tx->GetHash()) {
+            if (it->second.islock->txid == tx->GetHash()) {
                 // we received an islock earlier
                 LogPrint(BCLog::INSTANTSEND, "CInstantSendManager::%s -- txid=%s, islock=%s\n", __func__,
                          tx->GetHash().ToString(), it->first.ToString());
-                islock = it->second.second;
+                islock = it->second.islock;
                 pendingInstantSendLocks.try_emplace(it->first, it->second);
                 pendingNoTxInstantSendLocks.erase(it);
                 break;
@@ -539,7 +539,7 @@ void CInstantSendManager::AddNonLockedTx(const CTransactionRef& tx, const CBlock
         LOCK(cs_pendingLocks);
         auto it = pendingNoTxInstantSendLocks.begin();
         while (it != pendingNoTxInstantSendLocks.end()) {
-            if (it->second.second->txid == tx->GetHash()) {
+            if (it->second.islock->txid == tx->GetHash()) {
                 // we received an islock earlier, let's put it back into pending and verify/lock
                 LogPrint(BCLog::INSTANTSEND, "CInstantSendManager::%s -- txid=%s, islock=%s\n", __func__,
                          tx->GetHash().ToString(), it->first.ToString());
@@ -626,7 +626,7 @@ void CInstantSendManager::TryEmplacePendingLock(const uint256& hash, const NodeI
     if (db.KnownInstantSendLock(hash)) return;
     LOCK(cs_pendingLocks);
     if (!pendingInstantSendLocks.count(hash)) {
-        pendingInstantSendLocks.emplace(hash, std::make_pair(id, islock));
+        pendingInstantSendLocks.emplace(hash, instantsend::PendingISLockFromPeer{id, islock});
     }
 }
 
@@ -848,11 +848,11 @@ bool CInstantSendManager::GetInstantSendLockByHash(const uint256& hash, instants
         LOCK(cs_pendingLocks);
         auto it = pendingInstantSendLocks.find(hash);
         if (it != pendingInstantSendLocks.end()) {
-            islock = it->second.second;
+            islock = it->second.islock;
         } else {
             auto itNoTx = pendingNoTxInstantSendLocks.find(hash);
             if (itNoTx != pendingNoTxInstantSendLocks.end()) {
-                islock = itNoTx->second.second;
+                islock = itNoTx->second.islock;
             } else {
                 return false;
             }
@@ -889,7 +889,7 @@ bool CInstantSendManager::IsWaitingForTx(const uint256& txHash) const
     LOCK(cs_pendingLocks);
     auto it = pendingNoTxInstantSendLocks.begin();
     while (it != pendingNoTxInstantSendLocks.end()) {
-        if (it->second.second->txid == txHash) {
+        if (it->second.islock->txid == txHash) {
             LogPrint(BCLog::INSTANTSEND, "CInstantSendManager::%s -- txid=%s, islock=%s\n", __func__, txHash.ToString(),
                      it->first.ToString());
             return true;
diff --git a/src/instantsend/instantsend.h b/src/instantsend/instantsend.h
index d9343e9cf418..13e86704ecff 100644
--- a/src/instantsend/instantsend.h
+++ b/src/instantsend/instantsend.h
@@ -38,6 +38,11 @@ struct DbWrapperParams;
 namespace instantsend {
 class InstantSendSigner;
 
+struct PendingISLockFromPeer {
+    NodeId node_id;
+    InstantSendLockPtr islock;
+};
+
 struct PendingState {
     bool m_pending_work{false};
     std::vector<std::pair<NodeId, MessageProcessingResult>> m_peer_activity{};
@@ -69,9 +74,9 @@ class CInstantSendManager final : public instantsend::InstantSendSignerParent
 
     mutable Mutex cs_pendingLocks;
     // Incoming and not verified yet
-    Uint256HashMap<std::pair<NodeId, instantsend::InstantSendLockPtr>> pendingInstantSendLocks GUARDED_BY(cs_pendingLocks);
+    Uint256HashMap<instantsend::PendingISLockFromPeer> pendingInstantSendLocks GUARDED_BY(cs_pendingLocks);
     // Tried to verify but there is no tx yet
-    Uint256HashMap<std::pair<NodeId, instantsend::InstantSendLockPtr>> pendingNoTxInstantSendLocks GUARDED_BY(cs_pendingLocks);
+    Uint256HashMap<instantsend::PendingISLockFromPeer> pendingNoTxInstantSendLocks GUARDED_BY(cs_pendingLocks);
 
     // TXs which are neither IS locked nor ChainLocked. We use this to determine for which TXs we need to retry IS
     // locking of child TXs
@@ -117,7 +122,7 @@ class CInstantSendManager final : public instantsend::InstantSendSignerParent
         EXCLUSIVE_LOCKS_REQUIRED(!cs_nonLocked, !cs_pendingLocks, !cs_pendingRetry);
 
     Uint256HashSet ProcessPendingInstantSendLocks(const Consensus::LLMQParams& llmq_params, int signOffset, bool ban,
-                                                  const Uint256HashMap<std::pair<NodeId, instantsend::InstantSendLockPtr>>& pend,
+                                                  const Uint256HashMap<instantsend::PendingISLockFromPeer>& pend,
                                                   std::vector<std::pair<NodeId, MessageProcessingResult>>& peer_activity)
         EXCLUSIVE_LOCKS_REQUIRED(!cs_nonLocked, !cs_pendingLocks, !cs_pendingRetry);
     MessageProcessingResult ProcessInstantSendLock(NodeId from, const uint256& hash,

From 2980e60c08ea28c0f8f242e4c5c91dcb22e71777 Mon Sep 17 00:00:00 2001
From: pasta <pasta@dashboost.org>
Date: Fri, 17 Oct 2025 17:54:17 -0500
Subject: [PATCH 442/656] perf: use vector instead of hash map for
 ProcessPendingInstantSendLocks

The 'pend' local variable in ProcessPendingInstantSendLocks was previously
using the same data structure as pendingInstantSendLocks (a hash map).
However, once we're in the processing step, we only iterate sequentially
through the locks - there are no hash-based lookups.

This commit changes 'pend' to use std::vector for better performance:
- Improved cache locality with contiguous memory layout
- Better CPU prefetching during iteration (3x through the data)
- Eliminates hash map overhead (bucket allocation, pointer chasing)
- Filtering step uses build-new-vector approach to maintain O(n)

The typical case processes up to 32 locks, making the vector's sequential
access pattern ideal for modern CPU cache hierarchies.
---
 src/instantsend/instantsend.cpp | 22 ++++++++++++----------
 src/instantsend/instantsend.h   |  3 ++-
 2 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/src/instantsend/instantsend.cpp b/src/instantsend/instantsend.cpp
index c64c357ed59c..675b90bcfaf0 100644
--- a/src/instantsend/instantsend.cpp
+++ b/src/instantsend/instantsend.cpp
@@ -174,7 +174,7 @@ MessageProcessingResult CInstantSendManager::ProcessMessage(NodeId from, std::st
 
 instantsend::PendingState CInstantSendManager::ProcessPendingInstantSendLocks()
 {
-    decltype(pendingInstantSendLocks) pend;
+    std::vector<std::pair<uint256, instantsend::PendingISLockFromPeer>> pend;
     instantsend::PendingState ret;
 
     if (!IsInstantSendEnabled()) {
@@ -189,6 +189,7 @@ instantsend::PendingState CInstantSendManager::ProcessPendingInstantSendLocks()
         // The keys of the removed values are temporaily stored here to avoid invalidating an iterator
         std::vector<uint256> removed;
         removed.reserve(maxCount);
+        pend.reserve(maxCount);
 
         for (const auto& [islockHash, nodeid_islptr_pair] : pendingInstantSendLocks) {
             // Check if we've reached max count
@@ -196,7 +197,7 @@ instantsend::PendingState CInstantSendManager::ProcessPendingInstantSendLocks()
                 ret.m_pending_work = true;
                 break;
             }
-            pend.emplace(islockHash, std::move(nodeid_islptr_pair));
+            pend.emplace_back(islockHash, std::move(nodeid_islptr_pair));
             removed.emplace_back(islockHash);
         }
 
@@ -222,16 +223,17 @@ instantsend::PendingState CInstantSendManager::ProcessPendingInstantSendLocks()
     if (!badISLocks.empty()) {
         LogPrint(BCLog::INSTANTSEND, "CInstantSendManager::%s -- doing verification on old active set\n", __func__);
 
-        // filter out valid IS locks from "pend"
-        for (auto it = pend.begin(); it != pend.end();) {
-            if (!badISLocks.count(it->first)) {
-                it = pend.erase(it);
-            } else {
-                ++it;
+        // filter out valid IS locks from "pend" - keep only bad ones
+        std::vector<std::pair<uint256, instantsend::PendingISLockFromPeer>> filteredPend;
+        filteredPend.reserve(badISLocks.size());
+        for (auto& p : pend) {
+            if (badISLocks.contains(p.first)) {
+                filteredPend.push_back(std::move(p));
             }
         }
+        
         // Now check against the previous active set and perform banning if this fails
-        ProcessPendingInstantSendLocks(llmq_params, dkgInterval, /*ban=*/true, pend, ret.m_peer_activity);
+        ProcessPendingInstantSendLocks(llmq_params, dkgInterval, /*ban=*/true, filteredPend, ret.m_peer_activity);
     }
 
     return ret;
@@ -239,7 +241,7 @@ instantsend::PendingState CInstantSendManager::ProcessPendingInstantSendLocks()
 
 Uint256HashSet CInstantSendManager::ProcessPendingInstantSendLocks(
     const Consensus::LLMQParams& llmq_params, int signOffset, bool ban,
-    const Uint256HashMap<instantsend::PendingISLockFromPeer>& pend,
+    const std::vector<std::pair<uint256, instantsend::PendingISLockFromPeer>>& pend,
     std::vector<std::pair<NodeId, MessageProcessingResult>>& peer_activity)
 {
     CBLSBatchVerifier<NodeId, uint256> batchVerifier(false, true, 8);
diff --git a/src/instantsend/instantsend.h b/src/instantsend/instantsend.h
index 13e86704ecff..ebe6b4cb48b2 100644
--- a/src/instantsend/instantsend.h
+++ b/src/instantsend/instantsend.h
@@ -20,6 +20,7 @@
 #include <atomic>
 #include <unordered_map>
 #include <unordered_set>
+#include <vector>
 
 class CBlockIndex;
 class CChainState;
@@ -122,7 +123,7 @@ class CInstantSendManager final : public instantsend::InstantSendSignerParent
         EXCLUSIVE_LOCKS_REQUIRED(!cs_nonLocked, !cs_pendingLocks, !cs_pendingRetry);
 
     Uint256HashSet ProcessPendingInstantSendLocks(const Consensus::LLMQParams& llmq_params, int signOffset, bool ban,
-                                                  const Uint256HashMap<instantsend::PendingISLockFromPeer>& pend,
+                                                  const std::vector<std::pair<uint256, instantsend::PendingISLockFromPeer>>& pend,
                                                   std::vector<std::pair<NodeId, MessageProcessingResult>>& peer_activity)
         EXCLUSIVE_LOCKS_REQUIRED(!cs_nonLocked, !cs_pendingLocks, !cs_pendingRetry);
     MessageProcessingResult ProcessInstantSendLock(NodeId from, const uint256& hash,

From e18a46bf9ea66bf4b3482e2735aa7f4de6a1c126 Mon Sep 17 00:00:00 2001
From: pasta <pasta@dashboost.org>
Date: Sat, 18 Oct 2025 11:22:15 -0500
Subject: [PATCH 443/656] refactor: simplify loop variable unpacking in
 bls_batchverifier.h

---
 src/bls/bls_batchverifier.h | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/bls/bls_batchverifier.h b/src/bls/bls_batchverifier.h
index a455b30d8d5f..e22bbf8d8240 100644
--- a/src/bls/bls_batchverifier.h
+++ b/src/bls/bls_batchverifier.h
@@ -82,27 +82,27 @@ class CBLSBatchVerifier
         }
 
         // revert to per-source verification
-        for (const auto& p : messagesBySource) {
+        for (const auto& [from, message_map] : messagesBySource) {
             bool batchValid = false;
 
             // no need to verify it again if there was just one source
             if (messagesBySource.size() != 1) {
                 byMessageHash.clear();
-                for (auto it = p.second.begin(); it != p.second.end(); ++it) {
+                for (auto it = message_map.begin(); it != message_map.end(); ++it) {
                     byMessageHash[(*it)->second.msgHash].emplace_back(*it);
                 }
                 batchValid = VerifyBatch(byMessageHash);
             }
             if (!batchValid) {
-                badSources.emplace(p.first);
+                badSources.emplace(from);
 
                 if (perMessageFallback) {
                     // revert to per-message verification
-                    if (p.second.size() == 1) {
+                    if (message_map.size() == 1) {
                         // no need to re-verify a single message
-                        badMessages.emplace(p.second[0]->second.msgId);
+                        badMessages.emplace(message_map[0]->second.msgId);
                     } else {
-                        for (const auto& msgIt : p.second) {
+                        for (const auto& msgIt : message_map) {
                             if (badMessages.count(msgIt->first)) {
                                 // same message might be invalid from different source, so no need to re-verify it
                                 continue;

From 7366d9594a94dd0f0917323d704ad1afc4f0914a Mon Sep 17 00:00:00 2001
From: pasta <pasta@dashboost.org>
Date: Sat, 18 Oct 2025 11:23:28 -0500
Subject: [PATCH 444/656] perf: avoid redundant signature validation in signing
 shares processing

---
 src/llmq/signing_shares.cpp | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/llmq/signing_shares.cpp b/src/llmq/signing_shares.cpp
index ca80f5d45c39..6a805752331b 100644
--- a/src/llmq/signing_shares.cpp
+++ b/src/llmq/signing_shares.cpp
@@ -658,9 +658,12 @@ bool CSigSharesManager::ProcessPendingSigShares()
                 continue;
             }
 
+            // Materialize the signature once. Get() internally validates, so if it returns an invalid signature,
+            // we know it's malformed. This avoids calling Get() twice (once for IsValid(), once for PushMessage).
+            CBLSSignature sig = sigShare.sigShare.Get();
             // we didn't check this earlier because we use a lazy BLS signature and tried to avoid doing the expensive
             // deserialization in the message thread
-            if (!sigShare.sigShare.Get().IsValid()) {
+            if (!sig.IsValid()) {
                 BanNode(nodeId);
                 // don't process any additional shares from this node
                 break;
@@ -676,7 +679,7 @@ bool CSigSharesManager::ProcessPendingSigShares()
                 assert(false);
             }
 
-            batchVerifier.PushMessage(nodeId, sigShare.GetKey(), sigShare.GetSignHash(), sigShare.sigShare.Get(), pubKeyShare);
+            batchVerifier.PushMessage(nodeId, sigShare.GetKey(), sigShare.GetSignHash(), sig, pubKeyShare);
             verifyCount++;
         }
     }

From 1b2bab48ad600c4acfc19758e0bf51e84244cc16 Mon Sep 17 00:00:00 2001
From: pasta <pasta@dashboost.org>
Date: Mon, 10 Nov 2025 20:23:20 -0600
Subject: [PATCH 445/656] chore: whitespace fix

---
 src/instantsend/instantsend.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/instantsend/instantsend.cpp b/src/instantsend/instantsend.cpp
index 675b90bcfaf0..293d35928e3c 100644
--- a/src/instantsend/instantsend.cpp
+++ b/src/instantsend/instantsend.cpp
@@ -231,7 +231,7 @@ instantsend::PendingState CInstantSendManager::ProcessPendingInstantSendLocks()
                 filteredPend.push_back(std::move(p));
             }
         }
-        
+
         // Now check against the previous active set and perform banning if this fails
         ProcessPendingInstantSendLocks(llmq_params, dkgInterval, /*ban=*/true, filteredPend, ret.m_peer_activity);
     }

From 0a08b2a7a0ffb20ff187436abd302a01b8b992c5 Mon Sep 17 00:00:00 2001
From: pasta <pasta@dashboost.org>
Date: Mon, 10 Nov 2025 21:24:33 -0600
Subject: [PATCH 446/656] refactor: enhance CSigSharesManager for single-member
 quorum handling

Added a new method, ProcessRecoveredSigUnlocked, to handle recovered signatures outside of the lock to improve thread safety. Updated TryRecoverSig to utilize this new method for single-member quorum cases, ensuring proper lock management during signature processing.
---
 src/llmq/signing_shares.cpp | 20 ++++++++++++++++----
 src/llmq/signing_shares.h   |  3 +++
 2 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/src/llmq/signing_shares.cpp b/src/llmq/signing_shares.cpp
index ca80f5d45c39..315dcf68c7f7 100644
--- a/src/llmq/signing_shares.cpp
+++ b/src/llmq/signing_shares.cpp
@@ -780,6 +780,7 @@ void CSigSharesManager::TryRecoverSig(const CQuorum& quorum, const uint256& id,
 
     std::vector<CBLSSignature> sigSharesForRecovery;
     std::vector<CBLSId> idsForRecovery;
+    std::shared_ptr<CRecoveredSig> singleMemberRecoveredSig;
     {
         LOCK(cs);
 
@@ -802,10 +803,10 @@ void CSigSharesManager::TryRecoverSig(const CQuorum& quorum, const uint256& id,
             LogPrint(BCLog::LLMQ_SIGS, "CSigSharesManager::%s -- recover single-node signature. id=%s, msgHash=%s\n",
                      __func__, id.ToString(), msgHash.ToString());
 
-            auto rs = std::make_shared<CRecoveredSig>(quorum.params.type, quorum.qc->quorumHash, id, msgHash,
+            singleMemberRecoveredSig = std::make_shared<CRecoveredSig>(quorum.params.type, quorum.qc->quorumHash, id, msgHash,
                                                       recoveredSig);
-            sigman.ProcessRecoveredSig(rs, m_peerman);
-            return; // end of single-quorum processing
+            // Release lock before calling ProcessRecoveredSig to avoid double lock in HandleNewRecoveredSig
+            // ProcessRecoveredSig will synchronously call HandleNewRecoveredSig which requires the lock
         }
 
         sigSharesForRecovery.reserve((size_t) quorum.params.threshold);
@@ -822,6 +823,12 @@ void CSigSharesManager::TryRecoverSig(const CQuorum& quorum, const uint256& id,
         }
     }
 
+    // Handle single-member quorum case after releasing the lock
+    if (singleMemberRecoveredSig) {
+        ProcessRecoveredSigUnlocked(singleMemberRecoveredSig);
+        return; // end of single-quorum processing
+    }
+
     // now recover it
     cxxtimer::Timer t(true);
     CBLSSignature recoveredSig;
@@ -850,7 +857,12 @@ void CSigSharesManager::TryRecoverSig(const CQuorum& quorum, const uint256& id,
         }
     }
 
-    sigman.ProcessRecoveredSig(rs, m_peerman);
+    ProcessRecoveredSigUnlocked(rs);
+}
+
+void CSigSharesManager::ProcessRecoveredSigUnlocked(const std::shared_ptr<const CRecoveredSig>& recoveredSig)
+{
+    sigman.ProcessRecoveredSig(recoveredSig, m_peerman);
 }
 
 CDeterministicMNCPtr CSigSharesManager::SelectMemberForRecovery(const CQuorum& quorum, const uint256 &id, int attempt)
diff --git a/src/llmq/signing_shares.h b/src/llmq/signing_shares.h
index f49c927ed068..425bfa1cff4c 100644
--- a/src/llmq/signing_shares.h
+++ b/src/llmq/signing_shares.h
@@ -477,6 +477,9 @@ class CSigSharesManager : public CRecoveredSigsListener
     void ProcessSigShare(const CSigShare& sigShare, const CQuorumCPtr& quorum) EXCLUSIVE_LOCKS_REQUIRED(!cs);
     void TryRecoverSig(const CQuorum& quorum, const uint256& id, const uint256& msgHash) EXCLUSIVE_LOCKS_REQUIRED(!cs);
 
+private:
+    void ProcessRecoveredSigUnlocked(const std::shared_ptr<const CRecoveredSig>& recoveredSig) LOCKS_EXCLUDED(cs);
+
     bool GetSessionInfoByRecvId(NodeId nodeId, uint32_t sessionId, CSigSharesNodeState::SessionInfo& retInfo)
         EXCLUSIVE_LOCKS_REQUIRED(!cs);
     static CSigShare RebuildSigShare(const CSigSharesNodeState::SessionInfo& session, const std::pair<uint16_t, CBLSLazySignature>& in);

From e98ba126a2a6d9350f1993af697abb71e04abed8 Mon Sep 17 00:00:00 2001
From: pasta <pasta@dashboost.org>
Date: Mon, 10 Nov 2025 21:32:53 -0600
Subject: [PATCH 447/656] refactor: streamline signature recovery process in
 CSigSharesManager

Removed the ProcessRecoveredSigUnlocked method and directly integrated its functionality into TryRecoverSig. This change simplifies the handling of recovered signatures for single-member quorums, ensuring proper lock management and enhancing code clarity.
---
 src/llmq/signing_shares.cpp | 11 ++---------
 src/llmq/signing_shares.h   |  3 ---
 2 files changed, 2 insertions(+), 12 deletions(-)

diff --git a/src/llmq/signing_shares.cpp b/src/llmq/signing_shares.cpp
index 315dcf68c7f7..9b55774eadea 100644
--- a/src/llmq/signing_shares.cpp
+++ b/src/llmq/signing_shares.cpp
@@ -805,8 +805,6 @@ void CSigSharesManager::TryRecoverSig(const CQuorum& quorum, const uint256& id,
 
             singleMemberRecoveredSig = std::make_shared<CRecoveredSig>(quorum.params.type, quorum.qc->quorumHash, id, msgHash,
                                                       recoveredSig);
-            // Release lock before calling ProcessRecoveredSig to avoid double lock in HandleNewRecoveredSig
-            // ProcessRecoveredSig will synchronously call HandleNewRecoveredSig which requires the lock
         }
 
         sigSharesForRecovery.reserve((size_t) quorum.params.threshold);
@@ -825,7 +823,7 @@ void CSigSharesManager::TryRecoverSig(const CQuorum& quorum, const uint256& id,
 
     // Handle single-member quorum case after releasing the lock
     if (singleMemberRecoveredSig) {
-        ProcessRecoveredSigUnlocked(singleMemberRecoveredSig);
+        sigman.ProcessRecoveredSig(singleMemberRecoveredSig, m_peerman);
         return; // end of single-quorum processing
     }
 
@@ -857,12 +855,7 @@ void CSigSharesManager::TryRecoverSig(const CQuorum& quorum, const uint256& id,
         }
     }
 
-    ProcessRecoveredSigUnlocked(rs);
-}
-
-void CSigSharesManager::ProcessRecoveredSigUnlocked(const std::shared_ptr<const CRecoveredSig>& recoveredSig)
-{
-    sigman.ProcessRecoveredSig(recoveredSig, m_peerman);
+    sigman.ProcessRecoveredSig(rs, m_peerman);
 }
 
 CDeterministicMNCPtr CSigSharesManager::SelectMemberForRecovery(const CQuorum& quorum, const uint256 &id, int attempt)
diff --git a/src/llmq/signing_shares.h b/src/llmq/signing_shares.h
index 425bfa1cff4c..f49c927ed068 100644
--- a/src/llmq/signing_shares.h
+++ b/src/llmq/signing_shares.h
@@ -477,9 +477,6 @@ class CSigSharesManager : public CRecoveredSigsListener
     void ProcessSigShare(const CSigShare& sigShare, const CQuorumCPtr& quorum) EXCLUSIVE_LOCKS_REQUIRED(!cs);
     void TryRecoverSig(const CQuorum& quorum, const uint256& id, const uint256& msgHash) EXCLUSIVE_LOCKS_REQUIRED(!cs);
 
-private:
-    void ProcessRecoveredSigUnlocked(const std::shared_ptr<const CRecoveredSig>& recoveredSig) LOCKS_EXCLUDED(cs);
-
     bool GetSessionInfoByRecvId(NodeId nodeId, uint32_t sessionId, CSigSharesNodeState::SessionInfo& retInfo)
         EXCLUSIVE_LOCKS_REQUIRED(!cs);
     static CSigShare RebuildSigShare(const CSigSharesNodeState::SessionInfo& session, const std::pair<uint16_t, CBLSLazySignature>& in);

From 65c33eaeabbbc66100c746a9ddefad19dc487523 Mon Sep 17 00:00:00 2001
From: UdjinM6 <UdjinM6@users.noreply.github.com>
Date: Tue, 11 Nov 2025 13:01:47 +0300
Subject: [PATCH 448/656] fix: correct BLS scheme setting in
 `MigrateLegacyDiffs()` when `nVersion` is present

---
 src/evo/deterministicmns.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/evo/deterministicmns.cpp b/src/evo/deterministicmns.cpp
index d8140aa0db90..b8b7d0c64109 100644
--- a/src/evo/deterministicmns.cpp
+++ b/src/evo/deterministicmns.cpp
@@ -1496,9 +1496,9 @@ bool CDeterministicMNManager::MigrateLegacyDiffs(const CBlockIndex* const tip_in
                     stateDiff.fields |= CDeterministicMNStateDiff::Field_nVersion;
                     stateDiff.state.nVersion = dmn->pdmnState->nVersion;
                 }
-                if (stateDiff.fields & CDeterministicMNStateDiff::Field_pubKeyOperator) {
-                    stateDiff.state.pubKeyOperator.SetLegacy(stateDiff.state.nVersion == ProTxVersion::LegacyBLS);
-                }
+            }
+            if (stateDiff.fields & CDeterministicMNStateDiff::Field_pubKeyOperator) {
+                stateDiff.state.pubKeyOperator.SetLegacy(stateDiff.state.nVersion == ProTxVersion::LegacyBLS);
             }
             convertedDiff.updatedMNs.emplace(internalId, stateDiff);
         }

From 42b334152844637ad677593f130c86266bf94d4a Mon Sep 17 00:00:00 2001
From: Konstantin Akimov <knstqq@gmail.com>
Date: Wed, 12 Nov 2025 02:15:05 +0700
Subject: [PATCH 449/656] perf: remove duplicated check of same key in the
 instant send database

Previous implementation checked both Deterministic and Non-deterministic
instant send locks; though once non-determinstic has been removed,
implementation has been updated and now the same key is checked twice.

This commit removes duplicated check
---
 src/instantsend/db.cpp | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/src/instantsend/db.cpp b/src/instantsend/db.cpp
index 778596851385..49af9762c010 100644
--- a/src/instantsend/db.cpp
+++ b/src/instantsend/db.cpp
@@ -279,11 +279,7 @@ InstantSendLockPtr CInstantSendDb::GetInstantSendLockByHashInternal(const uint25
     ret = std::make_shared<InstantSendLock>();
     bool exists = db->Read(std::make_tuple(DB_ISLOCK_BY_HASH, hash), *ret);
     if (!exists || (::SerializeHash(*ret) != hash)) {
-        ret = std::make_shared<InstantSendLock>();
-        exists = db->Read(std::make_tuple(DB_ISLOCK_BY_HASH, hash), *ret);
-        if (!exists || (::SerializeHash(*ret) != hash)) {
-            ret = nullptr;
-        }
+        ret = nullptr;
     }
     islockCache.insert(hash, ret);
     return ret;

From bd285fcf33cb40a0a8ee7711dcec9228ac9c0136 Mon Sep 17 00:00:00 2001
From: UdjinM6 <UdjinM6@users.noreply.github.com>
Date: Wed, 12 Nov 2025 17:59:32 +0300
Subject: [PATCH 450/656] refactor: We don't need SERIALIZE_METHODS for
 CDeterministicMNStateDiffLegacy, only deser

We don't use ser for anything (yet)
---
 src/evo/dmnstate.h | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/src/evo/dmnstate.h b/src/evo/dmnstate.h
index 7fa609465002..526144c5cf35 100644
--- a/src/evo/dmnstate.h
+++ b/src/evo/dmnstate.h
@@ -357,27 +357,26 @@ class CDeterministicMNStateDiffLegacy
     }
 
     // Deserialize using legacy format
-    SERIALIZE_METHODS(CDeterministicMNStateDiffLegacy, obj)
+    template<typename Stream>
+    void Unserialize(Stream& s)
     {
-        READWRITE(VARINT(obj.fields));
+        s >> VARINT(fields);
 
         boost::hana::for_each(legacy_members, [&](auto&& member) {
             using BaseType = std::decay_t<decltype(member)>;
             if constexpr (BaseType::mask == LegacyField_pubKeyOperator) {
-                if (obj.fields & member.mask) {
+                if (fields & member.mask) {
                     // We'll set proper scheme later in MigrateLegacyDiffs()
-                    READWRITE(CBLSLazyPublicKeyVersionWrapper(const_cast<CBLSLazyPublicKey&>(obj.state.pubKeyOperator),
-                                                              /*legacy=*/true));
+                    s >> CBLSLazyPublicKeyVersionWrapper(state.pubKeyOperator, /*legacy=*/true);
                 }
             } else if constexpr (BaseType::mask == LegacyField_netInfo) {
-                if (obj.fields & member.mask) {
+                if (fields & member.mask) {
                     // Legacy format supports non-extended addresses only
-                    READWRITE(NetInfoSerWrapper(const_cast<std::shared_ptr<NetInfoInterface>&>(obj.state.netInfo),
-                                                /*is_extended=*/false));
+                    s >> NetInfoSerWrapper(state.netInfo, /*is_extended=*/false);
                 }
             } else {
-                if (obj.fields & member.mask) {
-                    READWRITE(member.get(obj.state));
+                if (fields & member.mask) {
+                    s >> member.get(state);
                 }
             }
         });

From 6ee673ca7b7e8fa85f2e817ea3bfb736f7db98de Mon Sep 17 00:00:00 2001
From: UdjinM6 <UdjinM6@users.noreply.github.com>
Date: Wed, 12 Nov 2025 18:01:50 +0300
Subject: [PATCH 451/656] feat: implement CDeterministicMNStateDiffLegacy ser
 (for testing only)

---
 src/evo/dmnstate.h | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)

diff --git a/src/evo/dmnstate.h b/src/evo/dmnstate.h
index 526144c5cf35..b2f93fad0ccd 100644
--- a/src/evo/dmnstate.h
+++ b/src/evo/dmnstate.h
@@ -356,6 +356,33 @@ class CDeterministicMNStateDiffLegacy
         s >> *this;
     }
 
+    // Used for testing only
+    template<typename Stream>
+    void Serialize(Stream& s) const
+    {
+        s << VARINT(fields);
+
+        boost::hana::for_each(legacy_members, [&](auto&& member) {
+            using BaseType = std::decay_t<decltype(member)>;
+            if constexpr (BaseType::mask == LegacyField_pubKeyOperator) {
+                if (fields & member.mask) {
+                    // We serialize it as is, no version wrapper is used here
+                    s << state.pubKeyOperator;
+                }
+            } else if constexpr (BaseType::mask == LegacyField_netInfo) {
+                if (fields & member.mask) {
+                    // Legacy format supports non-extended addresses only
+                    s << NetInfoSerWrapper(const_cast<std::shared_ptr<NetInfoInterface>&>(state.netInfo),
+                                                /*is_extended=*/false);
+                }
+            } else {
+                if (fields & member.mask) {
+                    s << member.get(state);
+                }
+            }
+        });
+    }
+
     // Deserialize using legacy format
     template<typename Stream>
     void Unserialize(Stream& s)

From 4c8ae8ebd559fdf6397d96cc797cb0dca364823b Mon Sep 17 00:00:00 2001
From: UdjinM6 <UdjinM6@users.noreply.github.com>
Date: Tue, 11 Nov 2025 12:19:07 +0300
Subject: [PATCH 452/656] test: update tests

Improvements:
- Compares against original values instead of hardcoded constants
- Verifies ban height round-trips correctly
- Verifies BLS key value is identical after round-trip (using Get() to force initialization)
- Verifies string representation matches
---
 src/test/evo_deterministicmns_tests.cpp | 22 +++++++++++++++++++---
 1 file changed, 19 insertions(+), 3 deletions(-)

diff --git a/src/test/evo_deterministicmns_tests.cpp b/src/test/evo_deterministicmns_tests.cpp
index c67d4dd40725..bc76a0ea05f4 100644
--- a/src/test/evo_deterministicmns_tests.cpp
+++ b/src/test/evo_deterministicmns_tests.cpp
@@ -1128,10 +1128,18 @@ BOOST_AUTO_TEST_CASE(migration_logic_validation)
 
     // Create sample legacy format state diff
     CDeterministicMNStateDiffLegacy legacyDiff;
-    legacyDiff.fields = 0x40000 | 0x0200 | 0x0800; // Legacy: nVersion, pubKeyOperator, netInfo
+    legacyDiff.fields = 0x40000 | 0x0200 | 0x0800 | 0x0010; // Legacy: nVersion, pubKeyOperator, netInfo, nPoSeBanHeight
     legacyDiff.state.nVersion = ProTxVersion::BasicBLS;
-    legacyDiff.state.pubKeyOperator.Set(CBLSPublicKey{}, false);
+    CBLSSecretKey sk;
+    sk.MakeNewKey();
+    legacyDiff.state.pubKeyOperator.Set(sk.GetPublicKey(), false);
+    BOOST_CHECK(!legacyDiff.state.pubKeyOperator.IsLegacy());
     legacyDiff.state.netInfo = NetInfoInterface::MakeNetInfo(ProTxVersion::BasicBLS);
+    BOOST_CHECK(!legacyDiff.state.IsBanned());
+    legacyDiff.state.BanIfNotBanned(2367316);
+    BOOST_CHECK(legacyDiff.state.IsBanned());
+    BOOST_CHECK_EQUAL(legacyDiff.state.GetBannedHeight(), 2367316);
+
 
     // Test legacy class conversion (this would normally be done by CDeterministicMNListDiff)
     CDataStream ss(SER_DISK, CLIENT_VERSION);
@@ -1139,14 +1147,22 @@ BOOST_AUTO_TEST_CASE(migration_logic_validation)
 
     CDeterministicMNStateDiffLegacy legacyDeserializer(deserialize, ss);
     CDeterministicMNStateDiff convertedDiff = legacyDeserializer.ToNewFormat();
+    BOOST_CHECK(!legacyDiff.state.pubKeyOperator.IsLegacy());
+    BOOST_CHECK(convertedDiff.state.pubKeyOperator.IsLegacy());
+    convertedDiff.state.pubKeyOperator.SetLegacy(false);
+    BOOST_CHECK(!convertedDiff.state.pubKeyOperator.IsLegacy());
 
     // Verify conversion worked correctly
     uint32_t expectedNewFields = CDeterministicMNStateDiff::Field_nVersion |       // 0x0001
+                                 CDeterministicMNStateDiff::Field_nPoSeBanHeight | // 0x0020
                                  CDeterministicMNStateDiff::Field_pubKeyOperator | // 0x0400
                                  CDeterministicMNStateDiff::Field_netInfo;         // 0x1000
 
     BOOST_CHECK_EQUAL(convertedDiff.fields, expectedNewFields);
-    BOOST_CHECK_EQUAL(convertedDiff.state.nVersion, ProTxVersion::BasicBLS);
+    BOOST_CHECK_EQUAL(convertedDiff.state.nVersion, legacyDiff.state.nVersion);
+    BOOST_CHECK_EQUAL(convertedDiff.state.GetBannedHeight(), legacyDiff.state.GetBannedHeight());
+    BOOST_CHECK(convertedDiff.state.pubKeyOperator.Get() == legacyDiff.state.pubKeyOperator.Get());
+    BOOST_CHECK_EQUAL(convertedDiff.state.pubKeyOperator.ToString(), legacyDiff.state.pubKeyOperator.ToString());
 }
 
 BOOST_AUTO_TEST_SUITE_END()

From 6decd41809d916ff83d6d3939be1d3de5e483943 Mon Sep 17 00:00:00 2001
From: PastaPastaPasta <6443210+PastaPastaPasta@users.noreply.github.com>
Date: Wed, 12 Nov 2025 09:53:16 -0600
Subject: [PATCH 453/656] chore: limit changes to boost/gmp

---
 configure.ac | 18 ++----------------
 1 file changed, 2 insertions(+), 16 deletions(-)

diff --git a/configure.ac b/configure.ac
index f6653d3ead04..f9138d39821e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -394,22 +394,8 @@ else
     fi
 fi
 
-if test "$enable_stacktraces" != "no"; then
-  AC_CHECK_HEADERS([execinfo.h], [
-    AC_CHECK_HEADERS([backtrace.h], [], [
-      if test "$enable_stacktraces" = "yes"; then
-        AC_MSG_ERROR([backtrace.h not found but --enable-stacktraces was specified. Install libbacktrace or use --disable-stacktraces.])
-      fi
-      AC_MSG_WARN([backtrace.h not found. Stacktraces will be disabled.])
-      enable_stacktraces=no
-    ])
-  ], [
-    if test "$enable_stacktraces" = "yes"; then
-      AC_MSG_ERROR([execinfo.h not found but --enable-stacktraces was specified. Stacktraces require execinfo.h. Use --disable-stacktraces.])
-    fi
-    AC_MSG_WARN([execinfo.h not found. Stacktraces will be disabled.])
-    enable_stacktraces=no
-  ])
+if test "$enable_stacktraces" != no; then
+  AC_CHECK_HEADERS([execinfo.h], [], [enable_stacktraces=no])
 fi
 
 AM_CONDITIONAL([ENABLE_STACKTRACES], [test "$enable_stacktraces" = "yes"])

From 046d87a1710e64f64469777ba7995d9d74243ec5 Mon Sep 17 00:00:00 2001
From: Kittywhiskers Van Gogh <63189531+kwvg@users.noreply.github.com>
Date: Thu, 13 Nov 2025 02:07:55 +0530
Subject: [PATCH 454/656] depends: ianlancetaylor/libbacktrace@b9e40069c0

---
 depends/packages/backtrace.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/depends/packages/backtrace.mk b/depends/packages/backtrace.mk
index de7f02fefc18..95717952e388 100644
--- a/depends/packages/backtrace.mk
+++ b/depends/packages/backtrace.mk
@@ -1,9 +1,9 @@
 package=backtrace
-$(package)_version=11427f31a64b11583fec94b4c2a265c7dafb1ab3
+$(package)_version=b9e40069c0b47a722286b94eb5231f7f05c08713
 $(package)_download_path=https://github.com/ianlancetaylor/libbacktrace/archive
 $(package)_download_file=$($(package)_version).tar.gz
 $(package)_file_name=$(package)_$($(package)_version).tar.gz
-$(package)_sha256_hash=76a8348ff04d80141aeb1c0e55879f17f241f38238def0eb1df7c6d1ac1a2c26
+$(package)_sha256_hash=81b37e762965c676b3316e90564c89f6480606add446651c785862571a1fdbca
 
 define $(package)_set_vars
 $(package)_config_opts=--disable-shared --enable-host-shared --prefix=$(host_prefix)

From e41899ef8ee77e4b375c264e9cca5d3c83df3f72 Mon Sep 17 00:00:00 2001
From: Kittywhiskers Van Gogh <63189531+kwvg@users.noreply.github.com>
Date: Thu, 13 Nov 2025 02:25:36 +0530
Subject: [PATCH 455/656] refactor: consolidate enhanced debugging logic

Review with `git log -p -n1 --color-moved=dimmed_zebra`
---
 configure.ac | 61 +++++++++++++++++++++++++---------------------------
 1 file changed, 29 insertions(+), 32 deletions(-)

diff --git a/configure.ac b/configure.ac
index 10898c110c8e..e8265d265ced 100644
--- a/configure.ac
+++ b/configure.ac
@@ -394,29 +394,6 @@ else
     fi
 fi
 
-if test "$enable_stacktraces" != no; then
-  AC_CHECK_HEADERS([execinfo.h], [], [enable_stacktraces=no])
-fi
-
-AM_CONDITIONAL([ENABLE_STACKTRACES], [test "$enable_stacktraces" = "yes"])
-if test "$enable_stacktraces" = "yes"; then
-    AC_DEFINE(ENABLE_STACKTRACES, 1, [Define this symbol if stacktraces should be enabled])
-else
-    enable_crashhooks=no
-fi
-
-AM_CONDITIONAL([ENABLE_CRASH_HOOKS], [test "$enable_crashhooks" = "yes"])
-if test "$enable_crashhooks" = "yes"; then
-    AC_DEFINE(ENABLE_CRASH_HOOKS, 1, [Define this symbol if crash hooks should be enabled])
-fi
-
-AX_CHECK_LINK_FLAG([-Wl,-wrap=__cxa_allocate_exception], [LINK_WRAP_SUPPORTED=yes],,,)
-AM_CONDITIONAL([CRASH_HOOKS_WRAPPED_CXX_ABI],[test $LINK_WRAP_SUPPORTED = "yes"])
-
-if test "$LINK_WRAP_SUPPORTED" = "yes"; then
-  AC_DEFINE(CRASH_HOOKS_WRAPPED_CXX_ABI, 1, [Define this symbol to use wrapped CXX ABIs for exception stacktraces])
-fi
-
 # Needed for MinGW targets when debug symbols are enabled as compiled objects get very large
 AX_CHECK_COMPILE_FLAG([-Wa,-mbig-obj], [DEBUG_CXXFLAGS="$DEBUG_CXXFLAGS -Wa,-mbig-obj"],,,)
 
@@ -1244,6 +1221,35 @@ if test "$use_thread_local" = "yes" || test "$use_thread_local" = "auto"; then
   LDFLAGS="$TEMP_LDFLAGS"
 fi
 
+AC_CHECK_HEADERS([execinfo.h], [], [enable_stacktraces=no])
+if test "$enable_stacktraces" != no; then
+  dnl ensure backtrace() is found, check -lexecinfo if necessary
+  if test "$TARGET_OS" != "windows"; then
+    AC_SEARCH_LIBS([backtrace], [execinfo], [], [
+      AC_MSG_ERROR([Unable to find backtrace()])
+    ])
+  fi
+fi
+
+AM_CONDITIONAL([ENABLE_STACKTRACES], [test "$enable_stacktraces" = "yes"])
+if test "$enable_stacktraces" = "yes"; then
+    AC_DEFINE(ENABLE_STACKTRACES, 1, [Define this symbol if stacktraces should be enabled])
+else
+    enable_crashhooks=no
+fi
+
+AM_CONDITIONAL([ENABLE_CRASH_HOOKS], [test "$enable_crashhooks" = "yes"])
+if test "$enable_crashhooks" = "yes"; then
+    AC_DEFINE(ENABLE_CRASH_HOOKS, 1, [Define this symbol if crash hooks should be enabled])
+fi
+
+AX_CHECK_LINK_FLAG([-Wl,-wrap=__cxa_allocate_exception], [LINK_WRAP_SUPPORTED=yes],,,)
+AM_CONDITIONAL([CRASH_HOOKS_WRAPPED_CXX_ABI],[test $LINK_WRAP_SUPPORTED = "yes"])
+
+if test "$LINK_WRAP_SUPPORTED" = "yes"; then
+  AC_DEFINE(CRASH_HOOKS_WRAPPED_CXX_ABI, 1, [Define this symbol to use wrapped CXX ABIs for exception stacktraces])
+fi
+
 dnl Check for different ways of gathering OS randomness
 AC_MSG_CHECKING([for Linux getrandom syscall])
 AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <unistd.h>
@@ -1285,15 +1291,6 @@ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <sys/types.h>
  [ AC_MSG_RESULT([no])]
 )
 
-dnl ensure backtrace() is found, check -lexecinfo if necessary
-if test "$TARGET_OS" != "windows"; then
-  if test "$enable_stacktraces" != "no"; then
-    AC_SEARCH_LIBS([backtrace], [execinfo], [], [
-      AC_MSG_ERROR([Unable to find backtrace()])
-    ])
-  fi
-fi
-
 AC_MSG_CHECKING([for fdatasync])
 AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <unistd.h>]],
  [[ fdatasync(0); ]])],

From b73deae36322e01ab82e7902ed798f353b8bc241 Mon Sep 17 00:00:00 2001
From: Kittywhiskers Van Gogh <63189531+kwvg@users.noreply.github.com>
Date: Wed, 12 Nov 2025 19:08:56 +0530
Subject: [PATCH 456/656] build: s/BACKTRACE_LIB/BACKTRACE_LIBS/g

Backtrace capabilities require multiple libraries depending on the
platform, let's keep the name more descriptive
---
 src/Makefile.am             | 12 ++++++------
 src/Makefile.bench.include  |  2 +-
 src/Makefile.qt.include     |  2 +-
 src/Makefile.qttest.include |  2 +-
 src/Makefile.test.include   |  4 ++--
 5 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/Makefile.am b/src/Makefile.am
index 9721e8e4f35e..79b6848c8646 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -41,9 +41,9 @@ endif
 endif
 
 if TARGET_WINDOWS
-BACKTRACE_LIB = -ldbghelp -lbacktrace
+BACKTRACE_LIBS = -ldbghelp -lbacktrace
 else
-BACKTRACE_LIB = -lbacktrace
+BACKTRACE_LIBS = -lbacktrace
 endif
 endif #ENABLE_STACKTRACES
 
@@ -1028,7 +1028,7 @@ bitcoin_bin_ldadd = \
   $(LIBMEMENV) \
   $(LIBSECP256K1)
 
-bitcoin_bin_ldadd += $(BACKTRACE_LIB) $(BDB_LIBS) $(MINIUPNPC_LIBS) $(NATPMP_LIBS) $(SQLITE_LIBS) $(EVENT_PTHREADS_LIBS) $(EVENT_LIBS) $(ZMQ_LIBS) $(GMP_LIBS)
+bitcoin_bin_ldadd += $(BACKTRACE_LIBS) $(BDB_LIBS) $(MINIUPNPC_LIBS) $(NATPMP_LIBS) $(SQLITE_LIBS) $(EVENT_PTHREADS_LIBS) $(EVENT_LIBS) $(ZMQ_LIBS) $(GMP_LIBS)
 
 dashd_SOURCES = $(bitcoin_daemon_sources) init/bitcoind.cpp
 dashd_CPPFLAGS = $(bitcoin_bin_cppflags)
@@ -1057,7 +1057,7 @@ dash_cli_LDADD = \
   $(LIBUNIVALUE) \
   $(LIBBITCOIN_UTIL) \
   $(LIBBITCOIN_CRYPTO)
-dash_cli_LDADD += $(BACKTRACE_LIB) $(EVENT_LIBS) $(GMP_LIBS)
+dash_cli_LDADD += $(BACKTRACE_LIBS) $(EVENT_LIBS) $(GMP_LIBS)
 #
 
 # dash-tx binary #
@@ -1079,7 +1079,7 @@ dash_tx_LDADD = \
   $(LIBDASHBLS) \
   $(LIBSECP256K1)
 
-dash_tx_LDADD += $(BACKTRACE_LIB) $(GMP_LIBS)
+dash_tx_LDADD += $(BACKTRACE_LIBS) $(GMP_LIBS)
 #
 
 # dash-wallet binary #
@@ -1097,7 +1097,7 @@ dash_wallet_LDADD = \
   $(LIBBITCOIN_CRYPTO) \
   $(LIBDASHBLS) \
   $(LIBSECP256K1) \
-  $(BACKTRACE_LIB) \
+  $(BACKTRACE_LIBS) \
   $(BOOST_LIBS) \
   $(BDB_LIBS) \
   $(SQLITE_LIBS) \
diff --git a/src/Makefile.bench.include b/src/Makefile.bench.include
index 345752eeddfd..be7bfe2d2dcc 100644
--- a/src/Makefile.bench.include
+++ b/src/Makefile.bench.include
@@ -81,7 +81,7 @@ bench_bench_dash_LDADD = \
   $(MINIUPNPC_LIBS) \
   $(NATPMP_LIBS) \
   $(GMP_LIBS) \
-  $(BACKTRACE_LIB)
+  $(BACKTRACE_LIBS)
 
 if ENABLE_ZMQ
 bench_bench_dash_LDADD += $(LIBBITCOIN_ZMQ) $(ZMQ_LIBS)
diff --git a/src/Makefile.qt.include b/src/Makefile.qt.include
index 932b7a2f64ac..488cbb21ff78 100644
--- a/src/Makefile.qt.include
+++ b/src/Makefile.qt.include
@@ -417,7 +417,7 @@ if ENABLE_ZMQ
 bitcoin_qt_ldadd += $(LIBBITCOIN_ZMQ) $(ZMQ_LIBS)
 endif
 bitcoin_qt_ldadd += $(LIBBITCOIN_CLI) $(LIBBITCOIN_COMMON) $(LIBBITCOIN_UTIL) $(LIBBITCOIN_CONSENSUS) $(LIBBITCOIN_CRYPTO) $(LIBDASHBLS) $(LIBUNIVALUE) $(LIBLEVELDB) $(LIBMEMENV) \
-  $(BACKTRACE_LIB) $(QT_LIBS) $(QT_DBUS_LIBS) $(QR_LIBS) $(BDB_LIBS) $(MINIUPNPC_LIBS) $(NATPMP_LIBS) $(SQLITE_LIBS) $(LIBSECP256K1) \
+  $(BACKTRACE_LIBS) $(QT_LIBS) $(QT_DBUS_LIBS) $(QR_LIBS) $(BDB_LIBS) $(MINIUPNPC_LIBS) $(NATPMP_LIBS) $(SQLITE_LIBS) $(LIBSECP256K1) \
   $(EVENT_PTHREADS_LIBS) $(EVENT_LIBS) $(GMP_LIBS)
 bitcoin_qt_ldflags = $(LDFLAGS_WRAP_EXCEPTIONS) $(RELDFLAGS) $(AM_LDFLAGS) $(QT_LDFLAGS) $(LIBTOOL_APP_LDFLAGS) $(PTHREAD_FLAGS)
 bitcoin_qt_libtoolflags = $(AM_LIBTOOLFLAGS) --tag CXX
diff --git a/src/Makefile.qttest.include b/src/Makefile.qttest.include
index 56e9225cb9da..83cdbefc1424 100644
--- a/src/Makefile.qttest.include
+++ b/src/Makefile.qttest.include
@@ -59,7 +59,7 @@ if ENABLE_ZMQ
 qt_test_test_dash_qt_LDADD += $(LIBBITCOIN_ZMQ) $(ZMQ_LIBS)
 endif
 qt_test_test_dash_qt_LDADD += $(LIBBITCOIN_CLI) $(LIBBITCOIN_COMMON) $(LIBBITCOIN_UTIL) $(LIBBITCOIN_CONSENSUS) $(LIBBITCOIN_CRYPTO) $(LIBDASHBLS) $(LIBUNIVALUE) $(LIBLEVELDB) \
-  $(LIBMEMENV) $(BACKTRACE_LIB) $(QT_LIBS) $(QT_DBUS_LIBS) $(QT_TEST_LIBS) \
+  $(LIBMEMENV) $(BACKTRACE_LIBS) $(QT_LIBS) $(QT_DBUS_LIBS) $(QT_TEST_LIBS) \
   $(QR_LIBS) $(BDB_LIBS) $(MINIUPNPC_LIBS) $(NATPMP_LIBS) $(SQLITE_LIBS) $(LIBSECP256K1) \
   $(EVENT_PTHREADS_LIBS) $(EVENT_LIBS) $(GMP_LIBS)
 qt_test_test_dash_qt_LDFLAGS = $(LDFLAGS_WRAP_EXCEPTIONS) $(RELDFLAGS) $(AM_LDFLAGS) $(QT_LDFLAGS) $(LIBTOOL_APP_LDFLAGS) $(PTHREAD_FLAGS)
diff --git a/src/Makefile.test.include b/src/Makefile.test.include
index ecce78db38f1..194957d28f2b 100644
--- a/src/Makefile.test.include
+++ b/src/Makefile.test.include
@@ -60,7 +60,7 @@ FUZZ_SUITE_LD_COMMON = \
  $(EVENT_LIBS) \
  $(EVENT_PTHREADS_LIBS) \
  $(GMP_LIBS) \
- $(BACKTRACE_LIB)
+ $(BACKTRACE_LIBS)
 
 if USE_UPNP
 FUZZ_SUITE_LD_COMMON += $(MINIUPNPC_LIBS)
@@ -256,7 +256,7 @@ test_test_dash_LDADD += $(LIBBITCOIN_WALLET)
 test_test_dash_CPPFLAGS += $(BDB_CPPFLAGS)
 endif
 test_test_dash_LDADD += $(LIBBITCOIN_NODE) $(LIBBITCOIN_CLI) $(LIBBITCOIN_COMMON) $(LIBBITCOIN_UTIL) $(LIBBITCOIN_CONSENSUS) $(LIBBITCOIN_CRYPTO) $(LIBUNIVALUE) \
-  $(LIBDASHBLS) $(LIBLEVELDB) $(LIBMEMENV) $(BACKTRACE_LIB) $(LIBSECP256K1) $(EVENT_LIBS) $(EVENT_PTHREADS_LIBS) $(MINISKETCH_LIBS)
+  $(LIBDASHBLS) $(LIBLEVELDB) $(LIBMEMENV) $(BACKTRACE_LIBS) $(LIBSECP256K1) $(EVENT_LIBS) $(EVENT_PTHREADS_LIBS) $(MINISKETCH_LIBS)
 test_test_dash_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS)
 
 test_test_dash_LDADD += $(BDB_LIBS) $(MINIUPNPC_LIBS) $(SQLITE_LIBS) $(NATPMP_LIBS) $(EVENT_PTHREADS_LIBS) $(EVENT_LIBS) $(GMP_LIBS)

From bc762ccba9d25f0f9a129155c2c2aa964800441c Mon Sep 17 00:00:00 2001
From: Kittywhiskers Van Gogh <63189531+kwvg@users.noreply.github.com>
Date: Wed, 12 Nov 2025 21:03:05 +0530
Subject: [PATCH 457/656] build: move `BACKTRACE_LIBS` determination to
 `configure.ac`

Library-specific details are ill-suited for Makefiles
---
 configure.ac    | 19 ++++++++++++-------
 src/Makefile.am | 14 ++++----------
 2 files changed, 16 insertions(+), 17 deletions(-)

diff --git a/configure.ac b/configure.ac
index e8265d265ced..6e0a3e3b96af 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1221,14 +1221,18 @@ if test "$use_thread_local" = "yes" || test "$use_thread_local" = "auto"; then
   LDFLAGS="$TEMP_LDFLAGS"
 fi
 
-AC_CHECK_HEADERS([execinfo.h], [], [enable_stacktraces=no])
-if test "$enable_stacktraces" != no; then
+BACKTRACE_LIBS=
+if test "$enable_stacktraces" != "no"; then
+  AC_CHECK_HEADERS([execinfo.h], [], [enable_stacktraces=no])
   dnl ensure backtrace() is found, check -lexecinfo if necessary
-  if test "$TARGET_OS" != "windows"; then
-    AC_SEARCH_LIBS([backtrace], [execinfo], [], [
-      AC_MSG_ERROR([Unable to find backtrace()])
-    ])
-  fi
+  AC_SEARCH_LIBS([backtrace], [execinfo], [
+    if test "$TARGET_OS" = "windows"; then
+      BACKTRACE_LIBS="$BACKTRACE_LIBS -ldbghelp"
+    fi
+    BACKTRACE_LIBS="$BACKTRACE_LIBS -lbacktrace"
+  ], [
+    AC_MSG_ERROR([Unable to find backtrace()])
+  ])
 fi
 
 AM_CONDITIONAL([ENABLE_STACKTRACES], [test "$enable_stacktraces" = "yes"])
@@ -1983,6 +1987,7 @@ AC_SUBST(USE_QRCODE)
 AC_SUBST(TESTDEFS)
 AC_SUBST(MINIUPNPC_CPPFLAGS)
 AC_SUBST(MINIUPNPC_LIBS)
+AC_SUBST(BACKTRACE_LIBS)
 AC_SUBST(GMP_LIBS)
 AC_SUBST(NATPMP_CPPFLAGS)
 AC_SUBST(NATPMP_LIBS)
diff --git a/src/Makefile.am b/src/Makefile.am
index 79b6848c8646..fc8879d221a4 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -36,16 +36,10 @@ if TARGET_WINDOWS
 LDFLAGS_WRAP_EXCEPTIONS += -Wl,-wrap,_assert -Wl,-wrap,_wassert
 else
 LDFLAGS_WRAP_EXCEPTIONS += -Wl,-wrap,__assert_fail
-endif
-endif
-endif
-
-if TARGET_WINDOWS
-BACKTRACE_LIBS = -ldbghelp -lbacktrace
-else
-BACKTRACE_LIBS = -lbacktrace
-endif
-endif #ENABLE_STACKTRACES
+endif # TARGET_WINDOWS
+endif # CRASH_HOOKS_WRAPPED_CXX_ABI
+endif # ENABLE_CRASH_HOOKS
+endif # ENABLE_STACKTRACES
 
 BITCOIN_INCLUDES=-I$(builddir) -I$(srcdir)/$(MINISKETCH_INCLUDE_DIR_INT) -I$(srcdir)/secp256k1/include -I$(srcdir)/$(UNIVALUE_INCLUDE_DIR_INT) $(LEVELDB_CPPFLAGS)
 BITCOIN_INCLUDES+=-isystem$(srcdir)/dashbls/include -isystem$(srcdir)/dashbls/depends/relic/include -isystem$(srcdir)/dashbls/depends/minialloc/include

From 496ed897c5a744382895f7b6186520961f007d84 Mon Sep 17 00:00:00 2001
From: UdjinM6 <UdjinM6@users.noreply.github.com>
Date: Thu, 13 Nov 2025 03:06:51 +0300
Subject: [PATCH 458/656] refactor: add BuildNewListFromBlock overload
 accepting explicit prevList

Add overload that takes an explicit starting CDeterministicMNList instead of
loading from GetListForBlock. This allows rebuilding masternode lists from
trusted snapshots without depending on potentially corrupted diffs in the
database.

Key changes:
- Add new overload taking prevList parameter (specialtxman.h)
- Refactor original method to delegate to new overload (specialtxman.cpp)
- Add assert to verify prevList is either empty or matches previous block
- Skip collateral validation when using dummy coins view (historical blocks)

Co-authored-by: Claude (Anthropic AI) <noreply@anthropic.com>
---
 src/evo/specialtxman.cpp | 35 +++++++++++++++++++++++++++--------
 src/evo/specialtxman.h   |  7 +++++++
 2 files changed, 34 insertions(+), 8 deletions(-)

diff --git a/src/evo/specialtxman.cpp b/src/evo/specialtxman.cpp
index 35d3fe14bc43..c3cdb823cc45 100644
--- a/src/evo/specialtxman.cpp
+++ b/src/evo/specialtxman.cpp
@@ -176,10 +176,24 @@ bool CSpecialTxProcessor::BuildNewListFromBlock(const CBlock& block, gsl::not_nu
                                                 BlockValidationState& state, CDeterministicMNList& mnListRet)
 {
     AssertLockHeld(cs_main);
+    CDeterministicMNList oldList = m_dmnman.GetListForBlock(pindexPrev);
+    return BuildNewListFromBlock(block, pindexPrev, oldList, view, debugLogs, state, mnListRet);
+}
+
+bool CSpecialTxProcessor::BuildNewListFromBlock(const CBlock& block, gsl::not_null<const CBlockIndex*> pindexPrev,
+                                                const CDeterministicMNList& prevList, const CCoinsViewCache& view,
+                                                bool debugLogs, BlockValidationState& state,
+                                                CDeterministicMNList& mnListRet)
+{
+    AssertLockHeld(cs_main);
+
+    // Verify that prevList either represents an empty/initial state (default-constructed),
+    // or it matches the previous block's hash.
+    assert(prevList == CDeterministicMNList() || prevList.GetBlockHash() == pindexPrev->GetBlockHash());
 
     int nHeight = pindexPrev->nHeight + 1;
 
-    CDeterministicMNList oldList = m_dmnman.GetListForBlock(pindexPrev);
+    CDeterministicMNList oldList = prevList;
     CDeterministicMNList newList = oldList;
     newList.SetBlockHash(uint256()); // we can't know the final block hash, so better not return a (invalid) block hash
     newList.SetHeight(nHeight);
@@ -235,13 +249,18 @@ bool CSpecialTxProcessor::BuildNewListFromBlock(const CBlock& block, gsl::not_nu
                 dmn->collateralOutpoint = proTx.collateralOutpoint;
             }
 
-            Coin coin;
-            CAmount expectedCollateral = GetMnType(proTx.nType).collat_amount;
-            if (!proTx.collateralOutpoint.hash.IsNull() && (!view.GetCoin(dmn->collateralOutpoint, coin) ||
-                                                            coin.IsSpent() || coin.out.nValue != expectedCollateral)) {
-                // should actually never get to this point as CheckProRegTx should have handled this case.
-                // We do this additional check nevertheless to be 100% sure
-                return state.Invalid(BlockValidationResult::BLOCK_CONSENSUS, "bad-protx-collateral");
+            // Complain about spent collaterals only when we process the tip.
+            // This is safe because blocks below the tip were verified
+            // when they were connected initially.
+            if (!view.GetBestBlock().IsNull()) {
+                Coin coin;
+                CAmount expectedCollateral = GetMnType(proTx.nType).collat_amount;
+                if (!proTx.collateralOutpoint.hash.IsNull() && (!view.GetCoin(dmn->collateralOutpoint, coin) ||
+                                                                coin.IsSpent() || coin.out.nValue != expectedCollateral)) {
+                    // should actually never get to this point as CheckProRegTx should have handled this case.
+                    // We do this additional check nevertheless to be 100% sure
+                    return state.Invalid(BlockValidationResult::BLOCK_CONSENSUS, "bad-protx-collateral");
+                }
             }
 
             auto replacedDmn = newList.GetMNByCollateral(dmn->collateralOutpoint);
diff --git a/src/evo/specialtxman.h b/src/evo/specialtxman.h
index 84f74cd06e85..0e21dbb0f556 100644
--- a/src/evo/specialtxman.h
+++ b/src/evo/specialtxman.h
@@ -79,6 +79,13 @@ class CSpecialTxProcessor
                                const CCoinsViewCache& view, bool debugLogs, BlockValidationState& state,
                                CDeterministicMNList& mnListRet) EXCLUSIVE_LOCKS_REQUIRED(cs_main);
 
+    // Variant that takes an explicit starting list instead of loading from GetListForBlock
+    // Used for rebuilding diffs from trusted snapshots
+    bool BuildNewListFromBlock(const CBlock& block, gsl::not_null<const CBlockIndex*> pindexPrev,
+                               const CDeterministicMNList& prevList, const CCoinsViewCache& view, bool debugLogs,
+                               BlockValidationState& state, CDeterministicMNList& mnListRet)
+        EXCLUSIVE_LOCKS_REQUIRED(cs_main);
+
 private:
     bool CheckCreditPoolDiffForBlock(const CBlock& block, const CBlockIndex* pindex, const CCbTx& cbTx,
                                      BlockValidationState& state) EXCLUSIVE_LOCKS_REQUIRED(::cs_main);

From 5379fcedaf32ee89569a869dea64b807293b22ff Mon Sep 17 00:00:00 2001
From: UdjinM6 <UdjinM6@users.noreply.github.com>
Date: Thu, 13 Nov 2025 03:09:45 +0300
Subject: [PATCH 459/656] refactor: add CDeterministicMNList::IsEqual method

Add method to compare two masternode lists for equality while ignoring
non-deterministic members (nTotalRegisteredCount, internalId).

Non-deterministic members can differ between nodes due to different sync
histories but don't affect consensus validity. This method is useful for
verifying that masternode list states match after applying diffs.

Key features:
- Compares blockHash, nHeight, and mnUniquePropertyMap
- Compares map sizes (but not nTotalRegisteredCount)
- Iterates through all masternodes comparing deterministic fields
- Uses SerializeHash for pdmnState to avoid enumerating all fields

Co-authored-by: Claude (Anthropic AI) <noreply@anthropic.com>
---
 src/evo/deterministicmns.h | 40 ++++++++++++++++++++++++++++++++++++++
 1 file changed, 40 insertions(+)

diff --git a/src/evo/deterministicmns.h b/src/evo/deterministicmns.h
index fe5a4f1dd787..4ea687ce60e3 100644
--- a/src/evo/deterministicmns.h
+++ b/src/evo/deterministicmns.h
@@ -436,6 +436,46 @@ class CDeterministicMNList
         return GetMN(p->first);
     }
 
+    // Compare two masternode lists for equality, ignoring non-deterministic members.
+    // Non-deterministic members (nTotalRegisteredCount, internalId) can differ between
+    // nodes due to different sync histories, but don't affect consensus validity.
+    bool IsEqual(const CDeterministicMNList& rhs) const
+    {
+        // Compare deterministic metadata
+        if (blockHash != rhs.blockHash ||
+            nHeight != rhs.nHeight ||
+            mnUniquePropertyMap != rhs.mnUniquePropertyMap) {
+            return false;
+        }
+
+        // Compare map sizes (actual entries compared below)
+        // Note: Not comparing nTotalRegisteredCount (non-deterministic)
+        if (mnMap.size() != rhs.mnMap.size() ||
+            mnInternalIdMap.size() != rhs.mnInternalIdMap.size()) {
+            return false;
+        }
+
+        // Compare each masternode entry
+        for (const auto& [proTxHash, dmn] : mnMap) {
+            auto dmn_rhs = rhs.mnMap.find(proTxHash);
+            if (dmn_rhs == nullptr) {
+                return false;
+            }
+
+            // Compare deterministic masternode fields
+            // Note: Not comparing internalId (non-deterministic)
+            if (dmn->proTxHash != dmn_rhs->get()->proTxHash ||
+                dmn->collateralOutpoint != dmn_rhs->get()->collateralOutpoint ||
+                dmn->nOperatorReward != dmn_rhs->get()->nOperatorReward ||
+                dmn->nType != dmn_rhs->get()->nType ||
+                // Use SerializeHash for pdmnState to avoid enumerating all state fields
+                SerializeHash(*dmn->pdmnState) != SerializeHash(*dmn_rhs->get()->pdmnState)) {
+                return false;
+            }
+        }
+        return true;
+    }
+
 private:
     template <typename T>
     [[nodiscard]] uint256 GetUniquePropertyHash(const T& v) const

From 449d7fa15fc700c0d878bdfb301e9a4df9c1df6f Mon Sep 17 00:00:00 2001
From: Konstantin Akimov <knstqq@gmail.com>
Date: Thu, 13 Nov 2025 17:33:09 +0700
Subject: [PATCH 460/656] fix: review comments for rpc/quorums help

---
 src/rpc/quorums.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/rpc/quorums.cpp b/src/rpc/quorums.cpp
index 92e578476b47..de50c24b570e 100644
--- a/src/rpc/quorums.cpp
+++ b/src/rpc/quorums.cpp
@@ -251,7 +251,7 @@ static RPCHelpMan quorum_info()
                 GetRpcResult("quorumHash"),
                 GetRpcResult("quorumIndex"),
                 {RPCResult::Type::STR_HEX, "minedBlock", "Blockhash where the commitment was mined."},
-                {RPCResult::Type::NUM, "previousConsecutiveDKGFailures", "Number of previous consecutive DKG failures."},
+                {RPCResult::Type::NUM, "previousConsecutiveDKGFailures", "Number of previous consecutive DKG failures. Only present for rotation-enabled quorums."},
                 {RPCResult::Type::ARR, "members", "Members of quorum",
                     {
                         {RPCResult::Type::OBJ, "", "",
@@ -260,7 +260,8 @@ static RPCHelpMan quorum_info()
                             GetRpcResult("service"),
                             GetRpcResult("addresses"),
                             GetRpcResult("pubKeyOperator"),
-                            {RPCResult::Type::BOOL, "valid", "True is member valid for this DKG"}
+                            {RPCResult::Type::BOOL, "valid", "True if member is valid for this DKG"},
+                            {RPCResult::Type::STR_HEX, "pubKeyShare", /*optional=*/true, "Share of BLS public key of the member. Only present if member is valid."}
                         }},
                     },
                 },

From 17b556ae09bdc465b44fe55d44c401a0f327d945 Mon Sep 17 00:00:00 2001
From: UdjinM6 <UdjinM6@users.noreply.github.com>
Date: Thu, 13 Nov 2025 03:15:14 +0300
Subject: [PATCH 461/656] feat: add evodb verify and repair RPC commands

Add two new RPC commands for verifying and repairing corrupted evodb diff
records between snapshots stored every 576 blocks.

evodb verify (read-only):
- Verifies that applying stored diffs between snapshots produces correct results
- Reports verification errors without modifying database
- Defaults to full range from DIP0003 activation to chain tip

evodb repair (writes to database):
- First runs verification on all snapshot pairs
- For failed pairs, recalculates diffs from actual blockchain data
- Writes repaired diffs to database using efficient batching (16MB chunks)
- Clears both diff and list caches to prevent serving stale data
- Only commits repairs if recalculation verification passes

Key implementation details:
- Uses BuildNewListFromBlock overload with dummy coins view to avoid UTXO lookups
- Breaks circular dependency by rebuilding from trusted snapshots, not corrupted diffs
- Handles missing initial snapshot at DIP0003 (creates empty list)
- Treats any other missing snapshot as critical error requiring reindex
- Logs progress every 100 snapshot pairs to avoid spam
- Separate error reporting for verification vs repair phases

New public types:
- CDeterministicMNManager::RecalcDiffsResult - result struct with detailed stats
- Forward declarations for ChainstateManager and CSpecialTxProcessor

Co-authored-by: Claude (Anthropic AI) <noreply@anthropic.com>
---
 src/evo/deterministicmns.cpp | 344 +++++++++++++++++++++++++++++++++++
 src/evo/deterministicmns.h   |  40 ++++
 src/rpc/evo.cpp              | 171 +++++++++++++++++
 3 files changed, 555 insertions(+)

diff --git a/src/evo/deterministicmns.cpp b/src/evo/deterministicmns.cpp
index d8140aa0db90..a56950f89d65 100644
--- a/src/evo/deterministicmns.cpp
+++ b/src/evo/deterministicmns.cpp
@@ -25,6 +25,7 @@
 #include <util/irange.h>
 #include <util/pointer.h>
 
+#include <functional>
 #include <optional>
 #include <memory>
 
@@ -1578,3 +1579,346 @@ bool CDeterministicMNManager::MigrateLegacyDiffs(const CBlockIndex* const tip_in
 
     return true;
 }
+
+CDeterministicMNManager::RecalcDiffsResult CDeterministicMNManager::RecalculateAndRepairDiffs(
+    const CBlockIndex* start_index, const CBlockIndex* stop_index, ChainstateManager& chainman,
+    BuildListFromBlockFunc build_list_func, bool repair)
+{
+    AssertLockHeld(::cs_main);
+
+    RecalcDiffsResult result;
+    result.start_height = start_index->nHeight;
+    result.stop_height = stop_index->nHeight;
+
+    const auto& consensus_params = Params().GetConsensus();
+
+    // Clamp start height to DIP0003 activation (no snapshots/diffs exist before this)
+    if (start_index->nHeight < consensus_params.DIP0003Height) {
+        start_index = stop_index->GetAncestor(consensus_params.DIP0003Height);
+        if (!start_index) {
+            result.verification_errors.push_back(strprintf("Stop height %d is below DIP0003 activation height %d",
+                                                           stop_index->nHeight, consensus_params.DIP0003Height));
+            return result;
+        }
+        LogPrintf("CDeterministicMNManager::%s -- Clamped start height from %d to DIP0003 activation height %d\n",
+                  __func__, result.start_height, consensus_params.DIP0003Height);
+        // Update result to reflect the clamped start height
+        result.start_height = start_index->nHeight;
+    }
+
+    // Collect all snapshot blocks in the range
+    std::vector<const CBlockIndex*> snapshot_blocks = CollectSnapshotBlocks(start_index, stop_index, consensus_params);
+
+    if (snapshot_blocks.empty()) {
+        result.verification_errors.push_back("Could not find starting snapshot");
+        return result;
+    }
+
+    if (snapshot_blocks.size() < 2) {
+        result.verification_errors.push_back(strprintf("Need at least 2 snapshots, found %d", snapshot_blocks.size()));
+        return result;
+    }
+
+    LogPrintf("CDeterministicMNManager::%s -- Processing %d snapshot pairs between heights %d and %d\n", __func__,
+              snapshot_blocks.size() - 1, result.start_height, result.stop_height);
+
+    // Storage for recalculated diffs if we plan to repair
+    std::vector<std::pair<uint256, CDeterministicMNListDiff>> recalculated_diffs;
+
+    // Process each pair of consecutive snapshots
+    for (size_t i = 0; i < snapshot_blocks.size() - 1; ++i) {
+        const CBlockIndex* from_index = snapshot_blocks[i];
+        const CBlockIndex* to_index = snapshot_blocks[i + 1];
+
+        // Load the snapshots from disk
+        CDeterministicMNList from_snapshot;
+        CDeterministicMNList to_snapshot;
+
+        bool has_from_snapshot;
+        bool has_to_snapshot;
+        {
+            LOCK(cs);
+            has_from_snapshot = m_evoDb.Read(std::make_pair(DB_LIST_SNAPSHOT, from_index->GetBlockHash()), from_snapshot);
+            has_to_snapshot = m_evoDb.Read(std::make_pair(DB_LIST_SNAPSHOT, to_index->GetBlockHash()), to_snapshot);
+        }
+
+        // Handle missing snapshots
+        if (!has_from_snapshot) {
+            // The initial snapshot at DIP0003 activation might not exist in the database on nodes
+            // that synced before the fix to explicitly write it. This is the only acceptable case.
+            if (from_index->nHeight == consensus_params.DIP0003Height) {
+                // Create an empty initial snapshot (matching what GetListForBlockInternal does)
+                from_snapshot = CDeterministicMNList(from_index->GetBlockHash(), from_index->nHeight, 0);
+                LogPrintf("CDeterministicMNManager::%s -- Using empty initial snapshot at DIP0003 height %d\n",
+                          __func__, from_index->nHeight);
+            } else {
+                // Any other missing snapshot is critical corruption beyond our repair capability
+                result.verification_errors.push_back(strprintf("CRITICAL: Snapshot missing at height %d. "
+                    "This cannot be repaired by this tool - full reindex required.", from_index->nHeight));
+                return result;
+            }
+        }
+
+        if (!has_to_snapshot) {
+            // Missing target snapshot is always critical - we cannot repair snapshots, only diffs
+            result.verification_errors.push_back(strprintf("CRITICAL: Snapshot missing at height %d. "
+                "This cannot be repaired by this tool - full reindex required.", to_index->nHeight));
+            return result;
+        }
+
+        // Verify this snapshot pair
+        bool is_snapshot_pair_valid;
+        {
+            LOCK(cs);
+            is_snapshot_pair_valid = VerifySnapshotPair(from_index, to_index, from_snapshot, to_snapshot, result, i, snapshot_blocks.size() - 1);
+        }
+
+        // If repair mode is enabled and verification failed, recalculate diffs from blockchain
+        if (repair && !is_snapshot_pair_valid) {
+            auto temp_diffs = RepairSnapshotPair(from_index, to_index, from_snapshot, to_snapshot, build_list_func, result);
+            if (temp_diffs.empty()) {
+                // RepairSnapshotPair failed - this is a critical error, cannot continue
+                return result;
+            }
+            // Only commit diffs if recalculation verification passed
+            recalculated_diffs.insert(recalculated_diffs.end(), temp_diffs.begin(), temp_diffs.end());
+            result.diffs_recalculated += temp_diffs.size();
+        }
+    }
+
+    // Write repaired diffs to database
+    if (repair) {
+        LOCK(cs);
+        WriteRepairedDiffs(recalculated_diffs, result);
+    }
+
+    return result;
+}
+
+std::vector<const CBlockIndex*> CDeterministicMNManager::CollectSnapshotBlocks(
+    const CBlockIndex* start_index, const CBlockIndex* stop_index, const Consensus::Params& consensus_params)
+{
+    AssertLockHeld(::cs_main);
+
+    std::vector<const CBlockIndex*> snapshot_blocks;
+
+    // Add the starting snapshot (find the snapshot at or before start)
+    // Walk backwards to find a snapshot block (divisible by DISK_SNAPSHOT_PERIOD)
+    // or the initial snapshot at DIP0003 activation height
+    const CBlockIndex* snapshot_start_index = start_index;
+    while (snapshot_start_index && snapshot_start_index->nHeight > consensus_params.DIP0003Height &&
+           (snapshot_start_index->nHeight % DISK_SNAPSHOT_PERIOD) != 0) {
+        snapshot_start_index = snapshot_start_index->pprev;
+    }
+
+    if (!snapshot_start_index) {
+        return snapshot_blocks; // Empty vector indicates error
+    }
+
+    // Collect all snapshot blocks up to and including the stop block
+    snapshot_blocks.push_back(snapshot_start_index);
+
+    // Find all subsequent snapshot heights
+    int current_snapshot_height = snapshot_start_index->nHeight;
+    while (true) {
+        // Calculate next snapshot height
+        int next_snapshot_height;
+        if (current_snapshot_height == consensus_params.DIP0003Height) {
+            // If we're at DIP0003 activation (initial snapshot), next is at first regular interval
+            next_snapshot_height = ((consensus_params.DIP0003Height / DISK_SNAPSHOT_PERIOD) + 1) * DISK_SNAPSHOT_PERIOD;
+        } else {
+            // Otherwise, add DISK_SNAPSHOT_PERIOD
+            next_snapshot_height = current_snapshot_height + DISK_SNAPSHOT_PERIOD;
+        }
+
+        if (next_snapshot_height > stop_index->nHeight) {
+            break;
+        }
+
+        const CBlockIndex* next_snapshot_index = stop_index->GetAncestor(next_snapshot_height);
+        if (!next_snapshot_index) {
+            break;
+        }
+
+        snapshot_blocks.push_back(next_snapshot_index);
+        current_snapshot_height = next_snapshot_height;
+    }
+
+    return snapshot_blocks;
+}
+
+bool CDeterministicMNManager::VerifySnapshotPair(
+    const CBlockIndex* from_index, const CBlockIndex* to_index, const CDeterministicMNList& from_snapshot,
+    const CDeterministicMNList& to_snapshot, RecalcDiffsResult& result, size_t pair_index, size_t total_pairs)
+{
+    AssertLockHeld(cs);
+    AssertLockHeld(::cs_main);
+
+    // Log progress periodically (every 100 snapshot pairs) to avoid spam
+    if (pair_index % 100 == 0) {
+        LogPrintf("CDeterministicMNManager::%s -- Progress: verifying snapshot pair %d/%d (heights %d-%d)\n",
+                  __func__, pair_index + 1, total_pairs, from_index->nHeight, to_index->nHeight);
+    }
+
+    // Verify this snapshot pair by applying all stored diffs sequentially
+    CDeterministicMNList test_list = from_snapshot;
+
+    try {
+        for (int nHeight = from_index->nHeight + 1; nHeight <= to_index->nHeight; ++nHeight) {
+            const CBlockIndex* pIndex = to_index->GetAncestor(nHeight);
+            if (!pIndex) {
+                result.verification_errors.push_back(strprintf("Failed to get ancestor at height %d", nHeight));
+                return false;
+            }
+
+            CDeterministicMNListDiff diff;
+            if (!m_evoDb.Read(std::make_pair(DB_LIST_DIFF, pIndex->GetBlockHash()), diff)) {
+                result.verification_errors.push_back(strprintf("Failed to read diff at height %d", nHeight));
+                return false;
+            }
+
+            diff.nHeight = nHeight;
+            test_list.ApplyDiff(pIndex, diff);
+        }
+    } catch (const std::exception& e) {
+        result.verification_errors.push_back(strprintf("Exception during verification: %s", e.what()));
+        return false;
+    }
+
+    // Verify that applying all diffs results in the target snapshot
+    bool is_snapshot_pair_valid = test_list.IsEqual(to_snapshot);
+
+    if (is_snapshot_pair_valid) {
+        result.snapshots_verified++;
+    } else {
+        result.verification_errors.push_back(
+            strprintf("Verification failed between snapshots at heights %d and %d: "
+                      "Applied diffs do not match target snapshot",
+                      from_index->nHeight, to_index->nHeight));
+    }
+
+    return is_snapshot_pair_valid;
+}
+
+std::vector<std::pair<uint256, CDeterministicMNListDiff>> CDeterministicMNManager::RepairSnapshotPair(
+    const CBlockIndex* from_index, const CBlockIndex* to_index, const CDeterministicMNList& from_snapshot,
+    const CDeterministicMNList& to_snapshot, BuildListFromBlockFunc build_list_func, RecalcDiffsResult& result)
+{
+    AssertLockHeld(::cs_main);
+
+    CDeterministicMNList current_list = from_snapshot;
+    // Temporary storage for recalculated diffs (one per block in this snapshot interval)
+    std::vector<std::pair<uint256, CDeterministicMNListDiff>> temp_diffs;
+    temp_diffs.reserve(to_index->nHeight - from_index->nHeight);
+
+    LogPrintf("CDeterministicMNManager::%s -- Repairing: recalculating diffs between snapshots at heights %d and %d\n",
+              __func__, from_index->nHeight, to_index->nHeight);
+
+    try {
+        for (int nHeight = from_index->nHeight + 1; nHeight <= to_index->nHeight; ++nHeight) {
+            const CBlockIndex* pIndex = to_index->GetAncestor(nHeight);
+
+            // Read the actual block from disk
+            CBlock block;
+            if (!node::ReadBlockFromDisk(block, pIndex, Params().GetConsensus())) {
+                result.repair_errors.push_back(strprintf("CRITICAL: Failed to read block at height %d. "
+                    "Cannot repair - full reindex required.", nHeight));
+                return {}; // Critical error - cannot continue repair
+            }
+
+            // Use a dummy coins view to avoid UTXO lookups. At chain tip, coins from
+            // historical blocks may already be spent. Since these blocks were fully
+            // validated when originally connected, we don't need to re-verify coin
+            // availability - we only need to extract special transactions.
+            CCoinsView view_dummy;
+            CCoinsViewCache view(&view_dummy);
+
+            // Build the new list by processing this block's special transactions
+            // Starting from current_list (our trusted state), not from corrupted diffs
+            CDeterministicMNList next_list;
+            BlockValidationState state;
+            if (!build_list_func(block, pIndex->pprev, current_list, view, false, state, next_list)) {
+                result.repair_errors.push_back(
+                    strprintf("CRITICAL: Failed to build list for block at height %d: %s. "
+                              "Cannot repair - full reindex required.", nHeight, state.ToString()));
+                return {}; // Critical error - cannot continue repair
+            }
+
+            // Set the correct block hash
+            next_list.SetBlockHash(pIndex->GetBlockHash());
+
+            // Calculate the diff between current and next
+            CDeterministicMNListDiff recalc_diff = current_list.BuildDiff(next_list);
+            recalc_diff.nHeight = nHeight;
+            // Store in temporary vector for this snapshot pair
+            temp_diffs.emplace_back(pIndex->GetBlockHash(), recalc_diff);
+
+            // Move forward
+            current_list = std::move(next_list);
+        }
+
+        // Verify that applying all diffs results in the target snapshot
+        if (current_list.IsEqual(to_snapshot)) {
+            LogPrintf("CDeterministicMNManager::%s -- Successfully recalculated %d diffs between heights %d and %d\n",
+                      __func__, temp_diffs.size(), from_index->nHeight, to_index->nHeight);
+            return temp_diffs; // Success - return recalculated diffs
+        } else {
+            result.repair_errors.push_back(
+                strprintf("CRITICAL: Recalculation failed between snapshots at heights %d and %d: "
+                          "Applied diffs do not match target snapshot. Cannot repair - full reindex required.",
+                          from_index->nHeight, to_index->nHeight));
+            return {}; // Failed verification - return empty vector
+        }
+    } catch (const std::exception& e) {
+        result.repair_errors.push_back(strprintf("CRITICAL: Exception during recalculation: %s. "
+                                                  "Cannot repair - full reindex required.", e.what()));
+        return {}; // Exception - return empty vector
+    }
+}
+
+void CDeterministicMNManager::WriteRepairedDiffs(
+    const std::vector<std::pair<uint256, CDeterministicMNListDiff>>& recalculated_diffs, RecalcDiffsResult& result)
+{
+    AssertLockHeld(cs);
+
+    if (recalculated_diffs.empty()) {
+        return;
+    }
+
+    CDBBatch batch(m_evoDb.GetRawDB());
+    const size_t BATCH_SIZE_THRESHOLD = 1 << 24; // 16MB
+    size_t diffs_written = 0;
+
+    LogPrintf("CDeterministicMNManager::%s -- Writing %d repaired diffs to database...\n",
+              __func__, recalculated_diffs.size());
+
+    for (const auto& [block_hash, diff] : recalculated_diffs) {
+        batch.Write(std::make_pair(DB_LIST_DIFF, block_hash), diff);
+        diffs_written++;
+
+        // Write batch when it gets too large
+        if (batch.SizeEstimate() >= BATCH_SIZE_THRESHOLD) {
+            LogPrintf("CDeterministicMNManager::%s -- Flushing batch (%d diffs written so far)...\n",
+                      __func__, diffs_written);
+            m_evoDb.GetRawDB().WriteBatch(batch);
+            batch.Clear();
+        }
+    }
+
+    // Write any remaining diffs in the batch
+    if (batch.SizeEstimate() > 0) {
+        LogPrintf("CDeterministicMNManager::%s -- Writing final batch...\n", __func__);
+        m_evoDb.GetRawDB().WriteBatch(batch);
+        batch.Clear();
+    }
+
+    // Clear caches for repaired diffs so next read gets fresh data from disk
+    // Must clear both diff cache and list cache since lists were built from old diffs
+    for (const auto& [block_hash, diff] : recalculated_diffs) {
+        mnListDiffsCache.erase(block_hash);
+        mnListsCache.erase(block_hash);
+    }
+
+    LogPrintf("CDeterministicMNManager::%s -- Successfully repaired %d diffs (caches cleared)\n", __func__,
+              recalculated_diffs.size());
+}
diff --git a/src/evo/deterministicmns.h b/src/evo/deterministicmns.h
index 4ea687ce60e3..5ba66a46543f 100644
--- a/src/evo/deterministicmns.h
+++ b/src/evo/deterministicmns.h
@@ -34,6 +34,8 @@ class CEvoDB;
 class CSimplifiedMNList;
 class CSimplifiedMNListEntry;
 class CMasternodeMetaMan;
+class ChainstateManager;
+class CSpecialTxProcessor;
 class TxValidationState;
 struct RPCResult;
 
@@ -718,6 +720,31 @@ class CDeterministicMNManager
 
     void DoMaintenance() EXCLUSIVE_LOCKS_REQUIRED(!cs, !cs_cleanup);
 
+    // Recalculate and optionally repair diffs between snapshots
+    struct RecalcDiffsResult {
+        int start_height{0};
+        int stop_height{0};
+        int diffs_recalculated{0};
+        int snapshots_verified{0};
+        std::vector<std::string> verification_errors;
+        std::vector<std::string> repair_errors;
+    };
+
+    // Callback type for building a new MN list from a block
+    using BuildListFromBlockFunc = std::function<bool(
+        const CBlock& block,
+        gsl::not_null<const CBlockIndex*> pindexPrev,
+        const CDeterministicMNList& prevList,
+        const CCoinsViewCache& view,
+        bool debugLogs,
+        BlockValidationState& state,
+        CDeterministicMNList& mnListRet)>;
+
+    [[nodiscard]] RecalcDiffsResult RecalculateAndRepairDiffs(
+        const CBlockIndex* start_index, const CBlockIndex* stop_index,
+        ChainstateManager& chainman, BuildListFromBlockFunc build_list_func,
+        bool repair) EXCLUSIVE_LOCKS_REQUIRED(!cs, ::cs_main);
+
     // Migration support for nVersion-first CDeterministicMNStateDiff format
     [[nodiscard]] bool IsMigrationRequired() const EXCLUSIVE_LOCKS_REQUIRED(!cs, ::cs_main);
     [[nodiscard]] bool MigrateLegacyDiffs(const CBlockIndex* const tip_index) EXCLUSIVE_LOCKS_REQUIRED(!cs, ::cs_main);
@@ -725,6 +752,19 @@ class CDeterministicMNManager
 private:
     void CleanupCache(int nHeight) EXCLUSIVE_LOCKS_REQUIRED(cs);
     CDeterministicMNList GetListForBlockInternal(gsl::not_null<const CBlockIndex*> pindex) EXCLUSIVE_LOCKS_REQUIRED(cs);
+
+    // Helper methods for RecalculateAndRepairDiffs
+    std::vector<const CBlockIndex*> CollectSnapshotBlocks(const CBlockIndex* start_index, const CBlockIndex* stop_index,
+                                                           const Consensus::Params& consensus_params) EXCLUSIVE_LOCKS_REQUIRED(::cs_main);
+    bool VerifySnapshotPair(const CBlockIndex* from_index, const CBlockIndex* to_index, const CDeterministicMNList& from_snapshot,
+                            const CDeterministicMNList& to_snapshot, RecalcDiffsResult& result, size_t pair_index,
+                            size_t total_pairs) EXCLUSIVE_LOCKS_REQUIRED(cs, ::cs_main);
+    std::vector<std::pair<uint256, CDeterministicMNListDiff>> RepairSnapshotPair(
+        const CBlockIndex* from_index, const CBlockIndex* to_index, const CDeterministicMNList& from_snapshot,
+        const CDeterministicMNList& to_snapshot, BuildListFromBlockFunc build_list_func, RecalcDiffsResult& result)
+        EXCLUSIVE_LOCKS_REQUIRED(::cs_main);
+    void WriteRepairedDiffs(const std::vector<std::pair<uint256, CDeterministicMNListDiff>>& recalculated_diffs,
+                            RecalcDiffsResult& result) EXCLUSIVE_LOCKS_REQUIRED(cs);
 };
 
 bool CheckProRegTx(CDeterministicMNManager& dmnman, const CTransaction& tx, gsl::not_null<const CBlockIndex*> pindexPrev, TxValidationState& state, const CCoinsViewCache& view, bool check_sigs);
diff --git a/src/rpc/evo.cpp b/src/rpc/evo.cpp
index 1ddd1cfd9980..8b51b19e9705 100644
--- a/src/rpc/evo.cpp
+++ b/src/rpc/evo.cpp
@@ -1752,6 +1752,175 @@ static RPCHelpMan protx_listdiff()
     };
 }
 
+// Helper function for evodb verify/repair commands
+static UniValue evodb_verify_or_repair_impl(const JSONRPCRequest& request, bool repair)
+{
+    const NodeContext& node = EnsureAnyNodeContext(request.context);
+    ChainstateManager& chainman = EnsureChainman(node);
+    CDeterministicMNManager& dmnman = *CHECK_NONFATAL(node.dmnman);
+    CChainstateHelper& chain_helper = *CHECK_NONFATAL(node.chain_helper);
+
+    LOCK(::cs_main);
+
+    const CBlockIndex* start_index;
+    const CBlockIndex* stop_index;
+
+    // Default to DIP0003 activation height if startBlock not specified
+    if (request.params[0].isNull()) {
+        const auto& consensus_params = Params().GetConsensus();
+        start_index = chainman.ActiveChain()[consensus_params.DIP0003Height];
+        if (!start_index) {
+            throw JSONRPCError(RPC_INTERNAL_ERROR, "Cannot find DIP0003 activation block");
+        }
+    } else {
+        uint256 start_block_hash = ParseBlock(request.params[0], chainman, "startBlock");
+        start_index = chainman.m_blockman.LookupBlockIndex(start_block_hash);
+        if (!start_index) {
+            throw JSONRPCError(RPC_INVALID_PARAMETER, "Start block not found");
+        }
+    }
+
+    // Default to chain tip if stopBlock not specified
+    if (request.params[1].isNull()) {
+        stop_index = chainman.ActiveChain().Tip();
+        if (!stop_index) {
+            throw JSONRPCError(RPC_INTERNAL_ERROR, "Cannot find chain tip");
+        }
+    } else {
+        uint256 stop_block_hash = ParseBlock(request.params[1], chainman, "stopBlock");
+        stop_index = chainman.m_blockman.LookupBlockIndex(stop_block_hash);
+        if (!stop_index) {
+            throw JSONRPCError(RPC_INVALID_PARAMETER, "Stop block not found");
+        }
+    }
+
+    int start_height = start_index->nHeight;
+    int stop_height = stop_index->nHeight;
+
+    // Validation
+    if (stop_height < start_height) {
+        throw JSONRPCError(RPC_INVALID_PARAMETER, "stopBlock must be >= startBlock");
+    }
+
+    // Create a callback that wraps CSpecialTxProcessor::BuildNewListFromBlock
+    // NO_THREAD_SAFETY_ANALYSIS: cs_main is held by the calling function (evodb_verify_or_repair_impl)
+    auto build_list_func = [&chain_helper](const CBlock& block, gsl::not_null<const CBlockIndex*> pindexPrev,
+                                           const CDeterministicMNList& prevList, const CCoinsViewCache& view,
+                                           bool debugLogs, BlockValidationState& state,
+                                           CDeterministicMNList& mnListRet) NO_THREAD_SAFETY_ANALYSIS -> bool {
+        return chain_helper.special_tx->BuildNewListFromBlock(block, pindexPrev, prevList, view, debugLogs, state, mnListRet);
+    };
+
+    // Call the dmnman method to do the work
+    auto recalc_result = dmnman.RecalculateAndRepairDiffs(start_index, stop_index, chainman, build_list_func, repair);
+
+    // Convert result to UniValue
+    UniValue result(UniValue::VOBJ);
+    UniValue verification_errors(UniValue::VARR);
+
+    for (const auto& error : recalc_result.verification_errors) {
+        verification_errors.push_back(error);
+    }
+
+    result.pushKV("startHeight", recalc_result.start_height);
+    result.pushKV("stopHeight", recalc_result.stop_height);
+    result.pushKV("diffsRecalculated", recalc_result.diffs_recalculated);
+    result.pushKV("snapshotsVerified", recalc_result.snapshots_verified);
+    result.pushKV("verificationErrors", verification_errors);
+
+    // Only include repair errors if we're in repair mode
+    if (repair) {
+        UniValue repair_errors(UniValue::VARR);
+        for (const auto& error : recalc_result.repair_errors) {
+            repair_errors.push_back(error);
+        }
+        result.pushKV("repairErrors", repair_errors);
+    }
+
+    return result;
+}
+
+static RPCHelpMan evodb_verify()
+{
+    return RPCHelpMan{"evodb verify",
+        "\nVerifies evodb diff records between specified block heights.\n"
+        "Checks that all diffs applied between snapshots in the range match the saved snapshots in evodb.\n"
+        "This is a read-only operation that does not modify the database.\n"
+        "If no heights are specified, defaults to the full range from DIP0003 activation to chain tip.\n",
+        {
+            {"startBlock", RPCArg::Type::NUM, RPCArg::Optional::OMITTED, "The starting block height (defaults to DIP0003 activation height)."},
+            {"stopBlock", RPCArg::Type::NUM, RPCArg::Optional::OMITTED, "The ending block height (defaults to current chain tip)."},
+        },
+        RPCResult{
+            RPCResult::Type::OBJ, "", "",
+            {
+                {RPCResult::Type::NUM, "startHeight", "Actual starting block height (may differ from input if clamped to DIP0003 activation)"},
+                {RPCResult::Type::NUM, "stopHeight", "Ending block height"},
+                {RPCResult::Type::NUM, "diffsRecalculated", "Number of diffs recalculated (always 0 for verify-only mode)"},
+                {RPCResult::Type::NUM, "snapshotsVerified", "Number of snapshot pairs that passed verification"},
+                {RPCResult::Type::ARR, "verificationErrors", "List of verification errors (empty if verification passed)",
+                    {
+                        {RPCResult::Type::STR, "", "Error message"},
+                    }
+                },
+            }
+        },
+        RPCExamples{
+            HelpExampleCli("evodb verify", "")
+            + HelpExampleCli("evodb verify", "1000 2000")
+            + HelpExampleRpc("evodb", "\"verify\"")
+            + HelpExampleRpc("evodb", "\"verify\", 1000, 2000")
+        },
+        [&](const RPCHelpMan& self, const JSONRPCRequest& request) -> UniValue
+{
+    return evodb_verify_or_repair_impl(request, false);
+},
+    };
+}
+
+static RPCHelpMan evodb_repair()
+{
+    return RPCHelpMan{"evodb repair",
+        "\nRepairs corrupted evodb diff records between specified block heights.\n"
+        "First verifies all diffs applied between snapshots in the range.\n"
+        "If verification fails, recalculates diffs from blockchain data and replaces corrupted records.\n"
+        "If no heights are specified, defaults to the full range from DIP0003 activation to chain tip.\n",
+        {
+            {"startBlock", RPCArg::Type::NUM, RPCArg::Optional::OMITTED, "The starting block height (defaults to DIP0003 activation height)."},
+            {"stopBlock", RPCArg::Type::NUM, RPCArg::Optional::OMITTED, "The ending block height (defaults to current chain tip)."},
+        },
+        RPCResult{
+            RPCResult::Type::OBJ, "", "",
+            {
+                {RPCResult::Type::NUM, "startHeight", "Actual starting block height (may differ from input if clamped to DIP0003 activation)"},
+                {RPCResult::Type::NUM, "stopHeight", "Ending block height"},
+                {RPCResult::Type::NUM, "diffsRecalculated", "Number of diffs successfully recalculated and written to database"},
+                {RPCResult::Type::NUM, "snapshotsVerified", "Number of snapshot pairs that passed verification"},
+                {RPCResult::Type::ARR, "verificationErrors", "Errors encountered during verification phase (empty if verification passed)",
+                    {
+                        {RPCResult::Type::STR, "", "Error message"},
+                    }
+                },
+                {RPCResult::Type::ARR, "repairErrors", "Critical errors encountered during repair phase (non-empty means full reindex required)",
+                    {
+                        {RPCResult::Type::STR, "", "Error message"},
+                    }
+                },
+            }
+        },
+        RPCExamples{
+            HelpExampleCli("evodb repair", "")
+            + HelpExampleCli("evodb repair", "1000 2000")
+            + HelpExampleRpc("evodb", "\"repair\"")
+            + HelpExampleRpc("evodb", "\"repair\", 1000, 2000")
+        },
+        [&](const RPCHelpMan& self, const JSONRPCRequest& request) -> UniValue
+{
+    return evodb_verify_or_repair_impl(request, true);
+},
+    };
+}
+
 static RPCHelpMan protx_help()
 {
     return RPCHelpMan{
@@ -1919,6 +2088,8 @@ void RegisterEvoRPCCommands(CRPCTable& tableRPC)
         {"evo", &protx_help},
         {"evo", &protx_diff},
         {"evo", &protx_listdiff},
+        {"hidden", &evodb_verify},
+        {"hidden", &evodb_repair},
     };
     static const CRPCCommand commands_wallet[]{
         {"evo", &protx_list},

From 7decd15718405e22b7ff7e07d252161ba9c91292 Mon Sep 17 00:00:00 2001
From: UdjinM6 <UdjinM6@users.noreply.github.com>
Date: Thu, 13 Nov 2025 12:39:19 +0300
Subject: [PATCH 462/656] docs: add comprehensive evodb verify/repair
 documentation
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Add detailed documentation for the new evodb verify and repair RPC
commands, covering:
- Command syntax and parameters
- Return value specifications
- Verification and repair process details
- Usage guidelines and troubleshooting
- Performance and implementation notes

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude <noreply@anthropic.com>
---
 doc/evodb-verify-repair.md | 160 +++++++++++++++++++++++++++++++++++++
 1 file changed, 160 insertions(+)
 create mode 100644 doc/evodb-verify-repair.md

diff --git a/doc/evodb-verify-repair.md b/doc/evodb-verify-repair.md
new file mode 100644
index 000000000000..5ebb0edf63ec
--- /dev/null
+++ b/doc/evodb-verify-repair.md
@@ -0,0 +1,160 @@
+# EvoDb Verify and Repair RPC Commands
+
+### `evodb verify`
+
+Verifies the integrity of evodb diff records between snapshots stored every 576 blocks.
+
+**Syntax:**
+```
+evodb verify [startBlock] [stopBlock]
+```
+
+**Parameters:**
+- `startBlock` (optional): Starting block height. Defaults to DIP0003 activation height.
+- `stopBlock` (optional): Ending block height. Defaults to current chain tip.
+
+**Returns:**
+```json
+{
+  "startHeight": n,           // Actual starting height (may be clamped to DIP0003)
+  "stopHeight": n,            // Ending block height
+  "diffsRecalculated": 0,     // Always 0 for verify mode
+  "snapshotsVerified": n,     // Number of snapshot pairs that passed verification
+  "verificationErrors": [     // Array of errors (empty if verification passed)
+    "error message",
+    ...
+  ]
+}
+```
+
+**Description:**
+
+This is a **read-only** operation that checks whether applying the stored diffs between consecutive snapshots produces the expected results. It does not modify the database.
+
+The command processes snapshot pairs (snapshots are stored every 576 blocks) and applies all diffs between them, verifying that the result matches the target snapshot. If all verification passes, `verificationErrors` will be empty.
+
+**Use cases:**
+- Diagnose suspected evodb corruption
+- Verify database integrity after hardware issues
+- Confirm successful repair operations
+
+**Example:**
+```bash
+# Verify entire chain
+dash-cli evodb verify
+
+# Verify specific range
+dash-cli evodb verify 1000 10000
+```
+
+---
+
+### `evodb repair`
+
+Repairs corrupted evodb diff records by recalculating them from blockchain data.
+
+**Syntax:**
+```
+evodb repair [startBlock] [stopBlock]
+```
+
+**Parameters:**
+- `startBlock` (optional): Starting block height. Defaults to DIP0003 activation height.
+- `stopBlock` (optional): Ending block height. Defaults to current chain tip.
+
+**Returns:**
+```json
+{
+  "startHeight": n,              // Actual starting height (may be clamped to DIP0003)
+  "stopHeight": n,               // Ending block height
+  "diffsRecalculated": n,        // Number of diffs successfully recalculated
+  "snapshotsVerified": n,        // Number of snapshot pairs that passed verification
+  "verificationErrors": [        // Errors during verification phase
+    "error message",
+    ...
+  ],
+  "repairErrors": [              // Critical errors during repair phase
+    "error message",             // Non-empty means full reindex required
+    ...
+  ]
+}
+```
+
+**Description:**
+
+This command first runs verification on all snapshot pairs in the specified range. For any pairs that fail verification, it recalculates the diffs from actual blockchain data and writes the corrected diffs to the database.
+
+The repair process:
+1. **Verification phase**: Checks all snapshot pairs for corruption
+2. **Repair phase**: For failed pairs, recalculates diffs from blockchain blocks
+3. **Database update**: Writes repaired diffs in efficient 16MB batches
+4. **Cache clearing**: Clears both diff and list caches to prevent serving stale data
+
+**Important notes:**
+- Requires all blockchain data to be available (blocks must not be pruned in the repair range)
+- If repair encounters critical errors (block read failures, missing snapshots), a full reindex is required
+- Critical errors are prefixed with "CRITICAL:" in error messages
+- Successfully repaired diffs are verified before being committed to the database
+
+**Use cases:**
+- Repair corrupted evodb after unclean shutdown
+- Fix database inconsistencies after hardware failures
+- Recover from disk corruption without full reindex (when possible)
+
+**Example:**
+```bash
+# Repair entire chain
+dash-cli evodb repair
+
+# Repair specific range
+dash-cli evodb repair 1000 10000
+```
+
+---
+
+## When to Use These Commands
+
+### Use `evodb verify` when:
+- You suspect evodb corruption but want to diagnose before taking action
+- Verifying integrity after hardware issues or crashes
+- Confirming successful repairs
+
+### Use `evodb repair` when:
+- `evodb verify` reports verification errors
+- You experience masternode list inconsistencies
+- After unclean shutdown or disk errors
+- As an alternative to full reindex when snapshots are intact
+
+### Full reindex required when:
+- Repair reports errors prefixed with "CRITICAL:"
+- Snapshots are missing or corrupted (cannot be repaired by this tool)
+- Block data is unavailable (pruned nodes in repair range)
+
+---
+
+## Technical Details
+
+### Verification Process
+- Processes snapshot pairs sequentially (snapshots stored every 576 blocks)
+- Applies all stored diffs between snapshots
+- Verifies result matches target snapshot using `CDeterministicMNList::IsEqual`
+- Reports all errors without stopping early
+
+### Repair Process
+- Reads actual blockchain blocks from disk
+- Processes special transactions to rebuild masternode lists
+- Uses dummy coins view (avoids UTXO lookups for historical blocks)
+- Calculates correct diffs and verifies before committing
+- Fails fast on critical errors (missing blocks, missing snapshots)
+
+### Performance Considerations
+- Repair is I/O intensive (reads blockchain blocks, writes database)
+- Progress logged every 100 snapshot pairs
+- Database writes batched in 16MB chunks for efficiency
+- Caches cleared after repair to ensure consistency
+
+### Implementation Notes
+- Both commands require `::cs_main` lock
+- Special handling for initial DIP0003 snapshot (may not exist in older databases)
+- Only diffs can be repaired; missing snapshots require full reindex
+- Repair verification must pass before diffs are committed to database

From 6df3a7c4afd4a90e3e9bdceffd65870eb34ace34 Mon Sep 17 00:00:00 2001
From: UdjinM6 <UdjinM6@users.noreply.github.com>
Date: Thu, 13 Nov 2025 14:02:13 +0300
Subject: [PATCH 463/656] docs: add release notes for evodb verify/repair RPCs
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Add release notes for new hidden RPC commands:
- evodb verify: read-only verification of evodb diffs
- evodb repair: repair corrupted diffs from blockchain data

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude <noreply@anthropic.com>
---
 doc/release-notes-6969.md | 6 ++++++
 1 file changed, 6 insertions(+)
 create mode 100644 doc/release-notes-6969.md

diff --git a/doc/release-notes-6969.md b/doc/release-notes-6969.md
new file mode 100644
index 000000000000..ee3a494cd4fb
--- /dev/null
+++ b/doc/release-notes-6969.md
@@ -0,0 +1,6 @@
+RPC changes
+-----------
+
+- Two new hidden RPC commands have been added for diagnosing and repairing corrupted evodb diff records:
+  - `evodb verify` - Verifies the integrity of evodb diff records between snapshots (read-only operation). Returns verification errors if any corruption is detected.
+  - `evodb repair` - Repairs corrupted evodb diff records by recalculating them from blockchain data. Automatically verifies repairs before committing to database. Reports critical errors that require full reindex.

From 9998bf6c3e4216a1ed6d0372c61d9b7d707834fa Mon Sep 17 00:00:00 2001
From: Kittywhiskers Van Gogh <63189531+kwvg@users.noreply.github.com>
Date: Thu, 13 Nov 2025 20:11:42 +0530
Subject: [PATCH 464/656] fix: improve libbacktrace detection

Co-authored-by: pasta <pasta@dashboost.org>
Co-authored-by: UdjinM6 <UdjinM6@users.noreply.github.com>
---
 configure.ac | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/configure.ac b/configure.ac
index 6e0a3e3b96af..27fcdb510ca6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1223,15 +1223,25 @@ fi
 
 BACKTRACE_LIBS=
 if test "$enable_stacktraces" != "no"; then
-  AC_CHECK_HEADERS([execinfo.h], [], [enable_stacktraces=no])
-  dnl ensure backtrace() is found, check -lexecinfo if necessary
-  AC_SEARCH_LIBS([backtrace], [execinfo], [
+  AC_CHECK_HEADERS([backtrace.h], [
     if test "$TARGET_OS" = "windows"; then
       BACKTRACE_LIBS="$BACKTRACE_LIBS -ldbghelp"
+    else
+      AC_CHECK_HEADERS([execinfo.h], [], [
+        if test "$enable_stacktraces" = "yes"; then
+          AC_MSG_ERROR([--enable-stacktraces was specified but execinfo.h was not found])
+        fi
+        AC_MSG_WARN([execinfo.h was not found, stacktraces will be disabled])
+        enable_stacktraces=no
+      ])
     fi
     BACKTRACE_LIBS="$BACKTRACE_LIBS -lbacktrace"
   ], [
-    AC_MSG_ERROR([Unable to find backtrace()])
+    if test "$enable_stacktraces" = "yes"; then
+      AC_MSG_ERROR([--enable-stacktraces was specified but backtrace.h was not found])
+    fi
+    AC_MSG_WARN([backtrace.h was not found, stacktraces will be disabled])
+    enable_stacktraces=no
   ])
 fi
 

From fc77534cfd717890b935d95e2e68fe5dc049f5a5 Mon Sep 17 00:00:00 2001
From: Kittywhiskers Van Gogh <63189531+kwvg@users.noreply.github.com>
Date: Wed, 12 Nov 2025 21:01:25 +0530
Subject: [PATCH 465/656] build: if enabling stacktraces, search for
 `libexecinfo` on BSDs

---
 configure.ac | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/configure.ac b/configure.ac
index 27fcdb510ca6..11dc75aec20d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -945,6 +945,9 @@ case $host in
    *linux*)
      TARGET_OS=linux
      ;;
+   *bsd*)
+     TARGET_OS=bsd
+     ;;
 esac
 
 if test "$use_extended_functional_tests" != "no"; then
@@ -1227,7 +1230,19 @@ if test "$enable_stacktraces" != "no"; then
     if test "$TARGET_OS" = "windows"; then
       BACKTRACE_LIBS="$BACKTRACE_LIBS -ldbghelp"
     else
-      AC_CHECK_HEADERS([execinfo.h], [], [
+      AC_CHECK_HEADERS([execinfo.h], [
+        if test "$TARGET_OS" = "bsd"; then
+          AC_SEARCH_LIBS([backtrace], [execinfo], [
+            BACKTRACE_LIBS="$BACKTRACE_LIBS -lexecinfo"
+          ], [
+            if test "$enable_stacktraces" = "yes"; then
+              AC_MSG_ERROR([--enable-stacktraces was specified but cannot locate libexecinfo])
+            fi
+            AC_MSG_WARN([cannot locate libexecinfo, stacktraces will be disabled])
+            enable_stacktraces=no
+          ])
+        fi
+      ], [
         if test "$enable_stacktraces" = "yes"; then
           AC_MSG_ERROR([--enable-stacktraces was specified but execinfo.h was not found])
         fi

From c5c8baf00212dfb7fbd8c7c90594d9ef5e8d1e90 Mon Sep 17 00:00:00 2001
From: Kittywhiskers Van Gogh <63189531+kwvg@users.noreply.github.com>
Date: Wed, 12 Nov 2025 20:31:41 +0530
Subject: [PATCH 466/656] fix: set `-export-dynamic` to ensure symbols are
 preserved

---
 configure.ac    | 13 ++++++++++++-
 src/Makefile.am |  2 +-
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/configure.ac b/configure.ac
index 11dc75aec20d..f0cc323fb089 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1224,6 +1224,7 @@ if test "$use_thread_local" = "yes" || test "$use_thread_local" = "auto"; then
   LDFLAGS="$TEMP_LDFLAGS"
 fi
 
+BACKTRACE_LDFLAGS=
 BACKTRACE_LIBS=
 if test "$enable_stacktraces" != "no"; then
   AC_CHECK_HEADERS([backtrace.h], [
@@ -1242,6 +1243,15 @@ if test "$enable_stacktraces" != "no"; then
             enable_stacktraces=no
           ])
         fi
+        AX_CHECK_LINK_FLAG([-Wl,-export-dynamic], [BACKTRACE_LDFLAGS="$BACKTRACE_LDFLAGS -Wl,-export-dynamic"], [
+          AX_CHECK_LINK_FLAG([-rdynamic], [BACKTRACE_LDFLAGS="$BACKTRACE_LDFLAGS -rdynamic"], [
+            if test "$enable_stacktraces" = "yes"; then
+              AC_MSG_ERROR([--enable-stacktraces was specified but cannot set requisite linker flags])
+            fi
+            AC_MSG_WARN([cannot set requisite linker flags, stacktraces will be disabled])
+            enable_stacktraces=no
+          ], [$LDFLAG_WERROR])
+        ], [$LDFLAG_WERROR])
       ], [
         if test "$enable_stacktraces" = "yes"; then
           AC_MSG_ERROR([--enable-stacktraces was specified but execinfo.h was not found])
@@ -2012,6 +2022,7 @@ AC_SUBST(USE_QRCODE)
 AC_SUBST(TESTDEFS)
 AC_SUBST(MINIUPNPC_CPPFLAGS)
 AC_SUBST(MINIUPNPC_LIBS)
+AC_SUBST(BACKTRACE_LDFLAGS)
 AC_SUBST(BACKTRACE_LIBS)
 AC_SUBST(GMP_LIBS)
 AC_SUBST(NATPMP_CPPFLAGS)
@@ -2111,7 +2122,7 @@ echo "  CFLAGS              = $DEBUG_CFLAGS $PTHREAD_CFLAGS $CFLAGS"
 echo "  CPPFLAGS            = $DEBUG_CPPFLAGS $HARDENED_CPPFLAGS $CORE_CPPFLAGS $CPPFLAGS"
 echo "  CXX                 = $CXX"
 echo "  CXXFLAGS            = $DEBUG_CXXFLAGS $HARDENED_CXXFLAGS $WARN_CXXFLAGS $NOWARN_CXXFLAGS $ERROR_CXXFLAGS $GPROF_CXXFLAGS $CORE_CXXFLAGS $CXXFLAGS"
-echo "  LDFLAGS             = $PTHREAD_LIBS $HARDENED_LDFLAGS $GPROF_LDFLAGS $CORE_LDFLAGS $LDFLAGS"
+echo "  LDFLAGS             = $PTHREAD_LIBS $HARDENED_LDFLAGS $GPROF_LDFLAGS $CORE_LDFLAGS $BACKTRACE_LDFLAGS $LDFLAGS"
 echo "  AR                  = $AR"
 echo "  ARFLAGS             = $ARFLAGS"
 echo
diff --git a/src/Makefile.am b/src/Makefile.am
index fc8879d221a4..5d23c0a2065b 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -9,7 +9,7 @@ print-%: FORCE
 
 DIST_SUBDIRS = secp256k1
 
-AM_LDFLAGS = $(LIBTOOL_LDFLAGS) $(HARDENED_LDFLAGS) $(GPROF_LDFLAGS) $(SANITIZER_LDFLAGS) $(CORE_LDFLAGS)
+AM_LDFLAGS = $(LIBTOOL_LDFLAGS) $(HARDENED_LDFLAGS) $(GPROF_LDFLAGS) $(SANITIZER_LDFLAGS) $(CORE_LDFLAGS) $(BACKTRACE_LDFLAGS)
 AM_CFLAGS = $(DEBUG_CFLAGS)
 AM_CXXFLAGS = $(DEBUG_CXXFLAGS) $(HARDENED_CXXFLAGS) $(WARN_CXXFLAGS) $(NOWARN_CXXFLAGS) $(ERROR_CXXFLAGS) $(GPROF_CXXFLAGS) $(SANITIZER_CXXFLAGS) $(CORE_CXXFLAGS)
 AM_OBJCXXFLAGS = $(AM_CXXFLAGS)

From 2699740081f9d70d6c2a4dbbd1ec57a5b2d1d473 Mon Sep 17 00:00:00 2001
From: Kittywhiskers Van Gogh <63189531+kwvg@users.noreply.github.com>
Date: Wed, 12 Nov 2025 20:11:36 +0530
Subject: [PATCH 467/656] fix: use `-fno-standalone-debug` on macOS,
 `-gdwarf-4` on non-Windows

---
 configure.ac    | 25 +++++++++++++++++++++++--
 src/Makefile.am |  4 ++--
 2 files changed, 25 insertions(+), 4 deletions(-)

diff --git a/configure.ac b/configure.ac
index f0cc323fb089..c34201657f91 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1224,6 +1224,7 @@ if test "$use_thread_local" = "yes" || test "$use_thread_local" = "auto"; then
   LDFLAGS="$TEMP_LDFLAGS"
 fi
 
+BACKTRACE_FLAGS=
 BACKTRACE_LDFLAGS=
 BACKTRACE_LIBS=
 if test "$enable_stacktraces" != "no"; then
@@ -1261,6 +1262,25 @@ if test "$enable_stacktraces" != "no"; then
       ])
     fi
     BACKTRACE_LIBS="$BACKTRACE_LIBS -lbacktrace"
+    dnl More modern compilers may emit DWARF 5 binaries by default, use DWARF 4 out of precaution
+    if test "$TARGET_OS" != "windows"; then
+      AX_CHECK_COMPILE_FLAG([-gdwarf-4], [BACKTRACE_FLAGS="$BACKTRACE_FLAGS -gdwarf-4"], [
+        if test "$enable_stacktraces" = "yes"; then
+          AC_MSG_ERROR([--enable-stacktraces was specified but cannot set -gdwarf-4])
+        fi
+        AC_MSG_WARN([cannot set -gdwarf-4, stacktraces will be disabled])
+        enable_stacktraces=no
+      ], [$CXXFLAG_WERROR])
+    fi
+    if test "$TARGET_OS" = "darwin"; then
+      AX_CHECK_COMPILE_FLAG([-fno-standalone-debug], [BACKTRACE_FLAGS="$BACKTRACE_FLAGS -fno-standalone-debug"], [
+        if test "$enable_stacktraces" = "yes"; then
+          AC_MSG_ERROR([--enable-stacktraces was specified but cannot set -fno-standalone-debug])
+        fi
+        AC_MSG_WARN([cannot set -fno-standalone-debug, stacktraces will be disabled])
+        enable_stacktraces=no
+      ], [$CXXFLAG_WERROR])
+    fi
   ], [
     if test "$enable_stacktraces" = "yes"; then
       AC_MSG_ERROR([--enable-stacktraces was specified but backtrace.h was not found])
@@ -2022,6 +2042,7 @@ AC_SUBST(USE_QRCODE)
 AC_SUBST(TESTDEFS)
 AC_SUBST(MINIUPNPC_CPPFLAGS)
 AC_SUBST(MINIUPNPC_LIBS)
+AC_SUBST(BACKTRACE_FLAGS)
 AC_SUBST(BACKTRACE_LDFLAGS)
 AC_SUBST(BACKTRACE_LIBS)
 AC_SUBST(GMP_LIBS)
@@ -2118,10 +2139,10 @@ echo "  target os           = $host_os"
 echo "  build os            = $build_os"
 echo
 echo "  CC                  = $CC"
-echo "  CFLAGS              = $DEBUG_CFLAGS $PTHREAD_CFLAGS $CFLAGS"
+echo "  CFLAGS              = $DEBUG_CFLAGS $PTHREAD_CFLAGS $BACKTRACE_FLAGS $CFLAGS"
 echo "  CPPFLAGS            = $DEBUG_CPPFLAGS $HARDENED_CPPFLAGS $CORE_CPPFLAGS $CPPFLAGS"
 echo "  CXX                 = $CXX"
-echo "  CXXFLAGS            = $DEBUG_CXXFLAGS $HARDENED_CXXFLAGS $WARN_CXXFLAGS $NOWARN_CXXFLAGS $ERROR_CXXFLAGS $GPROF_CXXFLAGS $CORE_CXXFLAGS $CXXFLAGS"
+echo "  CXXFLAGS            = $DEBUG_CXXFLAGS $HARDENED_CXXFLAGS $WARN_CXXFLAGS $NOWARN_CXXFLAGS $ERROR_CXXFLAGS $GPROF_CXXFLAGS $CORE_CXXFLAGS $BACKTRACE_FLAGS $CXXFLAGS"
 echo "  LDFLAGS             = $PTHREAD_LIBS $HARDENED_LDFLAGS $GPROF_LDFLAGS $CORE_LDFLAGS $BACKTRACE_LDFLAGS $LDFLAGS"
 echo "  AR                  = $AR"
 echo "  ARFLAGS             = $ARFLAGS"
diff --git a/src/Makefile.am b/src/Makefile.am
index 5d23c0a2065b..c109b5013f7d 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -10,8 +10,8 @@ print-%: FORCE
 DIST_SUBDIRS = secp256k1
 
 AM_LDFLAGS = $(LIBTOOL_LDFLAGS) $(HARDENED_LDFLAGS) $(GPROF_LDFLAGS) $(SANITIZER_LDFLAGS) $(CORE_LDFLAGS) $(BACKTRACE_LDFLAGS)
-AM_CFLAGS = $(DEBUG_CFLAGS)
-AM_CXXFLAGS = $(DEBUG_CXXFLAGS) $(HARDENED_CXXFLAGS) $(WARN_CXXFLAGS) $(NOWARN_CXXFLAGS) $(ERROR_CXXFLAGS) $(GPROF_CXXFLAGS) $(SANITIZER_CXXFLAGS) $(CORE_CXXFLAGS)
+AM_CFLAGS = $(DEBUG_CFLAGS) $(BACKTRACE_FLAGS)
+AM_CXXFLAGS = $(DEBUG_CXXFLAGS) $(HARDENED_CXXFLAGS) $(WARN_CXXFLAGS) $(NOWARN_CXXFLAGS) $(ERROR_CXXFLAGS) $(GPROF_CXXFLAGS) $(SANITIZER_CXXFLAGS) $(CORE_CXXFLAGS) $(BACKTRACE_FLAGS)
 AM_OBJCXXFLAGS = $(AM_CXXFLAGS)
 AM_CPPFLAGS = $(DEBUG_CPPFLAGS) $(HARDENED_CPPFLAGS) $(CORE_CPPFLAGS)
 AM_LIBTOOLFLAGS = --preserve-dup-deps

From 0d1d6d3005e641a83b88dde5a935c223542d704f Mon Sep 17 00:00:00 2001
From: Kittywhiskers Van Gogh <63189531+kwvg@users.noreply.github.com>
Date: Thu, 13 Nov 2025 02:32:41 +0530
Subject: [PATCH 468/656] fix: resolve compile errors in `stacktraces.cpp` on
 Windows

---
 src/stacktraces.cpp | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/stacktraces.cpp b/src/stacktraces.cpp
index 85a0e15b3aae..3f6262108c97 100644
--- a/src/stacktraces.cpp
+++ b/src/stacktraces.cpp
@@ -131,7 +131,7 @@ static backtrace_state* GetLibBacktraceState()
     // libbacktrace is not able to handle the DWARF debuglink in the .exe
     // but luckily we can just specify the .dbg file here as it's a valid PE/XCOFF file
     static std::string debugFileName = g_exeFileName + ".dbg";
-    static const char* exeFileNamePtr = fs::exists(debugFileName) ? debugFileName.c_str() : g_exeFileName.c_str();
+    static const char* exeFileNamePtr = fs::exists(fs::absolute(fs::PathFromString(debugFileName))) ? debugFileName.c_str() : g_exeFileName.c_str();
 #else
     static const char* exeFileNamePtr = g_exeFileName.empty() ? nullptr : g_exeFileName.c_str();
 #endif
@@ -168,8 +168,6 @@ static __attribute__((noinline)) std::vector<uint64_t> GetStackFrames(size_t ski
 {
 #ifdef ENABLE_STACKTRACES
     // We can't use libbacktrace for stack unwinding on Windows as it returns invalid addresses (like 0x1 or 0xffffffff)
-    static BOOL symInitialized = SymInitialize(GetCurrentProcess(), nullptr, TRUE);
-
     // dbghelp is not thread safe
     static StdMutex m;
     StdLockGuard l(m);

From f482f01041d0caec44c7e1c09f73811b46afc48b Mon Sep 17 00:00:00 2001
From: UdjinM6 <UdjinM6@users.noreply.github.com>
Date: Thu, 13 Nov 2025 17:10:01 +0300
Subject: [PATCH 469/656] fix: drop redundant thread safety annotations

---
 src/evo/deterministicmns.cpp | 20 +++++---------------
 src/evo/deterministicmns.h   |  4 ++--
 2 files changed, 7 insertions(+), 17 deletions(-)

diff --git a/src/evo/deterministicmns.cpp b/src/evo/deterministicmns.cpp
index a56950f89d65..826a2da3ab06 100644
--- a/src/evo/deterministicmns.cpp
+++ b/src/evo/deterministicmns.cpp
@@ -1634,13 +1634,8 @@ CDeterministicMNManager::RecalcDiffsResult CDeterministicMNManager::RecalculateA
         CDeterministicMNList from_snapshot;
         CDeterministicMNList to_snapshot;
 
-        bool has_from_snapshot;
-        bool has_to_snapshot;
-        {
-            LOCK(cs);
-            has_from_snapshot = m_evoDb.Read(std::make_pair(DB_LIST_SNAPSHOT, from_index->GetBlockHash()), from_snapshot);
-            has_to_snapshot = m_evoDb.Read(std::make_pair(DB_LIST_SNAPSHOT, to_index->GetBlockHash()), to_snapshot);
-        }
+        bool has_from_snapshot = m_evoDb.Read(std::make_pair(DB_LIST_SNAPSHOT, from_index->GetBlockHash()), from_snapshot);
+        bool has_to_snapshot = m_evoDb.Read(std::make_pair(DB_LIST_SNAPSHOT, to_index->GetBlockHash()), to_snapshot);
 
         // Handle missing snapshots
         if (!has_from_snapshot) {
@@ -1667,11 +1662,7 @@ CDeterministicMNManager::RecalcDiffsResult CDeterministicMNManager::RecalculateA
         }
 
         // Verify this snapshot pair
-        bool is_snapshot_pair_valid;
-        {
-            LOCK(cs);
-            is_snapshot_pair_valid = VerifySnapshotPair(from_index, to_index, from_snapshot, to_snapshot, result, i, snapshot_blocks.size() - 1);
-        }
+        bool is_snapshot_pair_valid = VerifySnapshotPair(from_index, to_index, from_snapshot, to_snapshot, result, i, snapshot_blocks.size() - 1);
 
         // If repair mode is enabled and verification failed, recalculate diffs from blockchain
         if (repair && !is_snapshot_pair_valid) {
@@ -1688,7 +1679,6 @@ CDeterministicMNManager::RecalcDiffsResult CDeterministicMNManager::RecalculateA
 
     // Write repaired diffs to database
     if (repair) {
-        LOCK(cs);
         WriteRepairedDiffs(recalculated_diffs, result);
     }
 
@@ -1751,7 +1741,6 @@ bool CDeterministicMNManager::VerifySnapshotPair(
     const CBlockIndex* from_index, const CBlockIndex* to_index, const CDeterministicMNList& from_snapshot,
     const CDeterministicMNList& to_snapshot, RecalcDiffsResult& result, size_t pair_index, size_t total_pairs)
 {
-    AssertLockHeld(cs);
     AssertLockHeld(::cs_main);
 
     // Log progress periodically (every 100 snapshot pairs) to avoid spam
@@ -1879,7 +1868,7 @@ std::vector<std::pair<uint256, CDeterministicMNListDiff>> CDeterministicMNManage
 void CDeterministicMNManager::WriteRepairedDiffs(
     const std::vector<std::pair<uint256, CDeterministicMNListDiff>>& recalculated_diffs, RecalcDiffsResult& result)
 {
-    AssertLockHeld(cs);
+    AssertLockNotHeld(cs);
 
     if (recalculated_diffs.empty()) {
         return;
@@ -1914,6 +1903,7 @@ void CDeterministicMNManager::WriteRepairedDiffs(
 
     // Clear caches for repaired diffs so next read gets fresh data from disk
     // Must clear both diff cache and list cache since lists were built from old diffs
+    LOCK(cs);
     for (const auto& [block_hash, diff] : recalculated_diffs) {
         mnListDiffsCache.erase(block_hash);
         mnListsCache.erase(block_hash);
diff --git a/src/evo/deterministicmns.h b/src/evo/deterministicmns.h
index 5ba66a46543f..b5a9f11df51e 100644
--- a/src/evo/deterministicmns.h
+++ b/src/evo/deterministicmns.h
@@ -758,13 +758,13 @@ class CDeterministicMNManager
                                                            const Consensus::Params& consensus_params) EXCLUSIVE_LOCKS_REQUIRED(::cs_main);
     bool VerifySnapshotPair(const CBlockIndex* from_index, const CBlockIndex* to_index, const CDeterministicMNList& from_snapshot,
                             const CDeterministicMNList& to_snapshot, RecalcDiffsResult& result, size_t pair_index,
-                            size_t total_pairs) EXCLUSIVE_LOCKS_REQUIRED(cs, ::cs_main);
+                            size_t total_pairs) EXCLUSIVE_LOCKS_REQUIRED(::cs_main);
     std::vector<std::pair<uint256, CDeterministicMNListDiff>> RepairSnapshotPair(
         const CBlockIndex* from_index, const CBlockIndex* to_index, const CDeterministicMNList& from_snapshot,
         const CDeterministicMNList& to_snapshot, BuildListFromBlockFunc build_list_func, RecalcDiffsResult& result)
         EXCLUSIVE_LOCKS_REQUIRED(::cs_main);
     void WriteRepairedDiffs(const std::vector<std::pair<uint256, CDeterministicMNListDiff>>& recalculated_diffs,
-                            RecalcDiffsResult& result) EXCLUSIVE_LOCKS_REQUIRED(cs);
+                            RecalcDiffsResult& result) EXCLUSIVE_LOCKS_REQUIRED(!cs);
 };
 
 bool CheckProRegTx(CDeterministicMNManager& dmnman, const CTransaction& tx, gsl::not_null<const CBlockIndex*> pindexPrev, TxValidationState& state, const CCoinsViewCache& view, bool check_sigs);

From f3ee1d71a0b5fd8bed375d11e25dc424c86669cb Mon Sep 17 00:00:00 2001
From: UdjinM6 <UdjinM6@users.noreply.github.com>
Date: Thu, 13 Nov 2025 17:17:06 +0300
Subject: [PATCH 470/656] refactor: move verification progress log out of
 VerifySnapshotPair

---
 src/evo/deterministicmns.cpp | 16 ++++++++--------
 src/evo/deterministicmns.h   |  4 ++--
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/evo/deterministicmns.cpp b/src/evo/deterministicmns.cpp
index 826a2da3ab06..a0dff77e8cf6 100644
--- a/src/evo/deterministicmns.cpp
+++ b/src/evo/deterministicmns.cpp
@@ -1661,8 +1661,14 @@ CDeterministicMNManager::RecalcDiffsResult CDeterministicMNManager::RecalculateA
             return result;
         }
 
+        // Log progress periodically (every 100 snapshot pairs) to avoid spam
+        if (i % 100 == 0) {
+            LogPrintf("CDeterministicMNManager::%s -- Progress: verifying snapshot pair %d/%d (heights %d-%d)\n",
+                      __func__, i + 1, snapshot_blocks.size() - 1, from_index->nHeight, to_index->nHeight);
+        }
+
         // Verify this snapshot pair
-        bool is_snapshot_pair_valid = VerifySnapshotPair(from_index, to_index, from_snapshot, to_snapshot, result, i, snapshot_blocks.size() - 1);
+        bool is_snapshot_pair_valid = VerifySnapshotPair(from_index, to_index, from_snapshot, to_snapshot, result);
 
         // If repair mode is enabled and verification failed, recalculate diffs from blockchain
         if (repair && !is_snapshot_pair_valid) {
@@ -1739,16 +1745,10 @@ std::vector<const CBlockIndex*> CDeterministicMNManager::CollectSnapshotBlocks(
 
 bool CDeterministicMNManager::VerifySnapshotPair(
     const CBlockIndex* from_index, const CBlockIndex* to_index, const CDeterministicMNList& from_snapshot,
-    const CDeterministicMNList& to_snapshot, RecalcDiffsResult& result, size_t pair_index, size_t total_pairs)
+    const CDeterministicMNList& to_snapshot, RecalcDiffsResult& result)
 {
     AssertLockHeld(::cs_main);
 
-    // Log progress periodically (every 100 snapshot pairs) to avoid spam
-    if (pair_index % 100 == 0) {
-        LogPrintf("CDeterministicMNManager::%s -- Progress: verifying snapshot pair %d/%d (heights %d-%d)\n",
-                  __func__, pair_index + 1, total_pairs, from_index->nHeight, to_index->nHeight);
-    }
-
     // Verify this snapshot pair by applying all stored diffs sequentially
     CDeterministicMNList test_list = from_snapshot;
 
diff --git a/src/evo/deterministicmns.h b/src/evo/deterministicmns.h
index b5a9f11df51e..b01fbd5f8f7e 100644
--- a/src/evo/deterministicmns.h
+++ b/src/evo/deterministicmns.h
@@ -757,8 +757,8 @@ class CDeterministicMNManager
     std::vector<const CBlockIndex*> CollectSnapshotBlocks(const CBlockIndex* start_index, const CBlockIndex* stop_index,
                                                            const Consensus::Params& consensus_params) EXCLUSIVE_LOCKS_REQUIRED(::cs_main);
     bool VerifySnapshotPair(const CBlockIndex* from_index, const CBlockIndex* to_index, const CDeterministicMNList& from_snapshot,
-                            const CDeterministicMNList& to_snapshot, RecalcDiffsResult& result, size_t pair_index,
-                            size_t total_pairs) EXCLUSIVE_LOCKS_REQUIRED(::cs_main);
+                            const CDeterministicMNList& to_snapshot, RecalcDiffsResult& result)
+        EXCLUSIVE_LOCKS_REQUIRED(::cs_main);
     std::vector<std::pair<uint256, CDeterministicMNListDiff>> RepairSnapshotPair(
         const CBlockIndex* from_index, const CBlockIndex* to_index, const CDeterministicMNList& from_snapshot,
         const CDeterministicMNList& to_snapshot, BuildListFromBlockFunc build_list_func, RecalcDiffsResult& result)

From 77fd5d09714f41f51495dde599526f7a5073816b Mon Sep 17 00:00:00 2001
From: thephez <thephez@users.noreply.github.com>
Date: Thu, 13 Nov 2025 10:27:11 -0500
Subject: [PATCH 471/656] feat: automatically validate proposal data when
 review screen loads

---
 src/qt/proposalwizard.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/qt/proposalwizard.cpp b/src/qt/proposalwizard.cpp
index 3b61a9fa3976..f9c01c93176a 100644
--- a/src/qt/proposalwizard.cpp
+++ b/src/qt/proposalwizard.cpp
@@ -199,6 +199,7 @@ void ProposalWizard::onNextFromDetails()
 {
     buildJsonAndHex();
     m_ui->stackedWidget->setCurrentIndex(1);
+    onValidateJson();  // Automatically validate when entering the review page
 }
 
 void ProposalWizard::onBackToDetails() { m_ui->stackedWidget->setCurrentIndex(0); }

From d9d18ac5a81435cb4bb4d153da5a0d05df536433 Mon Sep 17 00:00:00 2001
From: thephez <thephez@users.noreply.github.com>
Date: Thu, 13 Nov 2025 10:31:21 -0500
Subject: [PATCH 472/656] chore: make proposal validation text boxes read-only

The data is regenerated based on the values from the previous screen, so any edits would be overwritten anyway.
---
 src/qt/forms/proposalwizard.ui | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/qt/forms/proposalwizard.ui b/src/qt/forms/proposalwizard.ui
index 046be2a81ecf..6cdd3ff21332 100644
--- a/src/qt/forms/proposalwizard.ui
+++ b/src/qt/forms/proposalwizard.ui
@@ -330,6 +330,9 @@
          <property name="maximumHeight">
           <number>120</number>
          </property>
+         <property name="readOnly">
+          <bool>true</bool>
+         </property>
         </widget>
        </item>
        <item>
@@ -337,6 +340,9 @@
          <property name="placeholderText">
           <string>Hex-encoded JSON</string>
          </property>
+         <property name="readOnly">
+          <bool>true</bool>
+         </property>
         </widget>
        </item>
        <item>

From 34bff7a8dec2a968c57141512dfd0990c2850c28 Mon Sep 17 00:00:00 2001
From: thephez <thephez@users.noreply.github.com>
Date: Thu, 13 Nov 2025 10:40:08 -0500
Subject: [PATCH 473/656] refactor(qt): remove redundant Validate button from
 governance proposal wizard

The Validate button is no longer needed since validation now happens  automatically when the review page loads, and the JSON/hex fields are read-only.
---
 src/qt/forms/proposalwizard.ui | 14 --------------
 src/qt/proposalwizard.cpp      |  1 -
 2 files changed, 15 deletions(-)

diff --git a/src/qt/forms/proposalwizard.ui b/src/qt/forms/proposalwizard.ui
index 6cdd3ff21332..074dd17b7b27 100644
--- a/src/qt/forms/proposalwizard.ui
+++ b/src/qt/forms/proposalwizard.ui
@@ -383,19 +383,6 @@
             </property>
           </widget>
          </item>
-         <item>
-           <widget class="QPushButton" name="btnValidate">
-           <property name="text">
-            <string>Validate</string>
-           </property>
-            <property name="minimumSize">
-             <size>
-              <width>0</width>
-              <height>28</height>
-             </size>
-            </property>
-          </widget>
-         </item>
          <item>
            <widget class="QPushButton" name="btnNext2">
            <property name="text">
@@ -768,7 +755,6 @@
    <tabstop>plainJson</tabstop>
    <tabstop>editHex</tabstop>
    <tabstop>btnBack1</tabstop>
-   <tabstop>btnValidate</tabstop>
    <tabstop>btnNext2</tabstop>
    <tabstop>editTxid</tabstop>
    <tabstop>btnCopyTxid</tabstop>
diff --git a/src/qt/proposalwizard.cpp b/src/qt/proposalwizard.cpp
index f9c01c93176a..35d913d308b5 100644
--- a/src/qt/proposalwizard.cpp
+++ b/src/qt/proposalwizard.cpp
@@ -90,7 +90,6 @@ ProposalWizard::ProposalWizard(interfaces::Node& node, WalletModel* walletModel,
     connect(m_ui->paymentAmount, &BitcoinAmountField::valueChanged, this, &ProposalWizard::updateLabels);
     connect(m_ui->btnNext1, &QPushButton::clicked, this, &ProposalWizard::onNextFromDetails);
     connect(m_ui->btnBack1, &QPushButton::clicked, this, &ProposalWizard::onBackToDetails);
-    connect(m_ui->btnValidate, &QPushButton::clicked, this, &ProposalWizard::onValidateJson);
     connect(m_ui->btnNext2, &QPushButton::clicked, this, &ProposalWizard::onNextFromReview);
     connect(m_ui->btnBack2, &QPushButton::clicked, this, &ProposalWizard::onBackToReview);
     connect(m_ui->btnPrepare, &QPushButton::clicked, this, &ProposalWizard::onPrepare);

From 74f26358526545d398a5547ddb4b65d6d21e2574 Mon Sep 17 00:00:00 2001
From: thephez <thephez@users.noreply.github.com>
Date: Thu, 13 Nov 2025 10:49:19 -0500
Subject: [PATCH 474/656] chore: lint fix

---
 src/qt/proposalwizard.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/qt/proposalwizard.cpp b/src/qt/proposalwizard.cpp
index 35d913d308b5..7657ba2f826f 100644
--- a/src/qt/proposalwizard.cpp
+++ b/src/qt/proposalwizard.cpp
@@ -198,7 +198,7 @@ void ProposalWizard::onNextFromDetails()
 {
     buildJsonAndHex();
     m_ui->stackedWidget->setCurrentIndex(1);
-    onValidateJson();  // Automatically validate when entering the review page
+    onValidateJson(); // Automatically validate when entering the review page
 }
 
 void ProposalWizard::onBackToDetails() { m_ui->stackedWidget->setCurrentIndex(0); }

From 7cd4a01dd18dfdacf552020b1f5237344da792bd Mon Sep 17 00:00:00 2001
From: thephez <thephez@users.noreply.github.com>
Date: Thu, 13 Nov 2025 11:13:43 -0500
Subject: [PATCH 475/656] style: make margins match on all governance wizard
 screens

---
 src/qt/forms/proposalwizard.ui | 15 ---------------
 1 file changed, 15 deletions(-)

diff --git a/src/qt/forms/proposalwizard.ui b/src/qt/forms/proposalwizard.ui
index 074dd17b7b27..992929f64ed3 100644
--- a/src/qt/forms/proposalwizard.ui
+++ b/src/qt/forms/proposalwizard.ui
@@ -33,21 +33,6 @@
     <widget class="QStackedWidget" name="stackedWidget">
      <widget class="QWidget" name="pageDetails">
       <layout class="QVBoxLayout" name="detailsLayout">
-       <property name="leftMargin">
-        <number>0</number>
-       </property>
-       <property name="topMargin">
-        <number>8</number>
-       </property>
-        <property name="rightMargin">
-        <number>0</number>
-       </property>
-       <property name="bottomMargin">
-        <number>0</number>
-       </property>
-       <property name="spacing">
-        <number>8</number>
-       </property>
        <item>
         <widget class="QLabel" name="labelHeader">
          <property name="text">

From ef44418895c5cc6d88955c158ee622a68c01842f Mon Sep 17 00:00:00 2001
From: pasta <pasta@dashboost.org>
Date: Thu, 13 Nov 2025 12:58:05 -0600
Subject: [PATCH 476/656] guix: enable build-id on linux

---
 configure.ac | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/configure.ac b/configure.ac
index f9138d39821e..6bae5a2b9efa 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1128,6 +1128,11 @@ if test "$use_hardening" != "no"; then
   AX_CHECK_LINK_FLAG([-fPIE -pie], [PIE_FLAGS="-fPIE"; HARDENED_LDFLAGS="$HARDENED_LDFLAGS -pie"], [], [$CXXFLAG_WERROR])
 fi
 
+dnl Add build-id for perf and debug symbol matching (Linux only)
+if test "$TARGET_OS" = "linux"; then
+  AX_CHECK_LINK_FLAG([-Wl,--build-id=sha1], [CORE_LDFLAGS="$CORE_LDFLAGS -Wl,--build-id=sha1"], [], [$LDFLAG_WERROR])
+fi
+
 dnl These flags are specific to ld64, and may cause issues with other linkers.
 dnl For example: GNU ld will interpret -dead_strip as -de and then try and use
 dnl "ad_strip" as the symbol for the entry point.

From 38934351e4d1c1eee1bba92f91bc3049225ed5b5 Mon Sep 17 00:00:00 2001
From: pasta <pasta@dashboost.org>
Date: Thu, 13 Nov 2025 13:05:58 -0600
Subject: [PATCH 477/656] devtools: relax strip in split-debug.sh

---
 contrib/devtools/split-debug.sh.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/contrib/devtools/split-debug.sh.in b/contrib/devtools/split-debug.sh.in
index 92b72b1446cf..7ad5f6ed5ad7 100644
--- a/contrib/devtools/split-debug.sh.in
+++ b/contrib/devtools/split-debug.sh.in
@@ -6,5 +6,5 @@ fi
 
 @OBJCOPY@ --enable-deterministic-archives -p --only-keep-debug $1 $3
 @OBJCOPY@ --enable-deterministic-archives -p --strip-debug $1 $2
-@STRIP@ --enable-deterministic-archives -p -s $2
+@STRIP@ --enable-deterministic-archives -p --strip-debug --strip-unneeded $2
 @OBJCOPY@ --enable-deterministic-archives -p --add-gnu-debuglink=$3 $2

From badabf970b624a1916f4ed41a21649a175fb04f8 Mon Sep 17 00:00:00 2001
From: pasta <pasta@dashboost.org>
Date: Thu, 13 Nov 2025 13:06:53 -0600
Subject: [PATCH 478/656] build: enhance debug file handling on Linux

- Added compression for DWARF sections in debug files.
- Implemented creation of .build-id tree for automatic discovery by perf.
- Added verification checks for build-ids and debug links in ELF files.
---
 contrib/guix/libexec/build.sh | 55 +++++++++++++++++++++++++++++++++++
 1 file changed, 55 insertions(+)

diff --git a/contrib/guix/libexec/build.sh b/contrib/guix/libexec/build.sh
index 5f9b62e32cce..90a5238372fa 100755
--- a/contrib/guix/libexec/build.sh
+++ b/contrib/guix/libexec/build.sh
@@ -341,6 +341,61 @@ mkdir -p "$DISTSRC"
                     find "${DISTNAME}/bin" -type f -executable -print0
                     find "${DISTNAME}/lib" -type f -print0
                 } | xargs -0 -P"$JOBS" -I{} "${DISTSRC}/contrib/devtools/split-debug.sh" {} {} {}.dbg
+
+                case "$HOST" in
+                    *linux*)
+                        # Compress DWARF sections in debug files and set proper permissions
+                        find "${DISTNAME}" -name "*.dbg" -type f -print0 | xargs -0 -P"$JOBS" -I{} sh -c '
+                            objcopy --compress-debug-sections=zlib "$1" "$1.tmp" && mv "$1.tmp" "$1"
+                            chmod 644 "$1"
+                        ' _ {}
+
+                        # Create .build-id tree for perf auto-discovery
+                        mkdir -p "${DISTNAME}/usr/lib/debug/.build-id"
+                        {
+                            find "${DISTNAME}/bin" -type f -executable -print0
+                            find "${DISTNAME}/lib" -type f -print0
+                        } | while IFS= read -r -d '' elf; do
+                            if file "$elf" | grep -q "ELF.*executable\|ELF.*shared object"; then
+                                build_id=$(readelf -n "$elf" 2>/dev/null | awk '/Build ID/ {print $3; exit}')
+                                if [ -n "$build_id" ] && [ -f "${elf}.dbg" ]; then
+                                    dir="${DISTNAME}/usr/lib/debug/.build-id/${build_id:0:2}"
+                                    mkdir -p "$dir"
+                                    cp "${elf}.dbg" "${dir}/${build_id:2}.debug"
+                                    chmod 644 "${dir}/${build_id:2}.debug"
+                                fi
+                            fi
+                        done
+
+                        # Verify build-ids and debug links
+                        {
+                            find "${DISTNAME}/bin" -type f -executable -print0
+                            find "${DISTNAME}/lib" -type f -print0
+                        } | {
+                            verification_failed=0
+                            while IFS= read -r -d '' elf; do
+                                if file "$elf" | grep -q "ELF.*executable\|ELF.*shared object"; then
+                                    # Check for build-id
+                                    if ! readelf -n "$elf" 2>/dev/null | grep -q "Build ID"; then
+                                        echo "ERROR: No build-id found in $elf" >&2
+                                        verification_failed=1
+                                    fi
+
+                                    # Check for .gnu_debuglink
+                                    if ! readelf --string-dump=.gnu_debuglink "$elf" >/dev/null 2>&1; then
+                                        echo "ERROR: No .gnu_debuglink found in $elf" >&2
+                                        verification_failed=1
+                                    fi
+                                fi
+                            done
+
+                            if [ "$verification_failed" -eq 1 ]; then
+                                echo "ERROR: Verification failed - some ELF files are missing build-ids or debug links" >&2
+                                exit 1
+                            fi
+                        }
+                        ;;
+                esac
                 ;;
         esac
 

From 16915ff010846f67e29d2dc240aed3ac04bb9ce1 Mon Sep 17 00:00:00 2001
From: Konstantin Akimov <knstqq@gmail.com>
Date: Fri, 14 Nov 2025 02:23:41 +0700
Subject: [PATCH 479/656] fixup: lock annotation for
 CMasternodeMetaMan::nDsqCount

---
 src/masternode/meta.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/masternode/meta.h b/src/masternode/meta.h
index 7d82b3b21df4..273c433e1acc 100644
--- a/src/masternode/meta.h
+++ b/src/masternode/meta.h
@@ -92,7 +92,7 @@ class MasternodeMetaStore
     mutable Mutex cs;
     std::map<uint256, CMasternodeMetaInfo> metaInfos GUARDED_BY(cs);
     // keep track of dsq count to prevent masternodes from gaming coinjoin queue
-    int64_t nDsqCount{0};
+    int64_t nDsqCount GUARDED_BY(cs){0};
     // keep track of the used Masternodes for CoinJoin across all wallets
     // Using deque for efficient FIFO removal and unordered_set for O(1) lookups
     std::deque<uint256> m_used_masternodes GUARDED_BY(cs);

From 1d1645175963cfccf6361ac24a792b0407067fa7 Mon Sep 17 00:00:00 2001
From: pasta <pasta@dashboost.org>
Date: Thu, 13 Nov 2025 13:46:59 -0600
Subject: [PATCH 480/656] fix: ensure that flooding quorum messages cannot
 starve the normal queue of processing

---
 src/net.cpp | 23 ++++++++++++++++++++---
 src/net.h   |  1 +
 2 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/src/net.cpp b/src/net.cpp
index 4c70bf9f2c37..201800deda64 100644
--- a/src/net.cpp
+++ b/src/net.cpp
@@ -4685,25 +4685,42 @@ std::optional<std::pair<CNetMessage, bool>> CNode::PollMessage()
 {
     LOCK(m_msg_process_queue_mutex);
 
-    // Prioritize quorum queue: pop from it first if non-empty
-    if (!m_msg_quorum_queue.empty()) {
+    // Ratio-based processing: process N quorum messages for every 1 normal message
+    // This ensures forward progress for both queues while strongly prioritizing quorum messages
+    // However, if normal queue is empty, process quorum messages in bursts (like old algorithm)
+    constexpr size_t QUORUM_TO_NORMAL_RATIO = 100;
+    
+    // Check if we should process normal queue for forward progress
+    // Only apply ratio when both queues have messages to allow burst processing when normal queue is empty
+    bool skip_quorum_processing = !m_msg_process_queue.empty() && 
+                                  m_quorum_msg_count_since_normal >= QUORUM_TO_NORMAL_RATIO;
+
+    // Prioritize quorum queue: pop from it first if non-empty and ratio not reached
+    // If normal queue is empty, process quorum messages without ratio limit (burst mode)
+    if (!m_msg_quorum_queue.empty() && !skip_quorum_processing) {
         std::list<CNetMessage> msgs;
         // Just take one message from quorum queue
         msgs.splice(msgs.begin(), m_msg_quorum_queue, m_msg_quorum_queue.begin());
         m_msg_quorum_queue_size -= msgs.front().m_raw_message_size;
+        // Only increment counter if normal queue has messages (to track ratio)
+        // If normal queue is empty, don't increment so we can process bursts quickly
+        if (!m_msg_process_queue.empty()) {
+            m_quorum_msg_count_since_normal++;
+        }
         // Compute backpressure over combined size of both queues
         fPauseRecv = (m_msg_quorum_queue_size + m_msg_process_queue_size) > m_recv_flood_size;
         // Return true for 'more' if either queue has remaining messages
         return std::make_pair(std::move(msgs.front()), !m_msg_quorum_queue.empty() || !m_msg_process_queue.empty());
     }
 
-    // Fall back to normal queue if quorum queue is empty
+    // Process normal queue (either because quorum queue is empty or ratio reached)
     if (m_msg_process_queue.empty()) return std::nullopt;
 
     std::list<CNetMessage> msgs;
     // Just take one message
     msgs.splice(msgs.begin(), m_msg_process_queue, m_msg_process_queue.begin());
     m_msg_process_queue_size -= msgs.front().m_raw_message_size;
+    m_quorum_msg_count_since_normal = 0; // Reset counter after processing normal message
     // Compute backpressure over combined size of both queues
     fPauseRecv = (m_msg_quorum_queue_size + m_msg_process_queue_size) > m_recv_flood_size;
 
diff --git a/src/net.h b/src/net.h
index 7d2ed393494f..f49f93c45449 100644
--- a/src/net.h
+++ b/src/net.h
@@ -1096,6 +1096,7 @@ class CNode
     size_t m_msg_process_queue_size GUARDED_BY(m_msg_process_queue_mutex){0};
     std::list<CNetMessage> m_msg_quorum_queue GUARDED_BY(m_msg_process_queue_mutex);
     size_t m_msg_quorum_queue_size GUARDED_BY(m_msg_process_queue_mutex){0};
+    size_t m_quorum_msg_count_since_normal GUARDED_BY(m_msg_process_queue_mutex){0};
 
     // Our address, as reported by the peer
     CService addrLocal GUARDED_BY(m_addr_local_mutex);

From f8be956b9c05686a8be2296b55d0f4573d43eab0 Mon Sep 17 00:00:00 2001
From: UdjinM6 <UdjinM6@users.noreply.github.com>
Date: Thu, 13 Nov 2025 23:00:19 +0300
Subject: [PATCH 481/656] refactor: rename second BuildNewListFromBlock variant
 to RebuildListFromBlock

Rationale:
  - Short and clear
  - The "rebuild" prefix makes it obvious you're starting from an existing list
  - Distinguishes it well from BuildNewListFromBlock (which builds from database)
---
 src/evo/specialtxman.cpp | 4 ++--
 src/evo/specialtxman.h   | 2 +-
 src/rpc/evo.cpp          | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/evo/specialtxman.cpp b/src/evo/specialtxman.cpp
index c3cdb823cc45..a788bc22437f 100644
--- a/src/evo/specialtxman.cpp
+++ b/src/evo/specialtxman.cpp
@@ -177,10 +177,10 @@ bool CSpecialTxProcessor::BuildNewListFromBlock(const CBlock& block, gsl::not_nu
 {
     AssertLockHeld(cs_main);
     CDeterministicMNList oldList = m_dmnman.GetListForBlock(pindexPrev);
-    return BuildNewListFromBlock(block, pindexPrev, oldList, view, debugLogs, state, mnListRet);
+    return RebuildListFromBlock(block, pindexPrev, oldList, view, debugLogs, state, mnListRet);
 }
 
-bool CSpecialTxProcessor::BuildNewListFromBlock(const CBlock& block, gsl::not_null<const CBlockIndex*> pindexPrev,
+bool CSpecialTxProcessor::RebuildListFromBlock(const CBlock& block, gsl::not_null<const CBlockIndex*> pindexPrev,
                                                 const CDeterministicMNList& prevList, const CCoinsViewCache& view,
                                                 bool debugLogs, BlockValidationState& state,
                                                 CDeterministicMNList& mnListRet)
diff --git a/src/evo/specialtxman.h b/src/evo/specialtxman.h
index 0e21dbb0f556..461fa8d222c1 100644
--- a/src/evo/specialtxman.h
+++ b/src/evo/specialtxman.h
@@ -81,7 +81,7 @@ class CSpecialTxProcessor
 
     // Variant that takes an explicit starting list instead of loading from GetListForBlock
     // Used for rebuilding diffs from trusted snapshots
-    bool BuildNewListFromBlock(const CBlock& block, gsl::not_null<const CBlockIndex*> pindexPrev,
+    bool RebuildListFromBlock(const CBlock& block, gsl::not_null<const CBlockIndex*> pindexPrev,
                                const CDeterministicMNList& prevList, const CCoinsViewCache& view, bool debugLogs,
                                BlockValidationState& state, CDeterministicMNList& mnListRet)
         EXCLUSIVE_LOCKS_REQUIRED(cs_main);
diff --git a/src/rpc/evo.cpp b/src/rpc/evo.cpp
index 8b51b19e9705..12bd74cc79dd 100644
--- a/src/rpc/evo.cpp
+++ b/src/rpc/evo.cpp
@@ -1808,7 +1808,7 @@ static UniValue evodb_verify_or_repair_impl(const JSONRPCRequest& request, bool
                                            const CDeterministicMNList& prevList, const CCoinsViewCache& view,
                                            bool debugLogs, BlockValidationState& state,
                                            CDeterministicMNList& mnListRet) NO_THREAD_SAFETY_ANALYSIS -> bool {
-        return chain_helper.special_tx->BuildNewListFromBlock(block, pindexPrev, prevList, view, debugLogs, state, mnListRet);
+        return chain_helper.special_tx->RebuildListFromBlock(block, pindexPrev, prevList, view, debugLogs, state, mnListRet);
     };
 
     // Call the dmnman method to do the work

From d0d42c721954a4ee925706c30c732c03ba24fefb Mon Sep 17 00:00:00 2001
From: PastaPastaPasta <6443210+PastaPastaPasta@users.noreply.github.com>
Date: Thu, 13 Nov 2025 14:06:10 -0600
Subject: [PATCH 482/656] refactor: prefix add

Co-authored-by: UdjinM6 <UdjinM6@users.noreply.github.com>
---
 src/net.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/net.cpp b/src/net.cpp
index 201800deda64..3fb87e47036d 100644
--- a/src/net.cpp
+++ b/src/net.cpp
@@ -4705,7 +4705,7 @@ std::optional<std::pair<CNetMessage, bool>> CNode::PollMessage()
         // Only increment counter if normal queue has messages (to track ratio)
         // If normal queue is empty, don't increment so we can process bursts quickly
         if (!m_msg_process_queue.empty()) {
-            m_quorum_msg_count_since_normal++;
+            ++m_quorum_msg_count_since_normal;
         }
         // Compute backpressure over combined size of both queues
         fPauseRecv = (m_msg_quorum_queue_size + m_msg_process_queue_size) > m_recv_flood_size;

From 627a8a5975e044acd4652140df9b1b7e8a4b28f4 Mon Sep 17 00:00:00 2001
From: pasta <pasta@dashboost.org>
Date: Thu, 13 Nov 2025 14:26:16 -0600
Subject: [PATCH 483/656] fix: whitepace

---
 src/net.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/net.cpp b/src/net.cpp
index 3fb87e47036d..34773354ec88 100644
--- a/src/net.cpp
+++ b/src/net.cpp
@@ -4689,10 +4689,10 @@ std::optional<std::pair<CNetMessage, bool>> CNode::PollMessage()
     // This ensures forward progress for both queues while strongly prioritizing quorum messages
     // However, if normal queue is empty, process quorum messages in bursts (like old algorithm)
     constexpr size_t QUORUM_TO_NORMAL_RATIO = 100;
-    
+
     // Check if we should process normal queue for forward progress
     // Only apply ratio when both queues have messages to allow burst processing when normal queue is empty
-    bool skip_quorum_processing = !m_msg_process_queue.empty() && 
+    bool skip_quorum_processing = !m_msg_process_queue.empty() &&
                                   m_quorum_msg_count_since_normal >= QUORUM_TO_NORMAL_RATIO;
 
     // Prioritize quorum queue: pop from it first if non-empty and ratio not reached

From 72c3efc2f98a483c4fc273ce39c0a671736df566 Mon Sep 17 00:00:00 2001
From: pasta <pasta@dashboost.org>
Date: Thu, 13 Nov 2025 16:40:10 -0600
Subject: [PATCH 484/656] fix: move `more_work` calculation into
 CollectPendingRecoveredSigsToVerify replacing incorrect logic in
 ProcessPendingRecoveredSigs

---
 src/llmq/signing.cpp | 18 +++++++++++++-----
 src/llmq/signing.h   |  2 +-
 2 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/src/llmq/signing.cpp b/src/llmq/signing.cpp
index 2511c1026a79..3ef97c0b6b87 100644
--- a/src/llmq/signing.cpp
+++ b/src/llmq/signing.cpp
@@ -435,15 +435,17 @@ MessageProcessingResult CSigningManager::ProcessMessage(NodeId from, std::string
     return ret;
 }
 
-void CSigningManager::CollectPendingRecoveredSigsToVerify(
+bool CSigningManager::CollectPendingRecoveredSigsToVerify(
         size_t maxUniqueSessions,
         std::unordered_map<NodeId, std::list<std::shared_ptr<const CRecoveredSig>>>& retSigShares,
         std::unordered_map<std::pair<Consensus::LLMQType, uint256>, CQuorumCPtr, StaticSaltedHasher>& retQuorums)
 {
+    bool more_work{false};
+
     {
         LOCK(cs_pending);
         if (pendingRecoveredSigs.empty()) {
-            return;
+            return false;
         }
 
         // TODO: refactor it to remove duplicated code with `CSigSharesManager::CollectPendingSigSharesToVerify`
@@ -466,8 +468,12 @@ void CSigningManager::CollectPendingRecoveredSigsToVerify(
         }, rnd);
 
         if (retSigShares.empty()) {
-            return;
+            return false;
         }
+
+        more_work = std::any_of(pendingRecoveredSigs.begin(), pendingRecoveredSigs.end(),
+                                [](const auto& p) { return !p.second.empty(); }) ||
+                    !pendingReconstructedRecoveredSigs.empty();
     }
 
     for (auto& p : retSigShares) {
@@ -500,6 +506,8 @@ void CSigningManager::CollectPendingRecoveredSigsToVerify(
             ++it;
         }
     }
+
+    return more_work;
 }
 
 void CSigningManager::ProcessPendingReconstructedRecoveredSigs(PeerManager& peerman)
@@ -520,7 +528,7 @@ bool CSigningManager::ProcessPendingRecoveredSigs(PeerManager& peerman)
     ProcessPendingReconstructedRecoveredSigs(peerman);
 
     const size_t nMaxBatchSize{32};
-    CollectPendingRecoveredSigsToVerify(nMaxBatchSize, recSigsByNode, quorums);
+    bool more_work = CollectPendingRecoveredSigsToVerify(nMaxBatchSize, recSigsByNode, quorums);
     if (recSigsByNode.empty()) {
         return false;
     }
@@ -574,7 +582,7 @@ bool CSigningManager::ProcessPendingRecoveredSigs(PeerManager& peerman)
         }
     }
 
-    return recSigsByNode.size() >= nMaxBatchSize;
+    return more_work;
 }
 
 // signature must be verified already
diff --git a/src/llmq/signing.h b/src/llmq/signing.h
index 2950a3d60dc4..20a25b492004 100644
--- a/src/llmq/signing.h
+++ b/src/llmq/signing.h
@@ -208,7 +208,7 @@ class CSigningManager
     void TruncateRecoveredSig(Consensus::LLMQType llmqType, const uint256& id);
 
 private:
-    void CollectPendingRecoveredSigsToVerify(
+    bool CollectPendingRecoveredSigsToVerify(
         size_t maxUniqueSessions, std::unordered_map<NodeId, std::list<std::shared_ptr<const CRecoveredSig>>>& retSigShares,
         std::unordered_map<std::pair<Consensus::LLMQType, uint256>, CQuorumCPtr, StaticSaltedHasher>& retQuorums)
         EXCLUSIVE_LOCKS_REQUIRED(!cs_pending);

From 3b948d29771bc6d64fb55d938de399437355af96 Mon Sep 17 00:00:00 2001
From: pasta <pasta@dashboost.org>
Date: Thu, 13 Nov 2025 16:51:18 -0600
Subject: [PATCH 485/656] fix: update CollectPendingSigSharesToVerify to return
 work status instead of a constant true

---
 src/llmq/signing_shares.cpp | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/src/llmq/signing_shares.cpp b/src/llmq/signing_shares.cpp
index c5e8c87e4be1..f1623d024a4a 100644
--- a/src/llmq/signing_shares.cpp
+++ b/src/llmq/signing_shares.cpp
@@ -568,6 +568,8 @@ bool CSigSharesManager::CollectPendingSigSharesToVerify(
     size_t maxUniqueSessions, std::unordered_map<NodeId, std::vector<CSigShare>>& retSigShares,
     std::unordered_map<std::pair<Consensus::LLMQType, uint256>, CQuorumCPtr, StaticSaltedHasher>& retQuorums)
 {
+    bool more_work{false};
+
     {
         LOCK(cs);
         if (nodeStates.empty()) {
@@ -606,6 +608,13 @@ bool CSigSharesManager::CollectPendingSigSharesToVerify(
         if (retSigShares.empty()) {
             return false;
         }
+
+        // Determine if there is still work left in any node state after pulling this batch
+        more_work = std::any_of(nodeStates.begin(), nodeStates.end(),
+                                [](const auto& entry) {
+                                    const auto& ns = entry.second;
+                                    return !ns.pendingIncomingSigShares.Empty();
+                                });
     }
 
     // For the convenience of the caller, also build a map of quorumHash -> quorum
@@ -632,7 +641,7 @@ bool CSigSharesManager::CollectPendingSigSharesToVerify(
         }
     }
 
-    return true;
+    return more_work;
 }
 
 bool CSigSharesManager::ProcessPendingSigShares()
@@ -641,8 +650,8 @@ bool CSigSharesManager::ProcessPendingSigShares()
     std::unordered_map<std::pair<Consensus::LLMQType, uint256>, CQuorumCPtr, StaticSaltedHasher> quorums;
 
     const size_t nMaxBatchSize{32};
-    bool collect_status = CollectPendingSigSharesToVerify(nMaxBatchSize, sigSharesByNodes, quorums);
-    if (!collect_status || sigSharesByNodes.empty()) {
+    bool more_work = CollectPendingSigSharesToVerify(nMaxBatchSize, sigSharesByNodes, quorums);
+    if (sigSharesByNodes.empty()) {
         return false;
     }
 
@@ -703,7 +712,7 @@ bool CSigSharesManager::ProcessPendingSigShares()
         ProcessPendingSigShares(v, quorums);
     }
 
-    return sigSharesByNodes.size() >= nMaxBatchSize;
+    return more_work;
 }
 
 // It's ensured that no duplicates are passed to this method

From 180e36944357dcff827bac7251e9aac3524c877b Mon Sep 17 00:00:00 2001
From: pasta <pasta@dashboost.org>
Date: Thu, 13 Nov 2025 17:23:19 -0600
Subject: [PATCH 486/656] refactor: use next cleanup instead of last cleanup;
 chrono

---
 src/llmq/signing.cpp | 7 ++++---
 src/llmq/signing.h   | 3 ++-
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/llmq/signing.cpp b/src/llmq/signing.cpp
index 2511c1026a79..7e0901792582 100644
--- a/src/llmq/signing.cpp
+++ b/src/llmq/signing.cpp
@@ -637,8 +637,9 @@ void CSigningManager::TruncateRecoveredSig(Consensus::LLMQType llmqType, const u
 
 void CSigningManager::Cleanup()
 {
-    int64_t now = TicksSinceEpoch<std::chrono::milliseconds>(SystemClock::now());
-    if (now - lastCleanupTime < 5000) {
+    constexpr auto CLEANUP_INTERVAL{5000ms};
+    auto now = SystemClock::now();
+    if (now < nextCleanupTime) {
         return;
     }
 
@@ -647,7 +648,7 @@ void CSigningManager::Cleanup()
     db.CleanupOldRecoveredSigs(maxAge);
     db.CleanupOldVotes(maxAge);
 
-    lastCleanupTime = TicksSinceEpoch<std::chrono::milliseconds>(SystemClock::now());
+    nextCleanupTime = now + CLEANUP_INTERVAL;
 }
 
 void CSigningManager::RegisterRecoveredSigsListener(CRecoveredSigsListener* l)
diff --git a/src/llmq/signing.h b/src/llmq/signing.h
index 2950a3d60dc4..fef5008bcd61 100644
--- a/src/llmq/signing.h
+++ b/src/llmq/signing.h
@@ -17,6 +17,7 @@
 #include <saltedhasher.h>
 #include <sync.h>
 #include <util/threadinterrupt.h>
+#include <util/time.h>
 
 #include <gsl/pointers.h>
 
@@ -177,7 +178,7 @@ class CSigningManager
 
     FastRandomContext rnd GUARDED_BY(cs_pending);
 
-    int64_t lastCleanupTime{0};
+    std::chrono::time_point<SystemClock> nextCleanupTime{};
 
     mutable Mutex cs_listeners;
     std::vector<CRecoveredSigsListener*> recoveredSigsListeners GUARDED_BY(cs_listeners);

From 8d0a575a26c733ae06a8084aafee1ffc6e3fb290 Mon Sep 17 00:00:00 2001
From: pasta <pasta@dashboost.org>
Date: Thu, 13 Nov 2025 17:33:04 -0600
Subject: [PATCH 487/656] fix: resolve improper atomic usage in
 CChainLocksHandler::Cleanup; use nextCleanup

---
 src/chainlock/chainlock.cpp | 12 +++++++++---
 src/chainlock/chainlock.h   |  2 +-
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/src/chainlock/chainlock.cpp b/src/chainlock/chainlock.cpp
index 39154d30d2d2..57e6bbf54e6d 100644
--- a/src/chainlock/chainlock.cpp
+++ b/src/chainlock/chainlock.cpp
@@ -32,7 +32,6 @@ using node::GetTransaction;
 
 namespace llmq {
 namespace {
-static constexpr auto CLEANUP_INTERVAL{30s};
 static constexpr auto CLEANUP_SEEN_TIMEOUT{24h};
 //! How long to wait for islocks until we consider a block with non-islocked TXs to be safe to sign
 static constexpr auto WAIT_FOR_ISLOCK_TIMEOUT{10min};
@@ -438,14 +437,21 @@ bool CChainLocksHandler::HasConflictingChainLock(int nHeight, const uint256& blo
 
 void CChainLocksHandler::Cleanup()
 {
+    constexpr auto CLEANUP_INTERVAL{30s};
     if (!m_mn_sync.IsBlockchainSynced()) {
         return;
     }
 
-    if (GetTime<std::chrono::seconds>() - lastCleanupTime.load() < CLEANUP_INTERVAL) {
+    auto now = GetTime<std::chrono::seconds>();
+    auto expected = nextCleanup.load(std::memory_order_relaxed);
+    // cleanup is due
+    if (now < expected) {
+        return;
+    }
+    // try to claim the cleanup slot atomically, if it fails, another thread is already cleaning up
+    if (!nextCleanup.compare_exchange_strong(expected, now + CLEANUP_INTERVAL, std::memory_order_relaxed)) {
         return;
     }
-    lastCleanupTime = GetTime<std::chrono::seconds>();
 
     {
         LOCK(cs);
diff --git a/src/chainlock/chainlock.h b/src/chainlock/chainlock.h
index c999d7f0f81c..f94cadf3a47a 100644
--- a/src/chainlock/chainlock.h
+++ b/src/chainlock/chainlock.h
@@ -67,7 +67,7 @@ class CChainLocksHandler final : public chainlock::ChainLockSignerParent
 
     std::map<uint256, std::chrono::seconds> seenChainLocks GUARDED_BY(cs);
 
-    std::atomic<std::chrono::seconds> lastCleanupTime{0s};
+    std::atomic<std::chrono::seconds> nextCleanup{0s};
 
 public:
     CChainLocksHandler() = delete;

From aef1169a5dbd1b857c233112e40f4254332d4dfe Mon Sep 17 00:00:00 2001
From: pasta <pasta@dashboost.org>
Date: Thu, 13 Nov 2025 17:41:45 -0600
Subject: [PATCH 488/656] fix: avoid 2 atomic loads, where 1 is intended

---
 src/llmq/signing_shares.cpp | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/llmq/signing_shares.cpp b/src/llmq/signing_shares.cpp
index c5e8c87e4be1..09dd461b9158 100644
--- a/src/llmq/signing_shares.cpp
+++ b/src/llmq/signing_shares.cpp
@@ -1658,7 +1658,8 @@ std::optional<CSigShare> CSigSharesManager::CreateSigShare(const CQuorum& quorum
 
         // TODO: This one should be SIGN by QUORUM key, not by OPERATOR key
         // see TODO in CDKGSession::FinalizeSingleCommitment for details
-        sigShare.sigShare.Set(m_mn_activeman.Sign(signHash, bls::bls_legacy_scheme.load()), bls::bls_legacy_scheme.load());
+        auto bls_scheme = bls::bls_legacy_scheme.load();
+        sigShare.sigShare.Set(m_mn_activeman.Sign(signHash, bls_scheme), bls_scheme);
 
         if (!sigShare.sigShare.Get().IsValid()) {
             LogPrintf("CSigSharesManager::%s -- failed to sign sigShare. signHash=%s, id=%s, msgHash=%s, time=%s\n",
@@ -1692,7 +1693,8 @@ std::optional<CSigShare> CSigSharesManager::CreateSigShare(const CQuorum& quorum
     CSigShare sigShare(quorum.params.type, quorum.qc->quorumHash, id, msgHash, uint16_t(memberIdx), {});
     uint256 signHash = sigShare.buildSignHash().Get();
 
-    sigShare.sigShare.Set(skShare.Sign(signHash, bls::bls_legacy_scheme.load()), bls::bls_legacy_scheme.load());
+    auto bls_scheme = bls::bls_legacy_scheme.load();
+    sigShare.sigShare.Set(skShare.Sign(signHash, bls_scheme), bls_scheme);
     if (!sigShare.sigShare.Get().IsValid()) {
         LogPrintf("CSigSharesManager::%s -- failed to sign sigShare. signHash=%s, id=%s, msgHash=%s, time=%s\n", __func__,
                   signHash.ToString(), sigShare.getId().ToString(), sigShare.getMsgHash().ToString(), t.count());

From 549837e5258071a02c25186e9c746709f5bb70c4 Mon Sep 17 00:00:00 2001
From: pasta <pasta@dashboost.org>
Date: Thu, 13 Nov 2025 18:00:01 -0600
Subject: [PATCH 489/656] fix: improve atomic load and set for cleanup height
 in CDeterministicMNManager

---
 src/evo/deterministicmns.cpp | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/evo/deterministicmns.cpp b/src/evo/deterministicmns.cpp
index b8b7d0c64109..43b349f700d2 100644
--- a/src/evo/deterministicmns.cpp
+++ b/src/evo/deterministicmns.cpp
@@ -722,8 +722,10 @@ bool CDeterministicMNManager::ProcessBlock(const CBlock& block, gsl::not_null<co
         }
         LogPrintf("CDeterministicMNManager::%s -- DIP3 is enforced now. nHeight=%d\n", __func__, nHeight);
     }
-    if (nHeight > to_cleanup) to_cleanup = nHeight;
-
+    int current = to_cleanup.load();
+    while (nHeight > current && !to_cleanup.compare_exchange_weak(current, nHeight)) {
+        // Loop continues if compare_exchange_weak failed (another thread changed it) (current is updated to the new value in to_cleanup)
+    }
     return true;
 }
 

From 48446f9d71cc4dc5310203cdf325acd33eda97c7 Mon Sep 17 00:00:00 2001
From: pasta <pasta@dashboost.org>
Date: Thu, 13 Nov 2025 19:14:35 -0600
Subject: [PATCH 490/656] fix: move the .debug files into the debug artifact

---
 contrib/guix/libexec/build.sh | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/contrib/guix/libexec/build.sh b/contrib/guix/libexec/build.sh
index 90a5238372fa..4438c3dc1246 100755
--- a/contrib/guix/libexec/build.sh
+++ b/contrib/guix/libexec/build.sh
@@ -432,12 +432,14 @@ mkdir -p "$DISTSRC"
                     || ( rm -f "${OUTDIR}/${DISTNAME}-${HOST//x86_64-w64-mingw32/win64}-debug.zip" && exit 1 )
                 ;;
             *linux*)
-                find "${DISTNAME}" -not -name "*.dbg" -print0 \
+                # Main (non-debug) tarball: exclude separate debug files and the build-id debug tree
+                find "${DISTNAME}" -not -name "*.dbg" -not -path "${DISTNAME}/usr/lib/debug/*" -print0 \
                     | sort --zero-terminated \
                     | tar --create --no-recursion --mode='u+rw,go+r-w,a+X' --null --files-from=- \
                     | gzip -9n > "${OUTDIR}/${DISTNAME}-${HOST}.tar.gz" \
                     || ( rm -f "${OUTDIR}/${DISTNAME}-${HOST}.tar.gz" && exit 1 )
-                find "${DISTNAME}" -name "*.dbg" -print0 \
+                # Debug tarball: include .dbg files and the build-id debug tree
+                find "${DISTNAME}" \( -name "*.dbg" -o -path "${DISTNAME}/usr/lib/debug/*" \) -print0 \
                     | sort --zero-terminated \
                     | tar --create --no-recursion --mode='u+rw,go+r-w,a+X' --null --files-from=- \
                     | gzip -9n > "${OUTDIR}/${DISTNAME}-${HOST}-debug.tar.gz" \

From 12ecc0df74623fa2a7f4561bac7fdfe2513a6d85 Mon Sep 17 00:00:00 2001
From: pasta <pasta@dashboost.org>
Date: Thu, 13 Nov 2025 21:10:48 -0600
Subject: [PATCH 491/656] refactor: implement CleanupThrottler for thread-safe
 cleanup management

---
 src/chainlock/chainlock.cpp |  9 +--------
 src/chainlock/chainlock.h   |  3 ++-
 src/llmq/signing.cpp        |  5 +----
 src/llmq/signing.h          |  2 +-
 src/llmq/signing_shares.cpp |  7 +++----
 src/llmq/signing_shares.h   |  3 ++-
 src/util/time.h             | 34 ++++++++++++++++++++++++++++++++++
 7 files changed, 44 insertions(+), 19 deletions(-)

diff --git a/src/chainlock/chainlock.cpp b/src/chainlock/chainlock.cpp
index 57e6bbf54e6d..8ea6e20c3912 100644
--- a/src/chainlock/chainlock.cpp
+++ b/src/chainlock/chainlock.cpp
@@ -442,14 +442,7 @@ void CChainLocksHandler::Cleanup()
         return;
     }
 
-    auto now = GetTime<std::chrono::seconds>();
-    auto expected = nextCleanup.load(std::memory_order_relaxed);
-    // cleanup is due
-    if (now < expected) {
-        return;
-    }
-    // try to claim the cleanup slot atomically, if it fails, another thread is already cleaning up
-    if (!nextCleanup.compare_exchange_strong(expected, now + CLEANUP_INTERVAL, std::memory_order_relaxed)) {
+    if (!cleanupThrottler.TryCleanup(CLEANUP_INTERVAL)) {
         return;
     }
 
diff --git a/src/chainlock/chainlock.h b/src/chainlock/chainlock.h
index f94cadf3a47a..14c9aa9a3f55 100644
--- a/src/chainlock/chainlock.h
+++ b/src/chainlock/chainlock.h
@@ -12,6 +12,7 @@
 #include <protocol.h>
 #include <saltedhasher.h>
 #include <sync.h>
+#include <util/time.h>
 
 #include <chainlock/signing.h>
 
@@ -67,7 +68,7 @@ class CChainLocksHandler final : public chainlock::ChainLockSignerParent
 
     std::map<uint256, std::chrono::seconds> seenChainLocks GUARDED_BY(cs);
 
-    std::atomic<std::chrono::seconds> nextCleanup{0s};
+    CleanupThrottler<NodeClock> cleanupThrottler;
 
 public:
     CChainLocksHandler() = delete;
diff --git a/src/llmq/signing.cpp b/src/llmq/signing.cpp
index 7e0901792582..b8f400566636 100644
--- a/src/llmq/signing.cpp
+++ b/src/llmq/signing.cpp
@@ -638,8 +638,7 @@ void CSigningManager::TruncateRecoveredSig(Consensus::LLMQType llmqType, const u
 void CSigningManager::Cleanup()
 {
     constexpr auto CLEANUP_INTERVAL{5000ms};
-    auto now = SystemClock::now();
-    if (now < nextCleanupTime) {
+    if (!cleanupThrottler.TryCleanup(CLEANUP_INTERVAL)) {
         return;
     }
 
@@ -647,8 +646,6 @@ void CSigningManager::Cleanup()
 
     db.CleanupOldRecoveredSigs(maxAge);
     db.CleanupOldVotes(maxAge);
-
-    nextCleanupTime = now + CLEANUP_INTERVAL;
 }
 
 void CSigningManager::RegisterRecoveredSigsListener(CRecoveredSigsListener* l)
diff --git a/src/llmq/signing.h b/src/llmq/signing.h
index fef5008bcd61..3de5857a1168 100644
--- a/src/llmq/signing.h
+++ b/src/llmq/signing.h
@@ -178,7 +178,7 @@ class CSigningManager
 
     FastRandomContext rnd GUARDED_BY(cs_pending);
 
-    std::chrono::time_point<SystemClock> nextCleanupTime{};
+    CleanupThrottler<NodeClock> cleanupThrottler;
 
     mutable Mutex cs_listeners;
     std::vector<CRecoveredSigsListener*> recoveredSigsListeners GUARDED_BY(cs_listeners);
diff --git a/src/llmq/signing_shares.cpp b/src/llmq/signing_shares.cpp
index c5e8c87e4be1..66aab5ad67b3 100644
--- a/src/llmq/signing_shares.cpp
+++ b/src/llmq/signing_shares.cpp
@@ -1387,8 +1387,8 @@ CSigShare CSigSharesManager::RebuildSigShare(const CSigSharesNodeState::SessionI
 
 void CSigSharesManager::Cleanup()
 {
-    int64_t now = GetTime<std::chrono::seconds>().count();
-    if (now - lastCleanupTime < 5) {
+    static constexpr auto CLEANUP_INTERVAL{5s};
+    if (!cleanupThrottler.TryCleanup(CLEANUP_INTERVAL)) {
         return;
     }
 
@@ -1451,6 +1451,7 @@ void CSigSharesManager::Cleanup()
 
         // Remove sessions which timed out
         Uint256HashSet timeoutSessions;
+        int64_t now = GetTime<std::chrono::seconds>().count();
         for (const auto& [signHash, lastSeenTime] : timeSeenForSessions) {
             if (now - lastSeenTime >= SESSION_NEW_SHARES_TIMEOUT) {
                 timeoutSessions.emplace(signHash);
@@ -1517,8 +1518,6 @@ void CSigSharesManager::Cleanup()
         });
         nodeStates.erase(nodeId);
     }
-
-    lastCleanupTime = GetTime<std::chrono::seconds>().count();
 }
 
 void CSigSharesManager::RemoveSigSharesForSession(const uint256& signHash)
diff --git a/src/llmq/signing_shares.h b/src/llmq/signing_shares.h
index f49c927ed068..8ec716a1fe17 100644
--- a/src/llmq/signing_shares.h
+++ b/src/llmq/signing_shares.h
@@ -15,6 +15,7 @@
 #include <serialize.h>
 #include <sync.h>
 #include <util/threadinterrupt.h>
+#include <util/time.h>
 #include <uint256.h>
 
 #include <atomic>
@@ -412,7 +413,7 @@ class CSigSharesManager : public CRecoveredSigsListener
     const CQuorumManager& qman;
     const CSporkManager& m_sporkman;
 
-    int64_t lastCleanupTime{0};
+    CleanupThrottler<NodeClock> cleanupThrottler;
     std::atomic<uint32_t> recoveredSigsCounter{0};
 
 public:
diff --git a/src/util/time.h b/src/util/time.h
index 2e71818802c1..c1929ab7a9de 100644
--- a/src/util/time.h
+++ b/src/util/time.h
@@ -8,6 +8,7 @@
 
 #include <compat/compat.h>
 
+#include <atomic>
 #include <chrono> // IWYU pragma: export
 #include <cstdint>
 #include <string>
@@ -31,6 +32,39 @@ using SteadyMicroseconds = std::chrono::time_point<std::chrono::steady_clock, st
 
 using SystemClock = std::chrono::system_clock;
 
+/**
+ * Thread-safe cleanup interval throttler.
+ * Ensures cleanup functions don't run more frequently than specified interval.
+ */
+template<typename ClockType = NodeClock>
+class CleanupThrottler {
+private:
+    std::atomic<typename ClockType::time_point> nextCleanup{typename ClockType::time_point{}};
+
+public:
+    /**
+     * Attempt to claim a cleanup slot.
+     * @param interval Minimum time between cleanups
+     * @return true if cleanup should proceed, false if throttled
+     */
+    bool TryCleanup(typename ClockType::duration interval) {
+        auto now = ClockType::now();
+        auto expected = nextCleanup.load(std::memory_order_relaxed);
+
+        // Cleanup not yet due
+        if (now < expected) {
+            return false;
+        }
+
+        // Atomically claim the cleanup slot
+        return nextCleanup.compare_exchange_strong(
+            expected,
+            now + interval,
+            std::memory_order_relaxed
+        );
+    }
+};
+
 void UninterruptibleSleep(const std::chrono::microseconds& n);
 
 /**

From 39773b088576dfde5c5706feb4959de16c759714 Mon Sep 17 00:00:00 2001
From: pasta <pasta@dashboost.org>
Date: Thu, 13 Nov 2025 21:21:29 -0600
Subject: [PATCH 492/656] fmt: run clang format

---
 src/llmq/signing_shares.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/llmq/signing_shares.h b/src/llmq/signing_shares.h
index 8ec716a1fe17..d729fe31f442 100644
--- a/src/llmq/signing_shares.h
+++ b/src/llmq/signing_shares.h
@@ -14,9 +14,9 @@
 #include <saltedhasher.h>
 #include <serialize.h>
 #include <sync.h>
+#include <uint256.h>
 #include <util/threadinterrupt.h>
 #include <util/time.h>
-#include <uint256.h>
 
 #include <atomic>
 #include <limits>

From 857f860a87aef646c7dd9ef6a32aecdd10b6194b Mon Sep 17 00:00:00 2001
From: pasta <pasta@dashboost.org>
Date: Thu, 13 Nov 2025 21:32:37 -0600
Subject: [PATCH 493/656] fix: shellcheck linter

---
 contrib/guix/libexec/build.sh | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/contrib/guix/libexec/build.sh b/contrib/guix/libexec/build.sh
index 4438c3dc1246..9ba96a33dc26 100755
--- a/contrib/guix/libexec/build.sh
+++ b/contrib/guix/libexec/build.sh
@@ -345,10 +345,7 @@ mkdir -p "$DISTSRC"
                 case "$HOST" in
                     *linux*)
                         # Compress DWARF sections in debug files and set proper permissions
-                        find "${DISTNAME}" -name "*.dbg" -type f -print0 | xargs -0 -P"$JOBS" -I{} sh -c '
-                            objcopy --compress-debug-sections=zlib "$1" "$1.tmp" && mv "$1.tmp" "$1"
-                            chmod 644 "$1"
-                        ' _ {}
+                        find "${DISTNAME}" -name "*.dbg" -type f -print0 | xargs -0 -P"$JOBS" -I{} sh -c "objcopy --compress-debug-sections=zlib \"\$1\" \"\$1.tmp\" && mv \"\$1.tmp\" \"\$1\"; chmod 644 \"\$1\"" _ {}
 
                         # Create .build-id tree for perf auto-discovery
                         mkdir -p "${DISTNAME}/usr/lib/debug/.build-id"

From 67aa2383a0e8502eed41c1d8211473a0b5035f1a Mon Sep 17 00:00:00 2001
From: Kittywhiskers Van Gogh <63189531+kwvg@users.noreply.github.com>
Date: Sat, 25 Oct 2025 00:40:51 +0530
Subject: [PATCH 494/656] merge bitcoin#31100: remove dependency install
 instructions from win docs

---
 depends/README.md    |  2 +-
 doc/build-windows.md | 20 ++------------------
 2 files changed, 3 insertions(+), 19 deletions(-)

diff --git a/depends/README.md b/depends/README.md
index dcafd548cc01..b541da6d191b 100644
--- a/depends/README.md
+++ b/depends/README.md
@@ -60,7 +60,7 @@ For more information, see [SDK Extraction](../contrib/macdeploy/README.md#sdk-ex
 
 #### For Win64 cross compilation
 
-- see [build-windows.md](../doc/build-windows.md#cross-compilation-for-ubuntu-and-windows-subsystem-for-linux)
+    apt install g++-mingw-w64-x86-64-posix
 
 #### For linux (including i386, ARM) cross compilation
 
diff --git a/doc/build-windows.md b/doc/build-windows.md
index 91d1b86cef54..873d8d67af62 100644
--- a/doc/build-windows.md
+++ b/doc/build-windows.md
@@ -27,24 +27,8 @@ The steps below can be performed on Ubuntu or WSL. The depends system
 will also work on other Linux distributions, however the commands for
 installing the toolchain will be different.
 
-First, install the general dependencies:
-
-    sudo apt-get install build-essential libtool autotools-dev automake pkg-config bsdmainutils curl git bison
-
-A host toolchain (`build-essential`) is necessary because some dependency
-packages need to build host utilities that are used in the build process.
-
-See [dependencies.md](dependencies.md) for a complete overview.
-
-## Building for 64-bit Windows
-
-The first step is to install the mingw-w64 cross-compilation tool chain:
-
-```sh
-sudo apt install g++-mingw-w64-x86-64-posix
-```
-
-Once the toolchain is installed the build steps are common:
+See [README.md](../depends/README.md) in the depends directory for which
+dependencies to install and [dependencies.md](dependencies.md) for a complete overview.
 
 Note that for WSL the Dash Core source path MUST be somewhere in the default mount file system, for
 example /usr/src/dash, AND not under /mnt/d/. If this is not the case the dependency autoconf scripts will fail.

From b443c14df6c1f3d962e7a410d4bb0148676e0a4c Mon Sep 17 00:00:00 2001
From: Kittywhiskers Van Gogh <63189531+kwvg@users.noreply.github.com>
Date: Sat, 25 Oct 2025 03:40:34 +0530
Subject: [PATCH 495/656] partial bitcoin#30454: Introduce CMake-based build
 system

includes:
- 6ce50fd9d0 (only some changes to `depends/README.md`)
---
 depends/README.md | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/depends/README.md b/depends/README.md
index b541da6d191b..f5ac1bd390e2 100644
--- a/depends/README.md
+++ b/depends/README.md
@@ -92,9 +92,13 @@ For linux S390X cross compilation:
 
     pkg install bash
 
+### Install the required dependencies: NetBSD
+
+    pkgin install bash gmake
+
 ### Install the required dependencies: OpenBSD
 
-    pkg_add bash gtar
+    pkg_add bash gmake gtar
 
 ### Dependency Options
 

From 8d887c34abdfad2b1c667a802f4ff83307beaf1c Mon Sep 17 00:00:00 2001
From: Kittywhiskers Van Gogh <63189531+kwvg@users.noreply.github.com>
Date: Thu, 9 Jan 2025 20:24:05 +0000
Subject: [PATCH 496/656] merge bitcoin#31626: Use base system's `sha256sum`
 utility on FreeBSD

---
 depends/builders/freebsd.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/depends/builders/freebsd.mk b/depends/builders/freebsd.mk
index 465f58e04dc7..18316f492ee9 100644
--- a/depends/builders/freebsd.mk
+++ b/depends/builders/freebsd.mk
@@ -1,5 +1,5 @@
 build_freebsd_CC=clang
 build_freebsd_CXX=clang++
 
-build_freebsd_SHA256SUM = shasum -a 256
+build_freebsd_SHA256SUM = sha256sum
 build_freebsd_DOWNLOAD = curl --location --fail --connect-timeout $(DOWNLOAD_CONNECT_TIMEOUT) --retry $(DOWNLOAD_RETRIES) -o

From e6d6d179350b8ed8217cc89fba4348b5d3e29299 Mon Sep 17 00:00:00 2001
From: Kittywhiskers Van Gogh <63189531+kwvg@users.noreply.github.com>
Date: Tue, 11 Feb 2025 11:27:27 +0100
Subject: [PATCH 497/656] merge bitcoin#31840: add missing Darwin objcopy

---
 depends/hosts/darwin.mk | 1 +
 1 file changed, 1 insertion(+)

diff --git a/depends/hosts/darwin.mk b/depends/hosts/darwin.mk
index a50e36110dc0..845ff03d6bae 100644
--- a/depends/hosts/darwin.mk
+++ b/depends/hosts/darwin.mk
@@ -19,6 +19,7 @@ clangxx_prog=$(shell $(SHELL) $(.SHELLFLAGS) "command -v clang++")
 darwin_AR=$(shell $(SHELL) $(.SHELLFLAGS) "command -v llvm-ar")
 darwin_DSYMUTIL=$(shell $(SHELL) $(.SHELLFLAGS) "command -v dsymutil")
 darwin_NM=$(shell $(SHELL) $(.SHELLFLAGS) "command -v llvm-nm")
+darwin_OBJCOPY=$(shell $(SHELL) $(.SHELLFLAGS) "command -v llvm-objcopy")
 darwin_OBJDUMP=$(shell $(SHELL) $(.SHELLFLAGS) "command -v llvm-objdump")
 darwin_RANLIB=$(shell $(SHELL) $(.SHELLFLAGS) "command -v llvm-ranlib")
 darwin_STRIP=$(shell $(SHELL) $(.SHELLFLAGS) "command -v llvm-strip")

From 86d0a27757febfa6d03405fad1944e363bf82a95 Mon Sep 17 00:00:00 2001
From: Kittywhiskers Van Gogh <63189531+kwvg@users.noreply.github.com>
Date: Sun, 4 Aug 2024 23:08:26 +0100
Subject: [PATCH 498/656] merge bitcoin#30584: Make default `host` and `build`
 comparable

---
 depends/Makefile | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/depends/Makefile b/depends/Makefile
index 53a5f23f1f79..c8510f4cc010 100644
--- a/depends/Makefile
+++ b/depends/Makefile
@@ -52,7 +52,6 @@ C_STANDARD ?= c11
 CXX_STANDARD ?= c++20
 
 BUILD = $(shell ./config.guess)
-HOST ?= $(BUILD)
 PATCHES_PATH = $(BASEDIR)/patches
 BASEDIR = $(CURDIR)
 HASH_LENGTH:=11
@@ -61,11 +60,6 @@ DOWNLOAD_RETRIES:=3
 HOST_ID_SALT ?= salt
 BUILD_ID_SALT ?= salt
 
-host:=$(BUILD)
-ifneq ($(HOST),)
-host:=$(HOST)
-endif
-
 ifneq ($(DEBUG),)
 release_type=debug
 else
@@ -75,9 +69,15 @@ endif
 base_build_dir=$(WORK_PATH)/build
 base_staging_dir=$(WORK_PATH)/staging
 base_download_dir=$(WORK_PATH)/download
-canonical_host:=$(shell ./config.sub $(HOST))
 build:=$(shell ./config.sub $(BUILD))
 
+host:=$(build)
+ifneq ($(HOST),)
+host:=$(HOST)
+endif
+HOST ?= $(BUILD)
+canonical_host:=$(shell ./config.sub $(HOST))
+
 build_arch =$(firstword $(subst -, ,$(build)))
 build_vendor=$(word 2,$(subst -, ,$(build)))
 full_build_os:=$(subst $(build_arch)-$(build_vendor)-,,$(build))

From c8e27a27bfb7e856bf9dfcd3dca0cfccfe91864b Mon Sep 17 00:00:00 2001
From: Kittywhiskers Van Gogh <63189531+kwvg@users.noreply.github.com>
Date: Sat, 25 Oct 2025 00:16:02 +0530
Subject: [PATCH 499/656] merge bitcoin#31982: rename libmultiprocess
 repository

---
 depends/packages/native_libmultiprocess.mk | 2 +-
 doc/design/multiprocess.md                 | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/depends/packages/native_libmultiprocess.mk b/depends/packages/native_libmultiprocess.mk
index 2e30be434cd1..8273f1508466 100644
--- a/depends/packages/native_libmultiprocess.mk
+++ b/depends/packages/native_libmultiprocess.mk
@@ -1,6 +1,6 @@
 package=native_libmultiprocess
 $(package)_version=6aca5f389bacf2942394b8738bbe15d6c9edfb9b
-$(package)_download_path=https://github.com/chaincodelabs/libmultiprocess/archive
+$(package)_download_path=https://github.com/bitcoin-core/libmultiprocess/archive
 $(package)_file_name=$($(package)_version).tar.gz
 $(package)_sha256_hash=2efeed53542bc1d8af3291f2b6f0e5d430d86a5e04e415ce33c136f2c226a51d
 $(package)_dependencies=native_capnp
diff --git a/doc/design/multiprocess.md b/doc/design/multiprocess.md
index 3463130110dd..6e305c0f9b24 100644
--- a/doc/design/multiprocess.md
+++ b/doc/design/multiprocess.md
@@ -19,7 +19,7 @@ The `-debug=ipc` command line option can be used to see requests and responses b
 
 ## Installation
 
-The multiprocess feature requires [Cap'n Proto](https://capnproto.org/) and [libmultiprocess](https://github.com/chaincodelabs/libmultiprocess) as dependencies. A simple way to get starting using it without installing these dependencies manually is to use the [depends system](../depends) with the `MULTIPROCESS=1` [dependency option](../depends#dependency-options) passed to make:
+The multiprocess feature requires [Cap'n Proto](https://capnproto.org/) and [libmultiprocess](https://github.com/bitcoin-core/libmultiprocess) as dependencies. A simple way to get starting using it without installing these dependencies manually is to use the [depends system](../depends) with the `MULTIPROCESS=1` [dependency option](../depends#dependency-options) passed to make:
 
 ```
 cd <DASH_SOURCE_DIRECTORY>
@@ -32,7 +32,7 @@ DASHD=dash-node test/functional/test_runner.py
 
 The configure script will pick up settings and library locations from the depends directory, so there is no need to pass `--enable-multiprocess` as a separate flag when using the depends system (it's controlled by the `MULTIPROCESS=1` option).
 
-Alternately, you can install [Cap'n Proto](https://capnproto.org/) and [libmultiprocess](https://github.com/chaincodelabs/libmultiprocess) packages on your system, and just run `./configure --enable-multiprocess` without using the depends system. The configure script will be able to locate the installed packages via [pkg-config](https://www.freedesktop.org/wiki/Software/pkg-config/). See [Installation](https://github.com/chaincodelabs/libmultiprocess#installation) section of the libmultiprocess readme for install steps. See [build-unix.md](build-unix.md) and [build-osx.md](build-osx.md) for information about installing dependencies in general.
+Alternately, you can install [Cap'n Proto](https://capnproto.org/) and [libmultiprocess](https://github.com/bitcoin-core/libmultiprocess) packages on your system, and just run `./configure --enable-multiprocess` without using the depends system. The configure script will be able to locate the installed packages via [pkg-config](https://www.freedesktop.org/wiki/Software/pkg-config/). See [Installation](https://github.com/bitcoin-core/libmultiprocess#installation) section of the libmultiprocess readme for install steps. See [build-unix.md](build-unix.md) and [build-osx.md](build-osx.md) for information about installing dependencies in general.
 
 ## IPC implementation details
 
@@ -48,7 +48,7 @@ interface method invokes the implementation directly. When code is running in
 different processes, calling an interface method invokes a proxy interface
 implementation that communicates with a remote process and invokes the real
 implementation in the remote process. The
-[libmultiprocess](https://github.com/chaincodelabs/libmultiprocess) code
+[libmultiprocess](https://github.com/bitcoin-core/libmultiprocess) code
 generation tool internally generates proxy client classes and proxy server
 classes for this purpose that are thin wrappers around Cap'n Proto
 [client](https://capnproto.org/cxxrpc.html#clients) and
@@ -67,6 +67,6 @@ a corresponding thread in the invoked process responsible for executing all
 method calls from the source thread, without blocking I/O or holding up another
 call, and using the same thread local variables, locks, and callbacks between
 calls. The forwarding, tracking, and threading is implemented inside the
-[libmultiprocess](https://github.com/chaincodelabs/libmultiprocess) library
+[libmultiprocess](https://github.com/bitcoin-core/libmultiprocess) library
 which has the design goal of making calls between processes look like calls in
 the same process to the extent possible.

From 00350a0d833fa5212bf3808b39b6d97f7c283942 Mon Sep 17 00:00:00 2001
From: Kittywhiskers Van Gogh <63189531+kwvg@users.noreply.github.com>
Date: Sat, 25 Oct 2025 00:52:26 +0530
Subject: [PATCH 500/656] merge bitcoin#32086: Shuffle depends instructions and
 recommend modern make for macOS

---
 depends/README.md | 159 +++++++++++++++++++++++++++-------------------
 1 file changed, 92 insertions(+), 67 deletions(-)

diff --git a/depends/README.md b/depends/README.md
index f5ac1bd390e2..62ae6312623b 100644
--- a/depends/README.md
+++ b/depends/README.md
@@ -1,16 +1,55 @@
-### Usage
+# Depends build
+
+This is a system of building and caching dependencies necessary for building
+Dash Core. It supports cross-compilation. For more details see [description.md](description.md),
+as well as [packages.md](packages.md) for how to add packages.
+
+## Usage
+
+### Ubuntu & Debian
+
+    apt install automake bison cmake curl libtool make patch pkg-config python3 xz-utils
 
 To build dependencies for the current arch+OS:
 
     make
 
-To build for another arch/OS:
+### macOS
 
-    make HOST=host-platform-triplet
+Install Xcode Command Line Tools and Homebrew Package Manager,
+see [build-osx.md](../doc/build-osx.md).
 
-For example:
+    brew install cmake make ninja
 
-    make HOST=x86_64-w64-mingw32 -j4
+To build dependencies for the current arch+OS:
+
+    gmake
+
+### FreeBSD
+
+    pkg install bash
+
+To build dependencies for the current arch+OS:
+
+    gmake
+
+### NetBSD
+
+    pkgin install bash gmake
+
+To build dependencies for the current arch+OS:
+
+    gmake
+
+### OpenBSD
+
+    pkg_add bash gmake gtar
+
+To build dependencies for the current arch+OS:
+
+    gmake
+
+## Configuring Dash Core
 
 **Dash Core's `configure` script by default will ignore the depends output.** In
 order for it to pick up libraries, tools, and settings from the depends build,
@@ -23,6 +62,53 @@ created. To use it during compilation:
 The default install prefix when using `config.site` is `--prefix=depends/<host-platform-triplet>`,
 so depends build outputs will be installed in that location.
 
+## Dependency Options
+
+The following can be set when running make: `make FOO=bar`
+
+- `SOURCES_PATH`: Downloaded sources will be placed here
+- `BASE_CACHE`: Built packages will be placed here
+- `SDK_PATH`: Path where SDKs can be found (used by macOS)
+- `FALLBACK_DOWNLOAD_PATH`: If a source file can't be fetched, try here before giving up
+- `C_STANDARD`: Set the C standard version used. Defaults to `c11`.
+- `CXX_STANDARD`: Set the C++ standard version used. Defaults to `c++20`.
+- `NO_BOOST`: Don't download/build/cache Boost
+- `NO_LIBEVENT`: Don't download/build/cache Libevent
+- `NO_QT`: Don't download/build/cache Qt and its dependencies
+- `NO_QR`: Don't download/build/cache packages needed for enabling qrencode
+- `NO_ZMQ`: Don't download/build/cache packages needed for enabling ZeroMQ
+- `NO_WALLET`: Don't download/build/cache libs needed to enable the wallet
+- `NO_BDB`: Don't download/build/cache BerkeleyDB
+- `NO_SQLITE`: Don't download/build/cache SQLite
+- `NO_UPNP`: Don't download/build/cache packages needed for enabling UPnP
+- `NO_NATPMP`: Don't download/build/cache packages needed for enabling NAT-PMP
+- `NO_USDT`: Don't download/build/cache packages needed for enabling USDT tracepoints
+- `ALLOW_HOST_PACKAGES`: Packages that are missed in dependencies (due to `NO_*` option or
+  build script logic) are searched for among the host system packages using
+  `pkg-config`. It allows building with packages of other (newer) versions
+- `MULTIPROCESS`: build libmultiprocess (experimental, requires cmake)
+- `DEBUG`: Disable some optimizations and enable more runtime checking
+- `HOST_ID_SALT`: Optional salt to use when generating host package ids
+- `BUILD_ID_SALT`: Optional salt to use when generating build package ids
+- `LOG`: Use file-based logging for individual packages. During a package build its log file
+  resides in the `depends` directory, and the log file is printed out automatically in case
+  of build error. After successful build log files are moved along with package archives
+- `LTO`: Enable options needed for LTO. Does not add `-flto` related options to *FLAGS.
+- `NO_HARDEN=1`: Don't use hardening options when building packages
+
+If some packages are not built, for example `make NO_WALLET=1`, the appropriate
+options will be passed to Dash Core's configure. In this case, `--disable-wallet`.
+
+## Cross compilation
+
+To build for another arch/OS:
+
+    make HOST=host-platform-triplet
+
+For example:
+
+    make HOST=x86_64-w64-mingw32 -j4
+
 Common `host-platform-triplet`s for cross compilation are:
 
 - `i686-pc-linux-gnu` for Linux 32 bit
@@ -41,13 +127,7 @@ Common `host-platform-triplet`s for cross compilation are:
 - `aarch64-linux-android` for Android ARM 64 bit
 - `x86_64-linux-android` for Android x86 64 bit
 
-The paths are automatically configured and no other options are needed unless targeting [Android](../doc/build-android.md).
-
-### Install the required dependencies: Ubuntu & Debian
-
-#### Common
-
-    apt install automake bison cmake curl libtool make patch pkg-config python3 xz-utils
+The paths are automatically configured and no other options are needed.
 
 #### For macOS cross compilation
 
@@ -88,64 +168,9 @@ For linux S390X cross compilation:
 
     sudo apt-get install g++-s390x-linux-gnu binutils-s390x-linux-gnu
 
-### Install the required dependencies: FreeBSD
-
-    pkg install bash
-
-### Install the required dependencies: NetBSD
-
-    pkgin install bash gmake
-
-### Install the required dependencies: OpenBSD
-
-    pkg_add bash gmake gtar
-
-### Dependency Options
-
-The following can be set when running make: `make FOO=bar`
-
-- `SOURCES_PATH`: Downloaded sources will be placed here
-- `BASE_CACHE`: Built packages will be placed here
-- `SDK_PATH`: Path where SDKs can be found (used by macOS)
-- `FALLBACK_DOWNLOAD_PATH`: If a source file can't be fetched, try here before giving up
-- `C_STANDARD`: Set the C standard version used. Defaults to `c11`.
-- `CXX_STANDARD`: Set the C++ standard version used. Defaults to `c++20`.
-- `NO_BOOST`: Don't download/build/cache Boost
-- `NO_LIBEVENT`: Don't download/build/cache Libevent
-- `NO_QT`: Don't download/build/cache Qt and its dependencies
-- `NO_QR`: Don't download/build/cache packages needed for enabling qrencode
-- `NO_ZMQ`: Don't download/build/cache packages needed for enabling ZeroMQ
-- `NO_WALLET`: Don't download/build/cache libs needed to enable the wallet
-- `NO_BDB`: Don't download/build/cache BerkeleyDB
-- `NO_SQLITE`: Don't download/build/cache SQLite
-- `NO_UPNP`: Don't download/build/cache packages needed for enabling UPnP
-- `NO_NATPMP`: Don't download/build/cache packages needed for enabling NAT-PMP
-- `NO_USDT`: Don't download/build/cache packages needed for enabling USDT tracepoints
-- `ALLOW_HOST_PACKAGES`: Packages that are missed in dependencies (due to `NO_*` option or
-  build script logic) are searched for among the host system packages using
-  `pkg-config`. It allows building with packages of other (newer) versions
-- `MULTIPROCESS`: build libmultiprocess (experimental, requires cmake)
-- `DEBUG`: Disable some optimizations and enable more runtime checking
-- `HOST_ID_SALT`: Optional salt to use when generating host package ids
-- `BUILD_ID_SALT`: Optional salt to use when generating build package ids
-- `LOG`: Use file-based logging for individual packages. During a package build its log file
-  resides in the `depends` directory, and the log file is printed out automatically in case
-  of build error. After successful build log files are moved along with package archives
-- `LTO`: Enable options needed for LTO. Does not add `-flto` related options to *FLAGS.
-- `NO_HARDEN=1`: Don't use hardening options when building packages
-
-If some packages are not built, for example `make NO_WALLET=1`, the appropriate
-options will be passed to Dash Core's configure. In this case, `--disable-wallet`.
-
 ### Additional targets
 
     download: run 'make download' to fetch all sources without building them
     download-osx: run 'make download-osx' to fetch all sources needed for macOS builds
     download-win: run 'make download-win' to fetch all sources needed for win builds
     download-linux: run 'make download-linux' to fetch all sources needed for linux builds
-
-
-### Other documentation
-
-- [description.md](description.md): General description of the depends system
-- [packages.md](packages.md): Steps for adding packages

From 6020cdcc02384c8220d42d52938d6e9a4542e649 Mon Sep 17 00:00:00 2001
From: Kittywhiskers Van Gogh <63189531+kwvg@users.noreply.github.com>
Date: Fri, 7 Feb 2025 09:44:02 +0000
Subject: [PATCH 501/656] merge bitcoin#31998: patch around PlacementNew issue
 in capnp

---
 depends/packages/capnp.mk                     |  5 ++
 depends/patches/capnp/abi_placement_new.patch | 71 +++++++++++++++++++
 2 files changed, 76 insertions(+)
 create mode 100644 depends/patches/capnp/abi_placement_new.patch

diff --git a/depends/packages/capnp.mk b/depends/packages/capnp.mk
index 7f41d3b5a4ed..dff92d9e61fe 100644
--- a/depends/packages/capnp.mk
+++ b/depends/packages/capnp.mk
@@ -4,6 +4,7 @@ $(package)_download_path=$(native_$(package)_download_path)
 $(package)_download_file=$(native_$(package)_download_file)
 $(package)_file_name=$(native_$(package)_file_name)
 $(package)_sha256_hash=$(native_$(package)_sha256_hash)
+$(package)_patches=abi_placement_new.patch
 
 define $(package)_set_vars :=
   $(package)_config_opts := -DBUILD_TESTING=OFF
@@ -12,6 +13,10 @@ define $(package)_set_vars :=
   $(package)_cxxflags += -fdebug-prefix-map=$($(package)_extract_dir)=/usr -fmacro-prefix-map=$($(package)_extract_dir)=/usr
 endef
 
+define $(package)_preprocess_cmds
+  patch -p2 < $($(package)_patch_dir)/abi_placement_new.patch
+endef
+
 define $(package)_config_cmds
   $($(package)_cmake) .
 endef
diff --git a/depends/patches/capnp/abi_placement_new.patch b/depends/patches/capnp/abi_placement_new.patch
new file mode 100644
index 000000000000..9aef85db8e86
--- /dev/null
+++ b/depends/patches/capnp/abi_placement_new.patch
@@ -0,0 +1,71 @@
+From 74560f26f75dda4257dce541ca362a1e763b2971 Mon Sep 17 00:00:00 2001
+From: Ryan Ofsky <ryan@ofsky.org>
+Date: Thu, 6 Feb 2025 08:39:05 -0500
+Subject: [PATCH 1/1] Avoid gcc/clang ABI incompatibility caused by
+ PlacementNew
+
+GCC and clang do not use same calling convention for passing empty struct
+parameters. There is more information about this in
+https://itanium-cxx-abi.github.io/cxx-abi/cxx-abi-dev/archives/2015-December/002869.html
+
+Unfortunately this can create an issue in capnproto if it is built without
+optimizations in GCC, and the resulting static libraries are used in a clang
+program, or vice versa.
+
+Depending on what order libraries are specified on the linker command line, and
+whether code compiled with the other compiler is calling any header functions
+that cause weak a `operator new(unsigned int, kj::_::PlacementNew, void*)`
+symbol to be defined in its own objects, this can cause the linker to link a
+GCC-generated `kj::ctor` with a clang-generated `operator new`, and the
+resulting program to crash due to the compilers using different calling
+conventions for `operator new`.
+
+This problem is difficult to avoid in general, but pretty easy to avoid here by
+changing `operator new` parameter order so the empty struct parameter is last.
+
+This change should be beneficial for capnproto users that may be compiling it
+without optimizations, and not necessarily using a single compiler to build all
+their dependencies.
+
+The problem does not occur if any optimizations are enabled because `operator
+new` calls are inlined in that case.
+---
+ c++/src/kj/common.h | 11 +++++++----
+ 1 file changed, 7 insertions(+), 4 deletions(-)
+
+diff --git a/c++/src/kj/common.h b/c++/src/kj/common.h
+index b8edde3c..28ab11d6 100644
+--- a/c++/src/kj/common.h
++++ b/c++/src/kj/common.h
+@@ -1034,24 +1034,27 @@ private:
+ 
+ // We want placement new, but we don't want to #include <new>.  operator new cannot be defined in
+ // a namespace, and defining it globally conflicts with the definition in <new>.  So we have to
+-// define a dummy type and an operator new that uses it.
++// define a dummy type and an operator new that uses it.  The dummy type is intentionally passed
++// as the last parameter so clang and GCC ABI calling conventions for empty struct struct parameters
++// are compatible, and there are not segfaults trying to call clang operator new/delete from GCC or
++// vice versa.
+ 
+ namespace _ {  // private
+ struct PlacementNew {};
+ }  // namespace _ (private)
+ } // namespace kj
+ 
+-inline void* operator new(size_t, kj::_::PlacementNew, void* __p) noexcept {
++inline void* operator new(size_t, void* __p, kj::_::PlacementNew) noexcept {
+   return __p;
+ }
+ 
+-inline void operator delete(void*, kj::_::PlacementNew, void* __p) noexcept {}
++inline void operator delete(void*, void* __p, kj::_::PlacementNew) noexcept {}
+ 
+ namespace kj {
+ 
+ template <typename T, typename... Params>
+ inline void ctor(T& location, Params&&... params) {
+-  new (_::PlacementNew(), &location) T(kj::fwd<Params>(params)...);
++  new (&location, _::PlacementNew()) T(kj::fwd<Params>(params)...);
+ }
+ 
+ template <typename T>

From d4bc0aa94276f7ba9d223b8c046644a050b2bdfc Mon Sep 17 00:00:00 2001
From: Kittywhiskers Van Gogh <63189531+kwvg@users.noreply.github.com>
Date: Thu, 15 May 2025 00:16:14 +0200
Subject: [PATCH 502/656] merge bitcoin#32505: bump to latest config.guess and
 config.sub

---
 depends/config.guess |  20 +-
 depends/config.sub   | 752 +++++++++++++++++++++++++++++++++----------
 2 files changed, 587 insertions(+), 185 deletions(-)

diff --git a/depends/config.guess b/depends/config.guess
index cdfc4392047c..48a684601bd2 100755
--- a/depends/config.guess
+++ b/depends/config.guess
@@ -1,10 +1,10 @@
 #! /bin/sh
 # Attempt to guess a canonical system name.
-#   Copyright 1992-2023 Free Software Foundation, Inc.
+#   Copyright 1992-2024 Free Software Foundation, Inc.
 
 # shellcheck disable=SC2006,SC2268 # see below for rationale
 
-timestamp='2023-08-22'
+timestamp='2024-07-27'
 
 # This file is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
@@ -60,7 +60,7 @@ version="\
 GNU config.guess ($timestamp)
 
 Originally written by Per Bothner.
-Copyright 1992-2023 Free Software Foundation, Inc.
+Copyright 1992-2024 Free Software Foundation, Inc.
 
 This is free software; see the source for copying conditions.  There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@@ -123,7 +123,7 @@ set_cc_for_build() {
     dummy=$tmp/dummy
     case ${CC_FOR_BUILD-},${HOST_CC-},${CC-} in
 	,,)    echo "int x;" > "$dummy.c"
-	       for driver in cc gcc c89 c99 ; do
+	       for driver in cc gcc c17 c99 c89 ; do
 		   if ($driver -c -o "$dummy.o" "$dummy.c") >/dev/null 2>&1 ; then
 		       CC_FOR_BUILD=$driver
 		       break
@@ -165,6 +165,8 @@ Linux|GNU|GNU/*)
 	LIBC=dietlibc
 	#elif defined(__GLIBC__)
 	LIBC=gnu
+	#elif defined(__LLVM_LIBC__)
+	LIBC=llvm
 	#else
 	#include <stdarg.h>
 	/* First heuristic to detect musl libc.  */
@@ -632,7 +634,8 @@ EOF
 		sed 's/^		//' << EOF > "$dummy.c"
 		#include <sys/systemcfg.h>
 
-		main()
+		int
+		main ()
 			{
 			if (!__power_pc())
 				exit(1);
@@ -716,7 +719,8 @@ EOF
 		#include <stdlib.h>
 		#include <unistd.h>
 
-		int main ()
+		int
+		main ()
 		{
 		#if defined(_SC_KERNEL_BITS)
 		    long bits = sysconf(_SC_KERNEL_BITS);
@@ -1593,6 +1597,9 @@ EOF
     *:Unleashed:*:*)
 	GUESS=$UNAME_MACHINE-unknown-unleashed$UNAME_RELEASE
 	;;
+    *:Ironclad:*:*)
+	GUESS=$UNAME_MACHINE-unknown-ironclad
+	;;
 esac
 
 # Do we have a guess based on uname results?
@@ -1616,6 +1623,7 @@ cat > "$dummy.c" <<EOF
 #endif
 #endif
 #endif
+int
 main ()
 {
 #if defined (sony)
diff --git a/depends/config.sub b/depends/config.sub
index defe52c0c874..4aaae46f6f74 100755
--- a/depends/config.sub
+++ b/depends/config.sub
@@ -1,10 +1,10 @@
 #! /bin/sh
 # Configuration validation subroutine script.
-#   Copyright 1992-2023 Free Software Foundation, Inc.
+#   Copyright 1992-2024 Free Software Foundation, Inc.
 
-# shellcheck disable=SC2006,SC2268 # see below for rationale
+# shellcheck disable=SC2006,SC2268,SC2162 # see below for rationale
 
-timestamp='2023-09-19'
+timestamp='2024-05-27'
 
 # This file is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
@@ -76,7 +76,7 @@ Report bugs and patches to <config-patches@gnu.org>."
 version="\
 GNU config.sub ($timestamp)
 
-Copyright 1992-2023 Free Software Foundation, Inc.
+Copyright 1992-2024 Free Software Foundation, Inc.
 
 This is free software; see the source for copying conditions.  There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@@ -120,7 +120,6 @@ case $# in
 esac
 
 # Split fields of configuration type
-# shellcheck disable=SC2162
 saved_IFS=$IFS
 IFS="-" read field1 field2 field3 field4 <<EOF
 $1
@@ -142,10 +141,20 @@ case $1 in
 		# parts
 		maybe_os=$field2-$field3
 		case $maybe_os in
-			nto-qnx* | linux-* | uclinux-uclibc* \
-			| uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* \
-			| netbsd*-eabi* | kopensolaris*-gnu* | cloudabi*-eabi* \
-			| storm-chaos* | os2-emx* | rtmk-nova* | managarm-* \
+			  cloudabi*-eabi* \
+			| kfreebsd*-gnu* \
+			| knetbsd*-gnu* \
+			| kopensolaris*-gnu* \
+			| linux-* \
+			| managarm-* \
+			| netbsd*-eabi* \
+			| netbsd*-gnu* \
+			| nto-qnx* \
+			| os2-emx* \
+			| rtmk-nova* \
+			| storm-chaos* \
+			| uclinux-gnu* \
+			| uclinux-uclibc* \
 			| windows-* )
 				basic_machine=$field1
 				basic_os=$maybe_os
@@ -161,8 +170,12 @@ case $1 in
 		esac
 		;;
 	*-*)
-		# A lone config we happen to match not fitting any pattern
 		case $field1-$field2 in
+			# Shorthands that happen to contain a single dash
+			convex-c[12] | convex-c3[248])
+				basic_machine=$field2-convex
+				basic_os=
+				;;
 			decstation-3100)
 				basic_machine=mips-dec
 				basic_os=
@@ -170,28 +183,88 @@ case $1 in
 			*-*)
 				# Second component is usually, but not always the OS
 				case $field2 in
-					# Prevent following clause from handling this valid os
+					# Do not treat sunos as a manufacturer
 					sun*os*)
 						basic_machine=$field1
 						basic_os=$field2
 						;;
-					zephyr*)
-						basic_machine=$field1-unknown
-						basic_os=$field2
-						;;
 					# Manufacturers
-					dec* | mips* | sequent* | encore* | pc533* | sgi* | sony* \
-					| att* | 7300* | 3300* | delta* | motorola* | sun[234]* \
-					| unicom* | ibm* | next | hp | isi* | apollo | altos* \
-					| convergent* | ncr* | news | 32* | 3600* | 3100* \
-					| hitachi* | c[123]* | convex* | sun | crds | omron* | dg \
-					| ultra | tti* | harris | dolphin | highlevel | gould \
-					| cbm | ns | masscomp | apple | axis | knuth | cray \
-					| microblaze* | sim | cisco \
-					| oki | wec | wrs | winbond)
+					  3100* \
+					| 32* \
+					| 3300* \
+					| 3600* \
+					| 7300* \
+					| acorn \
+					| altos* \
+					| apollo \
+					| apple \
+					| atari \
+					| att* \
+					| axis \
+					| be \
+					| bull \
+					| cbm \
+					| ccur \
+					| cisco \
+					| commodore \
+					| convergent* \
+					| convex* \
+					| cray \
+					| crds \
+					| dec* \
+					| delta* \
+					| dg \
+					| digital \
+					| dolphin \
+					| encore* \
+					| gould \
+					| harris \
+					| highlevel \
+					| hitachi* \
+					| hp \
+					| ibm* \
+					| intergraph \
+					| isi* \
+					| knuth \
+					| masscomp \
+					| microblaze* \
+					| mips* \
+					| motorola* \
+					| ncr* \
+					| news \
+					| next \
+					| ns \
+					| oki \
+					| omron* \
+					| pc533* \
+					| rebel \
+					| rom68k \
+					| rombug \
+					| semi \
+					| sequent* \
+					| siemens \
+					| sgi* \
+					| siemens \
+					| sim \
+					| sni \
+					| sony* \
+					| stratus \
+					| sun \
+					| sun[234]* \
+					| tektronix \
+					| tti* \
+					| ultra \
+					| unicom* \
+					| wec \
+					| winbond \
+					| wrs)
 						basic_machine=$field1-$field2
 						basic_os=
 						;;
+					zephyr*)
+						basic_machine=$field1-unknown
+						basic_os=$field2
+						;;
 					*)
 						basic_machine=$field1
 						basic_os=$field2
@@ -272,26 +345,6 @@ case $1 in
 				basic_machine=arm-unknown
 				basic_os=cegcc
 				;;
-			convex-c1)
-				basic_machine=c1-convex
-				basic_os=bsd
-				;;
-			convex-c2)
-				basic_machine=c2-convex
-				basic_os=bsd
-				;;
-			convex-c32)
-				basic_machine=c32-convex
-				basic_os=bsd
-				;;
-			convex-c34)
-				basic_machine=c34-convex
-				basic_os=bsd
-				;;
-			convex-c38)
-				basic_machine=c38-convex
-				basic_os=bsd
-				;;
 			cray)
 				basic_machine=j90-cray
 				basic_os=unicos
@@ -714,15 +767,26 @@ case $basic_machine in
 		vendor=dec
 		basic_os=tops20
 		;;
-	delta | 3300 | motorola-3300 | motorola-delta \
-	      | 3300-motorola | delta-motorola)
+	delta | 3300 | delta-motorola | 3300-motorola | motorola-delta | motorola-3300)
 		cpu=m68k
 		vendor=motorola
 		;;
-	dpx2*)
+	# This used to be dpx2*, but that gets the RS6000-based
+	# DPX/20 and the x86-based DPX/2-100 wrong.  See
+	# https://oldskool.silicium.org/stations/bull_dpx20.htm
+	# https://www.feb-patrimoine.com/english/bull_dpx2.htm
+	# https://www.feb-patrimoine.com/english/unix_and_bull.htm
+	dpx2 | dpx2[23]00 | dpx2[23]xx)
 		cpu=m68k
 		vendor=bull
-		basic_os=sysv3
+		;;
+	dpx2100 | dpx21xx)
+		cpu=i386
+		vendor=bull
+		;;
+	dpx20)
+		cpu=rs6000
+		vendor=bull
 		;;
 	encore | umax | mmax)
 		cpu=ns32k
@@ -837,18 +901,6 @@ case $basic_machine in
 	next | m*-next)
 		cpu=m68k
 		vendor=next
-		case $basic_os in
-		    openstep*)
-		        ;;
-		    nextstep*)
-			;;
-		    ns2*)
-		      basic_os=nextstep2
-			;;
-		    *)
-		      basic_os=nextstep3
-			;;
-		esac
 		;;
 	np1)
 		cpu=np1
@@ -937,7 +989,6 @@ case $basic_machine in
 		;;
 
 	*-*)
-		# shellcheck disable=SC2162
 		saved_IFS=$IFS
 		IFS="-" read cpu vendor <<EOF
 $basic_machine
@@ -972,15 +1023,19 @@ unset -v basic_machine
 
 # Decode basic machines in the full and proper CPU-Company form.
 case $cpu-$vendor in
-	# Here we handle the default manufacturer of certain CPU types in canonical form. It is in
-	# some cases the only manufacturer, in others, it is the most popular.
+	# Here we handle the default manufacturer of certain CPU types in canonical form.
+	# It is in some cases the only manufacturer, in others, it is the most popular.
+	c[12]-convex | c[12]-unknown | c3[248]-convex | c3[248]-unknown)
+		vendor=convex
+		basic_os=${basic_os:-bsd}
+		;;
 	craynv-unknown)
 		vendor=cray
 		basic_os=${basic_os:-unicosmp}
 		;;
 	c90-unknown | c90-cray)
 		vendor=cray
-		basic_os=${Basic_os:-unicos}
+		basic_os=${basic_os:-unicos}
 		;;
 	fx80-unknown)
 		vendor=alliant
@@ -1026,11 +1081,29 @@ case $cpu-$vendor in
 		vendor=alt
 		basic_os=${basic_os:-linux-gnueabihf}
 		;;
-	dpx20-unknown | dpx20-bull)
-		cpu=rs6000
-		vendor=bull
+
+	# Normalized CPU+vendor pairs that imply an OS, if not otherwise specified
+	m68k-isi)
+		basic_os=${basic_os:-sysv}
+		;;
+	m68k-sony)
+		basic_os=${basic_os:-newsos}
+		;;
+	m68k-tektronix)
+		basic_os=${basic_os:-bsd}
+		;;
+	m88k-harris)
+		basic_os=${basic_os:-sysv3}
+		;;
+	i386-bull | m68k-bull)
+		basic_os=${basic_os:-sysv3}
+		;;
+	rs6000-bull)
 		basic_os=${basic_os:-bosx}
 		;;
+	mips-sni)
+		basic_os=${basic_os:-sysv4}
+		;;
 
 	# Here we normalize CPU types irrespective of the vendor
 	amd64-*)
@@ -1038,7 +1111,7 @@ case $cpu-$vendor in
 		;;
 	blackfin-*)
 		cpu=bfin
-		basic_os=linux
+		basic_os=${basic_os:-linux}
 		;;
 	c54x-*)
 		cpu=tic54x
@@ -1061,7 +1134,7 @@ case $cpu-$vendor in
 		;;
 	m68knommu-*)
 		cpu=m68k
-		basic_os=linux
+		basic_os=${basic_os:-linux}
 		;;
 	m9s12z-* | m68hcs12z-* | hcs12z-* | s12z-*)
 		cpu=s12z
@@ -1071,7 +1144,7 @@ case $cpu-$vendor in
 		;;
 	parisc-*)
 		cpu=hppa
-		basic_os=linux
+		basic_os=${basic_os:-linux}
 		;;
 	pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*)
 		cpu=i586
@@ -1085,9 +1158,6 @@ case $cpu-$vendor in
 	pentium4-*)
 		cpu=i786
 		;;
-	pc98-*)
-		cpu=i386
-		;;
 	ppc-* | ppcbe-*)
 		cpu=powerpc
 		;;
@@ -1121,9 +1191,6 @@ case $cpu-$vendor in
 	tx39el-*)
 		cpu=mipstx39el
 		;;
-	x64-*)
-		cpu=x86_64
-		;;
 	xscale-* | xscalee[bl]-*)
 		cpu=`echo "$cpu" | sed 's/^xscale/arm/'`
 		;;
@@ -1179,88 +1246,227 @@ case $cpu-$vendor in
 		# Recognize the canonical CPU types that are allowed with any
 		# company name.
 		case $cpu in
-			1750a | 580 \
+			  1750a \
+			| 580 \
+			| [cjt]90 \
 			| a29k \
-			| aarch64 | aarch64_be | aarch64c | arm64ec \
+			| aarch64 \
+			| aarch64_be \
+			| aarch64c \
 			| abacus \
-			| alpha | alphaev[4-8] | alphaev56 | alphaev6[78] \
-			| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] \
-			| alphapca5[67] | alpha64pca5[67] \
+			| alpha \
+			| alpha64 \
+			| alpha64ev56 \
+			| alpha64ev6[78] \
+			| alpha64ev[4-8] \
+			| alpha64pca5[67] \
+			| alphaev56 \
+			| alphaev6[78] \
+			| alphaev[4-8] \
+			| alphapca5[67] \
 			| am33_2.0 \
 			| amdgcn \
-			| arc | arceb | arc32 | arc64 \
-			| arm | arm[lb]e | arme[lb] | armv* \
-			| avr | avr32 \
+			| arc \
+			| arc32 \
+			| arc64 \
+			| arceb \
+			| arm \
+			| arm64e \
+			| arm64ec \
+			| arm[lb]e \
+			| arme[lb] \
+			| armv* \
 			| asmjs \
+			| avr \
+			| avr32 \
 			| ba \
-			| be32 | be64 \
-			| bfin | bpf | bs2000 \
-			| c[123]* | c30 | [cjt]90 | c4x \
-			| c8051 | clipper | craynv | csky | cydra \
-			| d10v | d30v | dlx | dsp16xx \
-			| e2k | elxsi | epiphany \
-			| f30[01] | f700 | fido | fr30 | frv | ft32 | fx80 \
-			| javascript \
-			| h8300 | h8500 \
-			| hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
+			| be32 \
+			| be64 \
+			| bfin \
+			| bpf \
+			| bs2000 \
+			| c30 \
+			| c4x \
+			| c8051 \
+			| c[123]* \
+			| clipper \
+			| craynv \
+			| csky \
+			| cydra \
+			| d10v \
+			| d30v \
+			| dlx \
+			| dsp16xx \
+			| e2k \
+			| elxsi \
+			| epiphany \
+			| f30[01] \
+			| f700 \
+			| fido \
+			| fr30 \
+			| frv \
+			| ft32 \
+			| fx80 \
+			| h8300 \
+			| h8500 \
 			| hexagon \
-			| i370 | i*86 | i860 | i960 | ia16 | ia64 \
-			| ip2k | iq2000 \
+			| hppa \
+			| hppa1.[01] \
+			| hppa2.0 \
+			| hppa2.0[nw] \
+			| hppa64 \
+			| i*86 \
+			| i370 \
+			| i860 \
+			| i960 \
+			| ia16 \
+			| ia64 \
+			| ip2k \
+			| iq2000 \
+			| javascript \
 			| k1om \
 			| kvx \
-			| le32 | le64 \
+			| le32 \
+			| le64 \
 			| lm32 \
-			| loongarch32 | loongarch64 \
-			| m32c | m32r | m32rle \
-			| m5200 | m68000 | m680[012346]0 | m68360 | m683?2 | m68k \
-			| m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x \
-			| m88110 | m88k | maxq | mb | mcore | mep | metag \
-			| microblaze | microblazeel \
+			| loongarch32 \
+			| loongarch64 \
+			| m32c \
+			| m32r \
+			| m32rle \
+			| m5200 \
+			| m68000 \
+			| m680[012346]0 \
+			| m6811 \
+			| m6812 \
+			| m68360 \
+			| m683?2 \
+			| m68hc11 \
+			| m68hc12 \
+			| m68hcs12x \
+			| m68k \
+			| m88110 \
+			| m88k \
+			| maxq \
+			| mb \
+			| mcore \
+			| mep \
+			| metag \
+			| microblaze \
+			| microblazeel \
 			| mips* \
 			| mmix \
-			| mn10200 | mn10300 \
+			| mn10200 \
+			| mn10300 \
 			| moxie \
-			| mt \
 			| msp430 \
-			| nds32 | nds32le | nds32be \
+			| mt \
+			| nanomips* \
+			| nds32 \
+			| nds32be \
+			| nds32le \
 			| nfp \
-			| nios | nios2 | nios2eb | nios2el \
-			| none | np1 | ns16k | ns32k | nvptx \
+			| nios \
+			| nios2 \
+			| nios2eb \
+			| nios2el \
+			| none \
+			| np1 \
+			| ns16k \
+			| ns32k \
+			| nvptx \
 			| open8 \
 			| or1k* \
 			| or32 \
 			| orion \
+			| pdp10 \
+			| pdp11 \
 			| picochip \
-			| pdp10 | pdp11 | pj | pjl | pn | power \
-			| powerpc | powerpc64 | powerpc64le | powerpcle | powerpcspe \
+			| pj \
+			| pjl \
+			| pn \
+			| power \
+			| powerpc \
+			| powerpc64 \
+			| powerpc64le \
+			| powerpcle \
+			| powerpcspe \
 			| pru \
 			| pyramid \
-			| riscv | riscv32 | riscv32be | riscv64 | riscv64be \
-			| rl78 | romp | rs6000 | rx \
-			| s390 | s390x \
+			| riscv \
+			| riscv32 \
+			| riscv32be \
+			| riscv64 \
+			| riscv64be \
+			| rl78 \
+			| romp \
+			| rs6000 \
+			| rx \
+			| s390 \
+			| s390x \
 			| score \
-			| sh | shl \
-			| sh[1234] | sh[24]a | sh[24]ae[lb] | sh[23]e | she[lb] | sh[lb]e \
-			| sh[1234]e[lb] |  sh[12345][lb]e | sh[23]ele | sh64 | sh64le \
-			| sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet \
+			| sh \
+			| sh64 \
+			| sh64le \
+			| sh[12345][lb]e \
+			| sh[1234] \
+			| sh[1234]e[lb] \
+			| sh[23]e \
+			| sh[23]ele \
+			| sh[24]a \
+			| sh[24]ae[lb] \
+			| sh[lb]e \
+			| she[lb] \
+			| shl \
+			| sparc \
+			| sparc64 \
+			| sparc64b \
+			| sparc64v \
+			| sparc86x \
+			| sparclet \
 			| sparclite \
-			| sparcv8 | sparcv9 | sparcv9b | sparcv9v | sv1 | sx* \
+			| sparcv8 \
+			| sparcv9 \
+			| sparcv9b \
+			| sparcv9v \
 			| spu \
+			| sv1 \
+			| sx* \
 			| tahoe \
 			| thumbv7* \
-			| tic30 | tic4x | tic54x | tic55x | tic6x | tic80 \
+			| tic30 \
+			| tic4x \
+			| tic54x \
+			| tic55x \
+			| tic6x \
+			| tic80 \
 			| tron \
 			| ubicom32 \
-			| v70 | v850 | v850e | v850e1 | v850es | v850e2 | v850e2v3 \
+			| v70 \
+			| v810 \
+			| v850 \
+			| v850e \
+			| v850e1 \
+			| v850e2 \
+			| v850e2v3 \
+			| v850es \
 			| vax \
+			| vc4 \
 			| visium \
 			| w65 \
-			| wasm32 | wasm64 \
+			| wasm32 \
+			| wasm64 \
 			| we32k \
-			| x86 | x86_64 | xc16x | xgate | xps100 \
-			| xstormy16 | xtensa* \
+			| x86 \
+			| x86_64 \
+			| xc16x \
+			| xgate \
+			| xps100 \
+			| xstormy16 \
+			| xtensa* \
 			| ymp \
-			| z8k | z80)
+			| z80 \
+			| z8k)
 				;;
 
 			*)
@@ -1305,7 +1511,6 @@ case $basic_os in
 		os=`echo "$basic_os" | sed -e 's|nto-qnx|qnx|'`
 		;;
 	*-*)
-		# shellcheck disable=SC2162
 		saved_IFS=$IFS
 		IFS="-" read kernel os <<EOF
 $basic_os
@@ -1352,6 +1557,23 @@ case $os in
 	unixware*)
 		os=sysv4.2uw
 		;;
+	# The marketing names for NeXT's operating systems were
+	# NeXTSTEP, NeXTSTEP 2, OpenSTEP 3, OpenSTEP 4.  'openstep' is
+	# mapped to 'openstep3', but 'openstep1' and 'openstep2' are
+	# mapped to 'nextstep' and 'nextstep2', consistent with the
+	# treatment of SunOS/Solaris.
+	ns | ns1 | nextstep | nextstep1 | openstep1)
+		os=nextstep
+		;;
+	ns2 | nextstep2 | openstep2)
+		os=nextstep2
+		;;
+	ns3 | nextstep3 | openstep | openstep3)
+		os=openstep3
+		;;
+	ns4 | nextstep4 | openstep4)
+		os=openstep4
+		;;
 	# es1800 is here to avoid being matched by es* (a different OS)
 	es1800*)
 		os=ose
@@ -1422,6 +1644,7 @@ case $os in
 		;;
 	utek*)
 		os=bsd
+		vendor=`echo "$vendor" | sed -e 's|^unknown$|tektronix|'`
 		;;
 	dynix*)
 		os=bsd
@@ -1438,21 +1661,25 @@ case $os in
 	386bsd)
 		os=bsd
 		;;
-	ctix* | uts*)
+	ctix*)
 		os=sysv
+		vendor=`echo "$vendor" | sed -e 's|^unknown$|convergent|'`
 		;;
-	nova*)
-		os=rtmk-nova
+	uts*)
+		os=sysv
 		;;
-	ns2)
-		os=nextstep2
+	nova*)
+		kernel=rtmk
+		os=nova
 		;;
 	# Preserve the version number of sinix5.
 	sinix5.*)
 		os=`echo "$os" | sed -e 's|sinix|sysv|'`
+		vendor=`echo "$vendor" | sed -e 's|^unknown$|sni|'`
 		;;
 	sinix*)
 		os=sysv4
+		vendor=`echo "$vendor" | sed -e 's|^unknown$|sni|'`
 		;;
 	tpf*)
 		os=tpf
@@ -1593,11 +1820,19 @@ case $cpu-$vendor in
 		os=
 		obj=elf
 		;;
+	# The -sgi and -siemens entries must be before the mips- entry
+	# or we get the wrong os.
+	*-sgi)
+		os=irix
+		;;
+	*-siemens)
+		os=sysv4
+		;;
 	mips*-cisco)
 		os=
 		obj=elf
 		;;
-	mips*-*)
+	mips*-*|nanomips*-*)
 		os=
 		obj=elf
 		;;
@@ -1605,7 +1840,8 @@ case $cpu-$vendor in
 		os=
 		obj=coff
 		;;
-	*-tti)	# must be before sparc entry or we get the wrong os.
+	# This must be before the sparc-* entry or we get the wrong os.
+	*-tti)
 		os=sysv3
 		;;
 	sparc-* | *-sun)
@@ -1637,7 +1873,7 @@ case $cpu-$vendor in
 		os=hpux
 		;;
 	*-hitachi)
-		os=hiux
+		os=hiuxwe2
 		;;
 	i860-* | *-att | *-ncr | *-altos | *-motorola | *-convergent)
 		os=sysv
@@ -1681,12 +1917,6 @@ case $cpu-$vendor in
 	*-encore)
 		os=bsd
 		;;
-	*-sgi)
-		os=irix
-		;;
-	*-siemens)
-		os=sysv4
-		;;
 	*-masscomp)
 		os=rtu
 		;;
@@ -1721,7 +1951,7 @@ fi
 
 case $os in
 	# Sometimes we do "kernel-libc", so those need to count as OSes.
-	musl* | newlib* | relibc* | uclibc*)
+	llvm* | musl* | newlib* | relibc* | uclibc*)
 		;;
 	# Likewise for "kernel-abi"
 	eabi* | gnueabi*)
@@ -1733,45 +1963,205 @@ case $os in
 	ghcjs)
 		;;
 	# Now accept the basic system types.
-	# The portable systems comes first.
 	# Each alternative MUST end in a * to match a version number.
-	gnu* | android* | bsd* | mach* | minix* | genix* | ultrix* | irix* \
-	     | *vms* | esix* | aix* | cnk* | sunos | sunos[34]* \
-	     | hpux* | unos* | osf* | luna* | dgux* | auroraux* | solaris* \
-	     | sym* |  plan9* | psp* | sim* | xray* | os68k* | v88r* \
-	     | hiux* | abug | nacl* | netware* | windows* \
-	     | os9* | macos* | osx* | ios* | tvos* | watchos* \
-	     | mpw* | magic* | mmixware* | mon960* | lnews* \
-	     | amigaos* | amigados* | msdos* | newsos* | unicos* | aof* \
-	     | aos* | aros* | cloudabi* | sortix* | twizzler* \
-	     | nindy* | vxsim* | vxworks* | ebmon* | hms* | mvs* \
-	     | clix* | riscos* | uniplus* | iris* | isc* | rtu* | xenix* \
-	     | mirbsd* | netbsd* | dicos* | openedition* | ose* \
-	     | bitrig* | openbsd* | secbsd* | solidbsd* | libertybsd* | os108* \
-	     | ekkobsd* | freebsd* | riscix* | lynxos* | os400* \
-	     | bosx* | nextstep* | cxux* | oabi* \
-	     | ptx* | ecoff* | winnt* | domain* | vsta* \
-	     | udi* | lites* | ieee* | go32* | aux* | hcos* \
-	     | chorusrdb* | cegcc* | glidix* | serenity* \
-	     | cygwin* | msys* | moss* | proelf* | rtems* \
-	     | midipix* | mingw32* | mingw64* | mint* \
-	     | uxpv* | beos* | mpeix* | udk* | moxiebox* \
-	     | interix* | uwin* | mks* | rhapsody* | darwin* \
-	     | openstep* | oskit* | conix* | pw32* | nonstopux* \
-	     | storm-chaos* | tops10* | tenex* | tops20* | its* \
-	     | os2* | vos* | palmos* | uclinux* | nucleus* | morphos* \
-	     | scout* | superux* | sysv* | rtmk* | tpf* | windiss* \
-	     | powermax* | dnix* | nx6 | nx7 | sei* | dragonfly* \
-	     | skyos* | haiku* | rdos* | toppers* | drops* | es* \
-	     | onefs* | tirtos* | phoenix* | fuchsia* | redox* | bme* \
-	     | midnightbsd* | amdhsa* | unleashed* | emscripten* | wasi* \
-	     | nsk* | powerunix* | genode* | zvmoe* | qnx* | emx* | zephyr* \
-	     | fiwix* | mlibc* | cos* | mbr* )
+	  abug \
+	| aix* \
+	| amdhsa* \
+	| amigados* \
+	| amigaos* \
+	| android* \
+	| aof* \
+	| aos* \
+	| aros* \
+	| atheos* \
+	| auroraux* \
+	| aux* \
+	| beos* \
+	| bitrig* \
+	| bme* \
+	| bosx* \
+	| bsd* \
+	| cegcc* \
+	| chorusos* \
+	| chorusrdb* \
+	| clix* \
+	| cloudabi* \
+	| cnk* \
+	| conix* \
+	| cos* \
+	| cxux* \
+	| cygwin* \
+	| darwin* \
+	| dgux* \
+	| dicos* \
+	| dnix* \
+	| domain* \
+	| dragonfly* \
+	| drops* \
+	| ebmon* \
+	| ecoff* \
+	| ekkobsd* \
+	| emscripten* \
+	| emx* \
+	| es* \
+	| fiwix* \
+	| freebsd* \
+	| fuchsia* \
+	| genix* \
+	| genode* \
+	| glidix* \
+	| gnu* \
+	| go32* \
+	| haiku* \
+	| hcos* \
+	| hiux* \
+	| hms* \
+	| hpux* \
+	| ieee* \
+	| interix* \
+	| ios* \
+	| iris* \
+	| irix* \
+	| ironclad* \
+	| isc* \
+	| its* \
+	| l4re* \
+	| libertybsd* \
+	| lites* \
+	| lnews* \
+	| luna* \
+	| lynxos* \
+	| mach* \
+	| macos* \
+	| magic* \
+	| mbr* \
+	| midipix* \
+	| midnightbsd* \
+	| mingw32* \
+	| mingw64* \
+	| minix* \
+	| mint* \
+	| mirbsd* \
+	| mks* \
+	| mlibc* \
+	| mmixware* \
+	| mon960* \
+	| morphos* \
+	| moss* \
+	| moxiebox* \
+	| mpeix* \
+	| mpw* \
+	| msdos* \
+	| msys* \
+	| mvs* \
+	| nacl* \
+	| netbsd* \
+	| netware* \
+	| newsos* \
+	| nextstep* \
+	| nindy* \
+	| nonstopux* \
+	| nova* \
+	| nsk* \
+	| nucleus* \
+	| nx6 \
+	| nx7 \
+	| oabi* \
+	| ohos* \
+	| onefs* \
+	| openbsd* \
+	| openedition* \
+	| openstep* \
+	| os108* \
+	| os2* \
+	| os400* \
+	| os68k* \
+	| os9* \
+	| ose* \
+	| osf* \
+	| oskit* \
+	| osx* \
+	| palmos* \
+	| phoenix* \
+	| plan9* \
+	| powermax* \
+	| powerunix* \
+	| proelf* \
+	| psos* \
+	| psp* \
+	| ptx* \
+	| pw32* \
+	| qnx* \
+	| rdos* \
+	| redox* \
+	| rhapsody* \
+	| riscix* \
+	| riscos* \
+	| rtems* \
+	| rtmk* \
+	| rtu* \
+	| scout* \
+	| secbsd* \
+	| sei* \
+	| serenity* \
+	| sim* \
+	| skyos* \
+	| solaris* \
+	| solidbsd* \
+	| sortix* \
+	| storm-chaos* \
+	| sunos \
+	| sunos[34]* \
+	| superux* \
+	| syllable* \
+	| sym* \
+	| sysv* \
+	| tenex* \
+	| tirtos* \
+	| toppers* \
+	| tops10* \
+	| tops20* \
+	| tpf* \
+	| tvos* \
+	| twizzler* \
+	| uclinux* \
+	| udi* \
+	| udk* \
+	| ultrix* \
+	| unicos* \
+	| uniplus* \
+	| unleashed* \
+	| unos* \
+	| uwin* \
+	| uxpv* \
+	| v88r* \
+	|*vms* \
+	| vos* \
+	| vsta* \
+	| vxsim* \
+	| vxworks* \
+	| wasi* \
+	| watchos* \
+	| wince* \
+	| windiss* \
+	| windows* \
+	| winnt* \
+	| xenix* \
+	| xray* \
+	| zephyr* \
+	| zvmoe* )
 		;;
 	# This one is extra strict with allowed versions
 	sco3.2v2 | sco3.2v[4-9]* | sco5v6*)
 		# Don't forget version if it is 3.2v4 or newer.
 		;;
+	# This refers to builds using the UEFI calling convention
+	# (which depends on the architecture) and PE file format.
+	# Note that this is both a different calling convention and
+	# different file format than that of GNU-EFI
+	# (x86_64-w64-mingw32).
+	uefi)
+		;;
 	none)
 		;;
 	kernel* | msvc* )
@@ -1818,16 +2208,18 @@ esac
 # As a final step for OS-related things, validate the OS-kernel combination
 # (given a valid OS), if there is a kernel.
 case $kernel-$os-$obj in
-	linux-gnu*- | linux-dietlibc*- | linux-android*- | linux-newlib*- \
-		   | linux-musl*- | linux-relibc*- | linux-uclibc*- | linux-mlibc*- )
+	linux-gnu*- | linux-android*- | linux-dietlibc*- | linux-llvm*- \
+		    | linux-mlibc*- | linux-musl*- | linux-newlib*- \
+		    | linux-relibc*- | linux-uclibc*- | linux-ohos*- )
 		;;
-	uclinux-uclibc*- )
+	uclinux-uclibc*- | uclinux-gnu*- )
 		;;
 	managarm-mlibc*- | managarm-kernel*- )
 		;;
 	windows*-msvc*-)
 		;;
-	-dietlibc*- | -newlib*- | -musl*- | -relibc*- | -uclibc*- | -mlibc*- )
+	-dietlibc*- | -llvm*- | -mlibc*- | -musl*- | -newlib*- | -relibc*- \
+		    | -uclibc*- )
 		# These are just libc implementations, not actual OSes, and thus
 		# require a kernel.
 		echo "Invalid configuration '$1': libc '$os' needs explicit kernel." 1>&2
@@ -1845,7 +2237,7 @@ case $kernel-$os-$obj in
 		echo "Invalid configuration '$1': '$os' needs 'windows'." 1>&2
 		exit 1
 		;;
-	kfreebsd*-gnu*- | kopensolaris*-gnu*-)
+	kfreebsd*-gnu*- | knetbsd*-gnu*- | netbsd*-gnu*- | kopensolaris*-gnu*-)
 		;;
 	vxworks-simlinux- | vxworks-simwindows- | vxworks-spe-)
 		;;
@@ -1853,6 +2245,8 @@ case $kernel-$os-$obj in
 		;;
 	os2-emx-)
 		;;
+	rtmk-nova-)
+		;;
 	*-eabi*- | *-gnueabi*-)
 		;;
 	none--*)
@@ -1879,7 +2273,7 @@ case $vendor in
 			*-riscix*)
 				vendor=acorn
 				;;
-			*-sunos*)
+			*-sunos* | *-solaris*)
 				vendor=sun
 				;;
 			*-cnk* | *-aix*)

From 8d90c3c3364f931c5d9e9228681ccbb3a651db5e Mon Sep 17 00:00:00 2001
From: Kittywhiskers Van Gogh <63189531+kwvg@users.noreply.github.com>
Date: Tue, 20 May 2025 10:45:06 +0100
Subject: [PATCH 503/656] merge bitcoin#32568: use "mkdir -p" when installing
 xproto

---
 depends/packages/xproto.mk | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/depends/packages/xproto.mk b/depends/packages/xproto.mk
index 29c349a21b5b..0a534556ee4a 100644
--- a/depends/packages/xproto.mk
+++ b/depends/packages/xproto.mk
@@ -21,6 +21,8 @@ define $(package)_build_cmds
   $(MAKE)
 endef
 
+# mkdir detection is broken on Alpine. Set MKDIRPROG to ensure we always
+# use "mkdir -p", and avoid parallelism issues during install.
 define $(package)_stage_cmds
-  $(MAKE) DESTDIR=$($(package)_staging_dir) install
+  $(MAKE) MKDIRPROG="mkdir -p" DESTDIR=$($(package)_staging_dir) install
 endef

From 44d32a3cd8b76acfa002ee35fae12b968c6fb4c7 Mon Sep 17 00:00:00 2001
From: Kittywhiskers Van Gogh <63189531+kwvg@users.noreply.github.com>
Date: Fri, 6 Jun 2025 01:27:48 +0200
Subject: [PATCH 504/656] merge bitcoin#32690: fix multiprocess build on
 OpenBSD (apply capnp patch, correct SHA256SUM command)

---
 depends/builders/openbsd.mk                   |  2 +-
 depends/packages/capnp.mk                     |  4 +-
 depends/packages/native_capnp.mk              |  5 ++
 depends/patches/capnp/fix_openbsd_build.patch | 71 +++++++++++++++++++
 .../native_capnp/fix_openbsd_build.patch      | 71 +++++++++++++++++++
 5 files changed, 151 insertions(+), 2 deletions(-)
 create mode 100644 depends/patches/capnp/fix_openbsd_build.patch
 create mode 100644 depends/patches/native_capnp/fix_openbsd_build.patch

diff --git a/depends/builders/openbsd.mk b/depends/builders/openbsd.mk
index 9c94c4baae7a..4b3214ae810f 100644
--- a/depends/builders/openbsd.mk
+++ b/depends/builders/openbsd.mk
@@ -1,7 +1,7 @@
 build_openbsd_CC = clang
 build_openbsd_CXX = clang++
 
-build_openbsd_SHA256SUM = sha256
+build_openbsd_SHA256SUM = sha256 -r
 build_openbsd_DOWNLOAD = curl --location --fail --connect-timeout $(DOWNLOAD_CONNECT_TIMEOUT) --retry $(DOWNLOAD_RETRIES) -o
 
 build_openbsd_TAR = gtar
diff --git a/depends/packages/capnp.mk b/depends/packages/capnp.mk
index dff92d9e61fe..0964ede3d31b 100644
--- a/depends/packages/capnp.mk
+++ b/depends/packages/capnp.mk
@@ -5,6 +5,7 @@ $(package)_download_file=$(native_$(package)_download_file)
 $(package)_file_name=$(native_$(package)_file_name)
 $(package)_sha256_hash=$(native_$(package)_sha256_hash)
 $(package)_patches=abi_placement_new.patch
+$(package)_patches += fix_openbsd_build.patch
 
 define $(package)_set_vars :=
   $(package)_config_opts := -DBUILD_TESTING=OFF
@@ -14,7 +15,8 @@ define $(package)_set_vars :=
 endef
 
 define $(package)_preprocess_cmds
-  patch -p2 < $($(package)_patch_dir)/abi_placement_new.patch
+  patch -p2 < $($(package)_patch_dir)/abi_placement_new.patch && \
+  patch -p2 < $($(package)_patch_dir)/fix_openbsd_build.patch
 endef
 
 define $(package)_config_cmds
diff --git a/depends/packages/native_capnp.mk b/depends/packages/native_capnp.mk
index e67b103716f4..c886d8e239df 100644
--- a/depends/packages/native_capnp.mk
+++ b/depends/packages/native_capnp.mk
@@ -4,6 +4,7 @@ $(package)_download_path=https://capnproto.org/
 $(package)_download_file=capnproto-c++-$($(package)_version).tar.gz
 $(package)_file_name=capnproto-cxx-$($(package)_version).tar.gz
 $(package)_sha256_hash=07167580e563f5e821e3b2af1c238c16ec7181612650c5901330fa9a0da50939
+$(package)_patches=fix_openbsd_build.patch
 
 define $(package)_set_vars
   $(package)_config_opts := -DBUILD_TESTING=OFF
@@ -11,6 +12,10 @@ define $(package)_set_vars
   $(package)_config_opts += -DWITH_ZLIB=OFF
 endef
 
+define $(package)_preprocess_cmds
+  patch -p2 < $($(package)_patch_dir)/fix_openbsd_build.patch
+endef
+
 define $(package)_config_cmds
   $($(package)_cmake) .
 endef
diff --git a/depends/patches/capnp/fix_openbsd_build.patch b/depends/patches/capnp/fix_openbsd_build.patch
new file mode 100644
index 000000000000..eb143c61e4dc
--- /dev/null
+++ b/depends/patches/capnp/fix_openbsd_build.patch
@@ -0,0 +1,71 @@
+From 0cd1792332dce6a3afae6e2bc2939da69fea65fa Mon Sep 17 00:00:00 2001
+From: Sebastian Falbesoner <sebastian.falbesoner@gmail.com>
+Date: Sat, 31 May 2025 00:49:44 +0200
+Subject: [PATCH 1/2] In cidr.c++, include <netinet/in.h> on all non-Windows
+ systems
+
+The motivation for this commit is to fix the build for OpenBSD,
+but it may also solves the same potential problem for other systems
+without causing any harm.
+
+Suggested already twice, see
+https://github.com/capnproto/capnproto/pull/1846#discussion_r1399499535
+https://github.com/capnproto/capnproto/pull/1907#discussion_r1452602424
+---
+ c++/src/kj/cidr.c++ | 3 ---
+ 1 file changed, 3 deletions(-)
+
+diff --git a/c++/src/kj/cidr.c++ b/c++/src/kj/cidr.c++
+index 6a1fa32e..9432b8f4 100644
+--- a/c++/src/kj/cidr.c++
++++ b/c++/src/kj/cidr.c++
+@@ -39,9 +39,6 @@
+ #else
+ #include <sys/socket.h>
+ #include <arpa/inet.h>
+-#endif
+-
+-#if __FreeBSD__
+ #include <netinet/in.h>
+ #endif
+ 
+-- 
+2.49.0
+
+
+From 2e76d17db3fc484061487c0779b16495939d30c3 Mon Sep 17 00:00:00 2001
+From: Sebastian Falbesoner <sebastian.falbesoner@gmail.com>
+Date: Sat, 31 May 2025 01:06:42 +0200
+Subject: [PATCH 2/2] Don't set KJ_USE_KQUEUE on OpenBSD
+
+OpenBSD doesn't support user event filters yet, hence
+the build fails as it misses the symbol EVFILT_USER in
+the kqueue implementation in async-unix.c++. Fix that
+by not setting KJ_USE_KQUEUE on OpenBSD, so the poll()-
+based implementation is used instead.
+
+Suggested in
+https://github.com/capnproto/capnproto/pull/1907/commits/829d3f03735f8f6762a50fc346db56bf02140f02#r1452600300
+---
+ c++/src/kj/async-unix.h | 5 +++--
+ 1 file changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/c++/src/kj/async-unix.h b/c++/src/kj/async-unix.h
+index 665305ea..e66ad8e4 100644
+--- a/c++/src/kj/async-unix.h
++++ b/c++/src/kj/async-unix.h
+@@ -37,8 +37,9 @@ KJ_BEGIN_HEADER
+ #if __linux__
+ // Default to epoll on Linux.
+ #define KJ_USE_EPOLL 1
+-#elif __APPLE__ || __FreeBSD__ || __OpenBSD__ || __NetBSD__ || __DragonFly__
+-// MacOS and BSDs prefer kqueue() for event notification.
++#elif __APPLE__ || __FreeBSD__ || __NetBSD__ || __DragonFly__
++// MacOS and most BSDs prefer kqueue() for event notification.
++// (Note that OpenBSD's kqueue(2) doesn't support user event filters yet)
+ #define KJ_USE_KQUEUE 1
+ #endif
+ #endif
+-- 
+2.49.0
+
diff --git a/depends/patches/native_capnp/fix_openbsd_build.patch b/depends/patches/native_capnp/fix_openbsd_build.patch
new file mode 100644
index 000000000000..eb143c61e4dc
--- /dev/null
+++ b/depends/patches/native_capnp/fix_openbsd_build.patch
@@ -0,0 +1,71 @@
+From 0cd1792332dce6a3afae6e2bc2939da69fea65fa Mon Sep 17 00:00:00 2001
+From: Sebastian Falbesoner <sebastian.falbesoner@gmail.com>
+Date: Sat, 31 May 2025 00:49:44 +0200
+Subject: [PATCH 1/2] In cidr.c++, include <netinet/in.h> on all non-Windows
+ systems
+
+The motivation for this commit is to fix the build for OpenBSD,
+but it may also solves the same potential problem for other systems
+without causing any harm.
+
+Suggested already twice, see
+https://github.com/capnproto/capnproto/pull/1846#discussion_r1399499535
+https://github.com/capnproto/capnproto/pull/1907#discussion_r1452602424
+---
+ c++/src/kj/cidr.c++ | 3 ---
+ 1 file changed, 3 deletions(-)
+
+diff --git a/c++/src/kj/cidr.c++ b/c++/src/kj/cidr.c++
+index 6a1fa32e..9432b8f4 100644
+--- a/c++/src/kj/cidr.c++
++++ b/c++/src/kj/cidr.c++
+@@ -39,9 +39,6 @@
+ #else
+ #include <sys/socket.h>
+ #include <arpa/inet.h>
+-#endif
+-
+-#if __FreeBSD__
+ #include <netinet/in.h>
+ #endif
+ 
+-- 
+2.49.0
+
+
+From 2e76d17db3fc484061487c0779b16495939d30c3 Mon Sep 17 00:00:00 2001
+From: Sebastian Falbesoner <sebastian.falbesoner@gmail.com>
+Date: Sat, 31 May 2025 01:06:42 +0200
+Subject: [PATCH 2/2] Don't set KJ_USE_KQUEUE on OpenBSD
+
+OpenBSD doesn't support user event filters yet, hence
+the build fails as it misses the symbol EVFILT_USER in
+the kqueue implementation in async-unix.c++. Fix that
+by not setting KJ_USE_KQUEUE on OpenBSD, so the poll()-
+based implementation is used instead.
+
+Suggested in
+https://github.com/capnproto/capnproto/pull/1907/commits/829d3f03735f8f6762a50fc346db56bf02140f02#r1452600300
+---
+ c++/src/kj/async-unix.h | 5 +++--
+ 1 file changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/c++/src/kj/async-unix.h b/c++/src/kj/async-unix.h
+index 665305ea..e66ad8e4 100644
+--- a/c++/src/kj/async-unix.h
++++ b/c++/src/kj/async-unix.h
+@@ -37,8 +37,9 @@ KJ_BEGIN_HEADER
+ #if __linux__
+ // Default to epoll on Linux.
+ #define KJ_USE_EPOLL 1
+-#elif __APPLE__ || __FreeBSD__ || __OpenBSD__ || __NetBSD__ || __DragonFly__
+-// MacOS and BSDs prefer kqueue() for event notification.
++#elif __APPLE__ || __FreeBSD__ || __NetBSD__ || __DragonFly__
++// MacOS and most BSDs prefer kqueue() for event notification.
++// (Note that OpenBSD's kqueue(2) doesn't support user event filters yet)
+ #define KJ_USE_KQUEUE 1
+ #endif
+ #endif
+-- 
+2.49.0
+

From ee9e9348433e9e2e42f4a2561c54dc55ec25878b Mon Sep 17 00:00:00 2001
From: Kittywhiskers Van Gogh <63189531+kwvg@users.noreply.github.com>
Date: Fri, 14 Nov 2025 15:32:41 +0530
Subject: [PATCH 505/656] build: check against `$host` instead of `TARGET_OS`
 in stacktrace search

Should prevent conflict in next commit
---
 configure.ac | 27 +++++++++++++--------------
 1 file changed, 13 insertions(+), 14 deletions(-)

diff --git a/configure.ac b/configure.ac
index 38fac3bbfbea..8cb1a5e9daf3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -952,9 +952,6 @@ case $host in
    *linux*)
      TARGET_OS=linux
      ;;
-   *bsd*)
-     TARGET_OS=bsd
-     ;;
 esac
 
 if test "$use_extended_functional_tests" != "no"; then
@@ -1240,17 +1237,19 @@ if test "$enable_stacktraces" != "no"; then
       BACKTRACE_LIBS="$BACKTRACE_LIBS -ldbghelp"
     else
       AC_CHECK_HEADERS([execinfo.h], [
-        if test "$TARGET_OS" = "bsd"; then
-          AC_SEARCH_LIBS([backtrace], [execinfo], [
-            BACKTRACE_LIBS="$BACKTRACE_LIBS -lexecinfo"
-          ], [
-            if test "$enable_stacktraces" = "yes"; then
-              AC_MSG_ERROR([--enable-stacktraces was specified but cannot locate libexecinfo])
-            fi
-            AC_MSG_WARN([cannot locate libexecinfo, stacktraces will be disabled])
-            enable_stacktraces=no
-          ])
-        fi
+        case $host in
+          *bsd*)
+            AC_SEARCH_LIBS([backtrace], [execinfo], [
+              BACKTRACE_LIBS="$BACKTRACE_LIBS -lexecinfo"
+            ], [
+              if test "$enable_stacktraces" = "yes"; then
+                AC_MSG_ERROR([--enable-stacktraces was specified but cannot locate libexecinfo])
+              fi
+              AC_MSG_WARN([cannot locate libexecinfo, stacktraces will be disabled])
+              enable_stacktraces=no
+            ])
+            ;;
+        esac
         AX_CHECK_LINK_FLAG([-Wl,-export-dynamic], [BACKTRACE_LDFLAGS="$BACKTRACE_LDFLAGS -Wl,-export-dynamic"], [
           AX_CHECK_LINK_FLAG([-rdynamic], [BACKTRACE_LDFLAGS="$BACKTRACE_LDFLAGS -rdynamic"], [
             if test "$enable_stacktraces" = "yes"; then

From ca52975e58741c26ab9378c7c4812d927eb9cf42 Mon Sep 17 00:00:00 2001
From: Kittywhiskers Van Gogh <63189531+kwvg@users.noreply.github.com>
Date: Sat, 25 Oct 2025 13:46:12 +0530
Subject: [PATCH 506/656] merge bitcoin#32731: Build `qt` package for FreeBSD
 hosts

---
 build-aux/m4/bitcoin_qt.m4   | 2 +-
 configure.ac                 | 3 +++
 depends/README.md            | 4 ++++
 depends/packages/packages.mk | 1 +
 depends/packages/qt.mk       | 4 +++-
 5 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/build-aux/m4/bitcoin_qt.m4 b/build-aux/m4/bitcoin_qt.m4
index b646a3e2a9d3..7a970cf911e5 100644
--- a/build-aux/m4/bitcoin_qt.m4
+++ b/build-aux/m4/bitcoin_qt.m4
@@ -148,7 +148,7 @@ AC_DEFUN([BITCOIN_QT_CONFIGURE],[
       _BITCOIN_QT_CHECK_STATIC_PLUGIN([QWindowsIntegrationPlugin], [-lqwindows])
       _BITCOIN_QT_CHECK_STATIC_PLUGIN([QWindowsVistaStylePlugin], [-lqwindowsvistastyle])
       AC_DEFINE([QT_QPA_PLATFORM_WINDOWS], [1], [Define this symbol if the qt platform is windows])
-    elif test "$TARGET_OS" = "linux"; then
+    elif test "$TARGET_OS" = "linux" -o "$TARGET_OS" = "freebsd"; then
       _BITCOIN_QT_CHECK_STATIC_PLUGIN([QXcbIntegrationPlugin], [-lqxcb])
       AC_DEFINE([QT_QPA_PLATFORM_XCB], [1], [Define this symbol if the qt platform is xcb])
     elif test "$TARGET_OS" = "darwin"; then
diff --git a/configure.ac b/configure.ac
index 8cb1a5e9daf3..862d16f09735 100644
--- a/configure.ac
+++ b/configure.ac
@@ -952,6 +952,9 @@ case $host in
    *linux*)
      TARGET_OS=linux
      ;;
+   *freebsd*)
+     TARGET_OS=freebsd
+     ;;
 esac
 
 if test "$use_extended_functional_tests" != "no"; then
diff --git a/depends/README.md b/depends/README.md
index 62ae6312623b..3e44a66b7621 100644
--- a/depends/README.md
+++ b/depends/README.md
@@ -29,6 +29,10 @@ To build dependencies for the current arch+OS:
 
     pkg install bash
 
+Skip the following packages if you don't intend to use the GUI and will build with [`NO_QT=1`](#dependency-options):
+
+    pkg install bison ninja pkgconf python3
+
 To build dependencies for the current arch+OS:
 
     gmake
diff --git a/depends/packages/packages.mk b/depends/packages/packages.mk
index 40f9ae6ad577..7e0bb2633219 100644
--- a/depends/packages/packages.mk
+++ b/depends/packages/packages.mk
@@ -10,6 +10,7 @@ qrencode_darwin_packages = qrencode
 qrencode_mingw32_packages = qrencode
 
 qt_linux_packages:=qt expat libxcb xcb_proto libXau xproto freetype fontconfig libxkbcommon libxcb_util libxcb_util_render libxcb_util_keysyms libxcb_util_image libxcb_util_wm
+qt_freebsd_packages:=$(qt_linux_packages)
 qt_android_packages=qt
 qt_darwin_packages=qt
 qt_mingw32_packages=qt
diff --git a/depends/packages/qt.mk b/depends/packages/qt.mk
index 6c8eb44984f2..18aedcf7afcf 100644
--- a/depends/packages/qt.mk
+++ b/depends/packages/qt.mk
@@ -4,7 +4,8 @@ $(package)_download_path=https://download.qt.io/archive/qt/5.15/$($(package)_ver
 $(package)_suffix=everywhere-opensource-src-$($(package)_version).tar.xz
 $(package)_file_name=qtbase-$($(package)_suffix)
 $(package)_sha256_hash=7b632550ea1048fc10c741e46e2e3b093e5ca94dfa6209e9e0848800e247023b
-$(package)_linux_dependencies=freetype fontconfig libxcb libxkbcommon libxcb_util libxcb_util_render libxcb_util_keysyms libxcb_util_image libxcb_util_wm
+$(package)_linux_dependencies := freetype fontconfig libxcb libxkbcommon libxcb_util libxcb_util_render libxcb_util_keysyms libxcb_util_image libxcb_util_wm
+$(package)_freebsd_dependencies := $($(package)_linux_dependencies)
 $(package)_qt_libs=corelib network widgets gui plugins testlib
 $(package)_linguist_tools = lrelease lupdate lconvert
 $(package)_patches = qt.pro
@@ -161,6 +162,7 @@ $(package)_config_opts_linux += -dbus-runtime
 ifneq ($(LTO),)
 $(package)_config_opts_linux += -ltcg
 endif
+$(package)_config_opts_freebsd := $$($(package)_config_opts_linux)
 
 ifneq (,$(findstring clang,$($(package)_cxx)))
   ifneq (,$(findstring -stdlib=libc++,$($(package)_cxx)))

From 61f2a2344a85ac838a3b59188a34fc4a65256224 Mon Sep 17 00:00:00 2001
From: Kittywhiskers Van Gogh <63189531+kwvg@users.noreply.github.com>
Date: Tue, 10 Jun 2025 14:59:46 +0100
Subject: [PATCH 507/656] merge bitcoin#32716: Override host compilers for
 FreeBSD and OpenBSD

---
 depends/builders/freebsd.mk | 4 ++++
 depends/builders/openbsd.mk | 4 ++++
 2 files changed, 8 insertions(+)

diff --git a/depends/builders/freebsd.mk b/depends/builders/freebsd.mk
index 18316f492ee9..910de28bf36f 100644
--- a/depends/builders/freebsd.mk
+++ b/depends/builders/freebsd.mk
@@ -3,3 +3,7 @@ build_freebsd_CXX=clang++
 
 build_freebsd_SHA256SUM = sha256sum
 build_freebsd_DOWNLOAD = curl --location --fail --connect-timeout $(DOWNLOAD_CONNECT_TIMEOUT) --retry $(DOWNLOAD_RETRIES) -o
+
+# freebsd host on freebsd builder: override freebsd host preferences.
+freebsd_CC = clang
+freebsd_CXX = clang++
diff --git a/depends/builders/openbsd.mk b/depends/builders/openbsd.mk
index 4b3214ae810f..6aeb14312587 100644
--- a/depends/builders/openbsd.mk
+++ b/depends/builders/openbsd.mk
@@ -7,3 +7,7 @@ build_openbsd_DOWNLOAD = curl --location --fail --connect-timeout $(DOWNLOAD_CON
 build_openbsd_TAR = gtar
 # openBSD touch doesn't understand -h
 build_openbsd_TOUCH = touch -m -t 200001011200
+
+# openbsd host on openbsd builder: override openbsd host preferences.
+openbsd_CC = clang
+openbsd_CXX = clang++

From 6e66ef8a691633a28b16d4241debe9847c17077f Mon Sep 17 00:00:00 2001
From: Kittywhiskers Van Gogh <63189531+kwvg@users.noreply.github.com>
Date: Mon, 30 Jun 2025 17:41:22 +0100
Subject: [PATCH 508/656] merge bitcoin#32837: fix libevent `_WIN32_WINNT`
 usage

---
 depends/packages/libevent.mk                |   4 +-
 depends/patches/libevent/winver_fixup.patch | 122 ++++++++++++++++++++
 2 files changed, 125 insertions(+), 1 deletion(-)
 create mode 100644 depends/patches/libevent/winver_fixup.patch

diff --git a/depends/packages/libevent.mk b/depends/packages/libevent.mk
index 4356c72129cc..0bb88f6dc282 100644
--- a/depends/packages/libevent.mk
+++ b/depends/packages/libevent.mk
@@ -6,6 +6,7 @@ $(package)_sha256_hash=92e6de1be9ec176428fd2367677e61ceffc2ee1cb119035037a27d346
 $(package)_patches=cmake_fixups.patch
 $(package)_patches += fix_mingw_link.patch
 $(package)_patches += netbsd_fixup.patch
+$(package)_patches += winver_fixup.patch
 $(package)_build_subdir=build
 
 # When building for Windows, we set _WIN32_WINNT to target the same Windows
@@ -27,7 +28,8 @@ endef
 define $(package)_preprocess_cmds
   patch -p1 < $($(package)_patch_dir)/cmake_fixups.patch && \
   patch -p1 < $($(package)_patch_dir)/fix_mingw_link.patch && \
-  patch -p1 < $($(package)_patch_dir)/netbsd_fixup.patch
+  patch -p1 < $($(package)_patch_dir)/netbsd_fixup.patch && \
+  patch -p1 < $($(package)_patch_dir)/winver_fixup.patch
 endef
 
 define $(package)_config_cmds
diff --git a/depends/patches/libevent/winver_fixup.patch b/depends/patches/libevent/winver_fixup.patch
new file mode 100644
index 000000000000..4995c356f942
--- /dev/null
+++ b/depends/patches/libevent/winver_fixup.patch
@@ -0,0 +1,122 @@
+Cherry-picked from a14ff91254f40cf36e0fee199e26fb11260fab49.
+
+move _WIN32_WINNT defintions before first #include
+
+_WIN32_WINNT and WIN32_LEAN_AND_MEAN need to be defined
+before the windows.h is included for the first time.
+Avoid the confusion of indirect #include by defining
+before any.
+
+diff --git a/event_iocp.c b/event_iocp.c
+index 6b2a2e15..4955e426 100644
+--- a/event_iocp.c
++++ b/event_iocp.c
+@@ -23,12 +23,14 @@
+  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+  */
+-#include "evconfig-private.h"
+ 
+ #ifndef _WIN32_WINNT
+ /* Minimum required for InitializeCriticalSectionAndSpinCount */
+ #define _WIN32_WINNT 0x0403
+ #endif
++
++#include "evconfig-private.h"
++
+ #include <winsock2.h>
+ #include <windows.h>
+ #include <process.h>
+diff --git a/evthread_win32.c b/evthread_win32.c
+index 2ec80560..8647f72b 100644
+--- a/evthread_win32.c
++++ b/evthread_win32.c
+@@ -23,18 +23,21 @@
+  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+  */
+-#include "event2/event-config.h"
+-#include "evconfig-private.h"
+ 
+ #ifdef _WIN32
+ #ifndef _WIN32_WINNT
+ /* Minimum required for InitializeCriticalSectionAndSpinCount */
+ #define _WIN32_WINNT 0x0403
+ #endif
+-#include <winsock2.h>
+ #define WIN32_LEAN_AND_MEAN
++#endif
++
++#include "event2/event-config.h"
++#include "evconfig-private.h"
++
++#ifdef _WIN32
++#include <winsock2.h>
+ #include <windows.h>
+-#undef WIN32_LEAN_AND_MEAN
+ #include <sys/locking.h>
+ #endif
+ 
+diff --git a/evutil.c b/evutil.c
+index 9817f086..8537ffe8 100644
+--- a/evutil.c
++++ b/evutil.c
+@@ -24,6 +24,14 @@
+  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+  */
+ 
++#ifdef _WIN32
++#ifndef _WIN32_WINNT
++/* For structs needed by GetAdaptersAddresses */
++#define _WIN32_WINNT 0x0501
++#endif
++#define WIN32_LEAN_AND_MEAN
++#endif
++
+ #include "event2/event-config.h"
+ #include "evconfig-private.h"
+ 
+@@ -31,15 +39,10 @@
+ #include <winsock2.h>
+ #include <winerror.h>
+ #include <ws2tcpip.h>
+-#define WIN32_LEAN_AND_MEAN
+ #include <windows.h>
+-#undef WIN32_LEAN_AND_MEAN
+ #include <io.h>
+ #include <tchar.h>
+ #include <process.h>
+-#undef _WIN32_WINNT
+-/* For structs needed by GetAdaptersAddresses */
+-#define _WIN32_WINNT 0x0501
+ #include <iphlpapi.h>
+ #include <netioapi.h>
+ #endif
+diff --git a/listener.c b/listener.c
+index f5c00c9c..d1080e76 100644
+--- a/listener.c
++++ b/listener.c
+@@ -24,16 +24,19 @@
+  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+  */
+ 
++#ifdef _WIN32
++#ifndef _WIN32_WINNT
++/* Minimum required for InitializeCriticalSectionAndSpinCount */
++#define _WIN32_WINNT 0x0403
++#endif
++#endif
++
+ #include "event2/event-config.h"
+ #include "evconfig-private.h"
+ 
+ #include <sys/types.h>
+ 
+ #ifdef _WIN32
+-#ifndef _WIN32_WINNT
+-/* Minimum required for InitializeCriticalSectionAndSpinCount */
+-#define _WIN32_WINNT 0x0403
+-#endif
+ #include <winsock2.h>
+ #include <winerror.h>
+ #include <ws2tcpip.h>

From 4e57d1a3570918e44004f6453f9042a280c15120 Mon Sep 17 00:00:00 2001
From: Kittywhiskers Van Gogh <63189531+kwvg@users.noreply.github.com>
Date: Mon, 14 Apr 2025 16:21:40 +0100
Subject: [PATCH 509/656] merge bitcoin#32266: Avoid `warning:
 "_FORTIFY_SOURCE"` redefined for `libevent`

---
 depends/packages/libevent.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/depends/packages/libevent.mk b/depends/packages/libevent.mk
index 0bb88f6dc282..bcc7cd067030 100644
--- a/depends/packages/libevent.mk
+++ b/depends/packages/libevent.mk
@@ -21,7 +21,7 @@ define $(package)_set_vars
   $(package)_cppflags_mingw32=-D_WIN32_WINNT=0x0601
 
   ifeq ($(NO_HARDEN),)
-  $(package)_cppflags+=-D_FORTIFY_SOURCE=3
+  $(package)_cppflags += -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=3
   endif
 endef
 

From dcf67c77b1a20a9ce3a2dd3457c2f59ab8d50da8 Mon Sep 17 00:00:00 2001
From: Kittywhiskers Van Gogh <63189531+kwvg@users.noreply.github.com>
Date: Mon, 13 May 2024 16:57:03 +0200
Subject: [PATCH 510/656] merge bitcoin#30095: avoid using thread_local
 variable that has a destructor

---
 configure.ac             |  5 -----
 src/sync.cpp             |  6 +++---
 src/util/threadnames.cpp | 31 +++++++++++++++++++++----------
 src/util/threadnames.h   |  6 +++---
 4 files changed, 27 insertions(+), 21 deletions(-)

diff --git a/configure.ac b/configure.ac
index 862d16f09735..17f4b03040ba 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1213,11 +1213,6 @@ if test "$use_thread_local" = "yes" || test "$use_thread_local" = "auto"; then
           dnl https://gist.github.com/jamesob/fe9a872051a88b2025b1aa37bfa98605
           AC_MSG_RESULT([no])
           ;;
-        *freebsd*)
-          dnl FreeBSD's implementation of thread_local is also buggy (per
-          dnl https://groups.google.com/d/msg/bsdmailinglist/22ncTZAbDp4/Dii_pII5AwAJ)
-          AC_MSG_RESULT([no])
-          ;;
         *)
           AC_DEFINE([HAVE_THREAD_LOCAL], [1], [Define if thread_local is supported.])
           AC_MSG_RESULT([yes])
diff --git a/src/sync.cpp b/src/sync.cpp
index 1747b69f6fee..5e7067e226cc 100644
--- a/src/sync.cpp
+++ b/src/sync.cpp
@@ -41,11 +41,11 @@ struct CLockLocation {
         const char* pszFile,
         int nLine,
         bool fTryIn,
-        const std::string& thread_name)
+        std::string&& thread_name)
         : fTry(fTryIn),
           mutexName(pszName),
           sourceFile(pszFile),
-          m_thread_name(thread_name),
+          m_thread_name(std::move(thread_name)),
           sourceLine(nLine) {}
 
     std::string ToString() const
@@ -64,7 +64,7 @@ struct CLockLocation {
     bool fTry;
     std::string mutexName;
     std::string sourceFile;
-    const std::string& m_thread_name;
+    const std::string m_thread_name;
     int sourceLine;
 };
 
diff --git a/src/util/threadnames.cpp b/src/util/threadnames.cpp
index 3f821e178214..b1f50dc40682 100644
--- a/src/util/threadnames.cpp
+++ b/src/util/threadnames.cpp
@@ -6,6 +6,7 @@
 #include <config/bitcoin-config.h>
 #endif
 
+#include <cstring>
 #include <string>
 #include <thread>
 #include <utility>
@@ -42,27 +43,37 @@ static void SetThreadName(const char* name)
 // global.
 #if defined(HAVE_THREAD_LOCAL)
 
-static thread_local std::string g_thread_name;
-const std::string& util::ThreadGetInternalName() { return g_thread_name; }
+/**
+ * The name of the thread. We use char array instead of std::string to avoid
+ * complications with running a destructor when the thread exits. Avoid adding
+ * other thread_local variables.
+ * @see https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=278701
+ */
+static thread_local char g_thread_name[128]{'\0'};
+std::string util::ThreadGetInternalName() { return g_thread_name; }
 //! Set the in-memory internal name for this thread. Does not affect the process
 //! name.
-static void SetInternalName(std::string name) { g_thread_name = std::move(name); }
+static void SetInternalName(const std::string& name)
+{
+    const size_t copy_bytes{std::min(sizeof(g_thread_name) - 1, name.length())};
+    std::memcpy(g_thread_name, name.data(), copy_bytes);
+    g_thread_name[copy_bytes] = '\0';
+}
 
 // Without thread_local available, don't handle internal name at all.
 #else
 
-static const std::string empty_string;
-const std::string& util::ThreadGetInternalName() { return empty_string; }
-static void SetInternalName(std::string name) { }
+std::string util::ThreadGetInternalName() { return ""; }
+static void SetInternalName(const std::string& name) { }
 #endif
 
-void util::ThreadRename(std::string&& name)
+void util::ThreadRename(const std::string& name)
 {
     SetThreadName(("d-" + name).c_str());
-    SetInternalName(std::move(name));
+    SetInternalName(name);
 }
 
-void util::ThreadSetInternalName(std::string&& name)
+void util::ThreadSetInternalName(const std::string& name)
 {
-    SetInternalName(std::move(name));
+    SetInternalName(name);
 }
diff --git a/src/util/threadnames.h b/src/util/threadnames.h
index 64b2689cf137..adca8c30009e 100644
--- a/src/util/threadnames.h
+++ b/src/util/threadnames.h
@@ -12,14 +12,14 @@ namespace util {
 //! as its system thread name.
 //! @note Do not call this for the main thread, as this will interfere with
 //! UNIX utilities such as top and killall. Use ThreadSetInternalName instead.
-void ThreadRename(std::string&&);
+void ThreadRename(const std::string&);
 
 //! Set the internal (in-memory) name of the current thread only.
-void ThreadSetInternalName(std::string&&);
+void ThreadSetInternalName(const std::string&);
 
 //! Get the thread's internal (in-memory) name; used e.g. for identification in
 //! logging.
-const std::string& ThreadGetInternalName();
+std::string ThreadGetInternalName();
 
 } // namespace util
 

From b7febbe0580a8b85c7c91501a7496d0586f7db92 Mon Sep 17 00:00:00 2001
From: Kittywhiskers Van Gogh <63189531+kwvg@users.noreply.github.com>
Date: Tue, 14 May 2024 17:04:37 +0100
Subject: [PATCH 511/656] merge bitcoin#30137: Remove `--enable-threadlocal`

---
 configure.ac                        | 40 -----------------------------
 src/init/common.cpp                 |  6 -----
 src/test/util/setup_common.h        |  5 ++--
 src/test/util_threadnames_tests.cpp |  9 -------
 src/util/threadnames.cpp            | 11 --------
 5 files changed, 2 insertions(+), 69 deletions(-)

diff --git a/configure.ac b/configure.ac
index 17f4b03040ba..68551386d587 100644
--- a/configure.ac
+++ b/configure.ac
@@ -237,12 +237,6 @@ AC_ARG_ENABLE([lcov-branch-coverage],
   [use_lcov_branch=yes],
   [use_lcov_branch=no])
 
-AC_ARG_ENABLE([threadlocal],
-  [AS_HELP_STRING([--enable-threadlocal],
-  [enable features that depend on the c++ thread_local keyword (currently just thread names in debug logs). (default is to enable if there is platform support)])],
-  [use_thread_local=$enableval],
-  [use_thread_local=auto])
-
 AC_ARG_ENABLE([zmq],
   [AS_HELP_STRING([--disable-zmq],
   [disable ZMQ notifications])],
@@ -1192,40 +1186,6 @@ AC_COMPILE_IFELSE([AC_LANG_SOURCE([
   [AC_MSG_RESULT([no])]
 )
 
-if test "$use_thread_local" = "yes" || test "$use_thread_local" = "auto"; then
-  TEMP_LDFLAGS="$LDFLAGS"
-  LDFLAGS="$TEMP_LDFLAGS $PTHREAD_CFLAGS"
-  AC_MSG_CHECKING([for thread_local support])
-  AC_LINK_IFELSE([AC_LANG_SOURCE([
-    #include <thread>
-    static thread_local int foo = 0;
-    static void run_thread() { foo++;}
-    int main(){
-    for(int i = 0; i < 10; i++) { std::thread(run_thread).detach();}
-    return foo;
-    }
-    ])],
-    [
-     case $host in
-       *mingw*)
-          dnl mingw32's implementation of thread_local has also been shown to behave
-          dnl erroneously under concurrent usage; see:
-          dnl https://gist.github.com/jamesob/fe9a872051a88b2025b1aa37bfa98605
-          AC_MSG_RESULT([no])
-          ;;
-        *)
-          AC_DEFINE([HAVE_THREAD_LOCAL], [1], [Define if thread_local is supported.])
-          AC_MSG_RESULT([yes])
-          ;;
-      esac
-    ],
-    [
-      AC_MSG_RESULT([no])
-    ]
-  )
-  LDFLAGS="$TEMP_LDFLAGS"
-fi
-
 BACKTRACE_FLAGS=
 BACKTRACE_LDFLAGS=
 BACKTRACE_LIBS=
diff --git a/src/init/common.cpp b/src/init/common.cpp
index fc1cc551aa1b..0a1bff80d48d 100644
--- a/src/init/common.cpp
+++ b/src/init/common.cpp
@@ -67,11 +67,7 @@ void AddLoggingArgs(ArgsManager& argsman)
     argsman.AddArg("-logips", strprintf("Include IP addresses in debug output (default: %u)", DEFAULT_LOGIPS), ArgsManager::ALLOW_ANY, OptionsCategory::DEBUG_TEST);
     argsman.AddArg("-loglevel=<level>|<category>:<level>", strprintf("Set the global or per-category severity level for logging categories enabled with the -debug configuration option or the logging RPC: %s (default=%s); warning and error levels are always logged. If <category>:<level> is supplied, the setting will override the global one and may be specified multiple times to set multiple category-specific levels. <category> can be: %s.", LogInstance().LogLevelsString(), LogInstance().LogLevelToStr(BCLog::DEFAULT_LOG_LEVEL), LogInstance().LogCategoriesString()), ArgsManager::DISALLOW_NEGATION | ArgsManager::DISALLOW_ELISION | ArgsManager::DEBUG_ONLY, OptionsCategory::DEBUG_TEST);
     argsman.AddArg("-logtimestamps", strprintf("Prepend debug output with timestamp (default: %u)", DEFAULT_LOGTIMESTAMPS), ArgsManager::ALLOW_ANY, OptionsCategory::DEBUG_TEST);
-#ifdef HAVE_THREAD_LOCAL
     argsman.AddArg("-logthreadnames", strprintf("Prepend debug output with name of the originating thread (only available on platforms supporting thread_local) (default: %u)", DEFAULT_LOGTHREADNAMES), ArgsManager::ALLOW_ANY | ArgsManager::DEBUG_ONLY, OptionsCategory::DEBUG_TEST);
-#else
-    argsman.AddHiddenArgs({"-logthreadnames"});
-#endif
     argsman.AddArg("-logsourcelocations", strprintf("Prepend debug output with name of the originating source location (source file, line number and function name) (default: %u)", DEFAULT_LOGSOURCELOCATIONS), ArgsManager::ALLOW_ANY, OptionsCategory::DEBUG_TEST);
     argsman.AddArg("-logtimemicros", strprintf("Add microsecond precision to debug timestamps (default: %u)", DEFAULT_LOGTIMEMICROS), ArgsManager::ALLOW_ANY | ArgsManager::DEBUG_ONLY, OptionsCategory::DEBUG_TEST);
     argsman.AddArg("-printtoconsole", "Send trace/debug info to console (default: 1 when no -daemon. To disable logging to file, set -nodebuglogfile)", ArgsManager::ALLOW_ANY, OptionsCategory::DEBUG_TEST);
@@ -85,9 +81,7 @@ void SetLoggingOptions(const ArgsManager& args)
     LogInstance().m_print_to_console = args.GetBoolArg("-printtoconsole", !args.GetBoolArg("-daemon", false));
     LogInstance().m_log_timestamps = args.GetBoolArg("-logtimestamps", DEFAULT_LOGTIMESTAMPS);
     LogInstance().m_log_time_micros = args.GetBoolArg("-logtimemicros", DEFAULT_LOGTIMEMICROS);
-#ifdef HAVE_THREAD_LOCAL
     LogInstance().m_log_threadnames = args.GetBoolArg("-logthreadnames", DEFAULT_LOGTHREADNAMES);
-#endif
     LogInstance().m_log_sourcelocations = args.GetBoolArg("-logsourcelocations", DEFAULT_LOGSOURCELOCATIONS);
 
     fLogIPs = args.GetBoolArg("-logips", DEFAULT_LOGIPS);
diff --git a/src/test/util/setup_common.h b/src/test/util/setup_common.h
index ae4896c764ac..0ad25583ce4b 100644
--- a/src/test/util/setup_common.h
+++ b/src/test/util/setup_common.h
@@ -48,9 +48,8 @@ std::ostream& operator<<(typename std::enable_if<std::is_enum<T>::value, std::os
 /**
  * This global and the helpers that use it are not thread-safe.
  *
- * If thread-safety is needed, the global could be made thread_local (given
- * that thread_local is supported on all architectures we support) or a
- * per-thread instance could be used in the multi-threaded test.
+ * If thread-safety is needed, a per-thread instance could be
+ * used in the multi-threaded test.
  */
 extern FastRandomContext g_insecure_rand_ctx;
 
diff --git a/src/test/util_threadnames_tests.cpp b/src/test/util_threadnames_tests.cpp
index dbb5423a77f2..3ddf3390615f 100644
--- a/src/test/util_threadnames_tests.cpp
+++ b/src/test/util_threadnames_tests.cpp
@@ -11,10 +11,6 @@
 #include <thread>
 #include <vector>
 
-#if defined(HAVE_CONFIG_H)
-#include <config/bitcoin-config.h>
-#endif
-
 #include <boost/test/unit_test.hpp>
 
 BOOST_AUTO_TEST_SUITE(util_threadnames_tests)
@@ -53,11 +49,6 @@ std::set<std::string> RenameEnMasse(int num_threads)
  */
 BOOST_AUTO_TEST_CASE(util_threadnames_test_rename_threaded)
 {
-#if !defined(HAVE_THREAD_LOCAL)
-    // This test doesn't apply to platforms where we don't have thread_local.
-    return;
-#endif
-
     std::set<std::string> names = RenameEnMasse(100);
 
     BOOST_CHECK_EQUAL(names.size(), 100U);
diff --git a/src/util/threadnames.cpp b/src/util/threadnames.cpp
index b1f50dc40682..d3ced175fef4 100644
--- a/src/util/threadnames.cpp
+++ b/src/util/threadnames.cpp
@@ -39,10 +39,6 @@ static void SetThreadName(const char* name)
 #endif
 }
 
-// If we have thread_local, just keep thread ID and name in a thread_local
-// global.
-#if defined(HAVE_THREAD_LOCAL)
-
 /**
  * The name of the thread. We use char array instead of std::string to avoid
  * complications with running a destructor when the thread exits. Avoid adding
@@ -60,13 +56,6 @@ static void SetInternalName(const std::string& name)
     g_thread_name[copy_bytes] = '\0';
 }
 
-// Without thread_local available, don't handle internal name at all.
-#else
-
-std::string util::ThreadGetInternalName() { return ""; }
-static void SetInternalName(const std::string& name) { }
-#endif
-
 void util::ThreadRename(const std::string& name)
 {
     SetThreadName(("d-" + name).c_str());

From d5dffb684b911de03fb4194b856beed7a8a780dd Mon Sep 17 00:00:00 2001
From: Kittywhiskers Van Gogh <63189531+kwvg@users.noreply.github.com>
Date: Wed, 8 Oct 2025 13:10:59 -0700
Subject: [PATCH 512/656] merge bitcoin#33580: Use $(package)_file_name when
 downloading from the fallback

---
 depends/funcs.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/depends/funcs.mk b/depends/funcs.mk
index 93bd9a87fde9..964be8ea61c5 100644
--- a/depends/funcs.mk
+++ b/depends/funcs.mk
@@ -35,7 +35,7 @@ endef
 
 define fetch_file
     ( $(call fetch_file_inner,$(1),$(2),$(3),$(4),$(5)) || \
-      $(call fetch_file_inner,$(1),$(FALLBACK_DOWNLOAD_PATH),$(3),$(4),$(5)))
+      $(call fetch_file_inner,$(1),$(FALLBACK_DOWNLOAD_PATH),$(4),$(4),$(5)))
 endef
 
 define int_get_build_recipe_hash

From f97d3d6185398ef61efe72fcaf9f883e4822470e Mon Sep 17 00:00:00 2001
From: Kittywhiskers Van Gogh <63189531+kwvg@users.noreply.github.com>
Date: Fri, 14 Nov 2025 16:17:37 +0530
Subject: [PATCH 513/656] fix: skip `EXPORTED_SYMBOLS` validation on ELF
 targets

---
 contrib/devtools/symbol-check.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/contrib/devtools/symbol-check.py b/contrib/devtools/symbol-check.py
index a89cd32e83d2..a8eebef5259b 100755
--- a/contrib/devtools/symbol-check.py
+++ b/contrib/devtools/symbol-check.py
@@ -285,7 +285,8 @@ def check_ELF_ABI(binary) -> bool:
 CHECKS = {
 lief.EXE_FORMATS.ELF: [
     ('IMPORTED_SYMBOLS', check_imported_symbols),
-    ('EXPORTED_SYMBOLS', check_exported_symbols),
+    # Dash: We export symbols aggressively to aid in backtrace generation
+    # ('EXPORTED_SYMBOLS', check_exported_symbols),
     ('LIBRARY_DEPENDENCIES', check_ELF_libraries),
     ('INTERPRETER_NAME', check_ELF_interpreter),
     ('ABI', check_ELF_ABI),

From 8e79c7ac1e1075579eef0def37b51e6050d194aa Mon Sep 17 00:00:00 2001
From: Kittywhiskers Van Gogh <63189531+kwvg@users.noreply.github.com>
Date: Fri, 14 Nov 2025 16:47:40 +0530
Subject: [PATCH 514/656] fix: allow `dbghelp.dll` for PE targets

---
 contrib/devtools/symbol-check.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/contrib/devtools/symbol-check.py b/contrib/devtools/symbol-check.py
index a8eebef5259b..13d0a5d398b1 100755
--- a/contrib/devtools/symbol-check.py
+++ b/contrib/devtools/symbol-check.py
@@ -163,7 +163,8 @@
 'msvcrt.dll', # C standard library for MSVC
 'SHELL32.dll', # shell API
 'WS2_32.dll', # sockets
-'bcrypt.dll',
+'bcrypt.dll', # crypto API
+'dbghelp.dll', # debugging routines
 # bitcoin-qt only
 'dwmapi.dll', # desktop window manager
 'GDI32.dll', # graphics device interface

From 4ea8b8cb23a820f03184c6df0c656cb22d98266c Mon Sep 17 00:00:00 2001
From: pasta <pasta@dashboost.org>
Date: Fri, 14 Nov 2025 07:25:13 -0600
Subject: [PATCH 515/656] fix: simply constexpr

---
 src/llmq/signing_shares.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/llmq/signing_shares.cpp b/src/llmq/signing_shares.cpp
index 66aab5ad67b3..f5314aa0376a 100644
--- a/src/llmq/signing_shares.cpp
+++ b/src/llmq/signing_shares.cpp
@@ -1387,7 +1387,7 @@ CSigShare CSigSharesManager::RebuildSigShare(const CSigSharesNodeState::SessionI
 
 void CSigSharesManager::Cleanup()
 {
-    static constexpr auto CLEANUP_INTERVAL{5s};
+    constexpr auto CLEANUP_INTERVAL{5s};
     if (!cleanupThrottler.TryCleanup(CLEANUP_INTERVAL)) {
         return;
     }

From c760e441fd8a8dbc465adb897b36f18b86b5cefc Mon Sep 17 00:00:00 2001
From: pasta <pasta@dashboost.org>
Date: Fri, 14 Nov 2025 09:13:53 -0600
Subject: [PATCH 516/656] fix: print compact stack traces if debug info is
 empty / not useful

---
 src/stacktraces.cpp | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/src/stacktraces.cpp b/src/stacktraces.cpp
index 3f6262108c97..ff508c0ea5ab 100644
--- a/src/stacktraces.cpp
+++ b/src/stacktraces.cpp
@@ -469,7 +469,19 @@ std::string GetCrashInfoStrFromSerializedStr(const std::string& ciStr)
 
 static std::string GetCrashInfoStr(const crash_info& ci, size_t spaces)
 {
-    if (ci.stackframeInfos.empty()) {
+    // Check if we have any useful debug information at all
+    // libbacktrace may return stackframe_info entries but with empty filenames and functions
+    // when it can find the binary but can't resolve symbols
+    bool hasUsefulInfo = [&ci]() {
+        for (const auto& si : ci.stackframeInfos) {
+            if (!si.filename.empty() || !si.function.empty()) {
+                return true;
+            }
+        }
+        return false;
+    }();
+
+    if (!hasUsefulInfo) {
         return GetCrashInfoStrNoDebugInfo(ci);
     }
 

From c4971dcb3e84495ae78305beafb2bc0389a2654b Mon Sep 17 00:00:00 2001
From: PastaPastaPasta <6443210+PastaPastaPasta@users.noreply.github.com>
Date: Fri, 14 Nov 2025 17:15:05 -0600
Subject: [PATCH 517/656] fix: use std::any_of

Co-authored-by: UdjinM6 <UdjinM6@users.noreply.github.com>
---
 src/stacktraces.cpp | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/src/stacktraces.cpp b/src/stacktraces.cpp
index ff508c0ea5ab..26283eb23109 100644
--- a/src/stacktraces.cpp
+++ b/src/stacktraces.cpp
@@ -472,14 +472,8 @@ static std::string GetCrashInfoStr(const crash_info& ci, size_t spaces)
     // Check if we have any useful debug information at all
     // libbacktrace may return stackframe_info entries but with empty filenames and functions
     // when it can find the binary but can't resolve symbols
-    bool hasUsefulInfo = [&ci]() {
-        for (const auto& si : ci.stackframeInfos) {
-            if (!si.filename.empty() || !si.function.empty()) {
-                return true;
-            }
-        }
-        return false;
-    }();
+    bool hasUsefulInfo = std::any_of(ci.stackframeInfos.begin(), ci.stackframeInfos.end(),
+                                     [](const auto& si) { return !si.filename.empty() || !si.function.empty(); });
 
     if (!hasUsefulInfo) {
         return GetCrashInfoStrNoDebugInfo(ci);

From ccc0d6a7275c017b6369d9d39c26ff41ed8d9f6d Mon Sep 17 00:00:00 2001
From: UdjinM6 <UdjinM6@users.noreply.github.com>
Date: Sun, 16 Nov 2025 13:43:48 +0300
Subject: [PATCH 518/656] ci: Add missing CI_FAILFAST_TEST_LEAVE_DANGLING env
 var to GH test workflow

---
 .github/workflows/test-src.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/test-src.yml b/.github/workflows/test-src.yml
index 62e47d0152ee..c0a9e5e58289 100644
--- a/.github/workflows/test-src.yml
+++ b/.github/workflows/test-src.yml
@@ -18,6 +18,7 @@ on:
 
 env:
   INTEGRATION_TESTS_ARGS: "--extended --exclude feature_pruning,feature_dbcrash"
+  CI_FAILFAST_TEST_LEAVE_DANGLING: 1  # GHA does not care about dangling processes and setting this variable avoids killing the CI script itself on error
 
 jobs:
   test-src:

From 521d92f502ce74874459ec865b30739ea6c60a27 Mon Sep 17 00:00:00 2001
From: Konstantin Akimov <knstqq@gmail.com>
Date: Mon, 17 Nov 2025 03:22:51 +0700
Subject: [PATCH 519/656] tests: unify dash.conf for dynamically added
 masternodes and statically added

---
 test/functional/test_framework/test_framework.py | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/test/functional/test_framework/test_framework.py b/test/functional/test_framework/test_framework.py
index d9ad16b25459..ab25ac3075ea 100755
--- a/test/functional/test_framework/test_framework.py
+++ b/test/functional/test_framework/test_framework.py
@@ -632,14 +632,20 @@ def dynamically_initialize_datadir(self, node_p2p_port, node_rpc_port):
             f.write("port=" + str(node_p2p_port) + "\n")
             f.write("rpcport=" + str(node_rpc_port) + "\n")
             f.write("server=1\n")
-            f.write("debug=1\n")
+            f.write("rpcdoccheck=1\n")
+            f.write("fallbackfee=0.00001\n")
+            f.write("server=1\n")
             f.write("keypool=1\n")
             f.write("discover=0\n")
+            f.write("dnsseed=0\n")
+            f.write("fixedseeds=0\n")
             f.write("listenonion=0\n")
+            f.write("peertimeout=999999999\n")
             f.write("printtoconsole=0\n")
             f.write("upnp=0\n")
             f.write("natpmp=0\n")
             f.write("shrinkdebugfile=0\n")
+            f.write("unsafesqlitesync=1\n")
             f.write("dip3params=2:2\n")
             f.write(f"testactivationheight=v20@{self.v20_height}\n")
             f.write(f"testactivationheight=mn_rr@{self.mn_rr_height}\n")

From 2972e84000398eb9d178e90c80fad5e8dd41b38a Mon Sep 17 00:00:00 2001
From: Konstantin Akimov <knstqq@gmail.com>
Date: Mon, 17 Nov 2025 03:41:45 +0700
Subject: [PATCH 520/656] test: removed duplicated code from
 dynamically_initialize_datadir with dash.conf preparation

---
 .../test_framework/test_framework.py          | 45 ++++++-------------
 1 file changed, 13 insertions(+), 32 deletions(-)

diff --git a/test/functional/test_framework/test_framework.py b/test/functional/test_framework/test_framework.py
index ab25ac3075ea..af5987365a0a 100755
--- a/test/functional/test_framework/test_framework.py
+++ b/test/functional/test_framework/test_framework.py
@@ -48,7 +48,6 @@
     check_json_precision,
     copy_datadir,
     force_finish_mnsync,
-    get_chain_conf_names,
     get_datadir_path,
     initialize_datadir,
     p2p_port,
@@ -56,7 +55,8 @@
     satoshi_round,
     softfork_active,
     wait_until_helper,
-    get_chain_folder, rpc_port,
+    get_chain_folder,
+    write_config,
 )
 
 
@@ -607,7 +607,7 @@ def add_dynamically_node(self, extra_args=None, *, rpchost=None, binary=None):
         return t_node
 
     # TODO: move it to DashTestFramework where it belongs
-    def dynamically_initialize_datadir(self, node_p2p_port, node_rpc_port):
+    def dynamically_initialize_datadir(self, mnidx):
         source_data_dir = get_datadir_path(self.options.tmpdir, 0)  # use node0 as a source
         new_data_dir = get_datadir_path(self.options.tmpdir, len(self.nodes))
 
@@ -624,33 +624,15 @@ def dynamically_initialize_datadir(self, node_p2p_port, node_rpc_port):
             if entry not in ['chainstate', 'blocks', 'indexes', 'evodb']:
                 os.remove(os.path.join(new_data_dir, self.chain, entry))
 
-        (chain_name_conf_arg, chain_name_conf_arg_value, chain_name_conf_section) = get_chain_conf_names(self.chain)
-
-        with open(os.path.join(new_data_dir, "dash.conf"), 'w', encoding='utf8') as f:
-            f.write("{}={}\n".format(chain_name_conf_arg, chain_name_conf_arg_value))
-            f.write("[{}]\n".format(chain_name_conf_section))
-            f.write("port=" + str(node_p2p_port) + "\n")
-            f.write("rpcport=" + str(node_rpc_port) + "\n")
-            f.write("server=1\n")
-            f.write("rpcdoccheck=1\n")
-            f.write("fallbackfee=0.00001\n")
-            f.write("server=1\n")
-            f.write("keypool=1\n")
-            f.write("discover=0\n")
-            f.write("dnsseed=0\n")
-            f.write("fixedseeds=0\n")
-            f.write("listenonion=0\n")
-            f.write("peertimeout=999999999\n")
-            f.write("printtoconsole=0\n")
-            f.write("upnp=0\n")
-            f.write("natpmp=0\n")
-            f.write("shrinkdebugfile=0\n")
-            f.write("unsafesqlitesync=1\n")
-            f.write("dip3params=2:2\n")
-            f.write(f"testactivationheight=v20@{self.v20_height}\n")
-            f.write(f"testactivationheight=mn_rr@{self.mn_rr_height}\n")
-            os.makedirs(os.path.join(new_data_dir, 'stderr'), exist_ok=True)
-            os.makedirs(os.path.join(new_data_dir, 'stdout'), exist_ok=True)
+        write_config(os.path.join(new_data_dir, "dash.conf"), extra_config=
+                "dip3params=2:2\n"
+                f"testactivationheight=v20@{self.v20_height}\n"
+                f"testactivationheight=mn_rr@{self.mn_rr_height}\n",
+                n=mnidx, chain=self.chain, disable_autoconnect=self.disable_autoconnect)
+
+        os.makedirs(os.path.join(new_data_dir, 'stderr'), exist_ok=True)
+        os.makedirs(os.path.join(new_data_dir, 'stdout'), exist_ok=True)
+        return new_data_dir
 
     def start_node(self, i, *args, **kwargs):
         """Start a dashd"""
@@ -1600,7 +1582,6 @@ def dynamically_add_masternode(self, evo=False, rnd=None, should_be_rejected=Fal
         mn_idx = len(self.nodes)
 
         node_p2p_port = p2p_port(mn_idx)
-        node_rpc_port = rpc_port(mn_idx)
 
         protx_success = False
         try:
@@ -1615,7 +1596,7 @@ def dynamically_add_masternode(self, evo=False, rnd=None, should_be_rejected=Fal
             # nothing to do
             return None
 
-        self.dynamically_initialize_datadir(node_p2p_port, node_rpc_port)
+        self.dynamically_initialize_datadir(mn_idx)
         node_info = self.add_dynamically_node(self.extra_args[0])
 
         args = ['-masternodeblsprivkey=%s' % created_mn_info.keyOperator] + node_info.extra_args

From 99f8abf4f2cb6292a8eabd3447d6a0278a29a630 Mon Sep 17 00:00:00 2001
From: Konstantin Akimov <knstqq@gmail.com>
Date: Mon, 17 Nov 2025 04:00:07 +0700
Subject: [PATCH 521/656] test: avoid copy-paste when update dip3 params in
 dash.conf

---
 .../test_framework/test_framework.py          | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/test/functional/test_framework/test_framework.py b/test/functional/test_framework/test_framework.py
index af5987365a0a..6169f4d9afe1 100755
--- a/test/functional/test_framework/test_framework.py
+++ b/test/functional/test_framework/test_framework.py
@@ -624,11 +624,9 @@ def dynamically_initialize_datadir(self, mnidx):
             if entry not in ['chainstate', 'blocks', 'indexes', 'evodb']:
                 os.remove(os.path.join(new_data_dir, self.chain, entry))
 
-        write_config(os.path.join(new_data_dir, "dash.conf"), extra_config=
-                "dip3params=2:2\n"
-                f"testactivationheight=v20@{self.v20_height}\n"
-                f"testactivationheight=mn_rr@{self.mn_rr_height}\n",
+        write_config(os.path.join(new_data_dir, "dash.conf"),
                 n=mnidx, chain=self.chain, disable_autoconnect=self.disable_autoconnect)
+        self.append_dip3_config(new_data_dir)
 
         os.makedirs(os.path.join(new_data_dir, 'stderr'), exist_ok=True)
         os.makedirs(os.path.join(new_data_dir, 'stdout'), exist_ok=True)
@@ -1464,11 +1462,7 @@ def add_nodes(self, num_nodes: int, extra_args=None, *, rpchost=None, binary=Non
         old_num_nodes = len(self.nodes)
         super().add_nodes(num_nodes, extra_args, rpchost=rpchost, binary=binary, binary_cli=binary_cli, versions=versions)
         for i in range(old_num_nodes, old_num_nodes + num_nodes):
-            append_config(self.nodes[i].datadir, [
-                "dip3params=2:2",
-                f"testactivationheight=v20@{self.v20_height}",
-                f"testactivationheight=mn_rr@{self.mn_rr_height}",
-            ])
+            self.append_dip3_config(self.nodes[i].datadir)
         if old_num_nodes == 0:
             # controller node is the only node that has an extra option allowing it to submit sporks
             append_config(self.nodes[0].datadir, ["sporkkey=cP4EKFyJsHT39LDqgdcB43Y3YXjNyjb5Fuas1GQSeAtjnZWmZEQK"])
@@ -1482,6 +1476,13 @@ def connect_nodes(self, a, b, *, peer_advertises_v2=None):
             if mn2.nodeIdx is not None:
                 mn2.get_node(self).setmnthreadactive(True)
 
+    def append_dip3_config(self, datadir):
+            append_config(datadir, [
+                "dip3params=2:2",
+                f"testactivationheight=v20@{self.v20_height}",
+                f"testactivationheight=mn_rr@{self.mn_rr_height}",
+            ])
+
     def set_dash_test_params(self, num_nodes, masterodes_count, extra_args=None, evo_count=0):
         self.mn_count = masterodes_count
         self.evo_count = evo_count

From 375bf9da8df5996ba635e47e0aa1d9e04e02da12 Mon Sep 17 00:00:00 2001
From: Konstantin Akimov <knstqq@gmail.com>
Date: Mon, 17 Nov 2025 03:05:02 +0700
Subject: [PATCH 522/656] test: new commandline argument -tinyblk to use blk
 size just 64kb instead 1Mb

Benefits of using -tinyblk for functional tests are:
 - less IO operation during running functional tests makes them run a bit faster
 - datadirs consume less storage on CI, it will prevent failures with 'System.IO.IOException: No space left on device'
 - datadirs consume less storage locally, multiple failed runs with no cleaning up of tmp dirs less likely will cause exhaustion of disk space
---
 src/init.cpp                           | 1 +
 src/node/blockstorage.cpp              | 5 +++--
 test/functional/test_framework/util.py | 2 ++
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/init.cpp b/src/init.cpp
index 0282930dacb5..cadf16db45c6 100644
--- a/src/init.cpp
+++ b/src/init.cpp
@@ -535,6 +535,7 @@ void SetupServerArgs(ArgsManager& argsman)
     argsman.AddArg("-assumevalid=<hex>", strprintf("If this block is in the chain assume that it and its ancestors are valid and potentially skip their script verification (0 to verify all, default: %s, testnet: %s)", defaultChainParams->GetConsensus().defaultAssumeValid.GetHex(), testnetChainParams->GetConsensus().defaultAssumeValid.GetHex()), ArgsManager::ALLOW_ANY, OptionsCategory::OPTIONS);
     argsman.AddArg("-blocksdir=<dir>", "Specify directory to hold blocks subdirectory for *.dat files (default: <datadir>)", ArgsManager::ALLOW_ANY, OptionsCategory::OPTIONS);
     argsman.AddArg("-fastprune", "Use smaller block files and lower minimum prune height for testing purposes", ArgsManager::ALLOW_ANY | ArgsManager::DEBUG_ONLY, OptionsCategory::DEBUG_TEST);
+    argsman.AddArg("-tinyblk", "Use smaller block files for testing purposes", ArgsManager::ALLOW_ANY | ArgsManager::DEBUG_ONLY, OptionsCategory::DEBUG_TEST);
 #if HAVE_SYSTEM
     argsman.AddArg("-blocknotify=<cmd>", "Execute command when the best block changes (%s in cmd is replaced by block hash)", ArgsManager::ALLOW_ANY, OptionsCategory::OPTIONS);
 #endif
diff --git a/src/node/blockstorage.cpp b/src/node/blockstorage.cpp
index 9752b6635888..efd6208421a0 100644
--- a/src/node/blockstorage.cpp
+++ b/src/node/blockstorage.cpp
@@ -589,12 +589,13 @@ void UnlinkPrunedFiles(const std::set<int>& setFilesToPrune)
 
 static FlatFileSeq BlockFileSeq()
 {
-    return FlatFileSeq(gArgs.GetBlocksDirPath(), "blk", gArgs.GetBoolArg("-fastprune", false) ? 0x4000 /* 16kb */ : BLOCKFILE_CHUNK_SIZE);
+    return FlatFileSeq(gArgs.GetBlocksDirPath(), "blk", gArgs.GetBoolArg("-tinyblk", false) ? 0x10000 /* 64kb */ :
+        (gArgs.GetBoolArg("-fastprune", false) ? 0x4000 /* 16kb */ : BLOCKFILE_CHUNK_SIZE));
 }
 
 static FlatFileSeq UndoFileSeq()
 {
-    return FlatFileSeq(gArgs.GetBlocksDirPath(), "rev", UNDOFILE_CHUNK_SIZE);
+    return FlatFileSeq(gArgs.GetBlocksDirPath(), "rev", gArgs.GetBoolArg("-tinyblk", false) ? 0x10000 /* 64kb */ : UNDOFILE_CHUNK_SIZE);
 }
 
 FILE* OpenBlockFile(const FlatFilePos& pos, bool fReadOnly)
diff --git a/test/functional/test_framework/util.py b/test/functional/test_framework/util.py
index 6c0304051724..71c0b875a0d7 100644
--- a/test/functional/test_framework/util.py
+++ b/test/functional/test_framework/util.py
@@ -419,6 +419,8 @@ def write_config(config_path, *, n, chain, extra_config="", disable_autoconnect=
         f.write("upnp=0\n")
         f.write("natpmp=0\n")
         f.write("shrinkdebugfile=0\n")
+        # To reduce IO and consumed disk storage use tiny size for allocated blk and rev files
+        f.write("tinyblk=1\n")
         # To improve SQLite wallet performance so that the tests don't timeout, use -unsafesqlitesync
         f.write("unsafesqlitesync=1\n")
         if disable_autoconnect:

From 37c6855c97b00d2b51b01fd150399b34df96b128 Mon Sep 17 00:00:00 2001
From: Konstantin Akimov <knstqq@gmail.com>
Date: Mon, 17 Nov 2025 13:49:20 +0700
Subject: [PATCH 523/656] fix: priority -fastprune over -tinyblock

Co-authored-by: UdjinM6 <UdjinM6@users.noreply.github.com>
---
 src/node/blockstorage.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/node/blockstorage.cpp b/src/node/blockstorage.cpp
index efd6208421a0..707acd044c28 100644
--- a/src/node/blockstorage.cpp
+++ b/src/node/blockstorage.cpp
@@ -589,8 +589,9 @@ void UnlinkPrunedFiles(const std::set<int>& setFilesToPrune)
 
 static FlatFileSeq BlockFileSeq()
 {
-    return FlatFileSeq(gArgs.GetBlocksDirPath(), "blk", gArgs.GetBoolArg("-tinyblk", false) ? 0x10000 /* 64kb */ :
-        (gArgs.GetBoolArg("-fastprune", false) ? 0x4000 /* 16kb */ : BLOCKFILE_CHUNK_SIZE));
+    return FlatFileSeq(gArgs.GetBlocksDirPath(), "blk",
+                       gArgs.GetBoolArg("-fastprune", false) ? 0x4000 /* 16kb */ :
+                        (gArgs.GetBoolArg("-tinyblk", false) ? 0x10000 /* 64kb */ : BLOCKFILE_CHUNK_SIZE));
 }
 
 static FlatFileSeq UndoFileSeq()

From 7a933949041279751d6b87133d94fa30c64c90fd Mon Sep 17 00:00:00 2001
From: Konstantin Akimov <knstqq@gmail.com>
Date: Mon, 17 Nov 2025 13:56:26 +0700
Subject: [PATCH 524/656] test: inline node_p2p_port to
 dynamically_prepare_masternode instead passing args

---
 test/functional/test_framework/test_framework.py | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/test/functional/test_framework/test_framework.py b/test/functional/test_framework/test_framework.py
index 6169f4d9afe1..6d67b3e0ebe3 100755
--- a/test/functional/test_framework/test_framework.py
+++ b/test/functional/test_framework/test_framework.py
@@ -1582,11 +1582,9 @@ def create_simple_node(self, extra_args=None):
     def dynamically_add_masternode(self, evo=False, rnd=None, should_be_rejected=False) -> Optional[MasternodeInfo]:
         mn_idx = len(self.nodes)
 
-        node_p2p_port = p2p_port(mn_idx)
-
         protx_success = False
         try:
-            created_mn_info = self.dynamically_prepare_masternode(mn_idx, node_p2p_port, evo, rnd)
+            created_mn_info = self.dynamically_prepare_masternode(mn_idx, evo, rnd)
             protx_success = True
         except:
             self.log.info("dynamically_prepare_masternode failed")
@@ -1616,10 +1614,11 @@ def dynamically_add_masternode(self, evo=False, rnd=None, should_be_rejected=Fal
         self.log.info("Successfully started and synced proTx:"+str(created_mn_info.proTxHash))
         return created_mn_info
 
-    def dynamically_prepare_masternode(self, idx, node_p2p_port, evo=False, rnd=None) -> MasternodeInfo:
+    def dynamically_prepare_masternode(self, idx, evo=False, rnd=None) -> MasternodeInfo:
         mn = MasternodeInfo(evo=evo, legacy=(not softfork_active(self.nodes[0], 'v19')))
         mn.generate_addresses(self.nodes[0])
 
+        node_p2p_port = p2p_port(idx)
         platform_node_id = hash160(b'%d' % rnd).hex() if rnd is not None else hash160(b'%d' % node_p2p_port).hex()
         addrs_platform_p2p = node_p2p_port + 101
         addrs_platform_https = node_p2p_port + 102

From def5d0a483fc143550fd9eed796bf3a53923e72a Mon Sep 17 00:00:00 2001
From: UdjinM6 <UdjinM6@users.noreply.github.com>
Date: Mon, 17 Nov 2025 12:18:43 +0300
Subject: [PATCH 525/656] chore: fix indentation

---
 test/functional/test_framework/test_framework.py | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/test/functional/test_framework/test_framework.py b/test/functional/test_framework/test_framework.py
index 6d67b3e0ebe3..1f784b0962d0 100755
--- a/test/functional/test_framework/test_framework.py
+++ b/test/functional/test_framework/test_framework.py
@@ -625,7 +625,7 @@ def dynamically_initialize_datadir(self, mnidx):
                 os.remove(os.path.join(new_data_dir, self.chain, entry))
 
         write_config(os.path.join(new_data_dir, "dash.conf"),
-                n=mnidx, chain=self.chain, disable_autoconnect=self.disable_autoconnect)
+                     n=mnidx, chain=self.chain, disable_autoconnect=self.disable_autoconnect)
         self.append_dip3_config(new_data_dir)
 
         os.makedirs(os.path.join(new_data_dir, 'stderr'), exist_ok=True)
@@ -1477,11 +1477,11 @@ def connect_nodes(self, a, b, *, peer_advertises_v2=None):
                 mn2.get_node(self).setmnthreadactive(True)
 
     def append_dip3_config(self, datadir):
-            append_config(datadir, [
-                "dip3params=2:2",
-                f"testactivationheight=v20@{self.v20_height}",
-                f"testactivationheight=mn_rr@{self.mn_rr_height}",
-            ])
+        append_config(datadir, [
+            "dip3params=2:2",
+            f"testactivationheight=v20@{self.v20_height}",
+            f"testactivationheight=mn_rr@{self.mn_rr_height}",
+        ])
 
     def set_dash_test_params(self, num_nodes, masterodes_count, extra_args=None, evo_count=0):
         self.mn_count = masterodes_count

From 81cd24009bada4048b0fe44e617f6276dd555f7e Mon Sep 17 00:00:00 2001
From: pasta <pasta@dashboost.org>
Date: Mon, 17 Nov 2025 11:28:01 -0600
Subject: [PATCH 526/656] fix: improve error handling in build script
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Fix verification block to properly capture exit status and prevent
build from continuing on failure. Change objcopy command to use &&
instead of semicolon to ensure chmod only runs if mv succeeds.

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude <noreply@anthropic.com>
---
 contrib/guix/libexec/build.sh | 55 ++++++++++++++++++-----------------
 1 file changed, 29 insertions(+), 26 deletions(-)

diff --git a/contrib/guix/libexec/build.sh b/contrib/guix/libexec/build.sh
index 9ba96a33dc26..6408234d89f9 100755
--- a/contrib/guix/libexec/build.sh
+++ b/contrib/guix/libexec/build.sh
@@ -345,7 +345,7 @@ mkdir -p "$DISTSRC"
                 case "$HOST" in
                     *linux*)
                         # Compress DWARF sections in debug files and set proper permissions
-                        find "${DISTNAME}" -name "*.dbg" -type f -print0 | xargs -0 -P"$JOBS" -I{} sh -c "objcopy --compress-debug-sections=zlib \"\$1\" \"\$1.tmp\" && mv \"\$1.tmp\" \"\$1\"; chmod 644 \"\$1\"" _ {}
+                        find "${DISTNAME}" -name "*.dbg" -type f -print0 | xargs -0 -P"$JOBS" -I{} sh -c "objcopy --compress-debug-sections=zlib \"\$1\" \"\$1.tmp\" && mv \"\$1.tmp\" \"\$1\" && chmod 644 \"\$1\"" _ {}
 
                         # Create .build-id tree for perf auto-discovery
                         mkdir -p "${DISTNAME}/usr/lib/debug/.build-id"
@@ -365,32 +365,35 @@ mkdir -p "$DISTSRC"
                         done
 
                         # Verify build-ids and debug links
-                        {
-                            find "${DISTNAME}/bin" -type f -executable -print0
-                            find "${DISTNAME}/lib" -type f -print0
-                        } | {
-                            verification_failed=0
-                            while IFS= read -r -d '' elf; do
-                                if file "$elf" | grep -q "ELF.*executable\|ELF.*shared object"; then
-                                    # Check for build-id
-                                    if ! readelf -n "$elf" 2>/dev/null | grep -q "Build ID"; then
-                                        echo "ERROR: No build-id found in $elf" >&2
-                                        verification_failed=1
-                                    fi
-
-                                    # Check for .gnu_debuglink
-                                    if ! readelf --string-dump=.gnu_debuglink "$elf" >/dev/null 2>&1; then
-                                        echo "ERROR: No .gnu_debuglink found in $elf" >&2
-                                        verification_failed=1
+                        verification_output=$(
+                            {
+                                find "${DISTNAME}/bin" -type f -executable -print0
+                                find "${DISTNAME}/lib" -type f -print0
+                            } | {
+                                verification_failed=0
+                                while IFS= read -r -d '' elf; do
+                                    if file "$elf" | grep -q "ELF.*executable\|ELF.*shared object"; then
+                                        # Check for build-id
+                                        if ! readelf -n "$elf" 2>/dev/null | grep -q "Build ID"; then
+                                            echo "ERROR: No build-id found in $elf" >&2
+                                            verification_failed=1
+                                        fi
+
+                                        # Check for .gnu_debuglink
+                                        if ! readelf --string-dump=.gnu_debuglink "$elf" >/dev/null 2>&1; then
+                                            echo "ERROR: No .gnu_debuglink found in $elf" >&2
+                                            verification_failed=1
+                                        fi
                                     fi
-                                fi
-                            done
-
-                            if [ "$verification_failed" -eq 1 ]; then
-                                echo "ERROR: Verification failed - some ELF files are missing build-ids or debug links" >&2
-                                exit 1
-                            fi
-                        }
+                                done
+                                exit "$verification_failed"
+                            } 2>&1
+                        )
+                        verification_status=$?
+                        if [ "$verification_status" -ne 0 ]; then
+                            echo "$verification_output" >&2
+                            exit 1
+                        fi
                         ;;
                 esac
                 ;;

From 466e2a2d1a69a108adacd97c7fe321b64679df13 Mon Sep 17 00:00:00 2001
From: Konstantin Akimov <knstqq@gmail.com>
Date: Wed, 5 Nov 2025 15:39:00 +0700
Subject: [PATCH 527/656] feat: introduce new bridge interface NetHandler to
 separate network logic and consensus

---
 src/init.cpp           |  7 ++++
 src/net_processing.cpp | 90 ++++++++++++++++++++++++++++++++++++++++++
 src/net_processing.h   | 37 ++++++++++++++++-
 3 files changed, 133 insertions(+), 1 deletion(-)

diff --git a/src/init.cpp b/src/init.cpp
index cadf16db45c6..efc42f73eee0 100644
--- a/src/init.cpp
+++ b/src/init.cpp
@@ -250,6 +250,9 @@ void Interrupt(NodeContext& node)
     if (node.active_ctx) {
         node.active_ctx->Interrupt();
     }
+    if (node.peerman) {
+        node.peerman->InterruptHandlers();
+    }
     if (node.llmq_ctx) {
         node.llmq_ctx->Interrupt();
     }
@@ -285,7 +288,10 @@ void PrepareShutdown(NodeContext& node)
     StopREST();
     StopRPC();
     StopHTTPServer();
+    if (node.peerman) node.peerman->RemoveHandlers();
+
     if (node.active_ctx) node.active_ctx->Stop();
+    if (node.peerman) node.peerman->StopHandlers();
     if (node.llmq_ctx) node.llmq_ctx->Stop();
 
     for (const auto& client : node.chain_clients) {
@@ -2288,6 +2294,7 @@ bool AppInitMain(NodeContext& node, interfaces::BlockAndHeaderTipInfo* tip_info)
     // ********************************************************* Step 10a: schedule Dash-specific tasks
 
     node.llmq_ctx->Start(*node.peerman);
+    node.peerman->StartHandlers();
     if (node.active_ctx) node.active_ctx->Start(*node.connman, *node.peerman);
 
     node.scheduler->scheduleEvery(std::bind(&CNetFulfilledRequestManager::DoMaintenance, std::ref(*node.netfulfilledman)), std::chrono::minutes{1});
diff --git a/src/net_processing.cpp b/src/net_processing.cpp
index f4514dbe61f9..62f9d8d94f41 100644
--- a/src/net_processing.cpp
+++ b/src/net_processing.cpp
@@ -637,6 +637,21 @@ class PeerManagerImpl final : public PeerManager
     void UpdateLastBlockAnnounceTime(NodeId node, int64_t time_in_seconds) override;
     bool IsBanned(NodeId pnode) override EXCLUSIVE_LOCKS_REQUIRED(cs_main, !m_peer_mutex);
     size_t GetRequestedObjectCount(NodeId nodeid) const override EXCLUSIVE_LOCKS_REQUIRED(::cs_main);
+
+    /** Implements external handlers logic */
+    void AddExtraHandler(std::unique_ptr<NetHandler>&& handler) override;
+    void RemoveHandlers() override;
+    void StartHandlers() override;
+    void StopHandlers() override;
+    void InterruptHandlers() override;
+
+    /** Implement PeerManagerInternal */
+    void PeerMisbehaving(const NodeId pnode, const int howmuch, const std::string& message = "") override EXCLUSIVE_LOCKS_REQUIRED(!m_peer_mutex);
+    void PeerEraseObjectRequest(const NodeId nodeid, const CInv& inv) override EXCLUSIVE_LOCKS_REQUIRED(::cs_main);
+    void PeerRelayInv(const CInv& inv) override EXCLUSIVE_LOCKS_REQUIRED(!m_peer_mutex);
+    void PeerRelayInvFiltered(const CInv& inv, const CTransaction& relatedTx) override EXCLUSIVE_LOCKS_REQUIRED(!m_peer_mutex);
+    void PeerRelayInvFiltered(const CInv& inv, const uint256& relatedTxHash) override EXCLUSIVE_LOCKS_REQUIRED(!m_peer_mutex);
+    void PeerAskPeersForTransaction(const uint256& txid) override EXCLUSIVE_LOCKS_REQUIRED(!m_peer_mutex);
 private:
     void _RelayTransaction(const uint256& txid) EXCLUSIVE_LOCKS_REQUIRED(cs_main, !m_peer_mutex);
 
@@ -1067,6 +1082,8 @@ class PeerManagerImpl final : public PeerManager
     std::vector<std::pair<uint256, CTransactionRef>> vExtraTxnForCompact GUARDED_BY(g_msgproc_mutex);
     /** Offset into vExtraTxnForCompact to insert the next tx */
     size_t vExtraTxnForCompactIt GUARDED_BY(g_msgproc_mutex) = 0;
+
+    std::vector<std::unique_ptr<NetHandler>> m_handlers;
 };
 
 // Keeps track of the time (in microseconds) when transactions were requested last time
@@ -1625,6 +1642,46 @@ size_t PeerManagerImpl::GetRequestedObjectCount(NodeId nodeid) const
     return state->m_object_download.m_object_process_time.size();
 }
 
+void PeerManagerImpl::AddExtraHandler(std::unique_ptr<NetHandler>&& handler)
+{
+    assert(handler != nullptr);
+    if (auto i = dynamic_cast<CValidationInterface*>(handler.get()); i != nullptr) {
+        RegisterValidationInterface(i);
+    }
+    m_handlers.emplace_back(std::move(handler));
+}
+
+void PeerManagerImpl::RemoveHandlers()
+{
+    InterruptHandlers();
+    StopHandlers();
+    m_handlers.clear();
+}
+
+void PeerManagerImpl::StartHandlers()
+{
+    for (auto& handler : m_handlers) {
+        handler->Start();
+    }
+}
+
+void PeerManagerImpl::StopHandlers()
+{
+    for (auto& handler : m_handlers) {
+        if (auto i = dynamic_cast<CValidationInterface*>(handler.get()); i != nullptr) {
+            UnregisterValidationInterface(i);
+        }
+        handler->Stop();
+    }
+}
+
+void PeerManagerImpl::InterruptHandlers()
+{
+    for (auto& handler : m_handlers) {
+        handler->Interrupt();
+    }
+}
+
 void PeerManagerImpl::UpdateLastBlockAnnounceTime(NodeId node, int64_t time_in_seconds)
 {
     LOCK(cs_main);
@@ -5395,6 +5452,9 @@ void PeerManagerImpl::ProcessMessage(
         }
 
         PostProcessMessage(m_llmq_ctx->isman->ProcessMessage(pfrom.GetId(), msg_type, vRecv), pfrom.GetId());
+        for (const auto& handler : m_handlers) {
+            handler->ProcessMessage(pfrom, msg_type, vRecv);
+        }
         return;
     }
 
@@ -6470,3 +6530,33 @@ bool PeerManagerImpl::SendMessages(CNode* pto)
     } // release cs_main
     return true;
 }
+
+void PeerManagerImpl::PeerMisbehaving(const NodeId pnode, const int howmuch, const std::string& message)
+{
+    Misbehaving(pnode, howmuch, message);
+}
+
+void PeerManagerImpl::PeerEraseObjectRequest(const NodeId nodeid, const CInv& inv)
+{
+    EraseObjectRequest(nodeid, inv);
+}
+
+void PeerManagerImpl::PeerRelayInv(const CInv& inv)
+{
+    RelayInv(inv);
+}
+
+void PeerManagerImpl::PeerRelayInvFiltered(const CInv& inv, const CTransaction& relatedTx)
+{
+    RelayInvFiltered(inv, relatedTx);
+}
+
+void PeerManagerImpl::PeerRelayInvFiltered(const CInv& inv, const uint256& relatedTxHash)
+{
+    RelayInvFiltered(inv, relatedTxHash);
+}
+
+void PeerManagerImpl::PeerAskPeersForTransaction(const uint256& txid)
+{
+    AskPeersForTransaction(txid);
+}
diff --git a/src/net_processing.h b/src/net_processing.h
index 8a4a4e7aba88..d15298401c24 100644
--- a/src/net_processing.h
+++ b/src/net_processing.h
@@ -55,7 +55,36 @@ struct CNodeStateStats {
     ServiceFlags their_services;
 };
 
-class PeerManager : public CValidationInterface, public NetEventsInterface
+class PeerManagerInternal
+{
+public:
+    virtual void PeerMisbehaving(const NodeId pnode, const int howmuch, const std::string& message = "") = 0;
+    virtual void PeerEraseObjectRequest(const NodeId nodeid, const CInv& inv) = 0;
+    virtual void PeerRelayInv(const CInv& inv) = 0;
+    virtual void PeerRelayInvFiltered(const CInv& inv, const CTransaction& relatedTx) = 0;
+    virtual void PeerRelayInvFiltered(const CInv& inv, const uint256& relatedTxHash) = 0;
+    virtual void PeerAskPeersForTransaction(const uint256& txid) = 0;
+};
+
+class NetHandler
+{
+public:
+    NetHandler(PeerManagerInternal* peer_manager) : m_peer_manager{Assert(peer_manager)} {}
+    virtual ~NetHandler() {
+        Interrupt();
+        Stop();
+    }
+
+    virtual void Start() {}
+    virtual void Stop() {}
+    virtual void Interrupt() {}
+    virtual void ProcessMessage(CNode& pfrom, const std::string& msg_type, CDataStream& vRecv) {}
+protected:
+    PeerManagerInternal* m_peer_manager;
+};
+
+
+class PeerManager : public CValidationInterface, public NetEventsInterface, public PeerManagerInternal
 {
 public:
     static std::unique_ptr<PeerManager> make(const CChainParams& chainparams, CConnman& connman, AddrMan& addrman,
@@ -133,6 +162,12 @@ class PeerManager : public CValidationInterface, public NetEventsInterface
     virtual bool IsBanned(NodeId pnode) = 0;
 
     virtual size_t GetRequestedObjectCount(NodeId nodeid) const = 0;
+
+    virtual void AddExtraHandler(std::unique_ptr<NetHandler>&& handler) = 0;
+    virtual void RemoveHandlers() = 0;
+    virtual void StartHandlers() = 0;
+    virtual void StopHandlers() = 0;
+    virtual void InterruptHandlers() = 0;
 };
 
 #endif // BITCOIN_NET_PROCESSING_H

From 90d7879f6c2a5b3421d6bd49a4fa7b274ed59137 Mon Sep 17 00:00:00 2001
From: Konstantin Akimov <knstqq@gmail.com>
Date: Tue, 11 Nov 2025 16:12:56 +0700
Subject: [PATCH 528/656] refactor: use NetHandler class to separate
 instantsend logic and network logic

---
 src/Makefile.am                         |   2 +
 src/init.cpp                            |   2 +
 src/instantsend/instantsend.cpp         | 363 ++++--------------------
 src/instantsend/instantsend.h           |  53 ++--
 src/instantsend/net_instantsend.cpp     | 268 +++++++++++++++++
 src/instantsend/net_instantsend.h       |  56 ++++
 src/llmq/context.cpp                    |   5 +-
 src/msg_result.h                        |   7 -
 src/net_processing.cpp                  |  14 -
 test/lint/lint-circular-dependencies.py |  15 +-
 10 files changed, 408 insertions(+), 377 deletions(-)
 create mode 100644 src/instantsend/net_instantsend.cpp
 create mode 100644 src/instantsend/net_instantsend.h

diff --git a/src/Makefile.am b/src/Makefile.am
index f9c03e364236..9a3b18c65482 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -252,6 +252,7 @@ BITCOIN_CORE_H = \
   instantsend/db.h \
   instantsend/instantsend.h \
   instantsend/lock.h \
+  instantsend/net_instantsend.h \
   instantsend/signing.h \
   kernel/coinstats.h \
   key.h \
@@ -523,6 +524,7 @@ libbitcoin_node_a_SOURCES = \
   instantsend/db.cpp \
   instantsend/instantsend.cpp \
   instantsend/lock.cpp \
+  instantsend/net_instantsend.cpp \
   instantsend/signing.cpp \
   kernel/coinstats.cpp \
   llmq/blockprocessor.cpp \
diff --git a/src/init.cpp b/src/init.cpp
index efc42f73eee0..c0c35b36aa54 100644
--- a/src/init.cpp
+++ b/src/init.cpp
@@ -87,6 +87,7 @@
 #include <flat-database.h>
 #include <governance/governance.h>
 #include <instantsend/instantsend.h>
+#include <instantsend/net_instantsend.h>
 #include <llmq/context.h>
 #include <llmq/dkgsessionmgr.h>
 #include <llmq/options.h>
@@ -2199,6 +2200,7 @@ bool AppInitMain(NodeContext& node, interfaces::BlockAndHeaderTipInfo* tip_info)
         g_active_notification_interface = std::make_unique<ActiveNotificationInterface>(*node.active_ctx, *node.mn_activeman);
         RegisterValidationInterface(g_active_notification_interface.get());
     }
+    node.peerman->AddExtraHandler(std::make_unique<NetInstantSend>(node.peerman.get(), *node.llmq_ctx->isman, *node.llmq_ctx->qman, chainman.ActiveChainstate()));
 
     // ********************************************************* Step 7d: Setup other Dash services
 
diff --git a/src/instantsend/instantsend.cpp b/src/instantsend/instantsend.cpp
index 293d35928e3c..7367535259a2 100644
--- a/src/instantsend/instantsend.cpp
+++ b/src/instantsend/instantsend.cpp
@@ -4,25 +4,17 @@
 
 #include <instantsend/instantsend.h>
 
+#include <chainlock/chainlock.h>
 #include <chainparams.h>
 #include <consensus/validation.h>
-#include <net_processing.h>
-#include <node/blockstorage.h>
-#include <txmempool.h>
-#include <util/thread.h>
-#include <validation.h>
-
-#include <bls/bls_batchverifier.h>
-#include <chainlock/chainlock.h>
 #include <instantsend/signing.h>
-#include <llmq/commitment.h>
-#include <llmq/quorums.h>
-#include <llmq/signhash.h>
 #include <masternode/sync.h>
+#include <node/blockstorage.h>
 #include <spork.h>
 #include <stats/client.h>
-
-#include <cxxtimer.hpp>
+#include <txmempool.h>
+#include <validation.h>
+#include <validationinterface.h>
 
 // Forward declaration to break dependency over node/transaction.h
 namespace node {
@@ -56,100 +48,26 @@ Uint256HashSet GetIdsFromLockable(const std::vector<T>& vec)
 }
 } // anonymous namespace
 
-CInstantSendManager::CInstantSendManager(CChainLocksHandler& _clhandler, CChainState& chainstate, CQuorumManager& _qman,
+CInstantSendManager::CInstantSendManager(CChainLocksHandler& _clhandler, CChainState& chainstate,
                                          CSigningManager& _sigman, CSporkManager& sporkman, CTxMemPool& _mempool,
                                          const CMasternodeSync& mn_sync, const util::DbWrapperParams& db_params) :
     db{db_params},
     clhandler{_clhandler},
     m_chainstate{chainstate},
-    qman{_qman},
     sigman{_sigman},
     spork_manager{sporkman},
     mempool{_mempool},
     m_mn_sync{mn_sync}
 {
-    workInterrupt.reset();
 }
 
 CInstantSendManager::~CInstantSendManager() = default;
 
-void CInstantSendManager::Start(PeerManager& peerman)
-{
-    // can't start new thread if we have one running already
-    if (workThread.joinable()) {
-        assert(false);
-    }
+bool ShouldReportISLockTiming() { return g_stats_client->active() || LogAcceptDebug(BCLog::INSTANTSEND); }
 
-    workThread = std::thread(&util::TraceThread, "isman", [this, &peerman] { WorkThreadMain(peerman); });
-
-    if (auto signer = m_signer.load(std::memory_order_acquire); signer) {
-        signer->Start();
-    }
-}
-
-void CInstantSendManager::Stop()
-{
-    if (auto signer = m_signer.load(std::memory_order_acquire); signer) {
-        signer->Stop();
-    }
-
-    // make sure to call InterruptWorkerThread() first
-    if (!workInterrupt) {
-        assert(false);
-    }
-
-    if (workThread.joinable()) {
-        workThread.join();
-    }
-}
-
-bool ShouldReportISLockTiming() {
-    return g_stats_client->active() || LogAcceptDebug(BCLog::INSTANTSEND);
-}
-
-MessageProcessingResult CInstantSendManager::ProcessMessage(NodeId from, std::string_view msg_type, CDataStream& vRecv)
+void CInstantSendManager::EnqueueInstantSendLock(NodeId from, const uint256& hash,
+                                                 const std::shared_ptr<instantsend::InstantSendLock>& islock)
 {
-    if (!IsInstantSendEnabled() || msg_type != NetMsgType::ISDLOCK) {
-        return {};
-    }
-
-    const auto islock = std::make_shared<instantsend::InstantSendLock>();
-    vRecv >> *islock;
-
-    auto hash = ::SerializeHash(*islock);
-
-    MessageProcessingResult ret{};
-    ret.m_to_erase = CInv{MSG_ISDLOCK, hash};
-
-    if (!islock->TriviallyValid()) {
-        ret.m_error = MisbehavingError{100};
-        return ret;
-    }
-
-    const auto blockIndex = WITH_LOCK(::cs_main, return m_chainstate.m_blockman.LookupBlockIndex(islock->cycleHash));
-    if (blockIndex == nullptr) {
-        // Maybe we don't have the block yet or maybe some peer spams invalid values for cycleHash
-        ret.m_error = MisbehavingError{1};
-        return ret;
-    }
-
-    // Deterministic islocks MUST use rotation based llmq
-    auto llmqType = Params().GetConsensus().llmqTypeDIP0024InstantSend;
-    const auto& llmq_params_opt = Params().GetLLMQ(llmqType);
-    assert(llmq_params_opt);
-    if (blockIndex->nHeight % llmq_params_opt->dkgInterval != 0) {
-        ret.m_error = MisbehavingError{100};
-        return ret;
-    }
-
-    if (WITH_LOCK(cs_pendingLocks, return pendingInstantSendLocks.count(hash) || pendingNoTxInstantSendLocks.count(hash)) ||
-        db.KnownInstantSendLock(hash)) {
-        return ret;
-    }
-
-    LogPrint(BCLog::INSTANTSEND, "CInstantSendManager::%s -- txid=%s, islock=%s: received islock, peer=%d\n", __func__,
-             islock->txid.ToString(), hash.ToString(), from);
-
     if (ShouldReportISLockTiming()) {
         auto time_diff = [&]() -> int64_t {
             LOCK(cs_timingsTxSeen);
@@ -169,190 +87,39 @@ MessageProcessingResult CInstantSendManager::ProcessMessage(NodeId from, std::st
 
     LOCK(cs_pendingLocks);
     pendingInstantSendLocks.emplace(hash, instantsend::PendingISLockFromPeer{from, islock});
-    return ret;
 }
 
-instantsend::PendingState CInstantSendManager::ProcessPendingInstantSendLocks()
+instantsend::PendingState CInstantSendManager::FetchPendingLocks()
 {
-    std::vector<std::pair<uint256, instantsend::PendingISLockFromPeer>> pend;
     instantsend::PendingState ret;
 
-    if (!IsInstantSendEnabled()) {
-        return ret;
-    }
-
-    {
-        LOCK(cs_pendingLocks);
-        // only process a max 32 locks at a time to avoid duplicate verification of recovered signatures which have been
-        // verified by CSigningManager in parallel
-        const size_t maxCount = 32;
-        // The keys of the removed values are temporaily stored here to avoid invalidating an iterator
-        std::vector<uint256> removed;
-        removed.reserve(maxCount);
-        pend.reserve(maxCount);
-
-        for (const auto& [islockHash, nodeid_islptr_pair] : pendingInstantSendLocks) {
-            // Check if we've reached max count
-            if (pend.size() >= maxCount) {
-                ret.m_pending_work = true;
-                break;
-            }
-            pend.emplace_back(islockHash, std::move(nodeid_islptr_pair));
-            removed.emplace_back(islockHash);
-        }
-
-        for (const auto& islockHash : removed) {
-            pendingInstantSendLocks.erase(islockHash);
+    LOCK(cs_pendingLocks);
+    // only process a max 32 locks at a time to avoid duplicate verification of recovered signatures which have been
+    // verified by CSigningManager in parallel
+    const size_t maxCount = 32;
+    // The keys of the removed values are temporaily stored here to avoid invalidating an iterator
+    std::vector<uint256> removed;
+    removed.reserve(std::min(maxCount, pendingInstantSendLocks.size()));
+
+    for (const auto& [islockHash, nodeid_islptr_pair] : pendingInstantSendLocks) {
+        // Check if we've reached max count
+        if (ret.m_pending_is.size() >= maxCount) {
+            ret.m_pending_work = true;
+            break;
         }
+        ret.m_pending_is.emplace_back(islockHash, std::move(nodeid_islptr_pair));
+        removed.emplace_back(islockHash);
     }
 
-    if (pend.empty()) {
-        ret.m_pending_work = false;
-        return ret;
-    }
-
-    // TODO Investigate if leaving this is ok
-    auto llmqType = Params().GetConsensus().llmqTypeDIP0024InstantSend;
-    const auto& llmq_params_opt = Params().GetLLMQ(llmqType);
-    assert(llmq_params_opt);
-    const auto& llmq_params = llmq_params_opt.value();
-    auto dkgInterval = llmq_params.dkgInterval;
-
-    // First check against the current active set and don't ban
-    auto badISLocks = ProcessPendingInstantSendLocks(llmq_params, /*signOffset=*/0, /*ban=*/false, pend, ret.m_peer_activity);
-    if (!badISLocks.empty()) {
-        LogPrint(BCLog::INSTANTSEND, "CInstantSendManager::%s -- doing verification on old active set\n", __func__);
-
-        // filter out valid IS locks from "pend" - keep only bad ones
-        std::vector<std::pair<uint256, instantsend::PendingISLockFromPeer>> filteredPend;
-        filteredPend.reserve(badISLocks.size());
-        for (auto& p : pend) {
-            if (badISLocks.contains(p.first)) {
-                filteredPend.push_back(std::move(p));
-            }
-        }
-
-        // Now check against the previous active set and perform banning if this fails
-        ProcessPendingInstantSendLocks(llmq_params, dkgInterval, /*ban=*/true, filteredPend, ret.m_peer_activity);
+    for (const auto& islockHash : removed) {
+        pendingInstantSendLocks.erase(islockHash);
     }
 
     return ret;
 }
 
-Uint256HashSet CInstantSendManager::ProcessPendingInstantSendLocks(
-    const Consensus::LLMQParams& llmq_params, int signOffset, bool ban,
-    const std::vector<std::pair<uint256, instantsend::PendingISLockFromPeer>>& pend,
-    std::vector<std::pair<NodeId, MessageProcessingResult>>& peer_activity)
-{
-    CBLSBatchVerifier<NodeId, uint256> batchVerifier(false, true, 8);
-    Uint256HashMap<CRecoveredSig> recSigs;
-
-    size_t verifyCount = 0;
-    size_t alreadyVerified = 0;
-    for (const auto& p : pend) {
-        const auto& hash = p.first;
-        auto nodeId = p.second.node_id;
-        const auto& islock = p.second.islock;
-
-        if (batchVerifier.badSources.count(nodeId)) {
-            continue;
-        }
-
-        if (!islock->sig.Get().IsValid()) {
-            batchVerifier.badSources.emplace(nodeId);
-            continue;
-        }
-
-        auto id = islock->GetRequestId();
-
-        // no need to verify an ISLOCK if we already have verified the recovered sig that belongs to it
-        if (sigman.HasRecoveredSig(llmq_params.type, id, islock->txid)) {
-            alreadyVerified++;
-            continue;
-        }
-
-        const auto blockIndex = WITH_LOCK(::cs_main, return m_chainstate.m_blockman.LookupBlockIndex(islock->cycleHash));
-        if (blockIndex == nullptr) {
-            batchVerifier.badSources.emplace(nodeId);
-            continue;
-        }
-
-        int nSignHeight{-1};
-        const auto dkgInterval = llmq_params.dkgInterval;
-        if (blockIndex->nHeight + dkgInterval < m_chainstate.m_chain.Height()) {
-            nSignHeight = blockIndex->nHeight + dkgInterval - 1;
-        }
-        // For RegTest non-rotating quorum cycleHash has directly quorum hash
-        auto quorum = llmq_params.useRotation ? llmq::SelectQuorumForSigning(llmq_params, m_chainstate.m_chain, qman,
-                                                                             id, nSignHeight, signOffset)
-                                              : qman.GetQuorum(llmq_params.type, islock->cycleHash);
-
-        if (!quorum) {
-            // should not happen, but if one fails to select, all others will also fail to select
-            return {};
-        }
-        uint256 signHash = llmq::SignHash{llmq_params.type, quorum->qc->quorumHash, id, islock->txid}.Get();
-        batchVerifier.PushMessage(nodeId, hash, signHash, islock->sig.Get(), quorum->qc->quorumPublicKey);
-        verifyCount++;
-
-        // We can reconstruct the CRecoveredSig objects from the islock and pass it to the signing manager, which
-        // avoids unnecessary double-verification of the signature. We however only do this when verification here
-        // turns out to be good (which is checked further down)
-        if (!sigman.HasRecoveredSigForId(llmq_params.type, id)) {
-            recSigs.try_emplace(hash,
-                                CRecoveredSig(llmq_params.type, quorum->qc->quorumHash, id, islock->txid, islock->sig));
-        }
-    }
-
-    cxxtimer::Timer verifyTimer(true);
-    batchVerifier.Verify();
-    verifyTimer.stop();
-
-    LogPrint(BCLog::INSTANTSEND, "CInstantSendManager::%s -- verified locks. count=%d, alreadyVerified=%d, vt=%d, nodes=%d\n", __func__,
-            verifyCount, alreadyVerified, verifyTimer.count(), batchVerifier.GetUniqueSourceCount());
-
-    Uint256HashSet badISLocks;
-
-    if (ban && !batchVerifier.badSources.empty()) {
-        LOCK(::cs_main);
-        for (const auto& nodeId : batchVerifier.badSources) {
-            // Let's not be too harsh, as the peer might simply be unlucky and might have sent us an old lock which
-            // does not validate anymore due to changed quorums
-            peer_activity.emplace_back(nodeId, MisbehavingError{20});
-        }
-    }
-    for (const auto& p : pend) {
-        const auto& hash = p.first;
-        auto nodeId = p.second.node_id;
-        const auto& islock = p.second.islock;
-
-        if (batchVerifier.badMessages.count(hash)) {
-            LogPrint(BCLog::INSTANTSEND, "CInstantSendManager::%s -- txid=%s, islock=%s: invalid sig in islock, peer=%d\n",
-                     __func__, islock->txid.ToString(), hash.ToString(), nodeId);
-            badISLocks.emplace(hash);
-            continue;
-        }
-
-        peer_activity.emplace_back(nodeId, ProcessInstantSendLock(nodeId, hash, islock));
-
-        // See comment further on top. We pass a reconstructed recovered sig to the signing manager to avoid
-        // double-verification of the sig.
-        auto it = recSigs.find(hash);
-        if (it != recSigs.end()) {
-            auto recSig = std::make_shared<CRecoveredSig>(std::move(it->second));
-            if (!sigman.HasRecoveredSigForId(llmq_params.type, recSig->getId())) {
-                LogPrint(BCLog::INSTANTSEND, "CInstantSendManager::%s -- txid=%s, islock=%s: passing reconstructed recSig to signing mgr, peer=%d\n", __func__,
-                         islock->txid.ToString(), hash.ToString(), nodeId);
-                sigman.PushReconstructedRecoveredSig(recSig);
-            }
-        }
-    }
-
-    return badISLocks;
-}
-
-MessageProcessingResult CInstantSendManager::ProcessInstantSendLock(NodeId from, const uint256& hash,
-                                                                    const instantsend::InstantSendLockPtr& islock)
+std::variant<uint256, CTransactionRef, std::monostate> CInstantSendManager::ProcessInstantSendLock(
+    NodeId from, const uint256& hash, const instantsend::InstantSendLockPtr& islock)
 {
     LogPrint(BCLog::INSTANTSEND, "CInstantSendManager::%s -- txid=%s, islock=%s: processing islock, peer=%d\n",
              __func__, islock->txid.ToString(), hash.ToString(), from);
@@ -361,12 +128,12 @@ MessageProcessingResult CInstantSendManager::ProcessInstantSendLock(NodeId from,
         signer->ClearLockFromQueue(islock);
     }
     if (db.KnownInstantSendLock(hash)) {
-        return {};
+        return std::monostate{};
     }
 
     if (const auto sameTxIsLock = db.GetInstantSendLockByTxid(islock->txid)) {
         // can happen, nothing to do
-        return {};
+        return std::monostate{};
     }
     for (const auto& in : islock->inputs) {
         const auto sameOutpointIsLock = db.GetInstantSendLockByInput(in);
@@ -389,7 +156,7 @@ MessageProcessingResult CInstantSendManager::ProcessInstantSendLock(NodeId from,
         if (pindexMined != nullptr && clhandler.HasChainLock(pindexMined->nHeight, pindexMined->GetBlockHash())) {
             LogPrint(BCLog::INSTANTSEND, "CInstantSendManager::%s -- txlock=%s, islock=%s: dropping islock as it already got a ChainLock in block %s, peer=%d\n", __func__,
                      islock->txid.ToString(), hash.ToString(), hashBlock.ToString(), from);
-            return {};
+            return std::monostate{};
         }
     }
 
@@ -420,17 +187,10 @@ MessageProcessingResult CInstantSendManager::ProcessInstantSendLock(NodeId from,
         mempool.AddTransactionsUpdated(1);
     }
 
-    MessageProcessingResult ret{};
-    CInv inv(MSG_ISDLOCK, hash);
     if (found_transaction) {
-        ret.m_inv_filter = std::make_pair(inv, tx);
-    } else {
-        // we don't have the TX yet, so we only filter based on txid. Later when that TX arrives, we will re-announce
-        // with the TX taken into account.
-        ret.m_inv_filter = std::make_pair(inv, islock->txid);
-        ret.m_request_tx = islock->txid;
+        return tx;
     }
-    return ret;
+    return islock->txid;
 }
 
 void CInstantSendManager::TransactionAddedToMempool(const CTransactionRef& tx)
@@ -603,6 +363,24 @@ void CInstantSendManager::RemoveNonLockedTx(const uint256& txid, bool retryChild
              __func__, txid.ToString(), retryChildren, retryChildrenCount);
 }
 
+std::vector<CTransactionRef> CInstantSendManager::PrepareTxToRetry()
+{
+    std::vector<CTransactionRef> txns{};
+
+    LOCK2(cs_nonLocked, cs_pendingRetry);
+    if (pendingRetryTxs.empty()) return txns;
+    txns.reserve(pendingRetryTxs.size());
+    for (const auto& txid : pendingRetryTxs) {
+        if (auto it = nonLockedTxs.find(txid); it != nonLockedTxs.end()) {
+            const auto& [_, tx_info] = *it;
+            if (tx_info.tx) {
+                txns.push_back(tx_info.tx);
+            }
+        }
+    }
+    return txns;
+}
+
 void CInstantSendManager::RemoveConflictedTx(const CTransaction& tx)
 {
     RemoveNonLockedTx(tx.GetHash(), false);
@@ -925,43 +703,6 @@ size_t CInstantSendManager::GetInstantSendLockCount() const
     return db.GetInstantSendLockCount();
 }
 
-void CInstantSendManager::WorkThreadMain(PeerManager& peerman)
-{
-    while (!workInterrupt) {
-        bool fMoreWork = [&]() -> bool {
-            if (!IsInstantSendEnabled()) return false;
-            auto [more_work, peer_activity] = ProcessPendingInstantSendLocks();
-            for (auto& [node_id, mpr] : peer_activity) {
-                peerman.PostProcessMessage(std::move(mpr), node_id);
-            }
-            auto signer = m_signer.load(std::memory_order_acquire);
-            if (!signer) return more_work;
-            // Construct set of non-locked transactions that are pending to retry
-            std::vector<CTransactionRef> txns{};
-            {
-                LOCK2(cs_nonLocked, cs_pendingRetry);
-                if (pendingRetryTxs.empty()) return more_work;
-                txns.reserve(pendingRetryTxs.size());
-                for (const auto& txid : pendingRetryTxs) {
-                    if (auto it = nonLockedTxs.find(txid); it != nonLockedTxs.end()) {
-                        const auto& [_, tx_info] = *it;
-                        if (tx_info.tx) {
-                            txns.push_back(tx_info.tx);
-                        }
-                    }
-                }
-            }
-            // Retry processing them
-            signer->ProcessPendingRetryLockTxs(txns);
-            return more_work;
-        }();
-
-        if (!fMoreWork && !workInterrupt.sleep_for(std::chrono::milliseconds(100))) {
-            return;
-        }
-    }
-}
-
 bool CInstantSendManager::IsInstantSendEnabled() const
 {
     return !fReindex && !fImporting && spork_manager.IsSporkActive(SPORK_2_INSTANTSEND_ENABLED);
diff --git a/src/instantsend/instantsend.h b/src/instantsend/instantsend.h
index ebe6b4cb48b2..6cbba2cc2706 100644
--- a/src/instantsend/instantsend.h
+++ b/src/instantsend/instantsend.h
@@ -5,21 +5,21 @@
 #ifndef BITCOIN_INSTANTSEND_INSTANTSEND_H
 #define BITCOIN_INSTANTSEND_INSTANTSEND_H
 
+#include <instantsend/db.h>
+#include <instantsend/lock.h>
+#include <instantsend/signing.h>
+
 #include <net_types.h>
 #include <primitives/transaction.h>
 #include <protocol.h>
 #include <sync.h>
 #include <threadsafety.h>
-#include <util/threadinterrupt.h>
-
-#include <instantsend/db.h>
-#include <instantsend/lock.h>
-#include <instantsend/signing.h>
 #include <unordered_lru_cache.h>
 
 #include <atomic>
 #include <unordered_map>
 #include <unordered_set>
+#include <variant>
 #include <vector>
 
 class CBlockIndex;
@@ -28,7 +28,6 @@ class CDataStream;
 class CMasternodeSync;
 class CSporkManager;
 class CTxMemPool;
-class PeerManager;
 namespace Consensus {
 struct LLMQParams;
 } // namespace Consensus
@@ -46,13 +45,12 @@ struct PendingISLockFromPeer {
 
 struct PendingState {
     bool m_pending_work{false};
-    std::vector<std::pair<NodeId, MessageProcessingResult>> m_peer_activity{};
+    std::vector<std::pair<uint256, PendingISLockFromPeer>> m_pending_is;
 };
 } // namespace instantsend
 
 namespace llmq {
 class CChainLocksHandler;
-class CQuorumManager;
 class CSigningManager;
 
 class CInstantSendManager final : public instantsend::InstantSendSignerParent
@@ -62,7 +60,6 @@ class CInstantSendManager final : public instantsend::InstantSendSignerParent
 
     CChainLocksHandler& clhandler;
     CChainState& m_chainstate;
-    CQuorumManager& qman;
     CSigningManager& sigman;
     CSporkManager& spork_manager;
     CTxMemPool& mempool;
@@ -70,9 +67,6 @@ class CInstantSendManager final : public instantsend::InstantSendSignerParent
 
     std::atomic<instantsend::InstantSendSigner*> m_signer{nullptr};
 
-    std::thread workThread;
-    CThreadInterrupt workInterrupt;
-
     mutable Mutex cs_pendingLocks;
     // Incoming and not verified yet
     Uint256HashMap<instantsend::PendingISLockFromPeer> pendingInstantSendLocks GUARDED_BY(cs_pendingLocks);
@@ -101,9 +95,9 @@ class CInstantSendManager final : public instantsend::InstantSendSignerParent
     CInstantSendManager() = delete;
     CInstantSendManager(const CInstantSendManager&) = delete;
     CInstantSendManager& operator=(const CInstantSendManager&) = delete;
-    explicit CInstantSendManager(CChainLocksHandler& _clhandler, CChainState& chainstate, CQuorumManager& _qman,
-                                 CSigningManager& _sigman, CSporkManager& sporkman, CTxMemPool& _mempool,
-                                 const CMasternodeSync& mn_sync, const util::DbWrapperParams& db_params);
+    explicit CInstantSendManager(CChainLocksHandler& _clhandler, CChainState& chainstate, CSigningManager& _sigman,
+                                 CSporkManager& sporkman, CTxMemPool& _mempool, const CMasternodeSync& mn_sync,
+                                 const util::DbWrapperParams& db_params);
     ~CInstantSendManager();
 
     void ConnectSigner(gsl::not_null<instantsend::InstantSendSigner*> signer)
@@ -114,22 +108,9 @@ class CInstantSendManager final : public instantsend::InstantSendSignerParent
     }
     void DisconnectSigner() { m_signer.store(nullptr, std::memory_order_release); }
 
-    void Start(PeerManager& peerman);
-    void Stop();
-    void InterruptWorkerThread() { workInterrupt(); };
+    instantsend::InstantSendSigner* Signer() const { return m_signer.load(); }
 
 private:
-    instantsend::PendingState ProcessPendingInstantSendLocks()
-        EXCLUSIVE_LOCKS_REQUIRED(!cs_nonLocked, !cs_pendingLocks, !cs_pendingRetry);
-
-    Uint256HashSet ProcessPendingInstantSendLocks(const Consensus::LLMQParams& llmq_params, int signOffset, bool ban,
-                                                  const std::vector<std::pair<uint256, instantsend::PendingISLockFromPeer>>& pend,
-                                                  std::vector<std::pair<NodeId, MessageProcessingResult>>& peer_activity)
-        EXCLUSIVE_LOCKS_REQUIRED(!cs_nonLocked, !cs_pendingLocks, !cs_pendingRetry);
-    MessageProcessingResult ProcessInstantSendLock(NodeId from, const uint256& hash,
-                                                   const instantsend::InstantSendLockPtr& islock)
-        EXCLUSIVE_LOCKS_REQUIRED(!cs_nonLocked, !cs_pendingLocks, !cs_pendingRetry);
-
     void AddNonLockedTx(const CTransactionRef& tx, const CBlockIndex* pindexMined)
         EXCLUSIVE_LOCKS_REQUIRED(!cs_nonLocked, !cs_pendingLocks, !cs_timingsTxSeen);
     void RemoveNonLockedTx(const uint256& txid, bool retryChildren)
@@ -143,9 +124,6 @@ class CInstantSendManager final : public instantsend::InstantSendSignerParent
     void ResolveBlockConflicts(const uint256& islockHash, const instantsend::InstantSendLock& islock)
         EXCLUSIVE_LOCKS_REQUIRED(!cs_nonLocked, !cs_pendingLocks, !cs_pendingRetry);
 
-    void WorkThreadMain(PeerManager& peerman)
-        EXCLUSIVE_LOCKS_REQUIRED(!cs_nonLocked, !cs_pendingLocks, !cs_pendingRetry);
-
     void HandleFullyConfirmedBlock(const CBlockIndex* pindex)
         EXCLUSIVE_LOCKS_REQUIRED(!cs_nonLocked, !cs_pendingRetry);
 
@@ -154,8 +132,17 @@ class CInstantSendManager final : public instantsend::InstantSendSignerParent
     bool IsWaitingForTx(const uint256& txHash) const EXCLUSIVE_LOCKS_REQUIRED(!cs_pendingLocks);
     instantsend::InstantSendLockPtr GetConflictingLock(const CTransaction& tx) const override;
 
-    [[nodiscard]] MessageProcessingResult ProcessMessage(NodeId from, std::string_view msg_type, CDataStream& vRecv)
+    /* Helpers for communications between CInstantSendManager & NetInstantSend */
+    // This helper returns up to 32 pending locks and remove them from queue of pending
+    [[nodiscard]] instantsend::PendingState FetchPendingLocks() EXCLUSIVE_LOCKS_REQUIRED(!cs_pendingLocks);
+    void EnqueueInstantSendLock(NodeId from, const uint256& hash, const std::shared_ptr<instantsend::InstantSendLock>& islock)
         EXCLUSIVE_LOCKS_REQUIRED(!cs_pendingLocks);
+    [[nodiscard]] std::vector<CTransactionRef> PrepareTxToRetry()
+        EXCLUSIVE_LOCKS_REQUIRED(!cs_nonLocked, !cs_pendingRetry);
+    CSigningManager& Sigman() { return sigman; }
+    [[nodiscard]] std::variant<uint256, CTransactionRef, std::monostate> ProcessInstantSendLock(
+        NodeId from, const uint256& hash, const instantsend::InstantSendLockPtr& islock)
+        EXCLUSIVE_LOCKS_REQUIRED(!cs_nonLocked, !cs_pendingLocks, !cs_pendingRetry);
 
     void TransactionAddedToMempool(const CTransactionRef& tx)
         EXCLUSIVE_LOCKS_REQUIRED(!cs_nonLocked, !cs_pendingLocks, !cs_pendingRetry, !cs_timingsTxSeen);
diff --git a/src/instantsend/net_instantsend.cpp b/src/instantsend/net_instantsend.cpp
new file mode 100644
index 000000000000..0807878d3411
--- /dev/null
+++ b/src/instantsend/net_instantsend.cpp
@@ -0,0 +1,268 @@
+// Copyright (c) 2025 The Dash Core developers
+// Distributed under the MIT software license, see the accompanying
+// file COPYING or http://www.opensource.org/licenses/mit-license.php.
+
+#include <instantsend/net_instantsend.h>
+
+#include <bls/bls_batchverifier.h>
+#include <cxxtimer.hpp>
+#include <instantsend/instantsend.h>
+#include <llmq/commitment.h>
+#include <llmq/quorums.h>
+#include <llmq/signhash.h>
+#include <llmq/signing.h>
+#include <util/thread.h>
+#include <validation.h>
+
+void NetInstantSend::ProcessMessage(CNode& pfrom, const std::string& msg_type, CDataStream& vRecv)
+{
+    if (msg_type != NetMsgType::ISDLOCK) {
+        return;
+    }
+
+    if (!m_is_manager.IsInstantSendEnabled()) return;
+
+    const auto islock = std::make_shared<instantsend::InstantSendLock>();
+    vRecv >> *islock;
+
+    uint256 hash = ::SerializeHash(*islock);
+
+    WITH_LOCK(::cs_main, m_peer_manager->PeerEraseObjectRequest(pfrom.GetId(), CInv{MSG_ISDLOCK, hash}));
+
+    if (!islock->TriviallyValid()) {
+        m_peer_manager->PeerMisbehaving(pfrom.GetId(), 100);
+        return;
+    }
+
+    int block_height = [this, islock] {
+        const auto blockIndex = WITH_LOCK(::cs_main, return m_chainstate.m_blockman.LookupBlockIndex(islock->cycleHash));
+        if (blockIndex == nullptr) {
+            return -1;
+        }
+        return blockIndex->nHeight;
+    }();
+    if (block_height < 0) {
+        // Maybe we don't have the block yet or maybe some peer spams invalid values for cycleHash
+        m_peer_manager->PeerMisbehaving(pfrom.GetId(), 1);
+        return;
+    }
+
+    // Deterministic islocks MUST use rotation based llmq
+    auto llmqType = Params().GetConsensus().llmqTypeDIP0024InstantSend;
+    const auto& llmq_params_opt = Params().GetLLMQ(llmqType);
+    assert(llmq_params_opt);
+    if (block_height % llmq_params_opt->dkgInterval != 0) {
+        m_peer_manager->PeerMisbehaving(pfrom.GetId(), 100);
+        return;
+    }
+
+    if (!m_is_manager.AlreadyHave(CInv{MSG_ISDLOCK, hash})) {
+        LogPrint(BCLog::INSTANTSEND, "CInstantSendManager::%s -- txid=%s, islock=%s: received islock, peer=%d\n",
+                 __func__, islock->txid.ToString(), hash.ToString(), pfrom.GetId());
+
+        m_is_manager.EnqueueInstantSendLock(pfrom.GetId(), hash, islock);
+    }
+}
+
+void NetInstantSend::Start()
+{
+    // can't start new thread if we have one running already
+    if (workThread.joinable()) {
+        assert(false);
+    }
+
+    workThread = std::thread(&util::TraceThread, "isman", [this] { WorkThreadMain(); });
+
+    if (auto signer = m_is_manager.Signer(); signer) {
+        signer->Start();
+    }
+}
+
+void NetInstantSend::Stop()
+{
+    if (auto signer = m_is_manager.Signer(); signer) {
+        signer->Stop();
+    }
+
+    // make sure to call Interrupt() first
+    if (!workInterrupt) {
+        assert(false);
+    }
+
+    if (workThread.joinable()) {
+        workThread.join();
+    }
+}
+
+Uint256HashSet NetInstantSend::ProcessPendingInstantSendLocks(
+    const Consensus::LLMQParams& llmq_params, int signOffset, bool ban,
+    const std::vector<std::pair<uint256, instantsend::PendingISLockFromPeer>>& pend)
+{
+    CBLSBatchVerifier<NodeId, uint256> batchVerifier(false, true, 8);
+    Uint256HashMap<llmq::CRecoveredSig> recSigs;
+
+    size_t verifyCount = 0;
+    size_t alreadyVerified = 0;
+    for (const auto& p : pend) {
+        const auto& hash = p.first;
+        auto nodeId = p.second.node_id;
+        const auto& islock = p.second.islock;
+
+        if (batchVerifier.badSources.count(nodeId)) {
+            continue;
+        }
+
+        if (!islock->sig.Get().IsValid()) {
+            batchVerifier.badSources.emplace(nodeId);
+            continue;
+        }
+
+        auto id = islock->GetRequestId();
+
+        // no need to verify an ISLOCK if we already have verified the recovered sig that belongs to it
+        if (m_is_manager.Sigman().HasRecoveredSig(llmq_params.type, id, islock->txid)) {
+            alreadyVerified++;
+            continue;
+        }
+
+        const auto blockIndex = WITH_LOCK(::cs_main, return m_chainstate.m_blockman.LookupBlockIndex(islock->cycleHash));
+        if (blockIndex == nullptr) {
+            batchVerifier.badSources.emplace(nodeId);
+            continue;
+        }
+
+        int nSignHeight{-1};
+        const auto dkgInterval = llmq_params.dkgInterval;
+        if (blockIndex->nHeight + dkgInterval < m_chainstate.m_chain.Height()) {
+            nSignHeight = blockIndex->nHeight + dkgInterval - 1;
+        }
+        // For RegTest non-rotating quorum cycleHash has directly quorum hash
+        auto quorum = llmq_params.useRotation ? llmq::SelectQuorumForSigning(llmq_params, m_chainstate.m_chain, m_qman,
+                                                                             id, nSignHeight, signOffset)
+                                              : m_qman.GetQuorum(llmq_params.type, islock->cycleHash);
+
+        if (!quorum) {
+            // should not happen, but if one fails to select, all others will also fail to select
+            return {};
+        }
+        uint256 signHash = llmq::SignHash{llmq_params.type, quorum->qc->quorumHash, id, islock->txid}.Get();
+        batchVerifier.PushMessage(nodeId, hash, signHash, islock->sig.Get(), quorum->qc->quorumPublicKey);
+        verifyCount++;
+
+        // We can reconstruct the CRecoveredSig objects from the islock and pass it to the signing manager, which
+        // avoids unnecessary double-verification of the signature. We however only do this when verification here
+        // turns out to be good (which is checked further down)
+        if (!m_is_manager.Sigman().HasRecoveredSigForId(llmq_params.type, id)) {
+            recSigs.try_emplace(hash, llmq::CRecoveredSig(llmq_params.type, quorum->qc->quorumHash, id, islock->txid,
+                                                          islock->sig));
+        }
+    }
+
+    cxxtimer::Timer verifyTimer(true);
+    batchVerifier.Verify();
+    verifyTimer.stop();
+
+    LogPrint(BCLog::INSTANTSEND,
+             "CInstantSendManager::%s -- verified locks. count=%d, alreadyVerified=%d, vt=%d, nodes=%d\n", __func__,
+             verifyCount, alreadyVerified, verifyTimer.count(), batchVerifier.GetUniqueSourceCount());
+
+    Uint256HashSet badISLocks;
+
+    if (ban && !batchVerifier.badSources.empty()) {
+        LOCK(::cs_main);
+        for (const auto& nodeId : batchVerifier.badSources) {
+            // Let's not be too harsh, as the peer might simply be unlucky and might have sent us an old lock which
+            // does not validate anymore due to changed quorums
+            m_peer_manager->PeerMisbehaving(nodeId, 20);
+        }
+    }
+    for (const auto& p : pend) {
+        const auto& hash = p.first;
+        auto nodeId = p.second.node_id;
+        const auto& islock = p.second.islock;
+
+        if (batchVerifier.badMessages.count(hash)) {
+            LogPrint(BCLog::INSTANTSEND, "CInstantSendManager::%s -- txid=%s, islock=%s: invalid sig in islock, peer=%d\n",
+                     __func__, islock->txid.ToString(), hash.ToString(), nodeId);
+            badISLocks.emplace(hash);
+            continue;
+        }
+
+        CInv inv(MSG_ISDLOCK, hash);
+        auto ret = m_is_manager.ProcessInstantSendLock(nodeId, hash, islock);
+        if (std::holds_alternative<uint256>(ret)) {
+            m_peer_manager->PeerRelayInvFiltered(inv, std::get<uint256>(ret));
+            m_peer_manager->PeerAskPeersForTransaction(islock->txid);
+        } else if (std::holds_alternative<CTransactionRef>(ret)) {
+            m_peer_manager->PeerRelayInvFiltered(inv, *std::get<CTransactionRef>(ret));
+        } else {
+            assert(std::holds_alternative<std::monostate>(ret));
+        }
+
+        // See comment further on top. We pass a reconstructed recovered sig to the signing manager to avoid
+        // double-verification of the sig.
+        auto it = recSigs.find(hash);
+        if (it != recSigs.end()) {
+            auto recSig = std::make_shared<llmq::CRecoveredSig>(std::move(it->second));
+            if (!m_is_manager.Sigman().HasRecoveredSigForId(llmq_params.type, recSig->getId())) {
+                LogPrint(BCLog::INSTANTSEND,
+                         "CInstantSendManager::%s -- txid=%s, islock=%s: passing reconstructed recSig to signing mgr, "
+                         "peer=%d\n",
+                         __func__, islock->txid.ToString(), hash.ToString(), nodeId);
+                m_is_manager.Sigman().PushReconstructedRecoveredSig(recSig);
+            }
+        }
+    }
+
+    return badISLocks;
+}
+
+
+void NetInstantSend::ProcessPendingISLocks(std::vector<std::pair<uint256, instantsend::PendingISLockFromPeer>>&& locks_to_process)
+{
+    // TODO Investigate if leaving this is ok
+    auto llmqType = Params().GetConsensus().llmqTypeDIP0024InstantSend;
+    const auto& llmq_params_opt = Params().GetLLMQ(llmqType);
+    assert(llmq_params_opt);
+    const auto& llmq_params = llmq_params_opt.value();
+    auto dkgInterval = llmq_params.dkgInterval;
+
+    // First check against the current active set and don't ban
+    auto bad_is_locks = ProcessPendingInstantSendLocks(llmq_params, /*signOffset=*/0, /*ban=*/false, locks_to_process);
+    if (!bad_is_locks.empty()) {
+        LogPrint(BCLog::INSTANTSEND, "CInstantSendManager::%s -- doing verification on old active set\n", __func__);
+
+        // filter out valid IS locks from "pend" - keep only bad ones
+        std::vector<std::pair<uint256, instantsend::PendingISLockFromPeer>> still_pending;
+        still_pending.reserve(bad_is_locks.size());
+        for (auto& p : locks_to_process) {
+            if (bad_is_locks.contains(p.first)) {
+                still_pending.push_back(std::move(p));
+            }
+        }
+        // Now check against the previous active set and perform banning if this fails
+        ProcessPendingInstantSendLocks(llmq_params, dkgInterval, /*ban=*/true, std::move(still_pending));
+    }
+}
+
+void NetInstantSend::WorkThreadMain()
+{
+    while (!workInterrupt) {
+        bool fMoreWork = [&]() -> bool {
+            if (!m_is_manager.IsInstantSendEnabled()) return false;
+
+            auto [more_work, locks] = m_is_manager.FetchPendingLocks();
+            if (!locks.empty()) {
+                ProcessPendingISLocks(std::move(locks));
+            }
+            if (auto signer = m_is_manager.Signer(); signer) {
+                signer->ProcessPendingRetryLockTxs(m_is_manager.PrepareTxToRetry());
+            }
+            return more_work;
+        }();
+
+        if (!fMoreWork && !workInterrupt.sleep_for(std::chrono::milliseconds(100))) {
+            return;
+        }
+    }
+}
diff --git a/src/instantsend/net_instantsend.h b/src/instantsend/net_instantsend.h
new file mode 100644
index 000000000000..d21ffb734ef1
--- /dev/null
+++ b/src/instantsend/net_instantsend.h
@@ -0,0 +1,56 @@
+// Copyright (c) 2025 The Dash Core developers
+// Distributed under the MIT software license, see the accompanying
+// file COPYING or http://www.opensource.org/licenses/mit-license.php.
+
+#ifndef BITCOIN_INSTANTSEND_NET_INSTANTSEND_H
+#define BITCOIN_INSTANTSEND_NET_INSTANTSEND_H
+
+#include <net_processing.h>
+
+#include <util/threadinterrupt.h>
+
+namespace instantsend {
+struct InstantSendLock;
+struct PendingISLockFromPeer;
+using InstantSendLockPtr = std::shared_ptr<InstantSendLock>;
+} // namespace instantsend
+namespace llmq {
+class CInstantSendManager;
+class CQuorumManager;
+} // namespace llmq
+
+class NetInstantSend final : public NetHandler
+{
+public:
+    NetInstantSend(PeerManagerInternal* peer_manager, llmq::CInstantSendManager& is_manager, llmq::CQuorumManager& qman,
+                   CChainState& chainstate) :
+        NetHandler(peer_manager),
+        m_is_manager{is_manager},
+        m_qman(qman),
+        m_chainstate{chainstate}
+    {
+        workInterrupt.reset();
+    }
+    void ProcessMessage(CNode& pfrom, const std::string& msg_type, CDataStream& vRecv) override;
+
+    void Start() override;
+    void Stop() override;
+    void Interrupt() override { workInterrupt(); };
+
+    void WorkThreadMain();
+
+private:
+    void ProcessPendingISLocks(std::vector<std::pair<uint256, instantsend::PendingISLockFromPeer>>&& locks_to_process);
+
+    Uint256HashSet ProcessPendingInstantSendLocks(
+        const Consensus::LLMQParams& llmq_params, int signOffset, bool ban,
+        const std::vector<std::pair<uint256, instantsend::PendingISLockFromPeer>>& pend);
+    llmq::CInstantSendManager& m_is_manager;
+    llmq::CQuorumManager& m_qman;
+    const CChainState& m_chainstate;
+
+    std::thread workThread;
+    CThreadInterrupt workInterrupt;
+};
+
+#endif // BITCOIN_INSTANTSEND_NET_INSTANTSEND_H
diff --git a/src/llmq/context.cpp b/src/llmq/context.cpp
index 9e8cb27dea71..e3c7b4911f1b 100644
--- a/src/llmq/context.cpp
+++ b/src/llmq/context.cpp
@@ -32,7 +32,7 @@ LLMQContext::LLMQContext(ChainstateManager& chainman, CDeterministicMNManager& d
                                                 db_params)},
     sigman{std::make_unique<llmq::CSigningManager>(chainman.ActiveChainstate(), *qman, db_params)},
     clhandler{std::make_unique<llmq::CChainLocksHandler>(chainman.ActiveChainstate(), *qman, sporkman, mempool, mn_sync)},
-    isman{std::make_unique<llmq::CInstantSendManager>(*clhandler, chainman.ActiveChainstate(), *qman, *sigman, sporkman,
+    isman{std::make_unique<llmq::CInstantSendManager>(*clhandler, chainman.ActiveChainstate(), *sigman, sporkman,
                                                       mempool, mn_sync, db_params)}
 {
     // Have to start it early to let VerifyDB check ChainLock signatures in coinbase
@@ -44,7 +44,6 @@ LLMQContext::~LLMQContext() {
 }
 
 void LLMQContext::Interrupt() {
-    isman->InterruptWorkerThread();
     sigman->InterruptWorkerThread();
 }
 
@@ -53,12 +52,10 @@ void LLMQContext::Start(PeerManager& peerman)
     qman->Start();
     sigman->StartWorkerThread(peerman);
     clhandler->Start(*isman);
-    isman->Start(peerman);
 }
 
 void LLMQContext::Stop()
 {
-    isman->Stop();
     clhandler->Stop();
     sigman->StopWorkerThread();
     qman->Stop();
diff --git a/src/msg_result.h b/src/msg_result.h
index 01b14288ee27..646d2142443c 100644
--- a/src/msg_result.h
+++ b/src/msg_result.h
@@ -7,7 +7,6 @@
 
 #include <coinjoin/coinjoin.h>
 
-#include <primitives/transaction.h>
 #include <protocol.h>
 #include <uint256.h>
 
@@ -54,12 +53,6 @@ struct MessageProcessingResult
     //! @m_dsq will relay DSQs to connected peers
     std::vector<CCoinJoinQueue> m_dsq;
 
-    //! @m_inv_filter will relay this inventory if filter matches to connected peers if not nullopt
-    std::optional<std::pair<CInv, std::variant<CTransactionRef, uint256>>> m_inv_filter;
-
-    //! @m_request_tx will ask connected peers to relay transaction if not nullopt
-    std::optional<uint256> m_request_tx;
-
     //! @m_transactions will relay transactions to peers which is ready to accept it (some peers does not accept transactions)
     std::vector<uint256> m_transactions;
 
diff --git a/src/net_processing.cpp b/src/net_processing.cpp
index 62f9d8d94f41..f799d434d800 100644
--- a/src/net_processing.cpp
+++ b/src/net_processing.cpp
@@ -3578,19 +3578,6 @@ void PeerManagerImpl::PostProcessMessage(MessageProcessingResult&& result, NodeI
     for (const auto& dsq : result.m_dsq) {
         RelayDSQ(dsq);
     }
-    if (result.m_inv_filter) {
-        const auto& [inv, filter] = result.m_inv_filter.value();
-        if (std::holds_alternative<CTransactionRef>(filter)) {
-            RelayInvFiltered(inv, *std::get<CTransactionRef>(filter));
-        } else if (std::holds_alternative<uint256>(filter)) {
-            RelayInvFiltered(inv, std::get<uint256>(filter));
-        } else {
-            assert(false);
-        }
-    }
-    if (result.m_request_tx) {
-        AskPeersForTransaction(result.m_request_tx.value());
-    }
 }
 
 MessageProcessingResult PeerManagerImpl::ProcessPlatformBanMessage(NodeId node, std::string_view msg_type, CDataStream& vRecv)
@@ -5451,7 +5438,6 @@ void PeerManagerImpl::ProcessMessage(
             return; // CLSIG
         }
 
-        PostProcessMessage(m_llmq_ctx->isman->ProcessMessage(pfrom.GetId(), msg_type, vRecv), pfrom.GetId());
         for (const auto& handler : m_handlers) {
             handler->ProcessMessage(pfrom, msg_type, vRecv);
         }
diff --git a/test/lint/lint-circular-dependencies.py b/test/lint/lint-circular-dependencies.py
index 4127d5a7df16..e591e3166ab6 100755
--- a/test/lint/lint-circular-dependencies.py
+++ b/test/lint/lint-circular-dependencies.py
@@ -23,15 +23,15 @@
     # Dash
     "banman -> common/bloom -> evo/assetlocktx -> llmq/quorums -> net -> banman",
     "chainlock/chainlock -> instantsend/instantsend -> chainlock/chainlock",
+    "chainlock/chainlock -> chainlock/signing -> llmq/signing -> net_processing -> chainlock/chainlock",
+    "chainlock/chainlock -> chainlock/signing -> llmq/signing -> net_processing -> masternode/active/context -> chainlock/chainlock",
     "chainlock/chainlock -> instantsend/instantsend -> instantsend/signing -> chainlock/chainlock",
-    "chainlock/chainlock -> instantsend/instantsend -> net_processing -> chainlock/chainlock",
-    "chainlock/chainlock -> instantsend/instantsend -> net_processing -> masternode/active/context -> chainlock/chainlock",
     "chainlock/chainlock -> llmq/quorums -> msg_result -> coinjoin/coinjoin -> chainlock/chainlock",
     "chainlock/chainlock -> validation -> chainlock/chainlock",
     "chainlock/chainlock -> validation -> evo/chainhelper -> chainlock/chainlock",
-    "chainlock/signing -> instantsend/instantsend -> net_processing -> masternode/active/context -> chainlock/signing",
-    "coinjoin/client -> coinjoin/coinjoin -> instantsend/instantsend -> net_processing -> coinjoin/walletman -> coinjoin/client",
-    "coinjoin/coinjoin -> instantsend/instantsend -> llmq/quorums -> msg_result -> coinjoin/coinjoin",
+    "chainlock/signing -> llmq/signing -> net_processing -> masternode/active/context -> chainlock/signing",
+    "coinjoin/coinjoin -> instantsend/instantsend -> spork -> msg_result -> coinjoin/coinjoin",
+    "coinjoin/client -> core_io -> evo/mnhftx -> llmq/signing -> net_processing -> coinjoin/walletman -> coinjoin/client",
     "coinjoin/server -> net_processing -> coinjoin/server",
     "coinjoin/server -> net_processing -> masternode/active/context -> coinjoin/server",
     "common/bloom -> evo/assetlocktx -> llmq/commitment -> evo/deterministicmns -> evo/simplifiedmns -> merkleblock -> common/bloom",
@@ -53,9 +53,8 @@
     "governance/governance -> masternode/sync -> governance/governance",
     "governance/governance -> net_processing -> masternode/active/context -> governance/governance",
     "governance/governance -> net_processing -> governance/governance",
-    "instantsend/instantsend -> net_processing -> instantsend/instantsend",
-    "instantsend/instantsend -> net_processing -> llmq/context -> instantsend/instantsend",
-    "instantsend/instantsend -> net_processing -> masternode/active/context -> instantsend/instantsend",
+    "instantsend/instantsend -> instantsend/signing -> llmq/signing -> net_processing -> instantsend/instantsend",
+    "instantsend/instantsend -> instantsend/signing -> llmq/signing -> net_processing -> masternode/active/context -> instantsend/instantsend",
     "instantsend/instantsend -> txmempool -> instantsend/instantsend",
     "instantsend/signing -> llmq/signing -> net_processing -> masternode/active/context -> instantsend/signing",
     "llmq/blockprocessor -> llmq/utils -> llmq/snapshot -> llmq/blockprocessor",

From 3c265230cf456965135c637ea64d8594c8209b80 Mon Sep 17 00:00:00 2001
From: Konstantin Akimov <knstqq@gmail.com>
Date: Tue, 11 Nov 2025 21:10:36 +0700
Subject: [PATCH 529/656] fix: update log records from CInstantSendManager for
 NetInstantSend instead and tidy up them a bit

---
 src/instantsend/net_instantsend.cpp | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/src/instantsend/net_instantsend.cpp b/src/instantsend/net_instantsend.cpp
index 0807878d3411..1e9227c359a0 100644
--- a/src/instantsend/net_instantsend.cpp
+++ b/src/instantsend/net_instantsend.cpp
@@ -57,8 +57,8 @@ void NetInstantSend::ProcessMessage(CNode& pfrom, const std::string& msg_type, C
     }
 
     if (!m_is_manager.AlreadyHave(CInv{MSG_ISDLOCK, hash})) {
-        LogPrint(BCLog::INSTANTSEND, "CInstantSendManager::%s -- txid=%s, islock=%s: received islock, peer=%d\n",
-                 __func__, islock->txid.ToString(), hash.ToString(), pfrom.GetId());
+        LogPrint(BCLog::INSTANTSEND, "NetInstantSend -- ISDLOCK txid=%s, islock=%s: received islock, peer=%d\n",
+                 islock->txid.ToString(), hash.ToString(), pfrom.GetId());
 
         m_is_manager.EnqueueInstantSendLock(pfrom.GetId(), hash, islock);
     }
@@ -162,9 +162,8 @@ Uint256HashSet NetInstantSend::ProcessPendingInstantSendLocks(
     batchVerifier.Verify();
     verifyTimer.stop();
 
-    LogPrint(BCLog::INSTANTSEND,
-             "CInstantSendManager::%s -- verified locks. count=%d, alreadyVerified=%d, vt=%d, nodes=%d\n", __func__,
-             verifyCount, alreadyVerified, verifyTimer.count(), batchVerifier.GetUniqueSourceCount());
+    LogPrint(BCLog::INSTANTSEND, "NetInstantSend::%s -- verified locks. count=%d, alreadyVerified=%d, vt=%d, nodes=%d\n",
+             __func__, verifyCount, alreadyVerified, verifyTimer.count(), batchVerifier.GetUniqueSourceCount());
 
     Uint256HashSet badISLocks;
 
@@ -182,7 +181,7 @@ Uint256HashSet NetInstantSend::ProcessPendingInstantSendLocks(
         const auto& islock = p.second.islock;
 
         if (batchVerifier.badMessages.count(hash)) {
-            LogPrint(BCLog::INSTANTSEND, "CInstantSendManager::%s -- txid=%s, islock=%s: invalid sig in islock, peer=%d\n",
+            LogPrint(BCLog::INSTANTSEND, "NetInstantSend::%s -- txid=%s, islock=%s: invalid sig in islock, peer=%d\n",
                      __func__, islock->txid.ToString(), hash.ToString(), nodeId);
             badISLocks.emplace(hash);
             continue;
@@ -205,9 +204,9 @@ Uint256HashSet NetInstantSend::ProcessPendingInstantSendLocks(
         if (it != recSigs.end()) {
             auto recSig = std::make_shared<llmq::CRecoveredSig>(std::move(it->second));
             if (!m_is_manager.Sigman().HasRecoveredSigForId(llmq_params.type, recSig->getId())) {
-                LogPrint(BCLog::INSTANTSEND,
-                         "CInstantSendManager::%s -- txid=%s, islock=%s: passing reconstructed recSig to signing mgr, "
-                         "peer=%d\n",
+                LogPrint(BCLog::INSTANTSEND, /* Continued */
+                         "NetInstantSend::%s -- txid=%s, islock=%s: "
+                         "passing reconstructed recSig to signing mgr, peer=%d\n",
                          __func__, islock->txid.ToString(), hash.ToString(), nodeId);
                 m_is_manager.Sigman().PushReconstructedRecoveredSig(recSig);
             }
@@ -230,7 +229,7 @@ void NetInstantSend::ProcessPendingISLocks(std::vector<std::pair<uint256, instan
     // First check against the current active set and don't ban
     auto bad_is_locks = ProcessPendingInstantSendLocks(llmq_params, /*signOffset=*/0, /*ban=*/false, locks_to_process);
     if (!bad_is_locks.empty()) {
-        LogPrint(BCLog::INSTANTSEND, "CInstantSendManager::%s -- doing verification on old active set\n", __func__);
+        LogPrint(BCLog::INSTANTSEND, "NetInstantSend::%s -- doing verification on old active set\n", __func__);
 
         // filter out valid IS locks from "pend" - keep only bad ones
         std::vector<std::pair<uint256, instantsend::PendingISLockFromPeer>> still_pending;

From a26a974fbf786c5e3f3b77b204f15234bdb30026 Mon Sep 17 00:00:00 2001
From: Konstantin Akimov <knstqq@gmail.com>
Date: Sat, 15 Nov 2025 21:47:44 +0700
Subject: [PATCH 530/656] perf: std::move a shared_ptr with islock in
 ProcessMessage

---
 src/instantsend/instantsend.cpp     | 4 ++--
 src/instantsend/instantsend.h       | 2 +-
 src/instantsend/net_instantsend.cpp | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/instantsend/instantsend.cpp b/src/instantsend/instantsend.cpp
index 7367535259a2..0415a19d5377 100644
--- a/src/instantsend/instantsend.cpp
+++ b/src/instantsend/instantsend.cpp
@@ -66,7 +66,7 @@ CInstantSendManager::~CInstantSendManager() = default;
 bool ShouldReportISLockTiming() { return g_stats_client->active() || LogAcceptDebug(BCLog::INSTANTSEND); }
 
 void CInstantSendManager::EnqueueInstantSendLock(NodeId from, const uint256& hash,
-                                                 const std::shared_ptr<instantsend::InstantSendLock>& islock)
+                                                 std::shared_ptr<instantsend::InstantSendLock> islock)
 {
     if (ShouldReportISLockTiming()) {
         auto time_diff = [&]() -> int64_t {
@@ -86,7 +86,7 @@ void CInstantSendManager::EnqueueInstantSendLock(NodeId from, const uint256& has
     }
 
     LOCK(cs_pendingLocks);
-    pendingInstantSendLocks.emplace(hash, instantsend::PendingISLockFromPeer{from, islock});
+    pendingInstantSendLocks.emplace(hash, instantsend::PendingISLockFromPeer{from, std::move(islock)});
 }
 
 instantsend::PendingState CInstantSendManager::FetchPendingLocks()
diff --git a/src/instantsend/instantsend.h b/src/instantsend/instantsend.h
index 6cbba2cc2706..30e8ba4a8ebf 100644
--- a/src/instantsend/instantsend.h
+++ b/src/instantsend/instantsend.h
@@ -135,7 +135,7 @@ class CInstantSendManager final : public instantsend::InstantSendSignerParent
     /* Helpers for communications between CInstantSendManager & NetInstantSend */
     // This helper returns up to 32 pending locks and remove them from queue of pending
     [[nodiscard]] instantsend::PendingState FetchPendingLocks() EXCLUSIVE_LOCKS_REQUIRED(!cs_pendingLocks);
-    void EnqueueInstantSendLock(NodeId from, const uint256& hash, const std::shared_ptr<instantsend::InstantSendLock>& islock)
+    void EnqueueInstantSendLock(NodeId from, const uint256& hash, std::shared_ptr<instantsend::InstantSendLock> islock)
         EXCLUSIVE_LOCKS_REQUIRED(!cs_pendingLocks);
     [[nodiscard]] std::vector<CTransactionRef> PrepareTxToRetry()
         EXCLUSIVE_LOCKS_REQUIRED(!cs_nonLocked, !cs_pendingRetry);
diff --git a/src/instantsend/net_instantsend.cpp b/src/instantsend/net_instantsend.cpp
index 1e9227c359a0..ecb81b6a5edb 100644
--- a/src/instantsend/net_instantsend.cpp
+++ b/src/instantsend/net_instantsend.cpp
@@ -22,7 +22,7 @@ void NetInstantSend::ProcessMessage(CNode& pfrom, const std::string& msg_type, C
 
     if (!m_is_manager.IsInstantSendEnabled()) return;
 
-    const auto islock = std::make_shared<instantsend::InstantSendLock>();
+    auto islock = std::make_shared<instantsend::InstantSendLock>();
     vRecv >> *islock;
 
     uint256 hash = ::SerializeHash(*islock);
@@ -60,7 +60,7 @@ void NetInstantSend::ProcessMessage(CNode& pfrom, const std::string& msg_type, C
         LogPrint(BCLog::INSTANTSEND, "NetInstantSend -- ISDLOCK txid=%s, islock=%s: received islock, peer=%d\n",
                  islock->txid.ToString(), hash.ToString(), pfrom.GetId());
 
-        m_is_manager.EnqueueInstantSendLock(pfrom.GetId(), hash, islock);
+        m_is_manager.EnqueueInstantSendLock(pfrom.GetId(), hash, std::move(islock));
     }
 }
 

From d4d64f6688cd0360802fb5bee375ab723b81d64f Mon Sep 17 00:00:00 2001
From: Konstantin Akimov <knstqq@gmail.com>
Date: Tue, 18 Nov 2025 02:49:00 +0700
Subject: [PATCH 531/656] fix: don't remove handlers too early

---
 src/init.cpp           | 1 -
 src/net_processing.cpp | 5 +++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/init.cpp b/src/init.cpp
index c0c35b36aa54..642df953f34f 100644
--- a/src/init.cpp
+++ b/src/init.cpp
@@ -289,7 +289,6 @@ void PrepareShutdown(NodeContext& node)
     StopREST();
     StopRPC();
     StopHTTPServer();
-    if (node.peerman) node.peerman->RemoveHandlers();
 
     if (node.active_ctx) node.active_ctx->Stop();
     if (node.peerman) node.peerman->StopHandlers();
diff --git a/src/net_processing.cpp b/src/net_processing.cpp
index f799d434d800..392d1d41ef35 100644
--- a/src/net_processing.cpp
+++ b/src/net_processing.cpp
@@ -595,6 +595,11 @@ class PeerManagerImpl final : public PeerManager
                     const std::unique_ptr<ActiveContext>& active_ctx, CJWalletManager* const cj_walletman,
                     const std::unique_ptr<LLMQContext>& llmq_ctx, bool ignore_incoming_txs);
 
+    ~PeerManagerImpl()
+    {
+        RemoveHandlers();
+    }
+
     /** Overridden from CValidationInterface. */
     void BlockConnected(const std::shared_ptr<const CBlock>& pblock, const CBlockIndex* pindexConnected) override
         EXCLUSIVE_LOCKS_REQUIRED(!m_peer_mutex, !m_recent_confirmed_transactions_mutex);

From 23fc17753fc56405836dafed4e238e5ac3d4a5b2 Mon Sep 17 00:00:00 2001
From: pasta <pasta@dashboost.org>
Date: Sat, 15 Nov 2025 00:05:03 -0600
Subject: [PATCH 532/656] fix: remove unnecessary lock in bad sources
 processing

---
 src/instantsend/net_instantsend.cpp | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/instantsend/net_instantsend.cpp b/src/instantsend/net_instantsend.cpp
index ecb81b6a5edb..f4eeb5300ce5 100644
--- a/src/instantsend/net_instantsend.cpp
+++ b/src/instantsend/net_instantsend.cpp
@@ -168,7 +168,6 @@ Uint256HashSet NetInstantSend::ProcessPendingInstantSendLocks(
     Uint256HashSet badISLocks;
 
     if (ban && !batchVerifier.badSources.empty()) {
-        LOCK(::cs_main);
         for (const auto& nodeId : batchVerifier.badSources) {
             // Let's not be too harsh, as the peer might simply be unlucky and might have sent us an old lock which
             // does not validate anymore due to changed quorums

From f961e04ed5956594afbdf6ff0c5b3fd279ec4f63 Mon Sep 17 00:00:00 2001
From: pasta <pasta@dashboost.org>
Date: Sat, 15 Nov 2025 00:08:05 -0600
Subject: [PATCH 533/656] fix: initialize BLS in benchmarking setup

---
 src/bench/bench_bitcoin.cpp | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/bench/bench_bitcoin.cpp b/src/bench/bench_bitcoin.cpp
index c5fe3fbdfddb..4db5412e16d6 100644
--- a/src/bench/bench_bitcoin.cpp
+++ b/src/bench/bench_bitcoin.cpp
@@ -4,6 +4,7 @@
 
 #include <bench/bench.h>
 
+#include <bls/bls.h>
 #include <clientversion.h>
 #include <crypto/sha256.h>
 #include <crypto/x11/dispatch.h>
@@ -64,6 +65,8 @@ int main(int argc, char** argv)
     SetupBenchArgs(argsman);
     SapphireAutoDetect();
     SHA256AutoDetect();
+    BLSInit();
+    bls::bls_legacy_scheme.store(false);
     std::string error;
     if (!argsman.ParseParameters(argc, argv, error)) {
         tfm::format(std::cerr, "Error parsing command line arguments: %s\n", error);

From 0e1f11421b814a3ea3dd8315a49a960f0b6da0d4 Mon Sep 17 00:00:00 2001
From: pasta <pasta@dashboost.org>
Date: Mon, 10 Nov 2025 14:13:21 -0600
Subject: [PATCH 534/656] instantsend: cache heights and reduce cs_main
 contention

- Add unordered_lru_cache for block heights in CInstantSendManager
- Provide GetTipHeight() (non-optional) and GetBlockHeight() helpers
- Use cache in InstantSendSigner::CheckCanLock
- Cache-first for cycleHash height in ISLOCK message path and batch verify
- Cache-first mined-height for HasChainLock and WriteInstantSendLockMined

Only InstantSend files are included in this commit.
---
 src/instantsend/instantsend.cpp     | 98 ++++++++++++++++++++++++++---
 src/instantsend/instantsend.h       | 32 +++++++---
 src/instantsend/net_instantsend.cpp | 26 ++++----
 src/instantsend/signing.cpp         | 28 ++++++---
 src/instantsend/signing.h           |  4 ++
 5 files changed, 151 insertions(+), 37 deletions(-)

diff --git a/src/instantsend/instantsend.cpp b/src/instantsend/instantsend.cpp
index 0415a19d5377..da43d5396366 100644
--- a/src/instantsend/instantsend.cpp
+++ b/src/instantsend/instantsend.cpp
@@ -145,25 +145,34 @@ std::variant<uint256, CTransactionRef, std::monostate> CInstantSendManager::Proc
 
     uint256 hashBlock{};
     const auto tx = GetTransaction(nullptr, &mempool, islock->txid, Params().GetConsensus(), hashBlock);
-    const CBlockIndex* pindexMined{nullptr};
     const bool found_transaction{tx != nullptr};
     // we ignore failure here as we must be able to propagate the lock even if we don't have the TX locally
+    int minedHeight{-1};
     if (found_transaction && !hashBlock.IsNull()) {
-        pindexMined = WITH_LOCK(::cs_main, return m_chainstate.m_blockman.LookupBlockIndex(hashBlock));
-
+        if (auto h = GetBlockHeight(hashBlock)) {
+            minedHeight = *h;
+        } else {
+            const CBlockIndex* pindexMined = WITH_LOCK(::cs_main, return m_chainstate.m_blockman.LookupBlockIndex(hashBlock));
+            if (pindexMined != nullptr) {
+                CacheBlockHeight(pindexMined->GetBlockHash(), pindexMined->nHeight);
+                minedHeight = pindexMined->nHeight;
+            }
+        }
         // Let's see if the TX that was locked by this islock is already mined in a ChainLocked block. If yes,
         // we can simply ignore the islock, as the ChainLock implies locking of all TXs in that chain
-        if (pindexMined != nullptr && clhandler.HasChainLock(pindexMined->nHeight, pindexMined->GetBlockHash())) {
-            LogPrint(BCLog::INSTANTSEND, "CInstantSendManager::%s -- txlock=%s, islock=%s: dropping islock as it already got a ChainLock in block %s, peer=%d\n", __func__,
-                     islock->txid.ToString(), hash.ToString(), hashBlock.ToString(), from);
+        if (clhandler.HasChainLock(minedHeight, hashBlock)) {
+            LogPrint(BCLog::INSTANTSEND, /* Continued */
+                     "CInstantSendManager::%s -- txlock=%s, islock=%s: dropping islock as it already got a "
+                     "ChainLock in block %s, peer=%d\n",
+                     __func__, islock->txid.ToString(), hash.ToString(), hashBlock.ToString(), from);
             return std::monostate{};
         }
     }
 
     if (found_transaction) {
         db.WriteNewInstantSendLock(hash, islock);
-        if (pindexMined) {
-            db.WriteInstantSendLockMined(hash, pindexMined->nHeight);
+        if (minedHeight >= 0) {
+            db.WriteInstantSendLockMined(hash, minedHeight);
         }
     } else {
         // put it in a separate pending map and try again later
@@ -251,6 +260,12 @@ void CInstantSendManager::BlockConnected(const std::shared_ptr<const CBlock>& pb
         return;
     }
 
+    {
+        LOCK(cs_height_cache);
+        CacheBlockHeightInternal(pindex->GetBlockHash(), pindex->nHeight);
+        m_cached_tip_height = pindex->nHeight;
+    }
+
     if (m_mn_sync.IsBlockchainSynced()) {
         const bool has_chainlock = clhandler.HasChainLock(pindex->nHeight, pindex->GetBlockHash());
         for (const auto& tx : pblock->vtx) {
@@ -278,6 +293,16 @@ void CInstantSendManager::BlockConnected(const std::shared_ptr<const CBlock>& pb
 void CInstantSendManager::BlockDisconnected(const std::shared_ptr<const CBlock>& pblock,
                                             const CBlockIndex* pindexDisconnected)
 {
+    {
+        LOCK(cs_height_cache);
+        m_cached_block_heights.erase(pindexDisconnected->GetBlockHash());
+        const CBlockIndex* const new_tip = pindexDisconnected->pprev;
+        m_cached_tip_height = new_tip ? new_tip->nHeight : -1;
+        if (new_tip) {
+            CacheBlockHeightInternal(new_tip->GetBlockHash(), new_tip->nHeight);
+        }
+    }
+
     db.RemoveBlockInstantSendLocks(pblock, pindexDisconnected);
 }
 
@@ -417,6 +442,12 @@ void CInstantSendManager::NotifyChainLock(const CBlockIndex* pindexChainLock)
 
 void CInstantSendManager::UpdatedBlockTip(const CBlockIndex* pindexNew)
 {
+    {
+        LOCK(cs_height_cache);
+        CacheBlockHeightInternal(pindexNew->GetBlockHash(), pindexNew->nHeight);
+        m_cached_tip_height = pindexNew->nHeight;
+    }
+
     bool fDIP0008Active = pindexNew->pprev && pindexNew->pprev->nHeight >= Params().GetConsensus().DIP0008Height;
 
     if (AreChainLocksEnabled(spork_manager) && fDIP0008Active) {
@@ -597,7 +628,7 @@ void CInstantSendManager::RemoveConflictingLock(const uint256& islockHash, const
 {
     LogPrintf("CInstantSendManager::%s -- txid=%s, islock=%s: Removing ISLOCK and its chained children\n", __func__,
               islock.txid.ToString(), islockHash.ToString());
-    int tipHeight = WITH_LOCK(::cs_main, return m_chainstate.m_chain.Height());
+    const int tipHeight = GetTipHeight();
 
     auto removedIslocks = db.RemoveChainedInstantSendLocks(islockHash, islock.txid, tipHeight);
     for (const auto& h : removedIslocks) {
@@ -703,6 +734,55 @@ size_t CInstantSendManager::GetInstantSendLockCount() const
     return db.GetInstantSendLockCount();
 }
 
+void CInstantSendManager::CacheBlockHeightInternal(const uint256& hash, int height) const
+{
+    AssertLockHeld(cs_height_cache);
+    m_cached_block_heights.insert(hash, height);
+}
+
+void CInstantSendManager::CacheBlockHeight(const uint256& hash, int height) const
+{
+    LOCK(cs_height_cache);
+    CacheBlockHeightInternal(hash, height);
+}
+
+std::optional<int> CInstantSendManager::GetBlockHeight(const uint256& hash) const
+{
+    {
+        LOCK(cs_height_cache);
+        int cached_height{0};
+        if (m_cached_block_heights.get(hash, cached_height)) return cached_height;
+    }
+
+    const CBlockIndex* pindex = WITH_LOCK(::cs_main, return m_chainstate.m_blockman.LookupBlockIndex(hash));
+    if (pindex == nullptr) {
+        return std::nullopt;
+    }
+
+    CacheBlockHeight(pindex->GetBlockHash(), pindex->nHeight);
+    return pindex->nHeight;
+}
+
+int CInstantSendManager::GetTipHeight() const
+{
+    {
+        LOCK(cs_height_cache);
+        if (m_cached_tip_height >= 0) {
+            return m_cached_tip_height;
+        }
+    }
+
+    const CBlockIndex* tip = WITH_LOCK(::cs_main, return m_chainstate.m_chain.Tip());
+    assert(tip != nullptr);
+
+    {
+        LOCK(cs_height_cache);
+        CacheBlockHeightInternal(tip->GetBlockHash(), tip->nHeight);
+        m_cached_tip_height = tip->nHeight;
+        return m_cached_tip_height;
+    }
+}
+
 bool CInstantSendManager::IsInstantSendEnabled() const
 {
     return !fReindex && !fImporting && spork_manager.IsSporkActive(SPORK_2_INSTANTSEND_ENABLED);
diff --git a/src/instantsend/instantsend.h b/src/instantsend/instantsend.h
index 30e8ba4a8ebf..8709637f25f4 100644
--- a/src/instantsend/instantsend.h
+++ b/src/instantsend/instantsend.h
@@ -17,11 +17,13 @@
 #include <unordered_lru_cache.h>
 
 #include <atomic>
-#include <unordered_map>
+#include <optional>
 #include <unordered_set>
 #include <variant>
 #include <vector>
 
+#include <saltedhasher.h>
+
 class CBlockIndex;
 class CChainState;
 class CDataStream;
@@ -91,6 +93,14 @@ class CInstantSendManager final : public instantsend::InstantSendSignerParent
     mutable Mutex cs_timingsTxSeen;
     Uint256HashMap<int64_t> timingsTxSeen GUARDED_BY(cs_timingsTxSeen);
 
+    mutable Mutex cs_height_cache;
+    static constexpr size_t MAX_BLOCK_HEIGHT_CACHE{16384};
+    mutable unordered_lru_cache<uint256, int, StaticSaltedHasher, MAX_BLOCK_HEIGHT_CACHE> m_cached_block_heights
+        GUARDED_BY(cs_height_cache);
+    mutable int m_cached_tip_height GUARDED_BY(cs_height_cache){-1};
+
+    void CacheBlockHeightInternal(const uint256& hash, int height) const EXCLUSIVE_LOCKS_REQUIRED(cs_height_cache);
+
 public:
     CInstantSendManager() = delete;
     CInstantSendManager(const CInstantSendManager&) = delete;
@@ -122,7 +132,7 @@ class CInstantSendManager final : public instantsend::InstantSendSignerParent
     void RemoveMempoolConflictsForLock(const uint256& hash, const instantsend::InstantSendLock& islock)
         EXCLUSIVE_LOCKS_REQUIRED(!cs_nonLocked, !cs_pendingRetry);
     void ResolveBlockConflicts(const uint256& islockHash, const instantsend::InstantSendLock& islock)
-        EXCLUSIVE_LOCKS_REQUIRED(!cs_nonLocked, !cs_pendingLocks, !cs_pendingRetry);
+        EXCLUSIVE_LOCKS_REQUIRED(!cs_nonLocked, !cs_pendingLocks, !cs_pendingRetry, !cs_height_cache);
 
     void HandleFullyConfirmedBlock(const CBlockIndex* pindex)
         EXCLUSIVE_LOCKS_REQUIRED(!cs_nonLocked, !cs_pendingRetry);
@@ -142,14 +152,15 @@ class CInstantSendManager final : public instantsend::InstantSendSignerParent
     CSigningManager& Sigman() { return sigman; }
     [[nodiscard]] std::variant<uint256, CTransactionRef, std::monostate> ProcessInstantSendLock(
         NodeId from, const uint256& hash, const instantsend::InstantSendLockPtr& islock)
-        EXCLUSIVE_LOCKS_REQUIRED(!cs_nonLocked, !cs_pendingLocks, !cs_pendingRetry);
+        EXCLUSIVE_LOCKS_REQUIRED(!cs_nonLocked, !cs_pendingLocks, !cs_pendingRetry, !cs_height_cache);
 
     void TransactionAddedToMempool(const CTransactionRef& tx)
         EXCLUSIVE_LOCKS_REQUIRED(!cs_nonLocked, !cs_pendingLocks, !cs_pendingRetry, !cs_timingsTxSeen);
-    void TransactionRemovedFromMempool(const CTransactionRef& tx);
+    void TransactionRemovedFromMempool(const CTransactionRef& tx) EXCLUSIVE_LOCKS_REQUIRED(!cs_height_cache);
     void BlockConnected(const std::shared_ptr<const CBlock>& pblock, const CBlockIndex* pindex)
-        EXCLUSIVE_LOCKS_REQUIRED(!cs_nonLocked, !cs_pendingLocks, !cs_pendingRetry, !cs_timingsTxSeen);
-    void BlockDisconnected(const std::shared_ptr<const CBlock>& pblock, const CBlockIndex* pindexDisconnected);
+        EXCLUSIVE_LOCKS_REQUIRED(!cs_nonLocked, !cs_pendingLocks, !cs_pendingRetry, !cs_timingsTxSeen, !cs_height_cache);
+    void BlockDisconnected(const std::shared_ptr<const CBlock>& pblock, const CBlockIndex* pindexDisconnected)
+        EXCLUSIVE_LOCKS_REQUIRED(!cs_height_cache);
 
     bool AlreadyHave(const CInv& inv) const EXCLUSIVE_LOCKS_REQUIRED(!cs_pendingLocks);
     bool GetInstantSendLockByHash(const uint256& hash, instantsend::InstantSendLock& ret) const
@@ -159,14 +170,19 @@ class CInstantSendManager final : public instantsend::InstantSendSignerParent
     void NotifyChainLock(const CBlockIndex* pindexChainLock)
         EXCLUSIVE_LOCKS_REQUIRED(!cs_nonLocked, !cs_pendingRetry);
     void UpdatedBlockTip(const CBlockIndex* pindexNew)
-        EXCLUSIVE_LOCKS_REQUIRED(!cs_nonLocked, !cs_pendingRetry);
+        EXCLUSIVE_LOCKS_REQUIRED(!cs_nonLocked, !cs_pendingRetry, !cs_height_cache);
 
-    void RemoveConflictingLock(const uint256& islockHash, const instantsend::InstantSendLock& islock);
+    void RemoveConflictingLock(const uint256& islockHash, const instantsend::InstantSendLock& islock)
+        EXCLUSIVE_LOCKS_REQUIRED(!cs_height_cache);
     void TryEmplacePendingLock(const uint256& hash, const NodeId id, const instantsend::InstantSendLockPtr& islock) override
         EXCLUSIVE_LOCKS_REQUIRED(!cs_pendingLocks);
 
     size_t GetInstantSendLockCount() const;
 
+    void CacheBlockHeight(const uint256& hash, int height) const EXCLUSIVE_LOCKS_REQUIRED(!cs_height_cache);
+    std::optional<int> GetBlockHeight(const uint256& hash) const override EXCLUSIVE_LOCKS_REQUIRED(!cs_height_cache);
+    int GetTipHeight() const override EXCLUSIVE_LOCKS_REQUIRED(!cs_height_cache);
+
     bool IsInstantSendEnabled() const override;
     /**
      * If true, MN should sign all transactions, if false, MN should not sign
diff --git a/src/instantsend/net_instantsend.cpp b/src/instantsend/net_instantsend.cpp
index f4eeb5300ce5..0e4b4b38caf5 100644
--- a/src/instantsend/net_instantsend.cpp
+++ b/src/instantsend/net_instantsend.cpp
@@ -34,18 +34,18 @@ void NetInstantSend::ProcessMessage(CNode& pfrom, const std::string& msg_type, C
         return;
     }
 
-    int block_height = [this, islock] {
+    auto cycleHeightOpt = m_is_manager.GetBlockHeight(islock->cycleHash);
+    if (!cycleHeightOpt) {
         const auto blockIndex = WITH_LOCK(::cs_main, return m_chainstate.m_blockman.LookupBlockIndex(islock->cycleHash));
         if (blockIndex == nullptr) {
-            return -1;
+            // Maybe we don't have the block yet or maybe some peer spams invalid values for cycleHash
+            m_peer_manager->PeerMisbehaving(pfrom.GetId(), 1);
+            return;
         }
-        return blockIndex->nHeight;
-    }();
-    if (block_height < 0) {
-        // Maybe we don't have the block yet or maybe some peer spams invalid values for cycleHash
-        m_peer_manager->PeerMisbehaving(pfrom.GetId(), 1);
-        return;
+        m_is_manager.CacheBlockHeight(blockIndex);
+        cycleHeightOpt = blockIndex->nHeight;
     }
+    const int block_height = *cycleHeightOpt;
 
     // Deterministic islocks MUST use rotation based llmq
     auto llmqType = Params().GetConsensus().llmqTypeDIP0024InstantSend;
@@ -125,16 +125,18 @@ Uint256HashSet NetInstantSend::ProcessPendingInstantSendLocks(
             continue;
         }
 
-        const auto blockIndex = WITH_LOCK(::cs_main, return m_chainstate.m_blockman.LookupBlockIndex(islock->cycleHash));
-        if (blockIndex == nullptr) {
+        auto cycleHeightOpt = m_is_manager.GetBlockHeight(islock->cycleHash);
+        if (!cycleHeightOpt) {
             batchVerifier.badSources.emplace(nodeId);
             continue;
         }
 
         int nSignHeight{-1};
         const auto dkgInterval = llmq_params.dkgInterval;
-        if (blockIndex->nHeight + dkgInterval < m_chainstate.m_chain.Height()) {
-            nSignHeight = blockIndex->nHeight + dkgInterval - 1;
+        const int tipHeight = m_is_manager.GetTipHeight();
+        const int cycleHeight = *cycleHeightOpt;
+        if (cycleHeight + dkgInterval < tipHeight) {
+            nSignHeight = cycleHeight + dkgInterval - 1;
         }
         // For RegTest non-rotating quorum cycleHash has directly quorum hash
         auto quorum = llmq_params.useRotation ? llmq::SelectQuorumForSigning(llmq_params, m_chainstate.m_chain, m_qman,
diff --git a/src/instantsend/signing.cpp b/src/instantsend/signing.cpp
index 789c0135f968..984968d9c53d 100644
--- a/src/instantsend/signing.cpp
+++ b/src/instantsend/signing.cpp
@@ -204,16 +204,28 @@ bool InstantSendSigner::CheckCanLock(const COutPoint& outpoint, bool printDebug,
         return false;
     }
 
-    const CBlockIndex* pindexMined;
-    int nTxAge;
-    {
-        LOCK(::cs_main);
-        pindexMined = m_chainstate.m_blockman.LookupBlockIndex(hashBlock);
-        nTxAge = m_chainstate.m_chain.Height() - pindexMined->nHeight + 1;
+    const auto blockHeight = m_isman.GetBlockHeight(hashBlock);
+    if (!blockHeight) {
+        if (printDebug) {
+            LogPrint(BCLog::INSTANTSEND, "%s -- txid=%s: failed to determine mined height for parent TX %s\n", __func__,
+                     txHash.ToString(), outpoint.hash.ToString());
+        }
+        return false;
+    }
+
+    const int tipHeight = m_isman.GetTipHeight();
+
+    if (tipHeight < *blockHeight) {
+        if (printDebug) {
+            LogPrint(BCLog::INSTANTSEND, "%s -- txid=%s: cached tip height %d is below block height %d for parent TX %s\n",
+                     __func__, txHash.ToString(), tipHeight, *blockHeight, outpoint.hash.ToString());
+        }
+        return false;
     }
 
-    if (nTxAge < nInstantSendConfirmationsRequired &&
-        !m_clhandler.HasChainLock(pindexMined->nHeight, pindexMined->GetBlockHash())) {
+    const int nTxAge = tipHeight - *blockHeight + 1;
+
+    if (nTxAge < nInstantSendConfirmationsRequired && !m_clhandler.HasChainLock(*blockHeight, hashBlock)) {
         if (printDebug) {
             LogPrint(BCLog::INSTANTSEND, "%s -- txid=%s: outpoint %s too new and not ChainLocked. nTxAge=%d, nInstantSendConfirmationsRequired=%d\n", __func__,
                      txHash.ToString(), outpoint.ToStringShort(), nTxAge, nInstantSendConfirmationsRequired);
diff --git a/src/instantsend/signing.h b/src/instantsend/signing.h
index f62ea90c4a18..cf878e8c21e9 100644
--- a/src/instantsend/signing.h
+++ b/src/instantsend/signing.h
@@ -8,6 +8,8 @@
 #include <instantsend/lock.h>
 #include <llmq/signing.h>
 
+#include <optional>
+
 class CMasternodeSync;
 class CSporkManager;
 class CTxMemPool;
@@ -34,6 +36,8 @@ class InstantSendSignerParent
     virtual bool IsLocked(const uint256& txHash) const = 0;
     virtual InstantSendLockPtr GetConflictingLock(const CTransaction& tx) const = 0;
     virtual void TryEmplacePendingLock(const uint256& hash, const NodeId id, const InstantSendLockPtr& islock) = 0;
+    virtual std::optional<int> GetBlockHeight(const uint256& hash) const = 0;
+    virtual int GetTipHeight() const = 0;
 };
 
 class InstantSendSigner final : public llmq::CRecoveredSigsListener

From 493d077e8717cdb0f8aeed701a1feb444f64b1dc Mon Sep 17 00:00:00 2001
From: pasta <pasta@dashboost.org>
Date: Thu, 13 Nov 2025 14:05:33 -0600
Subject: [PATCH 535/656] refactor: simplify optional usage

---
 src/instantsend/instantsend.cpp | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/src/instantsend/instantsend.cpp b/src/instantsend/instantsend.cpp
index da43d5396366..22561afc8c2f 100644
--- a/src/instantsend/instantsend.cpp
+++ b/src/instantsend/instantsend.cpp
@@ -147,11 +147,9 @@ std::variant<uint256, CTransactionRef, std::monostate> CInstantSendManager::Proc
     const auto tx = GetTransaction(nullptr, &mempool, islock->txid, Params().GetConsensus(), hashBlock);
     const bool found_transaction{tx != nullptr};
     // we ignore failure here as we must be able to propagate the lock even if we don't have the TX locally
-    int minedHeight{-1};
-    if (found_transaction && !hashBlock.IsNull()) {
-        if (auto h = GetBlockHeight(hashBlock)) {
-            minedHeight = *h;
-        } else {
+    std::optional<int> minedHeight = GetBlockHeight(hashBlock);
+    if (found_transaction) {
+        if (!minedHeight.has_value()) {
             const CBlockIndex* pindexMined = WITH_LOCK(::cs_main, return m_chainstate.m_blockman.LookupBlockIndex(hashBlock));
             if (pindexMined != nullptr) {
                 CacheBlockHeight(pindexMined->GetBlockHash(), pindexMined->nHeight);
@@ -160,7 +158,7 @@ std::variant<uint256, CTransactionRef, std::monostate> CInstantSendManager::Proc
         }
         // Let's see if the TX that was locked by this islock is already mined in a ChainLocked block. If yes,
         // we can simply ignore the islock, as the ChainLock implies locking of all TXs in that chain
-        if (clhandler.HasChainLock(minedHeight, hashBlock)) {
+        if (minedHeight.has_value() && clhandler.HasChainLock(*minedHeight, hashBlock)) {
             LogPrint(BCLog::INSTANTSEND, /* Continued */
                      "CInstantSendManager::%s -- txlock=%s, islock=%s: dropping islock as it already got a "
                      "ChainLock in block %s, peer=%d\n",
@@ -171,8 +169,8 @@ std::variant<uint256, CTransactionRef, std::monostate> CInstantSendManager::Proc
 
     if (found_transaction) {
         db.WriteNewInstantSendLock(hash, islock);
-        if (minedHeight >= 0) {
-            db.WriteInstantSendLockMined(hash, minedHeight);
+        if (minedHeight.has_value()) {
+            db.WriteInstantSendLockMined(hash, *minedHeight);
         }
     } else {
         // put it in a separate pending map and try again later
@@ -748,6 +746,9 @@ void CInstantSendManager::CacheBlockHeight(const uint256& hash, int height) cons
 
 std::optional<int> CInstantSendManager::GetBlockHeight(const uint256& hash) const
 {
+    if (hash.IsNull()) {
+        return std::nullopt;
+    }
     {
         LOCK(cs_height_cache);
         int cached_height{0};

From e918729c2c109c2a1281d6ae3447521322ec8512 Mon Sep 17 00:00:00 2001
From: UdjinM6 <UdjinM6@users.noreply.github.com>
Date: Fri, 14 Nov 2025 14:44:00 +0300
Subject: [PATCH 536/656] refactor: add CacheTipHeight, improve cache API
 safety

Add CacheTipHeight() helper to eliminate code duplication when updating
tip height cache. Refactor cache methods to accept CBlockIndex* instead
of hash/height pairs for type safety. Handle nullptr cases properly.
---
 src/instantsend/instantsend.cpp | 51 +++++++++++++++------------------
 src/instantsend/instantsend.h   |  5 ++--
 2 files changed, 26 insertions(+), 30 deletions(-)

diff --git a/src/instantsend/instantsend.cpp b/src/instantsend/instantsend.cpp
index 22561afc8c2f..68766bf0c71f 100644
--- a/src/instantsend/instantsend.cpp
+++ b/src/instantsend/instantsend.cpp
@@ -152,7 +152,7 @@ std::variant<uint256, CTransactionRef, std::monostate> CInstantSendManager::Proc
         if (!minedHeight.has_value()) {
             const CBlockIndex* pindexMined = WITH_LOCK(::cs_main, return m_chainstate.m_blockman.LookupBlockIndex(hashBlock));
             if (pindexMined != nullptr) {
-                CacheBlockHeight(pindexMined->GetBlockHash(), pindexMined->nHeight);
+                CacheBlockHeight(pindexMined);
                 minedHeight = pindexMined->nHeight;
             }
         }
@@ -258,11 +258,7 @@ void CInstantSendManager::BlockConnected(const std::shared_ptr<const CBlock>& pb
         return;
     }
 
-    {
-        LOCK(cs_height_cache);
-        CacheBlockHeightInternal(pindex->GetBlockHash(), pindex->nHeight);
-        m_cached_tip_height = pindex->nHeight;
-    }
+    CacheTipHeight(pindex);
 
     if (m_mn_sync.IsBlockchainSynced()) {
         const bool has_chainlock = clhandler.HasChainLock(pindex->nHeight, pindex->GetBlockHash());
@@ -294,13 +290,10 @@ void CInstantSendManager::BlockDisconnected(const std::shared_ptr<const CBlock>&
     {
         LOCK(cs_height_cache);
         m_cached_block_heights.erase(pindexDisconnected->GetBlockHash());
-        const CBlockIndex* const new_tip = pindexDisconnected->pprev;
-        m_cached_tip_height = new_tip ? new_tip->nHeight : -1;
-        if (new_tip) {
-            CacheBlockHeightInternal(new_tip->GetBlockHash(), new_tip->nHeight);
-        }
     }
 
+    CacheTipHeight(pindexDisconnected->pprev);
+
     db.RemoveBlockInstantSendLocks(pblock, pindexDisconnected);
 }
 
@@ -440,11 +433,7 @@ void CInstantSendManager::NotifyChainLock(const CBlockIndex* pindexChainLock)
 
 void CInstantSendManager::UpdatedBlockTip(const CBlockIndex* pindexNew)
 {
-    {
-        LOCK(cs_height_cache);
-        CacheBlockHeightInternal(pindexNew->GetBlockHash(), pindexNew->nHeight);
-        m_cached_tip_height = pindexNew->nHeight;
-    }
+    CacheTipHeight(pindexNew);
 
     bool fDIP0008Active = pindexNew->pprev && pindexNew->pprev->nHeight >= Params().GetConsensus().DIP0008Height;
 
@@ -732,16 +721,16 @@ size_t CInstantSendManager::GetInstantSendLockCount() const
     return db.GetInstantSendLockCount();
 }
 
-void CInstantSendManager::CacheBlockHeightInternal(const uint256& hash, int height) const
+void CInstantSendManager::CacheBlockHeightInternal(const CBlockIndex* const block_index) const
 {
     AssertLockHeld(cs_height_cache);
-    m_cached_block_heights.insert(hash, height);
+    m_cached_block_heights.insert(block_index->GetBlockHash(), block_index->nHeight);
 }
 
-void CInstantSendManager::CacheBlockHeight(const uint256& hash, int height) const
+void CInstantSendManager::CacheBlockHeight(const CBlockIndex* const block_index) const
 {
     LOCK(cs_height_cache);
-    CacheBlockHeightInternal(hash, height);
+    CacheBlockHeightInternal(block_index);
 }
 
 std::optional<int> CInstantSendManager::GetBlockHeight(const uint256& hash) const
@@ -760,10 +749,21 @@ std::optional<int> CInstantSendManager::GetBlockHeight(const uint256& hash) cons
         return std::nullopt;
     }
 
-    CacheBlockHeight(pindex->GetBlockHash(), pindex->nHeight);
+    CacheBlockHeight(pindex);
     return pindex->nHeight;
 }
 
+void CInstantSendManager::CacheTipHeight(const CBlockIndex* const tip) const
+{
+    LOCK(cs_height_cache);
+    if (tip) {
+        CacheBlockHeightInternal(tip);
+        m_cached_tip_height = tip->nHeight;
+    } else {
+        m_cached_tip_height = -1;
+    }
+}
+
 int CInstantSendManager::GetTipHeight() const
 {
     {
@@ -774,14 +774,9 @@ int CInstantSendManager::GetTipHeight() const
     }
 
     const CBlockIndex* tip = WITH_LOCK(::cs_main, return m_chainstate.m_chain.Tip());
-    assert(tip != nullptr);
 
-    {
-        LOCK(cs_height_cache);
-        CacheBlockHeightInternal(tip->GetBlockHash(), tip->nHeight);
-        m_cached_tip_height = tip->nHeight;
-        return m_cached_tip_height;
-    }
+    CacheTipHeight(tip);
+    return tip ? tip->nHeight : -1;
 }
 
 bool CInstantSendManager::IsInstantSendEnabled() const
diff --git a/src/instantsend/instantsend.h b/src/instantsend/instantsend.h
index 8709637f25f4..9b93198e85f4 100644
--- a/src/instantsend/instantsend.h
+++ b/src/instantsend/instantsend.h
@@ -99,7 +99,7 @@ class CInstantSendManager final : public instantsend::InstantSendSignerParent
         GUARDED_BY(cs_height_cache);
     mutable int m_cached_tip_height GUARDED_BY(cs_height_cache){-1};
 
-    void CacheBlockHeightInternal(const uint256& hash, int height) const EXCLUSIVE_LOCKS_REQUIRED(cs_height_cache);
+    void CacheBlockHeightInternal(const CBlockIndex* const block_index) const EXCLUSIVE_LOCKS_REQUIRED(cs_height_cache);
 
 public:
     CInstantSendManager() = delete;
@@ -179,8 +179,9 @@ class CInstantSendManager final : public instantsend::InstantSendSignerParent
 
     size_t GetInstantSendLockCount() const;
 
-    void CacheBlockHeight(const uint256& hash, int height) const EXCLUSIVE_LOCKS_REQUIRED(!cs_height_cache);
+    void CacheBlockHeight(const CBlockIndex* const block_index) const EXCLUSIVE_LOCKS_REQUIRED(!cs_height_cache);
     std::optional<int> GetBlockHeight(const uint256& hash) const override EXCLUSIVE_LOCKS_REQUIRED(!cs_height_cache);
+    void CacheTipHeight(const CBlockIndex* const tip) const EXCLUSIVE_LOCKS_REQUIRED(!cs_height_cache);
     int GetTipHeight() const override EXCLUSIVE_LOCKS_REQUIRED(!cs_height_cache);
 
     bool IsInstantSendEnabled() const override;

From 61a1f726e5032db0eb64f6aeec844d159df56e19 Mon Sep 17 00:00:00 2001
From: Kittywhiskers Van Gogh <63189531+kwvg@users.noreply.github.com>
Date: Tue, 17 Dec 2024 04:28:10 +0000
Subject: [PATCH 537/656] revert: stop tracking cmake dependency
 relic_conf.h.in

reverts:
- 02260cba57f5b28c35509fbd6168feac50a1980e.
---
 .../depends/relic/include/relic_conf.h.in     | 717 ++++++++++++++++++
 1 file changed, 717 insertions(+)
 create mode 100644 src/dashbls/depends/relic/include/relic_conf.h.in

diff --git a/src/dashbls/depends/relic/include/relic_conf.h.in b/src/dashbls/depends/relic/include/relic_conf.h.in
new file mode 100644
index 000000000000..7db6f5b509c4
--- /dev/null
+++ b/src/dashbls/depends/relic/include/relic_conf.h.in
@@ -0,0 +1,717 @@
+/*
+ * RELIC is an Efficient LIbrary for Cryptography
+ * Copyright (c) 2009 RELIC Authors
+ *
+ * This file is part of RELIC. RELIC is legal property of its developers,
+ * whose names are not listed here. Please refer to the COPYRIGHT file
+ * for contact information.
+ *
+ * RELIC is free software; you can redistribute it and/or modify it under the
+ * terms of the version 2.1 (or later) of the GNU Lesser General Public License
+ * as published by the Free Software Foundation; or version 2.0 of the Apache
+ * License as published by the Apache Software Foundation. See the LICENSE files
+ * for more details.
+ *
+ * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ * A PARTICULAR PURPOSE. See the LICENSE files for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public or the
+ * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
+ * or <https://www.apache.org/licenses/>.
+ */
+
+/**
+ * @file
+ *
+ * Project configuration.
+ *
+ * @version $Id: relic_conf.h.in 45 2009-07-04 23:45:48Z dfaranha $
+ * @ingroup relic
+ */
+
+#ifndef RLC_CONF_H
+#define RLC_CONF_H
+
+/** Project version. */
+#define RLC_VERSION "@VERSION@"
+
+/** Debugging support. */
+#cmakedefine DEBUG
+/** Profiling support. */
+#cmakedefine PROFL
+/** Error handling support. */
+#cmakedefine CHECK
+/** Verbose error messages. */
+#cmakedefine VERBS
+/** Build with overhead estimation. */
+#cmakedefine OVERH
+/** Build documentation. */
+#cmakedefine DOCUM
+/** Build only the selected algorithms. */
+#cmakedefine STRIP
+/** Build with printing disabled. */
+#cmakedefine QUIET
+/** Build with colored output. */
+#cmakedefine COLOR
+/** Build with big-endian support. */
+#cmakedefine BIGED
+/** Build shared library. */
+#cmakedefine SHLIB
+/** Build static library. */
+#cmakedefine STLIB
+
+/** Number of times each test is ran. */
+#define TESTS    @TESTS@
+/** Number of times each benchmark is ran. */
+#define BENCH    @BENCH@
+/** Number of available cores. */
+#define CORES    @CORES@
+
+/** Atmel AVR ATMega128 8-bit architecture. */
+#define AVR      1
+/** MSP430 16-bit architecture. */
+#define MSP      2
+/** ARM 32-bit architecture. */
+#define ARM      3
+/** Intel x86-compatible 32-bit architecture. */
+#define X86      4
+/** AMD64-compatible 64-bit architecture. */
+#define X64      5
+/** Architecture. */
+#cmakedefine ARCH	 @ARCH@
+
+/** Size of word in this architecture. */
+#define WSIZE    @WSIZE@
+
+/** Byte boundary to align digit vectors. */
+#define ALIGN    @ALIGN@
+
+/** Build multiple precision integer module. */
+#cmakedefine WITH_BN
+/** Build prime field module. */
+#cmakedefine WITH_FP
+/** Build prime field extension module. */
+#cmakedefine WITH_FPX
+/** Build binary field module. */
+#cmakedefine WITH_FB
+/** Build prime elliptic curve module. */
+#cmakedefine WITH_EP
+/** Build prime field extension elliptic curve module. */
+#cmakedefine WITH_EPX
+/** Build binary elliptic curve module. */
+#cmakedefine WITH_EB
+/** Build elliptic Edwards curve module. */
+#cmakedefine WITH_ED
+/** Build elliptic curve cryptography module. */
+#cmakedefine WITH_EC
+/** Build pairings over prime curves module. */
+#cmakedefine WITH_PP
+/** Build pairing-based cryptography module. */
+#cmakedefine WITH_PC
+/** Build block ciphers. */
+#cmakedefine WITH_BC
+/** Build hash functions. */
+#cmakedefine WITH_MD
+/** Build cryptographic protocols. */
+#cmakedefine WITH_CP
+/** Build Multi-party computation primitives. */
+#cmakedefine WITH_MPC
+
+/** Easy C-only backend. */
+#define EASY	 1
+/** GMP backend. */
+#define GMP      2
+/** GMP constant-time backend. */
+#define GMP_SEC  3
+/** Arithmetic backend. */
+#define ARITH    @ARITH@
+
+/** Required precision in bits. */
+#define BN_PRECI @BN_PRECI@
+/** A multiple precision integer can store w words. */
+#define SINGLE	 0
+/** A multiple precision integer can store the result of an addition. */
+#define CARRY	 1
+/** A multiple precision integer can store the result of a multiplication. */
+#define DOUBLE	 2
+/** Effective size of a multiple precision integer. */
+#define BN_MAGNI @BN_MAGNI@
+/** Number of Karatsuba steps. */
+#define BN_KARAT @BN_KARAT@
+
+/** Schoolbook multiplication. */
+#define BASIC    1
+/** Comba multiplication. */
+#define COMBA    2
+/** Chosen multiple precision multiplication method. */
+#define BN_MUL   @BN_MUL@
+
+/** Schoolbook squaring. */
+#define BASIC    1
+/** Comba squaring. */
+#define COMBA    2
+/** Reuse multiplication for squaring. */
+#define MULTP    4
+/** Chosen multiple precision multiplication method. */
+#define BN_SQR   @BN_SQR@
+
+/** Division modular reduction. */
+#define BASIC    1
+/** Barrett modular reduction. */
+#define BARRT    2
+/** Montgomery modular reduction. */
+#define MONTY    3
+/** Pseudo-Mersenne modular reduction. */
+#define PMERS    4
+/** Chosen multiple precision modular reduction method. */
+#define BN_MOD   @BN_MOD@
+
+/** Binary modular exponentiation. */
+#define BASIC    1
+/** Sliding window modular exponentiation. */
+#define SLIDE    2
+/** Montgomery powering ladder. */
+#define MONTY    3
+/** Chosen multiple precision modular exponentiation method. */
+#define BN_MXP   @BN_MXP@
+
+/** Basic Euclidean GCD Algorithm. */
+#define BASIC    1
+/** Lehmer's fast GCD Algorithm. */
+#define LEHME    2
+/** Stein's binary GCD Algorithm. */
+#define STEIN    3
+/** Chosen multiple precision greatest common divisor method. */
+#define BN_GCD   @BN_GCD@
+
+/** Basic prime generation. */
+#define BASIC    1
+/** Safe prime generation. */
+#define SAFEP    2
+/** Strong prime generation. */
+#define STRON    3
+/** Chosen prime generation algorithm. */
+#define BN_GEN   @BN_GEN@
+
+/** Multiple precision arithmetic method */
+#define BN_METHD "@BN_METHD@"
+
+/** Prime field size in bits. */
+#define FP_PRIME @FP_PRIME@
+/** Number of Karatsuba steps. */
+#define FP_KARAT @FP_KARAT@
+/** Prefer Pseudo-Mersenne primes over random primes. */
+#cmakedefine FP_PMERS
+/** Use -1 as quadratic non-residue. */
+#cmakedefine FP_QNRES
+/** Width of window processing for exponentiation methods. */
+#define FP_WIDTH @FP_WIDTH@
+
+/** Schoolbook addition. */
+#define BASIC    1
+/** Integrated modular addtion. */
+#define INTEG    3
+/** Chosen prime field multiplication method. */
+#define FP_ADD   @FP_ADD@
+
+/** Schoolbook multiplication. */
+#define BASIC    1
+/** Comba multiplication. */
+#define COMBA    2
+/** Integrated modular multiplication. */
+#define INTEG    3
+/** Chosen prime field multiplication method. */
+#define FP_MUL   @FP_MUL@
+
+/** Schoolbook squaring. */
+#define BASIC    1
+/** Comba squaring. */
+#define COMBA    2
+/** Integrated modular squaring. */
+#define INTEG    3
+/** Reuse multiplication for squaring. */
+#define MULTP    4
+/** Chosen prime field multiplication method. */
+#define FP_SQR   @FP_SQR@
+
+/** Division-based reduction. */
+#define BASIC    1
+/** Fast reduction modulo special form prime. */
+#define QUICK    2
+/** Montgomery modular reduction. */
+#define MONTY    3
+/** Chosen prime field reduction method. */
+#define FP_RDC   @FP_RDC@
+
+/** Inversion by Fermat's Little Theorem. */
+#define BASIC    1
+/** Binary inversion. */
+#define BINAR    2
+/** Integrated modular multiplication. */
+#define MONTY    3
+/** Extended Euclidean algorithm. */
+#define EXGCD    4
+/** Constant-time inversion by Bernstein-Yang division steps. */
+#define DIVST    5
+/** Use implementation provided by the lower layer. */
+#define LOWER    8
+/** Chosen prime field inversion method. */
+#define FP_INV   @FP_INV@
+
+/** Binary modular exponentiation. */
+#define BASIC    1
+/** Sliding window modular exponentiation. */
+#define SLIDE    2
+/** Constant-time Montgomery powering ladder. */
+#define MONTY    3
+/** Chosen multiple precision modular exponentiation method. */
+#define FP_EXP   @FP_EXP@
+
+/** Prime field arithmetic method */
+#define FP_METHD "@FP_METHD@"
+
+/** Basic quadratic extension field arithmetic. */
+#define BASIC    1
+/** Integrated extension field arithmetic. */
+#define INTEG    3
+/* Chosen extension field arithmetic method. */
+#define FPX_QDR   @FPX_QDR@
+
+/** Basic cubic extension field arithmetic. */
+#define BASIC    1
+/** Integrated extension field arithmetic. */
+#define INTEG    3
+/* Chosen extension field arithmetic method. */
+#define FPX_CBC   @FPX_CBC@
+
+/** Basic quadratic extension field arithmetic. */
+#define BASIC    1
+/** Lazy-reduced extension field arithmetic. */
+#define LAZYR    2
+/* Chosen extension field arithmetic method. */
+#define FPX_RDC   @FPX_RDC@
+
+/** Prime extension field arithmetic method */
+#define FPX_METHD "@FPX_METHD@"
+
+/** Irreducible polynomial size in bits. */
+#define FB_POLYN @FB_POLYN@
+/** Number of Karatsuba steps. */
+#define FB_KARAT @FB_KARAT@
+/** Prefer trinomials over pentanomials. */
+#cmakedefine FB_TRINO
+/** Prefer square-root friendly polynomials. */
+#cmakedefine FB_SQRTF
+/** Precompute multiplication table for sqrt(z). */
+#cmakedefine FB_PRECO
+/** Width of window processing for exponentiation methods. */
+#define FB_WIDTH @FB_WIDTH@
+
+/** Shift-and-add multiplication. */
+#define BASIC    1
+/** Lopez-Dahab multiplication. */
+#define LODAH	 2
+/** Integrated modular multiplication. */
+#define INTEG	 3
+/** Chosen binary field multiplication method. */
+#define FB_MUL   @FB_MUL@
+
+/** Basic squaring. */
+#define BASIC    1
+/** Table-based squaring. */
+#define QUICK    2
+/** Integrated modular squaring. */
+#define INTEG	 3
+/** Chosen binary field squaring method. */
+#define FB_SQR   @FB_SQR@
+
+/** Shift-and-add modular reduction. */
+#define BASIC    1
+/** Fast reduction modulo a trinomial or pentanomial. */
+#define QUICK	 2
+/** Chosen binary field modular reduction method. */
+#define FB_RDC   @FB_RDC@
+
+/** Square root by repeated squaring. */
+#define BASIC    1
+/** Fast square root extraction. */
+#define QUICK	 2
+/** Chosen binary field modular reduction method. */
+#define FB_SRT   @FB_SRT@
+
+/** Trace by repeated squaring. */
+#define BASIC    1
+/** Fast trace computation. */
+#define QUICK	 2
+/** Chosen trace computation method. */
+#define FB_TRC   @FB_TRC@
+
+/** Solve by half-trace computation. */
+#define BASIC    1
+/** Solve with precomputed half-traces. */
+#define QUICK	 2
+/** Chosen method to solve a quadratic equation. */
+#define FB_SLV   @FB_SLV@
+
+/** Inversion by Fermat's Little Theorem. */
+#define BASIC    1
+/** Binary inversion. */
+#define BINAR    2
+/** Almost inverse algorithm. */
+#define ALMOS    3
+/** Extended Euclidean algorithm. */
+#define EXGCD    4
+/** Itoh-Tsuji inversion. */
+#define ITOHT    5
+/** Hardware-friendly inversion by Brunner-Curiger-Hofstetter.*/
+#define BRUCH    6
+/** Constant-time version of almost inverse. */
+#define CTAIA    7
+/** Use implementation provided by the lower layer. */
+#define LOWER    8
+/** Chosen binary field inversion method. */
+#define FB_INV   @FB_INV@
+
+/** Binary modular exponentiation. */
+#define BASIC    1
+/** Sliding window modular exponentiation. */
+#define SLIDE    2
+/** Constant-time Montgomery powering ladder. */
+#define MONTY    3
+/** Chosen multiple precision modular exponentiation method. */
+#define FB_EXP   @FB_EXP@
+
+/** Iterated squaring/square-root by consecutive squaring/square-root. */
+#define BASIC    1
+/** Iterated squaring/square-root by table-based method. */
+#define QUICK	 2
+/** Chosen method to solve a quadratic equation. */
+#define FB_ITR   @FB_ITR@
+
+/** Binary field arithmetic method */
+#define FB_METHD "@FB_METHD@"
+
+/** Support for ordinary curves. */
+#cmakedefine EP_PLAIN
+/** Support for supersingular curves. */
+#cmakedefine EP_SUPER
+/** Support for prime curves with efficient endormorphisms. */
+#cmakedefine EP_ENDOM
+/** Use mixed coordinates. */
+#cmakedefine EP_MIXED
+/** Build precomputation table for generator. */
+#cmakedefine EP_PRECO
+/** Enable isogeny map for SSWU map-to-curve. */
+#cmakedefine EP_CTMAP
+/** Width of precomputation table for fixed point methods. */
+#define EP_DEPTH @EP_DEPTH@
+/** Width of window processing for unknown point methods. */
+#define EP_WIDTH @EP_WIDTH@
+
+/** Affine coordinates. */
+#define BASIC	 1
+/** Projective coordinates. */
+#define PROJC	 2
+/** Jacobian coordinates. */
+#define JACOB	 3
+/** Chosen prime elliptic curve coordinate method. */
+#define EP_ADD	 @EP_ADD@
+
+/** Binary point multiplication. */
+#define BASIC	 1
+/** Sliding window. */
+#define SLIDE    2
+/** Montgomery powering ladder. */
+#define MONTY	 3
+/** Left-to-right Width-w NAF. */
+#define LWNAF	 4
+/** Left-to-right Width-w NAF. */
+#define LWREG	 5
+/** Chosen prime elliptic curve point multiplication method. */
+#define EP_MUL	 @EP_MUL@
+
+/** Binary point multiplication. */
+#define BASIC	 1
+/** Single-table comb method. */
+#define COMBS	 2
+/** Double-table comb method. */
+#define COMBD    3
+/** Left-to-right Width-w NAF. */
+#define LWNAF	 4
+/** Chosen prime elliptic curve point multiplication method. */
+#define EP_FIX	 @EP_FIX@
+
+/** Basic simultaneouns point multiplication. */
+#define BASIC    1
+/** Shamir's trick. */
+#define TRICK    2
+/** Interleaving of w-(T)NAFs. */
+#define INTER    3
+/** Joint sparse form. */
+#define JOINT    4
+/** Chosen prime elliptic curve simulteanous point multiplication method. */
+#define EP_SIM   @EP_SIM@
+
+/** Prime elliptic curve arithmetic method. */
+#define EP_METHD "@EP_METHD@"
+
+/** Support for ordinary curves without endormorphisms. */
+#cmakedefine EB_PLAIN
+/** Support for Koblitz anomalous binary curves. */
+#cmakedefine EB_KBLTZ
+/** Use mixed coordinates. */
+#cmakedefine EB_MIXED
+/** Build precomputation table for generator. */
+#cmakedefine EB_PRECO
+/** Width of precomputation table for fixed point methods. */
+#define EB_DEPTH @EB_DEPTH@
+/** Width of window processing for unknown point methods. */
+#define EB_WIDTH @EB_WIDTH@
+
+/** Binary elliptic curve arithmetic method. */
+#define EB_METHD "@EB_METHD@"
+
+/** Affine coordinates. */
+#define BASIC	 1
+/** López-Dahab Projective coordinates. */
+#define PROJC	 2
+/** Chosen binary elliptic curve coordinate method. */
+#define EB_ADD	 @EB_ADD@
+
+/** Binary point multiplication. */
+#define BASIC	 1
+/** L�pez-Dahab point multiplication. */
+#define LODAH	 2
+/** Halving. */
+#define HALVE    3
+/** Left-to-right width-w (T)NAF. */
+#define LWNAF	 4
+/** Right-to-left width-w (T)NAF. */
+#define RWNAF	 5
+/** Chosen binary elliptic curve point multiplication method. */
+#define EB_MUL	 @EB_MUL@
+
+/** Binary point multiplication. */
+#define BASIC	 1
+/** Single-table comb method. */
+#define COMBS	 2
+/** Double-table comb method. */
+#define COMBD    3
+/** Left-to-right Width-w NAF. */
+#define LWNAF	 4
+/** Chosen binary elliptic curve point multiplication method. */
+#define EB_FIX	 @EB_FIX@
+
+/** Basic simultaneouns point multiplication. */
+#define BASIC    1
+/** Shamir's trick. */
+#define TRICK    2
+/** Interleaving of w-(T)NAFs. */
+#define INTER    3
+/** Joint sparse form. */
+#define JOINT    4
+/** Chosen binary elliptic curve simulteanous point multiplication method. */
+#define EB_SIM   @EB_SIM@
+
+/** Build precomputation table for generator. */
+#cmakedefine ED_PRECO
+/** Width of precomputation table for fixed point methods. */
+#define ED_DEPTH @ED_DEPTH@
+/** Width of window processing for unknown point methods. */
+#define ED_WIDTH @ED_WIDTH@
+
+/** Edwards elliptic curve arithmetic method. */
+#define ED_METHD "@ED_METHD@"
+
+/** Affine coordinates. */
+#define BASIC    1
+/** Simple projective twisted Edwards coordinates */
+#define PROJC	 2
+/** Extended projective twisted Edwards coordinates */
+#define EXTND	 3
+/** Chosen binary elliptic curve coordinate method. */
+#define ED_ADD	 @ED_ADD@
+
+/** Binary point multiplication. */
+#define BASIC	 1
+/** Sliding window. */
+#define SLIDE    2
+/** Montgomery powering ladder. */
+#define MONTY	 3
+/** Left-to-right Width-w NAF. */
+#define LWNAF	 4
+/** Left-to-right Width-w NAF. */
+#define LWREG	 5
+/** Chosen prime elliptic twisted Edwards curve point multiplication method. */
+#define ED_MUL	 @ED_MUL@
+
+/** Binary point multiplication. */
+#define BASIC	 1
+/** Single-table comb method. */
+#define COMBS	 2
+/** Double-table comb method. */
+#define COMBD    3
+/** Left-to-right Width-w NAF. */
+#define LWNAF	 4
+/** Chosen prime elliptic twisted Edwards curve point multiplication method. */
+#define ED_FIX	 @ED_FIX@
+
+/** Basic simultaneouns point multiplication. */
+#define BASIC    1
+/** Shamir's trick. */
+#define TRICK    2
+/** Interleaving of w-(T)NAFs. */
+#define INTER    3
+/** Joint sparse form. */
+#define JOINT    4
+/** Chosen prime elliptic curve simulteanous point multiplication method. */
+#define ED_SIM   @ED_SIM@
+
+/** Prime curves. */
+#define PRIME    1
+/** Binary curves. */
+#define CHAR2    2
+/** Edwards curves */
+#define EDDIE    3
+/** Chosen elliptic curve type. */
+#define EC_CUR	 @EC_CUR@
+
+/** Chosen elliptic curve cryptography method. */
+#define EC_METHD "@EC_METHD@"
+/** Prefer curves with efficient endomorphisms. */
+#cmakedefine EC_ENDOM
+
+/** Basic quadratic extension field arithmetic. */
+#define BASIC    1
+/** Lazy-reduced extension field arithmetic. */
+#define LAZYR    2
+/* Chosen extension field arithmetic method. */
+#define PP_EXT   @PP_EXT@
+
+/** Bilinear pairing method. */
+#define PP_METHD "@PP_METHD@"
+
+/** Tate pairing. */
+#define TATEP    1
+/** Weil pairing. */
+#define WEILP    2
+/** Optimal ate pairing. */
+#define OATEP    3
+/** Chosen pairing method over prime elliptic curves. */
+#define PP_MAP   @PP_MAP@
+
+/** SHA-224 hash function. */
+#define SH224          2
+/** SHA-256 hash function. */
+#define SH256          3
+/** SHA-384 hash function. */
+#define SH384          4
+/** SHA-512 hash function. */
+#define SH512          5
+/** BLAKE2s-160 hash function. */
+#define B2S160         6
+/** BLAKE2s-256 hash function. */
+#define B2S256         7
+/** Chosen hash function. */
+#define MD_MAP   @MD_MAP@
+
+/** Choice of hash function. */
+#define MD_METHD "@MD_METHD@"
+
+/** Chosen RSA method. */
+#cmakedefine CP_CRT
+/** RSA without padding. */
+#define BASIC    1
+/** RSA PKCS#1 v1.5 padding. */
+#define PKCS1    2
+/** RSA PKCS#1 v2.1 padding. */
+#define PKCS2    3
+/** Chosen RSA padding method. */
+#define CP_RSAPD @CP_RSAPD@
+
+/** Automatic memory allocation. */
+#define AUTO     1
+/** Dynamic memory allocation. */
+#define DYNAMIC  2
+/** Chosen memory allocation policy. */
+#define ALLOC    @ALLOC@
+
+/** NIST HASH-DRBG generator. */
+#define HASHD    1
+/** Intel RdRand instruction. */
+#define RDRND    2
+/** Operating system underlying generator. */
+#define UDEV     3
+/** Override library generator with the callback. */
+#define CALL     4
+/** Chosen random generator. */
+#define RAND     @RAND@
+
+/** Standard C library generator. */
+#define LIBC     1
+/** Intel RdRand instruction. */
+#define RDRND    2
+/** Device node generator. */
+#define UDEV     3
+/** Use Windows' CryptGenRandom. */
+#define WCGR     4
+/** Chosen random generator seeder. */
+#cmakedefine SEED     @SEED@
+
+/** GNU/Linux operating system. */
+#define LINUX    1
+/** FreeBSD operating system. */
+#define FREEBSD  2
+/** Windows operating system. */
+#define MACOSX   3
+/** Windows operating system. */
+#define WINDOWS  4
+/** Android operating system. */
+#define DROID    5
+/** Arduino platform. */
+#define DUINO    6
+/** OpenBSD operating system. */
+#define OPENBSD  7
+/** Detected operation system. */
+#cmakedefine OPSYS    @OPSYS@
+
+/** OpenMP multithreading support. */
+#define OPENMP   1
+/** POSIX multithreading support. */
+#define PTHREAD  2
+/** Chosen multithreading API. */
+#cmakedefine MULTI    @MULTI@
+
+/** Per-process high-resolution timer. */
+#define HREAL    1
+/** Per-process high-resolution timer. */
+#define HPROC    2
+/** Per-thread high-resolution timer. */
+#define HTHRD    3
+/** POSIX-compatible timer. */
+#define POSIX    4
+/** ANSI-compatible timer. */
+#define ANSI     5
+/** Cycle-counting timer. */
+#define CYCLE    6
+/** Performance monitoring framework. */
+#define PERF     7
+/** Chosen timer. */
+#cmakedefine TIMER    @TIMER@
+
+/** Prefix to identity this build of the library. */
+#cmakedefine LABEL    @LABEL@
+
+#ifndef ASM
+
+#include "relic_label.h"
+
+/**
+ * Prints the project options selected at build time.
+ */
+void conf_print(void);
+
+#endif /* ASM */
+
+#endif /* !RLC_CONF_H */

From 83d072735625b00b262d70c8b22a74041fdc65eb Mon Sep 17 00:00:00 2001
From: Kittywhiskers Van Gogh <63189531+kwvg@users.noreply.github.com>
Date: Thu, 20 Nov 2025 01:13:55 +0530
Subject: [PATCH 538/656] Squashed 'src/dashbls/' changes from
 dd683653c6..6169ee9c91

6169ee9c91 Merge pull request #120 from kwvg/bump_2.0
8b8e492967 chore: bump version to 2.0
e367139843 Merge pull request #119 from PastaPastaPasta/various-optimizations
6dc1515724 fix: include array
290a787340 fix: compilation error
44bbdd6d2e perf: CoreMPL::Aggregate needs a vector, this implicitly allocates vecPublicKeys.size() times
776a061b8b perf: remove unneeded SecAlloc in SignG2
7b1fb5a17f perf: remove unused bn_t one
e2ee41d376 perf: use reserve where trivial
b6c08aa624 perf: avoid extra allocations and copies in HashPubKeys
829291f4c2 fix: leak in HashPubKeys
b94489cb3e fix: memory leak in CoreMPL::AggregateSecure, call bn_free for each time we call bn_new
483003da88 fix: avoid allocation churn in DivFP; fix memory leak
6e7c89a18b fix: add a destructor to fix a memory leak
05a79d2b44 perf: avoid unneeded vector allocation in Add
d7958a05f6 Revert "perf: use unordered_set and fail fast in BasicSchemeMPL::AggregateVerify"
a19de6290b perf: use unordered_set and fail fast in BasicSchemeMPL::AggregateVerify
e25c2e34c7 perf: prefer serialize to array
7c1d20a6af perf: use serializeToArray
4e833dbc1f fix: include <array>
9141e14446 perf: in CoreMPL::Aggregate return array
10744ea62f perf: don't use vector for constant sized
2af62e2b62 Merge pull request #116 from kwvg/bump_mimalloc_3.0.10
7bec91a655 patch: add awareness for different page sizes
03bf222cad patch: swap conditions to evaluate emscripten-specific case earlier
cae3f99ee8 patch: s/mi_align_up_ptr/_mi_align_up_ptr/g
e79044797a ci: build with debug enabled
1ca74c12c8 build: prefer debug mimalloc lib over release lib for Rust and Go binds
c47c84e409 build: update build files for `mimalloc` subtree bump
a325850bfd build: harmonize cmake version across dependencies
f064d8fe7f depends: commit microsoft/mimalloc@dfa50c37 to source tree as da7905c9
da7905c923 Squashed 'depends/mimalloc/' changes from 91ba1f374..dfa50c37d
b4622d0c7a revert: update cmake
160dd95097 Merge pull request #117 from kwvg/homekeep_p2
79775723d9 revert: disable Go bindings CI for macos for now
ef58d4306a chore(ci): bump Go to 1.24
f4242f46df ci: add Rust 1.91 to build matrix, test bindings
fc54fc58c8 chore(ci): bump Python version matrix to test 3.10 to 3.13
2881362fd9 fix: account for API changes introduced in Python 3.13 in binds
3c7fa5c41c build: apply review suggestions for Go binds Makefile
3dafb33875 build: add Homebrew and MacPorts awareness in Go binds Makefile
bb72770c97 refactor: shuffle contents of Go binds Makefile
dd4766212b build: drop standalone library definition comments from Go binds
68905cdbad build: enable runtime assertions for WASM debug builds
9368177b81 build: ensure LINK_FLAGS actually propagate to blsjstmp
b0006ab1e9 Merge pull request #118 from kwvg/fix_sz
a47caad61a refactor: use the size of the buffer in the Python binds when possible
8b200a6640 fix: correct typo in Python bindings
f91afeec90 fix!: pass the actual size of the buffer from the Go bindings
9605703c78 fix!: pass the actual size of the buffer from the Rust bindings

git-subtree-dir: src/dashbls
git-subtree-split: 6169ee9c9141d209c2a576f0e2e99856b2ee3e25
---
 .github/workflows/build-binds.yml             |   24 +-
 .github/workflows/build-test.yaml             |    2 +-
 Makefile.mimalloc.include                     |   42 +-
 configure.ac                                  |    2 +-
 depends/mimalloc/.gitignore                   |    6 +-
 depends/mimalloc/CMakeLists.txt               |  551 ++++-
 depends/mimalloc/LICENSE                      |    2 +-
 depends/mimalloc/SECURITY.md                  |   41 +
 depends/mimalloc/azure-pipelines.yml          |  208 +-
 .../mimalloc/bin/mimalloc-redirect-arm64.dll  |  Bin 0 -> 61440 bytes
 .../mimalloc/bin/mimalloc-redirect-arm64.lib  |  Bin 0 -> 2976 bytes
 .../bin/mimalloc-redirect-arm64ec.dll         |  Bin 0 -> 104960 bytes
 .../bin/mimalloc-redirect-arm64ec.lib         |  Bin 0 -> 3308 bytes
 depends/mimalloc/bin/mimalloc-redirect.dll    |  Bin 56832 -> 60416 bytes
 depends/mimalloc/bin/mimalloc-redirect.lib    |  Bin 2874 -> 2874 bytes
 depends/mimalloc/bin/mimalloc-redirect32.dll  |  Bin 40448 -> 38912 bytes
 depends/mimalloc/bin/mimalloc-redirect32.lib  |  Bin 2928 -> 2928 bytes
 depends/mimalloc/bin/minject-arm64.exe        |  Bin 0 -> 23040 bytes
 depends/mimalloc/bin/minject.exe              |  Bin 20992 -> 24064 bytes
 depends/mimalloc/bin/minject32.exe            |  Bin 18432 -> 20480 bytes
 depends/mimalloc/bin/readme.md                |  118 +
 .../cmake/mimalloc-config-version.cmake       |    6 +-
 depends/mimalloc/cmake/mimalloc-config.cmake  |    8 +-
 .../contrib/docker/alpine-arm32v7/Dockerfile  |   28 +
 .../contrib/docker/alpine-x86/Dockerfile      |   28 +
 .../mimalloc/contrib/docker/alpine/Dockerfile |   23 +
 .../contrib/docker/manylinux-x64/Dockerfile   |   23 +
 depends/mimalloc/contrib/docker/readme.md     |   10 +
 depends/mimalloc/contrib/vcpkg/portfile.cmake |   64 +
 depends/mimalloc/contrib/vcpkg/readme.md      |   40 +
 depends/mimalloc/contrib/vcpkg/usage          |   20 +
 .../contrib/vcpkg/vcpkg-cmake-wrapper.cmake   |   20 +
 depends/mimalloc/contrib/vcpkg/vcpkg.json     |   48 +
 depends/mimalloc/doc/doxyfile                 |  700 ++++--
 depends/mimalloc/doc/mimalloc-doc.h           |  438 ++--
 depends/mimalloc/doc/mimalloc-doxygen.css     |   11 +
 depends/mimalloc/docs/annotated.html          |   65 +-
 depends/mimalloc/docs/bench.html              |   65 +-
 depends/mimalloc/docs/build.html              |   67 +-
 depends/mimalloc/docs/classes.html            |   65 +-
 depends/mimalloc/docs/clipboard.js            |   61 +
 depends/mimalloc/docs/cookie.js               |   58 +
 depends/mimalloc/docs/doxygen.css             |  765 +++---
 depends/mimalloc/docs/doxygen.svg             |   28 +
 depends/mimalloc/docs/dynsections.js          |  253 +-
 depends/mimalloc/docs/environment.html        |   85 +-
 depends/mimalloc/docs/functions.html          |   82 +-
 depends/mimalloc/docs/functions_vars.html     |   84 +-
 depends/mimalloc/docs/group__aligned.html     |  305 +--
 depends/mimalloc/docs/group__aligned.js       |   17 +-
 depends/mimalloc/docs/group__analysis.html    |  266 ++-
 depends/mimalloc/docs/group__analysis.js      |    5 +-
 ...group__analysis_structmi__heap__area__t.js |    2 +
 depends/mimalloc/docs/group__cpp.html         |  267 +--
 depends/mimalloc/docs/group__cpp.js           |   16 +-
 depends/mimalloc/docs/group__extended.html    | 1016 +++++---
 depends/mimalloc/docs/group__extended.js      |   23 +-
 depends/mimalloc/docs/group__heap.html        |  698 +++---
 depends/mimalloc/docs/group__heap.js          |   46 +-
 depends/mimalloc/docs/group__malloc.html      |  408 ++--
 depends/mimalloc/docs/group__malloc.js        |   22 +-
 depends/mimalloc/docs/group__options.html     |  335 +--
 depends/mimalloc/docs/group__options.js       |   34 +-
 depends/mimalloc/docs/group__posix.html       |  481 ++--
 depends/mimalloc/docs/group__posix.js         |   18 +-
 depends/mimalloc/docs/group__typed.html       |  311 +--
 depends/mimalloc/docs/group__zeroinit.html    |  365 ++-
 depends/mimalloc/docs/group__zeroinit.js      |   22 +-
 depends/mimalloc/docs/index.html              |   81 +-
 depends/mimalloc/docs/jquery.js               |  197 +-
 .../mimalloc/docs/mimalloc-doc_8h_source.html |  976 ++++----
 depends/mimalloc/docs/mimalloc-doxygen.css    |   11 +
 depends/mimalloc/docs/modules.html            |    8 +-
 depends/mimalloc/docs/navtree.css             |   17 +-
 depends/mimalloc/docs/navtree.js              |  829 +++----
 depends/mimalloc/docs/navtreedata.js          |    6 +-
 depends/mimalloc/docs/navtreeindex0.js        |  289 ++-
 depends/mimalloc/docs/overrides.html          |  117 +-
 depends/mimalloc/docs/pages.html              |   67 +-
 depends/mimalloc/docs/resize.js               |  185 +-
 depends/mimalloc/docs/search/all_1.js         |    4 +-
 depends/mimalloc/docs/search/all_10.js        |    4 +
 depends/mimalloc/docs/search/all_2.js         |    8 +-
 depends/mimalloc/docs/search/all_3.js         |    4 +-
 depends/mimalloc/docs/search/all_4.js         |    4 +-
 depends/mimalloc/docs/search/all_5.js         |    4 +-
 depends/mimalloc/docs/search/all_6.js         |  153 +-
 depends/mimalloc/docs/search/all_7.js         |    3 +-
 depends/mimalloc/docs/search/all_8.js         |    3 +-
 depends/mimalloc/docs/search/all_9.js         |  191 +-
 depends/mimalloc/docs/search/all_a.js         |    3 +-
 depends/mimalloc/docs/search/all_b.js         |    4 +-
 depends/mimalloc/docs/search/all_c.js         |    4 +-
 depends/mimalloc/docs/search/all_d.js         |    3 +-
 depends/mimalloc/docs/search/all_e.js         |    5 +
 depends/mimalloc/docs/search/all_f.js         |    4 +
 depends/mimalloc/docs/search/classes_0.js     |    4 +-
 depends/mimalloc/docs/search/close.svg        |   18 +
 depends/mimalloc/docs/search/enums_0.js       |    2 +-
 depends/mimalloc/docs/search/enumvalues_0.js  |    2 +-
 depends/mimalloc/docs/search/enumvalues_1.js  |   44 +-
 depends/mimalloc/docs/search/functions_0.js   |  248 +-
 depends/mimalloc/docs/search/groups_0.js      |    4 +-
 depends/mimalloc/docs/search/groups_1.js      |    2 +-
 depends/mimalloc/docs/search/groups_2.js      |    2 +-
 depends/mimalloc/docs/search/groups_3.js      |    2 +-
 depends/mimalloc/docs/search/groups_4.js      |    3 +-
 depends/mimalloc/docs/search/groups_5.js      |    3 +-
 depends/mimalloc/docs/search/groups_6.js      |    3 +-
 depends/mimalloc/docs/search/groups_7.js      |    2 +-
 depends/mimalloc/docs/search/groups_8.js      |    2 +-
 depends/mimalloc/docs/search/groups_9.js      |    4 +
 depends/mimalloc/docs/search/groups_a.js      |    5 +
 depends/mimalloc/docs/search/groups_b.js      |    4 +
 depends/mimalloc/docs/search/groups_c.js      |    4 +
 depends/mimalloc/docs/search/groups_d.js      |    4 +
 depends/mimalloc/docs/search/pages_0.js       |    2 +-
 depends/mimalloc/docs/search/pages_1.js       |    2 +-
 depends/mimalloc/docs/search/pages_2.js       |    2 +-
 depends/mimalloc/docs/search/pages_3.js       |    4 +-
 depends/mimalloc/docs/search/pages_4.js       |    3 +-
 depends/mimalloc/docs/search/pages_5.js       |    4 +
 depends/mimalloc/docs/search/pages_6.js       |    4 +
 depends/mimalloc/docs/search/pages_7.js       |    4 +
 depends/mimalloc/docs/search/search.css       |  159 +-
 depends/mimalloc/docs/search/search.js        | 1018 ++++----
 depends/mimalloc/docs/search/searchdata.js    |    8 +-
 depends/mimalloc/docs/search/typedefs_0.js    |   12 +-
 depends/mimalloc/docs/search/variables_0.js   |    4 +-
 depends/mimalloc/docs/search/variables_1.js   |    2 +-
 depends/mimalloc/docs/search/variables_2.js   |    2 +-
 depends/mimalloc/docs/search/variables_3.js   |    2 +-
 depends/mimalloc/docs/search/variables_4.js   |    4 +
 depends/mimalloc/docs/tabs.css                |   13 +-
 depends/mimalloc/docs/topics.js               |   13 +
 depends/mimalloc/docs/using.html              |   69 +-
 .../ide/vs2017/mimalloc-override-test.vcxproj |  190 --
 .../mimalloc-override-test.vcxproj.filters    |   22 -
 .../ide/vs2017/mimalloc-override.vcxproj      |  256 --
 .../vs2017/mimalloc-override.vcxproj.filters  |   86 -
 .../ide/vs2017/mimalloc-test-stress.vcxproj   |  159 --
 .../mimalloc-test-stress.vcxproj.filters      |   22 -
 .../mimalloc/ide/vs2017/mimalloc-test.vcxproj |  158 --
 .../ide/vs2017/mimalloc-test.vcxproj.filters  |   22 -
 depends/mimalloc/ide/vs2017/mimalloc.sln      |   71 -
 depends/mimalloc/ide/vs2017/mimalloc.vcxproj  |  262 ---
 .../ide/vs2017/mimalloc.vcxproj.filters       |   92 -
 .../ide/vs2019/mimalloc-override-test.vcxproj |  190 --
 .../ide/vs2019/mimalloc-override.vcxproj      |  256 --
 .../vs2019/mimalloc-override.vcxproj.filters  |   84 -
 .../ide/vs2019/mimalloc-test-api.vcxproj      |  155 --
 .../ide/vs2019/mimalloc-test-stress.vcxproj   |  159 --
 .../mimalloc/ide/vs2019/mimalloc-test.vcxproj |  158 --
 depends/mimalloc/ide/vs2019/mimalloc.sln      |   81 -
 depends/mimalloc/ide/vs2019/mimalloc.vcxproj  |  254 --
 .../ide/vs2019/mimalloc.vcxproj.filters       |   87 -
 .../mimalloc/ide/vs2022/mimalloc-lib.vcxproj  |  500 ++++
 .../ide/vs2022/mimalloc-lib.vcxproj.filters   |  108 +
 .../ide/vs2022/mimalloc-override-dll.vcxproj  |  515 ++++
 .../mimalloc-override-dll.vcxproj.filters     |  108 +
 .../vs2022/mimalloc-override-test-dep.vcxproj |  355 +++
 .../ide/vs2022/mimalloc-override-test.vcxproj |  174 +-
 .../ide/vs2022/mimalloc-override.vcxproj      |  257 --
 .../ide/vs2022/mimalloc-test-api.vcxproj      |  142 +-
 .../ide/vs2022/mimalloc-test-stress.vcxproj   |  137 +-
 .../mimalloc/ide/vs2022/mimalloc-test.vcxproj |  141 +-
 depends/mimalloc/ide/vs2022/mimalloc.sln      |   82 +-
 depends/mimalloc/ide/vs2022/mimalloc.vcxproj  |  255 --
 depends/mimalloc/include/mimalloc-internal.h  | 1093 ---------
 .../mimalloc/include/mimalloc-new-delete.h    |   19 +-
 depends/mimalloc/include/mimalloc-override.h  |    3 +-
 depends/mimalloc/include/mimalloc-stats.h     |  117 +
 depends/mimalloc/include/mimalloc-track.h     |   43 -
 depends/mimalloc/include/mimalloc-types.h     |  602 -----
 depends/mimalloc/include/mimalloc.h           |  307 ++-
 .../{mimalloc-atomic.h => mimalloc/atomic.h}  |  302 ++-
 depends/mimalloc/include/mimalloc/bits.h      |  377 +++
 depends/mimalloc/include/mimalloc/internal.h  | 1203 ++++++++++
 depends/mimalloc/include/mimalloc/prim.h      |  431 ++++
 depends/mimalloc/include/mimalloc/track.h     |  145 ++
 depends/mimalloc/include/mimalloc/types.h     |  614 +++++
 depends/mimalloc/mimalloc.pc.in               |    8 +-
 depends/mimalloc/readme.md                    |  472 ++--
 depends/mimalloc/src/alloc-aligned.c          |  281 ++-
 depends/mimalloc/src/alloc-override.c         |   91 +-
 depends/mimalloc/src/alloc-posix.c            |   15 +-
 depends/mimalloc/src/alloc.c                  |  895 +++----
 depends/mimalloc/src/arena-meta.c             |  179 ++
 depends/mimalloc/src/arena.c                  | 2092 ++++++++++++++---
 depends/mimalloc/src/bitmap.c                 | 1986 +++++++++++++---
 depends/mimalloc/src/bitmap.h                 |  363 ++-
 depends/mimalloc/src/free.c                   |  577 +++++
 depends/mimalloc/src/heap.c                   |  574 +++--
 depends/mimalloc/src/init.c                   |  930 ++++----
 depends/mimalloc/src/libc.c                   |  417 ++++
 depends/mimalloc/src/options.c                |  567 +++--
 depends/mimalloc/src/os.c                     | 1620 ++++---------
 depends/mimalloc/src/page-map.c               |  389 +++
 depends/mimalloc/src/page-queue.c             |  269 ++-
 depends/mimalloc/src/page.c                   |  744 +++---
 depends/mimalloc/src/prim/emscripten/prim.c   |  252 ++
 .../osx/alloc-override-zone.c}                |   40 +-
 depends/mimalloc/src/prim/osx/prim.c          |    9 +
 depends/mimalloc/src/prim/prim.c              |   76 +
 depends/mimalloc/src/prim/readme.md           |    9 +
 depends/mimalloc/src/prim/unix/prim.c         |  973 ++++++++
 depends/mimalloc/src/prim/wasi/prim.c         |  288 +++
 .../src/prim/windows/etw-mimalloc.wprp        |   61 +
 depends/mimalloc/src/prim/windows/etw.h       |  905 +++++++
 depends/mimalloc/src/prim/windows/etw.man     |  Bin 0 -> 3926 bytes
 depends/mimalloc/src/prim/windows/prim.c      |  915 +++++++
 depends/mimalloc/src/prim/windows/readme.md   |   17 +
 depends/mimalloc/src/random.c                 |  204 +-
 depends/mimalloc/src/region.c                 |  506 ----
 depends/mimalloc/src/segment-cache.c          |  368 ---
 depends/mimalloc/src/segment.c                | 1553 ------------
 depends/mimalloc/src/static.c                 |   30 +-
 depends/mimalloc/src/stats.c                  |  735 +++---
 depends/mimalloc/test/CMakeLists.txt          |   12 +-
 depends/mimalloc/test/main-override-dep.cpp   |   60 +
 depends/mimalloc/test/main-override-dep.h     |   12 +
 depends/mimalloc/test/main-override-static.c  |  245 +-
 depends/mimalloc/test/main-override.cpp       |  287 ++-
 depends/mimalloc/test/test-api-fill.c         |   15 +-
 depends/mimalloc/test/test-api.c              |  231 +-
 depends/mimalloc/test/test-stress.c           |  185 +-
 depends/mimalloc/test/test-wrong.c            |   42 +-
 depends/mimalloc/test/testhelper.h            |   10 +-
 depends/relic/CMakeLists.txt                  |    6 +-
 go-bindings/Makefile                          |   75 +-
 go-bindings/elements.cpp                      |    8 +-
 go-bindings/elements.go                       |    6 +-
 go-bindings/elements.h                        |    4 +-
 go-bindings/privatekey.cpp                    |    4 +-
 go-bindings/privatekey.go                     |    4 +-
 go-bindings/privatekey.h                      |    2 +-
 go-bindings/schemes.go                        |    2 -
 go-bindings/threshold.go                      |    2 -
 go-bindings/util.go                           |    2 -
 include/dashbls/schemes.hpp                   |    7 +-
 js-bindings/CMakeLists.txt                    |   15 +-
 python-bindings/pythonbindings.cpp            |   42 +-
 rust-bindings/bls-dash-sys/bindings.rs        |    5 +
 rust-bindings/bls-dash-sys/build.rs           |   14 +-
 .../c-bindings/bip32/extendedprivatekey.cpp   |    6 +-
 .../c-bindings/bip32/extendedprivatekey.h     |    1 +
 .../c-bindings/bip32/extendedpublickey.cpp    |    3 +-
 .../c-bindings/bip32/extendedpublickey.h      |    1 +
 .../bls-dash-sys/c-bindings/elements.cpp      |    8 +-
 .../bls-dash-sys/c-bindings/elements.h        |    4 +-
 .../bls-dash-sys/c-bindings/privatekey.cpp    |    4 +-
 .../bls-dash-sys/c-bindings/privatekey.h      |    2 +-
 .../bls-signatures/src/bip32/private_key.rs   |    2 +-
 .../bls-signatures/src/bip32/public_key.rs    |    2 +-
 rust-bindings/bls-signatures/src/elements.rs  |    4 +-
 .../bls-signatures/src/private_key.rs         |    2 +-
 src/CMakeLists.txt                            |   14 +
 src/privatekey.cpp                            |    6 +-
 src/schemes.cpp                               |   79 +-
 src/test.cpp                                  |   42 +-
 src/threshold.cpp                             |   13 +-
 261 files changed, 27240 insertions(+), 18129 deletions(-)
 create mode 100644 depends/mimalloc/SECURITY.md
 create mode 100755 depends/mimalloc/bin/mimalloc-redirect-arm64.dll
 create mode 100755 depends/mimalloc/bin/mimalloc-redirect-arm64.lib
 create mode 100755 depends/mimalloc/bin/mimalloc-redirect-arm64ec.dll
 create mode 100755 depends/mimalloc/bin/mimalloc-redirect-arm64ec.lib
 mode change 100644 => 100755 depends/mimalloc/bin/mimalloc-redirect.dll
 mode change 100644 => 100755 depends/mimalloc/bin/mimalloc-redirect.lib
 mode change 100644 => 100755 depends/mimalloc/bin/mimalloc-redirect32.dll
 mode change 100644 => 100755 depends/mimalloc/bin/mimalloc-redirect32.lib
 create mode 100644 depends/mimalloc/bin/minject-arm64.exe
 create mode 100644 depends/mimalloc/bin/readme.md
 create mode 100644 depends/mimalloc/contrib/docker/alpine-arm32v7/Dockerfile
 create mode 100644 depends/mimalloc/contrib/docker/alpine-x86/Dockerfile
 create mode 100644 depends/mimalloc/contrib/docker/alpine/Dockerfile
 create mode 100644 depends/mimalloc/contrib/docker/manylinux-x64/Dockerfile
 create mode 100644 depends/mimalloc/contrib/docker/readme.md
 create mode 100644 depends/mimalloc/contrib/vcpkg/portfile.cmake
 create mode 100644 depends/mimalloc/contrib/vcpkg/readme.md
 create mode 100644 depends/mimalloc/contrib/vcpkg/usage
 create mode 100644 depends/mimalloc/contrib/vcpkg/vcpkg-cmake-wrapper.cmake
 create mode 100644 depends/mimalloc/contrib/vcpkg/vcpkg.json
 create mode 100644 depends/mimalloc/docs/clipboard.js
 create mode 100644 depends/mimalloc/docs/cookie.js
 create mode 100644 depends/mimalloc/docs/doxygen.svg
 create mode 100644 depends/mimalloc/docs/search/all_10.js
 create mode 100644 depends/mimalloc/docs/search/all_e.js
 create mode 100644 depends/mimalloc/docs/search/all_f.js
 create mode 100644 depends/mimalloc/docs/search/close.svg
 create mode 100644 depends/mimalloc/docs/search/groups_9.js
 create mode 100644 depends/mimalloc/docs/search/groups_a.js
 create mode 100644 depends/mimalloc/docs/search/groups_b.js
 create mode 100644 depends/mimalloc/docs/search/groups_c.js
 create mode 100644 depends/mimalloc/docs/search/groups_d.js
 create mode 100644 depends/mimalloc/docs/search/pages_5.js
 create mode 100644 depends/mimalloc/docs/search/pages_6.js
 create mode 100644 depends/mimalloc/docs/search/pages_7.js
 create mode 100644 depends/mimalloc/docs/search/variables_4.js
 create mode 100644 depends/mimalloc/docs/topics.js
 delete mode 100644 depends/mimalloc/ide/vs2017/mimalloc-override-test.vcxproj
 delete mode 100644 depends/mimalloc/ide/vs2017/mimalloc-override-test.vcxproj.filters
 delete mode 100644 depends/mimalloc/ide/vs2017/mimalloc-override.vcxproj
 delete mode 100644 depends/mimalloc/ide/vs2017/mimalloc-override.vcxproj.filters
 delete mode 100644 depends/mimalloc/ide/vs2017/mimalloc-test-stress.vcxproj
 delete mode 100644 depends/mimalloc/ide/vs2017/mimalloc-test-stress.vcxproj.filters
 delete mode 100644 depends/mimalloc/ide/vs2017/mimalloc-test.vcxproj
 delete mode 100644 depends/mimalloc/ide/vs2017/mimalloc-test.vcxproj.filters
 delete mode 100644 depends/mimalloc/ide/vs2017/mimalloc.sln
 delete mode 100644 depends/mimalloc/ide/vs2017/mimalloc.vcxproj
 delete mode 100644 depends/mimalloc/ide/vs2017/mimalloc.vcxproj.filters
 delete mode 100644 depends/mimalloc/ide/vs2019/mimalloc-override-test.vcxproj
 delete mode 100644 depends/mimalloc/ide/vs2019/mimalloc-override.vcxproj
 delete mode 100644 depends/mimalloc/ide/vs2019/mimalloc-override.vcxproj.filters
 delete mode 100644 depends/mimalloc/ide/vs2019/mimalloc-test-api.vcxproj
 delete mode 100644 depends/mimalloc/ide/vs2019/mimalloc-test-stress.vcxproj
 delete mode 100644 depends/mimalloc/ide/vs2019/mimalloc-test.vcxproj
 delete mode 100644 depends/mimalloc/ide/vs2019/mimalloc.sln
 delete mode 100644 depends/mimalloc/ide/vs2019/mimalloc.vcxproj
 delete mode 100644 depends/mimalloc/ide/vs2019/mimalloc.vcxproj.filters
 create mode 100644 depends/mimalloc/ide/vs2022/mimalloc-lib.vcxproj
 create mode 100644 depends/mimalloc/ide/vs2022/mimalloc-lib.vcxproj.filters
 create mode 100644 depends/mimalloc/ide/vs2022/mimalloc-override-dll.vcxproj
 create mode 100644 depends/mimalloc/ide/vs2022/mimalloc-override-dll.vcxproj.filters
 create mode 100644 depends/mimalloc/ide/vs2022/mimalloc-override-test-dep.vcxproj
 delete mode 100644 depends/mimalloc/ide/vs2022/mimalloc-override.vcxproj
 delete mode 100644 depends/mimalloc/ide/vs2022/mimalloc.vcxproj
 delete mode 100644 depends/mimalloc/include/mimalloc-internal.h
 create mode 100644 depends/mimalloc/include/mimalloc-stats.h
 delete mode 100644 depends/mimalloc/include/mimalloc-track.h
 delete mode 100644 depends/mimalloc/include/mimalloc-types.h
 rename depends/mimalloc/include/{mimalloc-atomic.h => mimalloc/atomic.h} (59%)
 create mode 100644 depends/mimalloc/include/mimalloc/bits.h
 create mode 100644 depends/mimalloc/include/mimalloc/internal.h
 create mode 100644 depends/mimalloc/include/mimalloc/prim.h
 create mode 100644 depends/mimalloc/include/mimalloc/track.h
 create mode 100644 depends/mimalloc/include/mimalloc/types.h
 create mode 100644 depends/mimalloc/src/arena-meta.c
 create mode 100644 depends/mimalloc/src/free.c
 create mode 100644 depends/mimalloc/src/libc.c
 create mode 100644 depends/mimalloc/src/page-map.c
 create mode 100644 depends/mimalloc/src/prim/emscripten/prim.c
 rename depends/mimalloc/src/{alloc-override-osx.c => prim/osx/alloc-override-zone.c} (93%)
 create mode 100644 depends/mimalloc/src/prim/osx/prim.c
 create mode 100644 depends/mimalloc/src/prim/prim.c
 create mode 100644 depends/mimalloc/src/prim/readme.md
 create mode 100644 depends/mimalloc/src/prim/unix/prim.c
 create mode 100644 depends/mimalloc/src/prim/wasi/prim.c
 create mode 100644 depends/mimalloc/src/prim/windows/etw-mimalloc.wprp
 create mode 100644 depends/mimalloc/src/prim/windows/etw.h
 create mode 100644 depends/mimalloc/src/prim/windows/etw.man
 create mode 100644 depends/mimalloc/src/prim/windows/prim.c
 create mode 100644 depends/mimalloc/src/prim/windows/readme.md
 delete mode 100644 depends/mimalloc/src/region.c
 delete mode 100644 depends/mimalloc/src/segment-cache.c
 delete mode 100644 depends/mimalloc/src/segment.c
 create mode 100644 depends/mimalloc/test/main-override-dep.cpp
 create mode 100644 depends/mimalloc/test/main-override-dep.h

diff --git a/.github/workflows/build-binds.yml b/.github/workflows/build-binds.yml
index 6fc729109d74..43dc8b212590 100644
--- a/.github/workflows/build-binds.yml
+++ b/.github/workflows/build-binds.yml
@@ -17,14 +17,15 @@ concurrency:
 
 jobs:
   build:
-    name: ${{ matrix.os }}, Python ${{ matrix.python }}, Go ${{ matrix.golang }}
+    name: ${{ matrix.os }}, Python ${{ matrix.python }}, Go ${{ matrix.golang }}, Rust ${{ matrix.rust }}
     runs-on: ${{ matrix.os }}
     strategy:
       fail-fast: false
       matrix:
         os: [macos-latest, ubuntu-latest]
-        golang: [ '1.22' ]
-        python: ['3.9', '3.10', '3.11', '3.12']
+        golang: [ '1.24' ]
+        python: ['3.10', '3.11', '3.12', '3.13']
+        rust: [ '1.91.0' ]
 
     steps:
     - name: Checkout code
@@ -73,12 +74,23 @@ jobs:
     - name: Build library using CMake
       run: |
         mkdir -p build && cd build
-        cmake ..
+        cmake .. -DCMAKE_BUILD_TYPE=Debug
         cmake --build . -- -j 6
 
     - name: Build Go bindings
-      # TODO: macos build is broken. Whoever needs this - please fix it and remove `if` below.
-      if: startsWith(matrix.os, 'ubuntu')
       run: |
         cd go-bindings
+        make config
         make
+
+    - name: Install Rust
+      run: |
+        rustup toolchain install ${{ matrix.rust }}
+        rustup default ${{ matrix.rust }}
+        rustc --version
+        cargo --version
+
+    - name: Build and test Rust bindings
+      run: |
+        cd rust-bindings/bls-dash-sys
+        cargo test
diff --git a/.github/workflows/build-test.yaml b/.github/workflows/build-test.yaml
index 2f210d86255e..90a550a5e4d2 100644
--- a/.github/workflows/build-test.yaml
+++ b/.github/workflows/build-test.yaml
@@ -53,7 +53,7 @@ jobs:
       if: startsWith(matrix.builder, 'cmake')
       run: |
         mkdir -p build && cd build
-        CC=${{ matrix.compiler.cc }} CXX=${{ matrix.compiler.cxx }} cmake .. -DBUILD_BLS_PYTHON_BINDINGS=0 -DARITH=${{ matrix.backend }}
+        CC=${{ matrix.compiler.cc }} CXX=${{ matrix.compiler.cxx }} cmake .. -DARITH=${{ matrix.backend }} -DBUILD_BLS_PYTHON_BINDINGS=0 -DCMAKE_BUILD_TYPE=Debug
         cmake --build . -- -j 6
         mv src/runtest ..
 
diff --git a/Makefile.mimalloc.include b/Makefile.mimalloc.include
index f062d90e83d2..fada5fe32819 100644
--- a/Makefile.mimalloc.include
+++ b/Makefile.mimalloc.include
@@ -1,10 +1,10 @@
-# Copyright (c) 2022 The Dash Core developers
+# Copyright (c) 2022-2025 The Dash Core developers
 # Distributed under the MIT software license, see the accompanying
 # file COPYING.MIT or http://www.opensource.org/licenses/mit-license.php.
 
 LIBMIMALLOC = libmimalloc-secure.la
 
-MIMALLOC_CFLAGS = \
+MIMALLOC_CPPFLAGS = \
 	-DMI_SECURE=4 \
     -DNDEBUG
 
@@ -13,32 +13,34 @@ MIMALLOC_INCLUDES = \
 	-I$(top_srcdir)/depends/mimalloc/src
 
 MIMALLOC_H = \
-	depends/mimalloc/include/mimalloc.h \
-	depends/mimalloc/include/mimalloc-atomic.h \
-	depends/mimalloc/include/mimalloc-internal.h \
-	depends/mimalloc/include/mimalloc-new-delete.h \
-	depends/mimalloc/include/mimalloc-override.h \
-	depends/mimalloc/include/mimalloc-track.h \
-	depends/mimalloc/include/mimalloc-types.h \
+    depends/mimalloc/include/mimalloc-new-delete.h \
+    depends/mimalloc/include/mimalloc-override.h \
+    depends/mimalloc/include/mimalloc-stats.h \
+    depends/mimalloc/include/mimalloc.h \
 	depends/mimalloc/src/bitmap.h
 
 libmimalloc_secure_la_SOURCES = \
 	$(MIMALLOC_H) \
-    depends/mimalloc/src/stats.c \
-    depends/mimalloc/src/random.c \
-    depends/mimalloc/src/os.c \
-    depends/mimalloc/src/bitmap.c \
-    depends/mimalloc/src/arena.c \
-    depends/mimalloc/src/segment-cache.c \
-    depends/mimalloc/src/segment.c \
-    depends/mimalloc/src/page.c \
-    depends/mimalloc/src/alloc.c \
     depends/mimalloc/src/alloc-aligned.c \
     depends/mimalloc/src/alloc-posix.c \
+    depends/mimalloc/src/alloc.c \
+    depends/mimalloc/src/arena-meta.c \
+    depends/mimalloc/src/arena.c \
+    depends/mimalloc/src/bitmap.c \
     depends/mimalloc/src/heap.c \
+    depends/mimalloc/src/init.c \
+    depends/mimalloc/src/libc.c \
     depends/mimalloc/src/options.c \
-    depends/mimalloc/src/init.c
+    depends/mimalloc/src/os.c \
+    depends/mimalloc/src/page-map.c \
+    depends/mimalloc/src/page.c \
+    depends/mimalloc/src/random.c \
+    depends/mimalloc/src/stats.c \
+    depends/mimalloc/src/prim/prim.c
 
-libmimalloc_secure_la_CFLAGS = $(AM_CFLAGS) $(MIMALLOC_INCLUDES) $(MIMALLOC_CFLAGS)
+libmimalloc_secure_la_CPPFLAGS = $(AM_CPPFLAGS) $(MIMALLOC_CPPFLAGS) $(MIMALLOC_INCLUDES)
+libmimalloc_secure_la_CXXFLAGS = $(AM_CXXFLAGS)
+libmimalloc_secure_la_CFLAGS   = $(AM_CFLAGS)
+libmimalloc_secure_la_LDFLAGS  = $(AM_LDFLAGS)
 
 noinst_LTLIBRARIES += $(LIBMIMALLOC)
diff --git a/configure.ac b/configure.ac
index 7551af213c18..56b8a78339e0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 AC_PREREQ([2.60])
-AC_INIT([libdashbls],[1.3.6])
+AC_INIT([libdashbls],[2.0])
 AC_CONFIG_AUX_DIR([build-aux])
 AC_CONFIG_MACRO_DIR([build-aux/m4])
 
diff --git a/depends/mimalloc/.gitignore b/depends/mimalloc/.gitignore
index f8b7f5eb8e99..bcedbc3f7d71 100644
--- a/depends/mimalloc/.gitignore
+++ b/depends/mimalloc/.gitignore
@@ -1,9 +1,13 @@
+build
 ide/vs20??/*.db
 ide/vs20??/*.opendb
 ide/vs20??/*.user
-ide/vs20??/*.vcxproj.filters
 ide/vs20??/.vs
 ide/vs20??/VTune*
 out/
 docs/
 *.zip
+*.tar
+*.gz
+.vscode
+.DS_STore
diff --git a/depends/mimalloc/CMakeLists.txt b/depends/mimalloc/CMakeLists.txt
index 7ac6673e6bf4..bb3682c48bb8 100644
--- a/depends/mimalloc/CMakeLists.txt
+++ b/depends/mimalloc/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.14)
+cmake_minimum_required(VERSION 3.18)
 project(libmimalloc C CXX)
 
 set(CMAKE_C_STANDARD 11)
@@ -6,77 +6,179 @@ set(CMAKE_CXX_STANDARD 17)
 
 option(MI_SECURE            "Use full security mitigations (like guard pages, allocation randomization, double-free mitigation, and free-list corruption detection)" OFF)
 option(MI_DEBUG_FULL        "Use full internal heap invariant checking in DEBUG mode (expensive)" OFF)
-option(MI_PADDING           "Enable padding to detect heap block overflow (used only in DEBUG mode or with Valgrind)" ON)
-option(MI_OVERRIDE          "Override the standard malloc interface (e.g. define entry points for malloc() etc)" ON)
+option(MI_PADDING           "Enable padding to detect heap block overflow (always on in DEBUG or SECURE mode, or with Valgrind/ASAN)" OFF)
+option(MI_OVERRIDE          "Override the standard malloc interface (i.e. define entry points for 'malloc', 'free', etc)" ON)
 option(MI_XMALLOC           "Enable abort() call on memory allocation failure by default" OFF)
 option(MI_SHOW_ERRORS       "Show error and warning messages by default (only enabled by default in DEBUG mode)" OFF)
-option(MI_VALGRIND          "Compile with Valgrind support (adds a small overhead)" OFF)
+option(MI_GUARDED           "Build with guard pages behind certain object allocations (implies MI_NO_PADDING=ON)" OFF)
 option(MI_USE_CXX           "Use the C++ compiler to compile the library (instead of the C compiler)" OFF)
+option(MI_OPT_ARCH          "Only for optimized builds: turn on architecture specific optimizations (for x64: '-march=haswell;-mavx2' (2013), for arm64: '-march=armv8.1-a' (2016))" OFF)
+option(MI_OPT_SIMD          "Use SIMD instructions (requires MI_OPT_ARCH to be enabled)" OFF)
 option(MI_SEE_ASM           "Generate assembly files" OFF)
 option(MI_OSX_INTERPOSE     "Use interpose to override standard malloc on macOS" ON)
-option(MI_OSX_ZONE          "Use malloc zone to override standard malloc on macOS" ON) 
+option(MI_OSX_ZONE          "Use malloc zone to override standard malloc on macOS" ON)
 option(MI_WIN_REDIRECT      "Use redirection module ('mimalloc-redirect') on Windows if compiling mimalloc as a DLL" ON)
-option(MI_LOCAL_DYNAMIC_TLS "Use slightly slower, dlopen-compatible TLS mechanism (Unix)" OFF)
+option(MI_WIN_USE_FIXED_TLS "Use a fixed TLS slot on Windows to avoid extra tests in the malloc fast path" OFF)
+option(MI_LOCAL_DYNAMIC_TLS "Use local-dynamic-tls, a slightly slower but dlopen-compatible thread local storage mechanism (Unix)" OFF)
+option(MI_LIBC_MUSL         "Enable this when linking with musl libc" OFF)
+
+option(MI_DEBUG_TSAN        "Build with thread sanitizer (needs clang)" OFF)
+option(MI_DEBUG_UBSAN       "Build with undefined-behavior sanitizer (needs clang++)" OFF)
+option(MI_TRACK_VALGRIND    "Compile with Valgrind support (adds a small overhead)" OFF)
+option(MI_TRACK_ASAN        "Compile with address sanitizer support (adds a small overhead)" OFF)
+option(MI_TRACK_ETW         "Compile with Windows event tracing (ETW) support (adds a small overhead)" OFF)
+
 option(MI_BUILD_SHARED      "Build shared library" ON)
 option(MI_BUILD_STATIC      "Build static library" ON)
 option(MI_BUILD_OBJECT      "Build object library" ON)
 option(MI_BUILD_TESTS       "Build test executables" ON)
-option(MI_DEBUG_TSAN        "Build with thread sanitizer (needs clang)" OFF)
-option(MI_DEBUG_UBSAN       "Build with undefined-behavior sanitizer (needs clang++)" OFF)
-option(MI_SKIP_COLLECT_ON_EXIT, "Skip collecting memory on program exit" OFF)
+
+option(MI_SKIP_COLLECT_ON_EXIT "Skip collecting memory on program exit" OFF)
+option(MI_NO_PADDING        "Force no use of padding even in DEBUG mode etc." OFF)
+option(MI_INSTALL_TOPLEVEL  "Install directly into $CMAKE_INSTALL_PREFIX instead of PREFIX/lib/mimalloc-version" OFF)
+option(MI_NO_THP            "Disable transparent huge pages support on Linux/Android for the mimalloc process only" OFF)
+option(MI_EXTRA_CPPDEFS     "Extra pre-processor definitions (use as `-DMI_EXTRA_CPPDEFS=\"opt1=val1;opt2=val2\"`)" "")
+
+# negated options for vcpkg features
+option(MI_NO_USE_CXX        "Use plain C compilation (has priority over MI_USE_CXX)" OFF)
+option(MI_NO_OPT_ARCH       "Do not use architecture specific optimizations (like '-march=armv8.1-a' for example) (has priority over MI_OPT_ARCH)" OFF)
 
 # deprecated options
+option(MI_WIN_USE_FLS       "Use Fiber local storage on Windows to detect thread termination (deprecated)" OFF)
 option(MI_CHECK_FULL        "Use full internal invariant checking in DEBUG mode (deprecated, use MI_DEBUG_FULL instead)" OFF)
-option(MI_INSTALL_TOPLEVEL  "Install directly into $CMAKE_INSTALL_PREFIX instead of PREFIX/lib/mimalloc-version (deprecated)" OFF)
 option(MI_USE_LIBATOMIC     "Explicitly link with -latomic (on older systems) (deprecated and detected automatically)" OFF)
 
+include(CheckLinkerFlag)    # requires cmake 3.18
 include(CheckIncludeFiles)
 include(GNUInstallDirs)
 include("cmake/mimalloc-config-version.cmake")
 
 set(mi_sources
-    src/stats.c
-    src/random.c
-    src/os.c
-    src/bitmap.c
-    src/arena.c
-    src/segment-cache.c
-    src/segment.c
-    src/page.c
     src/alloc.c
     src/alloc-aligned.c
     src/alloc-posix.c
+    src/arena.c
+    src/arena-meta.c
+    src/bitmap.c
     src/heap.c
+    src/init.c
+    src/libc.c
     src/options.c
-    src/init.c)
+    src/os.c
+    src/page.c
+    src/page-map.c
+    src/random.c
+    src/stats.c
+    src/prim/prim.c)
 
+set(mi_cflags "")
+set(mi_cflags_static "")            # extra flags for a static library build
+set(mi_cflags_dynamic "")           # extra flags for a shared-object library build
+set(mi_libraries "")
+
+if(MI_EXTRA_CPPDEFS)
+ set(mi_defines ${MI_EXTRA_CPPDEFS})
+else()
+ set(mi_defines "")
+endif()
+
+# pass git revision as a define
+if(EXISTS "${CMAKE_SOURCE_DIR}/.git/index")
+  find_package(Git)
+  if(GIT_FOUND)
+    execute_process(COMMAND ${GIT_EXECUTABLE} "describe" OUTPUT_VARIABLE mi_git_describe RESULT_VARIABLE mi_git_res ERROR_QUIET OUTPUT_STRIP_TRAILING_WHITESPACE)
+    if(mi_git_res EQUAL "0")
+      list(APPEND mi_defines "MI_GIT_DESCRIBE=${mi_git_describe}")
+      # add to dependencies so we rebuild if the git head commit changes
+      set_property(GLOBAL APPEND PROPERTY CMAKE_CONFIGURE_DEPENDS "${CMAKE_SOURCE_DIR}/.git/index")
+    endif()
+  endif()
+endif()
 
 # -----------------------------------------------------------------------------
-# Convenience: set default build type depending on the build directory
+# Convenience: set default build type and compiler depending on the build directory
 # -----------------------------------------------------------------------------
 
-message(STATUS "")    
+message(STATUS "")
 if (NOT CMAKE_BUILD_TYPE)
-  if ("${CMAKE_BINARY_DIR}" MATCHES ".*(D|d)ebug$" OR  MI_DEBUG_FULL)
-    message(STATUS "No build type selected, default to: Debug")
+  if ("${CMAKE_BINARY_DIR}" MATCHES ".*((D|d)ebug|asan|tsan|ubsan|valgrind)$" OR MI_DEBUG_FULL)
+    message(STATUS "No build type selected, default to 'Debug'")
     set(CMAKE_BUILD_TYPE "Debug")
   else()
-    message(STATUS "No build type selected, default to: Release")
+    message(STATUS "No build type selected, default to 'Release'")
     set(CMAKE_BUILD_TYPE "Release")
   endif()
 endif()
 
+if (CMAKE_GENERATOR MATCHES "^Visual Studio.*$")
+  message(STATUS "Note: when building with Visual Studio the build type is specified when building.")
+  message(STATUS "For example: 'cmake --build . --config=Release")
+endif()
+
 if("${CMAKE_BINARY_DIR}" MATCHES ".*(S|s)ecure$")
   message(STATUS "Default to secure build")
   set(MI_SECURE "ON")
 endif()
 
 
+# Determine architecture
+set(MI_OPT_ARCH_FLAGS "")
+set(MI_ARCH "unknown")
+if(CMAKE_SYSTEM_PROCESSOR MATCHES "^(x86|i[3456]86)$" OR CMAKE_GENERATOR_PLATFORM MATCHES "^(x86|Win32)$")
+  set(MI_ARCH "x86")
+elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "^(x86_64|x64|amd64|AMD64)$" OR CMAKE_GENERATOR_PLATFORM STREQUAL "x64" OR "x86_64" IN_LIST CMAKE_OSX_ARCHITECTURES) # must be before arm64
+  set(MI_ARCH "x64")
+elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "^(aarch64|arm64|armv[89].?|ARM64)$" OR CMAKE_GENERATOR_PLATFORM STREQUAL "ARM64" OR "arm64" IN_LIST CMAKE_OSX_ARCHITECTURES)
+  set(MI_ARCH "arm64")
+elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "^(arm|armv[34567].?|ARM)$")
+  set(MI_ARCH "arm32")
+elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "^(riscv|riscv32|riscv64)$")
+  if(CMAKE_SIZEOF_VOID_P==4)
+    set(MI_ARCH "riscv32")
+  else()
+    set(MI_ARCH "riscv64")
+  endif()
+else()
+  set(MI_ARCH ${CMAKE_SYSTEM_PROCESSOR})
+endif()
+message(STATUS "Architecture: ${MI_ARCH}") # (${CMAKE_SYSTEM_PROCESSOR}, ${CMAKE_GENERATOR_PLATFORM}, ${CMAKE_GENERATOR})")
+
+# negative overrides (mainly to support vcpkg features)
+if(MI_NO_USE_CXX)
+  set(MI_USE_CXX "OFF")
+endif()
+if(MI_NO_OPT_ARCH)
+  set(MI_OPT_ARCH "OFF")
+elseif(MI_ARCH STREQUAL "arm64")
+  set(MI_OPT_ARCH "ON")  # enable armv8.1-a by default on arm64 unless MI_NO_OPT_ARCH is set
+endif()
+
+
 # -----------------------------------------------------------------------------
 # Process options
 # -----------------------------------------------------------------------------
 
-if(CMAKE_C_COMPILER_ID MATCHES "MSVC|Intel")
+if(CMAKE_C_COMPILER_ID STREQUAL "Clang" AND CMAKE_CXX_COMPILER_FRONTEND_VARIANT STREQUAL "MSVC")
+  set(MI_CLANG_CL "ON")
+endif()
+
+# put -Wall early so other warnings can be disabled selectively
+if(CMAKE_C_COMPILER_ID MATCHES "AppleClang|Clang")
+  if (MI_CLANG_CL)
+    list(APPEND mi_cflags -W)
+  else()
+    list(APPEND mi_cflags -Wall -Wextra -Wpedantic)
+  endif()
+endif()
+if(CMAKE_C_COMPILER_ID MATCHES "GNU")
+    list(APPEND mi_cflags -Wall -Wextra)
+endif()
+if(CMAKE_C_COMPILER_ID MATCHES "Intel")
+    list(APPEND mi_cflags -Wall)
+endif()
+
+# force C++ compilation with msvc or clang-cl to use modern C++ atomics
+if(CMAKE_C_COMPILER_ID MATCHES "MSVC|Intel" OR MI_CLANG_CL)
   set(MI_USE_CXX "ON")
 endif()
 
@@ -86,8 +188,8 @@ if(MI_OVERRIDE)
     if(MI_OSX_ZONE)
       # use zone's on macOS
       message(STATUS "  Use malloc zone to override malloc (MI_OSX_ZONE=ON)")
-      list(APPEND mi_sources src/alloc-override-osx.c)
-      list(APPEND mi_defines MI_OSX_ZONE=1)      
+      list(APPEND mi_sources src/prim/osx/alloc-override-zone.c)
+      list(APPEND mi_defines MI_OSX_ZONE=1)
       if (NOT MI_OSX_INTERPOSE)
         message(STATUS "  WARNING: zone overriding usually also needs interpose (use -DMI_OSX_INTERPOSE=ON)")
       endif()
@@ -107,12 +209,6 @@ if(MI_OVERRIDE)
 endif()
 
 if(WIN32)
-  if (MI_WIN_REDIRECT)
-    if (MSVC_C_ARCHITECTURE_ID MATCHES "ARM")
-      message(STATUS "Cannot use redirection on Windows ARM (MI_WIN_REDIRECT=OFF)")
-      set(MI_WIN_REDIRECT OFF)
-    endif()
-  endif()
   if (NOT MI_WIN_REDIRECT)
     # use a negative define for backward compatibility
     list(APPEND mi_defines MI_WIN_NOREDIRECT=1)
@@ -122,26 +218,75 @@ endif()
 if(MI_SECURE)
   message(STATUS "Set full secure build (MI_SECURE=ON)")
   list(APPEND mi_defines MI_SECURE=4)
-  #if (MI_VALGRIND)
-  #  message(WARNING "Secure mode is a bit weakened when compiling with Valgrind support as buffer overflow detection is no longer byte-precise (if running without valgrind)")
-  #endif()
 endif()
 
-if(MI_VALGRIND)
+if(MI_TRACK_VALGRIND)
   CHECK_INCLUDE_FILES("valgrind/valgrind.h;valgrind/memcheck.h" MI_HAS_VALGRINDH)
   if (NOT MI_HAS_VALGRINDH)
-    set(MI_VALGRIND OFF)
-    message(WARNING "Cannot find the 'valgrind/valgrind.h' and 'valgrind/memcheck.h' -- install valgrind first")
-    message(STATUS  "Compile **without** Valgrind support (MI_VALGRIND=OFF)")
+    set(MI_TRACK_VALGRIND OFF)
+    message(WARNING "Cannot find the 'valgrind/valgrind.h' and 'valgrind/memcheck.h' -- install valgrind first?")
+    message(STATUS  "Disabling Valgrind support (MI_TRACK_VALGRIND=OFF)")
   else()
-    message(STATUS "Compile with Valgrind support (MI_VALGRIND=ON)")
-    list(APPEND mi_defines MI_VALGRIND=1)
+    message(STATUS "Compile with Valgrind support (MI_TRACK_VALGRIND=ON)")
+    list(APPEND mi_defines MI_TRACK_VALGRIND=1)
+  endif()
+endif()
+
+if(MI_TRACK_ASAN)
+  if (APPLE AND MI_OVERRIDE)
+    set(MI_TRACK_ASAN OFF)
+    message(WARNING "Cannot enable address sanitizer support on macOS if MI_OVERRIDE is ON (MI_TRACK_ASAN=OFF)")
+  endif()
+  if (MI_TRACK_VALGRIND)
+    set(MI_TRACK_ASAN OFF)
+    message(WARNING "Cannot enable address sanitizer support with also Valgrind support enabled (MI_TRACK_ASAN=OFF)")
+  endif()
+  if(MI_TRACK_ASAN)
+    CHECK_INCLUDE_FILES("sanitizer/asan_interface.h" MI_HAS_ASANH)
+    if (NOT MI_HAS_ASANH)
+      set(MI_TRACK_ASAN OFF)
+      message(WARNING "Cannot find the 'sanitizer/asan_interface.h' -- install address sanitizer support first")
+      message(STATUS  "Compile **without** address sanitizer support (MI_TRACK_ASAN=OFF)")
+    else()
+      message(STATUS "Compile with address sanitizer support (MI_TRACK_ASAN=ON)")
+      list(APPEND mi_defines MI_TRACK_ASAN=1)
+      list(APPEND mi_cflags -fsanitize=address)
+      list(APPEND mi_libraries -fsanitize=address)
+    endif()
+  endif()
+endif()
+
+if(MI_TRACK_ETW)
+  if(NOT WIN32)
+    set(MI_TRACK_ETW OFF)
+    message(WARNING "Can only enable ETW support on Windows (MI_TRACK_ETW=OFF)")
+  endif()
+  if (MI_TRACK_VALGRIND OR MI_TRACK_ASAN)
+    set(MI_TRACK_ETW OFF)
+    message(WARNING "Cannot enable ETW support with also Valgrind or ASAN support enabled (MI_TRACK_ETW=OFF)")
+  endif()
+  if(MI_TRACK_ETW)
+    message(STATUS "Compile with Windows event tracing support (MI_TRACK_ETW=ON)")
+    list(APPEND mi_defines MI_TRACK_ETW=1)
+  endif()
+endif()
+
+if(MI_GUARDED)
+  message(STATUS "Compile guard pages behind certain object allocations (MI_GUARDED=ON)")
+  list(APPEND mi_defines MI_GUARDED=1)
+  if(NOT MI_NO_PADDING)
+    message(STATUS "  Disabling padding due to guard pages (MI_NO_PADDING=ON)")
+    set(MI_NO_PADDING ON)
   endif()
 endif()
 
 if(MI_SEE_ASM)
   message(STATUS "Generate assembly listings (MI_SEE_ASM=ON)")
   list(APPEND mi_cflags -save-temps)
+  if(CMAKE_C_COMPILER_ID MATCHES "AppleClang|Clang" AND CMAKE_C_COMPILER_VERSION VERSION_GREATER 14)
+    message(STATUS "No GNU Line marker")
+    list(APPEND mi_cflags -Wno-gnu-line-marker)
+  endif()
 endif()
 
 if(MI_CHECK_FULL)
@@ -159,9 +304,14 @@ if(MI_DEBUG_FULL)
   list(APPEND mi_defines MI_DEBUG=3)   # full invariant checking
 endif()
 
-if(NOT MI_PADDING)
-  message(STATUS "Disable padding of heap blocks in debug mode (MI_PADDING=OFF)")
+if(MI_NO_PADDING)
+  message(STATUS "Suppress any padding of heap blocks (MI_NO_PADDING=ON)")
   list(APPEND mi_defines MI_PADDING=0)
+else()
+  if(MI_PADDING)
+    message(STATUS "Enable explicit padding of heap blocks (MI_PADDING=ON)")
+    list(APPEND mi_defines MI_PADDING=1)
+  endif()
 endif()
 
 if(MI_XMALLOC)
@@ -179,27 +329,28 @@ if(MI_DEBUG_TSAN)
     message(STATUS "Build with thread sanitizer (MI_DEBUG_TSAN=ON)")
     list(APPEND mi_defines MI_TSAN=1)
     list(APPEND mi_cflags -fsanitize=thread -g -O1)
-    list(APPEND CMAKE_EXE_LINKER_FLAGS -fsanitize=thread)
+    list(APPEND mi_libraries -fsanitize=thread)
   else()
-    message(WARNING "Can only use thread sanitizer with clang (MI_DEBUG_TSAN=ON but ignored)")    
-  endif()  
+    message(WARNING "Can only use thread sanitizer with clang (MI_DEBUG_TSAN=ON but ignored)")
+  endif()
 endif()
 
 if(MI_DEBUG_UBSAN)
-  if(CMAKE_BUILD_TYPE MATCHES "Debug")    
+  if(CMAKE_BUILD_TYPE MATCHES "Debug")
     if(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
       message(STATUS "Build with undefined-behavior sanitizer (MI_DEBUG_UBSAN=ON)")
+      list(APPEND mi_defines MI_UBSAN=1)
       list(APPEND mi_cflags -fsanitize=undefined -g -fno-sanitize-recover=undefined)
-      list(APPEND CMAKE_EXE_LINKER_FLAGS -fsanitize=undefined)
+      list(APPEND mi_libraries -fsanitize=undefined)
       if (NOT MI_USE_CXX)
         message(STATUS "(switch to use C++ due to MI_DEBUG_UBSAN)")
         set(MI_USE_CXX "ON")
       endif()
     else()
-      message(WARNING "Can only use undefined-behavior sanitizer with clang++ (MI_DEBUG_UBSAN=ON but ignored)")    
-    endif()  
+      message(WARNING "Can only use undefined-behavior sanitizer with clang++ (MI_DEBUG_UBSAN=ON but ignored)")
+    endif()
   else()
-    message(WARNING "Can only use thread sanitizer with a debug build (CMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE})")    
+    message(WARNING "Can only use undefined-behavior sanitizer with a debug build (CMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE})")
   endif()
 endif()
 
@@ -215,74 +366,175 @@ if(MI_USE_CXX)
   endif()
 endif()
 
+if(CMAKE_SYSTEM_NAME MATCHES "Linux|Android")
+  if(MI_NO_THP)
+    message(STATUS "Disable transparent huge pages support (MI_NO_THP=ON)")
+    list(APPEND mi_defines MI_NO_THP=1)
+  endif()
+endif()
+
+if(MI_LIBC_MUSL)
+  message(STATUS "Assume using musl libc (MI_LIBC_MUSL=ON)")
+  list(APPEND mi_defines MI_LIBC_MUSL=1)
+endif()
+
+if(MI_WIN_USE_FLS)
+  message(STATUS "Use the Fiber API to detect thread termination (deprecated) (MI_WIN_USE_FLS=ON)")
+  list(APPEND mi_defines MI_WIN_USE_FLS=1)
+endif()
+
+if(MI_WIN_USE_FIXED_TLS)
+  message(STATUS "Use fixed TLS slot on Windows to avoid extra tests in the malloc fast path (MI_WIN_USE_FIXED_TLS=ON)")
+  list(APPEND mi_defines MI_WIN_USE_FIXED_TLS=1)
+endif()
+
+# Check /proc/cpuinfo for an SV39 MMU and limit the virtual address bits.
+# (this will skip the aligned hinting in that case. Issue #939, #949)
+if (EXISTS /proc/cpuinfo)
+  file(STRINGS /proc/cpuinfo mi_sv39_mmu REGEX "^mmu[ \t]+:[ \t]+sv39$")
+  if (mi_sv39_mmu)
+    MESSAGE( STATUS "Set virtual address bits to 39 (SV39 MMU detected)" )
+    list(APPEND mi_defines MI_DEFAULT_VIRTUAL_ADDRESS_BITS=39)
+  endif()
+endif()
+
+# On Haiku use `-DCMAKE_INSTALL_PREFIX` instead, issue #788
+# if(CMAKE_SYSTEM_NAME MATCHES "Haiku")
+#   SET(CMAKE_INSTALL_LIBDIR ~/config/non-packaged/lib)
+#   SET(CMAKE_INSTALL_INCLUDEDIR ~/config/non-packaged/headers)
+# endif()
+
 # Compiler flags
-if(CMAKE_C_COMPILER_ID MATCHES "AppleClang|Clang|GNU")
-  list(APPEND mi_cflags -Wall -Wextra -Wno-unknown-pragmas -fvisibility=hidden)
+if(CMAKE_C_COMPILER_ID MATCHES "AppleClang|Clang|GNU" AND NOT MI_CLANG_CL)
+  list(APPEND mi_cflags -Wno-unknown-pragmas -fvisibility=hidden)
   if(NOT MI_USE_CXX)
     list(APPEND mi_cflags -Wstrict-prototypes)
-  endif()  
+  endif()
   if(CMAKE_C_COMPILER_ID MATCHES "AppleClang|Clang")
-    list(APPEND mi_cflags -Wpedantic -Wno-static-in-inline)
+    list(APPEND mi_cflags -Wno-static-in-inline)
   endif()
 endif()
 
 if(CMAKE_C_COMPILER_ID MATCHES "Intel")
-  list(APPEND mi_cflags -Wall -fvisibility=hidden)
+  list(APPEND mi_cflags -fvisibility=hidden)
 endif()
 
-if(CMAKE_C_COMPILER_ID MATCHES "AppleClang|Clang|GNU|Intel" AND NOT CMAKE_SYSTEM_NAME MATCHES "Haiku")
+if(CMAKE_C_COMPILER_ID MATCHES "AppleClang|Clang|GNU|Intel" AND NOT CMAKE_SYSTEM_NAME MATCHES "Haiku" AND NOT MI_CLANG_CL)
   if(MI_LOCAL_DYNAMIC_TLS)
     list(APPEND mi_cflags -ftls-model=local-dynamic)
   else()
-    list(APPEND mi_cflags -ftls-model=initial-exec)
+    if(MI_LIBC_MUSL)
+      # with musl we use local-dynamic for the static build, see issue #644
+      list(APPEND mi_cflags_static  -ftls-model=local-dynamic)
+      list(APPEND mi_cflags_dynamic -ftls-model=initial-exec)
+      message(STATUS "Use local dynamic TLS for the static build (since MI_LIBC_MUSL=ON)")
+    else()
+      list(APPEND mi_cflags -ftls-model=initial-exec)
+    endif()
   endif()
+endif()
+
+if(CMAKE_C_COMPILER_ID MATCHES "AppleClang|Clang|GNU|Intel")
   if(MI_OVERRIDE)
     list(APPEND mi_cflags -fno-builtin-malloc)
   endif()
 endif()
 
-if (MSVC AND MSVC_VERSION GREATER_EQUAL 1914)
+# Compiler and architecture specific flags
+if(CMAKE_C_COMPILER_ID MATCHES "AppleClang|Clang|GNU|Intel" AND NOT CMAKE_SYSTEM_NAME MATCHES "Haiku")
+  if(MI_OPT_ARCH)
+    if(APPLE AND CMAKE_C_COMPILER_ID MATCHES "AppleClang|Clang" AND CMAKE_OSX_ARCHITECTURES)   # to support multi-arch binaries (#999)
+      if("arm64" IN_LIST CMAKE_OSX_ARCHITECTURES)
+        list(APPEND MI_OPT_ARCH_FLAGS "-Xarch_arm64;-march=armv8.1-a")
+      endif()
+      if("x86_64" IN_LIST CMAKE_OSX_ARCHITECTURES)
+        list(APPEND MI_OPT_ARCH_FLAGS "-Xarch_x86_64;-march=haswell;-Xarch_x86_64;-mavx2")
+      endif()
+    elseif(MI_ARCH STREQUAL "x64")
+      set(MI_OPT_ARCH_FLAGS "-march=haswell;-mavx2")    # fast bit scan (since 2013)
+    elseif(MI_ARCH STREQUAL "arm64")
+      set(MI_OPT_ARCH_FLAGS "-march=armv8.1-a")         # fast atomics (since 2016)
+    endif()
+  endif()
+endif()
+
+if (MSVC AND MSVC_VERSION GREATER_EQUAL 1914) # vs2017+
   list(APPEND mi_cflags /Zc:__cplusplus)
+  if(MI_OPT_ARCH AND NOT MI_CLANG_CL)
+    if(MI_ARCH STREQUAL "x64")
+      set(MI_OPT_ARCH_FLAGS "/arch:AVX2")
+    elseif(MI_ARCH STREQUAL "arm64")
+      set(MI_OPT_ARCH_FLAGS "/arch:armv8.1")
+    endif()
+  endif()
+endif()
+
+if(MINGW)
+  add_definitions(-D_WIN32_WINNT=0x600)                # issue #976
+endif()
+
+if(MI_OPT_ARCH_FLAGS)
+  list(APPEND mi_cflags ${MI_OPT_ARCH_FLAGS})
+  message(STATUS "Architecture specific optimization is enabled (with ${MI_OPT_ARCH_FLAGS}) (MI_OPT_ARCH=ON)")
+  if (MI_OPT_SIMD)
+    list(APPEND mi_defines "MI_OPT_SIMD=1")
+    message(STATUS "SIMD instructions are enabled (MI_OPT_SIMD=ON)")
+  endif()
+elseif(MI_OPT_SIMD)
+  message(STATUS "SIMD instructions are not enabled (either MI_OPT_ARCH=OFF or this architecture has no SIMD support)")
 endif()
 
 # extra needed libraries
+
+# we prefer -l<lib> test over `find_library` as sometimes core libraries
+# like `libatomic` are not on the system path (see issue #898)
+function(find_link_library libname outlibname)
+  check_linker_flag(C "-l${libname}" mi_has_lib${libname})
+  if (mi_has_lib${libname})
+    message(VERBOSE "link library: -l${libname}")
+    set(${outlibname} ${libname} PARENT_SCOPE)
+  else()
+    find_library(MI_LIBPATH libname)
+    if (MI_LIBPATH)
+      message(VERBOSE "link library ${libname} at ${MI_LIBPATH}")
+      set(${outlibname} ${MI_LIBPATH} PARENT_SCOPE)
+    else()
+      message(VERBOSE "link library not found: ${libname}")
+      set(${outlibname} "" PARENT_SCOPE)
+    endif()
+  endif()
+endfunction()
+
 if(WIN32)
   list(APPEND mi_libraries psapi shell32 user32 advapi32 bcrypt)
-  set(pc_libraries "-lpsapi -lshell32 -luser32 -ladvapi32 -lbcrypt")
 else()
-  set(pc_libraries "")
-  find_library(MI_LIBPTHREAD pthread)
-  if (MI_LIBPTHREAD)                      
-    list(APPEND mi_libraries ${MI_LIBPTHREAD})
-    set(pc_libraries "${pc_libraries} -pthread")
+  find_link_library("pthread" MI_LIB_PTHREAD)
+  if(MI_LIB_PTHREAD)
+    list(APPEND mi_libraries "${MI_LIB_PTHREAD}")
   endif()
-  find_library(MI_LIBRT rt)
-  if(MI_LIBRT)
-    list(APPEND mi_libraries ${MI_LIBRT})
-    set(pc_libraries "${pc_libraries} -lrt")
+  find_link_library("rt" MI_LIB_RT)
+  if(MI_LIB_RT)
+    list(APPEND mi_libraries "${MI_LIB_RT}")
   endif()
-  find_library(MI_LIBATOMIC atomic)
-  if (NOT MI_LIBATOMIC AND MI_USE_LIBATOMIC) 
-    set(MI_LIBATOMIC atomic)
-  endif()
-  if (MI_LIBATOMIC) 
-    list(APPEND mi_libraries ${MI_LIBATOMIC})
-    set(pc_libraries "${pc_libraries} -latomic")
+  find_link_library("atomic" MI_LIB_ATOMIC)
+  if(MI_LIB_ATOMIC)
+    list(APPEND mi_libraries "${MI_LIB_ATOMIC}")
   endif()
 endif()
 
+
 # -----------------------------------------------------------------------------
 # Install and output names
 # -----------------------------------------------------------------------------
 
 # dynamic/shared library and symlinks always go to /usr/local/lib equivalent
-set(mi_install_libdir   "${CMAKE_INSTALL_LIBDIR}")
+# we use ${CMAKE_INSTALL_BINDIR} and ${CMAKE_INSTALL_LIBDIR}.
 
 # static libraries and object files, includes, and cmake config files
 # are either installed at top level, or use versioned directories for side-by-side installation (default)
 if (MI_INSTALL_TOPLEVEL)
   set(mi_install_objdir     "${CMAKE_INSTALL_LIBDIR}")
-  set(mi_install_incdir     "${CMAKE_INSTALL_INCLUDEDIR}")        
+  set(mi_install_incdir     "${CMAKE_INSTALL_INCLUDEDIR}")
   set(mi_install_cmakedir   "${CMAKE_INSTALL_LIBDIR}/cmake/mimalloc")
 else()
   set(mi_install_objdir     "${CMAKE_INSTALL_LIBDIR}/mimalloc-${mi_version}")       # for static library and object files
@@ -290,16 +542,22 @@ else()
   set(mi_install_cmakedir   "${CMAKE_INSTALL_LIBDIR}/cmake/mimalloc-${mi_version}") # for cmake package info
 endif()
 
-set(mi_basename "mimalloc")
+set(mi_libname "mimalloc")
 if(MI_SECURE)
-  set(mi_basename "${mi_basename}-secure")
+  set(mi_libname "${mi_libname}-secure")
+endif()
+if(MI_TRACK_VALGRIND)
+  set(mi_libname "${mi_libname}-valgrind")
 endif()
-if(MI_VALGRIND)
-  set(mi_basename "${mi_basename}-valgrind")
+if(MI_TRACK_ASAN)
+  set(mi_libname "${mi_libname}-asan")
 endif()
 string(TOLOWER "${CMAKE_BUILD_TYPE}" CMAKE_BUILD_TYPE_LC)
-if(NOT(CMAKE_BUILD_TYPE_LC MATCHES "^(release|relwithdebinfo|minsizerel|none)$"))
-  set(mi_basename "${mi_basename}-${CMAKE_BUILD_TYPE_LC}") #append build type (e.g. -debug) if not a release version
+list(APPEND mi_defines "MI_CMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE_LC}")  #todo: multi-config project needs $<CONFIG> ?
+if(CMAKE_BUILD_TYPE_LC MATCHES "^(release|relwithdebinfo|minsizerel|none)$")
+  list(APPEND mi_defines MI_BUILD_RELEASE)
+else()
+  set(mi_libname "${mi_libname}-${CMAKE_BUILD_TYPE_LC}") #append build type (e.g. -debug) if not a release version
 endif()
 
 if(MI_BUILD_SHARED)
@@ -316,8 +574,8 @@ if(MI_BUILD_TESTS)
 endif()
 
 message(STATUS "")
-message(STATUS "Library base name: ${mi_basename}")
-message(STATUS "Version          : ${mi_version}")
+message(STATUS "Library name     : ${mi_libname}")
+message(STATUS "Version          : ${mi_version}.${mi_version_patch}")
 message(STATUS "Build type       : ${CMAKE_BUILD_TYPE_LC}")
 if(MI_USE_CXX)
   message(STATUS "C++ Compiler     : ${CMAKE_CXX_COMPILER}")
@@ -337,53 +595,66 @@ message(STATUS "")
 # shared library
 if(MI_BUILD_SHARED)
   add_library(mimalloc SHARED ${mi_sources})
-  set_target_properties(mimalloc PROPERTIES VERSION ${mi_version} SOVERSION ${mi_version_major} OUTPUT_NAME ${mi_basename} )
+  set_target_properties(mimalloc PROPERTIES VERSION ${mi_version} SOVERSION ${mi_version_major} OUTPUT_NAME ${mi_libname} )
   target_compile_definitions(mimalloc PRIVATE ${mi_defines} MI_SHARED_LIB MI_SHARED_LIB_EXPORT)
-  target_compile_options(mimalloc PRIVATE ${mi_cflags})
-  target_link_libraries(mimalloc PUBLIC ${mi_libraries})
+  target_compile_options(mimalloc PRIVATE ${mi_cflags} ${mi_cflags_dynamic})
+  target_link_libraries(mimalloc PRIVATE ${mi_libraries})
   target_include_directories(mimalloc PUBLIC
       $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
       $<INSTALL_INTERFACE:${mi_install_incdir}>
   )
+  install(TARGETS mimalloc EXPORT mimalloc ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
+  install(EXPORT mimalloc DESTINATION ${mi_install_cmakedir})
+
+  if(WIN32 AND NOT MINGW)
+    # On windows, the import library name for the dll would clash with the static mimalloc.lib library
+    # so we postfix the dll import library with `.dll.lib` (and also the .pdb debug file)
+    set_property(TARGET mimalloc PROPERTY ARCHIVE_OUTPUT_NAME "${mi_libname}.dll" )
+    install(FILES "$<TARGET_FILE_DIR:mimalloc>/${mi_libname}.dll.lib" DESTINATION ${CMAKE_INSTALL_LIBDIR})
+    set_property(TARGET mimalloc PROPERTY PDB_NAME "${mi_libname}.dll")
+    # don't try to install the pdb since it may not be generated depending on the configuration
+    # install(FILES "$<TARGET_FILE_DIR:mimalloc>/${mi_libname}.dll.pdb" DESTINATION ${CMAKE_INSTALL_LIBDIR})
+  endif()
   if(WIN32 AND MI_WIN_REDIRECT)
+    if(MINGW)
+      set_property(TARGET mimalloc PROPERTY PREFIX "")
+    endif()
     # On windows, link and copy the mimalloc redirection dll too.
-    if(CMAKE_SIZEOF_VOID_P EQUAL 4)
+    if(CMAKE_GENERATOR_PLATFORM STREQUAL "arm64ec")
+      set(MIMALLOC_REDIRECT_SUFFIX "-arm64ec")
+    elseif(MI_ARCH STREQUAL "x64")
+      set(MIMALLOC_REDIRECT_SUFFIX "")
+      if(CMAKE_SYSTEM_PROCESSOR STREQUAL "ARM64")
+        message(STATUS "Note: x64 code emulated on Windows for arm64 should use an arm64ec build of 'mimalloc.dll'")
+        message(STATUS "      together with 'mimalloc-redirect-arm64ec.dll'. See the 'bin\\readme.md' for more information.")
+      endif()
+    elseif(MI_ARCH STREQUAL "x86")
       set(MIMALLOC_REDIRECT_SUFFIX "32")
     else()
-      set(MIMALLOC_REDIRECT_SUFFIX "")
+      set(MIMALLOC_REDIRECT_SUFFIX "-${MI_ARCH}")  # -arm64 etc.
     endif()
 
-    target_link_libraries(mimalloc PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/bin/mimalloc-redirect${MIMALLOC_REDIRECT_SUFFIX}.lib)
+    target_link_libraries(mimalloc PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/bin/mimalloc-redirect${MIMALLOC_REDIRECT_SUFFIX}.lib)  # the DLL import library
     add_custom_command(TARGET mimalloc POST_BUILD
       COMMAND "${CMAKE_COMMAND}" -E copy "${CMAKE_CURRENT_SOURCE_DIR}/bin/mimalloc-redirect${MIMALLOC_REDIRECT_SUFFIX}.dll" $<TARGET_FILE_DIR:mimalloc>
       COMMENT "Copy mimalloc-redirect${MIMALLOC_REDIRECT_SUFFIX}.dll to output directory")
-    install(FILES "$<TARGET_FILE_DIR:mimalloc>/mimalloc-redirect${MIMALLOC_REDIRECT_SUFFIX}.dll" DESTINATION ${mi_install_libdir})
+    install(FILES "$<TARGET_FILE_DIR:mimalloc>/mimalloc-redirect${MIMALLOC_REDIRECT_SUFFIX}.dll" DESTINATION ${CMAKE_INSTALL_BINDIR})
   endif()
-
-  install(TARGETS mimalloc EXPORT mimalloc DESTINATION ${mi_install_libdir} LIBRARY)  
-  install(EXPORT mimalloc DESTINATION ${mi_install_cmakedir})
 endif()
 
+
 # static library
 if (MI_BUILD_STATIC)
   add_library(mimalloc-static STATIC ${mi_sources})
+  set_property(TARGET mimalloc-static PROPERTY OUTPUT_NAME ${mi_libname})
   set_property(TARGET mimalloc-static PROPERTY POSITION_INDEPENDENT_CODE ON)
   target_compile_definitions(mimalloc-static PRIVATE ${mi_defines} MI_STATIC_LIB)
-  target_compile_options(mimalloc-static PRIVATE ${mi_cflags})
-  target_link_libraries(mimalloc-static PUBLIC ${mi_libraries})
+  target_compile_options(mimalloc-static PRIVATE ${mi_cflags} ${mi_cflags_static})
+  target_link_libraries(mimalloc-static PRIVATE ${mi_libraries})
   target_include_directories(mimalloc-static PUBLIC
       $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
       $<INSTALL_INTERFACE:${mi_install_incdir}>
   )
-  if(WIN32)
-    # When building both static and shared libraries on Windows, a static library should use a
-    # different output name to avoid the conflict with the import library of a shared one.
-    string(REPLACE "mimalloc" "mimalloc-static" mi_output_name ${mi_basename})
-    set_target_properties(mimalloc-static PROPERTIES OUTPUT_NAME ${mi_output_name})
-  else()
-    set_target_properties(mimalloc-static PROPERTIES OUTPUT_NAME ${mi_basename})
-  endif()
-
   install(TARGETS mimalloc-static EXPORT mimalloc DESTINATION ${mi_install_objdir} LIBRARY)
   install(EXPORT mimalloc DESTINATION ${mi_install_cmakedir})
 endif()
@@ -392,6 +663,7 @@ endif()
 install(FILES include/mimalloc.h DESTINATION ${mi_install_incdir})
 install(FILES include/mimalloc-override.h DESTINATION ${mi_install_incdir})
 install(FILES include/mimalloc-new-delete.h DESTINATION ${mi_install_incdir})
+install(FILES include/mimalloc-stats.h DESTINATION ${mi_install_incdir})
 install(FILES cmake/mimalloc-config.cmake DESTINATION ${mi_install_cmakedir})
 install(FILES cmake/mimalloc-config-version.cmake DESTINATION ${mi_install_cmakedir})
 
@@ -401,31 +673,54 @@ if (MI_BUILD_OBJECT)
   add_library(mimalloc-obj OBJECT src/static.c)
   set_property(TARGET mimalloc-obj PROPERTY POSITION_INDEPENDENT_CODE ON)
   target_compile_definitions(mimalloc-obj PRIVATE ${mi_defines})
-  target_compile_options(mimalloc-obj PRIVATE ${mi_cflags})
+  target_compile_options(mimalloc-obj PRIVATE ${mi_cflags} ${mi_cflags_static})
   target_include_directories(mimalloc-obj PUBLIC
       $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
       $<INSTALL_INTERFACE:${mi_install_incdir}>
   )
 
+  # Copy the generated object file (`static.o`) to the output directory (as `mimalloc.o`)
+  if(CMAKE_GENERATOR MATCHES "^Visual Studio.*$")
+    set(mimalloc-obj-static "${CMAKE_CURRENT_BINARY_DIR}/mimalloc-obj.dir/$<CONFIG>/static${CMAKE_C_OUTPUT_EXTENSION}")
+  else()
+    set(mimalloc-obj-static "${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles/mimalloc-obj.dir/src/static.c${CMAKE_C_OUTPUT_EXTENSION}")
+  endif()
+  set(mimalloc-obj-out "${CMAKE_CURRENT_BINARY_DIR}/${mi_libname}${CMAKE_C_OUTPUT_EXTENSION}")
+  add_custom_command(OUTPUT ${mimalloc-obj-out} DEPENDS mimalloc-obj COMMAND "${CMAKE_COMMAND}" -E copy "${mimalloc-obj-static}" "${mimalloc-obj-out}")
+  add_custom_target(mimalloc-obj-target ALL DEPENDS ${mimalloc-obj-out})
+
+
   # the following seems to lead to cmake warnings/errors on some systems, disable for now :-(
   # install(TARGETS mimalloc-obj EXPORT mimalloc DESTINATION ${mi_install_objdir})
 
   # the FILES expression can also be: $<TARGET_OBJECTS:mimalloc-obj>
   # but that fails cmake versions less than 3.10 so we leave it as is for now
-  install(FILES ${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles/mimalloc-obj.dir/src/static.c${CMAKE_C_OUTPUT_EXTENSION}
+  install(FILES ${mimalloc-obj-static}
           DESTINATION ${mi_install_objdir}
-          RENAME ${mi_basename}${CMAKE_C_OUTPUT_EXTENSION} )
+          RENAME ${mi_libname}${CMAKE_C_OUTPUT_EXTENSION} )
 endif()
 
+
 # pkg-config file support
+set(mi_pc_libraries "")
+foreach(item IN LISTS mi_libraries)
+  if(item MATCHES " *[-].*")
+    set(mi_pc_libraries "${mi_pc_libraries} ${item}")
+  else()
+    set(mi_pc_libraries "${mi_pc_libraries} -l${item}")
+  endif()
+endforeach()
+
 include("cmake/JoinPaths.cmake")
-join_paths(includedir_for_pc_file "\${prefix}" "${CMAKE_INSTALL_INCLUDEDIR}")
-join_paths(libdir_for_pc_file "\${prefix}" "${CMAKE_INSTALL_LIBDIR}")
+join_paths(mi_pc_includedir "\${prefix}" "${CMAKE_INSTALL_INCLUDEDIR}")
+join_paths(mi_pc_libdir "\${prefix}" "${CMAKE_INSTALL_LIBDIR}")
 
 configure_file(mimalloc.pc.in mimalloc.pc @ONLY)
 install(FILES "${CMAKE_CURRENT_BINARY_DIR}/mimalloc.pc"
         DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig/")
 
+
+
 # -----------------------------------------------------------------------------
 # API surface testing
 # -----------------------------------------------------------------------------
@@ -433,15 +728,41 @@ install(FILES "${CMAKE_CURRENT_BINARY_DIR}/mimalloc.pc"
 if (MI_BUILD_TESTS)
   enable_testing()
 
+  # static link tests
   foreach(TEST_NAME api api-fill stress)
     add_executable(mimalloc-test-${TEST_NAME} test/test-${TEST_NAME}.c)
     target_compile_definitions(mimalloc-test-${TEST_NAME} PRIVATE ${mi_defines})
     target_compile_options(mimalloc-test-${TEST_NAME} PRIVATE ${mi_cflags})
     target_include_directories(mimalloc-test-${TEST_NAME} PRIVATE include)
-    target_link_libraries(mimalloc-test-${TEST_NAME} PRIVATE mimalloc ${mi_libraries})
-
+    if(MI_BUILD_STATIC AND NOT MI_DEBUG_TSAN)
+      target_link_libraries(mimalloc-test-${TEST_NAME} PRIVATE mimalloc-static ${mi_libraries})
+    elseif(MI_BUILD_SHARED)
+      target_link_libraries(mimalloc-test-${TEST_NAME} PRIVATE mimalloc ${mi_libraries})
+    else()
+      message(STATUS "cannot build TSAN tests without MI_BUILD_SHARED being enabled")
+    endif()
     add_test(NAME test-${TEST_NAME} COMMAND mimalloc-test-${TEST_NAME})
   endforeach()
+
+  # dynamic override test
+  if(MI_BUILD_SHARED AND NOT (MI_TRACK_ASAN OR MI_DEBUG_TSAN OR MI_DEBUG_UBSAN))
+    add_executable(mimalloc-test-stress-dynamic test/test-stress.c)
+    target_compile_definitions(mimalloc-test-stress-dynamic PRIVATE ${mi_defines} "USE_STD_MALLOC=1")
+    target_compile_options(mimalloc-test-stress-dynamic PRIVATE ${mi_cflags})
+    target_include_directories(mimalloc-test-stress-dynamic PRIVATE include)
+    if(WIN32)
+      target_compile_definitions(mimalloc-test-stress-dynamic PRIVATE "MI_LINK_VERSION=1")  # link mi_version
+      target_link_libraries(mimalloc-test-stress-dynamic PRIVATE mimalloc ${mi_libraries})  # link mi_version
+      add_test(NAME test-stress-dynamic COMMAND ${CMAKE_COMMAND} -E env MIMALLOC_VERBOSE=1 $<TARGET_FILE:mimalloc-test-stress-dynamic>)
+    else()
+      if(APPLE)
+        set(LD_PRELOAD "DYLD_INSERT_LIBRARIES")
+      else()
+        set(LD_PRELOAD "LD_PRELOAD")
+      endif()
+      add_test(NAME test-stress-dynamic COMMAND ${CMAKE_COMMAND} -E env MIMALLOC_VERBOSE=1 ${LD_PRELOAD}=$<TARGET_FILE:mimalloc> $<TARGET_FILE:mimalloc-test-stress-dynamic>)
+    endif()
+  endif()
 endif()
 
 # -----------------------------------------------------------------------------
diff --git a/depends/mimalloc/LICENSE b/depends/mimalloc/LICENSE
index 670b668a0c92..53315ebee557 100644
--- a/depends/mimalloc/LICENSE
+++ b/depends/mimalloc/LICENSE
@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2018-2021 Microsoft Corporation, Daan Leijen
+Copyright (c) 2018-2025 Microsoft Corporation, Daan Leijen
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
diff --git a/depends/mimalloc/SECURITY.md b/depends/mimalloc/SECURITY.md
new file mode 100644
index 000000000000..b3c89efc852e
--- /dev/null
+++ b/depends/mimalloc/SECURITY.md
@@ -0,0 +1,41 @@
+<!-- BEGIN MICROSOFT SECURITY.MD V0.0.9 BLOCK -->
+
+## Security
+
+Microsoft takes the security of our software products and services seriously, which includes all source code repositories managed through our GitHub organizations, which include [Microsoft](https://github.com/Microsoft), [Azure](https://github.com/Azure), [DotNet](https://github.com/dotnet), [AspNet](https://github.com/aspnet) and [Xamarin](https://github.com/xamarin).
+
+If you believe you have found a security vulnerability in any Microsoft-owned repository that meets [Microsoft's definition of a security vulnerability](https://aka.ms/security.md/definition), please report it to us as described below.
+
+## Reporting Security Issues
+
+**Please do not report security vulnerabilities through public GitHub issues.**
+
+Instead, please report them to the Microsoft Security Response Center (MSRC) at [https://msrc.microsoft.com/create-report](https://aka.ms/security.md/msrc/create-report).
+
+If you prefer to submit without logging in, send email to [secure@microsoft.com](mailto:secure@microsoft.com).  If possible, encrypt your message with our PGP key; please download it from the [Microsoft Security Response Center PGP Key page](https://aka.ms/security.md/msrc/pgp).
+
+You should receive a response within 24 hours. If for some reason you do not, please follow up via email to ensure we received your original message. Additional information can be found at [microsoft.com/msrc](https://www.microsoft.com/msrc). 
+
+Please include the requested information listed below (as much as you can provide) to help us better understand the nature and scope of the possible issue:
+
+  * Type of issue (e.g. buffer overflow, SQL injection, cross-site scripting, etc.)
+  * Full paths of source file(s) related to the manifestation of the issue
+  * The location of the affected source code (tag/branch/commit or direct URL)
+  * Any special configuration required to reproduce the issue
+  * Step-by-step instructions to reproduce the issue
+  * Proof-of-concept or exploit code (if possible)
+  * Impact of the issue, including how an attacker might exploit the issue
+
+This information will help us triage your report more quickly.
+
+If you are reporting for a bug bounty, more complete reports can contribute to a higher bounty award. Please visit our [Microsoft Bug Bounty Program](https://aka.ms/security.md/msrc/bounty) page for more details about our active programs.
+
+## Preferred Languages
+
+We prefer all communications to be in English.
+
+## Policy
+
+Microsoft follows the principle of [Coordinated Vulnerability Disclosure](https://aka.ms/security.md/cvd).
+
+<!-- END MICROSOFT SECURITY.MD BLOCK -->
diff --git a/depends/mimalloc/azure-pipelines.yml b/depends/mimalloc/azure-pipelines.yml
index eb2a3d4315b1..b71517ad5616 100644
--- a/depends/mimalloc/azure-pipelines.yml
+++ b/depends/mimalloc/azure-pipelines.yml
@@ -6,16 +6,15 @@
 trigger:
   branches:
     include:
-    - master
-    - dev
-    - dev-slice
+    - main
+    - dev*
   tags:
     include:
     - v*
 
-jobs:  
+jobs:
 - job:
-  displayName: Windows
+  displayName: Windows 2022
   pool:
     vmImage:
       windows-2022
@@ -29,10 +28,30 @@ jobs:
         BuildType: release
         cmakeExtraArgs: -DCMAKE_BUILD_TYPE=Release
         MSBuildConfiguration: Release
+      Release SIMD:
+        BuildType: release-simd
+        cmakeExtraArgs: -DCMAKE_BUILD_TYPE=Release -DMI_OPT_ARCH=ON -DMI_OPT_SIMD=ON -DMI_WIN_USE_FIXED_TLS=ON
+        MSBuildConfiguration: Release
       Secure:
         BuildType: secure
         cmakeExtraArgs: -DCMAKE_BUILD_TYPE=Release -DMI_SECURE=ON
         MSBuildConfiguration: Release
+      Debug x86:
+        BuildType: debug
+        cmakeExtraArgs: -DCMAKE_BUILD_TYPE=Debug -DMI_DEBUG_FULL=ON -A Win32
+        MSBuildConfiguration: Debug
+      Release x86:
+        BuildType: release
+        cmakeExtraArgs: -DCMAKE_BUILD_TYPE=Release -A Win32
+        MSBuildConfiguration: Release
+      Debug Fixed TLS:
+        BuildType: debug
+        cmakeExtraArgs: -DCMAKE_BUILD_TYPE=Debug -DMI_DEBUG_FULL=ON -DMI_WIN_USE_FIXED_TLS=ON
+        MSBuildConfiguration: Debug
+      Release Fixed TLS:
+        BuildType: release
+        cmakeExtraArgs: -DCMAKE_BUILD_TYPE=Release -DMI_WIN_USE_FIXED_TLS=ON
+        MSBuildConfiguration: Release
   steps:
   - task: CMake@1
     inputs:
@@ -43,7 +62,7 @@ jobs:
       solution: $(BuildType)/libmimalloc.sln
       configuration: '$(MSBuildConfiguration)'
       msbuildArguments: -m
-  - script: ctest --verbose --timeout 120 -C $(MSBuildConfiguration)
+  - script: ctest --verbose --timeout 240 -C $(MSBuildConfiguration)
     workingDirectory: $(BuildType)
     displayName: CTest
   #- script: $(BuildType)\$(BuildType)\mimalloc-test-stress
@@ -52,10 +71,10 @@ jobs:
   #  artifact: mimalloc-windows-$(BuildType)
 
 - job:
-  displayName: Linux
+  displayName: Ubuntu 22.04
   pool:
     vmImage:
-     ubuntu-18.04
+     ubuntu-22.04
   strategy:
     matrix:
       Debug:
@@ -88,6 +107,11 @@ jobs:
         CXX: clang++
         BuildType: release-clang
         cmakeExtraArgs: -DCMAKE_BUILD_TYPE=Release
+      Release SIMD Clang:
+        CC: clang
+        CXX: clang++
+        BuildType: release-simd-clang
+        cmakeExtraArgs: -DCMAKE_BUILD_TYPE=Release -DMI_OPT_ARCH=ON -DMI_OPT_SIMD=ON
       Secure Clang:
         CC: clang
         CXX: clang++
@@ -98,6 +122,27 @@ jobs:
         CXX: clang++
         BuildType: debug-clang-cxx
         cmakeExtraArgs: -DCMAKE_BUILD_TYPE=Debug -DMI_DEBUG_FULL=ON -DMI_USE_CXX=ON
+      Debug ASAN Clang:
+        CC: clang
+        CXX: clang++
+        BuildType: debug-asan-clang
+        cmakeExtraArgs: -DCMAKE_BUILD_TYPE=Debug -DMI_DEBUG_FULL=ON -DMI_TRACK_ASAN=ON
+      Debug UBSAN Clang:
+        CC: clang
+        CXX: clang++
+        BuildType: debug-ubsan-clang
+        cmakeExtraArgs: -DCMAKE_BUILD_TYPE=Debug -DMI_DEBUG_FULL=ON -DMI_DEBUG_UBSAN=ON
+      Debug TSAN Clang++:
+        CC: clang
+        CXX: clang++
+        BuildType: debug-tsan-clang-cxx
+        cmakeExtraArgs: -DCMAKE_BUILD_TYPE=RelWithDebInfo -DMI_USE_CXX=ON -DMI_DEBUG_TSAN=ON
+      Debug Guarded Clang:
+        CC: clang
+        CXX: clang
+        BuildType: debug-guarded-clang
+        cmakeExtraArgs: -DCMAKE_BUILD_TYPE=RelWithDebInfo -DMI_DEBUG_FULL=ON -DMI_GUARDED=ON
+
   steps:
   - task: CMake@1
     inputs:
@@ -105,17 +150,19 @@ jobs:
       cmakeArgs: .. $(cmakeExtraArgs)
   - script: make -j$(nproc) -C $(BuildType)
     displayName: Make
-  - script: ctest --verbose --timeout 120
+  - script: ctest --verbose --timeout 240
     workingDirectory: $(BuildType)
     displayName: CTest
+    env:
+      MIMALLOC_GUARDED_SAMPLE_RATE: 1000
 #  - upload: $(Build.SourcesDirectory)/$(BuildType)
 #    artifact: mimalloc-ubuntu-$(BuildType)
 
 - job:
-  displayName: macOS
+  displayName: macOS 14 (Sonoma)
   pool:
     vmImage:
-      macOS-latest
+      macOS-14
   strategy:
     matrix:
       Debug:
@@ -124,6 +171,9 @@ jobs:
       Release:
         BuildType: release
         cmakeExtraArgs: -DCMAKE_BUILD_TYPE=Release
+      Release SIMD:
+        BuildType: release-simd
+        cmakeExtraArgs: -DCMAKE_BUILD_TYPE=Release -DMI_OPT_ARCH=ON -DMI_OPT_SIMD=ON
       Secure:
         BuildType: secure
         cmakeExtraArgs: -DCMAKE_BUILD_TYPE=Release -DMI_SECURE=ON
@@ -134,48 +184,104 @@ jobs:
       cmakeArgs: .. $(cmakeExtraArgs)
   - script: make -j$(sysctl -n hw.ncpu) -C $(BuildType)
     displayName: Make
-  # - script: MIMALLOC_VERBOSE=1 ./mimalloc-test-api
-  #   workingDirectory: $(BuildType)
-  #   displayName: TestAPI
-  # - script: MIMALLOC_VERBOSE=1 ./mimalloc-test-stress
-  #   workingDirectory: $(BuildType)
-  #   displayName: TestStress    
-  - script: ctest --verbose --timeout 120
+  - script: ctest --verbose --timeout 240
     workingDirectory: $(BuildType)
     displayName: CTest
-    
 #  - upload: $(Build.SourcesDirectory)/$(BuildType)
 #    artifact: mimalloc-macos-$(BuildType)
 
-# - job:
-#   displayName: Windows-2017
-#   pool:
-#     vmImage:
-#       vs2017-win2016
-#   strategy:
-#     matrix:
-#       Debug:
-#         BuildType: debug
-#         cmakeExtraArgs: -A x64 -DCMAKE_BUILD_TYPE=Debug -DMI_DEBUG_FULL=ON
-#         MSBuildConfiguration: Debug
-#       Release:
-#         BuildType: release
-#         cmakeExtraArgs: -A x64 -DCMAKE_BUILD_TYPE=Release
-#         MSBuildConfiguration: Release
-#       Secure:
-#         BuildType: secure
-#         cmakeExtraArgs: -A x64 -DCMAKE_BUILD_TYPE=Release -DMI_SECURE=ON
-#         MSBuildConfiguration: Release
-#   steps:
-#   - task: CMake@1
-#     inputs:
-#       workingDirectory: $(BuildType)
-#       cmakeArgs: .. $(cmakeExtraArgs)
-#   - task: MSBuild@1
-#     inputs:
-#       solution: $(BuildType)/libmimalloc.sln
-#       configuration: '$(MSBuildConfiguration)'
-#   - script: |
-#       cd $(BuildType)
-#       ctest --verbose --timeout 120
-#     displayName: CTest
+# ----------------------------------------------------------
+# Other OS versions (just debug mode)
+# ----------------------------------------------------------
+
+- job:
+  displayName: Ubuntu 24.04
+  pool:
+    vmImage:
+      ubuntu-24.04
+  strategy:
+    matrix:
+      Debug:
+        CC: gcc
+        CXX: g++
+        BuildType: debug
+        cmakeExtraArgs: -DCMAKE_BUILD_TYPE=Debug -DMI_DEBUG_FULL=ON
+      Debug++:
+        CC: gcc
+        CXX: g++
+        BuildType: debug-cxx
+        cmakeExtraArgs: -DCMAKE_BUILD_TYPE=Debug -DMI_DEBUG_FULL=ON -DMI_USE_CXX=ON
+      Debug Clang:
+        CC: clang
+        CXX: clang++
+        BuildType: debug-clang
+        cmakeExtraArgs: -DCMAKE_BUILD_TYPE=Debug -DMI_DEBUG_FULL=ON
+      Debug++ Clang:
+        CC: clang
+        CXX: clang++
+        BuildType: debug-clang-cxx
+        cmakeExtraArgs: -DCMAKE_BUILD_TYPE=Debug -DMI_DEBUG_FULL=ON -DMI_USE_CXX=ON
+      Release Clang:
+        CC: clang
+        CXX: clang++
+        BuildType: release-clang
+        cmakeExtraArgs: -DCMAKE_BUILD_TYPE=Release
+  steps:
+  - task: CMake@1
+    inputs:
+      workingDirectory: $(BuildType)
+      cmakeArgs: .. $(cmakeExtraArgs)
+  - script: make -j$(nproc) -C $(BuildType)
+    displayName: Make
+  - script: ctest --verbose --timeout 240
+    workingDirectory: $(BuildType)
+    displayName: CTest
+
+- job:
+  displayName: macOS 15 (Sequoia)
+  pool:
+    vmImage:
+      macOS-15
+  strategy:
+    matrix:
+      Debug:
+        BuildType: debug
+        cmakeExtraArgs: -DCMAKE_BUILD_TYPE=Debug -DMI_DEBUG_FULL=ON
+      Release:
+        BuildType: release
+        cmakeExtraArgs: -DCMAKE_BUILD_TYPE=Release
+  steps:
+  - task: CMake@1
+    inputs:
+      workingDirectory: $(BuildType)
+      cmakeArgs: .. $(cmakeExtraArgs)
+  - script: make -j$(sysctl -n hw.ncpu) -C $(BuildType)
+    displayName: Make
+  - script: ctest --verbose --timeout 240
+    workingDirectory: $(BuildType)
+    displayName: CTest
+
+- job:
+  displayName: macOS 13 (Ventura)
+  pool:
+    vmImage:
+      macOS-13
+  strategy:
+    matrix:
+      Debug:
+        BuildType: debug
+        cmakeExtraArgs: -DCMAKE_BUILD_TYPE=Debug -DMI_DEBUG_FULL=ON
+      Release:
+        BuildType: release
+        cmakeExtraArgs: -DCMAKE_BUILD_TYPE=Release
+  steps:
+  - task: CMake@1
+    inputs:
+      workingDirectory: $(BuildType)
+      cmakeArgs: .. $(cmakeExtraArgs)
+  - script: make -j$(sysctl -n hw.ncpu) -C $(BuildType)
+    displayName: Make
+  - script: ctest --verbose --timeout 180
+    workingDirectory: $(BuildType)
+    displayName: CTest
+
diff --git a/depends/mimalloc/bin/mimalloc-redirect-arm64.dll b/depends/mimalloc/bin/mimalloc-redirect-arm64.dll
new file mode 100755
index 0000000000000000000000000000000000000000..27172d2c0d5f24e2b1a4cccc931bbf530c20860c
GIT binary patch
literal 61440
zcmeHw3wV^rdG7oYm|ZY7*x13wE-NraU<1O`HW*)4#@NC)WI<zMpB`xu3zE@wCD~w(
zTgjwPv7Mf>w%gFA7m14z;$o5}F>0Dt)V+|TKE=4np-<Cx1vp*oTySnhX(;D?znS@W
z_SXuG4DECJte$5z|3CB1H{ZPTecyaD|LxHyH>*OW)Cl~}o>l4qQvOBd|GEFAP<+MY
zKe<AEG5mJX0q>Ewi<Z~awnUl|jcXFI`bc%Gp`o!gvN9e?v^7L(8zT2FT^6ZtTos=^
zcI@bz4C^0VS$X2khPiLr-&;Q@`SKU#yyVT#BYo`TZD0O^q;tRgWl8_fn>w8*=M}Zp
zHLN?7q~(j1TGexzYJ2ZHYb?zvH6=2p;EJ2oO5|MbNp^G!l5uj_E;&3dQ0g-N!=Fu6
zA4&-p{t8qTPIM)k3_jO6eH}`D8+CsF1*M8vxzkfAHniDOD-1totNorTMw9c~mAXMP
zKH@*n&p!w0?AG|YR+Jxz;U7g_iJ#jpP9sWH%}%U}wSr~~m7*O#(yYeM`HMn5W@|E4
z_A?Z0#_u`&p2pAliz?MOyGavDAJJC;sniLF2#27H&Q7!>s&Oos02_d-)cg23e^H@}
z*ENEW7!fOx@4F5W4ncQcc253mC<M+HdhhhVtacrL)!X&n=L&ZH>tr=>X2YNDI#Z~U
zsVmh$dYek7$Ebm0W1<87S4IcQINDt*`3r^WwW!x#(d4PuLaO};Y0hl;i*E2s_7zrs
zt6Qm4q4(||n1QnJ^Wo3c@Z6i8413|1L0?hqsRfp1vZp?*^3?KT(gx^5r1$z3qzgkc
zLDvk`Tn@!N0`;6go(eqK-r2X*JCwKoYRFm$xgl$M6w<4aLbh}v(og6#G*Z2jCe0_J
z18ln;ZJ!*4a`cgHQMNSBL6;OB%;z!qeE;m(Po%&b?df(mqFv<oqpf4a3$)}J15fhc
zaR+2(pTVn_a^v_a9;Ze{d#B^v(y?z5&`n_;+F;$U6@rh*6$J*6%aMikLLTx*1>{9t
z$oo#3@)WXOXeRo%;ACMK7>3s>$`;61Uijfup_)ng`q4*VTyb`z?jv;v$AWM14Qd(X
zIEFr>A4iA}T!i!iZ3<o|A*1e7_=7112df9{7j=N`6XzeIEw>$4_xjNW_0EGV#Qa~*
zp8f3PNZ~iBXB=~pYZ2t)I2)`>f#F=pBeG$PMK+AR$i^|pu`i3@m#tqB;O*;WQS`&D
z1%lO}I=i5IGoaryfx*n@M}MxC=g`F&-e}QR_RaEP+oUgkZ^Xbqp}#iY%0WF2+Q!*M
z8v8RFzM^dry4ycV4V2xWu1+sf3u>4?tQMS@jy@SZPNDDVNk*sbajE+7MUKIuKG6f{
zRC7DZQaFcRzD7LNW$hKeYL4N?Cs_H?Q!~74M}P;~c^~{AQtC_X>Yl$3hrj-NGthU~
z=r=+)LY@bqhYy-|rm5z?r3~ggbWn{4zh1ci34Y#4Z+vKmdYt*`snK2q9@N37APd_%
ziME!QwnE{r{T}W2+rTeZUmi2^TiH)erEP@2k%m7zIXya%o=jZAAFKoxmS!@>_ZYEw
zxNpHdY!fu1C#dryv?DqM8xkGTHkA~c0^Jh&DawR=@_k`shVMzz5);^9aEyI_wiH-F
zMnn5@E;_4Y?}H!o>Kik_?_BzJE`DNjOSNx%8+|*o;jhGopl9!ds7tVE7neoAWul`C
zLHV=|Yksz#tLHW^S3Te={@?1jZ^y7t`cc|w$np7|v_Y}ej1DVfmzIwHdj{%QALnTw
zm$7@+xBi?u<h0?|wSLgbc4os@Gxi5vpdad@t`w@CH0K)3FPs-s(AO{Ne3_?UTb$1-
zKx2Kr9AiG}r46#2I6$YRTxf9&y{8>4qaB>t@RslAT)zk(EIxoXd>Q9ob533K@j#iy
zB1$Y!rhpH^HBHYs!J&!K4nT7`?bG2y`Q)6~aXx{3l)vleXJsC?zSzeJG@OH79;8Qq
zmUAw)@-Z)pypx=t(H?Cm<;Z#1k&_s*F6I9^F$RWV^x5`L#+ou)8QBhxA;&*+tWn0g
zUvYV|UxufQ8~SB=S{=y7-{=8&_8UEzOj)Q0j4Rj=%va(o+&LO;duTg_yx+q7CG?=P
zaY7aPd<?oHIs}@VG*3U)VLi^tAD|zMd#p^fTX){$__2IEXrWg}(9U`1x=z#)J0Mn|
z|1sJ~!7i-s(=N|!_|uI3Q{OQM(KloKbc}<3^Ejx_kl`xo4(y`$Uh0&gqnwO!?qr^s
ztBmXww=oaAMMp5l$uVU!_)7kR$OkVwzT|=9chZy#`Yf>y<{YaV?eG({le^rpp9Hx;
za|f}Wlo@wFHVW{u`Y@LAnKJ6HqQ2Vs4(IK})AZ@kfY?XHnGJub{Vd}r_%^X!_*xkw
z>Vf0eP8Me5CMGPC*wvv)BW{#B#6`zFVvh&UoLx>`v9T2O!}|3!_)7dd(raEzneBP4
z*Nml;e;yj?Js$dXZ#>)3ag(lR+VtmVS3l0TeyCw=^Z6wrV=3Aa|B`D>QKXV#j0e{g
zPyNT)&su!kHHFs4UagNe!wxY|AER#EtaXt1r*ORCjE)oaoUcA)yZ3m;E?~RG&_5Z!
zU(C$ej0HI7-3&VV3p;N~Okmd_)JfORIJ&?#ZeU%T_uHzulk(tvI{L#n>*|lednDx_
zf%yV4pJ0QyuXrrZe?!hI7<(bVBE1nZS{e3g8T|7O)m+MXljXFdVfGU-Q>LF^(maW&
zv^`9oZ@WAXYMvp)rR?u;<-}fAM$W%d%{Oxnve>+*n)g^NFc%^|eLVDh^wl(Q9d3KS
z@3wc+lkxZ4`@EOI9%DA#Ha5C#yzMm?p%2uDlj1iKbB3d@gkekCk7Aug`(RlS{DB95
zG6yltoan$8ey(-0!R2?*YmU%ASd97uefTEYyX*qnn}_x-Kk(<exEMYGzB8GG4C(3G
zcDrCJp#scXz~3KtTMu%GueImkLt8I{ufSSJ$5#dVIK3#^>tP&EfbVg{^~d0!Q}dz&
z`%Hgtb^E&`(7&YD+>dom7M>%|iDz$mp6V65V>~}k$41z;THZYp@|ZmM-iJvyifudd
zMHT4e+|VgkZp7-PUi*=DBRBmqeaQsl+y3r9WF2`pu*Y&ZxQ;xt;cxW(bAkIjGDbyS
zayxt%eezEs2XWzi<oe`5+}C>yF+wqYfsU_wCy!Lk2hmT)mTh_t#{NNQCd<2(Ivna+
zqvs~fpDF0F<PF>}F+~;alksv`@B93DfnKjl-dN4|50Qs?PI%I%OIxU8`6%z+Z_)QM
z4zaP5!k^tg@Z)MHChLT}<^Qf@HST2;duo9E6lBfByMHe85c9p#=}GRFd}*wf@63jS
zgW`5e$Jl2#=n!vR#C1YuKg9OOwiiWvzjaC5>(cY_QZw$$)Pffx?G^nS3zNmP^RB|=
z_pn#!_E+o$F&N`o(G?ss4hv!3!@UjIu&)#JZ(00`MkN0s7r)64KOAG;&dHDQAlmfz
z8Pkx{Uz0;GZCsa;e?-!Q%|ZSilzrF^-4L0vXF>U;FJ}LObvsZldD9(va11}E<>9>h
zV5WZ^*f+@PU;l_?SFZlu?C`@eVxFA+tAc;^Wsi+a9-)s7%09=D9mnZ8fi)?7l|ME(
zreBk>3CP|*Hz0f0$Ydgy>~}c)aGbs)x9pvmpU*iqZ>#2)&o_RU*Xv}C8G4L4*Vn>s
zi$5Rk&BEThEO}op`4>9!<2b!AxBM5ZTOF4rpUyQt_d4T)<Mh3O@iB9r=pl|d=gIgy
z5wN|3mnE;r)t?8Q{@@t;m{XT7xIaaslDFsT&%;iCaGZWP(4VD_JUC7-)$(Bf>u_;V
zakf8+jY|FleEuMRvdrOu<MgtN)Te`^l3uPpJ>m2T$LS{meR|4~2gm8Bj69g@vvn?%
z+>xt4l}>#erz>;!r}I3zPM_ratZGMQ9H*-TGOuyk#Bq9!X%jKH`0`jN`DtJQ|8^vO
zFXA+&3$YG+%S)z?d&yBFWL$dE%hbT}h0%dy_hMgT8Rk!k_rl3G)a7xgBb-b>!TAEm
z2XXwAIW8KVOjnxY4jfmTV{c3{y~Z5JaJ<&E-H6!o;fyb3Kk3gghYT3se1yj?4d?b6
zTsaJRHz%<M%FyBXy+zT16AvP8TpC?)Y+HfMUmo`KQ%j=*&s=W$_OS4i_#_pkzfz~X
zgJY7Zhob}2w5|1s-VThAm?30h8Hrz?$d;9Se-6wTpM((Wg*h+bT3I*rK7^Qpd#r*H
zWMB;9_9KdMXC1pvb?ela{@J*N@d@LO-yEau2Ke=+*Xpq+9<VomzNJ28ouiyGsM5=m
zjVAV#{()a{*YpKfFs3Ch#AyAN_Tbp$D$qhdDxeDsM#?<TnE%S;|1>;AUMKeJvvoVJ
zOn!jai<tQJI>sf-O}*5zC}OaGapEgyU+!wv%WH7L`;3kuiTg3cp8bdkQ`k4MWi~Ff
zv1BReq|A&L<pF)K&9n42hCGY?70Zip0o(D<M>=srp<{D6P8SAjZj@tlI8Ni5pxysP
z8*+_N;m^j|ej8{r3K<swTQeR<iqDJ~xZLO<_ddB#M%fq>7jp~`ddW|p*4W;xV;70%
zNyoii+4BKbSS#wiULIr3NFMFr!8I%6|9|72D&k`1cQPNxmd<ahv><sL_Rev{?FJJl
zcR~O3WQcb>c=M9nt9onn;Mlz%`66pqLGn{ZR*N}cP{bX3$-ODy=;Fit&|O>ysP!mY
zZ_5n*0P+TG9{Koj@;GDHPW&H3pAgR<fvgjxZ`_-Lt?}B6x!(1%0xotf;PR7e(BL%{
zx<3U!_J?a9T=#knH*}bNeK%g;uH$F;(|-6W>}T~Jp9DRC@5K5MYiFeJr!v=XD_9`d
zc-JJ~$G$)M+QaKxh;?NwjNBE!0l8Di`#Vd+z0ts4E3Wr(|Fsum*sQqD!up8Eomy88
zhvr_B<n=%51ll|tis|$IsWLuT3tf}+jGfxL?bHRd!!^9<5{^S1&?TI6osTszen_z=
zA-)0j>eiL{<YwcOM__KjG57Z9r@4o5624ik=^5Qd9EaFl_q_`H64c{RspseQA-3*_
zv>!>mRgiodx+HDBtJZIdz%Tt@wLXn}&R?wOVXd3m<|UsT30w^>jDLh@m+*uy*mApI
z;a!{LK8lY`sXjjeKF8-^-oxBSe?wZ;ac%O=pJ_V~UPfl@YYiN$E=cx24E+H8Oy~z~
zWwbLcDc~vBmn^UTYm?h8FWK(_Hr(Gqd1xfAuWCGfyF4ja6QA%02Y-zH;cfT9cYa%Z
zr`3O}uZ7Un0!Lq;#I=gt`fB_wbi5yJbG^@g$+aQqI(<SEz7YEA&u7{{WM5}5Mc;U>
zf<7e-`(io;W7&^>(Km2h>2uw+eHZnM^raYg$cp(5{n6LR&e-eZum`#R1equcb&}VZ
zs9T&5X&3*FJq@uP*hLCDTC3wPeH{nwv!3+<a-D)$W8KL<iVjUx>qC@%YIHqu58VyF
zgFMO>>N36)Wp<x~x*NJqCE+vHe~WFy*23^r_8P@#>^ad#Y^99Q8SkA5$*2EKWR&%2
zztKa=6#=%=4lo11-aplSnTfs2ciB(&QOf7)@-Le5Fv@A0T<g-VQ?O&kNPp*FSJKym
z;rCwA_tT7h=gbDBeG}-3X&L=1`)RPHuOJ3;Z2`W+`k%+aH*5Ss&sfHenMa$1t^GRs
zD0o%_&vCHHHQ<eW`ZW5P)LSZ9j`+wcCH=_cdQE>sbgf#q%RSpAz^wq+;@_)Q$xnm#
zanSZ-oaw`7U1?$-vt|Z{%?}epBR6n)m3YZDe4}5J$B+218po(#@eAmS$oR*Qjdk8c
zivEZ%Lp`<~Ld+&Q@GAOIihg_+G?0P*tA8r|O0}1~pRuuN6FMV%%{F!;KNp_}+C8%&
zy6fy)W1ac`PxM#_PuLxN>TzRxIrSX)VLbF4G1&hf!EKQf`r(tQ|Ib=F`jUYDF9e+(
zZ);1W5nF<9F1EIWF)M=Hv@gU`x?T7P8z)$MlKY*sefM%KqP(w!=g?Q!yySIqpPqTJ
zbLx1ZtHa<gIt*JBJ%^u={u{f{``~&!*(U8ud@9lqY=*kSdya(v<2Z+myr+b^a%RI{
z=Zq^c{-SgJ&@aZ2uUuhtivAY9m;HEJ>&uY>;KeqrUpiYD&e##~6<t2Al7IbEqx<vB
zd~^qN2KkKJ#0R3SBx1SaZ>i)l9OE9SBb2e}d~IVqMRy9rqC00cnCoTGfqv)=$NMXY
zrN#fDExES}efoQ=0|r-O+Gp&6bGRKFJC09KFNi71I7YvxdCn9+1Aa0_&<Vi~{g!xu
ze$ZaeW!;#r`?6bC^e_CuUyOnd;P^%KnQJ1(IONH;e$Az~ZP7>3XF#Xx9p4#43?OnQ
zbz4oj>cXbj7HwJDf?k`p);|q;i7TytZ`ORcjsb?*{hb3o+Qxf)x##%2dLPeKXCB66
zp7zBDd_B~A_6mPC?(g5IWDR%L?B&W_Pu;`*`c&wC$XP$)IvmD}^KDe-WwRE3g}U$R
zrsl8j^}I{V)<b&;+AP<2MYsmQdHJCndSZ1##yB&s&_g%Qb?zg8E{ab@oGU5pNK(YU
z-LiIFEH>@QULRtpgX5F4?Y$F@&r|5P%$MF(VwZ~z4c0^Zi@lLt>tUU*d6D+mGL=M(
z4S%eXw#=^Utl#UT&NH6kd<vbA`4l$e+XLoq`1-4)9Qmfa7uRmywb%OHaZ5qoV$Pe>
z)%s%iN7>(o&K^?gcKX%Oz^}bRo0tA$@0<PwzFGUvq5LuA3XLz&^S|Dknu+@#xW_DW
zG47j#PYSPHgg(Q^ukSDPW*$QxQ{tr#UY#uX3F15GyZB@BD=J8y1TA8cp3&S_(D(I;
zy=}8?V0?g+_&Yo1aGbctn%O@nLYu@g^tdPTy@t9cVJEs?crEX@<FWM<xVPeE-V?~R
z{xReuZkBtg>VSdup+P)}o7Ge3xb%6~l9zE!KfE@|_MxX9^4VX%&#|kLfAwSC=W8f4
z=a&z)Uy~SsV*yztwtx<Ydp1>QpBL8m%OVdvbxdD$b@B^_SJ2;Edre{NaK9$;5<f>>
znt}Od2IOMgHv@5pv`2j=jfoE*176~9pf92m@H-*O3%>&2nTa(iZ<n4gY+PZ+4>4nS
z?P$)Sq?xPz)veALQa|i?bQ3Sq6=}L+XS@)TjL~bM@Y<CaH|i#R3GZRm^QC)#nz3*6
z$E*uDma^ya6>GcB+>)g~pc8!{4jco<EA%74OXh#d4qKxh0k?OB26KzhnEw5Y*XuAx
zSQ_ZnH-@rD_9JBDmccSrh<>nrv+mm@>ps{n{FL#f!@igA%mx$3NsNow5HkO&-dof*
zY}TIev&+kXwb*ONCz9W{{+aXKBGkiN*EB>uS+j7xO<#_=jB7+*$E2Py&W&=djAQ0;
zj$mFV=Sg!;e<a7y37JDU9>9z~(D=uJFv>V4u77NY%)Dopw3095$#c}_vBOW~v2?k3
zLl)tIRN6v)p3{yf8;`T&H9e2XdJ%r~7<|&P!h)IHhhfV233jwuVI8;4>|40=lic54
z2y90owgzqy)U)?eY5!yNn{gEIlzkfX>x<CM6OjKneAlsUm|xyf$+0=c<z-+a{y(5Y
z(8b<tJvH}xQ$N68e8A+){3vlySjI*C9`ALKJZ--NCGblp87o14V6@)awjO8fQ`$WZ
zhX><V@tf!e==2<d;~Ai_{)#^3Vf5i&>5E9`j3v**#;;kw^7ZSXPq+q)n5qKnqe+y>
z<u?OsAo6_aI?+YWx3A8y@fUQ6HXic&7TC3AbmF<`LiXD6DA*}tYJW~T<27GSA7|z$
zDZ^ONm+~HjKV*OG{57($c@O%?KG^c#am$}CZ2nvNRa4IOwu{gE#MbZ%jYo_SzkV6?
zwHJLIPk(Rk-KLH3Ie{7I-went^T9Qs_rfy~TP*Ws3~L$NTp7Mv*jz_jr3@$!%J34`
zQ&xtt;Q8o;3zA_5WTqS<H~0@r?y*|#2VJ=j7B;U9Wn`QDPGR$Rb&TH|0)4O_qitCZ
zy-33c`h5(ekGEa1jJo6F3*V^mjV`d*&HxVV7wH}%E#jM#x#&#)N%!<Q=*SD}``)jO
zP!rR*7EfI+q@MA(cTw|J>Jg4Z9g7~%8q@I_8*8($i(X<(nRLvh_X5)MqU*(eQ7*a&
zAMlG@xAGkHOF(b;9l(SBaJ{{!e=_zF)lo$4`19}Ig)iarG~!Q|nb_h9*a>{8%(qDC
z->aa*jPuj*BWdn0V}3k&_K&ds)$;`RMGnb1#(;Aq^%eYZy;b}MWtBYe?uS3*T>A~o
zwUjBRpQAt3>%<D|`}B%@QxP}O2RJ@T{2cR)pZn<#;pcd6{TzLs@k#85_&Me|JbXXL
zeCy|M?D{3^=kO@(1Up9bozyv5-%K^*K^bw3ame^L;{(a#=^HWrfj)%c^EiG|egn$M
z%Z#P0JE4!zE3VrFOUfIWbRN2?W-RSm3fJ2NL);4>=~E`HR146a<_n+r8R{xyN<4Ez
zT_0_A9cv`o4)h7v8sJO8_cO%8uRFPU4}4&mDYN;Z=P$b&yyQNt(8%j=&Bc>#k*{f2
z(~94_PUvR_WU%yD3;6Aa)#oJ6f1f_k%CsQbycXv*gJilqBU5<Nd1c~Ulhu!pAlp!V
zp*@R_F?ia(@Oqt<8@^#YeaI#&H~q!)S1t2#9DBpLWfuC&GxQ%tUa50g&N@TMEPl+6
zt<%QSL-a8X9p@SYx;#eaIwy{>^ZrBnKFbQMi+jbccz+b<WSp~Z8t1f=mpG@g%$)~-
zDeXjf!{*;ddmn)2A#co>hd_5T<a+4&F`vWSEb{>42<qLx8vki!qrbV_`c(Ka@^k$t
z{ino*hzZl9w12egmTNhV$b+r+rVHT<a6K~g{PoKwUxRxPX<IyxV{VG8t6#+UG6u5u
z(T5?Uu8Xw}d@}tl*O6RP*_hM6KEoK^`eyRQaj0L%<@9rXoM)JKFq2n`yfKsy`C-s9
z^*rpW8#-QR!MbW--iOvNyZbcG^&QL^@=UAvesk>sJhIva{`8N`W4p6VyRM8&kT3fT
z<Ws6X45J?fxL=pgykLE^Umg5J@}Ey(-OKxbxgN7}vm9|g<4f{yXJ2v5^$hn5q(7#8
zxems9zyYz5u4nlmB|h&XjRFVuA8Yx6AE8Y>FS+Yj^XxNl=W{-6<6Ql{+R6bv0G-@_
z%6@T7uf!e(`E&od0DCH2gD`(5*TYCdkUb1JIFGWQ?s~)@f5^aj+g?Y8tq4y`>+kPQ
z1r7Fh;amK9kh%q&k4RnQzsPo-^00d0h&)$05B0EK^v~z$^U)}GpYcrJf&4jGH_k&F
ze72JKK=#Sr{h$AU{#YM>_>wse;oj-ci`DO*9HUl%zK72`&Ny@5t235FUzu@o1K06A
za*d30=^fxX3-sT7=G|SRHNBL<AJmLyj3s_D>zX33nV>(tz>Yrj2<IG`M}e)B!6(?V
zCBZWIL6+Ul@#9+gX7uG|$Z&V`6`2QWCoTKhWoja1oQZ3_y;Amk`Mb6(Y|G}EvaeS8
zWlKhydUrrB#)k`skRA73TKNXaJ}*-?NcKB2WwpV6E!1W9zVEPpJA<0xVJ`)L5pVLh
z!mOh@e;8JMKRlP7Ssi0Ne_xCG2>a7xow-gb&qiT<tv~yM-CuzZvG!YK?H77UJIJ}e
z2i{!w((fDx9j;3svF{#WEP2ns+0W*x7XqExN6lQT*{G5$alJhJXD|8j>qf{>%=tF3
z4u_0lza1zCuM2oC)9mL!W<H;N40=?9`#gBxlgLE7EW~~d=9VXL4+7?j9^N}}0(L0(
z3Lu|*p74X4)xjH+dl1*sXGmROA#)@A8Rka)92}0rbF!~fSpVC1Eo?AHIqg*Xgg#3@
z$E)VioL4bk^wU^-$r@zzXuAeM3<}?5`F84Y)AKWU{D5;N@gkqA4WF(IeLvTExKE3=
zLZ2ApIoc|Kuj@yDIgY<%?^B}Bg8k9QDz5p4kjc3|+B*~tZ1v?Z<R(AZmFVbD{R_uH
zH|HbJb$||IMSf+xUy;wUVUFL;xfrqvAEfUAkDJiH<7k`rY;b<jWBLopJIt6qN?*hN
zIan#&L%4~2i)wtlx`?-fAD$arPTy(kP6cll%ei)cm3yLC&k#%5<6~O~GvksXUy~>E
zj$Q|y6D#6g411uTlDhr5^+j+8zaUOyjGm2-p`O!+?*OmG=*J1vIS#z+oGh4iOisRU
zVv|znTJ}Dlu{ZjOsjxSrKlI-nV{nZM`o9Bp#m=~I34J3Tv}@W1?=29ULcZ9P!Hm9x
zZF{9fvSxjO@d)i0dx?_Yq4WP5`QR;jO`gPt`$+!2uyc*X_a#_Ev0P|z44E?b)0@2-
z+6k_k<9VQr-J~#&9)cegIgBkukyqyE;Wr>d#(xwgf8XF{_eaRrmlN@>FDH%}rxzlw
zKVDck^BCs7e(1SfuXBHS9(<?Ub`|9F+w!I)o4<edv)m``0v%%4ia#<bV_D{BkDGI!
zCNaX8(>BBKIiumb?e!+t@5InI@`=)Ju;0adOg&=6x*Zw4CY>Dzp+lehpm!nE<@(i(
zxAtEKfBLSMz)P-+fj9d-1F@CcU-D(YB53~<^zcSIhR}%`@&<;&8#qFju(sEj67!eI
z8~M1FFTAhH!CT}5FY<QB%eI@r(Tz`?_kq9{A7ku<7)aWLymE}btu?Z*(b#D}4?6BO
zxqjZpaJg__!MgMprP}5(AE2G^T01V~EayBx9pku=7GrAXjeg35yfEsMjy{Crc^~R+
zB7TVNq)w5pgLd9Q-av@={=v47zp9c2A*>Uqmz*P@U)J_wrakdHu<I=U(KRvo_3vq&
zly!%Zu?zC>`u8sE*>jGSH5|*#Givk?yeEP3b5Bgx7|iR)<k6qdhgd($xsmr8k?)6w
zZ?Mno$1%jBwjbX^45RJC-gD*b(=onc907kM7-5V<SUYfib9|9Xz5v|h{t&eHkKp6u
zVa8kTse>+KOypV(_f-XB^ohP%d@%aJWAejXMI9CS|HhX~KeMjz=f{1pS;l3we?Ch$
z#p*Nk*V<f!zTWX?T^J+M(}sX`mTet`y!5N8<GN%e#wrRLS+hFz+d(5X67ZjhrEtw8
zaNi&0!?<wYdK3NQ*oU%o6>;B$7m-g{i^q=cwKBJx=UItw&RC20RXF#bSl#aAK09y=
z=P0M{Lhd8fp{%*a%twCw2EAs?VtJ;h(-<4KoY%+cL-q&e0oovOm6!tl;|P9OXX`lz
zV<PQCm!y5@ip+I57v0PuGxa43o<E^40zJ=9`s+CJE-B>a>@RKB#NW~$#$4KizR*|u
z{eca;{q@@e4cl8n{n2&bk!yy5x)zK299W2+px@tv{D;{GM~^I48Gq{9ow+}19&{W1
zfIrpoJDznr0eyN8afR)hq`CCO$lsx_4P`J2jBh*p=jx0p_hZGPo05Be0GrN1!~L3i
z+%pDym-o)3*hkZD#+GhMe&)OS9*0js7jW-~%;$d$+Z*JsP<Jo#=?6&{lJ&<`$;Yto
zZ{r>pL-FrUY|>}#*PE6+Y4%YVTR<m|$n|IVM2=}6uQemK;Bl2XwsVe@L&u6yN7kgY
zGwQ0?M4ulI)7E0Ru16nx4`L3%z}OObq#z6T?x+LsYYS*YqJN-aoyiurInc*BT9$s)
zG5b&OLBE*12e=W7QRstQGlu;Apk@8vuznqUDf>IXp7DZRV=MeQe$rpR%03Xs$hMF5
ztldwFqJ3?zj5)8zyY`|3e-1y0zUeg+d;$HVcMxUZaRqqDdB^q1t09kI0DjZN=J`y;
zB;m0y7mvqLMtO11kMNi~DOup~z@SaQ_@DARG><<B@Q|{8&Evb^A?F7tB|qdn7t}|{
zVaNU&@Unf>?<N3W?}jAf^1a~e##cq?qdc2~GV)ZVHzYp^U4oxJ44tUpvw!E?ClH$)
z%Fo$#GWzcNorqay`hLljvmdfAXJP>ARu_FB_9_@3$(qZTHIm$D)?Fu2J_B_)rv~eL
z^y#KP?OgiV5lP-)Y(~mTGcl9Qp``D~<caMu4|G{Fcty#Tt_-L{8U76VnVBCm`<W5g
z*#WG(-^7o0n!Uf1q2s<MY4?H-*Lt#O{rw_fW$CtoX6qn2XCE2-7|)O=-YfdrXMI{X
zt{vR|Z-VYKKCRxPcH1YvPosPzeze`8`a`<sK(ju;OWSRxUD7pyrcu*j{o?M6XVa|)
zP5eCkEIv<x?#TeH?=K9F7N2s^E%j+#d<Nrr9CHz6UIhC40(FMsKOb~=1ZcDTmm`nm
zkN2j$HZxGizpfmhKLMXhnfQLt8~r+NJek3fw*5QM-<&u@XWV`7b%W@f^(6HRa=811
zRYLFLmuZ(aN866VHYvlef!6g)?eNXak0U>*SN3@_-Y2BcPy0-nTqi1o%*dxKQilCU
z`<{uR>bd%C<*G7reJUVVr;%$3^676G&#;}G_(2BtAr0D`<pF$;4x&3ZzJDq7F207I
ze7P=#y+eO`Ij{W-;<b!F3h)Ij_3Q-WchGX4`lkz||HmwPGtNd1w*MoP2glLZU$pJ-
zH$xWc?|YENJTofyqP{KswGR7sh5pgL(a%BhYkG~1KfaDU{~-LVKXdMj22a`d9zu>a
zg84_6quLpxTyn&mG57oB*faHKpM!0dpRoN0es~VWAG^Lm^f~$mj8CABi!q;L%Dz7&
zaK9b(2^dODPRuc`@@yRDWA3dV7^=QIzB$_c@=*0aYoBjBSG&B<kuA4#{~mbo{bYPj
z=LBSb4{M9>aBLwv_dIdGv)&I!thq<{xa$&QCxP+!vCw7g?!10yqdYI``z7|p^-aP0
zgUa6;TpwendA#NLH`2lP$vb<|hV;2m^-5dkqXS0o1!(zRxk3C$2TZ?XX>nb}_pcX7
z@9R7DSacEo665l7+-K{~1&Y2H`QJ77-=?q+n?j7veU@?fZ9=RX3hQSK=(mkd%buSt
z<1+@V!=K}~5np7+F_%1c9o_-IA3;2f_rXt?gdgQO5|Fcxa|7}ZAfL2Z@{K)*d?=%Q
z_F2!N<;${1*shGR?BB^;ikO=1?+M7o{T1%D)QpJmc?Z6m>s``)+Tdx|`Ld4F>*L<;
zf{C}2=C>>j#+`L>-^9CI8)FahgBO4`^Kf5?Jf~5>>(Q15w#B^yKHF4rQu}_+D|lb$
z1YDDsz2uNL(U%9$X&+&G%g`S7sV2xfiXB-OA)jN-x-zEYHJ*$gV8_~zp^x-Kww#zc
zSYnR0e%qO!IL|=$*!I!D{#YOT2cBuA<>d1vMUeAa$inrS>`kI==8r-iW#e-?(*8AC
zz6kXZG_nVcHf-5o+1xnSnV*ea45^2}v?nOH(L>5PNDr?&haRHrqv_#b`8c-dTh{&}
z@guGw$dSvQPn-2`PJ6!b9CD(Ja-QFwoq12<iEMk}{)0a@(COze7ca&5J%%6G%F6@&
zi5mO*d&uqfXDIvHW7qfaZ?FrAcT)lTdehRtr~0-79Uf#~$Q#POo=bmp``Uo^a@p5f
z<U97YKU6e?eE}DYvy>0kVQpVF&Q2BPe%}M1cP}H4ckq6Yk?QkZ7>DV&KFfU!?8odc
zerJU2k^408HT1vSkN9}^3}_oeKlhKj7XGPV^0(x;z&XCmIUemCU*Q~IrH>hlU5vl0
zHfk=nnDhaYt}^L5lPa4!joNRj;NA~~cb}@|?f9)W1n3;UH6q^~xv9QEa#21X2eWHe
z;Tt12-NwB6$iuv*>~}}VgS_<lP0u~|+^UthhNYS?2<4<($GS?{@2Sj=>vMir1%A=;
z#%mq{H1Z~9^5!w`5b_)ueu;VP+ZH57uG=MVGwQELo@TH1hds5W9p@`sT6DSoZj1fC
z3BTu3g#!7G$xS75NmGTqcIgYgZE{nI$TUesuJ7M?9DgHDY#edo__gObkEp6~{n5Ug
zPM}7$KE8v;<Zu7Z;*ZDIqi<+VVQ!FL8kqeYzj4SvJq4Ll(Rci+@H>p(?Z_{~?@9a`
z@aw>j912vS8lmcI>tl8J*2=6zd{u2CUfnt?mZ-n|mu9c3t3z3(l*L*b6P2qP8{*kH
zwGFkc%&|2qSJk$}R@MoXpBHZ!BCE1Bo~WlJ94q_xzc=Ej-JT6jhpWfy)g!AC55`;X
zud6GIHLQY+3FbUd+pubJLu+FF1C5E&RjU$lj{3XaW3A<h##UhQ$=XC~TdeNUczt66
zTC#LxMQh#TZSlnV#SPEYCK?;+;|;B!j3sKNi#LxzDcV@nmPjDKJibz?PnkUMs|NG3
zc&rI6G_(R;L3nTvFHKI#I?Z>`Xx|xWO~k6>cSeRRk0%n1iF1@c8%s3QHmtD}nopaI
zdZe{6vKkOaTI*UOfFw~H*H)#Rj7TgIkHqVnS^==i)N6{hR@e9y*GGz{HO*KU$&{~&
zw?>{#)V9VWP0*v-mX_K^c%Mg?JX-q5BTE-m-oIp7>3xqZuB=#m|B{Nui!jg1-=OlP
zpIlr~vE=^6rhM+g<rTlYc;TlOFI%`2b99E^;>U8aQzZ)@D1Btv;)RbbUAXjt2ON5^
zy>IC<%QnNOykg1HiY3dJJh`~?k)@^gS1zr%e{qFUL$+I9x_nVt<&sCsmsTuab`H7+
zmR2lsdV3yzk1a1-TuMK?vaPmm)t!-N=FXlsd)_UPM`MY|t@9(dmfU*VEf^R00fWo4
z7{$hCTO!ZI69oFs$h7C$W}6>LtX^5Aw&$}NQ6o`{kAcyjWawtK#H-s9Hg{0|tX1)q
zZEGwuw_c#YZzmD2i^p1ghLx^cqUKS#oWItZIJE9r{uBLfiL7c%K#L=yc05?w)*1m-
zOI-A`c1=SgTw0`fRa=}|?dwrC?sw0fF<V-(?hjZ+R>x}VQ1#i`)*7%+wAR9>u8+i;
zn(AtiEe*z7BC}>iVk;X_inf7Oq^>cx3dfqAa{2ipYR1xDODnuuEU_x0op}V`XR}q}
zA7y-V)UU)>-6|a}MHI2Eh4LlhYuf6dD!Q>bs}u3~>`1Xzq8TDj(8FoZ_*m;Fwf;QT
zR=*NQO7UB9HSyT0IGL@ft&TKE3FWVCcqUd?3&=~>O<SkAD)rcMOWuMZiM2w9g0yuc
z)>9drHcJ~Zl#Qz+iCDuLP+PXs>e^(G8yhehJh64)q@+3fEj4z??GHyrI*EUr0x_Po
z&&68B|KPiKZFTX;G&Gt(r*Mf>|M_%rU9}A^)6|rlX|%#=Ew{*TB@`KFO{gmQEo*C=
znuxo2Nq$=oZQK%Z$g<>Pi%@u0fTp&@o{8h*eCr$OhHK)0d0lONTYco|w)&<>OYL)P
z>AAMZJ^Vk||Dq!w$?<0Va-tE+yE0b2c4%EMQVKCcwS*Rx?1gi#;mVZT^LmP^i7Vw8
zbxcZ<%J{k_Sb*W?pWA%ZR-I^NOLpKKdE+gOb%1Efw3ec2EmNrE60#6J-^#PRFi~wv
z#Gip%iJ0(+X0H8+Z?EJ^9(uGmxDhDwbL;MmRO8!-5g1&eRp;DdhCzx=e-VjTsis6?
zt*Bizt%(g=hsV?6X|>iaEPZW#6MTr@8GMZq?Xtd9&eXANOmoV7#L=>WaGYPKwV3Ys
z{@v1BJneZ)O}wsd-mSjJ){NMH;5x<e@761kGSU){*SD}&D`}U$Jw#%w5gVfQ(UC}T
zO>ILfgOv58tE+8Ts~xGRvI$+0y)qF4MLd>(PfbKH8Z57FtgnYsuvYwDjZ}3_ym~Fg
zTHTn4_`P)XUdJoC|9b3*0odi9FESndSQAD@AEkZcMy5||!HsSFJN128VyMs$bgFYd
z`u`Oxhga{TxA5PSa-zYzc$m1SVtL$$qZ#uJ-etqYJ(Sn?;lQp|7`$tSiF-*N_hI3_
z&fvXin7HrH<323hHygY=hl%^9JnqB7eZRr`&@gd7n#X-uxF0ompBg6a#nt(EW>~<V
z(zr!Tdci#MxL+`2tT5l;T|P|Q%k#Jo3-=m>cl$7LUzf*ySh#O7cpn%h?%jFZhlTrL
zgZHUn;(j!b`>=4wyIpzdT@{=3LYahC<>Q$P#f<b(gLl<1ai5>ZeK@eI|7GyrG)&xw
z)o8wwdd=Y7naBM<RU7sjybqZ4Pyqjuc;0_siUIky!8vWxQvux5dH;PWU{~sgTAxEE
zooG_qSWRBvEfg0uEipJpO<Eqny)2LWMaA1PTV-%=GHH7N_x3#Q7OIPyZZ<e~2JpV9
zjpUgPLg0YG`%oVDLD*c%jFiFqR37(B3G-myKhp8cIFk-0$md)N1R@6S5|c&)_~+M6
zmjZRARv4UXOxhH{J-=?cG`P1LoHv`a+n$?s>ZyDjc}alpGdLeMY1*U*4DJ(G=l5qW
z3GhEQ^QuWBCT%jfAI|IhC4qgu!MV(&wvp5LNCvM%*}p1NKJFziE8mvq(+fkO$>7-@
zz<tx&Y}~h)@`-ueFAU%zsJjiGeF5By>#}iAnes>;_aTtHu<TP7@1JDjd|_Pj)EA1t
zM1yyUNy`HG_u)evuAje9{(1V`2-Fyy*O|0EfO~%3lpD8?o4eWI+-=gn0Pd;0zJFYZ
zbJkB8oKKlF^i%CuLNz+wlE*zKZXY)@VsM^s(vQn8U;m>aP;T(9F==}c|G@g`qjAks
zoezO-gYzMirUSS~^0=Q5!eNz<`#0^!BPO*>%JTbR7K%%fmKeOF0o*(DxL*>yEz=bS
z@0tMaO?licM3*F8XYk$>!2NI@_e+AeWxB=S-EGnXCM{W`{r&-yTKar?aS%9ca88-@
zv`vk^x94%cI6w!uj5}@O8IzWnw94R}&f^|H?Bbl3S)5I3xt5rH0(+iMFD?S>4Bnef
zy5Ek2!M!ZMZo0UD8*YaU&S{gLGO2AWzYlDYxX9^%_U{u-T4K`te&j{QIl!*W;9O<W
zc9U)~ex@n!X99>_oYPK&bDv2q*Q5D))k1Me(v-#fXC|IB={R$}V@qD&FA45t2Im@+
zZZ>JT!TnGk_e+9%p6P!L0{Z>m<`u(uce#~9UJI_XC5v?WE!LGn<)4}gEO)v1r%rhy
zuHR%#1}HbDnt=8BdTh;|@4=N*yt}y8zOvZ1tKVSk@NJWiDOAdfk8KxF&B^9FkZUU&
z;?MG3-8G5EXKgcV$H~@owJj*F#M`!;AmbXmve>5<xds(e6!JIt;4Rl{8se*Tr9s(_
z+!hbF0_X$Tx&rxII{%f>wzD9~Q7jd6$Q5hN?oUAMSSu^CUO<paw_?s>Q_srTxO#O<
zycKL5#c<>d6r&HK9wIjT<DWWe$b9z{?|avkGV<v9uKf1<8PqRbnyp`=cZSF)8`~MA
zXI2p{Kl1W>XBdkdj)auMr!imhaNoy`;z4?<%QdmZ(n16JV3xET%pH=>jJAH8xZvR9
zEd4QK<&-<Uk^X8UHUwzL4uO^<li`22MEDBGmg{-(&%B=;{4DO7+FC!|eA`$CYfYVv
ze}=>0e9ggN?-L4L);rZ9Pv+b<tMK0bWq9#Azgyzt&=Ol6uM8Bp@5d)0iXVVl=B(!y
z<fvB>FXi`WVy&6l8W-DcE`lH*UvG>S0B)lpM$M!*;A^!mYqVt?18zcB5ZnTFe6T>`
z^P^ti9PP>x>+!(S`gGQd7<oXJ;qGW?pk1TQ8H@F6nRnu6(VILrF*x7ohi%n(FKax5
zaD%rLJ^^|QALs+P=?Yox`W{l7T&5Qeem;!@0vdMk$w`sBok4H`2i>;*>XgC7$@6<*
z2!yZgnXN=T4QrbvbWWZgbX#iL5k=5>*48bB)HmNUU|!(ds!zs0R~kM5CgUS4H`AWg
zG13|i#@2m8X-C_?<Yk}x&1Ur5!AkUj?OUC2%KW?lcEaD%2g(NVbIPqGK3@k*)`J-5
zwl}AbgW9<eJ8>}uqd<Qg4PYzhD7WKbvB<JNGq}O}IcR)5e5=Tz-+?w9ShM9H%)`Q-
z8GoN9yQ^6^3_&vpj~sM<gCxe^=~4PQnoubFd77qry^o-&l!}=0;{0<67Lt#ZmKZ#v
z0o?aDWaD0L%ID{C|5$k2%2fu>rU35a0=T!E@{&C67P^m>ZZ>#!2XJ4}n62-9raYR*
z{bS*6D<3v^rUJMJ{rl-axvig1hlfBYtmo5-Cbe9G{=GO*Zt3#r@DP}9@GJ}98uafg
z0_DSNEnmwbP-F017r-^>-!})!ZT)<jN8tY_1h5a6wVTHESul_N3GSZ-w)bRx=;r01
ze;~Nu2YNp*2Ys$>JloEovS58~EK0}BU<}o-wedtl-1#se>v2QVj-jdN?{Vg$XD0&m
ze!p_j8{wsj;XkN9!Fv3*H~(xq7d;(^&uVwzTiZz2Bb1GfSL!`{1ibhvrO-KVGtybA
z%Iibgui91T)k?(*QU&T-rG6dfn~?r4(#R)xp7Oepc7eVOA71|_oEKlGR1)a{q<HlR
zzILwE60fSDW|C6P;C~b;^P~6(Jiqb2AL)XTsls%TQk!ue#Wy0qg!=q;`2z6e_sgfL
zlzhXy9_RdyIn(G(N<AM+UD<aF`;qeI&tiVN>P9-!OL_b8vBqm~ehBGxNK@wgG}1>Y
z?;NFWL)wmXeL>X~r||`Mp7X2izYBhckS_631rzb%<2{h88(*)l_o@mf-hq6SS0U|0
zehTSVy;Nc60;PV1a^p*{aqy`@`aM-uuwo(FgFM}LDYXmb<##Lf6QpJLDD?*@Pa}O1
z=S}x2^~>OYD5})ms2?g->PC(WQt&I-jCApcR6%O7QooJ!b@;~g4xC3GX8)D91!)`V
zjeA6?GvGJwQI1cQw*~18q<u(>3Q~otoOo7w#YiddCZx9^?L+!J(&*#pXJJ+0{^b}4
z$W!x4v`ajnQ0kk&W7DT}`;jL(?x=_KZtBOcfDZi2Dj_fFtMH9#r1<Wkw1@BTi5&PY
zoTT^;CG-sKn{#}(Oz7}ECrMSck<+C3{)*JY_dui`zE7d%qCUQtAm^b~`W)|*=QtMN
z{Wrj`%G->T{l$BTgbw!&s>L|Rd(T8K@IF_;8Sm4T^LC`v54<-=>f?P;QXlUxlKOaV
z3vyt*kg|O|Pb4Xxvk<z|NTIg{xc^`BabL750zcf3F8O#KK=N^)wB+NyI@C*fxQ|!(
zS0SbRxbKU4P=Nc8<Q(_K$T{xQfc&WfJQpnW@E!t@AJ1olpYqhxI>qyRC~x<0f2yRo
ze++WBd$_L#?Wh9W=OHQHSEGIt?c@C^&_~!WKF&>h#d?eS=^+l4e5?c14wNH4QtMHE
zxJlbr8tIFmyXbx@&+tD10Z+kg^Vgo;n5PPmQIaD+JVL25lvQ<l>iHa_e%HP0>g(*+
z;qRV4cXr8id`1~xI>xtl@1Fk4%O99Ee>%T;jE|JpH8#ZWp1wZbGX36r#*V%#*3uHM
zUx`m}gF!>f-P79=4R^NSGrje(mRa?+)rrQI#?`H}@G0LrV=eWwpP4%yU$AbdT^(<+
z-xAlYfmI}OS8JlJrFBWe>PEwD%6YiWn<Dj4Q@%%E+q&MIBPS7WZbK{aRpp7=XYd90
zHSrd|&@EoP4xh5;*S{aZC!z7(cK*M6daPwh!!wPT=BG#6YD=rD<1Ogh>R4S%e0pS#
z&*!c=L$`9*oGh8{n&Wp4)$f{Pal=XWAm%>XjBli%q;J=uU8-mP?&$7yyZ7%ou;<jC
z;(aCiYW8)$(fvm14G?tdah})}=~~gXdFz&~hqs2dkK10hy?w`~9eq1azpi%9-`Ui?
zu6uuXde^C4#XVKKYj$_;KDsBhXX4)SeJl2D-goGY!*8hlnoqQ=tn0wmzO9G09^G29
zeg5|7_VVrBJNEB5u;b8<$j;)OB|D=#w{&-QcXuD?9@jImXVdP@yVc&%-gW!h_nms<
z^c$)V-*Sgos&iatO;=Obx~@%Ksjca)r?#Hns<y4zUbVeud(-xH+Yj$Jx+AqCz2nr5
zvYq8St9CZ+T(`5Y`%w4M?sWI5?)g2@p7Nfmo|>NhyASLx-dnPF{@${^o%_1??cdk8
zPaRh3f1rtposrJs&iS32yS8+7c6E2{?+R@jx2=8qrtO=zcWytuL%kk)ed6onylE%7
zs$Jx`uIK3P)b3Ne%lEF>TeY`lZ`0mG`ws6rx-Yday$?)Ncqb&1XlGexdFP7Gs?Gyl
zeO-sUO19147Ts31t$bVe_Wj!rY(KO;@_O;>C9ltaJ^K2Vot-<ockbVLVCT496L%Hw
z+SIeTXG>3KPj`>n6WTLw&%`~EJ?fO$sp{)F)N`~a-E*pE{+{Tb@;z01YWD2kdtmRO
zy+`+^_7=ZU@<#NH@;6psWIY-G&d%=61D%IDCvJ^wE!i5~x_R4{ZQa`rYzyrew<EHn
OWCuje|NS>a;Qs-C1Wx+^

literal 0
HcmV?d00001

diff --git a/depends/mimalloc/bin/mimalloc-redirect-arm64.lib b/depends/mimalloc/bin/mimalloc-redirect-arm64.lib
new file mode 100755
index 0000000000000000000000000000000000000000..dca80b9b855c57735600d925e005a34cc88b21b9
GIT binary patch
literal 2976
zcmcguJ8u&~5dQqg%i$3b8X!mqiUcU~BaZEW6h#*Z5>{T|I1SDD;&aGJb{t)dC{s|R
zq2LEZDJW8;N3?07qCy~nL=$MBfFe?=FnhOqKKt$*8wFO{+nsM`cXnsK*}ZEMs!?2>
zjKrnJ5*=-ng_Pi(u{$Z=D?|XC1ww~FcLC_x1tLSdZc|IOpJZ11c6gPjl@ujA_i!PX
zSElbT-pgel<`;5GMX#vka<v#WN}6tzinXX}R5B?j%KXyota}1BeP&qt`3Fn$Gs^T-
zeu`GmE9<nrB34#3eM4O?m*9oDwM%O*We)l2Dz%bPX;|HwVBz*G^So-UYAE`eUSs-A
zh=-<DT{HJx*EEq%qnJw6qu5JfJPZMaZeX_u7^1jtQyuCDcKQH`Duo#V1ksBggwcg=
zM=wMkK81Mt9o7Rk-DTshu)0UujaQRb-4XF(j1%+aiWT~{IU8>Z=t)_bye;yy5b?>2
zm{u+$F4CB*pR{f|J#J^awim+7XJ6lq1VGWZN=z#)KYcR1$VEJ&&I=*%R>r{Hn69Zc
zbvP-8E>h<U)n6PS`awowpX+5f47xgSp6m%dhRcxlgVbIJ5tGW576-n8!2zN)=!!DS
zIgH?F>%yE~G^!ibm6~)jcT1Yh&d>1ihUN@OY-7wAi1w^EK;JI2*TO2~VzshPXF1vm
z1dflbRjd_gs<~be!X+|b9%oe`=HZ#$kU&yQhXB|*={myj1pDw}?KUe!YJ)K7dn!rV
zHi09ZGA)_OIG7ehZt~LSx8~-plXx*rvxe-igK1*|WK4T41l}^H{TBwc!-K1|Dc?t~
zQ!kE<ii@BSVfp(0&Ewxc$$&))z{`s*@-;0S$MT)!tFy?EMZTs4&h!q1z+0yG&%ND_
zr=zr?wh7#+=WY5*?7xU5y|y<o68;u5y%27E-T5o-`N#8D_q3Pwm5-MXnDqc%U0yHQ
zDOwk#bDVv1_4y}uEd?#>u1C7n_1UrS#UtggfAk~$Ax`!~P4?{<+W+_+-(BO$`s*uV
TzdQKqJ4=hOr+x8<=)Z|StCO&)

literal 0
HcmV?d00001

diff --git a/depends/mimalloc/bin/mimalloc-redirect-arm64ec.dll b/depends/mimalloc/bin/mimalloc-redirect-arm64ec.dll
new file mode 100755
index 0000000000000000000000000000000000000000..a228af39d5a094c6c4c7d257fb6184c7d66b72ca
GIT binary patch
literal 104960
zcmeIb4SZD9nLmCe0hs`5KveLhOh8Hig&@9wVwnhNKrJy)OIuqqgn`6_BqTwD;x<v+
z2KBSQ#JZJs-ED%PA%e!L|0UhNgsN?<x<<5J_Wy6U6F?2%w(+H1Vxjqczvt!7ojZ4C
zk^#EA|DEs&&%Nj6c{|T}p68r<?#(S<ZWQT4h++607!YC)Ab<Sw|M>s)q57<eKRipk
zknu*=9?#8hWUVMJsrFS?RjjKDtoIcK%F8Qie5-@Ls*UBol5*doWy^i*E7k;Oo_XfT
zOEl_lyz=;-z1u%JYJOjw^5KzA+;>m<(~(ys{P4)jfG<w@_{h&>yN{3l0&wo+KgsgB
zlRrB0lDt3jDErNw+$Z}NloS;cr&EIb#X_w4rdMou_q}zdu1`$zjY>OfhIj`h*L!4f
zK84Gamvyp)*J(nW!T<1Mps2$=m4}}+QHZ9hlL689sw8KkM}*L)%;yo=>|B^8Lg?Lk
zQ<@mhd-GG7CN_ga;aHEj$dtK2-x!bZE7o;wm=%}iVrEUSwgwezyYU}c-iKc;2d?Cg
z4`gQ+2Wu;9ic1Sw(uZG)|7+fae|&6LwI)y#5Mpi)%R&2cfc?A<|M-RQ&s5Ds=cgzq
z!<zv|0@{B3LUhioR1G^vp~4TMqXEAe)y_XNaMcyHRqMrE_RmK<^7n{KyQ=D{B2-bw
z)U|B)s9U>WSp^zW=K{KyI{8jiyX#T=|BIhLq>pOr8yM)zO!N1Pw28mIb)>()uX@(e
zzB!HGo0vA{=t3b@bf&NRb>_d+JTm(X|62>tZb4e+(UyS$S$^W4pYA-7E}9yJXv{=k
zk+$I1C+^wXTIiXmtRzib-7Q3S=Gdhj?Lu57L{F`lFV2CDj3VB4k9Z;N_^Q0?QMM3e
z>Blqk8V3fh45g<}XZ<iyw=W&P2hu%lxqyq#665~QiGj?SfP)%<DEck&>2Hot{}N6A
ztfc7&qUmoQy!^v7{okLNto&K==_io?5a?3>|1wDW6NmXf+UpT3j19m}Xafi{YWy43
z_&4aWZ)lG*_P0XzH$nT^IJDjAwYbyUoEewim73nShfFUJNpJJ2LCH5k)4OZP^s?OP
zC6Mm~=un?uiAT@tI)2A6eh+be>hbHs_&tQV+oi{^&28@fo0f0Ekm<F!)7u=M-j6lC
z$wQ_Wh@`i9)u7~S(ey?PnO>GVy#(@oL(@AtI<_z9Nza-dG50ci<|2_ehvU;Hr0?}E
z6j>uNc3zI1U)NRqWgzocE_kEywYcNk9F1@9pzsAE@oioelfT`A!k6Wa&xOD5#=zI<
z3CA$$zcN(}v)O;1)?uF1Az~Tp4k2bScBSFhgWtace$KbAyU;PQjQWkHr(#wVJ^1Q)
z^fqaFMMI{iVw6P>@o6yfeO1%Dame&kOp2nHK)zf}Z$<)oj0r8a7*xp^l-aY#qIaDB
zS<Zn5<-gKo?%^E2=RoHV7{9ZVqSq2l&+^ai^k^@n_wlIs^V?m%K$xD4KZ)g|y^!9&
zCPgnRnqC6=XfLGq&++NCO+*ZG8NXw;@$16)Js6HZX)^ve$8R3|GU<IkDS9o@^eq4E
zPVZt(@BXCd1;X@X{7EdIN7GxE6uqoydI{uvSC8LKap+xtkyvhzKc3?Uye7tEBKJ!_
zzRLS`kyaYOI>Un))QA{VsAJGF#Gor2xTElGj)M<A-ignb2;cE-k^CY4#N%&tB7B?U
z;B(>c*ht4*$NB|pBc~4Y{5r;P{RAE6*?5%er$SxN_0z%hv^K7vvT*$g@IQ+=@b6AK
zCIC618~x1(V$;{_hgkIA(e!_EGW3sci=>bEG+6mx(DeWDWaw{>LqCE1k81jVGf4XM
z?LD^G#ry+vs3DZDVul|72Alj1w0Zmb**^XP_R8`9+R*8@a}6))Z;nGBK0hA)ke2^*
zCqw`Ewn+IA-v%pxr>6gzlcB#k4*dl3H*5NT$#Beb=e*PRjD33i!}>pdpbO(KW1JrU
zF35jW`_L|}e`^h9AOBiC{{Mb5^f$+$kC+jU{z^^%CnrPy__j#-5g!LD|6EP~A5Vt<
z<~Z~d$Uk1w|C>S5Uwe^%C*r3Z`$~_v>JY~LUHJ0e^fTHHr;lhGc6@E#+Ka@_-wE&0
zkXZ6*==|@0k9ko(;=-^;zuxtIamLYRapR}7jkE`Hx+>ut){GN7O}km}1z(B7OG5ga
zhd_UrJN;`<hW_!-#+HBF;N-vXWaw`m0{s~B|JfVc7hv5u_SsJd&X3_91nYm1p#FCW
z>i;uA{n>wxPk(ZP`l}Pv-xR<8kyQ!ms}t0JD?$C=$Ei1Sk8w}bh4)TS&V6eybJlL#
zzRCYV&ibu5;~9xBymw;ZLr&<#S3PKa;k^@y54o!wf2#(KFT8hR;d9~dra1VT)!vB}
zyP!k4|4bhRe<t_-!DF73Ih?aTV)p#GZ*n8>bKN#O4jnT;qUnYAPAq!J(c;mYq3NBQ
z6ut1?iKK_zG?9E~YkK`7V*7#E@`d+KEP4s#`xtbn&)*J$9`nz7m4B)jq~^gM+xRs=
zz6R>k<fK@0M2ue%<U1SlVsFy))ZU36zXlI-ta$WjFQm64X?kk!MC&u5e6$zR+mbXr
zwRd9COCTTZh4j`Bh92@qm+_NpeXY+fj9-`5r^y*3#_y=6cWcu0S|aHoM~X-9O-=90
zr0E61^pG1SlJ9v<Z$i@avLfjvknb@~@5C92=X*rF5aIaKXYJj~XQokm_wU8P9f>a-
ze<JX~$G6*JS_N!v-=Oe?<B!CL_@kfeMdAC&pzwv`PXs;}{@P;T(|hUR_@kdc+x8Bz
zx2>K#OPRwl$a?O~81y9YzX_k&7=w=S&(ZY4@uyM8J4p{dIv%|THNBc4(+kHRNl)(G
zCzh{V(_1+>dW~i;K!|YsiJ+H2z5-2eegb;7y=_UelJN)6k8R_Jy?ZHN1NCW(K@sEk
zGtgno^Cd-3#UDL>iXMD)JbJVj(i@f(Jr#enJ_jWq?S=GuhsXCR?)p^mCxTuA`Dibs
z_j)3F;k|qN_(^}M_1T5-vpqXj`x^FhADn+n;hRaXJt=xB{zTA&kJjU7VqS#3%+&NA
zO^Tk1KU$xIl5ec0SDO?)6@Mb=C6Mn=di-urKrc(w6`cK_vDbgBpPHb4L4x`(CaAAS
zP=9}d`o|K~KOMh*-%k_Nzn!4|{RH)Yj#J;wb5(lZRphwF|LJbe?%x~c?gt|AxyJwL
z=`Qhg-=Ofh#(!7-eljS0uJPZMzqT0obUe1}&{}_Le~<_NLmngIF`peC#IJdF|0M9g
z3IEd=gN`Hq+vvH*f65S--h-N6&5-H2#{Y!!m1}w{hfL2k{wI{LK+~I_fSzl-%882q
zlrJJ4JIC*5pu_m#ONw4p{HJ_z>Cs+DZ&*_FqT+u-`Dibs*PHG>?~Q%B>oY3;CzOx&
zLVB+!qURR>b9$Wdzs>F0y?y>IMVunN_N3@V#s4;pUza`pJMCqrruS%4^rGT_LixsO
zdbLT>i;DjV<@=K!zuObgi-;FK*Z8y4E&kjP18*cg*Z8y4E&g0SD15H*$Cba&3<{rX
z{Bh-PWDI;!@yFNW7JtZNL_AQ>?Zffs4B&qg_TQHle||^PbB#ZgAuhcmphJ4^44Iy5
z{7ER^zi4`UhD^^j{v?#|2b$jF3Fx`{OJ7v{p?neXz&U=CFn;u3bxF~Sia(SuE<M@{
z>8%+gy>`6a!925)>uX<B{7EPu?S=I6lA;$Ce-g?^dm+6`6VcQ0CsMws`14C={Be$7
zo7QJ$QuLzY&o7<v$4T#RHN8(f@#nia8y6{GRQyROUzMh}KPh@q@h72tw`qDmN<eSY
z=Jaz!=cI=wdBs?+HM4v_yTHf_cvTwCGp`b!J3=GWbMH*G$L7`NIlYYW_WD`a%lv*E
znu+PP#HOd$O-_3EpA@}7G(EYm8a}h_q_^&*=w-#G7el_A;?NVL>rd&}<v3}@#Xt11
z8b2ibLmwM4B>Y1ki(V1wFA~}__7v>)6P`bEP3$^<-gM9~YYW1}^kR((=*6(F=TC}W
ztTBo$-(x35FV>jFmhYZ8^y1E+B*w1LNh{v`$r<`s<qZk{(8nfcNce|77ULcGGljq7
zx%9eyW5k}1@IGWIpQYwM;O`%k=I@w&$Ax3h&TA+*`>7vR4S2?sw&09a=2+2`|A6Qh
zh*f+>;nUE}kxbFP?>XdJIb%n5WMW@C|N6PV$~^1(w>j@J&%pK9R=hoNr1-G!>hFIq
zGcE7~whMVC{<?eM*?pN`UOMm31Ce{NCKmSLdEoHT{<nvxZGQgec%%1~;^5p@yu%-A
z788H{2gJMs?B^8|@H<_@yTx@PAHPK!-aY)2zj@?IybIBJyLb5rammQ{Mfy^l8@uX#
zoIjrG5m&x1(njIj+4SD|<L9&<&uIARwdudw@|S@t7l^NaB*eGmxwGMY_Yy}}=i@8i
z295`T<ChK`5Ap0;@BHHDfuqY6#|N7qdGhhEcZEVf|MqC$c-W(GJbay4UIsoM_M}N1
zJpa~kao+P=uFHGAb^COQYpKQ0!-^lugfVoJ32`z)ro)h}_4r{a*8<NOrMZ6@SP><g
z@b|mPrg2%a0aqJvNuGe~XcR8Wc#*q|AH<OH2yh;S%&o`o$fMp?0dJw_#!vU2FnlVR
zePY2ov^`^Ub~spjxlP*3_-rwE>FvS`_}+W(iSoKf#P%O{ONjgMSm#+|oeO)>wxV>g
zxz-xzoz~bmY~@G!ar###?*E&xtwqxh+gTKSV`t4_J7fPS8~f_Y=eOLu(z3BTEIG7|
z89bc{@LZP<Jo$<7*zDewAKLuAVVjTQhjUQcY2>&>*eJ%uX`_Ky_U;&;NIaE;$Kx2M
zNIb=f@t8T|7_X@LqQ@)NeCct_m*EDlWBj7<>hT*gUdMPw;nm|gSiJsZ=67wd)*cVO
z_7}#HOfgAZA#M;W#T|klV#xN`{|WK8V!QaE=oasZ;{qR`aMVk^(NFuL?Eb|FAN||f
z=eL}IAJ9HJ%3jU<@h8CZ<4WLxKS+e9Fae%_C<Y$*g+zGj65zSF5O@j`<7rNShxU3R
zDgP3wXWHk9r2I=H9@^uHIR3@V7hj}Yu<J-XdfW$V*Va7rC%~)iV90n26X4Z$F=V`T
z3Giw=88Y7H1bDUG3>j}{0=(LehKx6q0I#;I!Qw59;pYN(331|{AItBKgw7HDJ!gyl
z1Ecus$F;vdbdJCO1|c3janDPwZg~)PsKo<?;;m0Be!R2iA<xcwuh@C;e9?cuSM;B_
z=O+p;aDJLTtSt}UHtDtDF6LKoT0|4}uO9V#>I&}jh)2E1<JsoKJwI#xw8EXHJqP>n
zP9d;P@Ah82xPKb@X55?c_pQ9&o86S*$#@9(3bH+7o@s+m1$|hEbw@VaI@){L-qSg+
zH{ClO?KT9k2Ep0`XIaEJ;uOGXbTAEc2VN3yg&<oG^mZU!^!Gwvy(0jjGs@7L4hUTk
zdWVa*@H`Rs{(kaM2ObWOKt1$KnvzG{qg|84!E#;$&+m~xhJYLNEc!b)g8u!WkNO_a
zJODn3i?{>8-3wg2u7?cN0dRIu4qT7rb!ddYV=C@VJIc!S)g+dI7W=-M4m^@SKXd{e
z+IV6=uLtELP;TcNeZ7>G{G_v=cRJ*pcQ`!*I?X7>p3Mqpx$tD%6iOG<$zP9LlhqYK
zHYw|KMo!?%#`~}2gZ2qI_EAsx%#xG=G^O4SgGcfMT1O{oJs7*7T(k+&r@lV|Ekmat
zA8@kUYY%8}4&c000d@bofq};+`qF<zyEHan>~LTq#)0Fmb)E}d&IVtSM~u1TQQ1I~
zv;kaOJV`x9+MSPj*ET&d%m3lFG^w+wK8Mj}8ti^LbTR$jk$=CF_ps4vo{`dyDWkzd
z{jh!Z#l!o53%O0X;e+<=oHLM1j=_n0{#ngq*mBQ>qCf8<aZc|-F|U~LCNb~ORLHLF
zIt1B!FI4tZXRdR_hg&!n3p=Gfz_vE9E`<AUz_(DZ;tb4xeSJ5_l>9)p-pOIyCBuLN
zbdCW3QXyWf6Q6r0BjcCfn+Dl2cVF{f41R8e%r|N}Q^bbX$%DT4?iFKzuj35jH)X>;
zW4zPEtt{`I?C%i3L0en}UP$XOXf4sSycw^4kMsFA)Srti1)6`u`{Bu)BN?ytP89uz
zr@}5LD!W`wU1<3@z6Yp_n>y#=Ls*Zp4abUoJ_a3WL$G~mLuzg{$+?AgOX$DI6Uu4t
z_YDu@J<PV$3Fe}6j4eO647vi3y6r=5?Tn2b0Y2E(Ytw))uD!*<C+FTW<?G&nY$xt{
zC2B5lPH{eYX<PI;Ha+qCS=>`HWlnz8+}6HS_p{r5ynfKLj1$J@`zsV5um$N~;WMP4
zHnE|Zb5hP-ZELV;d<Tub&1y&gJ`KLz_&$&FeQJCe3)o-#tzOzxjK0P{8s4a*FM&TR
zZgXD3M(C$HXhZ3ut(P$gaY)8+*zp^xT*fuVglxuybF7#kuMxL8I5(}BalWdTZE=nH
z!1=M9^CMP1K;HP%Q6A|};k%{J;GDmRabDlkcD>M%j1#Ccy7E(3s1vBeex7R2SYm6#
zm_?cKIXfA%3?9tU4vCk#WgG(El&j_VfQ;vEK0HJ6tMefAVNAF4#{Q6d1!KFR!!ke0
z4l~|^56;1mjc?3ri*M?heJRgxI2O=#26SNLm9{}$7@kRo*WlydX&YJ>97i=bywjze
z8s{&F6LK1y#%5xT(}eXl`vDDOKhubZ_QSk|av=^%-(!#c;Kc(uLMZzd;-YMib|(KQ
zgbohC=A`YR%}j;U%Bk3ovHmFJVty5iM`cNo|Bort^U@Y?X$QnJ1~{d^<lMqsGX6o%
zGe>UMj6QO{QO9Wi33v&ikC|gjK<C6gKMKb^&L_k^#srMJ%CVpyUOVRtco@sE31K`I
z&^C2D^2r?Q8kXr8sd+EBl4ZaxZ40qgUXwRH4zm14lmnNs3*x}_TfO8<$D_lDYsRK<
zK0?M=zujgo1Yc-#Eyv`-u)SEhnFEipqch2$uA|)x+PRLQysx7^wM<?8a-J2OxaZ|4
z|K4(k&Ra2l(kH;j%Q2(<*!=0?^spS%5$j}5ZEMquJXZFho|HYvdComt+L+1hBH{_~
zN*_Mlv!RqSnEMjXh7Y7osCw^k&#m5Xc*c;1%HLGErfKB~#$LWuI{0-^E8ao(W-XPx
z=7J{uS6=kms9R)-rn50lTpL~cmjS%$G_<wRiF-Pf{m#JrMm}+XwlqW8EXON^>swE#
zyjJBV;zRQDIXqXDwBQG`VXtz$KMP%vZ{%dmSs06FpdI~^HP4v4n0ZDUw)-=i?T`jy
zK-ixCPHf<OWNh$2PUeH>oCNOS<bN3A8*)=A2lCVGGjabdd0)UB5#<HF_k%~n*KWmw
zbzd(w<T9SKp7SnAIS~WGa=xf=Qm2x3k~k3q!Z`OToL=P5ls8#E_t<g1A~wumtTVcK
zS8Uj2bb%O*Jo;Aez5Z|aLa)ivd)!X%ut$!+MejLJSoavSWNF-Qr}2hoLl$J9Jsg&P
z7P)bT|B(#LG39r$F68`RT^90B5B$w6<W#f#{SC*JO(I3G>D{xzNB?1T)Z>uhSD<&s
z5b4bUeS>eWX9L&q#mHmfYn#@Ahu*1b?zUjAc+=nupnq%JO+WA<eY3d-9?tbV_z<kw
z)E+>Zy6#=*@9<z84*~B%tUnIGpNHo7`ybHq;<LkHd3QMEYw~R9!Fnu0pTpzov!i#8
z=#cY{>y9}pCp!Y(T8D!lT?XHL6Wfg-ZCiXPL_2w}+X*}0SX1PB>h|5H`KG_7FZsQ`
ze-r!j#&;QC)k<IH*dsb|&o83lm5A|E5*)n0clYg{rmgUG^zAQ$PwJ8JZLs@ZJBw`j
zo61)^4j@O#rf*^X%UpiA*svFRV~+f7l>=b^MCXl^KTu+=$D7rjL%Vl2{5x_QpUQPR
zCT6I8uye3SN53rbo~iJDlqPdgiIXv+9`>4tJw42;eykhYX8;%S$?oZ%c}>Ez;McwQ
zJ~H+bJ9tf8%#VhW`*A2TFd?}AlCj#hzF_Wvcu&5YA@A`|RZhyipllE7z>9#aZh3#l
zI^t2^U1mFvXIc|-$%3Drt>oqRm!11P<YSYKzUjx@?m6^BK6wh)S<(AVq~9M1%WvrW
zK_3ajX{UeUo)(o?EYtS3T+F-AS69$;e|l3f{Z&hP)5c+ue8_o^+>?2~v{76$|HPin
za_%L;7g@GQKOKQDYgkjj4c|l?K3pS*amB|x7&NW@-d^x&<tdmCGQWZChWQ`X)PXsP
zacrYa)xoAD&)6d(|56scUnK1w^|EZLjUQaYUn_o?Kin9WuO9m}5%Tp6YntXJ-wYc*
zTqAdLm9Nmwdti9egKoUfvhj}V-dT>dK76h<Hn^sLmSf}KJ!_7G_m<&JpTalTZC>i)
zY8yUW_g?MJJN*uH8+&Zt5E~v!G=9iW%AkXIc$l;7#Qe_A8rcz{d(Rn7zjWjOS{whk
z?!DHX{~_B}{TWS@+{R~tZG3RuyTCC%I(9=w8OIsB<@kKjG57YK(excRd2Y1HgKOBM
zt1S&#o~#i~zyGt#T)D|653YM}a>%pH#t*K0mnnW2H?n)CMf#J#h^By>Ov`OJaNWE7
z6v?!AL{o>GOkcFggzMffI%N8ajUQb1ens<xoW*8y?ZV@2y39?URkr@P?p@_BPjdoW
zr%$qcR*{WoT=y0^cwT3tiR<2VnkLo~@a2e`-ljuXn-0eu%`<t*0_2^{SFXjn@+D7G
z=%A<RE#<%3dY6m-gV*}|4=lj`&vJji#No-Xa9j->Ec4c9H1&Q_$a?QyTz^GhXN_#?
zU8S$<ab2XZJ)@d>*Xip3u1hr!6^QRQg?%gKrhi9F>DRt`AFu6gn$f0#dCK0|O<3E7
z+u{1%h5r6SHzFTi=AU=qi8RKuc2DlqrqD8f|KFS?{ahQ?S;VLEjgc}(Z};pS)f7V6
z+iG0fV8@NwvxhVHXf!#M%*($R$t&^xX}HQYyvSiQ=nL@-Q}#nH!aZ&B-~|sdm$Av}
zhaIqw$!YC<8nk>m|7m1i!~A5+naWo~e;vK0$`+^(%s(sshJZKX9`)ow<c_w+F<0*!
zNI8KwJ1}kDSmx}+iJUPDIAou_XIg!(Kp)sm0c>O*^LttEIoqng)a*r2XSUpwdXsJI
z!)<q9elmx&@YH8ocrMU*Ld*Tg`F`h`zlqcQ)4$S|pCd2FesYI=MoZbQR5^Ah<jUi7
z3Y9N6&OrGz=z03yaK3y1xqA<CW<G~Ed9%sEJ&23FHv6h`;#2u|d#wE1<lX~#-Xig6
zzNl~Oez-0FNw@hDT=%9se8~u#FTr&$o-v!}1)yO)yEe})EE>qM{ID_Zm1=w1mwn~%
z{>SxP;vP8nJ(-Jnj4kZ-SmPb~Ph|_URBk5MQEbn>f9ts!*ZH{TUV;~Edz07kp6jmv
z<Q}_i4Z&;E&Z3!{X3?yNAEW(Ao5vWWwM=XB0(x>Yo4EJ*jnR>7BjV^mc`@fvOBl~{
zns+l6$(SX_FNE<3VLa@5X1N#VjggyeLfs})r`z|VtlyN8u6h3L8K?am^kQ^^<%Zm2
zhm7N-ZlKQ$_#QqB)X!fZ640yL8jHAhqPM{>&rAUKWcY$f_@!RBMg{Ii@%I$;^QGu@
z&xw1s%XNq3AHKThChTcW6&(ke8^dQap3pBdmdHHmV48|yo^zWPVyy~2w8=dyy^o@0
zD)?K-6hhf0rp;vFnXGKYw83-gam>FNTm77O$nAOEtbL<*_PI^HGnBn?jJ*MM-!sFE
z`MH+u+==xmZO7oK0}j&Tev`CUTzl(buee8^-p@FT{1eZQ1><gkd{(XLv#*TBb95XV
zhPaGt<nR61Q<2Y{4=<xF<2m$&xaTv2y#nhWC0{4@sAO5L$11~jeOA=_>h|Hg$4&nX
z`;;_47MmJ;p#7g>Q!mP8Oa(4amWuxq&wzflenQj_>9k0k9j#*PRZ=IO^O}0Ew&^HW
z-LoymrvKp8$Qu^I-%a*+u)U~1Pw9*?&gjg>KXVPnXyzFq^t&GRL%ni8-SFbWygPtC
z7S0}x6Lve!;FSB;-~sx@ICOZ2t8)TaPf9<*F+O}P>v^AXH0u*QUpRREJkFgH_x$FR
z#+UkAqvuIF#vI?yu;$6<@XRg#JkigsFvoaagZo0pADa2>hh8v8!ubZ~pmR-}3%Msy
zmz<mQpV%MeS%Ewqvu41CWW36qYwhnG#s2APl=ndA^n;99cwTAk5w+0Pfg>XqHVB!J
zpCCqupA*&RQ+|Ek1mhu}!)o78Tj#S@+B@@_5XR#T?4ikd4LL)g`EO<pgIDh5($DKT
zyiY!Nll!~FWGs+&Jy~q>QpU;tO&oVG-iyHe+9YLe(J=#c*1j40PY{sTzp0h9v4@ob
zA8Veujl`ZPec3kfNE`ONHLmG9f08`PeTE*+4J{9C)94oXI{sG4G97#CZ&Oa0yHWSE
zCB2Ss>iP`S%lXB#Op_ru`~`E}H?8NX?&m7RkbmkPF?(P0mf^YGOJ}}y;vS*)en6LF
zlgIc%eQB9ESEx(*j1B(L_)nPixCnbgd*-&r20T9an<qR?--oW`xD;VrGU0F50XNDy
zH!+9%LobP@{a9;wa@l@()3;UoeKNKeDY|?%u>|^0!`Ya3i$v1{z<m&HdtfgD<)0g?
zb6~~|?Xzy;SZKbX-*0nV<e3_6uM@`%`>+Vt=wI*|$Rc@s9=x&7KLJ7>>37kOw7tmT
zr7e9Ma^yme$Iu2mFh=xDhR-bWG~qiyj~be=J^4(<%H<vU@qzA%d;B{w238(5l;I5A
z#(DL_@bf^7A7W?!LG2q%J`^#(pzn?Fsb+rB=IrwcfBtb?58@{0-QSsZF7po0nyqKx
zb$SkSZpt}~`1l*->yie>nC~TXUVj5;K4ckunDJR=9#17c>92G==D9H5W1e_1k7Qit
z{x!?sXE?Y1Nzs@t=MM1G*G1)ndOoV>Lu&j<lk<5bX>u;o4<e7`*+Gf_R@{R}o(ZFE
zow(=crz9RsyNTl!K9>u7lQ!N1d*)i;t})t%v95saNty9zUFK+M;FUa|a5=O4)>6#l
z^o;O4#(2rObP)OZANAauqhtNmuvwHd|L(zfg+LpQ=Fx*MiKYX%#@WbylzB-aUSJ>6
zcGEKkZM&Pmr}g|AzP$&wN;~88YH1hX3G@r73;g*@Wh)pLHE+d-ozR6Gulle}82kC6
z8B5gBHgfE?0esRnV2e`c(2vZ?==aTe4BA0J_06*PMH~8zpN#-*TyKGH<XT?a8)=<u
zZ*OSPm(sUkE*05gMS$n|NUKTFI>W6m{0V8%=SW(ZPvjr8HVL$s`9J+L@oZ3dK2iIR
zYAzTam}@Hk*JklO%fi+1zFVI;7?U|F_Uy6jfAG)H;`y%$OTzZwbH9*#7w=^{Y#z_I
zCS%TeksoFl`O#M8F@D&B&WZ62WnRac6Xatjk{Yu<`H7OXjq{pw-0t(vg6(ACnH_VR
z+g<F=*qF8MRCWUUk6zE%<==86>D$g5!RBR*xlnXSh<PsI`J$tXdpq;g9s>6OkY_ZC
zy<?h2nzL9opDv&u)_Xi-rQevL+q?=K+4F|?+i`WGZ64Py8UB9O&j1bNca0JI5z9qW
z&qDYh%ztY?LfXB0_C{YM^B0uK{6)u%PR>W<N{ESLWj)GueFvW9zHQF|?Rv3a+x=lS
z^Ny)vQ#O16)*|y5e<90Ngx>zIKSG}+^@Te6h~;LiT;kJp^atSAJ0?x~gG;roW4**@
zI5L;PIbitMj8c4mVg+K}rk-@qbgU~n2&rGO_Z(||_oI)IpTizyoFd+=w5G%8gB-DK
zB-b+PyfWu##~4Ek<4XN7b{QK&K*96(@V;CYXiGkC^+-O`(DyK&HL89Yr3bW*WsHN&
zIJ@-_&pHps?*ZV(K2krPx%Ph(x^RmPc3sE2wvPk#ZRQDLuhiAfB@f}uP)2DT`Ncf(
zpqzTLbQKtD>1u=4m6R22y&o!nEpss7w#Vs=wuS-~-!n@6#0{SY+*~U*imb5yZ`U~E
z#X-tv$pM?dI*Iz1ex31u8shpi@Xfq_8uCHO2j>;rnEW4mkkY@x4yCQZ&w4p#@S}(o
z;k5+iXi;(0<a^p4uqMbT9jTtRTY3J&>e+)l-$}bO<J(G^i7QL_@%zxuj6ZVeQOM7v
zjjo0r(B`=&;8}l_mn43d#_~Uqvj;lCx{)>`_a0v~zQq<}BkUCIq}@?J%&p+RWXypc
zY3E<0OqlcJ7y5i#wn2=QZDy-BpJyAyO4A1R`&uHu;JMy5j^LYe|3JmbHk04k{CB~*
z93RF)y*JT-y$R_<Agg{}a7xZX=gRy|=i74af}9_+W$5Sg(znR*5*v`}(C?0uc3gjc
z(^kVj^MZxwhuq-L>e<6|XFs{7McyFi;0!>F+hNQj+9`7pKlgWV%`(g#S=P+FLf^~1
zRbIoUSTDy7I;75;=}&N-fjW+z-JjQ?4z}6PdRZ>Vo%ce`5gR_qk7?(I8}ua(KuHU@
zc+YuAK6#xeuYODB3+jC{x!(Z4e*nJoKziDA?lTfHU&Z`v6uGmS{zLEm#EQ#H{Q8_~
zI>ulG<^pm7AMltnrDG&L9j}?6a=yTab3JuA{PH2lc@RGLz!Qj<FNvn_xQyRJ(4m{{
z!G=2$**)AB{8!{YiS$7e!+8Sdk~c$+tMtn}>m|#S|LA}DBlr)tfn3n>CgWR_orn*G
z-m9?VV0@Ck7xJN<ijBCQ20F%H(x<`vSG>=;#&$MakoKhgs_|>Tya0BFvm3}^3$Sj!
zkUZJ(O~cxlI3JvVcFZ9l$261g!3OC|yq?Z^X3xPtK7Ko|Idd`sxdYZZR*XI2*)W<u
zR>xdfM|#{3#Mu5L<uUPic>0E2oFBIO@7U|_P2Yg;d0O>cSKIZ2Z@gJ_ykn3P1us|*
zd+&g(V;FDDJ2sqSe4lF?<eLV*Wjs0;?L8UOkxMPNc+5~dV!a;b@yF>K$~f1_BkG+z
zJjivkmdAT0aNaU*NIXmf&*Ve$4g5**eWv0Y>2H|tz3CfDy<y%azLmb=1GT2=0H0BE
zj5KvFcF_wTYRQ-Z8LvERIc>+%FMO-guYaD=?KJ3ta<Sb~wne^n*sYzGpY865(~h{X
z@6++>FfqPY?l)zWrqj-N-LY`PHrf%cz4Z%kjTqB0N;hWCVqSDm$K*-nkZKRDcaDFP
zoWH1-whABcS?*8p9_^Q)z1fcf4*Jtg=H07_*e@6Rv8u8CMC1YRd(y8g*E!A?F<;=5
zWt;$HoG64Xb3ODu<Xydd#)2H-@WA)6U!md+_szQGJ;s8umv#$$IIki7hm|V<cMtp}
zWB9As>m+YO@`LolYTaId{lX5(_hjUC^bt-!$TIB*@B0vbkoU$9(kE)4Mfs#3WSI?z
z<p)`A{2;FFe#`j50ot|=Cv8$c=TYND9`W1(;}rIP+D8({9T&qs95Q6UCvtpc{Y9wf
za|=DzavuQp3cG_}R5~WVz6%qyo2<v!tU2+VUg{8Mj3oSuhO4mNQhNo{C&FhwOj~Bo
zi+3kE7e<=7fVCp$7VK?aHe_S&@-TH_^_{q37kp%%t~2G{d(Surxa2bf@9+yQcf(0q
z#H;D5w$d+7knN{CcrfkDZ1gk4-^+E%5&B5O(>(u%Qrs6u@iaQjQ^th}d15SzkYf<M
z#gc{dUHTxcPb14bn=J4hW9VZV4Bzx8_l{j|>G8~q;`1!qj}EsV48O9^8LoX|@httE
z8Cx5TJ7UP#3mfMe2(~;*#zI@3Ve*2d>Ku9j_5(WPyu!0l=?8JozP<8UDe?!#T-Mp+
z1a!)IB5`BR9|66iXtUHaYSdD+n*qL--aG2=5xZraV4gv{dtduk!yEn0XybF?--yrd
zXKn6Py|<5?vUh~?pJp9(9>)`9n6n-5qxdDS7c8H6F3wwXj`2Q-7#0-gY{57)S2FJ-
zWq?=J7i%y0Z2Duaf4TNEIjekb4!W3&;r%j6Px=X!KkZJJ?@6!?=biK=jyB9CXoKJp
zeLCkE+T3s8UO(+JE{z@O8+ss53>qEYa}oFS`4KzrOMrJ$BHSmyKYU6I+)75gZ^V5w
zwpkJ_BYZ0AHGi)<>ams$>vf@dKVE<50(xg`WXve!c;VXHqt;a{>tvi~+1_wjF3Lth
zCYEQQEuqJQ=UuwpB+w(x;2%spjNV7I_Ax-8&*bDeBN=;fj$iW;K_7Mw8<TvJKF`fa
zdNy9Myjg+0Ke<+(m@7V90z7GWZ-no3Vy)UI_MUI;;Rx_1-$&uzfRO|3VE=M`NZNIj
z9dVuOQ|?DedYTWG$$onwzh3)Uc(fjl0Q#X9>H~W|{aKbi2D7gb9v{BvO5E}EagN~+
z^APRiI~0_ga|-(h@{GYqv`NEW9@msC|33Fe0KJeY1N<@1q5QGdmv(<(_MOeS82fn`
zl><eOIs04BM<!$3@q7gF!^&Ie12A6uBrcTSMgDB{8REWu@_Pnz&~GYi&)m;a_akv{
z|F#0pZSXA0;W?nevn13bWSr<(^xRR#Pj&s_gZkQwcY(ZHirzjvN~}ctHl7=pcH;VP
zPg~-DWZL0-xc`H{yNh>GnEPA}oR^{fukL(%=SbCF*1>-lk7Uj)<678fLC^ACf8;#S
zF=JlXSD8Baa8qZ^aZ`u5#k#9F&X67W@e3ZV^FJcvcFBdyUp+&N2anTn2B$;T-JAcm
zsmm~Rb9CL03$3~(!*#!_!58!WYh&<^^Y?~7%g-AA=7j5_c)vPaS7LmV>36NFGw(5F
zaIXVD(>&N;!;cT&zRX}B(fm<{==_Lf_McdGh&^QN7f0KmwN9Yl(Q}yd%EYtF^gN=i
zcr%dyy@WHxV*r04<~585d=2>|%ilzP$nv*wKML?)0r~#s|0m|Pjs*N2Aj=Qx{PTS=
zZxZI7v~BFIeD3#h-679c?4_T9KExE!v`C$okn0gX`<Z0!xkm+GL|zMxUjmQn`B3;Q
zid{Eu*OuRf?8fgNgf4JiXP^E1Nt2EZJm$9FZu)!CUO%r0KjXb$G;Qu5cr4>54_fP}
z`@t(>mfW8_m3x)uTmbTfw?gzKm=6c8#aU~f+u@jyKlq8B`>_{^c`_bn!Vvr0dKW;C
z@CUf=Ke)i(e*kqo@G&YrTx^})`eC1nT@nxcl+Mxmy?mZZzeWEuOXnKbO8>%jiyWWO
z`4~@^dY%UXKJMShcU2~i5gSG_zvDWq2j9BE9O7De<VdqtMvepDZ16U7+|dR+j3JIc
zFn7Z}@k}45@w9~72QpChwqNBBhzUL1p8%~i@Yw^oxkuY-&a2W_!l%)`>bN%%gD2bh
zmyTF%;Da8@0N=z1e<9DH#gZ>0fOZ&%gzf6l4&%ml4Se3mchQk!&d~akc);@!=;O#J
z(ZSsJFvl1?9DtmRzZheD59>2(j1gyY^%xg$&Qo5S?wX;yF4E}<zi-$={oC|e2YqsH
z!t|XC8g|`IG0z_upJr*>;NCWA?G2Aph<J6GjKgTlF^{Jcjsxcv+9Vza;B)HjX|1=B
z(7#=VqtM?`JXcr>`bUs=A3@(E>Chu|X!01T$NGs%kN7t7A9P+b7xu`!J<-0mn_ptt
z79?+GUSkenUSdw`xyE=`4}Z#Mf&Tz{y`0N@UV}9YZML2|L>=dtoU7b>;9SK$bxU7G
zzCF2Fa<ArV@V{oyU6$9Y@?AE+Oq|p)_fak1g=^610L}0>XRt@Wdf67&;3@nbn%=8q
z`&{O=ws-0ZVGFz9-z6XVoxV=wA`LeC9)&)91}b&FH_OUjAJIBD`-Fxc$phAP7QeWL
z{2l37zaC6apKkme_p6=-ZTf((!e`rgXtvYzOtNUs`C#BNK2LZX?XgBHcuPaB*;t<J
zxW}@G!IYbL6vFr-o_8=t(${3bhmJ%HFwd>+el&n_CBJ^odyXaE{ovY3_N@=kOSUuP
zZ^pb6^Tvz5+!xYzru?xUclzQ7flEGT2X5+l267R*eu<a*^MQUJ=FG*$cJTbCn7A=!
z5;w*THjF(pHHIAHhlm^HINKy~W3e2CTk;27#BH|^LpMBL(d!WF`HadBIu0<`Mb0W|
zgKv2a8B4VcB}#`XexaQ+ewm!xP5)nJ-?K4Zx$r^fKvubS$tX4BBmFYUrEPP3*cM|;
z--xmgd&m#UGSDAm*Fj&%aa{zw4b&rYaoHzJ^#Pr?7`weZZw}vb@Y|v(&5QLR<^azz
z&4WF|ugILNMbpbbU;32@-`6tUniJ(m)m)J0CN!@t;EQ?LR6JATT1f7Zuui|*PJBFz
zMLFoh<l2&D_2Dx5HRHP|Ycp{2EGY4A(s-S+Q=S7@Ll}96Lmo9RlRI0BmmT1b_47jH
zn&w=#)GcC!7x^sL!3VLYa3Az7&)b2&_mMjqJsO)E!?DI(FtT90)xJ7(z}UpK7G>r&
z@!>mQv~el#+rX#faL;o+l23i^5I%r;tv)x>G2P4$%m*`vx%Y3M7d;qjw&$G0IoXK$
zM86<?Z~X*o%s)JWZy=zp+yk-s_d1M`oO_OVfHQy{Zn?Cu{n+MR2cHM<`BWF<z`gwD
zPIyk-4?Vt$a>|l@??@{a)ghLEwj2-XJ7`bl>>sW(Fjn?+eP#|d^Lbi~dd?Av6E>=S
zox-W(u9g2{{xIh=I76H}7)yIS_u1&P9(BY!V;{HBKH#tR;dcqHvpIh;W|BT^Ptu2t
zNSSaiZ9j%gevHE(>HE;0_IB7>-|KIDqTEd%(l_XJjid*gkn~_rv|URc_zJtc7Cp2f
zy(P3S)%PuVw!qQX=;BrvT|izb_kV!@ZpvV@FQcol|8}3(EtlH%S>|9az~{k_tF_UM
z`1U32>s{niQn!#zLd@eRyV3IORnLUOI&+LSV`792>3S>Y&bq{!J8S*}zQJy9x-It$
zN8l_k{D%Avp!|NErXQYzVLX|bgP5=Tz6x8B=eg1LFy=0EJ>z4fzeM>#l+zEhomZZv
z7}@k7&JmdW&#vRWv|U?{Cd~ZzOtEBm7C9pErGqwkm`~f)bOqN=SX)URnCs)(#6Xq_
zlx3rj+|%GYv$SbBcRH<gS_pG8fam=5^}j)Ukvg&Ex*^y%_v&dY@R##A*QA}I4g0+K
ziSA=tcVs~hy${+g>OX7A@{_|#mJyIao;iUWJ+qYGHStTvBFs6ytHFH6?A6%Z*J-=7
z;tymq`xSCu6MXD2a$^6&?2p!IIk~^NNu5bk-vxxtQU8U|9qq3deQtux^zEM93!136
z*-F<k{s;89d-kFZv>pU4*|z?IrXqtEIHnjJo(m-opBs)_Q3o8G4360sHWk=#z=#wd
z^$N$?Za8`rj$(sj?}bgdHXOzlad1xVQ&ZLe=B4D>b5Rq|p=SYaL>>wm<-5A5Lp!`H
zeUW7sf5JRPoN0uu7Vz5!)aPKHYbP=UD_>XnrSd(o{JYs-f$r@7wvclS<7N3{UC%L<
z``J3Tq7HiK`@uW&Pq{Y7*eh9mO(lALei-%B(1*E)vwtphWcq7=hIjmYmY#M&PxJ+{
zO|Ht{NY_W7NV@gmvU-CH?IL*bWHsGj=LLPp%a1VM66Fol_pKMu--o|j&UFyaLDHs=
z;C&tYn0Jx~#Nl2sp68C`Ip!?*qnX$T0vdVl)|5YnGCVsNNBiu8EqHHH=eHT(v-SIQ
zw2>Jo&w%|*x4l!R^Eb%@&s@_!8Mo*!-S%bU+0BLtlrQ{V3H*S1FCFqx*Y%jwKG^9b
z;LpM@=h`l(+-O66WI`sk<vd|tF6Fvae?JOi79khPqvQe(bH0>vnRgm(@?jkuy{@v$
zw*^dEevR{h<AphZb9i#SBJCFZS~`TyHo!i<0Df0cKHTH)f=7(2A9I58{l)QpE9Qk9
z@8V%TIo>!=_cq%hW~=v4bZ$eMAr;3vTGPf~#WqX$u9w+ofvw=VrhJDF`RLL6Xh$f+
zbLqDki_-Xf#k7I`nd9(Xm!I^i`N1)vuf(?@$B`eeN7*0w!TZ$vNbeSm%|)n}-?|1a
z!|QC6bF65Ka=gBz#!EQI3*{KE?&)|3mt(_kcO3*C>El3?dW*J2_ceumyiV2iP6**<
z$JC8*j3?(Qb%N*r5#ua$`2pyJV-v!@Q3z|+2z&lQ40}d-B6}t-{tm^So%-2{MO1{G
zux)<FllE<5cNOG{HBag>&{lu=bUy!tKa<Zgw?pn&{g%Y(_cgqm7pvcw;5Z`YBWTI_
zh@9h)^fhwM%l8njkbJw_%ryJFX1)TM$@f9<FLQ3-I*2jFyha^zEX<oP$H6xNd<~>~
z<ahezxBZom=syI!?*jjO>7s-F6m8@?YO}GCB%g<*gEsbVdH$EQWgG0vn)hP&N<MAp
zaDhvYPyZpbe-~?o_rU8R@QV3^I`9i#c@`Y=9(r_Nca#9{Q26cfq5VtpI}j24Lg$L-
zmlV&~)EV^noEJx*8w@?@CPJS^kD8tb57V7`wCgZ;qK%(Hj`IytZ|-*UA?AzJgOe|g
zvx7H*pCuPY^XE3s^^#9p+{D<z9y|EAPGCdUT$~kSZtTRSO+;S7xrm&GehGhv6?PE)
ze3krdh|>@8HD<rJ-28?Mzhh$X+ce1jSnIg@0{lTn`5k}wKWUG0%&`|`=FJwTT;Pqm
z__JPL#?r@k?fDDFK;|#>3m60Tzb=M6|At^`=^wgh4vxR)9aDchUE2HN==)WBd(9X5
zxhV#X@5X4a^cign6YTB5Kl5Sc8HJ2txPBYF*>lro=4dF#GrdP`@h4%v_+2CoR=j{-
zb-akObI^7j_c4-B$2<YQ_UGZBjnS9({uYiRN6~lm$CivMZTA0A=I^%mC?SK%2M@u&
zyesoVzuD95$2n}^iuNTthlodwTQnXI<ca71rosPM@e*>H_$>Vj`1K(s{Tw{Lf?v)d
zH(n`sy*(dt;319|(f<VtM|4h|fe*af=Lh*<zo*dWNvmJ9UA{Hiz2A4yXKS2(S(4xI
zxh&GcIpRl==*s=2So8m|%uB-k%slYxc>uQ(F%RnWJa`v5Ki8JA@KT5Tc@7)Vc0G`<
zwcshJWWjnQS_kYmLFz%<y-ok@e;fLKLG{P@MeCmZw>an;{ojawH&}h6X?q;~Nbef7
zpBJYO>Ai{rY)&~ZMV}c7`c1&9)0&?)Iccw?eIfc^VBv_C^+QS5T~DLYZ&aMV<U8Qt
z+vw>8#{D>c1$b~9qiN_T&%efqM_-D=*L%SGu7x{VCh|4G-k*LG@yvb>vmSN`{e;)m
zhz)CDlXjooNn1tvH7I9WvkqzH``(Kq)*<p8?VWr_8|7GsG)C+f0LRI$t7nhpI7htS
zCgriOtIaz33WprA*2#au9=+L<#`;#qFXuY>>(H}o1ADU8z{r`S*2yS~wNC!z(BRj}
z_k(x0b@Dot!$rw;vef^Qh;?#U|0tL1z*y^K<obV&b@F!+fUJ3Gvp?F?>yBq5X5D*<
z*0popE9K3NVQ(l;WN*o=d*@-J!s(B^;E!=N)|@u;Ih5}H9Xp<<&EsBM&!T=jFMh5C
z^Q%;!cUgk+?4DufdseCq_F_0sxlfB{P2qDNxTY;4=h?t|J}WTiSY%t|6x@dqI2S_M
z-TY4u=4$2{u!XdVzn%fwrNiYnW!jg*ZtmO1ceKMlvTd5Jtw*+PTv~s1(_L<DN7~wE
zXuP@SH<h`yJ<rzmT;0}#@9Vm?J<HbiOx?C;MAL0<ZO7W$jtTR7lcVht_(`q-upfpW
z?49A7SMwbA%$u^Y51QdQtBG)=XLM7ZCk^itd0!*+3h!(52^ilM0)Ge2;CU5!%wYNz
zqn{7w6$*9VCiEkYEr4I2%sfGT6Mitb@{oJ5-Kbmq{YUY)<7FR=gBRmG65qb}VgIZU
zzx<Z`0B{>#opgrMzX$n-vwtF86@$-K#*(it#xnr%!qIeZ+cfY!&5TzJUhQ;}=`Zz>
zU>rl=`u+vf%WQ0H+v)XSUyd|I&-A9|{X9n-sYBWhf3{$eLpq~iCmF)?TDE7@YhF*<
zTN6ELN0&hEV%W?`*o@(Y_t~(eRUU7I4duqcQ<4BrvBRdw*N2dYavgTa6_Z!&!^Y(`
zNn0x!Bz?4tOFvl~qAn=2*BT$MH9n!o)Y!94hV~B=JbE6_Q}f81by?E_j8$laYKu)R
z{L~dtx3rh{CjRs8-l?A5M`oq%{^08L-M?QjY`2-ioPW$IXgj}Oun6@F(e8S*&)xmr
z#8-9=pg(+WyYbH{e9`(FtnN4}gVEoq#P>j*`aU_wd8l}ejc|=l`^-eF6=@58jhv_r
zWjKEu_BWL4zpA~H7o+D`{3L9Ty<#J;+#`m}*f))km$+qoP&q~8QaqD<ZD63iv}df0
zX=**ax3$nSQO58X?fXjW=M1hr@*Dh3z{b+t;e%=4z7)BLY>#h<bL<oHWAJ;%46Z%m
zq2ecdFzwry1~RCh#?qd1;<ay_X7maERr_-jwm&j3(8v5ww%>bA!uD{ZjhdhKQvAJv
zIQj|mqxf$x-8(U1d&v*%0s3h##WVaw_znNEeb(fJ?Ir)nOJ)1OEZ6p@z|S-qpC2`!
z)ck0qKR9%L+D^+SIOa%HKjlYcKdVn-KVr3yHE%y&{^Om0{EBC1Kh}2kIo~>8G)?pj
zKiZFPi~R{P?vLr7wolU2+CENCZ@U@!Nbm19|KRKsi{Ad~n*)yxRL^>?1<$t*qz`Wk
zfv5XI1CJd{Kd0?L`na|tvF;yx($8(X9x#-CURxHR!0+Mo32pEb7JolYS3aU2>-Rr?
zC3ok?%U_DfX{nD`KiWS?do%Wc?W^|EEa5u7_V&^quvU`oJ%enIHIQtdJIMB!kFtGz
z;`R~zw<K<F>{;RuByMl!mzwVr2B)8_@yb7V204F?Kf(8q1~q^8UZwE2T<6+;F!ON`
zd6+dP2ZJv`yti=CCSBsUW!DMgz1<&R4q9`2i2lHBe%tNb*cHaTyR`lyS3SpUj~qGC
zIGTB+@F$KVk{>nheWfjF3Gqj?@0l{V_K36Kr?1pAGhurh|9z!<2Wht|Z)q&WJL`$`
zW79v{&mLO)+$)CG-gEU(+P9as40COtXr4SU?)sgSdnj`+(R@i{$8wxhe$!W)d!{Sj
zQFgpn+CgJ!;9}SI3FXZ6_a`f7y!GQZ$K!8eCZWS9`QUG#midyq-NuTWsq&NtQW{8U
zAf<u--WnK~lIA0a15-Z2X)(f2H5}<v_oiII*X7UJwP#O!fYo9kB!Tr`RQ;3-uuYlz
z`R}TMyoX-S+p^O4g|8m|@}_}-*Iy6c7dY-8blm^IaX;zq$o^w%dH>&4?i6220|$I~
zXn~(@4UcPh1zs5APo9S7X($U*|D`mL(m+ZBDGj7FkkUX(11SxpG?3CjN&_hkq%@Gy
z!2f6sWdB0csg=JLBhztzlG5e9rtlf)52^b?2Q*}G1Qc&Hc<`#f5Szz>vwU1-dW09h
z<MEq`Umt$uPmV|6NWT2dMp+Ka{b`~V2N>q!y4bOY;YV2>e)I9W62FD`Eyl0?#~*oX
zuR5vg&JItco;9}0OjTZ|VHA-h`Du=YFN(n63TidJ1`QiE-0DJS!@KXTBUT(!7q@fx
zFrJwo;HD4P_%+a{?+J78YoK4>6XxUBz(Rcw45^<aHQ>n<V*W3MNDB$rzeWPszDS6f
zHNo1NONz_NQQVF<7P{^<Wq0eJ_2s%+)V?M}!#LF6RdH8Map@(dMIfMC0DlhfD4eF2
z{cEqf0_8cVzsjvXC&x6Ac2dYT#lhN2648Byz@z}rGfUP4Y66#Bi6+uVGy}}c$thY3
z>x2D^LfGESDz-tzIrusW>*f6=3j@_PH*O46t+{P&O<;9dusRoYbqU%mL>u}hs!ij$
z`|jfP(!RsAsEReKIRPrq^N3C_+SV!_a`1A_e6T(<sP4;r9)2Ll$Z<I?MIFk<hs)-$
zY%9v<hRdivxqrJgTt-z&f43Fyq-ecRYA8CQ?>t%NhY!6Q?X+rqKlF&^I^3_Wu2%JF
zq7y!JW~FWbA1vtyuDYVOYCQ}mO%$Tx%&O|DqDyjSvri$)>L{Bkld`aUobdZciq5p2
z`uFhj{@N|a57oc_`G)sz{^t8jA9z3SK9(Fjc<A7NRl9S*AHFl6kiWsUI~Vvy4FccA
zqIpu!{Ri>$#w!O8-T%fbhYlVbKghCC!so3=`@a?(tnAZ;Z+uVvTMu;I_u1oM@09a5
zSQ{BEzdm@t9)IU0<h4j$Uwu0Gc8=3vZ6w)#=fMU?55flVdY1PP=I99F&m1l~MNj>q
zdfpqloWGdT0x$l_cCp}jx;|M5e=70Eg300?Y(Kn@FX_jEvE)8g<@k()q#p|+jLG`b
z1rahN{#Xz(O4gq)h|h6I{IMWDry%Q37d%~hHF#smWy(*NTn4Y96APMlrwb;Uhl%K(
zY=3+vK-$k3ktv}MFIMyCTe|#X4X?y9lm3rC^n2!K06)Bb5cwO+hwI;!xG%$R9ezch
zTHE*lxt8IYr4{8r#P93)4dM4={1S7TNEgGz`jYj5va*Vz%c_EFN~(fIHJ1gd)?al+
zuxRF*vNF`JlC^=FimFv>D$0YAB_-u0H7qfGSFI_jW*!?+7A%iZw5le^G|v1O`EK?p
z`Aqp-+{gQgFM-NiP5-aSwRmiN$(~E76*sS`x-nR@sH`k6P`(Bl*uat-O3K$PF0ZND
zbVEf|?wU1KL1wnEdOly1UsX{9UEfwxRkJZrc1v)5Mb##Z*6@OwvRgL>t2Qkzzq6#O
zqI`X@yymt*Rf$yKMZ-`F8Vfg8RiQjTxLSy%x(xV=fIKf4s04-b8jPJBzZE}M`yAOC
z)@it3!(n>gWtYA;dP>2R22vVGX&|M6lm=27NNFIYfs_VP8c1m%rGb<NPK5?i>(W!9
z#s9fDa%vUtQF}Mn_-d*GMZs%)G3$d>RTWin>hB6vm6w#SGc6RJjdBmlS5x6zi!B*n
zO<A=MTPRf}LG`3j*b01ss-Q2pzOn`zG9uisGEh@gY<1k^%brp>?OI>BeqFG}cUM(O
zP0&|~U9FPp>XHgPz`kY4Ex9+}ylmmBMN5|FUVroARRxO|Eh$*MaD`$kx_;Shiwg>t
zELyDVXJ5Ob;0ued{nFy)*Dm`!$}D_~KktT4<Xn40?#;^=U;FuG*Dkx^23vcey?)tp
zgEovOzhKF-f+Z`Ke0lMzo0sJ-TD7cT(c%IjV$#jeU9m84)skECmldp79;e+6%L*3S
zq)mYD^DFWe=jKDc)f-F7)?DMebN0+RGv{3DyCqQNyL_(i@|?@BycFXi_a&uf?!qWm
z+*R$nGgw7MU*nr{_r{s}mko?v$xSfZ{bd#CQB|@gs4Gmn%c_G#8>>udxW6vHY)x?W
z#&rgn9iOAZ!dDe63kIq!gsbeEq_jL5m+hyfI0&n|i~mXcuJ*0jSOqKgNwed{>Wwu%
zw5kqD`z%>kUV%+lU-p`fL0YwC7m<3uZuYd9l8V`&g|2*S10`kXdRIwJG0<1llwgN<
zlP^$NSyqB#NibOLyX-PwV08s*K^wb?zOstI8eA)M!j8{kQ6ZM}s%x+digOJ<wYlso
zsrH#J!NH8LOaE2n6*a4DShC3C#%l6c6<oKm45p%p&01R(49@grD<i^Jx$qO-5tX+>
z?WBIb<~C(NpWnECHLiqMv~0PrI2c$HB(ilSMZR)bL;g$3?+lccK;=2LQ)(4fAwIvt
zG_S^x1ZrSI&bDQ2thUy%$;;Xb3}wYyUsa%d9a<Z-Q_42VL9QsrXz<4Lfs>Nt<QW#l
zeuO+68C@*6A&>DaxjRrJ{m=S}H5<!<z9}GD1);8qY8O;pH^OD=p0Z>LXW^9UOXcrs
z7&7iE(OH&PmzGpkQt#4B`V@^zeYR#1{E;RMo*iJR)qy*MzSY4^6?DVJL8!U5Wc|kV
zzB@Lquk=-y+)YY%Z}feR|3~{@2r?+g8}`dp6)@h_fuhpbww@&fo?sNo2OX;@h3#G|
z%&Ir{>&dEWyh>i9kA`fr3P*)712i`4-js`tMO8JVWCqU0Z?L+e3@Vy5r8;X$^&}d(
ze1JmrS+hLC3sb9=Rlz&qR($$l4X3&CBi4K+R^m{j#liK#kngU&##dCaCg{V2tEy2Y
zm+E1V)mmOWxiDN!@&#(pJ8McM2^)vU+w3VNW?q=~CF?8ULo8uR%1M{~W#@1ogGQ4R
zMS*fmcT8+W7R)iePN~-7SpMC#H~KX9)y2WGvN@Mq9$O)z{Lt$pn}0W6i7kEA!QlF8
zO0}Bv(wYyxz*;=10`-wTUv_axc@2}4O>9?IQeLVYsWfH%C=JD{s{&{d3{=6VR{1a*
ztS_oqzaB=xUcm)QQ$@wWqEfQ8wxY^sNoluxm9HrI)!0!7K<6GW!h)VuzzEx;q_5q`
z)G5_dm4^AOjz31<;`{3S=y(mS@<Cp7?p4pJ2H8B-Olu%p>w9jJdavzF={*@^%G3H@
znWWx3f0ELBGI}r8`mRk<@5L!UlZ@I$gVy)fB=w&2)0Dj@qxfd6@Af41ek|o@l2N<p
z)cW3^q~86nr0hKz#rGP0H@m;5ln7^gDxXQDBG>v%t?!&9_1=~8@2+}HRG6prU6`ca
z{V97-q+-|lTCMNKB=w%1$|GI%ny9c<>$@vSz1OAknM5jftq&P}w<H%=@mfw@>{HXO
zBvXaZz<90ixk>81H>LNa>?mLByD~|=&rSK6r1bu<*7w#V^_~>bR41`r>$^Rr_rIz&
zbZUKfX}I5^|K?Plcv{Be1Fh#{M&H{a^P1w+di1pDJyYv>yoT8hy=VS&Do;EeiuY?h
z=WAH#(EIpQzH&O$E^4%%>ojb1=)LeqDSJO1if`6>Zg=SWbkIuS3~QiE>wAAn?_s6<
z6|VY>zMqK9WBv-H|5ua9)cW?N^!``1gB-1IzlQk^{ioJVr)M~dwVrD=taIo+wQf2+
zdT-QvZq{&*hQ1%F{Bfm*r-%CgUaZ|(&mj$uY3Tj2(tDnU|9drbdL+->uJRb4hB+EG
z>-~Z5)IPy!QGA}(^GXd3k-C>7*Qu4dzV4c|)N?(fq?3SkTAz&$y^Ehk>b+IhH>C7_
z650-T-J|u{?a+I-L+^dMzA>fuu<}mkYKQXgnHru9s#M>>Yam<e+ppnDhyKTRMEaY-
zV@|b<r-53n=LQWM9ePi#o8oCN`MPGU=RF#BJM_LMW$(!=H%`w!qvt1;pC7N`*8fNO
zmu?N?ph#6Ep@AH&=R6IQK#}T_ga!(=zH2pXbm+hPpHgu(3AHBdvPbKAzlO&gdav7)
z(tAQBCegt6l=AC28X6SEseKuviqiu9THpB&y?3R~5u6r%8>Gcr-?a|Chf?{YQPF9E
z4O-t@9eU46`I*zAZ-cZ|>wAxeT^cs(=S<zH=S@acrxb>?p8GWPwyHSWpr12!r=B;R
zQhgg_KCR~*4gDGl9anQw@ztp6l){x-&y_~s8vDxB{=g~KvlCf^)_1dpof@|4^-^DI
z-Q-l+DY*}6Js;Ch>{R~UAW!WB8%>;An5p%gt)XAT)PCft)w2`ZO0DNg4I4F_tJh5p
zsr8dnWvAr6UF*49Lxa?t+J`i%I4!VG>pQbe?~iGiul3%X(*J4E`%10nS`C{uJf`)X
zpUP)Wi{4X6|7$d$z6Y*9IgD?a8!qH$!d0;>VmtL!>s7Lqb*nqD-j2n(wbfSz)t8Nl
z0QLG-HDG^!E?Z&ecX8z{zGYluK4EO=sxKPb@NSfU>T#9)5V8>g-E77DCUVKD^59+k
zc6V`A#a)IB>DY=@yOL^Dufo^2E5YMBe8SjjE%}P7CM(3R^@FcouPYC(QJtcSZG0Pj
z*gK%TqgZtye$&qSM6?kWO<byFM;E>VHIec-*bdaNBl|fRS!M6&TCMvTJ}cI)tq#@z
zjm<D@d^)NjgESAxHs!HyZDz=F`>ilW6y`_uxASlQx+m>R)kfNvv^(8M8yo3F*_km!
zgO9i@=`>==hmAw>VYShJXVm_EZd6Cvsj63vjV_I9(B4@jDLYGJw$r1nzAi5HVCh-P
zqsPitZ<9vKt0u8-06Jy}6d&P&h`*|;Cbz+wQ2*iYl>?vAd$_l<PkXr`7S^?D9jX5?
zhUjvILF?XXDBDGRV;%g2?+sag$A39K#LmBaYU!amur|2LQQ`9a{~KVIuKny4F8vCE
zx%_*%ftqk{r58ijt$`DdWjERipl)p;+RUUhz-z27VzlKrI^2ZnAob?xV<`(wEPQ%W
zg08$`KVF!&Ry*TGG(Tt-#%{Av2VHH=;Tdc7(%;CBXs^piBD!4LhoP#ymzg|KdV{x=
zcpUAG`q18?H`O76uH_-slnYB?)1TGGrUVeS>BqH&JDn(XK@W=dn$_zlj?#;*%#uPk
zka&$`rW5;V)TT(bvz4hqH?^9MGz3*<=DKMi`|H1Lz%s|ZF`ux1UZwFsF<~EJuxWb6
z#@JS4&~x2tDCwyAFUunDEwW+zw&}{!pRoyBon@B}-AVkWy`wG)pRL|-V&S#vlKr5D
z`18#sV-%gC%oDp#fyg0`%>qazPQ4iqql<|7rw7;B-=&SE4{KJq*tdg*O|6mqN8>PR
z50AgqCQ{T0J;Z1er4N^Oh9JUBL^L3NXBqK1{l6nTN%`z$F70n{#w)b9%3RvJg&{*H
zs?OP;fl&%Z=J69tuF_ytdC>NUHrS5=S@p8|SuxtJJ%w<zx8!nbubG!!G+$BjIQw<!
z{e=A*8hTyNMV>F~)Ad_Z?}-={og92x?W1LCXpmLD7^!!ku5V50-KglKV2;+O-=X)`
zA4KXsU)MLM^nOzMHk}K#K5HF%uYEpJ?~S^?J*9V}x|4#<MxPG7JN<i?qyD6braFuL
zTA#fRy*mB-F-Lt$btk6*?=BTr$7^V?IsJRKqu#Vj!Q?bBSL-v+p;xDWFLcx=M=jMW
zrGfvR8n}Gh?=Ji9jO2NH<Ey@XYu~Z`{lMf=rF#Ak)IesY5Th^f2tVLBz(T+)07HQD
zc|Qh!i<kF+H}ih15Gw$?0dEKNpM$@t3)l`=2Iw1yzljOh2)G$goGZiwfR%s`1BL(}
z1<W~5h{plz0Jj5n1MUL!oiD@-fQ^7Z0u<wgcp0z~@O8it;5&f%6NLB;U?<=qz?=(&
z_yDjO@Dsqy3xzliSO+-lLXYSJ91U1_5#$7H2fPSSTr9*Tfcb!z0yYC)0qFY-<mWx$
zBHmAg{JaNT!FwO%=RM#W-e*C6-UHU~9)H_(Gw%T(;QeIC&wIc}d4CDy=RM$d-cN!2
zya#*%uoLh{fFZz_0mWw_KcElr9Y8<eZvYDc4*}KzegN1E_z7Sq;BmkZ;INC(AAc`&
zG@uV~9AG8jMSz`vmjGsFLw>+Qz$*Z|0p|ny@#j$&0k#9)4CtE<`2iaNZwD0cJ!=3f
z0m}eGfHi>mmqLEPPQV8Mb1sAYfX#r90`>tu4(P`pQQZ#M2)GL{1o#4A{w&B3*a`SD
zU``I?2W$p>2QYIs<Oi$+JOtPW_yJ(y<&Yn+8}K-we-7lo82kf{2J~G4`2qca7XcOm
zUIJJLcqw2r;1z(Kfb#)EfQtadm5?9M2e<;z4|qFZA>bOoI>0i(X22T2KETa@{;MEA
zU?bqefFZy~0rRhh{D7T++W~XtLVmzzz!v~B=RtnJI>46!`v6}DEW}@qeh07{@Hc?|
zYau^iJKzU^zWI<JuoCb%U?<?P&j8<bkRPxRa2#Ma;6;G`&q02`cEC#keG4EzU?bps
zK;eh{fR%tZ1BL)s0OsdHe!xz^HGnzSLw>+!z#72Jg^(Yx4)6iMKEQ_o3l~9tz)rx&
z0ey=hKVTi;F2E4r3xN4IKz_hZz?T7YZiM`R&4BL!iaf{<SO|CsuoLhDK;II`4_FC!
zoaKO{CxZS>kQ=aj8RQ1svqFf=M96at@bU9e{{<m7VQZlBHX+^>!n5*=LIeRj0WTAU
zo@0PLqE75zDMTPGl$Q4uA-;k8ZouyXR^HD0kSFu2LbRZLC*W^!-~KfrngEMe5g*zE
zF7XtmWe0@V0Q_44SuR!!(EvUg0p|@5rT489q8;~@#X`J+{*@&t2i`q^Q$$Gg0j|e=
z<sAz40>0=Cot;@D#7?x|1GpY|vp2%Uc|xArJL!t+L?hq?z*c?V33v<e`0k>K7kUZ-
z{~@jLth~F`eFI>JC``+{hkS?9LYv`|Ctw`@2KYUN>G@!N3Fx%~jz)QYy%0b4gwpfx
z7vifZ?*t42um1rdhC}YcZwT=P@YDNE;)Q;`CBz@ut^ssGr*?}FTX3KGAlntD*F7Y}
zb?Dy>cro<V2MBy=l@ANCcvvW{t5Jx*W4|ULcHlnyI~+&hX$Jg~r%oJu41dEJ{cE?9
ze#o=+yBw!N&)n|`F%7U1Fe@#T-uXE7TIlHm{4MbH{R8C>d2;?yh<gF|0PaXHOmEyK
z#4F&db35n*U*?l&554$W6(3!I)PKWH@C`fJ|1|go{^n;;5BV$GF^=em{SfgY=wY1*
zi1B$IcEb7>p+DT?y$xxfI9JW__TW1Y65`w`$0-fxAgPx$oP$I=k%sr;MHb}7IX$sh
zgwk+MPnP4oZS<@2;C%$y5AP$$dwicp>J#UOB_5m~hCb>%_>PCfgZDATY|zDb5z)TT
zgYP0ri1*fHIo?~75Z{@X_JsEcWj)?o2A+@y-<Jb^jGKmd{|9&rJ$U~|LVT}V+8y4v
zm3Z(SKq)W211KTh)1tkn;XN%0@m+PrFCgW|-=C8G@b`P=IO6YXN{GL2s`vn040>Jq
zUUVwFen5_UEg<D;*RU6m^5XA_N&5Kvw6Yz(e=6m}-^G^Y_>PzyFMQWZ1TbFso}1W#
ze*RY!zDhvOvj)H|r2h-rYp2NRqMkcNC145Qe!yJ7yjMx5Q}}*KyX_RsfcFB{z9vNF
zc^=UPxD{~x>q2w_76bMI?g7k%fAGE`#9Y9YfQ5kVfV0s*q+#a2sCz%)Whk%IuvwRP
z1HO!Y;!XHhz#PDL01E+s1K0?72(T0I1HeAOPXK-0@UMXRfWyYae*=yNYzG_%7y`Tq
zF!L?M7eGJYrGS-yR{(YbUI~7V0g~VBeTu)8fVZRG_cr1QU_M|CU>)FQz;?g~07HNe
z17^O1cmn7Ld>pV6a64c#;4Z*!z!w0;uMkfF^8pXB9*}gq0m+B=*NXmJz)RrAiUBVL
z+zNOFU>D$gz+-@m0JHxU@ept&;0nM7z}o@$0ImV-1uO#`zaRVq<^gU7tOa}kup5x$
zA^r_~;ywrP1;9eU9|7(GJOr5e|AHUnvHp+{*W)(_*M)#<@tch}cG5q6LKGvGWCAkA
z_y8GWasU}){47Uo$tNs6X=*71|E)Cudj)^^t&3#SBhpZi<5He6Or~O@urN*B>tc@c
z7u2pV^W7P&s>V6e>!!}0nKRWFEHA29Q&PU}x~X4Sal>VEr~0aE0_AH0WfkSY>!xlB
zR!?2<xid%34^&qN*RL+y<O728>g%R%tSY~zx~Mp~K2Uwx`jVomit38BHJ24ttiL8u
zy?*AMv#0vj2g*y<2CHjsvr_{qpKpFm)yC?YCFN@?G`2|zu+5ny`=MubuxMjdNzEpG
zkCLk3hK-;ST$5i_a%V|da9yz4s<c-xu0_`xh<$VL&S06ZjQ?LZHBh~z{LTtI7N6?d
zSdv>*6s(49YXfD~!KuDk7M}UDVpEwvD}tx_vn=7zef}(?H{3)HqWfJYd>Lvon|;ld
z&9%*S%?-_s&9yC!En8c9Tjp-_Z_C@3kDN#NJYpO`aZ6=OZA)EC16qh2RVJFf&6&;P
zfg!tD_!YkHo%?rYw&gvY|8&FCox8eriQRLb@jp}hO#8EYp6z=Ui1OhR0kT_iT8dkm
zx3z8yZ5zMcw|(XI#vNOCbnoy!mHAZOQ+2Hkt(~pMc8a#SZIw^gKHdIw@2<XG*}Ds$
zDSoE;nf=d(o<)cii-@jeWlPt#?rr<G^=|WT&)c5Ay>R=U9i2P6cI@Ag^VHm@{7>aS
z)!N$Lx~H|P)z_BYw)N@er!#kt-`(&`<1?ZX{vJ4#96m@-`L?$7Z9BG2JmGyJ^NHf^
zmD_8#*KKdu9@^2nqi@Ht9pcHAPZd5@`BdFg4NrBq?r-gFJ=Q9A=C$Rw6}DBj)wXp$
z-Sza`-TvKqyI1aRe`e1!ozHYX!zYioQ|9KJ=DE#z&CM;XE$uCPS~^?CKjC|#ar@To
z&D-0zd!NjFa{QCoPZIOir-(IkCowj(^*-JAwAfX+yLfly?%LgTyZ1j6dZzc8zGsd-
z1Eh_JMF9EDE1L_Oi!qj6E!{1l7XK4@Pvk$b@`=JH_H6Im-nD)I_M9i@KIwll@5%fp
zTc2uwYR^-hPjx-z+nK#{?#``k&26o1?QMJ7GIx#N<=d6LD`%HzR^wT@t9DnzuC2S8
zclGY>+by2Sd}jPJh0hj0Tl;LovyB|jc8|CMV1IL{xvyEYcw6$ft=v|;t#(`26WvdQ
hp6GkRzawwQ${oc!_B`47WcQPyC($_d^Ixuk{|l;U-E05=

literal 0
HcmV?d00001

diff --git a/depends/mimalloc/bin/mimalloc-redirect-arm64ec.lib b/depends/mimalloc/bin/mimalloc-redirect-arm64ec.lib
new file mode 100755
index 0000000000000000000000000000000000000000..0ce7743647b158d25a8dd82854e6fc34a0b6b28c
GIT binary patch
literal 3308
zcmc&$&1(}u6n{w?+eVT2g<e`B7F487nkKP@Qnp`cY1)(|J$RaKvunGMZOS&4+&m~2
z#FGdA0`btB2nq_NAVtut9z1ywJbDns(nEbSJG0qMc9Skh9Y|*8_ulOM-kbN{%;izp
zD6Nh~;xT9IA9T*eEWrnZLt?ZP0e}!d#|}Ve0-&o#$jsbAE?*>5(}l_W%tA4jC%UG~
z<#MIeZ>Wl9sHJMZZ0MPkS^`4m7qi*sC2-$!jk%(DdvSi2OpO=E!8iL%oqZS5-{}BI
zbOO|H(t8r%HU6@v03M@lzq^@v5P%?>`5$a+Fs|LnSO*hZig<c(Kq;3YJ~};FxHC7A
z%NEAyChfkQNu~MeFGVh**Seq+Iv@-um~ZMcw^0bL=o(=mAXh5}Q7UU{1Ej5KRR)O=
zA&RykFPBX{3sl#<Fj7?w{a>9BA)3BU<jop}ZX<6G88g5kvq%d|+@;*4RzhJLCFMoP
zf!oL+?m@&Zagb;hm;@YKurqWZY*YJMVYeOQ8#P1b7CzEG5*KOA<FZ`@r!(~kR<=WM
z>Cwymcz{N-*#;DKd2^+&z^6b5PsD`x5=18kG)1n;eMuoYkArXc`^5n)haf>>m+NIX
z481rwgZl|Ric1jN4PxI1SZJ{Iv`pHoa4w343jQ!%fYWdT_P5T?X(gkwQMp@<UCUpO
zWoPDRx!loVMWdA(3mI)#^KcZ!|1cZ1+!v%$MPEmI_O}9o!$b2s<~MLL`(hA;TO<Hx
z(yBn11L)2nfuyJo0$}N+>j=dy-{RQhYd0wf_Ygn+V(dHOl9^$vW-8l3cn~gs{A8H~
z;1+QT%I(b-aYF*95%)$+cuynlm?G&Y(a?jmJTG^@nLCtB+WZ)T@7?dd{=^N;&~W!-
zi_A?6*U`+UnQLznNFsAn0;hUE#Dw=$?-=}j6ko@Yl8?ga*Zadax%2T&0YKA#{KeY~
z&)!cmPedCoa(*v(Jownt!*Odceczeo#_3D=`JOu`els1J6Vvz2X~cRp*ZmaUTlsJc
z{S?AdOW#0ES8?mQ>$bu-ui=sA^E-I;@bk3o{48G9{oKY`jSGCU8gXG&i#<Kad9xC)
K5P#InRgu4s#~Wh+

literal 0
HcmV?d00001

diff --git a/depends/mimalloc/bin/mimalloc-redirect.dll b/depends/mimalloc/bin/mimalloc-redirect.dll
old mode 100644
new mode 100755
index 83b6bd4f379ba4d9c0fcdf6b846c3b60867a31d1..ec035f1bd61eb9326d65f23594864c139061b3f6
GIT binary patch
literal 60416
zcmeHw3wT`Bb?%le*|M=L1#A$IgkxtMPl9d656FP+Fb0_%CjutM5J6}>vNX0-WNDa(
z5!5a+GKq*#sy6A3(~?{Hf!_~75?i4u9RmT85+X?2IIp54O*qQX*1aK(L)z&6|9+e~
zGm;!X@V&RaqwhP~ueH}&``>G?{WxdNx%sYcF<uB!jB9vUh(3h;3(5bd{x^u?saHHT
zReX8UH)r$}Rey8Fs)ojd6^pm5i`TBV>S~*tTawnAs1;8&TaC?D)vdQ#>s#uh^UBI5
z`!wrcmaqP&qs{Y=n(Ntr4IKHhOb3oWf$)~0tB*V>!}&*!$nfQ(DqJYjD;w(?Sa&Q<
z!^?%J|KtSG^s}F@Gc+f}OzVPiQ?C>?$f+oj**))OTt?eu4&&p5m>{#Vq3A^^!NT7-
z5kW##GQr5S%IQuC@g3Bu-ynpamAi|?AO%6%4@;P#|9XmqA98~+A>L{7PA3F?@Dz0O
zlF`;A%6Hv?e^i-m*X=+|{#imq=Edu4leLIUL>738Qe1cA^8AHh9`h8L=z9wVZMZh#
zs>kK|3ki{)7gL0?jcBU`bkIYDDCk1-;)!@2;t~^J18{}-IWEs%NYX`{T0lsQ1hA5A
za6Ckag6@XgoI+|W1nftueWmszt9%vJk5u_8tC6(q_BVodSC!AUk!4kP;-B5Q$``V`
z%6`=%gwsDsh$kjHn_)io3n(OSyZyP~voF2$lHFDEy&)t!%f8=OB%UuWMaj~a5f#bG
zKKvK<J!t_(Uj|Y6)5S#(r&GlX)0v5=w+&g(N-d;5O0)Ji{5BK_*pC$Z7zt9RQpQ4z
zRjAl-KNBIleWR~JBvFIJXju7?NgW_YYB+5;l*%}mWWLJE0ch^0=IU>x{7Q1QL<+EM
z^!Y_<GMX$0PNtNxVf=wjaVDY5C(34K>X{6P4R=w9RenTts0LVCJRq&|`I%qkE0S?t
zpxdjO6evGZ>?=P~?JHV*ELr9zt~{10&iv1XY3N>=)txPn`gfo^4SbdM3&lS6Q09U>
zAOiNa#lA$P0n4(-_uHMvD9qncnt4_6&g}}?LU7@$#5UmkDO%p0iyr!4+Ee=*2DOr*
zHg@{xI;dVUf}a)-r;|6@o0mSe4u*niiECgLov+iHrl3Dp!3@X0Vt0PS?wq~}B<$QN
zFo2R65)!<UwTNXNL#^9ot+G3iRyJsGs_KA&R{`_NoR-<_t*}T|Fsu>DQW;ikm{I<8
zl`jIlE+8%urwf{OKM`;qW;hhbf5<<v7V=?#LB(XlDk4<n3){a=`fBXXXCTcYAFKW3
zqz9*}SUP|TzRVPz`T$cD;d9;(ra25y6wd6-Q>2&*P)ZO(t%V9)$=;(H0cOYSYY|Jl
z7jWK;QVHj!6wu(j$PNKXKpR{j^D>9AoRu<VEb$vtRC)xyN@r{T`rpXYpLkG_be5fr
zx?;P^e)=;E=p$7{!)WacO;HW)q)}nOKZ|nqp})Gb<Zn^2`pRckbPiN^mF$xhi;I?Z
zR8<U*Qt{KWe3frT$F!oMPr&A2a<*&q=+08Ku@M~E#`w6*wdnpkq_DD&A-DX<Dqm^G
zG<bm$oBGlblzfn}u9B-1SpX?o37LAV0zj0OOQT#uwJKCxqRV^^0_06vd@S`&mb-pM
z5^Dr2GJUelLx1HlSNU9d^t#|_JEee|9SNw|7XZy>LCCot1#p;?(OVYUE2Iaq5D~Ci
zxF{B=u};_IBMG|1=L2HWIYXY;H3Vr7wsR-ef9N#GfD479<xe9Q?&eaJairAw04U0z
zPV0iyL|KrTX(~WfOU8AhLrR;&(mxr&kj+02zOubaBnDW79BhU0DjBD>g_3iW6ln1T
zS`RIhG^mL2?|f0^0Uc{`zv_pO(Lym{e}i%6b1t7omyetzB%j+|KE5maF^pWm^7SQP
z4Zv0Qk7UW1rN&K;ZwFsECn)B0{0>Gd)t0~{XXN&)<#1(+ewDad@a$j8BA4$^Iayw1
z+^OAJESr$yK{0}ntLD4Rk7U9#ON^Y~q}K|G)O+Z?>=8z!=QrQbGi<dckyG4Iug(dJ
z)Wn79p>0e`8<LY+u1UzwP_v!%4z}(kX?0;+&30kw4QXaGV1J8fo|f|z*s5;FY>5(Q
zugU<l{>A-C<xgcD%!-!e0CSqo$P7fLD5qThsamuoi>tE6-0^^^62lnWWi!AEaw+6k
zYBJTg*oUPuhN4FZJu{VoS?x=FBJ~2ZFn5^Q2K?!tFda(0+D|Uqc!`eP^<bHbr7f_^
zz@vZ}Vw~eW3{?M*T%WZstsR7-sd1UW7)!PHuf<aBU7*2I?H}HP1)^~llITR&8|d{y
zj*++8?O*e?kuW*c?tD~6omnU4T>mv+2MbaqL&e2l1dejgu`u0!vZ#E^Kf+DG7yoFr
z_QfSbFEIy@z_C3ltC}?i9gg&*L5*LK?GIoOlni}ddK;wLPtHnKu+Ia|bTpuQsP$~v
z*{Jk<m2ZJXb;DF2sb!7$H=nT(I$6rPGC5httkehTHUrRc{uyikJ?Tj#$GNHNC_t|6
z&Io}&&+-UJ9t$*9XMo~IvpnW+yhXR{+6Svt%n8_AY0lv@Zr^XvxtiMpE@Dkt#Fm{g
z$K6?uiPY70=N4Z#I>~NNV_%}<Ca*Jel3Lf$uhux-zoJppWvj=Ma-6|%T9scwELHyS
z<78)8oPupcw=0&Ki3Q6~)?ob1g$U(9Qd6b<R4Dsd5YV)($!Vrmaxx6eo(uvxFWV%w
z>ySll!yL#~6|H#z{!7amU_r!bl+Aby)S6SHi)(#q)2S2(96+NAMz)YEfGV-+9gNS#
zh^zYbaTaARB+vQqgOj9CnDj#GR5hwj3!kF)c4xoy_iqB)j9l~voUQ*(oG<wgK+#q5
z+aHjk>_0y4uB=;g*E46dpZt0)KyLl*@GzXze25w0q~v@>_h%-;Al(?coDH^%Qtx0x
zLeA|pf+KQmP=2K3K`4hNUyZHjA0aA|SCV*KYJ&5wNmw>BF+MfLNyFEp5}eKjU}6tX
zzZJyY0ME+0$Y+EwQ-utT8h%<uKqSkY$^QnmQ6F2>BFG*O9;j}%l<@t2yKDO2-&G_Q
zzUa(bz*T#;6zd_m*Pi|rlz)}2axMVLIjr$CzbN^^0|@7@=bsxtxu4toMkScRwiXqw
zUDj7zWOseeC!j8d$&LtwJYVJtkrRR(0715gRu`nRmmU=j3+6L;hzuUiGFXCIY6LAY
z43>BpB!liTLiy8Mim3&<`cjWZA0@*o8WRdQCPU;SRSF?O!@+Wg1yxMSf+{15Tf_Ns
zs63o5fA}*f&)0Wc1nmEQirZk@Wnvp9wpZWxcvSoOYSi6JpQ2T(c2%n;8>m*TRFe~x
zR4r_{hI3SFC>g2R=gI!MtZJ)V)m9lMtGue+Gy=-@lM6QnM#;VQ!OKSGI)O(@e)!#y
zYWS(fmo9J-;!&f5xyGnb<5lDL_UNxa0fuq7Bm>*sE^P8>60qH^V2ik-B1TjMqOQ*G
z#IKNJMOMXnw_d%eSARw-ZY0BR{W7a!gR5c#c|*kprDBsSs>z6I>L_{Rj-nBk79`Jm
z;F7gJh`BXmre^GnlpOv8Fnqs9$)u|!&xWaFQYqQ$ifT2YS|Ms-K8}Awjyw<4D)JOq
zb@fJ5Z=+YmnIo(S1EK7NExtC?lgeD66G#iQ5KWO{3v=+7Aq5jkfQm!L0yv|asLqQt
z6wqvy<Zx1mcbhmI7vpx<qq5w2bSe^9X7nMm8p|sdR%5Ne%68}HWIh;|k#UTSyGmvt
z&MIk=bd}81$$pi*QYQyga*<9RSIOl%IjEAi=%m9W)I5QZe{?_#fXsz<*B0eyA+HAo
znJFY=jDLpg9Z;k0>q@IV$X8U1@sBHr9)?&D_?ch<6KXlKuo^Pb%<7u{Zj1vi)h&2?
z=h$45ZSnQ83|+xclyCW0MY<m&kEG0XuE9vcu}V4I4CdU4^ft*$sNL0Qgxp0)j#s<`
z(_ddH8QhcR<ni=vJcpUSyN=bTVfs|fzTD7YqAB|eMbrMAq5*jaa@1t`kM9=(8g_sq
z6l5UOLT4f5UO{$@l!41MsOzl$H5M|@m#jwpqRjhsjd7`qP`--g*Q1=1oWORztL#si
zHHTF&t<OOnuqsFX7nooFzqmjm**BOhQDmrVZ+?z*rCAe=SifN5u=HP65}@fk1_<GF
zM;`kGhNmA#HWw$s@u}&cN=qs(O@hPIzs$0nm4jNAaBm6P$0Y4Vi2WI2MafAxaD@z!
znW#@*<@S_wUNJ$E6H74(h*2^4nqy?}v%#fW@+%qo8c6IHO0FYQM4d9((U{KF@+SoY
zEqh-L3cmb0*N9z`9F~O;)<HTNT?QsV+mmZ=X@oKr6xf~10vcoH2jppqB+jXkwA+Is
zMYw<QF|dD}Yvjy)92b7+qtaw{@=OKLSk8z2Y(*Ll=t3J{TB!0ZR+&kS(6a1VAra$p
z2JA~s|Ey(3`B67Vt?#lFTu(XoE~V{BrQ|sq4`D9K+9=h4&PAn=mUrBhd*0<=Ce3!4
za)NHpJG|G1x?D3>$!!8;dC#Xezi}MsbLb8-)V_deN2m9I!}DsWa?ITEaR4v_Y^ilv
zZ(t@aNDl>JnuIOvJUc;^qPOL-4@)mYDMrOfc6IU^#7@ZARJfN4a3r%D_?E7csU}6l
zYap<U0>l3b#NAr5YvnDZi0XexN?YU+VFyPTYh|pJu@Fo%0I`&>q+Y<iKm)TflVsFF
zl=KY*pj#$Ph%G?&{2RlGCl2kc0eGtux)Rf2qz93Hik8nAAdQ4`8SG?XdM$XiA&JE;
z7BomagoNFtJtNX|E}C%~JGueZZ$qB*4LCIywA&;}XQ*Ko@0?2K*Huz_7pkI-F^Sz|
zlTzG}k6Ucjz8Gg63IU=x(kc7po#6euf2Iw~=5&TImejmNhus58&QEHdQim(fUm>$Q
zW4YQ~Ob-*(44)#ygN9+q?vy%(KoJ<`#z_w85O0AXt5qJpmOtE#VOD-b&jFjCqZyi!
zqy3L}Z{}aV@WtggW6N6h-2cQdRhF&jM>~InyfE>>nCH?wd9fNFoFV{BNZ%$Lmw7)m
z16Uy(!kII1nKg`4B07LcGWC3@f}=@|#GIq88VYF8UZ=r+0dNsTZo-SXyM+$Y7YCiI
zOI4Q{KgaXUv?L}_C8abVQ2S{(&?$2{U5K@ISS6_jy`5ju$Rbe5quN0E(G?S%Ph!Vg
zel!iqzQz5U8YKO)z7h)Pn%)KP#Xb1FKOG)Mqn2x>FOgK8cBvCY?M|SKn>pBX>g*}b
z3^&`{b%D?ji$j@-LmxNCpEWrhXupu=39p;CwhEPUeNP8Z-C$E&5dypNqp&_ip&C)S
z9#DAt3(G2$J&#fJ6lV;(3zqF1MN1S?p}saSA!aw&UA#+$7)BEoWfTJ9kn>g<MyR|6
z()Fm13tgub)#(AGe;}Hng|E7|q)-O~1IM)T=zycQTGy*4Mz9m?yZ3zn>jZQzx<4p3
zUS^u0?vY(!Z^l-hHRE*b_bN>zhKS0pp|54bsITm<fc?rKOTv9rm9dp}*A}TSY2XuA
z!Kk5J#Mz4m8D===-pW;z0ZAdZ`8i@N`#|1+A2~>*<+f_eZS`1ggL55WhDdlgwoZ1+
zk7!9~dyGaBbUv?1yw=QPb=Ck=dCw27SR#qBMWx@wfiJm+);@*#7Fi)@29^%YlEc&z
z^1l6jG%pKNb@Cn+Yn>w0tsJY<u5dmBF3M6v`bHq?`$>u6flBXHQ7QS_Qgs8wuWl@H
z{FG9hKl3fg8tG|Le5O+#<10Hh=P^NczaMRa72zhM(s=jPvfC{*(-NE5xg}b*J5Q_n
zo8PEGFKVk}TT6ayEY`1Qgeu?rX|W-y5TM0IP=g)pcWf+*su2rTgTTM=RT$jt(Ip45
zI;13bxaF=7&<A=_Nnt%HCGid{`o-BvX%aj%#;+Gi{`OY%14rQ{>|w&%X<JSuDl60j
zS=2)WC`f?Ry(;(MU017gevBg%RKs1jU^!RYl3|GAgPl`4oM%+A?5pwp`d+iGJ+YpE
zp8g44R{6u5b#18Qa~>J3Vwhs_56sJtPO+UNh&YNYt<F20m7`Uwk<OIWYC5NEcIJ&n
z6CsNTT;6o!@>)H3bA1a738)Rk7Z+wNq$ob!tm)YFVz?DrpIm(S=_I9Um|46lO1VD#
zE>Co%^3u}e$ndXyY7*FRh3XIu^5S^I6C^Z5IaR?-LzV7SB`3(7`O39vbe#nz0-=u~
zR_IUOgf36b$4cP~Vfe^JoM<6K5AkFrCX#LxP=kQ;KV)gigQ$b5_pxg7Vp^+@SXk1G
zho?u7-%TCyAjA}4Xt6S8<|5|Rh~!1c^UdN@g37vTP=qWrD+|e5?|Q(-X3CNiRM>7G
zEaK_SMFf$l-%;Bz38ao;=NYyu+X89UJD7(GfzFOCh&ms{4xB*J3ThT35`U+RR#6SE
z$;ze>jM+cn=*=|9GKoOvqsO?ma{d#CA7J1^gK)c!9dRRfKo%x5sac@YUgaDI5k`S8
zAsehfkQSf0I5Ul+Fq6}}OK3mBk(UJ^>yJPuodr;Yfbyea>CIUAB`-5cscy-wP^$I&
zQr#P5iCq`M;|B0S*`W(FLGv~T`7C2nF9Ryj)|0oO@?uqagkw|7t(S7TgM7l}M?=$8
zo4TrsFw;wSCiCqH&Oc*Y%VFpndtn0$Qwtj`Wn{y+h&i_DdNK!mQ=Bh=2RjMr8a^;`
zpL|dNMWxOkqX=#DkH<ZB6xAdq%38SPy;b^j``P^E2Zk%Kj!1=_t2hY3+B*Z?3^B5}
zCI>K#yUrEUoH7bbv$j854EHUIr#SzDvwPzy)$=pio;2%Qbpuzf3qwxVZ<Ge^P+pME
z$U9#C&g`0h@(WNAW}&v(79u=ZgQsSJ9KUk^?IQ`T&-;9av7ZJGOle{<XK-HDNr_D*
zLlbCnU1jfJ_b<^3NvBrBhS^SU9{oQ+j_i73CyfasmkS0!=U4uI%afW$wiB79<y*L$
zP$X)r0N7-8EWc4ZM5lloAaZLj5rwterOXZKB}Itpz>Ai$A{gu8trCWd;;HHKSz-YV
zmWCu~Qd&tcZhx*J>)Y95`hGhe6@WFW?RHgX8nY<yLVKLYPN-7>?zQ=sx76w_%4LUg
zn93+d={(EBK(r4_a8e)^p+nURKP=w^b7ikBLYo$ejqLh>YZG!Mi)LXgWnHJ#C&&NS
zpwb*@O~0?!HmHMzX=ogr2ctFz)t$%bKB!A%Eqpcd8?f0e6-hbn-~>bC;CQFY0=OZm
zG<G5579ZPKGStd-g{;DDm9Yv`5*)haT{g;5Jm-}`DS-8cUtD~wyz44f#GORg6X$UG
zC};VWOLKFN6c^!S*6O<+ZIEt7I@|V>4?c)z(NG}sz}_!+p#GsR10h+k^cZS9SnetM
zf?M<&i&m&2-55NCwdn(j_uv)B1}8uz|L`%p?nOEeJmxfIa{G_3zu=fFu01`DLt&`O
zWy({{2cu+)G7s04nrr#7!6~D1J@(@X7aU_r`>}DS5;$H8{5Hg>2A*K-(P!QCn~eR*
zm+)UHF+QtAdDmme&VrrwWFf8H#AAaO$_0&m&x^1CJgckQeC)?lE;wdN&@OKY^fo0B
zmMyv97*q{#Pb7{{74b^OhF_a1?wbnDXw_3yUn)I|*)Hma2en{<cIS%H@}sMKzO|1`
zTLy|bvS;TE?cxeVQfW(~skT3tyBWm@$gzK0%|d#YEw}&Db79!X1<AD(S>qhX6iCyx
zxRJBCK8edkoAo<H<s`+9_cI1VV;oC)y-5f=pT^F=+Z~5F^1b6v4p}+q^2guzzH<)a
z@8SIM7s^Z~%<4#nF@+aKB#c~*M^}sCehkt%<y{N)s8epZ{AlqqEW)?EYeX)aZW&*K
zrI(MlbZ7D3d--p+0*k}*3U^B{AHwRWF7~k=hKm>qbI@?=UpkBv#s_a?0Ys_1V<#uz
zET$}tv@tF`>oWz9HK9WL;PvHCITK9*e8UvqP?5_{;3mnYX3ZL-{Eyd=HFm~^^%Sxm
z9Ko8pD7m8v7)|mxDfv@|a|vx4*znl`e=%}_d+?ZZA;oc=8ii#`R2fwnO`0kt26?4Y
zBy|bq6^y4YsOE<)&*8#Ijw9n}H{A}M7C{Fg?P8I%i$x?y*Du;Mn`3GbYA(V6o-_Ux
zJRGf@9tPsdQiv<|bres|eBH|*4V^QzmE#e)k@BMuyH-x69E@iD;dxje+$}tnR<tw&
zEm8}NWx&tq0(eY5+>SXw9&zcX5r=kyeCUh#XKG-gF|3BjYK|#TtU8N}+S4V_u9%G~
zmc+`{W$w<@7+Mb#jBb&--V}KBIXNrkH`&se<LSI2k(y@mCMezzm>DP6ot5sapELf)
zes&%!Bs@ERh25FcWIW%v^d%^jEXK01IP-VCba7eUoZ!9d@k;Yld@0zVV~eF3fbpiK
zecW$eS?tS2L-v9ca9I{2nb}RLC18`8ka?1wZ3O47Z{+PASXAIbRG=5-R*!ao9|Oqs
zIL;E-W$w;X9TvC`gey{XV~sv<=PDu5#B8|`2xsRei*t(fNS3op9wXz3HYp#ab|0E#
zJuK$a6R{yYsa!ZJ!FFLM&MR_qW+k~xu&|?#0TsPbkgKJvy`sT#Ia;YSY;VQsl5QAp
z1mHPI*e09Vo(_?Hpt^GzmXUH91tsl(^UybQSB6T!Nc`kE8(^EJm%364R>N3v;o-%<
zBzO?SjG)+1GW2N!bj1d1Szm=LmPdnSwKrfry7489Lv%=3m9QeT!=~Goa%|lSTY{tR
zqkuv!)hs25V1XX3kYZK)LaKe-M|OS`Mg7ipNa8#fbZwn2%&~U^q6-|FG%lldcDx-Y
zZ?MV5cfjFFr91PUW%9_xoKn3k@5&Koc}S0iAy@zH?$c0t^5}0Z`dgl!0i6({PnF^y
zF$g(rSYl&ij+LwW@lnGv0QQl;8y?2!g0*R^08Oc^&z-sDslE)=<p}h)IIq3ntlM)D
z#1bB}F>vk6^XypzyF8}5Bxbt&+nAxKP0aKQAlJIJX75Ucxj5k+vIie5mr-<h8&-Ch
zIq?fh)8rrF3?E}YKx3X-{-|8{NoMWNRGL62YeJC1v-OX|ksH6JaKqudn<JfK2syJ1
zjr5117kJ#A^~};Cg5fIOjGI<uXtB3LKcIHT<dmD76GQvJfohg+Y}J<M$PENkRPAA>
zNfrCB!ZHk$iX$XplcyxPgg78mIj-h-2pc)j9DDlVp(`O?q2At#GqsPIc%?{wgagWE
z`*{CLYKOiFTZ*L9u5^Bm$B7B2%?`yFQ$KYee_Qt$qA~lCWzx*p(>QYd*s?y{GlfvM
zVXvXLavL@}_EK<X$lvZvFiQ!w7JmeDb94k=9jD3Gh(4VzZC^ScTl|uZauH2S^-GV!
zJCCg#I2f^Nklpw}46;wY0$(xo7Fvs<Fo0V06xK)@Z|*s-#<2sk<qegRjo>F;k5i&;
z6zf7SPDcT^Q5N~CUx!d<k%0qt3h{u$kl{Q_k-4U)Y!m?hCUd>MSC;LG+sBm9?v#uW
z(!SL91i^Tx+k7|y)%<$g>UTahpj;)+7Eb9eM!Jh!dg;PL>YVZ23L}7Kv1yj`XE?hi
zT++ngd6i=x<NgottkRfm*ZP9aD?bB+e23*u@aTc;EUvaYaIyjCFNaVIuE>AlcI=ZT
z(*x5L$P+1xl`tZ#Qyx{>-U&qho-Tiq-24U)TR93N<VfiedDjaG=MQm@fbEt>6LGCj
z-v3s2v&|z~W!JMa-g=px0bXJ9QtJ`?U?k0&VY?CkTBR#^)YpS@n=8HYEw^y*GooyK
zzqxGzb|Fx+v7zEkGr5`y;hChcaslldi*Sa;Bk+)1Z-+A9m4xM8|E9eT90y!N`NKZ}
z58fZ&gOE2qUPZ``wySa4)tS9L-;I1Hf=BtNwVXy8pygkYI!E*iRYme1O>Qnby#bb3
z6dIWiFSV*DJTf21t}3c&UwYjkT6&OefoN%LFe2P`KuSJ%(7*=|sGro^?&Qhxge6dS
zGZ#cdTx6>f*<$(l7oLY&GLO$grEufjZTyz+7}Dy_QVjy!Og;*i$$JqzDFdc8KtZlI
zrEPPihIN&U^LYo1lN!5o64wwTP@>W1<`ShEiBkL0s)KCxO}f?KB!`Y_wZs5~vi<6b
zKdr5SAdE-0%N8sK2AjBO8hV5(<0dUcdTpOegnZL)e*+qu8{1Fb%_c;g&tuI(dD0(X
z9VORS()2^hp3Tj;5bK6W8o>P<3mT9?!1;$4hWWcn+^Cs;xtsY!zg!-12+N~nb*Ky-
zY1O#9!2&;%vOw<Lx&QQo(G0mMM*qEw5&TT5e9PxR=sb;?2U}OBw~)`$|JY9)<+=|V
zl^wbcM2%<-9*KiGU_c>r*cVcWJgk&Ia+u?Ks|MACZ-X^s4bEOi3rW6*T}HlZ$@ku4
z_!&TvbKNhn#(&XShyd%nadHJ$<HGLUKLz{f66B+VV2l+vhiz(NZ_&_UDlZ@Tm)69^
zIDA?ubhW7~i$roMl0Kx=&YBxAqzPT|CY<LY4&`jB9CFrzO5&2@&TduaTbWyMUSbu2
zgFK&*dvpJAKREco!7nz>AP0Yz0|hA#C9EkjFB=5OQMHom)GDy3^fs~v{9<C`L<Yqh
z`IOep^g$R8G2^fzxG`N6q}52%#$3X^2yvK6QmF`lzt*mhnPtcXw+4~I{*`sOQ&G3S
z{Oq7d><UzU9SWm)a(S-ExTJ4)Dk#UMKMq+S@vPk0nJ{49fp{KW4C9bnF8qoW6(K01
ze9O#h(AN+DEqiz9A#hNt;28v*p*nN1w(HJ(h<Qb+3SCPL+ko2rfJ?|yBLqAHjOk&;
zCztec-tYKu53gJ5t(%nHB6#$CH}uRku#w~0-K4P1{?crlxp5&cfKD5E70;2O&FoH^
zB6rrZ0byCJ-569>5an!IJX{_H7w@J8{>)c_I}CuHKM#gQN?}pRrbB=n%v4tyTf*}c
z>VcQ#C|Bmjhg)CA0g`j!(^!OIS`-=iU@Qi&{BeXD0UR3Ai9kW`?I^XL(efKm7`wJ)
zIb4Y}q`!b6G3$|%1;~ObF?jPGL<QW&deoqm4M2}A=@-cqJ4k1A7WZc@3q15ppZzs&
zBcM|=Jy+?R=92+V@t(}_{g~f@K#cp{SB)=AanSq=IUX8X&#l8C;&S-P9z{aS$~onb
zYGG_p&vBVS_9!O&PktWM(ya7PR^^D(w7LmlvJGU}y1%ohwgJ<Guxi4%%n!*LFN#=9
zwxE?T$d-9%b6R#1i`^Vw@;5_&fOZ)p$T}3PUq@Y^ags7Rj@egID?EM19`^LvB2Px=
zw0>CEd_3#otol0LyGz<RrQg~1LpAFKGP_h0<%8Cjllqf?&2yZg8>M^V+6FceaN4+N
z!-HmR#Ewr2d`?DHVI2y)Y2LUqTJ}jiSLAHNxjV;zX}2`%R+u%P8vYJVzU4)F6FwjF
zJ#chcmv8yHPI5+v%^qPAs~{$6gy?qJ+j41Qb|j#HhcY+1+Clmxx{OY14<4aoH971t
z9ObRH(DUTUOtn-EDcVPWplD&i^08aYPxK&NW$jeB`6()V`LZX9xF~C*Ivmid>Yw5~
z0|<~MbsYK_`kcvt?YWOKivJ>uFj?5nXS8&S(k+}A4*iNUx~BgM_DYhl^INzHxUt#D
z6!TT4?cBk7UDIEaRQ=BD@Y2-5%4|gLkX!d}vvnPvX*-vxy5G`u_q%mNsQXQ~ZhN-w
zfLr$;zc1w;)pc9kx_olu2Gt1sWVCDg<GM=7*$+NyaJ-945HwtE>^=($=Mz{*Jzw(R
zd+;<nkpm2Q$6@*VH;fXsgvxy{21l~rjAZ4E%C}&lE%zLr0y%6YQd(SVB{mJJUm@N+
z$_gaPeo6g4_&au~JkMKJnXQt#Sj9WTrJ(#CDL?nTHU_kzwE|Osp~gA~%PPgZ!ZiMQ
zR{1ekv6{IxG>6tRqWNgQnrr-W)9n0n8BL(y`58ia@S1l#mW!9J)Tb-;j#5d^XL&+8
zG=1AB^ds$A3%N~K`bci2(fIo{sg+AAPx$gw`Ohh;y}v@(4S4dKn~%>oHT~BSj)6}O
zo?q1Te~xfLdK3Y9`mERV(Xsh^&L=fAL0u^@N~JOJ9Iq?=77sIeS~AvogffqpK}_>_
zKDUxSI~{$0q?P=vuG*Pf_0;k{p)1{yTPa5#M$edye7CND@tE~p{5etrP8kQJ*9>y)
zi{mS(DBC%@yp&3*QB<K@3VCW?>aCfTFX!JRUM)jCz5*KQ)%fceW>g_#Gy~1*w=m63
zQ=WX4>A@?XK41P7O5D}1e0e4uaNfk3E^cwD+h?9plC3Y*JgB@(mLMw+3tB9mT>KLG
zl&6oMx2F94jBK=b69qv8?TX)y=%X>7@9}DOskhdd(vPCWBjD$DT~^;*Wb%#VO|1Dw
zF|V<nPx9(N<gGf2KJW9k?{xLq=`~u9J)H(V@-)Salu`7#-^)7BewER%FB9HYWfd4p
ze~+cT=&d=Hzsbk{Id7$`IEDWxO7dhGhk&^w{qRU8rz`)<Bdba+#;!k#{J$E>WQ_W7
zYTU4MjmMVMuqARSWpgBjoIh8bf}_8$kNxu{uT^CM%Y$l!KN?LRFVTPf^1SmM>6${$
zcks-<a`5V=oAX&@WZsLr*6mBbTZw&AvQk=;>oA9>A4B#C7d(pV!$g8(u?f9JnGa>K
zos;KTt~4wWnei*!i~xa>*D|`iJGH!=bxU@<c}KE5k>StnUXWWD?kj!?39^CZ@>x^Z
z6Ylv}V7JzcXbo?~lWM8HDPlG#G(*spf^Mmz_#<=Mgw^=af<N&d8NCuw@TlQP$0I0w
zQ6PQ+wD47D=#W_|XX-N_$TGZ))zoh>jrh;tLH^A3nG0EB@;=PGD>LsyM|^@mvq-*+
z4|}Q+0a0o|3{SriWo~a|?>LV*&y)SFe$S!$dme=0nIJZC8loZm-Ui1ixL=R$Ugqjd
z8S{{=V^a0cYZps<;0dGm=ff`|+tt9#xTj+e0q0_Du9Y_09)1RCu07nR<mKC6t(KQ#
z52MHfS^-Br*@=_oq+C&ioS#BMj={_Jss>ISUEs;-BO7>1`%9s#*psH09R8efXfn_n
zD#1Tx`j;W54Kr)4%Z+xYwAMetA*0&esqOSgYyGCC@KcY|vev~1PTN`su^rC0*2kEq
ztaV@-&17_I{R+xlTgh6hd7cK^mZ~Fnv!26<Ui#W+@s4P`H>VFbMeu9?SCC|jL-w^L
zUq@Wt3pmr8iNR-wXZ7Iy5yP|M@_$nP-yr|D%Ks1Gf8p<ZA@KbTiu0Q~oO+*1&(UE>
zhyA+TtA}}~Hn!Db5p6Ao>uw<`ksjYRzRl1!A)n{wqC$v=?$Ei2^Ig>Pz0|(-%`z8s
zJT{)!$ahBja8Q_i54L$P^(xR<q>=Bb_HAfsO0KU*nzE^b&VS&62kO_XL;jw7aq=-9
z`K{_b)aE_h^P(!v_i;}nKP7VkqM{XfY=h2Q$h>akd33{Joe;!iD?&|o4f8}B^m_n#
zioLM#5XDyH&0CX5uvoOI_kEl9V)H%V5oF8vU;6?$al^Z}kq0u9Cv_^CR3s+N#7j?b
z_oj^D)FLr;jZQPXs7PGI(Bzwt`8Oc{!Xk0uOkK`2^O?q^Ub$wJu(U{&vfRie-9x(G
zPY~h(qT(BLxW*Hbp81q#%4h2GhY(H~C#DqLsLI!v^hcE5KS7#$Z%0UZCVU9#OU8*y
zitbhVJcBgltU*XUZ$QX;q@!LYWI6Lq`F5Q);X|5!4MM|@_%fgPFf@EkxxxAJapLl#
z#aaHWM?OYxLuW#Ri&vi;K=19(nOYwCc;!EXH0yiI4IkpXUGrf*@*};GOMPxYTI%}_
zr7!6WPNdt8^jP|_ob`=7LpN4v=uAB$KR<2q4WImaCO<#Sr^B-A66$C8nUFY~P5xMV
z8or~2Yarj$Gj?x6>c?`ngQ3aK4>cXfKh87w)P?v(3iJp|^wo#-OSlGcSyu=Vz!kyO
zhHC(qfIqqrmk(DE*GF)X!#FWs6pQtZ>ua0v?)<s&XnkWmT9=$x-_(TM)iSp>*%Dt}
z-_jh-&1r0IOftvRSzX_ls9n<}socD1^B7sHlhOEk<vXbf|L)*?0$)AW-`UPbt)jX<
z{-J2Hs;SAYZLWug_cG_E#^(Cv&B^%vH?_o<)z`<P^un(e-I5H)Tav)wj>dR0RoirP
zbbU+wej&moE0awhO-1APFK^z^7;kA_A8k(FQ5$cR4ZN}#rI2xBDjr9EIEwzfQ|EzS
z9hlqE+887>CxNZRcdT~)zmgwlRho>jj_a&sytXcSoi%28G#+n>pQ8M}+IVwg^EyMJ
z_@tz*SjiS^ExN`^HYF@T8E=fL*->~htlD_gims0((J>-hFIJnZYj7*xZ~14%-nZDw
zmamH@t^4AQ$*2{B^))6EjV)MR+`QuEW!2TU-nhDI#cj)Os9wH$<?^Z(E0^E6N~txn
z{MI{`uUxsJYPl|-zj)Qk+m|oCbNOwHZ@mS1F2CisjK)p`7T>h2`nKhZZ@G2xtvB7|
zp$FR=ZoSR0&GHGaTyg8l6{}X<wS0B;t;?!b-@3AD`AQ+ilp9{Q>PCC@ikri?u3UB7
zDd=vxb>)qo*8U!Tx2&?4FAJl6Yf_C(_19S&=FeL=Z{Zy4=GwTmAZRTJEVz1()q2e$
zaUXiG<-UZqAsQ#Z*IBb3NX^q1Av5-527yV>Z9$EABR&E{?~|pQn~2t>;wE=Q{@nWL
zn$$YO%v&$7z?Bn^HbrX_F2mJcCq|2-QQ<Gy5QUZ9$A8kE6IOjH4y(1KnK7~^m9#*W
zh)R2GT-V$J$7lKLQ&C#6YX`YFFP;Csd6K_zlEBDXTie)#s`oV}8^AuEY=q~%->Qwp
zni`QU1x6Fr+__fmniiBoHZZc9T59VNSL}qBpR1x`EafGV@P4)NdP_Nb3*X~0RidZr
zPgxoNMybCVU-4P(;WC3NrV`XI9$lAef@vsWSFMdlqw_4kGMe{EmieAgdC*&ucPP8L
zCAEGHVnXoSKn>B_`Y4&LYpk=HWeN3fY~E1Y)CkA}t+QGcS0Qd$WyllglG-F}C!e;7
z#A>R8b7yG_y0T@h6|Zex2WrE1R#QrLa!WIMg9%dyPDzS0-_Bu!yzODn$VTEHCrb2Z
z;{&xx>2L6zqf}GWngyY8Gz!nRsXv!4s;Z{oB6UrfGmE2cR$`94*1&*~;&dtV6ZbU6
zV#Hl~MSe>OGUiwwvK;*=5r)nRu+&8DhA2M9bbkxoZbK9>w>GX%t+)O#wLWGg8Xusf
z2U6At`QPhrNAsuF+LpLgtL9THfu%##^4BJzsp%e}Jg^*SYysNSILAT<KG2Hj1C6IF
zZ?5&qSN<MAo|dD}&I9ol44yT$b@z-t)@BHSl}(*o0Iep9p0w(&Y`ICVCsc}fwTz>V
z4oR{)+8V<M)ZE;($rq`*c#@Kg;du0oCR&=%MKfn5X3R>=<RFs^D|VmjWpcbedo>o1
zZUD-bUc}MOC_m=<3vwk7Wi2!=)eqNMb@&z+dJmq+^o%kC*-g5=STPx`W?JlGC>Nt(
z<7k=m&uTOsZ|ED>$Kb=<#^CE;kSk4um9upW8!b-gkA@jGP>%LDE1{d?&MSuA;Azr{
zhG<jM!UgV3p%}6Kz;&i)UNK&glvW}dU7w(0_*j`|JX*DDv4Vy4$(H4BXlzb$QFK4)
zni`w$QI1>=CB3vp_L_JtD5AA-`1H7i-e7rM%lh>&3f78VuaK&1h}PXhwK$U8R(kDT
zt&dduRo@W<up528$~N?zCakPIO8MH2&7PH*tq_j9CXXgWs}2qBryKUvsQRZ%U!YS6
zbZES{o+a)T1>Dcdl=f)6`_2;gPyzR|!o6SPef%tOj}>q~E8HE8_sO%wUEEpl?`H-4
zpu(*}hiA%TpkVK33Ynz0G~U6p#63{3_p`#?)_6zG68G)`?q`L2Oyk{smbga>xStj7
zdo<qZv&21J!2PUnKd$jUahABBDBylpxR?G|t!Ml?JX0ptU4?bznPNuzkj6W5mbga>
zxStK|qE+L)^(=AkF5rGvxc6$j2hI}rfdcMlh5H*C?~`YV`&kJsR1(EM(dPs@EI{&q
z1_4Xs?bl&25C4IW7uGB1qbI60&NVuW<l)|3!2Nu{E@B$zRvmWa;V$kj*!%eazDMKS
ztHX32?t=w;KOeA*?`WI{b$B8V_lknOpBLQ4PxX36hv!E~fonbjevNmqfO|eP=QSPH
zct;AjpI4mona4EVZ3W!(p*gSVZjE=34tw+PFYKGn5B&Wa=i@pY%)`B~Z#qA?pD;N8
zlUmnQ>M)?!?Xki-^1J{a&^U*5Sfj&;#=WP2`+31Vrg3i5VYdz|H16R7?&k&fJsRge
z9U39A+T3%Q0bSnqKoNgZUidpl1O_#pC-QI~$iuz#XR04M3b>ym;;MS3#xtNp!!)!e
z*WSaryt{zAf#{sVh{iLPhx<7(EmZ!!2y|$?dvw^Bhkq=RYxlpGVS(VZ5IC-Jc64|m
z5BI{p>9k-xbE2Osd#==BK!=7=cfsBb6mM%7);LFW*s8;xPpJL~6>xuB@ixr5HO_l<
zXz~l;`9&bD@jkA@6M6Xe7VQ1JbU@|n%AW*vSffKDY@mR<f#Piq+ceJI`FI!3W!_et
z^O^N%ynFL-5Bx!4-JXxt+nMgycpuNhT@-MCJ7FHd%h7nB%)>oWz<mT(Z)ZlSqxVfZ
z^y@IKaS!Wt{M#wBzze^#(Kv^7*r3BUjeA7__w!;VZ5rop9roz(gvPzCfctsDy-(vj
zphF{Mpn$i5;=F{8!Fx#gc}s_4wMw5T?3>OD?jenHjSeFQcP*`O4t!o<7cq@<hYov8
zsQpagJo5bD-luUM(BTOkhP0ol$h*INezf@ik88y*lphc1&>+yJaX0Bg`1T?Y)_BKs
z*sa5~#ywE5_qP{t&8<)4d|ZbjqwF6a!H~}<g$uZ!7u*X>|L-86-aD>eF^qSn8!hDP
z$W^w?BAt4R_G(GxCUpgtd%3ttPkB75-egP$DA!3v!1{bWx8lzC;L0T4UEFA1S#0F0
zHyC^PrsO9dR?8P3n<k)|C!6m;Zd~0Qy^rq-Z-}?tXT(sBCtJ}qCQ!T@Z~Klx$8~sR
zu}dxW8c|GD$Y0}ww`{L#j@GM6BeFeu8$7%fK%bYbDv-aSb6*K<8Viz9ie<%7^r}tf
zwkJ>R+9WHoUY;VWy%k3-*7b~@Eo;{%qDipv7=}mBykfLLnuk=I?QxSHGi1IuiTBN`
zN?CnWeXsuND<4A8zEo+heM!61MB3OWXM~*@Lp1!z%Wa)zEcNhcNIhH{{k;+I`?yg&
z!cJAWA~skWXh5HzB_-$Qj!CC`TfI$O;^5*e+oSu+Q|@VvY_A%`ngDW47brcl8M?I!
z7&W*J*WZhO_Wk7GXK>HfR`%)5H^Q=5E9zYQvm8d|D-Ifamr&B>yi*<eWYb2hz;^>~
z!;9DXeH9mnMD5z>>bwH)`}s+T;+tTWqt^2lj8bo9bQ!;wQ=81zR=60sqY>ouaqUK1
z0pQjaqRmWopK$4NdRz8mo|{k=ByPr14TWdmxcu~>gj^Y8Jw^<$E}iirS|5;QxqB=$
zPp-D+tYEj6ekXnoz0RYEk@?y_j8yHt%-|V;8@#3DlSgmh1HD1TP{;~7a$OIphFrE4
z(9hIzX*?i6um_(}DMptw0xsa7WUH^$X<R&cZYwl_<ZD`HDiKf3+GI&OPoC;@Q>x`i
zLr{5UtQ!hhUw_Mhd3kALK3V^~TJr%gSs!7zX?e!RNUJ&MvF;K|IcogNyxg=aHrqcQ
ztfW0qzUezpnVXk~o#b!m^U6l>^OPG+T)rMGSr2NQdc1ksI6}^uj1w=WV3gM$j|EW5
zDauWM7%XzepYGiJ`lHaec(|it6#LGT;ej<*|B*Zl?AiWzX>yyIgToj!Bk&l7&J{>v
z{570Z`_xt)s$6`BtxoS_bw;-?-&*(`f`RCq!XAxhZyxU9`dr-8x_nOo_jAJAR36ZH
z4(8!Lm}l=Nba_t!cLUwIg}+gDU8zIEES+cX0bSl(z}-M}PGLyn8P3B!-@iBHm7kN)
zLS@ma@$AUMHQ&E)%_}cJcWwym(RlXd;hOK?`}4}rO=_X`agC>whikrn7jNaRZwkm2
z5csc%0M6lZPSdzQ%g<xG^3Tumj`!sL(3>|3{Z0AjeV}*qMxh_=7|+NVQI=ny2aB>{
zx>Lq#*FDjAbJX);Le}Gfrs+#v&pqQDjh>Cjqj%di8ogFtR?+-Nv?sqFzdg=BBc~Al
zH%FiX-=@Y@8pn6q5l(yuzAt~T5ETfY#dQ+#0fbjvD1?K!g>X5p6NrZqW^h??q!IQ_
z6T**p+jM-p9@hY9P9UtiSco*@F@%?20y^?R_(fdD5${1bgliA!5&o)Dh<?PyrTD%&
zu3p3=2>$|CCHVIsJc&ynE-r&U?-n9}co^XqaaE88;pJBd(TaEg;a#}Gh)0-*D~Na-
z!k2M{5FbGJZc7LoaSP#{_}*oV^a!8CRfBjM;bcGZ5U)V^Pq-RLk5788<Yzq-C`0%e
zT!YB(M!0YeWFbF<umM*H@fgA%;tC)>i15w1pe0Xy;PcU|fCK9y{8~VWt%#=)zJ<#V
zdNE&!`*5`(zYXE*3xw!E`~<>l7NQ-9hY)@W*Kx$V5w2JSJP{8g{P5M#H-R|9Z{sRO
zd=O#xHIR=u!)YG?&WKwGKaH!8d=NexL|-62fbcC`X~eB-h1i0thcpN`FM%$MBb>4n
z{e*Z0!l@zH590_+m!XZ|UxBb5R|n!Tgg?U7hWH@Duik*RBc4V$?M7gSxP|adToJ@Y
z74mTPAs$2cb6nkspFnuga^#U7;T0>O8{-IXz}1R)7-1K#Uc|c*K8I@%@d1Qae;7I=
z9zr<(X6Vc~!acV@Chj=&BK*v)z>{?mPWmWxM7#pwU*f7kya(Z>D`88BTL@pf4ZIN_
zMEK(EkdOEP!tozNA0b|Wa9j;^XB^=IT&0kOZ%2xCxGE6G_YB47aaAIYZ>Wlwa9N1s
zyKmyxxcrFY+k0XLt^nfrE}2+~D~LG0*(4sq6+#@}%@R-IvJuBOg~aQ)!ieKLH{zXl
zL4U;Y?G^D+ToJ_aJrMCIt_H;MjS6uLR}67{H$fDA9C#v*cRdL|t~SI22v_3jKpgMh
z5|85QMjX$}if3?bCH>t(d<a($;&?xlXu!1xal9K%{28uZ#PPl^@e-~+#0L=mJFYb1
z_#Ky+gR38L{FYAKjcWjL{LV;h!gU;R{02ijfol-)G{QG<If&yo0%FQ15F(D>XNYCE
zP9l!q$cT-&L<)5gK8C9lar_2eJcFwOaXjZP{sUJf;&}F2%*SORj^`uA23&r`@ywoh
z0#^WWJVz$}9aoU_5zz4>J;F7(Y{X-=LVN>P81Vsw*R28mq+wWxYKY_9L3|%q3~}tq
z#E0vFIpWwCi@(OzhB)>NV!~Qrj<|*JAzTfJpZQ;rs6-`PZMk)e#5iQY1&zp`RE)Nu
zEYe*hHWlU8Vrt3tt?Qet4eD#}OJ~oY7nqIDTI0*p`1bMA*|)E{X>M>fzd?<U);F~@
zN0-jNKbn|*{Rhh?FR4u=qU+b-lk8y7oLD+L6>q*SfzKwduT9Kd-&hxKNwlm@&c&yd
zud7Y0pSNNDY<$tYxp8eYVZJS|q=A)XElI{xiR6mrwJn<4%-_Rp;Y?W%H51XgRJ<{H
zzfL139=$gODbf0Hym3QgQ*>Q4;TC#}m$#xSzXo58Pjoj~P5i%fc5Pxs^M)2IyJlOd
z#$|PN(FEGIwzeq|oo!v^@>z1#*ix2Um7~*=tK7z+`jV>*Zb*#mj*&TSuo>hA_67IF
z_U+l<yWiPw9rPcJ9Nc=S=g{#(qFab+lvngr_Jn&nwsmjo-zIjH?g;H@-PyLYZ|8}}
zPd*;l)v!CZd(ZB{J<c9$Z_U2QzODNP_8;G0alk$pKG<<EeW?GCI1DB|%2t9sp`PAt
zecSvy0y}~`>>WKj_w4N5nci8s%i87N72MUmd+Y9=-Mza@_g3t!-0R=lwy$H~$^GI$
z>|pCb=g^5mq8IiJc9EWjo>)&?&+%=8+njADw}p4q?1=1W*b&>&zjI*c@tuP^ot>dw
z_O9@*nq84yeY?}U2X+tcc6JB$2KU-~YxYL=?%CJ7FTHPI-|>Cc0sn!m2YU|gIoNlw
z;&A0*>u}((NW;HCPDf97&(@wjJz{(5_KNM5+pX=bJKA=f*m-iNc)a5AhF!5;t-CsQ
zk@Lyj<Qm&cj?O;&K=?r9K>A?+!GVLv4-Os-9u6J04~Gxe5Q_nfaRj|ReLd-({+@vz
z|MtN4(Dt4kdv^5h=-ZLrQTe#_xc~9s<K4Tq?&{gKXIJm8(mfS>D)(4>{CnE=cI@4{
z_vAjYzjS}a{>uHa1FZ+z4s;yoJ|G6=I2D2Y!Tt9Bn*EXedk*v-NFNwDaQuLE$bTq!
z$UYQ4wDoY$;oigP!~KWF3HUDPQL(LZn}1tyTgUe9?LFIjw~L*nJ1ckkceXy>_IUT>
OJ&%K=@b}*kf&UGM_JSP%

literal 56832
zcmeHw33y!9mF6u)!sSJl02{;>p6xO&;)U`Okhf5_CG#9)T(Jc$XeUxxDqGcPDQYo-
zF@qf0K^~!Qg(m$u-JOiEjV*)0N;()pCUij@Tcin5m~`6NmF=6Sl+&$DLZW2St@+Pg
zUcGu%C0h=3N22Qc?z`JL=bm%!x#uo#sm=FwvG*~?@)1Ty8S6t#KQF(IeHldc%o|^x
z$-Xf4YjgS>6<?cESs#pOp>XrAu)k5O^*1#&N3|UREgWmof=yc4mTg*Nb6sFbVc|5F
zB)#yHZHeaLU-YT4;^6t08hHME-%iBe+CTKtU-0-BFE#P_iartl8_#bI*47hlHcoxz
zjMaT&3j4{~@A(zXFq^AQ&zpGz+m4bF2QR*}7!d`=T6qbj^BB8~7bRmBM=dD}zdTlh
zj6hORdR~-hEsXs;pnJL;%uUGM4z`BqptY!^N5!ny!JA+q#!7j?MP5L+XAICK(LhTS
z_1d4~LM)T))^@3mv6>~}I)Bv9*bUQA03O&3gc=0P&kOTdBEZ<=Z=<3Wf#@|LSbko{
z;!8pTa0V$7vN9*)ehUziUZNKiaP4G_kcIO$kO3|n3D=^S>#iGcME9GS-~tWJ0IVf?
z&?%?)oiw=hsU`2d+#B>8I&~vsLqD2|OT&CzehYmKU2z>QU%D2TgOoZv2bUk9_l91A
zX$<AxjLYbBTwaES3>6T_z!kXs)AhLg%@kZNpNq>M=HYTR;m$=*3_U{hbRxg)R$Q7~
zxZI3kHk409x4`0ueonYwK~D^YZo=g{B6{l$xV(z4=Il<Si+-TO<<t*Ux{50fl(|YO
zkk$0I^QC%cnM>DEq*Zj_qIXofyn1Khr<xcu&Oxo8n`S&vz?gm(m1LEA+v(CTXAoTP
zEco{8sO~8I&L#&tlkWuN+BcD8(ULw~nSOtqf$$dqRP;)|V}CrBzdW9p0=%bCltz+s
z$@vwWx1D$EV9=u<$ahhqlz4Vh%1fzYks9r%j8|{l<0@uRU=T0_FFG}~9l*$q#uWu8
zPlHI}B|`Q<GItsq86*`&>HL*Ys~U?zt$SQ<7Mli@amSW$Qfd@GG?Sl*$oeT<Er~kH
zdf4v!hzYIe6l)g(YLY#4Ntw${<z+4hPs<9a4<WLr=v2O|=v0NvvHI0$p_y6uY9c@J
z+2wJ_R&w#Ok%U~nc9@G&e~ErJAESh^#B`e?J^IRgSENKKThrgyuXnsk%(&Z~iMKAU
z?PN1Tiv>fiWHg!E6uqh%dWG$eM>ptu*KWT9h6c3At+1*)&yqFHK>t_5tl#$yz2mET
z$LzHLA!C>UgDLPJ!<AWZ6H<x42i9zkRd^Nh!iLAIH)Swo?HFKX=(Ca(Bi5<6eJol`
zaTSX?d0f2v#-dlsTs4qm8tJXZpeg!u9^*HNh91BL+<tr`xP^6>3KF|3m%l~k;M0E_
zbyevduc0lCsAz2?Qy-lvQgIIuT!|SncN^uX0hjUjAeuq|RldX#8ymZM)6`~1VIH-=
zkh+$*@KD<!eI-(no1pu_a)6TVuOa&N#u|y~k=E)-yh%R9jZS5W!W26eY<OOR`(^rX
ze@Qgmkw*ncM_~sD%Vs+Zcf%hSohoyTLfAPHq5|A;i-UK$2ldq9?uw3rtw5|;_}Zq9
zfr`$8wHz_uv97(Wcr*jz4ZOb6HK%=+W9VZTs<2vpd?QBn{5uoFe4J40fij`ia9(01
z%yai?lCSVVlop+;bUE8+!K)S2BP;CqW0dMF*doAu$dMIilEY$^=tyS~A4F?NGsPm!
zJDAGJfud~c>Q`geQ@!aoIk4>B;zS>>v%oKWHB-AvJC^oo7D5}k@#qNj4%<TS;X?hW
zQ-#;K92J-_$fIh|2jd=9LxKrsK@~2_@(LG$z)D;$bYjNIN-<%Ht*)+=OjtLr$!Fwr
z!2_lg2v+n8O5t9w5e285#&5BdD0(F>D`Hc4MPjZ(fG8SIOC@;)w<ozjz5ru({RkG|
zAZm!BF8ZjFr)j`=ql-kV;L0z!60L(}_&Z~>D1$b&)%~I$y^1SAgeFE1PCRMSxyGc!
zCs9tPz@+0^*bh%|@d~!+nv!<;c>n)K_CIHV*wKWmNSO=42b?zqG47S{e8$ySbWW<>
zXvVkS=61vTMZ-+^4;Q0(!Ki&cqQ%NBYC6(8^0`V<W*|5<l#2C5;`=-^#;lvZe&BxH
z%VP7$zw2WCU@>aBesB%F2J2QJd<iksD@%MVHf4Ey=qbu_o8^m!R1@T#EmjlUf$Gu<
zxRv{Kv6}Gl`GU-P4(xpe4F}DbhG7L`N3UQtf*Rv@G|XO!qbuC2`=esU;W$`zXq*Df
zbv7mDATdKsTSbrgA<4z}gUxKRX078FOBJ{&aL3gER=_4P`D$z$iLa4mIe7|I2dFEl
zPz(UAZH<e?&QcNP=IpaS_s?zTOSqhEBkT5DEmQYBS}0O+4WtwBpdgMEt;xn9DC{kL
zeO`2`;DJ{dRyeV|geS{ly?+N5>kA<+7VD>fhcN{4H7<Vk;hAoKEqdGka<vj#6sG(*
zPZ|LlVkmE?@>s#pD8@gL=SKp|<8333qJ7_{vb}46uoec=%2>Ey=q!~$gYfH*b5yk?
zB!9{$mQtziQc{lx(iIFn!Ceb-Z6oueMPy=F|G@DNMK6U~8IaDDxt3|ft&g}zZe0+U
zrIhl*BzRK`vEmXbE%qUrG(2E&>A0EyXDnVMoyD<L)Bs<rk4picOw#ah8q1`r#-YT`
zNg7M{+$A|$`DmF)86N#08NYAb^1aOmKiAm9rp6kQ8e2DRiieXFBe4~F$39mVI!SMf
zW0xw^s;t91LR?po*RL|(`W0-VCW#%2@<9l*X%S8csaVneBScM67=vn!R8lB57YoQ(
zHHK0MEeLNFo5{_mSeVZ;kA!WB&Qe&>X|OMy4ypLsLnlzZ7DdFYk4CjtMz*{RS8iAX
zR8eDmkEHlp082taQ>%5cJ!A0=Wk45YFtO#d`YB_NTu$l57;a_1Jx5iED~RS&_}r<y
zO&IiYVyP@6OUqv-=Jk$#V-r|P@coC!cmy-&(Di?S9y$vgFH?PC-YRoX)H2q}E~|^4
z)D_wMcNUj@_eWu8Ex#Wfh0DJD*B9Zkxxc3AK{T}Yynzt_(~BZvaL^-&9Yy=!Dqw8q
zy1sme-ua|!fI7Cba1OP#?ic0~+Onu1WWG{{jcAn6;EGG_1Q-!uNdjUM=S1snMZj$#
z5G^$ie2QM#mrq>47O$~z^mQE48nezrY*f$yT10gC09u3u+4Ul^0P;|lS9nxY<e=ve
zuUJ(S?f*;E+xcxJ@;;E4dxjMzkrj%_3M;?!EUeWL?n8+rYo#V@e9i-FrGm9JCRN(&
zay70=VQo%+I%~6u{0ks2S@W7iyo!j|%9@s@%C?c^d?SRtozzSj(crFtSLh~5I^X1c
z>FouJPNg%`jWc+|on)rM#H>)56;@_0*ssk*aLvz?%JZ2_`iM4|#2S@4ywYr{QZ-eH
zrsmnZaxqcd4~kM>RVH4Q!mAn=i@&}P1V25LWO2L6BD#jNxLvSVV>U&T4cB8$dqLk_
zjx>AgC7OevDVeM@G3yj&-ME;1kO=<TNHSS(GFeZwp~rf`B)`+a$47%|ssT-5Dx19?
zL@@gABw9ZtT4(pUS_vCJn$=o(qO;P~qIb&G-nR%$&b}3xrdld6fwmHS$CF}u?kt>6
z^!|zfI}2{4CIEksKspOFne7(Yn`O2~WS7ZougGqY**=l2kl8q8!D&BY`tiwgZbheR
zWcE*Lh@Hn>!;sh5Dj9AEq`6Ej+INhyowJLHrd&K3Z~q^Xt>8RN8z<90B@2&UMQ&ss
zd=Ovoa*AyP);aqTwDJ;Z)c7t6Fsp{3^AHm=>Re#FpHL|=13Lc4dja?z0G=sm17Szv
zW`fR(U4^>$feGUk)IsHR<BKH-V=a~TpcL!-j{pUPW}<i_6)!_E2dbhRF$ADR0_bY+
z?&iD~La-5VI6C_p<T3k4^}VNQQpnBCe~Jr@*KGHU#57KKHDD?pY`KiapTY7l=x~d}
zfev5&VKUULw<K`y#tl3DXH3n@UpH<g+!SDOZ)f%ks26s8B|xNqdN<C{WP9b*9`+#2
zIQ-LhwLSa(b?<rdk+g6QQQQ{iH?=(E=t^nSRdnK<n9heh%imi5`snN<wGM`1twH-5
z+fzq~Erf_N_wx8oL|&|-FlQpQo)&Rf%VSkvj*|<VOJXNZ=aR!%t<c5?2bNwOC{$v@
zi*mlZa*q}lor*)@Q#rsHZ!z}Br-{c)8=ooXW!MSfZUHgGcZl_rD&?Eb3UCVMW`F-b
zaLDqyu?q~M&J8KuY|oYCv%GLMGy{*<2&%@%w|+KGCsroX&NA>}y%)0gd=J(~<h1(`
zv*?VX7x%g1NJ3|HinS7|G8aGO#R=>Tx`gJUUP6VcLxvyc9;&~bFg)2`a@s<hyvs1l
zg+!O#26!?GzOXEM5&BsEmU-s^6fyd6R74OOb$<n>#x9Vp=!nxIu@#&`tyh5vsT^u8
zWqYnwoQu05)AhX=(S#hPL&K=xu0{b7gFDFFNFM6Adg@G%{*6JZ@%1Sow(6bO2BT?$
zsUo|B5Iz#3#%TEf)+16~II%luRgciw-qWOAQ~U3}N8~q@?Sr!Ie7!j<M~g^kK2hTy
z8-C>LT8u@5G%ceW$PeQ5le&H;bVt41Dxthasf6NZq*#9wltH!XXbLyf6m^g-)erFV
zy%166Lj>K*_vCb`_2NDU^|ZKagbF@leQ+8uP$;|4Nu=+O;|K=_4jpBVkPY6=$8=jM
zi^6fx@M@XCqWAJ-hZmfr5Z9<&(+T<}k>nh%bc*{0nz&y806O^qWa8_b5c0Dq?@m0y
zPfP3H-Og0=Q7M_e8}eg(;XWG4;vJp+*^gPg<s)R)1(L~ZH(1m*wVo^(eHo${#_Kgs
zE>I)ZZF<-bm>$+6E!|7NZlfK*!ga&3xrOT<`e;UGO3A;Xm5bAp#h>my&)2VDvWJT;
z7sFG~G#OPl6;j8D&O^#eDX+34c@uy@bgIym9bqgJ>iuz$!K|R{$O4b!LGmIk8Y|lO
zV}hk@hZim3*eGe9Ri?udw?oW(suI40JD#Gp|0zlEgECJ?e!GoM4NXzFJkA9*mVckm
z(7PlR9D}E{T2JM;z?h3(%-6{~xg{v>1Ezq6$dRHF4!I+LudT9$kXjN`hSrIL|GlS4
z-51wO@0{PV^f&G|l8w``7rA*v6uT&<>C;7quL<*;GasG89aD4$q~IOn#rllObQZl5
zWv==3xFV(pNRKs#14UTVWg8ZzK*{k2Jg?#Zu5g2VIf#cx@|VRE{7lu|;jIS~PTC<{
z%Cvof+l*=a)RXk^hv>@D*~jj)j<kZIDdd<t3$-m+-$lM7IMxY)Tbw>Rd$$eYThJ+W
zKVLj?>#3q~!tLHoR$E%M@ADD{g*5Z7bQbMXh71fo^gKiZ87#8+@PqcTWS&W-sDl3V
z1G-c86MweAOQrDnP67epBo$;76+u(N*-5%NNd<xl1q}#V#3Tr}oqkt6vbg_$zDH>M
z*3Hnk<J&^xY7#6M+RrCS%y-5dS%;^XNH@5h5=33mseP_q#A0_@@CO|5a0Sxtvf%eB
zM_vK$w(xf-FkU!E+f5T~hR`wjwuIDoTU@jFI@Ht?Og)vkF^)8Jr?uhf<h=OlPhu)h
z5&&Uvn+Q<~7gDPEY)O?^GPRh~!^3)~yd{9chE|DR1wSj+;{!BUTZ|oZ1mP;nkin+9
zV5JnahKs#g<>-K;h7K0GKoBaxkS|<9D){`rK+j+c2FKOqMp_%C8=sh@X(3IE4U(81
zR4LkD47Y}<hkEKi+o_qOm!8+6I}P9wOBnN%xb3`dMCf!GqN0NcLI_PaQ^Yv$H*VAT
zVs-^YTfz2_kMTehdFYA+oh{JAabrIYqx_lWVLvpb;jX7+Z30AM%hY0?uc~-OTRe{*
zcEjU<*12cs2*8IvgNwp|xhPUYL~4<$5TrWt9c}Rfh@MY(Ir2HMm^>5P6IBY<LInPr
z#co#>7Jf$N$K0wokJD+x*=}r>D!WY3MuUkwz9=hs$9i1pk52$_ZY5-5P<u-Wwni%L
zWVj1FPv$TTp%za?$2!0ch{6utX`J~cI=n6G!GW}y6f5D4VtqPGcn@2He1RZX*`1fT
zmtaa~?$*}z&4eE1uD5W_CXAe~QPVJ>Qc)wlGdWKsP72fHdOJP>zuIqHeo;(Y>^+@-
zC@ob{tGQ0F?v7n9xFmHM8^ClzdzmlIc)|b0R#|EfGXsjiFS&R3n0=elzD_#v$@YEd
zG;~zK(093d`0heXIdCZ4t6)=+bao!<XYN~gha*)=W~}kqG3v)#4WwkOAB|05R9PY~
za$`GemT)tslKBdTTd?~q?L?DfiJLGOp*j1&EJtGH%LQfw#=mE1U<hn!ZAJk<Mbhto
z9qnLWa3Fu$1zm!rw=SGa(I=nbuo<L{#`{TWUYcFFy=%r3{}26ztkh;(=A~Aa{iwTq
z`RjBFq>~h0-rL3}zHt!)2IpHknKnN+poC?QgxSYq{4G)8y@&0;d-!f_|EB?LyvHnK
zd)cHO`SYde`|TD!#Zrfhtpc9ti4#{oJ&4N)?`oWAP)x3^Xy0YDFH5U?U%!0JlgN1i
zO}8Ap`H##c)AV9XgMmxS-L^drFU+2Lh)<B-#J_OBqR!*6I_f#Vw78kL9Z%~DTKm&|
zyC)Iz`U*_49Z!mb0qjg#QErS*MJ2edp>b8iqJh+A&z3n#0mkpMTbMzQ*1(J$USbE>
z+(6LLUQCJT2r=JdL)S{E!Ul>l=jUxii?4hg_q*v85)04!eug|wV!wjBhB%bMd7jDs
zzOO3KiVmj~!;AK8ay*CuMQvlLLQne^?fYwm2Ccwf&5~?*xjL)#j;Z8&QdCT`(g02^
zmE$)lD+q9-7P4~5F}}IfLZ^~RCAbfV$AzWkko@$Uko+6OXxr&O;rsgOrVe${(h)-H
zpWjaASY!O^YibNa-|+i<K7dWY9>j1^j~#gl*Gm;p9GOjL;eRWGGF~JCowFZBnkagV
zmr+2s?ojx!S@;MF<x#rJTq?QHNi<6E^canM?jHD!IX8jO$t&F>=Qpl3AmcG<aR+<f
zCs1vC22PEi7e^l^hCE>CT4LxXG)0hvLSz@2?Jc7A_}#HZrbDY2Ob?QW1pD>IJdPg6
z`X8$XLH2)R0yJDG|D3~^iwMV=*CE1wGp`r>+SB7a=S_N~@ujSb)Y3lks_LM`E4)f<
zO0Q$+B+8*vJuk+G3aW5c5_3WkIw^vxSadD2T>FV>=v5bYL@w%y{710fMF}L=NgrP0
zD3HXlJZ-Qm6JJl<g=2Hg0SazBFvd6q_h>&1!wm{JGoM2g+(`;`CWQjRWQjLb_Yg&)
z!i(K=kEJobl(#BLxWYYCz*bHEo+-=XL*y68Ez~G~jMHIw3$kkN0Ni3BLV7GDP%a48
z9xL@?u3VZ8K&^_!Zsc_UFJZAOO}GPkF;L$E6x5^TBc_u$toyu3%5@2E3X9I@SNV{@
zIvyqBZU|rakb}MVc39l!0RW!&0adh#u}KGf`FPMMv5|@#v0}pZDTnP58&1k=a-`C5
zg>-TQOee~8%Z1Z94?0%PIjhunnvK)1zCJq24gF$g+Oc{mdmUfTV8`X;H^#_*xB>2m
z{Nzs{Fec7hl<nYP7!VkW0n`fvy%L)HvkyUYEnv70vouTGD8czbkg#|f3fu=l((yd*
zE}p-Z{BgCfEcnr4>~+Xm=)qp<i30_1q6n;FX}g0~0(|jfKZ6XSTr4bTT}!KqsE1Y*
zmO{RqfQ0DFej^W0l?f5ah&xHJ=eb?*kx0!5-^mYh+;aWmCW>xbGkJ;c(Wr2<-K%ZY
zDGh#7`PP^ivfNDMlg{qMmsB4l$M3sg8ClkA8P=3Sze&L%Ar5rPiR&6}>(FsOi{g<<
zv!G*EKdfahS<BmJ#5j<k9W(lk*Qp4@#*;Wo>H;wumG=|$^=Ii>?8Ig=Kg_2z<6TJ$
zLZ0m`d<>7@8lML`nXJ;&b(E+VM@og|L}d^V3G=4Fh0hAIkD6pn`h1UpE>9+P!!1S9
zNFa?x#dF<5zlSklruMBS5opWg0~}_~1t|P;S*RO{uRtH2vsdwge&gfxv?tV~CHA1S
z%*36Q#NA-xo)owrkhmL7TrY6lChj?a$#xf-xDkPSg~Xj^;*#pt3rS)h1RW+(yvAyv
zh_P}5P4XB&;;8OlS3&JTRGulg=>vG+glqx2$h;LwD)o;@+4g4_GfJ`a=Ua@wqh7HN
zUp;wiLzA4-%=3UqcleybS8g~>ri>X!KR`zuTtb4IorLQwJVKhN=8yuQn7{Wa(pW3t
zRt2Rye8qz3zkWGMR2#aT&hFk3wVCHP;%SR7%^(x(H(o%@Pm1iP2`Tz?3#4|5)S3Y)
z6MU6~_ho=jA3w5@c@pWm3`iFH$kd)OT?jRZ*e;Y^ehK;l#cdhRQf%;@5`KRM(wr+B
z{6{7H-H4aPGqhlXUo7G0XQyvDHI=Fw!7U={#9_pCd9&*G%M$5}8IUac&2~N^EaAUP
zBD=E^$=dz~iMl!~D(7PC_Wy%6;E?<`i0zUKA;!jkMdF{zif{H04NH&l3$X!Bj*?XS
zBfrNNdLE<J4ypLDAAR$;2)!1}A$puWlPwa3BtLwLj9w@B+K<+_1Ewj47@d{5dCU83
z%j0x#XzL$QC|Kp!q<o^v-aeM()LentKJLCy!D$GAH`&DTb5dOv$|9Mh$I(6`99<G2
z**+Gi*e)dXYljr{Z1NBi%}7@LPR)!d@XP4#11DnL)SzJ!>L2kSysc-reWl;euyXoR
zI#yB*7lD6#Ec^^yUPIgJZ1$6sFIBU4CDmnV^dk5TW<ljbXW;kKW5Hi6zbmrX`$h13
zO%~K_{QhpN@tMK?gzfwTz3`UaE7|0;So+kl^uy)L(5SsXf1SB`aX&62KF&?;ME)%c
zk)%0~K`(U>{xl1z?DAyb=Z9H{T$mp?Y1)<0a+=Ott4LD5YSpQ?yvA1q<@6Jh45||S
z`;*MQWP?xhubJev0!{pS%y(&n-fMglFKmhli%%F{<F8SWxG90dfwfcKk7J-{3AaAe
z;g8P#<qi1w#f7F6uJ6?LFj3+j&1Jog#2pE2PpNzFF<Y0*?VsUT1^}Y{zd}P9+J8v4
zpK%>$F}ajva(r8v;wM8s9JHUIJqK9w8D9nmTp>mKK8Hfsquw@HjO}Y9l2vr$l%NXf
z_=v1lZYb{%a8AJShXsAcof5)LX#CcHWG+uGEW`OA9eqHhcxa10G=ir^m%n8^@gisf
zL`&2qZbOWAiQct@wT|DUQ>|~oJ^IA$i7Ti^l})Fzg^8QdZ`Ie6-fp0K_hLYyB{7~x
zXP2SQ?7Z}0m7=rpWW@Rb3^}oy8J+*pTODk4el@@P`L&i`1N^#+UxWO5KfgBOI-cfo
zusIFnG?3FkP6Ig&<TQ}eKu!ZW4dgVC(?CuGISu4Akki0>UIRF~n)E;QZG3vzX%|A-
z0|<U0wyMKjYc>nv1nN%6IsuWpZrxV4ZRtZlnRfi1-{0}rp`qJ)rZ4Wo$syaYYWv-h
zKsd6!&hKy9UKiNCy)oG6Z@_oy7l#9N!Em59y1h9T-QF14UAwsD))m{g1{wnXNFW^y
zU(w$o^jwfr_eE*IG1bAQ&c(O6@Carh#dx`WCUnU26kq9JS5mCXRZQjUQGSJkT`^a}
zQC#9+B?NDeoet)tdet7)e_Z1I7%^T0$zLzy9hR8jseE=Go9$T395eFR498~XxIB+t
z?zmF4^BU?Ey{q%s)s9bzcBq{2iQe=)Hr?^TR5=cz{Hi>5m1A)dj`TqAiXO?kUeckM
z@*kJ^xiY^)##B%Gpn64zV#+H$5?z9$_{WHqK1qHBcL?Q5Zq>eumEKie!DWjToWfJ>
z+w-bi(Xr#Ha(irtyV}97R`OY6(t|ax+PhGBHa-=8rg(?cH?>FoVU3AD)aQOV4ZPDD
z!1E>a>Lz=*1$Kv+<{%0>^4k$Y2=6autO?;7gpCOE5V}x)2;mC|{RrPhAPRZ-$Dw?d
zHWx0bYiK}eHJ>5<(dKY<U2{_)wItXSj8ci3KdbA45&w<`4rP`Fnz9sCM+4zT;vx6T
zX&|Qo(twALNtQkuS836(zc#Q+6M9M;t*f*^INTf_qy9mExGC7QOF;-a_Uq<No7YuT
zY}rs<wrShC^%dpSTg%HfZ7tuxKU4|ewE8XglyBX-sjOTQTDrP&>)qw6?=9c9ddpo_
z`0~3lkz=0K8`o8AD_?!rmepG}ZnV$`+4WntDYD6SeOote*}AE6(|zUD6<gMoRd3l^
zR=$<7tnK>NRc_F$H*NN9*;=`647iP3wr;RUYp3^Nf0MS<qb>6+TgD~b5eqidt<vU4
zq}&e%o9db$jA*;DzX&!rq2}S(5*Y|Y^%r-lmi*#oV1$GC6E^a;Nw~$4Ky56nO4G_0
z*9CUOb}3?3JX?io7dsrjmr*FyR;L|kiiRHo5&WX{fp9>3kS^SwB3fN646D&X{%CDI
zC3eK38lWNp%@3g9uBK)<dd*!I3uw`1&9skHeXd=4^Ab*9O$yMFw$mSM0P2ImXg$b>
zqe09x4{82Ts3C}A-e4f2EnckocQm6GZ9_*|L$kjQX+e%z>6t7F!o0mm)ZbL+57%j8
zqo?8j@Dxgb-eJp7UyXmstF}PRAr@j0YCjy<6>IQ^C9zv}h64fK%AfwFDGJ@m&L<5j
zj%fmi-h&VOqv#UYS#w>iAppD9n!|O0Fy1N<KNF5?jj>qM;*_HKd@w8m;v#Ja_ROm^
zPs@DxGHbhv)>ttNkrWL}iuiX2@Mnb&H8<6fy+P+K!Nypl_7}0nkQNC(j3zL?v=7mh
z_@Olh;c+V<0o?OLH?P)`6}tja?ZI#`8qh*mb_63dPAz!hW*FBFf9?I*ZE+4`Sn1UA
z1yMCgX~|2W%zBk?Bvu7*HBSRa#spFwXbHhWB{egz%2}*79Ho|2hb6@c2O`Z4P|@7^
zkva1tbIC~gLW|UAj=~i0$F&m<?8b1{<f4v-p%~}pcrvNZ)%;QDanAe@Au2~gS@-<l
z%~C$aMX)i1F={e{f0slL5I#pv;>bUtRA^Cun7U<tL^iMN4?@l5EhzbAb1YIHXlPiz
zOt~?Pf8v*97AT5M^F)UrwMZb)7$GU}=a&|<)%-iL0!8c7G|dg?7Ntq{A%bfNHr+2A
z(*l#C>8TrnI~HgGe;95mtU-Zfowd!4jp#>04BQUo)Yb=T?<cl)HitD+N~@jj#EhY8
z#Hb@3Wc9yELH{@htQ0vxV(+Ws|39l_JYKeao8|w9ju-L27`|T0+j5C=$15hL-0f1{
zgO@1x@C22+N6OoGiE?Wb)Xw{*yyq@a?)U_idr-<de2H>*O;EYnYr-#;$auVNc6fry
z?UwR-FHvsaT@%xv`=q>~OO#uipmMiMdAl!B?$!w^cb}AZ;1cETouG0XQeNkmFKwI-
zPf)ovDX;eu<@Rj3G<}VC-gu|stE9Xwmne5=g38?`<?X#hxqBz5+;2#E&t0P2@3j5>
zXVLqqly~?&CO11R{E}0~B{EiekNYO3-%|W%ix){bOJ(e}$=y0h<@QNAt7KenlY4lQ
z%H1mE?2>V}P40n7D)$$poN*Zs*yLs(nVjQ$P|7)Mmp7Y3m?Y)SuZaFEk?|xE>w;o<
zq`cnunA|=oZ_Rs5?vRwXRmNR5`6uhTrANxyC*!zH?#a4t8IW=g%6LS^#d6*bP11R+
z_>A!9nv6?j?3HqNPg1#kQqCF~hh#h~_tm~hDtEh-^Pr5?#OL|5)OA{q(o4+IO3%hl
z^k1Kpr{5-bw@vPIvc6@K$ZaTj&!+aTrz$mHBI{cxiQH}}PpM7riEhUi;@>CbtyleN
zlizbsYQJBI-bAVImU8yWxX&i{WL>xPOF0K+JYtjEH%a@uq+i&vTgF})Yn9TzC#l?3
zQqGW!C(8KzWBF{C@^;I(&nACplJ@tYlJj+8*P4u#KD#EV+`5#r$|mpNBwd%Q{;Zes
zw%FwMZJnI+wvxL`%G+&|yLghz-7Dpd+vM(=<Z=&4c?V@YtmNM&?7UaT%04Db?EI>b
zuSCWk8OLRRhbF1qx|Fj@#`QAxN_mGTsobqn&Vw>mcI;E@R8=s^;$A6lzl;qTcS*T>
zC+WJy`A>44CS$jZRrgNTeQ2qa(<kG48Bg~8SgVxtpp5%uJRt3SV3OMTIVtCejFo+B
zcTethYRMZyzET-i$+$+!Jv>SKyH(2BE#rO}_e!~oZRhC99&+)-)PQ)eUB04=H!PJD
z{B?Ix%!>$4yb@l`q0FpApn5A6Gi#|22gIAeL;&?ND*y<eUJn=4>HU44#k;>j^~$em
zSG)mip&R3$P^soG4l5CWW+|q3h=bKlfd}bb_4;u0gQ^*7$5Jfdf)P|#*9ZI|@VE=F
z{F>05ue54nh3HHD;O+2TO@TUrlvZrvTj|4!0C-!mKp^@G&U~d>2@8-6)f_PcU;b#S
zJT|udQ9>j<8za?L#EjJvPx0Bjb7v$F1sRKBSopM6Lk4ahoNbcF%v#Kl%B@+v&n%FV
z{0Mw2|LUtb*3S<Bo@WV;+nofG#zyU=*_kp#MUPrCr4!8(o|2cB5Ph>me!s{1K0B(@
z>{QeXV5Li?8o=9&L_4<9tZ=fo#oPGYZcIHBAvK6C^(p#>EMgE#0JNjJz?4^kr09t&
zSyAQfj-~(P`~7G@={<=p?9*DVK8=*rwSZ35f09Caxu76*Zvt|-ly4G%pJZM&%eF=v
zw&BACI-G{72Wy%AyAG(^2zO_PH_I}>Zw;)YZ!h}sxAv+Pp$E`PtFz;qRwH{GYL%8C
z4Tp0LddiMcdX@K=>edtlt{)qYsT8s&RmXdKjDA;eDWiwOXRNWcD?Loo;>>pCw<A*E
zWf_T_UM}rGwJN=o8YF3YgIDBqZ175b$?;)w#1T^3H9esiT1hD^`ZHlth9mi#w3e+9
zncGQI7xW<7uG>LhP?dVIl&Mi(Ede-PWf2OA@FZzf#NjMu!r7`?*$&x;B&^1?g5db_
zn;%qW%bTW_9QOiK@@Hw8izV=tjZvGDf*jMTSpg@;IWOb%%)Hrb(!MRaGWDl=#!_eY
zmQ8n@zJj;arO~t0D^5(h7F`k^?1PUyqR*?OahdR@Oav|aL-8@5abne}osO+8tsQH<
z>JP<3%J@^(XX7&ij47WvZZg=ntqqG>MgM27S87l8zu8Wz$))sb7ML`BWPmdpB;edH
zr-7UXavI2KAg6(x267t6X&|S8oCb0l$Y~&_f%ljOYA$E&IRp<rEM0sBV~-&eBi)O*
z_DaSyq`MIR5TOKV`V*kPL(q{PK>Vqz81o@Ld^KbDm7pH!R>Z$T7!HHhHH>``!9aQ#
zapSd&IRVp!_}d8Qs2uUz*D*GNwD)?(K8-MlbT8tcBX|MNZUB7*H_{=*C-H6EDx~B1
zY-`~>#!8Xa5Z{S!p|&DD`~k+UUC3Aq(jLTjAk-l3L;P8UdZgosXD$Lgf<c@>IES>h
zn6bkM14s`dzULOkdI%ozyrqmCM7kC67ZC=L9zcBOGRE4G4k7;Ka>$2t%?ifeLg+_&
z81a1{WULSAR>Uvd3i*&OzKyXnrJ#+pcO_#-5W10$Bko&;`Y2>y&Db^shI9zAa}9I_
z7!Tqn5j2$dB7Si#>InWrjIBi|LE49SAA*i_H{xlxgD<2#h#y;rdZab{k4VP`=mhCu
z#BY|N9_eCy4Lyo)q`Q$GK)mS=^ds60A^uApI!E~+;(<-TLwWIs(axQa1LfU_AFV(i
zA&qZ?vL7RakjD2i+0~oTFG%AXlI#wIR;2OWRJI499cg@PkiCe|g*3jm$OaJ(B8_kH
zu`BKZZKUy?Hntw22Wfn(j)f6=k;Zq-*fE4Yr15Pp_C16+()ivLo3jOdfi%7W#kM01
zAdT-Lv8NEu5j^4_Aq)~cVy6%CB8_)j*)oJ-r18EdYd{!58qX-P&mk~;4;tTZV7DPS
zk;XfbtRA5lX}k~1o<Jx;8t;g*HxM+W@q9MBY%6q&G@jjMYY;q0<N0N_2cZ;cJlo1n
zAb63+bC2wo2s+Yi8)J(Qd`RQDK(-yB3TZqO$(}-}K^o76vhN|(BaLSU*^ElmBaP>b
z*m{H(r15MW+k?=GG@dtOuOhS~jc0P$Wp|?tX*{RGK7w!%X*|2Z{sy5NX*|!sh7o#@
zX7?~Q7oitvydTN_2SOjxcxRAJs{-#-j`)syp?`wU{c;+}Y2Z&n11+BvZ!JGA;}bG|
zL&iUl@raDCctXH0k#U8L-)&(A_&@52R(4XGmb|s?i6YOIeB5>3gg--A*AxkEi_%|S
zu($G1mdsZ+-`y0fZLSN*YW79}>Ql-po0H)1>8zqId`BQ!*3h8i+wk~Tq`2d*s4v_c
z#Xk++6AVXV{)Wwg#%B8Ojk(l5VDF0FBmP0;u2|y^q!?=^D&<YF#y}Xi$}8~S4S~AN
z{9hU(>@wouBe6jEq4K8P!Ekd^Bfjl_k3Ssbf4KAjVQ$1jHRbgG9vhp(>+0(88F|pO
z-%YpnST6miqXGPPADBUCP34LHvkP;0hVrTTSd*YG^pt}=B3wf%YA%<efi<_cG&ZPz
z?OD5E=@JkA+Mx-f91dXZg1aj>E-qc5i9d;Hz`viZUGPvKvf%a)6;4~@k3<5EJMf1!
zAkY+9yC4>BS{1?HJ~a9xiyMQr;pRy5&gf$NFT^T;q;bjar3>&6CQZSefruL6qBW4x
zv^CLiEE3(+w6j@Kn|lFj%ja@DVDkS73PvB2d6a|$55&+)pw1T#?#4gt><UE8N^5m_
z3;tq={`I8-e+h#B)uHR!1^&pUrrpi=2f_=qSa4l!E&RpW1v~u>k-!4&7L(4JTe7#Z
z=9Uzm*4$zW2lO?!D7_(*(i6E%P6Ig&kf$$&8j6pX9QPe}K2!XR{tSE8`K<TZk!RV7
z(i6icMoxI1GoBlM&i(x0^TzYq$#W+MPXeI}`(Q*R-2>g{x{IIce`??<=b`wa{zL3=
z-{JV-k;A=5`i=}A>3O>MY2)ecqdi9lj~+bMeXOhJU{Cw;uHy%f_Z)A1ru~_&XS$zh
zdA9Z0_Gb@18#>W)qV+`AiTdY4&$T?){#?!T_0LzGtU1ZLd2`IyUDd5W<$KC|NI&E|
zRCB2Gu=lWjxazRyNa+#p5&ekoi2G^J)1^;)pVpt&j=GO}j+P$v9xXYh9rGOX9@CE%
z_muRwdrEt}J<j9B$F<|0<E6*hGtOs5xWpyT4s)4{PZ(Tk=W~Nx?vdx%^XDM@0GE82
zWbb9{aYX%GcB4BE>CZjY2k8e6^+Njo!#ziOkHn93KTXp2Jsp4g;8D^*@6o=aUB^fZ
zJ;!>FwfA)OboaC#7ux7P-tr9T<KQ!)XN5kxo~=J2G}3;e=DB)kr0RLnNa*>N=Y1zh
SFZCxw#7*v()4(Nb;Qs?c9K0F;

diff --git a/depends/mimalloc/bin/mimalloc-redirect.lib b/depends/mimalloc/bin/mimalloc-redirect.lib
old mode 100644
new mode 100755
index 059fb8702a71277ea4eb9995e0826eb53f88f6e5..785fa4751353bc3375ee9b77b6942505053f63c1
GIT binary patch
delta 99
zcmdlbwo7b-1PgOT?vlyUEIV1W8Gg1;&f-v>{F}vr>1X?9TUK30mKp_{x0CbOCLm-x
kIe37wlWke0Ci}9-ve;fa@oMrq_8l+<+EB^O8#y|e0O^V&+5i9m

delta 99
zcmdlbwo7b-1Pk-E_CJ%QS$49>GVCm!oW-F$`8SIL)6UY(wye60ES=(e-b~J8n}Cq*
l<lq6yPPS#0n(WIS%fh9;?*HU<>^oozw4sulH*$0`0RY)`A~XO1

diff --git a/depends/mimalloc/bin/mimalloc-redirect32.dll b/depends/mimalloc/bin/mimalloc-redirect32.dll
old mode 100644
new mode 100755
index 2892d459fc5302190558bb941046049b87488271..92578f240e430f5baffc000ae3c366db690fb75a
GIT binary patch
literal 38912
zcmeHw3wTs#o%hKNrZ6zm8ft1|9V!TwOD8u-GPyw+1UCaSDN}20O9GiN1GzaD3M|<s
z4y+l5JmUAEvVL_Jl~q=|E-DMC$R>z^D%H?sD=NC7o7R&~R--#xr#LkG`~Tnb&P*<(
zU3c|KzQ=i<lR4+T{NLaEzrXJ}b7Fh!kdmP&N+ynx5k)zJZ~9d6-^u^<qk8VUzByMp
zdB^kf&!km9KYx?k<1@8-Tef-YnoL{knwwkvrY$a$H_&YIG@I6JeAv{~Qtw(mXU?nz
z8tMNqY#un>oOfCt-}#mK)JeWJpZ+SoHw+e?`Wk=dojS$eKR7ME3;4Rmv(-&~Z->-w
zRg~(qEXDouE8Aq7ekFbW?6kQ{l+`GCL6r8t1K&m*wR~;l^K?a-!I#Nzr8Z443+3rb
zRTg)me$;`##aC6WqFh61^%g~0Ox0CsN<X@e``FWzV-P@YEsk-OlN7v3`{jPuE<d{e
zOBMbQE}AO|Ipt%*Y?piM>-=@VNJ>zPgW9ack@Bem`sJdTl6?^stvJ@<ct4JmPnDu{
zFZcSqTT#Yy#hk$;MfpD|jc{5;^t`Ud7Br-}E8qc-dw5(sLj9-DACLpi@Q|a+st;M?
zVO!i0cIs-}rdGwM*3VRw;068mS!yXH6ugjm(HbWh;g_HI&gGO3`hWKFDaF{^-iN<R
zu$(Rw|J%Mny1wIzVmS8^s@UHh$SmlNWSyalR0`-H9MXraI!2%m*<xX*G31Pft;V35
z7Q)}QsN%m5;KI(>f%MKaoCSN*LVO)OpB8e)BG03{#KrV<!8V-|xHs6QR|0ojw8jW{
zWF}5V@CjREk;k}d<{1JRu?5?V%1$eY9ME;zM!*B6s|#E8RPaXFspkTq)G!%N*+vYf
zoNrjZ=hqufS#fTAV@XdWGxCoG-4ck#BjT^dy2u@2YdqMENfECtHluG2#>#NU4_Nh`
z>5-SXC)#6N`*tO4(>c_0zzZp)FpTK&?9wA2nuxA0!xlH3yL0~w{s%jREZP;t_ijus
z1H;ZC=^QY2ew@U>as!^vQ(@#=qO!Mx<(QZS^D~=9^y`Uf{u%gd+_}JT&I+OW=V0na
zhk7>{2_4yPR`ud+ka!-RN0dX(Vd}nf4KNhE@Y{gC(>a3PBf;1mPwNfmY$L%QbI3Ln
znPoWV90{IZ8FCJRr$ctN2P8mLb_-c`kyB`I-2WU6>onG=e<ND(M3z{GL)K{67PZ)N
zd<#<Mo`bg8HL6cii?Rr!k*iWM?g-mrtWr?D=#^JXoH1XyMlyDw^M{xMDFM%Ai8B_q
z4rf?VPHgHtK(%4#a0YbK`bH<KdgMfcdC&pyFNwvQ9(jN%AF$~<nSvlo>c#ZAQZpqX
zbk+x*;hYY$UJgw(oJ$AW7eG58WoQa&ELQ^AsY=W9(?>3Gn>6k-Ye|o$Lo82dvfi$K
zRftM(4W_TJ0jurmPq<hQi-qaLalxj;#vg2pk1;5!hO}adDTBTP1t9-9cz%el)2bI>
zA#=T@&;Jg(I(27_`VmoYIM)rK>McEiEDRrc2WEmfvW@6iDlle@`Yp|}K>rc66Aamq
zV8|L!wb=Cj#nk;&x?No$sSk&3uu+V6mn`YF41-}djXFpO>y8{Jx~E`us$h)a+%VB6
zYA?!?OG|zo?tOB!JqCx!RoK-!p<y9#!={6Sg1tNAOgm130%cs+s6TmwY?}NXP0ar;
z_#-<oipnRL1~DJph{L0t9ph1mzij{HPVbjanXOy!WOicEhzb%3!6f|=@IJyM?z^pn
z9Q-T7LGE)F`^do%UmF$n;!lH7Z`oDCz+u?rD$V37?dk!+CUBSBrbFE$ulp>&fjfm~
zfIg5r%^`;XM>ZE_Z$Rncd5p?a!Gi85QzpgwtV{9%Oh7li<$Hk{Kq=G+mVz*WOSTN?
zQ%nh5)p*1DdJa{wReR@QU|sO_$H*;F5HN+D@yJY!PILf%95aP|JA&nx;0BaHdSvOC
zP?|}h^d6odh0<UBjzm8ylrnyk@UK8<SMR;aZJ7C4gF{f-i`FP8C>&AuKWEr?8D%Lx
zC2R0oD1fGBIHL%V))DwXHk_#7Um$Dn(`Z194aOGw?*i9H9BRFQGPvi>`aX#Uz1CZ%
zi`HR6(QCcw>9xLr@84-8m-z1h-$sJ3n*xgtI7d32Z$R5KtWixvqHF=cVjUr^9-PZq
zsQt3QLQo+Gb$jHLMhfI+YJJNLOUbZB58R0$61HltoQB{39B6-yTO*3x%-dTix|KY=
zgwYKm#*jJReyBiVs6BE<joOTEPCBD9?npE81>TM9C3rqF<TN5#2(OEWYy)BEK#fYN
z2P8i@J26NrB*ARkMWYesK;X|Q!|2XL))TfF!;W~!*)L|%8o1AmtlOyG`mLrN!%AQ_
zM51Gn+%ij2ph=`!{qWuDEL2k3qf-8lxMhdvZ^1h|-+-rA;dJ^PYAyrIjs!$U4}l>?
zsSi8?48fkv5RhOttK%W-P%m=8VB3(=HWz2h!nUE`{+J>+4Al7s40Q&@KuT_gX^>kr
zWHR>cv(V0=o@C(J5sKU+HR{V6KNj5@8A%O#DV8l97TM<*qbegtT!<4R$f!OoNJ$qk
zK0l@W3v4HUmKL~+jchHhAr8Z-OYqZ%Q}g;)q!}@R!eIFT&J_O=v`r7pP``pK_z=!B
z0(!Lu=Y~_=P~th{u1DrkQxFl3<h)*Cz`&al9XS58anDj;h$8nyU`R8Z%A)ZS@!fqD
zSKAe}V<Cakjp|PM1N^mUlBPZ>n*5%znE<BJOIPRqZ_w))It+G_DZ4Xq(zU-45zg+u
zN@DtV=pe)-0J9q-g^ZFo4%ni|wn-iKzYr)G)peM<el4{t`yT2#EV>RSy84SaLhZN&
zKXG^t4Glr&ND%rDgVLj{Av%N*Sj7+#AWB2{W^JZCN2Lq46+vG`%14F*XitxVmP-WR
zo(gS1b{!C12a?d{OBlt}>k6BI27}kfG+;k<54QDlVs%~8x-Mv4Prxwj-;9;{C@AZQ
z=)pTu7)%=uJd10h`?VyLhsJU#c(Y*d^6`ZwPv0}H@KtkY9!0oOqd!ig&rKcusvP~Q
z82xH;^hss3mnfZljqF)tP9G5<=JXNCU|SzE=dz@KS<t`SX}c*PeS*YZ<331){v0kb
zp>daFmrLBmdI{l?;vbUfqHj{sj`L8PgITOL&p~Z8O2>%O{8UI6B%}*OGT3&3A$8LQ
z0qqv_yFWJ!TNa?Yh^WJTl1RNGR@1@^&dN?_xs&rOEr^gBK|hO<%jSLa7*sbvX_PJ#
zrGx*O!Y7s#4S$A62HVassFRZZNkRW)r!ziEbk~W{!>N!?$Sx<ii|s^GbnhIi4lpkm
z%(K*xhJKd12HT$Hp^r;C$C-}xc&GK2J4(Y{Wo9DvIZ90~T946Jm+hFN%Xzd$y?ZtZ
z4QbZFu=N-M(@|u@2W#BfUiADl_cUJI--^X>AxbXp_v360pY6ig<9xOkXRUN*Z9m9g
z`;PKgCk+Jl-U54P3s#0~&k*uwM2+*7n9-3FU%@gM<wvMIY<&hej!+<r*L3mNcDH*s
zR(rHA|Kxnan-j7g4z?Xu4Ew%=9_}+3FYG*AqaJ4!)P0@<gceb<0pTVf&|=7;Hq4>^
zncsv-lL}sJrw~BYDMCXz@8X)Cmz0Yip&CLaL%@gLrLhWe>5$^bip3fS-TTlpPAg+~
zA7H586+y9=BTZW5J!qRAc$?eoL*3tLb;#f%bKHBW=#!!-83_&UBUFALYg;Co_0eUE
zY-atP4Ac})%2i;*o)5AY@QhY6x|)%BR48KS-7>7sp><Lsa6UmXQ^X@l;x2KLMjFO3
zo8<9Um!2~IVn0dJL+T3-U(6ybq>*Y9M1ut{Z7Kx}?plg7H-|W-iuhy(VU1!5hs7K1
z3LyQ#u0SkU3Ql98hIK&X7rboK(LPiO5!p*boFXraEO*mT?yCDq6|mSVe<w)`i$BU6
z?nEDl`!KcN&x0m*tr)t*j|?T51Asq<(<ueG9$W8Fm1Q(5UQhA@&2WYktEV5ENb&HR
zv`i^15&yTRZBHXXuqNu!FnB>rMnrwb&^qu6qlBzyA<mGkyVrUl%{|};?kBQXaghsB
z9vGOJ-#vJU8asz-)H`Jz_Ir??Qk@@l!M1G0zlhduoRkiO3`tdu;e^sqw=Mv}Cx63!
zjhlhD!$_QI{X85zj}4@Ouyr70y%x4zgE+M1kR;fT39uvT=PcLRA97xXq?TAO^WrZa
z+?@jh{Sq3{!g$YOTzm!>nnOH8sfzkhA&r9P8bY?dZ&DJ|5OTiIwV!H3)~h7yo(1q!
zeKqP3TQ1g+n3RQ5zjcKjHxvciV^G=axtIz~?)qY!kOG9Q*TLtjFo|f5yO<{W{a@2W
zv$<<d$abmAc^0iMaVxbM$PPuYaS7`4ME|JWZKr<!m;1qe#KK}Vt1W(LHA`M4X0cr}
z?0*G_4_GfG1rB}Lu3$G&$~zYg#>m?NyJhXcBoh0!5WnG^9(!$A)h+^(@aoKjZ4-9g
z$Q9P>K4eHUQP5kZqrG971}7An?K>O$4cI!w{-^#TW(ZM`6U;;I4<{J14nxk^55lb$
zz7*Cuv!HvB?i*m0mqnY2ut}CrJTk8Vcp9**gpjba5({=OMy26&04tBE;k08$joQnr
zgG|F|?De$Swr9Dold{=j4)yvV4N3`VA!EYMSuDI7>+YcFLJE&1Dax>;(;~_;XloH>
zH-!C|G20L9zb=i8ve%BG#k6HkGuFX&Y44jR^IJ?phIcTcH`A!N6{uQQS3hLpP}5%}
zWY{9bw4!I)(YhgIeNEJ|7t+;qS)+FKCMTadw+;*GuC8l<=umrkR&pDp3yP=dH&xpW
zr)|+IgV4cP4VD?tFD7QPjqbgR@ReBOzB@YF;-vRp+E%hNqx->TBe1*#up#RJjNr-*
z*oXQ}8W`oTcI_wX;7pfIg>m%Ps6Q0Yh$#5jyC!W!;p`!)j>6w(vw}k%_-+!ZgC6t8
z@IoDg`vA-S9!vlT*vGJ4t>Jn&rKEmzp`J;>V?dD65Ozc%%4=c^1<2s&Xz}?0zJ-CV
zNf+sa4v|;?Gw5z`7euw1e5C`M%6mlb4C@f><UzfP7233f*;$-X+Lnt&a#-u2xv|L4
z**Rp>cHiHR*{YNN9P2kNv~*!T%&K3$h!vV_w~aWSK_<m3SJ+F(P!2dO<hx&mk=WH&
zej#*&98^p?sGD6}%Wh5w0mN$5pNq_+3;gPWwv*+n-+vE{#Y~f94JQS{_PK!B_Sx4p
zdyLZEhp0m}0S0GfF?KR=$FblZ6FfUabA?0${;V@O)ODgG_I$u{ZJ$VU-nc(A%*}Ef
z>U`0x#5!yU9%9L&YACEf<WOg%P*B586%vQ}DMG7ZKbwjFjs-R9&qM~oLm?^*hiwCf
z)7h(P)T^QbCPOYEye`+Fel?|Szu`3bihdsLNJ_<Zc<9K?!HvisCla5~S3Mct_B8dc
zv0R4G!HqQUo!{W(?TQj!GY|8|Mj?a@D%h4v-6v%J>QpC&OjW=6+v#SIUHvv`FeSds
zVh-LjXs)aDnuxeRlG<T3MA}TAP;LkY%ZDiM3M_S-C^Vm!?o{k6-|b$?0TzSgu+P_h
zo|<c&{BP@mgh^*eS4QSh6_PbX0GN^vf)3ru4h$JvbRj(#Ap9a2K7M~CIArX#jv%Gb
z1^d(d*c{OXZ@dw*=}-vk)gd1SX0~iGNm3t{Kgr4OQ11}A6MPbcq_;SSz3<@7s?+ca
z?jtm{5BwWDZ5Yajs0j(Ux^I_5{h?S?NS8pCRH|(#Ai#q9CWrcE(Wb;2_00lAXintr
z2ssPrm=4y6n2^JsMQ~im3sr1Zal`35J8s$@QxrdJ9#=YtdkrD_?n}ZTyCZoN96@(=
z8MzBvtfPb;Iq<)oVo18(-Ab)Lm1qq^Pu?pb2O;DO0*2G;=q^sznps#@;64@#D3ZlR
z1`fTB6?Bt!Q~0wX{PiIG(M?e7uP#QwfX@XyWC1;G#VF+Pbwc!|0Bak@-I1qqxdtBc
zlcENJt;DML!KXzL+P*lE0RW!^H(V&ON66j){bqGdI@0%s1K1v;WGB2j+pd;rlrbdS
zslG;CA_|ra<G#sQ<&pD;L;>oGblV#7{O-s~rc&7PlFYDT5EW;8YzX9*X!mB!#uC_<
z&{F2FsmnSbCU9XsSuiKBZCQgSK+L_1va9`aY?T5TrKRd$jcU3dP2p^q<w!Ace>!Th
z#{D0LqolwP_irP+$88@h7bscc2#d^&mJvvALXJ#|YP5&|XJR3kSTu~gT+o<k*n$0G
zxI&~as7Sb46ogi15(5y}9N1=rQpC|QF*O-qwqr*T{M)X$`ya$qO0mzF%<wS(6KTox
zMCcn(WP=|@H~>8y0C-;n8?>v>nxubI_KsVD5x~)7C-gU0+fCCXA+$N2)`65Zs*7(3
zV|fk*4Ix;eKDaAW@#n&)K*`gw{N_8Er@<5ytWLLF+M6{v1HlIkBy&)qD?xhK^>5Gs
zEH|zoEg_pp4-TeTt{A##Pl#{C;!XqZkQ(-ViwbPR@@B!AN(hjwh_-)%uRs0t+Z)JJ
zAdf+e*HY<0H~LV0$Ll?4{q$ULUfjJH+`u)~k@A0~3JatL17x^B+qQ&>-gsBfjTst-
zQ>)X0{gtyXQM~5H=^<NmP{&l9BONz?MPzI|ayql&PRseWa>#Kc*l+0RM?O!;4W}Gw
z!Ivs~UYarce4->BC9}`dRJeNvyv5)@fSdqMal&x$Z}^%9BGWK@>|^*VS|<j>O+4Jl
zM&wcj_?bO7?&2*m>^eaI4X3h=JhXoH_c({U(vP@oIF*@>dG++qn0-mxKg&oK&&F>0
zKu6nva&4~Sy&ESZ|2kKB3ISoDV-Qb@f&F9)U@7z+2BZtG%Y-Bw;1U}`nGR%XeA{Yh
za4zDN6mdhyI7;i-p7rbsqnxI`1}Q*@9If&>ZTK;JTUcNmNiD@LFNNkeaKfGwf<O=<
z!9w`2QDkS=R>0wNta%B0kvG3IH6N?r>wf-w=yzd?e)l6=f>WYLLx#YHD>tNO8M-pK
z83lv%;HzmR&S68>FtmsgCmWKQ>{a_;FzowzqNE|5y$aKcYnIrHgrV2^I*yyPL9bAh
z2*#d%`d+yZIbe-<u9-(`YLHL{SCN9Aw#7SMAHnwE)0HU4_$YG5dv4A!oH{?J8<(;(
z^`z}5XvCa$S>AI)>0C1>HuxF}s9(oTdJeA5LqnI3z<mDVNl-;X&I9$lj=hm99pCH6
zHLDr+@jExo!D>#9I1zE$l!J11e6L-0yVBpeDJwSEfosO!L;417#88x`;T~MitGM%d
zeh%43Dt_!N^r*maDR`r@<GFU!N+am3o(Bs<E#^I@_R33CiK!2aLbu~e2C+mKmWbda
zG+4Gp-eG{8RhF|Fwy73dv@M4n2JY0eHCWXHYqDaUnRiBhB<vkGEeCHvGs$y;ZbK-2
zlr?DigI=-@&0wOl$|IOZz{K-}JhakaH{Bhk+j|*!(4sNomV6+6KBYHyybdc>0{2M<
z5GFlt0cMfeQsxwktc(<BW)I(rPT6T4H&yDC%LsVKNf*ve3!cvsCQj*AdTL(5_AA#z
zr1q&#MCse|g5Mii;>3+lZA8N<UB~OR@lV?!cvcEbPcNtB(a+CEWJS)w<WpHf^eK(K
z3y6ceaybC&Xb%Yc81Dp$@akN$_h64ngr^+4y8FjuzS=`p=#S?suvcYZG5`oNnbaGh
z9)xn0o#~MVw3xZ`9ouKp;?&(q3B<{3Oyr`~2*ZJSB8@hN*5!&_0CrLIJP1pfa|ncB
zg!dfK3_Efu6%DV;Aw+oUpho?LAV%|&^GN|xL_o0hco)c0PrHiMB&{MM_ioSB9vmy;
zL`}~VMh>A5$t^|DBPR(G4!$jnZYkM;%tuGhJ!^1)=0s58xsmPamjFCxl~9fCSz;8s
zY7*-Vk&b8W{Sfk%;2^XoPK=_xFhG5V+vt<37sp1(ATpn%*2P15qgGEsMtwxP#3LPa
z`Ff-XgJLfg1J|hU7Zj5wfF`pB5mbU|7WZQdh=(#~iRU!3_TD2n5Ji7%lysB$ir9sZ
z4mC2rdUJl6iC?@dZiEBHJjLR{p+1TDlU(^2_P-z1?tTnNqEk&j;kbeI?GwFNn)X_6
zjPzPxa`syP4d(;6+x{}XU%~Y+^u1OU=YzIh>#JB-MV{D>lsS$yKJMVp`Vng$s6Zj`
zyb%chLOk4o6k!m)S8=N}BCV*u!m5tDY=JGk);>_Yf)QW92>*=ps~GWLaQ$MS*ZLzY
z>8_#d$Ef=WM*k_!uVeI|>9)@$&huXAp%;@QlO4~st4)cKBX#a54NF@)D-*+3_aboh
zTK^rx{1T*ph4Wzyi-)SLzXAFGz~rJ&U~LS+bkQ?_%Tk7*UD!J?-^37O*HT(OO1qsR
zy=5*R_;*4nceu%(hLY=PzPCWzGF^CRLH*b;3j}GyuoGzmQs5W__Gar1#DV03gXznB
zn5MuCcunl>(KZ@($`Mt#nAF!@_!QLd)K6*PY(y&zr;wx2Qc{mCdKM+{Gr_W1*t-5S
z@OZ3TmchHW+Li!T4Vi8C?6AcalMd{iWm5dJ$pk2+h(&HtwV~@#QciGjceY~Ke*|O^
zN3)SX>_13D(DDTqp}CYbypx2DKQ-8<Dt@;{`r?{dxoE8Huwo=yny8^oX{N;00In7%
zu7+^6R2toT00*<?MIo)P$O8c@uaSubUuR>;8T>k7(LnC|0xob<if*c6pBZ7=noYSq
zr?Vh+Cs>Ic`0OO?Tb#vVJDc}6{T`;2qhMEpR%LLv!`MAHY6vf`Ny{bq?r>r<wEP+l
zRU1tb@G`961%0}sHO%gd@Fxa!KSQ{G$GV+6xE^jOH4w4)(EO>1ci8*4KhAD<y|4!1
zCY1nIJvyxal0qLQAhwuW*+qT=yL#)`2y_VEZatNOk!n<w!IGh+LsCnJFdOWM;?4|8
zDKN9{s#JZzrajX@k6Yw|lX#@gu<ui-QB`;;<T&(f*++3L8E_{J?#{u8>fHh|deK8%
zpv})Z(3TfP23mRyfJd}&rqF^dmH%YNC*0gUY*l#J2KT`H4^XvxF%j*!!q$d;wUvBt
z1F=h8CeE<*Pd||+<KK|}%wmj!)DWy<<qpg|kv8}_!b;ESfFlUf*a-t3J<XM)E^;p3
zBmiUO^Sx{(^Mzcs7}!Y7=>{F$$jHRF8zX&@^|YU*WvN0g^e8%Sq3)fJ<y=zVmdWnm
zULccpydr(t4ipj7CZXwq=AVK?Ih0}SrRNzl_tI^$xd6SxYJ^4Ux;CZda*V~UG|~>5
zC#9@xI68|{&m}+C<`_UEL%UoBEFfdlha5U|_$O3j@|^gRePjj)XJX?XdNLO^wCT6K
z3JVBGN_D7_U$J|HSnp#Sq1!w<D7iaMaq(wAq*^_u(nL%R%*B9q^;54=X=Y>v%F+U}
zse=QHuqg2giHs3TEZVf72fwlB0r3ojXxyPb$UA*dc*-F{t97(TEu^7=c~XE8qGztL
zKc#$;W}{7t{PlKZHPjgizypaH5X<v9d&4FJSb}+A`AE4K5+J%OLg*9ye*H_HdCFiI
zQH+-e`Qmw8GCfX-@-*2#Kn<X-6(ooYNQ6oJ+3v!fVA+>`z|1*A3#Z7vq66I=6v_w{
z<(L8^W^W<l#b=}Na2BhMrTZYX0oX%xsE~)<Gts8{FlH4j>rnh3fOi5OY;6l6V_XU$
z&LQ5r81h($IE2{LU|E{t$IU!ljaHUH`&^%9Q`P1`+DMxTk?zRh!DBcPmLLrY>umnX
z1)<kQPmc`JmetN?2oj4O&fKXooZW#Nx06J)0g7n;^vKI}Gk)hX3VCd0n7YH`6d{ft
zoxI8M9{A`Mx-hZlBL`{If=q6#kug7Wv|*EMLp-2R2!+Ir|56GA6j2W-c&486SR>HZ
zxSu7jwB#y@59zrqRz0t<K;Zx)r@4Q&`vSG>xy<F*&Ax*q#;y-{P2LN^gFvtiVFwN{
z2TF&#cG;p7jB&VY%hB7{&*Sg|N&E;Lp5UP9<~O)iqMpHNU1o%K%l{67AbN&<&+u6;
z&iLM_Ef;};*l*bP5!58tW--IL>@;kwwQR>tYJ>|{ACIPOefka9W#~<VJJocA+jP9F
z&67iZ;BD-w*WsZQ^+(_5-jTa;KaD3u;TvAw!1jzu4ngdL^i&S!IywkK9&~>h?U4t5
zj7O07;rv;HwBU5t!)j<Dr5f4UP<Fb&?MI=zooXm=eMEFbe#x7gL?N=%eUPf@=O;g6
zlM@|}P{*TGLn-z<Wyiu~$8z^^rfamTf1T3t40Y_L8iG17z*DxXzxxl3b9fpb_ZQ0f
z*9e8~OFRO+&zA)Wp`O^%G_q52UqiiG`7hL0-<w4V3~rE2uz@Q4jr0!ipIXl5vBgB<
z2OFov?=QhAkCn?Z<j=K&yWx>{B)zu7eVH<nkXR6*JhYmY33Pjte(-?QE3?LZjhcKx
zDmf~#SYCw6;BEv^5dw6O7H)JzsbyITG2`G9B;rw<z`$S7ow9<&HHllj0Dp}T!Jd)K
z0OI|)D2lv0GCx=z14k79-BLBkDUHmdLfnYJhC$*%0^$#XWnjjMw8*;1TBhwzrHw@o
zXwMTxXvEax6H%u^qMo0mF8w_XVc2&ZJmvvrrVL=%_i-x5uS8xl!qsXk3w7V9Tgv{G
z+(74lko$j;E9w3)%*0~L_F<PNdkMu|(2r+;hC1*Zs|GG3AB>oxa={xqKigL}90nMe
z!8G&{OXM!x+=fzNmOm6uB(f;7Fj%gvBo5+MS#qs|P=|YYR3W$sQJpu6=aOX#!t%j7
zyq@!WO+N3{(BDN524U>?Y2y?`u-Jory`8T!1#dHX+`9>o@Oe5s3r&S%Bqv53CqIm>
zVv8i98$y0gF@ltzP8&mW96~#&a3cB9tkuJ*H0de)8g-SRDe_L?DCoxrl(?{x=qH*8
z6{b#v@DIV6Lj~^@tQOC=sb7a-u>TU9BZPsre&oC~Z6X}B3Bkn(V460OxJjGv!!&02
z3T~2cjJWN^`tTsn<Ab6<X_GZ(v642~vX{XBLYtiN4Ek}~CohiDCfs1@7uqB>=O3ZN
z@I<UlQiVIXOeeI-$jrd6uLL6Ufr9H)aa(O-`#}OfV+K#ruHMSxlcY-k|4{#mD7LFV
zo4CGL)_;5A`Y*`(&rDqZm$JTX;`#<z|AaV6IxK;2t*kGfxc_@({X4}8T!{87SkZrm
ztiL5Z$GG{6V$6Ty`d(T8?TPEZAnQLfas6M)`nHMd8)W?x6W6bm_2m=PJ7~j_(*8b<
z1*uOHO8<!!3lb4(#CgFsZpimig#E~RiY&BkhehqXwZH-wm6_tAs6Fl9zKgB;FT{u<
ziqLK*?k9_)6#gffE%Ns_yJq_Ii&(pQUn+e>DbSDb4nn5p18Dy>G5>DfRDBEc|0p+{
zeEtt}8``@bJAX!YOza%WX-fA^>l5j9)uSSFAJyh9)nn!ZlhGIH8na_Bw@dy4IhB6<
z?ZyZFN%5!9uNG>Mm_sW4Dy|#1Kh69p9IXbU`GfHnOg2Al?O%I4{3-YzpJ@K0Bd+==
zw-GyxjQ@YyKL=(aLViNln|O@u1fS%Dc|4l0P}_;>-^?EVx9cIFBn;rA_*ve4N->TE
zW~t9&oA2{<@mcyqOI|FE|2vO*k1Wit1*wG!|IOsTI{vHYzefB;VEfbOt#ROUTNLFi
zju&x6ap<<<31ocBk9=>+928_D5h<?2@jh8AzTwGmb6rtBU8~RotqOu6A8uUl#c>FS
z{a(CY1V=lLqd10fd=2FnaJ-1)RUEf)5QTIl1Fr*V@-)>o;vFH&ysmnW*R|DOkiWdX
zu@U8)xxCKb;@w=|((D>t;%WBysYLeLT<`JKZE56Ii85F7ZHhMgUEU@_k%J?nJ)@n@
z>0`#ckuoc!TwkrC6MS$^?^oe>tt@Dwhqw71Dzrns+(R!+Sx`hpxwVS2fXcLYtyJOq
z8eO}@OI30}+mxtZu(PGn-&Bul;x+MH^jolJ&z|}%+fYvLl*y*{VvKy8Dz&4_3aHGF
zvJ@<ZR7SErf^V(w3M#`dOO;D&QKr4)1;6!Ds@rkB#pmPtsx(*|uIb$_3(R>`R*SNB
z#>QogfyR@c`=CeMNfxAhPo{Hwl<Io#`&|Atjg9N-n(HAqAC;{2G}l|3{odVcTfD34
z>%A^Qb}em#-|lVkLpL7rc>RI8Mw_dt#k*Tk3bShbjgElJyW85l)8lPvZgMsIAF1<t
zSnT&?q84L36!3acZg&CqLs}W=Z3XdluDVu?(CmlCvDT%)|NrXLyh|BxX{9E=w{EMe
z)HGq8%j<3N-lp!UI&ZV5c^lP=Pk=4W<Zm%GK!hfLqt67Edp$02H|4@q=XIG}O|5<i
zPf7M^t@Cfi)2&*k-KND0TOY8PlJ(nMe$!K4kKbi#h2465K2Hm*(6-*Ts=9jPLz~yE
ze|XjEYU}12>zeg7)`vEM_PDx@k63GJ)~~UmF3+;5#%Z;D(E6}t<A&6>)(vCHC}zvr
zRn-q$EgLpkHm-&3B<O<N>WvQ*xn!BWX8p#R^_$i|X5C!9an+j58*A2BYbF`bzG~A$
z>o%{q**Df~dU%p{Yd6+Blrp>9;urKbY+7esWe2V;0Z(InscC24@`B|BOHH;quPMLS
zlyA;2T58%=yh3>jl4^O%XWHrV5<^Q(3-<(;YX{9sdS+=D@_JbddU!o}!58`IWV>ZP
z*VcenlqTAWvSszIErD%g+ou#J+T(put~#G2t!z$p@uX3tIQaP8E@;wI^oRA-XQ~f)
zp^+w5B|6y>@SD)e=VG1nY-?^oSTHTF54cE66LK8Q+w!~zmNR`BLckYOL!GA)U7zy!
z@y?_=uit~XwA)nI+S=$rF%RhSnU*ax)op1(Eyf04OpPsd^*9H)R9Xpmf~ey2!~4~F
z>rEmEn($sV+1xdm>?Y{98E;|RoYH$fK??W?kJq&=&<OF1K^|=Ix?Iami-lr5!1GP@
zfWm8T@INB-Vnd*53(gdU-s|Re)z!O*&^FIjQ#02PW>53Zx<(J!Yu>eR7g5}>NjCL?
z^>u#e#n^U@)KG+cICH9Pfyi1KOy0WYZD=h?E^G|2Fk70zb-Iv!;9MBId<R<U9Ekfg
zF-j94FVCJjKl=>4moCugGA+blUQDEPR2x@4d{UwZt`ub<S<ph?Qa-joF>!@3D$0F3
zJgu$7U-oG9&O6XvYD#G~F0w#@sRK07SGUuJm*(wmA$RF^fu*}VO@SuU_CQms$>-Ta
zBkc*8D(J7G2=B)RKnQ@xv(yA;@7cA~)QtRLvujr?G)X}|w3X8)VBFk9WXAhhO#Ur7
z*rfmUwm_k`)NS2yd;On}@#NT>i32IughkdRaEV3|W8z!PL!*Fxa$eeZV5`?p)LFQo
zm4eabYiR^a?_cPfztDF-DL<!w#O{Q(kMg)Ag;uX?C%9_TQcW^<;ZN9Zi6ZqEk|jkD
zJTEnE#rq9SFhZ|iN<oN>MFL#NTqK(NO?7_soWHP@29%DDE*CHKkOIrLo~Bm#kHiG<
zCPj=#eYs<@y(EFIiuUqFNdkZ<Rxb3B7fWp?`9^(wZdYTYmSu~MG)M65{$!s-Hcmd<
z<a4>2e1sk^c}%enQ(Xh{XpA<?WLoU@H2W!`*iG#kJ<U6W!(`RgQhXF|@z$Y*tIiAG
z={14dRKK;QsR_zUy<C+KC|ljGtvd)(LyOmxm{F>%MUElnDr6(P_9Ss3Inn=7U`Xm4
zW6<2mqJ_Ri#94ffDaLFZ;$r;Yqwl|c-T2mj+!7OTn<v3uHHER40eAHz*lVXS_D6x+
zJqh;qDU96@-1{cM-am!09|Z1aCc)l4g|Qz8?z59%SN?43`kBkX-9HKTsws?p7`XL+
zdwbrRrZDyez+E;8_Sz|o-45LDNwBw1VeET>`^Y5Nk4|Ci&jR<QNw9ZMVeI|D9iIey
z{}jfa{RPEXh~u^yVD%(*x9#-Dsjvh0qmyC(<G}d6MyUtx#%YRu7jU=ZIH=+8p29jZ
zRyaq2`8bXf8umle2zxg$U&3)!!`?rQu&clvCEQ;W{-kdjVb2EUTpUX^?8DOtdl@iS
zYq-bS!c@Pm1@6{qihUn&AD*Vzj{^6JX^Q<Ua9_r8O~XH(V$%>X#|Zav;UlM0Y%&6~
z2}dE0D)`4Lo0!8?_c4U88kir)(TbxM*lVW|_D*0vjN=#%6R?}65%#mdd<h51z`j;|
z_v4zM<)^|a{23yg8up_acH`e+9Z0_vnBt#Y;56f4nC}zc)pSkIY)|peqrmBw*rzzw
zvGDc+_aPj|H2nP=H5rU;I0dh}fw>RIH4Xc8icKmo$8i|HB=|i%jrhJ4n9Fe3arA9a
zjNQ`+yBnC>aZEvVep5(CfcpfFOA^0*`pjbpm~~%Pj0<qkM2*u3`#NCWq~Sg^jdB^{
zb3JhTHSB%U40|VVAJ(v+m}c0I0rv?F`|vcw-VNNBaa_k?hJQbVgLG*+e4@ad`K)5h
z!C?gM)@g*@49sOXs&UwX`@}TDUJJ~A9Hb+|(+D@=JqX;#aCGA^B9}2uquA6B%uyV1
z95k2dlmqMk9=yg;h@%fWGoA9tYGAI%(T>9moiR@%ojD53XK|3e*r!qMPI#{acMM0)
zSK!-$y=ofqy$YCXaqPo!h_GvWG&HY2eg1G95Wk}kkA`o??>=ZG{%M8wv^dp^Uk8ZV
z#3kBMU24z7rB>&4@zc}X5p~+7=tn;_NEweVnV$BTHzPqG?dfjOC%`}C+e{BsOPVP~
zqD`~wDf+#G+uQP#Y?D$X+IW1Z+KgW;v;xyMJld@R!Fc1Uh#x6Dz%K^2HM{CX2ej8%
zqZN;tcWUG0{PF8WrXlFcHu5oe4GPI%Y}G_K>ikLUqp@tR^Gobf4w9hkG#-=aMDvwx
zTN)aCE`Q=FeID)h)zBU7M+RskPw^}|{f?9MN}l4`c2StbAowA%%HLtKVqhX@m(UT`
z9j$@X5Y&&-740hVd(OlR1TD#K=4ql%Yb}3s0Gi|UOVo*ml1JL~Qe`HKlmsJ_JQ&*z
z7`QU=+XjrA;GHxu@ym(PJOu7h9nnv+mFFd^B`=wS+9+r{89x(PNEak8C5EwOlF3Ov
zYQOWKzLL`#MeaMQO!U_H${o24|3*c08gng&Q}BDFhv5t8x0*a(UtNQ1b7~=Eo%-7!
zRIP=d8P`5hIKF+2YZd8konQ14Ix5E*TbVjmLhhO*!3s^vn)oqRqD?|-EMF<ML_?mx
z)EZeU^<S2=G$*kW*-r9a*ul8cF=J`&T@04MtNngxRNLE@Y4VjLX%0my_&B~uzcr@4
zWD(j+4#*bl=tf~lI4xlw3H_Hn67>mplxn-<YA2>WiZuxvreA1tdrjJWEfI^KZ;Se|
zWg59e|I}-e?Pk%LX{TOm0W;C>_SXr!N!nxzO{o{D<D`~py)`@Kj$)o1jwiStBllE(
zkYA9pNG+FTV|kO>{w>zY$tK20;Tg!WwGe(T9&1a&_ax^ealKU?Pvslg`DpwplAWYZ
z@>`BQ%5H>^M$w(9eoWs~)=kv+zfmvQoAhC0tVUC#(R2Sj+av}9FRT9%_x^F<R2kOp
zg|_0F-%3V>Q~0wNI6F1$-Rs00j^LVKL^g$S6SQN%c|yZpt6}fPHNUBCietYFoc$Vh
z(|W=87_Rx9XHy(|Cf<@`#6d8nzAw<Or#N(_5ICzetWw|Y(*%1ha5idKrM~Z-CfE-G
z=MfF7)b|t91p8Fi>B;b6eKBgaKrwb~S?U@gb*ZAYO{{0ev|F3HZb@CojA=J^Ny70L
z?Z=g;_M-(61IOeh!o0)fZFb2YhNBI&C!oZOvA8E{OW;%5Cgw6xTMekBI}Z2QKJwjD
zME_5p|0xI3_`O$n_f`97O7u=HyaQ{3@;fr252&N}LABw1P-8!3mAjf6<(p*67v(KC
zFT(2=@RkJpj=y}7bJN;o#f#{D33%B_Bi`jzzG%10x2UpW&aARJpU>5_1+Vr1fo5O%
zqJX!#)Q499G}ZZ*HF>srTYN1I{$+SYKxv(?Y5C5)MR-$2v!}u3lkX=Hqk)vkROa^v
zeE#*#4J{hA``?6G!TsD1J^4K~9{+Cb8YN!WhXWYJRd4rtcH#{%+g!dxWoor`7hZcq
zZx^Y?t0eH=7y4VisLr>(d1njMc#$dKS+$j3HdVf;p{~*AT4Z`KL8t7&+mBNA;3!OG
z4<;su?qv^3zTsl5FebW2X0aFLZ!@nkzu)XIZ#B1?f0p;Fyx-=<^D^`G`FG_%ng8AV
zALr*3%rAIvK}kVn!G;1?fw$n#3pxr86nw1U69sEmKDqK6E5B5-uk=9a*Gp$uj24S!
zr)8hzi<aM79xMAq*}s;V%NxqSRlc~Qq#{^xx#I3hdu3hamn)-{ib;&U)%+RrKbXH^
z{*L*1^HuXt&9n2C<^5US<9S>1KAIQK`)uCd=6xyeg}nZ}U*@Id8}skUUz~5ve=L7n
zzCXV+|Ks`B@?XinmA|^cQSb<Gy|?hgg?kEvg&T@KP}Ep-tmqdjzHRxg<)@Y*%Wo_*
z%Z`@im)Dl3S3X}!%DfcwerV+{i_=SdB`=peUfN;VTDGt3Z_BdF%gX;>`9GA;tC(N0
zlV0&(r6~07sCSrcK=e$WzF<Xxzu<6z3F90o{7m85!YhR@7XD}9tRh2EanYki4MjgF
z`gPI0D|W5uTJhqF$ck^S{O6VV#qTTrWbv1ae^+cQ(Us0GRqW#3Y;JSFyvO`?%>JLu
z-!*^Vd<D4ZeQX#~ahEifbe1eAU0k}Rw7+zqRIxl`Ichm;d9>{DvRy!#Q(jo!SAMm8
zxcp$np^9fK)>T$lx+~GKT~VIFSEgBKUSRGvUoiKZ_vW<&d2xPO{-gQP{8)Z=!HI&C
z1$_mLg{_5)i<TA*6sbi+MbV<8D~_!=zT(7+$5+;_tY6u<GN(AV*i^i@_-gUB;_Jl&
z#fM4`msFS9OLZ2#<$~psr5zmWEIU+IR$f)Uro6g5Rvs@`Dl#i{6(=jsRGh8ouDDRq
zTIsLcRk^paov<CkKYGL0QnT4yY_5XVspcVb)EqY}dB^gO=bgwqlXo_+HorbUx4=}e
zpkQgiwSwyf{RL{lVetBy!efQ@qD|oO<3+Va`W40%msVU}(YNB-ihV0PR~}q>cx6@b
zn&Rr>c(GEVD>+kgw&X&IzjRk=d#Tw{XeqXoS*oB3!<MKeW{F#lmpxl{qU>bZnX>wF
zcX?~MsbWFJ;)<me=8EeT{S^ZhLls9VpQ$`rd93nyrE*lrWRv+(^W)}PbG_M^mz|fJ
zcR8;w?`qz)yz6<L`3Lh4<sZ&Jl79koKZ|)^s%Wfi#mw6)_f;w<6r~LFUTj`!E;N^6
p<^!1dusMdAAH~d{%{!U*cz$iZJHHjSmdi80in-Iw(d`fR`7aH=0oVWl

literal 40448
zcmeHw3v^T0neH(bL=b_M)JdI&q=ys&86L4M8ym|ukN8mNML`x;n&y%ifn_A)SM}hL
z!3|W<B82adnY2UOWQNYr8E#kRUT#Z?lTemPsUf{&u9MJ=+aVJtb<<<yByOvjDyhKt
z`~Q88EF0U9N$gD5lGfTsI{V-IfA4?)d!K!5+d~JXOi7XqC<6nM)P`^REaU6gmu`S(
zeD=8+(($P;&1%b7^U|y;kJm3Z`<gcUTn+LjS7T#SK;Gz<eZfZA+bCD8T_-m*)wmZ;
zpFVB2hI;<vp=eY8J8gO?IMnxSJ>U1W)#CfLy}i%Y@%KB=HuCq)ZQ}bqzIS*xd8qGb
zoZ1yhT9YwFdj0H0m)@pZnl$Uij2U-GUqFp2YNwg;O=Sb$oB8)7Nt(j9gWuAw452L4
zPm-2R=1$a)I`FsnvJ*A*ud-)I^9Z~lLn<XD5C1f0NO80yy2Zm`W8DL9)fn(a0r&O*
z;P0-+h4>;_htZcob&;>e6#%cj1lxc@0^g64@>vFVSR|TBZ@mmaGfD}{Fb2@BeUVo*
z>?WDOBh&mJ_?_}uM)-Vw-zL<tPM{m6`<E$=@KdyN*EgZz7UB=O;&z9wYPVu&P5SP7
zHE^Cjz2CeA9`M~6xU7NQdjAn_-MfP7-hn&xdW^VyiZ1W|87^O%ipv>-zCrCCU4Y9^
zsax)6ak+6OE?enxn%W)6!R0sExHxXWWjb}EA=mrrZMZyg2QJ>*ahVO%_C7{+Kbwxr
zzZ2$Nx8gGYGq_CoG%l5B!tDMjU7V4=%2ve`RuU0gqB7z%Iy`c-WL6DOPUwuOZkl>2
zlYSY_DhaY#<kt`XWGwlB@4GYSWtcm5<s8Mh4wcc36!_G$P>!_aWhv{_R|&AUJ!r7B
zM<=(@%~%+LFVts>C`RVc6t=}9PIK59izw!hni0meB_;*#1oIJReE+0<8Tb`Coe}2y
z&<h!1XFU26x{t;;<2Qy{j8gFSP>V?lPCcu{NzmvG_%VP_M2SZqV$cn3Bt+B}YB5V&
z6(HSj+-Dnr&X|rdqL`@SO2ld63UICQn03N7kafa&#rm^=DeHuS-?l6BPe%>WA6eQ*
zV{8;9lf5)kM5jiSM5rA~Alq4OX8&~XlIcwBS4{gRMc*0`GxcX_Cq@7JNO+8ywnWyc
zoA$mExOca(-7ZP;e-6TCg3NTX=6>_O$H{DLXVCw9s*FA_fE~LDbWJx&O2_)oCXNCo
zQgUDluI8<?vrZ{+lE8GR%3P_|Lh<myx?FX=_|;1`irhk!!_I!{zO@28T3-1>(6rAv
zfZhY4_|(TtS*L6Rq0_lxTVHfq)+y&e=!K%Nvkx}tv#U1=RC>3tVvL?Zd-L8GiLBG?
zP~QU)kYz#VEB#?57O};wwjBTL6y4;YZMH-GiD(;9Vr-IF^n&h4QzN!GyChsU_VT4A
z&bYr!LmA({@6%8hIStD)-x-f6{h12tNsasV6Ex!N&xCI)SN8GHi5?r#ut|-6v>&j?
zplrTL(R-NF{Wjx1=18zf?#=u%P#fwak7D41g0oH;q18ng8Cj<$!K||*Hq_mO5d(<z
z<zRN|AY%QQqUX3x2KSjZ|MbY{&$Itvq?zpM`|l47z*@pe2xTS*DBIQ7x!Qz?gQ1<^
z5sabD!7S907&hPuykCiru3^xtg!_Qp3K19gDJCHde9mO;419*}PTb^B?-KB=Q|)jn
zll63PGT4cJ29iPtJZ6pT6$n1y;`!^01fc&wQla-J6<PtRR+}j>kI<i(WLJ-1!h<rh
zPW4A@h&kZrFZG&sYd;ij)2IW5h*r^~g!hE8QuXL9`w2f`dqA%_H~+Vhjz>nZ#YmpV
z_My;dSHFaC%JzwaI07`{move%6XXb>jC+TAn43|&C&dIli}-7Y3<79oAQ=<dOdx`u
zyoTP$UL5aey17fUI|M~E6Ha+!l8LAal%rc-NGIfZfKlE#>V(nzEs6#-olN67qc_a=
zW{GFL$3XwOrw#-#1TLC7a%t+Yt3MNg29~91q*8rOzwfmE4$})FAN-A`mmCUs2;?(R
zcLjqEk<~113t8G9xt5S48B(hg@(=0}N(32`^=H8;kV?2UMmDBh-110<f5)ZZg;8`%
z_5pv!P<;8$Tfn$6^!`H>wrNt8!_GwX27&_b{*i6N{ZC9bBTm98CPf#t+K?n58A$Nx
z_ZTRdDPk2-GIPft*#~w0uaV3^W|mhL^AjYptIrEBX5&uo?Zd!0tHgj`;tXf+i&=Zl
zqb?<ePVRjk6&OjG&KMFDWdL&s5B!+0PjGVYx6yzM7mCjb+zhJ@RH}gwn9<%xuhsVv
zH0V$+%V(8-;-W+Oz}ul*!S^3El=A~qq1S=X`*LvZe&@hG=M{{$OeLmyV2no~cu@vu
zRQ1kaUa0-T;2dC~06aS9-3XY1^IU3uITs@}(-zx*6DHy0R7m9az6jhu;MSOhKgioz
zAi6DiY(8_>i#eLY&FG|pNm7sM64h%GeK4j(rQDGu@&`YM>@oC$A?!3GIg6}Hgl#<$
zXOBbu^?wL;-<TxQ3`?-uwi7ktIT-wN%IMlL!<ZvBbEGm6c6JLXnuB+Gu<A6cPYFDs
zmVPOCBTRxt30WssM+KaOsyTqUNSy{CrI{+Ne=+adVfxFMU7T0oyDEZSccprf5oSk&
zqNA6XAxEhRJ^&s<rww6n0%=wx!b)EUrnOK@pVTq~zZOPpeSi1`Wj+W1&MOE6Qz(a^
zWU-%!Ty`LyB<yw5&<_5l(V@&|z@h&8AA~;UULF`oo#a14<QOBUe1af~AH&u^rM&)0
zkOFx9BTRaoAp`h!_w9ohomHO1l_r6Vti4mPT=W=l-@14Em4N}fr<rK{^tVhyWF~`)
z4(hhw7RS<pY_a#1pk+wc1JreYYF7?F<VZ2mHJ0oeDCFs9%Q+0vC#Dl=xIvE2#8DQM
zF&QyGz$N<$0b$};!d{HpK2&mTpTOUTe3iTutUWe_wKhWdUVn;Iw3HS;F1o6Ntj*Hd
zxIn#HxR=I8kIqI9bq}@laF*6hH^dwT9cZXK$wt=RuOQhP!b%Sztx09&qTc<Y=zejK
zl{<%PDfEGbvc)c)k1pyPYUyG=F6f9ZFe2r`-_h(NsJD`iD?M?d{`Pw*is;lkb#f<X
zC#_O2pF{73gKOhGx3G=cVIvJw&X<8{17p&Zb6#iaykP1)Gj&eKe@@^(x6hdvqL6un
zXk98xXY?*-xQp$~phCuUn`MOQrFTg<jiq*-rFOwmJF|3B$A41bKe=!Ex#by}qP{_b
zIy`p5^<&1RW$0~sFSf~kr42JCO^H}P6h23Yw!8pmJ}{XT^&%9dVe$~BqExPq>s%cd
zTpeewj_LT1F;~j5eadCec69daAq;Q7!*ZQfj#9g`%G31KYJ0k})p^vR_6ulOITTTz
zMu0wwtn`q>bC7yI%`o%Xy*sgKa11qPm0j)pwWo`}_Vw}C0i%y#2WRrv6NDd*aM|A4
zN*yabhqu#`&*)HB2!vtfNT}tAl(pyEXz3|HuZVKQu7(6Ff8P$3hRWzF1+t;21QccB
z{<m@q10$@<P~Yfd$->IvP|IN{fK*?(4DY*>CLLPxdR76odWY!LG5I7gW<>8n+eyJ&
zJx2+aAz+AX#B_AJCq}hV#%straSL@pe97{d{iuIZ)T3E0-Ja2#F=i0HRp)v-W%mQO
zupnm)5#>otGB23^^tRGI!CCD3Nn?H*vU;QZmNs9eskcS3*M)^y#$mFf-Ux8vK$7}5
zm)L=Hh@eUR`;5Ae{kdo&X0(Jp{{FLTZK9Bhf0BCpc;MgNHxr!la%FZ{iEHV6t1X7X
z9e318b<)5sCObBo6l^s0OFO@aY!eF-%Zs&PoBABh>a}6#rPjSYh-gT{>Ll#<AY7;p
z^+&S^Zz8hF08}xDXo9ejh}<;r3bKo=6YWsd4XEf?Zlpc45AXJ@pB!F#sTfB{_c}0(
z6LrsqyCrj-q^<%J*b||B(w#S9(D#d}{$sI@u+O=HL7xCWyZegqFoYIJ2r|#mHeT=s
zOMCC@h#C4!2Mu-@uuEt&LQ!1~b(btjmiAh(`K%G^4=DCOTEEeW+!O1_I;mCZvXeQ~
zYBbaGuvRSawE68E)^zr)XKb;Tdn-jR7)|{m+Ugd&nb=sOB>Yo%w<O45KH3df%NFde
zMfwZ_zQtDUfh}HslMO2vA;S^@Hf*a+1;5=6^&*}m5Kd^kqatHK;<@T$$&J~ba;PO+
z3SfIT`z(|OA3}gs>wZJS4~q{B*glC>N^=>w$7%uFnLdVNsmxx=@PmLeDr3ZkEw=tJ
zcHGc_b}`|)5hpf0Vwo#S!wSUi37yUf+q$2l70c<j;I`dpmAS^efw$b_p%N*u0$VYm
z?J(;ScsLw7vl5%H*t<!DiY40jf?Hdi{bFYZE{VNqaGQw!8}EN+15fnCHFj&R9mhmG
z(47G57xJNjTVx)eaoTEVA=_q-vfV)OWOtuTi)t+9$)2j=PWav{@PK%m7|Y5Bt*zbU
zd$t684<o4+J5cJc@F=JiE2q|BF@Xn`PP6}-KEV7J!`DFkT&4PTV8vw3+a+<B7HcsC
zoy^M8Fd0V;wdcS%&yr2>>?A^ViVK@yt=u1aR7P4rTT56x5@eMO3u^I;cGtAEJws#G
zRXP3*sAJ2<GffA>wu=$xMK}-k=Kg07$94==E0%}M!tAiK3;q$Yb=5|)mqS0Ww4gFG
zY`c*44BcNKs)VUCqI6<6?!d=mUlU}Y#j$2)Z6lq`(29pttq7%R{Y-LgOkCJogm)*x
z*k*!f&H(GX-=c#8G@Ows#jarywg)|5va5Hn4#;JBN7j(v9xWoLt}NL7mL!1`Rs?Yb
z4_<@ta*cPkP&;e^HWpE)C$}m+LmZcfbj#%4{{!qEJQp{sJAb8(c9jASZ3pO1uD9Jw
zcDMELW>+^q5sO)sMBvL9wloeCfz31qu+fU4nux4`TnG$t3M*98AFedeY)1MctA>r_
z8rYY{=4>odi5-%D>P`Ty7wzaJ!Yd4<5@!tE**T#2YiM}vG0o$#6k7F|NbJ3^9S1oP
z#3uLN0T4K}tB>gr9^}|e$^-<tD?M1CHEIsJ)8epC#*c`z&*8}>gtu}xN_J_j0#At}
z^3m9chh9MRqCpl`y5Qu{qh?4fZH-7{fs~h@gtW&@%2s;9<nf95whI_%95c@AG2@?G
zThGw^Z|lVT@9Yk}FdJdxyj}eP9vNdJXNVJBtk8J9XeVBki+0hOlLXHOV!QfH(gR>@
zK~lKbrsFMfxNE|ybY<;z(BsK#?_rK@fw7_Nukev<_^TO1&jhhBRwiQ?)ULjnLvt(}
zWGB=$G^HTkug#kne>{I;mx7;O7^am)q3)o}*}~~J_1aK7?Vi&1S0)~$)JHvo*#zus
zGVgxBm%81_t3;l{j1d#I$R^VepdJ5sv?yxP*N~VuvQA`Y?EXNdPBWQ<)7`L@F_N7T
zdSNn;D0GTNCw-KlM)FaZx)~hs+==054DB#T*sHz+;zm}OC=!HDn_+$28SLs0-yqwY
z26L)Z3o$+fx-7<u6aiQnSta8&Nn0mHS0WTn-ujuk$=FYIcn*_4%@a7!Dkkhi!ILo%
zOyO0uPShB{kVllkj=kBg=8wfdDl_=4%a_85g*aIv1#c$uz-ia^-;L4R>JUBffT;+6
zi_HTeFmYlWSy&B!pJ}+TtAU1t6g@ebkFZ2x3nM#5GGpod8ipbW47ydK!!WHE0V||V
z9`ve2*f8x{F3SFyOY}LTs^@S-&m#~AD%EnN3F46!1<9<vU!XwNMS~imt5vTv7noEZ
z?m#-#p}aZJp}ghnP=1BqJxJ7ljqkT{{~J?>qT+Y2twXtF>`<Z)*U=cqY=<4-sf>ko
zN1#wVF9YJUyg7-89`EgfIX&GRMlg-Pby26du|w$u#+O0y6;OB;zb}B|&vE}+utWJ5
za|fbchw=-+ehKRTir*JO{dHsA43ezX+38UKg0Tt8l+DestF|QNsLRtwWGOY>k|evP
z1365G@(#$n3)Ju7cR$GDp`r3Sp#MFDi#=RN5B?BGkhCsHAwdT>rdFz##3LFq=~xe9
zhxy^hbqjkVfNSB7t@w+7C7mW0#KQ=&e`ISLrYUJDrHbll?h0?|!@8s2iFF5}<VQ{+
zhH#+M7byrvp?3UWi!HX3o^_N?LyG8vTW(QeJ2Mq5VlmC>$%~=owk@`J4!PCNX|fc!
zkrI45P!f;635PahwcbVk4#VuomV!-~7_+hGEAk42D{XY&hV&HiN?Vu&?$c17t(b-!
zjR=DR<qUn{stg$v5buywQRhAieL$3mOtO0xY(<>f{7X`HPVe_AN(s7Id!E7#wwGx0
z5ah9HR<ifDXYKi#XcM^!n6Spq9^|NqhrhmH4{TseIZ^=UV~`1foBqg6VY9~A*@_HW
z|4Un(;FHF6e|U{qMuH&F(u3!I4r9c2l9uN|Vz=!V#O}=Ay&!n4NHWB1AKMMvA6kX5
z-F53Zy8f|?gMhZ?4^o&#Hb<w0gm3hdh?E23tk)5e;&-Bh=NN9tKI%_I1!h~%Nvgws
zhWfauLl~lLixkG$7QT^(V?Bymnn_bO`<*JDHNsf*ToH$4Y**;v=zcWe_?2~{6G_%r
zh@R&haZxV_pdmdh1iBub2&Z9iz8;vN8!kg8i96H`4!+<Rfo~3X#wO%Bq=WYm*waNw
za|Kdte~MoQ><rv3+9JK5bSz`Mt;Y5-wINZGM1I2~EqKGRjNZRP9cJoDL5P4^9ESst
zX_`oAUdmXtaSFrf=Z9!aw#*W)$!SBSN?WnKlLT!BY00uS+8JHlp$udoo5e#BN!Xo^
z%84zYS;+4PN6N!`cjzr>KsPDc2~E>eCqnko6~ywJ>EyvqI)7l;c|(4C?`2TkqL?ud
zjjdG~Gqp_w%40|`Zve_6!f17xxaK9|l1@|Hh5<@h6jVkL#T2eIqQn0J7|Oz?6Sj)t
z_PS-r0w}~79IEj(4&Ly<J2^<uMx2qNO^mXln;B|?ppA^4r#^MHc;FXZjJk{<&WBKr
z1oe?2kadXDhcRuRB>+zPffNT<e#`xkD<g&=xiZpD0lD`eH;?|Dx%oJ~j`a(gnme?R
zrp_2Kayezn(`<PUHGu0sBEURMg4v!0K`3E5Gi7MQo`@8^U3B23F7Cxrms}EpT-Q($
z{{G$bh}Blb$ksbf-LbJeohq5F75b8SaF2qfC#WrirC<OaZghzG3PbxjPC1aQvx~x3
zo1-sAUBbh8B7<FMHAhE1w<z%>mPt{SlCrITCa}dZ`vF`15Nzb|)cF#h6NTq<u=;pB
zUxav}4^7^|5v|X&v@07d!2svEdcTA-a!@oL>1Xf82JSYP$N4Hp^TBG>#Wl$OV$o-~
z|4p9l)Ura<WB2O|!XL0>`Z{dKnKl*zauFJRUZCTLYAh@)Zp%i{%<>!}BzFiTQEe0L
zTH7broW~%4C1xj%+Uoy%MVpz#(JmS)z4UO|vmTB}8=2}X(E{Ujwx=GIp6vu7!~K<j
z*wwn2jwHI(vxmTRLR5X3Yq{e=>UfACl!ZT}cg!2?Smrs*c(K^|-zgoBQO7odP*$t)
zVprq8Pf{ecl=1dZfv24*V72jtKp}SXXA(Q)a-L4W)t4A%>X=N~O9sV;Yp;o~snnDP
zV*Fq2SV+Q<|6x2$lL9+vSit+mswK1o@zcebkO5}Fa;#YJkE-wrT6b`S&DKJwXCKX@
zQ?w=o#A@~~07E-4W8KDhi~>)8C+msvn0vpBMc#)O7V==SuH}>xYvG5*4@<kgKoszm
zI=pOT_}x1Ej*;P0bogZ)`o{upIR3XqH4cxC4DZn4KNdf9?sz>6{{KOTKQ(gyuj%j>
z@gskje6>3K;gS2V)Zt|#!|&GNcZ>|5qQfua{fUv}7uAq|WO#=T|MAH1f6(DijR3Et
zElaF!)lN>+4MUtn_%kvB-n60ZedL~-#d3Z~Lv0KUZBLF!Z!sV{{1o>wq0bA3lxNA*
z9*cQ8R*H>@M!|td8^u%e+eOu&MN<YFexm=Nvs~Xj)1wpgcJ+$bFA($)o)A3#uc*T2
zIrf>ZrV4sVeI4U%lk3peHf?`pgitf8zAW5lBz-aGH9T(`u3`}QlF7#gF}DtBb6s#~
z=Ezw1#q`1ID&=;An`5c?myJdr_{Zcw1^)u!Hc1&$@yiSwx>v<;;Lje#ZFG2#*wskl
z)xBy6{?YhP;cw<h@{7&c<bphh+l;(p!Sqt_nXUt$@mlzDFzjggO-~}VL^Q_oW{)f{
z^wq;SNA#y5!vOqF^gX33YLz&Dn;fZ>n~19D=c2PhWfw4=OMzSU)P{U>;1;UX2J&c6
z@*xi`hJsU$Wkgp+S28VCytp7}VUrKEz9Fj6h^cjrM2#wm8YYj?sEPgAK0LxPV;krw
z=kXA3TMEIfJ&#j0QiZq70UT`*zNE(Ddd|a-9E!MsF>o(4{Atl&?7CWQ*?w#xWzR>{
zrLD6>CUB_x&ryHMCZb=8=2B+=rZI499ZnNx!%4t{p9z?v*67W;^QcP&(dgXhoKV?C
zmiaR}N4j?p+(H1MWeV=*l;Expst@ta<AI0tz#It=kq71&_-f=U9s3xVW9Dl%Uvv06
zldts9`9qLOH%)6Gt%0-#(i%u>AgzJ42GSZxYap$Gv<A`|NNXUifwTtF8sIk?u^Tn)
zqyKF*dP2Pg#l8upQZ&+GCfsJDoCNHo1`{pP*Wnt#PCpLFOVamUl0?t;=}0J*?YKXH
zau}rsC!TLZX+)WfQiSpX>Mx+Yjq(A?^o{5Q43nfx{28?dZ-c8Ie+zA)&t2p7xi<wY
z`HO1m>rr3L^{zmZuezqG(LJ=r+vp8Yjoz!e#_M-&tmjtAI(OqJRn-BvuYtHof38mh
zj&&95=6~?RS?%wxTk)fvk)|Jif6F@==z3qtdZ*v*^RKUQxf<8kxVNsq%AV_+f`Ro7
z{;iu9e$m@#$zShq*SlSQ_tgzy_~sh+4dGYU$62~nS_4;WAa}cTbz~`#13uR#cZobA
z%<c0v`9^_lbNL#*jhhKN^2fH?wtUT+wf9w5tX{W##TupBp;WAPDEC#N`BkvB4=4`D
z>Iwz0JZqK1saU_Hth27AKTnx#tK2^vjg)I$xqQt!#d`l*>)MqoQ`!REinZ$q-C%#a
zWA$3c>Z;WbDb;J%F0ZIw>!?s1W6-lNuextl^=g}at)pt)80}WBb=;RC-EjWD;A)if
za^?Ko{CsI+&|6<qBG2)IuWjDOnx<`jc`IUtx2X}ej|LZMh4|K^28aHX`-M&D;q&5;
ztJ0h>*lwZUy(#DuwR&HzZefjkV{r5E_9>Og_C67bbeh$v(}}w=;M*Zd0gv0~mbcM`
z{lhQU1by%Xx!D!i<e?uMg8><>{BGHWM&8YhO_+Y<c{M?|9B7i0_8h9Wvb=j1k=T+x
zRY50mt;<`FuG_o;{4GV7FW|-ew?lR{H`jYn%>><kdEr9YwXq3M(1uRr`X*Nmegj=9
zt|WT`spJp18f#p>8d*%XGX9>e-rQXSK1P67<FDLSr?i?yq=SB<>vL}o*1LQfvU_WN
zZZ}KwU-Qx!fSxoXleUOUN*|zK@1w2&R1d#ustMM+;j40!ug2}8zXChh1{w-BE=+bI
zh0S5dUVsh@<c*lkO61(_a}aY<X%UXmK5#BlBs|3L+Umw16W-C(SVMjUoo@Fw1RLbK
zU_-O)_dW{L7$<T$T_vg7y}cQhl#usq;`9gvsvD>o-bUhVhj6m>Ntk(an(wj7gMiKM
zfV|D;4Y=iIBtTw2jm4CHz9u--M%Sh-qx;`1(9>yGljJG)#ET9~@+BJSJSM+|92y4n
z)8*2>gPVK-!p_D5u0aueZhuofRCd=K|ExLwyT~ay%_DUtN86BS#v1Xtw_-@kT1rX7
zO^jzAH%W|l$*utOHfv5Zb<zU`-Oiiiy$5{g)V&SO7=uYB@K>OrZR*P%2it3ZEL!gt
zaQVmtbNn>=HJ^hZcS*XusFwU5cYVE<1&fX(8#hbF$z--nel7dm?gl?`j6X`9;-<2z
z7I`kHO_Sw$2vz}_0C!NkdT-+v5oqS>LJmgSdhf=$vfJfD*zw6w6nW*QriKRi9d&ds
zg(5b2+?%!#TeVF-IVn}DooW&Bb%>CZWF9r14hs6w0xBu+PvFz`gk(OCG8(J)WuwDJ
z>vO&JU7)LuLA!tH_|cAmuHhS_<2R3^+-A^~$Do}%j<gqmZs{1b4~`@43ec?@gLd;c
z(%t~NfiY+w8%NrEK=;rXwEM@A_EFG1GY0L>aio0_bYo-CHZLE2{9SJh8Lgf1n;2s#
zqrr2>k#+&-+Q*=6A4l3Xpu1}f+Rfug`w-|JAA|P6aio17bo<7jeQX?Q8~<7|n^8vd
zwehT<3A(dCA=<g1TZ~en(LcCi;&kvJXl_99XteDUNP9bI?m{`B(LOeTv=4*k(<p5k
z?ZXpD`#fk~K<UwFw@)DL7-$*}O`LzFj@ca0o%adRE(P5+pAhW_LD%yM(GGy_9+ZO`
z{fUe%M?mu!N}EP|B4f)r(Ck9#L+QtyCEqu3K5zJzWX?vJhazKa+b59rGSFOuvL2<A
z=IRNg9RST;C^Y7qSBme0xaW5yQUk#_{C*O2j%u_!HQH^s=Qk$CfnF-gGek$Dz3lTs
z?ta|!n+vH8$KiJZbWGnCG{*t`m?&k?EkIeN(eGC#j*lA944~}PXisEpIRKi6QI2c0
zCC%T)RMy7?>;%njlo(2T1;+RU>fH1l<j5!=lPDhwO)2PBq10>i%@e5egP{2|$~ld;
zJb|?PKr^n<-8F%+oQz|9QZnbD(C_vMro8}ki#6JZCz$ps(5=#FcTX_w8qjS<*@Yrw
zeD6Xb{ZGW_5NIAnIf){H?uH4ZeE~GPQTkDqf$rf6q-}T#evU#q?w&xpL@yU~SE1Ap
zeZ=zI35+fHgIeZ8D2ItQJ`*{I9s|uYC|xM+(D_8pWBs6M{2R<=C^B@uYyx#&0h$|7
zSl<&kcN4u`p!+1sNt9;LwojnkJ)mj$Tdavt4ukfF38YQ3e^MWD21PvDuf`Kp;)9Q+
zXixhIE{<>rXz~{A2$tG2d8@&EZhrdB9RbsBML#;ikwTA8bPzu6F+FpVyw&gp`M_m0
z9X`-;rc?>MjqYu9j>O|@+NQTjsS<6xet@byZdWsS+Kfl@8Y7^06$qqRPE7|m!Lhl~
zT_ZZ6{m|-Ra;G*%TU{MmwZN;l(T_1`tdI?cgGS=R6&U1wC@<BnfX@3c!hj_CzZ#^;
zpc8MZt@XPD$x{~GF@?8bVEB%9NF=En;L{I|picjZa}A;)>hzy1pU#keURFQqgLX+D
zVc*dj=;t^9*G_T>z3Psn<4H;Yewb#8e<xwuDP8@{2-;ocUjil?>N?UyPPLg{B_*vm
zsF&g0AU6Y(XH!5|SEHm4FmdvQc~9z4*PPyw<<jVgaV_vBb-;=fn9z1Ced;LLCb}+l
z9td}8oqo7^P>-S|w@W(qXmz5urdMvn{rHTLU}M<5PEK+J>enF_tinKMK2z^g&qbkr
zCBjW=yX5__b`JM)Ivef^h}OcF(EqCX)P6}DYgS9zPY2ML(ygBKcFhlki8QF@yTjV*
z0w-~><+%UIHXQ7q^cC=QRW0jvc&$b(*;+g6HKgsRb($@8oLY3yo%t%g=rL+odtF6n
zuZIJ@1qZbuyd)#gFkjbuB;iR_q>j_8pd;fJeUo<3#%s;S&0>6{-s>C_kn9d2l2Yh(
z8oFfv)O)gMwP?tFQ}4COG1+hQd!5z6^Kq#-lVdW4PHLU*17ZwvBj#n)`(buZ)d$J1
z+ak4IuNz5U9}=buo1~MXGmsy9j0~4ar+vLXo~k$9-a3x!h3Wd%`wba4!f+$`Wr{in
z<4e+`#dt{i$}rriY99%A3S3w32sBb0cew0HK0aKVBrzI1=}%e%X$_<`kk&w218EJU
zHIUXoS_A(@HPC6#ka|!Il^N1(l*K4^lsc5Jp&UW^u%Dg4r+-dS|CD>Zp1#L}_HqMu
zJyzqTwdIX|@45iJf+)Q<33Y?_RZY%D@1~|2w+5C@O$K~OT~*Uyb4hwsT2tfuygN`)
zU%v|P_Tb(5j*R;Qc3)EfZ{a`S^#y{idYikUiQa>}mFT1G{ecI>8=UtC8#dyXBz>8%
zD2>4ew-4JiYw&)ZyT-<E)A^-8Qm@LO+qXk$-0Jl;H8$WKtOr~^FTa-Wr=BaZwXD#)
zmMfcl%WG=z8W3=%?&hRwHvK!Tf&YvKG9>y(Dk!^#_NKo<foG~C)K4`?(kj53@jsAS
z28aF7?&-Uv21=K1Z>ZPb?k<~~w<s5{5H=zjAyAdgbylrhSUgu2FB#Y4Z+Vo>-Qo7n
zU0ObUTB*zLcQ<Uri_SpM=r5Za^fi|F@p@r{%fGO}yUEw&Z>kL}#QTROE`P(Kt$B0t
zhHRs^*6r6Lk)Q@tvRoSQ1^t25jkQf0w!5x@&2ks_Lr;F6+#A@T-J{0m{&Emh+%<Ne
zcPrk^-t6`#fvI3+J6=Vnw}{u^6;r&AP1mxyF8}Jrtxa3pzPWPHyL{6o#I>@ywXS-<
zd#-$M5>M&9qf;rpcL-0V_a=oy_tJZHz2PQlh4hcK2GSZ}4dBGYdi?O`9nX6%?{wa)
zdEI#}mcOw4wdG065zEt-A6V`z*jw<eg06x$3oaGBUocQGqcB+b)xt>O<AvWY{M*9s
z70xYLR`P7g_e=Mb?Jx6}|4aGJOV=;`r=`DI3ZydT1$-6felPb#u9UYr@2~RyIq!|U
zd-7}Zx8#2>|C#(#`9IA+pZ{w9FY|wwZ??>`%(dKS*<#sY`MTvP(EgF-jOA6!>y}HF
zK;fRke=NLV@z)nyi{_Smr=+{|_ob$?OJ(<z=a*Z{e_sA?<-aQjAxuzf@U<fEhxv2B
z|E0nk7k_JUby0oMuA*NTl@vc%^04(8>v?OU^zO3%R<@<=?Xo|XN#&m{FDPG9{$P1S
zxv%^?<<FPDSpHSweVHW9!`Gq3|Fn2Y(d|Va6n(0=zSvj1z4$A|dy4lLA1wZ6@sq`9
z00BMtI$V6DxV?Dh5_w7Kl0!?LT++5AyCkQipyXi56D7w=OjfgXfpwqtfc2==P--ll
zUAn7uPwC;(M5$CZvuu0W&ay*gv9fqsc6oDop!{HYUwMDIX{l#v{nC9)dzPxi&n^_q
zuN!h}axdm~=l10G<vy6VK5s*wC+|XDSKh_Eo;-VgRsMtd8=%q7{0sRP^H*8cK!fKj
z%L*zAP8PHm6c?5jE-PGBc)YN!@MPhc!ra9Li;EYRE?&0y>BYwuA79+I_~hbwMGJ~@
ziwcU0i;ff>Ejm`zR&=sRE}mVyptzv87!n^YK3aUN_;_*7l9@}MU`dZGF_)06a>)Uf
z_Q?{XmE_H~=2-VYW~r1UHka;XnGcl4A+@0_0I7GC^+W1JSv{oQUaqp#vGRC%4NKm<
zG_bUrrSDscH?0q1837fn&)tyg$?ei~pypQPkrrz5IyEhH=dH;XdRU)-4w|@-Utu9V
Y*ez9-cGkvuOQ!{h(x0>j(i)KdKc*F0egFUf

diff --git a/depends/mimalloc/bin/mimalloc-redirect32.lib b/depends/mimalloc/bin/mimalloc-redirect32.lib
old mode 100644
new mode 100755
index 7dadab3d657e82efecf90d288b13df7d1ffab7a2..bf64978793de2eb34b5ec714fcffa813c7188d88
GIT binary patch
delta 118
zcmew$_Caie84Js^=+G;Ztyp%kXfyn5pRC2MK3SgCj_GIn=6F^^MozuEdu|?OU|?XH
zY|kP+c?(++Oqo7V$>exesmZ16v7C!-S|2`ysxq4_$WaedB|UjP2M1K;=F1#&nE;m<
BC=&nx

delta 118
zcmew$_Caie84JtnFDi#7Te0k7k!9FfI$4WdeX=~O9n;Rz&GD>;jGSgqmpneoz`(#X
z*`7su@)outm@<8!lF9L`Qj<&BV>!E@9lG)ms>*D#AV)n+mGtEG92`)Un=f<BWdZ<c
CIwu?e

diff --git a/depends/mimalloc/bin/minject-arm64.exe b/depends/mimalloc/bin/minject-arm64.exe
new file mode 100644
index 0000000000000000000000000000000000000000..4293b0ff3ea850f6b245ca768e3620fdd34e4bcc
GIT binary patch
literal 23040
zcmeHv3wTu3wf{adNtl`NGy%fPoCGkFNWv>%!b8pwq6v=#CIjN5O@`zoGbA$;W+p(O
z)C8^?4YrI@ZNXa}TAPWjqJQubTWg}V1yMgheAQYL9yJiHQ3Nt7&Hb%?&PgT_^tQL(
z_wWDvJ6|Si@3q%nd+oK?UTf`rW@gE4+nAm)7J+wnH)96@=_T?1-||mjY;gQ@gV}!L
zYY7L1#jhpU98RBD>GhO(?Jlv{?sj|p;woA6R=Gu|TU?M|Ai6vya@wFlrU@$RM^`<2
z=tKQGJGJ-UHZIzE7WIpFy}RQyhwtt9D~EsH@iz|N-*Ex(C!62haR%^1{kuCK11!Gl
zD5opFD`_Xu7vJ?KUbi}n9mM-;Gg+F=SV?0PyY5J1nMTve5?Qova0;6QOp1a%I2CXx
zFH4xVQr0mR#qbX=4YJ*+kTUVov!Yt9liC+pg^31;PQ_4>)vaLc5EW_|Yo&oI@y7=w
zBwpJXGXor5#@JYnxbnYkOR<LG{UpXR6j86(A<ZwZ_oL-B&6fnCxvTR)iN8d~iqgC#
zcE24mT?>?iH;`-!-eE5ZEollF>!LA>@Frf6Df}fd)|^(U@*`O*@g{m3-eE6^_<4Qa
zV&J$=YEU3L=qmgraXPue147af>59{>q)P8gVr+hI?f>tRD8#=-8i2m`v6kpSv%Zkm
z&lmhIcp;jFE^mAxcv;T^7xb+0bG^`bUaxDs(B1toR2@34k7?Ain&T(+v5jr|;f)5y
zIt`ynAtuaw>+;5yh6~YB=zPJ84aD<&!EZRflS6dD(<Al4zs5%dzsCC|7Wj+GJDe|#
zb7kHybKWGs#=osz2%dUS7d*35AN(+>SAO3AO~`|Jh^)qX;ZYVKIX_3erO%i#m`iNq
z>8s918T0&*v0ZKT3}XoxOBehwp2qqe*OfL_EA%H}tn=zvgcn*&f#)%vMnml+M;ml?
z67$@vwLL9`NKR^F?8X!S$oz<B`26nuC+63kB^<k&F3qqNgMCqEgN~)2FA#zkVpxdA
zBVE$i+T2KX(zg@i_pWD5qhdRK?d3uY*@^`=(b9mid+e}VFC5eCL^QJfe7xIr!Ar&Z
zU}!w!>*>%nXC4~B()qZVQpi4_#+t6_PGI|oL+=f<6g-Pyf$dRj7|B-D-F=|$hth*A
zk_C9*Tcwa7)EuWaUXQedE<*lRtjlnfU-%d_Uu}-lb!`77{fNd<7%L8M^8ibz6?Sx|
zj%9Lwv!#$fiUmlv*1K63wH;99ARRsU_wEDQnAApnn*THdbR!x=<E7B0;;i6>+vf*+
zbfi~w)W417hus|4=0kkAPE~qm!jG(nlYZ$niA2+!X}}s9#x`d(2nsZ-uz|63($&IY
z?AR-iEsC+&g@f2JxbfJ9Ms^JDH+EqpJC+Jtcp@M*88BwKo~8fVq6_@u7k69b%TIYr
zk8QW!eg8i1hdQ=$vaZHDSYKm}7fc<AI%b<Eur&iW{c-16;oi~7mfVHOn<B?-y}aO!
z<hi*Ex9%A{CV5lT7{Zqe#)ah*UmYFoFlRimL^^1|T6J9Ro)M2a`IRRcmDkz*KeZ-D
z{Ni6buNF)1yo3S&SLSuT;I~+J0rsxL-gv6V7k6i|%-pf8AOm`R7W!TbeXoPQABMg^
zPh=}&pzC>4BG*`=n2l_KwV49Z*oTX<@3uzoe9CLY`nPAXfJtc1G{FW;<C-%XvGxR0
zREUk5PWn!U4IEZ&AX&A6WYq?eRU7!#r&5y%Ht>-VHqfFE6bi<U%|>Rs6YHF}>BP=x
zef{Wi%c6zln?{Uz9qU{^chSPvgE3>uH;o)a_^m?p!mSfuAHCRV&iED98MYPph}PMe
zl93Nvt6TgN>pW&CPZ+>#XGt!alRY}{*5A7yZpA!mFgK)fu^ew17&r=i{fo8M>)(Cs
zUq9Dn7CzUl(A%#qk$kRX)BosP2V!ph=Ne0MeRUh3YpoDA*Oq~So$6e(F;|l|*FA#*
zKLMWhC7*l3;6Rm17YRDT>5dIn{M#@~NRM?F@Fty+Z;1Zle(Mt-Jo&HJk!60bjs)XB
zt)na1!%yIA8{qTf53n^6qofTY^u*`ccJ+BuyFs1*NyPSW9kge`4;mDkGN|!`^fNsy
zhG1Pf>%wA)FD!;Q{wFa6{6>CD40#aq>Vm&VI@3upEA%J}g%BJ1#}bNVS}bArD6!;H
zzgQA_R0{DqBZl?HlN)$ExxDdM!=>W+@GBO?li%|k>dJBB>vWpG<@q7}l9u!EI6qhl
zQI2SKNlo#QY)$e&W=pP?n(j5Rbcaa_!9Q3BMM~ALMYHsZYot(J0t-Y(N=<hP#_|Sa
z{euOm$t?_y{s8rM)Zqh$6$*pOx9&lF#@l3Kw$Hn}N7fCOnv#X+MMg_<y+bF3W(bD*
zssU_&<6x<21jcBX#sbdyEI|ItxWsbsE$HTOclQj!9l~0j9WMm09P?|eAL!Vc)Cgwl
zKt6V_4lzxD+{=@9-aLr=H)|>6kA|Ns6r#%Si)1#M$NfTd{jbozOBlfC@sv?&`a~EQ
z-Hm#kI*)S5e;%?oLiP?eaM2>m_4TVE`)a{dZ+gev1wT71UKmkc4jIe8>b9Lg-qJn<
zI?_>I`C@~zR!T07<I(<Iz#GV>)trT5z7p&E(h?1`3<=mSE53jULjucCrkqmAo1a(n
zd?k0KJfHWe9TuRR{)cKm8Yh9qi0sXebS*;^zj9a#btBiMe2DsJzNKByQd*%$5jO-}
z)(cW-KGsJF-v{qXA)+DKH5%9w@268~&yQhEN_&I#PMx8=<WJHD7R_uvtfhnOev|Yd
z@4GCF&&yKil$ukYAHuloHP9LHiDxk#dtghv&&R#v*I_+^x%Jj~=k$#GP<}9qg>nR`
zIv)182eB+?uGEy<Vy-s}Qf9nGSknTWITGdJ!Wui3jZ&uB$Yz)aNtx{iz+o(4T*d-*
z*9k#Gf>dn~jP-Tbun_uJ$EQZDDMBo3gI^%s(H^}X{@SeO)~%4aj)4c&<wcq8h&6Pc
zGSGU~j^=Cg(pTLN$6!qkz*fj-T>L;Eya=1QgmrlFZmFwHACuCWI3~~pI{2%=ox0&2
zS>4^XiyveKIiF=?0?(k0#^yE#{^tu`;{JfQ+lTUTUgk806v7!cDLSTgKB?JC+mOI-
zLBspBDSZxV^_F3Q16tV<!^h)vwbulm0>0M{aXwV@oKU$w_$6}t%Nw8J`A!$?A$|Z`
z)BeX@qX|+j9*cRypB~44KR##}vt<HOPBdF&f%cnO=4i+|132G3QkUibBnBvlKN-cg
zHxE|)ywIZH-Ukl$nNBhZpDMU_2scQ@3FCR+H-M`dsNxb7-0Q&MjHmRSs^AV24*rhw
zvnaUV11D)XyMlXxaLAQ7U9Ez94!GTF91@;Za7etj?^e$?LW_di2OQII#}wQXz!gQQ
z{5~D8>`TEy`|UW*o$S5{_O#Z-0yn6+f*?#Fx}yfrCF0zm(KUn4aUJ681-3@;Fx$Em
z7D!S092F8K_VhU!#+&!KR_W8?Vz#x3EHF;%Q+plP;bzEK!)?08irh03F)o(QZWPBE
z`uHo@fzKi95a7*NV_L_7yv()@cSdI#wXz(YN#_wWZg_^fqBC)Ssg&)}nVADvVBSj^
z9g8}<ZS6NpnHRF8%myW2Jjw)f;Nq9v56{-K*x1!<KlP`*MfPt%&ig#_CgcVw1_OM8
zeq^J7eJaBLO$Pn5Y8%Blie*}R9NKBWt!3;$2z@9IqcfWowoS3S9exD%dc0vO{5jeO
z-Y<1wO#`pu>^U5`wqhaBJ(>1@Oyl(!qXBKO_eS>VrZ)_<HmXl+y`F`BG8s3mz|DF(
zHgF04;etLQ*xjuQo-d0Eem<LpC|<<eC3Ur<tsVS~$nBk&J3~(2iugA|FNH=5F-Jxq
z&!GJS{U2>GS#a+#5`KFGKj)I2?8X|kufCWO-=ySM63!4fGY3X&^mjdkb3hmFI!2&x
z7sfzdbaW)%Opi18U<>!Jb%2N?Db10}{lyD9R^E)5Y8cs^ap>>eGf1|scq!ChJ_BT9
z!}(dfXWj-DbHooD@vk;#kPq9Bd6;l+J*ywxi1^aD8uN?A{E!#Scm?B`1eR$KMjuHB
zE*)oy6Ts7&4aK^UK3PI6d|FK7A=p7Ya0kEa-ro)#Y=%DCz_V2!r|p&WIM~uFh}k47
z@7t#IZ9?DnF;eJk67V>uOuvhDwU1GBeinC5{pV%GyxK=f@cV{(qHiAwTAb-oKGqID
zm-AWofzNS2aK7xOVEcRXgDXU~|LkNbbmZK|H>!|doSnx)hjqsK6!fK><n~R*oen*C
zjYE9-bkhUo$VK&&kb_WO(w-C%B>OZXPYJ@N&%sYOU@z(^&$5i~s6##yjXdju-qctw
z=%W{^xfRZF%g$nLT*%=Xu92F82~tyv#azD#GUmdzYmhIjHXh!w$0Ri^{IzlCI>B@#
z#gf3=2~RlWGDix9ksY=9%tpD`-b|^fZGKAqJSnlm4qS>bvVNg3u%{2@EYz=pcme;>
z^r#?>NBnYuZyX^tIR)d9v#{-ZE#@P)35IA#loUEQo;96?jeoI)H6@Tvv96S#knP&B
z-%es3X%7`evhB`9DR^$Y)b!DGDWtQ^I%3F5sZX%Xs%IE)CADL|TE1#rq~xp4h`#yi
z$GKO|S4TsS8-&r(h59S!t0_5G&R0oh3u5-!d6eJP98cV2*m?MehMf(VuNgWw2yu{a
zWc?J#=eSM^n)HSvw71EA)+e%{<2p-l5poFwaz{s+5Olysa?s{LZqcAK)t~c8O-AIS
z$$}}`nF(E$BX>2jCgU)?Cjws`bxpD$OfyboO{>XP;A<DcUKZm1<`l*;A;&wtMQSPs
z-$|({JL|`h?M&!^FR_)g=;-=!tf?M(Y#-ck;70YsjbcsZ;1AmxRu2C2gy{0}%iT7T
zZ8h|sER2lKbqz@_M|rhNYAVE;;p~kV180VE_@F_s58S84l8gf(V?KENcrHtKL#|g6
zSYQck`UUW8fLs==#U4S3p2wp3*<mZj+$9Vte;xKsHvYulyKV0aEcO-1T`mmj$-iCD
zp@DL8{g{+<*v}u$H}f;aR_OCBJ<gdH7WmusQt0CWmS;Z1p7jXE=pilf2lELE@drO)
zfZ4*qKfv#PqK|4k1D`9yC!K-+IRoEwMu<A{W90fRvCSE6!&wIInrGafo6_|Z^mu=6
zQdbA${7_=U7FyUaoKudCxZHi<2F#W2*XX?1R*d`*wodWkQN$FoSIW^fn|01mY&QA2
zzBaog{mM2Q1wH)%V}HP|Y_p`N2cf6_XRKM!$LR5Fe==f-Gm-75Jd<JHT|n$Prytcg
z25W`<D?~Zi&tTIRd3<7xUo2vwONirId_rv6|4|ms3*%vzi?EmB+uE@=zszT$hbNBO
z88>KPefwk<x@cvAvmZnRF=pW6DP8c3Zhf#F`(-%JW9{&1nvWd?J%^yvIAQpacKA%>
zeLNmfe2S%52wqKyA2oRA3{m1!JL1!qbjHw+N+F+dr=FD~FR|5)P~sE(U2H7wnh){V
z7^j?R)H~TCtS!aD4#Wlc@TN-`^K;k*@(l9l!{E=GPHryj+J#&jXEz)9CbnlJVh-~A
zFS;Kld;;QWJ8a5;vq3xJI>iQFrnrE(Vt{S)ctUZ9%80j#kcsC+&@bni5XW=#5#ZVW
z$%5c^-S8t_;ByIM4;7l{w&}+-jvgj8k$>3?-$HS%b9~L*Ya`h9&7W<0<6=QpP>K1m
zjiZ3;9N#=Qt^jxAh!vk>yh?q|+zm0TX(MoN<G%V!$l3LtE=ak{1+4Sg@e6|3*8!6I
z?D&Wv`KNh;q2ttN-L^0Dr4ZS`Ia)8wzXN)z$9~2h4ej0=7dRV&%r{7(jfk(NL1XH3
zfH!}l#K23Gv%wzPk++eJ8HVtj_9(NA3cQDYl=IJo@5CMZ(Y^ePGqRDrG%9ccZMXvo
zbn8a&GfoEfPCIn2*-13)1Zy^9gb;g#^oR3Us0I0gb~i$MYB}QEo4VNgaQo8w8DL*;
z>kLX?<YYKU@cT2)>oUb0%AsN#>3IR!6yc5bF@X<O-;nVNY_A>p73C@eA;(9Mqp>Gf
zF&>!&+$7{G$O&g0R%t13)5Z=0XGC5T1dil*;@aknCy);v0lk@WSm&b5p{H3sovSJL
zjK`g8XIA8|xeT>q0-ae=yliM06S!em-3~5ut`aXVjH$8ij$kwJoHm{FaxKa<qfRtT
z7#lbVer=eW8T#e@@C=P%9Bqz<Gc<SBC>SvI79H0~`<53o4YIH-UKqZ*8FzD>FJvUS
zINyYEf!b>x+JVQiN=_z>4wQiZy3eqW!TSO1Ek4#7MMf$MPmfd19cQHw^0p?LC&@r@
z{@@^fzi`y>z7#4lNx@UFb$(ZYcFGsxnV}<Lu(B5oZIrt!IUXP5<GyufiSL<nM;AYj
zbNwEQ?A6a9ovNR<c)qXOK*xFggSsJ~L;YBr7(gD)bz#7|DC?*^1KN#!!+B?uoC=QD
zEmDZ=P18es1e=PpqrxvCk<0ZP$VF>)dE@I1U&2R)%CqnsLA&>RSv%)rZ%qiis?LE~
zCI${`WqT6%#5BIF)myIP^%kYx$pj(rJFU$!9C{ns_?%X+9TE61t&BUT{aV>FB=EFa
zHiWG&zgJ*V6RoLcbEmMjTt6-20+0QpeQK`_Jp8SF=(+WX#-4F334#02hwdcq9It=#
z{E+yro@bBH<NZ3e{h+|MKMME^Al*|PL^%fbD5Cus!}(UvX3ho<a_?h%5(6cm3*!AB
z!0m?JG@^V2Z>)VfrxD@;8_>27xTo-b1n>VuouI_n%xaV$M)`HT$rk8Y-uVHRu5QRj
z&%atR?#pP??omi?P3AouPwS6osw#bWdmGwo@Fv;9X&7Ea*ZUa&<!+GXxEXWA{l-kX
zgLwh5s1$YF`=vk!oeuAOe(x*dZq0$YQoM3_bxkx+A;CoZ7oRaO29{vFBFw)v9?z&0
zyWc15F)HnLV_-hobJV_cw#Pk=^#I0#{inQx@oFJ6KZhgNuR|>OPv9hh&2*rSJHz7^
z(8KPJf1)?gxo_XlYZ3Q#^WJKOZLJOK+kku2AE7T~nOTIsb1<%mH{D}S0gS<C9Igk%
z^Xew$GY&D0D{%Isb@zggh_yz{m|+GD?OD>#i{OV`EyW1AiOvB!1D?|v;9naM({ex`
z4|<~My>ol9XMJcrm!S_qICM^TR)sn)i*j!pzK(BV%<Z^43}3_WcCt74;q-R>HH|nI
z@;gLRn=wGTrI=j=ADwf#@Q?%XFZc4$L;Da{UYM<a(~LU`=&_Ie&>X*le-7tgLplH+
zbM7=BGiG)`o{tp0-a!2aV4QZ;LC5Q7Q2qiuh*!AG3@^p*@R<|!b0^%cUR;<-Hs;W?
z8M~s`nnQYKdkAxa?WX$$?jPZcOo4ZR+YMO^kb~Jx0o<W;8j@iUWFS1wOaYvC9>Ccr
zXf!ge3j=7iI=9&uO_`c(=L>rG&TjBI2iZ0MpgsGbJLC55?tRe$3pj9RG%vwi-iG@Q
z2kwhk<G$F~SZ76!(?s{k3Bcz}rTbsQnikAsAd5bdlT3HRIEUC-Aa{^dooqDLM-MXA
zH$<~gyb#?1+qRkL`GO^-<59#6Bc3nN*>0C5xnm2(kUhxBc+9LhPHRZ>HPL)=)^o6~
znN+9yGMW?JPf?xD7X--$yH(%NqyI3!7X#a!4L!DEzut*wBYTvX)oFnJ#9!WZi0p*c
zFx)3yi4WKPvD{4B6FJ}oJ~z-FSOt9&ECM9?`t#!U5GD_|F^h$N?gP)5p0-0C*zb0l
z7sV<O>w7Ee$Pv~Q>2~e75<kth&SKAi?$g$oUAJA`4xi_D(A*9arBG}XTNy9JcC=s}
z>0E|+?K2n=n{iH~*hP78JJyZkvDY{*8fWYuNN?c${z^~VsJ?BjTUek^J91*)7rFCU
zd^RSzmip3}88AzsH9jvrFb}dc2yCT6xOaym5qY`ZOfj?5XrcS_mm0$DH(u1gIc@I;
zsXx1(vFR!#8=yEsx+jQFAaY20*YrgEm=MkVvtf`TSATseeHr7lmfp{ih4U%9*!^%_
zM9py{{3_;3a)xkkhujH1Nx1VFs`uwh{0unfQ|{P0a@XiS<Lv1jhv-;sZ@maHoM^+x
zf4QHJ)a*2Dp8IeYK>00ymWFt}AF@^RXF{}h={z?FcPrS>re-spTlk)~lmArrv_R#%
zfX`%Wg0Rh;kShCtU88&VT(3_Fmk)E;##*jb^gQg!dM5hw1-<@}V%39)UAcM|=g{@a
z;~0(dFx=lmp4Ex)13DI$D;O5dGqN>ilo!<IY-omjwEldLg!#Ffu@_<Qc>X1YwDNtb
z-z)aHTE)l*M=|MVf~LQ4c`%2g#y!Jm4o740?8l7r>vX(n&&-D`4xHHzA?{u&Hs7g>
z?a<@-RDXG{I!>E9j&RMtY#hklX}Gs{&B%s$4v~iS(8Vj|nPKH=VdZDS%4@^Q8^X$~
z!^+QwmG2HK-xpT?QCRtbu<}D;<=4Z?KMyPK4J$t$R&ER{KN(hD6;@smRz4n9elD#1
zyRh<(u=3`x@^xY5l(6y$%E{ux_NRbc9QRuA1q}P@De}$mSK<BuzMkjh%6=8#Kj2qE
z+s;@V@|be+5B=#Q@fl;XpYL8**1#j*Q}C~<@T3aAQsFh<SK6nj@L3hFaeLrarDRpx
z?@-|*D*hD}?pI-*3bp>v-lmlDRQMwmYVBXC^&9U{FeCc4n^n9<Z@yhCDe#0!AEn~s
zRM@HFA5;6UQ1R<kxI=}Ht8l*xA5!UGQS0xh@UJTDRN)sIROdTKt$$zbzoDPp?W#O~
zQQ>b@`aG4+tm1Vld_{$`RQRL{MHMbkp<jh7Rj6s_r)s@fg{xJ#SA|6?G^wyuU01Dt
z&P?^|1w;FO&ESq%ee0c*`_{GoaVq}kRoXSW{!sRMJ>FR&^V_{;vR|}&iycnCT<ov%
z%Cp4v8OU{&*A?6CUf0ZY(Y(&-cc3TAa<S-@OPpRXNdC5d-_XAP+qkl;$U8G#6_-`H
z%iW%JZqa4Ogxs>I$UjS*vVLOv`q`r0=c{tbA_hW-*?8k~xBTUFueDb=OT@MIgg*79
z*`m{BFOx<3dWEP=(c`UVUL@S~s&d;`RbUv8=&6+5VyUwN`kUx8iS!Tc6MeHdQj}el
z{_07h#|v7ISV3y1{?y*f!z<fMM888;x)gide%bB!5goNS-DP6ZL|+o|rEdh;AuY)a
z8EIV6tWAP{LC9X_EEe5Wu2r%ZYx0fsVBm9>x$U(2>iSjrWHHI*bg#yePM?+}mO^l^
zyw2<NlN8gZrLJ=NX<)7#UmA(TU-({96+|I1MSO?JUO|FagRIiy^~)ukF0G`ZLZeqk
z=$V#=W{T2%7~Sb{L%I#Jh%eU2?h+rq2vzNImxx*$Ul=picYRfbxYn0OOO2vB4~?P1
zZ>`houd-MCFZfl+_O-HT_luPtA9MlPCQhrG)hoZtgJxJmZ}ar<W(GBTysCce(2q}a
zdsOZCV6^^XhoU5tSN3>IWb7*Xsu!tLQK4^^qH1yCbSF17b%G|9ig$uV6+7(iGF9J1
z;_*7moNi2ATM3n|Pc%>5P?fB5Wej{FuVTA2QmV_zM}TelWv>gH-0qi?MUD&qhiQ8?
z>%iL6@^kk<#_X2Ysl&qjF{d=q0u@wysze_QZk~91bzV<2gf<k>eUn7ewPy3ADW_^@
z>#+BF_YB{6>X2lmsuYv31yv_Uv+1R$cD_W~UL|4sQ8TvA>j72xOujY?z7XN_{%2-=
zwK?|6>y_PhxGc^bhQ%Si1Xx*NFP6V1wkmh8Bv+C;buHF46$`e?<0B`Oip$5;ROqf)
zW~tREV|S*eRycirKxO$+ce?qIMDM^G7mlf^4!NQd&_iWdyuZ}BUNs6@_a5BbIh8lU
zKl1G&udl?WhUL>1p$>>3W$?*vKi6k!DmM|P^ylTdb4Zl0Gk{x=UCz{EPX&1hxl;DR
zG)sEeiPTHkEF^QP8mLtHlsF+4dt5F%oJj@63ROZ<UQa)A)}W~FOR0&B-9yyLCZ@Vd
zWt3Us+No*jFu+{yKYiS#yWoN<@SQpl-Vfj6#8T26mF<WyMN!043bo8k=e|{5FBeyF
zG%Ye@oDAER-LzwfA3P8oFvLf#)amu1>J}Y{<lzj{Or|Oyg4Zl?xKZpQqIkP9Ti^G@
zIT-3jlS!=;ZK^}WKfbys@R!fwS%+ca(rL|!W-ahNR>Wym$)ajh)Ly~cX%ToM{(0OL
z)qGXH=7fme$>~)q<6WxgJB`??P!mMN1XH;Mie{I+T;{%m+Tcnk(1@$-#pP9%3CYB(
zl=I>i%{f7V73=KPK2h7QGWSlND)@1)2ay?W2L1S}uhmi<B<m$#-D9!p+J&#E)>~zw
z0y(WLO(Yh*OcA!QgsCO+s;V*y6tKK<#Z_wTQo~6oR%*O^Y?yObBWM5oi$YS5h1uPd
z>QK_5q-^R}icQD{WJD5Cyag#7X(6d+e<#7#plXWy*i76uNWW#WTisthZrw+2iTfsm
zW%ARoz$C<rq%<(j=9Wq+gktrnT7F0q;;8|sX=OQ=Qcnfq0x6kLS|6GR@hXt91`fZ!
z(l=}J<T6NHwJHskKiTCh_IiAtQa?({D3kqOS)N=XubsTg>7Gofhf7X#mE6eF7Z(Ly
zryEv*I14plcgXAQuF48U75z7e;sHfhwW_o<*dT=YI+<c-JqqmCgLLgI=36k!Q(28L
z?C^``;$(5!lxb5^@o&Z?afvn&(JK37%Ec#%3+z~j#j<m?>^5OoTTZrEkbjfy7K=4o
z%q<X?TJu-rF34UWCRz$mPn;y)l55M!Uv3jYVYTGhZWZ%y5-oYRii>jd7EBVeS1z??
z7Ziy3Rxrz5vUG87Hn6#QS&Nr1$j!T1oR6M)`8IKJ?vh*^*xK^>kSep>Z1lWIT#{|g
z$^mc7{M^O4wp+<D-IQy~BfdA~TSbew)MB;eW-VWAv5HHVTbJe+WJ81nV4Rnmcas(4
zWG~6iv!!8N;Kb||sE7qQmc@%{FmSUh#~iFArI?k!^j2%`%{ewPCx7vRY#`@nLpsa+
z#o5YWm|E6iOYRb=%Cf|AGf8L_^TCH^NQ8=v;w?GZgrqSo_{*~8=I7C5vhwq6R#Ycp
zu2x%5=UZ|MvL}faYi<Fl<tA(X5}GC{7JV=R*q~=#w!(*$-gj+4LTj}gQ`h7X7i3!&
zgBunqPo1c?l(0c1Ah~4<T}mF$_mmc5L^DstQyoeUPTm)e^eW*fIZX|3S3WFijsFWM
z6<wKi#(V`Ysqkw<@LSHWVgGFqIjY=C!{pa~%K*>3818);!_!bU|H>lYoMl@~-}lG8
zC)0idz<~Pt6tzCV<))rBv+z3!8qEY`OOo<?0%=Y<$4r<(G|(jz0n?^TDK0HzY$fWP
zZ<f_IVP%$uXo~vb2<hmH<2MeKeQ>$F@A`f?Le})dWdT>$7svT+>w{a$`Tevnj??Y#
zgR^nEhQ2sXw-30b_@KJ>dkCas(zQ~buwlc7l2uRvbKr)Z>%i+To{($d{3`q4ZsYvc
zhvRGtT}>aHLRSYIqjA=g-j&~r*bkJt4%1L%b8g`e_cYve!Yu_ZgZe4!l}<Rii)+V&
zGZm-YofP3`7>G_`&nj1e4zy{jeEdAG{T_w(yA7-cYfA0(`wSDNOhu6u)nHwO9vqj6
z@Za<r$%+!&YEPXyb#!ye>00`C>eN`aTfv1P$KtNHZ42m5ofrU;Q*c8=dB0PUr(>BU
zUV}l7{>LHR84U><Ju4dBQ?HFYjVT-2Y9mftKtC7s$LbD89a8#45KleZJrwl3903|K
z_A?rhiZ_JObdwBw4o4i?Y(9<ausE0nJJxVUL!BDQYT}}xsG)fGVo#k~!)k`!4&J4B
zw{1DJc>)H9l83f!IlB2el%v6m-0Y!0p3zXJ#xrSX1m~j=O^A@<-qxf4&f|u|casb$
zr&B?59r3I^A$$csWo+rtTlpAAH%|a!LZ<Sw7}6BR?!b!C-X{1{yc@#m1DRwX+pR^P
z8LZOKw&knS)E7(37Qm{$!h0Y35*!pp8;3GJJAv`P!q16FLm@NDi6jb_e|T6OybPzo
zZyW4Wd$q$ZB?&((vQoof9NdGp0{2cB?l^FD7RGWwuf0A4t_!%%Fn+N(rSC@HqhYvo
z;A(&q!}#3>+)?0$hT%2<*9;u(AMLe(?m{K4))#(vpRVZRyZdxS5C7Bq^m)wZNB-<3
z!$OG{4Xm&*tI&sg2WP3XxDYpEB^5F##sH7Q7%o`+h4T7hnO{)g*MP2oE#!Bx_+_6J
zS=Qxww%jGzQ`4s?_n6C>yx!?&>|R#tmvOOqKaJ}yw)+cxY$Pk@XMV;uu~NFI!ej~y
z?ZsYyq0_UfuoU-nY#l2tt*G)jaJS7$i!1n*%skxp(oG`6*OE(pvRuv{W`5jrtb^Fe
ztPlf~R8=xPc=`M#P7kDWxjgQ|wWXC_+$`WahhdOn8KLIKiZqqg`1%s{b32P&m23km
z#jU>&I#O<z82gbzhqn7zDZe6PEP)l`2F;DzogXUFV@6w8DIKej!+;sTUt??(Q%+x`
z^Fp8OD8$VgE(@VknawARztCP;S?I5>l$nuami@?S=@f?3JJunNk$Ov=WjGiYy6t!}
zv91v5FK(%(vqGmE*Q~ha-q6z|yK#-{anqF%{oYO?W};DPy~9anDm>`+5+9r5lvFO1
z*?7#4md>WgSW3UCML)1qSXfzzRq~b<GZxufgFGW3sj}L`QBr!(Wrbe34A&f(vEM<;
zDa0+0y@IA+i2DnSP)Jrl_Y;)EsB=|FIi*Z|NlUn_E9625%BXx<NhYjam>xWC&Xivc
zAxjAxUu_|~q7yE=7Nfz|6e(C4qlx1d*e^4Cr8Cv#OI?Rc6;Pz&m&N=}mz-KLHFavL
zV%YsCxS@SxJ4~-EoS^?04%uG$P3?3a>#K$yUEf4SR`X5mibnfTY>Ze|C3~xv%3gl<
zcNfc99?TbeX^!q@*`KAjfTdm!?U>vWCWT>bd_{p|v3k%JaQSRdmBn`x<fRhZuFvf;
z(t^dXgdEx-PevBV{^f4P+mvK${sp~g<Xtqz5`MFv!~GHB;-YM8UiRYY(-gllo4I6H
zF*Yt%7$xow?xtNw8~D4|znKQQ@uGb0pM7bcC;MmnzxF-xcqzW5smZV}@8z@$zue}&
zcDG#d^T*!sPyXd;-|<=FcgIIP`AET|+sj-<q1m_m{_W+CwED*$SibS?oQS(GJ(zy_
zt$8`~8;;&v^v=Y=shtZJZdgBKZNlkW3-w!v)O__=xNPyeE{`4C`1<71A<rhf_V|p7
zCx<?A>t)0Jcd#$cE&Oa;Tk#_`#jib^c=rfHW6E#8|3Fd8wk1n*q{(A9cTc|c<nZb>
z(+0m)))ssD+{zP!Ump7ApH0VFKmN_UJC9YbT=(;*`IEa(Ze0D|8^g-SKG5;V@cqAh
zCHl{UXZ`#S_ncnvYQzmMjQY_3V*SSnZ$4f(Ye3@D1D=~+IW}Qq$%k+M?U9@QGAnQM
zy5#hf$7er(?XDG{=dDQkLEDa&_kMitw$1|w;@98v1LH4#|MHpJJM!;2nbjgR|8m;J
zzqsC~d9D9-^_o4;e5otj`d<&_bv`x!#Bkf_=ZhS7{r%ii0~SSIbPbJs``%H`2Ma!4
z@UG`rOjO$XzZJ#5Ioh)KxvdNTaQQD!RTMA#;fajsE%(g)!4uE9;woF`?Y4F<PuPFQ
z-&?-7d*AqnUM~LC^b_VozpC$&2j%8GKJ)v_J{<ScaD7hMT7CVtsu?lSt<R6&V157o
zXAZ6@dh9;`;pWXn8|tThv>}}KyYj!G25{F?vjVvc;4*efZ~)RB!y&*&05gW+>;>2W
zNcFgDa2^7b0AB^%26!59H{j=h`vAWJ+#iF;vmCU5BH&TL48YyPadrfJWE9R+fPV%o
z0n8Z9*be~dM=iGjzB&#xfL(z50PC&=FF<^5gq;Ay=SGm{H8Xs^giQpDn*uq2r{C!$
z{5ya)%qwFWW6M$B23SOOoK?+$L(>_{W)@*3U@qWpz-54)fSlh9#@=M}b#XKC3=aK^
z0Ota>0*(WuPqNnn)&NrbKEO)wl`<GZ_9!%{kj~a)fv0nF4&cA{OF&Kw9m6F0$|>+O
zKUDlRyfFgv0&x*qHfc^gtn-|C>s|PGgY5MoubZ1RHEl`~o(2|s=)ud}q~*4oQZtf7
zpC74&9gjohxk=TsFKOP5gG_Vqkr&yu3Qyj^!0nrxRONNg^5J6!F1rs8Yt$zwc#7(p
zW%s$#)=o{L=bg?{+2>yoJ{nkw;vB!X%ID9;GZd9u;<s>{p2+*5Cx58r^jE8OV7&60
zDvTnREcH6qB9|(YeLaog&Ds1(D5kwwUMpANQvvutH_7hHb+7f5%ibih%4y+;ow-S+
z_6nbzBu?((GY1cWt~Sb?$$ey+gNH}z<j{T2WKD0VgssC>i;{9zn6X#dyL4~S-t~KH
e_R{aP#-c;}Znnp;r+LqzJy-4hUBmz58u)Ko)C~Rr

literal 0
HcmV?d00001

diff --git a/depends/mimalloc/bin/minject.exe b/depends/mimalloc/bin/minject.exe
index 625816f1f7774c1f57b70033ea4fbb5e7a14e270..91c7951292186f0147fa29f088511e5edb4a9f96 100644
GIT binary patch
literal 24064
zcmeHv3w%>mw)alcl+sr!G)xhYQw&msmeQhAXe$X#@C4IRON*dlThg@6m?kj~XptF<
zX_a`4!*#q~$IEq)an$R)7_WnXI<}NYc_|McAU@DxG+5E9BOpHV{ntJxZK#fO=YDg)
z@BZ#@4xF?0UVH7e*Is+=wfA1<q!rh%V`|1&BJOCEu`Pgf8Tj+NALme<F>zZ4durr?
zoGmKrft;EahfnZ$-Ob*HR>9Wba=HD&a=YLSxCDnwFfCjpw7MJZ`RVB?dWChxEn7bs
znfdC&v75D+9v*>w_WiGHNa66M4XGR+*}ynFykQ*Rt^f22$B)c><>7MV!}q_nA(_M6
zhh_LO&sRHaEyR0xPpZs}HQtfLezxa{=2+PPo5WHRGA?J+fytM#<7Wb9^0YxkfYJ$!
zC2`acWSf8>CE`-E`ZcjiN?l-OCNV&C3Wk#GsU?i{QDPlqC#azg#{P_U2Cof_6(f^b
zEyF?lu*AVCj2#zLDKIeRiRUwnKHqO|^8+`28XhDN^<C))Qv4DatIzi~HuxLBD+ee8
z?n$@{aK~K+l;q1~qy!M-CSH&^{xUGuo$rwec^^AaN_2~H$6W^E=k<AQz;T_dLxTEp
zJ?^;6!0GHxHwZ~bYy)nhyAgNXWngSxT=pMHXg~~WK3>jP?|$VHLpSP^#gJd0d7T*i
zpui#>6{Yi{^l{`!G#WJ*?V)nPD(x1fS41f}s(T6ZLzHgR8$`*k7scR?g1SLo#8M2^
z=rgS$lRn!Tvg(CJi#c238TRYzMd?^%RgAG;VSI!$zLgjgyPIx^XDEUT<okA}pA*w1
zTgm*Rx_4lmqI5KJ@wf9I_c!o|CWNhIP-6H-eQ{KGCuiL!hII$PC6bL6cyUzM%1dhW
z1y-q7l=>pS{u)KHJSiw5ef)L#simlHk|O{0V8IoCp?+?l;&0K9v_lMu&`=e$Zh+E7
zfi!ODDEq9QIv{=SH;ADn19Eplo`@LsWJYzrpCK#j^jF{7*oVB>uP>mXE=IG4*eG**
zpcVwM7Q6OnJ6}UH9kZFX^ANQca_S4VmGG2bU;GTI!V2p$M0Mx$P~6q+A0viE6(@=I
zMs+7;Y~X#-wr^W9)r<B-b@}kdqV!_XX{$64)ve{y^vP@q@ms0{O9i(=i}bZ9y|7CS
z4b~G~XoMK{$^6CeZOJH$?u_bwI9MZah)}v&N)L-g+W}F6(3Vi*3l?dY6=rRqUXyJL
zb-i3BKB7ZNF*-R6etZTQ7Fnep<1?wZTs7Ocm7%-Fj$-D&!V>M~iK(%~#j!*x5|-ep
z#K0^4T0nLGNIVnz)t2ZUX~Ng=VCJI3UB|VZ|ElOP^A8vC)M|aU`1~)QkS|iHU=3gK
z0_ZDB4*6~{cO5rrO>Y{d-kwONv8dP4mv=?~ZBkE9L|fG3=#w6Gc8bz&%h`8K(lN2;
z{Y35N?Z%$|OjFUZgl=Qe@q~lj@2HL1&3iB3d!)a7?f3*sbbGlp{{F7xfeoTWO+zi2
zq#L1pS7HLYq4(;wSqU^zmHt1rGbi`&(Et2pe_Q`aU;lsmulP@=K9ihi_I1X^#_Pm2
z9|*97qSL!fdVyKPWp}<GjnZ`aLu~wvd{Eb%w}MRDb&Li$oZb$bicJ498Z|z1dEwF3
z)-Y--IxWtHp~IvArzmi&0tfBswQsSfj2kfhq?gH_Zl<OtlD4$LI;3GS=D%t&yZ%Ot
zS^qEW7RF#T50tN+o^WbD+F5hH@d@hW$LOTFv)exoJ^d{<9g%roKq+CY5s@u$LZ>bU
zEsFM2(G(OJpUKMDb6K1cnzR#5m|p)?RoJkJ;HvO9lEu{hH}$_>?*Dq~f4>Etzk{*B
zH0pRZdY3`Hvz(80{CNy^zaIE}!p{W0KMgqp<$6DlQT>#(!F`K0tf@koQ98sG7uDTy
zIdab&bbqxXPEr4573KcFQIY87Cc;%Dc18VV+RY<M^ZXOZI0pOa#Qt=spASt%j;nxo
z90k~tU|j~<Q0&wT+Rm*oFL{9=lj7?R%BR4lut*3^FrH3Okcq`DKFxCZu*K(hge5L~
z@kvD+SlN}u=Uh}*NX3JT&lxOJeDV2XF3_PQF??%m@mYbz=S5n4*kBD>d|r&|o+et`
z0cFYQ&m3B0qPijwTf^)1<UuUb4T43wIoBfjurvFkvCeo?Y#mm%Z}7jg7F#6?T=X$x
zu-&OzVKYmXHgngWKypzxEn+udXJX7W7j>JoPcKP;-TNy==~_XaPbR54&0KP5Wva9w
z*{I%YEZMU%!x%-q?YZWX-XH4w-;@?)nWybFN<E?)|J4e|aQZt?Oys#U(dd4d>`uyT
zqRg;M@sHTQ)h@oySYxc^4l?*bmAMEm@inXTu{E?>Uu>2>vd*5P?Ocv?mL<Bga(3za
zfwL7|r?s6`z(mGi$Ay6mOyHWL8iKORO1zAw^@&sej<GdLZ((<nHv1BPmMHC#`xosM
z!-g!=?Bc*@qOD)vVPKCUh~WxVRJUs~uibV0M~xOKs-0+n%I9YqrB_YTB^A<c(pSk5
zZFn?fsE{g!tECzhv~^@<dbwm($@<#2GC8{4670_Hf4N*Tsi3RZjM6?axGPIk_gT~#
zmQdQ4Vsy7y^402}i_&`i0}ymUIPEm;b)vco5+L-fegkr%bWp^`*<itL8?b=zj|0!u
zV9}6y)#!6YX;!beyB7-K@`}-3Q*r4ffwLB=RBw?!q6sy(X~^FBzVubT<*`6j&|#K#
zb0X%NwsSWutTbQS`8>C@)gL5_(VeIs*e^<NYX6WL)d{GumCnTy%ziX7CFiuAzX!E;
zvl{Job_b4%yL(6yY}z12M&PU%?9oJZEA_lLR;gQ@_KJ3M#@aM&`c|kq_XIw{{EM23
z+f`!Nq6(amH0LlCEYd(orQNI<Kzgk)k&YVS^nPR_mwX1^k`=w)-ObyP?vqs&-7bcd
zWN0QD#ReEuSl`5GHzY|4oV7}wTzgn1t?F)TNY0586dM}`&~imvN_J{*e+1iZvFot5
z^DUfYiA)fsy%xzO5S4nn*z>l=DxIp3UbGxKErv@w$WX+d_Y%bL(x~?7D!`Q^Eb0L<
z`0hEY`oktu$$8%-Q959fwoBKhSxOFhQ%sTt9^sTpy%z%KT7nT(;ADk#Q+Cl|lVr~{
zNwvvl=^CLTY>ZZ@cUZ!fs730wsP|gVek@8o)@j>|4kJk&Arlg(?X{HjX}hk0wEc@@
zm92&Ai1dF-DwA~+)4?eXjS=kvtmvh23!S}jm|4yJ(!Qu}2F9xk7I8c2AliHCYb?l8
zZJJRkFSe);iX{iNU7zBR0s$aZ1-XGYt?FKBSr$nMnYe7~K05Y6xjhxqIbbWMeQ8qv
zk>r#X%fn+)zpBjI%1JcpW6U_bNPVI*Hjz)p(KMT%EbT*C#Wa+ymxoaOlBnJ%s;&Bh
z$P1vcNH0VZY4-rvUQFg8NVS-4I7iCU%NkA$iPGKNQY<|u60G605T@K+G{MySA`)2i
zV<cqa3e}I0zMD5>#js<7^;o7QSyc10Q7;!T6Ssg)z{8?{mQaRKvZNWQyLa=U2rVcs
z+G7kE;WvzW?Y4oj=8!R2yDc)&gp)zYh*>#5v#CT(@GX!It+T+5i0ZwPalEBu$BHDQ
zdUwb;UNUA4<+3DW_E0XHJ0#g5Yo8VqOeH<5pFwkyBMl|l>i$sM>QGBt1;jH3S2<PM
zJC<UCnx$&20EYuG*+czHhy`Tf?!U=cvQHbF2O9K9Xj*5I7QmzJRs8=RBa)+r{J%Dw
z4a)x4q<QdbSaanLTh#|E)MJYFn5Csz73xc@(o<a3R`v0Ut~1)s2Vq@SX|>*93a8~8
zr8g|W?U~cwG)?=^H0`wIS@5H)Lp!m9U^sDxIkaHF7@GH`MV{mH!ilNIP=ZBDdlB;)
z(|2A+sfxi@ylPP&S*P91UB_C?w`vtU&_^`>#nIi;F8Cm$`W*Rz;^3}KG@4Zz(r1^4
z6Q>%3J(-lYl)T{m@g`M&LSZ+J{yH>|)vSt^RpT<_jdeFI>orP;;d}1He2BdB5mqx3
zTv#}LH{}mg9+~%HyOEtr<^W~3P)50UsA3VVb@D-AEgG>>MCDlI+H=up(P>)7#KCpQ
zz$b+CSyWdt5z=4+!R?$ArG1f0K~4F3@}iiWT}MdVH9LqQ-w52a?1o+|mOJSy<LrF@
zML4_C`h}GS>)q_!z!}kYR%wP#wBbrDcduTew9ys)(F1&lMCmiCHMCxcQhBEIvRT5Y
z?$kcrmQeDlHk=M0V})z_PcDCSU=%D^0BIdm_lfFMF_d;zjPA0OoL&7hiv-vFtiBK3
zIF$vrWG*~o4LzdoM&1&fi+28GTKkm#AhOy{X9Ah&tJcu3^c_HuZmTH5uw+PH6dgs8
zRr*RK+xs2N>zZ)lBjk!i%=z~!!qYp*CJHQJbC$eN&>SZ#(b9RsDiw;mchcG-?-#HJ
z8aqn!VQ&kh@zJJrM(rQ2<cr~GjF0pJt%M_yDmmxZ4z7Z4oytJ7+`np&faWX|ErVly
z1qz3g(!i<q{~jhsqH^^_dqZ-rQc8?glzh4JO7s)P^$W76+z+FK({}X|c@XkuS)w~A
zQIKp2?nF0C`r_nMzd)%)dTCcD*A}Kl`khq!{nIcUcq-8%y+tSXT+6iA7f7X8O<soM
z)MhftlL-&`ujCoE7n$@ek&ZDWl~Z2~^c!G`%#Gy85g0iVv7u0#2{IZ{h(V!;T%-0P
zGc$$)m}U?sR3Zj@lf~dpxOu9G5h{-FEXgaPE`o?WxPno%mVB+fy#vb)&Wc)58b$Le
z2g2tm!Y_GFmg8=2D6|9zOM9SM%m<njOT=(i4>t#G*Lf^fChca~W~`EID(22J{+VF<
z95Frm0j(8h{L_n$ud_;t*d(U!1fF{L92H@YSn{U#PyFolELC_6SgRx(C88p`hEF>%
zcnKpLdA@&W;w$stFc|UtT%==K`ZchY$YL<urb3stVpoH0UnQ2HqT@KuJx4PVBM-fy
zPgXoAzBP9|VJSxewmFyuMTbeNRmLqyqyFL;K~(oCSaDix@IhsZM0Ld|rLFVFXmQO~
zs9@0k_)kb<%gaYkwC#!Nj$BNZiZ)=bd=XCK0!DS)h#_`FU2mWY=L|dMjU=tTQNy-W
z;FKsz8Dhwl+%#LI?b=0THe)G{2OY&#a<z^&l^GrjCB;h;v|W37LapuUA=+Sfq8P&F
zDJ;TtDzmju8#3u=5t=V-Nkus^?felE)=(owj9=i}{m5wA*N`8)4ISc+O?I9AIA8Iu
zoG6~4w&JjzTs+~+YZ&vFh|<f@f2sieZ$3qpPy5HMtB?|32X+Fm82*O{Ps9I)_g!E|
z6YX8VStZ^yqJeN_d=k<8sKRQ&<I~*jeqqExBOPv6ak<&#azBz?E<ap2#*&6lbVarI
zG{C=Dr7viIinUle!u@M+%)dT_9$EjU;|0w{?piah!SMn!%ZlU0Bd5;O{*C*QFiapK
zpeOsKKAeLgiHxrW9t%oDLq#&`b|U>OLiup|uPGBzGHe1e$Cb<<VFHmCl+0!#>){z#
zZZ_GbK*u|rMeD7hr}Q1@kwyBLzfCw5i6G2@8QQ7e05tp}lp;!1ncAmE$@32jUe}p`
z28ZhYRE&4z0U8y05dqKttezG;i?l!T<i~_Pf~0oyxyXH39<ltV7&@Z?jkz$|uQood
z5_j(+Pc9-P9NpbfI)eqyZlm*yC>@CEHhvF@u5N31)(orGJfQ49uq?sfUkQIN(&=%b
zTAcP~RJR$l{N(g9O$~DTdQxF{VRTpGMAp%+LRvn*oP>@-@VyI_^<${4=rFCUa36_d
z)+S!0Y*z+4%IYj6QCRaNYSPxJgJ&oF2eR7hx<#$|D5kOWBDrRP9tHF;(4#7<(?Bq6
zAnMGWQNN*BqXVx%HNBn*r{4|+<kI%Oi){ub_+gN4GjQhEA!E>^x+qZE&EPwI>Emzt
zFYYKiBJ%R|d#J9~{1sGwiUM^}-D;5Hi11U+^u^u45q1}0r2(3Uo&CU6z#%7Fr9N!d
z^oskCKw>EYTHAFR6#V3Q8?T0_`#ng=(mtX{J08+@lwCt|_;2edE2l)@DtYQY4w}dp
zf0DbSM%7{6DFAAyJ0qck&8X2|K>EXgAJcJNjpUhUks+=We%XR_@LbgIM~#=b94|-i
zLo>85A#1aSZ`9W#_JWwp&BYXV!PXG3DjZk|=@r;)K)DmQ@!13eITCpa_4h}0W`#yK
zNFxo=tdnVS6q=7A207nw`u89Nv<U4-oJ13M4aS!-$q;?#+spVkN<r{*l_+gDY9HEx
zSx|&GM`wyo1E;-5ho!=5JM{;6QuKWMKu1YlAhY9E)rvq$$E^w2T^&aWhWI=Lqzz|B
z2B}NixdUjTO#^LHAc<)Gv+*J@tUCcpm~$$2+H*`P(ZDD%_<3^R^e#<!K4Yp=_bL^q
zqGEes6jcnQ?b3L7VIYpHQ{j3U=Xx)=4(;cL^B+O{r*RgA3JdClBi4y@AR!w0HR{AO
z>2fE|pwrZe37~CJn)`mNS933D|FXZ>eg^u7_Ki=ePHhH1dGSSKU-H!u+q?I&6blRA
zoN($VoMa?vJFI&nMzTXDfy^Vzv|XQ|)Ef4s^gE1OM#z+3#3&yeq#OatmwD;U$^CP|
z?fXja-bmx^Y2fPmr=U05&V59N6{hP+N=RSyXYSH`jcu)}f5a}$r<CCP?$3UhLR-R?
zQ=iiNzRr{W3|O5JTqEn>LC|?FvFQ9USag&<k4oV5qW|JZ!C4S%H}A%_G3Kw+-vc>b
z1RXG~#mZPA?TUOsacb-r>k(|k8tI`uUK=fxgU2dF;L_i~5*=BGwrG*brllmvGtv>{
z*HPX#lwU%5n?k%V2bsl`QDU8Z*^h{+KwpQT7+$(MDLt3cM<eTy<`kjq2yK=SRQ5$4
zgRare>j05OiFk~WD{4UuZ(7askqRKOSx*DyCq&erf=4EhkyLuT2^<=`lo~sOG&pM_
zM~G$zQQw-xc_pFih`4U0(Tz+*J<MgSin);^AmZ`Z++Lo44D^w^I8Ri`J#`42h!*Q9
zw$XUo#$TMvo&66OIYsQQ1T++$F|36rh%86uuA@@=gY)3cFyT8d1p-mu1-mstppYR$
zJUNPYeJ4Pq7)_vqDO;i_J9SJZ__<7QHxXO}g54T3YD05~kr+0scw2Yvi>w1C@_mR)
z3v&>!I4{A<7<mV+Ko6s^_cVs95-^`7bySy4yhg{-A{^Tn*(}p0i&ARjD5go|-|)cN
z8rjNWcI20U<X5F5QZkS4U^w%jK{QZn=)?vg^3R|sI{Z6T<T6Mj_4bbi1&s|TN;+VV
z3^Xf2L+|1*{6s+>k00Y8yG~AaA_;%-Su!wym!j4>J}%dQH6IW!HdD&j{Ss7AT#j9o
z5+~z5Jj520`!!-opFgXpdqC9wE`7Wa>(++|EMP2q5o0*3j5`JdGf{(5RpbGP8hHl%
zv2jT(?C#Hs{6@}<EZP(KIg<VFZ&GmvF<b8_+iyT~(y>4@hIr)<A~~`oxi~h_d!x-L
zjr^SB0@zTe|AF#9k!kYLLQ#{}tr>X{^{6lUsrEKa7YM|V<{kjb5=8c20Cs5_@KkXD
z$bca$i`)dExDK-MmYeVVn`Uda9*9N*ZK5sx10-N#|4u-?cg<}2#wt*^B^8yLW*f5u
zH3$r9pS~97)$Q4$`jGZ%BVLcBbs(&^R}5w85ft@jBm877>G7sW^ODs)){<^7&XL=5
z``^MEj`$VVQgD@?{g6^A&}$MP#czT;vU}xsA9o##q++(=t$DXUwexsjgm|a!p1IUz
znusz@M;Ss3m@dcsiJgZ7X%U)8FzOiqu?}OrWLhy;b`yx<)Q$y4M5@8MA174uQzFoj
z5~VFsYeK+ryWEOmC(qF4^X$=a-Di(R`{aS7`J7!VN*}<uaHQ5eTMEgZDcty0-cP3?
zRni;qi$QxPrfNlIRChldyeOIRF4>G@;0ELn{FzDVPB|T}$d>c7C~w9)#fky3=Y${@
zAzfr15Q}=mt+WTGZ~MecktrH#3L@i}rI}44V187IXYs;8^8?DlUoYz|>h9gY1uCJh
zgSIeO10cE`x(Wo*$%o<i_V3@M>fOH`32b230I&G6<LGxVSs%e>juHuS-;26uYu1%u
z&v0Ki)&R{doIb2+AQ+r%0YH87ceP^pS9$|Qbk}^)4a1X;ZN=6O`_22ggZ3v%`wmRq
ziWv)EixyxT=(cgoLAV(1At)QwwS!oc{w)GBG5pU*x&PS*&lJ^>pU0lnUn&M0^~ER+
zpWvmOh&EmnAfo+#I2@q@WOKP@kq~Gv{U#ivD0THwAx`NCLUmCyBnU?uw>&_t2D{<9
zyVjDN_wxqi8WhFbjqN-3dj`N7QgKvwFL+8vX$yoR3Tha{Fb0qUS5aLTHHelBQJoh_
zEK=#gFI4{Iu&9po@KfG;{Xu97kqJ`Rvffj3xx3<P4N2@L2I%tat#n>*nw=b&A=*S7
z()*Noio<qnp6Y^IJ0ViWinQR?b4W1lKgT9nE=+)I0Pc}&;6p&<Y0Q*wfX3pxhBYNN
zU+am$_~5PCiGeZFA|ZVHiSy2PgXa=f=+>NPhM%hZ={%&w*FStz6LDfJ#SjAOb;*$?
zIUV^B@B-f93BSDrWZ|;M0s2Q_X`v1!VgF9UNfD=#x4fq~W159^vMtGSg(n2%x~qrP
zUHu((Gx;YRwFuqH^EDF@l|9;x6grm<8`pf|aM>-!H3Kfc-D#5cnWTZDJ$$-oH=0uq
zV#XTRe0;Ut6$mZ+vpMxpsN$UTd8qcwzzt$B{TIa;@yP>oqgrvdCX5X0V63b=NyYrR
zW%Wr3%%4-{A#kx~)8}7CgXe^mdJ$_s{X<{1KkxBnnIz3bOeSNnPh|>evXJZ_0bD8)
z_*~2=eQcHvndu$y*CSTjjbY;mk{wb>pFkkU3xObxcH19E`clCp0Zd+;LkA(%>alz?
z8Wzt}XAh$eYRKeU^l0ByGO&8Itcm0Cg>YxT|2|{SU?+p|IPvvv%@fFy#Je?*AO-uP
z)#aa%)NXq(%Qp^0AMMt34Hd0GGBjbeOfXIxoQBG1NOe%`c}Eaa4~n5$0aeFqgS4R+
zC9^Q8cTTUCPd-UwLcJ$X1pAVAYi1%z{vo89ft2w~kKkVx>=SltvXR9ELBSZLwu0&)
z#Qyq9^y<<*kmoB1I6%3QJ%K{r!1g)Y139314cK7%TX-5kcRV!V5R#zY4$waW1Y42N
zZhQB8zBCbUeQ-Y0JO+$WyX~FPz6FD<42Xi`vn;XaROaL;OJu>fM}#!hv%zZ3o?K{4
zJbOsIG`*GcPHzIhfUHOrgKs}ChSC=+40S$iq09o>IWgKd65xswlt2i4org)q!>Yj@
znfN?l873_G-A7Q4Y1|u~yb;3_oqQjE;sa=;+xYVbSjeK2*YoFM{)}+^#XS81Pk+dt
z1N`|3fBu<2@8LA(c=|kle#xI-^C#n_ck#5JKV|;O9G}9UY5bYNpP8KIFor2Q`EFp~
za)w<)=fmiUVMRO}S3dbca4^(jxfMj|eNn>c_z?D!qp)sZgSSI~f>6p!iuSB2Mx))@
z`+B4v;9(~J>#vM@xr+}d(51j96}U@*uPN}10&5hQtH7)V#;>cCe5V2n6uexDPqLN#
zzzs5{>P8tBDsa346BT$~p{pLor&}q{U8Zo3K_$CZDR(LOO*bh83V3jMepvlJCI7wx
z(-it_1zx7W-zep!N`8R?mnd+#0-XxHOQClv@-0{L2bJ;<6qsBm3pz%D^A)-_1;%>w
zpu)$mz;2~}z5=gT=&KZ1s=!|<^n#MVSIKWy;JXUktH4-$P0BbFD)nAh%CnUGVI{v>
zfhh_;R^K#B{&_+ScF&RXCx*co{k;l4mhYT#;m;dl_-FHFy#Fth$LNMbxPc2UyVvXX
z&Jmcu!P{*23k_adi^FfX`2$}29HFfkUR1umwY<UGdgUx3ccsJMf|^L%ZGzX{=<tHU
z)W25mJIdSs8dn5Mzg6BVXDQ;cfa_+Ld!<WgZ9s=yc0s0}BNVhvp4C<&H28dhR=a?P
zP@x2Oo>I}_TG8NiGzu#kayTZIuQCgc)`n)gKtJOU<Sx3s?aaGet{8ANEO(+Ax8U~J
zT|$$?3H?p>r3mx@$z<Ogjuh;z9)J6E!R-aDTX0f0hy#@m@$lLk8U=rgU9MttW6S08
z`-qN89Ij?z%4FXZ;!D3cYJjvPGi0Q8h1{6X{0B%4%?_L33bZb_dod>8Ne>1-N3*Me
zMqe4ffX^;WX?3`MfFUg^oFX(qaIbx(*Wo8AiVE|VJN(ozSB@{AMB*2I_Y{CAB&LAh
zNHsV~@OF@S++M%Ek<;ZjI-N0kxrM=Q#n4Pvx(}^8+%8DB$}ZpsJa$*34?nbOce@&e
zSQ#IfT#Rp9z$vWo<<n3jsq`bpQ0BM7;q?a^oc|a6oc4wlcA>#9c-%hd0<ujm49ppl
zztxRmSi?|pQG79jn%!PSKMl~2PjI;v?f77{ep`#Iq!h2+?QOJUR?$z%NTsq0eRE`0
z3zLf++|ZN`rYKar5-iHr(%@=V^i3pgucO)FLf2y>p|JG{xsz7~rYc++17FB1+b*?~
z*XrOcz_$E$Z!0EwgWo<?;JEk)y6ufw2gaU;pSuS#W|w`X(k#p$eaaV%P(iypAoyT#
zbA=n)D+j$Nv>}V`n=X*9V>VBkawvAT5_4~8&hUAsG)Y#fNHHB#P;qk9n<08C=R*{m
zt0e3&YQ|Q2-Jpu^$v1kz2O_@T|CL_<r9KYH>$STY;IcS#7#4^4k)g-gV6%TiY(?%N
zNxofbjB6eSY`NRVoe%~xFAuu2*#VsnpP%v$7jJ@>wb-2=;M|0VW&4{PZOY)&_zvRA
zN<CM>5AtbYZ}VXC!oq1PPz9_M&G5Z0I-wIEZVCz)_;t>Q<H|}&gl{r}8?d)J@@#G=
zc?7%1?u98f4zd-fmOME)e`R4(T9DTT!RBslZGiJ|(%PU%O3E6nN6r}(?H5wUM8|9)
z>ZvJAagB3?6*Kc^!PG3=Q~J2`ZiTaP;#YbC{2YD{ib12^$rBF?60H~RCMf30S=@`-
z+w8UgN7HaZx*4!yyNl)q@q@2{tA*gmH95RKWL-iF*6etO`6(#@AC{>(;Bb|o2q)Yi
z_t3XYC`BVzrKBi%qRML#@W`W)MS@?x7WYat2)9jGqFDj_prvpc{K{1^94dG6a#B1m
z#KY}!w)2trhNB^R2d7soi&qKI?;|lCp&*EeuH|v76LMP{Znks(KxJ?jw3rCX8*DcR
zJULT|R}<&Ot(J3w>YOVZ+I>Q7O4_*xatGk6y>6_&a3!e6uL~`f);h9W^2dYLs*GCv
zSjK8AOcY?xZ_XEp#Sl|0O&GkqM*H$WGc5+Nwwq;l7-N?gPeSWqjCWpMY(qutmDMqZ
zitVvz*%`F01{ZB-Xk)?2Vn0hx!HRFkY9R>MVVg!;m@+u0r@+b--k3n#Hb}qCc9$}z
z23@z0To3m@SbE79!}g|NO_-7o#%6A#v`vuhJufC7b%-zjpr(=KT$<cY_<m9{p<;EY
zAH-{s9b?eq_j`PEX3S`Y#DV4cu=yFS4x88Qb2s^sl3SVK_uB0<8tp4)EO)qO(DtI$
zp5NMd72l$?(&FlH!78wpLQR+#_O^yrk5g8~(A1FqoY2~?{E9mt)(0`-31rh6RN63F
z(yznDCtSJP(~jk}#V_RArV51xg#~$dTrpj!hzT!L+kJN0V^0@M4bZ*S?)ZV-m4XIq
zM6<AH;ryEGjMZkrvPh_^Ubxs|GMj`+#zn|anl4;tsSy{})(D`eHdfXw6&B7HjFn4;
zYb=$f>4JGlRkeB1B4J@Qm{}^StQIq{mdbK#t;te(wJ;AgD;L%XR!fDY25f5<@+K8#
z7Bgzj7b?uv<sx_+=UJ?lnx*81=38niiSPV{)q+u|GFI1E%4@C0YN4vOx@zGfGej_f
zaiyhlel^-LSC}hn^3g7Ef_X7A!XnXVwNhi?W~@aYs!2+rd|}nnYRlDPjUX<xn#@4X
zGebJ#JgZr53|%X?8Z8x2m9fHjHAz@4ECe6wArZ<l;^&@bLQ<PX{4cMuEUcu?lrOBT
zsYZ4>`dVExSou23BJ*^?SZ!HEYMEcXu!6ctibWl?05+&uX_onr(k~nvkkDAwqU$kv
z1e4il1vd;-rP9&ZP{Qs8mo}bo*=ebg_vw5-#g-Hymv6Q6TI4-8_s5vt7c5jUTHjRq
zs)t_&RV?-Qg$B>JpF2JCWPFDLztQS{lRV#OM?rK{f4iJ*ihOGoxK4o&C~$)UiB0Tp
zBH-Hz)`_6)!D`&|<OX78_&DV6a%F>yx<lRZ0NOzKlXU}T0+!8WY!U817BV*H3dWqc
ze}h2zv$!W9TH1npD{h?o*(}8H-$m$}4(C^w*I0?crpxgs9O!Qw=v!StvrS5Q45u$B
z7_1}XuyZruPZprR`3^ce>Cqzc=r@{V`2_{Gre?+-M?RVI<<&L%CFMq<*)$AC$SoJ*
z@XiH&y8vh5b^C_l2uZpgYQthI2kz*FIL`0H1-L5CFLEJ{(+ymJtKoF#F2r#<hK4${
z=$rDl9$-tX3T?}I{R+3!-`Ys>0lzk35Wi~Gs>bC|4O>#H$nEvp^cEv;r~U%m^}L;y
zcwCK4=eYnU)3pItszy6)G#>Kb$asq6k;ey?0XtaASoRREh;SXi#f>A6fl$1$1HoOT
zt{lg~-ksCQ?3u@lm;S_SxsS&d=%oz(eTvxMs-VJpDyP3mp)Y`SA`e`LY7oa|BK%*w
zRN5q_Z5+w8vyz#%I@O~ZlgP$YkMdkppIM+9m&nFdf6p_fURR(Ro502v0%j+$Y;Tq)
zCq0p+Hzu*fStHoNiy$BF$DyYjG#H;(r6jVHStD6WVUj0jY!VxL674jOV49jFW*Eg-
z9qyw_z4*K;LB$dZ!0(bIcFD;^ruD0trZIt4jb`lExHA{aZC#KbPMZZ<+=H}ndDXa7
zHm>n<Hm+tW8#gPLjZ^7a*1)I}nI63Rz#Ffm!UXg=g^isxijBQjH!%9dMF+Lr>7KOu
z)GAe0GRsn3#L@>+PmJ^=*N>=5D#%GrV97hOSv?eR-z3I<Me-5urA(fG3b<}XW-5=*
z$JbFMC$i+~M31^Yp&;jM5<9yija_q61AV2i`pNJ$xRb8~Z%qQz{5g^5|Kl>ovIs}B
z6*vZZhI(vx9eVTi4IFGIo-b4C52I6!N@k;KMzc}S$EYVWy3;(V^*J?(tOf(0d@_?&
z!D%kXy@AVtc7Tt^sdCa-PNSCP)MT(6d?b)lJz-$niLnR2*RAuY5>+g59%Cbi+2R2F
zDmbw{_?rkXz!u225=?-_XW@?JmGP<?Nqi<TM)fciSP5pqPTYwIBogE{RRu`4J1d2y
zS0`1ebQ-3cwT<aiTUZj6aeGbT_Nvk)GhHKY*tl*~#tHPfiulq+Z~*f=c3qD+v&X>L
z1F{F>=t+o~XB*+pG3R5K3Ak?HHpSr@fh$1&m&Db*1Gu9G`20BBqrhzeZfzWHKXA$5
z*A|ES0Jw9YBmWb-ObtjGV!3a^f4qN@b@Jd~q)X2K<Nb@Qhrjpx7X$P8ao+Oc#WbaO
zGMUxYmDl+YmvS^YY;}l`HahK~7zaEK><F~^>+EedI}c#7@!y86<1u;sC8?`etG(4{
z_v4Q_l~>nR)>tacGiMdZk?mS$Z*!m|#G3HQgp-9y0++49U*}`rV>TWeV(f>ki9(m?
zeqCLI&FimoxR=*8A#%%B;=5pHz}JGP7;CaQd5~@{-T+W+nXx-rlh1Cynf(j%BNDa}
z9hl1M&_H9rgHHkKkZg3gA!lo=+f}!s$>T)?s)<@@u-WWb@P8~z<7sEJcs-ZH*6Lxa
zSQFj@`7nj$cq3!?$aE;Xi#73}DXjo?h^e{|2mFyNJ$e*mO>_unjYQ8Qu8fUk@>!i+
zLY>dvQioV8!pG3Aoy{YRzplaKsq?pc>}({-Z1>|7L}zxydN3l{j1=AEXhs;N&eec-
zRV(Xo2wH)!Bv_rpg}^&re5@KQvbzx2ce^OKNW1Gg^dv?Vs~t~rrObok+3fp6={h^R
z6#b*2tC3}FqQBxsf3mBt&Qpg`@;2M(tBS!K<QW4=<<Zt5CD$%vbzXZjf@0{gzlD@j
zhiG7fle%ArXct<jBP*b27VRXJzRIMW(oTFyO9<cAaUoQ4t9)2VCX8L29^5X@lm`*9
zmyBy)DIvR}cnG@$t-;o0DOfWjCE&e)-_9C5j=WZ1-b#evK#_;PW#@Oa+Vh+<^JeDB
zhCPge8`^i4!}OZt35K`PVsG$#S2;!KeeKX=>vvI+)qGdEtkDZ7ZcV&4VE49H*}Xhc
z<g(ez-RLjoQfb1~c7M6-463|tnlY9}W{AVq@DT-)WvM~Ch|5<4RT+KrAupxaeQL{~
zkuI{r5=5FIDowTDS>E8G*KFnVZV!HBB;l-XH^Q3pl`%5A{CL60GO1*-{KBf%g<(O9
zPpB<E6Gau9?cOSchsoeS)zrFVSJr5bIWGu8onf0ai|qctSo|coDSdQ%=iB+~zZln_
zQI9M5n<tU`N$k6>F;`cbtwn{hmn$U?XoDMJWt8I1=??M%<WBy_UG(x>1*u{$!6}`<
zrNo|AzT|8yHw?zUTpfn~PiGG-6Am}ML|>=M7quUMZK~Xv|Jh^fT$gOHJ0E)Fh=0ao
zCw+(KT)JUm(r?x;`uTm$t@WRmT({%Z+LnCjk$Y=zeN{}n<LpmnoqT1kIPdX;q57kf
zGx7#Z3s$vVu_EW>(mM6s+Kw+DiRVA@XJ3sU|HKP3nzWm94m^5=^Ea96mwuHTzLA}O
zf59gc-nOmpupQVu>5ehUPh9@&P50LKtgEOJ4Kv2y9-XoD9bNk^g&D6jzn%5f`%7NR
z*qQnA>nVp$oPK8RZHL;ItbFKq{7vgeSN-7lk&A8~e{cVK-BXY4O?^FM&O^KIJZajW
z`2FX{zUSXAoz8jr(Y13%O#0o3ZAG5(Ikz^x_v(l1=f63p^7fTeXI=hi$#a+dZ1JBf
z7f)IJ_JcjgfBgRS1Hb?M#I`$EkNm}soqxKaf8m|)l=rB*A1gfbX6qZ&ueM*e-}3O2
zUnDf&{q+5n1HYa3lCI|B=jvO!zJC9=Bd*b$Y0cEU8XD{P$)eMyW9~zvlk(d>te^Pu
z#m0@>?q0C#t2ck^v|an7mx@z^cV4;rm)lyiJtyXFs2-@zdFsZmdzNk3bm{#&ZNDmd
zDYx%e(m8v&MSS$io34Ft!UNQ9!QJiC)&;H@oqFQAOIKCD5q@&ZE%lGw<=@kNd;Kb@
z@Pk!E^N;I)o(3{AaWutEv6gzkU*KMg^d>+JVhi^noeAj1y#Z+t;7$b}A8(*I1dga|
z6KDv|!QF>+d~AVY4h4uIoCKcWHMr?-e#XZVD8?WnUXTqu!Ajh-hz2kgQy?hn@Qo(X
z09N9zCmO)*V<98b2LT%{X6$aHJ%CGd&=;iR&;0T60E!EIpl9qQ&=54^Y#u?HU^VV@
zR2MK72Ot<b{}VJ%L7%V|5PTcA32A~K<8DNnU>eTpZAcTm68Bo936|p~dV+LzCw%-F
zp3e8X;Z2?bp5QO0;hRXLHvv9__~!|vDGutzd7b);Z=e{ylVV>2Pw?NA^aeosd$x&7
zWSEaM(NHAIp`@LFk1FZM0gDP{p0fb=<2Io#!2tzNaBPuGGahiUl3oJn#!dV^fa7N&
zhKssYfH&hN{5rs+S3oDgp8%YBrHnTL{tWk8;5PuiuA~Xl_q&8A_|9yMDbo0cjBUsL
zIPn3b_{1ip2~rHA6lsFvaW^9UkLxdKK*eLJ*$81=NFjfBUhpmWk%^dtAf`Cz4~H+_
zz?aT#YsKeBcCQb+?6N5{^9!cn9lp&?FHOs))Yi<;E1n|w{Mbr0;PVB0*_3v>Z_3=O
z(o;(DNt(TNIo_Isfy-AmCE#_<@!>O|)&?J5v?^~u@zq1?oCaTO{)(AX==%gmlilZE
z9N!vP2|}sg8}Rupc>k$zoAg(>6;0yxP?NuqcKF+sJTPASEdjJ*Z>;h<R$yn_Z1)Wo
z#uuCU_Y3H@)xN^+#8*3bmQ88!SzIgJH`~2agn+}ykDg^yni`xw`xIfuAfHma!2L_D
zl+L(7rc%84RXT_2r88oBL*~Lk{Pvsy^8zKFjcpq{Hm=>cZsUfHn>O}sJh&0aD!DB8
dVZ+1X!v`OZJUsC5xrf=tWGef|^}j*`{|A`ww_E@K

literal 20992
zcmeHv4SZD9weOxJ6NZp55i=M?<bXpH3JHNw8%UxvWG0*glMwR(sAve2lVmiRna)Q@
ztlD4_%Xm61_g#ByTWfi=z1RMp-qKsI0&TqsQ3zia!4HtCsh<ZUHChGy>UsaQ&zXFw
z?R|ak-uHg@dElJ2_gZVOz4qE`ul;e(q~iMRESWKuf?LxV+YLyUgFpYu!^GJ1IeVwG
zho>H$yW8YBI=8mP7Z!q{Ky#>}P4G7O{eg(ESr$T3zu@x=uC+BnTcA<S&&Wu#8=`-4
z-|Y*BKe@OgalhQ#)$tngd$!H!R5_g4`5}jwbiT}CX6G5eUEiI-;qWIjI(8smy=_+K
zn;gE?p~H*xywBT0vOljSRc^)_?@DF9=*-Oto)I>WO-q_Sn~{=V*0H}?0GP?s4m4X&
zCoz`FQDczp0D_E(E17NDnkZzH1y&c50K{itD9IjP$Jihxx)>Xxih}r$dPcA9j4eYZ
zeJv-Aq9-T1KriBo8Waa(9pmLpDv%$MJ0ie6I1dj}h}v$n11Ww9jBUyfH8w;V7~3`n
zC<ksJSuXBzmjjf1osFF&{3hH~w}^Y(<zTEYKd3YEHlnS(&eh|XkOZG2KNJpmk>)n(
zLW1N~;vRQ7IG@}a03+Fm!B(8FiZWxDgRzxkx&OaYV%&TX<{3C*Tw-ja-6F;!_RRHS
z_ge*$a#B=26qR?>6Pl*E3l9=q@F)jF<yld&Xttgu=vHN;-61LwyC`-)UQj<Oi$sdC
zT6?A^=CWsdVjjCtvyO`;nem8ylc=0hZ%qh}7=ll5!3#++iM#2B@d8CifqtJY^aB#Q
zVGp^zX8SVN?4)|xXUjia@b8xoO9*?o1IIVoi!|HssH`$5#%)JYiJFZXI9ap(E2q@j
z3p~mIIMj#!43e(TWgx*G%Hv{8L<_256$gwW3S<#SS7{zbETn!Aafq=EBYJhQpen|L
znVRiJF88Eb0eQR^CK~I{i>YYDUO-(@1hY93y}<j6Y7ih=>^*4hc^1`lEoauAqf}q4
z)n4#xQjq$*$b*L?Ub8~8ZOjL%w=XhNjEknd#bD3|G+VijjlL;*5AU^5DXm|#Z6~bq
zyTY>`Wkj>R$#ofw*A<JDy_geElB}hY@@G+ba(^;<=W*hSO%dZ^UAh?mh6Ob33C;G0
zJQ7DGqE8XZcCXR8BGG$PRG_dFOL<aK_IuD`2ep{|PN*N?8pT(CFoqJf`G116gmVKr
zYIIvTv*CN)9j&JJMwe36;qE;iwG{S|oEy+_&P;b<pY>5OsmWE`A6_deHG)eyWu4<-
zE@gGPyZF$SY07GgGx?ws$?1}Yg8OnSiU)4D55K6a&T=n&%Bk!Vll#TwWJ6>;<7Ko$
z{n00yc0`P4JVBZ5l$msK*XB-MQ@3utv({PXT<4_z+u$zLMCEyp@{T8Vo4v@byzN=O
z!rHR}6Og1mQMtV2&FJ}x-m})8TwqiiT#^iUX}rop`~rGWv%Rs1F^@8I=0WtFQ+Wxl
zmA?Fn$R(n(zsWkM2T1B=G49B6Eia0`FM5adK8BA7V!Q$Z{!tgud-{$>Nzuq2l2V@O
zRGxDwS5znmtdDL;Dn4P2t7gV3luBWhQfq>>PHf32Q#>Zv>yWef@D_`<PwMW=9e$=v
zahYJN=bg%7v3q}(m^>&YPnTlpAB)-nvG|kQej+OO*&l#XtK;cs$=ftr9w`v}jeQq#
zBBBZc)B%FIgrv0#H^F?=PtH-$v|Ut|4TuK@U=FD3LLqIyRaA0C^t_~$*d^s{u~&;+
z)6_KDem-uW<8HSEo&ytRSszK6)6-||`8N!cl6-5=qkxif+glb<djiFy7}GCWADgDx
zhM?RYxI0rWXtoo`6ko9RJOpm*Bgv?@r!RU^JkU?7VAw#5>Cy9IcfVP)tzSqUf6Sxw
zi3^{#J~Dk<`cg68Zt6K0eHX(|a}{-(#JFUNo>R;tkS{4CF_ZNXvx@XKX9|Vlc*ZNp
zsP}&a*~&e-c@FeZRZ?u(v!b?7j2T$14>hMo&wG>}ZZJ5nC%MlP({rK%TPDmd!mr7;
zQt=bkJAZ}9<53>A?;y+f9=G=NVcAIRf)o!<krcl`?8*B?<&fC_2Xlq;J276;B`W>m
zQ;1>LX=48yNn$b@{Q3nkdB2GIsAtK2tdCaFIQuX>PgIV&lzqyz=~D4i?P)GWLP$8{
zN<IWD<x1VEDf()KvM#&uxJ$V))1_2c+{#L!BHp4^Bo9lllcYQ$B_EW|kDyl1!Z!<#
zQ*z-Usrab1cRsWoUagyI8#-1Ee>i5Uge}f|f<`)b)3OJ#y_d(K!<sD@-O~#P_<K;%
zk7ulaN?p2BSy?0{KO+_&v-Y0C>`-`oO*|#n6HhNxZp`w)nYl{+P@+6;pXFJ22nr=1
z^u)f!?G7C)ln+3xSojessjS1K;ITWT<mZeDV>y<bk}}hc83S_-b%Ywcj0RS@ML7&Y
z#X=A^qI;5`7LyN)$+}$C10G3vQk_A*fT)`<DwuecI*hLqo_I=3RKCUiL+T$&g0e9T
zuDjuUQu0ytA`)-916Ci97N$z3@@(9hxCN+}?LlWdq}UZ={BpR6?k~!kbZ7ElY;{rL
z@mN`=Qf9aA9l6vME3;Vls&mknu`&#@^30~<s-*B5Jzi7_V)7xydAU^lczdcd`9REh
zx#G+k%VjCf?6F)n4={RwrGSiheA};KNTobmxdnBfjdk1>Yw4goMRV(2^%!rX5nWQI
zdz9nDbtJ^49CA^Ba`&FL_LTE6yiVBeQdS~D?K9%}AjR_;POYEfxx4tVH9i}R!_PyG
zd*Ly}beB>MJNA2$kC7MNkVPYcVv#5LR7LU&6}{)IJwGMyfsM(%UGen%g-=S|`!bbN
zB08RM3tx~ZlF-%Fv^}1(*d1Fv;*72QSkedV%6Q6DXDo?^7N+y`V;G<-yGl$9qyIT6
z`GoZm9t*Z5iScR^Ldx5sQj0YS7G%13jCEzdGx<XI{!E%nicoo0WvnC{Vy8K~`!gvm
z6+augYnN#_X(`Qk8=Updo18Z~H`d>D;|&89$`gntKf|`isXV2gJ%=gEg}8+I3n=vk
z$|GZgZ>q<P%!OQJ1}I~!_xRMMPg^Y>T0WjqdoE~N;aQrJobft%daFGbGm7%QW~=@Z
z>;>-@MCF3099FLfC*?)*dJMbXL$DOoY#}wdiXO~c$|ug{`H>8)0?>5KSj%&x=S1&$
zW5S9ch{Y>0VZA@!5Z<fZ@nes28wI!b$qy6rov6TVpK&W!c$6osk9H&#KWB{}z+m<$
zYyQ2{mk6<fgb9r1vE)H9d72nYKQC(grQ-9q{a8{EYJbCf{>*H|WB1Z?9<+Xw)O`&q
zIqTY{JCL<!F>1wZ=865(zJpo}6BLo19Hj2({Nz$T@hGo}<Y;a1A_^G=<J;p=3d93X
zP~b-qKHojz>?+BJ_pDYff1_!;)B4y|e6lKp*_9`0rdohh@r8(Wbe4MQ%v(?Z29aoy
zj{ukh4nz_&g5U6Cytz*8fGaWM#&0)ODk*PN6u-9ROOo<5yh9_0nDM@*0asyle^Q~m
z?Sc(xem?ULcu2}K`+NAffiGvgL)@>vN8uPQzgk)JhNOH<K}(bteqznUXbxtsj;B0?
zf=o(&0x|60D0W#da@niI__D3&=_~|x^*S5uK@$=<J|X7S@yjvwtU)+Cp_YJX%|wZD
zx>zqtb;a5-OcwGsiQT9^OVSWk$$ucJ$W#2f_0FFo+`BQ)TSX-k>TV`=zrxi;xc)6w
zMA7g8f)qGP26?YI#CXaeZw2p3Ywt>kaakWR;)SC3vb*P8WI2R>g@g|Mi6Zv7$g;xI
zqy6nsQm{_rbZW+Li3Mx4;uk}&4X1;!hzkA_upR|Y<+MJsf5K1!$MqNj>U?nUm8N5K
z2Zm+xQy`xvaudjVDJaEP=V-RRd6>*jd*bG`G<uZhXb-VLjC=5)75y)-BrN4<J5j=C
zK62D5SG+7qvmHv1HCufmiPd!BanY-4wg-WtRqFewZ7cPX!}^^wNFx}~<|9}19@K2B
zpn!*Jh}W3-+?NVx)NBPL4r`I#SIF~;uGwmN6{*`cn%VA(>j^zwjQK51%T3naBgE!)
zmLOnv6;<iQx;jj5OxK_kZAh~A9^;8*YwrQ#?e0qvW98^%F-we9W?LV1WYQu&Rxa$G
z2097t=|RF1YoxvFlYC{Z{+#-R0#z>=u*RYc$JZeA+&Y&UF;q0W&dFHRQZ%~~Fya=K
zXJGa3VnnG0?@+<Bk@@4+pA|~V??L|&jm{J5bmE}yej)TauzydbJ{+OW<_cg3gwR7P
zUAQYc0A0`b%RE4S<iy&3T!74`0Qt5aAo*hcl)x42)vVuMk9grxKC;e%{mL_y6FeRc
zB;w)yXqV@IX*o~PkcYzQYp|S`v;!V2=YM);gceZnr+CI}bep;zEjgkLYPPqbiH?7b
z_k5okC6bPsL98;*$1_SPv%$!0r_3576Gln(Y9mullqEc)pJ%k%G0Y?O?Dc#%we_v-
zXp%(p&GU4&@y5rb7tS39J<0{O^Ic3;r%`!NpQQZG`rQFF=L1c{R6DizbkvOaJ)G=(
z#IzUdZ77ZH>2){?6BU)FuZ4dcTi|z<OlN$7pRC#1!2%cNhb9OLCpFs<YI1yywm)Sd
z>*_Qit*`GNwlfw(R9s`k?=f28aUSO%Nx5WO%0<TH|4vuwg{w)AxVakzt?T>5cxenN
zF<wg(>S599zQ6+|JvPxJXuYV%-i0!nZTA&?gHumI$Wdh81xe9r+5p8f>PUw2oErZl
zY=IH^0vfQ_fl?F(s<2VfZ2N$+K7xq4=(-19id@!J>en^NXrQuI_lvOTnfG}`mym_x
zwpK3m@B!ec`cA^aZnU(18<+}ZmBphBN{W?-BF$C>2B~<J#oGHG$f9x-=ODZc5*v}w
zRlU_v_2sjg)>V3@6s*>sJMru)eStF3tMyes@u|NB6SXG;#V57rU07qRJyT(XZ74BZ
zXqXZmy=^wP*Hqr?3NpMuF+XlWy8D6_iJ;I=xH`|OHK@rGzt66F+6{uF+>$FPVQg4m
z;R_j@rZCh<XJ{iRuD7KUehU+j<-;g{M6>-KG~zij%5(h~&sv>lx54uO=h+V>UQh6x
zP!|%<*kzpWjg5!I3B%U61Vpy(4@@5KA3VyNPV4;#3USnQuJEkX{jtgVZ3@_r;l{Ap
z_&)0@&WmPtecjX^P3!u45)3{75}k*kVp_zV$RJZ$dmaRuc+<h#6ip@GNC{36<F;Rc
z6Y&O{>uH!aSGdx&=nS#@155Pme)Iei#!P3n7-birY-e-^m5rwFH(NOI`f-9=4Z&aH
zf;U6(*nWPp{3#@V0OwhzGnW`5s2#pUJKjYLq1}9=9n*|<oF;!lJ7$Bo#i;J9iH2P>
zq5g9SM4w&%bhHokJ0CTj`61*vcPHtU9YG1c&N^^8cd%43eoNBu*PXkk>hxU+`akJ(
zC_J^)+Pe<=d*b1=;cK0{r|6tdCOB^&<(vY}<=})&%Ww`<w)U)|EW&<oJ|&cohBNn@
zf4KrC8J@D={Ew92i`Vz8-^!$=PmdNsyvdjclc=}9scC2SQe`OLGaco-N~0*jA{jUV
zRPR3zGH=@+2AU^sei({iBSB$9&}{o>A(tTiasufDNZ3C`ikw|n=S60Xa(!<C*F&QM
zxI{><zz)Fn4?uH-nm$aS9EXQzBNkCPs(uWG>0E`P`|s30B9POdBv&s)biV<^@s=VC
zONTKm`8J3Gpl2>x`}P@{h2k0Cq|D1a13B@Gw<&*oEdMCw_ZiGL=OFX1l+n)``EFh<
zN&~jpjKMspZlv^DN}p7_kmek*Y;_R+(9;(QtG`BfqM8u^)tiFHm-K=f90EJ2YMxhb
z1QM%qS_LK{sh$Q^6(}`}9)CnZRCX~{mI?$Uo7Dm0d74CiC)Mz^ZaVVZLk^@a1{>|+
zy5GuGUjY+85X~Ln`Co%y{Q;MWWk&9qen=wTiSG;a#{SAg)meM40(2}r=h%kRYIQR*
zcb`-;4t<q}8Eem#K=dAru0CM?6;Q~~z$>|oH+?pMn#-FTN!zV~cIK4M@X@85;Z*?D
z1cn3VC`!X}Y}n#>#Kh~m`>?tL7<CoYC1>a^Vv#E_yQ}Y_7T941)}zjNRTAQbg4wx?
zWL-Iq7u$(Jb-&IFFPf$fTEG#<1CzY^a}KlB9|H0>Atw}z`coVyp*x+rq3awy=b~n{
z7aWDhe`!*$f;P&)@TK6GqjMB@Vdcia(+nO=xj4vijC+Nm_s5Tu@eWH*-h(9K>TBqy
z?SL1f)OOx4H$XJ+kPybI(Rbei7d&IGEGjAU3&?JYXc;z(#e<Qo!oCsF`pXQ@RhSw7
z$oK!b12_sekG|CX6$gu71+n)ae=T5j4Qw;#Ag|sJ#ns=UHmrnFmi7&2sk`*d)WU=6
z&yXB`^KQ5bdDEz@uF|)@g6fr1(PqpnTW(fA;a(TX#Y)N!zkL=|wVP`jrM=aQln?9L
z=cA6oCTqZaT{g9FQ2Ueh8|I&ZL5!LI8Gy0`k$n_kzj-U3rd=jog+0)gsW(9_ZWA0{
z_4EBf({l6FXEZI^A$l`Pkbuj5@H9a3p{>j5U2wF1_cRo0TJFq_)_NB1vp(v~664oq
zi^<23L}X6y!lBtAF_vY=A!Q^RuLC^A{h>5vr3J@A#eE?Q9UTq7gzXMqDR4V=W94x>
zrP5&MR6zaMC3`@(_uZ$|H=u0carD@<p3~7O;x}#ojMtZXJ9M6|(x1=^&AU%UQhJU@
z(^VQ+aPq|fi3X3_T<k8r1I&nmr=nBTr7-v~cCHk*T7Xt(0YP<%Ru@9zzC?%VV;tK6
z@%+hIedkYVgP`ON@bN9wiOO4G5JbiNULiF5_0pX$<$a$Ht&0bu5wTm&#?Y<E)@(0c
z44mT57GrL_v>HJUp?3+TpVrgy3PI2JP~I(|Sf<!NB#4Db7rHaW!hUfNonFwl2;!B<
z6pmE|m9ZH!f31)zp|?Kgk0E<KW#M)=4ixqc9N7(%(A&)2%)ud={c~c_=HHAOj~v-$
z8aT2K39Oj^JMemJJO47;-EFa}ucKZhlJvG0_ANILEyXhBo<2+o=I?X<xH(3!d%h0<
z<thHviSY;R4mxk$`c@zMQaQEf5)d`p>ofR3Oi>OWU9blun5mDW2KYw2V#K-o7($Mk
zL2(CJtcSrYDnC-eCdR*elE<UNh*X-bnJ93N60y6{UIc1<h*LQetrzJOh_4{yDiM&y
z`B%jVB?MaT=5x`#gS;**;Kf)kRYQt!q;vPZRBLx1PUd>Ik)G|)R#fy7IEmVH01JH^
zqB&qKnOL*Ed=V{ru~ngC7_d0RxO>EU4=jSSJF4^)7-&*<Xtu|Y#Ke^j_qN2vWc4w=
z5xmcS48{_-K2A2fap1_AVjjZy{6hlzNC29>Vh`=?o0eOm1)^8Pc7D(pt8>T3>dfvv
zJy2_Udq(%33rMg?%IE<n+?Zx@Ocvw^D<RdGw~Y6qm*Umv)?#nCZ76zq_t&#iqBHTn
zFMj9Hhpn%7Ur1`VZT*lrzHg!x&PIEI{*thMKot=t#28*9)?3t-dRjdMI6-!N_W!Vh
zEnfOlfZ-XKZm2=2nl1fept}bwV)09%Gh8tFaJ}wNx?b_w-_Xl;Oe%Yfdh>J2X6oBq
zjMhw?xg50abSeGr!qYD0uygB(KO(m}x4yGV_D5aHab=|Npfg@(a!(ty?sRT_*XNh<
zV%6@Rb_hP5qI>}7vET$bJ&JRMj92i&Qky?=jb<(FOEs}bZt12}tmWsH1_@kd-u1!9
zTK5HEi(SMLfc`;6>reW_SuVv~g(=9{J!o>p%x)xyrvO)i1Yfnf;^IfeBe!AgZrzF6
zUCL>yJyExH?<-ToY3^zLC_5EJ4w%<M5t8nTWq6RZ?tLT6+WmJr;;TT=I)%k%7wEKE
z;ZAT|9u7mi>6qC6vLH@7M(5%JKPj9yuwo#(UNI+uyL-@b!2Aw&^)yan=C_e@o*NJ%
zMcsqK0rN>@;iVuvi_~s#9dliI(p7vi3J-AE1^ZCRP&A`E<55r@vDps+P_O2~UFbz5
zIyaNQlBbxm8$|1O5v*`&^JiGevMKy|ZaSq^{(O^T?%_{Ae{SH<|Hhv^{CN|9ZsO0)
z{P}zS{4;+B`7^|y5&mrF&kp|lkk|4mf9~g)F8;ieKXv(c>3Ghwl0TPal7~;e#`Zhf
z&}16r$I<7{fCNXKKApTNDmdVK3hSpCh>KXzP#8Y~szQ{)gIkMW^FHf6{YpRZF#i|V
z|6vP!=_Xy^eFofRz(WRn(SYw7u+@Om>-BODBfrSVuQT#@8BjFv3AH0e{=#)SW&<KS
zT`LS|H(<H}lMHzCBsnEF=;f9g@M(ij$6|48<nJ=*gBueR9sbMYyup{?+G*sI3_iO7
z3k<m3pbr^vzX59v`ep+L4S1^odlGqr|0V-Q41HCDo^qqEiD1Bd172;=6MEiel>5+t
zCk=YJ0YirTmV|x={DHy$Wh1}S$Ukhr#|-$Q0TcDTZsZ3IIAXvoL(UZjTy4M}gMP=P
z{(El`b5Iyhz^bKsJ~#;`>b2+U^h7=ZH|FU0tk0n*_&yIJ>`b`iP$&>uA+R=ITSF_p
zB+LuRjlPiVjpR4Bwn9j8f`D`$ZlAxsq1D$Yv^UJ<RV4CNZUGXSWr03#6m$`RP$vs*
z=4>qLZ`j-_3z2{j2+Dq;$=52c5ax%|1bTpFes~2(3UXU8(z!?oguojRS{p*mGD#r%
zn2eCz&?rP&WW9(tfQjB82@@YteEw!3XMQ+`<kA<p4bYZ!hK^LPkeg7Nf1umY?DGo#
zXxnBvwBWDsLqOQq>~DxfLo#^jiiTw&r_JZT879jSnxJ+_-V*XfNQc6ud7FI^s+OB3
zoDYTYJ#Z8%ka_~X9d2kPg*(9z41^+bBdN>`(^C@mCds4CVY-pS!1)4xXmhJ9;6ql~
z-x$V+$DILxqmZESj>s+OnBNg?723o3f}S+==E6xn@3eMbC=zXG{ojz+DmS#tLPJCd
z2Eu4Pbeq34x?)W4wgAZJ{V{Ukcrt@o10lmM4X{gC@COX5goU<-h_^*IPFhF~gc@ad
zDScW^rqoRrUcpVrg!zR&?pQ_x(+n<N2p;5ZY4A52b|#iU$k*)iqv?qrFvNz1-1)ag
z7Z_3*$%VeUuTo8UZ9ZNDd?_M_+AwGuBJu)(<HkSG>`=lV(C5_cTYQlg?!10^i%~7y
z9c{`NoG?LWAS#66VAlvYbXFQsko;26RSz!`$kquTCrkObXEC+~V{L4V@Ns5TNq%W)
zu?R!X81&SdF@B=+E=r6|Qg#wI>IenEHNGXEY6b6z@$LRwTK#!#9Md->`y1K}kAY+9
zBg!uXTN}Lcr_?s|9@FHrwMM_@p~E%@!aV4pBlGfLJFg7b>I+9G@ALC2IITr)4FVS+
zJUlzn<m)gxpMujUuCye0HR2v07IH@rgBKo7LxBni2yxLi#4m2Qygcp-qb{V&;keQg
zQsL8r5C-HnU!FJ6N)bU0$|1O7<EU7HO6h|GQltJ`{DCckH_+DBfMC&zO;AEJGR`O;
z1z&J<PUK9eiqS#b3(_!e@Bp;}UM2BVn7ejj)(|j@;HMDiA8Lp`#)Jr;3Ia{A!Bxw6
zh?F~IZ<M2{=b+ePIIQfaVL<W_RuD&_GjdJ7P#9Ui&>{oyu&E2oPfLr2F$0k*R||$-
z!VS9F!#4^gsO0LjG$T)3c`X7SdDMwW@GIN`<3#9J9fT#GcHl>yg7e@99)^z)y_M6+
z#+-;pz~9=*jsB^aLi|3?Z#WSz5~ZI6VC2C-P!Ubb;|?a|wl&-$^H4xEL<X8Kgv|}!
zTcW|a3rJQIm&F~FOM>ZIw={Hyg~aHSd9VpY5tc&%Ost3+D95jf&Pmf4IVpwSQO7iT
zZG2xQN*h89Am=yd3nXGpC}|M#HS&N0C%Z+DdI?c^2{KJ}X=#|GWdv|RSdY+1+UAT7
zvmAH>OhS_&e46(m*`ZnX8*V-tO~Vuocu2r(NZ}Dal7ldvlMlge?n^XNf5tM0&&1%S
z9^g`%0<8$gWDG(j%8)O^$>ffPwqUES@0g$I@j+<oG=2?~kFG?$;~DgR8g1DmUNVBu
z%e}WO5bVUX)DjVLy$gh;1xpL^@L0M?sPK71fpDNHB2>#^xgq3jStPg`U?7j|yIJ<9
zp~70xE!3<nuU+q~b_-ICP*uHlo#b-6gn7;y<mW9C)=RbG+PYc+9M#Us+Utb1<$|;F
zI$@1e=~^VXH&j)-YifkG)et6CRCy#fuu^52r_Lo+t`b(FWaZjg!6Q{jwGdmomRD&A
zliVm-E>yUy%S6a_u9Q4d?R7M!%ca^%l3TvET5t+g&gxpJtj^=C7OLv1tJc=Ip@Iv7
zE2YZvYSiPda97smqh8<y_c~;R8qw+TP-T$jtV0{BNlT$@ZPj(v(kii55Z8KKZXj2>
zp`CN3$E{a}rj>b|QUy%qtZ=R(4XcH<kV7pbMqNkzEWu4ks?&-8Wwp}UN@`5m+REB$
zWEY{W)wQFA*Go0-MS`<hsv)zKSFf$0W|Co11~otoN>;jcIb`&SeFGNit2#72p^xBl
zJ3Wwwj;b^on&?XSojxV_WeV;3I+i<oA|wmBd?}jOqOU@EP{VvMA<!py!wd2g6HMZF
zU^vKQHMp~{#l2joCTQu%X5nrHt#uL&?~7Rv3U`5qUs>=gQ4R+vpSmXeM(b15za5dg
z>9hAs9V>PGHUoaD2HKSUXI|HSww_&ve%lRruK{;`PP_hAm9wc}7yeDUs%u;|J0E(<
z-u}S>=MUJiA6^%|B|ztYWh*w;h2>CqV<Y0s#zwh)qcO8?M4aB(7H;?EbzHS<W3`M0
zTUbsI@hdm1Md_M_`!b%=;i|G)5B=WGF%SD3`VF4F%}-><QpWJsZ4_rOC}8aqa9CM6
z^xyR5`)F@t$LlZTSL#2<%P%PKHZ?Q019=O{DXXrvZzyvT&jXWigxoa|$9L_!C*UMr
zwr>)Skb{$OWxySqh~x53PQX=hc|#L%oKKyAtL1znz`;yLJ8C%}qlz%762D1gG**d+
z|3=Z?9%zlUH6l-AcqC~Qf9tKcHg1M#n5EXRO(^2EOHN)-<^<gJyq@gwxLTc0n1Ivy
za)J96)zd-!q5qciVbVwMAM_q$E$a;(bzC9gx`3nKW*U6U2uJ5*+u?8qj$DENj?w{;
z_-&<Q6Jz&Mesh@b^%K7pP5h>kyc#U92Yx$gFIa*k+th{nOrtoi6XE~bWwNF+YvWXA
zU1nj{>S;mK%oH}WdPeY~O_>FzSt)E*^(DcXn`{N9OOx28O98W!Sav8YI2Z4?G8$7^
z%CadecoAdw;NAc`%|(Ud^QN>EmbPpvOIw;6oST)(vR*|!jZ>JpHkA#bjD~xgQEq(R
zgx3$LOOpyrmrZ4t?VLH1H8kT`X5aK+#-{YDX$5#yaM2WY(Y}n4X+u+kmQ7QtQh}Rm
zPGaV#(^=JJcuj->IYe?TNzC$i7SI13aPJv)5q*4qd>NA^g;}aog2|hb3g&)fVIRGh
z!v6GlI+I>CL+><3-*v6J0zVq6qxNDHg3dr=;9;Ml!vQ{pgWpb&VU(Z5XPPyQ&1%eM
zvuZD4vzE<dvrIEs*2s*Z%plr7CxgvtT*T(oE@X3-eVNTM*;)3;%%QAfGx|6^#l%up
zGB$Nm|8_0WKdSKMVy}%e5{f+pcjA6{T;8yM)l`x*559$Ra4$CeW$dl+hWH+oBWOx8
zv7{<M@(1*D#?sU(lg-R*%l0yxX*WwH8ux)z?gP5N!RMBlnRN#I&2UhHBN#7<Ycob@
z(1CHVA%VeJGENDyod}N@Ly2o6aDBk-8i%_LxB|3&!??2d19#FvUk4{j;<Gp4b_2I<
z9PU-%ERfeR4wr&6?+f6g@tn9e(z&N2k^40K;{08=$-mq%(KcV4zw7q+k2-&Muy6$X
zr4U|nQi>-ntiHaiK8*7iUz5*UkCVa1Rv8?#fcHj2IADs@%N<^sAKb9ZKMPyW&z|v@
z1g>Una$8uAFt)C&x~{TTs&Fq^R-m8c)-k!m2TF`J;e~W7i<1U^Z$qR$%r0SGe(uiL
z?W~E8>|loa`UY<(Qtu0Fu5ZGLCEJ4UD_f)C7DR8><Zb1LQ`>bJ!A{7y2B+S1zRK7)
zSyNb+Z(-kK5u65XL1PxMdQ{dJ4dOL#J(7*S0Ca9^3;65Xn}Q)6%`~y^BxK>Q2oSg5
z=WPqJTUk@Hj6-z?q|;6VXP`uFh+MVISBNP0ZM_sY?`BQ>@Q|W@J+}RRoQK_^w+7mE
zvnD#@W{t$pPaYY&l<C`W3KjKXxuqUwjyOhzwPm)FFp>I(V6Z;Y8I;*n(p!#TcN4-n
zFb+b{L)nZB-{fn?0a3lb0q-!j)MIngj!!&Tz0Z#WXdL+8I!coLIN%QW>5z?9i}h$%
zf-6yaJj+$O3_90kUmZ)=%j`<DkGir}*RhHIx(EFUhx+<pJ$fzF?4`HnqdDj^6PoJ1
zZ$nBiUCQc1ax+eh(Beo78K)j^UK(1d`SmyoLJjrg6?D`?D>kF8IxFXtNiJCl$C&k8
z36owc?^@CcJvq(}0Y4YYPuMU&kE`FHke|`<BtFruC*RYxV9kt-fb;Q)%o>8eytZ)O
z7MxFkBM*P$B;sq6^IDhWEy>dzeG&(Ew!cV+`!$bem|RDT+z|XrbULXHcfyWse~F8{
z<}cB8i%#IEO1U;FhdQg|5Dsl{4C<B30%$MB(-ldp<Vcww9I8SAuN)3bjcndHY%T9m
zAh8AqZw=S47N&BB%b_o&SZlI0>ZCOuc!EeH<U~q!q_wOeNUxX5=$#hg%JYQt1Ohno
zD>wSc?T_Ha8v6rL*6A;9>ip;y)OcsI6n4p*qs`57s0wGN<nX^S*ZK9(*62<IGbloh
zVP7}b$dS(_#~{sUV<1#6^VePpsdrG@D)<{1k;hG}0oJ&yE8U*LrFzsWp@`@WLeo-8
z@c?xf#Q+K}|JN>h`DsG!bSL3nEZ{-c1sxo{Q8?a&4<r*`{1M+5*MA)gWM*R9ft&WO
zn*e`?y9nuBfM)EuTu5gE25?s)J$}zdd%34^Zvvj+^SC>Z9=|`MecO>4*arYl@HO1K
zkRActdNJ1INN)$MybR|ENRQuNjo*9G9;|0JqCfUh1Yg2^Ino5*!o3LT@p~oOcRe!)
zA7KGc@M{A0-bfSNihCQ<1n;98X@dK4KZrEJ6S#?=;E;hQNWZLk9QYAHe0#u#kR~_-
z`y^@$zC&R6RsqW%9hMqt2O#|oDGTrfpTtc(#{j2duSDr|z&hL{X9M6XM*3C2+pvcc
z!9#EdZsH+$&`2KvOkJeoEr4@ylS~2d2<{-#^ufX``e*@Z2cVJ<c}U*__&RRFUjVFG
zjB^a6YXP?#X@W<LG{Lqd*mHrWYAIvYxF0||2uS<HT}Tt8y`KYVf)C<uLHdj9|78o9
z`1x5jwy+bm)IaDf_ze8i6!;~WH=)GspD{U<T+`8p&n<9biq%wU&XW9s9K6W%2I!4c
zX--{jd0tVDfK{}=u>r4Z<<gu^Ih=FN)fs6e4Pm^--Hca<5a17&=0rpO6=8h#(AE&f
zTP)+n58m>&t!N0h<+m@%q4%@CCOI5gH@-HA5`>aSC>oAP{-%H-ZQfszRydEBLrHu-
z62+GQokkv*ko>hMYLOeOLcVsaV4CIdC~-X5&0pf8*&exFZpBv$c$Vfgge8A_;1)TQ
zBSd{pFD;l#bDA1j!*Y(WcvMcw;?J+8Wbp)@N*0ec4#i6rC+vpI#7_L|oP+i;h}%26
yc5d6bedoP9AK2Nqb8zR$UyS_X!Y@Fm(%*G-?YMWxjvWu|*tG+=FRuSG7WkjF)XIDS

diff --git a/depends/mimalloc/bin/minject32.exe b/depends/mimalloc/bin/minject32.exe
index 6857ad0ce1ccd014ed02c99d2c13feb5783fddb9..077f235b587ba1319f706990d821184d014233de 100644
GIT binary patch
delta 11009
zcmd^ldt6gT-uKB3qJY6FEh<(}swkpKP5>cX!X<dAXb=ffMNo(ykXs>9bft+6RFB8B
zwDH+>cYR#ly4H1VYpZSPJ&5H}t<{z)t+vH3TaQ93tq9ms^L*z7tnSly-_QH^d-%-E
zZ+`Q;&&+S;9Ac{%+4hU-<HVHc*@R?f=^wlf`SdflMvD09pKr;~pIA}UCl}fceWQi8
zq|aMuOZx)RZr)VXHwvv!f6=XEw9i!J3v|y^{NWa%f2N{X=r1cOV2JEzLjq?R^c1yN
zB%@}XKC+$~emW_!$VW707BwA+Fc0#ZFy};((QkGpMYR%41x0l_Lp0-kZ4}imrl`Y9
zDQe!cA(I05B^0G26eEw0qBNkK^uQdmsoD(e=1^4rDAS!ki5`yn{X~E|lpvH@DEB-%
zjLa!qV_pMXs|-~>iWDWyxkNl;<|07%JUT*MX(}l%@YqDzFi5BuAKxclCbBlTOggIR
z%-tu8>v3D;#niG4{)!t<h19Kd2Mp?Tl>Jm-ZqpfzJM{jBV#;mt1tI^=ZxP*<c81U!
zIS3TF1N@VS5UC^GH=~#`8u)Eswcf8_b#4<Fm<mu9i|=w6`0XIIpOQQDzJ?JzmnDZV
zu9bgO7?TnWE|__bZUG!I;8$^X4G_8A8UN;?#{gUW2}Ff5hYP0v250LXD7`N<VDxBq
zCdwv@W;=6b(KG7$%{SeaKDTAa=ne=Iy!WkhnZ3BIp|tMfd0g}AmE6B_o1AaUGDIa#
zKd%j_H+xO7{_s8}qNsKCwgk%jNE)dh7V2?AEl;!GkXruP?PI?o>GrbU5O<4~a(X#^
ziKAHk5agS=EMG^;*md>Vud8zFK2fBe<4!j6{`ASB)`-Y%E7#b_E9k}|7k8+nmTPUi
z=1;da{Nu=xBLn|r(|x(qjn?Z@hjbZ)G<HhDTRHs@eezR&hm=l%7EZdS&IL6MW3hxR
zf5~f>(v-)Gyd6Qb2l{me5c_RCa`@6*H;9N)#%%8Pwx1RQVVS{HBOv^iU)*kHmbzmr
z)0wZM91cQe<!_<3pYpx-8kB7NsqhHsGi)_-$~=SFO}O-g>xB<O!kA-gM!0y_Fp~{T
zOe-OKn2?Ph(>9&a{Yv&n4_Wsr2!0BJRf1q|rVAY1e`5lZbykZ1*AO^;9#4p2cHA|K
z&mZQTwv5pvLwx;j5orY?e=afz@*INO44F+PA1nf7a9?1~mH)Dl30r&DcA3BxSm!p!
z?eq?ai!e{Ab(tr57z@D&LC*4r9#oR>j0mxx^0&P!gjG@d0!2|={9-JBkIG`L;XNp&
zoZrbFip_MSiHfBLcR&foS^Xe=$wLH8AdCbpCe(eA>$RU6k0q;Gw@xvo7R+E*dPNyn
z=^weqm3gblQY{v?8IgnC=t2ED+hnh2WOJK++4Ld1b(LsiI%j3-+!k-zl}DJlBsu*_
zrqS8p6|r{pN{L9)BA^*_GJ;wC6Fg%GR0ilCp#UM*-V>CW&3(b$W^=pPnjyXj`>)Pr
znNWAhEM_J5n<Z>2qchF>5$vZDZ=IK(Pv&ZdoUeLo7Olqq5VL`K@Q9e?(O7w#XcV+4
zGmYGj*h-D8r6U_*iFsI2n~8L(m_nu4<MvS&7|>pKNl}~NoGYJTW%Yc9JAe`5dJgG`
zcD3jSN#t7ey`*9FeT4WI38qK$6nDq5RHT@aN>Mw#=hwO{w>do@e!E5AMM$|o_@Y%z
zv5`)8=DiuiGH$0-TkBHPuE(6l%~90mq2=^loHd=-v1o&~)m^fjdFyhDj^fVp2DpRR
zWOHX78Biw(+$l;T3d28iB*`%E#A0rc<j;%Y7Zg);)Xp)EjiMck)$ZCh%T32p_s%4d
zW1$Ev{Raf81FUF&C&ceak{X#V0Q`|b>{Kpm(6L0s>EXMa)zl}mS%V`Az0w2^b9=*o
zNRfQS=Js;>KF-nsd;7HdcEyw5V<{s!)&5gVeCgpn#1!cyCmXLw?M)Ky{Q2t+sjab7
z401^mm*;Qq9Fm-4^}UitHme;z({0>*`8YP0SG-Xn#;TpfHE{-C?fFXQ_oD(=vieT0
zI@qzvEvfQ{H(c|;0GA?{w1)r4>MskEOMfyj5dNX|tfDRl26Rs_G7ZG5rUADbPQe{6
zxA$5!RvDMx$))&8nz@DZw2g|o7-!AsaO;O``sMIJE`7)m<i#aPB`pSW{E&UYk%XDa
zrgyoO8T?Tk<LGh=q#PA~TGEtZz^qA{CHhVSUr)xcQBDQ(tv^GJh3C%IePW)DSU7xb
zoPMzJia3Ky??M=sIi%Yp`VL9jcmtmUHv9ThzBofL$TfzGMajOBUQx1Kl<Y6sB4tN&
zi+s5>Uy1%QYw2Q><{?n}PBzV-10qe%rG-8Mr+)FnBD1k+p>#i&EMKQxAg)?Se<CbR
z!CrqZb!?F2L+37^saE|^n*C%Lr;{t*(22FZTN{b$+%8O5vM*QD!CCsamA;a%*@_Z2
zw}V~5@LysB!!zs+vPN~|B_g^_(!!>9vihEw^g+c_PAKQHda)WLpK>+r;k{fgFB#<Y
z?e-@BnfhMX4WVq-Wez?!hq0NxY|0P`Tnj6~Qsc(&;INEEtiF9@Rj0R0EIm$x??kW5
zk{>W(&I;cN*2~bSO&_d$HgEMYk+9qIR;yi}<lwekW(LW8U+cpiz`*EI0e=bjzQiMB
zgj6=G(~&i3<bD|5+I$xA?<^K3e;PZDI|obaKCyVKT|$aPv@^45x7vDXN3NT#>57@B
zs9h(5!&n%DY<drUiSDn%Uj7n6U=alDim{yUF+TVf*|mz=mq>8*eJNPljyw^Ydxn!9
zGiV1kO*AsK#L5O(iL+5VpwNHK{d{dJ$g`P)7-`nKMf{&I%ISN#uQ(%C=+_E=iqrWc
zQjn+^tA7WwSp7MN^nHi#Hiz`jY<dT_m?6WFgq79wkf7KR*Wi%;H>6Sq$9!qFf&Yhq
z@35Z=Rru@Qaem=9?SWY&`(Cm<;8rm%Vv~2DQ!ysQ%419K%yrjZGAA-T!GC%a*3^(Z
z1E1aIsNviIW89i!Mn<X!&C8%k6CA3%nzyrQr4U5MpA7BB5P0umM<z#@7hjwQx3d|F
z%;E+R7K^OK<A?WPM~i-lc);vV#)+sOVsrblk@dRB{v=y2sIE;>n}JC&a*<MU1d5BP
z4EF_G)Z78RAS%WmIyfuc7dQ*-531`|)CPcI+Z~A2DV`Yx7{}^xDkZcM<HTap?*l&$
zQf;%M&I?3>Okd|h#iWQHuyRRpl1AG+gQD(7^la54y`qj6ATgz=`$~W$fZCnUDyCY=
zvF^wk8uo@e%|DLxG<-RQah6fG_}5H2TvW;Vmd(s2L3`o{;i@bI{9!J4a9zDybKJ-n
z$k<wp4afRAm)pmzBFJ=sLApARYZ5j`Hq(#{^tvB#Ifp+Df<ID2HnWGI4WQ0uItZu-
z$oQuK(h{hGKq><12s8uG@PrBTWx&b$c{ZCn#QR~HxGnx%x||ziYkIkCWR?f`i)5{&
z`(nPyq1k4Ua=q5>(R|2{KnuI%9QQF_K+^Mt9eM@e0c1@aG4gqO1rTOwvtA+Me#QyA
zu73D<EuNDZe%l?e03JxbMoP!_(syvDaVicc4##{+_=ntpA^Zo=k!Zwhaf8`xO`kg;
zI0+X)+_9Ra(bUqN^F<D;=Qzwq%($DZ_fAQQaKP2{g?~lH$$>t|oo+B=yz!d&=HIx}
z_A3%w{Ocx6(9MJI6#}nF?RDsn73+#A18W)N&pm(zk=s{HWx50MJ<A5?_9{4Jj-Drb
z!(`P_mZh0SrW&mLksDa!l;@quAV|UFbb@QA{umZ$T#h+3ZnHUfSfN6nJCw=1Ll_?i
zqi|ajW|xb92R!bJOee-NTPX6l11M|)a{rT)b^ZlV$RS3zwSrvtl<t5buyE-Z_tz##
z6?GRtfcuFYOlW-3WV$VbOllgmNd;}=N6e_*4q99M8zvoOT81nsMy7<2efj-=@+J`8
zOo-cTH3t}(qlElrkpJof-X2E+hB>v2MsJl6KB*CrTp@sR`=HyLZe)fCd&Pb1?u*2y
zk##MY-i2WBTR?T+SgAo698W~7{`WzHF_Sq(Mp7|C7P_#?{p~e!QKnI`?_@J>fZ25a
zjx0CrVl92|BNtG@<vXTEu6VjmLSpRuX7GGOR@1;Wud8<+8#mK?F7R)L&Ubc>i}3zg
z3|J|^W8NdMh7dR7y5@X&+$`^>2rAA)x{Sa&4`~2_Q|}}F63X9P>>=GxV1tLWgutur
zBb`A|`5w}nF!{|w0k*ymxLC}TfEeKp#hfE&Bltd!G~Ce!ubn63qnL_+9}l!WF)ChB
zHx*)W{@I&HBNo?QAjICxiGL@4!1jbUh}{@=q{$(+yXH;b1;lA**SHy0ix+|_>Q1#K
zL?~)M0uk=kb#I~NzUrO}>92}#Z$QAi!<%Jf+ljg-G|NbW6m|PIV?PnVyIDrw?Qv%v
z1o6%+_k1npW7qHSE?4`B`9X$(I)3qW;o!l0i|36NH}eu(yj94x+-Y+NzY2NCZRzFC
z3fCfke)f0wGhobM<R8TK08zRthS>^-`CtfVTm*U$kdcWa8hr#Xkbo2!-?Icz|23>E
zW3h<;*q5Ss+A71D%=ZyE1R&ST2jUu6EMk@X1<W}#t;Snp)unIv6mOh;Npm3LQ7NeV
zQ5pC@fH5ZrQ<lNsAXpt_;BCl<X%7cs6&dBdfaCGyi{dX4lD7oLL&8vt)Jjp1FXOY&
z=l7HGa4#alB5Er3=0}6;4F56Ew5y3<ff0VIz+Oh!n~KLXy~}jS4=@cLeTVgsLtbeN
z0MxiDUA3ErDE=UNJM@<i7}n}2x-AJ8?%KIPLB~SYZ!Ezw%dzyB1*rH=ALm08Lair!
zh+i!-GKw%z-LjpZLmsYp{JZGq@M$oE>!sZ>3Fb*go@@_jHv4l?*~MbKB)J1LkmkO?
zhYEC{8fWBhc<eLF-BG-qDB$O#<_7sf(kS_CG}%VClJ5`pOfqIeh6q6LhT2OO8J_|I
zTq8t$w)2Y#lMU^oiIGj5iRYW424rem%~cA7auDKxCubtAj>xiwEV-OhIaqsbB(Pg0
z$hN!#0^F8P{%y2p_`f>mPn;gz9e}%jOuBF7Xk6kYjWK%PN?%;nwHGW`X%{|7aVNWP
z8~HEg!aN5T9teck_m;199-27Ix?(Lh0bfq0x(X4&;U!hOa+~;dp3dlEieE`0)qU-l
zNcbpci_ZZIWtNgY`7VZ+E}8v~$g-9<dNfS0>$gm0R)LE5A?{+<6bwVUL!*SQIb7}P
zR@&R#tY0D_WBu}lx=^SICF@rr)D@_kWkjLqm<XN}%XlTMIa4fW{4*gi)%o<KB+(Pj
zbCc4oSy)k6#|rWt$1;j`y}2B0+eeHheo|&HTa7P;`zk(IiZQdK{fUB2Im6D`<B2`k
z(sGM8e-Z9<`*<Ar0B}wY-G-|}D()+dLMRA(3+8K}BWIH9p@EJC0@mI$-ho?ow#%?i
zF;3s-d^IRuq;vKL#jMcf>!^YAd90re!0IOK589<`YM@|Q6H`qT2l(so7512@iJ>S7
zJ`>@K5hmaoJo98(VTUEc;xi{Hs=)@9CjQDlo!chQ(7j_qr=fw=IDxkHgp%b_{E$0f
zHbf#WGTgI1nprI2_rmcOY3La-l55>%<U8C#_;xQRKY53B5w<I*mqJ;K{%`<pxGnml
zAjg4q!W}Rkf;e1U4kICtaFQ=Z0YMmW=m&8R2^4f${IDL(a_D*yyg94enyziYx+b?4
zN+2-PZ>B$nFPkxP%S>)ToTPPI4Efe>nHJRG19j_Sk^(Jb?VHVGHu~7#<RODn{Fkdq
z?P_A)h;UArve24|^~x%_O;UcT0P$UD&e$K>u~tV>O_|2`I+0`ECYAPP)r4#=0dF0n
zxsQjp_(glORC}}X8g>?;<q0jR{%^E6+?m(r=%~U8?nq)3mm2ENmW28{P{KPijoAlu
zPWKe0m4-2H%Xrocw_AK3H!_pe$W>(a`6sdIaZAHeCf9^V>WRJfo-n&#AVx*SqerGo
zQ7gmzK_u;R)O65onTo%1H&@oP-s~nRyHrlMvDv<OE#_)2V+OVj%r});@MauYRAySp
zs>us?XJnb#RDw5cEU{r`2VTqZ;>`Q#dwg2hDk=M@oXzyL#6XVoo8UQCZ@b@a*dyYy
zI_XOxxjnQyB$v0>40*FzeTrS%;c&6{io2!=((X#(a`Bel#pVt|<3JP1zvf|aVtY-8
zXltmznsl!vzw+Yi02r-$zBqJ6jDBeAWV#Jb57UyNVXukLHJ7=pz5^s$oS#2xd#jj>
z98Z8NcUoj5o@Bi~PY76nfE7juPLhACC~E64YHyW#D8-<(U%4?%Y$f7;rKaSH+7+NC
zoRq(!mVB+I+Y}=5@rmw7NXYATdY`@1YuZ`+pqHX990cS$(loS!f%aCpM-OJwV^M!o
zuz54*Cz#tBEa-g;8~xk?qS`v`3w!4;9u6!Z>UqH)fmr*6WeL>1)d@6oPCGg6toEcu
zsXc3%EwFl)kIvqC$s^n&1bg{jA>BTnL4jjH--G)&W%eguf$p$Gi`7FspvQ*8C-yb}
zTj3HYT*S4|ZH+g;M@cFBRqy9_t<_Q6J`O{w8aO{quy)|$w0OaGPwjDcP_$8DzxuwQ
ziDHEjY(Lu7h8!3ptA+pGWRGk8bWY9GCDuI!Wd3%OI-s7^lXsCiatEp7Yf-P;6>v;w
z{0<7uWSh{)whGN7)j|_tMzi-B*<m!Co_c<-&`O`*kJh1=KYx_;g(TP_<Kc)1e+Mv_
zM?HTK-4@v%)T5-7t3|d~7)I)p9Ug{?r7JeLs21B%^u-i*htTKz$VO)u%LdVJ?8Gu9
z*`D+nCJ7m!6Pd8ynKvyc#ic{We`K#v?-y#DQ11}xT|!+i)Vqaxk5Hcy>K>s!=xmra
z*;*~Y6++Dmb%#*53iTPGJ}1=esF8Ov?D4`z!HKYS)wbIw#FWb{-*)>ow3fw+mvZru
zZOGo6czByR`R`IO^0Ifs(-eiN`a3x^%@Kc>BZ~p~tblYr7CLTh!!v*tsjXaNTT??l
z;N!MXo5<-B2UzDJ(^ux;K8Laor2*wE$~P!?Q1UUp7-a?EAhhIp677~O{3jJ<8A=?A
z8YK*6*D%dmBSrm$ek@w@97cN*{p;DDe!Hi&QtiV8JX$f3p(tr6%TQhg?i9*Kz_lpP
zq3lIDL|Wi&D2E_4AN}boC@LAnfRc|g8ihQMfo3PlPoQB?UIP7Y^n+108qqm}B1Pw0
zw7n?pDCBt%xYq%vqAfvLg5rxpp0TraLQAS8Gk%5tJY7en&Cop?5@023lPp?OWo3C~
zY%sQL<$9Ajcui#iQ)D(3m@Sp2*x>4UQIPQ4V{0l)qcp)`n~KZ~xB#09f-6mhMU`Nl
z`JZ@%G3#$A`%mKj4+5*BG{itl*@m+6O=ZEQYhZnuDcIvoY_PKW5lyu=cuiH6rPLJc
zA=ZLEf;zr$#)Bf~>tS)uzOcCCvu6fMM@2*oyWvcVSUQe~EiEc5hBvf2Hh80Ij^_BE
zA|4Q1t4sxmO+=w-tz~_%xjeX}sBA;95QWmB(lsUcA9=*RBy$Q&N=65Jp1T@^u1EO)
zid|88Sul8li^?E;O&PH|xV+Ls7F<y&D_>u^rqtOn_r;vx;7pS#IF2!!E2?7W&Rvh0
zu&kX^P+mH>w5Xu6ysCVi8IZ@Ox#mifX>Oru<J`4HWpgV{YYIzEb4m*ng4aQIX?djy
z`T&-$F+;!8uC$6Gk4scpVv)=FiWqq{Ux%gZIUY66v6^g&)IgTe?0LvaBhSb$9mtzU
z33h&k0VUQmO2(YW=s;}hAnR*$C@K(miA`b)0#O{`6=(@Aa4tnHM>&n+t;EJfX+mj5
zIgN4_B}PS2Nhp6uc?Bhcrl@$7KToHq&%7y$$p0g<Oh0g&Aaj1o^2OwL5#;v~_^rg$
zYIA658SuEG;wKcyN^^?HPa#4h2}+ZM6U@08|Kr{>1|yZjKawzbe(>PwhgMY&qou%?
zfNL1PvAo1wT8KXJoy1@mzh%po!nNyxzr1Wjj=3OoVG?xV=N|Xr9uqQD*D}hAGm;1Z
z;c^cl4?_7}oQJR%I1;}(f<>X#04efYk`n~yaZ62boxqL%6^F=BR3C8nxG!uak|fJ;
zgP2nkB*a8W08~C^pLjD8jJ3`uqE}nDhv}$4qmYNZdXlzdxF!9%SvqPDO4xET;(2yM
zzD7q;TkpY@AQ$ccuKga|)4+8C=L`Cg=Oy3*5wcYtx|IU{9FU9-r@%eTy}+#i&U_E<
zL7Wga;7abnMFCe090|n8V<z#(+J5l=_p?X&|9bW~@5JC;AXbO>^t?3%1*WPhXNY#@
z@fF%0@uX^LhQ(C5*<h*^vP@ZlDW%+kmyAj(%9)oC5Ev_-Z!)J?Dl1K8=H(2@PYbb)
z{3Om@34!69WMNs6xoAyE(H2wY;-V_^0*q5HNETM5k}SO5RB5O*Re_WG#`$r=B-wsh
zrpfF)moP!}vU618q?vyt!qdwOEhVM}Ysv~sOgLvF?@?%|EGO1dE@yh;ab&2T=XCyZ
ztY6{5FRa3(OTN{;jYJq{ePzP?sYn>qu_YhOx%EPQ*~9xyCHoG3YM%Q-SJfx6)AmpC
zdTDRw^SjrV=HJ$4pSqaE%;63`m-V}g3#3mCI5k}t5*H*NKF8*FJTfMtH+9jL>d1{D
zT{(G@T?*UKL9zm;{N<ORpd)AJu2Z}o^3kEll9&AV=KLaetfGFpzUarvSF8nlZ3Q2_
zKJ}>w<ws_{v--LG#`<)_0^Qu8C*5;%z6sd;xO&Wm^;gFKa(zYnm=F9vyFB`Q=XY->
zTF-A@v1#8cIF%{tMndtWPseTudaiqKz=;<=^tn7Hc3<=MuGBNq==UdFHJ{|Z3;FEO
zj#%%huXw*jR|JLpuJG!`@AsyC6}#lgO*1vtS%<XmKKvJB-xA}Dtylikc<GtzkM+Lx
z+LY?;TSxuv)Cd1s*}Zi8Hz|!G*9+?YuS&^(C#mWeH$Q&h)t|-dcfIlZCA}{vw+Aer
z_-;N^cjx-c-jB-qOZ{aR*$G9?%<ob^FF!xdYfkm|`BOfdnDp1Tb}efD<*S!V3NoH(
zpXX!W9<}u!Z<Rh8Skalde_3x<$ca^V8gus_oA&z;3Xan4VXa5GL6hIY1&5+mXI!1U
zhbUI=+8kbQi5%zC`R=qW%f58H+VFV(!JXzd*OU2MICamK;~~0c(eW|K{rLSF$VJNO
z%14zOlus#lEB7i-D9<Rnm0qd<Rj4XaRib)D^@A!%JxjenU83HhcF=q2lk|D|8a+r)
z(oEH;H1jn^O|fQ+W|!tw&3Bq9k*dfQky|78L@J^tL}f?qj0%V@i~b<`R`is4kIq{@
zFLz#Q%+Z*A+9TSfaYb>IHC_|HBEBkqZ~Q;v-;8gGzZ~BaACwTDkeJYz@KM6&3AYkP
zCx#?OBt|DDCoWDjCgvx8Pd?)WBO78Zj#q{%waS$+y-N9<@}TlX<y*=Y<t62}%Ab{D
zl|mJvN>MFRWvbSw%2Zoa+f}<&hgB}sS=HyNt13$Erw&qEXR7C^Q`B|p_tZbCr_-zH
z=jdko4z1R#)9llHqLD``BEur*MrK8>irf<UY2@X|e?@*D=@T_QYJJq>QCp+7M?D+$
zY1B|uLG;tn&qp7QelhxN^rz9C(G%w-#%ze$7jr7+)0pcqy)peULowo5dF+_jX|eNS
z6JzzU*|BS4+hQ+RWADWJYYo~wEu*z)Iqe79v)XU8yfz?C8<!flC@wc{W_)t|;`q||
zqw%lCD-r?|CMPHpQWF*?tV(!1;pv2P37;igOSqXZlyD%imqZ4ss~yb(<q~DKGGAGw
zELU2TJC(o3#Qs&uD}PY_q?D=rR1c}9s=`$&l{G_^jqt2jRj4+qo>19Ue^BjJol||K
z`c~DW`Vm3$QU|D~sMTt%I!&Ff&R3VI&FU>`oBApBF11trC-njKVfD-E*VXT;KTv<9
z{!D#EeO-M+eM{|DkD@2gGwB#QnKsZydKJBvX6Q27OmCrW^i%XMM0yXsFN;1%AEA%Y
zuhZ{fS+&w<>2~@Hx|9Bv?xBCAhv;&RMFV$q!jw}Ql}@!-Wl%9#mZ6DZiOR$siTjDy
VxN`WTk<xNHln$ehzapM3`X2%5S_S|B

delta 9235
zcmd^Fe_T}6wm)Znz=)$WDi|sz=~x<SFvIU*e(+-u3v>_xEkF^*4kIeTjFMLxY=$m}
z-IR6eeY*EnS6_BtR<~zYdtr6Eqxb-gn`T|3E3c^Qt)p0>as^*p=Y97XFznvX`+VNt
z@9^1suf5jVYp=ET+H3D~hUUF&^B#6jhHQ{|%ADoV4^3IH{n@Iz@#6V*u&xn(UH`_1
z+)}&gA&1mH_|Q(N-SE&3v`hcK@gW!5?aywk%Rqaof3t)?)&G1QrJw4rl=`b{syHf}
z8GGzDhRJ7@%p2~R8-bc5q5BybJDHt2mzj^QF2rfOQ@EQgnW9+DFx?ab3H?H5TBN#}
zVSF-%SyKSqQ+LdX>IPt?9OI9bVN$_4XZkXiqtONI6S1hYDD#B~+3m@X&H`vfnT>KM
z%7n)X%ChQ8S0!-I$x&@U!EB6GsF2;YI1A8($4a^D9ktu4LOL<cASzID4!t2;%?hVw
zT2K3)Dl5~`bMq-Cm%Qgkf^L<QSzRc89>i0p2*wAaMyyuGdpw%_wR{41Pfv*7Z`0bH
zOwg^yK=Hu;HYmhjSVAxZ8;tTWnN+O8U!X2@G9`9#%RdaRxOGYhDCFue$|(y*jg7X8
z+cC_0T;;c^?c;b-tb$<DE#58B6m+`%Fyf}E6v!O6ps?BGgD030*J7&LkFsxS_Q?&%
zxy2WfX2L4vTvjJ+QKsA#bPomHqb0$pc*!VrOTZOIibrz?-d;~SD;^lPL-;^h$a2Em
zu+6CXuz9f$tNDUaucwUNUO+rtOVB;Z5Lh4LCz&e48R6`trIm74-Zh5gUWa_~KmHyJ
za(gNCI-rSGQ6FE5DJm%?e<s)Y^7DMtsK`P2mVkS9%Q=^fmpdhIaMF^h#-s|4h=ovy
zL|DU`Mze@b6h4YbTmc(oeDwMXa#YekG~t`0m{6J}v8aSxF`Oeud3RqaZyQa!UE_NM
zA*PwfWP3ASWZam)x8<D1S0k*NJj+8y3i+m?U{oDu=53!C&KLq+wh=@mjRC%Rkhh7H
zc@ZR#n8(Of|4LRfFNa~;!g759_jO{4yWC|vPx)JduEdhkq6xls&uCMm_yQWAk7byQ
zWg6cuw8VCv6bxB;G#R^FJVAF4xvH6GWi;=H*@IC!X`K{g#JTKd$2g+#t;5LBl%J9h
z{DthMJ#B0zRUq!9KU0Z;RDUu^!|QC^$5dY1Wd8$fYyRw@?}Qs#2ir1P{|XjEuI-D?
z2Jh!QyEi7=V`W-16-8VuP~xjU1cRh_#D5=4Y@Z-@`ItRfeDR28UNg0?O`a`TY#WUG
z%qs8TZG%`5(llfx?ml?QXzSHHdJYlUaz^9(K}HR|L{5^XQLFse(JvLGc+h)HPS$Jv
zie|oCJlZegZA0>79&i6B`RJpI^3#wfKgt*P!ZC&uWVuT7cAc!{nrjZ}Aa=F!qwV1&
zPepp=C%u71-tSoVMF=6w)rK>qG1k8$C~wgER|QGu@G!|%$-CpO@V0&_1Po_}hvQBf
zKh(551f2$winyUHm>T$R$y9IJan*$s1fo;HQLjwgDH`85uqOAyCe+w7BwH=-B=@Sx
zid5rKO^aUGJSEOE5_gg>IPH%KBeqduRmi*SbWhVL#)u-A64cwpH<3O;_a2WVc?!bB
zeIV~Bv?C1UopM{hU3{97vD=QT#b@aPxJ7ch<&5i2_|LCyCbp5IU&;zsQ!qEuuV|HH
zpsmj?K7e5k45F$PoF_-)WNen2%~G*hT6U*`kASNF$S{(nChpVnPQLg&pP5SFl!8${
zOG~nJ3t{!&`Fhn9EN!#l8lR=3JNv{YW1b8=4OVz|g;su&WX1@)rq1^ijOKceEdq<?
zZL7>Uxa&Vj@p*E;nq;a;Q=j|`;vVA5`}n$Aek~{dPIB(3;RJ6x4Lf<LXN{E0<Xs4p
zw1N@MV*=(xKp=4BACsouxIt2WT0TN-z1|M(V%s3^K27Bn_Y+$mR4*Fjvpu84b{YcY
zh)fdMN)YudZ|fc31O>fvx7a50uV!1r{M%`iUx5T~M<lTg=91!m`DOUXdrXzdyN9|I
zsn|@-UE#F$cBwEAG&B~B)IW8Q9m_oHEA#;=yOado{ak#u)x(H4hJ(REJJ(2e$`!z&
zJbfv@sDx^Ixzt}gGL|_+19iZM2ypShbwH>2;=YzM?n(NaIn>r~2<p%AP3K$7gK4Q6
zp98v(Zmcz5aLI7aaIFPN<1cU$5)iQsk!i%KJ}6Edp$SvtJ50T28_LEG@ULh2@*bi%
zXg3b;m|eoXN0s{xltW+`hc&h@$PX7D1$!yi2TG?c$cn9?!Ykx+QqULo1^6^thFG=8
zeUPb{W@{JrXk!+CJX4wjWPe7xU-1HDFn0fPMX6nEmq@+RNN}IgE|{*Psr;OKdN6?-
zp&ERDO$eWMhvzHooVN0y@0=@@i_HQ4-D{Y;X#`mcCI(&iV8&qL!4fWm5?=%{SJJ!w
zo3@VegC&oWydYuF`ii!Wn`ah|7b)MX>8WzPluOM5<NaWCvd&0p4|*8V+hrT2s&hTa
ztA5)kUp`cdWT`?=+Hx^1Cp5lN>ii@Ha88+%DGZ*45;!%3QRlIb=_z0vaWeESF&aEe
z+|XX#a!uo#iBY?6K(<x$WCUP;E<2Wn=@2=%=ae`pYDkizHFj!R6yTF2YX$4{IZH2M
zG|9}6A8k&xYgz`;Yi?w1nwGC6NXBSd`XopW=#0=heZJ>q^!>%7V^)z5#5}C#*gXMi
zx+gW8TB@uJ<FX?0mU7k9c`ZZIMMUy=3@IN8CLSu`S}A2SC}SSKNXmz}XDG5nVu!Cu
z$k(OZAUq>_fVO*rQSXI(VlU-RQ*;f`rJObkU<E)fk3wrG^a_RUrBEY<tbiuo2q;X~
z@BGN_OFo8Sq*WwW_+7eaaR|2ua+c50MdGehO5?Ryg%dqr=ZVB=`fP`&z-f;?u4>KE
zX>ff|cA{mS%SwY$c~Fm>!r4W7<GLV0i?eb(Ng!v)e_SFm$h&kgL6=TjimV?)BO*r^
z<9~#1olZp<?h80Wm$QCP=*)Z$z9F8E`S7u0Fz(M_-2;Z@P-KLBK&~9UAZvdeTvuNv
zA9%l%H=7=#D{*!I`_BWZ$r<$L=wh8#Cu67cir-Je+L!4T0b7e1?YK9TNv>7lPP8c%
z2DvP$%AZ4odu>q(caSd4`<^S(&PFWWyk}y(&S`~N{TSVrqgw)D8S7jNGah!`F{XmX
zR;G)_xkp9pk|c~@u!!k#j0%3rMcb@QQ5Tj0@fkHreTb`siiY_mpx~Iu5?nN$9+uv_
z2Pr*Yr}G}y8Z#A|mT$lU7pmbxggzi`2r7beBe`7=Erx{@A6Lk?2Sb`o)H;T^bkXj-
z5^g```}{KY?@jB}_McdnHg4W5m={&Tou^}7!x$(#mM}14gB?2j=*$T8HVCJpqCBfg
zxWrtHsJUfC@Kb8kcwAGZqq!I=_))O^Gh#j^I{txJQpAl?%6*_rh;#(`?n`PG_sQfY
z6<buIdGVOxT<ITxU|NfVNJxD7NLrIh^F)@MUQ*#&oBGIFs7VsrNhfZt!k(Fn!@rd=
z%#pHOAuw}k_z?<o60F%p;abWKR%?hihvHlzUM+<iL%bhj&Lg{S<^2`K`9i!E6mAXi
z-c8|WZsi?-%154)=$^L$w?9wmAGS?P*Scr>&bX$x6|(7e);-mGROSuHd}rL}4S@mW
zoPf8RrRSCxW1KQ>KSp6mmPkQ@Hxl<`e=aVABNra0^hw++Kc!D^eq@qK(?ZWke{KX$
z)d7dc8O~k$Cw$@H%aiz2kT_s&HZRrq@`1n|z9kJU`FvpU?^rl~U}2|{Zcuh$R;QBY
zOm;xqDeX6QAiPsa-@Mqi;^1;4mgezeG~b+Y&E)nh#{&Dl4SMKtbn}&nz93wM^5e-@
zi^SZFw6(s%5V}Qh45sE9VX?nu2#2E7$DUmT3`vT;70>NKe~jZS?$_Squ{bMJnk`FR
zb3%fi&-DC65{@jbL@T{z0*dzg>5SqX-yx0SGBE;&D@f-+I8y5r;OyiqwC%vvVxmRd
zVK`U(uS-yMghC$!D&aV4eK!R?Tn>eQPZ?ANfDQrb!FeZoCNqqfsKjkS+)u&z0Lh@(
z4cN)@@nSCm5-F;}7jQM4`%1ho9FBQC4ifSe;2uV07ng&1-8v{*C=OC=CS>5PZ!(v<
z7>o-*-Mmf=2U3*Ls*m!#D~&9nBgJmOkgpV#=!*L&SszA4xY-V8xHuVudc@N}8v-5T
z22jK%Y4q)MbcZvN>n^l1;xwoRgT5E)=FD978!TX}t#4oK1}kGYk%>0|-#tJ<<O+TY
zMRIHCs^y^)_e2PX=jc4u5!8w<C8fe>W<c5YS!?+>L3f|{2lUs8%P}b#Gz8Pkt~n**
zZ4?KswIsRJDJvx(2BT6TEqGR3DDi=7Mu~VClTt2KFj+Lv3B=(^kTN1hqC?`va5Om2
z;>AO;xOu|S@Vy%LV#sFSIk!^03U=IPSaF@OBW7-l58ZX^I*3CQ|A=Y8rf+Wgh5=*y
zB;jDpyr?EQlDlXE8*aklX0$!xOTzh>JJXD3U9(7m+IX+JK7wSa<XLKCcfA@f3C6ST
zi-tf&c?UT*aJ@u)9Dc;=#a8c&h8Nz~Z4ff&-kr1vUSY+Zbp7gKISx^UK2Y8vIzpWY
zCoXf;BLf!>vgI8}qRpno8-%@cZ}TWa^6qT8=AO?jff(_K3XE6^4VOy0uZFs=IDKFs
z-g_d*PoZ4=lz6F5lxoVzPsxyKE9y?=V$|$G7HT_{;yp6h=~Qtd4TM#2jMp*Bv=`jZ
zFq?$r+Y{Mc!sgoxJh&xL%QVeRDu#X`IiiD%pO33cEo59_%}r_sH)DK-VzG9#y$(05
zTQ_Ew*F=>I0`CqNTVUG2<d9JffY%N8uA37WKE1%El6*i%cjHhBp=b8yNm%ctNUviE
z*V`elV}!8_E9aTmXyNgBY3b1rJ^ayneo7>OiVlRkAz<xjXP{UImq+J~(pvGc?I7F1
zF^n8p2Z;)v|3#P(oHtWt2S<n4^tCWI_Acw=Rp_+0(poywbO?+h=WR&jkN__zNrCE*
zi=A@uC79Wz(DlfWu3P$$IdSC?y-L9s+bX-R5T@QS&*NnLYlFk*{I*w+r9(`!&*59m
zjSk$zAkJ?aL3WIm1iRIUTNUKKLEZMiiH-{n<TL4#5Slpgh_o(gD)-$aFGJqFJB@xa
zb<b^|3`I7jWk$QFdmna9-LCc?5g~$c$tS^HeV~JzA1AzV$BOhHU<n^jb|}PQ2@?HS
z@E-5NwHv6Pib~#ZM-;qEE92FMS*65`bR0oWVSfq<^JmxtluE0gQZwP-PraQA<JI~L
zxSibmNXac+Vr8m>NmLnJt+aeCuBj+-{kR10ix!@oAMg1TngrdEd|1$}#YfB%E@2tc
z3tdlfAxPfiF$h$wgLmNus-^dm&O1d5h;>GcuZYHX01ogv29f3<*l@z%)K{eWS90|M
zKAhj7;8)>opD$J89h)?r$Emt|c&p1%i*GtfHCq!ME3h*7T#&TfvDJ;0LEMDK`tg>J
zm+(=(K{2^&GG18kQ}IP=cQ(WbbqkhxrV&#$^zfcyc?lQ@3nB3S?F?UwuZn55p<VYF
zPE3#nQIJAEOcbd}dH-++O_#2z-czzM5pq&KxQ|-r?Ur>ZslhOed5L0%kJ1m-8lM1!
zw_DNWk;oYTBbiaT9;R%J*7cC#goeeJrc2U$^(9g;=nSh^&}r;+myXF-h2+D<ApzGq
zVqHdWcWelaY!yPcW4D}M&}-~<-;U2T@ALx?VGE8K?>y$75?To>pF}mq!W#l7u<z28
zG3aWZ4Rjc%L<_NZuJmw~GzV4FI%)&0=a$hrX)UcyYfx``JgQl0rnsbLu3c)B`BJkm
zPimItpn3jDWg{A5V_vG2TE$CsX#F<TOS@=a+K64scBsJOZy$&i%u6nGyObR2NeU*=
zrL2|6*uKifG03S{yE(vgHSa=S1}j5-GKEGWpRXK2|7br$qy$6z9G8g@?Z*xk^6!c<
z(XZRVh0jZMt5i2jbwH~3NcA&P{hU;HOZ8r<z9hVM*IZA#1UE``tyGIreO#)0r1~`K
zp5Veyq)sntY>Yy$NeYx*n|3#;4$GK;YZ8FB0Jzs^-YCcCq*3pn<(1to%K?Q9=_0)S
z35LN!9grcmTz4N(AqM~{WG<RD!#%bANr~8w_ZILFo9fW!Ma`^7w~k>d)`B0U4P`&d
zJ18HbTtvwSJryMfunH}GwxTUr0~*RQlxUQxC<>IuF&=9%!`zGV6>#)<5$)L$hIs}!
z`UC*u@i2ig#6h&RDBq!ILDZwX2sj_@qZqsqZ5_%ZD6J?@(-!nkP_6+sqf9S_LMRz1
z`6%>B1-%X9zXp8`%0~2?QB)|etU+}U#7ijK0Utx#gF>GhXy*g>G}<AQvnXrPUxGp(
z_hPHmzNrhfv~y#Dl{uiZK6OV_0u4zTtB(5mZT0D~%$Axhm9_ZQXlcEpx~ASy<ud4(
zRoB)s#&N=-$|ZAHnL#h?TAIN!!rMztheno0Duif#e#DlVtxjo3`k@{A>9Qr;wnJ=9
zwIkNGEw;91>*m-UH7+i8T+-5UGMykon3D8cAu73v)gKa)i)H0wzrsm-f%>R#B}yXI
zo*Dmzj!^@SL`htQl0+##(&*RLTEtr(Xn8-OO?~Q)8SHz)Q5g~hY!9pq<vE-(X{GYx
zE2(4TWgDzuFnJa(LF7=u&G`Gtv$`m!XnTY9Xz{B9xz8tCt@m$!`39zBveV0o8yxiw
zW!06HTg$2)+snp0Q?||RD%;Yqy=rM`%~pfHY_+4-QQ6=aC&Slu)f+>T#G;wUFzHec
z0JA)MO+Njp@Ci_)pAU6gwn{`Rq6b@PSq=ShP$!w1nu#zM_N5Pa*1`|V>O(&p2H-+$
zwz0mhp>gcj#N)tI6GMEu?b~WyTdL8gE~jr1WB8prcUEtF5ctD|<8oY8x)qt23$LiR
z;O@u$jbYv^#Ks9t2*x!b#sC;`ZG=#Y3o&*BmqBroM!H5inEtwYnBqca=_#%qIJ(|r
zI0MD?05`#WDMIKDe*{O!vYHslC&`qN*}yQdXvTj-jol#pCZi(k;zBEPW1$dXn(euG
zmzDWD3R48Ov8N8A60O*i6L4!0kFCJHJ^{BAxPIWyPr&^WxM+AMaRTl=;5hK<CgA#j
zTZ>x_lRp6|LndnmW6lKJeBc^^qc)E}8)zm&#LoQxo+GjH|Mwgz%(wJT-orGw>bF+a
zJ-og_xNgZ5a;%HgvCR4gSEVaCvBsc3<g|V#%PUY6x*hco+a2|rw$*Q`+*;+x-sZ+d
zuAYgOEqA!G-Szd3tuA~0wkk(M!-{GqW&(B%SMR8-29miT6ZU3DFRzlX*jnSNsjRKp
z=_tytX>jF%&UoZ28gd*P-48zKsJGWU8X%APt+IG4SGl#i)=_P1ta8-3YPN07t*NE+
zGFyaT_FVQcVQ$Wx#f@~jf^F6AT1TG5j-a}2f(m1bF^>zCIftIk)zS}T%$u|RkhAh@
z>$~`$gyn}e<h{lontJaw)<Zvrv+;}LE8;!zzl?t?{`c{JivKo#QbKfsA)zecg@i8?
z)cV=_RDGGgQGZ$ggFe-;*>KHZPyAKl*~GsjYLbjeIY|XcDak97i<93^K9KrWYGK;u
zG*x;=`nq&i`U~l=r@xclo!*!JefoT3qA|~S(s<VRm2uQKEn`teVusn1u_B`=qdeom
zj58U3%ZM<=ne3)=lf&dU?KK@R9Wk9WePJ3fG3Ib{q}gD;*SyADY2IeuW#-NQV*WSt
zd*)Bge>D%9Z<uehEVLwAvMhy`GRuC;=N4EM%P`e2e0qFt{3G$di~l<Q_Jq|5k0rdH
za3x`p{vLgvewBWk-m_i*rv4p$hrUPu7ro3d&yZk9F)TN5hLeU*3||;78iowXiR%+P
z6E7!*B~4D!CM6^#CuJu!CGAf>oh(mToRXTdDy2B(ft1RW2UE7BG^DhqypXa#<<*q;
zQaV$Xr5aPKQr)SCQ#(?7Qa?-mK6P=LJ}oybKkebPU#Gp2_D0%KPntjdx9M-Ef0}-q
zajtQv(Q9lq{>u38#>2)g<Cn%8Mr(#GV_im7Ms3CnQ;bPxT5qZ`)ti21+GF~KsoV6C
z>CYz7blEh+Jlnh&{>e43GT#pmxy+B6Tg^|HpE3W^ycd3Y!~7O})nPtq{>c29`AhQ!
z^WWezxn+{YGs801veaU-6j(|uRhAmdHjCTxGs|wv&n<q7VEKjR*Or$puUX!-ylwft
zrNeT<a?0{2%Q?%JmTxTITCQ5ITbTGzo@V01;<fR<_%`$zYbgDuCRh{l6YL3GLT!S=
gtTJoO96la`Zl~`TICK*Fl?kH>jQ-H>MZ4Jl0d5#H7ytkO

diff --git a/depends/mimalloc/bin/readme.md b/depends/mimalloc/bin/readme.md
new file mode 100644
index 000000000000..69eed4115821
--- /dev/null
+++ b/depends/mimalloc/bin/readme.md
@@ -0,0 +1,118 @@
+# Windows Override
+
+<span id="override_on_windows">We use a separate redirection DLL to override mimalloc on Windows</span> 
+such that we redirect all malloc/free calls that go through the (dynamic) C runtime allocator, 
+including those from other DLL's or libraries. As it intercepts all allocation calls on a low level, 
+it can be used on large programs that include other 3rd party components.
+There are four requirements to make the overriding work well:
+
+1. Use the C-runtime library as a DLL (using the `/MD` or `/MDd` switch).
+
+2. Link your program explicitly with the `mimalloc.dll.lib` export library for
+   the `mimalloc.dll` -- which contains all mimalloc functionality.
+   To ensure the `mimalloc.dll` is actually loaded at run-time it is easiest 
+   to insert some call to the mimalloc API in the `main` function, like `mi_version()`
+   (or use the `/include:mi_version` switch on the linker, or
+   similarly, `#pragma comment(linker, "/include:mi_version")` in some source file). 
+   See the `mimalloc-test-override` project for an example on how to use this. 
+
+3. The `mimalloc-redirect.dll` must be put in the same folder as the main 
+   `mimalloc.dll` at runtime (as it is a dependency of that DLL).
+   The redirection DLL ensures that all calls to the C runtime malloc API get 
+   redirected to mimalloc functions (which reside in `mimalloc.dll`).
+
+4. Ensure the `mimalloc.dll` comes as early as possible in the import
+   list of the final executable (so it can intercept all potential allocations).
+   You can use `minject -l <exe>` to check this if needed.
+
+```csharp
+┌──────────────┐                                                    
+│ Your Program │                                                    
+└────┬─────────┘                                                    
+     │                                                              
+     │ mi_version()  ┌───────────────┐     ┌───────────────────────┐
+     ├──────────────►│ mimalloc.dll  ├────►│ mimalloc-redirect.dll │
+     │               └──────┬────────┘     └───────────────────────┘
+     │                      ▼                                       
+     │ malloc() etc. ┌──────────────┐                               
+     ├──────────────►│ ucrtbase.dll │                               
+     │               └──────────────┘                               
+     │                                                              
+     │                                                              
+     └──────────────► ...                                           
+```
+
+For best performance on Windows with C++, it
+is also recommended to also override the `new`/`delete` operations (by including
+[`mimalloc-new-delete.h`](../include/mimalloc-new-delete.h) 
+a single(!) source file in your project).
+
+The environment variable `MIMALLOC_DISABLE_REDIRECT=1` can be used to disable dynamic
+overriding at run-time. Use `MIMALLOC_VERBOSE=1` to check if mimalloc was successfully 
+redirected.
+
+### Other Platforms
+
+You always link with `mimalloc.dll` but for different platforms you may 
+need a specific redirection DLL:
+
+- __x64__: `mimalloc-redirect.dll`.
+- __x86__: `mimalloc-redirect32.dll`. Use for older 32-bit Windows programs.
+- __arm64__: `mimalloc-redirect-arm64.dll`. Use for native Windows arm64 programs.
+- __arm64ec__: `mimalloc-redirect-arm64ec.dll`. The [arm64ec] ABI is "emulation compatible" 
+  mode on Windows arm64. Unfortunately we cannot run x64 code emulated on Windows arm64 with
+  the x64 mimalloc override directly (since the C runtime always uses `arm64ec`). Instead:
+  1. Build the program as normal for x64 and link as normal with the x64 
+     `mimalloc.dll.lib` export library.
+  2. Now separately build `mimalloc.dll` in `arm64ec` mode and _overwrite_ your
+     previous (x64) `mimalloc.dll` -- the loader can handle the mix of arm64ec
+     and x64 code. Now use `mimalloc-redirect-arm64ec.dll` to match your new
+     arm64ec `mimalloc.dll`. The main program stays as is and can be fully x64 
+     or contain more arm64ec modules. At runtime, the arm64ec `mimalloc.dll` will
+     run with native arm64 instructions while the rest of the program runs emulated x64.
+
+[arm64ec]: https://learn.microsoft.com/en-us/windows/arm/arm64ec
+
+
+### Minject
+
+We cannot always re-link an executable with `mimalloc.dll`, and similarly, we 
+cannot always ensure that the DLL comes first in the import table of the final executable.
+In many cases though we can patch existing executables without any recompilation
+if they are linked with the dynamic C runtime (`ucrtbase.dll`) -- just put the 
+`mimalloc.dll` into the import table (and put `mimalloc-redirect.dll` in the same 
+directory) Such patching can be done for example with [CFF Explorer](https://ntcore.com/?page_id=388).
+
+The `minject` program can also do this from the command line
+Use `minject --help` for options:
+
+```
+> minject --help
+
+minject:
+  Injects the mimalloc dll into the import table of a 64-bit executable,
+  and/or ensures that it comes first in het import table.
+
+usage:
+  > minject [options] <exe>
+
+options:
+  -h   --help        show this help
+  -v   --verbose     be verbose
+  -l   --list        only list imported modules
+  -i   --inplace     update the exe in-place (make sure there is a backup!)
+  -f   --force       always overwrite without prompting
+       --postfix=<p> use <p> as a postfix to the mimalloc dll.
+                     e.g. use --postfix=debug to link with mimalloc-debug.dll
+
+notes:
+  Without '--inplace' an injected <exe> is generated with the same name ending in '-mi'.
+  Ensure 'mimalloc-redirect.dll' is in the same folder as the mimalloc dll.
+
+examples:
+  > minject --list myprogram.exe
+  > minject --force --inplace myprogram.exe
+```  
+
+For x86 32-bit binaries, use `minject32`, and for arm64 binaries use `minject-arm64`.
+
diff --git a/depends/mimalloc/cmake/mimalloc-config-version.cmake b/depends/mimalloc/cmake/mimalloc-config-version.cmake
index f0669c84d166..97756d79a5f0 100644
--- a/depends/mimalloc/cmake/mimalloc-config-version.cmake
+++ b/depends/mimalloc/cmake/mimalloc-config-version.cmake
@@ -1,6 +1,6 @@
-set(mi_version_major 2)
-set(mi_version_minor 0)
-set(mi_version_patch 7)
+set(mi_version_major 3)
+set(mi_version_minor 1)
+set(mi_version_patch 5)
 set(mi_version ${mi_version_major}.${mi_version_minor})
 
 set(PACKAGE_VERSION ${mi_version})
diff --git a/depends/mimalloc/cmake/mimalloc-config.cmake b/depends/mimalloc/cmake/mimalloc-config.cmake
index 8a28e37e7edd..a49b02a25a14 100644
--- a/depends/mimalloc/cmake/mimalloc-config.cmake
+++ b/depends/mimalloc/cmake/mimalloc-config.cmake
@@ -2,13 +2,13 @@ include(${CMAKE_CURRENT_LIST_DIR}/mimalloc.cmake)
 get_filename_component(MIMALLOC_CMAKE_DIR "${CMAKE_CURRENT_LIST_DIR}" PATH)  # one up from the cmake dir, e.g. /usr/local/lib/cmake/mimalloc-2.0
 get_filename_component(MIMALLOC_VERSION_DIR "${CMAKE_CURRENT_LIST_DIR}" NAME)
 string(REPLACE "/lib/cmake" "/lib" MIMALLOC_LIBRARY_DIR "${MIMALLOC_CMAKE_DIR}")
-if("${MIMALLOC_VERSION_DIR}" EQUAL "mimalloc")  
+if("${MIMALLOC_VERSION_DIR}" EQUAL "mimalloc")
   # top level install
   string(REPLACE "/lib/cmake" "/include" MIMALLOC_INCLUDE_DIR "${MIMALLOC_CMAKE_DIR}")
   set(MIMALLOC_OBJECT_DIR "${MIMALLOC_LIBRARY_DIR}")
-else()  
+else()
   # versioned
   string(REPLACE "/lib/cmake/" "/include/" MIMALLOC_INCLUDE_DIR "${CMAKE_CURRENT_LIST_DIR}")
-  string(REPLACE "/lib/cmake/" "/lib/" MIMALLOC_OBJECT_DIR "${CMAKE_CURRENT_LIST_DIR}")  
-endif()  
+  string(REPLACE "/lib/cmake/" "/lib/" MIMALLOC_OBJECT_DIR "${CMAKE_CURRENT_LIST_DIR}")
+endif()
 set(MIMALLOC_TARGET_DIR "${MIMALLOC_LIBRARY_DIR}") # legacy
diff --git a/depends/mimalloc/contrib/docker/alpine-arm32v7/Dockerfile b/depends/mimalloc/contrib/docker/alpine-arm32v7/Dockerfile
new file mode 100644
index 000000000000..daa60f50d55a
--- /dev/null
+++ b/depends/mimalloc/contrib/docker/alpine-arm32v7/Dockerfile
@@ -0,0 +1,28 @@
+# install from an image
+# download first an appropriate tar.gz image into the current directory
+# from <https://github.com/alpinelinux/docker-alpine/tree/edge/armv7>
+FROM scratch
+
+# Substitute the image name that was downloaded
+ADD alpine-minirootfs-20240329-armv7.tar.gz /
+
+# Install tools
+RUN apk add build-base make cmake
+RUN apk add git
+RUN apk add vim
+
+RUN mkdir -p  /home/dev
+WORKDIR /home/dev
+
+# Get mimalloc
+RUN git clone https://github.com/microsoft/mimalloc -b dev2
+RUN mkdir -p mimalloc/out/release
+RUN mkdir -p mimalloc/out/debug
+
+# Build mimalloc debug
+WORKDIR /home/dev/mimalloc/out/debug
+RUN cmake ../.. -DMI_DEBUG_FULL=ON
+RUN make -j
+RUN make test
+
+CMD ["/bin/sh"]
diff --git a/depends/mimalloc/contrib/docker/alpine-x86/Dockerfile b/depends/mimalloc/contrib/docker/alpine-x86/Dockerfile
new file mode 100644
index 000000000000..a0f76c17d768
--- /dev/null
+++ b/depends/mimalloc/contrib/docker/alpine-x86/Dockerfile
@@ -0,0 +1,28 @@
+# install from an image
+# download first an appropriate tar.gz image into the current directory
+# from <https://github.com/alpinelinux/docker-alpine/tree/edge/x86>
+FROM scratch
+
+# Substitute the image name that was downloaded
+ADD alpine-minirootfs-20250108-x86.tar.gz /
+
+# Install tools
+RUN apk add build-base make cmake
+RUN apk add git
+RUN apk add vim
+
+RUN mkdir -p  /home/dev
+WORKDIR /home/dev
+
+# Get mimalloc
+RUN git clone https://github.com/microsoft/mimalloc -b dev2
+RUN mkdir -p mimalloc/out/release
+RUN mkdir -p mimalloc/out/debug
+
+# Build mimalloc debug
+WORKDIR /home/dev/mimalloc/out/debug
+RUN cmake ../.. -DMI_DEBUG_FULL=ON
+# RUN make -j
+# RUN make test
+
+CMD ["/bin/sh"]
diff --git a/depends/mimalloc/contrib/docker/alpine/Dockerfile b/depends/mimalloc/contrib/docker/alpine/Dockerfile
new file mode 100644
index 000000000000..e1234a9b64b5
--- /dev/null
+++ b/depends/mimalloc/contrib/docker/alpine/Dockerfile
@@ -0,0 +1,23 @@
+# alpine image  
+FROM alpine
+
+# Install tools
+RUN apk add build-base make cmake
+RUN apk add git
+RUN apk add vim
+
+RUN mkdir -p  /home/dev
+WORKDIR /home/dev
+
+# Get mimalloc
+RUN git clone https://github.com/microsoft/mimalloc -b dev2
+RUN mkdir -p mimalloc/out/release
+RUN mkdir -p mimalloc/out/debug
+
+# Build mimalloc debug
+WORKDIR /home/dev/mimalloc/out/debug
+RUN cmake ../.. -DMI_DEBUG_FULL=ON
+RUN make -j
+RUN make test
+
+CMD ["/bin/sh"]
\ No newline at end of file
diff --git a/depends/mimalloc/contrib/docker/manylinux-x64/Dockerfile b/depends/mimalloc/contrib/docker/manylinux-x64/Dockerfile
new file mode 100644
index 000000000000..ff54d674efc5
--- /dev/null
+++ b/depends/mimalloc/contrib/docker/manylinux-x64/Dockerfile
@@ -0,0 +1,23 @@
+FROM quay.io/pypa/manylinux2014_x86_64
+
+# Install tools
+RUN yum install -y openssl-devel
+RUN yum install -y gcc gcc-c++ kernel-devel make
+RUN yum install -y git cmake
+RUN yum install -y vim
+
+RUN mkdir -p  /home/dev
+WORKDIR /home/dev
+
+# Get mimalloc
+RUN git clone https://github.com/microsoft/mimalloc -b dev2
+RUN mkdir -p mimalloc/out/release
+RUN mkdir -p mimalloc/out/debug
+
+# Build mimalloc debug
+WORKDIR /home/dev/mimalloc/out/debug
+RUN cmake ../.. -DMI_DEBUG_FULL=ON
+RUN make -j
+RUN make test
+
+CMD ["/bin/sh"]
\ No newline at end of file
diff --git a/depends/mimalloc/contrib/docker/readme.md b/depends/mimalloc/contrib/docker/readme.md
new file mode 100644
index 000000000000..b3d900940795
--- /dev/null
+++ b/depends/mimalloc/contrib/docker/readme.md
@@ -0,0 +1,10 @@
+Various example docker files used for testing.
+
+Usage:
+
+```
+> cd <host>
+> docker build -t <host>-mimalloc .
+> docker run -it <host>-mimalloc
+>> make test
+```
diff --git a/depends/mimalloc/contrib/vcpkg/portfile.cmake b/depends/mimalloc/contrib/vcpkg/portfile.cmake
new file mode 100644
index 000000000000..a3be8101e607
--- /dev/null
+++ b/depends/mimalloc/contrib/vcpkg/portfile.cmake
@@ -0,0 +1,64 @@
+vcpkg_from_github(
+  OUT_SOURCE_PATH SOURCE_PATH
+  REPO microsoft/mimalloc
+  HEAD_REF master
+
+  # The "REF" can be a commit hash, branch name (dev2), or a version (v2.2.1).
+  REF "v${VERSION}"
+  # REF 6a89f8554eaab8d8d00e17b5b09f79e1d8dbf61b
+
+  # The sha512 is the hash of the tar.gz bundle.
+  # (To get the sha512, run `vcpkg install "mimalloc[override]" --overlay-ports=./contrib/vcpkg` and copy the sha from the error message.)
+  SHA512 1e1268292283eb3c07a1f4de1bb919ebfeb18cbd4af0ca01d197d4dc46972ea127527e95e18f73381bda03593bcca5d3e4744c3ab49876c68567abebff030690
+)
+
+vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
+  FEATURES
+    c           MI_NO_USE_CXX
+    guarded     MI_GUARDED
+    secure      MI_SECURE
+    override    MI_OVERRIDE
+    optarch     MI_OPT_ARCH
+    nooptarch   MI_NO_OPT_ARCH
+    optsimd     MI_OPT_SIMD
+    xmalloc     MI_XMALLOC
+    asm         MI_SEE_ASM
+)
+string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" MI_BUILD_STATIC)
+string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" MI_BUILD_SHARED)
+
+vcpkg_cmake_configure(
+  SOURCE_PATH "${SOURCE_PATH}"
+  OPTIONS
+    -DMI_USE_CXX=ON
+    -DMI_BUILD_TESTS=OFF
+    -DMI_BUILD_OBJECT=ON
+    -DMI_BUILD_STATIC=${MI_BUILD_STATIC}
+    -DMI_BUILD_SHARED=${MI_BUILD_SHARED}
+    -DMI_INSTALL_TOPLEVEL=ON
+    ${FEATURE_OPTIONS}
+)
+
+vcpkg_cmake_install()
+vcpkg_copy_pdbs()
+
+file(COPY
+  "${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake"
+  "${CMAKE_CURRENT_LIST_DIR}/usage"
+  DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}"
+)
+vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/mimalloc)
+
+if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic")
+  # todo: why is this needed?
+  vcpkg_replace_string(
+    "${CURRENT_PACKAGES_DIR}/include/mimalloc.h"
+    "!defined(MI_SHARED_LIB)"
+    "0 // !defined(MI_SHARED_LIB)"
+  )
+endif()
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
+
+vcpkg_fixup_pkgconfig()
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")
diff --git a/depends/mimalloc/contrib/vcpkg/readme.md b/depends/mimalloc/contrib/vcpkg/readme.md
new file mode 100644
index 000000000000..014f2867363b
--- /dev/null
+++ b/depends/mimalloc/contrib/vcpkg/readme.md
@@ -0,0 +1,40 @@
+# Vcpkg support
+
+This directory is meant to provide the sources for the official [vcpkg port] 
+of mimalloc, but can also be used to override the official port with
+your own variant.
+
+For example, you can edit the [`portfile.cmake`](portfile.cmake) 
+to check out a specific commit, version, or branch of mimalloc, or set further options. 
+You can install such custom port as:
+
+```sh
+$ vcpkg install "mimalloc[override]" --recurse --overlay-ports=./contrib/vcpkg
+```
+
+This will also show the correct sha512 hash if you use a custom version.
+Another way is to refer to the overlay from the [vcpkg-configuration.json](https://learn.microsoft.com/en-us/vcpkg/reference/vcpkg-configuration-json) file.
+See also the vcpkg [documentation](https://learn.microsoft.com/en-us/vcpkg/produce/update-package-version) for more information.
+
+
+# Using mimalloc from vcpkg
+
+When using [cmake with vcpkg](https://learn.microsoft.com/en-us/vcpkg/get_started/get-started?pivots=shell-powershell), 
+you can use mimalloc from the `CMakeLists.txt` as:
+
+```cmake
+find_package(mimalloc CONFIG REQUIRED)
+target_link_libraries(main PRIVATE mimalloc)
+```
+
+See [`test/CMakeLists.txt](../../test/CMakeLists.txt) for more examples.
+
+
+# Acknowledgements
+
+The original port for vckpg was contributed by many people, including: @vicroms, @myd7349, @PhoubeHui, @LilyWangL,
+@JonLiu1993, @RT2Code, Remy Tassoux, @wangao, @BillyONeal, @jiayuehua, @dg0yt, @gerar-ryan-immersaview, @nickdademo, 
+and @jimwang118 -- Thank you so much!
+
+
+[vcpkg port]: https://github.com/microsoft/vcpkg/tree/master/ports/mimalloc
diff --git a/depends/mimalloc/contrib/vcpkg/usage b/depends/mimalloc/contrib/vcpkg/usage
new file mode 100644
index 000000000000..7ce649a754f3
--- /dev/null
+++ b/depends/mimalloc/contrib/vcpkg/usage
@@ -0,0 +1,20 @@
+Use the following CMake targets to import mimalloc:
+
+  find_package(mimalloc CONFIG REQUIRED)
+  target_link_libraries(main PRIVATE mimalloc)
+
+And use mimalloc in your sources as:
+
+  #include <mimalloc.h>
+  #include <stdio.h>
+  int main(int argc, char** argv) {
+    int* p = mi_malloc_tp(int);
+    *p = mi_version();
+    printf("mimalloc version: %d\n", *p);
+    mi_free(p);
+    return 0;
+  }
+
+When dynamically overriding on Windows, ensure `mimalloc.dll` is linked through some call to
+mimalloc (e.g. `mi_version()`), and that the `mimalloc-redirect.dll` is in the same directory.
+See https://github.com/microsoft/mimalloc/blob/dev/bin/readme.md for detailed information.
diff --git a/depends/mimalloc/contrib/vcpkg/vcpkg-cmake-wrapper.cmake b/depends/mimalloc/contrib/vcpkg/vcpkg-cmake-wrapper.cmake
new file mode 100644
index 000000000000..1b3557226e00
--- /dev/null
+++ b/depends/mimalloc/contrib/vcpkg/vcpkg-cmake-wrapper.cmake
@@ -0,0 +1,20 @@
+_find_package(${ARGS})
+
+if(CMAKE_CURRENT_LIST_DIR STREQUAL "${MIMALLOC_CMAKE_DIR}/${MIMALLOC_VERSION_DIR}")
+    set(MIMALLOC_INCLUDE_DIR "${VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/include")
+    # As in vcpkg.cmake
+    if(NOT DEFINED CMAKE_BUILD_TYPE OR CMAKE_BUILD_TYPE MATCHES "^[Dd][Ee][Bb][Uu][Gg]$")
+        set(MIMALLOC_LIBRARY_DIR "${VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/debug/lib")
+    else()
+        set(MIMALLOC_LIBRARY_DIR "${VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/lib")
+    endif()
+    set(MIMALLOC_OBJECT_DIR "${MIMALLOC_LIBRARY_DIR}")
+    set(MIMALLOC_TARGET_DIR "${MIMALLOC_LIBRARY_DIR}")
+endif()
+
+# vcpkg always configures either a static or dynamic library.
+# ensure to always expose the mimalloc target as either the static or dynamic build.
+if(TARGET mimalloc-static AND NOT TARGET mimalloc)
+  add_library(mimalloc INTERFACE IMPORTED)
+  set_target_properties(mimalloc PROPERTIES INTERFACE_LINK_LIBRARIES mimalloc-static)
+endif()
diff --git a/depends/mimalloc/contrib/vcpkg/vcpkg.json b/depends/mimalloc/contrib/vcpkg/vcpkg.json
new file mode 100644
index 000000000000..65d57d2ef98a
--- /dev/null
+++ b/depends/mimalloc/contrib/vcpkg/vcpkg.json
@@ -0,0 +1,48 @@
+{
+  "name": "mimalloc",
+  "version": "3.1.4",
+  "port-version": 2,
+  "description": "Compact general purpose allocator with excellent performance",
+  "homepage": "https://github.com/microsoft/mimalloc",
+  "license": "MIT",
+  "supports": "!uwp",
+  "dependencies": [
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    },
+    {
+      "name": "vcpkg-cmake-config",
+      "host": true
+    }
+  ],
+  "features": {
+    "c": {
+      "description": "Use C11 compilation (this can still override new/delete)"
+    },
+    "override": {
+      "description": "Override the standard malloc/free interface"
+    },
+    "secure": {
+      "description": "Use full security mitigations (like guard pages and randomization)"
+    },
+    "guarded": {
+      "description": "Use build that support guard pages after objects controlled with MIMALLOC_GUARDED_SAMPLE_RATE"
+    },
+    "xmalloc": {
+      "description": "If out-of-memory, call abort() instead of returning NULL"
+    },
+    "optarch": {
+      "description": "Use architecture specific optimizations (on x64: '-march=haswell;-mavx2', on arm64: '-march=armv8.1-a')"
+    },
+    "nooptarch": {
+      "description": "Do _not_ use architecture specific optimizations (on x64: '-march=haswell;-mavx2', on arm64: '-march=armv8.1-a')"
+    },
+    "optsimd": {
+      "description": "Allow use of SIMD instructions (avx2 or neon) (requires 'optarch' to be enabled)"
+    },
+    "asm": {
+      "description": "Generate assembly files"
+    }
+  }
+}
\ No newline at end of file
diff --git a/depends/mimalloc/doc/doxyfile b/depends/mimalloc/doc/doxyfile
index 73266f4e9be2..53f874cfb27e 100644
--- a/depends/mimalloc/doc/doxyfile
+++ b/depends/mimalloc/doc/doxyfile
@@ -1,4 +1,4 @@
-# Doxyfile 1.9.1
+# Doxyfile 1.11.0
 
 # This file describes the settings to be used by the documentation system
 # doxygen (www.doxygen.org) for a project.
@@ -12,6 +12,16 @@
 # For lists, items can also be appended using:
 # TAG += value [value, ...]
 # Values that contain spaces should be placed between quotes (\" \").
+#
+# Note:
+#
+# Use doxygen to compare the used configuration file with the template
+# configuration file:
+# doxygen -x [configFile]
+# Use doxygen to compare the used configuration file with the template
+# configuration file without replacing the environment variables or CMake type
+# replacement variables:
+# doxygen -x_noenv [configFile]
 
 #---------------------------------------------------------------------------
 # Project related configuration options
@@ -38,7 +48,7 @@ PROJECT_NAME           = mi-malloc
 # could be handy for archiving the generated documentation or if some version
 # control system is used.
 
-PROJECT_NUMBER         = 1.7/2.0
+PROJECT_NUMBER         = 1.8/2.1
 
 # Using the PROJECT_BRIEF tag one can provide an optional one line description
 # for a project that appears at the top of each page and should give viewer a
@@ -53,6 +63,12 @@ PROJECT_BRIEF          =
 
 PROJECT_LOGO           = mimalloc-logo.svg
 
+# With the PROJECT_ICON tag one can specify an icon that is included in the tabs
+# when the HTML document is shown. Doxygen will copy the logo to the output
+# directory.
+
+PROJECT_ICON           =
+
 # The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) path
 # into which the generated documentation will be written. If a relative path is
 # entered, it will be relative to the location where doxygen was started. If
@@ -60,16 +76,28 @@ PROJECT_LOGO           = mimalloc-logo.svg
 
 OUTPUT_DIRECTORY       = ..
 
-# If the CREATE_SUBDIRS tag is set to YES then doxygen will create 4096 sub-
-# directories (in 2 levels) under the output directory of each output format and
-# will distribute the generated files over these directories. Enabling this
+# If the CREATE_SUBDIRS tag is set to YES then doxygen will create up to 4096
+# sub-directories (in 2 levels) under the output directory of each output format
+# and will distribute the generated files over these directories. Enabling this
 # option can be useful when feeding doxygen a huge amount of source files, where
 # putting all generated files in the same directory would otherwise causes
-# performance problems for the file system.
+# performance problems for the file system. Adapt CREATE_SUBDIRS_LEVEL to
+# control the number of sub-directories.
 # The default value is: NO.
 
 CREATE_SUBDIRS         = NO
 
+# Controls the number of sub-directories that will be created when
+# CREATE_SUBDIRS tag is set to YES. Level 0 represents 16 directories, and every
+# level increment doubles the number of directories, resulting in 4096
+# directories at level 8 which is the default and also the maximum value. The
+# sub-directories are organized in 2 levels, the first level always has a fixed
+# number of 16 directories.
+# Minimum value: 0, maximum value: 8, default value: 8.
+# This tag requires that the tag CREATE_SUBDIRS is set to YES.
+
+CREATE_SUBDIRS_LEVEL   = 8
+
 # If the ALLOW_UNICODE_NAMES tag is set to YES, doxygen will allow non-ASCII
 # characters to appear in the names of generated files. If set to NO, non-ASCII
 # characters will be escaped, for example _xE3_x81_x84 will be used for Unicode
@@ -81,26 +109,18 @@ ALLOW_UNICODE_NAMES    = NO
 # The OUTPUT_LANGUAGE tag is used to specify the language in which all
 # documentation generated by doxygen is written. Doxygen will use this
 # information to generate all constant output in the proper language.
-# Possible values are: Afrikaans, Arabic, Armenian, Brazilian, Catalan, Chinese,
-# Chinese-Traditional, Croatian, Czech, Danish, Dutch, English (United States),
-# Esperanto, Farsi (Persian), Finnish, French, German, Greek, Hungarian,
-# Indonesian, Italian, Japanese, Japanese-en (Japanese with English messages),
-# Korean, Korean-en (Korean with English messages), Latvian, Lithuanian,
-# Macedonian, Norwegian, Persian (Farsi), Polish, Portuguese, Romanian, Russian,
-# Serbian, Serbian-Cyrillic, Slovak, Slovene, Spanish, Swedish, Turkish,
-# Ukrainian and Vietnamese.
+# Possible values are: Afrikaans, Arabic, Armenian, Brazilian, Bulgarian,
+# Catalan, Chinese, Chinese-Traditional, Croatian, Czech, Danish, Dutch, English
+# (United States), Esperanto, Farsi (Persian), Finnish, French, German, Greek,
+# Hindi, Hungarian, Indonesian, Italian, Japanese, Japanese-en (Japanese with
+# English messages), Korean, Korean-en (Korean with English messages), Latvian,
+# Lithuanian, Macedonian, Norwegian, Persian (Farsi), Polish, Portuguese,
+# Romanian, Russian, Serbian, Serbian-Cyrillic, Slovak, Slovene, Spanish,
+# Swedish, Turkish, Ukrainian and Vietnamese.
 # The default value is: English.
 
 OUTPUT_LANGUAGE        = English
 
-# The OUTPUT_TEXT_DIRECTION tag is used to specify the direction in which all
-# documentation generated by doxygen is written. Doxygen will use this
-# information to generate all generated output in the proper direction.
-# Possible values are: None, LTR, RTL and Context.
-# The default value is: None.
-
-OUTPUT_TEXT_DIRECTION  = None
-
 # If the BRIEF_MEMBER_DESC tag is set to YES, doxygen will include brief member
 # descriptions after the members that are listed in the file and class
 # documentation (similar to Javadoc). Set to NO to disable this.
@@ -258,16 +278,16 @@ TAB_SIZE               = 2
 # the documentation. An alias has the form:
 # name=value
 # For example adding
-# "sideeffect=@par Side Effects:\n"
+# "sideeffect=@par Side Effects:^^"
 # will allow you to put the command \sideeffect (or @sideeffect) in the
 # documentation, which will result in a user-defined paragraph with heading
-# "Side Effects:". You can put \n's in the value part of an alias to insert
-# newlines (in the resulting output). You can put ^^ in the value part of an
-# alias to insert a newline as if a physical newline was in the original file.
-# When you need a literal { or } or , in the value part of an alias you have to
-# escape them by means of a backslash (\), this can lead to conflicts with the
-# commands \{ and \} for these it is advised to use the version @{ and @} or use
-# a double escape (\\{ and \\})
+# "Side Effects:". Note that you cannot put \n's in the value part of an alias
+# to insert newlines (in the resulting output). You can put ^^ in the value part
+# of an alias to insert a newline as if a physical newline was in the original
+# file. When you need a literal { or } or , in the value part of an alias you
+# have to escape them by means of a backslash (\), this can lead to conflicts
+# with the commands \{ and \} for these it is advised to use the version @{ and
+# @} or use a double escape (\\{ and \\})
 
 ALIASES                =
 
@@ -312,8 +332,8 @@ OPTIMIZE_OUTPUT_SLICE  = NO
 # extension. Doxygen has a built-in mapping, but you can override or extend it
 # using this tag. The format is ext=language, where ext is a file extension, and
 # language is one of the parsers supported by doxygen: IDL, Java, JavaScript,
-# Csharp (C#), C, C++, D, PHP, md (Markdown), Objective-C, Python, Slice, VHDL,
-# Fortran (fixed format Fortran: FortranFixed, free formatted Fortran:
+# Csharp (C#), C, C++, Lex, D, PHP, md (Markdown), Objective-C, Python, Slice,
+# VHDL, Fortran (fixed format Fortran: FortranFixed, free formatted Fortran:
 # FortranFree, unknown formatted Fortran: Fortran. In the later case the parser
 # tries to guess whether the code is fixed or free formatted code, this is the
 # default for Fortran type files). For instance to make doxygen treat .inc files
@@ -344,11 +364,22 @@ MARKDOWN_SUPPORT       = YES
 # to that level are automatically included in the table of contents, even if
 # they do not have an id attribute.
 # Note: This feature currently applies only to Markdown headings.
-# Minimum value: 0, maximum value: 99, default value: 5.
+# Minimum value: 0, maximum value: 99, default value: 6.
 # This tag requires that the tag MARKDOWN_SUPPORT is set to YES.
 
 TOC_INCLUDE_HEADINGS   = 0
 
+# The MARKDOWN_ID_STYLE tag can be used to specify the algorithm used to
+# generate identifiers for the Markdown headings. Note: Every identifier is
+# unique.
+# Possible values are: DOXYGEN use a fixed 'autotoc_md' string followed by a
+# sequence number starting at 0 and GITHUB use the lower case version of title
+# with any whitespace replaced by '-' and punctuation characters removed.
+# The default value is: DOXYGEN.
+# This tag requires that the tag MARKDOWN_SUPPORT is set to YES.
+
+MARKDOWN_ID_STYLE      = DOXYGEN
+
 # When enabled doxygen tries to link words that correspond to documented
 # classes, or namespaces to their corresponding documentation. Such a link can
 # be prevented in individual cases by putting a % sign in front of the word or
@@ -361,8 +392,8 @@ AUTOLINK_SUPPORT       = YES
 # to include (a tag file for) the STL sources as input, then you should set this
 # tag to YES in order to let doxygen match functions declarations and
 # definitions whose arguments contain STL classes (e.g. func(std::string);
-# versus func(std::string) {}). This also make the inheritance and collaboration
-# diagrams that involve STL classes more complete and accurate.
+# versus func(std::string) {}). This also makes the inheritance and
+# collaboration diagrams that involve STL classes more complete and accurate.
 # The default value is: NO.
 
 BUILTIN_STL_SUPPORT    = NO
@@ -374,9 +405,9 @@ BUILTIN_STL_SUPPORT    = NO
 CPP_CLI_SUPPORT        = NO
 
 # Set the SIP_SUPPORT tag to YES if your project consists of sip (see:
-# https://www.riverbankcomputing.com/software/sip/intro) sources only. Doxygen
-# will parse them like normal C++ but will assume all classes use public instead
-# of private inheritance when no explicit protection keyword is present.
+# https://www.riverbankcomputing.com/software) sources only. Doxygen will parse
+# them like normal C++ but will assume all classes use public instead of private
+# inheritance when no explicit protection keyword is present.
 # The default value is: NO.
 
 SIP_SUPPORT            = NO
@@ -460,19 +491,27 @@ TYPEDEF_HIDES_STRUCT   = YES
 
 LOOKUP_CACHE_SIZE      = 0
 
-# The NUM_PROC_THREADS specifies the number threads doxygen is allowed to use
+# The NUM_PROC_THREADS specifies the number of threads doxygen is allowed to use
 # during processing. When set to 0 doxygen will based this on the number of
 # cores available in the system. You can set it explicitly to a value larger
 # than 0 to get more control over the balance between CPU load and processing
 # speed. At this moment only the input processing can be done using multiple
 # threads. Since this is still an experimental feature the default is set to 1,
-# which efficively disables parallel processing. Please report any issues you
+# which effectively disables parallel processing. Please report any issues you
 # encounter. Generating dot graphs in parallel is controlled by the
 # DOT_NUM_THREADS setting.
 # Minimum value: 0, maximum value: 32, default value: 1.
 
 NUM_PROC_THREADS       = 1
 
+# If the TIMESTAMP tag is set different from NO then each generated page will
+# contain the date or date and time when the page was generated. Setting this to
+# NO can help when comparing the output of multiple runs.
+# Possible values are: YES, NO, DATETIME and DATE.
+# The default value is: NO.
+
+TIMESTAMP              = NO
+
 #---------------------------------------------------------------------------
 # Build related configuration options
 #---------------------------------------------------------------------------
@@ -554,7 +593,8 @@ HIDE_UNDOC_MEMBERS     = NO
 # If the HIDE_UNDOC_CLASSES tag is set to YES, doxygen will hide all
 # undocumented classes that are normally visible in the class hierarchy. If set
 # to NO, these classes will be included in the various overviews. This option
-# has no effect if EXTRACT_ALL is enabled.
+# will also hide undocumented C++ concepts if enabled. This option has no effect
+# if EXTRACT_ALL is enabled.
 # The default value is: NO.
 
 HIDE_UNDOC_CLASSES     = NO
@@ -585,14 +625,15 @@ INTERNAL_DOCS          = NO
 # filesystem is case sensitive (i.e. it supports files in the same directory
 # whose names only differ in casing), the option must be set to YES to properly
 # deal with such files in case they appear in the input. For filesystems that
-# are not case sensitive the option should be be set to NO to properly deal with
+# are not case sensitive the option should be set to NO to properly deal with
 # output files written for symbols that only differ in casing, such as for two
 # classes, one named CLASS and the other named Class, and to also support
 # references to files without having to specify the exact matching casing. On
 # Windows (including Cygwin) and MacOS, users should typically set this option
 # to NO, whereas on Linux or other Unix flavors it should typically be set to
 # YES.
-# The default value is: system dependent.
+# Possible values are: SYSTEM, NO and YES.
+# The default value is: SYSTEM.
 
 CASE_SENSE_NAMES       = NO
 
@@ -610,6 +651,12 @@ HIDE_SCOPE_NAMES       = NO
 
 HIDE_COMPOUND_REFERENCE= NO
 
+# If the SHOW_HEADERFILE tag is set to YES then the documentation for a class
+# will show which file needs to be included to use the class.
+# The default value is: YES.
+
+SHOW_HEADERFILE        = YES
+
 # If the SHOW_INCLUDE_FILES tag is set to YES then doxygen will put a list of
 # the files that are included by a file in the documentation of that file.
 # The default value is: YES.
@@ -767,7 +814,8 @@ FILE_VERSION_FILTER    =
 # output files in an output format independent way. To create the layout file
 # that represents doxygen's defaults, run doxygen with the -l option. You can
 # optionally specify a file name after the option, if omitted DoxygenLayout.xml
-# will be used as the name of the layout file.
+# will be used as the name of the layout file. See also section "Changing the
+# layout of pages" for information.
 #
 # Note that if you run doxygen from a directory containing a file called
 # DoxygenLayout.xml, doxygen will parse it automatically even if the LAYOUT_FILE
@@ -813,27 +861,50 @@ WARNINGS               = YES
 WARN_IF_UNDOCUMENTED   = YES
 
 # If the WARN_IF_DOC_ERROR tag is set to YES, doxygen will generate warnings for
-# potential errors in the documentation, such as not documenting some parameters
-# in a documented function, or documenting parameters that don't exist or using
-# markup commands wrongly.
+# potential errors in the documentation, such as documenting some parameters in
+# a documented function twice, or documenting parameters that don't exist or
+# using markup commands wrongly.
 # The default value is: YES.
 
 WARN_IF_DOC_ERROR      = YES
 
+# If WARN_IF_INCOMPLETE_DOC is set to YES, doxygen will warn about incomplete
+# function parameter documentation. If set to NO, doxygen will accept that some
+# parameters have no documentation without warning.
+# The default value is: YES.
+
+WARN_IF_INCOMPLETE_DOC = YES
+
 # This WARN_NO_PARAMDOC option can be enabled to get warnings for functions that
 # are documented, but have no documentation for their parameters or return
-# value. If set to NO, doxygen will only warn about wrong or incomplete
-# parameter documentation, but not about the absence of documentation. If
-# EXTRACT_ALL is set to YES then this flag will automatically be disabled.
+# value. If set to NO, doxygen will only warn about wrong parameter
+# documentation, but not about the absence of documentation. If EXTRACT_ALL is
+# set to YES then this flag will automatically be disabled. See also
+# WARN_IF_INCOMPLETE_DOC
 # The default value is: NO.
 
 WARN_NO_PARAMDOC       = NO
 
+# If WARN_IF_UNDOC_ENUM_VAL option is set to YES, doxygen will warn about
+# undocumented enumeration values. If set to NO, doxygen will accept
+# undocumented enumeration values. If EXTRACT_ALL is set to YES then this flag
+# will automatically be disabled.
+# The default value is: NO.
+
+WARN_IF_UNDOC_ENUM_VAL = NO
+
 # If the WARN_AS_ERROR tag is set to YES then doxygen will immediately stop when
 # a warning is encountered. If the WARN_AS_ERROR tag is set to FAIL_ON_WARNINGS
 # then doxygen will continue running as if WARN_AS_ERROR tag is set to NO, but
 # at the end of the doxygen process doxygen will return with a non-zero status.
-# Possible values are: NO, YES and FAIL_ON_WARNINGS.
+# If the WARN_AS_ERROR tag is set to FAIL_ON_WARNINGS_PRINT then doxygen behaves
+# like FAIL_ON_WARNINGS but in case no WARN_LOGFILE is defined doxygen will not
+# write the warning messages in between other messages but write them at the end
+# of a run, in case a WARN_LOGFILE is defined the warning messages will be
+# besides being in the defined file also be shown at the end of a run, unless
+# the WARN_LOGFILE is defined as - i.e. standard output (stdout) in that case
+# the behavior will remain as with the setting FAIL_ON_WARNINGS.
+# Possible values are: NO, YES, FAIL_ON_WARNINGS and FAIL_ON_WARNINGS_PRINT.
 # The default value is: NO.
 
 WARN_AS_ERROR          = NO
@@ -844,13 +915,27 @@ WARN_AS_ERROR          = NO
 # and the warning text. Optionally the format may contain $version, which will
 # be replaced by the version of the file (if it could be obtained via
 # FILE_VERSION_FILTER)
+# See also: WARN_LINE_FORMAT
 # The default value is: $file:$line: $text.
 
 WARN_FORMAT            = "$file:$line: $text"
 
+# In the $text part of the WARN_FORMAT command it is possible that a reference
+# to a more specific place is given. To make it easier to jump to this place
+# (outside of doxygen) the user can define a custom "cut" / "paste" string.
+# Example:
+# WARN_LINE_FORMAT = "'vi $file +$line'"
+# See also: WARN_FORMAT
+# The default value is: at line $line of file $file.
+
+WARN_LINE_FORMAT       = "at line $line of file $file"
+
 # The WARN_LOGFILE tag can be used to specify a file to which warning and error
 # messages should be written. If left blank the output is written to standard
-# error (stderr).
+# error (stderr). In case the file specified cannot be opened for writing the
+# warning and error messages are written to standard error. When as file - is
+# specified the warning and error messages are written to standard output
+# (stdout).
 
 WARN_LOGFILE           =
 
@@ -871,10 +956,21 @@ INPUT                  = mimalloc-doc.h
 # libiconv (or the iconv built into libc) for the transcoding. See the libiconv
 # documentation (see:
 # https://www.gnu.org/software/libiconv/) for the list of possible encodings.
+# See also: INPUT_FILE_ENCODING
 # The default value is: UTF-8.
 
 INPUT_ENCODING         = UTF-8
 
+# This tag can be used to specify the character encoding of the source files
+# that doxygen parses The INPUT_FILE_ENCODING tag can be used to specify
+# character encoding on a per file pattern basis. Doxygen will compare the file
+# name with each pattern and apply the encoding instead of the default
+# INPUT_ENCODING) if there is a match. The character encodings are a list of the
+# form: pattern=encoding (like *.php=ISO-8859-1).
+# See also: INPUT_ENCODING for further information on supported encodings.
+
+INPUT_FILE_ENCODING    =
+
 # If the value of the INPUT tag contains directories, you can use the
 # FILE_PATTERNS tag to specify one or more wildcard patterns (like *.cpp and
 # *.h) to filter out the source-files in the directories.
@@ -886,12 +982,12 @@ INPUT_ENCODING         = UTF-8
 # Note the list of default checked file patterns might differ from the list of
 # default file extension mappings.
 #
-# If left blank the following patterns are tested:*.c, *.cc, *.cxx, *.cpp,
-# *.c++, *.java, *.ii, *.ixx, *.ipp, *.i++, *.inl, *.idl, *.ddl, *.odl, *.h,
-# *.hh, *.hxx, *.hpp, *.h++, *.cs, *.d, *.php, *.php4, *.php5, *.phtml, *.inc,
-# *.m, *.markdown, *.md, *.mm, *.dox (to be provided as doxygen C comment),
-# *.py, *.pyw, *.f90, *.f95, *.f03, *.f08, *.f18, *.f, *.for, *.vhd, *.vhdl,
-# *.ucf, *.qsf and *.ice.
+# If left blank the following patterns are tested:*.c, *.cc, *.cxx, *.cxxm,
+# *.cpp, *.cppm, *.ccm, *.c++, *.c++m, *.java, *.ii, *.ixx, *.ipp, *.i++, *.inl,
+# *.idl, *.ddl, *.odl, *.h, *.hh, *.hxx, *.hpp, *.h++, *.ixx, *.l, *.cs, *.d,
+# *.php, *.php4, *.php5, *.phtml, *.inc, *.m, *.markdown, *.md, *.mm, *.dox (to
+# be provided as doxygen C comment), *.py, *.pyw, *.f90, *.f95, *.f03, *.f08,
+# *.f18, *.f, *.for, *.vhd, *.vhdl, *.ucf, *.qsf and *.ice.
 
 FILE_PATTERNS          = *.c \
                          *.cc \
@@ -973,10 +1069,7 @@ EXCLUDE_PATTERNS       =
 # (namespaces, classes, functions, etc.) that should be excluded from the
 # output. The symbol name can be a fully qualified name, a word, or if the
 # wildcard * is used, a substring. Examples: ANamespace, AClass,
-# AClass::ANamespace, ANamespace::*Test
-#
-# Note that the wildcards are matched against the file with absolute path, so to
-# exclude all test directories use the pattern */test/*
+# ANamespace::AClass, ANamespace::*Test
 
 EXCLUDE_SYMBOLS        =
 
@@ -1021,6 +1114,11 @@ IMAGE_PATH             =
 # code is scanned, but not when the output code is generated. If lines are added
 # or removed, the anchors will not be placed correctly.
 #
+# Note that doxygen will use the data processed and written to standard output
+# for further processing, therefore nothing else, like debug statements or used
+# commands (so in case of a Windows batch file always use @echo OFF), should be
+# written to standard output.
+#
 # Note that for custom extensions or not directly supported extensions you also
 # need to set EXTENSION_MAPPING for the extension otherwise the files are not
 # properly processed by doxygen.
@@ -1062,6 +1160,15 @@ FILTER_SOURCE_PATTERNS =
 
 USE_MDFILE_AS_MAINPAGE =
 
+# The Fortran standard specifies that for fixed formatted Fortran code all
+# characters from position 72 are to be considered as comment. A common
+# extension is to allow longer lines before the automatic comment starts. The
+# setting FORTRAN_COMMENT_AFTER will also make it possible that longer lines can
+# be processed before the automatic comment starts.
+# Minimum value: 7, maximum value: 10000, default value: 72.
+
+FORTRAN_COMMENT_AFTER  = 72
+
 #---------------------------------------------------------------------------
 # Configuration options related to source browsing
 #---------------------------------------------------------------------------
@@ -1076,7 +1183,8 @@ USE_MDFILE_AS_MAINPAGE =
 SOURCE_BROWSER         = NO
 
 # Setting the INLINE_SOURCES tag to YES will include the body of functions,
-# classes and enums directly into the documentation.
+# multi-line macros, enums or list initialized variables directly into the
+# documentation.
 # The default value is: NO.
 
 INLINE_SOURCES         = NO
@@ -1159,9 +1267,11 @@ VERBATIM_HEADERS       = YES
 
 CLANG_ASSISTED_PARSING = NO
 
-# If clang assisted parsing is enabled and the CLANG_ADD_INC_PATHS tag is set to
-# YES then doxygen will add the directory of each input to the include path.
+# If the CLANG_ASSISTED_PARSING tag is set to YES and the CLANG_ADD_INC_PATHS
+# tag is set to YES then doxygen will add the directory of each input to the
+# include path.
 # The default value is: YES.
+# This tag requires that the tag CLANG_ASSISTED_PARSING is set to YES.
 
 CLANG_ADD_INC_PATHS    = YES
 
@@ -1197,10 +1307,11 @@ CLANG_DATABASE_PATH    =
 
 ALPHABETICAL_INDEX     = YES
 
-# In case all classes in a project start with a common prefix, all classes will
-# be put under the same header in the alphabetical index. The IGNORE_PREFIX tag
-# can be used to specify a prefix (or a list of prefixes) that should be ignored
-# while generating the index headers.
+# The IGNORE_PREFIX tag can be used to specify a prefix (or a list of prefixes)
+# that should be ignored while generating the index headers. The IGNORE_PREFIX
+# tag works for classes, function and member names. The entity will be placed in
+# the alphabetical list under the first letter of the entity name that remains
+# after removing the prefix.
 # This tag requires that the tag ALPHABETICAL_INDEX is set to YES.
 
 IGNORE_PREFIX          =
@@ -1279,7 +1390,12 @@ HTML_STYLESHEET        =
 # Doxygen will copy the style sheet files to the output directory.
 # Note: The order of the extra style sheet files is of importance (e.g. the last
 # style sheet in the list overrules the setting of the previous ones in the
-# list). For an example see the documentation.
+# list).
+# Note: Since the styling of scrollbars can currently not be overruled in
+# Webkit/Chromium, the styling will be left out of the default doxygen.css if
+# one or more extra stylesheets have been specified. So if scrollbar
+# customization is desired it has to be added explicitly. For an example see the
+# documentation.
 # This tag requires that the tag GENERATE_HTML is set to YES.
 
 HTML_EXTRA_STYLESHEET  = mimalloc-doxygen.css
@@ -1294,9 +1410,22 @@ HTML_EXTRA_STYLESHEET  = mimalloc-doxygen.css
 
 HTML_EXTRA_FILES       =
 
+# The HTML_COLORSTYLE tag can be used to specify if the generated HTML output
+# should be rendered with a dark or light theme.
+# Possible values are: LIGHT always generates light mode output, DARK always
+# generates dark mode output, AUTO_LIGHT automatically sets the mode according
+# to the user preference, uses light mode if no preference is set (the default),
+# AUTO_DARK automatically sets the mode according to the user preference, uses
+# dark mode if no preference is set and TOGGLE allows a user to switch between
+# light and dark mode via a button.
+# The default value is: AUTO_LIGHT.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_COLORSTYLE        = LIGHT
+
 # The HTML_COLORSTYLE_HUE tag controls the color of the HTML output. Doxygen
 # will adjust the colors in the style sheet and background images according to
-# this color. Hue is specified as an angle on a colorwheel, see
+# this color. Hue is specified as an angle on a color-wheel, see
 # https://en.wikipedia.org/wiki/Hue for more information. For instance the value
 # 0 represents red, 60 is yellow, 120 is green, 180 is cyan, 240 is blue, 300
 # purple, and 360 is red again.
@@ -1306,7 +1435,7 @@ HTML_EXTRA_FILES       =
 HTML_COLORSTYLE_HUE    = 189
 
 # The HTML_COLORSTYLE_SAT tag controls the purity (or saturation) of the colors
-# in the HTML output. For a value of 0 the output will use grayscales only. A
+# in the HTML output. For a value of 0 the output will use gray-scales only. A
 # value of 255 will produce the most vivid colors.
 # Minimum value: 0, maximum value: 255, default value: 100.
 # This tag requires that the tag GENERATE_HTML is set to YES.
@@ -1324,15 +1453,6 @@ HTML_COLORSTYLE_SAT    = 12
 
 HTML_COLORSTYLE_GAMMA  = 240
 
-# If the HTML_TIMESTAMP tag is set to YES then the footer of each generated HTML
-# page will contain the date and time when the page was generated. Setting this
-# to YES can help to show when doxygen was last run and thus if the
-# documentation is up to date.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-HTML_TIMESTAMP         = NO
-
 # If the HTML_DYNAMIC_MENUS tag is set to YES then the generated HTML
 # documentation will contain a main index with vertical navigation menus that
 # are dynamically created via JavaScript. If disabled, the navigation index will
@@ -1352,6 +1472,33 @@ HTML_DYNAMIC_MENUS     = NO
 
 HTML_DYNAMIC_SECTIONS  = NO
 
+# If the HTML_CODE_FOLDING tag is set to YES then classes and functions can be
+# dynamically folded and expanded in the generated HTML source code.
+# The default value is: YES.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_CODE_FOLDING      = YES
+
+# If the HTML_COPY_CLIPBOARD tag is set to YES then doxygen will show an icon in
+# the top right corner of code and text fragments that allows the user to copy
+# its content to the clipboard. Note this only works if supported by the browser
+# and the web page is served via a secure context (see:
+# https://www.w3.org/TR/secure-contexts/), i.e. using the https: or file:
+# protocol.
+# The default value is: YES.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_COPY_CLIPBOARD    = YES
+
+# Doxygen stores a couple of settings persistently in the browser (via e.g.
+# cookies). By default these settings apply to all HTML pages generated by
+# doxygen across all projects. The HTML_PROJECT_COOKIE tag can be used to store
+# the settings under a project specific key, such that the user preferences will
+# be stored separately.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_PROJECT_COOKIE    =
+
 # With HTML_INDEX_NUM_ENTRIES one can control the preferred number of entries
 # shown in the various tree structured indices initially; the user can expand
 # and collapse entries dynamically later on. Doxygen will expand the tree to
@@ -1388,6 +1535,13 @@ GENERATE_DOCSET        = NO
 
 DOCSET_FEEDNAME        = "Doxygen generated docs"
 
+# This tag determines the URL of the docset feed. A documentation feed provides
+# an umbrella under which multiple documentation sets from a single provider
+# (such as a company or product suite) can be grouped.
+# This tag requires that the tag GENERATE_DOCSET is set to YES.
+
+DOCSET_FEEDURL         =
+
 # This tag specifies a string that should uniquely identify the documentation
 # set bundle. This should be a reverse domain-name style string, e.g.
 # com.mycompany.MyDocSet. Doxygen will append .docset to the name.
@@ -1413,8 +1567,12 @@ DOCSET_PUBLISHER_NAME  = Publisher
 # If the GENERATE_HTMLHELP tag is set to YES then doxygen generates three
 # additional HTML index files: index.hhp, index.hhc, and index.hhk. The
 # index.hhp is a project file that can be read by Microsoft's HTML Help Workshop
-# (see:
-# https://www.microsoft.com/en-us/download/details.aspx?id=21138) on Windows.
+# on Windows. In the beginning of 2021 Microsoft took the original page, with
+# a.o. the download links, offline the HTML help workshop was already many years
+# in maintenance mode). You can download the HTML help workshop from the web
+# archives at Installation executable (see:
+# http://web.archive.org/web/20160201063255/http://download.microsoft.com/downlo
+# ad/0/A/9/0A939EF6-E31C-430F-A3DF-DFAE7960D564/htmlhelp.exe).
 #
 # The HTML Help Workshop contains a compiler that can convert all HTML output
 # generated by doxygen into a single compiled HTML file (.chm). Compiled HTML
@@ -1471,6 +1629,16 @@ BINARY_TOC             = NO
 
 TOC_EXPAND             = NO
 
+# The SITEMAP_URL tag is used to specify the full URL of the place where the
+# generated documentation will be placed on the server by the user during the
+# deployment of the documentation. The generated sitemap is called sitemap.xml
+# and placed on the directory specified by HTML_OUTPUT. In case no SITEMAP_URL
+# is specified no sitemap is generated. For information about the sitemap
+# protocol see https://www.sitemaps.org
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+SITEMAP_URL            =
+
 # If the GENERATE_QHP tag is set to YES and both QHP_NAMESPACE and
 # QHP_VIRTUAL_FOLDER are set, an additional index file will be generated that
 # can be used as input for Qt's qhelpgenerator to generate a Qt Compressed Help
@@ -1573,16 +1741,28 @@ DISABLE_INDEX          = YES
 # to work a browser that supports JavaScript, DHTML, CSS and frames is required
 # (i.e. any modern browser). Windows users are probably better off using the
 # HTML help feature. Via custom style sheets (see HTML_EXTRA_STYLESHEET) one can
-# further fine-tune the look of the index. As an example, the default style
-# sheet generated by doxygen has an example that shows how to put an image at
-# the root of the tree instead of the PROJECT_NAME. Since the tree basically has
-# the same information as the tab index, you could consider setting
-# DISABLE_INDEX to YES when enabling this option.
+# further fine tune the look of the index (see "Fine-tuning the output"). As an
+# example, the default style sheet generated by doxygen has an example that
+# shows how to put an image at the root of the tree instead of the PROJECT_NAME.
+# Since the tree basically has the same information as the tab index, you could
+# consider setting DISABLE_INDEX to YES when enabling this option.
 # The default value is: NO.
 # This tag requires that the tag GENERATE_HTML is set to YES.
 
 GENERATE_TREEVIEW      = YES
 
+# When both GENERATE_TREEVIEW and DISABLE_INDEX are set to YES, then the
+# FULL_SIDEBAR option determines if the side bar is limited to only the treeview
+# area (value NO) or if it should extend to the full height of the window (value
+# YES). Setting this to YES gives a layout similar to
+# https://docs.readthedocs.io with more room for contents, but less room for the
+# project logo, title, and description. If either GENERATE_TREEVIEW or
+# DISABLE_INDEX is set to NO, this option has no effect.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+FULL_SIDEBAR           = NO
+
 # The ENUM_VALUES_PER_LINE tag can be used to set the number of enum values that
 # doxygen will group on one line in the generated HTML documentation.
 #
@@ -1607,6 +1787,13 @@ TREEVIEW_WIDTH         = 180
 
 EXT_LINKS_IN_WINDOW    = NO
 
+# If the OBFUSCATE_EMAILS tag is set to YES, doxygen will obfuscate email
+# addresses.
+# The default value is: YES.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+OBFUSCATE_EMAILS       = YES
+
 # If the HTML_FORMULA_FORMAT option is set to svg, doxygen will use the pdf2svg
 # tool (see https://github.com/dawbarton/pdf2svg) or inkscape (see
 # https://inkscape.org) to generate formulas as SVG images instead of PNGs for
@@ -1627,17 +1814,6 @@ HTML_FORMULA_FORMAT    = png
 
 FORMULA_FONTSIZE       = 10
 
-# Use the FORMULA_TRANSPARENT tag to determine whether or not the images
-# generated for formulas are transparent PNGs. Transparent PNGs are not
-# supported properly for IE 6.0, but are supported on all modern browsers.
-#
-# Note that when changing this option you need to delete any form_*.png files in
-# the HTML output directory before the changes have effect.
-# The default value is: YES.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-FORMULA_TRANSPARENT    = YES
-
 # The FORMULA_MACROFILE can contain LaTeX \newcommand and \renewcommand commands
 # to create new LaTeX commands to be used in formulas as building blocks. See
 # the section "Including formulas" for details.
@@ -1655,11 +1831,29 @@ FORMULA_MACROFILE      =
 
 USE_MATHJAX            = NO
 
+# With MATHJAX_VERSION it is possible to specify the MathJax version to be used.
+# Note that the different versions of MathJax have different requirements with
+# regards to the different settings, so it is possible that also other MathJax
+# settings have to be changed when switching between the different MathJax
+# versions.
+# Possible values are: MathJax_2 and MathJax_3.
+# The default value is: MathJax_2.
+# This tag requires that the tag USE_MATHJAX is set to YES.
+
+MATHJAX_VERSION        = MathJax_2
+
 # When MathJax is enabled you can set the default output format to be used for
-# the MathJax output. See the MathJax site (see:
-# http://docs.mathjax.org/en/v2.7-latest/output.html) for more details.
+# the MathJax output. For more details about the output format see MathJax
+# version 2 (see:
+# http://docs.mathjax.org/en/v2.7-latest/output.html) and MathJax version 3
+# (see:
+# http://docs.mathjax.org/en/latest/web/components/output.html).
 # Possible values are: HTML-CSS (which is slower, but has the best
-# compatibility), NativeMML (i.e. MathML) and SVG.
+# compatibility. This is the name for Mathjax version 2, for MathJax version 3
+# this will be translated into chtml), NativeMML (i.e. MathML. Only supported
+# for MathJax 2. For MathJax version 3 chtml will be used instead.), chtml (This
+# is the name for Mathjax version 3, for MathJax version 2 this will be
+# translated into HTML-CSS) and SVG.
 # The default value is: HTML-CSS.
 # This tag requires that the tag USE_MATHJAX is set to YES.
 
@@ -1672,15 +1866,21 @@ MATHJAX_FORMAT         = HTML-CSS
 # MATHJAX_RELPATH should be ../mathjax. The default value points to the MathJax
 # Content Delivery Network so you can quickly see the result without installing
 # MathJax. However, it is strongly recommended to install a local copy of
-# MathJax from https://www.mathjax.org before deployment.
-# The default value is: https://cdn.jsdelivr.net/npm/mathjax@2.
+# MathJax from https://www.mathjax.org before deployment. The default value is:
+# - in case of MathJax version 2: https://cdn.jsdelivr.net/npm/mathjax@2
+# - in case of MathJax version 3: https://cdn.jsdelivr.net/npm/mathjax@3
 # This tag requires that the tag USE_MATHJAX is set to YES.
 
 MATHJAX_RELPATH        = http://cdn.mathjax.org/mathjax/latest
 
 # The MATHJAX_EXTENSIONS tag can be used to specify one or more MathJax
 # extension names that should be enabled during MathJax rendering. For example
+# for MathJax version 2 (see
+# https://docs.mathjax.org/en/v2.7-latest/tex.html#tex-and-latex-extensions):
 # MATHJAX_EXTENSIONS = TeX/AMSmath TeX/AMSsymbols
+# For example for MathJax version 3 (see
+# http://docs.mathjax.org/en/latest/input/tex/extensions/index.html):
+# MATHJAX_EXTENSIONS = ams
 # This tag requires that the tag USE_MATHJAX is set to YES.
 
 MATHJAX_EXTENSIONS     =
@@ -1860,29 +2060,31 @@ PAPER_TYPE             = a4
 
 EXTRA_PACKAGES         =
 
-# The LATEX_HEADER tag can be used to specify a personal LaTeX header for the
-# generated LaTeX document. The header should contain everything until the first
-# chapter. If it is left blank doxygen will generate a standard header. See
-# section "Doxygen usage" for information on how to let doxygen write the
-# default header to a separate file.
+# The LATEX_HEADER tag can be used to specify a user-defined LaTeX header for
+# the generated LaTeX document. The header should contain everything until the
+# first chapter. If it is left blank doxygen will generate a standard header. It
+# is highly recommended to start with a default header using
+# doxygen -w latex new_header.tex new_footer.tex new_stylesheet.sty
+# and then modify the file new_header.tex. See also section "Doxygen usage" for
+# information on how to generate the default header that doxygen normally uses.
 #
-# Note: Only use a user-defined header if you know what you are doing! The
-# following commands have a special meaning inside the header: $title,
-# $datetime, $date, $doxygenversion, $projectname, $projectnumber,
-# $projectbrief, $projectlogo. Doxygen will replace $title with the empty
-# string, for the replacement values of the other commands the user is referred
-# to HTML_HEADER.
+# Note: Only use a user-defined header if you know what you are doing!
+# Note: The header is subject to change so you typically have to regenerate the
+# default header when upgrading to a newer version of doxygen. The following
+# commands have a special meaning inside the header (and footer): For a
+# description of the possible markers and block names see the documentation.
 # This tag requires that the tag GENERATE_LATEX is set to YES.
 
 LATEX_HEADER           =
 
-# The LATEX_FOOTER tag can be used to specify a personal LaTeX footer for the
-# generated LaTeX document. The footer should contain everything after the last
-# chapter. If it is left blank doxygen will generate a standard footer. See
+# The LATEX_FOOTER tag can be used to specify a user-defined LaTeX footer for
+# the generated LaTeX document. The footer should contain everything after the
+# last chapter. If it is left blank doxygen will generate a standard footer. See
 # LATEX_HEADER for more information on how to generate a default footer and what
-# special commands can be used inside the footer.
-#
-# Note: Only use a user-defined footer if you know what you are doing!
+# special commands can be used inside the footer. See also section "Doxygen
+# usage" for information on how to generate the default footer that doxygen
+# normally uses. Note: Only use a user-defined footer if you know what you are
+# doing!
 # This tag requires that the tag GENERATE_LATEX is set to YES.
 
 LATEX_FOOTER           =
@@ -1925,10 +2127,16 @@ PDF_HYPERLINKS         = YES
 
 USE_PDFLATEX           = YES
 
-# If the LATEX_BATCHMODE tag is set to YES, doxygen will add the \batchmode
-# command to the generated LaTeX files. This will instruct LaTeX to keep running
-# if errors occur, instead of asking the user for help. This option is also used
-# when generating formulas in HTML.
+# The LATEX_BATCHMODE tag signals the behavior of LaTeX in case of an error.
+# Possible values are: NO same as ERROR_STOP, YES same as BATCH, BATCH In batch
+# mode nothing is printed on the terminal, errors are scrolled as if <return> is
+# hit at every error; missing files that TeX tries to input or request from
+# keyboard input (\read on a not open input stream) cause the job to abort,
+# NON_STOP In nonstop mode the diagnostic message will appear on the terminal,
+# but there is no possibility of user interaction just like in batch mode,
+# SCROLL In scroll mode, TeX will stop only for missing files to input or if
+# keyboard input is necessary and ERROR_STOP In errorstop mode, TeX will stop at
+# each error, asking for user intervention.
 # The default value is: NO.
 # This tag requires that the tag GENERATE_LATEX is set to YES.
 
@@ -1941,16 +2149,6 @@ LATEX_BATCHMODE        = NO
 
 LATEX_HIDE_INDICES     = NO
 
-# If the LATEX_SOURCE_CODE tag is set to YES then doxygen will include source
-# code with syntax highlighting in the LaTeX output.
-#
-# Note that which sources are shown also depends on other settings such as
-# SOURCE_BROWSER.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_LATEX is set to YES.
-
-LATEX_SOURCE_CODE      = NO
-
 # The LATEX_BIB_STYLE tag can be used to specify the style to use for the
 # bibliography, e.g. plainnat, or ieeetr. See
 # https://en.wikipedia.org/wiki/BibTeX and \cite for more info.
@@ -1959,14 +2157,6 @@ LATEX_SOURCE_CODE      = NO
 
 LATEX_BIB_STYLE        = plain
 
-# If the LATEX_TIMESTAMP tag is set to YES then the footer of each generated
-# page will contain the date and time when the page was generated. Setting this
-# to NO can help when comparing the output of multiple runs.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_LATEX is set to YES.
-
-LATEX_TIMESTAMP        = NO
-
 # The LATEX_EMOJI_DIRECTORY tag is used to specify the (relative or absolute)
 # path from which the emoji images will be read. If a relative path is entered,
 # it will be relative to the LATEX_OUTPUT directory. If left blank the
@@ -2031,15 +2221,13 @@ RTF_STYLESHEET_FILE    =
 
 RTF_EXTENSIONS_FILE    =
 
-# If the RTF_SOURCE_CODE tag is set to YES then doxygen will include source code
-# with syntax highlighting in the RTF output.
-#
-# Note that which sources are shown also depends on other settings such as
-# SOURCE_BROWSER.
-# The default value is: NO.
+# The RTF_EXTRA_FILES tag can be used to specify one or more extra images or
+# other source files which should be copied to the RTF_OUTPUT output directory.
+# Note that the files will be copied as-is; there are no commands or markers
+# available.
 # This tag requires that the tag GENERATE_RTF is set to YES.
 
-RTF_SOURCE_CODE        = NO
+RTF_EXTRA_FILES        =
 
 #---------------------------------------------------------------------------
 # Configuration options related to the man page output
@@ -2137,21 +2325,12 @@ GENERATE_DOCBOOK       = NO
 
 DOCBOOK_OUTPUT         = docbook
 
-# If the DOCBOOK_PROGRAMLISTING tag is set to YES, doxygen will include the
-# program listings (including syntax highlighting and cross-referencing
-# information) to the DOCBOOK output. Note that enabling this will significantly
-# increase the size of the DOCBOOK output.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_DOCBOOK is set to YES.
-
-DOCBOOK_PROGRAMLISTING = NO
-
 #---------------------------------------------------------------------------
 # Configuration options for the AutoGen Definitions output
 #---------------------------------------------------------------------------
 
 # If the GENERATE_AUTOGEN_DEF tag is set to YES, doxygen will generate an
-# AutoGen Definitions (see http://autogen.sourceforge.net/) file that captures
+# AutoGen Definitions (see https://autogen.sourceforge.net/) file that captures
 # the structure of the code including all documentation. Note that this feature
 # is still experimental and incomplete at the moment.
 # The default value is: NO.
@@ -2162,6 +2341,28 @@ GENERATE_AUTOGEN_DEF   = NO
 # Configuration options related to Sqlite3 output
 #---------------------------------------------------------------------------
 
+# If the GENERATE_SQLITE3 tag is set to YES doxygen will generate a Sqlite3
+# database with symbols found by doxygen stored in tables.
+# The default value is: NO.
+
+GENERATE_SQLITE3       = NO
+
+# The SQLITE3_OUTPUT tag is used to specify where the Sqlite3 database will be
+# put. If a relative path is entered the value of OUTPUT_DIRECTORY will be put
+# in front of it.
+# The default directory is: sqlite3.
+# This tag requires that the tag GENERATE_SQLITE3 is set to YES.
+
+SQLITE3_OUTPUT         = sqlite3
+
+# The SQLITE3_RECREATE_DB tag is set to YES, the existing doxygen_sqlite3.db
+# database file will be recreated with each doxygen run. If set to NO, doxygen
+# will warn if a database file is already found and not modify it.
+# The default value is: YES.
+# This tag requires that the tag GENERATE_SQLITE3 is set to YES.
+
+SQLITE3_RECREATE_DB    = YES
+
 #---------------------------------------------------------------------------
 # Configuration options related to the Perl module output
 #---------------------------------------------------------------------------
@@ -2236,7 +2437,8 @@ SEARCH_INCLUDES        = YES
 
 # The INCLUDE_PATH tag can be used to specify one or more directories that
 # contain include files that are not input files but should be processed by the
-# preprocessor.
+# preprocessor. Note that the INCLUDE_PATH is not recursive, so the setting of
+# RECURSIVE has no effect here.
 # This tag requires that the tag SEARCH_INCLUDES is set to YES.
 
 INCLUDE_PATH           =
@@ -2303,15 +2505,15 @@ TAGFILES               =
 
 GENERATE_TAGFILE       =
 
-# If the ALLEXTERNALS tag is set to YES, all external class will be listed in
-# the class index. If set to NO, only the inherited external classes will be
-# listed.
+# If the ALLEXTERNALS tag is set to YES, all external classes and namespaces
+# will be listed in the class and namespace index. If set to NO, only the
+# inherited external classes will be listed.
 # The default value is: NO.
 
 ALLEXTERNALS           = NO
 
 # If the EXTERNAL_GROUPS tag is set to YES, all external groups will be listed
-# in the modules index. If set to NO, only the current project's groups will be
+# in the topic index. If set to NO, only the current project's groups will be
 # listed.
 # The default value is: YES.
 
@@ -2325,25 +2527,9 @@ EXTERNAL_GROUPS        = YES
 EXTERNAL_PAGES         = YES
 
 #---------------------------------------------------------------------------
-# Configuration options related to the dot tool
+# Configuration options related to diagram generator tools
 #---------------------------------------------------------------------------
 
-# If the CLASS_DIAGRAMS tag is set to YES, doxygen will generate a class diagram
-# (in HTML and LaTeX) for classes with base or super classes. Setting the tag to
-# NO turns the diagrams off. Note that this option also works with HAVE_DOT
-# disabled, but it is recommended to install and use dot, since it yields more
-# powerful graphs.
-# The default value is: YES.
-
-CLASS_DIAGRAMS         = YES
-
-# You can include diagrams made with dia in doxygen documentation. Doxygen will
-# then run dia to produce the diagram and insert it in the documentation. The
-# DIA_PATH tag allows you to specify the directory where the dia binary resides.
-# If left empty dia is assumed to be found in the default search path.
-
-DIA_PATH               =
-
 # If set to YES the inheritance and collaboration graphs will hide inheritance
 # and usage relations if the target is undocumented or is not a class.
 # The default value is: YES.
@@ -2352,7 +2538,7 @@ HIDE_UNDOC_RELATIONS   = YES
 
 # If you set the HAVE_DOT tag to YES then doxygen will assume the dot tool is
 # available from the path. This tool is part of Graphviz (see:
-# http://www.graphviz.org/), a graph visualization toolkit from AT&T and Lucent
+# https://www.graphviz.org/), a graph visualization toolkit from AT&T and Lucent
 # Bell Labs. The other options in this section have no effect if this option is
 # set to NO
 # The default value is: NO.
@@ -2369,49 +2555,77 @@ HAVE_DOT               = NO
 
 DOT_NUM_THREADS        = 0
 
-# When you want a differently looking font in the dot files that doxygen
-# generates you can specify the font name using DOT_FONTNAME. You need to make
-# sure dot is able to find the font, which can be done by putting it in a
-# standard location or by setting the DOTFONTPATH environment variable or by
-# setting DOT_FONTPATH to the directory containing the font.
-# The default value is: Helvetica.
+# DOT_COMMON_ATTR is common attributes for nodes, edges and labels of
+# subgraphs. When you want a differently looking font in the dot files that
+# doxygen generates you can specify fontname, fontcolor and fontsize attributes.
+# For details please see <a href=https://graphviz.org/doc/info/attrs.html>Node,
+# Edge and Graph Attributes specification</a> You need to make sure dot is able
+# to find the font, which can be done by putting it in a standard location or by
+# setting the DOTFONTPATH environment variable or by setting DOT_FONTPATH to the
+# directory containing the font. Default graphviz fontsize is 14.
+# The default value is: fontname=Helvetica,fontsize=10.
 # This tag requires that the tag HAVE_DOT is set to YES.
 
-DOT_FONTNAME           = Helvetica
+DOT_COMMON_ATTR        = "fontname=Helvetica,fontsize=10"
 
-# The DOT_FONTSIZE tag can be used to set the size (in points) of the font of
-# dot graphs.
-# Minimum value: 4, maximum value: 24, default value: 10.
+# DOT_EDGE_ATTR is concatenated with DOT_COMMON_ATTR. For elegant style you can
+# add 'arrowhead=open, arrowtail=open, arrowsize=0.5'. <a
+# href=https://graphviz.org/doc/info/arrows.html>Complete documentation about
+# arrows shapes.</a>
+# The default value is: labelfontname=Helvetica,labelfontsize=10.
 # This tag requires that the tag HAVE_DOT is set to YES.
 
-DOT_FONTSIZE           = 10
+DOT_EDGE_ATTR          = "labelfontname=Helvetica,labelfontsize=10"
 
-# By default doxygen will tell dot to use the default font as specified with
-# DOT_FONTNAME. If you specify a different font using DOT_FONTNAME you can set
-# the path where dot can find it using this tag.
+# DOT_NODE_ATTR is concatenated with DOT_COMMON_ATTR. For view without boxes
+# around nodes set 'shape=plain' or 'shape=plaintext' <a
+# href=https://www.graphviz.org/doc/info/shapes.html>Shapes specification</a>
+# The default value is: shape=box,height=0.2,width=0.4.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+DOT_NODE_ATTR          = "shape=box,height=0.2,width=0.4"
+
+# You can set the path where dot can find font specified with fontname in
+# DOT_COMMON_ATTR and others dot attributes.
 # This tag requires that the tag HAVE_DOT is set to YES.
 
 DOT_FONTPATH           =
 
-# If the CLASS_GRAPH tag is set to YES then doxygen will generate a graph for
-# each documented class showing the direct and indirect inheritance relations.
-# Setting this tag to YES will force the CLASS_DIAGRAMS tag to NO.
+# If the CLASS_GRAPH tag is set to YES or GRAPH or BUILTIN then doxygen will
+# generate a graph for each documented class showing the direct and indirect
+# inheritance relations. In case the CLASS_GRAPH tag is set to YES or GRAPH and
+# HAVE_DOT is enabled as well, then dot will be used to draw the graph. In case
+# the CLASS_GRAPH tag is set to YES and HAVE_DOT is disabled or if the
+# CLASS_GRAPH tag is set to BUILTIN, then the built-in generator will be used.
+# If the CLASS_GRAPH tag is set to TEXT the direct and indirect inheritance
+# relations will be shown as texts / links. Explicit enabling an inheritance
+# graph or choosing a different representation for an inheritance graph of a
+# specific class, can be accomplished by means of the command \inheritancegraph.
+# Disabling an inheritance graph can be accomplished by means of the command
+# \hideinheritancegraph.
+# Possible values are: NO, YES, TEXT, GRAPH and BUILTIN.
 # The default value is: YES.
-# This tag requires that the tag HAVE_DOT is set to YES.
 
 CLASS_GRAPH            = YES
 
 # If the COLLABORATION_GRAPH tag is set to YES then doxygen will generate a
 # graph for each documented class showing the direct and indirect implementation
 # dependencies (inheritance, containment, and class references variables) of the
-# class with other documented classes.
+# class with other documented classes. Explicit enabling a collaboration graph,
+# when COLLABORATION_GRAPH is set to NO, can be accomplished by means of the
+# command \collaborationgraph. Disabling a collaboration graph can be
+# accomplished by means of the command \hidecollaborationgraph.
 # The default value is: YES.
 # This tag requires that the tag HAVE_DOT is set to YES.
 
 COLLABORATION_GRAPH    = YES
 
 # If the GROUP_GRAPHS tag is set to YES then doxygen will generate a graph for
-# groups, showing the direct groups dependencies.
+# groups, showing the direct groups dependencies. Explicit enabling a group
+# dependency graph, when GROUP_GRAPHS is set to NO, can be accomplished by means
+# of the command \groupgraph. Disabling a directory graph can be accomplished by
+# means of the command \hidegroupgraph. See also the chapter Grouping in the
+# manual.
 # The default value is: YES.
 # This tag requires that the tag HAVE_DOT is set to YES.
 
@@ -2453,8 +2667,8 @@ DOT_UML_DETAILS        = NO
 
 # The DOT_WRAP_THRESHOLD tag can be used to set the maximum number of characters
 # to display on a single line. If the actual line length exceeds this threshold
-# significantly it will wrapped across multiple lines. Some heuristics are apply
-# to avoid ugly line breaks.
+# significantly it will be wrapped across multiple lines. Some heuristics are
+# applied to avoid ugly line breaks.
 # Minimum value: 0, maximum value: 1000, default value: 17.
 # This tag requires that the tag HAVE_DOT is set to YES.
 
@@ -2471,7 +2685,9 @@ TEMPLATE_RELATIONS     = NO
 # If the INCLUDE_GRAPH, ENABLE_PREPROCESSING and SEARCH_INCLUDES tags are set to
 # YES then doxygen will generate a graph for each documented file showing the
 # direct and indirect include dependencies of the file with other documented
-# files.
+# files. Explicit enabling an include graph, when INCLUDE_GRAPH is is set to NO,
+# can be accomplished by means of the command \includegraph. Disabling an
+# include graph can be accomplished by means of the command \hideincludegraph.
 # The default value is: YES.
 # This tag requires that the tag HAVE_DOT is set to YES.
 
@@ -2480,7 +2696,10 @@ INCLUDE_GRAPH          = YES
 # If the INCLUDED_BY_GRAPH, ENABLE_PREPROCESSING and SEARCH_INCLUDES tags are
 # set to YES then doxygen will generate a graph for each documented file showing
 # the direct and indirect include dependencies of the file with other documented
-# files.
+# files. Explicit enabling an included by graph, when INCLUDED_BY_GRAPH is set
+# to NO, can be accomplished by means of the command \includedbygraph. Disabling
+# an included by graph can be accomplished by means of the command
+# \hideincludedbygraph.
 # The default value is: YES.
 # This tag requires that the tag HAVE_DOT is set to YES.
 
@@ -2520,16 +2739,26 @@ GRAPHICAL_HIERARCHY    = YES
 # If the DIRECTORY_GRAPH tag is set to YES then doxygen will show the
 # dependencies a directory has on other directories in a graphical way. The
 # dependency relations are determined by the #include relations between the
-# files in the directories.
+# files in the directories. Explicit enabling a directory graph, when
+# DIRECTORY_GRAPH is set to NO, can be accomplished by means of the command
+# \directorygraph. Disabling a directory graph can be accomplished by means of
+# the command \hidedirectorygraph.
 # The default value is: YES.
 # This tag requires that the tag HAVE_DOT is set to YES.
 
 DIRECTORY_GRAPH        = YES
 
+# The DIR_GRAPH_MAX_DEPTH tag can be used to limit the maximum number of levels
+# of child directories generated in directory dependency graphs by dot.
+# Minimum value: 1, maximum value: 25, default value: 1.
+# This tag requires that the tag DIRECTORY_GRAPH is set to YES.
+
+DIR_GRAPH_MAX_DEPTH    = 1
+
 # The DOT_IMAGE_FORMAT tag can be used to set the image format of the images
 # generated by dot. For an explanation of the image formats see the section
 # output formats in the documentation of the dot tool (Graphviz (see:
-# http://www.graphviz.org/)).
+# https://www.graphviz.org/)).
 # Note: If you choose svg you need to set HTML_FILE_EXTENSION to xhtml in order
 # to make the SVG files visible in IE 9+ (other browsers do not have this
 # requirement).
@@ -2566,11 +2795,12 @@ DOT_PATH               =
 
 DOTFILE_DIRS           =
 
-# The MSCFILE_DIRS tag can be used to specify one or more directories that
-# contain msc files that are included in the documentation (see the \mscfile
-# command).
+# You can include diagrams made with dia in doxygen documentation. Doxygen will
+# then run dia to produce the diagram and insert it in the documentation. The
+# DIA_PATH tag allows you to specify the directory where the dia binary resides.
+# If left empty dia is assumed to be found in the default search path.
 
-MSCFILE_DIRS           =
+DIA_PATH               =
 
 # The DIAFILE_DIRS tag can be used to specify one or more directories that
 # contain dia files that are included in the documentation (see the \diafile
@@ -2579,10 +2809,10 @@ MSCFILE_DIRS           =
 DIAFILE_DIRS           =
 
 # When using plantuml, the PLANTUML_JAR_PATH tag should be used to specify the
-# path where java can find the plantuml.jar file. If left blank, it is assumed
-# PlantUML is not used or called during a preprocessing step. Doxygen will
-# generate a warning when it encounters a \startuml command in this case and
-# will not generate output for the diagram.
+# path where java can find the plantuml.jar file or to the filename of jar file
+# to be used. If left blank, it is assumed PlantUML is not used or called during
+# a preprocessing step. Doxygen will generate a warning when it encounters a
+# \startuml command in this case and will not generate output for the diagram.
 
 PLANTUML_JAR_PATH      =
 
@@ -2599,7 +2829,7 @@ PLANTUML_INCLUDE_PATH  =
 # The DOT_GRAPH_MAX_NODES tag can be used to set the maximum number of nodes
 # that will be shown in the graph. If the number of nodes in a graph becomes
 # larger than this value, doxygen will truncate the graph, which is visualized
-# by representing a node as a red box. Note that doxygen if the number of direct
+# by representing a node as a red box. Note that if the number of direct
 # children of the root node in a graph is already larger than
 # DOT_GRAPH_MAX_NODES then the graph will not be shown at all. Also note that
 # the size of a graph can be further restricted by MAX_DOT_GRAPH_DEPTH.
@@ -2620,18 +2850,6 @@ DOT_GRAPH_MAX_NODES    = 50
 
 MAX_DOT_GRAPH_DEPTH    = 0
 
-# Set the DOT_TRANSPARENT tag to YES to generate images with a transparent
-# background. This is disabled by default, because dot on Windows does not seem
-# to support this out of the box.
-#
-# Warning: Depending on the platform used, enabling this option may lead to
-# badly anti-aliased labels on the edges of a graph (i.e. they become hard to
-# read).
-# The default value is: NO.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-DOT_TRANSPARENT        = NO
-
 # Set the DOT_MULTI_TARGETS tag to YES to allow dot to generate multiple output
 # files in one run (i.e. multiple -o and -T options on the command line). This
 # makes dot run faster, but since only newer versions of dot (>1.8.10) support
@@ -2644,6 +2862,8 @@ DOT_MULTI_TARGETS      = NO
 # If the GENERATE_LEGEND tag is set to YES doxygen will generate a legend page
 # explaining the meaning of the various boxes and arrows in the dot generated
 # graphs.
+# Note: This tag requires that UML_LOOK isn't set, i.e. the doxygen internal
+# graphical representation for inheritance and collaboration diagrams is used.
 # The default value is: YES.
 # This tag requires that the tag HAVE_DOT is set to YES.
 
@@ -2652,8 +2872,24 @@ GENERATE_LEGEND        = YES
 # If the DOT_CLEANUP tag is set to YES, doxygen will remove the intermediate
 # files that are used to generate the various graphs.
 #
-# Note: This setting is not only used for dot files but also for msc and
-# plantuml temporary files.
+# Note: This setting is not only used for dot files but also for msc temporary
+# files.
 # The default value is: YES.
 
 DOT_CLEANUP            = YES
+
+# You can define message sequence charts within doxygen comments using the \msc
+# command. If the MSCGEN_TOOL tag is left empty (the default), then doxygen will
+# use a built-in version of mscgen tool to produce the charts. Alternatively,
+# the MSCGEN_TOOL tag can also specify the name an external tool. For instance,
+# specifying prog as the value, doxygen will call the tool as prog -T
+# <outfile_format> -o <outputfile> <inputfile>. The external tool should support
+# output file formats "png", "eps", "svg", and "ismap".
+
+MSCGEN_TOOL            =
+
+# The MSCFILE_DIRS tag can be used to specify one or more directories that
+# contain msc files that are included in the documentation (see the \mscfile
+# command).
+
+MSCFILE_DIRS           =
diff --git a/depends/mimalloc/doc/mimalloc-doc.h b/depends/mimalloc/doc/mimalloc-doc.h
index f435309226bd..7a412852ffe8 100644
--- a/depends/mimalloc/doc/mimalloc-doc.h
+++ b/depends/mimalloc/doc/mimalloc-doc.h
@@ -1,5 +1,5 @@
 /* ----------------------------------------------------------------------------
-Copyright (c) 2018-2021, Microsoft Research, Daan Leijen
+Copyright (c) 2018-2025, Microsoft Research, Daan Leijen
 This is free software; you can redistribute it and/or modify it under the
 terms of the MIT license. A copy of the license can be found in the file
 "LICENSE" at the root of this distribution.
@@ -25,12 +25,15 @@ without code changes, for example, on Unix you can use it as:
 ```
 
 Notable aspects of the design include:
-
 - __small and consistent__: the library is about 8k LOC using simple and
   consistent data structures. This makes it very suitable
   to integrate and adapt in other projects. For runtime systems it
   provides hooks for a monotonic _heartbeat_ and deferred freeing (for
   bounded worst-case times with reference counting).
+  Partly due to its simplicity, mimalloc has been ported to many systems (Windows, macOS,
+  Linux, WASM, various BSD's, Haiku, MUSL, etc) and has excellent support for dynamic overriding.
+  At the same time, it is an industrial strength allocator that runs (very) large scale
+  distributed services on thousands of machines with excellent worst case latencies.
 - __free list sharding__: instead of one big free list (per size class) we have
   many smaller lists per "mimalloc page" which reduces fragmentation and
   increases locality --
@@ -40,28 +43,28 @@ Notable aspects of the design include:
   per mimalloc page, but for each page we have multiple free lists. In particular, there
   is one list for thread-local `free` operations, and another one for concurrent `free`
   operations. Free-ing from another thread can now be a single CAS without needing
-  sophisticated coordination between threads. Since there will be 
+  sophisticated coordination between threads. Since there will be
   thousands of separate free lists, contention is naturally distributed over the heap,
   and the chance of contending on a single location will be low -- this is quite
   similar to randomized algorithms like skip lists where adding
   a random oracle removes the need for a more complex algorithm.
-- __eager page reset__: when a "page" becomes empty (with increased chance
-  due to free list sharding) the memory is marked to the OS as unused ("reset" or "purged")
+- __eager page purging__: when a "page" becomes empty (with increased chance
+  due to free list sharding) the memory is marked to the OS as unused (reset or decommitted)
   reducing (real) memory pressure and fragmentation, especially in long running
   programs.
-- __secure__: _mimalloc_ can be build in secure mode, adding guard pages,
+- __secure__: _mimalloc_ can be built in secure mode, adding guard pages,
   randomized allocation, encrypted free lists, etc. to protect against various
-  heap vulnerabilities. The performance penalty is only around 5% on average
+  heap vulnerabilities. The performance penalty is usually around 10% on average
   over our benchmarks.
 - __first-class heaps__: efficiently create and use multiple heaps to allocate across different regions.
   A heap can be destroyed at once instead of deallocating each object separately.
 - __bounded__: it does not suffer from _blowup_ \[1\], has bounded worst-case allocation
-  times (_wcat_), bounded space overhead (~0.2% meta-data, with low internal fragmentation),
-  and has no internal points of contention using only atomic operations.
-- __fast__: In our benchmarks (see [below](#performance)),
-  _mimalloc_ outperforms all other leading allocators (_jemalloc_, _tcmalloc_, _Hoard_, etc),
-  and usually uses less memory (up to 25% more in the worst case). A nice property
-  is that it does consistently well over a wide range of benchmarks.
+  times (_wcat_) (upto OS primitives), bounded space overhead (~0.2% meta-data, with low
+  internal fragmentation), and has no internal points of contention using only atomic operations.
+- __fast__: In our benchmarks (see [below](#bench)),
+  _mimalloc_ outperforms other leading allocators (_jemalloc_, _tcmalloc_, _Hoard_, etc),
+  and often uses less memory. A nice property is that it does consistently well over a wide range
+  of benchmarks. There is also good huge OS page support for larger server programs.
 
 You can read more on the design of _mimalloc_ in the
 [technical report](https://www.microsoft.com/en-us/research/publication/mimalloc-free-list-sharding-in-action)
@@ -168,7 +171,7 @@ void* mi_expand(void* p, size_t newsize);
 /// @returns A pointer to a block of \a count * \a size bytes, or \a NULL
 /// if out of memory or if \a count * \a size overflows.
 ///
-/// If there is no overflow, it behaves exactly like `mi_malloc(p,count*size)`.
+/// If there is no overflow, it behaves exactly like `mi_malloc(count*size)`.
 /// @see mi_calloc()
 /// @see mi_zallocn()
 void* mi_mallocn(size_t count, size_t size);
@@ -278,8 +281,7 @@ void* mi_zalloc_small(size_t size);
 /// The returned size can be
 /// used to call \a mi_expand successfully.
 /// The returned size is always at least equal to the
-/// allocated size of \a p, and, in the current design,
-/// should be less than 16.7% more.
+/// allocated size of \a p.
 ///
 /// @see [_msize](https://docs.microsoft.com/en-us/cpp/c-runtime-library/reference/msize?view=vs-2017) (Windows)
 /// @see [malloc_usable_size](http://man7.org/linux/man-pages/man3/malloc_usable_size.3.html) (Linux)
@@ -304,7 +306,7 @@ size_t mi_good_size(size_t size);
 /// in very narrow circumstances; in particular, when a long running thread
 /// allocates a lot of blocks that are freed by other threads it may improve
 /// resource usage by calling this every once in a while.
-void   mi_collect(bool force);
+void mi_collect(bool force);
 
 /// Deprecated
 /// @param out Ignored, outputs to the registered output function or stderr by default.
@@ -414,7 +416,7 @@ void mi_register_error(mi_error_fun* errfun, void* arg);
 bool mi_is_in_heap_region(const void* p);
 
 /// Reserve OS memory for use by mimalloc. Reserved areas are used
-/// before allocating from the OS again. By reserving a large area upfront, 
+/// before allocating from the OS again. By reserving a large area upfront,
 /// allocation can be more efficient, and can be better managed on systems
 /// without `mmap`/`VirtualAlloc` (like WASM for example).
 /// @param size        The size to reserve.
@@ -423,25 +425,24 @@ bool mi_is_in_heap_region(const void* p);
 /// @return \a 0 if successful, and an error code otherwise (e.g. `ENOMEM`).
 int  mi_reserve_os_memory(size_t size, bool commit, bool allow_large);
 
-/// Manage a particular memory area for use by mimalloc. 
+/// Manage a particular memory area for use by mimalloc.
 /// This is just like `mi_reserve_os_memory` except that the area should already be
 /// allocated in some manner and available for use my mimalloc.
 /// @param start       Start of the memory area
 /// @param size        The size of the memory area.
-/// @param commit      Is the area already committed?
-/// @param is_large    Does it consist of large OS pages? Set this to \a true as well for memory
-///                    that should not be decommitted or protected (like rdma etc.)
+/// @param is_committed Is the area already committed?
+/// @param is_pinned   Can the memory not be decommitted or reset? (usually the case for large OS pages)
 /// @param is_zero     Does the area consists of zero's?
 /// @param numa_node   Possible associated numa node or `-1`.
 /// @return \a true if successful, and \a false on error.
-bool mi_manage_os_memory(void* start, size_t size, bool is_committed, bool is_large, bool is_zero, int numa_node);
+bool mi_manage_os_memory(void* start, size_t size, bool is_committed, bool is_pinned, bool is_zero, int numa_node);
 
 /// Reserve \a pages of huge OS pages (1GiB) evenly divided over \a numa_nodes nodes,
 /// but stops after at most `timeout_msecs` seconds.
 /// @param pages The number of 1GiB pages to reserve.
 /// @param numa_nodes The number of nodes do evenly divide the pages over, or 0 for using the actual number of NUMA nodes.
 /// @param timeout_msecs Maximum number of milli-seconds to try reserving, or 0 for no timeout.
-/// @returns 0 if successfull, \a ENOMEM if running out of memory, or \a ETIMEDOUT if timed out.
+/// @returns 0 if successful, \a ENOMEM if running out of memory, or \a ETIMEDOUT if timed out.
 ///
 /// The reserved memory is used by mimalloc to satisfy allocations.
 /// May quit before \a timeout_msecs are expired if it estimates it will take more than
@@ -453,9 +454,9 @@ int mi_reserve_huge_os_pages_interleave(size_t pages, size_t numa_nodes, size_t
 /// Reserve \a pages of huge OS pages (1GiB) at a specific \a numa_node,
 /// but stops after at most `timeout_msecs` seconds.
 /// @param pages The number of 1GiB pages to reserve.
-/// @param numa_node The NUMA node where the memory is reserved (start at 0).
+/// @param numa_node The NUMA node where the memory is reserved (start at 0). Use -1 for no affinity.
 /// @param timeout_msecs Maximum number of milli-seconds to try reserving, or 0 for no timeout.
-/// @returns 0 if successfull, \a ENOMEM if running out of memory, or \a ETIMEDOUT if timed out.
+/// @returns 0 if successful, \a ENOMEM if running out of memory, or \a ETIMEDOUT if timed out.
 ///
 /// The reserved memory is used by mimalloc to satisfy allocations.
 /// May quit before \a timeout_msecs are expired if it estimates it will take more than
@@ -468,7 +469,7 @@ int mi_reserve_huge_os_pages_at(size_t pages, int numa_node, size_t timeout_msec
 /// Is the C runtime \a malloc API redirected?
 /// @returns \a true if all malloc API calls are redirected to mimalloc.
 ///
-/// Currenty only used on Windows.
+/// Currently only used on Windows.
 bool mi_is_redirected();
 
 /// Return process information (time and memory usage).
@@ -486,6 +487,91 @@ bool mi_is_redirected();
 /// on other systems as the amount of read/write accessible memory reserved by mimalloc.
 void mi_process_info(size_t* elapsed_msecs, size_t* user_msecs, size_t* system_msecs, size_t* current_rss, size_t* peak_rss, size_t* current_commit, size_t* peak_commit, size_t* page_faults);
 
+/// @brief Show all current arena's.
+/// @param show_inuse       Show the arena blocks that are in use.
+/// @param show_abandoned   Show the abandoned arena blocks.
+/// @param show_purge       Show arena blocks scheduled for purging.
+void mi_debug_show_arenas(bool show_inuse, bool show_abandoned, bool show_purge);
+
+/// Mimalloc uses large (virtual) memory areas, called "arena"s, from the OS to manage its memory.
+/// Each arena has an associated identifier.
+typedef int mi_arena_id_t;
+
+/// @brief  Return the size of an arena.
+/// @param arena_id  The arena identifier.
+/// @param size      Returned size in bytes of the (virtual) arena area.
+/// @return base address of the arena.
+void* mi_arena_area(mi_arena_id_t arena_id, size_t* size);
+
+/// @brief Reserve huge OS pages (1GiB) into a single arena.
+/// @param pages             Number of 1GiB pages to reserve.
+/// @param numa_node         The associated NUMA node, or -1 for no NUMA preference.
+/// @param timeout_msecs     Max amount of milli-seconds this operation is allowed to take. (0 is infinite)
+/// @param exclusive         If exclusive, only a heap associated with this arena can allocate in it.
+/// @param arena_id          The arena identifier.
+/// @return 0 if successful, \a ENOMEM if running out of memory, or \a ETIMEDOUT if timed out.
+int   mi_reserve_huge_os_pages_at_ex(size_t pages, int numa_node, size_t timeout_msecs, bool exclusive, mi_arena_id_t* arena_id);
+
+/// @brief Reserve OS memory to be managed in an arena.
+/// @param size Size the reserve.
+/// @param commit Should the memory be initially committed?
+/// @param allow_large Allow the use of large OS pages?
+/// @param exclusive  Is the returned arena exclusive?
+/// @param arena_id The new arena identifier.
+/// @return Zero on success, an error code otherwise.
+int   mi_reserve_os_memory_ex(size_t size, bool commit, bool allow_large, bool exclusive, mi_arena_id_t* arena_id);
+
+/// @brief Manage externally allocated memory as a mimalloc arena. This memory will not be freed by mimalloc.
+/// @param start Start address of the area.
+/// @param size  Size in bytes of the area.
+/// @param is_committed  Is the memory already committed?
+/// @param is_large      Does it consist of (pinned) large OS pages?
+/// @param is_zero       Is the memory zero-initialized?
+/// @param numa_node     Associated NUMA node, or -1 to have no NUMA preference.
+/// @param exclusive     Is the arena exclusive (where only heaps associated with the arena can allocate in it)
+/// @param arena_id      The new arena identifier.
+/// @return `true` if successful.
+bool  mi_manage_os_memory_ex(void* start, size_t size, bool is_committed, bool is_large, bool is_zero, int numa_node, bool exclusive, mi_arena_id_t* arena_id);
+
+/// @brief Create a new heap that only allocates in the specified arena.
+/// @param arena_id The arena identifier.
+/// @return The new heap or `NULL`.
+mi_heap_t* mi_heap_new_in_arena(mi_arena_id_t arena_id);
+
+/// @brief Create a new heap
+/// @param heap_tag       The heap tag associated with this heap; heaps only reclaim memory between heaps with the same tag.
+/// @param allow_destroy  Is \a mi_heap_destroy allowed?  Not allowing this allows the heap to reclaim memory from terminated threads.
+/// @param arena_id       If not 0, the heap will only allocate from the specified arena.
+/// @return A new heap or `NULL` on failure.
+///
+/// The \a arena_id can be used by runtimes to allocate only in a specified pre-reserved arena.
+/// This is used for example for a compressed pointer heap in Koka.
+/// The \a heap_tag enables heaps to keep objects of a certain type isolated to heaps with that tag.
+/// This is used for example in the CPython integration.
+mi_heap_t* mi_heap_new_ex(int heap_tag, bool allow_destroy, mi_arena_id_t arena_id);
+
+/// A process can associate threads with sub-processes.
+/// A sub-process will not reclaim memory from (abandoned heaps/threads)
+/// other subprocesses.
+typedef void* mi_subproc_id_t;
+
+/// @brief  Get the main sub-process identifier.
+mi_subproc_id_t mi_subproc_main(void);
+
+/// @brief Create a fresh sub-process (with no associated threads yet).
+/// @return The new sub-process identifier.
+mi_subproc_id_t mi_subproc_new(void);
+
+/// @brief Delete a previously created sub-process.
+/// @param subproc The sub-process identifier.
+/// Only delete sub-processes if all associated threads have terminated.
+void mi_subproc_delete(mi_subproc_id_t subproc);
+
+/// Add the current thread to the given sub-process.
+/// This should be called right after a thread is created (and no allocation has taken place yet)
+void mi_subproc_add_current_thread(mi_subproc_id_t subproc);
+
+
 /// \}
 
 // ------------------------------------------------------
@@ -495,20 +581,24 @@ void mi_process_info(size_t* elapsed_msecs, size_t* user_msecs, size_t* system_m
 /// \defgroup aligned Aligned Allocation
 ///
 /// Allocating aligned memory blocks.
+/// Note that `alignment` always follows `size` for consistency with the unaligned
+/// allocation API, but unfortunately this differs from `posix_memalign` and `aligned_alloc` in the C library.
 ///
 /// \{
 
-/// The maximum supported alignment size (currently 1MiB).
-#define MI_ALIGNMENT_MAX   (1024*1024UL)   
-
 /// Allocate \a size bytes aligned by \a alignment.
 /// @param size  number of bytes to allocate.
-/// @param alignment  the minimal alignment of the allocated memory. Must be less than #MI_ALIGNMENT_MAX.
-/// @returns pointer to the allocated memory or \a NULL if out of memory.
-/// The returned pointer is aligned by \a alignment, i.e.
-/// `(uintptr_t)p % alignment == 0`.
-///
+/// @param alignment  the minimal alignment of the allocated memory.
+/// @returns pointer to the allocated memory or \a NULL if out of memory,
+/// or if the alignment is not a power of 2 (including 0). The \a size is unrestricted
+/// (and does not have to be an integral multiple of the \a alignment).
+/// The returned pointer is aligned by \a alignment, i.e. `(uintptr_t)p % alignment == 0`.
 /// Returns a unique pointer if called with \a size 0.
+///
+/// Note that `alignment` always follows `size` for consistency with the unaligned
+/// allocation API, but unfortunately this differs from `posix_memalign` and `aligned_alloc` in the C library.
+///
+/// @see [aligned_alloc](https://en.cppreference.com/w/c/memory/aligned_alloc) (in the standard C11 library, with switched arguments!)
 /// @see [_aligned_malloc](https://docs.microsoft.com/en-us/cpp/c-runtime-library/reference/aligned-malloc?view=vs-2017) (on Windows)
 /// @see [aligned_alloc](http://man.openbsd.org/reallocarray) (on BSD, with switched arguments!)
 /// @see [posix_memalign](https://linux.die.net/man/3/posix_memalign) (on Posix, with switched arguments!)
@@ -522,11 +612,12 @@ void* mi_realloc_aligned(void* p, size_t newsize, size_t alignment);
 /// @param size  number of bytes to allocate.
 /// @param alignment  the minimal alignment of the allocated memory at \a offset.
 /// @param offset     the offset that should be aligned.
-/// @returns pointer to the allocated memory or \a NULL if out of memory.
-/// The returned pointer is aligned by \a alignment at \a offset, i.e.
-/// `((uintptr_t)p + offset) % alignment == 0`.
-///
+/// @returns pointer to the allocated memory or \a NULL if out of memory,
+/// or if the alignment is not a power of 2 (including 0). The \a size is unrestricted
+/// (and does not have to be an integral multiple of the \a alignment).
+/// The returned pointer is aligned by \a alignment, i.e. `(uintptr_t)p % alignment == 0`.
 /// Returns a unique pointer if called with \a size 0.
+///
 /// @see [_aligned_offset_malloc](https://docs.microsoft.com/en-us/cpp/c-runtime-library/reference/aligned-offset-malloc?view=vs-2017) (on Windows)
 void* mi_malloc_aligned_at(size_t size, size_t alignment, size_t offset);
 void* mi_zalloc_aligned_at(size_t size, size_t alignment, size_t offset);
@@ -558,7 +649,7 @@ mi_heap_t* mi_heap_new();
 
 /// Delete a previously allocated heap.
 /// This will release resources and migrate any
-/// still allocated blocks in this heap (efficienty)
+/// still allocated blocks in this heap (efficiently)
 /// to the default heap.
 ///
 /// If \a heap is the default heap, the default
@@ -574,12 +665,12 @@ void mi_heap_delete(mi_heap_t* heap);
 /// heap is set to the backing heap.
 void mi_heap_destroy(mi_heap_t* heap);
 
-/// Set the default heap to use for mi_malloc() et al.
+/// Set the default heap to use in the current thread for mi_malloc() et al.
 /// @param heap  The new default heap.
 /// @returns The previous default heap.
 mi_heap_t* mi_heap_set_default(mi_heap_t* heap);
 
-/// Get the default heap that is used for mi_malloc() et al.
+/// Get the default heap that is used for mi_malloc() et al. (for the current thread).
 /// @returns The current default heap.
 mi_heap_t* mi_heap_get_default();
 
@@ -764,6 +855,8 @@ typedef struct mi_heap_area_s {
   size_t committed;   ///< current committed bytes of this area
   size_t used;        ///< bytes in use by allocated blocks
   size_t block_size;  ///< size in bytes of one block
+  size_t full_block_size; ///< size in bytes of a full block including padding and metadata.
+  int    heap_tag;    ///< heap tag associated with this area (see \a mi_heap_new_ex)
 } mi_heap_area_t;
 
 /// Visitor function passed to mi_heap_visit_blocks()
@@ -788,6 +881,23 @@ typedef bool (mi_block_visit_fun)(const mi_heap_t* heap, const mi_heap_area_t* a
 /// @returns \a true if all areas and blocks were visited.
 bool mi_heap_visit_blocks(const mi_heap_t* heap, bool visit_all_blocks, mi_block_visit_fun* visitor, void* arg);
 
+/// @brief Visit all areas and blocks in abandoned heaps.
+/// @param subproc_id The sub-process id associated with the abandoned heaps.
+/// @param heap_tag Visit only abandoned memory with the specified heap tag, use -1 to visit all abandoned memory.
+/// @param visit_blocks If \a true visits all allocated blocks, otherwise
+///                         \a visitor is only called for every heap area.
+/// @param visitor This function is called for every area in the heap
+///                 (with \a block as \a NULL). If \a visit_all_blocks is
+///                 \a true, \a visitor is also called for every allocated
+///                 block in every area (with `block!=NULL`).
+///                 return \a false from this function to stop visiting early.
+/// @param arg extra argument passed to the \a visitor.
+/// @return \a true if all areas and blocks were visited.
+///
+/// Note: requires the option `mi_option_visit_abandoned` to be set
+/// at the start of the program.
+bool mi_abandoned_visit_blocks(mi_subproc_id_t subproc_id, int heap_tag, bool visit_blocks, mi_block_visit_fun* visitor, void* arg);
+
 /// \}
 
 /// \defgroup options Runtime Options
@@ -799,34 +909,38 @@ bool mi_heap_visit_blocks(const mi_heap_t* heap, bool visit_all_blocks, mi_block
 /// Runtime options.
 typedef enum mi_option_e {
   // stable options
-  mi_option_show_errors,  ///< Print error messages to `stderr`.
-  mi_option_show_stats,   ///< Print statistics to `stderr` when the program is done.
-  mi_option_verbose,      ///< Print verbose messages to `stderr`.
-
-  // the following options are experimental
-  mi_option_eager_commit, ///< Eagerly commit segments (4MiB) (enabled by default).
-  mi_option_large_os_pages,      ///< Use large OS pages (2MiB in size) if possible
-  mi_option_reserve_huge_os_pages, ///< The number of huge OS pages (1GiB in size) to reserve at the start of the program.
-  mi_option_reserve_huge_os_pages_at, ///< Reserve huge OS pages at node N.
-  mi_option_reserve_os_memory,        ///< Reserve specified amount of OS memory at startup, e.g. "1g" or "512m".
-  mi_option_segment_cache,   ///< The number of segments per thread to keep cached (0).
-  mi_option_page_reset,      ///< Reset page memory after \a mi_option_reset_delay milliseconds when it becomes free.
-  mi_option_abandoned_page_reset, //< Reset free page memory when a thread terminates.
-  mi_option_use_numa_nodes,  ///< Pretend there are at most N NUMA nodes; Use 0 to use the actual detected NUMA nodes at runtime.
-  mi_option_eager_commit_delay,  ///< the first N segments per thread are not eagerly committed (=1). 
-  mi_option_os_tag,          ///< OS tag to assign to mimalloc'd memory
-  mi_option_limit_os_alloc,  ///< If set to 1, do not use OS memory for allocation (but only pre-reserved arenas)
-
-  // v1.x specific options
-  mi_option_eager_region_commit, ///< Eagerly commit large (256MiB) memory regions (enabled by default, except on Windows)
-  mi_option_segment_reset,   ///< Experimental
-  mi_option_reset_delay,     ///< Delay in milli-seconds before resetting a page (100ms by default)
-  mi_option_reset_decommits, ///< Experimental
-
-  // v2.x specific options
-  mi_option_allow_decommit,  ///< Enable decommitting memory (=on)
-  mi_option_decommit_delay,  ///< Decommit page memory after N milli-seconds delay (25ms).
-  mi_option_segment_decommit_delay, ///< Decommit large segment memory after N milli-seconds delay (500ms).
+  mi_option_show_errors,  ///< Print error messages.
+  mi_option_show_stats,   ///< Print statistics on termination.
+  mi_option_verbose,      ///< Print verbose messages.
+  mi_option_max_errors,                 ///< issue at most N error messages
+  mi_option_max_warnings,               ///< issue at most N warning messages
+
+  // advanced options
+  mi_option_reserve_huge_os_pages,    ///< reserve N huge OS pages (1GiB pages) at startup
+  mi_option_reserve_huge_os_pages_at, ///< Reserve N huge OS pages at a specific NUMA node N.
+  mi_option_reserve_os_memory,        ///< reserve specified amount of OS memory in an arena at startup (internally, this value is in KiB; use `mi_option_get_size`)
+  mi_option_allow_large_os_pages,     ///< allow large (2 or 4 MiB) OS pages, implies eager commit. If false, also disables THP for the process.
+  mi_option_purge_decommits,          ///< should a memory purge decommit? (=1). Set to 0 to use memory reset on a purge (instead of decommit)
+  mi_option_arena_reserve,            ///< initial memory size for arena reservation (= 1 GiB on 64-bit) (internally, this value is in KiB; use `mi_option_get_size`)
+  mi_option_os_tag,                   ///< tag used for OS logging (macOS only for now) (=100)
+  mi_option_retry_on_oom,             ///< retry on out-of-memory for N milli seconds (=400), set to 0 to disable retries. (only on windows)
+
+  // experimental options
+  mi_option_eager_commit,             ///< eager commit segments? (after `eager_commit_delay` segments) (enabled by default).
+  mi_option_eager_commit_delay,       ///< the first N segments per thread are not eagerly committed (but per page in the segment on demand)
+  mi_option_arena_eager_commit,       ///< eager commit arenas? Use 2 to enable just on overcommit systems (=2)
+  mi_option_abandoned_page_purge,     ///< immediately purge delayed purges on thread termination
+  mi_option_purge_delay,              ///< memory purging is delayed by N milli seconds; use 0 for immediate purging or -1 for no purging at all. (=10)
+  mi_option_use_numa_nodes,           ///< 0 = use all available numa nodes, otherwise use at most N nodes.
+  mi_option_disallow_os_alloc,        ///< 1 = do not use OS memory for allocation (but only programmatically reserved arenas)
+  mi_option_limit_os_alloc,           ///< If set to 1, do not use OS memory for allocation (but only pre-reserved arenas)
+  mi_option_max_segment_reclaim,        ///< max. percentage of the abandoned segments can be reclaimed per try (=10%)
+  mi_option_destroy_on_exit,            ///< if set, release all memory on exit; sometimes used for dynamic unloading but can be unsafe
+  mi_option_arena_purge_mult,           ///< multiplier for `purge_delay` for the purging delay for arenas (=10)
+  mi_option_abandoned_reclaim_on_free,  ///< allow to reclaim an abandoned segment on a free (=1)
+  mi_option_purge_extend_delay,         ///< extend purge delay on each subsequent delay (=1)
+  mi_option_disallow_arena_alloc,       ///< 1 = do not use arena's for allocation (except if using specific arena id's)
+  mi_option_visit_abandoned,            ///< allow visiting heap blocks from abandoned threads (=0)
 
   _mi_option_last
 } mi_option_t;
@@ -838,7 +952,10 @@ void  mi_option_disable(mi_option_t option);
 void  mi_option_set_enabled(mi_option_t option, bool enable);
 void  mi_option_set_enabled_default(mi_option_t option, bool enable);
 
-long  mi_option_get(mi_option_t option);
+long   mi_option_get(mi_option_t option);
+long   mi_option_get_clamp(mi_option_t option, long min, long max);
+size_t mi_option_get_size(mi_option_t option);
+
 void  mi_option_set(mi_option_t option, long value);
 void  mi_option_set_default(mi_option_t option, long value);
 
@@ -852,21 +969,27 @@ void  mi_option_set_default(mi_option_t option, long value);
 ///
 /// \{
 
+/// Just as `free` but also checks if the pointer `p` belongs to our heap.
+void   mi_cfree(void* p);
+void* mi__expand(void* p, size_t newsize);
+
 void*  mi_recalloc(void* p, size_t count, size_t size);
 size_t mi_malloc_size(const void* p);
+size_t mi_malloc_good_size(size_t size);
 size_t mi_malloc_usable_size(const void *p);
 
-/// Just as `free` but also checks if the pointer `p` belongs to our heap.
-void   mi_cfree(void* p);
-
 int mi_posix_memalign(void** p, size_t alignment, size_t size);
 int mi__posix_memalign(void** p, size_t alignment, size_t size);
 void* mi_memalign(size_t alignment, size_t size);
 void* mi_valloc(size_t size);
-
 void* mi_pvalloc(size_t size);
 void* mi_aligned_alloc(size_t alignment, size_t size);
 
+unsigned short* mi_wcsdup(const unsigned short* s);
+unsigned char*  mi_mbsdup(const unsigned char* s);
+int mi_dupenv_s(char** buf, size_t* size, const char* name);
+int mi_wdupenv_s(unsigned short** buf, size_t* size, const unsigned short* name);
+
 /// Correspond s to [reallocarray](https://www.freebsd.org/cgi/man.cgi?query=reallocarray&sektion=3&manpath=freebsd-release-ports)
 /// in FreeBSD.
 void* mi_reallocarray(void* p, size_t count, size_t size);
@@ -874,6 +997,9 @@ void* mi_reallocarray(void* p, size_t count, size_t size);
 /// Corresponds to [reallocarr](https://man.netbsd.org/reallocarr.3) in NetBSD.
 int   mi_reallocarr(void* p, size_t count, size_t size);
 
+void* mi_aligned_recalloc(void* p, size_t newcount, size_t size, size_t alignment);
+void* mi_aligned_offset_recalloc(void* p, size_t newcount, size_t size, size_t alignment, size_t offset);
+
 void mi_free_size(void* p, size_t size);
 void mi_free_size_aligned(void* p, size_t size, size_t alignment);
 void mi_free_aligned(void* p, size_t alignment);
@@ -888,7 +1014,7 @@ void mi_free_aligned(void* p, size_t alignment);
 ///
 ///  Note: use the `mimalloc-new-delete.h` header to override the \a new
 ///        and \a delete operators globally. The wrappers here are mostly
-///        for convience for library writers that need to interface with
+///        for convenience for library writers that need to interface with
 ///        mimalloc from C++.
 ///
 /// \{
@@ -927,7 +1053,7 @@ template<class T> struct mi_stl_allocator { }
 
 /*! \page build Building
 
-Checkout the sources from Github:
+Checkout the sources from GitHub:
 ```
 git clone https://github.com/microsoft/mimalloc
 ```
@@ -998,7 +1124,7 @@ mimalloc uses only safe OS calls (`mmap` and `VirtualAlloc`) and can co-exist
 with other allocators linked to the same program.
 If you use `cmake`, you can simply use:
 ```
-find_package(mimalloc 1.0 REQUIRED)
+find_package(mimalloc 2.1 REQUIRED)
 ```
 in your `CMakeLists.txt` to find a locally installed mimalloc. Then use either:
 ```
@@ -1012,7 +1138,7 @@ to link with the static library. See `test\CMakeLists.txt` for an example.
 
 ### C++
 For best performance in C++ programs, it is also recommended to override the
-global `new` and `delete` operators. For convience, mimalloc provides
+global `new` and `delete` operators. For convenience, mimalloc provides
 [`mimalloc-new-delete.h`](https://github.com/microsoft/mimalloc/blob/master/include/mimalloc-new-delete.h) which does this for you -- just include it in a single(!) source file in your project.
 
 In C++, mimalloc also provides the `mi_stl_allocator` struct which implements the `std::allocator`
@@ -1071,38 +1197,64 @@ See \ref overrides for more info.
 
 /*! \page environment Environment Options
 
-You can set further options either programmatically (using [`mi_option_set`](https://microsoft.github.io/mimalloc/group__options.html)),
-or via environment variables.
+You can set further options either programmatically (using [`mi_option_set`](https://microsoft.github.io/mimalloc/group__options.html)), or via environment variables:
 
 - `MIMALLOC_SHOW_STATS=1`: show statistics when the program terminates.
 - `MIMALLOC_VERBOSE=1`: show verbose messages.
 - `MIMALLOC_SHOW_ERRORS=1`: show error and warning messages.
-- `MIMALLOC_PAGE_RESET=0`: by default, mimalloc will reset (or purge) OS pages when not in use to signal to the OS
-   that the underlying physical memory can be reused. This can reduce memory fragmentation in long running (server)
-   programs. By setting it to `0` no such page resets will be done which can improve performance for programs that are not long
-   running. As an alternative, the `MIMALLOC_DECOMMIT_DELAY=`<msecs> can be set higher (100ms by default) to make the page
-   reset occur less frequently instead of turning it off completely.
-- `MIMALLOC_LARGE_OS_PAGES=1`: use large OS pages (2MiB) when available; for some workloads this can significantly
-   improve performance. Use `MIMALLOC_VERBOSE` to check if the large OS pages are enabled -- usually one needs
-   to explicitly allow large OS pages (as on [Windows][windows-huge] and [Linux][linux-huge]). However, sometimes
+
+Advanced options:
+
+- `MIMALLOC_ARENA_EAGER_COMMIT=2`: turns on eager commit for the large arenas (usually 1GiB) from which mimalloc
+   allocates segments and pages. Set this to 2 (default) to
+   only enable this on overcommit systems (e.g. Linux). Set this to 1 to enable explicitly on other systems
+   as well (like Windows or macOS) which may improve performance (as the whole arena is committed at once).
+   Note that eager commit only increases the commit but not the actual the peak resident set
+   (rss) so it is generally ok to enable this.
+- `MIMALLOC_PURGE_DELAY=N`: the delay in `N` milli-seconds (by default `10`) after which mimalloc will purge
+   OS pages that are not in use. This signals to the OS that the underlying physical memory can be reused which
+   can reduce memory fragmentation especially in long running (server) programs. Setting `N` to `0` purges immediately when
+   a page becomes unused which can improve memory usage but also decreases performance. Setting `N` to a higher
+   value like `100` can improve performance (sometimes by a lot) at the cost of potentially using more memory at times.
+   Setting it to `-1` disables purging completely.
+- `MIMALLOC_PURGE_DECOMMITS=1`: By default "purging" memory means unused memory is decommitted (`MEM_DECOMMIT` on Windows,
+   `MADV_DONTNEED` (which decresease rss immediately) on `mmap` systems). Set this to 0 to instead "reset" unused
+   memory on a purge (`MEM_RESET` on Windows, generally `MADV_FREE` (which does not decrease rss immediately) on `mmap` systems).
+   Mimalloc generally does not "free" OS memory but only "purges" OS memory, in other words, it tries to keep virtual
+   address ranges and decommits within those ranges (to make the underlying physical memory available to other processes).
+
+Further options for large workloads and services:
+
+- `MIMALLOC_USE_NUMA_NODES=N`: pretend there are at most `N` NUMA nodes. If not set, the actual NUMA nodes are detected
+   at runtime. Setting `N` to 1 may avoid problems in some virtual environments. Also, setting it to a lower number than
+   the actual NUMA nodes is fine and will only cause threads to potentially allocate more memory across actual NUMA
+   nodes (but this can happen in any case as NUMA local allocation is always a best effort but not guaranteed).
+- `MIMALLOC_ALLOW_LARGE_OS_PAGES=1`: use large OS pages (2 or 4MiB) when available; for some workloads this can significantly
+   improve performance. When this option is disabled (default), it also disables transparent huge pages (THP) for the process
+   (on Linux and Android). On Linux the default setting is 2 -- this enables the use of large pages through THP only.
+   Use `MIMALLOC_VERBOSE` to check if the large OS pages are enabled -- usually one needs
+   to explicitly give permissions for large OS pages (as on [Windows][windows-huge] and [Linux][linux-huge]). However, sometimes
    the OS is very slow to reserve contiguous physical memory for large OS pages so use with care on systems that
-   can have fragmented memory (for that reason, we generally recommend to use `MIMALLOC_RESERVE_HUGE_OS_PAGES` instead when possible).
-- `MIMALLOC_RESERVE_HUGE_OS_PAGES=N`: where N is the number of 1GiB _huge_ OS pages. This reserves the huge pages at
+   can have fragmented memory (for that reason, we generally recommend to use `MIMALLOC_RESERVE_HUGE_OS_PAGES` instead whenever possible).
+- `MIMALLOC_RESERVE_HUGE_OS_PAGES=N`: where `N` is the number of 1GiB _huge_ OS pages. This reserves the huge pages at
    startup and sometimes this can give a large (latency) performance improvement on big workloads.
-   Usually it is better to not use
-   `MIMALLOC_LARGE_OS_PAGES` in combination with this setting. Just like large OS pages, use with care as reserving
+   Usually it is better to not use `MIMALLOC_ALLOW_LARGE_OS_PAGES=1` in combination with this setting. Just like large
+   OS pages, use with care as reserving
    contiguous physical memory can take a long time when memory is fragmented (but reserving the huge pages is done at
    startup only once).
-   Note that we usually need to explicitly enable huge OS pages (as on [Windows][windows-huge] and [Linux][linux-huge])). With huge OS pages, it may be beneficial to set the setting
+   Note that we usually need to explicitly give permission for huge OS pages (as on [Windows][windows-huge] and [Linux][linux-huge])).
+   With huge OS pages, it may be beneficial to set the setting
    `MIMALLOC_EAGER_COMMIT_DELAY=N` (`N` is 1 by default) to delay the initial `N` segments (of 4MiB)
    of a thread to not allocate in the huge OS pages; this prevents threads that are short lived
-   and allocate just a little to take up space in the huge OS page area (which cannot be reset).
-- `MIMALLOC_RESERVE_HUGE_OS_PAGES_AT=N`: where N is the numa node. This reserves the huge pages at a specific numa node. 
-   (`N` is -1 by default to reserve huge pages evenly among the given number of numa nodes (or use the available ones as detected))
+   and allocate just a little to take up space in the huge OS page area (which cannot be purged as huge OS pages are pinned
+   to physical memory).
+   The huge pages are usually allocated evenly among NUMA nodes.
+   We can use `MIMALLOC_RESERVE_HUGE_OS_PAGES_AT=N` where `N` is the numa node (starting at 0) to allocate all
+   the huge pages at a specific numa node instead.
 
 Use caution when using `fork` in combination with either large or huge OS pages: on a fork, the OS uses copy-on-write
 for all pages in the original process including the huge OS pages. When any memory is now written in that area, the
-OS will copy the entire 1GiB huge page (or 2MiB large page) which can cause the memory usage to grow in big increments.
+OS will copy the entire 1GiB huge page (or 2MiB large page) which can cause the memory usage to grow in large increments.
 
 [linux-huge]: https://access.redhat.com/documentation/en-us/red_hat_enterprise_linux/5/html/tuning_and_optimizing_red_hat_enterprise_linux_for_oracle_9i_and_10g_databases/sect-oracle_9i_and_10g_tuning_guide-large_memory_optimization_big_pages_and_huge_pages-configuring_huge_pages_in_red_hat_enterprise_linux_4_or_5
 [windows-huge]: https://docs.microsoft.com/en-us/sql/database-engine/configure-windows/enable-the-lock-pages-in-memory-option-windows?view=sql-server-2017
@@ -1111,88 +1263,106 @@ OS will copy the entire 1GiB huge page (or 2MiB large page) which can cause the
 
 /*! \page overrides Overriding Malloc
 
-Overriding the standard `malloc` can be done either _dynamically_ or _statically_.
+Overriding the standard `malloc` (and `new`) can be done either _dynamically_ or _statically_.
 
 ## Dynamic override
 
 This is the recommended way to override the standard malloc interface.
 
+### Dynamic Override on Linux, BSD
 
-### Linux, BSD
-
-On these systems we preload the mimalloc shared
+On these ELF-based systems we preload the mimalloc shared
 library so all calls to the standard `malloc` interface are
 resolved to the _mimalloc_ library.
-
-- `env LD_PRELOAD=/usr/lib/libmimalloc.so myprogram`
+```
+> env LD_PRELOAD=/usr/lib/libmimalloc.so myprogram
+```
 
 You can set extra environment variables to check that mimalloc is running,
 like:
 ```
-env MIMALLOC_VERBOSE=1 LD_PRELOAD=/usr/lib/libmimalloc.so myprogram
+> env MIMALLOC_VERBOSE=1 LD_PRELOAD=/usr/lib/libmimalloc.so myprogram
 ```
 or run with the debug version to get detailed statistics:
 ```
-env MIMALLOC_SHOW_STATS=1 LD_PRELOAD=/usr/lib/libmimalloc-debug.so myprogram
+> env MIMALLOC_SHOW_STATS=1 LD_PRELOAD=/usr/lib/libmimalloc-debug.so myprogram
 ```
 
-### MacOS
+### Dynamic Override on MacOS
 
 On macOS we can also preload the mimalloc shared
 library so all calls to the standard `malloc` interface are
 resolved to the _mimalloc_ library.
-
-- `env DYLD_FORCE_FLAT_NAMESPACE=1 DYLD_INSERT_LIBRARIES=/usr/lib/libmimalloc.dylib myprogram`
+```
+> env DYLD_INSERT_LIBRARIES=/usr/lib/libmimalloc.dylib myprogram
+```
 
 Note that certain security restrictions may apply when doing this from
 the [shell](https://stackoverflow.com/questions/43941322/dyld-insert-libraries-ignored-when-calling-application-through-bash).
 
-(Note: macOS support for dynamic overriding is recent, please report any issues.)
 
+### Dynamic Override on Windows
+
+<span id="override_on_windows">Dynamically overriding on mimalloc on Windows</span> 
+is robust and has the particular advantage to be able to redirect all malloc/free calls 
+that go through the (dynamic) C runtime allocator, including those from other DLL's or 
+libraries. As it intercepts all allocation calls on a low level, it can be used reliably 
+on large programs that include other 3rd party components.
+There are four requirements to make the overriding work well:
+
+1. Use the C-runtime library as a DLL (using the `/MD` or `/MDd` switch).
 
-### Windows
+2. Link your program explicitly with the `mimalloc.lib` export library for the `mimalloc.dll`.
+   (which must be compiled with `-DMI_OVERRIDE=ON`, which is the default though).
+   To ensure the `mimalloc.dll` is actually loaded at run-time it is easiest 
+   to insert some call to the mimalloc API in the `main` function, like `mi_version()`
+   (or use the `/include:mi_version` switch on the linker command, or
+   similarly, `#pragma comment(linker, "/include:mi_version")` in some source file). 
+   See the `mimalloc-test-override` project for an example on how to use this. 
 
-Overriding on Windows is robust and has the
-particular advantage to be able to redirect all malloc/free calls that go through
-the (dynamic) C runtime allocator, including those from other DLL's or libraries.
+3. The `mimalloc-redirect.dll` must be put in the same directory as the main 
+   `mimalloc.dll` at runtime (as it is a dependency of that DLL).
+   The redirection DLL ensures that all calls to the C runtime malloc API get 
+   redirected to mimalloc functions (which reside in `mimalloc.dll`).
 
-The overriding on Windows requires that you link your program explicitly with
-the mimalloc DLL and use the C-runtime library as a DLL (using the `/MD` or `/MDd` switch).
-Also, the `mimalloc-redirect.dll` (or `mimalloc-redirect32.dll`) must be available
-in the same folder as the main `mimalloc-override.dll` at runtime (as it is a dependency).
-The redirection DLL ensures that all calls to the C runtime malloc API get redirected to
-mimalloc (in `mimalloc-override.dll`).
+4. Ensure the `mimalloc.dll` comes as early as possible in the import
+   list of the final executable (so it can intercept all potential allocations).
+   You can use `minject -l <exe>` to check this if needed.
 
-To ensure the mimalloc DLL is loaded at run-time it is easiest to insert some
-call to the mimalloc API in the `main` function, like `mi_version()`
-(or use the `/INCLUDE:mi_version` switch on the linker). See the `mimalloc-override-test` project
-for an example on how to use this. For best performance on Windows with C++, it
+For best performance on Windows with C++, it
 is also recommended to also override the `new`/`delete` operations (by including
-[`mimalloc-new-delete.h`](https://github.com/microsoft/mimalloc/blob/master/include/mimalloc-new-delete.h) a single(!) source file in your project).
+[`mimalloc-new-delete.h`](include/mimalloc-new-delete.h)
+a single(!) source file in your project).
 
 The environment variable `MIMALLOC_DISABLE_REDIRECT=1` can be used to disable dynamic
-overriding at run-time. Use `MIMALLOC_VERBOSE=1` to check if mimalloc was successfully redirected.
+overriding at run-time. Use `MIMALLOC_VERBOSE=1` to check if mimalloc was successfully 
+redirected.
 
-(Note: in principle, it is possible to even patch existing executables without any recompilation
-if they are linked with the dynamic C runtime (`ucrtbase.dll`) -- just put the `mimalloc-override.dll`
-into the import table (and put `mimalloc-redirect.dll` in the same folder)
-Such patching can be done for example with [CFF Explorer](https://ntcore.com/?page_id=388)).
+For different platforms than x64, you may need a specific [redirection dll](bin).
+Furthermore, we cannot always re-link an executable or ensure `mimalloc.dll` comes
+first in the import table. In such cases the [`minject`](bin) tool can be used
+to patch the executable's import tables.
 
 
 ## Static override
 
-On Unix systems, you can also statically link with _mimalloc_ to override the standard
+On Unix-like systems, you can also statically link with _mimalloc_ to override the standard
 malloc interface. The recommended way is to link the final program with the
-_mimalloc_ single object file (`mimalloc-override.o`). We use
+_mimalloc_ single object file (`mimalloc.o`). We use
 an object file instead of a library file as linkers give preference to
 that over archives to resolve symbols. To ensure that the standard
 malloc interface resolves to the _mimalloc_ library, link it as the first
 object file. For example:
-
 ```
-gcc -o myprogram mimalloc-override.o  myfile1.c ...
+> gcc -o myprogram mimalloc.o  myfile1.c ...
 ```
 
+Another way to override statically that works on all platforms, is to
+link statically to mimalloc (as shown in the introduction) and include a
+header file in each source file that re-defines `malloc` etc. to `mi_malloc`.
+This is provided by [`mimalloc-override.h`](https://github.com/microsoft/mimalloc/blob/master/include/mimalloc-override.h). This only works reliably though if all sources are
+under your control or otherwise mixing of pointers from different heaps may occur!
+
 ## List of Overrides:
 
 The specific functions that get redirected to the _mimalloc_ library are:
diff --git a/depends/mimalloc/doc/mimalloc-doxygen.css b/depends/mimalloc/doc/mimalloc-doxygen.css
index b24f5643268f..c889a8d2c326 100644
--- a/depends/mimalloc/doc/mimalloc-doxygen.css
+++ b/depends/mimalloc/doc/mimalloc-doxygen.css
@@ -47,3 +47,14 @@ div.fragment {
 #nav-sync img {
 	display: none;
 }
+h1,h2,h3,h4,h5,h6 {
+	transition:none;
+}
+.memtitle {
+	background-image: none;
+	background-color: #EEE;
+}
+table.memproto, .memproto {
+	text-shadow: none;
+	font-size: 110%;
+}
diff --git a/depends/mimalloc/docs/annotated.html b/depends/mimalloc/docs/annotated.html
index f3e392a457a9..fbb3936e234f 100644
--- a/depends/mimalloc/docs/annotated.html
+++ b/depends/mimalloc/docs/annotated.html
@@ -1,24 +1,26 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "https://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
+<html xmlns="http://www.w3.org/1999/xhtml" lang="en-US">
 <head>
 <meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
-<meta http-equiv="X-UA-Compatible" content="IE=9"/>
-<meta name="generator" content="Doxygen 1.9.1"/>
+<meta http-equiv="X-UA-Compatible" content="IE=11"/>
+<meta name="generator" content="Doxygen 1.13.1"/>
 <meta name="viewport" content="width=device-width, initial-scale=1"/>
 <title>mi-malloc: Data Structures</title>
 <link href="tabs.css" rel="stylesheet" type="text/css"/>
 <script type="text/javascript" src="jquery.js"></script>
 <script type="text/javascript" src="dynsections.js"></script>
+<script type="text/javascript" src="clipboard.js"></script>
 <link href="navtree.css" rel="stylesheet" type="text/css"/>
-<script type="text/javascript" src="resize.js"></script>
 <script type="text/javascript" src="navtreedata.js"></script>
 <script type="text/javascript" src="navtree.js"></script>
+<script type="text/javascript" src="resize.js"></script>
+<script type="text/javascript" src="cookie.js"></script>
 <link href="search/search.css" rel="stylesheet" type="text/css"/>
 <script type="text/javascript" src="search/searchdata.js"></script>
 <script type="text/javascript" src="search/search.js"></script>
 <script type="text/javascript">
-/* @license magnet:?xt=urn:btih:cf05388f2679ee054f2beb29a391d25f4e673ac3&amp;dn=gpl-2.0.txt GPL-v2 */
-  $(document).ready(function() { init_search(); });
+/* @license magnet:?xt=urn:btih:d3d9a9a6595521f9666a5e94cc830dab83b65699&amp;dn=expat.txt MIT */
+  $(function() { init_search(); });
 /* @license-end */
 </script>
 <link href="doxygen.css" rel="stylesheet" type="text/css" />
@@ -29,20 +31,16 @@
 <div id="titlearea">
 <table cellspacing="0" cellpadding="0">
  <tbody>
- <tr style="height: 56px;">
+ <tr id="projectrow">
   <td id="projectlogo"><img alt="Logo" src="mimalloc-logo.svg"/></td>
-  <td id="projectalign" style="padding-left: 0.5em;">
-   <div id="projectname">mi-malloc
-   &#160;<span id="projectnumber">1.7/2.0</span>
+  <td id="projectalign">
+   <div id="projectname">mi-malloc<span id="projectnumber">&#160;1.8/2.1</span>
    </div>
   </td>
-   <td>        <div id="MSearchBox" class="MSearchBoxInactive">
+    <td>        <div id="MSearchBox" class="MSearchBoxInactive">
         <span class="left">
-          <img id="MSearchSelect" src="search/mag_sel.svg"
-               onmouseover="return searchBox.OnSearchSelectShow()"
-               onmouseout="return searchBox.OnSearchSelectHide()"
-               alt=""/>
-          <input type="text" id="MSearchField" value="Search" accesskey="S"
+          <span id="MSearchSelect"                onmouseover="return searchBox.OnSearchSelectShow()"                onmouseout="return searchBox.OnSearchSelectHide()">&#160;</span>
+          <input type="text" id="MSearchField" value="" placeholder="Search" accesskey="S"
                onfocus="searchBox.OnSearchFieldFocus(true)" 
                onblur="searchBox.OnSearchFieldFocus(false)" 
                onkeyup="searchBox.OnSearchFieldChange(event)"/>
@@ -56,10 +54,15 @@
 </table>
 </div>
 <!-- end header part -->
-<!-- Generated by Doxygen 1.9.1 -->
+<!-- Generated by Doxygen 1.13.1 -->
+<script type="text/javascript">
+/* @license magnet:?xt=urn:btih:d3d9a9a6595521f9666a5e94cc830dab83b65699&amp;dn=expat.txt MIT */
+var searchBox = new SearchBox("searchBox", "search/",'.html');
+/* @license-end */
+</script>
 <script type="text/javascript">
-/* @license magnet:?xt=urn:btih:cf05388f2679ee054f2beb29a391d25f4e673ac3&amp;dn=gpl-2.0.txt GPL-v2 */
-var searchBox = new SearchBox("searchBox", "search",false,'Search','.html');
+/* @license magnet:?xt=urn:btih:d3d9a9a6595521f9666a5e94cc830dab83b65699&amp;dn=expat.txt MIT */
+$(function() { codefold.init(0); });
 /* @license-end */
 </script>
 </div><!-- top -->
@@ -74,8 +77,8 @@
   </div>
 </div>
 <script type="text/javascript">
-/* @license magnet:?xt=urn:btih:cf05388f2679ee054f2beb29a391d25f4e673ac3&amp;dn=gpl-2.0.txt GPL-v2 */
-$(document).ready(function(){initNavTree('annotated.html',''); initResizable(); });
+/* @license magnet:?xt=urn:btih:d3d9a9a6595521f9666a5e94cc830dab83b65699&amp;dn=expat.txt MIT */
+$(function(){initNavTree('annotated.html',''); initResizable(true); });
 /* @license-end */
 </script>
 <div id="doc-content">
@@ -88,20 +91,26 @@
 
 <!-- iframe showing the search results (closed by default) -->
 <div id="MSearchResultsWindow">
-<iframe src="javascript:void(0)" frameborder="0" 
-        name="MSearchResults" id="MSearchResults">
-</iframe>
+<div id="MSearchResults">
+<div class="SRPage">
+<div id="SRIndex">
+<div id="SRResults"></div>
+<div class="SRStatus" id="Loading">Loading...</div>
+<div class="SRStatus" id="Searching">Searching...</div>
+<div class="SRStatus" id="NoMatches">No Matches</div>
+</div>
+</div>
+</div>
 </div>
 
 <div class="header">
-  <div class="headertitle">
-<div class="title">Data Structures</div>  </div>
+  <div class="headertitle"><div class="title">Data Structures</div></div>
 </div><!--header-->
 <div class="contents">
 <div class="textblock">Here are the data structures with brief descriptions:</div><div class="directory">
 <table class="directory">
 <tr id="row_0_" class="even"><td class="entry"><span style="width:16px;display:inline-block;">&#160;</span><span class="icona"><span class="icon">C</span></span><a class="el" href="group__analysis.html#structmi__heap__area__t" target="_self">mi_heap_area_t</a></td><td class="desc">An area of heap space contains blocks of a single size </td></tr>
-<tr id="row_1_"><td class="entry"><span style="width:16px;display:inline-block;">&#160;</span><span class="icona"><span class="icon">C</span></span><a class="el" href="group__cpp.html#structmi__stl__allocator" target="_self">mi_stl_allocator</a></td><td class="desc"><em>std::allocator</em> implementation for mimalloc for use in STL containers </td></tr>
+<tr id="row_1_" class="odd"><td class="entry"><span style="width:16px;display:inline-block;">&#160;</span><span class="icona"><span class="icon">C</span></span><a class="el" href="group__cpp.html#structmi__stl__allocator" target="_self">mi_stl_allocator</a></td><td class="desc"><em class="arg">std::allocator</em> implementation for mimalloc for use in STL containers </td></tr>
 </table>
 </div><!-- directory -->
 </div><!-- contents -->
@@ -109,7 +118,7 @@
 <!-- start footer part -->
 <div id="nav-path" class="navpath"><!-- id is needed for treeview function! -->
   <ul>
-    <li class="footer">Generated by <a href="https://www.doxygen.org/index.html"><img class="footer" src="doxygen.svg" width="104" height="31" alt="doxygen"/></a> 1.9.1 </li>
+    <li class="footer">Generated by <a href="https://www.doxygen.org/index.html"><img class="footer" src="doxygen.svg" width="104" height="31" alt="doxygen"/></a> 1.13.1 </li>
   </ul>
 </div>
 </body>
diff --git a/depends/mimalloc/docs/bench.html b/depends/mimalloc/docs/bench.html
index 6c4728958088..c896e7fcb092 100644
--- a/depends/mimalloc/docs/bench.html
+++ b/depends/mimalloc/docs/bench.html
@@ -1,24 +1,26 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "https://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
+<html xmlns="http://www.w3.org/1999/xhtml" lang="en-US">
 <head>
 <meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
-<meta http-equiv="X-UA-Compatible" content="IE=9"/>
-<meta name="generator" content="Doxygen 1.9.1"/>
+<meta http-equiv="X-UA-Compatible" content="IE=11"/>
+<meta name="generator" content="Doxygen 1.13.1"/>
 <meta name="viewport" content="width=device-width, initial-scale=1"/>
 <title>mi-malloc: Performance</title>
 <link href="tabs.css" rel="stylesheet" type="text/css"/>
 <script type="text/javascript" src="jquery.js"></script>
 <script type="text/javascript" src="dynsections.js"></script>
+<script type="text/javascript" src="clipboard.js"></script>
 <link href="navtree.css" rel="stylesheet" type="text/css"/>
-<script type="text/javascript" src="resize.js"></script>
 <script type="text/javascript" src="navtreedata.js"></script>
 <script type="text/javascript" src="navtree.js"></script>
+<script type="text/javascript" src="resize.js"></script>
+<script type="text/javascript" src="cookie.js"></script>
 <link href="search/search.css" rel="stylesheet" type="text/css"/>
 <script type="text/javascript" src="search/searchdata.js"></script>
 <script type="text/javascript" src="search/search.js"></script>
 <script type="text/javascript">
-/* @license magnet:?xt=urn:btih:cf05388f2679ee054f2beb29a391d25f4e673ac3&amp;dn=gpl-2.0.txt GPL-v2 */
-  $(document).ready(function() { init_search(); });
+/* @license magnet:?xt=urn:btih:d3d9a9a6595521f9666a5e94cc830dab83b65699&amp;dn=expat.txt MIT */
+  $(function() { init_search(); });
 /* @license-end */
 </script>
 <link href="doxygen.css" rel="stylesheet" type="text/css" />
@@ -29,20 +31,16 @@
 <div id="titlearea">
 <table cellspacing="0" cellpadding="0">
  <tbody>
- <tr style="height: 56px;">
+ <tr id="projectrow">
   <td id="projectlogo"><img alt="Logo" src="mimalloc-logo.svg"/></td>
-  <td id="projectalign" style="padding-left: 0.5em;">
-   <div id="projectname">mi-malloc
-   &#160;<span id="projectnumber">1.7/2.0</span>
+  <td id="projectalign">
+   <div id="projectname">mi-malloc<span id="projectnumber">&#160;1.8/2.1</span>
    </div>
   </td>
-   <td>        <div id="MSearchBox" class="MSearchBoxInactive">
+    <td>        <div id="MSearchBox" class="MSearchBoxInactive">
         <span class="left">
-          <img id="MSearchSelect" src="search/mag_sel.svg"
-               onmouseover="return searchBox.OnSearchSelectShow()"
-               onmouseout="return searchBox.OnSearchSelectHide()"
-               alt=""/>
-          <input type="text" id="MSearchField" value="Search" accesskey="S"
+          <span id="MSearchSelect"                onmouseover="return searchBox.OnSearchSelectShow()"                onmouseout="return searchBox.OnSearchSelectHide()">&#160;</span>
+          <input type="text" id="MSearchField" value="" placeholder="Search" accesskey="S"
                onfocus="searchBox.OnSearchFieldFocus(true)" 
                onblur="searchBox.OnSearchFieldFocus(false)" 
                onkeyup="searchBox.OnSearchFieldChange(event)"/>
@@ -56,10 +54,15 @@
 </table>
 </div>
 <!-- end header part -->
-<!-- Generated by Doxygen 1.9.1 -->
+<!-- Generated by Doxygen 1.13.1 -->
+<script type="text/javascript">
+/* @license magnet:?xt=urn:btih:d3d9a9a6595521f9666a5e94cc830dab83b65699&amp;dn=expat.txt MIT */
+var searchBox = new SearchBox("searchBox", "search/",'.html');
+/* @license-end */
+</script>
 <script type="text/javascript">
-/* @license magnet:?xt=urn:btih:cf05388f2679ee054f2beb29a391d25f4e673ac3&amp;dn=gpl-2.0.txt GPL-v2 */
-var searchBox = new SearchBox("searchBox", "search",false,'Search','.html');
+/* @license magnet:?xt=urn:btih:d3d9a9a6595521f9666a5e94cc830dab83b65699&amp;dn=expat.txt MIT */
+$(function() { codefold.init(0); });
 /* @license-end */
 </script>
 </div><!-- top -->
@@ -74,8 +77,8 @@
   </div>
 </div>
 <script type="text/javascript">
-/* @license magnet:?xt=urn:btih:cf05388f2679ee054f2beb29a391d25f4e673ac3&amp;dn=gpl-2.0.txt GPL-v2 */
-$(document).ready(function(){initNavTree('bench.html',''); initResizable(); });
+/* @license magnet:?xt=urn:btih:d3d9a9a6595521f9666a5e94cc830dab83b65699&amp;dn=expat.txt MIT */
+$(function(){initNavTree('bench.html',''); initResizable(true); });
 /* @license-end */
 </script>
 <div id="doc-content">
@@ -88,14 +91,20 @@
 
 <!-- iframe showing the search results (closed by default) -->
 <div id="MSearchResultsWindow">
-<iframe src="javascript:void(0)" frameborder="0" 
-        name="MSearchResults" id="MSearchResults">
-</iframe>
+<div id="MSearchResults">
+<div class="SRPage">
+<div id="SRIndex">
+<div id="SRResults"></div>
+<div class="SRStatus" id="Loading">Loading...</div>
+<div class="SRStatus" id="Searching">Searching...</div>
+<div class="SRStatus" id="NoMatches">No Matches</div>
+</div>
+</div>
+</div>
 </div>
 
-<div class="PageDoc"><div class="header">
-  <div class="headertitle">
-<div class="title">Performance </div>  </div>
+<div><div class="header">
+  <div class="headertitle"><div class="title">Performance</div></div>
 </div><!--header-->
 <div class="contents">
 <div class="textblock"><p>We tested <em>mimalloc</em> against many other top allocators over a wide range of benchmarks, ranging from various real world programs to synthetic benchmarks that see how the allocator behaves under more extreme circumstances.</p>
@@ -107,7 +116,7 @@
 <!-- start footer part -->
 <div id="nav-path" class="navpath"><!-- id is needed for treeview function! -->
   <ul>
-    <li class="footer">Generated by <a href="https://www.doxygen.org/index.html"><img class="footer" src="doxygen.svg" width="104" height="31" alt="doxygen"/></a> 1.9.1 </li>
+    <li class="footer">Generated by <a href="https://www.doxygen.org/index.html"><img class="footer" src="doxygen.svg" width="104" height="31" alt="doxygen"/></a> 1.13.1 </li>
   </ul>
 </div>
 </body>
diff --git a/depends/mimalloc/docs/build.html b/depends/mimalloc/docs/build.html
index dbcc0d7521be..9849b055f2b3 100644
--- a/depends/mimalloc/docs/build.html
+++ b/depends/mimalloc/docs/build.html
@@ -1,24 +1,26 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "https://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
+<html xmlns="http://www.w3.org/1999/xhtml" lang="en-US">
 <head>
 <meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
-<meta http-equiv="X-UA-Compatible" content="IE=9"/>
-<meta name="generator" content="Doxygen 1.9.1"/>
+<meta http-equiv="X-UA-Compatible" content="IE=11"/>
+<meta name="generator" content="Doxygen 1.13.1"/>
 <meta name="viewport" content="width=device-width, initial-scale=1"/>
 <title>mi-malloc: Building</title>
 <link href="tabs.css" rel="stylesheet" type="text/css"/>
 <script type="text/javascript" src="jquery.js"></script>
 <script type="text/javascript" src="dynsections.js"></script>
+<script type="text/javascript" src="clipboard.js"></script>
 <link href="navtree.css" rel="stylesheet" type="text/css"/>
-<script type="text/javascript" src="resize.js"></script>
 <script type="text/javascript" src="navtreedata.js"></script>
 <script type="text/javascript" src="navtree.js"></script>
+<script type="text/javascript" src="resize.js"></script>
+<script type="text/javascript" src="cookie.js"></script>
 <link href="search/search.css" rel="stylesheet" type="text/css"/>
 <script type="text/javascript" src="search/searchdata.js"></script>
 <script type="text/javascript" src="search/search.js"></script>
 <script type="text/javascript">
-/* @license magnet:?xt=urn:btih:cf05388f2679ee054f2beb29a391d25f4e673ac3&amp;dn=gpl-2.0.txt GPL-v2 */
-  $(document).ready(function() { init_search(); });
+/* @license magnet:?xt=urn:btih:d3d9a9a6595521f9666a5e94cc830dab83b65699&amp;dn=expat.txt MIT */
+  $(function() { init_search(); });
 /* @license-end */
 </script>
 <link href="doxygen.css" rel="stylesheet" type="text/css" />
@@ -29,20 +31,16 @@
 <div id="titlearea">
 <table cellspacing="0" cellpadding="0">
  <tbody>
- <tr style="height: 56px;">
+ <tr id="projectrow">
   <td id="projectlogo"><img alt="Logo" src="mimalloc-logo.svg"/></td>
-  <td id="projectalign" style="padding-left: 0.5em;">
-   <div id="projectname">mi-malloc
-   &#160;<span id="projectnumber">1.7/2.0</span>
+  <td id="projectalign">
+   <div id="projectname">mi-malloc<span id="projectnumber">&#160;1.8/2.1</span>
    </div>
   </td>
-   <td>        <div id="MSearchBox" class="MSearchBoxInactive">
+    <td>        <div id="MSearchBox" class="MSearchBoxInactive">
         <span class="left">
-          <img id="MSearchSelect" src="search/mag_sel.svg"
-               onmouseover="return searchBox.OnSearchSelectShow()"
-               onmouseout="return searchBox.OnSearchSelectHide()"
-               alt=""/>
-          <input type="text" id="MSearchField" value="Search" accesskey="S"
+          <span id="MSearchSelect"                onmouseover="return searchBox.OnSearchSelectShow()"                onmouseout="return searchBox.OnSearchSelectHide()">&#160;</span>
+          <input type="text" id="MSearchField" value="" placeholder="Search" accesskey="S"
                onfocus="searchBox.OnSearchFieldFocus(true)" 
                onblur="searchBox.OnSearchFieldFocus(false)" 
                onkeyup="searchBox.OnSearchFieldChange(event)"/>
@@ -56,10 +54,15 @@
 </table>
 </div>
 <!-- end header part -->
-<!-- Generated by Doxygen 1.9.1 -->
+<!-- Generated by Doxygen 1.13.1 -->
+<script type="text/javascript">
+/* @license magnet:?xt=urn:btih:d3d9a9a6595521f9666a5e94cc830dab83b65699&amp;dn=expat.txt MIT */
+var searchBox = new SearchBox("searchBox", "search/",'.html');
+/* @license-end */
+</script>
 <script type="text/javascript">
-/* @license magnet:?xt=urn:btih:cf05388f2679ee054f2beb29a391d25f4e673ac3&amp;dn=gpl-2.0.txt GPL-v2 */
-var searchBox = new SearchBox("searchBox", "search",false,'Search','.html');
+/* @license magnet:?xt=urn:btih:d3d9a9a6595521f9666a5e94cc830dab83b65699&amp;dn=expat.txt MIT */
+$(function() { codefold.init(0); });
 /* @license-end */
 </script>
 </div><!-- top -->
@@ -74,8 +77,8 @@
   </div>
 </div>
 <script type="text/javascript">
-/* @license magnet:?xt=urn:btih:cf05388f2679ee054f2beb29a391d25f4e673ac3&amp;dn=gpl-2.0.txt GPL-v2 */
-$(document).ready(function(){initNavTree('build.html',''); initResizable(); });
+/* @license magnet:?xt=urn:btih:d3d9a9a6595521f9666a5e94cc830dab83b65699&amp;dn=expat.txt MIT */
+$(function(){initNavTree('build.html',''); initResizable(true); });
 /* @license-end */
 </script>
 <div id="doc-content">
@@ -88,17 +91,23 @@
 
 <!-- iframe showing the search results (closed by default) -->
 <div id="MSearchResultsWindow">
-<iframe src="javascript:void(0)" frameborder="0" 
-        name="MSearchResults" id="MSearchResults">
-</iframe>
+<div id="MSearchResults">
+<div class="SRPage">
+<div id="SRIndex">
+<div id="SRResults"></div>
+<div class="SRStatus" id="Loading">Loading...</div>
+<div class="SRStatus" id="Searching">Searching...</div>
+<div class="SRStatus" id="NoMatches">No Matches</div>
+</div>
+</div>
+</div>
 </div>
 
-<div class="PageDoc"><div class="header">
-  <div class="headertitle">
-<div class="title">Building </div>  </div>
+<div><div class="header">
+  <div class="headertitle"><div class="title">Building</div></div>
 </div><!--header-->
 <div class="contents">
-<div class="textblock"><p>Checkout the sources from Github: </p><div class="fragment"><div class="line">git clone https:<span class="comment">//github.com/microsoft/mimalloc</span></div>
+<div class="textblock"><p>Checkout the sources from GitHub: </p><div class="fragment"><div class="line">git clone https:<span class="comment">//github.com/microsoft/mimalloc</span></div>
 </div><!-- fragment --><h2>Windows</h2>
 <p>Open <code>ide/vs2019/mimalloc.sln</code> in Visual Studio 2019 and build (or <code>ide/vs2017/mimalloc.sln</code>). The <code>mimalloc</code> project builds a static library (in <code>out/msvc-x64</code>), while the <code>mimalloc-override</code> project builds a DLL for overriding malloc in the entire program.</p>
 <h2>macOS, Linux, BSD, etc.</h2>
@@ -130,7 +139,7 @@ <h2>macOS, Linux, BSD, etc.</h2>
 <!-- start footer part -->
 <div id="nav-path" class="navpath"><!-- id is needed for treeview function! -->
   <ul>
-    <li class="footer">Generated by <a href="https://www.doxygen.org/index.html"><img class="footer" src="doxygen.svg" width="104" height="31" alt="doxygen"/></a> 1.9.1 </li>
+    <li class="footer">Generated by <a href="https://www.doxygen.org/index.html"><img class="footer" src="doxygen.svg" width="104" height="31" alt="doxygen"/></a> 1.13.1 </li>
   </ul>
 </div>
 </body>
diff --git a/depends/mimalloc/docs/classes.html b/depends/mimalloc/docs/classes.html
index b744c4d90041..e86cf9f2f1ee 100644
--- a/depends/mimalloc/docs/classes.html
+++ b/depends/mimalloc/docs/classes.html
@@ -1,24 +1,26 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "https://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
+<html xmlns="http://www.w3.org/1999/xhtml" lang="en-US">
 <head>
 <meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
-<meta http-equiv="X-UA-Compatible" content="IE=9"/>
-<meta name="generator" content="Doxygen 1.9.1"/>
+<meta http-equiv="X-UA-Compatible" content="IE=11"/>
+<meta name="generator" content="Doxygen 1.13.1"/>
 <meta name="viewport" content="width=device-width, initial-scale=1"/>
 <title>mi-malloc: Data Structure Index</title>
 <link href="tabs.css" rel="stylesheet" type="text/css"/>
 <script type="text/javascript" src="jquery.js"></script>
 <script type="text/javascript" src="dynsections.js"></script>
+<script type="text/javascript" src="clipboard.js"></script>
 <link href="navtree.css" rel="stylesheet" type="text/css"/>
-<script type="text/javascript" src="resize.js"></script>
 <script type="text/javascript" src="navtreedata.js"></script>
 <script type="text/javascript" src="navtree.js"></script>
+<script type="text/javascript" src="resize.js"></script>
+<script type="text/javascript" src="cookie.js"></script>
 <link href="search/search.css" rel="stylesheet" type="text/css"/>
 <script type="text/javascript" src="search/searchdata.js"></script>
 <script type="text/javascript" src="search/search.js"></script>
 <script type="text/javascript">
-/* @license magnet:?xt=urn:btih:cf05388f2679ee054f2beb29a391d25f4e673ac3&amp;dn=gpl-2.0.txt GPL-v2 */
-  $(document).ready(function() { init_search(); });
+/* @license magnet:?xt=urn:btih:d3d9a9a6595521f9666a5e94cc830dab83b65699&amp;dn=expat.txt MIT */
+  $(function() { init_search(); });
 /* @license-end */
 </script>
 <link href="doxygen.css" rel="stylesheet" type="text/css" />
@@ -29,20 +31,16 @@
 <div id="titlearea">
 <table cellspacing="0" cellpadding="0">
  <tbody>
- <tr style="height: 56px;">
+ <tr id="projectrow">
   <td id="projectlogo"><img alt="Logo" src="mimalloc-logo.svg"/></td>
-  <td id="projectalign" style="padding-left: 0.5em;">
-   <div id="projectname">mi-malloc
-   &#160;<span id="projectnumber">1.7/2.0</span>
+  <td id="projectalign">
+   <div id="projectname">mi-malloc<span id="projectnumber">&#160;1.8/2.1</span>
    </div>
   </td>
-   <td>        <div id="MSearchBox" class="MSearchBoxInactive">
+    <td>        <div id="MSearchBox" class="MSearchBoxInactive">
         <span class="left">
-          <img id="MSearchSelect" src="search/mag_sel.svg"
-               onmouseover="return searchBox.OnSearchSelectShow()"
-               onmouseout="return searchBox.OnSearchSelectHide()"
-               alt=""/>
-          <input type="text" id="MSearchField" value="Search" accesskey="S"
+          <span id="MSearchSelect"                onmouseover="return searchBox.OnSearchSelectShow()"                onmouseout="return searchBox.OnSearchSelectHide()">&#160;</span>
+          <input type="text" id="MSearchField" value="" placeholder="Search" accesskey="S"
                onfocus="searchBox.OnSearchFieldFocus(true)" 
                onblur="searchBox.OnSearchFieldFocus(false)" 
                onkeyup="searchBox.OnSearchFieldChange(event)"/>
@@ -56,10 +54,15 @@
 </table>
 </div>
 <!-- end header part -->
-<!-- Generated by Doxygen 1.9.1 -->
+<!-- Generated by Doxygen 1.13.1 -->
+<script type="text/javascript">
+/* @license magnet:?xt=urn:btih:d3d9a9a6595521f9666a5e94cc830dab83b65699&amp;dn=expat.txt MIT */
+var searchBox = new SearchBox("searchBox", "search/",'.html');
+/* @license-end */
+</script>
 <script type="text/javascript">
-/* @license magnet:?xt=urn:btih:cf05388f2679ee054f2beb29a391d25f4e673ac3&amp;dn=gpl-2.0.txt GPL-v2 */
-var searchBox = new SearchBox("searchBox", "search",false,'Search','.html');
+/* @license magnet:?xt=urn:btih:d3d9a9a6595521f9666a5e94cc830dab83b65699&amp;dn=expat.txt MIT */
+$(function() { codefold.init(0); });
 /* @license-end */
 </script>
 </div><!-- top -->
@@ -74,8 +77,8 @@
   </div>
 </div>
 <script type="text/javascript">
-/* @license magnet:?xt=urn:btih:cf05388f2679ee054f2beb29a391d25f4e673ac3&amp;dn=gpl-2.0.txt GPL-v2 */
-$(document).ready(function(){initNavTree('classes.html',''); initResizable(); });
+/* @license magnet:?xt=urn:btih:d3d9a9a6595521f9666a5e94cc830dab83b65699&amp;dn=expat.txt MIT */
+$(function(){initNavTree('classes.html',''); initResizable(true); });
 /* @license-end */
 </script>
 <div id="doc-content">
@@ -88,20 +91,26 @@
 
 <!-- iframe showing the search results (closed by default) -->
 <div id="MSearchResultsWindow">
-<iframe src="javascript:void(0)" frameborder="0" 
-        name="MSearchResults" id="MSearchResults">
-</iframe>
+<div id="MSearchResults">
+<div class="SRPage">
+<div id="SRIndex">
+<div id="SRResults"></div>
+<div class="SRStatus" id="Loading">Loading...</div>
+<div class="SRStatus" id="Searching">Searching...</div>
+<div class="SRStatus" id="NoMatches">No Matches</div>
+</div>
+</div>
+</div>
 </div>
 
 <div class="header">
-  <div class="headertitle">
-<div class="title">Data Structure Index</div>  </div>
+  <div class="headertitle"><div class="title">Data Structure Index</div></div>
 </div><!--header-->
 <div class="contents">
 <div class="qindex"><a class="qindex" href="#letter_M">M</a></div>
 <div class="classindex">
 <dl class="classindex even">
-<dt class="alphachar"><a name="letter_M">M</a></dt>
+<dt class="alphachar"><a id="letter_M" name="letter_M">M</a></dt>
 <dd><a class="el" href="group__analysis.html#structmi__heap__area__t">mi_heap_area_t</a></dd><dd><a class="el" href="group__cpp.html#structmi__stl__allocator">mi_stl_allocator</a></dd></dl>
 </div>
 </div><!-- contents -->
@@ -109,7 +118,7 @@
 <!-- start footer part -->
 <div id="nav-path" class="navpath"><!-- id is needed for treeview function! -->
   <ul>
-    <li class="footer">Generated by <a href="https://www.doxygen.org/index.html"><img class="footer" src="doxygen.svg" width="104" height="31" alt="doxygen"/></a> 1.9.1 </li>
+    <li class="footer">Generated by <a href="https://www.doxygen.org/index.html"><img class="footer" src="doxygen.svg" width="104" height="31" alt="doxygen"/></a> 1.13.1 </li>
   </ul>
 </div>
 </body>
diff --git a/depends/mimalloc/docs/clipboard.js b/depends/mimalloc/docs/clipboard.js
new file mode 100644
index 000000000000..42c1fb0e02dc
--- /dev/null
+++ b/depends/mimalloc/docs/clipboard.js
@@ -0,0 +1,61 @@
+/**
+
+The code below is based on the Doxygen Awesome project, see
+https://github.com/jothepro/doxygen-awesome-css
+
+MIT License
+
+Copyright (c) 2021 - 2022 jothepro
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+
+*/
+
+let clipboard_title = "Copy to clipboard"
+let clipboard_icon = `<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" width="24" height="24"><path d="M0 0h24v24H0V0z" fill="none"/><path d="M16 1H4c-1.1 0-2 .9-2 2v14h2V3h12V1zm3 4H8c-1.1 0-2 .9-2 2v14c0 1.1.9 2 2 2h11c1.1 0 2-.9 2-2V7c0-1.1-.9-2-2-2zm0 16H8V7h11v14z"/></svg>`
+let clipboard_successIcon = `<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" width="24" height="24"><path d="M0 0h24v24H0V0z" fill="none"/><path d="M9 16.17L4.83 12l-1.42 1.41L9 19 21 7l-1.41-1.41L9 16.17z"/></svg>`
+let clipboard_successDuration = 1000
+
+$(function() {
+  if(navigator.clipboard) {
+    const fragments = document.getElementsByClassName("fragment")
+    for(const fragment of fragments) {
+      const clipboard_div = document.createElement("div")
+      clipboard_div.classList.add("clipboard")
+      clipboard_div.innerHTML = clipboard_icon
+      clipboard_div.title = clipboard_title
+      $(clipboard_div).click(function() {
+        const content = this.parentNode.cloneNode(true)
+        // filter out line number and folded fragments from file listings
+        content.querySelectorAll(".lineno, .ttc, .foldclosed").forEach((node) => { node.remove() })
+        let text = content.textContent
+        // remove trailing newlines and trailing spaces from empty lines
+        text = text.replace(/^\s*\n/gm,'\n').replace(/\n*$/,'')
+        navigator.clipboard.writeText(text);
+        this.classList.add("success")
+        this.innerHTML = clipboard_successIcon
+        window.setTimeout(() => { // switch back to normal icon after timeout
+            this.classList.remove("success")
+            this.innerHTML = clipboard_icon
+        }, clipboard_successDuration);
+      })
+      fragment.insertBefore(clipboard_div, fragment.firstChild)
+    }
+  }
+})
diff --git a/depends/mimalloc/docs/cookie.js b/depends/mimalloc/docs/cookie.js
new file mode 100644
index 000000000000..53ad21d98119
--- /dev/null
+++ b/depends/mimalloc/docs/cookie.js
@@ -0,0 +1,58 @@
+/*!
+ Cookie helper functions
+ Copyright (c) 2023 Dimitri van Heesch
+ Released under MIT license.
+*/
+let Cookie = {
+  cookie_namespace: 'doxygen_',
+
+  readSetting(cookie,defVal) {
+    if (window.chrome) {
+      const val = localStorage.getItem(this.cookie_namespace+cookie) ||
+                  sessionStorage.getItem(this.cookie_namespace+cookie);
+      if (val) return val;
+    } else {
+      let myCookie = this.cookie_namespace+cookie+"=";
+      if (document.cookie) {
+        const index = document.cookie.indexOf(myCookie);
+        if (index != -1) {
+          const valStart = index + myCookie.length;
+          let valEnd = document.cookie.indexOf(";", valStart);
+          if (valEnd == -1) {
+            valEnd = document.cookie.length;
+          }
+          return document.cookie.substring(valStart, valEnd);
+        }
+      }
+    }
+    return defVal;
+  },
+
+  writeSetting(cookie,val,days=10*365) { // default days='forever', 0=session cookie, -1=delete
+    if (window.chrome) {
+      if (days==0) {
+        sessionStorage.setItem(this.cookie_namespace+cookie,val);
+      } else {
+        localStorage.setItem(this.cookie_namespace+cookie,val);
+      }
+    } else {
+      let date = new Date();
+      date.setTime(date.getTime()+(days*24*60*60*1000));
+      const expiration = days!=0 ? "expires="+date.toGMTString()+";" : "";
+      document.cookie = this.cookie_namespace + cookie + "=" +
+                        val + "; SameSite=Lax;" + expiration + "path=/";
+    }
+  },
+
+  eraseSetting(cookie) {
+    if (window.chrome) {
+      if (localStorage.getItem(this.cookie_namespace+cookie)) {
+        localStorage.removeItem(this.cookie_namespace+cookie);
+      } else if (sessionStorage.getItem(this.cookie_namespace+cookie)) {
+        sessionStorage.removeItem(this.cookie_namespace+cookie);
+      }
+    } else {
+      this.writeSetting(cookie,'',-1);
+    }
+  },
+}
diff --git a/depends/mimalloc/docs/doxygen.css b/depends/mimalloc/docs/doxygen.css
index f090ef799cc0..0ee13f355c97 100644
--- a/depends/mimalloc/docs/doxygen.css
+++ b/depends/mimalloc/docs/doxygen.css
@@ -1,26 +1,31 @@
-/* The standard CSS for doxygen 1.9.1 */
+/* The standard CSS for doxygen 1.13.1*/
 
-body, table, div, p, dl {
-	font: 400 14px/22px Roboto,sans-serif;
+body {
+    background-color: white;
+    color: black;
 }
 
-p.reference, p.definition {
-	font: 400 14px/22px Roboto,sans-serif;
+body, table, div, p, dl {
+	font-weight: 400;
+	font-size: 14px;
+	font-family: Roboto,sans-serif;
+	line-height: 22px;
 }
 
 /* @group Heading Levels */
 
-h1.groupheader {
-	font-size: 150%;
-}
-
 .title {
-	font: 400 14px/28px Roboto,sans-serif;
+	font-family: Roboto,sans-serif;
+	line-height: 28px;
 	font-size: 150%;
 	font-weight: bold;
 	margin: 10px 2px;
 }
 
+h1.groupheader {
+	font-size: 150%;
+}
+
 h2.groupheader {
 	border-bottom: 1px solid #474D4E;
 	color: #0A0B0B;
@@ -53,15 +58,6 @@ dt {
 	font-weight: bold;
 }
 
-ul.multicol {
-	-moz-column-gap: 1em;
-	-webkit-column-gap: 1em;
-	column-gap: 1em;
-	-moz-column-count: 3;
-	-webkit-column-count: 3;
-	column-count: 3;
-}
-
 p.startli, p.startdd {
 	margin-top: 2px;
 }
@@ -113,7 +109,6 @@ h3.version {
 }
 
 div.navtab {
-	border-right: 1px solid #636C6D;
 	padding-right: 15px;
 	text-align: right;
 	line-height: 110%;
@@ -127,6 +122,7 @@ td.navtab {
 	padding-right: 6px;
 	padding-left: 6px;
 }
+
 td.navtabHL {
 	background-image: url('tab_a.png');
 	background-repeat:repeat-x;
@@ -135,7 +131,7 @@ td.navtabHL {
 }
 
 td.navtabHL a, td.navtabHL a:visited {
-	color: #fff;
+	color: white;
 	text-shadow: 0px 1px 1px rgba(0, 0, 0, 1.0);
 }
 
@@ -151,6 +147,12 @@ div.qindex{
 	color: #A0A0A0;
 }
 
+#main-menu a:focus {
+	outline: auto;
+	z-index: 10;
+	position: relative;
+}
+
 dt.alphachar{
 	font-size: 180%;
 	font-weight: bold;
@@ -176,6 +178,10 @@ dt.alphachar{
 	line-height: 1.15em;
 }
 
+.classindex dl.even {
+	background-color: white;
+}
+
 .classindex dl.odd {
 	background-color: #F0F1F1;
 }
@@ -206,11 +212,13 @@ a {
 }
 
 a:hover {
-	text-decoration: underline;
+	text-decoration: none;
+	background:   linear-gradient(to bottom, transparent 0,transparent calc(100% - 1px), currentColor 100%);
 }
 
-.contents a.qindexHL:visited {
-        color: #FFFFFF;
+a:hover > span.arrow {
+        text-decoration: none;
+        background : #F2F3F3;
 }
 
 a.el {
@@ -221,21 +229,75 @@ a.elRef {
 }
 
 a.code, a.code:visited, a.line, a.line:visited {
-	color: #171919; 
+	color: #171919;
 }
 
 a.codeRef, a.codeRef:visited, a.lineRef, a.lineRef:visited {
-	color: #171919; 
+	color: #171919;
 }
 
+a.code.hl_class { /* style for links to class names in code snippets */ }
+a.code.hl_struct { /* style for links to struct names in code snippets */ }
+a.code.hl_union { /* style for links to union names in code snippets */ }
+a.code.hl_interface { /* style for links to interface names in code snippets */ }
+a.code.hl_protocol { /* style for links to protocol names in code snippets */ }
+a.code.hl_category { /* style for links to category names in code snippets */ }
+a.code.hl_exception { /* style for links to exception names in code snippets */ }
+a.code.hl_service { /* style for links to service names in code snippets */ }
+a.code.hl_singleton { /* style for links to singleton names in code snippets */ }
+a.code.hl_concept { /* style for links to concept names in code snippets */ }
+a.code.hl_namespace { /* style for links to namespace names in code snippets */ }
+a.code.hl_package { /* style for links to package names in code snippets */ }
+a.code.hl_define { /* style for links to macro names in code snippets */ }
+a.code.hl_function { /* style for links to function names in code snippets */ }
+a.code.hl_variable { /* style for links to variable names in code snippets */ }
+a.code.hl_typedef { /* style for links to typedef names in code snippets */ }
+a.code.hl_enumvalue { /* style for links to enum value names in code snippets */ }
+a.code.hl_enumeration { /* style for links to enumeration names in code snippets */ }
+a.code.hl_signal { /* style for links to Qt signal names in code snippets */ }
+a.code.hl_slot { /* style for links to Qt slot names in code snippets */ }
+a.code.hl_friend { /* style for links to friend names in code snippets */ }
+a.code.hl_dcop { /* style for links to KDE3 DCOP names in code snippets */ }
+a.code.hl_property { /* style for links to property names in code snippets */ }
+a.code.hl_event { /* style for links to event names in code snippets */ }
+a.code.hl_sequence { /* style for links to sequence names in code snippets */ }
+a.code.hl_dictionary { /* style for links to dictionary names in code snippets */ }
+
 /* @end */
 
 dl.el {
 	margin-left: -1cm;
 }
 
+ul.check {
+  list-style:none;
+  text-indent: -16px;
+  padding-left: 38px;
+}
+li.unchecked:before {
+  content: "\2610\A0";
+}
+li.checked:before {
+  content: "\2611\A0";
+}
+
+ol {
+  text-indent: 0px;
+}
+
 ul {
-  overflow: hidden; /*Fixed: list item bullets overlap floating elements*/
+  text-indent: 0px;
+  overflow: visible;
+}
+
+ul.multicol {
+        -moz-column-gap: 1em;
+        -webkit-column-gap: 1em;
+        column-gap: 1em;
+        -moz-column-count: 3;
+        -webkit-column-count: 3;
+        column-count: 3;
+        list-style-type: none;
 }
 
 #side-nav ul {
@@ -249,35 +311,70 @@ ul {
 .fragment {
   text-align: left;
   direction: ltr;
-  overflow-x: auto; /*Fixed: fragment lines overlap floating elements*/
+  overflow-x: auto;
   overflow-y: hidden;
+  position: relative;
+  min-height: 12px;
+  margin: 10px 0px;
+  padding: 10px 10px;
+  border: 1px solid #90989A;
+  border-radius: 4px;
+  background-color: #F7F8F8;
+  color: black;
 }
 
 pre.fragment {
-        border: 1px solid #90989A;
-        background-color: #F7F8F8;
-        padding: 4px 6px;
-        margin: 4px 8px 4px 2px;
+  word-wrap: break-word;
+  font-size:  10pt;
+  line-height: 125%;
+  font-family: 'JetBrains Mono',Consolas,Monaco,'Andale Mono','Ubuntu Mono',monospace,fixed;
+}
+
+.clipboard {
+        width: 24px;
+        height: 24px;
+        right: 5px;
+        top: 5px;
+        opacity: 0;
+        position: absolute;
+        display: inline;
         overflow: auto;
-        word-wrap: break-word;
-        font-size:  9pt;
-        line-height: 125%;
-        font-family: monospace, fixed;
-        font-size: 105%;
+        fill: black;
+        justify-content: center;
+        align-items: center;
+        cursor: pointer;
+}
+
+.clipboard.success {
+        border: 1px solid black;
+        border-radius: 4px;
+}
+
+.fragment:hover .clipboard, .clipboard.success {
+        opacity: .28;
 }
 
-div.fragment {
-  padding: 0 0 1px 0; /*Fixed: last line underline overlap border*/
-  margin: 4px 8px 4px 2px;
-	background-color: #F7F8F8;
-	border: 1px solid #90989A;
+.clipboard:hover, .clipboard.success {
+        opacity: 1 !important;
+}
+
+.clipboard:active:not([class~=success]) svg {
+        transform: scale(.91);
+}
+
+.clipboard.success svg {
+        fill: #2EC82E;
+}
+
+.clipboard.success {
+        border-color: #2EC82E;
 }
 
 div.line {
-	font-family: monospace, fixed;
+	font-family: 'JetBrains Mono',Consolas,Monaco,'Andale Mono','Ubuntu Mono',monospace,fixed;
         font-size: 13px;
 	min-height: 13px;
-	line-height: 1.0;
+	line-height: 1.2;
 	text-wrap: unrestricted;
 	white-space: -moz-pre-wrap; /* Moz */
 	white-space: -pre-wrap;     /* Opera 4-6 */
@@ -310,19 +407,35 @@ div.line.glow {
 	box-shadow: 0 0 10px cyan;
 }
 
+span.fold {
+        margin-left: 5px;
+        margin-right: 1px;
+        margin-top: 0px;
+        margin-bottom: 0px;
+        padding: 0px;
+	display: inline-block;
+	width: 12px;
+	height: 12px;
+	background-repeat:no-repeat;
+        background-position:center;
+}
 
 span.lineno {
 	padding-right: 4px;
+        margin-right: 9px;
 	text-align: right;
-	border-right: 2px solid #0F0;
+	border-right: 2px solid #00FF00;
+	color: black;
 	background-color: #E8E8E8;
         white-space: pre;
 }
-span.lineno a {
+span.lineno a, span.lineno a:visited {
+	color: #171919;
 	background-color: #D8D8D8;
 }
 
 span.lineno a:hover {
+	color: #171919;
 	background-color: #C8C8C8;
 }
 
@@ -335,24 +448,6 @@ span.lineno a:hover {
 	user-select: none;
 }
 
-div.ah, span.ah {
-	background-color: black;
-	font-weight: bold;
-	color: #FFFFFF;
-	margin-bottom: 3px;
-	margin-top: 3px;
-	padding: 0.2em;
-	border: solid thin #333;
-	border-radius: 0.5em;
-	-webkit-border-radius: .5em;
-	-moz-border-radius: .5em;
-	box-shadow: 2px 2px 3px #999;
-	-webkit-box-shadow: 2px 2px 3px #999;
-	-moz-box-shadow: rgba(0, 0, 0, 0.15) 2px 2px 2px;
-	background-image: -webkit-gradient(linear, left top, left bottom, from(#eee), to(#000),color-stop(0.3, #444));
-	background-image: -moz-linear-gradient(center top, #eee 0%, #444 40%, #000 110%);
-}
-
 div.classindex ul {
         list-style: none;
         padding-left: 0;
@@ -374,7 +469,6 @@ div.groupText {
 }
 
 body {
-	background-color: white;
 	color: black;
         margin: 0;
 }
@@ -385,33 +479,15 @@ div.contents {
 	margin-right: 8px;
 }
 
-td.indexkey {
-	background-color: #D6D9D9;
-	font-weight: bold;
-	border: 1px solid #90989A;
-	margin: 2px 0px 2px 0;
-	padding: 2px 10px;
-        white-space: nowrap;
-        vertical-align: top;
-}
-
-td.indexvalue {
-	background-color: #D6D9D9;
-	border: 1px solid #90989A;
-	padding: 2px 10px;
-	margin: 2px 0px;
-}
-
-tr.memlist {
-	background-color: #DADDDE;
-}
-
 p.formulaDsp {
 	text-align: center;
 }
 
-img.formulaDsp {
-	
+img.dark-mode-visible {
+	display: none;
+}
+img.light-mode-visible {
+	display: none;
 }
 
 img.formulaInl, img.inline {
@@ -437,52 +513,63 @@ address.footer {
 img.footer {
 	border: 0px;
 	vertical-align: middle;
+	width: 104px;
+}
+
+.compoundTemplParams {
+	color: #171919;
+	font-size: 80%;
+	line-height: 120%;
 }
 
 /* @group Code Colorization */
 
 span.keyword {
-	color: #008000
+	color: #008000;
 }
 
 span.keywordtype {
-	color: #604020
+	color: #604020;
 }
 
 span.keywordflow {
-	color: #e08000
+	color: #E08000;
 }
 
 span.comment {
-	color: #800000
+	color: #800000;
 }
 
 span.preprocessor {
-	color: #806020
+	color: #806020;
 }
 
 span.stringliteral {
-	color: #002080
+	color: #002080;
 }
 
 span.charliteral {
-	color: #008080
+	color: #008080;
+}
+
+span.xmlcdata {
+	color: black;
 }
 
 span.vhdldigit { 
-	color: #ff00ff 
+	color: #FF00FF;
 }
 
 span.vhdlchar { 
-	color: #000000 
+	color: #000000;
 }
 
 span.vhdlkeyword { 
-	color: #700070 
+	color: #700070;
 }
 
 span.vhdllogic { 
-	color: #ff0000 
+	color: #FF0000;
 }
 
 blockquote {
@@ -492,34 +579,8 @@ blockquote {
         padding: 0 12px 0 16px;
 }
 
-blockquote.DocNodeRTL {
-   border-left: 0;
-   border-right: 2px solid #5B6364;
-   margin: 0 4px 0 24px;
-   padding: 0 16px 0 12px;
-}
-
 /* @end */
 
-/*
-.search {
-	color: #003399;
-	font-weight: bold;
-}
-
-form.search {
-	margin-bottom: 0px;
-	margin-top: 0px;
-}
-
-input.search {
-	font-size: 75%;
-	color: #000080;
-	font-weight: normal;
-	background-color: #e8eef2;
-}
-*/
-
 td.tiny {
 	font-size: 75%;
 }
@@ -527,11 +588,12 @@ td.tiny {
 .dirtab {
 	padding: 4px;
 	border-collapse: collapse;
-	border: 1px solid #636C6D;
+	border: 1px solid #060606;
 }
 
 th.dirtab {
-	background: #D6D9D9;
+	background-color: #0B0C0C;
+	color: #FFFFFF;
 	font-weight: bold;
 }
 
@@ -641,15 +703,6 @@ table.memberdecls {
 	margin-left: 9px;
 }
 
-.memnav {
-	background-color: #D6D9D9;
-	border: 1px solid #636C6D;
-	text-align: center;
-	margin: 2px;
-	margin-right: 15px;
-	padding: 2px;
-}
-
 .mempage {
 	width: 100%;
 }
@@ -689,33 +742,24 @@ table.memberdecls {
         font-weight: bold;
         text-shadow: 0px 1px 1px rgba(255, 255, 255, 0.9);
         background-color: #BDC2C3;
-        /* opera specific markup */
         box-shadow: 5px 5px 5px rgba(0, 0, 0, 0.15);
         border-top-right-radius: 4px;
-        /* firefox specific markup */
-        -moz-box-shadow: rgba(0, 0, 0, 0.15) 5px 5px 5px;
-        -moz-border-radius-topright: 4px;
-        /* webkit specific markup */
-        -webkit-box-shadow: 5px 5px 5px rgba(0, 0, 0, 0.15);
-        -webkit-border-top-right-radius: 4px;
-
 }
 
 .overload {
-        font-family: "courier new",courier,monospace;
+        font-family: 'JetBrains Mono',Consolas,Monaco,'Andale Mono','Ubuntu Mono',monospace,fixed;
 	font-size: 65%;
 }
 
 .memdoc, dl.reflist dd {
-        border-bottom: 1px solid #697273;      
-        border-left: 1px solid #697273;      
-        border-right: 1px solid #697273; 
+        border-bottom: 1px solid #697273;
+        border-left: 1px solid #697273;
+        border-right: 1px solid #697273;
         padding: 6px 10px 2px 10px;
-        background-color: #F7F8F8;
         border-top-width: 0;
         background-image:url('nav_g.png');
         background-repeat:repeat-x;
-        background-color: #FFFFFF;
+        background-color: white;
         /* opera specific markup */
         border-bottom-left-radius: 4px;
         border-bottom-right-radius: 4px;
@@ -745,36 +789,44 @@ dl.reflist dd {
 
 .paramtype {
 	white-space: nowrap;
+	padding: 0px;
+	padding-bottom: 1px;
 }
 
 .paramname {
-	color: #602020;
 	white-space: nowrap;
+        padding: 0px;
+        padding-bottom: 1px;
+        margin-left: 2px;
 }
+
 .paramname em {
+	color: #602020;
 	font-style: normal;
+	margin-right: 1px;
 }
-.paramname code {
-        line-height: 14px;
+
+.paramname .paramdefval {
+	font-family: 'JetBrains Mono',Consolas,Monaco,'Andale Mono','Ubuntu Mono',monospace,fixed;
 }
 
 .params, .retval, .exception, .tparams {
         margin-left: 0px;
         padding-left: 0px;
-}       
+}
 
 .params .paramname, .retval .paramname, .tparams .paramname, .exception .paramname {
         font-weight: bold;
         vertical-align: top;
 }
-        
+
 .params .paramtype, .tparams .paramtype {
         font-style: italic;
         vertical-align: top;
-}       
-        
+}
+
 .params .paramdir, .tparams .paramdir {
-        font-family: "courier new",courier,monospace;
+        font-family: 'JetBrains Mono',Consolas,Monaco,'Andale Mono','Ubuntu Mono',monospace,fixed;
         vertical-align: top;
 }
 
@@ -858,9 +910,14 @@ div.directory {
 	border-left: 1px solid rgba(0,0,0,0.05);
 }
 
+.directory tr.odd {
+	padding-left: 6px;
+	background-color: #F0F1F1;
+}
+
 .directory tr.even {
 	padding-left: 6px;
-	background-color: #EDEFEF;
+	background-color: white;
 }
 
 .directory img {
@@ -896,7 +953,8 @@ div.directory {
 }
 
 .icon {
-    font-family: Arial, Helvetica;
+    font-family: Arial,Helvetica;
+    line-height: normal;
     font-weight: bold;
     font-size: 12px;
     height: 14px;
@@ -920,8 +978,7 @@ div.directory {
     width: 24px;
     height: 18px;
     margin-bottom: 4px;
-    background-image:url('folderopen.png');
-    background-position: 0px -4px;
+    background-image:url('folderopen.svg');
     background-repeat: repeat-y;
     vertical-align:top;
     display: inline-block;
@@ -931,8 +988,7 @@ div.directory {
     width: 24px;
     height: 18px;
     margin-bottom: 4px;
-    background-image:url('folderclosed.png');
-    background-position: 0px -4px;
+    background-image:url('folderclosed.svg');
     background-repeat: repeat-y;
     vertical-align:top;
     display: inline-block;
@@ -942,17 +998,13 @@ div.directory {
     width: 24px;
     height: 18px;
     margin-bottom: 4px;
-    background-image:url('doc.png');
+    background-image:url('doc.svg');
     background-position: 0px -4px;
     background-repeat: repeat-y;
     vertical-align:top;
     display: inline-block;
 }
 
-table.directory {
-    font: 400 14px Roboto,sans-serif;
-}
-
 /* @end */
 
 div.dynheader {
@@ -994,15 +1046,10 @@ table.doxtable th {
 }
 
 table.fieldtable {
-        /*width: 100%;*/
         margin-bottom: 10px;
         border: 1px solid #697273;
         border-spacing: 0px;
-        -moz-border-radius: 4px;
-        -webkit-border-radius: 4px;
         border-radius: 4px;
-        -moz-box-shadow: rgba(0, 0, 0, 0.15) 2px 2px 2px;
-        -webkit-box-shadow: 2px 2px 2px rgba(0, 0, 0, 0.15);
         box-shadow: 2px 2px 2px rgba(0, 0, 0, 0.15);
 }
 
@@ -1010,7 +1057,7 @@ table.fieldtable {
         padding: 3px 7px 2px;
 }
 
-.fieldtable td.fieldtype, .fieldtable td.fieldname {
+.fieldtable td.fieldtype, .fieldtable td.fieldname, .fieldtable td.fieldinit {
         white-space: nowrap;
         border-right: 1px solid #697273;
         border-bottom: 1px solid #697273;
@@ -1021,15 +1068,20 @@ table.fieldtable {
         padding-top: 3px;
 }
 
+.fieldtable td.fieldinit {
+        padding-top: 3px;
+        text-align: right;
+}
+
+
 .fieldtable td.fielddoc {
         border-bottom: 1px solid #697273;
-        /*width: 100%;*/
 }
 
 .fieldtable td.fielddoc p:first-child {
         margin-top: 0px;
-}       
-        
+}
+
 .fieldtable td.fielddoc p:last-child {
         margin-bottom: 2px;
 }
@@ -1039,7 +1091,7 @@ table.fieldtable {
 }
 
 .fieldtable th {
-        background-image:url('nav_f.png');
+        background-image: url('nav_f.png');
         background-repeat:repeat-x;
         background-color: #C4C8C9;
         font-size: 90%;
@@ -1048,10 +1100,6 @@ table.fieldtable {
         padding-top: 5px;
         text-align:left;
         font-weight: 400;
-        -moz-border-radius-topleft: 4px;
-        -moz-border-radius-topright: 4px;
-        -webkit-border-top-left-radius: 4px;
-        -webkit-border-top-right-radius: 4px;
         border-top-left-radius: 4px;
         border-top-right-radius: 4px;
         border-bottom: 1px solid #697273;
@@ -1071,12 +1119,12 @@ table.fieldtable {
 .navpath ul
 {
 	font-size: 11px;
-	background-image:url('tab_b.png');
+	background-image: url('tab_b.png');
 	background-repeat:repeat-x;
 	background-position: 0 -5px;
 	height:30px;
 	line-height:30px;
-	color:#494F50;
+	color:#040404;
 	border:solid 1px #8C9596;
 	overflow:hidden;
 	margin:0px;
@@ -1092,24 +1140,24 @@ table.fieldtable {
 	background-image:url('bc_s.png');
 	background-repeat:no-repeat;
 	background-position:right;
-	color:#0A0B0B;
+	color: #0A0B0B;
 }
 
 .navpath li.navelem a
 {
 	height:32px;
 	display:block;
-	text-decoration: none;
 	outline: none;
 	color: #040404;
 	font-family: 'Lucida Grande',Geneva,Helvetica,Arial,sans-serif;
 	text-shadow: 0px 1px 1px rgba(255, 255, 255, 0.9);
-	text-decoration: none;        
+	text-decoration: none;
 }
 
 .navpath li.navelem a:hover
 {
-	color:#2E3233;
+	color: white;
+	text-shadow: 0px 1px 1px rgba(0, 0, 0, 1.0);
 }
 
 .navpath li.footer
@@ -1121,7 +1169,7 @@ table.fieldtable {
         background-image:none;
         background-repeat:no-repeat;
         background-position:right;
-        color:#0A0B0B;
+        color: #050505;
         font-size: 8pt;
 }
 
@@ -1133,7 +1181,7 @@ div.summary
 	padding-right: 5px;
 	width: 50%;
 	text-align: right;
-}       
+}
 
 div.summary a
 {
@@ -1148,7 +1196,7 @@ table.classindex
         margin-right: 3%;
         width: 94%;
         border: 0;
-        border-spacing: 0; 
+        border-spacing: 0;
         padding: 0;
 }
 
@@ -1166,7 +1214,7 @@ div.ingroups a
 
 div.header
 {
-        background-image:url('nav_h.png');
+        background-image: url('nav_h.png');
         background-repeat:repeat-x;
 	background-color: #F2F3F3;
 	margin:  0px;
@@ -1187,17 +1235,13 @@ dl {
         padding: 0 0 0 0;
 }
 
-/* dl.note, dl.warning, dl.attention, dl.pre, dl.post, dl.invariant, dl.deprecated, dl.todo, dl.test, dl.bug, dl.examples */
+/*
+
 dl.section {
 	margin-left: 0px;
 	padding-left: 0px;
 }
 
-dl.section.DocNodeRTL {
-  margin-right: 0px;
-  padding-right: 0px;
-}
-
 dl.note {
   margin-left: -7px;
   padding-left: 3px;
@@ -1205,33 +1249,13 @@ dl.note {
   border-color: #D0C000;
 }
 
-dl.note.DocNodeRTL {
-  margin-left: 0;
-  padding-left: 0;
-  border-left: 0;
-  margin-right: -7px;
-  padding-right: 3px;
-  border-right: 4px solid;
-  border-color: #D0C000;
-}
-
-dl.warning, dl.attention {
+dl.warning, dl.attention, dl.important {
   margin-left: -7px;
   padding-left: 3px;
   border-left: 4px solid;
   border-color: #FF0000;
 }
 
-dl.warning.DocNodeRTL, dl.attention.DocNodeRTL {
-  margin-left: 0;
-  padding-left: 0;
-  border-left: 0;
-  margin-right: -7px;
-  padding-right: 3px;
-  border-right: 4px solid;
-  border-color: #FF0000;
-}
-
 dl.pre, dl.post, dl.invariant {
   margin-left: -7px;
   padding-left: 3px;
@@ -1239,16 +1263,6 @@ dl.pre, dl.post, dl.invariant {
   border-color: #00D000;
 }
 
-dl.pre.DocNodeRTL, dl.post.DocNodeRTL, dl.invariant.DocNodeRTL {
-  margin-left: 0;
-  padding-left: 0;
-  border-left: 0;
-  margin-right: -7px;
-  padding-right: 3px;
-  border-right: 4px solid;
-  border-color: #00D000;
-}
-
 dl.deprecated {
   margin-left: -7px;
   padding-left: 3px;
@@ -1256,16 +1270,6 @@ dl.deprecated {
   border-color: #505050;
 }
 
-dl.deprecated.DocNodeRTL {
-  margin-left: 0;
-  padding-left: 0;
-  border-left: 0;
-  margin-right: -7px;
-  padding-right: 3px;
-  border-right: 4px solid;
-  border-color: #505050;
-}
-
 dl.todo {
   margin-left: -7px;
   padding-left: 3px;
@@ -1273,16 +1277,6 @@ dl.todo {
   border-color: #00C0E0;
 }
 
-dl.todo.DocNodeRTL {
-  margin-left: 0;
-  padding-left: 0;
-  border-left: 0;
-  margin-right: -7px;
-  padding-right: 3px;
-  border-right: 4px solid;
-  border-color: #00C0E0;
-}
-
 dl.test {
   margin-left: -7px;
   padding-left: 3px;
@@ -1290,16 +1284,6 @@ dl.test {
   border-color: #3030E0;
 }
 
-dl.test.DocNodeRTL {
-  margin-left: 0;
-  padding-left: 0;
-  border-left: 0;
-  margin-right: -7px;
-  padding-right: 3px;
-  border-right: 4px solid;
-  border-color: #3030E0;
-}
-
 dl.bug {
   margin-left: -7px;
   padding-left: 3px;
@@ -1307,20 +1291,110 @@ dl.bug {
   border-color: #C08050;
 }
 
-dl.bug.DocNodeRTL {
-  margin-left: 0;
-  padding-left: 0;
-  border-left: 0;
-  margin-right: -7px;
-  padding-right: 3px;
-  border-right: 4px solid;
-  border-color: #C08050;
+*/
+
+dl.bug dt a, dl.deprecated dt a, dl.todo dt a, dl.test a {
+    font-weight: bold !important;
+}
+
+dl.warning, dl.attention, dl.important, dl.note, dl.deprecated, dl.bug,
+dl.invariant, dl.pre, dl.post, dl.todo, dl.test, dl.remark {
+    padding: 10px;
+    margin: 10px 0px;
+    overflow: hidden;
+    margin-left: 0;
+    border-radius: 4px;
 }
 
 dl.section dd {
-	margin-bottom: 6px;
+    margin-bottom: 2px;
+}
+
+dl.warning, dl.attention, dl.important {
+    background: #f8d1cc;
+    border-left: 8px solid #b61825;
+    color: #75070f;
 }
 
+dl.warning dt, dl.attention dt, dl.important dt {
+    color: #b61825;
+}
+
+dl.note, dl.remark {
+    background: #faf3d8;
+    border-left: 8px solid #f3a600;
+    color: #5f4204;
+}
+
+dl.note dt, dl.remark dt {
+    color: #f3a600;
+}
+
+dl.todo {
+    background: #e4f3ff;
+    border-left: 8px solid #1879C4;
+    color: #274a5c;
+}
+
+dl.todo dt {
+    color: #1879C4;
+}
+
+dl.test {
+    background: #e8e8ff;
+    border-left: 8px solid #3939C4;
+    color: #1a1a5c;
+}
+
+dl.test dt {
+    color: #3939C4;
+}
+
+dl.bug dt a {
+    color: #5b2bdd !important;
+}
+
+dl.bug {
+    background: #e4dafd;
+    border-left: 8px solid #5b2bdd;
+    color: #2a0d72;
+}
+
+dl.bug dt a {
+    color: #5b2bdd !important;
+}
+
+dl.deprecated {
+    background: #ecf0f3;
+    border-left: 8px solid #5b6269;
+    color: #43454a;
+}
+
+dl.deprecated dt a {
+    color: #5b6269 !important;
+}
+
+dl.note dd, dl.warning dd, dl.pre dd, dl.post dd,
+dl.remark dd, dl.attention dd, dl.important dd, dl.invariant dd,
+dl.bug dd, dl.deprecated dd, dl.todo dd, dl.test dd {
+    margin-inline-start: 0px;
+}
+
+dl.invariant, dl.pre, dl.post {
+    background: #d8f1e3;
+    border-left: 8px solid #44b86f;
+    color: #265532;
+}
+
+dl.invariant dt, dl.pre dt, dl.post dt {
+    color: #44b86f;
+}
+
+
+#projectrow
+{
+	height: 56px;
+}
 
 #projectlogo
 {
@@ -1328,34 +1402,43 @@ dl.section dd {
 	vertical-align: bottom;
 	border-collapse: separate;
 }
- 
+
 #projectlogo img
-{ 
+{
 	border: 0px none;
 }
- 
+
 #projectalign
 {
         vertical-align: middle;
+        padding-left: 0.5em;
 }
 
 #projectname
 {
-	font: 300% Tahoma, Arial,sans-serif;
+	font-size: 200%;
+	font-family: Tahoma,Arial,sans-serif;
 	margin: 0px;
 	padding: 2px 0px;
 }
-    
+
+#side-nav #projectname
+{
+	font-size: 130%;
+}
+
 #projectbrief
 {
-	font: 120% Tahoma, Arial,sans-serif;
+	font-size: 90%;
+        font-family: Tahoma,Arial,sans-serif;
 	margin: 0px;
 	padding: 0px;
 }
 
 #projectnumber
 {
-	font: 50% Tahoma, Arial,sans-serif;
+	font-size: 50%;
+	font-family: 50% Tahoma,Arial,sans-serif;
 	margin: 0px;
 	padding: 0px;
 }
@@ -1366,6 +1449,7 @@ dl.section dd {
 	margin: 0px;
 	width: 100%;
 	border-bottom: 1px solid #212425;
+	background-color: white;
 }
 
 .image
@@ -1398,11 +1482,6 @@ dl.section dd {
 	font-weight: bold;
 }
 
-div.zoom
-{
-	border: 1px solid #4F5657;
-}
-
 dl.citelist {
         margin-bottom:50px;
 }
@@ -1433,27 +1512,16 @@ div.toc {
         width: 200px;
 }
 
-.PageDocRTL-title div.toc {
-  float: left !important;
-  text-align: right;
-}
-
 div.toc li {
-        background: url("bdwn.png") no-repeat scroll 0 5px transparent;
-        font: 10px/1.2 Verdana,DejaVu Sans,Geneva,sans-serif;
+        background: url("data:image/svg+xml;utf8,<svg xmlns='http://www.w3.org/2000/svg' version='1.1' height='10px' width='5px' fill='grey'><text x='0' y='5' font-size='10'>&%238595;</text></svg>") no-repeat scroll 0 5px transparent;
+        font: 10px/1.2 Verdana,'DejaVu Sans',Geneva,sans-serif;
         margin-top: 5px;
         padding-left: 10px;
         padding-top: 2px;
 }
 
-.PageDocRTL-title div.toc li {
-  background-position-x: right !important;
-  padding-left: 0 !important;
-  padding-right: 10px;
-}
-
 div.toc h3 {
-        font: bold 12px/1.2 Arial,FreeSans,sans-serif;
+        font: bold 12px/1.2 Verdana,'DejaVu Sans',Geneva,sans-serif;
 	color: #171919;
         border-bottom: 0 none;
         margin: 0;
@@ -1463,22 +1531,19 @@ div.toc ul {
         list-style: none outside none;
         border: medium none;
         padding: 0px;
-}       
-
-div.toc li.level1 {
-        margin-left: 0px;
 }
 
-div.toc li.level2 {
+div.toc li[class^='level'] {
         margin-left: 15px;
 }
 
-div.toc li.level3 {
-        margin-left: 30px;
+div.toc li.level1 {
+        margin-left: 0px;
 }
 
-div.toc li.level4 {
-        margin-left: 45px;
+div.toc li.empty {
+        background-image: none;
+        margin-top: 0px;
 }
 
 span.emoji {
@@ -1487,24 +1552,8 @@ span.emoji {
          */
 }
 
-.PageDocRTL-title div.toc li.level1 {
-  margin-left: 0 !important;
-  margin-right: 0;
-}
-
-.PageDocRTL-title div.toc li.level2 {
-  margin-left: 0 !important;
-  margin-right: 15px;
-}
-
-.PageDocRTL-title div.toc li.level3 {
-  margin-left: 0 !important;
-  margin-right: 30px;
-}
-
-.PageDocRTL-title div.toc li.level4 {
-  margin-left: 0 !important;
-  margin-right: 45px;
+span.obfuscator {
+  display: none;
 }
 
 .inherit_header {
@@ -1541,7 +1590,8 @@ tr.heading h2 {
 
 #powerTip {
 	cursor: default;
-	white-space: nowrap;
+	/*white-space: nowrap;*/
+        color: black;
 	background-color: white;
 	border: 1px solid gray;
 	border-radius: 4px 4px 4px 4px;
@@ -1564,6 +1614,10 @@ tr.heading h2 {
         font-weight: bold;
 }
 
+#powerTip a {
+	color: #171919;
+}
+
 #powerTip div.ttname {
         font-weight: bold;
 }
@@ -1575,7 +1629,9 @@ tr.heading h2 {
 #powerTip div {
         margin: 0px;
         padding: 0px;
-        font: 12px/16px Roboto,sans-serif;
+        font-size: 12px;
+       	font-family: Roboto,sans-serif;
+	line-height: 16px;
 }
 
 #powerTip:before, #powerTip:after {
@@ -1620,12 +1676,12 @@ tr.heading h2 {
 }
 
 #powerTip.n:after, #powerTip.ne:after, #powerTip.nw:after {
-	border-top-color: #FFFFFF;
+	border-top-color: white;
 	border-width: 10px;
 	margin: 0px -10px;
 }
-#powerTip.n:before {
-	border-top-color: #808080;
+#powerTip.n:before, #powerTip.ne:before, #powerTip.nw:before {
+	border-top-color: gray;
 	border-width: 11px;
 	margin: 0px -11px;
 }
@@ -1648,13 +1704,13 @@ tr.heading h2 {
 }
 
 #powerTip.s:after, #powerTip.se:after, #powerTip.sw:after {
-	border-bottom-color: #FFFFFF;
+	border-bottom-color: white;
 	border-width: 10px;
 	margin: 0px -10px;
 }
 
 #powerTip.s:before, #powerTip.se:before, #powerTip.sw:before {
-	border-bottom-color: #808080;
+	border-bottom-color: gray;
 	border-width: 11px;
 	margin: 0px -11px;
 }
@@ -1675,13 +1731,13 @@ tr.heading h2 {
 	left: 100%;
 }
 #powerTip.e:after {
-	border-left-color: #FFFFFF;
+	border-left-color: gray;
 	border-width: 10px;
 	top: 50%;
 	margin-top: -10px;
 }
 #powerTip.e:before {
-	border-left-color: #808080;
+	border-left-color: gray;
 	border-width: 11px;
 	top: 50%;
 	margin-top: -11px;
@@ -1691,13 +1747,13 @@ tr.heading h2 {
 	right: 100%;
 }
 #powerTip.w:after {
-	border-right-color: #FFFFFF;
+	border-right-color: gray;
 	border-width: 10px;
 	top: 50%;
 	margin-top: -10px;
 }
 #powerTip.w:before {
-	border-right-color: #808080;
+	border-right-color: gray;
 	border-width: 11px;
 	top: 50%;
 	margin-top: -11px;
@@ -1758,36 +1814,37 @@ th.markdownTableHeadCenter, td.markdownTableBodyCenter {
 	text-align: center
 }
 
-.DocNodeRTL {
-  text-align: right;
-  direction: rtl;
+tt, code, kbd
+{
+  display: inline-block;
+}
+tt, code, kbd
+{
+  vertical-align: top;
 }
+/* @end */
 
-.DocNodeLTR {
-  text-align: left;
-  direction: ltr;
+u {
+	text-decoration: underline;
 }
 
-table.DocNodeRTL {
-   width: auto;
-   margin-right: 0;
-   margin-left: auto;
+details>summary {
+  list-style-type: none;
 }
 
-table.DocNodeLTR {
-   width: auto;
-   margin-right: auto;
-   margin-left: 0;
+details > summary::-webkit-details-marker {
+    display: none;
 }
 
-tt, code, kbd, samp
-{
-  display: inline-block;
-  direction:ltr; 
+details>summary::before {
+    content: "\25ba";
+    padding-right:4px;
+    font-size: 80%;
 }
-/* @end */
 
-u {
-	text-decoration: underline;
+details[open]>summary::before {
+    content: "\25bc";
+    padding-right:4px;
+    font-size: 80%;
 }
 
diff --git a/depends/mimalloc/docs/doxygen.svg b/depends/mimalloc/docs/doxygen.svg
new file mode 100644
index 000000000000..aeb5facb8198
--- /dev/null
+++ b/depends/mimalloc/docs/doxygen.svg
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN"
+ "https://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" viewBox="0 0 104 31" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+ <defs>
+  <linearGradient id="a">
+   <stop stop-color="#212425" offset="0"/>
+   <stop stop-color="#3D4243" offset="1"/>
+  </linearGradient>
+  <linearGradient id="d" x1="31.474" x2="31.474" y1="24.821" y2="26.773" gradientUnits="userSpaceOnUse" xlink:href="#a"/>
+  <linearGradient id="c" x1="31.474" x2="31.474" y1="24.821" y2="26.773" gradientTransform="matrix(.6816 0 0 1.0248 72.391 -.91809)" gradientUnits="userSpaceOnUse" xlink:href="#a"/>
+  <linearGradient id="b" x1="56.295" x2="56.295" y1="24.622" y2="26.574" gradientUnits="userSpaceOnUse" xlink:href="#a"/>
+  <linearGradient id="e" x1="49.067" x2="48.956" y1="19.719" y2="9.5227" gradientTransform="matrix(.97968 0 0 1.0207 -.25579 -.25579)" gradientUnits="userSpaceOnUse">
+   <stop stop-color="#899293" offset="0"/>
+   <stop stop-color="#DADDDE" offset="1"/>
+  </linearGradient>
+  <filter id="f" x="-.010676" y="-.045304" width="1.0214" height="1.0906" color-interpolation-filters="sRGB">
+   <feGaussianBlur stdDeviation="0.45293203"/>
+  </filter>
+ </defs>
+ <g>
+  <path transform="translate(-2.5759 -27.848)" d="m13.609 32.203v6.8633h-0.05078c-0.40533-0.66867-0.96254-1.1715-1.6719-1.5059-0.69244-0.35193-1.4282-0.52734-2.2051-0.52734-0.96267 0-1.807 0.2027-2.5332 0.60742-0.72622 0.38713-1.3344 0.90556-1.8242 1.5566-0.47289 0.65108-0.83456 1.4092-1.0879 2.2715-0.23644 0.84464-0.35547 1.7236-0.35547 2.6387 0 0.95022 0.11902 1.8643 0.35547 2.7441 0.25333 0.87983 0.615 1.6633 1.0879 2.3496 0.48978 0.66867 1.1065 1.2066 1.8496 1.6113 0.74311 0.38713 1.6044 0.58008 2.584 0.58008 0.86133 0 1.6311-0.15787 2.3066-0.47461 0.69244-0.33434 1.2497-0.87227 1.6719-1.6113h0.05078v1.7422h3.4199v-18.846zm12.875 4.8301c-1.0302 0-1.9596 0.17541-2.7871 0.52734-0.82756 0.33434-1.5358 0.81965-2.127 1.4531-0.59111 0.61588-1.0483 1.3721-1.3691 2.2695-0.32089 0.87983-0.48047 1.866-0.48047 2.957s0.15958 2.0752 0.48047 2.9551c0.32089 0.87983 0.77803 1.6361 1.3691 2.2695 0.59111 0.61588 1.2994 1.0914 2.127 1.4258 0.82756 0.33434 1.7569 0.50195 2.7871 0.50195 1.0302 0 1.9596-0.16762 2.7871-0.50195 0.84444-0.33434 1.5612-0.8099 2.1523-1.4258 0.59111-0.63348 1.0483-1.3897 1.3691-2.2695 0.32089-0.87983 0.48047-1.8641 0.48047-2.9551s-0.15958-2.0772-0.48047-2.957c-0.32089-0.89743-0.77803-1.6536-1.3691-2.2695-0.59111-0.63348-1.3079-1.1188-2.1523-1.4531-0.82756-0.35193-1.7569-0.52734-2.7871-0.52734zm41.715 0c-0.912 0-1.7223 0.18516-2.4316 0.55469-0.69244 0.36953-1.2752 0.87043-1.748 1.5039-0.47289 0.61588-0.83651 1.337-1.0898 2.1641-0.23645 0.80944-0.35352 1.6553-0.35352 2.5352 0 0.93262 0.10007 1.8214 0.30273 2.666 0.21956 0.82704 0.55767 1.556 1.0137 2.1895 0.456 0.61588 1.0387 1.109 1.748 1.4785 0.70933 0.35193 1.5536 0.5293 2.5332 0.5293 0.79378 0 1.5446-0.16762 2.2539-0.50195 0.72622-0.35193 1.2834-0.88986 1.6719-1.6113h0.05078v1.7949c0.01689 0.96782-0.21071 1.7689-0.68359 2.4023-0.456 0.63348-1.1898 0.95117-2.2031 0.95117-0.64178 0-1.2075-0.14228-1.6973-0.42383-0.48978-0.26395-0.81939-0.74731-0.98828-1.4512h-3.5723c0.05067 0.77425 0.25276 1.435 0.60742 1.9805 0.37156 0.56309 0.8287 1.0192 1.3691 1.3711 0.55733 0.35193 1.1656 0.60726 1.8242 0.76562 0.67556 0.17597 1.3328 0.26562 1.9746 0.26562 1.5031 0 2.7025-0.21245 3.5977-0.63477 0.89511-0.42232 1.5798-0.94076 2.0527-1.5566 0.47289-0.59829 0.777-1.2493 0.91211-1.9531 0.152-0.70386 0.22656-1.3295 0.22656-1.875v-12.775h-3.4199v1.8223h-0.05078c-0.43911-0.79185-0.98782-1.3551-1.6465-1.6895-0.64178-0.33434-1.3926-0.50195-2.2539-0.50195zm16.523 0c-0.99644 0-1.9088 0.18516-2.7363 0.55469-0.81067 0.36953-1.5124 0.88018-2.1035 1.5312-0.59111 0.63348-1.0463 1.3897-1.3672 2.2695s-0.48047 1.831-0.48047 2.8516c0 1.0558 0.15108 2.0225 0.45508 2.9023 0.32089 0.87983 0.76758 1.6361 1.3418 2.2695 0.57422 0.63348 1.276 1.1266 2.1035 1.4785 0.82756 0.33434 1.7569 0.50195 2.7871 0.50195 1.4862 0 2.7517-0.35277 3.7988-1.0566 1.0471-0.70387 1.8254-1.8733 2.332-3.5098h-3.168c-0.11822 0.42232-0.43934 0.82772-0.96289 1.2148-0.52355 0.36953-1.1468 0.55274-1.873 0.55273-1.0133 0-1.7916-0.27286-2.332-0.81836-0.54044-0.5455-0.83605-1.4245-0.88672-2.6387h9.4492c0.06756-1.0558-0.01551-2.0673-0.25195-3.0352-0.23644-0.96782-0.62557-1.8293-1.166-2.5859-0.52356-0.75666-1.1998-1.355-2.0273-1.7949-0.82756-0.45751-1.7974-0.6875-2.9121-0.6875zm16.189 0c-0.76 0-1.5023 0.18516-2.2285 0.55469-0.72622 0.35193-1.3174 0.92299-1.7734 1.7148h-0.07617v-1.9004h-3.4199v13.646h3.5977v-7.1523c0-1.3901 0.21909-2.3841 0.6582-2.9824 0.43911-0.61588 1.1494-0.92383 2.1289-0.92383 0.86133 0 1.4611 0.28066 1.7988 0.84375 0.33777 0.5455 0.50586 1.3816 0.50586 2.5078v7.707h3.5976v-8.3926c0-0.84464-0.0765-1.6106-0.22851-2.2969-0.13511-0.70387-0.37971-1.2925-0.73438-1.7676-0.35466-0.49271-0.84386-0.87277-1.4688-1.1367-0.608-0.28155-1.3948-0.42188-2.3574-0.42188zm-66.063 0.36914 4.3066 6.4668-4.7129 7.1797h4.0293l2.7363-4.3027 2.7344 4.3027h4.1055l-4.8398-7.2578 4.3066-6.3887h-3.9766l-2.2793 3.5645-2.3066-3.5645zm13.275 0 4.584 12.803c0.10133 0.26395 0.15234 0.54461 0.15234 0.84375 0 0.40472-0.11707 0.77504-0.35352 1.1094-0.21956 0.33434-0.56617 0.52729-1.0391 0.58008-0.35467 0.0176-0.70979 0.0098-1.0645-0.02539-0.35467-0.03519-0.70128-0.07028-1.0391-0.10547v3.0879c0.37156 0.03519 0.73518 0.06051 1.0898 0.07813 0.37156 0.03519 0.74368 0.05273 1.1152 0.05273 1.2329 0 2.1943-0.23778 2.8867-0.71289 0.69244-0.47511 1.2326-1.2664 1.6211-2.375l5.4727-15.336h-3.7246l-2.8613 9.3438h-0.05078l-2.9648-9.3438zm-37.48 2.4551c0.59111 0 1.0823 0.12279 1.4707 0.36914 0.38844 0.24635 0.6991 0.57184 0.93555 0.97656 0.25333 0.38713 0.43187 0.84515 0.5332 1.373 0.10133 0.5103 0.15234 1.0482 0.15234 1.6113 0 0.56309-0.05101 1.1069-0.15234 1.6348-0.10133 0.5279-0.27137 1.0035-0.50781 1.4258-0.23644 0.40472-0.5556 0.73021-0.96094 0.97656-0.38844 0.24635-0.87959 0.36914-1.4707 0.36914-0.55733 0-1.038-0.12279-1.4434-0.36914-0.38844-0.26395-0.71806-0.59723-0.98828-1.002-0.25333-0.42232-0.43842-0.89788-0.55664-1.4258s-0.17773-1.0561-0.17773-1.584c-1e-7 -0.56309 0.05101-1.0991 0.15234-1.6094 0.11822-0.5279 0.29481-0.99567 0.53125-1.4004 0.25333-0.40472 0.58295-0.73021 0.98828-0.97656 0.40533-0.24635 0.90303-0.36914 1.4941-0.36914zm15.84 0c0.608 0 1.1142 0.13253 1.5195 0.39648 0.42222 0.24635 0.75184 0.57184 0.98828 0.97656 0.25333 0.40472 0.42992 0.87054 0.53125 1.3984 0.10133 0.5279 0.15234 1.0658 0.15234 1.6113 0 0.5455-0.05101 1.0815-0.15234 1.6094-0.10134 0.5103-0.27792 0.97612-0.53125 1.3984-0.23644 0.40472-0.56606 0.73021-0.98828 0.97656-0.40533 0.24635-0.91153 0.36914-1.5195 0.36914-0.608 0-1.1142-0.12279-1.5195-0.36914s-0.73495-0.57184-0.98828-0.97656c-0.23644-0.42232-0.40648-0.88814-0.50781-1.3984-0.10133-0.5279-0.15234-1.0639-0.15234-1.6094 0-0.5455 0.05101-1.0834 0.15234-1.6113 0.10133-0.5279 0.27137-0.99371 0.50781-1.3984 0.25333-0.40472 0.58295-0.73021 0.98828-0.97656 0.40533-0.26395 0.91153-0.39648 1.5195-0.39648zm42.602 0c0.59111 0 1.0803 0.11499 1.4688 0.34375 0.38844 0.22876 0.70105 0.5367 0.9375 0.92383 0.23644 0.38713 0.40648 0.8354 0.50781 1.3457 0.10133 0.49271 0.15039 1.0209 0.15039 1.584 0 0.4927-0.06606 0.96827-0.20117 1.4258-0.11822 0.43992-0.30526 0.83557-0.55859 1.1875-0.25333 0.35193-0.57445 0.63259-0.96289 0.84375-0.38844 0.21116-0.83513 0.31836-1.3418 0.31836-0.55733 0-1.021-0.12474-1.3926-0.37109-0.37156-0.24635-0.67566-0.56209-0.91211-0.94922-0.21956-0.38713-0.38109-0.81786-0.48242-1.293-0.08444-0.49271-0.12695-0.98581-0.12695-1.4785 0-0.5103 0.05101-0.99366 0.15234-1.4512 0.11822-0.47511 0.29676-0.89025 0.5332-1.2422 0.25333-0.36953 0.55744-0.65993 0.91211-0.87109 0.37156-0.21116 0.80974-0.31641 1.3164-0.31641zm15.535 0c0.87822 0 1.529 0.24753 1.9512 0.74023 0.43911 0.49271 0.74322 1.2138 0.91211 2.1641h-5.8535c0.01689-0.26395 0.0679-0.5641 0.15234-0.89844 0.10133-0.33434 0.26287-0.65008 0.48242-0.94922 0.23644-0.29914 0.54055-0.54667 0.91211-0.74023 0.38845-0.21116 0.86914-0.31641 1.4434-0.31641z" filter="url(#f)" opacity=".3" stroke="#969696"/>
+  <path d="m0.97202 24.161 43.605-0.0019 0.0508 3.3061-43.6 0.04174z" fill="url(#d)" stroke="#000" stroke-width=".5"/>
+  <path d="m10.283 3.5547v6.8633h-0.05078c-0.40533-0.66867-0.96254-1.1715-1.6719-1.5059-0.69244-0.35193-1.4282-0.52734-2.2051-0.52734-0.96267 0-1.807 0.2027-2.5332 0.60742-0.72622 0.38713-1.3344 0.90556-1.8242 1.5566-0.47289 0.65108-0.83456 1.4092-1.0879 2.2715-0.23644 0.84464-0.35547 1.7236-0.35547 2.6387 0 0.95022 0.11902 1.8643 0.35547 2.7441 0.25333 0.87983 0.615 1.6633 1.0879 2.3496 0.48978 0.66867 1.1065 1.2066 1.8496 1.6113 0.74311 0.38713 1.6044 0.58008 2.584 0.58008 0.86133 0 1.6311-0.15787 2.3066-0.47461 0.69244-0.33434 1.2497-0.87227 1.6719-1.6113h0.05078v1.7422h3.4199v-18.846zm12.875 4.8301c-1.0302 0-1.9596 0.17541-2.7871 0.52734-0.82756 0.33434-1.5358 0.81965-2.127 1.4531-0.59111 0.61588-1.0483 1.3721-1.3691 2.2695-0.32089 0.87983-0.48047 1.866-0.48047 2.957s0.15958 2.0752 0.48047 2.9551c0.32089 0.87983 0.77803 1.6361 1.3691 2.2695 0.59111 0.61588 1.2994 1.0914 2.127 1.4258 0.82756 0.33434 1.7569 0.50195 2.7871 0.50195 1.0302 0 1.9596-0.16762 2.7871-0.50195 0.84444-0.33434 1.5612-0.8099 2.1523-1.4258 0.59111-0.63348 1.0483-1.3897 1.3691-2.2695 0.32089-0.87983 0.48047-1.8641 0.48047-2.9551s-0.15958-2.0772-0.48047-2.957c-0.32089-0.89743-0.77803-1.6536-1.3691-2.2695-0.59111-0.63348-1.3079-1.1188-2.1523-1.4531-0.82756-0.35193-1.7569-0.52734-2.7871-0.52734zm41.715 0c-0.912 0-1.7223 0.18516-2.4316 0.55469-0.69244 0.36953-1.2752 0.87043-1.748 1.5039-0.47289 0.61588-0.83651 1.337-1.0898 2.1641-0.23644 0.80944-0.35352 1.6553-0.35352 2.5352 0 0.93262 0.10007 1.8214 0.30273 2.666 0.21956 0.82704 0.55767 1.556 1.0137 2.1895 0.456 0.61588 1.0387 1.109 1.748 1.4785 0.70933 0.35193 1.5536 0.5293 2.5332 0.5293 0.79378 0 1.5446-0.16762 2.2539-0.50195 0.72622-0.35193 1.2834-0.88986 1.6719-1.6113h0.05078v1.7949c0.01689 0.96782-0.21071 1.7689-0.68359 2.4023-0.456 0.63348-1.1898 0.95117-2.2031 0.95117-0.64178 0-1.2075-0.14228-1.6973-0.42383-0.48978-0.26395-0.81939-0.74731-0.98828-1.4512h-3.5723c0.05067 0.77425 0.25276 1.435 0.60742 1.9805 0.37156 0.56309 0.8287 1.0192 1.3691 1.3711 0.55733 0.35193 1.1656 0.60726 1.8242 0.76562 0.67556 0.17597 1.3328 0.26562 1.9746 0.26562 1.5031 0 2.7025-0.21245 3.5977-0.63477 0.89511-0.42232 1.5798-0.94076 2.0527-1.5566 0.47289-0.59829 0.777-1.2493 0.91211-1.9531 0.152-0.70386 0.22656-1.3295 0.22656-1.875v-12.775h-3.4199v1.8223h-0.05078c-0.43911-0.79185-0.98782-1.3551-1.6465-1.6895-0.64178-0.33434-1.3926-0.50195-2.2539-0.50195zm16.523 0c-0.99644 0-1.9088 0.18516-2.7363 0.55469-0.81067 0.36953-1.5124 0.88017-2.1035 1.5312-0.59111 0.63348-1.0463 1.3897-1.3672 2.2695s-0.48047 1.831-0.48047 2.8516c0 1.0558 0.15108 2.0225 0.45508 2.9023 0.32089 0.87983 0.76758 1.6361 1.3418 2.2695 0.57422 0.63348 1.276 1.1266 2.1035 1.4785 0.82756 0.33434 1.7569 0.50195 2.7871 0.50195 1.4862 0 2.7517-0.35278 3.7988-1.0566 1.0471-0.70386 1.8254-1.8733 2.332-3.5098h-3.168c-0.11822 0.42232-0.43934 0.82772-0.96289 1.2148-0.52355 0.36953-1.1468 0.55274-1.873 0.55273-1.0133 0-1.7916-0.27286-2.332-0.81836-0.54044-0.5455-0.83605-1.4245-0.88672-2.6387h9.4492c0.06756-1.0558-0.01551-2.0673-0.25195-3.0352-0.23644-0.96782-0.62557-1.8293-1.166-2.5859-0.52356-0.75666-1.1998-1.355-2.0273-1.7949-0.82756-0.45751-1.7974-0.6875-2.9121-0.6875zm16.189 0c-0.76 0-1.5023 0.18516-2.2285 0.55469-0.72622 0.35193-1.3174 0.923-1.7734 1.7148h-0.07617v-1.9004h-3.4199v13.646h3.5977v-7.1523c0-1.3901 0.21909-2.3841 0.6582-2.9824 0.43911-0.61588 1.1494-0.92383 2.1289-0.92383 0.86133 0 1.461 0.28066 1.7988 0.84375 0.33778 0.5455 0.50586 1.3816 0.50586 2.5078v7.707h3.5977v-8.3926c0-0.84464-0.0765-1.6106-0.22852-2.2969-0.13511-0.70387-0.3797-1.2925-0.73437-1.7676-0.35466-0.49271-0.84386-0.87277-1.4688-1.1367-0.608-0.28155-1.3948-0.42188-2.3574-0.42188zm-66.062 0.36914 4.3066 6.4668-4.7129 7.1797h4.0293l2.7363-4.3027 2.7344 4.3027h4.1055l-4.8398-7.2578 4.3066-6.3887h-3.9766l-2.2793 3.5645-2.3066-3.5645zm13.275 0 4.584 12.803c0.10133 0.26395 0.15234 0.54461 0.15234 0.84375 0 0.40472-0.11707 0.77504-0.35352 1.1094-0.21956 0.33434-0.56617 0.52729-1.0391 0.58008-0.35467 0.0176-0.70979 0.0098-1.0645-0.02539-0.35467-0.03519-0.70128-0.07027-1.0391-0.10547v3.0879c0.37156 0.03519 0.73518 0.06052 1.0898 0.07813 0.37156 0.03519 0.74368 0.05273 1.1152 0.05273 1.2329 0 2.1943-0.23778 2.8867-0.71289 0.69244-0.47511 1.2326-1.2664 1.6211-2.375l5.4727-15.336h-3.7246l-2.8613 9.3437h-0.05078l-2.9648-9.3437zm-37.48 2.4551c0.59111 0 1.0823 0.12279 1.4707 0.36914s0.6991 0.57184 0.93555 0.97656c0.25333 0.38713 0.43187 0.84515 0.5332 1.373 0.10133 0.5103 0.15234 1.0482 0.15234 1.6113 0 0.56309-0.05101 1.1069-0.15234 1.6348-0.10133 0.5279-0.27137 1.0035-0.50781 1.4258-0.23644 0.40472-0.5556 0.73021-0.96094 0.97656-0.38844 0.24635-0.87959 0.36914-1.4707 0.36914-0.55733 0-1.038-0.12279-1.4434-0.36914-0.38844-0.26395-0.71806-0.59723-0.98828-1.002-0.25333-0.42232-0.43842-0.89788-0.55664-1.4258s-0.17773-1.0561-0.17773-1.584c-1e-7 -0.56309 0.05101-1.0991 0.15234-1.6094 0.11822-0.5279 0.29481-0.99567 0.53125-1.4004 0.25333-0.40472 0.58295-0.73021 0.98828-0.97656 0.40533-0.24635 0.90303-0.36914 1.4941-0.36914zm15.84 0c0.608 0 1.1142 0.13254 1.5195 0.39648 0.42222 0.24635 0.75184 0.57184 0.98828 0.97656 0.25333 0.40472 0.42992 0.87054 0.53125 1.3984 0.10133 0.5279 0.15234 1.0658 0.15234 1.6113 0 0.5455-0.05101 1.0815-0.15234 1.6094-0.10133 0.5103-0.27792 0.97612-0.53125 1.3984-0.23644 0.40472-0.56606 0.73021-0.98828 0.97656-0.40533 0.24635-0.91153 0.36914-1.5195 0.36914-0.608 0-1.1142-0.12279-1.5195-0.36914s-0.73495-0.57184-0.98828-0.97656c-0.23644-0.42232-0.40648-0.88813-0.50781-1.3984-0.10133-0.5279-0.15234-1.0639-0.15234-1.6094 0-0.5455 0.05101-1.0834 0.15234-1.6113 0.10133-0.5279 0.27137-0.99371 0.50781-1.3984 0.25333-0.40472 0.58295-0.73021 0.98828-0.97656 0.40533-0.26395 0.91153-0.39648 1.5195-0.39648zm42.602 0c0.59111 0 1.0803 0.11499 1.4688 0.34375 0.38844 0.22876 0.70106 0.5367 0.9375 0.92383 0.23644 0.38713 0.40648 0.8354 0.50781 1.3457 0.10133 0.49271 0.15039 1.0209 0.15039 1.584 0 0.49271-0.06606 0.96827-0.20117 1.4258-0.11822 0.43992-0.30526 0.83557-0.55859 1.1875-0.25333 0.35193-0.57445 0.63259-0.96289 0.84375-0.38844 0.21116-0.83513 0.31836-1.3418 0.31836-0.55733 0-1.021-0.12474-1.3926-0.37109-0.37156-0.24635-0.67566-0.56209-0.91211-0.94922-0.21956-0.38713-0.38109-0.81786-0.48242-1.293-0.08444-0.49271-0.12695-0.98581-0.12695-1.4785 0-0.5103 0.05101-0.99366 0.15234-1.4512 0.11822-0.47511 0.29676-0.89026 0.5332-1.2422 0.25333-0.36953 0.55744-0.65993 0.91211-0.87109 0.37156-0.21116 0.80974-0.31641 1.3164-0.31641zm15.535 0c0.87822 0 1.529 0.24753 1.9512 0.74024 0.43911 0.49271 0.74322 1.2138 0.91211 2.1641h-5.8535c0.01689-0.26395 0.0679-0.5641 0.15234-0.89844 0.10133-0.33434 0.26287-0.65008 0.48242-0.94922 0.23644-0.29914 0.54055-0.54667 0.91211-0.74023 0.38845-0.21116 0.86914-0.31641 1.4434-0.31641z" fill="url(#e)" stroke="#171919" stroke-width=".7"/>
+  <path d="m52.988 27.291c0.99602-1.0359 1.3944-1.8725 1.7928-3.1076l3.8247-0.03984c0.3113 1.6096 0.82413 2.5137 1.6335 3.1474z" fill="url(#b)" stroke="#000" stroke-width=".5"/>
+  <path d="m73.89 24.04 28.885-0.2011-0.12476 3.3879-31.033 0.16229c1.2621-1.0234 1.9665-2.2859 2.2724-3.3491z" fill="url(#c)" stroke="#000" stroke-width=".41788"/>
+ </g>
+</svg>
diff --git a/depends/mimalloc/docs/dynsections.js b/depends/mimalloc/docs/dynsections.js
index 3174bd7bebbf..3cc426a65adc 100644
--- a/depends/mimalloc/docs/dynsections.js
+++ b/depends/mimalloc/docs/dynsections.js
@@ -22,100 +22,177 @@
 
  @licend  The above is the entire license notice for the JavaScript code in this file
  */
-function toggleVisibility(linkObj)
-{
- var base = $(linkObj).attr('id');
- var summary = $('#'+base+'-summary');
- var content = $('#'+base+'-content');
- var trigger = $('#'+base+'-trigger');
- var src=$(trigger).attr('src');
- if (content.is(':visible')===true) {
-   content.hide();
-   summary.show();
-   $(linkObj).addClass('closed').removeClass('opened');
-   $(trigger).attr('src',src.substring(0,src.length-8)+'closed.png');
- } else {
-   content.show();
-   summary.hide();
-   $(linkObj).removeClass('closed').addClass('opened');
-   $(trigger).attr('src',src.substring(0,src.length-10)+'open.png');
- }
- return false;
-}
 
-function updateStripes()
-{
-  $('table.directory tr').
-       removeClass('even').filter(':visible:even').addClass('even');
+function toggleVisibility(linkObj) {
+  return dynsection.toggleVisibility(linkObj);
 }
 
-function toggleLevel(level)
-{
-  $('table.directory tr').each(function() {
-    var l = this.id.split('_').length-1;
-    var i = $('#img'+this.id.substring(3));
-    var a = $('#arr'+this.id.substring(3));
-    if (l<level+1) {
-      i.removeClass('iconfopen iconfclosed').addClass('iconfopen');
-      a.html('&#9660;');
-      $(this).show();
-    } else if (l==level+1) {
-      i.removeClass('iconfclosed iconfopen').addClass('iconfclosed');
-      a.html('&#9658;');
-      $(this).show();
+let dynsection = {
+
+  // helper function
+  updateStripes : function() {
+    $('table.directory tr').
+      removeClass('even').filter(':visible:even').addClass('even');
+    $('table.directory tr').
+      removeClass('odd').filter(':visible:odd').addClass('odd');
+  },
+
+  toggleVisibility : function(linkObj) {
+    const base = $(linkObj).attr('id');
+    const summary = $('#'+base+'-summary');
+    const content = $('#'+base+'-content');
+    const trigger = $('#'+base+'-trigger');
+    const src=$(trigger).attr('src');
+    if (content.is(':visible')===true) {
+      content.hide();
+      summary.show();
+      $(linkObj).addClass('closed').removeClass('opened');
+      $(trigger).attr('src',src.substring(0,src.length-8)+'closed.png');
     } else {
-      $(this).hide();
+      content.show();
+      summary.hide();
+      $(linkObj).removeClass('closed').addClass('opened');
+      $(trigger).attr('src',src.substring(0,src.length-10)+'open.png');
     }
-  });
-  updateStripes();
-}
+    return false;
+  },
 
-function toggleFolder(id)
-{
-  // the clicked row
-  var currentRow = $('#row_'+id);
-
-  // all rows after the clicked row
-  var rows = currentRow.nextAll("tr");
-
-  var re = new RegExp('^row_'+id+'\\d+_$', "i"); //only one sub
-
-  // only match elements AFTER this one (can't hide elements before)
-  var childRows = rows.filter(function() { return this.id.match(re); });
-
-  // first row is visible we are HIDING
-  if (childRows.filter(':first').is(':visible')===true) {
-    // replace down arrow by right arrow for current row
-    var currentRowSpans = currentRow.find("span");
-    currentRowSpans.filter(".iconfopen").removeClass("iconfopen").addClass("iconfclosed");
-    currentRowSpans.filter(".arrow").html('&#9658;');
-    rows.filter("[id^=row_"+id+"]").hide(); // hide all children
-  } else { // we are SHOWING
-    // replace right arrow by down arrow for current row
-    var currentRowSpans = currentRow.find("span");
-    currentRowSpans.filter(".iconfclosed").removeClass("iconfclosed").addClass("iconfopen");
-    currentRowSpans.filter(".arrow").html('&#9660;');
-    // replace down arrows by right arrows for child rows
-    var childRowsSpans = childRows.find("span");
-    childRowsSpans.filter(".iconfopen").removeClass("iconfopen").addClass("iconfclosed");
-    childRowsSpans.filter(".arrow").html('&#9658;');
-    childRows.show(); //show all children
-  }
-  updateStripes();
-}
+  toggleLevel : function(level) {
+    $('table.directory tr').each(function() {
+      const l = this.id.split('_').length-1;
+      const i = $('#img'+this.id.substring(3));
+      const a = $('#arr'+this.id.substring(3));
+      if (l<level+1) {
+        i.removeClass('iconfopen iconfclosed').addClass('iconfopen');
+        a.html('&#9660;');
+        $(this).show();
+      } else if (l==level+1) {
+        i.removeClass('iconfclosed iconfopen').addClass('iconfclosed');
+        a.html('&#9658;');
+        $(this).show();
+      } else {
+        $(this).hide();
+      }
+    });
+    this.updateStripes();
+  },
 
+  toggleFolder : function(id) {
+    // the clicked row
+    const currentRow = $('#row_'+id);
 
-function toggleInherit(id)
-{
-  var rows = $('tr.inherit.'+id);
-  var img = $('tr.inherit_header.'+id+' img');
-  var src = $(img).attr('src');
-  if (rows.filter(':first').is(':visible')===true) {
-    rows.css('display','none');
-    $(img).attr('src',src.substring(0,src.length-8)+'closed.png');
-  } else {
-    rows.css('display','table-row'); // using show() causes jump in firefox
-    $(img).attr('src',src.substring(0,src.length-10)+'open.png');
-  }
-}
+    // all rows after the clicked row
+    const rows = currentRow.nextAll("tr");
+
+    const re = new RegExp('^row_'+id+'\\d+_$', "i"); //only one sub
+
+    // only match elements AFTER this one (can't hide elements before)
+    const childRows = rows.filter(function() { return this.id.match(re); });
+
+    // first row is visible we are HIDING
+    if (childRows.filter(':first').is(':visible')===true) {
+      // replace down arrow by right arrow for current row
+      const currentRowSpans = currentRow.find("span");
+      currentRowSpans.filter(".iconfopen").removeClass("iconfopen").addClass("iconfclosed");
+      currentRowSpans.filter(".arrow").html('&#9658;');
+      rows.filter("[id^=row_"+id+"]").hide(); // hide all children
+    } else { // we are SHOWING
+      // replace right arrow by down arrow for current row
+      const currentRowSpans = currentRow.find("span");
+      currentRowSpans.filter(".iconfclosed").removeClass("iconfclosed").addClass("iconfopen");
+      currentRowSpans.filter(".arrow").html('&#9660;');
+      // replace down arrows by right arrows for child rows
+      const childRowsSpans = childRows.find("span");
+      childRowsSpans.filter(".iconfopen").removeClass("iconfopen").addClass("iconfclosed");
+      childRowsSpans.filter(".arrow").html('&#9658;');
+      childRows.show(); //show all children
+    }
+    this.updateStripes();
+  },
+
+  toggleInherit : function(id) {
+    const rows = $('tr.inherit.'+id);
+    const img = $('tr.inherit_header.'+id+' img');
+    const src = $(img).attr('src');
+    if (rows.filter(':first').is(':visible')===true) {
+      rows.css('display','none');
+      $(img).attr('src',src.substring(0,src.length-8)+'closed.png');
+    } else {
+      rows.css('display','table-row'); // using show() causes jump in firefox
+      $(img).attr('src',src.substring(0,src.length-10)+'open.png');
+    }
+  },
+};
+
+let codefold = {
+  opened : true,
+
+  // in case HTML_COLORSTYLE is LIGHT or DARK the vars will be replaced, so we write them out explicitly and use double quotes
+  plusImg:  [ "url('plus.svg')",  "url('../../plus.svg')" ],
+  minusImg: [ "url('minus.svg')", "url('../../minus.svg')" ],
+
+  // toggle all folding blocks
+  toggle_all : function(relPath) {
+    if (this.opened) {
+      $('#fold_all').css('background-image',this.plusImg[relPath]);
+      $('div[id^=foldopen]').hide();
+      $('div[id^=foldclosed]').show();
+    } else {
+      $('#fold_all').css('background-image',this.minusImg[relPath]);
+      $('div[id^=foldopen]').show();
+      $('div[id^=foldclosed]').hide();
+    }
+    this.opened=!this.opened;
+  },
+
+  // toggle single folding block
+  toggle : function(id) {
+    $('#foldopen'+id).toggle();
+    $('#foldclosed'+id).toggle();
+  },
+
+  init : function(relPath) {
+    $('span[class=lineno]').css({
+      'padding-right':'4px',
+      'margin-right':'2px',
+      'display':'inline-block',
+      'width':'54px',
+      'background':'linear-gradient(#808080,#808080) no-repeat 46px/2px 100%'
+    });
+    // add global toggle to first line
+    $('span[class=lineno]:first').append('<span class="fold" id="fold_all" '+
+      'onclick="javascript:codefold.toggle_all('+relPath+');" '+
+      'style="background-image:'+this.minusImg[relPath]+';"></span>');
+    // add vertical lines to other rows
+    $('span[class=lineno]').not(':eq(0)').append('<span class="fold"></span>');
+    // add toggle controls to lines with fold divs
+    $('div[class=foldopen]').each(function() {
+      // extract specific id to use
+      const id    = $(this).attr('id').replace('foldopen','');
+      // extract start and end foldable fragment attributes
+      const start = $(this).attr('data-start');
+      const end   = $(this).attr('data-end');
+      // replace normal fold span with controls for the first line of a foldable fragment
+      $(this).find('span[class=fold]:first').replaceWith('<span class="fold" '+
+                   'onclick="javascript:codefold.toggle(\''+id+'\');" '+
+                   'style="background-image:'+codefold.minusImg[relPath]+';"></span>');
+      // append div for folded (closed) representation
+      $(this).after('<div id="foldclosed'+id+'" class="foldclosed" style="display:none;"></div>');
+      // extract the first line from the "open" section to represent closed content
+      const line = $(this).children().first().clone();
+      // remove any glow that might still be active on the original line
+      $(line).removeClass('glow');
+      if (start) {
+        // if line already ends with a start marker (e.g. trailing {), remove it
+        $(line).html($(line).html().replace(new RegExp('\\s*'+start+'\\s*$','g'),''));
+      }
+      // replace minus with plus symbol
+      $(line).find('span[class=fold]').css('background-image',codefold.plusImg[relPath]);
+      // append ellipsis
+      $(line).append(' '+start+'<a href="javascript:codefold.toggle(\''+id+'\')">&#8230;</a>'+end);
+      // insert constructed line into closed div
+      $('#foldclosed'+id).html(line);
+    });
+  },
+};
 /* @license-end */
diff --git a/depends/mimalloc/docs/environment.html b/depends/mimalloc/docs/environment.html
index f571f95f8052..7da7c3053199 100644
--- a/depends/mimalloc/docs/environment.html
+++ b/depends/mimalloc/docs/environment.html
@@ -1,24 +1,26 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "https://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
+<html xmlns="http://www.w3.org/1999/xhtml" lang="en-US">
 <head>
 <meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
-<meta http-equiv="X-UA-Compatible" content="IE=9"/>
-<meta name="generator" content="Doxygen 1.9.1"/>
+<meta http-equiv="X-UA-Compatible" content="IE=11"/>
+<meta name="generator" content="Doxygen 1.13.1"/>
 <meta name="viewport" content="width=device-width, initial-scale=1"/>
 <title>mi-malloc: Environment Options</title>
 <link href="tabs.css" rel="stylesheet" type="text/css"/>
 <script type="text/javascript" src="jquery.js"></script>
 <script type="text/javascript" src="dynsections.js"></script>
+<script type="text/javascript" src="clipboard.js"></script>
 <link href="navtree.css" rel="stylesheet" type="text/css"/>
-<script type="text/javascript" src="resize.js"></script>
 <script type="text/javascript" src="navtreedata.js"></script>
 <script type="text/javascript" src="navtree.js"></script>
+<script type="text/javascript" src="resize.js"></script>
+<script type="text/javascript" src="cookie.js"></script>
 <link href="search/search.css" rel="stylesheet" type="text/css"/>
 <script type="text/javascript" src="search/searchdata.js"></script>
 <script type="text/javascript" src="search/search.js"></script>
 <script type="text/javascript">
-/* @license magnet:?xt=urn:btih:cf05388f2679ee054f2beb29a391d25f4e673ac3&amp;dn=gpl-2.0.txt GPL-v2 */
-  $(document).ready(function() { init_search(); });
+/* @license magnet:?xt=urn:btih:d3d9a9a6595521f9666a5e94cc830dab83b65699&amp;dn=expat.txt MIT */
+  $(function() { init_search(); });
 /* @license-end */
 </script>
 <link href="doxygen.css" rel="stylesheet" type="text/css" />
@@ -29,20 +31,16 @@
 <div id="titlearea">
 <table cellspacing="0" cellpadding="0">
  <tbody>
- <tr style="height: 56px;">
+ <tr id="projectrow">
   <td id="projectlogo"><img alt="Logo" src="mimalloc-logo.svg"/></td>
-  <td id="projectalign" style="padding-left: 0.5em;">
-   <div id="projectname">mi-malloc
-   &#160;<span id="projectnumber">1.7/2.0</span>
+  <td id="projectalign">
+   <div id="projectname">mi-malloc<span id="projectnumber">&#160;1.8/2.1</span>
    </div>
   </td>
-   <td>        <div id="MSearchBox" class="MSearchBoxInactive">
+    <td>        <div id="MSearchBox" class="MSearchBoxInactive">
         <span class="left">
-          <img id="MSearchSelect" src="search/mag_sel.svg"
-               onmouseover="return searchBox.OnSearchSelectShow()"
-               onmouseout="return searchBox.OnSearchSelectHide()"
-               alt=""/>
-          <input type="text" id="MSearchField" value="Search" accesskey="S"
+          <span id="MSearchSelect"                onmouseover="return searchBox.OnSearchSelectShow()"                onmouseout="return searchBox.OnSearchSelectHide()">&#160;</span>
+          <input type="text" id="MSearchField" value="" placeholder="Search" accesskey="S"
                onfocus="searchBox.OnSearchFieldFocus(true)" 
                onblur="searchBox.OnSearchFieldFocus(false)" 
                onkeyup="searchBox.OnSearchFieldChange(event)"/>
@@ -56,10 +54,15 @@
 </table>
 </div>
 <!-- end header part -->
-<!-- Generated by Doxygen 1.9.1 -->
+<!-- Generated by Doxygen 1.13.1 -->
+<script type="text/javascript">
+/* @license magnet:?xt=urn:btih:d3d9a9a6595521f9666a5e94cc830dab83b65699&amp;dn=expat.txt MIT */
+var searchBox = new SearchBox("searchBox", "search/",'.html');
+/* @license-end */
+</script>
 <script type="text/javascript">
-/* @license magnet:?xt=urn:btih:cf05388f2679ee054f2beb29a391d25f4e673ac3&amp;dn=gpl-2.0.txt GPL-v2 */
-var searchBox = new SearchBox("searchBox", "search",false,'Search','.html');
+/* @license magnet:?xt=urn:btih:d3d9a9a6595521f9666a5e94cc830dab83b65699&amp;dn=expat.txt MIT */
+$(function() { codefold.init(0); });
 /* @license-end */
 </script>
 </div><!-- top -->
@@ -74,8 +77,8 @@
   </div>
 </div>
 <script type="text/javascript">
-/* @license magnet:?xt=urn:btih:cf05388f2679ee054f2beb29a391d25f4e673ac3&amp;dn=gpl-2.0.txt GPL-v2 */
-$(document).ready(function(){initNavTree('environment.html',''); initResizable(); });
+/* @license magnet:?xt=urn:btih:d3d9a9a6595521f9666a5e94cc830dab83b65699&amp;dn=expat.txt MIT */
+$(function(){initNavTree('environment.html',''); initResizable(true); });
 /* @license-end */
 </script>
 <div id="doc-content">
@@ -88,34 +91,48 @@
 
 <!-- iframe showing the search results (closed by default) -->
 <div id="MSearchResultsWindow">
-<iframe src="javascript:void(0)" frameborder="0" 
-        name="MSearchResults" id="MSearchResults">
-</iframe>
+<div id="MSearchResults">
+<div class="SRPage">
+<div id="SRIndex">
+<div id="SRResults"></div>
+<div class="SRStatus" id="Loading">Loading...</div>
+<div class="SRStatus" id="Searching">Searching...</div>
+<div class="SRStatus" id="NoMatches">No Matches</div>
+</div>
+</div>
+</div>
 </div>
 
-<div class="PageDoc"><div class="header">
-  <div class="headertitle">
-<div class="title">Environment Options </div>  </div>
+<div><div class="header">
+  <div class="headertitle"><div class="title">Environment Options</div></div>
 </div><!--header-->
 <div class="contents">
-<div class="textblock"><p>You can set further options either programmatically (using <a href="https://microsoft.github.io/mimalloc/group__options.html"><code>mi_option_set</code></a>), or via environment variables.</p>
+<div class="textblock"><p>You can set further options either programmatically (using <a href="https://microsoft.github.io/mimalloc/group__options.html"><code>mi_option_set</code></a>), or via environment variables:</p>
 <ul>
 <li><code>MIMALLOC_SHOW_STATS=1</code>: show statistics when the program terminates.</li>
 <li><code>MIMALLOC_VERBOSE=1</code>: show verbose messages.</li>
 <li><code>MIMALLOC_SHOW_ERRORS=1</code>: show error and warning messages.</li>
-<li><code>MIMALLOC_PAGE_RESET=0</code>: by default, mimalloc will reset (or purge) OS pages when not in use to signal to the OS that the underlying physical memory can be reused. This can reduce memory fragmentation in long running (server) programs. By setting it to <code>0</code> no such page resets will be done which can improve performance for programs that are not long running. As an alternative, the <code>MIMALLOC_RESET_DELAY=</code>&lt;msecs&gt; can be set higher (100ms by default) to make the page reset occur less frequently instead of turning it off completely.</li>
-<li><code>MIMALLOC_LARGE_OS_PAGES=1</code>: use large OS pages (2MiB) when available; for some workloads this can significantly improve performance. Use <code>MIMALLOC_VERBOSE</code> to check if the large OS pages are enabled &ndash; usually one needs to explicitly allow large OS pages (as on <a href="https://docs.microsoft.com/en-us/sql/database-engine/configure-windows/enable-the-lock-pages-in-memory-option-windows?view=sql-server-2017">Windows</a> and <a href="https://access.redhat.com/documentation/en-us/red_hat_enterprise_linux/5/html/tuning_and_optimizing_red_hat_enterprise_linux_for_oracle_9i_and_10g_databases/sect-oracle_9i_and_10g_tuning_guide-large_memory_optimization_big_pages_and_huge_pages-configuring_huge_pages_in_red_hat_enterprise_linux_4_or_5">Linux</a>). However, sometimes the OS is very slow to reserve contiguous physical memory for large OS pages so use with care on systems that can have fragmented memory (for that reason, we generally recommend to use <code>MIMALLOC_RESERVE_HUGE_OS_PAGES</code> instead when possible).</li>
-<li><code>MIMALLOC_RESERVE_HUGE_OS_PAGES=N</code>: where N is the number of 1GiB <em>huge</em> OS pages. This reserves the huge pages at startup and sometimes this can give a large (latency) performance improvement on big workloads. Usually it is better to not use <code>MIMALLOC_LARGE_OS_PAGES</code> in combination with this setting. Just like large OS pages, use with care as reserving contiguous physical memory can take a long time when memory is fragmented (but reserving the huge pages is done at startup only once). Note that we usually need to explicitly enable huge OS pages (as on <a href="https://docs.microsoft.com/en-us/sql/database-engine/configure-windows/enable-the-lock-pages-in-memory-option-windows?view=sql-server-2017">Windows</a> and <a href="https://access.redhat.com/documentation/en-us/red_hat_enterprise_linux/5/html/tuning_and_optimizing_red_hat_enterprise_linux_for_oracle_9i_and_10g_databases/sect-oracle_9i_and_10g_tuning_guide-large_memory_optimization_big_pages_and_huge_pages-configuring_huge_pages_in_red_hat_enterprise_linux_4_or_5">Linux</a>)). With huge OS pages, it may be beneficial to set the setting <code>MIMALLOC_EAGER_COMMIT_DELAY=N</code> (<code>N</code> is 1 by default) to delay the initial <code>N</code> segments (of 4MiB) of a thread to not allocate in the huge OS pages; this prevents threads that are short lived and allocate just a little to take up space in the huge OS page area (which cannot be reset).</li>
-<li><code>MIMALLOC_RESERVE_HUGE_OS_PAGES_AT=N</code>: where N is the numa node. This reserves the huge pages at a specific numa node. (<code>N</code> is -1 by default to reserve huge pages evenly among the given number of numa nodes (or use the available ones as detected))</li>
 </ul>
-<p>Use caution when using <code>fork</code> in combination with either large or huge OS pages: on a fork, the OS uses copy-on-write for all pages in the original process including the huge OS pages. When any memory is now written in that area, the OS will copy the entire 1GiB huge page (or 2MiB large page) which can cause the memory usage to grow in big increments. </p>
+<p>Advanced options:</p>
+<ul>
+<li><code>MIMALLOC_ARENA_EAGER_COMMIT=2</code>: turns on eager commit for the large arenas (usually 1GiB) from which mimalloc allocates segments and pages. Set this to 2 (default) to only enable this on overcommit systems (e.g. Linux). Set this to 1 to enable explicitly on other systems as well (like Windows or macOS) which may improve performance (as the whole arena is committed at once). Note that eager commit only increases the commit but not the actual the peak resident set (rss) so it is generally ok to enable this.</li>
+<li><code>MIMALLOC_PURGE_DELAY=N</code>: the delay in <code>N</code> milli-seconds (by default <code>10</code>) after which mimalloc will purge OS pages that are not in use. This signals to the OS that the underlying physical memory can be reused which can reduce memory fragmentation especially in long running (server) programs. Setting <code>N</code> to <code>0</code> purges immediately when a page becomes unused which can improve memory usage but also decreases performance. Setting <code>N</code> to a higher value like <code>100</code> can improve performance (sometimes by a lot) at the cost of potentially using more memory at times. Setting it to <code>-1</code> disables purging completely.</li>
+<li><code>MIMALLOC_PURGE_DECOMMITS=1</code>: By default "purging" memory means unused memory is decommitted (<code>MEM_DECOMMIT</code> on Windows, <code>MADV_DONTNEED</code> (which decresease rss immediately) on <code>mmap</code> systems). Set this to 0 to instead "reset" unused memory on a purge (<code>MEM_RESET</code> on Windows, generally <code>MADV_FREE</code> (which does not decrease rss immediately) on <code>mmap</code> systems). Mimalloc generally does not "free" OS memory but only "purges" OS memory, in other words, it tries to keep virtual address ranges and decommits within those ranges (to make the underlying physical memory available to other processes).</li>
+</ul>
+<p>Further options for large workloads and services:</p>
+<ul>
+<li><code>MIMALLOC_USE_NUMA_NODES=N</code>: pretend there are at most <code>N</code> NUMA nodes. If not set, the actual NUMA nodes are detected at runtime. Setting <code>N</code> to 1 may avoid problems in some virtual environments. Also, setting it to a lower number than the actual NUMA nodes is fine and will only cause threads to potentially allocate more memory across actual NUMA nodes (but this can happen in any case as NUMA local allocation is always a best effort but not guaranteed).</li>
+<li><code>MIMALLOC_ALLOW_LARGE_OS_PAGES=1</code>: use large OS pages (2 or 4MiB) when available; for some workloads this can significantly improve performance. When this option is disabled, it also disables transparent huge pages (THP) for the process (on Linux and Android). Use <code>MIMALLOC_VERBOSE</code> to check if the large OS pages are enabled &ndash; usually one needs to explicitly give permissions for large OS pages (as on <a href="https://docs.microsoft.com/en-us/sql/database-engine/configure-windows/enable-the-lock-pages-in-memory-option-windows?view=sql-server-2017">Windows</a> and <a href="https://access.redhat.com/documentation/en-us/red_hat_enterprise_linux/5/html/tuning_and_optimizing_red_hat_enterprise_linux_for_oracle_9i_and_10g_databases/sect-oracle_9i_and_10g_tuning_guide-large_memory_optimization_big_pages_and_huge_pages-configuring_huge_pages_in_red_hat_enterprise_linux_4_or_5">Linux</a>). However, sometimes the OS is very slow to reserve contiguous physical memory for large OS pages so use with care on systems that can have fragmented memory (for that reason, we generally recommend to use <code>MIMALLOC_RESERVE_HUGE_OS_PAGES</code> instead whenever possible).</li>
+<li><code>MIMALLOC_RESERVE_HUGE_OS_PAGES=N</code>: where <code>N</code> is the number of 1GiB <em>huge</em> OS pages. This reserves the huge pages at startup and sometimes this can give a large (latency) performance improvement on big workloads. Usually it is better to not use <code>MIMALLOC_ALLOW_LARGE_OS_PAGES=1</code> in combination with this setting. Just like large OS pages, use with care as reserving contiguous physical memory can take a long time when memory is fragmented (but reserving the huge pages is done at startup only once). Note that we usually need to explicitly give permission for huge OS pages (as on <a href="https://docs.microsoft.com/en-us/sql/database-engine/configure-windows/enable-the-lock-pages-in-memory-option-windows?view=sql-server-2017">Windows</a> and <a href="https://access.redhat.com/documentation/en-us/red_hat_enterprise_linux/5/html/tuning_and_optimizing_red_hat_enterprise_linux_for_oracle_9i_and_10g_databases/sect-oracle_9i_and_10g_tuning_guide-large_memory_optimization_big_pages_and_huge_pages-configuring_huge_pages_in_red_hat_enterprise_linux_4_or_5">Linux</a>)). With huge OS pages, it may be beneficial to set the setting <code>MIMALLOC_EAGER_COMMIT_DELAY=N</code> (<code>N</code> is 1 by default) to delay the initial <code>N</code> segments (of 4MiB) of a thread to not allocate in the huge OS pages; this prevents threads that are short lived and allocate just a little to take up space in the huge OS page area (which cannot be purged as huge OS pages are pinned to physical memory). The huge pages are usually allocated evenly among NUMA nodes. We can use <code>MIMALLOC_RESERVE_HUGE_OS_PAGES_AT=N</code> where <code>N</code> is the numa node (starting at 0) to allocate all the huge pages at a specific numa node instead.</li>
+</ul>
+<p>Use caution when using <code>fork</code> in combination with either large or huge OS pages: on a fork, the OS uses copy-on-write for all pages in the original process including the huge OS pages. When any memory is now written in that area, the OS will copy the entire 1GiB huge page (or 2MiB large page) which can cause the memory usage to grow in large increments. </p>
 </div></div><!-- contents -->
 </div><!-- PageDoc -->
 </div><!-- doc-content -->
 <!-- start footer part -->
 <div id="nav-path" class="navpath"><!-- id is needed for treeview function! -->
   <ul>
-    <li class="footer">Generated by <a href="https://www.doxygen.org/index.html"><img class="footer" src="doxygen.svg" width="104" height="31" alt="doxygen"/></a> 1.9.1 </li>
+    <li class="footer">Generated by <a href="https://www.doxygen.org/index.html"><img class="footer" src="doxygen.svg" width="104" height="31" alt="doxygen"/></a> 1.13.1 </li>
   </ul>
 </div>
 </body>
diff --git a/depends/mimalloc/docs/functions.html b/depends/mimalloc/docs/functions.html
index 373fafe2b8b4..043b8621bef0 100644
--- a/depends/mimalloc/docs/functions.html
+++ b/depends/mimalloc/docs/functions.html
@@ -1,24 +1,26 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "https://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
+<html xmlns="http://www.w3.org/1999/xhtml" lang="en-US">
 <head>
 <meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
-<meta http-equiv="X-UA-Compatible" content="IE=9"/>
-<meta name="generator" content="Doxygen 1.9.1"/>
+<meta http-equiv="X-UA-Compatible" content="IE=11"/>
+<meta name="generator" content="Doxygen 1.13.1"/>
 <meta name="viewport" content="width=device-width, initial-scale=1"/>
 <title>mi-malloc: Data Fields</title>
 <link href="tabs.css" rel="stylesheet" type="text/css"/>
 <script type="text/javascript" src="jquery.js"></script>
 <script type="text/javascript" src="dynsections.js"></script>
+<script type="text/javascript" src="clipboard.js"></script>
 <link href="navtree.css" rel="stylesheet" type="text/css"/>
-<script type="text/javascript" src="resize.js"></script>
 <script type="text/javascript" src="navtreedata.js"></script>
 <script type="text/javascript" src="navtree.js"></script>
+<script type="text/javascript" src="resize.js"></script>
+<script type="text/javascript" src="cookie.js"></script>
 <link href="search/search.css" rel="stylesheet" type="text/css"/>
 <script type="text/javascript" src="search/searchdata.js"></script>
 <script type="text/javascript" src="search/search.js"></script>
 <script type="text/javascript">
-/* @license magnet:?xt=urn:btih:cf05388f2679ee054f2beb29a391d25f4e673ac3&amp;dn=gpl-2.0.txt GPL-v2 */
-  $(document).ready(function() { init_search(); });
+/* @license magnet:?xt=urn:btih:d3d9a9a6595521f9666a5e94cc830dab83b65699&amp;dn=expat.txt MIT */
+  $(function() { init_search(); });
 /* @license-end */
 </script>
 <link href="doxygen.css" rel="stylesheet" type="text/css" />
@@ -29,20 +31,16 @@
 <div id="titlearea">
 <table cellspacing="0" cellpadding="0">
  <tbody>
- <tr style="height: 56px;">
+ <tr id="projectrow">
   <td id="projectlogo"><img alt="Logo" src="mimalloc-logo.svg"/></td>
-  <td id="projectalign" style="padding-left: 0.5em;">
-   <div id="projectname">mi-malloc
-   &#160;<span id="projectnumber">1.7/2.0</span>
+  <td id="projectalign">
+   <div id="projectname">mi-malloc<span id="projectnumber">&#160;1.8/2.1</span>
    </div>
   </td>
-   <td>        <div id="MSearchBox" class="MSearchBoxInactive">
+    <td>        <div id="MSearchBox" class="MSearchBoxInactive">
         <span class="left">
-          <img id="MSearchSelect" src="search/mag_sel.svg"
-               onmouseover="return searchBox.OnSearchSelectShow()"
-               onmouseout="return searchBox.OnSearchSelectHide()"
-               alt=""/>
-          <input type="text" id="MSearchField" value="Search" accesskey="S"
+          <span id="MSearchSelect"                onmouseover="return searchBox.OnSearchSelectShow()"                onmouseout="return searchBox.OnSearchSelectHide()">&#160;</span>
+          <input type="text" id="MSearchField" value="" placeholder="Search" accesskey="S"
                onfocus="searchBox.OnSearchFieldFocus(true)" 
                onblur="searchBox.OnSearchFieldFocus(false)" 
                onkeyup="searchBox.OnSearchFieldChange(event)"/>
@@ -56,10 +54,15 @@
 </table>
 </div>
 <!-- end header part -->
-<!-- Generated by Doxygen 1.9.1 -->
+<!-- Generated by Doxygen 1.13.1 -->
+<script type="text/javascript">
+/* @license magnet:?xt=urn:btih:d3d9a9a6595521f9666a5e94cc830dab83b65699&amp;dn=expat.txt MIT */
+var searchBox = new SearchBox("searchBox", "search/",'.html');
+/* @license-end */
+</script>
 <script type="text/javascript">
-/* @license magnet:?xt=urn:btih:cf05388f2679ee054f2beb29a391d25f4e673ac3&amp;dn=gpl-2.0.txt GPL-v2 */
-var searchBox = new SearchBox("searchBox", "search",false,'Search','.html');
+/* @license magnet:?xt=urn:btih:d3d9a9a6595521f9666a5e94cc830dab83b65699&amp;dn=expat.txt MIT */
+$(function() { codefold.init(0); });
 /* @license-end */
 </script>
 </div><!-- top -->
@@ -74,8 +77,8 @@
   </div>
 </div>
 <script type="text/javascript">
-/* @license magnet:?xt=urn:btih:cf05388f2679ee054f2beb29a391d25f4e673ac3&amp;dn=gpl-2.0.txt GPL-v2 */
-$(document).ready(function(){initNavTree('functions.html',''); initResizable(); });
+/* @license magnet:?xt=urn:btih:d3d9a9a6595521f9666a5e94cc830dab83b65699&amp;dn=expat.txt MIT */
+$(function(){initNavTree('functions.html',''); initResizable(true); });
 /* @license-end */
 </script>
 <div id="doc-content">
@@ -88,35 +91,34 @@
 
 <!-- iframe showing the search results (closed by default) -->
 <div id="MSearchResultsWindow">
-<iframe src="javascript:void(0)" frameborder="0" 
-        name="MSearchResults" id="MSearchResults">
-</iframe>
+<div id="MSearchResults">
+<div class="SRPage">
+<div id="SRIndex">
+<div id="SRResults"></div>
+<div class="SRStatus" id="Loading">Loading...</div>
+<div class="SRStatus" id="Searching">Searching...</div>
+<div class="SRStatus" id="NoMatches">No Matches</div>
+</div>
+</div>
+</div>
 </div>
 
 <div class="contents">
 <div class="textblock">Here is a list of all struct and union fields with links to the structures/unions they belong to:</div><ul>
-<li>block_size
-: <a class="el" href="group__analysis.html#a332a6c14d736a99699d5453a1cb04b41">mi_heap_area_t</a>
-</li>
-<li>blocks
-: <a class="el" href="group__analysis.html#ae0085e6e1cf059a4eb7767e30e9991b8">mi_heap_area_t</a>
-</li>
-<li>committed
-: <a class="el" href="group__analysis.html#ab47526df656d8837ec3e97f11b83f835">mi_heap_area_t</a>
-</li>
-<li>reserved
-: <a class="el" href="group__analysis.html#ae848a3e6840414891035423948ca0383">mi_heap_area_t</a>
-</li>
-<li>used
-: <a class="el" href="group__analysis.html#ab820302c5cd0df133eb8e51650a008b4">mi_heap_area_t</a>
-</li>
+<li>block_size&#160;:&#160;<a class="el" href="group__analysis.html#a332a6c14d736a99699d5453a1cb04b41">mi_heap_area_t</a></li>
+<li>blocks&#160;:&#160;<a class="el" href="group__analysis.html#ae0085e6e1cf059a4eb7767e30e9991b8">mi_heap_area_t</a></li>
+<li>committed&#160;:&#160;<a class="el" href="group__analysis.html#ab47526df656d8837ec3e97f11b83f835">mi_heap_area_t</a></li>
+<li>full_block_size&#160;:&#160;<a class="el" href="group__analysis.html#ab53664e31d7fe2564f8d42041ef75cb3">mi_heap_area_t</a></li>
+<li>heap_tag&#160;:&#160;<a class="el" href="group__analysis.html#a2b7a0c92ece8daf46b558efc990ebdc1">mi_heap_area_t</a></li>
+<li>reserved&#160;:&#160;<a class="el" href="group__analysis.html#ae848a3e6840414891035423948ca0383">mi_heap_area_t</a></li>
+<li>used&#160;:&#160;<a class="el" href="group__analysis.html#ab820302c5cd0df133eb8e51650a008b4">mi_heap_area_t</a></li>
 </ul>
 </div><!-- contents -->
 </div><!-- doc-content -->
 <!-- start footer part -->
 <div id="nav-path" class="navpath"><!-- id is needed for treeview function! -->
   <ul>
-    <li class="footer">Generated by <a href="https://www.doxygen.org/index.html"><img class="footer" src="doxygen.svg" width="104" height="31" alt="doxygen"/></a> 1.9.1 </li>
+    <li class="footer">Generated by <a href="https://www.doxygen.org/index.html"><img class="footer" src="doxygen.svg" width="104" height="31" alt="doxygen"/></a> 1.13.1 </li>
   </ul>
 </div>
 </body>
diff --git a/depends/mimalloc/docs/functions_vars.html b/depends/mimalloc/docs/functions_vars.html
index a12ef6226574..ec9a4de13482 100644
--- a/depends/mimalloc/docs/functions_vars.html
+++ b/depends/mimalloc/docs/functions_vars.html
@@ -1,24 +1,26 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "https://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
+<html xmlns="http://www.w3.org/1999/xhtml" lang="en-US">
 <head>
 <meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
-<meta http-equiv="X-UA-Compatible" content="IE=9"/>
-<meta name="generator" content="Doxygen 1.9.1"/>
+<meta http-equiv="X-UA-Compatible" content="IE=11"/>
+<meta name="generator" content="Doxygen 1.13.1"/>
 <meta name="viewport" content="width=device-width, initial-scale=1"/>
 <title>mi-malloc: Data Fields - Variables</title>
 <link href="tabs.css" rel="stylesheet" type="text/css"/>
 <script type="text/javascript" src="jquery.js"></script>
 <script type="text/javascript" src="dynsections.js"></script>
+<script type="text/javascript" src="clipboard.js"></script>
 <link href="navtree.css" rel="stylesheet" type="text/css"/>
-<script type="text/javascript" src="resize.js"></script>
 <script type="text/javascript" src="navtreedata.js"></script>
 <script type="text/javascript" src="navtree.js"></script>
+<script type="text/javascript" src="resize.js"></script>
+<script type="text/javascript" src="cookie.js"></script>
 <link href="search/search.css" rel="stylesheet" type="text/css"/>
 <script type="text/javascript" src="search/searchdata.js"></script>
 <script type="text/javascript" src="search/search.js"></script>
 <script type="text/javascript">
-/* @license magnet:?xt=urn:btih:cf05388f2679ee054f2beb29a391d25f4e673ac3&amp;dn=gpl-2.0.txt GPL-v2 */
-  $(document).ready(function() { init_search(); });
+/* @license magnet:?xt=urn:btih:d3d9a9a6595521f9666a5e94cc830dab83b65699&amp;dn=expat.txt MIT */
+  $(function() { init_search(); });
 /* @license-end */
 </script>
 <link href="doxygen.css" rel="stylesheet" type="text/css" />
@@ -29,20 +31,16 @@
 <div id="titlearea">
 <table cellspacing="0" cellpadding="0">
  <tbody>
- <tr style="height: 56px;">
+ <tr id="projectrow">
   <td id="projectlogo"><img alt="Logo" src="mimalloc-logo.svg"/></td>
-  <td id="projectalign" style="padding-left: 0.5em;">
-   <div id="projectname">mi-malloc
-   &#160;<span id="projectnumber">1.7/2.0</span>
+  <td id="projectalign">
+   <div id="projectname">mi-malloc<span id="projectnumber">&#160;1.8/2.1</span>
    </div>
   </td>
-   <td>        <div id="MSearchBox" class="MSearchBoxInactive">
+    <td>        <div id="MSearchBox" class="MSearchBoxInactive">
         <span class="left">
-          <img id="MSearchSelect" src="search/mag_sel.svg"
-               onmouseover="return searchBox.OnSearchSelectShow()"
-               onmouseout="return searchBox.OnSearchSelectHide()"
-               alt=""/>
-          <input type="text" id="MSearchField" value="Search" accesskey="S"
+          <span id="MSearchSelect"                onmouseover="return searchBox.OnSearchSelectShow()"                onmouseout="return searchBox.OnSearchSelectHide()">&#160;</span>
+          <input type="text" id="MSearchField" value="" placeholder="Search" accesskey="S"
                onfocus="searchBox.OnSearchFieldFocus(true)" 
                onblur="searchBox.OnSearchFieldFocus(false)" 
                onkeyup="searchBox.OnSearchFieldChange(event)"/>
@@ -56,10 +54,15 @@
 </table>
 </div>
 <!-- end header part -->
-<!-- Generated by Doxygen 1.9.1 -->
+<!-- Generated by Doxygen 1.13.1 -->
+<script type="text/javascript">
+/* @license magnet:?xt=urn:btih:d3d9a9a6595521f9666a5e94cc830dab83b65699&amp;dn=expat.txt MIT */
+var searchBox = new SearchBox("searchBox", "search/",'.html');
+/* @license-end */
+</script>
 <script type="text/javascript">
-/* @license magnet:?xt=urn:btih:cf05388f2679ee054f2beb29a391d25f4e673ac3&amp;dn=gpl-2.0.txt GPL-v2 */
-var searchBox = new SearchBox("searchBox", "search",false,'Search','.html');
+/* @license magnet:?xt=urn:btih:d3d9a9a6595521f9666a5e94cc830dab83b65699&amp;dn=expat.txt MIT */
+$(function() { codefold.init(0); });
 /* @license-end */
 </script>
 </div><!-- top -->
@@ -74,8 +77,8 @@
   </div>
 </div>
 <script type="text/javascript">
-/* @license magnet:?xt=urn:btih:cf05388f2679ee054f2beb29a391d25f4e673ac3&amp;dn=gpl-2.0.txt GPL-v2 */
-$(document).ready(function(){initNavTree('functions_vars.html',''); initResizable(); });
+/* @license magnet:?xt=urn:btih:d3d9a9a6595521f9666a5e94cc830dab83b65699&amp;dn=expat.txt MIT */
+$(function(){initNavTree('functions_vars.html',''); initResizable(true); });
 /* @license-end */
 </script>
 <div id="doc-content">
@@ -88,35 +91,34 @@
 
 <!-- iframe showing the search results (closed by default) -->
 <div id="MSearchResultsWindow">
-<iframe src="javascript:void(0)" frameborder="0" 
-        name="MSearchResults" id="MSearchResults">
-</iframe>
+<div id="MSearchResults">
+<div class="SRPage">
+<div id="SRIndex">
+<div id="SRResults"></div>
+<div class="SRStatus" id="Loading">Loading...</div>
+<div class="SRStatus" id="Searching">Searching...</div>
+<div class="SRStatus" id="NoMatches">No Matches</div>
+</div>
+</div>
+</div>
 </div>
 
 <div class="contents">
-&#160;<ul>
-<li>block_size
-: <a class="el" href="group__analysis.html#a332a6c14d736a99699d5453a1cb04b41">mi_heap_area_t</a>
-</li>
-<li>blocks
-: <a class="el" href="group__analysis.html#ae0085e6e1cf059a4eb7767e30e9991b8">mi_heap_area_t</a>
-</li>
-<li>committed
-: <a class="el" href="group__analysis.html#ab47526df656d8837ec3e97f11b83f835">mi_heap_area_t</a>
-</li>
-<li>reserved
-: <a class="el" href="group__analysis.html#ae848a3e6840414891035423948ca0383">mi_heap_area_t</a>
-</li>
-<li>used
-: <a class="el" href="group__analysis.html#ab820302c5cd0df133eb8e51650a008b4">mi_heap_area_t</a>
-</li>
+<div class="textblock">Here is a list of all variables with links to the structures/unions they belong to:</div><ul>
+<li>block_size&#160;:&#160;<a class="el" href="group__analysis.html#a332a6c14d736a99699d5453a1cb04b41">mi_heap_area_t</a></li>
+<li>blocks&#160;:&#160;<a class="el" href="group__analysis.html#ae0085e6e1cf059a4eb7767e30e9991b8">mi_heap_area_t</a></li>
+<li>committed&#160;:&#160;<a class="el" href="group__analysis.html#ab47526df656d8837ec3e97f11b83f835">mi_heap_area_t</a></li>
+<li>full_block_size&#160;:&#160;<a class="el" href="group__analysis.html#ab53664e31d7fe2564f8d42041ef75cb3">mi_heap_area_t</a></li>
+<li>heap_tag&#160;:&#160;<a class="el" href="group__analysis.html#a2b7a0c92ece8daf46b558efc990ebdc1">mi_heap_area_t</a></li>
+<li>reserved&#160;:&#160;<a class="el" href="group__analysis.html#ae848a3e6840414891035423948ca0383">mi_heap_area_t</a></li>
+<li>used&#160;:&#160;<a class="el" href="group__analysis.html#ab820302c5cd0df133eb8e51650a008b4">mi_heap_area_t</a></li>
 </ul>
 </div><!-- contents -->
 </div><!-- doc-content -->
 <!-- start footer part -->
 <div id="nav-path" class="navpath"><!-- id is needed for treeview function! -->
   <ul>
-    <li class="footer">Generated by <a href="https://www.doxygen.org/index.html"><img class="footer" src="doxygen.svg" width="104" height="31" alt="doxygen"/></a> 1.9.1 </li>
+    <li class="footer">Generated by <a href="https://www.doxygen.org/index.html"><img class="footer" src="doxygen.svg" width="104" height="31" alt="doxygen"/></a> 1.13.1 </li>
   </ul>
 </div>
 </body>
diff --git a/depends/mimalloc/docs/group__aligned.html b/depends/mimalloc/docs/group__aligned.html
index bd11f30f2732..f107758e8395 100644
--- a/depends/mimalloc/docs/group__aligned.html
+++ b/depends/mimalloc/docs/group__aligned.html
@@ -1,24 +1,26 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "https://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
+<html xmlns="http://www.w3.org/1999/xhtml" lang="en-US">
 <head>
 <meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
-<meta http-equiv="X-UA-Compatible" content="IE=9"/>
-<meta name="generator" content="Doxygen 1.9.1"/>
+<meta http-equiv="X-UA-Compatible" content="IE=11"/>
+<meta name="generator" content="Doxygen 1.13.1"/>
 <meta name="viewport" content="width=device-width, initial-scale=1"/>
 <title>mi-malloc: Aligned Allocation</title>
 <link href="tabs.css" rel="stylesheet" type="text/css"/>
 <script type="text/javascript" src="jquery.js"></script>
 <script type="text/javascript" src="dynsections.js"></script>
+<script type="text/javascript" src="clipboard.js"></script>
 <link href="navtree.css" rel="stylesheet" type="text/css"/>
-<script type="text/javascript" src="resize.js"></script>
 <script type="text/javascript" src="navtreedata.js"></script>
 <script type="text/javascript" src="navtree.js"></script>
+<script type="text/javascript" src="resize.js"></script>
+<script type="text/javascript" src="cookie.js"></script>
 <link href="search/search.css" rel="stylesheet" type="text/css"/>
 <script type="text/javascript" src="search/searchdata.js"></script>
 <script type="text/javascript" src="search/search.js"></script>
 <script type="text/javascript">
-/* @license magnet:?xt=urn:btih:cf05388f2679ee054f2beb29a391d25f4e673ac3&amp;dn=gpl-2.0.txt GPL-v2 */
-  $(document).ready(function() { init_search(); });
+/* @license magnet:?xt=urn:btih:d3d9a9a6595521f9666a5e94cc830dab83b65699&amp;dn=expat.txt MIT */
+  $(function() { init_search(); });
 /* @license-end */
 </script>
 <link href="doxygen.css" rel="stylesheet" type="text/css" />
@@ -29,20 +31,16 @@
 <div id="titlearea">
 <table cellspacing="0" cellpadding="0">
  <tbody>
- <tr style="height: 56px;">
+ <tr id="projectrow">
   <td id="projectlogo"><img alt="Logo" src="mimalloc-logo.svg"/></td>
-  <td id="projectalign" style="padding-left: 0.5em;">
-   <div id="projectname">mi-malloc
-   &#160;<span id="projectnumber">1.7/2.0</span>
+  <td id="projectalign">
+   <div id="projectname">mi-malloc<span id="projectnumber">&#160;1.8/2.1</span>
    </div>
   </td>
-   <td>        <div id="MSearchBox" class="MSearchBoxInactive">
+    <td>        <div id="MSearchBox" class="MSearchBoxInactive">
         <span class="left">
-          <img id="MSearchSelect" src="search/mag_sel.svg"
-               onmouseover="return searchBox.OnSearchSelectShow()"
-               onmouseout="return searchBox.OnSearchSelectHide()"
-               alt=""/>
-          <input type="text" id="MSearchField" value="Search" accesskey="S"
+          <span id="MSearchSelect"                onmouseover="return searchBox.OnSearchSelectShow()"                onmouseout="return searchBox.OnSearchSelectHide()">&#160;</span>
+          <input type="text" id="MSearchField" value="" placeholder="Search" accesskey="S"
                onfocus="searchBox.OnSearchFieldFocus(true)" 
                onblur="searchBox.OnSearchFieldFocus(false)" 
                onkeyup="searchBox.OnSearchFieldChange(event)"/>
@@ -56,10 +54,15 @@
 </table>
 </div>
 <!-- end header part -->
-<!-- Generated by Doxygen 1.9.1 -->
+<!-- Generated by Doxygen 1.13.1 -->
+<script type="text/javascript">
+/* @license magnet:?xt=urn:btih:d3d9a9a6595521f9666a5e94cc830dab83b65699&amp;dn=expat.txt MIT */
+var searchBox = new SearchBox("searchBox", "search/",'.html');
+/* @license-end */
+</script>
 <script type="text/javascript">
-/* @license magnet:?xt=urn:btih:cf05388f2679ee054f2beb29a391d25f4e673ac3&amp;dn=gpl-2.0.txt GPL-v2 */
-var searchBox = new SearchBox("searchBox", "search",false,'Search','.html');
+/* @license magnet:?xt=urn:btih:d3d9a9a6595521f9666a5e94cc830dab83b65699&amp;dn=expat.txt MIT */
+$(function() { codefold.init(0); });
 /* @license-end */
 </script>
 </div><!-- top -->
@@ -74,8 +77,8 @@
   </div>
 </div>
 <script type="text/javascript">
-/* @license magnet:?xt=urn:btih:cf05388f2679ee054f2beb29a391d25f4e673ac3&amp;dn=gpl-2.0.txt GPL-v2 */
-$(document).ready(function(){initNavTree('group__aligned.html',''); initResizable(); });
+/* @license magnet:?xt=urn:btih:d3d9a9a6595521f9666a5e94cc830dab83b65699&amp;dn=expat.txt MIT */
+$(function(){initNavTree('group__aligned.html',''); initResizable(true); });
 /* @license-end */
 </script>
 <div id="doc-content">
@@ -88,180 +91,142 @@
 
 <!-- iframe showing the search results (closed by default) -->
 <div id="MSearchResultsWindow">
-<iframe src="javascript:void(0)" frameborder="0" 
-        name="MSearchResults" id="MSearchResults">
-</iframe>
+<div id="MSearchResults">
+<div class="SRPage">
+<div id="SRIndex">
+<div id="SRResults"></div>
+<div class="SRStatus" id="Loading">Loading...</div>
+<div class="SRStatus" id="Searching">Searching...</div>
+<div class="SRStatus" id="NoMatches">No Matches</div>
+</div>
+</div>
+</div>
 </div>
 
 <div class="header">
   <div class="summary">
-<a href="#define-members">Macros</a> &#124;
 <a href="#func-members">Functions</a>  </div>
-  <div class="headertitle">
-<div class="title">Aligned Allocation</div>  </div>
+  <div class="headertitle"><div class="title">Aligned Allocation</div></div>
 </div><!--header-->
 <div class="contents">
 
 <p>Allocating aligned memory blocks.  
 <a href="#details">More...</a></p>
 <table class="memberdecls">
-<tr class="heading"><td colspan="2"><h2 class="groupheader"><a name="define-members"></a>
-Macros</h2></td></tr>
-<tr class="memitem:ga83c03016066b438f51a8095e9140be06"><td class="memItemLeft" align="right" valign="top">#define&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__aligned.html#ga83c03016066b438f51a8095e9140be06">MI_ALIGNMENT_MAX</a></td></tr>
-<tr class="memdesc:ga83c03016066b438f51a8095e9140be06"><td class="mdescLeft">&#160;</td><td class="mdescRight">The maximum supported alignment size (currently 1MiB).  <a href="group__aligned.html#ga83c03016066b438f51a8095e9140be06">More...</a><br /></td></tr>
-<tr class="separator:ga83c03016066b438f51a8095e9140be06"><td class="memSeparator" colspan="2">&#160;</td></tr>
-</table><table class="memberdecls">
-<tr class="heading"><td colspan="2"><h2 class="groupheader"><a name="func-members"></a>
+<tr class="heading"><td colspan="2"><h2 class="groupheader"><a id="func-members" name="func-members"></a>
 Functions</h2></td></tr>
-<tr class="memitem:ga68930196751fa2cca9e1fd0d71bade56"><td class="memItemLeft" align="right" valign="top">void *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__aligned.html#ga68930196751fa2cca9e1fd0d71bade56">mi_malloc_aligned</a> (size_t size, size_t alignment)</td></tr>
-<tr class="memdesc:ga68930196751fa2cca9e1fd0d71bade56"><td class="mdescLeft">&#160;</td><td class="mdescRight">Allocate <em>size</em> bytes aligned by <em>alignment</em>.  <a href="group__aligned.html#ga68930196751fa2cca9e1fd0d71bade56">More...</a><br /></td></tr>
-<tr class="separator:ga68930196751fa2cca9e1fd0d71bade56"><td class="memSeparator" colspan="2">&#160;</td></tr>
-<tr class="memitem:ga0cadbcf5b89a7b6fb171bc8df8734819"><td class="memItemLeft" align="right" valign="top">void *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__aligned.html#ga0cadbcf5b89a7b6fb171bc8df8734819">mi_zalloc_aligned</a> (size_t size, size_t alignment)</td></tr>
-<tr class="separator:ga0cadbcf5b89a7b6fb171bc8df8734819"><td class="memSeparator" colspan="2">&#160;</td></tr>
-<tr class="memitem:ga53dddb4724042a90315b94bc268fb4c9"><td class="memItemLeft" align="right" valign="top">void *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__aligned.html#ga53dddb4724042a90315b94bc268fb4c9">mi_calloc_aligned</a> (size_t count, size_t size, size_t alignment)</td></tr>
-<tr class="separator:ga53dddb4724042a90315b94bc268fb4c9"><td class="memSeparator" colspan="2">&#160;</td></tr>
-<tr class="memitem:ga4028d1cf4aa4c87c880747044a8322ae"><td class="memItemLeft" align="right" valign="top">void *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__aligned.html#ga4028d1cf4aa4c87c880747044a8322ae">mi_realloc_aligned</a> (void *p, size_t newsize, size_t alignment)</td></tr>
-<tr class="separator:ga4028d1cf4aa4c87c880747044a8322ae"><td class="memSeparator" colspan="2">&#160;</td></tr>
-<tr class="memitem:ga5850da130c936bd77db039dcfbc8295d"><td class="memItemLeft" align="right" valign="top">void *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__aligned.html#ga5850da130c936bd77db039dcfbc8295d">mi_malloc_aligned_at</a> (size_t size, size_t alignment, size_t offset)</td></tr>
-<tr class="memdesc:ga5850da130c936bd77db039dcfbc8295d"><td class="mdescLeft">&#160;</td><td class="mdescRight">Allocate <em>size</em> bytes aligned by <em>alignment</em> at a specified <em>offset</em>.  <a href="group__aligned.html#ga5850da130c936bd77db039dcfbc8295d">More...</a><br /></td></tr>
-<tr class="separator:ga5850da130c936bd77db039dcfbc8295d"><td class="memSeparator" colspan="2">&#160;</td></tr>
-<tr class="memitem:ga5f8c2353766db522565e642fafd8a3f8"><td class="memItemLeft" align="right" valign="top">void *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__aligned.html#ga5f8c2353766db522565e642fafd8a3f8">mi_zalloc_aligned_at</a> (size_t size, size_t alignment, size_t offset)</td></tr>
-<tr class="separator:ga5f8c2353766db522565e642fafd8a3f8"><td class="memSeparator" colspan="2">&#160;</td></tr>
-<tr class="memitem:ga08647c4593f3b2eef24a919a73eba3a3"><td class="memItemLeft" align="right" valign="top">void *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__aligned.html#ga08647c4593f3b2eef24a919a73eba3a3">mi_calloc_aligned_at</a> (size_t count, size_t size, size_t alignment, size_t offset)</td></tr>
-<tr class="separator:ga08647c4593f3b2eef24a919a73eba3a3"><td class="memSeparator" colspan="2">&#160;</td></tr>
-<tr class="memitem:gaf66a9ae6c6f08bd6be6fb6ea771faffb"><td class="memItemLeft" align="right" valign="top">void *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__aligned.html#gaf66a9ae6c6f08bd6be6fb6ea771faffb">mi_realloc_aligned_at</a> (void *p, size_t newsize, size_t alignment, size_t offset)</td></tr>
-<tr class="separator:gaf66a9ae6c6f08bd6be6fb6ea771faffb"><td class="memSeparator" colspan="2">&#160;</td></tr>
+<tr class="memitem:ga69578ff1a98ca16e1dcd02c0995cd65c" id="r_ga69578ff1a98ca16e1dcd02c0995cd65c"><td class="memItemLeft" align="right" valign="top">void *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="#ga69578ff1a98ca16e1dcd02c0995cd65c">mi_malloc_aligned</a> (size_t size, size_t alignment)</td></tr>
+<tr class="memdesc:ga69578ff1a98ca16e1dcd02c0995cd65c"><td class="mdescLeft">&#160;</td><td class="mdescRight">Allocate <em class="arg">size</em> bytes aligned by <em class="arg">alignment</em>.  <br /></td></tr>
+<tr class="separator:ga69578ff1a98ca16e1dcd02c0995cd65c"><td class="memSeparator" colspan="2">&#160;</td></tr>
+<tr class="memitem:gaac7d0beb782f9b9ac31f47492b130f82" id="r_gaac7d0beb782f9b9ac31f47492b130f82"><td class="memItemLeft" align="right" valign="top">void *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="#gaac7d0beb782f9b9ac31f47492b130f82">mi_zalloc_aligned</a> (size_t size, size_t alignment)</td></tr>
+<tr class="separator:gaac7d0beb782f9b9ac31f47492b130f82"><td class="memSeparator" colspan="2">&#160;</td></tr>
+<tr class="memitem:ga424ef386fb1f9f8e0a86ab53f16eaaf1" id="r_ga424ef386fb1f9f8e0a86ab53f16eaaf1"><td class="memItemLeft" align="right" valign="top">void *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="#ga424ef386fb1f9f8e0a86ab53f16eaaf1">mi_calloc_aligned</a> (size_t count, size_t size, size_t alignment)</td></tr>
+<tr class="separator:ga424ef386fb1f9f8e0a86ab53f16eaaf1"><td class="memSeparator" colspan="2">&#160;</td></tr>
+<tr class="memitem:ga5d7a46d054b4d7abe9d8d2474add2edf" id="r_ga5d7a46d054b4d7abe9d8d2474add2edf"><td class="memItemLeft" align="right" valign="top">void *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="#ga5d7a46d054b4d7abe9d8d2474add2edf">mi_realloc_aligned</a> (void *p, size_t newsize, size_t alignment)</td></tr>
+<tr class="separator:ga5d7a46d054b4d7abe9d8d2474add2edf"><td class="memSeparator" colspan="2">&#160;</td></tr>
+<tr class="memitem:ga2022f71b95a7cd6cce1b6e07752ae8ca" id="r_ga2022f71b95a7cd6cce1b6e07752ae8ca"><td class="memItemLeft" align="right" valign="top">void *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="#ga2022f71b95a7cd6cce1b6e07752ae8ca">mi_malloc_aligned_at</a> (size_t size, size_t alignment, size_t offset)</td></tr>
+<tr class="memdesc:ga2022f71b95a7cd6cce1b6e07752ae8ca"><td class="mdescLeft">&#160;</td><td class="mdescRight">Allocate <em class="arg">size</em> bytes aligned by <em class="arg">alignment</em> at a specified <em class="arg">offset</em>.  <br /></td></tr>
+<tr class="separator:ga2022f71b95a7cd6cce1b6e07752ae8ca"><td class="memSeparator" colspan="2">&#160;</td></tr>
+<tr class="memitem:ga7c1778805ce50ebbf02ccbd5e39d5dba" id="r_ga7c1778805ce50ebbf02ccbd5e39d5dba"><td class="memItemLeft" align="right" valign="top">void *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="#ga7c1778805ce50ebbf02ccbd5e39d5dba">mi_zalloc_aligned_at</a> (size_t size, size_t alignment, size_t offset)</td></tr>
+<tr class="separator:ga7c1778805ce50ebbf02ccbd5e39d5dba"><td class="memSeparator" colspan="2">&#160;</td></tr>
+<tr class="memitem:ga977f96bd2c5c141bcd70e6685c90d6c3" id="r_ga977f96bd2c5c141bcd70e6685c90d6c3"><td class="memItemLeft" align="right" valign="top">void *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="#ga977f96bd2c5c141bcd70e6685c90d6c3">mi_calloc_aligned_at</a> (size_t count, size_t size, size_t alignment, size_t offset)</td></tr>
+<tr class="separator:ga977f96bd2c5c141bcd70e6685c90d6c3"><td class="memSeparator" colspan="2">&#160;</td></tr>
+<tr class="memitem:gad06dcf2bb8faadb2c8ea61ee5d24bbf6" id="r_gad06dcf2bb8faadb2c8ea61ee5d24bbf6"><td class="memItemLeft" align="right" valign="top">void *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="#gad06dcf2bb8faadb2c8ea61ee5d24bbf6">mi_realloc_aligned_at</a> (void *p, size_t newsize, size_t alignment, size_t offset)</td></tr>
+<tr class="separator:gad06dcf2bb8faadb2c8ea61ee5d24bbf6"><td class="memSeparator" colspan="2">&#160;</td></tr>
 </table>
 <a name="details" id="details"></a><h2 class="groupheader">Detailed Description</h2>
 <p>Allocating aligned memory blocks. </p>
-<h2 class="groupheader">Macro Definition Documentation</h2>
-<a id="ga83c03016066b438f51a8095e9140be06"></a>
-<h2 class="memtitle"><span class="permalink"><a href="#ga83c03016066b438f51a8095e9140be06">&#9670;&nbsp;</a></span>MI_ALIGNMENT_MAX</h2>
-
-<div class="memitem">
-<div class="memproto">
-      <table class="memname">
-        <tr>
-          <td class="memname">#define MI_ALIGNMENT_MAX</td>
-        </tr>
-      </table>
-</div><div class="memdoc">
-
-<p>The maximum supported alignment size (currently 1MiB). </p>
-
-</div>
-</div>
+<p>Note that <code>alignment</code> always follows <code>size</code> for consistency with the unaligned allocation API, but unfortunately this differs from <code>posix_memalign</code> and <code>aligned_alloc</code> in the C library. </p>
 <h2 class="groupheader">Function Documentation</h2>
-<a id="ga53dddb4724042a90315b94bc268fb4c9"></a>
-<h2 class="memtitle"><span class="permalink"><a href="#ga53dddb4724042a90315b94bc268fb4c9">&#9670;&nbsp;</a></span>mi_calloc_aligned()</h2>
+<a id="ga424ef386fb1f9f8e0a86ab53f16eaaf1" name="ga424ef386fb1f9f8e0a86ab53f16eaaf1"></a>
+<h2 class="memtitle"><span class="permalink"><a href="#ga424ef386fb1f9f8e0a86ab53f16eaaf1">&#9670;&#160;</a></span>mi_calloc_aligned()</h2>
 
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname">void* mi_calloc_aligned </td>
+          <td class="memname">void * mi_calloc_aligned </td>
           <td>(</td>
-          <td class="paramtype">size_t&#160;</td>
-          <td class="paramname"><em>count</em>, </td>
+          <td class="paramtype">size_t</td>          <td class="paramname"><span class="paramname"><em>count</em></span>, </td>
         </tr>
         <tr>
           <td class="paramkey"></td>
           <td></td>
-          <td class="paramtype">size_t&#160;</td>
-          <td class="paramname"><em>size</em>, </td>
+          <td class="paramtype">size_t</td>          <td class="paramname"><span class="paramname"><em>size</em></span>, </td>
         </tr>
         <tr>
           <td class="paramkey"></td>
           <td></td>
-          <td class="paramtype">size_t&#160;</td>
-          <td class="paramname"><em>alignment</em>&#160;</td>
-        </tr>
-        <tr>
-          <td></td>
-          <td>)</td>
-          <td></td><td></td>
+          <td class="paramtype">size_t</td>          <td class="paramname"><span class="paramname"><em>alignment</em></span>&#160;)</td>
         </tr>
       </table>
 </div><div class="memdoc">
 
 </div>
 </div>
-<a id="ga08647c4593f3b2eef24a919a73eba3a3"></a>
-<h2 class="memtitle"><span class="permalink"><a href="#ga08647c4593f3b2eef24a919a73eba3a3">&#9670;&nbsp;</a></span>mi_calloc_aligned_at()</h2>
+<a id="ga977f96bd2c5c141bcd70e6685c90d6c3" name="ga977f96bd2c5c141bcd70e6685c90d6c3"></a>
+<h2 class="memtitle"><span class="permalink"><a href="#ga977f96bd2c5c141bcd70e6685c90d6c3">&#9670;&#160;</a></span>mi_calloc_aligned_at()</h2>
 
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname">void* mi_calloc_aligned_at </td>
+          <td class="memname">void * mi_calloc_aligned_at </td>
           <td>(</td>
-          <td class="paramtype">size_t&#160;</td>
-          <td class="paramname"><em>count</em>, </td>
+          <td class="paramtype">size_t</td>          <td class="paramname"><span class="paramname"><em>count</em></span>, </td>
         </tr>
         <tr>
           <td class="paramkey"></td>
           <td></td>
-          <td class="paramtype">size_t&#160;</td>
-          <td class="paramname"><em>size</em>, </td>
+          <td class="paramtype">size_t</td>          <td class="paramname"><span class="paramname"><em>size</em></span>, </td>
         </tr>
         <tr>
           <td class="paramkey"></td>
           <td></td>
-          <td class="paramtype">size_t&#160;</td>
-          <td class="paramname"><em>alignment</em>, </td>
+          <td class="paramtype">size_t</td>          <td class="paramname"><span class="paramname"><em>alignment</em></span>, </td>
         </tr>
         <tr>
           <td class="paramkey"></td>
           <td></td>
-          <td class="paramtype">size_t&#160;</td>
-          <td class="paramname"><em>offset</em>&#160;</td>
-        </tr>
-        <tr>
-          <td></td>
-          <td>)</td>
-          <td></td><td></td>
+          <td class="paramtype">size_t</td>          <td class="paramname"><span class="paramname"><em>offset</em></span>&#160;)</td>
         </tr>
       </table>
 </div><div class="memdoc">
 
 </div>
 </div>
-<a id="ga68930196751fa2cca9e1fd0d71bade56"></a>
-<h2 class="memtitle"><span class="permalink"><a href="#ga68930196751fa2cca9e1fd0d71bade56">&#9670;&nbsp;</a></span>mi_malloc_aligned()</h2>
+<a id="ga69578ff1a98ca16e1dcd02c0995cd65c" name="ga69578ff1a98ca16e1dcd02c0995cd65c"></a>
+<h2 class="memtitle"><span class="permalink"><a href="#ga69578ff1a98ca16e1dcd02c0995cd65c">&#9670;&#160;</a></span>mi_malloc_aligned()</h2>
 
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname">void* mi_malloc_aligned </td>
+          <td class="memname">void * mi_malloc_aligned </td>
           <td>(</td>
-          <td class="paramtype">size_t&#160;</td>
-          <td class="paramname"><em>size</em>, </td>
+          <td class="paramtype">size_t</td>          <td class="paramname"><span class="paramname"><em>size</em></span>, </td>
         </tr>
         <tr>
           <td class="paramkey"></td>
           <td></td>
-          <td class="paramtype">size_t&#160;</td>
-          <td class="paramname"><em>alignment</em>&#160;</td>
-        </tr>
-        <tr>
-          <td></td>
-          <td>)</td>
-          <td></td><td></td>
+          <td class="paramtype">size_t</td>          <td class="paramname"><span class="paramname"><em>alignment</em></span>&#160;)</td>
         </tr>
       </table>
 </div><div class="memdoc">
 
-<p>Allocate <em>size</em> bytes aligned by <em>alignment</em>. </p>
+<p>Allocate <em class="arg">size</em> bytes aligned by <em class="arg">alignment</em>. </p>
 <dl class="params"><dt>Parameters</dt><dd>
   <table class="params">
     <tr><td class="paramname">size</td><td>number of bytes to allocate. </td></tr>
-    <tr><td class="paramname">alignment</td><td>the minimal alignment of the allocated memory. Must be less than <a class="el" href="group__aligned.html#ga83c03016066b438f51a8095e9140be06" title="The maximum supported alignment size (currently 1MiB).">MI_ALIGNMENT_MAX</a>. </td></tr>
+    <tr><td class="paramname">alignment</td><td>the minimal alignment of the allocated memory. </td></tr>
   </table>
   </dd>
 </dl>
-<dl class="section return"><dt>Returns</dt><dd>pointer to the allocated memory or <em>NULL</em> if out of memory. The returned pointer is aligned by <em>alignment</em>, i.e. <code>(uintptr_t)p % alignment == 0</code>.</dd></dl>
-<p>Returns a unique pointer if called with <em>size</em> 0. </p><dl class="section see"><dt>See also</dt><dd><a href="https://docs.microsoft.com/en-us/cpp/c-runtime-library/reference/aligned-malloc?view=vs-2017">_aligned_malloc</a> (on Windows) </dd>
+<dl class="section return"><dt>Returns</dt><dd>pointer to the allocated memory or <em class="arg">NULL</em> if out of memory, or if the alignment is not a power of 2 (including 0). The <em class="arg">size</em> is unrestricted (and does not have to be an integral multiple of the <em class="arg">alignment</em>). The returned pointer is aligned by <em class="arg">alignment</em>, i.e. <code>(uintptr_t)p % alignment == 0</code>. Returns a unique pointer if called with <em class="arg">size</em> 0.</dd></dl>
+<p>Note that <code>alignment</code> always follows <code>size</code> for consistency with the unaligned allocation API, but unfortunately this differs from <code>posix_memalign</code> and <code>aligned_alloc</code> in the C library.</p>
+<dl class="section see"><dt>See also</dt><dd><a href="https://en.cppreference.com/w/c/memory/aligned_alloc">aligned_alloc</a> (in the standard C11 library, with switched arguments!) </dd>
+<dd>
+<a href="https://docs.microsoft.com/en-us/cpp/c-runtime-library/reference/aligned-malloc?view=vs-2017">_aligned_malloc</a> (on Windows) </dd>
 <dd>
 <a href="http://man.openbsd.org/reallocarray">aligned_alloc</a> (on BSD, with switched arguments!) </dd>
 <dd>
@@ -271,182 +236,142 @@ <h2 class="memtitle"><span class="permalink"><a href="#ga68930196751fa2cca9e1fd0
 
 </div>
 </div>
-<a id="ga5850da130c936bd77db039dcfbc8295d"></a>
-<h2 class="memtitle"><span class="permalink"><a href="#ga5850da130c936bd77db039dcfbc8295d">&#9670;&nbsp;</a></span>mi_malloc_aligned_at()</h2>
+<a id="ga2022f71b95a7cd6cce1b6e07752ae8ca" name="ga2022f71b95a7cd6cce1b6e07752ae8ca"></a>
+<h2 class="memtitle"><span class="permalink"><a href="#ga2022f71b95a7cd6cce1b6e07752ae8ca">&#9670;&#160;</a></span>mi_malloc_aligned_at()</h2>
 
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname">void* mi_malloc_aligned_at </td>
+          <td class="memname">void * mi_malloc_aligned_at </td>
           <td>(</td>
-          <td class="paramtype">size_t&#160;</td>
-          <td class="paramname"><em>size</em>, </td>
+          <td class="paramtype">size_t</td>          <td class="paramname"><span class="paramname"><em>size</em></span>, </td>
         </tr>
         <tr>
           <td class="paramkey"></td>
           <td></td>
-          <td class="paramtype">size_t&#160;</td>
-          <td class="paramname"><em>alignment</em>, </td>
+          <td class="paramtype">size_t</td>          <td class="paramname"><span class="paramname"><em>alignment</em></span>, </td>
         </tr>
         <tr>
           <td class="paramkey"></td>
           <td></td>
-          <td class="paramtype">size_t&#160;</td>
-          <td class="paramname"><em>offset</em>&#160;</td>
-        </tr>
-        <tr>
-          <td></td>
-          <td>)</td>
-          <td></td><td></td>
+          <td class="paramtype">size_t</td>          <td class="paramname"><span class="paramname"><em>offset</em></span>&#160;)</td>
         </tr>
       </table>
 </div><div class="memdoc">
 
-<p>Allocate <em>size</em> bytes aligned by <em>alignment</em> at a specified <em>offset</em>. </p>
+<p>Allocate <em class="arg">size</em> bytes aligned by <em class="arg">alignment</em> at a specified <em class="arg">offset</em>. </p>
 <dl class="params"><dt>Parameters</dt><dd>
   <table class="params">
     <tr><td class="paramname">size</td><td>number of bytes to allocate. </td></tr>
-    <tr><td class="paramname">alignment</td><td>the minimal alignment of the allocated memory at <em>offset</em>. </td></tr>
+    <tr><td class="paramname">alignment</td><td>the minimal alignment of the allocated memory at <em class="arg">offset</em>. </td></tr>
     <tr><td class="paramname">offset</td><td>the offset that should be aligned. </td></tr>
   </table>
   </dd>
 </dl>
-<dl class="section return"><dt>Returns</dt><dd>pointer to the allocated memory or <em>NULL</em> if out of memory. The returned pointer is aligned by <em>alignment</em> at <em>offset</em>, i.e. <code>((uintptr_t)p + offset) % alignment == 0</code>.</dd></dl>
-<p>Returns a unique pointer if called with <em>size</em> 0. </p><dl class="section see"><dt>See also</dt><dd><a href="https://docs.microsoft.com/en-us/cpp/c-runtime-library/reference/aligned-offset-malloc?view=vs-2017">_aligned_offset_malloc</a> (on Windows) </dd></dl>
+<dl class="section return"><dt>Returns</dt><dd>pointer to the allocated memory or <em class="arg">NULL</em> if out of memory, or if the alignment is not a power of 2 (including 0). The <em class="arg">size</em> is unrestricted (and does not have to be an integral multiple of the <em class="arg">alignment</em>). The returned pointer is aligned by <em class="arg">alignment</em>, i.e. <code>(uintptr_t)p % alignment == 0</code>. Returns a unique pointer if called with <em class="arg">size</em> 0.</dd></dl>
+<dl class="section see"><dt>See also</dt><dd><a href="https://docs.microsoft.com/en-us/cpp/c-runtime-library/reference/aligned-offset-malloc?view=vs-2017">_aligned_offset_malloc</a> (on Windows) </dd></dl>
 
 </div>
 </div>
-<a id="ga4028d1cf4aa4c87c880747044a8322ae"></a>
-<h2 class="memtitle"><span class="permalink"><a href="#ga4028d1cf4aa4c87c880747044a8322ae">&#9670;&nbsp;</a></span>mi_realloc_aligned()</h2>
+<a id="ga5d7a46d054b4d7abe9d8d2474add2edf" name="ga5d7a46d054b4d7abe9d8d2474add2edf"></a>
+<h2 class="memtitle"><span class="permalink"><a href="#ga5d7a46d054b4d7abe9d8d2474add2edf">&#9670;&#160;</a></span>mi_realloc_aligned()</h2>
 
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname">void* mi_realloc_aligned </td>
+          <td class="memname">void * mi_realloc_aligned </td>
           <td>(</td>
-          <td class="paramtype">void *&#160;</td>
-          <td class="paramname"><em>p</em>, </td>
+          <td class="paramtype">void *</td>          <td class="paramname"><span class="paramname"><em>p</em></span>, </td>
         </tr>
         <tr>
           <td class="paramkey"></td>
           <td></td>
-          <td class="paramtype">size_t&#160;</td>
-          <td class="paramname"><em>newsize</em>, </td>
+          <td class="paramtype">size_t</td>          <td class="paramname"><span class="paramname"><em>newsize</em></span>, </td>
         </tr>
         <tr>
           <td class="paramkey"></td>
           <td></td>
-          <td class="paramtype">size_t&#160;</td>
-          <td class="paramname"><em>alignment</em>&#160;</td>
-        </tr>
-        <tr>
-          <td></td>
-          <td>)</td>
-          <td></td><td></td>
+          <td class="paramtype">size_t</td>          <td class="paramname"><span class="paramname"><em>alignment</em></span>&#160;)</td>
         </tr>
       </table>
 </div><div class="memdoc">
 
 </div>
 </div>
-<a id="gaf66a9ae6c6f08bd6be6fb6ea771faffb"></a>
-<h2 class="memtitle"><span class="permalink"><a href="#gaf66a9ae6c6f08bd6be6fb6ea771faffb">&#9670;&nbsp;</a></span>mi_realloc_aligned_at()</h2>
+<a id="gad06dcf2bb8faadb2c8ea61ee5d24bbf6" name="gad06dcf2bb8faadb2c8ea61ee5d24bbf6"></a>
+<h2 class="memtitle"><span class="permalink"><a href="#gad06dcf2bb8faadb2c8ea61ee5d24bbf6">&#9670;&#160;</a></span>mi_realloc_aligned_at()</h2>
 
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname">void* mi_realloc_aligned_at </td>
+          <td class="memname">void * mi_realloc_aligned_at </td>
           <td>(</td>
-          <td class="paramtype">void *&#160;</td>
-          <td class="paramname"><em>p</em>, </td>
+          <td class="paramtype">void *</td>          <td class="paramname"><span class="paramname"><em>p</em></span>, </td>
         </tr>
         <tr>
           <td class="paramkey"></td>
           <td></td>
-          <td class="paramtype">size_t&#160;</td>
-          <td class="paramname"><em>newsize</em>, </td>
+          <td class="paramtype">size_t</td>          <td class="paramname"><span class="paramname"><em>newsize</em></span>, </td>
         </tr>
         <tr>
           <td class="paramkey"></td>
           <td></td>
-          <td class="paramtype">size_t&#160;</td>
-          <td class="paramname"><em>alignment</em>, </td>
+          <td class="paramtype">size_t</td>          <td class="paramname"><span class="paramname"><em>alignment</em></span>, </td>
         </tr>
         <tr>
           <td class="paramkey"></td>
           <td></td>
-          <td class="paramtype">size_t&#160;</td>
-          <td class="paramname"><em>offset</em>&#160;</td>
-        </tr>
-        <tr>
-          <td></td>
-          <td>)</td>
-          <td></td><td></td>
+          <td class="paramtype">size_t</td>          <td class="paramname"><span class="paramname"><em>offset</em></span>&#160;)</td>
         </tr>
       </table>
 </div><div class="memdoc">
 
 </div>
 </div>
-<a id="ga0cadbcf5b89a7b6fb171bc8df8734819"></a>
-<h2 class="memtitle"><span class="permalink"><a href="#ga0cadbcf5b89a7b6fb171bc8df8734819">&#9670;&nbsp;</a></span>mi_zalloc_aligned()</h2>
+<a id="gaac7d0beb782f9b9ac31f47492b130f82" name="gaac7d0beb782f9b9ac31f47492b130f82"></a>
+<h2 class="memtitle"><span class="permalink"><a href="#gaac7d0beb782f9b9ac31f47492b130f82">&#9670;&#160;</a></span>mi_zalloc_aligned()</h2>
 
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname">void* mi_zalloc_aligned </td>
+          <td class="memname">void * mi_zalloc_aligned </td>
           <td>(</td>
-          <td class="paramtype">size_t&#160;</td>
-          <td class="paramname"><em>size</em>, </td>
+          <td class="paramtype">size_t</td>          <td class="paramname"><span class="paramname"><em>size</em></span>, </td>
         </tr>
         <tr>
           <td class="paramkey"></td>
           <td></td>
-          <td class="paramtype">size_t&#160;</td>
-          <td class="paramname"><em>alignment</em>&#160;</td>
-        </tr>
-        <tr>
-          <td></td>
-          <td>)</td>
-          <td></td><td></td>
+          <td class="paramtype">size_t</td>          <td class="paramname"><span class="paramname"><em>alignment</em></span>&#160;)</td>
         </tr>
       </table>
 </div><div class="memdoc">
 
 </div>
 </div>
-<a id="ga5f8c2353766db522565e642fafd8a3f8"></a>
-<h2 class="memtitle"><span class="permalink"><a href="#ga5f8c2353766db522565e642fafd8a3f8">&#9670;&nbsp;</a></span>mi_zalloc_aligned_at()</h2>
+<a id="ga7c1778805ce50ebbf02ccbd5e39d5dba" name="ga7c1778805ce50ebbf02ccbd5e39d5dba"></a>
+<h2 class="memtitle"><span class="permalink"><a href="#ga7c1778805ce50ebbf02ccbd5e39d5dba">&#9670;&#160;</a></span>mi_zalloc_aligned_at()</h2>
 
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname">void* mi_zalloc_aligned_at </td>
+          <td class="memname">void * mi_zalloc_aligned_at </td>
           <td>(</td>
-          <td class="paramtype">size_t&#160;</td>
-          <td class="paramname"><em>size</em>, </td>
+          <td class="paramtype">size_t</td>          <td class="paramname"><span class="paramname"><em>size</em></span>, </td>
         </tr>
         <tr>
           <td class="paramkey"></td>
           <td></td>
-          <td class="paramtype">size_t&#160;</td>
-          <td class="paramname"><em>alignment</em>, </td>
+          <td class="paramtype">size_t</td>          <td class="paramname"><span class="paramname"><em>alignment</em></span>, </td>
         </tr>
         <tr>
           <td class="paramkey"></td>
           <td></td>
-          <td class="paramtype">size_t&#160;</td>
-          <td class="paramname"><em>offset</em>&#160;</td>
-        </tr>
-        <tr>
-          <td></td>
-          <td>)</td>
-          <td></td><td></td>
+          <td class="paramtype">size_t</td>          <td class="paramname"><span class="paramname"><em>offset</em></span>&#160;)</td>
         </tr>
       </table>
 </div><div class="memdoc">
@@ -458,7 +383,7 @@ <h2 class="memtitle"><span class="permalink"><a href="#ga5f8c2353766db522565e642
 <!-- start footer part -->
 <div id="nav-path" class="navpath"><!-- id is needed for treeview function! -->
   <ul>
-    <li class="footer">Generated by <a href="https://www.doxygen.org/index.html"><img class="footer" src="doxygen.svg" width="104" height="31" alt="doxygen"/></a> 1.9.1 </li>
+    <li class="footer">Generated by <a href="https://www.doxygen.org/index.html"><img class="footer" src="doxygen.svg" width="104" height="31" alt="doxygen"/></a> 1.13.1 </li>
   </ul>
 </div>
 </body>
diff --git a/depends/mimalloc/docs/group__aligned.js b/depends/mimalloc/docs/group__aligned.js
index 06ccb0c370bb..d77e5036c311 100644
--- a/depends/mimalloc/docs/group__aligned.js
+++ b/depends/mimalloc/docs/group__aligned.js
@@ -1,12 +1,11 @@
 var group__aligned =
 [
-    [ "MI_ALIGNMENT_MAX", "group__aligned.html#ga83c03016066b438f51a8095e9140be06", null ],
-    [ "mi_calloc_aligned", "group__aligned.html#ga53dddb4724042a90315b94bc268fb4c9", null ],
-    [ "mi_calloc_aligned_at", "group__aligned.html#ga08647c4593f3b2eef24a919a73eba3a3", null ],
-    [ "mi_malloc_aligned", "group__aligned.html#ga68930196751fa2cca9e1fd0d71bade56", null ],
-    [ "mi_malloc_aligned_at", "group__aligned.html#ga5850da130c936bd77db039dcfbc8295d", null ],
-    [ "mi_realloc_aligned", "group__aligned.html#ga4028d1cf4aa4c87c880747044a8322ae", null ],
-    [ "mi_realloc_aligned_at", "group__aligned.html#gaf66a9ae6c6f08bd6be6fb6ea771faffb", null ],
-    [ "mi_zalloc_aligned", "group__aligned.html#ga0cadbcf5b89a7b6fb171bc8df8734819", null ],
-    [ "mi_zalloc_aligned_at", "group__aligned.html#ga5f8c2353766db522565e642fafd8a3f8", null ]
+    [ "mi_calloc_aligned", "group__aligned.html#ga424ef386fb1f9f8e0a86ab53f16eaaf1", null ],
+    [ "mi_calloc_aligned_at", "group__aligned.html#ga977f96bd2c5c141bcd70e6685c90d6c3", null ],
+    [ "mi_malloc_aligned", "group__aligned.html#ga69578ff1a98ca16e1dcd02c0995cd65c", null ],
+    [ "mi_malloc_aligned_at", "group__aligned.html#ga2022f71b95a7cd6cce1b6e07752ae8ca", null ],
+    [ "mi_realloc_aligned", "group__aligned.html#ga5d7a46d054b4d7abe9d8d2474add2edf", null ],
+    [ "mi_realloc_aligned_at", "group__aligned.html#gad06dcf2bb8faadb2c8ea61ee5d24bbf6", null ],
+    [ "mi_zalloc_aligned", "group__aligned.html#gaac7d0beb782f9b9ac31f47492b130f82", null ],
+    [ "mi_zalloc_aligned_at", "group__aligned.html#ga7c1778805ce50ebbf02ccbd5e39d5dba", null ]
 ];
\ No newline at end of file
diff --git a/depends/mimalloc/docs/group__analysis.html b/depends/mimalloc/docs/group__analysis.html
index 883099fe50a7..882830ebb5b4 100644
--- a/depends/mimalloc/docs/group__analysis.html
+++ b/depends/mimalloc/docs/group__analysis.html
@@ -1,24 +1,26 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "https://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
+<html xmlns="http://www.w3.org/1999/xhtml" lang="en-US">
 <head>
 <meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
-<meta http-equiv="X-UA-Compatible" content="IE=9"/>
-<meta name="generator" content="Doxygen 1.9.1"/>
+<meta http-equiv="X-UA-Compatible" content="IE=11"/>
+<meta name="generator" content="Doxygen 1.13.1"/>
 <meta name="viewport" content="width=device-width, initial-scale=1"/>
 <title>mi-malloc: Heap Introspection</title>
 <link href="tabs.css" rel="stylesheet" type="text/css"/>
 <script type="text/javascript" src="jquery.js"></script>
 <script type="text/javascript" src="dynsections.js"></script>
+<script type="text/javascript" src="clipboard.js"></script>
 <link href="navtree.css" rel="stylesheet" type="text/css"/>
-<script type="text/javascript" src="resize.js"></script>
 <script type="text/javascript" src="navtreedata.js"></script>
 <script type="text/javascript" src="navtree.js"></script>
+<script type="text/javascript" src="resize.js"></script>
+<script type="text/javascript" src="cookie.js"></script>
 <link href="search/search.css" rel="stylesheet" type="text/css"/>
 <script type="text/javascript" src="search/searchdata.js"></script>
 <script type="text/javascript" src="search/search.js"></script>
 <script type="text/javascript">
-/* @license magnet:?xt=urn:btih:cf05388f2679ee054f2beb29a391d25f4e673ac3&amp;dn=gpl-2.0.txt GPL-v2 */
-  $(document).ready(function() { init_search(); });
+/* @license magnet:?xt=urn:btih:d3d9a9a6595521f9666a5e94cc830dab83b65699&amp;dn=expat.txt MIT */
+  $(function() { init_search(); });
 /* @license-end */
 </script>
 <link href="doxygen.css" rel="stylesheet" type="text/css" />
@@ -29,20 +31,16 @@
 <div id="titlearea">
 <table cellspacing="0" cellpadding="0">
  <tbody>
- <tr style="height: 56px;">
+ <tr id="projectrow">
   <td id="projectlogo"><img alt="Logo" src="mimalloc-logo.svg"/></td>
-  <td id="projectalign" style="padding-left: 0.5em;">
-   <div id="projectname">mi-malloc
-   &#160;<span id="projectnumber">1.7/2.0</span>
+  <td id="projectalign">
+   <div id="projectname">mi-malloc<span id="projectnumber">&#160;1.8/2.1</span>
    </div>
   </td>
-   <td>        <div id="MSearchBox" class="MSearchBoxInactive">
+    <td>        <div id="MSearchBox" class="MSearchBoxInactive">
         <span class="left">
-          <img id="MSearchSelect" src="search/mag_sel.svg"
-               onmouseover="return searchBox.OnSearchSelectShow()"
-               onmouseout="return searchBox.OnSearchSelectHide()"
-               alt=""/>
-          <input type="text" id="MSearchField" value="Search" accesskey="S"
+          <span id="MSearchSelect"                onmouseover="return searchBox.OnSearchSelectShow()"                onmouseout="return searchBox.OnSearchSelectHide()">&#160;</span>
+          <input type="text" id="MSearchField" value="" placeholder="Search" accesskey="S"
                onfocus="searchBox.OnSearchFieldFocus(true)" 
                onblur="searchBox.OnSearchFieldFocus(false)" 
                onkeyup="searchBox.OnSearchFieldChange(event)"/>
@@ -56,10 +54,15 @@
 </table>
 </div>
 <!-- end header part -->
-<!-- Generated by Doxygen 1.9.1 -->
+<!-- Generated by Doxygen 1.13.1 -->
+<script type="text/javascript">
+/* @license magnet:?xt=urn:btih:d3d9a9a6595521f9666a5e94cc830dab83b65699&amp;dn=expat.txt MIT */
+var searchBox = new SearchBox("searchBox", "search/",'.html');
+/* @license-end */
+</script>
 <script type="text/javascript">
-/* @license magnet:?xt=urn:btih:cf05388f2679ee054f2beb29a391d25f4e673ac3&amp;dn=gpl-2.0.txt GPL-v2 */
-var searchBox = new SearchBox("searchBox", "search",false,'Search','.html');
+/* @license magnet:?xt=urn:btih:d3d9a9a6595521f9666a5e94cc830dab83b65699&amp;dn=expat.txt MIT */
+$(function() { codefold.init(0); });
 /* @license-end */
 </script>
 </div><!-- top -->
@@ -74,8 +77,8 @@
   </div>
 </div>
 <script type="text/javascript">
-/* @license magnet:?xt=urn:btih:cf05388f2679ee054f2beb29a391d25f4e673ac3&amp;dn=gpl-2.0.txt GPL-v2 */
-$(document).ready(function(){initNavTree('group__analysis.html',''); initResizable(); });
+/* @license magnet:?xt=urn:btih:d3d9a9a6595521f9666a5e94cc830dab83b65699&amp;dn=expat.txt MIT */
+$(function(){initNavTree('group__analysis.html',''); initResizable(true); });
 /* @license-end */
 </script>
 <div id="doc-content">
@@ -88,9 +91,16 @@
 
 <!-- iframe showing the search results (closed by default) -->
 <div id="MSearchResultsWindow">
-<iframe src="javascript:void(0)" frameborder="0" 
-        name="MSearchResults" id="MSearchResults">
-</iframe>
+<div id="MSearchResults">
+<div class="SRPage">
+<div id="SRIndex">
+<div id="SRResults"></div>
+<div class="SRStatus" id="Loading">Loading...</div>
+<div class="SRStatus" id="Searching">Searching...</div>
+<div class="SRStatus" id="NoMatches">No Matches</div>
+</div>
+</div>
+</div>
 </div>
 
 <div class="header">
@@ -98,46 +108,48 @@
 <a href="#nested-classes">Data Structures</a> &#124;
 <a href="#typedef-members">Typedefs</a> &#124;
 <a href="#func-members">Functions</a>  </div>
-  <div class="headertitle">
-<div class="title">Heap Introspection</div>  </div>
+  <div class="headertitle"><div class="title">Heap Introspection</div></div>
 </div><!--header-->
 <div class="contents">
 
 <p>Inspect the heap at runtime.  
 <a href="#details">More...</a></p>
 <table class="memberdecls">
-<tr class="heading"><td colspan="2"><h2 class="groupheader"><a name="nested-classes"></a>
+<tr class="heading"><td colspan="2"><h2 class="groupheader"><a id="nested-classes" name="nested-classes"></a>
 Data Structures</h2></td></tr>
-<tr class="memitem:structmi__heap__area__t"><td class="memItemLeft" align="right" valign="top">struct &#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__analysis.html#structmi__heap__area__t">mi_heap_area_t</a></td></tr>
-<tr class="memdesc:structmi__heap__area__t"><td class="mdescLeft">&#160;</td><td class="mdescRight">An area of heap space contains blocks of a single size.  <a href="group__analysis.html#structmi__heap__area__t">More...</a><br /></td></tr>
+<tr class="memitem:structmi__heap__area__t" id="r_structmi__heap__area__t"><td class="memItemLeft" align="right" valign="top">struct &#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="#structmi__heap__area__t">mi_heap_area_t</a></td></tr>
+<tr class="memdesc:structmi__heap__area__t"><td class="mdescLeft">&#160;</td><td class="mdescRight">An area of heap space contains blocks of a single size.  <a href="#structmi__heap__area__t">More...</a><br /></td></tr>
 <tr class="separator:structmi__heap__area__t"><td class="memSeparator" colspan="2">&#160;</td></tr>
 </table><table class="memberdecls">
-<tr class="heading"><td colspan="2"><h2 class="groupheader"><a name="typedef-members"></a>
+<tr class="heading"><td colspan="2"><h2 class="groupheader"><a id="typedef-members" name="typedef-members"></a>
 Typedefs</h2></td></tr>
-<tr class="memitem:gadfa01e2900f0e5d515ad5506b26f6d65"><td class="memItemLeft" align="right" valign="top">typedef bool()&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__analysis.html#gadfa01e2900f0e5d515ad5506b26f6d65">mi_block_visit_fun</a>(const <a class="el" href="group__heap.html#ga34a47cde5a5b38c29f1aa3c5e76943c2">mi_heap_t</a> *heap, const <a class="el" href="group__analysis.html#structmi__heap__area__t">mi_heap_area_t</a> *area, void *block, size_t block_size, void *arg)</td></tr>
-<tr class="memdesc:gadfa01e2900f0e5d515ad5506b26f6d65"><td class="mdescLeft">&#160;</td><td class="mdescRight">Visitor function passed to <a class="el" href="group__analysis.html#ga70c46687dc6e9dc98b232b02646f8bed" title="Visit all areas and blocks in a heap.">mi_heap_visit_blocks()</a>  <a href="group__analysis.html#gadfa01e2900f0e5d515ad5506b26f6d65">More...</a><br /></td></tr>
-<tr class="separator:gadfa01e2900f0e5d515ad5506b26f6d65"><td class="memSeparator" colspan="2">&#160;</td></tr>
+<tr class="memitem:ga8255dc9371e6b299d9802a610c4e34ec" id="r_ga8255dc9371e6b299d9802a610c4e34ec"><td class="memItemLeft" align="right" valign="top">typedef bool&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="#ga8255dc9371e6b299d9802a610c4e34ec">mi_block_visit_fun</a>(const <a class="el" href="group__heap.html#ga34a47cde5a5b38c29f1aa3c5e76943c2">mi_heap_t</a> *heap, const <a class="el" href="#structmi__heap__area__t">mi_heap_area_t</a> *area, void *block, size_t block_size, void *arg)</td></tr>
+<tr class="memdesc:ga8255dc9371e6b299d9802a610c4e34ec"><td class="mdescLeft">&#160;</td><td class="mdescRight">Visitor function passed to <a class="el" href="#ga70c46687dc6e9dc98b232b02646f8bed" title="Visit all areas and blocks in a heap.">mi_heap_visit_blocks()</a>  <br /></td></tr>
+<tr class="separator:ga8255dc9371e6b299d9802a610c4e34ec"><td class="memSeparator" colspan="2">&#160;</td></tr>
 </table><table class="memberdecls">
-<tr class="heading"><td colspan="2"><h2 class="groupheader"><a name="func-members"></a>
+<tr class="heading"><td colspan="2"><h2 class="groupheader"><a id="func-members" name="func-members"></a>
 Functions</h2></td></tr>
-<tr class="memitem:gaa862aa8ed8d57d84cae41fc1022d71af"><td class="memItemLeft" align="right" valign="top">bool&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__analysis.html#gaa862aa8ed8d57d84cae41fc1022d71af">mi_heap_contains_block</a> (<a class="el" href="group__heap.html#ga34a47cde5a5b38c29f1aa3c5e76943c2">mi_heap_t</a> *heap, const void *p)</td></tr>
-<tr class="memdesc:gaa862aa8ed8d57d84cae41fc1022d71af"><td class="mdescLeft">&#160;</td><td class="mdescRight">Does a heap contain a pointer to a previously allocated block?  <a href="group__analysis.html#gaa862aa8ed8d57d84cae41fc1022d71af">More...</a><br /></td></tr>
+<tr class="memitem:gaa862aa8ed8d57d84cae41fc1022d71af" id="r_gaa862aa8ed8d57d84cae41fc1022d71af"><td class="memItemLeft" align="right" valign="top">bool&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="#gaa862aa8ed8d57d84cae41fc1022d71af">mi_heap_contains_block</a> (<a class="el" href="group__heap.html#ga34a47cde5a5b38c29f1aa3c5e76943c2">mi_heap_t</a> *heap, const void *p)</td></tr>
+<tr class="memdesc:gaa862aa8ed8d57d84cae41fc1022d71af"><td class="mdescLeft">&#160;</td><td class="mdescRight">Does a heap contain a pointer to a previously allocated block?  <br /></td></tr>
 <tr class="separator:gaa862aa8ed8d57d84cae41fc1022d71af"><td class="memSeparator" colspan="2">&#160;</td></tr>
-<tr class="memitem:ga0d67c1789faaa15ff366c024fcaf6377"><td class="memItemLeft" align="right" valign="top">bool&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__analysis.html#ga0d67c1789faaa15ff366c024fcaf6377">mi_heap_check_owned</a> (<a class="el" href="group__heap.html#ga34a47cde5a5b38c29f1aa3c5e76943c2">mi_heap_t</a> *heap, const void *p)</td></tr>
-<tr class="memdesc:ga0d67c1789faaa15ff366c024fcaf6377"><td class="mdescLeft">&#160;</td><td class="mdescRight">Check safely if any pointer is part of a heap.  <a href="group__analysis.html#ga0d67c1789faaa15ff366c024fcaf6377">More...</a><br /></td></tr>
+<tr class="memitem:ga0d67c1789faaa15ff366c024fcaf6377" id="r_ga0d67c1789faaa15ff366c024fcaf6377"><td class="memItemLeft" align="right" valign="top">bool&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="#ga0d67c1789faaa15ff366c024fcaf6377">mi_heap_check_owned</a> (<a class="el" href="group__heap.html#ga34a47cde5a5b38c29f1aa3c5e76943c2">mi_heap_t</a> *heap, const void *p)</td></tr>
+<tr class="memdesc:ga0d67c1789faaa15ff366c024fcaf6377"><td class="mdescLeft">&#160;</td><td class="mdescRight">Check safely if any pointer is part of a heap.  <br /></td></tr>
 <tr class="separator:ga0d67c1789faaa15ff366c024fcaf6377"><td class="memSeparator" colspan="2">&#160;</td></tr>
-<tr class="memitem:ga628c237489c2679af84a4d0d143b3dd5"><td class="memItemLeft" align="right" valign="top">bool&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__analysis.html#ga628c237489c2679af84a4d0d143b3dd5">mi_check_owned</a> (const void *p)</td></tr>
-<tr class="memdesc:ga628c237489c2679af84a4d0d143b3dd5"><td class="mdescLeft">&#160;</td><td class="mdescRight">Check safely if any pointer is part of the default heap of this thread.  <a href="group__analysis.html#ga628c237489c2679af84a4d0d143b3dd5">More...</a><br /></td></tr>
+<tr class="memitem:ga628c237489c2679af84a4d0d143b3dd5" id="r_ga628c237489c2679af84a4d0d143b3dd5"><td class="memItemLeft" align="right" valign="top">bool&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="#ga628c237489c2679af84a4d0d143b3dd5">mi_check_owned</a> (const void *p)</td></tr>
+<tr class="memdesc:ga628c237489c2679af84a4d0d143b3dd5"><td class="mdescLeft">&#160;</td><td class="mdescRight">Check safely if any pointer is part of the default heap of this thread.  <br /></td></tr>
 <tr class="separator:ga628c237489c2679af84a4d0d143b3dd5"><td class="memSeparator" colspan="2">&#160;</td></tr>
-<tr class="memitem:ga70c46687dc6e9dc98b232b02646f8bed"><td class="memItemLeft" align="right" valign="top">bool&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__analysis.html#ga70c46687dc6e9dc98b232b02646f8bed">mi_heap_visit_blocks</a> (const <a class="el" href="group__heap.html#ga34a47cde5a5b38c29f1aa3c5e76943c2">mi_heap_t</a> *heap, bool visit_all_blocks, <a class="el" href="group__analysis.html#gadfa01e2900f0e5d515ad5506b26f6d65">mi_block_visit_fun</a> *visitor, void *arg)</td></tr>
-<tr class="memdesc:ga70c46687dc6e9dc98b232b02646f8bed"><td class="mdescLeft">&#160;</td><td class="mdescRight">Visit all areas and blocks in a heap.  <a href="group__analysis.html#ga70c46687dc6e9dc98b232b02646f8bed">More...</a><br /></td></tr>
+<tr class="memitem:ga70c46687dc6e9dc98b232b02646f8bed" id="r_ga70c46687dc6e9dc98b232b02646f8bed"><td class="memItemLeft" align="right" valign="top">bool&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="#ga70c46687dc6e9dc98b232b02646f8bed">mi_heap_visit_blocks</a> (const <a class="el" href="group__heap.html#ga34a47cde5a5b38c29f1aa3c5e76943c2">mi_heap_t</a> *heap, bool visit_all_blocks, <a class="el" href="#ga8255dc9371e6b299d9802a610c4e34ec">mi_block_visit_fun</a> *visitor, void *arg)</td></tr>
+<tr class="memdesc:ga70c46687dc6e9dc98b232b02646f8bed"><td class="mdescLeft">&#160;</td><td class="mdescRight">Visit all areas and blocks in a heap.  <br /></td></tr>
 <tr class="separator:ga70c46687dc6e9dc98b232b02646f8bed"><td class="memSeparator" colspan="2">&#160;</td></tr>
+<tr class="memitem:ga6a4865a887b2ec5247854af61562503c" id="r_ga6a4865a887b2ec5247854af61562503c"><td class="memItemLeft" align="right" valign="top">bool&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="#ga6a4865a887b2ec5247854af61562503c">mi_abandoned_visit_blocks</a> (<a class="el" href="group__extended.html#ga8c0bcd1fee27c7641e9c3c0d991b3b7d">mi_subproc_id_t</a> subproc_id, int heap_tag, bool visit_blocks, <a class="el" href="#ga8255dc9371e6b299d9802a610c4e34ec">mi_block_visit_fun</a> *visitor, void *arg)</td></tr>
+<tr class="memdesc:ga6a4865a887b2ec5247854af61562503c"><td class="mdescLeft">&#160;</td><td class="mdescRight">Visit all areas and blocks in abandoned heaps.  <br /></td></tr>
+<tr class="separator:ga6a4865a887b2ec5247854af61562503c"><td class="memSeparator" colspan="2">&#160;</td></tr>
 </table>
 <a name="details" id="details"></a><h2 class="groupheader">Detailed Description</h2>
 <p>Inspect the heap at runtime. </p>
 <hr/><h2 class="groupheader">Data Structure Documentation</h2>
 <a name="structmi__heap__area__t" id="structmi__heap__area__t"></a>
-<h2 class="memtitle"><span class="permalink"><a href="#structmi__heap__area__t">&#9670;&nbsp;</a></span>mi_heap_area_t</h2>
+<h2 class="memtitle"><span class="permalink"><a href="#structmi__heap__area__t">&#9670;&#160;</a></span>mi_heap_area_t</h2>
 
 <div class="memitem">
 <div class="memproto">
@@ -152,31 +164,43 @@ <h2 class="memtitle"><span class="permalink"><a href="#structmi__heap__area__t">
 </div><table class="fieldtable">
 <tr><th colspan="3">Data Fields</th></tr>
 <tr><td class="fieldtype">
-<a id="a332a6c14d736a99699d5453a1cb04b41"></a>size_t</td>
+<a id="a332a6c14d736a99699d5453a1cb04b41" name="a332a6c14d736a99699d5453a1cb04b41"></a>size_t</td>
 <td class="fieldname">
 block_size</td>
 <td class="fielddoc">
 size in bytes of one block </td></tr>
 <tr><td class="fieldtype">
-<a id="ae0085e6e1cf059a4eb7767e30e9991b8"></a>void *</td>
+<a id="ae0085e6e1cf059a4eb7767e30e9991b8" name="ae0085e6e1cf059a4eb7767e30e9991b8"></a>void *</td>
 <td class="fieldname">
 blocks</td>
 <td class="fielddoc">
 start of the area containing heap blocks </td></tr>
 <tr><td class="fieldtype">
-<a id="ab47526df656d8837ec3e97f11b83f835"></a>size_t</td>
+<a id="ab47526df656d8837ec3e97f11b83f835" name="ab47526df656d8837ec3e97f11b83f835"></a>size_t</td>
 <td class="fieldname">
 committed</td>
 <td class="fielddoc">
 current committed bytes of this area </td></tr>
 <tr><td class="fieldtype">
-<a id="ae848a3e6840414891035423948ca0383"></a>size_t</td>
+<a id="ab53664e31d7fe2564f8d42041ef75cb3" name="ab53664e31d7fe2564f8d42041ef75cb3"></a>size_t</td>
+<td class="fieldname">
+full_block_size</td>
+<td class="fielddoc">
+size in bytes of a full block including padding and metadata. </td></tr>
+<tr><td class="fieldtype">
+<a id="a2b7a0c92ece8daf46b558efc990ebdc1" name="a2b7a0c92ece8daf46b558efc990ebdc1"></a>int</td>
+<td class="fieldname">
+heap_tag</td>
+<td class="fielddoc">
+heap tag associated with this area (see <em class="arg">mi_heap_new_ex</em>) </td></tr>
+<tr><td class="fieldtype">
+<a id="ae848a3e6840414891035423948ca0383" name="ae848a3e6840414891035423948ca0383"></a>size_t</td>
 <td class="fieldname">
 reserved</td>
 <td class="fielddoc">
 bytes reserved for this area </td></tr>
 <tr><td class="fieldtype">
-<a id="ab820302c5cd0df133eb8e51650a008b4"></a>size_t</td>
+<a id="ab820302c5cd0df133eb8e51650a008b4" name="ab820302c5cd0df133eb8e51650a008b4"></a>size_t</td>
 <td class="fieldname">
 used</td>
 <td class="fielddoc">
@@ -186,27 +210,77 @@ <h2 class="memtitle"><span class="permalink"><a href="#structmi__heap__area__t">
 </div>
 </div>
 <h2 class="groupheader">Typedef Documentation</h2>
-<a id="gadfa01e2900f0e5d515ad5506b26f6d65"></a>
-<h2 class="memtitle"><span class="permalink"><a href="#gadfa01e2900f0e5d515ad5506b26f6d65">&#9670;&nbsp;</a></span>mi_block_visit_fun</h2>
+<a id="ga8255dc9371e6b299d9802a610c4e34ec" name="ga8255dc9371e6b299d9802a610c4e34ec"></a>
+<h2 class="memtitle"><span class="permalink"><a href="#ga8255dc9371e6b299d9802a610c4e34ec">&#9670;&#160;</a></span>mi_block_visit_fun</h2>
 
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname">typedef bool() mi_block_visit_fun(const <a class="el" href="group__heap.html#ga34a47cde5a5b38c29f1aa3c5e76943c2">mi_heap_t</a> *heap, const <a class="el" href="group__analysis.html#structmi__heap__area__t">mi_heap_area_t</a> *area, void *block, size_t block_size, void *arg)</td>
+          <td class="memname">typedef bool mi_block_visit_fun(const <a class="el" href="group__heap.html#ga34a47cde5a5b38c29f1aa3c5e76943c2">mi_heap_t</a> *heap, const <a class="el" href="#structmi__heap__area__t">mi_heap_area_t</a> *area, void *block, size_t block_size, void *arg)</td>
         </tr>
       </table>
 </div><div class="memdoc">
 
-<p>Visitor function passed to <a class="el" href="group__analysis.html#ga70c46687dc6e9dc98b232b02646f8bed" title="Visit all areas and blocks in a heap.">mi_heap_visit_blocks()</a> </p>
-<dl class="section return"><dt>Returns</dt><dd><em>true</em> if ok, <em>false</em> to stop visiting (i.e. break)</dd></dl>
-<p>This function is always first called for every <em>area</em> with <em>block</em> as a <em>NULL</em> pointer. If <em>visit_all_blocks</em> was <em>true</em>, the function is then called for every allocated block in that area. </p>
+<p>Visitor function passed to <a class="el" href="#ga70c46687dc6e9dc98b232b02646f8bed" title="Visit all areas and blocks in a heap.">mi_heap_visit_blocks()</a> </p>
+<dl class="section return"><dt>Returns</dt><dd><em class="arg">true</em> if ok, <em class="arg">false</em> to stop visiting (i.e. break)</dd></dl>
+<p>This function is always first called for every <em class="arg">area</em> with <em class="arg">block</em> as a <em class="arg">NULL</em> pointer. If <em class="arg">visit_all_blocks</em> was <em class="arg">true</em>, the function is then called for every allocated block in that area. </p>
 
 </div>
 </div>
 <h2 class="groupheader">Function Documentation</h2>
-<a id="ga628c237489c2679af84a4d0d143b3dd5"></a>
-<h2 class="memtitle"><span class="permalink"><a href="#ga628c237489c2679af84a4d0d143b3dd5">&#9670;&nbsp;</a></span>mi_check_owned()</h2>
+<a id="ga6a4865a887b2ec5247854af61562503c" name="ga6a4865a887b2ec5247854af61562503c"></a>
+<h2 class="memtitle"><span class="permalink"><a href="#ga6a4865a887b2ec5247854af61562503c">&#9670;&#160;</a></span>mi_abandoned_visit_blocks()</h2>
+
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">bool mi_abandoned_visit_blocks </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="group__extended.html#ga8c0bcd1fee27c7641e9c3c0d991b3b7d">mi_subproc_id_t</a></td>          <td class="paramname"><span class="paramname"><em>subproc_id</em></span>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">int</td>          <td class="paramname"><span class="paramname"><em>heap_tag</em></span>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">bool</td>          <td class="paramname"><span class="paramname"><em>visit_blocks</em></span>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype"><a class="el" href="#ga8255dc9371e6b299d9802a610c4e34ec">mi_block_visit_fun</a> *</td>          <td class="paramname"><span class="paramname"><em>visitor</em></span>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">void *</td>          <td class="paramname"><span class="paramname"><em>arg</em></span>&#160;)</td>
+        </tr>
+      </table>
+</div><div class="memdoc">
+
+<p>Visit all areas and blocks in abandoned heaps. </p>
+<dl class="params"><dt>Parameters</dt><dd>
+  <table class="params">
+    <tr><td class="paramname">subproc_id</td><td>The sub-process id associated with the abandoned heaps. </td></tr>
+    <tr><td class="paramname">heap_tag</td><td>Visit only abandoned memory with the specified heap tag, use -1 to visit all abandoned memory. </td></tr>
+    <tr><td class="paramname">visit_blocks</td><td>If <em class="arg">true</em> visits all allocated blocks, otherwise <em class="arg">visitor</em> is only called for every heap area. </td></tr>
+    <tr><td class="paramname">visitor</td><td>This function is called for every area in the heap (with <em class="arg">block</em> as <em class="arg">NULL</em>). If <em class="arg">visit_all_blocks</em> is <em class="arg">true</em>, <em class="arg">visitor</em> is also called for every allocated block in every area (with <code>block!=NULL</code>). return <em class="arg">false</em> from this function to stop visiting early. </td></tr>
+    <tr><td class="paramname">arg</td><td>extra argument passed to the <em class="arg">visitor</em>. </td></tr>
+  </table>
+  </dd>
+</dl>
+<dl class="section return"><dt>Returns</dt><dd><em class="arg">true</em> if all areas and blocks were visited.</dd></dl>
+<p>Note: requires the option <code>mi_option_visit_abandoned</code> to be set at the start of the program. </p>
+
+</div>
+</div>
+<a id="ga628c237489c2679af84a4d0d143b3dd5" name="ga628c237489c2679af84a4d0d143b3dd5"></a>
+<h2 class="memtitle"><span class="permalink"><a href="#ga628c237489c2679af84a4d0d143b3dd5">&#9670;&#160;</a></span>mi_check_owned()</h2>
 
 <div class="memitem">
 <div class="memproto">
@@ -214,8 +288,7 @@ <h2 class="memtitle"><span class="permalink"><a href="#ga628c237489c2679af84a4d0
         <tr>
           <td class="memname">bool mi_check_owned </td>
           <td>(</td>
-          <td class="paramtype">const void *&#160;</td>
-          <td class="paramname"><em>p</em></td><td>)</td>
+          <td class="paramtype">const void *</td>          <td class="paramname"><span class="paramname"><em>p</em></span></td><td>)</td>
           <td></td>
         </tr>
       </table>
@@ -228,15 +301,15 @@ <h2 class="memtitle"><span class="permalink"><a href="#ga628c237489c2679af84a4d0
   </table>
   </dd>
 </dl>
-<dl class="section return"><dt>Returns</dt><dd><em>true</em> if <em>p</em> points to a block in default heap of this thread.</dd></dl>
-<p>Note: expensive function, linear in the pages in the heap. </p><dl class="section see"><dt>See also</dt><dd><a class="el" href="group__analysis.html#gaa862aa8ed8d57d84cae41fc1022d71af" title="Does a heap contain a pointer to a previously allocated block?">mi_heap_contains_block()</a> </dd>
+<dl class="section return"><dt>Returns</dt><dd><em class="arg">true</em> if <em class="arg">p</em> points to a block in default heap of this thread.</dd></dl>
+<p>Note: expensive function, linear in the pages in the heap. </p><dl class="section see"><dt>See also</dt><dd><a class="el" href="#gaa862aa8ed8d57d84cae41fc1022d71af" title="Does a heap contain a pointer to a previously allocated block?">mi_heap_contains_block()</a> </dd>
 <dd>
-<a class="el" href="group__heap.html#ga8db4cbb87314a989a9a187464d6b5e05" title="Get the default heap that is used for mi_malloc() et al.">mi_heap_get_default()</a> </dd></dl>
+<a class="el" href="group__heap.html#ga14c667a6e2c5d28762d8cb7d4e057909" title="Get the default heap that is used for mi_malloc() et al.">mi_heap_get_default()</a> </dd></dl>
 
 </div>
 </div>
-<a id="ga0d67c1789faaa15ff366c024fcaf6377"></a>
-<h2 class="memtitle"><span class="permalink"><a href="#ga0d67c1789faaa15ff366c024fcaf6377">&#9670;&nbsp;</a></span>mi_heap_check_owned()</h2>
+<a id="ga0d67c1789faaa15ff366c024fcaf6377" name="ga0d67c1789faaa15ff366c024fcaf6377"></a>
+<h2 class="memtitle"><span class="permalink"><a href="#ga0d67c1789faaa15ff366c024fcaf6377">&#9670;&#160;</a></span>mi_heap_check_owned()</h2>
 
 <div class="memitem">
 <div class="memproto">
@@ -244,19 +317,12 @@ <h2 class="memtitle"><span class="permalink"><a href="#ga0d67c1789faaa15ff366c02
         <tr>
           <td class="memname">bool mi_heap_check_owned </td>
           <td>(</td>
-          <td class="paramtype"><a class="el" href="group__heap.html#ga34a47cde5a5b38c29f1aa3c5e76943c2">mi_heap_t</a> *&#160;</td>
-          <td class="paramname"><em>heap</em>, </td>
+          <td class="paramtype"><a class="el" href="group__heap.html#ga34a47cde5a5b38c29f1aa3c5e76943c2">mi_heap_t</a> *</td>          <td class="paramname"><span class="paramname"><em>heap</em></span>, </td>
         </tr>
         <tr>
           <td class="paramkey"></td>
           <td></td>
-          <td class="paramtype">const void *&#160;</td>
-          <td class="paramname"><em>p</em>&#160;</td>
-        </tr>
-        <tr>
-          <td></td>
-          <td>)</td>
-          <td></td><td></td>
+          <td class="paramtype">const void *</td>          <td class="paramname"><span class="paramname"><em>p</em></span>&#160;)</td>
         </tr>
       </table>
 </div><div class="memdoc">
@@ -269,15 +335,15 @@ <h2 class="memtitle"><span class="permalink"><a href="#ga0d67c1789faaa15ff366c02
   </table>
   </dd>
 </dl>
-<dl class="section return"><dt>Returns</dt><dd><em>true</em> if <em>p</em> points to a block in <em>heap</em>.</dd></dl>
-<p>Note: expensive function, linear in the pages in the heap. </p><dl class="section see"><dt>See also</dt><dd><a class="el" href="group__analysis.html#gaa862aa8ed8d57d84cae41fc1022d71af" title="Does a heap contain a pointer to a previously allocated block?">mi_heap_contains_block()</a> </dd>
+<dl class="section return"><dt>Returns</dt><dd><em class="arg">true</em> if <em class="arg">p</em> points to a block in <em class="arg">heap</em>.</dd></dl>
+<p>Note: expensive function, linear in the pages in the heap. </p><dl class="section see"><dt>See also</dt><dd><a class="el" href="#gaa862aa8ed8d57d84cae41fc1022d71af" title="Does a heap contain a pointer to a previously allocated block?">mi_heap_contains_block()</a> </dd>
 <dd>
-<a class="el" href="group__heap.html#ga8db4cbb87314a989a9a187464d6b5e05" title="Get the default heap that is used for mi_malloc() et al.">mi_heap_get_default()</a> </dd></dl>
+<a class="el" href="group__heap.html#ga14c667a6e2c5d28762d8cb7d4e057909" title="Get the default heap that is used for mi_malloc() et al.">mi_heap_get_default()</a> </dd></dl>
 
 </div>
 </div>
-<a id="gaa862aa8ed8d57d84cae41fc1022d71af"></a>
-<h2 class="memtitle"><span class="permalink"><a href="#gaa862aa8ed8d57d84cae41fc1022d71af">&#9670;&nbsp;</a></span>mi_heap_contains_block()</h2>
+<a id="gaa862aa8ed8d57d84cae41fc1022d71af" name="gaa862aa8ed8d57d84cae41fc1022d71af"></a>
+<h2 class="memtitle"><span class="permalink"><a href="#gaa862aa8ed8d57d84cae41fc1022d71af">&#9670;&#160;</a></span>mi_heap_contains_block()</h2>
 
 <div class="memitem">
 <div class="memproto">
@@ -285,19 +351,12 @@ <h2 class="memtitle"><span class="permalink"><a href="#gaa862aa8ed8d57d84cae41fc
         <tr>
           <td class="memname">bool mi_heap_contains_block </td>
           <td>(</td>
-          <td class="paramtype"><a class="el" href="group__heap.html#ga34a47cde5a5b38c29f1aa3c5e76943c2">mi_heap_t</a> *&#160;</td>
-          <td class="paramname"><em>heap</em>, </td>
+          <td class="paramtype"><a class="el" href="group__heap.html#ga34a47cde5a5b38c29f1aa3c5e76943c2">mi_heap_t</a> *</td>          <td class="paramname"><span class="paramname"><em>heap</em></span>, </td>
         </tr>
         <tr>
           <td class="paramkey"></td>
           <td></td>
-          <td class="paramtype">const void *&#160;</td>
-          <td class="paramname"><em>p</em>&#160;</td>
-        </tr>
-        <tr>
-          <td></td>
-          <td>)</td>
-          <td></td><td></td>
+          <td class="paramtype">const void *</td>          <td class="paramname"><span class="paramname"><em>p</em></span>&#160;)</td>
         </tr>
       </table>
 </div><div class="memdoc">
@@ -310,13 +369,13 @@ <h2 class="memtitle"><span class="permalink"><a href="#gaa862aa8ed8d57d84cae41fc
   </table>
   </dd>
 </dl>
-<dl class="section return"><dt>Returns</dt><dd><em>true</em> if the block pointed to by <em>p</em> is in the <em>heap</em>. </dd></dl>
-<dl class="section see"><dt>See also</dt><dd><a class="el" href="group__analysis.html#ga0d67c1789faaa15ff366c024fcaf6377" title="Check safely if any pointer is part of a heap.">mi_heap_check_owned()</a> </dd></dl>
+<dl class="section return"><dt>Returns</dt><dd><em class="arg">true</em> if the block pointed to by <em class="arg">p</em> is in the <em class="arg">heap</em>. </dd></dl>
+<dl class="section see"><dt>See also</dt><dd><a class="el" href="#ga0d67c1789faaa15ff366c024fcaf6377" title="Check safely if any pointer is part of a heap.">mi_heap_check_owned()</a> </dd></dl>
 
 </div>
 </div>
-<a id="ga70c46687dc6e9dc98b232b02646f8bed"></a>
-<h2 class="memtitle"><span class="permalink"><a href="#ga70c46687dc6e9dc98b232b02646f8bed">&#9670;&nbsp;</a></span>mi_heap_visit_blocks()</h2>
+<a id="ga70c46687dc6e9dc98b232b02646f8bed" name="ga70c46687dc6e9dc98b232b02646f8bed"></a>
+<h2 class="memtitle"><span class="permalink"><a href="#ga70c46687dc6e9dc98b232b02646f8bed">&#9670;&#160;</a></span>mi_heap_visit_blocks()</h2>
 
 <div class="memitem">
 <div class="memproto">
@@ -324,31 +383,22 @@ <h2 class="memtitle"><span class="permalink"><a href="#ga70c46687dc6e9dc98b232b0
         <tr>
           <td class="memname">bool mi_heap_visit_blocks </td>
           <td>(</td>
-          <td class="paramtype">const <a class="el" href="group__heap.html#ga34a47cde5a5b38c29f1aa3c5e76943c2">mi_heap_t</a> *&#160;</td>
-          <td class="paramname"><em>heap</em>, </td>
+          <td class="paramtype">const <a class="el" href="group__heap.html#ga34a47cde5a5b38c29f1aa3c5e76943c2">mi_heap_t</a> *</td>          <td class="paramname"><span class="paramname"><em>heap</em></span>, </td>
         </tr>
         <tr>
           <td class="paramkey"></td>
           <td></td>
-          <td class="paramtype">bool&#160;</td>
-          <td class="paramname"><em>visit_all_blocks</em>, </td>
+          <td class="paramtype">bool</td>          <td class="paramname"><span class="paramname"><em>visit_all_blocks</em></span>, </td>
         </tr>
         <tr>
           <td class="paramkey"></td>
           <td></td>
-          <td class="paramtype"><a class="el" href="group__analysis.html#gadfa01e2900f0e5d515ad5506b26f6d65">mi_block_visit_fun</a> *&#160;</td>
-          <td class="paramname"><em>visitor</em>, </td>
+          <td class="paramtype"><a class="el" href="#ga8255dc9371e6b299d9802a610c4e34ec">mi_block_visit_fun</a> *</td>          <td class="paramname"><span class="paramname"><em>visitor</em></span>, </td>
         </tr>
         <tr>
           <td class="paramkey"></td>
           <td></td>
-          <td class="paramtype">void *&#160;</td>
-          <td class="paramname"><em>arg</em>&#160;</td>
-        </tr>
-        <tr>
-          <td></td>
-          <td>)</td>
-          <td></td><td></td>
+          <td class="paramtype">void *</td>          <td class="paramname"><span class="paramname"><em>arg</em></span>&#160;)</td>
         </tr>
       </table>
 </div><div class="memdoc">
@@ -357,13 +407,13 @@ <h2 class="memtitle"><span class="permalink"><a href="#ga70c46687dc6e9dc98b232b0
 <dl class="params"><dt>Parameters</dt><dd>
   <table class="params">
     <tr><td class="paramname">heap</td><td>The heap to visit. </td></tr>
-    <tr><td class="paramname">visit_all_blocks</td><td>If <em>true</em> visits all allocated blocks, otherwise <em>visitor</em> is only called for every heap area. </td></tr>
-    <tr><td class="paramname">visitor</td><td>This function is called for every area in the heap (with <em>block</em> as <em>NULL</em>). If <em>visit_all_blocks</em> is <em>true</em>, <em>visitor</em> is also called for every allocated block in every area (with <code>block!=NULL</code>). return <em>false</em> from this function to stop visiting early. </td></tr>
-    <tr><td class="paramname">arg</td><td>Extra argument passed to <em>visitor</em>. </td></tr>
+    <tr><td class="paramname">visit_all_blocks</td><td>If <em class="arg">true</em> visits all allocated blocks, otherwise <em class="arg">visitor</em> is only called for every heap area. </td></tr>
+    <tr><td class="paramname">visitor</td><td>This function is called for every area in the heap (with <em class="arg">block</em> as <em class="arg">NULL</em>). If <em class="arg">visit_all_blocks</em> is <em class="arg">true</em>, <em class="arg">visitor</em> is also called for every allocated block in every area (with <code>block!=NULL</code>). return <em class="arg">false</em> from this function to stop visiting early. </td></tr>
+    <tr><td class="paramname">arg</td><td>Extra argument passed to <em class="arg">visitor</em>. </td></tr>
   </table>
   </dd>
 </dl>
-<dl class="section return"><dt>Returns</dt><dd><em>true</em> if all areas and blocks were visited. </dd></dl>
+<dl class="section return"><dt>Returns</dt><dd><em class="arg">true</em> if all areas and blocks were visited. </dd></dl>
 
 </div>
 </div>
@@ -372,7 +422,7 @@ <h2 class="memtitle"><span class="permalink"><a href="#ga70c46687dc6e9dc98b232b0
 <!-- start footer part -->
 <div id="nav-path" class="navpath"><!-- id is needed for treeview function! -->
   <ul>
-    <li class="footer">Generated by <a href="https://www.doxygen.org/index.html"><img class="footer" src="doxygen.svg" width="104" height="31" alt="doxygen"/></a> 1.9.1 </li>
+    <li class="footer">Generated by <a href="https://www.doxygen.org/index.html"><img class="footer" src="doxygen.svg" width="104" height="31" alt="doxygen"/></a> 1.13.1 </li>
   </ul>
 </div>
 </body>
diff --git a/depends/mimalloc/docs/group__analysis.js b/depends/mimalloc/docs/group__analysis.js
index 351783628ddf..5e72b94a5e4f 100644
--- a/depends/mimalloc/docs/group__analysis.js
+++ b/depends/mimalloc/docs/group__analysis.js
@@ -4,10 +4,13 @@ var group__analysis =
       [ "block_size", "group__analysis.html#a332a6c14d736a99699d5453a1cb04b41", null ],
       [ "blocks", "group__analysis.html#ae0085e6e1cf059a4eb7767e30e9991b8", null ],
       [ "committed", "group__analysis.html#ab47526df656d8837ec3e97f11b83f835", null ],
+      [ "full_block_size", "group__analysis.html#ab53664e31d7fe2564f8d42041ef75cb3", null ],
+      [ "heap_tag", "group__analysis.html#a2b7a0c92ece8daf46b558efc990ebdc1", null ],
       [ "reserved", "group__analysis.html#ae848a3e6840414891035423948ca0383", null ],
       [ "used", "group__analysis.html#ab820302c5cd0df133eb8e51650a008b4", null ]
     ] ],
-    [ "mi_block_visit_fun", "group__analysis.html#gadfa01e2900f0e5d515ad5506b26f6d65", null ],
+    [ "mi_block_visit_fun", "group__analysis.html#ga8255dc9371e6b299d9802a610c4e34ec", null ],
+    [ "mi_abandoned_visit_blocks", "group__analysis.html#ga6a4865a887b2ec5247854af61562503c", null ],
     [ "mi_check_owned", "group__analysis.html#ga628c237489c2679af84a4d0d143b3dd5", null ],
     [ "mi_heap_check_owned", "group__analysis.html#ga0d67c1789faaa15ff366c024fcaf6377", null ],
     [ "mi_heap_contains_block", "group__analysis.html#gaa862aa8ed8d57d84cae41fc1022d71af", null ],
diff --git a/depends/mimalloc/docs/group__analysis_structmi__heap__area__t.js b/depends/mimalloc/docs/group__analysis_structmi__heap__area__t.js
index 2dbabc5cde17..41a8e77abecc 100644
--- a/depends/mimalloc/docs/group__analysis_structmi__heap__area__t.js
+++ b/depends/mimalloc/docs/group__analysis_structmi__heap__area__t.js
@@ -3,6 +3,8 @@ var group__analysis_structmi__heap__area__t =
     [ "block_size", "group__analysis.html#a332a6c14d736a99699d5453a1cb04b41", null ],
     [ "blocks", "group__analysis.html#ae0085e6e1cf059a4eb7767e30e9991b8", null ],
     [ "committed", "group__analysis.html#ab47526df656d8837ec3e97f11b83f835", null ],
+    [ "full_block_size", "group__analysis.html#ab53664e31d7fe2564f8d42041ef75cb3", null ],
+    [ "heap_tag", "group__analysis.html#a2b7a0c92ece8daf46b558efc990ebdc1", null ],
     [ "reserved", "group__analysis.html#ae848a3e6840414891035423948ca0383", null ],
     [ "used", "group__analysis.html#ab820302c5cd0df133eb8e51650a008b4", null ]
 ];
\ No newline at end of file
diff --git a/depends/mimalloc/docs/group__cpp.html b/depends/mimalloc/docs/group__cpp.html
index e81179feb643..d998433469de 100644
--- a/depends/mimalloc/docs/group__cpp.html
+++ b/depends/mimalloc/docs/group__cpp.html
@@ -1,24 +1,26 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "https://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
+<html xmlns="http://www.w3.org/1999/xhtml" lang="en-US">
 <head>
 <meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
-<meta http-equiv="X-UA-Compatible" content="IE=9"/>
-<meta name="generator" content="Doxygen 1.9.1"/>
+<meta http-equiv="X-UA-Compatible" content="IE=11"/>
+<meta name="generator" content="Doxygen 1.13.1"/>
 <meta name="viewport" content="width=device-width, initial-scale=1"/>
 <title>mi-malloc: C++ wrappers</title>
 <link href="tabs.css" rel="stylesheet" type="text/css"/>
 <script type="text/javascript" src="jquery.js"></script>
 <script type="text/javascript" src="dynsections.js"></script>
+<script type="text/javascript" src="clipboard.js"></script>
 <link href="navtree.css" rel="stylesheet" type="text/css"/>
-<script type="text/javascript" src="resize.js"></script>
 <script type="text/javascript" src="navtreedata.js"></script>
 <script type="text/javascript" src="navtree.js"></script>
+<script type="text/javascript" src="resize.js"></script>
+<script type="text/javascript" src="cookie.js"></script>
 <link href="search/search.css" rel="stylesheet" type="text/css"/>
 <script type="text/javascript" src="search/searchdata.js"></script>
 <script type="text/javascript" src="search/search.js"></script>
 <script type="text/javascript">
-/* @license magnet:?xt=urn:btih:cf05388f2679ee054f2beb29a391d25f4e673ac3&amp;dn=gpl-2.0.txt GPL-v2 */
-  $(document).ready(function() { init_search(); });
+/* @license magnet:?xt=urn:btih:d3d9a9a6595521f9666a5e94cc830dab83b65699&amp;dn=expat.txt MIT */
+  $(function() { init_search(); });
 /* @license-end */
 </script>
 <link href="doxygen.css" rel="stylesheet" type="text/css" />
@@ -29,20 +31,16 @@
 <div id="titlearea">
 <table cellspacing="0" cellpadding="0">
  <tbody>
- <tr style="height: 56px;">
+ <tr id="projectrow">
   <td id="projectlogo"><img alt="Logo" src="mimalloc-logo.svg"/></td>
-  <td id="projectalign" style="padding-left: 0.5em;">
-   <div id="projectname">mi-malloc
-   &#160;<span id="projectnumber">1.7/2.0</span>
+  <td id="projectalign">
+   <div id="projectname">mi-malloc<span id="projectnumber">&#160;1.8/2.1</span>
    </div>
   </td>
-   <td>        <div id="MSearchBox" class="MSearchBoxInactive">
+    <td>        <div id="MSearchBox" class="MSearchBoxInactive">
         <span class="left">
-          <img id="MSearchSelect" src="search/mag_sel.svg"
-               onmouseover="return searchBox.OnSearchSelectShow()"
-               onmouseout="return searchBox.OnSearchSelectHide()"
-               alt=""/>
-          <input type="text" id="MSearchField" value="Search" accesskey="S"
+          <span id="MSearchSelect"                onmouseover="return searchBox.OnSearchSelectShow()"                onmouseout="return searchBox.OnSearchSelectHide()">&#160;</span>
+          <input type="text" id="MSearchField" value="" placeholder="Search" accesskey="S"
                onfocus="searchBox.OnSearchFieldFocus(true)" 
                onblur="searchBox.OnSearchFieldFocus(false)" 
                onkeyup="searchBox.OnSearchFieldChange(event)"/>
@@ -56,10 +54,15 @@
 </table>
 </div>
 <!-- end header part -->
-<!-- Generated by Doxygen 1.9.1 -->
+<!-- Generated by Doxygen 1.13.1 -->
+<script type="text/javascript">
+/* @license magnet:?xt=urn:btih:d3d9a9a6595521f9666a5e94cc830dab83b65699&amp;dn=expat.txt MIT */
+var searchBox = new SearchBox("searchBox", "search/",'.html');
+/* @license-end */
+</script>
 <script type="text/javascript">
-/* @license magnet:?xt=urn:btih:cf05388f2679ee054f2beb29a391d25f4e673ac3&amp;dn=gpl-2.0.txt GPL-v2 */
-var searchBox = new SearchBox("searchBox", "search",false,'Search','.html');
+/* @license magnet:?xt=urn:btih:d3d9a9a6595521f9666a5e94cc830dab83b65699&amp;dn=expat.txt MIT */
+$(function() { codefold.init(0); });
 /* @license-end */
 </script>
 </div><!-- top -->
@@ -74,8 +77,8 @@
   </div>
 </div>
 <script type="text/javascript">
-/* @license magnet:?xt=urn:btih:cf05388f2679ee054f2beb29a391d25f4e673ac3&amp;dn=gpl-2.0.txt GPL-v2 */
-$(document).ready(function(){initNavTree('group__cpp.html',''); initResizable(); });
+/* @license magnet:?xt=urn:btih:d3d9a9a6595521f9666a5e94cc830dab83b65699&amp;dn=expat.txt MIT */
+$(function(){initNavTree('group__cpp.html',''); initResizable(true); });
 /* @license-end */
 </script>
 <div id="doc-content">
@@ -88,59 +91,65 @@
 
 <!-- iframe showing the search results (closed by default) -->
 <div id="MSearchResultsWindow">
-<iframe src="javascript:void(0)" frameborder="0" 
-        name="MSearchResults" id="MSearchResults">
-</iframe>
+<div id="MSearchResults">
+<div class="SRPage">
+<div id="SRIndex">
+<div id="SRResults"></div>
+<div class="SRStatus" id="Loading">Loading...</div>
+<div class="SRStatus" id="Searching">Searching...</div>
+<div class="SRStatus" id="NoMatches">No Matches</div>
+</div>
+</div>
+</div>
 </div>
 
 <div class="header">
   <div class="summary">
 <a href="#nested-classes">Data Structures</a> &#124;
 <a href="#func-members">Functions</a>  </div>
-  <div class="headertitle">
-<div class="title">C++ wrappers</div>  </div>
+  <div class="headertitle"><div class="title">C++ wrappers</div></div>
 </div><!--header-->
 <div class="contents">
 
 <p><code>mi_</code> prefixed implementations of various allocation functions that use C++ semantics on out-of-memory, generally calling <code>std::get_new_handler</code> and raising a <code>std::bad_alloc</code> exception on failure.  
 <a href="#details">More...</a></p>
 <table class="memberdecls">
-<tr class="heading"><td colspan="2"><h2 class="groupheader"><a name="nested-classes"></a>
+<tr class="heading"><td colspan="2"><h2 class="groupheader"><a id="nested-classes" name="nested-classes"></a>
 Data Structures</h2></td></tr>
-<tr class="memitem:structmi__stl__allocator"><td class="memItemLeft" align="right" valign="top">struct &#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__cpp.html#structmi__stl__allocator">mi_stl_allocator&lt; T &gt;</a></td></tr>
-<tr class="memdesc:structmi__stl__allocator"><td class="mdescLeft">&#160;</td><td class="mdescRight"><em>std::allocator</em> implementation for mimalloc for use in STL containers.  <a href="group__cpp.html#structmi__stl__allocator">More...</a><br /></td></tr>
+<tr class="memitem:structmi__stl__allocator" id="r_structmi__stl__allocator"><td class="memItemLeft" align="right" valign="top">struct &#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="#structmi__stl__allocator">mi_stl_allocator&lt; T &gt;</a></td></tr>
+<tr class="memdesc:structmi__stl__allocator"><td class="mdescLeft">&#160;</td><td class="mdescRight"><em class="arg">std::allocator</em> implementation for mimalloc for use in STL containers.  <a href="#structmi__stl__allocator">More...</a><br /></td></tr>
 <tr class="separator:structmi__stl__allocator"><td class="memSeparator" colspan="2">&#160;</td></tr>
 </table><table class="memberdecls">
-<tr class="heading"><td colspan="2"><h2 class="groupheader"><a name="func-members"></a>
+<tr class="heading"><td colspan="2"><h2 class="groupheader"><a id="func-members" name="func-members"></a>
 Functions</h2></td></tr>
-<tr class="memitem:gaad048a9fce3d02c5909cd05c6ec24545"><td class="memItemLeft" align="right" valign="top">void *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__cpp.html#gaad048a9fce3d02c5909cd05c6ec24545">mi_new</a> (std::size_t n) noexcept(false)</td></tr>
-<tr class="memdesc:gaad048a9fce3d02c5909cd05c6ec24545"><td class="mdescLeft">&#160;</td><td class="mdescRight">like <a class="el" href="group__malloc.html#ga3406e8b168bc74c8637b11571a6da83a" title="Allocate size bytes.">mi_malloc()</a>, but when out of memory, use <code>std::get_new_handler</code> and raise <code>std::bad_alloc</code> exception on failure.  <a href="group__cpp.html#gaad048a9fce3d02c5909cd05c6ec24545">More...</a><br /></td></tr>
-<tr class="separator:gaad048a9fce3d02c5909cd05c6ec24545"><td class="memSeparator" colspan="2">&#160;</td></tr>
-<tr class="memitem:gae7bc4f56cd57ed3359060ff4f38bda81"><td class="memItemLeft" align="right" valign="top">void *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__cpp.html#gae7bc4f56cd57ed3359060ff4f38bda81">mi_new_n</a> (size_t count, size_t size) noexcept(false)</td></tr>
-<tr class="memdesc:gae7bc4f56cd57ed3359060ff4f38bda81"><td class="mdescLeft">&#160;</td><td class="mdescRight">like <a class="el" href="group__malloc.html#ga0b05e2bf0f73e7401ae08597ff782ac6" title="Allocate count elements of size bytes.">mi_mallocn()</a>, but when out of memory, use <code>std::get_new_handler</code> and raise <code>std::bad_alloc</code> exception on failure.  <a href="group__cpp.html#gae7bc4f56cd57ed3359060ff4f38bda81">More...</a><br /></td></tr>
-<tr class="separator:gae7bc4f56cd57ed3359060ff4f38bda81"><td class="memSeparator" colspan="2">&#160;</td></tr>
-<tr class="memitem:gaef2c2bdb4f70857902d3c8903ac095f3"><td class="memItemLeft" align="right" valign="top">void *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__cpp.html#gaef2c2bdb4f70857902d3c8903ac095f3">mi_new_aligned</a> (std::size_t n, std::align_val_t alignment) noexcept(false)</td></tr>
-<tr class="memdesc:gaef2c2bdb4f70857902d3c8903ac095f3"><td class="mdescLeft">&#160;</td><td class="mdescRight">like <a class="el" href="group__aligned.html#ga68930196751fa2cca9e1fd0d71bade56" title="Allocate size bytes aligned by alignment.">mi_malloc_aligned()</a>, but when out of memory, use <code>std::get_new_handler</code> and raise <code>std::bad_alloc</code> exception on failure.  <a href="group__cpp.html#gaef2c2bdb4f70857902d3c8903ac095f3">More...</a><br /></td></tr>
-<tr class="separator:gaef2c2bdb4f70857902d3c8903ac095f3"><td class="memSeparator" colspan="2">&#160;</td></tr>
-<tr class="memitem:gaeaded64eda71ed6b1d569d3e723abc4a"><td class="memItemLeft" align="right" valign="top">void *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__cpp.html#gaeaded64eda71ed6b1d569d3e723abc4a">mi_new_nothrow</a> (size_t n)</td></tr>
-<tr class="memdesc:gaeaded64eda71ed6b1d569d3e723abc4a"><td class="mdescLeft">&#160;</td><td class="mdescRight">like <code>mi_malloc</code>, but when out of memory, use <code>std::get_new_handler</code> but return <em>NULL</em> on failure.  <a href="group__cpp.html#gaeaded64eda71ed6b1d569d3e723abc4a">More...</a><br /></td></tr>
-<tr class="separator:gaeaded64eda71ed6b1d569d3e723abc4a"><td class="memSeparator" colspan="2">&#160;</td></tr>
-<tr class="memitem:gab5e29558926d934c3f1cae8c815f942c"><td class="memItemLeft" align="right" valign="top">void *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__cpp.html#gab5e29558926d934c3f1cae8c815f942c">mi_new_aligned_nothrow</a> (size_t n, size_t alignment)</td></tr>
-<tr class="memdesc:gab5e29558926d934c3f1cae8c815f942c"><td class="mdescLeft">&#160;</td><td class="mdescRight">like <code>mi_malloc_aligned</code>, but when out of memory, use <code>std::get_new_handler</code> but return <em>NULL</em> on failure.  <a href="group__cpp.html#gab5e29558926d934c3f1cae8c815f942c">More...</a><br /></td></tr>
-<tr class="separator:gab5e29558926d934c3f1cae8c815f942c"><td class="memSeparator" colspan="2">&#160;</td></tr>
-<tr class="memitem:gaab78a32f55149e9fbf432d5288e38e1e"><td class="memItemLeft" align="right" valign="top">void *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__cpp.html#gaab78a32f55149e9fbf432d5288e38e1e">mi_new_realloc</a> (void *p, size_t newsize)</td></tr>
-<tr class="memdesc:gaab78a32f55149e9fbf432d5288e38e1e"><td class="mdescLeft">&#160;</td><td class="mdescRight">like <a class="el" href="group__malloc.html#gaf11eb497da57bdfb2de65eb191c69db6" title="Re-allocate memory to newsize bytes.">mi_realloc()</a>, but when out of memory, use <code>std::get_new_handler</code> and raise <code>std::bad_alloc</code> exception on failure.  <a href="group__cpp.html#gaab78a32f55149e9fbf432d5288e38e1e">More...</a><br /></td></tr>
-<tr class="separator:gaab78a32f55149e9fbf432d5288e38e1e"><td class="memSeparator" colspan="2">&#160;</td></tr>
-<tr class="memitem:ga756f4b2bc6a7ecd0a90baea8e90c7907"><td class="memItemLeft" align="right" valign="top">void *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__cpp.html#ga756f4b2bc6a7ecd0a90baea8e90c7907">mi_new_reallocn</a> (void *p, size_t newcount, size_t size)</td></tr>
-<tr class="memdesc:ga756f4b2bc6a7ecd0a90baea8e90c7907"><td class="mdescLeft">&#160;</td><td class="mdescRight">like <a class="el" href="group__malloc.html#ga61d57b4144ba24fba5c1e9b956d13853" title="Re-allocate memory to count elements of size bytes.">mi_reallocn()</a>, but when out of memory, use <code>std::get_new_handler</code> and raise <code>std::bad_alloc</code> exception on failure.  <a href="group__cpp.html#ga756f4b2bc6a7ecd0a90baea8e90c7907">More...</a><br /></td></tr>
-<tr class="separator:ga756f4b2bc6a7ecd0a90baea8e90c7907"><td class="memSeparator" colspan="2">&#160;</td></tr>
+<tr class="memitem:ga633d96e3bc7011f960df9f3b2731fc6a" id="r_ga633d96e3bc7011f960df9f3b2731fc6a"><td class="memItemLeft" align="right" valign="top">void *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="#ga633d96e3bc7011f960df9f3b2731fc6a">mi_new</a> (std::size_t n) noexcept(false)</td></tr>
+<tr class="memdesc:ga633d96e3bc7011f960df9f3b2731fc6a"><td class="mdescLeft">&#160;</td><td class="mdescRight">like <a class="el" href="group__malloc.html#gae1dd97b542420c87ae085e822b1229e8" title="Allocate size bytes.">mi_malloc()</a>, but when out of memory, use <code>std::get_new_handler</code> and raise <code>std::bad_alloc</code> exception on failure.  <br /></td></tr>
+<tr class="separator:ga633d96e3bc7011f960df9f3b2731fc6a"><td class="memSeparator" colspan="2">&#160;</td></tr>
+<tr class="memitem:gadd11b85c15d21d308386844b5233856c" id="r_gadd11b85c15d21d308386844b5233856c"><td class="memItemLeft" align="right" valign="top">void *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="#gadd11b85c15d21d308386844b5233856c">mi_new_n</a> (size_t count, size_t size) noexcept(false)</td></tr>
+<tr class="memdesc:gadd11b85c15d21d308386844b5233856c"><td class="mdescLeft">&#160;</td><td class="mdescRight">like <a class="el" href="group__malloc.html#ga61f46bade3db76ca24aaafedc40de7b6" title="Allocate count elements of size bytes.">mi_mallocn()</a>, but when out of memory, use <code>std::get_new_handler</code> and raise <code>std::bad_alloc</code> exception on failure.  <br /></td></tr>
+<tr class="separator:gadd11b85c15d21d308386844b5233856c"><td class="memSeparator" colspan="2">&#160;</td></tr>
+<tr class="memitem:ga79c54da0b4b4ce9fcc11d2f6ef6675f8" id="r_ga79c54da0b4b4ce9fcc11d2f6ef6675f8"><td class="memItemLeft" align="right" valign="top">void *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="#ga79c54da0b4b4ce9fcc11d2f6ef6675f8">mi_new_aligned</a> (std::size_t n, std::align_val_t alignment) noexcept(false)</td></tr>
+<tr class="memdesc:ga79c54da0b4b4ce9fcc11d2f6ef6675f8"><td class="mdescLeft">&#160;</td><td class="mdescRight">like <a class="el" href="group__aligned.html#ga69578ff1a98ca16e1dcd02c0995cd65c" title="Allocate size bytes aligned by alignment.">mi_malloc_aligned()</a>, but when out of memory, use <code>std::get_new_handler</code> and raise <code>std::bad_alloc</code> exception on failure.  <br /></td></tr>
+<tr class="separator:ga79c54da0b4b4ce9fcc11d2f6ef6675f8"><td class="memSeparator" colspan="2">&#160;</td></tr>
+<tr class="memitem:ga5cb4f120d1f7296074256215aa9a9e54" id="r_ga5cb4f120d1f7296074256215aa9a9e54"><td class="memItemLeft" align="right" valign="top">void *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="#ga5cb4f120d1f7296074256215aa9a9e54">mi_new_nothrow</a> (size_t n)</td></tr>
+<tr class="memdesc:ga5cb4f120d1f7296074256215aa9a9e54"><td class="mdescLeft">&#160;</td><td class="mdescRight">like <code>mi_malloc</code>, but when out of memory, use <code>std::get_new_handler</code> but return <em class="arg">NULL</em> on failure.  <br /></td></tr>
+<tr class="separator:ga5cb4f120d1f7296074256215aa9a9e54"><td class="memSeparator" colspan="2">&#160;</td></tr>
+<tr class="memitem:ga92ae00b6dd64406c7e64557711ec04b7" id="r_ga92ae00b6dd64406c7e64557711ec04b7"><td class="memItemLeft" align="right" valign="top">void *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="#ga92ae00b6dd64406c7e64557711ec04b7">mi_new_aligned_nothrow</a> (size_t n, size_t alignment)</td></tr>
+<tr class="memdesc:ga92ae00b6dd64406c7e64557711ec04b7"><td class="mdescLeft">&#160;</td><td class="mdescRight">like <code>mi_malloc_aligned</code>, but when out of memory, use <code>std::get_new_handler</code> but return <em class="arg">NULL</em> on failure.  <br /></td></tr>
+<tr class="separator:ga92ae00b6dd64406c7e64557711ec04b7"><td class="memSeparator" colspan="2">&#160;</td></tr>
+<tr class="memitem:ga6867d89baf992728e0cc20a1f47db4d0" id="r_ga6867d89baf992728e0cc20a1f47db4d0"><td class="memItemLeft" align="right" valign="top">void *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="#ga6867d89baf992728e0cc20a1f47db4d0">mi_new_realloc</a> (void *p, size_t newsize)</td></tr>
+<tr class="memdesc:ga6867d89baf992728e0cc20a1f47db4d0"><td class="mdescLeft">&#160;</td><td class="mdescRight">like <a class="el" href="group__malloc.html#ga0621af6a5e3aa384e6a1b548958bf583" title="Re-allocate memory to newsize bytes.">mi_realloc()</a>, but when out of memory, use <code>std::get_new_handler</code> and raise <code>std::bad_alloc</code> exception on failure.  <br /></td></tr>
+<tr class="separator:ga6867d89baf992728e0cc20a1f47db4d0"><td class="memSeparator" colspan="2">&#160;</td></tr>
+<tr class="memitem:gaace912ce086682d56f3ce9f7638d9d67" id="r_gaace912ce086682d56f3ce9f7638d9d67"><td class="memItemLeft" align="right" valign="top">void *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="#gaace912ce086682d56f3ce9f7638d9d67">mi_new_reallocn</a> (void *p, size_t newcount, size_t size)</td></tr>
+<tr class="memdesc:gaace912ce086682d56f3ce9f7638d9d67"><td class="mdescLeft">&#160;</td><td class="mdescRight">like <a class="el" href="group__malloc.html#ga8bddfb4a1270a0854bbcf44cb3980467" title="Re-allocate memory to count elements of size bytes.">mi_reallocn()</a>, but when out of memory, use <code>std::get_new_handler</code> and raise <code>std::bad_alloc</code> exception on failure.  <br /></td></tr>
+<tr class="separator:gaace912ce086682d56f3ce9f7638d9d67"><td class="memSeparator" colspan="2">&#160;</td></tr>
 </table>
 <a name="details" id="details"></a><h2 class="groupheader">Detailed Description</h2>
 <p><code>mi_</code> prefixed implementations of various allocation functions that use C++ semantics on out-of-memory, generally calling <code>std::get_new_handler</code> and raising a <code>std::bad_alloc</code> exception on failure. </p>
-<p>Note: use the <code>mimalloc-new-delete.h</code> header to override the <em>new</em> and <em>delete</em> operators globally. The wrappers here are mostly for convience for library writers that need to interface with mimalloc from C++. </p>
+<p>Note: use the <code>mimalloc-new-delete.h</code> header to override the <em class="arg">new</em> and <em class="arg">delete</em> operators globally. The wrappers here are mostly for convenience for library writers that need to interface with mimalloc from C++. </p>
 <hr/><h2 class="groupheader">Data Structure Documentation</h2>
 <a name="structmi__stl__allocator" id="structmi__stl__allocator"></a>
-<h2 class="memtitle"><span class="permalink"><a href="#structmi__stl__allocator">&#9670;&nbsp;</a></span>mi_stl_allocator</h2>
+<h2 class="memtitle"><span class="permalink"><a href="#structmi__stl__allocator">&#9670;&#160;</a></span>mi_stl_allocator</h2>
 
 <div class="memitem">
 <div class="memproto">
@@ -150,10 +159,8 @@ <h2 class="memtitle"><span class="permalink"><a href="#structmi__stl__allocator"
         </tr>
       </table>
 </div><div class="memdoc">
-<div class="textblock"><h3>template&lt;class T&gt;<br />
-struct mi_stl_allocator&lt; T &gt;</h3>
-
-<p><em>std::allocator</em> implementation for mimalloc for use in STL containers. </p>
+<div class="textblock"><div class="compoundTemplParams">template&lt;class T&gt;<br />
+struct mi_stl_allocator&lt; T &gt;</div><p><em class="arg">std::allocator</em> implementation for mimalloc for use in STL containers. </p>
 <p>For example: </p><div class="fragment"><div class="line">std::vector&lt;int, mi_stl_allocator&lt;int&gt; &gt; vec;</div>
 <div class="line">vec.push_back(1);</div>
 <div class="line">vec.pop_back();</div>
@@ -161,223 +168,161 @@ <h2 class="memtitle"><span class="permalink"><a href="#structmi__stl__allocator"
 </div>
 </div>
 <h2 class="groupheader">Function Documentation</h2>
-<a id="gaad048a9fce3d02c5909cd05c6ec24545"></a>
-<h2 class="memtitle"><span class="permalink"><a href="#gaad048a9fce3d02c5909cd05c6ec24545">&#9670;&nbsp;</a></span>mi_new()</h2>
+<a id="ga633d96e3bc7011f960df9f3b2731fc6a" name="ga633d96e3bc7011f960df9f3b2731fc6a"></a>
+<h2 class="memtitle"><span class="permalink"><a href="#ga633d96e3bc7011f960df9f3b2731fc6a">&#9670;&#160;</a></span>mi_new()</h2>
 
 <div class="memitem">
 <div class="memproto">
-<table class="mlabels">
-  <tr>
-  <td class="mlabels-left">
       <table class="memname">
         <tr>
-          <td class="memname">void* mi_new </td>
+          <td class="memname">void * mi_new </td>
           <td>(</td>
-          <td class="paramtype">std::size_t&#160;</td>
-          <td class="paramname"><em>n</em></td><td>)</td>
+          <td class="paramtype">std::size_t</td>          <td class="paramname"><span class="paramname"><em>n</em></span></td><td>)</td>
           <td></td>
         </tr>
       </table>
-  </td>
-  <td class="mlabels-right">
-<span class="mlabels"><span class="mlabel">noexcept</span></span>  </td>
-  </tr>
-</table>
 </div><div class="memdoc">
 
-<p>like <a class="el" href="group__malloc.html#ga3406e8b168bc74c8637b11571a6da83a" title="Allocate size bytes.">mi_malloc()</a>, but when out of memory, use <code>std::get_new_handler</code> and raise <code>std::bad_alloc</code> exception on failure. </p>
+<p>like <a class="el" href="group__malloc.html#gae1dd97b542420c87ae085e822b1229e8" title="Allocate size bytes.">mi_malloc()</a>, but when out of memory, use <code>std::get_new_handler</code> and raise <code>std::bad_alloc</code> exception on failure. </p>
 
 </div>
 </div>
-<a id="gaef2c2bdb4f70857902d3c8903ac095f3"></a>
-<h2 class="memtitle"><span class="permalink"><a href="#gaef2c2bdb4f70857902d3c8903ac095f3">&#9670;&nbsp;</a></span>mi_new_aligned()</h2>
+<a id="ga79c54da0b4b4ce9fcc11d2f6ef6675f8" name="ga79c54da0b4b4ce9fcc11d2f6ef6675f8"></a>
+<h2 class="memtitle"><span class="permalink"><a href="#ga79c54da0b4b4ce9fcc11d2f6ef6675f8">&#9670;&#160;</a></span>mi_new_aligned()</h2>
 
 <div class="memitem">
 <div class="memproto">
-<table class="mlabels">
-  <tr>
-  <td class="mlabels-left">
       <table class="memname">
         <tr>
-          <td class="memname">void* mi_new_aligned </td>
+          <td class="memname">void * mi_new_aligned </td>
           <td>(</td>
-          <td class="paramtype">std::size_t&#160;</td>
-          <td class="paramname"><em>n</em>, </td>
+          <td class="paramtype">std::size_t</td>          <td class="paramname"><span class="paramname"><em>n</em></span>, </td>
         </tr>
         <tr>
           <td class="paramkey"></td>
           <td></td>
-          <td class="paramtype">std::align_val_t&#160;</td>
-          <td class="paramname"><em>alignment</em>&#160;</td>
-        </tr>
-        <tr>
-          <td></td>
-          <td>)</td>
-          <td></td><td></td>
+          <td class="paramtype">std::align_val_t</td>          <td class="paramname"><span class="paramname"><em>alignment</em></span>&#160;)</td>
         </tr>
       </table>
-  </td>
-  <td class="mlabels-right">
-<span class="mlabels"><span class="mlabel">noexcept</span></span>  </td>
-  </tr>
-</table>
 </div><div class="memdoc">
 
-<p>like <a class="el" href="group__aligned.html#ga68930196751fa2cca9e1fd0d71bade56" title="Allocate size bytes aligned by alignment.">mi_malloc_aligned()</a>, but when out of memory, use <code>std::get_new_handler</code> and raise <code>std::bad_alloc</code> exception on failure. </p>
+<p>like <a class="el" href="group__aligned.html#ga69578ff1a98ca16e1dcd02c0995cd65c" title="Allocate size bytes aligned by alignment.">mi_malloc_aligned()</a>, but when out of memory, use <code>std::get_new_handler</code> and raise <code>std::bad_alloc</code> exception on failure. </p>
 
 </div>
 </div>
-<a id="gab5e29558926d934c3f1cae8c815f942c"></a>
-<h2 class="memtitle"><span class="permalink"><a href="#gab5e29558926d934c3f1cae8c815f942c">&#9670;&nbsp;</a></span>mi_new_aligned_nothrow()</h2>
+<a id="ga92ae00b6dd64406c7e64557711ec04b7" name="ga92ae00b6dd64406c7e64557711ec04b7"></a>
+<h2 class="memtitle"><span class="permalink"><a href="#ga92ae00b6dd64406c7e64557711ec04b7">&#9670;&#160;</a></span>mi_new_aligned_nothrow()</h2>
 
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname">void* mi_new_aligned_nothrow </td>
+          <td class="memname">void * mi_new_aligned_nothrow </td>
           <td>(</td>
-          <td class="paramtype">size_t&#160;</td>
-          <td class="paramname"><em>n</em>, </td>
+          <td class="paramtype">size_t</td>          <td class="paramname"><span class="paramname"><em>n</em></span>, </td>
         </tr>
         <tr>
           <td class="paramkey"></td>
           <td></td>
-          <td class="paramtype">size_t&#160;</td>
-          <td class="paramname"><em>alignment</em>&#160;</td>
-        </tr>
-        <tr>
-          <td></td>
-          <td>)</td>
-          <td></td><td></td>
+          <td class="paramtype">size_t</td>          <td class="paramname"><span class="paramname"><em>alignment</em></span>&#160;)</td>
         </tr>
       </table>
 </div><div class="memdoc">
 
-<p>like <code>mi_malloc_aligned</code>, but when out of memory, use <code>std::get_new_handler</code> but return <em>NULL</em> on failure. </p>
+<p>like <code>mi_malloc_aligned</code>, but when out of memory, use <code>std::get_new_handler</code> but return <em class="arg">NULL</em> on failure. </p>
 
 </div>
 </div>
-<a id="gae7bc4f56cd57ed3359060ff4f38bda81"></a>
-<h2 class="memtitle"><span class="permalink"><a href="#gae7bc4f56cd57ed3359060ff4f38bda81">&#9670;&nbsp;</a></span>mi_new_n()</h2>
+<a id="gadd11b85c15d21d308386844b5233856c" name="gadd11b85c15d21d308386844b5233856c"></a>
+<h2 class="memtitle"><span class="permalink"><a href="#gadd11b85c15d21d308386844b5233856c">&#9670;&#160;</a></span>mi_new_n()</h2>
 
 <div class="memitem">
 <div class="memproto">
-<table class="mlabels">
-  <tr>
-  <td class="mlabels-left">
       <table class="memname">
         <tr>
-          <td class="memname">void* mi_new_n </td>
+          <td class="memname">void * mi_new_n </td>
           <td>(</td>
-          <td class="paramtype">size_t&#160;</td>
-          <td class="paramname"><em>count</em>, </td>
+          <td class="paramtype">size_t</td>          <td class="paramname"><span class="paramname"><em>count</em></span>, </td>
         </tr>
         <tr>
           <td class="paramkey"></td>
           <td></td>
-          <td class="paramtype">size_t&#160;</td>
-          <td class="paramname"><em>size</em>&#160;</td>
-        </tr>
-        <tr>
-          <td></td>
-          <td>)</td>
-          <td></td><td></td>
+          <td class="paramtype">size_t</td>          <td class="paramname"><span class="paramname"><em>size</em></span>&#160;)</td>
         </tr>
       </table>
-  </td>
-  <td class="mlabels-right">
-<span class="mlabels"><span class="mlabel">noexcept</span></span>  </td>
-  </tr>
-</table>
 </div><div class="memdoc">
 
-<p>like <a class="el" href="group__malloc.html#ga0b05e2bf0f73e7401ae08597ff782ac6" title="Allocate count elements of size bytes.">mi_mallocn()</a>, but when out of memory, use <code>std::get_new_handler</code> and raise <code>std::bad_alloc</code> exception on failure. </p>
+<p>like <a class="el" href="group__malloc.html#ga61f46bade3db76ca24aaafedc40de7b6" title="Allocate count elements of size bytes.">mi_mallocn()</a>, but when out of memory, use <code>std::get_new_handler</code> and raise <code>std::bad_alloc</code> exception on failure. </p>
 
 </div>
 </div>
-<a id="gaeaded64eda71ed6b1d569d3e723abc4a"></a>
-<h2 class="memtitle"><span class="permalink"><a href="#gaeaded64eda71ed6b1d569d3e723abc4a">&#9670;&nbsp;</a></span>mi_new_nothrow()</h2>
+<a id="ga5cb4f120d1f7296074256215aa9a9e54" name="ga5cb4f120d1f7296074256215aa9a9e54"></a>
+<h2 class="memtitle"><span class="permalink"><a href="#ga5cb4f120d1f7296074256215aa9a9e54">&#9670;&#160;</a></span>mi_new_nothrow()</h2>
 
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname">void* mi_new_nothrow </td>
+          <td class="memname">void * mi_new_nothrow </td>
           <td>(</td>
-          <td class="paramtype">size_t&#160;</td>
-          <td class="paramname"><em>n</em></td><td>)</td>
+          <td class="paramtype">size_t</td>          <td class="paramname"><span class="paramname"><em>n</em></span></td><td>)</td>
           <td></td>
         </tr>
       </table>
 </div><div class="memdoc">
 
-<p>like <code>mi_malloc</code>, but when out of memory, use <code>std::get_new_handler</code> but return <em>NULL</em> on failure. </p>
+<p>like <code>mi_malloc</code>, but when out of memory, use <code>std::get_new_handler</code> but return <em class="arg">NULL</em> on failure. </p>
 
 </div>
 </div>
-<a id="gaab78a32f55149e9fbf432d5288e38e1e"></a>
-<h2 class="memtitle"><span class="permalink"><a href="#gaab78a32f55149e9fbf432d5288e38e1e">&#9670;&nbsp;</a></span>mi_new_realloc()</h2>
+<a id="ga6867d89baf992728e0cc20a1f47db4d0" name="ga6867d89baf992728e0cc20a1f47db4d0"></a>
+<h2 class="memtitle"><span class="permalink"><a href="#ga6867d89baf992728e0cc20a1f47db4d0">&#9670;&#160;</a></span>mi_new_realloc()</h2>
 
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname">void* mi_new_realloc </td>
+          <td class="memname">void * mi_new_realloc </td>
           <td>(</td>
-          <td class="paramtype">void *&#160;</td>
-          <td class="paramname"><em>p</em>, </td>
+          <td class="paramtype">void *</td>          <td class="paramname"><span class="paramname"><em>p</em></span>, </td>
         </tr>
         <tr>
           <td class="paramkey"></td>
           <td></td>
-          <td class="paramtype">size_t&#160;</td>
-          <td class="paramname"><em>newsize</em>&#160;</td>
-        </tr>
-        <tr>
-          <td></td>
-          <td>)</td>
-          <td></td><td></td>
+          <td class="paramtype">size_t</td>          <td class="paramname"><span class="paramname"><em>newsize</em></span>&#160;)</td>
         </tr>
       </table>
 </div><div class="memdoc">
 
-<p>like <a class="el" href="group__malloc.html#gaf11eb497da57bdfb2de65eb191c69db6" title="Re-allocate memory to newsize bytes.">mi_realloc()</a>, but when out of memory, use <code>std::get_new_handler</code> and raise <code>std::bad_alloc</code> exception on failure. </p>
+<p>like <a class="el" href="group__malloc.html#ga0621af6a5e3aa384e6a1b548958bf583" title="Re-allocate memory to newsize bytes.">mi_realloc()</a>, but when out of memory, use <code>std::get_new_handler</code> and raise <code>std::bad_alloc</code> exception on failure. </p>
 
 </div>
 </div>
-<a id="ga756f4b2bc6a7ecd0a90baea8e90c7907"></a>
-<h2 class="memtitle"><span class="permalink"><a href="#ga756f4b2bc6a7ecd0a90baea8e90c7907">&#9670;&nbsp;</a></span>mi_new_reallocn()</h2>
+<a id="gaace912ce086682d56f3ce9f7638d9d67" name="gaace912ce086682d56f3ce9f7638d9d67"></a>
+<h2 class="memtitle"><span class="permalink"><a href="#gaace912ce086682d56f3ce9f7638d9d67">&#9670;&#160;</a></span>mi_new_reallocn()</h2>
 
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname">void* mi_new_reallocn </td>
+          <td class="memname">void * mi_new_reallocn </td>
           <td>(</td>
-          <td class="paramtype">void *&#160;</td>
-          <td class="paramname"><em>p</em>, </td>
+          <td class="paramtype">void *</td>          <td class="paramname"><span class="paramname"><em>p</em></span>, </td>
         </tr>
         <tr>
           <td class="paramkey"></td>
           <td></td>
-          <td class="paramtype">size_t&#160;</td>
-          <td class="paramname"><em>newcount</em>, </td>
+          <td class="paramtype">size_t</td>          <td class="paramname"><span class="paramname"><em>newcount</em></span>, </td>
         </tr>
         <tr>
           <td class="paramkey"></td>
           <td></td>
-          <td class="paramtype">size_t&#160;</td>
-          <td class="paramname"><em>size</em>&#160;</td>
-        </tr>
-        <tr>
-          <td></td>
-          <td>)</td>
-          <td></td><td></td>
+          <td class="paramtype">size_t</td>          <td class="paramname"><span class="paramname"><em>size</em></span>&#160;)</td>
         </tr>
       </table>
 </div><div class="memdoc">
 
-<p>like <a class="el" href="group__malloc.html#ga61d57b4144ba24fba5c1e9b956d13853" title="Re-allocate memory to count elements of size bytes.">mi_reallocn()</a>, but when out of memory, use <code>std::get_new_handler</code> and raise <code>std::bad_alloc</code> exception on failure. </p>
+<p>like <a class="el" href="group__malloc.html#ga8bddfb4a1270a0854bbcf44cb3980467" title="Re-allocate memory to count elements of size bytes.">mi_reallocn()</a>, but when out of memory, use <code>std::get_new_handler</code> and raise <code>std::bad_alloc</code> exception on failure. </p>
 
 </div>
 </div>
@@ -386,7 +331,7 @@ <h2 class="memtitle"><span class="permalink"><a href="#ga756f4b2bc6a7ecd0a90baea
 <!-- start footer part -->
 <div id="nav-path" class="navpath"><!-- id is needed for treeview function! -->
   <ul>
-    <li class="footer">Generated by <a href="https://www.doxygen.org/index.html"><img class="footer" src="doxygen.svg" width="104" height="31" alt="doxygen"/></a> 1.9.1 </li>
+    <li class="footer">Generated by <a href="https://www.doxygen.org/index.html"><img class="footer" src="doxygen.svg" width="104" height="31" alt="doxygen"/></a> 1.13.1 </li>
   </ul>
 </div>
 </body>
diff --git a/depends/mimalloc/docs/group__cpp.js b/depends/mimalloc/docs/group__cpp.js
index 207066468529..355f1ac6d053 100644
--- a/depends/mimalloc/docs/group__cpp.js
+++ b/depends/mimalloc/docs/group__cpp.js
@@ -1,11 +1,11 @@
 var group__cpp =
 [
-    [ "mi_stl_allocator", "group__cpp.html#structmi__stl__allocator", null ],
-    [ "mi_new", "group__cpp.html#gaad048a9fce3d02c5909cd05c6ec24545", null ],
-    [ "mi_new_aligned", "group__cpp.html#gaef2c2bdb4f70857902d3c8903ac095f3", null ],
-    [ "mi_new_aligned_nothrow", "group__cpp.html#gab5e29558926d934c3f1cae8c815f942c", null ],
-    [ "mi_new_n", "group__cpp.html#gae7bc4f56cd57ed3359060ff4f38bda81", null ],
-    [ "mi_new_nothrow", "group__cpp.html#gaeaded64eda71ed6b1d569d3e723abc4a", null ],
-    [ "mi_new_realloc", "group__cpp.html#gaab78a32f55149e9fbf432d5288e38e1e", null ],
-    [ "mi_new_reallocn", "group__cpp.html#ga756f4b2bc6a7ecd0a90baea8e90c7907", null ]
+    [ "mi_stl_allocator< T >", "group__cpp.html#structmi__stl__allocator", null ],
+    [ "mi_new", "group__cpp.html#ga633d96e3bc7011f960df9f3b2731fc6a", null ],
+    [ "mi_new_aligned", "group__cpp.html#ga79c54da0b4b4ce9fcc11d2f6ef6675f8", null ],
+    [ "mi_new_aligned_nothrow", "group__cpp.html#ga92ae00b6dd64406c7e64557711ec04b7", null ],
+    [ "mi_new_n", "group__cpp.html#gadd11b85c15d21d308386844b5233856c", null ],
+    [ "mi_new_nothrow", "group__cpp.html#ga5cb4f120d1f7296074256215aa9a9e54", null ],
+    [ "mi_new_realloc", "group__cpp.html#ga6867d89baf992728e0cc20a1f47db4d0", null ],
+    [ "mi_new_reallocn", "group__cpp.html#gaace912ce086682d56f3ce9f7638d9d67", null ]
 ];
\ No newline at end of file
diff --git a/depends/mimalloc/docs/group__extended.html b/depends/mimalloc/docs/group__extended.html
index e54991180272..4eea7c69bc5e 100644
--- a/depends/mimalloc/docs/group__extended.html
+++ b/depends/mimalloc/docs/group__extended.html
@@ -1,24 +1,26 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "https://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
+<html xmlns="http://www.w3.org/1999/xhtml" lang="en-US">
 <head>
 <meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
-<meta http-equiv="X-UA-Compatible" content="IE=9"/>
-<meta name="generator" content="Doxygen 1.9.1"/>
+<meta http-equiv="X-UA-Compatible" content="IE=11"/>
+<meta name="generator" content="Doxygen 1.13.1"/>
 <meta name="viewport" content="width=device-width, initial-scale=1"/>
 <title>mi-malloc: Extended Functions</title>
 <link href="tabs.css" rel="stylesheet" type="text/css"/>
 <script type="text/javascript" src="jquery.js"></script>
 <script type="text/javascript" src="dynsections.js"></script>
+<script type="text/javascript" src="clipboard.js"></script>
 <link href="navtree.css" rel="stylesheet" type="text/css"/>
-<script type="text/javascript" src="resize.js"></script>
 <script type="text/javascript" src="navtreedata.js"></script>
 <script type="text/javascript" src="navtree.js"></script>
+<script type="text/javascript" src="resize.js"></script>
+<script type="text/javascript" src="cookie.js"></script>
 <link href="search/search.css" rel="stylesheet" type="text/css"/>
 <script type="text/javascript" src="search/searchdata.js"></script>
 <script type="text/javascript" src="search/search.js"></script>
 <script type="text/javascript">
-/* @license magnet:?xt=urn:btih:cf05388f2679ee054f2beb29a391d25f4e673ac3&amp;dn=gpl-2.0.txt GPL-v2 */
-  $(document).ready(function() { init_search(); });
+/* @license magnet:?xt=urn:btih:d3d9a9a6595521f9666a5e94cc830dab83b65699&amp;dn=expat.txt MIT */
+  $(function() { init_search(); });
 /* @license-end */
 </script>
 <link href="doxygen.css" rel="stylesheet" type="text/css" />
@@ -29,20 +31,16 @@
 <div id="titlearea">
 <table cellspacing="0" cellpadding="0">
  <tbody>
- <tr style="height: 56px;">
+ <tr id="projectrow">
   <td id="projectlogo"><img alt="Logo" src="mimalloc-logo.svg"/></td>
-  <td id="projectalign" style="padding-left: 0.5em;">
-   <div id="projectname">mi-malloc
-   &#160;<span id="projectnumber">1.7/2.0</span>
+  <td id="projectalign">
+   <div id="projectname">mi-malloc<span id="projectnumber">&#160;1.8/2.1</span>
    </div>
   </td>
-   <td>        <div id="MSearchBox" class="MSearchBoxInactive">
+    <td>        <div id="MSearchBox" class="MSearchBoxInactive">
         <span class="left">
-          <img id="MSearchSelect" src="search/mag_sel.svg"
-               onmouseover="return searchBox.OnSearchSelectShow()"
-               onmouseout="return searchBox.OnSearchSelectHide()"
-               alt=""/>
-          <input type="text" id="MSearchField" value="Search" accesskey="S"
+          <span id="MSearchSelect"                onmouseover="return searchBox.OnSearchSelectShow()"                onmouseout="return searchBox.OnSearchSelectHide()">&#160;</span>
+          <input type="text" id="MSearchField" value="" placeholder="Search" accesskey="S"
                onfocus="searchBox.OnSearchFieldFocus(true)" 
                onblur="searchBox.OnSearchFieldFocus(false)" 
                onkeyup="searchBox.OnSearchFieldChange(event)"/>
@@ -56,10 +54,15 @@
 </table>
 </div>
 <!-- end header part -->
-<!-- Generated by Doxygen 1.9.1 -->
+<!-- Generated by Doxygen 1.13.1 -->
+<script type="text/javascript">
+/* @license magnet:?xt=urn:btih:d3d9a9a6595521f9666a5e94cc830dab83b65699&amp;dn=expat.txt MIT */
+var searchBox = new SearchBox("searchBox", "search/",'.html');
+/* @license-end */
+</script>
 <script type="text/javascript">
-/* @license magnet:?xt=urn:btih:cf05388f2679ee054f2beb29a391d25f4e673ac3&amp;dn=gpl-2.0.txt GPL-v2 */
-var searchBox = new SearchBox("searchBox", "search",false,'Search','.html');
+/* @license magnet:?xt=urn:btih:d3d9a9a6595521f9666a5e94cc830dab83b65699&amp;dn=expat.txt MIT */
+$(function() { codefold.init(0); });
 /* @license-end */
 </script>
 </div><!-- top -->
@@ -74,8 +77,8 @@
   </div>
 </div>
 <script type="text/javascript">
-/* @license magnet:?xt=urn:btih:cf05388f2679ee054f2beb29a391d25f4e673ac3&amp;dn=gpl-2.0.txt GPL-v2 */
-$(document).ready(function(){initNavTree('group__extended.html',''); initResizable(); });
+/* @license magnet:?xt=urn:btih:d3d9a9a6595521f9666a5e94cc830dab83b65699&amp;dn=expat.txt MIT */
+$(function(){initNavTree('group__extended.html',''); initResizable(true); });
 /* @license-end */
 </script>
 <div id="doc-content">
@@ -88,9 +91,16 @@
 
 <!-- iframe showing the search results (closed by default) -->
 <div id="MSearchResultsWindow">
-<iframe src="javascript:void(0)" frameborder="0" 
-        name="MSearchResults" id="MSearchResults">
-</iframe>
+<div id="MSearchResults">
+<div class="SRPage">
+<div id="SRIndex">
+<div id="SRResults"></div>
+<div class="SRStatus" id="Loading">Loading...</div>
+<div class="SRStatus" id="Searching">Searching...</div>
+<div class="SRStatus" id="NoMatches">No Matches</div>
+</div>
+</div>
+</div>
 </div>
 
 <div class="header">
@@ -98,106 +108,144 @@
 <a href="#define-members">Macros</a> &#124;
 <a href="#typedef-members">Typedefs</a> &#124;
 <a href="#func-members">Functions</a>  </div>
-  <div class="headertitle">
-<div class="title">Extended Functions</div>  </div>
+  <div class="headertitle"><div class="title">Extended Functions</div></div>
 </div><!--header-->
 <div class="contents">
 
 <p>Extended functionality.  
 <a href="#details">More...</a></p>
 <table class="memberdecls">
-<tr class="heading"><td colspan="2"><h2 class="groupheader"><a name="define-members"></a>
+<tr class="heading"><td colspan="2"><h2 class="groupheader"><a id="define-members" name="define-members"></a>
 Macros</h2></td></tr>
-<tr class="memitem:ga1ea64283508718d9d645c38efc2f4305"><td class="memItemLeft" align="right" valign="top">#define&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__extended.html#ga1ea64283508718d9d645c38efc2f4305">MI_SMALL_SIZE_MAX</a></td></tr>
-<tr class="memdesc:ga1ea64283508718d9d645c38efc2f4305"><td class="mdescLeft">&#160;</td><td class="mdescRight">Maximum size allowed for small allocations in <a class="el" href="group__extended.html#ga7136c2e55cb22c98ecf95d08d6debb99" title="Allocate a small object.">mi_malloc_small</a> and <a class="el" href="group__extended.html#ga220f29f40a44404b0061c15bc1c31152" title="Allocate a zero initialized small object.">mi_zalloc_small</a> (usually <code>128*sizeof(void*)</code> (= 1KB on 64-bit systems))  <a href="group__extended.html#ga1ea64283508718d9d645c38efc2f4305">More...</a><br /></td></tr>
+<tr class="memitem:ga1ea64283508718d9d645c38efc2f4305" id="r_ga1ea64283508718d9d645c38efc2f4305"><td class="memItemLeft" align="right" valign="top">#define&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="#ga1ea64283508718d9d645c38efc2f4305">MI_SMALL_SIZE_MAX</a></td></tr>
+<tr class="memdesc:ga1ea64283508718d9d645c38efc2f4305"><td class="mdescLeft">&#160;</td><td class="mdescRight">Maximum size allowed for small allocations in <a class="el" href="#ga7f050bc6b897da82692174f5fce59cde" title="Allocate a small object.">mi_malloc_small</a> and <a class="el" href="#ga51c47637e81df0e2f13a2d7a2dec123e" title="Allocate a zero initialized small object.">mi_zalloc_small</a> (usually <code>128*sizeof(void*)</code> (= 1KB on 64-bit systems))  <br /></td></tr>
 <tr class="separator:ga1ea64283508718d9d645c38efc2f4305"><td class="memSeparator" colspan="2">&#160;</td></tr>
 </table><table class="memberdecls">
-<tr class="heading"><td colspan="2"><h2 class="groupheader"><a name="typedef-members"></a>
+<tr class="heading"><td colspan="2"><h2 class="groupheader"><a id="typedef-members" name="typedef-members"></a>
 Typedefs</h2></td></tr>
-<tr class="memitem:ga299dae78d25ce112e384a98b7309c5be"><td class="memItemLeft" align="right" valign="top">typedef void()&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__extended.html#ga299dae78d25ce112e384a98b7309c5be">mi_deferred_free_fun</a>(bool force, unsigned long long heartbeat, void *arg)</td></tr>
-<tr class="memdesc:ga299dae78d25ce112e384a98b7309c5be"><td class="mdescLeft">&#160;</td><td class="mdescRight">Type of deferred free functions.  <a href="group__extended.html#ga299dae78d25ce112e384a98b7309c5be">More...</a><br /></td></tr>
-<tr class="separator:ga299dae78d25ce112e384a98b7309c5be"><td class="memSeparator" colspan="2">&#160;</td></tr>
-<tr class="memitem:gad823d23444a4b77a40f66bf075a98a0c"><td class="memItemLeft" align="right" valign="top">typedef void()&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__extended.html#gad823d23444a4b77a40f66bf075a98a0c">mi_output_fun</a>(const char *msg, void *arg)</td></tr>
-<tr class="memdesc:gad823d23444a4b77a40f66bf075a98a0c"><td class="mdescLeft">&#160;</td><td class="mdescRight">Type of output functions.  <a href="group__extended.html#gad823d23444a4b77a40f66bf075a98a0c">More...</a><br /></td></tr>
-<tr class="separator:gad823d23444a4b77a40f66bf075a98a0c"><td class="memSeparator" colspan="2">&#160;</td></tr>
-<tr class="memitem:ga251d369cda3f1c2a955c555486ed90e5"><td class="memItemLeft" align="right" valign="top">typedef void()&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__extended.html#ga251d369cda3f1c2a955c555486ed90e5">mi_error_fun</a>(int err, void *arg)</td></tr>
-<tr class="memdesc:ga251d369cda3f1c2a955c555486ed90e5"><td class="mdescLeft">&#160;</td><td class="mdescRight">Type of error callback functions.  <a href="group__extended.html#ga251d369cda3f1c2a955c555486ed90e5">More...</a><br /></td></tr>
-<tr class="separator:ga251d369cda3f1c2a955c555486ed90e5"><td class="memSeparator" colspan="2">&#160;</td></tr>
+<tr class="memitem:ga292a45f7dbc7cd23c5352ce1f0002816" id="r_ga292a45f7dbc7cd23c5352ce1f0002816"><td class="memItemLeft" align="right" valign="top">typedef void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="#ga292a45f7dbc7cd23c5352ce1f0002816">mi_deferred_free_fun</a>(bool force, unsigned long long heartbeat, void *arg)</td></tr>
+<tr class="memdesc:ga292a45f7dbc7cd23c5352ce1f0002816"><td class="mdescLeft">&#160;</td><td class="mdescRight">Type of deferred free functions.  <br /></td></tr>
+<tr class="separator:ga292a45f7dbc7cd23c5352ce1f0002816"><td class="memSeparator" colspan="2">&#160;</td></tr>
+<tr class="memitem:gadf31cea7d0332a81c8b882cbbdbadb8d" id="r_gadf31cea7d0332a81c8b882cbbdbadb8d"><td class="memItemLeft" align="right" valign="top">typedef void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="#gadf31cea7d0332a81c8b882cbbdbadb8d">mi_output_fun</a>(const char *msg, void *arg)</td></tr>
+<tr class="memdesc:gadf31cea7d0332a81c8b882cbbdbadb8d"><td class="mdescLeft">&#160;</td><td class="mdescRight">Type of output functions.  <br /></td></tr>
+<tr class="separator:gadf31cea7d0332a81c8b882cbbdbadb8d"><td class="memSeparator" colspan="2">&#160;</td></tr>
+<tr class="memitem:ga83fc6a688b322261e1c2deab000b0591" id="r_ga83fc6a688b322261e1c2deab000b0591"><td class="memItemLeft" align="right" valign="top">typedef void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="#ga83fc6a688b322261e1c2deab000b0591">mi_error_fun</a>(int err, void *arg)</td></tr>
+<tr class="memdesc:ga83fc6a688b322261e1c2deab000b0591"><td class="mdescLeft">&#160;</td><td class="mdescRight">Type of error callback functions.  <br /></td></tr>
+<tr class="separator:ga83fc6a688b322261e1c2deab000b0591"><td class="memSeparator" colspan="2">&#160;</td></tr>
+<tr class="memitem:ga99fe38650d0b02e0e0f89ee024db91d3" id="r_ga99fe38650d0b02e0e0f89ee024db91d3"><td class="memItemLeft" align="right" valign="top">typedef int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="#ga99fe38650d0b02e0e0f89ee024db91d3">mi_arena_id_t</a></td></tr>
+<tr class="memdesc:ga99fe38650d0b02e0e0f89ee024db91d3"><td class="mdescLeft">&#160;</td><td class="mdescRight">Mimalloc uses large (virtual) memory areas, called "arena"s, from the OS to manage its memory.  <br /></td></tr>
+<tr class="separator:ga99fe38650d0b02e0e0f89ee024db91d3"><td class="memSeparator" colspan="2">&#160;</td></tr>
+<tr class="memitem:ga8c0bcd1fee27c7641e9c3c0d991b3b7d" id="r_ga8c0bcd1fee27c7641e9c3c0d991b3b7d"><td class="memItemLeft" align="right" valign="top">typedef void *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="#ga8c0bcd1fee27c7641e9c3c0d991b3b7d">mi_subproc_id_t</a></td></tr>
+<tr class="memdesc:ga8c0bcd1fee27c7641e9c3c0d991b3b7d"><td class="mdescLeft">&#160;</td><td class="mdescRight">A process can associate threads with sub-processes.  <br /></td></tr>
+<tr class="separator:ga8c0bcd1fee27c7641e9c3c0d991b3b7d"><td class="memSeparator" colspan="2">&#160;</td></tr>
 </table><table class="memberdecls">
-<tr class="heading"><td colspan="2"><h2 class="groupheader"><a name="func-members"></a>
+<tr class="heading"><td colspan="2"><h2 class="groupheader"><a id="func-members" name="func-members"></a>
 Functions</h2></td></tr>
-<tr class="memitem:ga7136c2e55cb22c98ecf95d08d6debb99"><td class="memItemLeft" align="right" valign="top">void *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__extended.html#ga7136c2e55cb22c98ecf95d08d6debb99">mi_malloc_small</a> (size_t size)</td></tr>
-<tr class="memdesc:ga7136c2e55cb22c98ecf95d08d6debb99"><td class="mdescLeft">&#160;</td><td class="mdescRight">Allocate a small object.  <a href="group__extended.html#ga7136c2e55cb22c98ecf95d08d6debb99">More...</a><br /></td></tr>
-<tr class="separator:ga7136c2e55cb22c98ecf95d08d6debb99"><td class="memSeparator" colspan="2">&#160;</td></tr>
-<tr class="memitem:ga220f29f40a44404b0061c15bc1c31152"><td class="memItemLeft" align="right" valign="top">void *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__extended.html#ga220f29f40a44404b0061c15bc1c31152">mi_zalloc_small</a> (size_t size)</td></tr>
-<tr class="memdesc:ga220f29f40a44404b0061c15bc1c31152"><td class="mdescLeft">&#160;</td><td class="mdescRight">Allocate a zero initialized small object.  <a href="group__extended.html#ga220f29f40a44404b0061c15bc1c31152">More...</a><br /></td></tr>
-<tr class="separator:ga220f29f40a44404b0061c15bc1c31152"><td class="memSeparator" colspan="2">&#160;</td></tr>
-<tr class="memitem:ga089c859d9eddc5f9b4bd946cd53cebee"><td class="memItemLeft" align="right" valign="top">size_t&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__extended.html#ga089c859d9eddc5f9b4bd946cd53cebee">mi_usable_size</a> (void *p)</td></tr>
-<tr class="memdesc:ga089c859d9eddc5f9b4bd946cd53cebee"><td class="mdescLeft">&#160;</td><td class="mdescRight">Return the available bytes in a memory block.  <a href="group__extended.html#ga089c859d9eddc5f9b4bd946cd53cebee">More...</a><br /></td></tr>
+<tr class="memitem:ga7f050bc6b897da82692174f5fce59cde" id="r_ga7f050bc6b897da82692174f5fce59cde"><td class="memItemLeft" align="right" valign="top">void *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="#ga7f050bc6b897da82692174f5fce59cde">mi_malloc_small</a> (size_t size)</td></tr>
+<tr class="memdesc:ga7f050bc6b897da82692174f5fce59cde"><td class="mdescLeft">&#160;</td><td class="mdescRight">Allocate a small object.  <br /></td></tr>
+<tr class="separator:ga7f050bc6b897da82692174f5fce59cde"><td class="memSeparator" colspan="2">&#160;</td></tr>
+<tr class="memitem:ga51c47637e81df0e2f13a2d7a2dec123e" id="r_ga51c47637e81df0e2f13a2d7a2dec123e"><td class="memItemLeft" align="right" valign="top">void *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="#ga51c47637e81df0e2f13a2d7a2dec123e">mi_zalloc_small</a> (size_t size)</td></tr>
+<tr class="memdesc:ga51c47637e81df0e2f13a2d7a2dec123e"><td class="mdescLeft">&#160;</td><td class="mdescRight">Allocate a zero initialized small object.  <br /></td></tr>
+<tr class="separator:ga51c47637e81df0e2f13a2d7a2dec123e"><td class="memSeparator" colspan="2">&#160;</td></tr>
+<tr class="memitem:ga089c859d9eddc5f9b4bd946cd53cebee" id="r_ga089c859d9eddc5f9b4bd946cd53cebee"><td class="memItemLeft" align="right" valign="top">size_t&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="#ga089c859d9eddc5f9b4bd946cd53cebee">mi_usable_size</a> (void *p)</td></tr>
+<tr class="memdesc:ga089c859d9eddc5f9b4bd946cd53cebee"><td class="mdescLeft">&#160;</td><td class="mdescRight">Return the available bytes in a memory block.  <br /></td></tr>
 <tr class="separator:ga089c859d9eddc5f9b4bd946cd53cebee"><td class="memSeparator" colspan="2">&#160;</td></tr>
-<tr class="memitem:gac057927cd06c854b45fe7847e921bd47"><td class="memItemLeft" align="right" valign="top">size_t&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__extended.html#gac057927cd06c854b45fe7847e921bd47">mi_good_size</a> (size_t size)</td></tr>
-<tr class="memdesc:gac057927cd06c854b45fe7847e921bd47"><td class="mdescLeft">&#160;</td><td class="mdescRight">Return the used allocation size.  <a href="group__extended.html#gac057927cd06c854b45fe7847e921bd47">More...</a><br /></td></tr>
+<tr class="memitem:gac057927cd06c854b45fe7847e921bd47" id="r_gac057927cd06c854b45fe7847e921bd47"><td class="memItemLeft" align="right" valign="top">size_t&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="#gac057927cd06c854b45fe7847e921bd47">mi_good_size</a> (size_t size)</td></tr>
+<tr class="memdesc:gac057927cd06c854b45fe7847e921bd47"><td class="mdescLeft">&#160;</td><td class="mdescRight">Return the used allocation size.  <br /></td></tr>
 <tr class="separator:gac057927cd06c854b45fe7847e921bd47"><td class="memSeparator" colspan="2">&#160;</td></tr>
-<tr class="memitem:ga421430e2226d7d468529cec457396756"><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__extended.html#ga421430e2226d7d468529cec457396756">mi_collect</a> (bool force)</td></tr>
-<tr class="memdesc:ga421430e2226d7d468529cec457396756"><td class="mdescLeft">&#160;</td><td class="mdescRight">Eagerly free memory.  <a href="group__extended.html#ga421430e2226d7d468529cec457396756">More...</a><br /></td></tr>
+<tr class="memitem:ga421430e2226d7d468529cec457396756" id="r_ga421430e2226d7d468529cec457396756"><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="#ga421430e2226d7d468529cec457396756">mi_collect</a> (bool force)</td></tr>
+<tr class="memdesc:ga421430e2226d7d468529cec457396756"><td class="mdescLeft">&#160;</td><td class="mdescRight">Eagerly free memory.  <br /></td></tr>
 <tr class="separator:ga421430e2226d7d468529cec457396756"><td class="memSeparator" colspan="2">&#160;</td></tr>
-<tr class="memitem:ga2d126e5c62d3badc35445e5d84166df2"><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__extended.html#ga2d126e5c62d3badc35445e5d84166df2">mi_stats_print</a> (void *out)</td></tr>
-<tr class="memdesc:ga2d126e5c62d3badc35445e5d84166df2"><td class="mdescLeft">&#160;</td><td class="mdescRight">Deprecated.  <a href="group__extended.html#ga2d126e5c62d3badc35445e5d84166df2">More...</a><br /></td></tr>
+<tr class="memitem:ga2d126e5c62d3badc35445e5d84166df2" id="r_ga2d126e5c62d3badc35445e5d84166df2"><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="#ga2d126e5c62d3badc35445e5d84166df2">mi_stats_print</a> (void *out)</td></tr>
+<tr class="memdesc:ga2d126e5c62d3badc35445e5d84166df2"><td class="mdescLeft">&#160;</td><td class="mdescRight">Deprecated.  <br /></td></tr>
 <tr class="separator:ga2d126e5c62d3badc35445e5d84166df2"><td class="memSeparator" colspan="2">&#160;</td></tr>
-<tr class="memitem:ga537f13b299ddf801e49a5a94fde02c79"><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__extended.html#ga537f13b299ddf801e49a5a94fde02c79">mi_stats_print_out</a> (<a class="el" href="group__extended.html#gad823d23444a4b77a40f66bf075a98a0c">mi_output_fun</a> *out, void *arg)</td></tr>
-<tr class="memdesc:ga537f13b299ddf801e49a5a94fde02c79"><td class="mdescLeft">&#160;</td><td class="mdescRight">Print the main statistics.  <a href="group__extended.html#ga537f13b299ddf801e49a5a94fde02c79">More...</a><br /></td></tr>
+<tr class="memitem:ga537f13b299ddf801e49a5a94fde02c79" id="r_ga537f13b299ddf801e49a5a94fde02c79"><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="#ga537f13b299ddf801e49a5a94fde02c79">mi_stats_print_out</a> (<a class="el" href="#gadf31cea7d0332a81c8b882cbbdbadb8d">mi_output_fun</a> *out, void *arg)</td></tr>
+<tr class="memdesc:ga537f13b299ddf801e49a5a94fde02c79"><td class="mdescLeft">&#160;</td><td class="mdescRight">Print the main statistics.  <br /></td></tr>
 <tr class="separator:ga537f13b299ddf801e49a5a94fde02c79"><td class="memSeparator" colspan="2">&#160;</td></tr>
-<tr class="memitem:ga3bb8468b8cfcc6e2a61d98aee85c5f99"><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__extended.html#ga3bb8468b8cfcc6e2a61d98aee85c5f99">mi_stats_reset</a> (void)</td></tr>
-<tr class="memdesc:ga3bb8468b8cfcc6e2a61d98aee85c5f99"><td class="mdescLeft">&#160;</td><td class="mdescRight">Reset statistics.  <a href="group__extended.html#ga3bb8468b8cfcc6e2a61d98aee85c5f99">More...</a><br /></td></tr>
+<tr class="memitem:ga3bb8468b8cfcc6e2a61d98aee85c5f99" id="r_ga3bb8468b8cfcc6e2a61d98aee85c5f99"><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="#ga3bb8468b8cfcc6e2a61d98aee85c5f99">mi_stats_reset</a> (void)</td></tr>
+<tr class="memdesc:ga3bb8468b8cfcc6e2a61d98aee85c5f99"><td class="mdescLeft">&#160;</td><td class="mdescRight">Reset statistics.  <br /></td></tr>
 <tr class="separator:ga3bb8468b8cfcc6e2a61d98aee85c5f99"><td class="memSeparator" colspan="2">&#160;</td></tr>
-<tr class="memitem:ga854b1de8cb067c7316286c28b2fcd3d1"><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__extended.html#ga854b1de8cb067c7316286c28b2fcd3d1">mi_stats_merge</a> (void)</td></tr>
-<tr class="memdesc:ga854b1de8cb067c7316286c28b2fcd3d1"><td class="mdescLeft">&#160;</td><td class="mdescRight">Merge thread local statistics with the main statistics and reset.  <a href="group__extended.html#ga854b1de8cb067c7316286c28b2fcd3d1">More...</a><br /></td></tr>
+<tr class="memitem:ga854b1de8cb067c7316286c28b2fcd3d1" id="r_ga854b1de8cb067c7316286c28b2fcd3d1"><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="#ga854b1de8cb067c7316286c28b2fcd3d1">mi_stats_merge</a> (void)</td></tr>
+<tr class="memdesc:ga854b1de8cb067c7316286c28b2fcd3d1"><td class="mdescLeft">&#160;</td><td class="mdescRight">Merge thread local statistics with the main statistics and reset.  <br /></td></tr>
 <tr class="separator:ga854b1de8cb067c7316286c28b2fcd3d1"><td class="memSeparator" colspan="2">&#160;</td></tr>
-<tr class="memitem:gaf8e73efc2cbca9ebfdfb166983a04c17"><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__extended.html#gaf8e73efc2cbca9ebfdfb166983a04c17">mi_thread_init</a> (void)</td></tr>
-<tr class="memdesc:gaf8e73efc2cbca9ebfdfb166983a04c17"><td class="mdescLeft">&#160;</td><td class="mdescRight">Initialize mimalloc on a thread.  <a href="group__extended.html#gaf8e73efc2cbca9ebfdfb166983a04c17">More...</a><br /></td></tr>
+<tr class="memitem:gaf8e73efc2cbca9ebfdfb166983a04c17" id="r_gaf8e73efc2cbca9ebfdfb166983a04c17"><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="#gaf8e73efc2cbca9ebfdfb166983a04c17">mi_thread_init</a> (void)</td></tr>
+<tr class="memdesc:gaf8e73efc2cbca9ebfdfb166983a04c17"><td class="mdescLeft">&#160;</td><td class="mdescRight">Initialize mimalloc on a thread.  <br /></td></tr>
 <tr class="separator:gaf8e73efc2cbca9ebfdfb166983a04c17"><td class="memSeparator" colspan="2">&#160;</td></tr>
-<tr class="memitem:ga0ae4581e85453456a0d658b2b98bf7bf"><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__extended.html#ga0ae4581e85453456a0d658b2b98bf7bf">mi_thread_done</a> (void)</td></tr>
-<tr class="memdesc:ga0ae4581e85453456a0d658b2b98bf7bf"><td class="mdescLeft">&#160;</td><td class="mdescRight">Uninitialize mimalloc on a thread.  <a href="group__extended.html#ga0ae4581e85453456a0d658b2b98bf7bf">More...</a><br /></td></tr>
+<tr class="memitem:ga0ae4581e85453456a0d658b2b98bf7bf" id="r_ga0ae4581e85453456a0d658b2b98bf7bf"><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="#ga0ae4581e85453456a0d658b2b98bf7bf">mi_thread_done</a> (void)</td></tr>
+<tr class="memdesc:ga0ae4581e85453456a0d658b2b98bf7bf"><td class="mdescLeft">&#160;</td><td class="mdescRight">Uninitialize mimalloc on a thread.  <br /></td></tr>
 <tr class="separator:ga0ae4581e85453456a0d658b2b98bf7bf"><td class="memSeparator" colspan="2">&#160;</td></tr>
-<tr class="memitem:gab1dac8476c46cb9eecab767eb40c1525"><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__extended.html#gab1dac8476c46cb9eecab767eb40c1525">mi_thread_stats_print_out</a> (<a class="el" href="group__extended.html#gad823d23444a4b77a40f66bf075a98a0c">mi_output_fun</a> *out, void *arg)</td></tr>
-<tr class="memdesc:gab1dac8476c46cb9eecab767eb40c1525"><td class="mdescLeft">&#160;</td><td class="mdescRight">Print out heap statistics for this thread.  <a href="group__extended.html#gab1dac8476c46cb9eecab767eb40c1525">More...</a><br /></td></tr>
+<tr class="memitem:gab1dac8476c46cb9eecab767eb40c1525" id="r_gab1dac8476c46cb9eecab767eb40c1525"><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="#gab1dac8476c46cb9eecab767eb40c1525">mi_thread_stats_print_out</a> (<a class="el" href="#gadf31cea7d0332a81c8b882cbbdbadb8d">mi_output_fun</a> *out, void *arg)</td></tr>
+<tr class="memdesc:gab1dac8476c46cb9eecab767eb40c1525"><td class="mdescLeft">&#160;</td><td class="mdescRight">Print out heap statistics for this thread.  <br /></td></tr>
 <tr class="separator:gab1dac8476c46cb9eecab767eb40c1525"><td class="memSeparator" colspan="2">&#160;</td></tr>
-<tr class="memitem:ga3460a6ca91af97be4058f523d3cb8ece"><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__extended.html#ga3460a6ca91af97be4058f523d3cb8ece">mi_register_deferred_free</a> (<a class="el" href="group__extended.html#ga299dae78d25ce112e384a98b7309c5be">mi_deferred_free_fun</a> *deferred_free, void *arg)</td></tr>
-<tr class="memdesc:ga3460a6ca91af97be4058f523d3cb8ece"><td class="mdescLeft">&#160;</td><td class="mdescRight">Register a deferred free function.  <a href="group__extended.html#ga3460a6ca91af97be4058f523d3cb8ece">More...</a><br /></td></tr>
+<tr class="memitem:ga3460a6ca91af97be4058f523d3cb8ece" id="r_ga3460a6ca91af97be4058f523d3cb8ece"><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="#ga3460a6ca91af97be4058f523d3cb8ece">mi_register_deferred_free</a> (<a class="el" href="#ga292a45f7dbc7cd23c5352ce1f0002816">mi_deferred_free_fun</a> *deferred_free, void *arg)</td></tr>
+<tr class="memdesc:ga3460a6ca91af97be4058f523d3cb8ece"><td class="mdescLeft">&#160;</td><td class="mdescRight">Register a deferred free function.  <br /></td></tr>
 <tr class="separator:ga3460a6ca91af97be4058f523d3cb8ece"><td class="memSeparator" colspan="2">&#160;</td></tr>
-<tr class="memitem:gae5b17ff027cd2150b43a33040250cf3f"><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__extended.html#gae5b17ff027cd2150b43a33040250cf3f">mi_register_output</a> (<a class="el" href="group__extended.html#gad823d23444a4b77a40f66bf075a98a0c">mi_output_fun</a> *out, void *arg)</td></tr>
-<tr class="memdesc:gae5b17ff027cd2150b43a33040250cf3f"><td class="mdescLeft">&#160;</td><td class="mdescRight">Register an output function.  <a href="group__extended.html#gae5b17ff027cd2150b43a33040250cf3f">More...</a><br /></td></tr>
+<tr class="memitem:gae5b17ff027cd2150b43a33040250cf3f" id="r_gae5b17ff027cd2150b43a33040250cf3f"><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="#gae5b17ff027cd2150b43a33040250cf3f">mi_register_output</a> (<a class="el" href="#gadf31cea7d0332a81c8b882cbbdbadb8d">mi_output_fun</a> *out, void *arg)</td></tr>
+<tr class="memdesc:gae5b17ff027cd2150b43a33040250cf3f"><td class="mdescLeft">&#160;</td><td class="mdescRight">Register an output function.  <br /></td></tr>
 <tr class="separator:gae5b17ff027cd2150b43a33040250cf3f"><td class="memSeparator" colspan="2">&#160;</td></tr>
-<tr class="memitem:gaa1d55e0e894be240827e5d87ec3a1f45"><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__extended.html#gaa1d55e0e894be240827e5d87ec3a1f45">mi_register_error</a> (<a class="el" href="group__extended.html#ga251d369cda3f1c2a955c555486ed90e5">mi_error_fun</a> *errfun, void *arg)</td></tr>
-<tr class="memdesc:gaa1d55e0e894be240827e5d87ec3a1f45"><td class="mdescLeft">&#160;</td><td class="mdescRight">Register an error callback function.  <a href="group__extended.html#gaa1d55e0e894be240827e5d87ec3a1f45">More...</a><br /></td></tr>
+<tr class="memitem:gaa1d55e0e894be240827e5d87ec3a1f45" id="r_gaa1d55e0e894be240827e5d87ec3a1f45"><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="#gaa1d55e0e894be240827e5d87ec3a1f45">mi_register_error</a> (<a class="el" href="#ga83fc6a688b322261e1c2deab000b0591">mi_error_fun</a> *errfun, void *arg)</td></tr>
+<tr class="memdesc:gaa1d55e0e894be240827e5d87ec3a1f45"><td class="mdescLeft">&#160;</td><td class="mdescRight">Register an error callback function.  <br /></td></tr>
 <tr class="separator:gaa1d55e0e894be240827e5d87ec3a1f45"><td class="memSeparator" colspan="2">&#160;</td></tr>
-<tr class="memitem:ga5f071b10d4df1c3658e04e7fd67a94e6"><td class="memItemLeft" align="right" valign="top">bool&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__extended.html#ga5f071b10d4df1c3658e04e7fd67a94e6">mi_is_in_heap_region</a> (const void *p)</td></tr>
-<tr class="memdesc:ga5f071b10d4df1c3658e04e7fd67a94e6"><td class="mdescLeft">&#160;</td><td class="mdescRight">Is a pointer part of our heap?  <a href="group__extended.html#ga5f071b10d4df1c3658e04e7fd67a94e6">More...</a><br /></td></tr>
+<tr class="memitem:ga5f071b10d4df1c3658e04e7fd67a94e6" id="r_ga5f071b10d4df1c3658e04e7fd67a94e6"><td class="memItemLeft" align="right" valign="top">bool&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="#ga5f071b10d4df1c3658e04e7fd67a94e6">mi_is_in_heap_region</a> (const void *p)</td></tr>
+<tr class="memdesc:ga5f071b10d4df1c3658e04e7fd67a94e6"><td class="mdescLeft">&#160;</td><td class="mdescRight">Is a pointer part of our heap?  <br /></td></tr>
 <tr class="separator:ga5f071b10d4df1c3658e04e7fd67a94e6"><td class="memSeparator" colspan="2">&#160;</td></tr>
-<tr class="memitem:ga00ec3324b6b2591c7fe3677baa30a767"><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__extended.html#ga00ec3324b6b2591c7fe3677baa30a767">mi_reserve_os_memory</a> (size_t size, bool commit, bool allow_large)</td></tr>
-<tr class="memdesc:ga00ec3324b6b2591c7fe3677baa30a767"><td class="mdescLeft">&#160;</td><td class="mdescRight">Reserve OS memory for use by mimalloc.  <a href="group__extended.html#ga00ec3324b6b2591c7fe3677baa30a767">More...</a><br /></td></tr>
+<tr class="memitem:ga00ec3324b6b2591c7fe3677baa30a767" id="r_ga00ec3324b6b2591c7fe3677baa30a767"><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="#ga00ec3324b6b2591c7fe3677baa30a767">mi_reserve_os_memory</a> (size_t size, bool commit, bool allow_large)</td></tr>
+<tr class="memdesc:ga00ec3324b6b2591c7fe3677baa30a767"><td class="mdescLeft">&#160;</td><td class="mdescRight">Reserve OS memory for use by mimalloc.  <br /></td></tr>
 <tr class="separator:ga00ec3324b6b2591c7fe3677baa30a767"><td class="memSeparator" colspan="2">&#160;</td></tr>
-<tr class="memitem:ga4c6486a1fdcd7a423b5f25fe4be8e0cf"><td class="memItemLeft" align="right" valign="top">bool&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__extended.html#ga4c6486a1fdcd7a423b5f25fe4be8e0cf">mi_manage_os_memory</a> (void *start, size_t size, bool is_committed, bool is_large, bool is_zero, int numa_node)</td></tr>
-<tr class="memdesc:ga4c6486a1fdcd7a423b5f25fe4be8e0cf"><td class="mdescLeft">&#160;</td><td class="mdescRight">Manage a particular memory area for use by mimalloc.  <a href="group__extended.html#ga4c6486a1fdcd7a423b5f25fe4be8e0cf">More...</a><br /></td></tr>
+<tr class="memitem:ga4c6486a1fdcd7a423b5f25fe4be8e0cf" id="r_ga4c6486a1fdcd7a423b5f25fe4be8e0cf"><td class="memItemLeft" align="right" valign="top">bool&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="#ga4c6486a1fdcd7a423b5f25fe4be8e0cf">mi_manage_os_memory</a> (void *start, size_t size, bool is_committed, bool is_large, bool is_zero, int numa_node)</td></tr>
+<tr class="memdesc:ga4c6486a1fdcd7a423b5f25fe4be8e0cf"><td class="mdescLeft">&#160;</td><td class="mdescRight">Manage a particular memory area for use by mimalloc.  <br /></td></tr>
 <tr class="separator:ga4c6486a1fdcd7a423b5f25fe4be8e0cf"><td class="memSeparator" colspan="2">&#160;</td></tr>
-<tr class="memitem:ga3132f521fb756fc0e8ec0b74fb58df50"><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__extended.html#ga3132f521fb756fc0e8ec0b74fb58df50">mi_reserve_huge_os_pages_interleave</a> (size_t pages, size_t numa_nodes, size_t timeout_msecs)</td></tr>
-<tr class="memdesc:ga3132f521fb756fc0e8ec0b74fb58df50"><td class="mdescLeft">&#160;</td><td class="mdescRight">Reserve <em>pages</em> of huge OS pages (1GiB) evenly divided over <em>numa_nodes</em> nodes, but stops after at most <code>timeout_msecs</code> seconds.  <a href="group__extended.html#ga3132f521fb756fc0e8ec0b74fb58df50">More...</a><br /></td></tr>
+<tr class="memitem:ga3132f521fb756fc0e8ec0b74fb58df50" id="r_ga3132f521fb756fc0e8ec0b74fb58df50"><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="#ga3132f521fb756fc0e8ec0b74fb58df50">mi_reserve_huge_os_pages_interleave</a> (size_t pages, size_t numa_nodes, size_t timeout_msecs)</td></tr>
+<tr class="memdesc:ga3132f521fb756fc0e8ec0b74fb58df50"><td class="mdescLeft">&#160;</td><td class="mdescRight">Reserve <em class="arg">pages</em> of huge OS pages (1GiB) evenly divided over <em class="arg">numa_nodes</em> nodes, but stops after at most <code>timeout_msecs</code> seconds.  <br /></td></tr>
 <tr class="separator:ga3132f521fb756fc0e8ec0b74fb58df50"><td class="memSeparator" colspan="2">&#160;</td></tr>
-<tr class="memitem:ga7795a13d20087447281858d2c771cca1"><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__extended.html#ga7795a13d20087447281858d2c771cca1">mi_reserve_huge_os_pages_at</a> (size_t pages, int numa_node, size_t timeout_msecs)</td></tr>
-<tr class="memdesc:ga7795a13d20087447281858d2c771cca1"><td class="mdescLeft">&#160;</td><td class="mdescRight">Reserve <em>pages</em> of huge OS pages (1GiB) at a specific <em>numa_node</em>, but stops after at most <code>timeout_msecs</code> seconds.  <a href="group__extended.html#ga7795a13d20087447281858d2c771cca1">More...</a><br /></td></tr>
+<tr class="memitem:ga7795a13d20087447281858d2c771cca1" id="r_ga7795a13d20087447281858d2c771cca1"><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="#ga7795a13d20087447281858d2c771cca1">mi_reserve_huge_os_pages_at</a> (size_t pages, int numa_node, size_t timeout_msecs)</td></tr>
+<tr class="memdesc:ga7795a13d20087447281858d2c771cca1"><td class="mdescLeft">&#160;</td><td class="mdescRight">Reserve <em class="arg">pages</em> of huge OS pages (1GiB) at a specific <em class="arg">numa_node</em>, but stops after at most <code>timeout_msecs</code> seconds.  <br /></td></tr>
 <tr class="separator:ga7795a13d20087447281858d2c771cca1"><td class="memSeparator" colspan="2">&#160;</td></tr>
-<tr class="memitem:gaad25050b19f30cd79397b227e0157a3f"><td class="memItemLeft" align="right" valign="top">bool&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__extended.html#gaad25050b19f30cd79397b227e0157a3f">mi_is_redirected</a> ()</td></tr>
-<tr class="memdesc:gaad25050b19f30cd79397b227e0157a3f"><td class="mdescLeft">&#160;</td><td class="mdescRight">Is the C runtime <em>malloc</em> API redirected?  <a href="group__extended.html#gaad25050b19f30cd79397b227e0157a3f">More...</a><br /></td></tr>
+<tr class="memitem:gaad25050b19f30cd79397b227e0157a3f" id="r_gaad25050b19f30cd79397b227e0157a3f"><td class="memItemLeft" align="right" valign="top">bool&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="#gaad25050b19f30cd79397b227e0157a3f">mi_is_redirected</a> ()</td></tr>
+<tr class="memdesc:gaad25050b19f30cd79397b227e0157a3f"><td class="mdescLeft">&#160;</td><td class="mdescRight">Is the C runtime <em class="arg">malloc</em> API redirected?  <br /></td></tr>
 <tr class="separator:gaad25050b19f30cd79397b227e0157a3f"><td class="memSeparator" colspan="2">&#160;</td></tr>
-<tr class="memitem:ga7d862c2affd5790381da14eb102a364d"><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__extended.html#ga7d862c2affd5790381da14eb102a364d">mi_process_info</a> (size_t *elapsed_msecs, size_t *user_msecs, size_t *system_msecs, size_t *current_rss, size_t *peak_rss, size_t *current_commit, size_t *peak_commit, size_t *page_faults)</td></tr>
-<tr class="memdesc:ga7d862c2affd5790381da14eb102a364d"><td class="mdescLeft">&#160;</td><td class="mdescRight">Return process information (time and memory usage).  <a href="group__extended.html#ga7d862c2affd5790381da14eb102a364d">More...</a><br /></td></tr>
+<tr class="memitem:ga7d862c2affd5790381da14eb102a364d" id="r_ga7d862c2affd5790381da14eb102a364d"><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="#ga7d862c2affd5790381da14eb102a364d">mi_process_info</a> (size_t *elapsed_msecs, size_t *user_msecs, size_t *system_msecs, size_t *current_rss, size_t *peak_rss, size_t *current_commit, size_t *peak_commit, size_t *page_faults)</td></tr>
+<tr class="memdesc:ga7d862c2affd5790381da14eb102a364d"><td class="mdescLeft">&#160;</td><td class="mdescRight">Return process information (time and memory usage).  <br /></td></tr>
 <tr class="separator:ga7d862c2affd5790381da14eb102a364d"><td class="memSeparator" colspan="2">&#160;</td></tr>
+<tr class="memitem:gad7439207f8f71fb6c382a9ea20b997e7" id="r_gad7439207f8f71fb6c382a9ea20b997e7"><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="#gad7439207f8f71fb6c382a9ea20b997e7">mi_debug_show_arenas</a> (bool show_inuse, bool show_abandoned, bool show_purge)</td></tr>
+<tr class="memdesc:gad7439207f8f71fb6c382a9ea20b997e7"><td class="mdescLeft">&#160;</td><td class="mdescRight">Show all current arena's.  <br /></td></tr>
+<tr class="separator:gad7439207f8f71fb6c382a9ea20b997e7"><td class="memSeparator" colspan="2">&#160;</td></tr>
+<tr class="memitem:ga9a25a00a22151619a0be91a10af7787f" id="r_ga9a25a00a22151619a0be91a10af7787f"><td class="memItemLeft" align="right" valign="top">void *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="#ga9a25a00a22151619a0be91a10af7787f">mi_arena_area</a> (<a class="el" href="#ga99fe38650d0b02e0e0f89ee024db91d3">mi_arena_id_t</a> arena_id, size_t *size)</td></tr>
+<tr class="memdesc:ga9a25a00a22151619a0be91a10af7787f"><td class="mdescLeft">&#160;</td><td class="mdescRight">Return the size of an arena.  <br /></td></tr>
+<tr class="separator:ga9a25a00a22151619a0be91a10af7787f"><td class="memSeparator" colspan="2">&#160;</td></tr>
+<tr class="memitem:ga591aab1c2bc2ca920e33f0f9f9cb5c52" id="r_ga591aab1c2bc2ca920e33f0f9f9cb5c52"><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="#ga591aab1c2bc2ca920e33f0f9f9cb5c52">mi_reserve_huge_os_pages_at_ex</a> (size_t pages, int numa_node, size_t timeout_msecs, bool exclusive, <a class="el" href="#ga99fe38650d0b02e0e0f89ee024db91d3">mi_arena_id_t</a> *arena_id)</td></tr>
+<tr class="memdesc:ga591aab1c2bc2ca920e33f0f9f9cb5c52"><td class="mdescLeft">&#160;</td><td class="mdescRight">Reserve huge OS pages (1GiB) into a single arena.  <br /></td></tr>
+<tr class="separator:ga591aab1c2bc2ca920e33f0f9f9cb5c52"><td class="memSeparator" colspan="2">&#160;</td></tr>
+<tr class="memitem:ga32f519797fd9a81acb4f52d36e6d751b" id="r_ga32f519797fd9a81acb4f52d36e6d751b"><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="#ga32f519797fd9a81acb4f52d36e6d751b">mi_reserve_os_memory_ex</a> (size_t size, bool commit, bool allow_large, bool exclusive, <a class="el" href="#ga99fe38650d0b02e0e0f89ee024db91d3">mi_arena_id_t</a> *arena_id)</td></tr>
+<tr class="memdesc:ga32f519797fd9a81acb4f52d36e6d751b"><td class="mdescLeft">&#160;</td><td class="mdescRight">Reserve OS memory to be managed in an arena.  <br /></td></tr>
+<tr class="separator:ga32f519797fd9a81acb4f52d36e6d751b"><td class="memSeparator" colspan="2">&#160;</td></tr>
+<tr class="memitem:ga41ce8525d77bbb60f618fa1029994f6e" id="r_ga41ce8525d77bbb60f618fa1029994f6e"><td class="memItemLeft" align="right" valign="top">bool&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="#ga41ce8525d77bbb60f618fa1029994f6e">mi_manage_os_memory_ex</a> (void *start, size_t size, bool is_committed, bool is_large, bool is_zero, int numa_node, bool exclusive, <a class="el" href="#ga99fe38650d0b02e0e0f89ee024db91d3">mi_arena_id_t</a> *arena_id)</td></tr>
+<tr class="memdesc:ga41ce8525d77bbb60f618fa1029994f6e"><td class="mdescLeft">&#160;</td><td class="mdescRight">Manage externally allocated memory as a mimalloc arena.  <br /></td></tr>
+<tr class="separator:ga41ce8525d77bbb60f618fa1029994f6e"><td class="memSeparator" colspan="2">&#160;</td></tr>
+<tr class="memitem:gaaf2d9976576d5efd5544be12848af949" id="r_gaaf2d9976576d5efd5544be12848af949"><td class="memItemLeft" align="right" valign="top"><a class="el" href="group__heap.html#ga34a47cde5a5b38c29f1aa3c5e76943c2">mi_heap_t</a> *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="#gaaf2d9976576d5efd5544be12848af949">mi_heap_new_in_arena</a> (<a class="el" href="#ga99fe38650d0b02e0e0f89ee024db91d3">mi_arena_id_t</a> arena_id)</td></tr>
+<tr class="memdesc:gaaf2d9976576d5efd5544be12848af949"><td class="mdescLeft">&#160;</td><td class="mdescRight">Create a new heap that only allocates in the specified arena.  <br /></td></tr>
+<tr class="separator:gaaf2d9976576d5efd5544be12848af949"><td class="memSeparator" colspan="2">&#160;</td></tr>
+<tr class="memitem:ga3ae360583f4351aa5267ee7e43008faf" id="r_ga3ae360583f4351aa5267ee7e43008faf"><td class="memItemLeft" align="right" valign="top"><a class="el" href="group__heap.html#ga34a47cde5a5b38c29f1aa3c5e76943c2">mi_heap_t</a> *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="#ga3ae360583f4351aa5267ee7e43008faf">mi_heap_new_ex</a> (int heap_tag, bool allow_destroy, <a class="el" href="#ga99fe38650d0b02e0e0f89ee024db91d3">mi_arena_id_t</a> arena_id)</td></tr>
+<tr class="memdesc:ga3ae360583f4351aa5267ee7e43008faf"><td class="mdescLeft">&#160;</td><td class="mdescRight">Create a new heap.  <br /></td></tr>
+<tr class="separator:ga3ae360583f4351aa5267ee7e43008faf"><td class="memSeparator" colspan="2">&#160;</td></tr>
+<tr class="memitem:ga2ecba0d7ebdc99e71bb985c4a1609806" id="r_ga2ecba0d7ebdc99e71bb985c4a1609806"><td class="memItemLeft" align="right" valign="top"><a class="el" href="#ga8c0bcd1fee27c7641e9c3c0d991b3b7d">mi_subproc_id_t</a>&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="#ga2ecba0d7ebdc99e71bb985c4a1609806">mi_subproc_main</a> (void)</td></tr>
+<tr class="memdesc:ga2ecba0d7ebdc99e71bb985c4a1609806"><td class="mdescLeft">&#160;</td><td class="mdescRight">Get the main sub-process identifier.  <br /></td></tr>
+<tr class="separator:ga2ecba0d7ebdc99e71bb985c4a1609806"><td class="memSeparator" colspan="2">&#160;</td></tr>
+<tr class="memitem:ga8068cac328e41fa2170faef707315243" id="r_ga8068cac328e41fa2170faef707315243"><td class="memItemLeft" align="right" valign="top"><a class="el" href="#ga8c0bcd1fee27c7641e9c3c0d991b3b7d">mi_subproc_id_t</a>&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="#ga8068cac328e41fa2170faef707315243">mi_subproc_new</a> (void)</td></tr>
+<tr class="memdesc:ga8068cac328e41fa2170faef707315243"><td class="mdescLeft">&#160;</td><td class="mdescRight">Create a fresh sub-process (with no associated threads yet).  <br /></td></tr>
+<tr class="separator:ga8068cac328e41fa2170faef707315243"><td class="memSeparator" colspan="2">&#160;</td></tr>
+<tr class="memitem:gaa7d263e9429bac9ac8345c9d25de610e" id="r_gaa7d263e9429bac9ac8345c9d25de610e"><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="#gaa7d263e9429bac9ac8345c9d25de610e">mi_subproc_delete</a> (<a class="el" href="#ga8c0bcd1fee27c7641e9c3c0d991b3b7d">mi_subproc_id_t</a> subproc)</td></tr>
+<tr class="memdesc:gaa7d263e9429bac9ac8345c9d25de610e"><td class="mdescLeft">&#160;</td><td class="mdescRight">Delete a previously created sub-process.  <br /></td></tr>
+<tr class="separator:gaa7d263e9429bac9ac8345c9d25de610e"><td class="memSeparator" colspan="2">&#160;</td></tr>
+<tr class="memitem:gadbc53414eb68b275588ec001ce1ddc7c" id="r_gadbc53414eb68b275588ec001ce1ddc7c"><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="#gadbc53414eb68b275588ec001ce1ddc7c">mi_subproc_add_current_thread</a> (<a class="el" href="#ga8c0bcd1fee27c7641e9c3c0d991b3b7d">mi_subproc_id_t</a> subproc)</td></tr>
+<tr class="memdesc:gadbc53414eb68b275588ec001ce1ddc7c"><td class="mdescLeft">&#160;</td><td class="mdescRight">Add the current thread to the given sub-process.  <br /></td></tr>
+<tr class="separator:gadbc53414eb68b275588ec001ce1ddc7c"><td class="memSeparator" colspan="2">&#160;</td></tr>
 </table>
 <a name="details" id="details"></a><h2 class="groupheader">Detailed Description</h2>
 <p>Extended functionality. </p>
 <h2 class="groupheader">Macro Definition Documentation</h2>
-<a id="ga1ea64283508718d9d645c38efc2f4305"></a>
-<h2 class="memtitle"><span class="permalink"><a href="#ga1ea64283508718d9d645c38efc2f4305">&#9670;&nbsp;</a></span>MI_SMALL_SIZE_MAX</h2>
+<a id="ga1ea64283508718d9d645c38efc2f4305" name="ga1ea64283508718d9d645c38efc2f4305"></a>
+<h2 class="memtitle"><span class="permalink"><a href="#ga1ea64283508718d9d645c38efc2f4305">&#9670;&#160;</a></span>MI_SMALL_SIZE_MAX</h2>
 
 <div class="memitem">
 <div class="memproto">
@@ -208,19 +256,36 @@ <h2 class="memtitle"><span class="permalink"><a href="#ga1ea64283508718d9d645c38
       </table>
 </div><div class="memdoc">
 
-<p>Maximum size allowed for small allocations in <a class="el" href="group__extended.html#ga7136c2e55cb22c98ecf95d08d6debb99" title="Allocate a small object.">mi_malloc_small</a> and <a class="el" href="group__extended.html#ga220f29f40a44404b0061c15bc1c31152" title="Allocate a zero initialized small object.">mi_zalloc_small</a> (usually <code>128*sizeof(void*)</code> (= 1KB on 64-bit systems)) </p>
+<p>Maximum size allowed for small allocations in <a class="el" href="#ga7f050bc6b897da82692174f5fce59cde" title="Allocate a small object.">mi_malloc_small</a> and <a class="el" href="#ga51c47637e81df0e2f13a2d7a2dec123e" title="Allocate a zero initialized small object.">mi_zalloc_small</a> (usually <code>128*sizeof(void*)</code> (= 1KB on 64-bit systems)) </p>
 
 </div>
 </div>
 <h2 class="groupheader">Typedef Documentation</h2>
-<a id="ga299dae78d25ce112e384a98b7309c5be"></a>
-<h2 class="memtitle"><span class="permalink"><a href="#ga299dae78d25ce112e384a98b7309c5be">&#9670;&nbsp;</a></span>mi_deferred_free_fun</h2>
+<a id="ga99fe38650d0b02e0e0f89ee024db91d3" name="ga99fe38650d0b02e0e0f89ee024db91d3"></a>
+<h2 class="memtitle"><span class="permalink"><a href="#ga99fe38650d0b02e0e0f89ee024db91d3">&#9670;&#160;</a></span>mi_arena_id_t</h2>
 
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname">typedef void() mi_deferred_free_fun(bool force, unsigned long long heartbeat, void *arg)</td>
+          <td class="memname">typedef int <a class="el" href="#ga99fe38650d0b02e0e0f89ee024db91d3">mi_arena_id_t</a></td>
+        </tr>
+      </table>
+</div><div class="memdoc">
+
+<p>Mimalloc uses large (virtual) memory areas, called "arena"s, from the OS to manage its memory. </p>
+<p>Each arena has an associated identifier. </p>
+
+</div>
+</div>
+<a id="ga292a45f7dbc7cd23c5352ce1f0002816" name="ga292a45f7dbc7cd23c5352ce1f0002816"></a>
+<h2 class="memtitle"><span class="permalink"><a href="#ga292a45f7dbc7cd23c5352ce1f0002816">&#9670;&#160;</a></span>mi_deferred_free_fun</h2>
+
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">typedef void mi_deferred_free_fun(bool force, unsigned long long heartbeat, void *arg)</td>
         </tr>
       </table>
 </div><div class="memdoc">
@@ -228,24 +293,24 @@ <h2 class="memtitle"><span class="permalink"><a href="#ga299dae78d25ce112e384a98
 <p>Type of deferred free functions. </p>
 <dl class="params"><dt>Parameters</dt><dd>
   <table class="params">
-    <tr><td class="paramname">force</td><td>If <em>true</em> all outstanding items should be freed. </td></tr>
+    <tr><td class="paramname">force</td><td>If <em class="arg">true</em> all outstanding items should be freed. </td></tr>
     <tr><td class="paramname">heartbeat</td><td>A monotonically increasing count. </td></tr>
     <tr><td class="paramname">arg</td><td>Argument that was passed at registration to hold extra state.</td></tr>
   </table>
   </dd>
 </dl>
-<dl class="section see"><dt>See also</dt><dd><a class="el" href="group__extended.html#ga3460a6ca91af97be4058f523d3cb8ece" title="Register a deferred free function.">mi_register_deferred_free</a> </dd></dl>
+<dl class="section see"><dt>See also</dt><dd><a class="el" href="#ga3460a6ca91af97be4058f523d3cb8ece" title="Register a deferred free function.">mi_register_deferred_free</a> </dd></dl>
 
 </div>
 </div>
-<a id="ga251d369cda3f1c2a955c555486ed90e5"></a>
-<h2 class="memtitle"><span class="permalink"><a href="#ga251d369cda3f1c2a955c555486ed90e5">&#9670;&nbsp;</a></span>mi_error_fun</h2>
+<a id="ga83fc6a688b322261e1c2deab000b0591" name="ga83fc6a688b322261e1c2deab000b0591"></a>
+<h2 class="memtitle"><span class="permalink"><a href="#ga83fc6a688b322261e1c2deab000b0591">&#9670;&#160;</a></span>mi_error_fun</h2>
 
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname">typedef void() mi_error_fun(int err, void *arg)</td>
+          <td class="memname">typedef void mi_error_fun(int err, void *arg)</td>
         </tr>
       </table>
 </div><div class="memdoc">
@@ -253,23 +318,23 @@ <h2 class="memtitle"><span class="permalink"><a href="#ga251d369cda3f1c2a955c555
 <p>Type of error callback functions. </p>
 <dl class="params"><dt>Parameters</dt><dd>
   <table class="params">
-    <tr><td class="paramname">err</td><td>Error code (see <a class="el" href="group__extended.html#gaa1d55e0e894be240827e5d87ec3a1f45" title="Register an error callback function.">mi_register_error()</a> for a complete list). </td></tr>
+    <tr><td class="paramname">err</td><td>Error code (see <a class="el" href="#gaa1d55e0e894be240827e5d87ec3a1f45" title="Register an error callback function.">mi_register_error()</a> for a complete list). </td></tr>
     <tr><td class="paramname">arg</td><td>Argument that was passed at registration to hold extra state.</td></tr>
   </table>
   </dd>
 </dl>
-<dl class="section see"><dt>See also</dt><dd><a class="el" href="group__extended.html#gaa1d55e0e894be240827e5d87ec3a1f45" title="Register an error callback function.">mi_register_error()</a> </dd></dl>
+<dl class="section see"><dt>See also</dt><dd><a class="el" href="#gaa1d55e0e894be240827e5d87ec3a1f45" title="Register an error callback function.">mi_register_error()</a> </dd></dl>
 
 </div>
 </div>
-<a id="gad823d23444a4b77a40f66bf075a98a0c"></a>
-<h2 class="memtitle"><span class="permalink"><a href="#gad823d23444a4b77a40f66bf075a98a0c">&#9670;&nbsp;</a></span>mi_output_fun</h2>
+<a id="gadf31cea7d0332a81c8b882cbbdbadb8d" name="gadf31cea7d0332a81c8b882cbbdbadb8d"></a>
+<h2 class="memtitle"><span class="permalink"><a href="#gadf31cea7d0332a81c8b882cbbdbadb8d">&#9670;&#160;</a></span>mi_output_fun</h2>
 
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname">typedef void() mi_output_fun(const char *msg, void *arg)</td>
+          <td class="memname">typedef void mi_output_fun(const char *msg, void *arg)</td>
         </tr>
       </table>
 </div><div class="memdoc">
@@ -282,13 +347,61 @@ <h2 class="memtitle"><span class="permalink"><a href="#gad823d23444a4b77a40f66bf
   </table>
   </dd>
 </dl>
-<dl class="section see"><dt>See also</dt><dd><a class="el" href="group__extended.html#gae5b17ff027cd2150b43a33040250cf3f" title="Register an output function.">mi_register_output()</a> </dd></dl>
+<dl class="section see"><dt>See also</dt><dd><a class="el" href="#gae5b17ff027cd2150b43a33040250cf3f" title="Register an output function.">mi_register_output()</a> </dd></dl>
+
+</div>
+</div>
+<a id="ga8c0bcd1fee27c7641e9c3c0d991b3b7d" name="ga8c0bcd1fee27c7641e9c3c0d991b3b7d"></a>
+<h2 class="memtitle"><span class="permalink"><a href="#ga8c0bcd1fee27c7641e9c3c0d991b3b7d">&#9670;&#160;</a></span>mi_subproc_id_t</h2>
+
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">typedef void* <a class="el" href="#ga8c0bcd1fee27c7641e9c3c0d991b3b7d">mi_subproc_id_t</a></td>
+        </tr>
+      </table>
+</div><div class="memdoc">
+
+<p>A process can associate threads with sub-processes. </p>
+<p>A sub-process will not reclaim memory from (abandoned heaps/threads) other subprocesses. </p>
 
 </div>
 </div>
 <h2 class="groupheader">Function Documentation</h2>
-<a id="ga421430e2226d7d468529cec457396756"></a>
-<h2 class="memtitle"><span class="permalink"><a href="#ga421430e2226d7d468529cec457396756">&#9670;&nbsp;</a></span>mi_collect()</h2>
+<a id="ga9a25a00a22151619a0be91a10af7787f" name="ga9a25a00a22151619a0be91a10af7787f"></a>
+<h2 class="memtitle"><span class="permalink"><a href="#ga9a25a00a22151619a0be91a10af7787f">&#9670;&#160;</a></span>mi_arena_area()</h2>
+
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">void * mi_arena_area </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="#ga99fe38650d0b02e0e0f89ee024db91d3">mi_arena_id_t</a></td>          <td class="paramname"><span class="paramname"><em>arena_id</em></span>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">size_t *</td>          <td class="paramname"><span class="paramname"><em>size</em></span>&#160;)</td>
+        </tr>
+      </table>
+</div><div class="memdoc">
+
+<p>Return the size of an arena. </p>
+<dl class="params"><dt>Parameters</dt><dd>
+  <table class="params">
+    <tr><td class="paramname">arena_id</td><td>The arena identifier. </td></tr>
+    <tr><td class="paramname">size</td><td>Returned size in bytes of the (virtual) arena area. </td></tr>
+  </table>
+  </dd>
+</dl>
+<dl class="section return"><dt>Returns</dt><dd>base address of the arena. </dd></dl>
+
+</div>
+</div>
+<a id="ga421430e2226d7d468529cec457396756" name="ga421430e2226d7d468529cec457396756"></a>
+<h2 class="memtitle"><span class="permalink"><a href="#ga421430e2226d7d468529cec457396756">&#9670;&#160;</a></span>mi_collect()</h2>
 
 <div class="memitem">
 <div class="memproto">
@@ -296,8 +409,7 @@ <h2 class="memtitle"><span class="permalink"><a href="#ga421430e2226d7d468529cec
         <tr>
           <td class="memname">void mi_collect </td>
           <td>(</td>
-          <td class="paramtype">bool&#160;</td>
-          <td class="paramname"><em>force</em></td><td>)</td>
+          <td class="paramtype">bool</td>          <td class="paramname"><span class="paramname"><em>force</em></span></td><td>)</td>
           <td></td>
         </tr>
       </table>
@@ -306,7 +418,7 @@ <h2 class="memtitle"><span class="permalink"><a href="#ga421430e2226d7d468529cec
 <p>Eagerly free memory. </p>
 <dl class="params"><dt>Parameters</dt><dd>
   <table class="params">
-    <tr><td class="paramname">force</td><td>If <em>true</em>, aggressively return memory to the OS (can be expensive!)</td></tr>
+    <tr><td class="paramname">force</td><td>If <em class="arg">true</em>, aggressively return memory to the OS (can be expensive!)</td></tr>
   </table>
   </dd>
 </dl>
@@ -314,8 +426,44 @@ <h2 class="memtitle"><span class="permalink"><a href="#ga421430e2226d7d468529cec
 
 </div>
 </div>
-<a id="gac057927cd06c854b45fe7847e921bd47"></a>
-<h2 class="memtitle"><span class="permalink"><a href="#gac057927cd06c854b45fe7847e921bd47">&#9670;&nbsp;</a></span>mi_good_size()</h2>
+<a id="gad7439207f8f71fb6c382a9ea20b997e7" name="gad7439207f8f71fb6c382a9ea20b997e7"></a>
+<h2 class="memtitle"><span class="permalink"><a href="#gad7439207f8f71fb6c382a9ea20b997e7">&#9670;&#160;</a></span>mi_debug_show_arenas()</h2>
+
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">void mi_debug_show_arenas </td>
+          <td>(</td>
+          <td class="paramtype">bool</td>          <td class="paramname"><span class="paramname"><em>show_inuse</em></span>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">bool</td>          <td class="paramname"><span class="paramname"><em>show_abandoned</em></span>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">bool</td>          <td class="paramname"><span class="paramname"><em>show_purge</em></span>&#160;)</td>
+        </tr>
+      </table>
+</div><div class="memdoc">
+
+<p>Show all current arena's. </p>
+<dl class="params"><dt>Parameters</dt><dd>
+  <table class="params">
+    <tr><td class="paramname">show_inuse</td><td>Show the arena blocks that are in use. </td></tr>
+    <tr><td class="paramname">show_abandoned</td><td>Show the abandoned arena blocks. </td></tr>
+    <tr><td class="paramname">show_purge</td><td>Show arena blocks scheduled for purging. </td></tr>
+  </table>
+  </dd>
+</dl>
+
+</div>
+</div>
+<a id="gac057927cd06c854b45fe7847e921bd47" name="gac057927cd06c854b45fe7847e921bd47"></a>
+<h2 class="memtitle"><span class="permalink"><a href="#gac057927cd06c854b45fe7847e921bd47">&#9670;&#160;</a></span>mi_good_size()</h2>
 
 <div class="memitem">
 <div class="memproto">
@@ -323,8 +471,7 @@ <h2 class="memtitle"><span class="permalink"><a href="#gac057927cd06c854b45fe784
         <tr>
           <td class="memname">size_t mi_good_size </td>
           <td>(</td>
-          <td class="paramtype">size_t&#160;</td>
-          <td class="paramname"><em>size</em></td><td>)</td>
+          <td class="paramtype">size_t</td>          <td class="paramname"><span class="paramname"><em>size</em></span></td><td>)</td>
           <td></td>
         </tr>
       </table>
@@ -339,12 +486,76 @@ <h2 class="memtitle"><span class="permalink"><a href="#gac057927cd06c854b45fe784
 </dl>
 <dl class="section return"><dt>Returns</dt><dd>the size <code>n</code> that will be allocated, where <code>n &gt;= size</code>.</dd></dl>
 <p>Generally, <code>mi_usable_size(mi_malloc(size)) == mi_good_size(size)</code>. This can be used to reduce internal wasted space when allocating buffers for example.</p>
-<dl class="section see"><dt>See also</dt><dd><a class="el" href="group__extended.html#ga089c859d9eddc5f9b4bd946cd53cebee" title="Return the available bytes in a memory block.">mi_usable_size()</a> </dd></dl>
+<dl class="section see"><dt>See also</dt><dd><a class="el" href="#ga089c859d9eddc5f9b4bd946cd53cebee" title="Return the available bytes in a memory block.">mi_usable_size()</a> </dd></dl>
 
 </div>
 </div>
-<a id="ga5f071b10d4df1c3658e04e7fd67a94e6"></a>
-<h2 class="memtitle"><span class="permalink"><a href="#ga5f071b10d4df1c3658e04e7fd67a94e6">&#9670;&nbsp;</a></span>mi_is_in_heap_region()</h2>
+<a id="ga3ae360583f4351aa5267ee7e43008faf" name="ga3ae360583f4351aa5267ee7e43008faf"></a>
+<h2 class="memtitle"><span class="permalink"><a href="#ga3ae360583f4351aa5267ee7e43008faf">&#9670;&#160;</a></span>mi_heap_new_ex()</h2>
+
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname"><a class="el" href="group__heap.html#ga34a47cde5a5b38c29f1aa3c5e76943c2">mi_heap_t</a> * mi_heap_new_ex </td>
+          <td>(</td>
+          <td class="paramtype">int</td>          <td class="paramname"><span class="paramname"><em>heap_tag</em></span>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">bool</td>          <td class="paramname"><span class="paramname"><em>allow_destroy</em></span>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype"><a class="el" href="#ga99fe38650d0b02e0e0f89ee024db91d3">mi_arena_id_t</a></td>          <td class="paramname"><span class="paramname"><em>arena_id</em></span>&#160;)</td>
+        </tr>
+      </table>
+</div><div class="memdoc">
+
+<p>Create a new heap. </p>
+<dl class="params"><dt>Parameters</dt><dd>
+  <table class="params">
+    <tr><td class="paramname">heap_tag</td><td>The heap tag associated with this heap; heaps only reclaim memory between heaps with the same tag. </td></tr>
+    <tr><td class="paramname">allow_destroy</td><td>Is <em class="arg">mi_heap_destroy</em> allowed? Not allowing this allows the heap to reclaim memory from terminated threads. </td></tr>
+    <tr><td class="paramname">arena_id</td><td>If not 0, the heap will only allocate from the specified arena. </td></tr>
+  </table>
+  </dd>
+</dl>
+<dl class="section return"><dt>Returns</dt><dd>A new heap or <code>NULL</code> on failure.</dd></dl>
+<p>The <em class="arg">arena_id</em> can be used by runtimes to allocate only in a specified pre-reserved arena. This is used for example for a compressed pointer heap in Koka. The <em class="arg">heap_tag</em> enables heaps to keep objects of a certain type isolated to heaps with that tag. This is used for example in the CPython integration. </p>
+
+</div>
+</div>
+<a id="gaaf2d9976576d5efd5544be12848af949" name="gaaf2d9976576d5efd5544be12848af949"></a>
+<h2 class="memtitle"><span class="permalink"><a href="#gaaf2d9976576d5efd5544be12848af949">&#9670;&#160;</a></span>mi_heap_new_in_arena()</h2>
+
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname"><a class="el" href="group__heap.html#ga34a47cde5a5b38c29f1aa3c5e76943c2">mi_heap_t</a> * mi_heap_new_in_arena </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="#ga99fe38650d0b02e0e0f89ee024db91d3">mi_arena_id_t</a></td>          <td class="paramname"><span class="paramname"><em>arena_id</em></span></td><td>)</td>
+          <td></td>
+        </tr>
+      </table>
+</div><div class="memdoc">
+
+<p>Create a new heap that only allocates in the specified arena. </p>
+<dl class="params"><dt>Parameters</dt><dd>
+  <table class="params">
+    <tr><td class="paramname">arena_id</td><td>The arena identifier. </td></tr>
+  </table>
+  </dd>
+</dl>
+<dl class="section return"><dt>Returns</dt><dd>The new heap or <code>NULL</code>. </dd></dl>
+
+</div>
+</div>
+<a id="ga5f071b10d4df1c3658e04e7fd67a94e6" name="ga5f071b10d4df1c3658e04e7fd67a94e6"></a>
+<h2 class="memtitle"><span class="permalink"><a href="#ga5f071b10d4df1c3658e04e7fd67a94e6">&#9670;&#160;</a></span>mi_is_in_heap_region()</h2>
 
 <div class="memitem">
 <div class="memproto">
@@ -352,8 +563,7 @@ <h2 class="memtitle"><span class="permalink"><a href="#ga5f071b10d4df1c3658e04e7
         <tr>
           <td class="memname">bool mi_is_in_heap_region </td>
           <td>(</td>
-          <td class="paramtype">const void *&#160;</td>
-          <td class="paramname"><em>p</em></td><td>)</td>
+          <td class="paramtype">const void *</td>          <td class="paramname"><span class="paramname"><em>p</em></span></td><td>)</td>
           <td></td>
         </tr>
       </table>
@@ -366,12 +576,12 @@ <h2 class="memtitle"><span class="permalink"><a href="#ga5f071b10d4df1c3658e04e7
   </table>
   </dd>
 </dl>
-<dl class="section return"><dt>Returns</dt><dd><em>true</em> if this is a pointer into our heap. This function is relatively fast. </dd></dl>
+<dl class="section return"><dt>Returns</dt><dd><em class="arg">true</em> if this is a pointer into our heap. This function is relatively fast. </dd></dl>
 
 </div>
 </div>
-<a id="gaad25050b19f30cd79397b227e0157a3f"></a>
-<h2 class="memtitle"><span class="permalink"><a href="#gaad25050b19f30cd79397b227e0157a3f">&#9670;&nbsp;</a></span>mi_is_redirected()</h2>
+<a id="gaad25050b19f30cd79397b227e0157a3f" name="gaad25050b19f30cd79397b227e0157a3f"></a>
+<h2 class="memtitle"><span class="permalink"><a href="#gaad25050b19f30cd79397b227e0157a3f">&#9670;&#160;</a></span>mi_is_redirected()</h2>
 
 <div class="memitem">
 <div class="memproto">
@@ -379,29 +589,28 @@ <h2 class="memtitle"><span class="permalink"><a href="#gaad25050b19f30cd79397b22
         <tr>
           <td class="memname">bool mi_is_redirected </td>
           <td>(</td>
-          <td class="paramname"></td><td>)</td>
+          <td class="paramname"><span class="paramname"><em></em></span></td><td>)</td>
           <td></td>
         </tr>
       </table>
 </div><div class="memdoc">
 
-<p>Is the C runtime <em>malloc</em> API redirected? </p>
-<dl class="section return"><dt>Returns</dt><dd><em>true</em> if all malloc API calls are redirected to mimalloc.</dd></dl>
-<p>Currenty only used on Windows. </p>
+<p>Is the C runtime <em class="arg">malloc</em> API redirected? </p>
+<dl class="section return"><dt>Returns</dt><dd><em class="arg">true</em> if all malloc API calls are redirected to mimalloc.</dd></dl>
+<p>Currently only used on Windows. </p>
 
 </div>
 </div>
-<a id="ga7136c2e55cb22c98ecf95d08d6debb99"></a>
-<h2 class="memtitle"><span class="permalink"><a href="#ga7136c2e55cb22c98ecf95d08d6debb99">&#9670;&nbsp;</a></span>mi_malloc_small()</h2>
+<a id="ga7f050bc6b897da82692174f5fce59cde" name="ga7f050bc6b897da82692174f5fce59cde"></a>
+<h2 class="memtitle"><span class="permalink"><a href="#ga7f050bc6b897da82692174f5fce59cde">&#9670;&#160;</a></span>mi_malloc_small()</h2>
 
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname">void* mi_malloc_small </td>
+          <td class="memname">void * mi_malloc_small </td>
           <td>(</td>
-          <td class="paramtype">size_t&#160;</td>
-          <td class="paramname"><em>size</em></td><td>)</td>
+          <td class="paramtype">size_t</td>          <td class="paramname"><span class="paramname"><em>size</em></span></td><td>)</td>
           <td></td>
         </tr>
       </table>
@@ -410,16 +619,16 @@ <h2 class="memtitle"><span class="permalink"><a href="#ga7136c2e55cb22c98ecf95d0
 <p>Allocate a small object. </p>
 <dl class="params"><dt>Parameters</dt><dd>
   <table class="params">
-    <tr><td class="paramname">size</td><td>The size in bytes, can be at most <a class="el" href="group__extended.html#ga1ea64283508718d9d645c38efc2f4305" title="Maximum size allowed for small allocations in mi_malloc_small and mi_zalloc_small (usually 128*sizeof...">MI_SMALL_SIZE_MAX</a>. </td></tr>
+    <tr><td class="paramname">size</td><td>The size in bytes, can be at most <a class="el" href="#ga1ea64283508718d9d645c38efc2f4305" title="Maximum size allowed for small allocations in mi_malloc_small and mi_zalloc_small (usually 128*sizeof...">MI_SMALL_SIZE_MAX</a>. </td></tr>
   </table>
   </dd>
 </dl>
-<dl class="section return"><dt>Returns</dt><dd>a pointer to newly allocated memory of at least <em>size</em> bytes, or <em>NULL</em> if out of memory. This function is meant for use in run-time systems for best performance and does not check if <em>size</em> was indeed small &ndash; use with care! </dd></dl>
+<dl class="section return"><dt>Returns</dt><dd>a pointer to newly allocated memory of at least <em class="arg">size</em> bytes, or <em class="arg">NULL</em> if out of memory. This function is meant for use in run-time systems for best performance and does not check if <em class="arg">size</em> was indeed small &ndash; use with care! </dd></dl>
 
 </div>
 </div>
-<a id="ga4c6486a1fdcd7a423b5f25fe4be8e0cf"></a>
-<h2 class="memtitle"><span class="permalink"><a href="#ga4c6486a1fdcd7a423b5f25fe4be8e0cf">&#9670;&nbsp;</a></span>mi_manage_os_memory()</h2>
+<a id="ga4c6486a1fdcd7a423b5f25fe4be8e0cf" name="ga4c6486a1fdcd7a423b5f25fe4be8e0cf"></a>
+<h2 class="memtitle"><span class="permalink"><a href="#ga4c6486a1fdcd7a423b5f25fe4be8e0cf">&#9670;&#160;</a></span>mi_manage_os_memory()</h2>
 
 <div class="memitem">
 <div class="memproto">
@@ -427,43 +636,32 @@ <h2 class="memtitle"><span class="permalink"><a href="#ga4c6486a1fdcd7a423b5f25f
         <tr>
           <td class="memname">bool mi_manage_os_memory </td>
           <td>(</td>
-          <td class="paramtype">void *&#160;</td>
-          <td class="paramname"><em>start</em>, </td>
+          <td class="paramtype">void *</td>          <td class="paramname"><span class="paramname"><em>start</em></span>, </td>
         </tr>
         <tr>
           <td class="paramkey"></td>
           <td></td>
-          <td class="paramtype">size_t&#160;</td>
-          <td class="paramname"><em>size</em>, </td>
+          <td class="paramtype">size_t</td>          <td class="paramname"><span class="paramname"><em>size</em></span>, </td>
         </tr>
         <tr>
           <td class="paramkey"></td>
           <td></td>
-          <td class="paramtype">bool&#160;</td>
-          <td class="paramname"><em>is_committed</em>, </td>
+          <td class="paramtype">bool</td>          <td class="paramname"><span class="paramname"><em>is_committed</em></span>, </td>
         </tr>
         <tr>
           <td class="paramkey"></td>
           <td></td>
-          <td class="paramtype">bool&#160;</td>
-          <td class="paramname"><em>is_large</em>, </td>
+          <td class="paramtype">bool</td>          <td class="paramname"><span class="paramname"><em>is_large</em></span>, </td>
         </tr>
         <tr>
           <td class="paramkey"></td>
           <td></td>
-          <td class="paramtype">bool&#160;</td>
-          <td class="paramname"><em>is_zero</em>, </td>
+          <td class="paramtype">bool</td>          <td class="paramname"><span class="paramname"><em>is_zero</em></span>, </td>
         </tr>
         <tr>
           <td class="paramkey"></td>
           <td></td>
-          <td class="paramtype">int&#160;</td>
-          <td class="paramname"><em>numa_node</em>&#160;</td>
-        </tr>
-        <tr>
-          <td></td>
-          <td>)</td>
-          <td></td><td></td>
+          <td class="paramtype">int</td>          <td class="paramname"><span class="paramname"><em>numa_node</em></span>&#160;)</td>
         </tr>
       </table>
 </div><div class="memdoc">
@@ -473,75 +671,129 @@ <h2 class="memtitle"><span class="permalink"><a href="#ga4c6486a1fdcd7a423b5f25f
   <table class="params">
     <tr><td class="paramname">start</td><td>Start of the memory area </td></tr>
     <tr><td class="paramname">size</td><td>The size of the memory area. </td></tr>
-    <tr><td class="paramname">commit</td><td>Is the area already committed? </td></tr>
-    <tr><td class="paramname">is_large</td><td>Does it consist of large OS pages? Set this to <em>true</em> as well for memory that should not be decommitted or protected (like rdma etc.) </td></tr>
+    <tr><td class="paramname">is_committed</td><td>Is the area already committed? </td></tr>
+    <tr><td class="paramname">is_large</td><td>Does it consist of large OS pages? Set this to <em class="arg">true</em> as well for memory that should not be decommitted or protected (like rdma etc.) </td></tr>
     <tr><td class="paramname">is_zero</td><td>Does the area consists of zero's? </td></tr>
     <tr><td class="paramname">numa_node</td><td>Possible associated numa node or <code>-1</code>. </td></tr>
   </table>
   </dd>
 </dl>
-<dl class="section return"><dt>Returns</dt><dd><em>true</em> if successful, and <em>false</em> on error. </dd></dl>
+<dl class="section return"><dt>Returns</dt><dd><em class="arg">true</em> if successful, and <em class="arg">false</em> on error. </dd></dl>
 
 </div>
 </div>
-<a id="ga7d862c2affd5790381da14eb102a364d"></a>
-<h2 class="memtitle"><span class="permalink"><a href="#ga7d862c2affd5790381da14eb102a364d">&#9670;&nbsp;</a></span>mi_process_info()</h2>
+<a id="ga41ce8525d77bbb60f618fa1029994f6e" name="ga41ce8525d77bbb60f618fa1029994f6e"></a>
+<h2 class="memtitle"><span class="permalink"><a href="#ga41ce8525d77bbb60f618fa1029994f6e">&#9670;&#160;</a></span>mi_manage_os_memory_ex()</h2>
 
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname">void mi_process_info </td>
+          <td class="memname">bool mi_manage_os_memory_ex </td>
           <td>(</td>
-          <td class="paramtype">size_t *&#160;</td>
-          <td class="paramname"><em>elapsed_msecs</em>, </td>
+          <td class="paramtype">void *</td>          <td class="paramname"><span class="paramname"><em>start</em></span>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">size_t</td>          <td class="paramname"><span class="paramname"><em>size</em></span>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">bool</td>          <td class="paramname"><span class="paramname"><em>is_committed</em></span>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">bool</td>          <td class="paramname"><span class="paramname"><em>is_large</em></span>, </td>
         </tr>
         <tr>
           <td class="paramkey"></td>
           <td></td>
-          <td class="paramtype">size_t *&#160;</td>
-          <td class="paramname"><em>user_msecs</em>, </td>
+          <td class="paramtype">bool</td>          <td class="paramname"><span class="paramname"><em>is_zero</em></span>, </td>
         </tr>
         <tr>
           <td class="paramkey"></td>
           <td></td>
-          <td class="paramtype">size_t *&#160;</td>
-          <td class="paramname"><em>system_msecs</em>, </td>
+          <td class="paramtype">int</td>          <td class="paramname"><span class="paramname"><em>numa_node</em></span>, </td>
         </tr>
         <tr>
           <td class="paramkey"></td>
           <td></td>
-          <td class="paramtype">size_t *&#160;</td>
-          <td class="paramname"><em>current_rss</em>, </td>
+          <td class="paramtype">bool</td>          <td class="paramname"><span class="paramname"><em>exclusive</em></span>, </td>
         </tr>
         <tr>
           <td class="paramkey"></td>
           <td></td>
-          <td class="paramtype">size_t *&#160;</td>
-          <td class="paramname"><em>peak_rss</em>, </td>
+          <td class="paramtype"><a class="el" href="#ga99fe38650d0b02e0e0f89ee024db91d3">mi_arena_id_t</a> *</td>          <td class="paramname"><span class="paramname"><em>arena_id</em></span>&#160;)</td>
+        </tr>
+      </table>
+</div><div class="memdoc">
+
+<p>Manage externally allocated memory as a mimalloc arena. </p>
+<p>This memory will not be freed by mimalloc. </p><dl class="params"><dt>Parameters</dt><dd>
+  <table class="params">
+    <tr><td class="paramname">start</td><td>Start address of the area. </td></tr>
+    <tr><td class="paramname">size</td><td>Size in bytes of the area. </td></tr>
+    <tr><td class="paramname">is_committed</td><td>Is the memory already committed? </td></tr>
+    <tr><td class="paramname">is_large</td><td>Does it consist of (pinned) large OS pages? </td></tr>
+    <tr><td class="paramname">is_zero</td><td>Is the memory zero-initialized? </td></tr>
+    <tr><td class="paramname">numa_node</td><td>Associated NUMA node, or -1 to have no NUMA preference. </td></tr>
+    <tr><td class="paramname">exclusive</td><td>Is the arena exclusive (where only heaps associated with the arena can allocate in it) </td></tr>
+    <tr><td class="paramname">arena_id</td><td>The new arena identifier. </td></tr>
+  </table>
+  </dd>
+</dl>
+<dl class="section return"><dt>Returns</dt><dd><code>true</code> if successful. </dd></dl>
+
+</div>
+</div>
+<a id="ga7d862c2affd5790381da14eb102a364d" name="ga7d862c2affd5790381da14eb102a364d"></a>
+<h2 class="memtitle"><span class="permalink"><a href="#ga7d862c2affd5790381da14eb102a364d">&#9670;&#160;</a></span>mi_process_info()</h2>
+
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">void mi_process_info </td>
+          <td>(</td>
+          <td class="paramtype">size_t *</td>          <td class="paramname"><span class="paramname"><em>elapsed_msecs</em></span>, </td>
         </tr>
         <tr>
           <td class="paramkey"></td>
           <td></td>
-          <td class="paramtype">size_t *&#160;</td>
-          <td class="paramname"><em>current_commit</em>, </td>
+          <td class="paramtype">size_t *</td>          <td class="paramname"><span class="paramname"><em>user_msecs</em></span>, </td>
         </tr>
         <tr>
           <td class="paramkey"></td>
           <td></td>
-          <td class="paramtype">size_t *&#160;</td>
-          <td class="paramname"><em>peak_commit</em>, </td>
+          <td class="paramtype">size_t *</td>          <td class="paramname"><span class="paramname"><em>system_msecs</em></span>, </td>
         </tr>
         <tr>
           <td class="paramkey"></td>
           <td></td>
-          <td class="paramtype">size_t *&#160;</td>
-          <td class="paramname"><em>page_faults</em>&#160;</td>
+          <td class="paramtype">size_t *</td>          <td class="paramname"><span class="paramname"><em>current_rss</em></span>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td>)</td>
-          <td></td><td></td>
+          <td class="paramtype">size_t *</td>          <td class="paramname"><span class="paramname"><em>peak_rss</em></span>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">size_t *</td>          <td class="paramname"><span class="paramname"><em>current_commit</em></span>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">size_t *</td>          <td class="paramname"><span class="paramname"><em>peak_commit</em></span>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">size_t *</td>          <td class="paramname"><span class="paramname"><em>page_faults</em></span>&#160;)</td>
         </tr>
       </table>
 </div><div class="memdoc">
@@ -560,12 +812,12 @@ <h2 class="memtitle"><span class="permalink"><a href="#ga7d862c2affd5790381da14e
   </table>
   </dd>
 </dl>
-<p>The <em>current_rss</em> is precise on Windows and MacOSX; other systems estimate this using <em>current_commit</em>. The <em>commit</em> is precise on Windows but estimated on other systems as the amount of read/write accessible memory reserved by mimalloc. </p>
+<p>The <em class="arg">current_rss</em> is precise on Windows and MacOSX; other systems estimate this using <em class="arg">current_commit</em>. The <em class="arg">commit</em> is precise on Windows but estimated on other systems as the amount of read/write accessible memory reserved by mimalloc. </p>
 
 </div>
 </div>
-<a id="ga3460a6ca91af97be4058f523d3cb8ece"></a>
-<h2 class="memtitle"><span class="permalink"><a href="#ga3460a6ca91af97be4058f523d3cb8ece">&#9670;&nbsp;</a></span>mi_register_deferred_free()</h2>
+<a id="ga3460a6ca91af97be4058f523d3cb8ece" name="ga3460a6ca91af97be4058f523d3cb8ece"></a>
+<h2 class="memtitle"><span class="permalink"><a href="#ga3460a6ca91af97be4058f523d3cb8ece">&#9670;&#160;</a></span>mi_register_deferred_free()</h2>
 
 <div class="memitem">
 <div class="memproto">
@@ -573,19 +825,12 @@ <h2 class="memtitle"><span class="permalink"><a href="#ga3460a6ca91af97be4058f52
         <tr>
           <td class="memname">void mi_register_deferred_free </td>
           <td>(</td>
-          <td class="paramtype"><a class="el" href="group__extended.html#ga299dae78d25ce112e384a98b7309c5be">mi_deferred_free_fun</a> *&#160;</td>
-          <td class="paramname"><em>deferred_free</em>, </td>
+          <td class="paramtype"><a class="el" href="#ga292a45f7dbc7cd23c5352ce1f0002816">mi_deferred_free_fun</a> *</td>          <td class="paramname"><span class="paramname"><em>deferred_free</em></span>, </td>
         </tr>
         <tr>
           <td class="paramkey"></td>
           <td></td>
-          <td class="paramtype">void *&#160;</td>
-          <td class="paramname"><em>arg</em>&#160;</td>
-        </tr>
-        <tr>
-          <td></td>
-          <td>)</td>
-          <td></td><td></td>
+          <td class="paramtype">void *</td>          <td class="paramname"><span class="paramname"><em>arg</em></span>&#160;)</td>
         </tr>
       </table>
 </div><div class="memdoc">
@@ -593,17 +838,17 @@ <h2 class="memtitle"><span class="permalink"><a href="#ga3460a6ca91af97be4058f52
 <p>Register a deferred free function. </p>
 <dl class="params"><dt>Parameters</dt><dd>
   <table class="params">
-    <tr><td class="paramname">deferred_free</td><td>Address of a deferred free-ing function or <em>NULL</em> to unregister. </td></tr>
+    <tr><td class="paramname">deferred_free</td><td>Address of a deferred free-ing function or <em class="arg">NULL</em> to unregister. </td></tr>
     <tr><td class="paramname">arg</td><td>Argument that will be passed on to the deferred free function.</td></tr>
   </table>
   </dd>
 </dl>
-<p>Some runtime systems use deferred free-ing, for example when using reference counting to limit the worst case free time. Such systems can register (re-entrant) deferred free function to free more memory on demand. When the <em>force</em> parameter is <em>true</em> all possible memory should be freed. The per-thread <em>heartbeat</em> parameter is monotonically increasing and guaranteed to be deterministic if the program allocates deterministically. The <em>deferred_free</em> function is guaranteed to be called deterministically after some number of allocations (regardless of freeing or available free memory). At most one <em>deferred_free</em> function can be active. </p>
+<p>Some runtime systems use deferred free-ing, for example when using reference counting to limit the worst case free time. Such systems can register (re-entrant) deferred free function to free more memory on demand. When the <em class="arg">force</em> parameter is <em class="arg">true</em> all possible memory should be freed. The per-thread <em class="arg">heartbeat</em> parameter is monotonically increasing and guaranteed to be deterministic if the program allocates deterministically. The <em class="arg">deferred_free</em> function is guaranteed to be called deterministically after some number of allocations (regardless of freeing or available free memory). At most one <em class="arg">deferred_free</em> function can be active. </p>
 
 </div>
 </div>
-<a id="gaa1d55e0e894be240827e5d87ec3a1f45"></a>
-<h2 class="memtitle"><span class="permalink"><a href="#gaa1d55e0e894be240827e5d87ec3a1f45">&#9670;&nbsp;</a></span>mi_register_error()</h2>
+<a id="gaa1d55e0e894be240827e5d87ec3a1f45" name="gaa1d55e0e894be240827e5d87ec3a1f45"></a>
+<h2 class="memtitle"><span class="permalink"><a href="#gaa1d55e0e894be240827e5d87ec3a1f45">&#9670;&#160;</a></span>mi_register_error()</h2>
 
 <div class="memitem">
 <div class="memproto">
@@ -611,19 +856,12 @@ <h2 class="memtitle"><span class="permalink"><a href="#gaa1d55e0e894be240827e5d8
         <tr>
           <td class="memname">void mi_register_error </td>
           <td>(</td>
-          <td class="paramtype"><a class="el" href="group__extended.html#ga251d369cda3f1c2a955c555486ed90e5">mi_error_fun</a> *&#160;</td>
-          <td class="paramname"><em>errfun</em>, </td>
+          <td class="paramtype"><a class="el" href="#ga83fc6a688b322261e1c2deab000b0591">mi_error_fun</a> *</td>          <td class="paramname"><span class="paramname"><em>errfun</em></span>, </td>
         </tr>
         <tr>
           <td class="paramkey"></td>
           <td></td>
-          <td class="paramtype">void *&#160;</td>
-          <td class="paramname"><em>arg</em>&#160;</td>
-        </tr>
-        <tr>
-          <td></td>
-          <td>)</td>
-          <td></td><td></td>
+          <td class="paramtype">void *</td>          <td class="paramname"><span class="paramname"><em>arg</em></span>&#160;)</td>
         </tr>
       </table>
 </div><div class="memdoc">
@@ -631,23 +869,23 @@ <h2 class="memtitle"><span class="permalink"><a href="#gaa1d55e0e894be240827e5d8
 <p>Register an error callback function. </p>
 <dl class="params"><dt>Parameters</dt><dd>
   <table class="params">
-    <tr><td class="paramname">errfun</td><td>The error function that is called on an error (use <em>NULL</em> for default) </td></tr>
+    <tr><td class="paramname">errfun</td><td>The error function that is called on an error (use <em class="arg">NULL</em> for default) </td></tr>
     <tr><td class="paramname">arg</td><td>Extra argument that will be passed on to the error function.</td></tr>
   </table>
   </dd>
 </dl>
-<p>The <em>errfun</em> function is called on an error in mimalloc after emitting an error message (through the output function). It as always legal to just return from the <em>errfun</em> function in which case allocation functions generally return <em>NULL</em> or ignore the condition. The default function only calls abort() when compiled in secure mode with an <em>EFAULT</em> error. The possible error codes are:</p><ul>
-<li><em>EAGAIN:</em> Double free was detected (only in debug and secure mode).</li>
-<li><em>EFAULT:</em> Corrupted free list or meta-data was detected (only in debug and secure mode).</li>
-<li><em>ENOMEM:</em> Not enough memory available to satisfy the request.</li>
-<li><em>EOVERFLOW:</em> Too large a request, for example in <a class="el" href="group__malloc.html#ga97fedb4f7107c592fd7f0f0a8949a57d" title="Allocate zero-initialized count elements of size bytes.">mi_calloc()</a>, the <em>count</em> and <em>size</em> parameters are too large.</li>
-<li><em>EINVAL:</em> Trying to free or re-allocate an invalid pointer. </li>
+<p>The <em class="arg">errfun</em> function is called on an error in mimalloc after emitting an error message (through the output function). It as always legal to just return from the <em class="arg">errfun</em> function in which case allocation functions generally return <em class="arg">NULL</em> or ignore the condition. The default function only calls abort() when compiled in secure mode with an <em class="arg">EFAULT</em> error. The possible error codes are:</p><ul>
+<li><em class="arg">EAGAIN:</em> Double free was detected (only in debug and secure mode).</li>
+<li><em class="arg">EFAULT:</em> Corrupted free list or meta-data was detected (only in debug and secure mode).</li>
+<li><em class="arg">ENOMEM:</em> Not enough memory available to satisfy the request.</li>
+<li><em class="arg">EOVERFLOW:</em> Too large a request, for example in <a class="el" href="group__malloc.html#ga6686568014b54d1e6c7ac64a076e4f56" title="Allocate zero-initialized count elements of size bytes.">mi_calloc()</a>, the <em class="arg">count</em> and <em class="arg">size</em> parameters are too large.</li>
+<li><em class="arg">EINVAL:</em> Trying to free or re-allocate an invalid pointer. </li>
 </ul>
 
 </div>
 </div>
-<a id="gae5b17ff027cd2150b43a33040250cf3f"></a>
-<h2 class="memtitle"><span class="permalink"><a href="#gae5b17ff027cd2150b43a33040250cf3f">&#9670;&nbsp;</a></span>mi_register_output()</h2>
+<a id="gae5b17ff027cd2150b43a33040250cf3f" name="gae5b17ff027cd2150b43a33040250cf3f"></a>
+<h2 class="memtitle"><span class="permalink"><a href="#gae5b17ff027cd2150b43a33040250cf3f">&#9670;&#160;</a></span>mi_register_output()</h2>
 
 <div class="memitem">
 <div class="memproto">
@@ -655,19 +893,12 @@ <h2 class="memtitle"><span class="permalink"><a href="#gae5b17ff027cd2150b43a330
         <tr>
           <td class="memname">void mi_register_output </td>
           <td>(</td>
-          <td class="paramtype"><a class="el" href="group__extended.html#gad823d23444a4b77a40f66bf075a98a0c">mi_output_fun</a> *&#160;</td>
-          <td class="paramname"><em>out</em>, </td>
+          <td class="paramtype"><a class="el" href="#gadf31cea7d0332a81c8b882cbbdbadb8d">mi_output_fun</a> *</td>          <td class="paramname"><span class="paramname"><em>out</em></span>, </td>
         </tr>
         <tr>
           <td class="paramkey"></td>
           <td></td>
-          <td class="paramtype">void *&#160;</td>
-          <td class="paramname"><em>arg</em>&#160;</td>
-        </tr>
-        <tr>
-          <td></td>
-          <td>)</td>
-          <td></td><td></td>
+          <td class="paramtype">void *</td>          <td class="paramname"><span class="paramname"><em>arg</em></span>&#160;)</td>
         </tr>
       </table>
 </div><div class="memdoc">
@@ -684,8 +915,8 @@ <h2 class="memtitle"><span class="permalink"><a href="#gae5b17ff027cd2150b43a330
 
 </div>
 </div>
-<a id="ga7795a13d20087447281858d2c771cca1"></a>
-<h2 class="memtitle"><span class="permalink"><a href="#ga7795a13d20087447281858d2c771cca1">&#9670;&nbsp;</a></span>mi_reserve_huge_os_pages_at()</h2>
+<a id="ga7795a13d20087447281858d2c771cca1" name="ga7795a13d20087447281858d2c771cca1"></a>
+<h2 class="memtitle"><span class="permalink"><a href="#ga7795a13d20087447281858d2c771cca1">&#9670;&#160;</a></span>mi_reserve_huge_os_pages_at()</h2>
 
 <div class="memitem">
 <div class="memproto">
@@ -693,76 +924,109 @@ <h2 class="memtitle"><span class="permalink"><a href="#ga7795a13d20087447281858d
         <tr>
           <td class="memname">int mi_reserve_huge_os_pages_at </td>
           <td>(</td>
-          <td class="paramtype">size_t&#160;</td>
-          <td class="paramname"><em>pages</em>, </td>
+          <td class="paramtype">size_t</td>          <td class="paramname"><span class="paramname"><em>pages</em></span>, </td>
         </tr>
         <tr>
           <td class="paramkey"></td>
           <td></td>
-          <td class="paramtype">int&#160;</td>
-          <td class="paramname"><em>numa_node</em>, </td>
+          <td class="paramtype">int</td>          <td class="paramname"><span class="paramname"><em>numa_node</em></span>, </td>
         </tr>
         <tr>
           <td class="paramkey"></td>
           <td></td>
-          <td class="paramtype">size_t&#160;</td>
-          <td class="paramname"><em>timeout_msecs</em>&#160;</td>
-        </tr>
-        <tr>
-          <td></td>
-          <td>)</td>
-          <td></td><td></td>
+          <td class="paramtype">size_t</td>          <td class="paramname"><span class="paramname"><em>timeout_msecs</em></span>&#160;)</td>
         </tr>
       </table>
 </div><div class="memdoc">
 
-<p>Reserve <em>pages</em> of huge OS pages (1GiB) at a specific <em>numa_node</em>, but stops after at most <code>timeout_msecs</code> seconds. </p>
+<p>Reserve <em class="arg">pages</em> of huge OS pages (1GiB) at a specific <em class="arg">numa_node</em>, but stops after at most <code>timeout_msecs</code> seconds. </p>
 <dl class="params"><dt>Parameters</dt><dd>
   <table class="params">
     <tr><td class="paramname">pages</td><td>The number of 1GiB pages to reserve. </td></tr>
-    <tr><td class="paramname">numa_node</td><td>The NUMA node where the memory is reserved (start at 0). </td></tr>
+    <tr><td class="paramname">numa_node</td><td>The NUMA node where the memory is reserved (start at 0). Use -1 for no affinity. </td></tr>
     <tr><td class="paramname">timeout_msecs</td><td>Maximum number of milli-seconds to try reserving, or 0 for no timeout. </td></tr>
   </table>
   </dd>
 </dl>
-<dl class="section return"><dt>Returns</dt><dd>0 if successfull, <em>ENOMEM</em> if running out of memory, or <em>ETIMEDOUT</em> if timed out.</dd></dl>
-<p>The reserved memory is used by mimalloc to satisfy allocations. May quit before <em>timeout_msecs</em> are expired if it estimates it will take more than 1.5 times <em>timeout_msecs</em>. The time limit is needed because on some operating systems it can take a long time to reserve contiguous memory if the physical memory is fragmented. </p>
+<dl class="section return"><dt>Returns</dt><dd>0 if successful, <em class="arg">ENOMEM</em> if running out of memory, or <em class="arg">ETIMEDOUT</em> if timed out.</dd></dl>
+<p>The reserved memory is used by mimalloc to satisfy allocations. May quit before <em class="arg">timeout_msecs</em> are expired if it estimates it will take more than 1.5 times <em class="arg">timeout_msecs</em>. The time limit is needed because on some operating systems it can take a long time to reserve contiguous memory if the physical memory is fragmented. </p>
 
 </div>
 </div>
-<a id="ga3132f521fb756fc0e8ec0b74fb58df50"></a>
-<h2 class="memtitle"><span class="permalink"><a href="#ga3132f521fb756fc0e8ec0b74fb58df50">&#9670;&nbsp;</a></span>mi_reserve_huge_os_pages_interleave()</h2>
+<a id="ga591aab1c2bc2ca920e33f0f9f9cb5c52" name="ga591aab1c2bc2ca920e33f0f9f9cb5c52"></a>
+<h2 class="memtitle"><span class="permalink"><a href="#ga591aab1c2bc2ca920e33f0f9f9cb5c52">&#9670;&#160;</a></span>mi_reserve_huge_os_pages_at_ex()</h2>
 
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname">int mi_reserve_huge_os_pages_interleave </td>
+          <td class="memname">int mi_reserve_huge_os_pages_at_ex </td>
           <td>(</td>
-          <td class="paramtype">size_t&#160;</td>
-          <td class="paramname"><em>pages</em>, </td>
+          <td class="paramtype">size_t</td>          <td class="paramname"><span class="paramname"><em>pages</em></span>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">int</td>          <td class="paramname"><span class="paramname"><em>numa_node</em></span>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">size_t</td>          <td class="paramname"><span class="paramname"><em>timeout_msecs</em></span>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">bool</td>          <td class="paramname"><span class="paramname"><em>exclusive</em></span>, </td>
         </tr>
         <tr>
           <td class="paramkey"></td>
           <td></td>
-          <td class="paramtype">size_t&#160;</td>
-          <td class="paramname"><em>numa_nodes</em>, </td>
+          <td class="paramtype"><a class="el" href="#ga99fe38650d0b02e0e0f89ee024db91d3">mi_arena_id_t</a> *</td>          <td class="paramname"><span class="paramname"><em>arena_id</em></span>&#160;)</td>
+        </tr>
+      </table>
+</div><div class="memdoc">
+
+<p>Reserve huge OS pages (1GiB) into a single arena. </p>
+<dl class="params"><dt>Parameters</dt><dd>
+  <table class="params">
+    <tr><td class="paramname">pages</td><td>Number of 1GiB pages to reserve. </td></tr>
+    <tr><td class="paramname">numa_node</td><td>The associated NUMA node, or -1 for no NUMA preference. </td></tr>
+    <tr><td class="paramname">timeout_msecs</td><td>Max amount of milli-seconds this operation is allowed to take. (0 is infinite) </td></tr>
+    <tr><td class="paramname">exclusive</td><td>If exclusive, only a heap associated with this arena can allocate in it. </td></tr>
+    <tr><td class="paramname">arena_id</td><td>The arena identifier. </td></tr>
+  </table>
+  </dd>
+</dl>
+<dl class="section return"><dt>Returns</dt><dd>0 if successful, <em class="arg">ENOMEM</em> if running out of memory, or <em class="arg">ETIMEDOUT</em> if timed out. </dd></dl>
+
+</div>
+</div>
+<a id="ga3132f521fb756fc0e8ec0b74fb58df50" name="ga3132f521fb756fc0e8ec0b74fb58df50"></a>
+<h2 class="memtitle"><span class="permalink"><a href="#ga3132f521fb756fc0e8ec0b74fb58df50">&#9670;&#160;</a></span>mi_reserve_huge_os_pages_interleave()</h2>
+
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">int mi_reserve_huge_os_pages_interleave </td>
+          <td>(</td>
+          <td class="paramtype">size_t</td>          <td class="paramname"><span class="paramname"><em>pages</em></span>, </td>
         </tr>
         <tr>
           <td class="paramkey"></td>
           <td></td>
-          <td class="paramtype">size_t&#160;</td>
-          <td class="paramname"><em>timeout_msecs</em>&#160;</td>
+          <td class="paramtype">size_t</td>          <td class="paramname"><span class="paramname"><em>numa_nodes</em></span>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td>)</td>
-          <td></td><td></td>
+          <td class="paramtype">size_t</td>          <td class="paramname"><span class="paramname"><em>timeout_msecs</em></span>&#160;)</td>
         </tr>
       </table>
 </div><div class="memdoc">
 
-<p>Reserve <em>pages</em> of huge OS pages (1GiB) evenly divided over <em>numa_nodes</em> nodes, but stops after at most <code>timeout_msecs</code> seconds. </p>
+<p>Reserve <em class="arg">pages</em> of huge OS pages (1GiB) evenly divided over <em class="arg">numa_nodes</em> nodes, but stops after at most <code>timeout_msecs</code> seconds. </p>
 <dl class="params"><dt>Parameters</dt><dd>
   <table class="params">
     <tr><td class="paramname">pages</td><td>The number of 1GiB pages to reserve. </td></tr>
@@ -771,13 +1035,13 @@ <h2 class="memtitle"><span class="permalink"><a href="#ga3132f521fb756fc0e8ec0b7
   </table>
   </dd>
 </dl>
-<dl class="section return"><dt>Returns</dt><dd>0 if successfull, <em>ENOMEM</em> if running out of memory, or <em>ETIMEDOUT</em> if timed out.</dd></dl>
-<p>The reserved memory is used by mimalloc to satisfy allocations. May quit before <em>timeout_msecs</em> are expired if it estimates it will take more than 1.5 times <em>timeout_msecs</em>. The time limit is needed because on some operating systems it can take a long time to reserve contiguous memory if the physical memory is fragmented. </p>
+<dl class="section return"><dt>Returns</dt><dd>0 if successful, <em class="arg">ENOMEM</em> if running out of memory, or <em class="arg">ETIMEDOUT</em> if timed out.</dd></dl>
+<p>The reserved memory is used by mimalloc to satisfy allocations. May quit before <em class="arg">timeout_msecs</em> are expired if it estimates it will take more than 1.5 times <em class="arg">timeout_msecs</em>. The time limit is needed because on some operating systems it can take a long time to reserve contiguous memory if the physical memory is fragmented. </p>
 
 </div>
 </div>
-<a id="ga00ec3324b6b2591c7fe3677baa30a767"></a>
-<h2 class="memtitle"><span class="permalink"><a href="#ga00ec3324b6b2591c7fe3677baa30a767">&#9670;&nbsp;</a></span>mi_reserve_os_memory()</h2>
+<a id="ga00ec3324b6b2591c7fe3677baa30a767" name="ga00ec3324b6b2591c7fe3677baa30a767"></a>
+<h2 class="memtitle"><span class="permalink"><a href="#ga00ec3324b6b2591c7fe3677baa30a767">&#9670;&#160;</a></span>mi_reserve_os_memory()</h2>
 
 <div class="memitem">
 <div class="memproto">
@@ -785,25 +1049,17 @@ <h2 class="memtitle"><span class="permalink"><a href="#ga00ec3324b6b2591c7fe3677
         <tr>
           <td class="memname">int mi_reserve_os_memory </td>
           <td>(</td>
-          <td class="paramtype">size_t&#160;</td>
-          <td class="paramname"><em>size</em>, </td>
+          <td class="paramtype">size_t</td>          <td class="paramname"><span class="paramname"><em>size</em></span>, </td>
         </tr>
         <tr>
           <td class="paramkey"></td>
           <td></td>
-          <td class="paramtype">bool&#160;</td>
-          <td class="paramname"><em>commit</em>, </td>
+          <td class="paramtype">bool</td>          <td class="paramname"><span class="paramname"><em>commit</em></span>, </td>
         </tr>
         <tr>
           <td class="paramkey"></td>
           <td></td>
-          <td class="paramtype">bool&#160;</td>
-          <td class="paramname"><em>allow_large</em>&#160;</td>
-        </tr>
-        <tr>
-          <td></td>
-          <td>)</td>
-          <td></td><td></td>
+          <td class="paramtype">bool</td>          <td class="paramname"><span class="paramname"><em>allow_large</em></span>&#160;)</td>
         </tr>
       </table>
 </div><div class="memdoc">
@@ -817,12 +1073,61 @@ <h2 class="memtitle"><span class="permalink"><a href="#ga00ec3324b6b2591c7fe3677
   </table>
   </dd>
 </dl>
-<dl class="section return"><dt>Returns</dt><dd><em>0</em> if successful, and an error code otherwise (e.g. <code>ENOMEM</code>). </dd></dl>
+<dl class="section return"><dt>Returns</dt><dd><em class="arg">0</em> if successful, and an error code otherwise (e.g. <code>ENOMEM</code>). </dd></dl>
+
+</div>
+</div>
+<a id="ga32f519797fd9a81acb4f52d36e6d751b" name="ga32f519797fd9a81acb4f52d36e6d751b"></a>
+<h2 class="memtitle"><span class="permalink"><a href="#ga32f519797fd9a81acb4f52d36e6d751b">&#9670;&#160;</a></span>mi_reserve_os_memory_ex()</h2>
+
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">int mi_reserve_os_memory_ex </td>
+          <td>(</td>
+          <td class="paramtype">size_t</td>          <td class="paramname"><span class="paramname"><em>size</em></span>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">bool</td>          <td class="paramname"><span class="paramname"><em>commit</em></span>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">bool</td>          <td class="paramname"><span class="paramname"><em>allow_large</em></span>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">bool</td>          <td class="paramname"><span class="paramname"><em>exclusive</em></span>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype"><a class="el" href="#ga99fe38650d0b02e0e0f89ee024db91d3">mi_arena_id_t</a> *</td>          <td class="paramname"><span class="paramname"><em>arena_id</em></span>&#160;)</td>
+        </tr>
+      </table>
+</div><div class="memdoc">
+
+<p>Reserve OS memory to be managed in an arena. </p>
+<dl class="params"><dt>Parameters</dt><dd>
+  <table class="params">
+    <tr><td class="paramname">size</td><td>Size the reserve. </td></tr>
+    <tr><td class="paramname">commit</td><td>Should the memory be initially committed? </td></tr>
+    <tr><td class="paramname">allow_large</td><td>Allow the use of large OS pages? </td></tr>
+    <tr><td class="paramname">exclusive</td><td>Is the returned arena exclusive? </td></tr>
+    <tr><td class="paramname">arena_id</td><td>The new arena identifier. </td></tr>
+  </table>
+  </dd>
+</dl>
+<dl class="section return"><dt>Returns</dt><dd>Zero on success, an error code otherwise. </dd></dl>
 
 </div>
 </div>
-<a id="ga854b1de8cb067c7316286c28b2fcd3d1"></a>
-<h2 class="memtitle"><span class="permalink"><a href="#ga854b1de8cb067c7316286c28b2fcd3d1">&#9670;&nbsp;</a></span>mi_stats_merge()</h2>
+<a id="ga854b1de8cb067c7316286c28b2fcd3d1" name="ga854b1de8cb067c7316286c28b2fcd3d1"></a>
+<h2 class="memtitle"><span class="permalink"><a href="#ga854b1de8cb067c7316286c28b2fcd3d1">&#9670;&#160;</a></span>mi_stats_merge()</h2>
 
 <div class="memitem">
 <div class="memproto">
@@ -830,8 +1135,7 @@ <h2 class="memtitle"><span class="permalink"><a href="#ga854b1de8cb067c7316286c2
         <tr>
           <td class="memname">void mi_stats_merge </td>
           <td>(</td>
-          <td class="paramtype">void&#160;</td>
-          <td class="paramname"></td><td>)</td>
+          <td class="paramtype">void</td>          <td class="paramname"><span class="paramname"><em></em></span></td><td>)</td>
           <td></td>
         </tr>
       </table>
@@ -841,8 +1145,8 @@ <h2 class="memtitle"><span class="permalink"><a href="#ga854b1de8cb067c7316286c2
 
 </div>
 </div>
-<a id="ga2d126e5c62d3badc35445e5d84166df2"></a>
-<h2 class="memtitle"><span class="permalink"><a href="#ga2d126e5c62d3badc35445e5d84166df2">&#9670;&nbsp;</a></span>mi_stats_print()</h2>
+<a id="ga2d126e5c62d3badc35445e5d84166df2" name="ga2d126e5c62d3badc35445e5d84166df2"></a>
+<h2 class="memtitle"><span class="permalink"><a href="#ga2d126e5c62d3badc35445e5d84166df2">&#9670;&#160;</a></span>mi_stats_print()</h2>
 
 <div class="memitem">
 <div class="memproto">
@@ -850,8 +1154,7 @@ <h2 class="memtitle"><span class="permalink"><a href="#ga2d126e5c62d3badc35445e5
         <tr>
           <td class="memname">void mi_stats_print </td>
           <td>(</td>
-          <td class="paramtype">void *&#160;</td>
-          <td class="paramname"><em>out</em></td><td>)</td>
+          <td class="paramtype">void *</td>          <td class="paramname"><span class="paramname"><em>out</em></span></td><td>)</td>
           <td></td>
         </tr>
       </table>
@@ -868,8 +1171,8 @@ <h2 class="memtitle"><span class="permalink"><a href="#ga2d126e5c62d3badc35445e5
 
 </div>
 </div>
-<a id="ga537f13b299ddf801e49a5a94fde02c79"></a>
-<h2 class="memtitle"><span class="permalink"><a href="#ga537f13b299ddf801e49a5a94fde02c79">&#9670;&nbsp;</a></span>mi_stats_print_out()</h2>
+<a id="ga537f13b299ddf801e49a5a94fde02c79" name="ga537f13b299ddf801e49a5a94fde02c79"></a>
+<h2 class="memtitle"><span class="permalink"><a href="#ga537f13b299ddf801e49a5a94fde02c79">&#9670;&#160;</a></span>mi_stats_print_out()</h2>
 
 <div class="memitem">
 <div class="memproto">
@@ -877,19 +1180,12 @@ <h2 class="memtitle"><span class="permalink"><a href="#ga537f13b299ddf801e49a5a9
         <tr>
           <td class="memname">void mi_stats_print_out </td>
           <td>(</td>
-          <td class="paramtype"><a class="el" href="group__extended.html#gad823d23444a4b77a40f66bf075a98a0c">mi_output_fun</a> *&#160;</td>
-          <td class="paramname"><em>out</em>, </td>
+          <td class="paramtype"><a class="el" href="#gadf31cea7d0332a81c8b882cbbdbadb8d">mi_output_fun</a> *</td>          <td class="paramname"><span class="paramname"><em>out</em></span>, </td>
         </tr>
         <tr>
           <td class="paramkey"></td>
           <td></td>
-          <td class="paramtype">void *&#160;</td>
-          <td class="paramname"><em>arg</em>&#160;</td>
-        </tr>
-        <tr>
-          <td></td>
-          <td>)</td>
-          <td></td><td></td>
+          <td class="paramtype">void *</td>          <td class="paramname"><span class="paramname"><em>arg</em></span>&#160;)</td>
         </tr>
       </table>
 </div><div class="memdoc">
@@ -897,8 +1193,8 @@ <h2 class="memtitle"><span class="permalink"><a href="#ga537f13b299ddf801e49a5a9
 <p>Print the main statistics. </p>
 <dl class="params"><dt>Parameters</dt><dd>
   <table class="params">
-    <tr><td class="paramname">out</td><td>An output function or <em>NULL</em> for the default. </td></tr>
-    <tr><td class="paramname">arg</td><td>Optional argument passed to <em>out</em> (if not <em>NULL</em>)</td></tr>
+    <tr><td class="paramname">out</td><td>An output function or <em class="arg">NULL</em> for the default. </td></tr>
+    <tr><td class="paramname">arg</td><td>Optional argument passed to <em class="arg">out</em> (if not <em class="arg">NULL</em>)</td></tr>
   </table>
   </dd>
 </dl>
@@ -906,8 +1202,8 @@ <h2 class="memtitle"><span class="permalink"><a href="#ga537f13b299ddf801e49a5a9
 
 </div>
 </div>
-<a id="ga3bb8468b8cfcc6e2a61d98aee85c5f99"></a>
-<h2 class="memtitle"><span class="permalink"><a href="#ga3bb8468b8cfcc6e2a61d98aee85c5f99">&#9670;&nbsp;</a></span>mi_stats_reset()</h2>
+<a id="ga3bb8468b8cfcc6e2a61d98aee85c5f99" name="ga3bb8468b8cfcc6e2a61d98aee85c5f99"></a>
+<h2 class="memtitle"><span class="permalink"><a href="#ga3bb8468b8cfcc6e2a61d98aee85c5f99">&#9670;&#160;</a></span>mi_stats_reset()</h2>
 
 <div class="memitem">
 <div class="memproto">
@@ -915,8 +1211,7 @@ <h2 class="memtitle"><span class="permalink"><a href="#ga3bb8468b8cfcc6e2a61d98a
         <tr>
           <td class="memname">void mi_stats_reset </td>
           <td>(</td>
-          <td class="paramtype">void&#160;</td>
-          <td class="paramname"></td><td>)</td>
+          <td class="paramtype">void</td>          <td class="paramname"><span class="paramname"><em></em></span></td><td>)</td>
           <td></td>
         </tr>
       </table>
@@ -926,8 +1221,92 @@ <h2 class="memtitle"><span class="permalink"><a href="#ga3bb8468b8cfcc6e2a61d98a
 
 </div>
 </div>
-<a id="ga0ae4581e85453456a0d658b2b98bf7bf"></a>
-<h2 class="memtitle"><span class="permalink"><a href="#ga0ae4581e85453456a0d658b2b98bf7bf">&#9670;&nbsp;</a></span>mi_thread_done()</h2>
+<a id="gadbc53414eb68b275588ec001ce1ddc7c" name="gadbc53414eb68b275588ec001ce1ddc7c"></a>
+<h2 class="memtitle"><span class="permalink"><a href="#gadbc53414eb68b275588ec001ce1ddc7c">&#9670;&#160;</a></span>mi_subproc_add_current_thread()</h2>
+
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">void mi_subproc_add_current_thread </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="#ga8c0bcd1fee27c7641e9c3c0d991b3b7d">mi_subproc_id_t</a></td>          <td class="paramname"><span class="paramname"><em>subproc</em></span></td><td>)</td>
+          <td></td>
+        </tr>
+      </table>
+</div><div class="memdoc">
+
+<p>Add the current thread to the given sub-process. </p>
+<p>This should be called right after a thread is created (and no allocation has taken place yet) </p>
+
+</div>
+</div>
+<a id="gaa7d263e9429bac9ac8345c9d25de610e" name="gaa7d263e9429bac9ac8345c9d25de610e"></a>
+<h2 class="memtitle"><span class="permalink"><a href="#gaa7d263e9429bac9ac8345c9d25de610e">&#9670;&#160;</a></span>mi_subproc_delete()</h2>
+
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">void mi_subproc_delete </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="#ga8c0bcd1fee27c7641e9c3c0d991b3b7d">mi_subproc_id_t</a></td>          <td class="paramname"><span class="paramname"><em>subproc</em></span></td><td>)</td>
+          <td></td>
+        </tr>
+      </table>
+</div><div class="memdoc">
+
+<p>Delete a previously created sub-process. </p>
+<dl class="params"><dt>Parameters</dt><dd>
+  <table class="params">
+    <tr><td class="paramname">subproc</td><td>The sub-process identifier. Only delete sub-processes if all associated threads have terminated. </td></tr>
+  </table>
+  </dd>
+</dl>
+
+</div>
+</div>
+<a id="ga2ecba0d7ebdc99e71bb985c4a1609806" name="ga2ecba0d7ebdc99e71bb985c4a1609806"></a>
+<h2 class="memtitle"><span class="permalink"><a href="#ga2ecba0d7ebdc99e71bb985c4a1609806">&#9670;&#160;</a></span>mi_subproc_main()</h2>
+
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname"><a class="el" href="#ga8c0bcd1fee27c7641e9c3c0d991b3b7d">mi_subproc_id_t</a> mi_subproc_main </td>
+          <td>(</td>
+          <td class="paramtype">void</td>          <td class="paramname"><span class="paramname"><em></em></span></td><td>)</td>
+          <td></td>
+        </tr>
+      </table>
+</div><div class="memdoc">
+
+<p>Get the main sub-process identifier. </p>
+
+</div>
+</div>
+<a id="ga8068cac328e41fa2170faef707315243" name="ga8068cac328e41fa2170faef707315243"></a>
+<h2 class="memtitle"><span class="permalink"><a href="#ga8068cac328e41fa2170faef707315243">&#9670;&#160;</a></span>mi_subproc_new()</h2>
+
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname"><a class="el" href="#ga8c0bcd1fee27c7641e9c3c0d991b3b7d">mi_subproc_id_t</a> mi_subproc_new </td>
+          <td>(</td>
+          <td class="paramtype">void</td>          <td class="paramname"><span class="paramname"><em></em></span></td><td>)</td>
+          <td></td>
+        </tr>
+      </table>
+</div><div class="memdoc">
+
+<p>Create a fresh sub-process (with no associated threads yet). </p>
+<dl class="section return"><dt>Returns</dt><dd>The new sub-process identifier. </dd></dl>
+
+</div>
+</div>
+<a id="ga0ae4581e85453456a0d658b2b98bf7bf" name="ga0ae4581e85453456a0d658b2b98bf7bf"></a>
+<h2 class="memtitle"><span class="permalink"><a href="#ga0ae4581e85453456a0d658b2b98bf7bf">&#9670;&#160;</a></span>mi_thread_done()</h2>
 
 <div class="memitem">
 <div class="memproto">
@@ -935,8 +1314,7 @@ <h2 class="memtitle"><span class="permalink"><a href="#ga0ae4581e85453456a0d658b
         <tr>
           <td class="memname">void mi_thread_done </td>
           <td>(</td>
-          <td class="paramtype">void&#160;</td>
-          <td class="paramname"></td><td>)</td>
+          <td class="paramtype">void</td>          <td class="paramname"><span class="paramname"><em></em></span></td><td>)</td>
           <td></td>
         </tr>
       </table>
@@ -947,8 +1325,8 @@ <h2 class="memtitle"><span class="permalink"><a href="#ga0ae4581e85453456a0d658b
 
 </div>
 </div>
-<a id="gaf8e73efc2cbca9ebfdfb166983a04c17"></a>
-<h2 class="memtitle"><span class="permalink"><a href="#gaf8e73efc2cbca9ebfdfb166983a04c17">&#9670;&nbsp;</a></span>mi_thread_init()</h2>
+<a id="gaf8e73efc2cbca9ebfdfb166983a04c17" name="gaf8e73efc2cbca9ebfdfb166983a04c17"></a>
+<h2 class="memtitle"><span class="permalink"><a href="#gaf8e73efc2cbca9ebfdfb166983a04c17">&#9670;&#160;</a></span>mi_thread_init()</h2>
 
 <div class="memitem">
 <div class="memproto">
@@ -956,8 +1334,7 @@ <h2 class="memtitle"><span class="permalink"><a href="#gaf8e73efc2cbca9ebfdfb166
         <tr>
           <td class="memname">void mi_thread_init </td>
           <td>(</td>
-          <td class="paramtype">void&#160;</td>
-          <td class="paramname"></td><td>)</td>
+          <td class="paramtype">void</td>          <td class="paramname"><span class="paramname"><em></em></span></td><td>)</td>
           <td></td>
         </tr>
       </table>
@@ -968,8 +1345,8 @@ <h2 class="memtitle"><span class="permalink"><a href="#gaf8e73efc2cbca9ebfdfb166
 
 </div>
 </div>
-<a id="gab1dac8476c46cb9eecab767eb40c1525"></a>
-<h2 class="memtitle"><span class="permalink"><a href="#gab1dac8476c46cb9eecab767eb40c1525">&#9670;&nbsp;</a></span>mi_thread_stats_print_out()</h2>
+<a id="gab1dac8476c46cb9eecab767eb40c1525" name="gab1dac8476c46cb9eecab767eb40c1525"></a>
+<h2 class="memtitle"><span class="permalink"><a href="#gab1dac8476c46cb9eecab767eb40c1525">&#9670;&#160;</a></span>mi_thread_stats_print_out()</h2>
 
 <div class="memitem">
 <div class="memproto">
@@ -977,19 +1354,12 @@ <h2 class="memtitle"><span class="permalink"><a href="#gab1dac8476c46cb9eecab767
         <tr>
           <td class="memname">void mi_thread_stats_print_out </td>
           <td>(</td>
-          <td class="paramtype"><a class="el" href="group__extended.html#gad823d23444a4b77a40f66bf075a98a0c">mi_output_fun</a> *&#160;</td>
-          <td class="paramname"><em>out</em>, </td>
+          <td class="paramtype"><a class="el" href="#gadf31cea7d0332a81c8b882cbbdbadb8d">mi_output_fun</a> *</td>          <td class="paramname"><span class="paramname"><em>out</em></span>, </td>
         </tr>
         <tr>
           <td class="paramkey"></td>
           <td></td>
-          <td class="paramtype">void *&#160;</td>
-          <td class="paramname"><em>arg</em>&#160;</td>
-        </tr>
-        <tr>
-          <td></td>
-          <td>)</td>
-          <td></td><td></td>
+          <td class="paramtype">void *</td>          <td class="paramname"><span class="paramname"><em>arg</em></span>&#160;)</td>
         </tr>
       </table>
 </div><div class="memdoc">
@@ -997,8 +1367,8 @@ <h2 class="memtitle"><span class="permalink"><a href="#gab1dac8476c46cb9eecab767
 <p>Print out heap statistics for this thread. </p>
 <dl class="params"><dt>Parameters</dt><dd>
   <table class="params">
-    <tr><td class="paramname">out</td><td>An output function or <em>NULL</em> for the default. </td></tr>
-    <tr><td class="paramname">arg</td><td>Optional argument passed to <em>out</em> (if not <em>NULL</em>)</td></tr>
+    <tr><td class="paramname">out</td><td>An output function or <em class="arg">NULL</em> for the default. </td></tr>
+    <tr><td class="paramname">arg</td><td>Optional argument passed to <em class="arg">out</em> (if not <em class="arg">NULL</em>)</td></tr>
   </table>
   </dd>
 </dl>
@@ -1006,8 +1376,8 @@ <h2 class="memtitle"><span class="permalink"><a href="#gab1dac8476c46cb9eecab767
 
 </div>
 </div>
-<a id="ga089c859d9eddc5f9b4bd946cd53cebee"></a>
-<h2 class="memtitle"><span class="permalink"><a href="#ga089c859d9eddc5f9b4bd946cd53cebee">&#9670;&nbsp;</a></span>mi_usable_size()</h2>
+<a id="ga089c859d9eddc5f9b4bd946cd53cebee" name="ga089c859d9eddc5f9b4bd946cd53cebee"></a>
+<h2 class="memtitle"><span class="permalink"><a href="#ga089c859d9eddc5f9b4bd946cd53cebee">&#9670;&#160;</a></span>mi_usable_size()</h2>
 
 <div class="memitem">
 <div class="memproto">
@@ -1015,8 +1385,7 @@ <h2 class="memtitle"><span class="permalink"><a href="#ga089c859d9eddc5f9b4bd946
         <tr>
           <td class="memname">size_t mi_usable_size </td>
           <td>(</td>
-          <td class="paramtype">void *&#160;</td>
-          <td class="paramname"><em>p</em></td><td>)</td>
+          <td class="paramtype">void *</td>          <td class="paramname"><span class="paramname"><em>p</em></span></td><td>)</td>
           <td></td>
         </tr>
       </table>
@@ -1025,31 +1394,30 @@ <h2 class="memtitle"><span class="permalink"><a href="#ga089c859d9eddc5f9b4bd946
 <p>Return the available bytes in a memory block. </p>
 <dl class="params"><dt>Parameters</dt><dd>
   <table class="params">
-    <tr><td class="paramname">p</td><td>Pointer to previously allocated memory (or <em>NULL</em>) </td></tr>
+    <tr><td class="paramname">p</td><td>Pointer to previously allocated memory (or <em class="arg">NULL</em>) </td></tr>
   </table>
   </dd>
 </dl>
-<dl class="section return"><dt>Returns</dt><dd>Returns the available bytes in the memory block, or 0 if <em>p</em> was <em>NULL</em>.</dd></dl>
-<p>The returned size can be used to call <em>mi_expand</em> successfully. The returned size is always at least equal to the allocated size of <em>p</em>, and, in the current design, should be less than 16.7% more.</p>
+<dl class="section return"><dt>Returns</dt><dd>Returns the available bytes in the memory block, or 0 if <em class="arg">p</em> was <em class="arg">NULL</em>.</dd></dl>
+<p>The returned size can be used to call <em class="arg">mi_expand</em> successfully. The returned size is always at least equal to the allocated size of <em class="arg">p</em>.</p>
 <dl class="section see"><dt>See also</dt><dd><a href="https://docs.microsoft.com/en-us/cpp/c-runtime-library/reference/msize?view=vs-2017">_msize</a> (Windows) </dd>
 <dd>
 <a href="http://man7.org/linux/man-pages/man3/malloc_usable_size.3.html">malloc_usable_size</a> (Linux) </dd>
 <dd>
-<a class="el" href="group__extended.html#gac057927cd06c854b45fe7847e921bd47" title="Return the used allocation size.">mi_good_size()</a> </dd></dl>
+<a class="el" href="#gac057927cd06c854b45fe7847e921bd47" title="Return the used allocation size.">mi_good_size()</a> </dd></dl>
 
 </div>
 </div>
-<a id="ga220f29f40a44404b0061c15bc1c31152"></a>
-<h2 class="memtitle"><span class="permalink"><a href="#ga220f29f40a44404b0061c15bc1c31152">&#9670;&nbsp;</a></span>mi_zalloc_small()</h2>
+<a id="ga51c47637e81df0e2f13a2d7a2dec123e" name="ga51c47637e81df0e2f13a2d7a2dec123e"></a>
+<h2 class="memtitle"><span class="permalink"><a href="#ga51c47637e81df0e2f13a2d7a2dec123e">&#9670;&#160;</a></span>mi_zalloc_small()</h2>
 
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname">void* mi_zalloc_small </td>
+          <td class="memname">void * mi_zalloc_small </td>
           <td>(</td>
-          <td class="paramtype">size_t&#160;</td>
-          <td class="paramname"><em>size</em></td><td>)</td>
+          <td class="paramtype">size_t</td>          <td class="paramname"><span class="paramname"><em>size</em></span></td><td>)</td>
           <td></td>
         </tr>
       </table>
@@ -1058,11 +1426,11 @@ <h2 class="memtitle"><span class="permalink"><a href="#ga220f29f40a44404b0061c15
 <p>Allocate a zero initialized small object. </p>
 <dl class="params"><dt>Parameters</dt><dd>
   <table class="params">
-    <tr><td class="paramname">size</td><td>The size in bytes, can be at most <a class="el" href="group__extended.html#ga1ea64283508718d9d645c38efc2f4305" title="Maximum size allowed for small allocations in mi_malloc_small and mi_zalloc_small (usually 128*sizeof...">MI_SMALL_SIZE_MAX</a>. </td></tr>
+    <tr><td class="paramname">size</td><td>The size in bytes, can be at most <a class="el" href="#ga1ea64283508718d9d645c38efc2f4305" title="Maximum size allowed for small allocations in mi_malloc_small and mi_zalloc_small (usually 128*sizeof...">MI_SMALL_SIZE_MAX</a>. </td></tr>
   </table>
   </dd>
 </dl>
-<dl class="section return"><dt>Returns</dt><dd>a pointer to newly allocated zero-initialized memory of at least <em>size</em> bytes, or <em>NULL</em> if out of memory. This function is meant for use in run-time systems for best performance and does not check if <em>size</em> was indeed small &ndash; use with care! </dd></dl>
+<dl class="section return"><dt>Returns</dt><dd>a pointer to newly allocated zero-initialized memory of at least <em class="arg">size</em> bytes, or <em class="arg">NULL</em> if out of memory. This function is meant for use in run-time systems for best performance and does not check if <em class="arg">size</em> was indeed small &ndash; use with care! </dd></dl>
 
 </div>
 </div>
@@ -1071,7 +1439,7 @@ <h2 class="memtitle"><span class="permalink"><a href="#ga220f29f40a44404b0061c15
 <!-- start footer part -->
 <div id="nav-path" class="navpath"><!-- id is needed for treeview function! -->
   <ul>
-    <li class="footer">Generated by <a href="https://www.doxygen.org/index.html"><img class="footer" src="doxygen.svg" width="104" height="31" alt="doxygen"/></a> 1.9.1 </li>
+    <li class="footer">Generated by <a href="https://www.doxygen.org/index.html"><img class="footer" src="doxygen.svg" width="104" height="31" alt="doxygen"/></a> 1.13.1 </li>
   </ul>
 </div>
 </body>
diff --git a/depends/mimalloc/docs/group__extended.js b/depends/mimalloc/docs/group__extended.js
index c217aaca76b6..43d6378fb097 100644
--- a/depends/mimalloc/docs/group__extended.js
+++ b/depends/mimalloc/docs/group__extended.js
@@ -1,29 +1,42 @@
 var group__extended =
 [
     [ "MI_SMALL_SIZE_MAX", "group__extended.html#ga1ea64283508718d9d645c38efc2f4305", null ],
-    [ "mi_deferred_free_fun", "group__extended.html#ga299dae78d25ce112e384a98b7309c5be", null ],
-    [ "mi_error_fun", "group__extended.html#ga251d369cda3f1c2a955c555486ed90e5", null ],
-    [ "mi_output_fun", "group__extended.html#gad823d23444a4b77a40f66bf075a98a0c", null ],
+    [ "mi_arena_id_t", "group__extended.html#ga99fe38650d0b02e0e0f89ee024db91d3", null ],
+    [ "mi_deferred_free_fun", "group__extended.html#ga292a45f7dbc7cd23c5352ce1f0002816", null ],
+    [ "mi_error_fun", "group__extended.html#ga83fc6a688b322261e1c2deab000b0591", null ],
+    [ "mi_output_fun", "group__extended.html#gadf31cea7d0332a81c8b882cbbdbadb8d", null ],
+    [ "mi_subproc_id_t", "group__extended.html#ga8c0bcd1fee27c7641e9c3c0d991b3b7d", null ],
+    [ "mi_arena_area", "group__extended.html#ga9a25a00a22151619a0be91a10af7787f", null ],
     [ "mi_collect", "group__extended.html#ga421430e2226d7d468529cec457396756", null ],
+    [ "mi_debug_show_arenas", "group__extended.html#gad7439207f8f71fb6c382a9ea20b997e7", null ],
     [ "mi_good_size", "group__extended.html#gac057927cd06c854b45fe7847e921bd47", null ],
+    [ "mi_heap_new_ex", "group__extended.html#ga3ae360583f4351aa5267ee7e43008faf", null ],
+    [ "mi_heap_new_in_arena", "group__extended.html#gaaf2d9976576d5efd5544be12848af949", null ],
     [ "mi_is_in_heap_region", "group__extended.html#ga5f071b10d4df1c3658e04e7fd67a94e6", null ],
     [ "mi_is_redirected", "group__extended.html#gaad25050b19f30cd79397b227e0157a3f", null ],
-    [ "mi_malloc_small", "group__extended.html#ga7136c2e55cb22c98ecf95d08d6debb99", null ],
+    [ "mi_malloc_small", "group__extended.html#ga7f050bc6b897da82692174f5fce59cde", null ],
     [ "mi_manage_os_memory", "group__extended.html#ga4c6486a1fdcd7a423b5f25fe4be8e0cf", null ],
+    [ "mi_manage_os_memory_ex", "group__extended.html#ga41ce8525d77bbb60f618fa1029994f6e", null ],
     [ "mi_process_info", "group__extended.html#ga7d862c2affd5790381da14eb102a364d", null ],
     [ "mi_register_deferred_free", "group__extended.html#ga3460a6ca91af97be4058f523d3cb8ece", null ],
     [ "mi_register_error", "group__extended.html#gaa1d55e0e894be240827e5d87ec3a1f45", null ],
     [ "mi_register_output", "group__extended.html#gae5b17ff027cd2150b43a33040250cf3f", null ],
     [ "mi_reserve_huge_os_pages_at", "group__extended.html#ga7795a13d20087447281858d2c771cca1", null ],
+    [ "mi_reserve_huge_os_pages_at_ex", "group__extended.html#ga591aab1c2bc2ca920e33f0f9f9cb5c52", null ],
     [ "mi_reserve_huge_os_pages_interleave", "group__extended.html#ga3132f521fb756fc0e8ec0b74fb58df50", null ],
     [ "mi_reserve_os_memory", "group__extended.html#ga00ec3324b6b2591c7fe3677baa30a767", null ],
+    [ "mi_reserve_os_memory_ex", "group__extended.html#ga32f519797fd9a81acb4f52d36e6d751b", null ],
     [ "mi_stats_merge", "group__extended.html#ga854b1de8cb067c7316286c28b2fcd3d1", null ],
     [ "mi_stats_print", "group__extended.html#ga2d126e5c62d3badc35445e5d84166df2", null ],
     [ "mi_stats_print_out", "group__extended.html#ga537f13b299ddf801e49a5a94fde02c79", null ],
     [ "mi_stats_reset", "group__extended.html#ga3bb8468b8cfcc6e2a61d98aee85c5f99", null ],
+    [ "mi_subproc_add_current_thread", "group__extended.html#gadbc53414eb68b275588ec001ce1ddc7c", null ],
+    [ "mi_subproc_delete", "group__extended.html#gaa7d263e9429bac9ac8345c9d25de610e", null ],
+    [ "mi_subproc_main", "group__extended.html#ga2ecba0d7ebdc99e71bb985c4a1609806", null ],
+    [ "mi_subproc_new", "group__extended.html#ga8068cac328e41fa2170faef707315243", null ],
     [ "mi_thread_done", "group__extended.html#ga0ae4581e85453456a0d658b2b98bf7bf", null ],
     [ "mi_thread_init", "group__extended.html#gaf8e73efc2cbca9ebfdfb166983a04c17", null ],
     [ "mi_thread_stats_print_out", "group__extended.html#gab1dac8476c46cb9eecab767eb40c1525", null ],
     [ "mi_usable_size", "group__extended.html#ga089c859d9eddc5f9b4bd946cd53cebee", null ],
-    [ "mi_zalloc_small", "group__extended.html#ga220f29f40a44404b0061c15bc1c31152", null ]
+    [ "mi_zalloc_small", "group__extended.html#ga51c47637e81df0e2f13a2d7a2dec123e", null ]
 ];
\ No newline at end of file
diff --git a/depends/mimalloc/docs/group__heap.html b/depends/mimalloc/docs/group__heap.html
index 0f21ea42c122..c01a9e54c1e2 100644
--- a/depends/mimalloc/docs/group__heap.html
+++ b/depends/mimalloc/docs/group__heap.html
@@ -1,24 +1,26 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "https://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
+<html xmlns="http://www.w3.org/1999/xhtml" lang="en-US">
 <head>
 <meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
-<meta http-equiv="X-UA-Compatible" content="IE=9"/>
-<meta name="generator" content="Doxygen 1.9.1"/>
+<meta http-equiv="X-UA-Compatible" content="IE=11"/>
+<meta name="generator" content="Doxygen 1.13.1"/>
 <meta name="viewport" content="width=device-width, initial-scale=1"/>
 <title>mi-malloc: Heap Allocation</title>
 <link href="tabs.css" rel="stylesheet" type="text/css"/>
 <script type="text/javascript" src="jquery.js"></script>
 <script type="text/javascript" src="dynsections.js"></script>
+<script type="text/javascript" src="clipboard.js"></script>
 <link href="navtree.css" rel="stylesheet" type="text/css"/>
-<script type="text/javascript" src="resize.js"></script>
 <script type="text/javascript" src="navtreedata.js"></script>
 <script type="text/javascript" src="navtree.js"></script>
+<script type="text/javascript" src="resize.js"></script>
+<script type="text/javascript" src="cookie.js"></script>
 <link href="search/search.css" rel="stylesheet" type="text/css"/>
 <script type="text/javascript" src="search/searchdata.js"></script>
 <script type="text/javascript" src="search/search.js"></script>
 <script type="text/javascript">
-/* @license magnet:?xt=urn:btih:cf05388f2679ee054f2beb29a391d25f4e673ac3&amp;dn=gpl-2.0.txt GPL-v2 */
-  $(document).ready(function() { init_search(); });
+/* @license magnet:?xt=urn:btih:d3d9a9a6595521f9666a5e94cc830dab83b65699&amp;dn=expat.txt MIT */
+  $(function() { init_search(); });
 /* @license-end */
 </script>
 <link href="doxygen.css" rel="stylesheet" type="text/css" />
@@ -29,20 +31,16 @@
 <div id="titlearea">
 <table cellspacing="0" cellpadding="0">
  <tbody>
- <tr style="height: 56px;">
+ <tr id="projectrow">
   <td id="projectlogo"><img alt="Logo" src="mimalloc-logo.svg"/></td>
-  <td id="projectalign" style="padding-left: 0.5em;">
-   <div id="projectname">mi-malloc
-   &#160;<span id="projectnumber">1.7/2.0</span>
+  <td id="projectalign">
+   <div id="projectname">mi-malloc<span id="projectnumber">&#160;1.8/2.1</span>
    </div>
   </td>
-   <td>        <div id="MSearchBox" class="MSearchBoxInactive">
+    <td>        <div id="MSearchBox" class="MSearchBoxInactive">
         <span class="left">
-          <img id="MSearchSelect" src="search/mag_sel.svg"
-               onmouseover="return searchBox.OnSearchSelectShow()"
-               onmouseout="return searchBox.OnSearchSelectHide()"
-               alt=""/>
-          <input type="text" id="MSearchField" value="Search" accesskey="S"
+          <span id="MSearchSelect"                onmouseover="return searchBox.OnSearchSelectShow()"                onmouseout="return searchBox.OnSearchSelectHide()">&#160;</span>
+          <input type="text" id="MSearchField" value="" placeholder="Search" accesskey="S"
                onfocus="searchBox.OnSearchFieldFocus(true)" 
                onblur="searchBox.OnSearchFieldFocus(false)" 
                onkeyup="searchBox.OnSearchFieldChange(event)"/>
@@ -56,10 +54,15 @@
 </table>
 </div>
 <!-- end header part -->
-<!-- Generated by Doxygen 1.9.1 -->
+<!-- Generated by Doxygen 1.13.1 -->
+<script type="text/javascript">
+/* @license magnet:?xt=urn:btih:d3d9a9a6595521f9666a5e94cc830dab83b65699&amp;dn=expat.txt MIT */
+var searchBox = new SearchBox("searchBox", "search/",'.html');
+/* @license-end */
+</script>
 <script type="text/javascript">
-/* @license magnet:?xt=urn:btih:cf05388f2679ee054f2beb29a391d25f4e673ac3&amp;dn=gpl-2.0.txt GPL-v2 */
-var searchBox = new SearchBox("searchBox", "search",false,'Search','.html');
+/* @license magnet:?xt=urn:btih:d3d9a9a6595521f9666a5e94cc830dab83b65699&amp;dn=expat.txt MIT */
+$(function() { codefold.init(0); });
 /* @license-end */
 </script>
 </div><!-- top -->
@@ -74,8 +77,8 @@
   </div>
 </div>
 <script type="text/javascript">
-/* @license magnet:?xt=urn:btih:cf05388f2679ee054f2beb29a391d25f4e673ac3&amp;dn=gpl-2.0.txt GPL-v2 */
-$(document).ready(function(){initNavTree('group__heap.html',''); initResizable(); });
+/* @license magnet:?xt=urn:btih:d3d9a9a6595521f9666a5e94cc830dab83b65699&amp;dn=expat.txt MIT */
+$(function(){initNavTree('group__heap.html',''); initResizable(true); });
 /* @license-end */
 </script>
 <div id="doc-content">
@@ -88,110 +91,116 @@
 
 <!-- iframe showing the search results (closed by default) -->
 <div id="MSearchResultsWindow">
-<iframe src="javascript:void(0)" frameborder="0" 
-        name="MSearchResults" id="MSearchResults">
-</iframe>
+<div id="MSearchResults">
+<div class="SRPage">
+<div id="SRIndex">
+<div id="SRResults"></div>
+<div class="SRStatus" id="Loading">Loading...</div>
+<div class="SRStatus" id="Searching">Searching...</div>
+<div class="SRStatus" id="NoMatches">No Matches</div>
+</div>
+</div>
+</div>
 </div>
 
 <div class="header">
   <div class="summary">
 <a href="#typedef-members">Typedefs</a> &#124;
 <a href="#func-members">Functions</a>  </div>
-  <div class="headertitle">
-<div class="title">Heap Allocation</div>  </div>
+  <div class="headertitle"><div class="title">Heap Allocation</div></div>
 </div><!--header-->
 <div class="contents">
 
 <p>First-class heaps that can be destroyed in one go.  
 <a href="#details">More...</a></p>
 <table class="memberdecls">
-<tr class="heading"><td colspan="2"><h2 class="groupheader"><a name="typedef-members"></a>
+<tr class="heading"><td colspan="2"><h2 class="groupheader"><a id="typedef-members" name="typedef-members"></a>
 Typedefs</h2></td></tr>
-<tr class="memitem:ga34a47cde5a5b38c29f1aa3c5e76943c2"><td class="memItemLeft" align="right" valign="top">typedef struct mi_heap_s&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__heap.html#ga34a47cde5a5b38c29f1aa3c5e76943c2">mi_heap_t</a></td></tr>
-<tr class="memdesc:ga34a47cde5a5b38c29f1aa3c5e76943c2"><td class="mdescLeft">&#160;</td><td class="mdescRight">Type of first-class heaps.  <a href="group__heap.html#ga34a47cde5a5b38c29f1aa3c5e76943c2">More...</a><br /></td></tr>
+<tr class="memitem:ga34a47cde5a5b38c29f1aa3c5e76943c2" id="r_ga34a47cde5a5b38c29f1aa3c5e76943c2"><td class="memItemLeft" align="right" valign="top">typedef struct mi_heap_s&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="#ga34a47cde5a5b38c29f1aa3c5e76943c2">mi_heap_t</a></td></tr>
+<tr class="memdesc:ga34a47cde5a5b38c29f1aa3c5e76943c2"><td class="mdescLeft">&#160;</td><td class="mdescRight">Type of first-class heaps.  <br /></td></tr>
 <tr class="separator:ga34a47cde5a5b38c29f1aa3c5e76943c2"><td class="memSeparator" colspan="2">&#160;</td></tr>
 </table><table class="memberdecls">
-<tr class="heading"><td colspan="2"><h2 class="groupheader"><a name="func-members"></a>
+<tr class="heading"><td colspan="2"><h2 class="groupheader"><a id="func-members" name="func-members"></a>
 Functions</h2></td></tr>
-<tr class="memitem:ga766f672ba56f2fbfeb9d9dbb0b7f6b11"><td class="memItemLeft" align="right" valign="top"><a class="el" href="group__heap.html#ga34a47cde5a5b38c29f1aa3c5e76943c2">mi_heap_t</a> *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__heap.html#ga766f672ba56f2fbfeb9d9dbb0b7f6b11">mi_heap_new</a> ()</td></tr>
-<tr class="memdesc:ga766f672ba56f2fbfeb9d9dbb0b7f6b11"><td class="mdescLeft">&#160;</td><td class="mdescRight">Create a new heap that can be used for allocation.  <a href="group__heap.html#ga766f672ba56f2fbfeb9d9dbb0b7f6b11">More...</a><br /></td></tr>
-<tr class="separator:ga766f672ba56f2fbfeb9d9dbb0b7f6b11"><td class="memSeparator" colspan="2">&#160;</td></tr>
-<tr class="memitem:ga2ab1af8d438819b55319c7ef51d1e409"><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__heap.html#ga2ab1af8d438819b55319c7ef51d1e409">mi_heap_delete</a> (<a class="el" href="group__heap.html#ga34a47cde5a5b38c29f1aa3c5e76943c2">mi_heap_t</a> *heap)</td></tr>
-<tr class="memdesc:ga2ab1af8d438819b55319c7ef51d1e409"><td class="mdescLeft">&#160;</td><td class="mdescRight">Delete a previously allocated heap.  <a href="group__heap.html#ga2ab1af8d438819b55319c7ef51d1e409">More...</a><br /></td></tr>
+<tr class="memitem:gaa718bb226ec0546ba6d1b6cb32179f3a" id="r_gaa718bb226ec0546ba6d1b6cb32179f3a"><td class="memItemLeft" align="right" valign="top"><a class="el" href="#ga34a47cde5a5b38c29f1aa3c5e76943c2">mi_heap_t</a> *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="#gaa718bb226ec0546ba6d1b6cb32179f3a">mi_heap_new</a> ()</td></tr>
+<tr class="memdesc:gaa718bb226ec0546ba6d1b6cb32179f3a"><td class="mdescLeft">&#160;</td><td class="mdescRight">Create a new heap that can be used for allocation.  <br /></td></tr>
+<tr class="separator:gaa718bb226ec0546ba6d1b6cb32179f3a"><td class="memSeparator" colspan="2">&#160;</td></tr>
+<tr class="memitem:ga2ab1af8d438819b55319c7ef51d1e409" id="r_ga2ab1af8d438819b55319c7ef51d1e409"><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="#ga2ab1af8d438819b55319c7ef51d1e409">mi_heap_delete</a> (<a class="el" href="#ga34a47cde5a5b38c29f1aa3c5e76943c2">mi_heap_t</a> *heap)</td></tr>
+<tr class="memdesc:ga2ab1af8d438819b55319c7ef51d1e409"><td class="mdescLeft">&#160;</td><td class="mdescRight">Delete a previously allocated heap.  <br /></td></tr>
 <tr class="separator:ga2ab1af8d438819b55319c7ef51d1e409"><td class="memSeparator" colspan="2">&#160;</td></tr>
-<tr class="memitem:ga9f9c0844edb9717f4feacd79116b8e0d"><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__heap.html#ga9f9c0844edb9717f4feacd79116b8e0d">mi_heap_destroy</a> (<a class="el" href="group__heap.html#ga34a47cde5a5b38c29f1aa3c5e76943c2">mi_heap_t</a> *heap)</td></tr>
-<tr class="memdesc:ga9f9c0844edb9717f4feacd79116b8e0d"><td class="mdescLeft">&#160;</td><td class="mdescRight">Destroy a heap, freeing all its still allocated blocks.  <a href="group__heap.html#ga9f9c0844edb9717f4feacd79116b8e0d">More...</a><br /></td></tr>
+<tr class="memitem:ga9f9c0844edb9717f4feacd79116b8e0d" id="r_ga9f9c0844edb9717f4feacd79116b8e0d"><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="#ga9f9c0844edb9717f4feacd79116b8e0d">mi_heap_destroy</a> (<a class="el" href="#ga34a47cde5a5b38c29f1aa3c5e76943c2">mi_heap_t</a> *heap)</td></tr>
+<tr class="memdesc:ga9f9c0844edb9717f4feacd79116b8e0d"><td class="mdescLeft">&#160;</td><td class="mdescRight">Destroy a heap, freeing all its still allocated blocks.  <br /></td></tr>
 <tr class="separator:ga9f9c0844edb9717f4feacd79116b8e0d"><td class="memSeparator" colspan="2">&#160;</td></tr>
-<tr class="memitem:gab8631ec88c8d26641b68b5d25dcd4422"><td class="memItemLeft" align="right" valign="top"><a class="el" href="group__heap.html#ga34a47cde5a5b38c29f1aa3c5e76943c2">mi_heap_t</a> *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__heap.html#gab8631ec88c8d26641b68b5d25dcd4422">mi_heap_set_default</a> (<a class="el" href="group__heap.html#ga34a47cde5a5b38c29f1aa3c5e76943c2">mi_heap_t</a> *heap)</td></tr>
-<tr class="memdesc:gab8631ec88c8d26641b68b5d25dcd4422"><td class="mdescLeft">&#160;</td><td class="mdescRight">Set the default heap to use for <a class="el" href="group__malloc.html#ga3406e8b168bc74c8637b11571a6da83a" title="Allocate size bytes.">mi_malloc()</a> et al.  <a href="group__heap.html#gab8631ec88c8d26641b68b5d25dcd4422">More...</a><br /></td></tr>
-<tr class="separator:gab8631ec88c8d26641b68b5d25dcd4422"><td class="memSeparator" colspan="2">&#160;</td></tr>
-<tr class="memitem:ga8db4cbb87314a989a9a187464d6b5e05"><td class="memItemLeft" align="right" valign="top"><a class="el" href="group__heap.html#ga34a47cde5a5b38c29f1aa3c5e76943c2">mi_heap_t</a> *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__heap.html#ga8db4cbb87314a989a9a187464d6b5e05">mi_heap_get_default</a> ()</td></tr>
-<tr class="memdesc:ga8db4cbb87314a989a9a187464d6b5e05"><td class="mdescLeft">&#160;</td><td class="mdescRight">Get the default heap that is used for <a class="el" href="group__malloc.html#ga3406e8b168bc74c8637b11571a6da83a" title="Allocate size bytes.">mi_malloc()</a> et al.  <a href="group__heap.html#ga8db4cbb87314a989a9a187464d6b5e05">More...</a><br /></td></tr>
-<tr class="separator:ga8db4cbb87314a989a9a187464d6b5e05"><td class="memSeparator" colspan="2">&#160;</td></tr>
-<tr class="memitem:ga5d03fbe062ffcf38f0f417fd968357fc"><td class="memItemLeft" align="right" valign="top"><a class="el" href="group__heap.html#ga34a47cde5a5b38c29f1aa3c5e76943c2">mi_heap_t</a> *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__heap.html#ga5d03fbe062ffcf38f0f417fd968357fc">mi_heap_get_backing</a> ()</td></tr>
-<tr class="memdesc:ga5d03fbe062ffcf38f0f417fd968357fc"><td class="mdescLeft">&#160;</td><td class="mdescRight">Get the backing heap.  <a href="group__heap.html#ga5d03fbe062ffcf38f0f417fd968357fc">More...</a><br /></td></tr>
-<tr class="separator:ga5d03fbe062ffcf38f0f417fd968357fc"><td class="memSeparator" colspan="2">&#160;</td></tr>
-<tr class="memitem:ga7922f7495cde30b1984d0e6072419298"><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__heap.html#ga7922f7495cde30b1984d0e6072419298">mi_heap_collect</a> (<a class="el" href="group__heap.html#ga34a47cde5a5b38c29f1aa3c5e76943c2">mi_heap_t</a> *heap, bool force)</td></tr>
-<tr class="memdesc:ga7922f7495cde30b1984d0e6072419298"><td class="mdescLeft">&#160;</td><td class="mdescRight">Release outstanding resources in a specific heap.  <a href="group__heap.html#ga7922f7495cde30b1984d0e6072419298">More...</a><br /></td></tr>
+<tr class="memitem:ga349b677dec7da5eacdbc7a385bd62a4a" id="r_ga349b677dec7da5eacdbc7a385bd62a4a"><td class="memItemLeft" align="right" valign="top"><a class="el" href="#ga34a47cde5a5b38c29f1aa3c5e76943c2">mi_heap_t</a> *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="#ga349b677dec7da5eacdbc7a385bd62a4a">mi_heap_set_default</a> (<a class="el" href="#ga34a47cde5a5b38c29f1aa3c5e76943c2">mi_heap_t</a> *heap)</td></tr>
+<tr class="memdesc:ga349b677dec7da5eacdbc7a385bd62a4a"><td class="mdescLeft">&#160;</td><td class="mdescRight">Set the default heap to use in the current thread for <a class="el" href="group__malloc.html#gae1dd97b542420c87ae085e822b1229e8" title="Allocate size bytes.">mi_malloc()</a> et al.  <br /></td></tr>
+<tr class="separator:ga349b677dec7da5eacdbc7a385bd62a4a"><td class="memSeparator" colspan="2">&#160;</td></tr>
+<tr class="memitem:ga14c667a6e2c5d28762d8cb7d4e057909" id="r_ga14c667a6e2c5d28762d8cb7d4e057909"><td class="memItemLeft" align="right" valign="top"><a class="el" href="#ga34a47cde5a5b38c29f1aa3c5e76943c2">mi_heap_t</a> *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="#ga14c667a6e2c5d28762d8cb7d4e057909">mi_heap_get_default</a> ()</td></tr>
+<tr class="memdesc:ga14c667a6e2c5d28762d8cb7d4e057909"><td class="mdescLeft">&#160;</td><td class="mdescRight">Get the default heap that is used for <a class="el" href="group__malloc.html#gae1dd97b542420c87ae085e822b1229e8" title="Allocate size bytes.">mi_malloc()</a> et al.  <br /></td></tr>
+<tr class="separator:ga14c667a6e2c5d28762d8cb7d4e057909"><td class="memSeparator" colspan="2">&#160;</td></tr>
+<tr class="memitem:gac6ac9f0e7be9ab4ff70acfc8dad1235a" id="r_gac6ac9f0e7be9ab4ff70acfc8dad1235a"><td class="memItemLeft" align="right" valign="top"><a class="el" href="#ga34a47cde5a5b38c29f1aa3c5e76943c2">mi_heap_t</a> *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="#gac6ac9f0e7be9ab4ff70acfc8dad1235a">mi_heap_get_backing</a> ()</td></tr>
+<tr class="memdesc:gac6ac9f0e7be9ab4ff70acfc8dad1235a"><td class="mdescLeft">&#160;</td><td class="mdescRight">Get the backing heap.  <br /></td></tr>
+<tr class="separator:gac6ac9f0e7be9ab4ff70acfc8dad1235a"><td class="memSeparator" colspan="2">&#160;</td></tr>
+<tr class="memitem:ga7922f7495cde30b1984d0e6072419298" id="r_ga7922f7495cde30b1984d0e6072419298"><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="#ga7922f7495cde30b1984d0e6072419298">mi_heap_collect</a> (<a class="el" href="#ga34a47cde5a5b38c29f1aa3c5e76943c2">mi_heap_t</a> *heap, bool force)</td></tr>
+<tr class="memdesc:ga7922f7495cde30b1984d0e6072419298"><td class="mdescLeft">&#160;</td><td class="mdescRight">Release outstanding resources in a specific heap.  <br /></td></tr>
 <tr class="separator:ga7922f7495cde30b1984d0e6072419298"><td class="memSeparator" colspan="2">&#160;</td></tr>
-<tr class="memitem:ga9cbed01e42c0647907295de92c3fa296"><td class="memItemLeft" align="right" valign="top">void *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__heap.html#ga9cbed01e42c0647907295de92c3fa296">mi_heap_malloc</a> (<a class="el" href="group__heap.html#ga34a47cde5a5b38c29f1aa3c5e76943c2">mi_heap_t</a> *heap, size_t size)</td></tr>
-<tr class="memdesc:ga9cbed01e42c0647907295de92c3fa296"><td class="mdescLeft">&#160;</td><td class="mdescRight">Allocate in a specific heap.  <a href="group__heap.html#ga9cbed01e42c0647907295de92c3fa296">More...</a><br /></td></tr>
-<tr class="separator:ga9cbed01e42c0647907295de92c3fa296"><td class="memSeparator" colspan="2">&#160;</td></tr>
-<tr class="memitem:gaa1a1c7a1f4da6826b5a25b70ef878368"><td class="memItemLeft" align="right" valign="top">void *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__heap.html#gaa1a1c7a1f4da6826b5a25b70ef878368">mi_heap_malloc_small</a> (<a class="el" href="group__heap.html#ga34a47cde5a5b38c29f1aa3c5e76943c2">mi_heap_t</a> *heap, size_t size)</td></tr>
-<tr class="memdesc:gaa1a1c7a1f4da6826b5a25b70ef878368"><td class="mdescLeft">&#160;</td><td class="mdescRight">Allocate a small object in a specific heap.  <a href="group__heap.html#gaa1a1c7a1f4da6826b5a25b70ef878368">More...</a><br /></td></tr>
-<tr class="separator:gaa1a1c7a1f4da6826b5a25b70ef878368"><td class="memSeparator" colspan="2">&#160;</td></tr>
-<tr class="memitem:ga903104592c8ed53417a3762da6241133"><td class="memItemLeft" align="right" valign="top">void *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__heap.html#ga903104592c8ed53417a3762da6241133">mi_heap_zalloc</a> (<a class="el" href="group__heap.html#ga34a47cde5a5b38c29f1aa3c5e76943c2">mi_heap_t</a> *heap, size_t size)</td></tr>
-<tr class="memdesc:ga903104592c8ed53417a3762da6241133"><td class="mdescLeft">&#160;</td><td class="mdescRight">Allocate zero-initialized in a specific heap.  <a href="group__heap.html#ga903104592c8ed53417a3762da6241133">More...</a><br /></td></tr>
-<tr class="separator:ga903104592c8ed53417a3762da6241133"><td class="memSeparator" colspan="2">&#160;</td></tr>
-<tr class="memitem:gaa6702b3c48e9e53e50e81b36f5011d55"><td class="memItemLeft" align="right" valign="top">void *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__heap.html#gaa6702b3c48e9e53e50e81b36f5011d55">mi_heap_calloc</a> (<a class="el" href="group__heap.html#ga34a47cde5a5b38c29f1aa3c5e76943c2">mi_heap_t</a> *heap, size_t count, size_t size)</td></tr>
-<tr class="memdesc:gaa6702b3c48e9e53e50e81b36f5011d55"><td class="mdescLeft">&#160;</td><td class="mdescRight">Allocate <em>count</em> zero-initialized elements in a specific heap.  <a href="group__heap.html#gaa6702b3c48e9e53e50e81b36f5011d55">More...</a><br /></td></tr>
-<tr class="separator:gaa6702b3c48e9e53e50e81b36f5011d55"><td class="memSeparator" colspan="2">&#160;</td></tr>
-<tr class="memitem:ga851da6c43fe0b71c1376cee8aef90db0"><td class="memItemLeft" align="right" valign="top">void *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__heap.html#ga851da6c43fe0b71c1376cee8aef90db0">mi_heap_mallocn</a> (<a class="el" href="group__heap.html#ga34a47cde5a5b38c29f1aa3c5e76943c2">mi_heap_t</a> *heap, size_t count, size_t size)</td></tr>
-<tr class="memdesc:ga851da6c43fe0b71c1376cee8aef90db0"><td class="mdescLeft">&#160;</td><td class="mdescRight">Allocate <em>count</em> elements in a specific heap.  <a href="group__heap.html#ga851da6c43fe0b71c1376cee8aef90db0">More...</a><br /></td></tr>
-<tr class="separator:ga851da6c43fe0b71c1376cee8aef90db0"><td class="memSeparator" colspan="2">&#160;</td></tr>
-<tr class="memitem:ga139d6b09dbf50c3c2523d0f4d1cfdeb5"><td class="memItemLeft" align="right" valign="top">char *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__heap.html#ga139d6b09dbf50c3c2523d0f4d1cfdeb5">mi_heap_strdup</a> (<a class="el" href="group__heap.html#ga34a47cde5a5b38c29f1aa3c5e76943c2">mi_heap_t</a> *heap, const char *s)</td></tr>
-<tr class="memdesc:ga139d6b09dbf50c3c2523d0f4d1cfdeb5"><td class="mdescLeft">&#160;</td><td class="mdescRight">Duplicate a string in a specific heap.  <a href="group__heap.html#ga139d6b09dbf50c3c2523d0f4d1cfdeb5">More...</a><br /></td></tr>
-<tr class="separator:ga139d6b09dbf50c3c2523d0f4d1cfdeb5"><td class="memSeparator" colspan="2">&#160;</td></tr>
-<tr class="memitem:ga8e3dbd46650dd26573cf307a2c8f1f5a"><td class="memItemLeft" align="right" valign="top">char *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__heap.html#ga8e3dbd46650dd26573cf307a2c8f1f5a">mi_heap_strndup</a> (<a class="el" href="group__heap.html#ga34a47cde5a5b38c29f1aa3c5e76943c2">mi_heap_t</a> *heap, const char *s, size_t n)</td></tr>
-<tr class="memdesc:ga8e3dbd46650dd26573cf307a2c8f1f5a"><td class="mdescLeft">&#160;</td><td class="mdescRight">Duplicate a string of at most length <em>n</em> in a specific heap.  <a href="group__heap.html#ga8e3dbd46650dd26573cf307a2c8f1f5a">More...</a><br /></td></tr>
-<tr class="separator:ga8e3dbd46650dd26573cf307a2c8f1f5a"><td class="memSeparator" colspan="2">&#160;</td></tr>
-<tr class="memitem:ga00e95ba1e01acac3cfd95bb7a357a6f0"><td class="memItemLeft" align="right" valign="top">char *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__heap.html#ga00e95ba1e01acac3cfd95bb7a357a6f0">mi_heap_realpath</a> (<a class="el" href="group__heap.html#ga34a47cde5a5b38c29f1aa3c5e76943c2">mi_heap_t</a> *heap, const char *fname, char *resolved_name)</td></tr>
-<tr class="memdesc:ga00e95ba1e01acac3cfd95bb7a357a6f0"><td class="mdescLeft">&#160;</td><td class="mdescRight">Resolve a file path name using a specific <em>heap</em> to allocate the result.  <a href="group__heap.html#ga00e95ba1e01acac3cfd95bb7a357a6f0">More...</a><br /></td></tr>
-<tr class="separator:ga00e95ba1e01acac3cfd95bb7a357a6f0"><td class="memSeparator" colspan="2">&#160;</td></tr>
-<tr class="memitem:gaaef3395f66be48f37bdc8322509c5d81"><td class="memItemLeft" align="right" valign="top">void *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__heap.html#gaaef3395f66be48f37bdc8322509c5d81">mi_heap_realloc</a> (<a class="el" href="group__heap.html#ga34a47cde5a5b38c29f1aa3c5e76943c2">mi_heap_t</a> *heap, void *p, size_t newsize)</td></tr>
-<tr class="separator:gaaef3395f66be48f37bdc8322509c5d81"><td class="memSeparator" colspan="2">&#160;</td></tr>
-<tr class="memitem:gac74e94ad9b0c9b57c1c4d88b8825b7a8"><td class="memItemLeft" align="right" valign="top">void *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__heap.html#gac74e94ad9b0c9b57c1c4d88b8825b7a8">mi_heap_reallocn</a> (<a class="el" href="group__heap.html#ga34a47cde5a5b38c29f1aa3c5e76943c2">mi_heap_t</a> *heap, void *p, size_t count, size_t size)</td></tr>
-<tr class="separator:gac74e94ad9b0c9b57c1c4d88b8825b7a8"><td class="memSeparator" colspan="2">&#160;</td></tr>
-<tr class="memitem:ga4a21070eb4e7cce018133c8d5f4b0527"><td class="memItemLeft" align="right" valign="top">void *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__heap.html#ga4a21070eb4e7cce018133c8d5f4b0527">mi_heap_reallocf</a> (<a class="el" href="group__heap.html#ga34a47cde5a5b38c29f1aa3c5e76943c2">mi_heap_t</a> *heap, void *p, size_t newsize)</td></tr>
-<tr class="separator:ga4a21070eb4e7cce018133c8d5f4b0527"><td class="memSeparator" colspan="2">&#160;</td></tr>
-<tr class="memitem:gab5b87e1805306f70df38789fcfcf6653"><td class="memItemLeft" align="right" valign="top">void *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__heap.html#gab5b87e1805306f70df38789fcfcf6653">mi_heap_malloc_aligned</a> (<a class="el" href="group__heap.html#ga34a47cde5a5b38c29f1aa3c5e76943c2">mi_heap_t</a> *heap, size_t size, size_t alignment)</td></tr>
-<tr class="separator:gab5b87e1805306f70df38789fcfcf6653"><td class="memSeparator" colspan="2">&#160;</td></tr>
-<tr class="memitem:ga23acd7680fb0976dde3783254c6c874b"><td class="memItemLeft" align="right" valign="top">void *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__heap.html#ga23acd7680fb0976dde3783254c6c874b">mi_heap_malloc_aligned_at</a> (<a class="el" href="group__heap.html#ga34a47cde5a5b38c29f1aa3c5e76943c2">mi_heap_t</a> *heap, size_t size, size_t alignment, size_t offset)</td></tr>
-<tr class="separator:ga23acd7680fb0976dde3783254c6c874b"><td class="memSeparator" colspan="2">&#160;</td></tr>
-<tr class="memitem:gaa450a59c6c7ae5fdbd1c2b80a8329ef0"><td class="memItemLeft" align="right" valign="top">void *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__heap.html#gaa450a59c6c7ae5fdbd1c2b80a8329ef0">mi_heap_zalloc_aligned</a> (<a class="el" href="group__heap.html#ga34a47cde5a5b38c29f1aa3c5e76943c2">mi_heap_t</a> *heap, size_t size, size_t alignment)</td></tr>
-<tr class="separator:gaa450a59c6c7ae5fdbd1c2b80a8329ef0"><td class="memSeparator" colspan="2">&#160;</td></tr>
-<tr class="memitem:ga45fb43a62776fbebbdf1edd99b527954"><td class="memItemLeft" align="right" valign="top">void *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__heap.html#ga45fb43a62776fbebbdf1edd99b527954">mi_heap_zalloc_aligned_at</a> (<a class="el" href="group__heap.html#ga34a47cde5a5b38c29f1aa3c5e76943c2">mi_heap_t</a> *heap, size_t size, size_t alignment, size_t offset)</td></tr>
-<tr class="separator:ga45fb43a62776fbebbdf1edd99b527954"><td class="memSeparator" colspan="2">&#160;</td></tr>
-<tr class="memitem:ga4af03a6e2b93fae77424d93f889705c3"><td class="memItemLeft" align="right" valign="top">void *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__heap.html#ga4af03a6e2b93fae77424d93f889705c3">mi_heap_calloc_aligned</a> (<a class="el" href="group__heap.html#ga34a47cde5a5b38c29f1aa3c5e76943c2">mi_heap_t</a> *heap, size_t count, size_t size, size_t alignment)</td></tr>
-<tr class="separator:ga4af03a6e2b93fae77424d93f889705c3"><td class="memSeparator" colspan="2">&#160;</td></tr>
-<tr class="memitem:ga08ca6419a5c057a4d965868998eef487"><td class="memItemLeft" align="right" valign="top">void *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__heap.html#ga08ca6419a5c057a4d965868998eef487">mi_heap_calloc_aligned_at</a> (<a class="el" href="group__heap.html#ga34a47cde5a5b38c29f1aa3c5e76943c2">mi_heap_t</a> *heap, size_t count, size_t size, size_t alignment, size_t offset)</td></tr>
-<tr class="separator:ga08ca6419a5c057a4d965868998eef487"><td class="memSeparator" colspan="2">&#160;</td></tr>
-<tr class="memitem:gafc603b696bd14cae6da28658f950d98c"><td class="memItemLeft" align="right" valign="top">void *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__heap.html#gafc603b696bd14cae6da28658f950d98c">mi_heap_realloc_aligned</a> (<a class="el" href="group__heap.html#ga34a47cde5a5b38c29f1aa3c5e76943c2">mi_heap_t</a> *heap, void *p, size_t newsize, size_t alignment)</td></tr>
-<tr class="separator:gafc603b696bd14cae6da28658f950d98c"><td class="memSeparator" colspan="2">&#160;</td></tr>
-<tr class="memitem:gaf96c788a1bf553fe2d371de9365e047c"><td class="memItemLeft" align="right" valign="top">void *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__heap.html#gaf96c788a1bf553fe2d371de9365e047c">mi_heap_realloc_aligned_at</a> (<a class="el" href="group__heap.html#ga34a47cde5a5b38c29f1aa3c5e76943c2">mi_heap_t</a> *heap, void *p, size_t newsize, size_t alignment, size_t offset)</td></tr>
-<tr class="separator:gaf96c788a1bf553fe2d371de9365e047c"><td class="memSeparator" colspan="2">&#160;</td></tr>
+<tr class="memitem:gab374e206c7034e0d899fb934e4f4a863" id="r_gab374e206c7034e0d899fb934e4f4a863"><td class="memItemLeft" align="right" valign="top">void *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="#gab374e206c7034e0d899fb934e4f4a863">mi_heap_malloc</a> (<a class="el" href="#ga34a47cde5a5b38c29f1aa3c5e76943c2">mi_heap_t</a> *heap, size_t size)</td></tr>
+<tr class="memdesc:gab374e206c7034e0d899fb934e4f4a863"><td class="mdescLeft">&#160;</td><td class="mdescRight">Allocate in a specific heap.  <br /></td></tr>
+<tr class="separator:gab374e206c7034e0d899fb934e4f4a863"><td class="memSeparator" colspan="2">&#160;</td></tr>
+<tr class="memitem:ga012c5c8abe22b10043de39ff95909541" id="r_ga012c5c8abe22b10043de39ff95909541"><td class="memItemLeft" align="right" valign="top">void *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="#ga012c5c8abe22b10043de39ff95909541">mi_heap_malloc_small</a> (<a class="el" href="#ga34a47cde5a5b38c29f1aa3c5e76943c2">mi_heap_t</a> *heap, size_t size)</td></tr>
+<tr class="memdesc:ga012c5c8abe22b10043de39ff95909541"><td class="mdescLeft">&#160;</td><td class="mdescRight">Allocate a small object in a specific heap.  <br /></td></tr>
+<tr class="separator:ga012c5c8abe22b10043de39ff95909541"><td class="memSeparator" colspan="2">&#160;</td></tr>
+<tr class="memitem:gabebc796399619d964d8db77aa835e8c1" id="r_gabebc796399619d964d8db77aa835e8c1"><td class="memItemLeft" align="right" valign="top">void *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="#gabebc796399619d964d8db77aa835e8c1">mi_heap_zalloc</a> (<a class="el" href="#ga34a47cde5a5b38c29f1aa3c5e76943c2">mi_heap_t</a> *heap, size_t size)</td></tr>
+<tr class="memdesc:gabebc796399619d964d8db77aa835e8c1"><td class="mdescLeft">&#160;</td><td class="mdescRight">Allocate zero-initialized in a specific heap.  <br /></td></tr>
+<tr class="separator:gabebc796399619d964d8db77aa835e8c1"><td class="memSeparator" colspan="2">&#160;</td></tr>
+<tr class="memitem:gac0098aaf231d3e9586c73136d5df95da" id="r_gac0098aaf231d3e9586c73136d5df95da"><td class="memItemLeft" align="right" valign="top">void *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="#gac0098aaf231d3e9586c73136d5df95da">mi_heap_calloc</a> (<a class="el" href="#ga34a47cde5a5b38c29f1aa3c5e76943c2">mi_heap_t</a> *heap, size_t count, size_t size)</td></tr>
+<tr class="memdesc:gac0098aaf231d3e9586c73136d5df95da"><td class="mdescLeft">&#160;</td><td class="mdescRight">Allocate <em class="arg">count</em> zero-initialized elements in a specific heap.  <br /></td></tr>
+<tr class="separator:gac0098aaf231d3e9586c73136d5df95da"><td class="memSeparator" colspan="2">&#160;</td></tr>
+<tr class="memitem:gab0f755c0b21c387fe8e9024200faa372" id="r_gab0f755c0b21c387fe8e9024200faa372"><td class="memItemLeft" align="right" valign="top">void *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="#gab0f755c0b21c387fe8e9024200faa372">mi_heap_mallocn</a> (<a class="el" href="#ga34a47cde5a5b38c29f1aa3c5e76943c2">mi_heap_t</a> *heap, size_t count, size_t size)</td></tr>
+<tr class="memdesc:gab0f755c0b21c387fe8e9024200faa372"><td class="mdescLeft">&#160;</td><td class="mdescRight">Allocate <em class="arg">count</em> elements in a specific heap.  <br /></td></tr>
+<tr class="separator:gab0f755c0b21c387fe8e9024200faa372"><td class="memSeparator" colspan="2">&#160;</td></tr>
+<tr class="memitem:ga5754e09ccc51dd6bc73885bb6ea21b7a" id="r_ga5754e09ccc51dd6bc73885bb6ea21b7a"><td class="memItemLeft" align="right" valign="top">char *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="#ga5754e09ccc51dd6bc73885bb6ea21b7a">mi_heap_strdup</a> (<a class="el" href="#ga34a47cde5a5b38c29f1aa3c5e76943c2">mi_heap_t</a> *heap, const char *s)</td></tr>
+<tr class="memdesc:ga5754e09ccc51dd6bc73885bb6ea21b7a"><td class="mdescLeft">&#160;</td><td class="mdescRight">Duplicate a string in a specific heap.  <br /></td></tr>
+<tr class="separator:ga5754e09ccc51dd6bc73885bb6ea21b7a"><td class="memSeparator" colspan="2">&#160;</td></tr>
+<tr class="memitem:gad224df78f1fbee942df8adf023e12cf3" id="r_gad224df78f1fbee942df8adf023e12cf3"><td class="memItemLeft" align="right" valign="top">char *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="#gad224df78f1fbee942df8adf023e12cf3">mi_heap_strndup</a> (<a class="el" href="#ga34a47cde5a5b38c29f1aa3c5e76943c2">mi_heap_t</a> *heap, const char *s, size_t n)</td></tr>
+<tr class="memdesc:gad224df78f1fbee942df8adf023e12cf3"><td class="mdescLeft">&#160;</td><td class="mdescRight">Duplicate a string of at most length <em class="arg">n</em> in a specific heap.  <br /></td></tr>
+<tr class="separator:gad224df78f1fbee942df8adf023e12cf3"><td class="memSeparator" colspan="2">&#160;</td></tr>
+<tr class="memitem:ga55545a3ec6da29c5b4f62e540ecac1e2" id="r_ga55545a3ec6da29c5b4f62e540ecac1e2"><td class="memItemLeft" align="right" valign="top">char *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="#ga55545a3ec6da29c5b4f62e540ecac1e2">mi_heap_realpath</a> (<a class="el" href="#ga34a47cde5a5b38c29f1aa3c5e76943c2">mi_heap_t</a> *heap, const char *fname, char *resolved_name)</td></tr>
+<tr class="memdesc:ga55545a3ec6da29c5b4f62e540ecac1e2"><td class="mdescLeft">&#160;</td><td class="mdescRight">Resolve a file path name using a specific <em class="arg">heap</em> to allocate the result.  <br /></td></tr>
+<tr class="separator:ga55545a3ec6da29c5b4f62e540ecac1e2"><td class="memSeparator" colspan="2">&#160;</td></tr>
+<tr class="memitem:gac5252d6a2e510bd349e4fcb452e6a93a" id="r_gac5252d6a2e510bd349e4fcb452e6a93a"><td class="memItemLeft" align="right" valign="top">void *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="#gac5252d6a2e510bd349e4fcb452e6a93a">mi_heap_realloc</a> (<a class="el" href="#ga34a47cde5a5b38c29f1aa3c5e76943c2">mi_heap_t</a> *heap, void *p, size_t newsize)</td></tr>
+<tr class="separator:gac5252d6a2e510bd349e4fcb452e6a93a"><td class="memSeparator" colspan="2">&#160;</td></tr>
+<tr class="memitem:gaccf7bfe10ce510a000d3547d9cf7fa29" id="r_gaccf7bfe10ce510a000d3547d9cf7fa29"><td class="memItemLeft" align="right" valign="top">void *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="#gaccf7bfe10ce510a000d3547d9cf7fa29">mi_heap_reallocn</a> (<a class="el" href="#ga34a47cde5a5b38c29f1aa3c5e76943c2">mi_heap_t</a> *heap, void *p, size_t count, size_t size)</td></tr>
+<tr class="separator:gaccf7bfe10ce510a000d3547d9cf7fa29"><td class="memSeparator" colspan="2">&#160;</td></tr>
+<tr class="memitem:gae7cd171425bee04c683c65a3701f0b4a" id="r_gae7cd171425bee04c683c65a3701f0b4a"><td class="memItemLeft" align="right" valign="top">void *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="#gae7cd171425bee04c683c65a3701f0b4a">mi_heap_reallocf</a> (<a class="el" href="#ga34a47cde5a5b38c29f1aa3c5e76943c2">mi_heap_t</a> *heap, void *p, size_t newsize)</td></tr>
+<tr class="separator:gae7cd171425bee04c683c65a3701f0b4a"><td class="memSeparator" colspan="2">&#160;</td></tr>
+<tr class="memitem:ga33f4f05b7fea7af2113c62a4bf882cc5" id="r_ga33f4f05b7fea7af2113c62a4bf882cc5"><td class="memItemLeft" align="right" valign="top">void *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="#ga33f4f05b7fea7af2113c62a4bf882cc5">mi_heap_malloc_aligned</a> (<a class="el" href="#ga34a47cde5a5b38c29f1aa3c5e76943c2">mi_heap_t</a> *heap, size_t size, size_t alignment)</td></tr>
+<tr class="separator:ga33f4f05b7fea7af2113c62a4bf882cc5"><td class="memSeparator" colspan="2">&#160;</td></tr>
+<tr class="memitem:gae7ffc045c3996497a7f3a5f6fe7b8aaa" id="r_gae7ffc045c3996497a7f3a5f6fe7b8aaa"><td class="memItemLeft" align="right" valign="top">void *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="#gae7ffc045c3996497a7f3a5f6fe7b8aaa">mi_heap_malloc_aligned_at</a> (<a class="el" href="#ga34a47cde5a5b38c29f1aa3c5e76943c2">mi_heap_t</a> *heap, size_t size, size_t alignment, size_t offset)</td></tr>
+<tr class="separator:gae7ffc045c3996497a7f3a5f6fe7b8aaa"><td class="memSeparator" colspan="2">&#160;</td></tr>
+<tr class="memitem:ga6466bde8b5712aa34e081a8317f9f471" id="r_ga6466bde8b5712aa34e081a8317f9f471"><td class="memItemLeft" align="right" valign="top">void *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="#ga6466bde8b5712aa34e081a8317f9f471">mi_heap_zalloc_aligned</a> (<a class="el" href="#ga34a47cde5a5b38c29f1aa3c5e76943c2">mi_heap_t</a> *heap, size_t size, size_t alignment)</td></tr>
+<tr class="separator:ga6466bde8b5712aa34e081a8317f9f471"><td class="memSeparator" colspan="2">&#160;</td></tr>
+<tr class="memitem:ga484e3d01cd174f78c7e53370e5a7c819" id="r_ga484e3d01cd174f78c7e53370e5a7c819"><td class="memItemLeft" align="right" valign="top">void *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="#ga484e3d01cd174f78c7e53370e5a7c819">mi_heap_zalloc_aligned_at</a> (<a class="el" href="#ga34a47cde5a5b38c29f1aa3c5e76943c2">mi_heap_t</a> *heap, size_t size, size_t alignment, size_t offset)</td></tr>
+<tr class="separator:ga484e3d01cd174f78c7e53370e5a7c819"><td class="memSeparator" colspan="2">&#160;</td></tr>
+<tr class="memitem:gacafcc26df827c7a7de5e850217566108" id="r_gacafcc26df827c7a7de5e850217566108"><td class="memItemLeft" align="right" valign="top">void *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="#gacafcc26df827c7a7de5e850217566108">mi_heap_calloc_aligned</a> (<a class="el" href="#ga34a47cde5a5b38c29f1aa3c5e76943c2">mi_heap_t</a> *heap, size_t count, size_t size, size_t alignment)</td></tr>
+<tr class="separator:gacafcc26df827c7a7de5e850217566108"><td class="memSeparator" colspan="2">&#160;</td></tr>
+<tr class="memitem:gaa42ec2079989c4374f2c331d9b35f4e4" id="r_gaa42ec2079989c4374f2c331d9b35f4e4"><td class="memItemLeft" align="right" valign="top">void *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="#gaa42ec2079989c4374f2c331d9b35f4e4">mi_heap_calloc_aligned_at</a> (<a class="el" href="#ga34a47cde5a5b38c29f1aa3c5e76943c2">mi_heap_t</a> *heap, size_t count, size_t size, size_t alignment, size_t offset)</td></tr>
+<tr class="separator:gaa42ec2079989c4374f2c331d9b35f4e4"><td class="memSeparator" colspan="2">&#160;</td></tr>
+<tr class="memitem:gaccf8c249872f30bf1c2493a09197d734" id="r_gaccf8c249872f30bf1c2493a09197d734"><td class="memItemLeft" align="right" valign="top">void *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="#gaccf8c249872f30bf1c2493a09197d734">mi_heap_realloc_aligned</a> (<a class="el" href="#ga34a47cde5a5b38c29f1aa3c5e76943c2">mi_heap_t</a> *heap, void *p, size_t newsize, size_t alignment)</td></tr>
+<tr class="separator:gaccf8c249872f30bf1c2493a09197d734"><td class="memSeparator" colspan="2">&#160;</td></tr>
+<tr class="memitem:ga6df988a7219d5707f010d5f3eb0dc3f5" id="r_ga6df988a7219d5707f010d5f3eb0dc3f5"><td class="memItemLeft" align="right" valign="top">void *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="#ga6df988a7219d5707f010d5f3eb0dc3f5">mi_heap_realloc_aligned_at</a> (<a class="el" href="#ga34a47cde5a5b38c29f1aa3c5e76943c2">mi_heap_t</a> *heap, void *p, size_t newsize, size_t alignment, size_t offset)</td></tr>
+<tr class="separator:ga6df988a7219d5707f010d5f3eb0dc3f5"><td class="memSeparator" colspan="2">&#160;</td></tr>
 </table>
 <a name="details" id="details"></a><h2 class="groupheader">Detailed Description</h2>
 <p>First-class heaps that can be destroyed in one go. </p>
 <h2 class="groupheader">Typedef Documentation</h2>
-<a id="ga34a47cde5a5b38c29f1aa3c5e76943c2"></a>
-<h2 class="memtitle"><span class="permalink"><a href="#ga34a47cde5a5b38c29f1aa3c5e76943c2">&#9670;&nbsp;</a></span>mi_heap_t</h2>
+<a id="ga34a47cde5a5b38c29f1aa3c5e76943c2" name="ga34a47cde5a5b38c29f1aa3c5e76943c2"></a>
+<h2 class="memtitle"><span class="permalink"><a href="#ga34a47cde5a5b38c29f1aa3c5e76943c2">&#9670;&#160;</a></span>mi_heap_t</h2>
 
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname">typedef struct mi_heap_s <a class="el" href="group__heap.html#ga34a47cde5a5b38c29f1aa3c5e76943c2">mi_heap_t</a></td>
+          <td class="memname">typedef struct mi_heap_s <a class="el" href="#ga34a47cde5a5b38c29f1aa3c5e76943c2">mi_heap_t</a></td>
         </tr>
       </table>
 </div><div class="memdoc">
@@ -202,131 +211,104 @@ <h2 class="memtitle"><span class="permalink"><a href="#ga34a47cde5a5b38c29f1aa3c
 </div>
 </div>
 <h2 class="groupheader">Function Documentation</h2>
-<a id="gaa6702b3c48e9e53e50e81b36f5011d55"></a>
-<h2 class="memtitle"><span class="permalink"><a href="#gaa6702b3c48e9e53e50e81b36f5011d55">&#9670;&nbsp;</a></span>mi_heap_calloc()</h2>
+<a id="gac0098aaf231d3e9586c73136d5df95da" name="gac0098aaf231d3e9586c73136d5df95da"></a>
+<h2 class="memtitle"><span class="permalink"><a href="#gac0098aaf231d3e9586c73136d5df95da">&#9670;&#160;</a></span>mi_heap_calloc()</h2>
 
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname">void* mi_heap_calloc </td>
+          <td class="memname">void * mi_heap_calloc </td>
           <td>(</td>
-          <td class="paramtype"><a class="el" href="group__heap.html#ga34a47cde5a5b38c29f1aa3c5e76943c2">mi_heap_t</a> *&#160;</td>
-          <td class="paramname"><em>heap</em>, </td>
+          <td class="paramtype"><a class="el" href="#ga34a47cde5a5b38c29f1aa3c5e76943c2">mi_heap_t</a> *</td>          <td class="paramname"><span class="paramname"><em>heap</em></span>, </td>
         </tr>
         <tr>
           <td class="paramkey"></td>
           <td></td>
-          <td class="paramtype">size_t&#160;</td>
-          <td class="paramname"><em>count</em>, </td>
+          <td class="paramtype">size_t</td>          <td class="paramname"><span class="paramname"><em>count</em></span>, </td>
         </tr>
         <tr>
           <td class="paramkey"></td>
           <td></td>
-          <td class="paramtype">size_t&#160;</td>
-          <td class="paramname"><em>size</em>&#160;</td>
-        </tr>
-        <tr>
-          <td></td>
-          <td>)</td>
-          <td></td><td></td>
+          <td class="paramtype">size_t</td>          <td class="paramname"><span class="paramname"><em>size</em></span>&#160;)</td>
         </tr>
       </table>
 </div><div class="memdoc">
 
-<p>Allocate <em>count</em> zero-initialized elements in a specific heap. </p>
-<dl class="section see"><dt>See also</dt><dd><a class="el" href="group__malloc.html#ga97fedb4f7107c592fd7f0f0a8949a57d" title="Allocate zero-initialized count elements of size bytes.">mi_calloc()</a> </dd></dl>
+<p>Allocate <em class="arg">count</em> zero-initialized elements in a specific heap. </p>
+<dl class="section see"><dt>See also</dt><dd><a class="el" href="group__malloc.html#ga6686568014b54d1e6c7ac64a076e4f56" title="Allocate zero-initialized count elements of size bytes.">mi_calloc()</a> </dd></dl>
 
 </div>
 </div>
-<a id="ga4af03a6e2b93fae77424d93f889705c3"></a>
-<h2 class="memtitle"><span class="permalink"><a href="#ga4af03a6e2b93fae77424d93f889705c3">&#9670;&nbsp;</a></span>mi_heap_calloc_aligned()</h2>
+<a id="gacafcc26df827c7a7de5e850217566108" name="gacafcc26df827c7a7de5e850217566108"></a>
+<h2 class="memtitle"><span class="permalink"><a href="#gacafcc26df827c7a7de5e850217566108">&#9670;&#160;</a></span>mi_heap_calloc_aligned()</h2>
 
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname">void* mi_heap_calloc_aligned </td>
+          <td class="memname">void * mi_heap_calloc_aligned </td>
           <td>(</td>
-          <td class="paramtype"><a class="el" href="group__heap.html#ga34a47cde5a5b38c29f1aa3c5e76943c2">mi_heap_t</a> *&#160;</td>
-          <td class="paramname"><em>heap</em>, </td>
+          <td class="paramtype"><a class="el" href="#ga34a47cde5a5b38c29f1aa3c5e76943c2">mi_heap_t</a> *</td>          <td class="paramname"><span class="paramname"><em>heap</em></span>, </td>
         </tr>
         <tr>
           <td class="paramkey"></td>
           <td></td>
-          <td class="paramtype">size_t&#160;</td>
-          <td class="paramname"><em>count</em>, </td>
+          <td class="paramtype">size_t</td>          <td class="paramname"><span class="paramname"><em>count</em></span>, </td>
         </tr>
         <tr>
           <td class="paramkey"></td>
           <td></td>
-          <td class="paramtype">size_t&#160;</td>
-          <td class="paramname"><em>size</em>, </td>
+          <td class="paramtype">size_t</td>          <td class="paramname"><span class="paramname"><em>size</em></span>, </td>
         </tr>
         <tr>
           <td class="paramkey"></td>
           <td></td>
-          <td class="paramtype">size_t&#160;</td>
-          <td class="paramname"><em>alignment</em>&#160;</td>
-        </tr>
-        <tr>
-          <td></td>
-          <td>)</td>
-          <td></td><td></td>
+          <td class="paramtype">size_t</td>          <td class="paramname"><span class="paramname"><em>alignment</em></span>&#160;)</td>
         </tr>
       </table>
 </div><div class="memdoc">
 
 </div>
 </div>
-<a id="ga08ca6419a5c057a4d965868998eef487"></a>
-<h2 class="memtitle"><span class="permalink"><a href="#ga08ca6419a5c057a4d965868998eef487">&#9670;&nbsp;</a></span>mi_heap_calloc_aligned_at()</h2>
+<a id="gaa42ec2079989c4374f2c331d9b35f4e4" name="gaa42ec2079989c4374f2c331d9b35f4e4"></a>
+<h2 class="memtitle"><span class="permalink"><a href="#gaa42ec2079989c4374f2c331d9b35f4e4">&#9670;&#160;</a></span>mi_heap_calloc_aligned_at()</h2>
 
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname">void* mi_heap_calloc_aligned_at </td>
+          <td class="memname">void * mi_heap_calloc_aligned_at </td>
           <td>(</td>
-          <td class="paramtype"><a class="el" href="group__heap.html#ga34a47cde5a5b38c29f1aa3c5e76943c2">mi_heap_t</a> *&#160;</td>
-          <td class="paramname"><em>heap</em>, </td>
+          <td class="paramtype"><a class="el" href="#ga34a47cde5a5b38c29f1aa3c5e76943c2">mi_heap_t</a> *</td>          <td class="paramname"><span class="paramname"><em>heap</em></span>, </td>
         </tr>
         <tr>
           <td class="paramkey"></td>
           <td></td>
-          <td class="paramtype">size_t&#160;</td>
-          <td class="paramname"><em>count</em>, </td>
+          <td class="paramtype">size_t</td>          <td class="paramname"><span class="paramname"><em>count</em></span>, </td>
         </tr>
         <tr>
           <td class="paramkey"></td>
           <td></td>
-          <td class="paramtype">size_t&#160;</td>
-          <td class="paramname"><em>size</em>, </td>
+          <td class="paramtype">size_t</td>          <td class="paramname"><span class="paramname"><em>size</em></span>, </td>
         </tr>
         <tr>
           <td class="paramkey"></td>
           <td></td>
-          <td class="paramtype">size_t&#160;</td>
-          <td class="paramname"><em>alignment</em>, </td>
+          <td class="paramtype">size_t</td>          <td class="paramname"><span class="paramname"><em>alignment</em></span>, </td>
         </tr>
         <tr>
           <td class="paramkey"></td>
           <td></td>
-          <td class="paramtype">size_t&#160;</td>
-          <td class="paramname"><em>offset</em>&#160;</td>
-        </tr>
-        <tr>
-          <td></td>
-          <td>)</td>
-          <td></td><td></td>
+          <td class="paramtype">size_t</td>          <td class="paramname"><span class="paramname"><em>offset</em></span>&#160;)</td>
         </tr>
       </table>
 </div><div class="memdoc">
 
 </div>
 </div>
-<a id="ga7922f7495cde30b1984d0e6072419298"></a>
-<h2 class="memtitle"><span class="permalink"><a href="#ga7922f7495cde30b1984d0e6072419298">&#9670;&nbsp;</a></span>mi_heap_collect()</h2>
+<a id="ga7922f7495cde30b1984d0e6072419298" name="ga7922f7495cde30b1984d0e6072419298"></a>
+<h2 class="memtitle"><span class="permalink"><a href="#ga7922f7495cde30b1984d0e6072419298">&#9670;&#160;</a></span>mi_heap_collect()</h2>
 
 <div class="memitem">
 <div class="memproto">
@@ -334,19 +316,12 @@ <h2 class="memtitle"><span class="permalink"><a href="#ga7922f7495cde30b1984d0e6
         <tr>
           <td class="memname">void mi_heap_collect </td>
           <td>(</td>
-          <td class="paramtype"><a class="el" href="group__heap.html#ga34a47cde5a5b38c29f1aa3c5e76943c2">mi_heap_t</a> *&#160;</td>
-          <td class="paramname"><em>heap</em>, </td>
+          <td class="paramtype"><a class="el" href="#ga34a47cde5a5b38c29f1aa3c5e76943c2">mi_heap_t</a> *</td>          <td class="paramname"><span class="paramname"><em>heap</em></span>, </td>
         </tr>
         <tr>
           <td class="paramkey"></td>
           <td></td>
-          <td class="paramtype">bool&#160;</td>
-          <td class="paramname"><em>force</em>&#160;</td>
-        </tr>
-        <tr>
-          <td></td>
-          <td>)</td>
-          <td></td><td></td>
+          <td class="paramtype">bool</td>          <td class="paramname"><span class="paramname"><em>force</em></span>&#160;)</td>
         </tr>
       </table>
 </div><div class="memdoc">
@@ -355,8 +330,8 @@ <h2 class="memtitle"><span class="permalink"><a href="#ga7922f7495cde30b1984d0e6
 
 </div>
 </div>
-<a id="ga2ab1af8d438819b55319c7ef51d1e409"></a>
-<h2 class="memtitle"><span class="permalink"><a href="#ga2ab1af8d438819b55319c7ef51d1e409">&#9670;&nbsp;</a></span>mi_heap_delete()</h2>
+<a id="ga2ab1af8d438819b55319c7ef51d1e409" name="ga2ab1af8d438819b55319c7ef51d1e409"></a>
+<h2 class="memtitle"><span class="permalink"><a href="#ga2ab1af8d438819b55319c7ef51d1e409">&#9670;&#160;</a></span>mi_heap_delete()</h2>
 
 <div class="memitem">
 <div class="memproto">
@@ -364,21 +339,20 @@ <h2 class="memtitle"><span class="permalink"><a href="#ga2ab1af8d438819b55319c7e
         <tr>
           <td class="memname">void mi_heap_delete </td>
           <td>(</td>
-          <td class="paramtype"><a class="el" href="group__heap.html#ga34a47cde5a5b38c29f1aa3c5e76943c2">mi_heap_t</a> *&#160;</td>
-          <td class="paramname"><em>heap</em></td><td>)</td>
+          <td class="paramtype"><a class="el" href="#ga34a47cde5a5b38c29f1aa3c5e76943c2">mi_heap_t</a> *</td>          <td class="paramname"><span class="paramname"><em>heap</em></span></td><td>)</td>
           <td></td>
         </tr>
       </table>
 </div><div class="memdoc">
 
 <p>Delete a previously allocated heap. </p>
-<p>This will release resources and migrate any still allocated blocks in this heap (efficienty) to the default heap.</p>
-<p>If <em>heap</em> is the default heap, the default heap is set to the backing heap. </p>
+<p>This will release resources and migrate any still allocated blocks in this heap (efficiently) to the default heap.</p>
+<p>If <em class="arg">heap</em> is the default heap, the default heap is set to the backing heap. </p>
 
 </div>
 </div>
-<a id="ga9f9c0844edb9717f4feacd79116b8e0d"></a>
-<h2 class="memtitle"><span class="permalink"><a href="#ga9f9c0844edb9717f4feacd79116b8e0d">&#9670;&nbsp;</a></span>mi_heap_destroy()</h2>
+<a id="ga9f9c0844edb9717f4feacd79116b8e0d" name="ga9f9c0844edb9717f4feacd79116b8e0d"></a>
+<h2 class="memtitle"><span class="permalink"><a href="#ga9f9c0844edb9717f4feacd79116b8e0d">&#9670;&#160;</a></span>mi_heap_destroy()</h2>
 
 <div class="memitem">
 <div class="memproto">
@@ -386,8 +360,7 @@ <h2 class="memtitle"><span class="permalink"><a href="#ga9f9c0844edb9717f4feacd7
         <tr>
           <td class="memname">void mi_heap_destroy </td>
           <td>(</td>
-          <td class="paramtype"><a class="el" href="group__heap.html#ga34a47cde5a5b38c29f1aa3c5e76943c2">mi_heap_t</a> *&#160;</td>
-          <td class="paramname"><em>heap</em></td><td>)</td>
+          <td class="paramtype"><a class="el" href="#ga34a47cde5a5b38c29f1aa3c5e76943c2">mi_heap_t</a> *</td>          <td class="paramname"><span class="paramname"><em>heap</em></span></td><td>)</td>
           <td></td>
         </tr>
       </table>
@@ -395,20 +368,20 @@ <h2 class="memtitle"><span class="permalink"><a href="#ga9f9c0844edb9717f4feacd7
 
 <p>Destroy a heap, freeing all its still allocated blocks. </p>
 <p>Use with care as this will free all blocks still allocated in the heap. However, this can be a very efficient way to free all heap memory in one go.</p>
-<p>If <em>heap</em> is the default heap, the default heap is set to the backing heap. </p>
+<p>If <em class="arg">heap</em> is the default heap, the default heap is set to the backing heap. </p>
 
 </div>
 </div>
-<a id="ga5d03fbe062ffcf38f0f417fd968357fc"></a>
-<h2 class="memtitle"><span class="permalink"><a href="#ga5d03fbe062ffcf38f0f417fd968357fc">&#9670;&nbsp;</a></span>mi_heap_get_backing()</h2>
+<a id="gac6ac9f0e7be9ab4ff70acfc8dad1235a" name="gac6ac9f0e7be9ab4ff70acfc8dad1235a"></a>
+<h2 class="memtitle"><span class="permalink"><a href="#gac6ac9f0e7be9ab4ff70acfc8dad1235a">&#9670;&#160;</a></span>mi_heap_get_backing()</h2>
 
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname"><a class="el" href="group__heap.html#ga34a47cde5a5b38c29f1aa3c5e76943c2">mi_heap_t</a>* mi_heap_get_backing </td>
+          <td class="memname"><a class="el" href="#ga34a47cde5a5b38c29f1aa3c5e76943c2">mi_heap_t</a> * mi_heap_get_backing </td>
           <td>(</td>
-          <td class="paramname"></td><td>)</td>
+          <td class="paramname"><span class="paramname"><em></em></span></td><td>)</td>
           <td></td>
         </tr>
       </table>
@@ -419,209 +392,170 @@ <h2 class="memtitle"><span class="permalink"><a href="#ga5d03fbe062ffcf38f0f417f
 
 </div>
 </div>
-<a id="ga8db4cbb87314a989a9a187464d6b5e05"></a>
-<h2 class="memtitle"><span class="permalink"><a href="#ga8db4cbb87314a989a9a187464d6b5e05">&#9670;&nbsp;</a></span>mi_heap_get_default()</h2>
+<a id="ga14c667a6e2c5d28762d8cb7d4e057909" name="ga14c667a6e2c5d28762d8cb7d4e057909"></a>
+<h2 class="memtitle"><span class="permalink"><a href="#ga14c667a6e2c5d28762d8cb7d4e057909">&#9670;&#160;</a></span>mi_heap_get_default()</h2>
 
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname"><a class="el" href="group__heap.html#ga34a47cde5a5b38c29f1aa3c5e76943c2">mi_heap_t</a>* mi_heap_get_default </td>
+          <td class="memname"><a class="el" href="#ga34a47cde5a5b38c29f1aa3c5e76943c2">mi_heap_t</a> * mi_heap_get_default </td>
           <td>(</td>
-          <td class="paramname"></td><td>)</td>
+          <td class="paramname"><span class="paramname"><em></em></span></td><td>)</td>
           <td></td>
         </tr>
       </table>
 </div><div class="memdoc">
 
-<p>Get the default heap that is used for <a class="el" href="group__malloc.html#ga3406e8b168bc74c8637b11571a6da83a" title="Allocate size bytes.">mi_malloc()</a> et al. </p>
-<dl class="section return"><dt>Returns</dt><dd>The current default heap. </dd></dl>
+<p>Get the default heap that is used for <a class="el" href="group__malloc.html#gae1dd97b542420c87ae085e822b1229e8" title="Allocate size bytes.">mi_malloc()</a> et al. </p>
+<p>(for the current thread). </p><dl class="section return"><dt>Returns</dt><dd>The current default heap. </dd></dl>
 
 </div>
 </div>
-<a id="ga9cbed01e42c0647907295de92c3fa296"></a>
-<h2 class="memtitle"><span class="permalink"><a href="#ga9cbed01e42c0647907295de92c3fa296">&#9670;&nbsp;</a></span>mi_heap_malloc()</h2>
+<a id="gab374e206c7034e0d899fb934e4f4a863" name="gab374e206c7034e0d899fb934e4f4a863"></a>
+<h2 class="memtitle"><span class="permalink"><a href="#gab374e206c7034e0d899fb934e4f4a863">&#9670;&#160;</a></span>mi_heap_malloc()</h2>
 
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname">void* mi_heap_malloc </td>
+          <td class="memname">void * mi_heap_malloc </td>
           <td>(</td>
-          <td class="paramtype"><a class="el" href="group__heap.html#ga34a47cde5a5b38c29f1aa3c5e76943c2">mi_heap_t</a> *&#160;</td>
-          <td class="paramname"><em>heap</em>, </td>
+          <td class="paramtype"><a class="el" href="#ga34a47cde5a5b38c29f1aa3c5e76943c2">mi_heap_t</a> *</td>          <td class="paramname"><span class="paramname"><em>heap</em></span>, </td>
         </tr>
         <tr>
           <td class="paramkey"></td>
           <td></td>
-          <td class="paramtype">size_t&#160;</td>
-          <td class="paramname"><em>size</em>&#160;</td>
-        </tr>
-        <tr>
-          <td></td>
-          <td>)</td>
-          <td></td><td></td>
+          <td class="paramtype">size_t</td>          <td class="paramname"><span class="paramname"><em>size</em></span>&#160;)</td>
         </tr>
       </table>
 </div><div class="memdoc">
 
 <p>Allocate in a specific heap. </p>
-<dl class="section see"><dt>See also</dt><dd><a class="el" href="group__malloc.html#ga3406e8b168bc74c8637b11571a6da83a" title="Allocate size bytes.">mi_malloc()</a> </dd></dl>
+<dl class="section see"><dt>See also</dt><dd><a class="el" href="group__malloc.html#gae1dd97b542420c87ae085e822b1229e8" title="Allocate size bytes.">mi_malloc()</a> </dd></dl>
 
 </div>
 </div>
-<a id="gab5b87e1805306f70df38789fcfcf6653"></a>
-<h2 class="memtitle"><span class="permalink"><a href="#gab5b87e1805306f70df38789fcfcf6653">&#9670;&nbsp;</a></span>mi_heap_malloc_aligned()</h2>
+<a id="ga33f4f05b7fea7af2113c62a4bf882cc5" name="ga33f4f05b7fea7af2113c62a4bf882cc5"></a>
+<h2 class="memtitle"><span class="permalink"><a href="#ga33f4f05b7fea7af2113c62a4bf882cc5">&#9670;&#160;</a></span>mi_heap_malloc_aligned()</h2>
 
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname">void* mi_heap_malloc_aligned </td>
+          <td class="memname">void * mi_heap_malloc_aligned </td>
           <td>(</td>
-          <td class="paramtype"><a class="el" href="group__heap.html#ga34a47cde5a5b38c29f1aa3c5e76943c2">mi_heap_t</a> *&#160;</td>
-          <td class="paramname"><em>heap</em>, </td>
+          <td class="paramtype"><a class="el" href="#ga34a47cde5a5b38c29f1aa3c5e76943c2">mi_heap_t</a> *</td>          <td class="paramname"><span class="paramname"><em>heap</em></span>, </td>
         </tr>
         <tr>
           <td class="paramkey"></td>
           <td></td>
-          <td class="paramtype">size_t&#160;</td>
-          <td class="paramname"><em>size</em>, </td>
+          <td class="paramtype">size_t</td>          <td class="paramname"><span class="paramname"><em>size</em></span>, </td>
         </tr>
         <tr>
           <td class="paramkey"></td>
           <td></td>
-          <td class="paramtype">size_t&#160;</td>
-          <td class="paramname"><em>alignment</em>&#160;</td>
-        </tr>
-        <tr>
-          <td></td>
-          <td>)</td>
-          <td></td><td></td>
+          <td class="paramtype">size_t</td>          <td class="paramname"><span class="paramname"><em>alignment</em></span>&#160;)</td>
         </tr>
       </table>
 </div><div class="memdoc">
 
 </div>
 </div>
-<a id="ga23acd7680fb0976dde3783254c6c874b"></a>
-<h2 class="memtitle"><span class="permalink"><a href="#ga23acd7680fb0976dde3783254c6c874b">&#9670;&nbsp;</a></span>mi_heap_malloc_aligned_at()</h2>
+<a id="gae7ffc045c3996497a7f3a5f6fe7b8aaa" name="gae7ffc045c3996497a7f3a5f6fe7b8aaa"></a>
+<h2 class="memtitle"><span class="permalink"><a href="#gae7ffc045c3996497a7f3a5f6fe7b8aaa">&#9670;&#160;</a></span>mi_heap_malloc_aligned_at()</h2>
 
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname">void* mi_heap_malloc_aligned_at </td>
+          <td class="memname">void * mi_heap_malloc_aligned_at </td>
           <td>(</td>
-          <td class="paramtype"><a class="el" href="group__heap.html#ga34a47cde5a5b38c29f1aa3c5e76943c2">mi_heap_t</a> *&#160;</td>
-          <td class="paramname"><em>heap</em>, </td>
+          <td class="paramtype"><a class="el" href="#ga34a47cde5a5b38c29f1aa3c5e76943c2">mi_heap_t</a> *</td>          <td class="paramname"><span class="paramname"><em>heap</em></span>, </td>
         </tr>
         <tr>
           <td class="paramkey"></td>
           <td></td>
-          <td class="paramtype">size_t&#160;</td>
-          <td class="paramname"><em>size</em>, </td>
+          <td class="paramtype">size_t</td>          <td class="paramname"><span class="paramname"><em>size</em></span>, </td>
         </tr>
         <tr>
           <td class="paramkey"></td>
           <td></td>
-          <td class="paramtype">size_t&#160;</td>
-          <td class="paramname"><em>alignment</em>, </td>
+          <td class="paramtype">size_t</td>          <td class="paramname"><span class="paramname"><em>alignment</em></span>, </td>
         </tr>
         <tr>
           <td class="paramkey"></td>
           <td></td>
-          <td class="paramtype">size_t&#160;</td>
-          <td class="paramname"><em>offset</em>&#160;</td>
-        </tr>
-        <tr>
-          <td></td>
-          <td>)</td>
-          <td></td><td></td>
+          <td class="paramtype">size_t</td>          <td class="paramname"><span class="paramname"><em>offset</em></span>&#160;)</td>
         </tr>
       </table>
 </div><div class="memdoc">
 
 </div>
 </div>
-<a id="gaa1a1c7a1f4da6826b5a25b70ef878368"></a>
-<h2 class="memtitle"><span class="permalink"><a href="#gaa1a1c7a1f4da6826b5a25b70ef878368">&#9670;&nbsp;</a></span>mi_heap_malloc_small()</h2>
+<a id="ga012c5c8abe22b10043de39ff95909541" name="ga012c5c8abe22b10043de39ff95909541"></a>
+<h2 class="memtitle"><span class="permalink"><a href="#ga012c5c8abe22b10043de39ff95909541">&#9670;&#160;</a></span>mi_heap_malloc_small()</h2>
 
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname">void* mi_heap_malloc_small </td>
+          <td class="memname">void * mi_heap_malloc_small </td>
           <td>(</td>
-          <td class="paramtype"><a class="el" href="group__heap.html#ga34a47cde5a5b38c29f1aa3c5e76943c2">mi_heap_t</a> *&#160;</td>
-          <td class="paramname"><em>heap</em>, </td>
+          <td class="paramtype"><a class="el" href="#ga34a47cde5a5b38c29f1aa3c5e76943c2">mi_heap_t</a> *</td>          <td class="paramname"><span class="paramname"><em>heap</em></span>, </td>
         </tr>
         <tr>
           <td class="paramkey"></td>
           <td></td>
-          <td class="paramtype">size_t&#160;</td>
-          <td class="paramname"><em>size</em>&#160;</td>
-        </tr>
-        <tr>
-          <td></td>
-          <td>)</td>
-          <td></td><td></td>
+          <td class="paramtype">size_t</td>          <td class="paramname"><span class="paramname"><em>size</em></span>&#160;)</td>
         </tr>
       </table>
 </div><div class="memdoc">
 
 <p>Allocate a small object in a specific heap. </p>
-<p><em>size</em> must be smaller or equal to <a class="el" href="group__extended.html#ga1ea64283508718d9d645c38efc2f4305" title="Maximum size allowed for small allocations in mi_malloc_small and mi_zalloc_small (usually 128*sizeof...">MI_SMALL_SIZE_MAX()</a>. </p><dl class="section see"><dt>See also</dt><dd><a class="el" href="group__malloc.html#ga3406e8b168bc74c8637b11571a6da83a" title="Allocate size bytes.">mi_malloc()</a> </dd></dl>
+<p><em class="arg">size</em> must be smaller or equal to <a class="el" href="group__extended.html#ga1ea64283508718d9d645c38efc2f4305" title="Maximum size allowed for small allocations in mi_malloc_small and mi_zalloc_small (usually 128*sizeof...">MI_SMALL_SIZE_MAX()</a>. </p><dl class="section see"><dt>See also</dt><dd><a class="el" href="group__malloc.html#gae1dd97b542420c87ae085e822b1229e8" title="Allocate size bytes.">mi_malloc()</a> </dd></dl>
 
 </div>
 </div>
-<a id="ga851da6c43fe0b71c1376cee8aef90db0"></a>
-<h2 class="memtitle"><span class="permalink"><a href="#ga851da6c43fe0b71c1376cee8aef90db0">&#9670;&nbsp;</a></span>mi_heap_mallocn()</h2>
+<a id="gab0f755c0b21c387fe8e9024200faa372" name="gab0f755c0b21c387fe8e9024200faa372"></a>
+<h2 class="memtitle"><span class="permalink"><a href="#gab0f755c0b21c387fe8e9024200faa372">&#9670;&#160;</a></span>mi_heap_mallocn()</h2>
 
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname">void* mi_heap_mallocn </td>
+          <td class="memname">void * mi_heap_mallocn </td>
           <td>(</td>
-          <td class="paramtype"><a class="el" href="group__heap.html#ga34a47cde5a5b38c29f1aa3c5e76943c2">mi_heap_t</a> *&#160;</td>
-          <td class="paramname"><em>heap</em>, </td>
+          <td class="paramtype"><a class="el" href="#ga34a47cde5a5b38c29f1aa3c5e76943c2">mi_heap_t</a> *</td>          <td class="paramname"><span class="paramname"><em>heap</em></span>, </td>
         </tr>
         <tr>
           <td class="paramkey"></td>
           <td></td>
-          <td class="paramtype">size_t&#160;</td>
-          <td class="paramname"><em>count</em>, </td>
+          <td class="paramtype">size_t</td>          <td class="paramname"><span class="paramname"><em>count</em></span>, </td>
         </tr>
         <tr>
           <td class="paramkey"></td>
           <td></td>
-          <td class="paramtype">size_t&#160;</td>
-          <td class="paramname"><em>size</em>&#160;</td>
-        </tr>
-        <tr>
-          <td></td>
-          <td>)</td>
-          <td></td><td></td>
+          <td class="paramtype">size_t</td>          <td class="paramname"><span class="paramname"><em>size</em></span>&#160;)</td>
         </tr>
       </table>
 </div><div class="memdoc">
 
-<p>Allocate <em>count</em> elements in a specific heap. </p>
-<dl class="section see"><dt>See also</dt><dd><a class="el" href="group__malloc.html#ga0b05e2bf0f73e7401ae08597ff782ac6" title="Allocate count elements of size bytes.">mi_mallocn()</a> </dd></dl>
+<p>Allocate <em class="arg">count</em> elements in a specific heap. </p>
+<dl class="section see"><dt>See also</dt><dd><a class="el" href="group__malloc.html#ga61f46bade3db76ca24aaafedc40de7b6" title="Allocate count elements of size bytes.">mi_mallocn()</a> </dd></dl>
 
 </div>
 </div>
-<a id="ga766f672ba56f2fbfeb9d9dbb0b7f6b11"></a>
-<h2 class="memtitle"><span class="permalink"><a href="#ga766f672ba56f2fbfeb9d9dbb0b7f6b11">&#9670;&nbsp;</a></span>mi_heap_new()</h2>
+<a id="gaa718bb226ec0546ba6d1b6cb32179f3a" name="gaa718bb226ec0546ba6d1b6cb32179f3a"></a>
+<h2 class="memtitle"><span class="permalink"><a href="#gaa718bb226ec0546ba6d1b6cb32179f3a">&#9670;&#160;</a></span>mi_heap_new()</h2>
 
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname"><a class="el" href="group__heap.html#ga34a47cde5a5b38c29f1aa3c5e76943c2">mi_heap_t</a>* mi_heap_new </td>
+          <td class="memname"><a class="el" href="#ga34a47cde5a5b38c29f1aa3c5e76943c2">mi_heap_t</a> * mi_heap_new </td>
           <td>(</td>
-          <td class="paramname"></td><td>)</td>
+          <td class="paramname"><span class="paramname"><em></em></span></td><td>)</td>
           <td></td>
         </tr>
       </table>
@@ -631,254 +565,201 @@ <h2 class="memtitle"><span class="permalink"><a href="#ga766f672ba56f2fbfeb9d9db
 
 </div>
 </div>
-<a id="gaaef3395f66be48f37bdc8322509c5d81"></a>
-<h2 class="memtitle"><span class="permalink"><a href="#gaaef3395f66be48f37bdc8322509c5d81">&#9670;&nbsp;</a></span>mi_heap_realloc()</h2>
+<a id="gac5252d6a2e510bd349e4fcb452e6a93a" name="gac5252d6a2e510bd349e4fcb452e6a93a"></a>
+<h2 class="memtitle"><span class="permalink"><a href="#gac5252d6a2e510bd349e4fcb452e6a93a">&#9670;&#160;</a></span>mi_heap_realloc()</h2>
 
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname">void* mi_heap_realloc </td>
+          <td class="memname">void * mi_heap_realloc </td>
           <td>(</td>
-          <td class="paramtype"><a class="el" href="group__heap.html#ga34a47cde5a5b38c29f1aa3c5e76943c2">mi_heap_t</a> *&#160;</td>
-          <td class="paramname"><em>heap</em>, </td>
+          <td class="paramtype"><a class="el" href="#ga34a47cde5a5b38c29f1aa3c5e76943c2">mi_heap_t</a> *</td>          <td class="paramname"><span class="paramname"><em>heap</em></span>, </td>
         </tr>
         <tr>
           <td class="paramkey"></td>
           <td></td>
-          <td class="paramtype">void *&#160;</td>
-          <td class="paramname"><em>p</em>, </td>
+          <td class="paramtype">void *</td>          <td class="paramname"><span class="paramname"><em>p</em></span>, </td>
         </tr>
         <tr>
           <td class="paramkey"></td>
           <td></td>
-          <td class="paramtype">size_t&#160;</td>
-          <td class="paramname"><em>newsize</em>&#160;</td>
-        </tr>
-        <tr>
-          <td></td>
-          <td>)</td>
-          <td></td><td></td>
+          <td class="paramtype">size_t</td>          <td class="paramname"><span class="paramname"><em>newsize</em></span>&#160;)</td>
         </tr>
       </table>
 </div><div class="memdoc">
 
 </div>
 </div>
-<a id="gafc603b696bd14cae6da28658f950d98c"></a>
-<h2 class="memtitle"><span class="permalink"><a href="#gafc603b696bd14cae6da28658f950d98c">&#9670;&nbsp;</a></span>mi_heap_realloc_aligned()</h2>
+<a id="gaccf8c249872f30bf1c2493a09197d734" name="gaccf8c249872f30bf1c2493a09197d734"></a>
+<h2 class="memtitle"><span class="permalink"><a href="#gaccf8c249872f30bf1c2493a09197d734">&#9670;&#160;</a></span>mi_heap_realloc_aligned()</h2>
 
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname">void* mi_heap_realloc_aligned </td>
+          <td class="memname">void * mi_heap_realloc_aligned </td>
           <td>(</td>
-          <td class="paramtype"><a class="el" href="group__heap.html#ga34a47cde5a5b38c29f1aa3c5e76943c2">mi_heap_t</a> *&#160;</td>
-          <td class="paramname"><em>heap</em>, </td>
+          <td class="paramtype"><a class="el" href="#ga34a47cde5a5b38c29f1aa3c5e76943c2">mi_heap_t</a> *</td>          <td class="paramname"><span class="paramname"><em>heap</em></span>, </td>
         </tr>
         <tr>
           <td class="paramkey"></td>
           <td></td>
-          <td class="paramtype">void *&#160;</td>
-          <td class="paramname"><em>p</em>, </td>
+          <td class="paramtype">void *</td>          <td class="paramname"><span class="paramname"><em>p</em></span>, </td>
         </tr>
         <tr>
           <td class="paramkey"></td>
           <td></td>
-          <td class="paramtype">size_t&#160;</td>
-          <td class="paramname"><em>newsize</em>, </td>
+          <td class="paramtype">size_t</td>          <td class="paramname"><span class="paramname"><em>newsize</em></span>, </td>
         </tr>
         <tr>
           <td class="paramkey"></td>
           <td></td>
-          <td class="paramtype">size_t&#160;</td>
-          <td class="paramname"><em>alignment</em>&#160;</td>
-        </tr>
-        <tr>
-          <td></td>
-          <td>)</td>
-          <td></td><td></td>
+          <td class="paramtype">size_t</td>          <td class="paramname"><span class="paramname"><em>alignment</em></span>&#160;)</td>
         </tr>
       </table>
 </div><div class="memdoc">
 
 </div>
 </div>
-<a id="gaf96c788a1bf553fe2d371de9365e047c"></a>
-<h2 class="memtitle"><span class="permalink"><a href="#gaf96c788a1bf553fe2d371de9365e047c">&#9670;&nbsp;</a></span>mi_heap_realloc_aligned_at()</h2>
+<a id="ga6df988a7219d5707f010d5f3eb0dc3f5" name="ga6df988a7219d5707f010d5f3eb0dc3f5"></a>
+<h2 class="memtitle"><span class="permalink"><a href="#ga6df988a7219d5707f010d5f3eb0dc3f5">&#9670;&#160;</a></span>mi_heap_realloc_aligned_at()</h2>
 
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname">void* mi_heap_realloc_aligned_at </td>
+          <td class="memname">void * mi_heap_realloc_aligned_at </td>
           <td>(</td>
-          <td class="paramtype"><a class="el" href="group__heap.html#ga34a47cde5a5b38c29f1aa3c5e76943c2">mi_heap_t</a> *&#160;</td>
-          <td class="paramname"><em>heap</em>, </td>
+          <td class="paramtype"><a class="el" href="#ga34a47cde5a5b38c29f1aa3c5e76943c2">mi_heap_t</a> *</td>          <td class="paramname"><span class="paramname"><em>heap</em></span>, </td>
         </tr>
         <tr>
           <td class="paramkey"></td>
           <td></td>
-          <td class="paramtype">void *&#160;</td>
-          <td class="paramname"><em>p</em>, </td>
+          <td class="paramtype">void *</td>          <td class="paramname"><span class="paramname"><em>p</em></span>, </td>
         </tr>
         <tr>
           <td class="paramkey"></td>
           <td></td>
-          <td class="paramtype">size_t&#160;</td>
-          <td class="paramname"><em>newsize</em>, </td>
+          <td class="paramtype">size_t</td>          <td class="paramname"><span class="paramname"><em>newsize</em></span>, </td>
         </tr>
         <tr>
           <td class="paramkey"></td>
           <td></td>
-          <td class="paramtype">size_t&#160;</td>
-          <td class="paramname"><em>alignment</em>, </td>
+          <td class="paramtype">size_t</td>          <td class="paramname"><span class="paramname"><em>alignment</em></span>, </td>
         </tr>
         <tr>
           <td class="paramkey"></td>
           <td></td>
-          <td class="paramtype">size_t&#160;</td>
-          <td class="paramname"><em>offset</em>&#160;</td>
-        </tr>
-        <tr>
-          <td></td>
-          <td>)</td>
-          <td></td><td></td>
+          <td class="paramtype">size_t</td>          <td class="paramname"><span class="paramname"><em>offset</em></span>&#160;)</td>
         </tr>
       </table>
 </div><div class="memdoc">
 
 </div>
 </div>
-<a id="ga4a21070eb4e7cce018133c8d5f4b0527"></a>
-<h2 class="memtitle"><span class="permalink"><a href="#ga4a21070eb4e7cce018133c8d5f4b0527">&#9670;&nbsp;</a></span>mi_heap_reallocf()</h2>
+<a id="gae7cd171425bee04c683c65a3701f0b4a" name="gae7cd171425bee04c683c65a3701f0b4a"></a>
+<h2 class="memtitle"><span class="permalink"><a href="#gae7cd171425bee04c683c65a3701f0b4a">&#9670;&#160;</a></span>mi_heap_reallocf()</h2>
 
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname">void* mi_heap_reallocf </td>
+          <td class="memname">void * mi_heap_reallocf </td>
           <td>(</td>
-          <td class="paramtype"><a class="el" href="group__heap.html#ga34a47cde5a5b38c29f1aa3c5e76943c2">mi_heap_t</a> *&#160;</td>
-          <td class="paramname"><em>heap</em>, </td>
+          <td class="paramtype"><a class="el" href="#ga34a47cde5a5b38c29f1aa3c5e76943c2">mi_heap_t</a> *</td>          <td class="paramname"><span class="paramname"><em>heap</em></span>, </td>
         </tr>
         <tr>
           <td class="paramkey"></td>
           <td></td>
-          <td class="paramtype">void *&#160;</td>
-          <td class="paramname"><em>p</em>, </td>
+          <td class="paramtype">void *</td>          <td class="paramname"><span class="paramname"><em>p</em></span>, </td>
         </tr>
         <tr>
           <td class="paramkey"></td>
           <td></td>
-          <td class="paramtype">size_t&#160;</td>
-          <td class="paramname"><em>newsize</em>&#160;</td>
-        </tr>
-        <tr>
-          <td></td>
-          <td>)</td>
-          <td></td><td></td>
+          <td class="paramtype">size_t</td>          <td class="paramname"><span class="paramname"><em>newsize</em></span>&#160;)</td>
         </tr>
       </table>
 </div><div class="memdoc">
 
 </div>
 </div>
-<a id="gac74e94ad9b0c9b57c1c4d88b8825b7a8"></a>
-<h2 class="memtitle"><span class="permalink"><a href="#gac74e94ad9b0c9b57c1c4d88b8825b7a8">&#9670;&nbsp;</a></span>mi_heap_reallocn()</h2>
+<a id="gaccf7bfe10ce510a000d3547d9cf7fa29" name="gaccf7bfe10ce510a000d3547d9cf7fa29"></a>
+<h2 class="memtitle"><span class="permalink"><a href="#gaccf7bfe10ce510a000d3547d9cf7fa29">&#9670;&#160;</a></span>mi_heap_reallocn()</h2>
 
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname">void* mi_heap_reallocn </td>
+          <td class="memname">void * mi_heap_reallocn </td>
           <td>(</td>
-          <td class="paramtype"><a class="el" href="group__heap.html#ga34a47cde5a5b38c29f1aa3c5e76943c2">mi_heap_t</a> *&#160;</td>
-          <td class="paramname"><em>heap</em>, </td>
+          <td class="paramtype"><a class="el" href="#ga34a47cde5a5b38c29f1aa3c5e76943c2">mi_heap_t</a> *</td>          <td class="paramname"><span class="paramname"><em>heap</em></span>, </td>
         </tr>
         <tr>
           <td class="paramkey"></td>
           <td></td>
-          <td class="paramtype">void *&#160;</td>
-          <td class="paramname"><em>p</em>, </td>
+          <td class="paramtype">void *</td>          <td class="paramname"><span class="paramname"><em>p</em></span>, </td>
         </tr>
         <tr>
           <td class="paramkey"></td>
           <td></td>
-          <td class="paramtype">size_t&#160;</td>
-          <td class="paramname"><em>count</em>, </td>
+          <td class="paramtype">size_t</td>          <td class="paramname"><span class="paramname"><em>count</em></span>, </td>
         </tr>
         <tr>
           <td class="paramkey"></td>
           <td></td>
-          <td class="paramtype">size_t&#160;</td>
-          <td class="paramname"><em>size</em>&#160;</td>
-        </tr>
-        <tr>
-          <td></td>
-          <td>)</td>
-          <td></td><td></td>
+          <td class="paramtype">size_t</td>          <td class="paramname"><span class="paramname"><em>size</em></span>&#160;)</td>
         </tr>
       </table>
 </div><div class="memdoc">
 
 </div>
 </div>
-<a id="ga00e95ba1e01acac3cfd95bb7a357a6f0"></a>
-<h2 class="memtitle"><span class="permalink"><a href="#ga00e95ba1e01acac3cfd95bb7a357a6f0">&#9670;&nbsp;</a></span>mi_heap_realpath()</h2>
+<a id="ga55545a3ec6da29c5b4f62e540ecac1e2" name="ga55545a3ec6da29c5b4f62e540ecac1e2"></a>
+<h2 class="memtitle"><span class="permalink"><a href="#ga55545a3ec6da29c5b4f62e540ecac1e2">&#9670;&#160;</a></span>mi_heap_realpath()</h2>
 
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname">char* mi_heap_realpath </td>
+          <td class="memname">char * mi_heap_realpath </td>
           <td>(</td>
-          <td class="paramtype"><a class="el" href="group__heap.html#ga34a47cde5a5b38c29f1aa3c5e76943c2">mi_heap_t</a> *&#160;</td>
-          <td class="paramname"><em>heap</em>, </td>
+          <td class="paramtype"><a class="el" href="#ga34a47cde5a5b38c29f1aa3c5e76943c2">mi_heap_t</a> *</td>          <td class="paramname"><span class="paramname"><em>heap</em></span>, </td>
         </tr>
         <tr>
           <td class="paramkey"></td>
           <td></td>
-          <td class="paramtype">const char *&#160;</td>
-          <td class="paramname"><em>fname</em>, </td>
+          <td class="paramtype">const char *</td>          <td class="paramname"><span class="paramname"><em>fname</em></span>, </td>
         </tr>
         <tr>
           <td class="paramkey"></td>
           <td></td>
-          <td class="paramtype">char *&#160;</td>
-          <td class="paramname"><em>resolved_name</em>&#160;</td>
-        </tr>
-        <tr>
-          <td></td>
-          <td>)</td>
-          <td></td><td></td>
+          <td class="paramtype">char *</td>          <td class="paramname"><span class="paramname"><em>resolved_name</em></span>&#160;)</td>
         </tr>
       </table>
 </div><div class="memdoc">
 
-<p>Resolve a file path name using a specific <em>heap</em> to allocate the result. </p>
-<dl class="section see"><dt>See also</dt><dd><a class="el" href="group__malloc.html#ga08cec32dd5bbe7da91c78d19f1b5bebe" title="Resolve a file path name.">mi_realpath()</a> </dd></dl>
+<p>Resolve a file path name using a specific <em class="arg">heap</em> to allocate the result. </p>
+<dl class="section see"><dt>See also</dt><dd><a class="el" href="group__malloc.html#ga94c3afcc086e85d75a57e9f76b9b71dd" title="Resolve a file path name.">mi_realpath()</a> </dd></dl>
 
 </div>
 </div>
-<a id="gab8631ec88c8d26641b68b5d25dcd4422"></a>
-<h2 class="memtitle"><span class="permalink"><a href="#gab8631ec88c8d26641b68b5d25dcd4422">&#9670;&nbsp;</a></span>mi_heap_set_default()</h2>
+<a id="ga349b677dec7da5eacdbc7a385bd62a4a" name="ga349b677dec7da5eacdbc7a385bd62a4a"></a>
+<h2 class="memtitle"><span class="permalink"><a href="#ga349b677dec7da5eacdbc7a385bd62a4a">&#9670;&#160;</a></span>mi_heap_set_default()</h2>
 
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname"><a class="el" href="group__heap.html#ga34a47cde5a5b38c29f1aa3c5e76943c2">mi_heap_t</a>* mi_heap_set_default </td>
+          <td class="memname"><a class="el" href="#ga34a47cde5a5b38c29f1aa3c5e76943c2">mi_heap_t</a> * mi_heap_set_default </td>
           <td>(</td>
-          <td class="paramtype"><a class="el" href="group__heap.html#ga34a47cde5a5b38c29f1aa3c5e76943c2">mi_heap_t</a> *&#160;</td>
-          <td class="paramname"><em>heap</em></td><td>)</td>
+          <td class="paramtype"><a class="el" href="#ga34a47cde5a5b38c29f1aa3c5e76943c2">mi_heap_t</a> *</td>          <td class="paramname"><span class="paramname"><em>heap</em></span></td><td>)</td>
           <td></td>
         </tr>
       </table>
 </div><div class="memdoc">
 
-<p>Set the default heap to use for <a class="el" href="group__malloc.html#ga3406e8b168bc74c8637b11571a6da83a" title="Allocate size bytes.">mi_malloc()</a> et al. </p>
+<p>Set the default heap to use in the current thread for <a class="el" href="group__malloc.html#gae1dd97b542420c87ae085e822b1229e8" title="Allocate size bytes.">mi_malloc()</a> et al. </p>
 <dl class="params"><dt>Parameters</dt><dd>
   <table class="params">
     <tr><td class="paramname">heap</td><td>The new default heap. </td></tr>
@@ -889,173 +770,134 @@ <h2 class="memtitle"><span class="permalink"><a href="#gab8631ec88c8d26641b68b5d
 
 </div>
 </div>
-<a id="ga139d6b09dbf50c3c2523d0f4d1cfdeb5"></a>
-<h2 class="memtitle"><span class="permalink"><a href="#ga139d6b09dbf50c3c2523d0f4d1cfdeb5">&#9670;&nbsp;</a></span>mi_heap_strdup()</h2>
+<a id="ga5754e09ccc51dd6bc73885bb6ea21b7a" name="ga5754e09ccc51dd6bc73885bb6ea21b7a"></a>
+<h2 class="memtitle"><span class="permalink"><a href="#ga5754e09ccc51dd6bc73885bb6ea21b7a">&#9670;&#160;</a></span>mi_heap_strdup()</h2>
 
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname">char* mi_heap_strdup </td>
+          <td class="memname">char * mi_heap_strdup </td>
           <td>(</td>
-          <td class="paramtype"><a class="el" href="group__heap.html#ga34a47cde5a5b38c29f1aa3c5e76943c2">mi_heap_t</a> *&#160;</td>
-          <td class="paramname"><em>heap</em>, </td>
+          <td class="paramtype"><a class="el" href="#ga34a47cde5a5b38c29f1aa3c5e76943c2">mi_heap_t</a> *</td>          <td class="paramname"><span class="paramname"><em>heap</em></span>, </td>
         </tr>
         <tr>
           <td class="paramkey"></td>
           <td></td>
-          <td class="paramtype">const char *&#160;</td>
-          <td class="paramname"><em>s</em>&#160;</td>
-        </tr>
-        <tr>
-          <td></td>
-          <td>)</td>
-          <td></td><td></td>
+          <td class="paramtype">const char *</td>          <td class="paramname"><span class="paramname"><em>s</em></span>&#160;)</td>
         </tr>
       </table>
 </div><div class="memdoc">
 
 <p>Duplicate a string in a specific heap. </p>
-<dl class="section see"><dt>See also</dt><dd><a class="el" href="group__malloc.html#gac7cffe13f1f458ed16789488bf92b9b2" title="Allocate and duplicate a string.">mi_strdup()</a> </dd></dl>
+<dl class="section see"><dt>See also</dt><dd><a class="el" href="group__malloc.html#ga245ac90ebc2cfdd17de599e5fea59889" title="Allocate and duplicate a string.">mi_strdup()</a> </dd></dl>
 
 </div>
 </div>
-<a id="ga8e3dbd46650dd26573cf307a2c8f1f5a"></a>
-<h2 class="memtitle"><span class="permalink"><a href="#ga8e3dbd46650dd26573cf307a2c8f1f5a">&#9670;&nbsp;</a></span>mi_heap_strndup()</h2>
+<a id="gad224df78f1fbee942df8adf023e12cf3" name="gad224df78f1fbee942df8adf023e12cf3"></a>
+<h2 class="memtitle"><span class="permalink"><a href="#gad224df78f1fbee942df8adf023e12cf3">&#9670;&#160;</a></span>mi_heap_strndup()</h2>
 
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname">char* mi_heap_strndup </td>
+          <td class="memname">char * mi_heap_strndup </td>
           <td>(</td>
-          <td class="paramtype"><a class="el" href="group__heap.html#ga34a47cde5a5b38c29f1aa3c5e76943c2">mi_heap_t</a> *&#160;</td>
-          <td class="paramname"><em>heap</em>, </td>
+          <td class="paramtype"><a class="el" href="#ga34a47cde5a5b38c29f1aa3c5e76943c2">mi_heap_t</a> *</td>          <td class="paramname"><span class="paramname"><em>heap</em></span>, </td>
         </tr>
         <tr>
           <td class="paramkey"></td>
           <td></td>
-          <td class="paramtype">const char *&#160;</td>
-          <td class="paramname"><em>s</em>, </td>
+          <td class="paramtype">const char *</td>          <td class="paramname"><span class="paramname"><em>s</em></span>, </td>
         </tr>
         <tr>
           <td class="paramkey"></td>
           <td></td>
-          <td class="paramtype">size_t&#160;</td>
-          <td class="paramname"><em>n</em>&#160;</td>
-        </tr>
-        <tr>
-          <td></td>
-          <td>)</td>
-          <td></td><td></td>
+          <td class="paramtype">size_t</td>          <td class="paramname"><span class="paramname"><em>n</em></span>&#160;)</td>
         </tr>
       </table>
 </div><div class="memdoc">
 
-<p>Duplicate a string of at most length <em>n</em> in a specific heap. </p>
-<dl class="section see"><dt>See also</dt><dd><a class="el" href="group__malloc.html#gaaabf971c2571891433477e2d21a35266" title="Allocate and duplicate a string up to n bytes.">mi_strndup()</a> </dd></dl>
+<p>Duplicate a string of at most length <em class="arg">n</em> in a specific heap. </p>
+<dl class="section see"><dt>See also</dt><dd><a class="el" href="group__malloc.html#ga486d0d26b3b3794f6d1cdb41a9aed92d" title="Allocate and duplicate a string up to n bytes.">mi_strndup()</a> </dd></dl>
 
 </div>
 </div>
-<a id="ga903104592c8ed53417a3762da6241133"></a>
-<h2 class="memtitle"><span class="permalink"><a href="#ga903104592c8ed53417a3762da6241133">&#9670;&nbsp;</a></span>mi_heap_zalloc()</h2>
+<a id="gabebc796399619d964d8db77aa835e8c1" name="gabebc796399619d964d8db77aa835e8c1"></a>
+<h2 class="memtitle"><span class="permalink"><a href="#gabebc796399619d964d8db77aa835e8c1">&#9670;&#160;</a></span>mi_heap_zalloc()</h2>
 
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname">void* mi_heap_zalloc </td>
+          <td class="memname">void * mi_heap_zalloc </td>
           <td>(</td>
-          <td class="paramtype"><a class="el" href="group__heap.html#ga34a47cde5a5b38c29f1aa3c5e76943c2">mi_heap_t</a> *&#160;</td>
-          <td class="paramname"><em>heap</em>, </td>
+          <td class="paramtype"><a class="el" href="#ga34a47cde5a5b38c29f1aa3c5e76943c2">mi_heap_t</a> *</td>          <td class="paramname"><span class="paramname"><em>heap</em></span>, </td>
         </tr>
         <tr>
           <td class="paramkey"></td>
           <td></td>
-          <td class="paramtype">size_t&#160;</td>
-          <td class="paramname"><em>size</em>&#160;</td>
-        </tr>
-        <tr>
-          <td></td>
-          <td>)</td>
-          <td></td><td></td>
+          <td class="paramtype">size_t</td>          <td class="paramname"><span class="paramname"><em>size</em></span>&#160;)</td>
         </tr>
       </table>
 </div><div class="memdoc">
 
 <p>Allocate zero-initialized in a specific heap. </p>
-<dl class="section see"><dt>See also</dt><dd><a class="el" href="group__malloc.html#gafdd9d8bb2986e668ba9884f28af38000" title="Allocate zero-initialized size bytes.">mi_zalloc()</a> </dd></dl>
+<dl class="section see"><dt>See also</dt><dd><a class="el" href="group__malloc.html#gae6e38c4403247a7b40d80419e093bfb8" title="Allocate zero-initialized size bytes.">mi_zalloc()</a> </dd></dl>
 
 </div>
 </div>
-<a id="gaa450a59c6c7ae5fdbd1c2b80a8329ef0"></a>
-<h2 class="memtitle"><span class="permalink"><a href="#gaa450a59c6c7ae5fdbd1c2b80a8329ef0">&#9670;&nbsp;</a></span>mi_heap_zalloc_aligned()</h2>
+<a id="ga6466bde8b5712aa34e081a8317f9f471" name="ga6466bde8b5712aa34e081a8317f9f471"></a>
+<h2 class="memtitle"><span class="permalink"><a href="#ga6466bde8b5712aa34e081a8317f9f471">&#9670;&#160;</a></span>mi_heap_zalloc_aligned()</h2>
 
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname">void* mi_heap_zalloc_aligned </td>
+          <td class="memname">void * mi_heap_zalloc_aligned </td>
           <td>(</td>
-          <td class="paramtype"><a class="el" href="group__heap.html#ga34a47cde5a5b38c29f1aa3c5e76943c2">mi_heap_t</a> *&#160;</td>
-          <td class="paramname"><em>heap</em>, </td>
+          <td class="paramtype"><a class="el" href="#ga34a47cde5a5b38c29f1aa3c5e76943c2">mi_heap_t</a> *</td>          <td class="paramname"><span class="paramname"><em>heap</em></span>, </td>
         </tr>
         <tr>
           <td class="paramkey"></td>
           <td></td>
-          <td class="paramtype">size_t&#160;</td>
-          <td class="paramname"><em>size</em>, </td>
+          <td class="paramtype">size_t</td>          <td class="paramname"><span class="paramname"><em>size</em></span>, </td>
         </tr>
         <tr>
           <td class="paramkey"></td>
           <td></td>
-          <td class="paramtype">size_t&#160;</td>
-          <td class="paramname"><em>alignment</em>&#160;</td>
-        </tr>
-        <tr>
-          <td></td>
-          <td>)</td>
-          <td></td><td></td>
+          <td class="paramtype">size_t</td>          <td class="paramname"><span class="paramname"><em>alignment</em></span>&#160;)</td>
         </tr>
       </table>
 </div><div class="memdoc">
 
 </div>
 </div>
-<a id="ga45fb43a62776fbebbdf1edd99b527954"></a>
-<h2 class="memtitle"><span class="permalink"><a href="#ga45fb43a62776fbebbdf1edd99b527954">&#9670;&nbsp;</a></span>mi_heap_zalloc_aligned_at()</h2>
+<a id="ga484e3d01cd174f78c7e53370e5a7c819" name="ga484e3d01cd174f78c7e53370e5a7c819"></a>
+<h2 class="memtitle"><span class="permalink"><a href="#ga484e3d01cd174f78c7e53370e5a7c819">&#9670;&#160;</a></span>mi_heap_zalloc_aligned_at()</h2>
 
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname">void* mi_heap_zalloc_aligned_at </td>
+          <td class="memname">void * mi_heap_zalloc_aligned_at </td>
           <td>(</td>
-          <td class="paramtype"><a class="el" href="group__heap.html#ga34a47cde5a5b38c29f1aa3c5e76943c2">mi_heap_t</a> *&#160;</td>
-          <td class="paramname"><em>heap</em>, </td>
+          <td class="paramtype"><a class="el" href="#ga34a47cde5a5b38c29f1aa3c5e76943c2">mi_heap_t</a> *</td>          <td class="paramname"><span class="paramname"><em>heap</em></span>, </td>
         </tr>
         <tr>
           <td class="paramkey"></td>
           <td></td>
-          <td class="paramtype">size_t&#160;</td>
-          <td class="paramname"><em>size</em>, </td>
+          <td class="paramtype">size_t</td>          <td class="paramname"><span class="paramname"><em>size</em></span>, </td>
         </tr>
         <tr>
           <td class="paramkey"></td>
           <td></td>
-          <td class="paramtype">size_t&#160;</td>
-          <td class="paramname"><em>alignment</em>, </td>
+          <td class="paramtype">size_t</td>          <td class="paramname"><span class="paramname"><em>alignment</em></span>, </td>
         </tr>
         <tr>
           <td class="paramkey"></td>
           <td></td>
-          <td class="paramtype">size_t&#160;</td>
-          <td class="paramname"><em>offset</em>&#160;</td>
-        </tr>
-        <tr>
-          <td></td>
-          <td>)</td>
-          <td></td><td></td>
+          <td class="paramtype">size_t</td>          <td class="paramname"><span class="paramname"><em>offset</em></span>&#160;)</td>
         </tr>
       </table>
 </div><div class="memdoc">
@@ -1067,7 +909,7 @@ <h2 class="memtitle"><span class="permalink"><a href="#ga45fb43a62776fbebbdf1edd
 <!-- start footer part -->
 <div id="nav-path" class="navpath"><!-- id is needed for treeview function! -->
   <ul>
-    <li class="footer">Generated by <a href="https://www.doxygen.org/index.html"><img class="footer" src="doxygen.svg" width="104" height="31" alt="doxygen"/></a> 1.9.1 </li>
+    <li class="footer">Generated by <a href="https://www.doxygen.org/index.html"><img class="footer" src="doxygen.svg" width="104" height="31" alt="doxygen"/></a> 1.13.1 </li>
   </ul>
 </div>
 </body>
diff --git a/depends/mimalloc/docs/group__heap.js b/depends/mimalloc/docs/group__heap.js
index 13d13778865b..8b6118d56b34 100644
--- a/depends/mimalloc/docs/group__heap.js
+++ b/depends/mimalloc/docs/group__heap.js
@@ -1,30 +1,30 @@
 var group__heap =
 [
     [ "mi_heap_t", "group__heap.html#ga34a47cde5a5b38c29f1aa3c5e76943c2", null ],
-    [ "mi_heap_calloc", "group__heap.html#gaa6702b3c48e9e53e50e81b36f5011d55", null ],
-    [ "mi_heap_calloc_aligned", "group__heap.html#ga4af03a6e2b93fae77424d93f889705c3", null ],
-    [ "mi_heap_calloc_aligned_at", "group__heap.html#ga08ca6419a5c057a4d965868998eef487", null ],
+    [ "mi_heap_calloc", "group__heap.html#gac0098aaf231d3e9586c73136d5df95da", null ],
+    [ "mi_heap_calloc_aligned", "group__heap.html#gacafcc26df827c7a7de5e850217566108", null ],
+    [ "mi_heap_calloc_aligned_at", "group__heap.html#gaa42ec2079989c4374f2c331d9b35f4e4", null ],
     [ "mi_heap_collect", "group__heap.html#ga7922f7495cde30b1984d0e6072419298", null ],
     [ "mi_heap_delete", "group__heap.html#ga2ab1af8d438819b55319c7ef51d1e409", null ],
     [ "mi_heap_destroy", "group__heap.html#ga9f9c0844edb9717f4feacd79116b8e0d", null ],
-    [ "mi_heap_get_backing", "group__heap.html#ga5d03fbe062ffcf38f0f417fd968357fc", null ],
-    [ "mi_heap_get_default", "group__heap.html#ga8db4cbb87314a989a9a187464d6b5e05", null ],
-    [ "mi_heap_malloc", "group__heap.html#ga9cbed01e42c0647907295de92c3fa296", null ],
-    [ "mi_heap_malloc_aligned", "group__heap.html#gab5b87e1805306f70df38789fcfcf6653", null ],
-    [ "mi_heap_malloc_aligned_at", "group__heap.html#ga23acd7680fb0976dde3783254c6c874b", null ],
-    [ "mi_heap_malloc_small", "group__heap.html#gaa1a1c7a1f4da6826b5a25b70ef878368", null ],
-    [ "mi_heap_mallocn", "group__heap.html#ga851da6c43fe0b71c1376cee8aef90db0", null ],
-    [ "mi_heap_new", "group__heap.html#ga766f672ba56f2fbfeb9d9dbb0b7f6b11", null ],
-    [ "mi_heap_realloc", "group__heap.html#gaaef3395f66be48f37bdc8322509c5d81", null ],
-    [ "mi_heap_realloc_aligned", "group__heap.html#gafc603b696bd14cae6da28658f950d98c", null ],
-    [ "mi_heap_realloc_aligned_at", "group__heap.html#gaf96c788a1bf553fe2d371de9365e047c", null ],
-    [ "mi_heap_reallocf", "group__heap.html#ga4a21070eb4e7cce018133c8d5f4b0527", null ],
-    [ "mi_heap_reallocn", "group__heap.html#gac74e94ad9b0c9b57c1c4d88b8825b7a8", null ],
-    [ "mi_heap_realpath", "group__heap.html#ga00e95ba1e01acac3cfd95bb7a357a6f0", null ],
-    [ "mi_heap_set_default", "group__heap.html#gab8631ec88c8d26641b68b5d25dcd4422", null ],
-    [ "mi_heap_strdup", "group__heap.html#ga139d6b09dbf50c3c2523d0f4d1cfdeb5", null ],
-    [ "mi_heap_strndup", "group__heap.html#ga8e3dbd46650dd26573cf307a2c8f1f5a", null ],
-    [ "mi_heap_zalloc", "group__heap.html#ga903104592c8ed53417a3762da6241133", null ],
-    [ "mi_heap_zalloc_aligned", "group__heap.html#gaa450a59c6c7ae5fdbd1c2b80a8329ef0", null ],
-    [ "mi_heap_zalloc_aligned_at", "group__heap.html#ga45fb43a62776fbebbdf1edd99b527954", null ]
+    [ "mi_heap_get_backing", "group__heap.html#gac6ac9f0e7be9ab4ff70acfc8dad1235a", null ],
+    [ "mi_heap_get_default", "group__heap.html#ga14c667a6e2c5d28762d8cb7d4e057909", null ],
+    [ "mi_heap_malloc", "group__heap.html#gab374e206c7034e0d899fb934e4f4a863", null ],
+    [ "mi_heap_malloc_aligned", "group__heap.html#ga33f4f05b7fea7af2113c62a4bf882cc5", null ],
+    [ "mi_heap_malloc_aligned_at", "group__heap.html#gae7ffc045c3996497a7f3a5f6fe7b8aaa", null ],
+    [ "mi_heap_malloc_small", "group__heap.html#ga012c5c8abe22b10043de39ff95909541", null ],
+    [ "mi_heap_mallocn", "group__heap.html#gab0f755c0b21c387fe8e9024200faa372", null ],
+    [ "mi_heap_new", "group__heap.html#gaa718bb226ec0546ba6d1b6cb32179f3a", null ],
+    [ "mi_heap_realloc", "group__heap.html#gac5252d6a2e510bd349e4fcb452e6a93a", null ],
+    [ "mi_heap_realloc_aligned", "group__heap.html#gaccf8c249872f30bf1c2493a09197d734", null ],
+    [ "mi_heap_realloc_aligned_at", "group__heap.html#ga6df988a7219d5707f010d5f3eb0dc3f5", null ],
+    [ "mi_heap_reallocf", "group__heap.html#gae7cd171425bee04c683c65a3701f0b4a", null ],
+    [ "mi_heap_reallocn", "group__heap.html#gaccf7bfe10ce510a000d3547d9cf7fa29", null ],
+    [ "mi_heap_realpath", "group__heap.html#ga55545a3ec6da29c5b4f62e540ecac1e2", null ],
+    [ "mi_heap_set_default", "group__heap.html#ga349b677dec7da5eacdbc7a385bd62a4a", null ],
+    [ "mi_heap_strdup", "group__heap.html#ga5754e09ccc51dd6bc73885bb6ea21b7a", null ],
+    [ "mi_heap_strndup", "group__heap.html#gad224df78f1fbee942df8adf023e12cf3", null ],
+    [ "mi_heap_zalloc", "group__heap.html#gabebc796399619d964d8db77aa835e8c1", null ],
+    [ "mi_heap_zalloc_aligned", "group__heap.html#ga6466bde8b5712aa34e081a8317f9f471", null ],
+    [ "mi_heap_zalloc_aligned_at", "group__heap.html#ga484e3d01cd174f78c7e53370e5a7c819", null ]
 ];
\ No newline at end of file
diff --git a/depends/mimalloc/docs/group__malloc.html b/depends/mimalloc/docs/group__malloc.html
index 2dc16656728f..3694d2b2a824 100644
--- a/depends/mimalloc/docs/group__malloc.html
+++ b/depends/mimalloc/docs/group__malloc.html
@@ -1,24 +1,26 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "https://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
+<html xmlns="http://www.w3.org/1999/xhtml" lang="en-US">
 <head>
 <meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
-<meta http-equiv="X-UA-Compatible" content="IE=9"/>
-<meta name="generator" content="Doxygen 1.9.1"/>
+<meta http-equiv="X-UA-Compatible" content="IE=11"/>
+<meta name="generator" content="Doxygen 1.13.1"/>
 <meta name="viewport" content="width=device-width, initial-scale=1"/>
 <title>mi-malloc: Basic Allocation</title>
 <link href="tabs.css" rel="stylesheet" type="text/css"/>
 <script type="text/javascript" src="jquery.js"></script>
 <script type="text/javascript" src="dynsections.js"></script>
+<script type="text/javascript" src="clipboard.js"></script>
 <link href="navtree.css" rel="stylesheet" type="text/css"/>
-<script type="text/javascript" src="resize.js"></script>
 <script type="text/javascript" src="navtreedata.js"></script>
 <script type="text/javascript" src="navtree.js"></script>
+<script type="text/javascript" src="resize.js"></script>
+<script type="text/javascript" src="cookie.js"></script>
 <link href="search/search.css" rel="stylesheet" type="text/css"/>
 <script type="text/javascript" src="search/searchdata.js"></script>
 <script type="text/javascript" src="search/search.js"></script>
 <script type="text/javascript">
-/* @license magnet:?xt=urn:btih:cf05388f2679ee054f2beb29a391d25f4e673ac3&amp;dn=gpl-2.0.txt GPL-v2 */
-  $(document).ready(function() { init_search(); });
+/* @license magnet:?xt=urn:btih:d3d9a9a6595521f9666a5e94cc830dab83b65699&amp;dn=expat.txt MIT */
+  $(function() { init_search(); });
 /* @license-end */
 </script>
 <link href="doxygen.css" rel="stylesheet" type="text/css" />
@@ -29,20 +31,16 @@
 <div id="titlearea">
 <table cellspacing="0" cellpadding="0">
  <tbody>
- <tr style="height: 56px;">
+ <tr id="projectrow">
   <td id="projectlogo"><img alt="Logo" src="mimalloc-logo.svg"/></td>
-  <td id="projectalign" style="padding-left: 0.5em;">
-   <div id="projectname">mi-malloc
-   &#160;<span id="projectnumber">1.7/2.0</span>
+  <td id="projectalign">
+   <div id="projectname">mi-malloc<span id="projectnumber">&#160;1.8/2.1</span>
    </div>
   </td>
-   <td>        <div id="MSearchBox" class="MSearchBoxInactive">
+    <td>        <div id="MSearchBox" class="MSearchBoxInactive">
         <span class="left">
-          <img id="MSearchSelect" src="search/mag_sel.svg"
-               onmouseover="return searchBox.OnSearchSelectShow()"
-               onmouseout="return searchBox.OnSearchSelectHide()"
-               alt=""/>
-          <input type="text" id="MSearchField" value="Search" accesskey="S"
+          <span id="MSearchSelect"                onmouseover="return searchBox.OnSearchSelectShow()"                onmouseout="return searchBox.OnSearchSelectHide()">&#160;</span>
+          <input type="text" id="MSearchField" value="" placeholder="Search" accesskey="S"
                onfocus="searchBox.OnSearchFieldFocus(true)" 
                onblur="searchBox.OnSearchFieldFocus(false)" 
                onkeyup="searchBox.OnSearchFieldChange(event)"/>
@@ -56,10 +54,15 @@
 </table>
 </div>
 <!-- end header part -->
-<!-- Generated by Doxygen 1.9.1 -->
+<!-- Generated by Doxygen 1.13.1 -->
+<script type="text/javascript">
+/* @license magnet:?xt=urn:btih:d3d9a9a6595521f9666a5e94cc830dab83b65699&amp;dn=expat.txt MIT */
+var searchBox = new SearchBox("searchBox", "search/",'.html');
+/* @license-end */
+</script>
 <script type="text/javascript">
-/* @license magnet:?xt=urn:btih:cf05388f2679ee054f2beb29a391d25f4e673ac3&amp;dn=gpl-2.0.txt GPL-v2 */
-var searchBox = new SearchBox("searchBox", "search",false,'Search','.html');
+/* @license magnet:?xt=urn:btih:d3d9a9a6595521f9666a5e94cc830dab83b65699&amp;dn=expat.txt MIT */
+$(function() { codefold.init(0); });
 /* @license-end */
 </script>
 </div><!-- top -->
@@ -74,8 +77,8 @@
   </div>
 </div>
 <script type="text/javascript">
-/* @license magnet:?xt=urn:btih:cf05388f2679ee054f2beb29a391d25f4e673ac3&amp;dn=gpl-2.0.txt GPL-v2 */
-$(document).ready(function(){initNavTree('group__malloc.html',''); initResizable(); });
+/* @license magnet:?xt=urn:btih:d3d9a9a6595521f9666a5e94cc830dab83b65699&amp;dn=expat.txt MIT */
+$(function(){initNavTree('group__malloc.html',''); initResizable(true); });
 /* @license-end */
 </script>
 <div id="doc-content">
@@ -88,94 +91,93 @@
 
 <!-- iframe showing the search results (closed by default) -->
 <div id="MSearchResultsWindow">
-<iframe src="javascript:void(0)" frameborder="0" 
-        name="MSearchResults" id="MSearchResults">
-</iframe>
+<div id="MSearchResults">
+<div class="SRPage">
+<div id="SRIndex">
+<div id="SRResults"></div>
+<div class="SRStatus" id="Loading">Loading...</div>
+<div class="SRStatus" id="Searching">Searching...</div>
+<div class="SRStatus" id="NoMatches">No Matches</div>
+</div>
+</div>
+</div>
 </div>
 
 <div class="header">
   <div class="summary">
 <a href="#func-members">Functions</a>  </div>
-  <div class="headertitle">
-<div class="title">Basic Allocation</div>  </div>
+  <div class="headertitle"><div class="title">Basic Allocation</div></div>
 </div><!--header-->
 <div class="contents">
 
 <p>The basic allocation interface.  
 <a href="#details">More...</a></p>
 <table class="memberdecls">
-<tr class="heading"><td colspan="2"><h2 class="groupheader"><a name="func-members"></a>
+<tr class="heading"><td colspan="2"><h2 class="groupheader"><a id="func-members" name="func-members"></a>
 Functions</h2></td></tr>
-<tr class="memitem:gaf2c7b89c327d1f60f59e68b9ea644d95"><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__malloc.html#gaf2c7b89c327d1f60f59e68b9ea644d95">mi_free</a> (void *p)</td></tr>
-<tr class="memdesc:gaf2c7b89c327d1f60f59e68b9ea644d95"><td class="mdescLeft">&#160;</td><td class="mdescRight">Free previously allocated memory.  <a href="group__malloc.html#gaf2c7b89c327d1f60f59e68b9ea644d95">More...</a><br /></td></tr>
+<tr class="memitem:gaf2c7b89c327d1f60f59e68b9ea644d95" id="r_gaf2c7b89c327d1f60f59e68b9ea644d95"><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="#gaf2c7b89c327d1f60f59e68b9ea644d95">mi_free</a> (void *p)</td></tr>
+<tr class="memdesc:gaf2c7b89c327d1f60f59e68b9ea644d95"><td class="mdescLeft">&#160;</td><td class="mdescRight">Free previously allocated memory.  <br /></td></tr>
 <tr class="separator:gaf2c7b89c327d1f60f59e68b9ea644d95"><td class="memSeparator" colspan="2">&#160;</td></tr>
-<tr class="memitem:ga3406e8b168bc74c8637b11571a6da83a"><td class="memItemLeft" align="right" valign="top">void *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__malloc.html#ga3406e8b168bc74c8637b11571a6da83a">mi_malloc</a> (size_t size)</td></tr>
-<tr class="memdesc:ga3406e8b168bc74c8637b11571a6da83a"><td class="mdescLeft">&#160;</td><td class="mdescRight">Allocate <em>size</em> bytes.  <a href="group__malloc.html#ga3406e8b168bc74c8637b11571a6da83a">More...</a><br /></td></tr>
-<tr class="separator:ga3406e8b168bc74c8637b11571a6da83a"><td class="memSeparator" colspan="2">&#160;</td></tr>
-<tr class="memitem:gafdd9d8bb2986e668ba9884f28af38000"><td class="memItemLeft" align="right" valign="top">void *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__malloc.html#gafdd9d8bb2986e668ba9884f28af38000">mi_zalloc</a> (size_t size)</td></tr>
-<tr class="memdesc:gafdd9d8bb2986e668ba9884f28af38000"><td class="mdescLeft">&#160;</td><td class="mdescRight">Allocate zero-initialized <code>size</code> bytes.  <a href="group__malloc.html#gafdd9d8bb2986e668ba9884f28af38000">More...</a><br /></td></tr>
-<tr class="separator:gafdd9d8bb2986e668ba9884f28af38000"><td class="memSeparator" colspan="2">&#160;</td></tr>
-<tr class="memitem:ga97fedb4f7107c592fd7f0f0a8949a57d"><td class="memItemLeft" align="right" valign="top">void *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__malloc.html#ga97fedb4f7107c592fd7f0f0a8949a57d">mi_calloc</a> (size_t count, size_t size)</td></tr>
-<tr class="memdesc:ga97fedb4f7107c592fd7f0f0a8949a57d"><td class="mdescLeft">&#160;</td><td class="mdescRight">Allocate zero-initialized <em>count</em> elements of <em>size</em> bytes.  <a href="group__malloc.html#ga97fedb4f7107c592fd7f0f0a8949a57d">More...</a><br /></td></tr>
-<tr class="separator:ga97fedb4f7107c592fd7f0f0a8949a57d"><td class="memSeparator" colspan="2">&#160;</td></tr>
-<tr class="memitem:gaf11eb497da57bdfb2de65eb191c69db6"><td class="memItemLeft" align="right" valign="top">void *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__malloc.html#gaf11eb497da57bdfb2de65eb191c69db6">mi_realloc</a> (void *p, size_t newsize)</td></tr>
-<tr class="memdesc:gaf11eb497da57bdfb2de65eb191c69db6"><td class="mdescLeft">&#160;</td><td class="mdescRight">Re-allocate memory to <em>newsize</em> bytes.  <a href="group__malloc.html#gaf11eb497da57bdfb2de65eb191c69db6">More...</a><br /></td></tr>
-<tr class="separator:gaf11eb497da57bdfb2de65eb191c69db6"><td class="memSeparator" colspan="2">&#160;</td></tr>
-<tr class="memitem:ga23a0fbb452b5dce8e31fab1a1958cacc"><td class="memItemLeft" align="right" valign="top">void *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__malloc.html#ga23a0fbb452b5dce8e31fab1a1958cacc">mi_recalloc</a> (void *p, size_t count, size_t size)</td></tr>
-<tr class="memdesc:ga23a0fbb452b5dce8e31fab1a1958cacc"><td class="mdescLeft">&#160;</td><td class="mdescRight">Re-allocate memory to <em>count</em> elements of <em>size</em> bytes, with extra memory initialized to zero.  <a href="group__malloc.html#ga23a0fbb452b5dce8e31fab1a1958cacc">More...</a><br /></td></tr>
+<tr class="memitem:gae1dd97b542420c87ae085e822b1229e8" id="r_gae1dd97b542420c87ae085e822b1229e8"><td class="memItemLeft" align="right" valign="top">void *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="#gae1dd97b542420c87ae085e822b1229e8">mi_malloc</a> (size_t size)</td></tr>
+<tr class="memdesc:gae1dd97b542420c87ae085e822b1229e8"><td class="mdescLeft">&#160;</td><td class="mdescRight">Allocate <em class="arg">size</em> bytes.  <br /></td></tr>
+<tr class="separator:gae1dd97b542420c87ae085e822b1229e8"><td class="memSeparator" colspan="2">&#160;</td></tr>
+<tr class="memitem:gae6e38c4403247a7b40d80419e093bfb8" id="r_gae6e38c4403247a7b40d80419e093bfb8"><td class="memItemLeft" align="right" valign="top">void *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="#gae6e38c4403247a7b40d80419e093bfb8">mi_zalloc</a> (size_t size)</td></tr>
+<tr class="memdesc:gae6e38c4403247a7b40d80419e093bfb8"><td class="mdescLeft">&#160;</td><td class="mdescRight">Allocate zero-initialized <code>size</code> bytes.  <br /></td></tr>
+<tr class="separator:gae6e38c4403247a7b40d80419e093bfb8"><td class="memSeparator" colspan="2">&#160;</td></tr>
+<tr class="memitem:ga6686568014b54d1e6c7ac64a076e4f56" id="r_ga6686568014b54d1e6c7ac64a076e4f56"><td class="memItemLeft" align="right" valign="top">void *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="#ga6686568014b54d1e6c7ac64a076e4f56">mi_calloc</a> (size_t count, size_t size)</td></tr>
+<tr class="memdesc:ga6686568014b54d1e6c7ac64a076e4f56"><td class="mdescLeft">&#160;</td><td class="mdescRight">Allocate zero-initialized <em class="arg">count</em> elements of <em class="arg">size</em> bytes.  <br /></td></tr>
+<tr class="separator:ga6686568014b54d1e6c7ac64a076e4f56"><td class="memSeparator" colspan="2">&#160;</td></tr>
+<tr class="memitem:ga0621af6a5e3aa384e6a1b548958bf583" id="r_ga0621af6a5e3aa384e6a1b548958bf583"><td class="memItemLeft" align="right" valign="top">void *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="#ga0621af6a5e3aa384e6a1b548958bf583">mi_realloc</a> (void *p, size_t newsize)</td></tr>
+<tr class="memdesc:ga0621af6a5e3aa384e6a1b548958bf583"><td class="mdescLeft">&#160;</td><td class="mdescRight">Re-allocate memory to <em class="arg">newsize</em> bytes.  <br /></td></tr>
+<tr class="separator:ga0621af6a5e3aa384e6a1b548958bf583"><td class="memSeparator" colspan="2">&#160;</td></tr>
+<tr class="memitem:ga23a0fbb452b5dce8e31fab1a1958cacc" id="r_ga23a0fbb452b5dce8e31fab1a1958cacc"><td class="memItemLeft" align="right" valign="top">void *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="#ga23a0fbb452b5dce8e31fab1a1958cacc">mi_recalloc</a> (void *p, size_t count, size_t size)</td></tr>
+<tr class="memdesc:ga23a0fbb452b5dce8e31fab1a1958cacc"><td class="mdescLeft">&#160;</td><td class="mdescRight">Re-allocate memory to <em class="arg">count</em> elements of <em class="arg">size</em> bytes, with extra memory initialized to zero.  <br /></td></tr>
 <tr class="separator:ga23a0fbb452b5dce8e31fab1a1958cacc"><td class="memSeparator" colspan="2">&#160;</td></tr>
-<tr class="memitem:gaaee66a1d483c3e28f585525fb96707e4"><td class="memItemLeft" align="right" valign="top">void *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__malloc.html#gaaee66a1d483c3e28f585525fb96707e4">mi_expand</a> (void *p, size_t newsize)</td></tr>
-<tr class="memdesc:gaaee66a1d483c3e28f585525fb96707e4"><td class="mdescLeft">&#160;</td><td class="mdescRight">Try to re-allocate memory to <em>newsize</em> bytes <em>in place</em>.  <a href="group__malloc.html#gaaee66a1d483c3e28f585525fb96707e4">More...</a><br /></td></tr>
-<tr class="separator:gaaee66a1d483c3e28f585525fb96707e4"><td class="memSeparator" colspan="2">&#160;</td></tr>
-<tr class="memitem:ga0b05e2bf0f73e7401ae08597ff782ac6"><td class="memItemLeft" align="right" valign="top">void *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__malloc.html#ga0b05e2bf0f73e7401ae08597ff782ac6">mi_mallocn</a> (size_t count, size_t size)</td></tr>
-<tr class="memdesc:ga0b05e2bf0f73e7401ae08597ff782ac6"><td class="mdescLeft">&#160;</td><td class="mdescRight">Allocate <em>count</em> elements of <em>size</em> bytes.  <a href="group__malloc.html#ga0b05e2bf0f73e7401ae08597ff782ac6">More...</a><br /></td></tr>
-<tr class="separator:ga0b05e2bf0f73e7401ae08597ff782ac6"><td class="memSeparator" colspan="2">&#160;</td></tr>
-<tr class="memitem:ga61d57b4144ba24fba5c1e9b956d13853"><td class="memItemLeft" align="right" valign="top">void *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__malloc.html#ga61d57b4144ba24fba5c1e9b956d13853">mi_reallocn</a> (void *p, size_t count, size_t size)</td></tr>
-<tr class="memdesc:ga61d57b4144ba24fba5c1e9b956d13853"><td class="mdescLeft">&#160;</td><td class="mdescRight">Re-allocate memory to <em>count</em> elements of <em>size</em> bytes.  <a href="group__malloc.html#ga61d57b4144ba24fba5c1e9b956d13853">More...</a><br /></td></tr>
-<tr class="separator:ga61d57b4144ba24fba5c1e9b956d13853"><td class="memSeparator" colspan="2">&#160;</td></tr>
-<tr class="memitem:gafe68ac7c5e24a65cd55c9d6b152211a0"><td class="memItemLeft" align="right" valign="top">void *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__malloc.html#gafe68ac7c5e24a65cd55c9d6b152211a0">mi_reallocf</a> (void *p, size_t newsize)</td></tr>
-<tr class="memdesc:gafe68ac7c5e24a65cd55c9d6b152211a0"><td class="mdescLeft">&#160;</td><td class="mdescRight">Re-allocate memory to <em>newsize</em> bytes,.  <a href="group__malloc.html#gafe68ac7c5e24a65cd55c9d6b152211a0">More...</a><br /></td></tr>
-<tr class="separator:gafe68ac7c5e24a65cd55c9d6b152211a0"><td class="memSeparator" colspan="2">&#160;</td></tr>
-<tr class="memitem:gac7cffe13f1f458ed16789488bf92b9b2"><td class="memItemLeft" align="right" valign="top">char *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__malloc.html#gac7cffe13f1f458ed16789488bf92b9b2">mi_strdup</a> (const char *s)</td></tr>
-<tr class="memdesc:gac7cffe13f1f458ed16789488bf92b9b2"><td class="mdescLeft">&#160;</td><td class="mdescRight">Allocate and duplicate a string.  <a href="group__malloc.html#gac7cffe13f1f458ed16789488bf92b9b2">More...</a><br /></td></tr>
-<tr class="separator:gac7cffe13f1f458ed16789488bf92b9b2"><td class="memSeparator" colspan="2">&#160;</td></tr>
-<tr class="memitem:gaaabf971c2571891433477e2d21a35266"><td class="memItemLeft" align="right" valign="top">char *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__malloc.html#gaaabf971c2571891433477e2d21a35266">mi_strndup</a> (const char *s, size_t n)</td></tr>
-<tr class="memdesc:gaaabf971c2571891433477e2d21a35266"><td class="mdescLeft">&#160;</td><td class="mdescRight">Allocate and duplicate a string up to <em>n</em> bytes.  <a href="group__malloc.html#gaaabf971c2571891433477e2d21a35266">More...</a><br /></td></tr>
-<tr class="separator:gaaabf971c2571891433477e2d21a35266"><td class="memSeparator" colspan="2">&#160;</td></tr>
-<tr class="memitem:ga08cec32dd5bbe7da91c78d19f1b5bebe"><td class="memItemLeft" align="right" valign="top">char *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__malloc.html#ga08cec32dd5bbe7da91c78d19f1b5bebe">mi_realpath</a> (const char *fname, char *resolved_name)</td></tr>
-<tr class="memdesc:ga08cec32dd5bbe7da91c78d19f1b5bebe"><td class="mdescLeft">&#160;</td><td class="mdescRight">Resolve a file path name.  <a href="group__malloc.html#ga08cec32dd5bbe7da91c78d19f1b5bebe">More...</a><br /></td></tr>
-<tr class="separator:ga08cec32dd5bbe7da91c78d19f1b5bebe"><td class="memSeparator" colspan="2">&#160;</td></tr>
+<tr class="memitem:ga19299856216cfbb08e2628593654dfb0" id="r_ga19299856216cfbb08e2628593654dfb0"><td class="memItemLeft" align="right" valign="top">void *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="#ga19299856216cfbb08e2628593654dfb0">mi_expand</a> (void *p, size_t newsize)</td></tr>
+<tr class="memdesc:ga19299856216cfbb08e2628593654dfb0"><td class="mdescLeft">&#160;</td><td class="mdescRight">Try to re-allocate memory to <em class="arg">newsize</em> bytes <em>in place</em>.  <br /></td></tr>
+<tr class="separator:ga19299856216cfbb08e2628593654dfb0"><td class="memSeparator" colspan="2">&#160;</td></tr>
+<tr class="memitem:ga61f46bade3db76ca24aaafedc40de7b6" id="r_ga61f46bade3db76ca24aaafedc40de7b6"><td class="memItemLeft" align="right" valign="top">void *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="#ga61f46bade3db76ca24aaafedc40de7b6">mi_mallocn</a> (size_t count, size_t size)</td></tr>
+<tr class="memdesc:ga61f46bade3db76ca24aaafedc40de7b6"><td class="mdescLeft">&#160;</td><td class="mdescRight">Allocate <em class="arg">count</em> elements of <em class="arg">size</em> bytes.  <br /></td></tr>
+<tr class="separator:ga61f46bade3db76ca24aaafedc40de7b6"><td class="memSeparator" colspan="2">&#160;</td></tr>
+<tr class="memitem:ga8bddfb4a1270a0854bbcf44cb3980467" id="r_ga8bddfb4a1270a0854bbcf44cb3980467"><td class="memItemLeft" align="right" valign="top">void *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="#ga8bddfb4a1270a0854bbcf44cb3980467">mi_reallocn</a> (void *p, size_t count, size_t size)</td></tr>
+<tr class="memdesc:ga8bddfb4a1270a0854bbcf44cb3980467"><td class="mdescLeft">&#160;</td><td class="mdescRight">Re-allocate memory to <em class="arg">count</em> elements of <em class="arg">size</em> bytes.  <br /></td></tr>
+<tr class="separator:ga8bddfb4a1270a0854bbcf44cb3980467"><td class="memSeparator" colspan="2">&#160;</td></tr>
+<tr class="memitem:ga4dc3a4067037b151a64629fe8a332641" id="r_ga4dc3a4067037b151a64629fe8a332641"><td class="memItemLeft" align="right" valign="top">void *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="#ga4dc3a4067037b151a64629fe8a332641">mi_reallocf</a> (void *p, size_t newsize)</td></tr>
+<tr class="memdesc:ga4dc3a4067037b151a64629fe8a332641"><td class="mdescLeft">&#160;</td><td class="mdescRight">Re-allocate memory to <em class="arg">newsize</em> bytes,.  <br /></td></tr>
+<tr class="separator:ga4dc3a4067037b151a64629fe8a332641"><td class="memSeparator" colspan="2">&#160;</td></tr>
+<tr class="memitem:ga245ac90ebc2cfdd17de599e5fea59889" id="r_ga245ac90ebc2cfdd17de599e5fea59889"><td class="memItemLeft" align="right" valign="top">char *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="#ga245ac90ebc2cfdd17de599e5fea59889">mi_strdup</a> (const char *s)</td></tr>
+<tr class="memdesc:ga245ac90ebc2cfdd17de599e5fea59889"><td class="mdescLeft">&#160;</td><td class="mdescRight">Allocate and duplicate a string.  <br /></td></tr>
+<tr class="separator:ga245ac90ebc2cfdd17de599e5fea59889"><td class="memSeparator" colspan="2">&#160;</td></tr>
+<tr class="memitem:ga486d0d26b3b3794f6d1cdb41a9aed92d" id="r_ga486d0d26b3b3794f6d1cdb41a9aed92d"><td class="memItemLeft" align="right" valign="top">char *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="#ga486d0d26b3b3794f6d1cdb41a9aed92d">mi_strndup</a> (const char *s, size_t n)</td></tr>
+<tr class="memdesc:ga486d0d26b3b3794f6d1cdb41a9aed92d"><td class="mdescLeft">&#160;</td><td class="mdescRight">Allocate and duplicate a string up to <em class="arg">n</em> bytes.  <br /></td></tr>
+<tr class="separator:ga486d0d26b3b3794f6d1cdb41a9aed92d"><td class="memSeparator" colspan="2">&#160;</td></tr>
+<tr class="memitem:ga94c3afcc086e85d75a57e9f76b9b71dd" id="r_ga94c3afcc086e85d75a57e9f76b9b71dd"><td class="memItemLeft" align="right" valign="top">char *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="#ga94c3afcc086e85d75a57e9f76b9b71dd">mi_realpath</a> (const char *fname, char *resolved_name)</td></tr>
+<tr class="memdesc:ga94c3afcc086e85d75a57e9f76b9b71dd"><td class="mdescLeft">&#160;</td><td class="mdescRight">Resolve a file path name.  <br /></td></tr>
+<tr class="separator:ga94c3afcc086e85d75a57e9f76b9b71dd"><td class="memSeparator" colspan="2">&#160;</td></tr>
 </table>
 <a name="details" id="details"></a><h2 class="groupheader">Detailed Description</h2>
 <p>The basic allocation interface. </p>
 <h2 class="groupheader">Function Documentation</h2>
-<a id="ga97fedb4f7107c592fd7f0f0a8949a57d"></a>
-<h2 class="memtitle"><span class="permalink"><a href="#ga97fedb4f7107c592fd7f0f0a8949a57d">&#9670;&nbsp;</a></span>mi_calloc()</h2>
+<a id="ga6686568014b54d1e6c7ac64a076e4f56" name="ga6686568014b54d1e6c7ac64a076e4f56"></a>
+<h2 class="memtitle"><span class="permalink"><a href="#ga6686568014b54d1e6c7ac64a076e4f56">&#9670;&#160;</a></span>mi_calloc()</h2>
 
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname">void* mi_calloc </td>
+          <td class="memname">void * mi_calloc </td>
           <td>(</td>
-          <td class="paramtype">size_t&#160;</td>
-          <td class="paramname"><em>count</em>, </td>
+          <td class="paramtype">size_t</td>          <td class="paramname"><span class="paramname"><em>count</em></span>, </td>
         </tr>
         <tr>
           <td class="paramkey"></td>
           <td></td>
-          <td class="paramtype">size_t&#160;</td>
-          <td class="paramname"><em>size</em>&#160;</td>
-        </tr>
-        <tr>
-          <td></td>
-          <td>)</td>
-          <td></td><td></td>
+          <td class="paramtype">size_t</td>          <td class="paramname"><span class="paramname"><em>size</em></span>&#160;)</td>
         </tr>
       </table>
 </div><div class="memdoc">
 
-<p>Allocate zero-initialized <em>count</em> elements of <em>size</em> bytes. </p>
+<p>Allocate zero-initialized <em class="arg">count</em> elements of <em class="arg">size</em> bytes. </p>
 <dl class="params"><dt>Parameters</dt><dd>
   <table class="params">
     <tr><td class="paramname">count</td><td>number of elements. </td></tr>
@@ -183,51 +185,44 @@ <h2 class="memtitle"><span class="permalink"><a href="#ga97fedb4f7107c592fd7f0f0
   </table>
   </dd>
 </dl>
-<dl class="section return"><dt>Returns</dt><dd>pointer to the allocated memory of <em>size*<em>count</em> bytes</em>, or <em>NULL</em> if either out of memory or when <code>count*size</code> overflows.</dd></dl>
-<p>Returns a unique pointer if called with either <em>size</em> or <em>count</em> of 0. </p><dl class="section see"><dt>See also</dt><dd><a class="el" href="group__malloc.html#gafdd9d8bb2986e668ba9884f28af38000" title="Allocate zero-initialized size bytes.">mi_zalloc()</a> </dd></dl>
+<dl class="section return"><dt>Returns</dt><dd>pointer to the allocated memory of <em class="arg">size*<em class="arg">count</em> bytes</em>, or <em class="arg">NULL</em> if either out of memory or when <code>count*size</code> overflows.</dd></dl>
+<p>Returns a unique pointer if called with either <em class="arg">size</em> or <em class="arg">count</em> of 0. </p><dl class="section see"><dt>See also</dt><dd><a class="el" href="#gae6e38c4403247a7b40d80419e093bfb8" title="Allocate zero-initialized size bytes.">mi_zalloc()</a> </dd></dl>
 
 </div>
 </div>
-<a id="gaaee66a1d483c3e28f585525fb96707e4"></a>
-<h2 class="memtitle"><span class="permalink"><a href="#gaaee66a1d483c3e28f585525fb96707e4">&#9670;&nbsp;</a></span>mi_expand()</h2>
+<a id="ga19299856216cfbb08e2628593654dfb0" name="ga19299856216cfbb08e2628593654dfb0"></a>
+<h2 class="memtitle"><span class="permalink"><a href="#ga19299856216cfbb08e2628593654dfb0">&#9670;&#160;</a></span>mi_expand()</h2>
 
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname">void* mi_expand </td>
+          <td class="memname">void * mi_expand </td>
           <td>(</td>
-          <td class="paramtype">void *&#160;</td>
-          <td class="paramname"><em>p</em>, </td>
+          <td class="paramtype">void *</td>          <td class="paramname"><span class="paramname"><em>p</em></span>, </td>
         </tr>
         <tr>
           <td class="paramkey"></td>
           <td></td>
-          <td class="paramtype">size_t&#160;</td>
-          <td class="paramname"><em>newsize</em>&#160;</td>
-        </tr>
-        <tr>
-          <td></td>
-          <td>)</td>
-          <td></td><td></td>
+          <td class="paramtype">size_t</td>          <td class="paramname"><span class="paramname"><em>newsize</em></span>&#160;)</td>
         </tr>
       </table>
 </div><div class="memdoc">
 
-<p>Try to re-allocate memory to <em>newsize</em> bytes <em>in place</em>. </p>
+<p>Try to re-allocate memory to <em class="arg">newsize</em> bytes <em>in place</em>. </p>
 <dl class="params"><dt>Parameters</dt><dd>
   <table class="params">
-    <tr><td class="paramname">p</td><td>pointer to previously allocated memory (or <em>NULL</em>). </td></tr>
+    <tr><td class="paramname">p</td><td>pointer to previously allocated memory (or <em class="arg">NULL</em>). </td></tr>
     <tr><td class="paramname">newsize</td><td>the new required size in bytes. </td></tr>
   </table>
   </dd>
 </dl>
-<dl class="section return"><dt>Returns</dt><dd>pointer to the re-allocated memory of <em>newsize</em> bytes (always equal to <em>p</em>), or <em>NULL</em> if either out of memory or if the memory could not be expanded in place. If <em>NULL</em> is returned, the pointer <em>p</em> is not freed. Otherwise the original pointer is returned as the reallocated result since it fits in-place with the new size. If <em>newsize</em> is larger than the original <em>size</em> allocated for <em>p</em>, the bytes after <em>size</em> are uninitialized. </dd></dl>
+<dl class="section return"><dt>Returns</dt><dd>pointer to the re-allocated memory of <em class="arg">newsize</em> bytes (always equal to <em class="arg">p</em>), or <em class="arg">NULL</em> if either out of memory or if the memory could not be expanded in place. If <em class="arg">NULL</em> is returned, the pointer <em class="arg">p</em> is not freed. Otherwise the original pointer is returned as the reallocated result since it fits in-place with the new size. If <em class="arg">newsize</em> is larger than the original <em class="arg">size</em> allocated for <em class="arg">p</em>, the bytes after <em class="arg">size</em> are uninitialized. </dd></dl>
 
 </div>
 </div>
-<a id="gaf2c7b89c327d1f60f59e68b9ea644d95"></a>
-<h2 class="memtitle"><span class="permalink"><a href="#gaf2c7b89c327d1f60f59e68b9ea644d95">&#9670;&nbsp;</a></span>mi_free()</h2>
+<a id="gaf2c7b89c327d1f60f59e68b9ea644d95" name="gaf2c7b89c327d1f60f59e68b9ea644d95"></a>
+<h2 class="memtitle"><span class="permalink"><a href="#gaf2c7b89c327d1f60f59e68b9ea644d95">&#9670;&#160;</a></span>mi_free()</h2>
 
 <div class="memitem">
 <div class="memproto">
@@ -235,77 +230,68 @@ <h2 class="memtitle"><span class="permalink"><a href="#gaf2c7b89c327d1f60f59e68b
         <tr>
           <td class="memname">void mi_free </td>
           <td>(</td>
-          <td class="paramtype">void *&#160;</td>
-          <td class="paramname"><em>p</em></td><td>)</td>
+          <td class="paramtype">void *</td>          <td class="paramname"><span class="paramname"><em>p</em></span></td><td>)</td>
           <td></td>
         </tr>
       </table>
 </div><div class="memdoc">
 
 <p>Free previously allocated memory. </p>
-<p>The pointer <code>p</code> must have been allocated before (or be <em>NULL</em>). </p><dl class="params"><dt>Parameters</dt><dd>
+<p>The pointer <code>p</code> must have been allocated before (or be <em class="arg">NULL</em>). </p><dl class="params"><dt>Parameters</dt><dd>
   <table class="params">
-    <tr><td class="paramname">p</td><td>pointer to free, or <em>NULL</em>. </td></tr>
+    <tr><td class="paramname">p</td><td>pointer to free, or <em class="arg">NULL</em>. </td></tr>
   </table>
   </dd>
 </dl>
 
 </div>
 </div>
-<a id="ga3406e8b168bc74c8637b11571a6da83a"></a>
-<h2 class="memtitle"><span class="permalink"><a href="#ga3406e8b168bc74c8637b11571a6da83a">&#9670;&nbsp;</a></span>mi_malloc()</h2>
+<a id="gae1dd97b542420c87ae085e822b1229e8" name="gae1dd97b542420c87ae085e822b1229e8"></a>
+<h2 class="memtitle"><span class="permalink"><a href="#gae1dd97b542420c87ae085e822b1229e8">&#9670;&#160;</a></span>mi_malloc()</h2>
 
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname">void* mi_malloc </td>
+          <td class="memname">void * mi_malloc </td>
           <td>(</td>
-          <td class="paramtype">size_t&#160;</td>
-          <td class="paramname"><em>size</em></td><td>)</td>
+          <td class="paramtype">size_t</td>          <td class="paramname"><span class="paramname"><em>size</em></span></td><td>)</td>
           <td></td>
         </tr>
       </table>
 </div><div class="memdoc">
 
-<p>Allocate <em>size</em> bytes. </p>
+<p>Allocate <em class="arg">size</em> bytes. </p>
 <dl class="params"><dt>Parameters</dt><dd>
   <table class="params">
     <tr><td class="paramname">size</td><td>number of bytes to allocate. </td></tr>
   </table>
   </dd>
 </dl>
-<dl class="section return"><dt>Returns</dt><dd>pointer to the allocated memory or <em>NULL</em> if out of memory. Returns a unique pointer if called with <em>size</em> 0. </dd></dl>
+<dl class="section return"><dt>Returns</dt><dd>pointer to the allocated memory or <em class="arg">NULL</em> if out of memory. Returns a unique pointer if called with <em class="arg">size</em> 0. </dd></dl>
 
 </div>
 </div>
-<a id="ga0b05e2bf0f73e7401ae08597ff782ac6"></a>
-<h2 class="memtitle"><span class="permalink"><a href="#ga0b05e2bf0f73e7401ae08597ff782ac6">&#9670;&nbsp;</a></span>mi_mallocn()</h2>
+<a id="ga61f46bade3db76ca24aaafedc40de7b6" name="ga61f46bade3db76ca24aaafedc40de7b6"></a>
+<h2 class="memtitle"><span class="permalink"><a href="#ga61f46bade3db76ca24aaafedc40de7b6">&#9670;&#160;</a></span>mi_mallocn()</h2>
 
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname">void* mi_mallocn </td>
+          <td class="memname">void * mi_mallocn </td>
           <td>(</td>
-          <td class="paramtype">size_t&#160;</td>
-          <td class="paramname"><em>count</em>, </td>
+          <td class="paramtype">size_t</td>          <td class="paramname"><span class="paramname"><em>count</em></span>, </td>
         </tr>
         <tr>
           <td class="paramkey"></td>
           <td></td>
-          <td class="paramtype">size_t&#160;</td>
-          <td class="paramname"><em>size</em>&#160;</td>
-        </tr>
-        <tr>
-          <td></td>
-          <td>)</td>
-          <td></td><td></td>
+          <td class="paramtype">size_t</td>          <td class="paramname"><span class="paramname"><em>size</em></span>&#160;)</td>
         </tr>
       </table>
 </div><div class="memdoc">
 
-<p>Allocate <em>count</em> elements of <em>size</em> bytes. </p>
+<p>Allocate <em class="arg">count</em> elements of <em class="arg">size</em> bytes. </p>
 <dl class="params"><dt>Parameters</dt><dd>
   <table class="params">
     <tr><td class="paramname">count</td><td>The number of elements. </td></tr>
@@ -313,159 +299,130 @@ <h2 class="memtitle"><span class="permalink"><a href="#ga0b05e2bf0f73e7401ae0859
   </table>
   </dd>
 </dl>
-<dl class="section return"><dt>Returns</dt><dd>A pointer to a block of <em>count</em> * <em>size</em> bytes, or <em>NULL</em> if out of memory or if <em>count</em> * <em>size</em> overflows.</dd></dl>
-<p>If there is no overflow, it behaves exactly like <code>mi_malloc(p,count*size)</code>. </p><dl class="section see"><dt>See also</dt><dd><a class="el" href="group__malloc.html#ga97fedb4f7107c592fd7f0f0a8949a57d" title="Allocate zero-initialized count elements of size bytes.">mi_calloc()</a> </dd>
+<dl class="section return"><dt>Returns</dt><dd>A pointer to a block of <em class="arg">count</em> * <em class="arg">size</em> bytes, or <em class="arg">NULL</em> if out of memory or if <em class="arg">count</em> * <em class="arg">size</em> overflows.</dd></dl>
+<p>If there is no overflow, it behaves exactly like <code>mi_malloc(count*size)</code>. </p><dl class="section see"><dt>See also</dt><dd><a class="el" href="#ga6686568014b54d1e6c7ac64a076e4f56" title="Allocate zero-initialized count elements of size bytes.">mi_calloc()</a> </dd>
 <dd>
 mi_zallocn() </dd></dl>
 
 </div>
 </div>
-<a id="gaf11eb497da57bdfb2de65eb191c69db6"></a>
-<h2 class="memtitle"><span class="permalink"><a href="#gaf11eb497da57bdfb2de65eb191c69db6">&#9670;&nbsp;</a></span>mi_realloc()</h2>
+<a id="ga0621af6a5e3aa384e6a1b548958bf583" name="ga0621af6a5e3aa384e6a1b548958bf583"></a>
+<h2 class="memtitle"><span class="permalink"><a href="#ga0621af6a5e3aa384e6a1b548958bf583">&#9670;&#160;</a></span>mi_realloc()</h2>
 
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname">void* mi_realloc </td>
+          <td class="memname">void * mi_realloc </td>
           <td>(</td>
-          <td class="paramtype">void *&#160;</td>
-          <td class="paramname"><em>p</em>, </td>
+          <td class="paramtype">void *</td>          <td class="paramname"><span class="paramname"><em>p</em></span>, </td>
         </tr>
         <tr>
           <td class="paramkey"></td>
           <td></td>
-          <td class="paramtype">size_t&#160;</td>
-          <td class="paramname"><em>newsize</em>&#160;</td>
-        </tr>
-        <tr>
-          <td></td>
-          <td>)</td>
-          <td></td><td></td>
+          <td class="paramtype">size_t</td>          <td class="paramname"><span class="paramname"><em>newsize</em></span>&#160;)</td>
         </tr>
       </table>
 </div><div class="memdoc">
 
-<p>Re-allocate memory to <em>newsize</em> bytes. </p>
+<p>Re-allocate memory to <em class="arg">newsize</em> bytes. </p>
 <dl class="params"><dt>Parameters</dt><dd>
   <table class="params">
-    <tr><td class="paramname">p</td><td>pointer to previously allocated memory (or <em>NULL</em>). </td></tr>
+    <tr><td class="paramname">p</td><td>pointer to previously allocated memory (or <em class="arg">NULL</em>). </td></tr>
     <tr><td class="paramname">newsize</td><td>the new required size in bytes. </td></tr>
   </table>
   </dd>
 </dl>
-<dl class="section return"><dt>Returns</dt><dd>pointer to the re-allocated memory of <em>newsize</em> bytes, or <em>NULL</em> if out of memory. If <em>NULL</em> is returned, the pointer <em>p</em> is not freed. Otherwise the original pointer is either freed or returned as the reallocated result (in case it fits in-place with the new size). If the pointer <em>p</em> is <em>NULL</em>, it behaves as <em>mi_malloc</em>(<em>newsize</em>). If <em>newsize</em> is larger than the original <em>size</em> allocated for <em>p</em>, the bytes after <em>size</em> are uninitialized. </dd></dl>
+<dl class="section return"><dt>Returns</dt><dd>pointer to the re-allocated memory of <em class="arg">newsize</em> bytes, or <em class="arg">NULL</em> if out of memory. If <em class="arg">NULL</em> is returned, the pointer <em class="arg">p</em> is not freed. Otherwise the original pointer is either freed or returned as the reallocated result (in case it fits in-place with the new size). If the pointer <em class="arg">p</em> is <em class="arg">NULL</em>, it behaves as <em class="arg">mi_malloc</em>(<em class="arg">newsize</em>). If <em class="arg">newsize</em> is larger than the original <em class="arg">size</em> allocated for <em class="arg">p</em>, the bytes after <em class="arg">size</em> are uninitialized. </dd></dl>
 
 </div>
 </div>
-<a id="gafe68ac7c5e24a65cd55c9d6b152211a0"></a>
-<h2 class="memtitle"><span class="permalink"><a href="#gafe68ac7c5e24a65cd55c9d6b152211a0">&#9670;&nbsp;</a></span>mi_reallocf()</h2>
+<a id="ga4dc3a4067037b151a64629fe8a332641" name="ga4dc3a4067037b151a64629fe8a332641"></a>
+<h2 class="memtitle"><span class="permalink"><a href="#ga4dc3a4067037b151a64629fe8a332641">&#9670;&#160;</a></span>mi_reallocf()</h2>
 
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname">void* mi_reallocf </td>
+          <td class="memname">void * mi_reallocf </td>
           <td>(</td>
-          <td class="paramtype">void *&#160;</td>
-          <td class="paramname"><em>p</em>, </td>
+          <td class="paramtype">void *</td>          <td class="paramname"><span class="paramname"><em>p</em></span>, </td>
         </tr>
         <tr>
           <td class="paramkey"></td>
           <td></td>
-          <td class="paramtype">size_t&#160;</td>
-          <td class="paramname"><em>newsize</em>&#160;</td>
-        </tr>
-        <tr>
-          <td></td>
-          <td>)</td>
-          <td></td><td></td>
+          <td class="paramtype">size_t</td>          <td class="paramname"><span class="paramname"><em>newsize</em></span>&#160;)</td>
         </tr>
       </table>
 </div><div class="memdoc">
 
-<p>Re-allocate memory to <em>newsize</em> bytes,. </p>
+<p>Re-allocate memory to <em class="arg">newsize</em> bytes,. </p>
 <dl class="params"><dt>Parameters</dt><dd>
   <table class="params">
-    <tr><td class="paramname">p</td><td>pointer to previously allocated memory (or <em>NULL</em>). </td></tr>
+    <tr><td class="paramname">p</td><td>pointer to previously allocated memory (or <em class="arg">NULL</em>). </td></tr>
     <tr><td class="paramname">newsize</td><td>the new required size in bytes. </td></tr>
   </table>
   </dd>
 </dl>
-<dl class="section return"><dt>Returns</dt><dd>pointer to the re-allocated memory of <em>newsize</em> bytes, or <em>NULL</em> if out of memory.</dd></dl>
-<p>In contrast to <a class="el" href="group__malloc.html#gaf11eb497da57bdfb2de65eb191c69db6" title="Re-allocate memory to newsize bytes.">mi_realloc()</a>, if <em>NULL</em> is returned, the original pointer <em>p</em> is freed (if it was not <em>NULL</em> itself). Otherwise the original pointer is either freed or returned as the reallocated result (in case it fits in-place with the new size). If the pointer <em>p</em> is <em>NULL</em>, it behaves as <em>mi_malloc</em>(<em>newsize</em>). If <em>newsize</em> is larger than the original <em>size</em> allocated for <em>p</em>, the bytes after <em>size</em> are uninitialized.</p>
+<dl class="section return"><dt>Returns</dt><dd>pointer to the re-allocated memory of <em class="arg">newsize</em> bytes, or <em class="arg">NULL</em> if out of memory.</dd></dl>
+<p>In contrast to <a class="el" href="#ga0621af6a5e3aa384e6a1b548958bf583" title="Re-allocate memory to newsize bytes.">mi_realloc()</a>, if <em class="arg">NULL</em> is returned, the original pointer <em class="arg">p</em> is freed (if it was not <em class="arg">NULL</em> itself). Otherwise the original pointer is either freed or returned as the reallocated result (in case it fits in-place with the new size). If the pointer <em class="arg">p</em> is <em class="arg">NULL</em>, it behaves as <em class="arg">mi_malloc</em>(<em class="arg">newsize</em>). If <em class="arg">newsize</em> is larger than the original <em class="arg">size</em> allocated for <em class="arg">p</em>, the bytes after <em class="arg">size</em> are uninitialized.</p>
 <dl class="section see"><dt>See also</dt><dd><a href="https://www.freebsd.org/cgi/man.cgi?query=reallocf">reallocf</a> (on BSD) </dd></dl>
 
 </div>
 </div>
-<a id="ga61d57b4144ba24fba5c1e9b956d13853"></a>
-<h2 class="memtitle"><span class="permalink"><a href="#ga61d57b4144ba24fba5c1e9b956d13853">&#9670;&nbsp;</a></span>mi_reallocn()</h2>
+<a id="ga8bddfb4a1270a0854bbcf44cb3980467" name="ga8bddfb4a1270a0854bbcf44cb3980467"></a>
+<h2 class="memtitle"><span class="permalink"><a href="#ga8bddfb4a1270a0854bbcf44cb3980467">&#9670;&#160;</a></span>mi_reallocn()</h2>
 
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname">void* mi_reallocn </td>
+          <td class="memname">void * mi_reallocn </td>
           <td>(</td>
-          <td class="paramtype">void *&#160;</td>
-          <td class="paramname"><em>p</em>, </td>
+          <td class="paramtype">void *</td>          <td class="paramname"><span class="paramname"><em>p</em></span>, </td>
         </tr>
         <tr>
           <td class="paramkey"></td>
           <td></td>
-          <td class="paramtype">size_t&#160;</td>
-          <td class="paramname"><em>count</em>, </td>
+          <td class="paramtype">size_t</td>          <td class="paramname"><span class="paramname"><em>count</em></span>, </td>
         </tr>
         <tr>
           <td class="paramkey"></td>
           <td></td>
-          <td class="paramtype">size_t&#160;</td>
-          <td class="paramname"><em>size</em>&#160;</td>
-        </tr>
-        <tr>
-          <td></td>
-          <td>)</td>
-          <td></td><td></td>
+          <td class="paramtype">size_t</td>          <td class="paramname"><span class="paramname"><em>size</em></span>&#160;)</td>
         </tr>
       </table>
 </div><div class="memdoc">
 
-<p>Re-allocate memory to <em>count</em> elements of <em>size</em> bytes. </p>
+<p>Re-allocate memory to <em class="arg">count</em> elements of <em class="arg">size</em> bytes. </p>
 <dl class="params"><dt>Parameters</dt><dd>
   <table class="params">
-    <tr><td class="paramname">p</td><td>Pointer to a previously allocated block (or <em>NULL</em>). </td></tr>
+    <tr><td class="paramname">p</td><td>Pointer to a previously allocated block (or <em class="arg">NULL</em>). </td></tr>
     <tr><td class="paramname">count</td><td>The number of elements. </td></tr>
     <tr><td class="paramname">size</td><td>The size of each element. </td></tr>
   </table>
   </dd>
 </dl>
-<dl class="section return"><dt>Returns</dt><dd>A pointer to a re-allocated block of <em>count</em> * <em>size</em> bytes, or <em>NULL</em> if out of memory or if <em>count</em> * <em>size</em> overflows.</dd></dl>
+<dl class="section return"><dt>Returns</dt><dd>A pointer to a re-allocated block of <em class="arg">count</em> * <em class="arg">size</em> bytes, or <em class="arg">NULL</em> if out of memory or if <em class="arg">count</em> * <em class="arg">size</em> overflows.</dd></dl>
 <p>If there is no overflow, it behaves exactly like <code>mi_realloc(p,count*size)</code>. </p><dl class="section see"><dt>See also</dt><dd><a href="http://man.openbsd.org/reallocarray">reallocarray()</a> (on BSD) </dd></dl>
 
 </div>
 </div>
-<a id="ga08cec32dd5bbe7da91c78d19f1b5bebe"></a>
-<h2 class="memtitle"><span class="permalink"><a href="#ga08cec32dd5bbe7da91c78d19f1b5bebe">&#9670;&nbsp;</a></span>mi_realpath()</h2>
+<a id="ga94c3afcc086e85d75a57e9f76b9b71dd" name="ga94c3afcc086e85d75a57e9f76b9b71dd"></a>
+<h2 class="memtitle"><span class="permalink"><a href="#ga94c3afcc086e85d75a57e9f76b9b71dd">&#9670;&#160;</a></span>mi_realpath()</h2>
 
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname">char* mi_realpath </td>
+          <td class="memname">char * mi_realpath </td>
           <td>(</td>
-          <td class="paramtype">const char *&#160;</td>
-          <td class="paramname"><em>fname</em>, </td>
+          <td class="paramtype">const char *</td>          <td class="paramname"><span class="paramname"><em>fname</em></span>, </td>
         </tr>
         <tr>
           <td class="paramkey"></td>
           <td></td>
-          <td class="paramtype">char *&#160;</td>
-          <td class="paramname"><em>resolved_name</em>&#160;</td>
-        </tr>
-        <tr>
-          <td></td>
-          <td>)</td>
-          <td></td><td></td>
+          <td class="paramtype">char *</td>          <td class="paramname"><span class="paramname"><em>resolved_name</em></span>&#160;)</td>
         </tr>
       </table>
 </div><div class="memdoc">
@@ -474,18 +431,18 @@ <h2 class="memtitle"><span class="permalink"><a href="#ga08cec32dd5bbe7da91c78d1
 <dl class="params"><dt>Parameters</dt><dd>
   <table class="params">
     <tr><td class="paramname">fname</td><td>File name. </td></tr>
-    <tr><td class="paramname">resolved_name</td><td>Should be <em>NULL</em> (but can also point to a buffer of at least <em>PATH_MAX</em> bytes). </td></tr>
+    <tr><td class="paramname">resolved_name</td><td>Should be <em class="arg">NULL</em> (but can also point to a buffer of at least <em class="arg">PATH_MAX</em> bytes). </td></tr>
   </table>
   </dd>
 </dl>
-<dl class="section return"><dt>Returns</dt><dd>If successful a pointer to the resolved absolute file name, or <em>NULL</em> on failure (with <em>errno</em> set to the error code).</dd></dl>
-<p>If <em>resolved_name</em> was <em>NULL</em>, the returned result should be freed with <a class="el" href="group__malloc.html#gaf2c7b89c327d1f60f59e68b9ea644d95" title="Free previously allocated memory.">mi_free()</a>.</p>
-<p>Replacement for the standard <a href="http://pubs.opengroup.org/onlinepubs/9699919799/functions/realpath.html">realpath()</a> such that <a class="el" href="group__malloc.html#gaf2c7b89c327d1f60f59e68b9ea644d95" title="Free previously allocated memory.">mi_free()</a> can be used on the returned result (if <em>resolved_name</em> was <em>NULL</em>). </p>
+<dl class="section return"><dt>Returns</dt><dd>If successful a pointer to the resolved absolute file name, or <em class="arg">NULL</em> on failure (with <em class="arg">errno</em> set to the error code).</dd></dl>
+<p>If <em class="arg">resolved_name</em> was <em class="arg">NULL</em>, the returned result should be freed with <a class="el" href="#gaf2c7b89c327d1f60f59e68b9ea644d95" title="Free previously allocated memory.">mi_free()</a>.</p>
+<p>Replacement for the standard <a href="http://pubs.opengroup.org/onlinepubs/9699919799/functions/realpath.html">realpath()</a> such that <a class="el" href="#gaf2c7b89c327d1f60f59e68b9ea644d95" title="Free previously allocated memory.">mi_free()</a> can be used on the returned result (if <em class="arg">resolved_name</em> was <em class="arg">NULL</em>). </p>
 
 </div>
 </div>
-<a id="ga23a0fbb452b5dce8e31fab1a1958cacc"></a>
-<h2 class="memtitle"><span class="permalink"><a href="#ga23a0fbb452b5dce8e31fab1a1958cacc">&#9670;&nbsp;</a></span>mi_recalloc()</h2>
+<a id="ga23a0fbb452b5dce8e31fab1a1958cacc" name="ga23a0fbb452b5dce8e31fab1a1958cacc"></a>
+<h2 class="memtitle"><span class="permalink"><a href="#ga23a0fbb452b5dce8e31fab1a1958cacc">&#9670;&#160;</a></span>mi_recalloc()</h2>
 
 <div class="memitem">
 <div class="memproto">
@@ -493,56 +450,47 @@ <h2 class="memtitle"><span class="permalink"><a href="#ga23a0fbb452b5dce8e31fab1
         <tr>
           <td class="memname">void * mi_recalloc </td>
           <td>(</td>
-          <td class="paramtype">void *&#160;</td>
-          <td class="paramname"><em>p</em>, </td>
+          <td class="paramtype">void *</td>          <td class="paramname"><span class="paramname"><em>p</em></span>, </td>
         </tr>
         <tr>
           <td class="paramkey"></td>
           <td></td>
-          <td class="paramtype">size_t&#160;</td>
-          <td class="paramname"><em>count</em>, </td>
+          <td class="paramtype">size_t</td>          <td class="paramname"><span class="paramname"><em>count</em></span>, </td>
         </tr>
         <tr>
           <td class="paramkey"></td>
           <td></td>
-          <td class="paramtype">size_t&#160;</td>
-          <td class="paramname"><em>size</em>&#160;</td>
-        </tr>
-        <tr>
-          <td></td>
-          <td>)</td>
-          <td></td><td></td>
+          <td class="paramtype">size_t</td>          <td class="paramname"><span class="paramname"><em>size</em></span>&#160;)</td>
         </tr>
       </table>
 </div><div class="memdoc">
 
-<p>Re-allocate memory to <em>count</em> elements of <em>size</em> bytes, with extra memory initialized to zero. </p>
+<p>Re-allocate memory to <em class="arg">count</em> elements of <em class="arg">size</em> bytes, with extra memory initialized to zero. </p>
 <dl class="params"><dt>Parameters</dt><dd>
   <table class="params">
-    <tr><td class="paramname">p</td><td>Pointer to a previously allocated block (or <em>NULL</em>). </td></tr>
+    <tr><td class="paramname">p</td><td>Pointer to a previously allocated block (or <em class="arg">NULL</em>). </td></tr>
     <tr><td class="paramname">count</td><td>The number of elements. </td></tr>
     <tr><td class="paramname">size</td><td>The size of each element. </td></tr>
   </table>
   </dd>
 </dl>
-<dl class="section return"><dt>Returns</dt><dd>A pointer to a re-allocated block of <em>count</em> * <em>size</em> bytes, or <em>NULL</em> if out of memory or if <em>count</em> * <em>size</em> overflows.</dd></dl>
-<p>If there is no overflow, it behaves exactly like <code>mi_rezalloc(p,count*size)</code>. </p><dl class="section see"><dt>See also</dt><dd><a class="el" href="group__malloc.html#ga61d57b4144ba24fba5c1e9b956d13853" title="Re-allocate memory to count elements of size bytes.">mi_reallocn()</a> </dd>
+<dl class="section return"><dt>Returns</dt><dd>A pointer to a re-allocated block of <em class="arg">count</em> * <em class="arg">size</em> bytes, or <em class="arg">NULL</em> if out of memory or if <em class="arg">count</em> * <em class="arg">size</em> overflows.</dd></dl>
+<p>If there is no overflow, it behaves exactly like <code>mi_rezalloc(p,count*size)</code>. </p><dl class="section see"><dt>See also</dt><dd><a class="el" href="#ga8bddfb4a1270a0854bbcf44cb3980467" title="Re-allocate memory to count elements of size bytes.">mi_reallocn()</a> </dd>
 <dd>
 <a href="http://man.openbsd.org/reallocarray">recallocarray()</a> (on BSD). </dd></dl>
 
 </div>
 </div>
-<a id="gac7cffe13f1f458ed16789488bf92b9b2"></a>
-<h2 class="memtitle"><span class="permalink"><a href="#gac7cffe13f1f458ed16789488bf92b9b2">&#9670;&nbsp;</a></span>mi_strdup()</h2>
+<a id="ga245ac90ebc2cfdd17de599e5fea59889" name="ga245ac90ebc2cfdd17de599e5fea59889"></a>
+<h2 class="memtitle"><span class="permalink"><a href="#ga245ac90ebc2cfdd17de599e5fea59889">&#9670;&#160;</a></span>mi_strdup()</h2>
 
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname">char* mi_strdup </td>
+          <td class="memname">char * mi_strdup </td>
           <td>(</td>
-          <td class="paramtype">const char *&#160;</td>
-          <td class="paramname"><em>s</em></td><td>)</td>
+          <td class="paramtype">const char *</td>          <td class="paramname"><span class="paramname"><em>s</em></span></td><td>)</td>
           <td></td>
         </tr>
       </table>
@@ -551,65 +499,57 @@ <h2 class="memtitle"><span class="permalink"><a href="#gac7cffe13f1f458ed1678948
 <p>Allocate and duplicate a string. </p>
 <dl class="params"><dt>Parameters</dt><dd>
   <table class="params">
-    <tr><td class="paramname">s</td><td>string to duplicate (or <em>NULL</em>). </td></tr>
+    <tr><td class="paramname">s</td><td>string to duplicate (or <em class="arg">NULL</em>). </td></tr>
   </table>
   </dd>
 </dl>
-<dl class="section return"><dt>Returns</dt><dd>a pointer to newly allocated memory initialized to string <em>s</em>, or <em>NULL</em> if either out of memory or if <em>s</em> is <em>NULL</em>.</dd></dl>
-<p>Replacement for the standard <a href="http://pubs.opengroup.org/onlinepubs/9699919799/functions/strdup.html">strdup()</a> such that <a class="el" href="group__malloc.html#gaf2c7b89c327d1f60f59e68b9ea644d95" title="Free previously allocated memory.">mi_free()</a> can be used on the returned result. </p>
+<dl class="section return"><dt>Returns</dt><dd>a pointer to newly allocated memory initialized to string <em class="arg">s</em>, or <em class="arg">NULL</em> if either out of memory or if <em class="arg">s</em> is <em class="arg">NULL</em>.</dd></dl>
+<p>Replacement for the standard <a href="http://pubs.opengroup.org/onlinepubs/9699919799/functions/strdup.html">strdup()</a> such that <a class="el" href="#gaf2c7b89c327d1f60f59e68b9ea644d95" title="Free previously allocated memory.">mi_free()</a> can be used on the returned result. </p>
 
 </div>
 </div>
-<a id="gaaabf971c2571891433477e2d21a35266"></a>
-<h2 class="memtitle"><span class="permalink"><a href="#gaaabf971c2571891433477e2d21a35266">&#9670;&nbsp;</a></span>mi_strndup()</h2>
+<a id="ga486d0d26b3b3794f6d1cdb41a9aed92d" name="ga486d0d26b3b3794f6d1cdb41a9aed92d"></a>
+<h2 class="memtitle"><span class="permalink"><a href="#ga486d0d26b3b3794f6d1cdb41a9aed92d">&#9670;&#160;</a></span>mi_strndup()</h2>
 
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname">char* mi_strndup </td>
+          <td class="memname">char * mi_strndup </td>
           <td>(</td>
-          <td class="paramtype">const char *&#160;</td>
-          <td class="paramname"><em>s</em>, </td>
+          <td class="paramtype">const char *</td>          <td class="paramname"><span class="paramname"><em>s</em></span>, </td>
         </tr>
         <tr>
           <td class="paramkey"></td>
           <td></td>
-          <td class="paramtype">size_t&#160;</td>
-          <td class="paramname"><em>n</em>&#160;</td>
-        </tr>
-        <tr>
-          <td></td>
-          <td>)</td>
-          <td></td><td></td>
+          <td class="paramtype">size_t</td>          <td class="paramname"><span class="paramname"><em>n</em></span>&#160;)</td>
         </tr>
       </table>
 </div><div class="memdoc">
 
-<p>Allocate and duplicate a string up to <em>n</em> bytes. </p>
+<p>Allocate and duplicate a string up to <em class="arg">n</em> bytes. </p>
 <dl class="params"><dt>Parameters</dt><dd>
   <table class="params">
-    <tr><td class="paramname">s</td><td>string to duplicate (or <em>NULL</em>). </td></tr>
+    <tr><td class="paramname">s</td><td>string to duplicate (or <em class="arg">NULL</em>). </td></tr>
     <tr><td class="paramname">n</td><td>maximum number of bytes to copy (excluding the terminating zero). </td></tr>
   </table>
   </dd>
 </dl>
-<dl class="section return"><dt>Returns</dt><dd>a pointer to newly allocated memory initialized to string <em>s</em> up to the first <em>n</em> bytes (and always zero terminated), or <em>NULL</em> if either out of memory or if <em>s</em> is <em>NULL</em>.</dd></dl>
-<p>Replacement for the standard <a href="http://pubs.opengroup.org/onlinepubs/9699919799/functions/strndup.html">strndup()</a> such that <a class="el" href="group__malloc.html#gaf2c7b89c327d1f60f59e68b9ea644d95" title="Free previously allocated memory.">mi_free()</a> can be used on the returned result. </p>
+<dl class="section return"><dt>Returns</dt><dd>a pointer to newly allocated memory initialized to string <em class="arg">s</em> up to the first <em class="arg">n</em> bytes (and always zero terminated), or <em class="arg">NULL</em> if either out of memory or if <em class="arg">s</em> is <em class="arg">NULL</em>.</dd></dl>
+<p>Replacement for the standard <a href="http://pubs.opengroup.org/onlinepubs/9699919799/functions/strndup.html">strndup()</a> such that <a class="el" href="#gaf2c7b89c327d1f60f59e68b9ea644d95" title="Free previously allocated memory.">mi_free()</a> can be used on the returned result. </p>
 
 </div>
 </div>
-<a id="gafdd9d8bb2986e668ba9884f28af38000"></a>
-<h2 class="memtitle"><span class="permalink"><a href="#gafdd9d8bb2986e668ba9884f28af38000">&#9670;&nbsp;</a></span>mi_zalloc()</h2>
+<a id="gae6e38c4403247a7b40d80419e093bfb8" name="gae6e38c4403247a7b40d80419e093bfb8"></a>
+<h2 class="memtitle"><span class="permalink"><a href="#gae6e38c4403247a7b40d80419e093bfb8">&#9670;&#160;</a></span>mi_zalloc()</h2>
 
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname">void* mi_zalloc </td>
+          <td class="memname">void * mi_zalloc </td>
           <td>(</td>
-          <td class="paramtype">size_t&#160;</td>
-          <td class="paramname"><em>size</em></td><td>)</td>
+          <td class="paramtype">size_t</td>          <td class="paramname"><span class="paramname"><em>size</em></span></td><td>)</td>
           <td></td>
         </tr>
       </table>
@@ -622,7 +562,7 @@ <h2 class="memtitle"><span class="permalink"><a href="#gafdd9d8bb2986e668ba9884f
   </table>
   </dd>
 </dl>
-<dl class="section return"><dt>Returns</dt><dd>Pointer to newly allocated zero initialized memory, or <em>NULL</em> if out of memory. </dd></dl>
+<dl class="section return"><dt>Returns</dt><dd>Pointer to newly allocated zero initialized memory, or <em class="arg">NULL</em> if out of memory. </dd></dl>
 
 </div>
 </div>
@@ -631,7 +571,7 @@ <h2 class="memtitle"><span class="permalink"><a href="#gafdd9d8bb2986e668ba9884f
 <!-- start footer part -->
 <div id="nav-path" class="navpath"><!-- id is needed for treeview function! -->
   <ul>
-    <li class="footer">Generated by <a href="https://www.doxygen.org/index.html"><img class="footer" src="doxygen.svg" width="104" height="31" alt="doxygen"/></a> 1.9.1 </li>
+    <li class="footer">Generated by <a href="https://www.doxygen.org/index.html"><img class="footer" src="doxygen.svg" width="104" height="31" alt="doxygen"/></a> 1.13.1 </li>
   </ul>
 </div>
 </body>
diff --git a/depends/mimalloc/docs/group__malloc.js b/depends/mimalloc/docs/group__malloc.js
index 7293ffafd19a..5b0765205350 100644
--- a/depends/mimalloc/docs/group__malloc.js
+++ b/depends/mimalloc/docs/group__malloc.js
@@ -1,16 +1,16 @@
 var group__malloc =
 [
-    [ "mi_calloc", "group__malloc.html#ga97fedb4f7107c592fd7f0f0a8949a57d", null ],
-    [ "mi_expand", "group__malloc.html#gaaee66a1d483c3e28f585525fb96707e4", null ],
+    [ "mi_calloc", "group__malloc.html#ga6686568014b54d1e6c7ac64a076e4f56", null ],
+    [ "mi_expand", "group__malloc.html#ga19299856216cfbb08e2628593654dfb0", null ],
     [ "mi_free", "group__malloc.html#gaf2c7b89c327d1f60f59e68b9ea644d95", null ],
-    [ "mi_malloc", "group__malloc.html#ga3406e8b168bc74c8637b11571a6da83a", null ],
-    [ "mi_mallocn", "group__malloc.html#ga0b05e2bf0f73e7401ae08597ff782ac6", null ],
-    [ "mi_realloc", "group__malloc.html#gaf11eb497da57bdfb2de65eb191c69db6", null ],
-    [ "mi_reallocf", "group__malloc.html#gafe68ac7c5e24a65cd55c9d6b152211a0", null ],
-    [ "mi_reallocn", "group__malloc.html#ga61d57b4144ba24fba5c1e9b956d13853", null ],
-    [ "mi_realpath", "group__malloc.html#ga08cec32dd5bbe7da91c78d19f1b5bebe", null ],
+    [ "mi_malloc", "group__malloc.html#gae1dd97b542420c87ae085e822b1229e8", null ],
+    [ "mi_mallocn", "group__malloc.html#ga61f46bade3db76ca24aaafedc40de7b6", null ],
+    [ "mi_realloc", "group__malloc.html#ga0621af6a5e3aa384e6a1b548958bf583", null ],
+    [ "mi_reallocf", "group__malloc.html#ga4dc3a4067037b151a64629fe8a332641", null ],
+    [ "mi_reallocn", "group__malloc.html#ga8bddfb4a1270a0854bbcf44cb3980467", null ],
+    [ "mi_realpath", "group__malloc.html#ga94c3afcc086e85d75a57e9f76b9b71dd", null ],
     [ "mi_recalloc", "group__malloc.html#ga23a0fbb452b5dce8e31fab1a1958cacc", null ],
-    [ "mi_strdup", "group__malloc.html#gac7cffe13f1f458ed16789488bf92b9b2", null ],
-    [ "mi_strndup", "group__malloc.html#gaaabf971c2571891433477e2d21a35266", null ],
-    [ "mi_zalloc", "group__malloc.html#gafdd9d8bb2986e668ba9884f28af38000", null ]
+    [ "mi_strdup", "group__malloc.html#ga245ac90ebc2cfdd17de599e5fea59889", null ],
+    [ "mi_strndup", "group__malloc.html#ga486d0d26b3b3794f6d1cdb41a9aed92d", null ],
+    [ "mi_zalloc", "group__malloc.html#gae6e38c4403247a7b40d80419e093bfb8", null ]
 ];
\ No newline at end of file
diff --git a/depends/mimalloc/docs/group__options.html b/depends/mimalloc/docs/group__options.html
index f92905d42f51..1092afcb7002 100644
--- a/depends/mimalloc/docs/group__options.html
+++ b/depends/mimalloc/docs/group__options.html
@@ -1,24 +1,26 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "https://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
+<html xmlns="http://www.w3.org/1999/xhtml" lang="en-US">
 <head>
 <meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
-<meta http-equiv="X-UA-Compatible" content="IE=9"/>
-<meta name="generator" content="Doxygen 1.9.1"/>
+<meta http-equiv="X-UA-Compatible" content="IE=11"/>
+<meta name="generator" content="Doxygen 1.13.1"/>
 <meta name="viewport" content="width=device-width, initial-scale=1"/>
 <title>mi-malloc: Runtime Options</title>
 <link href="tabs.css" rel="stylesheet" type="text/css"/>
 <script type="text/javascript" src="jquery.js"></script>
 <script type="text/javascript" src="dynsections.js"></script>
+<script type="text/javascript" src="clipboard.js"></script>
 <link href="navtree.css" rel="stylesheet" type="text/css"/>
-<script type="text/javascript" src="resize.js"></script>
 <script type="text/javascript" src="navtreedata.js"></script>
 <script type="text/javascript" src="navtree.js"></script>
+<script type="text/javascript" src="resize.js"></script>
+<script type="text/javascript" src="cookie.js"></script>
 <link href="search/search.css" rel="stylesheet" type="text/css"/>
 <script type="text/javascript" src="search/searchdata.js"></script>
 <script type="text/javascript" src="search/search.js"></script>
 <script type="text/javascript">
-/* @license magnet:?xt=urn:btih:cf05388f2679ee054f2beb29a391d25f4e673ac3&amp;dn=gpl-2.0.txt GPL-v2 */
-  $(document).ready(function() { init_search(); });
+/* @license magnet:?xt=urn:btih:d3d9a9a6595521f9666a5e94cc830dab83b65699&amp;dn=expat.txt MIT */
+  $(function() { init_search(); });
 /* @license-end */
 </script>
 <link href="doxygen.css" rel="stylesheet" type="text/css" />
@@ -29,20 +31,16 @@
 <div id="titlearea">
 <table cellspacing="0" cellpadding="0">
  <tbody>
- <tr style="height: 56px;">
+ <tr id="projectrow">
   <td id="projectlogo"><img alt="Logo" src="mimalloc-logo.svg"/></td>
-  <td id="projectalign" style="padding-left: 0.5em;">
-   <div id="projectname">mi-malloc
-   &#160;<span id="projectnumber">1.7/2.0</span>
+  <td id="projectalign">
+   <div id="projectname">mi-malloc<span id="projectnumber">&#160;1.8/2.1</span>
    </div>
   </td>
-   <td>        <div id="MSearchBox" class="MSearchBoxInactive">
+    <td>        <div id="MSearchBox" class="MSearchBoxInactive">
         <span class="left">
-          <img id="MSearchSelect" src="search/mag_sel.svg"
-               onmouseover="return searchBox.OnSearchSelectShow()"
-               onmouseout="return searchBox.OnSearchSelectHide()"
-               alt=""/>
-          <input type="text" id="MSearchField" value="Search" accesskey="S"
+          <span id="MSearchSelect"                onmouseover="return searchBox.OnSearchSelectShow()"                onmouseout="return searchBox.OnSearchSelectHide()">&#160;</span>
+          <input type="text" id="MSearchField" value="" placeholder="Search" accesskey="S"
                onfocus="searchBox.OnSearchFieldFocus(true)" 
                onblur="searchBox.OnSearchFieldFocus(false)" 
                onkeyup="searchBox.OnSearchFieldChange(event)"/>
@@ -56,10 +54,15 @@
 </table>
 </div>
 <!-- end header part -->
-<!-- Generated by Doxygen 1.9.1 -->
+<!-- Generated by Doxygen 1.13.1 -->
+<script type="text/javascript">
+/* @license magnet:?xt=urn:btih:d3d9a9a6595521f9666a5e94cc830dab83b65699&amp;dn=expat.txt MIT */
+var searchBox = new SearchBox("searchBox", "search/",'.html');
+/* @license-end */
+</script>
 <script type="text/javascript">
-/* @license magnet:?xt=urn:btih:cf05388f2679ee054f2beb29a391d25f4e673ac3&amp;dn=gpl-2.0.txt GPL-v2 */
-var searchBox = new SearchBox("searchBox", "search",false,'Search','.html');
+/* @license magnet:?xt=urn:btih:d3d9a9a6595521f9666a5e94cc830dab83b65699&amp;dn=expat.txt MIT */
+$(function() { codefold.init(0); });
 /* @license-end */
 </script>
 </div><!-- top -->
@@ -74,8 +77,8 @@
   </div>
 </div>
 <script type="text/javascript">
-/* @license magnet:?xt=urn:btih:cf05388f2679ee054f2beb29a391d25f4e673ac3&amp;dn=gpl-2.0.txt GPL-v2 */
-$(document).ready(function(){initNavTree('group__options.html',''); initResizable(); });
+/* @license magnet:?xt=urn:btih:d3d9a9a6595521f9666a5e94cc830dab83b65699&amp;dn=expat.txt MIT */
+$(function(){initNavTree('group__options.html',''); initResizable(true); });
 /* @license-end */
 </script>
 <div id="doc-content">
@@ -88,128 +91,177 @@
 
 <!-- iframe showing the search results (closed by default) -->
 <div id="MSearchResultsWindow">
-<iframe src="javascript:void(0)" frameborder="0" 
-        name="MSearchResults" id="MSearchResults">
-</iframe>
+<div id="MSearchResults">
+<div class="SRPage">
+<div id="SRIndex">
+<div id="SRResults"></div>
+<div class="SRStatus" id="Loading">Loading...</div>
+<div class="SRStatus" id="Searching">Searching...</div>
+<div class="SRStatus" id="NoMatches">No Matches</div>
+</div>
+</div>
+</div>
 </div>
 
 <div class="header">
   <div class="summary">
 <a href="#enum-members">Enumerations</a> &#124;
 <a href="#func-members">Functions</a>  </div>
-  <div class="headertitle">
-<div class="title">Runtime Options</div>  </div>
+  <div class="headertitle"><div class="title">Runtime Options</div></div>
 </div><!--header-->
 <div class="contents">
 
 <p>Set runtime behavior.  
 <a href="#details">More...</a></p>
 <table class="memberdecls">
-<tr class="heading"><td colspan="2"><h2 class="groupheader"><a name="enum-members"></a>
+<tr class="heading"><td colspan="2"><h2 class="groupheader"><a id="enum-members" name="enum-members"></a>
 Enumerations</h2></td></tr>
-<tr class="memitem:gafebf7ed116adb38ae5218bc3ce06884c"><td class="memItemLeft" align="right" valign="top">enum &#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__options.html#gafebf7ed116adb38ae5218bc3ce06884c">mi_option_t</a> { <br />
-&#160;&#160;<a class="el" href="group__options.html#ggafebf7ed116adb38ae5218bc3ce06884cafbf4822e5c00732c5984b32a032837f0">mi_option_show_errors</a>
-, <a class="el" href="group__options.html#ggafebf7ed116adb38ae5218bc3ce06884ca0957ef73b2550764b4840edf48422fda">mi_option_show_stats</a>
-, <a class="el" href="group__options.html#ggafebf7ed116adb38ae5218bc3ce06884ca7c8b7bf5281c581bad64f5daa6442777">mi_option_verbose</a>
-, <a class="el" href="group__options.html#ggafebf7ed116adb38ae5218bc3ce06884ca1e8de72c93da7ff22d91e1e27b52ac2b">mi_option_eager_commit</a>
+<tr class="memitem:gafebf7ed116adb38ae5218bc3ce06884c" id="r_gafebf7ed116adb38ae5218bc3ce06884c"><td class="memItemLeft" align="right" valign="top">enum &#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="#gafebf7ed116adb38ae5218bc3ce06884c">mi_option_t</a> { <br />
+&#160;&#160;<a class="el" href="#ggafebf7ed116adb38ae5218bc3ce06884cafbf4822e5c00732c5984b32a032837f0">mi_option_show_errors</a>
+, <a class="el" href="#ggafebf7ed116adb38ae5218bc3ce06884ca0957ef73b2550764b4840edf48422fda">mi_option_show_stats</a>
+, <a class="el" href="#ggafebf7ed116adb38ae5218bc3ce06884ca7c8b7bf5281c581bad64f5daa6442777">mi_option_verbose</a>
+, <a class="el" href="#ggafebf7ed116adb38ae5218bc3ce06884caec6ecbe29d46a48205ed8823a8a52a6a">mi_option_max_errors</a>
+, <br />
+&#160;&#160;<a class="el" href="#ggafebf7ed116adb38ae5218bc3ce06884caf9595921087e942602ee079158762665">mi_option_max_warnings</a>
+, <a class="el" href="#ggafebf7ed116adb38ae5218bc3ce06884caca7ed041be3b0b9d0b82432c7bf41af2">mi_option_reserve_huge_os_pages</a>
+, <a class="el" href="#ggafebf7ed116adb38ae5218bc3ce06884caa13e7926d4339d2aa6fbf61d4473fd5c">mi_option_reserve_huge_os_pages_at</a>
+, <a class="el" href="#ggafebf7ed116adb38ae5218bc3ce06884cafbf4999c828cf79a0fb2de65d23f7333">mi_option_reserve_os_memory</a>
 , <br />
-&#160;&#160;<a class="el" href="group__options.html#ggafebf7ed116adb38ae5218bc3ce06884ca32ce97ece29f69e82579679cf8a307ad">mi_option_eager_region_commit</a>
-, <a class="el" href="group__options.html#ggafebf7ed116adb38ae5218bc3ce06884ca4192d491200d0055df0554d4cf65054e">mi_option_large_os_pages</a>
-, <a class="el" href="group__options.html#ggafebf7ed116adb38ae5218bc3ce06884caca7ed041be3b0b9d0b82432c7bf41af2">mi_option_reserve_huge_os_pages</a>
-, <a class="el" href="group__options.html#ggafebf7ed116adb38ae5218bc3ce06884caa13e7926d4339d2aa6fbf61d4473fd5c">mi_option_reserve_huge_os_pages_at</a>
+&#160;&#160;<a class="el" href="#ggafebf7ed116adb38ae5218bc3ce06884ca7cc4804ced69004fa42a9a136a9ba556">mi_option_allow_large_os_pages</a>
+, <a class="el" href="#ggafebf7ed116adb38ae5218bc3ce06884ca9d15c5e3d2115eef681c17e4dd5ab9a4">mi_option_purge_decommits</a>
+, <a class="el" href="#ggafebf7ed116adb38ae5218bc3ce06884cab1c88e23ae290bbeec824038a97959de">mi_option_arena_reserve</a>
+, <a class="el" href="#ggafebf7ed116adb38ae5218bc3ce06884ca4b74ae2a69e445de6c2361b73c1d14bf">mi_option_os_tag</a>
 , <br />
-&#160;&#160;<a class="el" href="group__options.html#ggafebf7ed116adb38ae5218bc3ce06884ca2ecbe7ef32f5c84de3739aa4f0b805a1">mi_option_segment_cache</a>
-, <a class="el" href="group__options.html#ggafebf7ed116adb38ae5218bc3ce06884cada854dd272c66342f18a93ee254a2968">mi_option_page_reset</a>
-, <a class="el" href="group__options.html#ggafebf7ed116adb38ae5218bc3ce06884cafb121d30d87591850d5410ccc3a95c6d">mi_option_segment_reset</a>
-, <a class="el" href="group__options.html#ggafebf7ed116adb38ae5218bc3ce06884ca154fe170131d5212cff57e22b99523c5">mi_option_reset_delay</a>
+&#160;&#160;<a class="el" href="#ggafebf7ed116adb38ae5218bc3ce06884ca8f51df355bf6651db899e6085b54865e">mi_option_retry_on_oom</a>
+, <a class="el" href="#ggafebf7ed116adb38ae5218bc3ce06884ca1e8de72c93da7ff22d91e1e27b52ac2b">mi_option_eager_commit</a>
+, <a class="el" href="#ggafebf7ed116adb38ae5218bc3ce06884ca17a190c25be381142d87e0468c4c068c">mi_option_eager_commit_delay</a>
+, <a class="el" href="#ggafebf7ed116adb38ae5218bc3ce06884cafd0c5ddbc4b59fd8b5216871728167a5">mi_option_arena_eager_commit</a>
 , <br />
-&#160;&#160;<a class="el" href="group__options.html#ggafebf7ed116adb38ae5218bc3ce06884ca0ac33a18f6b659fcfaf44efb0bab1b74">mi_option_use_numa_nodes</a>
-, <a class="el" href="group__options.html#ggafebf7ed116adb38ae5218bc3ce06884cac81ee965b130fa81238913a3c239d536">mi_option_reset_decommits</a>
-, <a class="el" href="group__options.html#ggafebf7ed116adb38ae5218bc3ce06884ca17a190c25be381142d87e0468c4c068c">mi_option_eager_commit_delay</a>
-, <a class="el" href="group__options.html#ggafebf7ed116adb38ae5218bc3ce06884ca4b74ae2a69e445de6c2361b73c1d14bf">mi_option_os_tag</a>
+&#160;&#160;<a class="el" href="#ggafebf7ed116adb38ae5218bc3ce06884ca11e62ed69200a489a5be955582078c0c">mi_option_abandoned_page_purge</a>
+, <a class="el" href="#ggafebf7ed116adb38ae5218bc3ce06884cadd351e615acd8563529c20a347be7290">mi_option_purge_delay</a>
+, <a class="el" href="#ggafebf7ed116adb38ae5218bc3ce06884ca0ac33a18f6b659fcfaf44efb0bab1b74">mi_option_use_numa_nodes</a>
+, <a class="el" href="#ggafebf7ed116adb38ae5218bc3ce06884cadcfb5a09580361b1be65901d2d812de6">mi_option_disallow_os_alloc</a>
 , <br />
-&#160;&#160;<a class="el" href="group__options.html#ggafebf7ed116adb38ae5218bc3ce06884ca5b4357b74be0d87568036c32eb1a2e4a">_mi_option_last</a>
+&#160;&#160;<a class="el" href="#ggafebf7ed116adb38ae5218bc3ce06884ca9fa61bd9668479f8452d2195759444cc">mi_option_limit_os_alloc</a>
+, <a class="el" href="#ggafebf7ed116adb38ae5218bc3ce06884caa9ad9005d7017c8c30ad2d6ba31db909">mi_option_max_segment_reclaim</a>
+, <a class="el" href="#ggafebf7ed116adb38ae5218bc3ce06884ca6364331e305e7d3c0218b058ff3afc88">mi_option_destroy_on_exit</a>
+, <a class="el" href="#ggafebf7ed116adb38ae5218bc3ce06884ca8236501f1ab45d26e6fd885d191a2b5e">mi_option_arena_purge_mult</a>
+, <br />
+&#160;&#160;<a class="el" href="#ggafebf7ed116adb38ae5218bc3ce06884ca009e4b5684922ce664d73d2a8e1698d9">mi_option_abandoned_reclaim_on_free</a>
+, <a class="el" href="#ggafebf7ed116adb38ae5218bc3ce06884ca02005f164bdf03f5f00c5be726adf487">mi_option_purge_extend_delay</a>
+, <a class="el" href="#ggafebf7ed116adb38ae5218bc3ce06884caeae1696100e4057ffc4182730cc04e40">mi_option_disallow_arena_alloc</a>
+, <a class="el" href="#ggafebf7ed116adb38ae5218bc3ce06884ca38c67733a3956a1f4eeaca89fab9e78e">mi_option_visit_abandoned</a>
+, <br />
+&#160;&#160;<a class="el" href="#ggafebf7ed116adb38ae5218bc3ce06884ca5b4357b74be0d87568036c32eb1a2e4a">_mi_option_last</a>
 <br />
  }</td></tr>
-<tr class="memdesc:gafebf7ed116adb38ae5218bc3ce06884c"><td class="mdescLeft">&#160;</td><td class="mdescRight">Runtime options.  <a href="group__options.html#gafebf7ed116adb38ae5218bc3ce06884c">More...</a><br /></td></tr>
+<tr class="memdesc:gafebf7ed116adb38ae5218bc3ce06884c"><td class="mdescLeft">&#160;</td><td class="mdescRight">Runtime options.  <a href="#gafebf7ed116adb38ae5218bc3ce06884c">More...</a><br /></td></tr>
 <tr class="separator:gafebf7ed116adb38ae5218bc3ce06884c"><td class="memSeparator" colspan="2">&#160;</td></tr>
 </table><table class="memberdecls">
-<tr class="heading"><td colspan="2"><h2 class="groupheader"><a name="func-members"></a>
+<tr class="heading"><td colspan="2"><h2 class="groupheader"><a id="func-members" name="func-members"></a>
 Functions</h2></td></tr>
-<tr class="memitem:ga459ad98f18b3fc9275474807fe0ca188"><td class="memItemLeft" align="right" valign="top">bool&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__options.html#ga459ad98f18b3fc9275474807fe0ca188">mi_option_is_enabled</a> (<a class="el" href="group__options.html#gafebf7ed116adb38ae5218bc3ce06884c">mi_option_t</a> option)</td></tr>
+<tr class="memitem:ga459ad98f18b3fc9275474807fe0ca188" id="r_ga459ad98f18b3fc9275474807fe0ca188"><td class="memItemLeft" align="right" valign="top">bool&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="#ga459ad98f18b3fc9275474807fe0ca188">mi_option_is_enabled</a> (<a class="el" href="#gafebf7ed116adb38ae5218bc3ce06884c">mi_option_t</a> option)</td></tr>
 <tr class="separator:ga459ad98f18b3fc9275474807fe0ca188"><td class="memSeparator" colspan="2">&#160;</td></tr>
-<tr class="memitem:ga04180ae41b0d601421dd62ced40ca050"><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__options.html#ga04180ae41b0d601421dd62ced40ca050">mi_option_enable</a> (<a class="el" href="group__options.html#gafebf7ed116adb38ae5218bc3ce06884c">mi_option_t</a> option)</td></tr>
+<tr class="memitem:ga04180ae41b0d601421dd62ced40ca050" id="r_ga04180ae41b0d601421dd62ced40ca050"><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="#ga04180ae41b0d601421dd62ced40ca050">mi_option_enable</a> (<a class="el" href="#gafebf7ed116adb38ae5218bc3ce06884c">mi_option_t</a> option)</td></tr>
 <tr class="separator:ga04180ae41b0d601421dd62ced40ca050"><td class="memSeparator" colspan="2">&#160;</td></tr>
-<tr class="memitem:gaebf6ff707a2e688ebb1a2296ca564054"><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__options.html#gaebf6ff707a2e688ebb1a2296ca564054">mi_option_disable</a> (<a class="el" href="group__options.html#gafebf7ed116adb38ae5218bc3ce06884c">mi_option_t</a> option)</td></tr>
+<tr class="memitem:gaebf6ff707a2e688ebb1a2296ca564054" id="r_gaebf6ff707a2e688ebb1a2296ca564054"><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="#gaebf6ff707a2e688ebb1a2296ca564054">mi_option_disable</a> (<a class="el" href="#gafebf7ed116adb38ae5218bc3ce06884c">mi_option_t</a> option)</td></tr>
 <tr class="separator:gaebf6ff707a2e688ebb1a2296ca564054"><td class="memSeparator" colspan="2">&#160;</td></tr>
-<tr class="memitem:ga9a13d05fcb77489cb06d4d017ebd8bed"><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__options.html#ga9a13d05fcb77489cb06d4d017ebd8bed">mi_option_set_enabled</a> (<a class="el" href="group__options.html#gafebf7ed116adb38ae5218bc3ce06884c">mi_option_t</a> option, bool enable)</td></tr>
+<tr class="memitem:ga9a13d05fcb77489cb06d4d017ebd8bed" id="r_ga9a13d05fcb77489cb06d4d017ebd8bed"><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="#ga9a13d05fcb77489cb06d4d017ebd8bed">mi_option_set_enabled</a> (<a class="el" href="#gafebf7ed116adb38ae5218bc3ce06884c">mi_option_t</a> option, bool enable)</td></tr>
 <tr class="separator:ga9a13d05fcb77489cb06d4d017ebd8bed"><td class="memSeparator" colspan="2">&#160;</td></tr>
-<tr class="memitem:ga65518b69ec5d32336b50e07f74b3f629"><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__options.html#ga65518b69ec5d32336b50e07f74b3f629">mi_option_set_enabled_default</a> (<a class="el" href="group__options.html#gafebf7ed116adb38ae5218bc3ce06884c">mi_option_t</a> option, bool enable)</td></tr>
+<tr class="memitem:ga65518b69ec5d32336b50e07f74b3f629" id="r_ga65518b69ec5d32336b50e07f74b3f629"><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="#ga65518b69ec5d32336b50e07f74b3f629">mi_option_set_enabled_default</a> (<a class="el" href="#gafebf7ed116adb38ae5218bc3ce06884c">mi_option_t</a> option, bool enable)</td></tr>
 <tr class="separator:ga65518b69ec5d32336b50e07f74b3f629"><td class="memSeparator" colspan="2">&#160;</td></tr>
-<tr class="memitem:ga7e8af195cc81d3fa64ccf2662caa565a"><td class="memItemLeft" align="right" valign="top">long&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__options.html#ga7e8af195cc81d3fa64ccf2662caa565a">mi_option_get</a> (<a class="el" href="group__options.html#gafebf7ed116adb38ae5218bc3ce06884c">mi_option_t</a> option)</td></tr>
+<tr class="memitem:ga7e8af195cc81d3fa64ccf2662caa565a" id="r_ga7e8af195cc81d3fa64ccf2662caa565a"><td class="memItemLeft" align="right" valign="top">long&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="#ga7e8af195cc81d3fa64ccf2662caa565a">mi_option_get</a> (<a class="el" href="#gafebf7ed116adb38ae5218bc3ce06884c">mi_option_t</a> option)</td></tr>
 <tr class="separator:ga7e8af195cc81d3fa64ccf2662caa565a"><td class="memSeparator" colspan="2">&#160;</td></tr>
-<tr class="memitem:gaf84921c32375e25754dc2ee6a911fa60"><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__options.html#gaf84921c32375e25754dc2ee6a911fa60">mi_option_set</a> (<a class="el" href="group__options.html#gafebf7ed116adb38ae5218bc3ce06884c">mi_option_t</a> option, long value)</td></tr>
+<tr class="memitem:ga96ad9c406338bd314cfe878cfc9bf723" id="r_ga96ad9c406338bd314cfe878cfc9bf723"><td class="memItemLeft" align="right" valign="top">long&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="#ga96ad9c406338bd314cfe878cfc9bf723">mi_option_get_clamp</a> (<a class="el" href="#gafebf7ed116adb38ae5218bc3ce06884c">mi_option_t</a> option, long min, long max)</td></tr>
+<tr class="separator:ga96ad9c406338bd314cfe878cfc9bf723"><td class="memSeparator" colspan="2">&#160;</td></tr>
+<tr class="memitem:ga274db5a6ac87cc24ef0b23e7006ed02c" id="r_ga274db5a6ac87cc24ef0b23e7006ed02c"><td class="memItemLeft" align="right" valign="top">size_t&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="#ga274db5a6ac87cc24ef0b23e7006ed02c">mi_option_get_size</a> (<a class="el" href="#gafebf7ed116adb38ae5218bc3ce06884c">mi_option_t</a> option)</td></tr>
+<tr class="separator:ga274db5a6ac87cc24ef0b23e7006ed02c"><td class="memSeparator" colspan="2">&#160;</td></tr>
+<tr class="memitem:gaf84921c32375e25754dc2ee6a911fa60" id="r_gaf84921c32375e25754dc2ee6a911fa60"><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="#gaf84921c32375e25754dc2ee6a911fa60">mi_option_set</a> (<a class="el" href="#gafebf7ed116adb38ae5218bc3ce06884c">mi_option_t</a> option, long value)</td></tr>
 <tr class="separator:gaf84921c32375e25754dc2ee6a911fa60"><td class="memSeparator" colspan="2">&#160;</td></tr>
-<tr class="memitem:ga7ef623e440e6e5545cb08c94e71e4b90"><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__options.html#ga7ef623e440e6e5545cb08c94e71e4b90">mi_option_set_default</a> (<a class="el" href="group__options.html#gafebf7ed116adb38ae5218bc3ce06884c">mi_option_t</a> option, long value)</td></tr>
+<tr class="memitem:ga7ef623e440e6e5545cb08c94e71e4b90" id="r_ga7ef623e440e6e5545cb08c94e71e4b90"><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="#ga7ef623e440e6e5545cb08c94e71e4b90">mi_option_set_default</a> (<a class="el" href="#gafebf7ed116adb38ae5218bc3ce06884c">mi_option_t</a> option, long value)</td></tr>
 <tr class="separator:ga7ef623e440e6e5545cb08c94e71e4b90"><td class="memSeparator" colspan="2">&#160;</td></tr>
 </table>
 <a name="details" id="details"></a><h2 class="groupheader">Detailed Description</h2>
 <p>Set runtime behavior. </p>
 <h2 class="groupheader">Enumeration Type Documentation</h2>
-<a id="gafebf7ed116adb38ae5218bc3ce06884c"></a>
-<h2 class="memtitle"><span class="permalink"><a href="#gafebf7ed116adb38ae5218bc3ce06884c">&#9670;&nbsp;</a></span>mi_option_t</h2>
+<a id="gafebf7ed116adb38ae5218bc3ce06884c" name="gafebf7ed116adb38ae5218bc3ce06884c"></a>
+<h2 class="memtitle"><span class="permalink"><a href="#gafebf7ed116adb38ae5218bc3ce06884c">&#9670;&#160;</a></span>mi_option_t</h2>
 
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname">enum <a class="el" href="group__options.html#gafebf7ed116adb38ae5218bc3ce06884c">mi_option_t</a></td>
+          <td class="memname">enum <a class="el" href="#gafebf7ed116adb38ae5218bc3ce06884c">mi_option_t</a></td>
         </tr>
       </table>
 </div><div class="memdoc">
 
 <p>Runtime options. </p>
 <table class="fieldtable">
-<tr><th colspan="2">Enumerator</th></tr><tr><td class="fieldname"><a id="ggafebf7ed116adb38ae5218bc3ce06884cafbf4822e5c00732c5984b32a032837f0"></a>mi_option_show_errors&#160;</td><td class="fielddoc"><p>Print error messages to <code>stderr</code>. </p>
+<tr><th colspan="2">Enumerator</th></tr><tr><td class="fieldname"><a id="ggafebf7ed116adb38ae5218bc3ce06884cafbf4822e5c00732c5984b32a032837f0" name="ggafebf7ed116adb38ae5218bc3ce06884cafbf4822e5c00732c5984b32a032837f0"></a>mi_option_show_errors&#160;</td><td class="fielddoc"><p>Print error messages. </p>
+</td></tr>
+<tr><td class="fieldname"><a id="ggafebf7ed116adb38ae5218bc3ce06884ca0957ef73b2550764b4840edf48422fda" name="ggafebf7ed116adb38ae5218bc3ce06884ca0957ef73b2550764b4840edf48422fda"></a>mi_option_show_stats&#160;</td><td class="fielddoc"><p>Print statistics on termination. </p>
+</td></tr>
+<tr><td class="fieldname"><a id="ggafebf7ed116adb38ae5218bc3ce06884ca7c8b7bf5281c581bad64f5daa6442777" name="ggafebf7ed116adb38ae5218bc3ce06884ca7c8b7bf5281c581bad64f5daa6442777"></a>mi_option_verbose&#160;</td><td class="fielddoc"><p>Print verbose messages. </p>
+</td></tr>
+<tr><td class="fieldname"><a id="ggafebf7ed116adb38ae5218bc3ce06884caec6ecbe29d46a48205ed8823a8a52a6a" name="ggafebf7ed116adb38ae5218bc3ce06884caec6ecbe29d46a48205ed8823a8a52a6a"></a>mi_option_max_errors&#160;</td><td class="fielddoc"><p>issue at most N error messages </p>
+</td></tr>
+<tr><td class="fieldname"><a id="ggafebf7ed116adb38ae5218bc3ce06884caf9595921087e942602ee079158762665" name="ggafebf7ed116adb38ae5218bc3ce06884caf9595921087e942602ee079158762665"></a>mi_option_max_warnings&#160;</td><td class="fielddoc"><p>issue at most N warning messages </p>
+</td></tr>
+<tr><td class="fieldname"><a id="ggafebf7ed116adb38ae5218bc3ce06884caca7ed041be3b0b9d0b82432c7bf41af2" name="ggafebf7ed116adb38ae5218bc3ce06884caca7ed041be3b0b9d0b82432c7bf41af2"></a>mi_option_reserve_huge_os_pages&#160;</td><td class="fielddoc"><p>reserve N huge OS pages (1GiB pages) at startup </p>
+</td></tr>
+<tr><td class="fieldname"><a id="ggafebf7ed116adb38ae5218bc3ce06884caa13e7926d4339d2aa6fbf61d4473fd5c" name="ggafebf7ed116adb38ae5218bc3ce06884caa13e7926d4339d2aa6fbf61d4473fd5c"></a>mi_option_reserve_huge_os_pages_at&#160;</td><td class="fielddoc"><p>Reserve N huge OS pages at a specific NUMA node N. </p>
 </td></tr>
-<tr><td class="fieldname"><a id="ggafebf7ed116adb38ae5218bc3ce06884ca0957ef73b2550764b4840edf48422fda"></a>mi_option_show_stats&#160;</td><td class="fielddoc"><p>Print statistics to <code>stderr</code> when the program is done. </p>
+<tr><td class="fieldname"><a id="ggafebf7ed116adb38ae5218bc3ce06884cafbf4999c828cf79a0fb2de65d23f7333" name="ggafebf7ed116adb38ae5218bc3ce06884cafbf4999c828cf79a0fb2de65d23f7333"></a>mi_option_reserve_os_memory&#160;</td><td class="fielddoc"><p>reserve specified amount of OS memory in an arena at startup (internally, this value is in KiB; use <code>mi_option_get_size</code>) </p>
 </td></tr>
-<tr><td class="fieldname"><a id="ggafebf7ed116adb38ae5218bc3ce06884ca7c8b7bf5281c581bad64f5daa6442777"></a>mi_option_verbose&#160;</td><td class="fielddoc"><p>Print verbose messages to <code>stderr</code>. </p>
+<tr><td class="fieldname"><a id="ggafebf7ed116adb38ae5218bc3ce06884ca7cc4804ced69004fa42a9a136a9ba556" name="ggafebf7ed116adb38ae5218bc3ce06884ca7cc4804ced69004fa42a9a136a9ba556"></a>mi_option_allow_large_os_pages&#160;</td><td class="fielddoc"><p>allow large (2 or 4 MiB) OS pages, implies eager commit. If false, also disables THP for the process. </p>
 </td></tr>
-<tr><td class="fieldname"><a id="ggafebf7ed116adb38ae5218bc3ce06884ca1e8de72c93da7ff22d91e1e27b52ac2b"></a>mi_option_eager_commit&#160;</td><td class="fielddoc"><p>Eagerly commit segments (4MiB) (enabled by default). </p>
+<tr><td class="fieldname"><a id="ggafebf7ed116adb38ae5218bc3ce06884ca9d15c5e3d2115eef681c17e4dd5ab9a4" name="ggafebf7ed116adb38ae5218bc3ce06884ca9d15c5e3d2115eef681c17e4dd5ab9a4"></a>mi_option_purge_decommits&#160;</td><td class="fielddoc"><p>should a memory purge decommit? (=1). Set to 0 to use memory reset on a purge (instead of decommit) </p>
 </td></tr>
-<tr><td class="fieldname"><a id="ggafebf7ed116adb38ae5218bc3ce06884ca32ce97ece29f69e82579679cf8a307ad"></a>mi_option_eager_region_commit&#160;</td><td class="fielddoc"><p>Eagerly commit large (256MiB) memory regions (enabled by default, except on Windows) </p>
+<tr><td class="fieldname"><a id="ggafebf7ed116adb38ae5218bc3ce06884cab1c88e23ae290bbeec824038a97959de" name="ggafebf7ed116adb38ae5218bc3ce06884cab1c88e23ae290bbeec824038a97959de"></a>mi_option_arena_reserve&#160;</td><td class="fielddoc"><p>initial memory size for arena reservation (= 1 GiB on 64-bit) (internally, this value is in KiB; use <code>mi_option_get_size</code>) </p>
 </td></tr>
-<tr><td class="fieldname"><a id="ggafebf7ed116adb38ae5218bc3ce06884ca4192d491200d0055df0554d4cf65054e"></a>mi_option_large_os_pages&#160;</td><td class="fielddoc"><p>Use large OS pages (2MiB in size) if possible. </p>
+<tr><td class="fieldname"><a id="ggafebf7ed116adb38ae5218bc3ce06884ca4b74ae2a69e445de6c2361b73c1d14bf" name="ggafebf7ed116adb38ae5218bc3ce06884ca4b74ae2a69e445de6c2361b73c1d14bf"></a>mi_option_os_tag&#160;</td><td class="fielddoc"><p>tag used for OS logging (macOS only for now) (=100) </p>
 </td></tr>
-<tr><td class="fieldname"><a id="ggafebf7ed116adb38ae5218bc3ce06884caca7ed041be3b0b9d0b82432c7bf41af2"></a>mi_option_reserve_huge_os_pages&#160;</td><td class="fielddoc"><p>The number of huge OS pages (1GiB in size) to reserve at the start of the program. </p>
+<tr><td class="fieldname"><a id="ggafebf7ed116adb38ae5218bc3ce06884ca8f51df355bf6651db899e6085b54865e" name="ggafebf7ed116adb38ae5218bc3ce06884ca8f51df355bf6651db899e6085b54865e"></a>mi_option_retry_on_oom&#160;</td><td class="fielddoc"><p>retry on out-of-memory for N milli seconds (=400), set to 0 to disable retries. (only on windows) </p>
 </td></tr>
-<tr><td class="fieldname"><a id="ggafebf7ed116adb38ae5218bc3ce06884caa13e7926d4339d2aa6fbf61d4473fd5c"></a>mi_option_reserve_huge_os_pages_at&#160;</td><td class="fielddoc"><p>Reserve huge OS pages at node N. </p>
+<tr><td class="fieldname"><a id="ggafebf7ed116adb38ae5218bc3ce06884ca1e8de72c93da7ff22d91e1e27b52ac2b" name="ggafebf7ed116adb38ae5218bc3ce06884ca1e8de72c93da7ff22d91e1e27b52ac2b"></a>mi_option_eager_commit&#160;</td><td class="fielddoc"><p>eager commit segments? (after <code>eager_commit_delay</code> segments) (enabled by default). </p>
 </td></tr>
-<tr><td class="fieldname"><a id="ggafebf7ed116adb38ae5218bc3ce06884ca2ecbe7ef32f5c84de3739aa4f0b805a1"></a>mi_option_segment_cache&#160;</td><td class="fielddoc"><p>The number of segments per thread to keep cached. </p>
+<tr><td class="fieldname"><a id="ggafebf7ed116adb38ae5218bc3ce06884ca17a190c25be381142d87e0468c4c068c" name="ggafebf7ed116adb38ae5218bc3ce06884ca17a190c25be381142d87e0468c4c068c"></a>mi_option_eager_commit_delay&#160;</td><td class="fielddoc"><p>the first N segments per thread are not eagerly committed (but per page in the segment on demand) </p>
 </td></tr>
-<tr><td class="fieldname"><a id="ggafebf7ed116adb38ae5218bc3ce06884cada854dd272c66342f18a93ee254a2968"></a>mi_option_page_reset&#160;</td><td class="fielddoc"><p>Reset page memory after <em>mi_option_reset_delay</em> milliseconds when it becomes free. </p>
+<tr><td class="fieldname"><a id="ggafebf7ed116adb38ae5218bc3ce06884cafd0c5ddbc4b59fd8b5216871728167a5" name="ggafebf7ed116adb38ae5218bc3ce06884cafd0c5ddbc4b59fd8b5216871728167a5"></a>mi_option_arena_eager_commit&#160;</td><td class="fielddoc"><p>eager commit arenas? Use 2 to enable just on overcommit systems (=2) </p>
 </td></tr>
-<tr><td class="fieldname"><a id="ggafebf7ed116adb38ae5218bc3ce06884cafb121d30d87591850d5410ccc3a95c6d"></a>mi_option_segment_reset&#160;</td><td class="fielddoc"><p>Experimental. </p>
+<tr><td class="fieldname"><a id="ggafebf7ed116adb38ae5218bc3ce06884ca11e62ed69200a489a5be955582078c0c" name="ggafebf7ed116adb38ae5218bc3ce06884ca11e62ed69200a489a5be955582078c0c"></a>mi_option_abandoned_page_purge&#160;</td><td class="fielddoc"><p>immediately purge delayed purges on thread termination </p>
 </td></tr>
-<tr><td class="fieldname"><a id="ggafebf7ed116adb38ae5218bc3ce06884ca154fe170131d5212cff57e22b99523c5"></a>mi_option_reset_delay&#160;</td><td class="fielddoc"><p>Delay in milli-seconds before resetting a page (100ms by default) </p>
+<tr><td class="fieldname"><a id="ggafebf7ed116adb38ae5218bc3ce06884cadd351e615acd8563529c20a347be7290" name="ggafebf7ed116adb38ae5218bc3ce06884cadd351e615acd8563529c20a347be7290"></a>mi_option_purge_delay&#160;</td><td class="fielddoc"><p>memory purging is delayed by N milli seconds; use 0 for immediate purging or -1 for no purging at all. (=10) </p>
 </td></tr>
-<tr><td class="fieldname"><a id="ggafebf7ed116adb38ae5218bc3ce06884ca0ac33a18f6b659fcfaf44efb0bab1b74"></a>mi_option_use_numa_nodes&#160;</td><td class="fielddoc"><p>Pretend there are at most N NUMA nodes. </p>
+<tr><td class="fieldname"><a id="ggafebf7ed116adb38ae5218bc3ce06884ca0ac33a18f6b659fcfaf44efb0bab1b74" name="ggafebf7ed116adb38ae5218bc3ce06884ca0ac33a18f6b659fcfaf44efb0bab1b74"></a>mi_option_use_numa_nodes&#160;</td><td class="fielddoc"><p>0 = use all available numa nodes, otherwise use at most N nodes. </p>
 </td></tr>
-<tr><td class="fieldname"><a id="ggafebf7ed116adb38ae5218bc3ce06884cac81ee965b130fa81238913a3c239d536"></a>mi_option_reset_decommits&#160;</td><td class="fielddoc"><p>Experimental. </p>
+<tr><td class="fieldname"><a id="ggafebf7ed116adb38ae5218bc3ce06884cadcfb5a09580361b1be65901d2d812de6" name="ggafebf7ed116adb38ae5218bc3ce06884cadcfb5a09580361b1be65901d2d812de6"></a>mi_option_disallow_os_alloc&#160;</td><td class="fielddoc"><p>1 = do not use OS memory for allocation (but only programmatically reserved arenas) </p>
 </td></tr>
-<tr><td class="fieldname"><a id="ggafebf7ed116adb38ae5218bc3ce06884ca17a190c25be381142d87e0468c4c068c"></a>mi_option_eager_commit_delay&#160;</td><td class="fielddoc"><p>Experimental. </p>
+<tr><td class="fieldname"><a id="ggafebf7ed116adb38ae5218bc3ce06884ca9fa61bd9668479f8452d2195759444cc" name="ggafebf7ed116adb38ae5218bc3ce06884ca9fa61bd9668479f8452d2195759444cc"></a>mi_option_limit_os_alloc&#160;</td><td class="fielddoc"><p>If set to 1, do not use OS memory for allocation (but only pre-reserved arenas) </p>
 </td></tr>
-<tr><td class="fieldname"><a id="ggafebf7ed116adb38ae5218bc3ce06884ca4b74ae2a69e445de6c2361b73c1d14bf"></a>mi_option_os_tag&#160;</td><td class="fielddoc"><p>OS tag to assign to mimalloc'd memory. </p>
+<tr><td class="fieldname"><a id="ggafebf7ed116adb38ae5218bc3ce06884caa9ad9005d7017c8c30ad2d6ba31db909" name="ggafebf7ed116adb38ae5218bc3ce06884caa9ad9005d7017c8c30ad2d6ba31db909"></a>mi_option_max_segment_reclaim&#160;</td><td class="fielddoc"><p>max. percentage of the abandoned segments can be reclaimed per try (=10%) </p>
 </td></tr>
-<tr><td class="fieldname"><a id="ggafebf7ed116adb38ae5218bc3ce06884ca5b4357b74be0d87568036c32eb1a2e4a"></a>_mi_option_last&#160;</td><td class="fielddoc"></td></tr>
+<tr><td class="fieldname"><a id="ggafebf7ed116adb38ae5218bc3ce06884ca6364331e305e7d3c0218b058ff3afc88" name="ggafebf7ed116adb38ae5218bc3ce06884ca6364331e305e7d3c0218b058ff3afc88"></a>mi_option_destroy_on_exit&#160;</td><td class="fielddoc"><p>if set, release all memory on exit; sometimes used for dynamic unloading but can be unsafe </p>
+</td></tr>
+<tr><td class="fieldname"><a id="ggafebf7ed116adb38ae5218bc3ce06884ca8236501f1ab45d26e6fd885d191a2b5e" name="ggafebf7ed116adb38ae5218bc3ce06884ca8236501f1ab45d26e6fd885d191a2b5e"></a>mi_option_arena_purge_mult&#160;</td><td class="fielddoc"><p>multiplier for <code>purge_delay</code> for the purging delay for arenas (=10) </p>
+</td></tr>
+<tr><td class="fieldname"><a id="ggafebf7ed116adb38ae5218bc3ce06884ca009e4b5684922ce664d73d2a8e1698d9" name="ggafebf7ed116adb38ae5218bc3ce06884ca009e4b5684922ce664d73d2a8e1698d9"></a>mi_option_abandoned_reclaim_on_free&#160;</td><td class="fielddoc"><p>allow to reclaim an abandoned segment on a free (=1) </p>
+</td></tr>
+<tr><td class="fieldname"><a id="ggafebf7ed116adb38ae5218bc3ce06884ca02005f164bdf03f5f00c5be726adf487" name="ggafebf7ed116adb38ae5218bc3ce06884ca02005f164bdf03f5f00c5be726adf487"></a>mi_option_purge_extend_delay&#160;</td><td class="fielddoc"><p>extend purge delay on each subsequent delay (=1) </p>
+</td></tr>
+<tr><td class="fieldname"><a id="ggafebf7ed116adb38ae5218bc3ce06884caeae1696100e4057ffc4182730cc04e40" name="ggafebf7ed116adb38ae5218bc3ce06884caeae1696100e4057ffc4182730cc04e40"></a>mi_option_disallow_arena_alloc&#160;</td><td class="fielddoc"><p>1 = do not use arena's for allocation (except if using specific arena id's) </p>
+</td></tr>
+<tr><td class="fieldname"><a id="ggafebf7ed116adb38ae5218bc3ce06884ca38c67733a3956a1f4eeaca89fab9e78e" name="ggafebf7ed116adb38ae5218bc3ce06884ca38c67733a3956a1f4eeaca89fab9e78e"></a>mi_option_visit_abandoned&#160;</td><td class="fielddoc"><p>allow visiting heap blocks from abandoned threads (=0) </p>
+</td></tr>
+<tr><td class="fieldname"><a id="ggafebf7ed116adb38ae5218bc3ce06884ca5b4357b74be0d87568036c32eb1a2e4a" name="ggafebf7ed116adb38ae5218bc3ce06884ca5b4357b74be0d87568036c32eb1a2e4a"></a>_mi_option_last&#160;</td><td class="fielddoc"></td></tr>
 </table>
 
 </div>
 </div>
 <h2 class="groupheader">Function Documentation</h2>
-<a id="gaebf6ff707a2e688ebb1a2296ca564054"></a>
-<h2 class="memtitle"><span class="permalink"><a href="#gaebf6ff707a2e688ebb1a2296ca564054">&#9670;&nbsp;</a></span>mi_option_disable()</h2>
+<a id="gaebf6ff707a2e688ebb1a2296ca564054" name="gaebf6ff707a2e688ebb1a2296ca564054"></a>
+<h2 class="memtitle"><span class="permalink"><a href="#gaebf6ff707a2e688ebb1a2296ca564054">&#9670;&#160;</a></span>mi_option_disable()</h2>
 
 <div class="memitem">
 <div class="memproto">
@@ -217,8 +269,7 @@ <h2 class="memtitle"><span class="permalink"><a href="#gaebf6ff707a2e688ebb1a229
         <tr>
           <td class="memname">void mi_option_disable </td>
           <td>(</td>
-          <td class="paramtype"><a class="el" href="group__options.html#gafebf7ed116adb38ae5218bc3ce06884c">mi_option_t</a>&#160;</td>
-          <td class="paramname"><em>option</em></td><td>)</td>
+          <td class="paramtype"><a class="el" href="#gafebf7ed116adb38ae5218bc3ce06884c">mi_option_t</a></td>          <td class="paramname"><span class="paramname"><em>option</em></span></td><td>)</td>
           <td></td>
         </tr>
       </table>
@@ -226,8 +277,8 @@ <h2 class="memtitle"><span class="permalink"><a href="#gaebf6ff707a2e688ebb1a229
 
 </div>
 </div>
-<a id="ga04180ae41b0d601421dd62ced40ca050"></a>
-<h2 class="memtitle"><span class="permalink"><a href="#ga04180ae41b0d601421dd62ced40ca050">&#9670;&nbsp;</a></span>mi_option_enable()</h2>
+<a id="ga04180ae41b0d601421dd62ced40ca050" name="ga04180ae41b0d601421dd62ced40ca050"></a>
+<h2 class="memtitle"><span class="permalink"><a href="#ga04180ae41b0d601421dd62ced40ca050">&#9670;&#160;</a></span>mi_option_enable()</h2>
 
 <div class="memitem">
 <div class="memproto">
@@ -235,8 +286,7 @@ <h2 class="memtitle"><span class="permalink"><a href="#ga04180ae41b0d601421dd62c
         <tr>
           <td class="memname">void mi_option_enable </td>
           <td>(</td>
-          <td class="paramtype"><a class="el" href="group__options.html#gafebf7ed116adb38ae5218bc3ce06884c">mi_option_t</a>&#160;</td>
-          <td class="paramname"><em>option</em></td><td>)</td>
+          <td class="paramtype"><a class="el" href="#gafebf7ed116adb38ae5218bc3ce06884c">mi_option_t</a></td>          <td class="paramname"><span class="paramname"><em>option</em></span></td><td>)</td>
           <td></td>
         </tr>
       </table>
@@ -244,8 +294,8 @@ <h2 class="memtitle"><span class="permalink"><a href="#ga04180ae41b0d601421dd62c
 
 </div>
 </div>
-<a id="ga7e8af195cc81d3fa64ccf2662caa565a"></a>
-<h2 class="memtitle"><span class="permalink"><a href="#ga7e8af195cc81d3fa64ccf2662caa565a">&#9670;&nbsp;</a></span>mi_option_get()</h2>
+<a id="ga7e8af195cc81d3fa64ccf2662caa565a" name="ga7e8af195cc81d3fa64ccf2662caa565a"></a>
+<h2 class="memtitle"><span class="permalink"><a href="#ga7e8af195cc81d3fa64ccf2662caa565a">&#9670;&#160;</a></span>mi_option_get()</h2>
 
 <div class="memitem">
 <div class="memproto">
@@ -253,8 +303,7 @@ <h2 class="memtitle"><span class="permalink"><a href="#ga7e8af195cc81d3fa64ccf26
         <tr>
           <td class="memname">long mi_option_get </td>
           <td>(</td>
-          <td class="paramtype"><a class="el" href="group__options.html#gafebf7ed116adb38ae5218bc3ce06884c">mi_option_t</a>&#160;</td>
-          <td class="paramname"><em>option</em></td><td>)</td>
+          <td class="paramtype"><a class="el" href="#gafebf7ed116adb38ae5218bc3ce06884c">mi_option_t</a></td>          <td class="paramname"><span class="paramname"><em>option</em></span></td><td>)</td>
           <td></td>
         </tr>
       </table>
@@ -262,82 +311,110 @@ <h2 class="memtitle"><span class="permalink"><a href="#ga7e8af195cc81d3fa64ccf26
 
 </div>
 </div>
-<a id="ga459ad98f18b3fc9275474807fe0ca188"></a>
-<h2 class="memtitle"><span class="permalink"><a href="#ga459ad98f18b3fc9275474807fe0ca188">&#9670;&nbsp;</a></span>mi_option_is_enabled()</h2>
+<a id="ga96ad9c406338bd314cfe878cfc9bf723" name="ga96ad9c406338bd314cfe878cfc9bf723"></a>
+<h2 class="memtitle"><span class="permalink"><a href="#ga96ad9c406338bd314cfe878cfc9bf723">&#9670;&#160;</a></span>mi_option_get_clamp()</h2>
 
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname">bool mi_option_is_enabled </td>
+          <td class="memname">long mi_option_get_clamp </td>
           <td>(</td>
-          <td class="paramtype"><a class="el" href="group__options.html#gafebf7ed116adb38ae5218bc3ce06884c">mi_option_t</a>&#160;</td>
-          <td class="paramname"><em>option</em></td><td>)</td>
+          <td class="paramtype"><a class="el" href="#gafebf7ed116adb38ae5218bc3ce06884c">mi_option_t</a></td>          <td class="paramname"><span class="paramname"><em>option</em></span>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">long</td>          <td class="paramname"><span class="paramname"><em>min</em></span>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
           <td></td>
+          <td class="paramtype">long</td>          <td class="paramname"><span class="paramname"><em>max</em></span>&#160;)</td>
         </tr>
       </table>
 </div><div class="memdoc">
 
 </div>
 </div>
-<a id="gaf84921c32375e25754dc2ee6a911fa60"></a>
-<h2 class="memtitle"><span class="permalink"><a href="#gaf84921c32375e25754dc2ee6a911fa60">&#9670;&nbsp;</a></span>mi_option_set()</h2>
+<a id="ga274db5a6ac87cc24ef0b23e7006ed02c" name="ga274db5a6ac87cc24ef0b23e7006ed02c"></a>
+<h2 class="memtitle"><span class="permalink"><a href="#ga274db5a6ac87cc24ef0b23e7006ed02c">&#9670;&#160;</a></span>mi_option_get_size()</h2>
 
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname">void mi_option_set </td>
+          <td class="memname">size_t mi_option_get_size </td>
           <td>(</td>
-          <td class="paramtype"><a class="el" href="group__options.html#gafebf7ed116adb38ae5218bc3ce06884c">mi_option_t</a>&#160;</td>
-          <td class="paramname"><em>option</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
+          <td class="paramtype"><a class="el" href="#gafebf7ed116adb38ae5218bc3ce06884c">mi_option_t</a></td>          <td class="paramname"><span class="paramname"><em>option</em></span></td><td>)</td>
           <td></td>
-          <td class="paramtype">long&#160;</td>
-          <td class="paramname"><em>value</em>&#160;</td>
         </tr>
+      </table>
+</div><div class="memdoc">
+
+</div>
+</div>
+<a id="ga459ad98f18b3fc9275474807fe0ca188" name="ga459ad98f18b3fc9275474807fe0ca188"></a>
+<h2 class="memtitle"><span class="permalink"><a href="#ga459ad98f18b3fc9275474807fe0ca188">&#9670;&#160;</a></span>mi_option_is_enabled()</h2>
+
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
+          <td class="memname">bool mi_option_is_enabled </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="#gafebf7ed116adb38ae5218bc3ce06884c">mi_option_t</a></td>          <td class="paramname"><span class="paramname"><em>option</em></span></td><td>)</td>
           <td></td>
-          <td>)</td>
-          <td></td><td></td>
         </tr>
       </table>
 </div><div class="memdoc">
 
 </div>
 </div>
-<a id="ga7ef623e440e6e5545cb08c94e71e4b90"></a>
-<h2 class="memtitle"><span class="permalink"><a href="#ga7ef623e440e6e5545cb08c94e71e4b90">&#9670;&nbsp;</a></span>mi_option_set_default()</h2>
+<a id="gaf84921c32375e25754dc2ee6a911fa60" name="gaf84921c32375e25754dc2ee6a911fa60"></a>
+<h2 class="memtitle"><span class="permalink"><a href="#gaf84921c32375e25754dc2ee6a911fa60">&#9670;&#160;</a></span>mi_option_set()</h2>
 
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname">void mi_option_set_default </td>
+          <td class="memname">void mi_option_set </td>
           <td>(</td>
-          <td class="paramtype"><a class="el" href="group__options.html#gafebf7ed116adb38ae5218bc3ce06884c">mi_option_t</a>&#160;</td>
-          <td class="paramname"><em>option</em>, </td>
+          <td class="paramtype"><a class="el" href="#gafebf7ed116adb38ae5218bc3ce06884c">mi_option_t</a></td>          <td class="paramname"><span class="paramname"><em>option</em></span>, </td>
         </tr>
         <tr>
           <td class="paramkey"></td>
           <td></td>
-          <td class="paramtype">long&#160;</td>
-          <td class="paramname"><em>value</em>&#160;</td>
+          <td class="paramtype">long</td>          <td class="paramname"><span class="paramname"><em>value</em></span>&#160;)</td>
+        </tr>
+      </table>
+</div><div class="memdoc">
+
+</div>
+</div>
+<a id="ga7ef623e440e6e5545cb08c94e71e4b90" name="ga7ef623e440e6e5545cb08c94e71e4b90"></a>
+<h2 class="memtitle"><span class="permalink"><a href="#ga7ef623e440e6e5545cb08c94e71e4b90">&#9670;&#160;</a></span>mi_option_set_default()</h2>
+
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">void mi_option_set_default </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="#gafebf7ed116adb38ae5218bc3ce06884c">mi_option_t</a></td>          <td class="paramname"><span class="paramname"><em>option</em></span>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td>)</td>
-          <td></td><td></td>
+          <td class="paramtype">long</td>          <td class="paramname"><span class="paramname"><em>value</em></span>&#160;)</td>
         </tr>
       </table>
 </div><div class="memdoc">
 
 </div>
 </div>
-<a id="ga9a13d05fcb77489cb06d4d017ebd8bed"></a>
-<h2 class="memtitle"><span class="permalink"><a href="#ga9a13d05fcb77489cb06d4d017ebd8bed">&#9670;&nbsp;</a></span>mi_option_set_enabled()</h2>
+<a id="ga9a13d05fcb77489cb06d4d017ebd8bed" name="ga9a13d05fcb77489cb06d4d017ebd8bed"></a>
+<h2 class="memtitle"><span class="permalink"><a href="#ga9a13d05fcb77489cb06d4d017ebd8bed">&#9670;&#160;</a></span>mi_option_set_enabled()</h2>
 
 <div class="memitem">
 <div class="memproto">
@@ -345,27 +422,20 @@ <h2 class="memtitle"><span class="permalink"><a href="#ga9a13d05fcb77489cb06d4d0
         <tr>
           <td class="memname">void mi_option_set_enabled </td>
           <td>(</td>
-          <td class="paramtype"><a class="el" href="group__options.html#gafebf7ed116adb38ae5218bc3ce06884c">mi_option_t</a>&#160;</td>
-          <td class="paramname"><em>option</em>, </td>
+          <td class="paramtype"><a class="el" href="#gafebf7ed116adb38ae5218bc3ce06884c">mi_option_t</a></td>          <td class="paramname"><span class="paramname"><em>option</em></span>, </td>
         </tr>
         <tr>
           <td class="paramkey"></td>
           <td></td>
-          <td class="paramtype">bool&#160;</td>
-          <td class="paramname"><em>enable</em>&#160;</td>
-        </tr>
-        <tr>
-          <td></td>
-          <td>)</td>
-          <td></td><td></td>
+          <td class="paramtype">bool</td>          <td class="paramname"><span class="paramname"><em>enable</em></span>&#160;)</td>
         </tr>
       </table>
 </div><div class="memdoc">
 
 </div>
 </div>
-<a id="ga65518b69ec5d32336b50e07f74b3f629"></a>
-<h2 class="memtitle"><span class="permalink"><a href="#ga65518b69ec5d32336b50e07f74b3f629">&#9670;&nbsp;</a></span>mi_option_set_enabled_default()</h2>
+<a id="ga65518b69ec5d32336b50e07f74b3f629" name="ga65518b69ec5d32336b50e07f74b3f629"></a>
+<h2 class="memtitle"><span class="permalink"><a href="#ga65518b69ec5d32336b50e07f74b3f629">&#9670;&#160;</a></span>mi_option_set_enabled_default()</h2>
 
 <div class="memitem">
 <div class="memproto">
@@ -373,19 +443,12 @@ <h2 class="memtitle"><span class="permalink"><a href="#ga65518b69ec5d32336b50e07
         <tr>
           <td class="memname">void mi_option_set_enabled_default </td>
           <td>(</td>
-          <td class="paramtype"><a class="el" href="group__options.html#gafebf7ed116adb38ae5218bc3ce06884c">mi_option_t</a>&#160;</td>
-          <td class="paramname"><em>option</em>, </td>
+          <td class="paramtype"><a class="el" href="#gafebf7ed116adb38ae5218bc3ce06884c">mi_option_t</a></td>          <td class="paramname"><span class="paramname"><em>option</em></span>, </td>
         </tr>
         <tr>
           <td class="paramkey"></td>
           <td></td>
-          <td class="paramtype">bool&#160;</td>
-          <td class="paramname"><em>enable</em>&#160;</td>
-        </tr>
-        <tr>
-          <td></td>
-          <td>)</td>
-          <td></td><td></td>
+          <td class="paramtype">bool</td>          <td class="paramname"><span class="paramname"><em>enable</em></span>&#160;)</td>
         </tr>
       </table>
 </div><div class="memdoc">
@@ -397,7 +460,7 @@ <h2 class="memtitle"><span class="permalink"><a href="#ga65518b69ec5d32336b50e07
 <!-- start footer part -->
 <div id="nav-path" class="navpath"><!-- id is needed for treeview function! -->
   <ul>
-    <li class="footer">Generated by <a href="https://www.doxygen.org/index.html"><img class="footer" src="doxygen.svg" width="104" height="31" alt="doxygen"/></a> 1.9.1 </li>
+    <li class="footer">Generated by <a href="https://www.doxygen.org/index.html"><img class="footer" src="doxygen.svg" width="104" height="31" alt="doxygen"/></a> 1.13.1 </li>
   </ul>
 </div>
 </body>
diff --git a/depends/mimalloc/docs/group__options.js b/depends/mimalloc/docs/group__options.js
index c8836cdc1c0d..b152f7bc33ce 100644
--- a/depends/mimalloc/docs/group__options.js
+++ b/depends/mimalloc/docs/group__options.js
@@ -4,24 +4,38 @@ var group__options =
       [ "mi_option_show_errors", "group__options.html#ggafebf7ed116adb38ae5218bc3ce06884cafbf4822e5c00732c5984b32a032837f0", null ],
       [ "mi_option_show_stats", "group__options.html#ggafebf7ed116adb38ae5218bc3ce06884ca0957ef73b2550764b4840edf48422fda", null ],
       [ "mi_option_verbose", "group__options.html#ggafebf7ed116adb38ae5218bc3ce06884ca7c8b7bf5281c581bad64f5daa6442777", null ],
-      [ "mi_option_eager_commit", "group__options.html#ggafebf7ed116adb38ae5218bc3ce06884ca1e8de72c93da7ff22d91e1e27b52ac2b", null ],
-      [ "mi_option_eager_region_commit", "group__options.html#ggafebf7ed116adb38ae5218bc3ce06884ca32ce97ece29f69e82579679cf8a307ad", null ],
-      [ "mi_option_large_os_pages", "group__options.html#ggafebf7ed116adb38ae5218bc3ce06884ca4192d491200d0055df0554d4cf65054e", null ],
+      [ "mi_option_max_errors", "group__options.html#ggafebf7ed116adb38ae5218bc3ce06884caec6ecbe29d46a48205ed8823a8a52a6a", null ],
+      [ "mi_option_max_warnings", "group__options.html#ggafebf7ed116adb38ae5218bc3ce06884caf9595921087e942602ee079158762665", null ],
       [ "mi_option_reserve_huge_os_pages", "group__options.html#ggafebf7ed116adb38ae5218bc3ce06884caca7ed041be3b0b9d0b82432c7bf41af2", null ],
       [ "mi_option_reserve_huge_os_pages_at", "group__options.html#ggafebf7ed116adb38ae5218bc3ce06884caa13e7926d4339d2aa6fbf61d4473fd5c", null ],
-      [ "mi_option_segment_cache", "group__options.html#ggafebf7ed116adb38ae5218bc3ce06884ca2ecbe7ef32f5c84de3739aa4f0b805a1", null ],
-      [ "mi_option_page_reset", "group__options.html#ggafebf7ed116adb38ae5218bc3ce06884cada854dd272c66342f18a93ee254a2968", null ],
-      [ "mi_option_segment_reset", "group__options.html#ggafebf7ed116adb38ae5218bc3ce06884cafb121d30d87591850d5410ccc3a95c6d", null ],
-      [ "mi_option_reset_delay", "group__options.html#ggafebf7ed116adb38ae5218bc3ce06884ca154fe170131d5212cff57e22b99523c5", null ],
-      [ "mi_option_use_numa_nodes", "group__options.html#ggafebf7ed116adb38ae5218bc3ce06884ca0ac33a18f6b659fcfaf44efb0bab1b74", null ],
-      [ "mi_option_reset_decommits", "group__options.html#ggafebf7ed116adb38ae5218bc3ce06884cac81ee965b130fa81238913a3c239d536", null ],
-      [ "mi_option_eager_commit_delay", "group__options.html#ggafebf7ed116adb38ae5218bc3ce06884ca17a190c25be381142d87e0468c4c068c", null ],
+      [ "mi_option_reserve_os_memory", "group__options.html#ggafebf7ed116adb38ae5218bc3ce06884cafbf4999c828cf79a0fb2de65d23f7333", null ],
+      [ "mi_option_allow_large_os_pages", "group__options.html#ggafebf7ed116adb38ae5218bc3ce06884ca7cc4804ced69004fa42a9a136a9ba556", null ],
+      [ "mi_option_purge_decommits", "group__options.html#ggafebf7ed116adb38ae5218bc3ce06884ca9d15c5e3d2115eef681c17e4dd5ab9a4", null ],
+      [ "mi_option_arena_reserve", "group__options.html#ggafebf7ed116adb38ae5218bc3ce06884cab1c88e23ae290bbeec824038a97959de", null ],
       [ "mi_option_os_tag", "group__options.html#ggafebf7ed116adb38ae5218bc3ce06884ca4b74ae2a69e445de6c2361b73c1d14bf", null ],
+      [ "mi_option_retry_on_oom", "group__options.html#ggafebf7ed116adb38ae5218bc3ce06884ca8f51df355bf6651db899e6085b54865e", null ],
+      [ "mi_option_eager_commit", "group__options.html#ggafebf7ed116adb38ae5218bc3ce06884ca1e8de72c93da7ff22d91e1e27b52ac2b", null ],
+      [ "mi_option_eager_commit_delay", "group__options.html#ggafebf7ed116adb38ae5218bc3ce06884ca17a190c25be381142d87e0468c4c068c", null ],
+      [ "mi_option_arena_eager_commit", "group__options.html#ggafebf7ed116adb38ae5218bc3ce06884cafd0c5ddbc4b59fd8b5216871728167a5", null ],
+      [ "mi_option_abandoned_page_purge", "group__options.html#ggafebf7ed116adb38ae5218bc3ce06884ca11e62ed69200a489a5be955582078c0c", null ],
+      [ "mi_option_purge_delay", "group__options.html#ggafebf7ed116adb38ae5218bc3ce06884cadd351e615acd8563529c20a347be7290", null ],
+      [ "mi_option_use_numa_nodes", "group__options.html#ggafebf7ed116adb38ae5218bc3ce06884ca0ac33a18f6b659fcfaf44efb0bab1b74", null ],
+      [ "mi_option_disallow_os_alloc", "group__options.html#ggafebf7ed116adb38ae5218bc3ce06884cadcfb5a09580361b1be65901d2d812de6", null ],
+      [ "mi_option_limit_os_alloc", "group__options.html#ggafebf7ed116adb38ae5218bc3ce06884ca9fa61bd9668479f8452d2195759444cc", null ],
+      [ "mi_option_max_segment_reclaim", "group__options.html#ggafebf7ed116adb38ae5218bc3ce06884caa9ad9005d7017c8c30ad2d6ba31db909", null ],
+      [ "mi_option_destroy_on_exit", "group__options.html#ggafebf7ed116adb38ae5218bc3ce06884ca6364331e305e7d3c0218b058ff3afc88", null ],
+      [ "mi_option_arena_purge_mult", "group__options.html#ggafebf7ed116adb38ae5218bc3ce06884ca8236501f1ab45d26e6fd885d191a2b5e", null ],
+      [ "mi_option_abandoned_reclaim_on_free", "group__options.html#ggafebf7ed116adb38ae5218bc3ce06884ca009e4b5684922ce664d73d2a8e1698d9", null ],
+      [ "mi_option_purge_extend_delay", "group__options.html#ggafebf7ed116adb38ae5218bc3ce06884ca02005f164bdf03f5f00c5be726adf487", null ],
+      [ "mi_option_disallow_arena_alloc", "group__options.html#ggafebf7ed116adb38ae5218bc3ce06884caeae1696100e4057ffc4182730cc04e40", null ],
+      [ "mi_option_visit_abandoned", "group__options.html#ggafebf7ed116adb38ae5218bc3ce06884ca38c67733a3956a1f4eeaca89fab9e78e", null ],
       [ "_mi_option_last", "group__options.html#ggafebf7ed116adb38ae5218bc3ce06884ca5b4357b74be0d87568036c32eb1a2e4a", null ]
     ] ],
     [ "mi_option_disable", "group__options.html#gaebf6ff707a2e688ebb1a2296ca564054", null ],
     [ "mi_option_enable", "group__options.html#ga04180ae41b0d601421dd62ced40ca050", null ],
     [ "mi_option_get", "group__options.html#ga7e8af195cc81d3fa64ccf2662caa565a", null ],
+    [ "mi_option_get_clamp", "group__options.html#ga96ad9c406338bd314cfe878cfc9bf723", null ],
+    [ "mi_option_get_size", "group__options.html#ga274db5a6ac87cc24ef0b23e7006ed02c", null ],
     [ "mi_option_is_enabled", "group__options.html#ga459ad98f18b3fc9275474807fe0ca188", null ],
     [ "mi_option_set", "group__options.html#gaf84921c32375e25754dc2ee6a911fa60", null ],
     [ "mi_option_set_default", "group__options.html#ga7ef623e440e6e5545cb08c94e71e4b90", null ],
diff --git a/depends/mimalloc/docs/group__posix.html b/depends/mimalloc/docs/group__posix.html
index 539f7ec68300..27351449ffe0 100644
--- a/depends/mimalloc/docs/group__posix.html
+++ b/depends/mimalloc/docs/group__posix.html
@@ -1,24 +1,26 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "https://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
+<html xmlns="http://www.w3.org/1999/xhtml" lang="en-US">
 <head>
 <meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
-<meta http-equiv="X-UA-Compatible" content="IE=9"/>
-<meta name="generator" content="Doxygen 1.9.1"/>
+<meta http-equiv="X-UA-Compatible" content="IE=11"/>
+<meta name="generator" content="Doxygen 1.13.1"/>
 <meta name="viewport" content="width=device-width, initial-scale=1"/>
 <title>mi-malloc: Posix</title>
 <link href="tabs.css" rel="stylesheet" type="text/css"/>
 <script type="text/javascript" src="jquery.js"></script>
 <script type="text/javascript" src="dynsections.js"></script>
+<script type="text/javascript" src="clipboard.js"></script>
 <link href="navtree.css" rel="stylesheet" type="text/css"/>
-<script type="text/javascript" src="resize.js"></script>
 <script type="text/javascript" src="navtreedata.js"></script>
 <script type="text/javascript" src="navtree.js"></script>
+<script type="text/javascript" src="resize.js"></script>
+<script type="text/javascript" src="cookie.js"></script>
 <link href="search/search.css" rel="stylesheet" type="text/css"/>
 <script type="text/javascript" src="search/searchdata.js"></script>
 <script type="text/javascript" src="search/search.js"></script>
 <script type="text/javascript">
-/* @license magnet:?xt=urn:btih:cf05388f2679ee054f2beb29a391d25f4e673ac3&amp;dn=gpl-2.0.txt GPL-v2 */
-  $(document).ready(function() { init_search(); });
+/* @license magnet:?xt=urn:btih:d3d9a9a6595521f9666a5e94cc830dab83b65699&amp;dn=expat.txt MIT */
+  $(function() { init_search(); });
 /* @license-end */
 </script>
 <link href="doxygen.css" rel="stylesheet" type="text/css" />
@@ -29,20 +31,16 @@
 <div id="titlearea">
 <table cellspacing="0" cellpadding="0">
  <tbody>
- <tr style="height: 56px;">
+ <tr id="projectrow">
   <td id="projectlogo"><img alt="Logo" src="mimalloc-logo.svg"/></td>
-  <td id="projectalign" style="padding-left: 0.5em;">
-   <div id="projectname">mi-malloc
-   &#160;<span id="projectnumber">1.7/2.0</span>
+  <td id="projectalign">
+   <div id="projectname">mi-malloc<span id="projectnumber">&#160;1.8/2.1</span>
    </div>
   </td>
-   <td>        <div id="MSearchBox" class="MSearchBoxInactive">
+    <td>        <div id="MSearchBox" class="MSearchBoxInactive">
         <span class="left">
-          <img id="MSearchSelect" src="search/mag_sel.svg"
-               onmouseover="return searchBox.OnSearchSelectShow()"
-               onmouseout="return searchBox.OnSearchSelectHide()"
-               alt=""/>
-          <input type="text" id="MSearchField" value="Search" accesskey="S"
+          <span id="MSearchSelect"                onmouseover="return searchBox.OnSearchSelectShow()"                onmouseout="return searchBox.OnSearchSelectHide()">&#160;</span>
+          <input type="text" id="MSearchField" value="" placeholder="Search" accesskey="S"
                onfocus="searchBox.OnSearchFieldFocus(true)" 
                onblur="searchBox.OnSearchFieldFocus(false)" 
                onkeyup="searchBox.OnSearchFieldChange(event)"/>
@@ -56,10 +54,15 @@
 </table>
 </div>
 <!-- end header part -->
-<!-- Generated by Doxygen 1.9.1 -->
+<!-- Generated by Doxygen 1.13.1 -->
+<script type="text/javascript">
+/* @license magnet:?xt=urn:btih:d3d9a9a6595521f9666a5e94cc830dab83b65699&amp;dn=expat.txt MIT */
+var searchBox = new SearchBox("searchBox", "search/",'.html');
+/* @license-end */
+</script>
 <script type="text/javascript">
-/* @license magnet:?xt=urn:btih:cf05388f2679ee054f2beb29a391d25f4e673ac3&amp;dn=gpl-2.0.txt GPL-v2 */
-var searchBox = new SearchBox("searchBox", "search",false,'Search','.html');
+/* @license magnet:?xt=urn:btih:d3d9a9a6595521f9666a5e94cc830dab83b65699&amp;dn=expat.txt MIT */
+$(function() { codefold.init(0); });
 /* @license-end */
 </script>
 </div><!-- top -->
@@ -74,8 +77,8 @@
   </div>
 </div>
 <script type="text/javascript">
-/* @license magnet:?xt=urn:btih:cf05388f2679ee054f2beb29a391d25f4e673ac3&amp;dn=gpl-2.0.txt GPL-v2 */
-$(document).ready(function(){initNavTree('group__posix.html',''); initResizable(); });
+/* @license magnet:?xt=urn:btih:d3d9a9a6595521f9666a5e94cc830dab83b65699&amp;dn=expat.txt MIT */
+$(function(){initNavTree('group__posix.html',''); initResizable(true); });
 /* @license-end */
 </script>
 <div id="doc-content">
@@ -88,62 +91,105 @@
 
 <!-- iframe showing the search results (closed by default) -->
 <div id="MSearchResultsWindow">
-<iframe src="javascript:void(0)" frameborder="0" 
-        name="MSearchResults" id="MSearchResults">
-</iframe>
+<div id="MSearchResults">
+<div class="SRPage">
+<div id="SRIndex">
+<div id="SRResults"></div>
+<div class="SRStatus" id="Loading">Loading...</div>
+<div class="SRStatus" id="Searching">Searching...</div>
+<div class="SRStatus" id="NoMatches">No Matches</div>
+</div>
+</div>
+</div>
 </div>
 
 <div class="header">
   <div class="summary">
 <a href="#func-members">Functions</a>  </div>
-  <div class="headertitle">
-<div class="title">Posix</div>  </div>
+  <div class="headertitle"><div class="title">Posix</div></div>
 </div><!--header-->
 <div class="contents">
 
 <p><code>mi_</code> prefixed implementations of various Posix, Unix, and C++ allocation functions.  
 <a href="#details">More...</a></p>
 <table class="memberdecls">
-<tr class="heading"><td colspan="2"><h2 class="groupheader"><a name="func-members"></a>
+<tr class="heading"><td colspan="2"><h2 class="groupheader"><a id="func-members" name="func-members"></a>
 Functions</h2></td></tr>
-<tr class="memitem:ga4531c9e775bb3ae12db57c1ba8a5d7de"><td class="memItemLeft" align="right" valign="top">size_t&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__posix.html#ga4531c9e775bb3ae12db57c1ba8a5d7de">mi_malloc_size</a> (const void *p)</td></tr>
+<tr class="memitem:ga705dc7a64bffacfeeb0141501a5c35d7" id="r_ga705dc7a64bffacfeeb0141501a5c35d7"><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="#ga705dc7a64bffacfeeb0141501a5c35d7">mi_cfree</a> (void *p)</td></tr>
+<tr class="memdesc:ga705dc7a64bffacfeeb0141501a5c35d7"><td class="mdescLeft">&#160;</td><td class="mdescRight">Just as <code>free</code> but also checks if the pointer <code>p</code> belongs to our heap.  <br /></td></tr>
+<tr class="separator:ga705dc7a64bffacfeeb0141501a5c35d7"><td class="memSeparator" colspan="2">&#160;</td></tr>
+<tr class="memitem:ga66bcfeb4faedbb42b796bc680821ef84" id="r_ga66bcfeb4faedbb42b796bc680821ef84"><td class="memItemLeft" align="right" valign="top">void *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="#ga66bcfeb4faedbb42b796bc680821ef84">mi__expand</a> (void *p, size_t newsize)</td></tr>
+<tr class="separator:ga66bcfeb4faedbb42b796bc680821ef84"><td class="memSeparator" colspan="2">&#160;</td></tr>
+<tr class="memitem:ga4531c9e775bb3ae12db57c1ba8a5d7de" id="r_ga4531c9e775bb3ae12db57c1ba8a5d7de"><td class="memItemLeft" align="right" valign="top">size_t&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="#ga4531c9e775bb3ae12db57c1ba8a5d7de">mi_malloc_size</a> (const void *p)</td></tr>
 <tr class="separator:ga4531c9e775bb3ae12db57c1ba8a5d7de"><td class="memSeparator" colspan="2">&#160;</td></tr>
-<tr class="memitem:ga06d07cf357bbac5c73ba5d0c0c421e17"><td class="memItemLeft" align="right" valign="top">size_t&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__posix.html#ga06d07cf357bbac5c73ba5d0c0c421e17">mi_malloc_usable_size</a> (const void *p)</td></tr>
+<tr class="memitem:ga9d23ac7885fed7413c11d8e0ffa31071" id="r_ga9d23ac7885fed7413c11d8e0ffa31071"><td class="memItemLeft" align="right" valign="top">size_t&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="#ga9d23ac7885fed7413c11d8e0ffa31071">mi_malloc_good_size</a> (size_t size)</td></tr>
+<tr class="separator:ga9d23ac7885fed7413c11d8e0ffa31071"><td class="memSeparator" colspan="2">&#160;</td></tr>
+<tr class="memitem:ga06d07cf357bbac5c73ba5d0c0c421e17" id="r_ga06d07cf357bbac5c73ba5d0c0c421e17"><td class="memItemLeft" align="right" valign="top">size_t&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="#ga06d07cf357bbac5c73ba5d0c0c421e17">mi_malloc_usable_size</a> (const void *p)</td></tr>
 <tr class="separator:ga06d07cf357bbac5c73ba5d0c0c421e17"><td class="memSeparator" colspan="2">&#160;</td></tr>
-<tr class="memitem:ga705dc7a64bffacfeeb0141501a5c35d7"><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__posix.html#ga705dc7a64bffacfeeb0141501a5c35d7">mi_cfree</a> (void *p)</td></tr>
-<tr class="memdesc:ga705dc7a64bffacfeeb0141501a5c35d7"><td class="mdescLeft">&#160;</td><td class="mdescRight">Just as <code>free</code> but also checks if the pointer <code>p</code> belongs to our heap.  <a href="group__posix.html#ga705dc7a64bffacfeeb0141501a5c35d7">More...</a><br /></td></tr>
-<tr class="separator:ga705dc7a64bffacfeeb0141501a5c35d7"><td class="memSeparator" colspan="2">&#160;</td></tr>
-<tr class="memitem:gacff84f226ba9feb2031b8992e5579447"><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__posix.html#gacff84f226ba9feb2031b8992e5579447">mi_posix_memalign</a> (void **p, size_t alignment, size_t size)</td></tr>
+<tr class="memitem:gacff84f226ba9feb2031b8992e5579447" id="r_gacff84f226ba9feb2031b8992e5579447"><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="#gacff84f226ba9feb2031b8992e5579447">mi_posix_memalign</a> (void **p, size_t alignment, size_t size)</td></tr>
 <tr class="separator:gacff84f226ba9feb2031b8992e5579447"><td class="memSeparator" colspan="2">&#160;</td></tr>
-<tr class="memitem:gad5a69c8fea96aa2b7a7c818c2130090a"><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__posix.html#gad5a69c8fea96aa2b7a7c818c2130090a">mi__posix_memalign</a> (void **p, size_t alignment, size_t size)</td></tr>
+<tr class="memitem:gad5a69c8fea96aa2b7a7c818c2130090a" id="r_gad5a69c8fea96aa2b7a7c818c2130090a"><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="#gad5a69c8fea96aa2b7a7c818c2130090a">mi__posix_memalign</a> (void **p, size_t alignment, size_t size)</td></tr>
 <tr class="separator:gad5a69c8fea96aa2b7a7c818c2130090a"><td class="memSeparator" colspan="2">&#160;</td></tr>
-<tr class="memitem:gaab7fa71ea93b96873f5d9883db57d40e"><td class="memItemLeft" align="right" valign="top">void *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__posix.html#gaab7fa71ea93b96873f5d9883db57d40e">mi_memalign</a> (size_t alignment, size_t size)</td></tr>
-<tr class="separator:gaab7fa71ea93b96873f5d9883db57d40e"><td class="memSeparator" colspan="2">&#160;</td></tr>
-<tr class="memitem:ga73baaf5951f5165ba0763d0c06b6a93b"><td class="memItemLeft" align="right" valign="top">void *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__posix.html#ga73baaf5951f5165ba0763d0c06b6a93b">mi_valloc</a> (size_t size)</td></tr>
-<tr class="separator:ga73baaf5951f5165ba0763d0c06b6a93b"><td class="memSeparator" colspan="2">&#160;</td></tr>
-<tr class="memitem:gaeb325c39b887d3b90d85d1eb1712fb1e"><td class="memItemLeft" align="right" valign="top">void *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__posix.html#gaeb325c39b887d3b90d85d1eb1712fb1e">mi_pvalloc</a> (size_t size)</td></tr>
-<tr class="separator:gaeb325c39b887d3b90d85d1eb1712fb1e"><td class="memSeparator" colspan="2">&#160;</td></tr>
-<tr class="memitem:ga1326d2e4388630b5f81ca7206318b8e5"><td class="memItemLeft" align="right" valign="top">void *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__posix.html#ga1326d2e4388630b5f81ca7206318b8e5">mi_aligned_alloc</a> (size_t alignment, size_t size)</td></tr>
-<tr class="separator:ga1326d2e4388630b5f81ca7206318b8e5"><td class="memSeparator" colspan="2">&#160;</td></tr>
-<tr class="memitem:ga48fad8648a2f1dab9c87ea9448a52088"><td class="memItemLeft" align="right" valign="top">void *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__posix.html#ga48fad8648a2f1dab9c87ea9448a52088">mi_reallocarray</a> (void *p, size_t count, size_t size)</td></tr>
-<tr class="memdesc:ga48fad8648a2f1dab9c87ea9448a52088"><td class="mdescLeft">&#160;</td><td class="mdescRight">Correspond s to <a href="https://www.freebsd.org/cgi/man.cgi?query=reallocarray&amp;sektion=3&amp;manpath=freebsd-release-ports">reallocarray</a> in FreeBSD.  <a href="group__posix.html#ga48fad8648a2f1dab9c87ea9448a52088">More...</a><br /></td></tr>
-<tr class="separator:ga48fad8648a2f1dab9c87ea9448a52088"><td class="memSeparator" colspan="2">&#160;</td></tr>
-<tr class="memitem:ga7e1934d60a3e697950eeb48e042bfad5"><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__posix.html#ga7e1934d60a3e697950eeb48e042bfad5">mi_reallocarr</a> (void *p, size_t count, size_t size)</td></tr>
-<tr class="memdesc:ga7e1934d60a3e697950eeb48e042bfad5"><td class="mdescLeft">&#160;</td><td class="mdescRight">Corresponds to <a href="https://man.netbsd.org/reallocarr.3">reallocarr</a> in NetBSD.  <a href="group__posix.html#ga7e1934d60a3e697950eeb48e042bfad5">More...</a><br /></td></tr>
+<tr class="memitem:ga726867f13fd29ca36064954c0285b1d8" id="r_ga726867f13fd29ca36064954c0285b1d8"><td class="memItemLeft" align="right" valign="top">void *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="#ga726867f13fd29ca36064954c0285b1d8">mi_memalign</a> (size_t alignment, size_t size)</td></tr>
+<tr class="separator:ga726867f13fd29ca36064954c0285b1d8"><td class="memSeparator" colspan="2">&#160;</td></tr>
+<tr class="memitem:ga50cafb9722020402f065de93799f64ca" id="r_ga50cafb9722020402f065de93799f64ca"><td class="memItemLeft" align="right" valign="top">void *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="#ga50cafb9722020402f065de93799f64ca">mi_valloc</a> (size_t size)</td></tr>
+<tr class="separator:ga50cafb9722020402f065de93799f64ca"><td class="memSeparator" colspan="2">&#160;</td></tr>
+<tr class="memitem:ga644bebccdbb2821542dd8c7e7641f476" id="r_ga644bebccdbb2821542dd8c7e7641f476"><td class="memItemLeft" align="right" valign="top">void *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="#ga644bebccdbb2821542dd8c7e7641f476">mi_pvalloc</a> (size_t size)</td></tr>
+<tr class="separator:ga644bebccdbb2821542dd8c7e7641f476"><td class="memSeparator" colspan="2">&#160;</td></tr>
+<tr class="memitem:ga430ed1513f0571ff83be00ec58a98ee0" id="r_ga430ed1513f0571ff83be00ec58a98ee0"><td class="memItemLeft" align="right" valign="top">void *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="#ga430ed1513f0571ff83be00ec58a98ee0">mi_aligned_alloc</a> (size_t alignment, size_t size)</td></tr>
+<tr class="separator:ga430ed1513f0571ff83be00ec58a98ee0"><td class="memSeparator" colspan="2">&#160;</td></tr>
+<tr class="memitem:gaa9fd7f25c9ac3a20e89b33bd6e383fcf" id="r_gaa9fd7f25c9ac3a20e89b33bd6e383fcf"><td class="memItemLeft" align="right" valign="top">unsigned short *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="#gaa9fd7f25c9ac3a20e89b33bd6e383fcf">mi_wcsdup</a> (const unsigned short *s)</td></tr>
+<tr class="separator:gaa9fd7f25c9ac3a20e89b33bd6e383fcf"><td class="memSeparator" colspan="2">&#160;</td></tr>
+<tr class="memitem:ga7b82a44094fdec4d2084eb4288a979b0" id="r_ga7b82a44094fdec4d2084eb4288a979b0"><td class="memItemLeft" align="right" valign="top">unsigned char *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="#ga7b82a44094fdec4d2084eb4288a979b0">mi_mbsdup</a> (const unsigned char *s)</td></tr>
+<tr class="separator:ga7b82a44094fdec4d2084eb4288a979b0"><td class="memSeparator" colspan="2">&#160;</td></tr>
+<tr class="memitem:gab41369c1a1da7504013a7a0b1d4dd958" id="r_gab41369c1a1da7504013a7a0b1d4dd958"><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="#gab41369c1a1da7504013a7a0b1d4dd958">mi_dupenv_s</a> (char **buf, size_t *size, const char *name)</td></tr>
+<tr class="separator:gab41369c1a1da7504013a7a0b1d4dd958"><td class="memSeparator" colspan="2">&#160;</td></tr>
+<tr class="memitem:ga6ac6a6a8f3c96f1af24bb8d0439cbbd1" id="r_ga6ac6a6a8f3c96f1af24bb8d0439cbbd1"><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="#ga6ac6a6a8f3c96f1af24bb8d0439cbbd1">mi_wdupenv_s</a> (unsigned short **buf, size_t *size, const unsigned short *name)</td></tr>
+<tr class="separator:ga6ac6a6a8f3c96f1af24bb8d0439cbbd1"><td class="memSeparator" colspan="2">&#160;</td></tr>
+<tr class="memitem:gadfeccb72748a2f6305474a37d9d57bce" id="r_gadfeccb72748a2f6305474a37d9d57bce"><td class="memItemLeft" align="right" valign="top">void *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="#gadfeccb72748a2f6305474a37d9d57bce">mi_reallocarray</a> (void *p, size_t count, size_t size)</td></tr>
+<tr class="memdesc:gadfeccb72748a2f6305474a37d9d57bce"><td class="mdescLeft">&#160;</td><td class="mdescRight">Correspond s to <a href="https://www.freebsd.org/cgi/man.cgi?query=reallocarray&amp;sektion=3&amp;manpath=freebsd-release-ports">reallocarray</a> in FreeBSD.  <br /></td></tr>
+<tr class="separator:gadfeccb72748a2f6305474a37d9d57bce"><td class="memSeparator" colspan="2">&#160;</td></tr>
+<tr class="memitem:ga7e1934d60a3e697950eeb48e042bfad5" id="r_ga7e1934d60a3e697950eeb48e042bfad5"><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="#ga7e1934d60a3e697950eeb48e042bfad5">mi_reallocarr</a> (void *p, size_t count, size_t size)</td></tr>
+<tr class="memdesc:ga7e1934d60a3e697950eeb48e042bfad5"><td class="mdescLeft">&#160;</td><td class="mdescRight">Corresponds to <a href="https://man.netbsd.org/reallocarr.3">reallocarr</a> in NetBSD.  <br /></td></tr>
 <tr class="separator:ga7e1934d60a3e697950eeb48e042bfad5"><td class="memSeparator" colspan="2">&#160;</td></tr>
-<tr class="memitem:gae01389eedab8d67341ff52e2aad80ebb"><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__posix.html#gae01389eedab8d67341ff52e2aad80ebb">mi_free_size</a> (void *p, size_t size)</td></tr>
+<tr class="memitem:gaf82cbb4b4f24acf723348628451798d3" id="r_gaf82cbb4b4f24acf723348628451798d3"><td class="memItemLeft" align="right" valign="top">void *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="#gaf82cbb4b4f24acf723348628451798d3">mi_aligned_recalloc</a> (void *p, size_t newcount, size_t size, size_t alignment)</td></tr>
+<tr class="separator:gaf82cbb4b4f24acf723348628451798d3"><td class="memSeparator" colspan="2">&#160;</td></tr>
+<tr class="memitem:ga16570deddd559001b44953eedbad0084" id="r_ga16570deddd559001b44953eedbad0084"><td class="memItemLeft" align="right" valign="top">void *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="#ga16570deddd559001b44953eedbad0084">mi_aligned_offset_recalloc</a> (void *p, size_t newcount, size_t size, size_t alignment, size_t offset)</td></tr>
+<tr class="separator:ga16570deddd559001b44953eedbad0084"><td class="memSeparator" colspan="2">&#160;</td></tr>
+<tr class="memitem:gae01389eedab8d67341ff52e2aad80ebb" id="r_gae01389eedab8d67341ff52e2aad80ebb"><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="#gae01389eedab8d67341ff52e2aad80ebb">mi_free_size</a> (void *p, size_t size)</td></tr>
 <tr class="separator:gae01389eedab8d67341ff52e2aad80ebb"><td class="memSeparator" colspan="2">&#160;</td></tr>
-<tr class="memitem:ga72e9d7ffb5fe94d69bc722c8506e27bc"><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__posix.html#ga72e9d7ffb5fe94d69bc722c8506e27bc">mi_free_size_aligned</a> (void *p, size_t size, size_t alignment)</td></tr>
+<tr class="memitem:ga72e9d7ffb5fe94d69bc722c8506e27bc" id="r_ga72e9d7ffb5fe94d69bc722c8506e27bc"><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="#ga72e9d7ffb5fe94d69bc722c8506e27bc">mi_free_size_aligned</a> (void *p, size_t size, size_t alignment)</td></tr>
 <tr class="separator:ga72e9d7ffb5fe94d69bc722c8506e27bc"><td class="memSeparator" colspan="2">&#160;</td></tr>
-<tr class="memitem:ga0d28d5cf61e6bfbb18c63092939fe5c9"><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__posix.html#ga0d28d5cf61e6bfbb18c63092939fe5c9">mi_free_aligned</a> (void *p, size_t alignment)</td></tr>
+<tr class="memitem:ga0d28d5cf61e6bfbb18c63092939fe5c9" id="r_ga0d28d5cf61e6bfbb18c63092939fe5c9"><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="#ga0d28d5cf61e6bfbb18c63092939fe5c9">mi_free_aligned</a> (void *p, size_t alignment)</td></tr>
 <tr class="separator:ga0d28d5cf61e6bfbb18c63092939fe5c9"><td class="memSeparator" colspan="2">&#160;</td></tr>
 </table>
 <a name="details" id="details"></a><h2 class="groupheader">Detailed Description</h2>
 <p><code>mi_</code> prefixed implementations of various Posix, Unix, and C++ allocation functions. </p>
 <p>Defined for convenience as all redirect to the regular mimalloc API. </p>
 <h2 class="groupheader">Function Documentation</h2>
-<a id="gad5a69c8fea96aa2b7a7c818c2130090a"></a>
-<h2 class="memtitle"><span class="permalink"><a href="#gad5a69c8fea96aa2b7a7c818c2130090a">&#9670;&nbsp;</a></span>mi__posix_memalign()</h2>
+<a id="ga66bcfeb4faedbb42b796bc680821ef84" name="ga66bcfeb4faedbb42b796bc680821ef84"></a>
+<h2 class="memtitle"><span class="permalink"><a href="#ga66bcfeb4faedbb42b796bc680821ef84">&#9670;&#160;</a></span>mi__expand()</h2>
+
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">void * mi__expand </td>
+          <td>(</td>
+          <td class="paramtype">void *</td>          <td class="paramname"><span class="paramname"><em>p</em></span>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">size_t</td>          <td class="paramname"><span class="paramname"><em>newsize</em></span>&#160;)</td>
+        </tr>
+      </table>
+</div><div class="memdoc">
+
+</div>
+</div>
+<a id="gad5a69c8fea96aa2b7a7c818c2130090a" name="gad5a69c8fea96aa2b7a7c818c2130090a"></a>
+<h2 class="memtitle"><span class="permalink"><a href="#gad5a69c8fea96aa2b7a7c818c2130090a">&#9670;&#160;</a></span>mi__posix_memalign()</h2>
 
 <div class="memitem">
 <div class="memproto">
@@ -151,61 +197,113 @@ <h2 class="memtitle"><span class="permalink"><a href="#gad5a69c8fea96aa2b7a7c818
         <tr>
           <td class="memname">int mi__posix_memalign </td>
           <td>(</td>
-          <td class="paramtype">void **&#160;</td>
-          <td class="paramname"><em>p</em>, </td>
+          <td class="paramtype">void **</td>          <td class="paramname"><span class="paramname"><em>p</em></span>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">size_t</td>          <td class="paramname"><span class="paramname"><em>alignment</em></span>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">size_t</td>          <td class="paramname"><span class="paramname"><em>size</em></span>&#160;)</td>
+        </tr>
+      </table>
+</div><div class="memdoc">
+
+</div>
+</div>
+<a id="ga430ed1513f0571ff83be00ec58a98ee0" name="ga430ed1513f0571ff83be00ec58a98ee0"></a>
+<h2 class="memtitle"><span class="permalink"><a href="#ga430ed1513f0571ff83be00ec58a98ee0">&#9670;&#160;</a></span>mi_aligned_alloc()</h2>
+
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">void * mi_aligned_alloc </td>
+          <td>(</td>
+          <td class="paramtype">size_t</td>          <td class="paramname"><span class="paramname"><em>alignment</em></span>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">size_t</td>          <td class="paramname"><span class="paramname"><em>size</em></span>&#160;)</td>
+        </tr>
+      </table>
+</div><div class="memdoc">
+
+</div>
+</div>
+<a id="ga16570deddd559001b44953eedbad0084" name="ga16570deddd559001b44953eedbad0084"></a>
+<h2 class="memtitle"><span class="permalink"><a href="#ga16570deddd559001b44953eedbad0084">&#9670;&#160;</a></span>mi_aligned_offset_recalloc()</h2>
+
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">void * mi_aligned_offset_recalloc </td>
+          <td>(</td>
+          <td class="paramtype">void *</td>          <td class="paramname"><span class="paramname"><em>p</em></span>, </td>
         </tr>
         <tr>
           <td class="paramkey"></td>
           <td></td>
-          <td class="paramtype">size_t&#160;</td>
-          <td class="paramname"><em>alignment</em>, </td>
+          <td class="paramtype">size_t</td>          <td class="paramname"><span class="paramname"><em>newcount</em></span>, </td>
         </tr>
         <tr>
           <td class="paramkey"></td>
           <td></td>
-          <td class="paramtype">size_t&#160;</td>
-          <td class="paramname"><em>size</em>&#160;</td>
+          <td class="paramtype">size_t</td>          <td class="paramname"><span class="paramname"><em>size</em></span>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">size_t</td>          <td class="paramname"><span class="paramname"><em>alignment</em></span>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td>)</td>
-          <td></td><td></td>
+          <td class="paramtype">size_t</td>          <td class="paramname"><span class="paramname"><em>offset</em></span>&#160;)</td>
         </tr>
       </table>
 </div><div class="memdoc">
 
 </div>
 </div>
-<a id="ga1326d2e4388630b5f81ca7206318b8e5"></a>
-<h2 class="memtitle"><span class="permalink"><a href="#ga1326d2e4388630b5f81ca7206318b8e5">&#9670;&nbsp;</a></span>mi_aligned_alloc()</h2>
+<a id="gaf82cbb4b4f24acf723348628451798d3" name="gaf82cbb4b4f24acf723348628451798d3"></a>
+<h2 class="memtitle"><span class="permalink"><a href="#gaf82cbb4b4f24acf723348628451798d3">&#9670;&#160;</a></span>mi_aligned_recalloc()</h2>
 
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname">void* mi_aligned_alloc </td>
+          <td class="memname">void * mi_aligned_recalloc </td>
           <td>(</td>
-          <td class="paramtype">size_t&#160;</td>
-          <td class="paramname"><em>alignment</em>, </td>
+          <td class="paramtype">void *</td>          <td class="paramname"><span class="paramname"><em>p</em></span>, </td>
         </tr>
         <tr>
           <td class="paramkey"></td>
           <td></td>
-          <td class="paramtype">size_t&#160;</td>
-          <td class="paramname"><em>size</em>&#160;</td>
+          <td class="paramtype">size_t</td>          <td class="paramname"><span class="paramname"><em>newcount</em></span>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">size_t</td>          <td class="paramname"><span class="paramname"><em>size</em></span>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td>)</td>
-          <td></td><td></td>
+          <td class="paramtype">size_t</td>          <td class="paramname"><span class="paramname"><em>alignment</em></span>&#160;)</td>
         </tr>
       </table>
 </div><div class="memdoc">
 
 </div>
 </div>
-<a id="ga705dc7a64bffacfeeb0141501a5c35d7"></a>
-<h2 class="memtitle"><span class="permalink"><a href="#ga705dc7a64bffacfeeb0141501a5c35d7">&#9670;&nbsp;</a></span>mi_cfree()</h2>
+<a id="ga705dc7a64bffacfeeb0141501a5c35d7" name="ga705dc7a64bffacfeeb0141501a5c35d7"></a>
+<h2 class="memtitle"><span class="permalink"><a href="#ga705dc7a64bffacfeeb0141501a5c35d7">&#9670;&#160;</a></span>mi_cfree()</h2>
 
 <div class="memitem">
 <div class="memproto">
@@ -213,8 +311,7 @@ <h2 class="memtitle"><span class="permalink"><a href="#ga705dc7a64bffacfeeb01415
         <tr>
           <td class="memname">void mi_cfree </td>
           <td>(</td>
-          <td class="paramtype">void *&#160;</td>
-          <td class="paramname"><em>p</em></td><td>)</td>
+          <td class="paramtype">void *</td>          <td class="paramname"><span class="paramname"><em>p</em></span></td><td>)</td>
           <td></td>
         </tr>
       </table>
@@ -224,64 +321,76 @@ <h2 class="memtitle"><span class="permalink"><a href="#ga705dc7a64bffacfeeb01415
 
 </div>
 </div>
-<a id="ga0d28d5cf61e6bfbb18c63092939fe5c9"></a>
-<h2 class="memtitle"><span class="permalink"><a href="#ga0d28d5cf61e6bfbb18c63092939fe5c9">&#9670;&nbsp;</a></span>mi_free_aligned()</h2>
+<a id="gab41369c1a1da7504013a7a0b1d4dd958" name="gab41369c1a1da7504013a7a0b1d4dd958"></a>
+<h2 class="memtitle"><span class="permalink"><a href="#gab41369c1a1da7504013a7a0b1d4dd958">&#9670;&#160;</a></span>mi_dupenv_s()</h2>
 
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname">void mi_free_aligned </td>
+          <td class="memname">int mi_dupenv_s </td>
           <td>(</td>
-          <td class="paramtype">void *&#160;</td>
-          <td class="paramname"><em>p</em>, </td>
+          <td class="paramtype">char **</td>          <td class="paramname"><span class="paramname"><em>buf</em></span>, </td>
         </tr>
         <tr>
           <td class="paramkey"></td>
           <td></td>
-          <td class="paramtype">size_t&#160;</td>
-          <td class="paramname"><em>alignment</em>&#160;</td>
+          <td class="paramtype">size_t *</td>          <td class="paramname"><span class="paramname"><em>size</em></span>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td>)</td>
-          <td></td><td></td>
+          <td class="paramtype">const char *</td>          <td class="paramname"><span class="paramname"><em>name</em></span>&#160;)</td>
         </tr>
       </table>
 </div><div class="memdoc">
 
 </div>
 </div>
-<a id="gae01389eedab8d67341ff52e2aad80ebb"></a>
-<h2 class="memtitle"><span class="permalink"><a href="#gae01389eedab8d67341ff52e2aad80ebb">&#9670;&nbsp;</a></span>mi_free_size()</h2>
+<a id="ga0d28d5cf61e6bfbb18c63092939fe5c9" name="ga0d28d5cf61e6bfbb18c63092939fe5c9"></a>
+<h2 class="memtitle"><span class="permalink"><a href="#ga0d28d5cf61e6bfbb18c63092939fe5c9">&#9670;&#160;</a></span>mi_free_aligned()</h2>
 
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname">void mi_free_size </td>
+          <td class="memname">void mi_free_aligned </td>
           <td>(</td>
-          <td class="paramtype">void *&#160;</td>
-          <td class="paramname"><em>p</em>, </td>
+          <td class="paramtype">void *</td>          <td class="paramname"><span class="paramname"><em>p</em></span>, </td>
         </tr>
         <tr>
           <td class="paramkey"></td>
           <td></td>
-          <td class="paramtype">size_t&#160;</td>
-          <td class="paramname"><em>size</em>&#160;</td>
+          <td class="paramtype">size_t</td>          <td class="paramname"><span class="paramname"><em>alignment</em></span>&#160;)</td>
         </tr>
+      </table>
+</div><div class="memdoc">
+
+</div>
+</div>
+<a id="gae01389eedab8d67341ff52e2aad80ebb" name="gae01389eedab8d67341ff52e2aad80ebb"></a>
+<h2 class="memtitle"><span class="permalink"><a href="#gae01389eedab8d67341ff52e2aad80ebb">&#9670;&#160;</a></span>mi_free_size()</h2>
+
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
+          <td class="memname">void mi_free_size </td>
+          <td>(</td>
+          <td class="paramtype">void *</td>          <td class="paramname"><span class="paramname"><em>p</em></span>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td>)</td>
-          <td></td><td></td>
+          <td class="paramtype">size_t</td>          <td class="paramname"><span class="paramname"><em>size</em></span>&#160;)</td>
         </tr>
       </table>
 </div><div class="memdoc">
 
 </div>
 </div>
-<a id="ga72e9d7ffb5fe94d69bc722c8506e27bc"></a>
-<h2 class="memtitle"><span class="permalink"><a href="#ga72e9d7ffb5fe94d69bc722c8506e27bc">&#9670;&nbsp;</a></span>mi_free_size_aligned()</h2>
+<a id="ga72e9d7ffb5fe94d69bc722c8506e27bc" name="ga72e9d7ffb5fe94d69bc722c8506e27bc"></a>
+<h2 class="memtitle"><span class="permalink"><a href="#ga72e9d7ffb5fe94d69bc722c8506e27bc">&#9670;&#160;</a></span>mi_free_size_aligned()</h2>
 
 <div class="memitem">
 <div class="memproto">
@@ -289,33 +398,42 @@ <h2 class="memtitle"><span class="permalink"><a href="#ga72e9d7ffb5fe94d69bc722c
         <tr>
           <td class="memname">void mi_free_size_aligned </td>
           <td>(</td>
-          <td class="paramtype">void *&#160;</td>
-          <td class="paramname"><em>p</em>, </td>
+          <td class="paramtype">void *</td>          <td class="paramname"><span class="paramname"><em>p</em></span>, </td>
         </tr>
         <tr>
           <td class="paramkey"></td>
           <td></td>
-          <td class="paramtype">size_t&#160;</td>
-          <td class="paramname"><em>size</em>, </td>
+          <td class="paramtype">size_t</td>          <td class="paramname"><span class="paramname"><em>size</em></span>, </td>
         </tr>
         <tr>
           <td class="paramkey"></td>
           <td></td>
-          <td class="paramtype">size_t&#160;</td>
-          <td class="paramname"><em>alignment</em>&#160;</td>
+          <td class="paramtype">size_t</td>          <td class="paramname"><span class="paramname"><em>alignment</em></span>&#160;)</td>
         </tr>
+      </table>
+</div><div class="memdoc">
+
+</div>
+</div>
+<a id="ga9d23ac7885fed7413c11d8e0ffa31071" name="ga9d23ac7885fed7413c11d8e0ffa31071"></a>
+<h2 class="memtitle"><span class="permalink"><a href="#ga9d23ac7885fed7413c11d8e0ffa31071">&#9670;&#160;</a></span>mi_malloc_good_size()</h2>
+
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
+          <td class="memname">size_t mi_malloc_good_size </td>
+          <td>(</td>
+          <td class="paramtype">size_t</td>          <td class="paramname"><span class="paramname"><em>size</em></span></td><td>)</td>
           <td></td>
-          <td>)</td>
-          <td></td><td></td>
         </tr>
       </table>
 </div><div class="memdoc">
 
 </div>
 </div>
-<a id="ga4531c9e775bb3ae12db57c1ba8a5d7de"></a>
-<h2 class="memtitle"><span class="permalink"><a href="#ga4531c9e775bb3ae12db57c1ba8a5d7de">&#9670;&nbsp;</a></span>mi_malloc_size()</h2>
+<a id="ga4531c9e775bb3ae12db57c1ba8a5d7de" name="ga4531c9e775bb3ae12db57c1ba8a5d7de"></a>
+<h2 class="memtitle"><span class="permalink"><a href="#ga4531c9e775bb3ae12db57c1ba8a5d7de">&#9670;&#160;</a></span>mi_malloc_size()</h2>
 
 <div class="memitem">
 <div class="memproto">
@@ -323,8 +441,7 @@ <h2 class="memtitle"><span class="permalink"><a href="#ga4531c9e775bb3ae12db57c1
         <tr>
           <td class="memname">size_t mi_malloc_size </td>
           <td>(</td>
-          <td class="paramtype">const void *&#160;</td>
-          <td class="paramname"><em>p</em></td><td>)</td>
+          <td class="paramtype">const void *</td>          <td class="paramname"><span class="paramname"><em>p</em></span></td><td>)</td>
           <td></td>
         </tr>
       </table>
@@ -332,8 +449,8 @@ <h2 class="memtitle"><span class="permalink"><a href="#ga4531c9e775bb3ae12db57c1
 
 </div>
 </div>
-<a id="ga06d07cf357bbac5c73ba5d0c0c421e17"></a>
-<h2 class="memtitle"><span class="permalink"><a href="#ga06d07cf357bbac5c73ba5d0c0c421e17">&#9670;&nbsp;</a></span>mi_malloc_usable_size()</h2>
+<a id="ga06d07cf357bbac5c73ba5d0c0c421e17" name="ga06d07cf357bbac5c73ba5d0c0c421e17"></a>
+<h2 class="memtitle"><span class="permalink"><a href="#ga06d07cf357bbac5c73ba5d0c0c421e17">&#9670;&#160;</a></span>mi_malloc_usable_size()</h2>
 
 <div class="memitem">
 <div class="memproto">
@@ -341,8 +458,7 @@ <h2 class="memtitle"><span class="permalink"><a href="#ga06d07cf357bbac5c73ba5d0
         <tr>
           <td class="memname">size_t mi_malloc_usable_size </td>
           <td>(</td>
-          <td class="paramtype">const void *&#160;</td>
-          <td class="paramname"><em>p</em></td><td>)</td>
+          <td class="paramtype">const void *</td>          <td class="paramname"><span class="paramname"><em>p</em></span></td><td>)</td>
           <td></td>
         </tr>
       </table>
@@ -350,36 +466,46 @@ <h2 class="memtitle"><span class="permalink"><a href="#ga06d07cf357bbac5c73ba5d0
 
 </div>
 </div>
-<a id="gaab7fa71ea93b96873f5d9883db57d40e"></a>
-<h2 class="memtitle"><span class="permalink"><a href="#gaab7fa71ea93b96873f5d9883db57d40e">&#9670;&nbsp;</a></span>mi_memalign()</h2>
+<a id="ga7b82a44094fdec4d2084eb4288a979b0" name="ga7b82a44094fdec4d2084eb4288a979b0"></a>
+<h2 class="memtitle"><span class="permalink"><a href="#ga7b82a44094fdec4d2084eb4288a979b0">&#9670;&#160;</a></span>mi_mbsdup()</h2>
 
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname">void* mi_memalign </td>
+          <td class="memname">unsigned char * mi_mbsdup </td>
           <td>(</td>
-          <td class="paramtype">size_t&#160;</td>
-          <td class="paramname"><em>alignment</em>, </td>
+          <td class="paramtype">const unsigned char *</td>          <td class="paramname"><span class="paramname"><em>s</em></span></td><td>)</td>
+          <td></td>
         </tr>
+      </table>
+</div><div class="memdoc">
+
+</div>
+</div>
+<a id="ga726867f13fd29ca36064954c0285b1d8" name="ga726867f13fd29ca36064954c0285b1d8"></a>
+<h2 class="memtitle"><span class="permalink"><a href="#ga726867f13fd29ca36064954c0285b1d8">&#9670;&#160;</a></span>mi_memalign()</h2>
+
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype">size_t&#160;</td>
-          <td class="paramname"><em>size</em>&#160;</td>
+          <td class="memname">void * mi_memalign </td>
+          <td>(</td>
+          <td class="paramtype">size_t</td>          <td class="paramname"><span class="paramname"><em>alignment</em></span>, </td>
         </tr>
         <tr>
+          <td class="paramkey"></td>
           <td></td>
-          <td>)</td>
-          <td></td><td></td>
+          <td class="paramtype">size_t</td>          <td class="paramname"><span class="paramname"><em>size</em></span>&#160;)</td>
         </tr>
       </table>
 </div><div class="memdoc">
 
 </div>
 </div>
-<a id="gacff84f226ba9feb2031b8992e5579447"></a>
-<h2 class="memtitle"><span class="permalink"><a href="#gacff84f226ba9feb2031b8992e5579447">&#9670;&nbsp;</a></span>mi_posix_memalign()</h2>
+<a id="gacff84f226ba9feb2031b8992e5579447" name="gacff84f226ba9feb2031b8992e5579447"></a>
+<h2 class="memtitle"><span class="permalink"><a href="#gacff84f226ba9feb2031b8992e5579447">&#9670;&#160;</a></span>mi_posix_memalign()</h2>
 
 <div class="memitem">
 <div class="memproto">
@@ -387,42 +513,33 @@ <h2 class="memtitle"><span class="permalink"><a href="#gacff84f226ba9feb2031b899
         <tr>
           <td class="memname">int mi_posix_memalign </td>
           <td>(</td>
-          <td class="paramtype">void **&#160;</td>
-          <td class="paramname"><em>p</em>, </td>
+          <td class="paramtype">void **</td>          <td class="paramname"><span class="paramname"><em>p</em></span>, </td>
         </tr>
         <tr>
           <td class="paramkey"></td>
           <td></td>
-          <td class="paramtype">size_t&#160;</td>
-          <td class="paramname"><em>alignment</em>, </td>
+          <td class="paramtype">size_t</td>          <td class="paramname"><span class="paramname"><em>alignment</em></span>, </td>
         </tr>
         <tr>
           <td class="paramkey"></td>
           <td></td>
-          <td class="paramtype">size_t&#160;</td>
-          <td class="paramname"><em>size</em>&#160;</td>
-        </tr>
-        <tr>
-          <td></td>
-          <td>)</td>
-          <td></td><td></td>
+          <td class="paramtype">size_t</td>          <td class="paramname"><span class="paramname"><em>size</em></span>&#160;)</td>
         </tr>
       </table>
 </div><div class="memdoc">
 
 </div>
 </div>
-<a id="gaeb325c39b887d3b90d85d1eb1712fb1e"></a>
-<h2 class="memtitle"><span class="permalink"><a href="#gaeb325c39b887d3b90d85d1eb1712fb1e">&#9670;&nbsp;</a></span>mi_pvalloc()</h2>
+<a id="ga644bebccdbb2821542dd8c7e7641f476" name="ga644bebccdbb2821542dd8c7e7641f476"></a>
+<h2 class="memtitle"><span class="permalink"><a href="#ga644bebccdbb2821542dd8c7e7641f476">&#9670;&#160;</a></span>mi_pvalloc()</h2>
 
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname">void* mi_pvalloc </td>
+          <td class="memname">void * mi_pvalloc </td>
           <td>(</td>
-          <td class="paramtype">size_t&#160;</td>
-          <td class="paramname"><em>size</em></td><td>)</td>
+          <td class="paramtype">size_t</td>          <td class="paramname"><span class="paramname"><em>size</em></span></td><td>)</td>
           <td></td>
         </tr>
       </table>
@@ -430,8 +547,8 @@ <h2 class="memtitle"><span class="permalink"><a href="#gaeb325c39b887d3b90d85d1e
 
 </div>
 </div>
-<a id="ga7e1934d60a3e697950eeb48e042bfad5"></a>
-<h2 class="memtitle"><span class="permalink"><a href="#ga7e1934d60a3e697950eeb48e042bfad5">&#9670;&nbsp;</a></span>mi_reallocarr()</h2>
+<a id="ga7e1934d60a3e697950eeb48e042bfad5" name="ga7e1934d60a3e697950eeb48e042bfad5"></a>
+<h2 class="memtitle"><span class="permalink"><a href="#ga7e1934d60a3e697950eeb48e042bfad5">&#9670;&#160;</a></span>mi_reallocarr()</h2>
 
 <div class="memitem">
 <div class="memproto">
@@ -439,25 +556,17 @@ <h2 class="memtitle"><span class="permalink"><a href="#ga7e1934d60a3e697950eeb48
         <tr>
           <td class="memname">int mi_reallocarr </td>
           <td>(</td>
-          <td class="paramtype">void *&#160;</td>
-          <td class="paramname"><em>p</em>, </td>
+          <td class="paramtype">void *</td>          <td class="paramname"><span class="paramname"><em>p</em></span>, </td>
         </tr>
         <tr>
           <td class="paramkey"></td>
           <td></td>
-          <td class="paramtype">size_t&#160;</td>
-          <td class="paramname"><em>count</em>, </td>
+          <td class="paramtype">size_t</td>          <td class="paramname"><span class="paramname"><em>count</em></span>, </td>
         </tr>
         <tr>
           <td class="paramkey"></td>
           <td></td>
-          <td class="paramtype">size_t&#160;</td>
-          <td class="paramname"><em>size</em>&#160;</td>
-        </tr>
-        <tr>
-          <td></td>
-          <td>)</td>
-          <td></td><td></td>
+          <td class="paramtype">size_t</td>          <td class="paramname"><span class="paramname"><em>size</em></span>&#160;)</td>
         </tr>
       </table>
 </div><div class="memdoc">
@@ -466,54 +575,88 @@ <h2 class="memtitle"><span class="permalink"><a href="#ga7e1934d60a3e697950eeb48
 
 </div>
 </div>
-<a id="ga48fad8648a2f1dab9c87ea9448a52088"></a>
-<h2 class="memtitle"><span class="permalink"><a href="#ga48fad8648a2f1dab9c87ea9448a52088">&#9670;&nbsp;</a></span>mi_reallocarray()</h2>
+<a id="gadfeccb72748a2f6305474a37d9d57bce" name="gadfeccb72748a2f6305474a37d9d57bce"></a>
+<h2 class="memtitle"><span class="permalink"><a href="#gadfeccb72748a2f6305474a37d9d57bce">&#9670;&#160;</a></span>mi_reallocarray()</h2>
 
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname">void* mi_reallocarray </td>
+          <td class="memname">void * mi_reallocarray </td>
           <td>(</td>
-          <td class="paramtype">void *&#160;</td>
-          <td class="paramname"><em>p</em>, </td>
+          <td class="paramtype">void *</td>          <td class="paramname"><span class="paramname"><em>p</em></span>, </td>
         </tr>
         <tr>
           <td class="paramkey"></td>
           <td></td>
-          <td class="paramtype">size_t&#160;</td>
-          <td class="paramname"><em>count</em>, </td>
+          <td class="paramtype">size_t</td>          <td class="paramname"><span class="paramname"><em>count</em></span>, </td>
         </tr>
         <tr>
           <td class="paramkey"></td>
           <td></td>
-          <td class="paramtype">size_t&#160;</td>
-          <td class="paramname"><em>size</em>&#160;</td>
+          <td class="paramtype">size_t</td>          <td class="paramname"><span class="paramname"><em>size</em></span>&#160;)</td>
         </tr>
+      </table>
+</div><div class="memdoc">
+
+<p>Correspond s to <a href="https://www.freebsd.org/cgi/man.cgi?query=reallocarray&amp;sektion=3&amp;manpath=freebsd-release-ports">reallocarray</a> in FreeBSD. </p>
+
+</div>
+</div>
+<a id="ga50cafb9722020402f065de93799f64ca" name="ga50cafb9722020402f065de93799f64ca"></a>
+<h2 class="memtitle"><span class="permalink"><a href="#ga50cafb9722020402f065de93799f64ca">&#9670;&#160;</a></span>mi_valloc()</h2>
+
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
         <tr>
+          <td class="memname">void * mi_valloc </td>
+          <td>(</td>
+          <td class="paramtype">size_t</td>          <td class="paramname"><span class="paramname"><em>size</em></span></td><td>)</td>
           <td></td>
-          <td>)</td>
-          <td></td><td></td>
         </tr>
       </table>
 </div><div class="memdoc">
 
-<p>Correspond s to <a href="https://www.freebsd.org/cgi/man.cgi?query=reallocarray&amp;sektion=3&amp;manpath=freebsd-release-ports">reallocarray</a> in FreeBSD. </p>
+</div>
+</div>
+<a id="gaa9fd7f25c9ac3a20e89b33bd6e383fcf" name="gaa9fd7f25c9ac3a20e89b33bd6e383fcf"></a>
+<h2 class="memtitle"><span class="permalink"><a href="#gaa9fd7f25c9ac3a20e89b33bd6e383fcf">&#9670;&#160;</a></span>mi_wcsdup()</h2>
+
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">unsigned short * mi_wcsdup </td>
+          <td>(</td>
+          <td class="paramtype">const unsigned short *</td>          <td class="paramname"><span class="paramname"><em>s</em></span></td><td>)</td>
+          <td></td>
+        </tr>
+      </table>
+</div><div class="memdoc">
 
 </div>
 </div>
-<a id="ga73baaf5951f5165ba0763d0c06b6a93b"></a>
-<h2 class="memtitle"><span class="permalink"><a href="#ga73baaf5951f5165ba0763d0c06b6a93b">&#9670;&nbsp;</a></span>mi_valloc()</h2>
+<a id="ga6ac6a6a8f3c96f1af24bb8d0439cbbd1" name="ga6ac6a6a8f3c96f1af24bb8d0439cbbd1"></a>
+<h2 class="memtitle"><span class="permalink"><a href="#ga6ac6a6a8f3c96f1af24bb8d0439cbbd1">&#9670;&#160;</a></span>mi_wdupenv_s()</h2>
 
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname">void* mi_valloc </td>
+          <td class="memname">int mi_wdupenv_s </td>
           <td>(</td>
-          <td class="paramtype">size_t&#160;</td>
-          <td class="paramname"><em>size</em></td><td>)</td>
+          <td class="paramtype">unsigned short **</td>          <td class="paramname"><span class="paramname"><em>buf</em></span>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">size_t *</td>          <td class="paramname"><span class="paramname"><em>size</em></span>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
           <td></td>
+          <td class="paramtype">const unsigned short *</td>          <td class="paramname"><span class="paramname"><em>name</em></span>&#160;)</td>
         </tr>
       </table>
 </div><div class="memdoc">
@@ -525,7 +668,7 @@ <h2 class="memtitle"><span class="permalink"><a href="#ga73baaf5951f5165ba0763d0
 <!-- start footer part -->
 <div id="nav-path" class="navpath"><!-- id is needed for treeview function! -->
   <ul>
-    <li class="footer">Generated by <a href="https://www.doxygen.org/index.html"><img class="footer" src="doxygen.svg" width="104" height="31" alt="doxygen"/></a> 1.9.1 </li>
+    <li class="footer">Generated by <a href="https://www.doxygen.org/index.html"><img class="footer" src="doxygen.svg" width="104" height="31" alt="doxygen"/></a> 1.13.1 </li>
   </ul>
 </div>
 </body>
diff --git a/depends/mimalloc/docs/group__posix.js b/depends/mimalloc/docs/group__posix.js
index 50c248c80dac..ea4ed269ed5d 100644
--- a/depends/mimalloc/docs/group__posix.js
+++ b/depends/mimalloc/docs/group__posix.js
@@ -1,17 +1,25 @@
 var group__posix =
 [
+    [ "mi__expand", "group__posix.html#ga66bcfeb4faedbb42b796bc680821ef84", null ],
     [ "mi__posix_memalign", "group__posix.html#gad5a69c8fea96aa2b7a7c818c2130090a", null ],
-    [ "mi_aligned_alloc", "group__posix.html#ga1326d2e4388630b5f81ca7206318b8e5", null ],
+    [ "mi_aligned_alloc", "group__posix.html#ga430ed1513f0571ff83be00ec58a98ee0", null ],
+    [ "mi_aligned_offset_recalloc", "group__posix.html#ga16570deddd559001b44953eedbad0084", null ],
+    [ "mi_aligned_recalloc", "group__posix.html#gaf82cbb4b4f24acf723348628451798d3", null ],
     [ "mi_cfree", "group__posix.html#ga705dc7a64bffacfeeb0141501a5c35d7", null ],
+    [ "mi_dupenv_s", "group__posix.html#gab41369c1a1da7504013a7a0b1d4dd958", null ],
     [ "mi_free_aligned", "group__posix.html#ga0d28d5cf61e6bfbb18c63092939fe5c9", null ],
     [ "mi_free_size", "group__posix.html#gae01389eedab8d67341ff52e2aad80ebb", null ],
     [ "mi_free_size_aligned", "group__posix.html#ga72e9d7ffb5fe94d69bc722c8506e27bc", null ],
+    [ "mi_malloc_good_size", "group__posix.html#ga9d23ac7885fed7413c11d8e0ffa31071", null ],
     [ "mi_malloc_size", "group__posix.html#ga4531c9e775bb3ae12db57c1ba8a5d7de", null ],
     [ "mi_malloc_usable_size", "group__posix.html#ga06d07cf357bbac5c73ba5d0c0c421e17", null ],
-    [ "mi_memalign", "group__posix.html#gaab7fa71ea93b96873f5d9883db57d40e", null ],
+    [ "mi_mbsdup", "group__posix.html#ga7b82a44094fdec4d2084eb4288a979b0", null ],
+    [ "mi_memalign", "group__posix.html#ga726867f13fd29ca36064954c0285b1d8", null ],
     [ "mi_posix_memalign", "group__posix.html#gacff84f226ba9feb2031b8992e5579447", null ],
-    [ "mi_pvalloc", "group__posix.html#gaeb325c39b887d3b90d85d1eb1712fb1e", null ],
+    [ "mi_pvalloc", "group__posix.html#ga644bebccdbb2821542dd8c7e7641f476", null ],
     [ "mi_reallocarr", "group__posix.html#ga7e1934d60a3e697950eeb48e042bfad5", null ],
-    [ "mi_reallocarray", "group__posix.html#ga48fad8648a2f1dab9c87ea9448a52088", null ],
-    [ "mi_valloc", "group__posix.html#ga73baaf5951f5165ba0763d0c06b6a93b", null ]
+    [ "mi_reallocarray", "group__posix.html#gadfeccb72748a2f6305474a37d9d57bce", null ],
+    [ "mi_valloc", "group__posix.html#ga50cafb9722020402f065de93799f64ca", null ],
+    [ "mi_wcsdup", "group__posix.html#gaa9fd7f25c9ac3a20e89b33bd6e383fcf", null ],
+    [ "mi_wdupenv_s", "group__posix.html#ga6ac6a6a8f3c96f1af24bb8d0439cbbd1", null ]
 ];
\ No newline at end of file
diff --git a/depends/mimalloc/docs/group__typed.html b/depends/mimalloc/docs/group__typed.html
index c19c7f4adbb7..0d3203e9279f 100644
--- a/depends/mimalloc/docs/group__typed.html
+++ b/depends/mimalloc/docs/group__typed.html
@@ -1,24 +1,26 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "https://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
+<html xmlns="http://www.w3.org/1999/xhtml" lang="en-US">
 <head>
 <meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
-<meta http-equiv="X-UA-Compatible" content="IE=9"/>
-<meta name="generator" content="Doxygen 1.9.1"/>
+<meta http-equiv="X-UA-Compatible" content="IE=11"/>
+<meta name="generator" content="Doxygen 1.13.1"/>
 <meta name="viewport" content="width=device-width, initial-scale=1"/>
 <title>mi-malloc: Typed Macros</title>
 <link href="tabs.css" rel="stylesheet" type="text/css"/>
 <script type="text/javascript" src="jquery.js"></script>
 <script type="text/javascript" src="dynsections.js"></script>
+<script type="text/javascript" src="clipboard.js"></script>
 <link href="navtree.css" rel="stylesheet" type="text/css"/>
-<script type="text/javascript" src="resize.js"></script>
 <script type="text/javascript" src="navtreedata.js"></script>
 <script type="text/javascript" src="navtree.js"></script>
+<script type="text/javascript" src="resize.js"></script>
+<script type="text/javascript" src="cookie.js"></script>
 <link href="search/search.css" rel="stylesheet" type="text/css"/>
 <script type="text/javascript" src="search/searchdata.js"></script>
 <script type="text/javascript" src="search/search.js"></script>
 <script type="text/javascript">
-/* @license magnet:?xt=urn:btih:cf05388f2679ee054f2beb29a391d25f4e673ac3&amp;dn=gpl-2.0.txt GPL-v2 */
-  $(document).ready(function() { init_search(); });
+/* @license magnet:?xt=urn:btih:d3d9a9a6595521f9666a5e94cc830dab83b65699&amp;dn=expat.txt MIT */
+  $(function() { init_search(); });
 /* @license-end */
 </script>
 <link href="doxygen.css" rel="stylesheet" type="text/css" />
@@ -29,20 +31,16 @@
 <div id="titlearea">
 <table cellspacing="0" cellpadding="0">
  <tbody>
- <tr style="height: 56px;">
+ <tr id="projectrow">
   <td id="projectlogo"><img alt="Logo" src="mimalloc-logo.svg"/></td>
-  <td id="projectalign" style="padding-left: 0.5em;">
-   <div id="projectname">mi-malloc
-   &#160;<span id="projectnumber">1.7/2.0</span>
+  <td id="projectalign">
+   <div id="projectname">mi-malloc<span id="projectnumber">&#160;1.8/2.1</span>
    </div>
   </td>
-   <td>        <div id="MSearchBox" class="MSearchBoxInactive">
+    <td>        <div id="MSearchBox" class="MSearchBoxInactive">
         <span class="left">
-          <img id="MSearchSelect" src="search/mag_sel.svg"
-               onmouseover="return searchBox.OnSearchSelectShow()"
-               onmouseout="return searchBox.OnSearchSelectHide()"
-               alt=""/>
-          <input type="text" id="MSearchField" value="Search" accesskey="S"
+          <span id="MSearchSelect"                onmouseover="return searchBox.OnSearchSelectShow()"                onmouseout="return searchBox.OnSearchSelectHide()">&#160;</span>
+          <input type="text" id="MSearchField" value="" placeholder="Search" accesskey="S"
                onfocus="searchBox.OnSearchFieldFocus(true)" 
                onblur="searchBox.OnSearchFieldFocus(false)" 
                onkeyup="searchBox.OnSearchFieldChange(event)"/>
@@ -56,10 +54,15 @@
 </table>
 </div>
 <!-- end header part -->
-<!-- Generated by Doxygen 1.9.1 -->
+<!-- Generated by Doxygen 1.13.1 -->
+<script type="text/javascript">
+/* @license magnet:?xt=urn:btih:d3d9a9a6595521f9666a5e94cc830dab83b65699&amp;dn=expat.txt MIT */
+var searchBox = new SearchBox("searchBox", "search/",'.html');
+/* @license-end */
+</script>
 <script type="text/javascript">
-/* @license magnet:?xt=urn:btih:cf05388f2679ee054f2beb29a391d25f4e673ac3&amp;dn=gpl-2.0.txt GPL-v2 */
-var searchBox = new SearchBox("searchBox", "search",false,'Search','.html');
+/* @license magnet:?xt=urn:btih:d3d9a9a6595521f9666a5e94cc830dab83b65699&amp;dn=expat.txt MIT */
+$(function() { codefold.init(0); });
 /* @license-end */
 </script>
 </div><!-- top -->
@@ -74,8 +77,8 @@
   </div>
 </div>
 <script type="text/javascript">
-/* @license magnet:?xt=urn:btih:cf05388f2679ee054f2beb29a391d25f4e673ac3&amp;dn=gpl-2.0.txt GPL-v2 */
-$(document).ready(function(){initNavTree('group__typed.html',''); initResizable(); });
+/* @license magnet:?xt=urn:btih:d3d9a9a6595521f9666a5e94cc830dab83b65699&amp;dn=expat.txt MIT */
+$(function(){initNavTree('group__typed.html',''); initResizable(true); });
 /* @license-end */
 </script>
 <div id="doc-content">
@@ -88,65 +91,71 @@
 
 <!-- iframe showing the search results (closed by default) -->
 <div id="MSearchResultsWindow">
-<iframe src="javascript:void(0)" frameborder="0" 
-        name="MSearchResults" id="MSearchResults">
-</iframe>
+<div id="MSearchResults">
+<div class="SRPage">
+<div id="SRIndex">
+<div id="SRResults"></div>
+<div class="SRStatus" id="Loading">Loading...</div>
+<div class="SRStatus" id="Searching">Searching...</div>
+<div class="SRStatus" id="NoMatches">No Matches</div>
+</div>
+</div>
+</div>
 </div>
 
 <div class="header">
   <div class="summary">
 <a href="#define-members">Macros</a>  </div>
-  <div class="headertitle">
-<div class="title">Typed Macros</div>  </div>
+  <div class="headertitle"><div class="title">Typed Macros</div></div>
 </div><!--header-->
 <div class="contents">
 
 <p>Typed allocation macros.  
 <a href="#details">More...</a></p>
 <table class="memberdecls">
-<tr class="heading"><td colspan="2"><h2 class="groupheader"><a name="define-members"></a>
+<tr class="heading"><td colspan="2"><h2 class="groupheader"><a id="define-members" name="define-members"></a>
 Macros</h2></td></tr>
-<tr class="memitem:ga0619a62c5fd886f1016030abe91f0557"><td class="memItemLeft" align="right" valign="top">#define&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__typed.html#ga0619a62c5fd886f1016030abe91f0557">mi_malloc_tp</a>(tp)</td></tr>
-<tr class="memdesc:ga0619a62c5fd886f1016030abe91f0557"><td class="mdescLeft">&#160;</td><td class="mdescRight">Allocate a block of type <em>tp</em>.  <a href="group__typed.html#ga0619a62c5fd886f1016030abe91f0557">More...</a><br /></td></tr>
+<tr class="memitem:ga0619a62c5fd886f1016030abe91f0557" id="r_ga0619a62c5fd886f1016030abe91f0557"><td class="memItemLeft" align="right" valign="top">#define&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="#ga0619a62c5fd886f1016030abe91f0557">mi_malloc_tp</a>(tp)</td></tr>
+<tr class="memdesc:ga0619a62c5fd886f1016030abe91f0557"><td class="mdescLeft">&#160;</td><td class="mdescRight">Allocate a block of type <em class="arg">tp</em>.  <br /></td></tr>
 <tr class="separator:ga0619a62c5fd886f1016030abe91f0557"><td class="memSeparator" colspan="2">&#160;</td></tr>
-<tr class="memitem:gac77a61bdaf680a803785fe307820b48c"><td class="memItemLeft" align="right" valign="top">#define&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__typed.html#gac77a61bdaf680a803785fe307820b48c">mi_zalloc_tp</a>(tp)</td></tr>
-<tr class="memdesc:gac77a61bdaf680a803785fe307820b48c"><td class="mdescLeft">&#160;</td><td class="mdescRight">Allocate a zero-initialized block of type <em>tp</em>.  <a href="group__typed.html#gac77a61bdaf680a803785fe307820b48c">More...</a><br /></td></tr>
+<tr class="memitem:gac77a61bdaf680a803785fe307820b48c" id="r_gac77a61bdaf680a803785fe307820b48c"><td class="memItemLeft" align="right" valign="top">#define&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="#gac77a61bdaf680a803785fe307820b48c">mi_zalloc_tp</a>(tp)</td></tr>
+<tr class="memdesc:gac77a61bdaf680a803785fe307820b48c"><td class="mdescLeft">&#160;</td><td class="mdescRight">Allocate a zero-initialized block of type <em class="arg">tp</em>.  <br /></td></tr>
 <tr class="separator:gac77a61bdaf680a803785fe307820b48c"><td class="memSeparator" colspan="2">&#160;</td></tr>
-<tr class="memitem:gae80c47c9d4cab10961fff1a8ac98fc07"><td class="memItemLeft" align="right" valign="top">#define&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__typed.html#gae80c47c9d4cab10961fff1a8ac98fc07">mi_calloc_tp</a>(tp,  count)</td></tr>
-<tr class="memdesc:gae80c47c9d4cab10961fff1a8ac98fc07"><td class="mdescLeft">&#160;</td><td class="mdescRight">Allocate <em>count</em> zero-initialized blocks of type <em>tp</em>.  <a href="group__typed.html#gae80c47c9d4cab10961fff1a8ac98fc07">More...</a><br /></td></tr>
+<tr class="memitem:gae80c47c9d4cab10961fff1a8ac98fc07" id="r_gae80c47c9d4cab10961fff1a8ac98fc07"><td class="memItemLeft" align="right" valign="top">#define&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="#gae80c47c9d4cab10961fff1a8ac98fc07">mi_calloc_tp</a>(tp,  count)</td></tr>
+<tr class="memdesc:gae80c47c9d4cab10961fff1a8ac98fc07"><td class="mdescLeft">&#160;</td><td class="mdescRight">Allocate <em class="arg">count</em> zero-initialized blocks of type <em class="arg">tp</em>.  <br /></td></tr>
 <tr class="separator:gae80c47c9d4cab10961fff1a8ac98fc07"><td class="memSeparator" colspan="2">&#160;</td></tr>
-<tr class="memitem:gae5cb6e0fafc9f23169c5622e077afe8b"><td class="memItemLeft" align="right" valign="top">#define&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__typed.html#gae5cb6e0fafc9f23169c5622e077afe8b">mi_mallocn_tp</a>(tp,  count)</td></tr>
-<tr class="memdesc:gae5cb6e0fafc9f23169c5622e077afe8b"><td class="mdescLeft">&#160;</td><td class="mdescRight">Allocate <em>count</em> blocks of type <em>tp</em>.  <a href="group__typed.html#gae5cb6e0fafc9f23169c5622e077afe8b">More...</a><br /></td></tr>
+<tr class="memitem:gae5cb6e0fafc9f23169c5622e077afe8b" id="r_gae5cb6e0fafc9f23169c5622e077afe8b"><td class="memItemLeft" align="right" valign="top">#define&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="#gae5cb6e0fafc9f23169c5622e077afe8b">mi_mallocn_tp</a>(tp,  count)</td></tr>
+<tr class="memdesc:gae5cb6e0fafc9f23169c5622e077afe8b"><td class="mdescLeft">&#160;</td><td class="mdescRight">Allocate <em class="arg">count</em> blocks of type <em class="arg">tp</em>.  <br /></td></tr>
 <tr class="separator:gae5cb6e0fafc9f23169c5622e077afe8b"><td class="memSeparator" colspan="2">&#160;</td></tr>
-<tr class="memitem:ga1158b49a55dfa81f58a4426a7578f523"><td class="memItemLeft" align="right" valign="top">#define&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__typed.html#ga1158b49a55dfa81f58a4426a7578f523">mi_reallocn_tp</a>(p,  tp,  count)</td></tr>
-<tr class="memdesc:ga1158b49a55dfa81f58a4426a7578f523"><td class="mdescLeft">&#160;</td><td class="mdescRight">Re-allocate to <em>count</em> blocks of type <em>tp</em>.  <a href="group__typed.html#ga1158b49a55dfa81f58a4426a7578f523">More...</a><br /></td></tr>
+<tr class="memitem:ga1158b49a55dfa81f58a4426a7578f523" id="r_ga1158b49a55dfa81f58a4426a7578f523"><td class="memItemLeft" align="right" valign="top">#define&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="#ga1158b49a55dfa81f58a4426a7578f523">mi_reallocn_tp</a>(p,  tp,  count)</td></tr>
+<tr class="memdesc:ga1158b49a55dfa81f58a4426a7578f523"><td class="mdescLeft">&#160;</td><td class="mdescRight">Re-allocate to <em class="arg">count</em> blocks of type <em class="arg">tp</em>.  <br /></td></tr>
 <tr class="separator:ga1158b49a55dfa81f58a4426a7578f523"><td class="memSeparator" colspan="2">&#160;</td></tr>
-<tr class="memitem:ga653bcb24ac495bc19940ecd6898f9cd7"><td class="memItemLeft" align="right" valign="top">#define&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__typed.html#ga653bcb24ac495bc19940ecd6898f9cd7">mi_heap_malloc_tp</a>(hp,  tp)</td></tr>
-<tr class="memdesc:ga653bcb24ac495bc19940ecd6898f9cd7"><td class="mdescLeft">&#160;</td><td class="mdescRight">Allocate a block of type <em>tp</em> in a heap <em>hp</em>.  <a href="group__typed.html#ga653bcb24ac495bc19940ecd6898f9cd7">More...</a><br /></td></tr>
+<tr class="memitem:ga653bcb24ac495bc19940ecd6898f9cd7" id="r_ga653bcb24ac495bc19940ecd6898f9cd7"><td class="memItemLeft" align="right" valign="top">#define&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="#ga653bcb24ac495bc19940ecd6898f9cd7">mi_heap_malloc_tp</a>(hp,  tp)</td></tr>
+<tr class="memdesc:ga653bcb24ac495bc19940ecd6898f9cd7"><td class="mdescLeft">&#160;</td><td class="mdescRight">Allocate a block of type <em class="arg">tp</em> in a heap <em class="arg">hp</em>.  <br /></td></tr>
 <tr class="separator:ga653bcb24ac495bc19940ecd6898f9cd7"><td class="memSeparator" colspan="2">&#160;</td></tr>
-<tr class="memitem:gad6e87e86e994aa14416ae9b5d4c188fe"><td class="memItemLeft" align="right" valign="top">#define&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__typed.html#gad6e87e86e994aa14416ae9b5d4c188fe">mi_heap_zalloc_tp</a>(hp,  tp)</td></tr>
-<tr class="memdesc:gad6e87e86e994aa14416ae9b5d4c188fe"><td class="mdescLeft">&#160;</td><td class="mdescRight">Allocate a zero-initialized block of type <em>tp</em> in a heap <em>hp</em>.  <a href="group__typed.html#gad6e87e86e994aa14416ae9b5d4c188fe">More...</a><br /></td></tr>
+<tr class="memitem:gad6e87e86e994aa14416ae9b5d4c188fe" id="r_gad6e87e86e994aa14416ae9b5d4c188fe"><td class="memItemLeft" align="right" valign="top">#define&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="#gad6e87e86e994aa14416ae9b5d4c188fe">mi_heap_zalloc_tp</a>(hp,  tp)</td></tr>
+<tr class="memdesc:gad6e87e86e994aa14416ae9b5d4c188fe"><td class="mdescLeft">&#160;</td><td class="mdescRight">Allocate a zero-initialized block of type <em class="arg">tp</em> in a heap <em class="arg">hp</em>.  <br /></td></tr>
 <tr class="separator:gad6e87e86e994aa14416ae9b5d4c188fe"><td class="memSeparator" colspan="2">&#160;</td></tr>
-<tr class="memitem:ga4e5d1f1707c90e5f55e023ac5f45fe74"><td class="memItemLeft" align="right" valign="top">#define&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__typed.html#ga4e5d1f1707c90e5f55e023ac5f45fe74">mi_heap_calloc_tp</a>(hp,  tp,  count)</td></tr>
-<tr class="memdesc:ga4e5d1f1707c90e5f55e023ac5f45fe74"><td class="mdescLeft">&#160;</td><td class="mdescRight">Allocate <em>count</em> zero-initialized blocks of type <em>tp</em> in a heap <em>hp</em>.  <a href="group__typed.html#ga4e5d1f1707c90e5f55e023ac5f45fe74">More...</a><br /></td></tr>
+<tr class="memitem:ga4e5d1f1707c90e5f55e023ac5f45fe74" id="r_ga4e5d1f1707c90e5f55e023ac5f45fe74"><td class="memItemLeft" align="right" valign="top">#define&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="#ga4e5d1f1707c90e5f55e023ac5f45fe74">mi_heap_calloc_tp</a>(hp,  tp,  count)</td></tr>
+<tr class="memdesc:ga4e5d1f1707c90e5f55e023ac5f45fe74"><td class="mdescLeft">&#160;</td><td class="mdescRight">Allocate <em class="arg">count</em> zero-initialized blocks of type <em class="arg">tp</em> in a heap <em class="arg">hp</em>.  <br /></td></tr>
 <tr class="separator:ga4e5d1f1707c90e5f55e023ac5f45fe74"><td class="memSeparator" colspan="2">&#160;</td></tr>
-<tr class="memitem:ga6b75cb9c4b9c647661d0924552dc6e83"><td class="memItemLeft" align="right" valign="top">#define&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__typed.html#ga6b75cb9c4b9c647661d0924552dc6e83">mi_heap_mallocn_tp</a>(hp,  tp,  count)</td></tr>
-<tr class="memdesc:ga6b75cb9c4b9c647661d0924552dc6e83"><td class="mdescLeft">&#160;</td><td class="mdescRight">Allocate <em>count</em> blocks of type <em>tp</em> in a heap <em>hp</em>.  <a href="group__typed.html#ga6b75cb9c4b9c647661d0924552dc6e83">More...</a><br /></td></tr>
+<tr class="memitem:ga6b75cb9c4b9c647661d0924552dc6e83" id="r_ga6b75cb9c4b9c647661d0924552dc6e83"><td class="memItemLeft" align="right" valign="top">#define&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="#ga6b75cb9c4b9c647661d0924552dc6e83">mi_heap_mallocn_tp</a>(hp,  tp,  count)</td></tr>
+<tr class="memdesc:ga6b75cb9c4b9c647661d0924552dc6e83"><td class="mdescLeft">&#160;</td><td class="mdescRight">Allocate <em class="arg">count</em> blocks of type <em class="arg">tp</em> in a heap <em class="arg">hp</em>.  <br /></td></tr>
 <tr class="separator:ga6b75cb9c4b9c647661d0924552dc6e83"><td class="memSeparator" colspan="2">&#160;</td></tr>
-<tr class="memitem:gaf213d5422ec35e7f6caad827c79bc948"><td class="memItemLeft" align="right" valign="top">#define&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__typed.html#gaf213d5422ec35e7f6caad827c79bc948">mi_heap_reallocn_tp</a>(hp,  p,  tp,  count)</td></tr>
-<tr class="memdesc:gaf213d5422ec35e7f6caad827c79bc948"><td class="mdescLeft">&#160;</td><td class="mdescRight">Re-allocate to <em>count</em> blocks of type <em>tp</em> in a heap <em>hp</em>.  <a href="group__typed.html#gaf213d5422ec35e7f6caad827c79bc948">More...</a><br /></td></tr>
+<tr class="memitem:gaf213d5422ec35e7f6caad827c79bc948" id="r_gaf213d5422ec35e7f6caad827c79bc948"><td class="memItemLeft" align="right" valign="top">#define&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="#gaf213d5422ec35e7f6caad827c79bc948">mi_heap_reallocn_tp</a>(hp,  p,  tp,  count)</td></tr>
+<tr class="memdesc:gaf213d5422ec35e7f6caad827c79bc948"><td class="mdescLeft">&#160;</td><td class="mdescRight">Re-allocate to <em class="arg">count</em> blocks of type <em class="arg">tp</em> in a heap <em class="arg">hp</em>.  <br /></td></tr>
 <tr class="separator:gaf213d5422ec35e7f6caad827c79bc948"><td class="memSeparator" colspan="2">&#160;</td></tr>
-<tr class="memitem:ga3e50a1600958fcaf1a7f3560c9174f9e"><td class="memItemLeft" align="right" valign="top">#define&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__typed.html#ga3e50a1600958fcaf1a7f3560c9174f9e">mi_heap_recalloc_tp</a>(hp,  p,  tp,  count)</td></tr>
-<tr class="memdesc:ga3e50a1600958fcaf1a7f3560c9174f9e"><td class="mdescLeft">&#160;</td><td class="mdescRight">Re-allocate to <em>count</em> zero initialized blocks of type <em>tp</em> in a heap <em>hp</em>.  <a href="group__typed.html#ga3e50a1600958fcaf1a7f3560c9174f9e">More...</a><br /></td></tr>
+<tr class="memitem:ga3e50a1600958fcaf1a7f3560c9174f9e" id="r_ga3e50a1600958fcaf1a7f3560c9174f9e"><td class="memItemLeft" align="right" valign="top">#define&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="#ga3e50a1600958fcaf1a7f3560c9174f9e">mi_heap_recalloc_tp</a>(hp,  p,  tp,  count)</td></tr>
+<tr class="memdesc:ga3e50a1600958fcaf1a7f3560c9174f9e"><td class="mdescLeft">&#160;</td><td class="mdescRight">Re-allocate to <em class="arg">count</em> zero initialized blocks of type <em class="arg">tp</em> in a heap <em class="arg">hp</em>.  <br /></td></tr>
 <tr class="separator:ga3e50a1600958fcaf1a7f3560c9174f9e"><td class="memSeparator" colspan="2">&#160;</td></tr>
 </table>
 <a name="details" id="details"></a><h2 class="groupheader">Detailed Description</h2>
 <p>Typed allocation macros. </p>
-<p>For example: </p><div class="fragment"><div class="line"><span class="keywordtype">int</span>* p = <a class="code" href="group__typed.html#ga0619a62c5fd886f1016030abe91f0557">mi_malloc_tp</a>(<span class="keywordtype">int</span>)</div>
-<div class="ttc" id="agroup__typed_html_ga0619a62c5fd886f1016030abe91f0557"><div class="ttname"><a href="group__typed.html#ga0619a62c5fd886f1016030abe91f0557">mi_malloc_tp</a></div><div class="ttdeci">#define mi_malloc_tp(tp)</div><div class="ttdoc">Allocate a block of type tp.</div><div class="ttdef"><b>Definition:</b> mimalloc-doc.h:692</div></div>
+<p>For example: </p><div class="fragment"><div class="line"><span class="keywordtype">int</span>* p = <a class="code hl_define" href="#ga0619a62c5fd886f1016030abe91f0557">mi_malloc_tp</a>(<span class="keywordtype">int</span>)</div>
+<div class="ttc" id="agroup__typed_html_ga0619a62c5fd886f1016030abe91f0557"><div class="ttname"><a href="#ga0619a62c5fd886f1016030abe91f0557">mi_malloc_tp</a></div><div class="ttdeci">#define mi_malloc_tp(tp)</div><div class="ttdoc">Allocate a block of type tp.</div><div class="ttdef"><b>Definition</b> mimalloc-doc.h:784</div></div>
 </div><!-- fragment --> <h2 class="groupheader">Macro Definition Documentation</h2>
-<a id="gae80c47c9d4cab10961fff1a8ac98fc07"></a>
-<h2 class="memtitle"><span class="permalink"><a href="#gae80c47c9d4cab10961fff1a8ac98fc07">&#9670;&nbsp;</a></span>mi_calloc_tp</h2>
+<a id="gae80c47c9d4cab10961fff1a8ac98fc07" name="gae80c47c9d4cab10961fff1a8ac98fc07"></a>
+<h2 class="memtitle"><span class="permalink"><a href="#gae80c47c9d4cab10961fff1a8ac98fc07">&#9670;&#160;</a></span>mi_calloc_tp</h2>
 
 <div class="memitem">
 <div class="memproto">
@@ -154,29 +163,22 @@ <h2 class="memtitle"><span class="permalink"><a href="#gae80c47c9d4cab10961fff1a
         <tr>
           <td class="memname">#define mi_calloc_tp</td>
           <td>(</td>
-          <td class="paramtype">&#160;</td>
-          <td class="paramname">tp, </td>
+          <td class="paramtype"></td>          <td class="paramname"><span class="paramname"><em>tp</em></span>, </td>
         </tr>
         <tr>
           <td class="paramkey"></td>
           <td></td>
-          <td class="paramtype">&#160;</td>
-          <td class="paramname">count&#160;</td>
-        </tr>
-        <tr>
-          <td></td>
-          <td>)</td>
-          <td></td><td></td>
+          <td class="paramtype"></td>          <td class="paramname"><span class="paramname"><em>count</em></span>&#160;)</td>
         </tr>
       </table>
 </div><div class="memdoc">
 
-<p>Allocate <em>count</em> zero-initialized blocks of type <em>tp</em>. </p>
+<p>Allocate <em class="arg">count</em> zero-initialized blocks of type <em class="arg">tp</em>. </p>
 
 </div>
 </div>
-<a id="ga4e5d1f1707c90e5f55e023ac5f45fe74"></a>
-<h2 class="memtitle"><span class="permalink"><a href="#ga4e5d1f1707c90e5f55e023ac5f45fe74">&#9670;&nbsp;</a></span>mi_heap_calloc_tp</h2>
+<a id="ga4e5d1f1707c90e5f55e023ac5f45fe74" name="ga4e5d1f1707c90e5f55e023ac5f45fe74"></a>
+<h2 class="memtitle"><span class="permalink"><a href="#ga4e5d1f1707c90e5f55e023ac5f45fe74">&#9670;&#160;</a></span>mi_heap_calloc_tp</h2>
 
 <div class="memitem">
 <div class="memproto">
@@ -184,35 +186,27 @@ <h2 class="memtitle"><span class="permalink"><a href="#ga4e5d1f1707c90e5f55e023a
         <tr>
           <td class="memname">#define mi_heap_calloc_tp</td>
           <td>(</td>
-          <td class="paramtype">&#160;</td>
-          <td class="paramname">hp, </td>
+          <td class="paramtype"></td>          <td class="paramname"><span class="paramname"><em>hp</em></span>, </td>
         </tr>
         <tr>
           <td class="paramkey"></td>
           <td></td>
-          <td class="paramtype">&#160;</td>
-          <td class="paramname">tp, </td>
+          <td class="paramtype"></td>          <td class="paramname"><span class="paramname"><em>tp</em></span>, </td>
         </tr>
         <tr>
           <td class="paramkey"></td>
           <td></td>
-          <td class="paramtype">&#160;</td>
-          <td class="paramname">count&#160;</td>
-        </tr>
-        <tr>
-          <td></td>
-          <td>)</td>
-          <td></td><td></td>
+          <td class="paramtype"></td>          <td class="paramname"><span class="paramname"><em>count</em></span>&#160;)</td>
         </tr>
       </table>
 </div><div class="memdoc">
 
-<p>Allocate <em>count</em> zero-initialized blocks of type <em>tp</em> in a heap <em>hp</em>. </p>
+<p>Allocate <em class="arg">count</em> zero-initialized blocks of type <em class="arg">tp</em> in a heap <em class="arg">hp</em>. </p>
 
 </div>
 </div>
-<a id="ga653bcb24ac495bc19940ecd6898f9cd7"></a>
-<h2 class="memtitle"><span class="permalink"><a href="#ga653bcb24ac495bc19940ecd6898f9cd7">&#9670;&nbsp;</a></span>mi_heap_malloc_tp</h2>
+<a id="ga653bcb24ac495bc19940ecd6898f9cd7" name="ga653bcb24ac495bc19940ecd6898f9cd7"></a>
+<h2 class="memtitle"><span class="permalink"><a href="#ga653bcb24ac495bc19940ecd6898f9cd7">&#9670;&#160;</a></span>mi_heap_malloc_tp</h2>
 
 <div class="memitem">
 <div class="memproto">
@@ -220,29 +214,22 @@ <h2 class="memtitle"><span class="permalink"><a href="#ga653bcb24ac495bc19940ecd
         <tr>
           <td class="memname">#define mi_heap_malloc_tp</td>
           <td>(</td>
-          <td class="paramtype">&#160;</td>
-          <td class="paramname">hp, </td>
+          <td class="paramtype"></td>          <td class="paramname"><span class="paramname"><em>hp</em></span>, </td>
         </tr>
         <tr>
           <td class="paramkey"></td>
           <td></td>
-          <td class="paramtype">&#160;</td>
-          <td class="paramname">tp&#160;</td>
-        </tr>
-        <tr>
-          <td></td>
-          <td>)</td>
-          <td></td><td></td>
+          <td class="paramtype"></td>          <td class="paramname"><span class="paramname"><em>tp</em></span>&#160;)</td>
         </tr>
       </table>
 </div><div class="memdoc">
 
-<p>Allocate a block of type <em>tp</em> in a heap <em>hp</em>. </p>
+<p>Allocate a block of type <em class="arg">tp</em> in a heap <em class="arg">hp</em>. </p>
 
 </div>
 </div>
-<a id="ga6b75cb9c4b9c647661d0924552dc6e83"></a>
-<h2 class="memtitle"><span class="permalink"><a href="#ga6b75cb9c4b9c647661d0924552dc6e83">&#9670;&nbsp;</a></span>mi_heap_mallocn_tp</h2>
+<a id="ga6b75cb9c4b9c647661d0924552dc6e83" name="ga6b75cb9c4b9c647661d0924552dc6e83"></a>
+<h2 class="memtitle"><span class="permalink"><a href="#ga6b75cb9c4b9c647661d0924552dc6e83">&#9670;&#160;</a></span>mi_heap_mallocn_tp</h2>
 
 <div class="memitem">
 <div class="memproto">
@@ -250,35 +237,27 @@ <h2 class="memtitle"><span class="permalink"><a href="#ga6b75cb9c4b9c647661d0924
         <tr>
           <td class="memname">#define mi_heap_mallocn_tp</td>
           <td>(</td>
-          <td class="paramtype">&#160;</td>
-          <td class="paramname">hp, </td>
+          <td class="paramtype"></td>          <td class="paramname"><span class="paramname"><em>hp</em></span>, </td>
         </tr>
         <tr>
           <td class="paramkey"></td>
           <td></td>
-          <td class="paramtype">&#160;</td>
-          <td class="paramname">tp, </td>
+          <td class="paramtype"></td>          <td class="paramname"><span class="paramname"><em>tp</em></span>, </td>
         </tr>
         <tr>
           <td class="paramkey"></td>
           <td></td>
-          <td class="paramtype">&#160;</td>
-          <td class="paramname">count&#160;</td>
-        </tr>
-        <tr>
-          <td></td>
-          <td>)</td>
-          <td></td><td></td>
+          <td class="paramtype"></td>          <td class="paramname"><span class="paramname"><em>count</em></span>&#160;)</td>
         </tr>
       </table>
 </div><div class="memdoc">
 
-<p>Allocate <em>count</em> blocks of type <em>tp</em> in a heap <em>hp</em>. </p>
+<p>Allocate <em class="arg">count</em> blocks of type <em class="arg">tp</em> in a heap <em class="arg">hp</em>. </p>
 
 </div>
 </div>
-<a id="gaf213d5422ec35e7f6caad827c79bc948"></a>
-<h2 class="memtitle"><span class="permalink"><a href="#gaf213d5422ec35e7f6caad827c79bc948">&#9670;&nbsp;</a></span>mi_heap_reallocn_tp</h2>
+<a id="gaf213d5422ec35e7f6caad827c79bc948" name="gaf213d5422ec35e7f6caad827c79bc948"></a>
+<h2 class="memtitle"><span class="permalink"><a href="#gaf213d5422ec35e7f6caad827c79bc948">&#9670;&#160;</a></span>mi_heap_reallocn_tp</h2>
 
 <div class="memitem">
 <div class="memproto">
@@ -286,41 +265,32 @@ <h2 class="memtitle"><span class="permalink"><a href="#gaf213d5422ec35e7f6caad82
         <tr>
           <td class="memname">#define mi_heap_reallocn_tp</td>
           <td>(</td>
-          <td class="paramtype">&#160;</td>
-          <td class="paramname">hp, </td>
+          <td class="paramtype"></td>          <td class="paramname"><span class="paramname"><em>hp</em></span>, </td>
         </tr>
         <tr>
           <td class="paramkey"></td>
           <td></td>
-          <td class="paramtype">&#160;</td>
-          <td class="paramname">p, </td>
+          <td class="paramtype"></td>          <td class="paramname"><span class="paramname"><em>p</em></span>, </td>
         </tr>
         <tr>
           <td class="paramkey"></td>
           <td></td>
-          <td class="paramtype">&#160;</td>
-          <td class="paramname">tp, </td>
+          <td class="paramtype"></td>          <td class="paramname"><span class="paramname"><em>tp</em></span>, </td>
         </tr>
         <tr>
           <td class="paramkey"></td>
           <td></td>
-          <td class="paramtype">&#160;</td>
-          <td class="paramname">count&#160;</td>
-        </tr>
-        <tr>
-          <td></td>
-          <td>)</td>
-          <td></td><td></td>
+          <td class="paramtype"></td>          <td class="paramname"><span class="paramname"><em>count</em></span>&#160;)</td>
         </tr>
       </table>
 </div><div class="memdoc">
 
-<p>Re-allocate to <em>count</em> blocks of type <em>tp</em> in a heap <em>hp</em>. </p>
+<p>Re-allocate to <em class="arg">count</em> blocks of type <em class="arg">tp</em> in a heap <em class="arg">hp</em>. </p>
 
 </div>
 </div>
-<a id="ga3e50a1600958fcaf1a7f3560c9174f9e"></a>
-<h2 class="memtitle"><span class="permalink"><a href="#ga3e50a1600958fcaf1a7f3560c9174f9e">&#9670;&nbsp;</a></span>mi_heap_recalloc_tp</h2>
+<a id="ga3e50a1600958fcaf1a7f3560c9174f9e" name="ga3e50a1600958fcaf1a7f3560c9174f9e"></a>
+<h2 class="memtitle"><span class="permalink"><a href="#ga3e50a1600958fcaf1a7f3560c9174f9e">&#9670;&#160;</a></span>mi_heap_recalloc_tp</h2>
 
 <div class="memitem">
 <div class="memproto">
@@ -328,41 +298,32 @@ <h2 class="memtitle"><span class="permalink"><a href="#ga3e50a1600958fcaf1a7f356
         <tr>
           <td class="memname">#define mi_heap_recalloc_tp</td>
           <td>(</td>
-          <td class="paramtype">&#160;</td>
-          <td class="paramname">hp, </td>
+          <td class="paramtype"></td>          <td class="paramname"><span class="paramname"><em>hp</em></span>, </td>
         </tr>
         <tr>
           <td class="paramkey"></td>
           <td></td>
-          <td class="paramtype">&#160;</td>
-          <td class="paramname">p, </td>
+          <td class="paramtype"></td>          <td class="paramname"><span class="paramname"><em>p</em></span>, </td>
         </tr>
         <tr>
           <td class="paramkey"></td>
           <td></td>
-          <td class="paramtype">&#160;</td>
-          <td class="paramname">tp, </td>
+          <td class="paramtype"></td>          <td class="paramname"><span class="paramname"><em>tp</em></span>, </td>
         </tr>
         <tr>
           <td class="paramkey"></td>
           <td></td>
-          <td class="paramtype">&#160;</td>
-          <td class="paramname">count&#160;</td>
-        </tr>
-        <tr>
-          <td></td>
-          <td>)</td>
-          <td></td><td></td>
+          <td class="paramtype"></td>          <td class="paramname"><span class="paramname"><em>count</em></span>&#160;)</td>
         </tr>
       </table>
 </div><div class="memdoc">
 
-<p>Re-allocate to <em>count</em> zero initialized blocks of type <em>tp</em> in a heap <em>hp</em>. </p>
+<p>Re-allocate to <em class="arg">count</em> zero initialized blocks of type <em class="arg">tp</em> in a heap <em class="arg">hp</em>. </p>
 
 </div>
 </div>
-<a id="gad6e87e86e994aa14416ae9b5d4c188fe"></a>
-<h2 class="memtitle"><span class="permalink"><a href="#gad6e87e86e994aa14416ae9b5d4c188fe">&#9670;&nbsp;</a></span>mi_heap_zalloc_tp</h2>
+<a id="gad6e87e86e994aa14416ae9b5d4c188fe" name="gad6e87e86e994aa14416ae9b5d4c188fe"></a>
+<h2 class="memtitle"><span class="permalink"><a href="#gad6e87e86e994aa14416ae9b5d4c188fe">&#9670;&#160;</a></span>mi_heap_zalloc_tp</h2>
 
 <div class="memitem">
 <div class="memproto">
@@ -370,29 +331,22 @@ <h2 class="memtitle"><span class="permalink"><a href="#gad6e87e86e994aa14416ae9b
         <tr>
           <td class="memname">#define mi_heap_zalloc_tp</td>
           <td>(</td>
-          <td class="paramtype">&#160;</td>
-          <td class="paramname">hp, </td>
+          <td class="paramtype"></td>          <td class="paramname"><span class="paramname"><em>hp</em></span>, </td>
         </tr>
         <tr>
           <td class="paramkey"></td>
           <td></td>
-          <td class="paramtype">&#160;</td>
-          <td class="paramname">tp&#160;</td>
-        </tr>
-        <tr>
-          <td></td>
-          <td>)</td>
-          <td></td><td></td>
+          <td class="paramtype"></td>          <td class="paramname"><span class="paramname"><em>tp</em></span>&#160;)</td>
         </tr>
       </table>
 </div><div class="memdoc">
 
-<p>Allocate a zero-initialized block of type <em>tp</em> in a heap <em>hp</em>. </p>
+<p>Allocate a zero-initialized block of type <em class="arg">tp</em> in a heap <em class="arg">hp</em>. </p>
 
 </div>
 </div>
-<a id="ga0619a62c5fd886f1016030abe91f0557"></a>
-<h2 class="memtitle"><span class="permalink"><a href="#ga0619a62c5fd886f1016030abe91f0557">&#9670;&nbsp;</a></span>mi_malloc_tp</h2>
+<a id="ga0619a62c5fd886f1016030abe91f0557" name="ga0619a62c5fd886f1016030abe91f0557"></a>
+<h2 class="memtitle"><span class="permalink"><a href="#ga0619a62c5fd886f1016030abe91f0557">&#9670;&#160;</a></span>mi_malloc_tp</h2>
 
 <div class="memitem">
 <div class="memproto">
@@ -400,28 +354,27 @@ <h2 class="memtitle"><span class="permalink"><a href="#ga0619a62c5fd886f1016030a
         <tr>
           <td class="memname">#define mi_malloc_tp</td>
           <td>(</td>
-          <td class="paramtype">&#160;</td>
-          <td class="paramname">tp</td><td>)</td>
+          <td class="paramtype"></td>          <td class="paramname"><span class="paramname"><em>tp</em></span></td><td>)</td>
           <td></td>
         </tr>
       </table>
 </div><div class="memdoc">
 
-<p>Allocate a block of type <em>tp</em>. </p>
+<p>Allocate a block of type <em class="arg">tp</em>. </p>
 <dl class="params"><dt>Parameters</dt><dd>
   <table class="params">
     <tr><td class="paramname">tp</td><td>The type of the block to allocate. </td></tr>
   </table>
   </dd>
 </dl>
-<dl class="section return"><dt>Returns</dt><dd>A pointer to an object of type <em>tp</em>, or <em>NULL</em> if out of memory.</dd></dl>
-<p><b>Example:</b> </p><div class="fragment"><div class="line"><span class="keywordtype">int</span>* p = <a class="code" href="group__typed.html#ga0619a62c5fd886f1016030abe91f0557">mi_malloc_tp</a>(<span class="keywordtype">int</span>)</div>
-</div><!-- fragment --><dl class="section see"><dt>See also</dt><dd><a class="el" href="group__malloc.html#ga3406e8b168bc74c8637b11571a6da83a" title="Allocate size bytes.">mi_malloc()</a> </dd></dl>
+<dl class="section return"><dt>Returns</dt><dd>A pointer to an object of type <em class="arg">tp</em>, or <em class="arg">NULL</em> if out of memory.</dd></dl>
+<p><b>Example:</b> </p><div class="fragment"><div class="line"><span class="keywordtype">int</span>* p = <a class="code hl_define" href="#ga0619a62c5fd886f1016030abe91f0557">mi_malloc_tp</a>(<span class="keywordtype">int</span>)</div>
+</div><!-- fragment --><dl class="section see"><dt>See also</dt><dd><a class="el" href="group__malloc.html#gae1dd97b542420c87ae085e822b1229e8" title="Allocate size bytes.">mi_malloc()</a> </dd></dl>
 
 </div>
 </div>
-<a id="gae5cb6e0fafc9f23169c5622e077afe8b"></a>
-<h2 class="memtitle"><span class="permalink"><a href="#gae5cb6e0fafc9f23169c5622e077afe8b">&#9670;&nbsp;</a></span>mi_mallocn_tp</h2>
+<a id="gae5cb6e0fafc9f23169c5622e077afe8b" name="gae5cb6e0fafc9f23169c5622e077afe8b"></a>
+<h2 class="memtitle"><span class="permalink"><a href="#gae5cb6e0fafc9f23169c5622e077afe8b">&#9670;&#160;</a></span>mi_mallocn_tp</h2>
 
 <div class="memitem">
 <div class="memproto">
@@ -429,29 +382,22 @@ <h2 class="memtitle"><span class="permalink"><a href="#gae5cb6e0fafc9f23169c5622
         <tr>
           <td class="memname">#define mi_mallocn_tp</td>
           <td>(</td>
-          <td class="paramtype">&#160;</td>
-          <td class="paramname">tp, </td>
+          <td class="paramtype"></td>          <td class="paramname"><span class="paramname"><em>tp</em></span>, </td>
         </tr>
         <tr>
           <td class="paramkey"></td>
           <td></td>
-          <td class="paramtype">&#160;</td>
-          <td class="paramname">count&#160;</td>
-        </tr>
-        <tr>
-          <td></td>
-          <td>)</td>
-          <td></td><td></td>
+          <td class="paramtype"></td>          <td class="paramname"><span class="paramname"><em>count</em></span>&#160;)</td>
         </tr>
       </table>
 </div><div class="memdoc">
 
-<p>Allocate <em>count</em> blocks of type <em>tp</em>. </p>
+<p>Allocate <em class="arg">count</em> blocks of type <em class="arg">tp</em>. </p>
 
 </div>
 </div>
-<a id="ga1158b49a55dfa81f58a4426a7578f523"></a>
-<h2 class="memtitle"><span class="permalink"><a href="#ga1158b49a55dfa81f58a4426a7578f523">&#9670;&nbsp;</a></span>mi_reallocn_tp</h2>
+<a id="ga1158b49a55dfa81f58a4426a7578f523" name="ga1158b49a55dfa81f58a4426a7578f523"></a>
+<h2 class="memtitle"><span class="permalink"><a href="#ga1158b49a55dfa81f58a4426a7578f523">&#9670;&#160;</a></span>mi_reallocn_tp</h2>
 
 <div class="memitem">
 <div class="memproto">
@@ -459,35 +405,27 @@ <h2 class="memtitle"><span class="permalink"><a href="#ga1158b49a55dfa81f58a4426
         <tr>
           <td class="memname">#define mi_reallocn_tp</td>
           <td>(</td>
-          <td class="paramtype">&#160;</td>
-          <td class="paramname">p, </td>
+          <td class="paramtype"></td>          <td class="paramname"><span class="paramname"><em>p</em></span>, </td>
         </tr>
         <tr>
           <td class="paramkey"></td>
           <td></td>
-          <td class="paramtype">&#160;</td>
-          <td class="paramname">tp, </td>
+          <td class="paramtype"></td>          <td class="paramname"><span class="paramname"><em>tp</em></span>, </td>
         </tr>
         <tr>
           <td class="paramkey"></td>
           <td></td>
-          <td class="paramtype">&#160;</td>
-          <td class="paramname">count&#160;</td>
-        </tr>
-        <tr>
-          <td></td>
-          <td>)</td>
-          <td></td><td></td>
+          <td class="paramtype"></td>          <td class="paramname"><span class="paramname"><em>count</em></span>&#160;)</td>
         </tr>
       </table>
 </div><div class="memdoc">
 
-<p>Re-allocate to <em>count</em> blocks of type <em>tp</em>. </p>
+<p>Re-allocate to <em class="arg">count</em> blocks of type <em class="arg">tp</em>. </p>
 
 </div>
 </div>
-<a id="gac77a61bdaf680a803785fe307820b48c"></a>
-<h2 class="memtitle"><span class="permalink"><a href="#gac77a61bdaf680a803785fe307820b48c">&#9670;&nbsp;</a></span>mi_zalloc_tp</h2>
+<a id="gac77a61bdaf680a803785fe307820b48c" name="gac77a61bdaf680a803785fe307820b48c"></a>
+<h2 class="memtitle"><span class="permalink"><a href="#gac77a61bdaf680a803785fe307820b48c">&#9670;&#160;</a></span>mi_zalloc_tp</h2>
 
 <div class="memitem">
 <div class="memproto">
@@ -495,14 +433,13 @@ <h2 class="memtitle"><span class="permalink"><a href="#gac77a61bdaf680a803785fe3
         <tr>
           <td class="memname">#define mi_zalloc_tp</td>
           <td>(</td>
-          <td class="paramtype">&#160;</td>
-          <td class="paramname">tp</td><td>)</td>
+          <td class="paramtype"></td>          <td class="paramname"><span class="paramname"><em>tp</em></span></td><td>)</td>
           <td></td>
         </tr>
       </table>
 </div><div class="memdoc">
 
-<p>Allocate a zero-initialized block of type <em>tp</em>. </p>
+<p>Allocate a zero-initialized block of type <em class="arg">tp</em>. </p>
 
 </div>
 </div>
@@ -511,7 +448,7 @@ <h2 class="memtitle"><span class="permalink"><a href="#gac77a61bdaf680a803785fe3
 <!-- start footer part -->
 <div id="nav-path" class="navpath"><!-- id is needed for treeview function! -->
   <ul>
-    <li class="footer">Generated by <a href="https://www.doxygen.org/index.html"><img class="footer" src="doxygen.svg" width="104" height="31" alt="doxygen"/></a> 1.9.1 </li>
+    <li class="footer">Generated by <a href="https://www.doxygen.org/index.html"><img class="footer" src="doxygen.svg" width="104" height="31" alt="doxygen"/></a> 1.13.1 </li>
   </ul>
 </div>
 </body>
diff --git a/depends/mimalloc/docs/group__zeroinit.html b/depends/mimalloc/docs/group__zeroinit.html
index 329a7739d207..6ae8ff87ea9b 100644
--- a/depends/mimalloc/docs/group__zeroinit.html
+++ b/depends/mimalloc/docs/group__zeroinit.html
@@ -1,24 +1,26 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "https://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
+<html xmlns="http://www.w3.org/1999/xhtml" lang="en-US">
 <head>
 <meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
-<meta http-equiv="X-UA-Compatible" content="IE=9"/>
-<meta name="generator" content="Doxygen 1.9.1"/>
+<meta http-equiv="X-UA-Compatible" content="IE=11"/>
+<meta name="generator" content="Doxygen 1.13.1"/>
 <meta name="viewport" content="width=device-width, initial-scale=1"/>
 <title>mi-malloc: Zero initialized re-allocation</title>
 <link href="tabs.css" rel="stylesheet" type="text/css"/>
 <script type="text/javascript" src="jquery.js"></script>
 <script type="text/javascript" src="dynsections.js"></script>
+<script type="text/javascript" src="clipboard.js"></script>
 <link href="navtree.css" rel="stylesheet" type="text/css"/>
-<script type="text/javascript" src="resize.js"></script>
 <script type="text/javascript" src="navtreedata.js"></script>
 <script type="text/javascript" src="navtree.js"></script>
+<script type="text/javascript" src="resize.js"></script>
+<script type="text/javascript" src="cookie.js"></script>
 <link href="search/search.css" rel="stylesheet" type="text/css"/>
 <script type="text/javascript" src="search/searchdata.js"></script>
 <script type="text/javascript" src="search/search.js"></script>
 <script type="text/javascript">
-/* @license magnet:?xt=urn:btih:cf05388f2679ee054f2beb29a391d25f4e673ac3&amp;dn=gpl-2.0.txt GPL-v2 */
-  $(document).ready(function() { init_search(); });
+/* @license magnet:?xt=urn:btih:d3d9a9a6595521f9666a5e94cc830dab83b65699&amp;dn=expat.txt MIT */
+  $(function() { init_search(); });
 /* @license-end */
 </script>
 <link href="doxygen.css" rel="stylesheet" type="text/css" />
@@ -29,20 +31,16 @@
 <div id="titlearea">
 <table cellspacing="0" cellpadding="0">
  <tbody>
- <tr style="height: 56px;">
+ <tr id="projectrow">
   <td id="projectlogo"><img alt="Logo" src="mimalloc-logo.svg"/></td>
-  <td id="projectalign" style="padding-left: 0.5em;">
-   <div id="projectname">mi-malloc
-   &#160;<span id="projectnumber">1.7/2.0</span>
+  <td id="projectalign">
+   <div id="projectname">mi-malloc<span id="projectnumber">&#160;1.8/2.1</span>
    </div>
   </td>
-   <td>        <div id="MSearchBox" class="MSearchBoxInactive">
+    <td>        <div id="MSearchBox" class="MSearchBoxInactive">
         <span class="left">
-          <img id="MSearchSelect" src="search/mag_sel.svg"
-               onmouseover="return searchBox.OnSearchSelectShow()"
-               onmouseout="return searchBox.OnSearchSelectHide()"
-               alt=""/>
-          <input type="text" id="MSearchField" value="Search" accesskey="S"
+          <span id="MSearchSelect"                onmouseover="return searchBox.OnSearchSelectShow()"                onmouseout="return searchBox.OnSearchSelectHide()">&#160;</span>
+          <input type="text" id="MSearchField" value="" placeholder="Search" accesskey="S"
                onfocus="searchBox.OnSearchFieldFocus(true)" 
                onblur="searchBox.OnSearchFieldFocus(false)" 
                onkeyup="searchBox.OnSearchFieldChange(event)"/>
@@ -56,10 +54,15 @@
 </table>
 </div>
 <!-- end header part -->
-<!-- Generated by Doxygen 1.9.1 -->
+<!-- Generated by Doxygen 1.13.1 -->
+<script type="text/javascript">
+/* @license magnet:?xt=urn:btih:d3d9a9a6595521f9666a5e94cc830dab83b65699&amp;dn=expat.txt MIT */
+var searchBox = new SearchBox("searchBox", "search/",'.html');
+/* @license-end */
+</script>
 <script type="text/javascript">
-/* @license magnet:?xt=urn:btih:cf05388f2679ee054f2beb29a391d25f4e673ac3&amp;dn=gpl-2.0.txt GPL-v2 */
-var searchBox = new SearchBox("searchBox", "search",false,'Search','.html');
+/* @license magnet:?xt=urn:btih:d3d9a9a6595521f9666a5e94cc830dab83b65699&amp;dn=expat.txt MIT */
+$(function() { codefold.init(0); });
 /* @license-end */
 </script>
 </div><!-- top -->
@@ -74,8 +77,8 @@
   </div>
 </div>
 <script type="text/javascript">
-/* @license magnet:?xt=urn:btih:cf05388f2679ee054f2beb29a391d25f4e673ac3&amp;dn=gpl-2.0.txt GPL-v2 */
-$(document).ready(function(){initNavTree('group__zeroinit.html',''); initResizable(); });
+/* @license magnet:?xt=urn:btih:d3d9a9a6595521f9666a5e94cc830dab83b65699&amp;dn=expat.txt MIT */
+$(function(){initNavTree('group__zeroinit.html',''); initResizable(true); });
 /* @license-end */
 </script>
 <div id="doc-content">
@@ -88,491 +91,397 @@
 
 <!-- iframe showing the search results (closed by default) -->
 <div id="MSearchResultsWindow">
-<iframe src="javascript:void(0)" frameborder="0" 
-        name="MSearchResults" id="MSearchResults">
-</iframe>
+<div id="MSearchResults">
+<div class="SRPage">
+<div id="SRIndex">
+<div id="SRResults"></div>
+<div class="SRStatus" id="Loading">Loading...</div>
+<div class="SRStatus" id="Searching">Searching...</div>
+<div class="SRStatus" id="NoMatches">No Matches</div>
+</div>
+</div>
+</div>
 </div>
 
 <div class="header">
   <div class="summary">
 <a href="#func-members">Functions</a>  </div>
-  <div class="headertitle">
-<div class="title">Zero initialized re-allocation</div>  </div>
+  <div class="headertitle"><div class="title">Zero initialized re-allocation</div></div>
 </div><!--header-->
 <div class="contents">
 
 <p>The zero-initialized re-allocations are only valid on memory that was originally allocated with zero initialization too.  
 <a href="#details">More...</a></p>
 <table class="memberdecls">
-<tr class="heading"><td colspan="2"><h2 class="groupheader"><a name="func-members"></a>
+<tr class="heading"><td colspan="2"><h2 class="groupheader"><a id="func-members" name="func-members"></a>
 Functions</h2></td></tr>
-<tr class="memitem:ga8c292e142110229a2980b37ab036dbc6"><td class="memItemLeft" align="right" valign="top">void *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__zeroinit.html#ga8c292e142110229a2980b37ab036dbc6">mi_rezalloc</a> (void *p, size_t newsize)</td></tr>
-<tr class="separator:ga8c292e142110229a2980b37ab036dbc6"><td class="memSeparator" colspan="2">&#160;</td></tr>
-<tr class="memitem:gacd71a7bce96aab38ae6de17af2eb2cf0"><td class="memItemLeft" align="right" valign="top">void *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__zeroinit.html#gacd71a7bce96aab38ae6de17af2eb2cf0">mi_rezalloc_aligned</a> (void *p, size_t newsize, size_t alignment)</td></tr>
-<tr class="separator:gacd71a7bce96aab38ae6de17af2eb2cf0"><td class="memSeparator" colspan="2">&#160;</td></tr>
-<tr class="memitem:gae8b358c417e61d5307da002702b0a8e1"><td class="memItemLeft" align="right" valign="top">void *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__zeroinit.html#gae8b358c417e61d5307da002702b0a8e1">mi_rezalloc_aligned_at</a> (void *p, size_t newsize, size_t alignment, size_t offset)</td></tr>
-<tr class="separator:gae8b358c417e61d5307da002702b0a8e1"><td class="memSeparator" colspan="2">&#160;</td></tr>
-<tr class="memitem:ga3e7e5c291acf1c7fd7ffd9914a9f945f"><td class="memItemLeft" align="right" valign="top">void *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__zeroinit.html#ga3e7e5c291acf1c7fd7ffd9914a9f945f">mi_recalloc_aligned</a> (void *p, size_t newcount, size_t size, size_t alignment)</td></tr>
-<tr class="separator:ga3e7e5c291acf1c7fd7ffd9914a9f945f"><td class="memSeparator" colspan="2">&#160;</td></tr>
-<tr class="memitem:ga4ff5e92ad73585418a072c9d059e5cf9"><td class="memItemLeft" align="right" valign="top">void *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__zeroinit.html#ga4ff5e92ad73585418a072c9d059e5cf9">mi_recalloc_aligned_at</a> (void *p, size_t newcount, size_t size, size_t alignment, size_t offset)</td></tr>
-<tr class="separator:ga4ff5e92ad73585418a072c9d059e5cf9"><td class="memSeparator" colspan="2">&#160;</td></tr>
-<tr class="memitem:gacfad83f14eb5d6a42a497a898e19fc76"><td class="memItemLeft" align="right" valign="top">void *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__zeroinit.html#gacfad83f14eb5d6a42a497a898e19fc76">mi_heap_rezalloc</a> (<a class="el" href="group__heap.html#ga34a47cde5a5b38c29f1aa3c5e76943c2">mi_heap_t</a> *heap, void *p, size_t newsize)</td></tr>
-<tr class="separator:gacfad83f14eb5d6a42a497a898e19fc76"><td class="memSeparator" colspan="2">&#160;</td></tr>
-<tr class="memitem:ga8648c5fbb22a80f0262859099f06dfbd"><td class="memItemLeft" align="right" valign="top">void *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__zeroinit.html#ga8648c5fbb22a80f0262859099f06dfbd">mi_heap_recalloc</a> (<a class="el" href="group__heap.html#ga34a47cde5a5b38c29f1aa3c5e76943c2">mi_heap_t</a> *heap, void *p, size_t newcount, size_t size)</td></tr>
-<tr class="separator:ga8648c5fbb22a80f0262859099f06dfbd"><td class="memSeparator" colspan="2">&#160;</td></tr>
-<tr class="memitem:ga375fa8a611c51905e592d5d467c49664"><td class="memItemLeft" align="right" valign="top">void *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__zeroinit.html#ga375fa8a611c51905e592d5d467c49664">mi_heap_rezalloc_aligned</a> (<a class="el" href="group__heap.html#ga34a47cde5a5b38c29f1aa3c5e76943c2">mi_heap_t</a> *heap, void *p, size_t newsize, size_t alignment)</td></tr>
-<tr class="separator:ga375fa8a611c51905e592d5d467c49664"><td class="memSeparator" colspan="2">&#160;</td></tr>
-<tr class="memitem:gac90da54fa7e5d10bdc97ce0b51dce2eb"><td class="memItemLeft" align="right" valign="top">void *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__zeroinit.html#gac90da54fa7e5d10bdc97ce0b51dce2eb">mi_heap_rezalloc_aligned_at</a> (<a class="el" href="group__heap.html#ga34a47cde5a5b38c29f1aa3c5e76943c2">mi_heap_t</a> *heap, void *p, size_t newsize, size_t alignment, size_t offset)</td></tr>
-<tr class="separator:gac90da54fa7e5d10bdc97ce0b51dce2eb"><td class="memSeparator" colspan="2">&#160;</td></tr>
-<tr class="memitem:ga9f3f999396c8f77ca5e80e7b40ac29e3"><td class="memItemLeft" align="right" valign="top">void *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__zeroinit.html#ga9f3f999396c8f77ca5e80e7b40ac29e3">mi_heap_recalloc_aligned</a> (<a class="el" href="group__heap.html#ga34a47cde5a5b38c29f1aa3c5e76943c2">mi_heap_t</a> *heap, void *p, size_t newcount, size_t size, size_t alignment)</td></tr>
-<tr class="separator:ga9f3f999396c8f77ca5e80e7b40ac29e3"><td class="memSeparator" colspan="2">&#160;</td></tr>
-<tr class="memitem:ga496452c96f1de8c500be9fddf52edaf7"><td class="memItemLeft" align="right" valign="top">void *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__zeroinit.html#ga496452c96f1de8c500be9fddf52edaf7">mi_heap_recalloc_aligned_at</a> (<a class="el" href="group__heap.html#ga34a47cde5a5b38c29f1aa3c5e76943c2">mi_heap_t</a> *heap, void *p, size_t newcount, size_t size, size_t alignment, size_t offset)</td></tr>
-<tr class="separator:ga496452c96f1de8c500be9fddf52edaf7"><td class="memSeparator" colspan="2">&#160;</td></tr>
+<tr class="memitem:gadfd34cd7b4f2bbda7ae06367a6360756" id="r_gadfd34cd7b4f2bbda7ae06367a6360756"><td class="memItemLeft" align="right" valign="top">void *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="#gadfd34cd7b4f2bbda7ae06367a6360756">mi_rezalloc</a> (void *p, size_t newsize)</td></tr>
+<tr class="separator:gadfd34cd7b4f2bbda7ae06367a6360756"><td class="memSeparator" colspan="2">&#160;</td></tr>
+<tr class="memitem:ga4d02404fe1e7db00beb65f185e012caa" id="r_ga4d02404fe1e7db00beb65f185e012caa"><td class="memItemLeft" align="right" valign="top">void *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="#ga4d02404fe1e7db00beb65f185e012caa">mi_rezalloc_aligned</a> (void *p, size_t newsize, size_t alignment)</td></tr>
+<tr class="separator:ga4d02404fe1e7db00beb65f185e012caa"><td class="memSeparator" colspan="2">&#160;</td></tr>
+<tr class="memitem:ga6843a88285bbfcc3bdfccc60aafd1270" id="r_ga6843a88285bbfcc3bdfccc60aafd1270"><td class="memItemLeft" align="right" valign="top">void *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="#ga6843a88285bbfcc3bdfccc60aafd1270">mi_rezalloc_aligned_at</a> (void *p, size_t newsize, size_t alignment, size_t offset)</td></tr>
+<tr class="separator:ga6843a88285bbfcc3bdfccc60aafd1270"><td class="memSeparator" colspan="2">&#160;</td></tr>
+<tr class="memitem:ga3e2169b48683aa0ab64f813fd68d839e" id="r_ga3e2169b48683aa0ab64f813fd68d839e"><td class="memItemLeft" align="right" valign="top">void *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="#ga3e2169b48683aa0ab64f813fd68d839e">mi_recalloc_aligned</a> (void *p, size_t newcount, size_t size, size_t alignment)</td></tr>
+<tr class="separator:ga3e2169b48683aa0ab64f813fd68d839e"><td class="memSeparator" colspan="2">&#160;</td></tr>
+<tr class="memitem:gaae25e4ddedd4e0fb61b1a8bd5d452750" id="r_gaae25e4ddedd4e0fb61b1a8bd5d452750"><td class="memItemLeft" align="right" valign="top">void *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="#gaae25e4ddedd4e0fb61b1a8bd5d452750">mi_recalloc_aligned_at</a> (void *p, size_t newcount, size_t size, size_t alignment, size_t offset)</td></tr>
+<tr class="separator:gaae25e4ddedd4e0fb61b1a8bd5d452750"><td class="memSeparator" colspan="2">&#160;</td></tr>
+<tr class="memitem:ga8d8b7ebb24b513cd84d1a696048da60d" id="r_ga8d8b7ebb24b513cd84d1a696048da60d"><td class="memItemLeft" align="right" valign="top">void *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="#ga8d8b7ebb24b513cd84d1a696048da60d">mi_heap_rezalloc</a> (<a class="el" href="group__heap.html#ga34a47cde5a5b38c29f1aa3c5e76943c2">mi_heap_t</a> *heap, void *p, size_t newsize)</td></tr>
+<tr class="separator:ga8d8b7ebb24b513cd84d1a696048da60d"><td class="memSeparator" colspan="2">&#160;</td></tr>
+<tr class="memitem:gad1a0d325d930eeb80f25e3fea37aacde" id="r_gad1a0d325d930eeb80f25e3fea37aacde"><td class="memItemLeft" align="right" valign="top">void *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="#gad1a0d325d930eeb80f25e3fea37aacde">mi_heap_recalloc</a> (<a class="el" href="group__heap.html#ga34a47cde5a5b38c29f1aa3c5e76943c2">mi_heap_t</a> *heap, void *p, size_t newcount, size_t size)</td></tr>
+<tr class="separator:gad1a0d325d930eeb80f25e3fea37aacde"><td class="memSeparator" colspan="2">&#160;</td></tr>
+<tr class="memitem:ga5129f6dc46ee1613d918820a8a0533a7" id="r_ga5129f6dc46ee1613d918820a8a0533a7"><td class="memItemLeft" align="right" valign="top">void *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="#ga5129f6dc46ee1613d918820a8a0533a7">mi_heap_rezalloc_aligned</a> (<a class="el" href="group__heap.html#ga34a47cde5a5b38c29f1aa3c5e76943c2">mi_heap_t</a> *heap, void *p, size_t newsize, size_t alignment)</td></tr>
+<tr class="separator:ga5129f6dc46ee1613d918820a8a0533a7"><td class="memSeparator" colspan="2">&#160;</td></tr>
+<tr class="memitem:ga2bafa79c3f98ea74882349d44cffa5d9" id="r_ga2bafa79c3f98ea74882349d44cffa5d9"><td class="memItemLeft" align="right" valign="top">void *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="#ga2bafa79c3f98ea74882349d44cffa5d9">mi_heap_rezalloc_aligned_at</a> (<a class="el" href="group__heap.html#ga34a47cde5a5b38c29f1aa3c5e76943c2">mi_heap_t</a> *heap, void *p, size_t newsize, size_t alignment, size_t offset)</td></tr>
+<tr class="separator:ga2bafa79c3f98ea74882349d44cffa5d9"><td class="memSeparator" colspan="2">&#160;</td></tr>
+<tr class="memitem:ga87ddd674bf1c67237d780d0b9e0f0f32" id="r_ga87ddd674bf1c67237d780d0b9e0f0f32"><td class="memItemLeft" align="right" valign="top">void *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="#ga87ddd674bf1c67237d780d0b9e0f0f32">mi_heap_recalloc_aligned</a> (<a class="el" href="group__heap.html#ga34a47cde5a5b38c29f1aa3c5e76943c2">mi_heap_t</a> *heap, void *p, size_t newcount, size_t size, size_t alignment)</td></tr>
+<tr class="separator:ga87ddd674bf1c67237d780d0b9e0f0f32"><td class="memSeparator" colspan="2">&#160;</td></tr>
+<tr class="memitem:ga07b5bcbaf00d0d2e598c232982588496" id="r_ga07b5bcbaf00d0d2e598c232982588496"><td class="memItemLeft" align="right" valign="top">void *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="#ga07b5bcbaf00d0d2e598c232982588496">mi_heap_recalloc_aligned_at</a> (<a class="el" href="group__heap.html#ga34a47cde5a5b38c29f1aa3c5e76943c2">mi_heap_t</a> *heap, void *p, size_t newcount, size_t size, size_t alignment, size_t offset)</td></tr>
+<tr class="separator:ga07b5bcbaf00d0d2e598c232982588496"><td class="memSeparator" colspan="2">&#160;</td></tr>
 </table>
 <a name="details" id="details"></a><h2 class="groupheader">Detailed Description</h2>
 <p>The zero-initialized re-allocations are only valid on memory that was originally allocated with zero initialization too. </p>
 <p>e.g. <code>mi_calloc</code>, <code>mi_zalloc</code>, <code>mi_zalloc_aligned</code> etc. see <a href="https://github.com/microsoft/mimalloc/issues/63#issuecomment-508272992">https://github.com/microsoft/mimalloc/issues/63#issuecomment-508272992</a> </p>
 <h2 class="groupheader">Function Documentation</h2>
-<a id="ga8648c5fbb22a80f0262859099f06dfbd"></a>
-<h2 class="memtitle"><span class="permalink"><a href="#ga8648c5fbb22a80f0262859099f06dfbd">&#9670;&nbsp;</a></span>mi_heap_recalloc()</h2>
+<a id="gad1a0d325d930eeb80f25e3fea37aacde" name="gad1a0d325d930eeb80f25e3fea37aacde"></a>
+<h2 class="memtitle"><span class="permalink"><a href="#gad1a0d325d930eeb80f25e3fea37aacde">&#9670;&#160;</a></span>mi_heap_recalloc()</h2>
 
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname">void* mi_heap_recalloc </td>
+          <td class="memname">void * mi_heap_recalloc </td>
           <td>(</td>
-          <td class="paramtype"><a class="el" href="group__heap.html#ga34a47cde5a5b38c29f1aa3c5e76943c2">mi_heap_t</a> *&#160;</td>
-          <td class="paramname"><em>heap</em>, </td>
+          <td class="paramtype"><a class="el" href="group__heap.html#ga34a47cde5a5b38c29f1aa3c5e76943c2">mi_heap_t</a> *</td>          <td class="paramname"><span class="paramname"><em>heap</em></span>, </td>
         </tr>
         <tr>
           <td class="paramkey"></td>
           <td></td>
-          <td class="paramtype">void *&#160;</td>
-          <td class="paramname"><em>p</em>, </td>
+          <td class="paramtype">void *</td>          <td class="paramname"><span class="paramname"><em>p</em></span>, </td>
         </tr>
         <tr>
           <td class="paramkey"></td>
           <td></td>
-          <td class="paramtype">size_t&#160;</td>
-          <td class="paramname"><em>newcount</em>, </td>
+          <td class="paramtype">size_t</td>          <td class="paramname"><span class="paramname"><em>newcount</em></span>, </td>
         </tr>
         <tr>
           <td class="paramkey"></td>
           <td></td>
-          <td class="paramtype">size_t&#160;</td>
-          <td class="paramname"><em>size</em>&#160;</td>
-        </tr>
-        <tr>
-          <td></td>
-          <td>)</td>
-          <td></td><td></td>
+          <td class="paramtype">size_t</td>          <td class="paramname"><span class="paramname"><em>size</em></span>&#160;)</td>
         </tr>
       </table>
 </div><div class="memdoc">
 
 </div>
 </div>
-<a id="ga9f3f999396c8f77ca5e80e7b40ac29e3"></a>
-<h2 class="memtitle"><span class="permalink"><a href="#ga9f3f999396c8f77ca5e80e7b40ac29e3">&#9670;&nbsp;</a></span>mi_heap_recalloc_aligned()</h2>
+<a id="ga87ddd674bf1c67237d780d0b9e0f0f32" name="ga87ddd674bf1c67237d780d0b9e0f0f32"></a>
+<h2 class="memtitle"><span class="permalink"><a href="#ga87ddd674bf1c67237d780d0b9e0f0f32">&#9670;&#160;</a></span>mi_heap_recalloc_aligned()</h2>
 
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname">void* mi_heap_recalloc_aligned </td>
+          <td class="memname">void * mi_heap_recalloc_aligned </td>
           <td>(</td>
-          <td class="paramtype"><a class="el" href="group__heap.html#ga34a47cde5a5b38c29f1aa3c5e76943c2">mi_heap_t</a> *&#160;</td>
-          <td class="paramname"><em>heap</em>, </td>
+          <td class="paramtype"><a class="el" href="group__heap.html#ga34a47cde5a5b38c29f1aa3c5e76943c2">mi_heap_t</a> *</td>          <td class="paramname"><span class="paramname"><em>heap</em></span>, </td>
         </tr>
         <tr>
           <td class="paramkey"></td>
           <td></td>
-          <td class="paramtype">void *&#160;</td>
-          <td class="paramname"><em>p</em>, </td>
+          <td class="paramtype">void *</td>          <td class="paramname"><span class="paramname"><em>p</em></span>, </td>
         </tr>
         <tr>
           <td class="paramkey"></td>
           <td></td>
-          <td class="paramtype">size_t&#160;</td>
-          <td class="paramname"><em>newcount</em>, </td>
+          <td class="paramtype">size_t</td>          <td class="paramname"><span class="paramname"><em>newcount</em></span>, </td>
         </tr>
         <tr>
           <td class="paramkey"></td>
           <td></td>
-          <td class="paramtype">size_t&#160;</td>
-          <td class="paramname"><em>size</em>, </td>
+          <td class="paramtype">size_t</td>          <td class="paramname"><span class="paramname"><em>size</em></span>, </td>
         </tr>
         <tr>
           <td class="paramkey"></td>
           <td></td>
-          <td class="paramtype">size_t&#160;</td>
-          <td class="paramname"><em>alignment</em>&#160;</td>
-        </tr>
-        <tr>
-          <td></td>
-          <td>)</td>
-          <td></td><td></td>
+          <td class="paramtype">size_t</td>          <td class="paramname"><span class="paramname"><em>alignment</em></span>&#160;)</td>
         </tr>
       </table>
 </div><div class="memdoc">
 
 </div>
 </div>
-<a id="ga496452c96f1de8c500be9fddf52edaf7"></a>
-<h2 class="memtitle"><span class="permalink"><a href="#ga496452c96f1de8c500be9fddf52edaf7">&#9670;&nbsp;</a></span>mi_heap_recalloc_aligned_at()</h2>
+<a id="ga07b5bcbaf00d0d2e598c232982588496" name="ga07b5bcbaf00d0d2e598c232982588496"></a>
+<h2 class="memtitle"><span class="permalink"><a href="#ga07b5bcbaf00d0d2e598c232982588496">&#9670;&#160;</a></span>mi_heap_recalloc_aligned_at()</h2>
 
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname">void* mi_heap_recalloc_aligned_at </td>
+          <td class="memname">void * mi_heap_recalloc_aligned_at </td>
           <td>(</td>
-          <td class="paramtype"><a class="el" href="group__heap.html#ga34a47cde5a5b38c29f1aa3c5e76943c2">mi_heap_t</a> *&#160;</td>
-          <td class="paramname"><em>heap</em>, </td>
+          <td class="paramtype"><a class="el" href="group__heap.html#ga34a47cde5a5b38c29f1aa3c5e76943c2">mi_heap_t</a> *</td>          <td class="paramname"><span class="paramname"><em>heap</em></span>, </td>
         </tr>
         <tr>
           <td class="paramkey"></td>
           <td></td>
-          <td class="paramtype">void *&#160;</td>
-          <td class="paramname"><em>p</em>, </td>
+          <td class="paramtype">void *</td>          <td class="paramname"><span class="paramname"><em>p</em></span>, </td>
         </tr>
         <tr>
           <td class="paramkey"></td>
           <td></td>
-          <td class="paramtype">size_t&#160;</td>
-          <td class="paramname"><em>newcount</em>, </td>
+          <td class="paramtype">size_t</td>          <td class="paramname"><span class="paramname"><em>newcount</em></span>, </td>
         </tr>
         <tr>
           <td class="paramkey"></td>
           <td></td>
-          <td class="paramtype">size_t&#160;</td>
-          <td class="paramname"><em>size</em>, </td>
+          <td class="paramtype">size_t</td>          <td class="paramname"><span class="paramname"><em>size</em></span>, </td>
         </tr>
         <tr>
           <td class="paramkey"></td>
           <td></td>
-          <td class="paramtype">size_t&#160;</td>
-          <td class="paramname"><em>alignment</em>, </td>
+          <td class="paramtype">size_t</td>          <td class="paramname"><span class="paramname"><em>alignment</em></span>, </td>
         </tr>
         <tr>
           <td class="paramkey"></td>
           <td></td>
-          <td class="paramtype">size_t&#160;</td>
-          <td class="paramname"><em>offset</em>&#160;</td>
-        </tr>
-        <tr>
-          <td></td>
-          <td>)</td>
-          <td></td><td></td>
+          <td class="paramtype">size_t</td>          <td class="paramname"><span class="paramname"><em>offset</em></span>&#160;)</td>
         </tr>
       </table>
 </div><div class="memdoc">
 
 </div>
 </div>
-<a id="gacfad83f14eb5d6a42a497a898e19fc76"></a>
-<h2 class="memtitle"><span class="permalink"><a href="#gacfad83f14eb5d6a42a497a898e19fc76">&#9670;&nbsp;</a></span>mi_heap_rezalloc()</h2>
+<a id="ga8d8b7ebb24b513cd84d1a696048da60d" name="ga8d8b7ebb24b513cd84d1a696048da60d"></a>
+<h2 class="memtitle"><span class="permalink"><a href="#ga8d8b7ebb24b513cd84d1a696048da60d">&#9670;&#160;</a></span>mi_heap_rezalloc()</h2>
 
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname">void* mi_heap_rezalloc </td>
+          <td class="memname">void * mi_heap_rezalloc </td>
           <td>(</td>
-          <td class="paramtype"><a class="el" href="group__heap.html#ga34a47cde5a5b38c29f1aa3c5e76943c2">mi_heap_t</a> *&#160;</td>
-          <td class="paramname"><em>heap</em>, </td>
+          <td class="paramtype"><a class="el" href="group__heap.html#ga34a47cde5a5b38c29f1aa3c5e76943c2">mi_heap_t</a> *</td>          <td class="paramname"><span class="paramname"><em>heap</em></span>, </td>
         </tr>
         <tr>
           <td class="paramkey"></td>
           <td></td>
-          <td class="paramtype">void *&#160;</td>
-          <td class="paramname"><em>p</em>, </td>
+          <td class="paramtype">void *</td>          <td class="paramname"><span class="paramname"><em>p</em></span>, </td>
         </tr>
         <tr>
           <td class="paramkey"></td>
           <td></td>
-          <td class="paramtype">size_t&#160;</td>
-          <td class="paramname"><em>newsize</em>&#160;</td>
-        </tr>
-        <tr>
-          <td></td>
-          <td>)</td>
-          <td></td><td></td>
+          <td class="paramtype">size_t</td>          <td class="paramname"><span class="paramname"><em>newsize</em></span>&#160;)</td>
         </tr>
       </table>
 </div><div class="memdoc">
 
 </div>
 </div>
-<a id="ga375fa8a611c51905e592d5d467c49664"></a>
-<h2 class="memtitle"><span class="permalink"><a href="#ga375fa8a611c51905e592d5d467c49664">&#9670;&nbsp;</a></span>mi_heap_rezalloc_aligned()</h2>
+<a id="ga5129f6dc46ee1613d918820a8a0533a7" name="ga5129f6dc46ee1613d918820a8a0533a7"></a>
+<h2 class="memtitle"><span class="permalink"><a href="#ga5129f6dc46ee1613d918820a8a0533a7">&#9670;&#160;</a></span>mi_heap_rezalloc_aligned()</h2>
 
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname">void* mi_heap_rezalloc_aligned </td>
+          <td class="memname">void * mi_heap_rezalloc_aligned </td>
           <td>(</td>
-          <td class="paramtype"><a class="el" href="group__heap.html#ga34a47cde5a5b38c29f1aa3c5e76943c2">mi_heap_t</a> *&#160;</td>
-          <td class="paramname"><em>heap</em>, </td>
+          <td class="paramtype"><a class="el" href="group__heap.html#ga34a47cde5a5b38c29f1aa3c5e76943c2">mi_heap_t</a> *</td>          <td class="paramname"><span class="paramname"><em>heap</em></span>, </td>
         </tr>
         <tr>
           <td class="paramkey"></td>
           <td></td>
-          <td class="paramtype">void *&#160;</td>
-          <td class="paramname"><em>p</em>, </td>
+          <td class="paramtype">void *</td>          <td class="paramname"><span class="paramname"><em>p</em></span>, </td>
         </tr>
         <tr>
           <td class="paramkey"></td>
           <td></td>
-          <td class="paramtype">size_t&#160;</td>
-          <td class="paramname"><em>newsize</em>, </td>
+          <td class="paramtype">size_t</td>          <td class="paramname"><span class="paramname"><em>newsize</em></span>, </td>
         </tr>
         <tr>
           <td class="paramkey"></td>
           <td></td>
-          <td class="paramtype">size_t&#160;</td>
-          <td class="paramname"><em>alignment</em>&#160;</td>
-        </tr>
-        <tr>
-          <td></td>
-          <td>)</td>
-          <td></td><td></td>
+          <td class="paramtype">size_t</td>          <td class="paramname"><span class="paramname"><em>alignment</em></span>&#160;)</td>
         </tr>
       </table>
 </div><div class="memdoc">
 
 </div>
 </div>
-<a id="gac90da54fa7e5d10bdc97ce0b51dce2eb"></a>
-<h2 class="memtitle"><span class="permalink"><a href="#gac90da54fa7e5d10bdc97ce0b51dce2eb">&#9670;&nbsp;</a></span>mi_heap_rezalloc_aligned_at()</h2>
+<a id="ga2bafa79c3f98ea74882349d44cffa5d9" name="ga2bafa79c3f98ea74882349d44cffa5d9"></a>
+<h2 class="memtitle"><span class="permalink"><a href="#ga2bafa79c3f98ea74882349d44cffa5d9">&#9670;&#160;</a></span>mi_heap_rezalloc_aligned_at()</h2>
 
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname">void* mi_heap_rezalloc_aligned_at </td>
+          <td class="memname">void * mi_heap_rezalloc_aligned_at </td>
           <td>(</td>
-          <td class="paramtype"><a class="el" href="group__heap.html#ga34a47cde5a5b38c29f1aa3c5e76943c2">mi_heap_t</a> *&#160;</td>
-          <td class="paramname"><em>heap</em>, </td>
+          <td class="paramtype"><a class="el" href="group__heap.html#ga34a47cde5a5b38c29f1aa3c5e76943c2">mi_heap_t</a> *</td>          <td class="paramname"><span class="paramname"><em>heap</em></span>, </td>
         </tr>
         <tr>
           <td class="paramkey"></td>
           <td></td>
-          <td class="paramtype">void *&#160;</td>
-          <td class="paramname"><em>p</em>, </td>
+          <td class="paramtype">void *</td>          <td class="paramname"><span class="paramname"><em>p</em></span>, </td>
         </tr>
         <tr>
           <td class="paramkey"></td>
           <td></td>
-          <td class="paramtype">size_t&#160;</td>
-          <td class="paramname"><em>newsize</em>, </td>
+          <td class="paramtype">size_t</td>          <td class="paramname"><span class="paramname"><em>newsize</em></span>, </td>
         </tr>
         <tr>
           <td class="paramkey"></td>
           <td></td>
-          <td class="paramtype">size_t&#160;</td>
-          <td class="paramname"><em>alignment</em>, </td>
+          <td class="paramtype">size_t</td>          <td class="paramname"><span class="paramname"><em>alignment</em></span>, </td>
         </tr>
         <tr>
           <td class="paramkey"></td>
           <td></td>
-          <td class="paramtype">size_t&#160;</td>
-          <td class="paramname"><em>offset</em>&#160;</td>
-        </tr>
-        <tr>
-          <td></td>
-          <td>)</td>
-          <td></td><td></td>
+          <td class="paramtype">size_t</td>          <td class="paramname"><span class="paramname"><em>offset</em></span>&#160;)</td>
         </tr>
       </table>
 </div><div class="memdoc">
 
 </div>
 </div>
-<a id="ga3e7e5c291acf1c7fd7ffd9914a9f945f"></a>
-<h2 class="memtitle"><span class="permalink"><a href="#ga3e7e5c291acf1c7fd7ffd9914a9f945f">&#9670;&nbsp;</a></span>mi_recalloc_aligned()</h2>
+<a id="ga3e2169b48683aa0ab64f813fd68d839e" name="ga3e2169b48683aa0ab64f813fd68d839e"></a>
+<h2 class="memtitle"><span class="permalink"><a href="#ga3e2169b48683aa0ab64f813fd68d839e">&#9670;&#160;</a></span>mi_recalloc_aligned()</h2>
 
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname">void* mi_recalloc_aligned </td>
+          <td class="memname">void * mi_recalloc_aligned </td>
           <td>(</td>
-          <td class="paramtype">void *&#160;</td>
-          <td class="paramname"><em>p</em>, </td>
+          <td class="paramtype">void *</td>          <td class="paramname"><span class="paramname"><em>p</em></span>, </td>
         </tr>
         <tr>
           <td class="paramkey"></td>
           <td></td>
-          <td class="paramtype">size_t&#160;</td>
-          <td class="paramname"><em>newcount</em>, </td>
+          <td class="paramtype">size_t</td>          <td class="paramname"><span class="paramname"><em>newcount</em></span>, </td>
         </tr>
         <tr>
           <td class="paramkey"></td>
           <td></td>
-          <td class="paramtype">size_t&#160;</td>
-          <td class="paramname"><em>size</em>, </td>
+          <td class="paramtype">size_t</td>          <td class="paramname"><span class="paramname"><em>size</em></span>, </td>
         </tr>
         <tr>
           <td class="paramkey"></td>
           <td></td>
-          <td class="paramtype">size_t&#160;</td>
-          <td class="paramname"><em>alignment</em>&#160;</td>
-        </tr>
-        <tr>
-          <td></td>
-          <td>)</td>
-          <td></td><td></td>
+          <td class="paramtype">size_t</td>          <td class="paramname"><span class="paramname"><em>alignment</em></span>&#160;)</td>
         </tr>
       </table>
 </div><div class="memdoc">
 
 </div>
 </div>
-<a id="ga4ff5e92ad73585418a072c9d059e5cf9"></a>
-<h2 class="memtitle"><span class="permalink"><a href="#ga4ff5e92ad73585418a072c9d059e5cf9">&#9670;&nbsp;</a></span>mi_recalloc_aligned_at()</h2>
+<a id="gaae25e4ddedd4e0fb61b1a8bd5d452750" name="gaae25e4ddedd4e0fb61b1a8bd5d452750"></a>
+<h2 class="memtitle"><span class="permalink"><a href="#gaae25e4ddedd4e0fb61b1a8bd5d452750">&#9670;&#160;</a></span>mi_recalloc_aligned_at()</h2>
 
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname">void* mi_recalloc_aligned_at </td>
+          <td class="memname">void * mi_recalloc_aligned_at </td>
           <td>(</td>
-          <td class="paramtype">void *&#160;</td>
-          <td class="paramname"><em>p</em>, </td>
+          <td class="paramtype">void *</td>          <td class="paramname"><span class="paramname"><em>p</em></span>, </td>
         </tr>
         <tr>
           <td class="paramkey"></td>
           <td></td>
-          <td class="paramtype">size_t&#160;</td>
-          <td class="paramname"><em>newcount</em>, </td>
+          <td class="paramtype">size_t</td>          <td class="paramname"><span class="paramname"><em>newcount</em></span>, </td>
         </tr>
         <tr>
           <td class="paramkey"></td>
           <td></td>
-          <td class="paramtype">size_t&#160;</td>
-          <td class="paramname"><em>size</em>, </td>
+          <td class="paramtype">size_t</td>          <td class="paramname"><span class="paramname"><em>size</em></span>, </td>
         </tr>
         <tr>
           <td class="paramkey"></td>
           <td></td>
-          <td class="paramtype">size_t&#160;</td>
-          <td class="paramname"><em>alignment</em>, </td>
+          <td class="paramtype">size_t</td>          <td class="paramname"><span class="paramname"><em>alignment</em></span>, </td>
         </tr>
         <tr>
           <td class="paramkey"></td>
           <td></td>
-          <td class="paramtype">size_t&#160;</td>
-          <td class="paramname"><em>offset</em>&#160;</td>
-        </tr>
-        <tr>
-          <td></td>
-          <td>)</td>
-          <td></td><td></td>
+          <td class="paramtype">size_t</td>          <td class="paramname"><span class="paramname"><em>offset</em></span>&#160;)</td>
         </tr>
       </table>
 </div><div class="memdoc">
 
 </div>
 </div>
-<a id="ga8c292e142110229a2980b37ab036dbc6"></a>
-<h2 class="memtitle"><span class="permalink"><a href="#ga8c292e142110229a2980b37ab036dbc6">&#9670;&nbsp;</a></span>mi_rezalloc()</h2>
+<a id="gadfd34cd7b4f2bbda7ae06367a6360756" name="gadfd34cd7b4f2bbda7ae06367a6360756"></a>
+<h2 class="memtitle"><span class="permalink"><a href="#gadfd34cd7b4f2bbda7ae06367a6360756">&#9670;&#160;</a></span>mi_rezalloc()</h2>
 
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname">void* mi_rezalloc </td>
+          <td class="memname">void * mi_rezalloc </td>
           <td>(</td>
-          <td class="paramtype">void *&#160;</td>
-          <td class="paramname"><em>p</em>, </td>
+          <td class="paramtype">void *</td>          <td class="paramname"><span class="paramname"><em>p</em></span>, </td>
         </tr>
         <tr>
           <td class="paramkey"></td>
           <td></td>
-          <td class="paramtype">size_t&#160;</td>
-          <td class="paramname"><em>newsize</em>&#160;</td>
-        </tr>
-        <tr>
-          <td></td>
-          <td>)</td>
-          <td></td><td></td>
+          <td class="paramtype">size_t</td>          <td class="paramname"><span class="paramname"><em>newsize</em></span>&#160;)</td>
         </tr>
       </table>
 </div><div class="memdoc">
 
 </div>
 </div>
-<a id="gacd71a7bce96aab38ae6de17af2eb2cf0"></a>
-<h2 class="memtitle"><span class="permalink"><a href="#gacd71a7bce96aab38ae6de17af2eb2cf0">&#9670;&nbsp;</a></span>mi_rezalloc_aligned()</h2>
+<a id="ga4d02404fe1e7db00beb65f185e012caa" name="ga4d02404fe1e7db00beb65f185e012caa"></a>
+<h2 class="memtitle"><span class="permalink"><a href="#ga4d02404fe1e7db00beb65f185e012caa">&#9670;&#160;</a></span>mi_rezalloc_aligned()</h2>
 
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname">void* mi_rezalloc_aligned </td>
+          <td class="memname">void * mi_rezalloc_aligned </td>
           <td>(</td>
-          <td class="paramtype">void *&#160;</td>
-          <td class="paramname"><em>p</em>, </td>
+          <td class="paramtype">void *</td>          <td class="paramname"><span class="paramname"><em>p</em></span>, </td>
         </tr>
         <tr>
           <td class="paramkey"></td>
           <td></td>
-          <td class="paramtype">size_t&#160;</td>
-          <td class="paramname"><em>newsize</em>, </td>
+          <td class="paramtype">size_t</td>          <td class="paramname"><span class="paramname"><em>newsize</em></span>, </td>
         </tr>
         <tr>
           <td class="paramkey"></td>
           <td></td>
-          <td class="paramtype">size_t&#160;</td>
-          <td class="paramname"><em>alignment</em>&#160;</td>
-        </tr>
-        <tr>
-          <td></td>
-          <td>)</td>
-          <td></td><td></td>
+          <td class="paramtype">size_t</td>          <td class="paramname"><span class="paramname"><em>alignment</em></span>&#160;)</td>
         </tr>
       </table>
 </div><div class="memdoc">
 
 </div>
 </div>
-<a id="gae8b358c417e61d5307da002702b0a8e1"></a>
-<h2 class="memtitle"><span class="permalink"><a href="#gae8b358c417e61d5307da002702b0a8e1">&#9670;&nbsp;</a></span>mi_rezalloc_aligned_at()</h2>
+<a id="ga6843a88285bbfcc3bdfccc60aafd1270" name="ga6843a88285bbfcc3bdfccc60aafd1270"></a>
+<h2 class="memtitle"><span class="permalink"><a href="#ga6843a88285bbfcc3bdfccc60aafd1270">&#9670;&#160;</a></span>mi_rezalloc_aligned_at()</h2>
 
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname">void* mi_rezalloc_aligned_at </td>
+          <td class="memname">void * mi_rezalloc_aligned_at </td>
           <td>(</td>
-          <td class="paramtype">void *&#160;</td>
-          <td class="paramname"><em>p</em>, </td>
+          <td class="paramtype">void *</td>          <td class="paramname"><span class="paramname"><em>p</em></span>, </td>
         </tr>
         <tr>
           <td class="paramkey"></td>
           <td></td>
-          <td class="paramtype">size_t&#160;</td>
-          <td class="paramname"><em>newsize</em>, </td>
+          <td class="paramtype">size_t</td>          <td class="paramname"><span class="paramname"><em>newsize</em></span>, </td>
         </tr>
         <tr>
           <td class="paramkey"></td>
           <td></td>
-          <td class="paramtype">size_t&#160;</td>
-          <td class="paramname"><em>alignment</em>, </td>
+          <td class="paramtype">size_t</td>          <td class="paramname"><span class="paramname"><em>alignment</em></span>, </td>
         </tr>
         <tr>
           <td class="paramkey"></td>
           <td></td>
-          <td class="paramtype">size_t&#160;</td>
-          <td class="paramname"><em>offset</em>&#160;</td>
-        </tr>
-        <tr>
-          <td></td>
-          <td>)</td>
-          <td></td><td></td>
+          <td class="paramtype">size_t</td>          <td class="paramname"><span class="paramname"><em>offset</em></span>&#160;)</td>
         </tr>
       </table>
 </div><div class="memdoc">
@@ -584,7 +493,7 @@ <h2 class="memtitle"><span class="permalink"><a href="#gae8b358c417e61d5307da002
 <!-- start footer part -->
 <div id="nav-path" class="navpath"><!-- id is needed for treeview function! -->
   <ul>
-    <li class="footer">Generated by <a href="https://www.doxygen.org/index.html"><img class="footer" src="doxygen.svg" width="104" height="31" alt="doxygen"/></a> 1.9.1 </li>
+    <li class="footer">Generated by <a href="https://www.doxygen.org/index.html"><img class="footer" src="doxygen.svg" width="104" height="31" alt="doxygen"/></a> 1.13.1 </li>
   </ul>
 </div>
 </body>
diff --git a/depends/mimalloc/docs/group__zeroinit.js b/depends/mimalloc/docs/group__zeroinit.js
index b9297d2123f8..505df60222d2 100644
--- a/depends/mimalloc/docs/group__zeroinit.js
+++ b/depends/mimalloc/docs/group__zeroinit.js
@@ -1,14 +1,14 @@
 var group__zeroinit =
 [
-    [ "mi_heap_recalloc", "group__zeroinit.html#ga8648c5fbb22a80f0262859099f06dfbd", null ],
-    [ "mi_heap_recalloc_aligned", "group__zeroinit.html#ga9f3f999396c8f77ca5e80e7b40ac29e3", null ],
-    [ "mi_heap_recalloc_aligned_at", "group__zeroinit.html#ga496452c96f1de8c500be9fddf52edaf7", null ],
-    [ "mi_heap_rezalloc", "group__zeroinit.html#gacfad83f14eb5d6a42a497a898e19fc76", null ],
-    [ "mi_heap_rezalloc_aligned", "group__zeroinit.html#ga375fa8a611c51905e592d5d467c49664", null ],
-    [ "mi_heap_rezalloc_aligned_at", "group__zeroinit.html#gac90da54fa7e5d10bdc97ce0b51dce2eb", null ],
-    [ "mi_recalloc_aligned", "group__zeroinit.html#ga3e7e5c291acf1c7fd7ffd9914a9f945f", null ],
-    [ "mi_recalloc_aligned_at", "group__zeroinit.html#ga4ff5e92ad73585418a072c9d059e5cf9", null ],
-    [ "mi_rezalloc", "group__zeroinit.html#ga8c292e142110229a2980b37ab036dbc6", null ],
-    [ "mi_rezalloc_aligned", "group__zeroinit.html#gacd71a7bce96aab38ae6de17af2eb2cf0", null ],
-    [ "mi_rezalloc_aligned_at", "group__zeroinit.html#gae8b358c417e61d5307da002702b0a8e1", null ]
+    [ "mi_heap_recalloc", "group__zeroinit.html#gad1a0d325d930eeb80f25e3fea37aacde", null ],
+    [ "mi_heap_recalloc_aligned", "group__zeroinit.html#ga87ddd674bf1c67237d780d0b9e0f0f32", null ],
+    [ "mi_heap_recalloc_aligned_at", "group__zeroinit.html#ga07b5bcbaf00d0d2e598c232982588496", null ],
+    [ "mi_heap_rezalloc", "group__zeroinit.html#ga8d8b7ebb24b513cd84d1a696048da60d", null ],
+    [ "mi_heap_rezalloc_aligned", "group__zeroinit.html#ga5129f6dc46ee1613d918820a8a0533a7", null ],
+    [ "mi_heap_rezalloc_aligned_at", "group__zeroinit.html#ga2bafa79c3f98ea74882349d44cffa5d9", null ],
+    [ "mi_recalloc_aligned", "group__zeroinit.html#ga3e2169b48683aa0ab64f813fd68d839e", null ],
+    [ "mi_recalloc_aligned_at", "group__zeroinit.html#gaae25e4ddedd4e0fb61b1a8bd5d452750", null ],
+    [ "mi_rezalloc", "group__zeroinit.html#gadfd34cd7b4f2bbda7ae06367a6360756", null ],
+    [ "mi_rezalloc_aligned", "group__zeroinit.html#ga4d02404fe1e7db00beb65f185e012caa", null ],
+    [ "mi_rezalloc_aligned_at", "group__zeroinit.html#ga6843a88285bbfcc3bdfccc60aafd1270", null ]
 ];
\ No newline at end of file
diff --git a/depends/mimalloc/docs/index.html b/depends/mimalloc/docs/index.html
index 2ea91215ea9e..b3c8a630ad72 100644
--- a/depends/mimalloc/docs/index.html
+++ b/depends/mimalloc/docs/index.html
@@ -1,24 +1,26 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "https://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
+<html xmlns="http://www.w3.org/1999/xhtml" lang="en-US">
 <head>
 <meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
-<meta http-equiv="X-UA-Compatible" content="IE=9"/>
-<meta name="generator" content="Doxygen 1.9.1"/>
+<meta http-equiv="X-UA-Compatible" content="IE=11"/>
+<meta name="generator" content="Doxygen 1.13.1"/>
 <meta name="viewport" content="width=device-width, initial-scale=1"/>
-<title>mi-malloc: Main Page</title>
+<title>mi-malloc: mi-malloc</title>
 <link href="tabs.css" rel="stylesheet" type="text/css"/>
 <script type="text/javascript" src="jquery.js"></script>
 <script type="text/javascript" src="dynsections.js"></script>
+<script type="text/javascript" src="clipboard.js"></script>
 <link href="navtree.css" rel="stylesheet" type="text/css"/>
-<script type="text/javascript" src="resize.js"></script>
 <script type="text/javascript" src="navtreedata.js"></script>
 <script type="text/javascript" src="navtree.js"></script>
+<script type="text/javascript" src="resize.js"></script>
+<script type="text/javascript" src="cookie.js"></script>
 <link href="search/search.css" rel="stylesheet" type="text/css"/>
 <script type="text/javascript" src="search/searchdata.js"></script>
 <script type="text/javascript" src="search/search.js"></script>
 <script type="text/javascript">
-/* @license magnet:?xt=urn:btih:cf05388f2679ee054f2beb29a391d25f4e673ac3&amp;dn=gpl-2.0.txt GPL-v2 */
-  $(document).ready(function() { init_search(); });
+/* @license magnet:?xt=urn:btih:d3d9a9a6595521f9666a5e94cc830dab83b65699&amp;dn=expat.txt MIT */
+  $(function() { init_search(); });
 /* @license-end */
 </script>
 <link href="doxygen.css" rel="stylesheet" type="text/css" />
@@ -29,20 +31,16 @@
 <div id="titlearea">
 <table cellspacing="0" cellpadding="0">
  <tbody>
- <tr style="height: 56px;">
+ <tr id="projectrow">
   <td id="projectlogo"><img alt="Logo" src="mimalloc-logo.svg"/></td>
-  <td id="projectalign" style="padding-left: 0.5em;">
-   <div id="projectname">mi-malloc
-   &#160;<span id="projectnumber">1.7/2.0</span>
+  <td id="projectalign">
+   <div id="projectname">mi-malloc<span id="projectnumber">&#160;1.8/2.1</span>
    </div>
   </td>
-   <td>        <div id="MSearchBox" class="MSearchBoxInactive">
+    <td>        <div id="MSearchBox" class="MSearchBoxInactive">
         <span class="left">
-          <img id="MSearchSelect" src="search/mag_sel.svg"
-               onmouseover="return searchBox.OnSearchSelectShow()"
-               onmouseout="return searchBox.OnSearchSelectHide()"
-               alt=""/>
-          <input type="text" id="MSearchField" value="Search" accesskey="S"
+          <span id="MSearchSelect"                onmouseover="return searchBox.OnSearchSelectShow()"                onmouseout="return searchBox.OnSearchSelectHide()">&#160;</span>
+          <input type="text" id="MSearchField" value="" placeholder="Search" accesskey="S"
                onfocus="searchBox.OnSearchFieldFocus(true)" 
                onblur="searchBox.OnSearchFieldFocus(false)" 
                onkeyup="searchBox.OnSearchFieldChange(event)"/>
@@ -56,10 +54,15 @@
 </table>
 </div>
 <!-- end header part -->
-<!-- Generated by Doxygen 1.9.1 -->
+<!-- Generated by Doxygen 1.13.1 -->
+<script type="text/javascript">
+/* @license magnet:?xt=urn:btih:d3d9a9a6595521f9666a5e94cc830dab83b65699&amp;dn=expat.txt MIT */
+var searchBox = new SearchBox("searchBox", "search/",'.html');
+/* @license-end */
+</script>
 <script type="text/javascript">
-/* @license magnet:?xt=urn:btih:cf05388f2679ee054f2beb29a391d25f4e673ac3&amp;dn=gpl-2.0.txt GPL-v2 */
-var searchBox = new SearchBox("searchBox", "search",false,'Search','.html');
+/* @license magnet:?xt=urn:btih:d3d9a9a6595521f9666a5e94cc830dab83b65699&amp;dn=expat.txt MIT */
+$(function() { codefold.init(0); });
 /* @license-end */
 </script>
 </div><!-- top -->
@@ -74,8 +77,8 @@
   </div>
 </div>
 <script type="text/javascript">
-/* @license magnet:?xt=urn:btih:cf05388f2679ee054f2beb29a391d25f4e673ac3&amp;dn=gpl-2.0.txt GPL-v2 */
-$(document).ready(function(){initNavTree('index.html',''); initResizable(); });
+/* @license magnet:?xt=urn:btih:d3d9a9a6595521f9666a5e94cc830dab83b65699&amp;dn=expat.txt MIT */
+$(function(){initNavTree('index.html',''); initResizable(true); });
 /* @license-end */
 </script>
 <div id="doc-content">
@@ -88,28 +91,33 @@
 
 <!-- iframe showing the search results (closed by default) -->
 <div id="MSearchResultsWindow">
-<iframe src="javascript:void(0)" frameborder="0" 
-        name="MSearchResults" id="MSearchResults">
-</iframe>
+<div id="MSearchResults">
+<div class="SRPage">
+<div id="SRIndex">
+<div id="SRResults"></div>
+<div class="SRStatus" id="Loading">Loading...</div>
+<div class="SRStatus" id="Searching">Searching...</div>
+<div class="SRStatus" id="NoMatches">No Matches</div>
+</div>
+</div>
+</div>
 </div>
 
-<div class="PageDoc"><div class="header">
-  <div class="headertitle">
-<div class="title">mi-malloc Documentation</div>  </div>
+<div><div class="header">
+  <div class="headertitle"><div class="title">mi-malloc </div></div>
 </div><!--header-->
 <div class="contents">
 <div class="textblock"><p>This is the API documentation of the <a href="https://github.com/microsoft/mimalloc">mimalloc</a> allocator (pronounced "me-malloc") &ndash; a general purpose allocator with excellent <a href="bench.html">performance</a> characteristics. Initially developed by Daan Leijen for the run-time systems of the <a href="https://github.com/koka-lang/koka">Koka</a> and <a href="https://github.com/leanprover/lean">Lean</a> languages.</p>
 <p>It is a drop-in replacement for <code>malloc</code> and can be used in other programs without code changes, for example, on Unix you can use it as: </p><div class="fragment"><div class="line">&gt; LD_PRELOAD=/usr/bin/libmimalloc.so  myprogram</div>
-</div><!-- fragment --><p>Notable aspects of the design include:</p>
-<ul>
-<li><b>small and consistent</b>: the library is about 8k LOC using simple and consistent data structures. This makes it very suitable to integrate and adapt in other projects. For runtime systems it provides hooks for a monotonic <em>heartbeat</em> and deferred freeing (for bounded worst-case times with reference counting).</li>
+</div><!-- fragment --><p>Notable aspects of the design include:</p><ul>
+<li><b>small and consistent</b>: the library is about 8k LOC using simple and consistent data structures. This makes it very suitable to integrate and adapt in other projects. For runtime systems it provides hooks for a monotonic <em>heartbeat</em> and deferred freeing (for bounded worst-case times with reference counting). Partly due to its simplicity, mimalloc has been ported to many systems (Windows, macOS, Linux, WASM, various BSD's, Haiku, MUSL, etc) and has excellent support for dynamic overriding. At the same time, it is an industrial strength allocator that runs (very) large scale distributed services on thousands of machines with excellent worst case latencies.</li>
 <li><b>free list sharding</b>: instead of one big free list (per size class) we have many smaller lists per "mimalloc page" which reduces fragmentation and increases locality &ndash; things that are allocated close in time get allocated close in memory. (A mimalloc page contains blocks of one size class and is usually 64KiB on a 64-bit system).</li>
 <li><b>free list multi-sharding</b>: the big idea! Not only do we shard the free list per mimalloc page, but for each page we have multiple free lists. In particular, there is one list for thread-local <code>free</code> operations, and another one for concurrent <code>free</code> operations. Free-ing from another thread can now be a single CAS without needing sophisticated coordination between threads. Since there will be thousands of separate free lists, contention is naturally distributed over the heap, and the chance of contending on a single location will be low &ndash; this is quite similar to randomized algorithms like skip lists where adding a random oracle removes the need for a more complex algorithm.</li>
-<li><b>eager page reset</b>: when a "page" becomes empty (with increased chance due to free list sharding) the memory is marked to the OS as unused ("reset" or "purged") reducing (real) memory pressure and fragmentation, especially in long running programs.</li>
-<li><b>secure</b>: <em>mimalloc</em> can be build in secure mode, adding guard pages, randomized allocation, encrypted free lists, etc. to protect against various heap vulnerabilities. The performance penalty is only around 5% on average over our benchmarks.</li>
+<li><b>eager page purging</b>: when a "page" becomes empty (with increased chance due to free list sharding) the memory is marked to the OS as unused (reset or decommitted) reducing (real) memory pressure and fragmentation, especially in long running programs.</li>
+<li><b>secure</b>: <em>mimalloc</em> can be built in secure mode, adding guard pages, randomized allocation, encrypted free lists, etc. to protect against various heap vulnerabilities. The performance penalty is usually around 10% on average over our benchmarks.</li>
 <li><b>first-class heaps</b>: efficiently create and use multiple heaps to allocate across different regions. A heap can be destroyed at once instead of deallocating each object separately.</li>
-<li><b>bounded</b>: it does not suffer from <em>blowup</em> [1], has bounded worst-case allocation times (<em>wcat</em>), bounded space overhead (~0.2% meta-data, with at most 12.5% waste in allocation sizes), and has no internal points of contention using only atomic operations.</li>
-<li><b>fast</b>: In our benchmarks (see <a href="#performance">below</a>), <em>mimalloc</em> outperforms all other leading allocators (<em>jemalloc</em>, <em>tcmalloc</em>, <em>Hoard</em>, etc), and usually uses less memory (up to 25% more in the worst case). A nice property is that it does consistently well over a wide range of benchmarks.</li>
+<li><b>bounded</b>: it does not suffer from <em>blowup</em> [1], has bounded worst-case allocation times (<em>wcat</em>) (upto OS primitives), bounded space overhead (~0.2% meta-data, with low internal fragmentation), and has no internal points of contention using only atomic operations.</li>
+<li><b>fast</b>: In our benchmarks (see <a class="el" href="bench.html">below</a>), <em>mimalloc</em> outperforms other leading allocators (<em>jemalloc</em>, <em>tcmalloc</em>, <em>Hoard</em>, etc), and often uses less memory. A nice property is that it does consistently well over a wide range of benchmarks. There is also good huge OS page support for larger server programs.</li>
 </ul>
 <p>You can read more on the design of <em>mimalloc</em> in the <a href="https://www.microsoft.com/en-us/research/publication/mimalloc-free-list-sharding-in-action">technical report</a> which also has detailed benchmark results.</p>
 <p>Further information:</p>
@@ -130,12 +138,13 @@
 <li><a class="el" href="group__cpp.html">C++ wrappers</a> </li>
 </ul>
 </div></div><!-- PageDoc -->
+<a href="doxygen_crawl.html"></a>
 </div><!-- contents -->
 </div><!-- doc-content -->
 <!-- start footer part -->
 <div id="nav-path" class="navpath"><!-- id is needed for treeview function! -->
   <ul>
-    <li class="footer">Generated by <a href="https://www.doxygen.org/index.html"><img class="footer" src="doxygen.svg" width="104" height="31" alt="doxygen"/></a> 1.9.1 </li>
+    <li class="footer">Generated by <a href="https://www.doxygen.org/index.html"><img class="footer" src="doxygen.svg" width="104" height="31" alt="doxygen"/></a> 1.13.1 </li>
   </ul>
 </div>
 </body>
diff --git a/depends/mimalloc/docs/jquery.js b/depends/mimalloc/docs/jquery.js
index 103c32d79b74..875ada738f09 100644
--- a/depends/mimalloc/docs/jquery.js
+++ b/depends/mimalloc/docs/jquery.js
@@ -1,18 +1,143 @@
-/*! jQuery v3.4.1 | (c) JS Foundation and other contributors | jquery.org/license */
-!function(e,t){"use strict";"object"==typeof module&&"object"==typeof module.exports?module.exports=e.document?t(e,!0):function(e){if(!e.document)throw new Error("jQuery requires a window with a document");return t(e)}:t(e)}("undefined"!=typeof window?window:this,function(C,e){"use strict";var t=[],E=C.document,r=Object.getPrototypeOf,s=t.slice,g=t.concat,u=t.push,i=t.indexOf,n={},o=n.toString,v=n.hasOwnProperty,a=v.toString,l=a.call(Object),y={},m=function(e){return"function"==typeof e&&"number"!=typeof e.nodeType},x=function(e){return null!=e&&e===e.window},c={type:!0,src:!0,nonce:!0,noModule:!0};function b(e,t,n){var r,i,o=(n=n||E).createElement("script");if(o.text=e,t)for(r in c)(i=t[r]||t.getAttribute&&t.getAttribute(r))&&o.setAttribute(r,i);n.head.appendChild(o).parentNode.removeChild(o)}function w(e){return null==e?e+"":"object"==typeof e||"function"==typeof e?n[o.call(e)]||"object":typeof e}var f="3.4.1",k=function(e,t){return new k.fn.init(e,t)},p=/^[\s\uFEFF\xA0]+|[\s\uFEFF\xA0]+$/g;function d(e){var t=!!e&&"length"in e&&e.length,n=w(e);return!m(e)&&!x(e)&&("array"===n||0===t||"number"==typeof t&&0<t&&t-1 in e)}k.fn=k.prototype={jquery:f,constructor:k,length:0,toArray:function(){return s.call(this)},get:function(e){return null==e?s.call(this):e<0?this[e+this.length]:this[e]},pushStack:function(e){var t=k.merge(this.constructor(),e);return t.prevObject=this,t},each:function(e){return k.each(this,e)},map:function(n){return this.pushStack(k.map(this,function(e,t){return n.call(e,t,e)}))},slice:function(){return this.pushStack(s.apply(this,arguments))},first:function(){return this.eq(0)},last:function(){return this.eq(-1)},eq:function(e){var t=this.length,n=+e+(e<0?t:0);return this.pushStack(0<=n&&n<t?[this[n]]:[])},end:function(){return this.prevObject||this.constructor()},push:u,sort:t.sort,splice:t.splice},k.extend=k.fn.extend=function(){var e,t,n,r,i,o,a=arguments[0]||{},s=1,u=arguments.length,l=!1;for("boolean"==typeof a&&(l=a,a=arguments[s]||{},s++),"object"==typeof a||m(a)||(a={}),s===u&&(a=this,s--);s<u;s++)if(null!=(e=arguments[s]))for(t in e)r=e[t],"__proto__"!==t&&a!==r&&(l&&r&&(k.isPlainObject(r)||(i=Array.isArray(r)))?(n=a[t],o=i&&!Array.isArray(n)?[]:i||k.isPlainObject(n)?n:{},i=!1,a[t]=k.extend(l,o,r)):void 0!==r&&(a[t]=r));return a},k.extend({expando:"jQuery"+(f+Math.random()).replace(/\D/g,""),isReady:!0,error:function(e){throw new Error(e)},noop:function(){},isPlainObject:function(e){var t,n;return!(!e||"[object Object]"!==o.call(e))&&(!(t=r(e))||"function"==typeof(n=v.call(t,"constructor")&&t.constructor)&&a.call(n)===l)},isEmptyObject:function(e){var t;for(t in e)return!1;return!0},globalEval:function(e,t){b(e,{nonce:t&&t.nonce})},each:function(e,t){var n,r=0;if(d(e)){for(n=e.length;r<n;r++)if(!1===t.call(e[r],r,e[r]))break}else for(r in e)if(!1===t.call(e[r],r,e[r]))break;return e},trim:function(e){return null==e?"":(e+"").replace(p,"")},makeArray:function(e,t){var n=t||[];return null!=e&&(d(Object(e))?k.merge(n,"string"==typeof e?[e]:e):u.call(n,e)),n},inArray:function(e,t,n){return null==t?-1:i.call(t,e,n)},merge:function(e,t){for(var n=+t.length,r=0,i=e.length;r<n;r++)e[i++]=t[r];return e.length=i,e},grep:function(e,t,n){for(var r=[],i=0,o=e.length,a=!n;i<o;i++)!t(e[i],i)!==a&&r.push(e[i]);return r},map:function(e,t,n){var r,i,o=0,a=[];if(d(e))for(r=e.length;o<r;o++)null!=(i=t(e[o],o,n))&&a.push(i);else for(o in e)null!=(i=t(e[o],o,n))&&a.push(i);return g.apply([],a)},guid:1,support:y}),"function"==typeof Symbol&&(k.fn[Symbol.iterator]=t[Symbol.iterator]),k.each("Boolean Number String Function Array Date RegExp Object Error Symbol".split(" "),function(e,t){n["[object "+t+"]"]=t.toLowerCase()});var h=function(n){var e,d,b,o,i,h,f,g,w,u,l,T,C,a,E,v,s,c,y,k="sizzle"+1*new Date,m=n.document,S=0,r=0,p=ue(),x=ue(),N=ue(),A=ue(),D=function(e,t){return e===t&&(l=!0),0},j={}.hasOwnProperty,t=[],q=t.pop,L=t.push,H=t.push,O=t.slice,P=function(e,t){for(var n=0,r=e.length;n<r;n++)if(e[n]===t)return n;return-1},R="checked|selected|async|autofocus|autoplay|controls|defer|disabled|hidden|ismap|loop|multiple|open|readonly|required|scoped",M="[\\x20\\t\\r\\n\\f]",I="(?:\\\\.|[\\w-]|[^\0-\\xa0])+",W="\\["+M+"*("+I+")(?:"+M+"*([*^$|!~]?=)"+M+"*(?:'((?:\\\\.|[^\\\\'])*)'|\"((?:\\\\.|[^\\\\\"])*)\"|("+I+"))|)"+M+"*\\]",$=":("+I+")(?:\\((('((?:\\\\.|[^\\\\'])*)'|\"((?:\\\\.|[^\\\\\"])*)\")|((?:\\\\.|[^\\\\()[\\]]|"+W+")*)|.*)\\)|)",F=new RegExp(M+"+","g"),B=new RegExp("^"+M+"+|((?:^|[^\\\\])(?:\\\\.)*)"+M+"+$","g"),_=new RegExp("^"+M+"*,"+M+"*"),z=new RegExp("^"+M+"*([>+~]|"+M+")"+M+"*"),U=new RegExp(M+"|>"),X=new RegExp($),V=new RegExp("^"+I+"$"),G={ID:new RegExp("^#("+I+")"),CLASS:new RegExp("^\\.("+I+")"),TAG:new RegExp("^("+I+"|[*])"),ATTR:new RegExp("^"+W),PSEUDO:new RegExp("^"+$),CHILD:new RegExp("^:(only|first|last|nth|nth-last)-(child|of-type)(?:\\("+M+"*(even|odd|(([+-]|)(\\d*)n|)"+M+"*(?:([+-]|)"+M+"*(\\d+)|))"+M+"*\\)|)","i"),bool:new RegExp("^(?:"+R+")$","i"),needsContext:new RegExp("^"+M+"*[>+~]|:(even|odd|eq|gt|lt|nth|first|last)(?:\\("+M+"*((?:-\\d)?\\d*)"+M+"*\\)|)(?=[^-]|$)","i")},Y=/HTML$/i,Q=/^(?:input|select|textarea|button)$/i,J=/^h\d$/i,K=/^[^{]+\{\s*\[native \w/,Z=/^(?:#([\w-]+)|(\w+)|\.([\w-]+))$/,ee=/[+~]/,te=new RegExp("\\\\([\\da-f]{1,6}"+M+"?|("+M+")|.)","ig"),ne=function(e,t,n){var r="0x"+t-65536;return r!=r||n?t:r<0?String.fromCharCode(r+65536):String.fromCharCode(r>>10|55296,1023&r|56320)},re=/([\0-\x1f\x7f]|^-?\d)|^-$|[^\0-\x1f\x7f-\uFFFF\w-]/g,ie=function(e,t){return t?"\0"===e?"\ufffd":e.slice(0,-1)+"\\"+e.charCodeAt(e.length-1).toString(16)+" ":"\\"+e},oe=function(){T()},ae=be(function(e){return!0===e.disabled&&"fieldset"===e.nodeName.toLowerCase()},{dir:"parentNode",next:"legend"});try{H.apply(t=O.call(m.childNodes),m.childNodes),t[m.childNodes.length].nodeType}catch(e){H={apply:t.length?function(e,t){L.apply(e,O.call(t))}:function(e,t){var n=e.length,r=0;while(e[n++]=t[r++]);e.length=n-1}}}function se(t,e,n,r){var i,o,a,s,u,l,c,f=e&&e.ownerDocument,p=e?e.nodeType:9;if(n=n||[],"string"!=typeof t||!t||1!==p&&9!==p&&11!==p)return n;if(!r&&((e?e.ownerDocument||e:m)!==C&&T(e),e=e||C,E)){if(11!==p&&(u=Z.exec(t)))if(i=u[1]){if(9===p){if(!(a=e.getElementById(i)))return n;if(a.id===i)return n.push(a),n}else if(f&&(a=f.getElementById(i))&&y(e,a)&&a.id===i)return n.push(a),n}else{if(u[2])return H.apply(n,e.getElementsByTagName(t)),n;if((i=u[3])&&d.getElementsByClassName&&e.getElementsByClassName)return H.apply(n,e.getElementsByClassName(i)),n}if(d.qsa&&!A[t+" "]&&(!v||!v.test(t))&&(1!==p||"object"!==e.nodeName.toLowerCase())){if(c=t,f=e,1===p&&U.test(t)){(s=e.getAttribute("id"))?s=s.replace(re,ie):e.setAttribute("id",s=k),o=(l=h(t)).length;while(o--)l[o]="#"+s+" "+xe(l[o]);c=l.join(","),f=ee.test(t)&&ye(e.parentNode)||e}try{return H.apply(n,f.querySelectorAll(c)),n}catch(e){A(t,!0)}finally{s===k&&e.removeAttribute("id")}}}return g(t.replace(B,"$1"),e,n,r)}function ue(){var r=[];return function e(t,n){return r.push(t+" ")>b.cacheLength&&delete e[r.shift()],e[t+" "]=n}}function le(e){return e[k]=!0,e}function ce(e){var t=C.createElement("fieldset");try{return!!e(t)}catch(e){return!1}finally{t.parentNode&&t.parentNode.removeChild(t),t=null}}function fe(e,t){var n=e.split("|"),r=n.length;while(r--)b.attrHandle[n[r]]=t}function pe(e,t){var n=t&&e,r=n&&1===e.nodeType&&1===t.nodeType&&e.sourceIndex-t.sourceIndex;if(r)return r;if(n)while(n=n.nextSibling)if(n===t)return-1;return e?1:-1}function de(t){return function(e){return"input"===e.nodeName.toLowerCase()&&e.type===t}}function he(n){return function(e){var t=e.nodeName.toLowerCase();return("input"===t||"button"===t)&&e.type===n}}function ge(t){return function(e){return"form"in e?e.parentNode&&!1===e.disabled?"label"in e?"label"in e.parentNode?e.parentNode.disabled===t:e.disabled===t:e.isDisabled===t||e.isDisabled!==!t&&ae(e)===t:e.disabled===t:"label"in e&&e.disabled===t}}function ve(a){return le(function(o){return o=+o,le(function(e,t){var n,r=a([],e.length,o),i=r.length;while(i--)e[n=r[i]]&&(e[n]=!(t[n]=e[n]))})})}function ye(e){return e&&"undefined"!=typeof e.getElementsByTagName&&e}for(e in d=se.support={},i=se.isXML=function(e){var t=e.namespaceURI,n=(e.ownerDocument||e).documentElement;return!Y.test(t||n&&n.nodeName||"HTML")},T=se.setDocument=function(e){var t,n,r=e?e.ownerDocument||e:m;return r!==C&&9===r.nodeType&&r.documentElement&&(a=(C=r).documentElement,E=!i(C),m!==C&&(n=C.defaultView)&&n.top!==n&&(n.addEventListener?n.addEventListener("unload",oe,!1):n.attachEvent&&n.attachEvent("onunload",oe)),d.attributes=ce(function(e){return e.className="i",!e.getAttribute("className")}),d.getElementsByTagName=ce(function(e){return e.appendChild(C.createComment("")),!e.getElementsByTagName("*").length}),d.getElementsByClassName=K.test(C.getElementsByClassName),d.getById=ce(function(e){return a.appendChild(e).id=k,!C.getElementsByName||!C.getElementsByName(k).length}),d.getById?(b.filter.ID=function(e){var t=e.replace(te,ne);return function(e){return e.getAttribute("id")===t}},b.find.ID=function(e,t){if("undefined"!=typeof t.getElementById&&E){var n=t.getElementById(e);return n?[n]:[]}}):(b.filter.ID=function(e){var n=e.replace(te,ne);return function(e){var t="undefined"!=typeof e.getAttributeNode&&e.getAttributeNode("id");return t&&t.value===n}},b.find.ID=function(e,t){if("undefined"!=typeof t.getElementById&&E){var n,r,i,o=t.getElementById(e);if(o){if((n=o.getAttributeNode("id"))&&n.value===e)return[o];i=t.getElementsByName(e),r=0;while(o=i[r++])if((n=o.getAttributeNode("id"))&&n.value===e)return[o]}return[]}}),b.find.TAG=d.getElementsByTagName?function(e,t){return"undefined"!=typeof t.getElementsByTagName?t.getElementsByTagName(e):d.qsa?t.querySelectorAll(e):void 0}:function(e,t){var n,r=[],i=0,o=t.getElementsByTagName(e);if("*"===e){while(n=o[i++])1===n.nodeType&&r.push(n);return r}return o},b.find.CLASS=d.getElementsByClassName&&function(e,t){if("undefined"!=typeof t.getElementsByClassName&&E)return t.getElementsByClassName(e)},s=[],v=[],(d.qsa=K.test(C.querySelectorAll))&&(ce(function(e){a.appendChild(e).innerHTML="<a id='"+k+"'></a><select id='"+k+"-\r\\' msallowcapture=''><option selected=''></option></select>",e.querySelectorAll("[msallowcapture^='']").length&&v.push("[*^$]="+M+"*(?:''|\"\")"),e.querySelectorAll("[selected]").length||v.push("\\["+M+"*(?:value|"+R+")"),e.querySelectorAll("[id~="+k+"-]").length||v.push("~="),e.querySelectorAll(":checked").length||v.push(":checked"),e.querySelectorAll("a#"+k+"+*").length||v.push(".#.+[+~]")}),ce(function(e){e.innerHTML="<a href='' disabled='disabled'></a><select disabled='disabled'><option/></select>";var t=C.createElement("input");t.setAttribute("type","hidden"),e.appendChild(t).setAttribute("name","D"),e.querySelectorAll("[name=d]").length&&v.push("name"+M+"*[*^$|!~]?="),2!==e.querySelectorAll(":enabled").length&&v.push(":enabled",":disabled"),a.appendChild(e).disabled=!0,2!==e.querySelectorAll(":disabled").length&&v.push(":enabled",":disabled"),e.querySelectorAll("*,:x"),v.push(",.*:")})),(d.matchesSelector=K.test(c=a.matches||a.webkitMatchesSelector||a.mozMatchesSelector||a.oMatchesSelector||a.msMatchesSelector))&&ce(function(e){d.disconnectedMatch=c.call(e,"*"),c.call(e,"[s!='']:x"),s.push("!=",$)}),v=v.length&&new RegExp(v.join("|")),s=s.length&&new RegExp(s.join("|")),t=K.test(a.compareDocumentPosition),y=t||K.test(a.contains)?function(e,t){var n=9===e.nodeType?e.documentElement:e,r=t&&t.parentNode;return e===r||!(!r||1!==r.nodeType||!(n.contains?n.contains(r):e.compareDocumentPosition&&16&e.compareDocumentPosition(r)))}:function(e,t){if(t)while(t=t.parentNode)if(t===e)return!0;return!1},D=t?function(e,t){if(e===t)return l=!0,0;var n=!e.compareDocumentPosition-!t.compareDocumentPosition;return n||(1&(n=(e.ownerDocument||e)===(t.ownerDocument||t)?e.compareDocumentPosition(t):1)||!d.sortDetached&&t.compareDocumentPosition(e)===n?e===C||e.ownerDocument===m&&y(m,e)?-1:t===C||t.ownerDocument===m&&y(m,t)?1:u?P(u,e)-P(u,t):0:4&n?-1:1)}:function(e,t){if(e===t)return l=!0,0;var n,r=0,i=e.parentNode,o=t.parentNode,a=[e],s=[t];if(!i||!o)return e===C?-1:t===C?1:i?-1:o?1:u?P(u,e)-P(u,t):0;if(i===o)return pe(e,t);n=e;while(n=n.parentNode)a.unshift(n);n=t;while(n=n.parentNode)s.unshift(n);while(a[r]===s[r])r++;return r?pe(a[r],s[r]):a[r]===m?-1:s[r]===m?1:0}),C},se.matches=function(e,t){return se(e,null,null,t)},se.matchesSelector=function(e,t){if((e.ownerDocument||e)!==C&&T(e),d.matchesSelector&&E&&!A[t+" "]&&(!s||!s.test(t))&&(!v||!v.test(t)))try{var n=c.call(e,t);if(n||d.disconnectedMatch||e.document&&11!==e.document.nodeType)return n}catch(e){A(t,!0)}return 0<se(t,C,null,[e]).length},se.contains=function(e,t){return(e.ownerDocument||e)!==C&&T(e),y(e,t)},se.attr=function(e,t){(e.ownerDocument||e)!==C&&T(e);var n=b.attrHandle[t.toLowerCase()],r=n&&j.call(b.attrHandle,t.toLowerCase())?n(e,t,!E):void 0;return void 0!==r?r:d.attributes||!E?e.getAttribute(t):(r=e.getAttributeNode(t))&&r.specified?r.value:null},se.escape=function(e){return(e+"").replace(re,ie)},se.error=function(e){throw new Error("Syntax error, unrecognized expression: "+e)},se.uniqueSort=function(e){var t,n=[],r=0,i=0;if(l=!d.detectDuplicates,u=!d.sortStable&&e.slice(0),e.sort(D),l){while(t=e[i++])t===e[i]&&(r=n.push(i));while(r--)e.splice(n[r],1)}return u=null,e},o=se.getText=function(e){var t,n="",r=0,i=e.nodeType;if(i){if(1===i||9===i||11===i){if("string"==typeof e.textContent)return e.textContent;for(e=e.firstChild;e;e=e.nextSibling)n+=o(e)}else if(3===i||4===i)return e.nodeValue}else while(t=e[r++])n+=o(t);return n},(b=se.selectors={cacheLength:50,createPseudo:le,match:G,attrHandle:{},find:{},relative:{">":{dir:"parentNode",first:!0}," ":{dir:"parentNode"},"+":{dir:"previousSibling",first:!0},"~":{dir:"previousSibling"}},preFilter:{ATTR:function(e){return e[1]=e[1].replace(te,ne),e[3]=(e[3]||e[4]||e[5]||"").replace(te,ne),"~="===e[2]&&(e[3]=" "+e[3]+" "),e.slice(0,4)},CHILD:function(e){return e[1]=e[1].toLowerCase(),"nth"===e[1].slice(0,3)?(e[3]||se.error(e[0]),e[4]=+(e[4]?e[5]+(e[6]||1):2*("even"===e[3]||"odd"===e[3])),e[5]=+(e[7]+e[8]||"odd"===e[3])):e[3]&&se.error(e[0]),e},PSEUDO:function(e){var t,n=!e[6]&&e[2];return G.CHILD.test(e[0])?null:(e[3]?e[2]=e[4]||e[5]||"":n&&X.test(n)&&(t=h(n,!0))&&(t=n.indexOf(")",n.length-t)-n.length)&&(e[0]=e[0].slice(0,t),e[2]=n.slice(0,t)),e.slice(0,3))}},filter:{TAG:function(e){var t=e.replace(te,ne).toLowerCase();return"*"===e?function(){return!0}:function(e){return e.nodeName&&e.nodeName.toLowerCase()===t}},CLASS:function(e){var t=p[e+" "];return t||(t=new RegExp("(^|"+M+")"+e+"("+M+"|$)"))&&p(e,function(e){return t.test("string"==typeof e.className&&e.className||"undefined"!=typeof e.getAttribute&&e.getAttribute("class")||"")})},ATTR:function(n,r,i){return function(e){var t=se.attr(e,n);return null==t?"!="===r:!r||(t+="","="===r?t===i:"!="===r?t!==i:"^="===r?i&&0===t.indexOf(i):"*="===r?i&&-1<t.indexOf(i):"$="===r?i&&t.slice(-i.length)===i:"~="===r?-1<(" "+t.replace(F," ")+" ").indexOf(i):"|="===r&&(t===i||t.slice(0,i.length+1)===i+"-"))}},CHILD:function(h,e,t,g,v){var y="nth"!==h.slice(0,3),m="last"!==h.slice(-4),x="of-type"===e;return 1===g&&0===v?function(e){return!!e.parentNode}:function(e,t,n){var r,i,o,a,s,u,l=y!==m?"nextSibling":"previousSibling",c=e.parentNode,f=x&&e.nodeName.toLowerCase(),p=!n&&!x,d=!1;if(c){if(y){while(l){a=e;while(a=a[l])if(x?a.nodeName.toLowerCase()===f:1===a.nodeType)return!1;u=l="only"===h&&!u&&"nextSibling"}return!0}if(u=[m?c.firstChild:c.lastChild],m&&p){d=(s=(r=(i=(o=(a=c)[k]||(a[k]={}))[a.uniqueID]||(o[a.uniqueID]={}))[h]||[])[0]===S&&r[1])&&r[2],a=s&&c.childNodes[s];while(a=++s&&a&&a[l]||(d=s=0)||u.pop())if(1===a.nodeType&&++d&&a===e){i[h]=[S,s,d];break}}else if(p&&(d=s=(r=(i=(o=(a=e)[k]||(a[k]={}))[a.uniqueID]||(o[a.uniqueID]={}))[h]||[])[0]===S&&r[1]),!1===d)while(a=++s&&a&&a[l]||(d=s=0)||u.pop())if((x?a.nodeName.toLowerCase()===f:1===a.nodeType)&&++d&&(p&&((i=(o=a[k]||(a[k]={}))[a.uniqueID]||(o[a.uniqueID]={}))[h]=[S,d]),a===e))break;return(d-=v)===g||d%g==0&&0<=d/g}}},PSEUDO:function(e,o){var t,a=b.pseudos[e]||b.setFilters[e.toLowerCase()]||se.error("unsupported pseudo: "+e);return a[k]?a(o):1<a.length?(t=[e,e,"",o],b.setFilters.hasOwnProperty(e.toLowerCase())?le(function(e,t){var n,r=a(e,o),i=r.length;while(i--)e[n=P(e,r[i])]=!(t[n]=r[i])}):function(e){return a(e,0,t)}):a}},pseudos:{not:le(function(e){var r=[],i=[],s=f(e.replace(B,"$1"));return s[k]?le(function(e,t,n,r){var i,o=s(e,null,r,[]),a=e.length;while(a--)(i=o[a])&&(e[a]=!(t[a]=i))}):function(e,t,n){return r[0]=e,s(r,null,n,i),r[0]=null,!i.pop()}}),has:le(function(t){return function(e){return 0<se(t,e).length}}),contains:le(function(t){return t=t.replace(te,ne),function(e){return-1<(e.textContent||o(e)).indexOf(t)}}),lang:le(function(n){return V.test(n||"")||se.error("unsupported lang: "+n),n=n.replace(te,ne).toLowerCase(),function(e){var t;do{if(t=E?e.lang:e.getAttribute("xml:lang")||e.getAttribute("lang"))return(t=t.toLowerCase())===n||0===t.indexOf(n+"-")}while((e=e.parentNode)&&1===e.nodeType);return!1}}),target:function(e){var t=n.location&&n.location.hash;return t&&t.slice(1)===e.id},root:function(e){return e===a},focus:function(e){return e===C.activeElement&&(!C.hasFocus||C.hasFocus())&&!!(e.type||e.href||~e.tabIndex)},enabled:ge(!1),disabled:ge(!0),checked:function(e){var t=e.nodeName.toLowerCase();return"input"===t&&!!e.checked||"option"===t&&!!e.selected},selected:function(e){return e.parentNode&&e.parentNode.selectedIndex,!0===e.selected},empty:function(e){for(e=e.firstChild;e;e=e.nextSibling)if(e.nodeType<6)return!1;return!0},parent:function(e){return!b.pseudos.empty(e)},header:function(e){return J.test(e.nodeName)},input:function(e){return Q.test(e.nodeName)},button:function(e){var t=e.nodeName.toLowerCase();return"input"===t&&"button"===e.type||"button"===t},text:function(e){var t;return"input"===e.nodeName.toLowerCase()&&"text"===e.type&&(null==(t=e.getAttribute("type"))||"text"===t.toLowerCase())},first:ve(function(){return[0]}),last:ve(function(e,t){return[t-1]}),eq:ve(function(e,t,n){return[n<0?n+t:n]}),even:ve(function(e,t){for(var n=0;n<t;n+=2)e.push(n);return e}),odd:ve(function(e,t){for(var n=1;n<t;n+=2)e.push(n);return e}),lt:ve(function(e,t,n){for(var r=n<0?n+t:t<n?t:n;0<=--r;)e.push(r);return e}),gt:ve(function(e,t,n){for(var r=n<0?n+t:n;++r<t;)e.push(r);return e})}}).pseudos.nth=b.pseudos.eq,{radio:!0,checkbox:!0,file:!0,password:!0,image:!0})b.pseudos[e]=de(e);for(e in{submit:!0,reset:!0})b.pseudos[e]=he(e);function me(){}function xe(e){for(var t=0,n=e.length,r="";t<n;t++)r+=e[t].value;return r}function be(s,e,t){var u=e.dir,l=e.next,c=l||u,f=t&&"parentNode"===c,p=r++;return e.first?function(e,t,n){while(e=e[u])if(1===e.nodeType||f)return s(e,t,n);return!1}:function(e,t,n){var r,i,o,a=[S,p];if(n){while(e=e[u])if((1===e.nodeType||f)&&s(e,t,n))return!0}else while(e=e[u])if(1===e.nodeType||f)if(i=(o=e[k]||(e[k]={}))[e.uniqueID]||(o[e.uniqueID]={}),l&&l===e.nodeName.toLowerCase())e=e[u]||e;else{if((r=i[c])&&r[0]===S&&r[1]===p)return a[2]=r[2];if((i[c]=a)[2]=s(e,t,n))return!0}return!1}}function we(i){return 1<i.length?function(e,t,n){var r=i.length;while(r--)if(!i[r](e,t,n))return!1;return!0}:i[0]}function Te(e,t,n,r,i){for(var o,a=[],s=0,u=e.length,l=null!=t;s<u;s++)(o=e[s])&&(n&&!n(o,r,i)||(a.push(o),l&&t.push(s)));return a}function Ce(d,h,g,v,y,e){return v&&!v[k]&&(v=Ce(v)),y&&!y[k]&&(y=Ce(y,e)),le(function(e,t,n,r){var i,o,a,s=[],u=[],l=t.length,c=e||function(e,t,n){for(var r=0,i=t.length;r<i;r++)se(e,t[r],n);return n}(h||"*",n.nodeType?[n]:n,[]),f=!d||!e&&h?c:Te(c,s,d,n,r),p=g?y||(e?d:l||v)?[]:t:f;if(g&&g(f,p,n,r),v){i=Te(p,u),v(i,[],n,r),o=i.length;while(o--)(a=i[o])&&(p[u[o]]=!(f[u[o]]=a))}if(e){if(y||d){if(y){i=[],o=p.length;while(o--)(a=p[o])&&i.push(f[o]=a);y(null,p=[],i,r)}o=p.length;while(o--)(a=p[o])&&-1<(i=y?P(e,a):s[o])&&(e[i]=!(t[i]=a))}}else p=Te(p===t?p.splice(l,p.length):p),y?y(null,t,p,r):H.apply(t,p)})}function Ee(e){for(var i,t,n,r=e.length,o=b.relative[e[0].type],a=o||b.relative[" "],s=o?1:0,u=be(function(e){return e===i},a,!0),l=be(function(e){return-1<P(i,e)},a,!0),c=[function(e,t,n){var r=!o&&(n||t!==w)||((i=t).nodeType?u(e,t,n):l(e,t,n));return i=null,r}];s<r;s++)if(t=b.relative[e[s].type])c=[be(we(c),t)];else{if((t=b.filter[e[s].type].apply(null,e[s].matches))[k]){for(n=++s;n<r;n++)if(b.relative[e[n].type])break;return Ce(1<s&&we(c),1<s&&xe(e.slice(0,s-1).concat({value:" "===e[s-2].type?"*":""})).replace(B,"$1"),t,s<n&&Ee(e.slice(s,n)),n<r&&Ee(e=e.slice(n)),n<r&&xe(e))}c.push(t)}return we(c)}return me.prototype=b.filters=b.pseudos,b.setFilters=new me,h=se.tokenize=function(e,t){var n,r,i,o,a,s,u,l=x[e+" "];if(l)return t?0:l.slice(0);a=e,s=[],u=b.preFilter;while(a){for(o in n&&!(r=_.exec(a))||(r&&(a=a.slice(r[0].length)||a),s.push(i=[])),n=!1,(r=z.exec(a))&&(n=r.shift(),i.push({value:n,type:r[0].replace(B," ")}),a=a.slice(n.length)),b.filter)!(r=G[o].exec(a))||u[o]&&!(r=u[o](r))||(n=r.shift(),i.push({value:n,type:o,matches:r}),a=a.slice(n.length));if(!n)break}return t?a.length:a?se.error(e):x(e,s).slice(0)},f=se.compile=function(e,t){var n,v,y,m,x,r,i=[],o=[],a=N[e+" "];if(!a){t||(t=h(e)),n=t.length;while(n--)(a=Ee(t[n]))[k]?i.push(a):o.push(a);(a=N(e,(v=o,m=0<(y=i).length,x=0<v.length,r=function(e,t,n,r,i){var o,a,s,u=0,l="0",c=e&&[],f=[],p=w,d=e||x&&b.find.TAG("*",i),h=S+=null==p?1:Math.random()||.1,g=d.length;for(i&&(w=t===C||t||i);l!==g&&null!=(o=d[l]);l++){if(x&&o){a=0,t||o.ownerDocument===C||(T(o),n=!E);while(s=v[a++])if(s(o,t||C,n)){r.push(o);break}i&&(S=h)}m&&((o=!s&&o)&&u--,e&&c.push(o))}if(u+=l,m&&l!==u){a=0;while(s=y[a++])s(c,f,t,n);if(e){if(0<u)while(l--)c[l]||f[l]||(f[l]=q.call(r));f=Te(f)}H.apply(r,f),i&&!e&&0<f.length&&1<u+y.length&&se.uniqueSort(r)}return i&&(S=h,w=p),c},m?le(r):r))).selector=e}return a},g=se.select=function(e,t,n,r){var i,o,a,s,u,l="function"==typeof e&&e,c=!r&&h(e=l.selector||e);if(n=n||[],1===c.length){if(2<(o=c[0]=c[0].slice(0)).length&&"ID"===(a=o[0]).type&&9===t.nodeType&&E&&b.relative[o[1].type]){if(!(t=(b.find.ID(a.matches[0].replace(te,ne),t)||[])[0]))return n;l&&(t=t.parentNode),e=e.slice(o.shift().value.length)}i=G.needsContext.test(e)?0:o.length;while(i--){if(a=o[i],b.relative[s=a.type])break;if((u=b.find[s])&&(r=u(a.matches[0].replace(te,ne),ee.test(o[0].type)&&ye(t.parentNode)||t))){if(o.splice(i,1),!(e=r.length&&xe(o)))return H.apply(n,r),n;break}}}return(l||f(e,c))(r,t,!E,n,!t||ee.test(e)&&ye(t.parentNode)||t),n},d.sortStable=k.split("").sort(D).join("")===k,d.detectDuplicates=!!l,T(),d.sortDetached=ce(function(e){return 1&e.compareDocumentPosition(C.createElement("fieldset"))}),ce(function(e){return e.innerHTML="<a href='#'></a>","#"===e.firstChild.getAttribute("href")})||fe("type|href|height|width",function(e,t,n){if(!n)return e.getAttribute(t,"type"===t.toLowerCase()?1:2)}),d.attributes&&ce(function(e){return e.innerHTML="<input/>",e.firstChild.setAttribute("value",""),""===e.firstChild.getAttribute("value")})||fe("value",function(e,t,n){if(!n&&"input"===e.nodeName.toLowerCase())return e.defaultValue}),ce(function(e){return null==e.getAttribute("disabled")})||fe(R,function(e,t,n){var r;if(!n)return!0===e[t]?t.toLowerCase():(r=e.getAttributeNode(t))&&r.specified?r.value:null}),se}(C);k.find=h,k.expr=h.selectors,k.expr[":"]=k.expr.pseudos,k.uniqueSort=k.unique=h.uniqueSort,k.text=h.getText,k.isXMLDoc=h.isXML,k.contains=h.contains,k.escapeSelector=h.escape;var T=function(e,t,n){var r=[],i=void 0!==n;while((e=e[t])&&9!==e.nodeType)if(1===e.nodeType){if(i&&k(e).is(n))break;r.push(e)}return r},S=function(e,t){for(var n=[];e;e=e.nextSibling)1===e.nodeType&&e!==t&&n.push(e);return n},N=k.expr.match.needsContext;function A(e,t){return e.nodeName&&e.nodeName.toLowerCase()===t.toLowerCase()}var D=/^<([a-z][^\/\0>:\x20\t\r\n\f]*)[\x20\t\r\n\f]*\/?>(?:<\/\1>|)$/i;function j(e,n,r){return m(n)?k.grep(e,function(e,t){return!!n.call(e,t,e)!==r}):n.nodeType?k.grep(e,function(e){return e===n!==r}):"string"!=typeof n?k.grep(e,function(e){return-1<i.call(n,e)!==r}):k.filter(n,e,r)}k.filter=function(e,t,n){var r=t[0];return n&&(e=":not("+e+")"),1===t.length&&1===r.nodeType?k.find.matchesSelector(r,e)?[r]:[]:k.find.matches(e,k.grep(t,function(e){return 1===e.nodeType}))},k.fn.extend({find:function(e){var t,n,r=this.length,i=this;if("string"!=typeof e)return this.pushStack(k(e).filter(function(){for(t=0;t<r;t++)if(k.contains(i[t],this))return!0}));for(n=this.pushStack([]),t=0;t<r;t++)k.find(e,i[t],n);return 1<r?k.uniqueSort(n):n},filter:function(e){return this.pushStack(j(this,e||[],!1))},not:function(e){return this.pushStack(j(this,e||[],!0))},is:function(e){return!!j(this,"string"==typeof e&&N.test(e)?k(e):e||[],!1).length}});var q,L=/^(?:\s*(<[\w\W]+>)[^>]*|#([\w-]+))$/;(k.fn.init=function(e,t,n){var r,i;if(!e)return this;if(n=n||q,"string"==typeof e){if(!(r="<"===e[0]&&">"===e[e.length-1]&&3<=e.length?[null,e,null]:L.exec(e))||!r[1]&&t)return!t||t.jquery?(t||n).find(e):this.constructor(t).find(e);if(r[1]){if(t=t instanceof k?t[0]:t,k.merge(this,k.parseHTML(r[1],t&&t.nodeType?t.ownerDocument||t:E,!0)),D.test(r[1])&&k.isPlainObject(t))for(r in t)m(this[r])?this[r](t[r]):this.attr(r,t[r]);return this}return(i=E.getElementById(r[2]))&&(this[0]=i,this.length=1),this}return e.nodeType?(this[0]=e,this.length=1,this):m(e)?void 0!==n.ready?n.ready(e):e(k):k.makeArray(e,this)}).prototype=k.fn,q=k(E);var H=/^(?:parents|prev(?:Until|All))/,O={children:!0,contents:!0,next:!0,prev:!0};function P(e,t){while((e=e[t])&&1!==e.nodeType);return e}k.fn.extend({has:function(e){var t=k(e,this),n=t.length;return this.filter(function(){for(var e=0;e<n;e++)if(k.contains(this,t[e]))return!0})},closest:function(e,t){var n,r=0,i=this.length,o=[],a="string"!=typeof e&&k(e);if(!N.test(e))for(;r<i;r++)for(n=this[r];n&&n!==t;n=n.parentNode)if(n.nodeType<11&&(a?-1<a.index(n):1===n.nodeType&&k.find.matchesSelector(n,e))){o.push(n);break}return this.pushStack(1<o.length?k.uniqueSort(o):o)},index:function(e){return e?"string"==typeof e?i.call(k(e),this[0]):i.call(this,e.jquery?e[0]:e):this[0]&&this[0].parentNode?this.first().prevAll().length:-1},add:function(e,t){return this.pushStack(k.uniqueSort(k.merge(this.get(),k(e,t))))},addBack:function(e){return this.add(null==e?this.prevObject:this.prevObject.filter(e))}}),k.each({parent:function(e){var t=e.parentNode;return t&&11!==t.nodeType?t:null},parents:function(e){return T(e,"parentNode")},parentsUntil:function(e,t,n){return T(e,"parentNode",n)},next:function(e){return P(e,"nextSibling")},prev:function(e){return P(e,"previousSibling")},nextAll:function(e){return T(e,"nextSibling")},prevAll:function(e){return T(e,"previousSibling")},nextUntil:function(e,t,n){return T(e,"nextSibling",n)},prevUntil:function(e,t,n){return T(e,"previousSibling",n)},siblings:function(e){return S((e.parentNode||{}).firstChild,e)},children:function(e){return S(e.firstChild)},contents:function(e){return"undefined"!=typeof e.contentDocument?e.contentDocument:(A(e,"template")&&(e=e.content||e),k.merge([],e.childNodes))}},function(r,i){k.fn[r]=function(e,t){var n=k.map(this,i,e);return"Until"!==r.slice(-5)&&(t=e),t&&"string"==typeof t&&(n=k.filter(t,n)),1<this.length&&(O[r]||k.uniqueSort(n),H.test(r)&&n.reverse()),this.pushStack(n)}});var R=/[^\x20\t\r\n\f]+/g;function M(e){return e}function I(e){throw e}function W(e,t,n,r){var i;try{e&&m(i=e.promise)?i.call(e).done(t).fail(n):e&&m(i=e.then)?i.call(e,t,n):t.apply(void 0,[e].slice(r))}catch(e){n.apply(void 0,[e])}}k.Callbacks=function(r){var e,n;r="string"==typeof r?(e=r,n={},k.each(e.match(R)||[],function(e,t){n[t]=!0}),n):k.extend({},r);var i,t,o,a,s=[],u=[],l=-1,c=function(){for(a=a||r.once,o=i=!0;u.length;l=-1){t=u.shift();while(++l<s.length)!1===s[l].apply(t[0],t[1])&&r.stopOnFalse&&(l=s.length,t=!1)}r.memory||(t=!1),i=!1,a&&(s=t?[]:"")},f={add:function(){return s&&(t&&!i&&(l=s.length-1,u.push(t)),function n(e){k.each(e,function(e,t){m(t)?r.unique&&f.has(t)||s.push(t):t&&t.length&&"string"!==w(t)&&n(t)})}(arguments),t&&!i&&c()),this},remove:function(){return k.each(arguments,function(e,t){var n;while(-1<(n=k.inArray(t,s,n)))s.splice(n,1),n<=l&&l--}),this},has:function(e){return e?-1<k.inArray(e,s):0<s.length},empty:function(){return s&&(s=[]),this},disable:function(){return a=u=[],s=t="",this},disabled:function(){return!s},lock:function(){return a=u=[],t||i||(s=t=""),this},locked:function(){return!!a},fireWith:function(e,t){return a||(t=[e,(t=t||[]).slice?t.slice():t],u.push(t),i||c()),this},fire:function(){return f.fireWith(this,arguments),this},fired:function(){return!!o}};return f},k.extend({Deferred:function(e){var o=[["notify","progress",k.Callbacks("memory"),k.Callbacks("memory"),2],["resolve","done",k.Callbacks("once memory"),k.Callbacks("once memory"),0,"resolved"],["reject","fail",k.Callbacks("once memory"),k.Callbacks("once memory"),1,"rejected"]],i="pending",a={state:function(){return i},always:function(){return s.done(arguments).fail(arguments),this},"catch":function(e){return a.then(null,e)},pipe:function(){var i=arguments;return k.Deferred(function(r){k.each(o,function(e,t){var n=m(i[t[4]])&&i[t[4]];s[t[1]](function(){var e=n&&n.apply(this,arguments);e&&m(e.promise)?e.promise().progress(r.notify).done(r.resolve).fail(r.reject):r[t[0]+"With"](this,n?[e]:arguments)})}),i=null}).promise()},then:function(t,n,r){var u=0;function l(i,o,a,s){return function(){var n=this,r=arguments,e=function(){var e,t;if(!(i<u)){if((e=a.apply(n,r))===o.promise())throw new TypeError("Thenable self-resolution");t=e&&("object"==typeof e||"function"==typeof e)&&e.then,m(t)?s?t.call(e,l(u,o,M,s),l(u,o,I,s)):(u++,t.call(e,l(u,o,M,s),l(u,o,I,s),l(u,o,M,o.notifyWith))):(a!==M&&(n=void 0,r=[e]),(s||o.resolveWith)(n,r))}},t=s?e:function(){try{e()}catch(e){k.Deferred.exceptionHook&&k.Deferred.exceptionHook(e,t.stackTrace),u<=i+1&&(a!==I&&(n=void 0,r=[e]),o.rejectWith(n,r))}};i?t():(k.Deferred.getStackHook&&(t.stackTrace=k.Deferred.getStackHook()),C.setTimeout(t))}}return k.Deferred(function(e){o[0][3].add(l(0,e,m(r)?r:M,e.notifyWith)),o[1][3].add(l(0,e,m(t)?t:M)),o[2][3].add(l(0,e,m(n)?n:I))}).promise()},promise:function(e){return null!=e?k.extend(e,a):a}},s={};return k.each(o,function(e,t){var n=t[2],r=t[5];a[t[1]]=n.add,r&&n.add(function(){i=r},o[3-e][2].disable,o[3-e][3].disable,o[0][2].lock,o[0][3].lock),n.add(t[3].fire),s[t[0]]=function(){return s[t[0]+"With"](this===s?void 0:this,arguments),this},s[t[0]+"With"]=n.fireWith}),a.promise(s),e&&e.call(s,s),s},when:function(e){var n=arguments.length,t=n,r=Array(t),i=s.call(arguments),o=k.Deferred(),a=function(t){return function(e){r[t]=this,i[t]=1<arguments.length?s.call(arguments):e,--n||o.resolveWith(r,i)}};if(n<=1&&(W(e,o.done(a(t)).resolve,o.reject,!n),"pending"===o.state()||m(i[t]&&i[t].then)))return o.then();while(t--)W(i[t],a(t),o.reject);return o.promise()}});var $=/^(Eval|Internal|Range|Reference|Syntax|Type|URI)Error$/;k.Deferred.exceptionHook=function(e,t){C.console&&C.console.warn&&e&&$.test(e.name)&&C.console.warn("jQuery.Deferred exception: "+e.message,e.stack,t)},k.readyException=function(e){C.setTimeout(function(){throw e})};var F=k.Deferred();function B(){E.removeEventListener("DOMContentLoaded",B),C.removeEventListener("load",B),k.ready()}k.fn.ready=function(e){return F.then(e)["catch"](function(e){k.readyException(e)}),this},k.extend({isReady:!1,readyWait:1,ready:function(e){(!0===e?--k.readyWait:k.isReady)||(k.isReady=!0)!==e&&0<--k.readyWait||F.resolveWith(E,[k])}}),k.ready.then=F.then,"complete"===E.readyState||"loading"!==E.readyState&&!E.documentElement.doScroll?C.setTimeout(k.ready):(E.addEventListener("DOMContentLoaded",B),C.addEventListener("load",B));var _=function(e,t,n,r,i,o,a){var s=0,u=e.length,l=null==n;if("object"===w(n))for(s in i=!0,n)_(e,t,s,n[s],!0,o,a);else if(void 0!==r&&(i=!0,m(r)||(a=!0),l&&(a?(t.call(e,r),t=null):(l=t,t=function(e,t,n){return l.call(k(e),n)})),t))for(;s<u;s++)t(e[s],n,a?r:r.call(e[s],s,t(e[s],n)));return i?e:l?t.call(e):u?t(e[0],n):o},z=/^-ms-/,U=/-([a-z])/g;function X(e,t){return t.toUpperCase()}function V(e){return e.replace(z,"ms-").replace(U,X)}var G=function(e){return 1===e.nodeType||9===e.nodeType||!+e.nodeType};function Y(){this.expando=k.expando+Y.uid++}Y.uid=1,Y.prototype={cache:function(e){var t=e[this.expando];return t||(t={},G(e)&&(e.nodeType?e[this.expando]=t:Object.defineProperty(e,this.expando,{value:t,configurable:!0}))),t},set:function(e,t,n){var r,i=this.cache(e);if("string"==typeof t)i[V(t)]=n;else for(r in t)i[V(r)]=t[r];return i},get:function(e,t){return void 0===t?this.cache(e):e[this.expando]&&e[this.expando][V(t)]},access:function(e,t,n){return void 0===t||t&&"string"==typeof t&&void 0===n?this.get(e,t):(this.set(e,t,n),void 0!==n?n:t)},remove:function(e,t){var n,r=e[this.expando];if(void 0!==r){if(void 0!==t){n=(t=Array.isArray(t)?t.map(V):(t=V(t))in r?[t]:t.match(R)||[]).length;while(n--)delete r[t[n]]}(void 0===t||k.isEmptyObject(r))&&(e.nodeType?e[this.expando]=void 0:delete e[this.expando])}},hasData:function(e){var t=e[this.expando];return void 0!==t&&!k.isEmptyObject(t)}};var Q=new Y,J=new Y,K=/^(?:\{[\w\W]*\}|\[[\w\W]*\])$/,Z=/[A-Z]/g;function ee(e,t,n){var r,i;if(void 0===n&&1===e.nodeType)if(r="data-"+t.replace(Z,"-$&").toLowerCase(),"string"==typeof(n=e.getAttribute(r))){try{n="true"===(i=n)||"false"!==i&&("null"===i?null:i===+i+""?+i:K.test(i)?JSON.parse(i):i)}catch(e){}J.set(e,t,n)}else n=void 0;return n}k.extend({hasData:function(e){return J.hasData(e)||Q.hasData(e)},data:function(e,t,n){return J.access(e,t,n)},removeData:function(e,t){J.remove(e,t)},_data:function(e,t,n){return Q.access(e,t,n)},_removeData:function(e,t){Q.remove(e,t)}}),k.fn.extend({data:function(n,e){var t,r,i,o=this[0],a=o&&o.attributes;if(void 0===n){if(this.length&&(i=J.get(o),1===o.nodeType&&!Q.get(o,"hasDataAttrs"))){t=a.length;while(t--)a[t]&&0===(r=a[t].name).indexOf("data-")&&(r=V(r.slice(5)),ee(o,r,i[r]));Q.set(o,"hasDataAttrs",!0)}return i}return"object"==typeof n?this.each(function(){J.set(this,n)}):_(this,function(e){var t;if(o&&void 0===e)return void 0!==(t=J.get(o,n))?t:void 0!==(t=ee(o,n))?t:void 0;this.each(function(){J.set(this,n,e)})},null,e,1<arguments.length,null,!0)},removeData:function(e){return this.each(function(){J.remove(this,e)})}}),k.extend({queue:function(e,t,n){var r;if(e)return t=(t||"fx")+"queue",r=Q.get(e,t),n&&(!r||Array.isArray(n)?r=Q.access(e,t,k.makeArray(n)):r.push(n)),r||[]},dequeue:function(e,t){t=t||"fx";var n=k.queue(e,t),r=n.length,i=n.shift(),o=k._queueHooks(e,t);"inprogress"===i&&(i=n.shift(),r--),i&&("fx"===t&&n.unshift("inprogress"),delete o.stop,i.call(e,function(){k.dequeue(e,t)},o)),!r&&o&&o.empty.fire()},_queueHooks:function(e,t){var n=t+"queueHooks";return Q.get(e,n)||Q.access(e,n,{empty:k.Callbacks("once memory").add(function(){Q.remove(e,[t+"queue",n])})})}}),k.fn.extend({queue:function(t,n){var e=2;return"string"!=typeof t&&(n=t,t="fx",e--),arguments.length<e?k.queue(this[0],t):void 0===n?this:this.each(function(){var e=k.queue(this,t,n);k._queueHooks(this,t),"fx"===t&&"inprogress"!==e[0]&&k.dequeue(this,t)})},dequeue:function(e){return this.each(function(){k.dequeue(this,e)})},clearQueue:function(e){return this.queue(e||"fx",[])},promise:function(e,t){var n,r=1,i=k.Deferred(),o=this,a=this.length,s=function(){--r||i.resolveWith(o,[o])};"string"!=typeof e&&(t=e,e=void 0),e=e||"fx";while(a--)(n=Q.get(o[a],e+"queueHooks"))&&n.empty&&(r++,n.empty.add(s));return s(),i.promise(t)}});var te=/[+-]?(?:\d*\.|)\d+(?:[eE][+-]?\d+|)/.source,ne=new RegExp("^(?:([+-])=|)("+te+")([a-z%]*)$","i"),re=["Top","Right","Bottom","Left"],ie=E.documentElement,oe=function(e){return k.contains(e.ownerDocument,e)},ae={composed:!0};ie.getRootNode&&(oe=function(e){return k.contains(e.ownerDocument,e)||e.getRootNode(ae)===e.ownerDocument});var se=function(e,t){return"none"===(e=t||e).style.display||""===e.style.display&&oe(e)&&"none"===k.css(e,"display")},ue=function(e,t,n,r){var i,o,a={};for(o in t)a[o]=e.style[o],e.style[o]=t[o];for(o in i=n.apply(e,r||[]),t)e.style[o]=a[o];return i};function le(e,t,n,r){var i,o,a=20,s=r?function(){return r.cur()}:function(){return k.css(e,t,"")},u=s(),l=n&&n[3]||(k.cssNumber[t]?"":"px"),c=e.nodeType&&(k.cssNumber[t]||"px"!==l&&+u)&&ne.exec(k.css(e,t));if(c&&c[3]!==l){u/=2,l=l||c[3],c=+u||1;while(a--)k.style(e,t,c+l),(1-o)*(1-(o=s()/u||.5))<=0&&(a=0),c/=o;c*=2,k.style(e,t,c+l),n=n||[]}return n&&(c=+c||+u||0,i=n[1]?c+(n[1]+1)*n[2]:+n[2],r&&(r.unit=l,r.start=c,r.end=i)),i}var ce={};function fe(e,t){for(var n,r,i,o,a,s,u,l=[],c=0,f=e.length;c<f;c++)(r=e[c]).style&&(n=r.style.display,t?("none"===n&&(l[c]=Q.get(r,"display")||null,l[c]||(r.style.display="")),""===r.style.display&&se(r)&&(l[c]=(u=a=o=void 0,a=(i=r).ownerDocument,s=i.nodeName,(u=ce[s])||(o=a.body.appendChild(a.createElement(s)),u=k.css(o,"display"),o.parentNode.removeChild(o),"none"===u&&(u="block"),ce[s]=u)))):"none"!==n&&(l[c]="none",Q.set(r,"display",n)));for(c=0;c<f;c++)null!=l[c]&&(e[c].style.display=l[c]);return e}k.fn.extend({show:function(){return fe(this,!0)},hide:function(){return fe(this)},toggle:function(e){return"boolean"==typeof e?e?this.show():this.hide():this.each(function(){se(this)?k(this).show():k(this).hide()})}});var pe=/^(?:checkbox|radio)$/i,de=/<([a-z][^\/\0>\x20\t\r\n\f]*)/i,he=/^$|^module$|\/(?:java|ecma)script/i,ge={option:[1,"<select multiple='multiple'>","</select>"],thead:[1,"<table>","</table>"],col:[2,"<table><colgroup>","</colgroup></table>"],tr:[2,"<table><tbody>","</tbody></table>"],td:[3,"<table><tbody><tr>","</tr></tbody></table>"],_default:[0,"",""]};function ve(e,t){var n;return n="undefined"!=typeof e.getElementsByTagName?e.getElementsByTagName(t||"*"):"undefined"!=typeof e.querySelectorAll?e.querySelectorAll(t||"*"):[],void 0===t||t&&A(e,t)?k.merge([e],n):n}function ye(e,t){for(var n=0,r=e.length;n<r;n++)Q.set(e[n],"globalEval",!t||Q.get(t[n],"globalEval"))}ge.optgroup=ge.option,ge.tbody=ge.tfoot=ge.colgroup=ge.caption=ge.thead,ge.th=ge.td;var me,xe,be=/<|&#?\w+;/;function we(e,t,n,r,i){for(var o,a,s,u,l,c,f=t.createDocumentFragment(),p=[],d=0,h=e.length;d<h;d++)if((o=e[d])||0===o)if("object"===w(o))k.merge(p,o.nodeType?[o]:o);else if(be.test(o)){a=a||f.appendChild(t.createElement("div")),s=(de.exec(o)||["",""])[1].toLowerCase(),u=ge[s]||ge._default,a.innerHTML=u[1]+k.htmlPrefilter(o)+u[2],c=u[0];while(c--)a=a.lastChild;k.merge(p,a.childNodes),(a=f.firstChild).textContent=""}else p.push(t.createTextNode(o));f.textContent="",d=0;while(o=p[d++])if(r&&-1<k.inArray(o,r))i&&i.push(o);else if(l=oe(o),a=ve(f.appendChild(o),"script"),l&&ye(a),n){c=0;while(o=a[c++])he.test(o.type||"")&&n.push(o)}return f}me=E.createDocumentFragment().appendChild(E.createElement("div")),(xe=E.createElement("input")).setAttribute("type","radio"),xe.setAttribute("checked","checked"),xe.setAttribute("name","t"),me.appendChild(xe),y.checkClone=me.cloneNode(!0).cloneNode(!0).lastChild.checked,me.innerHTML="<textarea>x</textarea>",y.noCloneChecked=!!me.cloneNode(!0).lastChild.defaultValue;var Te=/^key/,Ce=/^(?:mouse|pointer|contextmenu|drag|drop)|click/,Ee=/^([^.]*)(?:\.(.+)|)/;function ke(){return!0}function Se(){return!1}function Ne(e,t){return e===function(){try{return E.activeElement}catch(e){}}()==("focus"===t)}function Ae(e,t,n,r,i,o){var a,s;if("object"==typeof t){for(s in"string"!=typeof n&&(r=r||n,n=void 0),t)Ae(e,s,n,r,t[s],o);return e}if(null==r&&null==i?(i=n,r=n=void 0):null==i&&("string"==typeof n?(i=r,r=void 0):(i=r,r=n,n=void 0)),!1===i)i=Se;else if(!i)return e;return 1===o&&(a=i,(i=function(e){return k().off(e),a.apply(this,arguments)}).guid=a.guid||(a.guid=k.guid++)),e.each(function(){k.event.add(this,t,i,r,n)})}function De(e,i,o){o?(Q.set(e,i,!1),k.event.add(e,i,{namespace:!1,handler:function(e){var t,n,r=Q.get(this,i);if(1&e.isTrigger&&this[i]){if(r.length)(k.event.special[i]||{}).delegateType&&e.stopPropagation();else if(r=s.call(arguments),Q.set(this,i,r),t=o(this,i),this[i](),r!==(n=Q.get(this,i))||t?Q.set(this,i,!1):n={},r!==n)return e.stopImmediatePropagation(),e.preventDefault(),n.value}else r.length&&(Q.set(this,i,{value:k.event.trigger(k.extend(r[0],k.Event.prototype),r.slice(1),this)}),e.stopImmediatePropagation())}})):void 0===Q.get(e,i)&&k.event.add(e,i,ke)}k.event={global:{},add:function(t,e,n,r,i){var o,a,s,u,l,c,f,p,d,h,g,v=Q.get(t);if(v){n.handler&&(n=(o=n).handler,i=o.selector),i&&k.find.matchesSelector(ie,i),n.guid||(n.guid=k.guid++),(u=v.events)||(u=v.events={}),(a=v.handle)||(a=v.handle=function(e){return"undefined"!=typeof k&&k.event.triggered!==e.type?k.event.dispatch.apply(t,arguments):void 0}),l=(e=(e||"").match(R)||[""]).length;while(l--)d=g=(s=Ee.exec(e[l])||[])[1],h=(s[2]||"").split(".").sort(),d&&(f=k.event.special[d]||{},d=(i?f.delegateType:f.bindType)||d,f=k.event.special[d]||{},c=k.extend({type:d,origType:g,data:r,handler:n,guid:n.guid,selector:i,needsContext:i&&k.expr.match.needsContext.test(i),namespace:h.join(".")},o),(p=u[d])||((p=u[d]=[]).delegateCount=0,f.setup&&!1!==f.setup.call(t,r,h,a)||t.addEventListener&&t.addEventListener(d,a)),f.add&&(f.add.call(t,c),c.handler.guid||(c.handler.guid=n.guid)),i?p.splice(p.delegateCount++,0,c):p.push(c),k.event.global[d]=!0)}},remove:function(e,t,n,r,i){var o,a,s,u,l,c,f,p,d,h,g,v=Q.hasData(e)&&Q.get(e);if(v&&(u=v.events)){l=(t=(t||"").match(R)||[""]).length;while(l--)if(d=g=(s=Ee.exec(t[l])||[])[1],h=(s[2]||"").split(".").sort(),d){f=k.event.special[d]||{},p=u[d=(r?f.delegateType:f.bindType)||d]||[],s=s[2]&&new RegExp("(^|\\.)"+h.join("\\.(?:.*\\.|)")+"(\\.|$)"),a=o=p.length;while(o--)c=p[o],!i&&g!==c.origType||n&&n.guid!==c.guid||s&&!s.test(c.namespace)||r&&r!==c.selector&&("**"!==r||!c.selector)||(p.splice(o,1),c.selector&&p.delegateCount--,f.remove&&f.remove.call(e,c));a&&!p.length&&(f.teardown&&!1!==f.teardown.call(e,h,v.handle)||k.removeEvent(e,d,v.handle),delete u[d])}else for(d in u)k.event.remove(e,d+t[l],n,r,!0);k.isEmptyObject(u)&&Q.remove(e,"handle events")}},dispatch:function(e){var t,n,r,i,o,a,s=k.event.fix(e),u=new Array(arguments.length),l=(Q.get(this,"events")||{})[s.type]||[],c=k.event.special[s.type]||{};for(u[0]=s,t=1;t<arguments.length;t++)u[t]=arguments[t];if(s.delegateTarget=this,!c.preDispatch||!1!==c.preDispatch.call(this,s)){a=k.event.handlers.call(this,s,l),t=0;while((i=a[t++])&&!s.isPropagationStopped()){s.currentTarget=i.elem,n=0;while((o=i.handlers[n++])&&!s.isImmediatePropagationStopped())s.rnamespace&&!1!==o.namespace&&!s.rnamespace.test(o.namespace)||(s.handleObj=o,s.data=o.data,void 0!==(r=((k.event.special[o.origType]||{}).handle||o.handler).apply(i.elem,u))&&!1===(s.result=r)&&(s.preventDefault(),s.stopPropagation()))}return c.postDispatch&&c.postDispatch.call(this,s),s.result}},handlers:function(e,t){var n,r,i,o,a,s=[],u=t.delegateCount,l=e.target;if(u&&l.nodeType&&!("click"===e.type&&1<=e.button))for(;l!==this;l=l.parentNode||this)if(1===l.nodeType&&("click"!==e.type||!0!==l.disabled)){for(o=[],a={},n=0;n<u;n++)void 0===a[i=(r=t[n]).selector+" "]&&(a[i]=r.needsContext?-1<k(i,this).index(l):k.find(i,this,null,[l]).length),a[i]&&o.push(r);o.length&&s.push({elem:l,handlers:o})}return l=this,u<t.length&&s.push({elem:l,handlers:t.slice(u)}),s},addProp:function(t,e){Object.defineProperty(k.Event.prototype,t,{enumerable:!0,configurable:!0,get:m(e)?function(){if(this.originalEvent)return e(this.originalEvent)}:function(){if(this.originalEvent)return this.originalEvent[t]},set:function(e){Object.defineProperty(this,t,{enumerable:!0,configurable:!0,writable:!0,value:e})}})},fix:function(e){return e[k.expando]?e:new k.Event(e)},special:{load:{noBubble:!0},click:{setup:function(e){var t=this||e;return pe.test(t.type)&&t.click&&A(t,"input")&&De(t,"click",ke),!1},trigger:function(e){var t=this||e;return pe.test(t.type)&&t.click&&A(t,"input")&&De(t,"click"),!0},_default:function(e){var t=e.target;return pe.test(t.type)&&t.click&&A(t,"input")&&Q.get(t,"click")||A(t,"a")}},beforeunload:{postDispatch:function(e){void 0!==e.result&&e.originalEvent&&(e.originalEvent.returnValue=e.result)}}}},k.removeEvent=function(e,t,n){e.removeEventListener&&e.removeEventListener(t,n)},k.Event=function(e,t){if(!(this instanceof k.Event))return new k.Event(e,t);e&&e.type?(this.originalEvent=e,this.type=e.type,this.isDefaultPrevented=e.defaultPrevented||void 0===e.defaultPrevented&&!1===e.returnValue?ke:Se,this.target=e.target&&3===e.target.nodeType?e.target.parentNode:e.target,this.currentTarget=e.currentTarget,this.relatedTarget=e.relatedTarget):this.type=e,t&&k.extend(this,t),this.timeStamp=e&&e.timeStamp||Date.now(),this[k.expando]=!0},k.Event.prototype={constructor:k.Event,isDefaultPrevented:Se,isPropagationStopped:Se,isImmediatePropagationStopped:Se,isSimulated:!1,preventDefault:function(){var e=this.originalEvent;this.isDefaultPrevented=ke,e&&!this.isSimulated&&e.preventDefault()},stopPropagation:function(){var e=this.originalEvent;this.isPropagationStopped=ke,e&&!this.isSimulated&&e.stopPropagation()},stopImmediatePropagation:function(){var e=this.originalEvent;this.isImmediatePropagationStopped=ke,e&&!this.isSimulated&&e.stopImmediatePropagation(),this.stopPropagation()}},k.each({altKey:!0,bubbles:!0,cancelable:!0,changedTouches:!0,ctrlKey:!0,detail:!0,eventPhase:!0,metaKey:!0,pageX:!0,pageY:!0,shiftKey:!0,view:!0,"char":!0,code:!0,charCode:!0,key:!0,keyCode:!0,button:!0,buttons:!0,clientX:!0,clientY:!0,offsetX:!0,offsetY:!0,pointerId:!0,pointerType:!0,screenX:!0,screenY:!0,targetTouches:!0,toElement:!0,touches:!0,which:function(e){var t=e.button;return null==e.which&&Te.test(e.type)?null!=e.charCode?e.charCode:e.keyCode:!e.which&&void 0!==t&&Ce.test(e.type)?1&t?1:2&t?3:4&t?2:0:e.which}},k.event.addProp),k.each({focus:"focusin",blur:"focusout"},function(e,t){k.event.special[e]={setup:function(){return De(this,e,Ne),!1},trigger:function(){return De(this,e),!0},delegateType:t}}),k.each({mouseenter:"mouseover",mouseleave:"mouseout",pointerenter:"pointerover",pointerleave:"pointerout"},function(e,i){k.event.special[e]={delegateType:i,bindType:i,handle:function(e){var t,n=e.relatedTarget,r=e.handleObj;return n&&(n===this||k.contains(this,n))||(e.type=r.origType,t=r.handler.apply(this,arguments),e.type=i),t}}}),k.fn.extend({on:function(e,t,n,r){return Ae(this,e,t,n,r)},one:function(e,t,n,r){return Ae(this,e,t,n,r,1)},off:function(e,t,n){var r,i;if(e&&e.preventDefault&&e.handleObj)return r=e.handleObj,k(e.delegateTarget).off(r.namespace?r.origType+"."+r.namespace:r.origType,r.selector,r.handler),this;if("object"==typeof e){for(i in e)this.off(i,t,e[i]);return this}return!1!==t&&"function"!=typeof t||(n=t,t=void 0),!1===n&&(n=Se),this.each(function(){k.event.remove(this,e,n,t)})}});var je=/<(?!area|br|col|embed|hr|img|input|link|meta|param)(([a-z][^\/\0>\x20\t\r\n\f]*)[^>]*)\/>/gi,qe=/<script|<style|<link/i,Le=/checked\s*(?:[^=]|=\s*.checked.)/i,He=/^\s*<!(?:\[CDATA\[|--)|(?:\]\]|--)>\s*$/g;function Oe(e,t){return A(e,"table")&&A(11!==t.nodeType?t:t.firstChild,"tr")&&k(e).children("tbody")[0]||e}function Pe(e){return e.type=(null!==e.getAttribute("type"))+"/"+e.type,e}function Re(e){return"true/"===(e.type||"").slice(0,5)?e.type=e.type.slice(5):e.removeAttribute("type"),e}function Me(e,t){var n,r,i,o,a,s,u,l;if(1===t.nodeType){if(Q.hasData(e)&&(o=Q.access(e),a=Q.set(t,o),l=o.events))for(i in delete a.handle,a.events={},l)for(n=0,r=l[i].length;n<r;n++)k.event.add(t,i,l[i][n]);J.hasData(e)&&(s=J.access(e),u=k.extend({},s),J.set(t,u))}}function Ie(n,r,i,o){r=g.apply([],r);var e,t,a,s,u,l,c=0,f=n.length,p=f-1,d=r[0],h=m(d);if(h||1<f&&"string"==typeof d&&!y.checkClone&&Le.test(d))return n.each(function(e){var t=n.eq(e);h&&(r[0]=d.call(this,e,t.html())),Ie(t,r,i,o)});if(f&&(t=(e=we(r,n[0].ownerDocument,!1,n,o)).firstChild,1===e.childNodes.length&&(e=t),t||o)){for(s=(a=k.map(ve(e,"script"),Pe)).length;c<f;c++)u=e,c!==p&&(u=k.clone(u,!0,!0),s&&k.merge(a,ve(u,"script"))),i.call(n[c],u,c);if(s)for(l=a[a.length-1].ownerDocument,k.map(a,Re),c=0;c<s;c++)u=a[c],he.test(u.type||"")&&!Q.access(u,"globalEval")&&k.contains(l,u)&&(u.src&&"module"!==(u.type||"").toLowerCase()?k._evalUrl&&!u.noModule&&k._evalUrl(u.src,{nonce:u.nonce||u.getAttribute("nonce")}):b(u.textContent.replace(He,""),u,l))}return n}function We(e,t,n){for(var r,i=t?k.filter(t,e):e,o=0;null!=(r=i[o]);o++)n||1!==r.nodeType||k.cleanData(ve(r)),r.parentNode&&(n&&oe(r)&&ye(ve(r,"script")),r.parentNode.removeChild(r));return e}k.extend({htmlPrefilter:function(e){return e.replace(je,"<$1></$2>")},clone:function(e,t,n){var r,i,o,a,s,u,l,c=e.cloneNode(!0),f=oe(e);if(!(y.noCloneChecked||1!==e.nodeType&&11!==e.nodeType||k.isXMLDoc(e)))for(a=ve(c),r=0,i=(o=ve(e)).length;r<i;r++)s=o[r],u=a[r],void 0,"input"===(l=u.nodeName.toLowerCase())&&pe.test(s.type)?u.checked=s.checked:"input"!==l&&"textarea"!==l||(u.defaultValue=s.defaultValue);if(t)if(n)for(o=o||ve(e),a=a||ve(c),r=0,i=o.length;r<i;r++)Me(o[r],a[r]);else Me(e,c);return 0<(a=ve(c,"script")).length&&ye(a,!f&&ve(e,"script")),c},cleanData:function(e){for(var t,n,r,i=k.event.special,o=0;void 0!==(n=e[o]);o++)if(G(n)){if(t=n[Q.expando]){if(t.events)for(r in t.events)i[r]?k.event.remove(n,r):k.removeEvent(n,r,t.handle);n[Q.expando]=void 0}n[J.expando]&&(n[J.expando]=void 0)}}}),k.fn.extend({detach:function(e){return We(this,e,!0)},remove:function(e){return We(this,e)},text:function(e){return _(this,function(e){return void 0===e?k.text(this):this.empty().each(function(){1!==this.nodeType&&11!==this.nodeType&&9!==this.nodeType||(this.textContent=e)})},null,e,arguments.length)},append:function(){return Ie(this,arguments,function(e){1!==this.nodeType&&11!==this.nodeType&&9!==this.nodeType||Oe(this,e).appendChild(e)})},prepend:function(){return Ie(this,arguments,function(e){if(1===this.nodeType||11===this.nodeType||9===this.nodeType){var t=Oe(this,e);t.insertBefore(e,t.firstChild)}})},before:function(){return Ie(this,arguments,function(e){this.parentNode&&this.parentNode.insertBefore(e,this)})},after:function(){return Ie(this,arguments,function(e){this.parentNode&&this.parentNode.insertBefore(e,this.nextSibling)})},empty:function(){for(var e,t=0;null!=(e=this[t]);t++)1===e.nodeType&&(k.cleanData(ve(e,!1)),e.textContent="");return this},clone:function(e,t){return e=null!=e&&e,t=null==t?e:t,this.map(function(){return k.clone(this,e,t)})},html:function(e){return _(this,function(e){var t=this[0]||{},n=0,r=this.length;if(void 0===e&&1===t.nodeType)return t.innerHTML;if("string"==typeof e&&!qe.test(e)&&!ge[(de.exec(e)||["",""])[1].toLowerCase()]){e=k.htmlPrefilter(e);try{for(;n<r;n++)1===(t=this[n]||{}).nodeType&&(k.cleanData(ve(t,!1)),t.innerHTML=e);t=0}catch(e){}}t&&this.empty().append(e)},null,e,arguments.length)},replaceWith:function(){var n=[];return Ie(this,arguments,function(e){var t=this.parentNode;k.inArray(this,n)<0&&(k.cleanData(ve(this)),t&&t.replaceChild(e,this))},n)}}),k.each({appendTo:"append",prependTo:"prepend",insertBefore:"before",insertAfter:"after",replaceAll:"replaceWith"},function(e,a){k.fn[e]=function(e){for(var t,n=[],r=k(e),i=r.length-1,o=0;o<=i;o++)t=o===i?this:this.clone(!0),k(r[o])[a](t),u.apply(n,t.get());return this.pushStack(n)}});var $e=new RegExp("^("+te+")(?!px)[a-z%]+$","i"),Fe=function(e){var t=e.ownerDocument.defaultView;return t&&t.opener||(t=C),t.getComputedStyle(e)},Be=new RegExp(re.join("|"),"i");function _e(e,t,n){var r,i,o,a,s=e.style;return(n=n||Fe(e))&&(""!==(a=n.getPropertyValue(t)||n[t])||oe(e)||(a=k.style(e,t)),!y.pixelBoxStyles()&&$e.test(a)&&Be.test(t)&&(r=s.width,i=s.minWidth,o=s.maxWidth,s.minWidth=s.maxWidth=s.width=a,a=n.width,s.width=r,s.minWidth=i,s.maxWidth=o)),void 0!==a?a+"":a}function ze(e,t){return{get:function(){if(!e())return(this.get=t).apply(this,arguments);delete this.get}}}!function(){function e(){if(u){s.style.cssText="position:absolute;left:-11111px;width:60px;margin-top:1px;padding:0;border:0",u.style.cssText="position:relative;display:block;box-sizing:border-box;overflow:scroll;margin:auto;border:1px;padding:1px;width:60%;top:1%",ie.appendChild(s).appendChild(u);var e=C.getComputedStyle(u);n="1%"!==e.top,a=12===t(e.marginLeft),u.style.right="60%",o=36===t(e.right),r=36===t(e.width),u.style.position="absolute",i=12===t(u.offsetWidth/3),ie.removeChild(s),u=null}}function t(e){return Math.round(parseFloat(e))}var n,r,i,o,a,s=E.createElement("div"),u=E.createElement("div");u.style&&(u.style.backgroundClip="content-box",u.cloneNode(!0).style.backgroundClip="",y.clearCloneStyle="content-box"===u.style.backgroundClip,k.extend(y,{boxSizingReliable:function(){return e(),r},pixelBoxStyles:function(){return e(),o},pixelPosition:function(){return e(),n},reliableMarginLeft:function(){return e(),a},scrollboxSize:function(){return e(),i}}))}();var Ue=["Webkit","Moz","ms"],Xe=E.createElement("div").style,Ve={};function Ge(e){var t=k.cssProps[e]||Ve[e];return t||(e in Xe?e:Ve[e]=function(e){var t=e[0].toUpperCase()+e.slice(1),n=Ue.length;while(n--)if((e=Ue[n]+t)in Xe)return e}(e)||e)}var Ye=/^(none|table(?!-c[ea]).+)/,Qe=/^--/,Je={position:"absolute",visibility:"hidden",display:"block"},Ke={letterSpacing:"0",fontWeight:"400"};function Ze(e,t,n){var r=ne.exec(t);return r?Math.max(0,r[2]-(n||0))+(r[3]||"px"):t}function et(e,t,n,r,i,o){var a="width"===t?1:0,s=0,u=0;if(n===(r?"border":"content"))return 0;for(;a<4;a+=2)"margin"===n&&(u+=k.css(e,n+re[a],!0,i)),r?("content"===n&&(u-=k.css(e,"padding"+re[a],!0,i)),"margin"!==n&&(u-=k.css(e,"border"+re[a]+"Width",!0,i))):(u+=k.css(e,"padding"+re[a],!0,i),"padding"!==n?u+=k.css(e,"border"+re[a]+"Width",!0,i):s+=k.css(e,"border"+re[a]+"Width",!0,i));return!r&&0<=o&&(u+=Math.max(0,Math.ceil(e["offset"+t[0].toUpperCase()+t.slice(1)]-o-u-s-.5))||0),u}function tt(e,t,n){var r=Fe(e),i=(!y.boxSizingReliable()||n)&&"border-box"===k.css(e,"boxSizing",!1,r),o=i,a=_e(e,t,r),s="offset"+t[0].toUpperCase()+t.slice(1);if($e.test(a)){if(!n)return a;a="auto"}return(!y.boxSizingReliable()&&i||"auto"===a||!parseFloat(a)&&"inline"===k.css(e,"display",!1,r))&&e.getClientRects().length&&(i="border-box"===k.css(e,"boxSizing",!1,r),(o=s in e)&&(a=e[s])),(a=parseFloat(a)||0)+et(e,t,n||(i?"border":"content"),o,r,a)+"px"}function nt(e,t,n,r,i){return new nt.prototype.init(e,t,n,r,i)}k.extend({cssHooks:{opacity:{get:function(e,t){if(t){var n=_e(e,"opacity");return""===n?"1":n}}}},cssNumber:{animationIterationCount:!0,columnCount:!0,fillOpacity:!0,flexGrow:!0,flexShrink:!0,fontWeight:!0,gridArea:!0,gridColumn:!0,gridColumnEnd:!0,gridColumnStart:!0,gridRow:!0,gridRowEnd:!0,gridRowStart:!0,lineHeight:!0,opacity:!0,order:!0,orphans:!0,widows:!0,zIndex:!0,zoom:!0},cssProps:{},style:function(e,t,n,r){if(e&&3!==e.nodeType&&8!==e.nodeType&&e.style){var i,o,a,s=V(t),u=Qe.test(t),l=e.style;if(u||(t=Ge(s)),a=k.cssHooks[t]||k.cssHooks[s],void 0===n)return a&&"get"in a&&void 0!==(i=a.get(e,!1,r))?i:l[t];"string"===(o=typeof n)&&(i=ne.exec(n))&&i[1]&&(n=le(e,t,i),o="number"),null!=n&&n==n&&("number"!==o||u||(n+=i&&i[3]||(k.cssNumber[s]?"":"px")),y.clearCloneStyle||""!==n||0!==t.indexOf("background")||(l[t]="inherit"),a&&"set"in a&&void 0===(n=a.set(e,n,r))||(u?l.setProperty(t,n):l[t]=n))}},css:function(e,t,n,r){var i,o,a,s=V(t);return Qe.test(t)||(t=Ge(s)),(a=k.cssHooks[t]||k.cssHooks[s])&&"get"in a&&(i=a.get(e,!0,n)),void 0===i&&(i=_e(e,t,r)),"normal"===i&&t in Ke&&(i=Ke[t]),""===n||n?(o=parseFloat(i),!0===n||isFinite(o)?o||0:i):i}}),k.each(["height","width"],function(e,u){k.cssHooks[u]={get:function(e,t,n){if(t)return!Ye.test(k.css(e,"display"))||e.getClientRects().length&&e.getBoundingClientRect().width?tt(e,u,n):ue(e,Je,function(){return tt(e,u,n)})},set:function(e,t,n){var r,i=Fe(e),o=!y.scrollboxSize()&&"absolute"===i.position,a=(o||n)&&"border-box"===k.css(e,"boxSizing",!1,i),s=n?et(e,u,n,a,i):0;return a&&o&&(s-=Math.ceil(e["offset"+u[0].toUpperCase()+u.slice(1)]-parseFloat(i[u])-et(e,u,"border",!1,i)-.5)),s&&(r=ne.exec(t))&&"px"!==(r[3]||"px")&&(e.style[u]=t,t=k.css(e,u)),Ze(0,t,s)}}}),k.cssHooks.marginLeft=ze(y.reliableMarginLeft,function(e,t){if(t)return(parseFloat(_e(e,"marginLeft"))||e.getBoundingClientRect().left-ue(e,{marginLeft:0},function(){return e.getBoundingClientRect().left}))+"px"}),k.each({margin:"",padding:"",border:"Width"},function(i,o){k.cssHooks[i+o]={expand:function(e){for(var t=0,n={},r="string"==typeof e?e.split(" "):[e];t<4;t++)n[i+re[t]+o]=r[t]||r[t-2]||r[0];return n}},"margin"!==i&&(k.cssHooks[i+o].set=Ze)}),k.fn.extend({css:function(e,t){return _(this,function(e,t,n){var r,i,o={},a=0;if(Array.isArray(t)){for(r=Fe(e),i=t.length;a<i;a++)o[t[a]]=k.css(e,t[a],!1,r);return o}return void 0!==n?k.style(e,t,n):k.css(e,t)},e,t,1<arguments.length)}}),((k.Tween=nt).prototype={constructor:nt,init:function(e,t,n,r,i,o){this.elem=e,this.prop=n,this.easing=i||k.easing._default,this.options=t,this.start=this.now=this.cur(),this.end=r,this.unit=o||(k.cssNumber[n]?"":"px")},cur:function(){var e=nt.propHooks[this.prop];return e&&e.get?e.get(this):nt.propHooks._default.get(this)},run:function(e){var t,n=nt.propHooks[this.prop];return this.options.duration?this.pos=t=k.easing[this.easing](e,this.options.duration*e,0,1,this.options.duration):this.pos=t=e,this.now=(this.end-this.start)*t+this.start,this.options.step&&this.options.step.call(this.elem,this.now,this),n&&n.set?n.set(this):nt.propHooks._default.set(this),this}}).init.prototype=nt.prototype,(nt.propHooks={_default:{get:function(e){var t;return 1!==e.elem.nodeType||null!=e.elem[e.prop]&&null==e.elem.style[e.prop]?e.elem[e.prop]:(t=k.css(e.elem,e.prop,""))&&"auto"!==t?t:0},set:function(e){k.fx.step[e.prop]?k.fx.step[e.prop](e):1!==e.elem.nodeType||!k.cssHooks[e.prop]&&null==e.elem.style[Ge(e.prop)]?e.elem[e.prop]=e.now:k.style(e.elem,e.prop,e.now+e.unit)}}}).scrollTop=nt.propHooks.scrollLeft={set:function(e){e.elem.nodeType&&e.elem.parentNode&&(e.elem[e.prop]=e.now)}},k.easing={linear:function(e){return e},swing:function(e){return.5-Math.cos(e*Math.PI)/2},_default:"swing"},k.fx=nt.prototype.init,k.fx.step={};var rt,it,ot,at,st=/^(?:toggle|show|hide)$/,ut=/queueHooks$/;function lt(){it&&(!1===E.hidden&&C.requestAnimationFrame?C.requestAnimationFrame(lt):C.setTimeout(lt,k.fx.interval),k.fx.tick())}function ct(){return C.setTimeout(function(){rt=void 0}),rt=Date.now()}function ft(e,t){var n,r=0,i={height:e};for(t=t?1:0;r<4;r+=2-t)i["margin"+(n=re[r])]=i["padding"+n]=e;return t&&(i.opacity=i.width=e),i}function pt(e,t,n){for(var r,i=(dt.tweeners[t]||[]).concat(dt.tweeners["*"]),o=0,a=i.length;o<a;o++)if(r=i[o].call(n,t,e))return r}function dt(o,e,t){var n,a,r=0,i=dt.prefilters.length,s=k.Deferred().always(function(){delete u.elem}),u=function(){if(a)return!1;for(var e=rt||ct(),t=Math.max(0,l.startTime+l.duration-e),n=1-(t/l.duration||0),r=0,i=l.tweens.length;r<i;r++)l.tweens[r].run(n);return s.notifyWith(o,[l,n,t]),n<1&&i?t:(i||s.notifyWith(o,[l,1,0]),s.resolveWith(o,[l]),!1)},l=s.promise({elem:o,props:k.extend({},e),opts:k.extend(!0,{specialEasing:{},easing:k.easing._default},t),originalProperties:e,originalOptions:t,startTime:rt||ct(),duration:t.duration,tweens:[],createTween:function(e,t){var n=k.Tween(o,l.opts,e,t,l.opts.specialEasing[e]||l.opts.easing);return l.tweens.push(n),n},stop:function(e){var t=0,n=e?l.tweens.length:0;if(a)return this;for(a=!0;t<n;t++)l.tweens[t].run(1);return e?(s.notifyWith(o,[l,1,0]),s.resolveWith(o,[l,e])):s.rejectWith(o,[l,e]),this}}),c=l.props;for(!function(e,t){var n,r,i,o,a;for(n in e)if(i=t[r=V(n)],o=e[n],Array.isArray(o)&&(i=o[1],o=e[n]=o[0]),n!==r&&(e[r]=o,delete e[n]),(a=k.cssHooks[r])&&"expand"in a)for(n in o=a.expand(o),delete e[r],o)n in e||(e[n]=o[n],t[n]=i);else t[r]=i}(c,l.opts.specialEasing);r<i;r++)if(n=dt.prefilters[r].call(l,o,c,l.opts))return m(n.stop)&&(k._queueHooks(l.elem,l.opts.queue).stop=n.stop.bind(n)),n;return k.map(c,pt,l),m(l.opts.start)&&l.opts.start.call(o,l),l.progress(l.opts.progress).done(l.opts.done,l.opts.complete).fail(l.opts.fail).always(l.opts.always),k.fx.timer(k.extend(u,{elem:o,anim:l,queue:l.opts.queue})),l}k.Animation=k.extend(dt,{tweeners:{"*":[function(e,t){var n=this.createTween(e,t);return le(n.elem,e,ne.exec(t),n),n}]},tweener:function(e,t){m(e)?(t=e,e=["*"]):e=e.match(R);for(var n,r=0,i=e.length;r<i;r++)n=e[r],dt.tweeners[n]=dt.tweeners[n]||[],dt.tweeners[n].unshift(t)},prefilters:[function(e,t,n){var r,i,o,a,s,u,l,c,f="width"in t||"height"in t,p=this,d={},h=e.style,g=e.nodeType&&se(e),v=Q.get(e,"fxshow");for(r in n.queue||(null==(a=k._queueHooks(e,"fx")).unqueued&&(a.unqueued=0,s=a.empty.fire,a.empty.fire=function(){a.unqueued||s()}),a.unqueued++,p.always(function(){p.always(function(){a.unqueued--,k.queue(e,"fx").length||a.empty.fire()})})),t)if(i=t[r],st.test(i)){if(delete t[r],o=o||"toggle"===i,i===(g?"hide":"show")){if("show"!==i||!v||void 0===v[r])continue;g=!0}d[r]=v&&v[r]||k.style(e,r)}if((u=!k.isEmptyObject(t))||!k.isEmptyObject(d))for(r in f&&1===e.nodeType&&(n.overflow=[h.overflow,h.overflowX,h.overflowY],null==(l=v&&v.display)&&(l=Q.get(e,"display")),"none"===(c=k.css(e,"display"))&&(l?c=l:(fe([e],!0),l=e.style.display||l,c=k.css(e,"display"),fe([e]))),("inline"===c||"inline-block"===c&&null!=l)&&"none"===k.css(e,"float")&&(u||(p.done(function(){h.display=l}),null==l&&(c=h.display,l="none"===c?"":c)),h.display="inline-block")),n.overflow&&(h.overflow="hidden",p.always(function(){h.overflow=n.overflow[0],h.overflowX=n.overflow[1],h.overflowY=n.overflow[2]})),u=!1,d)u||(v?"hidden"in v&&(g=v.hidden):v=Q.access(e,"fxshow",{display:l}),o&&(v.hidden=!g),g&&fe([e],!0),p.done(function(){for(r in g||fe([e]),Q.remove(e,"fxshow"),d)k.style(e,r,d[r])})),u=pt(g?v[r]:0,r,p),r in v||(v[r]=u.start,g&&(u.end=u.start,u.start=0))}],prefilter:function(e,t){t?dt.prefilters.unshift(e):dt.prefilters.push(e)}}),k.speed=function(e,t,n){var r=e&&"object"==typeof e?k.extend({},e):{complete:n||!n&&t||m(e)&&e,duration:e,easing:n&&t||t&&!m(t)&&t};return k.fx.off?r.duration=0:"number"!=typeof r.duration&&(r.duration in k.fx.speeds?r.duration=k.fx.speeds[r.duration]:r.duration=k.fx.speeds._default),null!=r.queue&&!0!==r.queue||(r.queue="fx"),r.old=r.complete,r.complete=function(){m(r.old)&&r.old.call(this),r.queue&&k.dequeue(this,r.queue)},r},k.fn.extend({fadeTo:function(e,t,n,r){return this.filter(se).css("opacity",0).show().end().animate({opacity:t},e,n,r)},animate:function(t,e,n,r){var i=k.isEmptyObject(t),o=k.speed(e,n,r),a=function(){var e=dt(this,k.extend({},t),o);(i||Q.get(this,"finish"))&&e.stop(!0)};return a.finish=a,i||!1===o.queue?this.each(a):this.queue(o.queue,a)},stop:function(i,e,o){var a=function(e){var t=e.stop;delete e.stop,t(o)};return"string"!=typeof i&&(o=e,e=i,i=void 0),e&&!1!==i&&this.queue(i||"fx",[]),this.each(function(){var e=!0,t=null!=i&&i+"queueHooks",n=k.timers,r=Q.get(this);if(t)r[t]&&r[t].stop&&a(r[t]);else for(t in r)r[t]&&r[t].stop&&ut.test(t)&&a(r[t]);for(t=n.length;t--;)n[t].elem!==this||null!=i&&n[t].queue!==i||(n[t].anim.stop(o),e=!1,n.splice(t,1));!e&&o||k.dequeue(this,i)})},finish:function(a){return!1!==a&&(a=a||"fx"),this.each(function(){var e,t=Q.get(this),n=t[a+"queue"],r=t[a+"queueHooks"],i=k.timers,o=n?n.length:0;for(t.finish=!0,k.queue(this,a,[]),r&&r.stop&&r.stop.call(this,!0),e=i.length;e--;)i[e].elem===this&&i[e].queue===a&&(i[e].anim.stop(!0),i.splice(e,1));for(e=0;e<o;e++)n[e]&&n[e].finish&&n[e].finish.call(this);delete t.finish})}}),k.each(["toggle","show","hide"],function(e,r){var i=k.fn[r];k.fn[r]=function(e,t,n){return null==e||"boolean"==typeof e?i.apply(this,arguments):this.animate(ft(r,!0),e,t,n)}}),k.each({slideDown:ft("show"),slideUp:ft("hide"),slideToggle:ft("toggle"),fadeIn:{opacity:"show"},fadeOut:{opacity:"hide"},fadeToggle:{opacity:"toggle"}},function(e,r){k.fn[e]=function(e,t,n){return this.animate(r,e,t,n)}}),k.timers=[],k.fx.tick=function(){var e,t=0,n=k.timers;for(rt=Date.now();t<n.length;t++)(e=n[t])()||n[t]!==e||n.splice(t--,1);n.length||k.fx.stop(),rt=void 0},k.fx.timer=function(e){k.timers.push(e),k.fx.start()},k.fx.interval=13,k.fx.start=function(){it||(it=!0,lt())},k.fx.stop=function(){it=null},k.fx.speeds={slow:600,fast:200,_default:400},k.fn.delay=function(r,e){return r=k.fx&&k.fx.speeds[r]||r,e=e||"fx",this.queue(e,function(e,t){var n=C.setTimeout(e,r);t.stop=function(){C.clearTimeout(n)}})},ot=E.createElement("input"),at=E.createElement("select").appendChild(E.createElement("option")),ot.type="checkbox",y.checkOn=""!==ot.value,y.optSelected=at.selected,(ot=E.createElement("input")).value="t",ot.type="radio",y.radioValue="t"===ot.value;var ht,gt=k.expr.attrHandle;k.fn.extend({attr:function(e,t){return _(this,k.attr,e,t,1<arguments.length)},removeAttr:function(e){return this.each(function(){k.removeAttr(this,e)})}}),k.extend({attr:function(e,t,n){var r,i,o=e.nodeType;if(3!==o&&8!==o&&2!==o)return"undefined"==typeof e.getAttribute?k.prop(e,t,n):(1===o&&k.isXMLDoc(e)||(i=k.attrHooks[t.toLowerCase()]||(k.expr.match.bool.test(t)?ht:void 0)),void 0!==n?null===n?void k.removeAttr(e,t):i&&"set"in i&&void 0!==(r=i.set(e,n,t))?r:(e.setAttribute(t,n+""),n):i&&"get"in i&&null!==(r=i.get(e,t))?r:null==(r=k.find.attr(e,t))?void 0:r)},attrHooks:{type:{set:function(e,t){if(!y.radioValue&&"radio"===t&&A(e,"input")){var n=e.value;return e.setAttribute("type",t),n&&(e.value=n),t}}}},removeAttr:function(e,t){var n,r=0,i=t&&t.match(R);if(i&&1===e.nodeType)while(n=i[r++])e.removeAttribute(n)}}),ht={set:function(e,t,n){return!1===t?k.removeAttr(e,n):e.setAttribute(n,n),n}},k.each(k.expr.match.bool.source.match(/\w+/g),function(e,t){var a=gt[t]||k.find.attr;gt[t]=function(e,t,n){var r,i,o=t.toLowerCase();return n||(i=gt[o],gt[o]=r,r=null!=a(e,t,n)?o:null,gt[o]=i),r}});var vt=/^(?:input|select|textarea|button)$/i,yt=/^(?:a|area)$/i;function mt(e){return(e.match(R)||[]).join(" ")}function xt(e){return e.getAttribute&&e.getAttribute("class")||""}function bt(e){return Array.isArray(e)?e:"string"==typeof e&&e.match(R)||[]}k.fn.extend({prop:function(e,t){return _(this,k.prop,e,t,1<arguments.length)},removeProp:function(e){return this.each(function(){delete this[k.propFix[e]||e]})}}),k.extend({prop:function(e,t,n){var r,i,o=e.nodeType;if(3!==o&&8!==o&&2!==o)return 1===o&&k.isXMLDoc(e)||(t=k.propFix[t]||t,i=k.propHooks[t]),void 0!==n?i&&"set"in i&&void 0!==(r=i.set(e,n,t))?r:e[t]=n:i&&"get"in i&&null!==(r=i.get(e,t))?r:e[t]},propHooks:{tabIndex:{get:function(e){var t=k.find.attr(e,"tabindex");return t?parseInt(t,10):vt.test(e.nodeName)||yt.test(e.nodeName)&&e.href?0:-1}}},propFix:{"for":"htmlFor","class":"className"}}),y.optSelected||(k.propHooks.selected={get:function(e){var t=e.parentNode;return t&&t.parentNode&&t.parentNode.selectedIndex,null},set:function(e){var t=e.parentNode;t&&(t.selectedIndex,t.parentNode&&t.parentNode.selectedIndex)}}),k.each(["tabIndex","readOnly","maxLength","cellSpacing","cellPadding","rowSpan","colSpan","useMap","frameBorder","contentEditable"],function(){k.propFix[this.toLowerCase()]=this}),k.fn.extend({addClass:function(t){var e,n,r,i,o,a,s,u=0;if(m(t))return this.each(function(e){k(this).addClass(t.call(this,e,xt(this)))});if((e=bt(t)).length)while(n=this[u++])if(i=xt(n),r=1===n.nodeType&&" "+mt(i)+" "){a=0;while(o=e[a++])r.indexOf(" "+o+" ")<0&&(r+=o+" ");i!==(s=mt(r))&&n.setAttribute("class",s)}return this},removeClass:function(t){var e,n,r,i,o,a,s,u=0;if(m(t))return this.each(function(e){k(this).removeClass(t.call(this,e,xt(this)))});if(!arguments.length)return this.attr("class","");if((e=bt(t)).length)while(n=this[u++])if(i=xt(n),r=1===n.nodeType&&" "+mt(i)+" "){a=0;while(o=e[a++])while(-1<r.indexOf(" "+o+" "))r=r.replace(" "+o+" "," ");i!==(s=mt(r))&&n.setAttribute("class",s)}return this},toggleClass:function(i,t){var o=typeof i,a="string"===o||Array.isArray(i);return"boolean"==typeof t&&a?t?this.addClass(i):this.removeClass(i):m(i)?this.each(function(e){k(this).toggleClass(i.call(this,e,xt(this),t),t)}):this.each(function(){var e,t,n,r;if(a){t=0,n=k(this),r=bt(i);while(e=r[t++])n.hasClass(e)?n.removeClass(e):n.addClass(e)}else void 0!==i&&"boolean"!==o||((e=xt(this))&&Q.set(this,"__className__",e),this.setAttribute&&this.setAttribute("class",e||!1===i?"":Q.get(this,"__className__")||""))})},hasClass:function(e){var t,n,r=0;t=" "+e+" ";while(n=this[r++])if(1===n.nodeType&&-1<(" "+mt(xt(n))+" ").indexOf(t))return!0;return!1}});var wt=/\r/g;k.fn.extend({val:function(n){var r,e,i,t=this[0];return arguments.length?(i=m(n),this.each(function(e){var t;1===this.nodeType&&(null==(t=i?n.call(this,e,k(this).val()):n)?t="":"number"==typeof t?t+="":Array.isArray(t)&&(t=k.map(t,function(e){return null==e?"":e+""})),(r=k.valHooks[this.type]||k.valHooks[this.nodeName.toLowerCase()])&&"set"in r&&void 0!==r.set(this,t,"value")||(this.value=t))})):t?(r=k.valHooks[t.type]||k.valHooks[t.nodeName.toLowerCase()])&&"get"in r&&void 0!==(e=r.get(t,"value"))?e:"string"==typeof(e=t.value)?e.replace(wt,""):null==e?"":e:void 0}}),k.extend({valHooks:{option:{get:function(e){var t=k.find.attr(e,"value");return null!=t?t:mt(k.text(e))}},select:{get:function(e){var t,n,r,i=e.options,o=e.selectedIndex,a="select-one"===e.type,s=a?null:[],u=a?o+1:i.length;for(r=o<0?u:a?o:0;r<u;r++)if(((n=i[r]).selected||r===o)&&!n.disabled&&(!n.parentNode.disabled||!A(n.parentNode,"optgroup"))){if(t=k(n).val(),a)return t;s.push(t)}return s},set:function(e,t){var n,r,i=e.options,o=k.makeArray(t),a=i.length;while(a--)((r=i[a]).selected=-1<k.inArray(k.valHooks.option.get(r),o))&&(n=!0);return n||(e.selectedIndex=-1),o}}}}),k.each(["radio","checkbox"],function(){k.valHooks[this]={set:function(e,t){if(Array.isArray(t))return e.checked=-1<k.inArray(k(e).val(),t)}},y.checkOn||(k.valHooks[this].get=function(e){return null===e.getAttribute("value")?"on":e.value})}),y.focusin="onfocusin"in C;var Tt=/^(?:focusinfocus|focusoutblur)$/,Ct=function(e){e.stopPropagation()};k.extend(k.event,{trigger:function(e,t,n,r){var i,o,a,s,u,l,c,f,p=[n||E],d=v.call(e,"type")?e.type:e,h=v.call(e,"namespace")?e.namespace.split("."):[];if(o=f=a=n=n||E,3!==n.nodeType&&8!==n.nodeType&&!Tt.test(d+k.event.triggered)&&(-1<d.indexOf(".")&&(d=(h=d.split(".")).shift(),h.sort()),u=d.indexOf(":")<0&&"on"+d,(e=e[k.expando]?e:new k.Event(d,"object"==typeof e&&e)).isTrigger=r?2:3,e.namespace=h.join("."),e.rnamespace=e.namespace?new RegExp("(^|\\.)"+h.join("\\.(?:.*\\.|)")+"(\\.|$)"):null,e.result=void 0,e.target||(e.target=n),t=null==t?[e]:k.makeArray(t,[e]),c=k.event.special[d]||{},r||!c.trigger||!1!==c.trigger.apply(n,t))){if(!r&&!c.noBubble&&!x(n)){for(s=c.delegateType||d,Tt.test(s+d)||(o=o.parentNode);o;o=o.parentNode)p.push(o),a=o;a===(n.ownerDocument||E)&&p.push(a.defaultView||a.parentWindow||C)}i=0;while((o=p[i++])&&!e.isPropagationStopped())f=o,e.type=1<i?s:c.bindType||d,(l=(Q.get(o,"events")||{})[e.type]&&Q.get(o,"handle"))&&l.apply(o,t),(l=u&&o[u])&&l.apply&&G(o)&&(e.result=l.apply(o,t),!1===e.result&&e.preventDefault());return e.type=d,r||e.isDefaultPrevented()||c._default&&!1!==c._default.apply(p.pop(),t)||!G(n)||u&&m(n[d])&&!x(n)&&((a=n[u])&&(n[u]=null),k.event.triggered=d,e.isPropagationStopped()&&f.addEventListener(d,Ct),n[d](),e.isPropagationStopped()&&f.removeEventListener(d,Ct),k.event.triggered=void 0,a&&(n[u]=a)),e.result}},simulate:function(e,t,n){var r=k.extend(new k.Event,n,{type:e,isSimulated:!0});k.event.trigger(r,null,t)}}),k.fn.extend({trigger:function(e,t){return this.each(function(){k.event.trigger(e,t,this)})},triggerHandler:function(e,t){var n=this[0];if(n)return k.event.trigger(e,t,n,!0)}}),y.focusin||k.each({focus:"focusin",blur:"focusout"},function(n,r){var i=function(e){k.event.simulate(r,e.target,k.event.fix(e))};k.event.special[r]={setup:function(){var e=this.ownerDocument||this,t=Q.access(e,r);t||e.addEventListener(n,i,!0),Q.access(e,r,(t||0)+1)},teardown:function(){var e=this.ownerDocument||this,t=Q.access(e,r)-1;t?Q.access(e,r,t):(e.removeEventListener(n,i,!0),Q.remove(e,r))}}});var Et=C.location,kt=Date.now(),St=/\?/;k.parseXML=function(e){var t;if(!e||"string"!=typeof e)return null;try{t=(new C.DOMParser).parseFromString(e,"text/xml")}catch(e){t=void 0}return t&&!t.getElementsByTagName("parsererror").length||k.error("Invalid XML: "+e),t};var Nt=/\[\]$/,At=/\r?\n/g,Dt=/^(?:submit|button|image|reset|file)$/i,jt=/^(?:input|select|textarea|keygen)/i;function qt(n,e,r,i){var t;if(Array.isArray(e))k.each(e,function(e,t){r||Nt.test(n)?i(n,t):qt(n+"["+("object"==typeof t&&null!=t?e:"")+"]",t,r,i)});else if(r||"object"!==w(e))i(n,e);else for(t in e)qt(n+"["+t+"]",e[t],r,i)}k.param=function(e,t){var n,r=[],i=function(e,t){var n=m(t)?t():t;r[r.length]=encodeURIComponent(e)+"="+encodeURIComponent(null==n?"":n)};if(null==e)return"";if(Array.isArray(e)||e.jquery&&!k.isPlainObject(e))k.each(e,function(){i(this.name,this.value)});else for(n in e)qt(n,e[n],t,i);return r.join("&")},k.fn.extend({serialize:function(){return k.param(this.serializeArray())},serializeArray:function(){return this.map(function(){var e=k.prop(this,"elements");return e?k.makeArray(e):this}).filter(function(){var e=this.type;return this.name&&!k(this).is(":disabled")&&jt.test(this.nodeName)&&!Dt.test(e)&&(this.checked||!pe.test(e))}).map(function(e,t){var n=k(this).val();return null==n?null:Array.isArray(n)?k.map(n,function(e){return{name:t.name,value:e.replace(At,"\r\n")}}):{name:t.name,value:n.replace(At,"\r\n")}}).get()}});var Lt=/%20/g,Ht=/#.*$/,Ot=/([?&])_=[^&]*/,Pt=/^(.*?):[ \t]*([^\r\n]*)$/gm,Rt=/^(?:GET|HEAD)$/,Mt=/^\/\//,It={},Wt={},$t="*/".concat("*"),Ft=E.createElement("a");function Bt(o){return function(e,t){"string"!=typeof e&&(t=e,e="*");var n,r=0,i=e.toLowerCase().match(R)||[];if(m(t))while(n=i[r++])"+"===n[0]?(n=n.slice(1)||"*",(o[n]=o[n]||[]).unshift(t)):(o[n]=o[n]||[]).push(t)}}function _t(t,i,o,a){var s={},u=t===Wt;function l(e){var r;return s[e]=!0,k.each(t[e]||[],function(e,t){var n=t(i,o,a);return"string"!=typeof n||u||s[n]?u?!(r=n):void 0:(i.dataTypes.unshift(n),l(n),!1)}),r}return l(i.dataTypes[0])||!s["*"]&&l("*")}function zt(e,t){var n,r,i=k.ajaxSettings.flatOptions||{};for(n in t)void 0!==t[n]&&((i[n]?e:r||(r={}))[n]=t[n]);return r&&k.extend(!0,e,r),e}Ft.href=Et.href,k.extend({active:0,lastModified:{},etag:{},ajaxSettings:{url:Et.href,type:"GET",isLocal:/^(?:about|app|app-storage|.+-extension|file|res|widget):$/.test(Et.protocol),global:!0,processData:!0,async:!0,contentType:"application/x-www-form-urlencoded; charset=UTF-8",accepts:{"*":$t,text:"text/plain",html:"text/html",xml:"application/xml, text/xml",json:"application/json, text/javascript"},contents:{xml:/\bxml\b/,html:/\bhtml/,json:/\bjson\b/},responseFields:{xml:"responseXML",text:"responseText",json:"responseJSON"},converters:{"* text":String,"text html":!0,"text json":JSON.parse,"text xml":k.parseXML},flatOptions:{url:!0,context:!0}},ajaxSetup:function(e,t){return t?zt(zt(e,k.ajaxSettings),t):zt(k.ajaxSettings,e)},ajaxPrefilter:Bt(It),ajaxTransport:Bt(Wt),ajax:function(e,t){"object"==typeof e&&(t=e,e=void 0),t=t||{};var c,f,p,n,d,r,h,g,i,o,v=k.ajaxSetup({},t),y=v.context||v,m=v.context&&(y.nodeType||y.jquery)?k(y):k.event,x=k.Deferred(),b=k.Callbacks("once memory"),w=v.statusCode||{},a={},s={},u="canceled",T={readyState:0,getResponseHeader:function(e){var t;if(h){if(!n){n={};while(t=Pt.exec(p))n[t[1].toLowerCase()+" "]=(n[t[1].toLowerCase()+" "]||[]).concat(t[2])}t=n[e.toLowerCase()+" "]}return null==t?null:t.join(", ")},getAllResponseHeaders:function(){return h?p:null},setRequestHeader:function(e,t){return null==h&&(e=s[e.toLowerCase()]=s[e.toLowerCase()]||e,a[e]=t),this},overrideMimeType:function(e){return null==h&&(v.mimeType=e),this},statusCode:function(e){var t;if(e)if(h)T.always(e[T.status]);else for(t in e)w[t]=[w[t],e[t]];return this},abort:function(e){var t=e||u;return c&&c.abort(t),l(0,t),this}};if(x.promise(T),v.url=((e||v.url||Et.href)+"").replace(Mt,Et.protocol+"//"),v.type=t.method||t.type||v.method||v.type,v.dataTypes=(v.dataType||"*").toLowerCase().match(R)||[""],null==v.crossDomain){r=E.createElement("a");try{r.href=v.url,r.href=r.href,v.crossDomain=Ft.protocol+"//"+Ft.host!=r.protocol+"//"+r.host}catch(e){v.crossDomain=!0}}if(v.data&&v.processData&&"string"!=typeof v.data&&(v.data=k.param(v.data,v.traditional)),_t(It,v,t,T),h)return T;for(i in(g=k.event&&v.global)&&0==k.active++&&k.event.trigger("ajaxStart"),v.type=v.type.toUpperCase(),v.hasContent=!Rt.test(v.type),f=v.url.replace(Ht,""),v.hasContent?v.data&&v.processData&&0===(v.contentType||"").indexOf("application/x-www-form-urlencoded")&&(v.data=v.data.replace(Lt,"+")):(o=v.url.slice(f.length),v.data&&(v.processData||"string"==typeof v.data)&&(f+=(St.test(f)?"&":"?")+v.data,delete v.data),!1===v.cache&&(f=f.replace(Ot,"$1"),o=(St.test(f)?"&":"?")+"_="+kt+++o),v.url=f+o),v.ifModified&&(k.lastModified[f]&&T.setRequestHeader("If-Modified-Since",k.lastModified[f]),k.etag[f]&&T.setRequestHeader("If-None-Match",k.etag[f])),(v.data&&v.hasContent&&!1!==v.contentType||t.contentType)&&T.setRequestHeader("Content-Type",v.contentType),T.setRequestHeader("Accept",v.dataTypes[0]&&v.accepts[v.dataTypes[0]]?v.accepts[v.dataTypes[0]]+("*"!==v.dataTypes[0]?", "+$t+"; q=0.01":""):v.accepts["*"]),v.headers)T.setRequestHeader(i,v.headers[i]);if(v.beforeSend&&(!1===v.beforeSend.call(y,T,v)||h))return T.abort();if(u="abort",b.add(v.complete),T.done(v.success),T.fail(v.error),c=_t(Wt,v,t,T)){if(T.readyState=1,g&&m.trigger("ajaxSend",[T,v]),h)return T;v.async&&0<v.timeout&&(d=C.setTimeout(function(){T.abort("timeout")},v.timeout));try{h=!1,c.send(a,l)}catch(e){if(h)throw e;l(-1,e)}}else l(-1,"No Transport");function l(e,t,n,r){var i,o,a,s,u,l=t;h||(h=!0,d&&C.clearTimeout(d),c=void 0,p=r||"",T.readyState=0<e?4:0,i=200<=e&&e<300||304===e,n&&(s=function(e,t,n){var r,i,o,a,s=e.contents,u=e.dataTypes;while("*"===u[0])u.shift(),void 0===r&&(r=e.mimeType||t.getResponseHeader("Content-Type"));if(r)for(i in s)if(s[i]&&s[i].test(r)){u.unshift(i);break}if(u[0]in n)o=u[0];else{for(i in n){if(!u[0]||e.converters[i+" "+u[0]]){o=i;break}a||(a=i)}o=o||a}if(o)return o!==u[0]&&u.unshift(o),n[o]}(v,T,n)),s=function(e,t,n,r){var i,o,a,s,u,l={},c=e.dataTypes.slice();if(c[1])for(a in e.converters)l[a.toLowerCase()]=e.converters[a];o=c.shift();while(o)if(e.responseFields[o]&&(n[e.responseFields[o]]=t),!u&&r&&e.dataFilter&&(t=e.dataFilter(t,e.dataType)),u=o,o=c.shift())if("*"===o)o=u;else if("*"!==u&&u!==o){if(!(a=l[u+" "+o]||l["* "+o]))for(i in l)if((s=i.split(" "))[1]===o&&(a=l[u+" "+s[0]]||l["* "+s[0]])){!0===a?a=l[i]:!0!==l[i]&&(o=s[0],c.unshift(s[1]));break}if(!0!==a)if(a&&e["throws"])t=a(t);else try{t=a(t)}catch(e){return{state:"parsererror",error:a?e:"No conversion from "+u+" to "+o}}}return{state:"success",data:t}}(v,s,T,i),i?(v.ifModified&&((u=T.getResponseHeader("Last-Modified"))&&(k.lastModified[f]=u),(u=T.getResponseHeader("etag"))&&(k.etag[f]=u)),204===e||"HEAD"===v.type?l="nocontent":304===e?l="notmodified":(l=s.state,o=s.data,i=!(a=s.error))):(a=l,!e&&l||(l="error",e<0&&(e=0))),T.status=e,T.statusText=(t||l)+"",i?x.resolveWith(y,[o,l,T]):x.rejectWith(y,[T,l,a]),T.statusCode(w),w=void 0,g&&m.trigger(i?"ajaxSuccess":"ajaxError",[T,v,i?o:a]),b.fireWith(y,[T,l]),g&&(m.trigger("ajaxComplete",[T,v]),--k.active||k.event.trigger("ajaxStop")))}return T},getJSON:function(e,t,n){return k.get(e,t,n,"json")},getScript:function(e,t){return k.get(e,void 0,t,"script")}}),k.each(["get","post"],function(e,i){k[i]=function(e,t,n,r){return m(t)&&(r=r||n,n=t,t=void 0),k.ajax(k.extend({url:e,type:i,dataType:r,data:t,success:n},k.isPlainObject(e)&&e))}}),k._evalUrl=function(e,t){return k.ajax({url:e,type:"GET",dataType:"script",cache:!0,async:!1,global:!1,converters:{"text script":function(){}},dataFilter:function(e){k.globalEval(e,t)}})},k.fn.extend({wrapAll:function(e){var t;return this[0]&&(m(e)&&(e=e.call(this[0])),t=k(e,this[0].ownerDocument).eq(0).clone(!0),this[0].parentNode&&t.insertBefore(this[0]),t.map(function(){var e=this;while(e.firstElementChild)e=e.firstElementChild;return e}).append(this)),this},wrapInner:function(n){return m(n)?this.each(function(e){k(this).wrapInner(n.call(this,e))}):this.each(function(){var e=k(this),t=e.contents();t.length?t.wrapAll(n):e.append(n)})},wrap:function(t){var n=m(t);return this.each(function(e){k(this).wrapAll(n?t.call(this,e):t)})},unwrap:function(e){return this.parent(e).not("body").each(function(){k(this).replaceWith(this.childNodes)}),this}}),k.expr.pseudos.hidden=function(e){return!k.expr.pseudos.visible(e)},k.expr.pseudos.visible=function(e){return!!(e.offsetWidth||e.offsetHeight||e.getClientRects().length)},k.ajaxSettings.xhr=function(){try{return new C.XMLHttpRequest}catch(e){}};var Ut={0:200,1223:204},Xt=k.ajaxSettings.xhr();y.cors=!!Xt&&"withCredentials"in Xt,y.ajax=Xt=!!Xt,k.ajaxTransport(function(i){var o,a;if(y.cors||Xt&&!i.crossDomain)return{send:function(e,t){var n,r=i.xhr();if(r.open(i.type,i.url,i.async,i.username,i.password),i.xhrFields)for(n in i.xhrFields)r[n]=i.xhrFields[n];for(n in i.mimeType&&r.overrideMimeType&&r.overrideMimeType(i.mimeType),i.crossDomain||e["X-Requested-With"]||(e["X-Requested-With"]="XMLHttpRequest"),e)r.setRequestHeader(n,e[n]);o=function(e){return function(){o&&(o=a=r.onload=r.onerror=r.onabort=r.ontimeout=r.onreadystatechange=null,"abort"===e?r.abort():"error"===e?"number"!=typeof r.status?t(0,"error"):t(r.status,r.statusText):t(Ut[r.status]||r.status,r.statusText,"text"!==(r.responseType||"text")||"string"!=typeof r.responseText?{binary:r.response}:{text:r.responseText},r.getAllResponseHeaders()))}},r.onload=o(),a=r.onerror=r.ontimeout=o("error"),void 0!==r.onabort?r.onabort=a:r.onreadystatechange=function(){4===r.readyState&&C.setTimeout(function(){o&&a()})},o=o("abort");try{r.send(i.hasContent&&i.data||null)}catch(e){if(o)throw e}},abort:function(){o&&o()}}}),k.ajaxPrefilter(function(e){e.crossDomain&&(e.contents.script=!1)}),k.ajaxSetup({accepts:{script:"text/javascript, application/javascript, application/ecmascript, application/x-ecmascript"},contents:{script:/\b(?:java|ecma)script\b/},converters:{"text script":function(e){return k.globalEval(e),e}}}),k.ajaxPrefilter("script",function(e){void 0===e.cache&&(e.cache=!1),e.crossDomain&&(e.type="GET")}),k.ajaxTransport("script",function(n){var r,i;if(n.crossDomain||n.scriptAttrs)return{send:function(e,t){r=k("<script>").attr(n.scriptAttrs||{}).prop({charset:n.scriptCharset,src:n.url}).on("load error",i=function(e){r.remove(),i=null,e&&t("error"===e.type?404:200,e.type)}),E.head.appendChild(r[0])},abort:function(){i&&i()}}});var Vt,Gt=[],Yt=/(=)\?(?=&|$)|\?\?/;k.ajaxSetup({jsonp:"callback",jsonpCallback:function(){var e=Gt.pop()||k.expando+"_"+kt++;return this[e]=!0,e}}),k.ajaxPrefilter("json jsonp",function(e,t,n){var r,i,o,a=!1!==e.jsonp&&(Yt.test(e.url)?"url":"string"==typeof e.data&&0===(e.contentType||"").indexOf("application/x-www-form-urlencoded")&&Yt.test(e.data)&&"data");if(a||"jsonp"===e.dataTypes[0])return r=e.jsonpCallback=m(e.jsonpCallback)?e.jsonpCallback():e.jsonpCallback,a?e[a]=e[a].replace(Yt,"$1"+r):!1!==e.jsonp&&(e.url+=(St.test(e.url)?"&":"?")+e.jsonp+"="+r),e.converters["script json"]=function(){return o||k.error(r+" was not called"),o[0]},e.dataTypes[0]="json",i=C[r],C[r]=function(){o=arguments},n.always(function(){void 0===i?k(C).removeProp(r):C[r]=i,e[r]&&(e.jsonpCallback=t.jsonpCallback,Gt.push(r)),o&&m(i)&&i(o[0]),o=i=void 0}),"script"}),y.createHTMLDocument=((Vt=E.implementation.createHTMLDocument("").body).innerHTML="<form></form><form></form>",2===Vt.childNodes.length),k.parseHTML=function(e,t,n){return"string"!=typeof e?[]:("boolean"==typeof t&&(n=t,t=!1),t||(y.createHTMLDocument?((r=(t=E.implementation.createHTMLDocument("")).createElement("base")).href=E.location.href,t.head.appendChild(r)):t=E),o=!n&&[],(i=D.exec(e))?[t.createElement(i[1])]:(i=we([e],t,o),o&&o.length&&k(o).remove(),k.merge([],i.childNodes)));var r,i,o},k.fn.load=function(e,t,n){var r,i,o,a=this,s=e.indexOf(" ");return-1<s&&(r=mt(e.slice(s)),e=e.slice(0,s)),m(t)?(n=t,t=void 0):t&&"object"==typeof t&&(i="POST"),0<a.length&&k.ajax({url:e,type:i||"GET",dataType:"html",data:t}).done(function(e){o=arguments,a.html(r?k("<div>").append(k.parseHTML(e)).find(r):e)}).always(n&&function(e,t){a.each(function(){n.apply(this,o||[e.responseText,t,e])})}),this},k.each(["ajaxStart","ajaxStop","ajaxComplete","ajaxError","ajaxSuccess","ajaxSend"],function(e,t){k.fn[t]=function(e){return this.on(t,e)}}),k.expr.pseudos.animated=function(t){return k.grep(k.timers,function(e){return t===e.elem}).length},k.offset={setOffset:function(e,t,n){var r,i,o,a,s,u,l=k.css(e,"position"),c=k(e),f={};"static"===l&&(e.style.position="relative"),s=c.offset(),o=k.css(e,"top"),u=k.css(e,"left"),("absolute"===l||"fixed"===l)&&-1<(o+u).indexOf("auto")?(a=(r=c.position()).top,i=r.left):(a=parseFloat(o)||0,i=parseFloat(u)||0),m(t)&&(t=t.call(e,n,k.extend({},s))),null!=t.top&&(f.top=t.top-s.top+a),null!=t.left&&(f.left=t.left-s.left+i),"using"in t?t.using.call(e,f):c.css(f)}},k.fn.extend({offset:function(t){if(arguments.length)return void 0===t?this:this.each(function(e){k.offset.setOffset(this,t,e)});var e,n,r=this[0];return r?r.getClientRects().length?(e=r.getBoundingClientRect(),n=r.ownerDocument.defaultView,{top:e.top+n.pageYOffset,left:e.left+n.pageXOffset}):{top:0,left:0}:void 0},position:function(){if(this[0]){var e,t,n,r=this[0],i={top:0,left:0};if("fixed"===k.css(r,"position"))t=r.getBoundingClientRect();else{t=this.offset(),n=r.ownerDocument,e=r.offsetParent||n.documentElement;while(e&&(e===n.body||e===n.documentElement)&&"static"===k.css(e,"position"))e=e.parentNode;e&&e!==r&&1===e.nodeType&&((i=k(e).offset()).top+=k.css(e,"borderTopWidth",!0),i.left+=k.css(e,"borderLeftWidth",!0))}return{top:t.top-i.top-k.css(r,"marginTop",!0),left:t.left-i.left-k.css(r,"marginLeft",!0)}}},offsetParent:function(){return this.map(function(){var e=this.offsetParent;while(e&&"static"===k.css(e,"position"))e=e.offsetParent;return e||ie})}}),k.each({scrollLeft:"pageXOffset",scrollTop:"pageYOffset"},function(t,i){var o="pageYOffset"===i;k.fn[t]=function(e){return _(this,function(e,t,n){var r;if(x(e)?r=e:9===e.nodeType&&(r=e.defaultView),void 0===n)return r?r[i]:e[t];r?r.scrollTo(o?r.pageXOffset:n,o?n:r.pageYOffset):e[t]=n},t,e,arguments.length)}}),k.each(["top","left"],function(e,n){k.cssHooks[n]=ze(y.pixelPosition,function(e,t){if(t)return t=_e(e,n),$e.test(t)?k(e).position()[n]+"px":t})}),k.each({Height:"height",Width:"width"},function(a,s){k.each({padding:"inner"+a,content:s,"":"outer"+a},function(r,o){k.fn[o]=function(e,t){var n=arguments.length&&(r||"boolean"!=typeof e),i=r||(!0===e||!0===t?"margin":"border");return _(this,function(e,t,n){var r;return x(e)?0===o.indexOf("outer")?e["inner"+a]:e.document.documentElement["client"+a]:9===e.nodeType?(r=e.documentElement,Math.max(e.body["scroll"+a],r["scroll"+a],e.body["offset"+a],r["offset"+a],r["client"+a])):void 0===n?k.css(e,t,i):k.style(e,t,n,i)},s,n?e:void 0,n)}})}),k.each("blur focus focusin focusout resize scroll click dblclick mousedown mouseup mousemove mouseover mouseout mouseenter mouseleave change select submit keydown keypress keyup contextmenu".split(" "),function(e,n){k.fn[n]=function(e,t){return 0<arguments.length?this.on(n,null,e,t):this.trigger(n)}}),k.fn.extend({hover:function(e,t){return this.mouseenter(e).mouseleave(t||e)}}),k.fn.extend({bind:function(e,t,n){return this.on(e,null,t,n)},unbind:function(e,t){return this.off(e,null,t)},delegate:function(e,t,n,r){return this.on(t,e,n,r)},undelegate:function(e,t,n){return 1===arguments.length?this.off(e,"**"):this.off(t,e||"**",n)}}),k.proxy=function(e,t){var n,r,i;if("string"==typeof t&&(n=e[t],t=e,e=n),m(e))return r=s.call(arguments,2),(i=function(){return e.apply(t||this,r.concat(s.call(arguments)))}).guid=e.guid=e.guid||k.guid++,i},k.holdReady=function(e){e?k.readyWait++:k.ready(!0)},k.isArray=Array.isArray,k.parseJSON=JSON.parse,k.nodeName=A,k.isFunction=m,k.isWindow=x,k.camelCase=V,k.type=w,k.now=Date.now,k.isNumeric=function(e){var t=k.type(e);return("number"===t||"string"===t)&&!isNaN(e-parseFloat(e))},"function"==typeof define&&define.amd&&define("jquery",[],function(){return k});var Qt=C.jQuery,Jt=C.$;return k.noConflict=function(e){return C.$===k&&(C.$=Jt),e&&C.jQuery===k&&(C.jQuery=Qt),k},e||(C.jQuery=C.$=k),k});
-/*! jQuery UI - v1.12.1 - 2019-01-27
+/*! jQuery v3.6.0 | (c) OpenJS Foundation and other contributors | jquery.org/license */
+!function(e,t){"use strict";"object"==typeof module&&"object"==typeof module.exports?module.exports=e.document?t(e,!0):function(e){if(!e.document)throw new Error("jQuery requires a window with a document");return t(e)}:t(e)}("undefined"!=typeof window?window:this,function(C,e){"use strict";var t=[],r=Object.getPrototypeOf,s=t.slice,g=t.flat?function(e){return t.flat.call(e)}:function(e){return t.concat.apply([],e)},u=t.push,i=t.indexOf,n={},o=n.toString,v=n.hasOwnProperty,a=v.toString,l=a.call(Object),y={},m=function(e){return"function"==typeof e&&"number"!=typeof e.nodeType&&"function"!=typeof e.item},x=function(e){return null!=e&&e===e.window},E=C.document,c={type:!0,src:!0,nonce:!0,noModule:!0};function b(e,t,n){var r,i,o=(n=n||E).createElement("script");if(o.text=e,t)for(r in c)(i=t[r]||t.getAttribute&&t.getAttribute(r))&&o.setAttribute(r,i);n.head.appendChild(o).parentNode.removeChild(o)}function w(e){return null==e?e+"":"object"==typeof e||"function"==typeof e?n[o.call(e)]||"object":typeof e}
+var f="3.6.0",S=function(e,t){return new S.fn.init(e,t)};function p(e){var t=!!e&&"length"in e&&e.length,n=w(e);return!m(e)&&!x(e)&&("array"===n||0===t||"number"==typeof t&&0<t&&t-1 in e)}S.fn=S.prototype={jquery:f,constructor:S,length:0,toArray:function(){return s.call(this)},get:function(e){return null==e?s.call(this):e<0?this[e+this.length]:this[e]},pushStack:function(e){var t=S.merge(this.constructor(),e);return t.prevObject=this,t},each:function(e){return S.each(this,e)},map:function(n){return this.pushStack(S.map(this,function(e,t){return n.call(e,t,e)}))},slice:function(){return this.pushStack(s.apply(this,arguments))},first:function(){return this.eq(0)},last:function(){return this.eq(-1)},even:function(){return this.pushStack(S.grep(this,function(e,t){return(t+1)%2}))},odd:function(){return this.pushStack(S.grep(this,function(e,t){return t%2}))},eq:function(e){var t=this.length,n=+e+(e<0?t:0);return this.pushStack(0<=n&&n<t?[this[n]]:[])},end:function(){return this.prevObject||this.constructor()},
+push:u,sort:t.sort,splice:t.splice},S.extend=S.fn.extend=function(){var e,t,n,r,i,o,a=arguments[0]||{},s=1,u=arguments.length,l=!1;for("boolean"==typeof a&&(l=a,a=arguments[s]||{},s++),"object"==typeof a||m(a)||(a={}),s===u&&(a=this,s--);s<u;s++)if(null!=(e=arguments[s]))for(t in e)r=e[t],"__proto__"!==t&&a!==r&&(l&&r&&(S.isPlainObject(r)||(i=Array.isArray(r)))?(n=a[t],o=i&&!Array.isArray(n)?[]:i||S.isPlainObject(n)?n:{},i=!1,a[t]=S.extend(l,o,r)):void 0!==r&&(a[t]=r));return a},S.extend({expando:"jQuery"+(f+Math.random()).replace(/\D/g,""),isReady:!0,error:function(e){throw new Error(e)},noop:function(){},isPlainObject:function(e){var t,n;return!(!e||"[object Object]"!==o.call(e))&&(!(t=r(e))||"function"==typeof(n=v.call(t,"constructor")&&t.constructor)&&a.call(n)===l)},isEmptyObject:function(e){var t;for(t in e)return!1;return!0},globalEval:function(e,t,n){b(e,{nonce:t&&t.nonce},n)},each:function(e,t){var n,r=0;if(p(e)){for(n=e.length;r<n;r++)if(!1===t.call(e[r],r,e[r]))break}else for(r in e)if(!1===t.call(
+e[r],r,e[r]))break;return e},makeArray:function(e,t){var n=t||[];return null!=e&&(p(Object(e))?S.merge(n,"string"==typeof e?[e]:e):u.call(n,e)),n},inArray:function(e,t,n){return null==t?-1:i.call(t,e,n)},merge:function(e,t){for(var n=+t.length,r=0,i=e.length;r<n;r++)e[i++]=t[r];return e.length=i,e},grep:function(e,t,n){for(var r=[],i=0,o=e.length,a=!n;i<o;i++)!t(e[i],i)!==a&&r.push(e[i]);return r},map:function(e,t,n){var r,i,o=0,a=[];if(p(e))for(r=e.length;o<r;o++)null!=(i=t(e[o],o,n))&&a.push(i);else for(o in e)null!=(i=t(e[o],o,n))&&a.push(i);return g(a)},guid:1,support:y}),"function"==typeof Symbol&&(S.fn[Symbol.iterator]=t[Symbol.iterator]),S.each("Boolean Number String Function Array Date RegExp Object Error Symbol".split(" "),function(e,t){n["[object "+t+"]"]=t.toLowerCase()});var d=function(n){var e,d,b,o,i,h,f,g,w,u,l,T,C,a,E,v,s,c,y,S="sizzle"+1*new Date,p=n.document,k=0,r=0,m=ue(),x=ue(),A=ue(),N=ue(),j=function(e,t){return e===t&&(l=!0),0},D={}.hasOwnProperty,t=[],q=t.pop,L=t.push,H=t.push,
+O=t.slice,P=function(e,t){for(var n=0,r=e.length;n<r;n++)if(e[n]===t)return n;return-1},R="checked|selected|async|autofocus|autoplay|controls|defer|disabled|hidden|ismap|loop|multiple|open|readonly|required|scoped",M="[\\x20\\t\\r\\n\\f]",I="(?:\\\\[\\da-fA-F]{1,6}"+M+"?|\\\\[^\\r\\n\\f]|[\\w-]|[^\0-\\x7f])+",W="\\["+M+"*("+I+")(?:"+M+"*([*^$|!~]?=)"+M+"*(?:'((?:\\\\.|[^\\\\'])*)'|\"((?:\\\\.|[^\\\\\"])*)\"|("+I+"))|)"+M+"*\\]",F=":("+I+")(?:\\((('((?:\\\\.|[^\\\\'])*)'|\"((?:\\\\.|[^\\\\\"])*)\")|((?:\\\\.|[^\\\\()[\\]]|"+W+")*)|.*)\\)|)",B=new RegExp(M+"+","g"),$=new RegExp("^"+M+"+|((?:^|[^\\\\])(?:\\\\.)*)"+M+"+$","g"),_=new RegExp("^"+M+"*,"+M+"*"),z=new RegExp("^"+M+"*([>+~]|"+M+")"+M+"*"),U=new RegExp(M+"|>"),X=new RegExp(F),V=new RegExp("^"+I+"$"),G={ID:new RegExp("^#("+I+")"),CLASS:new RegExp("^\\.("+I+")"),TAG:new RegExp("^("+I+"|[*])"),ATTR:new RegExp("^"+W),PSEUDO:new RegExp("^"+F),CHILD:new RegExp(
+"^:(only|first|last|nth|nth-last)-(child|of-type)(?:\\("+M+"*(even|odd|(([+-]|)(\\d*)n|)"+M+"*(?:([+-]|)"+M+"*(\\d+)|))"+M+"*\\)|)","i"),bool:new RegExp("^(?:"+R+")$","i"),needsContext:new RegExp("^"+M+"*[>+~]|:(even|odd|eq|gt|lt|nth|first|last)(?:\\("+M+"*((?:-\\d)?\\d*)"+M+"*\\)|)(?=[^-]|$)","i")},Y=/HTML$/i,Q=/^(?:input|select|textarea|button)$/i,J=/^h\d$/i,K=/^[^{]+\{\s*\[native \w/,Z=/^(?:#([\w-]+)|(\w+)|\.([\w-]+))$/,ee=/[+~]/,te=new RegExp("\\\\[\\da-fA-F]{1,6}"+M+"?|\\\\([^\\r\\n\\f])","g"),ne=function(e,t){var n="0x"+e.slice(1)-65536;return t||(n<0?String.fromCharCode(n+65536):String.fromCharCode(n>>10|55296,1023&n|56320))},re=/([\0-\x1f\x7f]|^-?\d)|^-$|[^\0-\x1f\x7f-\uFFFF\w-]/g,ie=function(e,t){return t?"\0"===e?"�":e.slice(0,-1)+"\\"+e.charCodeAt(e.length-1).toString(16)+" ":"\\"+e},oe=function(){T()},ae=be(function(e){return!0===e.disabled&&"fieldset"===e.nodeName.toLowerCase()},{dir:"parentNode",next:"legend"});try{H.apply(t=O.call(p.childNodes),p.childNodes),t[p.childNodes.length].nodeType
+}catch(e){H={apply:t.length?function(e,t){L.apply(e,O.call(t))}:function(e,t){var n=e.length,r=0;while(e[n++]=t[r++]);e.length=n-1}}}function se(t,e,n,r){var i,o,a,s,u,l,c,f=e&&e.ownerDocument,p=e?e.nodeType:9;if(n=n||[],"string"!=typeof t||!t||1!==p&&9!==p&&11!==p)return n;if(!r&&(T(e),e=e||C,E)){if(11!==p&&(u=Z.exec(t)))if(i=u[1]){if(9===p){if(!(a=e.getElementById(i)))return n;if(a.id===i)return n.push(a),n}else if(f&&(a=f.getElementById(i))&&y(e,a)&&a.id===i)return n.push(a),n}else{if(u[2])return H.apply(n,e.getElementsByTagName(t)),n;if((i=u[3])&&d.getElementsByClassName&&e.getElementsByClassName)return H.apply(n,e.getElementsByClassName(i)),n}if(d.qsa&&!N[t+" "]&&(!v||!v.test(t))&&(1!==p||"object"!==e.nodeName.toLowerCase())){if(c=t,f=e,1===p&&(U.test(t)||z.test(t))){(f=ee.test(t)&&ye(e.parentNode)||e)===e&&d.scope||((s=e.getAttribute("id"))?s=s.replace(re,ie):e.setAttribute("id",s=S)),o=(l=h(t)).length;while(o--)l[o]=(s?"#"+s:":scope")+" "+xe(l[o]);c=l.join(",")}try{return H.apply(n,f.querySelectorAll(c
+)),n}catch(e){N(t,!0)}finally{s===S&&e.removeAttribute("id")}}}return g(t.replace($,"$1"),e,n,r)}function ue(){var r=[];return function e(t,n){return r.push(t+" ")>b.cacheLength&&delete e[r.shift()],e[t+" "]=n}}function le(e){return e[S]=!0,e}function ce(e){var t=C.createElement("fieldset");try{return!!e(t)}catch(e){return!1}finally{t.parentNode&&t.parentNode.removeChild(t),t=null}}function fe(e,t){var n=e.split("|"),r=n.length;while(r--)b.attrHandle[n[r]]=t}function pe(e,t){var n=t&&e,r=n&&1===e.nodeType&&1===t.nodeType&&e.sourceIndex-t.sourceIndex;if(r)return r;if(n)while(n=n.nextSibling)if(n===t)return-1;return e?1:-1}function de(t){return function(e){return"input"===e.nodeName.toLowerCase()&&e.type===t}}function he(n){return function(e){var t=e.nodeName.toLowerCase();return("input"===t||"button"===t)&&e.type===n}}function ge(t){return function(e){
+return"form"in e?e.parentNode&&!1===e.disabled?"label"in e?"label"in e.parentNode?e.parentNode.disabled===t:e.disabled===t:e.isDisabled===t||e.isDisabled!==!t&&ae(e)===t:e.disabled===t:"label"in e&&e.disabled===t}}function ve(a){return le(function(o){return o=+o,le(function(e,t){var n,r=a([],e.length,o),i=r.length;while(i--)e[n=r[i]]&&(e[n]=!(t[n]=e[n]))})})}function ye(e){return e&&"undefined"!=typeof e.getElementsByTagName&&e}for(e in d=se.support={},i=se.isXML=function(e){var t=e&&e.namespaceURI,n=e&&(e.ownerDocument||e).documentElement;return!Y.test(t||n&&n.nodeName||"HTML")},T=se.setDocument=function(e){var t,n,r=e?e.ownerDocument||e:p;return r!=C&&9===r.nodeType&&r.documentElement&&(a=(C=r).documentElement,E=!i(C),p!=C&&(n=C.defaultView)&&n.top!==n&&(n.addEventListener?n.addEventListener("unload",oe,!1):n.attachEvent&&n.attachEvent("onunload",oe)),d.scope=ce(function(e){return a.appendChild(e).appendChild(C.createElement("div")),"undefined"!=typeof e.querySelectorAll&&!e.querySelectorAll(
+":scope fieldset div").length}),d.attributes=ce(function(e){return e.className="i",!e.getAttribute("className")}),d.getElementsByTagName=ce(function(e){return e.appendChild(C.createComment("")),!e.getElementsByTagName("*").length}),d.getElementsByClassName=K.test(C.getElementsByClassName),d.getById=ce(function(e){return a.appendChild(e).id=S,!C.getElementsByName||!C.getElementsByName(S).length}),d.getById?(b.filter.ID=function(e){var t=e.replace(te,ne);return function(e){return e.getAttribute("id")===t}},b.find.ID=function(e,t){if("undefined"!=typeof t.getElementById&&E){var n=t.getElementById(e);return n?[n]:[]}}):(b.filter.ID=function(e){var n=e.replace(te,ne);return function(e){var t="undefined"!=typeof e.getAttributeNode&&e.getAttributeNode("id");return t&&t.value===n}},b.find.ID=function(e,t){if("undefined"!=typeof t.getElementById&&E){var n,r,i,o=t.getElementById(e);if(o){if((n=o.getAttributeNode("id"))&&n.value===e)return[o];i=t.getElementsByName(e),r=0;while(o=i[r++])if((n=o.getAttributeNode("id")
+)&&n.value===e)return[o]}return[]}}),b.find.TAG=d.getElementsByTagName?function(e,t){return"undefined"!=typeof t.getElementsByTagName?t.getElementsByTagName(e):d.qsa?t.querySelectorAll(e):void 0}:function(e,t){var n,r=[],i=0,o=t.getElementsByTagName(e);if("*"===e){while(n=o[i++])1===n.nodeType&&r.push(n);return r}return o},b.find.CLASS=d.getElementsByClassName&&function(e,t){if("undefined"!=typeof t.getElementsByClassName&&E)return t.getElementsByClassName(e)},s=[],v=[],(d.qsa=K.test(C.querySelectorAll))&&(ce(function(e){var t;a.appendChild(e).innerHTML="<a id='"+S+"'></a><select id='"+S+"-\r\\' msallowcapture=''><option selected=''></option></select>",e.querySelectorAll("[msallowcapture^='']").length&&v.push("[*^$]="+M+"*(?:''|\"\")"),e.querySelectorAll("[selected]").length||v.push("\\["+M+"*(?:value|"+R+")"),e.querySelectorAll("[id~="+S+"-]").length||v.push("~="),(t=C.createElement("input")).setAttribute("name",""),e.appendChild(t),e.querySelectorAll("[name='']").length||v.push(
+"\\["+M+"*name"+M+"*="+M+"*(?:''|\"\")"),e.querySelectorAll(":checked").length||v.push(":checked"),e.querySelectorAll("a#"+S+"+*").length||v.push(".#.+[+~]"),e.querySelectorAll("\\\f"),v.push("[\\r\\n\\f]")}),ce(function(e){e.innerHTML="<a href='' disabled='disabled'></a><select disabled='disabled'><option/></select>";var t=C.createElement("input");t.setAttribute("type","hidden"),e.appendChild(t).setAttribute("name","D"),e.querySelectorAll("[name=d]").length&&v.push("name"+M+"*[*^$|!~]?="),2!==e.querySelectorAll(":enabled").length&&v.push(":enabled",":disabled"),a.appendChild(e).disabled=!0,2!==e.querySelectorAll(":disabled").length&&v.push(":enabled",":disabled"),e.querySelectorAll("*,:x"),v.push(",.*:")})),(d.matchesSelector=K.test(c=a.matches||a.webkitMatchesSelector||a.mozMatchesSelector||a.oMatchesSelector||a.msMatchesSelector))&&ce(function(e){d.disconnectedMatch=c.call(e,"*"),c.call(e,"[s!='']:x"),s.push("!=",F)}),v=v.length&&new RegExp(v.join("|")),s=s.length&&new RegExp(s.join("|")),t=K.test(
+a.compareDocumentPosition),y=t||K.test(a.contains)?function(e,t){var n=9===e.nodeType?e.documentElement:e,r=t&&t.parentNode;return e===r||!(!r||1!==r.nodeType||!(n.contains?n.contains(r):e.compareDocumentPosition&&16&e.compareDocumentPosition(r)))}:function(e,t){if(t)while(t=t.parentNode)if(t===e)return!0;return!1},j=t?function(e,t){if(e===t)return l=!0,0;var n=!e.compareDocumentPosition-!t.compareDocumentPosition;return n||(1&(n=(e.ownerDocument||e)==(t.ownerDocument||t)?e.compareDocumentPosition(t):1)||!d.sortDetached&&t.compareDocumentPosition(e)===n?e==C||e.ownerDocument==p&&y(p,e)?-1:t==C||t.ownerDocument==p&&y(p,t)?1:u?P(u,e)-P(u,t):0:4&n?-1:1)}:function(e,t){if(e===t)return l=!0,0;var n,r=0,i=e.parentNode,o=t.parentNode,a=[e],s=[t];if(!i||!o)return e==C?-1:t==C?1:i?-1:o?1:u?P(u,e)-P(u,t):0;if(i===o)return pe(e,t);n=e;while(n=n.parentNode)a.unshift(n);n=t;while(n=n.parentNode)s.unshift(n);while(a[r]===s[r])r++;return r?pe(a[r],s[r]):a[r]==p?-1:s[r]==p?1:0}),C},se.matches=function(e,t){return se(e,null,
+null,t)},se.matchesSelector=function(e,t){if(T(e),d.matchesSelector&&E&&!N[t+" "]&&(!s||!s.test(t))&&(!v||!v.test(t)))try{var n=c.call(e,t);if(n||d.disconnectedMatch||e.document&&11!==e.document.nodeType)return n}catch(e){N(t,!0)}return 0<se(t,C,null,[e]).length},se.contains=function(e,t){return(e.ownerDocument||e)!=C&&T(e),y(e,t)},se.attr=function(e,t){(e.ownerDocument||e)!=C&&T(e);var n=b.attrHandle[t.toLowerCase()],r=n&&D.call(b.attrHandle,t.toLowerCase())?n(e,t,!E):void 0;return void 0!==r?r:d.attributes||!E?e.getAttribute(t):(r=e.getAttributeNode(t))&&r.specified?r.value:null},se.escape=function(e){return(e+"").replace(re,ie)},se.error=function(e){throw new Error("Syntax error, unrecognized expression: "+e)},se.uniqueSort=function(e){var t,n=[],r=0,i=0;if(l=!d.detectDuplicates,u=!d.sortStable&&e.slice(0),e.sort(j),l){while(t=e[i++])t===e[i]&&(r=n.push(i));while(r--)e.splice(n[r],1)}return u=null,e},o=se.getText=function(e){var t,n="",r=0,i=e.nodeType;if(i){if(1===i||9===i||11===i){if(
+"string"==typeof e.textContent)return e.textContent;for(e=e.firstChild;e;e=e.nextSibling)n+=o(e)}else if(3===i||4===i)return e.nodeValue}else while(t=e[r++])n+=o(t);return n},(b=se.selectors={cacheLength:50,createPseudo:le,match:G,attrHandle:{},find:{},relative:{">":{dir:"parentNode",first:!0}," ":{dir:"parentNode"},"+":{dir:"previousSibling",first:!0},"~":{dir:"previousSibling"}},preFilter:{ATTR:function(e){return e[1]=e[1].replace(te,ne),e[3]=(e[3]||e[4]||e[5]||"").replace(te,ne),"~="===e[2]&&(e[3]=" "+e[3]+" "),e.slice(0,4)},CHILD:function(e){return e[1]=e[1].toLowerCase(),"nth"===e[1].slice(0,3)?(e[3]||se.error(e[0]),e[4]=+(e[4]?e[5]+(e[6]||1):2*("even"===e[3]||"odd"===e[3])),e[5]=+(e[7]+e[8]||"odd"===e[3])):e[3]&&se.error(e[0]),e},PSEUDO:function(e){var t,n=!e[6]&&e[2];return G.CHILD.test(e[0])?null:(e[3]?e[2]=e[4]||e[5]||"":n&&X.test(n)&&(t=h(n,!0))&&(t=n.indexOf(")",n.length-t)-n.length)&&(e[0]=e[0].slice(0,t),e[2]=n.slice(0,t)),e.slice(0,3))}},filter:{TAG:function(e){var t=e.replace(te,ne
+).toLowerCase();return"*"===e?function(){return!0}:function(e){return e.nodeName&&e.nodeName.toLowerCase()===t}},CLASS:function(e){var t=m[e+" "];return t||(t=new RegExp("(^|"+M+")"+e+"("+M+"|$)"))&&m(e,function(e){return t.test("string"==typeof e.className&&e.className||"undefined"!=typeof e.getAttribute&&e.getAttribute("class")||"")})},ATTR:function(n,r,i){return function(e){var t=se.attr(e,n);return null==t?"!="===r:!r||(t+="","="===r?t===i:"!="===r?t!==i:"^="===r?i&&0===t.indexOf(i):"*="===r?i&&-1<t.indexOf(i):"$="===r?i&&t.slice(-i.length)===i:"~="===r?-1<(" "+t.replace(B," ")+" ").indexOf(i):"|="===r&&(t===i||t.slice(0,i.length+1)===i+"-"))}},CHILD:function(h,e,t,g,v){var y="nth"!==h.slice(0,3),m="last"!==h.slice(-4),x="of-type"===e;return 1===g&&0===v?function(e){return!!e.parentNode}:function(e,t,n){var r,i,o,a,s,u,l=y!==m?"nextSibling":"previousSibling",c=e.parentNode,f=x&&e.nodeName.toLowerCase(),p=!n&&!x,d=!1;if(c){if(y){while(l){a=e;while(a=a[l])if(x?a.nodeName.toLowerCase()===f:1===a.nodeType
+)return!1;u=l="only"===h&&!u&&"nextSibling"}return!0}if(u=[m?c.firstChild:c.lastChild],m&&p){d=(s=(r=(i=(o=(a=c)[S]||(a[S]={}))[a.uniqueID]||(o[a.uniqueID]={}))[h]||[])[0]===k&&r[1])&&r[2],a=s&&c.childNodes[s];while(a=++s&&a&&a[l]||(d=s=0)||u.pop())if(1===a.nodeType&&++d&&a===e){i[h]=[k,s,d];break}}else if(p&&(d=s=(r=(i=(o=(a=e)[S]||(a[S]={}))[a.uniqueID]||(o[a.uniqueID]={}))[h]||[])[0]===k&&r[1]),!1===d)while(a=++s&&a&&a[l]||(d=s=0)||u.pop())if((x?a.nodeName.toLowerCase()===f:1===a.nodeType)&&++d&&(p&&((i=(o=a[S]||(a[S]={}))[a.uniqueID]||(o[a.uniqueID]={}))[h]=[k,d]),a===e))break;return(d-=v)===g||d%g==0&&0<=d/g}}},PSEUDO:function(e,o){var t,a=b.pseudos[e]||b.setFilters[e.toLowerCase()]||se.error("unsupported pseudo: "+e);return a[S]?a(o):1<a.length?(t=[e,e,"",o],b.setFilters.hasOwnProperty(e.toLowerCase())?le(function(e,t){var n,r=a(e,o),i=r.length;while(i--)e[n=P(e,r[i])]=!(t[n]=r[i])}):function(e){return a(e,0,t)}):a}},pseudos:{not:le(function(e){var r=[],i=[],s=f(e.replace($,"$1"));return s[S]?le(
+function(e,t,n,r){var i,o=s(e,null,r,[]),a=e.length;while(a--)(i=o[a])&&(e[a]=!(t[a]=i))}):function(e,t,n){return r[0]=e,s(r,null,n,i),r[0]=null,!i.pop()}}),has:le(function(t){return function(e){return 0<se(t,e).length}}),contains:le(function(t){return t=t.replace(te,ne),function(e){return-1<(e.textContent||o(e)).indexOf(t)}}),lang:le(function(n){return V.test(n||"")||se.error("unsupported lang: "+n),n=n.replace(te,ne).toLowerCase(),function(e){var t;do{if(t=E?e.lang:e.getAttribute("xml:lang")||e.getAttribute("lang"))return(t=t.toLowerCase())===n||0===t.indexOf(n+"-")}while((e=e.parentNode)&&1===e.nodeType);return!1}}),target:function(e){var t=n.location&&n.location.hash;return t&&t.slice(1)===e.id},root:function(e){return e===a},focus:function(e){return e===C.activeElement&&(!C.hasFocus||C.hasFocus())&&!!(e.type||e.href||~e.tabIndex)},enabled:ge(!1),disabled:ge(!0),checked:function(e){var t=e.nodeName.toLowerCase();return"input"===t&&!!e.checked||"option"===t&&!!e.selected},selected:function(e){
+return e.parentNode&&e.parentNode.selectedIndex,!0===e.selected},empty:function(e){for(e=e.firstChild;e;e=e.nextSibling)if(e.nodeType<6)return!1;return!0},parent:function(e){return!b.pseudos.empty(e)},header:function(e){return J.test(e.nodeName)},input:function(e){return Q.test(e.nodeName)},button:function(e){var t=e.nodeName.toLowerCase();return"input"===t&&"button"===e.type||"button"===t},text:function(e){var t;return"input"===e.nodeName.toLowerCase()&&"text"===e.type&&(null==(t=e.getAttribute("type"))||"text"===t.toLowerCase())},first:ve(function(){return[0]}),last:ve(function(e,t){return[t-1]}),eq:ve(function(e,t,n){return[n<0?n+t:n]}),even:ve(function(e,t){for(var n=0;n<t;n+=2)e.push(n);return e}),odd:ve(function(e,t){for(var n=1;n<t;n+=2)e.push(n);return e}),lt:ve(function(e,t,n){for(var r=n<0?n+t:t<n?t:n;0<=--r;)e.push(r);return e}),gt:ve(function(e,t,n){for(var r=n<0?n+t:n;++r<t;)e.push(r);return e})}}).pseudos.nth=b.pseudos.eq,{radio:!0,checkbox:!0,file:!0,password:!0,image:!0})b.pseudos[e]=de(e);
+for(e in{submit:!0,reset:!0})b.pseudos[e]=he(e);function me(){}function xe(e){for(var t=0,n=e.length,r="";t<n;t++)r+=e[t].value;return r}function be(s,e,t){var u=e.dir,l=e.next,c=l||u,f=t&&"parentNode"===c,p=r++;return e.first?function(e,t,n){while(e=e[u])if(1===e.nodeType||f)return s(e,t,n);return!1}:function(e,t,n){var r,i,o,a=[k,p];if(n){while(e=e[u])if((1===e.nodeType||f)&&s(e,t,n))return!0}else while(e=e[u])if(1===e.nodeType||f)if(i=(o=e[S]||(e[S]={}))[e.uniqueID]||(o[e.uniqueID]={}),l&&l===e.nodeName.toLowerCase())e=e[u]||e;else{if((r=i[c])&&r[0]===k&&r[1]===p)return a[2]=r[2];if((i[c]=a)[2]=s(e,t,n))return!0}return!1}}function we(i){return 1<i.length?function(e,t,n){var r=i.length;while(r--)if(!i[r](e,t,n))return!1;return!0}:i[0]}function Te(e,t,n,r,i){for(var o,a=[],s=0,u=e.length,l=null!=t;s<u;s++)(o=e[s])&&(n&&!n(o,r,i)||(a.push(o),l&&t.push(s)));return a}function Ce(d,h,g,v,y,e){return v&&!v[S]&&(v=Ce(v)),y&&!y[S]&&(y=Ce(y,e)),le(function(e,t,n,r){var i,o,a,s=[],u=[],l=t.length,c=e||function(e,t,n
+){for(var r=0,i=t.length;r<i;r++)se(e,t[r],n);return n}(h||"*",n.nodeType?[n]:n,[]),f=!d||!e&&h?c:Te(c,s,d,n,r),p=g?y||(e?d:l||v)?[]:t:f;if(g&&g(f,p,n,r),v){i=Te(p,u),v(i,[],n,r),o=i.length;while(o--)(a=i[o])&&(p[u[o]]=!(f[u[o]]=a))}if(e){if(y||d){if(y){i=[],o=p.length;while(o--)(a=p[o])&&i.push(f[o]=a);y(null,p=[],i,r)}o=p.length;while(o--)(a=p[o])&&-1<(i=y?P(e,a):s[o])&&(e[i]=!(t[i]=a))}}else p=Te(p===t?p.splice(l,p.length):p),y?y(null,t,p,r):H.apply(t,p)})}function Ee(e){for(var i,t,n,r=e.length,o=b.relative[e[0].type],a=o||b.relative[" "],s=o?1:0,u=be(function(e){return e===i},a,!0),l=be(function(e){return-1<P(i,e)},a,!0),c=[function(e,t,n){var r=!o&&(n||t!==w)||((i=t).nodeType?u(e,t,n):l(e,t,n));return i=null,r}];s<r;s++)if(t=b.relative[e[s].type])c=[be(we(c),t)];else{if((t=b.filter[e[s].type].apply(null,e[s].matches))[S]){for(n=++s;n<r;n++)if(b.relative[e[n].type])break;return Ce(1<s&&we(c),1<s&&xe(e.slice(0,s-1).concat({value:" "===e[s-2].type?"*":""})).replace($,"$1"),t,s<n&&Ee(e.slice(s,n)),n<r&&Ee(
+e=e.slice(n)),n<r&&xe(e))}c.push(t)}return we(c)}return me.prototype=b.filters=b.pseudos,b.setFilters=new me,h=se.tokenize=function(e,t){var n,r,i,o,a,s,u,l=x[e+" "];if(l)return t?0:l.slice(0);a=e,s=[],u=b.preFilter;while(a){for(o in n&&!(r=_.exec(a))||(r&&(a=a.slice(r[0].length)||a),s.push(i=[])),n=!1,(r=z.exec(a))&&(n=r.shift(),i.push({value:n,type:r[0].replace($," ")}),a=a.slice(n.length)),b.filter)!(r=G[o].exec(a))||u[o]&&!(r=u[o](r))||(n=r.shift(),i.push({value:n,type:o,matches:r}),a=a.slice(n.length));if(!n)break}return t?a.length:a?se.error(e):x(e,s).slice(0)},f=se.compile=function(e,t){var n,v,y,m,x,r,i=[],o=[],a=A[e+" "];if(!a){t||(t=h(e)),n=t.length;while(n--)(a=Ee(t[n]))[S]?i.push(a):o.push(a);(a=A(e,(v=o,m=0<(y=i).length,x=0<v.length,r=function(e,t,n,r,i){var o,a,s,u=0,l="0",c=e&&[],f=[],p=w,d=e||x&&b.find.TAG("*",i),h=k+=null==p?1:Math.random()||.1,g=d.length;for(i&&(w=t==C||t||i);l!==g&&null!=(o=d[l]);l++){if(x&&o){a=0,t||o.ownerDocument==C||(T(o),n=!E);while(s=v[a++])if(s(o,t||C,n)){r.push(o);
+break}i&&(k=h)}m&&((o=!s&&o)&&u--,e&&c.push(o))}if(u+=l,m&&l!==u){a=0;while(s=y[a++])s(c,f,t,n);if(e){if(0<u)while(l--)c[l]||f[l]||(f[l]=q.call(r));f=Te(f)}H.apply(r,f),i&&!e&&0<f.length&&1<u+y.length&&se.uniqueSort(r)}return i&&(k=h,w=p),c},m?le(r):r))).selector=e}return a},g=se.select=function(e,t,n,r){var i,o,a,s,u,l="function"==typeof e&&e,c=!r&&h(e=l.selector||e);if(n=n||[],1===c.length){if(2<(o=c[0]=c[0].slice(0)).length&&"ID"===(a=o[0]).type&&9===t.nodeType&&E&&b.relative[o[1].type]){if(!(t=(b.find.ID(a.matches[0].replace(te,ne),t)||[])[0]))return n;l&&(t=t.parentNode),e=e.slice(o.shift().value.length)}i=G.needsContext.test(e)?0:o.length;while(i--){if(a=o[i],b.relative[s=a.type])break;if((u=b.find[s])&&(r=u(a.matches[0].replace(te,ne),ee.test(o[0].type)&&ye(t.parentNode)||t))){if(o.splice(i,1),!(e=r.length&&xe(o)))return H.apply(n,r),n;break}}}return(l||f(e,c))(r,t,!E,n,!t||ee.test(e)&&ye(t.parentNode)||t),n},d.sortStable=S.split("").sort(j).join("")===S,d.detectDuplicates=!!l,T(),d.sortDetached=ce(
+function(e){return 1&e.compareDocumentPosition(C.createElement("fieldset"))}),ce(function(e){return e.innerHTML="<a href='#'></a>","#"===e.firstChild.getAttribute("href")})||fe("type|href|height|width",function(e,t,n){if(!n)return e.getAttribute(t,"type"===t.toLowerCase()?1:2)}),d.attributes&&ce(function(e){return e.innerHTML="<input/>",e.firstChild.setAttribute("value",""),""===e.firstChild.getAttribute("value")})||fe("value",function(e,t,n){if(!n&&"input"===e.nodeName.toLowerCase())return e.defaultValue}),ce(function(e){return null==e.getAttribute("disabled")})||fe(R,function(e,t,n){var r;if(!n)return!0===e[t]?t.toLowerCase():(r=e.getAttributeNode(t))&&r.specified?r.value:null}),se}(C);S.find=d,S.expr=d.selectors,S.expr[":"]=S.expr.pseudos,S.uniqueSort=S.unique=d.uniqueSort,S.text=d.getText,S.isXMLDoc=d.isXML,S.contains=d.contains,S.escapeSelector=d.escape;var h=function(e,t,n){var r=[],i=void 0!==n;while((e=e[t])&&9!==e.nodeType)if(1===e.nodeType){if(i&&S(e).is(n))break;r.push(e)}return r},T=function(e,t){
+for(var n=[];e;e=e.nextSibling)1===e.nodeType&&e!==t&&n.push(e);return n},k=S.expr.match.needsContext;function A(e,t){return e.nodeName&&e.nodeName.toLowerCase()===t.toLowerCase()}var N=/^<([a-z][^\/\0>:\x20\t\r\n\f]*)[\x20\t\r\n\f]*\/?>(?:<\/\1>|)$/i;function j(e,n,r){return m(n)?S.grep(e,function(e,t){return!!n.call(e,t,e)!==r}):n.nodeType?S.grep(e,function(e){return e===n!==r}):"string"!=typeof n?S.grep(e,function(e){return-1<i.call(n,e)!==r}):S.filter(n,e,r)}S.filter=function(e,t,n){var r=t[0];return n&&(e=":not("+e+")"),1===t.length&&1===r.nodeType?S.find.matchesSelector(r,e)?[r]:[]:S.find.matches(e,S.grep(t,function(e){return 1===e.nodeType}))},S.fn.extend({find:function(e){var t,n,r=this.length,i=this;if("string"!=typeof e)return this.pushStack(S(e).filter(function(){for(t=0;t<r;t++)if(S.contains(i[t],this))return!0}));for(n=this.pushStack([]),t=0;t<r;t++)S.find(e,i[t],n);return 1<r?S.uniqueSort(n):n},filter:function(e){return this.pushStack(j(this,e||[],!1))},not:function(e){return this.pushStack(j(
+this,e||[],!0))},is:function(e){return!!j(this,"string"==typeof e&&k.test(e)?S(e):e||[],!1).length}});var D,q=/^(?:\s*(<[\w\W]+>)[^>]*|#([\w-]+))$/;(S.fn.init=function(e,t,n){var r,i;if(!e)return this;if(n=n||D,"string"==typeof e){if(!(r="<"===e[0]&&">"===e[e.length-1]&&3<=e.length?[null,e,null]:q.exec(e))||!r[1]&&t)return!t||t.jquery?(t||n).find(e):this.constructor(t).find(e);if(r[1]){if(t=t instanceof S?t[0]:t,S.merge(this,S.parseHTML(r[1],t&&t.nodeType?t.ownerDocument||t:E,!0)),N.test(r[1])&&S.isPlainObject(t))for(r in t)m(this[r])?this[r](t[r]):this.attr(r,t[r]);return this}return(i=E.getElementById(r[2]))&&(this[0]=i,this.length=1),this}return e.nodeType?(this[0]=e,this.length=1,this):m(e)?void 0!==n.ready?n.ready(e):e(S):S.makeArray(e,this)}).prototype=S.fn,D=S(E);var L=/^(?:parents|prev(?:Until|All))/,H={children:!0,contents:!0,next:!0,prev:!0};function O(e,t){while((e=e[t])&&1!==e.nodeType);return e}S.fn.extend({has:function(e){var t=S(e,this),n=t.length;return this.filter(function(){for(
+var e=0;e<n;e++)if(S.contains(this,t[e]))return!0})},closest:function(e,t){var n,r=0,i=this.length,o=[],a="string"!=typeof e&&S(e);if(!k.test(e))for(;r<i;r++)for(n=this[r];n&&n!==t;n=n.parentNode)if(n.nodeType<11&&(a?-1<a.index(n):1===n.nodeType&&S.find.matchesSelector(n,e))){o.push(n);break}return this.pushStack(1<o.length?S.uniqueSort(o):o)},index:function(e){return e?"string"==typeof e?i.call(S(e),this[0]):i.call(this,e.jquery?e[0]:e):this[0]&&this[0].parentNode?this.first().prevAll().length:-1},add:function(e,t){return this.pushStack(S.uniqueSort(S.merge(this.get(),S(e,t))))},addBack:function(e){return this.add(null==e?this.prevObject:this.prevObject.filter(e))}}),S.each({parent:function(e){var t=e.parentNode;return t&&11!==t.nodeType?t:null},parents:function(e){return h(e,"parentNode")},parentsUntil:function(e,t,n){return h(e,"parentNode",n)},next:function(e){return O(e,"nextSibling")},prev:function(e){return O(e,"previousSibling")},nextAll:function(e){return h(e,"nextSibling")},prevAll:function(e){
+return h(e,"previousSibling")},nextUntil:function(e,t,n){return h(e,"nextSibling",n)},prevUntil:function(e,t,n){return h(e,"previousSibling",n)},siblings:function(e){return T((e.parentNode||{}).firstChild,e)},children:function(e){return T(e.firstChild)},contents:function(e){return null!=e.contentDocument&&r(e.contentDocument)?e.contentDocument:(A(e,"template")&&(e=e.content||e),S.merge([],e.childNodes))}},function(r,i){S.fn[r]=function(e,t){var n=S.map(this,i,e);return"Until"!==r.slice(-5)&&(t=e),t&&"string"==typeof t&&(n=S.filter(t,n)),1<this.length&&(H[r]||S.uniqueSort(n),L.test(r)&&n.reverse()),this.pushStack(n)}});var P=/[^\x20\t\r\n\f]+/g;function R(e){return e}function M(e){throw e}function I(e,t,n,r){var i;try{e&&m(i=e.promise)?i.call(e).done(t).fail(n):e&&m(i=e.then)?i.call(e,t,n):t.apply(void 0,[e].slice(r))}catch(e){n.apply(void 0,[e])}}S.Callbacks=function(r){var e,n;r="string"==typeof r?(e=r,n={},S.each(e.match(P)||[],function(e,t){n[t]=!0}),n):S.extend({},r);var i,t,o,a,s=[],u=[],l=-1,c=function(
+){for(a=a||r.once,o=i=!0;u.length;l=-1){t=u.shift();while(++l<s.length)!1===s[l].apply(t[0],t[1])&&r.stopOnFalse&&(l=s.length,t=!1)}r.memory||(t=!1),i=!1,a&&(s=t?[]:"")},f={add:function(){return s&&(t&&!i&&(l=s.length-1,u.push(t)),function n(e){S.each(e,function(e,t){m(t)?r.unique&&f.has(t)||s.push(t):t&&t.length&&"string"!==w(t)&&n(t)})}(arguments),t&&!i&&c()),this},remove:function(){return S.each(arguments,function(e,t){var n;while(-1<(n=S.inArray(t,s,n)))s.splice(n,1),n<=l&&l--}),this},has:function(e){return e?-1<S.inArray(e,s):0<s.length},empty:function(){return s&&(s=[]),this},disable:function(){return a=u=[],s=t="",this},disabled:function(){return!s},lock:function(){return a=u=[],t||i||(s=t=""),this},locked:function(){return!!a},fireWith:function(e,t){return a||(t=[e,(t=t||[]).slice?t.slice():t],u.push(t),i||c()),this},fire:function(){return f.fireWith(this,arguments),this},fired:function(){return!!o}};return f},S.extend({Deferred:function(e){var o=[["notify","progress",S.Callbacks("memory"),
+S.Callbacks("memory"),2],["resolve","done",S.Callbacks("once memory"),S.Callbacks("once memory"),0,"resolved"],["reject","fail",S.Callbacks("once memory"),S.Callbacks("once memory"),1,"rejected"]],i="pending",a={state:function(){return i},always:function(){return s.done(arguments).fail(arguments),this},catch:function(e){return a.then(null,e)},pipe:function(){var i=arguments;return S.Deferred(function(r){S.each(o,function(e,t){var n=m(i[t[4]])&&i[t[4]];s[t[1]](function(){var e=n&&n.apply(this,arguments);e&&m(e.promise)?e.promise().progress(r.notify).done(r.resolve).fail(r.reject):r[t[0]+"With"](this,n?[e]:arguments)})}),i=null}).promise()},then:function(t,n,r){var u=0;function l(i,o,a,s){return function(){var n=this,r=arguments,e=function(){var e,t;if(!(i<u)){if((e=a.apply(n,r))===o.promise())throw new TypeError("Thenable self-resolution");t=e&&("object"==typeof e||"function"==typeof e)&&e.then,m(t)?s?t.call(e,l(u,o,R,s),l(u,o,M,s)):(u++,t.call(e,l(u,o,R,s),l(u,o,M,s),l(u,o,R,o.notifyWith))):(a!==R&&(n=void 0,
+r=[e]),(s||o.resolveWith)(n,r))}},t=s?e:function(){try{e()}catch(e){S.Deferred.exceptionHook&&S.Deferred.exceptionHook(e,t.stackTrace),u<=i+1&&(a!==M&&(n=void 0,r=[e]),o.rejectWith(n,r))}};i?t():(S.Deferred.getStackHook&&(t.stackTrace=S.Deferred.getStackHook()),C.setTimeout(t))}}return S.Deferred(function(e){o[0][3].add(l(0,e,m(r)?r:R,e.notifyWith)),o[1][3].add(l(0,e,m(t)?t:R)),o[2][3].add(l(0,e,m(n)?n:M))}).promise()},promise:function(e){return null!=e?S.extend(e,a):a}},s={};return S.each(o,function(e,t){var n=t[2],r=t[5];a[t[1]]=n.add,r&&n.add(function(){i=r},o[3-e][2].disable,o[3-e][3].disable,o[0][2].lock,o[0][3].lock),n.add(t[3].fire),s[t[0]]=function(){return s[t[0]+"With"](this===s?void 0:this,arguments),this},s[t[0]+"With"]=n.fireWith}),a.promise(s),e&&e.call(s,s),s},when:function(e){var n=arguments.length,t=n,r=Array(t),i=s.call(arguments),o=S.Deferred(),a=function(t){return function(e){r[t]=this,i[t]=1<arguments.length?s.call(arguments):e,--n||o.resolveWith(r,i)}};if(n<=1&&(I(e,o.done(a(t)).resolve,
+o.reject,!n),"pending"===o.state()||m(i[t]&&i[t].then)))return o.then();while(t--)I(i[t],a(t),o.reject);return o.promise()}});var W=/^(Eval|Internal|Range|Reference|Syntax|Type|URI)Error$/;S.Deferred.exceptionHook=function(e,t){C.console&&C.console.warn&&e&&W.test(e.name)&&C.console.warn("jQuery.Deferred exception: "+e.message,e.stack,t)},S.readyException=function(e){C.setTimeout(function(){throw e})};var F=S.Deferred();function B(){E.removeEventListener("DOMContentLoaded",B),C.removeEventListener("load",B),S.ready()}S.fn.ready=function(e){return F.then(e)["catch"](function(e){S.readyException(e)}),this},S.extend({isReady:!1,readyWait:1,ready:function(e){(!0===e?--S.readyWait:S.isReady)||(S.isReady=!0)!==e&&0<--S.readyWait||F.resolveWith(E,[S])}}),S.ready.then=F.then,"complete"===E.readyState||"loading"!==E.readyState&&!E.documentElement.doScroll?C.setTimeout(S.ready):(E.addEventListener("DOMContentLoaded",B),C.addEventListener("load",B));var $=function(e,t,n,r,i,o,a){var s=0,u=e.length,l=null==n;if(
+"object"===w(n))for(s in i=!0,n)$(e,t,s,n[s],!0,o,a);else if(void 0!==r&&(i=!0,m(r)||(a=!0),l&&(a?(t.call(e,r),t=null):(l=t,t=function(e,t,n){return l.call(S(e),n)})),t))for(;s<u;s++)t(e[s],n,a?r:r.call(e[s],s,t(e[s],n)));return i?e:l?t.call(e):u?t(e[0],n):o},_=/^-ms-/,z=/-([a-z])/g;function U(e,t){return t.toUpperCase()}function X(e){return e.replace(_,"ms-").replace(z,U)}var V=function(e){return 1===e.nodeType||9===e.nodeType||!+e.nodeType};function G(){this.expando=S.expando+G.uid++}G.uid=1,G.prototype={cache:function(e){var t=e[this.expando];return t||(t={},V(e)&&(e.nodeType?e[this.expando]=t:Object.defineProperty(e,this.expando,{value:t,configurable:!0}))),t},set:function(e,t,n){var r,i=this.cache(e);if("string"==typeof t)i[X(t)]=n;else for(r in t)i[X(r)]=t[r];return i},get:function(e,t){return void 0===t?this.cache(e):e[this.expando]&&e[this.expando][X(t)]},access:function(e,t,n){return void 0===t||t&&"string"==typeof t&&void 0===n?this.get(e,t):(this.set(e,t,n),void 0!==n?n:t)},remove:function(e,t){
+var n,r=e[this.expando];if(void 0!==r){if(void 0!==t){n=(t=Array.isArray(t)?t.map(X):(t=X(t))in r?[t]:t.match(P)||[]).length;while(n--)delete r[t[n]]}(void 0===t||S.isEmptyObject(r))&&(e.nodeType?e[this.expando]=void 0:delete e[this.expando])}},hasData:function(e){var t=e[this.expando];return void 0!==t&&!S.isEmptyObject(t)}};var Y=new G,Q=new G,J=/^(?:\{[\w\W]*\}|\[[\w\W]*\])$/,K=/[A-Z]/g;function Z(e,t,n){var r,i;if(void 0===n&&1===e.nodeType)if(r="data-"+t.replace(K,"-$&").toLowerCase(),"string"==typeof(n=e.getAttribute(r))){try{n="true"===(i=n)||"false"!==i&&("null"===i?null:i===+i+""?+i:J.test(i)?JSON.parse(i):i)}catch(e){}Q.set(e,t,n)}else n=void 0;return n}S.extend({hasData:function(e){return Q.hasData(e)||Y.hasData(e)},data:function(e,t,n){return Q.access(e,t,n)},removeData:function(e,t){Q.remove(e,t)},_data:function(e,t,n){return Y.access(e,t,n)},_removeData:function(e,t){Y.remove(e,t)}}),S.fn.extend({data:function(n,e){var t,r,i,o=this[0],a=o&&o.attributes;if(void 0===n){if(this.length&&(i=Q.get(o),
+1===o.nodeType&&!Y.get(o,"hasDataAttrs"))){t=a.length;while(t--)a[t]&&0===(r=a[t].name).indexOf("data-")&&(r=X(r.slice(5)),Z(o,r,i[r]));Y.set(o,"hasDataAttrs",!0)}return i}return"object"==typeof n?this.each(function(){Q.set(this,n)}):$(this,function(e){var t;if(o&&void 0===e)return void 0!==(t=Q.get(o,n))?t:void 0!==(t=Z(o,n))?t:void 0;this.each(function(){Q.set(this,n,e)})},null,e,1<arguments.length,null,!0)},removeData:function(e){return this.each(function(){Q.remove(this,e)})}}),S.extend({queue:function(e,t,n){var r;if(e)return t=(t||"fx")+"queue",r=Y.get(e,t),n&&(!r||Array.isArray(n)?r=Y.access(e,t,S.makeArray(n)):r.push(n)),r||[]},dequeue:function(e,t){t=t||"fx";var n=S.queue(e,t),r=n.length,i=n.shift(),o=S._queueHooks(e,t);"inprogress"===i&&(i=n.shift(),r--),i&&("fx"===t&&n.unshift("inprogress"),delete o.stop,i.call(e,function(){S.dequeue(e,t)},o)),!r&&o&&o.empty.fire()},_queueHooks:function(e,t){var n=t+"queueHooks";return Y.get(e,n)||Y.access(e,n,{empty:S.Callbacks("once memory").add(function(){
+Y.remove(e,[t+"queue",n])})})}}),S.fn.extend({queue:function(t,n){var e=2;return"string"!=typeof t&&(n=t,t="fx",e--),arguments.length<e?S.queue(this[0],t):void 0===n?this:this.each(function(){var e=S.queue(this,t,n);S._queueHooks(this,t),"fx"===t&&"inprogress"!==e[0]&&S.dequeue(this,t)})},dequeue:function(e){return this.each(function(){S.dequeue(this,e)})},clearQueue:function(e){return this.queue(e||"fx",[])},promise:function(e,t){var n,r=1,i=S.Deferred(),o=this,a=this.length,s=function(){--r||i.resolveWith(o,[o])};"string"!=typeof e&&(t=e,e=void 0),e=e||"fx";while(a--)(n=Y.get(o[a],e+"queueHooks"))&&n.empty&&(r++,n.empty.add(s));return s(),i.promise(t)}});var ee=/[+-]?(?:\d*\.|)\d+(?:[eE][+-]?\d+|)/.source,te=new RegExp("^(?:([+-])=|)("+ee+")([a-z%]*)$","i"),ne=["Top","Right","Bottom","Left"],re=E.documentElement,ie=function(e){return S.contains(e.ownerDocument,e)},oe={composed:!0};re.getRootNode&&(ie=function(e){return S.contains(e.ownerDocument,e)||e.getRootNode(oe)===e.ownerDocument});var ae=function(e,t
+){return"none"===(e=t||e).style.display||""===e.style.display&&ie(e)&&"none"===S.css(e,"display")};function se(e,t,n,r){var i,o,a=20,s=r?function(){return r.cur()}:function(){return S.css(e,t,"")},u=s(),l=n&&n[3]||(S.cssNumber[t]?"":"px"),c=e.nodeType&&(S.cssNumber[t]||"px"!==l&&+u)&&te.exec(S.css(e,t));if(c&&c[3]!==l){u/=2,l=l||c[3],c=+u||1;while(a--)S.style(e,t,c+l),(1-o)*(1-(o=s()/u||.5))<=0&&(a=0),c/=o;c*=2,S.style(e,t,c+l),n=n||[]}return n&&(c=+c||+u||0,i=n[1]?c+(n[1]+1)*n[2]:+n[2],r&&(r.unit=l,r.start=c,r.end=i)),i}var ue={};function le(e,t){for(var n,r,i,o,a,s,u,l=[],c=0,f=e.length;c<f;c++)(r=e[c]).style&&(n=r.style.display,t?("none"===n&&(l[c]=Y.get(r,"display")||null,l[c]||(r.style.display="")),""===r.style.display&&ae(r)&&(l[c]=(u=a=o=void 0,a=(i=r).ownerDocument,s=i.nodeName,(u=ue[s])||(o=a.body.appendChild(a.createElement(s)),u=S.css(o,"display"),o.parentNode.removeChild(o),"none"===u&&(u="block"),ue[s]=u)))):"none"!==n&&(l[c]="none",Y.set(r,"display",n)));for(c=0;c<f;c++)null!=l[c]&&(e[c
+].style.display=l[c]);return e}S.fn.extend({show:function(){return le(this,!0)},hide:function(){return le(this)},toggle:function(e){return"boolean"==typeof e?e?this.show():this.hide():this.each(function(){ae(this)?S(this).show():S(this).hide()})}});var ce,fe,pe=/^(?:checkbox|radio)$/i,de=/<([a-z][^\/\0>\x20\t\r\n\f]*)/i,he=/^$|^module$|\/(?:java|ecma)script/i;ce=E.createDocumentFragment().appendChild(E.createElement("div")),(fe=E.createElement("input")).setAttribute("type","radio"),fe.setAttribute("checked","checked"),fe.setAttribute("name","t"),ce.appendChild(fe),y.checkClone=ce.cloneNode(!0).cloneNode(!0).lastChild.checked,ce.innerHTML="<textarea>x</textarea>",y.noCloneChecked=!!ce.cloneNode(!0).lastChild.defaultValue,ce.innerHTML="<option></option>",y.option=!!ce.lastChild;var ge={thead:[1,"<table>","</table>"],col:[2,"<table><colgroup>","</colgroup></table>"],tr:[2,"<table><tbody>","</tbody></table>"],td:[3,"<table><tbody><tr>","</tr></tbody></table>"],_default:[0,"",""]};function ve(e,t){var n;
+return n="undefined"!=typeof e.getElementsByTagName?e.getElementsByTagName(t||"*"):"undefined"!=typeof e.querySelectorAll?e.querySelectorAll(t||"*"):[],void 0===t||t&&A(e,t)?S.merge([e],n):n}function ye(e,t){for(var n=0,r=e.length;n<r;n++)Y.set(e[n],"globalEval",!t||Y.get(t[n],"globalEval"))}ge.tbody=ge.tfoot=ge.colgroup=ge.caption=ge.thead,ge.th=ge.td,y.option||(ge.optgroup=ge.option=[1,"<select multiple='multiple'>","</select>"]);var me=/<|&#?\w+;/;function xe(e,t,n,r,i){for(var o,a,s,u,l,c,f=t.createDocumentFragment(),p=[],d=0,h=e.length;d<h;d++)if((o=e[d])||0===o)if("object"===w(o))S.merge(p,o.nodeType?[o]:o);else if(me.test(o)){a=a||f.appendChild(t.createElement("div")),s=(de.exec(o)||["",""])[1].toLowerCase(),u=ge[s]||ge._default,a.innerHTML=u[1]+S.htmlPrefilter(o)+u[2],c=u[0];while(c--)a=a.lastChild;S.merge(p,a.childNodes),(a=f.firstChild).textContent=""}else p.push(t.createTextNode(o));f.textContent="",d=0;while(o=p[d++])if(r&&-1<S.inArray(o,r))i&&i.push(o);else if(l=ie(o),a=ve(f.appendChild(o),
+"script"),l&&ye(a),n){c=0;while(o=a[c++])he.test(o.type||"")&&n.push(o)}return f}var be=/^([^.]*)(?:\.(.+)|)/;function we(){return!0}function Te(){return!1}function Ce(e,t){return e===function(){try{return E.activeElement}catch(e){}}()==("focus"===t)}function Ee(e,t,n,r,i,o){var a,s;if("object"==typeof t){for(s in"string"!=typeof n&&(r=r||n,n=void 0),t)Ee(e,s,n,r,t[s],o);return e}if(null==r&&null==i?(i=n,r=n=void 0):null==i&&("string"==typeof n?(i=r,r=void 0):(i=r,r=n,n=void 0)),!1===i)i=Te;else if(!i)return e;return 1===o&&(a=i,(i=function(e){return S().off(e),a.apply(this,arguments)}).guid=a.guid||(a.guid=S.guid++)),e.each(function(){S.event.add(this,t,i,r,n)})}function Se(e,i,o){o?(Y.set(e,i,!1),S.event.add(e,i,{namespace:!1,handler:function(e){var t,n,r=Y.get(this,i);if(1&e.isTrigger&&this[i]){if(r.length)(S.event.special[i]||{}).delegateType&&e.stopPropagation();else if(r=s.call(arguments),Y.set(this,i,r),t=o(this,i),this[i](),r!==(n=Y.get(this,i))||t?Y.set(this,i,!1):n={},r!==n
+)return e.stopImmediatePropagation(),e.preventDefault(),n&&n.value}else r.length&&(Y.set(this,i,{value:S.event.trigger(S.extend(r[0],S.Event.prototype),r.slice(1),this)}),e.stopImmediatePropagation())}})):void 0===Y.get(e,i)&&S.event.add(e,i,we)}S.event={global:{},add:function(t,e,n,r,i){var o,a,s,u,l,c,f,p,d,h,g,v=Y.get(t);if(V(t)){n.handler&&(n=(o=n).handler,i=o.selector),i&&S.find.matchesSelector(re,i),n.guid||(n.guid=S.guid++),(u=v.events)||(u=v.events=Object.create(null)),(a=v.handle)||(a=v.handle=function(e){return"undefined"!=typeof S&&S.event.triggered!==e.type?S.event.dispatch.apply(t,arguments):void 0}),l=(e=(e||"").match(P)||[""]).length;while(l--)d=g=(s=be.exec(e[l])||[])[1],h=(s[2]||"").split(".").sort(),d&&(f=S.event.special[d]||{},d=(i?f.delegateType:f.bindType)||d,f=S.event.special[d]||{},c=S.extend({type:d,origType:g,data:r,handler:n,guid:n.guid,selector:i,needsContext:i&&S.expr.match.needsContext.test(i),namespace:h.join(".")},o),(p=u[d])||((p=u[d]=[]).delegateCount=0,
+f.setup&&!1!==f.setup.call(t,r,h,a)||t.addEventListener&&t.addEventListener(d,a)),f.add&&(f.add.call(t,c),c.handler.guid||(c.handler.guid=n.guid)),i?p.splice(p.delegateCount++,0,c):p.push(c),S.event.global[d]=!0)}},remove:function(e,t,n,r,i){var o,a,s,u,l,c,f,p,d,h,g,v=Y.hasData(e)&&Y.get(e);if(v&&(u=v.events)){l=(t=(t||"").match(P)||[""]).length;while(l--)if(d=g=(s=be.exec(t[l])||[])[1],h=(s[2]||"").split(".").sort(),d){f=S.event.special[d]||{},p=u[d=(r?f.delegateType:f.bindType)||d]||[],s=s[2]&&new RegExp("(^|\\.)"+h.join("\\.(?:.*\\.|)")+"(\\.|$)"),a=o=p.length;while(o--)c=p[o],!i&&g!==c.origType||n&&n.guid!==c.guid||s&&!s.test(c.namespace)||r&&r!==c.selector&&("**"!==r||!c.selector)||(p.splice(o,1),c.selector&&p.delegateCount--,f.remove&&f.remove.call(e,c));a&&!p.length&&(f.teardown&&!1!==f.teardown.call(e,h,v.handle)||S.removeEvent(e,d,v.handle),delete u[d])}else for(d in u)S.event.remove(e,d+t[l],n,r,!0);S.isEmptyObject(u)&&Y.remove(e,"handle events")}},dispatch:function(e){var t,n,r,i,o,a,s=new Array(
+arguments.length),u=S.event.fix(e),l=(Y.get(this,"events")||Object.create(null))[u.type]||[],c=S.event.special[u.type]||{};for(s[0]=u,t=1;t<arguments.length;t++)s[t]=arguments[t];if(u.delegateTarget=this,!c.preDispatch||!1!==c.preDispatch.call(this,u)){a=S.event.handlers.call(this,u,l),t=0;while((i=a[t++])&&!u.isPropagationStopped()){u.currentTarget=i.elem,n=0;while((o=i.handlers[n++])&&!u.isImmediatePropagationStopped())u.rnamespace&&!1!==o.namespace&&!u.rnamespace.test(o.namespace)||(u.handleObj=o,u.data=o.data,void 0!==(r=((S.event.special[o.origType]||{}).handle||o.handler).apply(i.elem,s))&&!1===(u.result=r)&&(u.preventDefault(),u.stopPropagation()))}return c.postDispatch&&c.postDispatch.call(this,u),u.result}},handlers:function(e,t){var n,r,i,o,a,s=[],u=t.delegateCount,l=e.target;if(u&&l.nodeType&&!("click"===e.type&&1<=e.button))for(;l!==this;l=l.parentNode||this)if(1===l.nodeType&&("click"!==e.type||!0!==l.disabled)){for(o=[],a={},n=0;n<u;n++)void 0===a[i=(r=t[n]).selector+" "]&&(a[i
+]=r.needsContext?-1<S(i,this).index(l):S.find(i,this,null,[l]).length),a[i]&&o.push(r);o.length&&s.push({elem:l,handlers:o})}return l=this,u<t.length&&s.push({elem:l,handlers:t.slice(u)}),s},addProp:function(t,e){Object.defineProperty(S.Event.prototype,t,{enumerable:!0,configurable:!0,get:m(e)?function(){if(this.originalEvent)return e(this.originalEvent)}:function(){if(this.originalEvent)return this.originalEvent[t]},set:function(e){Object.defineProperty(this,t,{enumerable:!0,configurable:!0,writable:!0,value:e})}})},fix:function(e){return e[S.expando]?e:new S.Event(e)},special:{load:{noBubble:!0},click:{setup:function(e){var t=this||e;return pe.test(t.type)&&t.click&&A(t,"input")&&Se(t,"click",we),!1},trigger:function(e){var t=this||e;return pe.test(t.type)&&t.click&&A(t,"input")&&Se(t,"click"),!0},_default:function(e){var t=e.target;return pe.test(t.type)&&t.click&&A(t,"input")&&Y.get(t,"click")||A(t,"a")}},beforeunload:{postDispatch:function(e){void 0!==e.result&&e.originalEvent&&(
+e.originalEvent.returnValue=e.result)}}}},S.removeEvent=function(e,t,n){e.removeEventListener&&e.removeEventListener(t,n)},S.Event=function(e,t){if(!(this instanceof S.Event))return new S.Event(e,t);e&&e.type?(this.originalEvent=e,this.type=e.type,this.isDefaultPrevented=e.defaultPrevented||void 0===e.defaultPrevented&&!1===e.returnValue?we:Te,this.target=e.target&&3===e.target.nodeType?e.target.parentNode:e.target,this.currentTarget=e.currentTarget,this.relatedTarget=e.relatedTarget):this.type=e,t&&S.extend(this,t),this.timeStamp=e&&e.timeStamp||Date.now(),this[S.expando]=!0},S.Event.prototype={constructor:S.Event,isDefaultPrevented:Te,isPropagationStopped:Te,isImmediatePropagationStopped:Te,isSimulated:!1,preventDefault:function(){var e=this.originalEvent;this.isDefaultPrevented=we,e&&!this.isSimulated&&e.preventDefault()},stopPropagation:function(){var e=this.originalEvent;this.isPropagationStopped=we,e&&!this.isSimulated&&e.stopPropagation()},stopImmediatePropagation:function(){var e=this.originalEvent;
+this.isImmediatePropagationStopped=we,e&&!this.isSimulated&&e.stopImmediatePropagation(),this.stopPropagation()}},S.each({altKey:!0,bubbles:!0,cancelable:!0,changedTouches:!0,ctrlKey:!0,detail:!0,eventPhase:!0,metaKey:!0,pageX:!0,pageY:!0,shiftKey:!0,view:!0,char:!0,code:!0,charCode:!0,key:!0,keyCode:!0,button:!0,buttons:!0,clientX:!0,clientY:!0,offsetX:!0,offsetY:!0,pointerId:!0,pointerType:!0,screenX:!0,screenY:!0,targetTouches:!0,toElement:!0,touches:!0,which:!0},S.event.addProp),S.each({focus:"focusin",blur:"focusout"},function(e,t){S.event.special[e]={setup:function(){return Se(this,e,Ce),!1},trigger:function(){return Se(this,e),!0},_default:function(){return!0},delegateType:t}}),S.each({mouseenter:"mouseover",mouseleave:"mouseout",pointerenter:"pointerover",pointerleave:"pointerout"},function(e,i){S.event.special[e]={delegateType:i,bindType:i,handle:function(e){var t,n=e.relatedTarget,r=e.handleObj;return n&&(n===this||S.contains(this,n))||(e.type=r.origType,t=r.handler.apply(this,arguments),e.type=i),t
+}}}),S.fn.extend({on:function(e,t,n,r){return Ee(this,e,t,n,r)},one:function(e,t,n,r){return Ee(this,e,t,n,r,1)},off:function(e,t,n){var r,i;if(e&&e.preventDefault&&e.handleObj)return r=e.handleObj,S(e.delegateTarget).off(r.namespace?r.origType+"."+r.namespace:r.origType,r.selector,r.handler),this;if("object"==typeof e){for(i in e)this.off(i,t,e[i]);return this}return!1!==t&&"function"!=typeof t||(n=t,t=void 0),!1===n&&(n=Te),this.each(function(){S.event.remove(this,e,n,t)})}});var ke=/<script|<style|<link/i,Ae=/checked\s*(?:[^=]|=\s*.checked.)/i,Ne=/^\s*<!(?:\[CDATA\[|--)|(?:\]\]|--)>\s*$/g;function je(e,t){return A(e,"table")&&A(11!==t.nodeType?t:t.firstChild,"tr")&&S(e).children("tbody")[0]||e}function De(e){return e.type=(null!==e.getAttribute("type"))+"/"+e.type,e}function qe(e){return"true/"===(e.type||"").slice(0,5)?e.type=e.type.slice(5):e.removeAttribute("type"),e}function Le(e,t){var n,r,i,o,a,s;if(1===t.nodeType){if(Y.hasData(e)&&(s=Y.get(e).events))for(i in Y.remove(t,"handle events"),s)for(n=0,
+r=s[i].length;n<r;n++)S.event.add(t,i,s[i][n]);Q.hasData(e)&&(o=Q.access(e),a=S.extend({},o),Q.set(t,a))}}function He(n,r,i,o){r=g(r);var e,t,a,s,u,l,c=0,f=n.length,p=f-1,d=r[0],h=m(d);if(h||1<f&&"string"==typeof d&&!y.checkClone&&Ae.test(d))return n.each(function(e){var t=n.eq(e);h&&(r[0]=d.call(this,e,t.html())),He(t,r,i,o)});if(f&&(t=(e=xe(r,n[0].ownerDocument,!1,n,o)).firstChild,1===e.childNodes.length&&(e=t),t||o)){for(s=(a=S.map(ve(e,"script"),De)).length;c<f;c++)u=e,c!==p&&(u=S.clone(u,!0,!0),s&&S.merge(a,ve(u,"script"))),i.call(n[c],u,c);if(s)for(l=a[a.length-1].ownerDocument,S.map(a,qe),c=0;c<s;c++)u=a[c],he.test(u.type||"")&&!Y.access(u,"globalEval")&&S.contains(l,u)&&(u.src&&"module"!==(u.type||"").toLowerCase()?S._evalUrl&&!u.noModule&&S._evalUrl(u.src,{nonce:u.nonce||u.getAttribute("nonce")},l):b(u.textContent.replace(Ne,""),u,l))}return n}function Oe(e,t,n){for(var r,i=t?S.filter(t,e):e,o=0;null!=(r=i[o]);o++)n||1!==r.nodeType||S.cleanData(ve(r)),r.parentNode&&(n&&ie(r)&&ye(ve(r,"script")),
+r.parentNode.removeChild(r));return e}S.extend({htmlPrefilter:function(e){return e},clone:function(e,t,n){var r,i,o,a,s,u,l,c=e.cloneNode(!0),f=ie(e);if(!(y.noCloneChecked||1!==e.nodeType&&11!==e.nodeType||S.isXMLDoc(e)))for(a=ve(c),r=0,i=(o=ve(e)).length;r<i;r++)s=o[r],u=a[r],void 0,"input"===(l=u.nodeName.toLowerCase())&&pe.test(s.type)?u.checked=s.checked:"input"!==l&&"textarea"!==l||(u.defaultValue=s.defaultValue);if(t)if(n)for(o=o||ve(e),a=a||ve(c),r=0,i=o.length;r<i;r++)Le(o[r],a[r]);else Le(e,c);return 0<(a=ve(c,"script")).length&&ye(a,!f&&ve(e,"script")),c},cleanData:function(e){for(var t,n,r,i=S.event.special,o=0;void 0!==(n=e[o]);o++)if(V(n)){if(t=n[Y.expando]){if(t.events)for(r in t.events)i[r]?S.event.remove(n,r):S.removeEvent(n,r,t.handle);n[Y.expando]=void 0}n[Q.expando]&&(n[Q.expando]=void 0)}}}),S.fn.extend({detach:function(e){return Oe(this,e,!0)},remove:function(e){return Oe(this,e)},text:function(e){return $(this,function(e){return void 0===e?S.text(this):this.empty().each(function(){
+1!==this.nodeType&&11!==this.nodeType&&9!==this.nodeType||(this.textContent=e)})},null,e,arguments.length)},append:function(){return He(this,arguments,function(e){1!==this.nodeType&&11!==this.nodeType&&9!==this.nodeType||je(this,e).appendChild(e)})},prepend:function(){return He(this,arguments,function(e){if(1===this.nodeType||11===this.nodeType||9===this.nodeType){var t=je(this,e);t.insertBefore(e,t.firstChild)}})},before:function(){return He(this,arguments,function(e){this.parentNode&&this.parentNode.insertBefore(e,this)})},after:function(){return He(this,arguments,function(e){this.parentNode&&this.parentNode.insertBefore(e,this.nextSibling)})},empty:function(){for(var e,t=0;null!=(e=this[t]);t++)1===e.nodeType&&(S.cleanData(ve(e,!1)),e.textContent="");return this},clone:function(e,t){return e=null!=e&&e,t=null==t?e:t,this.map(function(){return S.clone(this,e,t)})},html:function(e){return $(this,function(e){var t=this[0]||{},n=0,r=this.length;if(void 0===e&&1===t.nodeType)return t.innerHTML;if(
+"string"==typeof e&&!ke.test(e)&&!ge[(de.exec(e)||["",""])[1].toLowerCase()]){e=S.htmlPrefilter(e);try{for(;n<r;n++)1===(t=this[n]||{}).nodeType&&(S.cleanData(ve(t,!1)),t.innerHTML=e);t=0}catch(e){}}t&&this.empty().append(e)},null,e,arguments.length)},replaceWith:function(){var n=[];return He(this,arguments,function(e){var t=this.parentNode;S.inArray(this,n)<0&&(S.cleanData(ve(this)),t&&t.replaceChild(e,this))},n)}}),S.each({appendTo:"append",prependTo:"prepend",insertBefore:"before",insertAfter:"after",replaceAll:"replaceWith"},function(e,a){S.fn[e]=function(e){for(var t,n=[],r=S(e),i=r.length-1,o=0;o<=i;o++)t=o===i?this:this.clone(!0),S(r[o])[a](t),u.apply(n,t.get());return this.pushStack(n)}});var Pe=new RegExp("^("+ee+")(?!px)[a-z%]+$","i"),Re=function(e){var t=e.ownerDocument.defaultView;return t&&t.opener||(t=C),t.getComputedStyle(e)},Me=function(e,t,n){var r,i,o={};for(i in t)o[i]=e.style[i],e.style[i]=t[i];for(i in r=n.call(e),t)e.style[i]=o[i];return r},Ie=new RegExp(ne.join("|"),"i");function We(e,t
+,n){var r,i,o,a,s=e.style;return(n=n||Re(e))&&(""!==(a=n.getPropertyValue(t)||n[t])||ie(e)||(a=S.style(e,t)),!y.pixelBoxStyles()&&Pe.test(a)&&Ie.test(t)&&(r=s.width,i=s.minWidth,o=s.maxWidth,s.minWidth=s.maxWidth=s.width=a,a=n.width,s.width=r,s.minWidth=i,s.maxWidth=o)),void 0!==a?a+"":a}function Fe(e,t){return{get:function(){if(!e())return(this.get=t).apply(this,arguments);delete this.get}}}!function(){function e(){if(l){u.style.cssText="position:absolute;left:-11111px;width:60px;margin-top:1px;padding:0;border:0",l.style.cssText="position:relative;display:block;box-sizing:border-box;overflow:scroll;margin:auto;border:1px;padding:1px;width:60%;top:1%",re.appendChild(u).appendChild(l);var e=C.getComputedStyle(l);n="1%"!==e.top,s=12===t(e.marginLeft),l.style.right="60%",o=36===t(e.right),r=36===t(e.width),l.style.position="absolute",i=12===t(l.offsetWidth/3),re.removeChild(u),l=null}}function t(e){return Math.round(parseFloat(e))}var n,r,i,o,a,s,u=E.createElement("div"),l=E.createElement("div");l.style&&(
+l.style.backgroundClip="content-box",l.cloneNode(!0).style.backgroundClip="",y.clearCloneStyle="content-box"===l.style.backgroundClip,S.extend(y,{boxSizingReliable:function(){return e(),r},pixelBoxStyles:function(){return e(),o},pixelPosition:function(){return e(),n},reliableMarginLeft:function(){return e(),s},scrollboxSize:function(){return e(),i},reliableTrDimensions:function(){var e,t,n,r;return null==a&&(e=E.createElement("table"),t=E.createElement("tr"),n=E.createElement("div"),e.style.cssText="position:absolute;left:-11111px;border-collapse:separate",t.style.cssText="border:1px solid",t.style.height="1px",n.style.height="9px",n.style.display="block",re.appendChild(e).appendChild(t).appendChild(n),r=C.getComputedStyle(t),a=parseInt(r.height,10)+parseInt(r.borderTopWidth,10)+parseInt(r.borderBottomWidth,10)===t.offsetHeight,re.removeChild(e)),a}}))}();var Be=["Webkit","Moz","ms"],$e=E.createElement("div").style,_e={};function ze(e){var t=S.cssProps[e]||_e[e];return t||(e in $e?e:_e[e]=function(e){var t=e[
+0].toUpperCase()+e.slice(1),n=Be.length;while(n--)if((e=Be[n]+t)in $e)return e}(e)||e)}var Ue=/^(none|table(?!-c[ea]).+)/,Xe=/^--/,Ve={position:"absolute",visibility:"hidden",display:"block"},Ge={letterSpacing:"0",fontWeight:"400"};function Ye(e,t,n){var r=te.exec(t);return r?Math.max(0,r[2]-(n||0))+(r[3]||"px"):t}function Qe(e,t,n,r,i,o){var a="width"===t?1:0,s=0,u=0;if(n===(r?"border":"content"))return 0;for(;a<4;a+=2)"margin"===n&&(u+=S.css(e,n+ne[a],!0,i)),r?("content"===n&&(u-=S.css(e,"padding"+ne[a],!0,i)),"margin"!==n&&(u-=S.css(e,"border"+ne[a]+"Width",!0,i))):(u+=S.css(e,"padding"+ne[a],!0,i),"padding"!==n?u+=S.css(e,"border"+ne[a]+"Width",!0,i):s+=S.css(e,"border"+ne[a]+"Width",!0,i));return!r&&0<=o&&(u+=Math.max(0,Math.ceil(e["offset"+t[0].toUpperCase()+t.slice(1)]-o-u-s-.5))||0),u}function Je(e,t,n){var r=Re(e),i=(!y.boxSizingReliable()||n)&&"border-box"===S.css(e,"boxSizing",!1,r),o=i,a=We(e,t,r),s="offset"+t[0].toUpperCase()+t.slice(1);if(Pe.test(a)){if(!n)return a;a="auto"}return(
+!y.boxSizingReliable()&&i||!y.reliableTrDimensions()&&A(e,"tr")||"auto"===a||!parseFloat(a)&&"inline"===S.css(e,"display",!1,r))&&e.getClientRects().length&&(i="border-box"===S.css(e,"boxSizing",!1,r),(o=s in e)&&(a=e[s])),(a=parseFloat(a)||0)+Qe(e,t,n||(i?"border":"content"),o,r,a)+"px"}function Ke(e,t,n,r,i){return new Ke.prototype.init(e,t,n,r,i)}S.extend({cssHooks:{opacity:{get:function(e,t){if(t){var n=We(e,"opacity");return""===n?"1":n}}}},cssNumber:{animationIterationCount:!0,columnCount:!0,fillOpacity:!0,flexGrow:!0,flexShrink:!0,fontWeight:!0,gridArea:!0,gridColumn:!0,gridColumnEnd:!0,gridColumnStart:!0,gridRow:!0,gridRowEnd:!0,gridRowStart:!0,lineHeight:!0,opacity:!0,order:!0,orphans:!0,widows:!0,zIndex:!0,zoom:!0},cssProps:{},style:function(e,t,n,r){if(e&&3!==e.nodeType&&8!==e.nodeType&&e.style){var i,o,a,s=X(t),u=Xe.test(t),l=e.style;if(u||(t=ze(s)),a=S.cssHooks[t]||S.cssHooks[s],void 0===n)return a&&"get"in a&&void 0!==(i=a.get(e,!1,r))?i:l[t];"string"===(o=typeof n)&&(i=te.exec(n))&&i[1]&&(n=se(
+e,t,i),o="number"),null!=n&&n==n&&("number"!==o||u||(n+=i&&i[3]||(S.cssNumber[s]?"":"px")),y.clearCloneStyle||""!==n||0!==t.indexOf("background")||(l[t]="inherit"),a&&"set"in a&&void 0===(n=a.set(e,n,r))||(u?l.setProperty(t,n):l[t]=n))}},css:function(e,t,n,r){var i,o,a,s=X(t);return Xe.test(t)||(t=ze(s)),(a=S.cssHooks[t]||S.cssHooks[s])&&"get"in a&&(i=a.get(e,!0,n)),void 0===i&&(i=We(e,t,r)),"normal"===i&&t in Ge&&(i=Ge[t]),""===n||n?(o=parseFloat(i),!0===n||isFinite(o)?o||0:i):i}}),S.each(["height","width"],function(e,u){S.cssHooks[u]={get:function(e,t,n){if(t)return!Ue.test(S.css(e,"display"))||e.getClientRects().length&&e.getBoundingClientRect().width?Je(e,u,n):Me(e,Ve,function(){return Je(e,u,n)})},set:function(e,t,n){var r,i=Re(e),o=!y.scrollboxSize()&&"absolute"===i.position,a=(o||n)&&"border-box"===S.css(e,"boxSizing",!1,i),s=n?Qe(e,u,n,a,i):0;return a&&o&&(s-=Math.ceil(e["offset"+u[0].toUpperCase()+u.slice(1)]-parseFloat(i[u])-Qe(e,u,"border",!1,i)-.5)),s&&(r=te.exec(t))&&"px"!==(r[3]||"px")&&(
+e.style[u]=t,t=S.css(e,u)),Ye(0,t,s)}}}),S.cssHooks.marginLeft=Fe(y.reliableMarginLeft,function(e,t){if(t)return(parseFloat(We(e,"marginLeft"))||e.getBoundingClientRect().left-Me(e,{marginLeft:0},function(){return e.getBoundingClientRect().left}))+"px"}),S.each({margin:"",padding:"",border:"Width"},function(i,o){S.cssHooks[i+o]={expand:function(e){for(var t=0,n={},r="string"==typeof e?e.split(" "):[e];t<4;t++)n[i+ne[t]+o]=r[t]||r[t-2]||r[0];return n}},"margin"!==i&&(S.cssHooks[i+o].set=Ye)}),S.fn.extend({css:function(e,t){return $(this,function(e,t,n){var r,i,o={},a=0;if(Array.isArray(t)){for(r=Re(e),i=t.length;a<i;a++)o[t[a]]=S.css(e,t[a],!1,r);return o}return void 0!==n?S.style(e,t,n):S.css(e,t)},e,t,1<arguments.length)}}),((S.Tween=Ke).prototype={constructor:Ke,init:function(e,t,n,r,i,o){this.elem=e,this.prop=n,this.easing=i||S.easing._default,this.options=t,this.start=this.now=this.cur(),this.end=r,this.unit=o||(S.cssNumber[n]?"":"px")},cur:function(){var e=Ke.propHooks[this.prop];return e&&e.get?e.get(
+this):Ke.propHooks._default.get(this)},run:function(e){var t,n=Ke.propHooks[this.prop];return this.options.duration?this.pos=t=S.easing[this.easing](e,this.options.duration*e,0,1,this.options.duration):this.pos=t=e,this.now=(this.end-this.start)*t+this.start,this.options.step&&this.options.step.call(this.elem,this.now,this),n&&n.set?n.set(this):Ke.propHooks._default.set(this),this}}).init.prototype=Ke.prototype,(Ke.propHooks={_default:{get:function(e){var t;return 1!==e.elem.nodeType||null!=e.elem[e.prop]&&null==e.elem.style[e.prop]?e.elem[e.prop]:(t=S.css(e.elem,e.prop,""))&&"auto"!==t?t:0},set:function(e){S.fx.step[e.prop]?S.fx.step[e.prop](e):1!==e.elem.nodeType||!S.cssHooks[e.prop]&&null==e.elem.style[ze(e.prop)]?e.elem[e.prop]=e.now:S.style(e.elem,e.prop,e.now+e.unit)}}}).scrollTop=Ke.propHooks.scrollLeft={set:function(e){e.elem.nodeType&&e.elem.parentNode&&(e.elem[e.prop]=e.now)}},S.easing={linear:function(e){return e},swing:function(e){return.5-Math.cos(e*Math.PI)/2},_default:"swing"},
+S.fx=Ke.prototype.init,S.fx.step={};var Ze,et,tt,nt,rt=/^(?:toggle|show|hide)$/,it=/queueHooks$/;function ot(){et&&(!1===E.hidden&&C.requestAnimationFrame?C.requestAnimationFrame(ot):C.setTimeout(ot,S.fx.interval),S.fx.tick())}function at(){return C.setTimeout(function(){Ze=void 0}),Ze=Date.now()}function st(e,t){var n,r=0,i={height:e};for(t=t?1:0;r<4;r+=2-t)i["margin"+(n=ne[r])]=i["padding"+n]=e;return t&&(i.opacity=i.width=e),i}function ut(e,t,n){for(var r,i=(lt.tweeners[t]||[]).concat(lt.tweeners["*"]),o=0,a=i.length;o<a;o++)if(r=i[o].call(n,t,e))return r}function lt(o,e,t){var n,a,r=0,i=lt.prefilters.length,s=S.Deferred().always(function(){delete u.elem}),u=function(){if(a)return!1;for(var e=Ze||at(),t=Math.max(0,l.startTime+l.duration-e),n=1-(t/l.duration||0),r=0,i=l.tweens.length;r<i;r++)l.tweens[r].run(n);return s.notifyWith(o,[l,n,t]),n<1&&i?t:(i||s.notifyWith(o,[l,1,0]),s.resolveWith(o,[l]),!1)},l=s.promise({elem:o,props:S.extend({},e),opts:S.extend(!0,{specialEasing:{},easing:S.easing._default},t),
+originalProperties:e,originalOptions:t,startTime:Ze||at(),duration:t.duration,tweens:[],createTween:function(e,t){var n=S.Tween(o,l.opts,e,t,l.opts.specialEasing[e]||l.opts.easing);return l.tweens.push(n),n},stop:function(e){var t=0,n=e?l.tweens.length:0;if(a)return this;for(a=!0;t<n;t++)l.tweens[t].run(1);return e?(s.notifyWith(o,[l,1,0]),s.resolveWith(o,[l,e])):s.rejectWith(o,[l,e]),this}}),c=l.props;for(!function(e,t){var n,r,i,o,a;for(n in e)if(i=t[r=X(n)],o=e[n],Array.isArray(o)&&(i=o[1],o=e[n]=o[0]),n!==r&&(e[r]=o,delete e[n]),(a=S.cssHooks[r])&&"expand"in a)for(n in o=a.expand(o),delete e[r],o)n in e||(e[n]=o[n],t[n]=i);else t[r]=i}(c,l.opts.specialEasing);r<i;r++)if(n=lt.prefilters[r].call(l,o,c,l.opts))return m(n.stop)&&(S._queueHooks(l.elem,l.opts.queue).stop=n.stop.bind(n)),n;return S.map(c,ut,l),m(l.opts.start)&&l.opts.start.call(o,l),l.progress(l.opts.progress).done(l.opts.done,l.opts.complete).fail(l.opts.fail).always(l.opts.always),S.fx.timer(S.extend(u,{elem:o,anim:l,queue:l.opts.queue})),l}
+S.Animation=S.extend(lt,{tweeners:{"*":[function(e,t){var n=this.createTween(e,t);return se(n.elem,e,te.exec(t),n),n}]},tweener:function(e,t){m(e)?(t=e,e=["*"]):e=e.match(P);for(var n,r=0,i=e.length;r<i;r++)n=e[r],lt.tweeners[n]=lt.tweeners[n]||[],lt.tweeners[n].unshift(t)},prefilters:[function(e,t,n){var r,i,o,a,s,u,l,c,f="width"in t||"height"in t,p=this,d={},h=e.style,g=e.nodeType&&ae(e),v=Y.get(e,"fxshow");for(r in n.queue||(null==(a=S._queueHooks(e,"fx")).unqueued&&(a.unqueued=0,s=a.empty.fire,a.empty.fire=function(){a.unqueued||s()}),a.unqueued++,p.always(function(){p.always(function(){a.unqueued--,S.queue(e,"fx").length||a.empty.fire()})})),t)if(i=t[r],rt.test(i)){if(delete t[r],o=o||"toggle"===i,i===(g?"hide":"show")){if("show"!==i||!v||void 0===v[r])continue;g=!0}d[r]=v&&v[r]||S.style(e,r)}if((u=!S.isEmptyObject(t))||!S.isEmptyObject(d))for(r in f&&1===e.nodeType&&(n.overflow=[h.overflow,h.overflowX,h.overflowY],null==(l=v&&v.display)&&(l=Y.get(e,"display")),"none"===(c=S.css(e,"display"))&&(l?c=l:(
+le([e],!0),l=e.style.display||l,c=S.css(e,"display"),le([e]))),("inline"===c||"inline-block"===c&&null!=l)&&"none"===S.css(e,"float")&&(u||(p.done(function(){h.display=l}),null==l&&(c=h.display,l="none"===c?"":c)),h.display="inline-block")),n.overflow&&(h.overflow="hidden",p.always(function(){h.overflow=n.overflow[0],h.overflowX=n.overflow[1],h.overflowY=n.overflow[2]})),u=!1,d)u||(v?"hidden"in v&&(g=v.hidden):v=Y.access(e,"fxshow",{display:l}),o&&(v.hidden=!g),g&&le([e],!0),p.done(function(){for(r in g||le([e]),Y.remove(e,"fxshow"),d)S.style(e,r,d[r])})),u=ut(g?v[r]:0,r,p),r in v||(v[r]=u.start,g&&(u.end=u.start,u.start=0))}],prefilter:function(e,t){t?lt.prefilters.unshift(e):lt.prefilters.push(e)}}),S.speed=function(e,t,n){var r=e&&"object"==typeof e?S.extend({},e):{complete:n||!n&&t||m(e)&&e,duration:e,easing:n&&t||t&&!m(t)&&t};return S.fx.off?r.duration=0:"number"!=typeof r.duration&&(r.duration in S.fx.speeds?r.duration=S.fx.speeds[r.duration]:r.duration=S.fx.speeds._default),
+null!=r.queue&&!0!==r.queue||(r.queue="fx"),r.old=r.complete,r.complete=function(){m(r.old)&&r.old.call(this),r.queue&&S.dequeue(this,r.queue)},r},S.fn.extend({fadeTo:function(e,t,n,r){return this.filter(ae).css("opacity",0).show().end().animate({opacity:t},e,n,r)},animate:function(t,e,n,r){var i=S.isEmptyObject(t),o=S.speed(e,n,r),a=function(){var e=lt(this,S.extend({},t),o);(i||Y.get(this,"finish"))&&e.stop(!0)};return a.finish=a,i||!1===o.queue?this.each(a):this.queue(o.queue,a)},stop:function(i,e,o){var a=function(e){var t=e.stop;delete e.stop,t(o)};return"string"!=typeof i&&(o=e,e=i,i=void 0),e&&this.queue(i||"fx",[]),this.each(function(){var e=!0,t=null!=i&&i+"queueHooks",n=S.timers,r=Y.get(this);if(t)r[t]&&r[t].stop&&a(r[t]);else for(t in r)r[t]&&r[t].stop&&it.test(t)&&a(r[t]);for(t=n.length;t--;)n[t].elem!==this||null!=i&&n[t].queue!==i||(n[t].anim.stop(o),e=!1,n.splice(t,1));!e&&o||S.dequeue(this,i)})},finish:function(a){return!1!==a&&(a=a||"fx"),this.each(function(){var e,t=Y.get(this),n=t[a+"queue"
+],r=t[a+"queueHooks"],i=S.timers,o=n?n.length:0;for(t.finish=!0,S.queue(this,a,[]),r&&r.stop&&r.stop.call(this,!0),e=i.length;e--;)i[e].elem===this&&i[e].queue===a&&(i[e].anim.stop(!0),i.splice(e,1));for(e=0;e<o;e++)n[e]&&n[e].finish&&n[e].finish.call(this);delete t.finish})}}),S.each(["toggle","show","hide"],function(e,r){var i=S.fn[r];S.fn[r]=function(e,t,n){return null==e||"boolean"==typeof e?i.apply(this,arguments):this.animate(st(r,!0),e,t,n)}}),S.each({slideDown:st("show"),slideUp:st("hide"),slideToggle:st("toggle"),fadeIn:{opacity:"show"},fadeOut:{opacity:"hide"},fadeToggle:{opacity:"toggle"}},function(e,r){S.fn[e]=function(e,t,n){return this.animate(r,e,t,n)}}),S.timers=[],S.fx.tick=function(){var e,t=0,n=S.timers;for(Ze=Date.now();t<n.length;t++)(e=n[t])()||n[t]!==e||n.splice(t--,1);n.length||S.fx.stop(),Ze=void 0},S.fx.timer=function(e){S.timers.push(e),S.fx.start()},S.fx.interval=13,S.fx.start=function(){et||(et=!0,ot())},S.fx.stop=function(){et=null},S.fx.speeds={slow:600,fast:200,_default:400},
+S.fn.delay=function(r,e){return r=S.fx&&S.fx.speeds[r]||r,e=e||"fx",this.queue(e,function(e,t){var n=C.setTimeout(e,r);t.stop=function(){C.clearTimeout(n)}})},tt=E.createElement("input"),nt=E.createElement("select").appendChild(E.createElement("option")),tt.type="checkbox",y.checkOn=""!==tt.value,y.optSelected=nt.selected,(tt=E.createElement("input")).value="t",tt.type="radio",y.radioValue="t"===tt.value;var ct,ft=S.expr.attrHandle;S.fn.extend({attr:function(e,t){return $(this,S.attr,e,t,1<arguments.length)},removeAttr:function(e){return this.each(function(){S.removeAttr(this,e)})}}),S.extend({attr:function(e,t,n){var r,i,o=e.nodeType;if(3!==o&&8!==o&&2!==o)return"undefined"==typeof e.getAttribute?S.prop(e,t,n):(1===o&&S.isXMLDoc(e)||(i=S.attrHooks[t.toLowerCase()]||(S.expr.match.bool.test(t)?ct:void 0)),void 0!==n?null===n?void S.removeAttr(e,t):i&&"set"in i&&void 0!==(r=i.set(e,n,t))?r:(e.setAttribute(t,n+""),n):i&&"get"in i&&null!==(r=i.get(e,t))?r:null==(r=S.find.attr(e,t))?void 0:r)},attrHooks:{type:{
+set:function(e,t){if(!y.radioValue&&"radio"===t&&A(e,"input")){var n=e.value;return e.setAttribute("type",t),n&&(e.value=n),t}}}},removeAttr:function(e,t){var n,r=0,i=t&&t.match(P);if(i&&1===e.nodeType)while(n=i[r++])e.removeAttribute(n)}}),ct={set:function(e,t,n){return!1===t?S.removeAttr(e,n):e.setAttribute(n,n),n}},S.each(S.expr.match.bool.source.match(/\w+/g),function(e,t){var a=ft[t]||S.find.attr;ft[t]=function(e,t,n){var r,i,o=t.toLowerCase();return n||(i=ft[o],ft[o]=r,r=null!=a(e,t,n)?o:null,ft[o]=i),r}});var pt=/^(?:input|select|textarea|button)$/i,dt=/^(?:a|area)$/i;function ht(e){return(e.match(P)||[]).join(" ")}function gt(e){return e.getAttribute&&e.getAttribute("class")||""}function vt(e){return Array.isArray(e)?e:"string"==typeof e&&e.match(P)||[]}S.fn.extend({prop:function(e,t){return $(this,S.prop,e,t,1<arguments.length)},removeProp:function(e){return this.each(function(){delete this[S.propFix[e]||e]})}}),S.extend({prop:function(e,t,n){var r,i,o=e.nodeType;if(3!==o&&8!==o&&2!==o
+)return 1===o&&S.isXMLDoc(e)||(t=S.propFix[t]||t,i=S.propHooks[t]),void 0!==n?i&&"set"in i&&void 0!==(r=i.set(e,n,t))?r:e[t]=n:i&&"get"in i&&null!==(r=i.get(e,t))?r:e[t]},propHooks:{tabIndex:{get:function(e){var t=S.find.attr(e,"tabindex");return t?parseInt(t,10):pt.test(e.nodeName)||dt.test(e.nodeName)&&e.href?0:-1}}},propFix:{for:"htmlFor",class:"className"}}),y.optSelected||(S.propHooks.selected={get:function(e){var t=e.parentNode;return t&&t.parentNode&&t.parentNode.selectedIndex,null},set:function(e){var t=e.parentNode;t&&(t.selectedIndex,t.parentNode&&t.parentNode.selectedIndex)}}),S.each(["tabIndex","readOnly","maxLength","cellSpacing","cellPadding","rowSpan","colSpan","useMap","frameBorder","contentEditable"],function(){S.propFix[this.toLowerCase()]=this}),S.fn.extend({addClass:function(t){var e,n,r,i,o,a,s,u=0;if(m(t))return this.each(function(e){S(this).addClass(t.call(this,e,gt(this)))});if((e=vt(t)).length)while(n=this[u++])if(i=gt(n),r=1===n.nodeType&&" "+ht(i)+" "){a=0;while(o=e[a++])r.indexOf(
+" "+o+" ")<0&&(r+=o+" ");i!==(s=ht(r))&&n.setAttribute("class",s)}return this},removeClass:function(t){var e,n,r,i,o,a,s,u=0;if(m(t))return this.each(function(e){S(this).removeClass(t.call(this,e,gt(this)))});if(!arguments.length)return this.attr("class","");if((e=vt(t)).length)while(n=this[u++])if(i=gt(n),r=1===n.nodeType&&" "+ht(i)+" "){a=0;while(o=e[a++])while(-1<r.indexOf(" "+o+" "))r=r.replace(" "+o+" "," ");i!==(s=ht(r))&&n.setAttribute("class",s)}return this},toggleClass:function(i,t){var o=typeof i,a="string"===o||Array.isArray(i);return"boolean"==typeof t&&a?t?this.addClass(i):this.removeClass(i):m(i)?this.each(function(e){S(this).toggleClass(i.call(this,e,gt(this),t),t)}):this.each(function(){var e,t,n,r;if(a){t=0,n=S(this),r=vt(i);while(e=r[t++])n.hasClass(e)?n.removeClass(e):n.addClass(e)}else void 0!==i&&"boolean"!==o||((e=gt(this))&&Y.set(this,"__className__",e),this.setAttribute&&this.setAttribute("class",e||!1===i?"":Y.get(this,"__className__")||""))})},hasClass:function(e){var t,n,r=0;
+t=" "+e+" ";while(n=this[r++])if(1===n.nodeType&&-1<(" "+ht(gt(n))+" ").indexOf(t))return!0;return!1}});var yt=/\r/g;S.fn.extend({val:function(n){var r,e,i,t=this[0];return arguments.length?(i=m(n),this.each(function(e){var t;1===this.nodeType&&(null==(t=i?n.call(this,e,S(this).val()):n)?t="":"number"==typeof t?t+="":Array.isArray(t)&&(t=S.map(t,function(e){return null==e?"":e+""})),(r=S.valHooks[this.type]||S.valHooks[this.nodeName.toLowerCase()])&&"set"in r&&void 0!==r.set(this,t,"value")||(this.value=t))})):t?(r=S.valHooks[t.type]||S.valHooks[t.nodeName.toLowerCase()])&&"get"in r&&void 0!==(e=r.get(t,"value"))?e:"string"==typeof(e=t.value)?e.replace(yt,""):null==e?"":e:void 0}}),S.extend({valHooks:{option:{get:function(e){var t=S.find.attr(e,"value");return null!=t?t:ht(S.text(e))}},select:{get:function(e){var t,n,r,i=e.options,o=e.selectedIndex,a="select-one"===e.type,s=a?null:[],u=a?o+1:i.length;for(r=o<0?u:a?o:0;r<u;r++)if(((n=i[r]).selected||r===o)&&!n.disabled&&(!n.parentNode.disabled||!A(n.parentNode
+,"optgroup"))){if(t=S(n).val(),a)return t;s.push(t)}return s},set:function(e,t){var n,r,i=e.options,o=S.makeArray(t),a=i.length;while(a--)((r=i[a]).selected=-1<S.inArray(S.valHooks.option.get(r),o))&&(n=!0);return n||(e.selectedIndex=-1),o}}}}),S.each(["radio","checkbox"],function(){S.valHooks[this]={set:function(e,t){if(Array.isArray(t))return e.checked=-1<S.inArray(S(e).val(),t)}},y.checkOn||(S.valHooks[this].get=function(e){return null===e.getAttribute("value")?"on":e.value})}),y.focusin="onfocusin"in C;var mt=/^(?:focusinfocus|focusoutblur)$/,xt=function(e){e.stopPropagation()};S.extend(S.event,{trigger:function(e,t,n,r){var i,o,a,s,u,l,c,f,p=[n||E],d=v.call(e,"type")?e.type:e,h=v.call(e,"namespace")?e.namespace.split("."):[];if(o=f=a=n=n||E,3!==n.nodeType&&8!==n.nodeType&&!mt.test(d+S.event.triggered)&&(-1<d.indexOf(".")&&(d=(h=d.split(".")).shift(),h.sort()),u=d.indexOf(":")<0&&"on"+d,(e=e[S.expando]?e:new S.Event(d,"object"==typeof e&&e)).isTrigger=r?2:3,e.namespace=h.join("."),
+e.rnamespace=e.namespace?new RegExp("(^|\\.)"+h.join("\\.(?:.*\\.|)")+"(\\.|$)"):null,e.result=void 0,e.target||(e.target=n),t=null==t?[e]:S.makeArray(t,[e]),c=S.event.special[d]||{},r||!c.trigger||!1!==c.trigger.apply(n,t))){if(!r&&!c.noBubble&&!x(n)){for(s=c.delegateType||d,mt.test(s+d)||(o=o.parentNode);o;o=o.parentNode)p.push(o),a=o;a===(n.ownerDocument||E)&&p.push(a.defaultView||a.parentWindow||C)}i=0;while((o=p[i++])&&!e.isPropagationStopped())f=o,e.type=1<i?s:c.bindType||d,(l=(Y.get(o,"events")||Object.create(null))[e.type]&&Y.get(o,"handle"))&&l.apply(o,t),(l=u&&o[u])&&l.apply&&V(o)&&(e.result=l.apply(o,t),!1===e.result&&e.preventDefault());return e.type=d,r||e.isDefaultPrevented()||c._default&&!1!==c._default.apply(p.pop(),t)||!V(n)||u&&m(n[d])&&!x(n)&&((a=n[u])&&(n[u]=null),S.event.triggered=d,e.isPropagationStopped()&&f.addEventListener(d,xt),n[d](),e.isPropagationStopped()&&f.removeEventListener(d,xt),S.event.triggered=void 0,a&&(n[u]=a)),e.result}},simulate:function(e,t,n){var r=S.extend(
+new S.Event,n,{type:e,isSimulated:!0});S.event.trigger(r,null,t)}}),S.fn.extend({trigger:function(e,t){return this.each(function(){S.event.trigger(e,t,this)})},triggerHandler:function(e,t){var n=this[0];if(n)return S.event.trigger(e,t,n,!0)}}),y.focusin||S.each({focus:"focusin",blur:"focusout"},function(n,r){var i=function(e){S.event.simulate(r,e.target,S.event.fix(e))};S.event.special[r]={setup:function(){var e=this.ownerDocument||this.document||this,t=Y.access(e,r);t||e.addEventListener(n,i,!0),Y.access(e,r,(t||0)+1)},teardown:function(){var e=this.ownerDocument||this.document||this,t=Y.access(e,r)-1;t?Y.access(e,r,t):(e.removeEventListener(n,i,!0),Y.remove(e,r))}}});var bt=C.location,wt={guid:Date.now()},Tt=/\?/;S.parseXML=function(e){var t,n;if(!e||"string"!=typeof e)return null;try{t=(new C.DOMParser).parseFromString(e,"text/xml")}catch(e){}return n=t&&t.getElementsByTagName("parsererror")[0],t&&!n||S.error("Invalid XML: "+(n?S.map(n.childNodes,function(e){return e.textContent}).join("\n"):e)),t};
+var Ct=/\[\]$/,Et=/\r?\n/g,St=/^(?:submit|button|image|reset|file)$/i,kt=/^(?:input|select|textarea|keygen)/i;function At(n,e,r,i){var t;if(Array.isArray(e))S.each(e,function(e,t){r||Ct.test(n)?i(n,t):At(n+"["+("object"==typeof t&&null!=t?e:"")+"]",t,r,i)});else if(r||"object"!==w(e))i(n,e);else for(t in e)At(n+"["+t+"]",e[t],r,i)}S.param=function(e,t){var n,r=[],i=function(e,t){var n=m(t)?t():t;r[r.length]=encodeURIComponent(e)+"="+encodeURIComponent(null==n?"":n)};if(null==e)return"";if(Array.isArray(e)||e.jquery&&!S.isPlainObject(e))S.each(e,function(){i(this.name,this.value)});else for(n in e)At(n,e[n],t,i);return r.join("&")},S.fn.extend({serialize:function(){return S.param(this.serializeArray())},serializeArray:function(){return this.map(function(){var e=S.prop(this,"elements");return e?S.makeArray(e):this}).filter(function(){var e=this.type;return this.name&&!S(this).is(":disabled")&&kt.test(this.nodeName)&&!St.test(e)&&(this.checked||!pe.test(e))}).map(function(e,t){var n=S(this).val();
+return null==n?null:Array.isArray(n)?S.map(n,function(e){return{name:t.name,value:e.replace(Et,"\r\n")}}):{name:t.name,value:n.replace(Et,"\r\n")}}).get()}});var Nt=/%20/g,jt=/#.*$/,Dt=/([?&])_=[^&]*/,qt=/^(.*?):[ \t]*([^\r\n]*)$/gm,Lt=/^(?:GET|HEAD)$/,Ht=/^\/\//,Ot={},Pt={},Rt="*/".concat("*"),Mt=E.createElement("a");function It(o){return function(e,t){"string"!=typeof e&&(t=e,e="*");var n,r=0,i=e.toLowerCase().match(P)||[];if(m(t))while(n=i[r++])"+"===n[0]?(n=n.slice(1)||"*",(o[n]=o[n]||[]).unshift(t)):(o[n]=o[n]||[]).push(t)}}function Wt(t,i,o,a){var s={},u=t===Pt;function l(e){var r;return s[e]=!0,S.each(t[e]||[],function(e,t){var n=t(i,o,a);return"string"!=typeof n||u||s[n]?u?!(r=n):void 0:(i.dataTypes.unshift(n),l(n),!1)}),r}return l(i.dataTypes[0])||!s["*"]&&l("*")}function Ft(e,t){var n,r,i=S.ajaxSettings.flatOptions||{};for(n in t)void 0!==t[n]&&((i[n]?e:r||(r={}))[n]=t[n]);return r&&S.extend(!0,e,r),e}Mt.href=bt.href,S.extend({active:0,lastModified:{},etag:{},ajaxSettings:{url:bt.href,type:"GET",
+isLocal:/^(?:about|app|app-storage|.+-extension|file|res|widget):$/.test(bt.protocol),global:!0,processData:!0,async:!0,contentType:"application/x-www-form-urlencoded; charset=UTF-8",accepts:{"*":Rt,text:"text/plain",html:"text/html",xml:"application/xml, text/xml",json:"application/json, text/javascript"},contents:{xml:/\bxml\b/,html:/\bhtml/,json:/\bjson\b/},responseFields:{xml:"responseXML",text:"responseText",json:"responseJSON"},converters:{"* text":String,"text html":!0,"text json":JSON.parse,"text xml":S.parseXML},flatOptions:{url:!0,context:!0}},ajaxSetup:function(e,t){return t?Ft(Ft(e,S.ajaxSettings),t):Ft(S.ajaxSettings,e)},ajaxPrefilter:It(Ot),ajaxTransport:It(Pt),ajax:function(e,t){"object"==typeof e&&(t=e,e=void 0),t=t||{};var c,f,p,n,d,r,h,g,i,o,v=S.ajaxSetup({},t),y=v.context||v,m=v.context&&(y.nodeType||y.jquery)?S(y):S.event,x=S.Deferred(),b=S.Callbacks("once memory"),w=v.statusCode||{},a={},s={},u="canceled",T={readyState:0,getResponseHeader:function(e){var t;if(h){if(!n){n={};while(
+t=qt.exec(p))n[t[1].toLowerCase()+" "]=(n[t[1].toLowerCase()+" "]||[]).concat(t[2])}t=n[e.toLowerCase()+" "]}return null==t?null:t.join(", ")},getAllResponseHeaders:function(){return h?p:null},setRequestHeader:function(e,t){return null==h&&(e=s[e.toLowerCase()]=s[e.toLowerCase()]||e,a[e]=t),this},overrideMimeType:function(e){return null==h&&(v.mimeType=e),this},statusCode:function(e){var t;if(e)if(h)T.always(e[T.status]);else for(t in e)w[t]=[w[t],e[t]];return this},abort:function(e){var t=e||u;return c&&c.abort(t),l(0,t),this}};if(x.promise(T),v.url=((e||v.url||bt.href)+"").replace(Ht,bt.protocol+"//"),v.type=t.method||t.type||v.method||v.type,v.dataTypes=(v.dataType||"*").toLowerCase().match(P)||[""],null==v.crossDomain){r=E.createElement("a");try{r.href=v.url,r.href=r.href,v.crossDomain=Mt.protocol+"//"+Mt.host!=r.protocol+"//"+r.host}catch(e){v.crossDomain=!0}}if(v.data&&v.processData&&"string"!=typeof v.data&&(v.data=S.param(v.data,v.traditional)),Wt(Ot,v,t,T),h)return T;for(i in(g=S.event&&v.global
+)&&0==S.active++&&S.event.trigger("ajaxStart"),v.type=v.type.toUpperCase(),v.hasContent=!Lt.test(v.type),f=v.url.replace(jt,""),v.hasContent?v.data&&v.processData&&0===(v.contentType||"").indexOf("application/x-www-form-urlencoded")&&(v.data=v.data.replace(Nt,"+")):(o=v.url.slice(f.length),v.data&&(v.processData||"string"==typeof v.data)&&(f+=(Tt.test(f)?"&":"?")+v.data,delete v.data),!1===v.cache&&(f=f.replace(Dt,"$1"),o=(Tt.test(f)?"&":"?")+"_="+wt.guid+++o),v.url=f+o),v.ifModified&&(S.lastModified[f]&&T.setRequestHeader("If-Modified-Since",S.lastModified[f]),S.etag[f]&&T.setRequestHeader("If-None-Match",S.etag[f])),(v.data&&v.hasContent&&!1!==v.contentType||t.contentType)&&T.setRequestHeader("Content-Type",v.contentType),T.setRequestHeader("Accept",v.dataTypes[0]&&v.accepts[v.dataTypes[0]]?v.accepts[v.dataTypes[0]]+("*"!==v.dataTypes[0]?", "+Rt+"; q=0.01":""):v.accepts["*"]),v.headers)T.setRequestHeader(i,v.headers[i]);if(v.beforeSend&&(!1===v.beforeSend.call(y,T,v)||h))return T.abort();if(u="abort",b.add(
+v.complete),T.done(v.success),T.fail(v.error),c=Wt(Pt,v,t,T)){if(T.readyState=1,g&&m.trigger("ajaxSend",[T,v]),h)return T;v.async&&0<v.timeout&&(d=C.setTimeout(function(){T.abort("timeout")},v.timeout));try{h=!1,c.send(a,l)}catch(e){if(h)throw e;l(-1,e)}}else l(-1,"No Transport");function l(e,t,n,r){var i,o,a,s,u,l=t;h||(h=!0,d&&C.clearTimeout(d),c=void 0,p=r||"",T.readyState=0<e?4:0,i=200<=e&&e<300||304===e,n&&(s=function(e,t,n){var r,i,o,a,s=e.contents,u=e.dataTypes;while("*"===u[0])u.shift(),void 0===r&&(r=e.mimeType||t.getResponseHeader("Content-Type"));if(r)for(i in s)if(s[i]&&s[i].test(r)){u.unshift(i);break}if(u[0]in n)o=u[0];else{for(i in n){if(!u[0]||e.converters[i+" "+u[0]]){o=i;break}a||(a=i)}o=o||a}if(o)return o!==u[0]&&u.unshift(o),n[o]}(v,T,n)),!i&&-1<S.inArray("script",v.dataTypes)&&S.inArray("json",v.dataTypes)<0&&(v.converters["text script"]=function(){}),s=function(e,t,n,r){var i,o,a,s,u,l={},c=e.dataTypes.slice();if(c[1])for(a in e.converters)l[a.toLowerCase()]=e.converters[a];o=c.shift();
+while(o)if(e.responseFields[o]&&(n[e.responseFields[o]]=t),!u&&r&&e.dataFilter&&(t=e.dataFilter(t,e.dataType)),u=o,o=c.shift())if("*"===o)o=u;else if("*"!==u&&u!==o){if(!(a=l[u+" "+o]||l["* "+o]))for(i in l)if((s=i.split(" "))[1]===o&&(a=l[u+" "+s[0]]||l["* "+s[0]])){!0===a?a=l[i]:!0!==l[i]&&(o=s[0],c.unshift(s[1]));break}if(!0!==a)if(a&&e["throws"])t=a(t);else try{t=a(t)}catch(e){return{state:"parsererror",error:a?e:"No conversion from "+u+" to "+o}}}return{state:"success",data:t}}(v,s,T,i),i?(v.ifModified&&((u=T.getResponseHeader("Last-Modified"))&&(S.lastModified[f]=u),(u=T.getResponseHeader("etag"))&&(S.etag[f]=u)),204===e||"HEAD"===v.type?l="nocontent":304===e?l="notmodified":(l=s.state,o=s.data,i=!(a=s.error))):(a=l,!e&&l||(l="error",e<0&&(e=0))),T.status=e,T.statusText=(t||l)+"",i?x.resolveWith(y,[o,l,T]):x.rejectWith(y,[T,l,a]),T.statusCode(w),w=void 0,g&&m.trigger(i?"ajaxSuccess":"ajaxError",[T,v,i?o:a]),b.fireWith(y,[T,l]),g&&(m.trigger("ajaxComplete",[T,v]),--S.active||S.event.trigger("ajaxStop")))
+}return T},getJSON:function(e,t,n){return S.get(e,t,n,"json")},getScript:function(e,t){return S.get(e,void 0,t,"script")}}),S.each(["get","post"],function(e,i){S[i]=function(e,t,n,r){return m(t)&&(r=r||n,n=t,t=void 0),S.ajax(S.extend({url:e,type:i,dataType:r,data:t,success:n},S.isPlainObject(e)&&e))}}),S.ajaxPrefilter(function(e){var t;for(t in e.headers)"content-type"===t.toLowerCase()&&(e.contentType=e.headers[t]||"")}),S._evalUrl=function(e,t,n){return S.ajax({url:e,type:"GET",dataType:"script",cache:!0,async:!1,global:!1,converters:{"text script":function(){}},dataFilter:function(e){S.globalEval(e,t,n)}})},S.fn.extend({wrapAll:function(e){var t;return this[0]&&(m(e)&&(e=e.call(this[0])),t=S(e,this[0].ownerDocument).eq(0).clone(!0),this[0].parentNode&&t.insertBefore(this[0]),t.map(function(){var e=this;while(e.firstElementChild)e=e.firstElementChild;return e}).append(this)),this},wrapInner:function(n){return m(n)?this.each(function(e){S(this).wrapInner(n.call(this,e))}):this.each(function(){var e=S(this),
+t=e.contents();t.length?t.wrapAll(n):e.append(n)})},wrap:function(t){var n=m(t);return this.each(function(e){S(this).wrapAll(n?t.call(this,e):t)})},unwrap:function(e){return this.parent(e).not("body").each(function(){S(this).replaceWith(this.childNodes)}),this}}),S.expr.pseudos.hidden=function(e){return!S.expr.pseudos.visible(e)},S.expr.pseudos.visible=function(e){return!!(e.offsetWidth||e.offsetHeight||e.getClientRects().length)},S.ajaxSettings.xhr=function(){try{return new C.XMLHttpRequest}catch(e){}};var Bt={0:200,1223:204},$t=S.ajaxSettings.xhr();y.cors=!!$t&&"withCredentials"in $t,y.ajax=$t=!!$t,S.ajaxTransport(function(i){var o,a;if(y.cors||$t&&!i.crossDomain)return{send:function(e,t){var n,r=i.xhr();if(r.open(i.type,i.url,i.async,i.username,i.password),i.xhrFields)for(n in i.xhrFields)r[n]=i.xhrFields[n];for(n in i.mimeType&&r.overrideMimeType&&r.overrideMimeType(i.mimeType),i.crossDomain||e["X-Requested-With"]||(e["X-Requested-With"]="XMLHttpRequest"),e)r.setRequestHeader(n,e[n]);o=function(e){
+return function(){o&&(o=a=r.onload=r.onerror=r.onabort=r.ontimeout=r.onreadystatechange=null,"abort"===e?r.abort():"error"===e?"number"!=typeof r.status?t(0,"error"):t(r.status,r.statusText):t(Bt[r.status]||r.status,r.statusText,"text"!==(r.responseType||"text")||"string"!=typeof r.responseText?{binary:r.response}:{text:r.responseText},r.getAllResponseHeaders()))}},r.onload=o(),a=r.onerror=r.ontimeout=o("error"),void 0!==r.onabort?r.onabort=a:r.onreadystatechange=function(){4===r.readyState&&C.setTimeout(function(){o&&a()})},o=o("abort");try{r.send(i.hasContent&&i.data||null)}catch(e){if(o)throw e}},abort:function(){o&&o()}}}),S.ajaxPrefilter(function(e){e.crossDomain&&(e.contents.script=!1)}),S.ajaxSetup({accepts:{script:"text/javascript, application/javascript, application/ecmascript, application/x-ecmascript"},contents:{script:/\b(?:java|ecma)script\b/},converters:{"text script":function(e){return S.globalEval(e),e}}}),S.ajaxPrefilter("script",function(e){void 0===e.cache&&(e.cache=!1),e.crossDomain&&(
+e.type="GET")}),S.ajaxTransport("script",function(n){var r,i;if(n.crossDomain||n.scriptAttrs)return{send:function(e,t){r=S("<script>").attr(n.scriptAttrs||{}).prop({charset:n.scriptCharset,src:n.url}).on("load error",i=function(e){r.remove(),i=null,e&&t("error"===e.type?404:200,e.type)}),E.head.appendChild(r[0])},abort:function(){i&&i()}}});var _t,zt=[],Ut=/(=)\?(?=&|$)|\?\?/;S.ajaxSetup({jsonp:"callback",jsonpCallback:function(){var e=zt.pop()||S.expando+"_"+wt.guid++;return this[e]=!0,e}}),S.ajaxPrefilter("json jsonp",function(e,t,n){var r,i,o,a=!1!==e.jsonp&&(Ut.test(e.url)?"url":"string"==typeof e.data&&0===(e.contentType||"").indexOf("application/x-www-form-urlencoded")&&Ut.test(e.data)&&"data");if(a||"jsonp"===e.dataTypes[0])return r=e.jsonpCallback=m(e.jsonpCallback)?e.jsonpCallback():e.jsonpCallback,a?e[a]=e[a].replace(Ut,"$1"+r):!1!==e.jsonp&&(e.url+=(Tt.test(e.url)?"&":"?")+e.jsonp+"="+r),e.converters["script json"]=function(){return o||S.error(r+" was not called"),o[0]},e.dataTypes[0]="json",i=C[r]
+,C[r]=function(){o=arguments},n.always(function(){void 0===i?S(C).removeProp(r):C[r]=i,e[r]&&(e.jsonpCallback=t.jsonpCallback,zt.push(r)),o&&m(i)&&i(o[0]),o=i=void 0}),"script"}),y.createHTMLDocument=((_t=E.implementation.createHTMLDocument("").body).innerHTML="<form></form><form></form>",2===_t.childNodes.length),S.parseHTML=function(e,t,n){return"string"!=typeof e?[]:("boolean"==typeof t&&(n=t,t=!1),t||(y.createHTMLDocument?((r=(t=E.implementation.createHTMLDocument("")).createElement("base")).href=E.location.href,t.head.appendChild(r)):t=E),o=!n&&[],(i=N.exec(e))?[t.createElement(i[1])]:(i=xe([e],t,o),o&&o.length&&S(o).remove(),S.merge([],i.childNodes)));var r,i,o},S.fn.load=function(e,t,n){var r,i,o,a=this,s=e.indexOf(" ");return-1<s&&(r=ht(e.slice(s)),e=e.slice(0,s)),m(t)?(n=t,t=void 0):t&&"object"==typeof t&&(i="POST"),0<a.length&&S.ajax({url:e,type:i||"GET",dataType:"html",data:t}).done(function(e){o=arguments,a.html(r?S("<div>").append(S.parseHTML(e)).find(r):e)}).always(n&&function(e,t){a.each(
+function(){n.apply(this,o||[e.responseText,t,e])})}),this},S.expr.pseudos.animated=function(t){return S.grep(S.timers,function(e){return t===e.elem}).length},S.offset={setOffset:function(e,t,n){var r,i,o,a,s,u,l=S.css(e,"position"),c=S(e),f={};"static"===l&&(e.style.position="relative"),s=c.offset(),o=S.css(e,"top"),u=S.css(e,"left"),("absolute"===l||"fixed"===l)&&-1<(o+u).indexOf("auto")?(a=(r=c.position()).top,i=r.left):(a=parseFloat(o)||0,i=parseFloat(u)||0),m(t)&&(t=t.call(e,n,S.extend({},s))),null!=t.top&&(f.top=t.top-s.top+a),null!=t.left&&(f.left=t.left-s.left+i),"using"in t?t.using.call(e,f):c.css(f)}},S.fn.extend({offset:function(t){if(arguments.length)return void 0===t?this:this.each(function(e){S.offset.setOffset(this,t,e)});var e,n,r=this[0];return r?r.getClientRects().length?(e=r.getBoundingClientRect(),n=r.ownerDocument.defaultView,{top:e.top+n.pageYOffset,left:e.left+n.pageXOffset}):{top:0,left:0}:void 0},position:function(){if(this[0]){var e,t,n,r=this[0],i={top:0,left:0};if("fixed"===S.css(r,
+"position"))t=r.getBoundingClientRect();else{t=this.offset(),n=r.ownerDocument,e=r.offsetParent||n.documentElement;while(e&&(e===n.body||e===n.documentElement)&&"static"===S.css(e,"position"))e=e.parentNode;e&&e!==r&&1===e.nodeType&&((i=S(e).offset()).top+=S.css(e,"borderTopWidth",!0),i.left+=S.css(e,"borderLeftWidth",!0))}return{top:t.top-i.top-S.css(r,"marginTop",!0),left:t.left-i.left-S.css(r,"marginLeft",!0)}}},offsetParent:function(){return this.map(function(){var e=this.offsetParent;while(e&&"static"===S.css(e,"position"))e=e.offsetParent;return e||re})}}),S.each({scrollLeft:"pageXOffset",scrollTop:"pageYOffset"},function(t,i){var o="pageYOffset"===i;S.fn[t]=function(e){return $(this,function(e,t,n){var r;if(x(e)?r=e:9===e.nodeType&&(r=e.defaultView),void 0===n)return r?r[i]:e[t];r?r.scrollTo(o?r.pageXOffset:n,o?n:r.pageYOffset):e[t]=n},t,e,arguments.length)}}),S.each(["top","left"],function(e,n){S.cssHooks[n]=Fe(y.pixelPosition,function(e,t){if(t)return t=We(e,n),Pe.test(t)?S(e).position()[n]+"px":t})}
+),S.each({Height:"height",Width:"width"},function(a,s){S.each({padding:"inner"+a,content:s,"":"outer"+a},function(r,o){S.fn[o]=function(e,t){var n=arguments.length&&(r||"boolean"!=typeof e),i=r||(!0===e||!0===t?"margin":"border");return $(this,function(e,t,n){var r;return x(e)?0===o.indexOf("outer")?e["inner"+a]:e.document.documentElement["client"+a]:9===e.nodeType?(r=e.documentElement,Math.max(e.body["scroll"+a],r["scroll"+a],e.body["offset"+a],r["offset"+a],r["client"+a])):void 0===n?S.css(e,t,i):S.style(e,t,n,i)},s,n?e:void 0,n)}})}),S.each(["ajaxStart","ajaxStop","ajaxComplete","ajaxError","ajaxSuccess","ajaxSend"],function(e,t){S.fn[t]=function(e){return this.on(t,e)}}),S.fn.extend({bind:function(e,t,n){return this.on(e,null,t,n)},unbind:function(e,t){return this.off(e,null,t)},delegate:function(e,t,n,r){return this.on(t,e,n,r)},undelegate:function(e,t,n){return 1===arguments.length?this.off(e,"**"):this.off(t,e||"**",n)},hover:function(e,t){return this.mouseenter(e).mouseleave(t||e)}}),S.each(
+"blur focus focusin focusout resize scroll click dblclick mousedown mouseup mousemove mouseover mouseout mouseenter mouseleave change select submit keydown keypress keyup contextmenu".split(" "),function(e,n){S.fn[n]=function(e,t){return 0<arguments.length?this.on(n,null,e,t):this.trigger(n)}});var Xt=/^[\s\uFEFF\xA0]+|[\s\uFEFF\xA0]+$/g;S.proxy=function(e,t){var n,r,i;if("string"==typeof t&&(n=e[t],t=e,e=n),m(e))return r=s.call(arguments,2),(i=function(){return e.apply(t||this,r.concat(s.call(arguments)))}).guid=e.guid=e.guid||S.guid++,i},S.holdReady=function(e){e?S.readyWait++:S.ready(!0)},S.isArray=Array.isArray,S.parseJSON=JSON.parse,S.nodeName=A,S.isFunction=m,S.isWindow=x,S.camelCase=X,S.type=w,S.now=Date.now,S.isNumeric=function(e){var t=S.type(e);return("number"===t||"string"===t)&&!isNaN(e-parseFloat(e))},S.trim=function(e){return null==e?"":(e+"").replace(Xt,"")},"function"==typeof define&&define.amd&&define("jquery",[],function(){return S});var Vt=C.jQuery,Gt=C.$;return S.noConflict=function(e){
+return C.$===S&&(C.$=Gt),e&&C.jQuery===S&&(C.jQuery=Vt),S},"undefined"==typeof e&&(C.jQuery=C.$=S),S});
+/*! jQuery UI - v1.13.2 - 2022-08-01
 * http://jqueryui.com
-* Includes: widget.js, position.js, data.js, disable-selection.js, focusable.js, form-reset-mixin.js, jquery-1-7.js, keycode.js, labels.js, scroll-parent.js, tabbable.js, unique-id.js, widgets/resizable.js, widgets/mouse.js
-* Copyright jQuery Foundation and other contributors; Licensed MIT */
-
-(function(t){"function"==typeof define&&define.amd?define(["jquery"],t):t(jQuery)})(function(t){function e(t){for(var e=t.css("visibility");"inherit"===e;)t=t.parent(),e=t.css("visibility");return"hidden"!==e}t.ui=t.ui||{},t.ui.version="1.12.1";var i=0,s=Array.prototype.slice;t.cleanData=function(e){return function(i){var s,n,o;for(o=0;null!=(n=i[o]);o++)try{s=t._data(n,"events"),s&&s.remove&&t(n).triggerHandler("remove")}catch(a){}e(i)}}(t.cleanData),t.widget=function(e,i,s){var n,o,a,r={},h=e.split(".")[0];e=e.split(".")[1];var l=h+"-"+e;return s||(s=i,i=t.Widget),t.isArray(s)&&(s=t.extend.apply(null,[{}].concat(s))),t.expr[":"][l.toLowerCase()]=function(e){return!!t.data(e,l)},t[h]=t[h]||{},n=t[h][e],o=t[h][e]=function(t,e){return this._createWidget?(arguments.length&&this._createWidget(t,e),void 0):new o(t,e)},t.extend(o,n,{version:s.version,_proto:t.extend({},s),_childConstructors:[]}),a=new i,a.options=t.widget.extend({},a.options),t.each(s,function(e,s){return t.isFunction(s)?(r[e]=function(){function t(){return i.prototype[e].apply(this,arguments)}function n(t){return i.prototype[e].apply(this,t)}return function(){var e,i=this._super,o=this._superApply;return this._super=t,this._superApply=n,e=s.apply(this,arguments),this._super=i,this._superApply=o,e}}(),void 0):(r[e]=s,void 0)}),o.prototype=t.widget.extend(a,{widgetEventPrefix:n?a.widgetEventPrefix||e:e},r,{constructor:o,namespace:h,widgetName:e,widgetFullName:l}),n?(t.each(n._childConstructors,function(e,i){var s=i.prototype;t.widget(s.namespace+"."+s.widgetName,o,i._proto)}),delete n._childConstructors):i._childConstructors.push(o),t.widget.bridge(e,o),o},t.widget.extend=function(e){for(var i,n,o=s.call(arguments,1),a=0,r=o.length;r>a;a++)for(i in o[a])n=o[a][i],o[a].hasOwnProperty(i)&&void 0!==n&&(e[i]=t.isPlainObject(n)?t.isPlainObject(e[i])?t.widget.extend({},e[i],n):t.widget.extend({},n):n);return e},t.widget.bridge=function(e,i){var n=i.prototype.widgetFullName||e;t.fn[e]=function(o){var a="string"==typeof o,r=s.call(arguments,1),h=this;return a?this.length||"instance"!==o?this.each(function(){var i,s=t.data(this,n);return"instance"===o?(h=s,!1):s?t.isFunction(s[o])&&"_"!==o.charAt(0)?(i=s[o].apply(s,r),i!==s&&void 0!==i?(h=i&&i.jquery?h.pushStack(i.get()):i,!1):void 0):t.error("no such method '"+o+"' for "+e+" widget instance"):t.error("cannot call methods on "+e+" prior to initialization; "+"attempted to call method '"+o+"'")}):h=void 0:(r.length&&(o=t.widget.extend.apply(null,[o].concat(r))),this.each(function(){var e=t.data(this,n);e?(e.option(o||{}),e._init&&e._init()):t.data(this,n,new i(o,this))})),h}},t.Widget=function(){},t.Widget._childConstructors=[],t.Widget.prototype={widgetName:"widget",widgetEventPrefix:"",defaultElement:"<div>",options:{classes:{},disabled:!1,create:null},_createWidget:function(e,s){s=t(s||this.defaultElement||this)[0],this.element=t(s),this.uuid=i++,this.eventNamespace="."+this.widgetName+this.uuid,this.bindings=t(),this.hoverable=t(),this.focusable=t(),this.classesElementLookup={},s!==this&&(t.data(s,this.widgetFullName,this),this._on(!0,this.element,{remove:function(t){t.target===s&&this.destroy()}}),this.document=t(s.style?s.ownerDocument:s.document||s),this.window=t(this.document[0].defaultView||this.document[0].parentWindow)),this.options=t.widget.extend({},this.options,this._getCreateOptions(),e),this._create(),this.options.disabled&&this._setOptionDisabled(this.options.disabled),this._trigger("create",null,this._getCreateEventData()),this._init()},_getCreateOptions:function(){return{}},_getCreateEventData:t.noop,_create:t.noop,_init:t.noop,destroy:function(){var e=this;this._destroy(),t.each(this.classesElementLookup,function(t,i){e._removeClass(i,t)}),this.element.off(this.eventNamespace).removeData(this.widgetFullName),this.widget().off(this.eventNamespace).removeAttr("aria-disabled"),this.bindings.off(this.eventNamespace)},_destroy:t.noop,widget:function(){return this.element},option:function(e,i){var s,n,o,a=e;if(0===arguments.length)return t.widget.extend({},this.options);if("string"==typeof e)if(a={},s=e.split("."),e=s.shift(),s.length){for(n=a[e]=t.widget.extend({},this.options[e]),o=0;s.length-1>o;o++)n[s[o]]=n[s[o]]||{},n=n[s[o]];if(e=s.pop(),1===arguments.length)return void 0===n[e]?null:n[e];n[e]=i}else{if(1===arguments.length)return void 0===this.options[e]?null:this.options[e];a[e]=i}return this._setOptions(a),this},_setOptions:function(t){var e;for(e in t)this._setOption(e,t[e]);return this},_setOption:function(t,e){return"classes"===t&&this._setOptionClasses(e),this.options[t]=e,"disabled"===t&&this._setOptionDisabled(e),this},_setOptionClasses:function(e){var i,s,n;for(i in e)n=this.classesElementLookup[i],e[i]!==this.options.classes[i]&&n&&n.length&&(s=t(n.get()),this._removeClass(n,i),s.addClass(this._classes({element:s,keys:i,classes:e,add:!0})))},_setOptionDisabled:function(t){this._toggleClass(this.widget(),this.widgetFullName+"-disabled",null,!!t),t&&(this._removeClass(this.hoverable,null,"ui-state-hover"),this._removeClass(this.focusable,null,"ui-state-focus"))},enable:function(){return this._setOptions({disabled:!1})},disable:function(){return this._setOptions({disabled:!0})},_classes:function(e){function i(i,o){var a,r;for(r=0;i.length>r;r++)a=n.classesElementLookup[i[r]]||t(),a=e.add?t(t.unique(a.get().concat(e.element.get()))):t(a.not(e.element).get()),n.classesElementLookup[i[r]]=a,s.push(i[r]),o&&e.classes[i[r]]&&s.push(e.classes[i[r]])}var s=[],n=this;return e=t.extend({element:this.element,classes:this.options.classes||{}},e),this._on(e.element,{remove:"_untrackClassesElement"}),e.keys&&i(e.keys.match(/\S+/g)||[],!0),e.extra&&i(e.extra.match(/\S+/g)||[]),s.join(" ")},_untrackClassesElement:function(e){var i=this;t.each(i.classesElementLookup,function(s,n){-1!==t.inArray(e.target,n)&&(i.classesElementLookup[s]=t(n.not(e.target).get()))})},_removeClass:function(t,e,i){return this._toggleClass(t,e,i,!1)},_addClass:function(t,e,i){return this._toggleClass(t,e,i,!0)},_toggleClass:function(t,e,i,s){s="boolean"==typeof s?s:i;var n="string"==typeof t||null===t,o={extra:n?e:i,keys:n?t:e,element:n?this.element:t,add:s};return o.element.toggleClass(this._classes(o),s),this},_on:function(e,i,s){var n,o=this;"boolean"!=typeof e&&(s=i,i=e,e=!1),s?(i=n=t(i),this.bindings=this.bindings.add(i)):(s=i,i=this.element,n=this.widget()),t.each(s,function(s,a){function r(){return e||o.options.disabled!==!0&&!t(this).hasClass("ui-state-disabled")?("string"==typeof a?o[a]:a).apply(o,arguments):void 0}"string"!=typeof a&&(r.guid=a.guid=a.guid||r.guid||t.guid++);var h=s.match(/^([\w:-]*)\s*(.*)$/),l=h[1]+o.eventNamespace,c=h[2];c?n.on(l,c,r):i.on(l,r)})},_off:function(e,i){i=(i||"").split(" ").join(this.eventNamespace+" ")+this.eventNamespace,e.off(i).off(i),this.bindings=t(this.bindings.not(e).get()),this.focusable=t(this.focusable.not(e).get()),this.hoverable=t(this.hoverable.not(e).get())},_delay:function(t,e){function i(){return("string"==typeof t?s[t]:t).apply(s,arguments)}var s=this;return setTimeout(i,e||0)},_hoverable:function(e){this.hoverable=this.hoverable.add(e),this._on(e,{mouseenter:function(e){this._addClass(t(e.currentTarget),null,"ui-state-hover")},mouseleave:function(e){this._removeClass(t(e.currentTarget),null,"ui-state-hover")}})},_focusable:function(e){this.focusable=this.focusable.add(e),this._on(e,{focusin:function(e){this._addClass(t(e.currentTarget),null,"ui-state-focus")},focusout:function(e){this._removeClass(t(e.currentTarget),null,"ui-state-focus")}})},_trigger:function(e,i,s){var n,o,a=this.options[e];if(s=s||{},i=t.Event(i),i.type=(e===this.widgetEventPrefix?e:this.widgetEventPrefix+e).toLowerCase(),i.target=this.element[0],o=i.originalEvent)for(n in o)n in i||(i[n]=o[n]);return this.element.trigger(i,s),!(t.isFunction(a)&&a.apply(this.element[0],[i].concat(s))===!1||i.isDefaultPrevented())}},t.each({show:"fadeIn",hide:"fadeOut"},function(e,i){t.Widget.prototype["_"+e]=function(s,n,o){"string"==typeof n&&(n={effect:n});var a,r=n?n===!0||"number"==typeof n?i:n.effect||i:e;n=n||{},"number"==typeof n&&(n={duration:n}),a=!t.isEmptyObject(n),n.complete=o,n.delay&&s.delay(n.delay),a&&t.effects&&t.effects.effect[r]?s[e](n):r!==e&&s[r]?s[r](n.duration,n.easing,o):s.queue(function(i){t(this)[e](),o&&o.call(s[0]),i()})}}),t.widget,function(){function e(t,e,i){return[parseFloat(t[0])*(u.test(t[0])?e/100:1),parseFloat(t[1])*(u.test(t[1])?i/100:1)]}function i(e,i){return parseInt(t.css(e,i),10)||0}function s(e){var i=e[0];return 9===i.nodeType?{width:e.width(),height:e.height(),offset:{top:0,left:0}}:t.isWindow(i)?{width:e.width(),height:e.height(),offset:{top:e.scrollTop(),left:e.scrollLeft()}}:i.preventDefault?{width:0,height:0,offset:{top:i.pageY,left:i.pageX}}:{width:e.outerWidth(),height:e.outerHeight(),offset:e.offset()}}var n,o=Math.max,a=Math.abs,r=/left|center|right/,h=/top|center|bottom/,l=/[\+\-]\d+(\.[\d]+)?%?/,c=/^\w+/,u=/%$/,d=t.fn.position;t.position={scrollbarWidth:function(){if(void 0!==n)return n;var e,i,s=t("<div style='display:block;position:absolute;width:50px;height:50px;overflow:hidden;'><div style='height:100px;width:auto;'></div></div>"),o=s.children()[0];return t("body").append(s),e=o.offsetWidth,s.css("overflow","scroll"),i=o.offsetWidth,e===i&&(i=s[0].clientWidth),s.remove(),n=e-i},getScrollInfo:function(e){var i=e.isWindow||e.isDocument?"":e.element.css("overflow-x"),s=e.isWindow||e.isDocument?"":e.element.css("overflow-y"),n="scroll"===i||"auto"===i&&e.width<e.element[0].scrollWidth,o="scroll"===s||"auto"===s&&e.height<e.element[0].scrollHeight;return{width:o?t.position.scrollbarWidth():0,height:n?t.position.scrollbarWidth():0}},getWithinInfo:function(e){var i=t(e||window),s=t.isWindow(i[0]),n=!!i[0]&&9===i[0].nodeType,o=!s&&!n;return{element:i,isWindow:s,isDocument:n,offset:o?t(e).offset():{left:0,top:0},scrollLeft:i.scrollLeft(),scrollTop:i.scrollTop(),width:i.outerWidth(),height:i.outerHeight()}}},t.fn.position=function(n){if(!n||!n.of)return d.apply(this,arguments);n=t.extend({},n);var u,p,f,m,g,_,v=t(n.of),b=t.position.getWithinInfo(n.within),y=t.position.getScrollInfo(b),w=(n.collision||"flip").split(" "),x={};return _=s(v),v[0].preventDefault&&(n.at="left top"),p=_.width,f=_.height,m=_.offset,g=t.extend({},m),t.each(["my","at"],function(){var t,e,i=(n[this]||"").split(" ");1===i.length&&(i=r.test(i[0])?i.concat(["center"]):h.test(i[0])?["center"].concat(i):["center","center"]),i[0]=r.test(i[0])?i[0]:"center",i[1]=h.test(i[1])?i[1]:"center",t=l.exec(i[0]),e=l.exec(i[1]),x[this]=[t?t[0]:0,e?e[0]:0],n[this]=[c.exec(i[0])[0],c.exec(i[1])[0]]}),1===w.length&&(w[1]=w[0]),"right"===n.at[0]?g.left+=p:"center"===n.at[0]&&(g.left+=p/2),"bottom"===n.at[1]?g.top+=f:"center"===n.at[1]&&(g.top+=f/2),u=e(x.at,p,f),g.left+=u[0],g.top+=u[1],this.each(function(){var s,r,h=t(this),l=h.outerWidth(),c=h.outerHeight(),d=i(this,"marginLeft"),_=i(this,"marginTop"),k=l+d+i(this,"marginRight")+y.width,C=c+_+i(this,"marginBottom")+y.height,D=t.extend({},g),T=e(x.my,h.outerWidth(),h.outerHeight());"right"===n.my[0]?D.left-=l:"center"===n.my[0]&&(D.left-=l/2),"bottom"===n.my[1]?D.top-=c:"center"===n.my[1]&&(D.top-=c/2),D.left+=T[0],D.top+=T[1],s={marginLeft:d,marginTop:_},t.each(["left","top"],function(e,i){t.ui.position[w[e]]&&t.ui.position[w[e]][i](D,{targetWidth:p,targetHeight:f,elemWidth:l,elemHeight:c,collisionPosition:s,collisionWidth:k,collisionHeight:C,offset:[u[0]+T[0],u[1]+T[1]],my:n.my,at:n.at,within:b,elem:h})}),n.using&&(r=function(t){var e=m.left-D.left,i=e+p-l,s=m.top-D.top,r=s+f-c,u={target:{element:v,left:m.left,top:m.top,width:p,height:f},element:{element:h,left:D.left,top:D.top,width:l,height:c},horizontal:0>i?"left":e>0?"right":"center",vertical:0>r?"top":s>0?"bottom":"middle"};l>p&&p>a(e+i)&&(u.horizontal="center"),c>f&&f>a(s+r)&&(u.vertical="middle"),u.important=o(a(e),a(i))>o(a(s),a(r))?"horizontal":"vertical",n.using.call(this,t,u)}),h.offset(t.extend(D,{using:r}))})},t.ui.position={fit:{left:function(t,e){var i,s=e.within,n=s.isWindow?s.scrollLeft:s.offset.left,a=s.width,r=t.left-e.collisionPosition.marginLeft,h=n-r,l=r+e.collisionWidth-a-n;e.collisionWidth>a?h>0&&0>=l?(i=t.left+h+e.collisionWidth-a-n,t.left+=h-i):t.left=l>0&&0>=h?n:h>l?n+a-e.collisionWidth:n:h>0?t.left+=h:l>0?t.left-=l:t.left=o(t.left-r,t.left)},top:function(t,e){var i,s=e.within,n=s.isWindow?s.scrollTop:s.offset.top,a=e.within.height,r=t.top-e.collisionPosition.marginTop,h=n-r,l=r+e.collisionHeight-a-n;e.collisionHeight>a?h>0&&0>=l?(i=t.top+h+e.collisionHeight-a-n,t.top+=h-i):t.top=l>0&&0>=h?n:h>l?n+a-e.collisionHeight:n:h>0?t.top+=h:l>0?t.top-=l:t.top=o(t.top-r,t.top)}},flip:{left:function(t,e){var i,s,n=e.within,o=n.offset.left+n.scrollLeft,r=n.width,h=n.isWindow?n.scrollLeft:n.offset.left,l=t.left-e.collisionPosition.marginLeft,c=l-h,u=l+e.collisionWidth-r-h,d="left"===e.my[0]?-e.elemWidth:"right"===e.my[0]?e.elemWidth:0,p="left"===e.at[0]?e.targetWidth:"right"===e.at[0]?-e.targetWidth:0,f=-2*e.offset[0];0>c?(i=t.left+d+p+f+e.collisionWidth-r-o,(0>i||a(c)>i)&&(t.left+=d+p+f)):u>0&&(s=t.left-e.collisionPosition.marginLeft+d+p+f-h,(s>0||u>a(s))&&(t.left+=d+p+f))},top:function(t,e){var i,s,n=e.within,o=n.offset.top+n.scrollTop,r=n.height,h=n.isWindow?n.scrollTop:n.offset.top,l=t.top-e.collisionPosition.marginTop,c=l-h,u=l+e.collisionHeight-r-h,d="top"===e.my[1],p=d?-e.elemHeight:"bottom"===e.my[1]?e.elemHeight:0,f="top"===e.at[1]?e.targetHeight:"bottom"===e.at[1]?-e.targetHeight:0,m=-2*e.offset[1];0>c?(s=t.top+p+f+m+e.collisionHeight-r-o,(0>s||a(c)>s)&&(t.top+=p+f+m)):u>0&&(i=t.top-e.collisionPosition.marginTop+p+f+m-h,(i>0||u>a(i))&&(t.top+=p+f+m))}},flipfit:{left:function(){t.ui.position.flip.left.apply(this,arguments),t.ui.position.fit.left.apply(this,arguments)},top:function(){t.ui.position.flip.top.apply(this,arguments),t.ui.position.fit.top.apply(this,arguments)}}}}(),t.ui.position,t.extend(t.expr[":"],{data:t.expr.createPseudo?t.expr.createPseudo(function(e){return function(i){return!!t.data(i,e)}}):function(e,i,s){return!!t.data(e,s[3])}}),t.fn.extend({disableSelection:function(){var t="onselectstart"in document.createElement("div")?"selectstart":"mousedown";return function(){return this.on(t+".ui-disableSelection",function(t){t.preventDefault()})}}(),enableSelection:function(){return this.off(".ui-disableSelection")}}),t.ui.focusable=function(i,s){var n,o,a,r,h,l=i.nodeName.toLowerCase();return"area"===l?(n=i.parentNode,o=n.name,i.href&&o&&"map"===n.nodeName.toLowerCase()?(a=t("img[usemap='#"+o+"']"),a.length>0&&a.is(":visible")):!1):(/^(input|select|textarea|button|object)$/.test(l)?(r=!i.disabled,r&&(h=t(i).closest("fieldset")[0],h&&(r=!h.disabled))):r="a"===l?i.href||s:s,r&&t(i).is(":visible")&&e(t(i)))},t.extend(t.expr[":"],{focusable:function(e){return t.ui.focusable(e,null!=t.attr(e,"tabindex"))}}),t.ui.focusable,t.fn.form=function(){return"string"==typeof this[0].form?this.closest("form"):t(this[0].form)},t.ui.formResetMixin={_formResetHandler:function(){var e=t(this);setTimeout(function(){var i=e.data("ui-form-reset-instances");t.each(i,function(){this.refresh()})})},_bindFormResetHandler:function(){if(this.form=this.element.form(),this.form.length){var t=this.form.data("ui-form-reset-instances")||[];t.length||this.form.on("reset.ui-form-reset",this._formResetHandler),t.push(this),this.form.data("ui-form-reset-instances",t)}},_unbindFormResetHandler:function(){if(this.form.length){var e=this.form.data("ui-form-reset-instances");e.splice(t.inArray(this,e),1),e.length?this.form.data("ui-form-reset-instances",e):this.form.removeData("ui-form-reset-instances").off("reset.ui-form-reset")}}},"1.7"===t.fn.jquery.substring(0,3)&&(t.each(["Width","Height"],function(e,i){function s(e,i,s,o){return t.each(n,function(){i-=parseFloat(t.css(e,"padding"+this))||0,s&&(i-=parseFloat(t.css(e,"border"+this+"Width"))||0),o&&(i-=parseFloat(t.css(e,"margin"+this))||0)}),i}var n="Width"===i?["Left","Right"]:["Top","Bottom"],o=i.toLowerCase(),a={innerWidth:t.fn.innerWidth,innerHeight:t.fn.innerHeight,outerWidth:t.fn.outerWidth,outerHeight:t.fn.outerHeight};t.fn["inner"+i]=function(e){return void 0===e?a["inner"+i].call(this):this.each(function(){t(this).css(o,s(this,e)+"px")})},t.fn["outer"+i]=function(e,n){return"number"!=typeof e?a["outer"+i].call(this,e):this.each(function(){t(this).css(o,s(this,e,!0,n)+"px")})}}),t.fn.addBack=function(t){return this.add(null==t?this.prevObject:this.prevObject.filter(t))}),t.ui.keyCode={BACKSPACE:8,COMMA:188,DELETE:46,DOWN:40,END:35,ENTER:13,ESCAPE:27,HOME:36,LEFT:37,PAGE_DOWN:34,PAGE_UP:33,PERIOD:190,RIGHT:39,SPACE:32,TAB:9,UP:38},t.ui.escapeSelector=function(){var t=/([!"#$%&'()*+,./:;<=>?@[\]^`{|}~])/g;return function(e){return e.replace(t,"\\$1")}}(),t.fn.labels=function(){var e,i,s,n,o;return this[0].labels&&this[0].labels.length?this.pushStack(this[0].labels):(n=this.eq(0).parents("label"),s=this.attr("id"),s&&(e=this.eq(0).parents().last(),o=e.add(e.length?e.siblings():this.siblings()),i="label[for='"+t.ui.escapeSelector(s)+"']",n=n.add(o.find(i).addBack(i))),this.pushStack(n))},t.fn.scrollParent=function(e){var i=this.css("position"),s="absolute"===i,n=e?/(auto|scroll|hidden)/:/(auto|scroll)/,o=this.parents().filter(function(){var e=t(this);return s&&"static"===e.css("position")?!1:n.test(e.css("overflow")+e.css("overflow-y")+e.css("overflow-x"))}).eq(0);return"fixed"!==i&&o.length?o:t(this[0].ownerDocument||document)},t.extend(t.expr[":"],{tabbable:function(e){var i=t.attr(e,"tabindex"),s=null!=i;return(!s||i>=0)&&t.ui.focusable(e,s)}}),t.fn.extend({uniqueId:function(){var t=0;return function(){return this.each(function(){this.id||(this.id="ui-id-"+ ++t)})}}(),removeUniqueId:function(){return this.each(function(){/^ui-id-\d+$/.test(this.id)&&t(this).removeAttr("id")})}}),t.ui.ie=!!/msie [\w.]+/.exec(navigator.userAgent.toLowerCase());var n=!1;t(document).on("mouseup",function(){n=!1}),t.widget("ui.mouse",{version:"1.12.1",options:{cancel:"input, textarea, button, select, option",distance:1,delay:0},_mouseInit:function(){var e=this;this.element.on("mousedown."+this.widgetName,function(t){return e._mouseDown(t)}).on("click."+this.widgetName,function(i){return!0===t.data(i.target,e.widgetName+".preventClickEvent")?(t.removeData(i.target,e.widgetName+".preventClickEvent"),i.stopImmediatePropagation(),!1):void 0}),this.started=!1},_mouseDestroy:function(){this.element.off("."+this.widgetName),this._mouseMoveDelegate&&this.document.off("mousemove."+this.widgetName,this._mouseMoveDelegate).off("mouseup."+this.widgetName,this._mouseUpDelegate)},_mouseDown:function(e){if(!n){this._mouseMoved=!1,this._mouseStarted&&this._mouseUp(e),this._mouseDownEvent=e;var i=this,s=1===e.which,o="string"==typeof this.options.cancel&&e.target.nodeName?t(e.target).closest(this.options.cancel).length:!1;return s&&!o&&this._mouseCapture(e)?(this.mouseDelayMet=!this.options.delay,this.mouseDelayMet||(this._mouseDelayTimer=setTimeout(function(){i.mouseDelayMet=!0},this.options.delay)),this._mouseDistanceMet(e)&&this._mouseDelayMet(e)&&(this._mouseStarted=this._mouseStart(e)!==!1,!this._mouseStarted)?(e.preventDefault(),!0):(!0===t.data(e.target,this.widgetName+".preventClickEvent")&&t.removeData(e.target,this.widgetName+".preventClickEvent"),this._mouseMoveDelegate=function(t){return i._mouseMove(t)},this._mouseUpDelegate=function(t){return i._mouseUp(t)},this.document.on("mousemove."+this.widgetName,this._mouseMoveDelegate).on("mouseup."+this.widgetName,this._mouseUpDelegate),e.preventDefault(),n=!0,!0)):!0}},_mouseMove:function(e){if(this._mouseMoved){if(t.ui.ie&&(!document.documentMode||9>document.documentMode)&&!e.button)return this._mouseUp(e);if(!e.which)if(e.originalEvent.altKey||e.originalEvent.ctrlKey||e.originalEvent.metaKey||e.originalEvent.shiftKey)this.ignoreMissingWhich=!0;else if(!this.ignoreMissingWhich)return this._mouseUp(e)}return(e.which||e.button)&&(this._mouseMoved=!0),this._mouseStarted?(this._mouseDrag(e),e.preventDefault()):(this._mouseDistanceMet(e)&&this._mouseDelayMet(e)&&(this._mouseStarted=this._mouseStart(this._mouseDownEvent,e)!==!1,this._mouseStarted?this._mouseDrag(e):this._mouseUp(e)),!this._mouseStarted)},_mouseUp:function(e){this.document.off("mousemove."+this.widgetName,this._mouseMoveDelegate).off("mouseup."+this.widgetName,this._mouseUpDelegate),this._mouseStarted&&(this._mouseStarted=!1,e.target===this._mouseDownEvent.target&&t.data(e.target,this.widgetName+".preventClickEvent",!0),this._mouseStop(e)),this._mouseDelayTimer&&(clearTimeout(this._mouseDelayTimer),delete this._mouseDelayTimer),this.ignoreMissingWhich=!1,n=!1,e.preventDefault()},_mouseDistanceMet:function(t){return Math.max(Math.abs(this._mouseDownEvent.pageX-t.pageX),Math.abs(this._mouseDownEvent.pageY-t.pageY))>=this.options.distance},_mouseDelayMet:function(){return this.mouseDelayMet},_mouseStart:function(){},_mouseDrag:function(){},_mouseStop:function(){},_mouseCapture:function(){return!0}}),t.ui.plugin={add:function(e,i,s){var n,o=t.ui[e].prototype;for(n in s)o.plugins[n]=o.plugins[n]||[],o.plugins[n].push([i,s[n]])},call:function(t,e,i,s){var n,o=t.plugins[e];if(o&&(s||t.element[0].parentNode&&11!==t.element[0].parentNode.nodeType))for(n=0;o.length>n;n++)t.options[o[n][0]]&&o[n][1].apply(t.element,i)}},t.widget("ui.resizable",t.ui.mouse,{version:"1.12.1",widgetEventPrefix:"resize",options:{alsoResize:!1,animate:!1,animateDuration:"slow",animateEasing:"swing",aspectRatio:!1,autoHide:!1,classes:{"ui-resizable-se":"ui-icon ui-icon-gripsmall-diagonal-se"},containment:!1,ghost:!1,grid:!1,handles:"e,s,se",helper:!1,maxHeight:null,maxWidth:null,minHeight:10,minWidth:10,zIndex:90,resize:null,start:null,stop:null},_num:function(t){return parseFloat(t)||0},_isNumber:function(t){return!isNaN(parseFloat(t))},_hasScroll:function(e,i){if("hidden"===t(e).css("overflow"))return!1;var s=i&&"left"===i?"scrollLeft":"scrollTop",n=!1;return e[s]>0?!0:(e[s]=1,n=e[s]>0,e[s]=0,n)},_create:function(){var e,i=this.options,s=this;this._addClass("ui-resizable"),t.extend(this,{_aspectRatio:!!i.aspectRatio,aspectRatio:i.aspectRatio,originalElement:this.element,_proportionallyResizeElements:[],_helper:i.helper||i.ghost||i.animate?i.helper||"ui-resizable-helper":null}),this.element[0].nodeName.match(/^(canvas|textarea|input|select|button|img)$/i)&&(this.element.wrap(t("<div class='ui-wrapper' style='overflow: hidden;'></div>").css({position:this.element.css("position"),width:this.element.outerWidth(),height:this.element.outerHeight(),top:this.element.css("top"),left:this.element.css("left")})),this.element=this.element.parent().data("ui-resizable",this.element.resizable("instance")),this.elementIsWrapper=!0,e={marginTop:this.originalElement.css("marginTop"),marginRight:this.originalElement.css("marginRight"),marginBottom:this.originalElement.css("marginBottom"),marginLeft:this.originalElement.css("marginLeft")},this.element.css(e),this.originalElement.css("margin",0),this.originalResizeStyle=this.originalElement.css("resize"),this.originalElement.css("resize","none"),this._proportionallyResizeElements.push(this.originalElement.css({position:"static",zoom:1,display:"block"})),this.originalElement.css(e),this._proportionallyResize()),this._setupHandles(),i.autoHide&&t(this.element).on("mouseenter",function(){i.disabled||(s._removeClass("ui-resizable-autohide"),s._handles.show())}).on("mouseleave",function(){i.disabled||s.resizing||(s._addClass("ui-resizable-autohide"),s._handles.hide())}),this._mouseInit()},_destroy:function(){this._mouseDestroy();var e,i=function(e){t(e).removeData("resizable").removeData("ui-resizable").off(".resizable").find(".ui-resizable-handle").remove()};return this.elementIsWrapper&&(i(this.element),e=this.element,this.originalElement.css({position:e.css("position"),width:e.outerWidth(),height:e.outerHeight(),top:e.css("top"),left:e.css("left")}).insertAfter(e),e.remove()),this.originalElement.css("resize",this.originalResizeStyle),i(this.originalElement),this},_setOption:function(t,e){switch(this._super(t,e),t){case"handles":this._removeHandles(),this._setupHandles();break;default:}},_setupHandles:function(){var e,i,s,n,o,a=this.options,r=this;if(this.handles=a.handles||(t(".ui-resizable-handle",this.element).length?{n:".ui-resizable-n",e:".ui-resizable-e",s:".ui-resizable-s",w:".ui-resizable-w",se:".ui-resizable-se",sw:".ui-resizable-sw",ne:".ui-resizable-ne",nw:".ui-resizable-nw"}:"e,s,se"),this._handles=t(),this.handles.constructor===String)for("all"===this.handles&&(this.handles="n,e,s,w,se,sw,ne,nw"),s=this.handles.split(","),this.handles={},i=0;s.length>i;i++)e=t.trim(s[i]),n="ui-resizable-"+e,o=t("<div>"),this._addClass(o,"ui-resizable-handle "+n),o.css({zIndex:a.zIndex}),this.handles[e]=".ui-resizable-"+e,this.element.append(o);this._renderAxis=function(e){var i,s,n,o;e=e||this.element;for(i in this.handles)this.handles[i].constructor===String?this.handles[i]=this.element.children(this.handles[i]).first().show():(this.handles[i].jquery||this.handles[i].nodeType)&&(this.handles[i]=t(this.handles[i]),this._on(this.handles[i],{mousedown:r._mouseDown})),this.elementIsWrapper&&this.originalElement[0].nodeName.match(/^(textarea|input|select|button)$/i)&&(s=t(this.handles[i],this.element),o=/sw|ne|nw|se|n|s/.test(i)?s.outerHeight():s.outerWidth(),n=["padding",/ne|nw|n/.test(i)?"Top":/se|sw|s/.test(i)?"Bottom":/^e$/.test(i)?"Right":"Left"].join(""),e.css(n,o),this._proportionallyResize()),this._handles=this._handles.add(this.handles[i])},this._renderAxis(this.element),this._handles=this._handles.add(this.element.find(".ui-resizable-handle")),this._handles.disableSelection(),this._handles.on("mouseover",function(){r.resizing||(this.className&&(o=this.className.match(/ui-resizable-(se|sw|ne|nw|n|e|s|w)/i)),r.axis=o&&o[1]?o[1]:"se")}),a.autoHide&&(this._handles.hide(),this._addClass("ui-resizable-autohide"))},_removeHandles:function(){this._handles.remove()},_mouseCapture:function(e){var i,s,n=!1;for(i in this.handles)s=t(this.handles[i])[0],(s===e.target||t.contains(s,e.target))&&(n=!0);return!this.options.disabled&&n},_mouseStart:function(e){var i,s,n,o=this.options,a=this.element;return this.resizing=!0,this._renderProxy(),i=this._num(this.helper.css("left")),s=this._num(this.helper.css("top")),o.containment&&(i+=t(o.containment).scrollLeft()||0,s+=t(o.containment).scrollTop()||0),this.offset=this.helper.offset(),this.position={left:i,top:s},this.size=this._helper?{width:this.helper.width(),height:this.helper.height()}:{width:a.width(),height:a.height()},this.originalSize=this._helper?{width:a.outerWidth(),height:a.outerHeight()}:{width:a.width(),height:a.height()},this.sizeDiff={width:a.outerWidth()-a.width(),height:a.outerHeight()-a.height()},this.originalPosition={left:i,top:s},this.originalMousePosition={left:e.pageX,top:e.pageY},this.aspectRatio="number"==typeof o.aspectRatio?o.aspectRatio:this.originalSize.width/this.originalSize.height||1,n=t(".ui-resizable-"+this.axis).css("cursor"),t("body").css("cursor","auto"===n?this.axis+"-resize":n),this._addClass("ui-resizable-resizing"),this._propagate("start",e),!0},_mouseDrag:function(e){var i,s,n=this.originalMousePosition,o=this.axis,a=e.pageX-n.left||0,r=e.pageY-n.top||0,h=this._change[o];return this._updatePrevProperties(),h?(i=h.apply(this,[e,a,r]),this._updateVirtualBoundaries(e.shiftKey),(this._aspectRatio||e.shiftKey)&&(i=this._updateRatio(i,e)),i=this._respectSize(i,e),this._updateCache(i),this._propagate("resize",e),s=this._applyChanges(),!this._helper&&this._proportionallyResizeElements.length&&this._proportionallyResize(),t.isEmptyObject(s)||(this._updatePrevProperties(),this._trigger("resize",e,this.ui()),this._applyChanges()),!1):!1},_mouseStop:function(e){this.resizing=!1;var i,s,n,o,a,r,h,l=this.options,c=this;return this._helper&&(i=this._proportionallyResizeElements,s=i.length&&/textarea/i.test(i[0].nodeName),n=s&&this._hasScroll(i[0],"left")?0:c.sizeDiff.height,o=s?0:c.sizeDiff.width,a={width:c.helper.width()-o,height:c.helper.height()-n},r=parseFloat(c.element.css("left"))+(c.position.left-c.originalPosition.left)||null,h=parseFloat(c.element.css("top"))+(c.position.top-c.originalPosition.top)||null,l.animate||this.element.css(t.extend(a,{top:h,left:r})),c.helper.height(c.size.height),c.helper.width(c.size.width),this._helper&&!l.animate&&this._proportionallyResize()),t("body").css("cursor","auto"),this._removeClass("ui-resizable-resizing"),this._propagate("stop",e),this._helper&&this.helper.remove(),!1},_updatePrevProperties:function(){this.prevPosition={top:this.position.top,left:this.position.left},this.prevSize={width:this.size.width,height:this.size.height}},_applyChanges:function(){var t={};return this.position.top!==this.prevPosition.top&&(t.top=this.position.top+"px"),this.position.left!==this.prevPosition.left&&(t.left=this.position.left+"px"),this.size.width!==this.prevSize.width&&(t.width=this.size.width+"px"),this.size.height!==this.prevSize.height&&(t.height=this.size.height+"px"),this.helper.css(t),t},_updateVirtualBoundaries:function(t){var e,i,s,n,o,a=this.options;o={minWidth:this._isNumber(a.minWidth)?a.minWidth:0,maxWidth:this._isNumber(a.maxWidth)?a.maxWidth:1/0,minHeight:this._isNumber(a.minHeight)?a.minHeight:0,maxHeight:this._isNumber(a.maxHeight)?a.maxHeight:1/0},(this._aspectRatio||t)&&(e=o.minHeight*this.aspectRatio,s=o.minWidth/this.aspectRatio,i=o.maxHeight*this.aspectRatio,n=o.maxWidth/this.aspectRatio,e>o.minWidth&&(o.minWidth=e),s>o.minHeight&&(o.minHeight=s),o.maxWidth>i&&(o.maxWidth=i),o.maxHeight>n&&(o.maxHeight=n)),this._vBoundaries=o},_updateCache:function(t){this.offset=this.helper.offset(),this._isNumber(t.left)&&(this.position.left=t.left),this._isNumber(t.top)&&(this.position.top=t.top),this._isNumber(t.height)&&(this.size.height=t.height),this._isNumber(t.width)&&(this.size.width=t.width)},_updateRatio:function(t){var e=this.position,i=this.size,s=this.axis;return this._isNumber(t.height)?t.width=t.height*this.aspectRatio:this._isNumber(t.width)&&(t.height=t.width/this.aspectRatio),"sw"===s&&(t.left=e.left+(i.width-t.width),t.top=null),"nw"===s&&(t.top=e.top+(i.height-t.height),t.left=e.left+(i.width-t.width)),t},_respectSize:function(t){var e=this._vBoundaries,i=this.axis,s=this._isNumber(t.width)&&e.maxWidth&&e.maxWidth<t.width,n=this._isNumber(t.height)&&e.maxHeight&&e.maxHeight<t.height,o=this._isNumber(t.width)&&e.minWidth&&e.minWidth>t.width,a=this._isNumber(t.height)&&e.minHeight&&e.minHeight>t.height,r=this.originalPosition.left+this.originalSize.width,h=this.originalPosition.top+this.originalSize.height,l=/sw|nw|w/.test(i),c=/nw|ne|n/.test(i);return o&&(t.width=e.minWidth),a&&(t.height=e.minHeight),s&&(t.width=e.maxWidth),n&&(t.height=e.maxHeight),o&&l&&(t.left=r-e.minWidth),s&&l&&(t.left=r-e.maxWidth),a&&c&&(t.top=h-e.minHeight),n&&c&&(t.top=h-e.maxHeight),t.width||t.height||t.left||!t.top?t.width||t.height||t.top||!t.left||(t.left=null):t.top=null,t},_getPaddingPlusBorderDimensions:function(t){for(var e=0,i=[],s=[t.css("borderTopWidth"),t.css("borderRightWidth"),t.css("borderBottomWidth"),t.css("borderLeftWidth")],n=[t.css("paddingTop"),t.css("paddingRight"),t.css("paddingBottom"),t.css("paddingLeft")];4>e;e++)i[e]=parseFloat(s[e])||0,i[e]+=parseFloat(n[e])||0;return{height:i[0]+i[2],width:i[1]+i[3]}},_proportionallyResize:function(){if(this._proportionallyResizeElements.length)for(var t,e=0,i=this.helper||this.element;this._proportionallyResizeElements.length>e;e++)t=this._proportionallyResizeElements[e],this.outerDimensions||(this.outerDimensions=this._getPaddingPlusBorderDimensions(t)),t.css({height:i.height()-this.outerDimensions.height||0,width:i.width()-this.outerDimensions.width||0})},_renderProxy:function(){var e=this.element,i=this.options;this.elementOffset=e.offset(),this._helper?(this.helper=this.helper||t("<div style='overflow:hidden;'></div>"),this._addClass(this.helper,this._helper),this.helper.css({width:this.element.outerWidth(),height:this.element.outerHeight(),position:"absolute",left:this.elementOffset.left+"px",top:this.elementOffset.top+"px",zIndex:++i.zIndex}),this.helper.appendTo("body").disableSelection()):this.helper=this.element
-},_change:{e:function(t,e){return{width:this.originalSize.width+e}},w:function(t,e){var i=this.originalSize,s=this.originalPosition;return{left:s.left+e,width:i.width-e}},n:function(t,e,i){var s=this.originalSize,n=this.originalPosition;return{top:n.top+i,height:s.height-i}},s:function(t,e,i){return{height:this.originalSize.height+i}},se:function(e,i,s){return t.extend(this._change.s.apply(this,arguments),this._change.e.apply(this,[e,i,s]))},sw:function(e,i,s){return t.extend(this._change.s.apply(this,arguments),this._change.w.apply(this,[e,i,s]))},ne:function(e,i,s){return t.extend(this._change.n.apply(this,arguments),this._change.e.apply(this,[e,i,s]))},nw:function(e,i,s){return t.extend(this._change.n.apply(this,arguments),this._change.w.apply(this,[e,i,s]))}},_propagate:function(e,i){t.ui.plugin.call(this,e,[i,this.ui()]),"resize"!==e&&this._trigger(e,i,this.ui())},plugins:{},ui:function(){return{originalElement:this.originalElement,element:this.element,helper:this.helper,position:this.position,size:this.size,originalSize:this.originalSize,originalPosition:this.originalPosition}}}),t.ui.plugin.add("resizable","animate",{stop:function(e){var i=t(this).resizable("instance"),s=i.options,n=i._proportionallyResizeElements,o=n.length&&/textarea/i.test(n[0].nodeName),a=o&&i._hasScroll(n[0],"left")?0:i.sizeDiff.height,r=o?0:i.sizeDiff.width,h={width:i.size.width-r,height:i.size.height-a},l=parseFloat(i.element.css("left"))+(i.position.left-i.originalPosition.left)||null,c=parseFloat(i.element.css("top"))+(i.position.top-i.originalPosition.top)||null;i.element.animate(t.extend(h,c&&l?{top:c,left:l}:{}),{duration:s.animateDuration,easing:s.animateEasing,step:function(){var s={width:parseFloat(i.element.css("width")),height:parseFloat(i.element.css("height")),top:parseFloat(i.element.css("top")),left:parseFloat(i.element.css("left"))};n&&n.length&&t(n[0]).css({width:s.width,height:s.height}),i._updateCache(s),i._propagate("resize",e)}})}}),t.ui.plugin.add("resizable","containment",{start:function(){var e,i,s,n,o,a,r,h=t(this).resizable("instance"),l=h.options,c=h.element,u=l.containment,d=u instanceof t?u.get(0):/parent/.test(u)?c.parent().get(0):u;d&&(h.containerElement=t(d),/document/.test(u)||u===document?(h.containerOffset={left:0,top:0},h.containerPosition={left:0,top:0},h.parentData={element:t(document),left:0,top:0,width:t(document).width(),height:t(document).height()||document.body.parentNode.scrollHeight}):(e=t(d),i=[],t(["Top","Right","Left","Bottom"]).each(function(t,s){i[t]=h._num(e.css("padding"+s))}),h.containerOffset=e.offset(),h.containerPosition=e.position(),h.containerSize={height:e.innerHeight()-i[3],width:e.innerWidth()-i[1]},s=h.containerOffset,n=h.containerSize.height,o=h.containerSize.width,a=h._hasScroll(d,"left")?d.scrollWidth:o,r=h._hasScroll(d)?d.scrollHeight:n,h.parentData={element:d,left:s.left,top:s.top,width:a,height:r}))},resize:function(e){var i,s,n,o,a=t(this).resizable("instance"),r=a.options,h=a.containerOffset,l=a.position,c=a._aspectRatio||e.shiftKey,u={top:0,left:0},d=a.containerElement,p=!0;d[0]!==document&&/static/.test(d.css("position"))&&(u=h),l.left<(a._helper?h.left:0)&&(a.size.width=a.size.width+(a._helper?a.position.left-h.left:a.position.left-u.left),c&&(a.size.height=a.size.width/a.aspectRatio,p=!1),a.position.left=r.helper?h.left:0),l.top<(a._helper?h.top:0)&&(a.size.height=a.size.height+(a._helper?a.position.top-h.top:a.position.top),c&&(a.size.width=a.size.height*a.aspectRatio,p=!1),a.position.top=a._helper?h.top:0),n=a.containerElement.get(0)===a.element.parent().get(0),o=/relative|absolute/.test(a.containerElement.css("position")),n&&o?(a.offset.left=a.parentData.left+a.position.left,a.offset.top=a.parentData.top+a.position.top):(a.offset.left=a.element.offset().left,a.offset.top=a.element.offset().top),i=Math.abs(a.sizeDiff.width+(a._helper?a.offset.left-u.left:a.offset.left-h.left)),s=Math.abs(a.sizeDiff.height+(a._helper?a.offset.top-u.top:a.offset.top-h.top)),i+a.size.width>=a.parentData.width&&(a.size.width=a.parentData.width-i,c&&(a.size.height=a.size.width/a.aspectRatio,p=!1)),s+a.size.height>=a.parentData.height&&(a.size.height=a.parentData.height-s,c&&(a.size.width=a.size.height*a.aspectRatio,p=!1)),p||(a.position.left=a.prevPosition.left,a.position.top=a.prevPosition.top,a.size.width=a.prevSize.width,a.size.height=a.prevSize.height)},stop:function(){var e=t(this).resizable("instance"),i=e.options,s=e.containerOffset,n=e.containerPosition,o=e.containerElement,a=t(e.helper),r=a.offset(),h=a.outerWidth()-e.sizeDiff.width,l=a.outerHeight()-e.sizeDiff.height;e._helper&&!i.animate&&/relative/.test(o.css("position"))&&t(this).css({left:r.left-n.left-s.left,width:h,height:l}),e._helper&&!i.animate&&/static/.test(o.css("position"))&&t(this).css({left:r.left-n.left-s.left,width:h,height:l})}}),t.ui.plugin.add("resizable","alsoResize",{start:function(){var e=t(this).resizable("instance"),i=e.options;t(i.alsoResize).each(function(){var e=t(this);e.data("ui-resizable-alsoresize",{width:parseFloat(e.width()),height:parseFloat(e.height()),left:parseFloat(e.css("left")),top:parseFloat(e.css("top"))})})},resize:function(e,i){var s=t(this).resizable("instance"),n=s.options,o=s.originalSize,a=s.originalPosition,r={height:s.size.height-o.height||0,width:s.size.width-o.width||0,top:s.position.top-a.top||0,left:s.position.left-a.left||0};t(n.alsoResize).each(function(){var e=t(this),s=t(this).data("ui-resizable-alsoresize"),n={},o=e.parents(i.originalElement[0]).length?["width","height"]:["width","height","top","left"];t.each(o,function(t,e){var i=(s[e]||0)+(r[e]||0);i&&i>=0&&(n[e]=i||null)}),e.css(n)})},stop:function(){t(this).removeData("ui-resizable-alsoresize")}}),t.ui.plugin.add("resizable","ghost",{start:function(){var e=t(this).resizable("instance"),i=e.size;e.ghost=e.originalElement.clone(),e.ghost.css({opacity:.25,display:"block",position:"relative",height:i.height,width:i.width,margin:0,left:0,top:0}),e._addClass(e.ghost,"ui-resizable-ghost"),t.uiBackCompat!==!1&&"string"==typeof e.options.ghost&&e.ghost.addClass(this.options.ghost),e.ghost.appendTo(e.helper)},resize:function(){var e=t(this).resizable("instance");e.ghost&&e.ghost.css({position:"relative",height:e.size.height,width:e.size.width})},stop:function(){var e=t(this).resizable("instance");e.ghost&&e.helper&&e.helper.get(0).removeChild(e.ghost.get(0))}}),t.ui.plugin.add("resizable","grid",{resize:function(){var e,i=t(this).resizable("instance"),s=i.options,n=i.size,o=i.originalSize,a=i.originalPosition,r=i.axis,h="number"==typeof s.grid?[s.grid,s.grid]:s.grid,l=h[0]||1,c=h[1]||1,u=Math.round((n.width-o.width)/l)*l,d=Math.round((n.height-o.height)/c)*c,p=o.width+u,f=o.height+d,m=s.maxWidth&&p>s.maxWidth,g=s.maxHeight&&f>s.maxHeight,_=s.minWidth&&s.minWidth>p,v=s.minHeight&&s.minHeight>f;s.grid=h,_&&(p+=l),v&&(f+=c),m&&(p-=l),g&&(f-=c),/^(se|s|e)$/.test(r)?(i.size.width=p,i.size.height=f):/^(ne)$/.test(r)?(i.size.width=p,i.size.height=f,i.position.top=a.top-d):/^(sw)$/.test(r)?(i.size.width=p,i.size.height=f,i.position.left=a.left-u):((0>=f-c||0>=p-l)&&(e=i._getPaddingPlusBorderDimensions(this)),f-c>0?(i.size.height=f,i.position.top=a.top-d):(f=c-e.height,i.size.height=f,i.position.top=a.top+o.height-f),p-l>0?(i.size.width=p,i.position.left=a.left-u):(p=l-e.width,i.size.width=p,i.position.left=a.left+o.width-p))}}),t.ui.resizable});/**
+* Includes: widget.js, position.js, data.js, disable-selection.js, focusable.js, form-reset-mixin.js, jquery-patch.js, keycode.js, labels.js, scroll-parent.js, tabbable.js, unique-id.js, widgets/resizable.js, widgets/mouse.js
+* Copyright jQuery Foundation and other contributors; Licensed MIT */!function(t){"use strict";"function"==typeof define&&define.amd?define(["jquery"],t):t(jQuery)}(function(y){"use strict";y.ui=y.ui||{};y.ui.version="1.13.2";var n,i=0,h=Array.prototype.hasOwnProperty,a=Array.prototype.slice;y.cleanData=(n=y.cleanData,function(t){for(var e,i,s=0;null!=(i=t[s]);s++)(e=y._data(i,"events"))&&e.remove&&y(i).triggerHandler("remove");n(t)}),y.widget=function(t,i,e){var s,n,o,h={},a=t.split(".")[0],r=a+"-"+(t=t.split(".")[1]);return e||(e=i,i=y.Widget),Array.isArray(e)&&(e=y.extend.apply(null,[{}].concat(e))),y.expr.pseudos[r.toLowerCase()]=function(t){return!!y.data(t,r)},y[a]=y[a]||{},s=y[a][t],n=y[a][t]=function(t,e){if(!this||!this._createWidget)return new n(t,e);arguments.length&&this._createWidget(t,e)},y.extend(n,s,{version:e.version,_proto:y.extend({},e),_childConstructors:[]}),(o=new i).options=y.widget.extend({},o.options),y.each(e,function(e,s){function n(){return i.prototype[e].apply(this,arguments)}
+function o(t){return i.prototype[e].apply(this,t)}h[e]="function"==typeof s?function(){var t,e=this._super,i=this._superApply;return this._super=n,this._superApply=o,t=s.apply(this,arguments),this._super=e,this._superApply=i,t}:s}),n.prototype=y.widget.extend(o,{widgetEventPrefix:s&&o.widgetEventPrefix||t},h,{constructor:n,namespace:a,widgetName:t,widgetFullName:r}),s?(y.each(s._childConstructors,function(t,e){var i=e.prototype;y.widget(i.namespace+"."+i.widgetName,n,e._proto)}),delete s._childConstructors):i._childConstructors.push(n),y.widget.bridge(t,n),n},y.widget.extend=function(t){for(var e,i,s=a.call(arguments,1),n=0,o=s.length;n<o;n++)for(e in s[n])i=s[n][e],h.call(s[n],e)&&void 0!==i&&(y.isPlainObject(i)?t[e]=y.isPlainObject(t[e])?y.widget.extend({},t[e],i):y.widget.extend({},i):t[e]=i);return t},y.widget.bridge=function(o,e){var h=e.prototype.widgetFullName||o;y.fn[o]=function(i){var t="string"==typeof i,s=a.call(arguments,1),n=this;return t?this.length||"instance"!==i?this.each(function(){var t,
+e=y.data(this,h);return"instance"===i?(n=e,!1):e?"function"!=typeof e[i]||"_"===i.charAt(0)?y.error("no such method '"+i+"' for "+o+" widget instance"):(t=e[i].apply(e,s))!==e&&void 0!==t?(n=t&&t.jquery?n.pushStack(t.get()):t,!1):void 0:y.error("cannot call methods on "+o+" prior to initialization; attempted to call method '"+i+"'")}):n=void 0:(s.length&&(i=y.widget.extend.apply(null,[i].concat(s))),this.each(function(){var t=y.data(this,h);t?(t.option(i||{}),t._init&&t._init()):y.data(this,h,new e(i,this))})),n}},y.Widget=function(){},y.Widget._childConstructors=[],y.Widget.prototype={widgetName:"widget",widgetEventPrefix:"",defaultElement:"<div>",options:{classes:{},disabled:!1,create:null},_createWidget:function(t,e){e=y(e||this.defaultElement||this)[0],this.element=y(e),this.uuid=i++,this.eventNamespace="."+this.widgetName+this.uuid,this.bindings=y(),this.hoverable=y(),this.focusable=y(),this.classesElementLookup={},e!==this&&(y.data(e,this.widgetFullName,this),this._on(!0,this.element,{remove:function(t
+){t.target===e&&this.destroy()}}),this.document=y(e.style?e.ownerDocument:e.document||e),this.window=y(this.document[0].defaultView||this.document[0].parentWindow)),this.options=y.widget.extend({},this.options,this._getCreateOptions(),t),this._create(),this.options.disabled&&this._setOptionDisabled(this.options.disabled),this._trigger("create",null,this._getCreateEventData()),this._init()},_getCreateOptions:function(){return{}},_getCreateEventData:y.noop,_create:y.noop,_init:y.noop,destroy:function(){var i=this;this._destroy(),y.each(this.classesElementLookup,function(t,e){i._removeClass(e,t)}),this.element.off(this.eventNamespace).removeData(this.widgetFullName),this.widget().off(this.eventNamespace).removeAttr("aria-disabled"),this.bindings.off(this.eventNamespace)},_destroy:y.noop,widget:function(){return this.element},option:function(t,e){var i,s,n,o=t;if(0===arguments.length)return y.widget.extend({},this.options);if("string"==typeof t)if(o={},t=(i=t.split(".")).shift(),i.length){for(s=o[t
+]=y.widget.extend({},this.options[t]),n=0;n<i.length-1;n++)s[i[n]]=s[i[n]]||{},s=s[i[n]];if(t=i.pop(),1===arguments.length)return void 0===s[t]?null:s[t];s[t]=e}else{if(1===arguments.length)return void 0===this.options[t]?null:this.options[t];o[t]=e}return this._setOptions(o),this},_setOptions:function(t){for(var e in t)this._setOption(e,t[e]);return this},_setOption:function(t,e){return"classes"===t&&this._setOptionClasses(e),this.options[t]=e,"disabled"===t&&this._setOptionDisabled(e),this},_setOptionClasses:function(t){var e,i,s;for(e in t)s=this.classesElementLookup[e],t[e]!==this.options.classes[e]&&s&&s.length&&(i=y(s.get()),this._removeClass(s,e),i.addClass(this._classes({element:i,keys:e,classes:t,add:!0})))},_setOptionDisabled:function(t){this._toggleClass(this.widget(),this.widgetFullName+"-disabled",null,!!t),t&&(this._removeClass(this.hoverable,null,"ui-state-hover"),this._removeClass(this.focusable,null,"ui-state-focus"))},enable:function(){return this._setOptions({disabled:!1})},
+disable:function(){return this._setOptions({disabled:!0})},_classes:function(n){var o=[],h=this;function t(t,e){for(var i,s=0;s<t.length;s++)i=h.classesElementLookup[t[s]]||y(),i=n.add?(function(){var i=[];n.element.each(function(t,e){y.map(h.classesElementLookup,function(t){return t}).some(function(t){return t.is(e)})||i.push(e)}),h._on(y(i),{remove:"_untrackClassesElement"})}(),y(y.uniqueSort(i.get().concat(n.element.get())))):y(i.not(n.element).get()),h.classesElementLookup[t[s]]=i,o.push(t[s]),e&&n.classes[t[s]]&&o.push(n.classes[t[s]])}return(n=y.extend({element:this.element,classes:this.options.classes||{}},n)).keys&&t(n.keys.match(/\S+/g)||[],!0),n.extra&&t(n.extra.match(/\S+/g)||[]),o.join(" ")},_untrackClassesElement:function(i){var s=this;y.each(s.classesElementLookup,function(t,e){-1!==y.inArray(i.target,e)&&(s.classesElementLookup[t]=y(e.not(i.target).get()))}),this._off(y(i.target))},_removeClass:function(t,e,i){return this._toggleClass(t,e,i,!1)},_addClass:function(t,e,i){
+return this._toggleClass(t,e,i,!0)},_toggleClass:function(t,e,i,s){var n="string"==typeof t||null===t,i={extra:n?e:i,keys:n?t:e,element:n?this.element:t,add:s="boolean"==typeof s?s:i};return i.element.toggleClass(this._classes(i),s),this},_on:function(n,o,t){var h,a=this;"boolean"!=typeof n&&(t=o,o=n,n=!1),t?(o=h=y(o),this.bindings=this.bindings.add(o)):(t=o,o=this.element,h=this.widget()),y.each(t,function(t,e){function i(){if(n||!0!==a.options.disabled&&!y(this).hasClass("ui-state-disabled"))return("string"==typeof e?a[e]:e).apply(a,arguments)}"string"!=typeof e&&(i.guid=e.guid=e.guid||i.guid||y.guid++);var s=t.match(/^([\w:-]*)\s*(.*)$/),t=s[1]+a.eventNamespace,s=s[2];s?h.on(t,s,i):o.on(t,i)})},_off:function(t,e){e=(e||"").split(" ").join(this.eventNamespace+" ")+this.eventNamespace,t.off(e),this.bindings=y(this.bindings.not(t).get()),this.focusable=y(this.focusable.not(t).get()),this.hoverable=y(this.hoverable.not(t).get())},_delay:function(t,e){var i=this;return setTimeout(function(){return(
+"string"==typeof t?i[t]:t).apply(i,arguments)},e||0)},_hoverable:function(t){this.hoverable=this.hoverable.add(t),this._on(t,{mouseenter:function(t){this._addClass(y(t.currentTarget),null,"ui-state-hover")},mouseleave:function(t){this._removeClass(y(t.currentTarget),null,"ui-state-hover")}})},_focusable:function(t){this.focusable=this.focusable.add(t),this._on(t,{focusin:function(t){this._addClass(y(t.currentTarget),null,"ui-state-focus")},focusout:function(t){this._removeClass(y(t.currentTarget),null,"ui-state-focus")}})},_trigger:function(t,e,i){var s,n,o=this.options[t];if(i=i||{},(e=y.Event(e)).type=(t===this.widgetEventPrefix?t:this.widgetEventPrefix+t).toLowerCase(),e.target=this.element[0],n=e.originalEvent)for(s in n)s in e||(e[s]=n[s]);return this.element.trigger(e,i),!("function"==typeof o&&!1===o.apply(this.element[0],[e].concat(i))||e.isDefaultPrevented())}},y.each({show:"fadeIn",hide:"fadeOut"},function(o,h){y.Widget.prototype["_"+o]=function(e,t,i){var s,n=(t="string"==typeof t?{effect:t}:t
+)?!0!==t&&"number"!=typeof t&&t.effect||h:o;"number"==typeof(t=t||{})?t={duration:t}:!0===t&&(t={}),s=!y.isEmptyObject(t),t.complete=i,t.delay&&e.delay(t.delay),s&&y.effects&&y.effects.effect[n]?e[o](t):n!==o&&e[n]?e[n](t.duration,t.easing,i):e.queue(function(t){y(this)[o](),i&&i.call(e[0]),t()})}});var s,x,D,o,r,l,u,p,W;y.widget;function E(t,e,i){return[parseFloat(t[0])*(p.test(t[0])?e/100:1),parseFloat(t[1])*(p.test(t[1])?i/100:1)]}function H(t,e){return parseInt(y.css(t,e),10)||0}function S(t){return null!=t&&t===t.window}x=Math.max,D=Math.abs,o=/left|center|right/,r=/top|center|bottom/,l=/[\+\-]\d+(\.[\d]+)?%?/,u=/^\w+/,p=/%$/,W=y.fn.position,y.position={scrollbarWidth:function(){if(void 0!==s)return s;var t,e=y("<div style='display:block;position:absolute;width:200px;height:200px;overflow:hidden;'><div style='height:300px;width:auto;'></div></div>"),i=e.children()[0];return y("body").append(e),t=i.offsetWidth,e.css("overflow","scroll"),t===(i=i.offsetWidth)&&(i=e[0].clientWidth),e.remove(),s=t-i},
+getScrollInfo:function(t){var e=t.isWindow||t.isDocument?"":t.element.css("overflow-x"),i=t.isWindow||t.isDocument?"":t.element.css("overflow-y"),e="scroll"===e||"auto"===e&&t.width<t.element[0].scrollWidth;return{width:"scroll"===i||"auto"===i&&t.height<t.element[0].scrollHeight?y.position.scrollbarWidth():0,height:e?y.position.scrollbarWidth():0}},getWithinInfo:function(t){var e=y(t||window),i=S(e[0]),s=!!e[0]&&9===e[0].nodeType;return{element:e,isWindow:i,isDocument:s,offset:!i&&!s?y(t).offset():{left:0,top:0},scrollLeft:e.scrollLeft(),scrollTop:e.scrollTop(),width:e.outerWidth(),height:e.outerHeight()}}},y.fn.position=function(p){if(!p||!p.of)return W.apply(this,arguments);var d,c,f,g,m,t,_="string"==typeof(p=y.extend({},p)).of?y(document).find(p.of):y(p.of),w=y.position.getWithinInfo(p.within),v=y.position.getScrollInfo(w),b=(p.collision||"flip").split(" "),z={},e=9===(t=(e=_)[0]).nodeType?{width:e.width(),height:e.height(),offset:{top:0,left:0}}:S(t)?{width:e.width(),height:e.height(),offset:{
+top:e.scrollTop(),left:e.scrollLeft()}}:t.preventDefault?{width:0,height:0,offset:{top:t.pageY,left:t.pageX}}:{width:e.outerWidth(),height:e.outerHeight(),offset:e.offset()};return _[0].preventDefault&&(p.at="left top"),c=e.width,f=e.height,m=y.extend({},g=e.offset),y.each(["my","at"],function(){var t,e,i=(p[this]||"").split(" ");(i=1===i.length?o.test(i[0])?i.concat(["center"]):r.test(i[0])?["center"].concat(i):["center","center"]:i)[0]=o.test(i[0])?i[0]:"center",i[1]=r.test(i[1])?i[1]:"center",t=l.exec(i[0]),e=l.exec(i[1]),z[this]=[t?t[0]:0,e?e[0]:0],p[this]=[u.exec(i[0])[0],u.exec(i[1])[0]]}),1===b.length&&(b[1]=b[0]),"right"===p.at[0]?m.left+=c:"center"===p.at[0]&&(m.left+=c/2),"bottom"===p.at[1]?m.top+=f:"center"===p.at[1]&&(m.top+=f/2),d=E(z.at,c,f),m.left+=d[0],m.top+=d[1],this.each(function(){var i,t,h=y(this),a=h.outerWidth(),r=h.outerHeight(),e=H(this,"marginLeft"),s=H(this,"marginTop"),n=a+e+H(this,"marginRight")+v.width,o=r+s+H(this,"marginBottom")+v.height,l=y.extend({},m),u=E(z.my,h.outerWidth()
+,h.outerHeight());"right"===p.my[0]?l.left-=a:"center"===p.my[0]&&(l.left-=a/2),"bottom"===p.my[1]?l.top-=r:"center"===p.my[1]&&(l.top-=r/2),l.left+=u[0],l.top+=u[1],i={marginLeft:e,marginTop:s},y.each(["left","top"],function(t,e){y.ui.position[b[t]]&&y.ui.position[b[t]][e](l,{targetWidth:c,targetHeight:f,elemWidth:a,elemHeight:r,collisionPosition:i,collisionWidth:n,collisionHeight:o,offset:[d[0]+u[0],d[1]+u[1]],my:p.my,at:p.at,within:w,elem:h})}),p.using&&(t=function(t){var e=g.left-l.left,i=e+c-a,s=g.top-l.top,n=s+f-r,o={target:{element:_,left:g.left,top:g.top,width:c,height:f},element:{element:h,left:l.left,top:l.top,width:a,height:r},horizontal:i<0?"left":0<e?"right":"center",vertical:n<0?"top":0<s?"bottom":"middle"};c<a&&D(e+i)<c&&(o.horizontal="center"),f<r&&D(s+n)<f&&(o.vertical="middle"),x(D(e),D(i))>x(D(s),D(n))?o.important="horizontal":o.important="vertical",p.using.call(this,t,o)}),h.offset(y.extend(l,{using:t}))})},y.ui.position={fit:{left:function(t,e){var i=e.within,
+s=i.isWindow?i.scrollLeft:i.offset.left,n=i.width,o=t.left-e.collisionPosition.marginLeft,h=s-o,a=o+e.collisionWidth-n-s;e.collisionWidth>n?0<h&&a<=0?(i=t.left+h+e.collisionWidth-n-s,t.left+=h-i):t.left=!(0<a&&h<=0)&&a<h?s+n-e.collisionWidth:s:0<h?t.left+=h:0<a?t.left-=a:t.left=x(t.left-o,t.left)},top:function(t,e){var i=e.within,s=i.isWindow?i.scrollTop:i.offset.top,n=e.within.height,o=t.top-e.collisionPosition.marginTop,h=s-o,a=o+e.collisionHeight-n-s;e.collisionHeight>n?0<h&&a<=0?(i=t.top+h+e.collisionHeight-n-s,t.top+=h-i):t.top=!(0<a&&h<=0)&&a<h?s+n-e.collisionHeight:s:0<h?t.top+=h:0<a?t.top-=a:t.top=x(t.top-o,t.top)}},flip:{left:function(t,e){var i=e.within,s=i.offset.left+i.scrollLeft,n=i.width,o=i.isWindow?i.scrollLeft:i.offset.left,h=t.left-e.collisionPosition.marginLeft,a=h-o,r=h+e.collisionWidth-n-o,l="left"===e.my[0]?-e.elemWidth:"right"===e.my[0]?e.elemWidth:0,i="left"===e.at[0]?e.targetWidth:"right"===e.at[0]?-e.targetWidth:0,h=-2*e.offset[0];a<0?((s=t.left+l+i+h+e.collisionWidth-n-s)<0||s<D(a)
+)&&(t.left+=l+i+h):0<r&&(0<(o=t.left-e.collisionPosition.marginLeft+l+i+h-o)||D(o)<r)&&(t.left+=l+i+h)},top:function(t,e){var i=e.within,s=i.offset.top+i.scrollTop,n=i.height,o=i.isWindow?i.scrollTop:i.offset.top,h=t.top-e.collisionPosition.marginTop,a=h-o,r=h+e.collisionHeight-n-o,l="top"===e.my[1]?-e.elemHeight:"bottom"===e.my[1]?e.elemHeight:0,i="top"===e.at[1]?e.targetHeight:"bottom"===e.at[1]?-e.targetHeight:0,h=-2*e.offset[1];a<0?((s=t.top+l+i+h+e.collisionHeight-n-s)<0||s<D(a))&&(t.top+=l+i+h):0<r&&(0<(o=t.top-e.collisionPosition.marginTop+l+i+h-o)||D(o)<r)&&(t.top+=l+i+h)}},flipfit:{left:function(){y.ui.position.flip.left.apply(this,arguments),y.ui.position.fit.left.apply(this,arguments)},top:function(){y.ui.position.flip.top.apply(this,arguments),y.ui.position.fit.top.apply(this,arguments)}}};var t;y.ui.position,y.extend(y.expr.pseudos,{data:y.expr.createPseudo?y.expr.createPseudo(function(e){return function(t){return!!y.data(t,e)}}):function(t,e,i){return!!y.data(t,i[3])}}),y.fn.extend({
+disableSelection:(t="onselectstart"in document.createElement("div")?"selectstart":"mousedown",function(){return this.on(t+".ui-disableSelection",function(t){t.preventDefault()})}),enableSelection:function(){return this.off(".ui-disableSelection")}});y.ui.focusable=function(t,e){var i,s,n,o,h=t.nodeName.toLowerCase();return"area"===h?(s=(i=t.parentNode).name,!(!t.href||!s||"map"!==i.nodeName.toLowerCase())&&(0<(s=y("img[usemap='#"+s+"']")).length&&s.is(":visible"))):(/^(input|select|textarea|button|object)$/.test(h)?(n=!t.disabled)&&(o=y(t).closest("fieldset")[0])&&(n=!o.disabled):n="a"===h&&t.href||e,n&&y(t).is(":visible")&&function(t){var e=t.css("visibility");for(;"inherit"===e;)t=t.parent(),e=t.css("visibility");return"visible"===e}(y(t)))},y.extend(y.expr.pseudos,{focusable:function(t){return y.ui.focusable(t,null!=y.attr(t,"tabindex"))}});var e,d;y.ui.focusable,y.fn._form=function(){return"string"==typeof this[0].form?this.closest("form"):y(this[0].form)},y.ui.formResetMixin={_formResetHandler:function(
+){var e=y(this);setTimeout(function(){var t=e.data("ui-form-reset-instances");y.each(t,function(){this.refresh()})})},_bindFormResetHandler:function(){var t;this.form=this.element._form(),this.form.length&&((t=this.form.data("ui-form-reset-instances")||[]).length||this.form.on("reset.ui-form-reset",this._formResetHandler),t.push(this),this.form.data("ui-form-reset-instances",t))},_unbindFormResetHandler:function(){var t;this.form.length&&((t=this.form.data("ui-form-reset-instances")).splice(y.inArray(this,t),1),t.length?this.form.data("ui-form-reset-instances",t):this.form.removeData("ui-form-reset-instances").off("reset.ui-form-reset"))}};y.expr.pseudos||(y.expr.pseudos=y.expr[":"]),y.uniqueSort||(y.uniqueSort=y.unique),y.escapeSelector||(e=/([\0-\x1f\x7f]|^-?\d)|^-$|[^\x80-\uFFFF\w-]/g,d=function(t,e){return e?"\0"===t?"�":t.slice(0,-1)+"\\"+t.charCodeAt(t.length-1).toString(16)+" ":"\\"+t},y.escapeSelector=function(t){return(t+"").replace(e,d)}),y.fn.even&&y.fn.odd||y.fn.extend({even:function(){
+return this.filter(function(t){return t%2==0})},odd:function(){return this.filter(function(t){return t%2==1})}});y.ui.keyCode={BACKSPACE:8,COMMA:188,DELETE:46,DOWN:40,END:35,ENTER:13,ESCAPE:27,HOME:36,LEFT:37,PAGE_DOWN:34,PAGE_UP:33,PERIOD:190,RIGHT:39,SPACE:32,TAB:9,UP:38},y.fn.labels=function(){var t,e,i;return this.length?this[0].labels&&this[0].labels.length?this.pushStack(this[0].labels):(e=this.eq(0).parents("label"),(t=this.attr("id"))&&(i=(i=this.eq(0).parents().last()).add((i.length?i:this).siblings()),t="label[for='"+y.escapeSelector(t)+"']",e=e.add(i.find(t).addBack(t))),this.pushStack(e)):this.pushStack([])},y.fn.scrollParent=function(t){var e=this.css("position"),i="absolute"===e,s=t?/(auto|scroll|hidden)/:/(auto|scroll)/,t=this.parents().filter(function(){var t=y(this);return(!i||"static"!==t.css("position"))&&s.test(t.css("overflow")+t.css("overflow-y")+t.css("overflow-x"))}).eq(0);return"fixed"!==e&&t.length?t:y(this[0].ownerDocument||document)},y.extend(y.expr.pseudos,{tabbable:function(t){
+var e=y.attr(t,"tabindex"),i=null!=e;return(!i||0<=e)&&y.ui.focusable(t,i)}}),y.fn.extend({uniqueId:(c=0,function(){return this.each(function(){this.id||(this.id="ui-id-"+ ++c)})}),removeUniqueId:function(){return this.each(function(){/^ui-id-\d+$/.test(this.id)&&y(this).removeAttr("id")})}}),y.ui.ie=!!/msie [\w.]+/.exec(navigator.userAgent.toLowerCase());var c,f=!1;y(document).on("mouseup",function(){f=!1});y.widget("ui.mouse",{version:"1.13.2",options:{cancel:"input, textarea, button, select, option",distance:1,delay:0},_mouseInit:function(){var e=this;this.element.on("mousedown."+this.widgetName,function(t){return e._mouseDown(t)}).on("click."+this.widgetName,function(t){if(!0===y.data(t.target,e.widgetName+".preventClickEvent"))return y.removeData(t.target,e.widgetName+".preventClickEvent"),t.stopImmediatePropagation(),!1}),this.started=!1},_mouseDestroy:function(){this.element.off("."+this.widgetName),this._mouseMoveDelegate&&this.document.off("mousemove."+this.widgetName,this._mouseMoveDelegate).off(
+"mouseup."+this.widgetName,this._mouseUpDelegate)},_mouseDown:function(t){if(!f){this._mouseMoved=!1,this._mouseStarted&&this._mouseUp(t),this._mouseDownEvent=t;var e=this,i=1===t.which,s=!("string"!=typeof this.options.cancel||!t.target.nodeName)&&y(t.target).closest(this.options.cancel).length;return i&&!s&&this._mouseCapture(t)?(this.mouseDelayMet=!this.options.delay,this.mouseDelayMet||(this._mouseDelayTimer=setTimeout(function(){e.mouseDelayMet=!0},this.options.delay)),this._mouseDistanceMet(t)&&this._mouseDelayMet(t)&&(this._mouseStarted=!1!==this._mouseStart(t),!this._mouseStarted)?(t.preventDefault(),!0):(!0===y.data(t.target,this.widgetName+".preventClickEvent")&&y.removeData(t.target,this.widgetName+".preventClickEvent"),this._mouseMoveDelegate=function(t){return e._mouseMove(t)},this._mouseUpDelegate=function(t){return e._mouseUp(t)},this.document.on("mousemove."+this.widgetName,this._mouseMoveDelegate).on("mouseup."+this.widgetName,this._mouseUpDelegate),t.preventDefault(),f=!0)):!0}},
+_mouseMove:function(t){if(this._mouseMoved){if(y.ui.ie&&(!document.documentMode||document.documentMode<9)&&!t.button)return this._mouseUp(t);if(!t.which)if(t.originalEvent.altKey||t.originalEvent.ctrlKey||t.originalEvent.metaKey||t.originalEvent.shiftKey)this.ignoreMissingWhich=!0;else if(!this.ignoreMissingWhich)return this._mouseUp(t)}return(t.which||t.button)&&(this._mouseMoved=!0),this._mouseStarted?(this._mouseDrag(t),t.preventDefault()):(this._mouseDistanceMet(t)&&this._mouseDelayMet(t)&&(this._mouseStarted=!1!==this._mouseStart(this._mouseDownEvent,t),this._mouseStarted?this._mouseDrag(t):this._mouseUp(t)),!this._mouseStarted)},_mouseUp:function(t){this.document.off("mousemove."+this.widgetName,this._mouseMoveDelegate).off("mouseup."+this.widgetName,this._mouseUpDelegate),this._mouseStarted&&(this._mouseStarted=!1,t.target===this._mouseDownEvent.target&&y.data(t.target,this.widgetName+".preventClickEvent",!0),this._mouseStop(t)),this._mouseDelayTimer&&(clearTimeout(this._mouseDelayTimer),
+delete this._mouseDelayTimer),this.ignoreMissingWhich=!1,f=!1,t.preventDefault()},_mouseDistanceMet:function(t){return Math.max(Math.abs(this._mouseDownEvent.pageX-t.pageX),Math.abs(this._mouseDownEvent.pageY-t.pageY))>=this.options.distance},_mouseDelayMet:function(){return this.mouseDelayMet},_mouseStart:function(){},_mouseDrag:function(){},_mouseStop:function(){},_mouseCapture:function(){return!0}}),y.ui.plugin={add:function(t,e,i){var s,n=y.ui[t].prototype;for(s in i)n.plugins[s]=n.plugins[s]||[],n.plugins[s].push([e,i[s]])},call:function(t,e,i,s){var n,o=t.plugins[e];if(o&&(s||t.element[0].parentNode&&11!==t.element[0].parentNode.nodeType))for(n=0;n<o.length;n++)t.options[o[n][0]]&&o[n][1].apply(t.element,i)}};y.widget("ui.resizable",y.ui.mouse,{version:"1.13.2",widgetEventPrefix:"resize",options:{alsoResize:!1,animate:!1,animateDuration:"slow",animateEasing:"swing",aspectRatio:!1,autoHide:!1,classes:{"ui-resizable-se":"ui-icon ui-icon-gripsmall-diagonal-se"},containment:!1,ghost:!1,grid:!1,
+handles:"e,s,se",helper:!1,maxHeight:null,maxWidth:null,minHeight:10,minWidth:10,zIndex:90,resize:null,start:null,stop:null},_num:function(t){return parseFloat(t)||0},_isNumber:function(t){return!isNaN(parseFloat(t))},_hasScroll:function(t,e){if("hidden"===y(t).css("overflow"))return!1;var i=e&&"left"===e?"scrollLeft":"scrollTop",e=!1;if(0<t[i])return!0;try{t[i]=1,e=0<t[i],t[i]=0}catch(t){}return e},_create:function(){var t,e=this.options,i=this;this._addClass("ui-resizable"),y.extend(this,{_aspectRatio:!!e.aspectRatio,aspectRatio:e.aspectRatio,originalElement:this.element,_proportionallyResizeElements:[],_helper:e.helper||e.ghost||e.animate?e.helper||"ui-resizable-helper":null}),this.element[0].nodeName.match(/^(canvas|textarea|input|select|button|img)$/i)&&(this.element.wrap(y("<div class='ui-wrapper'></div>").css({overflow:"hidden",position:this.element.css("position"),width:this.element.outerWidth(),height:this.element.outerHeight(),top:this.element.css("top"),left:this.element.css("left")})),
+this.element=this.element.parent().data("ui-resizable",this.element.resizable("instance")),this.elementIsWrapper=!0,t={marginTop:this.originalElement.css("marginTop"),marginRight:this.originalElement.css("marginRight"),marginBottom:this.originalElement.css("marginBottom"),marginLeft:this.originalElement.css("marginLeft")},this.element.css(t),this.originalElement.css("margin",0),this.originalResizeStyle=this.originalElement.css("resize"),this.originalElement.css("resize","none"),this._proportionallyResizeElements.push(this.originalElement.css({position:"static",zoom:1,display:"block"})),this.originalElement.css(t),this._proportionallyResize()),this._setupHandles(),e.autoHide&&y(this.element).on("mouseenter",function(){e.disabled||(i._removeClass("ui-resizable-autohide"),i._handles.show())}).on("mouseleave",function(){e.disabled||i.resizing||(i._addClass("ui-resizable-autohide"),i._handles.hide())}),this._mouseInit()},_destroy:function(){this._mouseDestroy(),this._addedHandles.remove();function t(t){y(t
+).removeData("resizable").removeData("ui-resizable").off(".resizable")}var e;return this.elementIsWrapper&&(t(this.element),e=this.element,this.originalElement.css({position:e.css("position"),width:e.outerWidth(),height:e.outerHeight(),top:e.css("top"),left:e.css("left")}).insertAfter(e),e.remove()),this.originalElement.css("resize",this.originalResizeStyle),t(this.originalElement),this},_setOption:function(t,e){switch(this._super(t,e),t){case"handles":this._removeHandles(),this._setupHandles();break;case"aspectRatio":this._aspectRatio=!!e}},_setupHandles:function(){var t,e,i,s,n,o=this.options,h=this;if(this.handles=o.handles||(y(".ui-resizable-handle",this.element).length?{n:".ui-resizable-n",e:".ui-resizable-e",s:".ui-resizable-s",w:".ui-resizable-w",se:".ui-resizable-se",sw:".ui-resizable-sw",ne:".ui-resizable-ne",nw:".ui-resizable-nw"}:"e,s,se"),this._handles=y(),this._addedHandles=y(),this.handles.constructor===String)for("all"===this.handles&&(this.handles="n,e,s,w,se,sw,ne,nw"),i=this.handles.split(
+","),this.handles={},e=0;e<i.length;e++)s="ui-resizable-"+(t=String.prototype.trim.call(i[e])),n=y("<div>"),this._addClass(n,"ui-resizable-handle "+s),n.css({zIndex:o.zIndex}),this.handles[t]=".ui-resizable-"+t,this.element.children(this.handles[t]).length||(this.element.append(n),this._addedHandles=this._addedHandles.add(n));this._renderAxis=function(t){var e,i,s;for(e in t=t||this.element,this.handles)this.handles[e].constructor===String?this.handles[e]=this.element.children(this.handles[e]).first().show():(this.handles[e].jquery||this.handles[e].nodeType)&&(this.handles[e]=y(this.handles[e]),this._on(this.handles[e],{mousedown:h._mouseDown})),this.elementIsWrapper&&this.originalElement[0].nodeName.match(/^(textarea|input|select|button)$/i)&&(i=y(this.handles[e],this.element),s=/sw|ne|nw|se|n|s/.test(e)?i.outerHeight():i.outerWidth(),i=["padding",/ne|nw|n/.test(e)?"Top":/se|sw|s/.test(e)?"Bottom":/^e$/.test(e)?"Right":"Left"].join(""),t.css(i,s),this._proportionallyResize()),this._handles=this._handles.add(
+this.handles[e])},this._renderAxis(this.element),this._handles=this._handles.add(this.element.find(".ui-resizable-handle")),this._handles.disableSelection(),this._handles.on("mouseover",function(){h.resizing||(this.className&&(n=this.className.match(/ui-resizable-(se|sw|ne|nw|n|e|s|w)/i)),h.axis=n&&n[1]?n[1]:"se")}),o.autoHide&&(this._handles.hide(),this._addClass("ui-resizable-autohide"))},_removeHandles:function(){this._addedHandles.remove()},_mouseCapture:function(t){var e,i,s=!1;for(e in this.handles)(i=y(this.handles[e])[0])!==t.target&&!y.contains(i,t.target)||(s=!0);return!this.options.disabled&&s},_mouseStart:function(t){var e,i,s=this.options,n=this.element;return this.resizing=!0,this._renderProxy(),e=this._num(this.helper.css("left")),i=this._num(this.helper.css("top")),s.containment&&(e+=y(s.containment).scrollLeft()||0,i+=y(s.containment).scrollTop()||0),this.offset=this.helper.offset(),this.position={left:e,top:i},this.size=this._helper?{width:this.helper.width(),height:this.helper.height()}:{
+width:n.width(),height:n.height()},this.originalSize=this._helper?{width:n.outerWidth(),height:n.outerHeight()}:{width:n.width(),height:n.height()},this.sizeDiff={width:n.outerWidth()-n.width(),height:n.outerHeight()-n.height()},this.originalPosition={left:e,top:i},this.originalMousePosition={left:t.pageX,top:t.pageY},this.aspectRatio="number"==typeof s.aspectRatio?s.aspectRatio:this.originalSize.width/this.originalSize.height||1,s=y(".ui-resizable-"+this.axis).css("cursor"),y("body").css("cursor","auto"===s?this.axis+"-resize":s),this._addClass("ui-resizable-resizing"),this._propagate("start",t),!0},_mouseDrag:function(t){var e=this.originalMousePosition,i=this.axis,s=t.pageX-e.left||0,e=t.pageY-e.top||0,i=this._change[i];return this._updatePrevProperties(),i&&(e=i.apply(this,[t,s,e]),this._updateVirtualBoundaries(t.shiftKey),(this._aspectRatio||t.shiftKey)&&(e=this._updateRatio(e,t)),e=this._respectSize(e,t),this._updateCache(e),this._propagate("resize",t),e=this._applyChanges(),
+!this._helper&&this._proportionallyResizeElements.length&&this._proportionallyResize(),y.isEmptyObject(e)||(this._updatePrevProperties(),this._trigger("resize",t,this.ui()),this._applyChanges())),!1},_mouseStop:function(t){this.resizing=!1;var e,i,s,n=this.options,o=this;return this._helper&&(s=(e=(i=this._proportionallyResizeElements).length&&/textarea/i.test(i[0].nodeName))&&this._hasScroll(i[0],"left")?0:o.sizeDiff.height,i=e?0:o.sizeDiff.width,e={width:o.helper.width()-i,height:o.helper.height()-s},i=parseFloat(o.element.css("left"))+(o.position.left-o.originalPosition.left)||null,s=parseFloat(o.element.css("top"))+(o.position.top-o.originalPosition.top)||null,n.animate||this.element.css(y.extend(e,{top:s,left:i})),o.helper.height(o.size.height),o.helper.width(o.size.width),this._helper&&!n.animate&&this._proportionallyResize()),y("body").css("cursor","auto"),this._removeClass("ui-resizable-resizing"),this._propagate("stop",t),this._helper&&this.helper.remove(),!1},_updatePrevProperties:function(){
+this.prevPosition={top:this.position.top,left:this.position.left},this.prevSize={width:this.size.width,height:this.size.height}},_applyChanges:function(){var t={};return this.position.top!==this.prevPosition.top&&(t.top=this.position.top+"px"),this.position.left!==this.prevPosition.left&&(t.left=this.position.left+"px"),this.size.width!==this.prevSize.width&&(t.width=this.size.width+"px"),this.size.height!==this.prevSize.height&&(t.height=this.size.height+"px"),this.helper.css(t),t},_updateVirtualBoundaries:function(t){var e,i,s=this.options,n={minWidth:this._isNumber(s.minWidth)?s.minWidth:0,maxWidth:this._isNumber(s.maxWidth)?s.maxWidth:1/0,minHeight:this._isNumber(s.minHeight)?s.minHeight:0,maxHeight:this._isNumber(s.maxHeight)?s.maxHeight:1/0};(this._aspectRatio||t)&&(e=n.minHeight*this.aspectRatio,i=n.minWidth/this.aspectRatio,s=n.maxHeight*this.aspectRatio,t=n.maxWidth/this.aspectRatio,e>n.minWidth&&(n.minWidth=e),i>n.minHeight&&(n.minHeight=i),s<n.maxWidth&&(n.maxWidth=s),t<n.maxHeight&&(n.maxHeight=t)
+),this._vBoundaries=n},_updateCache:function(t){this.offset=this.helper.offset(),this._isNumber(t.left)&&(this.position.left=t.left),this._isNumber(t.top)&&(this.position.top=t.top),this._isNumber(t.height)&&(this.size.height=t.height),this._isNumber(t.width)&&(this.size.width=t.width)},_updateRatio:function(t){var e=this.position,i=this.size,s=this.axis;return this._isNumber(t.height)?t.width=t.height*this.aspectRatio:this._isNumber(t.width)&&(t.height=t.width/this.aspectRatio),"sw"===s&&(t.left=e.left+(i.width-t.width),t.top=null),"nw"===s&&(t.top=e.top+(i.height-t.height),t.left=e.left+(i.width-t.width)),t},_respectSize:function(t){var e=this._vBoundaries,i=this.axis,s=this._isNumber(t.width)&&e.maxWidth&&e.maxWidth<t.width,n=this._isNumber(t.height)&&e.maxHeight&&e.maxHeight<t.height,o=this._isNumber(t.width)&&e.minWidth&&e.minWidth>t.width,h=this._isNumber(t.height)&&e.minHeight&&e.minHeight>t.height,a=this.originalPosition.left+this.originalSize.width,r=this.originalPosition.top+this.originalSize.height
+,l=/sw|nw|w/.test(i),i=/nw|ne|n/.test(i);return o&&(t.width=e.minWidth),h&&(t.height=e.minHeight),s&&(t.width=e.maxWidth),n&&(t.height=e.maxHeight),o&&l&&(t.left=a-e.minWidth),s&&l&&(t.left=a-e.maxWidth),h&&i&&(t.top=r-e.minHeight),n&&i&&(t.top=r-e.maxHeight),t.width||t.height||t.left||!t.top?t.width||t.height||t.top||!t.left||(t.left=null):t.top=null,t},_getPaddingPlusBorderDimensions:function(t){for(var e=0,i=[],s=[t.css("borderTopWidth"),t.css("borderRightWidth"),t.css("borderBottomWidth"),t.css("borderLeftWidth")],n=[t.css("paddingTop"),t.css("paddingRight"),t.css("paddingBottom"),t.css("paddingLeft")];e<4;e++)i[e]=parseFloat(s[e])||0,i[e]+=parseFloat(n[e])||0;return{height:i[0]+i[2],width:i[1]+i[3]}},_proportionallyResize:function(){if(this._proportionallyResizeElements.length)for(var t,e=0,i=this.helper||this.element;e<this._proportionallyResizeElements.length;e++)t=this._proportionallyResizeElements[e],this.outerDimensions||(this.outerDimensions=this._getPaddingPlusBorderDimensions(t)),t.css({
+height:i.height()-this.outerDimensions.height||0,width:i.width()-this.outerDimensions.width||0})},_renderProxy:function(){var t=this.element,e=this.options;this.elementOffset=t.offset(),this._helper?(this.helper=this.helper||y("<div></div>").css({overflow:"hidden"}),this._addClass(this.helper,this._helper),this.helper.css({width:this.element.outerWidth(),height:this.element.outerHeight(),position:"absolute",left:this.elementOffset.left+"px",top:this.elementOffset.top+"px",zIndex:++e.zIndex}),this.helper.appendTo("body").disableSelection()):this.helper=this.element},_change:{e:function(t,e){return{width:this.originalSize.width+e}},w:function(t,e){var i=this.originalSize;return{left:this.originalPosition.left+e,width:i.width-e}},n:function(t,e,i){var s=this.originalSize;return{top:this.originalPosition.top+i,height:s.height-i}},s:function(t,e,i){return{height:this.originalSize.height+i}},se:function(t,e,i){return y.extend(this._change.s.apply(this,arguments),this._change.e.apply(this,[t,e,i]))},sw:function(t,e,
+i){return y.extend(this._change.s.apply(this,arguments),this._change.w.apply(this,[t,e,i]))},ne:function(t,e,i){return y.extend(this._change.n.apply(this,arguments),this._change.e.apply(this,[t,e,i]))},nw:function(t,e,i){return y.extend(this._change.n.apply(this,arguments),this._change.w.apply(this,[t,e,i]))}},_propagate:function(t,e){y.ui.plugin.call(this,t,[e,this.ui()]),"resize"!==t&&this._trigger(t,e,this.ui())},plugins:{},ui:function(){return{originalElement:this.originalElement,element:this.element,helper:this.helper,position:this.position,size:this.size,originalSize:this.originalSize,originalPosition:this.originalPosition}}}),y.ui.plugin.add("resizable","animate",{stop:function(e){var i=y(this).resizable("instance"),t=i.options,s=i._proportionallyResizeElements,n=s.length&&/textarea/i.test(s[0].nodeName),o=n&&i._hasScroll(s[0],"left")?0:i.sizeDiff.height,h=n?0:i.sizeDiff.width,n={width:i.size.width-h,height:i.size.height-o},h=parseFloat(i.element.css("left"))+(i.position.left-i.originalPosition.left
+)||null,o=parseFloat(i.element.css("top"))+(i.position.top-i.originalPosition.top)||null;i.element.animate(y.extend(n,o&&h?{top:o,left:h}:{}),{duration:t.animateDuration,easing:t.animateEasing,step:function(){var t={width:parseFloat(i.element.css("width")),height:parseFloat(i.element.css("height")),top:parseFloat(i.element.css("top")),left:parseFloat(i.element.css("left"))};s&&s.length&&y(s[0]).css({width:t.width,height:t.height}),i._updateCache(t),i._propagate("resize",e)}})}}),y.ui.plugin.add("resizable","containment",{start:function(){var i,s,n=y(this).resizable("instance"),t=n.options,e=n.element,o=t.containment,h=o instanceof y?o.get(0):/parent/.test(o)?e.parent().get(0):o;h&&(n.containerElement=y(h),/document/.test(o)||o===document?(n.containerOffset={left:0,top:0},n.containerPosition={left:0,top:0},n.parentData={element:y(document),left:0,top:0,width:y(document).width(),height:y(document).height()||document.body.parentNode.scrollHeight}):(i=y(h),s=[],y(["Top","Right","Left","Bottom"]).each(function(t,e
+){s[t]=n._num(i.css("padding"+e))}),n.containerOffset=i.offset(),n.containerPosition=i.position(),n.containerSize={height:i.innerHeight()-s[3],width:i.innerWidth()-s[1]},t=n.containerOffset,e=n.containerSize.height,o=n.containerSize.width,o=n._hasScroll(h,"left")?h.scrollWidth:o,e=n._hasScroll(h)?h.scrollHeight:e,n.parentData={element:h,left:t.left,top:t.top,width:o,height:e}))},resize:function(t){var e=y(this).resizable("instance"),i=e.options,s=e.containerOffset,n=e.position,o=e._aspectRatio||t.shiftKey,h={top:0,left:0},a=e.containerElement,t=!0;a[0]!==document&&/static/.test(a.css("position"))&&(h=s),n.left<(e._helper?s.left:0)&&(e.size.width=e.size.width+(e._helper?e.position.left-s.left:e.position.left-h.left),o&&(e.size.height=e.size.width/e.aspectRatio,t=!1),e.position.left=i.helper?s.left:0),n.top<(e._helper?s.top:0)&&(e.size.height=e.size.height+(e._helper?e.position.top-s.top:e.position.top),o&&(e.size.width=e.size.height*e.aspectRatio,t=!1),e.position.top=e._helper?s.top:0),
+i=e.containerElement.get(0)===e.element.parent().get(0),n=/relative|absolute/.test(e.containerElement.css("position")),i&&n?(e.offset.left=e.parentData.left+e.position.left,e.offset.top=e.parentData.top+e.position.top):(e.offset.left=e.element.offset().left,e.offset.top=e.element.offset().top),n=Math.abs(e.sizeDiff.width+(e._helper?e.offset.left-h.left:e.offset.left-s.left)),s=Math.abs(e.sizeDiff.height+(e._helper?e.offset.top-h.top:e.offset.top-s.top)),n+e.size.width>=e.parentData.width&&(e.size.width=e.parentData.width-n,o&&(e.size.height=e.size.width/e.aspectRatio,t=!1)),s+e.size.height>=e.parentData.height&&(e.size.height=e.parentData.height-s,o&&(e.size.width=e.size.height*e.aspectRatio,t=!1)),t||(e.position.left=e.prevPosition.left,e.position.top=e.prevPosition.top,e.size.width=e.prevSize.width,e.size.height=e.prevSize.height)},stop:function(){var t=y(this).resizable("instance"),e=t.options,i=t.containerOffset,s=t.containerPosition,n=t.containerElement,o=y(t.helper),h=o.offset(),a=o.outerWidth(
+)-t.sizeDiff.width,o=o.outerHeight()-t.sizeDiff.height;t._helper&&!e.animate&&/relative/.test(n.css("position"))&&y(this).css({left:h.left-s.left-i.left,width:a,height:o}),t._helper&&!e.animate&&/static/.test(n.css("position"))&&y(this).css({left:h.left-s.left-i.left,width:a,height:o})}}),y.ui.plugin.add("resizable","alsoResize",{start:function(){var t=y(this).resizable("instance").options;y(t.alsoResize).each(function(){var t=y(this);t.data("ui-resizable-alsoresize",{width:parseFloat(t.width()),height:parseFloat(t.height()),left:parseFloat(t.css("left")),top:parseFloat(t.css("top"))})})},resize:function(t,i){var e=y(this).resizable("instance"),s=e.options,n=e.originalSize,o=e.originalPosition,h={height:e.size.height-n.height||0,width:e.size.width-n.width||0,top:e.position.top-o.top||0,left:e.position.left-o.left||0};y(s.alsoResize).each(function(){var t=y(this),s=y(this).data("ui-resizable-alsoresize"),n={},e=t.parents(i.originalElement[0]).length?["width","height"]:["width","height","top","left"];y.each(e,
+function(t,e){var i=(s[e]||0)+(h[e]||0);i&&0<=i&&(n[e]=i||null)}),t.css(n)})},stop:function(){y(this).removeData("ui-resizable-alsoresize")}}),y.ui.plugin.add("resizable","ghost",{start:function(){var t=y(this).resizable("instance"),e=t.size;t.ghost=t.originalElement.clone(),t.ghost.css({opacity:.25,display:"block",position:"relative",height:e.height,width:e.width,margin:0,left:0,top:0}),t._addClass(t.ghost,"ui-resizable-ghost"),!1!==y.uiBackCompat&&"string"==typeof t.options.ghost&&t.ghost.addClass(this.options.ghost),t.ghost.appendTo(t.helper)},resize:function(){var t=y(this).resizable("instance");t.ghost&&t.ghost.css({position:"relative",height:t.size.height,width:t.size.width})},stop:function(){var t=y(this).resizable("instance");t.ghost&&t.helper&&t.helper.get(0).removeChild(t.ghost.get(0))}}),y.ui.plugin.add("resizable","grid",{resize:function(){var t,e=y(this).resizable("instance"),i=e.options,s=e.size,n=e.originalSize,o=e.originalPosition,h=e.axis,a="number"==typeof i.grid?[i.grid,i.grid]:i.grid,r=a[0
+]||1,l=a[1]||1,u=Math.round((s.width-n.width)/r)*r,p=Math.round((s.height-n.height)/l)*l,d=n.width+u,c=n.height+p,f=i.maxWidth&&i.maxWidth<d,g=i.maxHeight&&i.maxHeight<c,m=i.minWidth&&i.minWidth>d,s=i.minHeight&&i.minHeight>c;i.grid=a,m&&(d+=r),s&&(c+=l),f&&(d-=r),g&&(c-=l),/^(se|s|e)$/.test(h)?(e.size.width=d,e.size.height=c):/^(ne)$/.test(h)?(e.size.width=d,e.size.height=c,e.position.top=o.top-p):/^(sw)$/.test(h)?(e.size.width=d,e.size.height=c,e.position.left=o.left-u):((c-l<=0||d-r<=0)&&(t=e._getPaddingPlusBorderDimensions(this)),0<c-l?(e.size.height=c,e.position.top=o.top-p):(c=l-t.height,e.size.height=c,e.position.top=o.top+n.height-c),0<d-r?(e.size.width=d,e.position.left=o.left-u):(d=r-t.width,e.size.width=d,e.position.left=o.left+n.width-d))}});y.ui.resizable});
+/**
  * Copyright (c) 2007 Ariel Flesler - aflesler ○ gmail • com | https://github.com/flesler
  * Licensed under MIT
  * @author Ariel Flesler
  * @version 2.1.2
- */
-;(function(f){"use strict";"function"===typeof define&&define.amd?define(["jquery"],f):"undefined"!==typeof module&&module.exports?module.exports=f(require("jquery")):f(jQuery)})(function($){"use strict";function n(a){return!a.nodeName||-1!==$.inArray(a.nodeName.toLowerCase(),["iframe","#document","html","body"])}function h(a){return $.isFunction(a)||$.isPlainObject(a)?a:{top:a,left:a}}var p=$.scrollTo=function(a,d,b){return $(window).scrollTo(a,d,b)};p.defaults={axis:"xy",duration:0,limit:!0};$.fn.scrollTo=function(a,d,b){"object"=== typeof d&&(b=d,d=0);"function"===typeof b&&(b={onAfter:b});"max"===a&&(a=9E9);b=$.extend({},p.defaults,b);d=d||b.duration;var u=b.queue&&1<b.axis.length;u&&(d/=2);b.offset=h(b.offset);b.over=h(b.over);return this.each(function(){function k(a){var k=$.extend({},b,{queue:!0,duration:d,complete:a&&function(){a.call(q,e,b)}});r.animate(f,k)}if(null!==a){var l=n(this),q=l?this.contentWindow||window:this,r=$(q),e=a,f={},t;switch(typeof e){case "number":case "string":if(/^([+-]=?)?\d+(\.\d+)?(px|%)?$/.test(e)){e= h(e);break}e=l?$(e):$(e,q);case "object":if(e.length===0)return;if(e.is||e.style)t=(e=$(e)).offset()}var v=$.isFunction(b.offset)&&b.offset(q,e)||b.offset;$.each(b.axis.split(""),function(a,c){var d="x"===c?"Left":"Top",m=d.toLowerCase(),g="scroll"+d,h=r[g](),n=p.max(q,c);t?(f[g]=t[m]+(l?0:h-r.offset()[m]),b.margin&&(f[g]-=parseInt(e.css("margin"+d),10)||0,f[g]-=parseInt(e.css("border"+d+"Width"),10)||0),f[g]+=v[m]||0,b.over[m]&&(f[g]+=e["x"===c?"width":"height"]()*b.over[m])):(d=e[m],f[g]=d.slice&& "%"===d.slice(-1)?parseFloat(d)/100*n:d);b.limit&&/^\d+$/.test(f[g])&&(f[g]=0>=f[g]?0:Math.min(f[g],n));!a&&1<b.axis.length&&(h===f[g]?f={}:u&&(k(b.onAfterFirst),f={}))});k(b.onAfter)}})};p.max=function(a,d){var b="x"===d?"Width":"Height",h="scroll"+b;if(!n(a))return a[h]-$(a)[b.toLowerCase()]();var b="client"+b,k=a.ownerDocument||a.document,l=k.documentElement,k=k.body;return Math.max(l[h],k[h])-Math.min(l[b],k[b])};$.Tween.propHooks.scrollLeft=$.Tween.propHooks.scrollTop={get:function(a){return $(a.elem)[a.prop]()}, set:function(a){var d=this.get(a);if(a.options.interrupt&&a._last&&a._last!==d)return $(a.elem).stop();var b=Math.round(a.now);d!==b&&($(a.elem)[a.prop](b),a._last=this.get(a))}};return p});
+ */(function(f){"use strict";"function"===typeof define&&define.amd?define(["jquery"],f):"undefined"!==typeof module&&module.exports?module.exports=f(require("jquery")):f(jQuery)})(function($){"use strict";function n(a){return!a.nodeName||-1!==$.inArray(a.nodeName.toLowerCase(),["iframe","#document","html","body"])}function h(a){return $.isFunction(a)||$.isPlainObject(a)?a:{top:a,left:a}}var p=$.scrollTo=function(a,d,b){return $(window).scrollTo(a,d,b)};p.defaults={axis:"xy",duration:0,limit:!0};$.fn.scrollTo=function(a,d,b){"object"===typeof d&&(b=d,d=0);"function"===typeof b&&(b={onAfter:b});"max"===a&&(a=9e9);b=$.extend({},p.defaults,b);d=d||b.duration;var u=b.queue&&1<b.axis.length;u&&(d/=2);b.offset=h(b.offset);b.over=h(b.over);return this.each(function(){function k(a){var k=$.extend({},b,{queue:!0,duration:d,complete:a&&function(){a.call(q,e,b)}});r.animate(f,k)}if(null!==a){var l=n(this),q=l?this.contentWindow||window:this,r=$(q),e=a,f={},t;switch(typeof e){case"number":case"string":if(
+/^([+-]=?)?\d+(\.\d+)?(px|%)?$/.test(e)){e=h(e);break}e=l?$(e):$(e,q);case"object":if(e.length===0)return;if(e.is||e.style)t=(e=$(e)).offset()}var v=$.isFunction(b.offset)&&b.offset(q,e)||b.offset;$.each(b.axis.split(""),function(a,c){var d="x"===c?"Left":"Top",m=d.toLowerCase(),g="scroll"+d,h=r[g](),n=p.max(q,c);t?(f[g]=t[m]+(l?0:h-r.offset()[m]),b.margin&&(f[g]-=parseInt(e.css("margin"+d),10)||0,f[g]-=parseInt(e.css("border"+d+"Width"),10)||0),f[g]+=v[m]||0,b.over[m]&&(f[g]+=e["x"===c?"width":"height"]()*b.over[m])):(d=e[m],f[g]=d.slice&&"%"===d.slice(-1)?parseFloat(d)/100*n:d);b.limit&&/^\d+$/.test(f[g])&&(f[g]=0>=f[g]?0:Math.min(f[g],n));!a&&1<b.axis.length&&(h===f[g]?f={}:u&&(k(b.onAfterFirst),f={}))});k(b.onAfter)}})};p.max=function(a,d){var b="x"===d?"Width":"Height",h="scroll"+b;if(!n(a))return a[h]-$(a)[b.toLowerCase()]();var b="client"+b,k=a.ownerDocument||a.document,l=k.documentElement,k=k.body;return Math.max(l[h],k[h])-Math.min(l[b],k[b])};
+$.Tween.propHooks.scrollLeft=$.Tween.propHooks.scrollTop={get:function(a){return $(a.elem)[a.prop]()},set:function(a){var d=this.get(a);if(a.options.interrupt&&a._last&&a._last!==d)return $(a.elem).stop();var b=Math.round(a.now);d!==b&&($(a.elem)[a.prop](b),a._last=this.get(a))}};return p});
 /*!
  PowerTip v1.3.1 (2018-04-15)
  https://stevenbenner.github.io/jquery-powertip/
@@ -20,7 +145,26 @@
  Released under MIT license.
  https://raw.github.com/stevenbenner/jquery-powertip/master/LICENSE.txt
 */
-(function(root,factory){if(typeof define==="function"&&define.amd){define(["jquery"],factory)}else if(typeof module==="object"&&module.exports){module.exports=factory(require("jquery"))}else{factory(root.jQuery)}})(this,function($){var $document=$(document),$window=$(window),$body=$("body");var DATA_DISPLAYCONTROLLER="displayController",DATA_HASACTIVEHOVER="hasActiveHover",DATA_FORCEDOPEN="forcedOpen",DATA_HASMOUSEMOVE="hasMouseMove",DATA_MOUSEONTOTIP="mouseOnToPopup",DATA_ORIGINALTITLE="originalTitle",DATA_POWERTIP="powertip",DATA_POWERTIPJQ="powertipjq",DATA_POWERTIPTARGET="powertiptarget",EVENT_NAMESPACE=".powertip",RAD2DEG=180/Math.PI,MOUSE_EVENTS=["click","dblclick","mousedown","mouseup","mousemove","mouseover","mouseout","mouseenter","mouseleave","contextmenu"];var session={tooltips:null,isTipOpen:false,isFixedTipOpen:false,isClosing:false,tipOpenImminent:false,activeHover:null,currentX:0,currentY:0,previousX:0,previousY:0,desyncTimeout:null,closeDelayTimeout:null,mouseTrackingActive:false,delayInProgress:false,windowWidth:0,windowHeight:0,scrollTop:0,scrollLeft:0};var Collision={none:0,top:1,bottom:2,left:4,right:8};$.fn.powerTip=function(opts,arg){var targetElements=this,options,tipController;if(!targetElements.length){return targetElements}if($.type(opts)==="string"&&$.powerTip[opts]){return $.powerTip[opts].call(targetElements,targetElements,arg)}options=$.extend({},$.fn.powerTip.defaults,opts);tipController=new TooltipController(options);initTracking();targetElements.each(function elementSetup(){var $this=$(this),dataPowertip=$this.data(DATA_POWERTIP),dataElem=$this.data(DATA_POWERTIPJQ),dataTarget=$this.data(DATA_POWERTIPTARGET),title=$this.attr("title");if(!dataPowertip&&!dataTarget&&!dataElem&&title){$this.data(DATA_POWERTIP,title);$this.data(DATA_ORIGINALTITLE,title);$this.removeAttr("title")}$this.data(DATA_DISPLAYCONTROLLER,new DisplayController($this,options,tipController))});if(!options.manual){$.each(options.openEvents,function(idx,evt){if($.inArray(evt,options.closeEvents)>-1){targetElements.on(evt+EVENT_NAMESPACE,function elementToggle(event){$.powerTip.toggle(this,event)})}else{targetElements.on(evt+EVENT_NAMESPACE,function elementOpen(event){$.powerTip.show(this,event)})}});$.each(options.closeEvents,function(idx,evt){if($.inArray(evt,options.openEvents)<0){targetElements.on(evt+EVENT_NAMESPACE,function elementClose(event){$.powerTip.hide(this,!isMouseEvent(event))})}});targetElements.on("keydown"+EVENT_NAMESPACE,function elementKeyDown(event){if(event.keyCode===27){$.powerTip.hide(this,true)}})}return targetElements};$.fn.powerTip.defaults={fadeInTime:200,fadeOutTime:100,followMouse:false,popupId:"powerTip",popupClass:null,intentSensitivity:7,intentPollInterval:100,closeDelay:100,placement:"n",smartPlacement:false,offset:10,mouseOnToPopup:false,manual:false,openEvents:["mouseenter","focus"],closeEvents:["mouseleave","blur"]};$.fn.powerTip.smartPlacementLists={n:["n","ne","nw","s"],e:["e","ne","se","w","nw","sw","n","s","e"],s:["s","se","sw","n"],w:["w","nw","sw","e","ne","se","n","s","w"],nw:["nw","w","sw","n","s","se","nw"],ne:["ne","e","se","n","s","sw","ne"],sw:["sw","w","nw","s","n","ne","sw"],se:["se","e","ne","s","n","nw","se"],"nw-alt":["nw-alt","n","ne-alt","sw-alt","s","se-alt","w","e"],"ne-alt":["ne-alt","n","nw-alt","se-alt","s","sw-alt","e","w"],"sw-alt":["sw-alt","s","se-alt","nw-alt","n","ne-alt","w","e"],"se-alt":["se-alt","s","sw-alt","ne-alt","n","nw-alt","e","w"]};$.powerTip={show:function apiShowTip(element,event){if(isMouseEvent(event)){trackMouse(event);session.previousX=event.pageX;session.previousY=event.pageY;$(element).data(DATA_DISPLAYCONTROLLER).show()}else{$(element).first().data(DATA_DISPLAYCONTROLLER).show(true,true)}return element},reposition:function apiResetPosition(element){$(element).first().data(DATA_DISPLAYCONTROLLER).resetPosition();return element},hide:function apiCloseTip(element,immediate){var displayController;immediate=element?immediate:true;if(element){displayController=$(element).first().data(DATA_DISPLAYCONTROLLER)}else if(session.activeHover){displayController=session.activeHover.data(DATA_DISPLAYCONTROLLER)}if(displayController){displayController.hide(immediate)}return element},toggle:function apiToggle(element,event){if(session.activeHover&&session.activeHover.is(element)){$.powerTip.hide(element,!isMouseEvent(event))}else{$.powerTip.show(element,event)}return element}};$.powerTip.showTip=$.powerTip.show;$.powerTip.closeTip=$.powerTip.hide;function CSSCoordinates(){var me=this;me.top="auto";me.left="auto";me.right="auto";me.bottom="auto";me.set=function(property,value){if($.isNumeric(value)){me[property]=Math.round(value)}}}function DisplayController(element,options,tipController){var hoverTimer=null,myCloseDelay=null;function openTooltip(immediate,forceOpen){cancelTimer();if(!element.data(DATA_HASACTIVEHOVER)){if(!immediate){session.tipOpenImminent=true;hoverTimer=setTimeout(function intentDelay(){hoverTimer=null;checkForIntent()},options.intentPollInterval)}else{if(forceOpen){element.data(DATA_FORCEDOPEN,true)}closeAnyDelayed();tipController.showTip(element)}}else{cancelClose()}}function closeTooltip(disableDelay){if(myCloseDelay){myCloseDelay=session.closeDelayTimeout=clearTimeout(myCloseDelay);session.delayInProgress=false}cancelTimer();session.tipOpenImminent=false;if(element.data(DATA_HASACTIVEHOVER)){element.data(DATA_FORCEDOPEN,false);if(!disableDelay){session.delayInProgress=true;session.closeDelayTimeout=setTimeout(function closeDelay(){session.closeDelayTimeout=null;tipController.hideTip(element);session.delayInProgress=false;myCloseDelay=null},options.closeDelay);myCloseDelay=session.closeDelayTimeout}else{tipController.hideTip(element)}}}function checkForIntent(){var xDifference=Math.abs(session.previousX-session.currentX),yDifference=Math.abs(session.previousY-session.currentY),totalDifference=xDifference+yDifference;if(totalDifference<options.intentSensitivity){cancelClose();closeAnyDelayed();tipController.showTip(element)}else{session.previousX=session.currentX;session.previousY=session.currentY;openTooltip()}}function cancelTimer(stopClose){hoverTimer=clearTimeout(hoverTimer);if(session.closeDelayTimeout&&myCloseDelay===session.closeDelayTimeout||stopClose){cancelClose()}}function cancelClose(){session.closeDelayTimeout=clearTimeout(session.closeDelayTimeout);session.delayInProgress=false}function closeAnyDelayed(){if(session.delayInProgress&&session.activeHover&&!session.activeHover.is(element)){session.activeHover.data(DATA_DISPLAYCONTROLLER).hide(true)}}function repositionTooltip(){tipController.resetPosition(element)}this.show=openTooltip;this.hide=closeTooltip;this.cancel=cancelTimer;this.resetPosition=repositionTooltip}function PlacementCalculator(){function computePlacementCoords(element,placement,tipWidth,tipHeight,offset){var placementBase=placement.split("-")[0],coords=new CSSCoordinates,position;if(isSvgElement(element)){position=getSvgPlacement(element,placementBase)}else{position=getHtmlPlacement(element,placementBase)}switch(placement){case"n":coords.set("left",position.left-tipWidth/2);coords.set("bottom",session.windowHeight-position.top+offset);break;case"e":coords.set("left",position.left+offset);coords.set("top",position.top-tipHeight/2);break;case"s":coords.set("left",position.left-tipWidth/2);coords.set("top",position.top+offset);break;case"w":coords.set("top",position.top-tipHeight/2);coords.set("right",session.windowWidth-position.left+offset);break;case"nw":coords.set("bottom",session.windowHeight-position.top+offset);coords.set("right",session.windowWidth-position.left-20);break;case"nw-alt":coords.set("left",position.left);coords.set("bottom",session.windowHeight-position.top+offset);break;case"ne":coords.set("left",position.left-20);coords.set("bottom",session.windowHeight-position.top+offset);break;case"ne-alt":coords.set("bottom",session.windowHeight-position.top+offset);coords.set("right",session.windowWidth-position.left);break;case"sw":coords.set("top",position.top+offset);coords.set("right",session.windowWidth-position.left-20);break;case"sw-alt":coords.set("left",position.left);coords.set("top",position.top+offset);break;case"se":coords.set("left",position.left-20);coords.set("top",position.top+offset);break;case"se-alt":coords.set("top",position.top+offset);coords.set("right",session.windowWidth-position.left);break}return coords}function getHtmlPlacement(element,placement){var objectOffset=element.offset(),objectWidth=element.outerWidth(),objectHeight=element.outerHeight(),left,top;switch(placement){case"n":left=objectOffset.left+objectWidth/2;top=objectOffset.top;break;case"e":left=objectOffset.left+objectWidth;top=objectOffset.top+objectHeight/2;break;case"s":left=objectOffset.left+objectWidth/2;top=objectOffset.top+objectHeight;break;case"w":left=objectOffset.left;top=objectOffset.top+objectHeight/2;break;case"nw":left=objectOffset.left;top=objectOffset.top;break;case"ne":left=objectOffset.left+objectWidth;top=objectOffset.top;break;case"sw":left=objectOffset.left;top=objectOffset.top+objectHeight;break;case"se":left=objectOffset.left+objectWidth;top=objectOffset.top+objectHeight;break}return{top:top,left:left}}function getSvgPlacement(element,placement){var svgElement=element.closest("svg")[0],domElement=element[0],point=svgElement.createSVGPoint(),boundingBox=domElement.getBBox(),matrix=domElement.getScreenCTM(),halfWidth=boundingBox.width/2,halfHeight=boundingBox.height/2,placements=[],placementKeys=["nw","n","ne","e","se","s","sw","w"],coords,rotation,steps,x;function pushPlacement(){placements.push(point.matrixTransform(matrix))}point.x=boundingBox.x;point.y=boundingBox.y;pushPlacement();point.x+=halfWidth;pushPlacement();point.x+=halfWidth;pushPlacement();point.y+=halfHeight;pushPlacement();point.y+=halfHeight;pushPlacement();point.x-=halfWidth;pushPlacement();point.x-=halfWidth;pushPlacement();point.y-=halfHeight;pushPlacement();if(placements[0].y!==placements[1].y||placements[0].x!==placements[7].x){rotation=Math.atan2(matrix.b,matrix.a)*RAD2DEG;steps=Math.ceil((rotation%360-22.5)/45);if(steps<1){steps+=8}while(steps--){placementKeys.push(placementKeys.shift())}}for(x=0;x<placements.length;x++){if(placementKeys[x]===placement){coords=placements[x];break}}return{top:coords.y+session.scrollTop,left:coords.x+session.scrollLeft}}this.compute=computePlacementCoords}function TooltipController(options){var placementCalculator=new PlacementCalculator,tipElement=$("#"+options.popupId);if(tipElement.length===0){tipElement=$("<div/>",{id:options.popupId});if($body.length===0){$body=$("body")}$body.append(tipElement);session.tooltips=session.tooltips?session.tooltips.add(tipElement):tipElement}if(options.followMouse){if(!tipElement.data(DATA_HASMOUSEMOVE)){$document.on("mousemove"+EVENT_NAMESPACE,positionTipOnCursor);$window.on("scroll"+EVENT_NAMESPACE,positionTipOnCursor);tipElement.data(DATA_HASMOUSEMOVE,true)}}function beginShowTip(element){element.data(DATA_HASACTIVEHOVER,true);tipElement.queue(function queueTipInit(next){showTip(element);next()})}function showTip(element){var tipContent;if(!element.data(DATA_HASACTIVEHOVER)){return}if(session.isTipOpen){if(!session.isClosing){hideTip(session.activeHover)}tipElement.delay(100).queue(function queueTipAgain(next){showTip(element);next()});return}element.trigger("powerTipPreRender");tipContent=getTooltipContent(element);if(tipContent){tipElement.empty().append(tipContent)}else{return}element.trigger("powerTipRender");session.activeHover=element;session.isTipOpen=true;tipElement.data(DATA_MOUSEONTOTIP,options.mouseOnToPopup);tipElement.addClass(options.popupClass);if(!options.followMouse||element.data(DATA_FORCEDOPEN)){positionTipOnElement(element);session.isFixedTipOpen=true}else{positionTipOnCursor()}if(!element.data(DATA_FORCEDOPEN)&&!options.followMouse){$document.on("click"+EVENT_NAMESPACE,function documentClick(event){var target=event.target;if(target!==element[0]){if(options.mouseOnToPopup){if(target!==tipElement[0]&&!$.contains(tipElement[0],target)){$.powerTip.hide()}}else{$.powerTip.hide()}}})}if(options.mouseOnToPopup&&!options.manual){tipElement.on("mouseenter"+EVENT_NAMESPACE,function tipMouseEnter(){if(session.activeHover){session.activeHover.data(DATA_DISPLAYCONTROLLER).cancel()}});tipElement.on("mouseleave"+EVENT_NAMESPACE,function tipMouseLeave(){if(session.activeHover){session.activeHover.data(DATA_DISPLAYCONTROLLER).hide()}})}tipElement.fadeIn(options.fadeInTime,function fadeInCallback(){if(!session.desyncTimeout){session.desyncTimeout=setInterval(closeDesyncedTip,500)}element.trigger("powerTipOpen")})}function hideTip(element){session.isClosing=true;session.isTipOpen=false;session.desyncTimeout=clearInterval(session.desyncTimeout);element.data(DATA_HASACTIVEHOVER,false);element.data(DATA_FORCEDOPEN,false);$document.off("click"+EVENT_NAMESPACE);tipElement.off(EVENT_NAMESPACE);tipElement.fadeOut(options.fadeOutTime,function fadeOutCallback(){var coords=new CSSCoordinates;session.activeHover=null;session.isClosing=false;session.isFixedTipOpen=false;tipElement.removeClass();coords.set("top",session.currentY+options.offset);coords.set("left",session.currentX+options.offset);tipElement.css(coords);element.trigger("powerTipClose")})}function positionTipOnCursor(){var tipWidth,tipHeight,coords,collisions,collisionCount;if(!session.isFixedTipOpen&&(session.isTipOpen||session.tipOpenImminent&&tipElement.data(DATA_HASMOUSEMOVE))){tipWidth=tipElement.outerWidth();tipHeight=tipElement.outerHeight();coords=new CSSCoordinates;coords.set("top",session.currentY+options.offset);coords.set("left",session.currentX+options.offset);collisions=getViewportCollisions(coords,tipWidth,tipHeight);if(collisions!==Collision.none){collisionCount=countFlags(collisions);if(collisionCount===1){if(collisions===Collision.right){coords.set("left",session.scrollLeft+session.windowWidth-tipWidth)}else if(collisions===Collision.bottom){coords.set("top",session.scrollTop+session.windowHeight-tipHeight)}}else{coords.set("left",session.currentX-tipWidth-options.offset);coords.set("top",session.currentY-tipHeight-options.offset)}}tipElement.css(coords)}}function positionTipOnElement(element){var priorityList,finalPlacement;if(options.smartPlacement||options.followMouse&&element.data(DATA_FORCEDOPEN)){priorityList=$.fn.powerTip.smartPlacementLists[options.placement];$.each(priorityList,function(idx,pos){var collisions=getViewportCollisions(placeTooltip(element,pos),tipElement.outerWidth(),tipElement.outerHeight());finalPlacement=pos;return collisions!==Collision.none})}else{placeTooltip(element,options.placement);finalPlacement=options.placement}tipElement.removeClass("w nw sw e ne se n s w se-alt sw-alt ne-alt nw-alt");tipElement.addClass(finalPlacement)}function placeTooltip(element,placement){var iterationCount=0,tipWidth,tipHeight,coords=new CSSCoordinates;coords.set("top",0);coords.set("left",0);tipElement.css(coords);do{tipWidth=tipElement.outerWidth();tipHeight=tipElement.outerHeight();coords=placementCalculator.compute(element,placement,tipWidth,tipHeight,options.offset);tipElement.css(coords)}while(++iterationCount<=5&&(tipWidth!==tipElement.outerWidth()||tipHeight!==tipElement.outerHeight()));return coords}function closeDesyncedTip(){var isDesynced=false,hasDesyncableCloseEvent=$.grep(["mouseleave","mouseout","blur","focusout"],function(eventType){return $.inArray(eventType,options.closeEvents)!==-1}).length>0;if(session.isTipOpen&&!session.isClosing&&!session.delayInProgress&&hasDesyncableCloseEvent){if(session.activeHover.data(DATA_HASACTIVEHOVER)===false||session.activeHover.is(":disabled")){isDesynced=true}else if(!isMouseOver(session.activeHover)&&!session.activeHover.is(":focus")&&!session.activeHover.data(DATA_FORCEDOPEN)){if(tipElement.data(DATA_MOUSEONTOTIP)){if(!isMouseOver(tipElement)){isDesynced=true}}else{isDesynced=true}}if(isDesynced){hideTip(session.activeHover)}}}this.showTip=beginShowTip;this.hideTip=hideTip;this.resetPosition=positionTipOnElement}function isSvgElement(element){return Boolean(window.SVGElement&&element[0]instanceof SVGElement)}function isMouseEvent(event){return Boolean(event&&$.inArray(event.type,MOUSE_EVENTS)>-1&&typeof event.pageX==="number")}function initTracking(){if(!session.mouseTrackingActive){session.mouseTrackingActive=true;getViewportDimensions();$(getViewportDimensions);$document.on("mousemove"+EVENT_NAMESPACE,trackMouse);$window.on("resize"+EVENT_NAMESPACE,trackResize);$window.on("scroll"+EVENT_NAMESPACE,trackScroll)}}function getViewportDimensions(){session.scrollLeft=$window.scrollLeft();session.scrollTop=$window.scrollTop();session.windowWidth=$window.width();session.windowHeight=$window.height()}function trackResize(){session.windowWidth=$window.width();session.windowHeight=$window.height()}function trackScroll(){var x=$window.scrollLeft(),y=$window.scrollTop();if(x!==session.scrollLeft){session.currentX+=x-session.scrollLeft;session.scrollLeft=x}if(y!==session.scrollTop){session.currentY+=y-session.scrollTop;session.scrollTop=y}}function trackMouse(event){session.currentX=event.pageX;session.currentY=event.pageY}function isMouseOver(element){var elementPosition=element.offset(),elementBox=element[0].getBoundingClientRect(),elementWidth=elementBox.right-elementBox.left,elementHeight=elementBox.bottom-elementBox.top;return session.currentX>=elementPosition.left&&session.currentX<=elementPosition.left+elementWidth&&session.currentY>=elementPosition.top&&session.currentY<=elementPosition.top+elementHeight}function getTooltipContent(element){var tipText=element.data(DATA_POWERTIP),tipObject=element.data(DATA_POWERTIPJQ),tipTarget=element.data(DATA_POWERTIPTARGET),targetElement,content;if(tipText){if($.isFunction(tipText)){tipText=tipText.call(element[0])}content=tipText}else if(tipObject){if($.isFunction(tipObject)){tipObject=tipObject.call(element[0])}if(tipObject.length>0){content=tipObject.clone(true,true)}}else if(tipTarget){targetElement=$("#"+tipTarget);if(targetElement.length>0){content=targetElement.html()}}return content}function getViewportCollisions(coords,elementWidth,elementHeight){var viewportTop=session.scrollTop,viewportLeft=session.scrollLeft,viewportBottom=viewportTop+session.windowHeight,viewportRight=viewportLeft+session.windowWidth,collisions=Collision.none;if(coords.top<viewportTop||Math.abs(coords.bottom-session.windowHeight)-elementHeight<viewportTop){collisions|=Collision.top}if(coords.top+elementHeight>viewportBottom||Math.abs(coords.bottom-session.windowHeight)>viewportBottom){collisions|=Collision.bottom}if(coords.left<viewportLeft||coords.right+elementWidth>viewportRight){collisions|=Collision.left}if(coords.left+elementWidth>viewportRight||coords.right<viewportLeft){collisions|=Collision.right}return collisions}function countFlags(value){var count=0;while(value){value&=value-1;count++}return count}return $.powerTip});/*!
+(function(root,factory){if(typeof define==="function"&&define.amd){define(["jquery"],factory)}else if(typeof module==="object"&&module.exports){module.exports=factory(require("jquery"))}else{factory(root.jQuery)}})(this,function($){var $document=$(document),$window=$(window),$body=$("body");var DATA_DISPLAYCONTROLLER="displayController",DATA_HASACTIVEHOVER="hasActiveHover",DATA_FORCEDOPEN="forcedOpen",DATA_HASMOUSEMOVE="hasMouseMove",DATA_MOUSEONTOTIP="mouseOnToPopup",DATA_ORIGINALTITLE="originalTitle",DATA_POWERTIP="powertip",DATA_POWERTIPJQ="powertipjq",DATA_POWERTIPTARGET="powertiptarget",EVENT_NAMESPACE=".powertip",RAD2DEG=180/Math.PI,MOUSE_EVENTS=["click","dblclick","mousedown","mouseup","mousemove","mouseover","mouseout","mouseenter","mouseleave","contextmenu"];var session={tooltips:null,isTipOpen:false,isFixedTipOpen:false,isClosing:false,tipOpenImminent:false,activeHover:null,currentX:0,currentY:0,previousX:0,previousY:0,desyncTimeout:null,closeDelayTimeout:null,mouseTrackingActive:false,
+delayInProgress:false,windowWidth:0,windowHeight:0,scrollTop:0,scrollLeft:0};var Collision={none:0,top:1,bottom:2,left:4,right:8};$.fn.powerTip=function(opts,arg){var targetElements=this,options,tipController;if(!targetElements.length){return targetElements}if($.type(opts)==="string"&&$.powerTip[opts]){return $.powerTip[opts].call(targetElements,targetElements,arg)}options=$.extend({},$.fn.powerTip.defaults,opts);tipController=new TooltipController(options);initTracking();targetElements.each(function elementSetup(){var $this=$(this),dataPowertip=$this.data(DATA_POWERTIP),dataElem=$this.data(DATA_POWERTIPJQ),dataTarget=$this.data(DATA_POWERTIPTARGET),title=$this.attr("title");if(!dataPowertip&&!dataTarget&&!dataElem&&title){$this.data(DATA_POWERTIP,title);$this.data(DATA_ORIGINALTITLE,title);$this.removeAttr("title")}$this.data(DATA_DISPLAYCONTROLLER,new DisplayController($this,options,tipController))});if(!options.manual){$.each(options.openEvents,function(idx,evt){if($.inArray(evt,options.closeEvents)>-1){
+targetElements.on(evt+EVENT_NAMESPACE,function elementToggle(event){$.powerTip.toggle(this,event)})}else{targetElements.on(evt+EVENT_NAMESPACE,function elementOpen(event){$.powerTip.show(this,event)})}});$.each(options.closeEvents,function(idx,evt){if($.inArray(evt,options.openEvents)<0){targetElements.on(evt+EVENT_NAMESPACE,function elementClose(event){$.powerTip.hide(this,!isMouseEvent(event))})}});targetElements.on("keydown"+EVENT_NAMESPACE,function elementKeyDown(event){if(event.keyCode===27){$.powerTip.hide(this,true)}})}return targetElements};$.fn.powerTip.defaults={fadeInTime:200,fadeOutTime:100,followMouse:false,popupId:"powerTip",popupClass:null,intentSensitivity:7,intentPollInterval:100,closeDelay:100,placement:"n",smartPlacement:false,offset:10,mouseOnToPopup:false,manual:false,openEvents:["mouseenter","focus"],closeEvents:["mouseleave","blur"]};$.fn.powerTip.smartPlacementLists={n:["n","ne","nw","s"],e:["e","ne","se","w","nw","sw","n","s","e"],s:["s","se","sw","n"],w:["w","nw","sw","e","ne","se",
+"n","s","w"],nw:["nw","w","sw","n","s","se","nw"],ne:["ne","e","se","n","s","sw","ne"],sw:["sw","w","nw","s","n","ne","sw"],se:["se","e","ne","s","n","nw","se"],"nw-alt":["nw-alt","n","ne-alt","sw-alt","s","se-alt","w","e"],"ne-alt":["ne-alt","n","nw-alt","se-alt","s","sw-alt","e","w"],"sw-alt":["sw-alt","s","se-alt","nw-alt","n","ne-alt","w","e"],"se-alt":["se-alt","s","sw-alt","ne-alt","n","nw-alt","e","w"]};$.powerTip={show:function apiShowTip(element,event){if(isMouseEvent(event)){trackMouse(event);session.previousX=event.pageX;session.previousY=event.pageY;$(element).data(DATA_DISPLAYCONTROLLER).show()}else{$(element).first().data(DATA_DISPLAYCONTROLLER).show(true,true)}return element},reposition:function apiResetPosition(element){$(element).first().data(DATA_DISPLAYCONTROLLER).resetPosition();return element},hide:function apiCloseTip(element,immediate){var displayController;immediate=element?immediate:true;if(element){displayController=$(element).first().data(DATA_DISPLAYCONTROLLER)}else if(
+session.activeHover){displayController=session.activeHover.data(DATA_DISPLAYCONTROLLER)}if(displayController){displayController.hide(immediate)}return element},toggle:function apiToggle(element,event){if(session.activeHover&&session.activeHover.is(element)){$.powerTip.hide(element,!isMouseEvent(event))}else{$.powerTip.show(element,event)}return element}};$.powerTip.showTip=$.powerTip.show;$.powerTip.closeTip=$.powerTip.hide;function CSSCoordinates(){var me=this;me.top="auto";me.left="auto";me.right="auto";me.bottom="auto";me.set=function(property,value){if($.isNumeric(value)){me[property]=Math.round(value)}}}function DisplayController(element,options,tipController){var hoverTimer=null,myCloseDelay=null;function openTooltip(immediate,forceOpen){cancelTimer();if(!element.data(DATA_HASACTIVEHOVER)){if(!immediate){session.tipOpenImminent=true;hoverTimer=setTimeout(function intentDelay(){hoverTimer=null;checkForIntent()},options.intentPollInterval)}else{if(forceOpen){element.data(DATA_FORCEDOPEN,true)}
+closeAnyDelayed();tipController.showTip(element)}}else{cancelClose()}}function closeTooltip(disableDelay){if(myCloseDelay){myCloseDelay=session.closeDelayTimeout=clearTimeout(myCloseDelay);session.delayInProgress=false}cancelTimer();session.tipOpenImminent=false;if(element.data(DATA_HASACTIVEHOVER)){element.data(DATA_FORCEDOPEN,false);if(!disableDelay){session.delayInProgress=true;session.closeDelayTimeout=setTimeout(function closeDelay(){session.closeDelayTimeout=null;tipController.hideTip(element);session.delayInProgress=false;myCloseDelay=null},options.closeDelay);myCloseDelay=session.closeDelayTimeout}else{tipController.hideTip(element)}}}function checkForIntent(){var xDifference=Math.abs(session.previousX-session.currentX),yDifference=Math.abs(session.previousY-session.currentY),totalDifference=xDifference+yDifference;if(totalDifference<options.intentSensitivity){cancelClose();closeAnyDelayed();tipController.showTip(element)}else{session.previousX=session.currentX;session.previousY=session.currentY;
+openTooltip()}}function cancelTimer(stopClose){hoverTimer=clearTimeout(hoverTimer);if(session.closeDelayTimeout&&myCloseDelay===session.closeDelayTimeout||stopClose){cancelClose()}}function cancelClose(){session.closeDelayTimeout=clearTimeout(session.closeDelayTimeout);session.delayInProgress=false}function closeAnyDelayed(){if(session.delayInProgress&&session.activeHover&&!session.activeHover.is(element)){session.activeHover.data(DATA_DISPLAYCONTROLLER).hide(true)}}function repositionTooltip(){tipController.resetPosition(element)}this.show=openTooltip;this.hide=closeTooltip;this.cancel=cancelTimer;this.resetPosition=repositionTooltip}function PlacementCalculator(){function computePlacementCoords(element,placement,tipWidth,tipHeight,offset){var placementBase=placement.split("-")[0],coords=new CSSCoordinates,position;if(isSvgElement(element)){position=getSvgPlacement(element,placementBase)}else{position=getHtmlPlacement(element,placementBase)}switch(placement){case"n":coords.set("left",position.left-tipWidth/2
+);coords.set("bottom",session.windowHeight-position.top+offset);break;case"e":coords.set("left",position.left+offset);coords.set("top",position.top-tipHeight/2);break;case"s":coords.set("left",position.left-tipWidth/2);coords.set("top",position.top+offset);break;case"w":coords.set("top",position.top-tipHeight/2);coords.set("right",session.windowWidth-position.left+offset);break;case"nw":coords.set("bottom",session.windowHeight-position.top+offset);coords.set("right",session.windowWidth-position.left-20);break;case"nw-alt":coords.set("left",position.left);coords.set("bottom",session.windowHeight-position.top+offset);break;case"ne":coords.set("left",position.left-20);coords.set("bottom",session.windowHeight-position.top+offset);break;case"ne-alt":coords.set("bottom",session.windowHeight-position.top+offset);coords.set("right",session.windowWidth-position.left);break;case"sw":coords.set("top",position.top+offset);coords.set("right",session.windowWidth-position.left-20);break;case"sw-alt":coords.set("left",
+position.left);coords.set("top",position.top+offset);break;case"se":coords.set("left",position.left-20);coords.set("top",position.top+offset);break;case"se-alt":coords.set("top",position.top+offset);coords.set("right",session.windowWidth-position.left);break}return coords}function getHtmlPlacement(element,placement){var objectOffset=element.offset(),objectWidth=element.outerWidth(),objectHeight=element.outerHeight(),left,top;switch(placement){case"n":left=objectOffset.left+objectWidth/2;top=objectOffset.top;break;case"e":left=objectOffset.left+objectWidth;top=objectOffset.top+objectHeight/2;break;case"s":left=objectOffset.left+objectWidth/2;top=objectOffset.top+objectHeight;break;case"w":left=objectOffset.left;top=objectOffset.top+objectHeight/2;break;case"nw":left=objectOffset.left;top=objectOffset.top;break;case"ne":left=objectOffset.left+objectWidth;top=objectOffset.top;break;case"sw":left=objectOffset.left;top=objectOffset.top+objectHeight;break;case"se":left=objectOffset.left+objectWidth;
+top=objectOffset.top+objectHeight;break}return{top:top,left:left}}function getSvgPlacement(element,placement){var svgElement=element.closest("svg")[0],domElement=element[0],point=svgElement.createSVGPoint(),boundingBox=domElement.getBBox(),matrix=domElement.getScreenCTM(),halfWidth=boundingBox.width/2,halfHeight=boundingBox.height/2,placements=[],placementKeys=["nw","n","ne","e","se","s","sw","w"],coords,rotation,steps,x;function pushPlacement(){placements.push(point.matrixTransform(matrix))}point.x=boundingBox.x;point.y=boundingBox.y;pushPlacement();point.x+=halfWidth;pushPlacement();point.x+=halfWidth;pushPlacement();point.y+=halfHeight;pushPlacement();point.y+=halfHeight;pushPlacement();point.x-=halfWidth;pushPlacement();point.x-=halfWidth;pushPlacement();point.y-=halfHeight;pushPlacement();if(placements[0].y!==placements[1].y||placements[0].x!==placements[7].x){rotation=Math.atan2(matrix.b,matrix.a)*RAD2DEG;steps=Math.ceil((rotation%360-22.5)/45);if(steps<1){steps+=8}while(steps--){placementKeys.push(
+placementKeys.shift())}}for(x=0;x<placements.length;x++){if(placementKeys[x]===placement){coords=placements[x];break}}return{top:coords.y+session.scrollTop,left:coords.x+session.scrollLeft}}this.compute=computePlacementCoords}function TooltipController(options){var placementCalculator=new PlacementCalculator,tipElement=$("#"+options.popupId);if(tipElement.length===0){tipElement=$("<div/>",{id:options.popupId});if($body.length===0){$body=$("body")}$body.append(tipElement);session.tooltips=session.tooltips?session.tooltips.add(tipElement):tipElement}if(options.followMouse){if(!tipElement.data(DATA_HASMOUSEMOVE)){$document.on("mousemove"+EVENT_NAMESPACE,positionTipOnCursor);$window.on("scroll"+EVENT_NAMESPACE,positionTipOnCursor);tipElement.data(DATA_HASMOUSEMOVE,true)}}function beginShowTip(element){element.data(DATA_HASACTIVEHOVER,true);tipElement.queue(function queueTipInit(next){showTip(element);next()})}function showTip(element){var tipContent;if(!element.data(DATA_HASACTIVEHOVER)){return}if(
+session.isTipOpen){if(!session.isClosing){hideTip(session.activeHover)}tipElement.delay(100).queue(function queueTipAgain(next){showTip(element);next()});return}element.trigger("powerTipPreRender");tipContent=getTooltipContent(element);if(tipContent){tipElement.empty().append(tipContent)}else{return}element.trigger("powerTipRender");session.activeHover=element;session.isTipOpen=true;tipElement.data(DATA_MOUSEONTOTIP,options.mouseOnToPopup);tipElement.addClass(options.popupClass);if(!options.followMouse||element.data(DATA_FORCEDOPEN)){positionTipOnElement(element);session.isFixedTipOpen=true}else{positionTipOnCursor()}if(!element.data(DATA_FORCEDOPEN)&&!options.followMouse){$document.on("click"+EVENT_NAMESPACE,function documentClick(event){var target=event.target;if(target!==element[0]){if(options.mouseOnToPopup){if(target!==tipElement[0]&&!$.contains(tipElement[0],target)){$.powerTip.hide()}}else{$.powerTip.hide()}}})}if(options.mouseOnToPopup&&!options.manual){tipElement.on("mouseenter"+EVENT_NAMESPACE,
+function tipMouseEnter(){if(session.activeHover){session.activeHover.data(DATA_DISPLAYCONTROLLER).cancel()}});tipElement.on("mouseleave"+EVENT_NAMESPACE,function tipMouseLeave(){if(session.activeHover){session.activeHover.data(DATA_DISPLAYCONTROLLER).hide()}})}tipElement.fadeIn(options.fadeInTime,function fadeInCallback(){if(!session.desyncTimeout){session.desyncTimeout=setInterval(closeDesyncedTip,500)}element.trigger("powerTipOpen")})}function hideTip(element){session.isClosing=true;session.isTipOpen=false;session.desyncTimeout=clearInterval(session.desyncTimeout);element.data(DATA_HASACTIVEHOVER,false);element.data(DATA_FORCEDOPEN,false);$document.off("click"+EVENT_NAMESPACE);tipElement.off(EVENT_NAMESPACE);tipElement.fadeOut(options.fadeOutTime,function fadeOutCallback(){var coords=new CSSCoordinates;session.activeHover=null;session.isClosing=false;session.isFixedTipOpen=false;tipElement.removeClass();coords.set("top",session.currentY+options.offset);coords.set("left",session.currentX+options.offset);
+tipElement.css(coords);element.trigger("powerTipClose")})}function positionTipOnCursor(){var tipWidth,tipHeight,coords,collisions,collisionCount;if(!session.isFixedTipOpen&&(session.isTipOpen||session.tipOpenImminent&&tipElement.data(DATA_HASMOUSEMOVE))){tipWidth=tipElement.outerWidth();tipHeight=tipElement.outerHeight();coords=new CSSCoordinates;coords.set("top",session.currentY+options.offset);coords.set("left",session.currentX+options.offset);collisions=getViewportCollisions(coords,tipWidth,tipHeight);if(collisions!==Collision.none){collisionCount=countFlags(collisions);if(collisionCount===1){if(collisions===Collision.right){coords.set("left",session.scrollLeft+session.windowWidth-tipWidth)}else if(collisions===Collision.bottom){coords.set("top",session.scrollTop+session.windowHeight-tipHeight)}}else{coords.set("left",session.currentX-tipWidth-options.offset);coords.set("top",session.currentY-tipHeight-options.offset)}}tipElement.css(coords)}}function positionTipOnElement(element){var priorityList,
+finalPlacement;if(options.smartPlacement||options.followMouse&&element.data(DATA_FORCEDOPEN)){priorityList=$.fn.powerTip.smartPlacementLists[options.placement];$.each(priorityList,function(idx,pos){var collisions=getViewportCollisions(placeTooltip(element,pos),tipElement.outerWidth(),tipElement.outerHeight());finalPlacement=pos;return collisions!==Collision.none})}else{placeTooltip(element,options.placement);finalPlacement=options.placement}tipElement.removeClass("w nw sw e ne se n s w se-alt sw-alt ne-alt nw-alt");tipElement.addClass(finalPlacement)}function placeTooltip(element,placement){var iterationCount=0,tipWidth,tipHeight,coords=new CSSCoordinates;coords.set("top",0);coords.set("left",0);tipElement.css(coords);do{tipWidth=tipElement.outerWidth();tipHeight=tipElement.outerHeight();coords=placementCalculator.compute(element,placement,tipWidth,tipHeight,options.offset);tipElement.css(coords)}while(++iterationCount<=5&&(tipWidth!==tipElement.outerWidth()||tipHeight!==tipElement.outerHeight()));
+return coords}function closeDesyncedTip(){var isDesynced=false,hasDesyncableCloseEvent=$.grep(["mouseleave","mouseout","blur","focusout"],function(eventType){return $.inArray(eventType,options.closeEvents)!==-1}).length>0;if(session.isTipOpen&&!session.isClosing&&!session.delayInProgress&&hasDesyncableCloseEvent){if(session.activeHover.data(DATA_HASACTIVEHOVER)===false||session.activeHover.is(":disabled")){isDesynced=true}else if(!isMouseOver(session.activeHover)&&!session.activeHover.is(":focus")&&!session.activeHover.data(DATA_FORCEDOPEN)){if(tipElement.data(DATA_MOUSEONTOTIP)){if(!isMouseOver(tipElement)){isDesynced=true}}else{isDesynced=true}}if(isDesynced){hideTip(session.activeHover)}}}this.showTip=beginShowTip;this.hideTip=hideTip;this.resetPosition=positionTipOnElement}function isSvgElement(element){return Boolean(window.SVGElement&&element[0]instanceof SVGElement)}function isMouseEvent(event){return Boolean(event&&$.inArray(event.type,MOUSE_EVENTS)>-1&&typeof event.pageX==="number")}
+function initTracking(){if(!session.mouseTrackingActive){session.mouseTrackingActive=true;getViewportDimensions();$(getViewportDimensions);$document.on("mousemove"+EVENT_NAMESPACE,trackMouse);$window.on("resize"+EVENT_NAMESPACE,trackResize);$window.on("scroll"+EVENT_NAMESPACE,trackScroll)}}function getViewportDimensions(){session.scrollLeft=$window.scrollLeft();session.scrollTop=$window.scrollTop();session.windowWidth=$window.width();session.windowHeight=$window.height()}function trackResize(){session.windowWidth=$window.width();session.windowHeight=$window.height()}function trackScroll(){var x=$window.scrollLeft(),y=$window.scrollTop();if(x!==session.scrollLeft){session.currentX+=x-session.scrollLeft;session.scrollLeft=x}if(y!==session.scrollTop){session.currentY+=y-session.scrollTop;session.scrollTop=y}}function trackMouse(event){session.currentX=event.pageX;session.currentY=event.pageY}function isMouseOver(element){var elementPosition=element.offset(),elementBox=element[0].getBoundingClientRect(),
+elementWidth=elementBox.right-elementBox.left,elementHeight=elementBox.bottom-elementBox.top;return session.currentX>=elementPosition.left&&session.currentX<=elementPosition.left+elementWidth&&session.currentY>=elementPosition.top&&session.currentY<=elementPosition.top+elementHeight}function getTooltipContent(element){var tipText=element.data(DATA_POWERTIP),tipObject=element.data(DATA_POWERTIPJQ),tipTarget=element.data(DATA_POWERTIPTARGET),targetElement,content;if(tipText){if($.isFunction(tipText)){tipText=tipText.call(element[0])}content=tipText}else if(tipObject){if($.isFunction(tipObject)){tipObject=tipObject.call(element[0])}if(tipObject.length>0){content=tipObject.clone(true,true)}}else if(tipTarget){targetElement=$("#"+tipTarget);if(targetElement.length>0){content=targetElement.html()}}return content}function getViewportCollisions(coords,elementWidth,elementHeight){var viewportTop=session.scrollTop,viewportLeft=session.scrollLeft,viewportBottom=viewportTop+session.windowHeight,
+viewportRight=viewportLeft+session.windowWidth,collisions=Collision.none;if(coords.top<viewportTop||Math.abs(coords.bottom-session.windowHeight)-elementHeight<viewportTop){collisions|=Collision.top}if(coords.top+elementHeight>viewportBottom||Math.abs(coords.bottom-session.windowHeight)>viewportBottom){collisions|=Collision.bottom}if(coords.left<viewportLeft||coords.right+elementWidth>viewportRight){collisions|=Collision.left}if(coords.left+elementWidth>viewportRight||coords.right<viewportLeft){collisions|=Collision.right}return collisions}function countFlags(value){var count=0;while(value){value&=value-1;count++}return count}return $.powerTip});
+/*!
  * jQuery UI Touch Punch 0.2.3
  *
  * Copyright 2011–2014, Dave Furfero
@@ -29,7 +173,32 @@
  * Depends:
  *  jquery.ui.widget.js
  *  jquery.ui.mouse.js
- */
-!function(a){function f(a,b){if(!(a.originalEvent.touches.length>1)){a.preventDefault();var c=a.originalEvent.changedTouches[0],d=document.createEvent("MouseEvents");d.initMouseEvent(b,!0,!0,window,1,c.screenX,c.screenY,c.clientX,c.clientY,!1,!1,!1,!1,0,null),a.target.dispatchEvent(d)}}if(a.support.touch="ontouchend"in document,a.support.touch){var e,b=a.ui.mouse.prototype,c=b._mouseInit,d=b._mouseDestroy;b._touchStart=function(a){var b=this;!e&&b._mouseCapture(a.originalEvent.changedTouches[0])&&(e=!0,b._touchMoved=!1,f(a,"mouseover"),f(a,"mousemove"),f(a,"mousedown"))},b._touchMove=function(a){e&&(this._touchMoved=!0,f(a,"mousemove"))},b._touchEnd=function(a){e&&(f(a,"mouseup"),f(a,"mouseout"),this._touchMoved||f(a,"click"),e=!1)},b._mouseInit=function(){var b=this;b.element.bind({touchstart:a.proxy(b,"_touchStart"),touchmove:a.proxy(b,"_touchMove"),touchend:a.proxy(b,"_touchEnd")}),c.call(b)},b._mouseDestroy=function(){var b=this;b.element.unbind({touchstart:a.proxy(b,"_touchStart"),touchmove:a.proxy(b,"_touchMove"),touchend:a.proxy(b,"_touchEnd")}),d.call(b)}}}(jQuery);/*! SmartMenus jQuery Plugin - v1.1.0 - September 17, 2017
+ */!function(a){function f(a,b){if(!(a.originalEvent.touches.length>1)){a.preventDefault();var c=a.originalEvent.changedTouches[0],d=document.createEvent("MouseEvents");d.initMouseEvent(b,!0,!0,window,1,c.screenX,c.screenY,c.clientX,c.clientY,!1,!1,!1,!1,0,null),a.target.dispatchEvent(d)}}if(a.support.touch="ontouchend"in document,a.support.touch){var e,b=a.ui.mouse.prototype,c=b._mouseInit,d=b._mouseDestroy;b._touchStart=function(a){var b=this;!e&&b._mouseCapture(a.originalEvent.changedTouches[0])&&(e=!0,b._touchMoved=!1,f(a,"mouseover"),f(a,"mousemove"),f(a,"mousedown"))},b._touchMove=function(a){e&&(this._touchMoved=!0,f(a,"mousemove"))},b._touchEnd=function(a){e&&(f(a,"mouseup"),f(a,"mouseout"),this._touchMoved||f(a,"click"),e=!1)},b._mouseInit=function(){var b=this;b.element.bind({touchstart:a.proxy(b,"_touchStart"),touchmove:a.proxy(b,"_touchMove"),touchend:a.proxy(b,"_touchEnd")}),c.call(b)},b._mouseDestroy=function(){var b=this;b.element.unbind({touchstart:a.proxy(b,"_touchStart"),touchmove:a.proxy(b,
+"_touchMove"),touchend:a.proxy(b,"_touchEnd")}),d.call(b)}}}(jQuery);
+/*! SmartMenus jQuery Plugin - v1.1.0 - September 17, 2017
  * http://www.smartmenus.org/
- * Copyright Vasil Dinkov, Vadikom Web Ltd. http://vadikom.com; Licensed MIT */(function(t){"function"==typeof define&&define.amd?define(["jquery"],t):"object"==typeof module&&"object"==typeof module.exports?module.exports=t(require("jquery")):t(jQuery)})(function($){function initMouseDetection(t){var e=".smartmenus_mouse";if(mouseDetectionEnabled||t)mouseDetectionEnabled&&t&&($(document).off(e),mouseDetectionEnabled=!1);else{var i=!0,s=null,o={mousemove:function(t){var e={x:t.pageX,y:t.pageY,timeStamp:(new Date).getTime()};if(s){var o=Math.abs(s.x-e.x),a=Math.abs(s.y-e.y);if((o>0||a>0)&&2>=o&&2>=a&&300>=e.timeStamp-s.timeStamp&&(mouse=!0,i)){var n=$(t.target).closest("a");n.is("a")&&$.each(menuTrees,function(){return $.contains(this.$root[0],n[0])?(this.itemEnter({currentTarget:n[0]}),!1):void 0}),i=!1}}s=e}};o[touchEvents?"touchstart":"pointerover pointermove pointerout MSPointerOver MSPointerMove MSPointerOut"]=function(t){isTouchEvent(t.originalEvent)&&(mouse=!1)},$(document).on(getEventsNS(o,e)),mouseDetectionEnabled=!0}}function isTouchEvent(t){return!/^(4|mouse)$/.test(t.pointerType)}function getEventsNS(t,e){e||(e="");var i={};for(var s in t)i[s.split(" ").join(e+" ")+e]=t[s];return i}var menuTrees=[],mouse=!1,touchEvents="ontouchstart"in window,mouseDetectionEnabled=!1,requestAnimationFrame=window.requestAnimationFrame||function(t){return setTimeout(t,1e3/60)},cancelAnimationFrame=window.cancelAnimationFrame||function(t){clearTimeout(t)},canAnimate=!!$.fn.animate;return $.SmartMenus=function(t,e){this.$root=$(t),this.opts=e,this.rootId="",this.accessIdPrefix="",this.$subArrow=null,this.activatedItems=[],this.visibleSubMenus=[],this.showTimeout=0,this.hideTimeout=0,this.scrollTimeout=0,this.clickActivated=!1,this.focusActivated=!1,this.zIndexInc=0,this.idInc=0,this.$firstLink=null,this.$firstSub=null,this.disabled=!1,this.$disableOverlay=null,this.$touchScrollingSub=null,this.cssTransforms3d="perspective"in t.style||"webkitPerspective"in t.style,this.wasCollapsible=!1,this.init()},$.extend($.SmartMenus,{hideAll:function(){$.each(menuTrees,function(){this.menuHideAll()})},destroy:function(){for(;menuTrees.length;)menuTrees[0].destroy();initMouseDetection(!0)},prototype:{init:function(t){var e=this;if(!t){menuTrees.push(this),this.rootId=((new Date).getTime()+Math.random()+"").replace(/\D/g,""),this.accessIdPrefix="sm-"+this.rootId+"-",this.$root.hasClass("sm-rtl")&&(this.opts.rightToLeftSubMenus=!0);var i=".smartmenus";this.$root.data("smartmenus",this).attr("data-smartmenus-id",this.rootId).dataSM("level",1).on(getEventsNS({"mouseover focusin":$.proxy(this.rootOver,this),"mouseout focusout":$.proxy(this.rootOut,this),keydown:$.proxy(this.rootKeyDown,this)},i)).on(getEventsNS({mouseenter:$.proxy(this.itemEnter,this),mouseleave:$.proxy(this.itemLeave,this),mousedown:$.proxy(this.itemDown,this),focus:$.proxy(this.itemFocus,this),blur:$.proxy(this.itemBlur,this),click:$.proxy(this.itemClick,this)},i),"a"),i+=this.rootId,this.opts.hideOnClick&&$(document).on(getEventsNS({touchstart:$.proxy(this.docTouchStart,this),touchmove:$.proxy(this.docTouchMove,this),touchend:$.proxy(this.docTouchEnd,this),click:$.proxy(this.docClick,this)},i)),$(window).on(getEventsNS({"resize orientationchange":$.proxy(this.winResize,this)},i)),this.opts.subIndicators&&(this.$subArrow=$("<span/>").addClass("sub-arrow"),this.opts.subIndicatorsText&&this.$subArrow.html(this.opts.subIndicatorsText)),initMouseDetection()}if(this.$firstSub=this.$root.find("ul").each(function(){e.menuInit($(this))}).eq(0),this.$firstLink=this.$root.find("a").eq(0),this.opts.markCurrentItem){var s=/(index|default)\.[^#\?\/]*/i,o=/#.*/,a=window.location.href.replace(s,""),n=a.replace(o,"");this.$root.find("a").each(function(){var t=this.href.replace(s,""),i=$(this);(t==a||t==n)&&(i.addClass("current"),e.opts.markCurrentTree&&i.parentsUntil("[data-smartmenus-id]","ul").each(function(){$(this).dataSM("parent-a").addClass("current")}))})}this.wasCollapsible=this.isCollapsible()},destroy:function(t){if(!t){var e=".smartmenus";this.$root.removeData("smartmenus").removeAttr("data-smartmenus-id").removeDataSM("level").off(e),e+=this.rootId,$(document).off(e),$(window).off(e),this.opts.subIndicators&&(this.$subArrow=null)}this.menuHideAll();var i=this;this.$root.find("ul").each(function(){var t=$(this);t.dataSM("scroll-arrows")&&t.dataSM("scroll-arrows").remove(),t.dataSM("shown-before")&&((i.opts.subMenusMinWidth||i.opts.subMenusMaxWidth)&&t.css({width:"",minWidth:"",maxWidth:""}).removeClass("sm-nowrap"),t.dataSM("scroll-arrows")&&t.dataSM("scroll-arrows").remove(),t.css({zIndex:"",top:"",left:"",marginLeft:"",marginTop:"",display:""})),0==(t.attr("id")||"").indexOf(i.accessIdPrefix)&&t.removeAttr("id")}).removeDataSM("in-mega").removeDataSM("shown-before").removeDataSM("scroll-arrows").removeDataSM("parent-a").removeDataSM("level").removeDataSM("beforefirstshowfired").removeAttr("role").removeAttr("aria-hidden").removeAttr("aria-labelledby").removeAttr("aria-expanded"),this.$root.find("a.has-submenu").each(function(){var t=$(this);0==t.attr("id").indexOf(i.accessIdPrefix)&&t.removeAttr("id")}).removeClass("has-submenu").removeDataSM("sub").removeAttr("aria-haspopup").removeAttr("aria-controls").removeAttr("aria-expanded").closest("li").removeDataSM("sub"),this.opts.subIndicators&&this.$root.find("span.sub-arrow").remove(),this.opts.markCurrentItem&&this.$root.find("a.current").removeClass("current"),t||(this.$root=null,this.$firstLink=null,this.$firstSub=null,this.$disableOverlay&&(this.$disableOverlay.remove(),this.$disableOverlay=null),menuTrees.splice($.inArray(this,menuTrees),1))},disable:function(t){if(!this.disabled){if(this.menuHideAll(),!t&&!this.opts.isPopup&&this.$root.is(":visible")){var e=this.$root.offset();this.$disableOverlay=$('<div class="sm-jquery-disable-overlay"/>').css({position:"absolute",top:e.top,left:e.left,width:this.$root.outerWidth(),height:this.$root.outerHeight(),zIndex:this.getStartZIndex(!0),opacity:0}).appendTo(document.body)}this.disabled=!0}},docClick:function(t){return this.$touchScrollingSub?(this.$touchScrollingSub=null,void 0):((this.visibleSubMenus.length&&!$.contains(this.$root[0],t.target)||$(t.target).closest("a").length)&&this.menuHideAll(),void 0)},docTouchEnd:function(){if(this.lastTouch){if(!(!this.visibleSubMenus.length||void 0!==this.lastTouch.x2&&this.lastTouch.x1!=this.lastTouch.x2||void 0!==this.lastTouch.y2&&this.lastTouch.y1!=this.lastTouch.y2||this.lastTouch.target&&$.contains(this.$root[0],this.lastTouch.target))){this.hideTimeout&&(clearTimeout(this.hideTimeout),this.hideTimeout=0);var t=this;this.hideTimeout=setTimeout(function(){t.menuHideAll()},350)}this.lastTouch=null}},docTouchMove:function(t){if(this.lastTouch){var e=t.originalEvent.touches[0];this.lastTouch.x2=e.pageX,this.lastTouch.y2=e.pageY}},docTouchStart:function(t){var e=t.originalEvent.touches[0];this.lastTouch={x1:e.pageX,y1:e.pageY,target:e.target}},enable:function(){this.disabled&&(this.$disableOverlay&&(this.$disableOverlay.remove(),this.$disableOverlay=null),this.disabled=!1)},getClosestMenu:function(t){for(var e=$(t).closest("ul");e.dataSM("in-mega");)e=e.parent().closest("ul");return e[0]||null},getHeight:function(t){return this.getOffset(t,!0)},getOffset:function(t,e){var i;"none"==t.css("display")&&(i={position:t[0].style.position,visibility:t[0].style.visibility},t.css({position:"absolute",visibility:"hidden"}).show());var s=t[0].getBoundingClientRect&&t[0].getBoundingClientRect(),o=s&&(e?s.height||s.bottom-s.top:s.width||s.right-s.left);return o||0===o||(o=e?t[0].offsetHeight:t[0].offsetWidth),i&&t.hide().css(i),o},getStartZIndex:function(t){var e=parseInt(this[t?"$root":"$firstSub"].css("z-index"));return!t&&isNaN(e)&&(e=parseInt(this.$root.css("z-index"))),isNaN(e)?1:e},getTouchPoint:function(t){return t.touches&&t.touches[0]||t.changedTouches&&t.changedTouches[0]||t},getViewport:function(t){var e=t?"Height":"Width",i=document.documentElement["client"+e],s=window["inner"+e];return s&&(i=Math.min(i,s)),i},getViewportHeight:function(){return this.getViewport(!0)},getViewportWidth:function(){return this.getViewport()},getWidth:function(t){return this.getOffset(t)},handleEvents:function(){return!this.disabled&&this.isCSSOn()},handleItemEvents:function(t){return this.handleEvents()&&!this.isLinkInMegaMenu(t)},isCollapsible:function(){return"static"==this.$firstSub.css("position")},isCSSOn:function(){return"inline"!=this.$firstLink.css("display")},isFixed:function(){var t="fixed"==this.$root.css("position");return t||this.$root.parentsUntil("body").each(function(){return"fixed"==$(this).css("position")?(t=!0,!1):void 0}),t},isLinkInMegaMenu:function(t){return $(this.getClosestMenu(t[0])).hasClass("mega-menu")},isTouchMode:function(){return!mouse||this.opts.noMouseOver||this.isCollapsible()},itemActivate:function(t,e){var i=t.closest("ul"),s=i.dataSM("level");if(s>1&&(!this.activatedItems[s-2]||this.activatedItems[s-2][0]!=i.dataSM("parent-a")[0])){var o=this;$(i.parentsUntil("[data-smartmenus-id]","ul").get().reverse()).add(i).each(function(){o.itemActivate($(this).dataSM("parent-a"))})}if((!this.isCollapsible()||e)&&this.menuHideSubMenus(this.activatedItems[s-1]&&this.activatedItems[s-1][0]==t[0]?s:s-1),this.activatedItems[s-1]=t,this.$root.triggerHandler("activate.smapi",t[0])!==!1){var a=t.dataSM("sub");a&&(this.isTouchMode()||!this.opts.showOnClick||this.clickActivated)&&this.menuShow(a)}},itemBlur:function(t){var e=$(t.currentTarget);this.handleItemEvents(e)&&this.$root.triggerHandler("blur.smapi",e[0])},itemClick:function(t){var e=$(t.currentTarget);if(this.handleItemEvents(e)){if(this.$touchScrollingSub&&this.$touchScrollingSub[0]==e.closest("ul")[0])return this.$touchScrollingSub=null,t.stopPropagation(),!1;if(this.$root.triggerHandler("click.smapi",e[0])===!1)return!1;var i=$(t.target).is(".sub-arrow"),s=e.dataSM("sub"),o=s?2==s.dataSM("level"):!1,a=this.isCollapsible(),n=/toggle$/.test(this.opts.collapsibleBehavior),r=/link$/.test(this.opts.collapsibleBehavior),h=/^accordion/.test(this.opts.collapsibleBehavior);if(s&&!s.is(":visible")){if((!r||!a||i)&&(this.opts.showOnClick&&o&&(this.clickActivated=!0),this.itemActivate(e,h),s.is(":visible")))return this.focusActivated=!0,!1}else if(a&&(n||i))return this.itemActivate(e,h),this.menuHide(s),n&&(this.focusActivated=!1),!1;return this.opts.showOnClick&&o||e.hasClass("disabled")||this.$root.triggerHandler("select.smapi",e[0])===!1?!1:void 0}},itemDown:function(t){var e=$(t.currentTarget);this.handleItemEvents(e)&&e.dataSM("mousedown",!0)},itemEnter:function(t){var e=$(t.currentTarget);if(this.handleItemEvents(e)){if(!this.isTouchMode()){this.showTimeout&&(clearTimeout(this.showTimeout),this.showTimeout=0);var i=this;this.showTimeout=setTimeout(function(){i.itemActivate(e)},this.opts.showOnClick&&1==e.closest("ul").dataSM("level")?1:this.opts.showTimeout)}this.$root.triggerHandler("mouseenter.smapi",e[0])}},itemFocus:function(t){var e=$(t.currentTarget);this.handleItemEvents(e)&&(!this.focusActivated||this.isTouchMode()&&e.dataSM("mousedown")||this.activatedItems.length&&this.activatedItems[this.activatedItems.length-1][0]==e[0]||this.itemActivate(e,!0),this.$root.triggerHandler("focus.smapi",e[0]))},itemLeave:function(t){var e=$(t.currentTarget);this.handleItemEvents(e)&&(this.isTouchMode()||(e[0].blur(),this.showTimeout&&(clearTimeout(this.showTimeout),this.showTimeout=0)),e.removeDataSM("mousedown"),this.$root.triggerHandler("mouseleave.smapi",e[0]))},menuHide:function(t){if(this.$root.triggerHandler("beforehide.smapi",t[0])!==!1&&(canAnimate&&t.stop(!0,!0),"none"!=t.css("display"))){var e=function(){t.css("z-index","")};this.isCollapsible()?canAnimate&&this.opts.collapsibleHideFunction?this.opts.collapsibleHideFunction.call(this,t,e):t.hide(this.opts.collapsibleHideDuration,e):canAnimate&&this.opts.hideFunction?this.opts.hideFunction.call(this,t,e):t.hide(this.opts.hideDuration,e),t.dataSM("scroll")&&(this.menuScrollStop(t),t.css({"touch-action":"","-ms-touch-action":"","-webkit-transform":"",transform:""}).off(".smartmenus_scroll").removeDataSM("scroll").dataSM("scroll-arrows").hide()),t.dataSM("parent-a").removeClass("highlighted").attr("aria-expanded","false"),t.attr({"aria-expanded":"false","aria-hidden":"true"});var i=t.dataSM("level");this.activatedItems.splice(i-1,1),this.visibleSubMenus.splice($.inArray(t,this.visibleSubMenus),1),this.$root.triggerHandler("hide.smapi",t[0])}},menuHideAll:function(){this.showTimeout&&(clearTimeout(this.showTimeout),this.showTimeout=0);for(var t=this.opts.isPopup?1:0,e=this.visibleSubMenus.length-1;e>=t;e--)this.menuHide(this.visibleSubMenus[e]);this.opts.isPopup&&(canAnimate&&this.$root.stop(!0,!0),this.$root.is(":visible")&&(canAnimate&&this.opts.hideFunction?this.opts.hideFunction.call(this,this.$root):this.$root.hide(this.opts.hideDuration))),this.activatedItems=[],this.visibleSubMenus=[],this.clickActivated=!1,this.focusActivated=!1,this.zIndexInc=0,this.$root.triggerHandler("hideAll.smapi")},menuHideSubMenus:function(t){for(var e=this.activatedItems.length-1;e>=t;e--){var i=this.activatedItems[e].dataSM("sub");i&&this.menuHide(i)}},menuInit:function(t){if(!t.dataSM("in-mega")){t.hasClass("mega-menu")&&t.find("ul").dataSM("in-mega",!0);for(var e=2,i=t[0];(i=i.parentNode.parentNode)!=this.$root[0];)e++;var s=t.prevAll("a").eq(-1);s.length||(s=t.prevAll().find("a").eq(-1)),s.addClass("has-submenu").dataSM("sub",t),t.dataSM("parent-a",s).dataSM("level",e).parent().dataSM("sub",t);var o=s.attr("id")||this.accessIdPrefix+ ++this.idInc,a=t.attr("id")||this.accessIdPrefix+ ++this.idInc;s.attr({id:o,"aria-haspopup":"true","aria-controls":a,"aria-expanded":"false"}),t.attr({id:a,role:"group","aria-hidden":"true","aria-labelledby":o,"aria-expanded":"false"}),this.opts.subIndicators&&s[this.opts.subIndicatorsPos](this.$subArrow.clone())}},menuPosition:function(t){var e,i,s=t.dataSM("parent-a"),o=s.closest("li"),a=o.parent(),n=t.dataSM("level"),r=this.getWidth(t),h=this.getHeight(t),u=s.offset(),l=u.left,c=u.top,d=this.getWidth(s),m=this.getHeight(s),p=$(window),f=p.scrollLeft(),v=p.scrollTop(),b=this.getViewportWidth(),S=this.getViewportHeight(),g=a.parent().is("[data-sm-horizontal-sub]")||2==n&&!a.hasClass("sm-vertical"),M=this.opts.rightToLeftSubMenus&&!o.is("[data-sm-reverse]")||!this.opts.rightToLeftSubMenus&&o.is("[data-sm-reverse]"),w=2==n?this.opts.mainMenuSubOffsetX:this.opts.subMenusSubOffsetX,T=2==n?this.opts.mainMenuSubOffsetY:this.opts.subMenusSubOffsetY;if(g?(e=M?d-r-w:w,i=this.opts.bottomToTopSubMenus?-h-T:m+T):(e=M?w-r:d-w,i=this.opts.bottomToTopSubMenus?m-T-h:T),this.opts.keepInViewport){var y=l+e,I=c+i;if(M&&f>y?e=g?f-y+e:d-w:!M&&y+r>f+b&&(e=g?f+b-r-y+e:w-r),g||(S>h&&I+h>v+S?i+=v+S-h-I:(h>=S||v>I)&&(i+=v-I)),g&&(I+h>v+S+.49||v>I)||!g&&h>S+.49){var x=this;t.dataSM("scroll-arrows")||t.dataSM("scroll-arrows",$([$('<span class="scroll-up"><span class="scroll-up-arrow"></span></span>')[0],$('<span class="scroll-down"><span class="scroll-down-arrow"></span></span>')[0]]).on({mouseenter:function(){t.dataSM("scroll").up=$(this).hasClass("scroll-up"),x.menuScroll(t)},mouseleave:function(e){x.menuScrollStop(t),x.menuScrollOut(t,e)},"mousewheel DOMMouseScroll":function(t){t.preventDefault()}}).insertAfter(t));var A=".smartmenus_scroll";if(t.dataSM("scroll",{y:this.cssTransforms3d?0:i-m,step:1,itemH:m,subH:h,arrowDownH:this.getHeight(t.dataSM("scroll-arrows").eq(1))}).on(getEventsNS({mouseover:function(e){x.menuScrollOver(t,e)},mouseout:function(e){x.menuScrollOut(t,e)},"mousewheel DOMMouseScroll":function(e){x.menuScrollMousewheel(t,e)}},A)).dataSM("scroll-arrows").css({top:"auto",left:"0",marginLeft:e+(parseInt(t.css("border-left-width"))||0),width:r-(parseInt(t.css("border-left-width"))||0)-(parseInt(t.css("border-right-width"))||0),zIndex:t.css("z-index")}).eq(g&&this.opts.bottomToTopSubMenus?0:1).show(),this.isFixed()){var C={};C[touchEvents?"touchstart touchmove touchend":"pointerdown pointermove pointerup MSPointerDown MSPointerMove MSPointerUp"]=function(e){x.menuScrollTouch(t,e)},t.css({"touch-action":"none","-ms-touch-action":"none"}).on(getEventsNS(C,A))}}}t.css({top:"auto",left:"0",marginLeft:e,marginTop:i-m})},menuScroll:function(t,e,i){var s,o=t.dataSM("scroll"),a=t.dataSM("scroll-arrows"),n=o.up?o.upEnd:o.downEnd;if(!e&&o.momentum){if(o.momentum*=.92,s=o.momentum,.5>s)return this.menuScrollStop(t),void 0}else s=i||(e||!this.opts.scrollAccelerate?this.opts.scrollStep:Math.floor(o.step));var r=t.dataSM("level");if(this.activatedItems[r-1]&&this.activatedItems[r-1].dataSM("sub")&&this.activatedItems[r-1].dataSM("sub").is(":visible")&&this.menuHideSubMenus(r-1),o.y=o.up&&o.y>=n||!o.up&&n>=o.y?o.y:Math.abs(n-o.y)>s?o.y+(o.up?s:-s):n,t.css(this.cssTransforms3d?{"-webkit-transform":"translate3d(0, "+o.y+"px, 0)",transform:"translate3d(0, "+o.y+"px, 0)"}:{marginTop:o.y}),mouse&&(o.up&&o.y>o.downEnd||!o.up&&o.y<o.upEnd)&&a.eq(o.up?1:0).show(),o.y==n)mouse&&a.eq(o.up?0:1).hide(),this.menuScrollStop(t);else if(!e){this.opts.scrollAccelerate&&o.step<this.opts.scrollStep&&(o.step+=.2);var h=this;this.scrollTimeout=requestAnimationFrame(function(){h.menuScroll(t)})}},menuScrollMousewheel:function(t,e){if(this.getClosestMenu(e.target)==t[0]){e=e.originalEvent;var i=(e.wheelDelta||-e.detail)>0;t.dataSM("scroll-arrows").eq(i?0:1).is(":visible")&&(t.dataSM("scroll").up=i,this.menuScroll(t,!0))}e.preventDefault()},menuScrollOut:function(t,e){mouse&&(/^scroll-(up|down)/.test((e.relatedTarget||"").className)||(t[0]==e.relatedTarget||$.contains(t[0],e.relatedTarget))&&this.getClosestMenu(e.relatedTarget)==t[0]||t.dataSM("scroll-arrows").css("visibility","hidden"))},menuScrollOver:function(t,e){if(mouse&&!/^scroll-(up|down)/.test(e.target.className)&&this.getClosestMenu(e.target)==t[0]){this.menuScrollRefreshData(t);var i=t.dataSM("scroll"),s=$(window).scrollTop()-t.dataSM("parent-a").offset().top-i.itemH;t.dataSM("scroll-arrows").eq(0).css("margin-top",s).end().eq(1).css("margin-top",s+this.getViewportHeight()-i.arrowDownH).end().css("visibility","visible")}},menuScrollRefreshData:function(t){var e=t.dataSM("scroll"),i=$(window).scrollTop()-t.dataSM("parent-a").offset().top-e.itemH;this.cssTransforms3d&&(i=-(parseFloat(t.css("margin-top"))-i)),$.extend(e,{upEnd:i,downEnd:i+this.getViewportHeight()-e.subH})},menuScrollStop:function(t){return this.scrollTimeout?(cancelAnimationFrame(this.scrollTimeout),this.scrollTimeout=0,t.dataSM("scroll").step=1,!0):void 0},menuScrollTouch:function(t,e){if(e=e.originalEvent,isTouchEvent(e)){var i=this.getTouchPoint(e);if(this.getClosestMenu(i.target)==t[0]){var s=t.dataSM("scroll");if(/(start|down)$/i.test(e.type))this.menuScrollStop(t)?(e.preventDefault(),this.$touchScrollingSub=t):this.$touchScrollingSub=null,this.menuScrollRefreshData(t),$.extend(s,{touchStartY:i.pageY,touchStartTime:e.timeStamp});else if(/move$/i.test(e.type)){var o=void 0!==s.touchY?s.touchY:s.touchStartY;if(void 0!==o&&o!=i.pageY){this.$touchScrollingSub=t;var a=i.pageY>o;void 0!==s.up&&s.up!=a&&$.extend(s,{touchStartY:i.pageY,touchStartTime:e.timeStamp}),$.extend(s,{up:a,touchY:i.pageY}),this.menuScroll(t,!0,Math.abs(i.pageY-o))}e.preventDefault()}else void 0!==s.touchY&&((s.momentum=15*Math.pow(Math.abs(i.pageY-s.touchStartY)/(e.timeStamp-s.touchStartTime),2))&&(this.menuScrollStop(t),this.menuScroll(t),e.preventDefault()),delete s.touchY)}}},menuShow:function(t){if((t.dataSM("beforefirstshowfired")||(t.dataSM("beforefirstshowfired",!0),this.$root.triggerHandler("beforefirstshow.smapi",t[0])!==!1))&&this.$root.triggerHandler("beforeshow.smapi",t[0])!==!1&&(t.dataSM("shown-before",!0),canAnimate&&t.stop(!0,!0),!t.is(":visible"))){var e=t.dataSM("parent-a"),i=this.isCollapsible();if((this.opts.keepHighlighted||i)&&e.addClass("highlighted"),i)t.removeClass("sm-nowrap").css({zIndex:"",width:"auto",minWidth:"",maxWidth:"",top:"",left:"",marginLeft:"",marginTop:""});else{if(t.css("z-index",this.zIndexInc=(this.zIndexInc||this.getStartZIndex())+1),(this.opts.subMenusMinWidth||this.opts.subMenusMaxWidth)&&(t.css({width:"auto",minWidth:"",maxWidth:""}).addClass("sm-nowrap"),this.opts.subMenusMinWidth&&t.css("min-width",this.opts.subMenusMinWidth),this.opts.subMenusMaxWidth)){var s=this.getWidth(t);t.css("max-width",this.opts.subMenusMaxWidth),s>this.getWidth(t)&&t.removeClass("sm-nowrap").css("width",this.opts.subMenusMaxWidth)}this.menuPosition(t)}var o=function(){t.css("overflow","")};i?canAnimate&&this.opts.collapsibleShowFunction?this.opts.collapsibleShowFunction.call(this,t,o):t.show(this.opts.collapsibleShowDuration,o):canAnimate&&this.opts.showFunction?this.opts.showFunction.call(this,t,o):t.show(this.opts.showDuration,o),e.attr("aria-expanded","true"),t.attr({"aria-expanded":"true","aria-hidden":"false"}),this.visibleSubMenus.push(t),this.$root.triggerHandler("show.smapi",t[0])}},popupHide:function(t){this.hideTimeout&&(clearTimeout(this.hideTimeout),this.hideTimeout=0);var e=this;this.hideTimeout=setTimeout(function(){e.menuHideAll()},t?1:this.opts.hideTimeout)},popupShow:function(t,e){if(!this.opts.isPopup)return alert('SmartMenus jQuery Error:\n\nIf you want to show this menu via the "popupShow" method, set the isPopup:true option.'),void 0;if(this.hideTimeout&&(clearTimeout(this.hideTimeout),this.hideTimeout=0),this.$root.dataSM("shown-before",!0),canAnimate&&this.$root.stop(!0,!0),!this.$root.is(":visible")){this.$root.css({left:t,top:e});var i=this,s=function(){i.$root.css("overflow","")};canAnimate&&this.opts.showFunction?this.opts.showFunction.call(this,this.$root,s):this.$root.show(this.opts.showDuration,s),this.visibleSubMenus[0]=this.$root}},refresh:function(){this.destroy(!0),this.init(!0)},rootKeyDown:function(t){if(this.handleEvents())switch(t.keyCode){case 27:var e=this.activatedItems[0];if(e){this.menuHideAll(),e[0].focus();var i=e.dataSM("sub");i&&this.menuHide(i)}break;case 32:var s=$(t.target);if(s.is("a")&&this.handleItemEvents(s)){var i=s.dataSM("sub");i&&!i.is(":visible")&&(this.itemClick({currentTarget:t.target}),t.preventDefault())}}},rootOut:function(t){if(this.handleEvents()&&!this.isTouchMode()&&t.target!=this.$root[0]&&(this.hideTimeout&&(clearTimeout(this.hideTimeout),this.hideTimeout=0),!this.opts.showOnClick||!this.opts.hideOnClick)){var e=this;this.hideTimeout=setTimeout(function(){e.menuHideAll()},this.opts.hideTimeout)}},rootOver:function(t){this.handleEvents()&&!this.isTouchMode()&&t.target!=this.$root[0]&&this.hideTimeout&&(clearTimeout(this.hideTimeout),this.hideTimeout=0)},winResize:function(t){if(this.handleEvents()){if(!("onorientationchange"in window)||"orientationchange"==t.type){var e=this.isCollapsible();this.wasCollapsible&&e||(this.activatedItems.length&&this.activatedItems[this.activatedItems.length-1][0].blur(),this.menuHideAll()),this.wasCollapsible=e}}else if(this.$disableOverlay){var i=this.$root.offset();this.$disableOverlay.css({top:i.top,left:i.left,width:this.$root.outerWidth(),height:this.$root.outerHeight()})}}}}),$.fn.dataSM=function(t,e){return e?this.data(t+"_smartmenus",e):this.data(t+"_smartmenus")},$.fn.removeDataSM=function(t){return this.removeData(t+"_smartmenus")},$.fn.smartmenus=function(options){if("string"==typeof options){var args=arguments,method=options;return Array.prototype.shift.call(args),this.each(function(){var t=$(this).data("smartmenus");t&&t[method]&&t[method].apply(t,args)})}return this.each(function(){var dataOpts=$(this).data("sm-options")||null;if(dataOpts)try{dataOpts=eval("("+dataOpts+")")}catch(e){dataOpts=null,alert('ERROR\n\nSmartMenus jQuery init:\nInvalid "data-sm-options" attribute value syntax.')}new $.SmartMenus(this,$.extend({},$.fn.smartmenus.defaults,options,dataOpts))})},$.fn.smartmenus.defaults={isPopup:!1,mainMenuSubOffsetX:0,mainMenuSubOffsetY:0,subMenusSubOffsetX:0,subMenusSubOffsetY:0,subMenusMinWidth:"10em",subMenusMaxWidth:"20em",subIndicators:!0,subIndicatorsPos:"append",subIndicatorsText:"",scrollStep:30,scrollAccelerate:!0,showTimeout:250,hideTimeout:500,showDuration:0,showFunction:null,hideDuration:0,hideFunction:function(t,e){t.fadeOut(200,e)},collapsibleShowDuration:0,collapsibleShowFunction:function(t,e){t.slideDown(200,e)},collapsibleHideDuration:0,collapsibleHideFunction:function(t,e){t.slideUp(200,e)},showOnClick:!1,hideOnClick:!0,noMouseOver:!1,keepInViewport:!0,keepHighlighted:!0,markCurrentItem:!1,markCurrentTree:!0,rightToLeftSubMenus:!1,bottomToTopSubMenus:!1,collapsibleBehavior:"default"},$});
\ No newline at end of file
+ * Copyright Vasil Dinkov, Vadikom Web Ltd. http://vadikom.com; Licensed MIT */(function(t){"function"==typeof define&&define.amd?define(["jquery"],t):"object"==typeof module&&"object"==typeof module.exports?module.exports=t(require("jquery")):t(jQuery)})(function($){function initMouseDetection(t){var e=".smartmenus_mouse";if(mouseDetectionEnabled||t)mouseDetectionEnabled&&t&&($(document).off(e),mouseDetectionEnabled=!1);else{var i=!0,s=null,o={mousemove:function(t){var e={x:t.pageX,y:t.pageY,timeStamp:(new Date).getTime()};if(s){var o=Math.abs(s.x-e.x),a=Math.abs(s.y-e.y);if((o>0||a>0)&&2>=o&&2>=a&&300>=e.timeStamp-s.timeStamp&&(mouse=!0,i)){var n=$(t.target).closest("a");n.is("a")&&$.each(menuTrees,function(){return $.contains(this.$root[0],n[0])?(this.itemEnter({currentTarget:n[0]}),!1):void 0}),i=!1}}s=e}};o[touchEvents?"touchstart":"pointerover pointermove pointerout MSPointerOver MSPointerMove MSPointerOut"]=function(t){isTouchEvent(t.originalEvent)&&(mouse=!1)},$(document).on(getEventsNS(o,e)),
+mouseDetectionEnabled=!0}}function isTouchEvent(t){return!/^(4|mouse)$/.test(t.pointerType)}function getEventsNS(t,e){e||(e="");var i={};for(var s in t)i[s.split(" ").join(e+" ")+e]=t[s];return i}var menuTrees=[],mouse=!1,touchEvents="ontouchstart"in window,mouseDetectionEnabled=!1,requestAnimationFrame=window.requestAnimationFrame||function(t){return setTimeout(t,1e3/60)},cancelAnimationFrame=window.cancelAnimationFrame||function(t){clearTimeout(t)},canAnimate=!!$.fn.animate;return $.SmartMenus=function(t,e){this.$root=$(t),this.opts=e,this.rootId="",this.accessIdPrefix="",this.$subArrow=null,this.activatedItems=[],this.visibleSubMenus=[],this.showTimeout=0,this.hideTimeout=0,this.scrollTimeout=0,this.clickActivated=!1,this.focusActivated=!1,this.zIndexInc=0,this.idInc=0,this.$firstLink=null,this.$firstSub=null,this.disabled=!1,this.$disableOverlay=null,this.$touchScrollingSub=null,this.cssTransforms3d="perspective"in t.style||"webkitPerspective"in t.style,this.wasCollapsible=!1,this.init()},$.extend(
+$.SmartMenus,{hideAll:function(){$.each(menuTrees,function(){this.menuHideAll()})},destroy:function(){for(;menuTrees.length;)menuTrees[0].destroy();initMouseDetection(!0)},prototype:{init:function(t){var e=this;if(!t){menuTrees.push(this),this.rootId=((new Date).getTime()+Math.random()+"").replace(/\D/g,""),this.accessIdPrefix="sm-"+this.rootId+"-",this.$root.hasClass("sm-rtl")&&(this.opts.rightToLeftSubMenus=!0);var i=".smartmenus";this.$root.data("smartmenus",this).attr("data-smartmenus-id",this.rootId).dataSM("level",1).on(getEventsNS({"mouseover focusin":$.proxy(this.rootOver,this),"mouseout focusout":$.proxy(this.rootOut,this),keydown:$.proxy(this.rootKeyDown,this)},i)).on(getEventsNS({mouseenter:$.proxy(this.itemEnter,this),mouseleave:$.proxy(this.itemLeave,this),mousedown:$.proxy(this.itemDown,this),focus:$.proxy(this.itemFocus,this),blur:$.proxy(this.itemBlur,this),click:$.proxy(this.itemClick,this)},i),"a"),i+=this.rootId,this.opts.hideOnClick&&$(document).on(getEventsNS({touchstart:$.proxy(
+this.docTouchStart,this),touchmove:$.proxy(this.docTouchMove,this),touchend:$.proxy(this.docTouchEnd,this),click:$.proxy(this.docClick,this)},i)),$(window).on(getEventsNS({"resize orientationchange":$.proxy(this.winResize,this)},i)),this.opts.subIndicators&&(this.$subArrow=$("<span/>").addClass("sub-arrow"),this.opts.subIndicatorsText&&this.$subArrow.html(this.opts.subIndicatorsText)),initMouseDetection()}if(this.$firstSub=this.$root.find("ul").each(function(){e.menuInit($(this))}).eq(0),this.$firstLink=this.$root.find("a").eq(0),this.opts.markCurrentItem){var s=/(index|default)\.[^#\?\/]*/i,o=/#.*/,a=window.location.href.replace(s,""),n=a.replace(o,"");this.$root.find("a").each(function(){var t=this.href.replace(s,""),i=$(this);(t==a||t==n)&&(i.addClass("current"),e.opts.markCurrentTree&&i.parentsUntil("[data-smartmenus-id]","ul").each(function(){$(this).dataSM("parent-a").addClass("current")}))})}this.wasCollapsible=this.isCollapsible()},destroy:function(t){if(!t){var e=".smartmenus";this.$root.removeData(
+"smartmenus").removeAttr("data-smartmenus-id").removeDataSM("level").off(e),e+=this.rootId,$(document).off(e),$(window).off(e),this.opts.subIndicators&&(this.$subArrow=null)}this.menuHideAll();var i=this;this.$root.find("ul").each(function(){var t=$(this);t.dataSM("scroll-arrows")&&t.dataSM("scroll-arrows").remove(),t.dataSM("shown-before")&&((i.opts.subMenusMinWidth||i.opts.subMenusMaxWidth)&&t.css({width:"",minWidth:"",maxWidth:""}).removeClass("sm-nowrap"),t.dataSM("scroll-arrows")&&t.dataSM("scroll-arrows").remove(),t.css({zIndex:"",top:"",left:"",marginLeft:"",marginTop:"",display:""})),0==(t.attr("id")||"").indexOf(i.accessIdPrefix)&&t.removeAttr("id")}).removeDataSM("in-mega").removeDataSM("shown-before").removeDataSM("scroll-arrows").removeDataSM("parent-a").removeDataSM("level").removeDataSM("beforefirstshowfired").removeAttr("role").removeAttr("aria-hidden").removeAttr("aria-labelledby").removeAttr("aria-expanded"),this.$root.find("a.has-submenu").each(function(){var t=$(this);0==t.attr("id"
+).indexOf(i.accessIdPrefix)&&t.removeAttr("id")}).removeClass("has-submenu").removeDataSM("sub").removeAttr("aria-haspopup").removeAttr("aria-controls").removeAttr("aria-expanded").closest("li").removeDataSM("sub"),this.opts.subIndicators&&this.$root.find("span.sub-arrow").remove(),this.opts.markCurrentItem&&this.$root.find("a.current").removeClass("current"),t||(this.$root=null,this.$firstLink=null,this.$firstSub=null,this.$disableOverlay&&(this.$disableOverlay.remove(),this.$disableOverlay=null),menuTrees.splice($.inArray(this,menuTrees),1))},disable:function(t){if(!this.disabled){if(this.menuHideAll(),!t&&!this.opts.isPopup&&this.$root.is(":visible")){var e=this.$root.offset();this.$disableOverlay=$('<div class="sm-jquery-disable-overlay"/>').css({position:"absolute",top:e.top,left:e.left,width:this.$root.outerWidth(),height:this.$root.outerHeight(),zIndex:this.getStartZIndex(!0),opacity:0}).appendTo(document.body)}this.disabled=!0}},docClick:function(t){return this.$touchScrollingSub?(
+this.$touchScrollingSub=null,void 0):((this.visibleSubMenus.length&&!$.contains(this.$root[0],t.target)||$(t.target).closest("a").length)&&this.menuHideAll(),void 0)},docTouchEnd:function(){if(this.lastTouch){if(!(!this.visibleSubMenus.length||void 0!==this.lastTouch.x2&&this.lastTouch.x1!=this.lastTouch.x2||void 0!==this.lastTouch.y2&&this.lastTouch.y1!=this.lastTouch.y2||this.lastTouch.target&&$.contains(this.$root[0],this.lastTouch.target))){this.hideTimeout&&(clearTimeout(this.hideTimeout),this.hideTimeout=0);var t=this;this.hideTimeout=setTimeout(function(){t.menuHideAll()},350)}this.lastTouch=null}},docTouchMove:function(t){if(this.lastTouch){var e=t.originalEvent.touches[0];this.lastTouch.x2=e.pageX,this.lastTouch.y2=e.pageY}},docTouchStart:function(t){var e=t.originalEvent.touches[0];this.lastTouch={x1:e.pageX,y1:e.pageY,target:e.target}},enable:function(){this.disabled&&(this.$disableOverlay&&(this.$disableOverlay.remove(),this.$disableOverlay=null),this.disabled=!1)},getClosestMenu:function(t){for(
+var e=$(t).closest("ul");e.dataSM("in-mega");)e=e.parent().closest("ul");return e[0]||null},getHeight:function(t){return this.getOffset(t,!0)},getOffset:function(t,e){var i;"none"==t.css("display")&&(i={position:t[0].style.position,visibility:t[0].style.visibility},t.css({position:"absolute",visibility:"hidden"}).show());var s=t[0].getBoundingClientRect&&t[0].getBoundingClientRect(),o=s&&(e?s.height||s.bottom-s.top:s.width||s.right-s.left);return o||0===o||(o=e?t[0].offsetHeight:t[0].offsetWidth),i&&t.hide().css(i),o},getStartZIndex:function(t){var e=parseInt(this[t?"$root":"$firstSub"].css("z-index"));return!t&&isNaN(e)&&(e=parseInt(this.$root.css("z-index"))),isNaN(e)?1:e},getTouchPoint:function(t){return t.touches&&t.touches[0]||t.changedTouches&&t.changedTouches[0]||t},getViewport:function(t){var e=t?"Height":"Width",i=document.documentElement["client"+e],s=window["inner"+e];return s&&(i=Math.min(i,s)),i},getViewportHeight:function(){return this.getViewport(!0)},getViewportWidth:function(){
+return this.getViewport()},getWidth:function(t){return this.getOffset(t)},handleEvents:function(){return!this.disabled&&this.isCSSOn()},handleItemEvents:function(t){return this.handleEvents()&&!this.isLinkInMegaMenu(t)},isCollapsible:function(){return"static"==this.$firstSub.css("position")},isCSSOn:function(){return"inline"!=this.$firstLink.css("display")},isFixed:function(){var t="fixed"==this.$root.css("position");return t||this.$root.parentsUntil("body").each(function(){return"fixed"==$(this).css("position")?(t=!0,!1):void 0}),t},isLinkInMegaMenu:function(t){return $(this.getClosestMenu(t[0])).hasClass("mega-menu")},isTouchMode:function(){return!mouse||this.opts.noMouseOver||this.isCollapsible()},itemActivate:function(t,e){var i=t.closest("ul"),s=i.dataSM("level");if(s>1&&(!this.activatedItems[s-2]||this.activatedItems[s-2][0]!=i.dataSM("parent-a")[0])){var o=this;$(i.parentsUntil("[data-smartmenus-id]","ul").get().reverse()).add(i).each(function(){o.itemActivate($(this).dataSM("parent-a"))})}if((
+!this.isCollapsible()||e)&&this.menuHideSubMenus(this.activatedItems[s-1]&&this.activatedItems[s-1][0]==t[0]?s:s-1),this.activatedItems[s-1]=t,this.$root.triggerHandler("activate.smapi",t[0])!==!1){var a=t.dataSM("sub");a&&(this.isTouchMode()||!this.opts.showOnClick||this.clickActivated)&&this.menuShow(a)}},itemBlur:function(t){var e=$(t.currentTarget);this.handleItemEvents(e)&&this.$root.triggerHandler("blur.smapi",e[0])},itemClick:function(t){var e=$(t.currentTarget);if(this.handleItemEvents(e)){if(this.$touchScrollingSub&&this.$touchScrollingSub[0]==e.closest("ul")[0])return this.$touchScrollingSub=null,t.stopPropagation(),!1;if(this.$root.triggerHandler("click.smapi",e[0])===!1)return!1;var i=$(t.target).is(".sub-arrow"),s=e.dataSM("sub"),o=s?2==s.dataSM("level"):!1,a=this.isCollapsible(),n=/toggle$/.test(this.opts.collapsibleBehavior),r=/link$/.test(this.opts.collapsibleBehavior),h=/^accordion/.test(this.opts.collapsibleBehavior);if(s&&!s.is(":visible")){if((!r||!a||i)&&(this.opts.showOnClick&&o&&(
+this.clickActivated=!0),this.itemActivate(e,h),s.is(":visible")))return this.focusActivated=!0,!1}else if(a&&(n||i))return this.itemActivate(e,h),this.menuHide(s),n&&(this.focusActivated=!1),!1;return this.opts.showOnClick&&o||e.hasClass("disabled")||this.$root.triggerHandler("select.smapi",e[0])===!1?!1:void 0}},itemDown:function(t){var e=$(t.currentTarget);this.handleItemEvents(e)&&e.dataSM("mousedown",!0)},itemEnter:function(t){var e=$(t.currentTarget);if(this.handleItemEvents(e)){if(!this.isTouchMode()){this.showTimeout&&(clearTimeout(this.showTimeout),this.showTimeout=0);var i=this;this.showTimeout=setTimeout(function(){i.itemActivate(e)},this.opts.showOnClick&&1==e.closest("ul").dataSM("level")?1:this.opts.showTimeout)}this.$root.triggerHandler("mouseenter.smapi",e[0])}},itemFocus:function(t){var e=$(t.currentTarget);this.handleItemEvents(e)&&(!this.focusActivated||this.isTouchMode()&&e.dataSM("mousedown")||this.activatedItems.length&&this.activatedItems[this.activatedItems.length-1][0]==e[0
+]||this.itemActivate(e,!0),this.$root.triggerHandler("focus.smapi",e[0]))},itemLeave:function(t){var e=$(t.currentTarget);this.handleItemEvents(e)&&(this.isTouchMode()||(e[0].blur(),this.showTimeout&&(clearTimeout(this.showTimeout),this.showTimeout=0)),e.removeDataSM("mousedown"),this.$root.triggerHandler("mouseleave.smapi",e[0]))},menuHide:function(t){if(this.$root.triggerHandler("beforehide.smapi",t[0])!==!1&&(canAnimate&&t.stop(!0,!0),"none"!=t.css("display"))){var e=function(){t.css("z-index","")};this.isCollapsible()?canAnimate&&this.opts.collapsibleHideFunction?this.opts.collapsibleHideFunction.call(this,t,e):t.hide(this.opts.collapsibleHideDuration,e):canAnimate&&this.opts.hideFunction?this.opts.hideFunction.call(this,t,e):t.hide(this.opts.hideDuration,e),t.dataSM("scroll")&&(this.menuScrollStop(t),t.css({"touch-action":"","-ms-touch-action":"","-webkit-transform":"",transform:""}).off(".smartmenus_scroll").removeDataSM("scroll").dataSM("scroll-arrows").hide()),t.dataSM("parent-a").removeClass(
+"highlighted").attr("aria-expanded","false"),t.attr({"aria-expanded":"false","aria-hidden":"true"});var i=t.dataSM("level");this.activatedItems.splice(i-1,1),this.visibleSubMenus.splice($.inArray(t,this.visibleSubMenus),1),this.$root.triggerHandler("hide.smapi",t[0])}},menuHideAll:function(){this.showTimeout&&(clearTimeout(this.showTimeout),this.showTimeout=0);for(var t=this.opts.isPopup?1:0,e=this.visibleSubMenus.length-1;e>=t;e--)this.menuHide(this.visibleSubMenus[e]);this.opts.isPopup&&(canAnimate&&this.$root.stop(!0,!0),this.$root.is(":visible")&&(canAnimate&&this.opts.hideFunction?this.opts.hideFunction.call(this,this.$root):this.$root.hide(this.opts.hideDuration))),this.activatedItems=[],this.visibleSubMenus=[],this.clickActivated=!1,this.focusActivated=!1,this.zIndexInc=0,this.$root.triggerHandler("hideAll.smapi")},menuHideSubMenus:function(t){for(var e=this.activatedItems.length-1;e>=t;e--){var i=this.activatedItems[e].dataSM("sub");i&&this.menuHide(i)}},menuInit:function(t){if(!t.dataSM("in-mega")){
+t.hasClass("mega-menu")&&t.find("ul").dataSM("in-mega",!0);for(var e=2,i=t[0];(i=i.parentNode.parentNode)!=this.$root[0];)e++;var s=t.prevAll("a").eq(-1);s.length||(s=t.prevAll().find("a").eq(-1)),s.addClass("has-submenu").dataSM("sub",t),t.dataSM("parent-a",s).dataSM("level",e).parent().dataSM("sub",t);var o=s.attr("id")||this.accessIdPrefix+ ++this.idInc,a=t.attr("id")||this.accessIdPrefix+ ++this.idInc;s.attr({id:o,"aria-haspopup":"true","aria-controls":a,"aria-expanded":"false"}),t.attr({id:a,role:"group","aria-hidden":"true","aria-labelledby":o,"aria-expanded":"false"}),this.opts.subIndicators&&s[this.opts.subIndicatorsPos](this.$subArrow.clone())}},menuPosition:function(t){var e,i,s=t.dataSM("parent-a"),o=s.closest("li"),a=o.parent(),n=t.dataSM("level"),r=this.getWidth(t),h=this.getHeight(t),u=s.offset(),l=u.left,c=u.top,d=this.getWidth(s),m=this.getHeight(s),p=$(window),f=p.scrollLeft(),v=p.scrollTop(),b=this.getViewportWidth(),S=this.getViewportHeight(),g=a.parent().is("[data-sm-horizontal-sub]"
+)||2==n&&!a.hasClass("sm-vertical"),M=this.opts.rightToLeftSubMenus&&!o.is("[data-sm-reverse]")||!this.opts.rightToLeftSubMenus&&o.is("[data-sm-reverse]"),w=2==n?this.opts.mainMenuSubOffsetX:this.opts.subMenusSubOffsetX,T=2==n?this.opts.mainMenuSubOffsetY:this.opts.subMenusSubOffsetY;if(g?(e=M?d-r-w:w,i=this.opts.bottomToTopSubMenus?-h-T:m+T):(e=M?w-r:d-w,i=this.opts.bottomToTopSubMenus?m-T-h:T),this.opts.keepInViewport){var y=l+e,I=c+i;if(M&&f>y?e=g?f-y+e:d-w:!M&&y+r>f+b&&(e=g?f+b-r-y+e:w-r),g||(S>h&&I+h>v+S?i+=v+S-h-I:(h>=S||v>I)&&(i+=v-I)),g&&(I+h>v+S+.49||v>I)||!g&&h>S+.49){var x=this;t.dataSM("scroll-arrows")||t.dataSM("scroll-arrows",$([$('<span class="scroll-up"><span class="scroll-up-arrow"></span></span>')[0],$('<span class="scroll-down"><span class="scroll-down-arrow"></span></span>')[0]]).on({mouseenter:function(){t.dataSM("scroll").up=$(this).hasClass("scroll-up"),x.menuScroll(t)},mouseleave:function(e){x.menuScrollStop(t),x.menuScrollOut(t,e)},"mousewheel DOMMouseScroll":function(t){
+t.preventDefault()}}).insertAfter(t));var A=".smartmenus_scroll";if(t.dataSM("scroll",{y:this.cssTransforms3d?0:i-m,step:1,itemH:m,subH:h,arrowDownH:this.getHeight(t.dataSM("scroll-arrows").eq(1))}).on(getEventsNS({mouseover:function(e){x.menuScrollOver(t,e)},mouseout:function(e){x.menuScrollOut(t,e)},"mousewheel DOMMouseScroll":function(e){x.menuScrollMousewheel(t,e)}},A)).dataSM("scroll-arrows").css({top:"auto",left:"0",marginLeft:e+(parseInt(t.css("border-left-width"))||0),width:r-(parseInt(t.css("border-left-width"))||0)-(parseInt(t.css("border-right-width"))||0),zIndex:t.css("z-index")}).eq(g&&this.opts.bottomToTopSubMenus?0:1).show(),this.isFixed()){var C={};C[touchEvents?"touchstart touchmove touchend":"pointerdown pointermove pointerup MSPointerDown MSPointerMove MSPointerUp"]=function(e){x.menuScrollTouch(t,e)},t.css({"touch-action":"none","-ms-touch-action":"none"}).on(getEventsNS(C,A))}}}t.css({top:"auto",left:"0",marginLeft:e,marginTop:i-m})},menuScroll:function(t,e,i){var s,o=t.dataSM("scroll"),
+a=t.dataSM("scroll-arrows"),n=o.up?o.upEnd:o.downEnd;if(!e&&o.momentum){if(o.momentum*=.92,s=o.momentum,.5>s)return this.menuScrollStop(t),void 0}else s=i||(e||!this.opts.scrollAccelerate?this.opts.scrollStep:Math.floor(o.step));var r=t.dataSM("level");if(this.activatedItems[r-1]&&this.activatedItems[r-1].dataSM("sub")&&this.activatedItems[r-1].dataSM("sub").is(":visible")&&this.menuHideSubMenus(r-1),o.y=o.up&&o.y>=n||!o.up&&n>=o.y?o.y:Math.abs(n-o.y)>s?o.y+(o.up?s:-s):n,t.css(this.cssTransforms3d?{"-webkit-transform":"translate3d(0, "+o.y+"px, 0)",transform:"translate3d(0, "+o.y+"px, 0)"}:{marginTop:o.y}),mouse&&(o.up&&o.y>o.downEnd||!o.up&&o.y<o.upEnd)&&a.eq(o.up?1:0).show(),o.y==n)mouse&&a.eq(o.up?0:1).hide(),this.menuScrollStop(t);else if(!e){this.opts.scrollAccelerate&&o.step<this.opts.scrollStep&&(o.step+=.2);var h=this;this.scrollTimeout=requestAnimationFrame(function(){h.menuScroll(t)})}},menuScrollMousewheel:function(t,e){if(this.getClosestMenu(e.target)==t[0]){e=e.originalEvent;var i=(
+e.wheelDelta||-e.detail)>0;t.dataSM("scroll-arrows").eq(i?0:1).is(":visible")&&(t.dataSM("scroll").up=i,this.menuScroll(t,!0))}e.preventDefault()},menuScrollOut:function(t,e){mouse&&(/^scroll-(up|down)/.test((e.relatedTarget||"").className)||(t[0]==e.relatedTarget||$.contains(t[0],e.relatedTarget))&&this.getClosestMenu(e.relatedTarget)==t[0]||t.dataSM("scroll-arrows").css("visibility","hidden"))},menuScrollOver:function(t,e){if(mouse&&!/^scroll-(up|down)/.test(e.target.className)&&this.getClosestMenu(e.target)==t[0]){this.menuScrollRefreshData(t);var i=t.dataSM("scroll"),s=$(window).scrollTop()-t.dataSM("parent-a").offset().top-i.itemH;t.dataSM("scroll-arrows").eq(0).css("margin-top",s).end().eq(1).css("margin-top",s+this.getViewportHeight()-i.arrowDownH).end().css("visibility","visible")}},menuScrollRefreshData:function(t){var e=t.dataSM("scroll"),i=$(window).scrollTop()-t.dataSM("parent-a").offset().top-e.itemH;this.cssTransforms3d&&(i=-(parseFloat(t.css("margin-top"))-i)),$.extend(e,{upEnd:i,
+downEnd:i+this.getViewportHeight()-e.subH})},menuScrollStop:function(t){return this.scrollTimeout?(cancelAnimationFrame(this.scrollTimeout),this.scrollTimeout=0,t.dataSM("scroll").step=1,!0):void 0},menuScrollTouch:function(t,e){if(e=e.originalEvent,isTouchEvent(e)){var i=this.getTouchPoint(e);if(this.getClosestMenu(i.target)==t[0]){var s=t.dataSM("scroll");if(/(start|down)$/i.test(e.type))this.menuScrollStop(t)?(e.preventDefault(),this.$touchScrollingSub=t):this.$touchScrollingSub=null,this.menuScrollRefreshData(t),$.extend(s,{touchStartY:i.pageY,touchStartTime:e.timeStamp});else if(/move$/i.test(e.type)){var o=void 0!==s.touchY?s.touchY:s.touchStartY;if(void 0!==o&&o!=i.pageY){this.$touchScrollingSub=t;var a=i.pageY>o;void 0!==s.up&&s.up!=a&&$.extend(s,{touchStartY:i.pageY,touchStartTime:e.timeStamp}),$.extend(s,{up:a,touchY:i.pageY}),this.menuScroll(t,!0,Math.abs(i.pageY-o))}e.preventDefault()}else void 0!==s.touchY&&((s.momentum=15*Math.pow(Math.abs(i.pageY-s.touchStartY)/(e.timeStamp-s.touchStartTime),2)
+)&&(this.menuScrollStop(t),this.menuScroll(t),e.preventDefault()),delete s.touchY)}}},menuShow:function(t){if((t.dataSM("beforefirstshowfired")||(t.dataSM("beforefirstshowfired",!0),this.$root.triggerHandler("beforefirstshow.smapi",t[0])!==!1))&&this.$root.triggerHandler("beforeshow.smapi",t[0])!==!1&&(t.dataSM("shown-before",!0),canAnimate&&t.stop(!0,!0),!t.is(":visible"))){var e=t.dataSM("parent-a"),i=this.isCollapsible();if((this.opts.keepHighlighted||i)&&e.addClass("highlighted"),i)t.removeClass("sm-nowrap").css({zIndex:"",width:"auto",minWidth:"",maxWidth:"",top:"",left:"",marginLeft:"",marginTop:""});else{if(t.css("z-index",this.zIndexInc=(this.zIndexInc||this.getStartZIndex())+1),(this.opts.subMenusMinWidth||this.opts.subMenusMaxWidth)&&(t.css({width:"auto",minWidth:"",maxWidth:""}).addClass("sm-nowrap"),this.opts.subMenusMinWidth&&t.css("min-width",this.opts.subMenusMinWidth),this.opts.subMenusMaxWidth)){var s=this.getWidth(t);t.css("max-width",this.opts.subMenusMaxWidth),s>this.getWidth(t
+)&&t.removeClass("sm-nowrap").css("width",this.opts.subMenusMaxWidth)}this.menuPosition(t)}var o=function(){t.css("overflow","")};i?canAnimate&&this.opts.collapsibleShowFunction?this.opts.collapsibleShowFunction.call(this,t,o):t.show(this.opts.collapsibleShowDuration,o):canAnimate&&this.opts.showFunction?this.opts.showFunction.call(this,t,o):t.show(this.opts.showDuration,o),e.attr("aria-expanded","true"),t.attr({"aria-expanded":"true","aria-hidden":"false"}),this.visibleSubMenus.push(t),this.$root.triggerHandler("show.smapi",t[0])}},popupHide:function(t){this.hideTimeout&&(clearTimeout(this.hideTimeout),this.hideTimeout=0);var e=this;this.hideTimeout=setTimeout(function(){e.menuHideAll()},t?1:this.opts.hideTimeout)},popupShow:function(t,e){if(!this.opts.isPopup)return alert('SmartMenus jQuery Error:\n\nIf you want to show this menu via the "popupShow" method, set the isPopup:true option.'),void 0;if(this.hideTimeout&&(clearTimeout(this.hideTimeout),this.hideTimeout=0),this.$root.dataSM("shown-before",!0),
+canAnimate&&this.$root.stop(!0,!0),!this.$root.is(":visible")){this.$root.css({left:t,top:e});var i=this,s=function(){i.$root.css("overflow","")};canAnimate&&this.opts.showFunction?this.opts.showFunction.call(this,this.$root,s):this.$root.show(this.opts.showDuration,s),this.visibleSubMenus[0]=this.$root}},refresh:function(){this.destroy(!0),this.init(!0)},rootKeyDown:function(t){if(this.handleEvents())switch(t.keyCode){case 27:var e=this.activatedItems[0];if(e){this.menuHideAll(),e[0].focus();var i=e.dataSM("sub");i&&this.menuHide(i)}break;case 32:var s=$(t.target);if(s.is("a")&&this.handleItemEvents(s)){var i=s.dataSM("sub");i&&!i.is(":visible")&&(this.itemClick({currentTarget:t.target}),t.preventDefault())}}},rootOut:function(t){if(this.handleEvents()&&!this.isTouchMode()&&t.target!=this.$root[0]&&(this.hideTimeout&&(clearTimeout(this.hideTimeout),this.hideTimeout=0),!this.opts.showOnClick||!this.opts.hideOnClick)){var e=this;this.hideTimeout=setTimeout(function(){e.menuHideAll()},this.opts.hideTimeout)}},
+rootOver:function(t){this.handleEvents()&&!this.isTouchMode()&&t.target!=this.$root[0]&&this.hideTimeout&&(clearTimeout(this.hideTimeout),this.hideTimeout=0)},winResize:function(t){if(this.handleEvents()){if(!("onorientationchange"in window)||"orientationchange"==t.type){var e=this.isCollapsible();this.wasCollapsible&&e||(this.activatedItems.length&&this.activatedItems[this.activatedItems.length-1][0].blur(),this.menuHideAll()),this.wasCollapsible=e}}else if(this.$disableOverlay){var i=this.$root.offset();this.$disableOverlay.css({top:i.top,left:i.left,width:this.$root.outerWidth(),height:this.$root.outerHeight()})}}}}),$.fn.dataSM=function(t,e){return e?this.data(t+"_smartmenus",e):this.data(t+"_smartmenus")},$.fn.removeDataSM=function(t){return this.removeData(t+"_smartmenus")},$.fn.smartmenus=function(options){if("string"==typeof options){var args=arguments,method=options;return Array.prototype.shift.call(args),this.each(function(){var t=$(this).data("smartmenus");t&&t[method]&&t[method].apply(t,args)})}
+return this.each(function(){var dataOpts=$(this).data("sm-options")||null;if(dataOpts)try{dataOpts=eval("("+dataOpts+")")}catch(e){dataOpts=null,alert('ERROR\n\nSmartMenus jQuery init:\nInvalid "data-sm-options" attribute value syntax.')}new $.SmartMenus(this,$.extend({},$.fn.smartmenus.defaults,options,dataOpts))})},$.fn.smartmenus.defaults={isPopup:!1,mainMenuSubOffsetX:0,mainMenuSubOffsetY:0,subMenusSubOffsetX:0,subMenusSubOffsetY:0,subMenusMinWidth:"10em",subMenusMaxWidth:"20em",subIndicators:!0,subIndicatorsPos:"append",subIndicatorsText:"",scrollStep:30,scrollAccelerate:!0,showTimeout:250,hideTimeout:500,showDuration:0,showFunction:null,hideDuration:0,hideFunction:function(t,e){t.fadeOut(200,e)},collapsibleShowDuration:0,collapsibleShowFunction:function(t,e){t.slideDown(200,e)},collapsibleHideDuration:0,collapsibleHideFunction:function(t,e){t.slideUp(200,e)},showOnClick:!1,hideOnClick:!0,noMouseOver:!1,keepInViewport:!0,keepHighlighted:!0,markCurrentItem:!1,markCurrentTree:!0,rightToLeftSubMenus:!1,
+bottomToTopSubMenus:!1,collapsibleBehavior:"default"},$});
diff --git a/depends/mimalloc/docs/mimalloc-doc_8h_source.html b/depends/mimalloc/docs/mimalloc-doc_8h_source.html
index 8935de8a8890..3c1ad4fbaed1 100644
--- a/depends/mimalloc/docs/mimalloc-doc_8h_source.html
+++ b/depends/mimalloc/docs/mimalloc-doc_8h_source.html
@@ -1,24 +1,26 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "https://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
+<html xmlns="http://www.w3.org/1999/xhtml" lang="en-US">
 <head>
 <meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
-<meta http-equiv="X-UA-Compatible" content="IE=9"/>
-<meta name="generator" content="Doxygen 1.9.1"/>
+<meta http-equiv="X-UA-Compatible" content="IE=11"/>
+<meta name="generator" content="Doxygen 1.13.1"/>
 <meta name="viewport" content="width=device-width, initial-scale=1"/>
 <title>mi-malloc: mimalloc-doc.h Source File</title>
 <link href="tabs.css" rel="stylesheet" type="text/css"/>
 <script type="text/javascript" src="jquery.js"></script>
 <script type="text/javascript" src="dynsections.js"></script>
+<script type="text/javascript" src="clipboard.js"></script>
 <link href="navtree.css" rel="stylesheet" type="text/css"/>
-<script type="text/javascript" src="resize.js"></script>
 <script type="text/javascript" src="navtreedata.js"></script>
 <script type="text/javascript" src="navtree.js"></script>
+<script type="text/javascript" src="resize.js"></script>
+<script type="text/javascript" src="cookie.js"></script>
 <link href="search/search.css" rel="stylesheet" type="text/css"/>
 <script type="text/javascript" src="search/searchdata.js"></script>
 <script type="text/javascript" src="search/search.js"></script>
 <script type="text/javascript">
-/* @license magnet:?xt=urn:btih:cf05388f2679ee054f2beb29a391d25f4e673ac3&amp;dn=gpl-2.0.txt GPL-v2 */
-  $(document).ready(function() { init_search(); });
+/* @license magnet:?xt=urn:btih:d3d9a9a6595521f9666a5e94cc830dab83b65699&amp;dn=expat.txt MIT */
+  $(function() { init_search(); });
 /* @license-end */
 </script>
 <link href="doxygen.css" rel="stylesheet" type="text/css" />
@@ -29,20 +31,16 @@
 <div id="titlearea">
 <table cellspacing="0" cellpadding="0">
  <tbody>
- <tr style="height: 56px;">
+ <tr id="projectrow">
   <td id="projectlogo"><img alt="Logo" src="mimalloc-logo.svg"/></td>
-  <td id="projectalign" style="padding-left: 0.5em;">
-   <div id="projectname">mi-malloc
-   &#160;<span id="projectnumber">1.7/2.0</span>
+  <td id="projectalign">
+   <div id="projectname">mi-malloc<span id="projectnumber">&#160;1.8/2.1</span>
    </div>
   </td>
-   <td>        <div id="MSearchBox" class="MSearchBoxInactive">
+    <td>        <div id="MSearchBox" class="MSearchBoxInactive">
         <span class="left">
-          <img id="MSearchSelect" src="search/mag_sel.svg"
-               onmouseover="return searchBox.OnSearchSelectShow()"
-               onmouseout="return searchBox.OnSearchSelectHide()"
-               alt=""/>
-          <input type="text" id="MSearchField" value="Search" accesskey="S"
+          <span id="MSearchSelect"                onmouseover="return searchBox.OnSearchSelectShow()"                onmouseout="return searchBox.OnSearchSelectHide()">&#160;</span>
+          <input type="text" id="MSearchField" value="" placeholder="Search" accesskey="S"
                onfocus="searchBox.OnSearchFieldFocus(true)" 
                onblur="searchBox.OnSearchFieldFocus(false)" 
                onkeyup="searchBox.OnSearchFieldChange(event)"/>
@@ -56,10 +54,15 @@
 </table>
 </div>
 <!-- end header part -->
-<!-- Generated by Doxygen 1.9.1 -->
+<!-- Generated by Doxygen 1.13.1 -->
+<script type="text/javascript">
+/* @license magnet:?xt=urn:btih:d3d9a9a6595521f9666a5e94cc830dab83b65699&amp;dn=expat.txt MIT */
+var searchBox = new SearchBox("searchBox", "search/",'.html');
+/* @license-end */
+</script>
 <script type="text/javascript">
-/* @license magnet:?xt=urn:btih:cf05388f2679ee054f2beb29a391d25f4e673ac3&amp;dn=gpl-2.0.txt GPL-v2 */
-var searchBox = new SearchBox("searchBox", "search",false,'Search','.html');
+/* @license magnet:?xt=urn:btih:d3d9a9a6595521f9666a5e94cc830dab83b65699&amp;dn=expat.txt MIT */
+$(function() { codefold.init(0); });
 /* @license-end */
 </script>
 </div><!-- top -->
@@ -74,8 +77,8 @@
   </div>
 </div>
 <script type="text/javascript">
-/* @license magnet:?xt=urn:btih:cf05388f2679ee054f2beb29a391d25f4e673ac3&amp;dn=gpl-2.0.txt GPL-v2 */
-$(document).ready(function(){initNavTree('mimalloc-doc_8h_source.html',''); initResizable(); });
+/* @license magnet:?xt=urn:btih:d3d9a9a6595521f9666a5e94cc830dab83b65699&amp;dn=expat.txt MIT */
+$(function(){initNavTree('mimalloc-doc_8h_source.html',''); initResizable(true); });
 /* @license-end */
 </script>
 <div id="doc-content">
@@ -88,473 +91,584 @@
 
 <!-- iframe showing the search results (closed by default) -->
 <div id="MSearchResultsWindow">
-<iframe src="javascript:void(0)" frameborder="0" 
-        name="MSearchResults" id="MSearchResults">
-</iframe>
+<div id="MSearchResults">
+<div class="SRPage">
+<div id="SRIndex">
+<div id="SRResults"></div>
+<div class="SRStatus" id="Loading">Loading...</div>
+<div class="SRStatus" id="Searching">Searching...</div>
+<div class="SRStatus" id="NoMatches">No Matches</div>
+</div>
+</div>
+</div>
 </div>
 
 <div class="header">
-  <div class="headertitle">
-<div class="title">mimalloc-doc.h</div>  </div>
+  <div class="headertitle"><div class="title">mimalloc-doc.h</div></div>
 </div><!--header-->
 <div class="contents">
-<div class="fragment"><div class="line"><a name="l00001"></a><span class="lineno">    1</span>&#160;<span class="comment">/* ----------------------------------------------------------------------------</span></div>
-<div class="line"><a name="l00002"></a><span class="lineno">    2</span>&#160;<span class="comment">Copyright (c) 2018-2021, Microsoft Research, Daan Leijen</span></div>
-<div class="line"><a name="l00003"></a><span class="lineno">    3</span>&#160;<span class="comment">This is free software; you can redistribute it and/or modify it under the</span></div>
-<div class="line"><a name="l00004"></a><span class="lineno">    4</span>&#160;<span class="comment">terms of the MIT license. A copy of the license can be found in the file</span></div>
-<div class="line"><a name="l00005"></a><span class="lineno">    5</span>&#160;<span class="comment">&quot;LICENSE&quot; at the root of this distribution.</span></div>
-<div class="line"><a name="l00006"></a><span class="lineno">    6</span>&#160;<span class="comment">-----------------------------------------------------------------------------*/</span></div>
-<div class="line"><a name="l00007"></a><span class="lineno">    7</span>&#160; </div>
-<div class="line"><a name="l00008"></a><span class="lineno">    8</span>&#160;<span class="preprocessor">#error &quot;documentation file only!&quot;</span></div>
-<div class="line"><a name="l00009"></a><span class="lineno">    9</span>&#160; </div>
-<div class="line"><a name="l00010"></a><span class="lineno">   10</span>&#160; </div>
-<div class="line"><a name="l00094"></a><span class="lineno">   94</span>&#160; </div>
-<div class="line"><a name="l00095"></a><span class="lineno">   95</span>&#160; </div>
-<div class="line"><a name="l00099"></a><span class="lineno"><a class="line" href="group__malloc.html#gaf2c7b89c327d1f60f59e68b9ea644d95">   99</a></span>&#160;<span class="keywordtype">void</span>  <a class="code" href="group__malloc.html#gaf2c7b89c327d1f60f59e68b9ea644d95">mi_free</a>(<span class="keywordtype">void</span>* p);</div>
-<div class="line"><a name="l00100"></a><span class="lineno">  100</span>&#160; </div>
-<div class="line"><a name="l00105"></a><span class="lineno"><a class="line" href="group__malloc.html#ga3406e8b168bc74c8637b11571a6da83a">  105</a></span>&#160;<span class="keywordtype">void</span>* <a class="code" href="group__malloc.html#ga3406e8b168bc74c8637b11571a6da83a">mi_malloc</a>(<span class="keywordtype">size_t</span> size);</div>
-<div class="line"><a name="l00106"></a><span class="lineno">  106</span>&#160; </div>
-<div class="line"><a name="l00111"></a><span class="lineno"><a class="line" href="group__malloc.html#gafdd9d8bb2986e668ba9884f28af38000">  111</a></span>&#160;<span class="keywordtype">void</span>* <a class="code" href="group__malloc.html#gafdd9d8bb2986e668ba9884f28af38000">mi_zalloc</a>(<span class="keywordtype">size_t</span> size);</div>
-<div class="line"><a name="l00112"></a><span class="lineno">  112</span>&#160; </div>
-<div class="line"><a name="l00122"></a><span class="lineno"><a class="line" href="group__malloc.html#ga97fedb4f7107c592fd7f0f0a8949a57d">  122</a></span>&#160;<span class="keywordtype">void</span>* <a class="code" href="group__malloc.html#ga97fedb4f7107c592fd7f0f0a8949a57d">mi_calloc</a>(<span class="keywordtype">size_t</span> count, <span class="keywordtype">size_t</span> size);</div>
-<div class="line"><a name="l00123"></a><span class="lineno">  123</span>&#160; </div>
-<div class="line"><a name="l00136"></a><span class="lineno"><a class="line" href="group__malloc.html#gaf11eb497da57bdfb2de65eb191c69db6">  136</a></span>&#160;<span class="keywordtype">void</span>* <a class="code" href="group__malloc.html#gaf11eb497da57bdfb2de65eb191c69db6">mi_realloc</a>(<span class="keywordtype">void</span>* p, <span class="keywordtype">size_t</span> newsize);</div>
-<div class="line"><a name="l00137"></a><span class="lineno">  137</span>&#160; </div>
-<div class="line"><a name="l00148"></a><span class="lineno"><a class="line" href="group__malloc.html#ga23a0fbb452b5dce8e31fab1a1958cacc">  148</a></span>&#160;<span class="keywordtype">void</span>* <a class="code" href="group__malloc.html#ga23a0fbb452b5dce8e31fab1a1958cacc">mi_recalloc</a>(<span class="keywordtype">void</span>* p, <span class="keywordtype">size_t</span> count, <span class="keywordtype">size_t</span> size);</div>
-<div class="line"><a name="l00149"></a><span class="lineno">  149</span>&#160; </div>
-<div class="line"><a name="l00163"></a><span class="lineno"><a class="line" href="group__malloc.html#gaaee66a1d483c3e28f585525fb96707e4">  163</a></span>&#160;<span class="keywordtype">void</span>* <a class="code" href="group__malloc.html#gaaee66a1d483c3e28f585525fb96707e4">mi_expand</a>(<span class="keywordtype">void</span>* p, <span class="keywordtype">size_t</span> newsize);</div>
-<div class="line"><a name="l00164"></a><span class="lineno">  164</span>&#160; </div>
-<div class="line"><a name="l00174"></a><span class="lineno"><a class="line" href="group__malloc.html#ga0b05e2bf0f73e7401ae08597ff782ac6">  174</a></span>&#160;<span class="keywordtype">void</span>* <a class="code" href="group__malloc.html#ga0b05e2bf0f73e7401ae08597ff782ac6">mi_mallocn</a>(<span class="keywordtype">size_t</span> count, <span class="keywordtype">size_t</span> size);</div>
-<div class="line"><a name="l00175"></a><span class="lineno">  175</span>&#160; </div>
-<div class="line"><a name="l00185"></a><span class="lineno"><a class="line" href="group__malloc.html#ga61d57b4144ba24fba5c1e9b956d13853">  185</a></span>&#160;<span class="keywordtype">void</span>* <a class="code" href="group__malloc.html#ga61d57b4144ba24fba5c1e9b956d13853">mi_reallocn</a>(<span class="keywordtype">void</span>* p, <span class="keywordtype">size_t</span> count, <span class="keywordtype">size_t</span> size);</div>
-<div class="line"><a name="l00186"></a><span class="lineno">  186</span>&#160; </div>
-<div class="line"><a name="l00203"></a><span class="lineno"><a class="line" href="group__malloc.html#gafe68ac7c5e24a65cd55c9d6b152211a0">  203</a></span>&#160;<span class="keywordtype">void</span>* <a class="code" href="group__malloc.html#gafe68ac7c5e24a65cd55c9d6b152211a0">mi_reallocf</a>(<span class="keywordtype">void</span>* p, <span class="keywordtype">size_t</span> newsize);</div>
-<div class="line"><a name="l00204"></a><span class="lineno">  204</span>&#160; </div>
-<div class="line"><a name="l00205"></a><span class="lineno">  205</span>&#160; </div>
-<div class="line"><a name="l00214"></a><span class="lineno"><a class="line" href="group__malloc.html#gac7cffe13f1f458ed16789488bf92b9b2">  214</a></span>&#160;<span class="keywordtype">char</span>* <a class="code" href="group__malloc.html#gac7cffe13f1f458ed16789488bf92b9b2">mi_strdup</a>(<span class="keyword">const</span> <span class="keywordtype">char</span>* s);</div>
-<div class="line"><a name="l00215"></a><span class="lineno">  215</span>&#160; </div>
-<div class="line"><a name="l00225"></a><span class="lineno"><a class="line" href="group__malloc.html#gaaabf971c2571891433477e2d21a35266">  225</a></span>&#160;<span class="keywordtype">char</span>* <a class="code" href="group__malloc.html#gaaabf971c2571891433477e2d21a35266">mi_strndup</a>(<span class="keyword">const</span> <span class="keywordtype">char</span>* s, <span class="keywordtype">size_t</span> n);</div>
-<div class="line"><a name="l00226"></a><span class="lineno">  226</span>&#160; </div>
-<div class="line"><a name="l00239"></a><span class="lineno"><a class="line" href="group__malloc.html#ga08cec32dd5bbe7da91c78d19f1b5bebe">  239</a></span>&#160;<span class="keywordtype">char</span>* <a class="code" href="group__malloc.html#ga08cec32dd5bbe7da91c78d19f1b5bebe">mi_realpath</a>(<span class="keyword">const</span> <span class="keywordtype">char</span>* fname, <span class="keywordtype">char</span>* resolved_name);</div>
-<div class="line"><a name="l00240"></a><span class="lineno">  240</span>&#160; </div>
-<div class="line"><a name="l00242"></a><span class="lineno">  242</span>&#160; </div>
-<div class="line"><a name="l00243"></a><span class="lineno">  243</span>&#160;<span class="comment">// ------------------------------------------------------</span></div>
-<div class="line"><a name="l00244"></a><span class="lineno">  244</span>&#160;<span class="comment">// Extended functionality</span></div>
-<div class="line"><a name="l00245"></a><span class="lineno">  245</span>&#160;<span class="comment">// ------------------------------------------------------</span></div>
-<div class="line"><a name="l00246"></a><span class="lineno">  246</span>&#160; </div>
-<div class="line"><a name="l00250"></a><span class="lineno">  250</span>&#160; </div>
-<div class="line"><a name="l00253"></a><span class="lineno"><a class="line" href="group__extended.html#ga1ea64283508718d9d645c38efc2f4305">  253</a></span>&#160;<span class="preprocessor">#define MI_SMALL_SIZE_MAX   (128*sizeof(void*))</span></div>
-<div class="line"><a name="l00254"></a><span class="lineno">  254</span>&#160; </div>
-<div class="line"><a name="l00262"></a><span class="lineno"><a class="line" href="group__extended.html#ga7136c2e55cb22c98ecf95d08d6debb99">  262</a></span>&#160;<span class="keywordtype">void</span>* <a class="code" href="group__extended.html#ga7136c2e55cb22c98ecf95d08d6debb99">mi_malloc_small</a>(<span class="keywordtype">size_t</span> size);</div>
-<div class="line"><a name="l00263"></a><span class="lineno">  263</span>&#160; </div>
-<div class="line"><a name="l00271"></a><span class="lineno"><a class="line" href="group__extended.html#ga220f29f40a44404b0061c15bc1c31152">  271</a></span>&#160;<span class="keywordtype">void</span>* <a class="code" href="group__extended.html#ga220f29f40a44404b0061c15bc1c31152">mi_zalloc_small</a>(<span class="keywordtype">size_t</span> size);</div>
-<div class="line"><a name="l00272"></a><span class="lineno">  272</span>&#160; </div>
-<div class="line"><a name="l00287"></a><span class="lineno"><a class="line" href="group__extended.html#ga089c859d9eddc5f9b4bd946cd53cebee">  287</a></span>&#160;<span class="keywordtype">size_t</span> <a class="code" href="group__extended.html#ga089c859d9eddc5f9b4bd946cd53cebee">mi_usable_size</a>(<span class="keywordtype">void</span>* p);</div>
-<div class="line"><a name="l00288"></a><span class="lineno">  288</span>&#160; </div>
-<div class="line"><a name="l00298"></a><span class="lineno"><a class="line" href="group__extended.html#gac057927cd06c854b45fe7847e921bd47">  298</a></span>&#160;<span class="keywordtype">size_t</span> <a class="code" href="group__extended.html#gac057927cd06c854b45fe7847e921bd47">mi_good_size</a>(<span class="keywordtype">size_t</span> size);</div>
-<div class="line"><a name="l00299"></a><span class="lineno">  299</span>&#160; </div>
-<div class="line"><a name="l00307"></a><span class="lineno"><a class="line" href="group__extended.html#ga421430e2226d7d468529cec457396756">  307</a></span>&#160;<span class="keywordtype">void</span>   <a class="code" href="group__extended.html#ga421430e2226d7d468529cec457396756">mi_collect</a>(<span class="keywordtype">bool</span> force);</div>
-<div class="line"><a name="l00308"></a><span class="lineno">  308</span>&#160; </div>
-<div class="line"><a name="l00313"></a><span class="lineno"><a class="line" href="group__extended.html#ga2d126e5c62d3badc35445e5d84166df2">  313</a></span>&#160;<span class="keywordtype">void</span> <a class="code" href="group__extended.html#ga2d126e5c62d3badc35445e5d84166df2">mi_stats_print</a>(<span class="keywordtype">void</span>* out);</div>
-<div class="line"><a name="l00314"></a><span class="lineno">  314</span>&#160; </div>
-<div class="line"><a name="l00320"></a><span class="lineno"><a class="line" href="group__extended.html#ga537f13b299ddf801e49a5a94fde02c79">  320</a></span>&#160;<span class="keywordtype">void</span> <a class="code" href="group__extended.html#ga537f13b299ddf801e49a5a94fde02c79">mi_stats_print_out</a>(<a class="code" href="group__extended.html#gad823d23444a4b77a40f66bf075a98a0c">mi_output_fun</a>* out, <span class="keywordtype">void</span>* arg);</div>
-<div class="line"><a name="l00321"></a><span class="lineno">  321</span>&#160; </div>
-<div class="line"><a name="l00323"></a><span class="lineno"><a class="line" href="group__extended.html#ga3bb8468b8cfcc6e2a61d98aee85c5f99">  323</a></span>&#160;<span class="keywordtype">void</span> <a class="code" href="group__extended.html#ga3bb8468b8cfcc6e2a61d98aee85c5f99">mi_stats_reset</a>(<span class="keywordtype">void</span>);</div>
-<div class="line"><a name="l00324"></a><span class="lineno">  324</span>&#160; </div>
-<div class="line"><a name="l00326"></a><span class="lineno"><a class="line" href="group__extended.html#ga854b1de8cb067c7316286c28b2fcd3d1">  326</a></span>&#160;<span class="keywordtype">void</span> <a class="code" href="group__extended.html#ga854b1de8cb067c7316286c28b2fcd3d1">mi_stats_merge</a>(<span class="keywordtype">void</span>);</div>
-<div class="line"><a name="l00327"></a><span class="lineno">  327</span>&#160; </div>
-<div class="line"><a name="l00331"></a><span class="lineno"><a class="line" href="group__extended.html#gaf8e73efc2cbca9ebfdfb166983a04c17">  331</a></span>&#160;<span class="keywordtype">void</span> <a class="code" href="group__extended.html#gaf8e73efc2cbca9ebfdfb166983a04c17">mi_thread_init</a>(<span class="keywordtype">void</span>);</div>
-<div class="line"><a name="l00332"></a><span class="lineno">  332</span>&#160; </div>
-<div class="line"><a name="l00337"></a><span class="lineno"><a class="line" href="group__extended.html#ga0ae4581e85453456a0d658b2b98bf7bf">  337</a></span>&#160;<span class="keywordtype">void</span> <a class="code" href="group__extended.html#ga0ae4581e85453456a0d658b2b98bf7bf">mi_thread_done</a>(<span class="keywordtype">void</span>);</div>
-<div class="line"><a name="l00338"></a><span class="lineno">  338</span>&#160; </div>
-<div class="line"><a name="l00344"></a><span class="lineno"><a class="line" href="group__extended.html#gab1dac8476c46cb9eecab767eb40c1525">  344</a></span>&#160;<span class="keywordtype">void</span> <a class="code" href="group__extended.html#gab1dac8476c46cb9eecab767eb40c1525">mi_thread_stats_print_out</a>(<a class="code" href="group__extended.html#gad823d23444a4b77a40f66bf075a98a0c">mi_output_fun</a>* out, <span class="keywordtype">void</span>* arg);</div>
-<div class="line"><a name="l00345"></a><span class="lineno">  345</span>&#160; </div>
-<div class="line"><a name="l00352"></a><span class="lineno"><a class="line" href="group__extended.html#ga299dae78d25ce112e384a98b7309c5be">  352</a></span>&#160;<span class="keyword">typedef</span> void (<a class="code" href="group__extended.html#ga299dae78d25ce112e384a98b7309c5be">mi_deferred_free_fun</a>)(<span class="keywordtype">bool</span> force, <span class="keywordtype">unsigned</span> <span class="keywordtype">long</span> <span class="keywordtype">long</span> heartbeat, <span class="keywordtype">void</span>* arg);</div>
-<div class="line"><a name="l00353"></a><span class="lineno">  353</span>&#160; </div>
-<div class="line"><a name="l00369"></a><span class="lineno"><a class="line" href="group__extended.html#ga3460a6ca91af97be4058f523d3cb8ece">  369</a></span>&#160;<span class="keywordtype">void</span>   <a class="code" href="group__extended.html#ga3460a6ca91af97be4058f523d3cb8ece">mi_register_deferred_free</a>(<a class="code" href="group__extended.html#ga299dae78d25ce112e384a98b7309c5be">mi_deferred_free_fun</a>* deferred_free, <span class="keywordtype">void</span>* arg);</div>
-<div class="line"><a name="l00370"></a><span class="lineno">  370</span>&#160; </div>
-<div class="line"><a name="l00376"></a><span class="lineno"><a class="line" href="group__extended.html#gad823d23444a4b77a40f66bf075a98a0c">  376</a></span>&#160;<span class="keyword">typedef</span> void (<a class="code" href="group__extended.html#gad823d23444a4b77a40f66bf075a98a0c">mi_output_fun</a>)(<span class="keyword">const</span> <span class="keywordtype">char</span>* msg, <span class="keywordtype">void</span>* arg);</div>
-<div class="line"><a name="l00377"></a><span class="lineno">  377</span>&#160; </div>
-<div class="line"><a name="l00384"></a><span class="lineno"><a class="line" href="group__extended.html#gae5b17ff027cd2150b43a33040250cf3f">  384</a></span>&#160;<span class="keywordtype">void</span> <a class="code" href="group__extended.html#gae5b17ff027cd2150b43a33040250cf3f">mi_register_output</a>(<a class="code" href="group__extended.html#gad823d23444a4b77a40f66bf075a98a0c">mi_output_fun</a>* out, <span class="keywordtype">void</span>* arg);</div>
-<div class="line"><a name="l00385"></a><span class="lineno">  385</span>&#160; </div>
-<div class="line"><a name="l00391"></a><span class="lineno"><a class="line" href="group__extended.html#ga251d369cda3f1c2a955c555486ed90e5">  391</a></span>&#160;<span class="keyword">typedef</span> void (<a class="code" href="group__extended.html#ga251d369cda3f1c2a955c555486ed90e5">mi_error_fun</a>)(<span class="keywordtype">int</span> err, <span class="keywordtype">void</span>* arg);</div>
-<div class="line"><a name="l00392"></a><span class="lineno">  392</span>&#160; </div>
-<div class="line"><a name="l00408"></a><span class="lineno"><a class="line" href="group__extended.html#gaa1d55e0e894be240827e5d87ec3a1f45">  408</a></span>&#160;<span class="keywordtype">void</span> <a class="code" href="group__extended.html#gaa1d55e0e894be240827e5d87ec3a1f45">mi_register_error</a>(<a class="code" href="group__extended.html#ga251d369cda3f1c2a955c555486ed90e5">mi_error_fun</a>* errfun, <span class="keywordtype">void</span>* arg);</div>
-<div class="line"><a name="l00409"></a><span class="lineno">  409</span>&#160; </div>
-<div class="line"><a name="l00414"></a><span class="lineno"><a class="line" href="group__extended.html#ga5f071b10d4df1c3658e04e7fd67a94e6">  414</a></span>&#160;<span class="keywordtype">bool</span> <a class="code" href="group__extended.html#ga5f071b10d4df1c3658e04e7fd67a94e6">mi_is_in_heap_region</a>(<span class="keyword">const</span> <span class="keywordtype">void</span>* p);</div>
-<div class="line"><a name="l00415"></a><span class="lineno">  415</span>&#160; </div>
-<div class="line"><a name="l00424"></a><span class="lineno"><a class="line" href="group__extended.html#ga00ec3324b6b2591c7fe3677baa30a767">  424</a></span>&#160;<span class="keywordtype">int</span>  <a class="code" href="group__extended.html#ga00ec3324b6b2591c7fe3677baa30a767">mi_reserve_os_memory</a>(<span class="keywordtype">size_t</span> size, <span class="keywordtype">bool</span> commit, <span class="keywordtype">bool</span> allow_large);</div>
-<div class="line"><a name="l00425"></a><span class="lineno">  425</span>&#160; </div>
-<div class="line"><a name="l00437"></a><span class="lineno"><a class="line" href="group__extended.html#ga4c6486a1fdcd7a423b5f25fe4be8e0cf">  437</a></span>&#160;<span class="keywordtype">bool</span> <a class="code" href="group__extended.html#ga4c6486a1fdcd7a423b5f25fe4be8e0cf">mi_manage_os_memory</a>(<span class="keywordtype">void</span>* start, <span class="keywordtype">size_t</span> size, <span class="keywordtype">bool</span> is_committed, <span class="keywordtype">bool</span> is_large, <span class="keywordtype">bool</span> is_zero, <span class="keywordtype">int</span> numa_node);</div>
-<div class="line"><a name="l00438"></a><span class="lineno">  438</span>&#160; </div>
-<div class="line"><a name="l00451"></a><span class="lineno"><a class="line" href="group__extended.html#ga3132f521fb756fc0e8ec0b74fb58df50">  451</a></span>&#160;<span class="keywordtype">int</span> <a class="code" href="group__extended.html#ga3132f521fb756fc0e8ec0b74fb58df50">mi_reserve_huge_os_pages_interleave</a>(<span class="keywordtype">size_t</span> pages, <span class="keywordtype">size_t</span> numa_nodes, <span class="keywordtype">size_t</span> timeout_msecs);</div>
-<div class="line"><a name="l00452"></a><span class="lineno">  452</span>&#160; </div>
-<div class="line"><a name="l00465"></a><span class="lineno"><a class="line" href="group__extended.html#ga7795a13d20087447281858d2c771cca1">  465</a></span>&#160;<span class="keywordtype">int</span> <a class="code" href="group__extended.html#ga7795a13d20087447281858d2c771cca1">mi_reserve_huge_os_pages_at</a>(<span class="keywordtype">size_t</span> pages, <span class="keywordtype">int</span> numa_node, <span class="keywordtype">size_t</span> timeout_msecs);</div>
-<div class="line"><a name="l00466"></a><span class="lineno">  466</span>&#160; </div>
-<div class="line"><a name="l00467"></a><span class="lineno">  467</span>&#160; </div>
-<div class="line"><a name="l00472"></a><span class="lineno"><a class="line" href="group__extended.html#gaad25050b19f30cd79397b227e0157a3f">  472</a></span>&#160;<span class="keywordtype">bool</span> <a class="code" href="group__extended.html#gaad25050b19f30cd79397b227e0157a3f">mi_is_redirected</a>();</div>
-<div class="line"><a name="l00473"></a><span class="lineno">  473</span>&#160; </div>
-<div class="line"><a name="l00487"></a><span class="lineno"><a class="line" href="group__extended.html#ga7d862c2affd5790381da14eb102a364d">  487</a></span>&#160;<span class="keywordtype">void</span> <a class="code" href="group__extended.html#ga7d862c2affd5790381da14eb102a364d">mi_process_info</a>(<span class="keywordtype">size_t</span>* elapsed_msecs, <span class="keywordtype">size_t</span>* user_msecs, <span class="keywordtype">size_t</span>* system_msecs, <span class="keywordtype">size_t</span>* current_rss, <span class="keywordtype">size_t</span>* peak_rss, <span class="keywordtype">size_t</span>* current_commit, <span class="keywordtype">size_t</span>* peak_commit, <span class="keywordtype">size_t</span>* page_faults);</div>
-<div class="line"><a name="l00488"></a><span class="lineno">  488</span>&#160; </div>
-<div class="line"><a name="l00490"></a><span class="lineno">  490</span>&#160; </div>
-<div class="line"><a name="l00491"></a><span class="lineno">  491</span>&#160;<span class="comment">// ------------------------------------------------------</span></div>
-<div class="line"><a name="l00492"></a><span class="lineno">  492</span>&#160;<span class="comment">// Aligned allocation</span></div>
-<div class="line"><a name="l00493"></a><span class="lineno">  493</span>&#160;<span class="comment">// ------------------------------------------------------</span></div>
-<div class="line"><a name="l00494"></a><span class="lineno">  494</span>&#160; </div>
-<div class="line"><a name="l00500"></a><span class="lineno">  500</span>&#160; </div>
-<div class="line"><a name="l00502"></a><span class="lineno"><a class="line" href="group__aligned.html#ga83c03016066b438f51a8095e9140be06">  502</a></span>&#160;<span class="preprocessor">#define MI_ALIGNMENT_MAX   (1024*1024UL)   </span></div>
-<div class="line"><a name="l00503"></a><span class="lineno">  503</span>&#160; </div>
-<div class="line"><a name="l00516"></a><span class="lineno"><a class="line" href="group__aligned.html#ga68930196751fa2cca9e1fd0d71bade56">  516</a></span>&#160;<span class="keywordtype">void</span>* <a class="code" href="group__aligned.html#ga68930196751fa2cca9e1fd0d71bade56">mi_malloc_aligned</a>(<span class="keywordtype">size_t</span> size, <span class="keywordtype">size_t</span> alignment);</div>
-<div class="line"><a name="l00517"></a><span class="lineno"><a class="line" href="group__aligned.html#ga0cadbcf5b89a7b6fb171bc8df8734819">  517</a></span>&#160;<span class="keywordtype">void</span>* <a class="code" href="group__aligned.html#ga0cadbcf5b89a7b6fb171bc8df8734819">mi_zalloc_aligned</a>(<span class="keywordtype">size_t</span> size, <span class="keywordtype">size_t</span> alignment);</div>
-<div class="line"><a name="l00518"></a><span class="lineno"><a class="line" href="group__aligned.html#ga53dddb4724042a90315b94bc268fb4c9">  518</a></span>&#160;<span class="keywordtype">void</span>* <a class="code" href="group__aligned.html#ga53dddb4724042a90315b94bc268fb4c9">mi_calloc_aligned</a>(<span class="keywordtype">size_t</span> count, <span class="keywordtype">size_t</span> size, <span class="keywordtype">size_t</span> alignment);</div>
-<div class="line"><a name="l00519"></a><span class="lineno"><a class="line" href="group__aligned.html#ga4028d1cf4aa4c87c880747044a8322ae">  519</a></span>&#160;<span class="keywordtype">void</span>* <a class="code" href="group__aligned.html#ga4028d1cf4aa4c87c880747044a8322ae">mi_realloc_aligned</a>(<span class="keywordtype">void</span>* p, <span class="keywordtype">size_t</span> newsize, <span class="keywordtype">size_t</span> alignment);</div>
-<div class="line"><a name="l00520"></a><span class="lineno">  520</span>&#160; </div>
-<div class="line"><a name="l00531"></a><span class="lineno"><a class="line" href="group__aligned.html#ga5850da130c936bd77db039dcfbc8295d">  531</a></span>&#160;<span class="keywordtype">void</span>* <a class="code" href="group__aligned.html#ga5850da130c936bd77db039dcfbc8295d">mi_malloc_aligned_at</a>(<span class="keywordtype">size_t</span> size, <span class="keywordtype">size_t</span> alignment, <span class="keywordtype">size_t</span> offset);</div>
-<div class="line"><a name="l00532"></a><span class="lineno"><a class="line" href="group__aligned.html#ga5f8c2353766db522565e642fafd8a3f8">  532</a></span>&#160;<span class="keywordtype">void</span>* <a class="code" href="group__aligned.html#ga5f8c2353766db522565e642fafd8a3f8">mi_zalloc_aligned_at</a>(<span class="keywordtype">size_t</span> size, <span class="keywordtype">size_t</span> alignment, <span class="keywordtype">size_t</span> offset);</div>
-<div class="line"><a name="l00533"></a><span class="lineno"><a class="line" href="group__aligned.html#ga08647c4593f3b2eef24a919a73eba3a3">  533</a></span>&#160;<span class="keywordtype">void</span>* <a class="code" href="group__aligned.html#ga08647c4593f3b2eef24a919a73eba3a3">mi_calloc_aligned_at</a>(<span class="keywordtype">size_t</span> count, <span class="keywordtype">size_t</span> size, <span class="keywordtype">size_t</span> alignment, <span class="keywordtype">size_t</span> offset);</div>
-<div class="line"><a name="l00534"></a><span class="lineno"><a class="line" href="group__heap.html#ga34a47cde5a5b38c29f1aa3c5e76943c2">  534</a></span>&#160;<span class="keywordtype">void</span>* <a class="code" href="group__aligned.html#gaf66a9ae6c6f08bd6be6fb6ea771faffb">mi_realloc_aligned_at</a>(<span class="keywordtype">void</span>* p, <span class="keywordtype">size_t</span> newsize, <span class="keywordtype">size_t</span> alignment, <span class="keywordtype">size_t</span> offset);</div>
-<div class="line"><a name="l00535"></a><span class="lineno">  535</span>&#160; </div>
-<div class="line"><a name="l00537"></a><span class="lineno">  537</span>&#160; </div>
-<div class="line"><a name="l00543"></a><span class="lineno">  543</span>&#160; </div>
-<div class="line"><a name="l00548"></a><span class="lineno">  548</span>&#160;<span class="keyword">struct </span>mi_heap_s;</div>
-<div class="line"><a name="l00549"></a><span class="lineno">  549</span>&#160; </div>
-<div class="line"><a name="l00554"></a><span class="lineno">  554</span>&#160;<span class="keyword">typedef</span> <span class="keyword">struct </span>mi_heap_s <a class="code" href="group__heap.html#ga34a47cde5a5b38c29f1aa3c5e76943c2">mi_heap_t</a>;</div>
-<div class="line"><a name="l00555"></a><span class="lineno">  555</span>&#160; </div>
-<div class="line"><a name="l00557"></a><span class="lineno"><a class="line" href="group__heap.html#ga766f672ba56f2fbfeb9d9dbb0b7f6b11">  557</a></span>&#160;<a class="code" href="group__heap.html#ga34a47cde5a5b38c29f1aa3c5e76943c2">mi_heap_t</a>* <a class="code" href="group__heap.html#ga766f672ba56f2fbfeb9d9dbb0b7f6b11">mi_heap_new</a>();</div>
-<div class="line"><a name="l00558"></a><span class="lineno">  558</span>&#160; </div>
-<div class="line"><a name="l00566"></a><span class="lineno"><a class="line" href="group__heap.html#ga2ab1af8d438819b55319c7ef51d1e409">  566</a></span>&#160;<span class="keywordtype">void</span> <a class="code" href="group__heap.html#ga2ab1af8d438819b55319c7ef51d1e409">mi_heap_delete</a>(<a class="code" href="group__heap.html#ga34a47cde5a5b38c29f1aa3c5e76943c2">mi_heap_t</a>* heap);</div>
-<div class="line"><a name="l00567"></a><span class="lineno">  567</span>&#160; </div>
-<div class="line"><a name="l00575"></a><span class="lineno"><a class="line" href="group__heap.html#ga9f9c0844edb9717f4feacd79116b8e0d">  575</a></span>&#160;<span class="keywordtype">void</span> <a class="code" href="group__heap.html#ga9f9c0844edb9717f4feacd79116b8e0d">mi_heap_destroy</a>(<a class="code" href="group__heap.html#ga34a47cde5a5b38c29f1aa3c5e76943c2">mi_heap_t</a>* heap);</div>
-<div class="line"><a name="l00576"></a><span class="lineno">  576</span>&#160; </div>
-<div class="line"><a name="l00580"></a><span class="lineno"><a class="line" href="group__heap.html#gab8631ec88c8d26641b68b5d25dcd4422">  580</a></span>&#160;<a class="code" href="group__heap.html#ga34a47cde5a5b38c29f1aa3c5e76943c2">mi_heap_t</a>* <a class="code" href="group__heap.html#gab8631ec88c8d26641b68b5d25dcd4422">mi_heap_set_default</a>(<a class="code" href="group__heap.html#ga34a47cde5a5b38c29f1aa3c5e76943c2">mi_heap_t</a>* heap);</div>
-<div class="line"><a name="l00581"></a><span class="lineno">  581</span>&#160; </div>
-<div class="line"><a name="l00584"></a><span class="lineno"><a class="line" href="group__heap.html#ga8db4cbb87314a989a9a187464d6b5e05">  584</a></span>&#160;<a class="code" href="group__heap.html#ga34a47cde5a5b38c29f1aa3c5e76943c2">mi_heap_t</a>* <a class="code" href="group__heap.html#ga8db4cbb87314a989a9a187464d6b5e05">mi_heap_get_default</a>();</div>
-<div class="line"><a name="l00585"></a><span class="lineno">  585</span>&#160; </div>
-<div class="line"><a name="l00591"></a><span class="lineno"><a class="line" href="group__heap.html#ga5d03fbe062ffcf38f0f417fd968357fc">  591</a></span>&#160;<a class="code" href="group__heap.html#ga34a47cde5a5b38c29f1aa3c5e76943c2">mi_heap_t</a>* <a class="code" href="group__heap.html#ga5d03fbe062ffcf38f0f417fd968357fc">mi_heap_get_backing</a>();</div>
-<div class="line"><a name="l00592"></a><span class="lineno">  592</span>&#160; </div>
-<div class="line"><a name="l00594"></a><span class="lineno"><a class="line" href="group__heap.html#ga7922f7495cde30b1984d0e6072419298">  594</a></span>&#160;<span class="keywordtype">void</span> <a class="code" href="group__heap.html#ga7922f7495cde30b1984d0e6072419298">mi_heap_collect</a>(<a class="code" href="group__heap.html#ga34a47cde5a5b38c29f1aa3c5e76943c2">mi_heap_t</a>* heap, <span class="keywordtype">bool</span> force);</div>
-<div class="line"><a name="l00595"></a><span class="lineno">  595</span>&#160; </div>
-<div class="line"><a name="l00598"></a><span class="lineno"><a class="line" href="group__heap.html#ga9cbed01e42c0647907295de92c3fa296">  598</a></span>&#160;<span class="keywordtype">void</span>* <a class="code" href="group__heap.html#ga9cbed01e42c0647907295de92c3fa296">mi_heap_malloc</a>(<a class="code" href="group__heap.html#ga34a47cde5a5b38c29f1aa3c5e76943c2">mi_heap_t</a>* heap, <span class="keywordtype">size_t</span> size);</div>
-<div class="line"><a name="l00599"></a><span class="lineno">  599</span>&#160; </div>
-<div class="line"><a name="l00603"></a><span class="lineno"><a class="line" href="group__heap.html#gaa1a1c7a1f4da6826b5a25b70ef878368">  603</a></span>&#160;<span class="keywordtype">void</span>* <a class="code" href="group__heap.html#gaa1a1c7a1f4da6826b5a25b70ef878368">mi_heap_malloc_small</a>(<a class="code" href="group__heap.html#ga34a47cde5a5b38c29f1aa3c5e76943c2">mi_heap_t</a>* heap, <span class="keywordtype">size_t</span> size);</div>
-<div class="line"><a name="l00604"></a><span class="lineno">  604</span>&#160; </div>
-<div class="line"><a name="l00607"></a><span class="lineno"><a class="line" href="group__heap.html#ga903104592c8ed53417a3762da6241133">  607</a></span>&#160;<span class="keywordtype">void</span>* <a class="code" href="group__heap.html#ga903104592c8ed53417a3762da6241133">mi_heap_zalloc</a>(<a class="code" href="group__heap.html#ga34a47cde5a5b38c29f1aa3c5e76943c2">mi_heap_t</a>* heap, <span class="keywordtype">size_t</span> size);</div>
-<div class="line"><a name="l00608"></a><span class="lineno">  608</span>&#160; </div>
-<div class="line"><a name="l00611"></a><span class="lineno"><a class="line" href="group__heap.html#gaa6702b3c48e9e53e50e81b36f5011d55">  611</a></span>&#160;<span class="keywordtype">void</span>* <a class="code" href="group__heap.html#gaa6702b3c48e9e53e50e81b36f5011d55">mi_heap_calloc</a>(<a class="code" href="group__heap.html#ga34a47cde5a5b38c29f1aa3c5e76943c2">mi_heap_t</a>* heap, <span class="keywordtype">size_t</span> count, <span class="keywordtype">size_t</span> size);</div>
-<div class="line"><a name="l00612"></a><span class="lineno">  612</span>&#160; </div>
-<div class="line"><a name="l00615"></a><span class="lineno"><a class="line" href="group__heap.html#ga851da6c43fe0b71c1376cee8aef90db0">  615</a></span>&#160;<span class="keywordtype">void</span>* <a class="code" href="group__heap.html#ga851da6c43fe0b71c1376cee8aef90db0">mi_heap_mallocn</a>(<a class="code" href="group__heap.html#ga34a47cde5a5b38c29f1aa3c5e76943c2">mi_heap_t</a>* heap, <span class="keywordtype">size_t</span> count, <span class="keywordtype">size_t</span> size);</div>
-<div class="line"><a name="l00616"></a><span class="lineno">  616</span>&#160; </div>
-<div class="line"><a name="l00619"></a><span class="lineno"><a class="line" href="group__heap.html#ga139d6b09dbf50c3c2523d0f4d1cfdeb5">  619</a></span>&#160;<span class="keywordtype">char</span>* <a class="code" href="group__heap.html#ga139d6b09dbf50c3c2523d0f4d1cfdeb5">mi_heap_strdup</a>(<a class="code" href="group__heap.html#ga34a47cde5a5b38c29f1aa3c5e76943c2">mi_heap_t</a>* heap, <span class="keyword">const</span> <span class="keywordtype">char</span>* s);</div>
-<div class="line"><a name="l00620"></a><span class="lineno">  620</span>&#160; </div>
-<div class="line"><a name="l00623"></a><span class="lineno"><a class="line" href="group__heap.html#ga8e3dbd46650dd26573cf307a2c8f1f5a">  623</a></span>&#160;<span class="keywordtype">char</span>* <a class="code" href="group__heap.html#ga8e3dbd46650dd26573cf307a2c8f1f5a">mi_heap_strndup</a>(<a class="code" href="group__heap.html#ga34a47cde5a5b38c29f1aa3c5e76943c2">mi_heap_t</a>* heap, <span class="keyword">const</span> <span class="keywordtype">char</span>* s, <span class="keywordtype">size_t</span> n);</div>
-<div class="line"><a name="l00624"></a><span class="lineno">  624</span>&#160; </div>
-<div class="line"><a name="l00627"></a><span class="lineno"><a class="line" href="group__heap.html#ga00e95ba1e01acac3cfd95bb7a357a6f0">  627</a></span>&#160;<span class="keywordtype">char</span>* <a class="code" href="group__heap.html#ga00e95ba1e01acac3cfd95bb7a357a6f0">mi_heap_realpath</a>(<a class="code" href="group__heap.html#ga34a47cde5a5b38c29f1aa3c5e76943c2">mi_heap_t</a>* heap, <span class="keyword">const</span> <span class="keywordtype">char</span>* fname, <span class="keywordtype">char</span>* resolved_name);</div>
-<div class="line"><a name="l00628"></a><span class="lineno">  628</span>&#160; </div>
-<div class="line"><a name="l00629"></a><span class="lineno"><a class="line" href="group__heap.html#gaaef3395f66be48f37bdc8322509c5d81">  629</a></span>&#160;<span class="keywordtype">void</span>* <a class="code" href="group__heap.html#gaaef3395f66be48f37bdc8322509c5d81">mi_heap_realloc</a>(<a class="code" href="group__heap.html#ga34a47cde5a5b38c29f1aa3c5e76943c2">mi_heap_t</a>* heap, <span class="keywordtype">void</span>* p, <span class="keywordtype">size_t</span> newsize);</div>
-<div class="line"><a name="l00630"></a><span class="lineno"><a class="line" href="group__heap.html#gac74e94ad9b0c9b57c1c4d88b8825b7a8">  630</a></span>&#160;<span class="keywordtype">void</span>* <a class="code" href="group__heap.html#gac74e94ad9b0c9b57c1c4d88b8825b7a8">mi_heap_reallocn</a>(<a class="code" href="group__heap.html#ga34a47cde5a5b38c29f1aa3c5e76943c2">mi_heap_t</a>* heap, <span class="keywordtype">void</span>* p, <span class="keywordtype">size_t</span> count, <span class="keywordtype">size_t</span> size);</div>
-<div class="line"><a name="l00631"></a><span class="lineno"><a class="line" href="group__heap.html#ga4a21070eb4e7cce018133c8d5f4b0527">  631</a></span>&#160;<span class="keywordtype">void</span>* <a class="code" href="group__heap.html#ga4a21070eb4e7cce018133c8d5f4b0527">mi_heap_reallocf</a>(<a class="code" href="group__heap.html#ga34a47cde5a5b38c29f1aa3c5e76943c2">mi_heap_t</a>* heap, <span class="keywordtype">void</span>* p, <span class="keywordtype">size_t</span> newsize);</div>
-<div class="line"><a name="l00632"></a><span class="lineno">  632</span>&#160; </div>
-<div class="line"><a name="l00633"></a><span class="lineno"><a class="line" href="group__heap.html#gab5b87e1805306f70df38789fcfcf6653">  633</a></span>&#160;<span class="keywordtype">void</span>* <a class="code" href="group__heap.html#gab5b87e1805306f70df38789fcfcf6653">mi_heap_malloc_aligned</a>(<a class="code" href="group__heap.html#ga34a47cde5a5b38c29f1aa3c5e76943c2">mi_heap_t</a>* heap, <span class="keywordtype">size_t</span> size, <span class="keywordtype">size_t</span> alignment);</div>
-<div class="line"><a name="l00634"></a><span class="lineno"><a class="line" href="group__heap.html#ga23acd7680fb0976dde3783254c6c874b">  634</a></span>&#160;<span class="keywordtype">void</span>* <a class="code" href="group__heap.html#ga23acd7680fb0976dde3783254c6c874b">mi_heap_malloc_aligned_at</a>(<a class="code" href="group__heap.html#ga34a47cde5a5b38c29f1aa3c5e76943c2">mi_heap_t</a>* heap, <span class="keywordtype">size_t</span> size, <span class="keywordtype">size_t</span> alignment, <span class="keywordtype">size_t</span> offset);</div>
-<div class="line"><a name="l00635"></a><span class="lineno"><a class="line" href="group__heap.html#gaa450a59c6c7ae5fdbd1c2b80a8329ef0">  635</a></span>&#160;<span class="keywordtype">void</span>* <a class="code" href="group__heap.html#gaa450a59c6c7ae5fdbd1c2b80a8329ef0">mi_heap_zalloc_aligned</a>(<a class="code" href="group__heap.html#ga34a47cde5a5b38c29f1aa3c5e76943c2">mi_heap_t</a>* heap, <span class="keywordtype">size_t</span> size, <span class="keywordtype">size_t</span> alignment);</div>
-<div class="line"><a name="l00636"></a><span class="lineno"><a class="line" href="group__heap.html#ga45fb43a62776fbebbdf1edd99b527954">  636</a></span>&#160;<span class="keywordtype">void</span>* <a class="code" href="group__heap.html#ga45fb43a62776fbebbdf1edd99b527954">mi_heap_zalloc_aligned_at</a>(<a class="code" href="group__heap.html#ga34a47cde5a5b38c29f1aa3c5e76943c2">mi_heap_t</a>* heap, <span class="keywordtype">size_t</span> size, <span class="keywordtype">size_t</span> alignment, <span class="keywordtype">size_t</span> offset);</div>
-<div class="line"><a name="l00637"></a><span class="lineno"><a class="line" href="group__heap.html#ga4af03a6e2b93fae77424d93f889705c3">  637</a></span>&#160;<span class="keywordtype">void</span>* <a class="code" href="group__heap.html#ga4af03a6e2b93fae77424d93f889705c3">mi_heap_calloc_aligned</a>(<a class="code" href="group__heap.html#ga34a47cde5a5b38c29f1aa3c5e76943c2">mi_heap_t</a>* heap, <span class="keywordtype">size_t</span> count, <span class="keywordtype">size_t</span> size, <span class="keywordtype">size_t</span> alignment);</div>
-<div class="line"><a name="l00638"></a><span class="lineno"><a class="line" href="group__heap.html#ga08ca6419a5c057a4d965868998eef487">  638</a></span>&#160;<span class="keywordtype">void</span>* <a class="code" href="group__heap.html#ga08ca6419a5c057a4d965868998eef487">mi_heap_calloc_aligned_at</a>(<a class="code" href="group__heap.html#ga34a47cde5a5b38c29f1aa3c5e76943c2">mi_heap_t</a>* heap, <span class="keywordtype">size_t</span> count, <span class="keywordtype">size_t</span> size, <span class="keywordtype">size_t</span> alignment, <span class="keywordtype">size_t</span> offset);</div>
-<div class="line"><a name="l00639"></a><span class="lineno"><a class="line" href="group__heap.html#gafc603b696bd14cae6da28658f950d98c">  639</a></span>&#160;<span class="keywordtype">void</span>* <a class="code" href="group__heap.html#gafc603b696bd14cae6da28658f950d98c">mi_heap_realloc_aligned</a>(<a class="code" href="group__heap.html#ga34a47cde5a5b38c29f1aa3c5e76943c2">mi_heap_t</a>* heap, <span class="keywordtype">void</span>* p, <span class="keywordtype">size_t</span> newsize, <span class="keywordtype">size_t</span> alignment);</div>
-<div class="line"><a name="l00640"></a><span class="lineno"><a class="line" href="group__heap.html#gaf96c788a1bf553fe2d371de9365e047c">  640</a></span>&#160;<span class="keywordtype">void</span>* <a class="code" href="group__heap.html#gaf96c788a1bf553fe2d371de9365e047c">mi_heap_realloc_aligned_at</a>(<a class="code" href="group__heap.html#ga34a47cde5a5b38c29f1aa3c5e76943c2">mi_heap_t</a>* heap, <span class="keywordtype">void</span>* p, <span class="keywordtype">size_t</span> newsize, <span class="keywordtype">size_t</span> alignment, <span class="keywordtype">size_t</span> offset);</div>
-<div class="line"><a name="l00641"></a><span class="lineno">  641</span>&#160; </div>
-<div class="line"><a name="l00643"></a><span class="lineno">  643</span>&#160; </div>
-<div class="line"><a name="l00644"></a><span class="lineno">  644</span>&#160; </div>
-<div class="line"><a name="l00653"></a><span class="lineno">  653</span>&#160; </div>
-<div class="line"><a name="l00654"></a><span class="lineno"><a class="line" href="group__zeroinit.html#ga8c292e142110229a2980b37ab036dbc6">  654</a></span>&#160;<span class="keywordtype">void</span>* <a class="code" href="group__zeroinit.html#ga8c292e142110229a2980b37ab036dbc6">mi_rezalloc</a>(<span class="keywordtype">void</span>* p, <span class="keywordtype">size_t</span> newsize);</div>
-<div class="line"><a name="l00655"></a><span class="lineno">  655</span>&#160;<span class="keywordtype">void</span>* <a class="code" href="group__malloc.html#ga23a0fbb452b5dce8e31fab1a1958cacc">mi_recalloc</a>(<span class="keywordtype">void</span>* p, <span class="keywordtype">size_t</span> newcount, <span class="keywordtype">size_t</span> size) ;</div>
-<div class="line"><a name="l00656"></a><span class="lineno">  656</span>&#160; </div>
-<div class="line"><a name="l00657"></a><span class="lineno"><a class="line" href="group__zeroinit.html#gacd71a7bce96aab38ae6de17af2eb2cf0">  657</a></span>&#160;<span class="keywordtype">void</span>* <a class="code" href="group__zeroinit.html#gacd71a7bce96aab38ae6de17af2eb2cf0">mi_rezalloc_aligned</a>(<span class="keywordtype">void</span>* p, <span class="keywordtype">size_t</span> newsize, <span class="keywordtype">size_t</span> alignment);</div>
-<div class="line"><a name="l00658"></a><span class="lineno"><a class="line" href="group__zeroinit.html#gae8b358c417e61d5307da002702b0a8e1">  658</a></span>&#160;<span class="keywordtype">void</span>* <a class="code" href="group__zeroinit.html#gae8b358c417e61d5307da002702b0a8e1">mi_rezalloc_aligned_at</a>(<span class="keywordtype">void</span>* p, <span class="keywordtype">size_t</span> newsize, <span class="keywordtype">size_t</span> alignment, <span class="keywordtype">size_t</span> offset);</div>
-<div class="line"><a name="l00659"></a><span class="lineno"><a class="line" href="group__zeroinit.html#ga3e7e5c291acf1c7fd7ffd9914a9f945f">  659</a></span>&#160;<span class="keywordtype">void</span>* <a class="code" href="group__zeroinit.html#ga3e7e5c291acf1c7fd7ffd9914a9f945f">mi_recalloc_aligned</a>(<span class="keywordtype">void</span>* p, <span class="keywordtype">size_t</span> newcount, <span class="keywordtype">size_t</span> size, <span class="keywordtype">size_t</span> alignment);</div>
-<div class="line"><a name="l00660"></a><span class="lineno"><a class="line" href="group__zeroinit.html#ga4ff5e92ad73585418a072c9d059e5cf9">  660</a></span>&#160;<span class="keywordtype">void</span>* <a class="code" href="group__zeroinit.html#ga4ff5e92ad73585418a072c9d059e5cf9">mi_recalloc_aligned_at</a>(<span class="keywordtype">void</span>* p, <span class="keywordtype">size_t</span> newcount, <span class="keywordtype">size_t</span> size, <span class="keywordtype">size_t</span> alignment, <span class="keywordtype">size_t</span> offset);</div>
-<div class="line"><a name="l00661"></a><span class="lineno">  661</span>&#160; </div>
-<div class="line"><a name="l00662"></a><span class="lineno"><a class="line" href="group__zeroinit.html#gacfad83f14eb5d6a42a497a898e19fc76">  662</a></span>&#160;<span class="keywordtype">void</span>* <a class="code" href="group__zeroinit.html#gacfad83f14eb5d6a42a497a898e19fc76">mi_heap_rezalloc</a>(<a class="code" href="group__heap.html#ga34a47cde5a5b38c29f1aa3c5e76943c2">mi_heap_t</a>* heap, <span class="keywordtype">void</span>* p, <span class="keywordtype">size_t</span> newsize);</div>
-<div class="line"><a name="l00663"></a><span class="lineno"><a class="line" href="group__zeroinit.html#ga8648c5fbb22a80f0262859099f06dfbd">  663</a></span>&#160;<span class="keywordtype">void</span>* <a class="code" href="group__zeroinit.html#ga8648c5fbb22a80f0262859099f06dfbd">mi_heap_recalloc</a>(<a class="code" href="group__heap.html#ga34a47cde5a5b38c29f1aa3c5e76943c2">mi_heap_t</a>* heap, <span class="keywordtype">void</span>* p, <span class="keywordtype">size_t</span> newcount, <span class="keywordtype">size_t</span> size);</div>
-<div class="line"><a name="l00664"></a><span class="lineno">  664</span>&#160; </div>
-<div class="line"><a name="l00665"></a><span class="lineno"><a class="line" href="group__zeroinit.html#ga375fa8a611c51905e592d5d467c49664">  665</a></span>&#160;<span class="keywordtype">void</span>* <a class="code" href="group__zeroinit.html#ga375fa8a611c51905e592d5d467c49664">mi_heap_rezalloc_aligned</a>(<a class="code" href="group__heap.html#ga34a47cde5a5b38c29f1aa3c5e76943c2">mi_heap_t</a>* heap, <span class="keywordtype">void</span>* p, <span class="keywordtype">size_t</span> newsize, <span class="keywordtype">size_t</span> alignment);</div>
-<div class="line"><a name="l00666"></a><span class="lineno"><a class="line" href="group__zeroinit.html#gac90da54fa7e5d10bdc97ce0b51dce2eb">  666</a></span>&#160;<span class="keywordtype">void</span>* <a class="code" href="group__zeroinit.html#gac90da54fa7e5d10bdc97ce0b51dce2eb">mi_heap_rezalloc_aligned_at</a>(<a class="code" href="group__heap.html#ga34a47cde5a5b38c29f1aa3c5e76943c2">mi_heap_t</a>* heap, <span class="keywordtype">void</span>* p, <span class="keywordtype">size_t</span> newsize, <span class="keywordtype">size_t</span> alignment, <span class="keywordtype">size_t</span> offset);</div>
-<div class="line"><a name="l00667"></a><span class="lineno"><a class="line" href="group__zeroinit.html#ga9f3f999396c8f77ca5e80e7b40ac29e3">  667</a></span>&#160;<span class="keywordtype">void</span>* <a class="code" href="group__zeroinit.html#ga9f3f999396c8f77ca5e80e7b40ac29e3">mi_heap_recalloc_aligned</a>(<a class="code" href="group__heap.html#ga34a47cde5a5b38c29f1aa3c5e76943c2">mi_heap_t</a>* heap, <span class="keywordtype">void</span>* p, <span class="keywordtype">size_t</span> newcount, <span class="keywordtype">size_t</span> size, <span class="keywordtype">size_t</span> alignment);</div>
-<div class="line"><a name="l00668"></a><span class="lineno"><a class="line" href="group__zeroinit.html#ga496452c96f1de8c500be9fddf52edaf7">  668</a></span>&#160;<span class="keywordtype">void</span>* <a class="code" href="group__zeroinit.html#ga496452c96f1de8c500be9fddf52edaf7">mi_heap_recalloc_aligned_at</a>(<a class="code" href="group__heap.html#ga34a47cde5a5b38c29f1aa3c5e76943c2">mi_heap_t</a>* heap, <span class="keywordtype">void</span>* p, <span class="keywordtype">size_t</span> newcount, <span class="keywordtype">size_t</span> size, <span class="keywordtype">size_t</span> alignment, <span class="keywordtype">size_t</span> offset);</div>
-<div class="line"><a name="l00669"></a><span class="lineno">  669</span>&#160; </div>
-<div class="line"><a name="l00671"></a><span class="lineno">  671</span>&#160; </div>
-<div class="line"><a name="l00680"></a><span class="lineno">  680</span>&#160; </div>
-<div class="line"><a name="l00692"></a><span class="lineno"><a class="line" href="group__typed.html#ga0619a62c5fd886f1016030abe91f0557">  692</a></span>&#160;<span class="preprocessor">#define mi_malloc_tp(tp)        ((tp*)mi_malloc(sizeof(tp)))</span></div>
-<div class="line"><a name="l00693"></a><span class="lineno">  693</span>&#160; </div>
-<div class="line"><a name="l00695"></a><span class="lineno"><a class="line" href="group__typed.html#gac77a61bdaf680a803785fe307820b48c">  695</a></span>&#160;<span class="preprocessor">#define mi_zalloc_tp(tp)        ((tp*)mi_zalloc(sizeof(tp)))</span></div>
-<div class="line"><a name="l00696"></a><span class="lineno">  696</span>&#160; </div>
-<div class="line"><a name="l00698"></a><span class="lineno"><a class="line" href="group__typed.html#gae80c47c9d4cab10961fff1a8ac98fc07">  698</a></span>&#160;<span class="preprocessor">#define mi_calloc_tp(tp,count)      ((tp*)mi_calloc(count,sizeof(tp)))</span></div>
-<div class="line"><a name="l00699"></a><span class="lineno">  699</span>&#160; </div>
-<div class="line"><a name="l00701"></a><span class="lineno"><a class="line" href="group__typed.html#gae5cb6e0fafc9f23169c5622e077afe8b">  701</a></span>&#160;<span class="preprocessor">#define mi_mallocn_tp(tp,count)     ((tp*)mi_mallocn(count,sizeof(tp)))</span></div>
-<div class="line"><a name="l00702"></a><span class="lineno">  702</span>&#160; </div>
-<div class="line"><a name="l00704"></a><span class="lineno"><a class="line" href="group__typed.html#ga1158b49a55dfa81f58a4426a7578f523">  704</a></span>&#160;<span class="preprocessor">#define mi_reallocn_tp(p,tp,count)  ((tp*)mi_reallocn(p,count,sizeof(tp)))</span></div>
-<div class="line"><a name="l00705"></a><span class="lineno">  705</span>&#160; </div>
-<div class="line"><a name="l00707"></a><span class="lineno"><a class="line" href="group__typed.html#ga653bcb24ac495bc19940ecd6898f9cd7">  707</a></span>&#160;<span class="preprocessor">#define mi_heap_malloc_tp(hp,tp)        ((tp*)mi_heap_malloc(hp,sizeof(tp)))</span></div>
-<div class="line"><a name="l00708"></a><span class="lineno">  708</span>&#160; </div>
-<div class="line"><a name="l00710"></a><span class="lineno"><a class="line" href="group__typed.html#gad6e87e86e994aa14416ae9b5d4c188fe">  710</a></span>&#160;<span class="preprocessor">#define mi_heap_zalloc_tp(hp,tp)        ((tp*)mi_heap_zalloc(hp,sizeof(tp)))</span></div>
-<div class="line"><a name="l00711"></a><span class="lineno">  711</span>&#160; </div>
-<div class="line"><a name="l00713"></a><span class="lineno"><a class="line" href="group__typed.html#ga4e5d1f1707c90e5f55e023ac5f45fe74">  713</a></span>&#160;<span class="preprocessor">#define mi_heap_calloc_tp(hp,tp,count)      ((tp*)mi_heap_calloc(hp,count,sizeof(tp)))</span></div>
-<div class="line"><a name="l00714"></a><span class="lineno">  714</span>&#160; </div>
-<div class="line"><a name="l00716"></a><span class="lineno"><a class="line" href="group__typed.html#ga6b75cb9c4b9c647661d0924552dc6e83">  716</a></span>&#160;<span class="preprocessor">#define mi_heap_mallocn_tp(hp,tp,count)     ((tp*)mi_heap_mallocn(hp,count,sizeof(tp)))</span></div>
-<div class="line"><a name="l00717"></a><span class="lineno">  717</span>&#160; </div>
-<div class="line"><a name="l00719"></a><span class="lineno"><a class="line" href="group__typed.html#gaf213d5422ec35e7f6caad827c79bc948">  719</a></span>&#160;<span class="preprocessor">#define mi_heap_reallocn_tp(hp,p,tp,count)  ((tp*)mi_heap_reallocn(p,count,sizeof(tp)))</span></div>
-<div class="line"><a name="l00720"></a><span class="lineno">  720</span>&#160; </div>
-<div class="line"><a name="l00722"></a><span class="lineno"><a class="line" href="group__typed.html#ga3e50a1600958fcaf1a7f3560c9174f9e">  722</a></span>&#160;<span class="preprocessor">#define mi_heap_recalloc_tp(hp,p,tp,count)  ((tp*)mi_heap_recalloc(p,count,sizeof(tp)))</span></div>
-<div class="line"><a name="l00723"></a><span class="lineno">  723</span>&#160; </div>
-<div class="line"><a name="l00725"></a><span class="lineno">  725</span>&#160; </div>
-<div class="line"><a name="l00731"></a><span class="lineno">  731</span>&#160; </div>
-<div class="line"><a name="l00738"></a><span class="lineno"><a class="line" href="group__analysis.html#gaa862aa8ed8d57d84cae41fc1022d71af">  738</a></span>&#160;<span class="keywordtype">bool</span> <a class="code" href="group__analysis.html#gaa862aa8ed8d57d84cae41fc1022d71af">mi_heap_contains_block</a>(<a class="code" href="group__heap.html#ga34a47cde5a5b38c29f1aa3c5e76943c2">mi_heap_t</a>* heap, <span class="keyword">const</span> <span class="keywordtype">void</span>* p);</div>
-<div class="line"><a name="l00739"></a><span class="lineno">  739</span>&#160; </div>
-<div class="line"><a name="l00748"></a><span class="lineno"><a class="line" href="group__analysis.html#ga0d67c1789faaa15ff366c024fcaf6377">  748</a></span>&#160;<span class="keywordtype">bool</span> <a class="code" href="group__analysis.html#ga0d67c1789faaa15ff366c024fcaf6377">mi_heap_check_owned</a>(<a class="code" href="group__heap.html#ga34a47cde5a5b38c29f1aa3c5e76943c2">mi_heap_t</a>* heap, <span class="keyword">const</span> <span class="keywordtype">void</span>* p);</div>
-<div class="line"><a name="l00749"></a><span class="lineno">  749</span>&#160; </div>
-<div class="line"><a name="l00757"></a><span class="lineno"><a class="line" href="group__analysis.html#ga628c237489c2679af84a4d0d143b3dd5">  757</a></span>&#160;<span class="keywordtype">bool</span> <a class="code" href="group__analysis.html#ga628c237489c2679af84a4d0d143b3dd5">mi_check_owned</a>(<span class="keyword">const</span> <span class="keywordtype">void</span>* p);</div>
-<div class="line"><a name="l00758"></a><span class="lineno">  758</span>&#160; </div>
-<div class="line"><a name="l00761"></a><span class="lineno"><a class="line" href="group__analysis.html">  761</a></span>&#160;<span class="keyword">typedef</span> <span class="keyword">struct </span>mi_heap_area_s {</div>
-<div class="line"><a name="l00762"></a><span class="lineno"><a class="line" href="group__analysis.html#ae0085e6e1cf059a4eb7767e30e9991b8">  762</a></span>&#160;  <span class="keywordtype">void</span>*  <a class="code" href="group__analysis.html#ae0085e6e1cf059a4eb7767e30e9991b8">blocks</a>;      </div>
-<div class="line"><a name="l00763"></a><span class="lineno"><a class="line" href="group__analysis.html#ae848a3e6840414891035423948ca0383">  763</a></span>&#160;  <span class="keywordtype">size_t</span> <a class="code" href="group__analysis.html#ae848a3e6840414891035423948ca0383">reserved</a>;    </div>
-<div class="line"><a name="l00764"></a><span class="lineno"><a class="line" href="group__analysis.html#ab47526df656d8837ec3e97f11b83f835">  764</a></span>&#160;  <span class="keywordtype">size_t</span> <a class="code" href="group__analysis.html#ab47526df656d8837ec3e97f11b83f835">committed</a>;   </div>
-<div class="line"><a name="l00765"></a><span class="lineno"><a class="line" href="group__analysis.html#ab820302c5cd0df133eb8e51650a008b4">  765</a></span>&#160;  <span class="keywordtype">size_t</span> <a class="code" href="group__analysis.html#ab820302c5cd0df133eb8e51650a008b4">used</a>;        </div>
-<div class="line"><a name="l00766"></a><span class="lineno"><a class="line" href="group__analysis.html#a332a6c14d736a99699d5453a1cb04b41">  766</a></span>&#160;  <span class="keywordtype">size_t</span> <a class="code" href="group__analysis.html#a332a6c14d736a99699d5453a1cb04b41">block_size</a>;  </div>
-<div class="line"><a name="l00767"></a><span class="lineno">  767</span>&#160;} <a class="code" href="group__analysis.html#structmi__heap__area__t">mi_heap_area_t</a>;</div>
-<div class="line"><a name="l00768"></a><span class="lineno">  768</span>&#160; </div>
-<div class="line"><a name="l00776"></a><span class="lineno"><a class="line" href="group__analysis.html#gadfa01e2900f0e5d515ad5506b26f6d65">  776</a></span>&#160;<span class="keyword">typedef</span> bool (<a class="code" href="group__analysis.html#gadfa01e2900f0e5d515ad5506b26f6d65">mi_block_visit_fun</a>)(<span class="keyword">const</span> <a class="code" href="group__heap.html#ga34a47cde5a5b38c29f1aa3c5e76943c2">mi_heap_t</a>* heap, <span class="keyword">const</span> <a class="code" href="group__analysis.html#structmi__heap__area__t">mi_heap_area_t</a>* area, <span class="keywordtype">void</span>* block, <span class="keywordtype">size_t</span> block_size, <span class="keywordtype">void</span>* arg);</div>
-<div class="line"><a name="l00777"></a><span class="lineno">  777</span>&#160; </div>
-<div class="line"><a name="l00789"></a><span class="lineno"><a class="line" href="group__analysis.html#ga70c46687dc6e9dc98b232b02646f8bed">  789</a></span>&#160;<span class="keywordtype">bool</span> <a class="code" href="group__analysis.html#ga70c46687dc6e9dc98b232b02646f8bed">mi_heap_visit_blocks</a>(<span class="keyword">const</span> <a class="code" href="group__heap.html#ga34a47cde5a5b38c29f1aa3c5e76943c2">mi_heap_t</a>* heap, <span class="keywordtype">bool</span> visit_all_blocks, <a class="code" href="group__analysis.html#gadfa01e2900f0e5d515ad5506b26f6d65">mi_block_visit_fun</a>* visitor, <span class="keywordtype">void</span>* arg);</div>
-<div class="line"><a name="l00790"></a><span class="lineno">  790</span>&#160; </div>
-<div class="line"><a name="l00792"></a><span class="lineno">  792</span>&#160; </div>
-<div class="line"><a name="l00798"></a><span class="lineno">  798</span>&#160; </div>
-<div class="line"><a name="l00800"></a><span class="lineno"><a class="line" href="group__options.html#gafebf7ed116adb38ae5218bc3ce06884c">  800</a></span>&#160;<span class="keyword">typedef</span> <span class="keyword">enum</span> mi_option_e {</div>
-<div class="line"><a name="l00801"></a><span class="lineno">  801</span>&#160;  <span class="comment">// stable options</span></div>
-<div class="line"><a name="l00802"></a><span class="lineno"><a class="line" href="group__options.html#ggafebf7ed116adb38ae5218bc3ce06884cafbf4822e5c00732c5984b32a032837f0">  802</a></span>&#160;  <a class="code" href="group__options.html#ggafebf7ed116adb38ae5218bc3ce06884cafbf4822e5c00732c5984b32a032837f0">mi_option_show_errors</a>,  </div>
-<div class="line"><a name="l00803"></a><span class="lineno"><a class="line" href="group__options.html#ggafebf7ed116adb38ae5218bc3ce06884ca0957ef73b2550764b4840edf48422fda">  803</a></span>&#160;  <a class="code" href="group__options.html#ggafebf7ed116adb38ae5218bc3ce06884ca0957ef73b2550764b4840edf48422fda">mi_option_show_stats</a>,   </div>
-<div class="line"><a name="l00804"></a><span class="lineno"><a class="line" href="group__options.html#ggafebf7ed116adb38ae5218bc3ce06884ca7c8b7bf5281c581bad64f5daa6442777">  804</a></span>&#160;  <a class="code" href="group__options.html#ggafebf7ed116adb38ae5218bc3ce06884ca7c8b7bf5281c581bad64f5daa6442777">mi_option_verbose</a>,      </div>
-<div class="line"><a name="l00805"></a><span class="lineno">  805</span>&#160;  <span class="comment">// the following options are experimental</span></div>
-<div class="line"><a name="l00806"></a><span class="lineno"><a class="line" href="group__options.html#ggafebf7ed116adb38ae5218bc3ce06884ca1e8de72c93da7ff22d91e1e27b52ac2b">  806</a></span>&#160;  <a class="code" href="group__options.html#ggafebf7ed116adb38ae5218bc3ce06884ca1e8de72c93da7ff22d91e1e27b52ac2b">mi_option_eager_commit</a>, </div>
-<div class="line"><a name="l00807"></a><span class="lineno"><a class="line" href="group__options.html#ggafebf7ed116adb38ae5218bc3ce06884ca32ce97ece29f69e82579679cf8a307ad">  807</a></span>&#160;  <a class="code" href="group__options.html#ggafebf7ed116adb38ae5218bc3ce06884ca32ce97ece29f69e82579679cf8a307ad">mi_option_eager_region_commit</a>, </div>
-<div class="line"><a name="l00808"></a><span class="lineno"><a class="line" href="group__options.html#ggafebf7ed116adb38ae5218bc3ce06884ca4192d491200d0055df0554d4cf65054e">  808</a></span>&#160;  <a class="code" href="group__options.html#ggafebf7ed116adb38ae5218bc3ce06884ca4192d491200d0055df0554d4cf65054e">mi_option_large_os_pages</a>,      </div>
-<div class="line"><a name="l00809"></a><span class="lineno"><a class="line" href="group__options.html#ggafebf7ed116adb38ae5218bc3ce06884caca7ed041be3b0b9d0b82432c7bf41af2">  809</a></span>&#160;  <a class="code" href="group__options.html#ggafebf7ed116adb38ae5218bc3ce06884caca7ed041be3b0b9d0b82432c7bf41af2">mi_option_reserve_huge_os_pages</a>, </div>
-<div class="line"><a name="l00810"></a><span class="lineno"><a class="line" href="group__options.html#ggafebf7ed116adb38ae5218bc3ce06884caa13e7926d4339d2aa6fbf61d4473fd5c">  810</a></span>&#160;  <a class="code" href="group__options.html#ggafebf7ed116adb38ae5218bc3ce06884caa13e7926d4339d2aa6fbf61d4473fd5c">mi_option_reserve_huge_os_pages_at</a>, </div>
-<div class="line"><a name="l00811"></a><span class="lineno"><a class="line" href="group__options.html#ggafebf7ed116adb38ae5218bc3ce06884ca2ecbe7ef32f5c84de3739aa4f0b805a1">  811</a></span>&#160;  <a class="code" href="group__options.html#ggafebf7ed116adb38ae5218bc3ce06884ca2ecbe7ef32f5c84de3739aa4f0b805a1">mi_option_segment_cache</a>,   </div>
-<div class="line"><a name="l00812"></a><span class="lineno"><a class="line" href="group__options.html#ggafebf7ed116adb38ae5218bc3ce06884cada854dd272c66342f18a93ee254a2968">  812</a></span>&#160;  <a class="code" href="group__options.html#ggafebf7ed116adb38ae5218bc3ce06884cada854dd272c66342f18a93ee254a2968">mi_option_page_reset</a>,      </div>
-<div class="line"><a name="l00813"></a><span class="lineno"><a class="line" href="group__options.html#ggafebf7ed116adb38ae5218bc3ce06884cafb121d30d87591850d5410ccc3a95c6d">  813</a></span>&#160;  <a class="code" href="group__options.html#ggafebf7ed116adb38ae5218bc3ce06884cafb121d30d87591850d5410ccc3a95c6d">mi_option_segment_reset</a>,   </div>
-<div class="line"><a name="l00814"></a><span class="lineno"><a class="line" href="group__options.html#ggafebf7ed116adb38ae5218bc3ce06884ca154fe170131d5212cff57e22b99523c5">  814</a></span>&#160;  <a class="code" href="group__options.html#ggafebf7ed116adb38ae5218bc3ce06884ca154fe170131d5212cff57e22b99523c5">mi_option_reset_delay</a>,     </div>
-<div class="line"><a name="l00815"></a><span class="lineno"><a class="line" href="group__options.html#ggafebf7ed116adb38ae5218bc3ce06884ca0ac33a18f6b659fcfaf44efb0bab1b74">  815</a></span>&#160;  <a class="code" href="group__options.html#ggafebf7ed116adb38ae5218bc3ce06884ca0ac33a18f6b659fcfaf44efb0bab1b74">mi_option_use_numa_nodes</a>,  </div>
-<div class="line"><a name="l00816"></a><span class="lineno"><a class="line" href="group__options.html#ggafebf7ed116adb38ae5218bc3ce06884cac81ee965b130fa81238913a3c239d536">  816</a></span>&#160;  <a class="code" href="group__options.html#ggafebf7ed116adb38ae5218bc3ce06884cac81ee965b130fa81238913a3c239d536">mi_option_reset_decommits</a>, </div>
-<div class="line"><a name="l00817"></a><span class="lineno"><a class="line" href="group__options.html#ggafebf7ed116adb38ae5218bc3ce06884ca17a190c25be381142d87e0468c4c068c">  817</a></span>&#160;  <a class="code" href="group__options.html#ggafebf7ed116adb38ae5218bc3ce06884ca17a190c25be381142d87e0468c4c068c">mi_option_eager_commit_delay</a>,  </div>
-<div class="line"><a name="l00818"></a><span class="lineno"><a class="line" href="group__options.html#ggafebf7ed116adb38ae5218bc3ce06884ca4b74ae2a69e445de6c2361b73c1d14bf">  818</a></span>&#160;  <a class="code" href="group__options.html#ggafebf7ed116adb38ae5218bc3ce06884ca4b74ae2a69e445de6c2361b73c1d14bf">mi_option_os_tag</a>,          </div>
-<div class="line"><a name="l00819"></a><span class="lineno">  819</span>&#160;  <a class="code" href="group__options.html#ggafebf7ed116adb38ae5218bc3ce06884ca5b4357b74be0d87568036c32eb1a2e4a">_mi_option_last</a></div>
-<div class="line"><a name="l00820"></a><span class="lineno"><a class="line" href="group__options.html#ggafebf7ed116adb38ae5218bc3ce06884ca5b4357b74be0d87568036c32eb1a2e4a">  820</a></span>&#160;} <a class="code" href="group__options.html#gafebf7ed116adb38ae5218bc3ce06884c">mi_option_t</a>;</div>
-<div class="line"><a name="l00821"></a><span class="lineno">  821</span>&#160; </div>
-<div class="line"><a name="l00822"></a><span class="lineno">  822</span>&#160; </div>
-<div class="line"><a name="l00823"></a><span class="lineno"><a class="line" href="group__options.html#ga459ad98f18b3fc9275474807fe0ca188">  823</a></span>&#160;<span class="keywordtype">bool</span>  <a class="code" href="group__options.html#ga459ad98f18b3fc9275474807fe0ca188">mi_option_is_enabled</a>(<a class="code" href="group__options.html#gafebf7ed116adb38ae5218bc3ce06884c">mi_option_t</a> option);</div>
-<div class="line"><a name="l00824"></a><span class="lineno"><a class="line" href="group__options.html#ga04180ae41b0d601421dd62ced40ca050">  824</a></span>&#160;<span class="keywordtype">void</span>  <a class="code" href="group__options.html#ga04180ae41b0d601421dd62ced40ca050">mi_option_enable</a>(<a class="code" href="group__options.html#gafebf7ed116adb38ae5218bc3ce06884c">mi_option_t</a> option);</div>
-<div class="line"><a name="l00825"></a><span class="lineno"><a class="line" href="group__options.html#gaebf6ff707a2e688ebb1a2296ca564054">  825</a></span>&#160;<span class="keywordtype">void</span>  <a class="code" href="group__options.html#gaebf6ff707a2e688ebb1a2296ca564054">mi_option_disable</a>(<a class="code" href="group__options.html#gafebf7ed116adb38ae5218bc3ce06884c">mi_option_t</a> option);</div>
-<div class="line"><a name="l00826"></a><span class="lineno"><a class="line" href="group__options.html#ga9a13d05fcb77489cb06d4d017ebd8bed">  826</a></span>&#160;<span class="keywordtype">void</span>  <a class="code" href="group__options.html#ga9a13d05fcb77489cb06d4d017ebd8bed">mi_option_set_enabled</a>(<a class="code" href="group__options.html#gafebf7ed116adb38ae5218bc3ce06884c">mi_option_t</a> option, <span class="keywordtype">bool</span> enable);</div>
-<div class="line"><a name="l00827"></a><span class="lineno"><a class="line" href="group__options.html#ga65518b69ec5d32336b50e07f74b3f629">  827</a></span>&#160;<span class="keywordtype">void</span>  <a class="code" href="group__options.html#ga65518b69ec5d32336b50e07f74b3f629">mi_option_set_enabled_default</a>(<a class="code" href="group__options.html#gafebf7ed116adb38ae5218bc3ce06884c">mi_option_t</a> option, <span class="keywordtype">bool</span> enable);</div>
-<div class="line"><a name="l00828"></a><span class="lineno">  828</span>&#160; </div>
-<div class="line"><a name="l00829"></a><span class="lineno"><a class="line" href="group__options.html#ga7e8af195cc81d3fa64ccf2662caa565a">  829</a></span>&#160;<span class="keywordtype">long</span>  <a class="code" href="group__options.html#ga7e8af195cc81d3fa64ccf2662caa565a">mi_option_get</a>(<a class="code" href="group__options.html#gafebf7ed116adb38ae5218bc3ce06884c">mi_option_t</a> option);</div>
-<div class="line"><a name="l00830"></a><span class="lineno"><a class="line" href="group__options.html#gaf84921c32375e25754dc2ee6a911fa60">  830</a></span>&#160;<span class="keywordtype">void</span>  <a class="code" href="group__options.html#gaf84921c32375e25754dc2ee6a911fa60">mi_option_set</a>(<a class="code" href="group__options.html#gafebf7ed116adb38ae5218bc3ce06884c">mi_option_t</a> option, <span class="keywordtype">long</span> value);</div>
-<div class="line"><a name="l00831"></a><span class="lineno"><a class="line" href="group__options.html#ga7ef623e440e6e5545cb08c94e71e4b90">  831</a></span>&#160;<span class="keywordtype">void</span>  <a class="code" href="group__options.html#ga7ef623e440e6e5545cb08c94e71e4b90">mi_option_set_default</a>(<a class="code" href="group__options.html#gafebf7ed116adb38ae5218bc3ce06884c">mi_option_t</a> option, <span class="keywordtype">long</span> value);</div>
-<div class="line"><a name="l00832"></a><span class="lineno">  832</span>&#160; </div>
-<div class="line"><a name="l00833"></a><span class="lineno">  833</span>&#160; </div>
-<div class="line"><a name="l00835"></a><span class="lineno">  835</span>&#160; </div>
-<div class="line"><a name="l00842"></a><span class="lineno">  842</span>&#160; </div>
-<div class="line"><a name="l00843"></a><span class="lineno">  843</span>&#160;<span class="keywordtype">void</span>*  <a class="code" href="group__malloc.html#ga23a0fbb452b5dce8e31fab1a1958cacc">mi_recalloc</a>(<span class="keywordtype">void</span>* p, <span class="keywordtype">size_t</span> count, <span class="keywordtype">size_t</span> size);</div>
-<div class="line"><a name="l00844"></a><span class="lineno"><a class="line" href="group__posix.html#ga4531c9e775bb3ae12db57c1ba8a5d7de">  844</a></span>&#160;<span class="keywordtype">size_t</span> <a class="code" href="group__posix.html#ga4531c9e775bb3ae12db57c1ba8a5d7de">mi_malloc_size</a>(<span class="keyword">const</span> <span class="keywordtype">void</span>* p);</div>
-<div class="line"><a name="l00845"></a><span class="lineno"><a class="line" href="group__posix.html#ga06d07cf357bbac5c73ba5d0c0c421e17">  845</a></span>&#160;<span class="keywordtype">size_t</span> <a class="code" href="group__posix.html#ga06d07cf357bbac5c73ba5d0c0c421e17">mi_malloc_usable_size</a>(<span class="keyword">const</span> <span class="keywordtype">void</span> *p);</div>
-<div class="line"><a name="l00846"></a><span class="lineno">  846</span>&#160; </div>
-<div class="line"><a name="l00848"></a><span class="lineno"><a class="line" href="group__posix.html#ga705dc7a64bffacfeeb0141501a5c35d7">  848</a></span>&#160;<span class="keywordtype">void</span>   <a class="code" href="group__posix.html#ga705dc7a64bffacfeeb0141501a5c35d7">mi_cfree</a>(<span class="keywordtype">void</span>* p);</div>
-<div class="line"><a name="l00849"></a><span class="lineno">  849</span>&#160; </div>
-<div class="line"><a name="l00850"></a><span class="lineno"><a class="line" href="group__posix.html#gacff84f226ba9feb2031b8992e5579447">  850</a></span>&#160;<span class="keywordtype">int</span> <a class="code" href="group__posix.html#gacff84f226ba9feb2031b8992e5579447">mi_posix_memalign</a>(<span class="keywordtype">void</span>** p, <span class="keywordtype">size_t</span> alignment, <span class="keywordtype">size_t</span> size);</div>
-<div class="line"><a name="l00851"></a><span class="lineno"><a class="line" href="group__posix.html#gad5a69c8fea96aa2b7a7c818c2130090a">  851</a></span>&#160;<span class="keywordtype">int</span> <a class="code" href="group__posix.html#gad5a69c8fea96aa2b7a7c818c2130090a">mi__posix_memalign</a>(<span class="keywordtype">void</span>** p, <span class="keywordtype">size_t</span> alignment, <span class="keywordtype">size_t</span> size);</div>
-<div class="line"><a name="l00852"></a><span class="lineno"><a class="line" href="group__posix.html#gaab7fa71ea93b96873f5d9883db57d40e">  852</a></span>&#160;<span class="keywordtype">void</span>* <a class="code" href="group__posix.html#gaab7fa71ea93b96873f5d9883db57d40e">mi_memalign</a>(<span class="keywordtype">size_t</span> alignment, <span class="keywordtype">size_t</span> size);</div>
-<div class="line"><a name="l00853"></a><span class="lineno"><a class="line" href="group__posix.html#ga73baaf5951f5165ba0763d0c06b6a93b">  853</a></span>&#160;<span class="keywordtype">void</span>* <a class="code" href="group__posix.html#ga73baaf5951f5165ba0763d0c06b6a93b">mi_valloc</a>(<span class="keywordtype">size_t</span> size);</div>
-<div class="line"><a name="l00854"></a><span class="lineno">  854</span>&#160; </div>
-<div class="line"><a name="l00855"></a><span class="lineno"><a class="line" href="group__posix.html#gaeb325c39b887d3b90d85d1eb1712fb1e">  855</a></span>&#160;<span class="keywordtype">void</span>* <a class="code" href="group__posix.html#gaeb325c39b887d3b90d85d1eb1712fb1e">mi_pvalloc</a>(<span class="keywordtype">size_t</span> size);</div>
-<div class="line"><a name="l00856"></a><span class="lineno"><a class="line" href="group__posix.html#ga1326d2e4388630b5f81ca7206318b8e5">  856</a></span>&#160;<span class="keywordtype">void</span>* <a class="code" href="group__posix.html#ga1326d2e4388630b5f81ca7206318b8e5">mi_aligned_alloc</a>(<span class="keywordtype">size_t</span> alignment, <span class="keywordtype">size_t</span> size);</div>
-<div class="line"><a name="l00857"></a><span class="lineno">  857</span>&#160; </div>
-<div class="line"><a name="l00860"></a><span class="lineno"><a class="line" href="group__posix.html#ga48fad8648a2f1dab9c87ea9448a52088">  860</a></span>&#160;<span class="keywordtype">void</span>* <a class="code" href="group__posix.html#ga48fad8648a2f1dab9c87ea9448a52088">mi_reallocarray</a>(<span class="keywordtype">void</span>* p, <span class="keywordtype">size_t</span> count, <span class="keywordtype">size_t</span> size);</div>
-<div class="line"><a name="l00861"></a><span class="lineno">  861</span>&#160; </div>
-<div class="line"><a name="l00863"></a><span class="lineno"><a class="line" href="group__posix.html#ga7e1934d60a3e697950eeb48e042bfad5">  863</a></span>&#160;<span class="keywordtype">int</span>   <a class="code" href="group__posix.html#ga7e1934d60a3e697950eeb48e042bfad5">mi_reallocarr</a>(<span class="keywordtype">void</span>* p, <span class="keywordtype">size_t</span> count, <span class="keywordtype">size_t</span> size);</div>
-<div class="line"><a name="l00864"></a><span class="lineno">  864</span>&#160; </div>
-<div class="line"><a name="l00865"></a><span class="lineno"><a class="line" href="group__posix.html#gae01389eedab8d67341ff52e2aad80ebb">  865</a></span>&#160;<span class="keywordtype">void</span> <a class="code" href="group__posix.html#gae01389eedab8d67341ff52e2aad80ebb">mi_free_size</a>(<span class="keywordtype">void</span>* p, <span class="keywordtype">size_t</span> size);</div>
-<div class="line"><a name="l00866"></a><span class="lineno"><a class="line" href="group__posix.html#ga72e9d7ffb5fe94d69bc722c8506e27bc">  866</a></span>&#160;<span class="keywordtype">void</span> <a class="code" href="group__posix.html#ga72e9d7ffb5fe94d69bc722c8506e27bc">mi_free_size_aligned</a>(<span class="keywordtype">void</span>* p, <span class="keywordtype">size_t</span> size, <span class="keywordtype">size_t</span> alignment);</div>
-<div class="line"><a name="l00867"></a><span class="lineno"><a class="line" href="group__posix.html#ga0d28d5cf61e6bfbb18c63092939fe5c9">  867</a></span>&#160;<span class="keywordtype">void</span> <a class="code" href="group__posix.html#ga0d28d5cf61e6bfbb18c63092939fe5c9">mi_free_aligned</a>(<span class="keywordtype">void</span>* p, <span class="keywordtype">size_t</span> alignment);</div>
-<div class="line"><a name="l00868"></a><span class="lineno">  868</span>&#160; </div>
-<div class="line"><a name="l00870"></a><span class="lineno">  870</span>&#160; </div>
-<div class="line"><a name="l00883"></a><span class="lineno">  883</span>&#160; </div>
-<div class="line"><a name="l00885"></a><span class="lineno"><a class="line" href="group__cpp.html#gaad048a9fce3d02c5909cd05c6ec24545">  885</a></span>&#160;<span class="keywordtype">void</span>* <a class="code" href="group__cpp.html#gaad048a9fce3d02c5909cd05c6ec24545">mi_new</a>(std::size_t n) noexcept(<span class="keyword">false</span>);</div>
-<div class="line"><a name="l00886"></a><span class="lineno">  886</span>&#160; </div>
-<div class="line"><a name="l00888"></a><span class="lineno"><a class="line" href="group__cpp.html#gae7bc4f56cd57ed3359060ff4f38bda81">  888</a></span>&#160;<span class="keywordtype">void</span>* <a class="code" href="group__cpp.html#gae7bc4f56cd57ed3359060ff4f38bda81">mi_new_n</a>(<span class="keywordtype">size_t</span> count, <span class="keywordtype">size_t</span> size) noexcept(<span class="keyword">false</span>);</div>
-<div class="line"><a name="l00889"></a><span class="lineno">  889</span>&#160; </div>
-<div class="line"><a name="l00891"></a><span class="lineno"><a class="line" href="group__cpp.html#gaef2c2bdb4f70857902d3c8903ac095f3">  891</a></span>&#160;<span class="keywordtype">void</span>* <a class="code" href="group__cpp.html#gaef2c2bdb4f70857902d3c8903ac095f3">mi_new_aligned</a>(std::size_t n, std::align_val_t alignment) noexcept(<span class="keyword">false</span>);</div>
-<div class="line"><a name="l00892"></a><span class="lineno">  892</span>&#160; </div>
-<div class="line"><a name="l00894"></a><span class="lineno"><a class="line" href="group__cpp.html#gaeaded64eda71ed6b1d569d3e723abc4a">  894</a></span>&#160;<span class="keywordtype">void</span>* <a class="code" href="group__cpp.html#gaeaded64eda71ed6b1d569d3e723abc4a">mi_new_nothrow</a>(<span class="keywordtype">size_t</span> n);</div>
-<div class="line"><a name="l00895"></a><span class="lineno">  895</span>&#160; </div>
-<div class="line"><a name="l00897"></a><span class="lineno"><a class="line" href="group__cpp.html#gab5e29558926d934c3f1cae8c815f942c">  897</a></span>&#160;<span class="keywordtype">void</span>* <a class="code" href="group__cpp.html#gab5e29558926d934c3f1cae8c815f942c">mi_new_aligned_nothrow</a>(<span class="keywordtype">size_t</span> n, <span class="keywordtype">size_t</span> alignment);</div>
-<div class="line"><a name="l00898"></a><span class="lineno">  898</span>&#160; </div>
-<div class="line"><a name="l00900"></a><span class="lineno"><a class="line" href="group__cpp.html#gaab78a32f55149e9fbf432d5288e38e1e">  900</a></span>&#160;<span class="keywordtype">void</span>* <a class="code" href="group__cpp.html#gaab78a32f55149e9fbf432d5288e38e1e">mi_new_realloc</a>(<span class="keywordtype">void</span>* p, <span class="keywordtype">size_t</span> newsize);</div>
-<div class="line"><a name="l00901"></a><span class="lineno">  901</span>&#160; </div>
-<div class="line"><a name="l00903"></a><span class="lineno"><a class="line" href="group__cpp.html#ga756f4b2bc6a7ecd0a90baea8e90c7907">  903</a></span>&#160;<span class="keywordtype">void</span>* <a class="code" href="group__cpp.html#ga756f4b2bc6a7ecd0a90baea8e90c7907">mi_new_reallocn</a>(<span class="keywordtype">void</span>* p, <span class="keywordtype">size_t</span> newcount, <span class="keywordtype">size_t</span> size);</div>
-<div class="line"><a name="l00904"></a><span class="lineno">  904</span>&#160; </div>
-<div class="line"><a name="l00912"></a><span class="lineno"><a class="line" href="group__cpp.html">  912</a></span>&#160;<span class="keyword">template</span>&lt;<span class="keyword">class</span> T&gt; <span class="keyword">struct </span><a class="code" href="group__cpp.html#structmi__stl__allocator">mi_stl_allocator</a> { }</div>
-<div class="line"><a name="l00913"></a><span class="lineno">  913</span>&#160; </div>
-<div class="line"><a name="l00915"></a><span class="lineno">  915</span>&#160; </div>
-<div class="ttc" id="agroup__aligned_html_ga08647c4593f3b2eef24a919a73eba3a3"><div class="ttname"><a href="group__aligned.html#ga08647c4593f3b2eef24a919a73eba3a3">mi_calloc_aligned_at</a></div><div class="ttdeci">void * mi_calloc_aligned_at(size_t count, size_t size, size_t alignment, size_t offset)</div></div>
-<div class="ttc" id="agroup__aligned_html_ga0cadbcf5b89a7b6fb171bc8df8734819"><div class="ttname"><a href="group__aligned.html#ga0cadbcf5b89a7b6fb171bc8df8734819">mi_zalloc_aligned</a></div><div class="ttdeci">void * mi_zalloc_aligned(size_t size, size_t alignment)</div></div>
-<div class="ttc" id="agroup__aligned_html_ga4028d1cf4aa4c87c880747044a8322ae"><div class="ttname"><a href="group__aligned.html#ga4028d1cf4aa4c87c880747044a8322ae">mi_realloc_aligned</a></div><div class="ttdeci">void * mi_realloc_aligned(void *p, size_t newsize, size_t alignment)</div></div>
-<div class="ttc" id="agroup__aligned_html_ga53dddb4724042a90315b94bc268fb4c9"><div class="ttname"><a href="group__aligned.html#ga53dddb4724042a90315b94bc268fb4c9">mi_calloc_aligned</a></div><div class="ttdeci">void * mi_calloc_aligned(size_t count, size_t size, size_t alignment)</div></div>
-<div class="ttc" id="agroup__aligned_html_ga5850da130c936bd77db039dcfbc8295d"><div class="ttname"><a href="group__aligned.html#ga5850da130c936bd77db039dcfbc8295d">mi_malloc_aligned_at</a></div><div class="ttdeci">void * mi_malloc_aligned_at(size_t size, size_t alignment, size_t offset)</div><div class="ttdoc">Allocate size bytes aligned by alignment at a specified offset.</div></div>
-<div class="ttc" id="agroup__aligned_html_ga5f8c2353766db522565e642fafd8a3f8"><div class="ttname"><a href="group__aligned.html#ga5f8c2353766db522565e642fafd8a3f8">mi_zalloc_aligned_at</a></div><div class="ttdeci">void * mi_zalloc_aligned_at(size_t size, size_t alignment, size_t offset)</div></div>
-<div class="ttc" id="agroup__aligned_html_ga68930196751fa2cca9e1fd0d71bade56"><div class="ttname"><a href="group__aligned.html#ga68930196751fa2cca9e1fd0d71bade56">mi_malloc_aligned</a></div><div class="ttdeci">void * mi_malloc_aligned(size_t size, size_t alignment)</div><div class="ttdoc">Allocate size bytes aligned by alignment.</div></div>
-<div class="ttc" id="agroup__aligned_html_gaf66a9ae6c6f08bd6be6fb6ea771faffb"><div class="ttname"><a href="group__aligned.html#gaf66a9ae6c6f08bd6be6fb6ea771faffb">mi_realloc_aligned_at</a></div><div class="ttdeci">void * mi_realloc_aligned_at(void *p, size_t newsize, size_t alignment, size_t offset)</div></div>
-<div class="ttc" id="agroup__analysis_html_a332a6c14d736a99699d5453a1cb04b41"><div class="ttname"><a href="group__analysis.html#a332a6c14d736a99699d5453a1cb04b41">mi_heap_area_t::block_size</a></div><div class="ttdeci">size_t block_size</div><div class="ttdoc">size in bytes of one block</div><div class="ttdef"><b>Definition:</b> mimalloc-doc.h:766</div></div>
-<div class="ttc" id="agroup__analysis_html_ab47526df656d8837ec3e97f11b83f835"><div class="ttname"><a href="group__analysis.html#ab47526df656d8837ec3e97f11b83f835">mi_heap_area_t::committed</a></div><div class="ttdeci">size_t committed</div><div class="ttdoc">current committed bytes of this area</div><div class="ttdef"><b>Definition:</b> mimalloc-doc.h:764</div></div>
-<div class="ttc" id="agroup__analysis_html_ab820302c5cd0df133eb8e51650a008b4"><div class="ttname"><a href="group__analysis.html#ab820302c5cd0df133eb8e51650a008b4">mi_heap_area_t::used</a></div><div class="ttdeci">size_t used</div><div class="ttdoc">bytes in use by allocated blocks</div><div class="ttdef"><b>Definition:</b> mimalloc-doc.h:765</div></div>
-<div class="ttc" id="agroup__analysis_html_ae0085e6e1cf059a4eb7767e30e9991b8"><div class="ttname"><a href="group__analysis.html#ae0085e6e1cf059a4eb7767e30e9991b8">mi_heap_area_t::blocks</a></div><div class="ttdeci">void * blocks</div><div class="ttdoc">start of the area containing heap blocks</div><div class="ttdef"><b>Definition:</b> mimalloc-doc.h:762</div></div>
-<div class="ttc" id="agroup__analysis_html_ae848a3e6840414891035423948ca0383"><div class="ttname"><a href="group__analysis.html#ae848a3e6840414891035423948ca0383">mi_heap_area_t::reserved</a></div><div class="ttdeci">size_t reserved</div><div class="ttdoc">bytes reserved for this area</div><div class="ttdef"><b>Definition:</b> mimalloc-doc.h:763</div></div>
+<div class="fragment"><div class="line"><a id="l00001" name="l00001"></a><span class="lineno">    1</span><span class="comment">/* ----------------------------------------------------------------------------</span></div>
+<div class="line"><a id="l00002" name="l00002"></a><span class="lineno">    2</span><span class="comment">Copyright (c) 2018-2025, Microsoft Research, Daan Leijen</span></div>
+<div class="line"><a id="l00003" name="l00003"></a><span class="lineno">    3</span><span class="comment">This is free software; you can redistribute it and/or modify it under the</span></div>
+<div class="line"><a id="l00004" name="l00004"></a><span class="lineno">    4</span><span class="comment">terms of the MIT license. A copy of the license can be found in the file</span></div>
+<div class="line"><a id="l00005" name="l00005"></a><span class="lineno">    5</span><span class="comment">&quot;LICENSE&quot; at the root of this distribution.</span></div>
+<div class="line"><a id="l00006" name="l00006"></a><span class="lineno">    6</span><span class="comment">-----------------------------------------------------------------------------*/</span></div>
+<div class="line"><a id="l00007" name="l00007"></a><span class="lineno">    7</span> </div>
+<div class="line"><a id="l00008" name="l00008"></a><span class="lineno">    8</span><span class="preprocessor">#error &quot;documentation file only!&quot;</span></div>
+<div class="line"><a id="l00009" name="l00009"></a><span class="lineno">    9</span> </div>
+<div class="line"><a id="l00010" name="l00010"></a><span class="lineno">   10</span></div>
+<div class="line"><a id="l00092" name="l00092"></a><span class="lineno">   92</span> </div>
+<div class="line"><a id="l00093" name="l00093"></a><span class="lineno">   93</span></div>
+<div class="line"><a id="l00097" name="l00097"></a><span class="lineno">   97</span> </div>
+<div class="line"><a id="l00098" name="l00098"></a><span class="lineno">   98</span></div>
+<div class="line"><a id="l00102" name="l00102"></a><span class="lineno"><a class="line" href="group__malloc.html#gaf2c7b89c327d1f60f59e68b9ea644d95">  102</a></span><span class="keywordtype">void</span>  <a class="code hl_function" href="group__malloc.html#gaf2c7b89c327d1f60f59e68b9ea644d95">mi_free</a>(<span class="keywordtype">void</span>* p);</div>
+<div class="line"><a id="l00103" name="l00103"></a><span class="lineno">  103</span></div>
+<div class="line"><a id="l00108" name="l00108"></a><span class="lineno"><a class="line" href="group__malloc.html#gae1dd97b542420c87ae085e822b1229e8">  108</a></span><span class="keywordtype">void</span>* <a class="code hl_function" href="group__malloc.html#gae1dd97b542420c87ae085e822b1229e8">mi_malloc</a>(<span class="keywordtype">size_t</span> size);</div>
+<div class="line"><a id="l00109" name="l00109"></a><span class="lineno">  109</span></div>
+<div class="line"><a id="l00114" name="l00114"></a><span class="lineno"><a class="line" href="group__malloc.html#gae6e38c4403247a7b40d80419e093bfb8">  114</a></span><span class="keywordtype">void</span>* <a class="code hl_function" href="group__malloc.html#gae6e38c4403247a7b40d80419e093bfb8">mi_zalloc</a>(<span class="keywordtype">size_t</span> size);</div>
+<div class="line"><a id="l00115" name="l00115"></a><span class="lineno">  115</span></div>
+<div class="line"><a id="l00125" name="l00125"></a><span class="lineno"><a class="line" href="group__malloc.html#ga6686568014b54d1e6c7ac64a076e4f56">  125</a></span><span class="keywordtype">void</span>* <a class="code hl_function" href="group__malloc.html#ga6686568014b54d1e6c7ac64a076e4f56">mi_calloc</a>(<span class="keywordtype">size_t</span> count, <span class="keywordtype">size_t</span> size);</div>
+<div class="line"><a id="l00126" name="l00126"></a><span class="lineno">  126</span></div>
+<div class="line"><a id="l00139" name="l00139"></a><span class="lineno"><a class="line" href="group__malloc.html#ga0621af6a5e3aa384e6a1b548958bf583">  139</a></span><span class="keywordtype">void</span>* <a class="code hl_function" href="group__malloc.html#ga0621af6a5e3aa384e6a1b548958bf583">mi_realloc</a>(<span class="keywordtype">void</span>* p, <span class="keywordtype">size_t</span> newsize);</div>
+<div class="line"><a id="l00140" name="l00140"></a><span class="lineno">  140</span></div>
+<div class="line"><a id="l00151" name="l00151"></a><span class="lineno"><a class="line" href="group__malloc.html#ga23a0fbb452b5dce8e31fab1a1958cacc">  151</a></span><span class="keywordtype">void</span>* <a class="code hl_function" href="group__malloc.html#ga23a0fbb452b5dce8e31fab1a1958cacc">mi_recalloc</a>(<span class="keywordtype">void</span>* p, <span class="keywordtype">size_t</span> count, <span class="keywordtype">size_t</span> size);</div>
+<div class="line"><a id="l00152" name="l00152"></a><span class="lineno">  152</span></div>
+<div class="line"><a id="l00166" name="l00166"></a><span class="lineno"><a class="line" href="group__malloc.html#ga19299856216cfbb08e2628593654dfb0">  166</a></span><span class="keywordtype">void</span>* <a class="code hl_function" href="group__malloc.html#ga19299856216cfbb08e2628593654dfb0">mi_expand</a>(<span class="keywordtype">void</span>* p, <span class="keywordtype">size_t</span> newsize);</div>
+<div class="line"><a id="l00167" name="l00167"></a><span class="lineno">  167</span></div>
+<div class="line"><a id="l00177" name="l00177"></a><span class="lineno"><a class="line" href="group__malloc.html#ga61f46bade3db76ca24aaafedc40de7b6">  177</a></span><span class="keywordtype">void</span>* <a class="code hl_function" href="group__malloc.html#ga61f46bade3db76ca24aaafedc40de7b6">mi_mallocn</a>(<span class="keywordtype">size_t</span> count, <span class="keywordtype">size_t</span> size);</div>
+<div class="line"><a id="l00178" name="l00178"></a><span class="lineno">  178</span></div>
+<div class="line"><a id="l00188" name="l00188"></a><span class="lineno"><a class="line" href="group__malloc.html#ga8bddfb4a1270a0854bbcf44cb3980467">  188</a></span><span class="keywordtype">void</span>* <a class="code hl_function" href="group__malloc.html#ga8bddfb4a1270a0854bbcf44cb3980467">mi_reallocn</a>(<span class="keywordtype">void</span>* p, <span class="keywordtype">size_t</span> count, <span class="keywordtype">size_t</span> size);</div>
+<div class="line"><a id="l00189" name="l00189"></a><span class="lineno">  189</span></div>
+<div class="line"><a id="l00206" name="l00206"></a><span class="lineno"><a class="line" href="group__malloc.html#ga4dc3a4067037b151a64629fe8a332641">  206</a></span><span class="keywordtype">void</span>* <a class="code hl_function" href="group__malloc.html#ga4dc3a4067037b151a64629fe8a332641">mi_reallocf</a>(<span class="keywordtype">void</span>* p, <span class="keywordtype">size_t</span> newsize);</div>
+<div class="line"><a id="l00207" name="l00207"></a><span class="lineno">  207</span> </div>
+<div class="line"><a id="l00208" name="l00208"></a><span class="lineno">  208</span></div>
+<div class="line"><a id="l00217" name="l00217"></a><span class="lineno"><a class="line" href="group__malloc.html#ga245ac90ebc2cfdd17de599e5fea59889">  217</a></span><span class="keywordtype">char</span>* <a class="code hl_function" href="group__malloc.html#ga245ac90ebc2cfdd17de599e5fea59889">mi_strdup</a>(<span class="keyword">const</span> <span class="keywordtype">char</span>* s);</div>
+<div class="line"><a id="l00218" name="l00218"></a><span class="lineno">  218</span></div>
+<div class="line"><a id="l00228" name="l00228"></a><span class="lineno"><a class="line" href="group__malloc.html#ga486d0d26b3b3794f6d1cdb41a9aed92d">  228</a></span><span class="keywordtype">char</span>* <a class="code hl_function" href="group__malloc.html#ga486d0d26b3b3794f6d1cdb41a9aed92d">mi_strndup</a>(<span class="keyword">const</span> <span class="keywordtype">char</span>* s, <span class="keywordtype">size_t</span> n);</div>
+<div class="line"><a id="l00229" name="l00229"></a><span class="lineno">  229</span></div>
+<div class="line"><a id="l00242" name="l00242"></a><span class="lineno"><a class="line" href="group__malloc.html#ga94c3afcc086e85d75a57e9f76b9b71dd">  242</a></span><span class="keywordtype">char</span>* <a class="code hl_function" href="group__malloc.html#ga94c3afcc086e85d75a57e9f76b9b71dd">mi_realpath</a>(<span class="keyword">const</span> <span class="keywordtype">char</span>* fname, <span class="keywordtype">char</span>* resolved_name);</div>
+<div class="line"><a id="l00243" name="l00243"></a><span class="lineno">  243</span></div>
+<div class="line"><a id="l00245" name="l00245"></a><span class="lineno">  245</span> </div>
+<div class="line"><a id="l00246" name="l00246"></a><span class="lineno">  246</span><span class="comment">// ------------------------------------------------------</span></div>
+<div class="line"><a id="l00247" name="l00247"></a><span class="lineno">  247</span><span class="comment">// Extended functionality</span></div>
+<div class="line"><a id="l00248" name="l00248"></a><span class="lineno">  248</span><span class="comment">// ------------------------------------------------------</span></div>
+<div class="line"><a id="l00249" name="l00249"></a><span class="lineno">  249</span></div>
+<div class="line"><a id="l00253" name="l00253"></a><span class="lineno">  253</span></div>
+<div class="line"><a id="l00256" name="l00256"></a><span class="lineno"><a class="line" href="group__extended.html#ga1ea64283508718d9d645c38efc2f4305">  256</a></span><span class="preprocessor">#define MI_SMALL_SIZE_MAX   (128*sizeof(void*))</span></div>
+<div class="line"><a id="l00257" name="l00257"></a><span class="lineno">  257</span></div>
+<div class="line"><a id="l00265" name="l00265"></a><span class="lineno"><a class="line" href="group__extended.html#ga7f050bc6b897da82692174f5fce59cde">  265</a></span><span class="keywordtype">void</span>* <a class="code hl_function" href="group__extended.html#ga7f050bc6b897da82692174f5fce59cde">mi_malloc_small</a>(<span class="keywordtype">size_t</span> size);</div>
+<div class="line"><a id="l00266" name="l00266"></a><span class="lineno">  266</span></div>
+<div class="line"><a id="l00274" name="l00274"></a><span class="lineno"><a class="line" href="group__extended.html#ga51c47637e81df0e2f13a2d7a2dec123e">  274</a></span><span class="keywordtype">void</span>* <a class="code hl_function" href="group__extended.html#ga51c47637e81df0e2f13a2d7a2dec123e">mi_zalloc_small</a>(<span class="keywordtype">size_t</span> size);</div>
+<div class="line"><a id="l00275" name="l00275"></a><span class="lineno">  275</span></div>
+<div class="line"><a id="l00289" name="l00289"></a><span class="lineno"><a class="line" href="group__extended.html#ga089c859d9eddc5f9b4bd946cd53cebee">  289</a></span><span class="keywordtype">size_t</span> <a class="code hl_function" href="group__extended.html#ga089c859d9eddc5f9b4bd946cd53cebee">mi_usable_size</a>(<span class="keywordtype">void</span>* p);</div>
+<div class="line"><a id="l00290" name="l00290"></a><span class="lineno">  290</span></div>
+<div class="line"><a id="l00300" name="l00300"></a><span class="lineno"><a class="line" href="group__extended.html#gac057927cd06c854b45fe7847e921bd47">  300</a></span><span class="keywordtype">size_t</span> <a class="code hl_function" href="group__extended.html#gac057927cd06c854b45fe7847e921bd47">mi_good_size</a>(<span class="keywordtype">size_t</span> size);</div>
+<div class="line"><a id="l00301" name="l00301"></a><span class="lineno">  301</span></div>
+<div class="line"><a id="l00309" name="l00309"></a><span class="lineno"><a class="line" href="group__extended.html#ga421430e2226d7d468529cec457396756">  309</a></span><span class="keywordtype">void</span> <a class="code hl_function" href="group__extended.html#ga421430e2226d7d468529cec457396756">mi_collect</a>(<span class="keywordtype">bool</span> force);</div>
+<div class="line"><a id="l00310" name="l00310"></a><span class="lineno">  310</span></div>
+<div class="line"><a id="l00315" name="l00315"></a><span class="lineno"><a class="line" href="group__extended.html#ga2d126e5c62d3badc35445e5d84166df2">  315</a></span><span class="keywordtype">void</span> <a class="code hl_function" href="group__extended.html#ga2d126e5c62d3badc35445e5d84166df2">mi_stats_print</a>(<span class="keywordtype">void</span>* out);</div>
+<div class="line"><a id="l00316" name="l00316"></a><span class="lineno">  316</span></div>
+<div class="line"><a id="l00322" name="l00322"></a><span class="lineno"><a class="line" href="group__extended.html#ga537f13b299ddf801e49a5a94fde02c79">  322</a></span><span class="keywordtype">void</span> <a class="code hl_function" href="group__extended.html#ga537f13b299ddf801e49a5a94fde02c79">mi_stats_print_out</a>(<a class="code hl_typedef" href="group__extended.html#gadf31cea7d0332a81c8b882cbbdbadb8d">mi_output_fun</a>* out, <span class="keywordtype">void</span>* arg);</div>
+<div class="line"><a id="l00323" name="l00323"></a><span class="lineno">  323</span></div>
+<div class="line"><a id="l00325" name="l00325"></a><span class="lineno"><a class="line" href="group__extended.html#ga3bb8468b8cfcc6e2a61d98aee85c5f99">  325</a></span><span class="keywordtype">void</span> <a class="code hl_function" href="group__extended.html#ga3bb8468b8cfcc6e2a61d98aee85c5f99">mi_stats_reset</a>(<span class="keywordtype">void</span>);</div>
+<div class="line"><a id="l00326" name="l00326"></a><span class="lineno">  326</span></div>
+<div class="line"><a id="l00328" name="l00328"></a><span class="lineno"><a class="line" href="group__extended.html#ga854b1de8cb067c7316286c28b2fcd3d1">  328</a></span><span class="keywordtype">void</span> <a class="code hl_function" href="group__extended.html#ga854b1de8cb067c7316286c28b2fcd3d1">mi_stats_merge</a>(<span class="keywordtype">void</span>);</div>
+<div class="line"><a id="l00329" name="l00329"></a><span class="lineno">  329</span></div>
+<div class="line"><a id="l00333" name="l00333"></a><span class="lineno"><a class="line" href="group__extended.html#gaf8e73efc2cbca9ebfdfb166983a04c17">  333</a></span><span class="keywordtype">void</span> <a class="code hl_function" href="group__extended.html#gaf8e73efc2cbca9ebfdfb166983a04c17">mi_thread_init</a>(<span class="keywordtype">void</span>);</div>
+<div class="line"><a id="l00334" name="l00334"></a><span class="lineno">  334</span></div>
+<div class="line"><a id="l00339" name="l00339"></a><span class="lineno"><a class="line" href="group__extended.html#ga0ae4581e85453456a0d658b2b98bf7bf">  339</a></span><span class="keywordtype">void</span> <a class="code hl_function" href="group__extended.html#ga0ae4581e85453456a0d658b2b98bf7bf">mi_thread_done</a>(<span class="keywordtype">void</span>);</div>
+<div class="line"><a id="l00340" name="l00340"></a><span class="lineno">  340</span></div>
+<div class="line"><a id="l00346" name="l00346"></a><span class="lineno"><a class="line" href="group__extended.html#gab1dac8476c46cb9eecab767eb40c1525">  346</a></span><span class="keywordtype">void</span> <a class="code hl_function" href="group__extended.html#gab1dac8476c46cb9eecab767eb40c1525">mi_thread_stats_print_out</a>(<a class="code hl_typedef" href="group__extended.html#gadf31cea7d0332a81c8b882cbbdbadb8d">mi_output_fun</a>* out, <span class="keywordtype">void</span>* arg);</div>
+<div class="line"><a id="l00347" name="l00347"></a><span class="lineno">  347</span></div>
+<div class="line"><a id="l00354" name="l00354"></a><span class="lineno"><a class="line" href="group__extended.html#ga292a45f7dbc7cd23c5352ce1f0002816">  354</a></span><span class="keyword">typedef</span> void (<a class="code hl_typedef" href="group__extended.html#ga292a45f7dbc7cd23c5352ce1f0002816">mi_deferred_free_fun</a>)(<span class="keywordtype">bool</span> force, <span class="keywordtype">unsigned</span> <span class="keywordtype">long</span> <span class="keywordtype">long</span> heartbeat, <span class="keywordtype">void</span>* arg);</div>
+<div class="line"><a id="l00355" name="l00355"></a><span class="lineno">  355</span></div>
+<div class="line"><a id="l00371" name="l00371"></a><span class="lineno"><a class="line" href="group__extended.html#ga3460a6ca91af97be4058f523d3cb8ece">  371</a></span><span class="keywordtype">void</span>   <a class="code hl_function" href="group__extended.html#ga3460a6ca91af97be4058f523d3cb8ece">mi_register_deferred_free</a>(<a class="code hl_typedef" href="group__extended.html#ga292a45f7dbc7cd23c5352ce1f0002816">mi_deferred_free_fun</a>* deferred_free, <span class="keywordtype">void</span>* arg);</div>
+<div class="line"><a id="l00372" name="l00372"></a><span class="lineno">  372</span></div>
+<div class="line"><a id="l00378" name="l00378"></a><span class="lineno"><a class="line" href="group__extended.html#gadf31cea7d0332a81c8b882cbbdbadb8d">  378</a></span><span class="keyword">typedef</span> void (<a class="code hl_typedef" href="group__extended.html#gadf31cea7d0332a81c8b882cbbdbadb8d">mi_output_fun</a>)(<span class="keyword">const</span> <span class="keywordtype">char</span>* msg, <span class="keywordtype">void</span>* arg);</div>
+<div class="line"><a id="l00379" name="l00379"></a><span class="lineno">  379</span></div>
+<div class="line"><a id="l00386" name="l00386"></a><span class="lineno"><a class="line" href="group__extended.html#gae5b17ff027cd2150b43a33040250cf3f">  386</a></span><span class="keywordtype">void</span> <a class="code hl_function" href="group__extended.html#gae5b17ff027cd2150b43a33040250cf3f">mi_register_output</a>(<a class="code hl_typedef" href="group__extended.html#gadf31cea7d0332a81c8b882cbbdbadb8d">mi_output_fun</a>* out, <span class="keywordtype">void</span>* arg);</div>
+<div class="line"><a id="l00387" name="l00387"></a><span class="lineno">  387</span></div>
+<div class="line"><a id="l00393" name="l00393"></a><span class="lineno"><a class="line" href="group__extended.html#ga83fc6a688b322261e1c2deab000b0591">  393</a></span><span class="keyword">typedef</span> void (<a class="code hl_typedef" href="group__extended.html#ga83fc6a688b322261e1c2deab000b0591">mi_error_fun</a>)(<span class="keywordtype">int</span> err, <span class="keywordtype">void</span>* arg);</div>
+<div class="line"><a id="l00394" name="l00394"></a><span class="lineno">  394</span></div>
+<div class="line"><a id="l00410" name="l00410"></a><span class="lineno"><a class="line" href="group__extended.html#gaa1d55e0e894be240827e5d87ec3a1f45">  410</a></span><span class="keywordtype">void</span> <a class="code hl_function" href="group__extended.html#gaa1d55e0e894be240827e5d87ec3a1f45">mi_register_error</a>(<a class="code hl_typedef" href="group__extended.html#ga83fc6a688b322261e1c2deab000b0591">mi_error_fun</a>* errfun, <span class="keywordtype">void</span>* arg);</div>
+<div class="line"><a id="l00411" name="l00411"></a><span class="lineno">  411</span></div>
+<div class="line"><a id="l00416" name="l00416"></a><span class="lineno"><a class="line" href="group__extended.html#ga5f071b10d4df1c3658e04e7fd67a94e6">  416</a></span><span class="keywordtype">bool</span> <a class="code hl_function" href="group__extended.html#ga5f071b10d4df1c3658e04e7fd67a94e6">mi_is_in_heap_region</a>(<span class="keyword">const</span> <span class="keywordtype">void</span>* p);</div>
+<div class="line"><a id="l00417" name="l00417"></a><span class="lineno">  417</span></div>
+<div class="line"><a id="l00426" name="l00426"></a><span class="lineno"><a class="line" href="group__extended.html#ga00ec3324b6b2591c7fe3677baa30a767">  426</a></span><span class="keywordtype">int</span>  <a class="code hl_function" href="group__extended.html#ga00ec3324b6b2591c7fe3677baa30a767">mi_reserve_os_memory</a>(<span class="keywordtype">size_t</span> size, <span class="keywordtype">bool</span> commit, <span class="keywordtype">bool</span> allow_large);</div>
+<div class="line"><a id="l00427" name="l00427"></a><span class="lineno">  427</span></div>
+<div class="line"><a id="l00439" name="l00439"></a><span class="lineno"><a class="line" href="group__extended.html#ga4c6486a1fdcd7a423b5f25fe4be8e0cf">  439</a></span><span class="keywordtype">bool</span> <a class="code hl_function" href="group__extended.html#ga4c6486a1fdcd7a423b5f25fe4be8e0cf">mi_manage_os_memory</a>(<span class="keywordtype">void</span>* start, <span class="keywordtype">size_t</span> size, <span class="keywordtype">bool</span> is_committed, <span class="keywordtype">bool</span> is_large, <span class="keywordtype">bool</span> is_zero, <span class="keywordtype">int</span> numa_node);</div>
+<div class="line"><a id="l00440" name="l00440"></a><span class="lineno">  440</span></div>
+<div class="line"><a id="l00453" name="l00453"></a><span class="lineno"><a class="line" href="group__extended.html#ga3132f521fb756fc0e8ec0b74fb58df50">  453</a></span><span class="keywordtype">int</span> <a class="code hl_function" href="group__extended.html#ga3132f521fb756fc0e8ec0b74fb58df50">mi_reserve_huge_os_pages_interleave</a>(<span class="keywordtype">size_t</span> pages, <span class="keywordtype">size_t</span> numa_nodes, <span class="keywordtype">size_t</span> timeout_msecs);</div>
+<div class="line"><a id="l00454" name="l00454"></a><span class="lineno">  454</span></div>
+<div class="line"><a id="l00467" name="l00467"></a><span class="lineno"><a class="line" href="group__extended.html#ga7795a13d20087447281858d2c771cca1">  467</a></span><span class="keywordtype">int</span> <a class="code hl_function" href="group__extended.html#ga7795a13d20087447281858d2c771cca1">mi_reserve_huge_os_pages_at</a>(<span class="keywordtype">size_t</span> pages, <span class="keywordtype">int</span> numa_node, <span class="keywordtype">size_t</span> timeout_msecs);</div>
+<div class="line"><a id="l00468" name="l00468"></a><span class="lineno">  468</span> </div>
+<div class="line"><a id="l00469" name="l00469"></a><span class="lineno">  469</span></div>
+<div class="line"><a id="l00474" name="l00474"></a><span class="lineno"><a class="line" href="group__extended.html#gaad25050b19f30cd79397b227e0157a3f">  474</a></span><span class="keywordtype">bool</span> <a class="code hl_function" href="group__extended.html#gaad25050b19f30cd79397b227e0157a3f">mi_is_redirected</a>();</div>
+<div class="line"><a id="l00475" name="l00475"></a><span class="lineno">  475</span></div>
+<div class="line"><a id="l00489" name="l00489"></a><span class="lineno"><a class="line" href="group__extended.html#ga7d862c2affd5790381da14eb102a364d">  489</a></span><span class="keywordtype">void</span> <a class="code hl_function" href="group__extended.html#ga7d862c2affd5790381da14eb102a364d">mi_process_info</a>(<span class="keywordtype">size_t</span>* elapsed_msecs, <span class="keywordtype">size_t</span>* user_msecs, <span class="keywordtype">size_t</span>* system_msecs, <span class="keywordtype">size_t</span>* current_rss, <span class="keywordtype">size_t</span>* peak_rss, <span class="keywordtype">size_t</span>* current_commit, <span class="keywordtype">size_t</span>* peak_commit, <span class="keywordtype">size_t</span>* page_faults);</div>
+<div class="line"><a id="l00490" name="l00490"></a><span class="lineno">  490</span></div>
+<div class="line"><a id="l00495" name="l00495"></a><span class="lineno"><a class="line" href="group__extended.html#gad7439207f8f71fb6c382a9ea20b997e7">  495</a></span><span class="keywordtype">void</span> <a class="code hl_function" href="group__extended.html#gad7439207f8f71fb6c382a9ea20b997e7">mi_debug_show_arenas</a>(<span class="keywordtype">bool</span> show_inuse, <span class="keywordtype">bool</span> show_abandoned, <span class="keywordtype">bool</span> show_purge);</div>
+<div class="line"><a id="l00496" name="l00496"></a><span class="lineno">  496</span></div>
+<div class="line"><a id="l00499" name="l00499"></a><span class="lineno"><a class="line" href="group__extended.html#ga99fe38650d0b02e0e0f89ee024db91d3">  499</a></span><span class="keyword">typedef</span> <span class="keywordtype">int</span> <a class="code hl_typedef" href="group__extended.html#ga99fe38650d0b02e0e0f89ee024db91d3">mi_arena_id_t</a>;</div>
+<div class="line"><a id="l00500" name="l00500"></a><span class="lineno">  500</span></div>
+<div class="line"><a id="l00505" name="l00505"></a><span class="lineno"><a class="line" href="group__extended.html#ga9a25a00a22151619a0be91a10af7787f">  505</a></span><span class="keywordtype">void</span>* <a class="code hl_function" href="group__extended.html#ga9a25a00a22151619a0be91a10af7787f">mi_arena_area</a>(<a class="code hl_typedef" href="group__extended.html#ga99fe38650d0b02e0e0f89ee024db91d3">mi_arena_id_t</a> arena_id, <span class="keywordtype">size_t</span>* size);</div>
+<div class="line"><a id="l00506" name="l00506"></a><span class="lineno">  506</span></div>
+<div class="line"><a id="l00514" name="l00514"></a><span class="lineno"><a class="line" href="group__extended.html#ga591aab1c2bc2ca920e33f0f9f9cb5c52">  514</a></span><span class="keywordtype">int</span>   <a class="code hl_function" href="group__extended.html#ga591aab1c2bc2ca920e33f0f9f9cb5c52">mi_reserve_huge_os_pages_at_ex</a>(<span class="keywordtype">size_t</span> pages, <span class="keywordtype">int</span> numa_node, <span class="keywordtype">size_t</span> timeout_msecs, <span class="keywordtype">bool</span> exclusive, <a class="code hl_typedef" href="group__extended.html#ga99fe38650d0b02e0e0f89ee024db91d3">mi_arena_id_t</a>* arena_id);</div>
+<div class="line"><a id="l00515" name="l00515"></a><span class="lineno">  515</span></div>
+<div class="line"><a id="l00523" name="l00523"></a><span class="lineno"><a class="line" href="group__extended.html#ga32f519797fd9a81acb4f52d36e6d751b">  523</a></span><span class="keywordtype">int</span>   <a class="code hl_function" href="group__extended.html#ga32f519797fd9a81acb4f52d36e6d751b">mi_reserve_os_memory_ex</a>(<span class="keywordtype">size_t</span> size, <span class="keywordtype">bool</span> commit, <span class="keywordtype">bool</span> allow_large, <span class="keywordtype">bool</span> exclusive, <a class="code hl_typedef" href="group__extended.html#ga99fe38650d0b02e0e0f89ee024db91d3">mi_arena_id_t</a>* arena_id);</div>
+<div class="line"><a id="l00524" name="l00524"></a><span class="lineno">  524</span></div>
+<div class="line"><a id="l00535" name="l00535"></a><span class="lineno"><a class="line" href="group__extended.html#ga41ce8525d77bbb60f618fa1029994f6e">  535</a></span><span class="keywordtype">bool</span>  <a class="code hl_function" href="group__extended.html#ga41ce8525d77bbb60f618fa1029994f6e">mi_manage_os_memory_ex</a>(<span class="keywordtype">void</span>* start, <span class="keywordtype">size_t</span> size, <span class="keywordtype">bool</span> is_committed, <span class="keywordtype">bool</span> is_large, <span class="keywordtype">bool</span> is_zero, <span class="keywordtype">int</span> numa_node, <span class="keywordtype">bool</span> exclusive, <a class="code hl_typedef" href="group__extended.html#ga99fe38650d0b02e0e0f89ee024db91d3">mi_arena_id_t</a>* arena_id);</div>
+<div class="line"><a id="l00536" name="l00536"></a><span class="lineno">  536</span></div>
+<div class="line"><a id="l00540" name="l00540"></a><span class="lineno"><a class="line" href="group__extended.html#gaaf2d9976576d5efd5544be12848af949">  540</a></span><a class="code hl_typedef" href="group__heap.html#ga34a47cde5a5b38c29f1aa3c5e76943c2">mi_heap_t</a>* <a class="code hl_function" href="group__extended.html#gaaf2d9976576d5efd5544be12848af949">mi_heap_new_in_arena</a>(<a class="code hl_typedef" href="group__extended.html#ga99fe38650d0b02e0e0f89ee024db91d3">mi_arena_id_t</a> arena_id);</div>
+<div class="line"><a id="l00541" name="l00541"></a><span class="lineno">  541</span></div>
+<div class="line"><a id="l00552" name="l00552"></a><span class="lineno"><a class="line" href="group__extended.html#ga3ae360583f4351aa5267ee7e43008faf">  552</a></span><a class="code hl_typedef" href="group__heap.html#ga34a47cde5a5b38c29f1aa3c5e76943c2">mi_heap_t</a>* <a class="code hl_function" href="group__extended.html#ga3ae360583f4351aa5267ee7e43008faf">mi_heap_new_ex</a>(<span class="keywordtype">int</span> heap_tag, <span class="keywordtype">bool</span> allow_destroy, <a class="code hl_typedef" href="group__extended.html#ga99fe38650d0b02e0e0f89ee024db91d3">mi_arena_id_t</a> arena_id);</div>
+<div class="line"><a id="l00553" name="l00553"></a><span class="lineno">  553</span></div>
+<div class="line"><a id="l00557" name="l00557"></a><span class="lineno"><a class="line" href="group__extended.html#ga8c0bcd1fee27c7641e9c3c0d991b3b7d">  557</a></span><span class="keyword">typedef</span> <span class="keywordtype">void</span>* <a class="code hl_typedef" href="group__extended.html#ga8c0bcd1fee27c7641e9c3c0d991b3b7d">mi_subproc_id_t</a>;</div>
+<div class="line"><a id="l00558" name="l00558"></a><span class="lineno">  558</span></div>
+<div class="line"><a id="l00560" name="l00560"></a><span class="lineno"><a class="line" href="group__extended.html#ga2ecba0d7ebdc99e71bb985c4a1609806">  560</a></span><a class="code hl_typedef" href="group__extended.html#ga8c0bcd1fee27c7641e9c3c0d991b3b7d">mi_subproc_id_t</a> <a class="code hl_function" href="group__extended.html#ga2ecba0d7ebdc99e71bb985c4a1609806">mi_subproc_main</a>(<span class="keywordtype">void</span>);</div>
+<div class="line"><a id="l00561" name="l00561"></a><span class="lineno">  561</span></div>
+<div class="line"><a id="l00564" name="l00564"></a><span class="lineno"><a class="line" href="group__extended.html#ga8068cac328e41fa2170faef707315243">  564</a></span><a class="code hl_typedef" href="group__extended.html#ga8c0bcd1fee27c7641e9c3c0d991b3b7d">mi_subproc_id_t</a> <a class="code hl_function" href="group__extended.html#ga8068cac328e41fa2170faef707315243">mi_subproc_new</a>(<span class="keywordtype">void</span>);</div>
+<div class="line"><a id="l00565" name="l00565"></a><span class="lineno">  565</span></div>
+<div class="line"><a id="l00569" name="l00569"></a><span class="lineno"><a class="line" href="group__extended.html#gaa7d263e9429bac9ac8345c9d25de610e">  569</a></span><span class="keywordtype">void</span> <a class="code hl_function" href="group__extended.html#gaa7d263e9429bac9ac8345c9d25de610e">mi_subproc_delete</a>(<a class="code hl_typedef" href="group__extended.html#ga8c0bcd1fee27c7641e9c3c0d991b3b7d">mi_subproc_id_t</a> subproc);</div>
+<div class="line"><a id="l00570" name="l00570"></a><span class="lineno">  570</span></div>
+<div class="line"><a id="l00573" name="l00573"></a><span class="lineno"><a class="line" href="group__extended.html#gadbc53414eb68b275588ec001ce1ddc7c">  573</a></span><span class="keywordtype">void</span> <a class="code hl_function" href="group__extended.html#gadbc53414eb68b275588ec001ce1ddc7c">mi_subproc_add_current_thread</a>(<a class="code hl_typedef" href="group__extended.html#ga8c0bcd1fee27c7641e9c3c0d991b3b7d">mi_subproc_id_t</a> subproc);</div>
+<div class="line"><a id="l00574" name="l00574"></a><span class="lineno">  574</span> </div>
+<div class="line"><a id="l00575" name="l00575"></a><span class="lineno">  575</span></div>
+<div class="line"><a id="l00577" name="l00577"></a><span class="lineno">  577</span> </div>
+<div class="line"><a id="l00578" name="l00578"></a><span class="lineno">  578</span><span class="comment">// ------------------------------------------------------</span></div>
+<div class="line"><a id="l00579" name="l00579"></a><span class="lineno">  579</span><span class="comment">// Aligned allocation</span></div>
+<div class="line"><a id="l00580" name="l00580"></a><span class="lineno">  580</span><span class="comment">// ------------------------------------------------------</span></div>
+<div class="line"><a id="l00581" name="l00581"></a><span class="lineno">  581</span></div>
+<div class="line"><a id="l00589" name="l00589"></a><span class="lineno">  589</span></div>
+<div class="line"><a id="l00607" name="l00607"></a><span class="lineno"><a class="line" href="group__aligned.html#ga69578ff1a98ca16e1dcd02c0995cd65c">  607</a></span><span class="keywordtype">void</span>* <a class="code hl_function" href="group__aligned.html#ga69578ff1a98ca16e1dcd02c0995cd65c">mi_malloc_aligned</a>(<span class="keywordtype">size_t</span> size, <span class="keywordtype">size_t</span> alignment);</div>
+<div class="line"><a id="l00608" name="l00608"></a><span class="lineno"><a class="line" href="group__aligned.html#gaac7d0beb782f9b9ac31f47492b130f82">  608</a></span><span class="keywordtype">void</span>* <a class="code hl_function" href="group__aligned.html#gaac7d0beb782f9b9ac31f47492b130f82">mi_zalloc_aligned</a>(<span class="keywordtype">size_t</span> size, <span class="keywordtype">size_t</span> alignment);</div>
+<div class="line"><a id="l00609" name="l00609"></a><span class="lineno"><a class="line" href="group__aligned.html#ga424ef386fb1f9f8e0a86ab53f16eaaf1">  609</a></span><span class="keywordtype">void</span>* <a class="code hl_function" href="group__aligned.html#ga424ef386fb1f9f8e0a86ab53f16eaaf1">mi_calloc_aligned</a>(<span class="keywordtype">size_t</span> count, <span class="keywordtype">size_t</span> size, <span class="keywordtype">size_t</span> alignment);</div>
+<div class="line"><a id="l00610" name="l00610"></a><span class="lineno"><a class="line" href="group__aligned.html#ga5d7a46d054b4d7abe9d8d2474add2edf">  610</a></span><span class="keywordtype">void</span>* <a class="code hl_function" href="group__aligned.html#ga5d7a46d054b4d7abe9d8d2474add2edf">mi_realloc_aligned</a>(<span class="keywordtype">void</span>* p, <span class="keywordtype">size_t</span> newsize, <span class="keywordtype">size_t</span> alignment);</div>
+<div class="line"><a id="l00611" name="l00611"></a><span class="lineno">  611</span></div>
+<div class="line"><a id="l00623" name="l00623"></a><span class="lineno"><a class="line" href="group__aligned.html#ga2022f71b95a7cd6cce1b6e07752ae8ca">  623</a></span><span class="keywordtype">void</span>* <a class="code hl_function" href="group__aligned.html#ga2022f71b95a7cd6cce1b6e07752ae8ca">mi_malloc_aligned_at</a>(<span class="keywordtype">size_t</span> size, <span class="keywordtype">size_t</span> alignment, <span class="keywordtype">size_t</span> offset);</div>
+<div class="line"><a id="l00624" name="l00624"></a><span class="lineno"><a class="line" href="group__aligned.html#ga7c1778805ce50ebbf02ccbd5e39d5dba">  624</a></span><span class="keywordtype">void</span>* <a class="code hl_function" href="group__aligned.html#ga7c1778805ce50ebbf02ccbd5e39d5dba">mi_zalloc_aligned_at</a>(<span class="keywordtype">size_t</span> size, <span class="keywordtype">size_t</span> alignment, <span class="keywordtype">size_t</span> offset);</div>
+<div class="line"><a id="l00625" name="l00625"></a><span class="lineno"><a class="line" href="group__aligned.html#ga977f96bd2c5c141bcd70e6685c90d6c3">  625</a></span><span class="keywordtype">void</span>* <a class="code hl_function" href="group__aligned.html#ga977f96bd2c5c141bcd70e6685c90d6c3">mi_calloc_aligned_at</a>(<span class="keywordtype">size_t</span> count, <span class="keywordtype">size_t</span> size, <span class="keywordtype">size_t</span> alignment, <span class="keywordtype">size_t</span> offset);</div>
+<div class="line"><a id="l00626" name="l00626"></a><span class="lineno"><a class="line" href="group__aligned.html#gad06dcf2bb8faadb2c8ea61ee5d24bbf6">  626</a></span><span class="keywordtype">void</span>* <a class="code hl_function" href="group__aligned.html#gad06dcf2bb8faadb2c8ea61ee5d24bbf6">mi_realloc_aligned_at</a>(<span class="keywordtype">void</span>* p, <span class="keywordtype">size_t</span> newsize, <span class="keywordtype">size_t</span> alignment, <span class="keywordtype">size_t</span> offset);</div>
+<div class="line"><a id="l00627" name="l00627"></a><span class="lineno">  627</span></div>
+<div class="line"><a id="l00629" name="l00629"></a><span class="lineno">  629</span></div>
+<div class="line"><a id="l00635" name="l00635"></a><span class="lineno">  635</span></div>
+<div class="line"><a id="l00640" name="l00640"></a><span class="lineno">  640</span><span class="keyword">struct </span>mi_heap_s;</div>
+<div class="line"><a id="l00641" name="l00641"></a><span class="lineno">  641</span></div>
+<div class="line"><a id="l00646" name="l00646"></a><span class="lineno"><a class="line" href="group__heap.html#ga34a47cde5a5b38c29f1aa3c5e76943c2">  646</a></span><span class="keyword">typedef</span> <span class="keyword">struct </span>mi_heap_s <a class="code hl_typedef" href="group__heap.html#ga34a47cde5a5b38c29f1aa3c5e76943c2">mi_heap_t</a>;</div>
+<div class="line"><a id="l00647" name="l00647"></a><span class="lineno">  647</span></div>
+<div class="line"><a id="l00649" name="l00649"></a><span class="lineno"><a class="line" href="group__heap.html#gaa718bb226ec0546ba6d1b6cb32179f3a">  649</a></span><a class="code hl_typedef" href="group__heap.html#ga34a47cde5a5b38c29f1aa3c5e76943c2">mi_heap_t</a>* <a class="code hl_function" href="group__heap.html#gaa718bb226ec0546ba6d1b6cb32179f3a">mi_heap_new</a>();</div>
+<div class="line"><a id="l00650" name="l00650"></a><span class="lineno">  650</span></div>
+<div class="line"><a id="l00658" name="l00658"></a><span class="lineno"><a class="line" href="group__heap.html#ga2ab1af8d438819b55319c7ef51d1e409">  658</a></span><span class="keywordtype">void</span> <a class="code hl_function" href="group__heap.html#ga2ab1af8d438819b55319c7ef51d1e409">mi_heap_delete</a>(<a class="code hl_typedef" href="group__heap.html#ga34a47cde5a5b38c29f1aa3c5e76943c2">mi_heap_t</a>* heap);</div>
+<div class="line"><a id="l00659" name="l00659"></a><span class="lineno">  659</span></div>
+<div class="line"><a id="l00667" name="l00667"></a><span class="lineno"><a class="line" href="group__heap.html#ga9f9c0844edb9717f4feacd79116b8e0d">  667</a></span><span class="keywordtype">void</span> <a class="code hl_function" href="group__heap.html#ga9f9c0844edb9717f4feacd79116b8e0d">mi_heap_destroy</a>(<a class="code hl_typedef" href="group__heap.html#ga34a47cde5a5b38c29f1aa3c5e76943c2">mi_heap_t</a>* heap);</div>
+<div class="line"><a id="l00668" name="l00668"></a><span class="lineno">  668</span></div>
+<div class="line"><a id="l00672" name="l00672"></a><span class="lineno"><a class="line" href="group__heap.html#ga349b677dec7da5eacdbc7a385bd62a4a">  672</a></span><a class="code hl_typedef" href="group__heap.html#ga34a47cde5a5b38c29f1aa3c5e76943c2">mi_heap_t</a>* <a class="code hl_function" href="group__heap.html#ga349b677dec7da5eacdbc7a385bd62a4a">mi_heap_set_default</a>(<a class="code hl_typedef" href="group__heap.html#ga34a47cde5a5b38c29f1aa3c5e76943c2">mi_heap_t</a>* heap);</div>
+<div class="line"><a id="l00673" name="l00673"></a><span class="lineno">  673</span></div>
+<div class="line"><a id="l00676" name="l00676"></a><span class="lineno"><a class="line" href="group__heap.html#ga14c667a6e2c5d28762d8cb7d4e057909">  676</a></span><a class="code hl_typedef" href="group__heap.html#ga34a47cde5a5b38c29f1aa3c5e76943c2">mi_heap_t</a>* <a class="code hl_function" href="group__heap.html#ga14c667a6e2c5d28762d8cb7d4e057909">mi_heap_get_default</a>();</div>
+<div class="line"><a id="l00677" name="l00677"></a><span class="lineno">  677</span></div>
+<div class="line"><a id="l00683" name="l00683"></a><span class="lineno"><a class="line" href="group__heap.html#gac6ac9f0e7be9ab4ff70acfc8dad1235a">  683</a></span><a class="code hl_typedef" href="group__heap.html#ga34a47cde5a5b38c29f1aa3c5e76943c2">mi_heap_t</a>* <a class="code hl_function" href="group__heap.html#gac6ac9f0e7be9ab4ff70acfc8dad1235a">mi_heap_get_backing</a>();</div>
+<div class="line"><a id="l00684" name="l00684"></a><span class="lineno">  684</span></div>
+<div class="line"><a id="l00686" name="l00686"></a><span class="lineno"><a class="line" href="group__heap.html#ga7922f7495cde30b1984d0e6072419298">  686</a></span><span class="keywordtype">void</span> <a class="code hl_function" href="group__heap.html#ga7922f7495cde30b1984d0e6072419298">mi_heap_collect</a>(<a class="code hl_typedef" href="group__heap.html#ga34a47cde5a5b38c29f1aa3c5e76943c2">mi_heap_t</a>* heap, <span class="keywordtype">bool</span> force);</div>
+<div class="line"><a id="l00687" name="l00687"></a><span class="lineno">  687</span></div>
+<div class="line"><a id="l00690" name="l00690"></a><span class="lineno"><a class="line" href="group__heap.html#gab374e206c7034e0d899fb934e4f4a863">  690</a></span><span class="keywordtype">void</span>* <a class="code hl_function" href="group__heap.html#gab374e206c7034e0d899fb934e4f4a863">mi_heap_malloc</a>(<a class="code hl_typedef" href="group__heap.html#ga34a47cde5a5b38c29f1aa3c5e76943c2">mi_heap_t</a>* heap, <span class="keywordtype">size_t</span> size);</div>
+<div class="line"><a id="l00691" name="l00691"></a><span class="lineno">  691</span></div>
+<div class="line"><a id="l00695" name="l00695"></a><span class="lineno"><a class="line" href="group__heap.html#ga012c5c8abe22b10043de39ff95909541">  695</a></span><span class="keywordtype">void</span>* <a class="code hl_function" href="group__heap.html#ga012c5c8abe22b10043de39ff95909541">mi_heap_malloc_small</a>(<a class="code hl_typedef" href="group__heap.html#ga34a47cde5a5b38c29f1aa3c5e76943c2">mi_heap_t</a>* heap, <span class="keywordtype">size_t</span> size);</div>
+<div class="line"><a id="l00696" name="l00696"></a><span class="lineno">  696</span></div>
+<div class="line"><a id="l00699" name="l00699"></a><span class="lineno"><a class="line" href="group__heap.html#gabebc796399619d964d8db77aa835e8c1">  699</a></span><span class="keywordtype">void</span>* <a class="code hl_function" href="group__heap.html#gabebc796399619d964d8db77aa835e8c1">mi_heap_zalloc</a>(<a class="code hl_typedef" href="group__heap.html#ga34a47cde5a5b38c29f1aa3c5e76943c2">mi_heap_t</a>* heap, <span class="keywordtype">size_t</span> size);</div>
+<div class="line"><a id="l00700" name="l00700"></a><span class="lineno">  700</span></div>
+<div class="line"><a id="l00703" name="l00703"></a><span class="lineno"><a class="line" href="group__heap.html#gac0098aaf231d3e9586c73136d5df95da">  703</a></span><span class="keywordtype">void</span>* <a class="code hl_function" href="group__heap.html#gac0098aaf231d3e9586c73136d5df95da">mi_heap_calloc</a>(<a class="code hl_typedef" href="group__heap.html#ga34a47cde5a5b38c29f1aa3c5e76943c2">mi_heap_t</a>* heap, <span class="keywordtype">size_t</span> count, <span class="keywordtype">size_t</span> size);</div>
+<div class="line"><a id="l00704" name="l00704"></a><span class="lineno">  704</span></div>
+<div class="line"><a id="l00707" name="l00707"></a><span class="lineno"><a class="line" href="group__heap.html#gab0f755c0b21c387fe8e9024200faa372">  707</a></span><span class="keywordtype">void</span>* <a class="code hl_function" href="group__heap.html#gab0f755c0b21c387fe8e9024200faa372">mi_heap_mallocn</a>(<a class="code hl_typedef" href="group__heap.html#ga34a47cde5a5b38c29f1aa3c5e76943c2">mi_heap_t</a>* heap, <span class="keywordtype">size_t</span> count, <span class="keywordtype">size_t</span> size);</div>
+<div class="line"><a id="l00708" name="l00708"></a><span class="lineno">  708</span></div>
+<div class="line"><a id="l00711" name="l00711"></a><span class="lineno"><a class="line" href="group__heap.html#ga5754e09ccc51dd6bc73885bb6ea21b7a">  711</a></span><span class="keywordtype">char</span>* <a class="code hl_function" href="group__heap.html#ga5754e09ccc51dd6bc73885bb6ea21b7a">mi_heap_strdup</a>(<a class="code hl_typedef" href="group__heap.html#ga34a47cde5a5b38c29f1aa3c5e76943c2">mi_heap_t</a>* heap, <span class="keyword">const</span> <span class="keywordtype">char</span>* s);</div>
+<div class="line"><a id="l00712" name="l00712"></a><span class="lineno">  712</span></div>
+<div class="line"><a id="l00715" name="l00715"></a><span class="lineno"><a class="line" href="group__heap.html#gad224df78f1fbee942df8adf023e12cf3">  715</a></span><span class="keywordtype">char</span>* <a class="code hl_function" href="group__heap.html#gad224df78f1fbee942df8adf023e12cf3">mi_heap_strndup</a>(<a class="code hl_typedef" href="group__heap.html#ga34a47cde5a5b38c29f1aa3c5e76943c2">mi_heap_t</a>* heap, <span class="keyword">const</span> <span class="keywordtype">char</span>* s, <span class="keywordtype">size_t</span> n);</div>
+<div class="line"><a id="l00716" name="l00716"></a><span class="lineno">  716</span></div>
+<div class="line"><a id="l00719" name="l00719"></a><span class="lineno"><a class="line" href="group__heap.html#ga55545a3ec6da29c5b4f62e540ecac1e2">  719</a></span><span class="keywordtype">char</span>* <a class="code hl_function" href="group__heap.html#ga55545a3ec6da29c5b4f62e540ecac1e2">mi_heap_realpath</a>(<a class="code hl_typedef" href="group__heap.html#ga34a47cde5a5b38c29f1aa3c5e76943c2">mi_heap_t</a>* heap, <span class="keyword">const</span> <span class="keywordtype">char</span>* fname, <span class="keywordtype">char</span>* resolved_name);</div>
+<div class="line"><a id="l00720" name="l00720"></a><span class="lineno">  720</span> </div>
+<div class="line"><a id="l00721" name="l00721"></a><span class="lineno"><a class="line" href="group__heap.html#gac5252d6a2e510bd349e4fcb452e6a93a">  721</a></span><span class="keywordtype">void</span>* <a class="code hl_function" href="group__heap.html#gac5252d6a2e510bd349e4fcb452e6a93a">mi_heap_realloc</a>(<a class="code hl_typedef" href="group__heap.html#ga34a47cde5a5b38c29f1aa3c5e76943c2">mi_heap_t</a>* heap, <span class="keywordtype">void</span>* p, <span class="keywordtype">size_t</span> newsize);</div>
+<div class="line"><a id="l00722" name="l00722"></a><span class="lineno"><a class="line" href="group__heap.html#gaccf7bfe10ce510a000d3547d9cf7fa29">  722</a></span><span class="keywordtype">void</span>* <a class="code hl_function" href="group__heap.html#gaccf7bfe10ce510a000d3547d9cf7fa29">mi_heap_reallocn</a>(<a class="code hl_typedef" href="group__heap.html#ga34a47cde5a5b38c29f1aa3c5e76943c2">mi_heap_t</a>* heap, <span class="keywordtype">void</span>* p, <span class="keywordtype">size_t</span> count, <span class="keywordtype">size_t</span> size);</div>
+<div class="line"><a id="l00723" name="l00723"></a><span class="lineno"><a class="line" href="group__heap.html#gae7cd171425bee04c683c65a3701f0b4a">  723</a></span><span class="keywordtype">void</span>* <a class="code hl_function" href="group__heap.html#gae7cd171425bee04c683c65a3701f0b4a">mi_heap_reallocf</a>(<a class="code hl_typedef" href="group__heap.html#ga34a47cde5a5b38c29f1aa3c5e76943c2">mi_heap_t</a>* heap, <span class="keywordtype">void</span>* p, <span class="keywordtype">size_t</span> newsize);</div>
+<div class="line"><a id="l00724" name="l00724"></a><span class="lineno">  724</span> </div>
+<div class="line"><a id="l00725" name="l00725"></a><span class="lineno"><a class="line" href="group__heap.html#ga33f4f05b7fea7af2113c62a4bf882cc5">  725</a></span><span class="keywordtype">void</span>* <a class="code hl_function" href="group__heap.html#ga33f4f05b7fea7af2113c62a4bf882cc5">mi_heap_malloc_aligned</a>(<a class="code hl_typedef" href="group__heap.html#ga34a47cde5a5b38c29f1aa3c5e76943c2">mi_heap_t</a>* heap, <span class="keywordtype">size_t</span> size, <span class="keywordtype">size_t</span> alignment);</div>
+<div class="line"><a id="l00726" name="l00726"></a><span class="lineno"><a class="line" href="group__heap.html#gae7ffc045c3996497a7f3a5f6fe7b8aaa">  726</a></span><span class="keywordtype">void</span>* <a class="code hl_function" href="group__heap.html#gae7ffc045c3996497a7f3a5f6fe7b8aaa">mi_heap_malloc_aligned_at</a>(<a class="code hl_typedef" href="group__heap.html#ga34a47cde5a5b38c29f1aa3c5e76943c2">mi_heap_t</a>* heap, <span class="keywordtype">size_t</span> size, <span class="keywordtype">size_t</span> alignment, <span class="keywordtype">size_t</span> offset);</div>
+<div class="line"><a id="l00727" name="l00727"></a><span class="lineno"><a class="line" href="group__heap.html#ga6466bde8b5712aa34e081a8317f9f471">  727</a></span><span class="keywordtype">void</span>* <a class="code hl_function" href="group__heap.html#ga6466bde8b5712aa34e081a8317f9f471">mi_heap_zalloc_aligned</a>(<a class="code hl_typedef" href="group__heap.html#ga34a47cde5a5b38c29f1aa3c5e76943c2">mi_heap_t</a>* heap, <span class="keywordtype">size_t</span> size, <span class="keywordtype">size_t</span> alignment);</div>
+<div class="line"><a id="l00728" name="l00728"></a><span class="lineno"><a class="line" href="group__heap.html#ga484e3d01cd174f78c7e53370e5a7c819">  728</a></span><span class="keywordtype">void</span>* <a class="code hl_function" href="group__heap.html#ga484e3d01cd174f78c7e53370e5a7c819">mi_heap_zalloc_aligned_at</a>(<a class="code hl_typedef" href="group__heap.html#ga34a47cde5a5b38c29f1aa3c5e76943c2">mi_heap_t</a>* heap, <span class="keywordtype">size_t</span> size, <span class="keywordtype">size_t</span> alignment, <span class="keywordtype">size_t</span> offset);</div>
+<div class="line"><a id="l00729" name="l00729"></a><span class="lineno"><a class="line" href="group__heap.html#gacafcc26df827c7a7de5e850217566108">  729</a></span><span class="keywordtype">void</span>* <a class="code hl_function" href="group__heap.html#gacafcc26df827c7a7de5e850217566108">mi_heap_calloc_aligned</a>(<a class="code hl_typedef" href="group__heap.html#ga34a47cde5a5b38c29f1aa3c5e76943c2">mi_heap_t</a>* heap, <span class="keywordtype">size_t</span> count, <span class="keywordtype">size_t</span> size, <span class="keywordtype">size_t</span> alignment);</div>
+<div class="line"><a id="l00730" name="l00730"></a><span class="lineno"><a class="line" href="group__heap.html#gaa42ec2079989c4374f2c331d9b35f4e4">  730</a></span><span class="keywordtype">void</span>* <a class="code hl_function" href="group__heap.html#gaa42ec2079989c4374f2c331d9b35f4e4">mi_heap_calloc_aligned_at</a>(<a class="code hl_typedef" href="group__heap.html#ga34a47cde5a5b38c29f1aa3c5e76943c2">mi_heap_t</a>* heap, <span class="keywordtype">size_t</span> count, <span class="keywordtype">size_t</span> size, <span class="keywordtype">size_t</span> alignment, <span class="keywordtype">size_t</span> offset);</div>
+<div class="line"><a id="l00731" name="l00731"></a><span class="lineno"><a class="line" href="group__heap.html#gaccf8c249872f30bf1c2493a09197d734">  731</a></span><span class="keywordtype">void</span>* <a class="code hl_function" href="group__heap.html#gaccf8c249872f30bf1c2493a09197d734">mi_heap_realloc_aligned</a>(<a class="code hl_typedef" href="group__heap.html#ga34a47cde5a5b38c29f1aa3c5e76943c2">mi_heap_t</a>* heap, <span class="keywordtype">void</span>* p, <span class="keywordtype">size_t</span> newsize, <span class="keywordtype">size_t</span> alignment);</div>
+<div class="line"><a id="l00732" name="l00732"></a><span class="lineno"><a class="line" href="group__heap.html#ga6df988a7219d5707f010d5f3eb0dc3f5">  732</a></span><span class="keywordtype">void</span>* <a class="code hl_function" href="group__heap.html#ga6df988a7219d5707f010d5f3eb0dc3f5">mi_heap_realloc_aligned_at</a>(<a class="code hl_typedef" href="group__heap.html#ga34a47cde5a5b38c29f1aa3c5e76943c2">mi_heap_t</a>* heap, <span class="keywordtype">void</span>* p, <span class="keywordtype">size_t</span> newsize, <span class="keywordtype">size_t</span> alignment, <span class="keywordtype">size_t</span> offset);</div>
+<div class="line"><a id="l00733" name="l00733"></a><span class="lineno">  733</span></div>
+<div class="line"><a id="l00735" name="l00735"></a><span class="lineno">  735</span> </div>
+<div class="line"><a id="l00736" name="l00736"></a><span class="lineno">  736</span></div>
+<div class="line"><a id="l00745" name="l00745"></a><span class="lineno">  745</span> </div>
+<div class="line"><a id="l00746" name="l00746"></a><span class="lineno"><a class="line" href="group__zeroinit.html#gadfd34cd7b4f2bbda7ae06367a6360756">  746</a></span><span class="keywordtype">void</span>* <a class="code hl_function" href="group__zeroinit.html#gadfd34cd7b4f2bbda7ae06367a6360756">mi_rezalloc</a>(<span class="keywordtype">void</span>* p, <span class="keywordtype">size_t</span> newsize);</div>
+<div class="line"><a id="l00747" name="l00747"></a><span class="lineno">  747</span><span class="keywordtype">void</span>* <a class="code hl_function" href="group__malloc.html#ga23a0fbb452b5dce8e31fab1a1958cacc">mi_recalloc</a>(<span class="keywordtype">void</span>* p, <span class="keywordtype">size_t</span> newcount, <span class="keywordtype">size_t</span> size) ;</div>
+<div class="line"><a id="l00748" name="l00748"></a><span class="lineno">  748</span> </div>
+<div class="line"><a id="l00749" name="l00749"></a><span class="lineno"><a class="line" href="group__zeroinit.html#ga4d02404fe1e7db00beb65f185e012caa">  749</a></span><span class="keywordtype">void</span>* <a class="code hl_function" href="group__zeroinit.html#ga4d02404fe1e7db00beb65f185e012caa">mi_rezalloc_aligned</a>(<span class="keywordtype">void</span>* p, <span class="keywordtype">size_t</span> newsize, <span class="keywordtype">size_t</span> alignment);</div>
+<div class="line"><a id="l00750" name="l00750"></a><span class="lineno"><a class="line" href="group__zeroinit.html#ga6843a88285bbfcc3bdfccc60aafd1270">  750</a></span><span class="keywordtype">void</span>* <a class="code hl_function" href="group__zeroinit.html#ga6843a88285bbfcc3bdfccc60aafd1270">mi_rezalloc_aligned_at</a>(<span class="keywordtype">void</span>* p, <span class="keywordtype">size_t</span> newsize, <span class="keywordtype">size_t</span> alignment, <span class="keywordtype">size_t</span> offset);</div>
+<div class="line"><a id="l00751" name="l00751"></a><span class="lineno"><a class="line" href="group__zeroinit.html#ga3e2169b48683aa0ab64f813fd68d839e">  751</a></span><span class="keywordtype">void</span>* <a class="code hl_function" href="group__zeroinit.html#ga3e2169b48683aa0ab64f813fd68d839e">mi_recalloc_aligned</a>(<span class="keywordtype">void</span>* p, <span class="keywordtype">size_t</span> newcount, <span class="keywordtype">size_t</span> size, <span class="keywordtype">size_t</span> alignment);</div>
+<div class="line"><a id="l00752" name="l00752"></a><span class="lineno"><a class="line" href="group__zeroinit.html#gaae25e4ddedd4e0fb61b1a8bd5d452750">  752</a></span><span class="keywordtype">void</span>* <a class="code hl_function" href="group__zeroinit.html#gaae25e4ddedd4e0fb61b1a8bd5d452750">mi_recalloc_aligned_at</a>(<span class="keywordtype">void</span>* p, <span class="keywordtype">size_t</span> newcount, <span class="keywordtype">size_t</span> size, <span class="keywordtype">size_t</span> alignment, <span class="keywordtype">size_t</span> offset);</div>
+<div class="line"><a id="l00753" name="l00753"></a><span class="lineno">  753</span> </div>
+<div class="line"><a id="l00754" name="l00754"></a><span class="lineno"><a class="line" href="group__zeroinit.html#ga8d8b7ebb24b513cd84d1a696048da60d">  754</a></span><span class="keywordtype">void</span>* <a class="code hl_function" href="group__zeroinit.html#ga8d8b7ebb24b513cd84d1a696048da60d">mi_heap_rezalloc</a>(<a class="code hl_typedef" href="group__heap.html#ga34a47cde5a5b38c29f1aa3c5e76943c2">mi_heap_t</a>* heap, <span class="keywordtype">void</span>* p, <span class="keywordtype">size_t</span> newsize);</div>
+<div class="line"><a id="l00755" name="l00755"></a><span class="lineno"><a class="line" href="group__zeroinit.html#gad1a0d325d930eeb80f25e3fea37aacde">  755</a></span><span class="keywordtype">void</span>* <a class="code hl_function" href="group__zeroinit.html#gad1a0d325d930eeb80f25e3fea37aacde">mi_heap_recalloc</a>(<a class="code hl_typedef" href="group__heap.html#ga34a47cde5a5b38c29f1aa3c5e76943c2">mi_heap_t</a>* heap, <span class="keywordtype">void</span>* p, <span class="keywordtype">size_t</span> newcount, <span class="keywordtype">size_t</span> size);</div>
+<div class="line"><a id="l00756" name="l00756"></a><span class="lineno">  756</span> </div>
+<div class="line"><a id="l00757" name="l00757"></a><span class="lineno"><a class="line" href="group__zeroinit.html#ga5129f6dc46ee1613d918820a8a0533a7">  757</a></span><span class="keywordtype">void</span>* <a class="code hl_function" href="group__zeroinit.html#ga5129f6dc46ee1613d918820a8a0533a7">mi_heap_rezalloc_aligned</a>(<a class="code hl_typedef" href="group__heap.html#ga34a47cde5a5b38c29f1aa3c5e76943c2">mi_heap_t</a>* heap, <span class="keywordtype">void</span>* p, <span class="keywordtype">size_t</span> newsize, <span class="keywordtype">size_t</span> alignment);</div>
+<div class="line"><a id="l00758" name="l00758"></a><span class="lineno"><a class="line" href="group__zeroinit.html#ga2bafa79c3f98ea74882349d44cffa5d9">  758</a></span><span class="keywordtype">void</span>* <a class="code hl_function" href="group__zeroinit.html#ga2bafa79c3f98ea74882349d44cffa5d9">mi_heap_rezalloc_aligned_at</a>(<a class="code hl_typedef" href="group__heap.html#ga34a47cde5a5b38c29f1aa3c5e76943c2">mi_heap_t</a>* heap, <span class="keywordtype">void</span>* p, <span class="keywordtype">size_t</span> newsize, <span class="keywordtype">size_t</span> alignment, <span class="keywordtype">size_t</span> offset);</div>
+<div class="line"><a id="l00759" name="l00759"></a><span class="lineno"><a class="line" href="group__zeroinit.html#ga87ddd674bf1c67237d780d0b9e0f0f32">  759</a></span><span class="keywordtype">void</span>* <a class="code hl_function" href="group__zeroinit.html#ga87ddd674bf1c67237d780d0b9e0f0f32">mi_heap_recalloc_aligned</a>(<a class="code hl_typedef" href="group__heap.html#ga34a47cde5a5b38c29f1aa3c5e76943c2">mi_heap_t</a>* heap, <span class="keywordtype">void</span>* p, <span class="keywordtype">size_t</span> newcount, <span class="keywordtype">size_t</span> size, <span class="keywordtype">size_t</span> alignment);</div>
+<div class="line"><a id="l00760" name="l00760"></a><span class="lineno"><a class="line" href="group__zeroinit.html#ga07b5bcbaf00d0d2e598c232982588496">  760</a></span><span class="keywordtype">void</span>* <a class="code hl_function" href="group__zeroinit.html#ga07b5bcbaf00d0d2e598c232982588496">mi_heap_recalloc_aligned_at</a>(<a class="code hl_typedef" href="group__heap.html#ga34a47cde5a5b38c29f1aa3c5e76943c2">mi_heap_t</a>* heap, <span class="keywordtype">void</span>* p, <span class="keywordtype">size_t</span> newcount, <span class="keywordtype">size_t</span> size, <span class="keywordtype">size_t</span> alignment, <span class="keywordtype">size_t</span> offset);</div>
+<div class="line"><a id="l00761" name="l00761"></a><span class="lineno">  761</span></div>
+<div class="line"><a id="l00763" name="l00763"></a><span class="lineno">  763</span></div>
+<div class="line"><a id="l00772" name="l00772"></a><span class="lineno">  772</span></div>
+<div class="line"><a id="l00784" name="l00784"></a><span class="lineno"><a class="line" href="group__typed.html#ga0619a62c5fd886f1016030abe91f0557">  784</a></span><span class="preprocessor">#define mi_malloc_tp(tp)        ((tp*)mi_malloc(sizeof(tp)))</span></div>
+<div class="line"><a id="l00785" name="l00785"></a><span class="lineno">  785</span></div>
+<div class="line"><a id="l00787" name="l00787"></a><span class="lineno"><a class="line" href="group__typed.html#gac77a61bdaf680a803785fe307820b48c">  787</a></span><span class="preprocessor">#define mi_zalloc_tp(tp)        ((tp*)mi_zalloc(sizeof(tp)))</span></div>
+<div class="line"><a id="l00788" name="l00788"></a><span class="lineno">  788</span></div>
+<div class="line"><a id="l00790" name="l00790"></a><span class="lineno"><a class="line" href="group__typed.html#gae80c47c9d4cab10961fff1a8ac98fc07">  790</a></span><span class="preprocessor">#define mi_calloc_tp(tp,count)      ((tp*)mi_calloc(count,sizeof(tp)))</span></div>
+<div class="line"><a id="l00791" name="l00791"></a><span class="lineno">  791</span></div>
+<div class="line"><a id="l00793" name="l00793"></a><span class="lineno"><a class="line" href="group__typed.html#gae5cb6e0fafc9f23169c5622e077afe8b">  793</a></span><span class="preprocessor">#define mi_mallocn_tp(tp,count)     ((tp*)mi_mallocn(count,sizeof(tp)))</span></div>
+<div class="line"><a id="l00794" name="l00794"></a><span class="lineno">  794</span></div>
+<div class="line"><a id="l00796" name="l00796"></a><span class="lineno"><a class="line" href="group__typed.html#ga1158b49a55dfa81f58a4426a7578f523">  796</a></span><span class="preprocessor">#define mi_reallocn_tp(p,tp,count)  ((tp*)mi_reallocn(p,count,sizeof(tp)))</span></div>
+<div class="line"><a id="l00797" name="l00797"></a><span class="lineno">  797</span></div>
+<div class="line"><a id="l00799" name="l00799"></a><span class="lineno"><a class="line" href="group__typed.html#ga653bcb24ac495bc19940ecd6898f9cd7">  799</a></span><span class="preprocessor">#define mi_heap_malloc_tp(hp,tp)        ((tp*)mi_heap_malloc(hp,sizeof(tp)))</span></div>
+<div class="line"><a id="l00800" name="l00800"></a><span class="lineno">  800</span></div>
+<div class="line"><a id="l00802" name="l00802"></a><span class="lineno"><a class="line" href="group__typed.html#gad6e87e86e994aa14416ae9b5d4c188fe">  802</a></span><span class="preprocessor">#define mi_heap_zalloc_tp(hp,tp)        ((tp*)mi_heap_zalloc(hp,sizeof(tp)))</span></div>
+<div class="line"><a id="l00803" name="l00803"></a><span class="lineno">  803</span></div>
+<div class="line"><a id="l00805" name="l00805"></a><span class="lineno"><a class="line" href="group__typed.html#ga4e5d1f1707c90e5f55e023ac5f45fe74">  805</a></span><span class="preprocessor">#define mi_heap_calloc_tp(hp,tp,count)      ((tp*)mi_heap_calloc(hp,count,sizeof(tp)))</span></div>
+<div class="line"><a id="l00806" name="l00806"></a><span class="lineno">  806</span></div>
+<div class="line"><a id="l00808" name="l00808"></a><span class="lineno"><a class="line" href="group__typed.html#ga6b75cb9c4b9c647661d0924552dc6e83">  808</a></span><span class="preprocessor">#define mi_heap_mallocn_tp(hp,tp,count)     ((tp*)mi_heap_mallocn(hp,count,sizeof(tp)))</span></div>
+<div class="line"><a id="l00809" name="l00809"></a><span class="lineno">  809</span></div>
+<div class="line"><a id="l00811" name="l00811"></a><span class="lineno"><a class="line" href="group__typed.html#gaf213d5422ec35e7f6caad827c79bc948">  811</a></span><span class="preprocessor">#define mi_heap_reallocn_tp(hp,p,tp,count)  ((tp*)mi_heap_reallocn(p,count,sizeof(tp)))</span></div>
+<div class="line"><a id="l00812" name="l00812"></a><span class="lineno">  812</span></div>
+<div class="line"><a id="l00814" name="l00814"></a><span class="lineno"><a class="line" href="group__typed.html#ga3e50a1600958fcaf1a7f3560c9174f9e">  814</a></span><span class="preprocessor">#define mi_heap_recalloc_tp(hp,p,tp,count)  ((tp*)mi_heap_recalloc(p,count,sizeof(tp)))</span></div>
+<div class="line"><a id="l00815" name="l00815"></a><span class="lineno">  815</span></div>
+<div class="line"><a id="l00817" name="l00817"></a><span class="lineno">  817</span></div>
+<div class="line"><a id="l00823" name="l00823"></a><span class="lineno">  823</span></div>
+<div class="line"><a id="l00830" name="l00830"></a><span class="lineno"><a class="line" href="group__analysis.html#gaa862aa8ed8d57d84cae41fc1022d71af">  830</a></span><span class="keywordtype">bool</span> <a class="code hl_function" href="group__analysis.html#gaa862aa8ed8d57d84cae41fc1022d71af">mi_heap_contains_block</a>(<a class="code hl_typedef" href="group__heap.html#ga34a47cde5a5b38c29f1aa3c5e76943c2">mi_heap_t</a>* heap, <span class="keyword">const</span> <span class="keywordtype">void</span>* p);</div>
+<div class="line"><a id="l00831" name="l00831"></a><span class="lineno">  831</span></div>
+<div class="line"><a id="l00840" name="l00840"></a><span class="lineno"><a class="line" href="group__analysis.html#ga0d67c1789faaa15ff366c024fcaf6377">  840</a></span><span class="keywordtype">bool</span> <a class="code hl_function" href="group__analysis.html#ga0d67c1789faaa15ff366c024fcaf6377">mi_heap_check_owned</a>(<a class="code hl_typedef" href="group__heap.html#ga34a47cde5a5b38c29f1aa3c5e76943c2">mi_heap_t</a>* heap, <span class="keyword">const</span> <span class="keywordtype">void</span>* p);</div>
+<div class="line"><a id="l00841" name="l00841"></a><span class="lineno">  841</span></div>
+<div class="line"><a id="l00849" name="l00849"></a><span class="lineno"><a class="line" href="group__analysis.html#ga628c237489c2679af84a4d0d143b3dd5">  849</a></span><span class="keywordtype">bool</span> <a class="code hl_function" href="group__analysis.html#ga628c237489c2679af84a4d0d143b3dd5">mi_check_owned</a>(<span class="keyword">const</span> <span class="keywordtype">void</span>* p);</div>
+<div class="line"><a id="l00850" name="l00850"></a><span class="lineno">  850</span></div>
+<div class="foldopen" id="foldopen00853" data-start="{" data-end="};">
+<div class="line"><a id="l00853" name="l00853"></a><span class="lineno"><a class="line" href="group__analysis.html">  853</a></span><span class="keyword">typedef</span> <span class="keyword">struct </span>mi_heap_area_s {</div>
+<div class="line"><a id="l00854" name="l00854"></a><span class="lineno"><a class="line" href="group__analysis.html#ae0085e6e1cf059a4eb7767e30e9991b8">  854</a></span>  <span class="keywordtype">void</span>*  <a class="code hl_variable" href="group__analysis.html#ae0085e6e1cf059a4eb7767e30e9991b8">blocks</a>;      </div>
+<div class="line"><a id="l00855" name="l00855"></a><span class="lineno"><a class="line" href="group__analysis.html#ae848a3e6840414891035423948ca0383">  855</a></span>  <span class="keywordtype">size_t</span> <a class="code hl_variable" href="group__analysis.html#ae848a3e6840414891035423948ca0383">reserved</a>;    </div>
+<div class="line"><a id="l00856" name="l00856"></a><span class="lineno"><a class="line" href="group__analysis.html#ab47526df656d8837ec3e97f11b83f835">  856</a></span>  <span class="keywordtype">size_t</span> <a class="code hl_variable" href="group__analysis.html#ab47526df656d8837ec3e97f11b83f835">committed</a>;   </div>
+<div class="line"><a id="l00857" name="l00857"></a><span class="lineno"><a class="line" href="group__analysis.html#ab820302c5cd0df133eb8e51650a008b4">  857</a></span>  <span class="keywordtype">size_t</span> <a class="code hl_variable" href="group__analysis.html#ab820302c5cd0df133eb8e51650a008b4">used</a>;        </div>
+<div class="line"><a id="l00858" name="l00858"></a><span class="lineno"><a class="line" href="group__analysis.html#a332a6c14d736a99699d5453a1cb04b41">  858</a></span>  <span class="keywordtype">size_t</span> <a class="code hl_variable" href="group__analysis.html#a332a6c14d736a99699d5453a1cb04b41">block_size</a>;  </div>
+<div class="line"><a id="l00859" name="l00859"></a><span class="lineno"><a class="line" href="group__analysis.html#ab53664e31d7fe2564f8d42041ef75cb3">  859</a></span>  <span class="keywordtype">size_t</span> <a class="code hl_variable" href="group__analysis.html#ab53664e31d7fe2564f8d42041ef75cb3">full_block_size</a>; </div>
+<div class="line"><a id="l00860" name="l00860"></a><span class="lineno"><a class="line" href="group__analysis.html#a2b7a0c92ece8daf46b558efc990ebdc1">  860</a></span>  <span class="keywordtype">int</span>    <a class="code hl_variable" href="group__analysis.html#a2b7a0c92ece8daf46b558efc990ebdc1">heap_tag</a>;    </div>
+<div class="line"><a id="l00861" name="l00861"></a><span class="lineno">  861</span>} <a class="code hl_struct" href="group__analysis.html#structmi__heap__area__t">mi_heap_area_t</a>;</div>
+</div>
+<div class="line"><a id="l00862" name="l00862"></a><span class="lineno">  862</span></div>
+<div class="line"><a id="l00870" name="l00870"></a><span class="lineno"><a class="line" href="group__analysis.html#ga8255dc9371e6b299d9802a610c4e34ec">  870</a></span><span class="keyword">typedef</span> bool (<a class="code hl_typedef" href="group__analysis.html#ga8255dc9371e6b299d9802a610c4e34ec">mi_block_visit_fun</a>)(<span class="keyword">const</span> <a class="code hl_typedef" href="group__heap.html#ga34a47cde5a5b38c29f1aa3c5e76943c2">mi_heap_t</a>* heap, <span class="keyword">const</span> <a class="code hl_struct" href="group__analysis.html#structmi__heap__area__t">mi_heap_area_t</a>* area, <span class="keywordtype">void</span>* block, <span class="keywordtype">size_t</span> block_size, <span class="keywordtype">void</span>* arg);</div>
+<div class="line"><a id="l00871" name="l00871"></a><span class="lineno">  871</span></div>
+<div class="line"><a id="l00883" name="l00883"></a><span class="lineno"><a class="line" href="group__analysis.html#ga70c46687dc6e9dc98b232b02646f8bed">  883</a></span><span class="keywordtype">bool</span> <a class="code hl_function" href="group__analysis.html#ga70c46687dc6e9dc98b232b02646f8bed">mi_heap_visit_blocks</a>(<span class="keyword">const</span> <a class="code hl_typedef" href="group__heap.html#ga34a47cde5a5b38c29f1aa3c5e76943c2">mi_heap_t</a>* heap, <span class="keywordtype">bool</span> visit_all_blocks, <a class="code hl_typedef" href="group__analysis.html#ga8255dc9371e6b299d9802a610c4e34ec">mi_block_visit_fun</a>* visitor, <span class="keywordtype">void</span>* arg);</div>
+<div class="line"><a id="l00884" name="l00884"></a><span class="lineno">  884</span></div>
+<div class="line"><a id="l00900" name="l00900"></a><span class="lineno"><a class="line" href="group__analysis.html#ga6a4865a887b2ec5247854af61562503c">  900</a></span><span class="keywordtype">bool</span> <a class="code hl_function" href="group__analysis.html#ga6a4865a887b2ec5247854af61562503c">mi_abandoned_visit_blocks</a>(<a class="code hl_typedef" href="group__extended.html#ga8c0bcd1fee27c7641e9c3c0d991b3b7d">mi_subproc_id_t</a> subproc_id, <span class="keywordtype">int</span> heap_tag, <span class="keywordtype">bool</span> visit_blocks, <a class="code hl_typedef" href="group__analysis.html#ga8255dc9371e6b299d9802a610c4e34ec">mi_block_visit_fun</a>* visitor, <span class="keywordtype">void</span>* arg);</div>
+<div class="line"><a id="l00901" name="l00901"></a><span class="lineno">  901</span></div>
+<div class="line"><a id="l00903" name="l00903"></a><span class="lineno">  903</span></div>
+<div class="line"><a id="l00909" name="l00909"></a><span class="lineno">  909</span></div>
+<div class="foldopen" id="foldopen00911" data-start="{" data-end="};">
+<div class="line"><a id="l00911" name="l00911"></a><span class="lineno"><a class="line" href="group__options.html#gafebf7ed116adb38ae5218bc3ce06884c">  911</a></span><span class="keyword">typedef</span> <span class="keyword">enum</span> mi_option_e {</div>
+<div class="line"><a id="l00912" name="l00912"></a><span class="lineno">  912</span>  <span class="comment">// stable options</span></div>
+<div class="line"><a id="l00913" name="l00913"></a><span class="lineno"><a class="line" href="group__options.html#ggafebf7ed116adb38ae5218bc3ce06884cafbf4822e5c00732c5984b32a032837f0">  913</a></span>  <a class="code hl_enumvalue" href="group__options.html#ggafebf7ed116adb38ae5218bc3ce06884cafbf4822e5c00732c5984b32a032837f0">mi_option_show_errors</a>,  </div>
+<div class="line"><a id="l00914" name="l00914"></a><span class="lineno"><a class="line" href="group__options.html#ggafebf7ed116adb38ae5218bc3ce06884ca0957ef73b2550764b4840edf48422fda">  914</a></span>  <a class="code hl_enumvalue" href="group__options.html#ggafebf7ed116adb38ae5218bc3ce06884ca0957ef73b2550764b4840edf48422fda">mi_option_show_stats</a>,   </div>
+<div class="line"><a id="l00915" name="l00915"></a><span class="lineno"><a class="line" href="group__options.html#ggafebf7ed116adb38ae5218bc3ce06884ca7c8b7bf5281c581bad64f5daa6442777">  915</a></span>  <a class="code hl_enumvalue" href="group__options.html#ggafebf7ed116adb38ae5218bc3ce06884ca7c8b7bf5281c581bad64f5daa6442777">mi_option_verbose</a>,      </div>
+<div class="line"><a id="l00916" name="l00916"></a><span class="lineno"><a class="line" href="group__options.html#ggafebf7ed116adb38ae5218bc3ce06884caec6ecbe29d46a48205ed8823a8a52a6a">  916</a></span>  <a class="code hl_enumvalue" href="group__options.html#ggafebf7ed116adb38ae5218bc3ce06884caec6ecbe29d46a48205ed8823a8a52a6a">mi_option_max_errors</a>,                 </div>
+<div class="line"><a id="l00917" name="l00917"></a><span class="lineno"><a class="line" href="group__options.html#ggafebf7ed116adb38ae5218bc3ce06884caf9595921087e942602ee079158762665">  917</a></span>  <a class="code hl_enumvalue" href="group__options.html#ggafebf7ed116adb38ae5218bc3ce06884caf9595921087e942602ee079158762665">mi_option_max_warnings</a>,               </div>
+<div class="line"><a id="l00918" name="l00918"></a><span class="lineno">  918</span> </div>
+<div class="line"><a id="l00919" name="l00919"></a><span class="lineno">  919</span>  <span class="comment">// advanced options</span></div>
+<div class="line"><a id="l00920" name="l00920"></a><span class="lineno"><a class="line" href="group__options.html#ggafebf7ed116adb38ae5218bc3ce06884caca7ed041be3b0b9d0b82432c7bf41af2">  920</a></span>  <a class="code hl_enumvalue" href="group__options.html#ggafebf7ed116adb38ae5218bc3ce06884caca7ed041be3b0b9d0b82432c7bf41af2">mi_option_reserve_huge_os_pages</a>,    </div>
+<div class="line"><a id="l00921" name="l00921"></a><span class="lineno"><a class="line" href="group__options.html#ggafebf7ed116adb38ae5218bc3ce06884caa13e7926d4339d2aa6fbf61d4473fd5c">  921</a></span>  <a class="code hl_enumvalue" href="group__options.html#ggafebf7ed116adb38ae5218bc3ce06884caa13e7926d4339d2aa6fbf61d4473fd5c">mi_option_reserve_huge_os_pages_at</a>, </div>
+<div class="line"><a id="l00922" name="l00922"></a><span class="lineno"><a class="line" href="group__options.html#ggafebf7ed116adb38ae5218bc3ce06884cafbf4999c828cf79a0fb2de65d23f7333">  922</a></span>  <a class="code hl_enumvalue" href="group__options.html#ggafebf7ed116adb38ae5218bc3ce06884cafbf4999c828cf79a0fb2de65d23f7333">mi_option_reserve_os_memory</a>,        </div>
+<div class="line"><a id="l00923" name="l00923"></a><span class="lineno"><a class="line" href="group__options.html#ggafebf7ed116adb38ae5218bc3ce06884ca7cc4804ced69004fa42a9a136a9ba556">  923</a></span>  <a class="code hl_enumvalue" href="group__options.html#ggafebf7ed116adb38ae5218bc3ce06884ca7cc4804ced69004fa42a9a136a9ba556">mi_option_allow_large_os_pages</a>,     </div>
+<div class="line"><a id="l00924" name="l00924"></a><span class="lineno"><a class="line" href="group__options.html#ggafebf7ed116adb38ae5218bc3ce06884ca9d15c5e3d2115eef681c17e4dd5ab9a4">  924</a></span>  <a class="code hl_enumvalue" href="group__options.html#ggafebf7ed116adb38ae5218bc3ce06884ca9d15c5e3d2115eef681c17e4dd5ab9a4">mi_option_purge_decommits</a>,          </div>
+<div class="line"><a id="l00925" name="l00925"></a><span class="lineno"><a class="line" href="group__options.html#ggafebf7ed116adb38ae5218bc3ce06884cab1c88e23ae290bbeec824038a97959de">  925</a></span>  <a class="code hl_enumvalue" href="group__options.html#ggafebf7ed116adb38ae5218bc3ce06884cab1c88e23ae290bbeec824038a97959de">mi_option_arena_reserve</a>,            </div>
+<div class="line"><a id="l00926" name="l00926"></a><span class="lineno"><a class="line" href="group__options.html#ggafebf7ed116adb38ae5218bc3ce06884ca4b74ae2a69e445de6c2361b73c1d14bf">  926</a></span>  <a class="code hl_enumvalue" href="group__options.html#ggafebf7ed116adb38ae5218bc3ce06884ca4b74ae2a69e445de6c2361b73c1d14bf">mi_option_os_tag</a>,                   </div>
+<div class="line"><a id="l00927" name="l00927"></a><span class="lineno"><a class="line" href="group__options.html#ggafebf7ed116adb38ae5218bc3ce06884ca8f51df355bf6651db899e6085b54865e">  927</a></span>  <a class="code hl_enumvalue" href="group__options.html#ggafebf7ed116adb38ae5218bc3ce06884ca8f51df355bf6651db899e6085b54865e">mi_option_retry_on_oom</a>,             </div>
+<div class="line"><a id="l00928" name="l00928"></a><span class="lineno">  928</span> </div>
+<div class="line"><a id="l00929" name="l00929"></a><span class="lineno">  929</span>  <span class="comment">// experimental options</span></div>
+<div class="line"><a id="l00930" name="l00930"></a><span class="lineno"><a class="line" href="group__options.html#ggafebf7ed116adb38ae5218bc3ce06884ca1e8de72c93da7ff22d91e1e27b52ac2b">  930</a></span>  <a class="code hl_enumvalue" href="group__options.html#ggafebf7ed116adb38ae5218bc3ce06884ca1e8de72c93da7ff22d91e1e27b52ac2b">mi_option_eager_commit</a>,             </div>
+<div class="line"><a id="l00931" name="l00931"></a><span class="lineno"><a class="line" href="group__options.html#ggafebf7ed116adb38ae5218bc3ce06884ca17a190c25be381142d87e0468c4c068c">  931</a></span>  <a class="code hl_enumvalue" href="group__options.html#ggafebf7ed116adb38ae5218bc3ce06884ca17a190c25be381142d87e0468c4c068c">mi_option_eager_commit_delay</a>,       </div>
+<div class="line"><a id="l00932" name="l00932"></a><span class="lineno"><a class="line" href="group__options.html#ggafebf7ed116adb38ae5218bc3ce06884cafd0c5ddbc4b59fd8b5216871728167a5">  932</a></span>  <a class="code hl_enumvalue" href="group__options.html#ggafebf7ed116adb38ae5218bc3ce06884cafd0c5ddbc4b59fd8b5216871728167a5">mi_option_arena_eager_commit</a>,       </div>
+<div class="line"><a id="l00933" name="l00933"></a><span class="lineno"><a class="line" href="group__options.html#ggafebf7ed116adb38ae5218bc3ce06884ca11e62ed69200a489a5be955582078c0c">  933</a></span>  <a class="code hl_enumvalue" href="group__options.html#ggafebf7ed116adb38ae5218bc3ce06884ca11e62ed69200a489a5be955582078c0c">mi_option_abandoned_page_purge</a>,     </div>
+<div class="line"><a id="l00934" name="l00934"></a><span class="lineno"><a class="line" href="group__options.html#ggafebf7ed116adb38ae5218bc3ce06884cadd351e615acd8563529c20a347be7290">  934</a></span>  <a class="code hl_enumvalue" href="group__options.html#ggafebf7ed116adb38ae5218bc3ce06884cadd351e615acd8563529c20a347be7290">mi_option_purge_delay</a>,              </div>
+<div class="line"><a id="l00935" name="l00935"></a><span class="lineno"><a class="line" href="group__options.html#ggafebf7ed116adb38ae5218bc3ce06884ca0ac33a18f6b659fcfaf44efb0bab1b74">  935</a></span>  <a class="code hl_enumvalue" href="group__options.html#ggafebf7ed116adb38ae5218bc3ce06884ca0ac33a18f6b659fcfaf44efb0bab1b74">mi_option_use_numa_nodes</a>,           </div>
+<div class="line"><a id="l00936" name="l00936"></a><span class="lineno"><a class="line" href="group__options.html#ggafebf7ed116adb38ae5218bc3ce06884cadcfb5a09580361b1be65901d2d812de6">  936</a></span>  <a class="code hl_enumvalue" href="group__options.html#ggafebf7ed116adb38ae5218bc3ce06884cadcfb5a09580361b1be65901d2d812de6">mi_option_disallow_os_alloc</a>,        </div>
+<div class="line"><a id="l00937" name="l00937"></a><span class="lineno"><a class="line" href="group__options.html#ggafebf7ed116adb38ae5218bc3ce06884ca9fa61bd9668479f8452d2195759444cc">  937</a></span>  <a class="code hl_enumvalue" href="group__options.html#ggafebf7ed116adb38ae5218bc3ce06884ca9fa61bd9668479f8452d2195759444cc">mi_option_limit_os_alloc</a>,           </div>
+<div class="line"><a id="l00938" name="l00938"></a><span class="lineno"><a class="line" href="group__options.html#ggafebf7ed116adb38ae5218bc3ce06884caa9ad9005d7017c8c30ad2d6ba31db909">  938</a></span>  <a class="code hl_enumvalue" href="group__options.html#ggafebf7ed116adb38ae5218bc3ce06884caa9ad9005d7017c8c30ad2d6ba31db909">mi_option_max_segment_reclaim</a>,        </div>
+<div class="line"><a id="l00939" name="l00939"></a><span class="lineno"><a class="line" href="group__options.html#ggafebf7ed116adb38ae5218bc3ce06884ca6364331e305e7d3c0218b058ff3afc88">  939</a></span>  <a class="code hl_enumvalue" href="group__options.html#ggafebf7ed116adb38ae5218bc3ce06884ca6364331e305e7d3c0218b058ff3afc88">mi_option_destroy_on_exit</a>,            </div>
+<div class="line"><a id="l00940" name="l00940"></a><span class="lineno"><a class="line" href="group__options.html#ggafebf7ed116adb38ae5218bc3ce06884ca8236501f1ab45d26e6fd885d191a2b5e">  940</a></span>  <a class="code hl_enumvalue" href="group__options.html#ggafebf7ed116adb38ae5218bc3ce06884ca8236501f1ab45d26e6fd885d191a2b5e">mi_option_arena_purge_mult</a>,           </div>
+<div class="line"><a id="l00941" name="l00941"></a><span class="lineno"><a class="line" href="group__options.html#ggafebf7ed116adb38ae5218bc3ce06884ca009e4b5684922ce664d73d2a8e1698d9">  941</a></span>  <a class="code hl_enumvalue" href="group__options.html#ggafebf7ed116adb38ae5218bc3ce06884ca009e4b5684922ce664d73d2a8e1698d9">mi_option_abandoned_reclaim_on_free</a>,  </div>
+<div class="line"><a id="l00942" name="l00942"></a><span class="lineno"><a class="line" href="group__options.html#ggafebf7ed116adb38ae5218bc3ce06884ca02005f164bdf03f5f00c5be726adf487">  942</a></span>  <a class="code hl_enumvalue" href="group__options.html#ggafebf7ed116adb38ae5218bc3ce06884ca02005f164bdf03f5f00c5be726adf487">mi_option_purge_extend_delay</a>,         </div>
+<div class="line"><a id="l00943" name="l00943"></a><span class="lineno"><a class="line" href="group__options.html#ggafebf7ed116adb38ae5218bc3ce06884caeae1696100e4057ffc4182730cc04e40">  943</a></span>  <a class="code hl_enumvalue" href="group__options.html#ggafebf7ed116adb38ae5218bc3ce06884caeae1696100e4057ffc4182730cc04e40">mi_option_disallow_arena_alloc</a>,       </div>
+<div class="line"><a id="l00944" name="l00944"></a><span class="lineno"><a class="line" href="group__options.html#ggafebf7ed116adb38ae5218bc3ce06884ca38c67733a3956a1f4eeaca89fab9e78e">  944</a></span>  <a class="code hl_enumvalue" href="group__options.html#ggafebf7ed116adb38ae5218bc3ce06884ca38c67733a3956a1f4eeaca89fab9e78e">mi_option_visit_abandoned</a>,            </div>
+<div class="line"><a id="l00945" name="l00945"></a><span class="lineno">  945</span> </div>
+<div class="line"><a id="l00946" name="l00946"></a><span class="lineno"><a class="line" href="group__options.html#ggafebf7ed116adb38ae5218bc3ce06884ca5b4357b74be0d87568036c32eb1a2e4a">  946</a></span>  <a class="code hl_enumvalue" href="group__options.html#ggafebf7ed116adb38ae5218bc3ce06884ca5b4357b74be0d87568036c32eb1a2e4a">_mi_option_last</a></div>
+<div class="line"><a id="l00947" name="l00947"></a><span class="lineno">  947</span>} <a class="code hl_enumeration" href="group__options.html#gafebf7ed116adb38ae5218bc3ce06884c">mi_option_t</a>;</div>
+</div>
+<div class="line"><a id="l00948" name="l00948"></a><span class="lineno">  948</span> </div>
+<div class="line"><a id="l00949" name="l00949"></a><span class="lineno">  949</span> </div>
+<div class="line"><a id="l00950" name="l00950"></a><span class="lineno"><a class="line" href="group__options.html#ga459ad98f18b3fc9275474807fe0ca188">  950</a></span><span class="keywordtype">bool</span>  <a class="code hl_function" href="group__options.html#ga459ad98f18b3fc9275474807fe0ca188">mi_option_is_enabled</a>(<a class="code hl_enumeration" href="group__options.html#gafebf7ed116adb38ae5218bc3ce06884c">mi_option_t</a> option);</div>
+<div class="line"><a id="l00951" name="l00951"></a><span class="lineno"><a class="line" href="group__options.html#ga04180ae41b0d601421dd62ced40ca050">  951</a></span><span class="keywordtype">void</span>  <a class="code hl_function" href="group__options.html#ga04180ae41b0d601421dd62ced40ca050">mi_option_enable</a>(<a class="code hl_enumeration" href="group__options.html#gafebf7ed116adb38ae5218bc3ce06884c">mi_option_t</a> option);</div>
+<div class="line"><a id="l00952" name="l00952"></a><span class="lineno"><a class="line" href="group__options.html#gaebf6ff707a2e688ebb1a2296ca564054">  952</a></span><span class="keywordtype">void</span>  <a class="code hl_function" href="group__options.html#gaebf6ff707a2e688ebb1a2296ca564054">mi_option_disable</a>(<a class="code hl_enumeration" href="group__options.html#gafebf7ed116adb38ae5218bc3ce06884c">mi_option_t</a> option);</div>
+<div class="line"><a id="l00953" name="l00953"></a><span class="lineno"><a class="line" href="group__options.html#ga9a13d05fcb77489cb06d4d017ebd8bed">  953</a></span><span class="keywordtype">void</span>  <a class="code hl_function" href="group__options.html#ga9a13d05fcb77489cb06d4d017ebd8bed">mi_option_set_enabled</a>(<a class="code hl_enumeration" href="group__options.html#gafebf7ed116adb38ae5218bc3ce06884c">mi_option_t</a> option, <span class="keywordtype">bool</span> enable);</div>
+<div class="line"><a id="l00954" name="l00954"></a><span class="lineno"><a class="line" href="group__options.html#ga65518b69ec5d32336b50e07f74b3f629">  954</a></span><span class="keywordtype">void</span>  <a class="code hl_function" href="group__options.html#ga65518b69ec5d32336b50e07f74b3f629">mi_option_set_enabled_default</a>(<a class="code hl_enumeration" href="group__options.html#gafebf7ed116adb38ae5218bc3ce06884c">mi_option_t</a> option, <span class="keywordtype">bool</span> enable);</div>
+<div class="line"><a id="l00955" name="l00955"></a><span class="lineno">  955</span> </div>
+<div class="line"><a id="l00956" name="l00956"></a><span class="lineno"><a class="line" href="group__options.html#ga7e8af195cc81d3fa64ccf2662caa565a">  956</a></span><span class="keywordtype">long</span>   <a class="code hl_function" href="group__options.html#ga7e8af195cc81d3fa64ccf2662caa565a">mi_option_get</a>(<a class="code hl_enumeration" href="group__options.html#gafebf7ed116adb38ae5218bc3ce06884c">mi_option_t</a> option);</div>
+<div class="line"><a id="l00957" name="l00957"></a><span class="lineno"><a class="line" href="group__options.html#ga96ad9c406338bd314cfe878cfc9bf723">  957</a></span><span class="keywordtype">long</span>   <a class="code hl_function" href="group__options.html#ga96ad9c406338bd314cfe878cfc9bf723">mi_option_get_clamp</a>(<a class="code hl_enumeration" href="group__options.html#gafebf7ed116adb38ae5218bc3ce06884c">mi_option_t</a> option, <span class="keywordtype">long</span> min, <span class="keywordtype">long</span> max);</div>
+<div class="line"><a id="l00958" name="l00958"></a><span class="lineno"><a class="line" href="group__options.html#ga274db5a6ac87cc24ef0b23e7006ed02c">  958</a></span><span class="keywordtype">size_t</span> <a class="code hl_function" href="group__options.html#ga274db5a6ac87cc24ef0b23e7006ed02c">mi_option_get_size</a>(<a class="code hl_enumeration" href="group__options.html#gafebf7ed116adb38ae5218bc3ce06884c">mi_option_t</a> option);</div>
+<div class="line"><a id="l00959" name="l00959"></a><span class="lineno">  959</span> </div>
+<div class="line"><a id="l00960" name="l00960"></a><span class="lineno"><a class="line" href="group__options.html#gaf84921c32375e25754dc2ee6a911fa60">  960</a></span><span class="keywordtype">void</span>  <a class="code hl_function" href="group__options.html#gaf84921c32375e25754dc2ee6a911fa60">mi_option_set</a>(<a class="code hl_enumeration" href="group__options.html#gafebf7ed116adb38ae5218bc3ce06884c">mi_option_t</a> option, <span class="keywordtype">long</span> value);</div>
+<div class="line"><a id="l00961" name="l00961"></a><span class="lineno"><a class="line" href="group__options.html#ga7ef623e440e6e5545cb08c94e71e4b90">  961</a></span><span class="keywordtype">void</span>  <a class="code hl_function" href="group__options.html#ga7ef623e440e6e5545cb08c94e71e4b90">mi_option_set_default</a>(<a class="code hl_enumeration" href="group__options.html#gafebf7ed116adb38ae5218bc3ce06884c">mi_option_t</a> option, <span class="keywordtype">long</span> value);</div>
+<div class="line"><a id="l00962" name="l00962"></a><span class="lineno">  962</span> </div>
+<div class="line"><a id="l00963" name="l00963"></a><span class="lineno">  963</span></div>
+<div class="line"><a id="l00965" name="l00965"></a><span class="lineno">  965</span></div>
+<div class="line"><a id="l00972" name="l00972"></a><span class="lineno">  972</span></div>
+<div class="line"><a id="l00974" name="l00974"></a><span class="lineno"><a class="line" href="group__posix.html#ga705dc7a64bffacfeeb0141501a5c35d7">  974</a></span><span class="keywordtype">void</span>   <a class="code hl_function" href="group__posix.html#ga705dc7a64bffacfeeb0141501a5c35d7">mi_cfree</a>(<span class="keywordtype">void</span>* p);</div>
+<div class="line"><a id="l00975" name="l00975"></a><span class="lineno"><a class="line" href="group__posix.html#ga66bcfeb4faedbb42b796bc680821ef84">  975</a></span><span class="keywordtype">void</span>* <a class="code hl_function" href="group__posix.html#ga66bcfeb4faedbb42b796bc680821ef84">mi__expand</a>(<span class="keywordtype">void</span>* p, <span class="keywordtype">size_t</span> newsize);</div>
+<div class="line"><a id="l00976" name="l00976"></a><span class="lineno">  976</span> </div>
+<div class="line"><a id="l00977" name="l00977"></a><span class="lineno">  977</span><span class="keywordtype">void</span>*  <a class="code hl_function" href="group__malloc.html#ga23a0fbb452b5dce8e31fab1a1958cacc">mi_recalloc</a>(<span class="keywordtype">void</span>* p, <span class="keywordtype">size_t</span> count, <span class="keywordtype">size_t</span> size);</div>
+<div class="line"><a id="l00978" name="l00978"></a><span class="lineno"><a class="line" href="group__posix.html#ga4531c9e775bb3ae12db57c1ba8a5d7de">  978</a></span><span class="keywordtype">size_t</span> <a class="code hl_function" href="group__posix.html#ga4531c9e775bb3ae12db57c1ba8a5d7de">mi_malloc_size</a>(<span class="keyword">const</span> <span class="keywordtype">void</span>* p);</div>
+<div class="line"><a id="l00979" name="l00979"></a><span class="lineno"><a class="line" href="group__posix.html#ga9d23ac7885fed7413c11d8e0ffa31071">  979</a></span><span class="keywordtype">size_t</span> <a class="code hl_function" href="group__posix.html#ga9d23ac7885fed7413c11d8e0ffa31071">mi_malloc_good_size</a>(<span class="keywordtype">size_t</span> size);</div>
+<div class="line"><a id="l00980" name="l00980"></a><span class="lineno"><a class="line" href="group__posix.html#ga06d07cf357bbac5c73ba5d0c0c421e17">  980</a></span><span class="keywordtype">size_t</span> <a class="code hl_function" href="group__posix.html#ga06d07cf357bbac5c73ba5d0c0c421e17">mi_malloc_usable_size</a>(<span class="keyword">const</span> <span class="keywordtype">void</span> *p);</div>
+<div class="line"><a id="l00981" name="l00981"></a><span class="lineno">  981</span> </div>
+<div class="line"><a id="l00982" name="l00982"></a><span class="lineno"><a class="line" href="group__posix.html#gacff84f226ba9feb2031b8992e5579447">  982</a></span><span class="keywordtype">int</span> <a class="code hl_function" href="group__posix.html#gacff84f226ba9feb2031b8992e5579447">mi_posix_memalign</a>(<span class="keywordtype">void</span>** p, <span class="keywordtype">size_t</span> alignment, <span class="keywordtype">size_t</span> size);</div>
+<div class="line"><a id="l00983" name="l00983"></a><span class="lineno"><a class="line" href="group__posix.html#gad5a69c8fea96aa2b7a7c818c2130090a">  983</a></span><span class="keywordtype">int</span> <a class="code hl_function" href="group__posix.html#gad5a69c8fea96aa2b7a7c818c2130090a">mi__posix_memalign</a>(<span class="keywordtype">void</span>** p, <span class="keywordtype">size_t</span> alignment, <span class="keywordtype">size_t</span> size);</div>
+<div class="line"><a id="l00984" name="l00984"></a><span class="lineno"><a class="line" href="group__posix.html#ga726867f13fd29ca36064954c0285b1d8">  984</a></span><span class="keywordtype">void</span>* <a class="code hl_function" href="group__posix.html#ga726867f13fd29ca36064954c0285b1d8">mi_memalign</a>(<span class="keywordtype">size_t</span> alignment, <span class="keywordtype">size_t</span> size);</div>
+<div class="line"><a id="l00985" name="l00985"></a><span class="lineno"><a class="line" href="group__posix.html#ga50cafb9722020402f065de93799f64ca">  985</a></span><span class="keywordtype">void</span>* <a class="code hl_function" href="group__posix.html#ga50cafb9722020402f065de93799f64ca">mi_valloc</a>(<span class="keywordtype">size_t</span> size);</div>
+<div class="line"><a id="l00986" name="l00986"></a><span class="lineno"><a class="line" href="group__posix.html#ga644bebccdbb2821542dd8c7e7641f476">  986</a></span><span class="keywordtype">void</span>* <a class="code hl_function" href="group__posix.html#ga644bebccdbb2821542dd8c7e7641f476">mi_pvalloc</a>(<span class="keywordtype">size_t</span> size);</div>
+<div class="line"><a id="l00987" name="l00987"></a><span class="lineno"><a class="line" href="group__posix.html#ga430ed1513f0571ff83be00ec58a98ee0">  987</a></span><span class="keywordtype">void</span>* <a class="code hl_function" href="group__posix.html#ga430ed1513f0571ff83be00ec58a98ee0">mi_aligned_alloc</a>(<span class="keywordtype">size_t</span> alignment, <span class="keywordtype">size_t</span> size);</div>
+<div class="line"><a id="l00988" name="l00988"></a><span class="lineno">  988</span> </div>
+<div class="line"><a id="l00989" name="l00989"></a><span class="lineno"><a class="line" href="group__posix.html#gaa9fd7f25c9ac3a20e89b33bd6e383fcf">  989</a></span><span class="keywordtype">unsigned</span> <span class="keywordtype">short</span>* <a class="code hl_function" href="group__posix.html#gaa9fd7f25c9ac3a20e89b33bd6e383fcf">mi_wcsdup</a>(<span class="keyword">const</span> <span class="keywordtype">unsigned</span> <span class="keywordtype">short</span>* s);</div>
+<div class="line"><a id="l00990" name="l00990"></a><span class="lineno"><a class="line" href="group__posix.html#ga7b82a44094fdec4d2084eb4288a979b0">  990</a></span><span class="keywordtype">unsigned</span> <span class="keywordtype">char</span>*  <a class="code hl_function" href="group__posix.html#ga7b82a44094fdec4d2084eb4288a979b0">mi_mbsdup</a>(<span class="keyword">const</span> <span class="keywordtype">unsigned</span> <span class="keywordtype">char</span>* s);</div>
+<div class="line"><a id="l00991" name="l00991"></a><span class="lineno"><a class="line" href="group__posix.html#gab41369c1a1da7504013a7a0b1d4dd958">  991</a></span><span class="keywordtype">int</span> <a class="code hl_function" href="group__posix.html#gab41369c1a1da7504013a7a0b1d4dd958">mi_dupenv_s</a>(<span class="keywordtype">char</span>** buf, <span class="keywordtype">size_t</span>* size, <span class="keyword">const</span> <span class="keywordtype">char</span>* name);</div>
+<div class="line"><a id="l00992" name="l00992"></a><span class="lineno"><a class="line" href="group__posix.html#ga6ac6a6a8f3c96f1af24bb8d0439cbbd1">  992</a></span><span class="keywordtype">int</span> <a class="code hl_function" href="group__posix.html#ga6ac6a6a8f3c96f1af24bb8d0439cbbd1">mi_wdupenv_s</a>(<span class="keywordtype">unsigned</span> <span class="keywordtype">short</span>** buf, <span class="keywordtype">size_t</span>* size, <span class="keyword">const</span> <span class="keywordtype">unsigned</span> <span class="keywordtype">short</span>* name);</div>
+<div class="line"><a id="l00993" name="l00993"></a><span class="lineno">  993</span></div>
+<div class="line"><a id="l00996" name="l00996"></a><span class="lineno"><a class="line" href="group__posix.html#gadfeccb72748a2f6305474a37d9d57bce">  996</a></span><span class="keywordtype">void</span>* <a class="code hl_function" href="group__posix.html#gadfeccb72748a2f6305474a37d9d57bce">mi_reallocarray</a>(<span class="keywordtype">void</span>* p, <span class="keywordtype">size_t</span> count, <span class="keywordtype">size_t</span> size);</div>
+<div class="line"><a id="l00997" name="l00997"></a><span class="lineno">  997</span></div>
+<div class="line"><a id="l00999" name="l00999"></a><span class="lineno"><a class="line" href="group__posix.html#ga7e1934d60a3e697950eeb48e042bfad5">  999</a></span><span class="keywordtype">int</span>   <a class="code hl_function" href="group__posix.html#ga7e1934d60a3e697950eeb48e042bfad5">mi_reallocarr</a>(<span class="keywordtype">void</span>* p, <span class="keywordtype">size_t</span> count, <span class="keywordtype">size_t</span> size);</div>
+<div class="line"><a id="l01000" name="l01000"></a><span class="lineno"> 1000</span> </div>
+<div class="line"><a id="l01001" name="l01001"></a><span class="lineno"><a class="line" href="group__posix.html#gaf82cbb4b4f24acf723348628451798d3"> 1001</a></span><span class="keywordtype">void</span>* <a class="code hl_function" href="group__posix.html#gaf82cbb4b4f24acf723348628451798d3">mi_aligned_recalloc</a>(<span class="keywordtype">void</span>* p, <span class="keywordtype">size_t</span> newcount, <span class="keywordtype">size_t</span> size, <span class="keywordtype">size_t</span> alignment);</div>
+<div class="line"><a id="l01002" name="l01002"></a><span class="lineno"><a class="line" href="group__posix.html#ga16570deddd559001b44953eedbad0084"> 1002</a></span><span class="keywordtype">void</span>* <a class="code hl_function" href="group__posix.html#ga16570deddd559001b44953eedbad0084">mi_aligned_offset_recalloc</a>(<span class="keywordtype">void</span>* p, <span class="keywordtype">size_t</span> newcount, <span class="keywordtype">size_t</span> size, <span class="keywordtype">size_t</span> alignment, <span class="keywordtype">size_t</span> offset);</div>
+<div class="line"><a id="l01003" name="l01003"></a><span class="lineno"> 1003</span> </div>
+<div class="line"><a id="l01004" name="l01004"></a><span class="lineno"><a class="line" href="group__posix.html#gae01389eedab8d67341ff52e2aad80ebb"> 1004</a></span><span class="keywordtype">void</span> <a class="code hl_function" href="group__posix.html#gae01389eedab8d67341ff52e2aad80ebb">mi_free_size</a>(<span class="keywordtype">void</span>* p, <span class="keywordtype">size_t</span> size);</div>
+<div class="line"><a id="l01005" name="l01005"></a><span class="lineno"><a class="line" href="group__posix.html#ga72e9d7ffb5fe94d69bc722c8506e27bc"> 1005</a></span><span class="keywordtype">void</span> <a class="code hl_function" href="group__posix.html#ga72e9d7ffb5fe94d69bc722c8506e27bc">mi_free_size_aligned</a>(<span class="keywordtype">void</span>* p, <span class="keywordtype">size_t</span> size, <span class="keywordtype">size_t</span> alignment);</div>
+<div class="line"><a id="l01006" name="l01006"></a><span class="lineno"><a class="line" href="group__posix.html#ga0d28d5cf61e6bfbb18c63092939fe5c9"> 1006</a></span><span class="keywordtype">void</span> <a class="code hl_function" href="group__posix.html#ga0d28d5cf61e6bfbb18c63092939fe5c9">mi_free_aligned</a>(<span class="keywordtype">void</span>* p, <span class="keywordtype">size_t</span> alignment);</div>
+<div class="line"><a id="l01007" name="l01007"></a><span class="lineno"> 1007</span></div>
+<div class="line"><a id="l01009" name="l01009"></a><span class="lineno"> 1009</span></div>
+<div class="line"><a id="l01022" name="l01022"></a><span class="lineno"> 1022</span></div>
+<div class="line"><a id="l01024" name="l01024"></a><span class="lineno"><a class="line" href="group__cpp.html#ga633d96e3bc7011f960df9f3b2731fc6a"> 1024</a></span><span class="keywordtype">void</span>* <a class="code hl_function" href="group__cpp.html#ga633d96e3bc7011f960df9f3b2731fc6a">mi_new</a>(std::size_t n) <span class="keyword">noexcept</span>(<span class="keyword">false</span>);</div>
+<div class="line"><a id="l01025" name="l01025"></a><span class="lineno"> 1025</span></div>
+<div class="line"><a id="l01027" name="l01027"></a><span class="lineno"><a class="line" href="group__cpp.html#gadd11b85c15d21d308386844b5233856c"> 1027</a></span><span class="keywordtype">void</span>* <a class="code hl_function" href="group__cpp.html#gadd11b85c15d21d308386844b5233856c">mi_new_n</a>(<span class="keywordtype">size_t</span> count, <span class="keywordtype">size_t</span> size) <span class="keyword">noexcept</span>(<span class="keyword">false</span>);</div>
+<div class="line"><a id="l01028" name="l01028"></a><span class="lineno"> 1028</span></div>
+<div class="line"><a id="l01030" name="l01030"></a><span class="lineno"><a class="line" href="group__cpp.html#ga79c54da0b4b4ce9fcc11d2f6ef6675f8"> 1030</a></span><span class="keywordtype">void</span>* <a class="code hl_function" href="group__cpp.html#ga79c54da0b4b4ce9fcc11d2f6ef6675f8">mi_new_aligned</a>(std::size_t n, std::align_val_t alignment) <span class="keyword">noexcept</span>(<span class="keyword">false</span>);</div>
+<div class="line"><a id="l01031" name="l01031"></a><span class="lineno"> 1031</span></div>
+<div class="line"><a id="l01033" name="l01033"></a><span class="lineno"><a class="line" href="group__cpp.html#ga5cb4f120d1f7296074256215aa9a9e54"> 1033</a></span><span class="keywordtype">void</span>* <a class="code hl_function" href="group__cpp.html#ga5cb4f120d1f7296074256215aa9a9e54">mi_new_nothrow</a>(<span class="keywordtype">size_t</span> n);</div>
+<div class="line"><a id="l01034" name="l01034"></a><span class="lineno"> 1034</span></div>
+<div class="line"><a id="l01036" name="l01036"></a><span class="lineno"><a class="line" href="group__cpp.html#ga92ae00b6dd64406c7e64557711ec04b7"> 1036</a></span><span class="keywordtype">void</span>* <a class="code hl_function" href="group__cpp.html#ga92ae00b6dd64406c7e64557711ec04b7">mi_new_aligned_nothrow</a>(<span class="keywordtype">size_t</span> n, <span class="keywordtype">size_t</span> alignment);</div>
+<div class="line"><a id="l01037" name="l01037"></a><span class="lineno"> 1037</span></div>
+<div class="line"><a id="l01039" name="l01039"></a><span class="lineno"><a class="line" href="group__cpp.html#ga6867d89baf992728e0cc20a1f47db4d0"> 1039</a></span><span class="keywordtype">void</span>* <a class="code hl_function" href="group__cpp.html#ga6867d89baf992728e0cc20a1f47db4d0">mi_new_realloc</a>(<span class="keywordtype">void</span>* p, <span class="keywordtype">size_t</span> newsize);</div>
+<div class="line"><a id="l01040" name="l01040"></a><span class="lineno"> 1040</span></div>
+<div class="line"><a id="l01042" name="l01042"></a><span class="lineno"><a class="line" href="group__cpp.html#gaace912ce086682d56f3ce9f7638d9d67"> 1042</a></span><span class="keywordtype">void</span>* <a class="code hl_function" href="group__cpp.html#gaace912ce086682d56f3ce9f7638d9d67">mi_new_reallocn</a>(<span class="keywordtype">void</span>* p, <span class="keywordtype">size_t</span> newcount, <span class="keywordtype">size_t</span> size);</div>
+<div class="line"><a id="l01043" name="l01043"></a><span class="lineno"> 1043</span></div>
+<div class="line"><a id="l01051" name="l01051"></a><span class="lineno"><a class="line" href="group__cpp.html"> 1051</a></span><span class="keyword">template</span>&lt;<span class="keyword">class</span> T&gt; <span class="keyword">struct </span><a class="code hl_struct" href="group__cpp.html#structmi__stl__allocator">mi_stl_allocator</a> { }</div>
+<div class="line"><a id="l01052" name="l01052"></a><span class="lineno"> 1052</span></div>
+<div class="line"><a id="l01054" name="l01054"></a><span class="lineno"> 1054</span></div>
+<div class="line"><a id="l01113" name="l01113"></a><span class="lineno"> 1113</span></div>
+<div class="line"><a id="l01198" name="l01198"></a><span class="lineno"> 1198</span></div>
+<div class="line"><a id="l01263" name="l01263"></a><span class="lineno"> 1263</span></div>
+<div class="line"><a id="l01433" name="l01433"></a><span class="lineno"> 1433</span></div>
+<div class="ttc" id="agroup__aligned_html_ga2022f71b95a7cd6cce1b6e07752ae8ca"><div class="ttname"><a href="group__aligned.html#ga2022f71b95a7cd6cce1b6e07752ae8ca">mi_malloc_aligned_at</a></div><div class="ttdeci">void * mi_malloc_aligned_at(size_t size, size_t alignment, size_t offset)</div><div class="ttdoc">Allocate size bytes aligned by alignment at a specified offset.</div></div>
+<div class="ttc" id="agroup__aligned_html_ga424ef386fb1f9f8e0a86ab53f16eaaf1"><div class="ttname"><a href="group__aligned.html#ga424ef386fb1f9f8e0a86ab53f16eaaf1">mi_calloc_aligned</a></div><div class="ttdeci">void * mi_calloc_aligned(size_t count, size_t size, size_t alignment)</div></div>
+<div class="ttc" id="agroup__aligned_html_ga5d7a46d054b4d7abe9d8d2474add2edf"><div class="ttname"><a href="group__aligned.html#ga5d7a46d054b4d7abe9d8d2474add2edf">mi_realloc_aligned</a></div><div class="ttdeci">void * mi_realloc_aligned(void *p, size_t newsize, size_t alignment)</div></div>
+<div class="ttc" id="agroup__aligned_html_ga69578ff1a98ca16e1dcd02c0995cd65c"><div class="ttname"><a href="group__aligned.html#ga69578ff1a98ca16e1dcd02c0995cd65c">mi_malloc_aligned</a></div><div class="ttdeci">void * mi_malloc_aligned(size_t size, size_t alignment)</div><div class="ttdoc">Allocate size bytes aligned by alignment.</div></div>
+<div class="ttc" id="agroup__aligned_html_ga7c1778805ce50ebbf02ccbd5e39d5dba"><div class="ttname"><a href="group__aligned.html#ga7c1778805ce50ebbf02ccbd5e39d5dba">mi_zalloc_aligned_at</a></div><div class="ttdeci">void * mi_zalloc_aligned_at(size_t size, size_t alignment, size_t offset)</div></div>
+<div class="ttc" id="agroup__aligned_html_ga977f96bd2c5c141bcd70e6685c90d6c3"><div class="ttname"><a href="group__aligned.html#ga977f96bd2c5c141bcd70e6685c90d6c3">mi_calloc_aligned_at</a></div><div class="ttdeci">void * mi_calloc_aligned_at(size_t count, size_t size, size_t alignment, size_t offset)</div></div>
+<div class="ttc" id="agroup__aligned_html_gaac7d0beb782f9b9ac31f47492b130f82"><div class="ttname"><a href="group__aligned.html#gaac7d0beb782f9b9ac31f47492b130f82">mi_zalloc_aligned</a></div><div class="ttdeci">void * mi_zalloc_aligned(size_t size, size_t alignment)</div></div>
+<div class="ttc" id="agroup__aligned_html_gad06dcf2bb8faadb2c8ea61ee5d24bbf6"><div class="ttname"><a href="group__aligned.html#gad06dcf2bb8faadb2c8ea61ee5d24bbf6">mi_realloc_aligned_at</a></div><div class="ttdeci">void * mi_realloc_aligned_at(void *p, size_t newsize, size_t alignment, size_t offset)</div></div>
+<div class="ttc" id="agroup__analysis_html_a2b7a0c92ece8daf46b558efc990ebdc1"><div class="ttname"><a href="group__analysis.html#a2b7a0c92ece8daf46b558efc990ebdc1">mi_heap_area_t::heap_tag</a></div><div class="ttdeci">int heap_tag</div><div class="ttdoc">heap tag associated with this area (see mi_heap_new_ex)</div><div class="ttdef"><b>Definition</b> mimalloc-doc.h:860</div></div>
+<div class="ttc" id="agroup__analysis_html_a332a6c14d736a99699d5453a1cb04b41"><div class="ttname"><a href="group__analysis.html#a332a6c14d736a99699d5453a1cb04b41">mi_heap_area_t::block_size</a></div><div class="ttdeci">size_t block_size</div><div class="ttdoc">size in bytes of one block</div><div class="ttdef"><b>Definition</b> mimalloc-doc.h:858</div></div>
+<div class="ttc" id="agroup__analysis_html_ab47526df656d8837ec3e97f11b83f835"><div class="ttname"><a href="group__analysis.html#ab47526df656d8837ec3e97f11b83f835">mi_heap_area_t::committed</a></div><div class="ttdeci">size_t committed</div><div class="ttdoc">current committed bytes of this area</div><div class="ttdef"><b>Definition</b> mimalloc-doc.h:856</div></div>
+<div class="ttc" id="agroup__analysis_html_ab53664e31d7fe2564f8d42041ef75cb3"><div class="ttname"><a href="group__analysis.html#ab53664e31d7fe2564f8d42041ef75cb3">mi_heap_area_t::full_block_size</a></div><div class="ttdeci">size_t full_block_size</div><div class="ttdoc">size in bytes of a full block including padding and metadata.</div><div class="ttdef"><b>Definition</b> mimalloc-doc.h:859</div></div>
+<div class="ttc" id="agroup__analysis_html_ab820302c5cd0df133eb8e51650a008b4"><div class="ttname"><a href="group__analysis.html#ab820302c5cd0df133eb8e51650a008b4">mi_heap_area_t::used</a></div><div class="ttdeci">size_t used</div><div class="ttdoc">bytes in use by allocated blocks</div><div class="ttdef"><b>Definition</b> mimalloc-doc.h:857</div></div>
+<div class="ttc" id="agroup__analysis_html_ae0085e6e1cf059a4eb7767e30e9991b8"><div class="ttname"><a href="group__analysis.html#ae0085e6e1cf059a4eb7767e30e9991b8">mi_heap_area_t::blocks</a></div><div class="ttdeci">void * blocks</div><div class="ttdoc">start of the area containing heap blocks</div><div class="ttdef"><b>Definition</b> mimalloc-doc.h:854</div></div>
+<div class="ttc" id="agroup__analysis_html_ae848a3e6840414891035423948ca0383"><div class="ttname"><a href="group__analysis.html#ae848a3e6840414891035423948ca0383">mi_heap_area_t::reserved</a></div><div class="ttdeci">size_t reserved</div><div class="ttdoc">bytes reserved for this area</div><div class="ttdef"><b>Definition</b> mimalloc-doc.h:855</div></div>
 <div class="ttc" id="agroup__analysis_html_ga0d67c1789faaa15ff366c024fcaf6377"><div class="ttname"><a href="group__analysis.html#ga0d67c1789faaa15ff366c024fcaf6377">mi_heap_check_owned</a></div><div class="ttdeci">bool mi_heap_check_owned(mi_heap_t *heap, const void *p)</div><div class="ttdoc">Check safely if any pointer is part of a heap.</div></div>
 <div class="ttc" id="agroup__analysis_html_ga628c237489c2679af84a4d0d143b3dd5"><div class="ttname"><a href="group__analysis.html#ga628c237489c2679af84a4d0d143b3dd5">mi_check_owned</a></div><div class="ttdeci">bool mi_check_owned(const void *p)</div><div class="ttdoc">Check safely if any pointer is part of the default heap of this thread.</div></div>
+<div class="ttc" id="agroup__analysis_html_ga6a4865a887b2ec5247854af61562503c"><div class="ttname"><a href="group__analysis.html#ga6a4865a887b2ec5247854af61562503c">mi_abandoned_visit_blocks</a></div><div class="ttdeci">bool mi_abandoned_visit_blocks(mi_subproc_id_t subproc_id, int heap_tag, bool visit_blocks, mi_block_visit_fun *visitor, void *arg)</div><div class="ttdoc">Visit all areas and blocks in abandoned heaps.</div></div>
 <div class="ttc" id="agroup__analysis_html_ga70c46687dc6e9dc98b232b02646f8bed"><div class="ttname"><a href="group__analysis.html#ga70c46687dc6e9dc98b232b02646f8bed">mi_heap_visit_blocks</a></div><div class="ttdeci">bool mi_heap_visit_blocks(const mi_heap_t *heap, bool visit_all_blocks, mi_block_visit_fun *visitor, void *arg)</div><div class="ttdoc">Visit all areas and blocks in a heap.</div></div>
+<div class="ttc" id="agroup__analysis_html_ga8255dc9371e6b299d9802a610c4e34ec"><div class="ttname"><a href="group__analysis.html#ga8255dc9371e6b299d9802a610c4e34ec">mi_block_visit_fun</a></div><div class="ttdeci">bool mi_block_visit_fun(const mi_heap_t *heap, const mi_heap_area_t *area, void *block, size_t block_size, void *arg)</div><div class="ttdoc">Visitor function passed to mi_heap_visit_blocks()</div><div class="ttdef"><b>Definition</b> mimalloc-doc.h:870</div></div>
 <div class="ttc" id="agroup__analysis_html_gaa862aa8ed8d57d84cae41fc1022d71af"><div class="ttname"><a href="group__analysis.html#gaa862aa8ed8d57d84cae41fc1022d71af">mi_heap_contains_block</a></div><div class="ttdeci">bool mi_heap_contains_block(mi_heap_t *heap, const void *p)</div><div class="ttdoc">Does a heap contain a pointer to a previously allocated block?</div></div>
-<div class="ttc" id="agroup__analysis_html_gadfa01e2900f0e5d515ad5506b26f6d65"><div class="ttname"><a href="group__analysis.html#gadfa01e2900f0e5d515ad5506b26f6d65">mi_block_visit_fun</a></div><div class="ttdeci">bool() mi_block_visit_fun(const mi_heap_t *heap, const mi_heap_area_t *area, void *block, size_t block_size, void *arg)</div><div class="ttdoc">Visitor function passed to mi_heap_visit_blocks()</div><div class="ttdef"><b>Definition:</b> mimalloc-doc.h:776</div></div>
-<div class="ttc" id="agroup__analysis_html_structmi__heap__area__t"><div class="ttname"><a href="group__analysis.html#structmi__heap__area__t">mi_heap_area_t</a></div><div class="ttdoc">An area of heap space contains blocks of a single size.</div><div class="ttdef"><b>Definition:</b> mimalloc-doc.h:761</div></div>
-<div class="ttc" id="agroup__cpp_html_ga756f4b2bc6a7ecd0a90baea8e90c7907"><div class="ttname"><a href="group__cpp.html#ga756f4b2bc6a7ecd0a90baea8e90c7907">mi_new_reallocn</a></div><div class="ttdeci">void * mi_new_reallocn(void *p, size_t newcount, size_t size)</div><div class="ttdoc">like mi_reallocn(), but when out of memory, use std::get_new_handler and raise std::bad_alloc excepti...</div></div>
-<div class="ttc" id="agroup__cpp_html_gaab78a32f55149e9fbf432d5288e38e1e"><div class="ttname"><a href="group__cpp.html#gaab78a32f55149e9fbf432d5288e38e1e">mi_new_realloc</a></div><div class="ttdeci">void * mi_new_realloc(void *p, size_t newsize)</div><div class="ttdoc">like mi_realloc(), but when out of memory, use std::get_new_handler and raise std::bad_alloc exceptio...</div></div>
-<div class="ttc" id="agroup__cpp_html_gaad048a9fce3d02c5909cd05c6ec24545"><div class="ttname"><a href="group__cpp.html#gaad048a9fce3d02c5909cd05c6ec24545">mi_new</a></div><div class="ttdeci">void * mi_new(std::size_t n) noexcept(false)</div><div class="ttdoc">like mi_malloc(), but when out of memory, use std::get_new_handler and raise std::bad_alloc exception...</div></div>
-<div class="ttc" id="agroup__cpp_html_gab5e29558926d934c3f1cae8c815f942c"><div class="ttname"><a href="group__cpp.html#gab5e29558926d934c3f1cae8c815f942c">mi_new_aligned_nothrow</a></div><div class="ttdeci">void * mi_new_aligned_nothrow(size_t n, size_t alignment)</div><div class="ttdoc">like mi_malloc_aligned, but when out of memory, use std::get_new_handler but return NULL on failure.</div></div>
-<div class="ttc" id="agroup__cpp_html_gae7bc4f56cd57ed3359060ff4f38bda81"><div class="ttname"><a href="group__cpp.html#gae7bc4f56cd57ed3359060ff4f38bda81">mi_new_n</a></div><div class="ttdeci">void * mi_new_n(size_t count, size_t size) noexcept(false)</div><div class="ttdoc">like mi_mallocn(), but when out of memory, use std::get_new_handler and raise std::bad_alloc exceptio...</div></div>
-<div class="ttc" id="agroup__cpp_html_gaeaded64eda71ed6b1d569d3e723abc4a"><div class="ttname"><a href="group__cpp.html#gaeaded64eda71ed6b1d569d3e723abc4a">mi_new_nothrow</a></div><div class="ttdeci">void * mi_new_nothrow(size_t n)</div><div class="ttdoc">like mi_malloc, but when out of memory, use std::get_new_handler but return NULL on failure.</div></div>
-<div class="ttc" id="agroup__cpp_html_gaef2c2bdb4f70857902d3c8903ac095f3"><div class="ttname"><a href="group__cpp.html#gaef2c2bdb4f70857902d3c8903ac095f3">mi_new_aligned</a></div><div class="ttdeci">void * mi_new_aligned(std::size_t n, std::align_val_t alignment) noexcept(false)</div><div class="ttdoc">like mi_malloc_aligned(), but when out of memory, use std::get_new_handler and raise std::bad_alloc e...</div></div>
-<div class="ttc" id="agroup__cpp_html_structmi__stl__allocator"><div class="ttname"><a href="group__cpp.html#structmi__stl__allocator">mi_stl_allocator</a></div><div class="ttdoc">std::allocator implementation for mimalloc for use in STL containers.</div><div class="ttdef"><b>Definition:</b> mimalloc-doc.h:912</div></div>
+<div class="ttc" id="agroup__analysis_html_structmi__heap__area__t"><div class="ttname"><a href="group__analysis.html#structmi__heap__area__t">mi_heap_area_t</a></div><div class="ttdoc">An area of heap space contains blocks of a single size.</div><div class="ttdef"><b>Definition</b> mimalloc-doc.h:853</div></div>
+<div class="ttc" id="agroup__cpp_html_ga5cb4f120d1f7296074256215aa9a9e54"><div class="ttname"><a href="group__cpp.html#ga5cb4f120d1f7296074256215aa9a9e54">mi_new_nothrow</a></div><div class="ttdeci">void * mi_new_nothrow(size_t n)</div><div class="ttdoc">like mi_malloc, but when out of memory, use std::get_new_handler but return NULL on failure.</div></div>
+<div class="ttc" id="agroup__cpp_html_ga633d96e3bc7011f960df9f3b2731fc6a"><div class="ttname"><a href="group__cpp.html#ga633d96e3bc7011f960df9f3b2731fc6a">mi_new</a></div><div class="ttdeci">void * mi_new(std::size_t n) noexcept(false)</div><div class="ttdoc">like mi_malloc(), but when out of memory, use std::get_new_handler and raise std::bad_alloc exception...</div></div>
+<div class="ttc" id="agroup__cpp_html_ga6867d89baf992728e0cc20a1f47db4d0"><div class="ttname"><a href="group__cpp.html#ga6867d89baf992728e0cc20a1f47db4d0">mi_new_realloc</a></div><div class="ttdeci">void * mi_new_realloc(void *p, size_t newsize)</div><div class="ttdoc">like mi_realloc(), but when out of memory, use std::get_new_handler and raise std::bad_alloc exceptio...</div></div>
+<div class="ttc" id="agroup__cpp_html_ga79c54da0b4b4ce9fcc11d2f6ef6675f8"><div class="ttname"><a href="group__cpp.html#ga79c54da0b4b4ce9fcc11d2f6ef6675f8">mi_new_aligned</a></div><div class="ttdeci">void * mi_new_aligned(std::size_t n, std::align_val_t alignment) noexcept(false)</div><div class="ttdoc">like mi_malloc_aligned(), but when out of memory, use std::get_new_handler and raise std::bad_alloc e...</div></div>
+<div class="ttc" id="agroup__cpp_html_ga92ae00b6dd64406c7e64557711ec04b7"><div class="ttname"><a href="group__cpp.html#ga92ae00b6dd64406c7e64557711ec04b7">mi_new_aligned_nothrow</a></div><div class="ttdeci">void * mi_new_aligned_nothrow(size_t n, size_t alignment)</div><div class="ttdoc">like mi_malloc_aligned, but when out of memory, use std::get_new_handler but return NULL on failure.</div></div>
+<div class="ttc" id="agroup__cpp_html_gaace912ce086682d56f3ce9f7638d9d67"><div class="ttname"><a href="group__cpp.html#gaace912ce086682d56f3ce9f7638d9d67">mi_new_reallocn</a></div><div class="ttdeci">void * mi_new_reallocn(void *p, size_t newcount, size_t size)</div><div class="ttdoc">like mi_reallocn(), but when out of memory, use std::get_new_handler and raise std::bad_alloc excepti...</div></div>
+<div class="ttc" id="agroup__cpp_html_gadd11b85c15d21d308386844b5233856c"><div class="ttname"><a href="group__cpp.html#gadd11b85c15d21d308386844b5233856c">mi_new_n</a></div><div class="ttdeci">void * mi_new_n(size_t count, size_t size) noexcept(false)</div><div class="ttdoc">like mi_mallocn(), but when out of memory, use std::get_new_handler and raise std::bad_alloc exceptio...</div></div>
+<div class="ttc" id="agroup__cpp_html_structmi__stl__allocator"><div class="ttname"><a href="group__cpp.html#structmi__stl__allocator">mi_stl_allocator</a></div><div class="ttdoc">std::allocator implementation for mimalloc for use in STL containers.</div><div class="ttdef"><b>Definition</b> mimalloc-doc.h:1051</div></div>
 <div class="ttc" id="agroup__extended_html_ga00ec3324b6b2591c7fe3677baa30a767"><div class="ttname"><a href="group__extended.html#ga00ec3324b6b2591c7fe3677baa30a767">mi_reserve_os_memory</a></div><div class="ttdeci">int mi_reserve_os_memory(size_t size, bool commit, bool allow_large)</div><div class="ttdoc">Reserve OS memory for use by mimalloc.</div></div>
 <div class="ttc" id="agroup__extended_html_ga089c859d9eddc5f9b4bd946cd53cebee"><div class="ttname"><a href="group__extended.html#ga089c859d9eddc5f9b4bd946cd53cebee">mi_usable_size</a></div><div class="ttdeci">size_t mi_usable_size(void *p)</div><div class="ttdoc">Return the available bytes in a memory block.</div></div>
 <div class="ttc" id="agroup__extended_html_ga0ae4581e85453456a0d658b2b98bf7bf"><div class="ttname"><a href="group__extended.html#ga0ae4581e85453456a0d658b2b98bf7bf">mi_thread_done</a></div><div class="ttdeci">void mi_thread_done(void)</div><div class="ttdoc">Uninitialize mimalloc on a thread.</div></div>
-<div class="ttc" id="agroup__extended_html_ga220f29f40a44404b0061c15bc1c31152"><div class="ttname"><a href="group__extended.html#ga220f29f40a44404b0061c15bc1c31152">mi_zalloc_small</a></div><div class="ttdeci">void * mi_zalloc_small(size_t size)</div><div class="ttdoc">Allocate a zero initialized small object.</div></div>
-<div class="ttc" id="agroup__extended_html_ga251d369cda3f1c2a955c555486ed90e5"><div class="ttname"><a href="group__extended.html#ga251d369cda3f1c2a955c555486ed90e5">mi_error_fun</a></div><div class="ttdeci">void() mi_error_fun(int err, void *arg)</div><div class="ttdoc">Type of error callback functions.</div><div class="ttdef"><b>Definition:</b> mimalloc-doc.h:391</div></div>
-<div class="ttc" id="agroup__extended_html_ga299dae78d25ce112e384a98b7309c5be"><div class="ttname"><a href="group__extended.html#ga299dae78d25ce112e384a98b7309c5be">mi_deferred_free_fun</a></div><div class="ttdeci">void() mi_deferred_free_fun(bool force, unsigned long long heartbeat, void *arg)</div><div class="ttdoc">Type of deferred free functions.</div><div class="ttdef"><b>Definition:</b> mimalloc-doc.h:352</div></div>
+<div class="ttc" id="agroup__extended_html_ga292a45f7dbc7cd23c5352ce1f0002816"><div class="ttname"><a href="group__extended.html#ga292a45f7dbc7cd23c5352ce1f0002816">mi_deferred_free_fun</a></div><div class="ttdeci">void mi_deferred_free_fun(bool force, unsigned long long heartbeat, void *arg)</div><div class="ttdoc">Type of deferred free functions.</div><div class="ttdef"><b>Definition</b> mimalloc-doc.h:354</div></div>
 <div class="ttc" id="agroup__extended_html_ga2d126e5c62d3badc35445e5d84166df2"><div class="ttname"><a href="group__extended.html#ga2d126e5c62d3badc35445e5d84166df2">mi_stats_print</a></div><div class="ttdeci">void mi_stats_print(void *out)</div><div class="ttdoc">Deprecated.</div></div>
+<div class="ttc" id="agroup__extended_html_ga2ecba0d7ebdc99e71bb985c4a1609806"><div class="ttname"><a href="group__extended.html#ga2ecba0d7ebdc99e71bb985c4a1609806">mi_subproc_main</a></div><div class="ttdeci">mi_subproc_id_t mi_subproc_main(void)</div><div class="ttdoc">Get the main sub-process identifier.</div></div>
 <div class="ttc" id="agroup__extended_html_ga3132f521fb756fc0e8ec0b74fb58df50"><div class="ttname"><a href="group__extended.html#ga3132f521fb756fc0e8ec0b74fb58df50">mi_reserve_huge_os_pages_interleave</a></div><div class="ttdeci">int mi_reserve_huge_os_pages_interleave(size_t pages, size_t numa_nodes, size_t timeout_msecs)</div><div class="ttdoc">Reserve pages of huge OS pages (1GiB) evenly divided over numa_nodes nodes, but stops after at most t...</div></div>
+<div class="ttc" id="agroup__extended_html_ga32f519797fd9a81acb4f52d36e6d751b"><div class="ttname"><a href="group__extended.html#ga32f519797fd9a81acb4f52d36e6d751b">mi_reserve_os_memory_ex</a></div><div class="ttdeci">int mi_reserve_os_memory_ex(size_t size, bool commit, bool allow_large, bool exclusive, mi_arena_id_t *arena_id)</div><div class="ttdoc">Reserve OS memory to be managed in an arena.</div></div>
 <div class="ttc" id="agroup__extended_html_ga3460a6ca91af97be4058f523d3cb8ece"><div class="ttname"><a href="group__extended.html#ga3460a6ca91af97be4058f523d3cb8ece">mi_register_deferred_free</a></div><div class="ttdeci">void mi_register_deferred_free(mi_deferred_free_fun *deferred_free, void *arg)</div><div class="ttdoc">Register a deferred free function.</div></div>
+<div class="ttc" id="agroup__extended_html_ga3ae360583f4351aa5267ee7e43008faf"><div class="ttname"><a href="group__extended.html#ga3ae360583f4351aa5267ee7e43008faf">mi_heap_new_ex</a></div><div class="ttdeci">mi_heap_t * mi_heap_new_ex(int heap_tag, bool allow_destroy, mi_arena_id_t arena_id)</div><div class="ttdoc">Create a new heap.</div></div>
 <div class="ttc" id="agroup__extended_html_ga3bb8468b8cfcc6e2a61d98aee85c5f99"><div class="ttname"><a href="group__extended.html#ga3bb8468b8cfcc6e2a61d98aee85c5f99">mi_stats_reset</a></div><div class="ttdeci">void mi_stats_reset(void)</div><div class="ttdoc">Reset statistics.</div></div>
+<div class="ttc" id="agroup__extended_html_ga41ce8525d77bbb60f618fa1029994f6e"><div class="ttname"><a href="group__extended.html#ga41ce8525d77bbb60f618fa1029994f6e">mi_manage_os_memory_ex</a></div><div class="ttdeci">bool mi_manage_os_memory_ex(void *start, size_t size, bool is_committed, bool is_large, bool is_zero, int numa_node, bool exclusive, mi_arena_id_t *arena_id)</div><div class="ttdoc">Manage externally allocated memory as a mimalloc arena.</div></div>
 <div class="ttc" id="agroup__extended_html_ga421430e2226d7d468529cec457396756"><div class="ttname"><a href="group__extended.html#ga421430e2226d7d468529cec457396756">mi_collect</a></div><div class="ttdeci">void mi_collect(bool force)</div><div class="ttdoc">Eagerly free memory.</div></div>
 <div class="ttc" id="agroup__extended_html_ga4c6486a1fdcd7a423b5f25fe4be8e0cf"><div class="ttname"><a href="group__extended.html#ga4c6486a1fdcd7a423b5f25fe4be8e0cf">mi_manage_os_memory</a></div><div class="ttdeci">bool mi_manage_os_memory(void *start, size_t size, bool is_committed, bool is_large, bool is_zero, int numa_node)</div><div class="ttdoc">Manage a particular memory area for use by mimalloc.</div></div>
+<div class="ttc" id="agroup__extended_html_ga51c47637e81df0e2f13a2d7a2dec123e"><div class="ttname"><a href="group__extended.html#ga51c47637e81df0e2f13a2d7a2dec123e">mi_zalloc_small</a></div><div class="ttdeci">void * mi_zalloc_small(size_t size)</div><div class="ttdoc">Allocate a zero initialized small object.</div></div>
 <div class="ttc" id="agroup__extended_html_ga537f13b299ddf801e49a5a94fde02c79"><div class="ttname"><a href="group__extended.html#ga537f13b299ddf801e49a5a94fde02c79">mi_stats_print_out</a></div><div class="ttdeci">void mi_stats_print_out(mi_output_fun *out, void *arg)</div><div class="ttdoc">Print the main statistics.</div></div>
+<div class="ttc" id="agroup__extended_html_ga591aab1c2bc2ca920e33f0f9f9cb5c52"><div class="ttname"><a href="group__extended.html#ga591aab1c2bc2ca920e33f0f9f9cb5c52">mi_reserve_huge_os_pages_at_ex</a></div><div class="ttdeci">int mi_reserve_huge_os_pages_at_ex(size_t pages, int numa_node, size_t timeout_msecs, bool exclusive, mi_arena_id_t *arena_id)</div><div class="ttdoc">Reserve huge OS pages (1GiB) into a single arena.</div></div>
 <div class="ttc" id="agroup__extended_html_ga5f071b10d4df1c3658e04e7fd67a94e6"><div class="ttname"><a href="group__extended.html#ga5f071b10d4df1c3658e04e7fd67a94e6">mi_is_in_heap_region</a></div><div class="ttdeci">bool mi_is_in_heap_region(const void *p)</div><div class="ttdoc">Is a pointer part of our heap?</div></div>
-<div class="ttc" id="agroup__extended_html_ga7136c2e55cb22c98ecf95d08d6debb99"><div class="ttname"><a href="group__extended.html#ga7136c2e55cb22c98ecf95d08d6debb99">mi_malloc_small</a></div><div class="ttdeci">void * mi_malloc_small(size_t size)</div><div class="ttdoc">Allocate a small object.</div></div>
 <div class="ttc" id="agroup__extended_html_ga7795a13d20087447281858d2c771cca1"><div class="ttname"><a href="group__extended.html#ga7795a13d20087447281858d2c771cca1">mi_reserve_huge_os_pages_at</a></div><div class="ttdeci">int mi_reserve_huge_os_pages_at(size_t pages, int numa_node, size_t timeout_msecs)</div><div class="ttdoc">Reserve pages of huge OS pages (1GiB) at a specific numa_node, but stops after at most timeout_msecs ...</div></div>
 <div class="ttc" id="agroup__extended_html_ga7d862c2affd5790381da14eb102a364d"><div class="ttname"><a href="group__extended.html#ga7d862c2affd5790381da14eb102a364d">mi_process_info</a></div><div class="ttdeci">void mi_process_info(size_t *elapsed_msecs, size_t *user_msecs, size_t *system_msecs, size_t *current_rss, size_t *peak_rss, size_t *current_commit, size_t *peak_commit, size_t *page_faults)</div><div class="ttdoc">Return process information (time and memory usage).</div></div>
+<div class="ttc" id="agroup__extended_html_ga7f050bc6b897da82692174f5fce59cde"><div class="ttname"><a href="group__extended.html#ga7f050bc6b897da82692174f5fce59cde">mi_malloc_small</a></div><div class="ttdeci">void * mi_malloc_small(size_t size)</div><div class="ttdoc">Allocate a small object.</div></div>
+<div class="ttc" id="agroup__extended_html_ga8068cac328e41fa2170faef707315243"><div class="ttname"><a href="group__extended.html#ga8068cac328e41fa2170faef707315243">mi_subproc_new</a></div><div class="ttdeci">mi_subproc_id_t mi_subproc_new(void)</div><div class="ttdoc">Create a fresh sub-process (with no associated threads yet).</div></div>
+<div class="ttc" id="agroup__extended_html_ga83fc6a688b322261e1c2deab000b0591"><div class="ttname"><a href="group__extended.html#ga83fc6a688b322261e1c2deab000b0591">mi_error_fun</a></div><div class="ttdeci">void mi_error_fun(int err, void *arg)</div><div class="ttdoc">Type of error callback functions.</div><div class="ttdef"><b>Definition</b> mimalloc-doc.h:393</div></div>
 <div class="ttc" id="agroup__extended_html_ga854b1de8cb067c7316286c28b2fcd3d1"><div class="ttname"><a href="group__extended.html#ga854b1de8cb067c7316286c28b2fcd3d1">mi_stats_merge</a></div><div class="ttdeci">void mi_stats_merge(void)</div><div class="ttdoc">Merge thread local statistics with the main statistics and reset.</div></div>
+<div class="ttc" id="agroup__extended_html_ga8c0bcd1fee27c7641e9c3c0d991b3b7d"><div class="ttname"><a href="group__extended.html#ga8c0bcd1fee27c7641e9c3c0d991b3b7d">mi_subproc_id_t</a></div><div class="ttdeci">void * mi_subproc_id_t</div><div class="ttdoc">A process can associate threads with sub-processes.</div><div class="ttdef"><b>Definition</b> mimalloc-doc.h:557</div></div>
+<div class="ttc" id="agroup__extended_html_ga99fe38650d0b02e0e0f89ee024db91d3"><div class="ttname"><a href="group__extended.html#ga99fe38650d0b02e0e0f89ee024db91d3">mi_arena_id_t</a></div><div class="ttdeci">int mi_arena_id_t</div><div class="ttdoc">Mimalloc uses large (virtual) memory areas, called &quot;arena&quot;s, from the OS to manage its memory.</div><div class="ttdef"><b>Definition</b> mimalloc-doc.h:499</div></div>
+<div class="ttc" id="agroup__extended_html_ga9a25a00a22151619a0be91a10af7787f"><div class="ttname"><a href="group__extended.html#ga9a25a00a22151619a0be91a10af7787f">mi_arena_area</a></div><div class="ttdeci">void * mi_arena_area(mi_arena_id_t arena_id, size_t *size)</div><div class="ttdoc">Return the size of an arena.</div></div>
 <div class="ttc" id="agroup__extended_html_gaa1d55e0e894be240827e5d87ec3a1f45"><div class="ttname"><a href="group__extended.html#gaa1d55e0e894be240827e5d87ec3a1f45">mi_register_error</a></div><div class="ttdeci">void mi_register_error(mi_error_fun *errfun, void *arg)</div><div class="ttdoc">Register an error callback function.</div></div>
+<div class="ttc" id="agroup__extended_html_gaa7d263e9429bac9ac8345c9d25de610e"><div class="ttname"><a href="group__extended.html#gaa7d263e9429bac9ac8345c9d25de610e">mi_subproc_delete</a></div><div class="ttdeci">void mi_subproc_delete(mi_subproc_id_t subproc)</div><div class="ttdoc">Delete a previously created sub-process.</div></div>
 <div class="ttc" id="agroup__extended_html_gaad25050b19f30cd79397b227e0157a3f"><div class="ttname"><a href="group__extended.html#gaad25050b19f30cd79397b227e0157a3f">mi_is_redirected</a></div><div class="ttdeci">bool mi_is_redirected()</div><div class="ttdoc">Is the C runtime malloc API redirected?</div></div>
+<div class="ttc" id="agroup__extended_html_gaaf2d9976576d5efd5544be12848af949"><div class="ttname"><a href="group__extended.html#gaaf2d9976576d5efd5544be12848af949">mi_heap_new_in_arena</a></div><div class="ttdeci">mi_heap_t * mi_heap_new_in_arena(mi_arena_id_t arena_id)</div><div class="ttdoc">Create a new heap that only allocates in the specified arena.</div></div>
 <div class="ttc" id="agroup__extended_html_gab1dac8476c46cb9eecab767eb40c1525"><div class="ttname"><a href="group__extended.html#gab1dac8476c46cb9eecab767eb40c1525">mi_thread_stats_print_out</a></div><div class="ttdeci">void mi_thread_stats_print_out(mi_output_fun *out, void *arg)</div><div class="ttdoc">Print out heap statistics for this thread.</div></div>
 <div class="ttc" id="agroup__extended_html_gac057927cd06c854b45fe7847e921bd47"><div class="ttname"><a href="group__extended.html#gac057927cd06c854b45fe7847e921bd47">mi_good_size</a></div><div class="ttdeci">size_t mi_good_size(size_t size)</div><div class="ttdoc">Return the used allocation size.</div></div>
-<div class="ttc" id="agroup__extended_html_gad823d23444a4b77a40f66bf075a98a0c"><div class="ttname"><a href="group__extended.html#gad823d23444a4b77a40f66bf075a98a0c">mi_output_fun</a></div><div class="ttdeci">void() mi_output_fun(const char *msg, void *arg)</div><div class="ttdoc">Type of output functions.</div><div class="ttdef"><b>Definition:</b> mimalloc-doc.h:376</div></div>
+<div class="ttc" id="agroup__extended_html_gad7439207f8f71fb6c382a9ea20b997e7"><div class="ttname"><a href="group__extended.html#gad7439207f8f71fb6c382a9ea20b997e7">mi_debug_show_arenas</a></div><div class="ttdeci">void mi_debug_show_arenas(bool show_inuse, bool show_abandoned, bool show_purge)</div><div class="ttdoc">Show all current arena&#39;s.</div></div>
+<div class="ttc" id="agroup__extended_html_gadbc53414eb68b275588ec001ce1ddc7c"><div class="ttname"><a href="group__extended.html#gadbc53414eb68b275588ec001ce1ddc7c">mi_subproc_add_current_thread</a></div><div class="ttdeci">void mi_subproc_add_current_thread(mi_subproc_id_t subproc)</div><div class="ttdoc">Add the current thread to the given sub-process.</div></div>
+<div class="ttc" id="agroup__extended_html_gadf31cea7d0332a81c8b882cbbdbadb8d"><div class="ttname"><a href="group__extended.html#gadf31cea7d0332a81c8b882cbbdbadb8d">mi_output_fun</a></div><div class="ttdeci">void mi_output_fun(const char *msg, void *arg)</div><div class="ttdoc">Type of output functions.</div><div class="ttdef"><b>Definition</b> mimalloc-doc.h:378</div></div>
 <div class="ttc" id="agroup__extended_html_gae5b17ff027cd2150b43a33040250cf3f"><div class="ttname"><a href="group__extended.html#gae5b17ff027cd2150b43a33040250cf3f">mi_register_output</a></div><div class="ttdeci">void mi_register_output(mi_output_fun *out, void *arg)</div><div class="ttdoc">Register an output function.</div></div>
 <div class="ttc" id="agroup__extended_html_gaf8e73efc2cbca9ebfdfb166983a04c17"><div class="ttname"><a href="group__extended.html#gaf8e73efc2cbca9ebfdfb166983a04c17">mi_thread_init</a></div><div class="ttdeci">void mi_thread_init(void)</div><div class="ttdoc">Initialize mimalloc on a thread.</div></div>
-<div class="ttc" id="agroup__heap_html_ga00e95ba1e01acac3cfd95bb7a357a6f0"><div class="ttname"><a href="group__heap.html#ga00e95ba1e01acac3cfd95bb7a357a6f0">mi_heap_realpath</a></div><div class="ttdeci">char * mi_heap_realpath(mi_heap_t *heap, const char *fname, char *resolved_name)</div><div class="ttdoc">Resolve a file path name using a specific heap to allocate the result.</div></div>
-<div class="ttc" id="agroup__heap_html_ga08ca6419a5c057a4d965868998eef487"><div class="ttname"><a href="group__heap.html#ga08ca6419a5c057a4d965868998eef487">mi_heap_calloc_aligned_at</a></div><div class="ttdeci">void * mi_heap_calloc_aligned_at(mi_heap_t *heap, size_t count, size_t size, size_t alignment, size_t offset)</div></div>
-<div class="ttc" id="agroup__heap_html_ga139d6b09dbf50c3c2523d0f4d1cfdeb5"><div class="ttname"><a href="group__heap.html#ga139d6b09dbf50c3c2523d0f4d1cfdeb5">mi_heap_strdup</a></div><div class="ttdeci">char * mi_heap_strdup(mi_heap_t *heap, const char *s)</div><div class="ttdoc">Duplicate a string in a specific heap.</div></div>
-<div class="ttc" id="agroup__heap_html_ga23acd7680fb0976dde3783254c6c874b"><div class="ttname"><a href="group__heap.html#ga23acd7680fb0976dde3783254c6c874b">mi_heap_malloc_aligned_at</a></div><div class="ttdeci">void * mi_heap_malloc_aligned_at(mi_heap_t *heap, size_t size, size_t alignment, size_t offset)</div></div>
+<div class="ttc" id="agroup__heap_html_ga012c5c8abe22b10043de39ff95909541"><div class="ttname"><a href="group__heap.html#ga012c5c8abe22b10043de39ff95909541">mi_heap_malloc_small</a></div><div class="ttdeci">void * mi_heap_malloc_small(mi_heap_t *heap, size_t size)</div><div class="ttdoc">Allocate a small object in a specific heap.</div></div>
+<div class="ttc" id="agroup__heap_html_ga14c667a6e2c5d28762d8cb7d4e057909"><div class="ttname"><a href="group__heap.html#ga14c667a6e2c5d28762d8cb7d4e057909">mi_heap_get_default</a></div><div class="ttdeci">mi_heap_t * mi_heap_get_default()</div><div class="ttdoc">Get the default heap that is used for mi_malloc() et al.</div></div>
 <div class="ttc" id="agroup__heap_html_ga2ab1af8d438819b55319c7ef51d1e409"><div class="ttname"><a href="group__heap.html#ga2ab1af8d438819b55319c7ef51d1e409">mi_heap_delete</a></div><div class="ttdeci">void mi_heap_delete(mi_heap_t *heap)</div><div class="ttdoc">Delete a previously allocated heap.</div></div>
-<div class="ttc" id="agroup__heap_html_ga34a47cde5a5b38c29f1aa3c5e76943c2"><div class="ttname"><a href="group__heap.html#ga34a47cde5a5b38c29f1aa3c5e76943c2">mi_heap_t</a></div><div class="ttdeci">struct mi_heap_s mi_heap_t</div><div class="ttdoc">Type of first-class heaps.</div><div class="ttdef"><b>Definition:</b> mimalloc-doc.h:554</div></div>
-<div class="ttc" id="agroup__heap_html_ga45fb43a62776fbebbdf1edd99b527954"><div class="ttname"><a href="group__heap.html#ga45fb43a62776fbebbdf1edd99b527954">mi_heap_zalloc_aligned_at</a></div><div class="ttdeci">void * mi_heap_zalloc_aligned_at(mi_heap_t *heap, size_t size, size_t alignment, size_t offset)</div></div>
-<div class="ttc" id="agroup__heap_html_ga4a21070eb4e7cce018133c8d5f4b0527"><div class="ttname"><a href="group__heap.html#ga4a21070eb4e7cce018133c8d5f4b0527">mi_heap_reallocf</a></div><div class="ttdeci">void * mi_heap_reallocf(mi_heap_t *heap, void *p, size_t newsize)</div></div>
-<div class="ttc" id="agroup__heap_html_ga4af03a6e2b93fae77424d93f889705c3"><div class="ttname"><a href="group__heap.html#ga4af03a6e2b93fae77424d93f889705c3">mi_heap_calloc_aligned</a></div><div class="ttdeci">void * mi_heap_calloc_aligned(mi_heap_t *heap, size_t count, size_t size, size_t alignment)</div></div>
-<div class="ttc" id="agroup__heap_html_ga5d03fbe062ffcf38f0f417fd968357fc"><div class="ttname"><a href="group__heap.html#ga5d03fbe062ffcf38f0f417fd968357fc">mi_heap_get_backing</a></div><div class="ttdeci">mi_heap_t * mi_heap_get_backing()</div><div class="ttdoc">Get the backing heap.</div></div>
-<div class="ttc" id="agroup__heap_html_ga766f672ba56f2fbfeb9d9dbb0b7f6b11"><div class="ttname"><a href="group__heap.html#ga766f672ba56f2fbfeb9d9dbb0b7f6b11">mi_heap_new</a></div><div class="ttdeci">mi_heap_t * mi_heap_new()</div><div class="ttdoc">Create a new heap that can be used for allocation.</div></div>
+<div class="ttc" id="agroup__heap_html_ga33f4f05b7fea7af2113c62a4bf882cc5"><div class="ttname"><a href="group__heap.html#ga33f4f05b7fea7af2113c62a4bf882cc5">mi_heap_malloc_aligned</a></div><div class="ttdeci">void * mi_heap_malloc_aligned(mi_heap_t *heap, size_t size, size_t alignment)</div></div>
+<div class="ttc" id="agroup__heap_html_ga349b677dec7da5eacdbc7a385bd62a4a"><div class="ttname"><a href="group__heap.html#ga349b677dec7da5eacdbc7a385bd62a4a">mi_heap_set_default</a></div><div class="ttdeci">mi_heap_t * mi_heap_set_default(mi_heap_t *heap)</div><div class="ttdoc">Set the default heap to use in the current thread for mi_malloc() et al.</div></div>
+<div class="ttc" id="agroup__heap_html_ga34a47cde5a5b38c29f1aa3c5e76943c2"><div class="ttname"><a href="group__heap.html#ga34a47cde5a5b38c29f1aa3c5e76943c2">mi_heap_t</a></div><div class="ttdeci">struct mi_heap_s mi_heap_t</div><div class="ttdoc">Type of first-class heaps.</div><div class="ttdef"><b>Definition</b> mimalloc-doc.h:646</div></div>
+<div class="ttc" id="agroup__heap_html_ga484e3d01cd174f78c7e53370e5a7c819"><div class="ttname"><a href="group__heap.html#ga484e3d01cd174f78c7e53370e5a7c819">mi_heap_zalloc_aligned_at</a></div><div class="ttdeci">void * mi_heap_zalloc_aligned_at(mi_heap_t *heap, size_t size, size_t alignment, size_t offset)</div></div>
+<div class="ttc" id="agroup__heap_html_ga55545a3ec6da29c5b4f62e540ecac1e2"><div class="ttname"><a href="group__heap.html#ga55545a3ec6da29c5b4f62e540ecac1e2">mi_heap_realpath</a></div><div class="ttdeci">char * mi_heap_realpath(mi_heap_t *heap, const char *fname, char *resolved_name)</div><div class="ttdoc">Resolve a file path name using a specific heap to allocate the result.</div></div>
+<div class="ttc" id="agroup__heap_html_ga5754e09ccc51dd6bc73885bb6ea21b7a"><div class="ttname"><a href="group__heap.html#ga5754e09ccc51dd6bc73885bb6ea21b7a">mi_heap_strdup</a></div><div class="ttdeci">char * mi_heap_strdup(mi_heap_t *heap, const char *s)</div><div class="ttdoc">Duplicate a string in a specific heap.</div></div>
+<div class="ttc" id="agroup__heap_html_ga6466bde8b5712aa34e081a8317f9f471"><div class="ttname"><a href="group__heap.html#ga6466bde8b5712aa34e081a8317f9f471">mi_heap_zalloc_aligned</a></div><div class="ttdeci">void * mi_heap_zalloc_aligned(mi_heap_t *heap, size_t size, size_t alignment)</div></div>
+<div class="ttc" id="agroup__heap_html_ga6df988a7219d5707f010d5f3eb0dc3f5"><div class="ttname"><a href="group__heap.html#ga6df988a7219d5707f010d5f3eb0dc3f5">mi_heap_realloc_aligned_at</a></div><div class="ttdeci">void * mi_heap_realloc_aligned_at(mi_heap_t *heap, void *p, size_t newsize, size_t alignment, size_t offset)</div></div>
 <div class="ttc" id="agroup__heap_html_ga7922f7495cde30b1984d0e6072419298"><div class="ttname"><a href="group__heap.html#ga7922f7495cde30b1984d0e6072419298">mi_heap_collect</a></div><div class="ttdeci">void mi_heap_collect(mi_heap_t *heap, bool force)</div><div class="ttdoc">Release outstanding resources in a specific heap.</div></div>
-<div class="ttc" id="agroup__heap_html_ga851da6c43fe0b71c1376cee8aef90db0"><div class="ttname"><a href="group__heap.html#ga851da6c43fe0b71c1376cee8aef90db0">mi_heap_mallocn</a></div><div class="ttdeci">void * mi_heap_mallocn(mi_heap_t *heap, size_t count, size_t size)</div><div class="ttdoc">Allocate count elements in a specific heap.</div></div>
-<div class="ttc" id="agroup__heap_html_ga8db4cbb87314a989a9a187464d6b5e05"><div class="ttname"><a href="group__heap.html#ga8db4cbb87314a989a9a187464d6b5e05">mi_heap_get_default</a></div><div class="ttdeci">mi_heap_t * mi_heap_get_default()</div><div class="ttdoc">Get the default heap that is used for mi_malloc() et al.</div></div>
-<div class="ttc" id="agroup__heap_html_ga8e3dbd46650dd26573cf307a2c8f1f5a"><div class="ttname"><a href="group__heap.html#ga8e3dbd46650dd26573cf307a2c8f1f5a">mi_heap_strndup</a></div><div class="ttdeci">char * mi_heap_strndup(mi_heap_t *heap, const char *s, size_t n)</div><div class="ttdoc">Duplicate a string of at most length n in a specific heap.</div></div>
-<div class="ttc" id="agroup__heap_html_ga903104592c8ed53417a3762da6241133"><div class="ttname"><a href="group__heap.html#ga903104592c8ed53417a3762da6241133">mi_heap_zalloc</a></div><div class="ttdeci">void * mi_heap_zalloc(mi_heap_t *heap, size_t size)</div><div class="ttdoc">Allocate zero-initialized in a specific heap.</div></div>
-<div class="ttc" id="agroup__heap_html_ga9cbed01e42c0647907295de92c3fa296"><div class="ttname"><a href="group__heap.html#ga9cbed01e42c0647907295de92c3fa296">mi_heap_malloc</a></div><div class="ttdeci">void * mi_heap_malloc(mi_heap_t *heap, size_t size)</div><div class="ttdoc">Allocate in a specific heap.</div></div>
 <div class="ttc" id="agroup__heap_html_ga9f9c0844edb9717f4feacd79116b8e0d"><div class="ttname"><a href="group__heap.html#ga9f9c0844edb9717f4feacd79116b8e0d">mi_heap_destroy</a></div><div class="ttdeci">void mi_heap_destroy(mi_heap_t *heap)</div><div class="ttdoc">Destroy a heap, freeing all its still allocated blocks.</div></div>
-<div class="ttc" id="agroup__heap_html_gaa1a1c7a1f4da6826b5a25b70ef878368"><div class="ttname"><a href="group__heap.html#gaa1a1c7a1f4da6826b5a25b70ef878368">mi_heap_malloc_small</a></div><div class="ttdeci">void * mi_heap_malloc_small(mi_heap_t *heap, size_t size)</div><div class="ttdoc">Allocate a small object in a specific heap.</div></div>
-<div class="ttc" id="agroup__heap_html_gaa450a59c6c7ae5fdbd1c2b80a8329ef0"><div class="ttname"><a href="group__heap.html#gaa450a59c6c7ae5fdbd1c2b80a8329ef0">mi_heap_zalloc_aligned</a></div><div class="ttdeci">void * mi_heap_zalloc_aligned(mi_heap_t *heap, size_t size, size_t alignment)</div></div>
-<div class="ttc" id="agroup__heap_html_gaa6702b3c48e9e53e50e81b36f5011d55"><div class="ttname"><a href="group__heap.html#gaa6702b3c48e9e53e50e81b36f5011d55">mi_heap_calloc</a></div><div class="ttdeci">void * mi_heap_calloc(mi_heap_t *heap, size_t count, size_t size)</div><div class="ttdoc">Allocate count zero-initialized elements in a specific heap.</div></div>
-<div class="ttc" id="agroup__heap_html_gaaef3395f66be48f37bdc8322509c5d81"><div class="ttname"><a href="group__heap.html#gaaef3395f66be48f37bdc8322509c5d81">mi_heap_realloc</a></div><div class="ttdeci">void * mi_heap_realloc(mi_heap_t *heap, void *p, size_t newsize)</div></div>
-<div class="ttc" id="agroup__heap_html_gab5b87e1805306f70df38789fcfcf6653"><div class="ttname"><a href="group__heap.html#gab5b87e1805306f70df38789fcfcf6653">mi_heap_malloc_aligned</a></div><div class="ttdeci">void * mi_heap_malloc_aligned(mi_heap_t *heap, size_t size, size_t alignment)</div></div>
-<div class="ttc" id="agroup__heap_html_gab8631ec88c8d26641b68b5d25dcd4422"><div class="ttname"><a href="group__heap.html#gab8631ec88c8d26641b68b5d25dcd4422">mi_heap_set_default</a></div><div class="ttdeci">mi_heap_t * mi_heap_set_default(mi_heap_t *heap)</div><div class="ttdoc">Set the default heap to use for mi_malloc() et al.</div></div>
-<div class="ttc" id="agroup__heap_html_gac74e94ad9b0c9b57c1c4d88b8825b7a8"><div class="ttname"><a href="group__heap.html#gac74e94ad9b0c9b57c1c4d88b8825b7a8">mi_heap_reallocn</a></div><div class="ttdeci">void * mi_heap_reallocn(mi_heap_t *heap, void *p, size_t count, size_t size)</div></div>
-<div class="ttc" id="agroup__heap_html_gaf96c788a1bf553fe2d371de9365e047c"><div class="ttname"><a href="group__heap.html#gaf96c788a1bf553fe2d371de9365e047c">mi_heap_realloc_aligned_at</a></div><div class="ttdeci">void * mi_heap_realloc_aligned_at(mi_heap_t *heap, void *p, size_t newsize, size_t alignment, size_t offset)</div></div>
-<div class="ttc" id="agroup__heap_html_gafc603b696bd14cae6da28658f950d98c"><div class="ttname"><a href="group__heap.html#gafc603b696bd14cae6da28658f950d98c">mi_heap_realloc_aligned</a></div><div class="ttdeci">void * mi_heap_realloc_aligned(mi_heap_t *heap, void *p, size_t newsize, size_t alignment)</div></div>
-<div class="ttc" id="agroup__malloc_html_ga08cec32dd5bbe7da91c78d19f1b5bebe"><div class="ttname"><a href="group__malloc.html#ga08cec32dd5bbe7da91c78d19f1b5bebe">mi_realpath</a></div><div class="ttdeci">char * mi_realpath(const char *fname, char *resolved_name)</div><div class="ttdoc">Resolve a file path name.</div></div>
-<div class="ttc" id="agroup__malloc_html_ga0b05e2bf0f73e7401ae08597ff782ac6"><div class="ttname"><a href="group__malloc.html#ga0b05e2bf0f73e7401ae08597ff782ac6">mi_mallocn</a></div><div class="ttdeci">void * mi_mallocn(size_t count, size_t size)</div><div class="ttdoc">Allocate count elements of size bytes.</div></div>
+<div class="ttc" id="agroup__heap_html_gaa42ec2079989c4374f2c331d9b35f4e4"><div class="ttname"><a href="group__heap.html#gaa42ec2079989c4374f2c331d9b35f4e4">mi_heap_calloc_aligned_at</a></div><div class="ttdeci">void * mi_heap_calloc_aligned_at(mi_heap_t *heap, size_t count, size_t size, size_t alignment, size_t offset)</div></div>
+<div class="ttc" id="agroup__heap_html_gaa718bb226ec0546ba6d1b6cb32179f3a"><div class="ttname"><a href="group__heap.html#gaa718bb226ec0546ba6d1b6cb32179f3a">mi_heap_new</a></div><div class="ttdeci">mi_heap_t * mi_heap_new()</div><div class="ttdoc">Create a new heap that can be used for allocation.</div></div>
+<div class="ttc" id="agroup__heap_html_gab0f755c0b21c387fe8e9024200faa372"><div class="ttname"><a href="group__heap.html#gab0f755c0b21c387fe8e9024200faa372">mi_heap_mallocn</a></div><div class="ttdeci">void * mi_heap_mallocn(mi_heap_t *heap, size_t count, size_t size)</div><div class="ttdoc">Allocate count elements in a specific heap.</div></div>
+<div class="ttc" id="agroup__heap_html_gab374e206c7034e0d899fb934e4f4a863"><div class="ttname"><a href="group__heap.html#gab374e206c7034e0d899fb934e4f4a863">mi_heap_malloc</a></div><div class="ttdeci">void * mi_heap_malloc(mi_heap_t *heap, size_t size)</div><div class="ttdoc">Allocate in a specific heap.</div></div>
+<div class="ttc" id="agroup__heap_html_gabebc796399619d964d8db77aa835e8c1"><div class="ttname"><a href="group__heap.html#gabebc796399619d964d8db77aa835e8c1">mi_heap_zalloc</a></div><div class="ttdeci">void * mi_heap_zalloc(mi_heap_t *heap, size_t size)</div><div class="ttdoc">Allocate zero-initialized in a specific heap.</div></div>
+<div class="ttc" id="agroup__heap_html_gac0098aaf231d3e9586c73136d5df95da"><div class="ttname"><a href="group__heap.html#gac0098aaf231d3e9586c73136d5df95da">mi_heap_calloc</a></div><div class="ttdeci">void * mi_heap_calloc(mi_heap_t *heap, size_t count, size_t size)</div><div class="ttdoc">Allocate count zero-initialized elements in a specific heap.</div></div>
+<div class="ttc" id="agroup__heap_html_gac5252d6a2e510bd349e4fcb452e6a93a"><div class="ttname"><a href="group__heap.html#gac5252d6a2e510bd349e4fcb452e6a93a">mi_heap_realloc</a></div><div class="ttdeci">void * mi_heap_realloc(mi_heap_t *heap, void *p, size_t newsize)</div></div>
+<div class="ttc" id="agroup__heap_html_gac6ac9f0e7be9ab4ff70acfc8dad1235a"><div class="ttname"><a href="group__heap.html#gac6ac9f0e7be9ab4ff70acfc8dad1235a">mi_heap_get_backing</a></div><div class="ttdeci">mi_heap_t * mi_heap_get_backing()</div><div class="ttdoc">Get the backing heap.</div></div>
+<div class="ttc" id="agroup__heap_html_gacafcc26df827c7a7de5e850217566108"><div class="ttname"><a href="group__heap.html#gacafcc26df827c7a7de5e850217566108">mi_heap_calloc_aligned</a></div><div class="ttdeci">void * mi_heap_calloc_aligned(mi_heap_t *heap, size_t count, size_t size, size_t alignment)</div></div>
+<div class="ttc" id="agroup__heap_html_gaccf7bfe10ce510a000d3547d9cf7fa29"><div class="ttname"><a href="group__heap.html#gaccf7bfe10ce510a000d3547d9cf7fa29">mi_heap_reallocn</a></div><div class="ttdeci">void * mi_heap_reallocn(mi_heap_t *heap, void *p, size_t count, size_t size)</div></div>
+<div class="ttc" id="agroup__heap_html_gaccf8c249872f30bf1c2493a09197d734"><div class="ttname"><a href="group__heap.html#gaccf8c249872f30bf1c2493a09197d734">mi_heap_realloc_aligned</a></div><div class="ttdeci">void * mi_heap_realloc_aligned(mi_heap_t *heap, void *p, size_t newsize, size_t alignment)</div></div>
+<div class="ttc" id="agroup__heap_html_gad224df78f1fbee942df8adf023e12cf3"><div class="ttname"><a href="group__heap.html#gad224df78f1fbee942df8adf023e12cf3">mi_heap_strndup</a></div><div class="ttdeci">char * mi_heap_strndup(mi_heap_t *heap, const char *s, size_t n)</div><div class="ttdoc">Duplicate a string of at most length n in a specific heap.</div></div>
+<div class="ttc" id="agroup__heap_html_gae7cd171425bee04c683c65a3701f0b4a"><div class="ttname"><a href="group__heap.html#gae7cd171425bee04c683c65a3701f0b4a">mi_heap_reallocf</a></div><div class="ttdeci">void * mi_heap_reallocf(mi_heap_t *heap, void *p, size_t newsize)</div></div>
+<div class="ttc" id="agroup__heap_html_gae7ffc045c3996497a7f3a5f6fe7b8aaa"><div class="ttname"><a href="group__heap.html#gae7ffc045c3996497a7f3a5f6fe7b8aaa">mi_heap_malloc_aligned_at</a></div><div class="ttdeci">void * mi_heap_malloc_aligned_at(mi_heap_t *heap, size_t size, size_t alignment, size_t offset)</div></div>
+<div class="ttc" id="agroup__malloc_html_ga0621af6a5e3aa384e6a1b548958bf583"><div class="ttname"><a href="group__malloc.html#ga0621af6a5e3aa384e6a1b548958bf583">mi_realloc</a></div><div class="ttdeci">void * mi_realloc(void *p, size_t newsize)</div><div class="ttdoc">Re-allocate memory to newsize bytes.</div></div>
+<div class="ttc" id="agroup__malloc_html_ga19299856216cfbb08e2628593654dfb0"><div class="ttname"><a href="group__malloc.html#ga19299856216cfbb08e2628593654dfb0">mi_expand</a></div><div class="ttdeci">void * mi_expand(void *p, size_t newsize)</div><div class="ttdoc">Try to re-allocate memory to newsize bytes in place.</div></div>
 <div class="ttc" id="agroup__malloc_html_ga23a0fbb452b5dce8e31fab1a1958cacc"><div class="ttname"><a href="group__malloc.html#ga23a0fbb452b5dce8e31fab1a1958cacc">mi_recalloc</a></div><div class="ttdeci">void * mi_recalloc(void *p, size_t count, size_t size)</div><div class="ttdoc">Re-allocate memory to count elements of size bytes, with extra memory initialized to zero.</div></div>
-<div class="ttc" id="agroup__malloc_html_ga3406e8b168bc74c8637b11571a6da83a"><div class="ttname"><a href="group__malloc.html#ga3406e8b168bc74c8637b11571a6da83a">mi_malloc</a></div><div class="ttdeci">void * mi_malloc(size_t size)</div><div class="ttdoc">Allocate size bytes.</div></div>
-<div class="ttc" id="agroup__malloc_html_ga61d57b4144ba24fba5c1e9b956d13853"><div class="ttname"><a href="group__malloc.html#ga61d57b4144ba24fba5c1e9b956d13853">mi_reallocn</a></div><div class="ttdeci">void * mi_reallocn(void *p, size_t count, size_t size)</div><div class="ttdoc">Re-allocate memory to count elements of size bytes.</div></div>
-<div class="ttc" id="agroup__malloc_html_ga97fedb4f7107c592fd7f0f0a8949a57d"><div class="ttname"><a href="group__malloc.html#ga97fedb4f7107c592fd7f0f0a8949a57d">mi_calloc</a></div><div class="ttdeci">void * mi_calloc(size_t count, size_t size)</div><div class="ttdoc">Allocate zero-initialized count elements of size bytes.</div></div>
-<div class="ttc" id="agroup__malloc_html_gaaabf971c2571891433477e2d21a35266"><div class="ttname"><a href="group__malloc.html#gaaabf971c2571891433477e2d21a35266">mi_strndup</a></div><div class="ttdeci">char * mi_strndup(const char *s, size_t n)</div><div class="ttdoc">Allocate and duplicate a string up to n bytes.</div></div>
-<div class="ttc" id="agroup__malloc_html_gaaee66a1d483c3e28f585525fb96707e4"><div class="ttname"><a href="group__malloc.html#gaaee66a1d483c3e28f585525fb96707e4">mi_expand</a></div><div class="ttdeci">void * mi_expand(void *p, size_t newsize)</div><div class="ttdoc">Try to re-allocate memory to newsize bytes in place.</div></div>
-<div class="ttc" id="agroup__malloc_html_gac7cffe13f1f458ed16789488bf92b9b2"><div class="ttname"><a href="group__malloc.html#gac7cffe13f1f458ed16789488bf92b9b2">mi_strdup</a></div><div class="ttdeci">char * mi_strdup(const char *s)</div><div class="ttdoc">Allocate and duplicate a string.</div></div>
-<div class="ttc" id="agroup__malloc_html_gaf11eb497da57bdfb2de65eb191c69db6"><div class="ttname"><a href="group__malloc.html#gaf11eb497da57bdfb2de65eb191c69db6">mi_realloc</a></div><div class="ttdeci">void * mi_realloc(void *p, size_t newsize)</div><div class="ttdoc">Re-allocate memory to newsize bytes.</div></div>
+<div class="ttc" id="agroup__malloc_html_ga245ac90ebc2cfdd17de599e5fea59889"><div class="ttname"><a href="group__malloc.html#ga245ac90ebc2cfdd17de599e5fea59889">mi_strdup</a></div><div class="ttdeci">char * mi_strdup(const char *s)</div><div class="ttdoc">Allocate and duplicate a string.</div></div>
+<div class="ttc" id="agroup__malloc_html_ga486d0d26b3b3794f6d1cdb41a9aed92d"><div class="ttname"><a href="group__malloc.html#ga486d0d26b3b3794f6d1cdb41a9aed92d">mi_strndup</a></div><div class="ttdeci">char * mi_strndup(const char *s, size_t n)</div><div class="ttdoc">Allocate and duplicate a string up to n bytes.</div></div>
+<div class="ttc" id="agroup__malloc_html_ga4dc3a4067037b151a64629fe8a332641"><div class="ttname"><a href="group__malloc.html#ga4dc3a4067037b151a64629fe8a332641">mi_reallocf</a></div><div class="ttdeci">void * mi_reallocf(void *p, size_t newsize)</div><div class="ttdoc">Re-allocate memory to newsize bytes,.</div></div>
+<div class="ttc" id="agroup__malloc_html_ga61f46bade3db76ca24aaafedc40de7b6"><div class="ttname"><a href="group__malloc.html#ga61f46bade3db76ca24aaafedc40de7b6">mi_mallocn</a></div><div class="ttdeci">void * mi_mallocn(size_t count, size_t size)</div><div class="ttdoc">Allocate count elements of size bytes.</div></div>
+<div class="ttc" id="agroup__malloc_html_ga6686568014b54d1e6c7ac64a076e4f56"><div class="ttname"><a href="group__malloc.html#ga6686568014b54d1e6c7ac64a076e4f56">mi_calloc</a></div><div class="ttdeci">void * mi_calloc(size_t count, size_t size)</div><div class="ttdoc">Allocate zero-initialized count elements of size bytes.</div></div>
+<div class="ttc" id="agroup__malloc_html_ga8bddfb4a1270a0854bbcf44cb3980467"><div class="ttname"><a href="group__malloc.html#ga8bddfb4a1270a0854bbcf44cb3980467">mi_reallocn</a></div><div class="ttdeci">void * mi_reallocn(void *p, size_t count, size_t size)</div><div class="ttdoc">Re-allocate memory to count elements of size bytes.</div></div>
+<div class="ttc" id="agroup__malloc_html_ga94c3afcc086e85d75a57e9f76b9b71dd"><div class="ttname"><a href="group__malloc.html#ga94c3afcc086e85d75a57e9f76b9b71dd">mi_realpath</a></div><div class="ttdeci">char * mi_realpath(const char *fname, char *resolved_name)</div><div class="ttdoc">Resolve a file path name.</div></div>
+<div class="ttc" id="agroup__malloc_html_gae1dd97b542420c87ae085e822b1229e8"><div class="ttname"><a href="group__malloc.html#gae1dd97b542420c87ae085e822b1229e8">mi_malloc</a></div><div class="ttdeci">void * mi_malloc(size_t size)</div><div class="ttdoc">Allocate size bytes.</div></div>
+<div class="ttc" id="agroup__malloc_html_gae6e38c4403247a7b40d80419e093bfb8"><div class="ttname"><a href="group__malloc.html#gae6e38c4403247a7b40d80419e093bfb8">mi_zalloc</a></div><div class="ttdeci">void * mi_zalloc(size_t size)</div><div class="ttdoc">Allocate zero-initialized size bytes.</div></div>
 <div class="ttc" id="agroup__malloc_html_gaf2c7b89c327d1f60f59e68b9ea644d95"><div class="ttname"><a href="group__malloc.html#gaf2c7b89c327d1f60f59e68b9ea644d95">mi_free</a></div><div class="ttdeci">void mi_free(void *p)</div><div class="ttdoc">Free previously allocated memory.</div></div>
-<div class="ttc" id="agroup__malloc_html_gafdd9d8bb2986e668ba9884f28af38000"><div class="ttname"><a href="group__malloc.html#gafdd9d8bb2986e668ba9884f28af38000">mi_zalloc</a></div><div class="ttdeci">void * mi_zalloc(size_t size)</div><div class="ttdoc">Allocate zero-initialized size bytes.</div></div>
-<div class="ttc" id="agroup__malloc_html_gafe68ac7c5e24a65cd55c9d6b152211a0"><div class="ttname"><a href="group__malloc.html#gafe68ac7c5e24a65cd55c9d6b152211a0">mi_reallocf</a></div><div class="ttdeci">void * mi_reallocf(void *p, size_t newsize)</div><div class="ttdoc">Re-allocate memory to newsize bytes,.</div></div>
 <div class="ttc" id="agroup__options_html_ga04180ae41b0d601421dd62ced40ca050"><div class="ttname"><a href="group__options.html#ga04180ae41b0d601421dd62ced40ca050">mi_option_enable</a></div><div class="ttdeci">void mi_option_enable(mi_option_t option)</div></div>
+<div class="ttc" id="agroup__options_html_ga274db5a6ac87cc24ef0b23e7006ed02c"><div class="ttname"><a href="group__options.html#ga274db5a6ac87cc24ef0b23e7006ed02c">mi_option_get_size</a></div><div class="ttdeci">size_t mi_option_get_size(mi_option_t option)</div></div>
 <div class="ttc" id="agroup__options_html_ga459ad98f18b3fc9275474807fe0ca188"><div class="ttname"><a href="group__options.html#ga459ad98f18b3fc9275474807fe0ca188">mi_option_is_enabled</a></div><div class="ttdeci">bool mi_option_is_enabled(mi_option_t option)</div></div>
 <div class="ttc" id="agroup__options_html_ga65518b69ec5d32336b50e07f74b3f629"><div class="ttname"><a href="group__options.html#ga65518b69ec5d32336b50e07f74b3f629">mi_option_set_enabled_default</a></div><div class="ttdeci">void mi_option_set_enabled_default(mi_option_t option, bool enable)</div></div>
 <div class="ttc" id="agroup__options_html_ga7e8af195cc81d3fa64ccf2662caa565a"><div class="ttname"><a href="group__options.html#ga7e8af195cc81d3fa64ccf2662caa565a">mi_option_get</a></div><div class="ttdeci">long mi_option_get(mi_option_t option)</div></div>
 <div class="ttc" id="agroup__options_html_ga7ef623e440e6e5545cb08c94e71e4b90"><div class="ttname"><a href="group__options.html#ga7ef623e440e6e5545cb08c94e71e4b90">mi_option_set_default</a></div><div class="ttdeci">void mi_option_set_default(mi_option_t option, long value)</div></div>
+<div class="ttc" id="agroup__options_html_ga96ad9c406338bd314cfe878cfc9bf723"><div class="ttname"><a href="group__options.html#ga96ad9c406338bd314cfe878cfc9bf723">mi_option_get_clamp</a></div><div class="ttdeci">long mi_option_get_clamp(mi_option_t option, long min, long max)</div></div>
 <div class="ttc" id="agroup__options_html_ga9a13d05fcb77489cb06d4d017ebd8bed"><div class="ttname"><a href="group__options.html#ga9a13d05fcb77489cb06d4d017ebd8bed">mi_option_set_enabled</a></div><div class="ttdeci">void mi_option_set_enabled(mi_option_t option, bool enable)</div></div>
 <div class="ttc" id="agroup__options_html_gaebf6ff707a2e688ebb1a2296ca564054"><div class="ttname"><a href="group__options.html#gaebf6ff707a2e688ebb1a2296ca564054">mi_option_disable</a></div><div class="ttdeci">void mi_option_disable(mi_option_t option)</div></div>
 <div class="ttc" id="agroup__options_html_gaf84921c32375e25754dc2ee6a911fa60"><div class="ttname"><a href="group__options.html#gaf84921c32375e25754dc2ee6a911fa60">mi_option_set</a></div><div class="ttdeci">void mi_option_set(mi_option_t option, long value)</div></div>
-<div class="ttc" id="agroup__options_html_gafebf7ed116adb38ae5218bc3ce06884c"><div class="ttname"><a href="group__options.html#gafebf7ed116adb38ae5218bc3ce06884c">mi_option_t</a></div><div class="ttdeci">mi_option_t</div><div class="ttdoc">Runtime options.</div><div class="ttdef"><b>Definition:</b> mimalloc-doc.h:800</div></div>
-<div class="ttc" id="agroup__options_html_ggafebf7ed116adb38ae5218bc3ce06884ca0957ef73b2550764b4840edf48422fda"><div class="ttname"><a href="group__options.html#ggafebf7ed116adb38ae5218bc3ce06884ca0957ef73b2550764b4840edf48422fda">mi_option_show_stats</a></div><div class="ttdeci">@ mi_option_show_stats</div><div class="ttdoc">Print statistics to stderr when the program is done.</div><div class="ttdef"><b>Definition:</b> mimalloc-doc.h:803</div></div>
-<div class="ttc" id="agroup__options_html_ggafebf7ed116adb38ae5218bc3ce06884ca0ac33a18f6b659fcfaf44efb0bab1b74"><div class="ttname"><a href="group__options.html#ggafebf7ed116adb38ae5218bc3ce06884ca0ac33a18f6b659fcfaf44efb0bab1b74">mi_option_use_numa_nodes</a></div><div class="ttdeci">@ mi_option_use_numa_nodes</div><div class="ttdoc">Pretend there are at most N NUMA nodes.</div><div class="ttdef"><b>Definition:</b> mimalloc-doc.h:815</div></div>
-<div class="ttc" id="agroup__options_html_ggafebf7ed116adb38ae5218bc3ce06884ca154fe170131d5212cff57e22b99523c5"><div class="ttname"><a href="group__options.html#ggafebf7ed116adb38ae5218bc3ce06884ca154fe170131d5212cff57e22b99523c5">mi_option_reset_delay</a></div><div class="ttdeci">@ mi_option_reset_delay</div><div class="ttdoc">Delay in milli-seconds before resetting a page (100ms by default)</div><div class="ttdef"><b>Definition:</b> mimalloc-doc.h:814</div></div>
-<div class="ttc" id="agroup__options_html_ggafebf7ed116adb38ae5218bc3ce06884ca17a190c25be381142d87e0468c4c068c"><div class="ttname"><a href="group__options.html#ggafebf7ed116adb38ae5218bc3ce06884ca17a190c25be381142d87e0468c4c068c">mi_option_eager_commit_delay</a></div><div class="ttdeci">@ mi_option_eager_commit_delay</div><div class="ttdoc">Experimental.</div><div class="ttdef"><b>Definition:</b> mimalloc-doc.h:817</div></div>
-<div class="ttc" id="agroup__options_html_ggafebf7ed116adb38ae5218bc3ce06884ca1e8de72c93da7ff22d91e1e27b52ac2b"><div class="ttname"><a href="group__options.html#ggafebf7ed116adb38ae5218bc3ce06884ca1e8de72c93da7ff22d91e1e27b52ac2b">mi_option_eager_commit</a></div><div class="ttdeci">@ mi_option_eager_commit</div><div class="ttdoc">Eagerly commit segments (4MiB) (enabled by default).</div><div class="ttdef"><b>Definition:</b> mimalloc-doc.h:806</div></div>
-<div class="ttc" id="agroup__options_html_ggafebf7ed116adb38ae5218bc3ce06884ca2ecbe7ef32f5c84de3739aa4f0b805a1"><div class="ttname"><a href="group__options.html#ggafebf7ed116adb38ae5218bc3ce06884ca2ecbe7ef32f5c84de3739aa4f0b805a1">mi_option_segment_cache</a></div><div class="ttdeci">@ mi_option_segment_cache</div><div class="ttdoc">The number of segments per thread to keep cached.</div><div class="ttdef"><b>Definition:</b> mimalloc-doc.h:811</div></div>
-<div class="ttc" id="agroup__options_html_ggafebf7ed116adb38ae5218bc3ce06884ca32ce97ece29f69e82579679cf8a307ad"><div class="ttname"><a href="group__options.html#ggafebf7ed116adb38ae5218bc3ce06884ca32ce97ece29f69e82579679cf8a307ad">mi_option_eager_region_commit</a></div><div class="ttdeci">@ mi_option_eager_region_commit</div><div class="ttdoc">Eagerly commit large (256MiB) memory regions (enabled by default, except on Windows)</div><div class="ttdef"><b>Definition:</b> mimalloc-doc.h:807</div></div>
-<div class="ttc" id="agroup__options_html_ggafebf7ed116adb38ae5218bc3ce06884ca4192d491200d0055df0554d4cf65054e"><div class="ttname"><a href="group__options.html#ggafebf7ed116adb38ae5218bc3ce06884ca4192d491200d0055df0554d4cf65054e">mi_option_large_os_pages</a></div><div class="ttdeci">@ mi_option_large_os_pages</div><div class="ttdoc">Use large OS pages (2MiB in size) if possible.</div><div class="ttdef"><b>Definition:</b> mimalloc-doc.h:808</div></div>
-<div class="ttc" id="agroup__options_html_ggafebf7ed116adb38ae5218bc3ce06884ca4b74ae2a69e445de6c2361b73c1d14bf"><div class="ttname"><a href="group__options.html#ggafebf7ed116adb38ae5218bc3ce06884ca4b74ae2a69e445de6c2361b73c1d14bf">mi_option_os_tag</a></div><div class="ttdeci">@ mi_option_os_tag</div><div class="ttdoc">OS tag to assign to mimalloc'd memory.</div><div class="ttdef"><b>Definition:</b> mimalloc-doc.h:818</div></div>
-<div class="ttc" id="agroup__options_html_ggafebf7ed116adb38ae5218bc3ce06884ca5b4357b74be0d87568036c32eb1a2e4a"><div class="ttname"><a href="group__options.html#ggafebf7ed116adb38ae5218bc3ce06884ca5b4357b74be0d87568036c32eb1a2e4a">_mi_option_last</a></div><div class="ttdeci">@ _mi_option_last</div><div class="ttdef"><b>Definition:</b> mimalloc-doc.h:819</div></div>
-<div class="ttc" id="agroup__options_html_ggafebf7ed116adb38ae5218bc3ce06884ca7c8b7bf5281c581bad64f5daa6442777"><div class="ttname"><a href="group__options.html#ggafebf7ed116adb38ae5218bc3ce06884ca7c8b7bf5281c581bad64f5daa6442777">mi_option_verbose</a></div><div class="ttdeci">@ mi_option_verbose</div><div class="ttdoc">Print verbose messages to stderr.</div><div class="ttdef"><b>Definition:</b> mimalloc-doc.h:804</div></div>
-<div class="ttc" id="agroup__options_html_ggafebf7ed116adb38ae5218bc3ce06884caa13e7926d4339d2aa6fbf61d4473fd5c"><div class="ttname"><a href="group__options.html#ggafebf7ed116adb38ae5218bc3ce06884caa13e7926d4339d2aa6fbf61d4473fd5c">mi_option_reserve_huge_os_pages_at</a></div><div class="ttdeci">@ mi_option_reserve_huge_os_pages_at</div><div class="ttdoc">Reserve huge OS pages at node N.</div><div class="ttdef"><b>Definition:</b> mimalloc-doc.h:810</div></div>
-<div class="ttc" id="agroup__options_html_ggafebf7ed116adb38ae5218bc3ce06884cac81ee965b130fa81238913a3c239d536"><div class="ttname"><a href="group__options.html#ggafebf7ed116adb38ae5218bc3ce06884cac81ee965b130fa81238913a3c239d536">mi_option_reset_decommits</a></div><div class="ttdeci">@ mi_option_reset_decommits</div><div class="ttdoc">Experimental.</div><div class="ttdef"><b>Definition:</b> mimalloc-doc.h:816</div></div>
-<div class="ttc" id="agroup__options_html_ggafebf7ed116adb38ae5218bc3ce06884caca7ed041be3b0b9d0b82432c7bf41af2"><div class="ttname"><a href="group__options.html#ggafebf7ed116adb38ae5218bc3ce06884caca7ed041be3b0b9d0b82432c7bf41af2">mi_option_reserve_huge_os_pages</a></div><div class="ttdeci">@ mi_option_reserve_huge_os_pages</div><div class="ttdoc">The number of huge OS pages (1GiB in size) to reserve at the start of the program.</div><div class="ttdef"><b>Definition:</b> mimalloc-doc.h:809</div></div>
-<div class="ttc" id="agroup__options_html_ggafebf7ed116adb38ae5218bc3ce06884cada854dd272c66342f18a93ee254a2968"><div class="ttname"><a href="group__options.html#ggafebf7ed116adb38ae5218bc3ce06884cada854dd272c66342f18a93ee254a2968">mi_option_page_reset</a></div><div class="ttdeci">@ mi_option_page_reset</div><div class="ttdoc">Reset page memory after mi_option_reset_delay milliseconds when it becomes free.</div><div class="ttdef"><b>Definition:</b> mimalloc-doc.h:812</div></div>
-<div class="ttc" id="agroup__options_html_ggafebf7ed116adb38ae5218bc3ce06884cafb121d30d87591850d5410ccc3a95c6d"><div class="ttname"><a href="group__options.html#ggafebf7ed116adb38ae5218bc3ce06884cafb121d30d87591850d5410ccc3a95c6d">mi_option_segment_reset</a></div><div class="ttdeci">@ mi_option_segment_reset</div><div class="ttdoc">Experimental.</div><div class="ttdef"><b>Definition:</b> mimalloc-doc.h:813</div></div>
-<div class="ttc" id="agroup__options_html_ggafebf7ed116adb38ae5218bc3ce06884cafbf4822e5c00732c5984b32a032837f0"><div class="ttname"><a href="group__options.html#ggafebf7ed116adb38ae5218bc3ce06884cafbf4822e5c00732c5984b32a032837f0">mi_option_show_errors</a></div><div class="ttdeci">@ mi_option_show_errors</div><div class="ttdoc">Print error messages to stderr.</div><div class="ttdef"><b>Definition:</b> mimalloc-doc.h:802</div></div>
+<div class="ttc" id="agroup__options_html_gafebf7ed116adb38ae5218bc3ce06884c"><div class="ttname"><a href="group__options.html#gafebf7ed116adb38ae5218bc3ce06884c">mi_option_t</a></div><div class="ttdeci">mi_option_t</div><div class="ttdoc">Runtime options.</div><div class="ttdef"><b>Definition</b> mimalloc-doc.h:911</div></div>
+<div class="ttc" id="agroup__options_html_ggafebf7ed116adb38ae5218bc3ce06884ca009e4b5684922ce664d73d2a8e1698d9"><div class="ttname"><a href="group__options.html#ggafebf7ed116adb38ae5218bc3ce06884ca009e4b5684922ce664d73d2a8e1698d9">mi_option_abandoned_reclaim_on_free</a></div><div class="ttdeci">@ mi_option_abandoned_reclaim_on_free</div><div class="ttdoc">allow to reclaim an abandoned segment on a free (=1)</div><div class="ttdef"><b>Definition</b> mimalloc-doc.h:941</div></div>
+<div class="ttc" id="agroup__options_html_ggafebf7ed116adb38ae5218bc3ce06884ca02005f164bdf03f5f00c5be726adf487"><div class="ttname"><a href="group__options.html#ggafebf7ed116adb38ae5218bc3ce06884ca02005f164bdf03f5f00c5be726adf487">mi_option_purge_extend_delay</a></div><div class="ttdeci">@ mi_option_purge_extend_delay</div><div class="ttdoc">extend purge delay on each subsequent delay (=1)</div><div class="ttdef"><b>Definition</b> mimalloc-doc.h:942</div></div>
+<div class="ttc" id="agroup__options_html_ggafebf7ed116adb38ae5218bc3ce06884ca0957ef73b2550764b4840edf48422fda"><div class="ttname"><a href="group__options.html#ggafebf7ed116adb38ae5218bc3ce06884ca0957ef73b2550764b4840edf48422fda">mi_option_show_stats</a></div><div class="ttdeci">@ mi_option_show_stats</div><div class="ttdoc">Print statistics on termination.</div><div class="ttdef"><b>Definition</b> mimalloc-doc.h:914</div></div>
+<div class="ttc" id="agroup__options_html_ggafebf7ed116adb38ae5218bc3ce06884ca0ac33a18f6b659fcfaf44efb0bab1b74"><div class="ttname"><a href="group__options.html#ggafebf7ed116adb38ae5218bc3ce06884ca0ac33a18f6b659fcfaf44efb0bab1b74">mi_option_use_numa_nodes</a></div><div class="ttdeci">@ mi_option_use_numa_nodes</div><div class="ttdoc">0 = use all available numa nodes, otherwise use at most N nodes.</div><div class="ttdef"><b>Definition</b> mimalloc-doc.h:935</div></div>
+<div class="ttc" id="agroup__options_html_ggafebf7ed116adb38ae5218bc3ce06884ca11e62ed69200a489a5be955582078c0c"><div class="ttname"><a href="group__options.html#ggafebf7ed116adb38ae5218bc3ce06884ca11e62ed69200a489a5be955582078c0c">mi_option_abandoned_page_purge</a></div><div class="ttdeci">@ mi_option_abandoned_page_purge</div><div class="ttdoc">immediately purge delayed purges on thread termination</div><div class="ttdef"><b>Definition</b> mimalloc-doc.h:933</div></div>
+<div class="ttc" id="agroup__options_html_ggafebf7ed116adb38ae5218bc3ce06884ca17a190c25be381142d87e0468c4c068c"><div class="ttname"><a href="group__options.html#ggafebf7ed116adb38ae5218bc3ce06884ca17a190c25be381142d87e0468c4c068c">mi_option_eager_commit_delay</a></div><div class="ttdeci">@ mi_option_eager_commit_delay</div><div class="ttdoc">the first N segments per thread are not eagerly committed (but per page in the segment on demand)</div><div class="ttdef"><b>Definition</b> mimalloc-doc.h:931</div></div>
+<div class="ttc" id="agroup__options_html_ggafebf7ed116adb38ae5218bc3ce06884ca1e8de72c93da7ff22d91e1e27b52ac2b"><div class="ttname"><a href="group__options.html#ggafebf7ed116adb38ae5218bc3ce06884ca1e8de72c93da7ff22d91e1e27b52ac2b">mi_option_eager_commit</a></div><div class="ttdeci">@ mi_option_eager_commit</div><div class="ttdoc">eager commit segments? (after eager_commit_delay segments) (enabled by default).</div><div class="ttdef"><b>Definition</b> mimalloc-doc.h:930</div></div>
+<div class="ttc" id="agroup__options_html_ggafebf7ed116adb38ae5218bc3ce06884ca38c67733a3956a1f4eeaca89fab9e78e"><div class="ttname"><a href="group__options.html#ggafebf7ed116adb38ae5218bc3ce06884ca38c67733a3956a1f4eeaca89fab9e78e">mi_option_visit_abandoned</a></div><div class="ttdeci">@ mi_option_visit_abandoned</div><div class="ttdoc">allow visiting heap blocks from abandoned threads (=0)</div><div class="ttdef"><b>Definition</b> mimalloc-doc.h:944</div></div>
+<div class="ttc" id="agroup__options_html_ggafebf7ed116adb38ae5218bc3ce06884ca4b74ae2a69e445de6c2361b73c1d14bf"><div class="ttname"><a href="group__options.html#ggafebf7ed116adb38ae5218bc3ce06884ca4b74ae2a69e445de6c2361b73c1d14bf">mi_option_os_tag</a></div><div class="ttdeci">@ mi_option_os_tag</div><div class="ttdoc">tag used for OS logging (macOS only for now) (=100)</div><div class="ttdef"><b>Definition</b> mimalloc-doc.h:926</div></div>
+<div class="ttc" id="agroup__options_html_ggafebf7ed116adb38ae5218bc3ce06884ca5b4357b74be0d87568036c32eb1a2e4a"><div class="ttname"><a href="group__options.html#ggafebf7ed116adb38ae5218bc3ce06884ca5b4357b74be0d87568036c32eb1a2e4a">_mi_option_last</a></div><div class="ttdeci">@ _mi_option_last</div><div class="ttdef"><b>Definition</b> mimalloc-doc.h:946</div></div>
+<div class="ttc" id="agroup__options_html_ggafebf7ed116adb38ae5218bc3ce06884ca6364331e305e7d3c0218b058ff3afc88"><div class="ttname"><a href="group__options.html#ggafebf7ed116adb38ae5218bc3ce06884ca6364331e305e7d3c0218b058ff3afc88">mi_option_destroy_on_exit</a></div><div class="ttdeci">@ mi_option_destroy_on_exit</div><div class="ttdoc">if set, release all memory on exit; sometimes used for dynamic unloading but can be unsafe</div><div class="ttdef"><b>Definition</b> mimalloc-doc.h:939</div></div>
+<div class="ttc" id="agroup__options_html_ggafebf7ed116adb38ae5218bc3ce06884ca7c8b7bf5281c581bad64f5daa6442777"><div class="ttname"><a href="group__options.html#ggafebf7ed116adb38ae5218bc3ce06884ca7c8b7bf5281c581bad64f5daa6442777">mi_option_verbose</a></div><div class="ttdeci">@ mi_option_verbose</div><div class="ttdoc">Print verbose messages.</div><div class="ttdef"><b>Definition</b> mimalloc-doc.h:915</div></div>
+<div class="ttc" id="agroup__options_html_ggafebf7ed116adb38ae5218bc3ce06884ca7cc4804ced69004fa42a9a136a9ba556"><div class="ttname"><a href="group__options.html#ggafebf7ed116adb38ae5218bc3ce06884ca7cc4804ced69004fa42a9a136a9ba556">mi_option_allow_large_os_pages</a></div><div class="ttdeci">@ mi_option_allow_large_os_pages</div><div class="ttdoc">allow large (2 or 4 MiB) OS pages, implies eager commit. If false, also disables THP for the process.</div><div class="ttdef"><b>Definition</b> mimalloc-doc.h:923</div></div>
+<div class="ttc" id="agroup__options_html_ggafebf7ed116adb38ae5218bc3ce06884ca8236501f1ab45d26e6fd885d191a2b5e"><div class="ttname"><a href="group__options.html#ggafebf7ed116adb38ae5218bc3ce06884ca8236501f1ab45d26e6fd885d191a2b5e">mi_option_arena_purge_mult</a></div><div class="ttdeci">@ mi_option_arena_purge_mult</div><div class="ttdoc">multiplier for purge_delay for the purging delay for arenas (=10)</div><div class="ttdef"><b>Definition</b> mimalloc-doc.h:940</div></div>
+<div class="ttc" id="agroup__options_html_ggafebf7ed116adb38ae5218bc3ce06884ca8f51df355bf6651db899e6085b54865e"><div class="ttname"><a href="group__options.html#ggafebf7ed116adb38ae5218bc3ce06884ca8f51df355bf6651db899e6085b54865e">mi_option_retry_on_oom</a></div><div class="ttdeci">@ mi_option_retry_on_oom</div><div class="ttdoc">retry on out-of-memory for N milli seconds (=400), set to 0 to disable retries. (only on windows)</div><div class="ttdef"><b>Definition</b> mimalloc-doc.h:927</div></div>
+<div class="ttc" id="agroup__options_html_ggafebf7ed116adb38ae5218bc3ce06884ca9d15c5e3d2115eef681c17e4dd5ab9a4"><div class="ttname"><a href="group__options.html#ggafebf7ed116adb38ae5218bc3ce06884ca9d15c5e3d2115eef681c17e4dd5ab9a4">mi_option_purge_decommits</a></div><div class="ttdeci">@ mi_option_purge_decommits</div><div class="ttdoc">should a memory purge decommit? (=1). Set to 0 to use memory reset on a purge (instead of decommit)</div><div class="ttdef"><b>Definition</b> mimalloc-doc.h:924</div></div>
+<div class="ttc" id="agroup__options_html_ggafebf7ed116adb38ae5218bc3ce06884ca9fa61bd9668479f8452d2195759444cc"><div class="ttname"><a href="group__options.html#ggafebf7ed116adb38ae5218bc3ce06884ca9fa61bd9668479f8452d2195759444cc">mi_option_limit_os_alloc</a></div><div class="ttdeci">@ mi_option_limit_os_alloc</div><div class="ttdoc">If set to 1, do not use OS memory for allocation (but only pre-reserved arenas)</div><div class="ttdef"><b>Definition</b> mimalloc-doc.h:937</div></div>
+<div class="ttc" id="agroup__options_html_ggafebf7ed116adb38ae5218bc3ce06884caa13e7926d4339d2aa6fbf61d4473fd5c"><div class="ttname"><a href="group__options.html#ggafebf7ed116adb38ae5218bc3ce06884caa13e7926d4339d2aa6fbf61d4473fd5c">mi_option_reserve_huge_os_pages_at</a></div><div class="ttdeci">@ mi_option_reserve_huge_os_pages_at</div><div class="ttdoc">Reserve N huge OS pages at a specific NUMA node N.</div><div class="ttdef"><b>Definition</b> mimalloc-doc.h:921</div></div>
+<div class="ttc" id="agroup__options_html_ggafebf7ed116adb38ae5218bc3ce06884caa9ad9005d7017c8c30ad2d6ba31db909"><div class="ttname"><a href="group__options.html#ggafebf7ed116adb38ae5218bc3ce06884caa9ad9005d7017c8c30ad2d6ba31db909">mi_option_max_segment_reclaim</a></div><div class="ttdeci">@ mi_option_max_segment_reclaim</div><div class="ttdoc">max. percentage of the abandoned segments can be reclaimed per try (=10%)</div><div class="ttdef"><b>Definition</b> mimalloc-doc.h:938</div></div>
+<div class="ttc" id="agroup__options_html_ggafebf7ed116adb38ae5218bc3ce06884cab1c88e23ae290bbeec824038a97959de"><div class="ttname"><a href="group__options.html#ggafebf7ed116adb38ae5218bc3ce06884cab1c88e23ae290bbeec824038a97959de">mi_option_arena_reserve</a></div><div class="ttdeci">@ mi_option_arena_reserve</div><div class="ttdoc">initial memory size for arena reservation (= 1 GiB on 64-bit) (internally, this value is in KiB; use ...</div><div class="ttdef"><b>Definition</b> mimalloc-doc.h:925</div></div>
+<div class="ttc" id="agroup__options_html_ggafebf7ed116adb38ae5218bc3ce06884caca7ed041be3b0b9d0b82432c7bf41af2"><div class="ttname"><a href="group__options.html#ggafebf7ed116adb38ae5218bc3ce06884caca7ed041be3b0b9d0b82432c7bf41af2">mi_option_reserve_huge_os_pages</a></div><div class="ttdeci">@ mi_option_reserve_huge_os_pages</div><div class="ttdoc">reserve N huge OS pages (1GiB pages) at startup</div><div class="ttdef"><b>Definition</b> mimalloc-doc.h:920</div></div>
+<div class="ttc" id="agroup__options_html_ggafebf7ed116adb38ae5218bc3ce06884cadcfb5a09580361b1be65901d2d812de6"><div class="ttname"><a href="group__options.html#ggafebf7ed116adb38ae5218bc3ce06884cadcfb5a09580361b1be65901d2d812de6">mi_option_disallow_os_alloc</a></div><div class="ttdeci">@ mi_option_disallow_os_alloc</div><div class="ttdoc">1 = do not use OS memory for allocation (but only programmatically reserved arenas)</div><div class="ttdef"><b>Definition</b> mimalloc-doc.h:936</div></div>
+<div class="ttc" id="agroup__options_html_ggafebf7ed116adb38ae5218bc3ce06884cadd351e615acd8563529c20a347be7290"><div class="ttname"><a href="group__options.html#ggafebf7ed116adb38ae5218bc3ce06884cadd351e615acd8563529c20a347be7290">mi_option_purge_delay</a></div><div class="ttdeci">@ mi_option_purge_delay</div><div class="ttdoc">memory purging is delayed by N milli seconds; use 0 for immediate purging or -1 for no purging at all...</div><div class="ttdef"><b>Definition</b> mimalloc-doc.h:934</div></div>
+<div class="ttc" id="agroup__options_html_ggafebf7ed116adb38ae5218bc3ce06884caeae1696100e4057ffc4182730cc04e40"><div class="ttname"><a href="group__options.html#ggafebf7ed116adb38ae5218bc3ce06884caeae1696100e4057ffc4182730cc04e40">mi_option_disallow_arena_alloc</a></div><div class="ttdeci">@ mi_option_disallow_arena_alloc</div><div class="ttdoc">1 = do not use arena&#39;s for allocation (except if using specific arena id&#39;s)</div><div class="ttdef"><b>Definition</b> mimalloc-doc.h:943</div></div>
+<div class="ttc" id="agroup__options_html_ggafebf7ed116adb38ae5218bc3ce06884caec6ecbe29d46a48205ed8823a8a52a6a"><div class="ttname"><a href="group__options.html#ggafebf7ed116adb38ae5218bc3ce06884caec6ecbe29d46a48205ed8823a8a52a6a">mi_option_max_errors</a></div><div class="ttdeci">@ mi_option_max_errors</div><div class="ttdoc">issue at most N error messages</div><div class="ttdef"><b>Definition</b> mimalloc-doc.h:916</div></div>
+<div class="ttc" id="agroup__options_html_ggafebf7ed116adb38ae5218bc3ce06884caf9595921087e942602ee079158762665"><div class="ttname"><a href="group__options.html#ggafebf7ed116adb38ae5218bc3ce06884caf9595921087e942602ee079158762665">mi_option_max_warnings</a></div><div class="ttdeci">@ mi_option_max_warnings</div><div class="ttdoc">issue at most N warning messages</div><div class="ttdef"><b>Definition</b> mimalloc-doc.h:917</div></div>
+<div class="ttc" id="agroup__options_html_ggafebf7ed116adb38ae5218bc3ce06884cafbf4822e5c00732c5984b32a032837f0"><div class="ttname"><a href="group__options.html#ggafebf7ed116adb38ae5218bc3ce06884cafbf4822e5c00732c5984b32a032837f0">mi_option_show_errors</a></div><div class="ttdeci">@ mi_option_show_errors</div><div class="ttdoc">Print error messages.</div><div class="ttdef"><b>Definition</b> mimalloc-doc.h:913</div></div>
+<div class="ttc" id="agroup__options_html_ggafebf7ed116adb38ae5218bc3ce06884cafbf4999c828cf79a0fb2de65d23f7333"><div class="ttname"><a href="group__options.html#ggafebf7ed116adb38ae5218bc3ce06884cafbf4999c828cf79a0fb2de65d23f7333">mi_option_reserve_os_memory</a></div><div class="ttdeci">@ mi_option_reserve_os_memory</div><div class="ttdoc">reserve specified amount of OS memory in an arena at startup (internally, this value is in KiB; use m...</div><div class="ttdef"><b>Definition</b> mimalloc-doc.h:922</div></div>
+<div class="ttc" id="agroup__options_html_ggafebf7ed116adb38ae5218bc3ce06884cafd0c5ddbc4b59fd8b5216871728167a5"><div class="ttname"><a href="group__options.html#ggafebf7ed116adb38ae5218bc3ce06884cafd0c5ddbc4b59fd8b5216871728167a5">mi_option_arena_eager_commit</a></div><div class="ttdeci">@ mi_option_arena_eager_commit</div><div class="ttdoc">eager commit arenas? Use 2 to enable just on overcommit systems (=2)</div><div class="ttdef"><b>Definition</b> mimalloc-doc.h:932</div></div>
 <div class="ttc" id="agroup__posix_html_ga06d07cf357bbac5c73ba5d0c0c421e17"><div class="ttname"><a href="group__posix.html#ga06d07cf357bbac5c73ba5d0c0c421e17">mi_malloc_usable_size</a></div><div class="ttdeci">size_t mi_malloc_usable_size(const void *p)</div></div>
 <div class="ttc" id="agroup__posix_html_ga0d28d5cf61e6bfbb18c63092939fe5c9"><div class="ttname"><a href="group__posix.html#ga0d28d5cf61e6bfbb18c63092939fe5c9">mi_free_aligned</a></div><div class="ttdeci">void mi_free_aligned(void *p, size_t alignment)</div></div>
-<div class="ttc" id="agroup__posix_html_ga1326d2e4388630b5f81ca7206318b8e5"><div class="ttname"><a href="group__posix.html#ga1326d2e4388630b5f81ca7206318b8e5">mi_aligned_alloc</a></div><div class="ttdeci">void * mi_aligned_alloc(size_t alignment, size_t size)</div></div>
+<div class="ttc" id="agroup__posix_html_ga16570deddd559001b44953eedbad0084"><div class="ttname"><a href="group__posix.html#ga16570deddd559001b44953eedbad0084">mi_aligned_offset_recalloc</a></div><div class="ttdeci">void * mi_aligned_offset_recalloc(void *p, size_t newcount, size_t size, size_t alignment, size_t offset)</div></div>
+<div class="ttc" id="agroup__posix_html_ga430ed1513f0571ff83be00ec58a98ee0"><div class="ttname"><a href="group__posix.html#ga430ed1513f0571ff83be00ec58a98ee0">mi_aligned_alloc</a></div><div class="ttdeci">void * mi_aligned_alloc(size_t alignment, size_t size)</div></div>
 <div class="ttc" id="agroup__posix_html_ga4531c9e775bb3ae12db57c1ba8a5d7de"><div class="ttname"><a href="group__posix.html#ga4531c9e775bb3ae12db57c1ba8a5d7de">mi_malloc_size</a></div><div class="ttdeci">size_t mi_malloc_size(const void *p)</div></div>
-<div class="ttc" id="agroup__posix_html_ga48fad8648a2f1dab9c87ea9448a52088"><div class="ttname"><a href="group__posix.html#ga48fad8648a2f1dab9c87ea9448a52088">mi_reallocarray</a></div><div class="ttdeci">void * mi_reallocarray(void *p, size_t count, size_t size)</div><div class="ttdoc">Correspond s to reallocarray in FreeBSD.</div></div>
+<div class="ttc" id="agroup__posix_html_ga50cafb9722020402f065de93799f64ca"><div class="ttname"><a href="group__posix.html#ga50cafb9722020402f065de93799f64ca">mi_valloc</a></div><div class="ttdeci">void * mi_valloc(size_t size)</div></div>
+<div class="ttc" id="agroup__posix_html_ga644bebccdbb2821542dd8c7e7641f476"><div class="ttname"><a href="group__posix.html#ga644bebccdbb2821542dd8c7e7641f476">mi_pvalloc</a></div><div class="ttdeci">void * mi_pvalloc(size_t size)</div></div>
+<div class="ttc" id="agroup__posix_html_ga66bcfeb4faedbb42b796bc680821ef84"><div class="ttname"><a href="group__posix.html#ga66bcfeb4faedbb42b796bc680821ef84">mi__expand</a></div><div class="ttdeci">void * mi__expand(void *p, size_t newsize)</div></div>
+<div class="ttc" id="agroup__posix_html_ga6ac6a6a8f3c96f1af24bb8d0439cbbd1"><div class="ttname"><a href="group__posix.html#ga6ac6a6a8f3c96f1af24bb8d0439cbbd1">mi_wdupenv_s</a></div><div class="ttdeci">int mi_wdupenv_s(unsigned short **buf, size_t *size, const unsigned short *name)</div></div>
 <div class="ttc" id="agroup__posix_html_ga705dc7a64bffacfeeb0141501a5c35d7"><div class="ttname"><a href="group__posix.html#ga705dc7a64bffacfeeb0141501a5c35d7">mi_cfree</a></div><div class="ttdeci">void mi_cfree(void *p)</div><div class="ttdoc">Just as free but also checks if the pointer p belongs to our heap.</div></div>
+<div class="ttc" id="agroup__posix_html_ga726867f13fd29ca36064954c0285b1d8"><div class="ttname"><a href="group__posix.html#ga726867f13fd29ca36064954c0285b1d8">mi_memalign</a></div><div class="ttdeci">void * mi_memalign(size_t alignment, size_t size)</div></div>
 <div class="ttc" id="agroup__posix_html_ga72e9d7ffb5fe94d69bc722c8506e27bc"><div class="ttname"><a href="group__posix.html#ga72e9d7ffb5fe94d69bc722c8506e27bc">mi_free_size_aligned</a></div><div class="ttdeci">void mi_free_size_aligned(void *p, size_t size, size_t alignment)</div></div>
-<div class="ttc" id="agroup__posix_html_ga73baaf5951f5165ba0763d0c06b6a93b"><div class="ttname"><a href="group__posix.html#ga73baaf5951f5165ba0763d0c06b6a93b">mi_valloc</a></div><div class="ttdeci">void * mi_valloc(size_t size)</div></div>
+<div class="ttc" id="agroup__posix_html_ga7b82a44094fdec4d2084eb4288a979b0"><div class="ttname"><a href="group__posix.html#ga7b82a44094fdec4d2084eb4288a979b0">mi_mbsdup</a></div><div class="ttdeci">unsigned char * mi_mbsdup(const unsigned char *s)</div></div>
 <div class="ttc" id="agroup__posix_html_ga7e1934d60a3e697950eeb48e042bfad5"><div class="ttname"><a href="group__posix.html#ga7e1934d60a3e697950eeb48e042bfad5">mi_reallocarr</a></div><div class="ttdeci">int mi_reallocarr(void *p, size_t count, size_t size)</div><div class="ttdoc">Corresponds to reallocarr in NetBSD.</div></div>
-<div class="ttc" id="agroup__posix_html_gaab7fa71ea93b96873f5d9883db57d40e"><div class="ttname"><a href="group__posix.html#gaab7fa71ea93b96873f5d9883db57d40e">mi_memalign</a></div><div class="ttdeci">void * mi_memalign(size_t alignment, size_t size)</div></div>
+<div class="ttc" id="agroup__posix_html_ga9d23ac7885fed7413c11d8e0ffa31071"><div class="ttname"><a href="group__posix.html#ga9d23ac7885fed7413c11d8e0ffa31071">mi_malloc_good_size</a></div><div class="ttdeci">size_t mi_malloc_good_size(size_t size)</div></div>
+<div class="ttc" id="agroup__posix_html_gaa9fd7f25c9ac3a20e89b33bd6e383fcf"><div class="ttname"><a href="group__posix.html#gaa9fd7f25c9ac3a20e89b33bd6e383fcf">mi_wcsdup</a></div><div class="ttdeci">unsigned short * mi_wcsdup(const unsigned short *s)</div></div>
+<div class="ttc" id="agroup__posix_html_gab41369c1a1da7504013a7a0b1d4dd958"><div class="ttname"><a href="group__posix.html#gab41369c1a1da7504013a7a0b1d4dd958">mi_dupenv_s</a></div><div class="ttdeci">int mi_dupenv_s(char **buf, size_t *size, const char *name)</div></div>
 <div class="ttc" id="agroup__posix_html_gacff84f226ba9feb2031b8992e5579447"><div class="ttname"><a href="group__posix.html#gacff84f226ba9feb2031b8992e5579447">mi_posix_memalign</a></div><div class="ttdeci">int mi_posix_memalign(void **p, size_t alignment, size_t size)</div></div>
 <div class="ttc" id="agroup__posix_html_gad5a69c8fea96aa2b7a7c818c2130090a"><div class="ttname"><a href="group__posix.html#gad5a69c8fea96aa2b7a7c818c2130090a">mi__posix_memalign</a></div><div class="ttdeci">int mi__posix_memalign(void **p, size_t alignment, size_t size)</div></div>
+<div class="ttc" id="agroup__posix_html_gadfeccb72748a2f6305474a37d9d57bce"><div class="ttname"><a href="group__posix.html#gadfeccb72748a2f6305474a37d9d57bce">mi_reallocarray</a></div><div class="ttdeci">void * mi_reallocarray(void *p, size_t count, size_t size)</div><div class="ttdoc">Correspond s to reallocarray in FreeBSD.</div></div>
 <div class="ttc" id="agroup__posix_html_gae01389eedab8d67341ff52e2aad80ebb"><div class="ttname"><a href="group__posix.html#gae01389eedab8d67341ff52e2aad80ebb">mi_free_size</a></div><div class="ttdeci">void mi_free_size(void *p, size_t size)</div></div>
-<div class="ttc" id="agroup__posix_html_gaeb325c39b887d3b90d85d1eb1712fb1e"><div class="ttname"><a href="group__posix.html#gaeb325c39b887d3b90d85d1eb1712fb1e">mi_pvalloc</a></div><div class="ttdeci">void * mi_pvalloc(size_t size)</div></div>
-<div class="ttc" id="agroup__zeroinit_html_ga375fa8a611c51905e592d5d467c49664"><div class="ttname"><a href="group__zeroinit.html#ga375fa8a611c51905e592d5d467c49664">mi_heap_rezalloc_aligned</a></div><div class="ttdeci">void * mi_heap_rezalloc_aligned(mi_heap_t *heap, void *p, size_t newsize, size_t alignment)</div></div>
-<div class="ttc" id="agroup__zeroinit_html_ga3e7e5c291acf1c7fd7ffd9914a9f945f"><div class="ttname"><a href="group__zeroinit.html#ga3e7e5c291acf1c7fd7ffd9914a9f945f">mi_recalloc_aligned</a></div><div class="ttdeci">void * mi_recalloc_aligned(void *p, size_t newcount, size_t size, size_t alignment)</div></div>
-<div class="ttc" id="agroup__zeroinit_html_ga496452c96f1de8c500be9fddf52edaf7"><div class="ttname"><a href="group__zeroinit.html#ga496452c96f1de8c500be9fddf52edaf7">mi_heap_recalloc_aligned_at</a></div><div class="ttdeci">void * mi_heap_recalloc_aligned_at(mi_heap_t *heap, void *p, size_t newcount, size_t size, size_t alignment, size_t offset)</div></div>
-<div class="ttc" id="agroup__zeroinit_html_ga4ff5e92ad73585418a072c9d059e5cf9"><div class="ttname"><a href="group__zeroinit.html#ga4ff5e92ad73585418a072c9d059e5cf9">mi_recalloc_aligned_at</a></div><div class="ttdeci">void * mi_recalloc_aligned_at(void *p, size_t newcount, size_t size, size_t alignment, size_t offset)</div></div>
-<div class="ttc" id="agroup__zeroinit_html_ga8648c5fbb22a80f0262859099f06dfbd"><div class="ttname"><a href="group__zeroinit.html#ga8648c5fbb22a80f0262859099f06dfbd">mi_heap_recalloc</a></div><div class="ttdeci">void * mi_heap_recalloc(mi_heap_t *heap, void *p, size_t newcount, size_t size)</div></div>
-<div class="ttc" id="agroup__zeroinit_html_ga8c292e142110229a2980b37ab036dbc6"><div class="ttname"><a href="group__zeroinit.html#ga8c292e142110229a2980b37ab036dbc6">mi_rezalloc</a></div><div class="ttdeci">void * mi_rezalloc(void *p, size_t newsize)</div></div>
-<div class="ttc" id="agroup__zeroinit_html_ga9f3f999396c8f77ca5e80e7b40ac29e3"><div class="ttname"><a href="group__zeroinit.html#ga9f3f999396c8f77ca5e80e7b40ac29e3">mi_heap_recalloc_aligned</a></div><div class="ttdeci">void * mi_heap_recalloc_aligned(mi_heap_t *heap, void *p, size_t newcount, size_t size, size_t alignment)</div></div>
-<div class="ttc" id="agroup__zeroinit_html_gac90da54fa7e5d10bdc97ce0b51dce2eb"><div class="ttname"><a href="group__zeroinit.html#gac90da54fa7e5d10bdc97ce0b51dce2eb">mi_heap_rezalloc_aligned_at</a></div><div class="ttdeci">void * mi_heap_rezalloc_aligned_at(mi_heap_t *heap, void *p, size_t newsize, size_t alignment, size_t offset)</div></div>
-<div class="ttc" id="agroup__zeroinit_html_gacd71a7bce96aab38ae6de17af2eb2cf0"><div class="ttname"><a href="group__zeroinit.html#gacd71a7bce96aab38ae6de17af2eb2cf0">mi_rezalloc_aligned</a></div><div class="ttdeci">void * mi_rezalloc_aligned(void *p, size_t newsize, size_t alignment)</div></div>
-<div class="ttc" id="agroup__zeroinit_html_gacfad83f14eb5d6a42a497a898e19fc76"><div class="ttname"><a href="group__zeroinit.html#gacfad83f14eb5d6a42a497a898e19fc76">mi_heap_rezalloc</a></div><div class="ttdeci">void * mi_heap_rezalloc(mi_heap_t *heap, void *p, size_t newsize)</div></div>
-<div class="ttc" id="agroup__zeroinit_html_gae8b358c417e61d5307da002702b0a8e1"><div class="ttname"><a href="group__zeroinit.html#gae8b358c417e61d5307da002702b0a8e1">mi_rezalloc_aligned_at</a></div><div class="ttdeci">void * mi_rezalloc_aligned_at(void *p, size_t newsize, size_t alignment, size_t offset)</div></div>
+<div class="ttc" id="agroup__posix_html_gaf82cbb4b4f24acf723348628451798d3"><div class="ttname"><a href="group__posix.html#gaf82cbb4b4f24acf723348628451798d3">mi_aligned_recalloc</a></div><div class="ttdeci">void * mi_aligned_recalloc(void *p, size_t newcount, size_t size, size_t alignment)</div></div>
+<div class="ttc" id="agroup__zeroinit_html_ga07b5bcbaf00d0d2e598c232982588496"><div class="ttname"><a href="group__zeroinit.html#ga07b5bcbaf00d0d2e598c232982588496">mi_heap_recalloc_aligned_at</a></div><div class="ttdeci">void * mi_heap_recalloc_aligned_at(mi_heap_t *heap, void *p, size_t newcount, size_t size, size_t alignment, size_t offset)</div></div>
+<div class="ttc" id="agroup__zeroinit_html_ga2bafa79c3f98ea74882349d44cffa5d9"><div class="ttname"><a href="group__zeroinit.html#ga2bafa79c3f98ea74882349d44cffa5d9">mi_heap_rezalloc_aligned_at</a></div><div class="ttdeci">void * mi_heap_rezalloc_aligned_at(mi_heap_t *heap, void *p, size_t newsize, size_t alignment, size_t offset)</div></div>
+<div class="ttc" id="agroup__zeroinit_html_ga3e2169b48683aa0ab64f813fd68d839e"><div class="ttname"><a href="group__zeroinit.html#ga3e2169b48683aa0ab64f813fd68d839e">mi_recalloc_aligned</a></div><div class="ttdeci">void * mi_recalloc_aligned(void *p, size_t newcount, size_t size, size_t alignment)</div></div>
+<div class="ttc" id="agroup__zeroinit_html_ga4d02404fe1e7db00beb65f185e012caa"><div class="ttname"><a href="group__zeroinit.html#ga4d02404fe1e7db00beb65f185e012caa">mi_rezalloc_aligned</a></div><div class="ttdeci">void * mi_rezalloc_aligned(void *p, size_t newsize, size_t alignment)</div></div>
+<div class="ttc" id="agroup__zeroinit_html_ga5129f6dc46ee1613d918820a8a0533a7"><div class="ttname"><a href="group__zeroinit.html#ga5129f6dc46ee1613d918820a8a0533a7">mi_heap_rezalloc_aligned</a></div><div class="ttdeci">void * mi_heap_rezalloc_aligned(mi_heap_t *heap, void *p, size_t newsize, size_t alignment)</div></div>
+<div class="ttc" id="agroup__zeroinit_html_ga6843a88285bbfcc3bdfccc60aafd1270"><div class="ttname"><a href="group__zeroinit.html#ga6843a88285bbfcc3bdfccc60aafd1270">mi_rezalloc_aligned_at</a></div><div class="ttdeci">void * mi_rezalloc_aligned_at(void *p, size_t newsize, size_t alignment, size_t offset)</div></div>
+<div class="ttc" id="agroup__zeroinit_html_ga87ddd674bf1c67237d780d0b9e0f0f32"><div class="ttname"><a href="group__zeroinit.html#ga87ddd674bf1c67237d780d0b9e0f0f32">mi_heap_recalloc_aligned</a></div><div class="ttdeci">void * mi_heap_recalloc_aligned(mi_heap_t *heap, void *p, size_t newcount, size_t size, size_t alignment)</div></div>
+<div class="ttc" id="agroup__zeroinit_html_ga8d8b7ebb24b513cd84d1a696048da60d"><div class="ttname"><a href="group__zeroinit.html#ga8d8b7ebb24b513cd84d1a696048da60d">mi_heap_rezalloc</a></div><div class="ttdeci">void * mi_heap_rezalloc(mi_heap_t *heap, void *p, size_t newsize)</div></div>
+<div class="ttc" id="agroup__zeroinit_html_gaae25e4ddedd4e0fb61b1a8bd5d452750"><div class="ttname"><a href="group__zeroinit.html#gaae25e4ddedd4e0fb61b1a8bd5d452750">mi_recalloc_aligned_at</a></div><div class="ttdeci">void * mi_recalloc_aligned_at(void *p, size_t newcount, size_t size, size_t alignment, size_t offset)</div></div>
+<div class="ttc" id="agroup__zeroinit_html_gad1a0d325d930eeb80f25e3fea37aacde"><div class="ttname"><a href="group__zeroinit.html#gad1a0d325d930eeb80f25e3fea37aacde">mi_heap_recalloc</a></div><div class="ttdeci">void * mi_heap_recalloc(mi_heap_t *heap, void *p, size_t newcount, size_t size)</div></div>
+<div class="ttc" id="agroup__zeroinit_html_gadfd34cd7b4f2bbda7ae06367a6360756"><div class="ttname"><a href="group__zeroinit.html#gadfd34cd7b4f2bbda7ae06367a6360756">mi_rezalloc</a></div><div class="ttdeci">void * mi_rezalloc(void *p, size_t newsize)</div></div>
 </div><!-- fragment --></div><!-- contents -->
 </div><!-- doc-content -->
 <!-- start footer part -->
 <div id="nav-path" class="navpath"><!-- id is needed for treeview function! -->
   <ul>
     <li class="navelem"><b>mimalloc-doc.h</b></li>
-    <li class="footer">Generated by <a href="https://www.doxygen.org/index.html"><img class="footer" src="doxygen.svg" width="104" height="31" alt="doxygen"/></a> 1.9.1 </li>
+    <li class="footer">Generated by <a href="https://www.doxygen.org/index.html"><img class="footer" src="doxygen.svg" width="104" height="31" alt="doxygen"/></a> 1.13.1 </li>
   </ul>
 </div>
 </body>
diff --git a/depends/mimalloc/docs/mimalloc-doxygen.css b/depends/mimalloc/docs/mimalloc-doxygen.css
index b24f5643268f..c889a8d2c326 100644
--- a/depends/mimalloc/docs/mimalloc-doxygen.css
+++ b/depends/mimalloc/docs/mimalloc-doxygen.css
@@ -47,3 +47,14 @@ div.fragment {
 #nav-sync img {
 	display: none;
 }
+h1,h2,h3,h4,h5,h6 {
+	transition:none;
+}
+.memtitle {
+	background-image: none;
+	background-color: #EEE;
+}
+table.memproto, .memproto {
+	text-shadow: none;
+	font-size: 110%;
+}
diff --git a/depends/mimalloc/docs/modules.html b/depends/mimalloc/docs/modules.html
index 7457cb9fd23f..0129057cd1a7 100644
--- a/depends/mimalloc/docs/modules.html
+++ b/depends/mimalloc/docs/modules.html
@@ -43,8 +43,8 @@
                onmouseout="return searchBox.OnSearchSelectHide()"
                alt=""/>
           <input type="text" id="MSearchField" value="Search" accesskey="S"
-               onfocus="searchBox.OnSearchFieldFocus(true)" 
-               onblur="searchBox.OnSearchFieldFocus(false)" 
+               onfocus="searchBox.OnSearchFieldFocus(true)"
+               onblur="searchBox.OnSearchFieldFocus(false)"
                onkeyup="searchBox.OnSearchFieldChange(event)"/>
           </span><span class="right">
             <a id="MSearchClose" href="javascript:searchBox.CloseResultsWindow()"><img id="MSearchCloseImg" border="0" src="search/close.svg" alt=""/></a>
@@ -69,7 +69,7 @@
       <div id="nav-sync" class="sync"></div>
     </div>
   </div>
-  <div id="splitbar" style="-moz-user-select:none;" 
+  <div id="splitbar" style="-moz-user-select:none;"
        class="ui-resizable-handle">
   </div>
 </div>
@@ -88,7 +88,7 @@
 
 <!-- iframe showing the search results (closed by default) -->
 <div id="MSearchResultsWindow">
-<iframe src="javascript:void(0)" frameborder="0" 
+<iframe src="javascript:void(0)" frameborder="0"
         name="MSearchResults" id="MSearchResults">
 </iframe>
 </div>
diff --git a/depends/mimalloc/docs/navtree.css b/depends/mimalloc/docs/navtree.css
index 046366ca230a..5ec66982ce29 100644
--- a/depends/mimalloc/docs/navtree.css
+++ b/depends/mimalloc/docs/navtree.css
@@ -22,10 +22,15 @@
 #nav-tree .selected {
   background-image: url('tab_a.png');
   background-repeat:repeat-x;
-  color: #fff;
+  color: white;
   text-shadow: 0px 1px 1px rgba(0, 0, 0, 1.0);
 }
 
+#nav-tree .selected .arrow {
+  color: #5B6364;
+  text-shadow: none;
+}
+
 #nav-tree img {
   margin:0px;
   padding:0px;
@@ -37,7 +42,6 @@
   text-decoration:none;
   padding:0px;
   margin:0px;
-  outline:none;
 }
 
 #nav-tree .label {
@@ -52,7 +56,7 @@
 
 #nav-tree .selected a {
   text-decoration:none;
-  color:#fff;
+  color:white;
 }
 
 #nav-tree .children_ul {
@@ -67,7 +71,6 @@
 
 #nav-tree {
   padding: 0px 0px;
-  background-color: #FAFAFF; 
   font-size:14px;
   overflow:auto;
 }
@@ -86,7 +89,8 @@
   display:block;
   position: absolute;
   left: 0px;
-  width: 180px;
+  width: $width;
+  overflow : hidden;
 }
 
 .ui-resizable .ui-resizable-handle {
@@ -94,7 +98,7 @@
 }
 
 .ui-resizable-e {
-  background-image:url("splitbar.png");
+  background-image:url('splitbar.png');
   background-size:100%;
   background-repeat:repeat-y;
   background-attachment: scroll;
@@ -117,7 +121,6 @@
 }
 
 #nav-tree {
-  background-image:url('nav_h.png');
   background-repeat:repeat-x;
   background-color: #F2F3F3;
   -webkit-overflow-scrolling : touch; /* iOS 5+ */
diff --git a/depends/mimalloc/docs/navtree.js b/depends/mimalloc/docs/navtree.js
index 1e272d31d4aa..2d4fa84a55d2 100644
--- a/depends/mimalloc/docs/navtree.js
+++ b/depends/mimalloc/docs/navtree.js
@@ -22,525 +22,462 @@
 
  @licend  The above is the entire license notice for the JavaScript code in this file
  */
-var navTreeSubIndices = new Array();
-var arrowDown = '&#9660;';
-var arrowRight = '&#9658;';
-
-function getData(varName)
-{
-  var i = varName.lastIndexOf('/');
-  var n = i>=0 ? varName.substring(i+1) : varName;
-  return eval(n.replace(/\-/g,'_'));
-}
 
-function stripPath(uri)
-{
-  return uri.substring(uri.lastIndexOf('/')+1);
-}
+function initNavTree(toroot,relpath) {
+  let navTreeSubIndices = [];
+  const ARROW_DOWN = '&#9660;';
+  const ARROW_RIGHT = '&#9658;';
+  const NAVPATH_COOKIE_NAME = ''+'navpath';
 
-function stripPath2(uri)
-{
-  var i = uri.lastIndexOf('/');
-  var s = uri.substring(i+1);
-  var m = uri.substring(0,i+1).match(/\/d\w\/d\w\w\/$/);
-  return m ? uri.substring(i-6) : s;
-}
+  const getData = function(varName) {
+    const i = varName.lastIndexOf('/');
+    const n = i>=0 ? varName.substring(i+1) : varName;
+    return eval(n.replace(/-/g,'_'));
+  }
 
-function hashValue()
-{
-  return $(location).attr('hash').substring(1).replace(/[^\w\-]/g,'');
-}
+  const stripPath = function(uri) {
+    return uri.substring(uri.lastIndexOf('/')+1);
+  }
 
-function hashUrl()
-{
-  return '#'+hashValue();
-}
+  const stripPath2 = function(uri) {
+    const i = uri.lastIndexOf('/');
+    const s = uri.substring(i+1);
+    const m = uri.substring(0,i+1).match(/\/d\w\/d\w\w\/$/);
+    return m ? uri.substring(i-6) : s;
+  }
 
-function pathName()
-{
-  return $(location).attr('pathname').replace(/[^-A-Za-z0-9+&@#/%?=~_|!:,.;\(\)]/g, '');
-}
+  const hashValue = function() {
+    return $(location).attr('hash').substring(1).replace(/[^\w-]/g,'');
+  }
 
-function localStorageSupported()
-{
-  try {
-    return 'localStorage' in window && window['localStorage'] !== null && window.localStorage.getItem;
+  const hashUrl = function() {
+    return '#'+hashValue();
   }
-  catch(e) {
-    return false;
+
+  const pathName = function() {
+    return $(location).attr('pathname').replace(/[^-A-Za-z0-9+&@#/%?=~_|!:,.;()]/g, '');
   }
-}
 
-function storeLink(link)
-{
-  if (!$("#nav-sync").hasClass('sync') && localStorageSupported()) {
-      window.localStorage.setItem('navpath',link);
+  const storeLink = function(link) {
+    if (!$("#nav-sync").hasClass('sync')) {
+      Cookie.writeSetting(NAVPATH_COOKIE_NAME,link,0);
+    }
   }
-}
 
-function deleteLink()
-{
-  if (localStorageSupported()) {
-    window.localStorage.setItem('navpath','');
+  const deleteLink = function() {
+    Cookie.eraseSetting(NAVPATH_COOKIE_NAME);
   }
-}
 
-function cachedLink()
-{
-  if (localStorageSupported()) {
-    return window.localStorage.getItem('navpath');
-  } else {
-    return '';
+  const cachedLink = function() {
+    return Cookie.readSetting(NAVPATH_COOKIE_NAME,'');
   }
-}
 
-function getScript(scriptName,func,show)
-{
-  var head = document.getElementsByTagName("head")[0];
-  var script = document.createElement('script');
-  script.id = scriptName;
-  script.type = 'text/javascript';
-  script.onload = func;
-  script.src = scriptName+'.js';
-  head.appendChild(script);
-}
+  const getScript = function(scriptName,func) {
+    const head = document.getElementsByTagName("head")[0];
+    const script = document.createElement('script');
+    script.id = scriptName;
+    script.type = 'text/javascript';
+    script.onload = func;
+    script.src = scriptName+'.js';
+    head.appendChild(script);
+  }
 
-function createIndent(o,domNode,node,level)
-{
-  var level=-1;
-  var n = node;
-  while (n.parentNode) { level++; n=n.parentNode; }
-  if (node.childrenData) {
-    var imgNode = document.createElement("span");
-    imgNode.className = 'arrow';
-    imgNode.style.paddingLeft=(16*level).toString()+'px';
-    imgNode.innerHTML=arrowRight;
-    node.plus_img = imgNode;
-    node.expandToggle = document.createElement("a");
-    node.expandToggle.href = "javascript:void(0)";
-    node.expandToggle.onclick = function() {
-      if (node.expanded) {
-        $(node.getChildrenUL()).slideUp("fast");
-        node.plus_img.innerHTML=arrowRight;
-        node.expanded = false;
-      } else {
-        expandNode(o, node, false, false);
+  const createIndent = function(o,domNode,node) {
+    let level=-1;
+    let n = node;
+    while (n.parentNode) { level++; n=n.parentNode; }
+    if (node.childrenData) {
+      const imgNode = document.createElement("span");
+      imgNode.className = 'arrow';
+      imgNode.style.paddingLeft=(16*level).toString()+'px';
+      imgNode.innerHTML=ARROW_RIGHT;
+      node.plus_img = imgNode;
+      node.expandToggle = document.createElement("a");
+      node.expandToggle.href = "javascript:void(0)";
+      node.expandToggle.onclick = function() {
+        if (node.expanded) {
+          $(node.getChildrenUL()).slideUp("fast");
+          node.plus_img.innerHTML=ARROW_RIGHT;
+          node.expanded = false;
+        } else {
+          expandNode(o, node, false, true);
+        }
       }
+      node.expandToggle.appendChild(imgNode);
+      domNode.appendChild(node.expandToggle);
+    } else {
+      let span = document.createElement("span");
+      span.className = 'arrow';
+      span.style.width   = 16*(level+1)+'px';
+      span.innerHTML = '&#160;';
+      domNode.appendChild(span);
     }
-    node.expandToggle.appendChild(imgNode);
-    domNode.appendChild(node.expandToggle);
-  } else {
-    var span = document.createElement("span");
-    span.className = 'arrow';
-    span.style.width   = 16*(level+1)+'px';
-    span.innerHTML = '&#160;';
-    domNode.appendChild(span);
   }
-}
 
-var animationInProgress = false;
-
-function gotoAnchor(anchor,aname,updateLocation)
-{
-  var pos, docContent = $('#doc-content');
-  var ancParent = $(anchor.parent());
-  if (ancParent.hasClass('memItemLeft') ||
-      ancParent.hasClass('memtitle') ||
-      ancParent.hasClass('fieldname') ||
-      ancParent.hasClass('fieldtype') ||
-      ancParent.is(':header'))
-  {
-    pos = ancParent.position().top;
-  } else if (anchor.position()) {
-    pos = anchor.position().top;
-  }
-  if (pos) {
-    var dist = Math.abs(Math.min(
-               pos-docContent.offset().top,
-               docContent[0].scrollHeight-
-               docContent.height()-docContent.scrollTop()));
-    animationInProgress=true;
-    docContent.animate({
-      scrollTop: pos + docContent.scrollTop() - docContent.offset().top
-    },Math.max(50,Math.min(500,dist)),function(){
-      if (updateLocation) window.location.href=aname;
-      animationInProgress=false;
-    });
-  }
-}
-
-function newNode(o, po, text, link, childrenData, lastNode)
-{
-  var node = new Object();
-  node.children = Array();
-  node.childrenData = childrenData;
-  node.depth = po.depth + 1;
-  node.relpath = po.relpath;
-  node.isLast = lastNode;
-
-  node.li = document.createElement("li");
-  po.getChildrenUL().appendChild(node.li);
-  node.parentNode = po;
-
-  node.itemDiv = document.createElement("div");
-  node.itemDiv.className = "item";
-
-  node.labelSpan = document.createElement("span");
-  node.labelSpan.className = "label";
-
-  createIndent(o,node.itemDiv,node,0);
-  node.itemDiv.appendChild(node.labelSpan);
-  node.li.appendChild(node.itemDiv);
-
-  var a = document.createElement("a");
-  node.labelSpan.appendChild(a);
-  node.label = document.createTextNode(text);
-  node.expanded = false;
-  a.appendChild(node.label);
-  if (link) {
-    var url;
-    if (link.substring(0,1)=='^') {
-      url = link.substring(1);
-      link = url;
-    } else {
-      url = node.relpath+link;
+  let animationInProgress = false;
+
+  const gotoAnchor = function(anchor,aname) {
+    let pos, docContent = $('#doc-content');
+    let ancParent = $(anchor.parent());
+    if (ancParent.hasClass('memItemLeft') || ancParent.hasClass('memtitle')  ||
+        ancParent.hasClass('fieldname')   || ancParent.hasClass('fieldtype') ||
+        ancParent.is(':header')) {
+      pos = ancParent.offset().top;
+    } else if (anchor.position()) {
+      pos = anchor.offset().top;
     }
-    a.className = stripPath(link.replace('#',':'));
-    if (link.indexOf('#')!=-1) {
-      var aname = '#'+link.split('#')[1];
-      var srcPage = stripPath(pathName());
-      var targetPage = stripPath(link.split('#')[0]);
-      a.href = srcPage!=targetPage ? url : "javascript:void(0)";
-      a.onclick = function(){
-        storeLink(link);
-        if (!$(a).parent().parent().hasClass('selected'))
-        {
-          $('.item').removeClass('selected');
-          $('.item').removeAttr('id');
-          $(a).parent().parent().addClass('selected');
-          $(a).parent().parent().attr('id','selected');
+    if (pos) {
+      const dcOffset    = docContent.offset().top;
+      const dcHeight    = docContent.height();
+      const dcScrHeight = docContent[0].scrollHeight
+      const dcScrTop    = docContent.scrollTop();
+      let dist = Math.abs(Math.min(pos-dcOffset,dcScrHeight-dcHeight-dcScrTop));
+      animationInProgress = true;
+      docContent.animate({
+        scrollTop: pos + dcScrTop - dcOffset
+      },Math.max(50,Math.min(500,dist)),function() {
+        animationInProgress=false;
+        if (anchor.parent().attr('class')=='memItemLeft') {
+          let rows = $('.memberdecls tr[class$="'+hashValue()+'"]');
+          glowEffect(rows.children(),300); // member without details
+        } else if (anchor.parent().attr('class')=='fieldname') {
+          glowEffect(anchor.parent().parent(),1000); // enum value
+        } else if (anchor.parent().attr('class')=='fieldtype') {
+          glowEffect(anchor.parent().parent(),1000); // struct field
+        } else if (anchor.parent().is(":header")) {
+          glowEffect(anchor.parent(),1000); // section header
+        } else {
+          glowEffect(anchor.next(),1000); // normal member
         }
-        var anchor = $(aname);
-        gotoAnchor(anchor,aname,true);
-      };
-    } else {
-      a.href = url;
-      a.onclick = function() { storeLink(link); }
+      });
     }
-  } else {
-    if (childrenData != null)
-    {
+  }
+
+  const newNode = function(o, po, text, link, childrenData, lastNode) {
+    const node = {
+      children     : [],
+      childrenData : childrenData,
+      depth        : po.depth + 1,
+      relpath      : po.relpath,
+      isLast       : lastNode,
+      li           : document.createElement("li"),
+      parentNode   : po,
+      itemDiv      : document.createElement("div"),
+      labelSpan    : document.createElement("span"),
+      label        : document.createTextNode(text),
+      expanded     : false,
+      childrenUL   : null,
+      getChildrenUL : function() {
+        if (!this.childrenUL) {
+          this.childrenUL = document.createElement("ul");
+          this.childrenUL.className = "children_ul";
+          this.childrenUL.style.display = "none";
+          this.li.appendChild(node.childrenUL);
+        }
+        return node.childrenUL;
+      },
+    };
+
+    node.itemDiv.className = "item";
+    node.labelSpan.className = "label";
+    createIndent(o,node.itemDiv,node);
+    node.itemDiv.appendChild(node.labelSpan);
+    node.li.appendChild(node.itemDiv);
+
+    const a = document.createElement("a");
+    node.labelSpan.appendChild(a);
+    po.getChildrenUL().appendChild(node.li);
+    a.appendChild(node.label);
+    if (link) {
+      let url;
+      if (link.substring(0,1)=='^') {
+        url = link.substring(1);
+        link = url;
+      } else {
+        url = node.relpath+link;
+      }
+      a.className = stripPath(link.replace('#',':'));
+      if (link.indexOf('#')!=-1) {
+        const aname = '#'+link.split('#')[1];
+        const srcPage = stripPath(pathName());
+        const targetPage = stripPath(link.split('#')[0]);
+        a.href = srcPage!=targetPage ? url : aname;
+        a.onclick = function() {
+          storeLink(link);
+          aPPar = $(a).parent().parent();
+          if (!aPPar.hasClass('selected')) {
+            $('.item').removeClass('selected');
+            $('.item').removeAttr('id');
+            aPPar.addClass('selected');
+            aPPar.attr('id','selected');
+          }
+          const anchor = $(aname);
+          gotoAnchor(anchor,aname);
+        };
+      } else {
+        a.href = url;
+        a.onclick = () => storeLink(link);
+      }
+    } else if (childrenData != null) {
       a.className = "nolink";
       a.href = "javascript:void(0)";
       a.onclick = node.expandToggle.onclick;
     }
+    return node;
   }
 
-  node.childrenUL = null;
-  node.getChildrenUL = function() {
-    if (!node.childrenUL) {
-      node.childrenUL = document.createElement("ul");
-      node.childrenUL.className = "children_ul";
-      node.childrenUL.style.display = "none";
-      node.li.appendChild(node.childrenUL);
-    }
-    return node.childrenUL;
-  };
-
-  return node;
-}
-
-function showRoot()
-{
-  var headerHeight = $("#top").height();
-  var footerHeight = $("#nav-path").height();
-  var windowHeight = $(window).height() - headerHeight - footerHeight;
-  (function (){ // retry until we can scroll to the selected item
-    try {
-      var navtree=$('#nav-tree');
-      navtree.scrollTo('#selected',100,{offset:-windowHeight/2});
-    } catch (err) {
-      setTimeout(arguments.callee, 0);
-    }
-  })();
-}
+  const showRoot = function() {
+    const headerHeight = $("#top").height();
+    const footerHeight = $("#nav-path").height();
+    const windowHeight = $(window).height() - headerHeight - footerHeight;
+    (function() { // retry until we can scroll to the selected item
+      try {
+        const navtree=$('#nav-tree');
+        navtree.scrollTo('#selected',100,{offset:-windowHeight/2});
+      } catch (err) {
+        setTimeout(arguments.callee, 0);
+      }
+    })();
+  }
 
-function expandNode(o, node, imm, showRoot)
-{
-  if (node.childrenData && !node.expanded) {
-    if (typeof(node.childrenData)==='string') {
-      var varName    = node.childrenData;
-      getScript(node.relpath+varName,function(){
-        node.childrenData = getData(varName);
-        expandNode(o, node, imm, showRoot);
-      }, showRoot);
-    } else {
-      if (!node.childrenVisited) {
-        getNode(o, node);
+  const expandNode = function(o, node, imm, setFocus) {
+    if (node.childrenData && !node.expanded) {
+      if (typeof(node.childrenData)==='string') {
+        const varName = node.childrenData;
+        getScript(node.relpath+varName,function() {
+          node.childrenData = getData(varName);
+          expandNode(o, node, imm, setFocus);
+        });
+      } else {
+        if (!node.childrenVisited) {
+          getNode(o, node);
+        }
+        $(node.getChildrenUL()).slideDown("fast");
+        node.plus_img.innerHTML = ARROW_DOWN;
+        node.expanded = true;
+        if (setFocus) {
+          $(node.expandToggle).focus();
+        }
       }
-      $(node.getChildrenUL()).slideDown("fast");
-      node.plus_img.innerHTML = arrowDown;
-      node.expanded = true;
     }
   }
-}
 
-function glowEffect(n,duration)
-{
-  n.addClass('glow').delay(duration).queue(function(next){
-    $(this).removeClass('glow');next();
-  });
-}
-
-function highlightAnchor()
-{
-  var aname = hashUrl();
-  var anchor = $(aname);
-  if (anchor.parent().attr('class')=='memItemLeft'){
-    var rows = $('.memberdecls tr[class$="'+hashValue()+'"]');
-    glowEffect(rows.children(),300); // member without details
-  } else if (anchor.parent().attr('class')=='fieldname'){
-    glowEffect(anchor.parent().parent(),1000); // enum value
-  } else if (anchor.parent().attr('class')=='fieldtype'){
-    glowEffect(anchor.parent().parent(),1000); // struct field
-  } else if (anchor.parent().is(":header")) {
-    glowEffect(anchor.parent(),1000); // section header
-  } else {
-    glowEffect(anchor.next(),1000); // normal member
+  const glowEffect = function(n,duration) {
+    n.addClass('glow').delay(duration).queue(function(next) {
+      $(this).removeClass('glow');next();
+    });
   }
-}
 
-function selectAndHighlight(hash,n)
-{
-  var a;
-  if (hash) {
-    var link=stripPath(pathName())+':'+hash.substring(1);
-    a=$('.item a[class$="'+link+'"]');
+  const highlightAnchor = function() {
+    const aname = hashUrl();
+    const anchor = $(aname);
+    gotoAnchor(anchor,aname);
   }
-  if (a && a.length) {
-    a.parent().parent().addClass('selected');
-    a.parent().parent().attr('id','selected');
-    highlightAnchor();
-  } else if (n) {
-    $(n.itemDiv).addClass('selected');
-    $(n.itemDiv).attr('id','selected');
-  }
-  if ($('#nav-tree-contents .item:first').hasClass('selected')) {
-    $('#nav-sync').css('top','30px');
-  } else {
-    $('#nav-sync').css('top','5px');
+
+  const selectAndHighlight = function(hash,n) {
+    let a;
+    if (hash) {
+      const link=stripPath(pathName())+':'+hash.substring(1);
+      a=$('.item a[class$="'+link+'"]');
+    }
+    if (a && a.length) {
+      a.parent().parent().addClass('selected');
+      a.parent().parent().attr('id','selected');
+      highlightAnchor();
+    } else if (n) {
+      $(n.itemDiv).addClass('selected');
+      $(n.itemDiv).attr('id','selected');
+    }
+    let topOffset=5;
+    if ($('#nav-tree-contents .item:first').hasClass('selected')) {
+      topOffset+=25;
+    }
+    $('#nav-sync').css('top',topOffset+'px');
+    showRoot();
   }
-  showRoot();
-}
 
-function showNode(o, node, index, hash)
-{
-  if (node && node.childrenData) {
-    if (typeof(node.childrenData)==='string') {
-      var varName    = node.childrenData;
-      getScript(node.relpath+varName,function(){
-        node.childrenData = getData(varName);
-        showNode(o,node,index,hash);
-      },true);
-    } else {
-      if (!node.childrenVisited) {
-        getNode(o, node);
-      }
-      $(node.getChildrenUL()).css({'display':'block'});
-      node.plus_img.innerHTML = arrowDown;
-      node.expanded = true;
-      var n = node.children[o.breadcrumbs[index]];
-      if (index+1<o.breadcrumbs.length) {
-        showNode(o,n,index+1,hash);
+  const showNode = function(o, node, index, hash) {
+    if (node && node.childrenData) {
+      if (typeof(node.childrenData)==='string') {
+        const varName = node.childrenData;
+        getScript(node.relpath+varName,function() {
+          node.childrenData = getData(varName);
+          showNode(o,node,index,hash);
+        });
       } else {
-        if (typeof(n.childrenData)==='string') {
-          var varName = n.childrenData;
-          getScript(n.relpath+varName,function(){
+        if (!node.childrenVisited) {
+          getNode(o, node);
+        }
+        $(node.getChildrenUL()).css({'display':'block'});
+        node.plus_img.innerHTML = ARROW_DOWN;
+        node.expanded = true;
+        const n = node.children[o.breadcrumbs[index]];
+        if (index+1<o.breadcrumbs.length) {
+          showNode(o,n,index+1,hash);
+        } else if (typeof(n.childrenData)==='string') {
+          const varName = n.childrenData;
+          getScript(n.relpath+varName,function() {
             n.childrenData = getData(varName);
             node.expanded=false;
             showNode(o,node,index,hash); // retry with child node expanded
-          },true);
+          });
         } else {
-          var rootBase = stripPath(o.toroot.replace(/\..+$/, ''));
+          const rootBase = stripPath(o.toroot.replace(/\..+$/, ''));
           if (rootBase=="index" || rootBase=="pages" || rootBase=="search") {
-            expandNode(o, n, true, true);
+            expandNode(o, n, true, false);
           }
           selectAndHighlight(hash,n);
         }
       }
-    }
-  } else {
-    selectAndHighlight(hash);
-  }
-}
-
-function removeToInsertLater(element) {
-  var parentNode = element.parentNode;
-  var nextSibling = element.nextSibling;
-  parentNode.removeChild(element);
-  return function() {
-    if (nextSibling) {
-      parentNode.insertBefore(element, nextSibling);
     } else {
-      parentNode.appendChild(element);
+      selectAndHighlight(hash);
     }
-  };
-}
-
-function getNode(o, po)
-{
-  var insertFunction = removeToInsertLater(po.li);
-  po.childrenVisited = true;
-  var l = po.childrenData.length-1;
-  for (var i in po.childrenData) {
-    var nodeData = po.childrenData[i];
-    po.children[i] = newNode(o, po, nodeData[0], nodeData[1], nodeData[2],
-      i==l);
   }
-  insertFunction();
-}
 
-function gotoNode(o,subIndex,root,hash,relpath)
-{
-  var nti = navTreeSubIndices[subIndex][root+hash];
-  o.breadcrumbs = $.extend(true, [], nti ? nti : navTreeSubIndices[subIndex][root]);
-  if (!o.breadcrumbs && root!=NAVTREE[0][1]) { // fallback: show index
-    navTo(o,NAVTREE[0][1],"",relpath);
-    $('.item').removeClass('selected');
-    $('.item').removeAttr('id');
-  }
-  if (o.breadcrumbs) {
-    o.breadcrumbs.unshift(0); // add 0 for root node
-    showNode(o, o.node, 0, hash);
+  const removeToInsertLater = function(element) {
+    const parentNode = element.parentNode;
+    const nextSibling = element.nextSibling;
+    parentNode.removeChild(element);
+    return function() {
+      if (nextSibling) {
+        parentNode.insertBefore(element, nextSibling);
+      } else {
+        parentNode.appendChild(element);
+      }
+    };
   }
-}
 
-function navTo(o,root,hash,relpath)
-{
-  var link = cachedLink();
-  if (link) {
-    var parts = link.split('#');
-    root = parts[0];
-    if (parts.length>1) hash = '#'+parts[1].replace(/[^\w\-]/g,'');
-    else hash='';
+  const getNode = function(o, po) {
+    const insertFunction = removeToInsertLater(po.li);
+    po.childrenVisited = true;
+    const l = po.childrenData.length-1;
+    for (let i in po.childrenData) {
+      const nodeData = po.childrenData[i];
+      po.children[i] = newNode(o, po, nodeData[0], nodeData[1], nodeData[2], i==l);
+    }
+    insertFunction();
   }
-  if (hash.match(/^#l\d+$/)) {
-    var anchor=$('a[name='+hash.substring(1)+']');
-    glowEffect(anchor.parent(),1000); // line number
-    hash=''; // strip line number anchors
+
+  const gotoNode = function(o,subIndex,root,hash,relpath) {
+    const nti = navTreeSubIndices[subIndex][root+hash];
+    o.breadcrumbs = $.extend(true, [], nti ? nti : navTreeSubIndices[subIndex][root]);
+    if (!o.breadcrumbs && root!=NAVTREE[0][1]) { // fallback: show index
+      navTo(o,NAVTREE[0][1],"",relpath);
+      $('.item').removeClass('selected');
+      $('.item').removeAttr('id');
+    }
+    if (o.breadcrumbs) {
+      o.breadcrumbs.unshift(0); // add 0 for root node
+      showNode(o, o.node, 0, hash);
+    }
   }
-  var url=root+hash;
-  var i=-1;
-  while (NAVTREEINDEX[i+1]<=url) i++;
-  if (i==-1) { i=0; root=NAVTREE[0][1]; } // fallback: show index
-  if (navTreeSubIndices[i]) {
-    gotoNode(o,i,root,hash,relpath)
-  } else {
-    getScript(relpath+'navtreeindex'+i,function(){
-      navTreeSubIndices[i] = eval('NAVTREEINDEX'+i);
-      if (navTreeSubIndices[i]) {
-        gotoNode(o,i,root,hash,relpath);
-      }
-    },true);
+
+  const navTo = function(o,root,hash,relpath) {
+    const link = cachedLink();
+    if (link) {
+      const parts = link.split('#');
+      root = parts[0];
+      hash = parts.length>1 ? '#'+parts[1].replace(/[^\w-]/g,'') : '';
+    }
+    if (hash.match(/^#l\d+$/)) {
+      const anchor=$('a[name='+hash.substring(1)+']');
+      glowEffect(anchor.parent(),1000); // line number
+      hash=''; // strip line number anchors
+    }
+    const url=root+hash;
+    let i=-1;
+    while (NAVTREEINDEX[i+1]<=url) i++;
+    if (i==-1) { i=0; root=NAVTREE[0][1]; } // fallback: show index
+    if (navTreeSubIndices[i]) {
+      gotoNode(o,i,root,hash,relpath)
+    } else {
+      getScript(relpath+'navtreeindex'+i,function() {
+        navTreeSubIndices[i] = eval('NAVTREEINDEX'+i);
+        if (navTreeSubIndices[i]) {
+          gotoNode(o,i,root,hash,relpath);
+        }
+      });
+    }
   }
-}
 
-function showSyncOff(n,relpath)
-{
+  const showSyncOff = function(n,relpath) {
     n.html('<img src="'+relpath+'sync_off.png" title="'+SYNCOFFMSG+'"/>');
-}
+  }
 
-function showSyncOn(n,relpath)
-{
+  const showSyncOn = function(n,relpath) {
     n.html('<img src="'+relpath+'sync_on.png" title="'+SYNCONMSG+'"/>');
-}
+  }
 
-function toggleSyncButton(relpath)
-{
-  var navSync = $('#nav-sync');
-  if (navSync.hasClass('sync')) {
-    navSync.removeClass('sync');
+  const o = {
+    toroot : toroot,
+    node   : {
+      childrenData  : NAVTREE,
+      children      : [],
+      childrenUL    : document.createElement("ul"),
+      getChildrenUL : function() { return this.childrenUL },
+      li            : document.getElementById("nav-tree-contents"),
+      depth         : 0,
+      relpath       : relpath,
+      expanded      : false,
+      isLast        : true,
+      plus_img      : document.createElement("span"),
+    },
+  };
+  o.node.li.appendChild(o.node.childrenUL);
+  o.node.plus_img.className = 'arrow';
+  o.node.plus_img.innerHTML = ARROW_RIGHT;
+
+  const navSync = $('#nav-sync');
+  if (cachedLink()) {
     showSyncOff(navSync,relpath);
-    storeLink(stripPath2(pathName())+hashUrl());
+    navSync.removeClass('sync');
   } else {
-    navSync.addClass('sync');
     showSyncOn(navSync,relpath);
-    deleteLink();
-  }
-}
-
-var loadTriggered = false;
-var readyTriggered = false;
-var loadObject,loadToRoot,loadUrl,loadRelPath;
-
-$(window).on('load',function(){
-  if (readyTriggered) { // ready first
-    navTo(loadObject,loadToRoot,loadUrl,loadRelPath);
-    showRoot();
   }
-  loadTriggered=true;
-});
-
-function initNavTree(toroot,relpath)
-{
-  var o = new Object();
-  o.toroot = toroot;
-  o.node = new Object();
-  o.node.li = document.getElementById("nav-tree-contents");
-  o.node.childrenData = NAVTREE;
-  o.node.children = new Array();
-  o.node.childrenUL = document.createElement("ul");
-  o.node.getChildrenUL = function() { return o.node.childrenUL; };
-  o.node.li.appendChild(o.node.childrenUL);
-  o.node.depth = 0;
-  o.node.relpath = relpath;
-  o.node.expanded = false;
-  o.node.isLast = true;
-  o.node.plus_img = document.createElement("span");
-  o.node.plus_img.className = 'arrow';
-  o.node.plus_img.innerHTML = arrowRight;
 
-  if (localStorageSupported()) {
-    var navSync = $('#nav-sync');
-    if (cachedLink()) {
-      showSyncOff(navSync,relpath);
+  navSync.click(() => {
+    const navSync = $('#nav-sync');
+    if (navSync.hasClass('sync')) {
       navSync.removeClass('sync');
+      showSyncOff(navSync,relpath);
+      storeLink(stripPath2(pathName())+hashUrl());
     } else {
+      navSync.addClass('sync');
       showSyncOn(navSync,relpath);
+      deleteLink();
     }
-    navSync.click(function(){ toggleSyncButton(relpath); });
-  }
+  });
 
-  if (loadTriggered) { // load before ready
-    navTo(o,toroot,hashUrl(),relpath);
-    showRoot();
-  } else { // ready before load
-    loadObject  = o;
-    loadToRoot  = toroot;
-    loadUrl     = hashUrl();
-    loadRelPath = relpath;
-    readyTriggered=true;
-  }
+  navTo(o,toroot,hashUrl(),relpath);
+  showRoot();
 
-  $(window).bind('hashchange', function(){
-     if (window.location.hash && window.location.hash.length>1){
-       var a;
-       if ($(location).attr('hash')){
-         var clslink=stripPath(pathName())+':'+hashValue();
-         a=$('.item a[class$="'+clslink.replace(/</g,'\\3c ')+'"]');
-       }
-       if (a==null || !$(a).parent().parent().hasClass('selected')){
-         $('.item').removeClass('selected');
-         $('.item').removeAttr('id');
-       }
-       var link=stripPath2(pathName());
-       navTo(o,link,hashUrl(),relpath);
-     } else if (!animationInProgress) {
-       $('#doc-content').scrollTop(0);
-       $('.item').removeClass('selected');
-       $('.item').removeAttr('id');
-       navTo(o,toroot,hashUrl(),relpath);
-     }
-  })
+  $(window).bind('hashchange', () => {
+    if (!animationInProgress) {
+      if (window.location.hash && window.location.hash.length>1) {
+        let a;
+        if ($(location).attr('hash')) {
+          const clslink=stripPath(pathName())+':'+hashValue();
+          a=$('.item a[class$="'+clslink.replace(/</g,'\\3c ')+'"]');
+        }
+        if (a==null || !$(a).parent().parent().hasClass('selected')) {
+          $('.item').removeClass('selected');
+          $('.item').removeAttr('id');
+        }
+        const link=stripPath2(pathName());
+        navTo(o,link,hashUrl(),relpath);
+        } else {
+        $('#doc-content').scrollTop(0);
+        $('.item').removeClass('selected');
+        $('.item').removeAttr('id');
+        navTo(o,toroot,hashUrl(),relpath);
+      }
+    }
+  });
+
+  $("div.toc a[href]").click(function(e) {
+    e.preventDefault();
+    const aname = $(this).attr("href");
+    gotoAnchor($(aname),aname);
+  });
 }
 /* @license-end */
diff --git a/depends/mimalloc/docs/navtreedata.js b/depends/mimalloc/docs/navtreedata.js
index 8dd5a5550210..c1a43b00d40b 100644
--- a/depends/mimalloc/docs/navtreedata.js
+++ b/depends/mimalloc/docs/navtreedata.js
@@ -30,7 +30,7 @@ var NAVTREE =
     [ "Environment Options", "environment.html", null ],
     [ "Overriding Malloc", "overrides.html", null ],
     [ "Performance", "bench.html", null ],
-    [ "Modules", "modules.html", "modules" ],
+    [ "Topics", "topics.html", "topics" ],
     [ "Data Structures", "annotated.html", [
       [ "Data Structures", "annotated.html", "annotated_dup" ],
       [ "Data Structure Index", "classes.html", null ],
@@ -47,5 +47,5 @@ var NAVTREEINDEX =
 "annotated.html"
 ];
 
-var SYNCONMSG = 'click to disable panel synchronisation';
-var SYNCOFFMSG = 'click to enable panel synchronisation';
\ No newline at end of file
+var SYNCONMSG = 'click to disable panel synchronization';
+var SYNCOFFMSG = 'click to enable panel synchronization';
\ No newline at end of file
diff --git a/depends/mimalloc/docs/navtreeindex0.js b/depends/mimalloc/docs/navtreeindex0.js
index 72181708b056..e3010d9ea130 100644
--- a/depends/mimalloc/docs/navtreeindex0.js
+++ b/depends/mimalloc/docs/navtreeindex0.js
@@ -8,147 +8,184 @@ var NAVTREEINDEX0 =
 "functions.html":[6,2,0],
 "functions_vars.html":[6,2,1],
 "group__aligned.html":[5,2],
-"group__aligned.html#ga08647c4593f3b2eef24a919a73eba3a3":[5,2,2],
-"group__aligned.html#ga0cadbcf5b89a7b6fb171bc8df8734819":[5,2,7],
-"group__aligned.html#ga4028d1cf4aa4c87c880747044a8322ae":[5,2,5],
-"group__aligned.html#ga53dddb4724042a90315b94bc268fb4c9":[5,2,1],
-"group__aligned.html#ga5850da130c936bd77db039dcfbc8295d":[5,2,4],
-"group__aligned.html#ga5f8c2353766db522565e642fafd8a3f8":[5,2,8],
-"group__aligned.html#ga68930196751fa2cca9e1fd0d71bade56":[5,2,3],
-"group__aligned.html#ga83c03016066b438f51a8095e9140be06":[5,2,0],
-"group__aligned.html#gaf66a9ae6c6f08bd6be6fb6ea771faffb":[5,2,6],
+"group__aligned.html#ga2022f71b95a7cd6cce1b6e07752ae8ca":[5,2,3],
+"group__aligned.html#ga424ef386fb1f9f8e0a86ab53f16eaaf1":[5,2,0],
+"group__aligned.html#ga5d7a46d054b4d7abe9d8d2474add2edf":[5,2,4],
+"group__aligned.html#ga69578ff1a98ca16e1dcd02c0995cd65c":[5,2,2],
+"group__aligned.html#ga7c1778805ce50ebbf02ccbd5e39d5dba":[5,2,7],
+"group__aligned.html#ga977f96bd2c5c141bcd70e6685c90d6c3":[5,2,1],
+"group__aligned.html#gaac7d0beb782f9b9ac31f47492b130f82":[5,2,6],
+"group__aligned.html#gad06dcf2bb8faadb2c8ea61ee5d24bbf6":[5,2,5],
 "group__analysis.html":[5,6],
+"group__analysis.html#a2b7a0c92ece8daf46b558efc990ebdc1":[5,6,0,4],
 "group__analysis.html#a332a6c14d736a99699d5453a1cb04b41":[5,6,0,0],
 "group__analysis.html#ab47526df656d8837ec3e97f11b83f835":[5,6,0,2],
-"group__analysis.html#ab820302c5cd0df133eb8e51650a008b4":[5,6,0,4],
+"group__analysis.html#ab53664e31d7fe2564f8d42041ef75cb3":[5,6,0,3],
+"group__analysis.html#ab820302c5cd0df133eb8e51650a008b4":[5,6,0,6],
 "group__analysis.html#ae0085e6e1cf059a4eb7767e30e9991b8":[5,6,0,1],
-"group__analysis.html#ae848a3e6840414891035423948ca0383":[5,6,0,3],
-"group__analysis.html#ga0d67c1789faaa15ff366c024fcaf6377":[5,6,3],
-"group__analysis.html#ga628c237489c2679af84a4d0d143b3dd5":[5,6,2],
-"group__analysis.html#ga70c46687dc6e9dc98b232b02646f8bed":[5,6,5],
-"group__analysis.html#gaa862aa8ed8d57d84cae41fc1022d71af":[5,6,4],
-"group__analysis.html#gadfa01e2900f0e5d515ad5506b26f6d65":[5,6,1],
+"group__analysis.html#ae848a3e6840414891035423948ca0383":[5,6,0,5],
+"group__analysis.html#ga0d67c1789faaa15ff366c024fcaf6377":[5,6,4],
+"group__analysis.html#ga628c237489c2679af84a4d0d143b3dd5":[5,6,3],
+"group__analysis.html#ga6a4865a887b2ec5247854af61562503c":[5,6,2],
+"group__analysis.html#ga70c46687dc6e9dc98b232b02646f8bed":[5,6,6],
+"group__analysis.html#ga8255dc9371e6b299d9802a610c4e34ec":[5,6,1],
+"group__analysis.html#gaa862aa8ed8d57d84cae41fc1022d71af":[5,6,5],
 "group__analysis.html#structmi__heap__area__t":[5,6,0],
 "group__cpp.html":[5,9],
-"group__cpp.html#ga756f4b2bc6a7ecd0a90baea8e90c7907":[5,9,7],
-"group__cpp.html#gaab78a32f55149e9fbf432d5288e38e1e":[5,9,6],
-"group__cpp.html#gaad048a9fce3d02c5909cd05c6ec24545":[5,9,1],
-"group__cpp.html#gab5e29558926d934c3f1cae8c815f942c":[5,9,3],
-"group__cpp.html#gae7bc4f56cd57ed3359060ff4f38bda81":[5,9,4],
-"group__cpp.html#gaeaded64eda71ed6b1d569d3e723abc4a":[5,9,5],
-"group__cpp.html#gaef2c2bdb4f70857902d3c8903ac095f3":[5,9,2],
+"group__cpp.html#ga5cb4f120d1f7296074256215aa9a9e54":[5,9,5],
+"group__cpp.html#ga633d96e3bc7011f960df9f3b2731fc6a":[5,9,1],
+"group__cpp.html#ga6867d89baf992728e0cc20a1f47db4d0":[5,9,6],
+"group__cpp.html#ga79c54da0b4b4ce9fcc11d2f6ef6675f8":[5,9,2],
+"group__cpp.html#ga92ae00b6dd64406c7e64557711ec04b7":[5,9,3],
+"group__cpp.html#gaace912ce086682d56f3ce9f7638d9d67":[5,9,7],
+"group__cpp.html#gadd11b85c15d21d308386844b5233856c":[5,9,4],
 "group__cpp.html#structmi__stl__allocator":[5,9,0],
 "group__extended.html":[5,1],
-"group__extended.html#ga00ec3324b6b2591c7fe3677baa30a767":[5,1,16],
-"group__extended.html#ga089c859d9eddc5f9b4bd946cd53cebee":[5,1,24],
-"group__extended.html#ga0ae4581e85453456a0d658b2b98bf7bf":[5,1,21],
+"group__extended.html#ga00ec3324b6b2591c7fe3677baa30a767":[5,1,24],
+"group__extended.html#ga089c859d9eddc5f9b4bd946cd53cebee":[5,1,37],
+"group__extended.html#ga0ae4581e85453456a0d658b2b98bf7bf":[5,1,34],
 "group__extended.html#ga1ea64283508718d9d645c38efc2f4305":[5,1,0],
-"group__extended.html#ga220f29f40a44404b0061c15bc1c31152":[5,1,25],
-"group__extended.html#ga251d369cda3f1c2a955c555486ed90e5":[5,1,2],
-"group__extended.html#ga299dae78d25ce112e384a98b7309c5be":[5,1,1],
-"group__extended.html#ga2d126e5c62d3badc35445e5d84166df2":[5,1,18],
-"group__extended.html#ga3132f521fb756fc0e8ec0b74fb58df50":[5,1,15],
-"group__extended.html#ga3460a6ca91af97be4058f523d3cb8ece":[5,1,11],
-"group__extended.html#ga3bb8468b8cfcc6e2a61d98aee85c5f99":[5,1,20],
-"group__extended.html#ga421430e2226d7d468529cec457396756":[5,1,4],
-"group__extended.html#ga4c6486a1fdcd7a423b5f25fe4be8e0cf":[5,1,9],
-"group__extended.html#ga537f13b299ddf801e49a5a94fde02c79":[5,1,19],
-"group__extended.html#ga5f071b10d4df1c3658e04e7fd67a94e6":[5,1,6],
-"group__extended.html#ga7136c2e55cb22c98ecf95d08d6debb99":[5,1,8],
-"group__extended.html#ga7795a13d20087447281858d2c771cca1":[5,1,14],
-"group__extended.html#ga7d862c2affd5790381da14eb102a364d":[5,1,10],
-"group__extended.html#ga854b1de8cb067c7316286c28b2fcd3d1":[5,1,17],
-"group__extended.html#gaa1d55e0e894be240827e5d87ec3a1f45":[5,1,12],
-"group__extended.html#gaad25050b19f30cd79397b227e0157a3f":[5,1,7],
-"group__extended.html#gab1dac8476c46cb9eecab767eb40c1525":[5,1,23],
-"group__extended.html#gac057927cd06c854b45fe7847e921bd47":[5,1,5],
-"group__extended.html#gad823d23444a4b77a40f66bf075a98a0c":[5,1,3],
-"group__extended.html#gae5b17ff027cd2150b43a33040250cf3f":[5,1,13],
-"group__extended.html#gaf8e73efc2cbca9ebfdfb166983a04c17":[5,1,22],
+"group__extended.html#ga292a45f7dbc7cd23c5352ce1f0002816":[5,1,2],
+"group__extended.html#ga2d126e5c62d3badc35445e5d84166df2":[5,1,27],
+"group__extended.html#ga2ecba0d7ebdc99e71bb985c4a1609806":[5,1,32],
+"group__extended.html#ga3132f521fb756fc0e8ec0b74fb58df50":[5,1,23],
+"group__extended.html#ga32f519797fd9a81acb4f52d36e6d751b":[5,1,25],
+"group__extended.html#ga3460a6ca91af97be4058f523d3cb8ece":[5,1,18],
+"group__extended.html#ga3ae360583f4351aa5267ee7e43008faf":[5,1,10],
+"group__extended.html#ga3bb8468b8cfcc6e2a61d98aee85c5f99":[5,1,29],
+"group__extended.html#ga41ce8525d77bbb60f618fa1029994f6e":[5,1,16],
+"group__extended.html#ga421430e2226d7d468529cec457396756":[5,1,7],
+"group__extended.html#ga4c6486a1fdcd7a423b5f25fe4be8e0cf":[5,1,15],
+"group__extended.html#ga51c47637e81df0e2f13a2d7a2dec123e":[5,1,38],
+"group__extended.html#ga537f13b299ddf801e49a5a94fde02c79":[5,1,28],
+"group__extended.html#ga591aab1c2bc2ca920e33f0f9f9cb5c52":[5,1,22],
+"group__extended.html#ga5f071b10d4df1c3658e04e7fd67a94e6":[5,1,12],
+"group__extended.html#ga7795a13d20087447281858d2c771cca1":[5,1,21],
+"group__extended.html#ga7d862c2affd5790381da14eb102a364d":[5,1,17],
+"group__extended.html#ga7f050bc6b897da82692174f5fce59cde":[5,1,14],
+"group__extended.html#ga8068cac328e41fa2170faef707315243":[5,1,33],
+"group__extended.html#ga83fc6a688b322261e1c2deab000b0591":[5,1,3],
+"group__extended.html#ga854b1de8cb067c7316286c28b2fcd3d1":[5,1,26],
+"group__extended.html#ga8c0bcd1fee27c7641e9c3c0d991b3b7d":[5,1,5],
+"group__extended.html#ga99fe38650d0b02e0e0f89ee024db91d3":[5,1,1],
+"group__extended.html#ga9a25a00a22151619a0be91a10af7787f":[5,1,6],
+"group__extended.html#gaa1d55e0e894be240827e5d87ec3a1f45":[5,1,19],
+"group__extended.html#gaa7d263e9429bac9ac8345c9d25de610e":[5,1,31],
+"group__extended.html#gaad25050b19f30cd79397b227e0157a3f":[5,1,13],
+"group__extended.html#gaaf2d9976576d5efd5544be12848af949":[5,1,11],
+"group__extended.html#gab1dac8476c46cb9eecab767eb40c1525":[5,1,36],
+"group__extended.html#gac057927cd06c854b45fe7847e921bd47":[5,1,9],
+"group__extended.html#gad7439207f8f71fb6c382a9ea20b997e7":[5,1,8],
+"group__extended.html#gadbc53414eb68b275588ec001ce1ddc7c":[5,1,30],
+"group__extended.html#gadf31cea7d0332a81c8b882cbbdbadb8d":[5,1,4],
+"group__extended.html#gae5b17ff027cd2150b43a33040250cf3f":[5,1,20],
+"group__extended.html#gaf8e73efc2cbca9ebfdfb166983a04c17":[5,1,35],
 "group__heap.html":[5,3],
-"group__heap.html#ga00e95ba1e01acac3cfd95bb7a357a6f0":[5,3,20],
-"group__heap.html#ga08ca6419a5c057a4d965868998eef487":[5,3,3],
-"group__heap.html#ga139d6b09dbf50c3c2523d0f4d1cfdeb5":[5,3,22],
-"group__heap.html#ga23acd7680fb0976dde3783254c6c874b":[5,3,11],
+"group__heap.html#ga012c5c8abe22b10043de39ff95909541":[5,3,12],
+"group__heap.html#ga14c667a6e2c5d28762d8cb7d4e057909":[5,3,8],
 "group__heap.html#ga2ab1af8d438819b55319c7ef51d1e409":[5,3,5],
+"group__heap.html#ga33f4f05b7fea7af2113c62a4bf882cc5":[5,3,10],
+"group__heap.html#ga349b677dec7da5eacdbc7a385bd62a4a":[5,3,21],
 "group__heap.html#ga34a47cde5a5b38c29f1aa3c5e76943c2":[5,3,0],
-"group__heap.html#ga45fb43a62776fbebbdf1edd99b527954":[5,3,26],
-"group__heap.html#ga4a21070eb4e7cce018133c8d5f4b0527":[5,3,18],
-"group__heap.html#ga4af03a6e2b93fae77424d93f889705c3":[5,3,2],
-"group__heap.html#ga5d03fbe062ffcf38f0f417fd968357fc":[5,3,7],
-"group__heap.html#ga766f672ba56f2fbfeb9d9dbb0b7f6b11":[5,3,14],
+"group__heap.html#ga484e3d01cd174f78c7e53370e5a7c819":[5,3,26],
+"group__heap.html#ga55545a3ec6da29c5b4f62e540ecac1e2":[5,3,20],
+"group__heap.html#ga5754e09ccc51dd6bc73885bb6ea21b7a":[5,3,22],
+"group__heap.html#ga6466bde8b5712aa34e081a8317f9f471":[5,3,25],
+"group__heap.html#ga6df988a7219d5707f010d5f3eb0dc3f5":[5,3,17],
 "group__heap.html#ga7922f7495cde30b1984d0e6072419298":[5,3,4],
-"group__heap.html#ga851da6c43fe0b71c1376cee8aef90db0":[5,3,13],
-"group__heap.html#ga8db4cbb87314a989a9a187464d6b5e05":[5,3,8],
-"group__heap.html#ga8e3dbd46650dd26573cf307a2c8f1f5a":[5,3,23],
-"group__heap.html#ga903104592c8ed53417a3762da6241133":[5,3,24],
-"group__heap.html#ga9cbed01e42c0647907295de92c3fa296":[5,3,9],
 "group__heap.html#ga9f9c0844edb9717f4feacd79116b8e0d":[5,3,6],
-"group__heap.html#gaa1a1c7a1f4da6826b5a25b70ef878368":[5,3,12],
-"group__heap.html#gaa450a59c6c7ae5fdbd1c2b80a8329ef0":[5,3,25],
-"group__heap.html#gaa6702b3c48e9e53e50e81b36f5011d55":[5,3,1],
-"group__heap.html#gaaef3395f66be48f37bdc8322509c5d81":[5,3,15],
-"group__heap.html#gab5b87e1805306f70df38789fcfcf6653":[5,3,10],
-"group__heap.html#gab8631ec88c8d26641b68b5d25dcd4422":[5,3,21],
-"group__heap.html#gac74e94ad9b0c9b57c1c4d88b8825b7a8":[5,3,19],
-"group__heap.html#gaf96c788a1bf553fe2d371de9365e047c":[5,3,17],
-"group__heap.html#gafc603b696bd14cae6da28658f950d98c":[5,3,16],
+"group__heap.html#gaa42ec2079989c4374f2c331d9b35f4e4":[5,3,3],
+"group__heap.html#gaa718bb226ec0546ba6d1b6cb32179f3a":[5,3,14],
+"group__heap.html#gab0f755c0b21c387fe8e9024200faa372":[5,3,13],
+"group__heap.html#gab374e206c7034e0d899fb934e4f4a863":[5,3,9],
+"group__heap.html#gabebc796399619d964d8db77aa835e8c1":[5,3,24],
+"group__heap.html#gac0098aaf231d3e9586c73136d5df95da":[5,3,1],
+"group__heap.html#gac5252d6a2e510bd349e4fcb452e6a93a":[5,3,15],
+"group__heap.html#gac6ac9f0e7be9ab4ff70acfc8dad1235a":[5,3,7],
+"group__heap.html#gacafcc26df827c7a7de5e850217566108":[5,3,2],
+"group__heap.html#gaccf7bfe10ce510a000d3547d9cf7fa29":[5,3,19],
+"group__heap.html#gaccf8c249872f30bf1c2493a09197d734":[5,3,16],
+"group__heap.html#gad224df78f1fbee942df8adf023e12cf3":[5,3,23],
+"group__heap.html#gae7cd171425bee04c683c65a3701f0b4a":[5,3,18],
+"group__heap.html#gae7ffc045c3996497a7f3a5f6fe7b8aaa":[5,3,11],
 "group__malloc.html":[5,0],
-"group__malloc.html#ga08cec32dd5bbe7da91c78d19f1b5bebe":[5,0,8],
-"group__malloc.html#ga0b05e2bf0f73e7401ae08597ff782ac6":[5,0,4],
+"group__malloc.html#ga0621af6a5e3aa384e6a1b548958bf583":[5,0,5],
+"group__malloc.html#ga19299856216cfbb08e2628593654dfb0":[5,0,1],
 "group__malloc.html#ga23a0fbb452b5dce8e31fab1a1958cacc":[5,0,9],
-"group__malloc.html#ga3406e8b168bc74c8637b11571a6da83a":[5,0,3],
-"group__malloc.html#ga61d57b4144ba24fba5c1e9b956d13853":[5,0,7],
-"group__malloc.html#ga97fedb4f7107c592fd7f0f0a8949a57d":[5,0,0],
-"group__malloc.html#gaaabf971c2571891433477e2d21a35266":[5,0,11],
-"group__malloc.html#gaaee66a1d483c3e28f585525fb96707e4":[5,0,1],
-"group__malloc.html#gac7cffe13f1f458ed16789488bf92b9b2":[5,0,10],
-"group__malloc.html#gaf11eb497da57bdfb2de65eb191c69db6":[5,0,5],
+"group__malloc.html#ga245ac90ebc2cfdd17de599e5fea59889":[5,0,10],
+"group__malloc.html#ga486d0d26b3b3794f6d1cdb41a9aed92d":[5,0,11],
+"group__malloc.html#ga4dc3a4067037b151a64629fe8a332641":[5,0,6],
+"group__malloc.html#ga61f46bade3db76ca24aaafedc40de7b6":[5,0,4],
+"group__malloc.html#ga6686568014b54d1e6c7ac64a076e4f56":[5,0,0],
+"group__malloc.html#ga8bddfb4a1270a0854bbcf44cb3980467":[5,0,7],
+"group__malloc.html#ga94c3afcc086e85d75a57e9f76b9b71dd":[5,0,8],
+"group__malloc.html#gae1dd97b542420c87ae085e822b1229e8":[5,0,3],
+"group__malloc.html#gae6e38c4403247a7b40d80419e093bfb8":[5,0,12],
 "group__malloc.html#gaf2c7b89c327d1f60f59e68b9ea644d95":[5,0,2],
-"group__malloc.html#gafdd9d8bb2986e668ba9884f28af38000":[5,0,12],
-"group__malloc.html#gafe68ac7c5e24a65cd55c9d6b152211a0":[5,0,6],
 "group__options.html":[5,7],
 "group__options.html#ga04180ae41b0d601421dd62ced40ca050":[5,7,2],
-"group__options.html#ga459ad98f18b3fc9275474807fe0ca188":[5,7,4],
-"group__options.html#ga65518b69ec5d32336b50e07f74b3f629":[5,7,8],
+"group__options.html#ga274db5a6ac87cc24ef0b23e7006ed02c":[5,7,5],
+"group__options.html#ga459ad98f18b3fc9275474807fe0ca188":[5,7,6],
+"group__options.html#ga65518b69ec5d32336b50e07f74b3f629":[5,7,10],
 "group__options.html#ga7e8af195cc81d3fa64ccf2662caa565a":[5,7,3],
-"group__options.html#ga7ef623e440e6e5545cb08c94e71e4b90":[5,7,6],
-"group__options.html#ga9a13d05fcb77489cb06d4d017ebd8bed":[5,7,7],
+"group__options.html#ga7ef623e440e6e5545cb08c94e71e4b90":[5,7,8],
+"group__options.html#ga96ad9c406338bd314cfe878cfc9bf723":[5,7,4],
+"group__options.html#ga9a13d05fcb77489cb06d4d017ebd8bed":[5,7,9],
 "group__options.html#gaebf6ff707a2e688ebb1a2296ca564054":[5,7,1],
-"group__options.html#gaf84921c32375e25754dc2ee6a911fa60":[5,7,5],
+"group__options.html#gaf84921c32375e25754dc2ee6a911fa60":[5,7,7],
 "group__options.html#gafebf7ed116adb38ae5218bc3ce06884c":[5,7,0],
+"group__options.html#ggafebf7ed116adb38ae5218bc3ce06884ca009e4b5684922ce664d73d2a8e1698d9":[5,7,0,24],
+"group__options.html#ggafebf7ed116adb38ae5218bc3ce06884ca02005f164bdf03f5f00c5be726adf487":[5,7,0,25],
 "group__options.html#ggafebf7ed116adb38ae5218bc3ce06884ca0957ef73b2550764b4840edf48422fda":[5,7,0,1],
-"group__options.html#ggafebf7ed116adb38ae5218bc3ce06884ca0ac33a18f6b659fcfaf44efb0bab1b74":[5,7,0,12],
-"group__options.html#ggafebf7ed116adb38ae5218bc3ce06884ca154fe170131d5212cff57e22b99523c5":[5,7,0,11],
+"group__options.html#ggafebf7ed116adb38ae5218bc3ce06884ca0ac33a18f6b659fcfaf44efb0bab1b74":[5,7,0,18],
+"group__options.html#ggafebf7ed116adb38ae5218bc3ce06884ca11e62ed69200a489a5be955582078c0c":[5,7,0,16],
 "group__options.html#ggafebf7ed116adb38ae5218bc3ce06884ca17a190c25be381142d87e0468c4c068c":[5,7,0,14],
-"group__options.html#ggafebf7ed116adb38ae5218bc3ce06884ca1e8de72c93da7ff22d91e1e27b52ac2b":[5,7,0,3],
-"group__options.html#ggafebf7ed116adb38ae5218bc3ce06884ca2ecbe7ef32f5c84de3739aa4f0b805a1":[5,7,0,8],
-"group__options.html#ggafebf7ed116adb38ae5218bc3ce06884ca32ce97ece29f69e82579679cf8a307ad":[5,7,0,4],
-"group__options.html#ggafebf7ed116adb38ae5218bc3ce06884ca4192d491200d0055df0554d4cf65054e":[5,7,0,5],
-"group__options.html#ggafebf7ed116adb38ae5218bc3ce06884ca4b74ae2a69e445de6c2361b73c1d14bf":[5,7,0,15],
-"group__options.html#ggafebf7ed116adb38ae5218bc3ce06884ca5b4357b74be0d87568036c32eb1a2e4a":[5,7,0,16],
+"group__options.html#ggafebf7ed116adb38ae5218bc3ce06884ca1e8de72c93da7ff22d91e1e27b52ac2b":[5,7,0,13],
+"group__options.html#ggafebf7ed116adb38ae5218bc3ce06884ca38c67733a3956a1f4eeaca89fab9e78e":[5,7,0,27],
+"group__options.html#ggafebf7ed116adb38ae5218bc3ce06884ca4b74ae2a69e445de6c2361b73c1d14bf":[5,7,0,11],
+"group__options.html#ggafebf7ed116adb38ae5218bc3ce06884ca5b4357b74be0d87568036c32eb1a2e4a":[5,7,0,28],
+"group__options.html#ggafebf7ed116adb38ae5218bc3ce06884ca6364331e305e7d3c0218b058ff3afc88":[5,7,0,22],
 "group__options.html#ggafebf7ed116adb38ae5218bc3ce06884ca7c8b7bf5281c581bad64f5daa6442777":[5,7,0,2],
-"group__options.html#ggafebf7ed116adb38ae5218bc3ce06884caa13e7926d4339d2aa6fbf61d4473fd5c":[5,7,0,7],
-"group__options.html#ggafebf7ed116adb38ae5218bc3ce06884cac81ee965b130fa81238913a3c239d536":[5,7,0,13],
-"group__options.html#ggafebf7ed116adb38ae5218bc3ce06884caca7ed041be3b0b9d0b82432c7bf41af2":[5,7,0,6],
-"group__options.html#ggafebf7ed116adb38ae5218bc3ce06884cada854dd272c66342f18a93ee254a2968":[5,7,0,9],
-"group__options.html#ggafebf7ed116adb38ae5218bc3ce06884cafb121d30d87591850d5410ccc3a95c6d":[5,7,0,10],
+"group__options.html#ggafebf7ed116adb38ae5218bc3ce06884ca7cc4804ced69004fa42a9a136a9ba556":[5,7,0,8],
+"group__options.html#ggafebf7ed116adb38ae5218bc3ce06884ca8236501f1ab45d26e6fd885d191a2b5e":[5,7,0,23],
+"group__options.html#ggafebf7ed116adb38ae5218bc3ce06884ca8f51df355bf6651db899e6085b54865e":[5,7,0,12],
+"group__options.html#ggafebf7ed116adb38ae5218bc3ce06884ca9d15c5e3d2115eef681c17e4dd5ab9a4":[5,7,0,9],
+"group__options.html#ggafebf7ed116adb38ae5218bc3ce06884ca9fa61bd9668479f8452d2195759444cc":[5,7,0,20],
+"group__options.html#ggafebf7ed116adb38ae5218bc3ce06884caa13e7926d4339d2aa6fbf61d4473fd5c":[5,7,0,6],
+"group__options.html#ggafebf7ed116adb38ae5218bc3ce06884caa9ad9005d7017c8c30ad2d6ba31db909":[5,7,0,21],
+"group__options.html#ggafebf7ed116adb38ae5218bc3ce06884cab1c88e23ae290bbeec824038a97959de":[5,7,0,10],
+"group__options.html#ggafebf7ed116adb38ae5218bc3ce06884caca7ed041be3b0b9d0b82432c7bf41af2":[5,7,0,5],
+"group__options.html#ggafebf7ed116adb38ae5218bc3ce06884cadcfb5a09580361b1be65901d2d812de6":[5,7,0,19],
+"group__options.html#ggafebf7ed116adb38ae5218bc3ce06884cadd351e615acd8563529c20a347be7290":[5,7,0,17],
+"group__options.html#ggafebf7ed116adb38ae5218bc3ce06884caeae1696100e4057ffc4182730cc04e40":[5,7,0,26],
+"group__options.html#ggafebf7ed116adb38ae5218bc3ce06884caec6ecbe29d46a48205ed8823a8a52a6a":[5,7,0,3],
+"group__options.html#ggafebf7ed116adb38ae5218bc3ce06884caf9595921087e942602ee079158762665":[5,7,0,4],
 "group__options.html#ggafebf7ed116adb38ae5218bc3ce06884cafbf4822e5c00732c5984b32a032837f0":[5,7,0,0],
+"group__options.html#ggafebf7ed116adb38ae5218bc3ce06884cafbf4999c828cf79a0fb2de65d23f7333":[5,7,0,7],
+"group__options.html#ggafebf7ed116adb38ae5218bc3ce06884cafd0c5ddbc4b59fd8b5216871728167a5":[5,7,0,15],
 "group__posix.html":[5,8],
-"group__posix.html#ga06d07cf357bbac5c73ba5d0c0c421e17":[5,8,7],
-"group__posix.html#ga0d28d5cf61e6bfbb18c63092939fe5c9":[5,8,3],
-"group__posix.html#ga1326d2e4388630b5f81ca7206318b8e5":[5,8,1],
-"group__posix.html#ga4531c9e775bb3ae12db57c1ba8a5d7de":[5,8,6],
-"group__posix.html#ga48fad8648a2f1dab9c87ea9448a52088":[5,8,12],
-"group__posix.html#ga705dc7a64bffacfeeb0141501a5c35d7":[5,8,2],
-"group__posix.html#ga72e9d7ffb5fe94d69bc722c8506e27bc":[5,8,5],
-"group__posix.html#ga73baaf5951f5165ba0763d0c06b6a93b":[5,8,13],
-"group__posix.html#ga7e1934d60a3e697950eeb48e042bfad5":[5,8,11],
-"group__posix.html#gaab7fa71ea93b96873f5d9883db57d40e":[5,8,8],
-"group__posix.html#gacff84f226ba9feb2031b8992e5579447":[5,8,9],
-"group__posix.html#gad5a69c8fea96aa2b7a7c818c2130090a":[5,8,0],
-"group__posix.html#gae01389eedab8d67341ff52e2aad80ebb":[5,8,4],
-"group__posix.html#gaeb325c39b887d3b90d85d1eb1712fb1e":[5,8,10],
+"group__posix.html#ga06d07cf357bbac5c73ba5d0c0c421e17":[5,8,12],
+"group__posix.html#ga0d28d5cf61e6bfbb18c63092939fe5c9":[5,8,7],
+"group__posix.html#ga16570deddd559001b44953eedbad0084":[5,8,3],
+"group__posix.html#ga430ed1513f0571ff83be00ec58a98ee0":[5,8,2],
+"group__posix.html#ga4531c9e775bb3ae12db57c1ba8a5d7de":[5,8,11],
+"group__posix.html#ga50cafb9722020402f065de93799f64ca":[5,8,19],
+"group__posix.html#ga644bebccdbb2821542dd8c7e7641f476":[5,8,16],
+"group__posix.html#ga66bcfeb4faedbb42b796bc680821ef84":[5,8,0],
+"group__posix.html#ga6ac6a6a8f3c96f1af24bb8d0439cbbd1":[5,8,21],
+"group__posix.html#ga705dc7a64bffacfeeb0141501a5c35d7":[5,8,5],
+"group__posix.html#ga726867f13fd29ca36064954c0285b1d8":[5,8,14],
+"group__posix.html#ga72e9d7ffb5fe94d69bc722c8506e27bc":[5,8,9],
+"group__posix.html#ga7b82a44094fdec4d2084eb4288a979b0":[5,8,13],
+"group__posix.html#ga7e1934d60a3e697950eeb48e042bfad5":[5,8,17],
+"group__posix.html#ga9d23ac7885fed7413c11d8e0ffa31071":[5,8,10],
+"group__posix.html#gaa9fd7f25c9ac3a20e89b33bd6e383fcf":[5,8,20],
+"group__posix.html#gab41369c1a1da7504013a7a0b1d4dd958":[5,8,6],
+"group__posix.html#gacff84f226ba9feb2031b8992e5579447":[5,8,15],
+"group__posix.html#gad5a69c8fea96aa2b7a7c818c2130090a":[5,8,1],
+"group__posix.html#gadfeccb72748a2f6305474a37d9d57bce":[5,8,18],
+"group__posix.html#gae01389eedab8d67341ff52e2aad80ebb":[5,8,8],
+"group__posix.html#gaf82cbb4b4f24acf723348628451798d3":[5,8,4],
 "group__typed.html":[5,5],
 "group__typed.html#ga0619a62c5fd886f1016030abe91f0557":[5,5,7],
 "group__typed.html#ga1158b49a55dfa81f58a4426a7578f523":[5,5,9],
@@ -162,20 +199,20 @@ var NAVTREEINDEX0 =
 "group__typed.html#gae80c47c9d4cab10961fff1a8ac98fc07":[5,5,0],
 "group__typed.html#gaf213d5422ec35e7f6caad827c79bc948":[5,5,4],
 "group__zeroinit.html":[5,4],
-"group__zeroinit.html#ga375fa8a611c51905e592d5d467c49664":[5,4,4],
-"group__zeroinit.html#ga3e7e5c291acf1c7fd7ffd9914a9f945f":[5,4,6],
-"group__zeroinit.html#ga496452c96f1de8c500be9fddf52edaf7":[5,4,2],
-"group__zeroinit.html#ga4ff5e92ad73585418a072c9d059e5cf9":[5,4,7],
-"group__zeroinit.html#ga8648c5fbb22a80f0262859099f06dfbd":[5,4,0],
-"group__zeroinit.html#ga8c292e142110229a2980b37ab036dbc6":[5,4,8],
-"group__zeroinit.html#ga9f3f999396c8f77ca5e80e7b40ac29e3":[5,4,1],
-"group__zeroinit.html#gac90da54fa7e5d10bdc97ce0b51dce2eb":[5,4,5],
-"group__zeroinit.html#gacd71a7bce96aab38ae6de17af2eb2cf0":[5,4,9],
-"group__zeroinit.html#gacfad83f14eb5d6a42a497a898e19fc76":[5,4,3],
-"group__zeroinit.html#gae8b358c417e61d5307da002702b0a8e1":[5,4,10],
+"group__zeroinit.html#ga07b5bcbaf00d0d2e598c232982588496":[5,4,2],
+"group__zeroinit.html#ga2bafa79c3f98ea74882349d44cffa5d9":[5,4,5],
+"group__zeroinit.html#ga3e2169b48683aa0ab64f813fd68d839e":[5,4,6],
+"group__zeroinit.html#ga4d02404fe1e7db00beb65f185e012caa":[5,4,9],
+"group__zeroinit.html#ga5129f6dc46ee1613d918820a8a0533a7":[5,4,4],
+"group__zeroinit.html#ga6843a88285bbfcc3bdfccc60aafd1270":[5,4,10],
+"group__zeroinit.html#ga87ddd674bf1c67237d780d0b9e0f0f32":[5,4,1],
+"group__zeroinit.html#ga8d8b7ebb24b513cd84d1a696048da60d":[5,4,3],
+"group__zeroinit.html#gaae25e4ddedd4e0fb61b1a8bd5d452750":[5,4,7],
+"group__zeroinit.html#gad1a0d325d930eeb80f25e3fea37aacde":[5,4,0],
+"group__zeroinit.html#gadfd34cd7b4f2bbda7ae06367a6360756":[5,4,8],
 "index.html":[],
-"modules.html":[5],
 "overrides.html":[3],
 "pages.html":[],
+"topics.html":[5],
 "using.html":[1]
 };
diff --git a/depends/mimalloc/docs/overrides.html b/depends/mimalloc/docs/overrides.html
index fc0ad591e7ae..51b186528038 100644
--- a/depends/mimalloc/docs/overrides.html
+++ b/depends/mimalloc/docs/overrides.html
@@ -1,24 +1,26 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "https://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
+<html xmlns="http://www.w3.org/1999/xhtml" lang="en-US">
 <head>
 <meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
-<meta http-equiv="X-UA-Compatible" content="IE=9"/>
-<meta name="generator" content="Doxygen 1.9.1"/>
+<meta http-equiv="X-UA-Compatible" content="IE=11"/>
+<meta name="generator" content="Doxygen 1.13.1"/>
 <meta name="viewport" content="width=device-width, initial-scale=1"/>
 <title>mi-malloc: Overriding Malloc</title>
 <link href="tabs.css" rel="stylesheet" type="text/css"/>
 <script type="text/javascript" src="jquery.js"></script>
 <script type="text/javascript" src="dynsections.js"></script>
+<script type="text/javascript" src="clipboard.js"></script>
 <link href="navtree.css" rel="stylesheet" type="text/css"/>
-<script type="text/javascript" src="resize.js"></script>
 <script type="text/javascript" src="navtreedata.js"></script>
 <script type="text/javascript" src="navtree.js"></script>
+<script type="text/javascript" src="resize.js"></script>
+<script type="text/javascript" src="cookie.js"></script>
 <link href="search/search.css" rel="stylesheet" type="text/css"/>
 <script type="text/javascript" src="search/searchdata.js"></script>
 <script type="text/javascript" src="search/search.js"></script>
 <script type="text/javascript">
-/* @license magnet:?xt=urn:btih:cf05388f2679ee054f2beb29a391d25f4e673ac3&amp;dn=gpl-2.0.txt GPL-v2 */
-  $(document).ready(function() { init_search(); });
+/* @license magnet:?xt=urn:btih:d3d9a9a6595521f9666a5e94cc830dab83b65699&amp;dn=expat.txt MIT */
+  $(function() { init_search(); });
 /* @license-end */
 </script>
 <link href="doxygen.css" rel="stylesheet" type="text/css" />
@@ -29,20 +31,16 @@
 <div id="titlearea">
 <table cellspacing="0" cellpadding="0">
  <tbody>
- <tr style="height: 56px;">
+ <tr id="projectrow">
   <td id="projectlogo"><img alt="Logo" src="mimalloc-logo.svg"/></td>
-  <td id="projectalign" style="padding-left: 0.5em;">
-   <div id="projectname">mi-malloc
-   &#160;<span id="projectnumber">1.7/2.0</span>
+  <td id="projectalign">
+   <div id="projectname">mi-malloc<span id="projectnumber">&#160;1.8/2.1</span>
    </div>
   </td>
-   <td>        <div id="MSearchBox" class="MSearchBoxInactive">
+    <td>        <div id="MSearchBox" class="MSearchBoxInactive">
         <span class="left">
-          <img id="MSearchSelect" src="search/mag_sel.svg"
-               onmouseover="return searchBox.OnSearchSelectShow()"
-               onmouseout="return searchBox.OnSearchSelectHide()"
-               alt=""/>
-          <input type="text" id="MSearchField" value="Search" accesskey="S"
+          <span id="MSearchSelect"                onmouseover="return searchBox.OnSearchSelectShow()"                onmouseout="return searchBox.OnSearchSelectHide()">&#160;</span>
+          <input type="text" id="MSearchField" value="" placeholder="Search" accesskey="S"
                onfocus="searchBox.OnSearchFieldFocus(true)" 
                onblur="searchBox.OnSearchFieldFocus(false)" 
                onkeyup="searchBox.OnSearchFieldChange(event)"/>
@@ -56,10 +54,15 @@
 </table>
 </div>
 <!-- end header part -->
-<!-- Generated by Doxygen 1.9.1 -->
+<!-- Generated by Doxygen 1.13.1 -->
+<script type="text/javascript">
+/* @license magnet:?xt=urn:btih:d3d9a9a6595521f9666a5e94cc830dab83b65699&amp;dn=expat.txt MIT */
+var searchBox = new SearchBox("searchBox", "search/",'.html');
+/* @license-end */
+</script>
 <script type="text/javascript">
-/* @license magnet:?xt=urn:btih:cf05388f2679ee054f2beb29a391d25f4e673ac3&amp;dn=gpl-2.0.txt GPL-v2 */
-var searchBox = new SearchBox("searchBox", "search",false,'Search','.html');
+/* @license magnet:?xt=urn:btih:d3d9a9a6595521f9666a5e94cc830dab83b65699&amp;dn=expat.txt MIT */
+$(function() { codefold.init(0); });
 /* @license-end */
 </script>
 </div><!-- top -->
@@ -74,8 +77,8 @@
   </div>
 </div>
 <script type="text/javascript">
-/* @license magnet:?xt=urn:btih:cf05388f2679ee054f2beb29a391d25f4e673ac3&amp;dn=gpl-2.0.txt GPL-v2 */
-$(document).ready(function(){initNavTree('overrides.html',''); initResizable(); });
+/* @license magnet:?xt=urn:btih:d3d9a9a6595521f9666a5e94cc830dab83b65699&amp;dn=expat.txt MIT */
+$(function(){initNavTree('overrides.html',''); initResizable(true); });
 /* @license-end */
 </script>
 <div id="doc-content">
@@ -88,43 +91,47 @@
 
 <!-- iframe showing the search results (closed by default) -->
 <div id="MSearchResultsWindow">
-<iframe src="javascript:void(0)" frameborder="0" 
-        name="MSearchResults" id="MSearchResults">
-</iframe>
+<div id="MSearchResults">
+<div class="SRPage">
+<div id="SRIndex">
+<div id="SRResults"></div>
+<div class="SRStatus" id="Loading">Loading...</div>
+<div class="SRStatus" id="Searching">Searching...</div>
+<div class="SRStatus" id="NoMatches">No Matches</div>
+</div>
+</div>
+</div>
 </div>
 
-<div class="PageDoc"><div class="header">
-  <div class="headertitle">
-<div class="title">Overriding Malloc </div>  </div>
+<div><div class="header">
+  <div class="headertitle"><div class="title">Overriding Malloc</div></div>
 </div><!--header-->
 <div class="contents">
-<div class="textblock"><p>Overriding the standard <code>malloc</code> can be done either <em>dynamically</em> or <em>statically</em>.</p>
+<div class="textblock"><p>Overriding the standard <code>malloc</code> (and <code>new</code>) can be done either <em>dynamically</em> or <em>statically</em>.</p>
 <h2>Dynamic override</h2>
 <p>This is the recommended way to override the standard malloc interface.</p>
-<h3>Linux, BSD</h3>
-<p>On these systems we preload the mimalloc shared library so all calls to the standard <code>malloc</code> interface are resolved to the <em>mimalloc</em> library.</p>
-<ul>
-<li><code>env LD_PRELOAD=/usr/lib/libmimalloc.so myprogram</code></li>
-</ul>
-<p>You can set extra environment variables to check that mimalloc is running, like: </p><div class="fragment"><div class="line">env MIMALLOC_VERBOSE=1 LD_PRELOAD=/usr/lib/libmimalloc.so myprogram</div>
-</div><!-- fragment --><p> or run with the debug version to get detailed statistics: </p><div class="fragment"><div class="line">env MIMALLOC_SHOW_STATS=1 LD_PRELOAD=/usr/lib/libmimalloc-debug.so myprogram</div>
-</div><!-- fragment --><h3>MacOS</h3>
-<p>On macOS we can also preload the mimalloc shared library so all calls to the standard <code>malloc</code> interface are resolved to the <em>mimalloc</em> library.</p>
-<ul>
-<li><code>env DYLD_FORCE_FLAT_NAMESPACE=1 DYLD_INSERT_LIBRARIES=/usr/lib/libmimalloc.dylib myprogram</code></li>
-</ul>
-<p>Note that certain security restrictions may apply when doing this from the <a href="https://stackoverflow.com/questions/43941322/dyld-insert-libraries-ignored-when-calling-application-through-bash">shell</a>.</p>
-<p>(Note: macOS support for dynamic overriding is recent, please report any issues.)</p>
-<h3>Windows</h3>
-<p>Overriding on Windows is robust and has the particular advantage to be able to redirect all malloc/free calls that go through the (dynamic) C runtime allocator, including those from other DLL's or libraries.</p>
-<p>The overriding on Windows requires that you link your program explicitly with the mimalloc DLL and use the C-runtime library as a DLL (using the <code>/MD</code> or <code>/MDd</code> switch). Also, the <code>mimalloc-redirect.dll</code> (or <code>mimalloc-redirect32.dll</code>) must be available in the same folder as the main <code>mimalloc-override.dll</code> at runtime (as it is a dependency). The redirection DLL ensures that all calls to the C runtime malloc API get redirected to mimalloc (in <code>mimalloc-override.dll</code>).</p>
-<p>To ensure the mimalloc DLL is loaded at run-time it is easiest to insert some call to the mimalloc API in the <code>main</code> function, like <code>mi_version()</code> (or use the <code>/INCLUDE:mi_version</code> switch on the linker). See the <code>mimalloc-override-test</code> project for an example on how to use this. For best performance on Windows with C++, it is also recommended to also override the <code>new</code>/<code>delete</code> operations (by including <a href="https://github.com/microsoft/mimalloc/blob/master/include/mimalloc-new-delete.h"><code>mimalloc-new-delete.h</code></a> a single(!) source file in your project without linking to the mimalloc library).</p>
+<h3>Dynamic Override on Linux, BSD</h3>
+<p>On these ELF-based systems we preload the mimalloc shared library so all calls to the standard <code>malloc</code> interface are resolved to the <em>mimalloc</em> library. </p><div class="fragment"><div class="line">&gt; env LD_PRELOAD=/usr/lib/libmimalloc.so myprogram</div>
+</div><!-- fragment --><p>You can set extra environment variables to check that mimalloc is running, like: </p><div class="fragment"><div class="line">&gt; env MIMALLOC_VERBOSE=1 LD_PRELOAD=/usr/lib/libmimalloc.so myprogram</div>
+</div><!-- fragment --><p> or run with the debug version to get detailed statistics: </p><div class="fragment"><div class="line">&gt; env MIMALLOC_SHOW_STATS=1 LD_PRELOAD=/usr/lib/libmimalloc-debug.so myprogram</div>
+</div><!-- fragment --><h3>Dynamic Override on MacOS</h3>
+<p>On macOS we can also preload the mimalloc shared library so all calls to the standard <code>malloc</code> interface are resolved to the <em>mimalloc</em> library. </p><div class="fragment"><div class="line">&gt; env DYLD_INSERT_LIBRARIES=/usr/lib/libmimalloc.dylib myprogram</div>
+</div><!-- fragment --><p>Note that certain security restrictions may apply when doing this from the <a href="https://stackoverflow.com/questions/43941322/dyld-insert-libraries-ignored-when-calling-application-through-bash">shell</a>.</p>
+<h3>Dynamic Override on Windows</h3>
+<p><span id="override_on_windows">Dynamically overriding on mimalloc on Windows</span> is robust and has the particular advantage to be able to redirect all malloc/free calls that go through the (dynamic) C runtime allocator, including those from other DLL's or libraries. As it intercepts all allocation calls on a low level, it can be used reliably on large programs that include other 3rd party components. There are four requirements to make the overriding work well:</p>
+<ol type="1">
+<li>Use the C-runtime library as a DLL (using the <code>/MD</code> or <code>/MDd</code> switch).</li>
+<li>Link your program explicitly with the <code>mimalloc.lib</code> export library for the <code>mimalloc.dll</code>. (which must be compiled with <code>-DMI_OVERRIDE=ON</code>, which is the default though). To ensure the <code>mimalloc.dll</code> is actually loaded at run-time it is easiest to insert some call to the mimalloc API in the <code>main</code> function, like <code>mi_version()</code> (or use the <code>/include:mi_version</code> switch on the linker command, or similarly, <code>#pragma comment(linker, "/include:mi_version")</code> in some source file). See the <code>mimalloc-test-override</code> project for an example on how to use this.</li>
+<li>The <code>mimalloc-redirect.dll</code> must be put in the same directory as the main <code>mimalloc.dll</code> at runtime (as it is a dependency of that DLL). The redirection DLL ensures that all calls to the C runtime malloc API get redirected to mimalloc functions (which reside in <code>mimalloc.dll</code>).</li>
+<li>Ensure the <code>mimalloc.dll</code> comes as early as possible in the import list of the final executable (so it can intercept all potential allocations). You can use <code>minject -l &lt;exe&gt;</code> to check this if needed.</li>
+</ol>
+<p>For best performance on Windows with C++, it is also recommended to also override the <code>new</code>/<code>delete</code> operations (by including <a href="include/mimalloc-new-delete.h"><code>mimalloc-new-delete.h</code></a> a single(!) source file in your project).</p>
 <p>The environment variable <code>MIMALLOC_DISABLE_REDIRECT=1</code> can be used to disable dynamic overriding at run-time. Use <code>MIMALLOC_VERBOSE=1</code> to check if mimalloc was successfully redirected.</p>
-<p>(Note: in principle, it is possible to even patch existing executables without any recompilation if they are linked with the dynamic C runtime (<code>ucrtbase.dll</code>) &ndash; just put the <code>mimalloc-override.dll</code> into the import table (and put <code>mimalloc-redirect.dll</code> in the same folder) Such patching can be done for example with <a href="https://ntcore.com/?page_id=388">CFF Explorer</a>).</p>
+<p>For different platforms than x64, you may need a specific [redirection dll](bin). Furthermore, we cannot always re-link an executable or ensure <code>mimalloc.dll</code> comes first in the import table. In such cases the [<code>minject</code>](bin) tool can be used to patch the executable's import tables.</p>
 <h2>Static override</h2>
-<p>On Unix systems, you can also statically link with <em>mimalloc</em> to override the standard malloc interface. The recommended way is to link the final program with the <em>mimalloc</em> single object file (<code>mimalloc-override.o</code>). We use an object file instead of a library file as linkers give preference to that over archives to resolve symbols. To ensure that the standard malloc interface resolves to the <em>mimalloc</em> library, link it as the first object file. For example:</p>
-<div class="fragment"><div class="line">gcc -o myprogram mimalloc-<span class="keyword">override</span>.o  myfile1.c ...</div>
-</div><!-- fragment --><h2>List of Overrides:</h2>
+<p>On Unix-like systems, you can also statically link with <em>mimalloc</em> to override the standard malloc interface. The recommended way is to link the final program with the <em>mimalloc</em> single object file (<code>mimalloc.o</code>). We use an object file instead of a library file as linkers give preference to that over archives to resolve symbols. To ensure that the standard malloc interface resolves to the <em>mimalloc</em> library, link it as the first object file. For example: </p><div class="fragment"><div class="line">&gt; gcc -o myprogram mimalloc.o  myfile1.c ...</div>
+</div><!-- fragment --><p>Another way to override statically that works on all platforms, is to link statically to mimalloc (as shown in the introduction) and include a header file in each source file that re-defines <code>malloc</code> etc. to <code>mi_malloc</code>. This is provided by <a href="https://github.com/microsoft/mimalloc/blob/master/include/mimalloc-override.h"><code>mimalloc-override.h</code></a>. This only works reliably though if all sources are under your control or otherwise mixing of pointers from different heaps may occur!</p>
+<h2>List of Overrides:</h2>
 <p>The specific functions that get redirected to the <em>mimalloc</em> library are:</p>
 <div class="fragment"><div class="line"><span class="comment">// C</span></div>
 <div class="line"><span class="keywordtype">void</span>*  malloc(<span class="keywordtype">size_t</span> size);</div>
@@ -142,10 +149,10 @@ <h2>Static override</h2>
 <div class="line"><span class="keywordtype">void</span>   <span class="keyword">operator</span> <span class="keyword">delete</span>(<span class="keywordtype">void</span>* p);</div>
 <div class="line"><span class="keywordtype">void</span>   <span class="keyword">operator</span> <span class="keyword">delete</span>[](<span class="keywordtype">void</span>* p);</div>
 <div class="line"> </div>
-<div class="line"><span class="keywordtype">void</span>*  <span class="keyword">operator</span> <span class="keyword">new</span>(std::size_t n) noexcept(<span class="keyword">false</span>);</div>
-<div class="line"><span class="keywordtype">void</span>*  <span class="keyword">operator</span> <span class="keyword">new</span>[](std::size_t n) noexcept(<span class="keyword">false</span>);</div>
-<div class="line"><span class="keywordtype">void</span>*  <span class="keyword">operator</span> <span class="keyword">new</span>( std::size_t n, std::align_val_t align) noexcept(<span class="keyword">false</span>);</div>
-<div class="line"><span class="keywordtype">void</span>*  <span class="keyword">operator</span> <span class="keyword">new</span>[]( std::size_t n, std::align_val_t align) noexcept(<span class="keyword">false</span>);</div>
+<div class="line"><span class="keywordtype">void</span>*  <span class="keyword">operator</span> <span class="keyword">new</span>(std::size_t n) <span class="keyword">noexcept</span>(<span class="keyword">false</span>);</div>
+<div class="line"><span class="keywordtype">void</span>*  <span class="keyword">operator</span> <span class="keyword">new</span>[](std::size_t n) <span class="keyword">noexcept</span>(<span class="keyword">false</span>);</div>
+<div class="line"><span class="keywordtype">void</span>*  <span class="keyword">operator</span> <span class="keyword">new</span>( std::size_t n, std::align_val_t align) <span class="keyword">noexcept</span>(<span class="keyword">false</span>);</div>
+<div class="line"><span class="keywordtype">void</span>*  <span class="keyword">operator</span> <span class="keyword">new</span>[]( std::size_t n, std::align_val_t align) <span class="keyword">noexcept</span>(<span class="keyword">false</span>);</div>
 <div class="line"> </div>
 <div class="line"><span class="keywordtype">void</span>*  <span class="keyword">operator</span> <span class="keyword">new</span>  ( std::size_t count, <span class="keyword">const</span> std::nothrow_t&amp; tag);</div>
 <div class="line"><span class="keywordtype">void</span>*  <span class="keyword">operator</span> <span class="keyword">new</span>[]( std::size_t count, <span class="keyword">const</span> std::nothrow_t&amp; tag);</div>
@@ -191,7 +198,7 @@ <h2>Static override</h2>
 <!-- start footer part -->
 <div id="nav-path" class="navpath"><!-- id is needed for treeview function! -->
   <ul>
-    <li class="footer">Generated by <a href="https://www.doxygen.org/index.html"><img class="footer" src="doxygen.svg" width="104" height="31" alt="doxygen"/></a> 1.9.1 </li>
+    <li class="footer">Generated by <a href="https://www.doxygen.org/index.html"><img class="footer" src="doxygen.svg" width="104" height="31" alt="doxygen"/></a> 1.13.1 </li>
   </ul>
 </div>
 </body>
diff --git a/depends/mimalloc/docs/pages.html b/depends/mimalloc/docs/pages.html
index 6999a810d037..b03b05f74c51 100644
--- a/depends/mimalloc/docs/pages.html
+++ b/depends/mimalloc/docs/pages.html
@@ -1,24 +1,26 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "https://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
+<html xmlns="http://www.w3.org/1999/xhtml" lang="en-US">
 <head>
 <meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
-<meta http-equiv="X-UA-Compatible" content="IE=9"/>
-<meta name="generator" content="Doxygen 1.9.1"/>
+<meta http-equiv="X-UA-Compatible" content="IE=11"/>
+<meta name="generator" content="Doxygen 1.13.1"/>
 <meta name="viewport" content="width=device-width, initial-scale=1"/>
 <title>mi-malloc: Related Pages</title>
 <link href="tabs.css" rel="stylesheet" type="text/css"/>
 <script type="text/javascript" src="jquery.js"></script>
 <script type="text/javascript" src="dynsections.js"></script>
+<script type="text/javascript" src="clipboard.js"></script>
 <link href="navtree.css" rel="stylesheet" type="text/css"/>
-<script type="text/javascript" src="resize.js"></script>
 <script type="text/javascript" src="navtreedata.js"></script>
 <script type="text/javascript" src="navtree.js"></script>
+<script type="text/javascript" src="resize.js"></script>
+<script type="text/javascript" src="cookie.js"></script>
 <link href="search/search.css" rel="stylesheet" type="text/css"/>
 <script type="text/javascript" src="search/searchdata.js"></script>
 <script type="text/javascript" src="search/search.js"></script>
 <script type="text/javascript">
-/* @license magnet:?xt=urn:btih:cf05388f2679ee054f2beb29a391d25f4e673ac3&amp;dn=gpl-2.0.txt GPL-v2 */
-  $(document).ready(function() { init_search(); });
+/* @license magnet:?xt=urn:btih:d3d9a9a6595521f9666a5e94cc830dab83b65699&amp;dn=expat.txt MIT */
+  $(function() { init_search(); });
 /* @license-end */
 </script>
 <link href="doxygen.css" rel="stylesheet" type="text/css" />
@@ -29,20 +31,16 @@
 <div id="titlearea">
 <table cellspacing="0" cellpadding="0">
  <tbody>
- <tr style="height: 56px;">
+ <tr id="projectrow">
   <td id="projectlogo"><img alt="Logo" src="mimalloc-logo.svg"/></td>
-  <td id="projectalign" style="padding-left: 0.5em;">
-   <div id="projectname">mi-malloc
-   &#160;<span id="projectnumber">1.7/2.0</span>
+  <td id="projectalign">
+   <div id="projectname">mi-malloc<span id="projectnumber">&#160;1.8/2.1</span>
    </div>
   </td>
-   <td>        <div id="MSearchBox" class="MSearchBoxInactive">
+    <td>        <div id="MSearchBox" class="MSearchBoxInactive">
         <span class="left">
-          <img id="MSearchSelect" src="search/mag_sel.svg"
-               onmouseover="return searchBox.OnSearchSelectShow()"
-               onmouseout="return searchBox.OnSearchSelectHide()"
-               alt=""/>
-          <input type="text" id="MSearchField" value="Search" accesskey="S"
+          <span id="MSearchSelect"                onmouseover="return searchBox.OnSearchSelectShow()"                onmouseout="return searchBox.OnSearchSelectHide()">&#160;</span>
+          <input type="text" id="MSearchField" value="" placeholder="Search" accesskey="S"
                onfocus="searchBox.OnSearchFieldFocus(true)" 
                onblur="searchBox.OnSearchFieldFocus(false)" 
                onkeyup="searchBox.OnSearchFieldChange(event)"/>
@@ -56,10 +54,15 @@
 </table>
 </div>
 <!-- end header part -->
-<!-- Generated by Doxygen 1.9.1 -->
+<!-- Generated by Doxygen 1.13.1 -->
+<script type="text/javascript">
+/* @license magnet:?xt=urn:btih:d3d9a9a6595521f9666a5e94cc830dab83b65699&amp;dn=expat.txt MIT */
+var searchBox = new SearchBox("searchBox", "search/",'.html');
+/* @license-end */
+</script>
 <script type="text/javascript">
-/* @license magnet:?xt=urn:btih:cf05388f2679ee054f2beb29a391d25f4e673ac3&amp;dn=gpl-2.0.txt GPL-v2 */
-var searchBox = new SearchBox("searchBox", "search",false,'Search','.html');
+/* @license magnet:?xt=urn:btih:d3d9a9a6595521f9666a5e94cc830dab83b65699&amp;dn=expat.txt MIT */
+$(function() { codefold.init(0); });
 /* @license-end */
 </script>
 </div><!-- top -->
@@ -74,8 +77,8 @@
   </div>
 </div>
 <script type="text/javascript">
-/* @license magnet:?xt=urn:btih:cf05388f2679ee054f2beb29a391d25f4e673ac3&amp;dn=gpl-2.0.txt GPL-v2 */
-$(document).ready(function(){initNavTree('pages.html',''); initResizable(); });
+/* @license magnet:?xt=urn:btih:d3d9a9a6595521f9666a5e94cc830dab83b65699&amp;dn=expat.txt MIT */
+$(function(){initNavTree('pages.html',''); initResizable(true); });
 /* @license-end */
 </script>
 <div id="doc-content">
@@ -88,22 +91,28 @@
 
 <!-- iframe showing the search results (closed by default) -->
 <div id="MSearchResultsWindow">
-<iframe src="javascript:void(0)" frameborder="0" 
-        name="MSearchResults" id="MSearchResults">
-</iframe>
+<div id="MSearchResults">
+<div class="SRPage">
+<div id="SRIndex">
+<div id="SRResults"></div>
+<div class="SRStatus" id="Loading">Loading...</div>
+<div class="SRStatus" id="Searching">Searching...</div>
+<div class="SRStatus" id="NoMatches">No Matches</div>
+</div>
+</div>
+</div>
 </div>
 
 <div class="header">
-  <div class="headertitle">
-<div class="title">Related Pages</div>  </div>
+  <div class="headertitle"><div class="title">Related Pages</div></div>
 </div><!--header-->
 <div class="contents">
 <div class="textblock">Here is a list of all related documentation pages:</div><div class="directory">
 <table class="directory">
 <tr id="row_0_" class="even"><td class="entry"><span style="width:16px;display:inline-block;">&#160;</span><a class="el" href="build.html" target="_self">Building</a></td><td class="desc"></td></tr>
-<tr id="row_1_"><td class="entry"><span style="width:16px;display:inline-block;">&#160;</span><a class="el" href="using.html" target="_self">Using the library</a></td><td class="desc"></td></tr>
+<tr id="row_1_" class="odd"><td class="entry"><span style="width:16px;display:inline-block;">&#160;</span><a class="el" href="using.html" target="_self">Using the library</a></td><td class="desc"></td></tr>
 <tr id="row_2_" class="even"><td class="entry"><span style="width:16px;display:inline-block;">&#160;</span><a class="el" href="environment.html" target="_self">Environment Options</a></td><td class="desc"></td></tr>
-<tr id="row_3_"><td class="entry"><span style="width:16px;display:inline-block;">&#160;</span><a class="el" href="overrides.html" target="_self">Overriding Malloc</a></td><td class="desc"></td></tr>
+<tr id="row_3_" class="odd"><td class="entry"><span style="width:16px;display:inline-block;">&#160;</span><a class="el" href="overrides.html" target="_self">Overriding Malloc</a></td><td class="desc"></td></tr>
 <tr id="row_4_" class="even"><td class="entry"><span style="width:16px;display:inline-block;">&#160;</span><a class="el" href="bench.html" target="_self">Performance</a></td><td class="desc"></td></tr>
 </table>
 </div><!-- directory -->
@@ -112,7 +121,7 @@
 <!-- start footer part -->
 <div id="nav-path" class="navpath"><!-- id is needed for treeview function! -->
   <ul>
-    <li class="footer">Generated by <a href="https://www.doxygen.org/index.html"><img class="footer" src="doxygen.svg" width="104" height="31" alt="doxygen"/></a> 1.9.1 </li>
+    <li class="footer">Generated by <a href="https://www.doxygen.org/index.html"><img class="footer" src="doxygen.svg" width="104" height="31" alt="doxygen"/></a> 1.13.1 </li>
   </ul>
 </div>
 </body>
diff --git a/depends/mimalloc/docs/resize.js b/depends/mimalloc/docs/resize.js
index e1ad0fe3ba04..a571744065a0 100644
--- a/depends/mimalloc/docs/resize.js
+++ b/depends/mimalloc/docs/resize.js
@@ -22,119 +22,126 @@
 
  @licend  The above is the entire license notice for the JavaScript code in this file
  */
-function initResizable()
-{
-  var cookie_namespace = 'doxygen';
-  var sidenav,navtree,content,header,collapsed,collapsedWidth=0,barWidth=6,desktop_vp=768,titleHeight;
 
-  function readCookie(cookie)
-  {
-    var myCookie = cookie_namespace+"_"+cookie+"=";
-    if (document.cookie) {
-      var index = document.cookie.indexOf(myCookie);
-      if (index != -1) {
-        var valStart = index + myCookie.length;
-        var valEnd = document.cookie.indexOf(";", valStart);
-        if (valEnd == -1) {
-          valEnd = document.cookie.length;
-        }
-        var val = document.cookie.substring(valStart, valEnd);
-        return val;
-      }
-    }
-    return 0;
-  }
-
-  function writeCookie(cookie, val, expiration)
-  {
-    if (val==undefined) return;
-    if (expiration == null) {
-      var date = new Date();
-      date.setTime(date.getTime()+(10*365*24*60*60*1000)); // default expiration is one week
-      expiration = date.toGMTString();
-    }
-    document.cookie = cookie_namespace + "_" + cookie + "=" + val + "; expires=" + expiration+"; path=/";
-  }
+function initResizable(treeview) {
+  let sidenav,navtree,content,header,footer,barWidth=6;
+  const RESIZE_COOKIE_NAME = ''+'width';
 
-  function resizeWidth()
-  {
-    var windowWidth = $(window).width() + "px";
-    var sidenavWidth = $(sidenav).outerWidth();
+  function resizeWidth() {
+    const sidenavWidth = $(sidenav).outerWidth();
     content.css({marginLeft:parseInt(sidenavWidth)+"px"});
-    writeCookie('width',sidenavWidth-barWidth, null);
+    if (typeof page_layout!=='undefined' && page_layout==1) {
+      footer.css({marginLeft:parseInt(sidenavWidth)+"px"});
+    }
+    Cookie.writeSetting(RESIZE_COOKIE_NAME,sidenavWidth-barWidth);
   }
 
-  function restoreWidth(navWidth)
-  {
-    var windowWidth = $(window).width() + "px";
+  function restoreWidth(navWidth) {
     content.css({marginLeft:parseInt(navWidth)+barWidth+"px"});
+    if (typeof page_layout!=='undefined' && page_layout==1) {
+      footer.css({marginLeft:parseInt(navWidth)+barWidth+"px"});
+    }
     sidenav.css({width:navWidth + "px"});
   }
 
-  function resizeHeight()
-  {
-    var headerHeight = header.outerHeight();
-    var footerHeight = footer.outerHeight();
-    var windowHeight = $(window).height() - headerHeight - footerHeight;
-    content.css({height:windowHeight + "px"});
-    navtree.css({height:windowHeight + "px"});
-    sidenav.css({height:windowHeight + "px"});
-    var width=$(window).width();
-    if (width!=collapsedWidth) {
-      if (width<desktop_vp && collapsedWidth>=desktop_vp) {
-        if (!collapsed) {
-          collapseExpand();
-        }
-      } else if (width>desktop_vp && collapsedWidth<desktop_vp) {
-        if (collapsed) {
-          collapseExpand();
-        }
+  function resizeHeight(treeview) {
+    const headerHeight = header.outerHeight();
+    const windowHeight = $(window).height();
+    let contentHeight;
+    if (treeview)
+    {
+      const footerHeight = footer.outerHeight();
+      let navtreeHeight,sideNavHeight;
+      if (typeof page_layout==='undefined' || page_layout==0) { /* DISABLE_INDEX=NO */
+        contentHeight = windowHeight - headerHeight - footerHeight;
+        navtreeHeight = contentHeight;
+        sideNavHeight = contentHeight;
+      } else if (page_layout==1) { /* DISABLE_INDEX=YES */
+        contentHeight = windowHeight - footerHeight;
+        navtreeHeight = windowHeight - headerHeight;
+        sideNavHeight = windowHeight;
       }
-      collapsedWidth=width;
+      navtree.css({height:navtreeHeight + "px"});
+      sidenav.css({height:sideNavHeight + "px"});
+    }
+    else
+    {
+      contentHeight = windowHeight - headerHeight;
     }
+    content.css({height:contentHeight + "px"});
     if (location.hash.slice(1)) {
       (document.getElementById(location.hash.slice(1))||document.body).scrollIntoView();
     }
   }
 
-  function collapseExpand()
-  {
+  function collapseExpand() {
+    let newWidth;
     if (sidenav.width()>0) {
-      restoreWidth(0);
-      collapsed=true;
-    }
-    else {
-      var width = readCookie('width');
-      if (width>200 && width<$(window).width()) { restoreWidth(width); } else { restoreWidth(200); }
-      collapsed=false;
+      newWidth=0;
+    } else {
+      const width = Cookie.readSetting(RESIZE_COOKIE_NAME,180);
+      newWidth = (width>180 && width<$(window).width()) ? width : 180;
     }
+    restoreWidth(newWidth);
+    const sidenavWidth = $(sidenav).outerWidth();
+    Cookie.writeSetting(RESIZE_COOKIE_NAME,sidenavWidth-barWidth);
   }
 
   header  = $("#top");
-  sidenav = $("#side-nav");
   content = $("#doc-content");
-  navtree = $("#nav-tree");
   footer  = $("#nav-path");
-  $(".side-nav-resizable").resizable({resize: function(e, ui) { resizeWidth(); } });
-  $(sidenav).resizable({ minWidth: 0 });
-  $(window).resize(function() { resizeHeight(); });
-  var device = navigator.userAgent.toLowerCase();
-  var touch_device = device.match(/(iphone|ipod|ipad|android)/);
-  if (touch_device) { /* wider split bar for touch only devices */
-    $(sidenav).css({ paddingRight:'20px' });
-    $('.ui-resizable-e').css({ width:'20px' });
-    $('#nav-sync').css({ right:'34px' });
-    barWidth=20;
+  sidenav = $("#side-nav");
+  if (!treeview) {
+//    title   = $("#titlearea");
+//    titleH  = $(title).height();
+//    let animating = false;
+//    content.on("scroll", function() {
+//      slideOpts = { duration: 200,
+//                    step: function() {
+//                        contentHeight = $(window).height() - header.outerHeight();
+//                        content.css({ height : contentHeight + "px" });
+//                      },
+//                    done: function() { animating=false; }
+//                  };
+//      if (content.scrollTop()>titleH && title.css('display')!='none' && !animating) {
+//        title.slideUp(slideOpts);
+//        animating=true;
+//      } else if (content.scrollTop()<=titleH && title.css('display')=='none' && !animating) {
+//        title.slideDown(slideOpts);
+//        animating=true;
+//      }
+//    });
+  } else {
+    navtree = $("#nav-tree");
+    $(".side-nav-resizable").resizable({resize: function(e, ui) { resizeWidth(); } });
+    $(sidenav).resizable({ minWidth: 0 });
   }
-  var width = readCookie('width');
-  if (width) { restoreWidth(width); } else { resizeWidth(); }
-  resizeHeight();
-  var url = location.href;
-  var i=url.indexOf("#");
+  $(window).resize(function() { resizeHeight(treeview); });
+  if (treeview)
+  {
+    const device = navigator.userAgent.toLowerCase();
+    const touch_device = device.match(/(iphone|ipod|ipad|android)/);
+    if (touch_device) { /* wider split bar for touch only devices */
+      $(sidenav).css({ paddingRight:'20px' });
+      $('.ui-resizable-e').css({ width:'20px' });
+      $('#nav-sync').css({ right:'34px' });
+      barWidth=20;
+    }
+    const width = Cookie.readSetting(RESIZE_COOKIE_NAME,180);
+    if (width) { restoreWidth(width); } else { resizeWidth(); }
+  }
+  resizeHeight(treeview);
+  const url = location.href;
+  const i=url.indexOf("#");
   if (i>=0) window.location.hash=url.substr(i);
-  var _preventDefault = function(evt) { evt.preventDefault(); };
-  $("#splitbar").bind("dragstart", _preventDefault).bind("selectstart", _preventDefault);
-  $(".ui-resizable-handle").dblclick(collapseExpand);
-  $(window).on('load',resizeHeight);
+  const _preventDefault = function(evt) { evt.preventDefault(); };
+  if (treeview)
+  {
+    $("#splitbar").bind("dragstart", _preventDefault).bind("selectstart", _preventDefault);
+    $(".ui-resizable-handle").dblclick(collapseExpand);
+    // workaround for firefox
+    $("body").css({overflow: "hidden"});
+  }
+  $(window).on('load',function() { resizeHeight(treeview); });
 }
 /* @license-end */
diff --git a/depends/mimalloc/docs/search/all_1.js b/depends/mimalloc/docs/search/all_1.js
index 7f1097c09520..d371a39915e0 100644
--- a/depends/mimalloc/docs/search/all_1.js
+++ b/depends/mimalloc/docs/search/all_1.js
@@ -1,4 +1,6 @@
 var searchData=
 [
-  ['aligned_20allocation_1',['Aligned Allocation',['../group__aligned.html',1,'']]]
+  ['aligned_20allocation_0',['Aligned Allocation',['../group__aligned.html',1,'']]],
+  ['allocation_1',['Allocation',['../group__aligned.html',1,'Aligned Allocation'],['../group__malloc.html',1,'Basic Allocation'],['../group__heap.html',1,'Heap Allocation']]],
+  ['allocation_2',['Zero initialized re-allocation',['../group__zeroinit.html',1,'']]]
 ];
diff --git a/depends/mimalloc/docs/search/all_10.js b/depends/mimalloc/docs/search/all_10.js
new file mode 100644
index 000000000000..1437d04ac002
--- /dev/null
+++ b/depends/mimalloc/docs/search/all_10.js
@@ -0,0 +1,4 @@
+var searchData=
+[
+  ['zero_20initialized_20re_20allocation_0',['Zero initialized re-allocation',['../group__zeroinit.html',1,'']]]
+];
diff --git a/depends/mimalloc/docs/search/all_2.js b/depends/mimalloc/docs/search/all_2.js
index 00576d78a20d..6a297a47bfaf 100644
--- a/depends/mimalloc/docs/search/all_2.js
+++ b/depends/mimalloc/docs/search/all_2.js
@@ -1,7 +1,7 @@
 var searchData=
 [
-  ['basic_20allocation_2',['Basic Allocation',['../group__malloc.html',1,'']]],
-  ['block_5fsize_3',['block_size',['../group__analysis.html#a332a6c14d736a99699d5453a1cb04b41',1,'mi_heap_area_t']]],
-  ['blocks_4',['blocks',['../group__analysis.html#ae0085e6e1cf059a4eb7767e30e9991b8',1,'mi_heap_area_t']]],
-  ['building_5',['Building',['../build.html',1,'']]]
+  ['basic_20allocation_0',['Basic Allocation',['../group__malloc.html',1,'']]],
+  ['block_5fsize_1',['block_size',['../group__analysis.html#a332a6c14d736a99699d5453a1cb04b41',1,'mi_heap_area_t']]],
+  ['blocks_2',['blocks',['../group__analysis.html#ae0085e6e1cf059a4eb7767e30e9991b8',1,'mi_heap_area_t']]],
+  ['building_3',['Building',['../build.html',1,'']]]
 ];
diff --git a/depends/mimalloc/docs/search/all_3.js b/depends/mimalloc/docs/search/all_3.js
index 9a029ee0b764..76374a610538 100644
--- a/depends/mimalloc/docs/search/all_3.js
+++ b/depends/mimalloc/docs/search/all_3.js
@@ -1,5 +1,5 @@
 var searchData=
 [
-  ['c_2b_2b_20wrappers_6',['C++ wrappers',['../group__cpp.html',1,'']]],
-  ['committed_7',['committed',['../group__analysis.html#ab47526df656d8837ec3e97f11b83f835',1,'mi_heap_area_t']]]
+  ['c_20wrappers_0',['C++ wrappers',['../group__cpp.html',1,'']]],
+  ['committed_1',['committed',['../group__analysis.html#ab47526df656d8837ec3e97f11b83f835',1,'mi_heap_area_t']]]
 ];
diff --git a/depends/mimalloc/docs/search/all_4.js b/depends/mimalloc/docs/search/all_4.js
index 5dc5128610b7..a2c108b7efbf 100644
--- a/depends/mimalloc/docs/search/all_4.js
+++ b/depends/mimalloc/docs/search/all_4.js
@@ -1,5 +1,5 @@
 var searchData=
 [
-  ['environment_20options_8',['Environment Options',['../environment.html',1,'']]],
-  ['extended_20functions_9',['Extended Functions',['../group__extended.html',1,'']]]
+  ['environment_20options_0',['Environment Options',['../environment.html',1,'']]],
+  ['extended_20functions_1',['Extended Functions',['../group__extended.html',1,'']]]
 ];
diff --git a/depends/mimalloc/docs/search/all_5.js b/depends/mimalloc/docs/search/all_5.js
index 7441d85349c2..6f8d30e9f2b4 100644
--- a/depends/mimalloc/docs/search/all_5.js
+++ b/depends/mimalloc/docs/search/all_5.js
@@ -1,5 +1,5 @@
 var searchData=
 [
-  ['heap_20allocation_10',['Heap Allocation',['../group__heap.html',1,'']]],
-  ['heap_20introspection_11',['Heap Introspection',['../group__analysis.html',1,'']]]
+  ['full_5fblock_5fsize_0',['full_block_size',['../group__analysis.html#ab53664e31d7fe2564f8d42041ef75cb3',1,'mi_heap_area_t']]],
+  ['functions_1',['Extended Functions',['../group__extended.html',1,'']]]
 ];
diff --git a/depends/mimalloc/docs/search/all_6.js b/depends/mimalloc/docs/search/all_6.js
index 6d32b7b1dba9..5a38d8485110 100644
--- a/depends/mimalloc/docs/search/all_6.js
+++ b/depends/mimalloc/docs/search/all_6.js
@@ -1,153 +1,6 @@
 var searchData=
 [
-  ['mi_5f_5fposix_5fmemalign_12',['mi__posix_memalign',['../group__posix.html#gad5a69c8fea96aa2b7a7c818c2130090a',1,'mimalloc-doc.h']]],
-  ['mi_5faligned_5falloc_13',['mi_aligned_alloc',['../group__posix.html#ga1326d2e4388630b5f81ca7206318b8e5',1,'mimalloc-doc.h']]],
-  ['mi_5falignment_5fmax_14',['MI_ALIGNMENT_MAX',['../group__aligned.html#ga83c03016066b438f51a8095e9140be06',1,'mimalloc-doc.h']]],
-  ['mi_5fblock_5fvisit_5ffun_15',['mi_block_visit_fun',['../group__analysis.html#gadfa01e2900f0e5d515ad5506b26f6d65',1,'mimalloc-doc.h']]],
-  ['mi_5fcalloc_16',['mi_calloc',['../group__malloc.html#ga97fedb4f7107c592fd7f0f0a8949a57d',1,'mimalloc-doc.h']]],
-  ['mi_5fcalloc_5faligned_17',['mi_calloc_aligned',['../group__aligned.html#ga53dddb4724042a90315b94bc268fb4c9',1,'mimalloc-doc.h']]],
-  ['mi_5fcalloc_5faligned_5fat_18',['mi_calloc_aligned_at',['../group__aligned.html#ga08647c4593f3b2eef24a919a73eba3a3',1,'mimalloc-doc.h']]],
-  ['mi_5fcalloc_5ftp_19',['mi_calloc_tp',['../group__typed.html#gae80c47c9d4cab10961fff1a8ac98fc07',1,'mimalloc-doc.h']]],
-  ['mi_5fcfree_20',['mi_cfree',['../group__posix.html#ga705dc7a64bffacfeeb0141501a5c35d7',1,'mimalloc-doc.h']]],
-  ['mi_5fcheck_5fowned_21',['mi_check_owned',['../group__analysis.html#ga628c237489c2679af84a4d0d143b3dd5',1,'mimalloc-doc.h']]],
-  ['mi_5fcollect_22',['mi_collect',['../group__extended.html#ga421430e2226d7d468529cec457396756',1,'mimalloc-doc.h']]],
-  ['mi_5fdeferred_5ffree_5ffun_23',['mi_deferred_free_fun',['../group__extended.html#ga299dae78d25ce112e384a98b7309c5be',1,'mimalloc-doc.h']]],
-  ['mi_5ferror_5ffun_24',['mi_error_fun',['../group__extended.html#ga251d369cda3f1c2a955c555486ed90e5',1,'mimalloc-doc.h']]],
-  ['mi_5fexpand_25',['mi_expand',['../group__malloc.html#gaaee66a1d483c3e28f585525fb96707e4',1,'mimalloc-doc.h']]],
-  ['mi_5ffree_26',['mi_free',['../group__malloc.html#gaf2c7b89c327d1f60f59e68b9ea644d95',1,'mimalloc-doc.h']]],
-  ['mi_5ffree_5faligned_27',['mi_free_aligned',['../group__posix.html#ga0d28d5cf61e6bfbb18c63092939fe5c9',1,'mimalloc-doc.h']]],
-  ['mi_5ffree_5fsize_28',['mi_free_size',['../group__posix.html#gae01389eedab8d67341ff52e2aad80ebb',1,'mimalloc-doc.h']]],
-  ['mi_5ffree_5fsize_5faligned_29',['mi_free_size_aligned',['../group__posix.html#ga72e9d7ffb5fe94d69bc722c8506e27bc',1,'mimalloc-doc.h']]],
-  ['mi_5fgood_5fsize_30',['mi_good_size',['../group__extended.html#gac057927cd06c854b45fe7847e921bd47',1,'mimalloc-doc.h']]],
-  ['mi_5fheap_5farea_5ft_31',['mi_heap_area_t',['../group__analysis.html#structmi__heap__area__t',1,'']]],
-  ['mi_5fheap_5fcalloc_32',['mi_heap_calloc',['../group__heap.html#gaa6702b3c48e9e53e50e81b36f5011d55',1,'mimalloc-doc.h']]],
-  ['mi_5fheap_5fcalloc_5faligned_33',['mi_heap_calloc_aligned',['../group__heap.html#ga4af03a6e2b93fae77424d93f889705c3',1,'mimalloc-doc.h']]],
-  ['mi_5fheap_5fcalloc_5faligned_5fat_34',['mi_heap_calloc_aligned_at',['../group__heap.html#ga08ca6419a5c057a4d965868998eef487',1,'mimalloc-doc.h']]],
-  ['mi_5fheap_5fcalloc_5ftp_35',['mi_heap_calloc_tp',['../group__typed.html#ga4e5d1f1707c90e5f55e023ac5f45fe74',1,'mimalloc-doc.h']]],
-  ['mi_5fheap_5fcheck_5fowned_36',['mi_heap_check_owned',['../group__analysis.html#ga0d67c1789faaa15ff366c024fcaf6377',1,'mimalloc-doc.h']]],
-  ['mi_5fheap_5fcollect_37',['mi_heap_collect',['../group__heap.html#ga7922f7495cde30b1984d0e6072419298',1,'mimalloc-doc.h']]],
-  ['mi_5fheap_5fcontains_5fblock_38',['mi_heap_contains_block',['../group__analysis.html#gaa862aa8ed8d57d84cae41fc1022d71af',1,'mimalloc-doc.h']]],
-  ['mi_5fheap_5fdelete_39',['mi_heap_delete',['../group__heap.html#ga2ab1af8d438819b55319c7ef51d1e409',1,'mimalloc-doc.h']]],
-  ['mi_5fheap_5fdestroy_40',['mi_heap_destroy',['../group__heap.html#ga9f9c0844edb9717f4feacd79116b8e0d',1,'mimalloc-doc.h']]],
-  ['mi_5fheap_5fget_5fbacking_41',['mi_heap_get_backing',['../group__heap.html#ga5d03fbe062ffcf38f0f417fd968357fc',1,'mimalloc-doc.h']]],
-  ['mi_5fheap_5fget_5fdefault_42',['mi_heap_get_default',['../group__heap.html#ga8db4cbb87314a989a9a187464d6b5e05',1,'mimalloc-doc.h']]],
-  ['mi_5fheap_5fmalloc_43',['mi_heap_malloc',['../group__heap.html#ga9cbed01e42c0647907295de92c3fa296',1,'mimalloc-doc.h']]],
-  ['mi_5fheap_5fmalloc_5faligned_44',['mi_heap_malloc_aligned',['../group__heap.html#gab5b87e1805306f70df38789fcfcf6653',1,'mimalloc-doc.h']]],
-  ['mi_5fheap_5fmalloc_5faligned_5fat_45',['mi_heap_malloc_aligned_at',['../group__heap.html#ga23acd7680fb0976dde3783254c6c874b',1,'mimalloc-doc.h']]],
-  ['mi_5fheap_5fmalloc_5fsmall_46',['mi_heap_malloc_small',['../group__heap.html#gaa1a1c7a1f4da6826b5a25b70ef878368',1,'mimalloc-doc.h']]],
-  ['mi_5fheap_5fmalloc_5ftp_47',['mi_heap_malloc_tp',['../group__typed.html#ga653bcb24ac495bc19940ecd6898f9cd7',1,'mimalloc-doc.h']]],
-  ['mi_5fheap_5fmallocn_48',['mi_heap_mallocn',['../group__heap.html#ga851da6c43fe0b71c1376cee8aef90db0',1,'mimalloc-doc.h']]],
-  ['mi_5fheap_5fmallocn_5ftp_49',['mi_heap_mallocn_tp',['../group__typed.html#ga6b75cb9c4b9c647661d0924552dc6e83',1,'mimalloc-doc.h']]],
-  ['mi_5fheap_5fnew_50',['mi_heap_new',['../group__heap.html#ga766f672ba56f2fbfeb9d9dbb0b7f6b11',1,'mimalloc-doc.h']]],
-  ['mi_5fheap_5frealloc_51',['mi_heap_realloc',['../group__heap.html#gaaef3395f66be48f37bdc8322509c5d81',1,'mimalloc-doc.h']]],
-  ['mi_5fheap_5frealloc_5faligned_52',['mi_heap_realloc_aligned',['../group__heap.html#gafc603b696bd14cae6da28658f950d98c',1,'mimalloc-doc.h']]],
-  ['mi_5fheap_5frealloc_5faligned_5fat_53',['mi_heap_realloc_aligned_at',['../group__heap.html#gaf96c788a1bf553fe2d371de9365e047c',1,'mimalloc-doc.h']]],
-  ['mi_5fheap_5freallocf_54',['mi_heap_reallocf',['../group__heap.html#ga4a21070eb4e7cce018133c8d5f4b0527',1,'mimalloc-doc.h']]],
-  ['mi_5fheap_5freallocn_55',['mi_heap_reallocn',['../group__heap.html#gac74e94ad9b0c9b57c1c4d88b8825b7a8',1,'mimalloc-doc.h']]],
-  ['mi_5fheap_5freallocn_5ftp_56',['mi_heap_reallocn_tp',['../group__typed.html#gaf213d5422ec35e7f6caad827c79bc948',1,'mimalloc-doc.h']]],
-  ['mi_5fheap_5frealpath_57',['mi_heap_realpath',['../group__heap.html#ga00e95ba1e01acac3cfd95bb7a357a6f0',1,'mimalloc-doc.h']]],
-  ['mi_5fheap_5frecalloc_58',['mi_heap_recalloc',['../group__zeroinit.html#ga8648c5fbb22a80f0262859099f06dfbd',1,'mimalloc-doc.h']]],
-  ['mi_5fheap_5frecalloc_5faligned_59',['mi_heap_recalloc_aligned',['../group__zeroinit.html#ga9f3f999396c8f77ca5e80e7b40ac29e3',1,'mimalloc-doc.h']]],
-  ['mi_5fheap_5frecalloc_5faligned_5fat_60',['mi_heap_recalloc_aligned_at',['../group__zeroinit.html#ga496452c96f1de8c500be9fddf52edaf7',1,'mimalloc-doc.h']]],
-  ['mi_5fheap_5frecalloc_5ftp_61',['mi_heap_recalloc_tp',['../group__typed.html#ga3e50a1600958fcaf1a7f3560c9174f9e',1,'mimalloc-doc.h']]],
-  ['mi_5fheap_5frezalloc_62',['mi_heap_rezalloc',['../group__zeroinit.html#gacfad83f14eb5d6a42a497a898e19fc76',1,'mimalloc-doc.h']]],
-  ['mi_5fheap_5frezalloc_5faligned_63',['mi_heap_rezalloc_aligned',['../group__zeroinit.html#ga375fa8a611c51905e592d5d467c49664',1,'mimalloc-doc.h']]],
-  ['mi_5fheap_5frezalloc_5faligned_5fat_64',['mi_heap_rezalloc_aligned_at',['../group__zeroinit.html#gac90da54fa7e5d10bdc97ce0b51dce2eb',1,'mimalloc-doc.h']]],
-  ['mi_5fheap_5fset_5fdefault_65',['mi_heap_set_default',['../group__heap.html#gab8631ec88c8d26641b68b5d25dcd4422',1,'mimalloc-doc.h']]],
-  ['mi_5fheap_5fstrdup_66',['mi_heap_strdup',['../group__heap.html#ga139d6b09dbf50c3c2523d0f4d1cfdeb5',1,'mimalloc-doc.h']]],
-  ['mi_5fheap_5fstrndup_67',['mi_heap_strndup',['../group__heap.html#ga8e3dbd46650dd26573cf307a2c8f1f5a',1,'mimalloc-doc.h']]],
-  ['mi_5fheap_5ft_68',['mi_heap_t',['../group__heap.html#ga34a47cde5a5b38c29f1aa3c5e76943c2',1,'mimalloc-doc.h']]],
-  ['mi_5fheap_5fvisit_5fblocks_69',['mi_heap_visit_blocks',['../group__analysis.html#ga70c46687dc6e9dc98b232b02646f8bed',1,'mimalloc-doc.h']]],
-  ['mi_5fheap_5fzalloc_70',['mi_heap_zalloc',['../group__heap.html#ga903104592c8ed53417a3762da6241133',1,'mimalloc-doc.h']]],
-  ['mi_5fheap_5fzalloc_5faligned_71',['mi_heap_zalloc_aligned',['../group__heap.html#gaa450a59c6c7ae5fdbd1c2b80a8329ef0',1,'mimalloc-doc.h']]],
-  ['mi_5fheap_5fzalloc_5faligned_5fat_72',['mi_heap_zalloc_aligned_at',['../group__heap.html#ga45fb43a62776fbebbdf1edd99b527954',1,'mimalloc-doc.h']]],
-  ['mi_5fheap_5fzalloc_5ftp_73',['mi_heap_zalloc_tp',['../group__typed.html#gad6e87e86e994aa14416ae9b5d4c188fe',1,'mimalloc-doc.h']]],
-  ['mi_5fis_5fin_5fheap_5fregion_74',['mi_is_in_heap_region',['../group__extended.html#ga5f071b10d4df1c3658e04e7fd67a94e6',1,'mimalloc-doc.h']]],
-  ['mi_5fis_5fredirected_75',['mi_is_redirected',['../group__extended.html#gaad25050b19f30cd79397b227e0157a3f',1,'mimalloc-doc.h']]],
-  ['mi_5fmalloc_76',['mi_malloc',['../group__malloc.html#ga3406e8b168bc74c8637b11571a6da83a',1,'mimalloc-doc.h']]],
-  ['mi_5fmalloc_5faligned_77',['mi_malloc_aligned',['../group__aligned.html#ga68930196751fa2cca9e1fd0d71bade56',1,'mimalloc-doc.h']]],
-  ['mi_5fmalloc_5faligned_5fat_78',['mi_malloc_aligned_at',['../group__aligned.html#ga5850da130c936bd77db039dcfbc8295d',1,'mimalloc-doc.h']]],
-  ['mi_5fmalloc_5fsize_79',['mi_malloc_size',['../group__posix.html#ga4531c9e775bb3ae12db57c1ba8a5d7de',1,'mimalloc-doc.h']]],
-  ['mi_5fmalloc_5fsmall_80',['mi_malloc_small',['../group__extended.html#ga7136c2e55cb22c98ecf95d08d6debb99',1,'mimalloc-doc.h']]],
-  ['mi_5fmalloc_5ftp_81',['mi_malloc_tp',['../group__typed.html#ga0619a62c5fd886f1016030abe91f0557',1,'mimalloc-doc.h']]],
-  ['mi_5fmalloc_5fusable_5fsize_82',['mi_malloc_usable_size',['../group__posix.html#ga06d07cf357bbac5c73ba5d0c0c421e17',1,'mimalloc-doc.h']]],
-  ['mi_5fmallocn_83',['mi_mallocn',['../group__malloc.html#ga0b05e2bf0f73e7401ae08597ff782ac6',1,'mimalloc-doc.h']]],
-  ['mi_5fmallocn_5ftp_84',['mi_mallocn_tp',['../group__typed.html#gae5cb6e0fafc9f23169c5622e077afe8b',1,'mimalloc-doc.h']]],
-  ['mi_5fmanage_5fos_5fmemory_85',['mi_manage_os_memory',['../group__extended.html#ga4c6486a1fdcd7a423b5f25fe4be8e0cf',1,'mimalloc-doc.h']]],
-  ['mi_5fmemalign_86',['mi_memalign',['../group__posix.html#gaab7fa71ea93b96873f5d9883db57d40e',1,'mimalloc-doc.h']]],
-  ['mi_5fnew_87',['mi_new',['../group__cpp.html#gaad048a9fce3d02c5909cd05c6ec24545',1,'mimalloc-doc.h']]],
-  ['mi_5fnew_5faligned_88',['mi_new_aligned',['../group__cpp.html#gaef2c2bdb4f70857902d3c8903ac095f3',1,'mimalloc-doc.h']]],
-  ['mi_5fnew_5faligned_5fnothrow_89',['mi_new_aligned_nothrow',['../group__cpp.html#gab5e29558926d934c3f1cae8c815f942c',1,'mimalloc-doc.h']]],
-  ['mi_5fnew_5fn_90',['mi_new_n',['../group__cpp.html#gae7bc4f56cd57ed3359060ff4f38bda81',1,'mimalloc-doc.h']]],
-  ['mi_5fnew_5fnothrow_91',['mi_new_nothrow',['../group__cpp.html#gaeaded64eda71ed6b1d569d3e723abc4a',1,'mimalloc-doc.h']]],
-  ['mi_5fnew_5frealloc_92',['mi_new_realloc',['../group__cpp.html#gaab78a32f55149e9fbf432d5288e38e1e',1,'mimalloc-doc.h']]],
-  ['mi_5fnew_5freallocn_93',['mi_new_reallocn',['../group__cpp.html#ga756f4b2bc6a7ecd0a90baea8e90c7907',1,'mimalloc-doc.h']]],
-  ['mi_5foption_5fdisable_94',['mi_option_disable',['../group__options.html#gaebf6ff707a2e688ebb1a2296ca564054',1,'mimalloc-doc.h']]],
-  ['mi_5foption_5feager_5fcommit_95',['mi_option_eager_commit',['../group__options.html#ggafebf7ed116adb38ae5218bc3ce06884ca1e8de72c93da7ff22d91e1e27b52ac2b',1,'mimalloc-doc.h']]],
-  ['mi_5foption_5feager_5fcommit_5fdelay_96',['mi_option_eager_commit_delay',['../group__options.html#ggafebf7ed116adb38ae5218bc3ce06884ca17a190c25be381142d87e0468c4c068c',1,'mimalloc-doc.h']]],
-  ['mi_5foption_5feager_5fregion_5fcommit_97',['mi_option_eager_region_commit',['../group__options.html#ggafebf7ed116adb38ae5218bc3ce06884ca32ce97ece29f69e82579679cf8a307ad',1,'mimalloc-doc.h']]],
-  ['mi_5foption_5fenable_98',['mi_option_enable',['../group__options.html#ga04180ae41b0d601421dd62ced40ca050',1,'mimalloc-doc.h']]],
-  ['mi_5foption_5fget_99',['mi_option_get',['../group__options.html#ga7e8af195cc81d3fa64ccf2662caa565a',1,'mimalloc-doc.h']]],
-  ['mi_5foption_5fis_5fenabled_100',['mi_option_is_enabled',['../group__options.html#ga459ad98f18b3fc9275474807fe0ca188',1,'mimalloc-doc.h']]],
-  ['mi_5foption_5flarge_5fos_5fpages_101',['mi_option_large_os_pages',['../group__options.html#ggafebf7ed116adb38ae5218bc3ce06884ca4192d491200d0055df0554d4cf65054e',1,'mimalloc-doc.h']]],
-  ['mi_5foption_5fos_5ftag_102',['mi_option_os_tag',['../group__options.html#ggafebf7ed116adb38ae5218bc3ce06884ca4b74ae2a69e445de6c2361b73c1d14bf',1,'mimalloc-doc.h']]],
-  ['mi_5foption_5fpage_5freset_103',['mi_option_page_reset',['../group__options.html#ggafebf7ed116adb38ae5218bc3ce06884cada854dd272c66342f18a93ee254a2968',1,'mimalloc-doc.h']]],
-  ['mi_5foption_5freserve_5fhuge_5fos_5fpages_104',['mi_option_reserve_huge_os_pages',['../group__options.html#ggafebf7ed116adb38ae5218bc3ce06884caca7ed041be3b0b9d0b82432c7bf41af2',1,'mimalloc-doc.h']]],
-  ['mi_5foption_5freserve_5fhuge_5fos_5fpages_5fat_105',['mi_option_reserve_huge_os_pages_at',['../group__options.html#ggafebf7ed116adb38ae5218bc3ce06884caa13e7926d4339d2aa6fbf61d4473fd5c',1,'mimalloc-doc.h']]],
-  ['mi_5foption_5freset_5fdecommits_106',['mi_option_reset_decommits',['../group__options.html#ggafebf7ed116adb38ae5218bc3ce06884cac81ee965b130fa81238913a3c239d536',1,'mimalloc-doc.h']]],
-  ['mi_5foption_5freset_5fdelay_107',['mi_option_reset_delay',['../group__options.html#ggafebf7ed116adb38ae5218bc3ce06884ca154fe170131d5212cff57e22b99523c5',1,'mimalloc-doc.h']]],
-  ['mi_5foption_5fsegment_5fcache_108',['mi_option_segment_cache',['../group__options.html#ggafebf7ed116adb38ae5218bc3ce06884ca2ecbe7ef32f5c84de3739aa4f0b805a1',1,'mimalloc-doc.h']]],
-  ['mi_5foption_5fsegment_5freset_109',['mi_option_segment_reset',['../group__options.html#ggafebf7ed116adb38ae5218bc3ce06884cafb121d30d87591850d5410ccc3a95c6d',1,'mimalloc-doc.h']]],
-  ['mi_5foption_5fset_110',['mi_option_set',['../group__options.html#gaf84921c32375e25754dc2ee6a911fa60',1,'mimalloc-doc.h']]],
-  ['mi_5foption_5fset_5fdefault_111',['mi_option_set_default',['../group__options.html#ga7ef623e440e6e5545cb08c94e71e4b90',1,'mimalloc-doc.h']]],
-  ['mi_5foption_5fset_5fenabled_112',['mi_option_set_enabled',['../group__options.html#ga9a13d05fcb77489cb06d4d017ebd8bed',1,'mimalloc-doc.h']]],
-  ['mi_5foption_5fset_5fenabled_5fdefault_113',['mi_option_set_enabled_default',['../group__options.html#ga65518b69ec5d32336b50e07f74b3f629',1,'mimalloc-doc.h']]],
-  ['mi_5foption_5fshow_5ferrors_114',['mi_option_show_errors',['../group__options.html#ggafebf7ed116adb38ae5218bc3ce06884cafbf4822e5c00732c5984b32a032837f0',1,'mimalloc-doc.h']]],
-  ['mi_5foption_5fshow_5fstats_115',['mi_option_show_stats',['../group__options.html#ggafebf7ed116adb38ae5218bc3ce06884ca0957ef73b2550764b4840edf48422fda',1,'mimalloc-doc.h']]],
-  ['mi_5foption_5ft_116',['mi_option_t',['../group__options.html#gafebf7ed116adb38ae5218bc3ce06884c',1,'mimalloc-doc.h']]],
-  ['mi_5foption_5fuse_5fnuma_5fnodes_117',['mi_option_use_numa_nodes',['../group__options.html#ggafebf7ed116adb38ae5218bc3ce06884ca0ac33a18f6b659fcfaf44efb0bab1b74',1,'mimalloc-doc.h']]],
-  ['mi_5foption_5fverbose_118',['mi_option_verbose',['../group__options.html#ggafebf7ed116adb38ae5218bc3ce06884ca7c8b7bf5281c581bad64f5daa6442777',1,'mimalloc-doc.h']]],
-  ['mi_5foutput_5ffun_119',['mi_output_fun',['../group__extended.html#gad823d23444a4b77a40f66bf075a98a0c',1,'mimalloc-doc.h']]],
-  ['mi_5fposix_5fmemalign_120',['mi_posix_memalign',['../group__posix.html#gacff84f226ba9feb2031b8992e5579447',1,'mimalloc-doc.h']]],
-  ['mi_5fprocess_5finfo_121',['mi_process_info',['../group__extended.html#ga7d862c2affd5790381da14eb102a364d',1,'mimalloc-doc.h']]],
-  ['mi_5fpvalloc_122',['mi_pvalloc',['../group__posix.html#gaeb325c39b887d3b90d85d1eb1712fb1e',1,'mimalloc-doc.h']]],
-  ['mi_5frealloc_123',['mi_realloc',['../group__malloc.html#gaf11eb497da57bdfb2de65eb191c69db6',1,'mimalloc-doc.h']]],
-  ['mi_5frealloc_5faligned_124',['mi_realloc_aligned',['../group__aligned.html#ga4028d1cf4aa4c87c880747044a8322ae',1,'mimalloc-doc.h']]],
-  ['mi_5frealloc_5faligned_5fat_125',['mi_realloc_aligned_at',['../group__aligned.html#gaf66a9ae6c6f08bd6be6fb6ea771faffb',1,'mimalloc-doc.h']]],
-  ['mi_5freallocarr_126',['mi_reallocarr',['../group__posix.html#ga7e1934d60a3e697950eeb48e042bfad5',1,'mimalloc-doc.h']]],
-  ['mi_5freallocarray_127',['mi_reallocarray',['../group__posix.html#ga48fad8648a2f1dab9c87ea9448a52088',1,'mimalloc-doc.h']]],
-  ['mi_5freallocf_128',['mi_reallocf',['../group__malloc.html#gafe68ac7c5e24a65cd55c9d6b152211a0',1,'mimalloc-doc.h']]],
-  ['mi_5freallocn_129',['mi_reallocn',['../group__malloc.html#ga61d57b4144ba24fba5c1e9b956d13853',1,'mimalloc-doc.h']]],
-  ['mi_5freallocn_5ftp_130',['mi_reallocn_tp',['../group__typed.html#ga1158b49a55dfa81f58a4426a7578f523',1,'mimalloc-doc.h']]],
-  ['mi_5frealpath_131',['mi_realpath',['../group__malloc.html#ga08cec32dd5bbe7da91c78d19f1b5bebe',1,'mimalloc-doc.h']]],
-  ['mi_5frecalloc_132',['mi_recalloc',['../group__malloc.html#ga23a0fbb452b5dce8e31fab1a1958cacc',1,'mimalloc-doc.h']]],
-  ['mi_5frecalloc_5faligned_133',['mi_recalloc_aligned',['../group__zeroinit.html#ga3e7e5c291acf1c7fd7ffd9914a9f945f',1,'mimalloc-doc.h']]],
-  ['mi_5frecalloc_5faligned_5fat_134',['mi_recalloc_aligned_at',['../group__zeroinit.html#ga4ff5e92ad73585418a072c9d059e5cf9',1,'mimalloc-doc.h']]],
-  ['mi_5fregister_5fdeferred_5ffree_135',['mi_register_deferred_free',['../group__extended.html#ga3460a6ca91af97be4058f523d3cb8ece',1,'mimalloc-doc.h']]],
-  ['mi_5fregister_5ferror_136',['mi_register_error',['../group__extended.html#gaa1d55e0e894be240827e5d87ec3a1f45',1,'mimalloc-doc.h']]],
-  ['mi_5fregister_5foutput_137',['mi_register_output',['../group__extended.html#gae5b17ff027cd2150b43a33040250cf3f',1,'mimalloc-doc.h']]],
-  ['mi_5freserve_5fhuge_5fos_5fpages_5fat_138',['mi_reserve_huge_os_pages_at',['../group__extended.html#ga7795a13d20087447281858d2c771cca1',1,'mimalloc-doc.h']]],
-  ['mi_5freserve_5fhuge_5fos_5fpages_5finterleave_139',['mi_reserve_huge_os_pages_interleave',['../group__extended.html#ga3132f521fb756fc0e8ec0b74fb58df50',1,'mimalloc-doc.h']]],
-  ['mi_5freserve_5fos_5fmemory_140',['mi_reserve_os_memory',['../group__extended.html#ga00ec3324b6b2591c7fe3677baa30a767',1,'mimalloc-doc.h']]],
-  ['mi_5frezalloc_141',['mi_rezalloc',['../group__zeroinit.html#ga8c292e142110229a2980b37ab036dbc6',1,'mimalloc-doc.h']]],
-  ['mi_5frezalloc_5faligned_142',['mi_rezalloc_aligned',['../group__zeroinit.html#gacd71a7bce96aab38ae6de17af2eb2cf0',1,'mimalloc-doc.h']]],
-  ['mi_5frezalloc_5faligned_5fat_143',['mi_rezalloc_aligned_at',['../group__zeroinit.html#gae8b358c417e61d5307da002702b0a8e1',1,'mimalloc-doc.h']]],
-  ['mi_5fsmall_5fsize_5fmax_144',['MI_SMALL_SIZE_MAX',['../group__extended.html#ga1ea64283508718d9d645c38efc2f4305',1,'mimalloc-doc.h']]],
-  ['mi_5fstats_5fmerge_145',['mi_stats_merge',['../group__extended.html#ga854b1de8cb067c7316286c28b2fcd3d1',1,'mimalloc-doc.h']]],
-  ['mi_5fstats_5fprint_146',['mi_stats_print',['../group__extended.html#ga2d126e5c62d3badc35445e5d84166df2',1,'mimalloc-doc.h']]],
-  ['mi_5fstats_5fprint_5fout_147',['mi_stats_print_out',['../group__extended.html#ga537f13b299ddf801e49a5a94fde02c79',1,'mimalloc-doc.h']]],
-  ['mi_5fstats_5freset_148',['mi_stats_reset',['../group__extended.html#ga3bb8468b8cfcc6e2a61d98aee85c5f99',1,'mimalloc-doc.h']]],
-  ['mi_5fstl_5fallocator_149',['mi_stl_allocator',['../group__cpp.html#structmi__stl__allocator',1,'']]],
-  ['mi_5fstrdup_150',['mi_strdup',['../group__malloc.html#gac7cffe13f1f458ed16789488bf92b9b2',1,'mimalloc-doc.h']]],
-  ['mi_5fstrndup_151',['mi_strndup',['../group__malloc.html#gaaabf971c2571891433477e2d21a35266',1,'mimalloc-doc.h']]],
-  ['mi_5fthread_5fdone_152',['mi_thread_done',['../group__extended.html#ga0ae4581e85453456a0d658b2b98bf7bf',1,'mimalloc-doc.h']]],
-  ['mi_5fthread_5finit_153',['mi_thread_init',['../group__extended.html#gaf8e73efc2cbca9ebfdfb166983a04c17',1,'mimalloc-doc.h']]],
-  ['mi_5fthread_5fstats_5fprint_5fout_154',['mi_thread_stats_print_out',['../group__extended.html#gab1dac8476c46cb9eecab767eb40c1525',1,'mimalloc-doc.h']]],
-  ['mi_5fusable_5fsize_155',['mi_usable_size',['../group__extended.html#ga089c859d9eddc5f9b4bd946cd53cebee',1,'mimalloc-doc.h']]],
-  ['mi_5fvalloc_156',['mi_valloc',['../group__posix.html#ga73baaf5951f5165ba0763d0c06b6a93b',1,'mimalloc-doc.h']]],
-  ['mi_5fzalloc_157',['mi_zalloc',['../group__malloc.html#gafdd9d8bb2986e668ba9884f28af38000',1,'mimalloc-doc.h']]],
-  ['mi_5fzalloc_5faligned_158',['mi_zalloc_aligned',['../group__aligned.html#ga0cadbcf5b89a7b6fb171bc8df8734819',1,'mimalloc-doc.h']]],
-  ['mi_5fzalloc_5faligned_5fat_159',['mi_zalloc_aligned_at',['../group__aligned.html#ga5f8c2353766db522565e642fafd8a3f8',1,'mimalloc-doc.h']]],
-  ['mi_5fzalloc_5fsmall_160',['mi_zalloc_small',['../group__extended.html#ga220f29f40a44404b0061c15bc1c31152',1,'mimalloc-doc.h']]],
-  ['mi_5fzalloc_5ftp_161',['mi_zalloc_tp',['../group__typed.html#gac77a61bdaf680a803785fe307820b48c',1,'mimalloc-doc.h']]]
+  ['heap_20allocation_0',['Heap Allocation',['../group__heap.html',1,'']]],
+  ['heap_20introspection_1',['Heap Introspection',['../group__analysis.html',1,'']]],
+  ['heap_5ftag_2',['heap_tag',['../group__analysis.html#a2b7a0c92ece8daf46b558efc990ebdc1',1,'mi_heap_area_t']]]
 ];
diff --git a/depends/mimalloc/docs/search/all_7.js b/depends/mimalloc/docs/search/all_7.js
index 8f296aa53e1b..6d20843280ff 100644
--- a/depends/mimalloc/docs/search/all_7.js
+++ b/depends/mimalloc/docs/search/all_7.js
@@ -1,4 +1,5 @@
 var searchData=
 [
-  ['overriding_20malloc_162',['Overriding Malloc',['../overrides.html',1,'']]]
+  ['initialized_20re_20allocation_0',['Zero initialized re-allocation',['../group__zeroinit.html',1,'']]],
+  ['introspection_1',['Heap Introspection',['../group__analysis.html',1,'']]]
 ];
diff --git a/depends/mimalloc/docs/search/all_8.js b/depends/mimalloc/docs/search/all_8.js
index a9caa77c7bfd..5071ed69e8a2 100644
--- a/depends/mimalloc/docs/search/all_8.js
+++ b/depends/mimalloc/docs/search/all_8.js
@@ -1,5 +1,4 @@
 var searchData=
 [
-  ['performance_163',['Performance',['../bench.html',1,'']]],
-  ['posix_164',['Posix',['../group__posix.html',1,'']]]
+  ['library_0',['Using the library',['../using.html',1,'']]]
 ];
diff --git a/depends/mimalloc/docs/search/all_9.js b/depends/mimalloc/docs/search/all_9.js
index f6b4ba352ef6..400cd0239def 100644
--- a/depends/mimalloc/docs/search/all_9.js
+++ b/depends/mimalloc/docs/search/all_9.js
@@ -1,5 +1,192 @@
 var searchData=
 [
-  ['reserved_165',['reserved',['../group__analysis.html#ae848a3e6840414891035423948ca0383',1,'mi_heap_area_t']]],
-  ['runtime_20options_166',['Runtime Options',['../group__options.html',1,'']]]
+  ['macros_0',['Typed Macros',['../group__typed.html',1,'']]],
+  ['malloc_1',['Overriding Malloc',['../overrides.html',1,'']]],
+  ['malloc_2',['mi-malloc',['../index.html',1,'']]],
+  ['mi_20malloc_3',['mi-malloc',['../index.html',1,'']]],
+  ['mi_5f_5fexpand_4',['mi__expand',['../group__posix.html#ga66bcfeb4faedbb42b796bc680821ef84',1,'mimalloc-doc.h']]],
+  ['mi_5f_5fposix_5fmemalign_5',['mi__posix_memalign',['../group__posix.html#gad5a69c8fea96aa2b7a7c818c2130090a',1,'mimalloc-doc.h']]],
+  ['mi_5fabandoned_5fvisit_5fblocks_6',['mi_abandoned_visit_blocks',['../group__analysis.html#ga6a4865a887b2ec5247854af61562503c',1,'mimalloc-doc.h']]],
+  ['mi_5faligned_5falloc_7',['mi_aligned_alloc',['../group__posix.html#ga430ed1513f0571ff83be00ec58a98ee0',1,'mimalloc-doc.h']]],
+  ['mi_5faligned_5foffset_5frecalloc_8',['mi_aligned_offset_recalloc',['../group__posix.html#ga16570deddd559001b44953eedbad0084',1,'mimalloc-doc.h']]],
+  ['mi_5faligned_5frecalloc_9',['mi_aligned_recalloc',['../group__posix.html#gaf82cbb4b4f24acf723348628451798d3',1,'mimalloc-doc.h']]],
+  ['mi_5farena_5farea_10',['mi_arena_area',['../group__extended.html#ga9a25a00a22151619a0be91a10af7787f',1,'mimalloc-doc.h']]],
+  ['mi_5farena_5fid_5ft_11',['mi_arena_id_t',['../group__extended.html#ga99fe38650d0b02e0e0f89ee024db91d3',1,'mimalloc-doc.h']]],
+  ['mi_5fblock_5fvisit_5ffun_12',['mi_block_visit_fun',['../group__analysis.html#ga8255dc9371e6b299d9802a610c4e34ec',1,'mimalloc-doc.h']]],
+  ['mi_5fcalloc_13',['mi_calloc',['../group__malloc.html#ga6686568014b54d1e6c7ac64a076e4f56',1,'mimalloc-doc.h']]],
+  ['mi_5fcalloc_5faligned_14',['mi_calloc_aligned',['../group__aligned.html#ga424ef386fb1f9f8e0a86ab53f16eaaf1',1,'mimalloc-doc.h']]],
+  ['mi_5fcalloc_5faligned_5fat_15',['mi_calloc_aligned_at',['../group__aligned.html#ga977f96bd2c5c141bcd70e6685c90d6c3',1,'mimalloc-doc.h']]],
+  ['mi_5fcalloc_5ftp_16',['mi_calloc_tp',['../group__typed.html#gae80c47c9d4cab10961fff1a8ac98fc07',1,'mimalloc-doc.h']]],
+  ['mi_5fcfree_17',['mi_cfree',['../group__posix.html#ga705dc7a64bffacfeeb0141501a5c35d7',1,'mimalloc-doc.h']]],
+  ['mi_5fcheck_5fowned_18',['mi_check_owned',['../group__analysis.html#ga628c237489c2679af84a4d0d143b3dd5',1,'mimalloc-doc.h']]],
+  ['mi_5fcollect_19',['mi_collect',['../group__extended.html#ga421430e2226d7d468529cec457396756',1,'mimalloc-doc.h']]],
+  ['mi_5fdebug_5fshow_5farenas_20',['mi_debug_show_arenas',['../group__extended.html#gad7439207f8f71fb6c382a9ea20b997e7',1,'mimalloc-doc.h']]],
+  ['mi_5fdeferred_5ffree_5ffun_21',['mi_deferred_free_fun',['../group__extended.html#ga292a45f7dbc7cd23c5352ce1f0002816',1,'mimalloc-doc.h']]],
+  ['mi_5fdupenv_5fs_22',['mi_dupenv_s',['../group__posix.html#gab41369c1a1da7504013a7a0b1d4dd958',1,'mimalloc-doc.h']]],
+  ['mi_5ferror_5ffun_23',['mi_error_fun',['../group__extended.html#ga83fc6a688b322261e1c2deab000b0591',1,'mimalloc-doc.h']]],
+  ['mi_5fexpand_24',['mi_expand',['../group__malloc.html#ga19299856216cfbb08e2628593654dfb0',1,'mimalloc-doc.h']]],
+  ['mi_5ffree_25',['mi_free',['../group__malloc.html#gaf2c7b89c327d1f60f59e68b9ea644d95',1,'mimalloc-doc.h']]],
+  ['mi_5ffree_5faligned_26',['mi_free_aligned',['../group__posix.html#ga0d28d5cf61e6bfbb18c63092939fe5c9',1,'mimalloc-doc.h']]],
+  ['mi_5ffree_5fsize_27',['mi_free_size',['../group__posix.html#gae01389eedab8d67341ff52e2aad80ebb',1,'mimalloc-doc.h']]],
+  ['mi_5ffree_5fsize_5faligned_28',['mi_free_size_aligned',['../group__posix.html#ga72e9d7ffb5fe94d69bc722c8506e27bc',1,'mimalloc-doc.h']]],
+  ['mi_5fgood_5fsize_29',['mi_good_size',['../group__extended.html#gac057927cd06c854b45fe7847e921bd47',1,'mimalloc-doc.h']]],
+  ['mi_5fheap_5farea_5ft_30',['mi_heap_area_t',['../group__analysis.html#structmi__heap__area__t',1,'']]],
+  ['mi_5fheap_5fcalloc_31',['mi_heap_calloc',['../group__heap.html#gac0098aaf231d3e9586c73136d5df95da',1,'mimalloc-doc.h']]],
+  ['mi_5fheap_5fcalloc_5faligned_32',['mi_heap_calloc_aligned',['../group__heap.html#gacafcc26df827c7a7de5e850217566108',1,'mimalloc-doc.h']]],
+  ['mi_5fheap_5fcalloc_5faligned_5fat_33',['mi_heap_calloc_aligned_at',['../group__heap.html#gaa42ec2079989c4374f2c331d9b35f4e4',1,'mimalloc-doc.h']]],
+  ['mi_5fheap_5fcalloc_5ftp_34',['mi_heap_calloc_tp',['../group__typed.html#ga4e5d1f1707c90e5f55e023ac5f45fe74',1,'mimalloc-doc.h']]],
+  ['mi_5fheap_5fcheck_5fowned_35',['mi_heap_check_owned',['../group__analysis.html#ga0d67c1789faaa15ff366c024fcaf6377',1,'mimalloc-doc.h']]],
+  ['mi_5fheap_5fcollect_36',['mi_heap_collect',['../group__heap.html#ga7922f7495cde30b1984d0e6072419298',1,'mimalloc-doc.h']]],
+  ['mi_5fheap_5fcontains_5fblock_37',['mi_heap_contains_block',['../group__analysis.html#gaa862aa8ed8d57d84cae41fc1022d71af',1,'mimalloc-doc.h']]],
+  ['mi_5fheap_5fdelete_38',['mi_heap_delete',['../group__heap.html#ga2ab1af8d438819b55319c7ef51d1e409',1,'mimalloc-doc.h']]],
+  ['mi_5fheap_5fdestroy_39',['mi_heap_destroy',['../group__heap.html#ga9f9c0844edb9717f4feacd79116b8e0d',1,'mimalloc-doc.h']]],
+  ['mi_5fheap_5fget_5fbacking_40',['mi_heap_get_backing',['../group__heap.html#gac6ac9f0e7be9ab4ff70acfc8dad1235a',1,'mimalloc-doc.h']]],
+  ['mi_5fheap_5fget_5fdefault_41',['mi_heap_get_default',['../group__heap.html#ga14c667a6e2c5d28762d8cb7d4e057909',1,'mimalloc-doc.h']]],
+  ['mi_5fheap_5fmalloc_42',['mi_heap_malloc',['../group__heap.html#gab374e206c7034e0d899fb934e4f4a863',1,'mimalloc-doc.h']]],
+  ['mi_5fheap_5fmalloc_5faligned_43',['mi_heap_malloc_aligned',['../group__heap.html#ga33f4f05b7fea7af2113c62a4bf882cc5',1,'mimalloc-doc.h']]],
+  ['mi_5fheap_5fmalloc_5faligned_5fat_44',['mi_heap_malloc_aligned_at',['../group__heap.html#gae7ffc045c3996497a7f3a5f6fe7b8aaa',1,'mimalloc-doc.h']]],
+  ['mi_5fheap_5fmalloc_5fsmall_45',['mi_heap_malloc_small',['../group__heap.html#ga012c5c8abe22b10043de39ff95909541',1,'mimalloc-doc.h']]],
+  ['mi_5fheap_5fmalloc_5ftp_46',['mi_heap_malloc_tp',['../group__typed.html#ga653bcb24ac495bc19940ecd6898f9cd7',1,'mimalloc-doc.h']]],
+  ['mi_5fheap_5fmallocn_47',['mi_heap_mallocn',['../group__heap.html#gab0f755c0b21c387fe8e9024200faa372',1,'mimalloc-doc.h']]],
+  ['mi_5fheap_5fmallocn_5ftp_48',['mi_heap_mallocn_tp',['../group__typed.html#ga6b75cb9c4b9c647661d0924552dc6e83',1,'mimalloc-doc.h']]],
+  ['mi_5fheap_5fnew_49',['mi_heap_new',['../group__heap.html#gaa718bb226ec0546ba6d1b6cb32179f3a',1,'mimalloc-doc.h']]],
+  ['mi_5fheap_5fnew_5fex_50',['mi_heap_new_ex',['../group__extended.html#ga3ae360583f4351aa5267ee7e43008faf',1,'mimalloc-doc.h']]],
+  ['mi_5fheap_5fnew_5fin_5farena_51',['mi_heap_new_in_arena',['../group__extended.html#gaaf2d9976576d5efd5544be12848af949',1,'mimalloc-doc.h']]],
+  ['mi_5fheap_5frealloc_52',['mi_heap_realloc',['../group__heap.html#gac5252d6a2e510bd349e4fcb452e6a93a',1,'mimalloc-doc.h']]],
+  ['mi_5fheap_5frealloc_5faligned_53',['mi_heap_realloc_aligned',['../group__heap.html#gaccf8c249872f30bf1c2493a09197d734',1,'mimalloc-doc.h']]],
+  ['mi_5fheap_5frealloc_5faligned_5fat_54',['mi_heap_realloc_aligned_at',['../group__heap.html#ga6df988a7219d5707f010d5f3eb0dc3f5',1,'mimalloc-doc.h']]],
+  ['mi_5fheap_5freallocf_55',['mi_heap_reallocf',['../group__heap.html#gae7cd171425bee04c683c65a3701f0b4a',1,'mimalloc-doc.h']]],
+  ['mi_5fheap_5freallocn_56',['mi_heap_reallocn',['../group__heap.html#gaccf7bfe10ce510a000d3547d9cf7fa29',1,'mimalloc-doc.h']]],
+  ['mi_5fheap_5freallocn_5ftp_57',['mi_heap_reallocn_tp',['../group__typed.html#gaf213d5422ec35e7f6caad827c79bc948',1,'mimalloc-doc.h']]],
+  ['mi_5fheap_5frealpath_58',['mi_heap_realpath',['../group__heap.html#ga55545a3ec6da29c5b4f62e540ecac1e2',1,'mimalloc-doc.h']]],
+  ['mi_5fheap_5frecalloc_59',['mi_heap_recalloc',['../group__zeroinit.html#gad1a0d325d930eeb80f25e3fea37aacde',1,'mimalloc-doc.h']]],
+  ['mi_5fheap_5frecalloc_5faligned_60',['mi_heap_recalloc_aligned',['../group__zeroinit.html#ga87ddd674bf1c67237d780d0b9e0f0f32',1,'mimalloc-doc.h']]],
+  ['mi_5fheap_5frecalloc_5faligned_5fat_61',['mi_heap_recalloc_aligned_at',['../group__zeroinit.html#ga07b5bcbaf00d0d2e598c232982588496',1,'mimalloc-doc.h']]],
+  ['mi_5fheap_5frecalloc_5ftp_62',['mi_heap_recalloc_tp',['../group__typed.html#ga3e50a1600958fcaf1a7f3560c9174f9e',1,'mimalloc-doc.h']]],
+  ['mi_5fheap_5frezalloc_63',['mi_heap_rezalloc',['../group__zeroinit.html#ga8d8b7ebb24b513cd84d1a696048da60d',1,'mimalloc-doc.h']]],
+  ['mi_5fheap_5frezalloc_5faligned_64',['mi_heap_rezalloc_aligned',['../group__zeroinit.html#ga5129f6dc46ee1613d918820a8a0533a7',1,'mimalloc-doc.h']]],
+  ['mi_5fheap_5frezalloc_5faligned_5fat_65',['mi_heap_rezalloc_aligned_at',['../group__zeroinit.html#ga2bafa79c3f98ea74882349d44cffa5d9',1,'mimalloc-doc.h']]],
+  ['mi_5fheap_5fset_5fdefault_66',['mi_heap_set_default',['../group__heap.html#ga349b677dec7da5eacdbc7a385bd62a4a',1,'mimalloc-doc.h']]],
+  ['mi_5fheap_5fstrdup_67',['mi_heap_strdup',['../group__heap.html#ga5754e09ccc51dd6bc73885bb6ea21b7a',1,'mimalloc-doc.h']]],
+  ['mi_5fheap_5fstrndup_68',['mi_heap_strndup',['../group__heap.html#gad224df78f1fbee942df8adf023e12cf3',1,'mimalloc-doc.h']]],
+  ['mi_5fheap_5ft_69',['mi_heap_t',['../group__heap.html#ga34a47cde5a5b38c29f1aa3c5e76943c2',1,'mimalloc-doc.h']]],
+  ['mi_5fheap_5fvisit_5fblocks_70',['mi_heap_visit_blocks',['../group__analysis.html#ga70c46687dc6e9dc98b232b02646f8bed',1,'mimalloc-doc.h']]],
+  ['mi_5fheap_5fzalloc_71',['mi_heap_zalloc',['../group__heap.html#gabebc796399619d964d8db77aa835e8c1',1,'mimalloc-doc.h']]],
+  ['mi_5fheap_5fzalloc_5faligned_72',['mi_heap_zalloc_aligned',['../group__heap.html#ga6466bde8b5712aa34e081a8317f9f471',1,'mimalloc-doc.h']]],
+  ['mi_5fheap_5fzalloc_5faligned_5fat_73',['mi_heap_zalloc_aligned_at',['../group__heap.html#ga484e3d01cd174f78c7e53370e5a7c819',1,'mimalloc-doc.h']]],
+  ['mi_5fheap_5fzalloc_5ftp_74',['mi_heap_zalloc_tp',['../group__typed.html#gad6e87e86e994aa14416ae9b5d4c188fe',1,'mimalloc-doc.h']]],
+  ['mi_5fis_5fin_5fheap_5fregion_75',['mi_is_in_heap_region',['../group__extended.html#ga5f071b10d4df1c3658e04e7fd67a94e6',1,'mimalloc-doc.h']]],
+  ['mi_5fis_5fredirected_76',['mi_is_redirected',['../group__extended.html#gaad25050b19f30cd79397b227e0157a3f',1,'mimalloc-doc.h']]],
+  ['mi_5fmalloc_77',['mi_malloc',['../group__malloc.html#gae1dd97b542420c87ae085e822b1229e8',1,'mimalloc-doc.h']]],
+  ['mi_5fmalloc_5faligned_78',['mi_malloc_aligned',['../group__aligned.html#ga69578ff1a98ca16e1dcd02c0995cd65c',1,'mimalloc-doc.h']]],
+  ['mi_5fmalloc_5faligned_5fat_79',['mi_malloc_aligned_at',['../group__aligned.html#ga2022f71b95a7cd6cce1b6e07752ae8ca',1,'mimalloc-doc.h']]],
+  ['mi_5fmalloc_5fgood_5fsize_80',['mi_malloc_good_size',['../group__posix.html#ga9d23ac7885fed7413c11d8e0ffa31071',1,'mimalloc-doc.h']]],
+  ['mi_5fmalloc_5fsize_81',['mi_malloc_size',['../group__posix.html#ga4531c9e775bb3ae12db57c1ba8a5d7de',1,'mimalloc-doc.h']]],
+  ['mi_5fmalloc_5fsmall_82',['mi_malloc_small',['../group__extended.html#ga7f050bc6b897da82692174f5fce59cde',1,'mimalloc-doc.h']]],
+  ['mi_5fmalloc_5ftp_83',['mi_malloc_tp',['../group__typed.html#ga0619a62c5fd886f1016030abe91f0557',1,'mimalloc-doc.h']]],
+  ['mi_5fmalloc_5fusable_5fsize_84',['mi_malloc_usable_size',['../group__posix.html#ga06d07cf357bbac5c73ba5d0c0c421e17',1,'mimalloc-doc.h']]],
+  ['mi_5fmallocn_85',['mi_mallocn',['../group__malloc.html#ga61f46bade3db76ca24aaafedc40de7b6',1,'mimalloc-doc.h']]],
+  ['mi_5fmallocn_5ftp_86',['mi_mallocn_tp',['../group__typed.html#gae5cb6e0fafc9f23169c5622e077afe8b',1,'mimalloc-doc.h']]],
+  ['mi_5fmanage_5fos_5fmemory_87',['mi_manage_os_memory',['../group__extended.html#ga4c6486a1fdcd7a423b5f25fe4be8e0cf',1,'mimalloc-doc.h']]],
+  ['mi_5fmanage_5fos_5fmemory_5fex_88',['mi_manage_os_memory_ex',['../group__extended.html#ga41ce8525d77bbb60f618fa1029994f6e',1,'mimalloc-doc.h']]],
+  ['mi_5fmbsdup_89',['mi_mbsdup',['../group__posix.html#ga7b82a44094fdec4d2084eb4288a979b0',1,'mimalloc-doc.h']]],
+  ['mi_5fmemalign_90',['mi_memalign',['../group__posix.html#ga726867f13fd29ca36064954c0285b1d8',1,'mimalloc-doc.h']]],
+  ['mi_5fnew_91',['mi_new',['../group__cpp.html#ga633d96e3bc7011f960df9f3b2731fc6a',1,'mimalloc-doc.h']]],
+  ['mi_5fnew_5faligned_92',['mi_new_aligned',['../group__cpp.html#ga79c54da0b4b4ce9fcc11d2f6ef6675f8',1,'mimalloc-doc.h']]],
+  ['mi_5fnew_5faligned_5fnothrow_93',['mi_new_aligned_nothrow',['../group__cpp.html#ga92ae00b6dd64406c7e64557711ec04b7',1,'mimalloc-doc.h']]],
+  ['mi_5fnew_5fn_94',['mi_new_n',['../group__cpp.html#gadd11b85c15d21d308386844b5233856c',1,'mimalloc-doc.h']]],
+  ['mi_5fnew_5fnothrow_95',['mi_new_nothrow',['../group__cpp.html#ga5cb4f120d1f7296074256215aa9a9e54',1,'mimalloc-doc.h']]],
+  ['mi_5fnew_5frealloc_96',['mi_new_realloc',['../group__cpp.html#ga6867d89baf992728e0cc20a1f47db4d0',1,'mimalloc-doc.h']]],
+  ['mi_5fnew_5freallocn_97',['mi_new_reallocn',['../group__cpp.html#gaace912ce086682d56f3ce9f7638d9d67',1,'mimalloc-doc.h']]],
+  ['mi_5foption_5fabandoned_5fpage_5fpurge_98',['mi_option_abandoned_page_purge',['../group__options.html#ggafebf7ed116adb38ae5218bc3ce06884ca11e62ed69200a489a5be955582078c0c',1,'mimalloc-doc.h']]],
+  ['mi_5foption_5fabandoned_5freclaim_5fon_5ffree_99',['mi_option_abandoned_reclaim_on_free',['../group__options.html#ggafebf7ed116adb38ae5218bc3ce06884ca009e4b5684922ce664d73d2a8e1698d9',1,'mimalloc-doc.h']]],
+  ['mi_5foption_5fallow_5flarge_5fos_5fpages_100',['mi_option_allow_large_os_pages',['../group__options.html#ggafebf7ed116adb38ae5218bc3ce06884ca7cc4804ced69004fa42a9a136a9ba556',1,'mimalloc-doc.h']]],
+  ['mi_5foption_5farena_5feager_5fcommit_101',['mi_option_arena_eager_commit',['../group__options.html#ggafebf7ed116adb38ae5218bc3ce06884cafd0c5ddbc4b59fd8b5216871728167a5',1,'mimalloc-doc.h']]],
+  ['mi_5foption_5farena_5fpurge_5fmult_102',['mi_option_arena_purge_mult',['../group__options.html#ggafebf7ed116adb38ae5218bc3ce06884ca8236501f1ab45d26e6fd885d191a2b5e',1,'mimalloc-doc.h']]],
+  ['mi_5foption_5farena_5freserve_103',['mi_option_arena_reserve',['../group__options.html#ggafebf7ed116adb38ae5218bc3ce06884cab1c88e23ae290bbeec824038a97959de',1,'mimalloc-doc.h']]],
+  ['mi_5foption_5fdestroy_5fon_5fexit_104',['mi_option_destroy_on_exit',['../group__options.html#ggafebf7ed116adb38ae5218bc3ce06884ca6364331e305e7d3c0218b058ff3afc88',1,'mimalloc-doc.h']]],
+  ['mi_5foption_5fdisable_105',['mi_option_disable',['../group__options.html#gaebf6ff707a2e688ebb1a2296ca564054',1,'mimalloc-doc.h']]],
+  ['mi_5foption_5fdisallow_5farena_5falloc_106',['mi_option_disallow_arena_alloc',['../group__options.html#ggafebf7ed116adb38ae5218bc3ce06884caeae1696100e4057ffc4182730cc04e40',1,'mimalloc-doc.h']]],
+  ['mi_5foption_5fdisallow_5fos_5falloc_107',['mi_option_disallow_os_alloc',['../group__options.html#ggafebf7ed116adb38ae5218bc3ce06884cadcfb5a09580361b1be65901d2d812de6',1,'mimalloc-doc.h']]],
+  ['mi_5foption_5feager_5fcommit_108',['mi_option_eager_commit',['../group__options.html#ggafebf7ed116adb38ae5218bc3ce06884ca1e8de72c93da7ff22d91e1e27b52ac2b',1,'mimalloc-doc.h']]],
+  ['mi_5foption_5feager_5fcommit_5fdelay_109',['mi_option_eager_commit_delay',['../group__options.html#ggafebf7ed116adb38ae5218bc3ce06884ca17a190c25be381142d87e0468c4c068c',1,'mimalloc-doc.h']]],
+  ['mi_5foption_5fenable_110',['mi_option_enable',['../group__options.html#ga04180ae41b0d601421dd62ced40ca050',1,'mimalloc-doc.h']]],
+  ['mi_5foption_5fget_111',['mi_option_get',['../group__options.html#ga7e8af195cc81d3fa64ccf2662caa565a',1,'mimalloc-doc.h']]],
+  ['mi_5foption_5fget_5fclamp_112',['mi_option_get_clamp',['../group__options.html#ga96ad9c406338bd314cfe878cfc9bf723',1,'mimalloc-doc.h']]],
+  ['mi_5foption_5fget_5fsize_113',['mi_option_get_size',['../group__options.html#ga274db5a6ac87cc24ef0b23e7006ed02c',1,'mimalloc-doc.h']]],
+  ['mi_5foption_5fis_5fenabled_114',['mi_option_is_enabled',['../group__options.html#ga459ad98f18b3fc9275474807fe0ca188',1,'mimalloc-doc.h']]],
+  ['mi_5foption_5flimit_5fos_5falloc_115',['mi_option_limit_os_alloc',['../group__options.html#ggafebf7ed116adb38ae5218bc3ce06884ca9fa61bd9668479f8452d2195759444cc',1,'mimalloc-doc.h']]],
+  ['mi_5foption_5fmax_5ferrors_116',['mi_option_max_errors',['../group__options.html#ggafebf7ed116adb38ae5218bc3ce06884caec6ecbe29d46a48205ed8823a8a52a6a',1,'mimalloc-doc.h']]],
+  ['mi_5foption_5fmax_5fsegment_5freclaim_117',['mi_option_max_segment_reclaim',['../group__options.html#ggafebf7ed116adb38ae5218bc3ce06884caa9ad9005d7017c8c30ad2d6ba31db909',1,'mimalloc-doc.h']]],
+  ['mi_5foption_5fmax_5fwarnings_118',['mi_option_max_warnings',['../group__options.html#ggafebf7ed116adb38ae5218bc3ce06884caf9595921087e942602ee079158762665',1,'mimalloc-doc.h']]],
+  ['mi_5foption_5fos_5ftag_119',['mi_option_os_tag',['../group__options.html#ggafebf7ed116adb38ae5218bc3ce06884ca4b74ae2a69e445de6c2361b73c1d14bf',1,'mimalloc-doc.h']]],
+  ['mi_5foption_5fpurge_5fdecommits_120',['mi_option_purge_decommits',['../group__options.html#ggafebf7ed116adb38ae5218bc3ce06884ca9d15c5e3d2115eef681c17e4dd5ab9a4',1,'mimalloc-doc.h']]],
+  ['mi_5foption_5fpurge_5fdelay_121',['mi_option_purge_delay',['../group__options.html#ggafebf7ed116adb38ae5218bc3ce06884cadd351e615acd8563529c20a347be7290',1,'mimalloc-doc.h']]],
+  ['mi_5foption_5fpurge_5fextend_5fdelay_122',['mi_option_purge_extend_delay',['../group__options.html#ggafebf7ed116adb38ae5218bc3ce06884ca02005f164bdf03f5f00c5be726adf487',1,'mimalloc-doc.h']]],
+  ['mi_5foption_5freserve_5fhuge_5fos_5fpages_123',['mi_option_reserve_huge_os_pages',['../group__options.html#ggafebf7ed116adb38ae5218bc3ce06884caca7ed041be3b0b9d0b82432c7bf41af2',1,'mimalloc-doc.h']]],
+  ['mi_5foption_5freserve_5fhuge_5fos_5fpages_5fat_124',['mi_option_reserve_huge_os_pages_at',['../group__options.html#ggafebf7ed116adb38ae5218bc3ce06884caa13e7926d4339d2aa6fbf61d4473fd5c',1,'mimalloc-doc.h']]],
+  ['mi_5foption_5freserve_5fos_5fmemory_125',['mi_option_reserve_os_memory',['../group__options.html#ggafebf7ed116adb38ae5218bc3ce06884cafbf4999c828cf79a0fb2de65d23f7333',1,'mimalloc-doc.h']]],
+  ['mi_5foption_5fretry_5fon_5foom_126',['mi_option_retry_on_oom',['../group__options.html#ggafebf7ed116adb38ae5218bc3ce06884ca8f51df355bf6651db899e6085b54865e',1,'mimalloc-doc.h']]],
+  ['mi_5foption_5fset_127',['mi_option_set',['../group__options.html#gaf84921c32375e25754dc2ee6a911fa60',1,'mimalloc-doc.h']]],
+  ['mi_5foption_5fset_5fdefault_128',['mi_option_set_default',['../group__options.html#ga7ef623e440e6e5545cb08c94e71e4b90',1,'mimalloc-doc.h']]],
+  ['mi_5foption_5fset_5fenabled_129',['mi_option_set_enabled',['../group__options.html#ga9a13d05fcb77489cb06d4d017ebd8bed',1,'mimalloc-doc.h']]],
+  ['mi_5foption_5fset_5fenabled_5fdefault_130',['mi_option_set_enabled_default',['../group__options.html#ga65518b69ec5d32336b50e07f74b3f629',1,'mimalloc-doc.h']]],
+  ['mi_5foption_5fshow_5ferrors_131',['mi_option_show_errors',['../group__options.html#ggafebf7ed116adb38ae5218bc3ce06884cafbf4822e5c00732c5984b32a032837f0',1,'mimalloc-doc.h']]],
+  ['mi_5foption_5fshow_5fstats_132',['mi_option_show_stats',['../group__options.html#ggafebf7ed116adb38ae5218bc3ce06884ca0957ef73b2550764b4840edf48422fda',1,'mimalloc-doc.h']]],
+  ['mi_5foption_5ft_133',['mi_option_t',['../group__options.html#gafebf7ed116adb38ae5218bc3ce06884c',1,'mimalloc-doc.h']]],
+  ['mi_5foption_5fuse_5fnuma_5fnodes_134',['mi_option_use_numa_nodes',['../group__options.html#ggafebf7ed116adb38ae5218bc3ce06884ca0ac33a18f6b659fcfaf44efb0bab1b74',1,'mimalloc-doc.h']]],
+  ['mi_5foption_5fverbose_135',['mi_option_verbose',['../group__options.html#ggafebf7ed116adb38ae5218bc3ce06884ca7c8b7bf5281c581bad64f5daa6442777',1,'mimalloc-doc.h']]],
+  ['mi_5foption_5fvisit_5fabandoned_136',['mi_option_visit_abandoned',['../group__options.html#ggafebf7ed116adb38ae5218bc3ce06884ca38c67733a3956a1f4eeaca89fab9e78e',1,'mimalloc-doc.h']]],
+  ['mi_5foutput_5ffun_137',['mi_output_fun',['../group__extended.html#gadf31cea7d0332a81c8b882cbbdbadb8d',1,'mimalloc-doc.h']]],
+  ['mi_5fposix_5fmemalign_138',['mi_posix_memalign',['../group__posix.html#gacff84f226ba9feb2031b8992e5579447',1,'mimalloc-doc.h']]],
+  ['mi_5fprocess_5finfo_139',['mi_process_info',['../group__extended.html#ga7d862c2affd5790381da14eb102a364d',1,'mimalloc-doc.h']]],
+  ['mi_5fpvalloc_140',['mi_pvalloc',['../group__posix.html#ga644bebccdbb2821542dd8c7e7641f476',1,'mimalloc-doc.h']]],
+  ['mi_5frealloc_141',['mi_realloc',['../group__malloc.html#ga0621af6a5e3aa384e6a1b548958bf583',1,'mimalloc-doc.h']]],
+  ['mi_5frealloc_5faligned_142',['mi_realloc_aligned',['../group__aligned.html#ga5d7a46d054b4d7abe9d8d2474add2edf',1,'mimalloc-doc.h']]],
+  ['mi_5frealloc_5faligned_5fat_143',['mi_realloc_aligned_at',['../group__aligned.html#gad06dcf2bb8faadb2c8ea61ee5d24bbf6',1,'mimalloc-doc.h']]],
+  ['mi_5freallocarr_144',['mi_reallocarr',['../group__posix.html#ga7e1934d60a3e697950eeb48e042bfad5',1,'mimalloc-doc.h']]],
+  ['mi_5freallocarray_145',['mi_reallocarray',['../group__posix.html#gadfeccb72748a2f6305474a37d9d57bce',1,'mimalloc-doc.h']]],
+  ['mi_5freallocf_146',['mi_reallocf',['../group__malloc.html#ga4dc3a4067037b151a64629fe8a332641',1,'mimalloc-doc.h']]],
+  ['mi_5freallocn_147',['mi_reallocn',['../group__malloc.html#ga8bddfb4a1270a0854bbcf44cb3980467',1,'mimalloc-doc.h']]],
+  ['mi_5freallocn_5ftp_148',['mi_reallocn_tp',['../group__typed.html#ga1158b49a55dfa81f58a4426a7578f523',1,'mimalloc-doc.h']]],
+  ['mi_5frealpath_149',['mi_realpath',['../group__malloc.html#ga94c3afcc086e85d75a57e9f76b9b71dd',1,'mimalloc-doc.h']]],
+  ['mi_5frecalloc_150',['mi_recalloc',['../group__malloc.html#ga23a0fbb452b5dce8e31fab1a1958cacc',1,'mimalloc-doc.h']]],
+  ['mi_5frecalloc_5faligned_151',['mi_recalloc_aligned',['../group__zeroinit.html#ga3e2169b48683aa0ab64f813fd68d839e',1,'mimalloc-doc.h']]],
+  ['mi_5frecalloc_5faligned_5fat_152',['mi_recalloc_aligned_at',['../group__zeroinit.html#gaae25e4ddedd4e0fb61b1a8bd5d452750',1,'mimalloc-doc.h']]],
+  ['mi_5fregister_5fdeferred_5ffree_153',['mi_register_deferred_free',['../group__extended.html#ga3460a6ca91af97be4058f523d3cb8ece',1,'mimalloc-doc.h']]],
+  ['mi_5fregister_5ferror_154',['mi_register_error',['../group__extended.html#gaa1d55e0e894be240827e5d87ec3a1f45',1,'mimalloc-doc.h']]],
+  ['mi_5fregister_5foutput_155',['mi_register_output',['../group__extended.html#gae5b17ff027cd2150b43a33040250cf3f',1,'mimalloc-doc.h']]],
+  ['mi_5freserve_5fhuge_5fos_5fpages_5fat_156',['mi_reserve_huge_os_pages_at',['../group__extended.html#ga7795a13d20087447281858d2c771cca1',1,'mimalloc-doc.h']]],
+  ['mi_5freserve_5fhuge_5fos_5fpages_5fat_5fex_157',['mi_reserve_huge_os_pages_at_ex',['../group__extended.html#ga591aab1c2bc2ca920e33f0f9f9cb5c52',1,'mimalloc-doc.h']]],
+  ['mi_5freserve_5fhuge_5fos_5fpages_5finterleave_158',['mi_reserve_huge_os_pages_interleave',['../group__extended.html#ga3132f521fb756fc0e8ec0b74fb58df50',1,'mimalloc-doc.h']]],
+  ['mi_5freserve_5fos_5fmemory_159',['mi_reserve_os_memory',['../group__extended.html#ga00ec3324b6b2591c7fe3677baa30a767',1,'mimalloc-doc.h']]],
+  ['mi_5freserve_5fos_5fmemory_5fex_160',['mi_reserve_os_memory_ex',['../group__extended.html#ga32f519797fd9a81acb4f52d36e6d751b',1,'mimalloc-doc.h']]],
+  ['mi_5frezalloc_161',['mi_rezalloc',['../group__zeroinit.html#gadfd34cd7b4f2bbda7ae06367a6360756',1,'mimalloc-doc.h']]],
+  ['mi_5frezalloc_5faligned_162',['mi_rezalloc_aligned',['../group__zeroinit.html#ga4d02404fe1e7db00beb65f185e012caa',1,'mimalloc-doc.h']]],
+  ['mi_5frezalloc_5faligned_5fat_163',['mi_rezalloc_aligned_at',['../group__zeroinit.html#ga6843a88285bbfcc3bdfccc60aafd1270',1,'mimalloc-doc.h']]],
+  ['mi_5fsmall_5fsize_5fmax_164',['MI_SMALL_SIZE_MAX',['../group__extended.html#ga1ea64283508718d9d645c38efc2f4305',1,'mimalloc-doc.h']]],
+  ['mi_5fstats_5fmerge_165',['mi_stats_merge',['../group__extended.html#ga854b1de8cb067c7316286c28b2fcd3d1',1,'mimalloc-doc.h']]],
+  ['mi_5fstats_5fprint_166',['mi_stats_print',['../group__extended.html#ga2d126e5c62d3badc35445e5d84166df2',1,'mimalloc-doc.h']]],
+  ['mi_5fstats_5fprint_5fout_167',['mi_stats_print_out',['../group__extended.html#ga537f13b299ddf801e49a5a94fde02c79',1,'mimalloc-doc.h']]],
+  ['mi_5fstats_5freset_168',['mi_stats_reset',['../group__extended.html#ga3bb8468b8cfcc6e2a61d98aee85c5f99',1,'mimalloc-doc.h']]],
+  ['mi_5fstl_5fallocator_169',['mi_stl_allocator',['../group__cpp.html#structmi__stl__allocator',1,'']]],
+  ['mi_5fstrdup_170',['mi_strdup',['../group__malloc.html#ga245ac90ebc2cfdd17de599e5fea59889',1,'mimalloc-doc.h']]],
+  ['mi_5fstrndup_171',['mi_strndup',['../group__malloc.html#ga486d0d26b3b3794f6d1cdb41a9aed92d',1,'mimalloc-doc.h']]],
+  ['mi_5fsubproc_5fadd_5fcurrent_5fthread_172',['mi_subproc_add_current_thread',['../group__extended.html#gadbc53414eb68b275588ec001ce1ddc7c',1,'mimalloc-doc.h']]],
+  ['mi_5fsubproc_5fdelete_173',['mi_subproc_delete',['../group__extended.html#gaa7d263e9429bac9ac8345c9d25de610e',1,'mimalloc-doc.h']]],
+  ['mi_5fsubproc_5fid_5ft_174',['mi_subproc_id_t',['../group__extended.html#ga8c0bcd1fee27c7641e9c3c0d991b3b7d',1,'mimalloc-doc.h']]],
+  ['mi_5fsubproc_5fmain_175',['mi_subproc_main',['../group__extended.html#ga2ecba0d7ebdc99e71bb985c4a1609806',1,'mimalloc-doc.h']]],
+  ['mi_5fsubproc_5fnew_176',['mi_subproc_new',['../group__extended.html#ga8068cac328e41fa2170faef707315243',1,'mimalloc-doc.h']]],
+  ['mi_5fthread_5fdone_177',['mi_thread_done',['../group__extended.html#ga0ae4581e85453456a0d658b2b98bf7bf',1,'mimalloc-doc.h']]],
+  ['mi_5fthread_5finit_178',['mi_thread_init',['../group__extended.html#gaf8e73efc2cbca9ebfdfb166983a04c17',1,'mimalloc-doc.h']]],
+  ['mi_5fthread_5fstats_5fprint_5fout_179',['mi_thread_stats_print_out',['../group__extended.html#gab1dac8476c46cb9eecab767eb40c1525',1,'mimalloc-doc.h']]],
+  ['mi_5fusable_5fsize_180',['mi_usable_size',['../group__extended.html#ga089c859d9eddc5f9b4bd946cd53cebee',1,'mimalloc-doc.h']]],
+  ['mi_5fvalloc_181',['mi_valloc',['../group__posix.html#ga50cafb9722020402f065de93799f64ca',1,'mimalloc-doc.h']]],
+  ['mi_5fwcsdup_182',['mi_wcsdup',['../group__posix.html#gaa9fd7f25c9ac3a20e89b33bd6e383fcf',1,'mimalloc-doc.h']]],
+  ['mi_5fwdupenv_5fs_183',['mi_wdupenv_s',['../group__posix.html#ga6ac6a6a8f3c96f1af24bb8d0439cbbd1',1,'mimalloc-doc.h']]],
+  ['mi_5fzalloc_184',['mi_zalloc',['../group__malloc.html#gae6e38c4403247a7b40d80419e093bfb8',1,'mimalloc-doc.h']]],
+  ['mi_5fzalloc_5faligned_185',['mi_zalloc_aligned',['../group__aligned.html#gaac7d0beb782f9b9ac31f47492b130f82',1,'mimalloc-doc.h']]],
+  ['mi_5fzalloc_5faligned_5fat_186',['mi_zalloc_aligned_at',['../group__aligned.html#ga7c1778805ce50ebbf02ccbd5e39d5dba',1,'mimalloc-doc.h']]],
+  ['mi_5fzalloc_5fsmall_187',['mi_zalloc_small',['../group__extended.html#ga51c47637e81df0e2f13a2d7a2dec123e',1,'mimalloc-doc.h']]],
+  ['mi_5fzalloc_5ftp_188',['mi_zalloc_tp',['../group__typed.html#gac77a61bdaf680a803785fe307820b48c',1,'mimalloc-doc.h']]]
 ];
diff --git a/depends/mimalloc/docs/search/all_a.js b/depends/mimalloc/docs/search/all_a.js
index 699b5456e717..dee0ab7ccfc4 100644
--- a/depends/mimalloc/docs/search/all_a.js
+++ b/depends/mimalloc/docs/search/all_a.js
@@ -1,4 +1,5 @@
 var searchData=
 [
-  ['typed_20macros_167',['Typed Macros',['../group__typed.html',1,'']]]
+  ['options_0',['Options',['../environment.html',1,'Environment Options'],['../group__options.html',1,'Runtime Options']]],
+  ['overriding_20malloc_1',['Overriding Malloc',['../overrides.html',1,'']]]
 ];
diff --git a/depends/mimalloc/docs/search/all_b.js b/depends/mimalloc/docs/search/all_b.js
index 73a2671d9261..44ef0a69f929 100644
--- a/depends/mimalloc/docs/search/all_b.js
+++ b/depends/mimalloc/docs/search/all_b.js
@@ -1,5 +1,5 @@
 var searchData=
 [
-  ['used_168',['used',['../group__analysis.html#ab820302c5cd0df133eb8e51650a008b4',1,'mi_heap_area_t']]],
-  ['using_20the_20library_169',['Using the library',['../using.html',1,'']]]
+  ['performance_0',['Performance',['../bench.html',1,'']]],
+  ['posix_1',['Posix',['../group__posix.html',1,'']]]
 ];
diff --git a/depends/mimalloc/docs/search/all_c.js b/depends/mimalloc/docs/search/all_c.js
index 192fb1cb78b0..d0a080fe2dcf 100644
--- a/depends/mimalloc/docs/search/all_c.js
+++ b/depends/mimalloc/docs/search/all_c.js
@@ -1,4 +1,6 @@
 var searchData=
 [
-  ['zero_20initialized_20re_2dallocation_170',['Zero initialized re-allocation',['../group__zeroinit.html',1,'']]]
+  ['re_20allocation_0',['Zero initialized re-allocation',['../group__zeroinit.html',1,'']]],
+  ['reserved_1',['reserved',['../group__analysis.html#ae848a3e6840414891035423948ca0383',1,'mi_heap_area_t']]],
+  ['runtime_20options_2',['Runtime Options',['../group__options.html',1,'']]]
 ];
diff --git a/depends/mimalloc/docs/search/all_d.js b/depends/mimalloc/docs/search/all_d.js
index 2b9b4cea09de..2cce101acf5c 100644
--- a/depends/mimalloc/docs/search/all_d.js
+++ b/depends/mimalloc/docs/search/all_d.js
@@ -1,4 +1,5 @@
 var searchData=
 [
-  ['zero_20initialized_20re_2dallocation',['Zero initialized re-allocation',['../group__zeroinit.html',1,'']]]
+  ['the_20library_0',['Using the library',['../using.html',1,'']]],
+  ['typed_20macros_1',['Typed Macros',['../group__typed.html',1,'']]]
 ];
diff --git a/depends/mimalloc/docs/search/all_e.js b/depends/mimalloc/docs/search/all_e.js
new file mode 100644
index 000000000000..4c8c2e890ffe
--- /dev/null
+++ b/depends/mimalloc/docs/search/all_e.js
@@ -0,0 +1,5 @@
+var searchData=
+[
+  ['used_0',['used',['../group__analysis.html#ab820302c5cd0df133eb8e51650a008b4',1,'mi_heap_area_t']]],
+  ['using_20the_20library_1',['Using the library',['../using.html',1,'']]]
+];
diff --git a/depends/mimalloc/docs/search/all_f.js b/depends/mimalloc/docs/search/all_f.js
new file mode 100644
index 000000000000..8f445b9fc8c2
--- /dev/null
+++ b/depends/mimalloc/docs/search/all_f.js
@@ -0,0 +1,4 @@
+var searchData=
+[
+  ['wrappers_0',['C++ wrappers',['../group__cpp.html',1,'']]]
+];
diff --git a/depends/mimalloc/docs/search/classes_0.js b/depends/mimalloc/docs/search/classes_0.js
index e3770fb49170..5ba187064f9a 100644
--- a/depends/mimalloc/docs/search/classes_0.js
+++ b/depends/mimalloc/docs/search/classes_0.js
@@ -1,5 +1,5 @@
 var searchData=
 [
-  ['mi_5fheap_5farea_5ft_171',['mi_heap_area_t',['../group__analysis.html#structmi__heap__area__t',1,'']]],
-  ['mi_5fstl_5fallocator_172',['mi_stl_allocator',['../group__cpp.html#structmi__stl__allocator',1,'']]]
+  ['mi_5fheap_5farea_5ft_0',['mi_heap_area_t',['../group__analysis.html#structmi__heap__area__t',1,'']]],
+  ['mi_5fstl_5fallocator_1',['mi_stl_allocator',['../group__cpp.html#structmi__stl__allocator',1,'']]]
 ];
diff --git a/depends/mimalloc/docs/search/close.svg b/depends/mimalloc/docs/search/close.svg
new file mode 100644
index 000000000000..337d6cc13298
--- /dev/null
+++ b/depends/mimalloc/docs/search/close.svg
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN"
+ "https://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   viewBox="0 0 11 11"
+   height="11"
+   width="11"
+   id="svg2"
+   version="1.1">
+  <defs
+     id="defs6" />
+  <path
+     id="path12"
+     d="M 5.5 0.5 A 5 5 0 0 0 0.5 5.5 A 5 5 0 0 0 5.5 10.5 A 5 5 0 0 0 10.5 5.5 A 5 5 0 0 0 5.5 0.5 z M 3.5820312 3 A 0.58291923 0.58291923 0 0 1 4 3.1757812 L 5.5 4.6757812 L 7 3.1757812 A 0.58291923 0.58291923 0 0 1 7.4003906 3 A 0.58291923 0.58291923 0 0 1 7.8242188 4 L 6.3242188 5.5 L 7.8242188 7 A 0.58291923 0.58291923 0 1 1 7 7.8242188 L 5.5 6.3242188 L 4 7.8242188 A 0.58291923 0.58291923 0 1 1 3.1757812 7 L 4.6757812 5.5 L 3.1757812 4 A 0.58291923 0.58291923 0 0 1 3.5820312 3 z "
+     style="stroke-width:1.09870648;fill:#bababa;fill-opacity:1" />
+</svg>
diff --git a/depends/mimalloc/docs/search/enums_0.js b/depends/mimalloc/docs/search/enums_0.js
index 6f1f38338b6c..9bc2f56b2b0c 100644
--- a/depends/mimalloc/docs/search/enums_0.js
+++ b/depends/mimalloc/docs/search/enums_0.js
@@ -1,4 +1,4 @@
 var searchData=
 [
-  ['mi_5foption_5ft_296',['mi_option_t',['../group__options.html#gafebf7ed116adb38ae5218bc3ce06884c',1,'mimalloc-doc.h']]]
+  ['mi_5foption_5ft_0',['mi_option_t',['../group__options.html#gafebf7ed116adb38ae5218bc3ce06884c',1,'mimalloc-doc.h']]]
 ];
diff --git a/depends/mimalloc/docs/search/enumvalues_0.js b/depends/mimalloc/docs/search/enumvalues_0.js
index 1aca63bbee65..cd7bb4196726 100644
--- a/depends/mimalloc/docs/search/enumvalues_0.js
+++ b/depends/mimalloc/docs/search/enumvalues_0.js
@@ -1,4 +1,4 @@
 var searchData=
 [
-  ['_5fmi_5foption_5flast_297',['_mi_option_last',['../group__options.html#ggafebf7ed116adb38ae5218bc3ce06884ca5b4357b74be0d87568036c32eb1a2e4a',1,'mimalloc-doc.h']]]
+  ['_5fmi_5foption_5flast_0',['_mi_option_last',['../group__options.html#ggafebf7ed116adb38ae5218bc3ce06884ca5b4357b74be0d87568036c32eb1a2e4a',1,'mimalloc-doc.h']]]
 ];
diff --git a/depends/mimalloc/docs/search/enumvalues_1.js b/depends/mimalloc/docs/search/enumvalues_1.js
index bd525bb854f3..d40f943b33d6 100644
--- a/depends/mimalloc/docs/search/enumvalues_1.js
+++ b/depends/mimalloc/docs/search/enumvalues_1.js
@@ -1,19 +1,31 @@
 var searchData=
 [
-  ['mi_5foption_5feager_5fcommit_298',['mi_option_eager_commit',['../group__options.html#ggafebf7ed116adb38ae5218bc3ce06884ca1e8de72c93da7ff22d91e1e27b52ac2b',1,'mimalloc-doc.h']]],
-  ['mi_5foption_5feager_5fcommit_5fdelay_299',['mi_option_eager_commit_delay',['../group__options.html#ggafebf7ed116adb38ae5218bc3ce06884ca17a190c25be381142d87e0468c4c068c',1,'mimalloc-doc.h']]],
-  ['mi_5foption_5feager_5fregion_5fcommit_300',['mi_option_eager_region_commit',['../group__options.html#ggafebf7ed116adb38ae5218bc3ce06884ca32ce97ece29f69e82579679cf8a307ad',1,'mimalloc-doc.h']]],
-  ['mi_5foption_5flarge_5fos_5fpages_301',['mi_option_large_os_pages',['../group__options.html#ggafebf7ed116adb38ae5218bc3ce06884ca4192d491200d0055df0554d4cf65054e',1,'mimalloc-doc.h']]],
-  ['mi_5foption_5fos_5ftag_302',['mi_option_os_tag',['../group__options.html#ggafebf7ed116adb38ae5218bc3ce06884ca4b74ae2a69e445de6c2361b73c1d14bf',1,'mimalloc-doc.h']]],
-  ['mi_5foption_5fpage_5freset_303',['mi_option_page_reset',['../group__options.html#ggafebf7ed116adb38ae5218bc3ce06884cada854dd272c66342f18a93ee254a2968',1,'mimalloc-doc.h']]],
-  ['mi_5foption_5freserve_5fhuge_5fos_5fpages_304',['mi_option_reserve_huge_os_pages',['../group__options.html#ggafebf7ed116adb38ae5218bc3ce06884caca7ed041be3b0b9d0b82432c7bf41af2',1,'mimalloc-doc.h']]],
-  ['mi_5foption_5freserve_5fhuge_5fos_5fpages_5fat_305',['mi_option_reserve_huge_os_pages_at',['../group__options.html#ggafebf7ed116adb38ae5218bc3ce06884caa13e7926d4339d2aa6fbf61d4473fd5c',1,'mimalloc-doc.h']]],
-  ['mi_5foption_5freset_5fdecommits_306',['mi_option_reset_decommits',['../group__options.html#ggafebf7ed116adb38ae5218bc3ce06884cac81ee965b130fa81238913a3c239d536',1,'mimalloc-doc.h']]],
-  ['mi_5foption_5freset_5fdelay_307',['mi_option_reset_delay',['../group__options.html#ggafebf7ed116adb38ae5218bc3ce06884ca154fe170131d5212cff57e22b99523c5',1,'mimalloc-doc.h']]],
-  ['mi_5foption_5fsegment_5fcache_308',['mi_option_segment_cache',['../group__options.html#ggafebf7ed116adb38ae5218bc3ce06884ca2ecbe7ef32f5c84de3739aa4f0b805a1',1,'mimalloc-doc.h']]],
-  ['mi_5foption_5fsegment_5freset_309',['mi_option_segment_reset',['../group__options.html#ggafebf7ed116adb38ae5218bc3ce06884cafb121d30d87591850d5410ccc3a95c6d',1,'mimalloc-doc.h']]],
-  ['mi_5foption_5fshow_5ferrors_310',['mi_option_show_errors',['../group__options.html#ggafebf7ed116adb38ae5218bc3ce06884cafbf4822e5c00732c5984b32a032837f0',1,'mimalloc-doc.h']]],
-  ['mi_5foption_5fshow_5fstats_311',['mi_option_show_stats',['../group__options.html#ggafebf7ed116adb38ae5218bc3ce06884ca0957ef73b2550764b4840edf48422fda',1,'mimalloc-doc.h']]],
-  ['mi_5foption_5fuse_5fnuma_5fnodes_312',['mi_option_use_numa_nodes',['../group__options.html#ggafebf7ed116adb38ae5218bc3ce06884ca0ac33a18f6b659fcfaf44efb0bab1b74',1,'mimalloc-doc.h']]],
-  ['mi_5foption_5fverbose_313',['mi_option_verbose',['../group__options.html#ggafebf7ed116adb38ae5218bc3ce06884ca7c8b7bf5281c581bad64f5daa6442777',1,'mimalloc-doc.h']]]
+  ['mi_5foption_5fabandoned_5fpage_5fpurge_0',['mi_option_abandoned_page_purge',['../group__options.html#ggafebf7ed116adb38ae5218bc3ce06884ca11e62ed69200a489a5be955582078c0c',1,'mimalloc-doc.h']]],
+  ['mi_5foption_5fabandoned_5freclaim_5fon_5ffree_1',['mi_option_abandoned_reclaim_on_free',['../group__options.html#ggafebf7ed116adb38ae5218bc3ce06884ca009e4b5684922ce664d73d2a8e1698d9',1,'mimalloc-doc.h']]],
+  ['mi_5foption_5fallow_5flarge_5fos_5fpages_2',['mi_option_allow_large_os_pages',['../group__options.html#ggafebf7ed116adb38ae5218bc3ce06884ca7cc4804ced69004fa42a9a136a9ba556',1,'mimalloc-doc.h']]],
+  ['mi_5foption_5farena_5feager_5fcommit_3',['mi_option_arena_eager_commit',['../group__options.html#ggafebf7ed116adb38ae5218bc3ce06884cafd0c5ddbc4b59fd8b5216871728167a5',1,'mimalloc-doc.h']]],
+  ['mi_5foption_5farena_5fpurge_5fmult_4',['mi_option_arena_purge_mult',['../group__options.html#ggafebf7ed116adb38ae5218bc3ce06884ca8236501f1ab45d26e6fd885d191a2b5e',1,'mimalloc-doc.h']]],
+  ['mi_5foption_5farena_5freserve_5',['mi_option_arena_reserve',['../group__options.html#ggafebf7ed116adb38ae5218bc3ce06884cab1c88e23ae290bbeec824038a97959de',1,'mimalloc-doc.h']]],
+  ['mi_5foption_5fdestroy_5fon_5fexit_6',['mi_option_destroy_on_exit',['../group__options.html#ggafebf7ed116adb38ae5218bc3ce06884ca6364331e305e7d3c0218b058ff3afc88',1,'mimalloc-doc.h']]],
+  ['mi_5foption_5fdisallow_5farena_5falloc_7',['mi_option_disallow_arena_alloc',['../group__options.html#ggafebf7ed116adb38ae5218bc3ce06884caeae1696100e4057ffc4182730cc04e40',1,'mimalloc-doc.h']]],
+  ['mi_5foption_5fdisallow_5fos_5falloc_8',['mi_option_disallow_os_alloc',['../group__options.html#ggafebf7ed116adb38ae5218bc3ce06884cadcfb5a09580361b1be65901d2d812de6',1,'mimalloc-doc.h']]],
+  ['mi_5foption_5feager_5fcommit_9',['mi_option_eager_commit',['../group__options.html#ggafebf7ed116adb38ae5218bc3ce06884ca1e8de72c93da7ff22d91e1e27b52ac2b',1,'mimalloc-doc.h']]],
+  ['mi_5foption_5feager_5fcommit_5fdelay_10',['mi_option_eager_commit_delay',['../group__options.html#ggafebf7ed116adb38ae5218bc3ce06884ca17a190c25be381142d87e0468c4c068c',1,'mimalloc-doc.h']]],
+  ['mi_5foption_5flimit_5fos_5falloc_11',['mi_option_limit_os_alloc',['../group__options.html#ggafebf7ed116adb38ae5218bc3ce06884ca9fa61bd9668479f8452d2195759444cc',1,'mimalloc-doc.h']]],
+  ['mi_5foption_5fmax_5ferrors_12',['mi_option_max_errors',['../group__options.html#ggafebf7ed116adb38ae5218bc3ce06884caec6ecbe29d46a48205ed8823a8a52a6a',1,'mimalloc-doc.h']]],
+  ['mi_5foption_5fmax_5fsegment_5freclaim_13',['mi_option_max_segment_reclaim',['../group__options.html#ggafebf7ed116adb38ae5218bc3ce06884caa9ad9005d7017c8c30ad2d6ba31db909',1,'mimalloc-doc.h']]],
+  ['mi_5foption_5fmax_5fwarnings_14',['mi_option_max_warnings',['../group__options.html#ggafebf7ed116adb38ae5218bc3ce06884caf9595921087e942602ee079158762665',1,'mimalloc-doc.h']]],
+  ['mi_5foption_5fos_5ftag_15',['mi_option_os_tag',['../group__options.html#ggafebf7ed116adb38ae5218bc3ce06884ca4b74ae2a69e445de6c2361b73c1d14bf',1,'mimalloc-doc.h']]],
+  ['mi_5foption_5fpurge_5fdecommits_16',['mi_option_purge_decommits',['../group__options.html#ggafebf7ed116adb38ae5218bc3ce06884ca9d15c5e3d2115eef681c17e4dd5ab9a4',1,'mimalloc-doc.h']]],
+  ['mi_5foption_5fpurge_5fdelay_17',['mi_option_purge_delay',['../group__options.html#ggafebf7ed116adb38ae5218bc3ce06884cadd351e615acd8563529c20a347be7290',1,'mimalloc-doc.h']]],
+  ['mi_5foption_5fpurge_5fextend_5fdelay_18',['mi_option_purge_extend_delay',['../group__options.html#ggafebf7ed116adb38ae5218bc3ce06884ca02005f164bdf03f5f00c5be726adf487',1,'mimalloc-doc.h']]],
+  ['mi_5foption_5freserve_5fhuge_5fos_5fpages_19',['mi_option_reserve_huge_os_pages',['../group__options.html#ggafebf7ed116adb38ae5218bc3ce06884caca7ed041be3b0b9d0b82432c7bf41af2',1,'mimalloc-doc.h']]],
+  ['mi_5foption_5freserve_5fhuge_5fos_5fpages_5fat_20',['mi_option_reserve_huge_os_pages_at',['../group__options.html#ggafebf7ed116adb38ae5218bc3ce06884caa13e7926d4339d2aa6fbf61d4473fd5c',1,'mimalloc-doc.h']]],
+  ['mi_5foption_5freserve_5fos_5fmemory_21',['mi_option_reserve_os_memory',['../group__options.html#ggafebf7ed116adb38ae5218bc3ce06884cafbf4999c828cf79a0fb2de65d23f7333',1,'mimalloc-doc.h']]],
+  ['mi_5foption_5fretry_5fon_5foom_22',['mi_option_retry_on_oom',['../group__options.html#ggafebf7ed116adb38ae5218bc3ce06884ca8f51df355bf6651db899e6085b54865e',1,'mimalloc-doc.h']]],
+  ['mi_5foption_5fshow_5ferrors_23',['mi_option_show_errors',['../group__options.html#ggafebf7ed116adb38ae5218bc3ce06884cafbf4822e5c00732c5984b32a032837f0',1,'mimalloc-doc.h']]],
+  ['mi_5foption_5fshow_5fstats_24',['mi_option_show_stats',['../group__options.html#ggafebf7ed116adb38ae5218bc3ce06884ca0957ef73b2550764b4840edf48422fda',1,'mimalloc-doc.h']]],
+  ['mi_5foption_5fuse_5fnuma_5fnodes_25',['mi_option_use_numa_nodes',['../group__options.html#ggafebf7ed116adb38ae5218bc3ce06884ca0ac33a18f6b659fcfaf44efb0bab1b74',1,'mimalloc-doc.h']]],
+  ['mi_5foption_5fverbose_26',['mi_option_verbose',['../group__options.html#ggafebf7ed116adb38ae5218bc3ce06884ca7c8b7bf5281c581bad64f5daa6442777',1,'mimalloc-doc.h']]],
+  ['mi_5foption_5fvisit_5fabandoned_27',['mi_option_visit_abandoned',['../group__options.html#ggafebf7ed116adb38ae5218bc3ce06884ca38c67733a3956a1f4eeaca89fab9e78e',1,'mimalloc-doc.h']]]
 ];
diff --git a/depends/mimalloc/docs/search/functions_0.js b/depends/mimalloc/docs/search/functions_0.js
index b44917a5be23..8899d6e4ba47 100644
--- a/depends/mimalloc/docs/search/functions_0.js
+++ b/depends/mimalloc/docs/search/functions_0.js
@@ -1,116 +1,138 @@
 var searchData=
 [
-  ['mi_5f_5fposix_5fmemalign_173',['mi__posix_memalign',['../group__posix.html#gad5a69c8fea96aa2b7a7c818c2130090a',1,'mimalloc-doc.h']]],
-  ['mi_5faligned_5falloc_174',['mi_aligned_alloc',['../group__posix.html#ga1326d2e4388630b5f81ca7206318b8e5',1,'mimalloc-doc.h']]],
-  ['mi_5fcalloc_175',['mi_calloc',['../group__malloc.html#ga97fedb4f7107c592fd7f0f0a8949a57d',1,'mimalloc-doc.h']]],
-  ['mi_5fcalloc_5faligned_176',['mi_calloc_aligned',['../group__aligned.html#ga53dddb4724042a90315b94bc268fb4c9',1,'mimalloc-doc.h']]],
-  ['mi_5fcalloc_5faligned_5fat_177',['mi_calloc_aligned_at',['../group__aligned.html#ga08647c4593f3b2eef24a919a73eba3a3',1,'mimalloc-doc.h']]],
-  ['mi_5fcfree_178',['mi_cfree',['../group__posix.html#ga705dc7a64bffacfeeb0141501a5c35d7',1,'mimalloc-doc.h']]],
-  ['mi_5fcheck_5fowned_179',['mi_check_owned',['../group__analysis.html#ga628c237489c2679af84a4d0d143b3dd5',1,'mimalloc-doc.h']]],
-  ['mi_5fcollect_180',['mi_collect',['../group__extended.html#ga421430e2226d7d468529cec457396756',1,'mimalloc-doc.h']]],
-  ['mi_5fexpand_181',['mi_expand',['../group__malloc.html#gaaee66a1d483c3e28f585525fb96707e4',1,'mimalloc-doc.h']]],
-  ['mi_5ffree_182',['mi_free',['../group__malloc.html#gaf2c7b89c327d1f60f59e68b9ea644d95',1,'mimalloc-doc.h']]],
-  ['mi_5ffree_5faligned_183',['mi_free_aligned',['../group__posix.html#ga0d28d5cf61e6bfbb18c63092939fe5c9',1,'mimalloc-doc.h']]],
-  ['mi_5ffree_5fsize_184',['mi_free_size',['../group__posix.html#gae01389eedab8d67341ff52e2aad80ebb',1,'mimalloc-doc.h']]],
-  ['mi_5ffree_5fsize_5faligned_185',['mi_free_size_aligned',['../group__posix.html#ga72e9d7ffb5fe94d69bc722c8506e27bc',1,'mimalloc-doc.h']]],
-  ['mi_5fgood_5fsize_186',['mi_good_size',['../group__extended.html#gac057927cd06c854b45fe7847e921bd47',1,'mimalloc-doc.h']]],
-  ['mi_5fheap_5fcalloc_187',['mi_heap_calloc',['../group__heap.html#gaa6702b3c48e9e53e50e81b36f5011d55',1,'mimalloc-doc.h']]],
-  ['mi_5fheap_5fcalloc_5faligned_188',['mi_heap_calloc_aligned',['../group__heap.html#ga4af03a6e2b93fae77424d93f889705c3',1,'mimalloc-doc.h']]],
-  ['mi_5fheap_5fcalloc_5faligned_5fat_189',['mi_heap_calloc_aligned_at',['../group__heap.html#ga08ca6419a5c057a4d965868998eef487',1,'mimalloc-doc.h']]],
-  ['mi_5fheap_5fcheck_5fowned_190',['mi_heap_check_owned',['../group__analysis.html#ga0d67c1789faaa15ff366c024fcaf6377',1,'mimalloc-doc.h']]],
-  ['mi_5fheap_5fcollect_191',['mi_heap_collect',['../group__heap.html#ga7922f7495cde30b1984d0e6072419298',1,'mimalloc-doc.h']]],
-  ['mi_5fheap_5fcontains_5fblock_192',['mi_heap_contains_block',['../group__analysis.html#gaa862aa8ed8d57d84cae41fc1022d71af',1,'mimalloc-doc.h']]],
-  ['mi_5fheap_5fdelete_193',['mi_heap_delete',['../group__heap.html#ga2ab1af8d438819b55319c7ef51d1e409',1,'mimalloc-doc.h']]],
-  ['mi_5fheap_5fdestroy_194',['mi_heap_destroy',['../group__heap.html#ga9f9c0844edb9717f4feacd79116b8e0d',1,'mimalloc-doc.h']]],
-  ['mi_5fheap_5fget_5fbacking_195',['mi_heap_get_backing',['../group__heap.html#ga5d03fbe062ffcf38f0f417fd968357fc',1,'mimalloc-doc.h']]],
-  ['mi_5fheap_5fget_5fdefault_196',['mi_heap_get_default',['../group__heap.html#ga8db4cbb87314a989a9a187464d6b5e05',1,'mimalloc-doc.h']]],
-  ['mi_5fheap_5fmalloc_197',['mi_heap_malloc',['../group__heap.html#ga9cbed01e42c0647907295de92c3fa296',1,'mimalloc-doc.h']]],
-  ['mi_5fheap_5fmalloc_5faligned_198',['mi_heap_malloc_aligned',['../group__heap.html#gab5b87e1805306f70df38789fcfcf6653',1,'mimalloc-doc.h']]],
-  ['mi_5fheap_5fmalloc_5faligned_5fat_199',['mi_heap_malloc_aligned_at',['../group__heap.html#ga23acd7680fb0976dde3783254c6c874b',1,'mimalloc-doc.h']]],
-  ['mi_5fheap_5fmalloc_5fsmall_200',['mi_heap_malloc_small',['../group__heap.html#gaa1a1c7a1f4da6826b5a25b70ef878368',1,'mimalloc-doc.h']]],
-  ['mi_5fheap_5fmallocn_201',['mi_heap_mallocn',['../group__heap.html#ga851da6c43fe0b71c1376cee8aef90db0',1,'mimalloc-doc.h']]],
-  ['mi_5fheap_5fnew_202',['mi_heap_new',['../group__heap.html#ga766f672ba56f2fbfeb9d9dbb0b7f6b11',1,'mimalloc-doc.h']]],
-  ['mi_5fheap_5frealloc_203',['mi_heap_realloc',['../group__heap.html#gaaef3395f66be48f37bdc8322509c5d81',1,'mimalloc-doc.h']]],
-  ['mi_5fheap_5frealloc_5faligned_204',['mi_heap_realloc_aligned',['../group__heap.html#gafc603b696bd14cae6da28658f950d98c',1,'mimalloc-doc.h']]],
-  ['mi_5fheap_5frealloc_5faligned_5fat_205',['mi_heap_realloc_aligned_at',['../group__heap.html#gaf96c788a1bf553fe2d371de9365e047c',1,'mimalloc-doc.h']]],
-  ['mi_5fheap_5freallocf_206',['mi_heap_reallocf',['../group__heap.html#ga4a21070eb4e7cce018133c8d5f4b0527',1,'mimalloc-doc.h']]],
-  ['mi_5fheap_5freallocn_207',['mi_heap_reallocn',['../group__heap.html#gac74e94ad9b0c9b57c1c4d88b8825b7a8',1,'mimalloc-doc.h']]],
-  ['mi_5fheap_5frealpath_208',['mi_heap_realpath',['../group__heap.html#ga00e95ba1e01acac3cfd95bb7a357a6f0',1,'mimalloc-doc.h']]],
-  ['mi_5fheap_5frecalloc_209',['mi_heap_recalloc',['../group__zeroinit.html#ga8648c5fbb22a80f0262859099f06dfbd',1,'mimalloc-doc.h']]],
-  ['mi_5fheap_5frecalloc_5faligned_210',['mi_heap_recalloc_aligned',['../group__zeroinit.html#ga9f3f999396c8f77ca5e80e7b40ac29e3',1,'mimalloc-doc.h']]],
-  ['mi_5fheap_5frecalloc_5faligned_5fat_211',['mi_heap_recalloc_aligned_at',['../group__zeroinit.html#ga496452c96f1de8c500be9fddf52edaf7',1,'mimalloc-doc.h']]],
-  ['mi_5fheap_5frezalloc_212',['mi_heap_rezalloc',['../group__zeroinit.html#gacfad83f14eb5d6a42a497a898e19fc76',1,'mimalloc-doc.h']]],
-  ['mi_5fheap_5frezalloc_5faligned_213',['mi_heap_rezalloc_aligned',['../group__zeroinit.html#ga375fa8a611c51905e592d5d467c49664',1,'mimalloc-doc.h']]],
-  ['mi_5fheap_5frezalloc_5faligned_5fat_214',['mi_heap_rezalloc_aligned_at',['../group__zeroinit.html#gac90da54fa7e5d10bdc97ce0b51dce2eb',1,'mimalloc-doc.h']]],
-  ['mi_5fheap_5fset_5fdefault_215',['mi_heap_set_default',['../group__heap.html#gab8631ec88c8d26641b68b5d25dcd4422',1,'mimalloc-doc.h']]],
-  ['mi_5fheap_5fstrdup_216',['mi_heap_strdup',['../group__heap.html#ga139d6b09dbf50c3c2523d0f4d1cfdeb5',1,'mimalloc-doc.h']]],
-  ['mi_5fheap_5fstrndup_217',['mi_heap_strndup',['../group__heap.html#ga8e3dbd46650dd26573cf307a2c8f1f5a',1,'mimalloc-doc.h']]],
-  ['mi_5fheap_5fvisit_5fblocks_218',['mi_heap_visit_blocks',['../group__analysis.html#ga70c46687dc6e9dc98b232b02646f8bed',1,'mimalloc-doc.h']]],
-  ['mi_5fheap_5fzalloc_219',['mi_heap_zalloc',['../group__heap.html#ga903104592c8ed53417a3762da6241133',1,'mimalloc-doc.h']]],
-  ['mi_5fheap_5fzalloc_5faligned_220',['mi_heap_zalloc_aligned',['../group__heap.html#gaa450a59c6c7ae5fdbd1c2b80a8329ef0',1,'mimalloc-doc.h']]],
-  ['mi_5fheap_5fzalloc_5faligned_5fat_221',['mi_heap_zalloc_aligned_at',['../group__heap.html#ga45fb43a62776fbebbdf1edd99b527954',1,'mimalloc-doc.h']]],
-  ['mi_5fis_5fin_5fheap_5fregion_222',['mi_is_in_heap_region',['../group__extended.html#ga5f071b10d4df1c3658e04e7fd67a94e6',1,'mimalloc-doc.h']]],
-  ['mi_5fis_5fredirected_223',['mi_is_redirected',['../group__extended.html#gaad25050b19f30cd79397b227e0157a3f',1,'mimalloc-doc.h']]],
-  ['mi_5fmalloc_224',['mi_malloc',['../group__malloc.html#ga3406e8b168bc74c8637b11571a6da83a',1,'mimalloc-doc.h']]],
-  ['mi_5fmalloc_5faligned_225',['mi_malloc_aligned',['../group__aligned.html#ga68930196751fa2cca9e1fd0d71bade56',1,'mimalloc-doc.h']]],
-  ['mi_5fmalloc_5faligned_5fat_226',['mi_malloc_aligned_at',['../group__aligned.html#ga5850da130c936bd77db039dcfbc8295d',1,'mimalloc-doc.h']]],
-  ['mi_5fmalloc_5fsize_227',['mi_malloc_size',['../group__posix.html#ga4531c9e775bb3ae12db57c1ba8a5d7de',1,'mimalloc-doc.h']]],
-  ['mi_5fmalloc_5fsmall_228',['mi_malloc_small',['../group__extended.html#ga7136c2e55cb22c98ecf95d08d6debb99',1,'mimalloc-doc.h']]],
-  ['mi_5fmalloc_5fusable_5fsize_229',['mi_malloc_usable_size',['../group__posix.html#ga06d07cf357bbac5c73ba5d0c0c421e17',1,'mimalloc-doc.h']]],
-  ['mi_5fmallocn_230',['mi_mallocn',['../group__malloc.html#ga0b05e2bf0f73e7401ae08597ff782ac6',1,'mimalloc-doc.h']]],
-  ['mi_5fmanage_5fos_5fmemory_231',['mi_manage_os_memory',['../group__extended.html#ga4c6486a1fdcd7a423b5f25fe4be8e0cf',1,'mimalloc-doc.h']]],
-  ['mi_5fmemalign_232',['mi_memalign',['../group__posix.html#gaab7fa71ea93b96873f5d9883db57d40e',1,'mimalloc-doc.h']]],
-  ['mi_5fnew_233',['mi_new',['../group__cpp.html#gaad048a9fce3d02c5909cd05c6ec24545',1,'mimalloc-doc.h']]],
-  ['mi_5fnew_5faligned_234',['mi_new_aligned',['../group__cpp.html#gaef2c2bdb4f70857902d3c8903ac095f3',1,'mimalloc-doc.h']]],
-  ['mi_5fnew_5faligned_5fnothrow_235',['mi_new_aligned_nothrow',['../group__cpp.html#gab5e29558926d934c3f1cae8c815f942c',1,'mimalloc-doc.h']]],
-  ['mi_5fnew_5fn_236',['mi_new_n',['../group__cpp.html#gae7bc4f56cd57ed3359060ff4f38bda81',1,'mimalloc-doc.h']]],
-  ['mi_5fnew_5fnothrow_237',['mi_new_nothrow',['../group__cpp.html#gaeaded64eda71ed6b1d569d3e723abc4a',1,'mimalloc-doc.h']]],
-  ['mi_5fnew_5frealloc_238',['mi_new_realloc',['../group__cpp.html#gaab78a32f55149e9fbf432d5288e38e1e',1,'mimalloc-doc.h']]],
-  ['mi_5fnew_5freallocn_239',['mi_new_reallocn',['../group__cpp.html#ga756f4b2bc6a7ecd0a90baea8e90c7907',1,'mimalloc-doc.h']]],
-  ['mi_5foption_5fdisable_240',['mi_option_disable',['../group__options.html#gaebf6ff707a2e688ebb1a2296ca564054',1,'mimalloc-doc.h']]],
-  ['mi_5foption_5fenable_241',['mi_option_enable',['../group__options.html#ga04180ae41b0d601421dd62ced40ca050',1,'mimalloc-doc.h']]],
-  ['mi_5foption_5fget_242',['mi_option_get',['../group__options.html#ga7e8af195cc81d3fa64ccf2662caa565a',1,'mimalloc-doc.h']]],
-  ['mi_5foption_5fis_5fenabled_243',['mi_option_is_enabled',['../group__options.html#ga459ad98f18b3fc9275474807fe0ca188',1,'mimalloc-doc.h']]],
-  ['mi_5foption_5fset_244',['mi_option_set',['../group__options.html#gaf84921c32375e25754dc2ee6a911fa60',1,'mimalloc-doc.h']]],
-  ['mi_5foption_5fset_5fdefault_245',['mi_option_set_default',['../group__options.html#ga7ef623e440e6e5545cb08c94e71e4b90',1,'mimalloc-doc.h']]],
-  ['mi_5foption_5fset_5fenabled_246',['mi_option_set_enabled',['../group__options.html#ga9a13d05fcb77489cb06d4d017ebd8bed',1,'mimalloc-doc.h']]],
-  ['mi_5foption_5fset_5fenabled_5fdefault_247',['mi_option_set_enabled_default',['../group__options.html#ga65518b69ec5d32336b50e07f74b3f629',1,'mimalloc-doc.h']]],
-  ['mi_5fposix_5fmemalign_248',['mi_posix_memalign',['../group__posix.html#gacff84f226ba9feb2031b8992e5579447',1,'mimalloc-doc.h']]],
-  ['mi_5fprocess_5finfo_249',['mi_process_info',['../group__extended.html#ga7d862c2affd5790381da14eb102a364d',1,'mimalloc-doc.h']]],
-  ['mi_5fpvalloc_250',['mi_pvalloc',['../group__posix.html#gaeb325c39b887d3b90d85d1eb1712fb1e',1,'mimalloc-doc.h']]],
-  ['mi_5frealloc_251',['mi_realloc',['../group__malloc.html#gaf11eb497da57bdfb2de65eb191c69db6',1,'mimalloc-doc.h']]],
-  ['mi_5frealloc_5faligned_252',['mi_realloc_aligned',['../group__aligned.html#ga4028d1cf4aa4c87c880747044a8322ae',1,'mimalloc-doc.h']]],
-  ['mi_5frealloc_5faligned_5fat_253',['mi_realloc_aligned_at',['../group__aligned.html#gaf66a9ae6c6f08bd6be6fb6ea771faffb',1,'mimalloc-doc.h']]],
-  ['mi_5freallocarr_254',['mi_reallocarr',['../group__posix.html#ga7e1934d60a3e697950eeb48e042bfad5',1,'mimalloc-doc.h']]],
-  ['mi_5freallocarray_255',['mi_reallocarray',['../group__posix.html#ga48fad8648a2f1dab9c87ea9448a52088',1,'mimalloc-doc.h']]],
-  ['mi_5freallocf_256',['mi_reallocf',['../group__malloc.html#gafe68ac7c5e24a65cd55c9d6b152211a0',1,'mimalloc-doc.h']]],
-  ['mi_5freallocn_257',['mi_reallocn',['../group__malloc.html#ga61d57b4144ba24fba5c1e9b956d13853',1,'mimalloc-doc.h']]],
-  ['mi_5frealpath_258',['mi_realpath',['../group__malloc.html#ga08cec32dd5bbe7da91c78d19f1b5bebe',1,'mimalloc-doc.h']]],
-  ['mi_5frecalloc_259',['mi_recalloc',['../group__malloc.html#ga23a0fbb452b5dce8e31fab1a1958cacc',1,'mimalloc-doc.h']]],
-  ['mi_5frecalloc_5faligned_260',['mi_recalloc_aligned',['../group__zeroinit.html#ga3e7e5c291acf1c7fd7ffd9914a9f945f',1,'mimalloc-doc.h']]],
-  ['mi_5frecalloc_5faligned_5fat_261',['mi_recalloc_aligned_at',['../group__zeroinit.html#ga4ff5e92ad73585418a072c9d059e5cf9',1,'mimalloc-doc.h']]],
-  ['mi_5fregister_5fdeferred_5ffree_262',['mi_register_deferred_free',['../group__extended.html#ga3460a6ca91af97be4058f523d3cb8ece',1,'mimalloc-doc.h']]],
-  ['mi_5fregister_5ferror_263',['mi_register_error',['../group__extended.html#gaa1d55e0e894be240827e5d87ec3a1f45',1,'mimalloc-doc.h']]],
-  ['mi_5fregister_5foutput_264',['mi_register_output',['../group__extended.html#gae5b17ff027cd2150b43a33040250cf3f',1,'mimalloc-doc.h']]],
-  ['mi_5freserve_5fhuge_5fos_5fpages_5fat_265',['mi_reserve_huge_os_pages_at',['../group__extended.html#ga7795a13d20087447281858d2c771cca1',1,'mimalloc-doc.h']]],
-  ['mi_5freserve_5fhuge_5fos_5fpages_5finterleave_266',['mi_reserve_huge_os_pages_interleave',['../group__extended.html#ga3132f521fb756fc0e8ec0b74fb58df50',1,'mimalloc-doc.h']]],
-  ['mi_5freserve_5fos_5fmemory_267',['mi_reserve_os_memory',['../group__extended.html#ga00ec3324b6b2591c7fe3677baa30a767',1,'mimalloc-doc.h']]],
-  ['mi_5frezalloc_268',['mi_rezalloc',['../group__zeroinit.html#ga8c292e142110229a2980b37ab036dbc6',1,'mimalloc-doc.h']]],
-  ['mi_5frezalloc_5faligned_269',['mi_rezalloc_aligned',['../group__zeroinit.html#gacd71a7bce96aab38ae6de17af2eb2cf0',1,'mimalloc-doc.h']]],
-  ['mi_5frezalloc_5faligned_5fat_270',['mi_rezalloc_aligned_at',['../group__zeroinit.html#gae8b358c417e61d5307da002702b0a8e1',1,'mimalloc-doc.h']]],
-  ['mi_5fstats_5fmerge_271',['mi_stats_merge',['../group__extended.html#ga854b1de8cb067c7316286c28b2fcd3d1',1,'mimalloc-doc.h']]],
-  ['mi_5fstats_5fprint_272',['mi_stats_print',['../group__extended.html#ga2d126e5c62d3badc35445e5d84166df2',1,'mimalloc-doc.h']]],
-  ['mi_5fstats_5fprint_5fout_273',['mi_stats_print_out',['../group__extended.html#ga537f13b299ddf801e49a5a94fde02c79',1,'mimalloc-doc.h']]],
-  ['mi_5fstats_5freset_274',['mi_stats_reset',['../group__extended.html#ga3bb8468b8cfcc6e2a61d98aee85c5f99',1,'mimalloc-doc.h']]],
-  ['mi_5fstrdup_275',['mi_strdup',['../group__malloc.html#gac7cffe13f1f458ed16789488bf92b9b2',1,'mimalloc-doc.h']]],
-  ['mi_5fstrndup_276',['mi_strndup',['../group__malloc.html#gaaabf971c2571891433477e2d21a35266',1,'mimalloc-doc.h']]],
-  ['mi_5fthread_5fdone_277',['mi_thread_done',['../group__extended.html#ga0ae4581e85453456a0d658b2b98bf7bf',1,'mimalloc-doc.h']]],
-  ['mi_5fthread_5finit_278',['mi_thread_init',['../group__extended.html#gaf8e73efc2cbca9ebfdfb166983a04c17',1,'mimalloc-doc.h']]],
-  ['mi_5fthread_5fstats_5fprint_5fout_279',['mi_thread_stats_print_out',['../group__extended.html#gab1dac8476c46cb9eecab767eb40c1525',1,'mimalloc-doc.h']]],
-  ['mi_5fusable_5fsize_280',['mi_usable_size',['../group__extended.html#ga089c859d9eddc5f9b4bd946cd53cebee',1,'mimalloc-doc.h']]],
-  ['mi_5fvalloc_281',['mi_valloc',['../group__posix.html#ga73baaf5951f5165ba0763d0c06b6a93b',1,'mimalloc-doc.h']]],
-  ['mi_5fzalloc_282',['mi_zalloc',['../group__malloc.html#gafdd9d8bb2986e668ba9884f28af38000',1,'mimalloc-doc.h']]],
-  ['mi_5fzalloc_5faligned_283',['mi_zalloc_aligned',['../group__aligned.html#ga0cadbcf5b89a7b6fb171bc8df8734819',1,'mimalloc-doc.h']]],
-  ['mi_5fzalloc_5faligned_5fat_284',['mi_zalloc_aligned_at',['../group__aligned.html#ga5f8c2353766db522565e642fafd8a3f8',1,'mimalloc-doc.h']]],
-  ['mi_5fzalloc_5fsmall_285',['mi_zalloc_small',['../group__extended.html#ga220f29f40a44404b0061c15bc1c31152',1,'mimalloc-doc.h']]]
+  ['mi_5f_5fexpand_0',['mi__expand',['../group__posix.html#ga66bcfeb4faedbb42b796bc680821ef84',1,'mimalloc-doc.h']]],
+  ['mi_5f_5fposix_5fmemalign_1',['mi__posix_memalign',['../group__posix.html#gad5a69c8fea96aa2b7a7c818c2130090a',1,'mimalloc-doc.h']]],
+  ['mi_5fabandoned_5fvisit_5fblocks_2',['mi_abandoned_visit_blocks',['../group__analysis.html#ga6a4865a887b2ec5247854af61562503c',1,'mimalloc-doc.h']]],
+  ['mi_5faligned_5falloc_3',['mi_aligned_alloc',['../group__posix.html#ga430ed1513f0571ff83be00ec58a98ee0',1,'mimalloc-doc.h']]],
+  ['mi_5faligned_5foffset_5frecalloc_4',['mi_aligned_offset_recalloc',['../group__posix.html#ga16570deddd559001b44953eedbad0084',1,'mimalloc-doc.h']]],
+  ['mi_5faligned_5frecalloc_5',['mi_aligned_recalloc',['../group__posix.html#gaf82cbb4b4f24acf723348628451798d3',1,'mimalloc-doc.h']]],
+  ['mi_5farena_5farea_6',['mi_arena_area',['../group__extended.html#ga9a25a00a22151619a0be91a10af7787f',1,'mimalloc-doc.h']]],
+  ['mi_5fcalloc_7',['mi_calloc',['../group__malloc.html#ga6686568014b54d1e6c7ac64a076e4f56',1,'mimalloc-doc.h']]],
+  ['mi_5fcalloc_5faligned_8',['mi_calloc_aligned',['../group__aligned.html#ga424ef386fb1f9f8e0a86ab53f16eaaf1',1,'mimalloc-doc.h']]],
+  ['mi_5fcalloc_5faligned_5fat_9',['mi_calloc_aligned_at',['../group__aligned.html#ga977f96bd2c5c141bcd70e6685c90d6c3',1,'mimalloc-doc.h']]],
+  ['mi_5fcfree_10',['mi_cfree',['../group__posix.html#ga705dc7a64bffacfeeb0141501a5c35d7',1,'mimalloc-doc.h']]],
+  ['mi_5fcheck_5fowned_11',['mi_check_owned',['../group__analysis.html#ga628c237489c2679af84a4d0d143b3dd5',1,'mimalloc-doc.h']]],
+  ['mi_5fcollect_12',['mi_collect',['../group__extended.html#ga421430e2226d7d468529cec457396756',1,'mimalloc-doc.h']]],
+  ['mi_5fdebug_5fshow_5farenas_13',['mi_debug_show_arenas',['../group__extended.html#gad7439207f8f71fb6c382a9ea20b997e7',1,'mimalloc-doc.h']]],
+  ['mi_5fdupenv_5fs_14',['mi_dupenv_s',['../group__posix.html#gab41369c1a1da7504013a7a0b1d4dd958',1,'mimalloc-doc.h']]],
+  ['mi_5fexpand_15',['mi_expand',['../group__malloc.html#ga19299856216cfbb08e2628593654dfb0',1,'mimalloc-doc.h']]],
+  ['mi_5ffree_16',['mi_free',['../group__malloc.html#gaf2c7b89c327d1f60f59e68b9ea644d95',1,'mimalloc-doc.h']]],
+  ['mi_5ffree_5faligned_17',['mi_free_aligned',['../group__posix.html#ga0d28d5cf61e6bfbb18c63092939fe5c9',1,'mimalloc-doc.h']]],
+  ['mi_5ffree_5fsize_18',['mi_free_size',['../group__posix.html#gae01389eedab8d67341ff52e2aad80ebb',1,'mimalloc-doc.h']]],
+  ['mi_5ffree_5fsize_5faligned_19',['mi_free_size_aligned',['../group__posix.html#ga72e9d7ffb5fe94d69bc722c8506e27bc',1,'mimalloc-doc.h']]],
+  ['mi_5fgood_5fsize_20',['mi_good_size',['../group__extended.html#gac057927cd06c854b45fe7847e921bd47',1,'mimalloc-doc.h']]],
+  ['mi_5fheap_5fcalloc_21',['mi_heap_calloc',['../group__heap.html#gac0098aaf231d3e9586c73136d5df95da',1,'mimalloc-doc.h']]],
+  ['mi_5fheap_5fcalloc_5faligned_22',['mi_heap_calloc_aligned',['../group__heap.html#gacafcc26df827c7a7de5e850217566108',1,'mimalloc-doc.h']]],
+  ['mi_5fheap_5fcalloc_5faligned_5fat_23',['mi_heap_calloc_aligned_at',['../group__heap.html#gaa42ec2079989c4374f2c331d9b35f4e4',1,'mimalloc-doc.h']]],
+  ['mi_5fheap_5fcheck_5fowned_24',['mi_heap_check_owned',['../group__analysis.html#ga0d67c1789faaa15ff366c024fcaf6377',1,'mimalloc-doc.h']]],
+  ['mi_5fheap_5fcollect_25',['mi_heap_collect',['../group__heap.html#ga7922f7495cde30b1984d0e6072419298',1,'mimalloc-doc.h']]],
+  ['mi_5fheap_5fcontains_5fblock_26',['mi_heap_contains_block',['../group__analysis.html#gaa862aa8ed8d57d84cae41fc1022d71af',1,'mimalloc-doc.h']]],
+  ['mi_5fheap_5fdelete_27',['mi_heap_delete',['../group__heap.html#ga2ab1af8d438819b55319c7ef51d1e409',1,'mimalloc-doc.h']]],
+  ['mi_5fheap_5fdestroy_28',['mi_heap_destroy',['../group__heap.html#ga9f9c0844edb9717f4feacd79116b8e0d',1,'mimalloc-doc.h']]],
+  ['mi_5fheap_5fget_5fbacking_29',['mi_heap_get_backing',['../group__heap.html#gac6ac9f0e7be9ab4ff70acfc8dad1235a',1,'mimalloc-doc.h']]],
+  ['mi_5fheap_5fget_5fdefault_30',['mi_heap_get_default',['../group__heap.html#ga14c667a6e2c5d28762d8cb7d4e057909',1,'mimalloc-doc.h']]],
+  ['mi_5fheap_5fmalloc_31',['mi_heap_malloc',['../group__heap.html#gab374e206c7034e0d899fb934e4f4a863',1,'mimalloc-doc.h']]],
+  ['mi_5fheap_5fmalloc_5faligned_32',['mi_heap_malloc_aligned',['../group__heap.html#ga33f4f05b7fea7af2113c62a4bf882cc5',1,'mimalloc-doc.h']]],
+  ['mi_5fheap_5fmalloc_5faligned_5fat_33',['mi_heap_malloc_aligned_at',['../group__heap.html#gae7ffc045c3996497a7f3a5f6fe7b8aaa',1,'mimalloc-doc.h']]],
+  ['mi_5fheap_5fmalloc_5fsmall_34',['mi_heap_malloc_small',['../group__heap.html#ga012c5c8abe22b10043de39ff95909541',1,'mimalloc-doc.h']]],
+  ['mi_5fheap_5fmallocn_35',['mi_heap_mallocn',['../group__heap.html#gab0f755c0b21c387fe8e9024200faa372',1,'mimalloc-doc.h']]],
+  ['mi_5fheap_5fnew_36',['mi_heap_new',['../group__heap.html#gaa718bb226ec0546ba6d1b6cb32179f3a',1,'mimalloc-doc.h']]],
+  ['mi_5fheap_5fnew_5fex_37',['mi_heap_new_ex',['../group__extended.html#ga3ae360583f4351aa5267ee7e43008faf',1,'mimalloc-doc.h']]],
+  ['mi_5fheap_5fnew_5fin_5farena_38',['mi_heap_new_in_arena',['../group__extended.html#gaaf2d9976576d5efd5544be12848af949',1,'mimalloc-doc.h']]],
+  ['mi_5fheap_5frealloc_39',['mi_heap_realloc',['../group__heap.html#gac5252d6a2e510bd349e4fcb452e6a93a',1,'mimalloc-doc.h']]],
+  ['mi_5fheap_5frealloc_5faligned_40',['mi_heap_realloc_aligned',['../group__heap.html#gaccf8c249872f30bf1c2493a09197d734',1,'mimalloc-doc.h']]],
+  ['mi_5fheap_5frealloc_5faligned_5fat_41',['mi_heap_realloc_aligned_at',['../group__heap.html#ga6df988a7219d5707f010d5f3eb0dc3f5',1,'mimalloc-doc.h']]],
+  ['mi_5fheap_5freallocf_42',['mi_heap_reallocf',['../group__heap.html#gae7cd171425bee04c683c65a3701f0b4a',1,'mimalloc-doc.h']]],
+  ['mi_5fheap_5freallocn_43',['mi_heap_reallocn',['../group__heap.html#gaccf7bfe10ce510a000d3547d9cf7fa29',1,'mimalloc-doc.h']]],
+  ['mi_5fheap_5frealpath_44',['mi_heap_realpath',['../group__heap.html#ga55545a3ec6da29c5b4f62e540ecac1e2',1,'mimalloc-doc.h']]],
+  ['mi_5fheap_5frecalloc_45',['mi_heap_recalloc',['../group__zeroinit.html#gad1a0d325d930eeb80f25e3fea37aacde',1,'mimalloc-doc.h']]],
+  ['mi_5fheap_5frecalloc_5faligned_46',['mi_heap_recalloc_aligned',['../group__zeroinit.html#ga87ddd674bf1c67237d780d0b9e0f0f32',1,'mimalloc-doc.h']]],
+  ['mi_5fheap_5frecalloc_5faligned_5fat_47',['mi_heap_recalloc_aligned_at',['../group__zeroinit.html#ga07b5bcbaf00d0d2e598c232982588496',1,'mimalloc-doc.h']]],
+  ['mi_5fheap_5frezalloc_48',['mi_heap_rezalloc',['../group__zeroinit.html#ga8d8b7ebb24b513cd84d1a696048da60d',1,'mimalloc-doc.h']]],
+  ['mi_5fheap_5frezalloc_5faligned_49',['mi_heap_rezalloc_aligned',['../group__zeroinit.html#ga5129f6dc46ee1613d918820a8a0533a7',1,'mimalloc-doc.h']]],
+  ['mi_5fheap_5frezalloc_5faligned_5fat_50',['mi_heap_rezalloc_aligned_at',['../group__zeroinit.html#ga2bafa79c3f98ea74882349d44cffa5d9',1,'mimalloc-doc.h']]],
+  ['mi_5fheap_5fset_5fdefault_51',['mi_heap_set_default',['../group__heap.html#ga349b677dec7da5eacdbc7a385bd62a4a',1,'mimalloc-doc.h']]],
+  ['mi_5fheap_5fstrdup_52',['mi_heap_strdup',['../group__heap.html#ga5754e09ccc51dd6bc73885bb6ea21b7a',1,'mimalloc-doc.h']]],
+  ['mi_5fheap_5fstrndup_53',['mi_heap_strndup',['../group__heap.html#gad224df78f1fbee942df8adf023e12cf3',1,'mimalloc-doc.h']]],
+  ['mi_5fheap_5fvisit_5fblocks_54',['mi_heap_visit_blocks',['../group__analysis.html#ga70c46687dc6e9dc98b232b02646f8bed',1,'mimalloc-doc.h']]],
+  ['mi_5fheap_5fzalloc_55',['mi_heap_zalloc',['../group__heap.html#gabebc796399619d964d8db77aa835e8c1',1,'mimalloc-doc.h']]],
+  ['mi_5fheap_5fzalloc_5faligned_56',['mi_heap_zalloc_aligned',['../group__heap.html#ga6466bde8b5712aa34e081a8317f9f471',1,'mimalloc-doc.h']]],
+  ['mi_5fheap_5fzalloc_5faligned_5fat_57',['mi_heap_zalloc_aligned_at',['../group__heap.html#ga484e3d01cd174f78c7e53370e5a7c819',1,'mimalloc-doc.h']]],
+  ['mi_5fis_5fin_5fheap_5fregion_58',['mi_is_in_heap_region',['../group__extended.html#ga5f071b10d4df1c3658e04e7fd67a94e6',1,'mimalloc-doc.h']]],
+  ['mi_5fis_5fredirected_59',['mi_is_redirected',['../group__extended.html#gaad25050b19f30cd79397b227e0157a3f',1,'mimalloc-doc.h']]],
+  ['mi_5fmalloc_60',['mi_malloc',['../group__malloc.html#gae1dd97b542420c87ae085e822b1229e8',1,'mimalloc-doc.h']]],
+  ['mi_5fmalloc_5faligned_61',['mi_malloc_aligned',['../group__aligned.html#ga69578ff1a98ca16e1dcd02c0995cd65c',1,'mimalloc-doc.h']]],
+  ['mi_5fmalloc_5faligned_5fat_62',['mi_malloc_aligned_at',['../group__aligned.html#ga2022f71b95a7cd6cce1b6e07752ae8ca',1,'mimalloc-doc.h']]],
+  ['mi_5fmalloc_5fgood_5fsize_63',['mi_malloc_good_size',['../group__posix.html#ga9d23ac7885fed7413c11d8e0ffa31071',1,'mimalloc-doc.h']]],
+  ['mi_5fmalloc_5fsize_64',['mi_malloc_size',['../group__posix.html#ga4531c9e775bb3ae12db57c1ba8a5d7de',1,'mimalloc-doc.h']]],
+  ['mi_5fmalloc_5fsmall_65',['mi_malloc_small',['../group__extended.html#ga7f050bc6b897da82692174f5fce59cde',1,'mimalloc-doc.h']]],
+  ['mi_5fmalloc_5fusable_5fsize_66',['mi_malloc_usable_size',['../group__posix.html#ga06d07cf357bbac5c73ba5d0c0c421e17',1,'mimalloc-doc.h']]],
+  ['mi_5fmallocn_67',['mi_mallocn',['../group__malloc.html#ga61f46bade3db76ca24aaafedc40de7b6',1,'mimalloc-doc.h']]],
+  ['mi_5fmanage_5fos_5fmemory_68',['mi_manage_os_memory',['../group__extended.html#ga4c6486a1fdcd7a423b5f25fe4be8e0cf',1,'mimalloc-doc.h']]],
+  ['mi_5fmanage_5fos_5fmemory_5fex_69',['mi_manage_os_memory_ex',['../group__extended.html#ga41ce8525d77bbb60f618fa1029994f6e',1,'mimalloc-doc.h']]],
+  ['mi_5fmbsdup_70',['mi_mbsdup',['../group__posix.html#ga7b82a44094fdec4d2084eb4288a979b0',1,'mimalloc-doc.h']]],
+  ['mi_5fmemalign_71',['mi_memalign',['../group__posix.html#ga726867f13fd29ca36064954c0285b1d8',1,'mimalloc-doc.h']]],
+  ['mi_5fnew_72',['mi_new',['../group__cpp.html#ga633d96e3bc7011f960df9f3b2731fc6a',1,'mimalloc-doc.h']]],
+  ['mi_5fnew_5faligned_73',['mi_new_aligned',['../group__cpp.html#ga79c54da0b4b4ce9fcc11d2f6ef6675f8',1,'mimalloc-doc.h']]],
+  ['mi_5fnew_5faligned_5fnothrow_74',['mi_new_aligned_nothrow',['../group__cpp.html#ga92ae00b6dd64406c7e64557711ec04b7',1,'mimalloc-doc.h']]],
+  ['mi_5fnew_5fn_75',['mi_new_n',['../group__cpp.html#gadd11b85c15d21d308386844b5233856c',1,'mimalloc-doc.h']]],
+  ['mi_5fnew_5fnothrow_76',['mi_new_nothrow',['../group__cpp.html#ga5cb4f120d1f7296074256215aa9a9e54',1,'mimalloc-doc.h']]],
+  ['mi_5fnew_5frealloc_77',['mi_new_realloc',['../group__cpp.html#ga6867d89baf992728e0cc20a1f47db4d0',1,'mimalloc-doc.h']]],
+  ['mi_5fnew_5freallocn_78',['mi_new_reallocn',['../group__cpp.html#gaace912ce086682d56f3ce9f7638d9d67',1,'mimalloc-doc.h']]],
+  ['mi_5foption_5fdisable_79',['mi_option_disable',['../group__options.html#gaebf6ff707a2e688ebb1a2296ca564054',1,'mimalloc-doc.h']]],
+  ['mi_5foption_5fenable_80',['mi_option_enable',['../group__options.html#ga04180ae41b0d601421dd62ced40ca050',1,'mimalloc-doc.h']]],
+  ['mi_5foption_5fget_81',['mi_option_get',['../group__options.html#ga7e8af195cc81d3fa64ccf2662caa565a',1,'mimalloc-doc.h']]],
+  ['mi_5foption_5fget_5fclamp_82',['mi_option_get_clamp',['../group__options.html#ga96ad9c406338bd314cfe878cfc9bf723',1,'mimalloc-doc.h']]],
+  ['mi_5foption_5fget_5fsize_83',['mi_option_get_size',['../group__options.html#ga274db5a6ac87cc24ef0b23e7006ed02c',1,'mimalloc-doc.h']]],
+  ['mi_5foption_5fis_5fenabled_84',['mi_option_is_enabled',['../group__options.html#ga459ad98f18b3fc9275474807fe0ca188',1,'mimalloc-doc.h']]],
+  ['mi_5foption_5fset_85',['mi_option_set',['../group__options.html#gaf84921c32375e25754dc2ee6a911fa60',1,'mimalloc-doc.h']]],
+  ['mi_5foption_5fset_5fdefault_86',['mi_option_set_default',['../group__options.html#ga7ef623e440e6e5545cb08c94e71e4b90',1,'mimalloc-doc.h']]],
+  ['mi_5foption_5fset_5fenabled_87',['mi_option_set_enabled',['../group__options.html#ga9a13d05fcb77489cb06d4d017ebd8bed',1,'mimalloc-doc.h']]],
+  ['mi_5foption_5fset_5fenabled_5fdefault_88',['mi_option_set_enabled_default',['../group__options.html#ga65518b69ec5d32336b50e07f74b3f629',1,'mimalloc-doc.h']]],
+  ['mi_5fposix_5fmemalign_89',['mi_posix_memalign',['../group__posix.html#gacff84f226ba9feb2031b8992e5579447',1,'mimalloc-doc.h']]],
+  ['mi_5fprocess_5finfo_90',['mi_process_info',['../group__extended.html#ga7d862c2affd5790381da14eb102a364d',1,'mimalloc-doc.h']]],
+  ['mi_5fpvalloc_91',['mi_pvalloc',['../group__posix.html#ga644bebccdbb2821542dd8c7e7641f476',1,'mimalloc-doc.h']]],
+  ['mi_5frealloc_92',['mi_realloc',['../group__malloc.html#ga0621af6a5e3aa384e6a1b548958bf583',1,'mimalloc-doc.h']]],
+  ['mi_5frealloc_5faligned_93',['mi_realloc_aligned',['../group__aligned.html#ga5d7a46d054b4d7abe9d8d2474add2edf',1,'mimalloc-doc.h']]],
+  ['mi_5frealloc_5faligned_5fat_94',['mi_realloc_aligned_at',['../group__aligned.html#gad06dcf2bb8faadb2c8ea61ee5d24bbf6',1,'mimalloc-doc.h']]],
+  ['mi_5freallocarr_95',['mi_reallocarr',['../group__posix.html#ga7e1934d60a3e697950eeb48e042bfad5',1,'mimalloc-doc.h']]],
+  ['mi_5freallocarray_96',['mi_reallocarray',['../group__posix.html#gadfeccb72748a2f6305474a37d9d57bce',1,'mimalloc-doc.h']]],
+  ['mi_5freallocf_97',['mi_reallocf',['../group__malloc.html#ga4dc3a4067037b151a64629fe8a332641',1,'mimalloc-doc.h']]],
+  ['mi_5freallocn_98',['mi_reallocn',['../group__malloc.html#ga8bddfb4a1270a0854bbcf44cb3980467',1,'mimalloc-doc.h']]],
+  ['mi_5frealpath_99',['mi_realpath',['../group__malloc.html#ga94c3afcc086e85d75a57e9f76b9b71dd',1,'mimalloc-doc.h']]],
+  ['mi_5frecalloc_100',['mi_recalloc',['../group__malloc.html#ga23a0fbb452b5dce8e31fab1a1958cacc',1,'mimalloc-doc.h']]],
+  ['mi_5frecalloc_5faligned_101',['mi_recalloc_aligned',['../group__zeroinit.html#ga3e2169b48683aa0ab64f813fd68d839e',1,'mimalloc-doc.h']]],
+  ['mi_5frecalloc_5faligned_5fat_102',['mi_recalloc_aligned_at',['../group__zeroinit.html#gaae25e4ddedd4e0fb61b1a8bd5d452750',1,'mimalloc-doc.h']]],
+  ['mi_5fregister_5fdeferred_5ffree_103',['mi_register_deferred_free',['../group__extended.html#ga3460a6ca91af97be4058f523d3cb8ece',1,'mimalloc-doc.h']]],
+  ['mi_5fregister_5ferror_104',['mi_register_error',['../group__extended.html#gaa1d55e0e894be240827e5d87ec3a1f45',1,'mimalloc-doc.h']]],
+  ['mi_5fregister_5foutput_105',['mi_register_output',['../group__extended.html#gae5b17ff027cd2150b43a33040250cf3f',1,'mimalloc-doc.h']]],
+  ['mi_5freserve_5fhuge_5fos_5fpages_5fat_106',['mi_reserve_huge_os_pages_at',['../group__extended.html#ga7795a13d20087447281858d2c771cca1',1,'mimalloc-doc.h']]],
+  ['mi_5freserve_5fhuge_5fos_5fpages_5fat_5fex_107',['mi_reserve_huge_os_pages_at_ex',['../group__extended.html#ga591aab1c2bc2ca920e33f0f9f9cb5c52',1,'mimalloc-doc.h']]],
+  ['mi_5freserve_5fhuge_5fos_5fpages_5finterleave_108',['mi_reserve_huge_os_pages_interleave',['../group__extended.html#ga3132f521fb756fc0e8ec0b74fb58df50',1,'mimalloc-doc.h']]],
+  ['mi_5freserve_5fos_5fmemory_109',['mi_reserve_os_memory',['../group__extended.html#ga00ec3324b6b2591c7fe3677baa30a767',1,'mimalloc-doc.h']]],
+  ['mi_5freserve_5fos_5fmemory_5fex_110',['mi_reserve_os_memory_ex',['../group__extended.html#ga32f519797fd9a81acb4f52d36e6d751b',1,'mimalloc-doc.h']]],
+  ['mi_5frezalloc_111',['mi_rezalloc',['../group__zeroinit.html#gadfd34cd7b4f2bbda7ae06367a6360756',1,'mimalloc-doc.h']]],
+  ['mi_5frezalloc_5faligned_112',['mi_rezalloc_aligned',['../group__zeroinit.html#ga4d02404fe1e7db00beb65f185e012caa',1,'mimalloc-doc.h']]],
+  ['mi_5frezalloc_5faligned_5fat_113',['mi_rezalloc_aligned_at',['../group__zeroinit.html#ga6843a88285bbfcc3bdfccc60aafd1270',1,'mimalloc-doc.h']]],
+  ['mi_5fstats_5fmerge_114',['mi_stats_merge',['../group__extended.html#ga854b1de8cb067c7316286c28b2fcd3d1',1,'mimalloc-doc.h']]],
+  ['mi_5fstats_5fprint_115',['mi_stats_print',['../group__extended.html#ga2d126e5c62d3badc35445e5d84166df2',1,'mimalloc-doc.h']]],
+  ['mi_5fstats_5fprint_5fout_116',['mi_stats_print_out',['../group__extended.html#ga537f13b299ddf801e49a5a94fde02c79',1,'mimalloc-doc.h']]],
+  ['mi_5fstats_5freset_117',['mi_stats_reset',['../group__extended.html#ga3bb8468b8cfcc6e2a61d98aee85c5f99',1,'mimalloc-doc.h']]],
+  ['mi_5fstrdup_118',['mi_strdup',['../group__malloc.html#ga245ac90ebc2cfdd17de599e5fea59889',1,'mimalloc-doc.h']]],
+  ['mi_5fstrndup_119',['mi_strndup',['../group__malloc.html#ga486d0d26b3b3794f6d1cdb41a9aed92d',1,'mimalloc-doc.h']]],
+  ['mi_5fsubproc_5fadd_5fcurrent_5fthread_120',['mi_subproc_add_current_thread',['../group__extended.html#gadbc53414eb68b275588ec001ce1ddc7c',1,'mimalloc-doc.h']]],
+  ['mi_5fsubproc_5fdelete_121',['mi_subproc_delete',['../group__extended.html#gaa7d263e9429bac9ac8345c9d25de610e',1,'mimalloc-doc.h']]],
+  ['mi_5fsubproc_5fmain_122',['mi_subproc_main',['../group__extended.html#ga2ecba0d7ebdc99e71bb985c4a1609806',1,'mimalloc-doc.h']]],
+  ['mi_5fsubproc_5fnew_123',['mi_subproc_new',['../group__extended.html#ga8068cac328e41fa2170faef707315243',1,'mimalloc-doc.h']]],
+  ['mi_5fthread_5fdone_124',['mi_thread_done',['../group__extended.html#ga0ae4581e85453456a0d658b2b98bf7bf',1,'mimalloc-doc.h']]],
+  ['mi_5fthread_5finit_125',['mi_thread_init',['../group__extended.html#gaf8e73efc2cbca9ebfdfb166983a04c17',1,'mimalloc-doc.h']]],
+  ['mi_5fthread_5fstats_5fprint_5fout_126',['mi_thread_stats_print_out',['../group__extended.html#gab1dac8476c46cb9eecab767eb40c1525',1,'mimalloc-doc.h']]],
+  ['mi_5fusable_5fsize_127',['mi_usable_size',['../group__extended.html#ga089c859d9eddc5f9b4bd946cd53cebee',1,'mimalloc-doc.h']]],
+  ['mi_5fvalloc_128',['mi_valloc',['../group__posix.html#ga50cafb9722020402f065de93799f64ca',1,'mimalloc-doc.h']]],
+  ['mi_5fwcsdup_129',['mi_wcsdup',['../group__posix.html#gaa9fd7f25c9ac3a20e89b33bd6e383fcf',1,'mimalloc-doc.h']]],
+  ['mi_5fwdupenv_5fs_130',['mi_wdupenv_s',['../group__posix.html#ga6ac6a6a8f3c96f1af24bb8d0439cbbd1',1,'mimalloc-doc.h']]],
+  ['mi_5fzalloc_131',['mi_zalloc',['../group__malloc.html#gae6e38c4403247a7b40d80419e093bfb8',1,'mimalloc-doc.h']]],
+  ['mi_5fzalloc_5faligned_132',['mi_zalloc_aligned',['../group__aligned.html#gaac7d0beb782f9b9ac31f47492b130f82',1,'mimalloc-doc.h']]],
+  ['mi_5fzalloc_5faligned_5fat_133',['mi_zalloc_aligned_at',['../group__aligned.html#ga7c1778805ce50ebbf02ccbd5e39d5dba',1,'mimalloc-doc.h']]],
+  ['mi_5fzalloc_5fsmall_134',['mi_zalloc_small',['../group__extended.html#ga51c47637e81df0e2f13a2d7a2dec123e',1,'mimalloc-doc.h']]]
 ];
diff --git a/depends/mimalloc/docs/search/groups_0.js b/depends/mimalloc/docs/search/groups_0.js
index 0ed99b804cea..d371a39915e0 100644
--- a/depends/mimalloc/docs/search/groups_0.js
+++ b/depends/mimalloc/docs/search/groups_0.js
@@ -1,4 +1,6 @@
 var searchData=
 [
-  ['aligned_20allocation_314',['Aligned Allocation',['../group__aligned.html',1,'']]]
+  ['aligned_20allocation_0',['Aligned Allocation',['../group__aligned.html',1,'']]],
+  ['allocation_1',['Allocation',['../group__aligned.html',1,'Aligned Allocation'],['../group__malloc.html',1,'Basic Allocation'],['../group__heap.html',1,'Heap Allocation']]],
+  ['allocation_2',['Zero initialized re-allocation',['../group__zeroinit.html',1,'']]]
 ];
diff --git a/depends/mimalloc/docs/search/groups_1.js b/depends/mimalloc/docs/search/groups_1.js
index f27c5847a097..8fca27170125 100644
--- a/depends/mimalloc/docs/search/groups_1.js
+++ b/depends/mimalloc/docs/search/groups_1.js
@@ -1,4 +1,4 @@
 var searchData=
 [
-  ['basic_20allocation_315',['Basic Allocation',['../group__malloc.html',1,'']]]
+  ['basic_20allocation_0',['Basic Allocation',['../group__malloc.html',1,'']]]
 ];
diff --git a/depends/mimalloc/docs/search/groups_2.js b/depends/mimalloc/docs/search/groups_2.js
index 6da64b68be2a..d260dec8a03d 100644
--- a/depends/mimalloc/docs/search/groups_2.js
+++ b/depends/mimalloc/docs/search/groups_2.js
@@ -1,4 +1,4 @@
 var searchData=
 [
-  ['c_2b_2b_20wrappers_316',['C++ wrappers',['../group__cpp.html',1,'']]]
+  ['c_20wrappers_0',['C++ wrappers',['../group__cpp.html',1,'']]]
 ];
diff --git a/depends/mimalloc/docs/search/groups_3.js b/depends/mimalloc/docs/search/groups_3.js
index cdfbe640a16a..7099da010d37 100644
--- a/depends/mimalloc/docs/search/groups_3.js
+++ b/depends/mimalloc/docs/search/groups_3.js
@@ -1,4 +1,4 @@
 var searchData=
 [
-  ['extended_20functions_317',['Extended Functions',['../group__extended.html',1,'']]]
+  ['extended_20functions_0',['Extended Functions',['../group__extended.html',1,'']]]
 ];
diff --git a/depends/mimalloc/docs/search/groups_4.js b/depends/mimalloc/docs/search/groups_4.js
index 687f1ea72825..87efcce9a042 100644
--- a/depends/mimalloc/docs/search/groups_4.js
+++ b/depends/mimalloc/docs/search/groups_4.js
@@ -1,5 +1,4 @@
 var searchData=
 [
-  ['heap_20allocation_318',['Heap Allocation',['../group__heap.html',1,'']]],
-  ['heap_20introspection_319',['Heap Introspection',['../group__analysis.html',1,'']]]
+  ['functions_0',['Extended Functions',['../group__extended.html',1,'']]]
 ];
diff --git a/depends/mimalloc/docs/search/groups_5.js b/depends/mimalloc/docs/search/groups_5.js
index 43c8b1fc4743..3131f4a2ec05 100644
--- a/depends/mimalloc/docs/search/groups_5.js
+++ b/depends/mimalloc/docs/search/groups_5.js
@@ -1,4 +1,5 @@
 var searchData=
 [
-  ['posix_320',['Posix',['../group__posix.html',1,'']]]
+  ['heap_20allocation_0',['Heap Allocation',['../group__heap.html',1,'']]],
+  ['heap_20introspection_1',['Heap Introspection',['../group__analysis.html',1,'']]]
 ];
diff --git a/depends/mimalloc/docs/search/groups_6.js b/depends/mimalloc/docs/search/groups_6.js
index 346318794bc3..6d20843280ff 100644
--- a/depends/mimalloc/docs/search/groups_6.js
+++ b/depends/mimalloc/docs/search/groups_6.js
@@ -1,4 +1,5 @@
 var searchData=
 [
-  ['runtime_20options_321',['Runtime Options',['../group__options.html',1,'']]]
+  ['initialized_20re_20allocation_0',['Zero initialized re-allocation',['../group__zeroinit.html',1,'']]],
+  ['introspection_1',['Heap Introspection',['../group__analysis.html',1,'']]]
 ];
diff --git a/depends/mimalloc/docs/search/groups_7.js b/depends/mimalloc/docs/search/groups_7.js
index aa150e973f4b..aafc4dae67f3 100644
--- a/depends/mimalloc/docs/search/groups_7.js
+++ b/depends/mimalloc/docs/search/groups_7.js
@@ -1,4 +1,4 @@
 var searchData=
 [
-  ['typed_20macros_322',['Typed Macros',['../group__typed.html',1,'']]]
+  ['macros_0',['Typed Macros',['../group__typed.html',1,'']]]
 ];
diff --git a/depends/mimalloc/docs/search/groups_8.js b/depends/mimalloc/docs/search/groups_8.js
index f9c29fe3bc1d..30681f7b5cd7 100644
--- a/depends/mimalloc/docs/search/groups_8.js
+++ b/depends/mimalloc/docs/search/groups_8.js
@@ -1,4 +1,4 @@
 var searchData=
 [
-  ['zero_20initialized_20re_2dallocation_323',['Zero initialized re-allocation',['../group__zeroinit.html',1,'']]]
+  ['options_0',['Runtime Options',['../group__options.html',1,'']]]
 ];
diff --git a/depends/mimalloc/docs/search/groups_9.js b/depends/mimalloc/docs/search/groups_9.js
new file mode 100644
index 000000000000..bc3429469219
--- /dev/null
+++ b/depends/mimalloc/docs/search/groups_9.js
@@ -0,0 +1,4 @@
+var searchData=
+[
+  ['posix_0',['Posix',['../group__posix.html',1,'']]]
+];
diff --git a/depends/mimalloc/docs/search/groups_a.js b/depends/mimalloc/docs/search/groups_a.js
new file mode 100644
index 000000000000..5f2947aafb6b
--- /dev/null
+++ b/depends/mimalloc/docs/search/groups_a.js
@@ -0,0 +1,5 @@
+var searchData=
+[
+  ['re_20allocation_0',['Zero initialized re-allocation',['../group__zeroinit.html',1,'']]],
+  ['runtime_20options_1',['Runtime Options',['../group__options.html',1,'']]]
+];
diff --git a/depends/mimalloc/docs/search/groups_b.js b/depends/mimalloc/docs/search/groups_b.js
new file mode 100644
index 000000000000..56eb25eae6e9
--- /dev/null
+++ b/depends/mimalloc/docs/search/groups_b.js
@@ -0,0 +1,4 @@
+var searchData=
+[
+  ['typed_20macros_0',['Typed Macros',['../group__typed.html',1,'']]]
+];
diff --git a/depends/mimalloc/docs/search/groups_c.js b/depends/mimalloc/docs/search/groups_c.js
new file mode 100644
index 000000000000..8f445b9fc8c2
--- /dev/null
+++ b/depends/mimalloc/docs/search/groups_c.js
@@ -0,0 +1,4 @@
+var searchData=
+[
+  ['wrappers_0',['C++ wrappers',['../group__cpp.html',1,'']]]
+];
diff --git a/depends/mimalloc/docs/search/groups_d.js b/depends/mimalloc/docs/search/groups_d.js
new file mode 100644
index 000000000000..1437d04ac002
--- /dev/null
+++ b/depends/mimalloc/docs/search/groups_d.js
@@ -0,0 +1,4 @@
+var searchData=
+[
+  ['zero_20initialized_20re_20allocation_0',['Zero initialized re-allocation',['../group__zeroinit.html',1,'']]]
+];
diff --git a/depends/mimalloc/docs/search/pages_0.js b/depends/mimalloc/docs/search/pages_0.js
index 07922dae7add..9c92133c3c92 100644
--- a/depends/mimalloc/docs/search/pages_0.js
+++ b/depends/mimalloc/docs/search/pages_0.js
@@ -1,4 +1,4 @@
 var searchData=
 [
-  ['building_324',['Building',['../build.html',1,'']]]
+  ['building_0',['Building',['../build.html',1,'']]]
 ];
diff --git a/depends/mimalloc/docs/search/pages_1.js b/depends/mimalloc/docs/search/pages_1.js
index 6433daeccef5..4e3b12eec4d1 100644
--- a/depends/mimalloc/docs/search/pages_1.js
+++ b/depends/mimalloc/docs/search/pages_1.js
@@ -1,4 +1,4 @@
 var searchData=
 [
-  ['environment_20options_325',['Environment Options',['../environment.html',1,'']]]
+  ['environment_20options_0',['Environment Options',['../environment.html',1,'']]]
 ];
diff --git a/depends/mimalloc/docs/search/pages_2.js b/depends/mimalloc/docs/search/pages_2.js
index 7577377b9719..5071ed69e8a2 100644
--- a/depends/mimalloc/docs/search/pages_2.js
+++ b/depends/mimalloc/docs/search/pages_2.js
@@ -1,4 +1,4 @@
 var searchData=
 [
-  ['overriding_20malloc_326',['Overriding Malloc',['../overrides.html',1,'']]]
+  ['library_0',['Using the library',['../using.html',1,'']]]
 ];
diff --git a/depends/mimalloc/docs/search/pages_3.js b/depends/mimalloc/docs/search/pages_3.js
index d62a3cfd1322..4c761a084669 100644
--- a/depends/mimalloc/docs/search/pages_3.js
+++ b/depends/mimalloc/docs/search/pages_3.js
@@ -1,4 +1,6 @@
 var searchData=
 [
-  ['performance_327',['Performance',['../bench.html',1,'']]]
+  ['malloc_0',['Overriding Malloc',['../overrides.html',1,'']]],
+  ['malloc_1',['mi-malloc',['../index.html',1,'']]],
+  ['mi_20malloc_2',['mi-malloc',['../index.html',1,'']]]
 ];
diff --git a/depends/mimalloc/docs/search/pages_4.js b/depends/mimalloc/docs/search/pages_4.js
index 4e4e64dc489e..a0c748ac09be 100644
--- a/depends/mimalloc/docs/search/pages_4.js
+++ b/depends/mimalloc/docs/search/pages_4.js
@@ -1,4 +1,5 @@
 var searchData=
 [
-  ['using_20the_20library_328',['Using the library',['../using.html',1,'']]]
+  ['options_0',['Environment Options',['../environment.html',1,'']]],
+  ['overriding_20malloc_1',['Overriding Malloc',['../overrides.html',1,'']]]
 ];
diff --git a/depends/mimalloc/docs/search/pages_5.js b/depends/mimalloc/docs/search/pages_5.js
new file mode 100644
index 000000000000..3142480928b9
--- /dev/null
+++ b/depends/mimalloc/docs/search/pages_5.js
@@ -0,0 +1,4 @@
+var searchData=
+[
+  ['performance_0',['Performance',['../bench.html',1,'']]]
+];
diff --git a/depends/mimalloc/docs/search/pages_6.js b/depends/mimalloc/docs/search/pages_6.js
new file mode 100644
index 000000000000..308a1780009f
--- /dev/null
+++ b/depends/mimalloc/docs/search/pages_6.js
@@ -0,0 +1,4 @@
+var searchData=
+[
+  ['the_20library_0',['Using the library',['../using.html',1,'']]]
+];
diff --git a/depends/mimalloc/docs/search/pages_7.js b/depends/mimalloc/docs/search/pages_7.js
new file mode 100644
index 000000000000..4806a8183e75
--- /dev/null
+++ b/depends/mimalloc/docs/search/pages_7.js
@@ -0,0 +1,4 @@
+var searchData=
+[
+  ['using_20the_20library_0',['Using the library',['../using.html',1,'']]]
+];
diff --git a/depends/mimalloc/docs/search/search.css b/depends/mimalloc/docs/search/search.css
index 10bd4b55d93a..190ed7fdbb7b 100644
--- a/depends/mimalloc/docs/search/search.css
+++ b/depends/mimalloc/docs/search/search.css
@@ -1,100 +1,111 @@
 /*---------------- Search Box */
 
-#FSearchBox {
-    float: left;
+#MSearchBox {
+    position: absolute;
+    right: 5px;
+}
+/*---------------- Search box styling */
+
+.SRPage * {
+    font-weight: normal;
+    line-height: normal;
+}
+
+dark-mode-toggle {
+    margin-left: 5px;
+    display: flex;
+    float: right;
 }
 
 #MSearchBox {
+    display: inline-block;
     white-space : nowrap;
-    float: none;
-    margin-top: 0px;
-    right: 0px;
-    width: 170px;
-    height: 24px;
+    background: white;
+    border-radius: 0.65em;
+    box-shadow: inset 0.5px 0.5px 3px 0px #555;
     z-index: 102;
-    display: inline;
-    position: absolute;
 }
 
-#MSearchBox .left
-{
-    display:block;
-    position:absolute;
-    left:10px;
-    width:20px;
-    height:19px;
-    background:url('search_l.png') no-repeat;
-    background-position:right;
+#MSearchBox .left {
+    display: inline-block;
+    vertical-align: middle;
+    height: 1.4em;
 }
 
 #MSearchSelect {
-    display:block;
-    position:absolute;
-    width:20px;
-    height:19px;
+    display: inline-block;
+    vertical-align: middle;
+    width: 20px;
+    height: 19px;
+    background-image: url('mag_sel.svg');
+    margin: 0 0 0 0.3em;
+    padding: 0;
 }
 
-.left #MSearchSelect {
-    left:4px;
+#MSearchSelectExt {
+    display: inline-block;
+    vertical-align: middle;
+    width: 10px;
+    height: 19px;
+    background-image: url('mag.svg');
+    margin: 0 0 0 0.5em;
+    padding: 0;
 }
 
-.right #MSearchSelect {
-    right:5px;
-}
 
 #MSearchField {
-    display:block;
-    position:absolute;
-    height:19px;
-    background:url('search_m.png') repeat-x;
+    display: inline-block;
+    vertical-align: middle;
+    width: 7.5em;
+    height: 19px;
+    margin: 0 0.15em;
+    padding: 0;
+    line-height: 1em;
     border:none;
-    width:111px;
-    margin-left:20px;
-    padding-left:4px;
     color: #909090;
     outline: none;
-    font: 9pt Arial, Verdana, sans-serif;
+    font-family: Arial,Verdana,sans-serif;
     -webkit-border-radius: 0px;
+    border-radius: 0px;
+    background: none;
 }
 
-#FSearchBox #MSearchField {
-    margin-left:15px;
+@media(hover: none) {
+    /* to avoid zooming on iOS */
+    #MSearchField {
+        font-size: 16px;
+    }
 }
 
 #MSearchBox .right {
-    display:block;
-    position:absolute;
-    right:10px;
-    top:0px;
-    width:20px;
-    height:19px;
-    background:url('search_r.png') no-repeat;
-    background-position:left;
+    display: inline-block;
+    vertical-align: middle;
+    width: 1.4em;
+    height: 1.4em;
 }
 
 #MSearchClose {
     display: none;
-    position: absolute;
-    top: 4px;
+    font-size: inherit;
     background : none;
     border: none;
-    margin: 0px 4px 0px 0px;
-    padding: 0px 0px;
+    margin: 0;
+    padding: 0;
     outline: none;
-}
 
-.left #MSearchClose {
-    left: 6px;
 }
 
-.right #MSearchClose {
-    right: 2px;
+#MSearchCloseImg {
+    padding: 0.3em;
+    margin: 0;
 }
 
 .MSearchBoxActive #MSearchField {
-    color: #000000;
+    color: black;
 }
 
+
+
 /*---------------- Search filter selection */
 
 #MSearchSelectWindow {
@@ -115,7 +126,7 @@
 }
 
 .SelectItem {
-    font: 8pt Arial, Verdana, sans-serif;
+    font: 8pt Arial,Verdana,sans-serif;
     padding-left:  2px;
     padding-right: 12px;
     border: 0px;
@@ -123,7 +134,7 @@
 
 span.SelectionMark {
     margin-right: 4px;
-    font-family: monospace;
+    font-family: 'JetBrains Mono',Consolas,Monaco,'Andale Mono','Ubuntu Mono',monospace,fixed;
     outline-style: none;
     text-decoration: none;
 }
@@ -131,7 +142,7 @@ span.SelectionMark {
 a.SelectItem {
     display: block;
     outline-style: none;
-    color: #000000; 
+    color: black;
     text-decoration: none;
     padding-left:   6px;
     padding-right: 12px;
@@ -139,13 +150,13 @@ a.SelectItem {
 
 a.SelectItem:focus,
 a.SelectItem:active {
-    color: #000000; 
+    color: black;
     outline-style: none;
     text-decoration: none;
 }
 
 a.SelectItem:hover {
-    color: #FFFFFF;
+    color: white;
     background-color: #0F1010;
     outline-style: none;
     text-decoration: none;
@@ -156,7 +167,7 @@ a.SelectItem:hover {
 /*---------------- Search results window */
 
 iframe#MSearchResults {
-    width: 60ex;
+    /*width: 60ex;*/
     height: 15em;
 }
 
@@ -164,9 +175,12 @@ iframe#MSearchResults {
     display: none;
     position: absolute;
     left: 0; top: 0;
-    border: 1px solid #000;
+    border: 1px solid black;
     background-color: #DADDDE;
     z-index:10000;
+    width: 300px;
+    height: 400px;
+    overflow: auto;
 }
 
 /* ----------------------------------- */
@@ -174,7 +188,6 @@ iframe#MSearchResults {
 
 #SRIndex {
     clear:both; 
-    padding-bottom: 15px;
 }
 
 .SREntry {
@@ -187,8 +200,9 @@ iframe#MSearchResults {
     padding: 1px 5px;
 }
 
-body.SRPage {
+div.SRPage {
     margin: 5px 2px;
+    background-color: #DADDDE;
 }
 
 .SRChildren {
@@ -200,17 +214,18 @@ body.SRPage {
 }
 
 .SRSymbol {
-    font-weight: bold; 
+    font-weight: bold;
     color: #121414;
-    font-family: Arial, Verdana, sans-serif;
+    font-family: Arial,Verdana,sans-serif;
     text-decoration: none;
     outline: none;
 }
 
 a.SRScope {
     display: block;
-    color: #121414; 
-    font-family: Arial, Verdana, sans-serif;
+    color: #121414;
+    font-family: Arial,Verdana,sans-serif;
+    font-size: 8pt;
     text-decoration: none;
     outline: none;
 }
@@ -222,29 +237,27 @@ a.SRScope:focus, a.SRScope:active {
 
 span.SRScope {
     padding-left: 4px;
+    font-family: Arial,Verdana,sans-serif;
 }
 
 .SRPage .SRStatus {
     padding: 2px 5px;
     font-size: 8pt;
     font-style: italic;
+    font-family: Arial,Verdana,sans-serif;
 }
 
 .SRResult {
     display: none;
 }
 
-DIV.searchresults {
+div.searchresults {
     margin-left: 10px;
     margin-right: 10px;
 }
 
 /*---------------- External search page results */
 
-.searchresult {
-    background-color: #DFE1E2;
-}
-
 .pages b {
    color: white;
    padding: 5px 5px 3px 5px;
diff --git a/depends/mimalloc/docs/search/search.js b/depends/mimalloc/docs/search/search.js
index fb226f734e6d..666af01e5ea2 100644
--- a/depends/mimalloc/docs/search/search.js
+++ b/depends/mimalloc/docs/search/search.js
@@ -22,56 +22,9 @@
 
  @licend  The above is the entire license notice for the JavaScript code in this file
  */
-function convertToId(search)
-{
-  var result = '';
-  for (i=0;i<search.length;i++)
-  {
-    var c = search.charAt(i);
-    var cn = c.charCodeAt(0);
-    if (c.match(/[a-z0-9\u0080-\uFFFF]/))
-    {
-      result+=c;
-    }
-    else if (cn<16)
-    {
-      result+="_0"+cn.toString(16);
-    }
-    else
-    {
-      result+="_"+cn.toString(16);
-    }
-  }
-  return result;
-}
+const SEARCH_COOKIE_NAME = ''+'search_grp';
 
-function getXPos(item)
-{
-  var x = 0;
-  if (item.offsetWidth)
-  {
-    while (item && item!=document.body)
-    {
-      x   += item.offsetLeft;
-      item = item.offsetParent;
-    }
-  }
-  return x;
-}
-
-function getYPos(item)
-{
-  var y = 0;
-  if (item.offsetWidth)
-  {
-     while (item && item!=document.body)
-     {
-       y   += item.offsetTop;
-       item = item.offsetParent;
-     }
-  }
-  return y;
-}
+const searchResults = new SearchResults();
 
 /* A class handling everything associated with the search panel.
 
@@ -80,11 +33,32 @@ function getYPos(item)
           storing this instance.  Is needed to be able to set timeouts.
    resultPath - path to use for external files
 */
-function SearchBox(name, resultsPath, inFrame, label, extension)
-{
+function SearchBox(name, resultsPath, extension) {
   if (!name || !resultsPath) {  alert("Missing parameters to SearchBox."); }
   if (!extension || extension == "") { extension = ".html"; }
 
+  function getXPos(item) {
+    let x = 0;
+    if (item.offsetWidth) {
+      while (item && item!=document.body) {
+        x   += item.offsetLeft;
+        item = item.offsetParent;
+      }
+    }
+    return x;
+  }
+
+  function getYPos(item) {
+    let y = 0;
+    if (item.offsetWidth) {
+      while (item && item!=document.body) {
+        y   += item.offsetTop;
+        item = item.offsetParent;
+      }
+    }
+    return y;
+  }
+
   // ---------- Instance variables
   this.name                  = name;
   this.resultsPath           = resultsPath;
@@ -96,120 +70,76 @@ function SearchBox(name, resultsPath, inFrame, label, extension)
   this.hideTimeout           = 0;
   this.searchIndex           = 0;
   this.searchActive          = false;
-  this.insideFrame           = inFrame;
-  this.searchLabel           = label;
   this.extension             = extension;
 
   // ----------- DOM Elements
 
-  this.DOMSearchField = function()
-  {  return document.getElementById("MSearchField");  }
-
-  this.DOMSearchSelect = function()
-  {  return document.getElementById("MSearchSelect");  }
-
-  this.DOMSearchSelectWindow = function()
-  {  return document.getElementById("MSearchSelectWindow");  }
-
-  this.DOMPopupSearchResults = function()
-  {  return document.getElementById("MSearchResults");  }
-
-  this.DOMPopupSearchResultsWindow = function()
-  {  return document.getElementById("MSearchResultsWindow");  }
-
-  this.DOMSearchClose = function()
-  {  return document.getElementById("MSearchClose"); }
-
-  this.DOMSearchBox = function()
-  {  return document.getElementById("MSearchBox");  }
+  this.DOMSearchField              = () => document.getElementById("MSearchField");
+  this.DOMSearchSelect             = () => document.getElementById("MSearchSelect");
+  this.DOMSearchSelectWindow       = () => document.getElementById("MSearchSelectWindow");
+  this.DOMPopupSearchResults       = () => document.getElementById("MSearchResults");
+  this.DOMPopupSearchResultsWindow = () => document.getElementById("MSearchResultsWindow");
+  this.DOMSearchClose              = () => document.getElementById("MSearchClose");
+  this.DOMSearchBox                = () => document.getElementById("MSearchBox");
 
   // ------------ Event Handlers
 
   // Called when focus is added or removed from the search field.
-  this.OnSearchFieldFocus = function(isActive)
-  {
+  this.OnSearchFieldFocus = function(isActive) {
     this.Activate(isActive);
   }
 
-  this.OnSearchSelectShow = function()
-  {
-    var searchSelectWindow = this.DOMSearchSelectWindow();
-    var searchField        = this.DOMSearchSelect();
-
-    if (this.insideFrame)
-    {
-      var left = getXPos(searchField);
-      var top  = getYPos(searchField);
-      left += searchField.offsetWidth + 6;
-      top += searchField.offsetHeight;
-
-      // show search selection popup
-      searchSelectWindow.style.display='block';
-      left -= searchSelectWindow.offsetWidth;
-      searchSelectWindow.style.left =  left + 'px';
-      searchSelectWindow.style.top  =  top  + 'px';
-    }
-    else
-    {
-      var left = getXPos(searchField);
-      var top  = getYPos(searchField);
-      top += searchField.offsetHeight;
-
-      // show search selection popup
-      searchSelectWindow.style.display='block';
-      searchSelectWindow.style.left =  left + 'px';
-      searchSelectWindow.style.top  =  top  + 'px';
-    }
+  this.OnSearchSelectShow = function() {
+    const searchSelectWindow = this.DOMSearchSelectWindow();
+    const searchField        = this.DOMSearchSelect();
+
+    const left = getXPos(searchField);
+    const top  = getYPos(searchField) + searchField.offsetHeight;
+
+    // show search selection popup
+    searchSelectWindow.style.display='block';
+    searchSelectWindow.style.left =  left + 'px';
+    searchSelectWindow.style.top  =  top  + 'px';
 
     // stop selection hide timer
-    if (this.hideTimeout)
-    {
+    if (this.hideTimeout) {
       clearTimeout(this.hideTimeout);
       this.hideTimeout=0;
     }
     return false; // to avoid "image drag" default event
   }
 
-  this.OnSearchSelectHide = function()
-  {
-    this.hideTimeout = setTimeout(this.name +".CloseSelectionWindow()",
+  this.OnSearchSelectHide = function() {
+    this.hideTimeout = setTimeout(this.CloseSelectionWindow.bind(this),
                                   this.closeSelectionTimeout);
   }
 
   // Called when the content of the search field is changed.
-  this.OnSearchFieldChange = function(evt)
-  {
-    if (this.keyTimeout) // kill running timer
-    {
+  this.OnSearchFieldChange = function(evt) {
+    if (this.keyTimeout) { // kill running timer
       clearTimeout(this.keyTimeout);
       this.keyTimeout = 0;
     }
 
-    var e  = (evt) ? evt : window.event; // for IE
-    if (e.keyCode==40 || e.keyCode==13)
-    {
-      if (e.shiftKey==1)
-      {
+    const e = evt ? evt : window.event; // for IE
+    if (e.keyCode==40 || e.keyCode==13) {
+      if (e.shiftKey==1) {
         this.OnSearchSelectShow();
-        var win=this.DOMSearchSelectWindow();
-        for (i=0;i<win.childNodes.length;i++)
-        {
-          var child = win.childNodes[i]; // get span within a
-          if (child.className=='SelectItem')
-          {
+        const win=this.DOMSearchSelectWindow();
+        for (let i=0;i<win.childNodes.length;i++) {
+          const child = win.childNodes[i]; // get span within a
+          if (child.className=='SelectItem') {
             child.focus();
             return;
           }
         }
         return;
+      } else {
+        const elem = searchResults.NavNext(0);
+        if (elem) elem.focus();
       }
-      else
-      {
-        window.frames.MSearchResults.postMessage("take_focus", "*");
-      }
-    }
-    else if (e.keyCode==27) // Escape out of the search field
-    {
+    } else if (e.keyCode==27) { // Escape out of the search field
+      e.stopPropagation();
       this.DOMSearchField().blur();
       this.DOMPopupSearchResultsWindow().style.display = 'none';
       this.DOMSearchClose().style.display = 'none';
@@ -219,18 +149,13 @@ function SearchBox(name, resultsPath, inFrame, label, extension)
     }
 
     // strip whitespaces
-    var searchValue = this.DOMSearchField().value.replace(/ +/g, "");
+    const searchValue = this.DOMSearchField().value.replace(/ +/g, "");
 
-    if (searchValue != this.lastSearchValue) // search value has changed
-    {
-      if (searchValue != "") // non-empty search
-      {
+    if (searchValue != this.lastSearchValue) { // search value has changed
+      if (searchValue != "") { // non-empty search
         // set timer for search update
-        this.keyTimeout = setTimeout(this.name + '.Search()',
-                                     this.keyTimeoutLength);
-      }
-      else // empty search field
-      {
+        this.keyTimeout = setTimeout(this.Search.bind(this), this.keyTimeoutLength);
+      } else { // empty search field
         this.DOMPopupSearchResultsWindow().style.display = 'none';
         this.DOMSearchClose().style.display = 'none';
         this.lastSearchValue = '';
@@ -238,37 +163,44 @@ function SearchBox(name, resultsPath, inFrame, label, extension)
     }
   }
 
-  this.SelectItemCount = function(id)
-  {
-    var count=0;
-    var win=this.DOMSearchSelectWindow();
-    for (i=0;i<win.childNodes.length;i++)
-    {
-      var child = win.childNodes[i]; // get span within a
-      if (child.className=='SelectItem')
-      {
+  this.SelectItemCount = function() {
+    let count=0;
+    const win=this.DOMSearchSelectWindow();
+    for (let i=0;i<win.childNodes.length;i++) {
+      const child = win.childNodes[i]; // get span within a
+      if (child.className=='SelectItem') {
         count++;
       }
     }
     return count;
   }
 
-  this.SelectItemSet = function(id)
-  {
-    var i,j=0;
-    var win=this.DOMSearchSelectWindow();
-    for (i=0;i<win.childNodes.length;i++)
-    {
-      var child = win.childNodes[i]; // get span within a
-      if (child.className=='SelectItem')
-      {
-        var node = child.firstChild;
-        if (j==id)
-        {
-          node.innerHTML='&#8226;';
+  this.GetSelectionIdByName = function(name) {
+    let j=0;
+    const win=this.DOMSearchSelectWindow();
+    for (let i=0;i<win.childNodes.length;i++) {
+      const child = win.childNodes[i];
+      if (child.className=='SelectItem') {
+        if (child.childNodes[1].nodeValue==name) {
+          return j;
         }
-        else
-        {
+        j++;
+      }
+    }
+    return 0;
+  }
+
+  this.SelectItemSet = function(id) {
+    let j=0;
+    const win=this.DOMSearchSelectWindow();
+    for (let i=0;i<win.childNodes.length;i++) {
+      const child = win.childNodes[i]; // get span within a
+      if (child.className=='SelectItem') {
+        const node = child.firstChild;
+        if (j==id) {
+          node.innerHTML='&#8226;';
+          Cookie.writeSetting(SEARCH_COOKIE_NAME, child.childNodes[1].nodeValue, 0)
+        } else {
           node.innerHTML='&#160;';
         }
         j++;
@@ -278,32 +210,25 @@ function SearchBox(name, resultsPath, inFrame, label, extension)
 
   // Called when an search filter selection is made.
   // set item with index id as the active item
-  this.OnSelectItem = function(id)
-  {
+  this.OnSelectItem = function(id) {
     this.searchIndex = id;
     this.SelectItemSet(id);
-    var searchValue = this.DOMSearchField().value.replace(/ +/g, "");
-    if (searchValue!="" && this.searchActive) // something was found -> do a search
-    {
+    const searchValue = this.DOMSearchField().value.replace(/ +/g, "");
+    if (searchValue!="" && this.searchActive) { // something was found -> do a search
       this.Search();
     }
   }
 
-  this.OnSearchSelectKey = function(evt)
-  {
-    var e = (evt) ? evt : window.event; // for IE
-    if (e.keyCode==40 && this.searchIndex<this.SelectItemCount()) // Down
-    {
+  this.OnSearchSelectKey = function(evt) {
+    const e = (evt) ? evt : window.event; // for IE
+    if (e.keyCode==40 && this.searchIndex<this.SelectItemCount()) { // Down
       this.searchIndex++;
       this.OnSelectItem(this.searchIndex);
-    }
-    else if (e.keyCode==38 && this.searchIndex>0) // Up
-    {
+    } else if (e.keyCode==38 && this.searchIndex>0) { // Up
       this.searchIndex--;
       this.OnSelectItem(this.searchIndex);
-    }
-    else if (e.keyCode==13 || e.keyCode==27)
-    {
+    } else if (e.keyCode==13 || e.keyCode==27) {
+      e.stopPropagation();
       this.OnSelectItem(this.searchIndex);
       this.CloseSelectionWindow();
       this.DOMSearchField().focus();
@@ -314,111 +239,108 @@ function SearchBox(name, resultsPath, inFrame, label, extension)
   // --------- Actions
 
   // Closes the results window.
-  this.CloseResultsWindow = function()
-  {
+  this.CloseResultsWindow = function() {
     this.DOMPopupSearchResultsWindow().style.display = 'none';
     this.DOMSearchClose().style.display = 'none';
     this.Activate(false);
   }
 
-  this.CloseSelectionWindow = function()
-  {
+  this.CloseSelectionWindow = function() {
     this.DOMSearchSelectWindow().style.display = 'none';
   }
 
   // Performs a search.
-  this.Search = function()
-  {
+  this.Search = function() {
     this.keyTimeout = 0;
 
     // strip leading whitespace
-    var searchValue = this.DOMSearchField().value.replace(/^ +/, "");
+    const searchValue = this.DOMSearchField().value.replace(/^ +/, "");
 
-    var code = searchValue.toLowerCase().charCodeAt(0);
-    var idxChar = searchValue.substr(0, 1).toLowerCase();
-    if ( 0xD800 <= code && code <= 0xDBFF && searchValue > 1) // surrogate pair
-    {
+    const code = searchValue.toLowerCase().charCodeAt(0);
+    let idxChar = searchValue.substr(0, 1).toLowerCase();
+    if ( 0xD800 <= code && code <= 0xDBFF && searchValue > 1) { // surrogate pair
       idxChar = searchValue.substr(0, 2);
     }
 
-    var resultsPage;
-    var resultsPageWithSearch;
-    var hasResultsPage;
-
-    var idx = indexSectionsWithContent[this.searchIndex].indexOf(idxChar);
-    if (idx!=-1)
-    {
-       var hexCode=idx.toString(16);
-       resultsPage = this.resultsPath + '/' + indexSectionNames[this.searchIndex] + '_' + hexCode + this.extension;
-       resultsPageWithSearch = resultsPage+'?'+escape(searchValue);
-       hasResultsPage = true;
+    let jsFile;
+    let idx = indexSectionsWithContent[this.searchIndex].indexOf(idxChar);
+    if (idx!=-1) {
+      const hexCode=idx.toString(16);
+      jsFile = this.resultsPath + indexSectionNames[this.searchIndex] + '_' + hexCode + '.js';
+    }
+
+    const loadJS = function(url, impl, loc) {
+      const scriptTag = document.createElement('script');
+      scriptTag.src = url;
+      scriptTag.onload = impl;
+      scriptTag.onreadystatechange = impl;
+      loc.appendChild(scriptTag);
     }
-    else // nothing available for this search term
-    {
-       resultsPage = this.resultsPath + '/nomatches' + this.extension;
-       resultsPageWithSearch = resultsPage;
-       hasResultsPage = false;
+
+    const domPopupSearchResultsWindow = this.DOMPopupSearchResultsWindow();
+    const domSearchBox = this.DOMSearchBox();
+    const domPopupSearchResults = this.DOMPopupSearchResults();
+    const domSearchClose = this.DOMSearchClose();
+    const resultsPath = this.resultsPath;
+
+    const handleResults = function() {
+      document.getElementById("Loading").style.display="none";
+      if (typeof searchData !== 'undefined') {
+        createResults(resultsPath);
+        document.getElementById("NoMatches").style.display="none";
+      }
+
+      if (idx!=-1) {
+        searchResults.Search(searchValue);
+      } else { // no file with search results => force empty search results
+        searchResults.Search('====');
+      }
+
+      if (domPopupSearchResultsWindow.style.display!='block') {
+        domSearchClose.style.display = 'inline-block';
+        let left = getXPos(domSearchBox) + 150;
+        let top  = getYPos(domSearchBox) + 20;
+        domPopupSearchResultsWindow.style.display = 'block';
+        left -= domPopupSearchResults.offsetWidth;
+        const maxWidth  = document.body.clientWidth;
+        const maxHeight = document.body.clientHeight;
+        let width = 300;
+        if (left<10) left=10;
+        if (width+left+8>maxWidth) width=maxWidth-left-8;
+        let height = 400;
+        if (height+top+8>maxHeight) height=maxHeight-top-8;
+        domPopupSearchResultsWindow.style.top     = top  + 'px';
+        domPopupSearchResultsWindow.style.left    = left + 'px';
+        domPopupSearchResultsWindow.style.width   = width + 'px';
+        domPopupSearchResultsWindow.style.height  = height + 'px';
+      }
     }
 
-    window.frames.MSearchResults.location = resultsPageWithSearch;
-    var domPopupSearchResultsWindow = this.DOMPopupSearchResultsWindow();
-
-    if (domPopupSearchResultsWindow.style.display!='block')
-    {
-       var domSearchBox = this.DOMSearchBox();
-       this.DOMSearchClose().style.display = 'inline-block';
-       if (this.insideFrame)
-       {
-         var domPopupSearchResults = this.DOMPopupSearchResults();
-         domPopupSearchResultsWindow.style.position = 'relative';
-         domPopupSearchResultsWindow.style.display  = 'block';
-         var width = document.body.clientWidth - 8; // the -8 is for IE :-(
-         domPopupSearchResultsWindow.style.width    = width + 'px';
-         domPopupSearchResults.style.width          = width + 'px';
-       }
-       else
-       {
-         var domPopupSearchResults = this.DOMPopupSearchResults();
-         var left = getXPos(domSearchBox) + 150; // domSearchBox.offsetWidth;
-         var top  = getYPos(domSearchBox) + 20;  // domSearchBox.offsetHeight + 1;
-         domPopupSearchResultsWindow.style.display = 'block';
-         left -= domPopupSearchResults.offsetWidth;
-         domPopupSearchResultsWindow.style.top     = top  + 'px';
-         domPopupSearchResultsWindow.style.left    = left + 'px';
-       }
+    if (jsFile) {
+      loadJS(jsFile, handleResults, this.DOMPopupSearchResultsWindow());
+    } else {
+      handleResults();
     }
 
     this.lastSearchValue = searchValue;
-    this.lastResultsPage = resultsPage;
   }
 
   // -------- Activation Functions
 
   // Activates or deactivates the search panel, resetting things to
   // their default values if necessary.
-  this.Activate = function(isActive)
-  {
+  this.Activate = function(isActive) {
     if (isActive || // open it
-        this.DOMPopupSearchResultsWindow().style.display == 'block'
-       )
-    {
+      this.DOMPopupSearchResultsWindow().style.display == 'block'
+    ) {
       this.DOMSearchBox().className = 'MSearchBoxActive';
-
-      var searchField = this.DOMSearchField();
-
-      if (searchField.value == this.searchLabel) // clear "Search" term upon entry
-      {
-        searchField.value = '';
-        this.searchActive = true;
-      }
-    }
-    else if (!isActive) // directly remove the panel
-    {
+      this.searchActive = true;
+    } else if (!isActive) { // directly remove the panel
       this.DOMSearchBox().className = 'MSearchBoxInactive';
-      this.DOMSearchField().value   = this.searchLabel;
       this.searchActive             = false;
       this.lastSearchValue          = ''
       this.lastResultsPage          = '';
+      this.DOMSearchField().value   = '';
     }
   }
 }
@@ -426,391 +348,347 @@ function SearchBox(name, resultsPath, inFrame, label, extension)
 // -----------------------------------------------------------------------
 
 // The class that handles everything on the search results page.
-function SearchResults(name)
-{
-    // The number of matches from the last run of <Search()>.
-    this.lastMatchCount = 0;
-    this.lastKey = 0;
-    this.repeatOn = false;
-
-    // Toggles the visibility of the passed element ID.
-    this.FindChildElement = function(id)
-    {
-      var parentElement = document.getElementById(id);
-      var element = parentElement.firstChild;
-
-      while (element && element!=parentElement)
-      {
-        if (element.nodeName.toLowerCase() == 'div' && element.className == 'SRChildren')
-        {
-          return element;
-        }
+function SearchResults() {
+
+  function convertToId(search) {
+    let result = '';
+    for (let i=0;i<search.length;i++) {
+      const c = search.charAt(i);
+      const cn = c.charCodeAt(0);
+      if (c.match(/[a-z0-9\u0080-\uFFFF]/)) {
+        result+=c;
+      } else if (cn<16) {
+        result+="_0"+cn.toString(16);
+      } else {
+        result+="_"+cn.toString(16);
+      }
+    }
+    return result;
+  }
 
-        if (element.nodeName.toLowerCase() == 'div' && element.hasChildNodes())
-        {
-           element = element.firstChild;
-        }
-        else if (element.nextSibling)
-        {
-           element = element.nextSibling;
-        }
-        else
-        {
-          do
-          {
-            element = element.parentNode;
-          }
-          while (element && element!=parentElement && !element.nextSibling);
+  // The number of matches from the last run of <Search()>.
+  this.lastMatchCount = 0;
+  this.lastKey = 0;
+  this.repeatOn = false;
 
-          if (element && element!=parentElement)
-          {
-            element = element.nextSibling;
-          }
-        }
+  // Toggles the visibility of the passed element ID.
+  this.FindChildElement = function(id) {
+    const parentElement = document.getElementById(id);
+    let element = parentElement.firstChild;
+
+    while (element && element!=parentElement) {
+      if (element.nodeName.toLowerCase() == 'div' && element.className == 'SRChildren') {
+        return element;
       }
-    }
 
-    this.Toggle = function(id)
-    {
-      var element = this.FindChildElement(id);
-      if (element)
-      {
-        if (element.style.display == 'block')
-        {
-          element.style.display = 'none';
+      if (element.nodeName.toLowerCase() == 'div' && element.hasChildNodes()) {
+        element = element.firstChild;
+      } else if (element.nextSibling) {
+        element = element.nextSibling;
+      } else {
+        do {
+          element = element.parentNode;
         }
-        else
-        {
-          element.style.display = 'block';
+        while (element && element!=parentElement && !element.nextSibling);
+
+        if (element && element!=parentElement) {
+          element = element.nextSibling;
         }
       }
     }
+  }
 
-    // Searches for the passed string.  If there is no parameter,
-    // it takes it from the URL query.
-    //
-    // Always returns true, since other documents may try to call it
-    // and that may or may not be possible.
-    this.Search = function(search)
-    {
-      if (!search) // get search word from URL
-      {
-        search = window.location.search;
-        search = search.substring(1);  // Remove the leading '?'
-        search = unescape(search);
+  this.Toggle = function(id) {
+    const element = this.FindChildElement(id);
+    if (element) {
+      if (element.style.display == 'block') {
+        element.style.display = 'none';
+      } else {
+        element.style.display = 'block';
       }
+    }
+  }
 
-      search = search.replace(/^ +/, ""); // strip leading spaces
-      search = search.replace(/ +$/, ""); // strip trailing spaces
-      search = search.toLowerCase();
-      search = convertToId(search);
-
-      var resultRows = document.getElementsByTagName("div");
-      var matches = 0;
-
-      var i = 0;
-      while (i < resultRows.length)
-      {
-        var row = resultRows.item(i);
-        if (row.className == "SRResult")
-        {
-          var rowMatchName = row.id.toLowerCase();
-          rowMatchName = rowMatchName.replace(/^sr\d*_/, ''); // strip 'sr123_'
-
-          if (search.length<=rowMatchName.length &&
-             rowMatchName.substr(0, search.length)==search)
-          {
-            row.style.display = 'block';
-            matches++;
-          }
-          else
-          {
-            row.style.display = 'none';
-          }
+  // Searches for the passed string.  If there is no parameter,
+  // it takes it from the URL query.
+  //
+  // Always returns true, since other documents may try to call it
+  // and that may or may not be possible.
+  this.Search = function(search) {
+    if (!search) { // get search word from URL
+      search = window.location.search;
+      search = search.substring(1);  // Remove the leading '?'
+      search = unescape(search);
+    }
+
+    search = search.replace(/^ +/, ""); // strip leading spaces
+    search = search.replace(/ +$/, ""); // strip trailing spaces
+    search = search.toLowerCase();
+    search = convertToId(search);
+
+    const resultRows = document.getElementsByTagName("div");
+    let matches = 0;
+
+    let i = 0;
+    while (i < resultRows.length) {
+      const row = resultRows.item(i);
+      if (row.className == "SRResult") {
+        let rowMatchName = row.id.toLowerCase();
+        rowMatchName = rowMatchName.replace(/^sr\d*_/, ''); // strip 'sr123_'
+
+        if (search.length<=rowMatchName.length &&
+          rowMatchName.substr(0, search.length)==search) {
+          row.style.display = 'block';
+          matches++;
+        } else {
+          row.style.display = 'none';
         }
-        i++;
-      }
-      document.getElementById("Searching").style.display='none';
-      if (matches == 0) // no results
-      {
-        document.getElementById("NoMatches").style.display='block';
       }
-      else // at least one result
-      {
-        document.getElementById("NoMatches").style.display='none';
-      }
-      this.lastMatchCount = matches;
-      return true;
+      i++;
     }
+    document.getElementById("Searching").style.display='none';
+    if (matches == 0) { // no results
+      document.getElementById("NoMatches").style.display='block';
+    } else { // at least one result
+      document.getElementById("NoMatches").style.display='none';
+    }
+    this.lastMatchCount = matches;
+    return true;
+  }
 
-    // return the first item with index index or higher that is visible
-    this.NavNext = function(index)
-    {
-      var focusItem;
-      while (1)
-      {
-        var focusName = 'Item'+index;
-        focusItem = document.getElementById(focusName);
-        if (focusItem && focusItem.parentNode.parentNode.style.display=='block')
-        {
-          break;
-        }
-        else if (!focusItem) // last element
-        {
-          break;
-        }
-        focusItem=null;
-        index++;
+  // return the first item with index index or higher that is visible
+  this.NavNext = function(index) {
+    let focusItem;
+    for (;;) {
+      const focusName = 'Item'+index;
+      focusItem = document.getElementById(focusName);
+      if (focusItem && focusItem.parentNode.parentNode.style.display=='block') {
+        break;
+      } else if (!focusItem) { // last element
+        break;
       }
-      return focusItem;
+      focusItem=null;
+      index++;
     }
+    return focusItem;
+  }
 
-    this.NavPrev = function(index)
-    {
-      var focusItem;
-      while (1)
-      {
-        var focusName = 'Item'+index;
-        focusItem = document.getElementById(focusName);
-        if (focusItem && focusItem.parentNode.parentNode.style.display=='block')
-        {
-          break;
-        }
-        else if (!focusItem) // last element
-        {
-          break;
-        }
-        focusItem=null;
-        index--;
+  this.NavPrev = function(index) {
+    let focusItem;
+    for (;;) {
+      const focusName = 'Item'+index;
+      focusItem = document.getElementById(focusName);
+      if (focusItem && focusItem.parentNode.parentNode.style.display=='block') {
+        break;
+      } else if (!focusItem) { // last element
+        break;
       }
-      return focusItem;
+      focusItem=null;
+      index--;
     }
+    return focusItem;
+  }
 
-    this.ProcessKeys = function(e)
-    {
-      if (e.type == "keydown")
-      {
-        this.repeatOn = false;
-        this.lastKey = e.keyCode;
+  this.ProcessKeys = function(e) {
+    if (e.type == "keydown") {
+      this.repeatOn = false;
+      this.lastKey = e.keyCode;
+    } else if (e.type == "keypress") {
+      if (!this.repeatOn) {
+        if (this.lastKey) this.repeatOn = true;
+        return false; // ignore first keypress after keydown
       }
-      else if (e.type == "keypress")
-      {
-        if (!this.repeatOn)
-        {
-          if (this.lastKey) this.repeatOn = true;
-          return false; // ignore first keypress after keydown
-        }
-      }
-      else if (e.type == "keyup")
-      {
-        this.lastKey = 0;
-        this.repeatOn = false;
-      }
-      return this.lastKey!=0;
+    } else if (e.type == "keyup") {
+      this.lastKey = 0;
+      this.repeatOn = false;
     }
+    return this.lastKey!=0;
+  }
 
-    this.Nav = function(evt,itemIndex)
-    {
-      var e  = (evt) ? evt : window.event; // for IE
-      if (e.keyCode==13) return true;
-      if (!this.ProcessKeys(e)) return false;
-
-      if (this.lastKey==38) // Up
-      {
-        var newIndex = itemIndex-1;
-        var focusItem = this.NavPrev(newIndex);
-        if (focusItem)
-        {
-          var child = this.FindChildElement(focusItem.parentNode.parentNode.id);
-          if (child && child.style.display == 'block') // children visible
-          {
-            var n=0;
-            var tmpElem;
-            while (1) // search for last child
-            {
-              tmpElem = document.getElementById('Item'+newIndex+'_c'+n);
-              if (tmpElem)
-              {
-                focusItem = tmpElem;
-              }
-              else // found it!
-              {
-                break;
-              }
-              n++;
+  this.Nav = function(evt,itemIndex) {
+    const e  = (evt) ? evt : window.event; // for IE
+    if (e.keyCode==13) return true;
+    if (!this.ProcessKeys(e)) return false;
+
+    if (this.lastKey==38) { // Up
+      const newIndex = itemIndex-1;
+      let focusItem = this.NavPrev(newIndex);
+      if (focusItem) {
+        let child = this.FindChildElement(focusItem.parentNode.parentNode.id);
+        if (child && child.style.display == 'block') { // children visible
+          let n=0;
+          let tmpElem;
+          for (;;) { // search for last child
+            tmpElem = document.getElementById('Item'+newIndex+'_c'+n);
+            if (tmpElem) {
+              focusItem = tmpElem;
+            } else { // found it!
+              break;
             }
+            n++;
           }
         }
-        if (focusItem)
-        {
-          focusItem.focus();
-        }
-        else // return focus to search field
-        {
-           parent.document.getElementById("MSearchField").focus();
-        }
-      }
-      else if (this.lastKey==40) // Down
-      {
-        var newIndex = itemIndex+1;
-        var focusItem;
-        var item = document.getElementById('Item'+itemIndex);
-        var elem = this.FindChildElement(item.parentNode.parentNode.id);
-        if (elem && elem.style.display == 'block') // children visible
-        {
-          focusItem = document.getElementById('Item'+itemIndex+'_c0');
-        }
-        if (!focusItem) focusItem = this.NavNext(newIndex);
-        if (focusItem)  focusItem.focus();
       }
-      else if (this.lastKey==39) // Right
-      {
-        var item = document.getElementById('Item'+itemIndex);
-        var elem = this.FindChildElement(item.parentNode.parentNode.id);
-        if (elem) elem.style.display = 'block';
+      if (focusItem) {
+        focusItem.focus();
+      } else { // return focus to search field
+        document.getElementById("MSearchField").focus();
       }
-      else if (this.lastKey==37) // Left
-      {
-        var item = document.getElementById('Item'+itemIndex);
-        var elem = this.FindChildElement(item.parentNode.parentNode.id);
-        if (elem) elem.style.display = 'none';
+    } else if (this.lastKey==40) { // Down
+      const newIndex = itemIndex+1;
+      let focusItem;
+      const item = document.getElementById('Item'+itemIndex);
+      const elem = this.FindChildElement(item.parentNode.parentNode.id);
+      if (elem && elem.style.display == 'block') { // children visible
+        focusItem = document.getElementById('Item'+itemIndex+'_c0');
       }
-      else if (this.lastKey==27) // Escape
-      {
-        parent.searchBox.CloseResultsWindow();
-        parent.document.getElementById("MSearchField").focus();
-      }
-      else if (this.lastKey==13) // Enter
-      {
-        return true;
-      }
-      return false;
+      if (!focusItem) focusItem = this.NavNext(newIndex);
+      if (focusItem)  focusItem.focus();
+    } else if (this.lastKey==39) { // Right
+      const item = document.getElementById('Item'+itemIndex);
+      const elem = this.FindChildElement(item.parentNode.parentNode.id);
+      if (elem) elem.style.display = 'block';
+    } else if (this.lastKey==37) { // Left
+      const item = document.getElementById('Item'+itemIndex);
+      const elem = this.FindChildElement(item.parentNode.parentNode.id);
+      if (elem) elem.style.display = 'none';
+    } else if (this.lastKey==27) { // Escape
+      e.stopPropagation();
+      searchBox.CloseResultsWindow();
+      document.getElementById("MSearchField").focus();
+    } else if (this.lastKey==13) { // Enter
+      return true;
     }
+    return false;
+  }
 
-    this.NavChild = function(evt,itemIndex,childIndex)
-    {
-      var e  = (evt) ? evt : window.event; // for IE
-      if (e.keyCode==13) return true;
-      if (!this.ProcessKeys(e)) return false;
-
-      if (this.lastKey==38) // Up
-      {
-        if (childIndex>0)
-        {
-          var newIndex = childIndex-1;
-          document.getElementById('Item'+itemIndex+'_c'+newIndex).focus();
-        }
-        else // already at first child, jump to parent
-        {
-          document.getElementById('Item'+itemIndex).focus();
-        }
-      }
-      else if (this.lastKey==40) // Down
-      {
-        var newIndex = childIndex+1;
-        var elem = document.getElementById('Item'+itemIndex+'_c'+newIndex);
-        if (!elem) // last child, jump to parent next parent
-        {
-          elem = this.NavNext(itemIndex+1);
-        }
-        if (elem)
-        {
-          elem.focus();
-        }
+  this.NavChild = function(evt,itemIndex,childIndex) {
+    const e  = (evt) ? evt : window.event; // for IE
+    if (e.keyCode==13) return true;
+    if (!this.ProcessKeys(e)) return false;
+
+    if (this.lastKey==38) { // Up
+      if (childIndex>0) {
+        const newIndex = childIndex-1;
+        document.getElementById('Item'+itemIndex+'_c'+newIndex).focus();
+      } else { // already at first child, jump to parent
+        document.getElementById('Item'+itemIndex).focus();
       }
-      else if (this.lastKey==27) // Escape
-      {
-        parent.searchBox.CloseResultsWindow();
-        parent.document.getElementById("MSearchField").focus();
+    } else if (this.lastKey==40) { // Down
+      const newIndex = childIndex+1;
+      let elem = document.getElementById('Item'+itemIndex+'_c'+newIndex);
+      if (!elem) { // last child, jump to parent next parent
+        elem = this.NavNext(itemIndex+1);
       }
-      else if (this.lastKey==13) // Enter
-      {
-        return true;
+      if (elem) {
+        elem.focus();
       }
-      return false;
+    } else if (this.lastKey==27) { // Escape
+      e.stopPropagation();
+      searchBox.CloseResultsWindow();
+      document.getElementById("MSearchField").focus();
+    } else if (this.lastKey==13) { // Enter
+      return true;
     }
+    return false;
+  }
 }
 
-function setKeyActions(elem,action)
-{
-  elem.setAttribute('onkeydown',action);
-  elem.setAttribute('onkeypress',action);
-  elem.setAttribute('onkeyup',action);
-}
+function createResults(resultsPath) {
 
-function setClassAttr(elem,attr)
-{
-  elem.setAttribute('class',attr);
-  elem.setAttribute('className',attr);
-}
+  function setKeyActions(elem,action) {
+    elem.setAttribute('onkeydown',action);
+    elem.setAttribute('onkeypress',action);
+    elem.setAttribute('onkeyup',action);
+  }
+
+  function setClassAttr(elem,attr) {
+    elem.setAttribute('class',attr);
+    elem.setAttribute('className',attr);
+  }
 
-function createResults()
-{
-  var results = document.getElementById("SRResults");
-  for (var e=0; e<searchData.length; e++)
-  {
-    var id = searchData[e][0];
-    var srResult = document.createElement('div');
+  const results = document.getElementById("SRResults");
+  results.innerHTML = '';
+  searchData.forEach((elem,index) => {
+    const id = elem[0];
+    const srResult = document.createElement('div');
     srResult.setAttribute('id','SR_'+id);
     setClassAttr(srResult,'SRResult');
-    var srEntry = document.createElement('div');
+    const srEntry = document.createElement('div');
     setClassAttr(srEntry,'SREntry');
-    var srLink = document.createElement('a');
-    srLink.setAttribute('id','Item'+e);
-    setKeyActions(srLink,'return searchResults.Nav(event,'+e+')');
+    const srLink = document.createElement('a');
+    srLink.setAttribute('id','Item'+index);
+    setKeyActions(srLink,'return searchResults.Nav(event,'+index+')');
     setClassAttr(srLink,'SRSymbol');
-    srLink.innerHTML = searchData[e][1][0];
+    srLink.innerHTML = elem[1][0];
     srEntry.appendChild(srLink);
-    if (searchData[e][1].length==2) // single result
-    {
-      srLink.setAttribute('href',searchData[e][1][1][0]);
-      if (searchData[e][1][1][1])
-      {
+    if (elem[1].length==2) { // single result
+      srLink.setAttribute('href',resultsPath+elem[1][1][0]);
+      srLink.setAttribute('onclick','searchBox.CloseResultsWindow()');
+      if (elem[1][1][1]) {
        srLink.setAttribute('target','_parent');
+      } else {
+       srLink.setAttribute('target','_blank');
       }
-      var srScope = document.createElement('span');
+      const srScope = document.createElement('span');
       setClassAttr(srScope,'SRScope');
-      srScope.innerHTML = searchData[e][1][1][2];
+      srScope.innerHTML = elem[1][1][2];
       srEntry.appendChild(srScope);
-    }
-    else // multiple results
-    {
+    } else { // multiple results
       srLink.setAttribute('href','javascript:searchResults.Toggle("SR_'+id+'")');
-      var srChildren = document.createElement('div');
+      const srChildren = document.createElement('div');
       setClassAttr(srChildren,'SRChildren');
-      for (var c=0; c<searchData[e][1].length-1; c++)
-      {
-        var srChild = document.createElement('a');
-        srChild.setAttribute('id','Item'+e+'_c'+c);
-        setKeyActions(srChild,'return searchResults.NavChild(event,'+e+','+c+')');
+      for (let c=0; c<elem[1].length-1; c++) {
+        const srChild = document.createElement('a');
+        srChild.setAttribute('id','Item'+index+'_c'+c);
+        setKeyActions(srChild,'return searchResults.NavChild(event,'+index+','+c+')');
         setClassAttr(srChild,'SRScope');
-        srChild.setAttribute('href',searchData[e][1][c+1][0]);
-        if (searchData[e][1][c+1][1])
-        {
+        srChild.setAttribute('href',resultsPath+elem[1][c+1][0]);
+        srChild.setAttribute('onclick','searchBox.CloseResultsWindow()');
+        if (elem[1][c+1][1]) {
          srChild.setAttribute('target','_parent');
+        } else {
+         srChild.setAttribute('target','_blank');
         }
-        srChild.innerHTML = searchData[e][1][c+1][2];
+        srChild.innerHTML = elem[1][c+1][2];
         srChildren.appendChild(srChild);
       }
       srEntry.appendChild(srChildren);
     }
     srResult.appendChild(srEntry);
     results.appendChild(srResult);
-  }
+  });
 }
 
-function init_search()
-{
-  var results = document.getElementById("MSearchSelectWindow");
-  for (var key in indexSectionLabels)
-  {
-    var link = document.createElement('a');
+function init_search() {
+  const results = document.getElementById("MSearchSelectWindow");
+
+  results.tabIndex=0;
+  for (let key in indexSectionLabels) {
+    const link = document.createElement('a');
     link.setAttribute('class','SelectItem');
     link.setAttribute('onclick','searchBox.OnSelectItem('+key+')');
     link.href='javascript:void(0)';
     link.innerHTML='<span class="SelectionMark">&#160;</span>'+indexSectionLabels[key];
     results.appendChild(link);
   }
-  searchBox.OnSelectItem(0);
+
+  const input = document.getElementById("MSearchSelect");
+  const searchSelectWindow = document.getElementById("MSearchSelectWindow");
+  input.tabIndex=0;
+  input.addEventListener("keydown", function(event) {
+    if (event.keyCode==13 || event.keyCode==40) {
+      event.preventDefault();
+      if (searchSelectWindow.style.display == 'block') {
+        searchBox.CloseSelectionWindow();
+      } else {
+        searchBox.OnSearchSelectShow();
+        searchBox.DOMSearchSelectWindow().focus();
+      }
+    }
+  });
+  const name = Cookie.readSetting(SEARCH_COOKIE_NAME,0);
+  const id = searchBox.GetSelectionIdByName(name);
+  searchBox.OnSelectItem(id);
 }
 /* @license-end */
diff --git a/depends/mimalloc/docs/search/searchdata.js b/depends/mimalloc/docs/search/searchdata.js
index dd31068e46aa..5a77779212ab 100644
--- a/depends/mimalloc/docs/search/searchdata.js
+++ b/depends/mimalloc/docs/search/searchdata.js
@@ -1,14 +1,14 @@
 var indexSectionsWithContent =
 {
-  0: "_abcehmoprtuz",
+  0: "_abcefhilmoprtuwz",
   1: "m",
   2: "m",
-  3: "bcru",
+  3: "bcfhru",
   4: "m",
   5: "m",
   6: "_m",
-  7: "abcehprtz",
-  8: "beopu"
+  7: "abcefhimoprtwz",
+  8: "belmoptu"
 };
 
 var indexSectionNames =
diff --git a/depends/mimalloc/docs/search/typedefs_0.js b/depends/mimalloc/docs/search/typedefs_0.js
index ac67dcd0bc66..bd147e38163c 100644
--- a/depends/mimalloc/docs/search/typedefs_0.js
+++ b/depends/mimalloc/docs/search/typedefs_0.js
@@ -1,8 +1,10 @@
 var searchData=
 [
-  ['mi_5fblock_5fvisit_5ffun_291',['mi_block_visit_fun',['../group__analysis.html#gadfa01e2900f0e5d515ad5506b26f6d65',1,'mimalloc-doc.h']]],
-  ['mi_5fdeferred_5ffree_5ffun_292',['mi_deferred_free_fun',['../group__extended.html#ga299dae78d25ce112e384a98b7309c5be',1,'mimalloc-doc.h']]],
-  ['mi_5ferror_5ffun_293',['mi_error_fun',['../group__extended.html#ga251d369cda3f1c2a955c555486ed90e5',1,'mimalloc-doc.h']]],
-  ['mi_5fheap_5ft_294',['mi_heap_t',['../group__heap.html#ga34a47cde5a5b38c29f1aa3c5e76943c2',1,'mimalloc-doc.h']]],
-  ['mi_5foutput_5ffun_295',['mi_output_fun',['../group__extended.html#gad823d23444a4b77a40f66bf075a98a0c',1,'mimalloc-doc.h']]]
+  ['mi_5farena_5fid_5ft_0',['mi_arena_id_t',['../group__extended.html#ga99fe38650d0b02e0e0f89ee024db91d3',1,'mimalloc-doc.h']]],
+  ['mi_5fblock_5fvisit_5ffun_1',['mi_block_visit_fun',['../group__analysis.html#ga8255dc9371e6b299d9802a610c4e34ec',1,'mimalloc-doc.h']]],
+  ['mi_5fdeferred_5ffree_5ffun_2',['mi_deferred_free_fun',['../group__extended.html#ga292a45f7dbc7cd23c5352ce1f0002816',1,'mimalloc-doc.h']]],
+  ['mi_5ferror_5ffun_3',['mi_error_fun',['../group__extended.html#ga83fc6a688b322261e1c2deab000b0591',1,'mimalloc-doc.h']]],
+  ['mi_5fheap_5ft_4',['mi_heap_t',['../group__heap.html#ga34a47cde5a5b38c29f1aa3c5e76943c2',1,'mimalloc-doc.h']]],
+  ['mi_5foutput_5ffun_5',['mi_output_fun',['../group__extended.html#gadf31cea7d0332a81c8b882cbbdbadb8d',1,'mimalloc-doc.h']]],
+  ['mi_5fsubproc_5fid_5ft_6',['mi_subproc_id_t',['../group__extended.html#ga8c0bcd1fee27c7641e9c3c0d991b3b7d',1,'mimalloc-doc.h']]]
 ];
diff --git a/depends/mimalloc/docs/search/variables_0.js b/depends/mimalloc/docs/search/variables_0.js
index 4c0d7728f8eb..2cf6a443fd0e 100644
--- a/depends/mimalloc/docs/search/variables_0.js
+++ b/depends/mimalloc/docs/search/variables_0.js
@@ -1,5 +1,5 @@
 var searchData=
 [
-  ['block_5fsize_286',['block_size',['../group__analysis.html#a332a6c14d736a99699d5453a1cb04b41',1,'mi_heap_area_t']]],
-  ['blocks_287',['blocks',['../group__analysis.html#ae0085e6e1cf059a4eb7767e30e9991b8',1,'mi_heap_area_t']]]
+  ['block_5fsize_0',['block_size',['../group__analysis.html#a332a6c14d736a99699d5453a1cb04b41',1,'mi_heap_area_t']]],
+  ['blocks_1',['blocks',['../group__analysis.html#ae0085e6e1cf059a4eb7767e30e9991b8',1,'mi_heap_area_t']]]
 ];
diff --git a/depends/mimalloc/docs/search/variables_1.js b/depends/mimalloc/docs/search/variables_1.js
index 449fd615d50a..86ead94f27b8 100644
--- a/depends/mimalloc/docs/search/variables_1.js
+++ b/depends/mimalloc/docs/search/variables_1.js
@@ -1,4 +1,4 @@
 var searchData=
 [
-  ['committed_288',['committed',['../group__analysis.html#ab47526df656d8837ec3e97f11b83f835',1,'mi_heap_area_t']]]
+  ['committed_0',['committed',['../group__analysis.html#ab47526df656d8837ec3e97f11b83f835',1,'mi_heap_area_t']]]
 ];
diff --git a/depends/mimalloc/docs/search/variables_2.js b/depends/mimalloc/docs/search/variables_2.js
index 713c68e01480..5e36c9bf58fb 100644
--- a/depends/mimalloc/docs/search/variables_2.js
+++ b/depends/mimalloc/docs/search/variables_2.js
@@ -1,4 +1,4 @@
 var searchData=
 [
-  ['reserved_289',['reserved',['../group__analysis.html#ae848a3e6840414891035423948ca0383',1,'mi_heap_area_t']]]
+  ['full_5fblock_5fsize_0',['full_block_size',['../group__analysis.html#ab53664e31d7fe2564f8d42041ef75cb3',1,'mi_heap_area_t']]]
 ];
diff --git a/depends/mimalloc/docs/search/variables_3.js b/depends/mimalloc/docs/search/variables_3.js
index 08ec3baed091..792ce772ffb4 100644
--- a/depends/mimalloc/docs/search/variables_3.js
+++ b/depends/mimalloc/docs/search/variables_3.js
@@ -1,4 +1,4 @@
 var searchData=
 [
-  ['used_290',['used',['../group__analysis.html#ab820302c5cd0df133eb8e51650a008b4',1,'mi_heap_area_t']]]
+  ['heap_5ftag_0',['heap_tag',['../group__analysis.html#a2b7a0c92ece8daf46b558efc990ebdc1',1,'mi_heap_area_t']]]
 ];
diff --git a/depends/mimalloc/docs/search/variables_4.js b/depends/mimalloc/docs/search/variables_4.js
new file mode 100644
index 000000000000..30cf0e0c55ce
--- /dev/null
+++ b/depends/mimalloc/docs/search/variables_4.js
@@ -0,0 +1,4 @@
+var searchData=
+[
+  ['reserved_0',['reserved',['../group__analysis.html#ae848a3e6840414891035423948ca0383',1,'mi_heap_area_t']]]
+];
diff --git a/depends/mimalloc/docs/tabs.css b/depends/mimalloc/docs/tabs.css
index e1f2e0b7d8d7..3502ea0aed7c 100644
--- a/depends/mimalloc/docs/tabs.css
+++ b/depends/mimalloc/docs/tabs.css
@@ -4,6 +4,7 @@
     z-index: 101;
     font-size: 13px;
     font-family: 'Lucida Grande',Geneva,Helvetica,Arial,sans-serif;
+    display: table;
 }
 
 .tabs2 {
@@ -16,7 +17,7 @@
 .tablist {
     margin: 0;
     padding: 0;
-    display: table;
+    display: block;
 }
 
 .tablist li {
@@ -40,6 +41,12 @@
     outline: none;
 }
 
+.tablist a:focus {
+    outline: auto;
+    z-index: 10;
+    position: relative;
+}
+
 .tabs3 .tablist a {
     padding: 0 10px;
 }
@@ -47,7 +54,7 @@
 .tablist a:hover {
     background-image: url('tab_h.png');
     background-repeat:repeat-x;
-    color: #fff;
+    color: white;
     text-shadow: 0px 1px 1px rgba(0, 0, 0, 1.0);
     text-decoration: none;
 }
@@ -55,7 +62,7 @@
 .tablist li.current a {
     background-image: url('tab_a.png');
     background-repeat:repeat-x;
-    color: #fff;
+    color: white;
     text-shadow: 0px 1px 1px rgba(0, 0, 0, 1.0);
 }
 
diff --git a/depends/mimalloc/docs/topics.js b/depends/mimalloc/docs/topics.js
new file mode 100644
index 000000000000..a9a23367fb06
--- /dev/null
+++ b/depends/mimalloc/docs/topics.js
@@ -0,0 +1,13 @@
+var topics =
+[
+    [ "Basic Allocation", "group__malloc.html", "group__malloc" ],
+    [ "Extended Functions", "group__extended.html", "group__extended" ],
+    [ "Aligned Allocation", "group__aligned.html", "group__aligned" ],
+    [ "Heap Allocation", "group__heap.html", "group__heap" ],
+    [ "Zero initialized re-allocation", "group__zeroinit.html", "group__zeroinit" ],
+    [ "Typed Macros", "group__typed.html", "group__typed" ],
+    [ "Heap Introspection", "group__analysis.html", "group__analysis" ],
+    [ "Runtime Options", "group__options.html", "group__options" ],
+    [ "Posix", "group__posix.html", "group__posix" ],
+    [ "C++ wrappers", "group__cpp.html", "group__cpp" ]
+];
\ No newline at end of file
diff --git a/depends/mimalloc/docs/using.html b/depends/mimalloc/docs/using.html
index 140f0c5c5147..a9996227b709 100644
--- a/depends/mimalloc/docs/using.html
+++ b/depends/mimalloc/docs/using.html
@@ -1,24 +1,26 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "https://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
+<html xmlns="http://www.w3.org/1999/xhtml" lang="en-US">
 <head>
 <meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
-<meta http-equiv="X-UA-Compatible" content="IE=9"/>
-<meta name="generator" content="Doxygen 1.9.1"/>
+<meta http-equiv="X-UA-Compatible" content="IE=11"/>
+<meta name="generator" content="Doxygen 1.13.1"/>
 <meta name="viewport" content="width=device-width, initial-scale=1"/>
 <title>mi-malloc: Using the library</title>
 <link href="tabs.css" rel="stylesheet" type="text/css"/>
 <script type="text/javascript" src="jquery.js"></script>
 <script type="text/javascript" src="dynsections.js"></script>
+<script type="text/javascript" src="clipboard.js"></script>
 <link href="navtree.css" rel="stylesheet" type="text/css"/>
-<script type="text/javascript" src="resize.js"></script>
 <script type="text/javascript" src="navtreedata.js"></script>
 <script type="text/javascript" src="navtree.js"></script>
+<script type="text/javascript" src="resize.js"></script>
+<script type="text/javascript" src="cookie.js"></script>
 <link href="search/search.css" rel="stylesheet" type="text/css"/>
 <script type="text/javascript" src="search/searchdata.js"></script>
 <script type="text/javascript" src="search/search.js"></script>
 <script type="text/javascript">
-/* @license magnet:?xt=urn:btih:cf05388f2679ee054f2beb29a391d25f4e673ac3&amp;dn=gpl-2.0.txt GPL-v2 */
-  $(document).ready(function() { init_search(); });
+/* @license magnet:?xt=urn:btih:d3d9a9a6595521f9666a5e94cc830dab83b65699&amp;dn=expat.txt MIT */
+  $(function() { init_search(); });
 /* @license-end */
 </script>
 <link href="doxygen.css" rel="stylesheet" type="text/css" />
@@ -29,20 +31,16 @@
 <div id="titlearea">
 <table cellspacing="0" cellpadding="0">
  <tbody>
- <tr style="height: 56px;">
+ <tr id="projectrow">
   <td id="projectlogo"><img alt="Logo" src="mimalloc-logo.svg"/></td>
-  <td id="projectalign" style="padding-left: 0.5em;">
-   <div id="projectname">mi-malloc
-   &#160;<span id="projectnumber">1.7/2.0</span>
+  <td id="projectalign">
+   <div id="projectname">mi-malloc<span id="projectnumber">&#160;1.8/2.1</span>
    </div>
   </td>
-   <td>        <div id="MSearchBox" class="MSearchBoxInactive">
+    <td>        <div id="MSearchBox" class="MSearchBoxInactive">
         <span class="left">
-          <img id="MSearchSelect" src="search/mag_sel.svg"
-               onmouseover="return searchBox.OnSearchSelectShow()"
-               onmouseout="return searchBox.OnSearchSelectHide()"
-               alt=""/>
-          <input type="text" id="MSearchField" value="Search" accesskey="S"
+          <span id="MSearchSelect"                onmouseover="return searchBox.OnSearchSelectShow()"                onmouseout="return searchBox.OnSearchSelectHide()">&#160;</span>
+          <input type="text" id="MSearchField" value="" placeholder="Search" accesskey="S"
                onfocus="searchBox.OnSearchFieldFocus(true)" 
                onblur="searchBox.OnSearchFieldFocus(false)" 
                onkeyup="searchBox.OnSearchFieldChange(event)"/>
@@ -56,10 +54,15 @@
 </table>
 </div>
 <!-- end header part -->
-<!-- Generated by Doxygen 1.9.1 -->
+<!-- Generated by Doxygen 1.13.1 -->
+<script type="text/javascript">
+/* @license magnet:?xt=urn:btih:d3d9a9a6595521f9666a5e94cc830dab83b65699&amp;dn=expat.txt MIT */
+var searchBox = new SearchBox("searchBox", "search/",'.html');
+/* @license-end */
+</script>
 <script type="text/javascript">
-/* @license magnet:?xt=urn:btih:cf05388f2679ee054f2beb29a391d25f4e673ac3&amp;dn=gpl-2.0.txt GPL-v2 */
-var searchBox = new SearchBox("searchBox", "search",false,'Search','.html');
+/* @license magnet:?xt=urn:btih:d3d9a9a6595521f9666a5e94cc830dab83b65699&amp;dn=expat.txt MIT */
+$(function() { codefold.init(0); });
 /* @license-end */
 </script>
 </div><!-- top -->
@@ -74,8 +77,8 @@
   </div>
 </div>
 <script type="text/javascript">
-/* @license magnet:?xt=urn:btih:cf05388f2679ee054f2beb29a391d25f4e673ac3&amp;dn=gpl-2.0.txt GPL-v2 */
-$(document).ready(function(){initNavTree('using.html',''); initResizable(); });
+/* @license magnet:?xt=urn:btih:d3d9a9a6595521f9666a5e94cc830dab83b65699&amp;dn=expat.txt MIT */
+$(function(){initNavTree('using.html',''); initResizable(true); });
 /* @license-end */
 </script>
 <div id="doc-content">
@@ -88,24 +91,30 @@
 
 <!-- iframe showing the search results (closed by default) -->
 <div id="MSearchResultsWindow">
-<iframe src="javascript:void(0)" frameborder="0" 
-        name="MSearchResults" id="MSearchResults">
-</iframe>
+<div id="MSearchResults">
+<div class="SRPage">
+<div id="SRIndex">
+<div id="SRResults"></div>
+<div class="SRStatus" id="Loading">Loading...</div>
+<div class="SRStatus" id="Searching">Searching...</div>
+<div class="SRStatus" id="NoMatches">No Matches</div>
+</div>
+</div>
+</div>
 </div>
 
-<div class="PageDoc"><div class="header">
-  <div class="headertitle">
-<div class="title">Using the library </div>  </div>
+<div><div class="header">
+  <div class="headertitle"><div class="title">Using the library</div></div>
 </div><!--header-->
 <div class="contents">
 <div class="textblock"><h3>Build</h3>
 <p>The preferred usage is including <code>&lt;mimalloc.h&gt;</code>, linking with the shared- or static library, and using the <code>mi_malloc</code> API exclusively for allocation. For example, </p><div class="fragment"><div class="line">gcc -o myprogram -lmimalloc myfile.c</div>
-</div><!-- fragment --><p>mimalloc uses only safe OS calls (<code>mmap</code> and <code>VirtualAlloc</code>) and can co-exist with other allocators linked to the same program. If you use <code>cmake</code>, you can simply use: </p><div class="fragment"><div class="line">find_package(mimalloc 1.0 REQUIRED)</div>
+</div><!-- fragment --><p>mimalloc uses only safe OS calls (<code>mmap</code> and <code>VirtualAlloc</code>) and can co-exist with other allocators linked to the same program. If you use <code>cmake</code>, you can simply use: </p><div class="fragment"><div class="line">find_package(mimalloc 2.1 REQUIRED)</div>
 </div><!-- fragment --><p> in your <code>CMakeLists.txt</code> to find a locally installed mimalloc. Then use either: </p><div class="fragment"><div class="line">target_link_libraries(myapp PUBLIC mimalloc)</div>
 </div><!-- fragment --><p> to link with the shared (dynamic) library, or: </p><div class="fragment"><div class="line">target_link_libraries(myapp PUBLIC mimalloc-<span class="keyword">static</span>)</div>
 </div><!-- fragment --><p> to link with the static library. See <code>test\CMakeLists.txt</code> for an example.</p>
 <h3>C++</h3>
-<p>For best performance in C++ programs, it is also recommended to override the global <code>new</code> and <code>delete</code> operators. For convience, mimalloc provides <a href="https://github.com/microsoft/mimalloc/blob/master/include/mimalloc-new-delete.h"><code>mimalloc-new-delete.h</code></a> which does this for you &ndash; just include it in a single(!) source file in your project without linking to the mimalloc's library.</p>
+<p>For best performance in C++ programs, it is also recommended to override the global <code>new</code> and <code>delete</code> operators. For convenience, mimalloc provides <a href="https://github.com/microsoft/mimalloc/blob/master/include/mimalloc-new-delete.h"><code>mimalloc-new-delete.h</code></a> which does this for you &ndash; just include it in a single(!) source file in your project.</p>
 <p>In C++, mimalloc also provides the <code><a class="el" href="group__cpp.html#structmi__stl__allocator" title="std::allocator implementation for mimalloc for use in STL containers.">mi_stl_allocator</a></code> struct which implements the <code>std::allocator</code> interface. For example: </p><div class="fragment"><div class="line">std::vector&lt;some_struct, mi_stl_allocator&lt;some_struct&gt;&gt; vec;</div>
 <div class="line">vec.push_back(some_struct());</div>
 </div><!-- fragment --><h3>Statistics</h3>
@@ -148,7 +157,7 @@ <h3>C++</h3>
 <!-- start footer part -->
 <div id="nav-path" class="navpath"><!-- id is needed for treeview function! -->
   <ul>
-    <li class="footer">Generated by <a href="https://www.doxygen.org/index.html"><img class="footer" src="doxygen.svg" width="104" height="31" alt="doxygen"/></a> 1.9.1 </li>
+    <li class="footer">Generated by <a href="https://www.doxygen.org/index.html"><img class="footer" src="doxygen.svg" width="104" height="31" alt="doxygen"/></a> 1.13.1 </li>
   </ul>
 </div>
 </body>
diff --git a/depends/mimalloc/ide/vs2017/mimalloc-override-test.vcxproj b/depends/mimalloc/ide/vs2017/mimalloc-override-test.vcxproj
deleted file mode 100644
index faaa00e35477..000000000000
--- a/depends/mimalloc/ide/vs2017/mimalloc-override-test.vcxproj
+++ /dev/null
@@ -1,190 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <VCProjectVersion>15.0</VCProjectVersion>
-    <ProjectGuid>{FEF7868F-750E-4C21-A04D-22707CC66879}</ProjectGuid>
-    <RootNamespace>mimalloc-override-test</RootNamespace>
-    <WindowsTargetPlatformVersion>10.0.17134.0</WindowsTargetPlatformVersion>
-    <ProjectName>mimalloc-override-test</ProjectName>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v141</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v141</PlatformToolset>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v141</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v141</PlatformToolset>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Label="Shared">
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <OutDir>$(ProjectDir)..\..\out\msvc-$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>$(ProjectDir)..\..\out\msvc-$(Platform)\$(ProjectName)\$(Configuration)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <OutDir>$(ProjectDir)..\..\out\msvc-$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>$(ProjectDir)..\..\out\msvc-$(Platform)\$(ProjectName)\$(Configuration)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <OutDir>$(ProjectDir)..\..\out\msvc-$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>$(ProjectDir)..\..\out\msvc-$(Platform)\$(ProjectName)\$(Configuration)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <OutDir>$(ProjectDir)..\..\out\msvc-$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>$(ProjectDir)..\..\out\msvc-$(Platform)\$(ProjectName)\$(Configuration)\</IntDir>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>Disabled</Optimization>
-      <SDLCheck>true</SDLCheck>
-      <ConformanceMode>true</ConformanceMode>
-      <AdditionalIncludeDirectories>..\..\include</AdditionalIncludeDirectories>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <ExceptionHandling>false</ExceptionHandling>
-      <CompileAs>Default</CompileAs>
-      <SupportJustMyCode>false</SupportJustMyCode>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <AdditionalDependencies>kernel32.lib;%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-    <PostBuildEvent />
-    <PostBuildEvent>
-      <Command>
-      </Command>
-    </PostBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>Disabled</Optimization>
-      <SDLCheck>true</SDLCheck>
-      <ConformanceMode>true</ConformanceMode>
-      <AdditionalIncludeDirectories>..\..\include</AdditionalIncludeDirectories>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <ExceptionHandling>Sync</ExceptionHandling>
-      <CompileAs>Default</CompileAs>
-      <SupportJustMyCode>false</SupportJustMyCode>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <EntryPointSymbol>
-      </EntryPointSymbol>
-      <AdditionalDependencies>kernel32.lib;%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-    <PostBuildEvent />
-    <PostBuildEvent>
-      <Command>
-      </Command>
-    </PostBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>MaxSpeed</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <SDLCheck>true</SDLCheck>
-      <ConformanceMode>true</ConformanceMode>
-      <AdditionalIncludeDirectories>..\..\include</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_MBCS;%(PreprocessorDefinitions);NDEBUG</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-    </ClCompile>
-    <Link>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-      <SubSystem>Console</SubSystem>
-      <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-    <PostBuildEvent>
-      <Command>
-      </Command>
-    </PostBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>MaxSpeed</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <SDLCheck>true</SDLCheck>
-      <ConformanceMode>true</ConformanceMode>
-      <AdditionalIncludeDirectories>..\..\include</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_MBCS;%(PreprocessorDefinitions);NDEBUG</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-    </ClCompile>
-    <Link>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-      <SubSystem>Console</SubSystem>
-      <EntryPointSymbol>
-      </EntryPointSymbol>
-      <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-    <PostBuildEvent>
-      <Command>
-      </Command>
-    </PostBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ProjectReference Include="mimalloc-override.vcxproj">
-      <Project>{abb5eae7-b3e6-432e-b636-333449892ea7}</Project>
-    </ProjectReference>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\test\main-override.cpp" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/depends/mimalloc/ide/vs2017/mimalloc-override-test.vcxproj.filters b/depends/mimalloc/ide/vs2017/mimalloc-override-test.vcxproj.filters
deleted file mode 100644
index eb5e70b7c25b..000000000000
--- a/depends/mimalloc/ide/vs2017/mimalloc-override-test.vcxproj.filters
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="Source Files">
-      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
-      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
-    </Filter>
-    <Filter Include="Header Files">
-      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
-      <Extensions>h;hh;hpp;hxx;hm;inl;inc;ipp;xsd</Extensions>
-    </Filter>
-    <Filter Include="Resource Files">
-      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
-      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\test\main-override.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/depends/mimalloc/ide/vs2017/mimalloc-override.vcxproj b/depends/mimalloc/ide/vs2017/mimalloc-override.vcxproj
deleted file mode 100644
index a87b69ac6887..000000000000
--- a/depends/mimalloc/ide/vs2017/mimalloc-override.vcxproj
+++ /dev/null
@@ -1,256 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <VCProjectVersion>15.0</VCProjectVersion>
-    <ProjectGuid>{ABB5EAE7-B3E6-432E-B636-333449892EA7}</ProjectGuid>
-    <RootNamespace>mimalloc-override</RootNamespace>
-    <WindowsTargetPlatformVersion>10.0.17134.0</WindowsTargetPlatformVersion>
-    <ProjectName>mimalloc-override</ProjectName>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v141</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v141</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v141</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v141</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Label="Shared">
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <OutDir>$(SolutionDir)..\..\out\msvc-$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>$(SolutionDir)..\..\out\msvc-$(Platform)\$(ProjectName)\$(Configuration)\</IntDir>
-    <TargetExt>.dll</TargetExt>
-    <TargetName>mimalloc-override</TargetName>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <OutDir>$(SolutionDir)..\..\out\msvc-$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>$(SolutionDir)..\..\out\msvc-$(Platform)\$(ProjectName)\$(Configuration)\</IntDir>
-    <TargetExt>.dll</TargetExt>
-    <TargetName>mimalloc-override</TargetName>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <OutDir>$(SolutionDir)..\..\out\msvc-$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>$(SolutionDir)..\..\out\msvc-$(Platform)\$(ProjectName)\$(Configuration)\</IntDir>
-    <TargetExt>.dll</TargetExt>
-    <TargetName>mimalloc-override</TargetName>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <OutDir>$(SolutionDir)..\..\out\msvc-$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>$(SolutionDir)..\..\out\msvc-$(Platform)\$(ProjectName)\$(Configuration)\</IntDir>
-    <TargetExt>.dll</TargetExt>
-    <TargetName>mimalloc-override</TargetName>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>Disabled</Optimization>
-      <SDLCheck>true</SDLCheck>
-      <ConformanceMode>true</ConformanceMode>
-      <AdditionalIncludeDirectories>../../include</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;MI_SHARED_LIB;MI_SHARED_LIB_EXPORT;MI_MALLOC_OVERRIDE;%(PreprocessorDefinitions);</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <SupportJustMyCode>false</SupportJustMyCode>
-      <CompileAs>Default</CompileAs>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>$(ProjectDir)\..\..\bin\mimalloc-redirect32.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <IgnoreSpecificDefaultLibraries>
-      </IgnoreSpecificDefaultLibraries>
-      <ModuleDefinitionFile>
-      </ModuleDefinitionFile>
-      <LinkTimeCodeGeneration>Default</LinkTimeCodeGeneration>
-      <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
-    </Link>
-    <PostBuildEvent>
-      <Command>COPY /Y $(ProjectDir)..\..\bin\mimalloc-redirect32.dll $(OutputPath)</Command>
-    </PostBuildEvent>
-    <PostBuildEvent>
-      <Message>Copy mimalloc-redirect32.dll to the output directory</Message>
-    </PostBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>Disabled</Optimization>
-      <SDLCheck>true</SDLCheck>
-      <ConformanceMode>true</ConformanceMode>
-      <AdditionalIncludeDirectories>../../include</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;MI_SHARED_LIB;MI_SHARED_LIB_EXPORT;MI_MALLOC_OVERRIDE;%(PreprocessorDefinitions);</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <SupportJustMyCode>false</SupportJustMyCode>
-      <CompileAs>Default</CompileAs>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>$(ProjectDir)\..\..\bin\mimalloc-redirect.lib;bcrypt.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <IgnoreSpecificDefaultLibraries>
-      </IgnoreSpecificDefaultLibraries>
-      <ModuleDefinitionFile>
-      </ModuleDefinitionFile>
-      <LinkTimeCodeGeneration>Default</LinkTimeCodeGeneration>
-      <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
-    </Link>
-    <PostBuildEvent>
-      <Command>COPY /Y $(ProjectDir)..\..\bin\mimalloc-redirect.dll $(OutputPath)</Command>
-    </PostBuildEvent>
-    <PostBuildEvent>
-      <Message>copy mimalloc-redirect.dll to the output directory</Message>
-    </PostBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>MaxSpeed</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <ConformanceMode>true</ConformanceMode>
-      <AdditionalIncludeDirectories>../../include</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;MI_SHARED_LIB;MI_SHARED_LIB_EXPORT;MI_MALLOC_OVERRIDE;%(PreprocessorDefinitions);NDEBUG</PreprocessorDefinitions>
-      <AssemblerOutput>AssemblyAndSourceCode</AssemblerOutput>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <WholeProgramOptimization>false</WholeProgramOptimization>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <CompileAs>Default</CompileAs>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-    </ClCompile>
-    <Link>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-      <AdditionalDependencies>$(ProjectDir)\..\..\bin\mimalloc-redirect32.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <ModuleDefinitionFile>
-      </ModuleDefinitionFile>
-      <LinkTimeCodeGeneration>Default</LinkTimeCodeGeneration>
-      <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
-    </Link>
-    <PostBuildEvent>
-      <Command>COPY /Y $(ProjectDir)..\..\bin\mimalloc-redirect32.dll $(OutputPath)</Command>
-    </PostBuildEvent>
-    <PostBuildEvent>
-      <Message>Copy mimalloc-redirect32.dll to the output directory</Message>
-    </PostBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>MaxSpeed</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <ConformanceMode>true</ConformanceMode>
-      <AdditionalIncludeDirectories>../../include</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;MI_SHARED_LIB;MI_SHARED_LIB_EXPORT;MI_MALLOC_OVERRIDE;%(PreprocessorDefinitions);NDEBUG</PreprocessorDefinitions>
-      <AssemblerOutput>AssemblyAndSourceCode</AssemblerOutput>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <WholeProgramOptimization>false</WholeProgramOptimization>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <CompileAs>Default</CompileAs>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-    </ClCompile>
-    <Link>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-      <AdditionalDependencies>$(ProjectDir)\..\..\bin\mimalloc-redirect.lib;bcrypt.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <ModuleDefinitionFile>
-      </ModuleDefinitionFile>
-      <LinkTimeCodeGeneration>Default</LinkTimeCodeGeneration>
-      <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
-    </Link>
-    <PostBuildEvent>
-      <Command>COPY /Y $(ProjectDir)..\..\bin\mimalloc-redirect.dll $(OutputPath)</Command>
-    </PostBuildEvent>
-    <PostBuildEvent>
-      <Message>copy mimalloc-redirect.dll to the output directory</Message>
-    </PostBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClInclude Include="$(ProjectDir)..\..\include\mimalloc-internal.h" />
-    <ClInclude Include="$(ProjectDir)..\..\include\mimalloc.h" />
-    <ClInclude Include="..\..\include\mimalloc-atomic.h" />
-    <ClInclude Include="..\..\include\mimalloc-new-delete.h" />
-    <ClInclude Include="..\..\include\mimalloc-override.h" />
-    <ClInclude Include="..\..\include\mimalloc-types.h" />
-    <ClInclude Include="..\..\src\bitmap.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\src\alloc-aligned.c">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="..\..\src\alloc-override.c">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="..\..\src\alloc-posix.c" />
-    <ClCompile Include="..\..\src\alloc.c" />
-    <ClCompile Include="..\..\src\arena.c" />
-    <ClCompile Include="..\..\src\bitmap.c" />
-    <ClCompile Include="..\..\src\heap.c" />
-    <ClCompile Include="..\..\src\init.c" />
-    <ClCompile Include="..\..\src\options.c" />
-    <ClCompile Include="..\..\src\os.c" />
-    <ClCompile Include="..\..\src\page-queue.c">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="..\..\src\page.c" />
-    <ClCompile Include="..\..\src\random.c" />
-    <ClCompile Include="..\..\src\segment-cache.c" />
-    <ClCompile Include="..\..\src\segment.c" />
-    <ClCompile Include="..\..\src\stats.c" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/depends/mimalloc/ide/vs2017/mimalloc-override.vcxproj.filters b/depends/mimalloc/ide/vs2017/mimalloc-override.vcxproj.filters
deleted file mode 100644
index d01f9311f199..000000000000
--- a/depends/mimalloc/ide/vs2017/mimalloc-override.vcxproj.filters
+++ /dev/null
@@ -1,86 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="Source Files">
-      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
-      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
-    </Filter>
-    <Filter Include="Header Files">
-      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
-      <Extensions>h;hh;hpp;hxx;hm;inl;inc;ipp;xsd</Extensions>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="$(ProjectDir)..\..\include\mimalloc.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="$(ProjectDir)..\..\include\mimalloc-internal.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\mimalloc-types.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\mimalloc-atomic.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\mimalloc-override.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\mimalloc-new-delete.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\bitmap.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\src\alloc.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\os.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\page.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\page-queue.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\segment.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\stats.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\alloc-aligned.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\heap.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\options.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\init.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\alloc-override.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\alloc-posix.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\arena.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\random.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\bitmap.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\segment-cache.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/depends/mimalloc/ide/vs2017/mimalloc-test-stress.vcxproj b/depends/mimalloc/ide/vs2017/mimalloc-test-stress.vcxproj
deleted file mode 100644
index b8267d0b39b2..000000000000
--- a/depends/mimalloc/ide/vs2017/mimalloc-test-stress.vcxproj
+++ /dev/null
@@ -1,159 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <VCProjectVersion>15.0</VCProjectVersion>
-    <ProjectGuid>{FEF7958F-750E-4C21-A04D-22707CC66878}</ProjectGuid>
-    <RootNamespace>mimalloc-test-stress</RootNamespace>
-    <WindowsTargetPlatformVersion>10.0.17134.0</WindowsTargetPlatformVersion>
-    <ProjectName>mimalloc-test-stress</ProjectName>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v141</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v141</PlatformToolset>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v141</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v141</PlatformToolset>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Label="Shared">
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <OutDir>$(ProjectDir)..\..\out\msvc-$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>$(ProjectDir)..\..\out\msvc-$(Platform)\$(ProjectName)\$(Configuration)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <OutDir>$(ProjectDir)..\..\out\msvc-$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>$(ProjectDir)..\..\out\msvc-$(Platform)\$(ProjectName)\$(Configuration)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <OutDir>$(ProjectDir)..\..\out\msvc-$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>$(ProjectDir)..\..\out\msvc-$(Platform)\$(ProjectName)\$(Configuration)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <OutDir>$(ProjectDir)..\..\out\msvc-$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>$(ProjectDir)..\..\out\msvc-$(Platform)\$(ProjectName)\$(Configuration)\</IntDir>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>Disabled</Optimization>
-      <SDLCheck>true</SDLCheck>
-      <ConformanceMode>true</ConformanceMode>
-      <AdditionalIncludeDirectories>..\..\include</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>Disabled</Optimization>
-      <SDLCheck>true</SDLCheck>
-      <ConformanceMode>true</ConformanceMode>
-      <AdditionalIncludeDirectories>..\..\include</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>MaxSpeed</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <SDLCheck>true</SDLCheck>
-      <ConformanceMode>true</ConformanceMode>
-      <AdditionalIncludeDirectories>..\..\include</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>%(PreprocessorDefinitions);NDEBUG</PreprocessorDefinitions>
-    </ClCompile>
-    <Link>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-      <SubSystem>Console</SubSystem>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>MaxSpeed</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <SDLCheck>true</SDLCheck>
-      <ConformanceMode>true</ConformanceMode>
-      <AdditionalIncludeDirectories>..\..\include</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>%(PreprocessorDefinitions);NDEBUG</PreprocessorDefinitions>
-    </ClCompile>
-    <Link>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-      <SubSystem>Console</SubSystem>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\test\test-stress.c">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ExcludedFromBuild>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="mimalloc.vcxproj">
-      <Project>{abb5eae7-b3e6-432e-b636-333449892ea6}</Project>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/depends/mimalloc/ide/vs2017/mimalloc-test-stress.vcxproj.filters b/depends/mimalloc/ide/vs2017/mimalloc-test-stress.vcxproj.filters
deleted file mode 100644
index 7c5239e8271c..000000000000
--- a/depends/mimalloc/ide/vs2017/mimalloc-test-stress.vcxproj.filters
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="Source Files">
-      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
-      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
-    </Filter>
-    <Filter Include="Header Files">
-      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
-      <Extensions>h;hh;hpp;hxx;hm;inl;inc;ipp;xsd</Extensions>
-    </Filter>
-    <Filter Include="Resource Files">
-      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
-      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\test\test-stress.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/depends/mimalloc/ide/vs2017/mimalloc-test.vcxproj b/depends/mimalloc/ide/vs2017/mimalloc-test.vcxproj
deleted file mode 100644
index 27c7bb6ea44c..000000000000
--- a/depends/mimalloc/ide/vs2017/mimalloc-test.vcxproj
+++ /dev/null
@@ -1,158 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <VCProjectVersion>15.0</VCProjectVersion>
-    <ProjectGuid>{FEF7858F-750E-4C21-A04D-22707CC66878}</ProjectGuid>
-    <RootNamespace>mimalloctest</RootNamespace>
-    <WindowsTargetPlatformVersion>10.0.17134.0</WindowsTargetPlatformVersion>
-    <ProjectName>mimalloc-test</ProjectName>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v141</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v141</PlatformToolset>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v141</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v141</PlatformToolset>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Label="Shared">
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <OutDir>$(ProjectDir)..\..\out\msvc-$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>$(ProjectDir)..\..\out\msvc-$(Platform)\$(ProjectName)\$(Configuration)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <OutDir>$(ProjectDir)..\..\out\msvc-$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>$(ProjectDir)..\..\out\msvc-$(Platform)\$(ProjectName)\$(Configuration)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <OutDir>$(ProjectDir)..\..\out\msvc-$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>$(ProjectDir)..\..\out\msvc-$(Platform)\$(ProjectName)\$(Configuration)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <OutDir>$(ProjectDir)..\..\out\msvc-$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>$(ProjectDir)..\..\out\msvc-$(Platform)\$(ProjectName)\$(Configuration)\</IntDir>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>Disabled</Optimization>
-      <SDLCheck>true</SDLCheck>
-      <ConformanceMode>true</ConformanceMode>
-      <AdditionalIncludeDirectories>..\..\include</AdditionalIncludeDirectories>
-      <LanguageStandard>stdcpp17</LanguageStandard>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>Disabled</Optimization>
-      <SDLCheck>true</SDLCheck>
-      <ConformanceMode>true</ConformanceMode>
-      <AdditionalIncludeDirectories>..\..\include</AdditionalIncludeDirectories>
-      <LanguageStandard>stdcpp17</LanguageStandard>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>MaxSpeed</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <SDLCheck>true</SDLCheck>
-      <ConformanceMode>true</ConformanceMode>
-      <AdditionalIncludeDirectories>..\..\include</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_MBCS;%(PreprocessorDefinitions);NDEBUG</PreprocessorDefinitions>
-      <LanguageStandard>stdcpp17</LanguageStandard>
-    </ClCompile>
-    <Link>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-      <SubSystem>Console</SubSystem>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>MaxSpeed</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <SDLCheck>true</SDLCheck>
-      <ConformanceMode>true</ConformanceMode>
-      <AdditionalIncludeDirectories>..\..\include</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_MBCS;%(PreprocessorDefinitions);NDEBUG</PreprocessorDefinitions>
-      <LanguageStandard>stdcpp17</LanguageStandard>
-    </ClCompile>
-    <Link>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-      <SubSystem>Console</SubSystem>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ProjectReference Include="mimalloc.vcxproj">
-      <Project>{abb5eae7-b3e6-432e-b636-333449892ea6}</Project>
-    </ProjectReference>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\test\main-override-static.c" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/depends/mimalloc/ide/vs2017/mimalloc-test.vcxproj.filters b/depends/mimalloc/ide/vs2017/mimalloc-test.vcxproj.filters
deleted file mode 100644
index fca75e1c3023..000000000000
--- a/depends/mimalloc/ide/vs2017/mimalloc-test.vcxproj.filters
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="Source Files">
-      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
-      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
-    </Filter>
-    <Filter Include="Header Files">
-      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
-      <Extensions>h;hh;hpp;hxx;hm;inl;inc;ipp;xsd</Extensions>
-    </Filter>
-    <Filter Include="Resource Files">
-      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
-      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\test\main-override-static.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/depends/mimalloc/ide/vs2017/mimalloc.sln b/depends/mimalloc/ide/vs2017/mimalloc.sln
deleted file mode 100644
index aeab6b88fc35..000000000000
--- a/depends/mimalloc/ide/vs2017/mimalloc.sln
+++ /dev/null
@@ -1,71 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.28010.2016
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mimalloc", "mimalloc.vcxproj", "{ABB5EAE7-B3E6-432E-B636-333449892EA6}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mimalloc-test", "mimalloc-test.vcxproj", "{FEF7858F-750E-4C21-A04D-22707CC66878}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mimalloc-override", "mimalloc-override.vcxproj", "{ABB5EAE7-B3E6-432E-B636-333449892EA7}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mimalloc-override-test", "mimalloc-override-test.vcxproj", "{FEF7868F-750E-4C21-A04D-22707CC66879}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mimalloc-test-stress", "mimalloc-test-stress.vcxproj", "{FEF7958F-750E-4C21-A04D-22707CC66878}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|x64 = Debug|x64
-		Debug|x86 = Debug|x86
-		Release|x64 = Release|x64
-		Release|x86 = Release|x86
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{ABB5EAE7-B3E6-432E-B636-333449892EA6}.Debug|x64.ActiveCfg = Debug|x64
-		{ABB5EAE7-B3E6-432E-B636-333449892EA6}.Debug|x64.Build.0 = Debug|x64
-		{ABB5EAE7-B3E6-432E-B636-333449892EA6}.Debug|x86.ActiveCfg = Debug|Win32
-		{ABB5EAE7-B3E6-432E-B636-333449892EA6}.Debug|x86.Build.0 = Debug|Win32
-		{ABB5EAE7-B3E6-432E-B636-333449892EA6}.Release|x64.ActiveCfg = Release|x64
-		{ABB5EAE7-B3E6-432E-B636-333449892EA6}.Release|x64.Build.0 = Release|x64
-		{ABB5EAE7-B3E6-432E-B636-333449892EA6}.Release|x86.ActiveCfg = Release|Win32
-		{ABB5EAE7-B3E6-432E-B636-333449892EA6}.Release|x86.Build.0 = Release|Win32
-		{FEF7858F-750E-4C21-A04D-22707CC66878}.Debug|x64.ActiveCfg = Debug|x64
-		{FEF7858F-750E-4C21-A04D-22707CC66878}.Debug|x64.Build.0 = Debug|x64
-		{FEF7858F-750E-4C21-A04D-22707CC66878}.Debug|x86.ActiveCfg = Debug|Win32
-		{FEF7858F-750E-4C21-A04D-22707CC66878}.Debug|x86.Build.0 = Debug|Win32
-		{FEF7858F-750E-4C21-A04D-22707CC66878}.Release|x64.ActiveCfg = Release|x64
-		{FEF7858F-750E-4C21-A04D-22707CC66878}.Release|x64.Build.0 = Release|x64
-		{FEF7858F-750E-4C21-A04D-22707CC66878}.Release|x86.ActiveCfg = Release|Win32
-		{FEF7858F-750E-4C21-A04D-22707CC66878}.Release|x86.Build.0 = Release|Win32
-		{ABB5EAE7-B3E6-432E-B636-333449892EA7}.Debug|x64.ActiveCfg = Debug|x64
-		{ABB5EAE7-B3E6-432E-B636-333449892EA7}.Debug|x64.Build.0 = Debug|x64
-		{ABB5EAE7-B3E6-432E-B636-333449892EA7}.Debug|x86.ActiveCfg = Debug|Win32
-		{ABB5EAE7-B3E6-432E-B636-333449892EA7}.Debug|x86.Build.0 = Debug|Win32
-		{ABB5EAE7-B3E6-432E-B636-333449892EA7}.Release|x64.ActiveCfg = Release|x64
-		{ABB5EAE7-B3E6-432E-B636-333449892EA7}.Release|x64.Build.0 = Release|x64
-		{ABB5EAE7-B3E6-432E-B636-333449892EA7}.Release|x86.ActiveCfg = Release|Win32
-		{ABB5EAE7-B3E6-432E-B636-333449892EA7}.Release|x86.Build.0 = Release|Win32
-		{FEF7868F-750E-4C21-A04D-22707CC66879}.Debug|x64.ActiveCfg = Debug|x64
-		{FEF7868F-750E-4C21-A04D-22707CC66879}.Debug|x64.Build.0 = Debug|x64
-		{FEF7868F-750E-4C21-A04D-22707CC66879}.Debug|x86.ActiveCfg = Debug|Win32
-		{FEF7868F-750E-4C21-A04D-22707CC66879}.Debug|x86.Build.0 = Debug|Win32
-		{FEF7868F-750E-4C21-A04D-22707CC66879}.Release|x64.ActiveCfg = Release|x64
-		{FEF7868F-750E-4C21-A04D-22707CC66879}.Release|x64.Build.0 = Release|x64
-		{FEF7868F-750E-4C21-A04D-22707CC66879}.Release|x86.ActiveCfg = Release|Win32
-		{FEF7868F-750E-4C21-A04D-22707CC66879}.Release|x86.Build.0 = Release|Win32
-		{FEF7958F-750E-4C21-A04D-22707CC66878}.Debug|x64.ActiveCfg = Debug|x64
-		{FEF7958F-750E-4C21-A04D-22707CC66878}.Debug|x64.Build.0 = Debug|x64
-		{FEF7958F-750E-4C21-A04D-22707CC66878}.Debug|x86.ActiveCfg = Debug|Win32
-		{FEF7958F-750E-4C21-A04D-22707CC66878}.Debug|x86.Build.0 = Debug|Win32
-		{FEF7958F-750E-4C21-A04D-22707CC66878}.Release|x64.ActiveCfg = Release|x64
-		{FEF7958F-750E-4C21-A04D-22707CC66878}.Release|x64.Build.0 = Release|x64
-		{FEF7958F-750E-4C21-A04D-22707CC66878}.Release|x86.ActiveCfg = Release|Win32
-		{FEF7958F-750E-4C21-A04D-22707CC66878}.Release|x86.Build.0 = Release|Win32
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {4297F93D-486A-4243-995F-7D32F59AE82A}
-	EndGlobalSection
-EndGlobal
diff --git a/depends/mimalloc/ide/vs2017/mimalloc.vcxproj b/depends/mimalloc/ide/vs2017/mimalloc.vcxproj
deleted file mode 100644
index 41fb77c1bf23..000000000000
--- a/depends/mimalloc/ide/vs2017/mimalloc.vcxproj
+++ /dev/null
@@ -1,262 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <VCProjectVersion>15.0</VCProjectVersion>
-    <ProjectGuid>{ABB5EAE7-B3E6-432E-B636-333449892EA6}</ProjectGuid>
-    <RootNamespace>mimalloc</RootNamespace>
-    <WindowsTargetPlatformVersion>10.0.17134.0</WindowsTargetPlatformVersion>
-    <ProjectName>mimalloc</ProjectName>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v141</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v141</PlatformToolset>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v141</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v141</PlatformToolset>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Label="Shared">
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <OutDir>$(SolutionDir)..\..\out\msvc-$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>$(SolutionDir)..\..\out\msvc-$(Platform)\$(ProjectName)\$(Configuration)\</IntDir>
-    <TargetExt>.lib</TargetExt>
-    <TargetName>mimalloc-static</TargetName>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <OutDir>$(SolutionDir)..\..\out\msvc-$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>$(SolutionDir)..\..\out\msvc-$(Platform)\$(ProjectName)\$(Configuration)\</IntDir>
-    <TargetExt>.lib</TargetExt>
-    <TargetName>mimalloc-static</TargetName>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <OutDir>$(SolutionDir)..\..\out\msvc-$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>$(SolutionDir)..\..\out\msvc-$(Platform)\$(ProjectName)\$(Configuration)\</IntDir>
-    <TargetExt>.lib</TargetExt>
-    <TargetName>mimalloc-static</TargetName>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <OutDir>$(SolutionDir)..\..\out\msvc-$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>$(SolutionDir)..\..\out\msvc-$(Platform)\$(ProjectName)\$(Configuration)\</IntDir>
-    <TargetExt>.lib</TargetExt>
-    <TargetName>mimalloc-static</TargetName>
-  </PropertyGroup>
-  <PropertyGroup Label="LLVM" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <UseLlvmLib>false</UseLlvmLib>
-  </PropertyGroup>
-  <PropertyGroup Label="LLVM" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <UseLlvmLib>false</UseLlvmLib>
-  </PropertyGroup>
-  <PropertyGroup Label="LLVM" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <UseLlvmLib>false</UseLlvmLib>
-  </PropertyGroup>
-  <PropertyGroup Label="LLVM" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <UseLlvmLib>false</UseLlvmLib>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>Disabled</Optimization>
-      <SDLCheck>true</SDLCheck>
-      <ConformanceMode>true</ConformanceMode>
-      <AdditionalIncludeDirectories>../../include</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;MI_DEBUG=3;%(PreprocessorDefinitions);</PreprocessorDefinitions>
-      <CompileAs>CompileAsC</CompileAs>
-      <SupportJustMyCode>false</SupportJustMyCode>
-      <LanguageStandard>stdcpp17</LanguageStandard>
-    </ClCompile>
-    <Lib>
-      <AdditionalLibraryDirectories>
-      </AdditionalLibraryDirectories>
-      <AdditionalDependencies>
-      </AdditionalDependencies>
-    </Lib>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <ClCompile>
-      <WarningLevel>Level4</WarningLevel>
-      <Optimization>Disabled</Optimization>
-      <SDLCheck>true</SDLCheck>
-      <ConformanceMode>true</ConformanceMode>
-      <AdditionalIncludeDirectories>../../include</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;MI_DEBUG=3;%(PreprocessorDefinitions);</PreprocessorDefinitions>
-      <CompileAs>CompileAsC</CompileAs>
-      <SupportJustMyCode>false</SupportJustMyCode>
-      <LanguageStandard>stdcpp17</LanguageStandard>
-    </ClCompile>
-    <PostBuildEvent>
-      <Command>
-      </Command>
-    </PostBuildEvent>
-    <Link>
-      <EntryPointSymbol>
-      </EntryPointSymbol>
-    </Link>
-    <Lib>
-      <AdditionalLibraryDirectories>
-      </AdditionalLibraryDirectories>
-      <AdditionalDependencies>
-      </AdditionalDependencies>
-    </Lib>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>MaxSpeed</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <ConformanceMode>true</ConformanceMode>
-      <AdditionalIncludeDirectories>../../include</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions);NDEBUG</PreprocessorDefinitions>
-      <AssemblerOutput>AssemblyAndSourceCode</AssemblerOutput>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <WholeProgramOptimization>false</WholeProgramOptimization>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <InlineFunctionExpansion>Default</InlineFunctionExpansion>
-      <CompileAs>CompileAsC</CompileAs>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-    </ClCompile>
-    <Link>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-    </Link>
-    <Lib>
-      <AdditionalLibraryDirectories>
-      </AdditionalLibraryDirectories>
-      <AdditionalDependencies>
-      </AdditionalDependencies>
-    </Lib>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <ClCompile>
-      <WarningLevel>Level4</WarningLevel>
-      <Optimization>MaxSpeed</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <ConformanceMode>true</ConformanceMode>
-      <AdditionalIncludeDirectories>../../include</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions);NDEBUG</PreprocessorDefinitions>
-      <AssemblerOutput>AssemblyAndSourceCode</AssemblerOutput>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <WholeProgramOptimization>false</WholeProgramOptimization>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <InlineFunctionExpansion>Default</InlineFunctionExpansion>
-      <CompileAs>CompileAsC</CompileAs>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-    </ClCompile>
-    <Link>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EntryPointSymbol>
-      </EntryPointSymbol>
-    </Link>
-    <PostBuildEvent>
-      <Command>
-      </Command>
-    </PostBuildEvent>
-    <Lib>
-      <AdditionalLibraryDirectories>
-      </AdditionalLibraryDirectories>
-      <AdditionalDependencies>
-      </AdditionalDependencies>
-    </Lib>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\src\alloc-aligned.c">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="..\..\src\alloc-override-osx.c">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="..\..\src\alloc-override.c">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="..\..\src\alloc-posix.c" />
-    <ClCompile Include="..\..\src\alloc.c" />
-    <ClCompile Include="..\..\src\arena.c" />
-    <ClCompile Include="..\..\src\bitmap.c" />
-    <ClCompile Include="..\..\src\heap.c" />
-    <ClCompile Include="..\..\src\init.c" />
-    <ClCompile Include="..\..\src\options.c" />
-    <ClCompile Include="..\..\src\page-queue.c">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="..\..\src\page.c" />
-    <ClCompile Include="..\..\src\random.c" />
-    <ClCompile Include="..\..\src\segment-cache.c" />
-    <ClCompile Include="..\..\src\segment.c" />
-    <ClCompile Include="..\..\src\os.c" />
-    <ClCompile Include="..\..\src\stats.c" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="$(ProjectDir)..\..\include\mimalloc-internal.h" />
-    <ClInclude Include="$(ProjectDir)..\..\include\mimalloc.h" />
-    <ClInclude Include="$(ProjectDir)..\..\include\mimalloc-atomic.h" />
-    <ClInclude Include="$(ProjectDir)..\..\include\mimalloc-override.h" />
-    <ClInclude Include="$(ProjectDir)..\..\include\mimalloc-types.h" />
-    <ClInclude Include="..\..\include\mimalloc-new-delete.h" />
-    <ClInclude Include="..\..\src\bitmap.h" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/depends/mimalloc/ide/vs2017/mimalloc.vcxproj.filters b/depends/mimalloc/ide/vs2017/mimalloc.vcxproj.filters
deleted file mode 100644
index 054176452686..000000000000
--- a/depends/mimalloc/ide/vs2017/mimalloc.vcxproj.filters
+++ /dev/null
@@ -1,92 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="Source Files">
-      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
-      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
-    </Filter>
-    <Filter Include="Header Files">
-      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
-      <Extensions>h;hh;hpp;hxx;hm;inl;inc;ipp;xsd</Extensions>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\src\stats.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\os.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\alloc.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\page.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\segment.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\alloc-aligned.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\page-queue.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\heap.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\alloc-override-osx.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\alloc-override.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\options.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\init.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\alloc-posix.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\arena.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\arena.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\random.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\bitmap.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\segment-cache.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="$(ProjectDir)..\..\include\mimalloc.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="$(ProjectDir)..\..\include\mimalloc-internal.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="$(ProjectDir)..\..\include\mimalloc-atomic.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="$(ProjectDir)..\..\include\mimalloc-override.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="$(ProjectDir)..\..\include\mimalloc-types.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\mimalloc-new-delete.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\bitmap.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/depends/mimalloc/ide/vs2019/mimalloc-override-test.vcxproj b/depends/mimalloc/ide/vs2019/mimalloc-override-test.vcxproj
deleted file mode 100644
index 7a9202f1b1b6..000000000000
--- a/depends/mimalloc/ide/vs2019/mimalloc-override-test.vcxproj
+++ /dev/null
@@ -1,190 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <VCProjectVersion>15.0</VCProjectVersion>
-    <ProjectGuid>{FEF7868F-750E-4C21-A04D-22707CC66879}</ProjectGuid>
-    <RootNamespace>mimalloc-override-test</RootNamespace>
-    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
-    <ProjectName>mimalloc-override-test</ProjectName>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v142</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v142</PlatformToolset>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v142</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v142</PlatformToolset>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Label="Shared">
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <OutDir>$(ProjectDir)..\..\out\msvc-$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>$(ProjectDir)..\..\out\msvc-$(Platform)\$(ProjectName)\$(Configuration)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <OutDir>$(ProjectDir)..\..\out\msvc-$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>$(ProjectDir)..\..\out\msvc-$(Platform)\$(ProjectName)\$(Configuration)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <OutDir>$(ProjectDir)..\..\out\msvc-$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>$(ProjectDir)..\..\out\msvc-$(Platform)\$(ProjectName)\$(Configuration)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <OutDir>$(ProjectDir)..\..\out\msvc-$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>$(ProjectDir)..\..\out\msvc-$(Platform)\$(ProjectName)\$(Configuration)\</IntDir>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>Disabled</Optimization>
-      <SDLCheck>true</SDLCheck>
-      <ConformanceMode>true</ConformanceMode>
-      <AdditionalIncludeDirectories>..\..\include</AdditionalIncludeDirectories>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <ExceptionHandling>Sync</ExceptionHandling>
-      <CompileAs>Default</CompileAs>
-      <SupportJustMyCode>false</SupportJustMyCode>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <AdditionalDependencies>kernel32.lib;%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-    <PostBuildEvent />
-    <PostBuildEvent>
-      <Command>
-      </Command>
-    </PostBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>Disabled</Optimization>
-      <SDLCheck>true</SDLCheck>
-      <ConformanceMode>true</ConformanceMode>
-      <AdditionalIncludeDirectories>..\..\include</AdditionalIncludeDirectories>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <ExceptionHandling>Sync</ExceptionHandling>
-      <CompileAs>Default</CompileAs>
-      <SupportJustMyCode>false</SupportJustMyCode>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <EntryPointSymbol>
-      </EntryPointSymbol>
-      <AdditionalDependencies>kernel32.lib;%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-    <PostBuildEvent />
-    <PostBuildEvent>
-      <Command>
-      </Command>
-    </PostBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>MaxSpeed</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <SDLCheck>true</SDLCheck>
-      <ConformanceMode>true</ConformanceMode>
-      <AdditionalIncludeDirectories>..\..\include</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_MBCS;%(PreprocessorDefinitions);NDEBUG</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-    </ClCompile>
-    <Link>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-      <SubSystem>Console</SubSystem>
-      <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-    <PostBuildEvent>
-      <Command>
-      </Command>
-    </PostBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>MaxSpeed</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <SDLCheck>true</SDLCheck>
-      <ConformanceMode>true</ConformanceMode>
-      <AdditionalIncludeDirectories>..\..\include</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_MBCS;%(PreprocessorDefinitions);NDEBUG</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-    </ClCompile>
-    <Link>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-      <SubSystem>Console</SubSystem>
-      <EntryPointSymbol>
-      </EntryPointSymbol>
-      <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-    <PostBuildEvent>
-      <Command>
-      </Command>
-    </PostBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\test\main-override.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="mimalloc-override.vcxproj">
-      <Project>{abb5eae7-b3e6-432e-b636-333449892ea7}</Project>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/depends/mimalloc/ide/vs2019/mimalloc-override.vcxproj b/depends/mimalloc/ide/vs2019/mimalloc-override.vcxproj
deleted file mode 100644
index 4136e574a83c..000000000000
--- a/depends/mimalloc/ide/vs2019/mimalloc-override.vcxproj
+++ /dev/null
@@ -1,256 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <VCProjectVersion>15.0</VCProjectVersion>
-    <ProjectGuid>{ABB5EAE7-B3E6-432E-B636-333449892EA7}</ProjectGuid>
-    <RootNamespace>mimalloc-override</RootNamespace>
-    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
-    <ProjectName>mimalloc-override</ProjectName>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v142</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v142</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v142</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v142</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Label="Shared">
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <OutDir>$(SolutionDir)..\..\out\msvc-$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>$(SolutionDir)..\..\out\msvc-$(Platform)\$(ProjectName)\$(Configuration)\</IntDir>
-    <TargetExt>.dll</TargetExt>
-    <TargetName>mimalloc-override</TargetName>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <OutDir>$(SolutionDir)..\..\out\msvc-$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>$(SolutionDir)..\..\out\msvc-$(Platform)\$(ProjectName)\$(Configuration)\</IntDir>
-    <TargetExt>.dll</TargetExt>
-    <TargetName>mimalloc-override</TargetName>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <OutDir>$(SolutionDir)..\..\out\msvc-$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>$(SolutionDir)..\..\out\msvc-$(Platform)\$(ProjectName)\$(Configuration)\</IntDir>
-    <TargetExt>.dll</TargetExt>
-    <TargetName>mimalloc-override</TargetName>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <OutDir>$(SolutionDir)..\..\out\msvc-$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>$(SolutionDir)..\..\out\msvc-$(Platform)\$(ProjectName)\$(Configuration)\</IntDir>
-    <TargetExt>.dll</TargetExt>
-    <TargetName>mimalloc-override</TargetName>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>Disabled</Optimization>
-      <SDLCheck>true</SDLCheck>
-      <ConformanceMode>true</ConformanceMode>
-      <AdditionalIncludeDirectories>../../include</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>MI_SHARED_LIB;MI_SHARED_LIB_EXPORT;MI_MALLOC_OVERRIDE;%(PreprocessorDefinitions);</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <SupportJustMyCode>false</SupportJustMyCode>
-      <CompileAs>Default</CompileAs>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>$(ProjectDir)\..\..\bin\mimalloc-redirect32.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <IgnoreSpecificDefaultLibraries>
-      </IgnoreSpecificDefaultLibraries>
-      <ModuleDefinitionFile>
-      </ModuleDefinitionFile>
-      <LinkTimeCodeGeneration>Default</LinkTimeCodeGeneration>
-      <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
-    </Link>
-    <PostBuildEvent>
-      <Command>COPY /Y $(ProjectDir)..\..\bin\mimalloc-redirect32.dll $(OutputPath)</Command>
-    </PostBuildEvent>
-    <PostBuildEvent>
-      <Message>Copy mimalloc-redirect32.dll to the output directory</Message>
-    </PostBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>Disabled</Optimization>
-      <SDLCheck>true</SDLCheck>
-      <ConformanceMode>true</ConformanceMode>
-      <AdditionalIncludeDirectories>../../include</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>MI_DEBUG=3;MI_SHARED_LIB;MI_SHARED_LIB_EXPORT;MI_MALLOC_OVERRIDE;%(PreprocessorDefinitions);</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <SupportJustMyCode>false</SupportJustMyCode>
-      <CompileAs>Default</CompileAs>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>$(ProjectDir)\..\..\bin\mimalloc-redirect.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <IgnoreSpecificDefaultLibraries>
-      </IgnoreSpecificDefaultLibraries>
-      <ModuleDefinitionFile>
-      </ModuleDefinitionFile>
-      <LinkTimeCodeGeneration>Default</LinkTimeCodeGeneration>
-      <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
-    </Link>
-    <PostBuildEvent>
-      <Command>COPY /Y $(ProjectDir)..\..\bin\mimalloc-redirect.dll $(OutputPath)</Command>
-    </PostBuildEvent>
-    <PostBuildEvent>
-      <Message>copy mimalloc-redirect.dll to the output directory</Message>
-    </PostBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>MaxSpeed</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <ConformanceMode>true</ConformanceMode>
-      <AdditionalIncludeDirectories>../../include</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>MI_SHARED_LIB;MI_SHARED_LIB_EXPORT;MI_MALLOC_OVERRIDE;%(PreprocessorDefinitions);NDEBUG</PreprocessorDefinitions>
-      <AssemblerOutput>AssemblyAndSourceCode</AssemblerOutput>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <WholeProgramOptimization>false</WholeProgramOptimization>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <CompileAs>Default</CompileAs>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-    </ClCompile>
-    <Link>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-      <AdditionalDependencies>$(ProjectDir)\..\..\bin\mimalloc-redirect32.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <ModuleDefinitionFile>
-      </ModuleDefinitionFile>
-      <LinkTimeCodeGeneration>Default</LinkTimeCodeGeneration>
-      <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
-    </Link>
-    <PostBuildEvent>
-      <Command>COPY /Y $(ProjectDir)..\..\bin\mimalloc-redirect32.dll $(OutputPath)</Command>
-    </PostBuildEvent>
-    <PostBuildEvent>
-      <Message>Copy mimalloc-redirect32.dll to the output directory</Message>
-    </PostBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>MaxSpeed</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <ConformanceMode>true</ConformanceMode>
-      <AdditionalIncludeDirectories>../../include</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>MI_SHARED_LIB;MI_SHARED_LIB_EXPORT;MI_MALLOC_OVERRIDE;%(PreprocessorDefinitions);NDEBUG</PreprocessorDefinitions>
-      <AssemblerOutput>AssemblyAndSourceCode</AssemblerOutput>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <WholeProgramOptimization>false</WholeProgramOptimization>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <CompileAs>Default</CompileAs>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-    </ClCompile>
-    <Link>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-      <AdditionalDependencies>$(ProjectDir)\..\..\bin\mimalloc-redirect.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <ModuleDefinitionFile>
-      </ModuleDefinitionFile>
-      <LinkTimeCodeGeneration>Default</LinkTimeCodeGeneration>
-      <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
-    </Link>
-    <PostBuildEvent>
-      <Command>COPY /Y $(ProjectDir)..\..\bin\mimalloc-redirect.dll $(OutputPath)</Command>
-    </PostBuildEvent>
-    <PostBuildEvent>
-      <Message>copy mimalloc-redirect.dll to the output directory</Message>
-    </PostBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClInclude Include="$(ProjectDir)..\..\include\mimalloc-internal.h" />
-    <ClInclude Include="$(ProjectDir)..\..\include\mimalloc.h" />
-    <ClInclude Include="..\..\include\mimalloc-atomic.h" />
-    <ClInclude Include="..\..\include\mimalloc-new-delete.h" />
-    <ClInclude Include="..\..\include\mimalloc-override.h" />
-    <ClInclude Include="..\..\include\mimalloc-types.h" />
-    <ClInclude Include="..\..\src\bitmap.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\src\alloc-aligned.c">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="..\..\src\alloc-override.c">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="..\..\src\alloc-posix.c" />
-    <ClCompile Include="..\..\src\alloc.c" />
-    <ClCompile Include="..\..\src\arena.c" />
-    <ClCompile Include="..\..\src\bitmap.c" />
-    <ClCompile Include="..\..\src\heap.c" />
-    <ClCompile Include="..\..\src\init.c" />
-    <ClCompile Include="..\..\src\options.c" />
-    <ClCompile Include="..\..\src\os.c" />
-    <ClCompile Include="..\..\src\page-queue.c">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="..\..\src\page.c" />
-    <ClCompile Include="..\..\src\random.c" />
-    <ClCompile Include="..\..\src\segment-cache.c" />
-    <ClCompile Include="..\..\src\segment.c" />
-    <ClCompile Include="..\..\src\stats.c" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/depends/mimalloc/ide/vs2019/mimalloc-override.vcxproj.filters b/depends/mimalloc/ide/vs2019/mimalloc-override.vcxproj.filters
deleted file mode 100644
index d6b7b5a966df..000000000000
--- a/depends/mimalloc/ide/vs2019/mimalloc-override.vcxproj.filters
+++ /dev/null
@@ -1,84 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <ClCompile Include="..\..\src\alloc.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\alloc-aligned.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\alloc-override.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\alloc-posix.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\heap.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\init.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\os.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\page.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\page-queue.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\segment.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\stats.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\arena.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\random.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\options.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\bitmap.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\segment-cache.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="$(ProjectDir)..\..\include\mimalloc.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\mimalloc-atomic.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="$(ProjectDir)..\..\include\mimalloc-internal.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\mimalloc-new-delete.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\mimalloc-override.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\mimalloc-types.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\bitmap.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-  </ItemGroup>
-  <ItemGroup>
-    <Filter Include="Header Files">
-      <UniqueIdentifier>{f1fccf27-17b9-42dd-ba51-6070baff85c6}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Source Files">
-      <UniqueIdentifier>{39cb7e38-69d0-43fb-8406-6a0f7cefc3b4}</UniqueIdentifier>
-    </Filter>
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/depends/mimalloc/ide/vs2019/mimalloc-test-api.vcxproj b/depends/mimalloc/ide/vs2019/mimalloc-test-api.vcxproj
deleted file mode 100644
index 812a9cb1163c..000000000000
--- a/depends/mimalloc/ide/vs2019/mimalloc-test-api.vcxproj
+++ /dev/null
@@ -1,155 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <VCProjectVersion>15.0</VCProjectVersion>
-    <ProjectGuid>{FFF7958F-750E-4C21-A04D-22707CC66878}</ProjectGuid>
-    <RootNamespace>mimalloc-test-api</RootNamespace>
-    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
-    <ProjectName>mimalloc-test-api</ProjectName>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v142</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v142</PlatformToolset>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v142</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v142</PlatformToolset>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Label="Shared">
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <OutDir>$(ProjectDir)..\..\out\msvc-$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>$(ProjectDir)..\..\out\msvc-$(Platform)\$(ProjectName)\$(Configuration)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <OutDir>$(ProjectDir)..\..\out\msvc-$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>$(ProjectDir)..\..\out\msvc-$(Platform)\$(ProjectName)\$(Configuration)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <OutDir>$(ProjectDir)..\..\out\msvc-$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>$(ProjectDir)..\..\out\msvc-$(Platform)\$(ProjectName)\$(Configuration)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <OutDir>$(ProjectDir)..\..\out\msvc-$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>$(ProjectDir)..\..\out\msvc-$(Platform)\$(ProjectName)\$(Configuration)\</IntDir>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>Disabled</Optimization>
-      <SDLCheck>true</SDLCheck>
-      <ConformanceMode>true</ConformanceMode>
-      <AdditionalIncludeDirectories>..\..\include</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>Disabled</Optimization>
-      <SDLCheck>true</SDLCheck>
-      <ConformanceMode>true</ConformanceMode>
-      <AdditionalIncludeDirectories>..\..\include</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>MaxSpeed</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <SDLCheck>true</SDLCheck>
-      <ConformanceMode>true</ConformanceMode>
-      <AdditionalIncludeDirectories>..\..\include</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>%(PreprocessorDefinitions);NDEBUG</PreprocessorDefinitions>
-    </ClCompile>
-    <Link>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-      <SubSystem>Console</SubSystem>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>MaxSpeed</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <SDLCheck>true</SDLCheck>
-      <ConformanceMode>true</ConformanceMode>
-      <AdditionalIncludeDirectories>..\..\include</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>%(PreprocessorDefinitions);NDEBUG</PreprocessorDefinitions>
-    </ClCompile>
-    <Link>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-      <SubSystem>Console</SubSystem>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\test\test-api.c">
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="mimalloc.vcxproj">
-      <Project>{abb5eae7-b3e6-432e-b636-333449892ea6}</Project>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
diff --git a/depends/mimalloc/ide/vs2019/mimalloc-test-stress.vcxproj b/depends/mimalloc/ide/vs2019/mimalloc-test-stress.vcxproj
deleted file mode 100644
index ef7ab3575a96..000000000000
--- a/depends/mimalloc/ide/vs2019/mimalloc-test-stress.vcxproj
+++ /dev/null
@@ -1,159 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <VCProjectVersion>15.0</VCProjectVersion>
-    <ProjectGuid>{FEF7958F-750E-4C21-A04D-22707CC66878}</ProjectGuid>
-    <RootNamespace>mimalloc-test-stress</RootNamespace>
-    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
-    <ProjectName>mimalloc-test-stress</ProjectName>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v142</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v142</PlatformToolset>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v142</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v142</PlatformToolset>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Label="Shared">
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <OutDir>$(ProjectDir)..\..\out\msvc-$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>$(ProjectDir)..\..\out\msvc-$(Platform)\$(ProjectName)\$(Configuration)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <OutDir>$(ProjectDir)..\..\out\msvc-$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>$(ProjectDir)..\..\out\msvc-$(Platform)\$(ProjectName)\$(Configuration)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <OutDir>$(ProjectDir)..\..\out\msvc-$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>$(ProjectDir)..\..\out\msvc-$(Platform)\$(ProjectName)\$(Configuration)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <OutDir>$(ProjectDir)..\..\out\msvc-$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>$(ProjectDir)..\..\out\msvc-$(Platform)\$(ProjectName)\$(Configuration)\</IntDir>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>Disabled</Optimization>
-      <SDLCheck>true</SDLCheck>
-      <ConformanceMode>true</ConformanceMode>
-      <AdditionalIncludeDirectories>..\..\include</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>Disabled</Optimization>
-      <SDLCheck>true</SDLCheck>
-      <ConformanceMode>true</ConformanceMode>
-      <AdditionalIncludeDirectories>..\..\include</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>MaxSpeed</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <SDLCheck>true</SDLCheck>
-      <ConformanceMode>true</ConformanceMode>
-      <AdditionalIncludeDirectories>..\..\include</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>%(PreprocessorDefinitions);NDEBUG</PreprocessorDefinitions>
-    </ClCompile>
-    <Link>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-      <SubSystem>Console</SubSystem>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>MaxSpeed</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <SDLCheck>true</SDLCheck>
-      <ConformanceMode>true</ConformanceMode>
-      <AdditionalIncludeDirectories>..\..\include</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>%(PreprocessorDefinitions);NDEBUG</PreprocessorDefinitions>
-    </ClCompile>
-    <Link>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-      <SubSystem>Console</SubSystem>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\test\test-stress.c">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ExcludedFromBuild>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="mimalloc.vcxproj">
-      <Project>{abb5eae7-b3e6-432e-b636-333449892ea6}</Project>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/depends/mimalloc/ide/vs2019/mimalloc-test.vcxproj b/depends/mimalloc/ide/vs2019/mimalloc-test.vcxproj
deleted file mode 100644
index 13af6ab4953b..000000000000
--- a/depends/mimalloc/ide/vs2019/mimalloc-test.vcxproj
+++ /dev/null
@@ -1,158 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <VCProjectVersion>15.0</VCProjectVersion>
-    <ProjectGuid>{FEF7858F-750E-4C21-A04D-22707CC66878}</ProjectGuid>
-    <RootNamespace>mimalloctest</RootNamespace>
-    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
-    <ProjectName>mimalloc-test</ProjectName>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v142</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v142</PlatformToolset>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v142</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v142</PlatformToolset>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Label="Shared">
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <OutDir>$(ProjectDir)..\..\out\msvc-$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>$(ProjectDir)..\..\out\msvc-$(Platform)\$(ProjectName)\$(Configuration)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <OutDir>$(ProjectDir)..\..\out\msvc-$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>$(ProjectDir)..\..\out\msvc-$(Platform)\$(ProjectName)\$(Configuration)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <OutDir>$(ProjectDir)..\..\out\msvc-$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>$(ProjectDir)..\..\out\msvc-$(Platform)\$(ProjectName)\$(Configuration)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <OutDir>$(ProjectDir)..\..\out\msvc-$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>$(ProjectDir)..\..\out\msvc-$(Platform)\$(ProjectName)\$(Configuration)\</IntDir>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>Disabled</Optimization>
-      <SDLCheck>true</SDLCheck>
-      <ConformanceMode>true</ConformanceMode>
-      <AdditionalIncludeDirectories>..\..\include</AdditionalIncludeDirectories>
-      <LanguageStandard>stdcpp17</LanguageStandard>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>Disabled</Optimization>
-      <SDLCheck>true</SDLCheck>
-      <ConformanceMode>true</ConformanceMode>
-      <AdditionalIncludeDirectories>..\..\include</AdditionalIncludeDirectories>
-      <LanguageStandard>stdcpp17</LanguageStandard>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>MaxSpeed</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <SDLCheck>true</SDLCheck>
-      <ConformanceMode>true</ConformanceMode>
-      <AdditionalIncludeDirectories>..\..\include</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_MBCS;%(PreprocessorDefinitions);NDEBUG</PreprocessorDefinitions>
-      <LanguageStandard>stdcpp17</LanguageStandard>
-    </ClCompile>
-    <Link>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-      <SubSystem>Console</SubSystem>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>MaxSpeed</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <SDLCheck>true</SDLCheck>
-      <ConformanceMode>true</ConformanceMode>
-      <AdditionalIncludeDirectories>..\..\include</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_MBCS;%(PreprocessorDefinitions);NDEBUG</PreprocessorDefinitions>
-      <LanguageStandard>stdcpp17</LanguageStandard>
-    </ClCompile>
-    <Link>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-      <SubSystem>Console</SubSystem>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ProjectReference Include="mimalloc.vcxproj">
-      <Project>{abb5eae7-b3e6-432e-b636-333449892ea6}</Project>
-    </ProjectReference>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\test\main-override-static.c" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/depends/mimalloc/ide/vs2019/mimalloc.sln b/depends/mimalloc/ide/vs2019/mimalloc.sln
deleted file mode 100644
index fcb938a4fe2a..000000000000
--- a/depends/mimalloc/ide/vs2019/mimalloc.sln
+++ /dev/null
@@ -1,81 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 16
-VisualStudioVersion = 16.0.29709.97
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mimalloc", "mimalloc.vcxproj", "{ABB5EAE7-B3E6-432E-B636-333449892EA6}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mimalloc-test", "mimalloc-test.vcxproj", "{FEF7858F-750E-4C21-A04D-22707CC66878}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mimalloc-override", "mimalloc-override.vcxproj", "{ABB5EAE7-B3E6-432E-B636-333449892EA7}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mimalloc-override-test", "mimalloc-override-test.vcxproj", "{FEF7868F-750E-4C21-A04D-22707CC66879}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mimalloc-test-stress", "mimalloc-test-stress.vcxproj", "{FEF7958F-750E-4C21-A04D-22707CC66878}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mimalloc-test-api", "mimalloc-test-api.vcxproj", "{FFF7958F-750E-4C21-A04D-22707CC66878}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|x64 = Debug|x64
-		Debug|x86 = Debug|x86
-		Release|x64 = Release|x64
-		Release|x86 = Release|x86
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{ABB5EAE7-B3E6-432E-B636-333449892EA6}.Debug|x64.ActiveCfg = Debug|x64
-		{ABB5EAE7-B3E6-432E-B636-333449892EA6}.Debug|x64.Build.0 = Debug|x64
-		{ABB5EAE7-B3E6-432E-B636-333449892EA6}.Debug|x86.ActiveCfg = Debug|Win32
-		{ABB5EAE7-B3E6-432E-B636-333449892EA6}.Debug|x86.Build.0 = Debug|Win32
-		{ABB5EAE7-B3E6-432E-B636-333449892EA6}.Release|x64.ActiveCfg = Release|x64
-		{ABB5EAE7-B3E6-432E-B636-333449892EA6}.Release|x64.Build.0 = Release|x64
-		{ABB5EAE7-B3E6-432E-B636-333449892EA6}.Release|x86.ActiveCfg = Release|Win32
-		{ABB5EAE7-B3E6-432E-B636-333449892EA6}.Release|x86.Build.0 = Release|Win32
-		{FEF7858F-750E-4C21-A04D-22707CC66878}.Debug|x64.ActiveCfg = Debug|x64
-		{FEF7858F-750E-4C21-A04D-22707CC66878}.Debug|x64.Build.0 = Debug|x64
-		{FEF7858F-750E-4C21-A04D-22707CC66878}.Debug|x86.ActiveCfg = Debug|Win32
-		{FEF7858F-750E-4C21-A04D-22707CC66878}.Debug|x86.Build.0 = Debug|Win32
-		{FEF7858F-750E-4C21-A04D-22707CC66878}.Release|x64.ActiveCfg = Release|x64
-		{FEF7858F-750E-4C21-A04D-22707CC66878}.Release|x64.Build.0 = Release|x64
-		{FEF7858F-750E-4C21-A04D-22707CC66878}.Release|x86.ActiveCfg = Release|Win32
-		{FEF7858F-750E-4C21-A04D-22707CC66878}.Release|x86.Build.0 = Release|Win32
-		{ABB5EAE7-B3E6-432E-B636-333449892EA7}.Debug|x64.ActiveCfg = Debug|x64
-		{ABB5EAE7-B3E6-432E-B636-333449892EA7}.Debug|x64.Build.0 = Debug|x64
-		{ABB5EAE7-B3E6-432E-B636-333449892EA7}.Debug|x86.ActiveCfg = Debug|Win32
-		{ABB5EAE7-B3E6-432E-B636-333449892EA7}.Debug|x86.Build.0 = Debug|Win32
-		{ABB5EAE7-B3E6-432E-B636-333449892EA7}.Release|x64.ActiveCfg = Release|x64
-		{ABB5EAE7-B3E6-432E-B636-333449892EA7}.Release|x64.Build.0 = Release|x64
-		{ABB5EAE7-B3E6-432E-B636-333449892EA7}.Release|x86.ActiveCfg = Release|Win32
-		{ABB5EAE7-B3E6-432E-B636-333449892EA7}.Release|x86.Build.0 = Release|Win32
-		{FEF7868F-750E-4C21-A04D-22707CC66879}.Debug|x64.ActiveCfg = Debug|x64
-		{FEF7868F-750E-4C21-A04D-22707CC66879}.Debug|x64.Build.0 = Debug|x64
-		{FEF7868F-750E-4C21-A04D-22707CC66879}.Debug|x86.ActiveCfg = Debug|Win32
-		{FEF7868F-750E-4C21-A04D-22707CC66879}.Debug|x86.Build.0 = Debug|Win32
-		{FEF7868F-750E-4C21-A04D-22707CC66879}.Release|x64.ActiveCfg = Release|x64
-		{FEF7868F-750E-4C21-A04D-22707CC66879}.Release|x64.Build.0 = Release|x64
-		{FEF7868F-750E-4C21-A04D-22707CC66879}.Release|x86.ActiveCfg = Release|Win32
-		{FEF7868F-750E-4C21-A04D-22707CC66879}.Release|x86.Build.0 = Release|Win32
-		{FEF7958F-750E-4C21-A04D-22707CC66878}.Debug|x64.ActiveCfg = Debug|x64
-		{FEF7958F-750E-4C21-A04D-22707CC66878}.Debug|x64.Build.0 = Debug|x64
-		{FEF7958F-750E-4C21-A04D-22707CC66878}.Debug|x86.ActiveCfg = Debug|Win32
-		{FEF7958F-750E-4C21-A04D-22707CC66878}.Debug|x86.Build.0 = Debug|Win32
-		{FEF7958F-750E-4C21-A04D-22707CC66878}.Release|x64.ActiveCfg = Release|x64
-		{FEF7958F-750E-4C21-A04D-22707CC66878}.Release|x64.Build.0 = Release|x64
-		{FEF7958F-750E-4C21-A04D-22707CC66878}.Release|x86.ActiveCfg = Release|Win32
-		{FEF7958F-750E-4C21-A04D-22707CC66878}.Release|x86.Build.0 = Release|Win32
-		{FFF7958F-750E-4C21-A04D-22707CC66878}.Debug|x64.ActiveCfg = Debug|x64
-		{FFF7958F-750E-4C21-A04D-22707CC66878}.Debug|x64.Build.0 = Debug|x64
-		{FFF7958F-750E-4C21-A04D-22707CC66878}.Debug|x86.ActiveCfg = Debug|Win32
-		{FFF7958F-750E-4C21-A04D-22707CC66878}.Debug|x86.Build.0 = Debug|Win32
-		{FFF7958F-750E-4C21-A04D-22707CC66878}.Release|x64.ActiveCfg = Release|x64
-		{FFF7958F-750E-4C21-A04D-22707CC66878}.Release|x64.Build.0 = Release|x64
-		{FFF7958F-750E-4C21-A04D-22707CC66878}.Release|x86.ActiveCfg = Release|Win32
-		{FFF7958F-750E-4C21-A04D-22707CC66878}.Release|x86.Build.0 = Release|Win32
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {4297F93D-486A-4243-995F-7D32F59AE82A}
-	EndGlobalSection
-EndGlobal
diff --git a/depends/mimalloc/ide/vs2019/mimalloc.vcxproj b/depends/mimalloc/ide/vs2019/mimalloc.vcxproj
deleted file mode 100644
index 9f967d94464b..000000000000
--- a/depends/mimalloc/ide/vs2019/mimalloc.vcxproj
+++ /dev/null
@@ -1,254 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <VCProjectVersion>15.0</VCProjectVersion>
-    <ProjectGuid>{ABB5EAE7-B3E6-432E-B636-333449892EA6}</ProjectGuid>
-    <RootNamespace>mimalloc</RootNamespace>
-    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
-    <ProjectName>mimalloc</ProjectName>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v142</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v142</PlatformToolset>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v142</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v142</PlatformToolset>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Label="Shared">
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <OutDir>$(SolutionDir)..\..\out\msvc-$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>$(SolutionDir)..\..\out\msvc-$(Platform)\$(ProjectName)\$(Configuration)\</IntDir>
-    <TargetExt>.lib</TargetExt>
-    <TargetName>mimalloc-static</TargetName>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <OutDir>$(SolutionDir)..\..\out\msvc-$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>$(SolutionDir)..\..\out\msvc-$(Platform)\$(ProjectName)\$(Configuration)\</IntDir>
-    <TargetExt>.lib</TargetExt>
-    <TargetName>mimalloc-static</TargetName>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <OutDir>$(SolutionDir)..\..\out\msvc-$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>$(SolutionDir)..\..\out\msvc-$(Platform)\$(ProjectName)\$(Configuration)\</IntDir>
-    <TargetExt>.lib</TargetExt>
-    <TargetName>mimalloc-static</TargetName>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <OutDir>$(SolutionDir)..\..\out\msvc-$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>$(SolutionDir)..\..\out\msvc-$(Platform)\$(ProjectName)\$(Configuration)\</IntDir>
-    <TargetExt>.lib</TargetExt>
-    <TargetName>mimalloc-static</TargetName>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <WarningLevel>Level4</WarningLevel>
-      <Optimization>Disabled</Optimization>
-      <SDLCheck>true</SDLCheck>
-      <ConformanceMode>true</ConformanceMode>
-      <AdditionalIncludeDirectories>../../include</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>MI_DEBUG=3;%(PreprocessorDefinitions);</PreprocessorDefinitions>
-      <CompileAs>CompileAsCpp</CompileAs>
-      <SupportJustMyCode>false</SupportJustMyCode>
-      <LanguageStandard>Default</LanguageStandard>
-    </ClCompile>
-    <Lib>
-      <AdditionalLibraryDirectories>
-      </AdditionalLibraryDirectories>
-      <AdditionalDependencies>
-      </AdditionalDependencies>
-    </Lib>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <ClCompile>
-      <WarningLevel>Level4</WarningLevel>
-      <Optimization>Disabled</Optimization>
-      <SDLCheck>true</SDLCheck>
-      <ConformanceMode>true</ConformanceMode>
-      <AdditionalIncludeDirectories>../../include</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>MI_DEBUG=3;%(PreprocessorDefinitions);</PreprocessorDefinitions>
-      <CompileAs>CompileAsCpp</CompileAs>
-      <SupportJustMyCode>false</SupportJustMyCode>
-      <LanguageStandard>Default</LanguageStandard>
-    </ClCompile>
-    <PostBuildEvent>
-      <Command>
-      </Command>
-    </PostBuildEvent>
-    <Link>
-      <EntryPointSymbol>
-      </EntryPointSymbol>
-    </Link>
-    <Lib>
-      <AdditionalLibraryDirectories>
-      </AdditionalLibraryDirectories>
-      <AdditionalDependencies>
-      </AdditionalDependencies>
-    </Lib>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <WarningLevel>Level4</WarningLevel>
-      <Optimization>MaxSpeed</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <ConformanceMode>true</ConformanceMode>
-      <AdditionalIncludeDirectories>../../include</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>%(PreprocessorDefinitions);NDEBUG</PreprocessorDefinitions>
-      <AssemblerOutput>AssemblyAndSourceCode</AssemblerOutput>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <WholeProgramOptimization>false</WholeProgramOptimization>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <InlineFunctionExpansion>Default</InlineFunctionExpansion>
-      <CompileAs>CompileAsCpp</CompileAs>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <LanguageStandard>Default</LanguageStandard>
-    </ClCompile>
-    <Link>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-    </Link>
-    <Lib>
-      <AdditionalLibraryDirectories>
-      </AdditionalLibraryDirectories>
-      <AdditionalDependencies>
-      </AdditionalDependencies>
-    </Lib>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <ClCompile>
-      <WarningLevel>Level4</WarningLevel>
-      <Optimization>MaxSpeed</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <ConformanceMode>true</ConformanceMode>
-      <AdditionalIncludeDirectories>../../include</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>%(PreprocessorDefinitions);NDEBUG</PreprocessorDefinitions>
-      <AssemblerOutput>AssemblyAndSourceCode</AssemblerOutput>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <WholeProgramOptimization>false</WholeProgramOptimization>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <InlineFunctionExpansion>Default</InlineFunctionExpansion>
-      <CompileAs>CompileAsCpp</CompileAs>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <LanguageStandard>Default</LanguageStandard>
-    </ClCompile>
-    <Link>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EntryPointSymbol>
-      </EntryPointSymbol>
-    </Link>
-    <PostBuildEvent>
-      <Command>
-      </Command>
-    </PostBuildEvent>
-    <Lib>
-      <AdditionalLibraryDirectories>
-      </AdditionalLibraryDirectories>
-      <AdditionalDependencies>
-      </AdditionalDependencies>
-    </Lib>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\src\alloc-aligned.c">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="..\..\src\alloc-override-osx.c">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="..\..\src\alloc-override.c">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="..\..\src\alloc-posix.c" />
-    <ClCompile Include="..\..\src\alloc.c" />
-    <ClCompile Include="..\..\src\arena.c" />
-    <ClCompile Include="..\..\src\bitmap.c">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="..\..\src\heap.c" />
-    <ClCompile Include="..\..\src\init.c" />
-    <ClCompile Include="..\..\src\options.c" />
-    <ClCompile Include="..\..\src\page-queue.c">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="..\..\src\page.c" />
-    <ClCompile Include="..\..\src\random.c" />
-    <ClCompile Include="..\..\src\segment-cache.c" />
-    <ClCompile Include="..\..\src\segment.c" />
-    <ClCompile Include="..\..\src\os.c" />
-    <ClCompile Include="..\..\src\stats.c" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="$(ProjectDir)..\..\include\mimalloc-internal.h" />
-    <ClInclude Include="$(ProjectDir)..\..\include\mimalloc.h" />
-    <ClInclude Include="$(ProjectDir)..\..\include\mimalloc-atomic.h" />
-    <ClInclude Include="$(ProjectDir)..\..\include\mimalloc-override.h" />
-    <ClInclude Include="$(ProjectDir)..\..\include\mimalloc-types.h" />
-    <ClInclude Include="..\..\include\mimalloc-new-delete.h" />
-    <ClInclude Include="..\..\src\bitmap.h" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/depends/mimalloc/ide/vs2019/mimalloc.vcxproj.filters b/depends/mimalloc/ide/vs2019/mimalloc.vcxproj.filters
deleted file mode 100644
index 92be7cb47e81..000000000000
--- a/depends/mimalloc/ide/vs2019/mimalloc.vcxproj.filters
+++ /dev/null
@@ -1,87 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <ClCompile Include="..\..\src\alloc.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\alloc-aligned.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\alloc-override.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\alloc-override-osx.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\alloc-posix.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\heap.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\init.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\options.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\os.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\page.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\page-queue.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\segment.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\stats.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\arena.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\random.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\bitmap.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\segment-cache.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="$(ProjectDir)..\..\include\mimalloc.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="$(ProjectDir)..\..\include\mimalloc-atomic.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="$(ProjectDir)..\..\include\mimalloc-internal.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\mimalloc-new-delete.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="$(ProjectDir)..\..\include\mimalloc-override.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="$(ProjectDir)..\..\include\mimalloc-types.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\bitmap.h">
-      <Filter>Source Files</Filter>
-    </ClInclude>
-  </ItemGroup>
-  <ItemGroup>
-    <Filter Include="Header Files">
-      <UniqueIdentifier>{2b556b10-f559-4b2d-896e-142652adbf0c}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Source Files">
-      <UniqueIdentifier>{852a14ae-6dde-4e95-8077-ca705e97e5af}</UniqueIdentifier>
-    </Filter>
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/depends/mimalloc/ide/vs2022/mimalloc-lib.vcxproj b/depends/mimalloc/ide/vs2022/mimalloc-lib.vcxproj
new file mode 100644
index 000000000000..b4bf013e0890
--- /dev/null
+++ b/depends/mimalloc/ide/vs2022/mimalloc-lib.vcxproj
@@ -0,0 +1,500 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|ARM64">
+      <Configuration>Debug</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|ARM64EC">
+      <Configuration>Debug</Configuration>
+      <Platform>ARM64EC</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|ARM64">
+      <Configuration>Release</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|ARM64EC">
+      <Configuration>Release</Configuration>
+      <Platform>ARM64EC</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <VCProjectVersion>15.0</VCProjectVersion>
+    <ProjectGuid>{ABB5EAE7-B3E6-432E-B636-333449892EA6}</ProjectGuid>
+    <RootNamespace>mimalloc-lib</RootNamespace>
+    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
+    <ProjectName>mimalloc-lib</ProjectName>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>v143</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>v143</PlatformToolset>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>v143</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>v143</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64EC'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>v143</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>v143</PlatformToolset>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>v143</PlatformToolset>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64EC'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>v143</PlatformToolset>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Label="Shared">
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64EC'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64EC'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <OutDir>$(SolutionDir)..\..\out\msvc-$(Platform)\$(Configuration)\</OutDir>
+    <IntDir>$(SolutionDir)..\..\out\msvc-$(Platform)\$(ProjectName)\$(Configuration)\</IntDir>
+    <TargetExt>.lib</TargetExt>
+    <TargetName>mimalloc</TargetName>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <OutDir>$(SolutionDir)..\..\out\msvc-$(Platform)\$(Configuration)\</OutDir>
+    <IntDir>$(SolutionDir)..\..\out\msvc-$(Platform)\$(ProjectName)\$(Configuration)\</IntDir>
+    <TargetExt>.lib</TargetExt>
+    <TargetName>mimalloc</TargetName>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <OutDir>$(SolutionDir)..\..\out\msvc-$(Platform)\$(Configuration)\</OutDir>
+    <IntDir>$(SolutionDir)..\..\out\msvc-$(Platform)\$(ProjectName)\$(Configuration)\</IntDir>
+    <TargetExt>.lib</TargetExt>
+    <TargetName>mimalloc</TargetName>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">
+    <OutDir>$(SolutionDir)..\..\out\msvc-$(Platform)\$(Configuration)\</OutDir>
+    <IntDir>$(SolutionDir)..\..\out\msvc-$(Platform)\$(ProjectName)\$(Configuration)\</IntDir>
+    <TargetExt>.lib</TargetExt>
+    <TargetName>mimalloc</TargetName>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64EC'">
+    <OutDir>$(SolutionDir)..\..\out\msvc-$(Platform)\$(Configuration)\</OutDir>
+    <IntDir>$(SolutionDir)..\..\out\msvc-$(Platform)\$(ProjectName)\$(Configuration)\</IntDir>
+    <TargetExt>.lib</TargetExt>
+    <TargetName>mimalloc</TargetName>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <OutDir>$(SolutionDir)..\..\out\msvc-$(Platform)\$(Configuration)\</OutDir>
+    <IntDir>$(SolutionDir)..\..\out\msvc-$(Platform)\$(ProjectName)\$(Configuration)\</IntDir>
+    <TargetExt>.lib</TargetExt>
+    <TargetName>mimalloc</TargetName>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">
+    <OutDir>$(SolutionDir)..\..\out\msvc-$(Platform)\$(Configuration)\</OutDir>
+    <IntDir>$(SolutionDir)..\..\out\msvc-$(Platform)\$(ProjectName)\$(Configuration)\</IntDir>
+    <TargetExt>.lib</TargetExt>
+    <TargetName>mimalloc</TargetName>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64EC'">
+    <OutDir>$(SolutionDir)..\..\out\msvc-$(Platform)\$(Configuration)\</OutDir>
+    <IntDir>$(SolutionDir)..\..\out\msvc-$(Platform)\$(ProjectName)\$(Configuration)\</IntDir>
+    <TargetExt>.lib</TargetExt>
+    <TargetName>mimalloc</TargetName>
+  </PropertyGroup>
+  <PropertyGroup Label="Vcpkg">
+    <VcpkgEnabled>false</VcpkgEnabled>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <WarningLevel>Level4</WarningLevel>
+      <Optimization>Disabled</Optimization>
+      <SDLCheck>true</SDLCheck>
+      <ConformanceMode>Default</ConformanceMode>
+      <AdditionalIncludeDirectories>../../include</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>MI_DEBUG=3;%(PreprocessorDefinitions);</PreprocessorDefinitions>
+      <CompileAs>CompileAsCpp</CompileAs>
+      <SupportJustMyCode>false</SupportJustMyCode>
+      <LanguageStandard>stdcpp20</LanguageStandard>
+      <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
+    </ClCompile>
+    <Lib>
+      <AdditionalLibraryDirectories>
+      </AdditionalLibraryDirectories>
+      <AdditionalDependencies>
+      </AdditionalDependencies>
+    </Lib>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <ClCompile>
+      <WarningLevel>Level4</WarningLevel>
+      <Optimization>Disabled</Optimization>
+      <SDLCheck>true</SDLCheck>
+      <ConformanceMode>Default</ConformanceMode>
+      <AdditionalIncludeDirectories>../../include</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>MI_DEBUG=3;MI_GUARDED=0;%(PreprocessorDefinitions);</PreprocessorDefinitions>
+      <CompileAs>CompileAsCpp</CompileAs>
+      <SupportJustMyCode>false</SupportJustMyCode>
+      <LanguageStandard>stdcpp20</LanguageStandard>
+      <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
+    </ClCompile>
+    <PostBuildEvent>
+      <Command>
+      </Command>
+    </PostBuildEvent>
+    <Link>
+      <EntryPointSymbol>
+      </EntryPointSymbol>
+    </Link>
+    <Lib>
+      <AdditionalLibraryDirectories>
+      </AdditionalLibraryDirectories>
+      <AdditionalDependencies>
+      </AdditionalDependencies>
+    </Lib>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">
+    <ClCompile>
+      <WarningLevel>Level4</WarningLevel>
+      <Optimization>Disabled</Optimization>
+      <SDLCheck>true</SDLCheck>
+      <ConformanceMode>Default</ConformanceMode>
+      <AdditionalIncludeDirectories>../../include</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>MI_DEBUG=3;MI_GUARDED=0;%(PreprocessorDefinitions);</PreprocessorDefinitions>
+      <CompileAs>CompileAsCpp</CompileAs>
+      <SupportJustMyCode>false</SupportJustMyCode>
+      <LanguageStandard>stdcpp20</LanguageStandard>
+      <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
+    </ClCompile>
+    <PostBuildEvent>
+      <Command>
+      </Command>
+    </PostBuildEvent>
+    <Link>
+      <EntryPointSymbol>
+      </EntryPointSymbol>
+    </Link>
+    <Lib>
+      <AdditionalLibraryDirectories>
+      </AdditionalLibraryDirectories>
+      <AdditionalDependencies>
+      </AdditionalDependencies>
+    </Lib>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64EC'">
+    <ClCompile>
+      <WarningLevel>Level4</WarningLevel>
+      <Optimization>Disabled</Optimization>
+      <SDLCheck>true</SDLCheck>
+      <ConformanceMode>Default</ConformanceMode>
+      <AdditionalIncludeDirectories>../../include</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>MI_DEBUG=3;MI_GUARDED=0;%(PreprocessorDefinitions);</PreprocessorDefinitions>
+      <CompileAs>CompileAsCpp</CompileAs>
+      <SupportJustMyCode>false</SupportJustMyCode>
+      <LanguageStandard>stdcpp20</LanguageStandard>
+      <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
+    </ClCompile>
+    <PostBuildEvent>
+      <Command>
+      </Command>
+    </PostBuildEvent>
+    <Link>
+      <EntryPointSymbol>
+      </EntryPointSymbol>
+    </Link>
+    <Lib>
+      <AdditionalLibraryDirectories>
+      </AdditionalLibraryDirectories>
+      <AdditionalDependencies>
+      </AdditionalDependencies>
+    </Lib>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <WarningLevel>Level4</WarningLevel>
+      <Optimization>MaxSpeed</Optimization>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <ConformanceMode>Default</ConformanceMode>
+      <AdditionalIncludeDirectories>../../include</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>%(PreprocessorDefinitions);NDEBUG</PreprocessorDefinitions>
+      <AssemblerOutput>AssemblyAndSourceCode</AssemblerOutput>
+      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+      <WholeProgramOptimization>false</WholeProgramOptimization>
+      <BufferSecurityCheck>false</BufferSecurityCheck>
+      <InlineFunctionExpansion>Default</InlineFunctionExpansion>
+      <CompileAs>CompileAsCpp</CompileAs>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <LanguageStandard>stdcpp20</LanguageStandard>
+      <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
+    </ClCompile>
+    <Link>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+    </Link>
+    <Lib>
+      <AdditionalLibraryDirectories>
+      </AdditionalLibraryDirectories>
+      <AdditionalDependencies>
+      </AdditionalDependencies>
+    </Lib>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <ClCompile>
+      <WarningLevel>Level4</WarningLevel>
+      <Optimization>MaxSpeed</Optimization>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <ConformanceMode>Default</ConformanceMode>
+      <AdditionalIncludeDirectories>../../include</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>%(PreprocessorDefinitions);NDEBUG</PreprocessorDefinitions>
+      <AssemblerOutput>AssemblyAndSourceCode</AssemblerOutput>
+      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+      <WholeProgramOptimization>false</WholeProgramOptimization>
+      <BufferSecurityCheck>false</BufferSecurityCheck>
+      <InlineFunctionExpansion>Default</InlineFunctionExpansion>
+      <CompileAs>CompileAsCpp</CompileAs>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <LanguageStandard>stdcpp20</LanguageStandard>
+      <EnableEnhancedInstructionSet>AdvancedVectorExtensions2</EnableEnhancedInstructionSet>
+      <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
+    </ClCompile>
+    <Link>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EntryPointSymbol>
+      </EntryPointSymbol>
+    </Link>
+    <PostBuildEvent>
+      <Command>
+      </Command>
+    </PostBuildEvent>
+    <Lib>
+      <AdditionalLibraryDirectories>
+      </AdditionalLibraryDirectories>
+      <AdditionalDependencies>
+      </AdditionalDependencies>
+    </Lib>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">
+    <ClCompile>
+      <WarningLevel>Level4</WarningLevel>
+      <Optimization>MaxSpeed</Optimization>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <ConformanceMode>Default</ConformanceMode>
+      <AdditionalIncludeDirectories>../../include</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>%(PreprocessorDefinitions);NDEBUG</PreprocessorDefinitions>
+      <AssemblerOutput>AssemblyAndSourceCode</AssemblerOutput>
+      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+      <WholeProgramOptimization>false</WholeProgramOptimization>
+      <BufferSecurityCheck>false</BufferSecurityCheck>
+      <InlineFunctionExpansion>Default</InlineFunctionExpansion>
+      <CompileAs>CompileAsCpp</CompileAs>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <LanguageStandard>stdcpp20</LanguageStandard>
+      <EnableEnhancedInstructionSet>CPUExtensionRequirementsARMv81</EnableEnhancedInstructionSet>
+      <ExceptionHandling>Sync</ExceptionHandling>
+      <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
+    </ClCompile>
+    <Link>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EntryPointSymbol>
+      </EntryPointSymbol>
+    </Link>
+    <PostBuildEvent>
+      <Command>
+      </Command>
+    </PostBuildEvent>
+    <Lib>
+      <AdditionalLibraryDirectories>
+      </AdditionalLibraryDirectories>
+      <AdditionalDependencies>
+      </AdditionalDependencies>
+    </Lib>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64EC'">
+    <ClCompile>
+      <WarningLevel>Level4</WarningLevel>
+      <Optimization>MaxSpeed</Optimization>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <ConformanceMode>Default</ConformanceMode>
+      <AdditionalIncludeDirectories>../../include</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>%(PreprocessorDefinitions);NDEBUG</PreprocessorDefinitions>
+      <AssemblerOutput>AssemblyAndSourceCode</AssemblerOutput>
+      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+      <WholeProgramOptimization>false</WholeProgramOptimization>
+      <BufferSecurityCheck>false</BufferSecurityCheck>
+      <InlineFunctionExpansion>Default</InlineFunctionExpansion>
+      <CompileAs>CompileAsCpp</CompileAs>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <LanguageStandard>stdcpp20</LanguageStandard>
+      <EnableEnhancedInstructionSet>CPUExtensionRequirementsARMv81</EnableEnhancedInstructionSet>
+      <ExceptionHandling>Sync</ExceptionHandling>
+      <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
+    </ClCompile>
+    <Link>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EntryPointSymbol>
+      </EntryPointSymbol>
+    </Link>
+    <PostBuildEvent>
+      <Command>
+      </Command>
+    </PostBuildEvent>
+    <Lib>
+      <AdditionalLibraryDirectories>
+      </AdditionalLibraryDirectories>
+      <AdditionalDependencies>
+      </AdditionalDependencies>
+    </Lib>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\src\alloc-aligned.c">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">false</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM64EC'">false</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">false</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64EC'">false</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="..\..\src\alloc-override.c">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64EC'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM64EC'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="..\..\src\alloc-posix.c" />
+    <ClCompile Include="..\..\src\alloc.c" />
+    <ClCompile Include="..\..\src\arena-meta.c" />
+    <ClCompile Include="..\..\src\arena.c" />
+    <ClCompile Include="..\..\src\bitmap.c">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">false</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64EC'">false</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="..\..\src\free.c">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64EC'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM64EC'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="..\..\src\heap.c" />
+    <ClCompile Include="..\..\src\init.c" />
+    <ClCompile Include="..\..\src\libc.c" />
+    <ClCompile Include="..\..\src\page-map.c" />
+    <ClCompile Include="..\..\src\prim\prim.c" />
+    <ClCompile Include="..\..\src\prim\windows\prim.c">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64EC'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM64EC'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="..\..\src\options.c" />
+    <ClCompile Include="..\..\src\page-queue.c">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64EC'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM64EC'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="..\..\src\page.c" />
+    <ClCompile Include="..\..\src\random.c" />
+    <ClCompile Include="..\..\src\os.c" />
+    <ClCompile Include="..\..\src\stats.c" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="$(ProjectDir)..\..\include\mimalloc.h" />
+    <ClInclude Include="$(ProjectDir)..\..\include\mimalloc-override.h" />
+    <ClInclude Include="..\..\include\mimalloc-new-delete.h" />
+    <ClInclude Include="..\..\include\mimalloc-stats.h" />
+    <ClInclude Include="..\..\include\mimalloc\atomic.h" />
+    <ClInclude Include="..\..\include\mimalloc\bits.h" />
+    <ClInclude Include="..\..\include\mimalloc\internal.h" />
+    <ClInclude Include="..\..\include\mimalloc\prim.h" />
+    <ClInclude Include="..\..\include\mimalloc\track.h" />
+    <ClInclude Include="..\..\include\mimalloc\types.h" />
+    <ClInclude Include="..\..\src\bitmap.h" />
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
\ No newline at end of file
diff --git a/depends/mimalloc/ide/vs2022/mimalloc-lib.vcxproj.filters b/depends/mimalloc/ide/vs2022/mimalloc-lib.vcxproj.filters
new file mode 100644
index 000000000000..6825f113fd69
--- /dev/null
+++ b/depends/mimalloc/ide/vs2022/mimalloc-lib.vcxproj.filters
@@ -0,0 +1,108 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <ClCompile Include="..\..\src\alloc.c">
+      <Filter>Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\alloc-aligned.c">
+      <Filter>Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\alloc-override.c">
+      <Filter>Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\alloc-posix.c">
+      <Filter>Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\arena.c">
+      <Filter>Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\bitmap.c">
+      <Filter>Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\free.c">
+      <Filter>Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\heap.c">
+      <Filter>Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\init.c">
+      <Filter>Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\libc.c">
+      <Filter>Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\options.c">
+      <Filter>Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\os.c">
+      <Filter>Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\page.c">
+      <Filter>Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\page-queue.c">
+      <Filter>Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\prim\windows\prim.c">
+      <Filter>Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\prim\prim.c">
+      <Filter>Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\random.c">
+      <Filter>Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\stats.c">
+      <Filter>Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\page-map.c">
+      <Filter>Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\arena-meta.c">
+      <Filter>Sources</Filter>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\..\include\mimalloc\atomic.h">
+      <Filter>Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\bitmap.h">
+      <Filter>Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\include\mimalloc\internal.h">
+      <Filter>Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="$(ProjectDir)..\..\include\mimalloc.h">
+      <Filter>Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\include\mimalloc-new-delete.h">
+      <Filter>Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="$(ProjectDir)..\..\include\mimalloc-override.h">
+      <Filter>Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\include\mimalloc\track.h">
+      <Filter>Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\include\mimalloc\types.h">
+      <Filter>Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\include\mimalloc\prim.h">
+      <Filter>Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\include\mimalloc\bits.h">
+      <Filter>Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\include\mimalloc-stats.h">
+      <Filter>Headers</Filter>
+    </ClInclude>
+  </ItemGroup>
+  <ItemGroup>
+    <Filter Include="Headers">
+      <UniqueIdentifier>{1430490c-e711-4ace-a1b8-36f4d5105873}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Sources">
+      <UniqueIdentifier>{461c78ef-04b0-44d1-a0ca-7d488abaa592}</UniqueIdentifier>
+    </Filter>
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/depends/mimalloc/ide/vs2022/mimalloc-override-dll.vcxproj b/depends/mimalloc/ide/vs2022/mimalloc-override-dll.vcxproj
new file mode 100644
index 000000000000..556d7926b766
--- /dev/null
+++ b/depends/mimalloc/ide/vs2022/mimalloc-override-dll.vcxproj
@@ -0,0 +1,515 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|ARM64">
+      <Configuration>Debug</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|ARM64EC">
+      <Configuration>Debug</Configuration>
+      <Platform>ARM64EC</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|ARM64">
+      <Configuration>Release</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|ARM64EC">
+      <Configuration>Release</Configuration>
+      <Platform>ARM64EC</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <VCProjectVersion>15.0</VCProjectVersion>
+    <ProjectGuid>{ABB5EAE7-B3E6-432E-B636-333449892EA7}</ProjectGuid>
+    <RootNamespace>mimalloc-override-dll</RootNamespace>
+    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
+    <ProjectName>mimalloc-override-dll</ProjectName>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>v143</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>v143</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>v143</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>v143</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64EC'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>v143</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>v143</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>v143</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64EC'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>v143</PlatformToolset>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Label="Shared">
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64EC'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64EC'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <OutDir>$(SolutionDir)..\..\out\msvc-$(Platform)\$(Configuration)\</OutDir>
+    <IntDir>$(SolutionDir)..\..\out\msvc-$(Platform)\$(ProjectName)\$(Configuration)\</IntDir>
+    <TargetExt>.dll</TargetExt>
+    <TargetName>mimalloc</TargetName>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <OutDir>$(SolutionDir)..\..\out\msvc-$(Platform)\$(Configuration)\</OutDir>
+    <IntDir>$(SolutionDir)..\..\out\msvc-$(Platform)\$(ProjectName)\$(Configuration)\</IntDir>
+    <TargetExt>.dll</TargetExt>
+    <TargetName>mimalloc</TargetName>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <OutDir>$(SolutionDir)..\..\out\msvc-$(Platform)\$(Configuration)\</OutDir>
+    <IntDir>$(SolutionDir)..\..\out\msvc-$(Platform)\$(ProjectName)\$(Configuration)\</IntDir>
+    <TargetExt>.dll</TargetExt>
+    <TargetName>mimalloc</TargetName>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">
+    <OutDir>$(SolutionDir)..\..\out\msvc-$(Platform)\$(Configuration)\</OutDir>
+    <IntDir>$(SolutionDir)..\..\out\msvc-$(Platform)\$(ProjectName)\$(Configuration)\</IntDir>
+    <TargetExt>.dll</TargetExt>
+    <TargetName>mimalloc</TargetName>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64EC'">
+    <OutDir>$(SolutionDir)..\..\out\msvc-$(Platform)\$(Configuration)\</OutDir>
+    <IntDir>$(SolutionDir)..\..\out\msvc-$(Platform)\$(ProjectName)\$(Configuration)\</IntDir>
+    <TargetExt>.dll</TargetExt>
+    <TargetName>mimalloc</TargetName>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <OutDir>$(SolutionDir)..\..\out\msvc-$(Platform)\$(Configuration)\</OutDir>
+    <IntDir>$(SolutionDir)..\..\out\msvc-$(Platform)\$(ProjectName)\$(Configuration)\</IntDir>
+    <TargetExt>.dll</TargetExt>
+    <TargetName>mimalloc</TargetName>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">
+    <OutDir>$(SolutionDir)..\..\out\msvc-$(Platform)\$(Configuration)\</OutDir>
+    <IntDir>$(SolutionDir)..\..\out\msvc-$(Platform)\$(ProjectName)\$(Configuration)\</IntDir>
+    <TargetExt>.dll</TargetExt>
+    <TargetName>mimalloc</TargetName>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64EC'">
+    <OutDir>$(SolutionDir)..\..\out\msvc-$(Platform)\$(Configuration)\</OutDir>
+    <IntDir>$(SolutionDir)..\..\out\msvc-$(Platform)\$(ProjectName)\$(Configuration)\</IntDir>
+    <TargetExt>.dll</TargetExt>
+    <TargetName>mimalloc</TargetName>
+  </PropertyGroup>
+  <PropertyGroup Label="Vcpkg">
+    <VcpkgEnabled>false</VcpkgEnabled>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <Optimization>Disabled</Optimization>
+      <SDLCheck>true</SDLCheck>
+      <ConformanceMode>true</ConformanceMode>
+      <AdditionalIncludeDirectories>../../include</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>MI_SHARED_LIB;MI_SHARED_LIB_EXPORT;MI_MALLOC_OVERRIDE;%(PreprocessorDefinitions);</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <SupportJustMyCode>false</SupportJustMyCode>
+      <CompileAs>CompileAsCpp</CompileAs>
+      <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>$(ProjectDir)\..\..\bin\mimalloc-redirect32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <IgnoreSpecificDefaultLibraries>
+      </IgnoreSpecificDefaultLibraries>
+      <ModuleDefinitionFile>
+      </ModuleDefinitionFile>
+      <LinkTimeCodeGeneration>Default</LinkTimeCodeGeneration>
+      <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
+      <ImportLibrary>$(OutDir)$(TargetName).dll.lib</ImportLibrary>
+      <ProgramDatabaseFile>$(OutDir)$(TargetName).dll.pdb</ProgramDatabaseFile>
+    </Link>
+    <PostBuildEvent>
+      <Command>COPY /Y "$(ProjectDir)..\..\bin\mimalloc-redirect32.dll" "$(OutputPath)"</Command>
+    </PostBuildEvent>
+    <PostBuildEvent>
+      <Message>Copy mimalloc-redirect32.dll to the output directory</Message>
+    </PostBuildEvent>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <Optimization>Disabled</Optimization>
+      <SDLCheck>true</SDLCheck>
+      <ConformanceMode>true</ConformanceMode>
+      <AdditionalIncludeDirectories>../../include</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>MI_DEBUG=4;MI_SHARED_LIB;MI_SHARED_LIB_EXPORT;MI_MALLOC_OVERRIDE;%(PreprocessorDefinitions);</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <SupportJustMyCode>false</SupportJustMyCode>
+      <CompileAs>CompileAsCpp</CompileAs>
+      <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>$(ProjectDir)\..\..\bin\mimalloc-redirect.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <IgnoreSpecificDefaultLibraries>
+      </IgnoreSpecificDefaultLibraries>
+      <ModuleDefinitionFile>
+      </ModuleDefinitionFile>
+      <LinkTimeCodeGeneration>Default</LinkTimeCodeGeneration>
+      <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
+      <ImportLibrary>$(OutDir)$(TargetName).dll.lib</ImportLibrary>
+      <ProgramDatabaseFile>$(OutDir)$(TargetName).dll.pdb</ProgramDatabaseFile>
+    </Link>
+    <PostBuildEvent>
+      <Command>COPY /Y "$(ProjectDir)..\..\bin\mimalloc-redirect.dll" "$(OutputPath)"</Command>
+    </PostBuildEvent>
+    <PostBuildEvent>
+      <Message>copy mimalloc-redirect.dll to the output directory</Message>
+    </PostBuildEvent>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <Optimization>Disabled</Optimization>
+      <SDLCheck>true</SDLCheck>
+      <ConformanceMode>true</ConformanceMode>
+      <AdditionalIncludeDirectories>../../include</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>MI_DEBUG=4;MI_SHARED_LIB;MI_SHARED_LIB_EXPORT;MI_MALLOC_OVERRIDE;%(PreprocessorDefinitions);</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <SupportJustMyCode>false</SupportJustMyCode>
+      <CompileAs>CompileAsCpp</CompileAs>
+      <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>$(ProjectDir)\..\..\bin\mimalloc-redirect-arm64.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <IgnoreSpecificDefaultLibraries>
+      </IgnoreSpecificDefaultLibraries>
+      <ModuleDefinitionFile>
+      </ModuleDefinitionFile>
+      <LinkTimeCodeGeneration>Default</LinkTimeCodeGeneration>
+      <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
+      <ImportLibrary>$(OutDir)$(TargetName).dll.lib</ImportLibrary>
+      <ProgramDatabaseFile>$(OutDir)$(TargetName).dll.pdb</ProgramDatabaseFile>
+    </Link>
+    <PostBuildEvent>
+      <Command>COPY /Y "$(ProjectDir)..\..\bin\mimalloc-redirect-arm64.dll" "$(OutputPath)"</Command>
+    </PostBuildEvent>
+    <PostBuildEvent>
+      <Message>copy mimalloc-redirect-arm64.dll to the output directory</Message>
+    </PostBuildEvent>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64EC'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <Optimization>Disabled</Optimization>
+      <SDLCheck>true</SDLCheck>
+      <ConformanceMode>true</ConformanceMode>
+      <AdditionalIncludeDirectories>../../include</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>MI_DEBUG=4;MI_SHARED_LIB;MI_SHARED_LIB_EXPORT;MI_MALLOC_OVERRIDE;%(PreprocessorDefinitions);</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <SupportJustMyCode>false</SupportJustMyCode>
+      <CompileAs>CompileAsCpp</CompileAs>
+      <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>$(ProjectDir)\..\..\bin\mimalloc-redirect-arm64ec.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <IgnoreSpecificDefaultLibraries>
+      </IgnoreSpecificDefaultLibraries>
+      <ModuleDefinitionFile>
+      </ModuleDefinitionFile>
+      <LinkTimeCodeGeneration>Default</LinkTimeCodeGeneration>
+      <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
+      <ImportLibrary>$(OutDir)$(TargetName).dll.lib</ImportLibrary>
+      <ProgramDatabaseFile>$(OutDir)$(TargetName).dll.pdb</ProgramDatabaseFile>
+    </Link>
+    <PostBuildEvent>
+      <Command>COPY /Y "$(ProjectDir)..\..\bin\mimalloc-redirect-arm64ec.dll" "$(OutputPath)"</Command>
+    </PostBuildEvent>
+    <PostBuildEvent>
+      <Message>copy mimalloc-redirect-arm64ec.dll to the output directory</Message>
+    </PostBuildEvent>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <Optimization>MaxSpeed</Optimization>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <ConformanceMode>true</ConformanceMode>
+      <AdditionalIncludeDirectories>../../include</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>MI_SHARED_LIB;MI_SHARED_LIB_EXPORT;MI_MALLOC_OVERRIDE;%(PreprocessorDefinitions);NDEBUG</PreprocessorDefinitions>
+      <AssemblerOutput>AssemblyAndSourceCode</AssemblerOutput>
+      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+      <WholeProgramOptimization>false</WholeProgramOptimization>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <CompileAs>CompileAsCpp</CompileAs>
+      <BufferSecurityCheck>false</BufferSecurityCheck>
+      <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
+    </ClCompile>
+    <Link>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+      <AdditionalDependencies>$(ProjectDir)\..\..\bin\mimalloc-redirect32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <ModuleDefinitionFile>
+      </ModuleDefinitionFile>
+      <LinkTimeCodeGeneration>Default</LinkTimeCodeGeneration>
+      <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
+      <ImportLibrary>$(OutDir)$(TargetName).dll.lib</ImportLibrary>
+      <ProgramDatabaseFile>$(OutDir)$(TargetName).dll.pdb</ProgramDatabaseFile>
+    </Link>
+    <PostBuildEvent>
+      <Command>COPY /Y "$(ProjectDir)..\..\bin\mimalloc-redirect32.dll" "$(OutputPath)"</Command>
+    </PostBuildEvent>
+    <PostBuildEvent>
+      <Message>Copy mimalloc-redirect32.dll to the output directory</Message>
+    </PostBuildEvent>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <Optimization>MaxSpeed</Optimization>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <ConformanceMode>true</ConformanceMode>
+      <AdditionalIncludeDirectories>../../include</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>MI_SHARED_LIB;MI_SHARED_LIB_EXPORT;MI_MALLOC_OVERRIDE;%(PreprocessorDefinitions);NDEBUG</PreprocessorDefinitions>
+      <AssemblerOutput>AssemblyAndSourceCode</AssemblerOutput>
+      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+      <WholeProgramOptimization>false</WholeProgramOptimization>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <CompileAs>CompileAsCpp</CompileAs>
+      <BufferSecurityCheck>false</BufferSecurityCheck>
+      <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
+    </ClCompile>
+    <Link>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+      <AdditionalDependencies>$(ProjectDir)\..\..\bin\mimalloc-redirect.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <ModuleDefinitionFile>
+      </ModuleDefinitionFile>
+      <LinkTimeCodeGeneration>Default</LinkTimeCodeGeneration>
+      <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
+      <ImportLibrary>$(OutDir)$(TargetName).dll.lib</ImportLibrary>
+      <ProgramDatabaseFile>$(OutDir)$(TargetName).dll.pdb</ProgramDatabaseFile>
+    </Link>
+    <PostBuildEvent>
+      <Command>COPY /Y "$(ProjectDir)..\..\bin\mimalloc-redirect.dll" "$(OutputPath)"</Command>
+    </PostBuildEvent>
+    <PostBuildEvent>
+      <Message>copy mimalloc-redirect.dll to the output directory</Message>
+    </PostBuildEvent>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <Optimization>MaxSpeed</Optimization>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <ConformanceMode>true</ConformanceMode>
+      <AdditionalIncludeDirectories>../../include</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>MI_SHARED_LIB;MI_SHARED_LIB_EXPORT;MI_MALLOC_OVERRIDE;%(PreprocessorDefinitions);NDEBUG</PreprocessorDefinitions>
+      <AssemblerOutput>AssemblyAndSourceCode</AssemblerOutput>
+      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+      <WholeProgramOptimization>false</WholeProgramOptimization>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <CompileAs>CompileAsCpp</CompileAs>
+      <BufferSecurityCheck>false</BufferSecurityCheck>
+      <EnableEnhancedInstructionSet>CPUExtensionRequirementsARMv81</EnableEnhancedInstructionSet>
+      <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
+    </ClCompile>
+    <Link>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+      <AdditionalDependencies>$(ProjectDir)\..\..\bin\mimalloc-redirect-arm64.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <ModuleDefinitionFile>
+      </ModuleDefinitionFile>
+      <LinkTimeCodeGeneration>Default</LinkTimeCodeGeneration>
+      <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
+      <ImportLibrary>$(OutDir)$(TargetName).dll.lib</ImportLibrary>
+      <ProgramDatabaseFile>$(OutDir)$(TargetName).dll.pdb</ProgramDatabaseFile>
+    </Link>
+    <PostBuildEvent>
+      <Command>COPY /Y "$(ProjectDir)..\..\bin\mimalloc-redirect-arm64.dll" "$(OutputPath)"</Command>
+    </PostBuildEvent>
+    <PostBuildEvent>
+      <Message>copy mimalloc-redirect-arm64.dll to the output directory</Message>
+    </PostBuildEvent>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64EC'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <Optimization>MaxSpeed</Optimization>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <ConformanceMode>true</ConformanceMode>
+      <AdditionalIncludeDirectories>../../include</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>MI_SHARED_LIB;MI_SHARED_LIB_EXPORT;MI_MALLOC_OVERRIDE;%(PreprocessorDefinitions);NDEBUG</PreprocessorDefinitions>
+      <AssemblerOutput>AssemblyAndSourceCode</AssemblerOutput>
+      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+      <WholeProgramOptimization>false</WholeProgramOptimization>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <CompileAs>CompileAsCpp</CompileAs>
+      <BufferSecurityCheck>false</BufferSecurityCheck>
+      <EnableEnhancedInstructionSet>CPUExtensionRequirementsARMv81</EnableEnhancedInstructionSet>
+      <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
+    </ClCompile>
+    <Link>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+      <AdditionalDependencies>$(ProjectDir)\..\..\bin\mimalloc-redirect-arm64ec.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <ModuleDefinitionFile>
+      </ModuleDefinitionFile>
+      <LinkTimeCodeGeneration>Default</LinkTimeCodeGeneration>
+      <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
+      <ImportLibrary>$(OutDir)$(TargetName).dll.lib</ImportLibrary>
+      <ProgramDatabaseFile>$(OutDir)$(TargetName).dll.pdb</ProgramDatabaseFile>
+    </Link>
+    <PostBuildEvent>
+      <Command>COPY /Y "$(ProjectDir)..\..\bin\mimalloc-redirect-arm64ec.dll" "$(OutputPath)"</Command>
+    </PostBuildEvent>
+    <PostBuildEvent>
+      <Message>copy mimalloc-redirect-arm64ec.dll to the output directory</Message>
+    </PostBuildEvent>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClInclude Include="$(ProjectDir)..\..\include\mimalloc.h" />
+    <ClInclude Include="..\..\include\mimalloc-new-delete.h" />
+    <ClInclude Include="..\..\include\mimalloc-override.h" />
+    <ClInclude Include="..\..\include\mimalloc-stats.h" />
+    <ClInclude Include="..\..\include\mimalloc\atomic.h" />
+    <ClInclude Include="..\..\include\mimalloc\bits.h" />
+    <ClInclude Include="..\..\include\mimalloc\internal.h" />
+    <ClInclude Include="..\..\include\mimalloc\prim.h" />
+    <ClInclude Include="..\..\include\mimalloc\track.h" />
+    <ClInclude Include="..\..\include\mimalloc\types.h" />
+    <ClInclude Include="..\..\src\bitmap.h" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\src\alloc-aligned.c">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">false</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64EC'">false</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">false</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM64EC'">false</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="..\..\src\alloc-override.c">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64EC'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM64EC'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="..\..\src\alloc-posix.c" />
+    <ClCompile Include="..\..\src\alloc.c" />
+    <ClCompile Include="..\..\src\arena-meta.c" />
+    <ClCompile Include="..\..\src\arena.c" />
+    <ClCompile Include="..\..\src\bitmap.c" />
+    <ClCompile Include="..\..\src\free.c">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64EC'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM64EC'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="..\..\src\heap.c" />
+    <ClCompile Include="..\..\src\init.c" />
+    <ClCompile Include="..\..\src\libc.c" />
+    <ClCompile Include="..\..\src\page-map.c" />
+    <ClCompile Include="..\..\src\prim\prim.c" />
+    <ClCompile Include="..\..\src\prim\windows\prim.c">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64EC'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM64EC'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="..\..\src\options.c" />
+    <ClCompile Include="..\..\src\os.c" />
+    <ClCompile Include="..\..\src\page-queue.c">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64EC'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM64EC'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="..\..\src\page.c" />
+    <ClCompile Include="..\..\src\random.c" />
+    <ClCompile Include="..\..\src\stats.c" />
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
\ No newline at end of file
diff --git a/depends/mimalloc/ide/vs2022/mimalloc-override-dll.vcxproj.filters b/depends/mimalloc/ide/vs2022/mimalloc-override-dll.vcxproj.filters
new file mode 100644
index 000000000000..ebcf545af7e2
--- /dev/null
+++ b/depends/mimalloc/ide/vs2022/mimalloc-override-dll.vcxproj.filters
@@ -0,0 +1,108 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <ClCompile Include="..\..\src\alloc.c">
+      <Filter>Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\alloc-aligned.c">
+      <Filter>Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\alloc-override.c">
+      <Filter>Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\alloc-posix.c">
+      <Filter>Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\arena.c">
+      <Filter>Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\bitmap.c">
+      <Filter>Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\heap.c">
+      <Filter>Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\init.c">
+      <Filter>Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\libc.c">
+      <Filter>Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\options.c">
+      <Filter>Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\os.c">
+      <Filter>Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\page.c">
+      <Filter>Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\page-queue.c">
+      <Filter>Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\prim\windows\prim.c">
+      <Filter>Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\prim\prim.c">
+      <Filter>Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\random.c">
+      <Filter>Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\stats.c">
+      <Filter>Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\page-map.c">
+      <Filter>Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\free.c">
+      <Filter>Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\arena-meta.c">
+      <Filter>Sources</Filter>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\..\include\mimalloc\atomic.h">
+      <Filter>Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\bitmap.h">
+      <Filter>Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\include\mimalloc\internal.h">
+      <Filter>Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="$(ProjectDir)..\..\include\mimalloc.h">
+      <Filter>Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\include\mimalloc-new-delete.h">
+      <Filter>Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\include\mimalloc-override.h">
+      <Filter>Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\include\mimalloc\track.h">
+      <Filter>Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\include\mimalloc\types.h">
+      <Filter>Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\include\mimalloc\prim.h">
+      <Filter>Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\include\mimalloc\bits.h">
+      <Filter>Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\include\mimalloc-stats.h">
+      <Filter>Headers</Filter>
+    </ClInclude>
+  </ItemGroup>
+  <ItemGroup>
+    <Filter Include="Headers">
+      <UniqueIdentifier>{262c6c21-e270-4ba6-bd63-4ac999307e4e}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Sources">
+      <UniqueIdentifier>{94b40bdc-a741-45dd-81aa-c05fabcd2970}</UniqueIdentifier>
+    </Filter>
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/depends/mimalloc/ide/vs2022/mimalloc-override-test-dep.vcxproj b/depends/mimalloc/ide/vs2022/mimalloc-override-test-dep.vcxproj
new file mode 100644
index 000000000000..c1b89690e448
--- /dev/null
+++ b/depends/mimalloc/ide/vs2022/mimalloc-override-test-dep.vcxproj
@@ -0,0 +1,355 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|ARM64">
+      <Configuration>Debug</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|ARM64EC">
+      <Configuration>Debug</Configuration>
+      <Platform>ARM64EC</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|ARM64">
+      <Configuration>Release</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|ARM64EC">
+      <Configuration>Release</Configuration>
+      <Platform>ARM64EC</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <VCProjectVersion>15.0</VCProjectVersion>
+    <ProjectGuid>{FEF7869F-750E-4C21-A04D-22707CC66879}</ProjectGuid>
+    <RootNamespace>mimalloc-test-override-dep</RootNamespace>
+    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
+    <ProjectName>mimalloc-test-override-dep</ProjectName>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>v143</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>v143</PlatformToolset>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>v143</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>v143</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64EC'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>v143</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>v143</PlatformToolset>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>v143</PlatformToolset>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64EC'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>v143</PlatformToolset>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Label="Shared">
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64EC'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64EC'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <OutDir>$(ProjectDir)..\..\out\msvc-$(Platform)\$(Configuration)\</OutDir>
+    <IntDir>$(ProjectDir)..\..\out\msvc-$(Platform)\$(ProjectName)\$(Configuration)\</IntDir>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <OutDir>$(ProjectDir)..\..\out\msvc-$(Platform)\$(Configuration)\</OutDir>
+    <IntDir>$(ProjectDir)..\..\out\msvc-$(Platform)\$(ProjectName)\$(Configuration)\</IntDir>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <OutDir>$(ProjectDir)..\..\out\msvc-$(Platform)\$(Configuration)\</OutDir>
+    <IntDir>$(ProjectDir)..\..\out\msvc-$(Platform)\$(ProjectName)\$(Configuration)\</IntDir>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">
+    <OutDir>$(ProjectDir)..\..\out\msvc-$(Platform)\$(Configuration)\</OutDir>
+    <IntDir>$(ProjectDir)..\..\out\msvc-$(Platform)\$(ProjectName)\$(Configuration)\</IntDir>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64EC'">
+    <OutDir>$(ProjectDir)..\..\out\msvc-$(Platform)\$(Configuration)\</OutDir>
+    <IntDir>$(ProjectDir)..\..\out\msvc-$(Platform)\$(ProjectName)\$(Configuration)\</IntDir>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <OutDir>$(ProjectDir)..\..\out\msvc-$(Platform)\$(Configuration)\</OutDir>
+    <IntDir>$(ProjectDir)..\..\out\msvc-$(Platform)\$(ProjectName)\$(Configuration)\</IntDir>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">
+    <OutDir>$(ProjectDir)..\..\out\msvc-$(Platform)\$(Configuration)\</OutDir>
+    <IntDir>$(ProjectDir)..\..\out\msvc-$(Platform)\$(ProjectName)\$(Configuration)\</IntDir>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64EC'">
+    <OutDir>$(ProjectDir)..\..\out\msvc-$(Platform)\$(Configuration)\</OutDir>
+    <IntDir>$(ProjectDir)..\..\out\msvc-$(Platform)\$(ProjectName)\$(Configuration)\</IntDir>
+  </PropertyGroup>
+  <PropertyGroup Label="Vcpkg">
+    <VcpkgEnabled>false</VcpkgEnabled>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <Optimization>Disabled</Optimization>
+      <SDLCheck>true</SDLCheck>
+      <ConformanceMode>true</ConformanceMode>
+      <AdditionalIncludeDirectories>..\..\include</AdditionalIncludeDirectories>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <ExceptionHandling>Sync</ExceptionHandling>
+      <CompileAs>Default</CompileAs>
+      <SupportJustMyCode>false</SupportJustMyCode>
+    </ClCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+      <AdditionalDependencies>kernel32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+    </Link>
+    <PostBuildEvent />
+    <PostBuildEvent>
+      <Command>
+      </Command>
+    </PostBuildEvent>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <Optimization>Disabled</Optimization>
+      <SDLCheck>true</SDLCheck>
+      <ConformanceMode>true</ConformanceMode>
+      <AdditionalIncludeDirectories>..\..\include</AdditionalIncludeDirectories>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <ExceptionHandling>Sync</ExceptionHandling>
+      <CompileAs>Default</CompileAs>
+      <SupportJustMyCode>false</SupportJustMyCode>
+    </ClCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+      <EntryPointSymbol>
+      </EntryPointSymbol>
+      <AdditionalDependencies>kernel32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+    </Link>
+    <PostBuildEvent />
+    <PostBuildEvent>
+      <Command>
+      </Command>
+    </PostBuildEvent>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <Optimization>Disabled</Optimization>
+      <SDLCheck>true</SDLCheck>
+      <ConformanceMode>true</ConformanceMode>
+      <AdditionalIncludeDirectories>..\..\include</AdditionalIncludeDirectories>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <ExceptionHandling>Sync</ExceptionHandling>
+      <CompileAs>Default</CompileAs>
+      <SupportJustMyCode>false</SupportJustMyCode>
+    </ClCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+      <EntryPointSymbol>
+      </EntryPointSymbol>
+      <AdditionalDependencies>kernel32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+    </Link>
+    <PostBuildEvent />
+    <PostBuildEvent>
+      <Command>
+      </Command>
+    </PostBuildEvent>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64EC'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <Optimization>Disabled</Optimization>
+      <SDLCheck>true</SDLCheck>
+      <ConformanceMode>true</ConformanceMode>
+      <AdditionalIncludeDirectories>..\..\include</AdditionalIncludeDirectories>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <ExceptionHandling>Sync</ExceptionHandling>
+      <CompileAs>Default</CompileAs>
+      <SupportJustMyCode>false</SupportJustMyCode>
+    </ClCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+      <EntryPointSymbol>
+      </EntryPointSymbol>
+      <AdditionalDependencies>kernel32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+    </Link>
+    <PostBuildEvent />
+    <PostBuildEvent>
+      <Command>
+      </Command>
+    </PostBuildEvent>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <Optimization>MaxSpeed</Optimization>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <SDLCheck>true</SDLCheck>
+      <ConformanceMode>true</ConformanceMode>
+      <AdditionalIncludeDirectories>..\..\include</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_MBCS;%(PreprocessorDefinitions);NDEBUG</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+    </ClCompile>
+    <Link>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+      <SubSystem>Console</SubSystem>
+      <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+    </Link>
+    <PostBuildEvent>
+      <Command>
+      </Command>
+    </PostBuildEvent>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <Optimization>MaxSpeed</Optimization>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <SDLCheck>true</SDLCheck>
+      <ConformanceMode>true</ConformanceMode>
+      <AdditionalIncludeDirectories>..\..\include</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_MBCS;%(PreprocessorDefinitions);NDEBUG</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+    </ClCompile>
+    <Link>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+      <SubSystem>Console</SubSystem>
+      <EntryPointSymbol>
+      </EntryPointSymbol>
+      <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+    </Link>
+    <PostBuildEvent>
+      <Command>
+      </Command>
+    </PostBuildEvent>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <Optimization>MaxSpeed</Optimization>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <SDLCheck>true</SDLCheck>
+      <ConformanceMode>true</ConformanceMode>
+      <AdditionalIncludeDirectories>..\..\include</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_MBCS;%(PreprocessorDefinitions);NDEBUG</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+    </ClCompile>
+    <Link>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+      <SubSystem>Console</SubSystem>
+      <EntryPointSymbol>
+      </EntryPointSymbol>
+      <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+    </Link>
+    <PostBuildEvent>
+      <Command>
+      </Command>
+    </PostBuildEvent>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64EC'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <Optimization>MaxSpeed</Optimization>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <SDLCheck>true</SDLCheck>
+      <ConformanceMode>true</ConformanceMode>
+      <AdditionalIncludeDirectories>..\..\include</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_MBCS;%(PreprocessorDefinitions);NDEBUG</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+    </ClCompile>
+    <Link>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+      <SubSystem>Console</SubSystem>
+      <EntryPointSymbol>
+      </EntryPointSymbol>
+      <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+    </Link>
+    <PostBuildEvent>
+      <Command>
+      </Command>
+    </PostBuildEvent>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\test\main-override-dep.cpp" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\..\test\main-override-dep.h" />
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
\ No newline at end of file
diff --git a/depends/mimalloc/ide/vs2022/mimalloc-override-test.vcxproj b/depends/mimalloc/ide/vs2022/mimalloc-override-test.vcxproj
index a3c56f7badce..1dc2cee71b60 100644
--- a/depends/mimalloc/ide/vs2022/mimalloc-override-test.vcxproj
+++ b/depends/mimalloc/ide/vs2022/mimalloc-override-test.vcxproj
@@ -1,10 +1,26 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|ARM64">
+      <Configuration>Debug</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|ARM64EC">
+      <Configuration>Debug</Configuration>
+      <Platform>ARM64EC</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="Debug|Win32">
       <Configuration>Debug</Configuration>
       <Platform>Win32</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|ARM64">
+      <Configuration>Release</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|ARM64EC">
+      <Configuration>Release</Configuration>
+      <Platform>ARM64EC</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="Release|Win32">
       <Configuration>Release</Configuration>
       <Platform>Win32</Platform>
@@ -23,7 +39,7 @@
     <ProjectGuid>{FEF7868F-750E-4C21-A04D-22707CC66879}</ProjectGuid>
     <RootNamespace>mimalloc-override-test</RootNamespace>
     <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
-    <ProjectName>mimalloc-override-test</ProjectName>
+    <ProjectName>mimalloc-test-override</ProjectName>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
@@ -42,12 +58,34 @@
     <UseDebugLibraries>true</UseDebugLibraries>
     <PlatformToolset>v143</PlatformToolset>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>v143</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64EC'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>v143</PlatformToolset>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
     <PlatformToolset>v143</PlatformToolset>
     <WholeProgramOptimization>true</WholeProgramOptimization>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>v143</PlatformToolset>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64EC'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>v143</PlatformToolset>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+  </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
   </ImportGroup>
@@ -62,9 +100,21 @@
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64EC'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64EC'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <OutDir>$(ProjectDir)..\..\out\msvc-$(Platform)\$(Configuration)\</OutDir>
@@ -78,10 +128,29 @@
     <OutDir>$(ProjectDir)..\..\out\msvc-$(Platform)\$(Configuration)\</OutDir>
     <IntDir>$(ProjectDir)..\..\out\msvc-$(Platform)\$(ProjectName)\$(Configuration)\</IntDir>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">
+    <OutDir>$(ProjectDir)..\..\out\msvc-$(Platform)\$(Configuration)\</OutDir>
+    <IntDir>$(ProjectDir)..\..\out\msvc-$(Platform)\$(ProjectName)\$(Configuration)\</IntDir>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64EC'">
+    <OutDir>$(ProjectDir)..\..\out\msvc-$(Platform)\$(Configuration)\</OutDir>
+    <IntDir>$(ProjectDir)..\..\out\msvc-$(Platform)\$(ProjectName)\$(Configuration)\</IntDir>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <OutDir>$(ProjectDir)..\..\out\msvc-$(Platform)\$(Configuration)\</OutDir>
     <IntDir>$(ProjectDir)..\..\out\msvc-$(Platform)\$(ProjectName)\$(Configuration)\</IntDir>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">
+    <OutDir>$(ProjectDir)..\..\out\msvc-$(Platform)\$(Configuration)\</OutDir>
+    <IntDir>$(ProjectDir)..\..\out\msvc-$(Platform)\$(ProjectName)\$(Configuration)\</IntDir>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64EC'">
+    <OutDir>$(ProjectDir)..\..\out\msvc-$(Platform)\$(Configuration)\</OutDir>
+    <IntDir>$(ProjectDir)..\..\out\msvc-$(Platform)\$(ProjectName)\$(Configuration)\</IntDir>
+  </PropertyGroup>
+  <PropertyGroup Label="Vcpkg">
+    <VcpkgEnabled>false</VcpkgEnabled>
+  </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <WarningLevel>Level3</WarningLevel>
@@ -128,6 +197,54 @@
       </Command>
     </PostBuildEvent>
   </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <Optimization>Disabled</Optimization>
+      <SDLCheck>true</SDLCheck>
+      <ConformanceMode>true</ConformanceMode>
+      <AdditionalIncludeDirectories>..\..\include</AdditionalIncludeDirectories>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <ExceptionHandling>Sync</ExceptionHandling>
+      <CompileAs>Default</CompileAs>
+      <SupportJustMyCode>false</SupportJustMyCode>
+    </ClCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+      <EntryPointSymbol>
+      </EntryPointSymbol>
+      <AdditionalDependencies>kernel32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+    </Link>
+    <PostBuildEvent />
+    <PostBuildEvent>
+      <Command>
+      </Command>
+    </PostBuildEvent>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64EC'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <Optimization>Disabled</Optimization>
+      <SDLCheck>true</SDLCheck>
+      <ConformanceMode>true</ConformanceMode>
+      <AdditionalIncludeDirectories>..\..\include</AdditionalIncludeDirectories>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <ExceptionHandling>Sync</ExceptionHandling>
+      <CompileAs>Default</CompileAs>
+      <SupportJustMyCode>false</SupportJustMyCode>
+    </ClCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+      <EntryPointSymbol>
+      </EntryPointSymbol>
+      <AdditionalDependencies>kernel32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+    </Link>
+    <PostBuildEvent />
+    <PostBuildEvent>
+      <Command>
+      </Command>
+    </PostBuildEvent>
+  </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
       <WarningLevel>Level3</WarningLevel>
@@ -176,13 +293,66 @@
       </Command>
     </PostBuildEvent>
   </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <Optimization>MaxSpeed</Optimization>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <SDLCheck>true</SDLCheck>
+      <ConformanceMode>true</ConformanceMode>
+      <AdditionalIncludeDirectories>..\..\include</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_MBCS;%(PreprocessorDefinitions);NDEBUG</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+    </ClCompile>
+    <Link>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+      <SubSystem>Console</SubSystem>
+      <EntryPointSymbol>
+      </EntryPointSymbol>
+      <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+    </Link>
+    <PostBuildEvent>
+      <Command>
+      </Command>
+    </PostBuildEvent>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64EC'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <Optimization>MaxSpeed</Optimization>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <SDLCheck>true</SDLCheck>
+      <ConformanceMode>true</ConformanceMode>
+      <AdditionalIncludeDirectories>..\..\include</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_MBCS;%(PreprocessorDefinitions);NDEBUG</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+    </ClCompile>
+    <Link>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+      <SubSystem>Console</SubSystem>
+      <EntryPointSymbol>
+      </EntryPointSymbol>
+      <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+    </Link>
+    <PostBuildEvent>
+      <Command>
+      </Command>
+    </PostBuildEvent>
+  </ItemDefinitionGroup>
   <ItemGroup>
     <ClCompile Include="..\..\test\main-override.cpp" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="mimalloc-override.vcxproj">
+    <ProjectReference Include="mimalloc-override-dll.vcxproj">
       <Project>{abb5eae7-b3e6-432e-b636-333449892ea7}</Project>
     </ProjectReference>
+    <ProjectReference Include="mimalloc-override-test-dep.vcxproj">
+      <Project>{fef7869f-750e-4c21-a04d-22707cc66879}</Project>
+    </ProjectReference>
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
diff --git a/depends/mimalloc/ide/vs2022/mimalloc-override.vcxproj b/depends/mimalloc/ide/vs2022/mimalloc-override.vcxproj
deleted file mode 100644
index f22d54a4edf4..000000000000
--- a/depends/mimalloc/ide/vs2022/mimalloc-override.vcxproj
+++ /dev/null
@@ -1,257 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <VCProjectVersion>15.0</VCProjectVersion>
-    <ProjectGuid>{ABB5EAE7-B3E6-432E-B636-333449892EA7}</ProjectGuid>
-    <RootNamespace>mimalloc-override</RootNamespace>
-    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
-    <ProjectName>mimalloc-override</ProjectName>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v143</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v143</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v143</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v143</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Label="Shared">
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <OutDir>$(SolutionDir)..\..\out\msvc-$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>$(SolutionDir)..\..\out\msvc-$(Platform)\$(ProjectName)\$(Configuration)\</IntDir>
-    <TargetExt>.dll</TargetExt>
-    <TargetName>mimalloc-override</TargetName>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <OutDir>$(SolutionDir)..\..\out\msvc-$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>$(SolutionDir)..\..\out\msvc-$(Platform)\$(ProjectName)\$(Configuration)\</IntDir>
-    <TargetExt>.dll</TargetExt>
-    <TargetName>mimalloc-override</TargetName>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <OutDir>$(SolutionDir)..\..\out\msvc-$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>$(SolutionDir)..\..\out\msvc-$(Platform)\$(ProjectName)\$(Configuration)\</IntDir>
-    <TargetExt>.dll</TargetExt>
-    <TargetName>mimalloc-override</TargetName>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <OutDir>$(SolutionDir)..\..\out\msvc-$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>$(SolutionDir)..\..\out\msvc-$(Platform)\$(ProjectName)\$(Configuration)\</IntDir>
-    <TargetExt>.dll</TargetExt>
-    <TargetName>mimalloc-override</TargetName>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>Disabled</Optimization>
-      <SDLCheck>true</SDLCheck>
-      <ConformanceMode>true</ConformanceMode>
-      <AdditionalIncludeDirectories>../../include</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>MI_SHARED_LIB;MI_SHARED_LIB_EXPORT;MI_MALLOC_OVERRIDE;%(PreprocessorDefinitions);</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <SupportJustMyCode>false</SupportJustMyCode>
-      <CompileAs>Default</CompileAs>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>$(ProjectDir)\..\..\bin\mimalloc-redirect32.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <IgnoreSpecificDefaultLibraries>
-      </IgnoreSpecificDefaultLibraries>
-      <ModuleDefinitionFile>
-      </ModuleDefinitionFile>
-      <LinkTimeCodeGeneration>Default</LinkTimeCodeGeneration>
-      <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
-    </Link>
-    <PostBuildEvent>
-      <Command>COPY /Y $(ProjectDir)..\..\bin\mimalloc-redirect32.dll $(OutputPath)</Command>
-    </PostBuildEvent>
-    <PostBuildEvent>
-      <Message>Copy mimalloc-redirect32.dll to the output directory</Message>
-    </PostBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>Disabled</Optimization>
-      <SDLCheck>true</SDLCheck>
-      <ConformanceMode>true</ConformanceMode>
-      <AdditionalIncludeDirectories>../../include</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>MI_DEBUG=3;MI_SHARED_LIB;MI_SHARED_LIB_EXPORT;MI_MALLOC_OVERRIDE;%(PreprocessorDefinitions);</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <SupportJustMyCode>false</SupportJustMyCode>
-      <CompileAs>Default</CompileAs>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>$(ProjectDir)\..\..\bin\mimalloc-redirect.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <IgnoreSpecificDefaultLibraries>
-      </IgnoreSpecificDefaultLibraries>
-      <ModuleDefinitionFile>
-      </ModuleDefinitionFile>
-      <LinkTimeCodeGeneration>Default</LinkTimeCodeGeneration>
-      <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
-    </Link>
-    <PostBuildEvent>
-      <Command>COPY /Y $(ProjectDir)..\..\bin\mimalloc-redirect.dll $(OutputPath)</Command>
-    </PostBuildEvent>
-    <PostBuildEvent>
-      <Message>copy mimalloc-redirect.dll to the output directory</Message>
-    </PostBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>MaxSpeed</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <ConformanceMode>true</ConformanceMode>
-      <AdditionalIncludeDirectories>../../include</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>MI_SHARED_LIB;MI_SHARED_LIB_EXPORT;MI_MALLOC_OVERRIDE;%(PreprocessorDefinitions);NDEBUG</PreprocessorDefinitions>
-      <AssemblerOutput>AssemblyAndSourceCode</AssemblerOutput>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <WholeProgramOptimization>false</WholeProgramOptimization>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <CompileAs>Default</CompileAs>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-    </ClCompile>
-    <Link>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-      <AdditionalDependencies>$(ProjectDir)\..\..\bin\mimalloc-redirect32.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <ModuleDefinitionFile>
-      </ModuleDefinitionFile>
-      <LinkTimeCodeGeneration>Default</LinkTimeCodeGeneration>
-      <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
-    </Link>
-    <PostBuildEvent>
-      <Command>COPY /Y $(ProjectDir)..\..\bin\mimalloc-redirect32.dll $(OutputPath)</Command>
-    </PostBuildEvent>
-    <PostBuildEvent>
-      <Message>Copy mimalloc-redirect32.dll to the output directory</Message>
-    </PostBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>MaxSpeed</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <ConformanceMode>true</ConformanceMode>
-      <AdditionalIncludeDirectories>../../include</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>MI_SHARED_LIB;MI_SHARED_LIB_EXPORT;MI_MALLOC_OVERRIDE;%(PreprocessorDefinitions);NDEBUG</PreprocessorDefinitions>
-      <AssemblerOutput>AssemblyAndSourceCode</AssemblerOutput>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <WholeProgramOptimization>false</WholeProgramOptimization>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <CompileAs>Default</CompileAs>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-    </ClCompile>
-    <Link>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-      <AdditionalDependencies>$(ProjectDir)\..\..\bin\mimalloc-redirect.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <ModuleDefinitionFile>
-      </ModuleDefinitionFile>
-      <LinkTimeCodeGeneration>Default</LinkTimeCodeGeneration>
-      <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
-    </Link>
-    <PostBuildEvent>
-      <Command>COPY /Y $(ProjectDir)..\..\bin\mimalloc-redirect.dll $(OutputPath)</Command>
-    </PostBuildEvent>
-    <PostBuildEvent>
-      <Message>copy mimalloc-redirect.dll to the output directory</Message>
-    </PostBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClInclude Include="$(ProjectDir)..\..\include\mimalloc-internal.h" />
-    <ClInclude Include="$(ProjectDir)..\..\include\mimalloc.h" />
-    <ClInclude Include="..\..\include\mimalloc-atomic.h" />
-    <ClInclude Include="..\..\include\mimalloc-new-delete.h" />
-    <ClInclude Include="..\..\include\mimalloc-override.h" />
-    <ClInclude Include="..\..\include\mimalloc-track.h" />
-    <ClInclude Include="..\..\include\mimalloc-types.h" />
-    <ClInclude Include="..\..\src\bitmap.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\src\alloc-aligned.c">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="..\..\src\alloc-override.c">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="..\..\src\alloc-posix.c" />
-    <ClCompile Include="..\..\src\alloc.c" />
-    <ClCompile Include="..\..\src\arena.c" />
-    <ClCompile Include="..\..\src\bitmap.c" />
-    <ClCompile Include="..\..\src\heap.c" />
-    <ClCompile Include="..\..\src\init.c" />
-    <ClCompile Include="..\..\src\options.c" />
-    <ClCompile Include="..\..\src\os.c" />
-    <ClCompile Include="..\..\src\page-queue.c">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="..\..\src\page.c" />
-    <ClCompile Include="..\..\src\random.c" />
-    <ClCompile Include="..\..\src\segment-cache.c" />
-    <ClCompile Include="..\..\src\segment.c" />
-    <ClCompile Include="..\..\src\stats.c" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/depends/mimalloc/ide/vs2022/mimalloc-test-api.vcxproj b/depends/mimalloc/ide/vs2022/mimalloc-test-api.vcxproj
index 6023c251fbe2..440693a2162e 100644
--- a/depends/mimalloc/ide/vs2022/mimalloc-test-api.vcxproj
+++ b/depends/mimalloc/ide/vs2022/mimalloc-test-api.vcxproj
@@ -1,10 +1,26 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|ARM64">
+      <Configuration>Debug</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|ARM64EC">
+      <Configuration>Debug</Configuration>
+      <Platform>ARM64EC</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="Debug|Win32">
       <Configuration>Debug</Configuration>
       <Platform>Win32</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|ARM64">
+      <Configuration>Release</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|ARM64EC">
+      <Configuration>Release</Configuration>
+      <Platform>ARM64EC</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="Release|Win32">
       <Configuration>Release</Configuration>
       <Platform>Win32</Platform>
@@ -42,12 +58,34 @@
     <UseDebugLibraries>true</UseDebugLibraries>
     <PlatformToolset>v143</PlatformToolset>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>v143</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64EC'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>v143</PlatformToolset>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
     <PlatformToolset>v143</PlatformToolset>
     <WholeProgramOptimization>true</WholeProgramOptimization>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>v143</PlatformToolset>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64EC'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>v143</PlatformToolset>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+  </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
   </ImportGroup>
@@ -62,9 +100,21 @@
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64EC'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64EC'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <OutDir>$(ProjectDir)..\..\out\msvc-$(Platform)\$(Configuration)\</OutDir>
@@ -78,10 +128,29 @@
     <OutDir>$(ProjectDir)..\..\out\msvc-$(Platform)\$(Configuration)\</OutDir>
     <IntDir>$(ProjectDir)..\..\out\msvc-$(Platform)\$(ProjectName)\$(Configuration)\</IntDir>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">
+    <OutDir>$(ProjectDir)..\..\out\msvc-$(Platform)\$(Configuration)\</OutDir>
+    <IntDir>$(ProjectDir)..\..\out\msvc-$(Platform)\$(ProjectName)\$(Configuration)\</IntDir>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64EC'">
+    <OutDir>$(ProjectDir)..\..\out\msvc-$(Platform)\$(Configuration)\</OutDir>
+    <IntDir>$(ProjectDir)..\..\out\msvc-$(Platform)\$(ProjectName)\$(Configuration)\</IntDir>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <OutDir>$(ProjectDir)..\..\out\msvc-$(Platform)\$(Configuration)\</OutDir>
     <IntDir>$(ProjectDir)..\..\out\msvc-$(Platform)\$(ProjectName)\$(Configuration)\</IntDir>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">
+    <OutDir>$(ProjectDir)..\..\out\msvc-$(Platform)\$(Configuration)\</OutDir>
+    <IntDir>$(ProjectDir)..\..\out\msvc-$(Platform)\$(ProjectName)\$(Configuration)\</IntDir>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64EC'">
+    <OutDir>$(ProjectDir)..\..\out\msvc-$(Platform)\$(Configuration)\</OutDir>
+    <IntDir>$(ProjectDir)..\..\out\msvc-$(Platform)\$(ProjectName)\$(Configuration)\</IntDir>
+  </PropertyGroup>
+  <PropertyGroup Label="Vcpkg">
+    <VcpkgEnabled>false</VcpkgEnabled>
+  </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <WarningLevel>Level3</WarningLevel>
@@ -106,6 +175,30 @@
       <SubSystem>Console</SubSystem>
     </Link>
   </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <Optimization>Disabled</Optimization>
+      <SDLCheck>true</SDLCheck>
+      <ConformanceMode>true</ConformanceMode>
+      <AdditionalIncludeDirectories>..\..\include</AdditionalIncludeDirectories>
+    </ClCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64EC'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <Optimization>Disabled</Optimization>
+      <SDLCheck>true</SDLCheck>
+      <ConformanceMode>true</ConformanceMode>
+      <AdditionalIncludeDirectories>..\..\include</AdditionalIncludeDirectories>
+    </ClCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+    </Link>
+  </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
       <WarningLevel>Level3</WarningLevel>
@@ -140,12 +233,59 @@
       <SubSystem>Console</SubSystem>
     </Link>
   </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <Optimization>MaxSpeed</Optimization>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <SDLCheck>true</SDLCheck>
+      <ConformanceMode>true</ConformanceMode>
+      <AdditionalIncludeDirectories>..\..\include</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>%(PreprocessorDefinitions);NDEBUG</PreprocessorDefinitions>
+    </ClCompile>
+    <Link>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+      <SubSystem>Console</SubSystem>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64EC'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <Optimization>MaxSpeed</Optimization>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <SDLCheck>true</SDLCheck>
+      <ConformanceMode>true</ConformanceMode>
+      <AdditionalIncludeDirectories>..\..\include</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>%(PreprocessorDefinitions);NDEBUG</PreprocessorDefinitions>
+    </ClCompile>
+    <Link>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+      <SubSystem>Console</SubSystem>
+    </Link>
+  </ItemDefinitionGroup>
   <ItemGroup>
+    <ClCompile Include="..\..\test\test-api-fill.c">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64EC'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM64EC'">true</ExcludedFromBuild>
+    </ClCompile>
     <ClCompile Include="..\..\test\test-api.c">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">false</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64EC'">false</ExcludedFromBuild>
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="mimalloc.vcxproj">
+    <ProjectReference Include="mimalloc-lib.vcxproj">
       <Project>{abb5eae7-b3e6-432e-b636-333449892ea6}</Project>
     </ProjectReference>
   </ItemGroup>
diff --git a/depends/mimalloc/ide/vs2022/mimalloc-test-stress.vcxproj b/depends/mimalloc/ide/vs2022/mimalloc-test-stress.vcxproj
index c7e820dfecf2..128a4ff6cf69 100644
--- a/depends/mimalloc/ide/vs2022/mimalloc-test-stress.vcxproj
+++ b/depends/mimalloc/ide/vs2022/mimalloc-test-stress.vcxproj
@@ -1,10 +1,26 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|ARM64">
+      <Configuration>Debug</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|ARM64EC">
+      <Configuration>Debug</Configuration>
+      <Platform>ARM64EC</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="Debug|Win32">
       <Configuration>Debug</Configuration>
       <Platform>Win32</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|ARM64">
+      <Configuration>Release</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|ARM64EC">
+      <Configuration>Release</Configuration>
+      <Platform>ARM64EC</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="Release|Win32">
       <Configuration>Release</Configuration>
       <Platform>Win32</Platform>
@@ -42,12 +58,34 @@
     <UseDebugLibraries>true</UseDebugLibraries>
     <PlatformToolset>v143</PlatformToolset>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>v143</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64EC'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>v143</PlatformToolset>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
     <PlatformToolset>v143</PlatformToolset>
     <WholeProgramOptimization>true</WholeProgramOptimization>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>v143</PlatformToolset>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64EC'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>v143</PlatformToolset>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+  </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
   </ImportGroup>
@@ -62,9 +100,21 @@
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64EC'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64EC'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <OutDir>$(ProjectDir)..\..\out\msvc-$(Platform)\$(Configuration)\</OutDir>
@@ -78,10 +128,29 @@
     <OutDir>$(ProjectDir)..\..\out\msvc-$(Platform)\$(Configuration)\</OutDir>
     <IntDir>$(ProjectDir)..\..\out\msvc-$(Platform)\$(ProjectName)\$(Configuration)\</IntDir>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">
+    <OutDir>$(ProjectDir)..\..\out\msvc-$(Platform)\$(Configuration)\</OutDir>
+    <IntDir>$(ProjectDir)..\..\out\msvc-$(Platform)\$(ProjectName)\$(Configuration)\</IntDir>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64EC'">
+    <OutDir>$(ProjectDir)..\..\out\msvc-$(Platform)\$(Configuration)\</OutDir>
+    <IntDir>$(ProjectDir)..\..\out\msvc-$(Platform)\$(ProjectName)\$(Configuration)\</IntDir>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <OutDir>$(ProjectDir)..\..\out\msvc-$(Platform)\$(Configuration)\</OutDir>
     <IntDir>$(ProjectDir)..\..\out\msvc-$(Platform)\$(ProjectName)\$(Configuration)\</IntDir>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">
+    <OutDir>$(ProjectDir)..\..\out\msvc-$(Platform)\$(Configuration)\</OutDir>
+    <IntDir>$(ProjectDir)..\..\out\msvc-$(Platform)\$(ProjectName)\$(Configuration)\</IntDir>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64EC'">
+    <OutDir>$(ProjectDir)..\..\out\msvc-$(Platform)\$(Configuration)\</OutDir>
+    <IntDir>$(ProjectDir)..\..\out\msvc-$(Platform)\$(ProjectName)\$(Configuration)\</IntDir>
+  </PropertyGroup>
+  <PropertyGroup Label="Vcpkg">
+    <VcpkgEnabled>false</VcpkgEnabled>
+  </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <WarningLevel>Level3</WarningLevel>
@@ -106,6 +175,30 @@
       <SubSystem>Console</SubSystem>
     </Link>
   </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <Optimization>Disabled</Optimization>
+      <SDLCheck>true</SDLCheck>
+      <ConformanceMode>true</ConformanceMode>
+      <AdditionalIncludeDirectories>..\..\include</AdditionalIncludeDirectories>
+    </ClCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64EC'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <Optimization>Disabled</Optimization>
+      <SDLCheck>true</SDLCheck>
+      <ConformanceMode>true</ConformanceMode>
+      <AdditionalIncludeDirectories>..\..\include</AdditionalIncludeDirectories>
+    </ClCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+    </Link>
+  </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
       <WarningLevel>Level3</WarningLevel>
@@ -140,17 +233,57 @@
       <SubSystem>Console</SubSystem>
     </Link>
   </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <Optimization>MaxSpeed</Optimization>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <SDLCheck>true</SDLCheck>
+      <ConformanceMode>true</ConformanceMode>
+      <AdditionalIncludeDirectories>..\..\include</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>%(PreprocessorDefinitions);NDEBUG</PreprocessorDefinitions>
+      <EnableEnhancedInstructionSet>CPUExtensionRequirementsARMv81</EnableEnhancedInstructionSet>
+    </ClCompile>
+    <Link>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+      <SubSystem>Console</SubSystem>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64EC'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <Optimization>MaxSpeed</Optimization>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <SDLCheck>true</SDLCheck>
+      <ConformanceMode>true</ConformanceMode>
+      <AdditionalIncludeDirectories>..\..\include</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>%(PreprocessorDefinitions);NDEBUG</PreprocessorDefinitions>
+      <EnableEnhancedInstructionSet>CPUExtensionRequirementsARMv81</EnableEnhancedInstructionSet>
+    </ClCompile>
+    <Link>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+      <SubSystem>Console</SubSystem>
+    </Link>
+  </ItemDefinitionGroup>
   <ItemGroup>
     <ClCompile Include="..\..\test\test-stress.c">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">false</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM64EC'">false</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">false</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64EC'">false</ExcludedFromBuild>
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="mimalloc.vcxproj">
-      <Project>{abb5eae7-b3e6-432e-b636-333449892ea6}</Project>
+    <ProjectReference Include="mimalloc-override-dll.vcxproj">
+      <Project>{abb5eae7-b3e6-432e-b636-333449892ea7}</Project>
     </ProjectReference>
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
diff --git a/depends/mimalloc/ide/vs2022/mimalloc-test.vcxproj b/depends/mimalloc/ide/vs2022/mimalloc-test.vcxproj
index 506dd7d457e8..1e41fca115cc 100644
--- a/depends/mimalloc/ide/vs2022/mimalloc-test.vcxproj
+++ b/depends/mimalloc/ide/vs2022/mimalloc-test.vcxproj
@@ -1,10 +1,26 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|ARM64">
+      <Configuration>Debug</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|ARM64EC">
+      <Configuration>Debug</Configuration>
+      <Platform>ARM64EC</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="Debug|Win32">
       <Configuration>Debug</Configuration>
       <Platform>Win32</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|ARM64">
+      <Configuration>Release</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|ARM64EC">
+      <Configuration>Release</Configuration>
+      <Platform>ARM64EC</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="Release|Win32">
       <Configuration>Release</Configuration>
       <Platform>Win32</Platform>
@@ -23,7 +39,7 @@
     <ProjectGuid>{FEF7858F-750E-4C21-A04D-22707CC66878}</ProjectGuid>
     <RootNamespace>mimalloctest</RootNamespace>
     <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
-    <ProjectName>mimalloc-test</ProjectName>
+    <ProjectName>mimalloc-test-static</ProjectName>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
@@ -42,12 +58,34 @@
     <UseDebugLibraries>true</UseDebugLibraries>
     <PlatformToolset>v143</PlatformToolset>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>v143</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64EC'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>v143</PlatformToolset>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
     <PlatformToolset>v143</PlatformToolset>
     <WholeProgramOptimization>true</WholeProgramOptimization>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>v143</PlatformToolset>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64EC'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>v143</PlatformToolset>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+  </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
   </ImportGroup>
@@ -62,9 +100,21 @@
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64EC'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64EC'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <OutDir>$(ProjectDir)..\..\out\msvc-$(Platform)\$(Configuration)\</OutDir>
@@ -78,10 +128,29 @@
     <OutDir>$(ProjectDir)..\..\out\msvc-$(Platform)\$(Configuration)\</OutDir>
     <IntDir>$(ProjectDir)..\..\out\msvc-$(Platform)\$(ProjectName)\$(Configuration)\</IntDir>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">
+    <OutDir>$(ProjectDir)..\..\out\msvc-$(Platform)\$(Configuration)\</OutDir>
+    <IntDir>$(ProjectDir)..\..\out\msvc-$(Platform)\$(ProjectName)\$(Configuration)\</IntDir>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64EC'">
+    <OutDir>$(ProjectDir)..\..\out\msvc-$(Platform)\$(Configuration)\</OutDir>
+    <IntDir>$(ProjectDir)..\..\out\msvc-$(Platform)\$(ProjectName)\$(Configuration)\</IntDir>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <OutDir>$(ProjectDir)..\..\out\msvc-$(Platform)\$(Configuration)\</OutDir>
     <IntDir>$(ProjectDir)..\..\out\msvc-$(Platform)\$(ProjectName)\$(Configuration)\</IntDir>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">
+    <OutDir>$(ProjectDir)..\..\out\msvc-$(Platform)\$(Configuration)\</OutDir>
+    <IntDir>$(ProjectDir)..\..\out\msvc-$(Platform)\$(ProjectName)\$(Configuration)\</IntDir>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64EC'">
+    <OutDir>$(ProjectDir)..\..\out\msvc-$(Platform)\$(Configuration)\</OutDir>
+    <IntDir>$(ProjectDir)..\..\out\msvc-$(Platform)\$(ProjectName)\$(Configuration)\</IntDir>
+  </PropertyGroup>
+  <PropertyGroup Label="Vcpkg">
+    <VcpkgEnabled>false</VcpkgEnabled>
+  </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <WarningLevel>Level3</WarningLevel>
@@ -108,6 +177,32 @@
       <SubSystem>Console</SubSystem>
     </Link>
   </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <Optimization>Disabled</Optimization>
+      <SDLCheck>true</SDLCheck>
+      <ConformanceMode>true</ConformanceMode>
+      <AdditionalIncludeDirectories>..\..\include</AdditionalIncludeDirectories>
+      <LanguageStandard>stdcpp17</LanguageStandard>
+    </ClCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64EC'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <Optimization>Disabled</Optimization>
+      <SDLCheck>true</SDLCheck>
+      <ConformanceMode>true</ConformanceMode>
+      <AdditionalIncludeDirectories>..\..\include</AdditionalIncludeDirectories>
+      <LanguageStandard>stdcpp17</LanguageStandard>
+    </ClCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+    </Link>
+  </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
       <WarningLevel>Level3</WarningLevel>
@@ -144,13 +239,49 @@
       <SubSystem>Console</SubSystem>
     </Link>
   </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <Optimization>MaxSpeed</Optimization>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <SDLCheck>true</SDLCheck>
+      <ConformanceMode>true</ConformanceMode>
+      <AdditionalIncludeDirectories>..\..\include</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_MBCS;%(PreprocessorDefinitions);NDEBUG</PreprocessorDefinitions>
+      <LanguageStandard>stdcpp17</LanguageStandard>
+    </ClCompile>
+    <Link>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+      <SubSystem>Console</SubSystem>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64EC'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <Optimization>MaxSpeed</Optimization>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <SDLCheck>true</SDLCheck>
+      <ConformanceMode>true</ConformanceMode>
+      <AdditionalIncludeDirectories>..\..\include</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_MBCS;%(PreprocessorDefinitions);NDEBUG</PreprocessorDefinitions>
+      <LanguageStandard>stdcpp17</LanguageStandard>
+    </ClCompile>
+    <Link>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+      <SubSystem>Console</SubSystem>
+    </Link>
+  </ItemDefinitionGroup>
   <ItemGroup>
-    <ProjectReference Include="mimalloc.vcxproj">
-      <Project>{abb5eae7-b3e6-432e-b636-333449892ea6}</Project>
-    </ProjectReference>
+    <ClCompile Include="..\..\test\main-override-static.c" />
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="..\..\test\main-override-static.c" />
+    <ProjectReference Include="mimalloc-lib.vcxproj">
+      <Project>{abb5eae7-b3e6-432e-b636-333449892ea6}</Project>
+    </ProjectReference>
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
diff --git a/depends/mimalloc/ide/vs2022/mimalloc.sln b/depends/mimalloc/ide/vs2022/mimalloc.sln
index fcb938a4fe2a..212b75155517 100644
--- a/depends/mimalloc/ide/vs2022/mimalloc.sln
+++ b/depends/mimalloc/ide/vs2022/mimalloc.sln
@@ -1,15 +1,17 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 16
-VisualStudioVersion = 16.0.29709.97
+# Visual Studio Version 17
+VisualStudioVersion = 17.12.35527.113
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mimalloc", "mimalloc.vcxproj", "{ABB5EAE7-B3E6-432E-B636-333449892EA6}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mimalloc-lib", "mimalloc-lib.vcxproj", "{ABB5EAE7-B3E6-432E-B636-333449892EA6}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mimalloc-test", "mimalloc-test.vcxproj", "{FEF7858F-750E-4C21-A04D-22707CC66878}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mimalloc-test-static", "mimalloc-test.vcxproj", "{FEF7858F-750E-4C21-A04D-22707CC66878}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mimalloc-override", "mimalloc-override.vcxproj", "{ABB5EAE7-B3E6-432E-B636-333449892EA7}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mimalloc-override-dll", "mimalloc-override-dll.vcxproj", "{ABB5EAE7-B3E6-432E-B636-333449892EA7}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mimalloc-override-test", "mimalloc-override-test.vcxproj", "{FEF7868F-750E-4C21-A04D-22707CC66879}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mimalloc-test-override-dep", "mimalloc-override-test-dep.vcxproj", "{FEF7869F-750E-4C21-A04D-22707CC66879}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mimalloc-test-override", "mimalloc-override-test.vcxproj", "{FEF7868F-750E-4C21-A04D-22707CC66879}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mimalloc-test-stress", "mimalloc-test-stress.vcxproj", "{FEF7958F-750E-4C21-A04D-22707CC66878}"
 EndProject
@@ -17,56 +19,124 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mimalloc-test-api", "mimall
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|ARM64 = Debug|ARM64
+		Debug|ARM64EC = Debug|ARM64EC
 		Debug|x64 = Debug|x64
 		Debug|x86 = Debug|x86
+		Release|ARM64 = Release|ARM64
+		Release|ARM64EC = Release|ARM64EC
 		Release|x64 = Release|x64
 		Release|x86 = Release|x86
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{ABB5EAE7-B3E6-432E-B636-333449892EA6}.Debug|ARM64.ActiveCfg = Debug|ARM64
+		{ABB5EAE7-B3E6-432E-B636-333449892EA6}.Debug|ARM64.Build.0 = Debug|ARM64
+		{ABB5EAE7-B3E6-432E-B636-333449892EA6}.Debug|ARM64EC.ActiveCfg = Debug|ARM64EC
+		{ABB5EAE7-B3E6-432E-B636-333449892EA6}.Debug|ARM64EC.Build.0 = Debug|ARM64EC
 		{ABB5EAE7-B3E6-432E-B636-333449892EA6}.Debug|x64.ActiveCfg = Debug|x64
 		{ABB5EAE7-B3E6-432E-B636-333449892EA6}.Debug|x64.Build.0 = Debug|x64
 		{ABB5EAE7-B3E6-432E-B636-333449892EA6}.Debug|x86.ActiveCfg = Debug|Win32
 		{ABB5EAE7-B3E6-432E-B636-333449892EA6}.Debug|x86.Build.0 = Debug|Win32
+		{ABB5EAE7-B3E6-432E-B636-333449892EA6}.Release|ARM64.ActiveCfg = Release|ARM64
+		{ABB5EAE7-B3E6-432E-B636-333449892EA6}.Release|ARM64.Build.0 = Release|ARM64
+		{ABB5EAE7-B3E6-432E-B636-333449892EA6}.Release|ARM64EC.ActiveCfg = Release|ARM64EC
+		{ABB5EAE7-B3E6-432E-B636-333449892EA6}.Release|ARM64EC.Build.0 = Release|ARM64EC
 		{ABB5EAE7-B3E6-432E-B636-333449892EA6}.Release|x64.ActiveCfg = Release|x64
 		{ABB5EAE7-B3E6-432E-B636-333449892EA6}.Release|x64.Build.0 = Release|x64
 		{ABB5EAE7-B3E6-432E-B636-333449892EA6}.Release|x86.ActiveCfg = Release|Win32
 		{ABB5EAE7-B3E6-432E-B636-333449892EA6}.Release|x86.Build.0 = Release|Win32
+		{FEF7858F-750E-4C21-A04D-22707CC66878}.Debug|ARM64.ActiveCfg = Debug|ARM64
+		{FEF7858F-750E-4C21-A04D-22707CC66878}.Debug|ARM64.Build.0 = Debug|ARM64
+		{FEF7858F-750E-4C21-A04D-22707CC66878}.Debug|ARM64EC.ActiveCfg = Debug|ARM64EC
+		{FEF7858F-750E-4C21-A04D-22707CC66878}.Debug|ARM64EC.Build.0 = Debug|ARM64EC
 		{FEF7858F-750E-4C21-A04D-22707CC66878}.Debug|x64.ActiveCfg = Debug|x64
 		{FEF7858F-750E-4C21-A04D-22707CC66878}.Debug|x64.Build.0 = Debug|x64
 		{FEF7858F-750E-4C21-A04D-22707CC66878}.Debug|x86.ActiveCfg = Debug|Win32
 		{FEF7858F-750E-4C21-A04D-22707CC66878}.Debug|x86.Build.0 = Debug|Win32
+		{FEF7858F-750E-4C21-A04D-22707CC66878}.Release|ARM64.ActiveCfg = Release|ARM64
+		{FEF7858F-750E-4C21-A04D-22707CC66878}.Release|ARM64.Build.0 = Release|ARM64
+		{FEF7858F-750E-4C21-A04D-22707CC66878}.Release|ARM64EC.ActiveCfg = Release|ARM64EC
+		{FEF7858F-750E-4C21-A04D-22707CC66878}.Release|ARM64EC.Build.0 = Release|ARM64EC
 		{FEF7858F-750E-4C21-A04D-22707CC66878}.Release|x64.ActiveCfg = Release|x64
 		{FEF7858F-750E-4C21-A04D-22707CC66878}.Release|x64.Build.0 = Release|x64
 		{FEF7858F-750E-4C21-A04D-22707CC66878}.Release|x86.ActiveCfg = Release|Win32
 		{FEF7858F-750E-4C21-A04D-22707CC66878}.Release|x86.Build.0 = Release|Win32
+		{ABB5EAE7-B3E6-432E-B636-333449892EA7}.Debug|ARM64.ActiveCfg = Debug|ARM64
+		{ABB5EAE7-B3E6-432E-B636-333449892EA7}.Debug|ARM64.Build.0 = Debug|ARM64
+		{ABB5EAE7-B3E6-432E-B636-333449892EA7}.Debug|ARM64EC.ActiveCfg = Debug|ARM64EC
+		{ABB5EAE7-B3E6-432E-B636-333449892EA7}.Debug|ARM64EC.Build.0 = Debug|ARM64EC
 		{ABB5EAE7-B3E6-432E-B636-333449892EA7}.Debug|x64.ActiveCfg = Debug|x64
 		{ABB5EAE7-B3E6-432E-B636-333449892EA7}.Debug|x64.Build.0 = Debug|x64
 		{ABB5EAE7-B3E6-432E-B636-333449892EA7}.Debug|x86.ActiveCfg = Debug|Win32
 		{ABB5EAE7-B3E6-432E-B636-333449892EA7}.Debug|x86.Build.0 = Debug|Win32
+		{ABB5EAE7-B3E6-432E-B636-333449892EA7}.Release|ARM64.ActiveCfg = Release|ARM64
+		{ABB5EAE7-B3E6-432E-B636-333449892EA7}.Release|ARM64.Build.0 = Release|ARM64
+		{ABB5EAE7-B3E6-432E-B636-333449892EA7}.Release|ARM64EC.ActiveCfg = Release|ARM64EC
+		{ABB5EAE7-B3E6-432E-B636-333449892EA7}.Release|ARM64EC.Build.0 = Release|ARM64EC
 		{ABB5EAE7-B3E6-432E-B636-333449892EA7}.Release|x64.ActiveCfg = Release|x64
 		{ABB5EAE7-B3E6-432E-B636-333449892EA7}.Release|x64.Build.0 = Release|x64
 		{ABB5EAE7-B3E6-432E-B636-333449892EA7}.Release|x86.ActiveCfg = Release|Win32
 		{ABB5EAE7-B3E6-432E-B636-333449892EA7}.Release|x86.Build.0 = Release|Win32
+		{FEF7869F-750E-4C21-A04D-22707CC66879}.Debug|ARM64.ActiveCfg = Debug|ARM64
+		{FEF7869F-750E-4C21-A04D-22707CC66879}.Debug|ARM64.Build.0 = Debug|ARM64
+		{FEF7869F-750E-4C21-A04D-22707CC66879}.Debug|ARM64EC.ActiveCfg = Debug|ARM64EC
+		{FEF7869F-750E-4C21-A04D-22707CC66879}.Debug|ARM64EC.Build.0 = Debug|ARM64EC
+		{FEF7869F-750E-4C21-A04D-22707CC66879}.Debug|x64.ActiveCfg = Debug|x64
+		{FEF7869F-750E-4C21-A04D-22707CC66879}.Debug|x64.Build.0 = Debug|x64
+		{FEF7869F-750E-4C21-A04D-22707CC66879}.Debug|x86.ActiveCfg = Debug|Win32
+		{FEF7869F-750E-4C21-A04D-22707CC66879}.Debug|x86.Build.0 = Debug|Win32
+		{FEF7869F-750E-4C21-A04D-22707CC66879}.Release|ARM64.ActiveCfg = Release|ARM64
+		{FEF7869F-750E-4C21-A04D-22707CC66879}.Release|ARM64.Build.0 = Release|ARM64
+		{FEF7869F-750E-4C21-A04D-22707CC66879}.Release|ARM64EC.ActiveCfg = Release|ARM64EC
+		{FEF7869F-750E-4C21-A04D-22707CC66879}.Release|ARM64EC.Build.0 = Release|ARM64EC
+		{FEF7869F-750E-4C21-A04D-22707CC66879}.Release|x64.ActiveCfg = Release|x64
+		{FEF7869F-750E-4C21-A04D-22707CC66879}.Release|x64.Build.0 = Release|x64
+		{FEF7869F-750E-4C21-A04D-22707CC66879}.Release|x86.ActiveCfg = Release|Win32
+		{FEF7869F-750E-4C21-A04D-22707CC66879}.Release|x86.Build.0 = Release|Win32
+		{FEF7868F-750E-4C21-A04D-22707CC66879}.Debug|ARM64.ActiveCfg = Debug|ARM64
+		{FEF7868F-750E-4C21-A04D-22707CC66879}.Debug|ARM64.Build.0 = Debug|ARM64
+		{FEF7868F-750E-4C21-A04D-22707CC66879}.Debug|ARM64EC.ActiveCfg = Debug|ARM64EC
+		{FEF7868F-750E-4C21-A04D-22707CC66879}.Debug|ARM64EC.Build.0 = Debug|ARM64EC
 		{FEF7868F-750E-4C21-A04D-22707CC66879}.Debug|x64.ActiveCfg = Debug|x64
 		{FEF7868F-750E-4C21-A04D-22707CC66879}.Debug|x64.Build.0 = Debug|x64
 		{FEF7868F-750E-4C21-A04D-22707CC66879}.Debug|x86.ActiveCfg = Debug|Win32
 		{FEF7868F-750E-4C21-A04D-22707CC66879}.Debug|x86.Build.0 = Debug|Win32
+		{FEF7868F-750E-4C21-A04D-22707CC66879}.Release|ARM64.ActiveCfg = Release|ARM64
+		{FEF7868F-750E-4C21-A04D-22707CC66879}.Release|ARM64.Build.0 = Release|ARM64
+		{FEF7868F-750E-4C21-A04D-22707CC66879}.Release|ARM64EC.ActiveCfg = Release|ARM64EC
+		{FEF7868F-750E-4C21-A04D-22707CC66879}.Release|ARM64EC.Build.0 = Release|ARM64EC
 		{FEF7868F-750E-4C21-A04D-22707CC66879}.Release|x64.ActiveCfg = Release|x64
 		{FEF7868F-750E-4C21-A04D-22707CC66879}.Release|x64.Build.0 = Release|x64
 		{FEF7868F-750E-4C21-A04D-22707CC66879}.Release|x86.ActiveCfg = Release|Win32
 		{FEF7868F-750E-4C21-A04D-22707CC66879}.Release|x86.Build.0 = Release|Win32
+		{FEF7958F-750E-4C21-A04D-22707CC66878}.Debug|ARM64.ActiveCfg = Debug|ARM64
+		{FEF7958F-750E-4C21-A04D-22707CC66878}.Debug|ARM64.Build.0 = Debug|ARM64
+		{FEF7958F-750E-4C21-A04D-22707CC66878}.Debug|ARM64EC.ActiveCfg = Debug|ARM64EC
+		{FEF7958F-750E-4C21-A04D-22707CC66878}.Debug|ARM64EC.Build.0 = Debug|ARM64EC
 		{FEF7958F-750E-4C21-A04D-22707CC66878}.Debug|x64.ActiveCfg = Debug|x64
 		{FEF7958F-750E-4C21-A04D-22707CC66878}.Debug|x64.Build.0 = Debug|x64
 		{FEF7958F-750E-4C21-A04D-22707CC66878}.Debug|x86.ActiveCfg = Debug|Win32
 		{FEF7958F-750E-4C21-A04D-22707CC66878}.Debug|x86.Build.0 = Debug|Win32
+		{FEF7958F-750E-4C21-A04D-22707CC66878}.Release|ARM64.ActiveCfg = Release|ARM64
+		{FEF7958F-750E-4C21-A04D-22707CC66878}.Release|ARM64.Build.0 = Release|ARM64
+		{FEF7958F-750E-4C21-A04D-22707CC66878}.Release|ARM64EC.ActiveCfg = Release|ARM64EC
+		{FEF7958F-750E-4C21-A04D-22707CC66878}.Release|ARM64EC.Build.0 = Release|ARM64EC
 		{FEF7958F-750E-4C21-A04D-22707CC66878}.Release|x64.ActiveCfg = Release|x64
 		{FEF7958F-750E-4C21-A04D-22707CC66878}.Release|x64.Build.0 = Release|x64
 		{FEF7958F-750E-4C21-A04D-22707CC66878}.Release|x86.ActiveCfg = Release|Win32
 		{FEF7958F-750E-4C21-A04D-22707CC66878}.Release|x86.Build.0 = Release|Win32
+		{FFF7958F-750E-4C21-A04D-22707CC66878}.Debug|ARM64.ActiveCfg = Debug|ARM64
+		{FFF7958F-750E-4C21-A04D-22707CC66878}.Debug|ARM64.Build.0 = Debug|ARM64
+		{FFF7958F-750E-4C21-A04D-22707CC66878}.Debug|ARM64EC.ActiveCfg = Debug|ARM64EC
+		{FFF7958F-750E-4C21-A04D-22707CC66878}.Debug|ARM64EC.Build.0 = Debug|ARM64EC
 		{FFF7958F-750E-4C21-A04D-22707CC66878}.Debug|x64.ActiveCfg = Debug|x64
 		{FFF7958F-750E-4C21-A04D-22707CC66878}.Debug|x64.Build.0 = Debug|x64
 		{FFF7958F-750E-4C21-A04D-22707CC66878}.Debug|x86.ActiveCfg = Debug|Win32
 		{FFF7958F-750E-4C21-A04D-22707CC66878}.Debug|x86.Build.0 = Debug|Win32
+		{FFF7958F-750E-4C21-A04D-22707CC66878}.Release|ARM64.ActiveCfg = Release|ARM64
+		{FFF7958F-750E-4C21-A04D-22707CC66878}.Release|ARM64.Build.0 = Release|ARM64
+		{FFF7958F-750E-4C21-A04D-22707CC66878}.Release|ARM64EC.ActiveCfg = Release|ARM64EC
+		{FFF7958F-750E-4C21-A04D-22707CC66878}.Release|ARM64EC.Build.0 = Release|ARM64EC
 		{FFF7958F-750E-4C21-A04D-22707CC66878}.Release|x64.ActiveCfg = Release|x64
 		{FFF7958F-750E-4C21-A04D-22707CC66878}.Release|x64.Build.0 = Release|x64
 		{FFF7958F-750E-4C21-A04D-22707CC66878}.Release|x86.ActiveCfg = Release|Win32
diff --git a/depends/mimalloc/ide/vs2022/mimalloc.vcxproj b/depends/mimalloc/ide/vs2022/mimalloc.vcxproj
deleted file mode 100644
index 00aaaffabb29..000000000000
--- a/depends/mimalloc/ide/vs2022/mimalloc.vcxproj
+++ /dev/null
@@ -1,255 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <VCProjectVersion>15.0</VCProjectVersion>
-    <ProjectGuid>{ABB5EAE7-B3E6-432E-B636-333449892EA6}</ProjectGuid>
-    <RootNamespace>mimalloc</RootNamespace>
-    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
-    <ProjectName>mimalloc</ProjectName>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v143</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v143</PlatformToolset>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v143</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v143</PlatformToolset>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Label="Shared">
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <OutDir>$(SolutionDir)..\..\out\msvc-$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>$(SolutionDir)..\..\out\msvc-$(Platform)\$(ProjectName)\$(Configuration)\</IntDir>
-    <TargetExt>.lib</TargetExt>
-    <TargetName>mimalloc-static</TargetName>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <OutDir>$(SolutionDir)..\..\out\msvc-$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>$(SolutionDir)..\..\out\msvc-$(Platform)\$(ProjectName)\$(Configuration)\</IntDir>
-    <TargetExt>.lib</TargetExt>
-    <TargetName>mimalloc-static</TargetName>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <OutDir>$(SolutionDir)..\..\out\msvc-$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>$(SolutionDir)..\..\out\msvc-$(Platform)\$(ProjectName)\$(Configuration)\</IntDir>
-    <TargetExt>.lib</TargetExt>
-    <TargetName>mimalloc-static</TargetName>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <OutDir>$(SolutionDir)..\..\out\msvc-$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>$(SolutionDir)..\..\out\msvc-$(Platform)\$(ProjectName)\$(Configuration)\</IntDir>
-    <TargetExt>.lib</TargetExt>
-    <TargetName>mimalloc-static</TargetName>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <WarningLevel>Level4</WarningLevel>
-      <Optimization>Disabled</Optimization>
-      <SDLCheck>true</SDLCheck>
-      <ConformanceMode>true</ConformanceMode>
-      <AdditionalIncludeDirectories>../../include</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>MI_DEBUG=3;%(PreprocessorDefinitions);</PreprocessorDefinitions>
-      <CompileAs>CompileAsCpp</CompileAs>
-      <SupportJustMyCode>false</SupportJustMyCode>
-      <LanguageStandard>Default</LanguageStandard>
-    </ClCompile>
-    <Lib>
-      <AdditionalLibraryDirectories>
-      </AdditionalLibraryDirectories>
-      <AdditionalDependencies>
-      </AdditionalDependencies>
-    </Lib>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <ClCompile>
-      <WarningLevel>Level4</WarningLevel>
-      <Optimization>Disabled</Optimization>
-      <SDLCheck>true</SDLCheck>
-      <ConformanceMode>true</ConformanceMode>
-      <AdditionalIncludeDirectories>../../include</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>MI_DEBUG=3;%(PreprocessorDefinitions);</PreprocessorDefinitions>
-      <CompileAs>CompileAsCpp</CompileAs>
-      <SupportJustMyCode>false</SupportJustMyCode>
-      <LanguageStandard>stdcpp20</LanguageStandard>
-    </ClCompile>
-    <PostBuildEvent>
-      <Command>
-      </Command>
-    </PostBuildEvent>
-    <Link>
-      <EntryPointSymbol>
-      </EntryPointSymbol>
-    </Link>
-    <Lib>
-      <AdditionalLibraryDirectories>
-      </AdditionalLibraryDirectories>
-      <AdditionalDependencies>
-      </AdditionalDependencies>
-    </Lib>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <WarningLevel>Level4</WarningLevel>
-      <Optimization>MaxSpeed</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <ConformanceMode>true</ConformanceMode>
-      <AdditionalIncludeDirectories>../../include</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>%(PreprocessorDefinitions);NDEBUG</PreprocessorDefinitions>
-      <AssemblerOutput>AssemblyAndSourceCode</AssemblerOutput>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <WholeProgramOptimization>false</WholeProgramOptimization>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <InlineFunctionExpansion>Default</InlineFunctionExpansion>
-      <CompileAs>CompileAsCpp</CompileAs>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <LanguageStandard>Default</LanguageStandard>
-    </ClCompile>
-    <Link>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-    </Link>
-    <Lib>
-      <AdditionalLibraryDirectories>
-      </AdditionalLibraryDirectories>
-      <AdditionalDependencies>
-      </AdditionalDependencies>
-    </Lib>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <ClCompile>
-      <WarningLevel>Level4</WarningLevel>
-      <Optimization>MaxSpeed</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <ConformanceMode>true</ConformanceMode>
-      <AdditionalIncludeDirectories>../../include</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>%(PreprocessorDefinitions);NDEBUG</PreprocessorDefinitions>
-      <AssemblerOutput>AssemblyAndSourceCode</AssemblerOutput>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <WholeProgramOptimization>false</WholeProgramOptimization>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <InlineFunctionExpansion>Default</InlineFunctionExpansion>
-      <CompileAs>CompileAsCpp</CompileAs>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <LanguageStandard>stdcpp20</LanguageStandard>
-    </ClCompile>
-    <Link>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EntryPointSymbol>
-      </EntryPointSymbol>
-    </Link>
-    <PostBuildEvent>
-      <Command>
-      </Command>
-    </PostBuildEvent>
-    <Lib>
-      <AdditionalLibraryDirectories>
-      </AdditionalLibraryDirectories>
-      <AdditionalDependencies>
-      </AdditionalDependencies>
-    </Lib>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\src\alloc-aligned.c">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="..\..\src\alloc-override-osx.c">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="..\..\src\alloc-override.c">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="..\..\src\alloc-posix.c" />
-    <ClCompile Include="..\..\src\alloc.c" />
-    <ClCompile Include="..\..\src\arena.c" />
-    <ClCompile Include="..\..\src\bitmap.c">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="..\..\src\heap.c" />
-    <ClCompile Include="..\..\src\init.c" />
-    <ClCompile Include="..\..\src\options.c" />
-    <ClCompile Include="..\..\src\page-queue.c">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="..\..\src\page.c" />
-    <ClCompile Include="..\..\src\random.c" />
-    <ClCompile Include="..\..\src\segment-cache.c" />
-    <ClCompile Include="..\..\src\segment.c" />
-    <ClCompile Include="..\..\src\os.c" />
-    <ClCompile Include="..\..\src\stats.c" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="$(ProjectDir)..\..\include\mimalloc-internal.h" />
-    <ClInclude Include="$(ProjectDir)..\..\include\mimalloc.h" />
-    <ClInclude Include="$(ProjectDir)..\..\include\mimalloc-atomic.h" />
-    <ClInclude Include="$(ProjectDir)..\..\include\mimalloc-override.h" />
-    <ClInclude Include="$(ProjectDir)..\..\include\mimalloc-types.h" />
-    <ClInclude Include="..\..\include\mimalloc-new-delete.h" />
-    <ClInclude Include="..\..\include\mimalloc-track.h" />
-    <ClInclude Include="..\..\src\bitmap.h" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/depends/mimalloc/include/mimalloc-internal.h b/depends/mimalloc/include/mimalloc-internal.h
deleted file mode 100644
index 550b654338ad..000000000000
--- a/depends/mimalloc/include/mimalloc-internal.h
+++ /dev/null
@@ -1,1093 +0,0 @@
-/* ----------------------------------------------------------------------------
-Copyright (c) 2018-2022, Microsoft Research, Daan Leijen
-This is free software; you can redistribute it and/or modify it under the
-terms of the MIT license. A copy of the license can be found in the file
-"LICENSE" at the root of this distribution.
------------------------------------------------------------------------------*/
-#pragma once
-#ifndef MIMALLOC_INTERNAL_H
-#define MIMALLOC_INTERNAL_H
-
-#include "mimalloc-types.h"
-#include "mimalloc-track.h"
-
-#if (MI_DEBUG>0)
-#define mi_trace_message(...)  _mi_trace_message(__VA_ARGS__)
-#else
-#define mi_trace_message(...)
-#endif
-
-#define MI_CACHE_LINE          64
-#if defined(_MSC_VER)
-#pragma warning(disable:4127)   // suppress constant conditional warning (due to MI_SECURE paths)
-#pragma warning(disable:26812)  // unscoped enum warning
-#define mi_decl_noinline        __declspec(noinline)
-#define mi_decl_thread          __declspec(thread)
-#define mi_decl_cache_align     __declspec(align(MI_CACHE_LINE))
-#elif (defined(__GNUC__) && (__GNUC__ >= 3)) || defined(__clang__) // includes clang and icc
-#define mi_decl_noinline        __attribute__((noinline))
-#define mi_decl_thread          __thread
-#define mi_decl_cache_align     __attribute__((aligned(MI_CACHE_LINE)))
-#else
-#define mi_decl_noinline
-#define mi_decl_thread          __thread        // hope for the best :-)
-#define mi_decl_cache_align
-#endif
-
-#if defined(__EMSCRIPTEN__) && !defined(__wasi__)
-#define __wasi__
-#endif
-
-#if defined(__cplusplus)
-#define mi_decl_externc       extern "C"
-#else
-#define mi_decl_externc  
-#endif
-
-#if !defined(_WIN32) && !defined(__wasi__) 
-#define  MI_USE_PTHREADS
-#include <pthread.h>
-#endif
-
-// "options.c"
-void       _mi_fputs(mi_output_fun* out, void* arg, const char* prefix, const char* message);
-void       _mi_fprintf(mi_output_fun* out, void* arg, const char* fmt, ...);
-void       _mi_warning_message(const char* fmt, ...);
-void       _mi_verbose_message(const char* fmt, ...);
-void       _mi_trace_message(const char* fmt, ...);
-void       _mi_options_init(void);
-void       _mi_error_message(int err, const char* fmt, ...);
-
-// random.c
-void       _mi_random_init(mi_random_ctx_t* ctx);
-void       _mi_random_split(mi_random_ctx_t* ctx, mi_random_ctx_t* new_ctx);
-uintptr_t  _mi_random_next(mi_random_ctx_t* ctx);
-uintptr_t  _mi_heap_random_next(mi_heap_t* heap);
-uintptr_t  _mi_os_random_weak(uintptr_t extra_seed);
-static inline uintptr_t _mi_random_shuffle(uintptr_t x);
-
-// init.c
-extern mi_decl_cache_align mi_stats_t       _mi_stats_main;
-extern mi_decl_cache_align const mi_page_t  _mi_page_empty;
-bool       _mi_is_main_thread(void);
-size_t     _mi_current_thread_count(void);
-bool       _mi_preloading(void);  // true while the C runtime is not ready
-
-// os.c
-size_t     _mi_os_page_size(void);
-void       _mi_os_init(void);                                      // called from process init
-void*      _mi_os_alloc(size_t size, mi_stats_t* stats);           // to allocate thread local data
-void       _mi_os_free(void* p, size_t size, mi_stats_t* stats);   // to free thread local data
-
-bool       _mi_os_protect(void* addr, size_t size);
-bool       _mi_os_unprotect(void* addr, size_t size);
-bool       _mi_os_commit(void* addr, size_t size, bool* is_zero, mi_stats_t* stats);
-bool       _mi_os_decommit(void* p, size_t size, mi_stats_t* stats);
-bool       _mi_os_reset(void* p, size_t size, mi_stats_t* stats);
-// bool       _mi_os_unreset(void* p, size_t size, bool* is_zero, mi_stats_t* stats);
-size_t     _mi_os_good_alloc_size(size_t size);
-bool       _mi_os_has_overcommit(void);
-
-// arena.c
-void*      _mi_arena_alloc_aligned(size_t size, size_t alignment, bool* commit, bool* large, bool* is_pinned, bool* is_zero, mi_arena_id_t req_arena_id, size_t* memid, mi_os_tld_t* tld);
-void*      _mi_arena_alloc(size_t size, bool* commit, bool* large, bool* is_pinned, bool* is_zero, mi_arena_id_t req_arena_id, size_t* memid, mi_os_tld_t* tld);
-void       _mi_arena_free(void* p, size_t size, size_t memid, bool is_committed, mi_os_tld_t* tld);
-mi_arena_id_t _mi_arena_id_none(void);
-bool       _mi_arena_memid_is_suitable(size_t memid, mi_arena_id_t req_arena_id);
-
-// "segment-cache.c"
-void*      _mi_segment_cache_pop(size_t size, mi_commit_mask_t* commit_mask, mi_commit_mask_t* decommit_mask, bool* large, bool* is_pinned, bool* is_zero, mi_arena_id_t req_arena_id, size_t* memid, mi_os_tld_t* tld);
-bool       _mi_segment_cache_push(void* start, size_t size, size_t memid, const mi_commit_mask_t* commit_mask, const mi_commit_mask_t* decommit_mask, bool is_large, bool is_pinned, mi_os_tld_t* tld);
-void       _mi_segment_cache_collect(bool force, mi_os_tld_t* tld);
-void       _mi_segment_map_allocated_at(const mi_segment_t* segment);
-void       _mi_segment_map_freed_at(const mi_segment_t* segment);
-
-// "segment.c"
-mi_page_t* _mi_segment_page_alloc(mi_heap_t* heap, size_t block_wsize, mi_segments_tld_t* tld, mi_os_tld_t* os_tld);
-void       _mi_segment_page_free(mi_page_t* page, bool force, mi_segments_tld_t* tld);
-void       _mi_segment_page_abandon(mi_page_t* page, mi_segments_tld_t* tld);
-bool       _mi_segment_try_reclaim_abandoned( mi_heap_t* heap, bool try_all, mi_segments_tld_t* tld);
-void       _mi_segment_thread_collect(mi_segments_tld_t* tld);
-void       _mi_segment_huge_page_free(mi_segment_t* segment, mi_page_t* page, mi_block_t* block);
-
-uint8_t*   _mi_segment_page_start(const mi_segment_t* segment, const mi_page_t* page, size_t* page_size); // page start for any page
-void       _mi_abandoned_reclaim_all(mi_heap_t* heap, mi_segments_tld_t* tld);
-void       _mi_abandoned_await_readers(void);
-void       _mi_abandoned_collect(mi_heap_t* heap, bool force, mi_segments_tld_t* tld);
-
-
-
-// "page.c"
-void*      _mi_malloc_generic(mi_heap_t* heap, size_t size, bool zero)  mi_attr_noexcept mi_attr_malloc;
-
-void       _mi_page_retire(mi_page_t* page) mi_attr_noexcept;                  // free the page if there are no other pages with many free blocks
-void       _mi_page_unfull(mi_page_t* page);
-void       _mi_page_free(mi_page_t* page, mi_page_queue_t* pq, bool force);   // free the page
-void       _mi_page_abandon(mi_page_t* page, mi_page_queue_t* pq);            // abandon the page, to be picked up by another thread...
-void       _mi_heap_delayed_free_all(mi_heap_t* heap);
-bool       _mi_heap_delayed_free_partial(mi_heap_t* heap);
-void       _mi_heap_collect_retired(mi_heap_t* heap, bool force);
-
-void       _mi_page_use_delayed_free(mi_page_t* page, mi_delayed_t delay, bool override_never);
-bool       _mi_page_try_use_delayed_free(mi_page_t* page, mi_delayed_t delay, bool override_never);
-size_t     _mi_page_queue_append(mi_heap_t* heap, mi_page_queue_t* pq, mi_page_queue_t* append);
-void       _mi_deferred_free(mi_heap_t* heap, bool force);
-
-void       _mi_page_free_collect(mi_page_t* page,bool force);
-void       _mi_page_reclaim(mi_heap_t* heap, mi_page_t* page);   // callback from segments
-
-size_t     _mi_bin_size(uint8_t bin);           // for stats
-uint8_t    _mi_bin(size_t size);                // for stats
-
-// "heap.c"
-void       _mi_heap_destroy_pages(mi_heap_t* heap);
-void       _mi_heap_collect_abandon(mi_heap_t* heap);
-void       _mi_heap_set_default_direct(mi_heap_t* heap);
-bool       _mi_heap_memid_is_suitable(mi_heap_t* heap, size_t memid);
-
-// "stats.c"
-void       _mi_stats_done(mi_stats_t* stats);
-
-mi_msecs_t  _mi_clock_now(void);
-mi_msecs_t  _mi_clock_end(mi_msecs_t start);
-mi_msecs_t  _mi_clock_start(void);
-
-// "alloc.c"
-void*       _mi_page_malloc(mi_heap_t* heap, mi_page_t* page, size_t size, bool zero) mi_attr_noexcept;  // called from `_mi_malloc_generic`
-void*       _mi_heap_malloc_zero(mi_heap_t* heap, size_t size, bool zero) mi_attr_noexcept;
-void*       _mi_heap_realloc_zero(mi_heap_t* heap, void* p, size_t newsize, bool zero) mi_attr_noexcept;
-mi_block_t* _mi_page_ptr_unalign(const mi_segment_t* segment, const mi_page_t* page, const void* p);
-bool        _mi_free_delayed_block(mi_block_t* block);
-
-#if MI_DEBUG>1
-bool        _mi_page_is_valid(mi_page_t* page);
-#endif
-
-
-// ------------------------------------------------------
-// Branches
-// ------------------------------------------------------
-
-#if defined(__GNUC__) || defined(__clang__)
-#define mi_unlikely(x)     (__builtin_expect(!!(x),false))
-#define mi_likely(x)       (__builtin_expect(!!(x),true))
-#elif (defined(__cplusplus) && (__cplusplus >= 202002L)) || (defined(_MSVC_LANG) && _MSVC_LANG >= 202002L)
-#define mi_unlikely(x)     (x) [[unlikely]]
-#define mi_likely(x)       (x) [[likely]]
-#else
-#define mi_unlikely(x)     (x)
-#define mi_likely(x)       (x)
-#endif
-
-#ifndef __has_builtin
-#define __has_builtin(x)  0
-#endif
-
-
-/* -----------------------------------------------------------
-  Error codes passed to `_mi_fatal_error`
-  All are recoverable but EFAULT is a serious error and aborts by default in secure mode.
-  For portability define undefined error codes using common Unix codes:
-  <https://www-numi.fnal.gov/offline_software/srt_public_context/WebDocs/Errors/unix_system_errors.html>
------------------------------------------------------------ */
-#include <errno.h>
-#ifndef EAGAIN         // double free
-#define EAGAIN (11)
-#endif
-#ifndef ENOMEM         // out of memory
-#define ENOMEM (12)
-#endif
-#ifndef EFAULT         // corrupted free-list or meta-data
-#define EFAULT (14)
-#endif
-#ifndef EINVAL         // trying to free an invalid pointer
-#define EINVAL (22)
-#endif
-#ifndef EOVERFLOW      // count*size overflow
-#define EOVERFLOW (75)
-#endif
-
-
-/* -----------------------------------------------------------
-  Inlined definitions
------------------------------------------------------------ */
-#define MI_UNUSED(x)     (void)(x)
-#if (MI_DEBUG>0)
-#define MI_UNUSED_RELEASE(x)
-#else
-#define MI_UNUSED_RELEASE(x)  MI_UNUSED(x)
-#endif
-
-#define MI_INIT4(x)   x(),x(),x(),x()
-#define MI_INIT8(x)   MI_INIT4(x),MI_INIT4(x)
-#define MI_INIT16(x)  MI_INIT8(x),MI_INIT8(x)
-#define MI_INIT32(x)  MI_INIT16(x),MI_INIT16(x)
-#define MI_INIT64(x)  MI_INIT32(x),MI_INIT32(x)
-#define MI_INIT128(x) MI_INIT64(x),MI_INIT64(x)
-#define MI_INIT256(x) MI_INIT128(x),MI_INIT128(x)
-
-
-// Is `x` a power of two? (0 is considered a power of two)
-static inline bool _mi_is_power_of_two(uintptr_t x) {
-  return ((x & (x - 1)) == 0);
-}
-
-// Is a pointer aligned?
-static inline bool _mi_is_aligned(void* p, size_t alignment) {
-  mi_assert_internal(alignment != 0);
-  return (((uintptr_t)p % alignment) == 0);
-}
-
-// Align upwards
-static inline uintptr_t _mi_align_up(uintptr_t sz, size_t alignment) {
-  mi_assert_internal(alignment != 0);
-  uintptr_t mask = alignment - 1;
-  if ((alignment & mask) == 0) {  // power of two?
-    return ((sz + mask) & ~mask);
-  }
-  else {
-    return (((sz + mask)/alignment)*alignment);
-  }
-}
-
-// Align downwards
-static inline uintptr_t _mi_align_down(uintptr_t sz, size_t alignment) {
-  mi_assert_internal(alignment != 0);
-  uintptr_t mask = alignment - 1;
-  if ((alignment & mask) == 0) { // power of two?
-    return (sz & ~mask);
-  }
-  else {
-    return ((sz / alignment) * alignment);
-  }
-}
-
-// Divide upwards: `s <= _mi_divide_up(s,d)*d < s+d`.
-static inline uintptr_t _mi_divide_up(uintptr_t size, size_t divider) {
-  mi_assert_internal(divider != 0);
-  return (divider == 0 ? size : ((size + divider - 1) / divider));
-}
-
-// Is memory zero initialized?
-static inline bool mi_mem_is_zero(void* p, size_t size) {
-  for (size_t i = 0; i < size; i++) {
-    if (((uint8_t*)p)[i] != 0) return false;
-  }
-  return true;
-}
-
-
-// Align a byte size to a size in _machine words_,
-// i.e. byte size == `wsize*sizeof(void*)`.
-static inline size_t _mi_wsize_from_size(size_t size) {
-  mi_assert_internal(size <= SIZE_MAX - sizeof(uintptr_t));
-  return (size + sizeof(uintptr_t) - 1) / sizeof(uintptr_t);
-}
-
-// Overflow detecting multiply
-#if __has_builtin(__builtin_umul_overflow) || (defined(__GNUC__) && (__GNUC__ >= 5))
-#include <limits.h>      // UINT_MAX, ULONG_MAX
-#if defined(_CLOCK_T)    // for Illumos
-#undef _CLOCK_T
-#endif
-static inline bool mi_mul_overflow(size_t count, size_t size, size_t* total) {
-  #if (SIZE_MAX == ULONG_MAX)
-    return __builtin_umull_overflow(count, size, (unsigned long *)total);
-  #elif (SIZE_MAX == UINT_MAX)
-    return __builtin_umul_overflow(count, size, (unsigned int *)total);
-  #else
-    return __builtin_umulll_overflow(count, size, (unsigned long long *)total);
-  #endif
-}
-#else /* __builtin_umul_overflow is unavailable */
-static inline bool mi_mul_overflow(size_t count, size_t size, size_t* total) {
-  #define MI_MUL_NO_OVERFLOW ((size_t)1 << (4*sizeof(size_t)))  // sqrt(SIZE_MAX)
-  *total = count * size;
-  // note: gcc/clang optimize this to directly check the overflow flag
-  return ((size >= MI_MUL_NO_OVERFLOW || count >= MI_MUL_NO_OVERFLOW) && size > 0 && (SIZE_MAX / size) < count);
-}
-#endif
-
-// Safe multiply `count*size` into `total`; return `true` on overflow.
-static inline bool mi_count_size_overflow(size_t count, size_t size, size_t* total) {
-  if (count==1) {  // quick check for the case where count is one (common for C++ allocators)
-    *total = size;
-    return false;
-  }
-  else if mi_unlikely(mi_mul_overflow(count, size, total)) {
-    #if MI_DEBUG > 0
-    _mi_error_message(EOVERFLOW, "allocation request is too large (%zu * %zu bytes)\n", count, size);
-    #endif
-    *total = SIZE_MAX;
-    return true;
-  }
-  else return false;
-}
-
-
-/* ----------------------------------------------------------------------------------------
-The thread local default heap: `_mi_get_default_heap` returns the thread local heap.
-On most platforms (Windows, Linux, FreeBSD, NetBSD, etc), this just returns a
-__thread local variable (`_mi_heap_default`). With the initial-exec TLS model this ensures
-that the storage will always be available (allocated on the thread stacks).
-On some platforms though we cannot use that when overriding `malloc` since the underlying
-TLS implementation (or the loader) will call itself `malloc` on a first access and recurse.
-We try to circumvent this in an efficient way:
-- macOSX : we use an unused TLS slot from the OS allocated slots (MI_TLS_SLOT). On OSX, the
-           loader itself calls `malloc` even before the modules are initialized.
-- OpenBSD: we use an unused slot from the pthread block (MI_TLS_PTHREAD_SLOT_OFS).
-- DragonFly: defaults are working but seem slow compared to freeBSD (see PR #323)
-------------------------------------------------------------------------------------------- */
-
-extern const mi_heap_t _mi_heap_empty;  // read-only empty heap, initial value of the thread local default heap
-extern bool _mi_process_is_initialized;
-mi_heap_t*  _mi_heap_main_get(void);    // statically allocated main backing heap
-
-#if defined(MI_MALLOC_OVERRIDE)
-#if defined(__APPLE__) // macOS
-#define MI_TLS_SLOT               89  // seems unused? 
-// #define MI_TLS_RECURSE_GUARD 1     
-// other possible unused ones are 9, 29, __PTK_FRAMEWORK_JAVASCRIPTCORE_KEY4 (94), __PTK_FRAMEWORK_GC_KEY9 (112) and __PTK_FRAMEWORK_OLDGC_KEY9 (89)
-// see <https://github.com/rweichler/substrate/blob/master/include/pthread_machdep.h>
-#elif defined(__OpenBSD__)
-// use end bytes of a name; goes wrong if anyone uses names > 23 characters (ptrhread specifies 16) 
-// see <https://github.com/openbsd/src/blob/master/lib/libc/include/thread_private.h#L371>
-#define MI_TLS_PTHREAD_SLOT_OFS   (6*sizeof(int) + 4*sizeof(void*) + 24)  
-// #elif defined(__DragonFly__)
-// #warning "mimalloc is not working correctly on DragonFly yet."
-// #define MI_TLS_PTHREAD_SLOT_OFS   (4 + 1*sizeof(void*))  // offset `uniqueid` (also used by gdb?) <https://github.com/DragonFlyBSD/DragonFlyBSD/blob/master/lib/libthread_xu/thread/thr_private.h#L458>
-#elif defined(__ANDROID__)
-// See issue #381
-#define MI_TLS_PTHREAD
-#endif
-#endif
-
-#if defined(MI_TLS_SLOT)
-static inline void* mi_tls_slot(size_t slot) mi_attr_noexcept;   // forward declaration
-#elif defined(MI_TLS_PTHREAD_SLOT_OFS)
-static inline mi_heap_t** mi_tls_pthread_heap_slot(void) {
-  pthread_t self = pthread_self();
-  #if defined(__DragonFly__)
-  if (self==NULL) {
-    mi_heap_t* pheap_main = _mi_heap_main_get();
-    return &pheap_main;
-  }
-  #endif
-  return (mi_heap_t**)((uint8_t*)self + MI_TLS_PTHREAD_SLOT_OFS);
-}
-#elif defined(MI_TLS_PTHREAD)
-extern pthread_key_t _mi_heap_default_key;
-#endif
-
-// Default heap to allocate from (if not using TLS- or pthread slots).
-// Do not use this directly but use through `mi_heap_get_default()` (or the unchecked `mi_get_default_heap`).
-// This thread local variable is only used when neither MI_TLS_SLOT, MI_TLS_PTHREAD, or MI_TLS_PTHREAD_SLOT_OFS are defined.
-// However, on the Apple M1 we do use the address of this variable as the unique thread-id (issue #356).
-extern mi_decl_thread mi_heap_t* _mi_heap_default;  // default heap to allocate from
-
-static inline mi_heap_t* mi_get_default_heap(void) {
-#if defined(MI_TLS_SLOT)
-  mi_heap_t* heap = (mi_heap_t*)mi_tls_slot(MI_TLS_SLOT);
-  if mi_unlikely(heap == NULL) {
-    #ifdef __GNUC__
-    __asm(""); // prevent conditional load of the address of _mi_heap_empty
-    #endif
-    heap = (mi_heap_t*)&_mi_heap_empty;    
-  }
-  return heap;
-#elif defined(MI_TLS_PTHREAD_SLOT_OFS)
-  mi_heap_t* heap = *mi_tls_pthread_heap_slot();
-  return (mi_unlikely(heap == NULL) ? (mi_heap_t*)&_mi_heap_empty : heap);
-#elif defined(MI_TLS_PTHREAD)
-  mi_heap_t* heap = (mi_unlikely(_mi_heap_default_key == (pthread_key_t)(-1)) ? _mi_heap_main_get() : (mi_heap_t*)pthread_getspecific(_mi_heap_default_key));
-  return (mi_unlikely(heap == NULL) ? (mi_heap_t*)&_mi_heap_empty : heap);
-#else
-  #if defined(MI_TLS_RECURSE_GUARD)  
-  if (mi_unlikely(!_mi_process_is_initialized)) return _mi_heap_main_get();
-  #endif
-  return _mi_heap_default;
-#endif
-}
-
-static inline bool mi_heap_is_default(const mi_heap_t* heap) {
-  return (heap == mi_get_default_heap());
-}
-
-static inline bool mi_heap_is_backing(const mi_heap_t* heap) {
-  return (heap->tld->heap_backing == heap);
-}
-
-static inline bool mi_heap_is_initialized(mi_heap_t* heap) {
-  mi_assert_internal(heap != NULL);
-  return (heap != &_mi_heap_empty);
-}
-
-static inline uintptr_t _mi_ptr_cookie(const void* p) {
-  extern mi_heap_t _mi_heap_main;
-  mi_assert_internal(_mi_heap_main.cookie != 0);
-  return ((uintptr_t)p ^ _mi_heap_main.cookie);
-}
-
-/* -----------------------------------------------------------
-  Pages
------------------------------------------------------------ */
-
-static inline mi_page_t* _mi_heap_get_free_small_page(mi_heap_t* heap, size_t size) {
-  mi_assert_internal(size <= (MI_SMALL_SIZE_MAX + MI_PADDING_SIZE));
-  const size_t idx = _mi_wsize_from_size(size);
-  mi_assert_internal(idx < MI_PAGES_DIRECT);
-  return heap->pages_free_direct[idx];
-}
-
-// Get the page belonging to a certain size class
-static inline mi_page_t* _mi_get_free_small_page(size_t size) {
-  return _mi_heap_get_free_small_page(mi_get_default_heap(), size);
-}
-
-// Segment that contains the pointer
-static inline mi_segment_t* _mi_ptr_segment(const void* p) {
-  // mi_assert_internal(p != NULL);
-  return (mi_segment_t*)((uintptr_t)p & ~MI_SEGMENT_MASK);
-}
-
-static inline mi_page_t* mi_slice_to_page(mi_slice_t* s) {
-  mi_assert_internal(s->slice_offset== 0 && s->slice_count > 0);
-  return (mi_page_t*)(s);
-}
-
-static inline mi_slice_t* mi_page_to_slice(mi_page_t* p) {
-  mi_assert_internal(p->slice_offset== 0 && p->slice_count > 0);
-  return (mi_slice_t*)(p);
-}
-
-// Segment belonging to a page
-static inline mi_segment_t* _mi_page_segment(const mi_page_t* page) {
-  mi_segment_t* segment = _mi_ptr_segment(page); 
-  mi_assert_internal(segment == NULL || ((mi_slice_t*)page >= segment->slices && (mi_slice_t*)page < segment->slices + segment->slice_entries));
-  return segment;
-}
-
-static inline mi_slice_t* mi_slice_first(const mi_slice_t* slice) {
-  mi_slice_t* start = (mi_slice_t*)((uint8_t*)slice - slice->slice_offset);
-  mi_assert_internal(start >= _mi_ptr_segment(slice)->slices);
-  mi_assert_internal(start->slice_offset == 0);
-  mi_assert_internal(start + start->slice_count > slice);
-  return start;
-}
-
-// Get the page containing the pointer
-static inline mi_page_t* _mi_segment_page_of(const mi_segment_t* segment, const void* p) {
-  ptrdiff_t diff = (uint8_t*)p - (uint8_t*)segment;
-  mi_assert_internal(diff >= 0 && diff < (ptrdiff_t)MI_SEGMENT_SIZE);
-  size_t idx = (size_t)diff >> MI_SEGMENT_SLICE_SHIFT;
-  mi_assert_internal(idx < segment->slice_entries);
-  mi_slice_t* slice0 = (mi_slice_t*)&segment->slices[idx];
-  mi_slice_t* slice = mi_slice_first(slice0);  // adjust to the block that holds the page data
-  mi_assert_internal(slice->slice_offset == 0);
-  mi_assert_internal(slice >= segment->slices && slice < segment->slices + segment->slice_entries);
-  return mi_slice_to_page(slice);
-}
-
-// Quick page start for initialized pages
-static inline uint8_t* _mi_page_start(const mi_segment_t* segment, const mi_page_t* page, size_t* page_size) {
-  return _mi_segment_page_start(segment, page, page_size);
-}
-
-// Get the page containing the pointer
-static inline mi_page_t* _mi_ptr_page(void* p) {
-  return _mi_segment_page_of(_mi_ptr_segment(p), p);
-}
-
-// Get the block size of a page (special case for huge objects)
-static inline size_t mi_page_block_size(const mi_page_t* page) {
-  const size_t bsize = page->xblock_size;
-  mi_assert_internal(bsize > 0);
-  if mi_likely(bsize < MI_HUGE_BLOCK_SIZE) {
-    return bsize;
-  }
-  else {
-    size_t psize;
-    _mi_segment_page_start(_mi_page_segment(page), page, &psize);
-    return psize;
-  }
-}
-
-// Get the usable block size of a page without fixed padding.
-// This may still include internal padding due to alignment and rounding up size classes.
-static inline size_t mi_page_usable_block_size(const mi_page_t* page) {
-  return mi_page_block_size(page) - MI_PADDING_SIZE;
-}
-
-// size of a segment
-static inline size_t mi_segment_size(mi_segment_t* segment) {
-  return segment->segment_slices * MI_SEGMENT_SLICE_SIZE;
-}
-
-static inline uint8_t* mi_segment_end(mi_segment_t* segment) {
-  return (uint8_t*)segment + mi_segment_size(segment);
-}
-
-// Thread free access
-static inline mi_block_t* mi_page_thread_free(const mi_page_t* page) {
-  return (mi_block_t*)(mi_atomic_load_relaxed(&((mi_page_t*)page)->xthread_free) & ~3);
-}
-
-static inline mi_delayed_t mi_page_thread_free_flag(const mi_page_t* page) {
-  return (mi_delayed_t)(mi_atomic_load_relaxed(&((mi_page_t*)page)->xthread_free) & 3);
-}
-
-// Heap access
-static inline mi_heap_t* mi_page_heap(const mi_page_t* page) {
-  return (mi_heap_t*)(mi_atomic_load_relaxed(&((mi_page_t*)page)->xheap));
-}
-
-static inline void mi_page_set_heap(mi_page_t* page, mi_heap_t* heap) {
-  mi_assert_internal(mi_page_thread_free_flag(page) != MI_DELAYED_FREEING);
-  mi_atomic_store_release(&page->xheap,(uintptr_t)heap);
-}
-
-// Thread free flag helpers
-static inline mi_block_t* mi_tf_block(mi_thread_free_t tf) {
-  return (mi_block_t*)(tf & ~0x03);
-}
-static inline mi_delayed_t mi_tf_delayed(mi_thread_free_t tf) {
-  return (mi_delayed_t)(tf & 0x03);
-}
-static inline mi_thread_free_t mi_tf_make(mi_block_t* block, mi_delayed_t delayed) {
-  return (mi_thread_free_t)((uintptr_t)block | (uintptr_t)delayed);
-}
-static inline mi_thread_free_t mi_tf_set_delayed(mi_thread_free_t tf, mi_delayed_t delayed) {
-  return mi_tf_make(mi_tf_block(tf),delayed);
-}
-static inline mi_thread_free_t mi_tf_set_block(mi_thread_free_t tf, mi_block_t* block) {
-  return mi_tf_make(block, mi_tf_delayed(tf));
-}
-
-// are all blocks in a page freed?
-// note: needs up-to-date used count, (as the `xthread_free` list may not be empty). see `_mi_page_collect_free`.
-static inline bool mi_page_all_free(const mi_page_t* page) {
-  mi_assert_internal(page != NULL);
-  return (page->used == 0);
-}
-
-// are there any available blocks?
-static inline bool mi_page_has_any_available(const mi_page_t* page) {
-  mi_assert_internal(page != NULL && page->reserved > 0);
-  return (page->used < page->reserved || (mi_page_thread_free(page) != NULL));
-}
-
-// are there immediately available blocks, i.e. blocks available on the free list.
-static inline bool mi_page_immediate_available(const mi_page_t* page) {
-  mi_assert_internal(page != NULL);
-  return (page->free != NULL);
-}
-
-// is more than 7/8th of a page in use?
-static inline bool mi_page_mostly_used(const mi_page_t* page) {
-  if (page==NULL) return true;
-  uint16_t frac = page->reserved / 8U;
-  return (page->reserved - page->used <= frac);
-}
-
-static inline mi_page_queue_t* mi_page_queue(const mi_heap_t* heap, size_t size) {
-  return &((mi_heap_t*)heap)->pages[_mi_bin(size)];
-}
-
-
-
-//-----------------------------------------------------------
-// Page flags
-//-----------------------------------------------------------
-static inline bool mi_page_is_in_full(const mi_page_t* page) {
-  return page->flags.x.in_full;
-}
-
-static inline void mi_page_set_in_full(mi_page_t* page, bool in_full) {
-  page->flags.x.in_full = in_full;
-}
-
-static inline bool mi_page_has_aligned(const mi_page_t* page) {
-  return page->flags.x.has_aligned;
-}
-
-static inline void mi_page_set_has_aligned(mi_page_t* page, bool has_aligned) {
-  page->flags.x.has_aligned = has_aligned;
-}
-
-
-/* -------------------------------------------------------------------
-Encoding/Decoding the free list next pointers
-
-This is to protect against buffer overflow exploits where the
-free list is mutated. Many hardened allocators xor the next pointer `p`
-with a secret key `k1`, as `p^k1`. This prevents overwriting with known
-values but might be still too weak: if the attacker can guess
-the pointer `p` this  can reveal `k1` (since `p^k1^p == k1`).
-Moreover, if multiple blocks can be read as well, the attacker can
-xor both as `(p1^k1) ^ (p2^k1) == p1^p2` which may reveal a lot
-about the pointers (and subsequently `k1`).
-
-Instead mimalloc uses an extra key `k2` and encodes as `((p^k2)<<<k1)+k1`.
-Since these operations are not associative, the above approaches do not
-work so well any more even if the `p` can be guesstimated. For example,
-for the read case we can subtract two entries to discard the `+k1` term,
-but that leads to `((p1^k2)<<<k1) - ((p2^k2)<<<k1)` at best.
-We include the left-rotation since xor and addition are otherwise linear
-in the lowest bit. Finally, both keys are unique per page which reduces
-the re-use of keys by a large factor.
-
-We also pass a separate `null` value to be used as `NULL` or otherwise
-`(k2<<<k1)+k1` would appear (too) often as a sentinel value.
-------------------------------------------------------------------- */
-
-static inline bool mi_is_in_same_segment(const void* p, const void* q) {
-  return (_mi_ptr_segment(p) == _mi_ptr_segment(q));
-}
-
-static inline bool mi_is_in_same_page(const void* p, const void* q) {
-  mi_segment_t* segment = _mi_ptr_segment(p);
-  if (_mi_ptr_segment(q) != segment) return false;
-  // assume q may be invalid // return (_mi_segment_page_of(segment, p) == _mi_segment_page_of(segment, q));
-  mi_page_t* page = _mi_segment_page_of(segment, p);
-  size_t psize;
-  uint8_t* start = _mi_segment_page_start(segment, page, &psize);
-  return (start <= (uint8_t*)q && (uint8_t*)q < start + psize);
-}
-
-static inline uintptr_t mi_rotl(uintptr_t x, uintptr_t shift) {
-  shift %= MI_INTPTR_BITS;
-  return (shift==0 ? x : ((x << shift) | (x >> (MI_INTPTR_BITS - shift))));
-}
-static inline uintptr_t mi_rotr(uintptr_t x, uintptr_t shift) {
-  shift %= MI_INTPTR_BITS;
-  return (shift==0 ? x : ((x >> shift) | (x << (MI_INTPTR_BITS - shift))));
-}
-
-static inline void* mi_ptr_decode(const void* null, const mi_encoded_t x, const uintptr_t* keys) {
-  void* p = (void*)(mi_rotr(x - keys[0], keys[0]) ^ keys[1]);
-  return (p==null ? NULL : p);
-}
-
-static inline mi_encoded_t mi_ptr_encode(const void* null, const void* p, const uintptr_t* keys) {
-  uintptr_t x = (uintptr_t)(p==NULL ? null : p);
-  return mi_rotl(x ^ keys[1], keys[0]) + keys[0];
-}
-
-static inline mi_block_t* mi_block_nextx( const void* null, const mi_block_t* block, const uintptr_t* keys ) {
-  mi_track_mem_defined(block,sizeof(mi_block_t));
-  mi_block_t* next;
-  #ifdef MI_ENCODE_FREELIST
-  next = (mi_block_t*)mi_ptr_decode(null, block->next, keys);
-  #else
-  MI_UNUSED(keys); MI_UNUSED(null);
-  next = (mi_block_t*)block->next;
-  #endif
-  mi_track_mem_noaccess(block,sizeof(mi_block_t));
-  return next;  
-}
-
-static inline void mi_block_set_nextx(const void* null, mi_block_t* block, const mi_block_t* next, const uintptr_t* keys) {
-  mi_track_mem_undefined(block,sizeof(mi_block_t));
-  #ifdef MI_ENCODE_FREELIST
-  block->next = mi_ptr_encode(null, next, keys);
-  #else
-  MI_UNUSED(keys); MI_UNUSED(null);
-  block->next = (mi_encoded_t)next;
-  #endif
-  mi_track_mem_noaccess(block,sizeof(mi_block_t));
-}
-
-static inline mi_block_t* mi_block_next(const mi_page_t* page, const mi_block_t* block) {
-  #ifdef MI_ENCODE_FREELIST
-  mi_block_t* next = mi_block_nextx(page,block,page->keys);
-  // check for free list corruption: is `next` at least in the same page?
-  // TODO: check if `next` is `page->block_size` aligned?
-  if mi_unlikely(next!=NULL && !mi_is_in_same_page(block, next)) {
-    _mi_error_message(EFAULT, "corrupted free list entry of size %zub at %p: value 0x%zx\n", mi_page_block_size(page), block, (uintptr_t)next);
-    next = NULL;
-  }
-  return next;
-  #else
-  MI_UNUSED(page);
-  return mi_block_nextx(page,block,NULL);
-  #endif
-}
-
-static inline void mi_block_set_next(const mi_page_t* page, mi_block_t* block, const mi_block_t* next) {
-  #ifdef MI_ENCODE_FREELIST
-  mi_block_set_nextx(page,block,next, page->keys);
-  #else
-  MI_UNUSED(page);
-  mi_block_set_nextx(page,block,next,NULL);
-  #endif
-}
-
-
-// -------------------------------------------------------------------
-// commit mask
-// -------------------------------------------------------------------
-
-static inline void mi_commit_mask_create_empty(mi_commit_mask_t* cm) {
-  for (size_t i = 0; i < MI_COMMIT_MASK_FIELD_COUNT; i++) {
-    cm->mask[i] = 0;
-  }
-}
-
-static inline void mi_commit_mask_create_full(mi_commit_mask_t* cm) {
-  for (size_t i = 0; i < MI_COMMIT_MASK_FIELD_COUNT; i++) {
-    cm->mask[i] = ~((size_t)0);
-  }
-}
-
-static inline bool mi_commit_mask_is_empty(const mi_commit_mask_t* cm) {
-  for (size_t i = 0; i < MI_COMMIT_MASK_FIELD_COUNT; i++) {
-    if (cm->mask[i] != 0) return false;
-  }
-  return true;
-}
-
-static inline bool mi_commit_mask_is_full(const mi_commit_mask_t* cm) {
-  for (size_t i = 0; i < MI_COMMIT_MASK_FIELD_COUNT; i++) {
-    if (cm->mask[i] != ~((size_t)0)) return false;
-  }
-  return true;
-}
-
-// defined in `segment.c`:
-size_t _mi_commit_mask_committed_size(const mi_commit_mask_t* cm, size_t total);
-size_t _mi_commit_mask_next_run(const mi_commit_mask_t* cm, size_t* idx);
-
-#define mi_commit_mask_foreach(cm,idx,count) \
-  idx = 0; \
-  while ((count = _mi_commit_mask_next_run(cm,&idx)) > 0) { 
-        
-#define mi_commit_mask_foreach_end() \
-    idx += count; \
-  }
-      
-
-
-
-// -------------------------------------------------------------------
-// Fast "random" shuffle
-// -------------------------------------------------------------------
-
-static inline uintptr_t _mi_random_shuffle(uintptr_t x) {
-  if (x==0) { x = 17; }   // ensure we don't get stuck in generating zeros
-#if (MI_INTPTR_SIZE==8)
-  // by Sebastiano Vigna, see: <http://xoshiro.di.unimi.it/splitmix64.c>
-  x ^= x >> 30;
-  x *= 0xbf58476d1ce4e5b9UL;
-  x ^= x >> 27;
-  x *= 0x94d049bb133111ebUL;
-  x ^= x >> 31;
-#elif (MI_INTPTR_SIZE==4)
-  // by Chris Wellons, see: <https://nullprogram.com/blog/2018/07/31/>
-  x ^= x >> 16;
-  x *= 0x7feb352dUL;
-  x ^= x >> 15;
-  x *= 0x846ca68bUL;
-  x ^= x >> 16;
-#endif
-  return x;
-}
-
-// -------------------------------------------------------------------
-// Optimize numa node access for the common case (= one node)
-// -------------------------------------------------------------------
-
-int    _mi_os_numa_node_get(mi_os_tld_t* tld);
-size_t _mi_os_numa_node_count_get(void);
-
-extern _Atomic(size_t) _mi_numa_node_count;
-static inline int _mi_os_numa_node(mi_os_tld_t* tld) {
-  if mi_likely(mi_atomic_load_relaxed(&_mi_numa_node_count) == 1) { return 0; }
-  else return _mi_os_numa_node_get(tld);
-}
-static inline size_t _mi_os_numa_node_count(void) {
-  const size_t count = mi_atomic_load_relaxed(&_mi_numa_node_count);
-  if mi_likely(count > 0) { return count; }
-  else return _mi_os_numa_node_count_get();
-}
-
-
-// -------------------------------------------------------------------
-// Getting the thread id should be performant as it is called in the
-// fast path of `_mi_free` and we specialize for various platforms.
-// We only require _mi_threadid() to return a unique id for each thread.
-// -------------------------------------------------------------------
-#if defined(_WIN32)
-
-#define WIN32_LEAN_AND_MEAN
-#include <windows.h>
-static inline mi_threadid_t _mi_thread_id(void) mi_attr_noexcept {
-  // Windows: works on Intel and ARM in both 32- and 64-bit
-  return (uintptr_t)NtCurrentTeb();
-}
-
-// We use assembly for a fast thread id on the main platforms. The TLS layout depends on 
-// both the OS and libc implementation so we use specific tests for each main platform.
-// If you test on another platform and it works please send a PR :-)
-// see also https://akkadia.org/drepper/tls.pdf for more info on the TLS register.
-#elif defined(__GNUC__) && ( \
-           (defined(__GLIBC__)   && (defined(__x86_64__) || defined(__i386__) || defined(__arm__) || defined(__aarch64__))) \
-        || (defined(__APPLE__)   && (defined(__x86_64__) || defined(__aarch64__))) \
-        || (defined(__BIONIC__)  && (defined(__x86_64__) || defined(__i386__) || defined(__arm__) || defined(__aarch64__))) \
-        || (defined(__FreeBSD__) && (defined(__x86_64__) || defined(__i386__) || defined(__aarch64__))) \
-        || (defined(__OpenBSD__) && (defined(__x86_64__) || defined(__i386__) || defined(__aarch64__))) \
-      )
-
-static inline void* mi_tls_slot(size_t slot) mi_attr_noexcept {
-  void* res;
-  const size_t ofs = (slot*sizeof(void*));
-  #if defined(__i386__)
-    __asm__("movl %%gs:%1, %0" : "=r" (res) : "m" (*((void**)ofs)) : );  // x86 32-bit always uses GS
-  #elif defined(__APPLE__) && defined(__x86_64__)
-    __asm__("movq %%gs:%1, %0" : "=r" (res) : "m" (*((void**)ofs)) : );  // x86_64 macOSX uses GS
-  #elif defined(__x86_64__) && (MI_INTPTR_SIZE==4)
-    __asm__("movl %%fs:%1, %0" : "=r" (res) : "m" (*((void**)ofs)) : );  // x32 ABI
-  #elif defined(__x86_64__)
-    __asm__("movq %%fs:%1, %0" : "=r" (res) : "m" (*((void**)ofs)) : );  // x86_64 Linux, BSD uses FS
-  #elif defined(__arm__)
-    void** tcb; MI_UNUSED(ofs);
-    __asm__ volatile ("mrc p15, 0, %0, c13, c0, 3\nbic %0, %0, #3" : "=r" (tcb));
-    res = tcb[slot];
-  #elif defined(__aarch64__)
-    void** tcb; MI_UNUSED(ofs);
-    #if defined(__APPLE__) // M1, issue #343
-    __asm__ volatile ("mrs %0, tpidrro_el0\nbic %0, %0, #7" : "=r" (tcb));
-    #else
-    __asm__ volatile ("mrs %0, tpidr_el0" : "=r" (tcb));
-    #endif
-    res = tcb[slot];
-  #endif
-  return res;
-}
-
-// setting a tls slot is only used on macOS for now
-static inline void mi_tls_slot_set(size_t slot, void* value) mi_attr_noexcept {
-  const size_t ofs = (slot*sizeof(void*));
-  #if defined(__i386__)
-    __asm__("movl %1,%%gs:%0" : "=m" (*((void**)ofs)) : "rn" (value) : );  // 32-bit always uses GS
-  #elif defined(__APPLE__) && defined(__x86_64__)
-    __asm__("movq %1,%%gs:%0" : "=m" (*((void**)ofs)) : "rn" (value) : );  // x86_64 macOS uses GS
-  #elif defined(__x86_64__) && (MI_INTPTR_SIZE==4)
-    __asm__("movl %1,%%fs:%0" : "=m" (*((void**)ofs)) : "rn" (value) : );  // x32 ABI
-  #elif defined(__x86_64__)
-    __asm__("movq %1,%%fs:%0" : "=m" (*((void**)ofs)) : "rn" (value) : );  // x86_64 Linux, BSD uses FS
-  #elif defined(__arm__)
-    void** tcb; MI_UNUSED(ofs);
-    __asm__ volatile ("mrc p15, 0, %0, c13, c0, 3\nbic %0, %0, #3" : "=r" (tcb));
-    tcb[slot] = value;
-  #elif defined(__aarch64__)
-    void** tcb; MI_UNUSED(ofs);
-    #if defined(__APPLE__) // M1, issue #343
-    __asm__ volatile ("mrs %0, tpidrro_el0\nbic %0, %0, #7" : "=r" (tcb));
-    #else
-    __asm__ volatile ("mrs %0, tpidr_el0" : "=r" (tcb));
-    #endif
-    tcb[slot] = value;
-  #endif
-}
-
-static inline mi_threadid_t _mi_thread_id(void) mi_attr_noexcept {
-  #if defined(__BIONIC__)
-    // issue #384, #495: on the Bionic libc (Android), slot 1 is the thread id
-    // see: https://github.com/aosp-mirror/platform_bionic/blob/c44b1d0676ded732df4b3b21c5f798eacae93228/libc/platform/bionic/tls_defines.h#L86
-    return (uintptr_t)mi_tls_slot(1);
-  #else
-    // in all our other targets, slot 0 is the thread id
-    // glibc: https://sourceware.org/git/?p=glibc.git;a=blob_plain;f=sysdeps/x86_64/nptl/tls.h
-    // apple: https://github.com/apple/darwin-xnu/blob/main/libsyscall/os/tsd.h#L36
-    return (uintptr_t)mi_tls_slot(0);
-  #endif
-}
-
-#else
-
-// otherwise use portable C, taking the address of a thread local variable (this is still very fast on most platforms).
-static inline mi_threadid_t _mi_thread_id(void) mi_attr_noexcept {
-  return (uintptr_t)&_mi_heap_default;
-}
-
-#endif
-
-
-// -----------------------------------------------------------------------
-// Count bits: trailing or leading zeros (with MI_INTPTR_BITS on all zero)
-// -----------------------------------------------------------------------
-
-#if defined(__GNUC__)
-
-#include <limits.h>       // LONG_MAX
-#define MI_HAVE_FAST_BITSCAN
-static inline size_t mi_clz(uintptr_t x) {
-  if (x==0) return MI_INTPTR_BITS;
-#if (INTPTR_MAX == LONG_MAX)
-  return __builtin_clzl(x);
-#else
-  return __builtin_clzll(x);
-#endif
-}
-static inline size_t mi_ctz(uintptr_t x) {
-  if (x==0) return MI_INTPTR_BITS;
-#if (INTPTR_MAX == LONG_MAX)
-  return __builtin_ctzl(x);
-#else
-  return __builtin_ctzll(x);
-#endif
-}
-
-#elif defined(_MSC_VER) 
-
-#include <limits.h>       // LONG_MAX
-#define MI_HAVE_FAST_BITSCAN
-static inline size_t mi_clz(uintptr_t x) {
-  if (x==0) return MI_INTPTR_BITS;
-  unsigned long idx;
-#if (INTPTR_MAX == LONG_MAX)
-  _BitScanReverse(&idx, x);
-#else
-  _BitScanReverse64(&idx, x);
-#endif  
-  return ((MI_INTPTR_BITS - 1) - idx);
-}
-static inline size_t mi_ctz(uintptr_t x) {
-  if (x==0) return MI_INTPTR_BITS;
-  unsigned long idx;
-#if (INTPTR_MAX == LONG_MAX)
-  _BitScanForward(&idx, x);
-#else
-  _BitScanForward64(&idx, x);
-#endif  
-  return idx;
-}
-
-#else
-static inline size_t mi_ctz32(uint32_t x) {
-  // de Bruijn multiplication, see <http://supertech.csail.mit.edu/papers/debruijn.pdf>
-  static const unsigned char debruijn[32] = {
-    0, 1, 28, 2, 29, 14, 24, 3, 30, 22, 20, 15, 25, 17, 4, 8,
-    31, 27, 13, 23, 21, 19, 16, 7, 26, 12, 18, 6, 11, 5, 10, 9
-  };
-  if (x==0) return 32;
-  return debruijn[((x & -(int32_t)x) * 0x077CB531UL) >> 27];
-}
-static inline size_t mi_clz32(uint32_t x) {
-  // de Bruijn multiplication, see <http://supertech.csail.mit.edu/papers/debruijn.pdf>
-  static const uint8_t debruijn[32] = {
-    31, 22, 30, 21, 18, 10, 29, 2, 20, 17, 15, 13, 9, 6, 28, 1,
-    23, 19, 11, 3, 16, 14, 7, 24, 12, 4, 8, 25, 5, 26, 27, 0
-  };
-  if (x==0) return 32;
-  x |= x >> 1;
-  x |= x >> 2;
-  x |= x >> 4;
-  x |= x >> 8;
-  x |= x >> 16;
-  return debruijn[(uint32_t)(x * 0x07C4ACDDUL) >> 27];
-}
-
-static inline size_t mi_clz(uintptr_t x) {
-  if (x==0) return MI_INTPTR_BITS;  
-#if (MI_INTPTR_BITS <= 32)
-  return mi_clz32((uint32_t)x);
-#else
-  size_t count = mi_clz32((uint32_t)(x >> 32));
-  if (count < 32) return count;
-  return (32 + mi_clz32((uint32_t)x));
-#endif
-}
-static inline size_t mi_ctz(uintptr_t x) {
-  if (x==0) return MI_INTPTR_BITS;
-#if (MI_INTPTR_BITS <= 32)
-  return mi_ctz32((uint32_t)x);
-#else
-  size_t count = mi_ctz32((uint32_t)x);
-  if (count < 32) return count;
-  return (32 + mi_ctz32((uint32_t)(x>>32)));
-#endif
-}
-
-#endif
-
-// "bit scan reverse": Return index of the highest bit (or MI_INTPTR_BITS if `x` is zero)
-static inline size_t mi_bsr(uintptr_t x) {
-  return (x==0 ? MI_INTPTR_BITS : MI_INTPTR_BITS - 1 - mi_clz(x));
-}
-
-
-// ---------------------------------------------------------------------------------
-// Provide our own `_mi_memcpy` for potential performance optimizations.
-//
-// For now, only on Windows with msvc/clang-cl we optimize to `rep movsb` if 
-// we happen to run on x86/x64 cpu's that have "fast short rep movsb" (FSRM) support 
-// (AMD Zen3+ (~2020) or Intel Ice Lake+ (~2017). See also issue #201 and pr #253. 
-// ---------------------------------------------------------------------------------
-
-#if !MI_TRACK_ENABLED && defined(_WIN32) && (defined(_M_IX86) || defined(_M_X64))
-#include <intrin.h>
-#include <string.h>
-extern bool _mi_cpu_has_fsrm;
-static inline void _mi_memcpy(void* dst, const void* src, size_t n) {
-  if (_mi_cpu_has_fsrm) {
-    __movsb((unsigned char*)dst, (const unsigned char*)src, n);
-  }
-  else {
-    memcpy(dst, src, n);
-  }
-}
-static inline void _mi_memzero(void* dst, size_t n) {
-  if (_mi_cpu_has_fsrm) {
-    __stosb((unsigned char*)dst, 0, n);
-  }
-  else {
-    memset(dst, 0, n);
-  }
-}
-#else
-#include <string.h>
-static inline void _mi_memcpy(void* dst, const void* src, size_t n) {
-  memcpy(dst, src, n);
-}
-static inline void _mi_memzero(void* dst, size_t n) {
-  memset(dst, 0, n);
-}
-#endif
-
-
-// -------------------------------------------------------------------------------
-// The `_mi_memcpy_aligned` can be used if the pointers are machine-word aligned 
-// This is used for example in `mi_realloc`.
-// -------------------------------------------------------------------------------
-
-#if (defined(__GNUC__) && (__GNUC__ >= 4)) || defined(__clang__)
-// On GCC/CLang we provide a hint that the pointers are word aligned.
-#include <string.h>
-static inline void _mi_memcpy_aligned(void* dst, const void* src, size_t n) {
-  mi_assert_internal(((uintptr_t)dst % MI_INTPTR_SIZE == 0) && ((uintptr_t)src % MI_INTPTR_SIZE == 0));
-  void* adst = __builtin_assume_aligned(dst, MI_INTPTR_SIZE);
-  const void* asrc = __builtin_assume_aligned(src, MI_INTPTR_SIZE);
-  _mi_memcpy(adst, asrc, n);
-}
-
-static inline void _mi_memzero_aligned(void* dst, size_t n) {
-  mi_assert_internal((uintptr_t)dst % MI_INTPTR_SIZE == 0);
-  void* adst = __builtin_assume_aligned(dst, MI_INTPTR_SIZE);
-  _mi_memzero(adst, n);
-}
-#else
-// Default fallback on `_mi_memcpy`
-static inline void _mi_memcpy_aligned(void* dst, const void* src, size_t n) {
-  mi_assert_internal(((uintptr_t)dst % MI_INTPTR_SIZE == 0) && ((uintptr_t)src % MI_INTPTR_SIZE == 0));
-  _mi_memcpy(dst, src, n);
-}
-
-static inline void _mi_memzero_aligned(void* dst, size_t n) {
-  mi_assert_internal((uintptr_t)dst % MI_INTPTR_SIZE == 0);
-  _mi_memzero(dst, n);
-}
-#endif
-
-
-#endif
diff --git a/depends/mimalloc/include/mimalloc-new-delete.h b/depends/mimalloc/include/mimalloc-new-delete.h
index 1c12fad2fc23..c16f4a6653d9 100644
--- a/depends/mimalloc/include/mimalloc-new-delete.h
+++ b/depends/mimalloc/include/mimalloc-new-delete.h
@@ -22,17 +22,26 @@ terms of the MIT license. A copy of the license can be found in the file
   #include <new>
   #include <mimalloc.h>
 
+  #if defined(_MSC_VER) && defined(_Ret_notnull_) && defined(_Post_writable_byte_size_)
+  // stay consistent with VCRT definitions
+  #define mi_decl_new(n)          mi_decl_nodiscard mi_decl_restrict _Ret_notnull_ _Post_writable_byte_size_(n)
+  #define mi_decl_new_nothrow(n)  mi_decl_nodiscard mi_decl_restrict _Ret_maybenull_ _Success_(return != NULL) _Post_writable_byte_size_(n)
+  #else
+  #define mi_decl_new(n)          mi_decl_nodiscard mi_decl_restrict
+  #define mi_decl_new_nothrow(n)  mi_decl_nodiscard mi_decl_restrict
+  #endif
+
   void operator delete(void* p) noexcept              { mi_free(p); };
   void operator delete[](void* p) noexcept            { mi_free(p); };
 
   void operator delete  (void* p, const std::nothrow_t&) noexcept { mi_free(p); }
   void operator delete[](void* p, const std::nothrow_t&) noexcept { mi_free(p); }
 
-  void* operator new(std::size_t n) noexcept(false)   { return mi_new(n); }
-  void* operator new[](std::size_t n) noexcept(false) { return mi_new(n); }
+  mi_decl_new(n) void* operator new(std::size_t n) noexcept(false) { return mi_new(n); }
+  mi_decl_new(n) void* operator new[](std::size_t n) noexcept(false) { return mi_new(n); }
 
-  void* operator new  (std::size_t n, const std::nothrow_t& tag) noexcept { (void)(tag); return mi_new_nothrow(n); }
-  void* operator new[](std::size_t n, const std::nothrow_t& tag) noexcept { (void)(tag); return mi_new_nothrow(n); }
+  mi_decl_new_nothrow(n) void* operator new  (std::size_t n, const std::nothrow_t& tag) noexcept { (void)(tag); return mi_new_nothrow(n); }
+  mi_decl_new_nothrow(n) void* operator new[](std::size_t n, const std::nothrow_t& tag) noexcept { (void)(tag); return mi_new_nothrow(n); }
 
   #if (__cplusplus >= 201402L || _MSC_VER >= 1916)
   void operator delete  (void* p, std::size_t n) noexcept { mi_free_size(p,n); };
@@ -46,7 +55,7 @@ terms of the MIT license. A copy of the license can be found in the file
   void operator delete[](void* p, std::size_t n, std::align_val_t al) noexcept { mi_free_size_aligned(p, n, static_cast<size_t>(al)); };
   void operator delete  (void* p, std::align_val_t al, const std::nothrow_t&) noexcept { mi_free_aligned(p, static_cast<size_t>(al)); }
   void operator delete[](void* p, std::align_val_t al, const std::nothrow_t&) noexcept { mi_free_aligned(p, static_cast<size_t>(al)); }
-  
+
   void* operator new  (std::size_t n, std::align_val_t al) noexcept(false) { return mi_new_aligned(n, static_cast<size_t>(al)); }
   void* operator new[](std::size_t n, std::align_val_t al) noexcept(false) { return mi_new_aligned(n, static_cast<size_t>(al)); }
   void* operator new  (std::size_t n, std::align_val_t al, const std::nothrow_t&) noexcept { return mi_new_aligned_nothrow(n, static_cast<size_t>(al)); }
diff --git a/depends/mimalloc/include/mimalloc-override.h b/depends/mimalloc/include/mimalloc-override.h
index c63b0b91a7c2..48a8a6226a05 100644
--- a/depends/mimalloc/include/mimalloc-override.h
+++ b/depends/mimalloc/include/mimalloc-override.h
@@ -24,7 +24,7 @@ not accidentally mix pointers from different allocators).
 #define free(p)                 mi_free(p)
 
 #define strdup(s)               mi_strdup(s)
-#define strndup(s,n)              mi_strndup(s,n)
+#define strndup(s,n)            mi_strndup(s,n)
 #define realpath(f,n)           mi_realpath(f,n)
 
 // Microsoft extensions
@@ -43,6 +43,7 @@ not accidentally mix pointers from different allocators).
 #define reallocf(p,n)           mi_reallocf(p,n)
 #define malloc_size(p)          mi_usable_size(p)
 #define malloc_usable_size(p)   mi_usable_size(p)
+#define malloc_good_size(sz)    mi_malloc_good_size(sz)
 #define cfree(p)                mi_free(p)
 
 #define valloc(n)               mi_valloc(n)
diff --git a/depends/mimalloc/include/mimalloc-stats.h b/depends/mimalloc/include/mimalloc-stats.h
new file mode 100644
index 000000000000..631f43bbec88
--- /dev/null
+++ b/depends/mimalloc/include/mimalloc-stats.h
@@ -0,0 +1,117 @@
+/* ----------------------------------------------------------------------------
+Copyright (c) 2018-2025, Microsoft Research, Daan Leijen
+This is free software; you can redistribute it and/or modify it under the
+terms of the MIT license. A copy of the license can be found in the file
+"LICENSE" at the root of this distribution.
+-----------------------------------------------------------------------------*/
+#pragma once
+#ifndef MIMALLOC_STATS_H
+#define MIMALLOC_STATS_H
+
+#include <mimalloc.h>
+#include <stdint.h>
+
+#define MI_STAT_VERSION   2   // increased on every backward incompatible change
+
+// count allocation over time
+typedef struct mi_stat_count_s {
+  int64_t total;                              // total allocated
+  int64_t peak;                               // peak allocation
+  int64_t current;                            // current allocation
+} mi_stat_count_t;
+
+// counters only increase
+typedef struct mi_stat_counter_s {
+  int64_t total;                              // total count
+} mi_stat_counter_t;
+
+#define MI_STAT_FIELDS() \
+  MI_STAT_COUNT(pages)                      /* count of mimalloc pages */ \
+  MI_STAT_COUNT(reserved)                   /* reserved memory bytes */ \
+  MI_STAT_COUNT(committed)                  /* committed bytes */ \
+  MI_STAT_COUNT(reset)                      /* reset bytes */ \
+  MI_STAT_COUNT(purged)                     /* purged bytes */ \
+  MI_STAT_COUNT(page_committed)             /* committed memory inside pages */ \
+  MI_STAT_COUNT(pages_abandoned)            /* abandonded pages count */ \
+  MI_STAT_COUNT(threads)                    /* number of threads */ \
+  MI_STAT_COUNT(malloc_normal)              /* allocated bytes <= MI_LARGE_OBJ_SIZE_MAX */ \
+  MI_STAT_COUNT(malloc_huge)                /* allocated bytes in huge pages */ \
+  MI_STAT_COUNT(malloc_requested)           /* malloc requested bytes */ \
+  \
+  MI_STAT_COUNTER(mmap_calls) \
+  MI_STAT_COUNTER(commit_calls) \
+  MI_STAT_COUNTER(reset_calls) \
+  MI_STAT_COUNTER(purge_calls) \
+  MI_STAT_COUNTER(arena_count)              /* number of memory arena's */ \
+  MI_STAT_COUNTER(malloc_normal_count)      /* number of blocks <= MI_LARGE_OBJ_SIZE_MAX */ \
+  MI_STAT_COUNTER(malloc_huge_count)        /* number of huge bloks */ \
+  MI_STAT_COUNTER(malloc_guarded_count)     /* number of allocations with guard pages */ \
+  \
+  /* internal statistics */ \
+  MI_STAT_COUNTER(arena_rollback_count) \
+  MI_STAT_COUNTER(arena_purges) \
+  MI_STAT_COUNTER(pages_extended)           /* number of page extensions */ \
+  MI_STAT_COUNTER(pages_retire)             /* number of pages that are retired */ \
+  MI_STAT_COUNTER(page_searches)            /* searches for a fresh page */ \
+  /* only on v1 and v2 */ \
+  MI_STAT_COUNT(segments) \
+  MI_STAT_COUNT(segments_abandoned) \
+  MI_STAT_COUNT(segments_cache) \
+  MI_STAT_COUNT(_segments_reserved) \
+  /* only on v3 */ \
+  MI_STAT_COUNTER(pages_reclaim_on_alloc) \
+  MI_STAT_COUNTER(pages_reclaim_on_free) \
+  MI_STAT_COUNTER(pages_reabandon_full) \
+  MI_STAT_COUNTER(pages_unabandon_busy_wait) \
+
+
+// Size bins for chunks
+typedef enum mi_chunkbin_e {
+  MI_CBIN_SMALL,    // slice_count == 1
+  MI_CBIN_OTHER,    // slice_count: any other from the other bins, and 1 <= slice_count <= MI_BCHUNK_BITS
+  MI_CBIN_MEDIUM,   // slice_count == 8
+  MI_CBIN_LARGE,    // slice_count == MI_SIZE_BITS  (only used if MI_ENABLE_LARGE_PAGES is 1)
+  MI_CBIN_NONE,     // no bin assigned yet (the chunk is completely free)
+  MI_CBIN_COUNT
+} mi_chunkbin_t;
+
+
+// Define the statistics structure
+#define MI_BIN_HUGE             (73U)   // see types.h
+#define MI_STAT_COUNT(stat)     mi_stat_count_t stat;
+#define MI_STAT_COUNTER(stat)   mi_stat_counter_t stat;
+
+typedef struct mi_stats_s
+{
+  int version;
+
+  MI_STAT_FIELDS()
+
+  // future extension
+  mi_stat_count_t   _stat_reserved[4];
+  mi_stat_counter_t _stat_counter_reserved[4];
+
+  // size segregated statistics
+  mi_stat_count_t   malloc_bins[MI_BIN_HUGE+1];   // allocation per size bin
+  mi_stat_count_t   page_bins[MI_BIN_HUGE+1];     // pages allocated per size bin
+  mi_stat_count_t   chunk_bins[MI_CBIN_COUNT];    // chunks per page sizes
+} mi_stats_t;
+
+#undef MI_STAT_COUNT
+#undef MI_STAT_COUNTER
+
+
+// Exported definitions
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+mi_decl_export void    mi_stats_get( size_t stats_size, mi_stats_t* stats ) mi_attr_noexcept;
+mi_decl_export char*   mi_stats_get_json( size_t buf_size, char* buf ) mi_attr_noexcept;    // use mi_free to free the result if the input buf == NULL
+mi_decl_export size_t  mi_stats_get_bin_size(size_t bin) mi_attr_noexcept;
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif // MIMALLOC_STATS_H
diff --git a/depends/mimalloc/include/mimalloc-track.h b/depends/mimalloc/include/mimalloc-track.h
deleted file mode 100644
index bb9df4fa35f7..000000000000
--- a/depends/mimalloc/include/mimalloc-track.h
+++ /dev/null
@@ -1,43 +0,0 @@
-/* ----------------------------------------------------------------------------
-Copyright (c) 2018-2021, Microsoft Research, Daan Leijen
-This is free software; you can redistribute it and/or modify it under the
-terms of the MIT license. A copy of the license can be found in the file
-"LICENSE" at the root of this distribution.
------------------------------------------------------------------------------*/
-#pragma once
-#ifndef MIMALLOC_TRACK_H
-#define MIMALLOC_TRACK_H
-
-// ------------------------------------------------------
-// Track memory ranges with macros for tools like Valgrind
-// or other memory checkers.
-// ------------------------------------------------------
-
-#if MI_VALGRIND
-
-#define MI_TRACK_ENABLED 1
-
-#include <valgrind/valgrind.h>
-#include <valgrind/memcheck.h>
-
-#define mi_track_malloc(p,size,zero)        VALGRIND_MALLOCLIKE_BLOCK(p,size,MI_PADDING_SIZE /*red zone*/,zero)
-#define mi_track_resize(p,oldsize,newsize)  VALGRIND_RESIZEINPLACE_BLOCK(p,oldsize,newsize,MI_PADDING_SIZE /*red zone*/)  
-#define mi_track_free(p)                    VALGRIND_FREELIKE_BLOCK(p,MI_PADDING_SIZE /*red zone*/)
-#define mi_track_mem_defined(p,size)        VALGRIND_MAKE_MEM_DEFINED(p,size)
-#define mi_track_mem_undefined(p,size)      VALGRIND_MAKE_MEM_UNDEFINED(p,size)
-#define mi_track_mem_noaccess(p,size)       VALGRIND_MAKE_MEM_NOACCESS(p,size)
-
-#else
-
-#define MI_TRACK_ENABLED 0
-
-#define mi_track_malloc(p,size,zero)  
-#define mi_track_resize(p,oldsize,newsize)  
-#define mi_track_free(p)              
-#define mi_track_mem_defined(p,size)  
-#define mi_track_mem_undefined(p,size)  
-#define mi_track_mem_noaccess(p,size)  
-
-#endif
-
-#endif
diff --git a/depends/mimalloc/include/mimalloc-types.h b/depends/mimalloc/include/mimalloc-types.h
deleted file mode 100644
index 800d94136cc7..000000000000
--- a/depends/mimalloc/include/mimalloc-types.h
+++ /dev/null
@@ -1,602 +0,0 @@
-/* ----------------------------------------------------------------------------
-Copyright (c) 2018-2021, Microsoft Research, Daan Leijen
-This is free software; you can redistribute it and/or modify it under the
-terms of the MIT license. A copy of the license can be found in the file
-"LICENSE" at the root of this distribution.
------------------------------------------------------------------------------*/
-#pragma once
-#ifndef MIMALLOC_TYPES_H
-#define MIMALLOC_TYPES_H
-
-#include <stddef.h>   // ptrdiff_t
-#include <stdint.h>   // uintptr_t, uint16_t, etc
-#include "mimalloc-atomic.h"  // _Atomic
-
-#ifdef _MSC_VER
-#pragma warning(disable:4214) // bitfield is not int
-#endif 
-
-// Minimal alignment necessary. On most platforms 16 bytes are needed
-// due to SSE registers for example. This must be at least `sizeof(void*)`
-#ifndef MI_MAX_ALIGN_SIZE
-#define MI_MAX_ALIGN_SIZE  16   // sizeof(max_align_t)
-#endif
-
-// ------------------------------------------------------
-// Variants
-// ------------------------------------------------------
-
-// Define NDEBUG in the release version to disable assertions.
-// #define NDEBUG
-
-// Define MI_VALGRIND to enable valgrind support
-// #define MI_VALGRIND 1
-
-// Define MI_STAT as 1 to maintain statistics; set it to 2 to have detailed statistics (but costs some performance).
-// #define MI_STAT 1
-
-// Define MI_SECURE to enable security mitigations
-// #define MI_SECURE 1  // guard page around metadata
-// #define MI_SECURE 2  // guard page around each mimalloc page
-// #define MI_SECURE 3  // encode free lists (detect corrupted free list (buffer overflow), and invalid pointer free)
-// #define MI_SECURE 4  // checks for double free. (may be more expensive)
-
-#if !defined(MI_SECURE)
-#define MI_SECURE 0
-#endif
-
-// Define MI_DEBUG for debug mode
-// #define MI_DEBUG 1  // basic assertion checks and statistics, check double free, corrupted free list, and invalid pointer free.
-// #define MI_DEBUG 2  // + internal assertion checks
-// #define MI_DEBUG 3  // + extensive internal invariant checking (cmake -DMI_DEBUG_FULL=ON)
-#if !defined(MI_DEBUG)
-#if !defined(NDEBUG) || defined(_DEBUG)
-#define MI_DEBUG 2
-#else
-#define MI_DEBUG 0
-#endif
-#endif
-
-// Reserve extra padding at the end of each block to be more resilient against heap block overflows.
-// The padding can detect byte-precise buffer overflow on free.
-#if !defined(MI_PADDING) && (MI_DEBUG>=1 || MI_VALGRIND)
-#define MI_PADDING  1
-#endif
-
-
-// Encoded free lists allow detection of corrupted free lists
-// and can detect buffer overflows, modify after free, and double `free`s.
-#if (MI_SECURE>=3 || MI_DEBUG>=1)
-#define MI_ENCODE_FREELIST  1 
-#endif
-
-
-// ------------------------------------------------------
-// Platform specific values
-// ------------------------------------------------------
-
-// ------------------------------------------------------
-// Size of a pointer.
-// We assume that `sizeof(void*)==sizeof(intptr_t)`
-// and it holds for all platforms we know of.
-//
-// However, the C standard only requires that:
-//  p == (void*)((intptr_t)p))
-// but we also need:
-//  i == (intptr_t)((void*)i)
-// or otherwise one might define an intptr_t type that is larger than a pointer...
-// ------------------------------------------------------
-
-#if INTPTR_MAX > INT64_MAX
-# define MI_INTPTR_SHIFT (4)  // assume 128-bit  (as on arm CHERI for example)
-#elif INTPTR_MAX == INT64_MAX
-# define MI_INTPTR_SHIFT (3)
-#elif INTPTR_MAX == INT32_MAX
-# define MI_INTPTR_SHIFT (2)
-#else
-#error platform pointers must be 32, 64, or 128 bits
-#endif
-
-#if SIZE_MAX == UINT64_MAX
-# define MI_SIZE_SHIFT (3)
-typedef int64_t  mi_ssize_t;
-#elif SIZE_MAX == UINT32_MAX
-# define MI_SIZE_SHIFT (2)
-typedef int32_t  mi_ssize_t;
-#else
-#error platform objects must be 32 or 64 bits
-#endif
-
-#if (SIZE_MAX/2) > LONG_MAX
-# define MI_ZU(x)  x##ULL
-# define MI_ZI(x)  x##LL
-#else
-# define MI_ZU(x)  x##UL
-# define MI_ZI(x)  x##L
-#endif
-
-#define MI_INTPTR_SIZE  (1<<MI_INTPTR_SHIFT)
-#define MI_INTPTR_BITS  (MI_INTPTR_SIZE*8)
-
-#define MI_SIZE_SIZE  (1<<MI_SIZE_SHIFT)
-#define MI_SIZE_BITS  (MI_SIZE_SIZE*8)
-
-#define MI_KiB     (MI_ZU(1024))
-#define MI_MiB     (MI_KiB*MI_KiB)
-#define MI_GiB     (MI_MiB*MI_KiB)
-
-
-// ------------------------------------------------------
-// Main internal data-structures
-// ------------------------------------------------------
-
-// Main tuning parameters for segment and page sizes
-// Sizes for 64-bit (usually divide by two for 32-bit)
-#define MI_SEGMENT_SLICE_SHIFT            (13 + MI_INTPTR_SHIFT)         // 64KiB  (32KiB on 32-bit)
-
-#if MI_INTPTR_SIZE > 4
-#define MI_SEGMENT_SHIFT                  (10 + MI_SEGMENT_SLICE_SHIFT)  // 64MiB
-#else
-#define MI_SEGMENT_SHIFT                  ( 7 + MI_SEGMENT_SLICE_SHIFT)  // 4MiB on 32-bit
-#endif
-
-#define MI_SMALL_PAGE_SHIFT               (MI_SEGMENT_SLICE_SHIFT)       // 64KiB
-#define MI_MEDIUM_PAGE_SHIFT              ( 3 + MI_SMALL_PAGE_SHIFT)     // 512KiB
-
-
-// Derived constants
-#define MI_SEGMENT_SIZE                   (MI_ZU(1)<<MI_SEGMENT_SHIFT)
-#define MI_SEGMENT_ALIGN                  MI_SEGMENT_SIZE
-#define MI_SEGMENT_MASK                   (MI_SEGMENT_SIZE - 1)
-#define MI_SEGMENT_SLICE_SIZE             (MI_ZU(1)<< MI_SEGMENT_SLICE_SHIFT)
-#define MI_SLICES_PER_SEGMENT             (MI_SEGMENT_SIZE / MI_SEGMENT_SLICE_SIZE) // 1024
-
-#define MI_SMALL_PAGE_SIZE                (MI_ZU(1)<<MI_SMALL_PAGE_SHIFT)
-#define MI_MEDIUM_PAGE_SIZE               (MI_ZU(1)<<MI_MEDIUM_PAGE_SHIFT)
-
-#define MI_SMALL_OBJ_SIZE_MAX             (MI_SMALL_PAGE_SIZE/4)   // 8KiB on 64-bit
-#define MI_MEDIUM_OBJ_SIZE_MAX            (MI_MEDIUM_PAGE_SIZE/4)  // 128KiB on 64-bit
-#define MI_MEDIUM_OBJ_WSIZE_MAX           (MI_MEDIUM_OBJ_SIZE_MAX/MI_INTPTR_SIZE)   
-#define MI_LARGE_OBJ_SIZE_MAX             (MI_SEGMENT_SIZE/2)      // 32MiB on 64-bit
-#define MI_LARGE_OBJ_WSIZE_MAX            (MI_LARGE_OBJ_SIZE_MAX/MI_INTPTR_SIZE)
-
-// Maximum number of size classes. (spaced exponentially in 12.5% increments)
-#define MI_BIN_HUGE  (73U)
-
-#if (MI_MEDIUM_OBJ_WSIZE_MAX >= 655360)
-#error "mimalloc internal: define more bins"
-#endif
-#if (MI_ALIGNMENT_MAX > MI_SEGMENT_SIZE/2)
-#error "mimalloc internal: the max aligned boundary is too large for the segment size"
-#endif
-#if (MI_ALIGNED_MAX % MI_SEGMENT_SLICE_SIZE != 0)
-#error "mimalloc internal: the max aligned boundary must be an integral multiple of the segment slice size"
-#endif
-
-// Maximum slice offset (15)
-#define MI_MAX_SLICE_OFFSET               ((MI_ALIGNMENT_MAX / MI_SEGMENT_SLICE_SIZE) - 1)
-
-// Used as a special value to encode block sizes in 32 bits.
-#define MI_HUGE_BLOCK_SIZE                ((uint32_t)(2*MI_GiB))
-
-// blocks up to this size are always allocated aligned
-#define MI_MAX_ALIGN_GUARANTEE            (8*MI_MAX_ALIGN_SIZE)  
-
-
-
-
-// ------------------------------------------------------
-// Mimalloc pages contain allocated blocks
-// ------------------------------------------------------
-
-// The free lists use encoded next fields
-// (Only actually encodes when MI_ENCODED_FREELIST is defined.)
-typedef uintptr_t  mi_encoded_t;
-
-// thread id's
-typedef size_t     mi_threadid_t;
-
-// free lists contain blocks
-typedef struct mi_block_s {
-  mi_encoded_t next;
-} mi_block_t;
-
-
-// The delayed flags are used for efficient multi-threaded free-ing
-typedef enum mi_delayed_e {
-  MI_USE_DELAYED_FREE   = 0, // push on the owning heap thread delayed list
-  MI_DELAYED_FREEING    = 1, // temporary: another thread is accessing the owning heap
-  MI_NO_DELAYED_FREE    = 2, // optimize: push on page local thread free queue if another block is already in the heap thread delayed free list
-  MI_NEVER_DELAYED_FREE = 3  // sticky, only resets on page reclaim
-} mi_delayed_t;
-
-
-// The `in_full` and `has_aligned` page flags are put in a union to efficiently
-// test if both are false (`full_aligned == 0`) in the `mi_free` routine.
-#if !MI_TSAN
-typedef union mi_page_flags_s {
-  uint8_t full_aligned;
-  struct {
-    uint8_t in_full : 1;
-    uint8_t has_aligned : 1;
-  } x;
-} mi_page_flags_t;
-#else
-// under thread sanitizer, use a byte for each flag to suppress warning, issue #130
-typedef union mi_page_flags_s {
-  uint16_t full_aligned;
-  struct {
-    uint8_t in_full;
-    uint8_t has_aligned;
-  } x;
-} mi_page_flags_t;
-#endif
-
-// Thread free list.
-// We use the bottom 2 bits of the pointer for mi_delayed_t flags
-typedef uintptr_t mi_thread_free_t;
-
-// A page contains blocks of one specific size (`block_size`).
-// Each page has three list of free blocks:
-// `free` for blocks that can be allocated,
-// `local_free` for freed blocks that are not yet available to `mi_malloc`
-// `thread_free` for freed blocks by other threads
-// The `local_free` and `thread_free` lists are migrated to the `free` list
-// when it is exhausted. The separate `local_free` list is necessary to
-// implement a monotonic heartbeat. The `thread_free` list is needed for
-// avoiding atomic operations in the common case.
-//
-//
-// `used - |thread_free|` == actual blocks that are in use (alive)
-// `used - |thread_free| + |free| + |local_free| == capacity`
-//
-// We don't count `freed` (as |free|) but use `used` to reduce
-// the number of memory accesses in the `mi_page_all_free` function(s).
-//
-// Notes: 
-// - Access is optimized for `mi_free` and `mi_page_alloc` (in `alloc.c`)
-// - Using `uint16_t` does not seem to slow things down
-// - The size is 8 words on 64-bit which helps the page index calculations
-//   (and 10 words on 32-bit, and encoded free lists add 2 words. Sizes 10 
-//    and 12 are still good for address calculation)
-// - To limit the structure size, the `xblock_size` is 32-bits only; for 
-//   blocks > MI_HUGE_BLOCK_SIZE the size is determined from the segment page size
-// - `thread_free` uses the bottom bits as a delayed-free flags to optimize
-//   concurrent frees where only the first concurrent free adds to the owning
-//   heap `thread_delayed_free` list (see `alloc.c:mi_free_block_mt`).
-//   The invariant is that no-delayed-free is only set if there is
-//   at least one block that will be added, or as already been added, to 
-//   the owning heap `thread_delayed_free` list. This guarantees that pages
-//   will be freed correctly even if only other threads free blocks.
-typedef struct mi_page_s {
-  // "owned" by the segment
-  uint32_t              slice_count;       // slices in this page (0 if not a page)
-  uint32_t              slice_offset;      // distance from the actual page data slice (0 if a page)
-  uint8_t               is_reset : 1;        // `true` if the page memory was reset
-  uint8_t               is_committed : 1;    // `true` if the page virtual memory is committed
-  uint8_t               is_zero_init : 1;    // `true` if the page was zero initialized
-
-  // layout like this to optimize access in `mi_malloc` and `mi_free`
-  uint16_t              capacity;          // number of blocks committed, must be the first field, see `segment.c:page_clear`
-  uint16_t              reserved;          // number of blocks reserved in memory
-  mi_page_flags_t       flags;             // `in_full` and `has_aligned` flags (8 bits)
-  uint8_t               is_zero : 1;         // `true` if the blocks in the free list are zero initialized
-  uint8_t               retire_expire : 7;   // expiration count for retired blocks
-
-  mi_block_t*           free;              // list of available free blocks (`malloc` allocates from this list)
-  #ifdef MI_ENCODE_FREELIST
-  uintptr_t             keys[2];           // two random keys to encode the free lists (see `_mi_block_next`)
-  #endif
-  uint32_t              used;              // number of blocks in use (including blocks in `local_free` and `thread_free`)
-  uint32_t              xblock_size;       // size available in each block (always `>0`) 
-
-  mi_block_t* local_free;                  // list of deferred free blocks by this thread (migrates to `free`)
-  _Atomic(mi_thread_free_t) xthread_free;  // list of deferred free blocks freed by other threads
-  _Atomic(uintptr_t)        xheap;
-
-  struct mi_page_s* next;                  // next page owned by this thread with the same `block_size`
-  struct mi_page_s* prev;                  // previous page owned by this thread with the same `block_size`
-
-  // 64-bit 9 words, 32-bit 12 words, (+2 for secure)
-  #if MI_INTPTR_SIZE==8
-  uintptr_t padding[1];
-  #endif
-} mi_page_t;
-
-
-
-typedef enum mi_page_kind_e {
-  MI_PAGE_SMALL,    // small blocks go into 64KiB pages inside a segment
-  MI_PAGE_MEDIUM,   // medium blocks go into medium pages inside a segment
-  MI_PAGE_LARGE,    // larger blocks go into a page of just one block
-  MI_PAGE_HUGE,     // huge blocks (> 16 MiB) are put into a single page in a single segment.
-} mi_page_kind_t;
-
-typedef enum mi_segment_kind_e {
-  MI_SEGMENT_NORMAL, // MI_SEGMENT_SIZE size with pages inside.
-  MI_SEGMENT_HUGE,   // > MI_LARGE_SIZE_MAX segment with just one huge page inside.
-} mi_segment_kind_t;
-
-// ------------------------------------------------------
-// A segment holds a commit mask where a bit is set if
-// the corresponding MI_COMMIT_SIZE area is committed.
-// The MI_COMMIT_SIZE must be a multiple of the slice
-// size. If it is equal we have the most fine grained 
-// decommit (but setting it higher can be more efficient).
-// The MI_MINIMAL_COMMIT_SIZE is the minimal amount that will
-// be committed in one go which can be set higher than
-// MI_COMMIT_SIZE for efficiency (while the decommit mask
-// is still tracked in fine-grained MI_COMMIT_SIZE chunks)
-// ------------------------------------------------------
-
-#define MI_MINIMAL_COMMIT_SIZE      (2*MI_MiB)
-#define MI_COMMIT_SIZE              (MI_SEGMENT_SLICE_SIZE)              // 64KiB
-#define MI_COMMIT_MASK_BITS         (MI_SEGMENT_SIZE / MI_COMMIT_SIZE)  
-#define MI_COMMIT_MASK_FIELD_BITS    MI_SIZE_BITS
-#define MI_COMMIT_MASK_FIELD_COUNT  (MI_COMMIT_MASK_BITS / MI_COMMIT_MASK_FIELD_BITS)
-
-#if (MI_COMMIT_MASK_BITS != (MI_COMMIT_MASK_FIELD_COUNT * MI_COMMIT_MASK_FIELD_BITS))
-#error "the segment size must be exactly divisible by the (commit size * size_t bits)"
-#endif
-
-typedef struct mi_commit_mask_s {
-  size_t mask[MI_COMMIT_MASK_FIELD_COUNT];
-} mi_commit_mask_t;
-
-typedef mi_page_t  mi_slice_t;
-typedef int64_t    mi_msecs_t;
-
-
-// Segments are large allocated memory blocks (8mb on 64 bit) from
-// the OS. Inside segments we allocated fixed size _pages_ that
-// contain blocks.
-typedef struct mi_segment_s {
-  size_t            memid;              // memory id for arena allocation
-  bool              mem_is_pinned;      // `true` if we cannot decommit/reset/protect in this memory (i.e. when allocated using large OS pages)    
-  bool              mem_is_large;       // in large/huge os pages?
-  bool              mem_is_committed;   // `true` if the whole segment is eagerly committed
-
-  bool              allow_decommit;     
-  mi_msecs_t        decommit_expire;
-  mi_commit_mask_t  decommit_mask;
-  mi_commit_mask_t  commit_mask;
-
-  _Atomic(struct mi_segment_s*) abandoned_next;
-
-  // from here is zero initialized
-  struct mi_segment_s* next;            // the list of freed segments in the cache (must be first field, see `segment.c:mi_segment_init`)
-  
-  size_t            abandoned;          // abandoned pages (i.e. the original owning thread stopped) (`abandoned <= used`)
-  size_t            abandoned_visits;   // count how often this segment is visited in the abandoned list (to force reclaim it it is too long)
-  size_t            used;               // count of pages in use
-  uintptr_t         cookie;             // verify addresses in debug mode: `mi_ptr_cookie(segment) == segment->cookie`  
-
-  size_t            segment_slices;      // for huge segments this may be different from `MI_SLICES_PER_SEGMENT`
-  size_t            segment_info_slices; // initial slices we are using segment info and possible guard pages.
-
-  // layout like this to optimize access in `mi_free`
-  mi_segment_kind_t kind;
-  _Atomic(mi_threadid_t) thread_id;      // unique id of the thread owning this segment
-  size_t            slice_entries;       // entries in the `slices` array, at most `MI_SLICES_PER_SEGMENT`
-  mi_slice_t        slices[MI_SLICES_PER_SEGMENT];
-} mi_segment_t;
-
-
-// ------------------------------------------------------
-// Heaps
-// Provide first-class heaps to allocate from.
-// A heap just owns a set of pages for allocation and
-// can only be allocate/reallocate from the thread that created it.
-// Freeing blocks can be done from any thread though.
-// Per thread, the segments are shared among its heaps.
-// Per thread, there is always a default heap that is
-// used for allocation; it is initialized to statically
-// point to an empty heap to avoid initialization checks
-// in the fast path.
-// ------------------------------------------------------
-
-// Thread local data
-typedef struct mi_tld_s mi_tld_t;
-
-// Pages of a certain block size are held in a queue.
-typedef struct mi_page_queue_s {
-  mi_page_t* first;
-  mi_page_t* last;
-  size_t     block_size;
-} mi_page_queue_t;
-
-#define MI_BIN_FULL  (MI_BIN_HUGE+1)
-
-// Random context
-typedef struct mi_random_cxt_s {
-  uint32_t input[16];
-  uint32_t output[16];
-  int      output_available;
-} mi_random_ctx_t;
-
-
-// In debug mode there is a padding structure at the end of the blocks to check for buffer overflows
-#if (MI_PADDING)
-typedef struct mi_padding_s {
-  uint32_t canary; // encoded block value to check validity of the padding (in case of overflow)
-  uint32_t delta;  // padding bytes before the block. (mi_usable_size(p) - delta == exact allocated bytes)
-} mi_padding_t;
-#define MI_PADDING_SIZE   (sizeof(mi_padding_t))
-#define MI_PADDING_WSIZE  ((MI_PADDING_SIZE + MI_INTPTR_SIZE - 1) / MI_INTPTR_SIZE)
-#else
-#define MI_PADDING_SIZE   0
-#define MI_PADDING_WSIZE  0
-#endif
-
-#define MI_PAGES_DIRECT   (MI_SMALL_WSIZE_MAX + MI_PADDING_WSIZE + 1)
-
-
-// A heap owns a set of pages.
-struct mi_heap_s {
-  mi_tld_t*             tld;
-  mi_page_t*            pages_free_direct[MI_PAGES_DIRECT];  // optimize: array where every entry points a page with possibly free blocks in the corresponding queue for that size.
-  mi_page_queue_t       pages[MI_BIN_FULL + 1];              // queue of pages for each size class (or "bin")
-  _Atomic(mi_block_t*)  thread_delayed_free;
-  mi_threadid_t         thread_id;                           // thread this heap belongs too
-  mi_arena_id_t         arena_id;                            // arena id if the heap belongs to a specific arena (or 0)  
-  uintptr_t             cookie;                              // random cookie to verify pointers (see `_mi_ptr_cookie`)
-  uintptr_t             keys[2];                             // two random keys used to encode the `thread_delayed_free` list
-  mi_random_ctx_t       random;                              // random number context used for secure allocation
-  size_t                page_count;                          // total number of pages in the `pages` queues.
-  size_t                page_retired_min;                    // smallest retired index (retired pages are fully free, but still in the page queues)
-  size_t                page_retired_max;                    // largest retired index into the `pages` array.
-  mi_heap_t*            next;                                // list of heaps per thread
-  bool                  no_reclaim;                          // `true` if this heap should not reclaim abandoned pages
-};
-
-
-
-// ------------------------------------------------------
-// Debug
-// ------------------------------------------------------
-
-#if !defined(MI_DEBUG_UNINIT)
-#define MI_DEBUG_UNINIT     (0xD0)
-#endif
-#if !defined(MI_DEBUG_FREED)
-#define MI_DEBUG_FREED      (0xDF)
-#endif
-#if !defined(MI_DEBUG_PADDING)
-#define MI_DEBUG_PADDING    (0xDE)
-#endif
-
-#if (MI_DEBUG)
-// use our own assertion to print without memory allocation
-void _mi_assert_fail(const char* assertion, const char* fname, unsigned int line, const char* func );
-#define mi_assert(expr)     ((expr) ? (void)0 : _mi_assert_fail(#expr,__FILE__,__LINE__,__func__))
-#else
-#define mi_assert(x)
-#endif
-
-#if (MI_DEBUG>1)
-#define mi_assert_internal    mi_assert
-#else
-#define mi_assert_internal(x)
-#endif
-
-#if (MI_DEBUG>2)
-#define mi_assert_expensive   mi_assert
-#else
-#define mi_assert_expensive(x)
-#endif
-
-// ------------------------------------------------------
-// Statistics
-// ------------------------------------------------------
-
-#ifndef MI_STAT
-#if (MI_DEBUG>0)
-#define MI_STAT 2
-#else
-#define MI_STAT 0
-#endif
-#endif
-
-typedef struct mi_stat_count_s {
-  int64_t allocated;
-  int64_t freed;
-  int64_t peak;
-  int64_t current;
-} mi_stat_count_t;
-
-typedef struct mi_stat_counter_s {
-  int64_t total;
-  int64_t count;
-} mi_stat_counter_t;
-
-typedef struct mi_stats_s {
-  mi_stat_count_t segments;
-  mi_stat_count_t pages;
-  mi_stat_count_t reserved;
-  mi_stat_count_t committed;
-  mi_stat_count_t reset;
-  mi_stat_count_t page_committed;
-  mi_stat_count_t segments_abandoned;
-  mi_stat_count_t pages_abandoned;
-  mi_stat_count_t threads;
-  mi_stat_count_t normal;
-  mi_stat_count_t huge;
-  mi_stat_count_t large;
-  mi_stat_count_t malloc;
-  mi_stat_count_t segments_cache;
-  mi_stat_counter_t pages_extended;
-  mi_stat_counter_t mmap_calls;
-  mi_stat_counter_t commit_calls;
-  mi_stat_counter_t page_no_retire;
-  mi_stat_counter_t searches;
-  mi_stat_counter_t normal_count;
-  mi_stat_counter_t huge_count;
-  mi_stat_counter_t large_count;
-#if MI_STAT>1
-  mi_stat_count_t normal_bins[MI_BIN_HUGE+1];
-#endif
-} mi_stats_t;
-
-
-void _mi_stat_increase(mi_stat_count_t* stat, size_t amount);
-void _mi_stat_decrease(mi_stat_count_t* stat, size_t amount);
-void _mi_stat_counter_increase(mi_stat_counter_t* stat, size_t amount);
-
-#if (MI_STAT)
-#define mi_stat_increase(stat,amount)         _mi_stat_increase( &(stat), amount)
-#define mi_stat_decrease(stat,amount)         _mi_stat_decrease( &(stat), amount)
-#define mi_stat_counter_increase(stat,amount) _mi_stat_counter_increase( &(stat), amount)
-#else
-#define mi_stat_increase(stat,amount)         (void)0
-#define mi_stat_decrease(stat,amount)         (void)0
-#define mi_stat_counter_increase(stat,amount) (void)0
-#endif
-
-#define mi_heap_stat_counter_increase(heap,stat,amount)  mi_stat_counter_increase( (heap)->tld->stats.stat, amount)
-#define mi_heap_stat_increase(heap,stat,amount)  mi_stat_increase( (heap)->tld->stats.stat, amount)
-#define mi_heap_stat_decrease(heap,stat,amount)  mi_stat_decrease( (heap)->tld->stats.stat, amount)
-
-// ------------------------------------------------------
-// Thread Local data
-// ------------------------------------------------------
-
-// A "span" is is an available range of slices. The span queues keep
-// track of slice spans of at most the given `slice_count` (but more than the previous size class).
-typedef struct mi_span_queue_s {
-  mi_slice_t* first;
-  mi_slice_t* last;
-  size_t      slice_count;
-} mi_span_queue_t;
-
-#define MI_SEGMENT_BIN_MAX (35)     // 35 == mi_segment_bin(MI_SLICES_PER_SEGMENT)
-
-// OS thread local data
-typedef struct mi_os_tld_s {
-  size_t                region_idx;   // start point for next allocation
-  mi_stats_t*           stats;        // points to tld stats
-} mi_os_tld_t;
-
-
-// Segments thread local data
-typedef struct mi_segments_tld_s {
-  mi_span_queue_t     spans[MI_SEGMENT_BIN_MAX+1];  // free slice spans inside segments
-  size_t              count;        // current number of segments;
-  size_t              peak_count;   // peak number of segments
-  size_t              current_size; // current size of all segments
-  size_t              peak_size;    // peak size of all segments
-  mi_stats_t*         stats;        // points to tld stats
-  mi_os_tld_t*        os;           // points to os stats
-} mi_segments_tld_t;
-
-// Thread local data
-struct mi_tld_s {
-  unsigned long long  heartbeat;     // monotonic heartbeat count
-  bool                recurse;       // true if deferred was called; used to prevent infinite recursion.
-  mi_heap_t*          heap_backing;  // backing heap of this thread (cannot be deleted)
-  mi_heap_t*          heaps;         // list of heaps in this thread (so we can abandon all when the thread terminates)
-  mi_segments_tld_t   segments;      // segment tld
-  mi_os_tld_t         os;            // os tld
-  mi_stats_t          stats;         // statistics
-};
-
-#endif
diff --git a/depends/mimalloc/include/mimalloc.h b/depends/mimalloc/include/mimalloc.h
index 32eab19ea5a5..aa4222f69f5b 100644
--- a/depends/mimalloc/include/mimalloc.h
+++ b/depends/mimalloc/include/mimalloc.h
@@ -1,5 +1,5 @@
 /* ----------------------------------------------------------------------------
-Copyright (c) 2018-2022, Microsoft Research, Daan Leijen
+Copyright (c) 2018-2023, Microsoft Research, Daan Leijen
 This is free software; you can redistribute it and/or modify it under the
 terms of the MIT license. A copy of the license can be found in the file
 "LICENSE" at the root of this distribution.
@@ -8,7 +8,7 @@ terms of the MIT license. A copy of the license can be found in the file
 #ifndef MIMALLOC_H
 #define MIMALLOC_H
 
-#define MI_MALLOC_VERSION 207   // major + 2 digits minor
+#define MI_MALLOC_VERSION 315   // major + 2 digits minor
 
 // ------------------------------------------------------
 // Compiler specific attributes
@@ -28,6 +28,8 @@ terms of the MIT license. A copy of the license can be found in the file
   #define mi_decl_nodiscard    [[nodiscard]]
 #elif (defined(__GNUC__) && (__GNUC__ >= 4)) || defined(__clang__)  // includes clang, icc, and clang-cl
   #define mi_decl_nodiscard    __attribute__((warn_unused_result))
+#elif defined(_HAS_NODISCARD)
+  #define mi_decl_nodiscard    _NODISCARD
 #elif (_MSC_VER >= 1700)
   #define mi_decl_nodiscard    _Check_return_
 #else
@@ -95,7 +97,6 @@ terms of the MIT license. A copy of the license can be found in the file
 
 #include <stddef.h>     // size_t
 #include <stdbool.h>    // bool
-#include <stdint.h>     // INTPTR_MAX
 
 #ifdef __cplusplus
 extern "C" {
@@ -152,26 +153,26 @@ mi_decl_export void mi_stats_reset(void)      mi_attr_noexcept;
 mi_decl_export void mi_stats_merge(void)      mi_attr_noexcept;
 mi_decl_export void mi_stats_print(void* out) mi_attr_noexcept;  // backward compatibility: `out` is ignored and should be NULL
 mi_decl_export void mi_stats_print_out(mi_output_fun* out, void* arg) mi_attr_noexcept;
+mi_decl_export void mi_thread_stats_print_out(mi_output_fun* out, void* arg) mi_attr_noexcept;
+mi_decl_export void mi_options_print(void)    mi_attr_noexcept;
+
+mi_decl_export void mi_process_info(size_t* elapsed_msecs, size_t* user_msecs, size_t* system_msecs,
+                                    size_t* current_rss, size_t* peak_rss,
+                                    size_t* current_commit, size_t* peak_commit, size_t* page_faults) mi_attr_noexcept;
 
+
+// Generally do not use the following as these are usually called automatically
 mi_decl_export void mi_process_init(void)     mi_attr_noexcept;
+mi_decl_export void mi_cdecl mi_process_done(void) mi_attr_noexcept;
 mi_decl_export void mi_thread_init(void)      mi_attr_noexcept;
 mi_decl_export void mi_thread_done(void)      mi_attr_noexcept;
-mi_decl_export void mi_thread_stats_print_out(mi_output_fun* out, void* arg) mi_attr_noexcept;
 
-mi_decl_export void mi_process_info(size_t* elapsed_msecs, size_t* user_msecs, size_t* system_msecs, 
-                                    size_t* current_rss, size_t* peak_rss, 
-                                    size_t* current_commit, size_t* peak_commit, size_t* page_faults) mi_attr_noexcept;
 
 // -------------------------------------------------------------------------------------
 // Aligned allocation
 // Note that `alignment` always follows `size` for consistency with unaligned
 // allocation, but unfortunately this differs from `posix_memalign` and `aligned_alloc`.
 // -------------------------------------------------------------------------------------
-#if (INTPTR_MAX > INT32_MAX)
-#define MI_ALIGNMENT_MAX   (16*1024*1024UL)  // maximum supported alignment is 16MiB
-#else
-#define MI_ALIGNMENT_MAX   (1024*1024UL)     // maximum supported alignment for 32-bit systems is 1MiB
-#endif
 
 mi_decl_nodiscard mi_decl_export mi_decl_restrict void* mi_malloc_aligned(size_t size, size_t alignment) mi_attr_noexcept mi_attr_malloc mi_attr_alloc_size(1) mi_attr_alloc_align(2);
 mi_decl_nodiscard mi_decl_export mi_decl_restrict void* mi_malloc_aligned_at(size_t size, size_t alignment, size_t offset) mi_attr_noexcept mi_attr_malloc mi_attr_alloc_size(1);
@@ -262,37 +263,89 @@ typedef struct mi_heap_area_s {
   size_t used;        // number of allocated blocks
   size_t block_size;  // size in bytes of each block
   size_t full_block_size; // size in bytes of a full block including padding and metadata.
+  int    heap_tag;    // heap tag associated with this area
 } mi_heap_area_t;
 
 typedef bool (mi_cdecl mi_block_visit_fun)(const mi_heap_t* heap, const mi_heap_area_t* area, void* block, size_t block_size, void* arg);
 
-mi_decl_export bool mi_heap_visit_blocks(const mi_heap_t* heap, bool visit_all_blocks, mi_block_visit_fun* visitor, void* arg);
+mi_decl_export bool   mi_heap_visit_blocks(const mi_heap_t* heap, bool visit_blocks, mi_block_visit_fun* visitor, void* arg);
 
-// Experimental
+// Advanced
 mi_decl_nodiscard mi_decl_export bool mi_is_in_heap_region(const void* p) mi_attr_noexcept;
 mi_decl_nodiscard mi_decl_export bool mi_is_redirected(void) mi_attr_noexcept;
 
-mi_decl_export int mi_reserve_huge_os_pages_interleave(size_t pages, size_t numa_nodes, size_t timeout_msecs) mi_attr_noexcept;
-mi_decl_export int mi_reserve_huge_os_pages_at(size_t pages, int numa_node, size_t timeout_msecs) mi_attr_noexcept;
+mi_decl_export int    mi_reserve_huge_os_pages_interleave(size_t pages, size_t numa_nodes, size_t timeout_msecs) mi_attr_noexcept;
+mi_decl_export int    mi_reserve_huge_os_pages_at(size_t pages, int numa_node, size_t timeout_msecs) mi_attr_noexcept;
 
-mi_decl_export int  mi_reserve_os_memory(size_t size, bool commit, bool allow_large) mi_attr_noexcept;
-mi_decl_export bool mi_manage_os_memory(void* start, size_t size, bool is_committed, bool is_large, bool is_zero, int numa_node) mi_attr_noexcept;
+mi_decl_export int    mi_reserve_os_memory(size_t size, bool commit, bool allow_large) mi_attr_noexcept;
+mi_decl_export bool   mi_manage_os_memory(void* start, size_t size, bool is_committed, bool is_pinned /* cannot decommit/reset? */, bool is_zero, int numa_node) mi_attr_noexcept;
 
-mi_decl_export void mi_debug_show_arenas(void) mi_attr_noexcept;
+mi_decl_export void   mi_debug_show_arenas(void) mi_attr_noexcept;
+mi_decl_export void   mi_arenas_print(void) mi_attr_noexcept;
+mi_decl_export size_t mi_arena_min_alignment(void);
 
-// Experimental: heaps associated with specific memory arena's
-typedef int mi_arena_id_t;
-mi_decl_export void* mi_arena_area(mi_arena_id_t arena_id, size_t* size);
-mi_decl_export int   mi_reserve_huge_os_pages_at_ex(size_t pages, int numa_node, size_t timeout_msecs, bool exclusive, mi_arena_id_t* arena_id) mi_attr_noexcept;
-mi_decl_export int   mi_reserve_os_memory_ex(size_t size, bool commit, bool allow_large, bool exclusive, mi_arena_id_t* arena_id) mi_attr_noexcept;
-mi_decl_export bool  mi_manage_os_memory_ex(void* start, size_t size, bool is_committed, bool is_large, bool is_zero, int numa_node, bool exclusive, mi_arena_id_t* arena_id) mi_attr_noexcept;
+// Advanced: heaps associated with specific memory arena's
+typedef void* mi_arena_id_t;
+mi_decl_export void*  mi_arena_area(mi_arena_id_t arena_id, size_t* size);
+mi_decl_export int    mi_reserve_huge_os_pages_at_ex(size_t pages, int numa_node, size_t timeout_msecs, bool exclusive, mi_arena_id_t* arena_id) mi_attr_noexcept;
+mi_decl_export int    mi_reserve_os_memory_ex(size_t size, bool commit, bool allow_large, bool exclusive, mi_arena_id_t* arena_id) mi_attr_noexcept;
+mi_decl_export bool   mi_manage_os_memory_ex(void* start, size_t size, bool is_committed, bool is_pinned, bool is_zero, int numa_node, bool exclusive, mi_arena_id_t* arena_id) mi_attr_noexcept;
 
-#if MI_MALLOC_VERSION >= 200
+#if MI_MALLOC_VERSION >= 182
+// Create a heap that only allocates in the specified arena
 mi_decl_nodiscard mi_decl_export mi_heap_t* mi_heap_new_in_arena(mi_arena_id_t arena_id);
 #endif
 
+
+// Advanced: allow sub-processes whose memory areas stay separated (and no reclamation between them)
+// Used for example for separate interpreters in one process.
+typedef void* mi_subproc_id_t;
+mi_decl_export mi_subproc_id_t mi_subproc_main(void);
+mi_decl_export mi_subproc_id_t mi_subproc_new(void);
+mi_decl_export void mi_subproc_delete(mi_subproc_id_t subproc);
+mi_decl_export void mi_subproc_add_current_thread(mi_subproc_id_t subproc); // this should be called right after a thread is created (and no allocation has taken place yet)
+
+// Advanced: visit abandoned heap areas (that are not owned by a specific heap)
+mi_decl_export bool mi_abandoned_visit_blocks(mi_subproc_id_t subproc_id, int heap_tag, bool visit_blocks, mi_block_visit_fun* visitor, void* arg);
+
+// Experimental: set numa-affinity of a heap
+mi_decl_export void mi_heap_set_numa_affinity(mi_heap_t* heap, int numa_node);
+
+// Experimental: objects followed by a guard page.
+// Setting the sample rate on a specific heap can be used to test parts of the program more
+// specifically (in combination with `mi_heap_set_default`).
+// A sample rate of 0 disables guarded objects, while 1 uses a guard page for every object.
+// A seed of 0 uses a random start point. Only objects within the size bound are eligable for guard pages.
+mi_decl_export void mi_heap_guarded_set_sample_rate(mi_heap_t* heap, size_t sample_rate, size_t seed);
+mi_decl_export void mi_heap_guarded_set_size_bound(mi_heap_t* heap, size_t min, size_t max);
+
+// Experimental: communicate that the thread is part of a threadpool
+mi_decl_export void mi_thread_set_in_threadpool(void) mi_attr_noexcept;
+
+// Experimental: create a new heap with a specified heap tag. Set `allow_destroy` to false to allow the thread
+// to reclaim abandoned memory (with a compatible heap_tag and arena_id) but in that case `mi_heap_destroy` will
+// fall back to `mi_heap_delete`.
+mi_decl_nodiscard mi_decl_export mi_heap_t* mi_heap_new_ex(int heap_tag, bool allow_destroy, mi_arena_id_t arena_id);
+
 // deprecated
-mi_decl_export int  mi_reserve_huge_os_pages(size_t pages, double max_secs, size_t* pages_reserved) mi_attr_noexcept;
+mi_decl_export int mi_reserve_huge_os_pages(size_t pages, double max_secs, size_t* pages_reserved) mi_attr_noexcept;
+mi_decl_export void mi_collect_reduce(size_t target_thread_owned) mi_attr_noexcept;
+
+
+
+// experimental
+typedef bool (mi_cdecl mi_commit_fun_t)(bool commit, void* start, size_t size, bool* is_zero, void* user_arg);
+mi_decl_export bool  mi_manage_memory(void* start, size_t size, bool is_committed, bool is_pinned, bool is_zero, int numa_node, bool exclusive,
+                                      mi_commit_fun_t* commit_fun, void* commit_fun_arg, mi_arena_id_t* arena_id) mi_attr_noexcept;
+
+mi_decl_export bool  mi_arena_unload(mi_arena_id_t arena_id, void** base, size_t* accessed_size, size_t* size);
+mi_decl_export bool  mi_arena_reload(void* start, size_t size, mi_commit_fun_t* commit_fun, void* commit_fun_arg, mi_arena_id_t* arena_id);
+mi_decl_export bool  mi_heap_reload(mi_heap_t* heap, mi_arena_id_t arena);
+mi_decl_export void  mi_heap_unload(mi_heap_t* heap);
+
+
+// Is a pointer contained in the given arena area?
+mi_decl_export bool  mi_arena_contains(mi_arena_id_t arena_id, const void* p);
 
 
 // ------------------------------------------------------
@@ -320,34 +373,58 @@ mi_decl_export int  mi_reserve_huge_os_pages(size_t pages, double max_secs, size
 
 typedef enum mi_option_e {
   // stable options
-  mi_option_show_errors,
-  mi_option_show_stats,
-  mi_option_verbose,
-  // some of the following options are experimental
-  // (deprecated options are kept for binary backward compatibility with v1.x versions)
-  mi_option_eager_commit,
-  mi_option_deprecated_eager_region_commit,
-  mi_option_deprecated_reset_decommits,
-  mi_option_large_os_pages,           // use large (2MiB) OS pages, implies eager commit
-  mi_option_reserve_huge_os_pages,    // reserve N huge OS pages (1GiB) at startup
-  mi_option_reserve_huge_os_pages_at, // reserve huge OS pages at a specific NUMA node
-  mi_option_reserve_os_memory,        // reserve specified amount of OS memory at startup
+  mi_option_show_errors,                // print error messages
+  mi_option_show_stats,                 // print statistics on termination
+  mi_option_verbose,                    // print verbose messages
+  // advanced options
+  mi_option_eager_commit,               // eager commit segments? (after `eager_commit_delay` segments) (=1)
+  mi_option_arena_eager_commit,         // eager commit arenas? Use 2 to enable just on overcommit systems (=2)
+  mi_option_purge_decommits,            // should a memory purge decommit? (=1). Set to 0 to use memory reset on a purge (instead of decommit)
+  mi_option_allow_large_os_pages,       // allow large (2 or 4 MiB) OS pages, implies eager commit. If false, also disables THP for the process.
+  mi_option_reserve_huge_os_pages,      // reserve N huge OS pages (1GiB pages) at startup
+  mi_option_reserve_huge_os_pages_at,   // reserve huge OS pages at a specific NUMA node
+  mi_option_reserve_os_memory,          // reserve specified amount of OS memory in an arena at startup (internally, this value is in KiB; use `mi_option_get_size`)
   mi_option_deprecated_segment_cache,
-  mi_option_page_reset,
-  mi_option_abandoned_page_decommit,
+  mi_option_deprecated_page_reset,
+  mi_option_abandoned_page_purge,       // immediately purge delayed purges on thread termination
   mi_option_deprecated_segment_reset,
-  mi_option_eager_commit_delay,
-  mi_option_decommit_delay,
-  mi_option_use_numa_nodes,           // 0 = use available numa nodes, otherwise use at most N nodes.
-  mi_option_limit_os_alloc,           // 1 = do not use OS memory for allocation (but only reserved arenas)
-  mi_option_os_tag,
-  mi_option_max_errors,
-  mi_option_max_warnings,
-  mi_option_max_segment_reclaim,
-  mi_option_allow_decommit,
-  mi_option_segment_decommit_delay,  
-  mi_option_decommit_extend_delay,
-  _mi_option_last
+  mi_option_eager_commit_delay,         // the first N segments per thread are not eagerly committed (but per page in the segment on demand)
+  mi_option_purge_delay,                // memory purging is delayed by N milli seconds; use 0 for immediate purging or -1 for no purging at all. (=10)
+  mi_option_use_numa_nodes,             // 0 = use all available numa nodes, otherwise use at most N nodes.
+  mi_option_disallow_os_alloc,          // 1 = do not use OS memory for allocation (but only programmatically reserved arenas)
+  mi_option_os_tag,                     // tag used for OS logging (macOS only for now) (=100)
+  mi_option_max_errors,                 // issue at most N error messages
+  mi_option_max_warnings,               // issue at most N warning messages
+  mi_option_deprecated_max_segment_reclaim,  // max. percentage of the abandoned segments can be reclaimed per try (=10%)
+  mi_option_destroy_on_exit,            // if set, release all memory on exit; sometimes used for dynamic unloading but can be unsafe
+  mi_option_arena_reserve,              // initial memory size for arena reservation (= 1 GiB on 64-bit) (internally, this value is in KiB; use `mi_option_get_size`)
+  mi_option_arena_purge_mult,           // multiplier for `purge_delay` for the purging delay for arenas (=10)
+  mi_option_deprecated_purge_extend_delay,
+  mi_option_disallow_arena_alloc,       // 1 = do not use arena's for allocation (except if using specific arena id's)
+  mi_option_retry_on_oom,               // retry on out-of-memory for N milli seconds (=400), set to 0 to disable retries. (only on windows)
+  mi_option_visit_abandoned,            // allow visiting heap blocks from abandoned threads (=0)
+  mi_option_guarded_min,                // only used when building with MI_GUARDED: minimal rounded object size for guarded objects (=0)
+  mi_option_guarded_max,                // only used when building with MI_GUARDED: maximal rounded object size for guarded objects (=0)
+  mi_option_guarded_precise,            // disregard minimal alignment requirement to always place guarded blocks exactly in front of a guard page (=0)
+  mi_option_guarded_sample_rate,        // 1 out of N allocations in the min/max range will be guarded (=1000)
+  mi_option_guarded_sample_seed,        // can be set to allow for a (more) deterministic re-execution when a guard page is triggered (=0)
+  mi_option_generic_collect,            // collect heaps every N (=10000) generic allocation calls
+  mi_option_page_reclaim_on_free,       // reclaim abandoned pages on a free (=0). -1 disallowr always, 0 allows if the page originated from the current heap, 1 allow always
+  mi_option_page_full_retain,           // retain N full (small) pages per size class (=2)
+  mi_option_page_max_candidates,        // max candidate pages to consider for allocation (=4)
+  mi_option_max_vabits,                 // max user space virtual address bits to consider (=48)
+  mi_option_pagemap_commit,             // commit the full pagemap (to always catch invalid pointer uses) (=0)
+  mi_option_page_commit_on_demand,      // commit page memory on-demand
+  mi_option_page_max_reclaim,           // don't reclaim pages of the same originating heap if we already own N pages (in that size class) (=-1 (unlimited))
+  mi_option_page_cross_thread_max_reclaim, // don't reclaim pages across threads if we already own N pages (in that size class) (=16)
+  _mi_option_last,
+  // legacy option names
+  mi_option_large_os_pages = mi_option_allow_large_os_pages,
+  mi_option_eager_region_commit = mi_option_arena_eager_commit,
+  mi_option_reset_decommits = mi_option_purge_decommits,
+  mi_option_reset_delay = mi_option_purge_delay,
+  mi_option_abandoned_page_reset = mi_option_abandoned_page_purge,
+  mi_option_limit_os_alloc = mi_option_disallow_os_alloc
 } mi_option_t;
 
 
@@ -357,8 +434,9 @@ mi_decl_export void mi_option_disable(mi_option_t option);
 mi_decl_export void mi_option_set_enabled(mi_option_t option, bool enable);
 mi_decl_export void mi_option_set_enabled_default(mi_option_t option, bool enable);
 
-mi_decl_nodiscard mi_decl_export long mi_option_get(mi_option_t option);
-mi_decl_nodiscard mi_decl_export long mi_option_get_clamp(mi_option_t option, long min, long max);
+mi_decl_nodiscard mi_decl_export long   mi_option_get(mi_option_t option);
+mi_decl_nodiscard mi_decl_export long   mi_option_get_clamp(mi_option_t option, long min, long max);
+mi_decl_nodiscard mi_decl_export size_t mi_option_get_size(mi_option_t option);
 mi_decl_export void mi_option_set(mi_option_t option, long value);
 mi_decl_export void mi_option_set_default(mi_option_t option, long value);
 
@@ -405,6 +483,9 @@ mi_decl_nodiscard mi_decl_export mi_decl_restrict void* mi_new_n(size_t count, s
 mi_decl_nodiscard mi_decl_export void* mi_new_realloc(void* p, size_t newsize)                mi_attr_alloc_size(2);
 mi_decl_nodiscard mi_decl_export void* mi_new_reallocn(void* p, size_t newcount, size_t size) mi_attr_alloc_size2(2, 3);
 
+mi_decl_nodiscard mi_decl_export mi_decl_restrict void* mi_heap_alloc_new(mi_heap_t* heap, size_t size)                mi_attr_malloc mi_attr_alloc_size(2);
+mi_decl_nodiscard mi_decl_export mi_decl_restrict void* mi_heap_alloc_new_n(mi_heap_t* heap, size_t count, size_t size) mi_attr_malloc mi_attr_alloc_size2(2, 3);
+
 #ifdef __cplusplus
 }
 #endif
@@ -422,7 +503,7 @@ mi_decl_nodiscard mi_decl_export void* mi_new_reallocn(void* p, size_t newcount,
 #include <utility>     // std::forward
 #endif
 
-template<class T> struct mi_stl_allocator {
+template<class T> struct _mi_stl_allocator_common {
   typedef T                 value_type;
   typedef std::size_t       size_type;
   typedef std::ptrdiff_t    difference_type;
@@ -430,6 +511,27 @@ template<class T> struct mi_stl_allocator {
   typedef value_type const& const_reference;
   typedef value_type*       pointer;
   typedef value_type const* const_pointer;
+
+  #if ((__cplusplus >= 201103L) || (_MSC_VER > 1900))  // C++11
+  using propagate_on_container_copy_assignment = std::true_type;
+  using propagate_on_container_move_assignment = std::true_type;
+  using propagate_on_container_swap            = std::true_type;
+  template <class U, class ...Args> void construct(U* p, Args&& ...args) { ::new(p) U(std::forward<Args>(args)...); }
+  template <class U> void destroy(U* p) mi_attr_noexcept { p->~U(); }
+  #else
+  void construct(pointer p, value_type const& val) { ::new(p) value_type(val); }
+  void destroy(pointer p) { p->~value_type(); }
+  #endif
+
+  size_type     max_size() const mi_attr_noexcept { return (PTRDIFF_MAX/sizeof(value_type)); }
+  pointer       address(reference x) const        { return &x; }
+  const_pointer address(const_reference x) const  { return &x; }
+};
+
+template<class T> struct mi_stl_allocator : public _mi_stl_allocator_common<T> {
+  using typename _mi_stl_allocator_common<T>::size_type;
+  using typename _mi_stl_allocator_common<T>::value_type;
+  using typename _mi_stl_allocator_common<T>::pointer;
   template <class U> struct rebind { typedef mi_stl_allocator<U> other; };
 
   mi_stl_allocator()                                             mi_attr_noexcept = default;
@@ -446,24 +548,91 @@ template<class T> struct mi_stl_allocator {
   #endif
 
   #if ((__cplusplus >= 201103L) || (_MSC_VER > 1900))  // C++11
-  using propagate_on_container_copy_assignment = std::true_type;
-  using propagate_on_container_move_assignment = std::true_type;
-  using propagate_on_container_swap            = std::true_type;
-  using is_always_equal                        = std::true_type;
-  template <class U, class ...Args> void construct(U* p, Args&& ...args) { ::new(p) U(std::forward<Args>(args)...); }
-  template <class U> void destroy(U* p) mi_attr_noexcept { p->~U(); }
-  #else
-  void construct(pointer p, value_type const& val) { ::new(p) value_type(val); }
-  void destroy(pointer p) { p->~value_type(); }
+  using is_always_equal = std::true_type;
   #endif
-
-  size_type     max_size() const mi_attr_noexcept { return (PTRDIFF_MAX/sizeof(value_type)); }
-  pointer       address(reference x) const        { return &x; }
-  const_pointer address(const_reference x) const  { return &x; }
 };
 
 template<class T1,class T2> bool operator==(const mi_stl_allocator<T1>& , const mi_stl_allocator<T2>& ) mi_attr_noexcept { return true; }
 template<class T1,class T2> bool operator!=(const mi_stl_allocator<T1>& , const mi_stl_allocator<T2>& ) mi_attr_noexcept { return false; }
+
+
+#if (__cplusplus >= 201103L) || (_MSC_VER >= 1900)  // C++11
+#define MI_HAS_HEAP_STL_ALLOCATOR 1
+
+#include <memory>      // std::shared_ptr
+
+// Common base class for STL allocators in a specific heap
+template<class T, bool _mi_destroy> struct _mi_heap_stl_allocator_common : public _mi_stl_allocator_common<T> {
+  using typename _mi_stl_allocator_common<T>::size_type;
+  using typename _mi_stl_allocator_common<T>::value_type;
+  using typename _mi_stl_allocator_common<T>::pointer;
+
+  _mi_heap_stl_allocator_common(mi_heap_t* hp) : heap(hp, [](mi_heap_t*) {}) {}    /* will not delete nor destroy the passed in heap */
+
+  #if (__cplusplus >= 201703L)  // C++17
+  mi_decl_nodiscard T* allocate(size_type count) { return static_cast<T*>(mi_heap_alloc_new_n(this->heap.get(), count, sizeof(T))); }
+  mi_decl_nodiscard T* allocate(size_type count, const void*) { return allocate(count); }
+  #else
+  mi_decl_nodiscard pointer allocate(size_type count, const void* = 0) { return static_cast<pointer>(mi_heap_alloc_new_n(this->heap.get(), count, sizeof(value_type))); }
+  #endif
+
+  #if ((__cplusplus >= 201103L) || (_MSC_VER > 1900))  // C++11
+  using is_always_equal = std::false_type;
+  #endif
+
+  void collect(bool force) { mi_heap_collect(this->heap.get(), force); }
+  template<class U> bool is_equal(const _mi_heap_stl_allocator_common<U, _mi_destroy>& x) const { return (this->heap == x.heap); }
+
+protected:
+  std::shared_ptr<mi_heap_t> heap;
+  template<class U, bool D> friend struct _mi_heap_stl_allocator_common;
+
+  _mi_heap_stl_allocator_common() {
+    mi_heap_t* hp = mi_heap_new();
+    this->heap.reset(hp, (_mi_destroy ? &heap_destroy : &heap_delete));  /* calls heap_delete/destroy when the refcount drops to zero */
+  }
+  _mi_heap_stl_allocator_common(const _mi_heap_stl_allocator_common& x) mi_attr_noexcept : heap(x.heap) { }
+  template<class U> _mi_heap_stl_allocator_common(const _mi_heap_stl_allocator_common<U, _mi_destroy>& x) mi_attr_noexcept : heap(x.heap) { }
+
+private:
+  static void heap_delete(mi_heap_t* hp)  { if (hp != NULL) { mi_heap_delete(hp); } }
+  static void heap_destroy(mi_heap_t* hp) { if (hp != NULL) { mi_heap_destroy(hp); } }
+};
+
+// STL allocator allocation in a specific heap
+template<class T> struct mi_heap_stl_allocator : public _mi_heap_stl_allocator_common<T, false> {
+  using typename _mi_heap_stl_allocator_common<T, false>::size_type;
+  mi_heap_stl_allocator() : _mi_heap_stl_allocator_common<T, false>() { } // creates fresh heap that is deleted when the destructor is called
+  mi_heap_stl_allocator(mi_heap_t* hp) : _mi_heap_stl_allocator_common<T, false>(hp) { }  // no delete nor destroy on the passed in heap
+  template<class U> mi_heap_stl_allocator(const mi_heap_stl_allocator<U>& x) mi_attr_noexcept : _mi_heap_stl_allocator_common<T, false>(x) { }
+
+  mi_heap_stl_allocator select_on_container_copy_construction() const { return *this; }
+  void deallocate(T* p, size_type) { mi_free(p); }
+  template<class U> struct rebind { typedef mi_heap_stl_allocator<U> other; };
+};
+
+template<class T1, class T2> bool operator==(const mi_heap_stl_allocator<T1>& x, const mi_heap_stl_allocator<T2>& y) mi_attr_noexcept { return (x.is_equal(y)); }
+template<class T1, class T2> bool operator!=(const mi_heap_stl_allocator<T1>& x, const mi_heap_stl_allocator<T2>& y) mi_attr_noexcept { return (!x.is_equal(y)); }
+
+
+// STL allocator allocation in a specific heap, where `free` does nothing and
+// the heap is destroyed in one go on destruction -- use with care!
+template<class T> struct mi_heap_destroy_stl_allocator : public _mi_heap_stl_allocator_common<T, true> {
+  using typename _mi_heap_stl_allocator_common<T, true>::size_type;
+  mi_heap_destroy_stl_allocator() : _mi_heap_stl_allocator_common<T, true>() { } // creates fresh heap that is destroyed when the destructor is called
+  mi_heap_destroy_stl_allocator(mi_heap_t* hp) : _mi_heap_stl_allocator_common<T, true>(hp) { }  // no delete nor destroy on the passed in heap
+  template<class U> mi_heap_destroy_stl_allocator(const mi_heap_destroy_stl_allocator<U>& x) mi_attr_noexcept : _mi_heap_stl_allocator_common<T, true>(x) { }
+
+  mi_heap_destroy_stl_allocator select_on_container_copy_construction() const { return *this; }
+  void deallocate(T*, size_type) { /* do nothing as we destroy the heap on destruct. */ }
+  template<class U> struct rebind { typedef mi_heap_destroy_stl_allocator<U> other; };
+};
+
+template<class T1, class T2> bool operator==(const mi_heap_destroy_stl_allocator<T1>& x, const mi_heap_destroy_stl_allocator<T2>& y) mi_attr_noexcept { return (x.is_equal(y)); }
+template<class T1, class T2> bool operator!=(const mi_heap_destroy_stl_allocator<T1>& x, const mi_heap_destroy_stl_allocator<T2>& y) mi_attr_noexcept { return (!x.is_equal(y)); }
+
+#endif // C++11
+
 #endif // __cplusplus
 
 #endif
diff --git a/depends/mimalloc/include/mimalloc-atomic.h b/depends/mimalloc/include/mimalloc/atomic.h
similarity index 59%
rename from depends/mimalloc/include/mimalloc-atomic.h
rename to depends/mimalloc/include/mimalloc/atomic.h
index 7ad5da585133..592afb16e97f 100644
--- a/depends/mimalloc/include/mimalloc-atomic.h
+++ b/depends/mimalloc/include/mimalloc/atomic.h
@@ -1,45 +1,64 @@
 /* ----------------------------------------------------------------------------
-Copyright (c) 2018-2021 Microsoft Research, Daan Leijen
+Copyright (c) 2018-2024 Microsoft Research, Daan Leijen
 This is free software; you can redistribute it and/or modify it under the
 terms of the MIT license. A copy of the license can be found in the file
 "LICENSE" at the root of this distribution.
 -----------------------------------------------------------------------------*/
 #pragma once
-#ifndef MIMALLOC_ATOMIC_H
-#define MIMALLOC_ATOMIC_H
+#ifndef MI_ATOMIC_H
+#define MI_ATOMIC_H
+
+// include windows.h or pthreads.h
+#if defined(_WIN32)
+#ifndef WIN32_LEAN_AND_MEAN
+#define WIN32_LEAN_AND_MEAN
+#endif
+#include <windows.h>
+#elif !defined(__wasi__) && (!defined(__EMSCRIPTEN__) || defined(__EMSCRIPTEN_PTHREADS__))
+#define  MI_USE_PTHREADS
+#include <pthread.h>
+#endif
 
 // --------------------------------------------------------------------------------------------
 // Atomics
 // We need to be portable between C, C++, and MSVC.
-// We base the primitives on the C/C++ atomics and create a mimimal wrapper for MSVC in C compilation mode. 
-// This is why we try to use only `uintptr_t` and `<type>*` as atomic types. 
-// To gain better insight in the range of used atomics, we use explicitly named memory order operations 
+// We base the primitives on the C/C++ atomics and create a minimal wrapper for MSVC in C compilation mode.
+// This is why we try to use only `uintptr_t` and `<type>*` as atomic types.
+// To gain better insight in the range of used atomics, we use explicitly named memory order operations
 // instead of passing the memory order as a parameter.
 // -----------------------------------------------------------------------------------------------
 
 #if defined(__cplusplus)
 // Use C++ atomics
 #include <atomic>
-#define  _Atomic(tp)            std::atomic<tp>
-#define  mi_atomic(name)        std::atomic_##name
-#define  mi_memory_order(name)  std::memory_order_##name
-#if !defined(ATOMIC_VAR_INIT) || (__cplusplus >= 202002L) // c++20, see issue #571
- #define MI_ATOMIC_VAR_INIT(x)  x
+#define  _Atomic(tp)              std::atomic<tp>
+#define  mi_atomic(name)          std::atomic_##name
+#define  mi_memory_order(name)    std::memory_order_##name
+#if (__cplusplus >= 202002L)      // c++20, see issue #571
+ #define MI_ATOMIC_VAR_INIT(x)    x
+#elif !defined(ATOMIC_VAR_INIT)
+ #define MI_ATOMIC_VAR_INIT(x)    x
 #else
- #define MI_ATOMIC_VAR_INIT(x)  ATOMIC_VAR_INIT(x)
+ #define MI_ATOMIC_VAR_INIT(x)    ATOMIC_VAR_INIT(x)
 #endif
 #elif defined(_MSC_VER)
 // Use MSVC C wrapper for C11 atomics
-#define  _Atomic(tp)            tp 
-#define  MI_ATOMIC_VAR_INIT(x)  x
-#define  mi_atomic(name)        mi_atomic_##name
-#define  mi_memory_order(name)  mi_memory_order_##name
+#define  _Atomic(tp)              tp
+#define  MI_ATOMIC_VAR_INIT(x)    x
+#define  mi_atomic(name)          mi_atomic_##name
+#define  mi_memory_order(name)    mi_memory_order_##name
 #else
 // Use C11 atomics
 #include <stdatomic.h>
-#define  mi_atomic(name)        atomic_##name
-#define  mi_memory_order(name)  memory_order_##name
-#define  MI_ATOMIC_VAR_INIT(x)  ATOMIC_VAR_INIT(x)
+#define  mi_atomic(name)          atomic_##name
+#define  mi_memory_order(name)    memory_order_##name
+#if (__STDC_VERSION__ >= 201710L) // c17, see issue #735
+ #define MI_ATOMIC_VAR_INIT(x)    x
+#elif !defined(ATOMIC_VAR_INIT)
+ #define MI_ATOMIC_VAR_INIT(x)    x
+#else
+ #define MI_ATOMIC_VAR_INIT(x)    ATOMIC_VAR_INIT(x)
+#endif
 #endif
 
 // Various defines for all used memory orders in mimalloc
@@ -53,18 +72,24 @@ terms of the MIT license. A copy of the license can be found in the file
 #define mi_atomic_load_relaxed(p)                mi_atomic(load_explicit)(p,mi_memory_order(relaxed))
 #define mi_atomic_store_release(p,x)             mi_atomic(store_explicit)(p,x,mi_memory_order(release))
 #define mi_atomic_store_relaxed(p,x)             mi_atomic(store_explicit)(p,x,mi_memory_order(relaxed))
+#define mi_atomic_exchange_relaxed(p,x)          mi_atomic(exchange_explicit)(p,x,mi_memory_order(relaxed))
 #define mi_atomic_exchange_release(p,x)          mi_atomic(exchange_explicit)(p,x,mi_memory_order(release))
 #define mi_atomic_exchange_acq_rel(p,x)          mi_atomic(exchange_explicit)(p,x,mi_memory_order(acq_rel))
+
+#define mi_atomic_cas_weak_relaxed(p,exp,des)    mi_atomic_cas_weak(p,exp,des,mi_memory_order(relaxed),mi_memory_order(relaxed))
 #define mi_atomic_cas_weak_release(p,exp,des)    mi_atomic_cas_weak(p,exp,des,mi_memory_order(release),mi_memory_order(relaxed))
 #define mi_atomic_cas_weak_acq_rel(p,exp,des)    mi_atomic_cas_weak(p,exp,des,mi_memory_order(acq_rel),mi_memory_order(acquire))
+#define mi_atomic_cas_strong_relaxed(p,exp,des)  mi_atomic_cas_strong(p,exp,des,mi_memory_order(relaxed),mi_memory_order(relaxed))
 #define mi_atomic_cas_strong_release(p,exp,des)  mi_atomic_cas_strong(p,exp,des,mi_memory_order(release),mi_memory_order(relaxed))
 #define mi_atomic_cas_strong_acq_rel(p,exp,des)  mi_atomic_cas_strong(p,exp,des,mi_memory_order(acq_rel),mi_memory_order(acquire))
 
 #define mi_atomic_add_relaxed(p,x)               mi_atomic(fetch_add_explicit)(p,x,mi_memory_order(relaxed))
-#define mi_atomic_sub_relaxed(p,x)               mi_atomic(fetch_sub_explicit)(p,x,mi_memory_order(relaxed))
 #define mi_atomic_add_acq_rel(p,x)               mi_atomic(fetch_add_explicit)(p,x,mi_memory_order(acq_rel))
+#define mi_atomic_sub_relaxed(p,x)               mi_atomic(fetch_sub_explicit)(p,x,mi_memory_order(relaxed))
 #define mi_atomic_sub_acq_rel(p,x)               mi_atomic(fetch_sub_explicit)(p,x,mi_memory_order(acq_rel))
+#define mi_atomic_and_relaxed(p,x)               mi_atomic(fetch_and_explicit)(p,x,mi_memory_order(relaxed))
 #define mi_atomic_and_acq_rel(p,x)               mi_atomic(fetch_and_explicit)(p,x,mi_memory_order(acq_rel))
+#define mi_atomic_or_relaxed(p,x)                mi_atomic(fetch_or_explicit)(p,x,mi_memory_order(relaxed))
 #define mi_atomic_or_acq_rel(p,x)                mi_atomic(fetch_or_explicit)(p,x,mi_memory_order(acq_rel))
 
 #define mi_atomic_increment_relaxed(p)           mi_atomic_add_relaxed(p,(uintptr_t)1)
@@ -91,6 +116,8 @@ static inline intptr_t mi_atomic_subi(_Atomic(intptr_t)*p, intptr_t sub);
 #define mi_atomic_cas_ptr_weak_release(tp,p,exp,des)    mi_atomic_cas_weak_release(p,exp,(tp*)des)
 #define mi_atomic_cas_ptr_weak_acq_rel(tp,p,exp,des)    mi_atomic_cas_weak_acq_rel(p,exp,(tp*)des)
 #define mi_atomic_cas_ptr_strong_release(tp,p,exp,des)  mi_atomic_cas_strong_release(p,exp,(tp*)des)
+#define mi_atomic_cas_ptr_strong_acq_rel(tp,p,exp,des)  mi_atomic_cas_strong_acq_rel(p,exp,(tp*)des)
+#define mi_atomic_exchange_ptr_relaxed(tp,p,x)          mi_atomic_exchange_relaxed(p,(tp*)x)
 #define mi_atomic_exchange_ptr_release(tp,p,x)          mi_atomic_exchange_release(p,(tp*)x)
 #define mi_atomic_exchange_ptr_acq_rel(tp,p,x)          mi_atomic_exchange_acq_rel(p,(tp*)x)
 #else
@@ -99,6 +126,8 @@ static inline intptr_t mi_atomic_subi(_Atomic(intptr_t)*p, intptr_t sub);
 #define mi_atomic_cas_ptr_weak_release(tp,p,exp,des)    mi_atomic_cas_weak_release(p,exp,des)
 #define mi_atomic_cas_ptr_weak_acq_rel(tp,p,exp,des)    mi_atomic_cas_weak_acq_rel(p,exp,des)
 #define mi_atomic_cas_ptr_strong_release(tp,p,exp,des)  mi_atomic_cas_strong_release(p,exp,des)
+#define mi_atomic_cas_ptr_strong_acq_rel(tp,p,exp,des)  mi_atomic_cas_strong_acq_rel(p,exp,des)
+#define mi_atomic_exchange_ptr_relaxed(tp,p,x)          mi_atomic_exchange_relaxed(p,x)
 #define mi_atomic_exchange_ptr_release(tp,p,x)          mi_atomic_exchange_release(p,x)
 #define mi_atomic_exchange_ptr_acq_rel(tp,p,x)          mi_atomic_exchange_acq_rel(p,x)
 #endif
@@ -107,24 +136,30 @@ static inline intptr_t mi_atomic_subi(_Atomic(intptr_t)*p, intptr_t sub);
 static inline int64_t mi_atomic_addi64_relaxed(volatile int64_t* p, int64_t add) {
   return mi_atomic(fetch_add_explicit)((_Atomic(int64_t)*)p, add, mi_memory_order(relaxed));
 }
+static inline void mi_atomic_void_addi64_relaxed(volatile int64_t* p, const volatile int64_t* padd) {
+  const int64_t add = mi_atomic_load_relaxed((_Atomic(int64_t)*)padd);
+  if (add != 0) {
+    mi_atomic(fetch_add_explicit)((_Atomic(int64_t)*)p, add, mi_memory_order(relaxed));
+  }
+}
 static inline void mi_atomic_maxi64_relaxed(volatile int64_t* p, int64_t x) {
   int64_t current = mi_atomic_load_relaxed((_Atomic(int64_t)*)p);
   while (current < x && !mi_atomic_cas_weak_release((_Atomic(int64_t)*)p, &current, x)) { /* nothing */ };
 }
 
 // Used by timers
-#define mi_atomic_loadi64_acquire(p)    mi_atomic(load_explicit)(p,mi_memory_order(acquire))
-#define mi_atomic_loadi64_relaxed(p)    mi_atomic(load_explicit)(p,mi_memory_order(relaxed))
-#define mi_atomic_storei64_release(p,x) mi_atomic(store_explicit)(p,x,mi_memory_order(release))
-#define mi_atomic_storei64_relaxed(p,x) mi_atomic(store_explicit)(p,x,mi_memory_order(relaxed))
+#define mi_atomic_loadi64_acquire(p)            mi_atomic(load_explicit)(p,mi_memory_order(acquire))
+#define mi_atomic_loadi64_relaxed(p)            mi_atomic(load_explicit)(p,mi_memory_order(relaxed))
+#define mi_atomic_storei64_release(p,x)         mi_atomic(store_explicit)(p,x,mi_memory_order(release))
+#define mi_atomic_storei64_relaxed(p,x)         mi_atomic(store_explicit)(p,x,mi_memory_order(relaxed))
 
+#define mi_atomic_casi64_strong_acq_rel(p,e,d)  mi_atomic_cas_strong_acq_rel(p,e,d)
+#define mi_atomic_addi64_acq_rel(p,i)           mi_atomic_add_acq_rel(p,i)
 
 
 #elif defined(_MSC_VER)
 
-// MSVC C compilation wrapper that uses Interlocked operations to model C11 atomics.
-#define WIN32_LEAN_AND_MEAN
-#include <windows.h>
+// Legacy MSVC plain C compilation wrapper that uses Interlocked operations to model C11 atomics.
 #include <intrin.h>
 #ifdef _WIN64
 typedef LONG64   msc_intptr_t;
@@ -189,7 +224,7 @@ static inline uintptr_t mi_atomic_load_explicit(_Atomic(uintptr_t) const* p, mi_
 #else
   uintptr_t x = *p;
   if (mo > mi_memory_order_relaxed) {
-    while (!mi_atomic_compare_exchange_weak_explicit(p, &x, x, mo, mi_memory_order_relaxed)) { /* nothing */ };
+    while (!mi_atomic_compare_exchange_weak_explicit((_Atomic(uintptr_t)*)p, &x, x, mo, mi_memory_order_relaxed)) { /* nothing */ };
   }
   return x;
 #endif
@@ -238,6 +273,14 @@ static inline int64_t mi_atomic_addi64_relaxed(volatile _Atomic(int64_t)*p, int6
   return current;
 #endif
 }
+
+static inline void mi_atomic_void_addi64_relaxed(volatile int64_t* p, const volatile int64_t* padd) {
+  const int64_t add = *padd;
+  if (add != 0) {
+    mi_atomic_addi64_relaxed((volatile _Atomic(int64_t)*)p, add);
+  }
+}
+
 static inline void mi_atomic_maxi64_relaxed(volatile _Atomic(int64_t)*p, int64_t x) {
   int64_t current;
   do {
@@ -245,6 +288,21 @@ static inline void mi_atomic_maxi64_relaxed(volatile _Atomic(int64_t)*p, int64_t
   } while (current < x && _InterlockedCompareExchange64(p, x, current) != current);
 }
 
+static inline void mi_atomic_addi64_acq_rel(volatile _Atomic(int64_t*)p, int64_t i) {
+  mi_atomic_addi64_relaxed(p, i);
+}
+
+static inline bool mi_atomic_casi64_strong_acq_rel(volatile _Atomic(int64_t*)p, int64_t* exp, int64_t des) {
+  int64_t read = _InterlockedCompareExchange64(p, des, *exp);
+  if (read == *exp) {
+    return true;
+  }
+  else {
+    *exp = read;
+    return false;
+  }
+}
+
 // The pointer macros cast to `uintptr_t`.
 #define mi_atomic_load_ptr_acquire(tp,p)                (tp*)mi_atomic_load_acquire((_Atomic(uintptr_t)*)(p))
 #define mi_atomic_load_ptr_relaxed(tp,p)                (tp*)mi_atomic_load_relaxed((_Atomic(uintptr_t)*)(p))
@@ -253,6 +311,8 @@ static inline void mi_atomic_maxi64_relaxed(volatile _Atomic(int64_t)*p, int64_t
 #define mi_atomic_cas_ptr_weak_release(tp,p,exp,des)    mi_atomic_cas_weak_release((_Atomic(uintptr_t)*)(p),(uintptr_t*)exp,(uintptr_t)des)
 #define mi_atomic_cas_ptr_weak_acq_rel(tp,p,exp,des)    mi_atomic_cas_weak_acq_rel((_Atomic(uintptr_t)*)(p),(uintptr_t*)exp,(uintptr_t)des)
 #define mi_atomic_cas_ptr_strong_release(tp,p,exp,des)  mi_atomic_cas_strong_release((_Atomic(uintptr_t)*)(p),(uintptr_t*)exp,(uintptr_t)des)
+#define mi_atomic_cas_ptr_strong_acq_rel(tp,p,exp,des)  mi_atomic_cas_strong_acq_rel((_Atomic(uintptr_t)*)(p),(uintptr_t*)exp,(uintptr_t)des)
+#define mi_atomic_exchange_ptr_relaxed(tp,p,x)          (tp*)mi_atomic_exchange_relaxed((_Atomic(uintptr_t)*)(p),(uintptr_t)x)
 #define mi_atomic_exchange_ptr_release(tp,p,x)          (tp*)mi_atomic_exchange_release((_Atomic(uintptr_t)*)(p),(uintptr_t)x)
 #define mi_atomic_exchange_ptr_acq_rel(tp,p,x)          (tp*)mi_atomic_exchange_acq_rel((_Atomic(uintptr_t)*)(p),(uintptr_t)x)
 
@@ -275,15 +335,41 @@ static inline intptr_t mi_atomic_subi(_Atomic(intptr_t)*p, intptr_t sub) {
   return (intptr_t)mi_atomic_addi(p, -sub);
 }
 
-// Yield 
+
+// ----------------------------------------------------------------------
+// Once and Guard
+// ----------------------------------------------------------------------
+
+typedef _Atomic(uintptr_t) mi_atomic_once_t;
+
+// Returns true only on the first invocation
+static inline bool mi_atomic_once( mi_atomic_once_t* once ) {
+  if (mi_atomic_load_relaxed(once) != 0) return false;     // quick test
+  uintptr_t expected = 0;
+  return mi_atomic_cas_strong_acq_rel(once, &expected, (uintptr_t)1); // try to set to 1
+}
+
+typedef _Atomic(uintptr_t) mi_atomic_guard_t;
+
+// Allows only one thread to execute at a time
+#define mi_atomic_guard(guard) \
+  uintptr_t _mi_guard_expected = 0; \
+  for(bool _mi_guard_once = true; \
+      _mi_guard_once && mi_atomic_cas_strong_acq_rel(guard,&_mi_guard_expected,(uintptr_t)1); \
+      (mi_atomic_store_release(guard,(uintptr_t)0), _mi_guard_once = false) )
+
+
+
+// ----------------------------------------------------------------------
+// Yield
+// ----------------------------------------------------------------------
+
 #if defined(__cplusplus)
 #include <thread>
 static inline void mi_atomic_yield(void) {
   std::this_thread::yield();
 }
 #elif defined(_WIN32)
-#define WIN32_LEAN_AND_MEAN
-#include <windows.h>
 static inline void mi_atomic_yield(void) {
   YieldProcessor();
 }
@@ -293,8 +379,9 @@ static inline void mi_atomic_yield(void) {
   _mm_pause();
 }
 #elif (defined(__GNUC__) || defined(__clang__)) && \
-      (defined(__x86_64__) || defined(__i386__) || defined(__arm__) || defined(__armel__) || defined(__ARMEL__) || \
-       defined(__aarch64__) || defined(__powerpc__) || defined(__ppc__) || defined(__PPC__))
+      (defined(__x86_64__) || defined(__i386__) || \
+       defined(__aarch64__) || defined(__arm__) || \
+       defined(__powerpc__) || defined(__ppc__) || defined(__PPC__) || defined(__POWERPC__))
 #if defined(__x86_64__) || defined(__i386__)
 static inline void mi_atomic_yield(void) {
   __asm__ volatile ("pause" ::: "memory");
@@ -303,19 +390,27 @@ static inline void mi_atomic_yield(void) {
 static inline void mi_atomic_yield(void) {
   __asm__ volatile("wfe");
 }
-#elif (defined(__arm__) && __ARM_ARCH__ >= 7)
+#elif defined(__arm__)
+#if __ARM_ARCH >= 7
 static inline void mi_atomic_yield(void) {
   __asm__ volatile("yield" ::: "memory");
 }
-#elif defined(__powerpc__) || defined(__ppc__) || defined(__PPC__)
+#else
 static inline void mi_atomic_yield(void) {
-  __asm__ __volatile__ ("or 27,27,27" ::: "memory");
+  __asm__ volatile ("nop" ::: "memory");
 }
-#elif defined(__armel__) || defined(__ARMEL__)
+#endif
+#elif defined(__powerpc__) || defined(__ppc__) || defined(__PPC__) || defined(__POWERPC__)
+#ifdef __APPLE__
 static inline void mi_atomic_yield(void) {
-  __asm__ volatile ("nop" ::: "memory");
+  __asm__ volatile ("or r27,r27,r27" ::: "memory");
+}
+#else
+static inline void mi_atomic_yield(void) {
+  __asm__ __volatile__ ("or 27,27,27" ::: "memory");
 }
 #endif
+#endif
 #elif defined(__sun)
 // Fallback for other archs
 #include <synch.h>
@@ -335,4 +430,133 @@ static inline void mi_atomic_yield(void) {
 #endif
 
 
-#endif // __MIMALLOC_ATOMIC_H
+// ----------------------------------------------------------------------
+// Locks
+// These should be light-weight in-process only locks.
+// Only used for reserving arena's and to maintain the abandoned list.
+// ----------------------------------------------------------------------
+#if _MSC_VER
+#pragma warning(disable:26110)  // unlock with holding lock
+#endif
+
+#define mi_lock(lock)    for(bool _go = (mi_lock_acquire(lock),true); _go; (mi_lock_release(lock), _go=false) )
+
+#if defined(_WIN32)
+
+#if 1
+#define mi_lock_t  SRWLOCK   // slim reader-writer lock
+
+static inline bool mi_lock_try_acquire(mi_lock_t* lock) {
+  return TryAcquireSRWLockExclusive(lock);
+}
+static inline void mi_lock_acquire(mi_lock_t* lock) {
+  AcquireSRWLockExclusive(lock);
+}
+static inline void mi_lock_release(mi_lock_t* lock) {
+  ReleaseSRWLockExclusive(lock);
+}
+static inline void mi_lock_init(mi_lock_t* lock) {
+  InitializeSRWLock(lock);
+}
+static inline void mi_lock_done(mi_lock_t* lock) {
+  (void)(lock);
+}
+
+#else
+#define mi_lock_t  CRITICAL_SECTION
+
+static inline bool mi_lock_try_acquire(mi_lock_t* lock) {
+  return TryEnterCriticalSection(lock);
+}
+static inline void mi_lock_acquire(mi_lock_t* lock) {
+  EnterCriticalSection(lock);
+}
+static inline void mi_lock_release(mi_lock_t* lock) {
+  LeaveCriticalSection(lock);
+}
+static inline void mi_lock_init(mi_lock_t* lock) {
+  InitializeCriticalSection(lock);
+}
+static inline void mi_lock_done(mi_lock_t* lock) {
+  DeleteCriticalSection(lock);
+}
+
+#endif
+
+#elif defined(MI_USE_PTHREADS)
+
+void _mi_error_message(int err, const char* fmt, ...);
+
+#define mi_lock_t  pthread_mutex_t
+
+static inline bool mi_lock_try_acquire(mi_lock_t* lock) {
+  return (pthread_mutex_trylock(lock) == 0);
+}
+static inline void mi_lock_acquire(mi_lock_t* lock) {
+  const int err = pthread_mutex_lock(lock);
+  if (err != 0) {
+    _mi_error_message(err, "internal error: lock cannot be acquired\n");
+  }
+}
+static inline void mi_lock_release(mi_lock_t* lock) {
+  pthread_mutex_unlock(lock);
+}
+static inline void mi_lock_init(mi_lock_t* lock) {
+  pthread_mutex_init(lock, NULL);
+}
+static inline void mi_lock_done(mi_lock_t* lock) {
+  pthread_mutex_destroy(lock);
+}
+
+#elif defined(__cplusplus)
+
+#include <mutex>
+#define mi_lock_t  std::mutex
+
+static inline bool mi_lock_try_acquire(mi_lock_t* lock) {
+  return lock->try_lock();
+}
+static inline void mi_lock_acquire(mi_lock_t* lock) {
+  lock->lock();
+}
+static inline void mi_lock_release(mi_lock_t* lock) {
+  lock->unlock();
+}
+static inline void mi_lock_init(mi_lock_t* lock) {
+  (void)(lock);
+}
+static inline void mi_lock_done(mi_lock_t* lock) {
+  (void)(lock);
+}
+
+#else
+
+// fall back to poor man's locks.
+// this should only be the case in a single-threaded environment (like __wasi__)
+
+#define mi_lock_t  _Atomic(uintptr_t)
+
+static inline bool mi_lock_try_acquire(mi_lock_t* lock) {
+  uintptr_t expected = 0;
+  return mi_atomic_cas_strong_acq_rel(lock, &expected, (uintptr_t)1);
+}
+static inline void mi_lock_acquire(mi_lock_t* lock) {
+  for (int i = 0; i < 1000; i++) {  // for at most 1000 tries?
+    if (mi_lock_try_acquire(lock)) return;
+    mi_atomic_yield();
+  }
+}
+static inline void mi_lock_release(mi_lock_t* lock) {
+  mi_atomic_store_release(lock, (uintptr_t)0);
+}
+static inline void mi_lock_init(mi_lock_t* lock) {
+  mi_lock_release(lock);
+}
+static inline void mi_lock_done(mi_lock_t* lock) {
+  (void)(lock);
+}
+
+#endif
+
+
+#endif // MI_ATOMIC_H
diff --git a/depends/mimalloc/include/mimalloc/bits.h b/depends/mimalloc/include/mimalloc/bits.h
new file mode 100644
index 000000000000..1d4063bb5994
--- /dev/null
+++ b/depends/mimalloc/include/mimalloc/bits.h
@@ -0,0 +1,377 @@
+/* ----------------------------------------------------------------------------
+Copyright (c) 2019-2024 Microsoft Research, Daan Leijen
+This is free software; you can redistribute it and/or modify it under the
+terms of the MIT license. A copy of the license can be found in the file
+"LICENSE" at the root of this distribution.
+-----------------------------------------------------------------------------*/
+
+/* ----------------------------------------------------------------------------
+  Bit operation, and platform dependent definition (MI_INTPTR_SIZE etc)
+---------------------------------------------------------------------------- */
+
+#pragma once
+#ifndef MI_BITS_H
+#define MI_BITS_H
+
+
+// ------------------------------------------------------
+// Size of a pointer.
+// We assume that `sizeof(void*)==sizeof(intptr_t)`
+// and it holds for all platforms we know of.
+//
+// However, the C standard only requires that:
+//  p == (void*)((intptr_t)p))
+// but we also need:
+//  i == (intptr_t)((void*)i)
+// or otherwise one might define an intptr_t type that is larger than a pointer...
+// ------------------------------------------------------
+
+#if INTPTR_MAX > INT64_MAX
+# define MI_INTPTR_SHIFT (4)  // assume 128-bit  (as on arm CHERI for example)
+#elif INTPTR_MAX == INT64_MAX
+# define MI_INTPTR_SHIFT (3)
+#elif INTPTR_MAX == INT32_MAX
+# define MI_INTPTR_SHIFT (2)
+#else
+#error platform pointers must be 32, 64, or 128 bits
+#endif
+
+#if (INTPTR_MAX) > LONG_MAX
+# define MI_PU(x)  x##ULL
+#else
+# define MI_PU(x)  x##UL
+#endif
+
+#if SIZE_MAX == UINT64_MAX
+# define MI_SIZE_SHIFT (3)
+typedef int64_t  mi_ssize_t;
+#elif SIZE_MAX == UINT32_MAX
+# define MI_SIZE_SHIFT (2)
+typedef int32_t  mi_ssize_t;
+#else
+#error platform objects must be 32 or 64 bits in size
+#endif
+
+#if (SIZE_MAX/2) > LONG_MAX
+# define MI_ZU(x)  x##ULL
+#else
+# define MI_ZU(x)  x##UL
+#endif
+
+#define MI_INTPTR_SIZE  (1<<MI_INTPTR_SHIFT)
+#define MI_INTPTR_BITS  (MI_INTPTR_SIZE*8)
+
+#define MI_SIZE_SIZE  (1<<MI_SIZE_SHIFT)
+#define MI_SIZE_BITS  (MI_SIZE_SIZE*8)
+
+#define MI_KiB     (MI_ZU(1024))
+#define MI_MiB     (MI_KiB*MI_KiB)
+#define MI_GiB     (MI_MiB*MI_KiB)
+
+
+/* --------------------------------------------------------------------------------
+  Architecture
+-------------------------------------------------------------------------------- */
+
+#if defined(__aarch64__) || defined(_M_ARM64) || defined(_M_HYBRID_X86_ARM64) || defined(_M_ARM64EC)  // consider arm64ec as arm64
+#define MI_ARCH_ARM64     1
+#elif defined(__amd64__) || defined(__amd64) || defined(__x86_64__) || defined(__x86_64) || defined(_M_X64) || defined(_M_AMD64)
+#define MI_ARCH_X64       1
+#elif defined(__i386__) || defined(__i386) || defined(_M_IX86) || defined(_X86_) || defined(__X86__)
+#define MI_ARCH_X86       1
+#elif defined(__arm__) || defined(_ARM) || defined(_M_ARM)  || defined(_M_ARMT) || defined(__arm)
+#define MI_ARCH_ARM32     1
+#elif defined(__riscv) || defined(_M_RISCV)
+#define MI_ARCH_RISCV     1
+#if (LONG_MAX == INT32_MAX)
+#define MI_ARCH_RISCV32   1
+#else
+#define MI_ARCH_RISCV64   1
+#endif
+#endif
+
+#if (MI_ARCH_X86 || MI_ARCH_X64)
+#include <immintrin.h>
+#elif MI_ARCH_ARM64 && MI_OPT_SIMD
+#include <arm_neon.h>
+#endif
+#if defined(_MSC_VER) && (MI_ARCH_X64 || MI_ARCH_X86 || MI_ARCH_ARM64 || MI_ARCH_ARM32)
+#include <intrin.h>
+#endif
+
+#if MI_ARCH_X64 && defined(__AVX2__) && !defined(__BMI2__) // msvc
+#define __BMI2__  1
+#endif
+#if MI_ARCH_X64 && (defined(__AVX2__) || defined(__BMI2__)) && !defined(__BMI1__) // msvc
+#define __BMI1__  1
+#endif
+
+// Define big endian if needed
+// #define MI_BIG_ENDIAN  1
+
+// maximum virtual address bits in a user-space pointer
+#if MI_DEFAULT_VIRTUAL_ADDRESS_BITS > 0 
+#define MI_MAX_VABITS     MI_DEFAULT_VIRTUAL_ADDRESS_BITS
+#elif   MI_ARCH_X64
+#define MI_MAX_VABITS     (47)
+#elif MI_INTPTR_SIZE > 4
+#define MI_MAX_VABITS     (48)
+#else
+#define MI_MAX_VABITS     (32)
+#endif
+
+
+// use a flat page-map (or a 2-level one)
+#ifndef MI_PAGE_MAP_FLAT
+#if MI_MAX_VABITS <= 40 && !MI_SECURE && !defined(__APPLE__) 
+#define MI_PAGE_MAP_FLAT  1
+#else
+#define MI_PAGE_MAP_FLAT  0
+#endif
+#endif
+
+#if MI_PAGE_MAP_FLAT && MI_SECURE
+#error should not use MI_PAGE_MAP_FLAT with a secure build
+#endif
+
+
+/* --------------------------------------------------------------------------------
+  Builtin's
+-------------------------------------------------------------------------------- */
+
+#if defined(__GNUC__) || defined(__clang__)
+#define mi_unlikely(x)     (__builtin_expect(!!(x),false))
+#define mi_likely(x)       (__builtin_expect(!!(x),true))
+#elif (defined(__cplusplus) && (__cplusplus >= 202002L)) || (defined(_MSVC_LANG) && _MSVC_LANG >= 202002L)
+#define mi_unlikely(x)     (x) [[unlikely]]
+#define mi_likely(x)       (x) [[likely]]
+#else
+#define mi_unlikely(x)     (x)
+#define mi_likely(x)       (x)
+#endif
+
+
+#ifndef __has_builtin
+#define __has_builtin(x)  0
+#endif
+
+#define mi_builtin(name)        __builtin_##name
+#define mi_has_builtin(name)    __has_builtin(__builtin_##name)
+
+#if (LONG_MAX == INT32_MAX)
+#define mi_builtin32(name)       mi_builtin(name##l)
+#define mi_has_builtin32(name)   mi_has_builtin(name##l)
+#else
+#define mi_builtin32(name)       mi_builtin(name)
+#define mi_has_builtin32(name)   mi_has_builtin(name)
+#endif
+#if (LONG_MAX == INT64_MAX)
+#define mi_builtin64(name)       mi_builtin(name##l)
+#define mi_has_builtin64(name)   mi_has_builtin(name##l)
+#else
+#define mi_builtin64(name)       mi_builtin(name##ll)
+#define mi_has_builtin64(name)   mi_has_builtin(name##ll)
+#endif
+
+#if (MI_SIZE_BITS == 32)
+#define mi_builtinz(name)        mi_builtin32(name)
+#define mi_has_builtinz(name)    mi_has_builtin32(name)
+#define mi_msc_builtinz(name)    name
+#elif (MI_SIZE_BITS == 64)
+#define mi_builtinz(name)        mi_builtin64(name)
+#define mi_has_builtinz(name)    mi_has_builtin64(name)
+#define mi_msc_builtinz(name)    name##64
+#endif
+
+/* --------------------------------------------------------------------------------
+  Popcount and count trailing/leading zero's
+-------------------------------------------------------------------------------- */
+
+size_t _mi_popcount_generic(size_t x);
+extern bool _mi_cpu_has_popcnt;
+
+static inline size_t mi_popcount(size_t x) {
+  #if defined(__GNUC__) && (MI_ARCH_X64 || MI_ARCH_X86)
+    #if !defined(__BMI1__)
+    if mi_unlikely(!_mi_cpu_has_popcnt) { return _mi_popcount_generic(x); }
+    #endif
+    size_t r;
+    __asm ("popcnt\t%1,%0" : "=r"(r) : "r"(x) : "cc");
+    return r;
+  #elif defined(_MSC_VER) && (MI_ARCH_X64 || MI_ARCH_X86)
+    #if !defined(__BMI1__)
+    if mi_unlikely(!_mi_cpu_has_popcnt) { return _mi_popcount_generic(x); }
+    #endif
+    return (size_t)mi_msc_builtinz(__popcnt)(x);
+  #elif defined(_MSC_VER) && MI_ARCH_ARM64
+    return (size_t)mi_msc_builtinz(__popcnt)(x);
+  #elif mi_has_builtinz(popcount)
+    return mi_builtinz(popcount)(x);
+  #else
+    #define MI_HAS_FAST_POPCOUNT  0
+    return _mi_popcount_generic(x);
+  #endif
+}
+
+#ifndef MI_HAS_FAST_POPCOUNT
+#define MI_HAS_FAST_POPCOUNT 1
+#endif
+
+
+
+size_t _mi_clz_generic(size_t x);
+size_t _mi_ctz_generic(size_t x);
+
+static inline size_t mi_ctz(size_t x) {
+  #if defined(__GNUC__) && MI_ARCH_X64 && defined(__BMI1__)  
+    size_t r;
+    __asm ("tzcnt\t%1, %0" : "=r"(r) : "r"(x) : "cc");
+    return r;
+  #elif defined(__GNUC__) && MI_ARCH_X64
+    // tzcnt is interpreted as bsf if BMI1 is not supported (pre-haswell)
+    // if the argument is zero:
+    // - tzcnt: sets carry-flag, and returns MI_SIZE_BITS
+    // - bsf  : sets zero-flag, and leaves the destination _unmodified_ (on both AMD and Intel now, see <https://github.com/llvm/llvm-project/pull/102885>)
+    // so we always initialize r to MI_SIZE_BITS to work correctly on all cpu's without branching
+    size_t r = MI_SIZE_BITS;
+    __asm ("tzcnt\t%1, %0" : "+r"(r) : "r"(x) : "cc");  // use '+r' to keep the assignment to r in case this becomes bsf on older cpu's
+    return r;
+  #elif mi_has_builtinz(ctz)
+    return (x!=0 ? (size_t)mi_builtinz(ctz)(x) : MI_SIZE_BITS);
+  #elif defined(_MSC_VER) && MI_ARCH_X64 && defined(__BMI1__)
+    return (x!=0 ? _tzcnt_u64(x) : MI_SIZE_BITS);  // ensure it still works on non-BMI1 cpu's as well
+  #elif defined(_MSC_VER) && (MI_ARCH_X64 || MI_ARCH_X86 || MI_ARCH_ARM64 || MI_ARCH_ARM32)
+    if (x==0) return MI_SIZE_BITS; // test explicitly for `x==0` to avoid codegen bug (issue #1071)    
+    unsigned long idx; mi_msc_builtinz(_BitScanForward)(&idx, x);
+    return (size_t)idx;
+  #elif defined(__GNUC__) && MI_ARCH_X86
+    size_t r = MI_SIZE_BITS;
+    __asm ("bsf\t%1, %0" : "+r"(r) : "r"(x) : "cc");
+    return r;
+  #elif MI_HAS_FAST_POPCOUNT
+    return (x!=0 ? (mi_popcount(x^(x-1))-1) : MI_SIZE_BITS);
+  #else
+    #define MI_HAS_FAST_BITSCAN  0
+    return (x!=0 ? _mi_ctz_generic(x) : MI_SIZE_BITS);
+  #endif
+}
+
+static inline size_t mi_clz(size_t x) {
+  // we don't optimize anymore to lzcnt as there are still non BMI1 cpu's around (like Intel Celeron, see issue #1016)
+  // on pre-haswell cpu's lzcnt gets executed as bsr which is not equivalent (at it returns the bit position)
+  #if defined(__GNUC__) && MI_ARCH_X64 && defined(__BMI1__) // on x64 lzcnt is defined for 0
+    size_t r;
+    __asm ("lzcnt\t%1, %0" : "=r"(r) : "r"(x) : "cc");
+    return r;
+  #elif mi_has_builtinz(clz)
+    return (x!=0 ? (size_t)mi_builtinz(clz)(x) : MI_SIZE_BITS);
+  #elif defined(_MSC_VER) && (MI_ARCH_X64 || MI_ARCH_X86 || MI_ARCH_ARM64 || MI_ARCH_ARM32)
+    if (x==0) return MI_SIZE_BITS; // test explicitly for `x==0` to avoid codegen bug (issue #1071)    
+    unsigned long idx; mi_msc_builtinz(_BitScanReverse)(&idx, x);
+    return (MI_SIZE_BITS - 1 - (size_t)idx);    
+  #elif defined(__GNUC__) && (MI_ARCH_X64 || MI_ARCH_X86)
+    if (x==0) return MI_SIZE_BITS;
+    size_t r;
+    __asm ("bsr\t%1, %0" : "=r"(r) : "r"(x) : "cc");
+    return (MI_SIZE_BITS - 1 - r);
+  #else
+    #define MI_HAS_FAST_BITSCAN  0
+    return (x!=0 ? _mi_clz_generic(x) : MI_SIZE_BITS);
+  #endif
+}
+
+#ifndef MI_HAS_FAST_BITSCAN
+#define MI_HAS_FAST_BITSCAN 1
+#endif
+
+/* --------------------------------------------------------------------------------
+  find trailing/leading zero  (bit scan forward/reverse)
+-------------------------------------------------------------------------------- */
+
+// Bit scan forward: find the least significant bit that is set (i.e. count trailing zero's)
+// return false if `x==0` (with `*idx` undefined) and true otherwise,
+// with the `idx` is set to the bit index (`0 <= *idx < MI_BFIELD_BITS`).
+static inline bool mi_bsf(size_t x, size_t* idx) {
+  #if defined(__GNUC__) && MI_ARCH_X64 && defined(__BMI1__) && (!defined(__clang_major__) || __clang_major__ >= 9)
+    // on x64 the carry flag is set on zero which gives better codegen
+    bool is_zero;
+    __asm ( "tzcnt\t%2, %1" : "=@ccc"(is_zero), "=r"(*idx) : "r"(x) : "cc" );
+    return !is_zero;
+  #elif defined(_MSC_VER) && (MI_ARCH_X64 || MI_ARCH_X86 || MI_ARCH_ARM64 || MI_ARCH_ARM32)
+    if (x==0) return false; // test explicitly for `x==0` to avoid codegen bug (issue #1071)    
+    unsigned long i; mi_msc_builtinz(_BitScanForward)(&i, x);
+    *idx = (size_t)i;
+    return true;
+  #else
+    return (x!=0 ? (*idx = mi_ctz(x), true) : false);
+  #endif
+}
+
+// Bit scan reverse: find the most significant bit that is set
+// return false if `x==0` (with `*idx` undefined) and true otherwise,
+// with the `idx` is set to the bit index (`0 <= *idx < MI_BFIELD_BITS`).
+static inline bool mi_bsr(size_t x, size_t* idx) {
+  #if defined(_MSC_VER) && (MI_ARCH_X64 || MI_ARCH_X86 || MI_ARCH_ARM64 || MI_ARCH_ARM32)
+    if (x==0) return false; // test explicitly for `x==0` to avoid codegen bug (issue #1071)    
+    unsigned long i; mi_msc_builtinz(_BitScanReverse)(&i, x);
+    *idx = (size_t)i;
+    return true;    
+  #else
+    return (x!=0 ? (*idx = MI_SIZE_BITS - 1 - mi_clz(x), true) : false);
+  #endif
+}
+
+
+/* --------------------------------------------------------------------------------
+  rotate
+-------------------------------------------------------------------------------- */
+
+static inline size_t mi_rotr(size_t x, size_t r) {
+  #if (mi_has_builtin(rotateright64) && MI_SIZE_BITS==64)
+    return mi_builtin(rotateright64)(x,r);
+  #elif (mi_has_builtin(rotateright32) && MI_SIZE_BITS==32)
+    return mi_builtin(rotateright32)(x,r);
+  #elif defined(_MSC_VER) && (MI_ARCH_X64 || MI_ARCH_ARM64)
+    return _rotr64(x, (int)r);
+  #elif defined(_MSC_VER) && (MI_ARCH_X86 || MI_ARCH_ARM32)
+    return _lrotr(x,(int)r);
+  #else
+    // The term `(-rshift)&(BITS-1)` is written instead of `BITS - rshift` to
+    // avoid UB when `rshift==0`. See <https://blog.regehr.org/archives/1063>
+    const unsigned int rshift = (unsigned int)(r) & (MI_SIZE_BITS-1);
+    return ((x >> rshift) | (x << ((-rshift) & (MI_SIZE_BITS-1))));
+  #endif
+}
+
+static inline size_t mi_rotl(size_t x, size_t r) {
+  #if (mi_has_builtin(rotateleft64) && MI_SIZE_BITS==64)
+    return mi_builtin(rotateleft64)(x,r);
+  #elif (mi_has_builtin(rotateleft32) && MI_SIZE_BITS==32)
+    return mi_builtin(rotateleft32)(x,r);
+  #elif defined(_MSC_VER) && (MI_ARCH_X64 || MI_ARCH_ARM64)
+    return _rotl64(x, (int)r);
+  #elif defined(_MSC_VER) && (MI_ARCH_X86 || MI_ARCH_ARM32)
+    return _lrotl(x, (int)r);
+  #else
+    // The term `(-rshift)&(BITS-1)` is written instead of `BITS - rshift` to
+    // avoid UB when `rshift==0`. See <https://blog.regehr.org/archives/1063>
+    const unsigned int rshift = (unsigned int)(r) & (MI_SIZE_BITS-1);
+    return ((x << rshift) | (x >> ((-rshift) & (MI_SIZE_BITS-1))));
+  #endif
+}
+
+static inline uint32_t mi_rotl32(uint32_t x, uint32_t r) {
+  #if mi_has_builtin(rotateleft32)
+    return mi_builtin(rotateleft32)(x,r);
+  #elif defined(_MSC_VER) && (MI_ARCH_X64 || MI_ARCH_X86 || MI_ARCH_ARM64 || MI_ARCH_ARM32)
+    return _lrotl(x, (int)r);
+  #else
+    // The term `(-rshift)&(BITS-1)` is written instead of `BITS - rshift` to
+    // avoid UB when `rshift==0`. See <https://blog.regehr.org/archives/1063>
+    const unsigned int rshift = (unsigned int)(r) & 31;
+    return ((x << rshift) | (x >> ((-rshift) & 31)));
+  #endif
+}
+
+
+#endif // MI_BITS_H
diff --git a/depends/mimalloc/include/mimalloc/internal.h b/depends/mimalloc/include/mimalloc/internal.h
new file mode 100644
index 000000000000..62387dc348d0
--- /dev/null
+++ b/depends/mimalloc/include/mimalloc/internal.h
@@ -0,0 +1,1203 @@
+/* ----------------------------------------------------------------------------
+Copyright (c) 2018-2023, Microsoft Research, Daan Leijen
+This is free software; you can redistribute it and/or modify it under the
+terms of the MIT license. A copy of the license can be found in the file
+"LICENSE" at the root of this distribution.
+-----------------------------------------------------------------------------*/
+#pragma once
+#ifndef MI_INTERNAL_H
+#define MI_INTERNAL_H
+
+// --------------------------------------------------------------------------
+// This file contains the internal API's of mimalloc and various utility
+// functions and macros.
+// --------------------------------------------------------------------------
+
+#include "types.h"
+#include "track.h"
+#include "bits.h"
+
+
+// --------------------------------------------------------------------------
+// Compiler defines
+// --------------------------------------------------------------------------
+
+#if (MI_DEBUG>0)
+#define mi_trace_message(...)  _mi_trace_message(__VA_ARGS__)
+#else
+#define mi_trace_message(...)
+#endif
+
+#define mi_decl_cache_align     mi_decl_align(64)
+
+#if defined(_MSC_VER)
+#pragma warning(disable:4127)   // suppress constant conditional warning (due to MI_SECURE paths)
+#pragma warning(disable:26812)  // unscoped enum warning
+#define mi_decl_noinline        __declspec(noinline)
+#define mi_decl_thread          __declspec(thread)
+#define mi_decl_align(a)        __declspec(align(a))
+#define mi_decl_noreturn        __declspec(noreturn)
+#define mi_decl_weak
+#define mi_decl_hidden
+#define mi_decl_cold
+#elif (defined(__GNUC__) && (__GNUC__ >= 3)) || defined(__clang__) // includes clang and icc
+#define mi_decl_noinline        __attribute__((noinline))
+#define mi_decl_thread          __thread
+#define mi_decl_align(a)        __attribute__((aligned(a)))
+#define mi_decl_noreturn        __attribute__((noreturn))
+#define mi_decl_weak            __attribute__((weak))
+#define mi_decl_hidden          __attribute__((visibility("hidden")))
+#if (__GNUC__ >= 4) || defined(__clang__)
+#define mi_decl_cold            __attribute__((cold))
+#else
+#define mi_decl_cold
+#endif
+#elif __cplusplus >= 201103L    // c++11
+#define mi_decl_noinline
+#define mi_decl_thread          thread_local
+#define mi_decl_align(a)        alignas(a)
+#define mi_decl_noreturn        [[noreturn]]
+#define mi_decl_weak
+#define mi_decl_hidden
+#define mi_decl_cold
+#else
+#define mi_decl_noinline
+#define mi_decl_thread          __thread        // hope for the best :-)
+#define mi_decl_align(a)
+#define mi_decl_noreturn
+#define mi_decl_weak
+#define mi_decl_hidden
+#define mi_decl_cold
+#endif
+
+#if defined(__GNUC__) || defined(__clang__)
+#define mi_unlikely(x)     (__builtin_expect(!!(x),false))
+#define mi_likely(x)       (__builtin_expect(!!(x),true))
+#elif (defined(__cplusplus) && (__cplusplus >= 202002L)) || (defined(_MSVC_LANG) && _MSVC_LANG >= 202002L)
+#define mi_unlikely(x)     (x) [[unlikely]]
+#define mi_likely(x)       (x) [[likely]]
+#else
+#define mi_unlikely(x)     (x)
+#define mi_likely(x)       (x)
+#endif
+
+#ifndef __has_builtin
+#define __has_builtin(x)    0
+#endif
+
+#if defined(__cplusplus)
+#define mi_decl_externc     extern "C"
+#else
+#define mi_decl_externc
+#endif
+
+#if (defined(__GNUC__) && (__GNUC__ >= 7)) || defined(__clang__) // includes clang and icc
+#define mi_decl_maybe_unused    __attribute__((unused))
+#elif __cplusplus >= 201703L    // c++17
+#define mi_decl_maybe_unused    [[maybe_unused]]
+#else
+#define mi_decl_maybe_unused
+#endif
+
+#if defined(__cplusplus)
+#define mi_decl_externc         extern "C"
+#else
+#define mi_decl_externc
+#endif
+
+
+#if defined(__EMSCRIPTEN__) && !defined(__wasi__)
+#define __wasi__
+#endif
+
+
+// --------------------------------------------------------------------------
+// Internal functions
+// --------------------------------------------------------------------------
+
+
+// "libc.c"
+#include <stdarg.h>
+int           _mi_vsnprintf(char* buf, size_t bufsize, const char* fmt, va_list args);
+int           _mi_snprintf(char* buf, size_t buflen, const char* fmt, ...);
+char          _mi_toupper(char c);
+int           _mi_strnicmp(const char* s, const char* t, size_t n);
+void          _mi_strlcpy(char* dest, const char* src, size_t dest_size);
+void          _mi_strlcat(char* dest, const char* src, size_t dest_size);
+size_t        _mi_strlen(const char* s);
+size_t        _mi_strnlen(const char* s, size_t max_len);
+bool          _mi_getenv(const char* name, char* result, size_t result_size);
+
+// "options.c"
+void          _mi_fputs(mi_output_fun* out, void* arg, const char* prefix, const char* message);
+void          _mi_fprintf(mi_output_fun* out, void* arg, const char* fmt, ...);
+void          _mi_raw_message(const char* fmt, ...);
+void          _mi_message(const char* fmt, ...);
+void          _mi_warning_message(const char* fmt, ...);
+void          _mi_verbose_message(const char* fmt, ...);
+void          _mi_trace_message(const char* fmt, ...);
+void          _mi_options_init(void);
+long          _mi_option_get_fast(mi_option_t option);
+void          _mi_error_message(int err, const char* fmt, ...);
+
+// random.c
+void          _mi_random_init(mi_random_ctx_t* ctx);
+void          _mi_random_init_weak(mi_random_ctx_t* ctx);
+void          _mi_random_reinit_if_weak(mi_random_ctx_t * ctx);
+void          _mi_random_split(mi_random_ctx_t* ctx, mi_random_ctx_t* new_ctx);
+uintptr_t     _mi_random_next(mi_random_ctx_t* ctx);
+uintptr_t     _mi_heap_random_next(mi_heap_t* heap);
+uintptr_t     _mi_os_random_weak(uintptr_t extra_seed);
+static inline uintptr_t _mi_random_shuffle(uintptr_t x);
+
+// init.c
+extern mi_decl_hidden mi_decl_cache_align const mi_page_t  _mi_page_empty;
+void          _mi_auto_process_init(void);
+void mi_cdecl _mi_auto_process_done(void) mi_attr_noexcept;
+bool          _mi_is_redirected(void);
+bool          _mi_allocator_init(const char** message);
+void          _mi_allocator_done(void);
+bool          _mi_is_main_thread(void);
+size_t        _mi_current_thread_count(void);
+bool          _mi_preloading(void);           // true while the C runtime is not initialized yet
+void          _mi_thread_done(mi_heap_t* heap);
+
+mi_subproc_t* _mi_subproc(void);
+mi_subproc_t* _mi_subproc_main(void);
+mi_subproc_t* _mi_subproc_from_id(mi_subproc_id_t subproc_id);
+mi_threadid_t _mi_thread_id(void) mi_attr_noexcept;
+size_t        _mi_thread_seq_id(void) mi_attr_noexcept;
+mi_tld_t*     _mi_thread_tld(void) mi_attr_noexcept;
+void          _mi_heap_guarded_init(mi_heap_t* heap);
+mi_heap_t*    _mi_heap_main_get(void);
+
+// os.c
+void          _mi_os_init(void);                                            // called from process init
+void*         _mi_os_alloc(size_t size, mi_memid_t* memid);
+void*         _mi_os_zalloc(size_t size, mi_memid_t* memid);
+void          _mi_os_free(void* p, size_t size, mi_memid_t memid);
+void          _mi_os_free_ex(void* p, size_t size, bool still_committed, mi_memid_t memid, mi_subproc_t* subproc );
+
+size_t        _mi_os_page_size(void);
+size_t        _mi_os_guard_page_size(void);
+size_t        _mi_os_good_alloc_size(size_t size);
+bool          _mi_os_has_overcommit(void);
+bool          _mi_os_has_virtual_reserve(void);
+size_t        _mi_os_virtual_address_bits(void);
+
+bool          _mi_os_reset(void* addr, size_t size);
+bool          _mi_os_decommit(void* addr, size_t size);
+void          _mi_os_reuse(void* p, size_t size);
+mi_decl_nodiscard bool _mi_os_commit(void* p, size_t size, bool* is_zero);
+mi_decl_nodiscard bool _mi_os_commit_ex(void* addr, size_t size, bool* is_zero, size_t stat_size);
+mi_decl_nodiscard bool _mi_os_protect(void* addr, size_t size);
+bool          _mi_os_unprotect(void* addr, size_t size);
+bool          _mi_os_purge(void* p, size_t size);
+bool          _mi_os_purge_ex(void* p, size_t size, bool allow_reset, size_t stats_size, mi_commit_fun_t* commit_fun, void* commit_fun_arg);
+
+size_t        _mi_os_secure_guard_page_size(void);
+bool          _mi_os_secure_guard_page_set_at(void* addr, mi_memid_t memid);
+bool          _mi_os_secure_guard_page_set_before(void* addr, mi_memid_t memid);
+bool          _mi_os_secure_guard_page_reset_at(void* addr, mi_memid_t memid);
+bool          _mi_os_secure_guard_page_reset_before(void* addr, mi_memid_t memid);
+
+int           _mi_os_numa_node(void);
+int           _mi_os_numa_node_count(void);
+
+void*         _mi_os_alloc_aligned(size_t size, size_t alignment, bool commit, bool allow_large, mi_memid_t* memid);
+void*         _mi_os_alloc_aligned_at_offset(size_t size, size_t alignment, size_t align_offset, bool commit, bool allow_large, mi_memid_t* memid);
+
+void*         _mi_os_get_aligned_hint(size_t try_alignment, size_t size);
+bool          _mi_os_use_large_page(size_t size, size_t alignment);
+size_t        _mi_os_large_page_size(void);
+void*         _mi_os_alloc_huge_os_pages(size_t pages, int numa_node, mi_msecs_t max_secs, size_t* pages_reserved, size_t* psize, mi_memid_t* memid);
+
+
+// arena.c
+mi_arena_id_t _mi_arena_id_none(void);
+mi_arena_t*   _mi_arena_from_id(mi_arena_id_t id);
+bool          _mi_arena_memid_is_suitable(mi_memid_t memid, mi_arena_t* request_arena);
+
+void*         _mi_arenas_alloc(mi_subproc_t* subproc, size_t size, bool commit, bool allow_pinned, mi_arena_t* req_arena, size_t tseq, int numa_node, mi_memid_t* memid);
+void*         _mi_arenas_alloc_aligned(mi_subproc_t* subproc, size_t size, size_t alignment, size_t align_offset, bool commit, bool allow_pinned, mi_arena_t* req_arena, size_t tseq, int numa_node, mi_memid_t* memid);
+void          _mi_arenas_free(void* p, size_t size, mi_memid_t memid);
+bool          _mi_arenas_contain(const void* p);
+void          _mi_arenas_collect(bool force_purge, bool visit_all, mi_tld_t* tld);
+void          _mi_arenas_unsafe_destroy_all(mi_tld_t* tld);
+
+mi_page_t*    _mi_arenas_page_alloc(mi_heap_t* heap, size_t block_size, size_t page_alignment);
+void          _mi_arenas_page_free(mi_page_t* page, mi_tld_t* tld);
+void          _mi_arenas_page_abandon(mi_page_t* page, mi_tld_t* tld);
+void          _mi_arenas_page_unabandon(mi_page_t* page);
+bool          _mi_arenas_page_try_reabandon_to_mapped(mi_page_t* page);
+
+// arena-meta.c
+void*         _mi_meta_zalloc( size_t size, mi_memid_t* memid );
+void          _mi_meta_free(void* p, size_t size, mi_memid_t memid);
+bool          _mi_meta_is_meta_page(void* p);
+
+// "page-map.c"
+bool          _mi_page_map_init(void);
+void          _mi_page_map_register(mi_page_t* page);
+void          _mi_page_map_unregister(mi_page_t* page);
+void          _mi_page_map_unregister_range(void* start, size_t size);
+mi_page_t*    _mi_safe_ptr_page(const void* p);
+void          _mi_page_map_unsafe_destroy(mi_subproc_t* subproc);
+
+// "page.c"
+void*         _mi_malloc_generic(mi_heap_t* heap, size_t size, bool zero, size_t huge_alignment)  mi_attr_noexcept mi_attr_malloc;
+
+void          _mi_page_retire(mi_page_t* page) mi_attr_noexcept;       // free the page if there are no other pages with many free blocks
+void          _mi_page_unfull(mi_page_t* page);
+void          _mi_page_free(mi_page_t* page, mi_page_queue_t* pq);     // free the page
+void          _mi_page_abandon(mi_page_t* page, mi_page_queue_t* pq);  // abandon the page, to be picked up by another thread...
+void          _mi_heap_collect_retired(mi_heap_t* heap, bool force);
+
+size_t        _mi_page_queue_append(mi_heap_t* heap, mi_page_queue_t* pq, mi_page_queue_t* append);
+void          _mi_deferred_free(mi_heap_t* heap, bool force);
+
+void          _mi_page_free_collect(mi_page_t* page, bool force);
+void          _mi_page_free_collect_partly(mi_page_t* page, mi_block_t* head);
+mi_decl_nodiscard bool _mi_page_init(mi_heap_t* heap, mi_page_t* page);
+bool          _mi_page_queue_is_valid(mi_heap_t* heap, const mi_page_queue_t* pq);
+
+size_t        _mi_page_bin(const mi_page_t* page); // for stats
+size_t        _mi_bin_size(size_t bin);            // for stats
+size_t        _mi_bin(size_t size);                // for stats
+
+// "heap.c"
+mi_heap_t*    _mi_heap_create(int heap_tag, bool allow_destroy, mi_arena_id_t arena_id, mi_tld_t* tld);
+void          _mi_heap_init(mi_heap_t* heap, mi_arena_id_t arena_id, bool noreclaim, uint8_t tag, mi_tld_t* tld);
+void          _mi_heap_destroy_pages(mi_heap_t* heap);
+void          _mi_heap_collect_abandon(mi_heap_t* heap);
+void          _mi_heap_set_default_direct(mi_heap_t* heap);
+bool          _mi_heap_memid_is_suitable(mi_heap_t* heap, mi_memid_t memid);
+void          _mi_heap_unsafe_destroy_all(mi_heap_t* heap);
+mi_heap_t*    _mi_heap_by_tag(mi_heap_t* heap, uint8_t tag);
+void          _mi_heap_area_init(mi_heap_area_t* area, mi_page_t* page);
+bool          _mi_heap_area_visit_blocks(const mi_heap_area_t* area, mi_page_t* page, mi_block_visit_fun* visitor, void* arg);
+void          _mi_heap_page_reclaim(mi_heap_t* heap, mi_page_t* page);
+
+// "stats.c"
+void          _mi_stats_init(void);
+void          _mi_stats_done(mi_stats_t* stats);
+void          _mi_stats_print(mi_stats_t* stats, mi_output_fun* out, void* arg) mi_attr_noexcept;
+void          _mi_stats_merge_thread(mi_tld_t* tld);
+void          _mi_stats_merge_from(mi_stats_t* to, mi_stats_t* from);
+mi_msecs_t    _mi_clock_now(void);
+mi_msecs_t    _mi_clock_end(mi_msecs_t start);
+mi_msecs_t    _mi_clock_start(void);
+
+// "alloc.c"
+void*         _mi_page_malloc_zero(mi_heap_t* heap, mi_page_t* page, size_t size, bool zero) mi_attr_noexcept;  // called from `_mi_malloc_generic`
+void*         _mi_page_malloc(mi_heap_t* heap, mi_page_t* page, size_t size) mi_attr_noexcept;                  // called from `_mi_heap_malloc_aligned`
+void*         _mi_page_malloc_zeroed(mi_heap_t* heap, mi_page_t* page, size_t size) mi_attr_noexcept;           // called from `_mi_heap_malloc_aligned`
+void*         _mi_heap_malloc_zero(mi_heap_t* heap, size_t size, bool zero) mi_attr_noexcept;
+void*         _mi_heap_malloc_zero_ex(mi_heap_t* heap, size_t size, bool zero, size_t huge_alignment) mi_attr_noexcept;     // called from `_mi_heap_malloc_aligned`
+void*         _mi_heap_realloc_zero(mi_heap_t* heap, void* p, size_t newsize, bool zero) mi_attr_noexcept;
+mi_block_t*   _mi_page_ptr_unalign(const mi_page_t* page, const void* p);
+void          _mi_padding_shrink(const mi_page_t* page, const mi_block_t* block, const size_t min_size);
+
+#if MI_DEBUG>1
+bool          _mi_page_is_valid(mi_page_t* page);
+#endif
+
+
+// ------------------------------------------------------
+// Assertions
+// ------------------------------------------------------
+
+#if (MI_DEBUG)
+// use our own assertion to print without memory allocation
+mi_decl_noreturn mi_decl_cold void _mi_assert_fail(const char* assertion, const char* fname, unsigned int line, const char* func) mi_attr_noexcept;
+#define mi_assert(expr)     ((expr) ? (void)0 : _mi_assert_fail(#expr,__FILE__,__LINE__,__func__))
+#else
+#define mi_assert(x)
+#endif
+
+#if (MI_DEBUG>1)
+#define mi_assert_internal    mi_assert
+#else
+#define mi_assert_internal(x)
+#endif
+
+#if (MI_DEBUG>2)
+#define mi_assert_expensive   mi_assert
+#else
+#define mi_assert_expensive(x)
+#endif
+
+
+/* -----------------------------------------------------------
+  Statistics (in `stats.c`)
+----------------------------------------------------------- */
+
+// add to stat keeping track of the peak
+void __mi_stat_increase(mi_stat_count_t* stat, size_t amount);
+void __mi_stat_decrease(mi_stat_count_t* stat, size_t amount);
+void __mi_stat_increase_mt(mi_stat_count_t* stat, size_t amount);
+void __mi_stat_decrease_mt(mi_stat_count_t* stat, size_t amount);
+
+// adjust stat in special cases to compensate for double counting (and does not adjust peak values and can decrease the total)
+void __mi_stat_adjust_increase(mi_stat_count_t* stat, size_t amount);
+void __mi_stat_adjust_decrease(mi_stat_count_t* stat, size_t amount);
+void __mi_stat_adjust_increase_mt(mi_stat_count_t* stat, size_t amount);
+void __mi_stat_adjust_decrease_mt(mi_stat_count_t* stat, size_t amount);
+
+// counters can just be increased
+void __mi_stat_counter_increase(mi_stat_counter_t* stat, size_t amount);
+void __mi_stat_counter_increase_mt(mi_stat_counter_t* stat, size_t amount);
+
+#define mi_subproc_stat_counter_increase(subproc,stat,amount)   __mi_stat_counter_increase_mt( &(subproc)->stats.stat, amount)
+#define mi_subproc_stat_increase(subproc,stat,amount)           __mi_stat_increase_mt( &(subproc)->stats.stat, amount)
+#define mi_subproc_stat_decrease(subproc,stat,amount)           __mi_stat_decrease_mt( &(subproc)->stats.stat, amount)
+#define mi_subproc_stat_adjust_increase(subproc,stat,amnt)      __mi_stat_adjust_increase_mt( &(subproc)->stats.stat, amnt)
+#define mi_subproc_stat_adjust_decrease(subproc,stat,amnt)      __mi_stat_adjust_decrease_mt( &(subproc)->stats.stat, amnt)
+
+#define mi_tld_stat_counter_increase(tld,stat,amount)           __mi_stat_counter_increase( &(tld)->stats.stat, amount)
+#define mi_tld_stat_increase(tld,stat,amount)                   __mi_stat_increase( &(tld)->stats.stat, amount)
+#define mi_tld_stat_decrease(tld,stat,amount)                   __mi_stat_decrease( &(tld)->stats.stat, amount)
+#define mi_tld_stat_adjust_increase(tld,stat,amnt)              __mi_stat_adjust_increase( &(tld)->stats.stat, amnt)
+#define mi_tld_stat_adjust_decrease(tld,stat,amnt)              __mi_stat_adjust_decrease( &(tld)->stats.stat, amnt)
+
+#define mi_os_stat_counter_increase(stat,amount)                mi_subproc_stat_counter_increase(_mi_subproc(),stat,amount)
+#define mi_os_stat_increase(stat,amount)                        mi_subproc_stat_increase(_mi_subproc(),stat,amount)
+#define mi_os_stat_decrease(stat,amount)                        mi_subproc_stat_decrease(_mi_subproc(),stat,amount)
+
+#define mi_heap_stat_counter_increase(heap,stat,amount)         mi_tld_stat_counter_increase(heap->tld, stat, amount)
+#define mi_heap_stat_increase(heap,stat,amount)                 mi_tld_stat_increase( heap->tld, stat, amount)
+#define mi_heap_stat_decrease(heap,stat,amount)                 mi_tld_stat_decrease( heap->tld, stat, amount)
+#define mi_heap_stat_adjust_decrease(heap,stat,amount)          mi_tld_stat_adjust_decrease( heap->tld, stat, amount)
+
+/* -----------------------------------------------------------
+  Options (exposed for the debugger)
+----------------------------------------------------------- */
+typedef enum mi_option_init_e {
+  MI_OPTION_UNINIT,       // not yet initialized
+  MI_OPTION_DEFAULTED,    // not found in the environment, use default value
+  MI_OPTION_INITIALIZED   // found in environment or set explicitly
+} mi_option_init_t;
+
+typedef struct mi_option_desc_s {
+  long              value;  // the value
+  mi_option_init_t  init;   // is it initialized yet? (from the environment)
+  mi_option_t       option; // for debugging: the option index should match the option
+  const char*       name;   // option name without `mimalloc_` prefix
+  const char*       legacy_name; // potential legacy option name
+} mi_option_desc_t;
+
+
+
+/* -----------------------------------------------------------
+  Inlined definitions
+----------------------------------------------------------- */
+#define MI_UNUSED(x)     (void)(x)
+#if (MI_DEBUG>0)
+#define MI_UNUSED_RELEASE(x)
+#else
+#define MI_UNUSED_RELEASE(x)  MI_UNUSED(x)
+#endif
+
+#define MI_INIT4(x)   x(),x(),x(),x()
+#define MI_INIT8(x)   MI_INIT4(x),MI_INIT4(x)
+#define MI_INIT16(x)  MI_INIT8(x),MI_INIT8(x)
+#define MI_INIT32(x)  MI_INIT16(x),MI_INIT16(x)
+#define MI_INIT64(x)  MI_INIT32(x),MI_INIT32(x)
+#define MI_INIT128(x) MI_INIT64(x),MI_INIT64(x)
+#define MI_INIT256(x) MI_INIT128(x),MI_INIT128(x)
+
+#define MI_INIT74(x)  MI_INIT64(x),MI_INIT8(x),x(),x()
+#define MI_INIT5(x)   MI_INIT4(x),x()
+
+#include <string.h>
+// initialize a local variable to zero; use memset as compilers optimize constant sized memset's
+#define _mi_memzero_var(x)  memset(&x,0,sizeof(x))
+
+// Is `x` a power of two? (0 is considered a power of two)
+static inline bool _mi_is_power_of_two(uintptr_t x) {
+  return ((x & (x - 1)) == 0);
+}
+
+// Is a pointer aligned?
+static inline bool _mi_is_aligned(void* p, size_t alignment) {
+  mi_assert_internal(alignment != 0);
+  return (((uintptr_t)p % alignment) == 0);
+}
+
+// Align upwards
+static inline uintptr_t _mi_align_up(uintptr_t sz, size_t alignment) {
+  mi_assert_internal(alignment != 0);
+  uintptr_t mask = alignment - 1;
+  if ((alignment & mask) == 0) {  // power of two?
+    return ((sz + mask) & ~mask);
+  }
+  else {
+    return (((sz + mask)/alignment)*alignment);
+  }
+}
+
+
+// Align a pointer upwards
+static inline uint8_t* _mi_align_up_ptr(void* p, size_t alignment) {
+  return (uint8_t*)_mi_align_up((uintptr_t)p, alignment);
+}
+
+
+static inline uintptr_t _mi_align_down(uintptr_t sz, size_t alignment) {
+  mi_assert_internal(alignment != 0);
+  uintptr_t mask = alignment - 1;
+  if ((alignment & mask) == 0) { // power of two?
+    return (sz & ~mask);
+  }
+  else {
+    return ((sz / alignment) * alignment);
+  }
+}
+
+static inline void* mi_align_down_ptr(void* p, size_t alignment) {
+  return (void*)_mi_align_down((uintptr_t)p, alignment);
+}
+
+// Divide upwards: `s <= _mi_divide_up(s,d)*d < s+d`.
+static inline uintptr_t _mi_divide_up(uintptr_t size, size_t divider) {
+  mi_assert_internal(divider != 0);
+  return (divider == 0 ? size : ((size + divider - 1) / divider));
+}
+
+
+// clamp an integer
+static inline size_t _mi_clamp(size_t sz, size_t min, size_t max) {
+  if (sz < min) return min;
+  else if (sz > max) return max;
+  else return sz;
+}
+
+// Is memory zero initialized?
+static inline bool mi_mem_is_zero(const void* p, size_t size) {
+  for (size_t i = 0; i < size; i++) {
+    if (((uint8_t*)p)[i] != 0) return false;
+  }
+  return true;
+}
+
+// Align a byte size to a size in _machine words_,
+// i.e. byte size == `wsize*sizeof(void*)`.
+static inline size_t _mi_wsize_from_size(size_t size) {
+  mi_assert_internal(size <= SIZE_MAX - sizeof(uintptr_t));
+  return (size + sizeof(uintptr_t) - 1) / sizeof(uintptr_t);
+}
+
+// Overflow detecting multiply
+#if __has_builtin(__builtin_umul_overflow) || (defined(__GNUC__) && (__GNUC__ >= 5))
+#include <limits.h>      // UINT_MAX, ULONG_MAX
+#if defined(_CLOCK_T)    // for Illumos
+#undef _CLOCK_T
+#endif
+static inline bool mi_mul_overflow(size_t count, size_t size, size_t* total) {
+  #if (SIZE_MAX == ULONG_MAX)
+    return __builtin_umull_overflow(count, size, (unsigned long *)total);
+  #elif (SIZE_MAX == UINT_MAX)
+    return __builtin_umul_overflow(count, size, (unsigned int *)total);
+  #else
+    return __builtin_umulll_overflow(count, size, (unsigned long long *)total);
+  #endif
+}
+#else /* __builtin_umul_overflow is unavailable */
+static inline bool mi_mul_overflow(size_t count, size_t size, size_t* total) {
+  #define MI_MUL_COULD_OVERFLOW ((size_t)1 << (4*sizeof(size_t)))  // sqrt(SIZE_MAX)
+  *total = count * size;
+  // note: gcc/clang optimize this to directly check the overflow flag
+  return ((size >= MI_MUL_COULD_OVERFLOW || count >= MI_MUL_COULD_OVERFLOW) && size > 0 && (SIZE_MAX / size) < count);
+}
+#endif
+
+// Safe multiply `count*size` into `total`; return `true` on overflow.
+static inline bool mi_count_size_overflow(size_t count, size_t size, size_t* total) {
+  if (count==1) {  // quick check for the case where count is one (common for C++ allocators)
+    *total = size;
+    return false;
+  }
+  else if mi_unlikely(mi_mul_overflow(count, size, total)) {
+    #if MI_DEBUG > 0
+    _mi_error_message(EOVERFLOW, "allocation request is too large (%zu * %zu bytes)\n", count, size);
+    #endif
+    *total = SIZE_MAX;
+    return true;
+  }
+  else return false;
+}
+
+
+/*----------------------------------------------------------------------------------------
+  Heap functions
+------------------------------------------------------------------------------------------- */
+
+extern mi_decl_hidden const mi_heap_t _mi_heap_empty;  // read-only empty heap, initial value of the thread local default heap
+
+static inline bool mi_heap_is_backing(const mi_heap_t* heap) {
+  return (heap->tld->heap_backing == heap);
+}
+
+static inline bool mi_heap_is_initialized(const mi_heap_t* heap) {
+  mi_assert_internal(heap != NULL);
+  return (heap != NULL && heap != &_mi_heap_empty);
+}
+
+static inline mi_page_t* _mi_heap_get_free_small_page(mi_heap_t* heap, size_t size) {
+  mi_assert_internal(size <= (MI_SMALL_SIZE_MAX + MI_PADDING_SIZE));
+  const size_t idx = _mi_wsize_from_size(size);
+  mi_assert_internal(idx < MI_PAGES_DIRECT);
+  return heap->pages_free_direct[idx];
+}
+
+
+//static inline uintptr_t _mi_ptr_cookie(const void* p) {
+//  extern mi_heap_t _mi_heap_main;
+//  mi_assert_internal(_mi_heap_main.cookie != 0);
+//  return ((uintptr_t)p ^ _mi_heap_main.cookie);
+//}
+
+
+/* -----------------------------------------------------------
+  The page map maps addresses to `mi_page_t` pointers
+----------------------------------------------------------- */
+
+#if MI_PAGE_MAP_FLAT
+
+// flat page-map committed on demand, using one byte per slice (64 KiB).
+// single indirection and low commit, but large initial virtual reserve (4 GiB with 48 bit virtual addresses)
+// used by default on <= 40 bit virtual address spaces.
+extern mi_decl_hidden uint8_t* _mi_page_map;
+
+static inline size_t _mi_page_map_index(const void* p) {
+  return (size_t)((uintptr_t)p >> MI_ARENA_SLICE_SHIFT);
+}
+
+static inline mi_page_t* _mi_ptr_page_ex(const void* p, bool* valid) {
+  const size_t idx = _mi_page_map_index(p);
+  const size_t ofs = _mi_page_map[idx];
+  if (valid != NULL) { *valid = (ofs != 0); }
+  return (mi_page_t*)((((uintptr_t)p >> MI_ARENA_SLICE_SHIFT) + 1 - ofs) << MI_ARENA_SLICE_SHIFT);
+}
+
+static inline mi_page_t* _mi_checked_ptr_page(const void* p) {
+  bool valid;
+  mi_page_t* const page = _mi_ptr_page_ex(p, &valid);
+  return (valid ? page : NULL);
+}
+
+static inline mi_page_t* _mi_unchecked_ptr_page(const void* p) {
+  return _mi_ptr_page_ex(p, NULL);
+}
+
+#else
+
+// 2-level page map:
+// double indirection, but low commit and low virtual reserve.
+//
+// the page-map is usually 4 MiB (for 48 bit virtual addresses) and points to sub maps of 64 KiB.
+// the page-map is committed on-demand (in 64 KiB parts) (and sub-maps are committed on-demand as well)
+// one sub page-map = 64 KiB => covers 2^(16-3) * 2^16 = 2^29 = 512 MiB address space
+// the page-map needs 48-(16+13) = 19 bits => 2^19 sub map pointers = 2^22 bytes = 4 MiB reserved size.
+#define MI_PAGE_MAP_SUB_SHIFT     (13)
+#define MI_PAGE_MAP_SUB_COUNT     (MI_ZU(1) << MI_PAGE_MAP_SUB_SHIFT)
+#define MI_PAGE_MAP_SHIFT         (MI_MAX_VABITS - MI_PAGE_MAP_SUB_SHIFT - MI_ARENA_SLICE_SHIFT)
+#define MI_PAGE_MAP_COUNT         (MI_ZU(1) << MI_PAGE_MAP_SHIFT)
+
+extern mi_decl_hidden _Atomic(mi_page_t**)* _mi_page_map;
+
+static inline size_t _mi_page_map_index(const void* p, size_t* sub_idx) {
+  const size_t u = (size_t)((uintptr_t)p / MI_ARENA_SLICE_SIZE);
+  if (sub_idx != NULL) { *sub_idx = u % MI_PAGE_MAP_SUB_COUNT; }
+  return (u / MI_PAGE_MAP_SUB_COUNT);
+}
+
+static inline mi_page_t** _mi_page_map_at(size_t idx) {
+  return mi_atomic_load_ptr_relaxed(mi_page_t*, &_mi_page_map[idx]);
+}
+
+static inline mi_page_t* _mi_unchecked_ptr_page(const void* p) {
+  size_t sub_idx;
+  const size_t idx = _mi_page_map_index(p, &sub_idx);
+  return (_mi_page_map_at(idx))[sub_idx];  // NULL if p==NULL
+}
+
+static inline mi_page_t* _mi_checked_ptr_page(const void* p) {
+  size_t sub_idx;
+  const size_t idx = _mi_page_map_index(p, &sub_idx);
+  mi_page_t** const sub = _mi_page_map_at(idx);
+  if mi_unlikely(sub == NULL) return NULL;
+  return sub[sub_idx];
+}
+
+#endif
+
+
+static inline mi_page_t* _mi_ptr_page(const void* p) {
+  mi_assert_internal(p==NULL || mi_is_in_heap_region(p));
+  #if MI_DEBUG || MI_SECURE || defined(__APPLE__)
+  return _mi_checked_ptr_page(p);
+  #else
+  return _mi_unchecked_ptr_page(p);
+  #endif
+}
+
+
+// Get the block size of a page
+static inline size_t mi_page_block_size(const mi_page_t* page) {
+  mi_assert_internal(page->block_size > 0);
+  return page->block_size;
+}
+
+// Page start
+static inline uint8_t* mi_page_start(const mi_page_t* page) {
+  return page->page_start;
+}
+
+static inline size_t mi_page_size(const mi_page_t* page) {
+  return mi_page_block_size(page) * page->reserved;
+}
+
+static inline uint8_t* mi_page_area(const mi_page_t* page, size_t* size) {
+  if (size) { *size = mi_page_size(page); }
+  return mi_page_start(page);
+}
+
+static inline size_t mi_page_info_size(void) {
+  return _mi_align_up(sizeof(mi_page_t), MI_MAX_ALIGN_SIZE);
+}
+
+static inline bool mi_page_contains_address(const mi_page_t* page, const void* p) {
+  size_t psize;
+  uint8_t* start = mi_page_area(page, &psize);
+  return (start <= (uint8_t*)p && (uint8_t*)p < start + psize);
+}
+
+static inline bool mi_page_is_in_arena(const mi_page_t* page) {
+  return (page->memid.memkind == MI_MEM_ARENA);
+}
+
+static inline bool mi_page_is_singleton(const mi_page_t* page) {
+  return (page->reserved == 1);
+}
+
+// Get the usable block size of a page without fixed padding.
+// This may still include internal padding due to alignment and rounding up size classes.
+static inline size_t mi_page_usable_block_size(const mi_page_t* page) {
+  return mi_page_block_size(page) - MI_PADDING_SIZE;
+}
+
+// This may change if we locate page info outside the page data slices
+static inline uint8_t* mi_page_slice_start(const mi_page_t* page) {
+  return (uint8_t*)page;
+}
+
+// This gives the offset relative to the start slice of a page. This may change if we ever
+// locate page info outside the page-data itself.
+static inline size_t mi_page_slice_offset_of(const mi_page_t* page, size_t offset_relative_to_page_start) {
+  return (page->page_start - mi_page_slice_start(page)) + offset_relative_to_page_start;
+}
+
+static inline size_t mi_page_committed(const mi_page_t* page) {
+  return (page->slice_committed == 0 ? mi_page_size(page) : page->slice_committed - (page->page_start - mi_page_slice_start(page)));
+}
+
+static inline mi_heap_t* mi_page_heap(const mi_page_t* page) {
+  return page->heap;
+}
+
+
+// are all blocks in a page freed?
+// note: needs up-to-date used count, (as the `xthread_free` list may not be empty). see `_mi_page_collect_free`.
+static inline bool mi_page_all_free(const mi_page_t* page) {
+  mi_assert_internal(page != NULL);
+  return (page->used == 0);
+}
+
+// are there immediately available blocks, i.e. blocks available on the free list.
+static inline bool mi_page_immediate_available(const mi_page_t* page) {
+  mi_assert_internal(page != NULL);
+  return (page->free != NULL);
+}
+
+
+// is the page not yet used up to its reserved space?
+static inline bool mi_page_is_expandable(const mi_page_t* page) {
+  mi_assert_internal(page != NULL);
+  mi_assert_internal(page->capacity <= page->reserved);
+  return (page->capacity < page->reserved);
+}
+
+
+static inline bool mi_page_is_full(mi_page_t* page) {
+  bool full = (page->reserved == page->used);
+  mi_assert_internal(!full || page->free == NULL);
+  return full;
+}
+
+// is more than 7/8th of a page in use?
+static inline bool mi_page_is_mostly_used(const mi_page_t* page) {
+  if (page==NULL) return true;
+  uint16_t frac = page->reserved / 8U;
+  return (page->reserved - page->used <= frac);
+}
+
+// is more than (n-1)/n'th of a page in use?
+static inline bool mi_page_is_used_at_frac(const mi_page_t* page, uint16_t n) {
+  if (page==NULL) return true;
+  uint16_t frac = page->reserved / n;
+  return (page->reserved - page->used <= frac);
+}
+
+
+static inline bool mi_page_is_huge(const mi_page_t* page) {
+  return (mi_page_is_singleton(page) &&
+          (page->block_size > MI_LARGE_MAX_OBJ_SIZE ||
+           (mi_memkind_is_os(page->memid.memkind) && page->memid.mem.os.base < (void*)page)));
+}
+
+static inline mi_page_queue_t* mi_page_queue(const mi_heap_t* heap, size_t size) {
+  mi_page_queue_t* const pq = &((mi_heap_t*)heap)->pages[_mi_bin(size)];
+  if (size <= MI_LARGE_MAX_OBJ_SIZE) { mi_assert_internal(pq->block_size <= MI_LARGE_MAX_OBJ_SIZE); }
+  return pq;
+}
+
+
+//-----------------------------------------------------------
+// Page thread id and flags
+//-----------------------------------------------------------
+
+// Thread id of thread that owns this page (with flags in the bottom 2 bits)
+static inline mi_threadid_t mi_page_xthread_id(const mi_page_t* page) {
+  return mi_atomic_load_relaxed(&((mi_page_t*)page)->xthread_id);
+}
+
+// Plain thread id of the thread that owns this page
+static inline mi_threadid_t mi_page_thread_id(const mi_page_t* page) {
+  return (mi_page_xthread_id(page) & ~MI_PAGE_FLAG_MASK);
+}
+
+static inline mi_page_flags_t mi_page_flags(const mi_page_t* page) {
+  return (mi_page_xthread_id(page) & MI_PAGE_FLAG_MASK);
+}
+
+static inline void mi_page_flags_set(mi_page_t* page, bool set, mi_page_flags_t newflag) {
+  if (set) { mi_atomic_or_relaxed(&page->xthread_id, newflag); }
+      else { mi_atomic_and_relaxed(&page->xthread_id, ~newflag); }
+}
+
+static inline bool mi_page_is_in_full(const mi_page_t* page) {
+  return ((mi_page_flags(page) & MI_PAGE_IN_FULL_QUEUE) != 0);
+}
+
+static inline void mi_page_set_in_full(mi_page_t* page, bool in_full) {
+  mi_page_flags_set(page, in_full, MI_PAGE_IN_FULL_QUEUE);
+}
+
+static inline bool mi_page_has_aligned(const mi_page_t* page) {
+  return ((mi_page_flags(page) & MI_PAGE_HAS_ALIGNED) != 0);
+}
+
+static inline void mi_page_set_has_aligned(mi_page_t* page, bool has_aligned) {
+  mi_page_flags_set(page, has_aligned, MI_PAGE_HAS_ALIGNED);
+}
+
+static inline void mi_page_set_heap(mi_page_t* page, mi_heap_t* heap) {
+  // mi_assert_internal(!mi_page_is_in_full(page));  // can happen when destroying pages on heap_destroy
+  const mi_threadid_t tid = (heap == NULL ? MI_THREADID_ABANDONED : heap->tld->thread_id) | mi_page_flags(page);
+  if (heap != NULL) {
+    page->heap = heap;
+    page->heap_tag = heap->tag;
+  }
+  else {
+    page->heap = NULL;
+  }
+  mi_atomic_store_release(&page->xthread_id, tid);
+}
+
+static inline bool mi_page_is_abandoned(const mi_page_t* page) {
+  // note: the xheap field of an abandoned heap is set to the subproc (for fast reclaim-on-free)
+  return (mi_page_thread_id(page) <= MI_THREADID_ABANDONED_MAPPED);
+}
+
+static inline bool mi_page_is_abandoned_mapped(const mi_page_t* page) {
+  return (mi_page_thread_id(page) == MI_THREADID_ABANDONED_MAPPED);
+}
+
+static inline void mi_page_set_abandoned_mapped(mi_page_t* page) {
+  mi_assert_internal(mi_page_is_abandoned(page));
+  mi_atomic_or_relaxed(&page->xthread_id, MI_THREADID_ABANDONED_MAPPED);
+}
+
+static inline void mi_page_clear_abandoned_mapped(mi_page_t* page) {
+  mi_assert_internal(mi_page_is_abandoned_mapped(page));
+  mi_atomic_and_relaxed(&page->xthread_id, MI_PAGE_FLAG_MASK);
+}
+
+//-----------------------------------------------------------
+// Thread free list and ownership
+//-----------------------------------------------------------
+
+// Thread free flag helpers
+static inline mi_block_t* mi_tf_block(mi_thread_free_t tf) {
+  return (mi_block_t*)(tf & ~1);
+}
+static inline bool mi_tf_is_owned(mi_thread_free_t tf) {
+  return ((tf & 1) == 1);
+}
+static inline mi_thread_free_t mi_tf_create(mi_block_t* block, bool owned) {
+  return (mi_thread_free_t)((uintptr_t)block | (owned ? 1 : 0));
+}
+
+// Thread free access
+static inline mi_block_t* mi_page_thread_free(const mi_page_t* page) {
+  return mi_tf_block(mi_atomic_load_relaxed(&((mi_page_t*)page)->xthread_free));
+}
+
+// are there any available blocks?
+static inline bool mi_page_has_any_available(const mi_page_t* page) {
+  mi_assert_internal(page != NULL && page->reserved > 0);
+  return (page->used < page->reserved || (mi_page_thread_free(page) != NULL));
+}
+
+
+// Owned?
+static inline bool mi_page_is_owned(const mi_page_t* page) {
+  return mi_tf_is_owned(mi_atomic_load_relaxed(&((mi_page_t*)page)->xthread_free));
+}
+
+// Unown a page that is currently owned
+static inline void _mi_page_unown_unconditional(mi_page_t* page) {
+  mi_assert_internal(mi_page_is_owned(page));
+  mi_assert_internal(mi_page_thread_id(page)==0);
+  const uintptr_t old = mi_atomic_and_acq_rel(&page->xthread_free, ~((uintptr_t)1));
+  mi_assert_internal((old&1)==1); MI_UNUSED(old);
+}
+
+// get ownership if it is not yet owned
+static inline bool mi_page_try_claim_ownership(mi_page_t* page) {
+  const uintptr_t old = mi_atomic_or_acq_rel(&page->xthread_free, 1);
+  return ((old&1)==0);
+}
+
+// release ownership of a page. This may free the page if all blocks were concurrently
+// freed in the meantime. Returns true if the page was freed.
+static inline bool _mi_page_unown(mi_page_t* page) {
+  mi_assert_internal(mi_page_is_owned(page));
+  mi_assert_internal(mi_page_is_abandoned(page));
+  mi_thread_free_t tf_new;
+  mi_thread_free_t tf_old = mi_atomic_load_relaxed(&page->xthread_free);
+  do {
+    mi_assert_internal(mi_tf_is_owned(tf_old));
+    while mi_unlikely(mi_tf_block(tf_old) != NULL) {
+      _mi_page_free_collect(page, false);  // update used
+      if (mi_page_all_free(page)) {        // it may become free just before unowning it
+        _mi_arenas_page_unabandon(page);
+        _mi_arenas_page_free(page,NULL);
+        return true;
+      }
+      tf_old = mi_atomic_load_relaxed(&page->xthread_free);
+    }
+    mi_assert_internal(mi_tf_block(tf_old)==NULL);
+    tf_new = mi_tf_create(NULL, false);
+  } while (!mi_atomic_cas_weak_acq_rel(&page->xthread_free, &tf_old, tf_new));
+  return false;
+}
+
+
+/* -------------------------------------------------------------------
+  Guarded objects
+------------------------------------------------------------------- */
+#if MI_GUARDED
+
+// we always align guarded pointers in a block at an offset
+// the block `next` field is then used as a tag to distinguish regular offset aligned blocks from guarded ones
+#define MI_BLOCK_TAG_ALIGNED   ((mi_encoded_t)(0))
+#define MI_BLOCK_TAG_GUARDED   (~MI_BLOCK_TAG_ALIGNED)
+
+static inline bool mi_block_ptr_is_guarded(const mi_block_t* block, const void* p) {
+  const ptrdiff_t offset = (uint8_t*)p - (uint8_t*)block;
+  return (offset >= (ptrdiff_t)(sizeof(mi_block_t)) && block->next == MI_BLOCK_TAG_GUARDED);
+}
+
+static inline bool mi_heap_malloc_use_guarded(mi_heap_t* heap, size_t size) {
+  // this code is written to result in fast assembly as it is on the hot path for allocation
+  const size_t count = heap->guarded_sample_count - 1;  // if the rate was 0, this will underflow and count for a long time..
+  if mi_likely(count != 0) {
+    // no sample
+    heap->guarded_sample_count = count;
+    return false;
+  }
+  else if (size >= heap->guarded_size_min && size <= heap->guarded_size_max) {
+    // use guarded allocation
+    heap->guarded_sample_count = heap->guarded_sample_rate;  // reset
+    return (heap->guarded_sample_rate != 0);
+  }
+  else {
+    // failed size criteria, rewind count (but don't write to an empty heap)
+    if (heap->guarded_sample_rate != 0) { heap->guarded_sample_count = 1; }
+    return false;
+  }
+}
+
+mi_decl_restrict void* _mi_heap_malloc_guarded(mi_heap_t* heap, size_t size, bool zero) mi_attr_noexcept;
+
+#endif
+
+
+/* -------------------------------------------------------------------
+Encoding/Decoding the free list next pointers
+
+This is to protect against buffer overflow exploits where the
+free list is mutated. Many hardened allocators xor the next pointer `p`
+with a secret key `k1`, as `p^k1`. This prevents overwriting with known
+values but might be still too weak: if the attacker can guess
+the pointer `p` this  can reveal `k1` (since `p^k1^p == k1`).
+Moreover, if multiple blocks can be read as well, the attacker can
+xor both as `(p1^k1) ^ (p2^k1) == p1^p2` which may reveal a lot
+about the pointers (and subsequently `k1`).
+
+Instead mimalloc uses an extra key `k2` and encodes as `((p^k2)<<<k1)+k1`.
+Since these operations are not associative, the above approaches do not
+work so well any more even if the `p` can be guesstimated. For example,
+for the read case we can subtract two entries to discard the `+k1` term,
+but that leads to `((p1^k2)<<<k1) - ((p2^k2)<<<k1)` at best.
+We include the left-rotation since xor and addition are otherwise linear
+in the lowest bit. Finally, both keys are unique per page which reduces
+the re-use of keys by a large factor.
+
+We also pass a separate `null` value to be used as `NULL` or otherwise
+`(k2<<<k1)+k1` would appear (too) often as a sentinel value.
+------------------------------------------------------------------- */
+
+static inline bool mi_is_in_same_page(const void* p, const void* q) {
+  mi_page_t* page = _mi_ptr_page(p);
+  return mi_page_contains_address(page,q);
+  // return (_mi_ptr_page(p) == _mi_ptr_page(q));
+}
+
+static inline void* mi_ptr_decode(const void* null, const mi_encoded_t x, const uintptr_t* keys) {
+  void* p = (void*)(mi_rotr(x - keys[0], keys[0]) ^ keys[1]);
+  return (p==null ? NULL : p);
+}
+
+static inline mi_encoded_t mi_ptr_encode(const void* null, const void* p, const uintptr_t* keys) {
+  uintptr_t x = (uintptr_t)(p==NULL ? null : p);
+  return mi_rotl(x ^ keys[1], keys[0]) + keys[0];
+}
+
+static inline uint32_t mi_ptr_encode_canary(const void* null, const void* p, const uintptr_t* keys) {
+  const uint32_t x = (uint32_t)(mi_ptr_encode(null,p,keys));
+  // make the lowest byte 0 to prevent spurious read overflows which could be a security issue (issue #951)
+  #if MI_BIG_ENDIAN
+  return (x & 0x00FFFFFF);
+  #else
+  return (x & 0xFFFFFF00);
+  #endif
+}
+
+static inline mi_block_t* mi_block_nextx( const void* null, const mi_block_t* block, const uintptr_t* keys ) {
+  mi_track_mem_defined(block,sizeof(mi_block_t));
+  mi_block_t* next;
+  #ifdef MI_ENCODE_FREELIST
+  next = (mi_block_t*)mi_ptr_decode(null, block->next, keys);
+  #else
+  MI_UNUSED(keys); MI_UNUSED(null);
+  next = (mi_block_t*)block->next;
+  #endif
+  mi_track_mem_noaccess(block,sizeof(mi_block_t));
+  return next;
+}
+
+static inline void mi_block_set_nextx(const void* null, mi_block_t* block, const mi_block_t* next, const uintptr_t* keys) {
+  mi_track_mem_undefined(block,sizeof(mi_block_t));
+  #ifdef MI_ENCODE_FREELIST
+  block->next = mi_ptr_encode(null, next, keys);
+  #else
+  MI_UNUSED(keys); MI_UNUSED(null);
+  block->next = (mi_encoded_t)next;
+  #endif
+  mi_track_mem_noaccess(block,sizeof(mi_block_t));
+}
+
+static inline mi_block_t* mi_block_next(const mi_page_t* page, const mi_block_t* block) {
+  #ifdef MI_ENCODE_FREELIST
+  mi_block_t* next = mi_block_nextx(page,block,page->keys);
+  // check for free list corruption: is `next` at least in the same page?
+  // TODO: check if `next` is `page->block_size` aligned?
+  if mi_unlikely(next!=NULL && !mi_is_in_same_page(block, next)) {
+    _mi_error_message(EFAULT, "corrupted free list entry of size %zub at %p: value 0x%zx\n", mi_page_block_size(page), block, (uintptr_t)next);
+    next = NULL;
+  }
+  return next;
+  #else
+  MI_UNUSED(page);
+  return mi_block_nextx(page,block,NULL);
+  #endif
+}
+
+static inline void mi_block_set_next(const mi_page_t* page, mi_block_t* block, const mi_block_t* next) {
+  #ifdef MI_ENCODE_FREELIST
+  mi_block_set_nextx(page,block,next, page->keys);
+  #else
+  MI_UNUSED(page);
+  mi_block_set_nextx(page,block,next,NULL);
+  #endif
+}
+
+/* -----------------------------------------------------------
+  arena blocks
+----------------------------------------------------------- */
+
+// Blocks needed for a given byte size
+static inline size_t mi_slice_count_of_size(size_t size) {
+  return _mi_divide_up(size, MI_ARENA_SLICE_SIZE);
+}
+
+// Byte size of a number of blocks
+static inline size_t mi_size_of_slices(size_t bcount) {
+  return (bcount * MI_ARENA_SLICE_SIZE);
+}
+
+
+/* -----------------------------------------------------------
+  memory id's
+----------------------------------------------------------- */
+
+static inline mi_memid_t _mi_memid_create(mi_memkind_t memkind) {
+  mi_memid_t memid;
+  _mi_memzero_var(memid);
+  memid.memkind = memkind;
+  return memid;
+}
+
+static inline mi_memid_t _mi_memid_none(void) {
+  return _mi_memid_create(MI_MEM_NONE);
+}
+
+static inline mi_memid_t _mi_memid_create_os(void* base, size_t size, bool committed, bool is_zero, bool is_large) {
+  mi_memid_t memid = _mi_memid_create(MI_MEM_OS);
+  memid.mem.os.base = base;
+  memid.mem.os.size = size;
+  memid.initially_committed = committed;
+  memid.initially_zero = is_zero;
+  memid.is_pinned = is_large;
+  return memid;
+}
+
+static inline mi_memid_t _mi_memid_create_meta(void* mpage, size_t block_idx, size_t block_count) {
+  mi_memid_t memid = _mi_memid_create(MI_MEM_META);
+  memid.mem.meta.meta_page = mpage;
+  memid.mem.meta.block_index = (uint32_t)block_idx;
+  memid.mem.meta.block_count = (uint32_t)block_count;
+  memid.initially_committed = true;
+  memid.initially_zero = true;
+  memid.is_pinned = true;
+  return memid;
+}
+
+
+// -------------------------------------------------------------------
+// Fast "random" shuffle
+// -------------------------------------------------------------------
+
+static inline uintptr_t _mi_random_shuffle(uintptr_t x) {
+  if (x==0) { x = 17; }   // ensure we don't get stuck in generating zeros
+#if (MI_INTPTR_SIZE>=8)
+  // by Sebastiano Vigna, see: <http://xoshiro.di.unimi.it/splitmix64.c>
+  x ^= x >> 30;
+  x *= 0xbf58476d1ce4e5b9UL;
+  x ^= x >> 27;
+  x *= 0x94d049bb133111ebUL;
+  x ^= x >> 31;
+#elif (MI_INTPTR_SIZE==4)
+  // by Chris Wellons, see: <https://nullprogram.com/blog/2018/07/31/>
+  x ^= x >> 16;
+  x *= 0x7feb352dUL;
+  x ^= x >> 15;
+  x *= 0x846ca68bUL;
+  x ^= x >> 16;
+#endif
+  return x;
+}
+
+
+// ---------------------------------------------------------------------------------
+// Provide our own `_mi_memcpy` for potential performance optimizations.
+//
+// For now, only on Windows with msvc/clang-cl we optimize to `rep movsb` if
+// we happen to run on x86/x64 cpu's that have "fast short rep movsb" (FSRM) support
+// (AMD Zen3+ (~2020) or Intel Ice Lake+ (~2017). See also issue #201 and pr #253.
+// ---------------------------------------------------------------------------------
+
+#if !MI_TRACK_ENABLED && defined(_WIN32) && (MI_ARCH_X64 || MI_ARCH_X86)
+extern mi_decl_hidden bool _mi_cpu_has_fsrm;
+extern mi_decl_hidden bool _mi_cpu_has_erms;
+
+static inline void _mi_memcpy(void* dst, const void* src, size_t n) {
+  if ((_mi_cpu_has_fsrm && n <= 128) || (_mi_cpu_has_erms && n > 128)) {
+    __movsb((unsigned char*)dst, (const unsigned char*)src, n);
+  }
+  else {
+    memcpy(dst, src, n);
+  }
+}
+static inline void _mi_memset(void* dst, int val, size_t n) {
+  if ((_mi_cpu_has_fsrm && n <= 128) || (_mi_cpu_has_erms && n > 128)) {
+    __stosb((unsigned char*)dst, (uint8_t)val, n);
+  }
+  else {
+    memset(dst, val, n);
+  }
+}
+#else
+static inline void _mi_memcpy(void* dst, const void* src, size_t n) {
+  memcpy(dst, src, n);
+}
+static inline void _mi_memset(void* dst, int val, size_t n) {
+  memset(dst, val, n);
+}
+#endif
+
+// -------------------------------------------------------------------------------
+// The `_mi_memcpy_aligned` can be used if the pointers are machine-word aligned
+// This is used for example in `mi_realloc`.
+// -------------------------------------------------------------------------------
+
+#if (defined(__GNUC__) && (__GNUC__ >= 4)) || defined(__clang__)
+// On GCC/CLang we provide a hint that the pointers are word aligned.
+static inline void _mi_memcpy_aligned(void* dst, const void* src, size_t n) {
+  mi_assert_internal(((uintptr_t)dst % MI_INTPTR_SIZE == 0) && ((uintptr_t)src % MI_INTPTR_SIZE == 0));
+  void* adst = __builtin_assume_aligned(dst, MI_INTPTR_SIZE);
+  const void* asrc = __builtin_assume_aligned(src, MI_INTPTR_SIZE);
+  _mi_memcpy(adst, asrc, n);
+}
+
+static inline void _mi_memset_aligned(void* dst, int val, size_t n) {
+  mi_assert_internal((uintptr_t)dst % MI_INTPTR_SIZE == 0);
+  void* adst = __builtin_assume_aligned(dst, MI_INTPTR_SIZE);
+  _mi_memset(adst, val, n);
+}
+#else
+// Default fallback on `_mi_memcpy`
+static inline void _mi_memcpy_aligned(void* dst, const void* src, size_t n) {
+  mi_assert_internal(((uintptr_t)dst % MI_INTPTR_SIZE == 0) && ((uintptr_t)src % MI_INTPTR_SIZE == 0));
+  _mi_memcpy(dst, src, n);
+}
+
+static inline void _mi_memset_aligned(void* dst, int val, size_t n) {
+  mi_assert_internal((uintptr_t)dst % MI_INTPTR_SIZE == 0);
+  _mi_memset(dst, val, n);
+}
+#endif
+
+static inline void _mi_memzero(void* dst, size_t n) {
+  _mi_memset(dst, 0, n);
+}
+
+static inline void _mi_memzero_aligned(void* dst, size_t n) {
+  _mi_memset_aligned(dst, 0, n);
+}
+
+
+#endif  // MI_INTERNAL_H
diff --git a/depends/mimalloc/include/mimalloc/prim.h b/depends/mimalloc/include/mimalloc/prim.h
new file mode 100644
index 000000000000..daddaf8b1cd5
--- /dev/null
+++ b/depends/mimalloc/include/mimalloc/prim.h
@@ -0,0 +1,431 @@
+/* ----------------------------------------------------------------------------
+Copyright (c) 2018-2024, Microsoft Research, Daan Leijen
+This is free software; you can redistribute it and/or modify it under the
+terms of the MIT license. A copy of the license can be found in the file
+"LICENSE" at the root of this distribution.
+-----------------------------------------------------------------------------*/
+#pragma once
+#ifndef MI_PRIM_H
+#define MI_PRIM_H
+
+
+// --------------------------------------------------------------------------
+// This file specifies the primitive portability API.
+// Each OS/host needs to implement these primitives, see `src/prim`
+// for implementations on Window, macOS, WASI, and Linux/Unix.
+//
+// note: on all primitive functions, we always have result parameters != NULL, and:
+//  addr != NULL and page aligned
+//  size > 0     and page aligned
+//  the return value is an error code as an `int` where 0 is success
+// --------------------------------------------------------------------------
+
+// OS memory configuration
+typedef struct mi_os_mem_config_s {
+  size_t  page_size;              // default to 4KiB
+  size_t  large_page_size;        // 0 if not supported, usually 2MiB (4MiB on Windows)
+  size_t  alloc_granularity;      // smallest allocation size (usually 4KiB, on Windows 64KiB)
+  size_t  physical_memory_in_kib; // physical memory size in KiB
+  size_t  virtual_address_bits;   // usually 48 or 56 bits on 64-bit systems. (used to determine secure randomization)
+  bool    has_overcommit;         // can we reserve more memory than can be actually committed?
+  bool    has_partial_free;       // can allocated blocks be freed partially? (true for mmap, false for VirtualAlloc)
+  bool    has_virtual_reserve;    // supports virtual address space reservation? (if true we can reserve virtual address space without using commit or physical memory)
+} mi_os_mem_config_t;
+
+// Initialize
+void _mi_prim_mem_init( mi_os_mem_config_t* config );
+
+// Free OS memory
+int _mi_prim_free(void* addr, size_t size );
+
+// Allocate OS memory. Return NULL on error.
+// The `try_alignment` is just a hint and the returned pointer does not have to be aligned.
+// If `commit` is false, the virtual memory range only needs to be reserved (with no access)
+// which will later be committed explicitly using `_mi_prim_commit`.
+// `is_zero` is set to true if the memory was zero initialized (as on most OS's)
+// The `hint_addr` address is either `NULL` or a preferred allocation address but can be ignored.
+// pre: !commit => !allow_large
+//      try_alignment >= _mi_os_page_size() and a power of 2
+int _mi_prim_alloc(void* hint_addr, size_t size, size_t try_alignment, bool commit, bool allow_large, bool* is_large, bool* is_zero, void** addr);
+
+// Commit memory. Returns error code or 0 on success.
+// For example, on Linux this would make the memory PROT_READ|PROT_WRITE.
+// `is_zero` is set to true if the memory was zero initialized (e.g. on Windows)
+int _mi_prim_commit(void* addr, size_t size, bool* is_zero);
+
+// Decommit memory. Returns error code or 0 on success. The `needs_recommit` result is true
+// if the memory would need to be re-committed. For example, on Windows this is always true,
+// but on Linux we could use MADV_DONTNEED to decommit which does not need a recommit.
+// pre: needs_recommit != NULL
+int _mi_prim_decommit(void* addr, size_t size, bool* needs_recommit);
+
+// Reset memory. The range keeps being accessible but the content might be reset to zero at any moment.
+// Returns error code or 0 on success.
+int _mi_prim_reset(void* addr, size_t size);
+
+// Reuse memory. This is called for memory that is already committed but
+// may have been reset (`_mi_prim_reset`) or decommitted (`_mi_prim_decommit`) where `needs_recommit` was false.
+// Returns error code or 0 on success. On most platforms this is a no-op.
+int _mi_prim_reuse(void* addr, size_t size);
+
+// Protect memory. Returns error code or 0 on success.
+int _mi_prim_protect(void* addr, size_t size, bool protect);
+
+// Allocate huge (1GiB) pages possibly associated with a NUMA node.
+// `is_zero` is set to true if the memory was zero initialized (as on most OS's)
+// pre: size > 0  and a multiple of 1GiB.
+//      numa_node is either negative (don't care), or a numa node number.
+int _mi_prim_alloc_huge_os_pages(void* hint_addr, size_t size, int numa_node, bool* is_zero, void** addr);
+
+// Return the current NUMA node
+size_t _mi_prim_numa_node(void);
+
+// Return the number of logical NUMA nodes
+size_t _mi_prim_numa_node_count(void);
+
+// Clock ticks
+mi_msecs_t _mi_prim_clock_now(void);
+
+// Return process information (only for statistics)
+typedef struct mi_process_info_s {
+  mi_msecs_t  elapsed;
+  mi_msecs_t  utime;
+  mi_msecs_t  stime;
+  size_t      current_rss;
+  size_t      peak_rss;
+  size_t      current_commit;
+  size_t      peak_commit;
+  size_t      page_faults;
+} mi_process_info_t;
+
+void _mi_prim_process_info(mi_process_info_t* pinfo);
+
+// Default stderr output. (only for warnings etc. with verbose enabled)
+// msg != NULL && _mi_strlen(msg) > 0
+void _mi_prim_out_stderr( const char* msg );
+
+// Get an environment variable. (only for options)
+// name != NULL, result != NULL, result_size >= 64
+bool _mi_prim_getenv(const char* name, char* result, size_t result_size);
+
+
+// Fill a buffer with strong randomness; return `false` on error or if
+// there is no strong randomization available.
+bool _mi_prim_random_buf(void* buf, size_t buf_len);
+
+// Called on the first thread start, and should ensure `_mi_thread_done` is called on thread termination.
+void _mi_prim_thread_init_auto_done(void);
+
+// Called on process exit and may take action to clean up resources associated with the thread auto done.
+void _mi_prim_thread_done_auto_done(void);
+
+// Called when the default heap for a thread changes
+void _mi_prim_thread_associate_default_heap(mi_heap_t* heap);
+
+// Is this thread part of a thread pool?
+bool _mi_prim_thread_is_in_threadpool(void);
+
+
+//-------------------------------------------------------------------
+// Access to TLS (thread local storage) slots.
+// We need fast access to both a unique thread id (in `free.c:mi_free`) and
+// to a thread-local heap pointer (in `alloc.c:mi_malloc`).
+// To achieve this we use specialized code for various platforms.
+//-------------------------------------------------------------------
+
+// On some libc + platform combinations we can directly access a thread-local storage (TLS) slot.
+// The TLS layout depends on both the OS and libc implementation so we use specific tests for each main platform.
+// If you test on another platform and it works please send a PR :-)
+// see also https://akkadia.org/drepper/tls.pdf for more info on the TLS register.
+//
+// Note: we would like to prefer `__builtin_thread_pointer()` nowadays instead of using assembly,
+// but unfortunately we can not detect support reliably (see issue #883)
+// We also use it on Apple OS as we use a TLS slot for the default heap there.
+#if defined(__GNUC__) && ( \
+           (defined(__GLIBC__)   && (defined(__x86_64__) || defined(__i386__) || (defined(__arm__) && __ARM_ARCH >= 7) || defined(__aarch64__))) \
+        || (defined(__APPLE__)   && (defined(__x86_64__) || defined(__aarch64__) || defined(__POWERPC__))) \
+        || (defined(__BIONIC__)  && (defined(__x86_64__) || defined(__i386__) || (defined(__arm__) && __ARM_ARCH >= 7) || defined(__aarch64__))) \
+        || (defined(__FreeBSD__) && (defined(__x86_64__) || defined(__i386__) || defined(__aarch64__))) \
+        || (defined(__OpenBSD__) && (defined(__x86_64__) || defined(__i386__) || defined(__aarch64__))) \
+      )
+
+#define MI_HAS_TLS_SLOT    1
+
+static inline void* mi_prim_tls_slot(size_t slot) mi_attr_noexcept {
+  void* res;
+  const size_t ofs = (slot*sizeof(void*));
+  #if defined(__i386__)
+    __asm__("movl %%gs:%1, %0" : "=r" (res) : "m" (*((void**)ofs)) : );  // x86 32-bit always uses GS
+  #elif defined(__APPLE__) && defined(__x86_64__)
+    __asm__("movq %%gs:%1, %0" : "=r" (res) : "m" (*((void**)ofs)) : );  // x86_64 macOSX uses GS
+  #elif defined(__x86_64__) && (MI_INTPTR_SIZE==4)
+    __asm__("movl %%fs:%1, %0" : "=r" (res) : "m" (*((void**)ofs)) : );  // x32 ABI
+  #elif defined(__x86_64__)
+    __asm__("movq %%fs:%1, %0" : "=r" (res) : "m" (*((void**)ofs)) : );  // x86_64 Linux, BSD uses FS
+  #elif defined(__arm__)
+    void** tcb; MI_UNUSED(ofs);
+    __asm__ volatile ("mrc p15, 0, %0, c13, c0, 3\nbic %0, %0, #3" : "=r" (tcb));
+    res = tcb[slot];
+  #elif defined(__aarch64__)
+    void** tcb; MI_UNUSED(ofs);
+    #if defined(__APPLE__) // M1, issue #343
+    __asm__ volatile ("mrs %0, tpidrro_el0\nbic %0, %0, #7" : "=r" (tcb));
+    #else
+    __asm__ volatile ("mrs %0, tpidr_el0" : "=r" (tcb));
+    #endif
+    res = tcb[slot];
+  #elif defined(__APPLE__) && defined(__POWERPC__) // ppc, issue #781
+    MI_UNUSED(ofs);
+    res = pthread_getspecific(slot);
+  #endif
+  return res;
+}
+
+// setting a tls slot is only used on macOS for now
+static inline void mi_prim_tls_slot_set(size_t slot, void* value) mi_attr_noexcept {
+  const size_t ofs = (slot*sizeof(void*));
+  #if defined(__i386__)
+    __asm__("movl %1,%%gs:%0" : "=m" (*((void**)ofs)) : "rn" (value) : );  // 32-bit always uses GS
+  #elif defined(__APPLE__) && defined(__x86_64__)
+    __asm__("movq %1,%%gs:%0" : "=m" (*((void**)ofs)) : "rn" (value) : );  // x86_64 macOS uses GS
+  #elif defined(__x86_64__) && (MI_INTPTR_SIZE==4)
+    __asm__("movl %1,%%fs:%0" : "=m" (*((void**)ofs)) : "rn" (value) : );  // x32 ABI
+  #elif defined(__x86_64__)
+    __asm__("movq %1,%%fs:%0" : "=m" (*((void**)ofs)) : "rn" (value) : );  // x86_64 Linux, BSD uses FS
+  #elif defined(__arm__)
+    void** tcb; MI_UNUSED(ofs);
+    __asm__ volatile ("mrc p15, 0, %0, c13, c0, 3\nbic %0, %0, #3" : "=r" (tcb));
+    tcb[slot] = value;
+  #elif defined(__aarch64__)
+    void** tcb; MI_UNUSED(ofs);
+    #if defined(__APPLE__) // M1, issue #343
+    __asm__ volatile ("mrs %0, tpidrro_el0\nbic %0, %0, #7" : "=r" (tcb));
+    #else
+    __asm__ volatile ("mrs %0, tpidr_el0" : "=r" (tcb));
+    #endif
+    tcb[slot] = value;
+  #elif defined(__APPLE__) && defined(__POWERPC__) // ppc, issue #781
+    MI_UNUSED(ofs);
+    pthread_setspecific(slot, value);
+  #endif
+}
+
+#elif _WIN32 && MI_WIN_USE_FIXED_TLS && !defined(MI_WIN_USE_FLS)
+
+// On windows we can store the thread-local heap at a fixed TLS slot to avoid
+// thread-local initialization checks in the fast path.
+// We allocate a user TLS slot at process initialization (see `windows/prim.c`)
+// and store the offset `_mi_win_tls_offset`.
+#define MI_HAS_TLS_SLOT  1              // 2 = we can reliably initialize the slot (saving a test on each malloc)
+
+extern mi_decl_hidden size_t _mi_win_tls_offset;
+
+#if MI_WIN_USE_FIXED_TLS > 1
+#define MI_TLS_SLOT     (MI_WIN_USE_FIXED_TLS)
+#elif MI_SIZE_SIZE == 4
+#define MI_TLS_SLOT     (0x0E10 + _mi_win_tls_offset)  // User TLS slots <https://en.wikipedia.org/wiki/Win32_Thread_Information_Block>
+#else
+#define MI_TLS_SLOT     (0x1480 + _mi_win_tls_offset)  // User TLS slots <https://en.wikipedia.org/wiki/Win32_Thread_Information_Block>
+#endif
+
+static inline void* mi_prim_tls_slot(size_t slot) mi_attr_noexcept {
+  #if (_M_X64 || _M_AMD64) && !defined(_M_ARM64EC)
+  return (void*)__readgsqword((unsigned long)slot);   // direct load at offset from gs
+  #elif _M_IX86 && !defined(_M_ARM64EC)
+  return (void*)__readfsdword((unsigned long)slot);   // direct load at offset from fs
+  #else
+  return ((void**)NtCurrentTeb())[slot / sizeof(void*)];
+  #endif
+}
+static inline void mi_prim_tls_slot_set(size_t slot, void* value) mi_attr_noexcept {
+  ((void**)NtCurrentTeb())[slot / sizeof(void*)] = value;
+}
+
+#endif
+
+
+
+//-------------------------------------------------------------------
+// Get a fast unique thread id.
+//
+// Getting the thread id should be performant as it is called in the
+// fast path of `_mi_free` and we specialize for various platforms as
+// inlined definitions. Regular code should call `init.c:_mi_thread_id()`.
+// We only require _mi_prim_thread_id() to return a unique id
+// for each thread (unequal to zero).
+//-------------------------------------------------------------------
+
+
+// Do we have __builtin_thread_pointer? This would be the preferred way to get a unique thread id
+// but unfortunately, it seems we cannot test for this reliably at this time (see issue #883)
+// Nevertheless, it seems needed on older graviton platforms (see issue #851).
+// For now, we only enable this for specific platforms.
+#if !defined(__APPLE__)  /* on apple (M1) the wrong register is read (tpidr_el0 instead of tpidrro_el0) so fall back to TLS slot assembly (<https://github.com/microsoft/mimalloc/issues/343#issuecomment-763272369>)*/ \
+    && !defined(__CYGWIN__) \
+    && !defined(MI_LIBC_MUSL) \
+    && (!defined(__clang_major__) || __clang_major__ >= 14)  /* older clang versions emit bad code; fall back to using the TLS slot (<https://lore.kernel.org/linux-arm-kernel/202110280952.352F66D8@keescook/T/>) */
+  #if    (defined(__GNUC__) && (__GNUC__ >= 7)  && defined(__aarch64__)) /* aarch64 for older gcc versions (issue #851) */ \
+      || (defined(__GNUC__) && (__GNUC__ >= 11) && defined(__x86_64__)) \
+      || (defined(__clang_major__) && (__clang_major__ >= 14) && (defined(__aarch64__) || defined(__x86_64__)))
+    #define MI_USE_BUILTIN_THREAD_POINTER  1
+  #endif
+#endif
+
+
+
+// defined in `init.c`; do not use these directly
+extern mi_decl_hidden mi_decl_thread mi_heap_t* _mi_heap_default;  // default heap to allocate from
+extern mi_decl_hidden bool _mi_process_is_initialized;             // has mi_process_init been called?
+
+static inline mi_threadid_t __mi_prim_thread_id(void) mi_attr_noexcept;
+
+static inline mi_threadid_t _mi_prim_thread_id(void) mi_attr_noexcept {
+  const mi_threadid_t tid = __mi_prim_thread_id();
+  mi_assert_internal(tid > 1);
+  mi_assert_internal((tid & MI_PAGE_FLAG_MASK) == 0);  // bottom 2 bits are clear?
+  return tid;
+}
+
+// Get a unique id for the current thread.
+#if defined(MI_PRIM_THREAD_ID)
+
+static inline mi_threadid_t __mi_prim_thread_id(void) mi_attr_noexcept {
+  return MI_PRIM_THREAD_ID();  // used for example by CPython for a free threaded build (see python/cpython#115488)
+}
+
+#elif defined(_WIN32)
+
+static inline mi_threadid_t __mi_prim_thread_id(void) mi_attr_noexcept {
+  // Windows: works on Intel and ARM in both 32- and 64-bit
+  return (uintptr_t)NtCurrentTeb();
+}
+
+#elif MI_USE_BUILTIN_THREAD_POINTER
+
+static inline mi_threadid_t __mi_prim_thread_id(void) mi_attr_noexcept {
+  // Works on most Unix based platforms with recent compilers
+  return (uintptr_t)__builtin_thread_pointer();
+}
+
+#elif MI_HAS_TLS_SLOT
+
+static inline mi_threadid_t __mi_prim_thread_id(void) mi_attr_noexcept {
+  #if defined(__BIONIC__)
+    // issue #384, #495: on the Bionic libc (Android), slot 1 is the thread id
+    // see: https://github.com/aosp-mirror/platform_bionic/blob/c44b1d0676ded732df4b3b21c5f798eacae93228/libc/platform/bionic/tls_defines.h#L86
+    return (uintptr_t)mi_prim_tls_slot(1);
+  #else
+    // in all our other targets, slot 0 is the thread id
+    // glibc: https://sourceware.org/git/?p=glibc.git;a=blob_plain;f=sysdeps/x86_64/nptl/tls.h
+    // apple: https://github.com/apple/darwin-xnu/blob/main/libsyscall/os/tsd.h#L36
+    return (uintptr_t)mi_prim_tls_slot(0);
+  #endif
+}
+
+#else
+
+// otherwise use portable C, taking the address of a thread local variable (this is still very fast on most platforms).
+static inline mi_threadid_t __mi_prim_thread_id(void) mi_attr_noexcept {
+  return (uintptr_t)&_mi_heap_default;
+}
+
+#endif
+
+
+
+/* ----------------------------------------------------------------------------------------
+Get the thread local default heap: `_mi_prim_get_default_heap()`
+
+This is inlined here as it is on the fast path for allocation functions.
+
+On most platforms (Windows, Linux, FreeBSD, NetBSD, etc), this just returns a
+__thread local variable (`_mi_heap_default`). With the initial-exec TLS model this ensures
+that the storage will always be available (allocated on the thread stacks).
+
+On some platforms though we cannot use that when overriding `malloc` since the underlying
+TLS implementation (or the loader) will call itself `malloc` on a first access and recurse.
+We try to circumvent this in an efficient way:
+- macOSX : we use an unused TLS slot from the OS allocated slots (MI_TLS_SLOT). On OSX, the
+           loader itself calls `malloc` even before the modules are initialized.
+- OpenBSD: we use an unused slot from the pthread block (MI_TLS_PTHREAD_SLOT_OFS).
+- DragonFly: defaults are working but seem slow compared to freeBSD (see PR #323)
+------------------------------------------------------------------------------------------- */
+
+static inline mi_heap_t* mi_prim_get_default_heap(void);
+
+#if defined(MI_MALLOC_OVERRIDE)
+#if defined(__APPLE__) // macOS
+  #define MI_TLS_SLOT               89  // seems unused?
+  // other possible unused ones are 9, 29, __PTK_FRAMEWORK_JAVASCRIPTCORE_KEY4 (94), __PTK_FRAMEWORK_GC_KEY9 (112) and __PTK_FRAMEWORK_OLDGC_KEY9 (89)
+  // see <https://github.com/rweichler/substrate/blob/master/include/pthread_machdep.h>
+#elif defined(__OpenBSD__)
+  // use end bytes of a name; goes wrong if anyone uses names > 23 characters (ptrhread specifies 16)
+  // see <https://github.com/openbsd/src/blob/master/lib/libc/include/thread_private.h#L371>
+  #define MI_TLS_PTHREAD_SLOT_OFS   (6*sizeof(int) + 4*sizeof(void*) + 24)
+  // #elif defined(__DragonFly__)
+  // #warning "mimalloc is not working correctly on DragonFly yet."
+  // #define MI_TLS_PTHREAD_SLOT_OFS   (4 + 1*sizeof(void*))  // offset `uniqueid` (also used by gdb?) <https://github.com/DragonFlyBSD/DragonFlyBSD/blob/master/lib/libthread_xu/thread/thr_private.h#L458>
+#elif defined(__ANDROID__)
+  // See issue #381
+  #define MI_TLS_PTHREAD
+#endif
+#endif
+
+
+#if MI_TLS_SLOT
+# if !defined(MI_HAS_TLS_SLOT)
+#  error "trying to use a TLS slot for the default heap, but the mi_prim_tls_slot primitives are not defined"
+# endif
+
+static inline mi_heap_t* mi_prim_get_default_heap(void) {
+  mi_heap_t* heap = (mi_heap_t*)mi_prim_tls_slot(MI_TLS_SLOT);
+  #if MI_HAS_TLS_SLOT == 1   // check if the TLS slot is initialized
+  if mi_unlikely(heap == NULL) {
+    #ifdef __GNUC__
+    __asm(""); // prevent conditional load of the address of _mi_heap_empty
+    #endif
+    heap = (mi_heap_t*)&_mi_heap_empty;
+  }
+  #endif
+  return heap;
+}
+
+#elif defined(MI_TLS_PTHREAD_SLOT_OFS)
+
+static inline mi_heap_t** mi_prim_tls_pthread_heap_slot(void) {
+  pthread_t self = pthread_self();
+  #if defined(__DragonFly__)
+  if (self==NULL) return NULL;
+  #endif
+  return (mi_heap_t**)((uint8_t*)self + MI_TLS_PTHREAD_SLOT_OFS);
+}
+
+static inline mi_heap_t* mi_prim_get_default_heap(void) {
+  mi_heap_t** pheap = mi_prim_tls_pthread_heap_slot();
+  if mi_unlikely(pheap == NULL) return _mi_heap_main_get();
+  mi_heap_t* heap = *pheap;
+  if mi_unlikely(heap == NULL) return (mi_heap_t*)&_mi_heap_empty;
+  return heap;
+}
+
+#elif defined(MI_TLS_PTHREAD)
+
+extern mi_decl_hidden pthread_key_t _mi_heap_default_key;
+static inline mi_heap_t* mi_prim_get_default_heap(void) {
+  mi_heap_t* heap = (mi_unlikely(_mi_heap_default_key == (pthread_key_t)(-1)) ? _mi_heap_main_get() : (mi_heap_t*)pthread_getspecific(_mi_heap_default_key));
+  return (mi_unlikely(heap == NULL) ? (mi_heap_t*)&_mi_heap_empty : heap);
+}
+
+#else // default using a thread local variable; used on most platforms.
+
+static inline mi_heap_t* mi_prim_get_default_heap(void) {
+  #if defined(MI_TLS_RECURSE_GUARD)
+  if (mi_unlikely(!_mi_process_is_initialized)) return _mi_heap_main_get();
+  #endif
+  return _mi_heap_default;
+}
+
+#endif  // mi_prim_get_default_heap()
+
+
+#endif  // MI_PRIM_H
diff --git a/depends/mimalloc/include/mimalloc/track.h b/depends/mimalloc/include/mimalloc/track.h
new file mode 100644
index 000000000000..199308a64a86
--- /dev/null
+++ b/depends/mimalloc/include/mimalloc/track.h
@@ -0,0 +1,145 @@
+/* ----------------------------------------------------------------------------
+Copyright (c) 2018-2023, Microsoft Research, Daan Leijen
+This is free software; you can redistribute it and/or modify it under the
+terms of the MIT license. A copy of the license can be found in the file
+"LICENSE" at the root of this distribution.
+-----------------------------------------------------------------------------*/
+#pragma once
+#ifndef MI_TRACK_H
+#define MI_TRACK_H
+
+/* ------------------------------------------------------------------------------------------------------
+Track memory ranges with macros for tools like Valgrind address sanitizer, or other memory checkers.
+These can be defined for tracking allocation:
+
+  #define mi_track_malloc_size(p,reqsize,size,zero)
+  #define mi_track_free_size(p,_size)
+
+The macros are set up such that the size passed to `mi_track_free_size`
+always matches the size of `mi_track_malloc_size`. (currently, `size == mi_usable_size(p)`).
+The `reqsize` is what the user requested, and `size >= reqsize`.
+The `size` is either byte precise (and `size==reqsize`) if `MI_PADDING` is enabled,
+or otherwise it is the usable block size which may be larger than the original request.
+Use `_mi_block_size_of(void* p)` to get the full block size that was allocated (including padding etc).
+The `zero` parameter is `true` if the allocated block is zero initialized.
+
+Optional:
+
+  #define mi_track_align(p,alignedp,offset,size)
+  #define mi_track_resize(p,oldsize,newsize)
+  #define mi_track_init()
+
+The `mi_track_align` is called right after a `mi_track_malloc` for aligned pointers in a block.
+The corresponding `mi_track_free` still uses the block start pointer and original size (corresponding to the `mi_track_malloc`).
+The `mi_track_resize` is currently unused but could be called on reallocations within a block.
+`mi_track_init` is called at program start.
+
+The following macros are for tools like asan and valgrind to track whether memory is
+defined, undefined, or not accessible at all:
+
+  #define mi_track_mem_defined(p,size)
+  #define mi_track_mem_undefined(p,size)
+  #define mi_track_mem_noaccess(p,size)
+
+-------------------------------------------------------------------------------------------------------*/
+
+#if MI_TRACK_VALGRIND
+// valgrind tool
+
+#define MI_TRACK_ENABLED      1
+#define MI_TRACK_HEAP_DESTROY 1           // track free of individual blocks on heap_destroy
+#define MI_TRACK_TOOL         "valgrind"
+
+#include <valgrind/valgrind.h>
+#include <valgrind/memcheck.h>
+
+#define mi_track_malloc_size(p,reqsize,size,zero) VALGRIND_MALLOCLIKE_BLOCK(p,size,MI_PADDING_SIZE /*red zone*/,zero)
+#define mi_track_free_size(p,_size)               VALGRIND_FREELIKE_BLOCK(p,MI_PADDING_SIZE /*red zone*/)
+#define mi_track_resize(p,oldsize,newsize)        VALGRIND_RESIZEINPLACE_BLOCK(p,oldsize,newsize,MI_PADDING_SIZE /*red zone*/)
+#define mi_track_mem_defined(p,size)              VALGRIND_MAKE_MEM_DEFINED(p,size)
+#define mi_track_mem_undefined(p,size)            VALGRIND_MAKE_MEM_UNDEFINED(p,size)
+#define mi_track_mem_noaccess(p,size)             VALGRIND_MAKE_MEM_NOACCESS(p,size)
+
+#elif MI_TRACK_ASAN
+// address sanitizer
+
+#define MI_TRACK_ENABLED      1
+#define MI_TRACK_HEAP_DESTROY 0
+#define MI_TRACK_TOOL         "asan"
+
+#include <sanitizer/asan_interface.h>
+
+#define mi_track_malloc_size(p,reqsize,size,zero) ASAN_UNPOISON_MEMORY_REGION(p,size)
+#define mi_track_free_size(p,size)                ASAN_POISON_MEMORY_REGION(p,size)
+#define mi_track_mem_defined(p,size)              ASAN_UNPOISON_MEMORY_REGION(p,size)
+#define mi_track_mem_undefined(p,size)            ASAN_UNPOISON_MEMORY_REGION(p,size)
+#define mi_track_mem_noaccess(p,size)             ASAN_POISON_MEMORY_REGION(p,size)
+
+#elif MI_TRACK_ETW
+// windows event tracing
+
+#define MI_TRACK_ENABLED      1
+#define MI_TRACK_HEAP_DESTROY 1
+#define MI_TRACK_TOOL         "ETW"
+
+#include "../src/prim/windows/etw.h"
+
+#define mi_track_init()                           EventRegistermicrosoft_windows_mimalloc();
+#define mi_track_malloc_size(p,reqsize,size,zero) EventWriteETW_MI_ALLOC((UINT64)(p), size)
+#define mi_track_free_size(p,size)                EventWriteETW_MI_FREE((UINT64)(p), size)
+
+#else
+// no tracking
+
+#define MI_TRACK_ENABLED      0
+#define MI_TRACK_HEAP_DESTROY 0
+#define MI_TRACK_TOOL         "none"
+
+#define mi_track_malloc_size(p,reqsize,size,zero)
+#define mi_track_free_size(p,_size)
+
+#endif
+
+// -------------------
+// Utility definitions
+
+#ifndef mi_track_resize
+#define mi_track_resize(p,oldsize,newsize)      mi_track_free_size(p,oldsize); mi_track_malloc(p,newsize,false)
+#endif
+
+#ifndef mi_track_align
+#define mi_track_align(p,alignedp,offset,size)  mi_track_mem_noaccess(p,offset)
+#endif
+
+#ifndef mi_track_init
+#define mi_track_init()
+#endif
+
+#ifndef mi_track_mem_defined
+#define mi_track_mem_defined(p,size)
+#endif
+
+#ifndef mi_track_mem_undefined
+#define mi_track_mem_undefined(p,size)
+#endif
+
+#ifndef mi_track_mem_noaccess
+#define mi_track_mem_noaccess(p,size)
+#endif
+
+
+#if MI_PADDING
+#define mi_track_malloc(p,reqsize,zero) \
+  if ((p)!=NULL) { \
+    mi_assert_internal(mi_usable_size(p)==(reqsize)); \
+    mi_track_malloc_size(p,reqsize,reqsize,zero); \
+  }
+#else
+#define mi_track_malloc(p,reqsize,zero) \
+  if ((p)!=NULL) { \
+    mi_assert_internal(mi_usable_size(p)>=(reqsize)); \
+    mi_track_malloc_size(p,reqsize,mi_usable_size(p),zero); \
+  }
+#endif
+
+#endif // MI_TRACK_H
diff --git a/depends/mimalloc/include/mimalloc/types.h b/depends/mimalloc/include/mimalloc/types.h
new file mode 100644
index 000000000000..00b05e1d4ce8
--- /dev/null
+++ b/depends/mimalloc/include/mimalloc/types.h
@@ -0,0 +1,614 @@
+/* ----------------------------------------------------------------------------
+Copyright (c) 2018-2024, Microsoft Research, Daan Leijen
+This is free software; you can redistribute it and/or modify it under the
+terms of the MIT license. A copy of the license can be found in the file
+"LICENSE" at the root of this distribution.
+-----------------------------------------------------------------------------*/
+#pragma once
+#ifndef MI_TYPES_H
+#define MI_TYPES_H
+
+// --------------------------------------------------------------------------
+// This file contains the main type definitions for mimalloc:
+// mi_heap_t      : all data for a thread-local heap, contains
+//                  lists of all managed heap pages.
+// mi_page_t      : a mimalloc page (usually 64KiB or 512KiB) from
+//                  where objects of a single size are allocated.
+//                  Note: we write "OS page" for OS memory pages while
+//                  using plain "page" for mimalloc pages (`mi_page_t`).
+// --------------------------------------------------------------------------
+
+
+#include <mimalloc-stats.h>
+#include <stddef.h>   // ptrdiff_t
+#include <stdint.h>   // uintptr_t, uint16_t, etc
+#include <limits.h>   // SIZE_MAX etc.
+#include <errno.h>    // error codes
+#include "bits.h"     // size defines (MI_INTPTR_SIZE etc), bit operations
+#include "atomic.h"   // _Atomic primitives
+
+// Minimal alignment necessary. On most platforms 16 bytes are needed
+// due to SSE registers for example. This must be at least `sizeof(void*)`
+#ifndef MI_MAX_ALIGN_SIZE
+#define MI_MAX_ALIGN_SIZE  16   // sizeof(max_align_t)
+#endif
+
+// ------------------------------------------------------
+// Variants
+// ------------------------------------------------------
+
+// Define NDEBUG in the release version to disable assertions.
+// #define NDEBUG
+
+// Define MI_TRACK_<tool> to enable tracking support
+// #define MI_TRACK_VALGRIND 1
+// #define MI_TRACK_ASAN     1
+// #define MI_TRACK_ETW      1
+
+// Define MI_STAT as 1 to maintain statistics; set it to 2 to have detailed statistics (but costs some performance).
+// #define MI_STAT 1
+
+// Define MI_SECURE to enable security mitigations. Level 1 has minimal performance impact,
+// but protects most metadata with guard pages:
+//   #define MI_SECURE 1  // guard page around metadata; check pointer validity on free
+//
+// Level 2 has more performance impact but protect well against various buffer overflows
+// by surrounding all mimalloc pages with guard pages:
+//   #define MI_SECURE 2  // guard page around each mimalloc page (can fragment VMA's with large heaps..)
+//
+// The next two levels can have more performance cost:
+//   #define MI_SECURE 3  // randomize allocations, encode free lists (detect corrupted free list (buffer overflow), and invalid pointer free)
+//   #define MI_SECURE 4  // checks for double free. (may be more expensive)
+
+#if !defined(MI_SECURE)
+#define MI_SECURE 0
+#endif
+
+// Define MI_DEBUG for debug mode
+// #define MI_DEBUG 1  // basic assertion checks and statistics, check double free, corrupted free list, and invalid pointer free.
+// #define MI_DEBUG 2  // + internal assertion checks
+// #define MI_DEBUG 3  // + extensive internal invariant checking (cmake -DMI_DEBUG_FULL=ON)
+#if !defined(MI_DEBUG)
+#if defined(MI_BUILD_RELEASE) || defined(NDEBUG)
+#define MI_DEBUG 0
+#else
+#define MI_DEBUG 2
+#endif
+#endif
+
+// Statistics (0=only essential, 1=normal, 2=more fine-grained (expensive) tracking)
+#ifndef MI_STAT
+#if (MI_DEBUG>0)
+#define MI_STAT 2
+#else
+#define MI_STAT 0
+#endif
+#endif
+
+// Use guard pages behind objects of a certain size (set by the MIMALLOC_DEBUG_GUARDED_MIN/MAX options)
+// Padding should be disabled when using guard pages
+// #define MI_GUARDED 1
+#if defined(MI_GUARDED)
+#define MI_PADDING  0
+#endif
+
+// Reserve extra padding at the end of each block to be more resilient against heap block overflows.
+// The padding can detect buffer overflow on free.
+#if !defined(MI_PADDING) && (MI_SECURE>=3 || MI_DEBUG>=1 || (MI_TRACK_VALGRIND || MI_TRACK_ASAN || MI_TRACK_ETW))
+#define MI_PADDING  1
+#endif
+
+// Check padding bytes; allows byte-precise buffer overflow detection
+#if !defined(MI_PADDING_CHECK) && MI_PADDING && (MI_SECURE>=3 || MI_DEBUG>=1)
+#define MI_PADDING_CHECK 1
+#endif
+
+
+// Encoded free lists allow detection of corrupted free lists
+// and can detect buffer overflows, modify after free, and double `free`s.
+#if (MI_SECURE>=3 || MI_DEBUG>=1)
+#define MI_ENCODE_FREELIST  1
+#endif
+
+// Enable large pages for objects between 64KiB and 512KiB.
+// Disabled by default as for many workloads the block sizes above 64 KiB are quite random which can lead to too many partially used large pages.
+#ifndef MI_ENABLE_LARGE_PAGES
+#define MI_ENABLE_LARGE_PAGES  0
+#endif
+
+// --------------------------------------------------------------
+// Sizes of internal data-structures
+// (comments specify sizes on 64-bit, usually 32-bit is halved)
+// --------------------------------------------------------------
+
+// Main size parameter; determines max arena sizes and max arena object sizes etc.
+#ifndef MI_ARENA_SLICE_SHIFT
+  #ifdef  MI_SMALL_PAGE_SHIFT   // backward compatibility
+  #define MI_ARENA_SLICE_SHIFT              MI_SMALL_PAGE_SHIFT
+  #else
+  #define MI_ARENA_SLICE_SHIFT              (14 + MI_SIZE_SHIFT)        // 64 KiB (32 KiB on 32-bit)
+  #endif
+#endif
+#if MI_ARENA_SLICE_SHIFT < 12
+#error Arena slices should be at least 4KiB
+#endif
+
+#ifndef MI_BCHUNK_BITS_SHIFT
+  #if MI_ARENA_SLICE_SHIFT <= 13    // <= 8KiB
+  #define MI_BCHUNK_BITS_SHIFT              (7)   // 128 bits
+  #elif MI_ARENA_SLICE_SHIFT < 16   // <= 32KiB
+  #define MI_BCHUNK_BITS_SHIFT              (8)   // 256 bits
+  #else 
+  #define MI_BCHUNK_BITS_SHIFT              (6 + MI_SIZE_SHIFT)       // 512 bits (or 256 on 32-bit)
+  #endif
+#endif
+
+#define MI_BCHUNK_BITS                    (1 << MI_BCHUNK_BITS_SHIFT)         // sub-bitmaps are "bchunks" of 512 bits
+#define MI_ARENA_SLICE_SIZE               (MI_ZU(1) << MI_ARENA_SLICE_SHIFT)  // arena's allocate in slices of 64 KiB
+#define MI_ARENA_SLICE_ALIGN              (MI_ARENA_SLICE_SIZE)
+
+#define MI_ARENA_MIN_OBJ_SLICES           (1)
+#define MI_ARENA_MAX_OBJ_SLICES           (MI_BCHUNK_BITS)            // 32 MiB (for now, cannot cross chunk boundaries)
+
+#define MI_ARENA_MIN_OBJ_SIZE             (MI_ARENA_MIN_OBJ_SLICES * MI_ARENA_SLICE_SIZE)
+#define MI_ARENA_MAX_OBJ_SIZE             (MI_ARENA_MAX_OBJ_SLICES * MI_ARENA_SLICE_SIZE)
+
+#if MI_ARENA_MAX_OBJ_SIZE < MI_SIZE_SIZE*1024
+#error maximum object size may be too small to hold local thread data  
+#endif
+
+#define MI_SMALL_PAGE_SIZE                MI_ARENA_MIN_OBJ_SIZE                    // 64 KiB
+#define MI_MEDIUM_PAGE_SIZE               (8*MI_SMALL_PAGE_SIZE)                   // 512 KiB  (=byte in the bchunk bitmap)
+#define MI_LARGE_PAGE_SIZE                (MI_SIZE_SIZE*MI_MEDIUM_PAGE_SIZE)       // 4 MiB    (=word in the bchunk bitmap)
+
+
+// Maximum number of size classes. (spaced exponentially in 12.5% increments)
+#if MI_BIN_HUGE != 73U
+#error "mimalloc internal: expecting 73 bins"
+#endif
+#define MI_BIN_FULL  (MI_BIN_HUGE+1)
+#define MI_BIN_COUNT (MI_BIN_FULL+1)
+
+// We never allocate more than PTRDIFF_MAX (see also <https://sourceware.org/ml/libc-announce/2019/msg00001.html>)
+#define MI_MAX_ALLOC_SIZE        PTRDIFF_MAX
+
+// Minimal commit for a page on-demand commit (should be >= OS page size)
+#define MI_PAGE_MIN_COMMIT_SIZE  MI_ARENA_SLICE_SIZE // (4*MI_KiB)
+
+
+// ------------------------------------------------------
+// Arena's are large reserved areas of memory allocated from
+// the OS that are managed by mimalloc to efficiently
+// allocate MI_ARENA_SLICE_SIZE slices of memory for the
+// mimalloc pages.
+// ------------------------------------------------------
+
+// A large memory arena where pages are allocated in. 
+typedef struct mi_arena_s mi_arena_t;     // defined below
+
+
+// ---------------------------------------------------------------
+// a memory id tracks the provenance of arena/OS allocated memory
+// ---------------------------------------------------------------
+
+// Memory can reside in arena's, direct OS allocated, meta-data pages, or statically allocated.
+// The memid keeps track of this.
+typedef enum mi_memkind_e {
+  MI_MEM_NONE,      // not allocated
+  MI_MEM_EXTERNAL,  // not owned by mimalloc but provided externally (via `mi_manage_os_memory` for example)
+  MI_MEM_STATIC,    // allocated in a static area and should not be freed (the initial main heap data for example (`init.c`))
+  MI_MEM_META,      // allocated with the meta data allocator (`arena-meta.c`)
+  MI_MEM_OS,        // allocated from the OS
+  MI_MEM_OS_HUGE,   // allocated as huge OS pages (usually 1GiB, pinned to physical memory)
+  MI_MEM_OS_REMAP,  // allocated in a remapable area (i.e. using `mremap`)
+  MI_MEM_ARENA      // allocated from an arena (the usual case) (`arena.c`)
+} mi_memkind_t;
+
+static inline bool mi_memkind_is_os(mi_memkind_t memkind) {
+  return (memkind >= MI_MEM_OS && memkind <= MI_MEM_OS_REMAP);
+}
+
+static inline bool mi_memkind_needs_no_free(mi_memkind_t memkind) {
+  return (memkind <= MI_MEM_STATIC);
+}
+
+
+typedef struct mi_memid_os_info {
+  void*         base;               // actual base address of the block (used for offset aligned allocations)
+  size_t        size;               // allocated full size
+  // size_t        alignment;       // alignment at allocation
+} mi_memid_os_info_t;
+
+typedef struct mi_memid_arena_info {
+  mi_arena_t*   arena;              // arena that contains this memory
+  uint32_t      slice_index;        // slice index in the arena
+  uint32_t      slice_count;        // allocated slices
+} mi_memid_arena_info_t;
+
+typedef struct mi_memid_meta_info {
+  void*         meta_page;          // meta-page that contains the block
+  uint32_t      block_index;        // block index in the meta-data page
+  uint32_t      block_count;        // allocated blocks
+} mi_memid_meta_info_t;
+
+typedef struct mi_memid_s {
+  union {
+    mi_memid_os_info_t    os;       // only used for MI_MEM_OS
+    mi_memid_arena_info_t arena;    // only used for MI_MEM_ARENA
+    mi_memid_meta_info_t  meta;     // only used for MI_MEM_META
+  } mem;
+  mi_memkind_t  memkind;
+  bool          is_pinned;          // `true` if we cannot decommit/reset/protect in this memory (e.g. when allocated using large (2Mib) or huge (1GiB) OS pages)
+  bool          initially_committed;// `true` if the memory was originally allocated as committed
+  bool          initially_zero;     // `true` if the memory was originally zero initialized
+} mi_memid_t;
+
+
+static inline bool mi_memid_is_os(mi_memid_t memid) {
+  return mi_memkind_is_os(memid.memkind);
+}
+
+static inline bool mi_memid_needs_no_free(mi_memid_t memid) {
+  return mi_memkind_needs_no_free(memid.memkind);
+}
+
+static inline mi_arena_t* mi_memid_arena(mi_memid_t memid) {
+  return (memid.memkind == MI_MEM_ARENA ? memid.mem.arena.arena : NULL);
+}
+
+
+// ------------------------------------------------------
+// Mimalloc pages contain allocated blocks
+// ------------------------------------------------------
+
+// The free lists use encoded next fields
+// (Only actually encodes when MI_ENCODED_FREELIST is defined.)
+typedef uintptr_t  mi_encoded_t;
+
+// thread id's
+typedef size_t     mi_threadid_t;
+
+// free lists contain blocks
+typedef struct mi_block_s {
+  mi_encoded_t next;
+} mi_block_t;
+
+
+// The page flags are put in the bottom 2 bits of the thread_id (for a fast test in `mi_free`)
+// `has_aligned` is true if the page has pointers at an offset in a block (so we unalign before free-ing)
+// `in_full_queue` is true if the page is full and resides in the full queue (so we move it to a regular queue on free-ing)
+#define MI_PAGE_IN_FULL_QUEUE         MI_ZU(0x01)
+#define MI_PAGE_HAS_ALIGNED           MI_ZU(0x02)
+#define MI_PAGE_FLAG_MASK             MI_ZU(0x03)
+typedef size_t mi_page_flags_t;
+
+// There are two special threadid's: 0 for abandoned threads, and 4 for abandoned & mapped threads --
+// abandoned-mapped pages are abandoned but also mapped in an arena so can be quickly found for reuse.
+#define MI_THREADID_ABANDONED         MI_ZU(0)
+#define MI_THREADID_ABANDONED_MAPPED  (MI_PAGE_FLAG_MASK + 1)
+
+// Thread free list.
+// Points to a list of blocks that are freed by other threads.
+// The least-bit is set if the page is owned by the current thread. (`mi_page_is_owned`).
+// Ownership is required before we can read any non-atomic fields in the page.
+// This way we can push a block on the thread free list and try to claim ownership atomically in `free.c:mi_free_block_mt`.
+typedef uintptr_t mi_thread_free_t;
+
+// A heap can serve only specific objects signified by its heap tag (e.g. various object types in CPython)
+typedef uint8_t mi_heaptag_t;
+
+// A page contains blocks of one specific size (`block_size`).
+// Each page has three list of free blocks:
+// `free` for blocks that can be allocated,
+// `local_free` for freed blocks that are not yet available to `mi_malloc`
+// `thread_free` for freed blocks by other threads
+// The `local_free` and `thread_free` lists are migrated to the `free` list
+// when it is exhausted. The separate `local_free` list is necessary to
+// implement a monotonic heartbeat. The `thread_free` list is needed for
+// avoiding atomic operations when allocating from the owning thread.
+//
+// `used - |thread_free|` == actual blocks that are in use (alive)
+// `used - |thread_free| + |free| + |local_free| == capacity`
+//
+// We don't count "freed" (as |free|) but use only the `used` field to reduce
+// the number of memory accesses in the `mi_page_all_free` function(s).
+// Use `_mi_page_free_collect` to collect the thread_free list and update the `used` count.
+//
+// Notes:
+// - Non-atomic fields can only be accessed if having _ownership_ (low bit of `xthread_free` is 1).
+//   Combining the `thread_free` list with an ownership bit allows a concurrent `free` to atomically
+//   free an object and (re)claim ownership if the page was abandoned.
+// - If a page is not part of a heap it is called "abandoned"  (`heap==NULL`) -- in
+//   that case the `xthreadid` is 0 or 4 (4 is for abandoned pages that
+//   are in the abandoned page lists of an arena, these are called "mapped" abandoned pages).
+// - page flags are in the bottom 3 bits of `xthread_id` for the fast path in `mi_free`.
+// - The layout is optimized for `free.c:mi_free` and `alloc.c:mi_page_alloc`
+// - Using `uint16_t` does not seem to slow things down
+
+typedef struct mi_page_s {
+  _Atomic(mi_threadid_t)    xthread_id;        // thread this page belongs to. (= `heap->thread_id (or 0 or 4 if abandoned) | page_flags`)
+
+  mi_block_t*               free;              // list of available free blocks (`malloc` allocates from this list)
+  uint16_t                  used;              // number of blocks in use (including blocks in `thread_free`)
+  uint16_t                  capacity;          // number of blocks committed
+  uint16_t                  reserved;          // number of blocks reserved in memory
+  uint8_t                   block_size_shift;  // if not zero, then `(1 << block_size_shift) == block_size` (only used for fast path in `free.c:_mi_page_ptr_unalign`)
+  uint8_t                   retire_expire;     // expiration count for retired blocks
+
+  mi_block_t*               local_free;        // list of deferred free blocks by this thread (migrates to `free`)
+  _Atomic(mi_thread_free_t) xthread_free;      // list of deferred free blocks freed by other threads (= `mi_block_t* | (1 if owned)`)
+
+  size_t                    block_size;        // size available in each block (always `>0`)
+  uint8_t*                  page_start;        // start of the blocks
+  mi_heaptag_t              heap_tag;          // tag of the owning heap, used to separate heaps by object type
+  bool                      free_is_zero;      // `true` if the blocks in the free list are zero initialized
+                                               // padding
+  #if (MI_ENCODE_FREELIST || MI_PADDING)
+  uintptr_t                 keys[2];           // two random keys to encode the free lists (see `_mi_block_next`) or padding canary
+  #endif
+
+  mi_heap_t*                heap;              // the heap owning this page (or NULL for abandoned pages)
+  struct mi_page_s*         next;              // next page owned by the heap with the same `block_size`
+  struct mi_page_s*         prev;              // previous page owned by the heap with the same `block_size`
+  size_t                    slice_committed;   // committed size relative to the first arena slice of the page data (or 0 if the page is fully committed already)
+  mi_memid_t                memid;             // provenance of the page memory
+} mi_page_t;
+
+
+// ------------------------------------------------------
+// Object sizes
+// ------------------------------------------------------
+
+#define MI_PAGE_ALIGN                     MI_ARENA_SLICE_ALIGN // pages must be aligned on this for the page map.
+#define MI_PAGE_MIN_START_BLOCK_ALIGN     MI_MAX_ALIGN_SIZE    // minimal block alignment for the first block in a page (16b)
+#define MI_PAGE_MAX_START_BLOCK_ALIGN2    MI_KiB               // maximal block alignment for "power of 2"-sized blocks (such that we guarantee natural alignment)
+#define MI_PAGE_MAX_OVERALLOC_ALIGN       MI_ARENA_SLICE_SIZE  // (64 KiB) limit for which we overallocate in arena pages, beyond this use OS allocation
+
+#if (MI_ENCODE_FREELIST || MI_PADDING) && MI_SIZE_SIZE == 8
+#define MI_PAGE_INFO_SIZE                 ((MI_INTPTR_SHIFT+2)*32)  // 160    >= sizeof(mi_page_t)
+#else
+#define MI_PAGE_INFO_SIZE                 ((MI_INTPTR_SHIFT+1)*32)  // 128/96 >= sizeof(mi_page_t)
+#endif
+
+// The max object size are checked to not waste more than 12.5% internally over the page sizes.
+#define MI_SMALL_MAX_OBJ_SIZE             ((MI_SMALL_PAGE_SIZE-MI_PAGE_INFO_SIZE)/8)   // < ~8 KiB
+#if MI_ENABLE_LARGE_PAGES
+#define MI_MEDIUM_MAX_OBJ_SIZE            ((MI_MEDIUM_PAGE_SIZE-MI_PAGE_INFO_SIZE)/8)  // < ~64 KiB
+#define MI_LARGE_MAX_OBJ_SIZE             (MI_LARGE_PAGE_SIZE/8)    // <= 512KiB // note: this must be a nice power of 2 or we get rounding issues with `_mi_bin`
+#else
+#define MI_MEDIUM_MAX_OBJ_SIZE            (MI_MEDIUM_PAGE_SIZE/8)   // <= 64 KiB
+#define MI_LARGE_MAX_OBJ_SIZE             MI_MEDIUM_MAX_OBJ_SIZE    // note: this must be a nice power of 2 or we get rounding issues with `_mi_bin`
+#endif
+#define MI_LARGE_MAX_OBJ_WSIZE            (MI_LARGE_MAX_OBJ_SIZE/MI_SIZE_SIZE)
+
+#if (MI_LARGE_MAX_OBJ_WSIZE >= 655360)
+#error "mimalloc internal: define more bins"
+#endif
+
+
+// ------------------------------------------------------
+// Page kinds
+// ------------------------------------------------------
+
+typedef enum mi_page_kind_e {
+  MI_PAGE_SMALL,    // small blocks go into 64KiB pages
+  MI_PAGE_MEDIUM,   // medium blocks go into 512KiB pages
+  MI_PAGE_LARGE,    // larger blocks go into 4MiB pages (if `MI_ENABLE_LARGE_PAGES==1`)
+  MI_PAGE_SINGLETON // page containing a single block.
+                    // used for blocks `> MI_LARGE_MAX_OBJ_SIZE` or an aligment `> MI_PAGE_MAX_OVERALLOC_ALIGN`.
+} mi_page_kind_t;
+
+
+
+// ------------------------------------------------------
+// Heaps
+//
+// Provide first-class heaps to allocate from.
+// A heap just owns a set of pages for allocation and
+// can only be allocate/reallocate from the thread that created it.
+// Freeing blocks can be done from any thread though.
+//
+// Per thread, there is always a default heap that is
+// used for allocation; it is initialized to statically
+// point to an empty heap to avoid initialization checks
+// in the fast path.
+// ------------------------------------------------------
+
+// Thread local data
+typedef struct mi_tld_s mi_tld_t;   // defined below
+
+// Pages of a certain block size are held in a queue.
+typedef struct mi_page_queue_s {
+  mi_page_t* first;
+  mi_page_t* last;
+  size_t     count;
+  size_t     block_size;
+} mi_page_queue_t;
+
+// Random context
+typedef struct mi_random_cxt_s {
+  uint32_t input[16];
+  uint32_t output[16];
+  int      output_available;
+  bool     weak;
+} mi_random_ctx_t;
+
+
+// In debug mode there is a padding structure at the end of the blocks to check for buffer overflows
+#if MI_PADDING
+typedef struct mi_padding_s {
+  uint32_t canary; // encoded block value to check validity of the padding (in case of overflow)
+  uint32_t delta;  // padding bytes before the block. (mi_usable_size(p) - delta == exact allocated bytes)
+} mi_padding_t;
+#define MI_PADDING_SIZE   (sizeof(mi_padding_t))
+#define MI_PADDING_WSIZE  ((MI_PADDING_SIZE + MI_INTPTR_SIZE - 1) / MI_INTPTR_SIZE)
+#else
+#define MI_PADDING_SIZE   0
+#define MI_PADDING_WSIZE  0
+#endif
+
+#define MI_PAGES_DIRECT   (MI_SMALL_WSIZE_MAX + MI_PADDING_WSIZE + 1)
+
+
+// A heap owns a set of pages.
+struct mi_heap_s {
+  mi_tld_t*             tld;                                 // thread-local data
+  mi_arena_t*           exclusive_arena;                     // if the heap should only allocate from a specific arena (or NULL)
+  int                   numa_node;                           // preferred numa node (or -1 for no preference)
+  uintptr_t             cookie;                              // random cookie to verify pointers (see `_mi_ptr_cookie`)
+  mi_random_ctx_t       random;                              // random number context used for secure allocation
+  size_t                page_count;                          // total number of pages in the `pages` queues.
+  size_t                page_retired_min;                    // smallest retired index (retired pages are fully free, but still in the page queues)
+  size_t                page_retired_max;                    // largest retired index into the `pages` array.
+  long                  generic_count;                       // how often is `_mi_malloc_generic` called?
+  long                  generic_collect_count;               // how often is `_mi_malloc_generic` called without collecting?
+  mi_heap_t*            next;                                // list of heaps per thread
+  long                  page_full_retain;                    // how many full pages can be retained per queue (before abondoning them)
+  bool                  allow_page_reclaim;                  // `true` if this heap should not reclaim abandoned pages
+  bool                  allow_page_abandon;                  // `true` if this heap can abandon pages to reduce memory footprint
+  uint8_t               tag;                                 // custom tag, can be used for separating heaps based on the object types
+  #if MI_GUARDED
+  size_t                guarded_size_min;                    // minimal size for guarded objects
+  size_t                guarded_size_max;                    // maximal size for guarded objects
+  size_t                guarded_sample_rate;                 // sample rate (set to 0 to disable guarded pages)
+  size_t                guarded_sample_count;                // current sample count (counting down to 0)
+  #endif
+  mi_page_t*            pages_free_direct[MI_PAGES_DIRECT];  // optimize: array where every entry points a page with possibly free blocks in the corresponding queue for that size.
+  mi_page_queue_t       pages[MI_BIN_COUNT];                 // queue of pages for each size class (or "bin")
+  mi_memid_t            memid;                               // provenance of the heap struct itself (meta or os)
+};
+
+
+// ------------------------------------------------------
+// Sub processes do not reclaim or visit pages from other sub processes. 
+// These are essentially the static variables of a process, and
+// usually there is only one subprocess. This can be used for example
+// by CPython to have seperate interpreters within one process.
+// Each thread can only belong to one subprocess.
+// ------------------------------------------------------
+
+#define MI_MAX_ARENAS   (160)   // Limited for now (and takes up .bss).. but arena's scale up exponentially (see `mi_arena_reserve`)
+                                // 160 arenas is enough for ~2 TiB memory
+
+typedef struct mi_subproc_s {
+  _Atomic(size_t)       arena_count;                    // current count of arena's
+  _Atomic(mi_arena_t*)  arenas[MI_MAX_ARENAS];          // arena's of this sub-process
+  mi_lock_t             arena_reserve_lock;             // lock to ensure arena's get reserved one at a time
+  _Atomic(int64_t)      purge_expire;                   // expiration is set if any arenas can be purged
+
+  _Atomic(size_t)       abandoned_count[MI_BIN_COUNT];  // total count of abandoned pages for this sub-process
+  mi_page_t*            os_abandoned_pages;             // list of pages that OS allocated and not in an arena (only used if `mi_option_visit_abandoned` is on)
+  mi_lock_t             os_abandoned_pages_lock;        // lock for the os abandoned pages list (this lock protects list operations)
+
+  mi_memid_t            memid;                          // provenance of this memory block (meta or OS)
+  mi_stats_t            stats;                          // sub-process statistics (tld stats are merged in on thread termination)
+} mi_subproc_t;
+
+
+
+// ------------------------------------------------------
+// Thread Local data
+// ------------------------------------------------------
+
+// Milliseconds as in `int64_t` to avoid overflows
+typedef int64_t  mi_msecs_t;
+
+// Thread local data
+struct mi_tld_s {
+  mi_threadid_t         thread_id;            // thread id of this thread
+  size_t                thread_seq;           // thread sequence id (linear count of created threads)
+  int                   numa_node;            // thread preferred numa node
+  mi_subproc_t*         subproc;              // sub-process this thread belongs to.
+  mi_heap_t*            heap_backing;         // backing heap of this thread (cannot be deleted)
+  mi_heap_t*            heaps;                // list of heaps in this thread (so we can abandon all when the thread terminates)
+  unsigned long long    heartbeat;            // monotonic heartbeat count
+  bool                  recurse;              // true if deferred was called; used to prevent infinite recursion.
+  bool                  is_in_threadpool;     // true if this thread is part of a threadpool (and can run arbitrary tasks)
+  mi_stats_t            stats;                // statistics
+  mi_memid_t            memid;                // provenance of the tld memory itself (meta or OS)
+};
+
+
+/* ----------------------------------------------------------------------------
+  Arenas are fixed area's of OS memory from which we can allocate
+  large blocks (>= MI_ARENA_MIN_BLOCK_SIZE).
+  In contrast to the rest of mimalloc, the arenas are shared between
+  threads and need to be accessed using atomic operations (using atomic `mi_bitmap_t`'s).
+
+  Arenas are also used to for huge OS page (1GiB) reservations or for reserving
+  OS memory upfront which can be improve performance or is sometimes needed
+  on embedded devices. We can also employ this with WASI or `sbrk` systems
+  to reserve large arenas upfront and be able to reuse the memory more effectively.
+-----------------------------------------------------------------------------*/
+
+#define MI_ARENA_BIN_COUNT      (MI_BIN_COUNT)
+#define MI_ARENA_MIN_SIZE       (MI_BCHUNK_BITS * MI_ARENA_SLICE_SIZE)           // 32 MiB (or 8 MiB on 32-bit)
+#define MI_ARENA_MAX_SIZE       (MI_BITMAP_MAX_BIT_COUNT * MI_ARENA_SLICE_SIZE)
+
+typedef struct mi_bitmap_s  mi_bitmap_t;    // atomic bitmap  (defined in `src/bitmap.h`)
+typedef struct mi_bbitmap_s mi_bbitmap_t;   // atomic binned bitmap (defined in `src/bitmap.h`)
+
+// A memory arena
+typedef struct mi_arena_s {
+  mi_memid_t          memid;                // provenance of the memory area
+  mi_subproc_t*       subproc;              // subprocess this arena belongs to (`this 'element-of' this->subproc->arenas`)
+
+  size_t              slice_count;          // total size of the area in arena slices (of `MI_ARENA_SLICE_SIZE`)
+  size_t              info_slices;          // initial slices reserved for the arena bitmaps
+  int                 numa_node;            // associated NUMA node
+  bool                is_exclusive;         // only allow allocations if specifically for this arena
+  _Atomic(mi_msecs_t) purge_expire;         // expiration time when slices can be purged from `slices_purge`.
+  mi_commit_fun_t*    commit_fun;           // custom commit/decommit memory
+  void*               commit_fun_arg;       // user argument for a custom commit function
+
+  mi_bbitmap_t*       slices_free;          // is the slice free? (a binned bitmap with size classes)
+  mi_bitmap_t*        slices_committed;     // is the slice committed? (i.e. accessible)
+  mi_bitmap_t*        slices_dirty;         // is the slice potentially non-zero?
+  mi_bitmap_t*        slices_purge;         // slices that can be purged
+  mi_bitmap_t*        pages;                // all registered pages (abandoned and owned)
+  mi_bitmap_t*        pages_abandoned[MI_ARENA_BIN_COUNT];  // abandoned pages per size bin (a set bit means the start of the page)
+                                            // the full queue contains abandoned full pages
+  // followed by the bitmaps (whose sizes depend on the arena size)
+  // note: when adding bitmaps revise `mi_arena_info_slices_needed`
+} mi_arena_t;
+
+
+/* -----------------------------------------------------------
+  Error codes passed to `_mi_fatal_error`
+  All are recoverable but EFAULT is a serious error and aborts by default in secure mode.
+  For portability define undefined error codes using common Unix codes:
+  <https://www-numi.fnal.gov/offline_software/srt_public_context/WebDocs/Errors/unix_system_errors.html>
+----------------------------------------------------------- */
+
+#ifndef EAGAIN         // double free
+#define EAGAIN (11)
+#endif
+#ifndef ENOMEM         // out of memory
+#define ENOMEM (12)
+#endif
+#ifndef EFAULT         // corrupted free-list or meta-data
+#define EFAULT (14)
+#endif
+#ifndef EINVAL         // trying to free an invalid pointer
+#define EINVAL (22)
+#endif
+#ifndef EOVERFLOW      // count*size overflow
+#define EOVERFLOW (75)
+#endif
+
+/* -----------------------------------------------------------
+  Debug constants
+----------------------------------------------------------- */
+
+#if !defined(MI_DEBUG_UNINIT)
+#define MI_DEBUG_UNINIT     (0xD0)
+#endif
+#if !defined(MI_DEBUG_FREED)
+#define MI_DEBUG_FREED      (0xDF)
+#endif
+#if !defined(MI_DEBUG_PADDING)
+#define MI_DEBUG_PADDING    (0xDE)
+#endif
+
+
+#endif // MI_TYPES_H
diff --git a/depends/mimalloc/mimalloc.pc.in b/depends/mimalloc/mimalloc.pc.in
index 36da2038845c..80922256ae0f 100644
--- a/depends/mimalloc/mimalloc.pc.in
+++ b/depends/mimalloc/mimalloc.pc.in
@@ -1,11 +1,11 @@
 prefix=@CMAKE_INSTALL_PREFIX@
-libdir=@libdir_for_pc_file@
-includedir=@includedir_for_pc_file@
+libdir=@mi_pc_libdir@
+includedir=@mi_pc_includedir@
 
 Name: @PROJECT_NAME@
 Description: A compact general purpose allocator with excellent performance
 Version: @PACKAGE_VERSION@
 URL: https://github.com/microsoft/mimalloc/
-Libs: -L${libdir} -lmimalloc
-Libs.private: @pc_libraries@
+Libs: -L${libdir} -l@mi_libname@
+Libs.private: @mi_pc_libraries@
 Cflags: -I${includedir}
diff --git a/depends/mimalloc/readme.md b/depends/mimalloc/readme.md
index fe2ead6905b9..71aaf7a24e83 100644
--- a/depends/mimalloc/readme.md
+++ b/depends/mimalloc/readme.md
@@ -9,24 +9,30 @@
 
 mimalloc (pronounced "me-malloc")
 is a general purpose allocator with excellent [performance](#performance) characteristics.
-Initially developed by Daan Leijen for the run-time systems of the
+Initially developed by Daan Leijen for the runtime systems of the
 [Koka](https://koka-lang.github.io) and [Lean](https://github.com/leanprover/lean) languages.
 
-Latest release tag: `v2.0.7` (2022-11-03).  
-Latest stable  tag: `v1.7.7` (2022-11-03).
+Latest release   : `v3.1.4` (beta) (2025-06-09).  
+Latest v2 release: `v2.2.4` (2025-06-09).  
+Latest v1 release: `v1.9.4` (2024-06-09).
 
 mimalloc is a drop-in replacement for `malloc` and can be used in other programs
 without code changes, for example, on dynamically linked ELF-based systems (Linux, BSD, etc.) you can use it as:
 ```
 > LD_PRELOAD=/usr/lib/libmimalloc.so  myprogram
 ```
-It also has an easy way to override the default allocator in [Windows](#override_on_windows). Notable aspects of the design include:
+It also includes a way to dynamically override the default allocator in [Windows](#override_on_windows). 
+Notable aspects of the design include:
 
-- __small and consistent__: the library is about 8k LOC using simple and
+- __small and consistent__: the library is about 10k LOC using simple and
   consistent data structures. This makes it very suitable
   to integrate and adapt in other projects. For runtime systems it
   provides hooks for a monotonic _heartbeat_ and deferred freeing (for
   bounded worst-case times with reference counting).
+  Partly due to its simplicity, mimalloc has been ported to many systems (Windows, macOS,
+  Linux, WASM, various BSD's, Haiku, MUSL, etc) and has excellent support for dynamic overriding.
+  At the same time, it is an industrial strength allocator that runs (very) large scale
+  distributed services on thousands of machines with excellent worst case latencies.
 - __free list sharding__: instead of one big free list (per size class) we have
   many smaller lists per "mimalloc page" which reduces fragmentation and
   increases locality --
@@ -36,13 +42,13 @@ It also has an easy way to override the default allocator in [Windows](#override
   per mimalloc page, but for each page we have multiple free lists. In particular, there
   is one list for thread-local `free` operations, and another one for concurrent `free`
   operations. Free-ing from another thread can now be a single CAS without needing
-  sophisticated coordination between threads. Since there will be 
+  sophisticated coordination between threads. Since there will be
   thousands of separate free lists, contention is naturally distributed over the heap,
   and the chance of contending on a single location will be low -- this is quite
   similar to randomized algorithms like skip lists where adding
   a random oracle removes the need for a more complex algorithm.
-- __eager page reset__: when a "page" becomes empty (with increased chance
-  due to free list sharding) the memory is marked to the OS as unused ("reset" or "purged")
+- __eager page purging__: when a "page" becomes empty (with increased chance
+  due to free list sharding) the memory is marked to the OS as unused (reset or decommitted)
   reducing (real) memory pressure and fragmentation, especially in long running
   programs.
 - __secure__: _mimalloc_ can be built in secure mode, adding guard pages,
@@ -50,35 +56,83 @@ It also has an easy way to override the default allocator in [Windows](#override
   heap vulnerabilities. The performance penalty is usually around 10% on average
   over our benchmarks.
 - __first-class heaps__: efficiently create and use multiple heaps to allocate across different regions.
-  A heap can be destroyed at once instead of deallocating each object separately.  
+  A heap can be destroyed at once instead of deallocating each object separately.
 - __bounded__: it does not suffer from _blowup_ \[1\], has bounded worst-case allocation
-  times (_wcat_), bounded space overhead (~0.2% meta-data, with low internal fragmentation),
-  and has no internal points of contention using only atomic operations.
+  times (_wcat_) (upto OS primitives), bounded space overhead (~0.2% meta-data, with low
+  internal fragmentation), and has no internal points of contention using only atomic operations.
 - __fast__: In our benchmarks (see [below](#performance)),
   _mimalloc_ outperforms other leading allocators (_jemalloc_, _tcmalloc_, _Hoard_, etc),
-  and often uses less memory. A nice property
-  is that it does consistently well over a wide range of benchmarks. There is also good huge OS page
-  support for larger server programs.
+  and often uses less memory. A nice property is that it does consistently well over a wide range
+  of benchmarks. There is also good huge OS page support for larger server programs.
 
 The [documentation](https://microsoft.github.io/mimalloc) gives a full overview of the API.
-You can read more on the design of _mimalloc_ in the [technical report](https://www.microsoft.com/en-us/research/publication/mimalloc-free-list-sharding-in-action) which also has detailed benchmark results.   
+You can read more on the design of _mimalloc_ in the [technical report](https://www.microsoft.com/en-us/research/publication/mimalloc-free-list-sharding-in-action) which also has detailed benchmark results.
 
-Enjoy!  
+Enjoy!
 
 ### Branches
 
-* `master`: latest stable release (based on `dev-slice`).
-* `dev`: development branch for mimalloc v1. Use this branch for submitting PR's.
-* `dev-slice`: development branch for mimalloc v2. This branch is downstream of `dev`.
+* `main`: latest stable release (still based on `dev2`).
+* `dev`:  development branch for mimalloc v1. Use this branch for submitting PR's.
+* `dev2`: development branch for mimalloc v2. This branch is downstream of `dev` 
+          (and is essentially equal to `dev` except for `src/segment.c`). Uses larger sliced segments to manage
+          mimalloc pages that can reduce fragmentation.
+* `dev3`: development branch for mimalloc v3 beta. This branch is downstream of `dev`. This version 
+          simplifies the lock-free ownership of previous versions, and improves sharing of memory between 
+          threads. On certain large workloads this version may use (much) less memory.
 
 ### Releases
 
-Note: the `v2.x` version has a new algorithm for managing internal mimalloc pages that tends to use reduce memory usage
-  and fragmentation compared to mimalloc `v1.x` (especially for large workloads). Should otherwise have similar performance
-  (see [below](#performance)); please report if you observe any significant performance regression.
-
-* 2022-11-03, `v1.7.7`, `v2.0.7`: Initial support for [Valgrind] for leak testing and heap block overflow detection. Initial
-  support for attaching heaps to a speficic memory area (only in v2). Fix `realloc` behavior for zero size blocks, remove restriction to integral multiple of the alignment in `alloc_align`, improved aligned allocation performance, reduced contention with many threads on few processors (thank you @dposluns!), vs2022 support, support `pkg-config`, .
+* 2025-06-09, `v1.9.4`, `v2.2.4`, `v3.1.4` (beta) : Some important bug fixes, including a case where OS memory
+  was not always fully released. Improved v3 performance, build on XBox, fix build on Android, support interpose 
+  for older macOS versions, use MADV_FREE_REUSABLE on macOS, always check commit success, better support for Windows 
+  fixed TLS offset, etc.
+* 2025-03-28, `v1.9.3`, `v2.2.3`, `v3.0.3` (beta) : Various small bug and build fixes, including:
+  fix arm32 pre v7 builds, fix mingw build, get runtime statistics, improve statistic commit counts, 
+  fix execution on non BMI1 x64 systems. 
+* 2025-03-06, `v1.9.2`, `v2.2.2`, `v3.0.2-beta`: Various small bug and build fixes. 
+  Add `mi_options_print`, `mi_arenas_print`, and the experimental `mi_stat_get` and `mi_stat_get_json`. 
+  Add `mi_thread_set_in_threadpool` and `mi_heap_set_numa_affinity` (v3 only). Add vcpkg portfile. 
+  Upgrade mimalloc-redirect to v1.3.2. `MI_OPT_ARCH` is off by default now but still assumes armv8.1-a on arm64
+  for fast atomic operations. Add QNX support.
+* 2025-01-03, `v1.8.9`, `v2.1.9`, `v3.0.1-alpha`: Interim release. Support Windows arm64. New [guarded](#guarded) build that can place OS 
+  guard pages behind objects to catch buffer overflows as they occur. 
+  Many small fixes: build on Windows arm64, cygwin, riscV, and dragonfly; fix Windows static library initialization to account for
+  thread local destructors (in Rust/C++); macOS tag change; macOS TLS slot fix; improve stats; 
+  consistent `mimalloc.dll` on Windows (instead of `mimalloc-override.dll`); fix mimalloc-redirect on Win11 H2; 
+  add 0-byte to canary; upstream CPython fixes; reduce .bss size; allow fixed TLS slot on Windows for improved performance.
+* 2024-05-21, `v1.8.7`, `v2.1.7`: Fix build issues on less common platforms. Started upstreaming patches
+  from the CPython [integration](https://github.com/python/cpython/issues/113141#issuecomment-2119255217). Upstream `vcpkg` patches.
+* 2024-05-13, `v1.8.6`, `v2.1.6`: Fix build errors on various (older) platforms. Refactored aligned allocation.
+* 2024-04-22, `v1.8.4`, `v2.1.4`: Fixes various bugs and build issues. Add `MI_LIBC_MUSL` cmake flag for musl builds.
+  Free-ing code is refactored into a separate module (`free.c`). Mimalloc page info is simplified with the block size
+  directly available (and new `block_size_shift` to improve aligned block free-ing).
+  New approach to collection of abandoned segments: When
+  a thread terminates the segments it owns are abandoned (containing still live objects) and these can be
+  reclaimed by other threads. We no longer use a list of abandoned segments but this is now done using bitmaps in arena's
+  which is more concurrent (and more aggressive). Abandoned memory can now also be reclaimed if a thread frees an object in
+  an abandoned page (which can be disabled using `mi_option_abandoned_reclaim_on_free`). The option `mi_option_max_segment_reclaim`
+  gives a maximum percentage of abandoned segments that can be reclaimed per try (=10%).
+
+* 2023-04-24, `v1.8.2`, `v2.1.2`: Fixes build issues on freeBSD, musl, and C17 (UE 5.1.1). Reduce code size/complexity
+  by removing regions and segment-cache's and only use arenas with improved memory purging -- this may improve memory
+  usage as well for larger services. Renamed options for consistency. Improved Valgrind and ASAN checking.
+
+* 2023-04-03, `v1.8.1`, `v2.1.1`: Fixes build issues on some platforms.
+
+* 2023-03-29, `v1.8.0`, `v2.1.0`: Improved support dynamic overriding on Windows 11. Improved tracing precision
+  with [asan](#asan) and [Valgrind](#valgrind), and added Windows event tracing [ETW](#ETW) (contributed by Xinglong He). Created an OS
+  abstraction layer to make it easier to port and separate platform dependent code (in `src/prim`). Fixed C++ STL compilation on older Microsoft C++ compilers, and various small bug fixes.
+
+* 2022-12-23, `v1.7.9`, `v2.0.9`: Supports building with [asan](#asan) and improved [Valgrind](#valgrind) support.
+  Support arbitrary large alignments (in particular for `std::pmr` pools).
+  Added C++ STL allocators attached to a specific heap (thanks @vmarkovtsev).
+  Heap walks now visit all object (including huge objects). Support Windows nano server containers (by Johannes Schindelin,@dscho).
+  Various small bug fixes.
+
+* 2022-11-03, `v1.7.7`, `v2.0.7`: Initial support for [Valgrind](#valgrind) for leak testing and heap block overflow
+  detection. Initial
+  support for attaching heaps to a specific memory area (only in v2). Fix `realloc` behavior for zero size blocks, remove restriction to integral multiple of the alignment in `alloc_align`, improved aligned allocation performance, reduced contention with many threads on few processors (thank you @dposluns!), vs2022 support, support `pkg-config`, .
 
 * 2022-04-14, `v1.7.6`, `v2.0.6`: fix fallback path for aligned OS allocation on Windows, improve Windows aligned allocation
   even when compiling with older SDK's, fix dynamic overriding on macOS Monterey, fix MSVC C++ dynamic overriding, fix
@@ -87,24 +141,10 @@ Note: the `v2.x` version has a new algorithm for managing internal mimalloc page
 
 * 2022-02-14, `v1.7.5`, `v2.0.5` (alpha): fix malloc override on
   Windows 11, fix compilation with musl, potentially reduced
-  committed memory, add `bin/minject` for Windows, 
+  committed memory, add `bin/minject` for Windows,
   improved wasm support, faster aligned allocation,
   various small fixes.
 
-* 2021-11-14, `v1.7.3`, `v2.0.3` (beta): improved WASM support, improved macOS support and performance (including
-  M1), improved performance for v2 for large objects, Python integration improvements, more standard
-  installation directories, various small fixes.
-
-* 2021-06-17, `v1.7.2`, `v2.0.2` (beta): support M1, better installation layout on Linux, fix
-  thread_id on Android, prefer 2-6TiB area for aligned allocation to work better on pre-windows 8, various small fixes.
-
-* 2021-04-06, `v1.7.1`, `v2.0.1` (beta): fix bug in arena allocation for huge pages, improved aslr on large allocations, initial M1 support (still experimental).
-  
-* 2021-01-31, `v2.0.0`: beta release 2.0: new slice algorithm for managing internal mimalloc pages.
-  
-* 2021-01-31, `v1.7.0`: stable release 1.7: support explicit user provided memory regions, more precise statistics,
-  improve macOS overriding, initial support for Apple M1, improved DragonFly support, faster memcpy on Windows, various small fixes.
-
 * [Older release notes](#older-release-notes)
 
 Special thanks to:
@@ -115,9 +155,9 @@ Special thanks to:
   memory model bugs using the [genMC] model checker.
 * Weipeng Liu (@pongba), Zhuowei Li, Junhua Wang, and Jakub Szymanski, for their early support of mimalloc and deployment
   at large scale services, leading to many improvements in the mimalloc algorithms for large workloads.
-* Jason Gibson (@jasongibson) for exhaustive testing on large scale workloads and server environments, and finding complex bugs 
+* Jason Gibson (@jasongibson) for exhaustive testing on large scale workloads and server environments, and finding complex bugs
   in (early versions of) `mimalloc`.
-* Manuel Pöter (@mpoeter) and Sam Gross(@colesbury) for finding an ABA concurrency issue in abandoned segment reclamation. Sam also created the [no GIL](https://github.com/colesbury/nogil) Python fork which 
+* Manuel Pöter (@mpoeter) and Sam Gross(@colesbury) for finding an ABA concurrency issue in abandoned segment reclamation. Sam also created the [no GIL](https://github.com/colesbury/nogil) Python fork which
   uses mimalloc internally.
 
 
@@ -138,14 +178,14 @@ mimalloc is used in various large scale low-latency services and programs, for e
 
 ## Windows
 
-Open `ide/vs2019/mimalloc.sln` in Visual Studio 2019 and build.
-The `mimalloc` project builds a static library (in `out/msvc-x64`), while the
-`mimalloc-override` project builds a DLL for overriding malloc
+Open `ide/vs2022/mimalloc.sln` in Visual Studio 2022 and build.
+The `mimalloc-lib` project builds a static library (in `out/msvc-x64`), while the
+`mimalloc-override-dll` project builds a DLL for overriding malloc
 in the entire program.
 
-## macOS, Linux, BSD, etc.
+## Linux, macOS, BSD, etc.
 
-We use [`cmake`](https://cmake.org)<sup>1</sup> as the build system:
+We use [`cmake`](https://cmake.org) as the build system:
 
 ```
 > mkdir -p out/release
@@ -168,32 +208,58 @@ maintains detailed statistics as:
 > cmake -DCMAKE_BUILD_TYPE=Debug ../..
 > make
 ```
+
 This will name the shared library as `libmimalloc-debug.so`.
 
-Finally, you can build a _secure_ version that uses guard pages, encrypted
-free lists, etc., as:
+Finally, you can build a _secure_ version that uses guard pages, encrypted free lists, etc., as:
+
 ```
 > mkdir -p out/secure
 > cd out/secure
 > cmake -DMI_SECURE=ON ../..
 > make
 ```
+
 This will name the shared library as `libmimalloc-secure.so`.
-Use `ccmake`<sup>2</sup> instead of `cmake`
-to see and customize all the available build options.
+Use `cmake ../.. -LH` to see all the available build options.
 
-Notes:
-1. Install CMake: `sudo apt-get install cmake`
-2. Install CCMake: `sudo apt-get install cmake-curses-gui`
+The examples use the default compiler. If you like to use another, use:
+
+```
+> CC=clang CXX=clang++ cmake ../..
+```
+
+## Cmake with Visual Studio
+
+You can also use cmake on Windows. Open a Visual Studio 2022 development prompt 
+and invoke `cmake` with the right [generator](https://cmake.org/cmake/help/latest/generator/Visual%20Studio%2017%202022.html) 
+and architecture, like:
+
+```
+> cmake ..\.. -G "Visual Studio 17 2022" -A x64 -DMI_OVERRIDE=ON
+```
+
+The cmake build type is specified when actually building, for example:
+
+```
+> cmake --build . --config=Release
+```
+
+You can also install the [LLVM toolset](https://learn.microsoft.com/en-us/cpp/build/clang-support-msbuild?view=msvc-170#install-1) 
+on Windows to build with the `clang-cl` compiler directly:
+
+```
+> cmake ../.. -G "Visual Studio 17 2022" -T ClangCl
+```
 
 
-## Single source
+## Single Source
 
 You can also directly build the single `src/static.c` file as part of your project without
 needing `cmake` at all. Make sure to also add the mimalloc `include` directory to the include path.
 
 
-# Using the library
+# Using the Library
 
 The preferred usage is including `<mimalloc.h>`, linking with
 the shared- or static library, and using the `mi_malloc` API exclusively for allocation. For example,
@@ -205,7 +271,7 @@ mimalloc uses only safe OS calls (`mmap` and `VirtualAlloc`) and can co-exist
 with other allocators linked to the same program.
 If you use `cmake`, you can simply use:
 ```
-find_package(mimalloc 1.4 REQUIRED)
+find_package(mimalloc 1.8 REQUIRED)
 ```
 in your `CMakeLists.txt` to find a locally installed mimalloc. Then use either:
 ```
@@ -218,8 +284,8 @@ target_link_libraries(myapp PUBLIC mimalloc-static)
 to link with the static library. See `test\CMakeLists.txt` for an example.
 
 For best performance in C++ programs, it is also recommended to override the
-global `new` and `delete` operators. For convience, mimalloc provides
-[`mimalloc-new-delete.h`](https://github.com/microsoft/mimalloc/blob/master/include/mimalloc-new-delete.h) which does this for you -- just include it in a single(!) source file in your project.
+global `new` and `delete` operators. For convenience, mimalloc provides
+[`mimalloc-new-delete.h`](include/mimalloc-new-delete.h) which does this for you -- just include it in a single(!) source file in your project.
 In C++, mimalloc also provides the `mi_stl_allocator` struct which implements the `std::allocator`
 interface.
 
@@ -266,46 +332,60 @@ completely and redirect all calls to the _mimalloc_ library instead .
 
 ## Environment Options
 
-You can set further options either programmatically (using [`mi_option_set`](https://microsoft.github.io/mimalloc/group__options.html)),
-or via environment variables:
+You can set further options either programmatically (using [`mi_option_set`](https://microsoft.github.io/mimalloc/group__options.html)), or via environment variables:
 
 - `MIMALLOC_SHOW_STATS=1`: show statistics when the program terminates.
 - `MIMALLOC_VERBOSE=1`: show verbose messages.
 - `MIMALLOC_SHOW_ERRORS=1`: show error and warning messages.
-- `MIMALLOC_PAGE_RESET=0`: by default, mimalloc will reset (or purge) OS pages that are not in use, to signal to the OS
-   that the underlying physical memory can be reused. This can reduce memory fragmentation in long running (server)
-   programs. By setting it to `0` this will no longer be done which can improve performance for batch-like programs.
-   As an alternative, the `MIMALLOC_RESET_DELAY=`<msecs> can be set higher (100ms by default) to make the page
-   reset occur less frequently instead of turning it off completely.
+
+Advanced options:
+
+- `MIMALLOC_ARENA_EAGER_COMMIT=2`: turns on eager commit for the large arenas (usually 1GiB) from which mimalloc
+   allocates segments and pages. Set this to 2 (default) to
+   only enable this on overcommit systems (e.g. Linux). Set this to 1 to enable explicitly on other systems
+   as well (like Windows or macOS) which may improve performance (as the whole arena is committed at once).
+   Note that eager commit only increases the commit but not the actual the peak resident set
+   (rss) so it is generally ok to enable this.
+- `MIMALLOC_PURGE_DELAY=N`: the delay in `N` milli-seconds (by default `10`) after which mimalloc will purge
+   OS pages that are not in use. This signals to the OS that the underlying physical memory can be reused which
+   can reduce memory fragmentation especially in long running (server) programs. Setting `N` to `0` purges immediately when
+   a page becomes unused which can improve memory usage but also decreases performance. Setting `N` to a higher
+   value like `100` can improve performance (sometimes by a lot) at the cost of potentially using more memory at times.
+   Setting it to `-1` disables purging completely.
+- `MIMALLOC_PURGE_DECOMMITS=1`: By default "purging" memory means unused memory is decommitted (`MEM_DECOMMIT` on Windows,
+   `MADV_DONTNEED` (which decresease rss immediately) on `mmap` systems). Set this to 0 to instead "reset" unused
+   memory on a purge (`MEM_RESET` on Windows, generally `MADV_FREE` (which does not decrease rss immediately) on `mmap` systems).
+   Mimalloc generally does not "free" OS memory but only "purges" OS memory, in other words, it tries to keep virtual
+   address ranges and decommits within those ranges (to make the underlying physical memory available to other processes).
+
+Further options for large workloads and services:
+
 - `MIMALLOC_USE_NUMA_NODES=N`: pretend there are at most `N` NUMA nodes. If not set, the actual NUMA nodes are detected
    at runtime. Setting `N` to 1 may avoid problems in some virtual environments. Also, setting it to a lower number than
    the actual NUMA nodes is fine and will only cause threads to potentially allocate more memory across actual NUMA
    nodes (but this can happen in any case as NUMA local allocation is always a best effort but not guaranteed).
-- `MIMALLOC_LARGE_OS_PAGES=1`: use large OS pages (2MiB) when available; for some workloads this can significantly
-   improve performance. Use `MIMALLOC_VERBOSE` to check if the large OS pages are enabled -- usually one needs
-   to explicitly allow large OS pages (as on [Windows][windows-huge] and [Linux][linux-huge]). However, sometimes
+- `MIMALLOC_ALLOW_LARGE_OS_PAGES=0`: Set to 1 to use large OS pages (2 or 4MiB) when available; for some workloads this can significantly
+   improve performance. When this option is disabled (default), it also disables transparent huge pages (THP) for the process
+   (on Linux and Android). On Linux the default setting is 2 -- this enables the use of large pages through THP only.
+   Use `MIMALLOC_VERBOSE` to check if the large OS pages are enabled -- usually one needs
+   to explicitly give permissions for large OS pages (as on [Windows][windows-huge] and [Linux][linux-huge]). However, sometimes
    the OS is very slow to reserve contiguous physical memory for large OS pages so use with care on systems that
    can have fragmented memory (for that reason, we generally recommend to use `MIMALLOC_RESERVE_HUGE_OS_PAGES` instead whenever possible).
-   <!--
-   - `MIMALLOC_EAGER_REGION_COMMIT=1`: on Windows, commit large (256MiB) regions eagerly. On Windows, these regions
-   show in the working set even though usually just a small part is committed to physical memory. This is why it
-   turned off by default on Windows as it looks not good in the task manager. However, turning it on has no
-   real drawbacks and may improve performance by a little.
-   -->
-- `MIMALLOC_RESERVE_HUGE_OS_PAGES=N`: where N is the number of 1GiB _huge_ OS pages. This reserves the huge pages at
+- `MIMALLOC_RESERVE_HUGE_OS_PAGES=N`: where `N` is the number of 1GiB _huge_ OS pages. This reserves the huge pages at
    startup and sometimes this can give a large (latency) performance improvement on big workloads.
-   Usually it is better to not use
-   `MIMALLOC_LARGE_OS_PAGES` in combination with this setting. Just like large OS pages, use with care as reserving
+   Usually it is better to not use `MIMALLOC_ALLOW_LARGE_OS_PAGES=1` in combination with this setting. Just like large
+   OS pages, use with care as reserving
    contiguous physical memory can take a long time when memory is fragmented (but reserving the huge pages is done at
    startup only once).
-   Note that we usually need to explicitly enable huge OS pages (as on [Windows][windows-huge] and [Linux][linux-huge])).
+   Note that we usually need to explicitly give permission for huge OS pages (as on [Windows][windows-huge] and [Linux][linux-huge])).
    With huge OS pages, it may be beneficial to set the setting
    `MIMALLOC_EAGER_COMMIT_DELAY=N` (`N` is 1 by default) to delay the initial `N` segments (of 4MiB)
    of a thread to not allocate in the huge OS pages; this prevents threads that are short lived
-   and allocate just a little to take up space in the huge OS page area (which cannot be reset).
+   and allocate just a little to take up space in the huge OS page area (which cannot be purged as huge OS pages are pinned
+   to physical memory).
    The huge pages are usually allocated evenly among NUMA nodes.
-   We can use `MIMALLOC_RESERVE_HUGE_OS_PAGES_AT=N` where `N` is the numa node (starting at 0) to allocate all 
-   the huge pages at a specific numa node instead. 
+   We can use `MIMALLOC_RESERVE_HUGE_OS_PAGES_AT=N` where `N` is the numa node (starting at 0) to allocate all
+   the huge pages at a specific numa node instead.
 
 Use caution when using `fork` in combination with either large or huge OS pages: on a fork, the OS uses copy-on-write
 for all pages in the original process including the huge OS pages. When any memory is now written in that area, the
@@ -333,50 +413,38 @@ As always, evaluate with care as part of an overall security strategy as all of
 
 ## Debug Mode
 
-When _mimalloc_ is built using debug mode, various checks are done at runtime to catch development errors.
+When _mimalloc_ is built using debug mode, (`-DCMAKE_BUILD_TYPE=Debug`), 
+various checks are done at runtime to catch development errors.
 
 - Statistics are maintained in detail for each object size. They can be shown using `MIMALLOC_SHOW_STATS=1` at runtime.
 - All objects have padding at the end to detect (byte precise) heap block overflows.
 - Double free's, and freeing invalid heap pointers are detected.
 - Corrupted free-lists and some forms of use-after-free are detected.
 
-## Valgrind
+## Guarded Mode
 
-Generally, we recommend using the standard allocator with the amazing [Valgrind] tool (and 
-also for other address sanitizers). 
-However, it is possible to build mimalloc with Valgrind support. This has a small performance 
-overhead but does allow detecting memory leaks and byte-precise buffer overflows directly on final 
-executables. To build with valgrind support, use the `MI_VALGRIND=ON` cmake option:
+<span id="guarded">_mimalloc_ can be build in guarded mode using the `-DMI_GUARDED=ON` flags in `cmake`.</span>
+This enables placing OS guard pages behind certain object allocations to catch buffer overflows as they occur.
+This can be invaluable to catch buffer-overflow bugs in large programs. However, it also means that any object
+allocated with a guard page takes at least 8 KiB memory for the guard page and its alignment. As such, allocating
+a guard page for every allocation may be too expensive both in terms of memory, and in terms of performance with
+many system calls. Therefore, there are various environment variables (and options) to tune this:
 
-```
-> cmake ../.. -DMI_VALGRIND=ON
-```
+- `MIMALLOC_GUARDED_SAMPLE_RATE=N`: Set the sample rate to `N` (by default 4000). This mode places a guard page
+  behind every `N` suitable object allocations (per thread). Since the performance in guarded mode without placing
+  guard pages is close to release mode, this can be used to enable guard pages even in production to catch latent 
+  buffer overflow bugs. Set the sample rate to `1` to guard every object, and to `0` to place no guard pages at all.
 
-This can also be combined with secure mode or debug mode. 
-You can then run your programs directly under valgrind:
+- `MIMALLOC_GUARDED_SAMPLE_SEED=N`: Start sampling at `N` (by default random). Can be used to reproduce a buffer
+  overflow if needed.
 
-```
-> valgrind <myprogram>
-```
+- `MIMALLOC_GUARDED_MIN=N`, `MIMALLOC_GUARDED_MAX=N`: Minimal and maximal _rounded_ object sizes for which a guard 
+  page is considered (`0` and `1GiB` respectively). If you suspect a buffer overflow occurs with an object of size
+  141, set the minimum and maximum to `148` and the sample rate to `1` to have all of those guarded.
 
-If you rely on overriding `malloc`/`free` by mimalloc (instead of using the `mi_malloc`/`mi_free` API directly), 
-you also need to tell `valgrind` to not intercept those calls itself, and use:
-
-```
-> MIMALLOC_SHOW_STATS=1 valgrind  --soname-synonyms=somalloc=*mimalloc* -- <myprogram>
-```
-
-By setting the `MIMALLOC_SHOW_STATS` environment variable you can check that mimalloc is indeed
-used and not the standard allocator. Even though the [Valgrind option][valgrind-soname] 
-is called `--soname-synonyms`, this also 
-works when overriding with a static library or object file. Unfortunately, it is not possible to
-dynamically override mimalloc using `LD_PRELOAD` together with `valgrind`.
-See also the `test/test-wrong.c` file to test with `valgrind`.
-
-Valgrind support is in its initial development -- please report any issues.
-
-[Valgrind]: https://valgrind.org/
-[valgrind-soname]: https://valgrind.org/docs/manual/manual-core.html#opt.soname-synonyms
+- `MIMALLOC_GUARDED_PRECISE=1`: If we have an object of size 13, we would usually place it an aligned 16 bytes in
+  front of the guard page. Using `MIMALLOC_GUARDED_PRECISE` places it exactly 13 bytes before a page so that even
+  a 1 byte overflow is detected. This violates the C/C++ minimal alignment guarantees though so use with care.
 
 
 # Overriding Standard Malloc
@@ -387,7 +455,7 @@ Overriding the standard `malloc` (and `new`) can be done either _dynamically_ or
 
 This is the recommended way to override the standard malloc interface.
 
-### Override on Linux, BSD
+### Dynamic Override on Linux, BSD
 
 On these ELF-based systems we preload the mimalloc shared
 library so all calls to the standard `malloc` interface are
@@ -406,7 +474,7 @@ or run with the debug version to get detailed statistics:
 > env MIMALLOC_SHOW_STATS=1 LD_PRELOAD=/usr/lib/libmimalloc-debug.so myprogram
 ```
 
-### Override on MacOS
+### Dynamic Override on MacOS
 
 On macOS we can also preload the mimalloc shared
 library so all calls to the standard `malloc` interface are
@@ -419,55 +487,163 @@ Note that certain security restrictions may apply when doing this from
 the [shell](https://stackoverflow.com/questions/43941322/dyld-insert-libraries-ignored-when-calling-application-through-bash).
 
 
-### Override on Windows
+### Dynamic Override on Windows
+
+<span id="override_on_windows">We use a separate redirection DLL to override mimalloc on Windows</span> 
+such that we redirect all malloc/free calls that go through the (dynamic) C runtime allocator, 
+including those from other DLL's or libraries. As it intercepts all allocation calls on a low level, 
+it can be used on large programs that include other 3rd party components.
+There are four requirements to make the overriding work well:
 
-<span id="override_on_windows">Overriding on Windows</span> is robust and has the
-particular advantage to be able to redirect all malloc/free calls that go through
-the (dynamic) C runtime allocator, including those from other DLL's or libraries.
+1. Use the C-runtime library as a DLL (using the `/MD` or `/MDd` switch).
 
-The overriding on Windows requires that you link your program explicitly with
-the mimalloc DLL and use the C-runtime library as a DLL (using the `/MD` or `/MDd` switch).
-Also, the `mimalloc-redirect.dll` (or `mimalloc-redirect32.dll`) must be put
-in the same folder as the main `mimalloc-override.dll` at runtime (as it is a dependency).
-The redirection DLL ensures that all calls to the C runtime malloc API get redirected to
-mimalloc (in `mimalloc-override.dll`).
+2. Link your program explicitly with the `mimalloc.dll.lib` export library for the `mimalloc.dll`.
+   (which must be compiled with `-DMI_OVERRIDE=ON`, which is the default though).
+   To ensure the `mimalloc.dll` is actually loaded at run-time it is easiest 
+   to insert some call to the mimalloc API in the `main` function, like `mi_version()`
+   (or use the `/include:mi_version` switch on the linker command, or
+   similarly, `#pragma comment(linker, "/include:mi_version")` in some source file). 
+   See the `mimalloc-test-override` project for an example on how to use this. 
 
-To ensure the mimalloc DLL is loaded at run-time it is easiest to insert some
-call to the mimalloc API in the `main` function, like `mi_version()`
-(or use the `/INCLUDE:mi_version` switch on the linker). See the `mimalloc-override-test` project
-for an example on how to use this. For best performance on Windows with C++, it
-is also recommended to also override the `new`/`delete` operations (by including
-[`mimalloc-new-delete.h`](https://github.com/microsoft/mimalloc/blob/master/include/mimalloc-new-delete.h) a single(!) source file in your project).
+3. The `mimalloc-redirect.dll` must be put in the same directory as the main 
+   `mimalloc.dll` at runtime (as it is a dependency of that DLL).
+   The redirection DLL ensures that all calls to the C runtime malloc API get 
+   redirected to mimalloc functions (which reside in `mimalloc.dll`).
+
+4. Ensure the `mimalloc.dll` comes as early as possible in the import
+   list of the final executable (so it can intercept all potential allocations).
+   You can use `minject -l <exe>` to check this if needed.
+
+For best performance on Windows with C++, it is also recommended to also override 
+the `new`/`delete` operations (by including [`mimalloc-new-delete.h`](include/mimalloc-new-delete.h)
+a single(!) source file in your project).
 
 The environment variable `MIMALLOC_DISABLE_REDIRECT=1` can be used to disable dynamic
-overriding at run-time. Use `MIMALLOC_VERBOSE=1` to check if mimalloc was successfully redirected.
+overriding at run-time. Use `MIMALLOC_VERBOSE=1` to check if mimalloc was successfully 
+redirected.
 
-(Note: in principle, it is possible to even patch existing executables without any recompilation
-if they are linked with the dynamic C runtime (`ucrtbase.dll`) -- just put the `mimalloc-override.dll`
-into the import table (and put `mimalloc-redirect.dll` in the same folder)
-Such patching can be done for example with [CFF Explorer](https://ntcore.com/?page_id=388)).
+For different platforms than x64, you may need a specific [redirection dll](bin).
+Furthermore, we cannot always re-link an executable or ensure `mimalloc.dll` comes
+first in the import table. In such cases the [`minject`](bin) tool can be used
+to patch the executable's import tables.
 
 
 ## Static override
 
 On Unix-like systems, you can also statically link with _mimalloc_ to override the standard
 malloc interface. The recommended way is to link the final program with the
-_mimalloc_ single object file (`mimalloc-override.o`). We use
+_mimalloc_ single object file (`mimalloc.o`). We use
 an object file instead of a library file as linkers give preference to
 that over archives to resolve symbols. To ensure that the standard
 malloc interface resolves to the _mimalloc_ library, link it as the first
 object file. For example:
+
 ```
-> gcc -o myprogram mimalloc-override.o  myfile1.c ...
+> gcc -o myprogram mimalloc.o  myfile1.c ...
 ```
 
 Another way to override statically that works on all platforms, is to
 link statically to mimalloc (as shown in the introduction) and include a
 header file in each source file that re-defines `malloc` etc. to `mi_malloc`.
-This is provided by [`mimalloc-override.h`](https://github.com/microsoft/mimalloc/blob/master/include/mimalloc-override.h). This only works reliably though if all sources are
+This is provided by [`mimalloc-override.h`](include/mimalloc-override.h). This only works 
+reliably though if all sources are
 under your control or otherwise mixing of pointers from different heaps may occur!
 
 
+# Tools
+
+Generally, we recommend using the standard allocator with memory tracking tools, but mimalloc
+can also be build to support the [address sanitizer][asan] or the excellent [Valgrind] tool.
+Moreover, it can be build to support Windows event tracing ([ETW]).
+This has a small performance overhead but does allow detecting memory leaks and byte-precise
+buffer overflows directly on final executables. See also the `test/test-wrong.c` file to test with various tools.
+
+## Valgrind
+
+To build with [valgrind] support, use the `MI_TRACK_VALGRIND=ON` cmake option:
+
+```
+> cmake ../.. -DMI_TRACK_VALGRIND=ON
+```
+
+This can also be combined with secure mode or debug mode.
+You can then run your programs directly under valgrind:
+
+```
+> valgrind <myprogram>
+```
+
+If you rely on overriding `malloc`/`free` by mimalloc (instead of using the `mi_malloc`/`mi_free` API directly),
+you also need to tell `valgrind` to not intercept those calls itself, and use:
+
+```
+> MIMALLOC_SHOW_STATS=1 valgrind  --soname-synonyms=somalloc=*mimalloc* -- <myprogram>
+```
+
+By setting the `MIMALLOC_SHOW_STATS` environment variable you can check that mimalloc is indeed
+used and not the standard allocator. Even though the [Valgrind option][valgrind-soname]
+is called `--soname-synonyms`, this also works when overriding with a static library or object file.
+To dynamically override mimalloc using `LD_PRELOAD` together with `valgrind`, use:
+
+```
+> valgrind --trace-children=yes --soname-synonyms=somalloc=*mimalloc* /usr/bin/env LD_PRELOAD=/usr/lib/libmimalloc.so -- <myprogram>
+```
+
+See also the `test/test-wrong.c` file to test with `valgrind`.
+
+Valgrind support is in its initial development -- please report any issues.
+
+[Valgrind]: https://valgrind.org/
+[valgrind-soname]: https://valgrind.org/docs/manual/manual-core.html#opt.soname-synonyms
+
+## ASAN
+
+To build with the address sanitizer, use the `-DMI_TRACK_ASAN=ON` cmake option:
+
+```
+> cmake ../.. -DMI_TRACK_ASAN=ON
+```
+
+This can also be combined with secure mode or debug mode.
+You can then run your programs as:'
+
+```
+> ASAN_OPTIONS=verbosity=1 <myprogram>
+```
+
+When you link a program with an address sanitizer build of mimalloc, you should
+generally compile that program too with the address sanitizer enabled.
+For example, assuming you build mimalloc in `out/debug`:
+
+```
+clang -g -o test-wrong -Iinclude test/test-wrong.c out/debug/libmimalloc-asan-debug.a -lpthread -fsanitize=address -fsanitize-recover=address
+```
+
+Since the address sanitizer redirects the standard allocation functions, on some platforms (macOSX for example)
+it is required to compile mimalloc with `-DMI_OVERRIDE=OFF`.
+Address sanitizer support is in its initial development -- please report any issues.
+
+[asan]: https://github.com/google/sanitizers/wiki/AddressSanitizer
+
+## ETW
+
+Event tracing for Windows ([ETW]) provides a high performance way to capture all allocations though
+mimalloc and analyze them later. To build with ETW support, use the `-DMI_TRACK_ETW=ON` cmake option.
+
+You can then capture an allocation trace using the Windows performance recorder (WPR), using the
+`src/prim/windows/etw-mimalloc.wprp` profile. In an admin prompt, you can use:
+```
+> wpr -start src\prim\windows\etw-mimalloc.wprp -filemode
+> <my_mimalloc_program>
+> wpr -stop <my_mimalloc_program>.etl
+```
+and then open `<my_mimalloc_program>.etl` in the Windows Performance Analyzer (WPA), or
+use a tool like [TraceControl] that is specialized for analyzing mimalloc traces.
+
+[ETW]: https://learn.microsoft.com/en-us/windows-hardware/test/wpt/event-tracing-for-windows
+[TraceControl]: https://github.com/xinglonghe/TraceControl
+
+
 # Performance
 
 Last update: 2021-01-30
@@ -573,7 +749,7 @@ The _alloc-test_, by
 [OLogN Technologies AG](http://ithare.com/testing-memory-allocators-ptmalloc2-tcmalloc-hoard-jemalloc-while-trying-to-simulate-real-world-loads/), is a very allocation intensive benchmark doing millions of
 allocations in various size classes. The test is scaled such that when an
 allocator performs almost identically on _alloc-test1_ as _alloc-testN_ it
-means that it scales linearly. 
+means that it scales linearly.
 
 The _sh6bench_ and _sh8bench_ benchmarks are
 developed by [MicroQuill](http://www.microquill.com/) as part of SmartHeap.
@@ -728,6 +904,16 @@ provided by the bot. You will only need to do this once across all repos using o
 
 # Older Release Notes
 
+* 2021-11-14, `v1.7.3`, `v2.0.3` (beta): improved WASM support, improved macOS support and performance (including
+  M1), improved performance for v2 for large objects, Python integration improvements, more standard
+  installation directories, various small fixes.
+* 2021-06-17, `v1.7.2`, `v2.0.2` (beta): support M1, better installation layout on Linux, fix
+  thread_id on Android, prefer 2-6TiB area for aligned allocation to work better on pre-windows 8, various small fixes.
+* 2021-04-06, `v1.7.1`, `v2.0.1` (beta): fix bug in arena allocation for huge pages, improved aslr on large allocations, initial M1 support (still experimental).
+* 2021-01-31, `v2.0.0`: beta release 2.0: new slice algorithm for managing internal mimalloc pages.
+* 2021-01-31, `v1.7.0`: stable release 1.7: support explicit user provided memory regions, more precise statistics,
+  improve macOS overriding, initial support for Apple M1, improved DragonFly support, faster memcpy on Windows, various small fixes.
+
 * 2020-09-24, `v1.6.7`: stable release 1.6: using standard C atomics, passing tsan testing, improved
   handling of failing to commit on Windows, add [`mi_process_info`](https://github.com/microsoft/mimalloc/blob/master/include/mimalloc.h#L156) api call.
 * 2020-08-06, `v1.6.4`: stable release 1.6: improved error recovery in low-memory situations,
@@ -749,9 +935,9 @@ provided by the bot. You will only need to do this once across all repos using o
 more eager concurrent free, addition of STL allocator, fixed potential memory leak.
 * 2020-01-15, `v1.3.0`: stable release 1.3: bug fixes, improved randomness and [stronger
 free list encoding](https://github.com/microsoft/mimalloc/blob/783e3377f79ee82af43a0793910a9f2d01ac7863/include/mimalloc-internal.h#L396) in secure mode.
+
 * 2019-12-22, `v1.2.2`: stable release 1.2: minor updates.
 * 2019-11-22, `v1.2.0`: stable release 1.2: bug fixes, improved secure mode (free list corruption checks, double free mitigation). Improved dynamic overriding on Windows.
 * 2019-10-07, `v1.1.0`: stable release 1.1.
 * 2019-09-01, `v1.0.8`: pre-release 8: more robust windows dynamic overriding, initial huge page support.
 * 2019-08-10, `v1.0.6`: pre-release 6: various performance improvements.
-
diff --git a/depends/mimalloc/src/alloc-aligned.c b/depends/mimalloc/src/alloc-aligned.c
index 9614aa092ee0..6b8bc7620f5c 100644
--- a/depends/mimalloc/src/alloc-aligned.c
+++ b/depends/mimalloc/src/alloc-aligned.c
@@ -6,99 +6,204 @@ terms of the MIT license. A copy of the license can be found in the file
 -----------------------------------------------------------------------------*/
 
 #include "mimalloc.h"
-#include "mimalloc-internal.h"
+#include "mimalloc/internal.h"
+#include "mimalloc/prim.h"  // mi_prim_get_default_heap
 
-#include <string.h>  // memset
+#include <string.h>     // memset
 
 // ------------------------------------------------------
 // Aligned Allocation
 // ------------------------------------------------------
 
-// Fallback primitive aligned allocation -- split out for better codegen
-static mi_decl_noinline void* mi_heap_malloc_zero_aligned_at_fallback(mi_heap_t* const heap, const size_t size, const size_t alignment, const size_t offset, const bool zero) mi_attr_noexcept
-{
-  mi_assert_internal(size <= PTRDIFF_MAX);
-  mi_assert_internal(alignment!=0 && _mi_is_power_of_two(alignment) && alignment <= MI_ALIGNMENT_MAX);
+static bool mi_malloc_is_naturally_aligned( size_t size, size_t alignment ) {
+  // objects up to `MI_PAGE_MIN_BLOCK_ALIGN` are always allocated aligned to their size
+  mi_assert_internal(_mi_is_power_of_two(alignment) && (alignment > 0));
+  if (alignment > size) return false;
+  const size_t bsize = mi_good_size(size);
+  const bool ok = (bsize <= MI_PAGE_MAX_START_BLOCK_ALIGN2 && _mi_is_power_of_two(bsize));
+  if (ok) { mi_assert_internal((bsize & (alignment-1)) == 0); } // since both power of 2 and alignment <= size
+  return ok;
+}
 
-  const uintptr_t align_mask = alignment-1;  // for any x, `(x & align_mask) == (x % alignment)`
-  const size_t padsize = size + MI_PADDING_SIZE;
+#if MI_GUARDED
+static mi_decl_restrict void* mi_heap_malloc_guarded_aligned(mi_heap_t* heap, size_t size, size_t alignment, bool zero) mi_attr_noexcept {
+  // use over allocation for guarded blocksl
+  mi_assert_internal(alignment > 0 && alignment < MI_PAGE_MAX_OVERALLOC_ALIGN);
+  const size_t oversize = size + alignment - 1;
+  void* base = _mi_heap_malloc_guarded(heap, oversize, zero);
+  void* p = _mi_align_up_ptr(base, alignment);
+  mi_track_align(base, p, (uint8_t*)p - (uint8_t*)base, size);
+  mi_assert_internal(mi_usable_size(p) >= size);
+  mi_assert_internal(_mi_is_aligned(p, alignment));
+  return p;
+}
 
-  // use regular allocation if it is guaranteed to fit the alignment constraints
-  if (offset==0 && alignment<=padsize && padsize<=MI_MAX_ALIGN_GUARANTEE && (padsize&align_mask)==0) {
-    void* p = _mi_heap_malloc_zero(heap, size, zero);
-    mi_assert_internal(p == NULL || ((uintptr_t)p % alignment) == 0);
-    return p;
-  }
+static void* mi_heap_malloc_zero_no_guarded(mi_heap_t* heap, size_t size, bool zero) {
+  const size_t rate = heap->guarded_sample_rate;
+  // only write if `rate!=0` so we don't write to the constant `_mi_heap_empty`
+  if (rate != 0) { heap->guarded_sample_rate = 0; }
+  void* p = _mi_heap_malloc_zero(heap, size, zero);
+  if (rate != 0) { heap->guarded_sample_rate = rate; }
+  return p;
+}
+#else
+static void* mi_heap_malloc_zero_no_guarded(mi_heap_t* heap, size_t size, bool zero) {
+  return _mi_heap_malloc_zero(heap, size, zero);
+}
+#endif
 
-  // otherwise over-allocate
-  const size_t oversize = size + alignment - 1;
-  void* p = _mi_heap_malloc_zero(heap, oversize, zero);
-  if (p == NULL) return NULL;
+// Fallback aligned allocation that over-allocates -- split out for better codegen
+static mi_decl_noinline void* mi_heap_malloc_zero_aligned_at_overalloc(mi_heap_t* const heap, const size_t size, const size_t alignment, const size_t offset, const bool zero) mi_attr_noexcept
+{
+  mi_assert_internal(size <= (MI_MAX_ALLOC_SIZE - MI_PADDING_SIZE));
+  mi_assert_internal(alignment != 0 && _mi_is_power_of_two(alignment));
+
+  void* p;
+  size_t oversize;
+  if mi_unlikely(alignment > MI_PAGE_MAX_OVERALLOC_ALIGN) {
+    // use OS allocation for large alignments and allocate inside a singleton page (not in an arena)
+    // This can support alignments >= MI_PAGE_ALIGN by ensuring the object can be aligned
+    // in the first (and single) page such that the page info is `MI_PAGE_ALIGN` bytes before it (and can be found in the _mi_page_map).
+    if mi_unlikely(offset != 0) {
+      // todo: cannot support offset alignment for very large alignments yet
+      #if MI_DEBUG > 0
+      _mi_error_message(EOVERFLOW, "aligned allocation with a large alignment cannot be used with an alignment offset (size %zu, alignment %zu, offset %zu)\n", size, alignment, offset);
+      #endif
+      return NULL;
+    }
+    oversize = (size <= MI_SMALL_SIZE_MAX ? MI_SMALL_SIZE_MAX + 1 /* ensure we use generic malloc path */ : size);
+    // note: no guarded as alignment > 0
+    p = _mi_heap_malloc_zero_ex(heap, oversize, zero, alignment); // the page block size should be large enough to align in the single huge page block
+    if (p == NULL) return NULL;
+  }
+  else {
+    // otherwise over-allocate
+    oversize = (size < MI_MAX_ALIGN_SIZE ? MI_MAX_ALIGN_SIZE : size) + alignment - 1;  // adjust for size <= 16; with size 0 and aligment 64k, we would allocate a 64k block and pointing just beyond that.
+    p = mi_heap_malloc_zero_no_guarded(heap, oversize, zero);
+    if (p == NULL) return NULL;
+  }
+  mi_page_t* page = _mi_ptr_page(p);
 
   // .. and align within the allocation
-  uintptr_t adjust = alignment - (((uintptr_t)p + offset) & align_mask);
-  mi_assert_internal(adjust <= alignment);
-  void* aligned_p = (adjust == alignment ? p : (void*)((uintptr_t)p + adjust));
-  if (aligned_p != p) mi_page_set_has_aligned(_mi_ptr_page(p), true);
+  const uintptr_t align_mask = alignment - 1;  // for any x, `(x & align_mask) == (x % alignment)`
+  const uintptr_t poffset = ((uintptr_t)p + offset) & align_mask;
+  const uintptr_t adjust  = (poffset == 0 ? 0 : alignment - poffset);
+  mi_assert_internal(adjust < alignment);
+  void* aligned_p = (void*)((uintptr_t)p + adjust);
+  if (aligned_p != p) {
+    mi_page_set_has_aligned(page, true);
+    #if MI_GUARDED
+    // set tag to aligned so mi_usable_size works with guard pages
+    if (adjust >= sizeof(mi_block_t)) {
+      mi_block_t* const block = (mi_block_t*)p;
+      block->next = MI_BLOCK_TAG_ALIGNED;
+    }
+    #endif
+    _mi_padding_shrink(page, (mi_block_t*)p, adjust + size);
+  }
+  // todo: expand padding if overallocated ?
+
+  mi_assert_internal(mi_page_usable_block_size(page) >= adjust + size);
   mi_assert_internal(((uintptr_t)aligned_p + offset) % alignment == 0);
-  mi_assert_internal(p == _mi_page_ptr_unalign(_mi_ptr_segment(aligned_p), _mi_ptr_page(aligned_p), aligned_p));
+  mi_assert_internal(mi_usable_size(aligned_p)>=size);
+  mi_assert_internal(mi_usable_size(p) == mi_usable_size(aligned_p)+adjust);
+  #if MI_DEBUG > 1
+  mi_page_t* const apage = _mi_ptr_page(aligned_p);
+  void* unalign_p = _mi_page_ptr_unalign(apage, aligned_p);
+  mi_assert_internal(p == unalign_p);
+  #endif
+
+  // now zero the block if needed
+  //if (alignment > MI_PAGE_MAX_OVERALLOC_ALIGN) {
+  //  // for the tracker, on huge aligned allocations only from the start of the large block is defined
+  //  mi_track_mem_undefined(aligned_p, size);
+  //  if (zero) {
+  //    _mi_memzero_aligned(aligned_p, mi_usable_size(aligned_p));
+  //  }
+  //}
 
-  #if MI_TRACK_ENABLED
   if (p != aligned_p) {
-    mi_track_free(p);
-    mi_track_malloc(aligned_p,size,zero);
-  }
-  else {
-    mi_track_resize(aligned_p,oversize,size);
+    mi_track_align(p,aligned_p,adjust,mi_usable_size(aligned_p));
+    #if MI_GUARDED
+    mi_track_mem_defined(p, sizeof(mi_block_t));
+    #endif
   }
-  #endif
   return aligned_p;
 }
 
-// Primitive aligned allocation
-static void* mi_heap_malloc_zero_aligned_at(mi_heap_t* const heap, const size_t size, const size_t alignment, const size_t offset, const bool zero) mi_attr_noexcept
+// Generic primitive aligned allocation -- split out for better codegen
+static mi_decl_noinline void* mi_heap_malloc_zero_aligned_at_generic(mi_heap_t* const heap, const size_t size, const size_t alignment, const size_t offset, const bool zero) mi_attr_noexcept
 {
-  // note: we don't require `size > offset`, we just guarantee that the address at offset is aligned regardless of the allocated size.
-  mi_assert(alignment > 0);
-  if mi_unlikely(alignment==0 || !_mi_is_power_of_two(alignment)) { // require power-of-two (see <https://en.cppreference.com/w/c/memory/aligned_alloc>)
+  mi_assert_internal(alignment != 0 && _mi_is_power_of_two(alignment));
+  // we don't allocate more than MI_MAX_ALLOC_SIZE (see <https://sourceware.org/ml/libc-announce/2019/msg00001.html>)
+  if mi_unlikely(size > (MI_MAX_ALLOC_SIZE - MI_PADDING_SIZE)) {
     #if MI_DEBUG > 0
-    _mi_error_message(EOVERFLOW, "aligned allocation requires the alignment to be a power-of-two (size %zu, alignment %zu)\n", size, alignment);
+    _mi_error_message(EOVERFLOW, "aligned allocation request is too large (size %zu, alignment %zu)\n", size, alignment);
     #endif
     return NULL;
   }
-  if mi_unlikely(alignment > MI_ALIGNMENT_MAX) {  // we cannot align at a boundary larger than this (or otherwise we cannot find segment headers)
-    #if MI_DEBUG > 0
-    _mi_error_message(EOVERFLOW, "aligned allocation has a maximum alignment of %zu (size %zu, alignment %zu)\n", MI_ALIGNMENT_MAX, size, alignment);
-    #endif
-    return NULL;
+
+  // use regular allocation if it is guaranteed to fit the alignment constraints.
+  // this is important to try as the fast path in `mi_heap_malloc_zero_aligned` only works when there exist
+  // a page with the right block size, and if we always use the over-alloc fallback that would never happen.
+  if (offset == 0 && mi_malloc_is_naturally_aligned(size,alignment)) {
+    void* p = mi_heap_malloc_zero_no_guarded(heap, size, zero);
+    mi_assert_internal(p == NULL || ((uintptr_t)p % alignment) == 0);
+    const bool is_aligned_or_null = (((uintptr_t)p) & (alignment-1))==0;
+    if mi_likely(is_aligned_or_null) {
+      return p;
+    }
+    else {
+      // this should never happen if the `mi_malloc_is_naturally_aligned` check is correct..
+      mi_assert(false);
+      mi_free(p);
+    }
   }
-  if mi_unlikely(size > PTRDIFF_MAX) {          // we don't allocate more than PTRDIFF_MAX (see <https://sourceware.org/ml/libc-announce/2019/msg00001.html>)                                                    
+
+  // fall back to over-allocation
+  return mi_heap_malloc_zero_aligned_at_overalloc(heap,size,alignment,offset,zero);
+}
+
+
+// Primitive aligned allocation
+static void* mi_heap_malloc_zero_aligned_at(mi_heap_t* const heap, const size_t size, const size_t alignment, const size_t offset, const bool zero) mi_attr_noexcept
+{
+  // note: we don't require `size > offset`, we just guarantee that the address at offset is aligned regardless of the allocated size.
+  if mi_unlikely(alignment == 0 || !_mi_is_power_of_two(alignment)) { // require power-of-two (see <https://en.cppreference.com/w/c/memory/aligned_alloc>)
     #if MI_DEBUG > 0
-    _mi_error_message(EOVERFLOW, "aligned allocation request is too large (size %zu, alignment %zu)\n", size, alignment);
+    _mi_error_message(EOVERFLOW, "aligned allocation requires the alignment to be a power-of-two (size %zu, alignment %zu)\n", size, alignment);
     #endif
     return NULL;
   }
-  const uintptr_t align_mask = alignment-1;       // for any x, `(x & align_mask) == (x % alignment)`
-  const size_t padsize = size + MI_PADDING_SIZE;  // note: cannot overflow due to earlier size > PTRDIFF_MAX check
+
+  #if MI_GUARDED
+  if (offset==0 && alignment < MI_PAGE_MAX_OVERALLOC_ALIGN && mi_heap_malloc_use_guarded(heap,size)) {
+    return mi_heap_malloc_guarded_aligned(heap, size, alignment, zero);
+  }
+  #endif
 
   // try first if there happens to be a small block available with just the right alignment
-  if mi_likely(padsize <= MI_SMALL_SIZE_MAX) {
+  // since most small power-of-2 blocks (under MI_PAGE_MAX_BLOCK_START_ALIGN2) are already
+  // naturally aligned this can be often the case.
+  if mi_likely(size <= MI_SMALL_SIZE_MAX && alignment <= size) {
+    const uintptr_t align_mask = alignment-1;       // for any x, `(x & align_mask) == (x % alignment)`
+    const size_t padsize = size + MI_PADDING_SIZE;
     mi_page_t* page = _mi_heap_get_free_small_page(heap, padsize);
-    const bool is_aligned = (((uintptr_t)page->free+offset) & align_mask)==0;
-    if mi_likely(page->free != NULL && is_aligned)
-    {
-      #if MI_STAT>1
-      mi_heap_stat_increase(heap, malloc, size);
-      #endif
-      void* p = _mi_page_malloc(heap, page, padsize, zero); // TODO: inline _mi_page_malloc
-      mi_assert_internal(p != NULL);
-      mi_assert_internal(((uintptr_t)p + offset) % alignment == 0);
-      mi_track_malloc(p,size,zero);
-      return p;
+    if mi_likely(page->free != NULL) {
+      const bool is_aligned = (((uintptr_t)page->free + offset) & align_mask)==0;
+      if mi_likely(is_aligned)
+      {
+        void* p = (zero ? _mi_page_malloc_zeroed(heap,page,padsize) : _mi_page_malloc(heap,page,padsize)); // call specific page malloc for better codegen
+        mi_assert_internal(p != NULL);
+        mi_assert_internal(((uintptr_t)p + offset) % alignment == 0);
+        mi_track_malloc(p,size,zero);
+        return p;
+      }
     }
   }
-  // fallback
-  return mi_heap_malloc_zero_aligned_at_fallback(heap, size, alignment, offset, zero);
+
+  // fallback to generic aligned allocation
+  return mi_heap_malloc_zero_aligned_at_generic(heap, size, alignment, offset, zero);
 }
 
 
@@ -111,22 +216,7 @@ mi_decl_nodiscard mi_decl_restrict void* mi_heap_malloc_aligned_at(mi_heap_t* he
 }
 
 mi_decl_nodiscard mi_decl_restrict void* mi_heap_malloc_aligned(mi_heap_t* heap, size_t size, size_t alignment) mi_attr_noexcept {
-  #if !MI_PADDING
-  // without padding, any small sized allocation is naturally aligned (see also `_mi_segment_page_start`)
-  if (!_mi_is_power_of_two(alignment)) return NULL;
-  if mi_likely(_mi_is_power_of_two(size) && size >= alignment && size <= MI_SMALL_SIZE_MAX)
-  #else
-  // with padding, we can only guarantee this for fixed alignments
-  if mi_likely((alignment == sizeof(void*) || (alignment == MI_MAX_ALIGN_SIZE && size > (MI_MAX_ALIGN_SIZE/2)))
-                && size <= MI_SMALL_SIZE_MAX)
-  #endif
-  {
-    // fast path for common alignment and size
-    return mi_heap_malloc_small(heap, size);
-  }
-  else {
-    return mi_heap_malloc_aligned_at(heap, size, alignment, 0);
-  }
+  return mi_heap_malloc_aligned_at(heap, size, alignment, 0);
 }
 
 // ------------------------------------------------------
@@ -152,27 +242,27 @@ mi_decl_nodiscard mi_decl_restrict void* mi_heap_calloc_aligned(mi_heap_t* heap,
 }
 
 mi_decl_nodiscard mi_decl_restrict void* mi_malloc_aligned_at(size_t size, size_t alignment, size_t offset) mi_attr_noexcept {
-  return mi_heap_malloc_aligned_at(mi_get_default_heap(), size, alignment, offset);
+  return mi_heap_malloc_aligned_at(mi_prim_get_default_heap(), size, alignment, offset);
 }
 
 mi_decl_nodiscard mi_decl_restrict void* mi_malloc_aligned(size_t size, size_t alignment) mi_attr_noexcept {
-  return mi_heap_malloc_aligned(mi_get_default_heap(), size, alignment);
+  return mi_heap_malloc_aligned(mi_prim_get_default_heap(), size, alignment);
 }
 
 mi_decl_nodiscard mi_decl_restrict void* mi_zalloc_aligned_at(size_t size, size_t alignment, size_t offset) mi_attr_noexcept {
-  return mi_heap_zalloc_aligned_at(mi_get_default_heap(), size, alignment, offset);
+  return mi_heap_zalloc_aligned_at(mi_prim_get_default_heap(), size, alignment, offset);
 }
 
 mi_decl_nodiscard mi_decl_restrict void* mi_zalloc_aligned(size_t size, size_t alignment) mi_attr_noexcept {
-  return mi_heap_zalloc_aligned(mi_get_default_heap(), size, alignment);
+  return mi_heap_zalloc_aligned(mi_prim_get_default_heap(), size, alignment);
 }
 
 mi_decl_nodiscard mi_decl_restrict void* mi_calloc_aligned_at(size_t count, size_t size, size_t alignment, size_t offset) mi_attr_noexcept {
-  return mi_heap_calloc_aligned_at(mi_get_default_heap(), count, size, alignment, offset);
+  return mi_heap_calloc_aligned_at(mi_prim_get_default_heap(), count, size, alignment, offset);
 }
 
 mi_decl_nodiscard mi_decl_restrict void* mi_calloc_aligned(size_t count, size_t size, size_t alignment) mi_attr_noexcept {
-  return mi_heap_calloc_aligned(mi_get_default_heap(), count, size, alignment);
+  return mi_heap_calloc_aligned(mi_prim_get_default_heap(), count, size, alignment);
 }
 
 
@@ -190,19 +280,13 @@ static void* mi_heap_realloc_zero_aligned_at(mi_heap_t* heap, void* p, size_t ne
     return p;  // reallocation still fits, is aligned and not more than 50% waste
   }
   else {
+    // note: we don't zero allocate upfront so we only zero initialize the expanded part
     void* newp = mi_heap_malloc_aligned_at(heap,newsize,alignment,offset);
     if (newp != NULL) {
       if (zero && newsize > size) {
-        const mi_page_t* page = _mi_ptr_page(newp);
-        if (page->is_zero) {
-          // already zero initialized
-          mi_assert_expensive(mi_mem_is_zero(newp,newsize));
-        }
-        else {
-          // also set last word in the previous allocation to zero to ensure any padding is zero-initialized
-          size_t start = (size >= sizeof(intptr_t) ? size - sizeof(intptr_t) : 0);
-          memset((uint8_t*)newp + start, 0, newsize - start);
-        }
+        // also set last word in the previous allocation to zero to ensure any padding is zero-initialized
+        size_t start = (size >= sizeof(intptr_t) ? size - sizeof(intptr_t) : 0);
+        _mi_memzero((uint8_t*)newp + start, newsize - start);
       }
       _mi_memcpy_aligned(newp, p, (newsize > size ? size : newsize));
       mi_free(p); // only free if successful
@@ -247,26 +331,27 @@ mi_decl_nodiscard void* mi_heap_recalloc_aligned(mi_heap_t* heap, void* p, size_
 }
 
 mi_decl_nodiscard void* mi_realloc_aligned_at(void* p, size_t newsize, size_t alignment, size_t offset) mi_attr_noexcept {
-  return mi_heap_realloc_aligned_at(mi_get_default_heap(), p, newsize, alignment, offset);
+  return mi_heap_realloc_aligned_at(mi_prim_get_default_heap(), p, newsize, alignment, offset);
 }
 
 mi_decl_nodiscard void* mi_realloc_aligned(void* p, size_t newsize, size_t alignment) mi_attr_noexcept {
-  return mi_heap_realloc_aligned(mi_get_default_heap(), p, newsize, alignment);
+  return mi_heap_realloc_aligned(mi_prim_get_default_heap(), p, newsize, alignment);
 }
 
 mi_decl_nodiscard void* mi_rezalloc_aligned_at(void* p, size_t newsize, size_t alignment, size_t offset) mi_attr_noexcept {
-  return mi_heap_rezalloc_aligned_at(mi_get_default_heap(), p, newsize, alignment, offset);
+  return mi_heap_rezalloc_aligned_at(mi_prim_get_default_heap(), p, newsize, alignment, offset);
 }
 
 mi_decl_nodiscard void* mi_rezalloc_aligned(void* p, size_t newsize, size_t alignment) mi_attr_noexcept {
-  return mi_heap_rezalloc_aligned(mi_get_default_heap(), p, newsize, alignment);
+  return mi_heap_rezalloc_aligned(mi_prim_get_default_heap(), p, newsize, alignment);
 }
 
 mi_decl_nodiscard void* mi_recalloc_aligned_at(void* p, size_t newcount, size_t size, size_t alignment, size_t offset) mi_attr_noexcept {
-  return mi_heap_recalloc_aligned_at(mi_get_default_heap(), p, newcount, size, alignment, offset);
+  return mi_heap_recalloc_aligned_at(mi_prim_get_default_heap(), p, newcount, size, alignment, offset);
 }
 
 mi_decl_nodiscard void* mi_recalloc_aligned(void* p, size_t newcount, size_t size, size_t alignment) mi_attr_noexcept {
-  return mi_heap_recalloc_aligned(mi_get_default_heap(), p, newcount, size, alignment);
+  return mi_heap_recalloc_aligned(mi_prim_get_default_heap(), p, newcount, size, alignment);
 }
 
+
diff --git a/depends/mimalloc/src/alloc-override.c b/depends/mimalloc/src/alloc-override.c
index 9534e9d57b1f..52ab69c5389c 100644
--- a/depends/mimalloc/src/alloc-override.c
+++ b/depends/mimalloc/src/alloc-override.c
@@ -13,7 +13,7 @@ terms of the MIT license. A copy of the license can be found in the file
 #error "It is only possible to override "malloc" on Windows when building as a DLL (and linking the C runtime as a DLL)"
 #endif
 
-#if defined(MI_MALLOC_OVERRIDE) && !(defined(_WIN32)) 
+#if defined(MI_MALLOC_OVERRIDE) && !(defined(_WIN32))
 
 #if defined(__APPLE__)
 #include <AvailabilityMacros.h>
@@ -23,7 +23,7 @@ mi_decl_externc size_t malloc_good_size(size_t size);
 #endif
 
 // helper definition for C override of C++ new
-typedef struct mi_nothrow_s { int _tag; } mi_nothrow_t;
+typedef void* mi_nothrow_t;
 
 // ------------------------------------------------------
 // Override system malloc
@@ -43,19 +43,25 @@ typedef struct mi_nothrow_s { int _tag; } mi_nothrow_t;
   #define MI_FORWARD0(fun,x)      MI_FORWARD(fun)
   #define MI_FORWARD02(fun,x,y)   MI_FORWARD(fun)
 #else
-  // otherwise use forwarding by calling our `mi_` function 
-  #define MI_FORWARD1(fun,x)      { return fun(x); }       
+  // otherwise use forwarding by calling our `mi_` function
+  #define MI_FORWARD1(fun,x)      { return fun(x); }
   #define MI_FORWARD2(fun,x,y)    { return fun(x,y); }
   #define MI_FORWARD3(fun,x,y,z)  { return fun(x,y,z); }
   #define MI_FORWARD0(fun,x)      { fun(x); }
   #define MI_FORWARD02(fun,x,y)   { fun(x,y); }
 #endif
 
-#if defined(__APPLE__) && defined(MI_SHARED_LIB_EXPORT) && defined(MI_OSX_INTERPOSE)    
-  // define MI_OSX_IS_INTERPOSED as we should not provide forwarding definitions for 
+
+#if defined(__APPLE__) && defined(MI_SHARED_LIB_EXPORT) && defined(MI_OSX_INTERPOSE)
+  // define MI_OSX_IS_INTERPOSED as we should not provide forwarding definitions for
   // functions that are interposed (or the interposing does not work)
   #define MI_OSX_IS_INTERPOSED
 
+  mi_decl_externc size_t mi_malloc_size_checked(void *p) {
+    if (!mi_is_in_heap_region(p)) return 0;
+    return mi_usable_size(p);
+  }
+
   // use interposing so `DYLD_INSERT_LIBRARIES` works without `DYLD_FORCE_FLAT_NAMESPACE=1`
   // See: <https://books.google.com/books?id=K8vUkpOXhN4C&pg=PA73>
   struct mi_interpose_s {
@@ -64,23 +70,21 @@ typedef struct mi_nothrow_s { int _tag; } mi_nothrow_t;
   };
   #define MI_INTERPOSE_FUN(oldfun,newfun) { (const void*)&newfun, (const void*)&oldfun }
   #define MI_INTERPOSE_MI(fun)            MI_INTERPOSE_FUN(fun,mi_##fun)
-  
-  __attribute__((used)) static struct mi_interpose_s _mi_interposes[]  __attribute__((section("__DATA, __interpose"))) =
+
+  #define MI_INTERPOSE_DECLS(name)        __attribute__((used)) static struct mi_interpose_s name[]  __attribute__((section("__DATA, __interpose")))
+
+  MI_INTERPOSE_DECLS(_mi_interposes) =
   {
     MI_INTERPOSE_MI(malloc),
     MI_INTERPOSE_MI(calloc),
     MI_INTERPOSE_MI(realloc),
     MI_INTERPOSE_MI(strdup),
-    MI_INTERPOSE_MI(strndup),
     MI_INTERPOSE_MI(realpath),
     MI_INTERPOSE_MI(posix_memalign),
     MI_INTERPOSE_MI(reallocf),
     MI_INTERPOSE_MI(valloc),
-    MI_INTERPOSE_MI(malloc_size),
+    MI_INTERPOSE_FUN(malloc_size,mi_malloc_size_checked),
     MI_INTERPOSE_MI(malloc_good_size),
-    #if defined(MAC_OS_X_VERSION_10_15) && MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_15 
-    MI_INTERPOSE_MI(aligned_alloc),
-    #endif
     #ifdef MI_OSX_ZONE
     // we interpose malloc_default_zone in alloc-override-osx.c so we can use mi_free safely
     MI_INTERPOSE_MI(free),
@@ -91,6 +95,12 @@ typedef struct mi_nothrow_s { int _tag; } mi_nothrow_t;
     MI_INTERPOSE_FUN(vfree,mi_cfree),
     #endif
   };
+  MI_INTERPOSE_DECLS(_mi_interposes_10_7) __OSX_AVAILABLE(10.7) = {
+    MI_INTERPOSE_MI(strndup),
+  };
+  MI_INTERPOSE_DECLS(_mi_interposes_10_15) __OSX_AVAILABLE(10.15) = {
+    MI_INTERPOSE_MI(aligned_alloc),
+  };
 
   #ifdef __cplusplus
   extern "C" {
@@ -122,11 +132,19 @@ typedef struct mi_nothrow_s { int _tag; } mi_nothrow_t;
   // cannot override malloc unless using a dll.
   // we just override new/delete which does work in a static library.
 #else
-  // On all other systems forward to our API  
+  // On all other systems forward allocation primitives to our API
   mi_decl_export void* malloc(size_t size)              MI_FORWARD1(mi_malloc, size)
   mi_decl_export void* calloc(size_t size, size_t n)    MI_FORWARD2(mi_calloc, size, n)
   mi_decl_export void* realloc(void* p, size_t newsize) MI_FORWARD2(mi_realloc, p, newsize)
   mi_decl_export void  free(void* p)                    MI_FORWARD0(mi_free, p)  
+  // In principle we do not need to forward `strdup`/`strndup` but on some systems these do not use `malloc` internally (but a more primitive call)
+  // We only override if `strdup` is not a macro (as on some older libc's, see issue #885)
+  #if !defined(strdup)
+  mi_decl_export char* strdup(const char* str)             MI_FORWARD1(mi_strdup, str)
+  #endif
+  #if !defined(strndup) && (!defined(__APPLE__) || (defined(MAC_OS_X_VERSION_10_7) && MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_7))
+  mi_decl_export char* strndup(const char* str, size_t n)  MI_FORWARD2(mi_strndup, str, n)   
+  #endif
 #endif
 
 #if (defined(__GNUC__) || defined(__clang__)) && !defined(__APPLE__)
@@ -168,34 +186,40 @@ typedef struct mi_nothrow_s { int _tag; } mi_nothrow_t;
   void operator delete[](void* p, std::size_t n, std::align_val_t al) noexcept { mi_free_size_aligned(p, n, static_cast<size_t>(al)); };
   void operator delete  (void* p, std::align_val_t al, const std::nothrow_t&) noexcept { mi_free_aligned(p, static_cast<size_t>(al)); }
   void operator delete[](void* p, std::align_val_t al, const std::nothrow_t&) noexcept { mi_free_aligned(p, static_cast<size_t>(al)); }
-  
+
   void* operator new( std::size_t n, std::align_val_t al)   noexcept(false) { return mi_new_aligned(n, static_cast<size_t>(al)); }
   void* operator new[]( std::size_t n, std::align_val_t al) noexcept(false) { return mi_new_aligned(n, static_cast<size_t>(al)); }
   void* operator new  (std::size_t n, std::align_val_t al, const std::nothrow_t&) noexcept { return mi_new_aligned_nothrow(n, static_cast<size_t>(al)); }
   void* operator new[](std::size_t n, std::align_val_t al, const std::nothrow_t&) noexcept { return mi_new_aligned_nothrow(n, static_cast<size_t>(al)); }
   #endif
 
-#elif (defined(__GNUC__) || defined(__clang__)) 
+#elif (defined(__GNUC__) || defined(__clang__))
   // ------------------------------------------------------
   // Override by defining the mangled C++ names of the operators (as
   // used by GCC and CLang).
   // See <https://itanium-cxx-abi.github.io/cxx-abi/abi.html#mangling>
   // ------------------------------------------------------
-  
+
   void _ZdlPv(void* p)            MI_FORWARD0(mi_free,p) // delete
   void _ZdaPv(void* p)            MI_FORWARD0(mi_free,p) // delete[]
   void _ZdlPvm(void* p, size_t n) MI_FORWARD02(mi_free_size,p,n)
   void _ZdaPvm(void* p, size_t n) MI_FORWARD02(mi_free_size,p,n)
+  
   void _ZdlPvSt11align_val_t(void* p, size_t al)            { mi_free_aligned(p,al); }
   void _ZdaPvSt11align_val_t(void* p, size_t al)            { mi_free_aligned(p,al); }
   void _ZdlPvmSt11align_val_t(void* p, size_t n, size_t al) { mi_free_size_aligned(p,n,al); }
   void _ZdaPvmSt11align_val_t(void* p, size_t n, size_t al) { mi_free_size_aligned(p,n,al); }
+
+  void _ZdlPvRKSt9nothrow_t(void* p, mi_nothrow_t tag)      { MI_UNUSED(tag); mi_free(p); }  // operator delete(void*, std::nothrow_t const&) 
+  void _ZdaPvRKSt9nothrow_t(void* p, mi_nothrow_t tag)      { MI_UNUSED(tag); mi_free(p); }  // operator delete[](void*, std::nothrow_t const&)
+  void _ZdlPvSt11align_val_tRKSt9nothrow_t(void* p, size_t al, mi_nothrow_t tag) { MI_UNUSED(tag); mi_free_aligned(p,al); } // operator delete(void*, std::align_val_t, std::nothrow_t const&) 
+  void _ZdaPvSt11align_val_tRKSt9nothrow_t(void* p, size_t al, mi_nothrow_t tag) { MI_UNUSED(tag); mi_free_aligned(p,al); } // operator delete[](void*, std::align_val_t, std::nothrow_t const&) 
   
   #if (MI_INTPTR_SIZE==8)
     void* _Znwm(size_t n)                             MI_FORWARD1(mi_new,n)  // new 64-bit
     void* _Znam(size_t n)                             MI_FORWARD1(mi_new,n)  // new[] 64-bit
     void* _ZnwmRKSt9nothrow_t(size_t n, mi_nothrow_t tag) { MI_UNUSED(tag); return mi_new_nothrow(n); }
-    void* _ZnamRKSt9nothrow_t(size_t n, mi_nothrow_t tag) { MI_UNUSED(tag); return mi_new_nothrow(n); }     
+    void* _ZnamRKSt9nothrow_t(size_t n, mi_nothrow_t tag) { MI_UNUSED(tag); return mi_new_nothrow(n); }
     void* _ZnwmSt11align_val_t(size_t n, size_t al)   MI_FORWARD2(mi_new_aligned, n, al)
     void* _ZnamSt11align_val_t(size_t n, size_t al)   MI_FORWARD2(mi_new_aligned, n, al)
     void* _ZnwmSt11align_val_tRKSt9nothrow_t(size_t n, size_t al, mi_nothrow_t tag) { MI_UNUSED(tag); return mi_new_aligned_nothrow(n,al); }
@@ -204,7 +228,7 @@ typedef struct mi_nothrow_s { int _tag; } mi_nothrow_t;
     void* _Znwj(size_t n)                             MI_FORWARD1(mi_new,n)  // new 64-bit
     void* _Znaj(size_t n)                             MI_FORWARD1(mi_new,n)  // new[] 64-bit
     void* _ZnwjRKSt9nothrow_t(size_t n, mi_nothrow_t tag) { MI_UNUSED(tag); return mi_new_nothrow(n); }
-    void* _ZnajRKSt9nothrow_t(size_t n, mi_nothrow_t tag) { MI_UNUSED(tag); return mi_new_nothrow(n); }   
+    void* _ZnajRKSt9nothrow_t(size_t n, mi_nothrow_t tag) { MI_UNUSED(tag); return mi_new_nothrow(n); }
     void* _ZnwjSt11align_val_t(size_t n, size_t al)   MI_FORWARD2(mi_new_aligned, n, al)
     void* _ZnajSt11align_val_t(size_t n, size_t al)   MI_FORWARD2(mi_new_aligned, n, al)
     void* _ZnwjSt11align_val_tRKSt9nothrow_t(size_t n, size_t al, mi_nothrow_t tag) { MI_UNUSED(tag); return mi_new_aligned_nothrow(n,al); }
@@ -226,7 +250,7 @@ extern "C" {
   // Forward Posix/Unix calls as well
   void*  reallocf(void* p, size_t newsize) MI_FORWARD2(mi_reallocf,p,newsize)
   size_t malloc_size(const void* p)        MI_FORWARD1(mi_usable_size,p)
-  #if !defined(__ANDROID__) && !defined(__FreeBSD__)
+  #if !defined(__ANDROID__) && !defined(__FreeBSD__) && !defined(__DragonFly__)
   size_t malloc_usable_size(void *p)       MI_FORWARD1(mi_usable_size,p)
   #else
   size_t malloc_usable_size(const void *p) MI_FORWARD1(mi_usable_size,p)
@@ -234,30 +258,41 @@ extern "C" {
 
   // No forwarding here due to aliasing/name mangling issues
   void*  valloc(size_t size)               { return mi_valloc(size); }
-  void   vfree(void* p)                    { mi_free(p); }                
+  void   vfree(void* p)                    { mi_free(p); }
   size_t malloc_good_size(size_t size)     { return mi_malloc_good_size(size); }
   int    posix_memalign(void** p, size_t alignment, size_t size) { return mi_posix_memalign(p, alignment, size); }
-  
+
   // `aligned_alloc` is only available when __USE_ISOC11 is defined.
+  // Note: it seems __USE_ISOC11 is not defined in musl (and perhaps other libc's) so we only check
+  // for it if using glibc.
   // Note: Conda has a custom glibc where `aligned_alloc` is declared `static inline` and we cannot
   // override it, but both _ISOC11_SOURCE and __USE_ISOC11 are undefined in Conda GCC7 or GCC9.
   // Fortunately, in the case where `aligned_alloc` is declared as `static inline` it
   // uses internally `memalign`, `posix_memalign`, or `_aligned_malloc` so we  can avoid overriding it ourselves.
-  #if __USE_ISOC11 
+  #if !defined(__GLIBC__) || __USE_ISOC11
   void* aligned_alloc(size_t alignment, size_t size) { return mi_aligned_alloc(alignment, size); }
   #endif
 #endif
 
 // no forwarding here due to aliasing/name mangling issues
-void  cfree(void* p)                                    { mi_free(p); } 
+void  cfree(void* p)                                    { mi_free(p); }
 void* pvalloc(size_t size)                              { return mi_pvalloc(size); }
-void* reallocarray(void* p, size_t count, size_t size)  { return mi_reallocarray(p, count, size); }
-int   reallocarr(void* p, size_t count, size_t size)    { return mi_reallocarr(p, count, size); }
 void* memalign(size_t alignment, size_t size)           { return mi_memalign(alignment, size); }
 void* _aligned_malloc(size_t alignment, size_t size)    { return mi_aligned_alloc(alignment, size); }
+void* reallocarray(void* p, size_t count, size_t size)  { return mi_reallocarray(p, count, size); }
+// some systems define reallocarr so mark it as a weak symbol (#751)
+mi_decl_weak int reallocarr(void* p, size_t count, size_t size)    { return mi_reallocarr(p, count, size); }
+
+#if defined(__wasi__)
+  // forward __libc interface (see PR #667)
+  void* __libc_malloc(size_t size)                      MI_FORWARD1(mi_malloc, size)
+  void* __libc_calloc(size_t count, size_t size)        MI_FORWARD2(mi_calloc, count, size)
+  void* __libc_realloc(void* p, size_t size)            MI_FORWARD2(mi_realloc, p, size)
+  void  __libc_free(void* p)                            MI_FORWARD0(mi_free, p)
+  void* __libc_memalign(size_t alignment, size_t size)  { return mi_memalign(alignment, size); }
 
-#if defined(__GLIBC__) && defined(__linux__)
-  // forward __libc interface (needed for glibc-based Linux distributions)
+#elif defined(__linux__)
+  // forward __libc interface (needed for glibc-based and musl-based Linux distributions)
   void* __libc_malloc(size_t size)                      MI_FORWARD1(mi_malloc,size)
   void* __libc_calloc(size_t count, size_t size)        MI_FORWARD2(mi_calloc,count,size)
   void* __libc_realloc(void* p, size_t size)            MI_FORWARD2(mi_realloc,p,size)
diff --git a/depends/mimalloc/src/alloc-posix.c b/depends/mimalloc/src/alloc-posix.c
index 57e15d05d8db..225752fd8707 100644
--- a/depends/mimalloc/src/alloc-posix.c
+++ b/depends/mimalloc/src/alloc-posix.c
@@ -10,7 +10,7 @@ terms of the MIT license. A copy of the license can be found in the file
 // for convenience and used when overriding these functions.
 // ------------------------------------------------------------------------
 #include "mimalloc.h"
-#include "mimalloc-internal.h"
+#include "mimalloc/internal.h"
 
 // ------------------------------------------------------
 // Posix & Unix functions definitions
@@ -33,12 +33,12 @@ terms of the MIT license. A copy of the license can be found in the file
 
 
 mi_decl_nodiscard size_t mi_malloc_size(const void* p) mi_attr_noexcept {
-  //if (!mi_is_in_heap_region(p)) return 0;
+  // if (!mi_is_in_heap_region(p)) return 0;
   return mi_usable_size(p);
 }
 
 mi_decl_nodiscard size_t mi_malloc_usable_size(const void *p) mi_attr_noexcept {
-  //if (!mi_is_in_heap_region(p)) return 0;
+  // if (!mi_is_in_heap_region(p)) return 0;
   return mi_usable_size(p);
 }
 
@@ -56,7 +56,8 @@ int mi_posix_memalign(void** p, size_t alignment, size_t size) mi_attr_noexcept
   // Note: The spec dictates we should not modify `*p` on an error. (issue#27)
   // <http://man7.org/linux/man-pages/man3/posix_memalign.3.html>
   if (p == NULL) return EINVAL;
-  if (alignment % sizeof(void*) != 0) return EINVAL;                   // natural alignment
+  if ((alignment % sizeof(void*)) != 0) return EINVAL;                 // natural alignment
+  // it is also required that alignment is a power of 2 and > 0; this is checked in `mi_malloc_aligned`
   if (alignment==0 || !_mi_is_power_of_two(alignment)) return EINVAL;  // not a power of 2
   void* q = mi_malloc_aligned(size, alignment);
   if (q==NULL && size != 0) return ENOMEM;
@@ -91,7 +92,7 @@ mi_decl_nodiscard mi_decl_restrict void* mi_aligned_alloc(size_t alignment, size
       #endif
       return NULL;
     }
-  */  
+  */
   // C11 also requires alignment to be a power-of-two (and > 0) which is checked in mi_malloc_aligned
   void* p = mi_malloc_aligned(size, alignment);
   mi_assert_internal(((uintptr_t)p % alignment) == 0);
@@ -110,7 +111,7 @@ mi_decl_nodiscard int mi_reallocarr( void* p, size_t count, size_t size ) mi_att
     errno = EINVAL;
     return EINVAL;
   }
-  void** op = (void**)p;  
+  void** op = (void**)p;
   void* newp = mi_reallocarray(*op, count, size);
   if mi_unlikely(newp == NULL) { return errno; }
   *op = newp;
@@ -149,7 +150,7 @@ int mi_dupenv_s(char** buf, size_t* size, const char* name) mi_attr_noexcept {
   else {
     *buf = mi_strdup(p);
     if (*buf==NULL) return ENOMEM;
-    if (size != NULL) *size = strlen(p);
+    if (size != NULL) *size = _mi_strlen(p);
   }
   return 0;
 }
diff --git a/depends/mimalloc/src/alloc.c b/depends/mimalloc/src/alloc.c
index 02d009e2f7d4..3e912726ff46 100644
--- a/depends/mimalloc/src/alloc.c
+++ b/depends/mimalloc/src/alloc.c
@@ -1,5 +1,5 @@
 /* ----------------------------------------------------------------------------
-Copyright (c) 2018-2022, Microsoft Research, Daan Leijen
+Copyright (c) 2018-2024, Microsoft Research, Daan Leijen
 This is free software; you can redistribute it and/or modify it under the
 terms of the MIT license. A copy of the license can be found in the file
 "LICENSE" at the root of this distribution.
@@ -9,15 +9,16 @@ terms of the MIT license. A copy of the license can be found in the file
 #endif
 
 #include "mimalloc.h"
-#include "mimalloc-internal.h"
-#include "mimalloc-atomic.h"
+#include "mimalloc/internal.h"
+#include "mimalloc/atomic.h"
+#include "mimalloc/prim.h"   // _mi_prim_thread_id()
 
-
-#include <string.h>  // memset, strlen
-#include <stdlib.h>  // malloc, exit
+#include <string.h>      // memset, strlen (for mi_strdup)
+#include <stdlib.h>      // malloc, abort
 
 #define MI_IN_ALLOC_C
 #include "alloc-override.c"
+#include "free.c"
 #undef MI_IN_ALLOC_C
 
 // ------------------------------------------------------
@@ -26,84 +27,135 @@ terms of the MIT license. A copy of the license can be found in the file
 
 // Fast allocation in a page: just pop from the free list.
 // Fall back to generic allocation only if the list is empty.
-extern inline void* _mi_page_malloc(mi_heap_t* heap, mi_page_t* page, size_t size, bool zero) mi_attr_noexcept {
-  mi_assert_internal(page->xblock_size==0||mi_page_block_size(page) >= size);
+// Note: in release mode the (inlined) routine is about 7 instructions with a single test.
+extern inline void* _mi_page_malloc_zero(mi_heap_t* heap, mi_page_t* page, size_t size, bool zero) mi_attr_noexcept
+{
+  if (page->block_size != 0) { // not the empty heap
+    mi_assert_internal(mi_page_block_size(page) >= size);
+    mi_assert_internal(_mi_is_aligned(page, MI_PAGE_ALIGN));
+    mi_assert_internal(_mi_ptr_page(page)==page);
+  }
+
+  // check the free list
   mi_block_t* const block = page->free;
   if mi_unlikely(block == NULL) {
-    return _mi_malloc_generic(heap, size, zero); 
+    return _mi_malloc_generic(heap, size, zero, 0);
   }
   mi_assert_internal(block != NULL && _mi_ptr_page(block) == page);
+
   // pop from the free list
-  page->used++;
   page->free = mi_block_next(page, block);
+  page->used++;
   mi_assert_internal(page->free == NULL || _mi_ptr_page(page->free) == page);
+  mi_assert_internal(page->block_size < MI_MAX_ALIGN_SIZE || _mi_is_aligned(block, MI_MAX_ALIGN_SIZE));
+
+  #if MI_DEBUG>3
+  if (page->free_is_zero && size > sizeof(*block)) {
+    mi_assert_expensive(mi_mem_is_zero(block+1,size - sizeof(*block)));
+  }
+  #endif
 
-  // allow use of the block internally 
+  // allow use of the block internally
   // note: when tracking we need to avoid ever touching the MI_PADDING since
-  // that is tracked by valgrind etc. as non-accessible (through the red-zone, see `mimalloc-track.h`)
+  // that is tracked by valgrind etc. as non-accessible (through the red-zone, see `mimalloc/track.h`)
   mi_track_mem_undefined(block, mi_page_usable_block_size(page));
-  
+
   // zero the block? note: we need to zero the full block size (issue #63)
   if mi_unlikely(zero) {
-    mi_assert_internal(page->xblock_size != 0); // do not call with zero'ing for huge blocks (see _mi_malloc_generic)
-    const size_t zsize = (page->is_zero ? sizeof(block->next) + MI_PADDING_SIZE : page->xblock_size);
-    _mi_memzero_aligned(block, zsize - MI_PADDING_SIZE);    
+    mi_assert_internal(page->block_size != 0); // do not call with zero'ing for huge blocks (see _mi_malloc_generic)
+    mi_assert_internal(!mi_page_is_huge(page));
+    #if MI_PADDING
+    mi_assert_internal(page->block_size >= MI_PADDING_SIZE);
+    #endif
+    if (page->free_is_zero) {
+      block->next = 0;
+      mi_track_mem_defined(block, page->block_size - MI_PADDING_SIZE);
+    }
+    else {
+      _mi_memzero_aligned(block, page->block_size - MI_PADDING_SIZE);
+    }
   }
 
-#if (MI_DEBUG>0) && !MI_TRACK_ENABLED
-  if (!page->is_zero && !zero) { memset(block, MI_DEBUG_UNINIT, mi_page_usable_block_size(page)); }
-#elif (MI_SECURE!=0)
+  #if (MI_DEBUG>0) && !MI_TRACK_ENABLED && !MI_TSAN
+  if (!zero && !mi_page_is_huge(page)) {
+    memset(block, MI_DEBUG_UNINIT, mi_page_usable_block_size(page));
+  }
+  #elif (MI_SECURE!=0)
   if (!zero) { block->next = 0; } // don't leak internal data
-#endif
+  #endif
 
-#if (MI_STAT>0)
+  #if (MI_STAT>0)
   const size_t bsize = mi_page_usable_block_size(page);
-  if (bsize <= MI_MEDIUM_OBJ_SIZE_MAX) {
-    mi_heap_stat_increase(heap, normal, bsize);
-    mi_heap_stat_counter_increase(heap, normal_count, 1);
-#if (MI_STAT>1)
+  if (bsize <= MI_LARGE_MAX_OBJ_SIZE) {
+    mi_heap_stat_increase(heap, malloc_normal, bsize);
+    mi_heap_stat_counter_increase(heap, malloc_normal_count, 1);
+    #if (MI_STAT>1)
     const size_t bin = _mi_bin(bsize);
-    mi_heap_stat_increase(heap, normal_bins[bin], 1);
-#endif
+    mi_heap_stat_increase(heap, malloc_bins[bin], 1);
+    mi_heap_stat_increase(heap, malloc_requested, size - MI_PADDING_SIZE);
+    #endif
   }
-#endif
+  #endif
 
-#if (MI_PADDING > 0) && defined(MI_ENCODE_FREELIST) && !MI_TRACK_ENABLED
-  mi_padding_t* const padding = (mi_padding_t*)((uint8_t*)block + mi_page_usable_block_size(page));
-  ptrdiff_t delta = ((uint8_t*)padding - (uint8_t*)block - (size - MI_PADDING_SIZE));
-  #if (MI_DEBUG>1)
-  mi_assert_internal(delta >= 0 && mi_page_usable_block_size(page) >= (size - MI_PADDING_SIZE + delta));
-  mi_track_mem_defined(padding,sizeof(mi_padding_t));  // note: re-enable since mi_page_usable_block_size may set noaccess
+  #if MI_PADDING // && !MI_TRACK_ENABLED
+    mi_padding_t* const padding = (mi_padding_t*)((uint8_t*)block + mi_page_usable_block_size(page));
+    ptrdiff_t delta = ((uint8_t*)padding - (uint8_t*)block - (size - MI_PADDING_SIZE));
+    #if (MI_DEBUG>=2)
+    mi_assert_internal(delta >= 0 && mi_page_usable_block_size(page) >= (size - MI_PADDING_SIZE + delta));
+    #endif
+    mi_track_mem_defined(padding,sizeof(mi_padding_t));  // note: re-enable since mi_page_usable_block_size may set noaccess
+    padding->canary = mi_ptr_encode_canary(page,block,page->keys);
+    padding->delta  = (uint32_t)(delta);
+    #if MI_PADDING_CHECK
+    if (!mi_page_is_huge(page)) {
+      uint8_t* fill = (uint8_t*)padding - delta;
+      const size_t maxpad = (delta > MI_MAX_ALIGN_SIZE ? MI_MAX_ALIGN_SIZE : delta); // set at most N initial padding bytes
+      for (size_t i = 0; i < maxpad; i++) { fill[i] = MI_DEBUG_PADDING; }
+    }
+    #endif
   #endif
-  padding->canary = (uint32_t)(mi_ptr_encode(page,block,page->keys));
-  padding->delta  = (uint32_t)(delta);
-  uint8_t* fill = (uint8_t*)padding - delta;
-  const size_t maxpad = (delta > MI_MAX_ALIGN_SIZE ? MI_MAX_ALIGN_SIZE : delta); // set at most N initial padding bytes
-  for (size_t i = 0; i < maxpad; i++) { fill[i] = MI_DEBUG_PADDING; }
-#endif
 
   return block;
 }
 
+// extra entries for improved efficiency in `alloc-aligned.c`.
+extern void* _mi_page_malloc(mi_heap_t* heap, mi_page_t* page, size_t size) mi_attr_noexcept {
+  return _mi_page_malloc_zero(heap,page,size,false);
+}
+extern void* _mi_page_malloc_zeroed(mi_heap_t* heap, mi_page_t* page, size_t size) mi_attr_noexcept {
+  return _mi_page_malloc_zero(heap,page,size,true);
+}
+
+#if MI_GUARDED
+mi_decl_restrict void* _mi_heap_malloc_guarded(mi_heap_t* heap, size_t size, bool zero) mi_attr_noexcept;
+#endif
+
 static inline mi_decl_restrict void* mi_heap_malloc_small_zero(mi_heap_t* heap, size_t size, bool zero) mi_attr_noexcept {
   mi_assert(heap != NULL);
-  mi_assert(heap->thread_id == 0 || heap->thread_id == _mi_thread_id()); // heaps are thread local
   mi_assert(size <= MI_SMALL_SIZE_MAX);
-#if (MI_PADDING)
-  if (size == 0) {
-    size = sizeof(void*);
+  #if MI_DEBUG
+  const uintptr_t tid = _mi_thread_id();
+  mi_assert(heap->tld->thread_id == 0 || heap->tld->thread_id == tid); // heaps are thread local
+  #endif
+  #if (MI_PADDING || MI_GUARDED)
+  if (size == 0) { size = sizeof(void*); }
+  #endif
+  #if MI_GUARDED
+  if (mi_heap_malloc_use_guarded(heap,size)) {
+    return _mi_heap_malloc_guarded(heap, size, zero);
   }
-#endif
+  #endif
+
+  // get page in constant time, and allocate from it
   mi_page_t* page = _mi_heap_get_free_small_page(heap, size + MI_PADDING_SIZE);
-  void* p = _mi_page_malloc(heap, page, size + MI_PADDING_SIZE, zero);
-  mi_assert_internal(p == NULL || mi_usable_size(p) >= size);
-#if MI_STAT>1
-  if (p != NULL) {
-    if (!mi_heap_is_initialized(heap)) { heap = mi_get_default_heap(); }
-    mi_heap_stat_increase(heap, malloc, mi_usable_size(p));
-  }
-#endif
+  void* const p = _mi_page_malloc_zero(heap, page, size + MI_PADDING_SIZE, zero);
   mi_track_malloc(p,size,zero);
+
+  #if MI_DEBUG>3
+  if (p != NULL && zero) {
+    mi_assert_expensive(mi_mem_is_zero(p, size));
+  }
+  #endif
   return p;
 }
 
@@ -113,41 +165,52 @@ mi_decl_nodiscard extern inline mi_decl_restrict void* mi_heap_malloc_small(mi_h
 }
 
 mi_decl_nodiscard extern inline mi_decl_restrict void* mi_malloc_small(size_t size) mi_attr_noexcept {
-  return mi_heap_malloc_small(mi_get_default_heap(), size);
+  return mi_heap_malloc_small(mi_prim_get_default_heap(), size);
 }
 
 // The main allocation function
-extern inline void* _mi_heap_malloc_zero(mi_heap_t* heap, size_t size, bool zero) mi_attr_noexcept {
+extern inline void* _mi_heap_malloc_zero_ex(mi_heap_t* heap, size_t size, bool zero, size_t huge_alignment) mi_attr_noexcept {
+  // fast path for small objects
   if mi_likely(size <= MI_SMALL_SIZE_MAX) {
+    mi_assert_internal(huge_alignment == 0);
     return mi_heap_malloc_small_zero(heap, size, zero);
   }
+  #if MI_GUARDED
+  else if (huge_alignment==0 && mi_heap_malloc_use_guarded(heap,size)) {
+    return _mi_heap_malloc_guarded(heap, size, zero);
+  }
+  #endif
   else {
+    // regular allocation
     mi_assert(heap!=NULL);
-    mi_assert(heap->thread_id == 0 || heap->thread_id == _mi_thread_id());   // heaps are thread local
-    void* const p = _mi_malloc_generic(heap, size + MI_PADDING_SIZE, zero);  // note: size can overflow but it is detected in malloc_generic
-    mi_assert_internal(p == NULL || mi_usable_size(p) >= size);
-    #if MI_STAT>1
-    if (p != NULL) {
-      if (!mi_heap_is_initialized(heap)) { heap = mi_get_default_heap(); }
-      mi_heap_stat_increase(heap, malloc, mi_usable_size(p));
+    mi_assert(heap->tld->thread_id == 0 || heap->tld->thread_id == _mi_thread_id());   // heaps are thread local
+    void* const p = _mi_malloc_generic(heap, size + MI_PADDING_SIZE, zero, huge_alignment);  // note: size can overflow but it is detected in malloc_generic
+    mi_track_malloc(p,size,zero);
+
+    #if MI_DEBUG>3
+    if (p != NULL && zero) {
+      mi_assert_expensive(mi_mem_is_zero(p, size));
     }
     #endif
-    mi_track_malloc(p,size,zero);
     return p;
   }
 }
 
+extern inline void* _mi_heap_malloc_zero(mi_heap_t* heap, size_t size, bool zero) mi_attr_noexcept {
+  return _mi_heap_malloc_zero_ex(heap, size, zero, 0);
+}
+
 mi_decl_nodiscard extern inline mi_decl_restrict void* mi_heap_malloc(mi_heap_t* heap, size_t size) mi_attr_noexcept {
   return _mi_heap_malloc_zero(heap, size, false);
 }
 
 mi_decl_nodiscard extern inline mi_decl_restrict void* mi_malloc(size_t size) mi_attr_noexcept {
-  return mi_heap_malloc(mi_get_default_heap(), size);
+  return mi_heap_malloc(mi_prim_get_default_heap(), size);
 }
 
 // zero initialized small block
 mi_decl_nodiscard mi_decl_restrict void* mi_zalloc_small(size_t size) mi_attr_noexcept {
-  return mi_heap_malloc_small_zero(mi_get_default_heap(), size, true);
+  return mi_heap_malloc_small_zero(mi_prim_get_default_heap(), size, true);
 }
 
 mi_decl_nodiscard extern inline mi_decl_restrict void* mi_heap_zalloc(mi_heap_t* heap, size_t size) mi_attr_noexcept {
@@ -155,467 +218,9 @@ mi_decl_nodiscard extern inline mi_decl_restrict void* mi_heap_zalloc(mi_heap_t*
 }
 
 mi_decl_nodiscard mi_decl_restrict void* mi_zalloc(size_t size) mi_attr_noexcept {
-  return mi_heap_zalloc(mi_get_default_heap(),size);
-}
-
-
-// ------------------------------------------------------
-// Check for double free in secure and debug mode
-// This is somewhat expensive so only enabled for secure mode 4
-// ------------------------------------------------------
-
-#if (MI_ENCODE_FREELIST && (MI_SECURE>=4 || MI_DEBUG!=0))
-// linear check if the free list contains a specific element
-static bool mi_list_contains(const mi_page_t* page, const mi_block_t* list, const mi_block_t* elem) {
-  while (list != NULL) {
-    if (elem==list) return true;
-    list = mi_block_next(page, list);
-  }
-  return false;
-}
-
-static mi_decl_noinline bool mi_check_is_double_freex(const mi_page_t* page, const mi_block_t* block) {
-  // The decoded value is in the same page (or NULL).
-  // Walk the free lists to verify positively if it is already freed
-  if (mi_list_contains(page, page->free, block) ||
-      mi_list_contains(page, page->local_free, block) ||
-      mi_list_contains(page, mi_page_thread_free(page), block))
-  {
-    _mi_error_message(EAGAIN, "double free detected of block %p with size %zu\n", block, mi_page_block_size(page));
-    return true;
-  }
-  return false;
-}
-
-#define mi_track_page(page,access)  { size_t psize; void* pstart = _mi_page_start(_mi_page_segment(page),page,&psize); mi_track_mem_##access( pstart, psize); }
-
-static inline bool mi_check_is_double_free(const mi_page_t* page, const mi_block_t* block) {
-  bool is_double_free = false;
-  mi_block_t* n = mi_block_nextx(page, block, page->keys); // pretend it is freed, and get the decoded first field
-  if (((uintptr_t)n & (MI_INTPTR_SIZE-1))==0 &&  // quick check: aligned pointer?
-      (n==NULL || mi_is_in_same_page(block, n))) // quick check: in same page or NULL?
-  {
-    // Suspicous: decoded value a in block is in the same page (or NULL) -- maybe a double free?
-    // (continue in separate function to improve code generation)
-    is_double_free = mi_check_is_double_freex(page, block);
-  }
-  return is_double_free;
-}
-#else
-static inline bool mi_check_is_double_free(const mi_page_t* page, const mi_block_t* block) {
-  MI_UNUSED(page);
-  MI_UNUSED(block);
-  return false;
-}
-#endif
-
-// ---------------------------------------------------------------------------
-// Check for heap block overflow by setting up padding at the end of the block
-// ---------------------------------------------------------------------------
-
-#if (MI_PADDING>0) && defined(MI_ENCODE_FREELIST) && !MI_TRACK_ENABLED
-static bool mi_page_decode_padding(const mi_page_t* page, const mi_block_t* block, size_t* delta, size_t* bsize) {
-  *bsize = mi_page_usable_block_size(page);
-  const mi_padding_t* const padding = (mi_padding_t*)((uint8_t*)block + *bsize);
-  mi_track_mem_defined(padding,sizeof(mi_padding_t));
-  *delta = padding->delta;
-  uint32_t canary = padding->canary;
-  uintptr_t keys[2]; 
-  keys[0] = page->keys[0];
-  keys[1] = page->keys[1]; 
-  bool ok = ((uint32_t)mi_ptr_encode(page,block,keys) == canary && *delta <= *bsize);
-  mi_track_mem_noaccess(padding,sizeof(mi_padding_t));
-  return ok;
-}
-
-// Return the exact usable size of a block.
-static size_t mi_page_usable_size_of(const mi_page_t* page, const mi_block_t* block) {
-  size_t bsize;
-  size_t delta;
-  bool ok = mi_page_decode_padding(page, block, &delta, &bsize);
-  mi_assert_internal(ok); mi_assert_internal(delta <= bsize);  
-  return (ok ? bsize - delta : 0);
-}
-
-static bool mi_verify_padding(const mi_page_t* page, const mi_block_t* block, size_t* size, size_t* wrong) {
-  size_t bsize;
-  size_t delta;
-  bool ok = mi_page_decode_padding(page, block, &delta, &bsize);
-  *size = *wrong = bsize;
-  if (!ok) return false;
-  mi_assert_internal(bsize >= delta);
-  *size = bsize - delta;
-  uint8_t* fill = (uint8_t*)block + bsize - delta;
-  const size_t maxpad = (delta > MI_MAX_ALIGN_SIZE ? MI_MAX_ALIGN_SIZE : delta); // check at most the first N padding bytes
-  mi_track_mem_defined(fill,maxpad);
-  for (size_t i = 0; i < maxpad; i++) {
-    if (fill[i] != MI_DEBUG_PADDING) {
-      *wrong = bsize - delta + i;
-      ok = false;
-      break;
-    }
-  }
-  mi_track_mem_noaccess(fill,maxpad);
-  return ok;
-}
-
-static void mi_check_padding(const mi_page_t* page, const mi_block_t* block) {
-  size_t size;
-  size_t wrong;
-  if (!mi_verify_padding(page,block,&size,&wrong)) {
-    _mi_error_message(EFAULT, "buffer overflow in heap block %p of size %zu: write after %zu bytes\n", block, size, wrong );
-  }
-}
-
-// When a non-thread-local block is freed, it becomes part of the thread delayed free
-// list that is freed later by the owning heap. If the exact usable size is too small to
-// contain the pointer for the delayed list, then shrink the padding (by decreasing delta)
-// so it will later not trigger an overflow error in `mi_free_block`.
-static void mi_padding_shrink(const mi_page_t* page, const mi_block_t* block, const size_t min_size) {
-  size_t bsize;
-  size_t delta;
-  bool ok = mi_page_decode_padding(page, block, &delta, &bsize);
-  mi_assert_internal(ok);
-  if (!ok || (bsize - delta) >= min_size) return;  // usually already enough space
-  mi_assert_internal(bsize >= min_size);
-  if (bsize < min_size) return;  // should never happen
-  size_t new_delta = (bsize - min_size);
-  mi_assert_internal(new_delta < bsize);
-  mi_padding_t* padding = (mi_padding_t*)((uint8_t*)block + bsize);
-  padding->delta = (uint32_t)new_delta;
-}
-#else
-static void mi_check_padding(const mi_page_t* page, const mi_block_t* block) {
-  MI_UNUSED(page);
-  MI_UNUSED(block);
-}
-
-static size_t mi_page_usable_size_of(const mi_page_t* page, const mi_block_t* block) {
-  MI_UNUSED(block);
-  return mi_page_usable_block_size(page);
-}
-
-static void mi_padding_shrink(const mi_page_t* page, const mi_block_t* block, const size_t min_size) {
-  MI_UNUSED(page);
-  MI_UNUSED(block);
-  MI_UNUSED(min_size);
-}
-#endif
-
-// only maintain stats for smaller objects if requested
-#if (MI_STAT>0)
-static void mi_stat_free(const mi_page_t* page, const mi_block_t* block) {
-  #if (MI_STAT < 2)  
-  MI_UNUSED(block);
-  #endif
-  mi_heap_t* const heap = mi_heap_get_default();
-  const size_t bsize = mi_page_usable_block_size(page);
-  #if (MI_STAT>1)
-  const size_t usize = mi_page_usable_size_of(page, block);
-  mi_heap_stat_decrease(heap, malloc, usize);
-  #endif  
-  if (bsize <= MI_MEDIUM_OBJ_SIZE_MAX) {
-    mi_heap_stat_decrease(heap, normal, bsize);
-    #if (MI_STAT > 1)
-    mi_heap_stat_decrease(heap, normal_bins[_mi_bin(bsize)], 1);
-    #endif
-  }
-  else if (bsize <= MI_LARGE_OBJ_SIZE_MAX) {
-    mi_heap_stat_decrease(heap, large, bsize);
-  }
-  else {
-    mi_heap_stat_decrease(heap, huge, bsize);
-  }
-}
-#else
-static void mi_stat_free(const mi_page_t* page, const mi_block_t* block) {
-  MI_UNUSED(page); MI_UNUSED(block);
-}
-#endif
-
-#if (MI_STAT>0)
-// maintain stats for huge objects
-static void mi_stat_huge_free(const mi_page_t* page) {
-  mi_heap_t* const heap = mi_heap_get_default();
-  const size_t bsize = mi_page_block_size(page); // to match stats in `page.c:mi_page_huge_alloc`
-  if (bsize <= MI_LARGE_OBJ_SIZE_MAX) {
-    mi_heap_stat_decrease(heap, large, bsize);
-  }
-  else {
-    mi_heap_stat_decrease(heap, huge, bsize);
-  }
-}
-#else
-static void mi_stat_huge_free(const mi_page_t* page) {
-  MI_UNUSED(page);
-}
-#endif
-
-// ------------------------------------------------------
-// Free
-// ------------------------------------------------------
-
-// multi-threaded free (or free in huge block)
-static mi_decl_noinline void _mi_free_block_mt(mi_page_t* page, mi_block_t* block)
-{
-  // The padding check may access the non-thread-owned page for the key values.
-  // that is safe as these are constant and the page won't be freed (as the block is not freed yet).
-  mi_check_padding(page, block);
-  mi_padding_shrink(page, block, sizeof(mi_block_t));       // for small size, ensure we can fit the delayed thread pointers without triggering overflow detection
-  #if (MI_DEBUG!=0) && !MI_TRACK_ENABLED                    // note: when tracking, cannot use mi_usable_size with multi-threading
-  memset(block, MI_DEBUG_FREED, mi_usable_size(block));
-  #endif
-
-  // huge page segments are always abandoned and can be freed immediately
-  mi_segment_t* segment = _mi_page_segment(page);
-  if (segment->kind==MI_SEGMENT_HUGE) {
-    mi_stat_huge_free(page);
-    _mi_segment_huge_page_free(segment, page, block);
-    return;
-  }
-
-  // Try to put the block on either the page-local thread free list, or the heap delayed free list.
-  mi_thread_free_t tfreex;
-  bool use_delayed;
-  mi_thread_free_t tfree = mi_atomic_load_relaxed(&page->xthread_free);
-  do {
-    use_delayed = (mi_tf_delayed(tfree) == MI_USE_DELAYED_FREE);
-    if mi_unlikely(use_delayed) {
-      // unlikely: this only happens on the first concurrent free in a page that is in the full list
-      tfreex = mi_tf_set_delayed(tfree,MI_DELAYED_FREEING);
-    }
-    else {
-      // usual: directly add to page thread_free list
-      mi_block_set_next(page, block, mi_tf_block(tfree));
-      tfreex = mi_tf_set_block(tfree,block);
-    }
-  } while (!mi_atomic_cas_weak_release(&page->xthread_free, &tfree, tfreex));
-
-  if mi_unlikely(use_delayed) {
-    // racy read on `heap`, but ok because MI_DELAYED_FREEING is set (see `mi_heap_delete` and `mi_heap_collect_abandon`)
-    mi_heap_t* const heap = (mi_heap_t*)(mi_atomic_load_acquire(&page->xheap)); //mi_page_heap(page);
-    mi_assert_internal(heap != NULL);
-    if (heap != NULL) {
-      // add to the delayed free list of this heap. (do this atomically as the lock only protects heap memory validity)
-      mi_block_t* dfree = mi_atomic_load_ptr_relaxed(mi_block_t, &heap->thread_delayed_free);
-      do {
-        mi_block_set_nextx(heap,block,dfree, heap->keys);
-      } while (!mi_atomic_cas_ptr_weak_release(mi_block_t,&heap->thread_delayed_free, &dfree, block));
-    }
-
-    // and reset the MI_DELAYED_FREEING flag
-    tfree = mi_atomic_load_relaxed(&page->xthread_free);
-    do {
-      tfreex = tfree;
-      mi_assert_internal(mi_tf_delayed(tfree) == MI_DELAYED_FREEING);
-      tfreex = mi_tf_set_delayed(tfree,MI_NO_DELAYED_FREE);
-    } while (!mi_atomic_cas_weak_release(&page->xthread_free, &tfree, tfreex));
-  }
-}
-
-// regular free
-static inline void _mi_free_block(mi_page_t* page, bool local, mi_block_t* block)
-{
-  // and push it on the free list
-  //const size_t bsize = mi_page_block_size(page);
-  if mi_likely(local) {
-    // owning thread can free a block directly
-    if mi_unlikely(mi_check_is_double_free(page, block)) return;
-    mi_check_padding(page, block);
-    #if (MI_DEBUG!=0) && !MI_TRACK_ENABLED
-    memset(block, MI_DEBUG_FREED, mi_page_block_size(page));
-    #endif
-    mi_block_set_next(page, block, page->local_free);
-    page->local_free = block;
-    page->used--;
-    if mi_unlikely(mi_page_all_free(page)) {
-      _mi_page_retire(page);
-    }
-    else if mi_unlikely(mi_page_is_in_full(page)) {
-      _mi_page_unfull(page);
-    }
-  }
-  else {
-    _mi_free_block_mt(page,block);
-  }
-}
-
-
-// Adjust a block that was allocated aligned, to the actual start of the block in the page.
-mi_block_t* _mi_page_ptr_unalign(const mi_segment_t* segment, const mi_page_t* page, const void* p) {
-  mi_assert_internal(page!=NULL && p!=NULL);
-  const size_t diff   = (uint8_t*)p - _mi_page_start(segment, page, NULL);
-  const size_t adjust = (diff % mi_page_block_size(page));
-  return (mi_block_t*)((uintptr_t)p - adjust);
-}
-
-
-static void mi_decl_noinline mi_free_generic(const mi_segment_t* segment, bool local, void* p) mi_attr_noexcept {
-  mi_page_t* const page = _mi_segment_page_of(segment, p);
-  mi_block_t* const block = (mi_page_has_aligned(page) ? _mi_page_ptr_unalign(segment, page, p) : (mi_block_t*)p);
-  mi_stat_free(page, block);                 // stat_free may access the padding
-  mi_track_free(p);
-  _mi_free_block(page, local, block);  
-}
-
-// Get the segment data belonging to a pointer
-// This is just a single `and` in assembly but does further checks in debug mode
-// (and secure mode) if this was a valid pointer.
-static inline mi_segment_t* mi_checked_ptr_segment(const void* p, const char* msg) 
-{
-  MI_UNUSED(msg);
-#if (MI_DEBUG>0)
-  if mi_unlikely(((uintptr_t)p & (MI_INTPTR_SIZE - 1)) != 0) {
-    _mi_error_message(EINVAL, "%s: invalid (unaligned) pointer: %p\n", msg, p);
-    return NULL;
-  }
-#endif
-
-  mi_segment_t* const segment = _mi_ptr_segment(p);
-  if mi_unlikely(segment == NULL) return NULL;  // checks also for (p==NULL)
-
-#if (MI_DEBUG>0)
-  if mi_unlikely(!mi_is_in_heap_region(p)) {
-    _mi_warning_message("%s: pointer might not point to a valid heap region: %p\n"
-      "(this may still be a valid very large allocation (over 64MiB))\n", msg, p);
-    if mi_likely(_mi_ptr_cookie(segment) == segment->cookie) {
-      _mi_warning_message("(yes, the previous pointer %p was valid after all)\n", p);
-    }
-  }
-#endif
-#if (MI_DEBUG>0 || MI_SECURE>=4)
-  if mi_unlikely(_mi_ptr_cookie(segment) != segment->cookie) {
-    _mi_error_message(EINVAL, "%s: pointer does not point to a valid heap space: %p\n", msg, p);
-    return NULL;
-  }
-#endif
-  return segment;
-}
-
-// Free a block 
-void mi_free(void* p) mi_attr_noexcept
-{
-  mi_segment_t* const segment = mi_checked_ptr_segment(p,"mi_free");
-  if mi_unlikely(segment == NULL) return; 
-
-  mi_threadid_t tid = _mi_thread_id();
-  mi_page_t* const page = _mi_segment_page_of(segment, p);
-  
-  if mi_likely(tid == mi_atomic_load_relaxed(&segment->thread_id) && page->flags.full_aligned == 0) {  // the thread id matches and it is not a full page, nor has aligned blocks
-    // local, and not full or aligned
-    mi_block_t* block = (mi_block_t*)(p);
-    if mi_unlikely(mi_check_is_double_free(page,block)) return;
-    mi_check_padding(page, block);
-    mi_stat_free(page, block);
-    #if (MI_DEBUG!=0) && !MI_TRACK_ENABLED
-    memset(block, MI_DEBUG_FREED, mi_page_block_size(page));
-    #endif
-    mi_track_free(p);
-    mi_block_set_next(page, block, page->local_free);
-    page->local_free = block;
-    if mi_unlikely(--page->used == 0) {   // using this expression generates better code than: page->used--; if (mi_page_all_free(page))    
-      _mi_page_retire(page);
-    }    
-  }
-  else {
-    // non-local, aligned blocks, or a full page; use the more generic path
-    // note: recalc page in generic to improve code generation
-    mi_free_generic(segment, tid == segment->thread_id, p);
-  }  
-}
-
-// return true if successful
-bool _mi_free_delayed_block(mi_block_t* block) {
-  // get segment and page
-  const mi_segment_t* const segment = _mi_ptr_segment(block);
-  mi_assert_internal(_mi_ptr_cookie(segment) == segment->cookie);
-  mi_assert_internal(_mi_thread_id() == segment->thread_id);
-  mi_page_t* const page = _mi_segment_page_of(segment, block);
-
-  // Clear the no-delayed flag so delayed freeing is used again for this page.
-  // This must be done before collecting the free lists on this page -- otherwise
-  // some blocks may end up in the page `thread_free` list with no blocks in the
-  // heap `thread_delayed_free` list which may cause the page to be never freed!
-  // (it would only be freed if we happen to scan it in `mi_page_queue_find_free_ex`)
-  if (!_mi_page_try_use_delayed_free(page, MI_USE_DELAYED_FREE, false /* dont overwrite never delayed */)) {
-    return false;
-  }
-
-  // collect all other non-local frees to ensure up-to-date `used` count
-  _mi_page_free_collect(page, false);
-
-  // and free the block (possibly freeing the page as well since used is updated)
-  _mi_free_block(page, true, block);
-  return true;
-}
-
-// Bytes available in a block
-mi_decl_noinline static size_t mi_page_usable_aligned_size_of(const mi_segment_t* segment, const mi_page_t* page, const void* p) mi_attr_noexcept {
-  const mi_block_t* block = _mi_page_ptr_unalign(segment, page, p);
-  const size_t size = mi_page_usable_size_of(page, block);
-  const ptrdiff_t adjust = (uint8_t*)p - (uint8_t*)block;
-  mi_assert_internal(adjust >= 0 && (size_t)adjust <= size);
-  return (size - adjust);
-}
-
-static inline size_t _mi_usable_size(const void* p, const char* msg) mi_attr_noexcept {
-  const mi_segment_t* const segment = mi_checked_ptr_segment(p, msg);
-  if (segment==NULL) return 0;  // also returns 0 if `p == NULL`
-  const mi_page_t* const page = _mi_segment_page_of(segment, p);  
-  if mi_likely(!mi_page_has_aligned(page)) {
-    const mi_block_t* block = (const mi_block_t*)p;
-    return mi_page_usable_size_of(page, block);
-  }
-  else {
-    // split out to separate routine for improved code generation
-    return mi_page_usable_aligned_size_of(segment, page, p);
-  }
-}
-
-mi_decl_nodiscard size_t mi_usable_size(const void* p) mi_attr_noexcept {
-  return _mi_usable_size(p, "mi_usable_size");
-}
-
-
-// ------------------------------------------------------
-// ensure explicit external inline definitions are emitted!
-// ------------------------------------------------------
-
-#ifdef __cplusplus
-void* _mi_externs[] = {
-  (void*)&_mi_page_malloc,
-  (void*)&_mi_heap_malloc_zero,
-  (void*)&mi_malloc,
-  (void*)&mi_malloc_small,
-  (void*)&mi_zalloc_small,
-  (void*)&mi_heap_malloc,
-  (void*)&mi_heap_zalloc,
-  (void*)&mi_heap_malloc_small
-};
-#endif
-
-
-// ------------------------------------------------------
-// Allocation extensions
-// ------------------------------------------------------
-
-void mi_free_size(void* p, size_t size) mi_attr_noexcept {
-  MI_UNUSED_RELEASE(size);
-  mi_assert(p == NULL || size <= _mi_usable_size(p,"mi_free_size"));
-  mi_free(p);
+  return mi_heap_zalloc(mi_prim_get_default_heap(),size);
 }
 
-void mi_free_size_aligned(void* p, size_t size, size_t alignment) mi_attr_noexcept {
-  MI_UNUSED_RELEASE(alignment);
-  mi_assert(((uintptr_t)p % alignment) == 0);
-  mi_free_size(p,size);
-}
-
-void mi_free_aligned(void* p, size_t alignment) mi_attr_noexcept {
-  MI_UNUSED_RELEASE(alignment);
-  mi_assert(((uintptr_t)p % alignment) == 0);
-  mi_free(p);
-}
 
 mi_decl_nodiscard extern inline mi_decl_restrict void* mi_heap_calloc(mi_heap_t* heap, size_t count, size_t size) mi_attr_noexcept {
   size_t total;
@@ -624,7 +229,7 @@ mi_decl_nodiscard extern inline mi_decl_restrict void* mi_heap_calloc(mi_heap_t*
 }
 
 mi_decl_nodiscard mi_decl_restrict void* mi_calloc(size_t count, size_t size) mi_attr_noexcept {
-  return mi_heap_calloc(mi_get_default_heap(),count,size);
+  return mi_heap_calloc(mi_prim_get_default_heap(),count,size);
 }
 
 // Uninitialized `calloc`
@@ -635,13 +240,13 @@ mi_decl_nodiscard extern mi_decl_restrict void* mi_heap_mallocn(mi_heap_t* heap,
 }
 
 mi_decl_nodiscard mi_decl_restrict void* mi_mallocn(size_t count, size_t size) mi_attr_noexcept {
-  return mi_heap_mallocn(mi_get_default_heap(),count,size);
+  return mi_heap_mallocn(mi_prim_get_default_heap(),count,size);
 }
 
 // Expand (or shrink) in place (or fail)
 void* mi_expand(void* p, size_t newsize) mi_attr_noexcept {
   #if MI_PADDING
-  // we do not shrink/expand with padding enabled 
+  // we do not shrink/expand with padding enabled
   MI_UNUSED(p); MI_UNUSED(newsize);
   return NULL;
   #else
@@ -656,11 +261,12 @@ void* _mi_heap_realloc_zero(mi_heap_t* heap, void* p, size_t newsize, bool zero)
   // if p == NULL then behave as malloc.
   // else if size == 0 then reallocate to a zero-sized block (and don't return NULL, just as mi_malloc(0)).
   // (this means that returning NULL always indicates an error, and `p` will not have been freed in that case.)
-  const size_t size = _mi_usable_size(p,"mi_realloc"); // also works if p == NULL (with size 0)
+  const size_t size = (p==NULL ? 0 : _mi_usable_size(p,"mi_realloc"));
   if mi_unlikely(newsize <= size && newsize >= (size / 2) && newsize > 0) {  // note: newsize must be > 0 or otherwise we return NULL for realloc(NULL,0)
-    // todo: adjust potential padding to reflect the new size?
-    mi_track_free(p);
-    mi_track_malloc(p,newsize,true);
+    mi_assert_internal(p!=NULL);
+    // todo: do not track as the usable size is still the same in the free; adjust potential padding?
+    // mi_track_resize(p,size,newsize)
+    // if (newsize < size) { mi_track_mem_noaccess((uint8_t*)p + newsize, size - newsize); }
     return p;  // reallocation still fits and not more than 50% waste
   }
   void* newp = mi_heap_malloc(heap,newsize);
@@ -668,14 +274,15 @@ void* _mi_heap_realloc_zero(mi_heap_t* heap, void* p, size_t newsize, bool zero)
     if (zero && newsize > size) {
       // also set last word in the previous allocation to zero to ensure any padding is zero-initialized
       const size_t start = (size >= sizeof(intptr_t) ? size - sizeof(intptr_t) : 0);
-      memset((uint8_t*)newp + start, 0, newsize - start);
+      _mi_memzero((uint8_t*)newp + start, newsize - start);
+    }
+    else if (newsize == 0) {
+      ((uint8_t*)newp)[0] = 0; // work around for applications that expect zero-reallocation to be zero initialized (issue #725)
     }
     if mi_likely(p != NULL) {
-      if mi_likely(_mi_is_aligned(p, sizeof(uintptr_t))) {  // a client may pass in an arbitrary pointer `p`..
-        const size_t copysize = (newsize > size ? size : newsize);
-        mi_track_mem_defined(p,copysize);  // _mi_useable_size may be too large for byte precise memory tracking..
-        _mi_memcpy_aligned(newp, p, copysize);
-      }
+      const size_t copysize = (newsize > size ? size : newsize);
+      mi_track_mem_defined(p,copysize);  // _mi_useable_size may be too large for byte precise memory tracking..
+      _mi_memcpy(newp, p, copysize);
       mi_free(p); // only free the original pointer if successful
     }
   }
@@ -683,7 +290,7 @@ void* _mi_heap_realloc_zero(mi_heap_t* heap, void* p, size_t newsize, bool zero)
 }
 
 mi_decl_nodiscard void* mi_heap_realloc(mi_heap_t* heap, void* p, size_t newsize) mi_attr_noexcept {
-  return _mi_heap_realloc_zero(heap, p, newsize, false);  
+  return _mi_heap_realloc_zero(heap, p, newsize, false);
 }
 
 mi_decl_nodiscard void* mi_heap_reallocn(mi_heap_t* heap, void* p, size_t count, size_t size) mi_attr_noexcept {
@@ -712,24 +319,24 @@ mi_decl_nodiscard void* mi_heap_recalloc(mi_heap_t* heap, void* p, size_t count,
 
 
 mi_decl_nodiscard void* mi_realloc(void* p, size_t newsize) mi_attr_noexcept {
-  return mi_heap_realloc(mi_get_default_heap(),p,newsize);
+  return mi_heap_realloc(mi_prim_get_default_heap(),p,newsize);
 }
 
 mi_decl_nodiscard void* mi_reallocn(void* p, size_t count, size_t size) mi_attr_noexcept {
-  return mi_heap_reallocn(mi_get_default_heap(),p,count,size);
+  return mi_heap_reallocn(mi_prim_get_default_heap(),p,count,size);
 }
 
 // Reallocate but free `p` on errors
 mi_decl_nodiscard void* mi_reallocf(void* p, size_t newsize) mi_attr_noexcept {
-  return mi_heap_reallocf(mi_get_default_heap(),p,newsize);
+  return mi_heap_reallocf(mi_prim_get_default_heap(),p,newsize);
 }
 
 mi_decl_nodiscard void* mi_rezalloc(void* p, size_t newsize) mi_attr_noexcept {
-  return mi_heap_rezalloc(mi_get_default_heap(), p, newsize);
+  return mi_heap_rezalloc(mi_prim_get_default_heap(), p, newsize);
 }
 
 mi_decl_nodiscard void* mi_recalloc(void* p, size_t count, size_t size) mi_attr_noexcept {
-  return mi_heap_recalloc(mi_get_default_heap(), p, count, size);
+  return mi_heap_recalloc(mi_prim_get_default_heap(), p, count, size);
 }
 
 
@@ -741,31 +348,31 @@ mi_decl_nodiscard void* mi_recalloc(void* p, size_t count, size_t size) mi_attr_
 // `strdup` using mi_malloc
 mi_decl_nodiscard mi_decl_restrict char* mi_heap_strdup(mi_heap_t* heap, const char* s) mi_attr_noexcept {
   if (s == NULL) return NULL;
-  size_t n = strlen(s);
-  char* t = (char*)mi_heap_malloc(heap,n+1);
-  if (t != NULL) _mi_memcpy(t, s, n + 1);
+  size_t len = _mi_strlen(s);
+  char* t = (char*)mi_heap_malloc(heap,len+1);
+  if (t == NULL) return NULL;
+  _mi_memcpy(t, s, len);
+  t[len] = 0;
   return t;
 }
 
 mi_decl_nodiscard mi_decl_restrict char* mi_strdup(const char* s) mi_attr_noexcept {
-  return mi_heap_strdup(mi_get_default_heap(), s);
+  return mi_heap_strdup(mi_prim_get_default_heap(), s);
 }
 
 // `strndup` using mi_malloc
 mi_decl_nodiscard mi_decl_restrict char* mi_heap_strndup(mi_heap_t* heap, const char* s, size_t n) mi_attr_noexcept {
   if (s == NULL) return NULL;
-  const char* end = (const char*)memchr(s, 0, n);  // find end of string in the first `n` characters (returns NULL if not found)
-  const size_t m = (end != NULL ? (size_t)(end - s) : n);  // `m` is the minimum of `n` or the end-of-string
-  mi_assert_internal(m <= n);
-  char* t = (char*)mi_heap_malloc(heap, m+1);
+  const size_t len = _mi_strnlen(s,n);  // len <= n
+  char* t = (char*)mi_heap_malloc(heap, len+1);
   if (t == NULL) return NULL;
-  _mi_memcpy(t, s, m);
-  t[m] = 0;
+  _mi_memcpy(t, s, len);
+  t[len] = 0;
   return t;
 }
 
 mi_decl_nodiscard mi_decl_restrict char* mi_strndup(const char* s, size_t n) mi_attr_noexcept {
-  return mi_heap_strndup(mi_get_default_heap(),s,n);
+  return mi_heap_strndup(mi_prim_get_default_heap(),s,n);
 }
 
 #ifndef __wasi__
@@ -774,7 +381,7 @@ mi_decl_nodiscard mi_decl_restrict char* mi_strndup(const char* s, size_t n) mi_
 #ifndef PATH_MAX
 #define PATH_MAX MAX_PATH
 #endif
-#include <windows.h>
+
 mi_decl_nodiscard mi_decl_restrict char* mi_heap_realpath(mi_heap_t* heap, const char* fname, char* resolved_name) mi_attr_noexcept {
   // todo: use GetFullPathNameW to allow longer file names
   char buf[PATH_MAX];
@@ -793,6 +400,7 @@ mi_decl_nodiscard mi_decl_restrict char* mi_heap_realpath(mi_heap_t* heap, const
   }
 }
 #else
+/*
 #include <unistd.h>  // pathconf
 static size_t mi_path_max(void) {
   static size_t path_max = 0;
@@ -804,25 +412,37 @@ static size_t mi_path_max(void) {
   }
   return path_max;
 }
-
+*/
 char* mi_heap_realpath(mi_heap_t* heap, const char* fname, char* resolved_name) mi_attr_noexcept {
   if (resolved_name != NULL) {
     return realpath(fname,resolved_name);
   }
   else {
-    size_t n  = mi_path_max();
+    char* rname = realpath(fname, NULL);
+    if (rname == NULL) return NULL;
+    char* result = mi_heap_strdup(heap, rname);
+    mi_cfree(rname);  // use checked free (which may be redirected to our free but that's ok)
+    // note: with ASAN realpath is intercepted and mi_cfree may leak the returned pointer :-(
+    return result;
+  }
+  /*
+    const size_t n  = mi_path_max();
     char* buf = (char*)mi_malloc(n+1);
-    if (buf==NULL) return NULL;
+    if (buf == NULL) {
+      errno = ENOMEM;
+      return NULL;
+    }
     char* rname  = realpath(fname,buf);
     char* result = mi_heap_strndup(heap,rname,n); // ok if `rname==NULL`
     mi_free(buf);
     return result;
   }
+  */
 }
 #endif
 
 mi_decl_nodiscard mi_decl_restrict char* mi_realpath(const char* fname, char* resolved_name) mi_attr_noexcept {
-  return mi_heap_realpath(mi_get_default_heap(),fname,resolved_name);
+  return mi_heap_realpath(mi_prim_get_default_heap(),fname,resolved_name);
 }
 #endif
 
@@ -843,12 +463,16 @@ static bool mi_try_new_handler(bool nothrow) {
   #else
     std::new_handler h = std::set_new_handler();
     std::set_new_handler(h);
-  #endif  
+  #endif
   if (h==NULL) {
-    _mi_error_message(ENOMEM, "out of memory in 'new'");      
+    _mi_error_message(ENOMEM, "out of memory in 'new'");
+    #if defined(_CPPUNWIND) || defined(__cpp_exceptions)  // exceptions are not always enabled
     if (!nothrow) {
       throw std::bad_alloc();
     }
+    #else
+    MI_UNUSED(nothrow);
+    #endif
     return false;
   }
   else {
@@ -876,7 +500,7 @@ static std_new_handler_t mi_get_new_handler() {
 static bool mi_try_new_handler(bool nothrow) {
   std_new_handler_t h = mi_get_new_handler();
   if (h==NULL) {
-    _mi_error_message(ENOMEM, "out of memory in 'new'");       
+    _mi_error_message(ENOMEM, "out of memory in 'new'");
     if (!nothrow) {
       abort();  // cannot throw in plain C, use abort
     }
@@ -889,20 +513,46 @@ static bool mi_try_new_handler(bool nothrow) {
 }
 #endif
 
-static mi_decl_noinline void* mi_try_new(size_t size, bool nothrow ) {
+mi_decl_export mi_decl_noinline void* mi_heap_try_new(mi_heap_t* heap, size_t size, bool nothrow ) {
   void* p = NULL;
   while(p == NULL && mi_try_new_handler(nothrow)) {
-    p = mi_malloc(size);
+    p = mi_heap_malloc(heap,size);
   }
   return p;
 }
 
-mi_decl_nodiscard mi_decl_restrict void* mi_new(size_t size) {
-  void* p = mi_malloc(size);
-  if mi_unlikely(p == NULL) return mi_try_new(size,false);
+static mi_decl_noinline void* mi_try_new(size_t size, bool nothrow) {
+  return mi_heap_try_new(mi_prim_get_default_heap(), size, nothrow);
+}
+
+
+mi_decl_nodiscard mi_decl_restrict void* mi_heap_alloc_new(mi_heap_t* heap, size_t size) {
+  void* p = mi_heap_malloc(heap,size);
+  if mi_unlikely(p == NULL) return mi_heap_try_new(heap, size, false);
   return p;
 }
 
+mi_decl_nodiscard mi_decl_restrict void* mi_new(size_t size) {
+  return mi_heap_alloc_new(mi_prim_get_default_heap(), size);
+}
+
+
+mi_decl_nodiscard mi_decl_restrict void* mi_heap_alloc_new_n(mi_heap_t* heap, size_t count, size_t size) {
+  size_t total;
+  if mi_unlikely(mi_count_size_overflow(count, size, &total)) {
+    mi_try_new_handler(false);  // on overflow we invoke the try_new_handler once to potentially throw std::bad_alloc
+    return NULL;
+  }
+  else {
+    return mi_heap_alloc_new(heap,total);
+  }
+}
+
+mi_decl_nodiscard mi_decl_restrict void* mi_new_n(size_t count, size_t size) {
+  return mi_heap_alloc_new_n(mi_prim_get_default_heap(), count, size);
+}
+
+
 mi_decl_nodiscard mi_decl_restrict void* mi_new_nothrow(size_t size) mi_attr_noexcept {
   void* p = mi_malloc(size);
   if mi_unlikely(p == NULL) return mi_try_new(size, true);
@@ -927,17 +577,6 @@ mi_decl_nodiscard mi_decl_restrict void* mi_new_aligned_nothrow(size_t size, siz
   return p;
 }
 
-mi_decl_nodiscard mi_decl_restrict void* mi_new_n(size_t count, size_t size) {
-  size_t total;
-  if mi_unlikely(mi_count_size_overflow(count, size, &total)) {
-    mi_try_new_handler(false);  // on overflow we invoke the try_new_handler once to potentially throw std::bad_alloc
-    return NULL;
-  }
-  else {
-    return mi_new(total);
-  }
-}
-
 mi_decl_nodiscard void* mi_new_realloc(void* p, size_t newsize) {
   void* q;
   do {
@@ -956,3 +595,103 @@ mi_decl_nodiscard void* mi_new_reallocn(void* p, size_t newcount, size_t size) {
     return mi_new_realloc(p, total);
   }
 }
+
+#if MI_GUARDED
+// We always allocate a guarded allocation at an offset (`mi_page_has_aligned` will be true).
+// We then set the first word of the block to `0` for regular offset aligned allocations (in `alloc-aligned.c`)
+// and the first word to `~0` for guarded allocations to have a correct `mi_usable_size`
+
+static void* mi_block_ptr_set_guarded(mi_block_t* block, size_t obj_size) {
+  // TODO: we can still make padding work by moving it out of the guard page area
+  mi_page_t* const page = _mi_ptr_page(block);
+  mi_page_set_has_aligned(page, true);
+  block->next = MI_BLOCK_TAG_GUARDED;
+
+  // set guard page at the end of the block
+  const size_t block_size = mi_page_block_size(page);  // must use `block_size` to match `mi_free_local`
+  const size_t os_page_size = _mi_os_page_size();
+  mi_assert_internal(block_size >= obj_size + os_page_size + sizeof(mi_block_t));
+  if (block_size < obj_size + os_page_size + sizeof(mi_block_t)) {
+    // should never happen
+    mi_free(block);
+    return NULL;
+  }
+  uint8_t* guard_page = (uint8_t*)block + block_size - os_page_size;
+  // note: the alignment of the guard page relies on blocks being os_page_size aligned which
+  // is ensured in `mi_arena_page_alloc_fresh`.
+  mi_assert_internal(_mi_is_aligned(block, os_page_size));
+  mi_assert_internal(_mi_is_aligned(guard_page, os_page_size));
+  if (!page->memid.is_pinned && _mi_is_aligned(guard_page, os_page_size)) {
+    _mi_os_protect(guard_page, os_page_size);
+  }
+  else {
+    _mi_warning_message("unable to set a guard page behind an object due to pinned memory (large OS pages?) (object %p of size %zu)\n", block, block_size);
+  }
+
+  // align pointer just in front of the guard page
+  size_t offset = block_size - os_page_size - obj_size;
+  mi_assert_internal(offset > sizeof(mi_block_t));
+  if (offset > MI_PAGE_MAX_OVERALLOC_ALIGN) {
+    // give up to place it right in front of the guard page if the offset is too large for unalignment
+    offset = MI_PAGE_MAX_OVERALLOC_ALIGN;
+  }
+  void* p = (uint8_t*)block + offset;
+  mi_track_align(block, p, offset, obj_size);
+  mi_track_mem_defined(block, sizeof(mi_block_t));
+  return p;
+}
+
+mi_decl_restrict void* _mi_heap_malloc_guarded(mi_heap_t* heap, size_t size, bool zero) mi_attr_noexcept
+{
+  #if defined(MI_PADDING_SIZE)
+  mi_assert(MI_PADDING_SIZE==0);
+  #endif
+  // allocate multiple of page size ending in a guard page
+  // ensure minimal alignment requirement?
+  const size_t os_page_size = _mi_os_page_size();
+  const size_t obj_size = (mi_option_is_enabled(mi_option_guarded_precise) ? size : _mi_align_up(size, MI_MAX_ALIGN_SIZE));
+  const size_t bsize    = _mi_align_up(_mi_align_up(obj_size, MI_MAX_ALIGN_SIZE) + sizeof(mi_block_t), MI_MAX_ALIGN_SIZE);
+  const size_t req_size = _mi_align_up(bsize + os_page_size, os_page_size);
+  mi_block_t* const block = (mi_block_t*)_mi_malloc_generic(heap, req_size, zero, 0 /* huge_alignment */);
+  if (block==NULL) return NULL;
+  void* const p = mi_block_ptr_set_guarded(block, obj_size);
+
+  // stats
+  mi_track_malloc(p, size, zero);
+  if (p != NULL) {
+    if (!mi_heap_is_initialized(heap)) { heap = mi_prim_get_default_heap(); }
+    #if MI_STAT>1
+    mi_heap_stat_adjust_decrease(heap, malloc_requested, req_size);
+    mi_heap_stat_increase(heap, malloc_requested, size);
+    #endif
+    mi_heap_stat_counter_increase(heap, malloc_guarded_count, 1);
+  }
+  #if MI_DEBUG>3
+  if (p != NULL && zero) {
+    mi_assert_expensive(mi_mem_is_zero(p, size));
+  }
+  #endif
+  return p;
+}
+#endif
+
+// ------------------------------------------------------
+// ensure explicit external inline definitions are emitted!
+// ------------------------------------------------------
+
+#ifdef __cplusplus
+void* _mi_externs[] = {
+  (void*)&_mi_page_malloc,
+  (void*)&_mi_page_malloc_zero,
+  (void*)&_mi_heap_malloc_zero,
+  (void*)&_mi_heap_malloc_zero_ex,
+  (void*)&mi_malloc,
+  (void*)&mi_malloc_small,
+  (void*)&mi_zalloc_small,
+  (void*)&mi_heap_malloc,
+  (void*)&mi_heap_zalloc,
+  (void*)&mi_heap_malloc_small
+  // (void*)&mi_heap_alloc_new,
+  // (void*)&mi_heap_alloc_new_n
+};
+#endif
diff --git a/depends/mimalloc/src/arena-meta.c b/depends/mimalloc/src/arena-meta.c
new file mode 100644
index 000000000000..3b64ab9b6367
--- /dev/null
+++ b/depends/mimalloc/src/arena-meta.c
@@ -0,0 +1,179 @@
+/* ----------------------------------------------------------------------------
+Copyright (c) 2019-2024, Microsoft Research, Daan Leijen
+This is free software; you can redistribute it and/or modify it under the
+terms of the MIT license. A copy of the license can be found in the file
+"LICENSE" at the root of this distribution.
+-----------------------------------------------------------------------------*/
+
+/* ----------------------------------------------------------------------------
+  We have a special "mini" allocator just for allocation of meta-data like
+  the heap (`mi_heap_t`) or thread-local data (`mi_tld_t`).
+
+  We reuse the bitmap of the arena's for allocation of 64b blocks inside
+  an arena slice (64KiB).
+  We always ensure that meta data is zero'd (we zero on `free`)
+-----------------------------------------------------------------------------*/
+
+#include "mimalloc.h"
+#include "mimalloc/internal.h"
+#include "bitmap.h"
+
+/* -----------------------------------------------------------
+  Meta data allocation
+----------------------------------------------------------- */
+
+#define MI_META_PAGE_SIZE         MI_ARENA_SLICE_SIZE
+#define MI_META_PAGE_ALIGN        MI_ARENA_SLICE_ALIGN
+
+// large enough such that META_MAX_SIZE > 4k (even on 32-bit)
+#define MI_META_BLOCK_SIZE        (1 << (16 - MI_BCHUNK_BITS_SHIFT))        // 128 on 64-bit
+#define MI_META_BLOCK_ALIGN       MI_META_BLOCK_SIZE
+#define MI_META_BLOCKS_PER_PAGE   (MI_META_PAGE_SIZE / MI_META_BLOCK_SIZE)  // 512
+#define MI_META_MAX_SIZE          (MI_BCHUNK_SIZE * MI_META_BLOCK_SIZE)
+
+#if MI_META_MAX_SIZE <= 4096
+#error "max meta object size should be at least 4KiB"
+#endif
+
+typedef struct mi_meta_page_s  {
+  _Atomic(struct mi_meta_page_s*)  next;    // a linked list of meta-data pages (never released)
+  mi_memid_t                       memid;   // provenance of the meta-page memory itself
+  mi_bbitmap_t                     blocks_free;  // a small bitmap with 1 bit per block.
+} mi_meta_page_t;
+
+static mi_decl_cache_align _Atomic(mi_meta_page_t*)  mi_meta_pages = MI_ATOMIC_VAR_INIT(NULL);
+
+
+#if MI_DEBUG > 1
+static mi_meta_page_t* mi_meta_page_of_ptr(void* p, size_t* block_idx) {
+  mi_meta_page_t* mpage = (mi_meta_page_t*)((uint8_t*)mi_align_down_ptr(p,MI_META_PAGE_ALIGN) + _mi_os_secure_guard_page_size());
+  if (block_idx != NULL) {
+    *block_idx = ((uint8_t*)p - (uint8_t*)mpage) / MI_META_BLOCK_SIZE;
+  }
+  return mpage;
+}
+#endif 
+
+static mi_meta_page_t* mi_meta_page_next( mi_meta_page_t* mpage ) {
+  return mi_atomic_load_ptr_acquire(mi_meta_page_t, &mpage->next);
+}
+
+static void* mi_meta_block_start( mi_meta_page_t* mpage, size_t block_idx ) {
+  mi_assert_internal(_mi_is_aligned((uint8_t*)mpage - _mi_os_secure_guard_page_size(), MI_META_PAGE_ALIGN));
+  mi_assert_internal(block_idx < MI_META_BLOCKS_PER_PAGE);
+  void* p = ((uint8_t*)mpage - _mi_os_secure_guard_page_size() + (block_idx * MI_META_BLOCK_SIZE));
+  mi_assert_internal(mpage == mi_meta_page_of_ptr(p,NULL));
+  return p;
+}
+
+// allocate a fresh meta page and add it to the global list.
+static mi_meta_page_t* mi_meta_page_zalloc(void) {
+  // allocate a fresh arena slice
+  // note: careful with _mi_subproc as it may recurse into mi_tld and meta_page_zalloc again.. (same with _mi_os_numa_node()...)
+  mi_memid_t memid;
+  uint8_t* base = (uint8_t*)_mi_arenas_alloc_aligned(_mi_subproc(), MI_META_PAGE_SIZE, MI_META_PAGE_ALIGN, 0,
+                                                                    true /* commit*/, (MI_SECURE==0) /* allow large? */,
+                                                                    NULL /* req arena */, 0 /* thread_seq */, -1 /* numa node */, &memid);
+  if (base == NULL) return NULL;
+  mi_assert_internal(_mi_is_aligned(base,MI_META_PAGE_ALIGN));
+  if (!memid.initially_zero) {
+    _mi_memzero_aligned(base, MI_ARENA_SLICE_SIZE);
+  }
+
+  // guard pages
+  #if MI_SECURE >= 1
+  _mi_os_secure_guard_page_set_at(base, memid);
+  _mi_os_secure_guard_page_set_before(base + MI_META_PAGE_SIZE, memid);
+  #endif
+  
+  // initialize the page and free block bitmap
+  mi_meta_page_t* mpage = (mi_meta_page_t*)(base + _mi_os_secure_guard_page_size());
+  mpage->memid = memid;
+  mi_bbitmap_init(&mpage->blocks_free, MI_META_BLOCKS_PER_PAGE, true /* already_zero */);
+  const size_t mpage_size  = offsetof(mi_meta_page_t,blocks_free) + mi_bbitmap_size(MI_META_BLOCKS_PER_PAGE, NULL);
+  const size_t info_blocks = _mi_divide_up(mpage_size,MI_META_BLOCK_SIZE);
+  const size_t guard_blocks = _mi_divide_up(_mi_os_secure_guard_page_size(), MI_META_BLOCK_SIZE);
+  mi_assert_internal(info_blocks + 2*guard_blocks < MI_META_BLOCKS_PER_PAGE);  
+  mi_bbitmap_unsafe_setN(&mpage->blocks_free, info_blocks + guard_blocks, MI_META_BLOCKS_PER_PAGE - info_blocks - 2*guard_blocks);
+
+  // push atomically in front of the meta page list
+  // (note: there is no ABA issue since we never free meta-pages)
+  mi_meta_page_t* old = mi_atomic_load_ptr_acquire(mi_meta_page_t,&mi_meta_pages);
+  do {
+    mi_atomic_store_ptr_release(mi_meta_page_t, &mpage->next, old);
+  } while(!mi_atomic_cas_ptr_weak_acq_rel(mi_meta_page_t,&mi_meta_pages,&old,mpage));
+  return mpage;
+}
+
+
+// allocate meta-data
+mi_decl_noinline void* _mi_meta_zalloc( size_t size, mi_memid_t* pmemid )
+{
+  mi_assert_internal(pmemid != NULL);
+  size = _mi_align_up(size,MI_META_BLOCK_SIZE);
+  if (size == 0 || size > MI_META_MAX_SIZE) return NULL;
+  const size_t block_count = _mi_divide_up(size,MI_META_BLOCK_SIZE);
+  mi_assert_internal(block_count > 0 && block_count < MI_BCHUNK_BITS);
+  mi_meta_page_t* mpage0 = mi_atomic_load_ptr_acquire(mi_meta_page_t,&mi_meta_pages);
+  mi_meta_page_t* mpage = mpage0;
+  while (mpage != NULL) {
+    size_t block_idx;
+    if (mi_bbitmap_try_find_and_clearN(&mpage->blocks_free, block_count, 0, &block_idx)) {
+      // found and claimed `block_count` blocks
+      *pmemid = _mi_memid_create_meta(mpage, block_idx, block_count);
+      return mi_meta_block_start(mpage,block_idx);
+    }
+    else {
+      mpage = mi_meta_page_next(mpage);
+    }
+  }
+  // failed to find space in existing pages
+  if (mi_atomic_load_ptr_acquire(mi_meta_page_t,&mi_meta_pages) != mpage0) {
+    // the page list was updated by another thread in the meantime, retry
+    return _mi_meta_zalloc(size,pmemid);
+  }
+  // otherwise, allocate a fresh metapage and try once more
+  mpage = mi_meta_page_zalloc();
+  if (mpage != NULL) {
+    size_t block_idx;
+    if (mi_bbitmap_try_find_and_clearN(&mpage->blocks_free, block_count, 0, &block_idx)) {
+      // found and claimed `block_count` blocks
+      *pmemid = _mi_memid_create_meta(mpage, block_idx, block_count);
+      return mi_meta_block_start(mpage,block_idx);
+    }
+  }
+  // if all this failed, allocate from the OS
+  return _mi_os_alloc(size, pmemid);
+}
+
+// free meta-data
+mi_decl_noinline void _mi_meta_free(void* p, size_t size, mi_memid_t memid) {
+  if (p==NULL) return;
+  if (memid.memkind == MI_MEM_META) {
+    mi_assert_internal(_mi_divide_up(size, MI_META_BLOCK_SIZE) == memid.mem.meta.block_count);
+    const size_t block_count = memid.mem.meta.block_count;
+    const size_t block_idx   = memid.mem.meta.block_index;
+    mi_meta_page_t* mpage = (mi_meta_page_t*)memid.mem.meta.meta_page; 
+    mi_assert_internal(mi_meta_page_of_ptr(p,NULL) == mpage);
+    mi_assert_internal(block_idx + block_count <= MI_META_BLOCKS_PER_PAGE);
+    mi_assert_internal(mi_bbitmap_is_clearN(&mpage->blocks_free, block_idx, block_count));
+    // we zero on free (and on the initial page allocation) so we don't need a "dirty" map
+    _mi_memzero_aligned(mi_meta_block_start(mpage, block_idx), block_count*MI_META_BLOCK_SIZE);
+    mi_bbitmap_setN(&mpage->blocks_free, block_idx, block_count);
+  }
+  else {
+    _mi_arenas_free(p,size,memid);
+  }
+}
+
+// used for debug output
+bool _mi_meta_is_meta_page(void* p) 
+{
+  mi_meta_page_t* mpage0 = mi_atomic_load_ptr_acquire(mi_meta_page_t, &mi_meta_pages);
+  mi_meta_page_t* mpage = mpage0;
+  while (mpage != NULL) {
+    if ((void*)mpage == p) return true;
+    mpage = mi_meta_page_next(mpage);    
+  }
+  return false;
+}
diff --git a/depends/mimalloc/src/arena.c b/depends/mimalloc/src/arena.c
index 239c56675619..b26f444288f5 100644
--- a/depends/mimalloc/src/arena.c
+++ b/depends/mimalloc/src/arena.c
@@ -1,5 +1,5 @@
 /* ----------------------------------------------------------------------------
-Copyright (c) 2019-2022, Microsoft Research, Daan Leijen
+Copyright (c) 2019-2024, Microsoft Research, Daan Leijen
 This is free software; you can redistribute it and/or modify it under the
 terms of the MIT license. A copy of the license can be found in the file
 "LICENSE" at the root of this distribution.
@@ -11,140 +11,155 @@ large blocks (>= MI_ARENA_MIN_BLOCK_SIZE, 4MiB).
 In contrast to the rest of mimalloc, the arenas are shared between
 threads and need to be accessed using atomic operations.
 
-Currently arenas are only used to for huge OS page (1GiB) reservations,
-or direct OS memory reservations -- otherwise it delegates to direct allocation from the OS.
-In the future, we can expose an API to manually add more kinds of arenas
-which is sometimes needed for embedded devices or shared memory for example.
-(We can also employ this with WASI or `sbrk` systems to reserve large arenas
- on demand and be able to reuse them efficiently).
+Arenas are also used to for huge OS page (1GiB) reservations or for reserving
+OS memory upfront which can be improve performance or is sometimes needed
+on embedded devices. We can also employ this with WASI or `sbrk` systems
+to reserve large arenas upfront and be able to reuse the memory more effectively.
 
-The arena allocation needs to be thread safe and we use an atomic bitmap to allocate. 
+The arena allocation needs to be thread safe and we use an atomic bitmap to allocate.
 -----------------------------------------------------------------------------*/
-#include "mimalloc.h"
-#include "mimalloc-internal.h"
-#include "mimalloc-atomic.h"
-
-#include <string.h>  // memset
-#include <errno.h> // ENOMEM
 
-#include "bitmap.h"  // atomic bitmap
+#include "mimalloc.h"
+#include "mimalloc/internal.h"
+#include "bitmap.h"
 
 
-// os.c
-void* _mi_os_alloc_aligned(size_t size, size_t alignment, bool commit, bool* large, mi_stats_t* stats);
-void  _mi_os_free_ex(void* p, size_t size, bool was_committed, mi_stats_t* stats);
+/* -----------------------------------------------------------
+  Arena id's
+----------------------------------------------------------- */
 
-void* _mi_os_alloc_huge_os_pages(size_t pages, int numa_node, mi_msecs_t max_secs, size_t* pages_reserved, size_t* psize);
-void  _mi_os_free_huge_pages(void* p, size_t size, mi_stats_t* stats);
+mi_arena_id_t _mi_arena_id_none(void) {
+  return NULL;
+}
 
-bool  _mi_os_commit(void* p, size_t size, bool* is_zero, mi_stats_t* stats);
-bool  _mi_os_decommit(void* addr, size_t size, mi_stats_t* stats);
+mi_arena_t* _mi_arena_from_id(mi_arena_id_t id) {
+  return (mi_arena_t*)id;
+}
 
 
-/* -----------------------------------------------------------
-  Arena allocation
------------------------------------------------------------ */
+static bool mi_arena_id_is_suitable(mi_arena_t* arena, mi_arena_t* req_arena) {
+  return ((arena == req_arena) ||                        // they match,
+          (req_arena == NULL && !arena->is_exclusive));  // or the arena is not exclusive, and we didn't request a specific one
+}
 
-// Block info: bit 0 contains the `in_use` bit, the upper bits the
-// size in count of arena blocks.
-typedef uintptr_t mi_block_info_t;
-#define MI_ARENA_BLOCK_SIZE   (MI_SEGMENT_SIZE)        // 8MiB  (must be at least MI_SEGMENT_ALIGN)
-#define MI_ARENA_MIN_OBJ_SIZE (MI_ARENA_BLOCK_SIZE/2)  // 4MiB
-#define MI_MAX_ARENAS         (64)                     // not more than 126 (since we use 7 bits in the memid and an arena index + 1)
-
-// A memory arena descriptor
-typedef struct mi_arena_s {
-  mi_arena_id_t id;                       // arena id; 0 for non-specific
-  bool     exclusive;                     // only allow allocations if specifically for this arena
-  _Atomic(uint8_t*) start;                // the start of the memory area
-  size_t   block_count;                   // size of the area in arena blocks (of `MI_ARENA_BLOCK_SIZE`)
-  size_t   field_count;                   // number of bitmap fields (where `field_count * MI_BITMAP_FIELD_BITS >= block_count`)
-  int      numa_node;                     // associated NUMA node
-  bool     is_zero_init;                  // is the arena zero initialized?
-  bool     allow_decommit;                // is decommit allowed? if true, is_large should be false and blocks_committed != NULL
-  bool     is_large;                      // large- or huge OS pages (always committed)
-  _Atomic(size_t) search_idx;             // optimization to start the search for free blocks
-  mi_bitmap_field_t* blocks_dirty;        // are the blocks potentially non-zero?
-  mi_bitmap_field_t* blocks_committed;    // are the blocks committed? (can be NULL for memory that cannot be decommitted)
-  mi_bitmap_field_t  blocks_inuse[1];     // in-place bitmap of in-use blocks (of size `field_count`)
-} mi_arena_t;
-
-
-// The available arenas
-static mi_decl_cache_align _Atomic(mi_arena_t*) mi_arenas[MI_MAX_ARENAS];
-static mi_decl_cache_align _Atomic(size_t)      mi_arena_count; // = 0
+bool _mi_arena_memid_is_suitable(mi_memid_t memid, mi_arena_t* request_arena) {
+  if (memid.memkind == MI_MEM_ARENA) {
+    return mi_arena_id_is_suitable(memid.mem.arena.arena, request_arena);
+  }
+  else {
+    return mi_arena_id_is_suitable(NULL, request_arena);
+  }
+}
 
+size_t mi_arenas_get_count(mi_subproc_t* subproc) {
+  return mi_atomic_load_relaxed(&subproc->arena_count);
+}
 
-/* -----------------------------------------------------------
-  Arena id's
-  0 is used for non-arena's (like OS memory)
-  id = arena_index + 1
------------------------------------------------------------ */
+mi_arena_t* mi_arena_from_index(mi_subproc_t* subproc, size_t idx) {
+  mi_assert_internal(idx < mi_arenas_get_count(subproc));
+  return mi_atomic_load_ptr_relaxed(mi_arena_t, &subproc->arenas[idx]);
+}
 
-static size_t mi_arena_id_index(mi_arena_id_t id) {
-  return (size_t)(id <= 0 ? MI_MAX_ARENAS : id - 1);
+static size_t mi_arena_info_slices(mi_arena_t* arena) {
+  return arena->info_slices;
 }
 
-static mi_arena_id_t mi_arena_id_create(size_t arena_index) {
-  mi_assert_internal(arena_index < MI_MAX_ARENAS);
-  mi_assert_internal(MI_MAX_ARENAS <= 126);
-  int id = (int)arena_index + 1;
-  mi_assert_internal(id >= 1 && id <= 127);
-  return id;
+#if MI_DEBUG > 1
+static bool mi_arena_has_page(mi_arena_t* arena, mi_page_t* page) {
+  return (page->memid.memkind == MI_MEM_ARENA &&
+          page->memid.mem.arena.arena == arena &&
+          mi_bitmap_is_setN(arena->pages, page->memid.mem.arena.slice_index, 1));
 }
+#endif
 
-mi_arena_id_t _mi_arena_id_none(void) {
-  return 0;
+size_t mi_arena_min_alignment(void) {
+  return MI_ARENA_SLICE_ALIGN;
 }
 
-static bool mi_arena_id_is_suitable(mi_arena_id_t arena_id, bool arena_is_exclusive, mi_arena_id_t req_arena_id) {
-  return ((!arena_is_exclusive && req_arena_id == _mi_arena_id_none()) ||
-          (arena_id == req_arena_id));
+mi_decl_nodiscard static bool mi_arena_commit(mi_arena_t* arena, void* start, size_t size, bool* is_zero, size_t already_committed) {
+  if (arena != NULL && arena->commit_fun != NULL) {
+    return (*arena->commit_fun)(true, start, size, is_zero, arena->commit_fun_arg);
+  }
+  else if (already_committed > 0) {
+    return _mi_os_commit_ex(start, size, is_zero, already_committed);
+  }
+  else {
+    return _mi_os_commit(start, size, is_zero);
+  }
 }
 
 
+
 /* -----------------------------------------------------------
-  Arena allocations get a memory id where the lower 8 bits are
-  the arena id, and the upper bits the block index.
+  Util
 ----------------------------------------------------------- */
 
-// Use `0` as a special id for direct OS allocated memory.
-#define MI_MEMID_OS   0
 
-static size_t mi_arena_memid_create(mi_arena_id_t id, bool exclusive, mi_bitmap_index_t bitmap_index) {
-  mi_assert_internal(((bitmap_index << 8) >> 8) == bitmap_index); // no overflow?
-  mi_assert_internal(id >= 0 && id <= 0x7F);
-  return ((bitmap_index << 8) | ((uint8_t)id & 0x7F) | (exclusive ? 0x80 : 0));
+// Size of an arena
+static size_t mi_arena_size(mi_arena_t* arena) {
+  return mi_size_of_slices(arena->slice_count);
 }
 
-static bool mi_arena_memid_indices(size_t arena_memid, size_t* arena_index, mi_bitmap_index_t* bitmap_index) {
-  *bitmap_index = (arena_memid >> 8);
-  mi_arena_id_t id = (int)(arena_memid & 0x7F);
-  *arena_index = mi_arena_id_index(id);
-  return ((arena_memid & 0x80) != 0);
+// Start of the arena memory area
+static uint8_t* mi_arena_start(mi_arena_t* arena) {
+  return ((uint8_t*)arena);
 }
 
-bool _mi_arena_memid_is_suitable(size_t arena_memid, mi_arena_id_t request_arena_id) {
-  mi_arena_id_t id = (int)(arena_memid & 0x7F);
-  bool exclusive = ((arena_memid & 0x80) != 0);
-  return mi_arena_id_is_suitable(id, exclusive, request_arena_id);
+// Start of a slice
+uint8_t* mi_arena_slice_start(mi_arena_t* arena, size_t slice_index) {
+  return (mi_arena_start(arena) + mi_size_of_slices(slice_index));
 }
 
-static size_t mi_block_count_of_size(size_t size) {
-  return _mi_divide_up(size, MI_ARENA_BLOCK_SIZE);
+// Arena area
+void* mi_arena_area(mi_arena_id_t arena_id, size_t* size) {
+  if (size != NULL) *size = 0;
+  mi_arena_t* arena = _mi_arena_from_id(arena_id);
+  if (arena == NULL) return NULL;
+  if (size != NULL) { *size = mi_size_of_slices(arena->slice_count); }
+  return mi_arena_start(arena);
 }
 
-/* -----------------------------------------------------------
-  Thread safe allocation in an arena
------------------------------------------------------------ */
-static bool mi_arena_alloc(mi_arena_t* arena, size_t blocks, mi_bitmap_index_t* bitmap_idx)
-{
-  size_t idx = 0; // mi_atomic_load_relaxed(&arena->search_idx);  // start from last search; ok to be relaxed as the exact start does not matter
-  if (_mi_bitmap_try_find_from_claim_across(arena->blocks_inuse, arena->field_count, idx, blocks, bitmap_idx)) {
-    mi_atomic_store_relaxed(&arena->search_idx, mi_bitmap_index_field(*bitmap_idx));  // start search from found location next time around
-    return true;
-  };
-  return false;
+
+// Create an arena memid
+static mi_memid_t mi_memid_create_arena(mi_arena_t* arena, size_t slice_index, size_t slice_count) {
+  mi_assert_internal(slice_index < UINT32_MAX);
+  mi_assert_internal(slice_count < UINT32_MAX);
+  mi_assert_internal(slice_count > 0);
+  mi_assert_internal(slice_index < arena->slice_count);
+  mi_memid_t memid = _mi_memid_create(MI_MEM_ARENA);
+  memid.mem.arena.arena = arena;
+  memid.mem.arena.slice_index = (uint32_t)slice_index;
+  memid.mem.arena.slice_count = (uint32_t)slice_count;
+  return memid;
+}
+
+// get the arena and slice span
+static mi_arena_t* mi_arena_from_memid(mi_memid_t memid, size_t* slice_index, size_t* slice_count) {
+  mi_assert_internal(memid.memkind == MI_MEM_ARENA);
+  mi_arena_t* arena = memid.mem.arena.arena;
+  if (slice_index) *slice_index = memid.mem.arena.slice_index;
+  if (slice_count) *slice_count = memid.mem.arena.slice_count;
+  return arena;
+}
+
+static mi_arena_t* mi_page_arena(mi_page_t* page, size_t* slice_index, size_t* slice_count) {
+  // todo: maybe store the arena* directly in the page?
+  return mi_arena_from_memid(page->memid, slice_index, slice_count);
+}
+
+static size_t mi_page_full_size(mi_page_t* page) {
+  if (page->memid.memkind == MI_MEM_ARENA) {
+    return page->memid.mem.arena.slice_count * MI_ARENA_SLICE_SIZE;
+  }
+  else if (mi_memid_is_os(page->memid) || page->memid.memkind == MI_MEM_EXTERNAL) {
+    mi_assert_internal((uint8_t*)page->memid.mem.os.base <= (uint8_t*)page);
+    const ptrdiff_t presize = (uint8_t*)page - (uint8_t*)page->memid.mem.os.base;
+    mi_assert_internal((ptrdiff_t)page->memid.mem.os.size >= presize);
+    return (presize > (ptrdiff_t)page->memid.mem.os.size ? 0 : page->memid.mem.os.size - presize);
+  }
+  else {
+    return 0;
+  }
 }
 
 
@@ -152,284 +167,1175 @@ static bool mi_arena_alloc(mi_arena_t* arena, size_t blocks, mi_bitmap_index_t*
   Arena Allocation
 ----------------------------------------------------------- */
 
-static mi_decl_noinline void* mi_arena_alloc_from(mi_arena_t* arena, size_t arena_index, size_t needed_bcount,
-                                                   bool* commit, bool* large, bool* is_pinned, bool* is_zero, 
-                                                   mi_arena_id_t req_arena_id, size_t* memid, mi_os_tld_t* tld)
+static mi_decl_noinline void* mi_arena_try_alloc_at(
+  mi_arena_t* arena, size_t slice_count, bool commit, size_t tseq, mi_memid_t* memid)
 {
-  MI_UNUSED(arena_index);
-  mi_assert_internal(mi_arena_id_index(arena->id) == arena_index);
-  if (!mi_arena_id_is_suitable(arena->id, arena->exclusive, req_arena_id)) return NULL;
-
-  mi_bitmap_index_t bitmap_index;
-  if (!mi_arena_alloc(arena, needed_bcount, &bitmap_index)) return NULL;
-
-  // claimed it! set the dirty bits (todo: no need for an atomic op here?)
-  void* p    = arena->start + (mi_bitmap_index_bit(bitmap_index)*MI_ARENA_BLOCK_SIZE);
-  *memid     = mi_arena_memid_create(arena->id, arena->exclusive, bitmap_index);
-  *is_zero   = _mi_bitmap_claim_across(arena->blocks_dirty, arena->field_count, needed_bcount, bitmap_index, NULL);
-  *large     = arena->is_large;
-  *is_pinned = (arena->is_large || !arena->allow_decommit);
-  if (arena->blocks_committed == NULL) {
-    // always committed
-    *commit = true;
-  }
-  else if (*commit) {
-    // arena not committed as a whole, but commit requested: ensure commit now
-    bool any_uncommitted;
-    _mi_bitmap_claim_across(arena->blocks_committed, arena->field_count, needed_bcount, bitmap_index, &any_uncommitted);
-    if (any_uncommitted) {
-      bool commit_zero;
-      _mi_os_commit(p, needed_bcount * MI_ARENA_BLOCK_SIZE, &commit_zero, tld->stats);
-      if (commit_zero) *is_zero = true;
+  size_t slice_index;
+  if (!mi_bbitmap_try_find_and_clearN(arena->slices_free, slice_count, tseq, &slice_index)) return NULL;
+
+  // claimed it!
+  void* p = mi_arena_slice_start(arena, slice_index);
+  *memid = mi_memid_create_arena(arena, slice_index, slice_count);
+  memid->is_pinned = arena->memid.is_pinned;
+
+  // set the dirty bits and track which slices become accessible
+  size_t touched_slices = slice_count;
+  if (arena->memid.initially_zero) {
+    size_t already_dirty = 0;
+    memid->initially_zero = mi_bitmap_setN(arena->slices_dirty, slice_index, slice_count, &already_dirty);
+    mi_assert_internal(already_dirty <= touched_slices);
+    touched_slices -= already_dirty;
+  }
+
+  // set commit state
+  if (commit) {        
+    // commit requested, but the range may not be committed as a whole: ensure it is committed now
+    const size_t already_committed = mi_bitmap_popcountN(arena->slices_committed, slice_index, slice_count);
+    if (already_committed < slice_count) {  
+      // not all committed, try to commit now
+      bool commit_zero = false;
+      if (!_mi_os_commit_ex(p, mi_size_of_slices(slice_count), &commit_zero, mi_size_of_slices(slice_count - already_committed))) {
+        // if the commit fails, release ownership, and return NULL;
+        // note: this does not roll back dirty bits but that is ok.
+        mi_bbitmap_setN(arena->slices_free, slice_index, slice_count);
+        return NULL;
+      }
+      if (commit_zero) { 
+        memid->initially_zero = true; 
+      }
+            
+      // set the commit bits 
+      mi_bitmap_setN(arena->slices_committed, slice_index, slice_count, NULL);      
+      
+      // committed
+      #if MI_DEBUG > 1
+      if (memid->initially_zero) {
+        if (!mi_mem_is_zero(p, mi_size_of_slices(slice_count))) {
+          _mi_error_message(EFAULT, "interal error: arena allocation was not zero-initialized!\n");
+          memid->initially_zero = false;
+        }
+      }
+      #endif
+    }
+    else {
+      // already fully committed.
+      _mi_os_reuse(p, mi_size_of_slices(slice_count));
+      // if the OS has overcommit, and this is the first time we access these pages, then
+      // count the commit now (as at arena reserve we didn't count those commits as these are on-demand)
+      if (_mi_os_has_overcommit() && touched_slices > 0) {
+        mi_subproc_stat_increase( arena->subproc, committed, mi_size_of_slices(touched_slices));
+      }      
+    }
+    
+    mi_assert_internal(mi_bitmap_is_setN(arena->slices_committed, slice_index, slice_count));
+    memid->initially_committed = true;
+    
+    // tool support
+    if (memid->initially_zero) {
+      mi_track_mem_defined(p, slice_count * MI_ARENA_SLICE_SIZE);
+    }
+    else {
+      mi_track_mem_undefined(p, slice_count * MI_ARENA_SLICE_SIZE);
     }
   }
   else {
-    // no need to commit, but check if already fully committed
-    *commit = _mi_bitmap_is_claimed_across(arena->blocks_committed, arena->field_count, needed_bcount, bitmap_index);
+    // no need to commit, but check if it is already fully committed
+    memid->initially_committed = mi_bitmap_is_setN(arena->slices_committed, slice_index, slice_count);
+    if (!memid->initially_committed) {
+      // partly committed.. adjust stats
+      size_t already_committed_count = 0;
+      mi_bitmap_setN(arena->slices_committed, slice_index, slice_count, &already_committed_count);
+      mi_bitmap_clearN(arena->slices_committed, slice_index, slice_count);
+      mi_os_stat_decrease(committed, mi_size_of_slices(already_committed_count));
+    }
   }
+
+  mi_assert_internal(mi_bbitmap_is_clearN(arena->slices_free, slice_index, slice_count));
+  if (commit) { mi_assert_internal(mi_bitmap_is_setN(arena->slices_committed, slice_index, slice_count)); }
+  if (commit) { mi_assert_internal(memid->initially_committed); }
+  mi_assert_internal(mi_bitmap_is_setN(arena->slices_dirty, slice_index, slice_count));
+
   return p;
 }
 
-static mi_decl_noinline void* mi_arena_allocate(int numa_node, size_t size, size_t alignment, bool* commit, bool* large, 
-                                                bool* is_pinned, bool* is_zero, 
-                                                mi_arena_id_t req_arena_id, size_t* memid, mi_os_tld_t* tld)
-{  
-  MI_UNUSED_RELEASE(alignment);
-  mi_assert_internal(alignment <= MI_SEGMENT_ALIGN);
-  const size_t max_arena = mi_atomic_load_relaxed(&mi_arena_count);  
-  const size_t bcount = mi_block_count_of_size(size);
-  if mi_likely(max_arena == 0) return NULL;
-  mi_assert_internal(size <= bcount*MI_ARENA_BLOCK_SIZE);
-
-  size_t arena_index = mi_arena_id_index(req_arena_id);
-  if (arena_index < MI_MAX_ARENAS) {
-    // try a specific arena if requested
-    mi_arena_t* arena = mi_atomic_load_ptr_relaxed(mi_arena_t, &mi_arenas[arena_index]);
-    if (arena != NULL &&
-        (arena->numa_node < 0 || arena->numa_node == numa_node) && // numa local?
-        (*large || !arena->is_large)) // large OS pages allowed, or arena is not large OS pages
-    {
-      void* p = mi_arena_alloc_from(arena, arena_index, bcount, commit, large, is_pinned, is_zero, req_arena_id, memid, tld);
-      mi_assert_internal((uintptr_t)p % alignment == 0);
-      if (p != NULL) return p;
+
+static int mi_reserve_os_memory_ex2(mi_subproc_t* subproc, size_t size, bool commit, bool allow_large, bool exclusive, mi_arena_id_t* arena_id);
+
+// try to reserve a fresh arena space
+static bool mi_arena_reserve(mi_subproc_t* subproc, size_t req_size, bool allow_large, mi_arena_id_t* arena_id)
+{
+  const size_t arena_count = mi_arenas_get_count(subproc);
+  if (arena_count > (MI_MAX_ARENAS - 4)) return false;
+
+  // calc reserve
+  size_t arena_reserve = mi_option_get_size(mi_option_arena_reserve);
+  if (arena_reserve == 0) return false;
+
+  if (!_mi_os_has_virtual_reserve()) {
+    arena_reserve = arena_reserve/4;  // be conservative if virtual reserve is not supported (for WASM for example)
+  }
+  arena_reserve = _mi_align_up(arena_reserve, MI_ARENA_SLICE_SIZE);
+
+  if (arena_count >= 1 && arena_count <= 128) {
+    // scale up the arena sizes exponentially every 4 entries
+    const size_t multiplier = (size_t)1 << _mi_clamp(arena_count/4, 0, 16);
+    size_t reserve = 0;
+    if (!mi_mul_overflow(multiplier, arena_reserve, &reserve)) {
+      arena_reserve = reserve;
     }
   }
-  else {
-    // try numa affine allocation
-    for (size_t i = 0; i < max_arena; i++) {
-      mi_arena_t* arena = mi_atomic_load_ptr_relaxed(mi_arena_t, &mi_arenas[i]);
-      if (arena == NULL) break; // end reached
-      if ((arena->numa_node < 0 || arena->numa_node == numa_node) && // numa local?
-        (*large || !arena->is_large)) // large OS pages allowed, or arena is not large OS pages
-      {
-        void* p = mi_arena_alloc_from(arena, i, bcount, commit, large, is_pinned, is_zero, req_arena_id, memid, tld);
-        mi_assert_internal((uintptr_t)p % alignment == 0);
-        if (p != NULL) return p;
-      }
+
+  // check arena bounds
+  const size_t min_reserve = MI_ARENA_MIN_SIZE;
+  const size_t max_reserve = MI_ARENA_MAX_SIZE;   // 16 GiB
+  if (arena_reserve < min_reserve) {
+    arena_reserve = min_reserve;
+  }
+  else if (arena_reserve > max_reserve) {
+    arena_reserve = max_reserve;
+  }
+
+  if (arena_reserve < req_size) return false;  // should be able to at least handle the current allocation size
+
+  // commit eagerly?
+  bool arena_commit = false;
+  const bool overcommit = _mi_os_has_overcommit();
+  if (mi_option_get(mi_option_arena_eager_commit) == 2) { arena_commit = overcommit; }
+  else if (mi_option_get(mi_option_arena_eager_commit) == 1) { arena_commit = true; }
+
+  // on an OS with overcommit (Linux) we don't count the commit yet as it is on-demand. Once a slice
+  // is actually allocated for the first time it will be counted.
+  const bool adjust = (overcommit && arena_commit);
+  if (adjust) { mi_subproc_stat_adjust_decrease( subproc, committed, arena_reserve); }
+  // and try to reserve the arena
+  int err = mi_reserve_os_memory_ex2(subproc, arena_reserve, arena_commit, allow_large, false /* exclusive? */, arena_id);
+  if (err != 0) {
+    if (adjust) { mi_subproc_stat_adjust_increase( subproc, committed, arena_reserve); } // roll back
+    // failed, try a smaller size?
+    const size_t small_arena_reserve = (MI_SIZE_BITS == 32 ? 128*MI_MiB : 1*MI_GiB);
+    if (adjust) { mi_subproc_stat_adjust_decrease( subproc, committed, arena_reserve); }
+    if (arena_reserve > small_arena_reserve) {
+      // try again
+      err = mi_reserve_os_memory_ex(small_arena_reserve, arena_commit, allow_large, false /* exclusive? */, arena_id);
+      if (err != 0 && adjust) { mi_subproc_stat_adjust_increase( subproc, committed, arena_reserve); } // roll back
     }
+  }
+  return (err==0);
+}
 
-    // try from another numa node instead..
-    for (size_t i = 0; i < max_arena; i++) {
-      mi_arena_t* arena = mi_atomic_load_ptr_relaxed(mi_arena_t, &mi_arenas[i]);
-      if (arena == NULL) break; // end reached
-      if ((arena->numa_node >= 0 && arena->numa_node != numa_node) && // not numa local!
-        (*large || !arena->is_large)) // large OS pages allowed, or arena is not large OS pages
-      {
-        void* p = mi_arena_alloc_from(arena, i, bcount, commit, large, is_pinned, is_zero, req_arena_id, memid, tld);
-        mi_assert_internal((uintptr_t)p % alignment == 0);
-        if (p != NULL) return p;
-      }
+
+
+
+/* -----------------------------------------------------------
+  Arena iteration
+----------------------------------------------------------- */
+
+static inline bool mi_arena_is_suitable(mi_arena_t* arena, mi_arena_t* req_arena, bool match_numa, int numa_node, bool allow_pinned) {
+  if (!allow_pinned && arena->memid.is_pinned) return false;
+  if (!mi_arena_id_is_suitable(arena, req_arena)) return false;
+  if (req_arena == NULL) { // if not specific, check numa affinity
+    const bool numa_suitable = (numa_node < 0 || arena->numa_node < 0 || arena->numa_node == numa_node);
+    if (match_numa) { if (!numa_suitable) return false; }
+               else { if (numa_suitable)  return false; }
+  }
+  return true;
+}
+
+#define mi_forall_arenas(subproc, req_arena, tseq, name_arena) { \
+  const size_t _arena_count = mi_arenas_get_count(subproc); \
+  const size_t _arena_cycle = (_arena_count == 0 ? 0 : _arena_count - 1); /* first search the arenas below the last one */ \
+  /* always start searching in the arena's below the max */ \
+  size_t _start = (_arena_cycle <= 1 ? 0 : (tseq % _arena_cycle)); \
+  for (size_t _i = 0; _i < _arena_count; _i++) { \
+    mi_arena_t* name_arena; \
+    if (req_arena != NULL) { \
+      name_arena = req_arena; /* if there is a specific req_arena, only search that one */\
+      if (_i > 0) break;       /* only once */ \
+    } \
+    else { \
+      size_t _idx; \
+      if (_i < _arena_cycle) { \
+        _idx = _i + _start; \
+        if (_idx >= _arena_cycle) { _idx -= _arena_cycle; } /* adjust so we rotate through the cycle */ \
+      } \
+      else { \
+        _idx = _i; /* remaining arena's */ \
+      } \
+      name_arena = mi_arena_from_index(subproc,_idx); \
+    } \
+    if (name_arena != NULL) \
+    {
+
+#define mi_forall_arenas_end()  \
+    } \
+  } \
+  }
+
+#define mi_forall_suitable_arenas(subproc, req_arena, tseq, match_numa, numa_node, allow_large, name_arena) \
+  mi_forall_arenas(subproc, req_arena,tseq,name_arena) { \
+    if (mi_arena_is_suitable(name_arena, req_arena, match_numa, numa_node, allow_large)) { \
+
+#define mi_forall_suitable_arenas_end() \
+  }} \
+  mi_forall_arenas_end()
+
+/* -----------------------------------------------------------
+  Arena allocation
+----------------------------------------------------------- */
+
+// allocate slices from the arenas
+static mi_decl_noinline void* mi_arenas_try_find_free(
+  mi_subproc_t* subproc, size_t slice_count, size_t alignment,
+  bool commit, bool allow_large, mi_arena_t* req_arena, size_t tseq, int numa_node, mi_memid_t* memid)
+{
+  mi_assert_internal(slice_count <= mi_slice_count_of_size(MI_ARENA_MAX_OBJ_SIZE));
+  mi_assert(alignment <= MI_ARENA_SLICE_ALIGN);
+  if (alignment > MI_ARENA_SLICE_ALIGN) return NULL;
+
+  // search arena's
+  mi_forall_suitable_arenas(subproc, req_arena, tseq, true /* only numa matching */, numa_node, allow_large, arena)
+  {
+    void* p = mi_arena_try_alloc_at(arena, slice_count, commit, tseq, memid);
+    if (p != NULL) return p;
+  }
+  mi_forall_suitable_arenas_end();
+  if (numa_node < 0) return NULL;
+
+  // search again but now regardless of preferred numa affinity
+  mi_forall_suitable_arenas(subproc, req_arena, tseq, false /* numa non-matching now */, numa_node, allow_large, arena)
+  {
+    void* p = mi_arena_try_alloc_at(arena, slice_count, commit, tseq, memid);
+    if (p != NULL) return p;
+  }
+  mi_forall_suitable_arenas_end();
+  return NULL;
+}
+
+// Allocate slices from the arena's -- potentially allocating a fresh arena
+static mi_decl_noinline void* mi_arenas_try_alloc(
+  mi_subproc_t* subproc,
+  size_t slice_count, size_t alignment,
+  bool commit, bool allow_large,
+  mi_arena_t* req_arena, size_t tseq, int numa_node, mi_memid_t* memid)
+{
+  mi_assert(slice_count <= MI_ARENA_MAX_OBJ_SLICES);
+  mi_assert(alignment <= MI_ARENA_SLICE_ALIGN);
+  void* p;
+
+  // try to find free slices in the arena's
+  p = mi_arenas_try_find_free(subproc, slice_count, alignment, commit, allow_large, req_arena, tseq, numa_node, memid);
+  if (p != NULL) return p;
+
+  // did we need a specific arena?
+  if (req_arena != NULL) return NULL;
+
+  // don't create arena's while preloading (todo: or should we?)
+  if (_mi_preloading()) return NULL;
+
+  // otherwise, try to reserve a new arena -- but one thread at a time.. (todo: allow 2 or 4 to reduce contention?)
+  const size_t arena_count = mi_arenas_get_count(subproc);
+  mi_lock(&subproc->arena_reserve_lock) {
+    if (arena_count == mi_arenas_get_count(subproc)) {
+      // we are the first to enter the lock, reserve a fresh arena
+      mi_arena_id_t arena_id = 0;
+      mi_arena_reserve(subproc, mi_size_of_slices(slice_count), allow_large, &arena_id);
+    }
+    else {
+      // another thread already reserved a new arena
     }
   }
+  // try once more to allocate in the new arena
+  mi_assert_internal(req_arena == NULL);
+  p = mi_arenas_try_find_free(subproc, slice_count, alignment, commit, allow_large, req_arena, tseq, numa_node, memid);
+  if (p != NULL) return p;
+
   return NULL;
 }
 
+// Allocate from the OS (if allowed)
+static void* mi_arena_os_alloc_aligned(
+  size_t size, size_t alignment, size_t align_offset,
+  bool commit, bool allow_large,
+  mi_arena_id_t req_arena_id, mi_memid_t* memid)
+{
+  // if we cannot use OS allocation, return NULL
+  if (mi_option_is_enabled(mi_option_disallow_os_alloc) || req_arena_id != _mi_arena_id_none()) {
+    errno = ENOMEM;
+    return NULL;
+  }
+
+  if (align_offset > 0) {
+    return _mi_os_alloc_aligned_at_offset(size, alignment, align_offset, commit, allow_large, memid);
+  }
+  else {
+    return _mi_os_alloc_aligned(size, alignment, commit, allow_large, memid);
+  }
+}
+
 
-void* _mi_arena_alloc_aligned(size_t size, size_t alignment, bool* commit, bool* large, bool* is_pinned, bool* is_zero,
-                              mi_arena_id_t req_arena_id, size_t* memid, mi_os_tld_t* tld)
+// Allocate large sized memory
+void* _mi_arenas_alloc_aligned( mi_subproc_t* subproc,
+  size_t size, size_t alignment, size_t align_offset,
+  bool commit, bool allow_large,
+  mi_arena_t* req_arena, size_t tseq, int numa_node, mi_memid_t* memid)
 {
-  mi_assert_internal(commit != NULL && is_pinned != NULL && is_zero != NULL && memid != NULL && tld != NULL);
+  mi_assert_internal(memid != NULL);
   mi_assert_internal(size > 0);
-  *memid   = MI_MEMID_OS;
-  *is_zero = false;
-  *is_pinned = false;
-
-  bool default_large = false;
-  if (large==NULL) large = &default_large;     // ensure `large != NULL`
-  const int numa_node = _mi_os_numa_node(tld); // current numa node
 
   // try to allocate in an arena if the alignment is small enough and the object is not too small (as for heap meta data)
-  if (size >= MI_ARENA_MIN_OBJ_SIZE && alignment <= MI_SEGMENT_ALIGN) {
-    void* p = mi_arena_allocate(numa_node, size, alignment, commit, large, is_pinned, is_zero, req_arena_id, memid, tld);
+  if (!mi_option_is_enabled(mi_option_disallow_arena_alloc) &&           // is arena allocation allowed?
+      size >= MI_ARENA_MIN_OBJ_SIZE && size <= MI_ARENA_MAX_OBJ_SIZE &&  // and not too small/large
+      alignment <= MI_ARENA_SLICE_ALIGN && align_offset == 0)            // and good alignment
+  {
+    const size_t slice_count = mi_slice_count_of_size(size);
+    void* p = mi_arenas_try_alloc(subproc,slice_count, alignment, commit, allow_large, req_arena, tseq, numa_node, memid);
     if (p != NULL) return p;
   }
 
-  // finally, fall back to the OS
-  if (mi_option_is_enabled(mi_option_limit_os_alloc) || req_arena_id != _mi_arena_id_none()) {
-    errno = ENOMEM;
+  // fall back to the OS
+  void* p = mi_arena_os_alloc_aligned(size, alignment, align_offset, commit, allow_large, req_arena, memid);
+  return p;
+}
+
+void* _mi_arenas_alloc(mi_subproc_t* subproc, size_t size, bool commit, bool allow_large, mi_arena_t* req_arena, size_t tseq, int numa_node, mi_memid_t* memid)
+{
+  return _mi_arenas_alloc_aligned(subproc, size, MI_ARENA_SLICE_SIZE, 0, commit, allow_large, req_arena, tseq, numa_node, memid);
+}
+
+
+
+/* -----------------------------------------------------------
+  Arena page allocation
+----------------------------------------------------------- */
+
+static bool mi_arena_try_claim_abandoned(size_t slice_index, mi_arena_t* arena, mi_heaptag_t heap_tag, bool* keep_abandoned) {
+  // found an abandoned page of the right size
+  mi_page_t* const page  = (mi_page_t*)mi_arena_slice_start(arena, slice_index);
+  // can we claim ownership?
+  if (!mi_page_try_claim_ownership(page)) {
+    // there was a concurrent free ..
+    // we need to keep it in the abandoned map as the free will call `mi_arena_page_unabandon`,
+    // and wait for readers (us!) to finish. This is why it is very important to set the abandoned
+    // bit again (or otherwise the unabandon will never stop waiting).
+    *keep_abandoned = true;
+    return false;
+  }
+  if (heap_tag != page->heap_tag) {
+    // wrong heap_tag.. we need to unown again
+    // note: this normally never happens unless heaptags are actually used.
+    // (an unown might free the page, and depending on that we can keep it in the abandoned map or not)
+    // note: a minor wrinkle: the page will still be mapped but the abandoned map entry is (temporarily) clear at this point.
+    //       so we cannot check in `mi_arenas_free` for this invariant to hold.
+    const bool freed = _mi_page_unown(page);
+    *keep_abandoned = !freed;
+    return false;
+  }
+  // yes, we can reclaim it, keep the abandoned map entry clear
+  *keep_abandoned = false;
+  return true;
+}
+
+static mi_page_t* mi_arenas_page_try_find_abandoned(mi_subproc_t* subproc, size_t slice_count, size_t block_size, mi_arena_t* req_arena, mi_heaptag_t heaptag, size_t tseq)
+{
+  MI_UNUSED(slice_count);
+  const size_t bin = _mi_bin(block_size);
+  mi_assert_internal(bin < MI_BIN_COUNT);
+
+  // any abandoned in our size class?
+  mi_assert_internal(subproc != NULL);
+  if (mi_atomic_load_relaxed(&subproc->abandoned_count[bin]) == 0) {
     return NULL;
   }
-  *is_zero = true;
-  *memid   = MI_MEMID_OS;  
-  void* p = _mi_os_alloc_aligned(size, alignment, *commit, large, tld->stats);
-  if (p != NULL) *is_pinned = *large;
-  return p;
+
+  // search arena's
+  const bool allow_large = true;
+  const int  any_numa = -1;
+  const bool match_numa = true;
+  mi_forall_suitable_arenas(subproc, req_arena, tseq, match_numa, any_numa, allow_large, arena)
+  {
+    size_t slice_index;
+    mi_bitmap_t* const bitmap = arena->pages_abandoned[bin];
+
+    if (mi_bitmap_try_find_and_claim(bitmap, tseq, &slice_index, &mi_arena_try_claim_abandoned, arena, heaptag)) {
+      // found an abandoned page of the right size
+      // and claimed ownership.
+      mi_page_t* page = (mi_page_t*)mi_arena_slice_start(arena, slice_index);
+      mi_assert_internal(mi_page_is_owned(page));
+      mi_assert_internal(mi_page_is_abandoned(page));
+      mi_assert_internal(mi_arena_has_page(arena,page));
+      mi_atomic_decrement_relaxed(&subproc->abandoned_count[bin]);
+      mi_tld_t* tld = _mi_thread_tld();
+      mi_tld_stat_decrease( tld, pages_abandoned, 1);
+      mi_tld_stat_counter_increase( tld, pages_reclaim_on_alloc, 1);
+
+      _mi_page_free_collect(page, false);  // update `used` count
+      mi_assert_internal(mi_bbitmap_is_clearN(arena->slices_free, slice_index, slice_count));
+      mi_assert_internal(page->slice_committed > 0 || mi_bitmap_is_setN(arena->slices_committed, slice_index, slice_count));
+      mi_assert_internal(mi_bitmap_is_setN(arena->slices_dirty, slice_index, slice_count));
+      mi_assert_internal(_mi_is_aligned(page, MI_PAGE_ALIGN));
+      mi_assert_internal(_mi_ptr_page(page)==page);
+      mi_assert_internal(_mi_ptr_page(mi_page_start(page))==page);
+      mi_assert_internal(mi_page_block_size(page) == block_size);
+      mi_assert_internal(!mi_page_is_full(page));
+      return page;
+    }
+  }
+  mi_forall_suitable_arenas_end();
+  return NULL;
 }
 
-void* _mi_arena_alloc(size_t size, bool* commit, bool* large, bool* is_pinned, bool* is_zero, mi_arena_id_t req_arena_id, size_t* memid, mi_os_tld_t* tld)
+// Allocate a fresh page
+static mi_page_t* mi_arenas_page_alloc_fresh(size_t slice_count, size_t block_size, size_t block_alignment,
+                                            mi_arena_t* req_arena, int numa_node, bool commit, mi_tld_t* tld)
 {
-  return _mi_arena_alloc_aligned(size, MI_ARENA_BLOCK_SIZE, commit, large, is_pinned, is_zero, req_arena_id, memid, tld);
+  const bool allow_large = (MI_SECURE < 2); // 2 = guard page at end of each arena page
+  const bool os_align = (block_alignment > MI_PAGE_MAX_OVERALLOC_ALIGN);
+  const size_t page_alignment = MI_ARENA_SLICE_ALIGN;
+
+  // try to allocate from free space in arena's
+  mi_memid_t memid = _mi_memid_none();
+  mi_page_t* page = NULL;
+  const size_t alloc_size = mi_size_of_slices(slice_count);
+  if (!mi_option_is_enabled(mi_option_disallow_arena_alloc) && // allowed to allocate from arena's?
+      !os_align &&                            // not large alignment
+      slice_count <= MI_ARENA_MAX_OBJ_SLICES) // and not too large
+  {
+    page = (mi_page_t*)mi_arenas_try_alloc(tld->subproc, slice_count, page_alignment, commit, allow_large, req_arena, tld->thread_seq, numa_node, &memid);
+    if (page != NULL) {
+      mi_assert_internal(mi_bitmap_is_clearN(memid.mem.arena.arena->pages, memid.mem.arena.slice_index, memid.mem.arena.slice_count));
+      mi_bitmap_set(memid.mem.arena.arena->pages, memid.mem.arena.slice_index);
+    }
+  }
+
+  // otherwise fall back to the OS
+  if (page == NULL) {
+    if (os_align) {
+      // note: slice_count already includes the page
+      mi_assert_internal(slice_count >= mi_slice_count_of_size(block_size) + mi_slice_count_of_size(page_alignment));
+      page = (mi_page_t*)mi_arena_os_alloc_aligned(alloc_size, block_alignment, page_alignment /* align offset */, commit, allow_large, req_arena, &memid);
+    }
+    else {
+      page = (mi_page_t*)mi_arena_os_alloc_aligned(alloc_size, page_alignment, 0 /* align offset */, commit, allow_large, req_arena, &memid);
+    }
+  }
+
+  if (page == NULL) return NULL;
+  mi_assert_internal(_mi_is_aligned(page, MI_PAGE_ALIGN));
+  mi_assert_internal(!os_align || _mi_is_aligned((uint8_t*)page + page_alignment, block_alignment));
+
+  // guard page at the end of mimalloc page?
+  #if MI_SECURE < 2
+  const size_t page_noguard_size = alloc_size;
+  #else
+  mi_assert(alloc_size > _mi_os_secure_guard_page_size());
+  const size_t page_noguard_size = alloc_size - _mi_os_secure_guard_page_size();
+  if (memid.initially_committed) {
+    _mi_os_secure_guard_page_set_at((uint8_t*)page + page_noguard_size, memid);
+  }
+  #endif
+
+  // claimed free slices: initialize the page partly
+  if (!memid.initially_zero && memid.initially_committed) {
+    mi_track_mem_undefined(page, slice_count * MI_ARENA_SLICE_SIZE);
+    _mi_memzero_aligned(page, sizeof(*page));
+  }
+  else if (memid.initially_committed) {
+    mi_track_mem_defined(page, slice_count * MI_ARENA_SLICE_SIZE);
+  }
+  #if MI_DEBUG > 1
+  if (memid.initially_zero && memid.initially_committed) {
+    if (!mi_mem_is_zero(page, page_noguard_size)) {
+      _mi_error_message(EFAULT, "internal error: page memory was not zero initialized.\n");
+      memid.initially_zero = false;
+      _mi_memzero_aligned(page, sizeof(*page));
+    }
+  }
+  #endif
+  mi_assert(MI_PAGE_INFO_SIZE >= mi_page_info_size());
+
+  size_t block_start;
+  #if MI_GUARDED
+  // in a guarded build, we align pages with blocks a multiple of an OS page size, to the OS page size
+  // this ensures that all blocks in such pages are OS page size aligned (which is needed for the guard pages)
+  const size_t os_page_size = _mi_os_page_size();
+  mi_assert_internal(MI_PAGE_ALIGN >= os_page_size);
+  if (!os_align && block_size % os_page_size == 0 && block_size > os_page_size /* at least 2 or more */ ) {
+    block_start = _mi_align_up(mi_page_info_size(), os_page_size);
+  }
+  else
+  #endif
+  if (os_align) {
+    block_start = MI_PAGE_ALIGN;
+  }
+  else if (_mi_is_power_of_two(block_size) && block_size <= MI_PAGE_MAX_START_BLOCK_ALIGN2) {
+    // naturally align all power-of-2 blocks
+    block_start = _mi_align_up(mi_page_info_size(), block_size);
+  }
+  else {
+    // otherwise start after the info
+    block_start = mi_page_info_size();
+  }
+  const size_t reserved    = (os_align ? 1 : (page_noguard_size - block_start) / block_size);
+  mi_assert_internal(reserved > 0 && reserved <= UINT16_MAX);
+
+  // commit first block?
+  size_t commit_size = 0;
+  if (!memid.initially_committed) {
+    commit_size = _mi_align_up(block_start + block_size, MI_PAGE_MIN_COMMIT_SIZE);
+    if (commit_size > page_noguard_size) { commit_size = page_noguard_size; }
+    bool is_zero;
+    if (!mi_arena_commit( mi_memid_arena(memid), page, commit_size, &is_zero, 0)) {
+      _mi_arenas_free(page, alloc_size, memid);
+      return NULL;
+    }
+    if (!memid.initially_zero && !is_zero) {
+      _mi_memzero_aligned(page, commit_size);
+    }
+  }
+
+  // initialize
+  page->reserved = (uint16_t)reserved;
+  page->page_start = (uint8_t*)page + block_start;
+  page->block_size = block_size;
+  page->slice_committed = commit_size;
+  page->memid = memid;
+  page->free_is_zero = memid.initially_zero;
+  if (block_size > 0 && _mi_is_power_of_two(block_size)) {
+    page->block_size_shift = (uint8_t)mi_ctz(block_size);
+  }
+  else {
+    page->block_size_shift = 0;
+  }
+  // and own it
+  mi_page_try_claim_ownership(page);
+
+  // register in the page map
+  _mi_page_map_register(page);
+
+  // stats
+  mi_tld_stat_increase(tld, pages, 1);
+  mi_tld_stat_increase(tld, page_bins[_mi_page_bin(page)], 1);
+
+  mi_assert_internal(_mi_ptr_page(page)==page);
+  mi_assert_internal(_mi_ptr_page(mi_page_start(page))==page);
+  mi_assert_internal(mi_page_block_size(page) == block_size);
+  mi_assert_internal(mi_page_is_abandoned(page));
+  mi_assert_internal(mi_page_is_owned(page));
+
+  return page;
 }
 
-void* mi_arena_area(mi_arena_id_t arena_id, size_t* size) {
-  if (size != NULL) *size = 0;
-  size_t arena_index = mi_arena_id_index(arena_id);
-  if (arena_index >= MI_MAX_ARENAS) return NULL;
-  mi_arena_t* arena = mi_atomic_load_ptr_relaxed(mi_arena_t, &mi_arenas[arena_index]);
-  if (arena == NULL) return NULL;
-  if (size != NULL) *size = arena->block_count * MI_ARENA_BLOCK_SIZE;
-  return arena->start;
+// Allocate a regular small/medium/large page.
+static mi_page_t* mi_arenas_page_regular_alloc(mi_heap_t* heap, size_t slice_count, size_t block_size) {
+  mi_arena_t* req_arena = heap->exclusive_arena;
+  mi_tld_t* const tld = heap->tld;
+
+  // 1. look for an abandoned page
+  mi_page_t* page = mi_arenas_page_try_find_abandoned(tld->subproc, slice_count, block_size, req_arena, heap->tag, tld->thread_seq);
+  if (page != NULL) {
+    return page;  // return as abandoned
+  }
+
+  // 2. find a free block, potentially allocating a new arena
+  const long commit_on_demand = mi_option_get(mi_option_page_commit_on_demand);
+  const bool commit = (slice_count <= mi_slice_count_of_size(MI_PAGE_MIN_COMMIT_SIZE) ||  // always commit small pages
+                       (commit_on_demand == 2 && _mi_os_has_overcommit()) || (commit_on_demand == 0));
+  page = mi_arenas_page_alloc_fresh(slice_count, block_size, 1, req_arena, heap->numa_node, commit, tld);
+  if (page == NULL) return NULL;
+
+  mi_assert_internal(page->memid.memkind != MI_MEM_ARENA || page->memid.mem.arena.slice_count == slice_count);
+  if (!_mi_page_init(heap, page)) {
+    _mi_arenas_free( page, mi_page_full_size(page), page->memid);
+    return NULL;
+  }
+  
+  return page;
+}
+
+// Allocate a page containing one block (very large, or with large alignment)
+static mi_page_t* mi_arenas_page_singleton_alloc(mi_heap_t* heap, size_t block_size, size_t block_alignment) {
+  mi_arena_t* req_arena = heap->exclusive_arena;
+  mi_tld_t* const tld = heap->tld;
+  const bool os_align = (block_alignment > MI_PAGE_MAX_OVERALLOC_ALIGN);
+  const size_t info_size = (os_align ? MI_PAGE_ALIGN : mi_page_info_size());
+  #if MI_SECURE < 2
+  const size_t slice_count = mi_slice_count_of_size(info_size + block_size);
+  #else
+  const size_t slice_count = mi_slice_count_of_size(_mi_align_up(info_size + block_size, _mi_os_secure_guard_page_size()) + _mi_os_secure_guard_page_size());
+  #endif
+
+  mi_page_t* page = mi_arenas_page_alloc_fresh(slice_count, block_size, block_alignment, req_arena, heap->numa_node, true /* commit singletons always */, tld);
+  if (page == NULL) return NULL;
+
+  mi_assert(page->reserved == 1);
+  if (!_mi_page_init(heap, page)) {
+    _mi_arenas_free( page, mi_page_full_size(page), page->memid);
+    return NULL;
+  }
+
+  return page;
+}
+
+
+mi_page_t* _mi_arenas_page_alloc(mi_heap_t* heap, size_t block_size, size_t block_alignment) {
+  mi_page_t* page;
+  if mi_unlikely(block_alignment > MI_PAGE_MAX_OVERALLOC_ALIGN) {
+    mi_assert_internal(_mi_is_power_of_two(block_alignment));
+    page = mi_arenas_page_singleton_alloc(heap, block_size, block_alignment);
+  }
+  else if (block_size <= MI_SMALL_MAX_OBJ_SIZE) {
+    page = mi_arenas_page_regular_alloc(heap, mi_slice_count_of_size(MI_SMALL_PAGE_SIZE), block_size);
+  }
+  else if (block_size <= MI_MEDIUM_MAX_OBJ_SIZE) {
+    page = mi_arenas_page_regular_alloc(heap, mi_slice_count_of_size(MI_MEDIUM_PAGE_SIZE), block_size);
+  }
+  #if MI_ENABLE_LARGE_PAGES
+  else if (block_size <= MI_LARGE_MAX_OBJ_SIZE) {
+    page = mi_arenas_page_regular_alloc(heap, mi_slice_count_of_size(MI_LARGE_PAGE_SIZE), block_size);
+  }
+  #endif
+  else {
+    page = mi_arenas_page_singleton_alloc(heap, block_size, block_alignment);
+  }
+  // mi_assert_internal(page == NULL || _mi_page_segment(page)->subproc == tld->subproc);
+  mi_assert_internal(_mi_is_aligned(page, MI_PAGE_ALIGN));
+  mi_assert_internal(_mi_ptr_page(page)==page);
+  mi_assert_internal(_mi_ptr_page(mi_page_start(page))==page);
+  mi_assert_internal(block_alignment <= MI_PAGE_MAX_OVERALLOC_ALIGN || _mi_is_aligned(mi_page_start(page), block_alignment));
+
+  return page;
+}
+
+void _mi_arenas_page_free(mi_page_t* page, mi_tld_t* stats_tld /* can be NULL */) {
+  mi_assert_internal(_mi_is_aligned(page, MI_PAGE_ALIGN));
+  mi_assert_internal(_mi_ptr_page(page)==page);
+  mi_assert_internal(mi_page_is_owned(page));
+  mi_assert_internal(mi_page_all_free(page));
+  mi_assert_internal(mi_page_is_abandoned(page));
+  mi_assert_internal(page->next==NULL && page->prev==NULL);
+
+  if (stats_tld != NULL) { 
+    mi_tld_stat_decrease(stats_tld, page_bins[_mi_page_bin(page)], 1);
+    mi_tld_stat_decrease(stats_tld, pages, 1);
+  }
+  else {
+    mi_os_stat_decrease(page_bins[_mi_page_bin(page)], 1);
+    mi_os_stat_decrease(pages, 1);
+  }
+
+  #if MI_DEBUG>1
+  if (page->memid.memkind==MI_MEM_ARENA && !mi_page_is_full(page)) {
+    size_t bin = _mi_bin(mi_page_block_size(page));
+    size_t slice_index;
+    size_t slice_count;
+    mi_arena_t* const arena = mi_page_arena(page, &slice_index, &slice_count);
+    mi_assert_internal(mi_bbitmap_is_clearN(arena->slices_free, slice_index, slice_count));
+    mi_assert_internal(page->slice_committed > 0 || mi_bitmap_is_setN(arena->slices_committed, slice_index, slice_count));
+    mi_assert_internal(mi_bitmap_is_clearN(arena->pages_abandoned[bin], slice_index, 1));
+    mi_assert_internal(mi_bitmap_is_setN(page->memid.mem.arena.arena->pages, page->memid.mem.arena.slice_index, 1));
+    // note: we cannot check for `!mi_page_is_abandoned_and_mapped` since that may
+    // be (temporarily) not true if the free happens while trying to reclaim
+    // see `mi_arana_try_claim_abandoned`
+  }
+  #endif
+
+  // recommit guard page at the end?
+  // we must do this since we may later allocate large spans over this page and cannot have a guard page in between
+  #if MI_SECURE >= 2
+  if (!page->memid.is_pinned) {
+    _mi_os_secure_guard_page_reset_before((uint8_t*)page + mi_page_full_size(page), page->memid);
+  }
+  #endif
+
+  // unregister page
+  _mi_page_map_unregister(page);
+  if (page->memid.memkind == MI_MEM_ARENA) {
+    mi_arena_t* const arena = page->memid.mem.arena.arena;
+    mi_bitmap_clear(arena->pages, page->memid.mem.arena.slice_index);
+    if (page->slice_committed > 0) {
+      // if committed on-demand, set the commit bits to account commit properly
+      mi_assert_internal(mi_page_full_size(page) >= page->slice_committed);
+      const size_t total_slices = page->slice_committed / MI_ARENA_SLICE_SIZE;  // conservative
+      //mi_assert_internal(mi_bitmap_is_clearN(arena->slices_committed, page->memid.mem.arena.slice_index, total_slices));
+      mi_assert_internal(page->memid.mem.arena.slice_count >= total_slices);
+      if (total_slices > 0) {
+        mi_bitmap_setN(arena->slices_committed, page->memid.mem.arena.slice_index, total_slices, NULL);
+      }
+      // any left over?
+      const size_t extra = page->slice_committed % MI_ARENA_SLICE_SIZE;
+      if (extra > 0) {
+        // pretend it was decommitted already
+        mi_os_stat_decrease(committed, extra);
+      }
+    }
+    else {
+      mi_assert_internal(mi_bitmap_is_setN(arena->slices_committed, page->memid.mem.arena.slice_index, page->memid.mem.arena.slice_count));
+    }
+  }
+  _mi_arenas_free(page, mi_page_full_size(page), page->memid);
 }
 
+/* -----------------------------------------------------------
+  Arena abandon
+----------------------------------------------------------- */
+
+void _mi_arenas_page_abandon(mi_page_t* page, mi_tld_t* tld) {
+  mi_assert_internal(_mi_is_aligned(page, MI_PAGE_ALIGN));
+  mi_assert_internal(_mi_ptr_page(page)==page);
+  mi_assert_internal(mi_page_is_owned(page));
+  mi_assert_internal(mi_page_is_abandoned(page));
+  mi_assert_internal(!mi_page_all_free(page));
+  mi_assert_internal(page->next==NULL && page->prev == NULL);
+
+  if (page->memid.memkind==MI_MEM_ARENA && !mi_page_is_full(page)) {
+    // make available for allocations
+    size_t bin = _mi_bin(mi_page_block_size(page));
+    size_t slice_index;
+    size_t slice_count;
+    mi_arena_t* arena = mi_page_arena(page, &slice_index, &slice_count);
+    mi_assert_internal(!mi_page_is_singleton(page));
+    mi_assert_internal(mi_bbitmap_is_clearN(arena->slices_free, slice_index, slice_count));
+    mi_assert_internal(page->slice_committed > 0 || mi_bitmap_is_setN(arena->slices_committed, slice_index, slice_count));
+    mi_assert_internal(mi_bitmap_is_setN(arena->slices_dirty, slice_index, slice_count));
+
+    mi_page_set_abandoned_mapped(page);
+    const bool wasclear = mi_bitmap_set(arena->pages_abandoned[bin], slice_index);
+    MI_UNUSED(wasclear); mi_assert_internal(wasclear);
+    mi_atomic_increment_relaxed(&arena->subproc->abandoned_count[bin]);
+    mi_tld_stat_increase(tld, pages_abandoned, 1);
+  }
+  else {
+    // page is full (or a singleton), or the page is OS/externally allocated
+    // leave as is; it will be reclaimed when an object is free'd in the page
+    mi_subproc_t* subproc = _mi_subproc();
+    // but for non-arena pages, add to the subproc list so these can be visited
+    if (page->memid.memkind != MI_MEM_ARENA && mi_option_is_enabled(mi_option_visit_abandoned)) {
+      mi_lock(&subproc->os_abandoned_pages_lock) {
+        // push in front
+        page->prev = NULL;
+        page->next = subproc->os_abandoned_pages;
+        if (page->next != NULL) { page->next->prev = page; }
+        subproc->os_abandoned_pages = page;
+      }
+    }
+    mi_tld_stat_increase(tld, pages_abandoned, 1);
+  }
+  _mi_page_unown(page);
+}
+
+bool _mi_arenas_page_try_reabandon_to_mapped(mi_page_t* page) {
+  mi_assert_internal(_mi_is_aligned(page, MI_PAGE_ALIGN));
+  mi_assert_internal(_mi_ptr_page(page)==page);
+  mi_assert_internal(mi_page_is_owned(page));
+  mi_assert_internal(mi_page_is_abandoned(page));
+  mi_assert_internal(!mi_page_is_abandoned_mapped(page));
+  mi_assert_internal(!mi_page_is_full(page));
+  mi_assert_internal(!mi_page_all_free(page));
+  mi_assert_internal(!mi_page_is_singleton(page));
+  if (mi_page_is_full(page) || mi_page_is_abandoned_mapped(page) || page->memid.memkind != MI_MEM_ARENA) {
+    return false;
+  }
+  else {
+    mi_tld_t* tld = _mi_thread_tld();
+    mi_tld_stat_counter_increase( tld, pages_reabandon_full, 1);
+    mi_tld_stat_adjust_decrease( tld, pages_abandoned, 1);  // adjust as we are not abandoning fresh
+    _mi_arenas_page_abandon(page,tld);
+    return true;
+  }
+}
+
+// called from `mi_free` if trying to unabandon an abandoned page
+void _mi_arenas_page_unabandon(mi_page_t* page) {
+  mi_assert_internal(_mi_is_aligned(page, MI_PAGE_ALIGN));
+  mi_assert_internal(_mi_ptr_page(page)==page);
+  mi_assert_internal(mi_page_is_owned(page));
+  mi_assert_internal(mi_page_is_abandoned(page));
+
+  if (mi_page_is_abandoned_mapped(page)) {
+    mi_assert_internal(page->memid.memkind==MI_MEM_ARENA);
+    // remove from the abandoned map
+    size_t bin = _mi_bin(mi_page_block_size(page));
+    size_t slice_index;
+    size_t slice_count;
+    mi_arena_t* arena = mi_page_arena(page, &slice_index, &slice_count);
+
+    mi_assert_internal(mi_bbitmap_is_clearN(arena->slices_free, slice_index, slice_count));
+    mi_assert_internal(page->slice_committed > 0 || mi_bitmap_is_setN(arena->slices_committed, slice_index, slice_count));
+
+    // this busy waits until a concurrent reader (from alloc_abandoned) is done
+    mi_bitmap_clear_once_set(arena->pages_abandoned[bin], slice_index);
+    mi_page_clear_abandoned_mapped(page);
+    mi_atomic_decrement_relaxed(&arena->subproc->abandoned_count[bin]);
+    mi_tld_stat_decrease(_mi_thread_tld(), pages_abandoned, 1);
+  }
+  else {
+    // page is full (or a singleton), page is OS allocated
+    mi_tld_stat_decrease(_mi_thread_tld(), pages_abandoned, 1);
+    // if not an arena page, remove from the subproc os pages list
+    if (page->memid.memkind != MI_MEM_ARENA && mi_option_is_enabled(mi_option_visit_abandoned)) {
+      mi_subproc_t* subproc = _mi_subproc();
+      mi_lock(&subproc->os_abandoned_pages_lock) {
+        if (page->prev != NULL) { page->prev->next = page->next; }
+        if (page->next != NULL) { page->next->prev = page->prev; }
+        if (subproc->os_abandoned_pages == page) { subproc->os_abandoned_pages = page->next; }
+        page->next = NULL;
+        page->prev = NULL;
+      }
+    }
+  }
+}
+
+
 /* -----------------------------------------------------------
   Arena free
 ----------------------------------------------------------- */
+static void mi_arena_schedule_purge(mi_arena_t* arena, size_t slice_index, size_t slices);
+static void mi_arenas_try_purge(bool force, bool visit_all, mi_tld_t* tld);
 
-void _mi_arena_free(void* p, size_t size, size_t memid, bool all_committed, mi_os_tld_t* tld) {
-  mi_assert_internal(size > 0 && tld->stats != NULL);
+void _mi_arenas_free(void* p, size_t size, mi_memid_t memid) {
   if (p==NULL) return;
   if (size==0) return;
 
-  if (memid == MI_MEMID_OS) {
+  // need to set all memory to undefined as some parts may still be marked as no_access (like padding etc.)
+  mi_track_mem_undefined(p, size);
+
+  if (mi_memkind_is_os(memid.memkind)) {
     // was a direct OS allocation, pass through
-    _mi_os_free_ex(p, size, all_committed, tld->stats);
+    _mi_os_free(p, size, memid);
   }
-  else {
+  else if (memid.memkind == MI_MEM_ARENA) {
     // allocated in an arena
-    size_t arena_idx;
-    size_t bitmap_idx;
-    mi_arena_memid_indices(memid, &arena_idx, &bitmap_idx);
-    mi_assert_internal(arena_idx < MI_MAX_ARENAS);
-    mi_arena_t* arena = mi_atomic_load_ptr_relaxed(mi_arena_t,&mi_arenas[arena_idx]);
-    mi_assert_internal(arena != NULL);
-    const size_t blocks = mi_block_count_of_size(size);
+    size_t slice_count;
+    size_t slice_index;
+    mi_arena_t* arena = mi_arena_from_memid(memid, &slice_index, &slice_count);
+    mi_assert_internal((size%MI_ARENA_SLICE_SIZE)==0);
+    mi_assert_internal((slice_count*MI_ARENA_SLICE_SIZE)==size);
+    mi_assert_internal(mi_arena_slice_start(arena,slice_index) <= (uint8_t*)p);
+    mi_assert_internal(mi_arena_slice_start(arena,slice_index) + mi_size_of_slices(slice_count) > (uint8_t*)p);
     // checks
     if (arena == NULL) {
-      _mi_error_message(EINVAL, "trying to free from non-existent arena: %p, size %zu, memid: 0x%zx\n", p, size, memid);
+      _mi_error_message(EINVAL, "trying to free from an invalid arena: %p, size %zu, memid: 0x%zx\n", p, size, memid);
       return;
     }
-    mi_assert_internal(arena->field_count > mi_bitmap_index_field(bitmap_idx));
-    if (arena->field_count <= mi_bitmap_index_field(bitmap_idx)) {
-      _mi_error_message(EINVAL, "trying to free from non-existent arena block: %p, size %zu, memid: 0x%zx\n", p, size, memid);
+    mi_assert_internal(slice_index < arena->slice_count);
+    mi_assert_internal(slice_index >= mi_arena_info_slices(arena));
+    if (slice_index < mi_arena_info_slices(arena) || slice_index > arena->slice_count) {
+      _mi_error_message(EINVAL, "trying to free from an invalid arena block: %p, size %zu, memid: 0x%zx\n", p, size, memid);
       return;
     }
+
     // potentially decommit
-    if (!arena->allow_decommit || arena->blocks_committed == NULL) {
-      mi_assert_internal(all_committed); // note: may be not true as we may "pretend" to be not committed (in segment.c)
-    }
-    else {
-      mi_assert_internal(arena->blocks_committed != NULL);
-      _mi_os_decommit(p, blocks * MI_ARENA_BLOCK_SIZE, tld->stats); // ok if this fails
-      _mi_bitmap_unclaim_across(arena->blocks_committed, arena->field_count, blocks, bitmap_idx);
+    if (!arena->memid.is_pinned /* && !arena->memid.initially_committed */) { // todo: allow decommit even if initially committed?
+      // (delay) purge the page
+      mi_arena_schedule_purge(arena, slice_index, slice_count);
     }
-    // and make it available to others again 
-    bool all_inuse = _mi_bitmap_unclaim_across(arena->blocks_inuse, arena->field_count, blocks, bitmap_idx);
+
+    // and make it available to others again
+    bool all_inuse = mi_bbitmap_setN(arena->slices_free, slice_index, slice_count);
     if (!all_inuse) {
-      _mi_error_message(EAGAIN, "trying to free an already freed block: %p, size %zu\n", p, size);
+      _mi_error_message(EAGAIN, "trying to free an already freed arena block: %p, size %zu\n", mi_arena_slice_start(arena,slice_index), mi_size_of_slices(slice_count));
       return;
     };
   }
+  else if (memid.memkind == MI_MEM_META) {
+    _mi_meta_free(p, size, memid);
+  }
+  else {
+    // arena was none, external, or static; nothing to do
+    mi_assert_internal(mi_memid_needs_no_free(memid));
+  }
+
+  // try to purge expired decommits
+  // mi_arenas_try_purge(false, false, NULL);
+}
+
+// Purge the arenas; if `force_purge` is true, amenable parts are purged even if not yet expired
+void _mi_arenas_collect(bool force_purge, bool visit_all, mi_tld_t* tld) {
+  mi_arenas_try_purge(force_purge, visit_all, tld);
+}
+
+
+// Is a pointer contained in the given arena area?
+bool mi_arena_contains(mi_arena_id_t arena_id, const void* p) {
+  mi_arena_t* arena = _mi_arena_from_id(arena_id);
+  return (mi_arena_start(arena) <= (const uint8_t*)p &&
+          mi_arena_start(arena) + mi_size_of_slices(arena->slice_count) >(const uint8_t*)p);
+}
+
+// Is a pointer inside any of our arenas?
+bool _mi_arenas_contain(const void* p) {
+  mi_subproc_t* subproc = _mi_subproc();
+  const size_t max_arena = mi_arenas_get_count(subproc);
+  for (size_t i = 0; i < max_arena; i++) {
+    mi_arena_t* arena = mi_atomic_load_ptr_acquire(mi_arena_t, &subproc->arenas[i]);
+    if (arena != NULL && mi_arena_contains(arena,p)) {
+      return true;
+    }
+  }
+  return false;
+}
+
+
+
+/* -----------------------------------------------------------
+  Remove an arena.
+----------------------------------------------------------- */
+
+// destroy owned arenas; this is unsafe and should only be done using `mi_option_destroy_on_exit`
+// for dynamic libraries that are unloaded and need to release all their allocated memory.
+static void mi_arenas_unsafe_destroy(mi_subproc_t* subproc) {
+  mi_assert_internal(subproc != NULL);
+  const size_t max_arena = mi_arenas_get_count(subproc);
+  size_t new_max_arena = 0;
+  for (size_t i = 0; i < max_arena; i++) {
+    mi_arena_t* arena = mi_atomic_load_ptr_acquire(mi_arena_t, &subproc->arenas[i]);
+    if (arena != NULL) {
+      // mi_lock_done(&arena->abandoned_visit_lock);
+      mi_atomic_store_ptr_release(mi_arena_t, &subproc->arenas[i], NULL);
+      if (mi_memkind_is_os(arena->memid.memkind)) {
+        _mi_os_free_ex(mi_arena_start(arena), mi_arena_size(arena), true, arena->memid, subproc); // pass `subproc` to avoid accessing the heap pointer (in `_mi_subproc()`)
+      }
+    }
+  }
+
+  // try to lower the max arena.
+  size_t expected = max_arena;
+  mi_atomic_cas_strong_acq_rel(&subproc->arena_count, &expected, new_max_arena);
 }
 
+
+// destroy owned arenas; this is unsafe and should only be done using `mi_option_destroy_on_exit`
+// for dynamic libraries that are unloaded and need to release all their allocated memory.
+void _mi_arenas_unsafe_destroy_all(mi_tld_t* tld) {
+  mi_arenas_unsafe_destroy(tld->subproc);
+  _mi_arenas_collect(true /* force purge */, true /* visit all*/, tld);  // purge non-owned arenas
+}
+
+
 /* -----------------------------------------------------------
   Add an arena.
 ----------------------------------------------------------- */
 
-static bool mi_arena_add(mi_arena_t* arena, mi_arena_id_t* arena_id) {
+static bool mi_arenas_add(mi_subproc_t* subproc, mi_arena_t* arena, mi_arena_id_t* arena_id) {
   mi_assert_internal(arena != NULL);
-  mi_assert_internal((uintptr_t)mi_atomic_load_ptr_relaxed(uint8_t,&arena->start) % MI_SEGMENT_ALIGN == 0);
-  mi_assert_internal(arena->block_count > 0);
-  if (arena_id != NULL) *arena_id = -1;
+  mi_assert_internal(arena->slice_count > 0);
+  if (arena_id != NULL) { *arena_id = NULL; }
+
+  // first try to find a NULL entry
+  const size_t count = mi_arenas_get_count(subproc);
+  size_t i;
+  for (i = 0; i < count; i++) {
+    if (mi_arena_from_index(subproc,i) == NULL) {
+      mi_arena_t* expected = NULL;
+      if (mi_atomic_cas_ptr_strong_release(mi_arena_t, &subproc->arenas[i], &expected, arena)) {
+        // success
+        if (arena_id != NULL) { *arena_id = arena; }
+        return true;
+      }
+    }
+  }
 
-  size_t i = mi_atomic_increment_acq_rel(&mi_arena_count);
+  // otherwise increase the max
+  i = mi_atomic_increment_acq_rel(&subproc->arena_count);
   if (i >= MI_MAX_ARENAS) {
-    mi_atomic_decrement_acq_rel(&mi_arena_count);
+    mi_atomic_decrement_acq_rel(&subproc->arena_count);
+    arena->subproc = NULL;
     return false;
   }
-  mi_atomic_store_ptr_release(mi_arena_t,&mi_arenas[i], arena);
-  arena->id = mi_arena_id_create(i);
-  if (arena_id != NULL) *arena_id = arena->id;
+
+  mi_subproc_stat_counter_increase(arena->subproc, arena_count, 1);
+  mi_atomic_store_ptr_release(mi_arena_t,&subproc->arenas[i], arena);
+  if (arena_id != NULL) { *arena_id = arena; }
   return true;
 }
 
-bool mi_manage_os_memory_ex(void* start, size_t size, bool is_committed, bool is_large, bool is_zero, int numa_node, bool exclusive, mi_arena_id_t* arena_id) mi_attr_noexcept
+static size_t mi_arena_info_slices_needed(size_t slice_count, size_t* bitmap_base) {
+  if (slice_count == 0) slice_count = MI_BCHUNK_BITS;
+  mi_assert_internal((slice_count % MI_BCHUNK_BITS) == 0);
+  const size_t base_size = _mi_align_up(sizeof(mi_arena_t), MI_BCHUNK_SIZE);
+  const size_t bitmaps_count = 4 + MI_BIN_COUNT; // commit, dirty, purge, pages, and abandonded
+  const size_t bitmaps_size = bitmaps_count * mi_bitmap_size(slice_count, NULL) + mi_bbitmap_size(slice_count, NULL); // + free
+  const size_t size = base_size + bitmaps_size;
+
+  const size_t os_page_size = _mi_os_page_size();
+  const size_t info_size = _mi_align_up(size, os_page_size) + _mi_os_secure_guard_page_size();
+  const size_t info_slices = mi_slice_count_of_size(info_size);
+
+  if (bitmap_base != NULL) *bitmap_base = base_size;
+  return info_slices;
+}
+
+static mi_bitmap_t* mi_arena_bitmap_init(size_t slice_count, uint8_t** base) {
+  mi_bitmap_t* bitmap = (mi_bitmap_t*)(*base);
+  *base = (*base) + mi_bitmap_init(bitmap, slice_count, true /* already zero */);
+  return bitmap;
+}
+
+static mi_bbitmap_t* mi_arena_bbitmap_init(size_t slice_count, uint8_t** base) {
+  mi_bbitmap_t* bbitmap = (mi_bbitmap_t*)(*base);
+  *base = (*base) + mi_bbitmap_init(bbitmap, slice_count, true /* already zero */);
+  return bbitmap;
+}
+
+
+static bool mi_manage_os_memory_ex2(mi_subproc_t* subproc, void* start, size_t size, int numa_node, bool exclusive,
+                                    mi_memid_t memid, mi_commit_fun_t* commit_fun, void* commit_fun_arg, mi_arena_id_t* arena_id) mi_attr_noexcept
 {
-  if (arena_id != NULL) *arena_id = _mi_arena_id_none();
-  if (size < MI_ARENA_BLOCK_SIZE) return false;
+  mi_assert(_mi_is_aligned(start,MI_ARENA_SLICE_SIZE));
+  mi_assert(start!=NULL);
+  if (arena_id != NULL) { *arena_id = _mi_arena_id_none(); }
+  if (start==NULL) return false;
+  if (!_mi_is_aligned(start,MI_ARENA_SLICE_SIZE)) {
+    // we can align the start since the memid tracks the real base of the memory.
+    void* const aligned_start = _mi_align_up_ptr(start, MI_ARENA_SLICE_SIZE);
+    const size_t diff = (uint8_t*)aligned_start - (uint8_t*)start;
+    if (diff >= size || (size - diff) < MI_ARENA_SLICE_SIZE) {
+      _mi_warning_message("after alignment, the size of the arena becomes too small (memory at %p with size %zu)\n", start, size);
+      return false;
+    }
+    start = aligned_start;
+    size = size - diff;
+  }
 
-  if (is_large) {
-    mi_assert_internal(is_committed);
-    is_committed = true;
+  const size_t slice_count = _mi_align_down(size / MI_ARENA_SLICE_SIZE, MI_BCHUNK_BITS);
+  if (slice_count > MI_BITMAP_MAX_BIT_COUNT) {  // 16 GiB for now
+    // todo: allow larger areas (either by splitting it up in arena's or having larger arena's)
+    _mi_warning_message("cannot use OS memory since it is too large (size %zu MiB, maximum is %zu MiB)", size/MI_MiB, mi_size_of_slices(MI_BITMAP_MAX_BIT_COUNT)/MI_MiB);
+    return false;
   }
-  
-  const size_t bcount = size / MI_ARENA_BLOCK_SIZE; 
-  const size_t fields = _mi_divide_up(bcount, MI_BITMAP_FIELD_BITS);
-  const size_t bitmaps = (is_committed ? 2 : 3);
-  const size_t asize  = sizeof(mi_arena_t) + (bitmaps*fields*sizeof(mi_bitmap_field_t));
-  mi_arena_t* arena   = (mi_arena_t*)_mi_os_alloc(asize, &_mi_stats_main); // TODO: can we avoid allocating from the OS?
-  if (arena == NULL) return false;
-
-  arena->id = _mi_arena_id_none();
-  arena->exclusive = exclusive;
-  arena->block_count = bcount;
-  arena->field_count = fields;
-  arena->start = (uint8_t*)start;
+  size_t bitmap_base;
+  const size_t info_slices = mi_arena_info_slices_needed(slice_count, &bitmap_base);
+  if (slice_count < info_slices+1) {
+    _mi_warning_message("cannot use OS memory since it is not large enough (size %zu KiB, minimum required is %zu KiB)", size/MI_KiB, mi_size_of_slices(info_slices+1)/MI_KiB);
+    return false;
+  }
+  else if (info_slices >= MI_ARENA_MAX_OBJ_SLICES) {
+    _mi_warning_message("cannot use OS memory since it is too large with respect to the maximum object size (size %zu MiB, meta-info slices %zu, maximum object slices are %zu)", size/MI_MiB, info_slices, MI_ARENA_MAX_OBJ_SLICES);
+    return false;
+  }
+
+  mi_arena_t* arena = (mi_arena_t*)start;
+
+  // commit & zero if needed
+  if (!memid.initially_committed) {
+    size_t commit_size = mi_size_of_slices(info_slices);
+    // leave a guard OS page decommitted at the end?
+    if (!memid.is_pinned) { commit_size -= _mi_os_secure_guard_page_size(); }
+    bool ok = false;
+    if (commit_fun != NULL) {
+      ok = (*commit_fun)(true /* commit */, arena, commit_size, NULL, commit_fun_arg);
+    }
+    else {
+      ok = _mi_os_commit(arena, commit_size, NULL);
+    }
+    if (!ok) {
+      _mi_warning_message("unable to commit meta-data for OS memory");
+      return false;
+    }
+  }
+  else if (!memid.is_pinned) {
+    // if MI_SECURE, set a guard page at the end
+    // todo: this does not respect the commit_fun as the memid is of external memory
+    _mi_os_secure_guard_page_set_before((uint8_t*)arena + mi_size_of_slices(info_slices), memid);
+  }
+  if (!memid.initially_zero) {
+    _mi_memzero(arena, mi_size_of_slices(info_slices) - _mi_os_secure_guard_page_size());
+  }
+
+  // init
+  arena->subproc      = subproc;
+  arena->memid        = memid;
+  arena->is_exclusive = exclusive;
+  arena->slice_count  = slice_count;
+  arena->info_slices  = info_slices;
   arena->numa_node    = numa_node; // TODO: or get the current numa node if -1? (now it allows anyone to allocate on -1)
-  arena->is_large     = is_large;
-  arena->is_zero_init = is_zero;
-  arena->allow_decommit = !is_large && !is_committed; // only allow decommit for initially uncommitted memory
-  arena->search_idx   = 0;
-  arena->blocks_dirty = &arena->blocks_inuse[fields]; // just after inuse bitmap
-  arena->blocks_committed = (!arena->allow_decommit ? NULL : &arena->blocks_inuse[2*fields]); // just after dirty bitmap
-  // the bitmaps are already zero initialized due to os_alloc
-  // initialize committed bitmap?
-  if (arena->blocks_committed != NULL && is_committed) {
-    memset((void*)arena->blocks_committed, 0xFF, fields*sizeof(mi_bitmap_field_t)); // cast to void* to avoid atomic warning
+  arena->purge_expire = 0;
+  arena->commit_fun   = commit_fun;
+  arena->commit_fun_arg = commit_fun_arg;
+  // mi_lock_init(&arena->abandoned_visit_lock);
+
+  // init bitmaps
+  uint8_t* base = mi_arena_start(arena) + bitmap_base;
+  arena->slices_free = mi_arena_bbitmap_init(slice_count,&base);
+  arena->slices_committed = mi_arena_bitmap_init(slice_count,&base);
+  arena->slices_dirty = mi_arena_bitmap_init(slice_count,&base);
+  arena->slices_purge = mi_arena_bitmap_init(slice_count, &base);
+  arena->pages = mi_arena_bitmap_init(slice_count, &base);
+  for( size_t i = 0; i < MI_ARENA_BIN_COUNT; i++) {
+    arena->pages_abandoned[i] = mi_arena_bitmap_init(slice_count,&base);
+  }
+  mi_assert_internal(mi_size_of_slices(info_slices) >= (size_t)(base - mi_arena_start(arena)));
+
+  // reserve our meta info (and reserve slices outside the memory area)
+  mi_bbitmap_unsafe_setN(arena->slices_free, info_slices /* start */, arena->slice_count - info_slices);
+  if (memid.initially_committed) {
+    mi_bitmap_unsafe_setN(arena->slices_committed, 0, arena->slice_count);
+  }
+  else {
+    mi_bitmap_setN(arena->slices_committed, 0, info_slices, NULL);
+  }
+  if (!memid.initially_zero) {
+    mi_bitmap_unsafe_setN(arena->slices_dirty, 0, arena->slice_count);
   }
-  // and claim leftover blocks if needed (so we never allocate there)
-  ptrdiff_t post = (fields * MI_BITMAP_FIELD_BITS) - bcount;
-  mi_assert_internal(post >= 0);
-  if (post > 0) {
-    // don't use leftover bits at the end
-    mi_bitmap_index_t postidx = mi_bitmap_index_create(fields - 1, MI_BITMAP_FIELD_BITS - post);
-    _mi_bitmap_claim(arena->blocks_inuse, fields, post, postidx, NULL);
+  else {
+    mi_bitmap_setN(arena->slices_dirty, 0, info_slices, NULL);
   }
 
-  return mi_arena_add(arena, arena_id);
+  return mi_arenas_add(subproc, arena, arena_id);
+}
+
 
+bool mi_manage_os_memory_ex(void* start, size_t size, bool is_committed, bool is_pinned, bool is_zero, int numa_node, bool exclusive, mi_arena_id_t* arena_id) mi_attr_noexcept {
+  mi_memid_t memid = _mi_memid_create(MI_MEM_EXTERNAL);
+  memid.mem.os.base = start;
+  memid.mem.os.size = size;
+  memid.initially_committed = is_committed;
+  memid.initially_zero = is_zero;
+  memid.is_pinned = is_pinned;
+  return mi_manage_os_memory_ex2(_mi_subproc(), start, size, numa_node, exclusive, memid, NULL, NULL, arena_id);
 }
 
-// Reserve a range of regular OS memory
-int mi_reserve_os_memory_ex(size_t size, bool commit, bool allow_large, bool exclusive, mi_arena_id_t* arena_id) mi_attr_noexcept 
+bool mi_manage_memory(void* start, size_t size, bool is_committed, bool is_zero, bool is_pinned, int numa_node, bool exclusive, mi_commit_fun_t* commit_fun, void* commit_fun_arg, mi_arena_id_t* arena_id) mi_attr_noexcept
 {
+  mi_memid_t memid = _mi_memid_create(MI_MEM_EXTERNAL);
+  memid.mem.os.base = start;
+  memid.mem.os.size = size;
+  memid.initially_committed = is_committed;
+  memid.initially_zero = is_zero;
+  memid.is_pinned = is_pinned;
+  return mi_manage_os_memory_ex2(_mi_subproc(), start, size, numa_node, exclusive, memid, commit_fun, commit_fun_arg, arena_id);
+}
+
+
+// Reserve a range of regular OS memory
+static int mi_reserve_os_memory_ex2(mi_subproc_t* subproc, size_t size, bool commit, bool allow_large, bool exclusive, mi_arena_id_t* arena_id) {
   if (arena_id != NULL) *arena_id = _mi_arena_id_none();
-  size = _mi_align_up(size, MI_ARENA_BLOCK_SIZE); // at least one block
-  bool large = allow_large;
-  void* start = _mi_os_alloc_aligned(size, MI_SEGMENT_ALIGN, commit, &large, &_mi_stats_main);
-  if (start==NULL) return ENOMEM;
-  if (!mi_manage_os_memory_ex(start, size, (large || commit), large, true, -1, exclusive, arena_id)) {
-    _mi_os_free_ex(start, size, commit, &_mi_stats_main);
-    _mi_verbose_message("failed to reserve %zu k memory\n", _mi_divide_up(size,1024));
+  size = _mi_align_up(size, MI_ARENA_SLICE_SIZE); // at least one slice
+  mi_memid_t memid;
+  void* start = _mi_os_alloc_aligned(size, MI_ARENA_SLICE_ALIGN, commit, allow_large, &memid);
+  if (start == NULL) return ENOMEM;
+  if (!mi_manage_os_memory_ex2(subproc, start, size, -1 /* numa node */, exclusive, memid, NULL, NULL, arena_id)) {
+    _mi_os_free_ex(start, size, commit, memid, NULL);
+    _mi_verbose_message("failed to reserve %zu KiB memory\n", _mi_divide_up(size, 1024));
     return ENOMEM;
   }
-  _mi_verbose_message("reserved %zu KiB memory%s\n", _mi_divide_up(size,1024), large ? " (in large os pages)" : "");
+  _mi_verbose_message("reserved %zu KiB memory%s\n", _mi_divide_up(size, 1024), memid.is_pinned ? " (in large os pages)" : "");
+  // mi_debug_show_arenas(true, true, false);
+
   return 0;
 }
 
+// Reserve a range of regular OS memory
+int mi_reserve_os_memory_ex(size_t size, bool commit, bool allow_large, bool exclusive, mi_arena_id_t* arena_id) mi_attr_noexcept {
+  return mi_reserve_os_memory_ex2(_mi_subproc(), size, commit, allow_large, exclusive, arena_id);
+}
+
+// Manage a range of regular OS memory
 bool mi_manage_os_memory(void* start, size_t size, bool is_committed, bool is_large, bool is_zero, int numa_node) mi_attr_noexcept {
-  return mi_manage_os_memory_ex(start, size, is_committed, is_large, is_zero, numa_node, false, NULL);
+  return mi_manage_os_memory_ex(start, size, is_committed, is_large, is_zero, numa_node, false /* exclusive? */, NULL);
 }
 
+// Reserve a range of regular OS memory
 int mi_reserve_os_memory(size_t size, bool commit, bool allow_large) mi_attr_noexcept {
   return mi_reserve_os_memory_ex(size, commit, allow_large, false, NULL);
 }
@@ -439,32 +1345,223 @@ int mi_reserve_os_memory(size_t size, bool commit, bool allow_large) mi_attr_noe
   Debugging
 ----------------------------------------------------------- */
 
-static size_t mi_debug_show_bitmap(const char* prefix, mi_bitmap_field_t* fields, size_t field_count ) {
-  size_t inuse_count = 0;
-  for (size_t i = 0; i < field_count; i++) {
-    char buf[MI_BITMAP_FIELD_BITS + 1];
-    uintptr_t field = mi_atomic_load_relaxed(&fields[i]);
-    for (size_t bit = 0; bit < MI_BITMAP_FIELD_BITS; bit++) {
-      bool inuse = ((((uintptr_t)1 << bit) & field) != 0);
-      if (inuse) inuse_count++;
-      buf[MI_BITMAP_FIELD_BITS - 1 - bit] = (inuse ? 'x' : '.');
+// Return idx of the slice past the last used slice
+static size_t mi_arena_used_slices(mi_arena_t* arena) {
+  size_t idx;
+  if (mi_bitmap_bsr(arena->pages, &idx)) {
+    mi_page_t* page = (mi_page_t*)mi_arena_slice_start(arena, idx);
+    const size_t page_slice_count = page->memid.mem.arena.slice_count;
+    return (idx + page_slice_count);
+  }
+  else {
+    return mi_arena_info_slices(arena);
+  }
+}
+
+static size_t mi_debug_show_bfield(mi_bfield_t field, char* buf, size_t* k) {
+  size_t bit_set_count = 0;
+  for (int bit = 0; bit < MI_BFIELD_BITS; bit++) {
+    bool is_set = ((((mi_bfield_t)1 << bit) & field) != 0);
+    if (is_set) bit_set_count++;
+    buf[*k++] = (is_set ? 'x' : '.');
+  }
+  return bit_set_count;
+}
+
+typedef enum mi_ansi_color_e {
+  MI_BLACK = 30,
+  MI_MAROON,
+  MI_DARKGREEN,
+  MI_ORANGE,
+  MI_NAVY,
+  MI_PURPLE,
+  MI_TEAL,
+  MI_GRAY,
+  MI_DARKGRAY = 90,
+  MI_RED,
+  MI_GREEN,
+  MI_YELLOW,
+  MI_BLUE,
+  MI_MAGENTA,
+  MI_CYAN,
+  MI_WHITE
+} mi_ansi_color_t;
+
+static void mi_debug_color(char* buf, size_t* k, mi_ansi_color_t color) {
+  *k += _mi_snprintf(buf + *k, 32, "\x1B[%dm", (int)color);
+}
+
+static int mi_page_commit_usage(mi_page_t* page) {
+  // if (mi_page_size(page) <= MI_PAGE_MIN_COMMIT_SIZE) return 100;
+  const size_t committed_size = mi_page_committed(page);
+  const size_t used_size = page->used * mi_page_block_size(page);
+  return (int)(used_size * 100 / committed_size);
+}
+
+static size_t mi_debug_show_page_bfield(mi_bfield_t field, char* buf, size_t* k, mi_arena_t* arena, size_t slice_index, long* pbit_of_page, mi_ansi_color_t* pcolor_of_page ) {
+  size_t bit_set_count = 0;
+  long bit_of_page = *pbit_of_page;
+  mi_ansi_color_t color = *pcolor_of_page;
+  mi_ansi_color_t prev_color = MI_GRAY;
+  for (int bit = 0; bit < MI_BFIELD_BITS; bit++, bit_of_page--) {
+    bool is_set = ((((mi_bfield_t)1 << bit) & field) != 0);
+    void* start = mi_arena_slice_start(arena, slice_index + bit);
+    char c = ' ';
+    if (is_set) {
+      mi_assert_internal(bit_of_page <= 0);
+      bit_set_count++;
+      c = 'p';
+      color = MI_GRAY;
+      mi_page_t* page = (mi_page_t*)start;
+      if (mi_page_is_singleton(page)) { c = 's'; }
+      else if (mi_page_is_full(page)) { c = 'f'; }
+      if (!mi_page_is_abandoned(page)) { c = _mi_toupper(c); }
+      int commit_usage = mi_page_commit_usage(page);
+      if (commit_usage < 25) { color = MI_MAROON; }
+      else if (commit_usage < 50) { color = MI_ORANGE; }
+      else if (commit_usage < 75) { color = MI_TEAL; }
+      else color = MI_DARKGREEN;
+      bit_of_page = (long)page->memid.mem.arena.slice_count;
     }
-    buf[MI_BITMAP_FIELD_BITS] = 0;
-    _mi_verbose_message("%s%s\n", prefix, buf);
+    else {
+      c = '?';
+      if (bit_of_page > 0) { c = '-'; }
+      else if (_mi_meta_is_meta_page(start)) { c = 'm'; color = MI_GRAY; }
+      else if (slice_index + bit < arena->info_slices) { c = 'i'; color = MI_GRAY; }
+      // else if (mi_bitmap_is_setN(arena->pages_purge, slice_index + bit, NULL)) { c = '*'; }
+      else if (mi_bbitmap_is_setN(arena->slices_free, slice_index+bit,1)) {
+        if (mi_bitmap_is_set(arena->slices_purge, slice_index + bit)) { c = '~'; color = MI_ORANGE; }
+        else if (mi_bitmap_is_setN(arena->slices_committed, slice_index + bit, 1)) { c = '_'; color = MI_GRAY; }
+        else { c = '.'; color = MI_GRAY; }
+      }
+      if (bit==MI_BFIELD_BITS-1 && bit_of_page > 1) { c = '>'; }
+    }
+    if (color != prev_color) {
+      mi_debug_color(buf, k, color);
+      prev_color = color;
+    }
+    buf[*k] = c; *k += 1;
   }
-  return inuse_count;
+  mi_debug_color(buf, k, MI_GRAY);
+  *pbit_of_page = bit_of_page;
+  *pcolor_of_page = color;
+  return bit_set_count;
 }
 
-void mi_debug_show_arenas(void) mi_attr_noexcept {
-  size_t max_arenas = mi_atomic_load_relaxed(&mi_arena_count);
+static size_t mi_debug_show_chunks(const char* header1, const char* header2, const char* header3,
+                                   size_t slice_count, size_t chunk_count,
+                                   mi_bchunk_t* chunks, mi_bchunkmap_t* chunk_bins, bool invert, mi_arena_t* arena, bool narrow)
+{
+  _mi_raw_message("\x1B[37m%s%s%s (use/commit: \x1B[31m0 - 25%%\x1B[33m - 50%%\x1B[36m - 75%%\x1B[32m - 100%%\x1B[0m)\n", header1, header2, header3);
+  const size_t fields_per_line = (narrow ? 2 : 4);
+  const size_t used_slice_count = mi_arena_used_slices(arena);
+  size_t bit_count = 0;
+  size_t bit_set_count = 0;
+  for (size_t i = 0; i < chunk_count && bit_count < slice_count; i++) {
+    char buf[5*MI_BCHUNK_BITS + 64]; _mi_memzero(buf, sizeof(buf));
+    if (bit_count > used_slice_count && i+2 < chunk_count) {
+      const size_t diff = chunk_count - 1 - i;
+      bit_count += diff*MI_BCHUNK_BITS;
+      _mi_raw_message("  |\n");
+      i = chunk_count-1;
+    }
+
+    size_t k = 0;
+    mi_bchunk_t* chunk = &chunks[i];
+
+    if (i<10)        { buf[k++] = ('0' + (char)i); buf[k++] = ' '; buf[k++] = ' '; }
+    else if (i<100)  { buf[k++] = ('0' + (char)(i/10)); buf[k++] = ('0' + (char)(i%10)); buf[k++] = ' '; }
+    else if (i<1000) { buf[k++] = ('0' + (char)(i/100)); buf[k++] = ('0' + (char)((i%100)/10)); buf[k++] = ('0' + (char)(i%10)); }
+
+    char chunk_kind = ' ';
+    if (chunk_bins != NULL) {
+      switch (mi_bbitmap_debug_get_bin(chunk_bins,i)) {
+        case MI_CBIN_SMALL:  chunk_kind = 'S'; break;
+        case MI_CBIN_MEDIUM: chunk_kind = 'M'; break;
+        case MI_CBIN_LARGE:  chunk_kind = 'L'; break;
+        case MI_CBIN_OTHER:  chunk_kind = 'X'; break;
+        default: chunk_kind = ' '; break; // suppress warning
+        // case MI_CBIN_NONE: chunk_kind = 'N'; break;
+      }
+    }
+    buf[k++] = chunk_kind;
+    buf[k++] = ' ';
+
+    long bit_of_page = 0;
+    mi_ansi_color_t color_of_page = MI_GRAY;
+    for (size_t j = 0; j < MI_BCHUNK_FIELDS; j++) {
+      if (j > 0 && (j % fields_per_line) == 0) {
+        // buf[k++] = '\n'; _mi_memset(buf+k,' ',7); k += 7;
+        _mi_raw_message("  %s\n\x1B[37m", buf);
+        _mi_memzero(buf, sizeof(buf));
+        _mi_memset(buf, ' ', 5); k = 5;
+      }
+      if (bit_count < slice_count) {
+        mi_bfield_t bfield = chunk->bfields[j];
+        if (invert) bfield = ~bfield;
+        size_t xcount = (arena!=NULL ? mi_debug_show_page_bfield(bfield, buf, &k, arena, bit_count, &bit_of_page, &color_of_page)
+                                     : mi_debug_show_bfield(bfield, buf, &k));
+        if (invert) xcount = MI_BFIELD_BITS - xcount;
+        bit_set_count += xcount;
+        buf[k++] = ' ';
+      }
+      else {
+        _mi_memset(buf + k, 'o', MI_BFIELD_BITS);
+        k += MI_BFIELD_BITS;
+      }
+      bit_count += MI_BFIELD_BITS;
+    }
+    _mi_raw_message("  %s\n\x1B[37m", buf);
+  }
+  _mi_raw_message("\x1B[0m  total ('x'): %zu\n", bit_set_count);
+  return bit_set_count;
+}
+
+static size_t mi_debug_show_bitmap_binned(const char* header1, const char* header2, const char* header3, size_t slice_count, mi_bitmap_t* bitmap, mi_bchunkmap_t* chunk_bins, bool invert, mi_arena_t* arena, bool narrow) {
+  return mi_debug_show_chunks(header1, header2, header3, slice_count, mi_bitmap_chunk_count(bitmap), &bitmap->chunks[0], chunk_bins, invert, arena, narrow);
+}
+
+static void mi_debug_show_arenas_ex(bool show_pages, bool narrow) mi_attr_noexcept {
+  mi_subproc_t* subproc = _mi_subproc();
+  size_t max_arenas = mi_arenas_get_count(subproc);
+  //size_t free_total = 0;
+  //size_t slice_total = 0;
+  //size_t abandoned_total = 0;
+  size_t page_total = 0;
   for (size_t i = 0; i < max_arenas; i++) {
-    mi_arena_t* arena = mi_atomic_load_ptr_relaxed(mi_arena_t, &mi_arenas[i]);
+    mi_arena_t* arena = mi_atomic_load_ptr_acquire(mi_arena_t, &subproc->arenas[i]);
     if (arena == NULL) break;
-    size_t inuse_count = 0;
-    _mi_verbose_message("arena %zu: %zu blocks with %zu fields\n", i, arena->block_count, arena->field_count);
-    inuse_count += mi_debug_show_bitmap("  ", arena->blocks_inuse, arena->field_count);
-    _mi_verbose_message("  blocks in use ('x'): %zu\n", inuse_count);
+    mi_assert(arena->subproc == subproc);
+    // slice_total += arena->slice_count;
+    _mi_raw_message("arena %zu at %p: %zu slices (%zu MiB)%s, subproc: %p\n", i, arena, arena->slice_count, (size_t)(mi_size_of_slices(arena->slice_count)/MI_MiB), (arena->memid.is_pinned ? ", pinned" : ""), arena->subproc);
+    //if (show_inuse) {
+    //  free_total += mi_debug_show_bbitmap("in-use slices", arena->slice_count, arena->slices_free, true, NULL);
+    //}
+    //if (show_committed) {
+    //  mi_debug_show_bitmap("committed slices", arena->slice_count, arena->slices_committed, false, NULL);
+    //}
+    // todo: abandoned slices
+    //if (show_purge) {
+    //  purge_total += mi_debug_show_bitmap("purgeable slices", arena->slice_count, arena->slices_purge, false, NULL);
+    //}
+    if (show_pages) {
+      const char* header1 = "pages (p:page, f:full, s:singleton, P,F,S:not abandoned, i:arena-info, m:meta-data, ~:free-purgable, _:free-committed, .:free-reserved)";
+      const char* header2 = (narrow ? "\n      " : " ");
+      const char* header3 = "(chunk bin: S:small, M : medium, L : large, X : other)";
+      page_total += mi_debug_show_bitmap_binned(header1, header2, header3, arena->slice_count, arena->pages, arena->slices_free->chunkmap_bins, false, arena, narrow);
+    }
   }
+  // if (show_inuse)     _mi_raw_message("total inuse slices    : %zu\n", slice_total - free_total);
+  // if (show_abandoned) _mi_raw_message("total abandoned slices: %zu\n", abandoned_total);
+  if (show_pages) _mi_raw_message("total pages in arenas: %zu\n", page_total);
+}
+
+void mi_debug_show_arenas(void) mi_attr_noexcept {
+  mi_debug_show_arenas_ex(true /* show pages */, false /* narrow? */);
+}
+
+void mi_arenas_print(void) mi_attr_noexcept {
+  mi_debug_show_arenas();
 }
 
 
@@ -473,21 +1570,22 @@ void mi_debug_show_arenas(void) mi_attr_noexcept {
 ----------------------------------------------------------- */
 // reserve at a specific numa node
 int mi_reserve_huge_os_pages_at_ex(size_t pages, int numa_node, size_t timeout_msecs, bool exclusive, mi_arena_id_t* arena_id) mi_attr_noexcept {
-  if (arena_id != NULL) *arena_id = -1;
+  if (arena_id != NULL) *arena_id = NULL;
   if (pages==0) return 0;
   if (numa_node < -1) numa_node = -1;
   if (numa_node >= 0) numa_node = numa_node % _mi_os_numa_node_count();
   size_t hsize = 0;
   size_t pages_reserved = 0;
-  void* p = _mi_os_alloc_huge_os_pages(pages, numa_node, timeout_msecs, &pages_reserved, &hsize);
+  mi_memid_t memid;
+  void* p = _mi_os_alloc_huge_os_pages(pages, numa_node, timeout_msecs, &pages_reserved, &hsize, &memid);
   if (p==NULL || pages_reserved==0) {
     _mi_warning_message("failed to reserve %zu GiB huge pages\n", pages);
     return ENOMEM;
   }
   _mi_verbose_message("numa node %i: reserved %zu GiB huge pages (of the %zu GiB requested)\n", numa_node, pages_reserved, pages);
 
-  if (!mi_manage_os_memory_ex(p, hsize, true, true, true, numa_node, exclusive, arena_id)) {
-    _mi_os_free_huge_pages(p, hsize, &_mi_stats_main);
+  if (!mi_manage_os_memory_ex2(_mi_subproc(), p, hsize, numa_node, exclusive, memid, NULL, NULL, arena_id)) {
+    _mi_os_free(p, hsize, memid);
     return ENOMEM;
   }
   return 0;
@@ -502,17 +1600,17 @@ int mi_reserve_huge_os_pages_interleave(size_t pages, size_t numa_nodes, size_t
   if (pages == 0) return 0;
 
   // pages per numa node
-  size_t numa_count = (numa_nodes > 0 ? numa_nodes : _mi_os_numa_node_count());
-  if (numa_count <= 0) numa_count = 1;
+  int numa_count = (numa_nodes > 0 && numa_nodes <= INT_MAX ? (int)numa_nodes : _mi_os_numa_node_count());
+  if (numa_count <= 0) { numa_count = 1; }
   const size_t pages_per = pages / numa_count;
   const size_t pages_mod = pages % numa_count;
   const size_t timeout_per = (timeout_msecs==0 ? 0 : (timeout_msecs / numa_count) + 50);
 
   // reserve evenly among numa nodes
-  for (size_t numa_node = 0; numa_node < numa_count && pages > 0; numa_node++) {
+  for (int numa_node = 0; numa_node < numa_count && pages > 0; numa_node++) {
     size_t node_pages = pages_per;  // can be 0
-    if (numa_node < pages_mod) node_pages++;
-    int err = mi_reserve_huge_os_pages_at(node_pages, (int)numa_node, timeout_per);
+    if ((size_t)numa_node < pages_mod) { node_pages++; }
+    int err = mi_reserve_huge_os_pages_at(node_pages, numa_node, timeout_per);
     if (err) return err;
     if (pages < node_pages) {
       pages = 0;
@@ -533,3 +1631,363 @@ int mi_reserve_huge_os_pages(size_t pages, double max_secs, size_t* pages_reserv
   if (err==0 && pages_reserved!=NULL) *pages_reserved = pages;
   return err;
 }
+
+
+
+
+
+/* -----------------------------------------------------------
+  Arena purge
+----------------------------------------------------------- */
+
+static long mi_arena_purge_delay(void) {
+  // <0 = no purging allowed, 0=immediate purging, >0=milli-second delay
+  return (mi_option_get(mi_option_purge_delay) * mi_option_get(mi_option_arena_purge_mult));
+}
+
+// reset or decommit in an arena and update the commit bitmap
+// assumes we own the area (i.e. slices_free is claimed by us)
+// returns if the memory is no longer committed (versus reset which keeps the commit)
+static bool mi_arena_purge(mi_arena_t* arena, size_t slice_index, size_t slice_count) {
+  mi_assert_internal(!arena->memid.is_pinned);
+  mi_assert_internal(mi_bbitmap_is_clearN(arena->slices_free, slice_index, slice_count));
+
+  const size_t size = mi_size_of_slices(slice_count);
+  void* const p = mi_arena_slice_start(arena, slice_index);
+  //const bool all_committed = mi_bitmap_is_setN(arena->slices_committed, slice_index, slice_count);
+  size_t already_committed;
+  mi_bitmap_setN(arena->slices_committed, slice_index, slice_count, &already_committed); // pretend all committed.. (as we lack a clearN call that counts the already set bits..)
+  const bool all_committed = (already_committed == slice_count);
+  const bool needs_recommit = _mi_os_purge_ex(p, size, all_committed /* allow reset? */, mi_size_of_slices(already_committed), arena->commit_fun, arena->commit_fun_arg);
+
+  if (needs_recommit) {
+    // no longer committed
+    mi_bitmap_clearN(arena->slices_committed, slice_index, slice_count);
+    // we just counted in the purge to decommit all, but the some part was not committed so adjust that here
+    // mi_os_stat_decrease(committed, mi_size_of_slices(slice_count - already_committed));
+  }
+  else if (!all_committed) {
+    // we cannot assume any of these are committed any longer (even with reset since we did setN and may have marked uncommitted slices as committed)
+    mi_bitmap_clearN(arena->slices_committed, slice_index, slice_count);
+    // we adjust the commit count as parts will be re-committed
+    // mi_os_stat_decrease(committed, mi_size_of_slices(already_committed));
+  }
+
+  return needs_recommit;
+}
+
+
+// Schedule a purge. This is usually delayed to avoid repeated decommit/commit calls.
+// Note: assumes we (still) own the area as we may purge immediately
+static void mi_arena_schedule_purge(mi_arena_t* arena, size_t slice_index, size_t slice_count) {
+  const long delay = mi_arena_purge_delay();
+  if (arena->memid.is_pinned || delay < 0 || _mi_preloading()) return;  // is purging allowed at all?
+
+  mi_assert_internal(mi_bbitmap_is_clearN(arena->slices_free, slice_index, slice_count));
+  if (delay == 0) {
+    // purge directly
+    mi_arena_purge(arena, slice_index, slice_count);
+  }
+  else {
+    // schedule purge
+    const mi_msecs_t expire = _mi_clock_now() + delay;
+    mi_msecs_t expire0 = 0;
+    if (mi_atomic_casi64_strong_acq_rel(&arena->purge_expire, &expire0, expire)) {
+      // expiration was not yet set
+      // maybe set the global arenas expire as well (if it wasn't set already)
+      mi_assert_internal(expire0==0);
+      mi_atomic_casi64_strong_acq_rel(&arena->subproc->purge_expire, &expire0, expire);
+    }
+    else {
+      // already an expiration was set
+    }
+    mi_bitmap_setN(arena->slices_purge, slice_index, slice_count, NULL);
+  }
+}
+
+typedef struct mi_purge_visit_info_s {
+  mi_msecs_t now;
+  mi_msecs_t delay;
+  bool all_purged;
+  bool any_purged;
+} mi_purge_visit_info_t;
+
+static bool mi_arena_try_purge_range(mi_arena_t* arena, size_t slice_index, size_t slice_count) {
+  if (mi_bbitmap_try_clearN(arena->slices_free, slice_index, slice_count)) {
+    // purge
+    bool decommitted = mi_arena_purge(arena, slice_index, slice_count); MI_UNUSED(decommitted);
+    mi_assert_internal(!decommitted || mi_bitmap_is_clearN(arena->slices_committed, slice_index, slice_count));
+    // and reset the free range
+    mi_bbitmap_setN(arena->slices_free, slice_index, slice_count);
+    return true;
+  }
+  else {
+    // was allocated again already
+    return false;
+  }
+}
+
+static bool mi_arena_try_purge_visitor(size_t slice_index, size_t slice_count, mi_arena_t* arena, void* arg) {
+  mi_purge_visit_info_t* vinfo = (mi_purge_visit_info_t*)arg;
+  // try to purge: first claim the free blocks
+  if (mi_arena_try_purge_range(arena, slice_index, slice_count)) {
+    vinfo->any_purged = true;
+    vinfo->all_purged = true;
+  }
+  else if (slice_count > 1)
+  {
+    // failed to claim the full range, try per slice instead
+    for (size_t i = 0; i < slice_count; i++) {
+      const bool purged = mi_arena_try_purge_range(arena, slice_index + i, 1);
+      vinfo->any_purged = vinfo->any_purged || purged;
+      vinfo->all_purged = vinfo->all_purged && purged;
+    }
+  }
+  // don't clear the purge bits as that is done atomically be the _bitmap_forall_set_ranges
+  // mi_bitmap_clearN(arena->slices_purge, slice_index, slice_count);
+  return true; // continue
+}
+
+// returns true if anything was purged
+static bool mi_arena_try_purge(mi_arena_t* arena, mi_msecs_t now, bool force)
+{
+  // check pre-conditions
+  if (arena->memid.is_pinned) return false;
+
+  // expired yet?
+  mi_msecs_t expire = mi_atomic_loadi64_relaxed(&arena->purge_expire);
+  if (!force && (expire == 0 || expire > now)) return false;
+
+  // reset expire
+  mi_atomic_storei64_release(&arena->purge_expire, (mi_msecs_t)0);
+  mi_subproc_stat_counter_increase(arena->subproc, arena_purges, 1);
+
+  // go through all purge info's  (with max MI_BFIELD_BITS ranges at a time)
+  // this also clears those ranges atomically (so any newly freed blocks will get purged next
+  // time around)
+  mi_purge_visit_info_t vinfo = { now, mi_arena_purge_delay(), true /*all?*/, false /*any?*/};
+  _mi_bitmap_forall_setc_ranges(arena->slices_purge, &mi_arena_try_purge_visitor, arena, &vinfo);
+
+  return vinfo.any_purged;
+}
+
+
+static void mi_arenas_try_purge(bool force, bool visit_all, mi_tld_t* tld)
+{
+  // try purge can be called often so try to only run when needed
+  const long delay = mi_arena_purge_delay();
+  if (_mi_preloading() || delay <= 0) return;  // nothing will be scheduled
+
+  // check if any arena needs purging?
+  mi_subproc_t* subproc = tld->subproc;
+  const mi_msecs_t now = _mi_clock_now();
+  const mi_msecs_t arenas_expire = mi_atomic_loadi64_acquire(&subproc->purge_expire);
+  if (!visit_all && !force && (arenas_expire == 0 || arenas_expire > now)) return;
+
+  const size_t max_arena = mi_arenas_get_count(subproc);
+  if (max_arena == 0) return;
+
+  // allow only one thread to purge at a time (todo: allow concurrent purging?)
+  static mi_atomic_guard_t purge_guard;
+  mi_atomic_guard(&purge_guard)
+  {
+    // increase global expire: at most one purge per delay cycle
+    if (arenas_expire > now) { mi_atomic_storei64_release(&subproc->purge_expire, now + (delay/10)); }
+    const size_t arena_start = tld->thread_seq % max_arena;
+    size_t max_purge_count = (visit_all ? max_arena : (max_arena/4)+1);
+    bool all_visited = true;
+    bool any_purged = false;
+    for (size_t _i = 0; _i < max_arena; _i++) {
+      size_t i = _i + arena_start;
+      if (i >= max_arena) { i -= max_arena; }
+      mi_arena_t* arena = mi_arena_from_index(subproc,i);
+      if (arena != NULL) {
+        if (mi_arena_try_purge(arena, now, force)) {
+          any_purged = true;
+          if (max_purge_count <= 1) {
+            all_visited = false;
+            break;
+          }
+          max_purge_count--;
+        }
+      }
+    }
+    if (all_visited && !any_purged) {
+      mi_atomic_storei64_release(&subproc->purge_expire, 0);
+    }
+  }
+}
+
+/* -----------------------------------------------------------
+  Visit abandoned pages
+----------------------------------------------------------- */
+
+typedef struct mi_abandoned_page_visit_info_s {
+  int heap_tag;
+  mi_block_visit_fun* visitor;
+  void* arg;
+  bool visit_blocks;
+} mi_abandoned_page_visit_info_t;
+
+static bool abandoned_page_visit(mi_page_t* page, mi_abandoned_page_visit_info_t* vinfo) {
+  if (page->heap_tag != vinfo->heap_tag) { return true; } // continue
+  mi_heap_area_t area;
+  _mi_heap_area_init(&area, page);
+  if (!vinfo->visitor(NULL, &area, NULL, area.block_size, vinfo->arg)) {
+    return false;
+  }
+  if (vinfo->visit_blocks) {
+    return _mi_heap_area_visit_blocks(&area, page, vinfo->visitor, vinfo->arg);
+  }
+  else {
+    return true;
+  }
+}
+
+static bool abandoned_page_visit_at(size_t slice_index, size_t slice_count, mi_arena_t* arena, void* arg) {
+  MI_UNUSED(slice_count);
+  mi_abandoned_page_visit_info_t* vinfo = (mi_abandoned_page_visit_info_t*)arg;
+  mi_page_t* page = (mi_page_t*)mi_arena_slice_start(arena, slice_index);
+  mi_assert_internal(mi_page_is_abandoned_mapped(page));
+  return abandoned_page_visit(page, vinfo);
+}
+
+// Visit all abandoned pages in this subproc.
+bool mi_abandoned_visit_blocks(mi_subproc_id_t subproc_id, int heap_tag, bool visit_blocks, mi_block_visit_fun* visitor, void* arg) {
+  mi_abandoned_page_visit_info_t visit_info = { heap_tag, visitor, arg, visit_blocks };
+  MI_UNUSED(subproc_id); MI_UNUSED(heap_tag); MI_UNUSED(visit_blocks); MI_UNUSED(visitor); MI_UNUSED(arg);
+
+  // visit abandoned pages in the arenas
+  // we don't have to claim because we assume we are the only thread running (in this subproc).
+  // (but we could atomically claim as well by first doing abandoned_reclaim and afterwards reabandoning).
+  bool ok = true;
+  mi_subproc_t* subproc = _mi_subproc_from_id(subproc_id);
+  mi_forall_arenas(subproc, NULL, 0, arena) {
+    mi_assert_internal(arena->subproc == subproc);
+    for (size_t bin = 0; ok && bin < MI_BIN_COUNT; bin++) {
+      // todo: if we had a single abandoned page map as well, this can be faster.
+      if (mi_atomic_load_relaxed(&subproc->abandoned_count[bin]) > 0) {
+        ok = _mi_bitmap_forall_set(arena->pages_abandoned[bin], &abandoned_page_visit_at, arena, &visit_info);
+      }
+    }
+  }
+  mi_forall_arenas_end();
+  if (!ok) return false;
+
+  // visit abandoned pages in OS allocated memory
+  // (technically we don't need the lock as we assume we are the only thread running in this subproc)
+  mi_lock(&subproc->os_abandoned_pages_lock) {
+    for (mi_page_t* page = subproc->os_abandoned_pages; ok && page != NULL; page = page->next) {
+      ok = abandoned_page_visit(page, &visit_info);
+    }
+  }
+
+  return ok;
+}
+
+
+/* -----------------------------------------------------------
+  Unloading and reloading an arena.
+----------------------------------------------------------- */
+static bool mi_arena_page_register(size_t slice_index, size_t slice_count, mi_arena_t* arena, void* arg) {
+  MI_UNUSED(arg); MI_UNUSED(slice_count);
+  mi_assert_internal(slice_count == 1);
+  mi_page_t* page = (mi_page_t*)mi_arena_slice_start(arena, slice_index);
+  mi_assert_internal(mi_bitmap_is_setN(page->memid.mem.arena.arena->pages, page->memid.mem.arena.slice_index, 1));
+  _mi_page_map_register(page);
+  mi_assert_internal(_mi_ptr_page(page)==page);
+  return true;
+}
+
+static bool mi_arena_pages_reregister(mi_arena_t* arena) {
+  return _mi_bitmap_forall_set(arena->pages, &mi_arena_page_register, arena, NULL);
+}
+
+mi_decl_export bool mi_arena_unload(mi_arena_id_t arena_id, void** base, size_t* accessed_size, size_t* full_size) {
+  mi_arena_t* arena = _mi_arena_from_id(arena_id);
+  if (arena==NULL) {
+    return false;
+  }
+  else if (!arena->is_exclusive) {
+    _mi_warning_message("cannot unload a non-exclusive arena (id %zu at %p)\n", arena_id, arena);
+    return false;
+  }
+  else if (arena->memid.memkind != MI_MEM_EXTERNAL) {
+    _mi_warning_message("can only unload managed arena's for external memory (id %zu at %p)\n", arena_id, arena);
+    return false;
+  }
+
+  // find accessed size
+  const size_t asize = mi_size_of_slices(mi_arena_used_slices(arena));
+  if (base != NULL) { *base = (void*)arena; }
+  if (full_size != NULL) { *full_size = arena->memid.mem.os.size;  }
+  if (accessed_size != NULL) { *accessed_size = asize; }
+
+  // adjust abandoned page count
+  mi_subproc_t* const subproc = arena->subproc;
+  for (size_t bin = 0; bin < MI_BIN_COUNT; bin++) {
+    const size_t count = mi_bitmap_popcount(arena->pages_abandoned[bin]);
+    if (count > 0) { mi_atomic_decrement_acq_rel(&subproc->abandoned_count[bin]); }
+  }
+
+  // unregister the pages
+  _mi_page_map_unregister_range(arena, asize);
+
+  // set arena entry to NULL
+  const size_t count = mi_arenas_get_count(subproc);
+  for(size_t i = 0; i < count; i++) {
+    if (mi_arena_from_index(subproc, i) == arena) {
+      mi_atomic_store_ptr_release(mi_arena_t, &subproc->arenas[i], NULL);
+      if (i + 1 == count) { // try adjust the count?
+        size_t expected = count;
+        mi_atomic_cas_strong_acq_rel(&subproc->arena_count, &expected, count-1);
+      }
+      break;
+    }
+  }
+  return true;
+}
+
+mi_decl_export bool mi_arena_reload(void* start, size_t size, mi_commit_fun_t* commit_fun, void* commit_fun_arg, mi_arena_id_t* arena_id) {
+  // assume the memory area is already containing the arena
+  if (arena_id != NULL) { *arena_id = _mi_arena_id_none(); }
+  if (start == NULL || size == 0) return false;
+  mi_arena_t* arena = (mi_arena_t*)start;
+  mi_memid_t memid = arena->memid;
+  if (memid.memkind != MI_MEM_EXTERNAL) {
+    _mi_warning_message("can only reload arena's from external memory (%p)\n", arena);
+    return false;
+  }
+  if (memid.mem.os.base != start) {
+    _mi_warning_message("the reloaded arena base address differs from the external memory (arena: %p, external: %p)\n", arena, start);
+    return false;
+  }
+  if (memid.mem.os.size != size) {
+    _mi_warning_message("the reloaded arena size differs from the external memory (arena size: %zu, external size: %zu)\n", arena->memid.mem.os.size, size);
+    return false;
+  }
+  if (!arena->is_exclusive) {
+    _mi_warning_message("the reloaded arena is not exclusive\n");
+    return false;
+  }
+
+  // re-initialize
+  arena->is_exclusive = true;
+  arena->commit_fun = commit_fun;
+  arena->commit_fun_arg = commit_fun_arg;
+  arena->subproc = _mi_subproc();
+  if (!mi_arenas_add(arena->subproc, arena, arena_id)) {
+    return false;
+  }
+  mi_arena_pages_reregister(arena);
+
+  // adjust abandoned page count
+  for (size_t bin = 0; bin < MI_BIN_COUNT; bin++) {
+    const size_t count = mi_bitmap_popcount(arena->pages_abandoned[bin]);
+    if (count > 0) { mi_atomic_decrement_acq_rel(&arena->subproc->abandoned_count[bin]); }
+  }
+
+  return true;
+}
+
+
diff --git a/depends/mimalloc/src/bitmap.c b/depends/mimalloc/src/bitmap.c
index 4fc7a1f3d140..66ebc157b04c 100644
--- a/depends/mimalloc/src/bitmap.c
+++ b/depends/mimalloc/src/bitmap.c
@@ -1,414 +1,1730 @@
 /* ----------------------------------------------------------------------------
-Copyright (c) 2019-2021 Microsoft Research, Daan Leijen
+Copyright (c) 2019-2024 Microsoft Research, Daan Leijen
 This is free software; you can redistribute it and/or modify it under the
 terms of the MIT license. A copy of the license can be found in the file
 "LICENSE" at the root of this distribution.
 -----------------------------------------------------------------------------*/
 
 /* ----------------------------------------------------------------------------
-Concurrent bitmap that can set/reset sequences of bits atomically,
-represeted as an array of fields where each field is a machine word (`size_t`)
-
-There are two api's; the standard one cannot have sequences that cross
-between the bitmap fields (and a sequence must be <= MI_BITMAP_FIELD_BITS).
-(this is used in region allocation)
-
-The `_across` postfixed functions do allow sequences that can cross over
-between the fields. (This is used in arena allocation)
+Concurrent bitmap that can set/reset sequences of bits atomically
 ---------------------------------------------------------------------------- */
 
 #include "mimalloc.h"
-#include "mimalloc-internal.h"
+#include "mimalloc/internal.h"
+#include "mimalloc/bits.h"
 #include "bitmap.h"
 
-/* -----------------------------------------------------------
-  Bitmap definition
------------------------------------------------------------ */
+#ifndef MI_OPT_SIMD
+#define MI_OPT_SIMD   0
+#endif
+
+/* --------------------------------------------------------------------------------
+  bfields
+-------------------------------------------------------------------------------- */
 
-// The bit mask for a given number of blocks at a specified bit index.
-static inline size_t mi_bitmap_mask_(size_t count, size_t bitidx) {
-  mi_assert_internal(count + bitidx <= MI_BITMAP_FIELD_BITS);
-  mi_assert_internal(count > 0);
-  if (count >= MI_BITMAP_FIELD_BITS) return MI_BITMAP_FIELD_FULL;
-  if (count == 0) return 0;
-  return ((((size_t)1 << count) - 1) << bitidx);
+static inline size_t mi_bfield_ctz(mi_bfield_t x) {
+  return mi_ctz(x);
 }
 
+static inline size_t mi_bfield_clz(mi_bfield_t x) {
+  return mi_clz(x);
+}
 
-/* -----------------------------------------------------------
-  Claim a bit sequence atomically
------------------------------------------------------------ */
+static inline size_t mi_bfield_popcount(mi_bfield_t x) {
+  return mi_popcount(x);
+}
 
-// Try to atomically claim a sequence of `count` bits in a single
-// field at `idx` in `bitmap`. Returns `true` on success.
-inline bool _mi_bitmap_try_find_claim_field(mi_bitmap_t bitmap, size_t idx, const size_t count, mi_bitmap_index_t* bitmap_idx)
-{
-  mi_assert_internal(bitmap_idx != NULL);
-  mi_assert_internal(count <= MI_BITMAP_FIELD_BITS);
-  mi_assert_internal(count > 0);
-  mi_bitmap_field_t* field = &bitmap[idx];
-  size_t map  = mi_atomic_load_relaxed(field);
-  if (map==MI_BITMAP_FIELD_FULL) return false; // short cut
-
-  // search for 0-bit sequence of length count
-  const size_t mask = mi_bitmap_mask_(count, 0);
-  const size_t bitidx_max = MI_BITMAP_FIELD_BITS - count;
-
-#ifdef MI_HAVE_FAST_BITSCAN
-  size_t bitidx = mi_ctz(~map);    // quickly find the first zero bit if possible
+static inline mi_bfield_t mi_bfield_clear_least_bit(mi_bfield_t x) {
+  return (x & (x-1));
+}
+
+// find the least significant bit that is set (i.e. count trailing zero's)
+// return false if `x==0` (with `*idx` undefined) and true otherwise,
+// with the `idx` is set to the bit index (`0 <= *idx < MI_BFIELD_BITS`).
+static inline bool mi_bfield_find_least_bit(mi_bfield_t x, size_t* idx) {
+  return mi_bsf(x,idx);
+}
+
+// find the most significant bit that is set.
+// return false if `x==0` (with `*idx` undefined) and true otherwise,
+// with the `idx` is set to the bit index (`0 <= *idx < MI_BFIELD_BITS`).
+static inline bool mi_bfield_find_highest_bit(mi_bfield_t x, size_t* idx) {
+  return mi_bsr(x, idx);
+}
+
+
+
+// find each set bit in a bit field `x` and clear it, until it becomes zero.
+static inline bool mi_bfield_foreach_bit(mi_bfield_t* x, size_t* idx) {
+  const bool found = mi_bfield_find_least_bit(*x, idx);
+  *x = mi_bfield_clear_least_bit(*x);
+  return found;
+}
+
+static inline mi_bfield_t mi_bfield_zero(void) {
+  return 0;
+}
+
+static inline mi_bfield_t mi_bfield_one(void) {
+  return 1;
+}
+
+static inline mi_bfield_t mi_bfield_all_set(void) {
+  return ~((mi_bfield_t)0);
+}
+
+// mask of `bit_count` bits set shifted to the left by `shiftl`
+static inline mi_bfield_t mi_bfield_mask(size_t bit_count, size_t shiftl) {
+  mi_assert_internal(bit_count > 0);
+  mi_assert_internal(bit_count + shiftl <= MI_BFIELD_BITS);
+  const mi_bfield_t mask0 = (bit_count < MI_BFIELD_BITS ? (mi_bfield_one() << bit_count)-1 : mi_bfield_all_set());
+  return (mask0 << shiftl);
+}
+
+
+// ------- mi_bfield_atomic_set ---------------------------------------
+// the `_set` functions return also the count of bits that were already set (for commit statistics)
+// the `_clear` functions return also whether the new bfield is all clear or not (for the chunk_map)
+
+// Set a bit atomically. Returns `true` if the bit transitioned from 0 to 1
+static inline bool mi_bfield_atomic_set(_Atomic(mi_bfield_t)*b, size_t idx) {
+  mi_assert_internal(idx < MI_BFIELD_BITS);
+  const mi_bfield_t mask = mi_bfield_mask(1, idx);;
+  const mi_bfield_t old = mi_atomic_or_acq_rel(b, mask);
+  return ((old&mask) == 0);
+}
+
+// Clear a bit atomically. Returns `true` if the bit transitioned from 1 to 0.
+// `all_clear` is set if the new bfield is zero.
+static inline bool mi_bfield_atomic_clear(_Atomic(mi_bfield_t)*b, size_t idx, bool* all_clear) {
+  mi_assert_internal(idx < MI_BFIELD_BITS);
+  const mi_bfield_t mask = mi_bfield_mask(1, idx);;
+  mi_bfield_t old = mi_atomic_and_acq_rel(b, ~mask);
+  if (all_clear != NULL) { *all_clear = ((old&~mask)==0); }
+  return ((old&mask) == mask);
+}
+
+// Clear a bit but only when/once it is set. This is used by concurrent free's while
+// the page is abandoned and mapped. This can incure a busy wait :-( but it should
+// happen almost never (and is accounted for in the stats)
+static inline void mi_bfield_atomic_clear_once_set(_Atomic(mi_bfield_t)*b, size_t idx) {
+  mi_assert_internal(idx < MI_BFIELD_BITS);
+  const mi_bfield_t mask = mi_bfield_mask(1, idx);;
+  mi_bfield_t old = mi_atomic_load_relaxed(b);
+  do {
+    if mi_unlikely((old&mask) == 0) {
+      old = mi_atomic_load_acquire(b);
+      if ((old&mask)==0) {
+        mi_subproc_stat_counter_increase(_mi_subproc(), pages_unabandon_busy_wait, 1);
+      }
+      while ((old&mask)==0) { // busy wait
+        mi_atomic_yield();
+        old = mi_atomic_load_acquire(b);
+      }
+    }
+  } while (!mi_atomic_cas_weak_acq_rel(b,&old, (old&~mask)));
+  mi_assert_internal((old&mask)==mask);  // we should only clear when it was set
+}
+
+// Set a mask set of bits atomically, and return true of the mask bits transitioned from all 0's to 1's.
+// `already_set` contains the count of bits that were already set (used when committing ranges to account
+// statistics correctly).
+static inline bool mi_bfield_atomic_set_mask(_Atomic(mi_bfield_t)*b, mi_bfield_t mask, size_t* already_set) {
+  mi_assert_internal(mask != 0);
+  mi_bfield_t old = mi_atomic_load_relaxed(b);
+  while (!mi_atomic_cas_weak_acq_rel(b, &old, old|mask)) {};  // try to atomically set the mask bits until success
+  if (already_set!=NULL) { *already_set = mi_bfield_popcount(old&mask); }
+  return ((old&mask) == 0);
+}
+
+// Clear a mask set of bits atomically, and return true of the mask bits transitioned from all 1's to 0's
+// `all_clear` is set to `true` if the new bfield became zero.
+static inline bool mi_bfield_atomic_clear_mask(_Atomic(mi_bfield_t)*b, mi_bfield_t mask, bool* all_clear) {
+  mi_assert_internal(mask != 0);
+  mi_bfield_t old = mi_atomic_load_relaxed(b);
+  while (!mi_atomic_cas_weak_acq_rel(b, &old, old&~mask)) {};  // try to atomically clear the mask bits until success
+  if (all_clear != NULL) { *all_clear = ((old&~mask)==0); }
+  return ((old&mask) == mask);
+}
+
+static inline bool mi_bfield_atomic_setX(_Atomic(mi_bfield_t)*b, size_t* already_set) {
+  const mi_bfield_t old = mi_atomic_exchange_release(b, mi_bfield_all_set());
+  if (already_set!=NULL) { *already_set = mi_bfield_popcount(old); }
+  return (old==0);
+}
+
+// static inline bool mi_bfield_atomic_clearX(_Atomic(mi_bfield_t)*b, bool* all_clear) {
+//   const mi_bfield_t old = mi_atomic_exchange_release(b, mi_bfield_zero());
+//   if (all_clear!=NULL) { *all_clear = true; }
+//   return (~old==0);
+// }
+
+// ------- mi_bfield_atomic_try_clear ---------------------------------------
+
+
+// Tries to clear a mask atomically, and returns true if the mask bits atomically transitioned from mask to 0
+// and false otherwise (leaving the bit field as is).
+// `all_clear` is set to `true` if the new bfield became zero.
+static inline bool mi_bfield_atomic_try_clear_mask_of(_Atomic(mi_bfield_t)*b, mi_bfield_t mask, mi_bfield_t expect, bool* all_clear) {
+  mi_assert_internal(mask != 0);
+  // try to atomically clear the mask bits
+  do {
+    if ((expect & mask) != mask) {  // are all bits still set?
+      if (all_clear != NULL) { *all_clear = (expect == 0); }
+      return false;
+    }
+  } while (!mi_atomic_cas_weak_acq_rel(b, &expect, expect & ~mask));
+  if (all_clear != NULL) { *all_clear = ((expect & ~mask) == 0);  }
+  return true;
+}
+
+static inline bool mi_bfield_atomic_try_clear_mask(_Atomic(mi_bfield_t)* b, mi_bfield_t mask, bool* all_clear) {
+  mi_assert_internal(mask != 0);
+  const mi_bfield_t expect = mi_atomic_load_relaxed(b);
+  return mi_bfield_atomic_try_clear_mask_of(b, mask, expect, all_clear);
+}
+
+// Tries to clear a bit atomically. Returns `true` if the bit transitioned from 1 to 0
+// and `false` otherwise leaving the bfield `b` as-is.
+// `all_clear` is set to true if the new bfield became zero (and false otherwise)
+mi_decl_maybe_unused static inline bool mi_bfield_atomic_try_clear(_Atomic(mi_bfield_t)* b, size_t idx, bool* all_clear) {
+  mi_assert_internal(idx < MI_BFIELD_BITS);
+  const mi_bfield_t mask = mi_bfield_one()<<idx;
+  return mi_bfield_atomic_try_clear_mask(b, mask, all_clear);
+}
+
+// Tries to clear a byte atomically, and returns true if the byte atomically transitioned from 0xFF to 0
+// `all_clear` is set to true if the new bfield became zero (and false otherwise)
+mi_decl_maybe_unused static inline bool mi_bfield_atomic_try_clear8(_Atomic(mi_bfield_t)*b, size_t idx, bool* all_clear) {
+  mi_assert_internal(idx < MI_BFIELD_BITS);
+  mi_assert_internal((idx%8)==0);
+  const mi_bfield_t mask = ((mi_bfield_t)0xFF)<<idx;
+  return mi_bfield_atomic_try_clear_mask(b, mask, all_clear);
+}
+
+// Try to clear a full field of bits atomically, and return true all bits transitioned from all 1's to 0's.
+// and false otherwise leaving the bit field as-is.
+// `all_clear` is set to true if the new bfield became zero (which is always the case if successful).
+static inline bool mi_bfield_atomic_try_clearX(_Atomic(mi_bfield_t)*b, bool* all_clear) {
+  mi_bfield_t old = mi_bfield_all_set();
+  if (mi_atomic_cas_strong_acq_rel(b, &old, mi_bfield_zero())) {
+    if (all_clear != NULL) { *all_clear = true; }
+    return true;
+  }
+  else return false;
+}
+
+
+// ------- mi_bfield_atomic_is_set ---------------------------------------
+
+// Check if a bit is set
+static inline bool mi_bfield_atomic_is_set(const _Atomic(mi_bfield_t)*b, const size_t idx) {
+  const mi_bfield_t x = mi_atomic_load_relaxed(b);
+  return ((x & mi_bfield_mask(1,idx)) != 0);
+}
+
+// Check if a bit is clear
+static inline bool mi_bfield_atomic_is_clear(const _Atomic(mi_bfield_t)*b, const size_t idx) {
+  const mi_bfield_t x = mi_atomic_load_relaxed(b);
+  return ((x & mi_bfield_mask(1, idx)) == 0);
+}
+
+// Check if a bit is xset
+static inline bool mi_bfield_atomic_is_xset(mi_xset_t set, const _Atomic(mi_bfield_t)*b, const size_t idx) {
+  if (set) return mi_bfield_atomic_is_set(b, idx);
+      else return mi_bfield_atomic_is_clear(b, idx);
+}
+
+// Check if all bits corresponding to a mask are set.
+static inline bool mi_bfield_atomic_is_set_mask(const _Atomic(mi_bfield_t)* b, mi_bfield_t mask) {
+  mi_assert_internal(mask != 0);
+  const mi_bfield_t x = mi_atomic_load_relaxed(b);
+  return ((x & mask) == mask);
+}
+
+// Check if all bits corresponding to a mask are clear.
+static inline bool mi_bfield_atomic_is_clear_mask(const _Atomic(mi_bfield_t)* b, mi_bfield_t mask) {
+  mi_assert_internal(mask != 0);
+  const mi_bfield_t x = mi_atomic_load_relaxed(b);
+  return ((x & mask) == 0);
+}
+
+// Check if all bits corresponding to a mask are set/cleared.
+static inline bool mi_bfield_atomic_is_xset_mask(mi_xset_t set, const _Atomic(mi_bfield_t)* b, mi_bfield_t mask) {
+  mi_assert_internal(mask != 0);
+  if (set) return mi_bfield_atomic_is_set_mask(b, mask);
+      else return mi_bfield_atomic_is_clear_mask(b, mask);
+}
+
+// Count bits in a mask
+static inline size_t mi_bfield_atomic_popcount_mask(_Atomic(mi_bfield_t)*b, mi_bfield_t mask) {
+  const mi_bfield_t x = mi_atomic_load_relaxed(b);
+  return mi_bfield_popcount(x & mask);
+}
+
+
+/* --------------------------------------------------------------------------------
+ bitmap chunks
+-------------------------------------------------------------------------------- */
+
+// ------- mi_bchunk_set ---------------------------------------
+
+// Set a single bit
+static inline bool mi_bchunk_set(mi_bchunk_t* chunk, size_t cidx, size_t* already_set) {
+  mi_assert_internal(cidx < MI_BCHUNK_BITS);
+  const size_t i = cidx / MI_BFIELD_BITS;
+  const size_t idx = cidx % MI_BFIELD_BITS;
+  const bool was_clear = mi_bfield_atomic_set(&chunk->bfields[i], idx);
+  if (already_set != NULL) { *already_set = (was_clear ? 0 : 1); }
+  return was_clear;
+}
+
+// Set `0 < n <= MI_BFIELD_BITS`, and return true of the mask bits transitioned from all 0's to 1's.
+// `already_set` contains the count of bits that were already set (used when committing ranges to account
+// statistics correctly).
+// Can cross over two bfields.
+static inline bool mi_bchunk_setNX(mi_bchunk_t* chunk, size_t cidx, size_t n, size_t* already_set) {
+  mi_assert_internal(cidx < MI_BCHUNK_BITS);
+  mi_assert_internal(n > 0 && n <= MI_BFIELD_BITS);
+  const size_t i = cidx / MI_BFIELD_BITS;
+  const size_t idx = cidx % MI_BFIELD_BITS;
+  if mi_likely(idx + n <= MI_BFIELD_BITS) {
+    // within one field
+    return mi_bfield_atomic_set_mask(&chunk->bfields[i], mi_bfield_mask(n,idx), already_set);
+  }
+  else {
+    // spanning two fields
+    const size_t m = MI_BFIELD_BITS - idx;  // bits to clear in the first field
+    mi_assert_internal(m < n);
+    mi_assert_internal(i < MI_BCHUNK_FIELDS - 1);
+    mi_assert_internal(idx + m <= MI_BFIELD_BITS);
+    size_t already_set1;
+    const bool all_set1 = mi_bfield_atomic_set_mask(&chunk->bfields[i], mi_bfield_mask(m, idx), &already_set1);
+    mi_assert_internal(n - m > 0);
+    mi_assert_internal(n - m < MI_BFIELD_BITS);
+    size_t already_set2;
+    const bool all_set2 = mi_bfield_atomic_set_mask(&chunk->bfields[i+1], mi_bfield_mask(n - m, 0), &already_set2);
+    if (already_set != NULL) { *already_set = already_set1 + already_set2; }
+    return (all_set1 && all_set2);
+  }
+}
+
+// Set a sequence of `n` bits within a chunk.
+// Returns true if all bits transitioned from 0 to 1 (or 1 to 0).
+mi_decl_noinline static bool mi_bchunk_xsetN_(mi_xset_t set, mi_bchunk_t* chunk, size_t cidx, size_t n, size_t* palready_set, bool* pmaybe_all_clear) {
+  mi_assert_internal(cidx + n <= MI_BCHUNK_BITS);
+  mi_assert_internal(n>0);
+  bool all_transition = true;
+  bool maybe_all_clear = true;
+  size_t total_already_set = 0;
+  size_t idx   = cidx % MI_BFIELD_BITS;
+  size_t field = cidx / MI_BFIELD_BITS;
+  while (n > 0) {
+    size_t m = MI_BFIELD_BITS - idx;   // m is the bits to xset in this field
+    if (m > n) { m = n; }
+    mi_assert_internal(idx + m <= MI_BFIELD_BITS);
+    mi_assert_internal(field < MI_BCHUNK_FIELDS);
+    const mi_bfield_t mask = mi_bfield_mask(m, idx);
+    size_t already_set = 0;
+    bool all_clear = false;
+    const bool transition = (set ? mi_bfield_atomic_set_mask(&chunk->bfields[field], mask, &already_set)
+                                 : mi_bfield_atomic_clear_mask(&chunk->bfields[field], mask, &all_clear));
+    mi_assert_internal((transition && already_set == 0) || (!transition && already_set > 0));
+    all_transition = all_transition && transition;
+    total_already_set += already_set;
+    maybe_all_clear = maybe_all_clear && all_clear;
+    // next field
+    field++;
+    idx = 0;
+    mi_assert_internal(m <= n);
+    n -= m;
+  }
+  if (palready_set!=NULL) { *palready_set = total_already_set; }
+  if (pmaybe_all_clear!=NULL) { *pmaybe_all_clear = maybe_all_clear; }
+  return all_transition;
+}
+
+static inline bool mi_bchunk_setN(mi_bchunk_t* chunk, size_t cidx, size_t n, size_t* already_set) {
+  mi_assert_internal(n>0 && n <= MI_BCHUNK_BITS);
+  if (n==1) return mi_bchunk_set(chunk, cidx, already_set);
+  // if (n==8 && (cidx%8) == 0) return mi_bchunk_set8(chunk, cidx, already_set);
+  // if (n==MI_BFIELD_BITS) return mi_bchunk_setX(chunk, cidx, already_set);
+  if (n<=MI_BFIELD_BITS) return mi_bchunk_setNX(chunk, cidx, n, already_set);
+  return mi_bchunk_xsetN_(MI_BIT_SET, chunk, cidx, n, already_set, NULL);
+}
+
+// ------- mi_bchunk_clear ---------------------------------------
+
+static inline bool mi_bchunk_clear(mi_bchunk_t* chunk, size_t cidx, bool* all_clear) {
+  mi_assert_internal(cidx < MI_BCHUNK_BITS);
+  const size_t i = cidx / MI_BFIELD_BITS;
+  const size_t idx = cidx % MI_BFIELD_BITS;
+  return mi_bfield_atomic_clear(&chunk->bfields[i], idx, all_clear);
+}
+
+static inline bool mi_bchunk_clearN(mi_bchunk_t* chunk, size_t cidx, size_t n, bool* maybe_all_clear) {
+  mi_assert_internal(n>0 && n <= MI_BCHUNK_BITS);
+  if (n==1) return mi_bchunk_clear(chunk, cidx, maybe_all_clear);
+  // if (n==8) return mi_bchunk_clear8(chunk, cidx, maybe_all_clear);
+  // if (n==MI_BFIELD_BITS) return mi_bchunk_clearX(chunk, cidx, maybe_all_clear);
+  // TODO: implement mi_bchunk_xsetNX instead of setNX
+  return mi_bchunk_xsetN_(MI_BIT_CLEAR, chunk, cidx, n, NULL, maybe_all_clear);
+}
+
+// Check if a sequence of `n` bits within a chunk are all set/cleared.
+// This can cross bfield's
+mi_decl_noinline static size_t mi_bchunk_popcountN_(mi_bchunk_t* chunk, size_t field_idx, size_t idx, size_t n) {
+  mi_assert_internal((field_idx*MI_BFIELD_BITS) + idx + n <= MI_BCHUNK_BITS);
+  size_t count = 0;
+  while (n > 0) {
+    size_t m = MI_BFIELD_BITS - idx;   // m is the bits to xset in this field
+    if (m > n) { m = n; }
+    mi_assert_internal(idx + m <= MI_BFIELD_BITS);
+    mi_assert_internal(field_idx < MI_BCHUNK_FIELDS);
+    const size_t mask = mi_bfield_mask(m, idx);
+    count += mi_bfield_atomic_popcount_mask(&chunk->bfields[field_idx], mask);
+    // next field
+    field_idx++;
+    idx = 0;
+    n -= m;
+  }
+  return count;
+}
+
+// Count set bits a sequence of `n` bits.
+static inline size_t mi_bchunk_popcountN(mi_bchunk_t* chunk, size_t cidx, size_t n) {
+  mi_assert_internal(cidx + n <= MI_BCHUNK_BITS);
+  mi_assert_internal(n>0);
+  if (n==0) return 0;
+  const size_t i = cidx / MI_BFIELD_BITS;
+  const size_t idx = cidx % MI_BFIELD_BITS;
+  if (n==1) { return (mi_bfield_atomic_is_set(&chunk->bfields[i], idx) ? 1 : 0); }
+  if (idx + n <= MI_BFIELD_BITS) { return mi_bfield_atomic_popcount_mask(&chunk->bfields[i], mi_bfield_mask(n, idx)); }
+  return mi_bchunk_popcountN_(chunk, i, idx, n);
+}
+
+
+// ------- mi_bchunk_is_xset ---------------------------------------
+
+// Check if a sequence of `n` bits within a chunk are all set/cleared.
+// This can cross bfield's
+mi_decl_noinline static bool mi_bchunk_is_xsetN_(mi_xset_t set, const mi_bchunk_t* chunk, size_t field_idx, size_t idx, size_t n) {
+  mi_assert_internal((field_idx*MI_BFIELD_BITS) + idx + n <= MI_BCHUNK_BITS);
+  while (n > 0) {
+    size_t m = MI_BFIELD_BITS - idx;   // m is the bits to xset in this field
+    if (m > n) { m = n; }
+    mi_assert_internal(idx + m <= MI_BFIELD_BITS);
+    mi_assert_internal(field_idx < MI_BCHUNK_FIELDS);
+    const size_t mask = mi_bfield_mask(m, idx);
+    if (!mi_bfield_atomic_is_xset_mask(set, &chunk->bfields[field_idx], mask)) {
+      return false;
+    }
+    // next field
+    field_idx++;
+    idx = 0;
+    n -= m;
+  }
+  return true;
+}
+
+// Check if a sequence of `n` bits within a chunk are all set/cleared.
+static inline bool mi_bchunk_is_xsetN(mi_xset_t set, const mi_bchunk_t* chunk, size_t cidx, size_t n) {
+  mi_assert_internal(cidx + n <= MI_BCHUNK_BITS);
+  mi_assert_internal(n>0);
+  if (n==0) return true;
+  const size_t i = cidx / MI_BFIELD_BITS;
+  const size_t idx = cidx % MI_BFIELD_BITS;
+  if (n==1) { return mi_bfield_atomic_is_xset(set, &chunk->bfields[i], idx); }
+  if (idx + n <= MI_BFIELD_BITS) { return mi_bfield_atomic_is_xset_mask(set, &chunk->bfields[i], mi_bfield_mask(n, idx)); }
+  return mi_bchunk_is_xsetN_(set, chunk, i, idx, n);
+}
+
+
+// ------- mi_bchunk_try_clear  ---------------------------------------
+
+// Clear `0 < n <= MI_BITFIELD_BITS`. Can cross over a bfield boundary.
+static inline bool mi_bchunk_try_clearNX(mi_bchunk_t* chunk, size_t cidx, size_t n, bool* pmaybe_all_clear) {
+  mi_assert_internal(cidx < MI_BCHUNK_BITS);
+  mi_assert_internal(n <= MI_BFIELD_BITS);
+  const size_t i = cidx / MI_BFIELD_BITS;
+  const size_t idx = cidx % MI_BFIELD_BITS;
+  if mi_likely(idx + n <= MI_BFIELD_BITS) {
+    // within one field
+    return mi_bfield_atomic_try_clear_mask(&chunk->bfields[i], mi_bfield_mask(n, idx), pmaybe_all_clear);
+  }
+  else {
+    // spanning two fields (todo: use double-word atomic ops?)
+    const size_t m = MI_BFIELD_BITS - idx;  // bits to clear in the first field
+    mi_assert_internal(m < n);
+    mi_assert_internal(i < MI_BCHUNK_FIELDS - 1);
+    bool field1_is_clear;
+    if (!mi_bfield_atomic_try_clear_mask(&chunk->bfields[i], mi_bfield_mask(m, idx), &field1_is_clear)) return false;
+    // try the second field as well
+    mi_assert_internal(n - m > 0);
+    mi_assert_internal(n - m < MI_BFIELD_BITS);
+    bool field2_is_clear;
+    if (!mi_bfield_atomic_try_clear_mask(&chunk->bfields[i+1], mi_bfield_mask(n - m, 0), &field2_is_clear)) {
+      // we failed to clear the second field, restore the first one
+      mi_bfield_atomic_set_mask(&chunk->bfields[i], mi_bfield_mask(m, idx), NULL);
+      return false;
+    }
+    if (pmaybe_all_clear != NULL) { *pmaybe_all_clear = field1_is_clear && field2_is_clear;  }
+    return true;
+  }
+}
+
+// Clear a full aligned bfield.
+// static inline bool mi_bchunk_try_clearX(mi_bchunk_t* chunk, size_t cidx, bool* pmaybe_all_clear) {
+//   mi_assert_internal(cidx < MI_BCHUNK_BITS);
+//   mi_assert_internal((cidx%MI_BFIELD_BITS) == 0);
+//   const size_t i = cidx / MI_BFIELD_BITS;
+//   return mi_bfield_atomic_try_clearX(&chunk->bfields[i], pmaybe_all_clear);
+// }
+
+// Try to atomically clear a sequence of `n` bits within a chunk.
+// Returns true if all bits transitioned from 1 to 0,
+// and false otherwise leaving all bit fields as is.
+// Note: this is the complex one as we need to unwind partial atomic operations if we fail halfway..
+// `maybe_all_clear` is set to `true` if all the bfields involved become zero.
+mi_decl_noinline static bool mi_bchunk_try_clearN_(mi_bchunk_t* chunk, size_t cidx, size_t n, bool* pmaybe_all_clear) {
+  mi_assert_internal(cidx + n <= MI_BCHUNK_BITS);
+  mi_assert_internal(n>0);
+  if (pmaybe_all_clear != NULL) { *pmaybe_all_clear = true; }
+  if (n==0) return true;
+
+  // first field
+  const size_t start_idx = cidx % MI_BFIELD_BITS;
+  const size_t start_field = cidx / MI_BFIELD_BITS;
+  size_t field = start_field;
+  size_t m = MI_BFIELD_BITS - start_idx;   // m are the bits to clear in this field
+  if (m > n) { m = n; }
+  mi_assert_internal(start_idx + m <= MI_BFIELD_BITS);
+  mi_assert_internal(start_field < MI_BCHUNK_FIELDS);
+  const mi_bfield_t mask_start = mi_bfield_mask(m, start_idx);
+  bool maybe_all_clear;
+  if (!mi_bfield_atomic_try_clear_mask(&chunk->bfields[field], mask_start, &maybe_all_clear)) return false;
+
+  // done?
+  mi_assert_internal(m <= n);
+  n -= m;
+
+  // continue with mid fields and last field: if these fail we need to recover by unsetting previous fields
+  // mid fields?
+  while (n >= MI_BFIELD_BITS) {
+    field++;
+    mi_assert_internal(field < MI_BCHUNK_FIELDS);
+    bool field_is_clear;
+    if (!mi_bfield_atomic_try_clearX(&chunk->bfields[field], &field_is_clear)) goto restore;
+    maybe_all_clear = maybe_all_clear && field_is_clear;
+    n -= MI_BFIELD_BITS;
+  }
+
+  // last field?
+  if (n > 0) {
+    mi_assert_internal(n < MI_BFIELD_BITS);
+    field++;
+    mi_assert_internal(field < MI_BCHUNK_FIELDS);
+    const mi_bfield_t mask_end = mi_bfield_mask(n, 0);
+    bool field_is_clear;
+    if (!mi_bfield_atomic_try_clear_mask(&chunk->bfields[field], mask_end, &field_is_clear)) goto restore;
+    maybe_all_clear = maybe_all_clear && field_is_clear;
+  }
+
+  if (pmaybe_all_clear != NULL) { *pmaybe_all_clear = maybe_all_clear; }
+  return true;
+
+restore:
+  // `field` is the index of the field that failed to set atomically; we need to restore all previous fields
+  mi_assert_internal(field > start_field);
+  while( field > start_field) {
+    field--;
+    if (field == start_field) {
+      mi_bfield_atomic_set_mask(&chunk->bfields[field], mask_start, NULL);
+    }
+    else {
+      mi_bfield_atomic_setX(&chunk->bfields[field], NULL);  // mid-field: set all bits again
+    }
+  }
+  return false;
+}
+
+
+static inline bool mi_bchunk_try_clearN(mi_bchunk_t* chunk, size_t cidx, size_t n, bool* maybe_all_clear) {
+  mi_assert_internal(n>0);
+  // if (n==MI_BFIELD_BITS) return mi_bchunk_try_clearX(chunk, cidx, maybe_all_clear);
+  if (n<=MI_BFIELD_BITS) return mi_bchunk_try_clearNX(chunk, cidx, n, maybe_all_clear);
+  return mi_bchunk_try_clearN_(chunk, cidx, n, maybe_all_clear);
+}
+
+
+// ------- mi_bchunk_try_find_and_clear ---------------------------------------
+
+#if MI_OPT_SIMD && defined(__AVX2__)
+mi_decl_maybe_unused static inline __m256i mi_mm256_zero(void) {
+  return _mm256_setzero_si256();
+}
+mi_decl_maybe_unused static inline __m256i mi_mm256_ones(void) {
+  return _mm256_set1_epi64x(~0);
+}
+mi_decl_maybe_unused static inline bool mi_mm256_is_ones(__m256i vec) {
+  return _mm256_testc_si256(vec, _mm256_cmpeq_epi32(vec, vec));
+}
+mi_decl_maybe_unused static inline bool mi_mm256_is_zero( __m256i vec) {
+  return _mm256_testz_si256(vec,vec);
+}
+#endif
+
+static inline bool mi_bchunk_try_find_and_clear_at(mi_bchunk_t* chunk, size_t chunk_idx, size_t* pidx) {
+  mi_assert_internal(chunk_idx < MI_BCHUNK_FIELDS);
+  // note: this must be acquire (and not relaxed), or otherwise the AVX code below can loop forever
+  // as the compiler won't reload the registers vec1 and vec2 from memory again.
+  const mi_bfield_t b = mi_atomic_load_acquire(&chunk->bfields[chunk_idx]);
+  size_t idx;
+  if (mi_bfield_find_least_bit(b, &idx)) {           // find the least bit
+    if mi_likely(mi_bfield_atomic_try_clear_mask_of(&chunk->bfields[chunk_idx], mi_bfield_mask(1,idx), b, NULL)) {  // clear it atomically
+      *pidx = (chunk_idx*MI_BFIELD_BITS) + idx;
+      mi_assert_internal(*pidx < MI_BCHUNK_BITS);
+      return true;
+    }
+  }
+  return false;
+}
+
+// Find least 1-bit in a chunk and try to clear it atomically
+// set `*pidx` to the bit index (0 <= *pidx < MI_BCHUNK_BITS) on success.
+// This is used to find free slices and abandoned pages and should be efficient.
+// todo: try neon version
+static inline bool mi_bchunk_try_find_and_clear(mi_bchunk_t* chunk, size_t* pidx) {
+  #if MI_OPT_SIMD && defined(__AVX2__) && (MI_BCHUNK_BITS==256)
+  while (true) {
+    const __m256i vec = _mm256_load_si256((const __m256i*)chunk->bfields);
+    const __m256i vcmp = _mm256_cmpeq_epi64(vec, mi_mm256_zero()); // (elem64 == 0 ? 0xFF  : 0)
+    const uint32_t mask = ~_mm256_movemask_epi8(vcmp);  // mask of most significant bit of each byte (so each 8 bits are all set or clear)
+    // mask is inverted, so each 8-bits is 0xFF iff the corresponding elem64 has a bit set (and thus can be cleared)
+    if (mask==0) return false;
+    mi_assert_internal((_tzcnt_u32(mask)%8) == 0); // tzcnt == 0, 8, 16, or 24
+    const size_t chunk_idx = _tzcnt_u32(mask) / 8;
+    if (mi_bchunk_try_find_and_clear_at(chunk, chunk_idx, pidx)) return true;
+    // try again
+    // note: there must be an atomic release/acquire in between or otherwise the registers may not be reloaded
+  }
+  #elif MI_OPT_SIMD && defined(__AVX2__) && (MI_BCHUNK_BITS==512)
+  while (true) {
+    size_t chunk_idx = 0;
+    #if 0
+    // one vector at a time
+    __m256i vec = _mm256_load_si256((const __m256i*)chunk->bfields);
+    if (mi_mm256_is_zero(vec)) {
+      chunk_idx += 4;
+      vec = _mm256_load_si256(((const __m256i*)chunk->bfields) + 1);
+    }
+    const __m256i vcmp = _mm256_cmpeq_epi64(vec, mi_mm256_zero()); // (elem64 == 0 ? 0xFF  : 0)
+    const uint32_t mask = ~_mm256_movemask_epi8(vcmp);  // mask of most significant bit of each byte (so each 8 bits are all set or clear)
+    // mask is inverted, so each 8-bits is 0xFF iff the corresponding elem64 has a bit set (and thus can be cleared)
+    if (mask==0) return false;
+    mi_assert_internal((_tzcnt_u32(mask)%8) == 0); // tzcnt == 0, 8, 16, or 24
+    chunk_idx += _tzcnt_u32(mask) / 8;
+    #else
+    // a cache line is 64b so we can just as well load all at the same time
+    const __m256i vec1  = _mm256_load_si256((const __m256i*)chunk->bfields);
+    const __m256i vec2  = _mm256_load_si256(((const __m256i*)chunk->bfields)+1);
+    const __m256i cmpv  = mi_mm256_zero();
+    const __m256i vcmp1 = _mm256_cmpeq_epi64(vec1, cmpv); // (elem64 == 0 ? 0xFF  : 0)
+    const __m256i vcmp2 = _mm256_cmpeq_epi64(vec2, cmpv); // (elem64 == 0 ? 0xFF  : 0)
+    const uint32_t mask1 = ~_mm256_movemask_epi8(vcmp1);  // mask of most significant bit of each byte (so each 8 bits are all set or clear)
+    const uint32_t mask2 = ~_mm256_movemask_epi8(vcmp2);  // mask of most significant bit of each byte (so each 8 bits are all set or clear)
+    const uint64_t mask = ((uint64_t)mask2 << 32) | mask1;
+    // mask is inverted, so each 8-bits is 0xFF iff the corresponding elem64 has a bit set (and thus can be cleared)
+    if (mask==0) return false;
+    mi_assert_internal((_tzcnt_u64(mask)%8) == 0); // tzcnt == 0, 8, 16, 24 , ..
+    chunk_idx = mi_ctz(mask) / 8;
+    #endif
+    if (mi_bchunk_try_find_and_clear_at(chunk, chunk_idx, pidx)) return true;
+    // try again
+    // note: there must be an atomic release/acquire in between or otherwise the registers may not be reloaded
+  }
+  #elif MI_OPT_SIMD && (MI_BCHUNK_BITS==512) && MI_ARCH_ARM64
+  while(true) {
+    // a cache line is 64b so we can just as well load all at the same time (?)
+    const uint64x2_t vzero1_lo = vceqzq_u64(vld1q_u64((uint64_t*)chunk->bfields));        // 2x64 bit is_zero
+    const uint64x2_t vzero1_hi = vceqzq_u64(vld1q_u64((uint64_t*)chunk->bfields + 2));    // 2x64 bit is_zero
+    const uint64x2_t vzero2_lo = vceqzq_u64(vld1q_u64((uint64_t*)chunk->bfields + 4));    // 2x64 bit is_zero
+    const uint64x2_t vzero2_hi = vceqzq_u64(vld1q_u64((uint64_t*)chunk->bfields + 6));    // 2x64 bit is_zero
+    const uint32x4_t vzero1    = vuzp1q_u32(vreinterpretq_u32_u64(vzero1_lo),vreinterpretq_u32_u64(vzero1_hi)); // unzip even elements: narrow to 4x32 bit is_zero ()
+    const uint32x4_t vzero2    = vuzp1q_u32(vreinterpretq_u32_u64(vzero2_lo),vreinterpretq_u32_u64(vzero2_hi)); // unzip even elements: narrow to 4x32 bit is_zero ()
+    const uint32x4_t vzero1x   = vreinterpretq_u32_u64(vshrq_n_u64(vreinterpretq_u64_u32(vzero1), 24));        // shift-right 2x32bit elem by 24: lo 16 bits contain the 2 lo bytes
+    const uint32x4_t vzero2x   = vreinterpretq_u32_u64(vshrq_n_u64(vreinterpretq_u64_u32(vzero2), 24));
+    const uint16x8_t vzero12   = vreinterpretq_u16_u32(vuzp1q_u32(vzero1x,vzero2x));                           // unzip even 32-bit elements into one vector
+    const uint8x8_t  vzero     = vmovn_u32(vzero12);                                                           // narrow the bottom 16-bits
+    const uint64_t mask = ~vget_lane_u64(vreinterpret_u64_u8(vzero), 0);  // 1 byte for each bfield (0xFF => bfield has a bit set)
+    if (mask==0) return false;
+    mi_assert_internal((mi_ctz(mask)%8) == 0); // tzcnt == 0, 8, 16, 24 , ..
+    const size_t chunk_idx = mi_ctz(mask) / 8;
+    if (mi_bchunk_try_find_and_clear_at(chunk, chunk_idx, pidx)) return true;
+    // try again
+    // note: there must be an atomic release/acquire in between or otherwise the registers may not be reloaded
+  }
+  #else
+  for (int i = 0; i < MI_BCHUNK_FIELDS; i++) {
+    if (mi_bchunk_try_find_and_clear_at(chunk, i, pidx)) return true;
+  }
+  return false;
+  #endif
+}
+
+static inline bool mi_bchunk_try_find_and_clear_1(mi_bchunk_t* chunk, size_t n, size_t* pidx) {
+  mi_assert_internal(n==1); MI_UNUSED(n);
+  return mi_bchunk_try_find_and_clear(chunk, pidx);
+}
+
+mi_decl_maybe_unused static inline bool mi_bchunk_try_find_and_clear8_at(mi_bchunk_t* chunk, size_t chunk_idx, size_t* pidx) {
+  const mi_bfield_t b = mi_atomic_load_relaxed(&chunk->bfields[chunk_idx]);
+  // has_set8 has low bit in each byte set if the byte in x == 0xFF
+  const mi_bfield_t has_set8 =
+    ((~b - MI_BFIELD_LO_BIT8) &      // high bit set if byte in x is 0xFF or < 0x7F
+     (b  & MI_BFIELD_HI_BIT8))       // high bit set if byte in x is >= 0x80
+     >> 7;                           // shift high bit to low bit
+  size_t idx;
+  if (mi_bfield_find_least_bit(has_set8, &idx)) { // find least 1-bit
+    mi_assert_internal(idx <= (MI_BFIELD_BITS - 8));
+    mi_assert_internal((idx%8)==0);
+    if mi_likely(mi_bfield_atomic_try_clear_mask_of(&chunk->bfields[chunk_idx], (mi_bfield_t)0xFF << idx, b, NULL)) {  // unset the byte atomically
+      *pidx = (chunk_idx*MI_BFIELD_BITS) + idx;
+      mi_assert_internal(*pidx + 8 <= MI_BCHUNK_BITS);
+      return true;
+    }
+  }
+  return false;
+}
+
+// find least aligned byte in a chunk with all bits set, and try unset it atomically
+// set `*pidx` to its bit index (0 <= *pidx < MI_BCHUNK_BITS) on success.
+// Used to find medium size pages in the free blocks.
+// todo: try neon version
+static mi_decl_noinline bool mi_bchunk_try_find_and_clear8(mi_bchunk_t* chunk, size_t* pidx) {
+  #if MI_OPT_SIMD && defined(__AVX2__) && (MI_BCHUNK_BITS==512)
+  while (true) {
+    // since a cache-line is 64b, load all at once
+    const __m256i vec1 = _mm256_load_si256((const __m256i*)chunk->bfields);
+    const __m256i vec2 = _mm256_load_si256((const __m256i*)chunk->bfields+1);
+    const __m256i cmpv = mi_mm256_ones();
+    const __m256i vcmp1 = _mm256_cmpeq_epi8(vec1, cmpv); // (byte == ~0 ? 0xFF : 0)
+    const __m256i vcmp2 = _mm256_cmpeq_epi8(vec2, cmpv); // (byte == ~0 ? 0xFF : 0)
+    const uint32_t mask1 = _mm256_movemask_epi8(vcmp1);    // mask of most significant bit of each byte
+    const uint32_t mask2 = _mm256_movemask_epi8(vcmp2);    // mask of most significant bit of each byte
+    const uint64_t mask = ((uint64_t)mask2 << 32) | mask1;
+    // mask is inverted, so each bit is 0xFF iff the corresponding byte has a bit set (and thus can be cleared)
+    if (mask==0) return false;
+    const size_t bidx = _tzcnt_u64(mask);          // byte-idx of the byte in the chunk
+    const size_t chunk_idx = bidx / 8;
+    const size_t idx = (bidx % 8)*8;
+    mi_assert_internal(chunk_idx < MI_BCHUNK_FIELDS);
+    if mi_likely(mi_bfield_atomic_try_clear8(&chunk->bfields[chunk_idx], idx, NULL)) {  // clear it atomically
+      *pidx = (chunk_idx*MI_BFIELD_BITS) + idx;
+      mi_assert_internal(*pidx + 8 <= MI_BCHUNK_BITS);
+      return true;
+    }
+    // try again
+    // note: there must be an atomic release/acquire in between or otherwise the registers may not be reloaded  }
+  }
+  #else
+    for (int i = 0; i < MI_BCHUNK_FIELDS; i++) {
+      if (mi_bchunk_try_find_and_clear8_at(chunk, i, pidx)) return true;
+    }
+    return false;
+  #endif
+}
+
+static inline bool mi_bchunk_try_find_and_clear_8(mi_bchunk_t* chunk, size_t n, size_t* pidx) {
+  mi_assert_internal(n==8); MI_UNUSED(n);
+  return mi_bchunk_try_find_and_clear8(chunk, pidx);
+}
+
+
+// find least aligned bfield in a chunk with all bits set, and try unset it atomically
+// set `*pidx` to its bit index (0 <= *pidx < MI_BCHUNK_BITS) on success.
+// Used to find large size pages in the free blocks.
+// todo: try neon version
+/*
+static mi_decl_noinline  bool mi_bchunk_try_find_and_clearX(mi_bchunk_t* chunk, size_t* pidx) {
+  #if MI_OPT_SIMD && defined(__AVX2__) && (MI_BCHUNK_BITS==512)
+  while (true) {
+    // since a cache-line is 64b, load all at once
+    const __m256i vec1 = _mm256_load_si256((const __m256i*)chunk->bfields);
+    const __m256i vec2 = _mm256_load_si256((const __m256i*)chunk->bfields+1);
+    const __m256i cmpv = mi_mm256_ones();
+    const __m256i vcmp1 = _mm256_cmpeq_epi64(vec1, cmpv); // (bfield == ~0 ? -1 : 0)
+    const __m256i vcmp2 = _mm256_cmpeq_epi64(vec2, cmpv); // (bfield == ~0 ? -1 : 0)
+    const uint32_t mask1 = _mm256_movemask_epi8(vcmp1);    // mask of most significant bit of each byte
+    const uint32_t mask2 = _mm256_movemask_epi8(vcmp2);    // mask of most significant bit of each byte
+    const uint64_t mask = ((uint64_t)mask2 << 32) | mask1;
+    // mask is inverted, so each 8-bits are set iff the corresponding elem64 has all bits set (and thus can be cleared)
+    if (mask==0) return false;
+    mi_assert_internal((_tzcnt_u64(mask)%8) == 0); // tzcnt == 0, 8, 16, 24 , ..
+    const size_t chunk_idx = _tzcnt_u64(mask) / 8;
+    mi_assert_internal(chunk_idx < MI_BCHUNK_FIELDS);
+    if mi_likely(mi_bfield_atomic_try_clearX(&chunk->bfields[chunk_idx],NULL)) {
+      *pidx = chunk_idx*MI_BFIELD_BITS;
+      mi_assert_internal(*pidx + MI_BFIELD_BITS <= MI_BCHUNK_BITS);
+      return true;
+    }
+    // try again
+    // note: there must be an atomic release/acquire in between or otherwise the registers may not be reloaded
+  }
 #else
-  size_t bitidx = 0;               // otherwise start at 0
+  for (int i = 0; i < MI_BCHUNK_FIELDS; i++) {
+    const mi_bfield_t b = mi_atomic_load_relaxed(&chunk->bfields[i]);
+    if (~b==0 && mi_bfield_atomic_try_clearX(&chunk->bfields[i], NULL)) {
+      *pidx = i*MI_BFIELD_BITS;
+      mi_assert_internal(*pidx + MI_BFIELD_BITS <= MI_BCHUNK_BITS);
+      return true;
+    }
+  }
+  return false;
 #endif
-  size_t m = (mask << bitidx);     // invariant: m == mask shifted by bitidx
-
-  // scan linearly for a free range of zero bits
-  while (bitidx <= bitidx_max) {
-    const size_t mapm = map & m;
-    if (mapm == 0) {  // are the mask bits free at bitidx?
-      mi_assert_internal((m >> bitidx) == mask); // no overflow?
-      const size_t newmap = map | m;
-      mi_assert_internal((newmap^map) >> bitidx == mask);
-      if (!mi_atomic_cas_weak_acq_rel(field, &map, newmap)) {  // TODO: use strong cas here?
-        // no success, another thread claimed concurrently.. keep going (with updated `map`)
-        continue;
+}
+
+static inline bool mi_bchunk_try_find_and_clear_X(mi_bchunk_t* chunk, size_t n, size_t* pidx) {
+  mi_assert_internal(n==MI_BFIELD_BITS); MI_UNUSED(n);
+  return mi_bchunk_try_find_and_clearX(chunk, pidx);
+}
+*/
+
+// find a sequence of `n` bits in a chunk with `0 < n <= MI_BFIELD_BITS` with all bits set,
+// and try to clear them atomically.
+// set `*pidx` to its bit index (0 <= *pidx <= MI_BCHUNK_BITS - n) on success.
+// will cross bfield boundaries.
+mi_decl_noinline static bool mi_bchunk_try_find_and_clearNX(mi_bchunk_t* chunk, size_t n, size_t* pidx) {
+  if (n == 0 || n > MI_BFIELD_BITS) return false;
+  const mi_bfield_t mask = mi_bfield_mask(n, 0);
+  // for all fields in the chunk
+  for (int i = 0; i < MI_BCHUNK_FIELDS; i++) {
+    mi_bfield_t b0 = mi_atomic_load_relaxed(&chunk->bfields[i]);
+    mi_bfield_t b = b0;
+    size_t idx;
+
+    // is there a range inside the field?
+    while (mi_bfield_find_least_bit(b, &idx)) { // find least 1-bit
+      if (idx + n > MI_BFIELD_BITS) break; // too short: maybe cross over, or continue with the next field
+
+      const size_t bmask = mask<<idx;
+      mi_assert_internal(bmask>>idx == mask);
+      if ((b&bmask) == bmask) { // found a match with all bits set, try clearing atomically
+        if mi_likely(mi_bfield_atomic_try_clear_mask_of(&chunk->bfields[i], bmask, b0, NULL)) {
+          *pidx = (i*MI_BFIELD_BITS) + idx;
+          mi_assert_internal(*pidx < MI_BCHUNK_BITS);
+          mi_assert_internal(*pidx + n <= MI_BCHUNK_BITS);
+          return true;
+        }
+        else {
+          // if we failed to atomically commit, reload b and try again from the start
+          b = b0 = mi_atomic_load_acquire(&chunk->bfields[i]);
+        }
       }
       else {
-        // success, we claimed the bits!
-        *bitmap_idx = mi_bitmap_index_create(idx, bitidx);
-        return true;
+        // advance by clearing the least run of ones, for example, with n>=4, idx=2:
+        // b             = 1111 1101 1010 1100
+        // .. + (1<<idx) = 1111 1101 1011 0000
+        // .. & b        = 1111 1101 1010 0000
+        b = b & (b + (mi_bfield_one() << idx));
+      }
+    }
+
+    // check if we can cross into the next bfield
+    if (b!=0 && i < MI_BCHUNK_FIELDS-1) {
+      const size_t post = mi_bfield_clz(~b);
+      if (post > 0) {
+        const size_t pre = mi_bfield_ctz(~mi_atomic_load_relaxed(&chunk->bfields[i+1]));
+        if (post + pre >= n) {
+          // it fits -- try to claim it atomically
+          const size_t cidx = (i*MI_BFIELD_BITS) + (MI_BFIELD_BITS - post);
+          if (mi_bchunk_try_clearNX(chunk, cidx, n, NULL)) {
+            // we cleared all atomically
+            *pidx = cidx;
+            mi_assert_internal(*pidx < MI_BCHUNK_BITS);
+            mi_assert_internal(*pidx + n <= MI_BCHUNK_BITS);
+            return true;
+          }
+        }
       }
     }
+  }
+  return false;
+}
+
+// find a sequence of `n` bits in a chunk with `n < MI_BCHUNK_BITS` with all bits set,
+// and try to clear them atomically.
+// set `*pidx` to its bit index (0 <= *pidx <= MI_BCHUNK_BITS - n) on success.
+// This can cross bfield boundaries.
+static mi_decl_noinline bool mi_bchunk_try_find_and_clearN_(mi_bchunk_t* chunk, size_t n, size_t* pidx) {
+  if (n == 0 || n > MI_BCHUNK_BITS) return false;  // cannot be more than a chunk
+
+  // we first scan ahead to see if there is a range of `n` set bits, and only then try to clear atomically
+  mi_assert_internal(n>0);
+  const size_t skip_count = (n-1)/MI_BFIELD_BITS;
+  size_t cidx;
+  for (size_t i = 0; i < MI_BCHUNK_FIELDS - skip_count; i++)
+  {
+    size_t m = n;   // bits to go
+
+    // first field
+    mi_bfield_t b = mi_atomic_load_relaxed(&chunk->bfields[i]);
+    size_t ones = mi_bfield_clz(~b);
+    cidx = (i*MI_BFIELD_BITS) + (MI_BFIELD_BITS - ones);  // start index
+    if (ones >= m) {
+      // we found enough bits!
+      m = 0;
+    }
     else {
-      // on to the next bit range
-#ifdef MI_HAVE_FAST_BITSCAN
-      const size_t shift = (count == 1 ? 1 : mi_bsr(mapm) - bitidx + 1);
-      mi_assert_internal(shift > 0 && shift <= count);
+      m -= ones;
+
+      // keep scanning further fields?
+      size_t j = 1;   // field count from i
+      while (i+j < MI_BCHUNK_FIELDS) {
+        mi_assert_internal(m > 0);
+        b = mi_atomic_load_relaxed(&chunk->bfields[i+j]);
+        ones = mi_bfield_ctz(~b);
+        if (ones >= m) {
+          // we found enough bits
+          m = 0;
+          break;
+        }
+        else if (ones == MI_BFIELD_BITS) {
+          // not enough yet, proceed to the next field
+          j++;
+          m -= MI_BFIELD_BITS;
+        }
+        else {
+          // the range was not enough, start from scratch
+          i = i + j - 1;  // no need to re-scan previous fields, except the last one (with clz this time)
+          mi_assert_internal(m>0);
+          break;
+        }
+      }
+    }
+
+    // did we find a range?
+    if (m==0) {
+      if (mi_bchunk_try_clearN(chunk, cidx, n, NULL)) {
+        // we cleared all atomically
+        *pidx = cidx;
+        mi_assert_internal(*pidx < MI_BCHUNK_BITS);
+        mi_assert_internal(*pidx + n <= MI_BCHUNK_BITS);
+        return true;
+      }
+      // note: if we fail for a small `n` on the first field, we don't rescan that field (as `i` is incremented)
+    }
+    // otherwise continue searching
+  }
+  return false;
+}
+
+
+
+// ------- mi_bchunk_clear_once_set ---------------------------------------
+
+static inline void mi_bchunk_clear_once_set(mi_bchunk_t* chunk, size_t cidx) {
+  mi_assert_internal(cidx < MI_BCHUNK_BITS);
+  const size_t i = cidx / MI_BFIELD_BITS;
+  const size_t idx = cidx % MI_BFIELD_BITS;
+  mi_bfield_atomic_clear_once_set(&chunk->bfields[i], idx);
+}
+
+
+// ------- mi_bitmap_all_are_clear ---------------------------------------
+
+
+// are all bits in a bitmap chunk clear?
+static inline bool mi_bchunk_all_are_clear_relaxed(mi_bchunk_t* chunk) {
+  #if MI_OPT_SIMD && defined(__AVX2__) && (MI_BCHUNK_BITS==256)
+  const __m256i vec = _mm256_load_si256((const __m256i*)chunk->bfields);
+  return mi_mm256_is_zero(vec);
+  #elif MI_OPT_SIMD &&  defined(__AVX2__) && (MI_BCHUNK_BITS==512)
+  // a 64b cache-line contains the entire chunk anyway so load both at once
+  const __m256i vec1 = _mm256_load_si256((const __m256i*)chunk->bfields);
+  const __m256i vec2 = _mm256_load_si256(((const __m256i*)chunk->bfields)+1);
+  return (mi_mm256_is_zero(_mm256_or_si256(vec1,vec2)));
+  #elif MI_OPT_SIMD && (MI_BCHUNK_BITS==512) && MI_ARCH_ARM64
+  const uint64x2_t v0 = vld1q_u64((uint64_t*)chunk->bfields);
+  const uint64x2_t v1 = vld1q_u64((uint64_t*)chunk->bfields + 2);
+  const uint64x2_t v2 = vld1q_u64((uint64_t*)chunk->bfields + 4);
+  const uint64x2_t v3 = vld1q_u64((uint64_t*)chunk->bfields + 6);
+  const uint64x2_t v  = vorrq_u64(vorrq_u64(v0,v1),vorrq_u64(v2,v3));
+  return (vmaxvq_u32(vreinterpretq_u32_u64(v)) == 0);
+  #else
+  for (int i = 0; i < MI_BCHUNK_FIELDS; i++) {
+    if (mi_atomic_load_relaxed(&chunk->bfields[i]) != 0) return false;
+  }
+  return true;
+  #endif
+}
+
+// are all bits in a bitmap chunk set?
+static inline bool mi_bchunk_all_are_set_relaxed(mi_bchunk_t* chunk) {
+#if MI_OPT_SIMD && defined(__AVX2__) && (MI_BCHUNK_BITS==256)
+  const __m256i vec = _mm256_load_si256((const __m256i*)chunk->bfields);
+  return mi_mm256_is_ones(vec);
+#elif MI_OPT_SIMD &&  defined(__AVX2__) && (MI_BCHUNK_BITS==512)
+  // a 64b cache-line contains the entire chunk anyway so load both at once
+  const __m256i vec1 = _mm256_load_si256((const __m256i*)chunk->bfields);
+  const __m256i vec2 = _mm256_load_si256(((const __m256i*)chunk->bfields)+1);
+  return (mi_mm256_is_ones(_mm256_and_si256(vec1, vec2)));
+#elif MI_OPT_SIMD && (MI_BCHUNK_BITS==512) && MI_ARCH_ARM64
+  const uint64x2_t v0 = vld1q_u64((uint64_t*)chunk->bfields);
+  const uint64x2_t v1 = vld1q_u64((uint64_t*)chunk->bfields + 2);
+  const uint64x2_t v2 = vld1q_u64((uint64_t*)chunk->bfields + 4);
+  const uint64x2_t v3 = vld1q_u64((uint64_t*)chunk->bfields + 6);
+  const uint64x2_t v  = vandq_u64(vandq_u64(v0,v1),vandq_u64(v2,v3));
+  return (vminvq_u32(vreinterpretq_u32_u64(v)) == 0xFFFFFFFFUL);
 #else
-      const size_t shift = 1;
+  for (int i = 0; i < MI_BCHUNK_FIELDS; i++) {
+    if (~mi_atomic_load_relaxed(&chunk->bfields[i]) != 0) return false;
+  }
+  return true;
 #endif
-      bitidx += shift;
-      m <<= shift;
+}
+
+
+static bool mi_bchunk_bsr(mi_bchunk_t* chunk, size_t* pidx) {
+  for (size_t i = MI_BCHUNK_FIELDS; i > 0; ) {
+    i--;
+    mi_bfield_t b = mi_atomic_load_relaxed(&chunk->bfields[i]);
+    size_t idx;
+    if (mi_bsr(b, &idx)) {
+      *pidx = (i*MI_BFIELD_BITS) + idx;
+      return true;
+    }
+  }
+  return false;
+}
+
+static size_t mi_bchunk_popcount(mi_bchunk_t* chunk) {
+  size_t popcount = 0;
+  for (size_t i = 0; i < MI_BCHUNK_FIELDS; i++) {
+    const mi_bfield_t b = mi_atomic_load_relaxed(&chunk->bfields[i]);
+    popcount += mi_bfield_popcount(b);
+  }
+  return popcount;
+}
+
+
+/* --------------------------------------------------------------------------------
+ bitmap chunkmap
+-------------------------------------------------------------------------------- */
+
+static void mi_bitmap_chunkmap_set(mi_bitmap_t* bitmap, size_t chunk_idx) {
+  mi_assert(chunk_idx < mi_bitmap_chunk_count(bitmap));
+  mi_bchunk_set(&bitmap->chunkmap, chunk_idx, NULL);
+}
+
+static bool mi_bitmap_chunkmap_try_clear(mi_bitmap_t* bitmap, size_t chunk_idx) {
+  mi_assert(chunk_idx < mi_bitmap_chunk_count(bitmap));
+  // check if the corresponding chunk is all clear
+  if (!mi_bchunk_all_are_clear_relaxed(&bitmap->chunks[chunk_idx])) return false;
+  // clear the chunkmap bit
+  mi_bchunk_clear(&bitmap->chunkmap, chunk_idx, NULL);
+  // .. but a concurrent set may have happened in between our all-clear test and the clearing of the
+  // bit in the mask. We check again to catch this situation.
+  if (!mi_bchunk_all_are_clear_relaxed(&bitmap->chunks[chunk_idx])) {
+    mi_bchunk_set(&bitmap->chunkmap, chunk_idx, NULL);
+    return false;
+  }
+  return true;
+}
+
+
+/* --------------------------------------------------------------------------------
+  bitmap
+-------------------------------------------------------------------------------- */
+
+size_t mi_bitmap_size(size_t bit_count, size_t* pchunk_count) {
+  mi_assert_internal((bit_count % MI_BCHUNK_BITS) == 0);
+  bit_count = _mi_align_up(bit_count, MI_BCHUNK_BITS);
+  mi_assert_internal(bit_count <= MI_BITMAP_MAX_BIT_COUNT);
+  mi_assert_internal(bit_count > 0);
+  const size_t chunk_count = bit_count / MI_BCHUNK_BITS;
+  mi_assert_internal(chunk_count >= 1);
+  const size_t size = offsetof(mi_bitmap_t,chunks) + (chunk_count * MI_BCHUNK_SIZE);
+  mi_assert_internal( (size%MI_BCHUNK_SIZE) == 0 );
+  if (pchunk_count != NULL) { *pchunk_count = chunk_count;  }
+  return size;
+}
+
+
+// initialize a bitmap to all unset; avoid a mem_zero if `already_zero` is true
+// returns the size of the bitmap
+size_t mi_bitmap_init(mi_bitmap_t* bitmap, size_t bit_count, bool already_zero) {
+  size_t chunk_count;
+  const size_t size = mi_bitmap_size(bit_count, &chunk_count);
+  if (!already_zero) {
+    _mi_memzero_aligned(bitmap, size);
+  }
+  mi_atomic_store_release(&bitmap->chunk_count, chunk_count);
+  mi_assert_internal(mi_atomic_load_relaxed(&bitmap->chunk_count) <= MI_BITMAP_MAX_CHUNK_COUNT);
+  return size;
+}
+
+
+// Set a sequence of `n` bits in the bitmap (and can cross chunks). Not atomic so only use if local to a thread.
+static void mi_bchunks_unsafe_setN(mi_bchunk_t* chunks, mi_bchunkmap_t* cmap, size_t idx, size_t n) {
+  mi_assert_internal(n>0);
+
+  // start chunk and index
+  size_t chunk_idx = idx / MI_BCHUNK_BITS;
+  const size_t cidx = idx % MI_BCHUNK_BITS;
+  const size_t ccount = _mi_divide_up(n, MI_BCHUNK_BITS);
+
+  // first update the chunkmap
+  mi_bchunk_setN(cmap, chunk_idx, ccount, NULL);
+
+  // first chunk
+  size_t m = MI_BCHUNK_BITS - cidx;
+  if (m > n) { m = n; }
+  mi_bchunk_setN(&chunks[chunk_idx], cidx, m, NULL);
+
+  // n can be large so use memset for efficiency for all in-between chunks
+  chunk_idx++;
+  n -= m;
+  const size_t mid_chunks = n / MI_BCHUNK_BITS;
+  if (mid_chunks > 0) {
+    _mi_memset(&chunks[chunk_idx], ~0, mid_chunks * MI_BCHUNK_SIZE);
+    chunk_idx += mid_chunks;
+    n -= (mid_chunks * MI_BCHUNK_BITS);
+  }
+
+  // last chunk
+  if (n > 0) {
+    mi_assert_internal(n < MI_BCHUNK_BITS);
+    mi_assert_internal(chunk_idx < MI_BCHUNK_FIELDS);
+    mi_bchunk_setN(&chunks[chunk_idx], 0, n, NULL);
+  }
+}
+
+// Set a sequence of `n` bits in the bitmap (and can cross chunks). Not atomic so only use if local to a thread.
+void mi_bitmap_unsafe_setN(mi_bitmap_t* bitmap, size_t idx, size_t n) {
+  mi_assert_internal(n>0);
+  mi_assert_internal(idx + n <= mi_bitmap_max_bits(bitmap));
+  mi_bchunks_unsafe_setN(&bitmap->chunks[0], &bitmap->chunkmap, idx, n);
+}
+
+
+
+
+// ------- mi_bitmap_xset ---------------------------------------
+
+// Set a sequence of `n` bits in the bitmap; returns `true` if atomically transitioned from 0's to 1's (or 1's to 0's).
+// `n` cannot cross chunk boundaries (and `n <= MI_BCHUNK_BITS`)!
+bool mi_bitmap_setN(mi_bitmap_t* bitmap, size_t idx, size_t n, size_t* already_set) {
+  mi_assert_internal(n>0);
+  mi_assert_internal(n<=MI_BCHUNK_BITS);
+
+  const size_t chunk_idx = idx / MI_BCHUNK_BITS;
+  const size_t cidx = idx % MI_BCHUNK_BITS;
+  mi_assert_internal(cidx + n <= MI_BCHUNK_BITS);  // don't cross chunks (for now)
+  mi_assert_internal(chunk_idx < mi_bitmap_chunk_count(bitmap));
+  if (cidx + n > MI_BCHUNK_BITS) { n = MI_BCHUNK_BITS - cidx; }  // paranoia
+
+  const bool were_allclear = mi_bchunk_setN(&bitmap->chunks[chunk_idx], cidx, n, already_set);
+  mi_bitmap_chunkmap_set(bitmap, chunk_idx);   // set afterwards
+  return were_allclear;
+}
+
+// Clear a sequence of `n` bits in the bitmap; returns `true` if atomically transitioned from 1's to 0's.
+// `n` cannot cross chunk boundaries (and `n <= MI_BCHUNK_BITS`)!
+bool mi_bitmap_clearN(mi_bitmap_t* bitmap, size_t idx, size_t n) {
+  mi_assert_internal(n>0);
+  mi_assert_internal(n<=MI_BCHUNK_BITS);
+
+  const size_t chunk_idx = idx / MI_BCHUNK_BITS;
+  const size_t cidx = idx % MI_BCHUNK_BITS;
+  mi_assert_internal(cidx + n <= MI_BCHUNK_BITS);  // don't cross chunks (for now)
+  mi_assert_internal(chunk_idx < mi_bitmap_chunk_count(bitmap));
+  if (cidx + n > MI_BCHUNK_BITS) { n = MI_BCHUNK_BITS - cidx; }  // paranoia
+
+  bool maybe_all_clear;
+  const bool were_allset = mi_bchunk_clearN(&bitmap->chunks[chunk_idx], cidx, n, &maybe_all_clear);
+  if (maybe_all_clear) { mi_bitmap_chunkmap_try_clear(bitmap, chunk_idx); }
+  return were_allset;
+}
+
+// Count bits set in a range of `n` bits.
+// `n` cannot cross chunk boundaries (and `n <= MI_BCHUNK_BITS`)!
+size_t mi_bitmap_popcountN( mi_bitmap_t* bitmap, size_t idx, size_t n) {
+  mi_assert_internal(n>0);
+  mi_assert_internal(n<=MI_BCHUNK_BITS);
+
+  const size_t chunk_idx = idx / MI_BCHUNK_BITS;
+  const size_t cidx = idx % MI_BCHUNK_BITS;
+  mi_assert_internal(cidx + n <= MI_BCHUNK_BITS);  // don't cross chunks (for now)
+  mi_assert_internal(chunk_idx < mi_bitmap_chunk_count(bitmap));
+  if (cidx + n > MI_BCHUNK_BITS) { n = MI_BCHUNK_BITS - cidx; }  // paranoia
+  return mi_bchunk_popcountN(&bitmap->chunks[chunk_idx], cidx, n);
+}
+
+
+// Set/clear a bit in the bitmap; returns `true` if atomically transitioned from 0 to 1 (or 1 to 0)
+bool mi_bitmap_set(mi_bitmap_t* bitmap, size_t idx) {
+  return mi_bitmap_setN(bitmap, idx, 1, NULL);
+}
+
+bool mi_bitmap_clear(mi_bitmap_t* bitmap, size_t idx) {
+  return mi_bitmap_clearN(bitmap, idx, 1);
+}
+
+
+
+// ------- mi_bitmap_is_xset ---------------------------------------
+
+// Is a sequence of n bits already all set/cleared?
+bool mi_bitmap_is_xsetN(mi_xset_t set, mi_bitmap_t* bitmap, size_t idx, size_t n) {
+  mi_assert_internal(n>0);
+  mi_assert_internal(n<=MI_BCHUNK_BITS);
+  mi_assert_internal(idx + n <= mi_bitmap_max_bits(bitmap));
+
+  const size_t chunk_idx = idx / MI_BCHUNK_BITS;
+  const size_t cidx = idx % MI_BCHUNK_BITS;
+  mi_assert_internal(cidx + n <= MI_BCHUNK_BITS);  // don't cross chunks (for now)
+  mi_assert_internal(chunk_idx < mi_bitmap_chunk_count(bitmap));
+  if (cidx + n > MI_BCHUNK_BITS) { n = MI_BCHUNK_BITS - cidx; }  // paranoia
+
+  return mi_bchunk_is_xsetN(set, &bitmap->chunks[chunk_idx], cidx, n);
+}
+
+
+
+
+/* --------------------------------------------------------------------------------
+  Iterate through a bfield
+-------------------------------------------------------------------------------- */
+
+// Cycle iteration through a bitfield. This is used to space out threads
+// so there is less chance of contention. When searching for a free page we
+// like to first search only the accessed part (so we reuse better). This
+// high point is called the `cycle`.
+//
+// We then iterate through the bitfield as:
+// first: [start, cycle>
+// then : [0, start>
+// then : [cycle, MI_BFIELD_BITS>
+//
+// The start is determined usually as `tseq % cycle` to have each thread
+// start at a different spot.
+// - We use `popcount` to improve branch prediction (maybe not needed? can we simplify?)
+// - The `cycle_mask` is the part `[start, cycle>`.
+#define mi_bfield_iterate(bfield,start,cycle,name_idx,SUF) { \
+  mi_assert_internal(start <= cycle); \
+  mi_assert_internal(start < MI_BFIELD_BITS); \
+  mi_assert_internal(cycle <= MI_BFIELD_BITS); \
+  mi_bfield_t _cycle_mask##SUF = mi_bfield_mask(cycle - start, start); \
+  size_t _bcount##SUF = mi_bfield_popcount(bfield); \
+  mi_bfield_t _b##SUF = bfield & _cycle_mask##SUF; /* process [start, cycle> first*/\
+  while(_bcount##SUF > 0) { \
+    _bcount##SUF--;\
+    if (_b##SUF==0) { _b##SUF = bfield & ~_cycle_mask##SUF; } /* process [0,start> + [cycle, MI_BFIELD_BITS> next */ \
+    /* size_t name_idx; */ \
+    bool _found##SUF = mi_bfield_find_least_bit(_b##SUF,&name_idx); \
+    mi_assert_internal(_found##SUF); MI_UNUSED(_found##SUF); \
+    { \
+
+#define mi_bfield_iterate_end(SUF) \
+    } \
+    _b##SUF = mi_bfield_clear_least_bit(_b##SUF); \
+  } \
+}
+
+#define mi_bfield_cycle_iterate(bfield,tseq,cycle,name_idx,SUF) { \
+  const size_t _start##SUF = (uint32_t)(tseq) % (uint32_t)(cycle); /* or: 0 to always search from the start? */\
+  mi_bfield_iterate(bfield,_start##SUF,cycle,name_idx,SUF)
+
+#define mi_bfield_cycle_iterate_end(SUF) \
+  mi_bfield_iterate_end(SUF); }
+
+
+/* --------------------------------------------------------------------------------
+  mi_bitmap_find
+  (used to find free pages)
+-------------------------------------------------------------------------------- */
+
+typedef bool (mi_bitmap_visit_fun_t)(mi_bitmap_t* bitmap, size_t chunk_idx, size_t n, size_t* idx, void* arg1, void* arg2);
+
+// Go through the bitmap and for every sequence of `n` set bits, call the visitor function.
+// If it returns `true` stop the search.
+static inline bool mi_bitmap_find(mi_bitmap_t* bitmap, size_t tseq, size_t n, size_t* pidx, mi_bitmap_visit_fun_t* on_find, void* arg1, void* arg2)
+{
+  const size_t chunkmap_max = _mi_divide_up(mi_bitmap_chunk_count(bitmap), MI_BFIELD_BITS);
+  for (size_t i = 0; i < chunkmap_max; i++) {
+    // and for each chunkmap entry we iterate over its bits to find the chunks
+    const mi_bfield_t cmap_entry = mi_atomic_load_relaxed(&bitmap->chunkmap.bfields[i]);
+    size_t hi;
+    if (mi_bfield_find_highest_bit(cmap_entry, &hi)) {
+      size_t eidx = 0;
+      mi_bfield_cycle_iterate(cmap_entry, tseq%8, hi+1, eidx, Y) // reduce the tseq to 8 bins to reduce using extra memory (see `mstress`)
+      {
+        mi_assert_internal(eidx <= MI_BFIELD_BITS);
+        const size_t chunk_idx = i*MI_BFIELD_BITS + eidx;
+        mi_assert_internal(chunk_idx < mi_bitmap_chunk_count(bitmap));
+        if ((*on_find)(bitmap, chunk_idx, n, pidx, arg1, arg2)) {
+          return true;
+        }
+      }
+      mi_bfield_cycle_iterate_end(Y);
     }
   }
-  // no bits found
   return false;
 }
 
-// Find `count` bits of 0 and set them to 1 atomically; returns `true` on success.
-// Starts at idx, and wraps around to search in all `bitmap_fields` fields.
-// `count` can be at most MI_BITMAP_FIELD_BITS and will never cross fields.
-bool _mi_bitmap_try_find_from_claim(mi_bitmap_t bitmap, const size_t bitmap_fields, const size_t start_field_idx, const size_t count, mi_bitmap_index_t* bitmap_idx) {
-  size_t idx = start_field_idx;
-  for (size_t visited = 0; visited < bitmap_fields; visited++, idx++) {
-    if (idx >= bitmap_fields) idx = 0; // wrap
-    if (_mi_bitmap_try_find_claim_field(bitmap, idx, count, bitmap_idx)) {
+
+/* --------------------------------------------------------------------------------
+  Bitmap: try_find_and_claim  -- used to allocate abandoned pages
+  note: the compiler will fully inline the indirect function call
+-------------------------------------------------------------------------------- */
+
+typedef struct mi_claim_fun_data_s {
+  mi_arena_t*   arena;
+  mi_heaptag_t  heap_tag;
+} mi_claim_fun_data_t;
+
+static bool mi_bitmap_try_find_and_claim_visit(mi_bitmap_t* bitmap, size_t chunk_idx, size_t n, size_t* pidx, void* arg1, void* arg2)
+{
+  mi_assert_internal(n==1); MI_UNUSED(n);
+  mi_claim_fun_t* claim_fun = (mi_claim_fun_t*)arg1;
+  mi_claim_fun_data_t* claim_data = (mi_claim_fun_data_t*)arg2;
+  size_t cidx;
+  if mi_likely(mi_bchunk_try_find_and_clear(&bitmap->chunks[chunk_idx], &cidx)) {
+    const size_t slice_index = (chunk_idx * MI_BCHUNK_BITS) + cidx;
+    mi_assert_internal(slice_index < mi_bitmap_max_bits(bitmap));
+    bool keep_set = true;
+    if ((*claim_fun)(slice_index, claim_data->arena, claim_data->heap_tag, &keep_set)) {
+      // success!
+      mi_assert_internal(!keep_set);
+      *pidx = slice_index;
       return true;
     }
+    else {
+      // failed to claim it, set abandoned mapping again (unless the page was freed)
+      if (keep_set) {
+        const bool wasclear = mi_bchunk_set(&bitmap->chunks[chunk_idx], cidx, NULL);
+        mi_assert_internal(wasclear); MI_UNUSED(wasclear);
+      }
+    }
+  }
+  else {
+    // we may find that all are cleared only on a second iteration but that is ok as
+    // the chunkmap is a conservative approximation.
+    mi_bitmap_chunkmap_try_clear(bitmap, chunk_idx);
   }
   return false;
 }
 
-// Like _mi_bitmap_try_find_from_claim but with an extra predicate that must be fullfilled
-bool _mi_bitmap_try_find_from_claim_pred(mi_bitmap_t bitmap, const size_t bitmap_fields, 
-            const size_t start_field_idx, const size_t count, 
-            mi_bitmap_pred_fun_t pred_fun, void* pred_arg,            
-            mi_bitmap_index_t* bitmap_idx) {
-  size_t idx = start_field_idx;
-  for (size_t visited = 0; visited < bitmap_fields; visited++, idx++) {
-    if (idx >= bitmap_fields) idx = 0; // wrap
-    if (_mi_bitmap_try_find_claim_field(bitmap, idx, count, bitmap_idx)) {
-      if (pred_fun == NULL || pred_fun(*bitmap_idx, pred_arg)) { 
+// Find a set bit in the bitmap and try to atomically clear it and claim it.
+// (Used to find pages in the pages_abandoned bitmaps.)
+mi_decl_nodiscard bool mi_bitmap_try_find_and_claim(mi_bitmap_t* bitmap, size_t tseq, size_t* pidx,
+  mi_claim_fun_t* claim, mi_arena_t* arena, mi_heaptag_t heap_tag)
+{
+  mi_claim_fun_data_t claim_data = { arena, heap_tag };
+  return mi_bitmap_find(bitmap, tseq, 1, pidx, &mi_bitmap_try_find_and_claim_visit, (void*)claim, &claim_data);
+}
+
+
+bool mi_bitmap_bsr(mi_bitmap_t* bitmap, size_t* idx) {
+  const size_t chunkmap_max = _mi_divide_up(mi_bitmap_chunk_count(bitmap), MI_BFIELD_BITS);
+  for (size_t i = chunkmap_max; i > 0; ) {
+    i--;
+    mi_bfield_t cmap = mi_atomic_load_relaxed(&bitmap->chunkmap.bfields[i]);
+    size_t cmap_idx;
+    if (mi_bsr(cmap,&cmap_idx)) {
+      // highest chunk
+      const size_t chunk_idx = i*MI_BFIELD_BITS + cmap_idx;
+      size_t cidx;
+      if (mi_bchunk_bsr(&bitmap->chunks[chunk_idx], &cidx)) {
+        *idx = (chunk_idx * MI_BCHUNK_BITS) + cidx;
         return true;
       }
-      // predicate returned false, unclaim and look further
-      _mi_bitmap_unclaim(bitmap, bitmap_fields, count, *bitmap_idx);
     }
   }
   return false;
 }
 
-/*
-// Find `count` bits of 0 and set them to 1 atomically; returns `true` on success.
-// For now, `count` can be at most MI_BITMAP_FIELD_BITS and will never span fields.
-bool _mi_bitmap_try_find_claim(mi_bitmap_t bitmap, const size_t bitmap_fields, const size_t count, mi_bitmap_index_t* bitmap_idx) {
-  return _mi_bitmap_try_find_from_claim(bitmap, bitmap_fields, 0, count, bitmap_idx);
+// Return count of all set bits in a bitmap.
+size_t mi_bitmap_popcount(mi_bitmap_t* bitmap) {
+  // for all chunkmap entries
+  size_t popcount = 0;
+  const size_t chunkmap_max = _mi_divide_up(mi_bitmap_chunk_count(bitmap), MI_BFIELD_BITS);
+  for (size_t i = 0; i < chunkmap_max; i++) {
+    mi_bfield_t cmap_entry = mi_atomic_load_relaxed(&bitmap->chunkmap.bfields[i]);
+    size_t cmap_idx;
+    // for each chunk (corresponding to a set bit in a chunkmap entry)
+    while (mi_bfield_foreach_bit(&cmap_entry, &cmap_idx)) {
+      const size_t chunk_idx = i*MI_BFIELD_BITS + cmap_idx;
+      // count bits in a chunk
+      popcount += mi_bchunk_popcount(&bitmap->chunks[chunk_idx]);
+    }
+  }
+  return popcount;
 }
-*/
 
-// Set `count` bits at `bitmap_idx` to 0 atomically
-// Returns `true` if all `count` bits were 1 previously.
-bool _mi_bitmap_unclaim(mi_bitmap_t bitmap, size_t bitmap_fields, size_t count, mi_bitmap_index_t bitmap_idx) {
-  const size_t idx = mi_bitmap_index_field(bitmap_idx);
-  const size_t bitidx = mi_bitmap_index_bit_in_field(bitmap_idx);
-  const size_t mask = mi_bitmap_mask_(count, bitidx);
-  mi_assert_internal(bitmap_fields > idx); MI_UNUSED(bitmap_fields);
-  // mi_assert_internal((bitmap[idx] & mask) == mask);
-  size_t prev = mi_atomic_and_acq_rel(&bitmap[idx], ~mask);
-  return ((prev & mask) == mask);
+
+
+// Clear a bit once it is set.
+void mi_bitmap_clear_once_set(mi_bitmap_t* bitmap, size_t idx) {
+  mi_assert_internal(idx < mi_bitmap_max_bits(bitmap));
+  const size_t chunk_idx = idx / MI_BCHUNK_BITS;
+  const size_t cidx = idx % MI_BCHUNK_BITS;
+  mi_assert_internal(chunk_idx < mi_bitmap_chunk_count(bitmap));
+  mi_bchunk_clear_once_set(&bitmap->chunks[chunk_idx], cidx);
 }
 
 
-// Set `count` bits at `bitmap_idx` to 1 atomically
-// Returns `true` if all `count` bits were 0 previously. `any_zero` is `true` if there was at least one zero bit.
-bool _mi_bitmap_claim(mi_bitmap_t bitmap, size_t bitmap_fields, size_t count, mi_bitmap_index_t bitmap_idx, bool* any_zero) {
-  const size_t idx = mi_bitmap_index_field(bitmap_idx);
-  const size_t bitidx = mi_bitmap_index_bit_in_field(bitmap_idx);
-  const size_t mask = mi_bitmap_mask_(count, bitidx);
-  mi_assert_internal(bitmap_fields > idx); MI_UNUSED(bitmap_fields);
-  //mi_assert_internal(any_zero != NULL || (bitmap[idx] & mask) == 0);
-  size_t prev = mi_atomic_or_acq_rel(&bitmap[idx], mask);
-  if (any_zero != NULL) *any_zero = ((prev & mask) != mask);
-  return ((prev & mask) == 0);
+// Visit all set bits in a bitmap.
+// todo: optimize further? maybe use avx512 to directly get all indices using a mask_compressstore?
+bool _mi_bitmap_forall_set(mi_bitmap_t* bitmap, mi_forall_set_fun_t* visit, mi_arena_t* arena, void* arg) {
+  // for all chunkmap entries
+  const size_t chunkmap_max = _mi_divide_up(mi_bitmap_chunk_count(bitmap), MI_BFIELD_BITS);
+  for(size_t i = 0; i < chunkmap_max; i++) {
+    mi_bfield_t cmap_entry = mi_atomic_load_relaxed(&bitmap->chunkmap.bfields[i]);
+    size_t cmap_idx;
+    // for each chunk (corresponding to a set bit in a chunkmap entry)
+    while (mi_bfield_foreach_bit(&cmap_entry, &cmap_idx)) {
+      const size_t chunk_idx = i*MI_BFIELD_BITS + cmap_idx;
+      // for each chunk field
+      mi_bchunk_t* const chunk = &bitmap->chunks[chunk_idx];
+      for (size_t j = 0; j < MI_BCHUNK_FIELDS; j++) {
+        const size_t base_idx = (chunk_idx*MI_BCHUNK_BITS) + (j*MI_BFIELD_BITS);
+        mi_bfield_t b = mi_atomic_load_relaxed(&chunk->bfields[j]);
+        size_t bidx;
+        while (mi_bfield_foreach_bit(&b, &bidx)) {
+          const size_t idx = base_idx + bidx;
+          if (!visit(idx, 1, arena, arg)) return false;
+        }
+      }
+    }
+  }
+  return true;
 }
 
-// Returns `true` if all `count` bits were 1. `any_ones` is `true` if there was at least one bit set to one.
-static bool mi_bitmap_is_claimedx(mi_bitmap_t bitmap, size_t bitmap_fields, size_t count, mi_bitmap_index_t bitmap_idx, bool* any_ones) {
-  const size_t idx = mi_bitmap_index_field(bitmap_idx);
-  const size_t bitidx = mi_bitmap_index_bit_in_field(bitmap_idx);
-  const size_t mask = mi_bitmap_mask_(count, bitidx);
-  mi_assert_internal(bitmap_fields > idx); MI_UNUSED(bitmap_fields);
-  size_t field = mi_atomic_load_relaxed(&bitmap[idx]);
-  if (any_ones != NULL) *any_ones = ((field & mask) != 0);
-  return ((field & mask) == mask);
+// Visit all set bits in a bitmap but try to return ranges (within bfields) if possible.
+// Also clear those ranges atomically.
+// Used by purging to purge larger ranges when possible
+// todo: optimize further? maybe use avx512 to directly get all indices using a mask_compressstore?
+bool _mi_bitmap_forall_setc_ranges(mi_bitmap_t* bitmap, mi_forall_set_fun_t* visit, mi_arena_t* arena, void* arg) {
+  // for all chunkmap entries
+  const size_t chunkmap_max = _mi_divide_up(mi_bitmap_chunk_count(bitmap), MI_BFIELD_BITS);
+  for (size_t i = 0; i < chunkmap_max; i++) {
+    mi_bfield_t cmap_entry = mi_atomic_load_relaxed(&bitmap->chunkmap.bfields[i]);
+    size_t cmap_idx;
+    // for each chunk (corresponding to a set bit in a chunkmap entry)
+    while (mi_bfield_foreach_bit(&cmap_entry, &cmap_idx)) {
+      const size_t chunk_idx = i*MI_BFIELD_BITS + cmap_idx;
+      // for each chunk field
+      mi_bchunk_t* const chunk = &bitmap->chunks[chunk_idx];
+      for (size_t j = 0; j < MI_BCHUNK_FIELDS; j++) {
+        const size_t base_idx = (chunk_idx*MI_BCHUNK_BITS) + (j*MI_BFIELD_BITS);
+        mi_bfield_t b = mi_atomic_exchange_acq_rel(&chunk->bfields[j], 0); // can be relaxed?
+        #if MI_DEBUG > 1
+        const size_t bpopcount = mi_popcount(b);
+        size_t rngcount = 0;
+        #endif
+        size_t bidx;
+        while (mi_bfield_find_least_bit(b, &bidx)) {
+          const size_t rng = mi_ctz(~(b>>bidx)); // all the set bits from bidx
+          #if MI_DEBUG > 1
+          rngcount += rng;
+          #endif
+          mi_assert_internal(rng>=1 && rng<=MI_BFIELD_BITS);
+          const size_t idx = base_idx + bidx;
+          mi_assert_internal((idx % MI_BFIELD_BITS) + rng <= MI_BFIELD_BITS);
+          mi_assert_internal((idx / MI_BCHUNK_BITS) < mi_bitmap_chunk_count(bitmap));
+          if (!visit(idx, rng, arena, arg)) return false;
+          // clear rng bits in b
+          b = b & ~mi_bfield_mask(rng, bidx);
+        }
+        mi_assert_internal(rngcount == bpopcount);
+      }
+    }
+  }
+  return true;
 }
 
-bool _mi_bitmap_is_claimed(mi_bitmap_t bitmap, size_t bitmap_fields, size_t count, mi_bitmap_index_t bitmap_idx) {
-  return mi_bitmap_is_claimedx(bitmap, bitmap_fields, count, bitmap_idx, NULL);
+
+
+/* --------------------------------------------------------------------------------
+  binned bitmap's
+-------------------------------------------------------------------------------- */
+
+
+size_t mi_bbitmap_size(size_t bit_count, size_t* pchunk_count) {
+  // mi_assert_internal((bit_count % MI_BCHUNK_BITS) == 0);
+  bit_count = _mi_align_up(bit_count, MI_BCHUNK_BITS);
+  mi_assert_internal(bit_count <= MI_BITMAP_MAX_BIT_COUNT);
+  mi_assert_internal(bit_count > 0);
+  const size_t chunk_count = bit_count / MI_BCHUNK_BITS;
+  mi_assert_internal(chunk_count >= 1);
+  const size_t size = offsetof(mi_bbitmap_t,chunks) + (chunk_count * MI_BCHUNK_SIZE);
+  mi_assert_internal( (size%MI_BCHUNK_SIZE) == 0 );
+  if (pchunk_count != NULL) { *pchunk_count = chunk_count;  }
+  return size;
 }
 
-bool _mi_bitmap_is_any_claimed(mi_bitmap_t bitmap, size_t bitmap_fields, size_t count, mi_bitmap_index_t bitmap_idx) {
-  bool any_ones;
-  mi_bitmap_is_claimedx(bitmap, bitmap_fields, count, bitmap_idx, &any_ones);
-  return any_ones;
+// initialize a bitmap to all unset; avoid a mem_zero if `already_zero` is true
+// returns the size of the bitmap
+size_t mi_bbitmap_init(mi_bbitmap_t* bbitmap, size_t bit_count, bool already_zero) {
+  size_t chunk_count;
+  const size_t size = mi_bbitmap_size(bit_count, &chunk_count);
+  if (!already_zero) {
+    _mi_memzero_aligned(bbitmap, size);
+  }
+  mi_atomic_store_release(&bbitmap->chunk_count, chunk_count);
+  mi_assert_internal(mi_atomic_load_relaxed(&bbitmap->chunk_count) <= MI_BITMAP_MAX_CHUNK_COUNT);
+  return size;
 }
 
+void mi_bbitmap_unsafe_setN(mi_bbitmap_t* bbitmap, size_t idx, size_t n) {
+  mi_assert_internal(n>0);
+  mi_assert_internal(idx + n <= mi_bbitmap_max_bits(bbitmap));
+  mi_bchunks_unsafe_setN(&bbitmap->chunks[0], &bbitmap->chunkmap, idx, n);
+}
 
-//--------------------------------------------------------------------------
-// the `_across` functions work on bitmaps where sequences can cross over
-// between the fields. This is used in arena allocation
-//--------------------------------------------------------------------------
 
-// Try to atomically claim a sequence of `count` bits starting from the field 
-// at `idx` in `bitmap` and crossing into subsequent fields. Returns `true` on success.
-static bool mi_bitmap_try_find_claim_field_across(mi_bitmap_t bitmap, size_t bitmap_fields, size_t idx, const size_t count, const size_t retries, mi_bitmap_index_t* bitmap_idx)
-{
-  mi_assert_internal(bitmap_idx != NULL);
-  
-  // check initial trailing zeros
-  mi_bitmap_field_t* field = &bitmap[idx];
-  size_t map = mi_atomic_load_relaxed(field);  
-  const size_t initial = mi_clz(map);  // count of initial zeros starting at idx
-  mi_assert_internal(initial <= MI_BITMAP_FIELD_BITS);
-  if (initial == 0)     return false;
-  if (initial >= count) return _mi_bitmap_try_find_claim_field(bitmap, idx, count, bitmap_idx);     // no need to cross fields
-  if (_mi_divide_up(count - initial, MI_BITMAP_FIELD_BITS) >= (bitmap_fields - idx)) return false; // not enough entries
-
-  // scan ahead
-  size_t found = initial;
-  size_t mask = 0;     // mask bits for the final field
-  while(found < count) {
-    field++;
-    map = mi_atomic_load_relaxed(field);
-    const size_t mask_bits = (found + MI_BITMAP_FIELD_BITS <= count ? MI_BITMAP_FIELD_BITS : (count - found));
-    mask = mi_bitmap_mask_(mask_bits, 0);
-    if ((map & mask) != 0) return false;
-    found += mask_bits;
-  }
-  mi_assert_internal(field < &bitmap[bitmap_fields]);
-
-  // found range of zeros up to the final field; mask contains mask in the final field
-  // now claim it atomically
-  mi_bitmap_field_t* const final_field = field;
-  const size_t final_mask = mask;
-  mi_bitmap_field_t* const initial_field = &bitmap[idx];
-  const size_t initial_mask = mi_bitmap_mask_(initial, MI_BITMAP_FIELD_BITS - initial);
-
-  // initial field
-  size_t newmap;
-  field = initial_field;
-  map = mi_atomic_load_relaxed(field);
-  do {
-    newmap = map | initial_mask;
-    if ((map & initial_mask) != 0) { goto rollback; };
-  } while (!mi_atomic_cas_strong_acq_rel(field, &map, newmap));
-  
-  // intermediate fields
-  while (++field < final_field) {
-    newmap = MI_BITMAP_FIELD_FULL;
-    map = 0;
-    if (!mi_atomic_cas_strong_acq_rel(field, &map, newmap)) { goto rollback; }
-  }
-  
-  // final field
-  mi_assert_internal(field == final_field);
-  map = mi_atomic_load_relaxed(field);
-  do {
-    newmap = map | final_mask;
-    if ((map & final_mask) != 0) { goto rollback; }
-  } while (!mi_atomic_cas_strong_acq_rel(field, &map, newmap));
 
-  // claimed!
-  *bitmap_idx = mi_bitmap_index_create(idx, MI_BITMAP_FIELD_BITS - initial);
-  return true;
+/* --------------------------------------------------------------------------------
+ binned bitmap used to track free slices
+-------------------------------------------------------------------------------- */
 
-rollback: 
-  // roll back intermediate fields
-  while (--field > initial_field) {
-    newmap = 0;
-    map = MI_BITMAP_FIELD_FULL;
-    mi_assert_internal(mi_atomic_load_relaxed(field) == map);
-    mi_atomic_store_release(field, newmap);
-  }
-  if (field == initial_field) {
-    map = mi_atomic_load_relaxed(field);
-    do {
-      mi_assert_internal((map & initial_mask) == initial_mask);
-      newmap = map & ~initial_mask;
-    } while (!mi_atomic_cas_strong_acq_rel(field, &map, newmap));
+// Assign a specific size bin to a chunk
+static void mi_bbitmap_set_chunk_bin(mi_bbitmap_t* bbitmap, size_t chunk_idx, mi_chunkbin_t bin) {
+  mi_assert_internal(chunk_idx < mi_bbitmap_chunk_count(bbitmap));
+  for (mi_chunkbin_t ibin = MI_CBIN_SMALL; ibin < MI_CBIN_NONE; ibin = mi_chunkbin_inc(ibin)) {
+    if (ibin == bin) {
+      const bool was_clear = mi_bchunk_set(& bbitmap->chunkmap_bins[ibin], chunk_idx, NULL);
+      if (was_clear) { mi_os_stat_increase(chunk_bins[ibin],1); }
+    }
+    else {
+      const bool was_set = mi_bchunk_clear(&bbitmap->chunkmap_bins[ibin], chunk_idx, NULL);
+      if (was_set) { mi_os_stat_decrease(chunk_bins[ibin],1); }
+    }
   }  
-  // retry? (we make a recursive call instead of goto to be able to use const declarations)
-  if (retries < 4) {
-    return mi_bitmap_try_find_claim_field_across(bitmap, bitmap_fields, idx, count, retries+1, bitmap_idx);
+}
+
+mi_chunkbin_t mi_bbitmap_debug_get_bin(const mi_bchunkmap_t* chunkmap_bins, size_t chunk_idx) {
+  for (mi_chunkbin_t ibin = MI_CBIN_SMALL; ibin < MI_CBIN_NONE; ibin = mi_chunkbin_inc(ibin)) {
+    if (mi_bchunk_is_xsetN(MI_BIT_SET, &chunkmap_bins[ibin], chunk_idx, 1)) {
+      return ibin;
+    }
   }
-  else {
+  return MI_CBIN_NONE;
+}
+
+// Track the index of the highest chunk that is accessed.
+static void mi_bbitmap_chunkmap_set_max(mi_bbitmap_t* bbitmap, size_t chunk_idx) {
+  size_t oldmax = mi_atomic_load_relaxed(&bbitmap->chunk_max_accessed);
+  if mi_unlikely(chunk_idx > oldmax) {
+    mi_atomic_cas_strong_relaxed(&bbitmap->chunk_max_accessed, &oldmax, chunk_idx);
+  }
+}
+
+// Set a bit in the chunkmap
+static void mi_bbitmap_chunkmap_set(mi_bbitmap_t* bbitmap, size_t chunk_idx, bool check_all_set) {
+  mi_assert(chunk_idx < mi_bbitmap_chunk_count(bbitmap));
+  if (check_all_set) {
+    if (mi_bchunk_all_are_set_relaxed(&bbitmap->chunks[chunk_idx])) {
+      // all slices are free in this chunk: return back to the NONE bin
+      mi_bbitmap_set_chunk_bin(bbitmap, chunk_idx, MI_CBIN_NONE);
+    }
+  }
+  mi_bchunk_set(&bbitmap->chunkmap, chunk_idx, NULL);
+  mi_bbitmap_chunkmap_set_max(bbitmap, chunk_idx);
+}
+
+static bool mi_bbitmap_chunkmap_try_clear(mi_bbitmap_t* bbitmap, size_t chunk_idx) {
+  mi_assert(chunk_idx < mi_bbitmap_chunk_count(bbitmap));
+  // check if the corresponding chunk is all clear
+  if (!mi_bchunk_all_are_clear_relaxed(&bbitmap->chunks[chunk_idx])) return false;
+  // clear the chunkmap bit
+  mi_bchunk_clear(&bbitmap->chunkmap, chunk_idx, NULL);
+  // .. but a concurrent set may have happened in between our all-clear test and the clearing of the
+  // bit in the mask. We check again to catch this situation. (note: mi_bchunk_clear must be acq-rel)
+  if (!mi_bchunk_all_are_clear_relaxed(&bbitmap->chunks[chunk_idx])) {
+    mi_bchunk_set(&bbitmap->chunkmap, chunk_idx, NULL);
     return false;
   }
+  mi_bbitmap_chunkmap_set_max(bbitmap, chunk_idx);
+  return true;
 }
 
 
-// Find `count` bits of zeros and set them to 1 atomically; returns `true` on success.
-// Starts at idx, and wraps around to search in all `bitmap_fields` fields.
-bool _mi_bitmap_try_find_from_claim_across(mi_bitmap_t bitmap, const size_t bitmap_fields, const size_t start_field_idx, const size_t count, mi_bitmap_index_t* bitmap_idx) {
-  mi_assert_internal(count > 0);
-  if (count==1) return _mi_bitmap_try_find_from_claim(bitmap, bitmap_fields, start_field_idx, count, bitmap_idx);
-  size_t idx = start_field_idx;
-  for (size_t visited = 0; visited < bitmap_fields; visited++, idx++) {
-    if (idx >= bitmap_fields) idx = 0; // wrap
-    // try to claim inside the field
-    if (count <= MI_BITMAP_FIELD_BITS) {
-      if (_mi_bitmap_try_find_claim_field(bitmap, idx, count, bitmap_idx)) {
-        return true;
-      }
+/* --------------------------------------------------------------------------------
+  mi_bbitmap_setN, try_clearN, and is_xsetN
+  (used to find free pages)
+-------------------------------------------------------------------------------- */
+
+// Set a sequence of `n` bits in the bitmap; returns `true` if atomically transitioned from 0's to 1's (or 1's to 0's).
+// `n` cannot cross chunk boundaries (and `n <= MI_BCHUNK_BITS`)!
+bool mi_bbitmap_setN(mi_bbitmap_t* bbitmap, size_t idx, size_t n) {
+  mi_assert_internal(n>0);
+  mi_assert_internal(n<=MI_BCHUNK_BITS);
+
+  const size_t chunk_idx = idx / MI_BCHUNK_BITS;
+  const size_t cidx = idx % MI_BCHUNK_BITS;
+  mi_assert_internal(cidx + n <= MI_BCHUNK_BITS);  // don't cross chunks (for now)
+  mi_assert_internal(chunk_idx < mi_bbitmap_chunk_count(bbitmap));
+  if (cidx + n > MI_BCHUNK_BITS) { n = MI_BCHUNK_BITS - cidx; }  // paranoia
+
+  const bool were_allclear = mi_bchunk_setN(&bbitmap->chunks[chunk_idx], cidx, n, NULL);
+  mi_bbitmap_chunkmap_set(bbitmap, chunk_idx, true);   // set after
+  return were_allclear;
+}
+
+
+// ------- mi_bbitmap_try_clearN ---------------------------------------
+
+bool mi_bbitmap_try_clearN(mi_bbitmap_t* bbitmap, size_t idx, size_t n) {
+  mi_assert_internal(n>0);
+  mi_assert_internal(n<=MI_BCHUNK_BITS);
+  mi_assert_internal(idx + n <= mi_bbitmap_max_bits(bbitmap));
+
+  const size_t chunk_idx = idx / MI_BCHUNK_BITS;
+  const size_t cidx = idx % MI_BCHUNK_BITS;
+  mi_assert_internal(cidx + n <= MI_BCHUNK_BITS);  // don't cross chunks (for now)
+  mi_assert_internal(chunk_idx < mi_bbitmap_chunk_count(bbitmap));
+  if (cidx + n > MI_BCHUNK_BITS) return false;
+  bool maybe_all_clear;
+  const bool cleared = mi_bchunk_try_clearN(&bbitmap->chunks[chunk_idx], cidx, n, &maybe_all_clear);
+  if (cleared && maybe_all_clear) { mi_bbitmap_chunkmap_try_clear(bbitmap, chunk_idx); }
+  // note: we don't set the size class for an explicit try_clearN (only used by purging)
+  return cleared;
+}
+
+
+// ------- mi_bbitmap_is_xset ---------------------------------------
+
+// Is a sequence of n bits already all set/cleared?
+bool mi_bbitmap_is_xsetN(mi_xset_t set, mi_bbitmap_t* bbitmap, size_t idx, size_t n) {
+  mi_assert_internal(n>0);
+  mi_assert_internal(n<=MI_BCHUNK_BITS);
+  mi_assert_internal(idx + n <= mi_bbitmap_max_bits(bbitmap));
+
+  const size_t chunk_idx = idx / MI_BCHUNK_BITS;
+  const size_t cidx = idx % MI_BCHUNK_BITS;
+  mi_assert_internal(cidx + n <= MI_BCHUNK_BITS);  // don't cross chunks (for now)
+  mi_assert_internal(chunk_idx < mi_bbitmap_chunk_count(bbitmap));
+  if (cidx + n > MI_BCHUNK_BITS) { n = MI_BCHUNK_BITS - cidx; }  // paranoia
+
+  return mi_bchunk_is_xsetN(set, &bbitmap->chunks[chunk_idx], cidx, n);
+}
+
+
+
+
+/* --------------------------------------------------------------------------------
+  mi_bbitmap_find
+  (used to find free pages)
+-------------------------------------------------------------------------------- */
+
+typedef bool (mi_bchunk_try_find_and_clear_fun_t)(mi_bchunk_t* chunk, size_t n, size_t* idx);
+
+// Go through the bbitmap and for every sequence of `n` set bits, call the visitor function.
+// If it returns `true` stop the search.
+//
+// This is used for finding free blocks and it is important to be efficient (with 2-level bitscan)
+// but also reduce fragmentation (through size bins).
+static inline bool mi_bbitmap_try_find_and_clear_generic(mi_bbitmap_t* bbitmap, size_t tseq, size_t n, size_t* pidx, mi_bchunk_try_find_and_clear_fun_t* on_find)
+{
+  // we space out threads to reduce contention
+  const size_t cmap_max_count  = _mi_divide_up(mi_bbitmap_chunk_count(bbitmap),MI_BFIELD_BITS);
+  const size_t chunk_acc       = mi_atomic_load_relaxed(&bbitmap->chunk_max_accessed);
+  const size_t cmap_acc        = chunk_acc / MI_BFIELD_BITS;
+  const size_t cmap_acc_bits   = 1 + (chunk_acc % MI_BFIELD_BITS);
+
+  // create a mask over the chunkmap entries to iterate over them efficiently
+  mi_assert_internal(MI_BFIELD_BITS >= MI_BCHUNK_FIELDS);
+  const mi_bfield_t cmap_mask  = mi_bfield_mask(cmap_max_count,0);
+  const size_t cmap_cycle      = cmap_acc+1;
+  const mi_chunkbin_t bbin = mi_chunkbin_of(n); 
+  // visit each cmap entry
+  size_t cmap_idx = 0;
+  mi_bfield_cycle_iterate(cmap_mask, tseq, cmap_cycle, cmap_idx, X)
+  {
+    // and for each chunkmap entry we iterate over its bits to find the chunks
+    const mi_bfield_t cmap_entry = mi_atomic_load_relaxed(&bbitmap->chunkmap.bfields[cmap_idx]);
+    const size_t cmap_entry_cycle = (cmap_idx != cmap_acc ? MI_BFIELD_BITS : cmap_acc_bits);
+    if (cmap_entry == 0) continue;
+
+    // get size bin masks
+    mi_bfield_t cmap_bins[MI_CBIN_COUNT] = { 0 };
+    cmap_bins[MI_CBIN_NONE] = cmap_entry;
+    for (mi_chunkbin_t ibin = MI_CBIN_SMALL; ibin < MI_CBIN_NONE; ibin = mi_chunkbin_inc(ibin)) {
+      const mi_bfield_t cmap_bin = mi_atomic_load_relaxed(&bbitmap->chunkmap_bins[ibin].bfields[cmap_idx]);
+      cmap_bins[ibin] = cmap_bin & cmap_entry;
+      cmap_bins[MI_CBIN_NONE] &= ~cmap_bin;      // clear bits that are in an assigned size bin
     }
-    // try to claim across fields
-    if (mi_bitmap_try_find_claim_field_across(bitmap, bitmap_fields, idx, count, 0, bitmap_idx)) {
-      return true;
+
+    // consider only chunks for a particular size bin at a time    
+    // this picks the best bin only within a cmap entry (~ 1GiB address space), but avoids multiple
+    // iterations through all entries.
+    mi_assert_internal(bbin < MI_CBIN_NONE);
+    for (mi_chunkbin_t ibin = MI_CBIN_SMALL; ibin <= MI_CBIN_NONE;
+          // skip from bbin to NONE (so, say, a SMALL will never be placed in a OTHER, MEDIUM, or LARGE chunk to reduce fragmentation)
+          ibin = (ibin == bbin ? MI_CBIN_NONE : mi_chunkbin_inc(ibin)))
+    {
+      mi_assert_internal(ibin < MI_CBIN_COUNT);
+      const mi_bfield_t cmap_bin = cmap_bins[ibin];      
+      size_t eidx = 0;
+      mi_bfield_cycle_iterate(cmap_bin, tseq, cmap_entry_cycle, eidx, Y)  
+      {
+        // assertion doesn't quite hold as the max_accessed may be out-of-date
+        // mi_assert_internal(cmap_entry_cycle > eidx || ibin == MI_CBIN_NONE);
+
+        // get the chunk 
+        const size_t chunk_idx = cmap_idx*MI_BFIELD_BITS + eidx;
+        mi_bchunk_t* chunk = &bbitmap->chunks[chunk_idx];
+
+        size_t cidx;
+        if ((*on_find)(chunk, n, &cidx)) {
+          if (cidx==0 && ibin == MI_CBIN_NONE) { // only the first block determines the size bin
+            // this chunk is now reserved for the `bbin` size class
+            mi_bbitmap_set_chunk_bin(bbitmap, chunk_idx, bbin);
+          }
+          *pidx = (chunk_idx * MI_BCHUNK_BITS) + cidx;
+          mi_assert_internal(*pidx + n <= mi_bbitmap_max_bits(bbitmap));
+          return true;
+        }
+        else {
+          // todo: should _on_find_ return a boolen if there is a chance all are clear to avoid calling `try_clear?`
+          // we may find that all are cleared only on a second iteration but that is ok as the chunkmap is a conservative approximation.
+          mi_bbitmap_chunkmap_try_clear(bbitmap, chunk_idx);
+        }
+      }
+      mi_bfield_cycle_iterate_end(Y);
     }
   }
+  mi_bfield_cycle_iterate_end(X);
   return false;
 }
 
-// Helper for masks across fields; returns the mid count, post_mask may be 0
-static size_t mi_bitmap_mask_across(mi_bitmap_index_t bitmap_idx, size_t bitmap_fields, size_t count, size_t* pre_mask, size_t* mid_mask, size_t* post_mask) {
-  MI_UNUSED_RELEASE(bitmap_fields);
-  const size_t bitidx = mi_bitmap_index_bit_in_field(bitmap_idx);
-  if mi_likely(bitidx + count <= MI_BITMAP_FIELD_BITS) {
-    *pre_mask = mi_bitmap_mask_(count, bitidx);
-    *mid_mask = 0;
-    *post_mask = 0;
-    mi_assert_internal(mi_bitmap_index_field(bitmap_idx) < bitmap_fields);
-    return 0;
-  }
-  else {
-    const size_t pre_bits = MI_BITMAP_FIELD_BITS - bitidx;
-    mi_assert_internal(pre_bits < count);
-    *pre_mask = mi_bitmap_mask_(pre_bits, bitidx);
-    count -= pre_bits;
-    const size_t mid_count = (count / MI_BITMAP_FIELD_BITS);
-    *mid_mask = MI_BITMAP_FIELD_FULL;
-    count %= MI_BITMAP_FIELD_BITS;
-    *post_mask = (count==0 ? 0 : mi_bitmap_mask_(count, 0));
-    mi_assert_internal(mi_bitmap_index_field(bitmap_idx) + mid_count + (count==0 ? 0 : 1) < bitmap_fields);
-    return mid_count;
-  }
-}
-
-// Set `count` bits at `bitmap_idx` to 0 atomically
-// Returns `true` if all `count` bits were 1 previously.
-bool _mi_bitmap_unclaim_across(mi_bitmap_t bitmap, size_t bitmap_fields, size_t count, mi_bitmap_index_t bitmap_idx) {
-  size_t idx = mi_bitmap_index_field(bitmap_idx);
-  size_t pre_mask;
-  size_t mid_mask;
-  size_t post_mask;
-  size_t mid_count = mi_bitmap_mask_across(bitmap_idx, bitmap_fields, count, &pre_mask, &mid_mask, &post_mask);  
-  bool all_one = true;
-  mi_bitmap_field_t* field = &bitmap[idx];
-  size_t prev = mi_atomic_and_acq_rel(field++, ~pre_mask);
-  if ((prev & pre_mask) != pre_mask) all_one = false;
-  while(mid_count-- > 0) {
-    prev = mi_atomic_and_acq_rel(field++, ~mid_mask);
-    if ((prev & mid_mask) != mid_mask) all_one = false;
-  }
-  if (post_mask!=0) {
-    prev = mi_atomic_and_acq_rel(field, ~post_mask);
-    if ((prev & post_mask) != post_mask) all_one = false;
-  }
-  return all_one;  
-}
-
-// Set `count` bits at `bitmap_idx` to 1 atomically
-// Returns `true` if all `count` bits were 0 previously. `any_zero` is `true` if there was at least one zero bit.
-bool _mi_bitmap_claim_across(mi_bitmap_t bitmap, size_t bitmap_fields, size_t count, mi_bitmap_index_t bitmap_idx, bool* pany_zero) {
-  size_t idx = mi_bitmap_index_field(bitmap_idx);
-  size_t pre_mask;
-  size_t mid_mask;
-  size_t post_mask;
-  size_t mid_count = mi_bitmap_mask_across(bitmap_idx, bitmap_fields, count, &pre_mask, &mid_mask, &post_mask);
-  bool all_zero = true;
-  bool any_zero = false;
-  _Atomic(size_t)*field = &bitmap[idx];
-  size_t prev = mi_atomic_or_acq_rel(field++, pre_mask);
-  if ((prev & pre_mask) != 0) all_zero = false;
-  if ((prev & pre_mask) != pre_mask) any_zero = true;
-  while (mid_count-- > 0) {
-    prev = mi_atomic_or_acq_rel(field++, mid_mask);
-    if ((prev & mid_mask) != 0) all_zero = false;
-    if ((prev & mid_mask) != mid_mask) any_zero = true;
-  }
-  if (post_mask!=0) {
-    prev = mi_atomic_or_acq_rel(field, post_mask);
-    if ((prev & post_mask) != 0) all_zero = false;
-    if ((prev & post_mask) != post_mask) any_zero = true;
-  }
-  if (pany_zero != NULL) *pany_zero = any_zero;
-  return all_zero;
-}
-
-
-// Returns `true` if all `count` bits were 1. 
-// `any_ones` is `true` if there was at least one bit set to one.
-static bool mi_bitmap_is_claimedx_across(mi_bitmap_t bitmap, size_t bitmap_fields, size_t count, mi_bitmap_index_t bitmap_idx, bool* pany_ones) {
-  size_t idx = mi_bitmap_index_field(bitmap_idx);
-  size_t pre_mask;
-  size_t mid_mask;
-  size_t post_mask;
-  size_t mid_count = mi_bitmap_mask_across(bitmap_idx, bitmap_fields, count, &pre_mask, &mid_mask, &post_mask);
-  bool all_ones = true;
-  bool any_ones = false;
-  mi_bitmap_field_t* field = &bitmap[idx];
-  size_t prev = mi_atomic_load_relaxed(field++);
-  if ((prev & pre_mask) != pre_mask) all_ones = false;
-  if ((prev & pre_mask) != 0) any_ones = true;
-  while (mid_count-- > 0) {
-    prev = mi_atomic_load_relaxed(field++);
-    if ((prev & mid_mask) != mid_mask) all_ones = false;
-    if ((prev & mid_mask) != 0) any_ones = true;
-  }
-  if (post_mask!=0) {
-    prev = mi_atomic_load_relaxed(field);
-    if ((prev & post_mask) != post_mask) all_ones = false;
-    if ((prev & post_mask) != 0) any_ones = true;
-  }  
-  if (pany_ones != NULL) *pany_ones = any_ones;
-  return all_ones;
+
+/* --------------------------------------------------------------------------------
+  mi_bbitmap_try_find_and_clear -- used to find free pages
+  note: the compiler will fully inline the indirect function calls
+-------------------------------------------------------------------------------- */
+
+bool mi_bbitmap_try_find_and_clear(mi_bbitmap_t* bbitmap, size_t tseq, size_t* pidx) {
+  return mi_bbitmap_try_find_and_clear_generic(bbitmap, tseq, 1, pidx, &mi_bchunk_try_find_and_clear_1);
 }
 
-bool _mi_bitmap_is_claimed_across(mi_bitmap_t bitmap, size_t bitmap_fields, size_t count, mi_bitmap_index_t bitmap_idx) {
-  return mi_bitmap_is_claimedx_across(bitmap, bitmap_fields, count, bitmap_idx, NULL);
+bool mi_bbitmap_try_find_and_clear8(mi_bbitmap_t* bbitmap, size_t tseq, size_t* pidx) {
+  return mi_bbitmap_try_find_and_clear_generic(bbitmap, tseq, 8, pidx, &mi_bchunk_try_find_and_clear_8);
+}
+
+// bool mi_bbitmap_try_find_and_clearX(mi_bbitmap_t* bbitmap, size_t tseq, size_t* pidx) {
+//   return mi_bbitmap_try_find_and_clear_generic(bbitmap, tseq, MI_BFIELD_BITS, pidx, &mi_bchunk_try_find_and_clear_X);
+// }
+
+bool mi_bbitmap_try_find_and_clearNX(mi_bbitmap_t* bbitmap, size_t tseq, size_t n, size_t* pidx) {
+  mi_assert_internal(n<=MI_BFIELD_BITS);
+  return mi_bbitmap_try_find_and_clear_generic(bbitmap, tseq, n, pidx, &mi_bchunk_try_find_and_clearNX);
 }
 
-bool _mi_bitmap_is_any_claimed_across(mi_bitmap_t bitmap, size_t bitmap_fields, size_t count, mi_bitmap_index_t bitmap_idx) {
-  bool any_ones;
-  mi_bitmap_is_claimedx_across(bitmap, bitmap_fields, count, bitmap_idx, &any_ones);
-  return any_ones;
+bool mi_bbitmap_try_find_and_clearN_(mi_bbitmap_t* bbitmap, size_t tseq, size_t n, size_t* pidx) {
+  mi_assert_internal(n<=MI_BCHUNK_BITS);
+  return mi_bbitmap_try_find_and_clear_generic(bbitmap, tseq, n, pidx, &mi_bchunk_try_find_and_clearN_);
 }
diff --git a/depends/mimalloc/src/bitmap.h b/depends/mimalloc/src/bitmap.h
index 0c501ec1feac..b9c9dfb41b06 100644
--- a/depends/mimalloc/src/bitmap.h
+++ b/depends/mimalloc/src/bitmap.h
@@ -1,111 +1,330 @@
 /* ----------------------------------------------------------------------------
-Copyright (c) 2019-2020 Microsoft Research, Daan Leijen
+Copyright (c) 2019-2024 Microsoft Research, Daan Leijen
 This is free software; you can redistribute it and/or modify it under the
 terms of the MIT license. A copy of the license can be found in the file
 "LICENSE" at the root of this distribution.
 -----------------------------------------------------------------------------*/
 
 /* ----------------------------------------------------------------------------
-Concurrent bitmap that can set/reset sequences of bits atomically,
-represeted as an array of fields where each field is a machine word (`size_t`)
-
-There are two api's; the standard one cannot have sequences that cross
-between the bitmap fields (and a sequence must be <= MI_BITMAP_FIELD_BITS).
-(this is used in region allocation)
-
-The `_across` postfixed functions do allow sequences that can cross over
-between the fields. (This is used in arena allocation)
+Concurrent bitmap that can set/reset sequences of bits atomically
 ---------------------------------------------------------------------------- */
 #pragma once
 #ifndef MI_BITMAP_H
 #define MI_BITMAP_H
 
-/* -----------------------------------------------------------
-  Bitmap definition
------------------------------------------------------------ */
+/* --------------------------------------------------------------------------------
+  Atomic bitmaps with release/acquire guarantees:
+
+  `mi_bfield_t`: is a single machine word that can efficiently be bit counted (usually `size_t`)
+      each bit usually represents a single MI_ARENA_SLICE_SIZE in an arena (64 KiB).
+      We need 16K bits to represent a 1GiB arena.
+
+  `mi_bchunk_t`: a chunk of bfield's of a total of MI_BCHUNK_BITS (= 512 on 64-bit, 256 on 32-bit)
+      allocations never span across chunks -- so MI_ARENA_MAX_OBJ_SIZE is the number
+      of bits in a chunk times the MI_ARENA_SLICE_SIZE (512 * 64KiB = 32 MiB).
+      These chunks are cache-aligned and we can use AVX2/AVX512/NEON/SVE/SVE2/etc. instructions
+      to scan for bits (perhaps) more efficiently.
+
+      We allocate byte-sized ranges aligned to bytes in the bfield, and bfield-sized
+      ranges aligned to a bfield.
+
+    Searching linearly through the chunks would be too slow (16K bits per GiB).
+    Instead we add a "chunkmap" to do a two-level search (more or less a btree of depth 2).
+
+   `mi_bchunkmap_t` (== `mi_bchunk_t`): for each chunk we track if it has (potentially) any bit set.
+      The chunkmap has 1 bit per chunk that is set if the chunk potentially has a bit set.
+      This is used to avoid scanning every chunk. (and thus strictly an optimization)
+      It is conservative: it is fine to set a bit in the chunk map even if the chunk turns out
+      to have no bits set. It is also allowed to briefly have a clear bit even if the
+      chunk has bits set -- as long as we guarantee that the bit will be set later on;
+      (this allows us to set the chunkmap bit right after we set a bit in the corresponding chunk).
+
+      However, when we clear a bit in a chunk, and the chunk is indeed all clear, we
+      cannot safely clear the bit corresponding to the chunk in the chunkmap since it
+      may race with another thread setting a bit in the same chunk. Therefore, when
+      clearing, we first test if a chunk is clear, then clear the chunkmap bit, and
+      then test again to catch any set bits that we may have missed.
+
+      Since the chunkmap may thus be briefly out-of-sync, this means that we may sometimes
+      not find a free page even though it's there (but we accept this as we avoid taking
+      full locks). (Another way to do this is to use an epoch but we like to avoid that complexity
+      for now).
+
+   `mi_bitmap_t`: a bitmap with N chunks. A bitmap has a chunkmap of MI_BCHUNK_BITS (512)
+      and thus has at most 512 chunks (=2^18 bits x 64 KiB slices = 16 GiB max arena size).
+      The minimum is 1 chunk which is a 32 MiB arena.
+
+   For now, the implementation assumes MI_HAS_FAST_BITSCAN and uses trailing-zero-count
+   and pop-count (but we think it can be adapted work reasonably well on older hardware too)
+--------------------------------------------------------------------------------------------- */
+
+// A word-size bit field.
+typedef size_t mi_bfield_t;
+
+#define MI_BFIELD_BITS_SHIFT         (MI_SIZE_SHIFT+3)
+#define MI_BFIELD_BITS               (1 << MI_BFIELD_BITS_SHIFT)
+#define MI_BFIELD_SIZE               (MI_BFIELD_BITS/8)
+#define MI_BFIELD_LO_BIT8            (((~(mi_bfield_t)0))/0xFF)         // 0x01010101 ..
+#define MI_BFIELD_HI_BIT8            (MI_BFIELD_LO_BIT8 << 7)           // 0x80808080 ..
+
+#define MI_BCHUNK_SIZE               (MI_BCHUNK_BITS / 8)
+#define MI_BCHUNK_FIELDS             (MI_BCHUNK_BITS / MI_BFIELD_BITS)  // 8 on both 64- and 32-bit
+
+
+// some compiler (msvc in C mode) cannot have expressions in the alignment attribute
+#if MI_BCHUNK_SIZE==64
+#define mi_decl_bchunk_align  mi_decl_align(64)
+#elif MI_BCHUNK_SIZE==32
+#define mi_decl_bchunk_align  mi_decl_align(32)
+#else
+#define mi_decl_bchunk_align  mi_decl_align(MI_BCHUNK_SIZE)
+#endif
+ 
+
+// A bitmap chunk contains 512 bits on 64-bit  (256 on 32-bit)
+typedef mi_decl_bchunk_align struct mi_bchunk_s {
+  _Atomic(mi_bfield_t) bfields[MI_BCHUNK_FIELDS];
+} mi_bchunk_t;
+
+
+// The chunkmap has one bit per corresponding chunk that is set if the chunk potentially has bits set.
+// The chunkmap is itself a chunk.
+typedef mi_bchunk_t mi_bchunkmap_t;
+
+#define MI_BCHUNKMAP_BITS             MI_BCHUNK_BITS
+
+#define MI_BITMAP_MAX_CHUNK_COUNT     (MI_BCHUNKMAP_BITS)
+#define MI_BITMAP_MIN_CHUNK_COUNT     (1)
+#if MI_SIZE_BITS > 32
+#define MI_BITMAP_DEFAULT_CHUNK_COUNT     (64)  // 2 GiB on 64-bit -- this is for the page map
+#else
+#define MI_BITMAP_DEFAULT_CHUNK_COUNT      (1)
+#endif
+#define MI_BITMAP_MAX_BIT_COUNT       (MI_BITMAP_MAX_CHUNK_COUNT * MI_BCHUNK_BITS)  // 16 GiB arena
+#define MI_BITMAP_MIN_BIT_COUNT       (MI_BITMAP_MIN_CHUNK_COUNT * MI_BCHUNK_BITS)  // 32 MiB arena
+#define MI_BITMAP_DEFAULT_BIT_COUNT   (MI_BITMAP_DEFAULT_CHUNK_COUNT * MI_BCHUNK_BITS)  // 2 GiB arena
+
+
+// An atomic bitmap
+typedef mi_decl_bchunk_align struct mi_bitmap_s {
+  _Atomic(size_t)  chunk_count;         // total count of chunks (0 < N <= MI_BCHUNKMAP_BITS)
+  size_t           _padding[MI_BCHUNK_SIZE/MI_SIZE_SIZE - 1];    // suppress warning on msvc
+  mi_bchunkmap_t   chunkmap;
+  mi_bchunk_t      chunks[MI_BITMAP_DEFAULT_CHUNK_COUNT];        // usually dynamic MI_BITMAP_MAX_CHUNK_COUNT
+} mi_bitmap_t;
+
+
+static inline size_t mi_bitmap_chunk_count(const mi_bitmap_t* bitmap) {
+  return mi_atomic_load_relaxed(&((mi_bitmap_t*)bitmap)->chunk_count);
+}
+
+static inline size_t mi_bitmap_max_bits(const mi_bitmap_t* bitmap) {
+  return (mi_bitmap_chunk_count(bitmap) * MI_BCHUNK_BITS);
+}
+
+
+
+/* --------------------------------------------------------------------------------
+  Atomic bitmap operations
+-------------------------------------------------------------------------------- */
+
+// Many operations are generic over setting or clearing the bit sequence: we use `mi_xset_t` for this (true if setting, false if clearing)
+typedef bool  mi_xset_t;
+#define MI_BIT_SET    (true)
+#define MI_BIT_CLEAR  (false)
+
+
+// Required size of a bitmap to represent `bit_count` bits.
+size_t mi_bitmap_size(size_t bit_count, size_t* chunk_count);
+
+// Initialize a bitmap to all clear; avoid a mem_zero if `already_zero` is true
+// returns the size of the bitmap.
+size_t mi_bitmap_init(mi_bitmap_t* bitmap, size_t bit_count, bool already_zero);
+
+// Set/clear a sequence of `n` bits in the bitmap (and can cross chunks).
+// Not atomic so only use if still local to a thread.
+void mi_bitmap_unsafe_setN(mi_bitmap_t* bitmap, size_t idx, size_t n);
 
-#define MI_BITMAP_FIELD_BITS   (8*MI_SIZE_SIZE)
-#define MI_BITMAP_FIELD_FULL   (~((size_t)0))   // all bits set
 
-// An atomic bitmap of `size_t` fields
-typedef _Atomic(size_t)  mi_bitmap_field_t;
-typedef mi_bitmap_field_t*  mi_bitmap_t;
+// Set a bit in the bitmap; returns `true` if it atomically transitioned from 0 to 1
+bool mi_bitmap_set(mi_bitmap_t* bitmap, size_t idx);
 
-// A bitmap index is the index of the bit in a bitmap.
-typedef size_t mi_bitmap_index_t;
+// Clear a bit in the bitmap; returns `true` if it atomically transitioned from 1 to 0
+bool mi_bitmap_clear(mi_bitmap_t* bitmap, size_t idx);
 
-// Create a bit index.
-static inline mi_bitmap_index_t mi_bitmap_index_create(size_t idx, size_t bitidx) {
-  mi_assert_internal(bitidx < MI_BITMAP_FIELD_BITS);
-  return (idx*MI_BITMAP_FIELD_BITS) + bitidx;
+// Set a sequence of `n` bits in the bitmap; returns `true` if atomically transitioned from all 0's to 1's
+// `n` cannot cross chunk boundaries (and `n <= MI_BCHUNK_BITS`)!
+// If `already_set` is not NULL, it is set to count of bits were already all set.
+// (this is used for correct statistics if commiting over a partially committed area)
+bool mi_bitmap_setN(mi_bitmap_t* bitmap, size_t idx, size_t n, size_t* already_set);
+
+// Clear a sequence of `n` bits in the bitmap; returns `true` if atomically transitioned from all 1's to 0's
+// `n` cannot cross chunk boundaries (and `n <= MI_BCHUNK_BITS`)!
+bool mi_bitmap_clearN(mi_bitmap_t* bitmap, size_t idx, size_t n);
+
+
+// Is a sequence of n bits already all set/cleared?
+bool mi_bitmap_is_xsetN(mi_xset_t set, mi_bitmap_t* bitmap, size_t idx, size_t n);
+
+// Is a sequence of n bits already set?
+// (Used to check if a memory range is already committed)
+static inline bool mi_bitmap_is_setN(mi_bitmap_t* bitmap, size_t idx, size_t n) {
+  return mi_bitmap_is_xsetN(MI_BIT_SET, bitmap, idx, n);
+}
+
+// Is a sequence of n bits already clear?
+static inline bool mi_bitmap_is_clearN(mi_bitmap_t* bitmap, size_t idx, size_t n) {
+  return mi_bitmap_is_xsetN(MI_BIT_CLEAR, bitmap, idx, n);
+}
+
+static inline bool mi_bitmap_is_set(mi_bitmap_t* bitmap, size_t idx) {
+  return mi_bitmap_is_setN(bitmap, idx, 1);
+}
+
+static inline bool mi_bitmap_is_clear(mi_bitmap_t* bitmap, size_t idx) {
+  return mi_bitmap_is_clearN(bitmap, idx, 1);
+}
+
+// Called once a bit is cleared to see if the memory slice can be claimed.
+typedef bool (mi_claim_fun_t)(size_t slice_index, mi_arena_t* arena, mi_heaptag_t heap_tag, bool* keep_set);
+
+// Find a set bits in the bitmap, atomically clear it, and check if `claim` returns true.
+// If not claimed, continue on (potentially setting the bit again depending on `keep_set`).
+// Returns true on success, and in that case sets the index: `0 <= *pidx <= MI_BITMAP_MAX_BITS-n`.
+mi_decl_nodiscard bool mi_bitmap_try_find_and_claim(mi_bitmap_t* bitmap, size_t tseq, size_t* pidx,
+                                                    mi_claim_fun_t* claim, mi_arena_t* arena, mi_heaptag_t heap_tag );
+
+
+// Atomically clear a bit but only if it is set. Will block otherwise until the bit is set.
+// This is used to delay free-ing a page that it at the same time being considered to be
+// allocated from `mi_arena_try_abandoned` (and is in the `claim` function of `mi_bitmap_try_find_and_claim`).
+void mi_bitmap_clear_once_set(mi_bitmap_t* bitmap, size_t idx);
+
+
+// If a bit is set in the bitmap, return `true` and set `idx` to the index of the highest bit.
+// Otherwise return `false` (and `*idx` is undefined).
+// Used for unloading arena's
+bool mi_bitmap_bsr(mi_bitmap_t* bitmap, size_t* idx);
+
+// Return count of all set bits in a bitmap.
+size_t mi_bitmap_popcount(mi_bitmap_t* bitmap);
+
+
+typedef bool (mi_forall_set_fun_t)(size_t slice_index, size_t slice_count, mi_arena_t* arena, void* arg2);
+
+// Visit all set bits in a bitmap (`slice_count == 1`)
+bool _mi_bitmap_forall_set(mi_bitmap_t* bitmap, mi_forall_set_fun_t* visit, mi_arena_t* arena, void* arg);
+
+// Visit all set bits in a bitmap with larger ranges if possible (`slice_count >= 1`)
+bool _mi_bitmap_forall_setc_ranges(mi_bitmap_t* bitmap, mi_forall_set_fun_t* visit, mi_arena_t* arena, void* arg);
+
+
+// Count all set bits in given range in the bitmap. (cannot cross chunks)
+size_t mi_bitmap_popcountN( mi_bitmap_t* bitmap, size_t idx, size_t n);
+
+/* ----------------------------------------------------------------------------
+  Binned concurrent bitmap
+  Assigns a size class to each chunk such that small blocks don't cause too
+  much fragmentation since we keep chunks for larger blocks separate.
+---------------------------------------------------------------------------- */
+
+// mi_chunkbin_t is defined in mimalloc-stats.h
+
+static inline mi_chunkbin_t mi_chunkbin_inc(mi_chunkbin_t bbin) {
+  mi_assert_internal(bbin < MI_CBIN_COUNT);
+  return (mi_chunkbin_t)((int)bbin + 1);
 }
 
-// Create a bit index.
-static inline mi_bitmap_index_t mi_bitmap_index_create_from_bit(size_t full_bitidx) {  
-  return mi_bitmap_index_create(full_bitidx / MI_BITMAP_FIELD_BITS, full_bitidx % MI_BITMAP_FIELD_BITS);
+static inline mi_chunkbin_t mi_chunkbin_dec(mi_chunkbin_t bbin) {
+  mi_assert_internal(bbin > MI_CBIN_NONE);
+  return (mi_chunkbin_t)((int)bbin - 1);
 }
 
-// Get the field index from a bit index.
-static inline size_t mi_bitmap_index_field(mi_bitmap_index_t bitmap_idx) {
-  return (bitmap_idx / MI_BITMAP_FIELD_BITS);
+static inline mi_chunkbin_t mi_chunkbin_of(size_t slice_count) {
+  if (slice_count==1) return MI_CBIN_SMALL;
+  if (slice_count==8) return MI_CBIN_MEDIUM;
+  #if MI_ENABLE_LARGE_PAGES
+  if (slice_count==MI_BFIELD_BITS) return MI_CBIN_LARGE;
+  #endif
+  return MI_CBIN_OTHER;
 }
 
-// Get the bit index in a bitmap field
-static inline size_t mi_bitmap_index_bit_in_field(mi_bitmap_index_t bitmap_idx) {
-  return (bitmap_idx % MI_BITMAP_FIELD_BITS);
+// An atomic "binned" bitmap for the free slices where we keep chunks reserved for particalar size classes
+typedef mi_decl_bchunk_align struct mi_bbitmap_s {
+  _Atomic(size_t)  chunk_count;         // total count of chunks (0 < N <= MI_BCHUNKMAP_BITS)
+  _Atomic(size_t)  chunk_max_accessed;  // max chunk index that was once cleared or set
+  #if (MI_BCHUNK_SIZE / MI_SIZE_SIZE) > 2
+  size_t           _padding[MI_BCHUNK_SIZE/MI_SIZE_SIZE - 2];    // suppress warning on msvc by aligning manually
+  #endif
+  mi_bchunkmap_t   chunkmap;                                    
+  mi_bchunkmap_t   chunkmap_bins[MI_CBIN_COUNT - 1];             // chunkmaps with bit set if the chunk is in that size class (excluding MI_CBIN_NONE)  
+  mi_bchunk_t      chunks[MI_BITMAP_DEFAULT_CHUNK_COUNT];        // usually dynamic MI_BITMAP_MAX_CHUNK_COUNT
+} mi_bbitmap_t;
+
+
+static inline size_t mi_bbitmap_chunk_count(const mi_bbitmap_t* bbitmap) {
+  return mi_atomic_load_relaxed(&((mi_bbitmap_t*)bbitmap)->chunk_count);
 }
 
-// Get the full bit index
-static inline size_t mi_bitmap_index_bit(mi_bitmap_index_t bitmap_idx) {
-  return bitmap_idx;
+static inline size_t mi_bbitmap_max_bits(const mi_bbitmap_t* bbitmap) {
+  return (mi_bbitmap_chunk_count(bbitmap) * MI_BCHUNK_BITS);
 }
 
-/* -----------------------------------------------------------
-  Claim a bit sequence atomically
------------------------------------------------------------ */
+mi_chunkbin_t mi_bbitmap_debug_get_bin(const mi_bchunk_t* chunkmap_bins, size_t chunk_idx);
 
-// Try to atomically claim a sequence of `count` bits in a single
-// field at `idx` in `bitmap`. Returns `true` on success.
-bool _mi_bitmap_try_find_claim_field(mi_bitmap_t bitmap, size_t idx, const size_t count, mi_bitmap_index_t* bitmap_idx);
+size_t mi_bbitmap_size(size_t bit_count, size_t* chunk_count);
 
-// Starts at idx, and wraps around to search in all `bitmap_fields` fields.
-// For now, `count` can be at most MI_BITMAP_FIELD_BITS and will never cross fields.
-bool _mi_bitmap_try_find_from_claim(mi_bitmap_t bitmap, const size_t bitmap_fields, const size_t start_field_idx, const size_t count, mi_bitmap_index_t* bitmap_idx);
 
-// Like _mi_bitmap_try_find_from_claim but with an extra predicate that must be fullfilled
-typedef bool (mi_cdecl *mi_bitmap_pred_fun_t)(mi_bitmap_index_t bitmap_idx, void* pred_arg);
-bool _mi_bitmap_try_find_from_claim_pred(mi_bitmap_t bitmap, const size_t bitmap_fields, const size_t start_field_idx, const size_t count, mi_bitmap_pred_fun_t pred_fun, void* pred_arg, mi_bitmap_index_t* bitmap_idx);
+// Initialize a bitmap to all clear; avoid a mem_zero if `already_zero` is true
+// returns the size of the bitmap.
+size_t mi_bbitmap_init(mi_bbitmap_t* bbitmap, size_t bit_count, bool already_zero);
 
-// Set `count` bits at `bitmap_idx` to 0 atomically
-// Returns `true` if all `count` bits were 1 previously.
-bool _mi_bitmap_unclaim(mi_bitmap_t bitmap, size_t bitmap_fields, size_t count, mi_bitmap_index_t bitmap_idx);
+// Set/clear a sequence of `n` bits in the bitmap (and can cross chunks).
+// Not atomic so only use if still local to a thread.
+void mi_bbitmap_unsafe_setN(mi_bbitmap_t* bbitmap, size_t idx, size_t n);
 
-// Set `count` bits at `bitmap_idx` to 1 atomically
-// Returns `true` if all `count` bits were 0 previously. `any_zero` is `true` if there was at least one zero bit.
-bool _mi_bitmap_claim(mi_bitmap_t bitmap, size_t bitmap_fields, size_t count, mi_bitmap_index_t bitmap_idx, bool* any_zero);
 
-bool _mi_bitmap_is_claimed(mi_bitmap_t bitmap, size_t bitmap_fields, size_t count, mi_bitmap_index_t bitmap_idx);
-bool _mi_bitmap_is_any_claimed(mi_bitmap_t bitmap, size_t bitmap_fields, size_t count, mi_bitmap_index_t bitmap_idx);
+// Set a sequence of `n` bits in the bbitmap; returns `true` if atomically transitioned from all 0's to 1's
+// `n` cannot cross chunk boundaries (and `n <= MI_BCHUNK_BITS`)!
+bool mi_bbitmap_setN(mi_bbitmap_t* bbitmap, size_t idx, size_t n);
 
 
-//--------------------------------------------------------------------------
-// the `_across` functions work on bitmaps where sequences can cross over
-// between the fields. This is used in arena allocation
-//--------------------------------------------------------------------------
+// Is a sequence of n bits already all set/cleared?
+bool mi_bbitmap_is_xsetN(mi_xset_t set, mi_bbitmap_t* bbitmap, size_t idx, size_t n);
 
-// Find `count` bits of zeros and set them to 1 atomically; returns `true` on success.
-// Starts at idx, and wraps around to search in all `bitmap_fields` fields.
-bool _mi_bitmap_try_find_from_claim_across(mi_bitmap_t bitmap, const size_t bitmap_fields, const size_t start_field_idx, const size_t count, mi_bitmap_index_t* bitmap_idx);
+// Is a sequence of n bits already set?
+// (Used to check if a memory range is already committed)
+static inline bool mi_bbitmap_is_setN(mi_bbitmap_t* bbitmap, size_t idx, size_t n) {
+  return mi_bbitmap_is_xsetN(MI_BIT_SET, bbitmap, idx, n);
+}
 
-// Set `count` bits at `bitmap_idx` to 0 atomically
-// Returns `true` if all `count` bits were 1 previously.
-bool _mi_bitmap_unclaim_across(mi_bitmap_t bitmap, size_t bitmap_fields, size_t count, mi_bitmap_index_t bitmap_idx);
+// Is a sequence of n bits already clear?
+static inline bool mi_bbitmap_is_clearN(mi_bbitmap_t* bbitmap, size_t idx, size_t n) {
+  return mi_bbitmap_is_xsetN(MI_BIT_CLEAR, bbitmap, idx, n);
+}
 
-// Set `count` bits at `bitmap_idx` to 1 atomically
-// Returns `true` if all `count` bits were 0 previously. `any_zero` is `true` if there was at least one zero bit.
-bool _mi_bitmap_claim_across(mi_bitmap_t bitmap, size_t bitmap_fields, size_t count, mi_bitmap_index_t bitmap_idx, bool* pany_zero);
 
-bool _mi_bitmap_is_claimed_across(mi_bitmap_t bitmap, size_t bitmap_fields, size_t count, mi_bitmap_index_t bitmap_idx);
-bool _mi_bitmap_is_any_claimed_across(mi_bitmap_t bitmap, size_t bitmap_fields, size_t count, mi_bitmap_index_t bitmap_idx);
+// Try to atomically transition `n` bits from all set to all clear. Returns `true` on succes.
+// `n` cannot cross chunk boundaries, where `n <= MI_CHUNK_BITS`.
+bool mi_bbitmap_try_clearN(mi_bbitmap_t* bbitmap, size_t idx, size_t n);
 
-#endif
+// Specialized versions for common bit sequence sizes
+bool mi_bbitmap_try_find_and_clear(mi_bbitmap_t* bbitmap, size_t tseq, size_t* pidx);  // 1-bit
+bool mi_bbitmap_try_find_and_clear8(mi_bbitmap_t* bbitmap, size_t tseq, size_t* pidx); // 8-bits
+// bool mi_bbitmap_try_find_and_clearX(mi_bbitmap_t* bbitmap, size_t tseq, size_t* pidx); // MI_BFIELD_BITS
+bool mi_bbitmap_try_find_and_clearNX(mi_bbitmap_t* bbitmap, size_t n, size_t tseq, size_t* pidx); // < MI_BFIELD_BITS
+bool mi_bbitmap_try_find_and_clearN_(mi_bbitmap_t* bbitmap, size_t n, size_t tseq, size_t* pidx); // > MI_BFIELD_BITS <= MI_BCHUNK_BITS
+
+// Find a sequence of `n` bits in the bbitmap with all bits set, and try to atomically clear all.
+// Returns true on success, and in that case sets the index: `0 <= *pidx <= MI_BITMAP_MAX_BITS-n`.
+mi_decl_nodiscard static inline bool mi_bbitmap_try_find_and_clearN(mi_bbitmap_t* bbitmap, size_t n, size_t tseq, size_t* pidx) {
+  if (n==1) return mi_bbitmap_try_find_and_clear(bbitmap, tseq, pidx);               // small pages
+  if (n==8) return mi_bbitmap_try_find_and_clear8(bbitmap, tseq, pidx);              // medium pages
+  // if (n==MI_BFIELD_BITS) return mi_bbitmap_try_find_and_clearX(bbitmap, tseq, pidx); // large pages
+  if (n==0 || n>MI_BCHUNK_BITS) return false;  // cannot be more than a chunk
+  if (n<=MI_BFIELD_BITS) return mi_bbitmap_try_find_and_clearNX(bbitmap, tseq, n, pidx);
+  return mi_bbitmap_try_find_and_clearN_(bbitmap, tseq, n, pidx);
+}
+
+
+#endif // MI_BITMAP_H
diff --git a/depends/mimalloc/src/free.c b/depends/mimalloc/src/free.c
new file mode 100644
index 000000000000..40e813809336
--- /dev/null
+++ b/depends/mimalloc/src/free.c
@@ -0,0 +1,577 @@
+/* ----------------------------------------------------------------------------
+Copyright (c) 2018-2024, Microsoft Research, Daan Leijen
+This is free software; you can redistribute it and/or modify it under the
+terms of the MIT license. A copy of the license can be found in the file
+"LICENSE" at the root of this distribution.
+-----------------------------------------------------------------------------*/
+#if !defined(MI_IN_ALLOC_C)
+#error "this file should be included from 'alloc.c' (so aliases can work from alloc-override)"
+// add includes help an IDE
+#include "mimalloc.h"
+#include "mimalloc/internal.h"
+#include "mimalloc/prim.h"   // _mi_prim_thread_id()
+#endif
+
+// forward declarations
+static void   mi_check_padding(const mi_page_t* page, const mi_block_t* block);
+static bool   mi_check_is_double_free(const mi_page_t* page, const mi_block_t* block);
+static size_t mi_page_usable_size_of(const mi_page_t* page, const mi_block_t* block);
+static void   mi_stat_free(const mi_page_t* page, const mi_block_t* block);
+
+
+// ------------------------------------------------------
+// Free
+// ------------------------------------------------------
+
+// regular free of a (thread local) block pointer
+// fast path written carefully to prevent spilling on the stack
+static inline void mi_free_block_local(mi_page_t* page, mi_block_t* block, bool track_stats, bool check_full)
+{
+  // checks
+  if mi_unlikely(mi_check_is_double_free(page, block)) return;
+  mi_check_padding(page, block);
+  if (track_stats) { mi_stat_free(page, block); }
+  #if (MI_DEBUG>0) && !MI_TRACK_ENABLED  && !MI_TSAN && !MI_GUARDED
+  memset(block, MI_DEBUG_FREED, mi_page_block_size(page));
+  #endif
+  if (track_stats) { mi_track_free_size(block, mi_page_usable_size_of(page, block)); } // faster then mi_usable_size as we already know the page and that p is unaligned
+
+  // actual free: push on the local free list
+  mi_block_set_next(page, block, page->local_free);
+  page->local_free = block;
+  if mi_unlikely(--page->used == 0) {
+    _mi_page_retire(page);
+  }
+  else if mi_unlikely(check_full && mi_page_is_in_full(page)) {
+    _mi_page_unfull(page);
+  }
+}
+
+// Forward declaration for multi-threaded collect
+static void mi_decl_noinline mi_free_try_collect_mt(mi_page_t* page, mi_block_t* mt_free) mi_attr_noexcept;
+
+// Free a block multi-threaded
+static inline void mi_free_block_mt(mi_page_t* page, mi_block_t* block) mi_attr_noexcept
+{
+  // adjust stats (after padding check and potentially recursive `mi_free` above)
+  mi_stat_free(page, block);    // stat_free may access the padding
+  mi_track_free_size(block, mi_page_usable_size_of(page, block));
+
+  // _mi_padding_shrink(page, block, sizeof(mi_block_t));
+#if (MI_DEBUG>0) && !MI_TRACK_ENABLED  && !MI_TSAN       // note: when tracking, cannot use mi_usable_size with multi-threading
+  size_t dbgsize = mi_usable_size(block);
+  if (dbgsize > MI_MiB) { dbgsize = MI_MiB; }
+  _mi_memset_aligned(block, MI_DEBUG_FREED, dbgsize);
+#endif
+
+  // push atomically on the page thread free list
+  mi_thread_free_t tf_new;
+  mi_thread_free_t tf_old = mi_atomic_load_relaxed(&page->xthread_free);
+  do {
+    mi_block_set_next(page, block, mi_tf_block(tf_old));
+    tf_new = mi_tf_create(block, true /* always use owned: try to claim it if the page is abandoned */);
+  } while (!mi_atomic_cas_weak_acq_rel(&page->xthread_free, &tf_old, tf_new)); // todo: release is enough?
+
+  // and atomically try to collect the page if it was abandoned
+  const bool is_owned_now = !mi_tf_is_owned(tf_old);
+  if (is_owned_now) {
+    mi_assert_internal(mi_page_is_abandoned(page));
+    mi_free_try_collect_mt(page,block);
+  }
+}
+
+
+// Adjust a block that was allocated aligned, to the actual start of the block in the page.
+// note: this can be called from `mi_free_generic_mt` where a non-owning thread accesses the
+// `page_start` and `block_size` fields; however these are constant and the page won't be
+// deallocated (as the block we are freeing keeps it alive) and thus safe to read concurrently.
+mi_block_t* _mi_page_ptr_unalign(const mi_page_t* page, const void* p) {
+  mi_assert_internal(page!=NULL && p!=NULL);
+
+  size_t diff = (uint8_t*)p - mi_page_start(page);
+  size_t adjust;
+  if mi_likely(page->block_size_shift != 0) {
+    adjust = diff & (((size_t)1 << page->block_size_shift) - 1);
+  }
+  else {
+    adjust = diff % mi_page_block_size(page);
+  }
+
+  return (mi_block_t*)((uintptr_t)p - adjust);
+}
+
+// forward declaration for a MI_GUARDED build
+#if MI_GUARDED
+static void mi_block_unguard(mi_page_t* page, mi_block_t* block, void* p); // forward declaration
+static inline void mi_block_check_unguard(mi_page_t* page, mi_block_t* block, void* p) {
+  if (mi_block_ptr_is_guarded(block, p)) { mi_block_unguard(page, block, p); }
+}
+#else
+static inline void mi_block_check_unguard(mi_page_t* page, mi_block_t* block, void* p) {
+  MI_UNUSED(page); MI_UNUSED(block); MI_UNUSED(p);
+}
+#endif
+
+
+// free a local pointer  (page parameter comes first for better codegen)
+static void mi_decl_noinline mi_free_generic_local(mi_page_t* page, void* p) mi_attr_noexcept {
+  mi_assert_internal(p!=NULL && page != NULL);
+  mi_block_t* const block = (mi_page_has_aligned(page) ? _mi_page_ptr_unalign(page, p) : (mi_block_t*)p);
+  mi_block_check_unguard(page, block, p);
+  mi_free_block_local(page, block, true /* track stats */, true /* check for a full page */);
+}
+
+// free a pointer owned by another thread (page parameter comes first for better codegen)
+static void mi_decl_noinline mi_free_generic_mt(mi_page_t* page, void* p) mi_attr_noexcept {
+  mi_assert_internal(p!=NULL && page != NULL);
+  mi_block_t* const block = _mi_page_ptr_unalign(page, p); // don't check `has_aligned` flag to avoid a race (issue #865)
+  mi_block_check_unguard(page, block, p);
+  mi_free_block_mt(page, block);
+}
+
+// generic free (for runtime integration)
+void mi_decl_noinline _mi_free_generic(mi_page_t* page, bool is_local, void* p) mi_attr_noexcept {
+  if (is_local) mi_free_generic_local(page,p);
+           else mi_free_generic_mt(page,p);
+}
+
+
+// Get the page belonging to a pointer
+// Does further checks in debug mode to see if this was a valid pointer.
+static inline mi_page_t* mi_validate_ptr_page(const void* p, const char* msg)
+{
+  MI_UNUSED_RELEASE(msg);
+  #if MI_DEBUG
+  if mi_unlikely(((uintptr_t)p & (MI_INTPTR_SIZE - 1)) != 0 && !mi_option_is_enabled(mi_option_guarded_precise)) {
+    _mi_error_message(EINVAL, "%s: invalid (unaligned) pointer: %p\n", msg, p);
+    return NULL;
+  }
+  mi_page_t* page = _mi_safe_ptr_page(p);
+  if (p != NULL && page == NULL) {
+    _mi_error_message(EINVAL, "%s: invalid pointer: %p\n", msg, p);
+  }
+  return page;
+  #else
+  return _mi_ptr_page(p);
+  #endif
+}
+
+// Free a block
+// Fast path written carefully to prevent register spilling on the stack
+void mi_free(void* p) mi_attr_noexcept
+{
+  mi_page_t* const page = mi_validate_ptr_page(p,"mi_free");
+  if mi_unlikely(page==NULL) return;  // page will be NULL if p==NULL
+  mi_assert_internal(p!=NULL && page!=NULL);
+
+  const mi_threadid_t xtid = (_mi_prim_thread_id() ^ mi_page_xthread_id(page));
+  if mi_likely(xtid == 0) {                        // `tid == mi_page_thread_id(page) && mi_page_flags(page) == 0`
+    // thread-local, aligned, and not a full page
+    mi_block_t* const block = (mi_block_t*)p;
+    mi_free_block_local(page, block, true /* track stats */, false /* no need to check if the page is full */);
+  }
+  else if (xtid <= MI_PAGE_FLAG_MASK) {            // `tid == mi_page_thread_id(page) && mi_page_flags(page) != 0`
+    // page is local, but is full or contains (inner) aligned blocks; use generic path
+    mi_free_generic_local(page, p);
+  }
+  // free-ing in a page owned by a heap in another thread, or an abandoned page (not belonging to a heap)
+  else if ((xtid & MI_PAGE_FLAG_MASK) == 0) {      // `tid != mi_page_thread_id(page) && mi_page_flags(page) == 0`
+    // blocks are aligned (and not a full page); push on the thread_free list
+    mi_block_t* const block = (mi_block_t*)p;
+    mi_free_block_mt(page,block);
+  }
+  else {
+    // page is full or contains (inner) aligned blocks; use generic multi-thread path
+    mi_free_generic_mt(page, p);
+  }
+}
+
+
+// ------------------------------------------------------
+// Multi-threaded Free (`_mt`)
+// ------------------------------------------------------
+static bool mi_page_unown_from_free(mi_page_t* page, mi_block_t* mt_free);
+
+static inline bool mi_page_queue_len_is_atmost( mi_heap_t* heap, size_t block_size, long atmost) {
+  mi_page_queue_t* const pq = mi_page_queue(heap,block_size);
+  mi_assert_internal(pq!=NULL);
+  return (pq->count <= (size_t)atmost);  
+}
+
+static void mi_decl_noinline mi_free_try_collect_mt(mi_page_t* page, mi_block_t* mt_free) mi_attr_noexcept {
+  mi_assert_internal(mi_page_is_owned(page));
+  mi_assert_internal(mi_page_is_abandoned(page));
+
+  // we own the page now..
+  // safe to collect the thread atomic free list
+  // use the `_partly` version to avoid atomic operations since we already have the `mt_free` pointing into the thread free list
+  _mi_page_free_collect_partly(page, mt_free);
+
+  #if MI_DEBUG > 1
+  if (mi_page_is_singleton(page)) { mi_assert_internal(mi_page_all_free(page)); }
+  #endif
+
+  // 1. free if the page is free now  (this is updated by `_mi_page_free_collect_partly`)
+  if (mi_page_all_free(page))
+  {
+    // first remove it from the abandoned pages in the arena (if mapped, this might wait for any readers to finish)
+    _mi_arenas_page_unabandon(page);
+    // we can free the page directly
+    _mi_arenas_page_free(page,NULL);
+    return;
+  }
+
+  // 2. we can try to reclaim the page for ourselves
+  // note: reclaiming can improve benchmarks like `larson` or `rbtree-ck` a lot even in the single-threaded case,
+  // since free-ing from an owned page avoids atomic operations. However, if we reclaim too eagerly in 
+  // a multi-threaded scenario we may start to hold on to too much memory and reduce reuse among threads.
+  // If the current heap is where the page originally came from, we reclaim much more eagerly while
+  // 'cross-thread' reclaiming on free is by default off (and we only 'reclaim' these by finding the abandoned 
+  // pages when we allocate a fresh page).
+  if (page->block_size <= MI_SMALL_MAX_OBJ_SIZE)       // only for small sized blocks
+  {
+    const long reclaim_on_free = _mi_option_get_fast(mi_option_page_reclaim_on_free);
+    if (reclaim_on_free >= 0) {                        // and reclaiming is allowed
+      // get our heap (with the right tag)
+      // note: don't use `mi_heap_get_default()` as we may just have terminated this thread and we should
+      // not reinitialize the heap for this thread. (can happen due to thread-local destructors for example -- issue #944)
+      mi_heap_t* heap = mi_prim_get_default_heap();
+      if (heap != page->heap) {
+        if (mi_heap_is_initialized(heap)) {
+          heap = _mi_heap_by_tag(heap, page->heap_tag);
+        }
+      }
+      // can we reclaim into this heap?      
+      if (heap != NULL && heap->allow_page_reclaim)      
+      {
+        long max_reclaim = 0;
+        if mi_likely(heap == page->heap) {  // did this page originate from the current heap?
+          // originating heap
+          max_reclaim = _mi_option_get_fast(heap->tld->is_in_threadpool ? mi_option_page_cross_thread_max_reclaim : mi_option_page_max_reclaim);          
+        }
+        else if (reclaim_on_free == 1 &&              // if cross-thread is allowed
+                 !heap->tld->is_in_threadpool &&      // and we are not part of a threadpool
+                 !mi_page_is_used_at_frac(page,8) &&  // and the page is not too full
+                 _mi_arena_memid_is_suitable(page->memid, heap->exclusive_arena)) {   // and it fits our memory
+          // across threads
+          max_reclaim = _mi_option_get_fast(mi_option_page_cross_thread_max_reclaim);
+        }
+        
+        if (max_reclaim < 0 || mi_page_queue_len_is_atmost(heap, page->block_size, max_reclaim)) { // are we within the reclaim limit?
+          // reclaim the page into this heap
+          // first remove it from the abandoned pages in the arena -- this might wait for any readers to finish
+          _mi_arenas_page_unabandon(page);
+          _mi_heap_page_reclaim(heap, page);
+          mi_heap_stat_counter_increase(heap, pages_reclaim_on_free, 1);
+          return;
+        }
+      }
+    }
+  }
+
+  // 3. if the page is unmapped, try to reabandon so it can possibly be mapped and found for allocations
+  if (!mi_page_is_used_at_frac(page, 8) &&  // only reabandon if a full page starts to have enough blocks available to prevent immediate re-abandon of a full page
+      !mi_page_is_abandoned_mapped(page) && page->memid.memkind == MI_MEM_ARENA &&
+      _mi_arenas_page_try_reabandon_to_mapped(page))
+  {
+    return;
+  }
+
+
+  // not reclaimed or free'd, unown again
+  // _mi_page_unown(page);
+  mi_page_unown_from_free(page, mt_free);
+}
+
+
+// release ownership of a page. This may free the page if all (other) blocks were concurrently
+// freed in the meantime. Returns true if the page was freed.
+// This is a specialized version of `mi_page_unown` to (try to) avoid calling `mi_page_free_collect` again.
+static bool mi_page_unown_from_free(mi_page_t* page, mi_block_t* mt_free) {
+  mi_assert_internal(mi_page_is_owned(page));
+  mi_assert_internal(mi_page_is_abandoned(page));
+  mi_assert_internal(mt_free != NULL);
+  mi_assert_internal(page->used > 1);
+  mi_thread_free_t tf_expect = mi_tf_create(mt_free, true);
+  mi_thread_free_t tf_new    = mi_tf_create(mt_free, false);
+  while mi_unlikely(!mi_atomic_cas_weak_acq_rel(&page->xthread_free, &tf_expect, tf_new)) {
+    mi_assert_internal(mi_tf_is_owned(tf_expect));
+    while (mi_tf_block(tf_expect) != NULL) {
+      _mi_page_free_collect(page,false);  // update used
+      if (mi_page_all_free(page)) {   // it may become free just before unowning it
+        _mi_arenas_page_unabandon(page);
+        _mi_arenas_page_free(page,NULL);
+        return true;
+      }
+      tf_expect = mi_atomic_load_relaxed(&page->xthread_free);
+    }
+    mi_assert_internal(mi_tf_block(tf_expect)==NULL);
+    tf_new = mi_tf_create(NULL, false);
+  }
+  return false;
+}
+
+
+// ------------------------------------------------------
+// Usable size
+// ------------------------------------------------------
+
+// Bytes available in a block
+static size_t mi_decl_noinline mi_page_usable_aligned_size_of(const mi_page_t* page, const void* p) mi_attr_noexcept {
+  const mi_block_t* block = _mi_page_ptr_unalign(page, p);
+  const size_t size = mi_page_usable_size_of(page, block);
+  const ptrdiff_t adjust = (uint8_t*)p - (uint8_t*)block;
+  mi_assert_internal(adjust >= 0 && (size_t)adjust <= size);
+  const size_t aligned_size = (size - adjust);
+  #if MI_GUARDED
+  if (mi_block_ptr_is_guarded(block, p)) {
+    return aligned_size - _mi_os_page_size();
+  }
+  #endif
+  return aligned_size;
+}
+
+static inline size_t _mi_usable_size(const void* p, const char* msg) mi_attr_noexcept {
+  const mi_page_t* const page = mi_validate_ptr_page(p,msg);
+  if mi_unlikely(page==NULL) return 0;
+  if mi_likely(!mi_page_has_aligned(page)) {
+    const mi_block_t* block = (const mi_block_t*)p;
+    return mi_page_usable_size_of(page, block);
+  }
+  else {
+    // split out to separate routine for improved code generation
+    return mi_page_usable_aligned_size_of(page, p);
+  }
+}
+
+mi_decl_nodiscard size_t mi_usable_size(const void* p) mi_attr_noexcept {
+  return _mi_usable_size(p, "mi_usable_size");
+}
+
+
+// ------------------------------------------------------
+// Free variants
+// ------------------------------------------------------
+
+void mi_free_size(void* p, size_t size) mi_attr_noexcept {
+  MI_UNUSED_RELEASE(size);
+  #if MI_DEBUG
+  const size_t available = _mi_usable_size(p,"mi_free_size");
+  mi_assert(p == NULL || size <= available || available == 0 /* invalid pointer */ );
+  #endif
+  mi_free(p);
+}
+
+void mi_free_size_aligned(void* p, size_t size, size_t alignment) mi_attr_noexcept {
+  MI_UNUSED_RELEASE(alignment);
+  mi_assert(((uintptr_t)p % alignment) == 0);
+  mi_free_size(p,size);
+}
+
+void mi_free_aligned(void* p, size_t alignment) mi_attr_noexcept {
+  MI_UNUSED_RELEASE(alignment);
+  mi_assert(((uintptr_t)p % alignment) == 0);
+  mi_free(p);
+}
+
+
+// ------------------------------------------------------
+// Check for double free in secure and debug mode
+// This is somewhat expensive so only enabled for secure mode 4
+// ------------------------------------------------------
+
+#if (MI_ENCODE_FREELIST && (MI_SECURE>=4 || MI_DEBUG!=0))
+// linear check if the free list contains a specific element
+static bool mi_list_contains(const mi_page_t* page, const mi_block_t* list, const mi_block_t* elem) {
+  while (list != NULL) {
+    if (elem==list) return true;
+    list = mi_block_next(page, list);
+  }
+  return false;
+}
+
+static mi_decl_noinline bool mi_check_is_double_freex(const mi_page_t* page, const mi_block_t* block) {
+  // The decoded value is in the same page (or NULL).
+  // Walk the free lists to verify positively if it is already freed
+  if (mi_list_contains(page, page->free, block) ||
+      mi_list_contains(page, page->local_free, block) ||
+      mi_list_contains(page, mi_page_thread_free(page), block))
+  {
+    _mi_error_message(EAGAIN, "double free detected of block %p with size %zu\n", block, mi_page_block_size(page));
+    return true;
+  }
+  return false;
+}
+
+#define mi_track_page(page,access)  { size_t psize; void* pstart = _mi_page_start(_mi_page_segment(page),page,&psize); mi_track_mem_##access( pstart, psize); }
+
+static inline bool mi_check_is_double_free(const mi_page_t* page, const mi_block_t* block) {
+  bool is_double_free = false;
+  mi_block_t* n = mi_block_nextx(page, block, page->keys); // pretend it is freed, and get the decoded first field
+  if (((uintptr_t)n & (MI_INTPTR_SIZE-1))==0 &&  // quick check: aligned pointer?
+      (n==NULL || mi_is_in_same_page(block, n))) // quick check: in same page or NULL?
+  {
+    // Suspicious: decoded value a in block is in the same page (or NULL) -- maybe a double free?
+    // (continue in separate function to improve code generation)
+    is_double_free = mi_check_is_double_freex(page, block);
+  }
+  return is_double_free;
+}
+#else
+static inline bool mi_check_is_double_free(const mi_page_t* page, const mi_block_t* block) {
+  MI_UNUSED(page);
+  MI_UNUSED(block);
+  return false;
+}
+#endif
+
+
+// ---------------------------------------------------------------------------
+// Check for heap block overflow by setting up padding at the end of the block
+// ---------------------------------------------------------------------------
+
+#if MI_PADDING // && !MI_TRACK_ENABLED
+static bool mi_page_decode_padding(const mi_page_t* page, const mi_block_t* block, size_t* delta, size_t* bsize) {
+  *bsize = mi_page_usable_block_size(page);
+  const mi_padding_t* const padding = (mi_padding_t*)((uint8_t*)block + *bsize);
+  mi_track_mem_defined(padding,sizeof(mi_padding_t));
+  *delta = padding->delta;
+  uint32_t canary = padding->canary;
+  uintptr_t keys[2];
+  keys[0] = page->keys[0];
+  keys[1] = page->keys[1];
+  bool ok = (mi_ptr_encode_canary(page,block,keys) == canary && *delta <= *bsize);
+  mi_track_mem_noaccess(padding,sizeof(mi_padding_t));
+  return ok;
+}
+
+// Return the exact usable size of a block.
+static size_t mi_page_usable_size_of(const mi_page_t* page, const mi_block_t* block) {
+  size_t bsize;
+  size_t delta;
+  bool ok = mi_page_decode_padding(page, block, &delta, &bsize);
+  mi_assert_internal(ok); mi_assert_internal(delta <= bsize);
+  return (ok ? bsize - delta : 0);
+}
+
+// When a non-thread-local block is freed, it becomes part of the thread delayed free
+// list that is freed later by the owning heap. If the exact usable size is too small to
+// contain the pointer for the delayed list, then shrink the padding (by decreasing delta)
+// so it will later not trigger an overflow error in `mi_free_block`.
+void _mi_padding_shrink(const mi_page_t* page, const mi_block_t* block, const size_t min_size) {
+  size_t bsize;
+  size_t delta;
+  bool ok = mi_page_decode_padding(page, block, &delta, &bsize);
+  mi_assert_internal(ok);
+  if (!ok || (bsize - delta) >= min_size) return;  // usually already enough space
+  mi_assert_internal(bsize >= min_size);
+  if (bsize < min_size) return;  // should never happen
+  size_t new_delta = (bsize - min_size);
+  mi_assert_internal(new_delta < bsize);
+  mi_padding_t* padding = (mi_padding_t*)((uint8_t*)block + bsize);
+  mi_track_mem_defined(padding,sizeof(mi_padding_t));
+  padding->delta = (uint32_t)new_delta;
+  mi_track_mem_noaccess(padding,sizeof(mi_padding_t));
+}
+#else
+static size_t mi_page_usable_size_of(const mi_page_t* page, const mi_block_t* block) {
+  MI_UNUSED(block);
+  return mi_page_usable_block_size(page);
+}
+
+void _mi_padding_shrink(const mi_page_t* page, const mi_block_t* block, const size_t min_size) {
+  MI_UNUSED(page);
+  MI_UNUSED(block);
+  MI_UNUSED(min_size);
+}
+#endif
+
+#if MI_PADDING && MI_PADDING_CHECK
+
+static bool mi_verify_padding(const mi_page_t* page, const mi_block_t* block, size_t* size, size_t* wrong) {
+  size_t bsize;
+  size_t delta;
+  bool ok = mi_page_decode_padding(page, block, &delta, &bsize);
+  *size = *wrong = bsize;
+  if (!ok) return false;
+  mi_assert_internal(bsize >= delta);
+  *size = bsize - delta;
+  if (!mi_page_is_huge(page)) {
+    uint8_t* fill = (uint8_t*)block + bsize - delta;
+    const size_t maxpad = (delta > MI_MAX_ALIGN_SIZE ? MI_MAX_ALIGN_SIZE : delta); // check at most the first N padding bytes
+    mi_track_mem_defined(fill, maxpad);
+    for (size_t i = 0; i < maxpad; i++) {
+      if (fill[i] != MI_DEBUG_PADDING) {
+        *wrong = bsize - delta + i;
+        ok = false;
+        break;
+      }
+    }
+    mi_track_mem_noaccess(fill, maxpad);
+  }
+  return ok;
+}
+
+static void mi_check_padding(const mi_page_t* page, const mi_block_t* block) {
+  size_t size;
+  size_t wrong;
+  if (!mi_verify_padding(page,block,&size,&wrong)) {
+    _mi_error_message(EFAULT, "buffer overflow in heap block %p of size %zu: write after %zu bytes\n", block, size, wrong );
+  }
+}
+
+#else
+
+static void mi_check_padding(const mi_page_t* page, const mi_block_t* block) {
+  MI_UNUSED(page);
+  MI_UNUSED(block);
+}
+
+#endif
+
+// only maintain stats for smaller objects if requested
+#if (MI_STAT>0)
+static void mi_stat_free(const mi_page_t* page, const mi_block_t* block) {
+  MI_UNUSED(block);
+  mi_heap_t* const heap = mi_heap_get_default();
+  const size_t bsize = mi_page_usable_block_size(page);
+  // #if (MI_STAT>1)
+  // const size_t usize = mi_page_usable_size_of(page, block);
+  // mi_heap_stat_decrease(heap, malloc_requested, usize);
+  // #endif
+  if (bsize <= MI_LARGE_MAX_OBJ_SIZE) {
+    mi_heap_stat_decrease(heap, malloc_normal, bsize);
+    #if (MI_STAT > 1)
+    mi_heap_stat_decrease(heap, malloc_bins[_mi_bin(bsize)], 1);
+    #endif
+  }
+  else {
+    const size_t bpsize = mi_page_block_size(page);  // match stat in page.c:mi_huge_page_alloc
+    mi_heap_stat_decrease(heap, malloc_huge, bpsize);
+  }
+}
+#else
+void mi_stat_free(const mi_page_t* page, const mi_block_t* block) {
+  MI_UNUSED(page); MI_UNUSED(block);
+}
+#endif
+
+
+// Remove guard page when building with MI_GUARDED
+#if MI_GUARDED
+static void mi_block_unguard(mi_page_t* page, mi_block_t* block, void* p) {
+  MI_UNUSED(p);
+  mi_assert_internal(mi_block_ptr_is_guarded(block, p));
+  mi_assert_internal(mi_page_has_aligned(page));
+  mi_assert_internal((uint8_t*)p - (uint8_t*)block >= (ptrdiff_t)sizeof(mi_block_t));
+  mi_assert_internal(block->next == MI_BLOCK_TAG_GUARDED);
+
+  const size_t bsize = mi_page_block_size(page);
+  const size_t psize = _mi_os_page_size();
+  mi_assert_internal(bsize > psize);
+  mi_assert_internal(!page->memid.is_pinned);
+  void* gpage = (uint8_t*)block + bsize - psize;
+  mi_assert_internal(_mi_is_aligned(gpage, psize));
+  _mi_os_unprotect(gpage, psize);
+}
+#endif
diff --git a/depends/mimalloc/src/heap.c b/depends/mimalloc/src/heap.c
index 15ca360312f1..fb0a6c9d379f 100644
--- a/depends/mimalloc/src/heap.c
+++ b/depends/mimalloc/src/heap.c
@@ -6,10 +6,8 @@ terms of the MIT license. A copy of the license can be found in the file
 -----------------------------------------------------------------------------*/
 
 #include "mimalloc.h"
-#include "mimalloc-internal.h"
-#include "mimalloc-atomic.h"
-
-#include <string.h>  // memset, memcpy
+#include "mimalloc/internal.h"
+#include "mimalloc/prim.h"  // mi_prim_get_default_heap
 
 #if defined(_MSC_VER) && (_MSC_VER < 1920)
 #pragma warning(disable:4204)  // non-constant aggregate initializer
@@ -30,15 +28,18 @@ static bool mi_heap_visit_pages(mi_heap_t* heap, heap_page_visitor_fun* fn, void
   // visit all pages
   #if MI_DEBUG>1
   size_t total = heap->page_count;
-  #endif
   size_t count = 0;
+  #endif
+
   for (size_t i = 0; i <= MI_BIN_FULL; i++) {
     mi_page_queue_t* pq = &heap->pages[i];
     mi_page_t* page = pq->first;
     while(page != NULL) {
       mi_page_t* next = page->next; // save next in case the page gets removed from the queue
       mi_assert_internal(mi_page_heap(page) == heap);
+      #if MI_DEBUG>1
       count++;
+      #endif
       if (!fn(heap, pq, page, arg1, arg2)) return false;
       page = next; // and continue
     }
@@ -54,8 +55,6 @@ static bool mi_heap_page_is_valid(mi_heap_t* heap, mi_page_queue_t* pq, mi_page_
   MI_UNUSED(arg2);
   MI_UNUSED(pq);
   mi_assert_internal(mi_page_heap(page) == heap);
-  mi_segment_t* segment = _mi_page_segment(page);
-  mi_assert_internal(segment->thread_id == heap->thread_id);
   mi_assert_expensive(_mi_page_is_valid(page));
   return true;
 }
@@ -64,6 +63,9 @@ static bool mi_heap_page_is_valid(mi_heap_t* heap, mi_page_queue_t* pq, mi_page_
 static bool mi_heap_is_valid(mi_heap_t* heap) {
   mi_assert_internal(heap!=NULL);
   mi_heap_visit_pages(heap, &mi_heap_page_is_valid, NULL, NULL);
+  for (size_t bin = 0; bin < MI_BIN_COUNT; bin++) {
+    mi_assert_internal(_mi_page_queue_is_valid(heap, &heap->pages[bin]));
+  }
   return true;
 }
 #endif
@@ -92,9 +94,9 @@ static bool mi_heap_page_collect(mi_heap_t* heap, mi_page_queue_t* pq, mi_page_t
   mi_collect_t collect = *((mi_collect_t*)arg_collect);
   _mi_page_free_collect(page, collect >= MI_FORCE);
   if (mi_page_all_free(page)) {
-    // no more used blocks, free the page. 
+    // no more used blocks, free the page.
     // note: this will free retired pages as well.
-    _mi_page_free(page, pq, collect >= MI_FORCE);
+    _mi_page_free(page, pq);
   }
   else if (collect == MI_ABANDON) {
     // still used blocks but the thread is done; abandon the page
@@ -103,70 +105,32 @@ static bool mi_heap_page_collect(mi_heap_t* heap, mi_page_queue_t* pq, mi_page_t
   return true; // don't break
 }
 
-static bool mi_heap_page_never_delayed_free(mi_heap_t* heap, mi_page_queue_t* pq, mi_page_t* page, void* arg1, void* arg2) {
-  MI_UNUSED(arg1);
-  MI_UNUSED(arg2);
-  MI_UNUSED(heap);
-  MI_UNUSED(pq);
-  _mi_page_use_delayed_free(page, MI_NEVER_DELAYED_FREE, false);
-  return true; // don't break
-}
 
 static void mi_heap_collect_ex(mi_heap_t* heap, mi_collect_t collect)
 {
   if (heap==NULL || !mi_heap_is_initialized(heap)) return;
+  mi_assert_expensive(mi_heap_is_valid(heap));
 
-  const bool force = collect >= MI_FORCE;  
+  const bool force = (collect >= MI_FORCE);
   _mi_deferred_free(heap, force);
 
-  // note: never reclaim on collect but leave it to threads that need storage to reclaim 
-  const bool force_main = 
-    #ifdef NDEBUG
-      collect == MI_FORCE
-    #else
-      collect >= MI_FORCE
-    #endif
-      && _mi_is_main_thread() && mi_heap_is_backing(heap) && !heap->no_reclaim;
+  // python/cpython#112532: we may be called from a thread that is not the owner of the heap
+  // const bool is_main_thread = (_mi_is_main_thread() && heap->thread_id == _mi_thread_id());
 
-  if (force_main) {
-    // the main thread is abandoned (end-of-program), try to reclaim all abandoned segments.
-    // if all memory is freed by now, all segments should be freed.
-    _mi_abandoned_reclaim_all(heap, &heap->tld->segments);
-  }
-  
-  // if abandoning, mark all pages to no longer add to delayed_free
-  if (collect == MI_ABANDON) {
-    mi_heap_visit_pages(heap, &mi_heap_page_never_delayed_free, NULL, NULL);
-  }
-
-  // free all current thread delayed blocks.
-  // (if abandoning, after this there are no more thread-delayed references into the pages.)
-  _mi_heap_delayed_free_all(heap);
+  // if (_mi_is_main_thread()) { mi_debug_show_arenas(true, false, false); }
 
   // collect retired pages
   _mi_heap_collect_retired(heap, force);
 
   // collect all pages owned by this thread
   mi_heap_visit_pages(heap, &mi_heap_page_collect, &collect, NULL);
-  mi_assert_internal( collect != MI_ABANDON || mi_atomic_load_ptr_acquire(mi_block_t,&heap->thread_delayed_free) == NULL );
-
-  // collect abandoned segments (in particular, decommit expired parts of segments in the abandoned segment list)
-  // note: forced decommit can be quite expensive if many threads are created/destroyed so we do not force on abandonment
-  _mi_abandoned_collect(heap, collect == MI_FORCE /* force? */, &heap->tld->segments);
-
-  // collect segment local caches
-  if (force) {
-    _mi_segment_thread_collect(&heap->tld->segments);
-  }
 
-  // decommit in global segment caches
-  // note: forced decommit can be quite expensive if many threads are created/destroyed so we do not force on abandonment
-  _mi_segment_cache_collect( collect == MI_FORCE, &heap->tld->os);  
+  // collect arenas (this is program wide so don't force purges on abandonment of threads)
+  //mi_atomic_storei64_release(&heap->tld->subproc->purge_expire, 1);
+  _mi_arenas_collect(collect == MI_FORCE /* force purge? */, collect >= MI_FORCE /* visit all? */, heap->tld);
 
-  // collect regions on program-exit (or shared library unload)
-  if (force && _mi_is_main_thread() && mi_heap_is_backing(heap)) {
-    //_mi_mem_collect(&heap->tld->os);
-  }
+  // merge statistics
+  if (collect <= MI_FORCE) { _mi_stats_merge_thread(heap->tld); }
 }
 
 void _mi_heap_collect_abandon(mi_heap_t* heap) {
@@ -178,7 +142,7 @@ void mi_heap_collect(mi_heap_t* heap, bool force) mi_attr_noexcept {
 }
 
 void mi_collect(bool force) mi_attr_noexcept {
-  mi_heap_collect(mi_get_default_heap(), force);
+  mi_heap_collect(mi_prim_get_default_heap(), force);
 }
 
 
@@ -187,66 +151,133 @@ void mi_collect(bool force) mi_attr_noexcept {
 ----------------------------------------------------------- */
 
 mi_heap_t* mi_heap_get_default(void) {
-  mi_thread_init();
-  return mi_get_default_heap();
+  mi_heap_t* heap = mi_prim_get_default_heap();
+  if mi_unlikely(!mi_heap_is_initialized(heap)) {
+    mi_thread_init();
+    heap = mi_prim_get_default_heap();
+  }
+  return heap;
+}
+
+static bool mi_heap_is_default(const mi_heap_t* heap) {
+  return (heap == mi_prim_get_default_heap());
 }
 
+
 mi_heap_t* mi_heap_get_backing(void) {
   mi_heap_t* heap = mi_heap_get_default();
   mi_assert_internal(heap!=NULL);
   mi_heap_t* bheap = heap->tld->heap_backing;
   mi_assert_internal(bheap!=NULL);
-  mi_assert_internal(bheap->thread_id == _mi_thread_id());
+  mi_assert_internal(bheap->tld->thread_id == _mi_thread_id());
   return bheap;
 }
 
-mi_decl_nodiscard mi_heap_t* mi_heap_new_in_arena( mi_arena_id_t arena_id ) {
-  mi_heap_t* bheap = mi_heap_get_backing();
-  mi_heap_t* heap = mi_heap_malloc_tp(bheap, mi_heap_t);  // todo: OS allocate in secure mode?
-  if (heap==NULL) return NULL;
+// todo: make order of parameters consistent (but would that break compat with CPython?)
+void _mi_heap_init(mi_heap_t* heap, mi_arena_id_t arena_id, bool allow_destroy, uint8_t heap_tag, mi_tld_t* tld)
+{
+  mi_assert_internal(heap!=NULL);
+  mi_memid_t memid = heap->memid;
   _mi_memcpy_aligned(heap, &_mi_heap_empty, sizeof(mi_heap_t));
-  heap->tld = bheap->tld;
-  heap->thread_id = _mi_thread_id();
-  heap->arena_id = arena_id;
-  _mi_random_split(&bheap->random, &heap->random);
+  heap->memid = memid;
+  heap->tld   = tld;  // avoid reading the thread-local tld during initialization
+  heap->tag   = heap_tag;
+  heap->numa_node = tld->numa_node;
+  heap->exclusive_arena    = _mi_arena_from_id(arena_id);
+  heap->allow_page_reclaim = (!allow_destroy && mi_option_get(mi_option_page_reclaim_on_free) >= 0);
+  heap->allow_page_abandon = (!allow_destroy && mi_option_get(mi_option_page_full_retain) >= 0);
+  heap->page_full_retain = mi_option_get_clamp(mi_option_page_full_retain, -1, 32);
+  if (heap->tld->is_in_threadpool) {
+    // if we run as part of a thread pool it is better to not arbitrarily reclaim abandoned pages into our heap.
+    // this is checked in `free.c:mi_free_try_collect_mt`
+    // .. but abandoning is good in this case: halve the full page retain (possibly to 0)
+    // (so blocked threads do not hold on to too much memory)
+    if (heap->page_full_retain > 0) {
+      heap->page_full_retain = heap->page_full_retain / 4;
+    }
+  }
+
+  if (heap->tld->heap_backing == NULL) {
+    heap->tld->heap_backing = heap;  // first heap becomes the backing heap
+    _mi_random_init(&heap->random);
+  }
+  else {
+    _mi_random_split(&heap->tld->heap_backing->random, &heap->random);
+  }
   heap->cookie  = _mi_heap_random_next(heap) | 1;
-  heap->keys[0] = _mi_heap_random_next(heap);
-  heap->keys[1] = _mi_heap_random_next(heap);
-  heap->no_reclaim = true;  // don't reclaim abandoned pages or otherwise destroy is unsafe
+  //heap->keys[0] = _mi_heap_random_next(heap);
+  //heap->keys[1] = _mi_heap_random_next(heap);*/
+  _mi_heap_guarded_init(heap);
+
   // push on the thread local heaps list
   heap->next = heap->tld->heaps;
   heap->tld->heaps = heap;
+}
+
+mi_heap_t* _mi_heap_create(int heap_tag, bool allow_destroy, mi_arena_id_t arena_id, mi_tld_t* tld) {
+  mi_assert_internal(tld!=NULL);
+  mi_assert(heap_tag >= 0 && heap_tag < 256);
+  // allocate and initialize a heap
+  mi_memid_t memid;
+  mi_heap_t* heap;
+  if (arena_id == _mi_arena_id_none()) {
+    heap = (mi_heap_t*)_mi_meta_zalloc(sizeof(mi_heap_t), &memid);
+  }
+  else {
+    // heaps associated wita a specific arena are allocated in that arena
+    // note: takes up at least one slice which is quite wasteful...
+    heap = (mi_heap_t*)_mi_arenas_alloc(_mi_subproc(), _mi_align_up(sizeof(mi_heap_t),MI_ARENA_MIN_OBJ_SIZE), true, true, _mi_arena_from_id(arena_id), tld->thread_seq, tld->numa_node, &memid);
+  }
+  if (heap==NULL) {
+    _mi_error_message(ENOMEM, "unable to allocate heap meta-data\n");
+    return NULL;
+  }
+  heap->memid = memid;
+  _mi_heap_init(heap, arena_id, allow_destroy, (uint8_t)heap_tag, tld);
   return heap;
 }
 
+mi_decl_nodiscard mi_heap_t* mi_heap_new_ex(int heap_tag, bool allow_destroy, mi_arena_id_t arena_id) {
+  mi_heap_t* bheap = mi_heap_get_backing();
+  mi_assert_internal(bheap != NULL);
+  return _mi_heap_create(heap_tag, allow_destroy, arena_id, bheap->tld);
+}
+
+mi_decl_nodiscard mi_heap_t* mi_heap_new_in_arena(mi_arena_id_t arena_id) {
+  return mi_heap_new_ex(0 /* default heap tag */, false /* allow destroy? */, arena_id);
+}
+
 mi_decl_nodiscard mi_heap_t* mi_heap_new(void) {
-  return mi_heap_new_in_arena(_mi_arena_id_none());
+  // don't reclaim abandoned memory or otherwise destroy is unsafe
+  return mi_heap_new_ex(0 /* default heap tag */, true /* allow destroy? */, _mi_arena_id_none());
 }
 
-bool _mi_heap_memid_is_suitable(mi_heap_t* heap, size_t memid) {
-  return _mi_arena_memid_is_suitable(memid, heap->arena_id);
+bool _mi_heap_memid_is_suitable(mi_heap_t* heap, mi_memid_t memid) {
+  return _mi_arena_memid_is_suitable(memid, heap->exclusive_arena);
 }
 
 uintptr_t _mi_heap_random_next(mi_heap_t* heap) {
   return _mi_random_next(&heap->random);
 }
 
+void mi_heap_set_numa_affinity(mi_heap_t* heap, int numa_node) {
+  if (heap == NULL) return;
+  heap->numa_node = (numa_node < 0 ? -1 : numa_node % _mi_os_numa_node_count());
+}
+
 // zero out the page queues
 static void mi_heap_reset_pages(mi_heap_t* heap) {
   mi_assert_internal(heap != NULL);
   mi_assert_internal(mi_heap_is_initialized(heap));
   // TODO: copy full empty heap instead?
-  memset(&heap->pages_free_direct, 0, sizeof(heap->pages_free_direct));
-#ifdef MI_MEDIUM_DIRECT
-  memset(&heap->pages_free_medium, 0, sizeof(heap->pages_free_medium));
-#endif
+  _mi_memset(&heap->pages_free_direct, 0, sizeof(heap->pages_free_direct));
   _mi_memcpy_aligned(&heap->pages, &_mi_heap_empty.pages, sizeof(heap->pages));
-  heap->thread_delayed_free = NULL;
+  // heap->thread_delayed_free = NULL;
   heap->page_count = 0;
 }
 
 // called from `mi_heap_destroy` and `mi_heap_delete` to free the internal heap resources.
-static void mi_heap_free(mi_heap_t* heap) {
+static void mi_heap_free(mi_heap_t* heap, bool do_free_mem) {
   mi_assert(heap != NULL);
   mi_assert_internal(mi_heap_is_initialized(heap));
   if (heap==NULL || !mi_heap_is_initialized(heap)) return;
@@ -260,7 +291,7 @@ static void mi_heap_free(mi_heap_t* heap) {
   // remove ourselves from the thread local heaps list
   // linear search but we expect the number of heaps to be relatively small
   mi_heap_t* prev = NULL;
-  mi_heap_t* curr = heap->tld->heaps; 
+  mi_heap_t* curr = heap->tld->heaps;
   while (curr != heap && curr != NULL) {
     prev = curr;
     curr = curr->next;
@@ -273,9 +304,23 @@ static void mi_heap_free(mi_heap_t* heap) {
   mi_assert_internal(heap->tld->heaps != NULL);
 
   // and free the used memory
-  mi_free(heap);
+  if (do_free_mem) {
+    _mi_meta_free(heap, sizeof(*heap), heap->memid);
+  }
 }
 
+// return a heap on the same thread as `heap` specialized for the specified tag (if it exists)
+mi_heap_t* _mi_heap_by_tag(mi_heap_t* heap, uint8_t tag) {
+  if (heap->tag == tag) {
+    return heap;
+  }
+  for (mi_heap_t *curr = heap->tld->heaps; curr != NULL; curr = curr->next) {
+    if (curr->tag == tag) {
+      return curr;
+    }
+  }
+  return NULL;
+}
 
 /* -----------------------------------------------------------
   Heap destroy
@@ -284,33 +329,27 @@ static void mi_heap_free(mi_heap_t* heap) {
 static bool _mi_heap_page_destroy(mi_heap_t* heap, mi_page_queue_t* pq, mi_page_t* page, void* arg1, void* arg2) {
   MI_UNUSED(arg1);
   MI_UNUSED(arg2);
-  MI_UNUSED(heap);
   MI_UNUSED(pq);
 
   // ensure no more thread_delayed_free will be added
-  _mi_page_use_delayed_free(page, MI_NEVER_DELAYED_FREE, false);
+  //_mi_page_use_delayed_free(page, MI_NEVER_DELAYED_FREE, false);
 
   // stats
   const size_t bsize = mi_page_block_size(page);
-  if (bsize > MI_MEDIUM_OBJ_SIZE_MAX) {
-    if (bsize <= MI_LARGE_OBJ_SIZE_MAX) {
-      mi_heap_stat_decrease(heap, large, bsize);
-    }
-    else {
-      mi_heap_stat_decrease(heap, huge, bsize);
-    }
+  if (bsize > MI_LARGE_MAX_OBJ_SIZE) {
+    mi_heap_stat_decrease(heap, malloc_huge, bsize);
   }
-#if (MI_STAT)
+  #if (MI_STAT>0)
   _mi_page_free_collect(page, false);  // update used count
   const size_t inuse = page->used;
-  if (bsize <= MI_LARGE_OBJ_SIZE_MAX) {
-    mi_heap_stat_decrease(heap, normal, bsize * inuse);
-#if (MI_STAT>1)
-    mi_heap_stat_decrease(heap, normal_bins[_mi_bin(bsize)], inuse);
-#endif
+  if (bsize <= MI_LARGE_MAX_OBJ_SIZE) {
+    mi_heap_stat_decrease(heap, malloc_normal, bsize * inuse);
+    #if (MI_STAT>1)
+    mi_heap_stat_decrease(heap, malloc_bins[_mi_bin(bsize)], inuse);
+    #endif
   }
-  mi_heap_stat_decrease(heap, malloc, bsize * inuse);  // todo: off for aligned blocks...
-#endif
+  // mi_heap_stat_decrease(heap, malloc_requested, bsize * inuse);  // todo: off for aligned blocks...
+  #endif
 
   /// pretend it is all free now
   mi_assert_internal(mi_page_thread_free(page) == NULL);
@@ -320,7 +359,8 @@ static bool _mi_heap_page_destroy(mi_heap_t* heap, mi_page_queue_t* pq, mi_page_
   // mi_page_free(page,false);
   page->next = NULL;
   page->prev = NULL;
-  _mi_segment_page_free(page,false /* no force? */, &heap->tld->segments);
+  mi_page_set_heap(page, NULL);
+  _mi_arenas_page_free(page, heap->tld);
 
   return true; // keep going
 }
@@ -330,62 +370,89 @@ void _mi_heap_destroy_pages(mi_heap_t* heap) {
   mi_heap_reset_pages(heap);
 }
 
+#if MI_TRACK_HEAP_DESTROY
+static bool mi_cdecl mi_heap_track_block_free(const mi_heap_t* heap, const mi_heap_area_t* area, void* block, size_t block_size, void* arg) {
+  MI_UNUSED(heap); MI_UNUSED(area);  MI_UNUSED(arg); MI_UNUSED(block_size);
+  mi_track_free_size(block,mi_usable_size(block));
+  return true;
+}
+#endif
+
 void mi_heap_destroy(mi_heap_t* heap) {
   mi_assert(heap != NULL);
   mi_assert(mi_heap_is_initialized(heap));
-  mi_assert(heap->no_reclaim);
+  mi_assert(!heap->allow_page_reclaim);
+  mi_assert(!heap->allow_page_abandon);
   mi_assert_expensive(mi_heap_is_valid(heap));
   if (heap==NULL || !mi_heap_is_initialized(heap)) return;
-  if (!heap->no_reclaim) {
-    // don't free in case it may contain reclaimed pages
+  #if MI_GUARDED
+  // _mi_warning_message("'mi_heap_destroy' called but MI_GUARDED is enabled -- using `mi_heap_delete` instead (heap at %p)\n", heap);
+  mi_heap_delete(heap);
+  return;
+  #else
+  if (heap->allow_page_reclaim) {
+    _mi_warning_message("'mi_heap_destroy' called but ignored as the heap was not created with 'allow_destroy' (heap at %p)\n", heap);
+    // don't free in case it may contain reclaimed pages,
     mi_heap_delete(heap);
   }
   else {
+    // track all blocks as freed
+    #if MI_TRACK_HEAP_DESTROY
+    mi_heap_visit_blocks(heap, true, mi_heap_track_block_free, NULL);
+    #endif
     // free all pages
     _mi_heap_destroy_pages(heap);
-    mi_heap_free(heap);
+    mi_heap_free(heap,true);
   }
+  #endif
 }
 
-
+// forcefully destroy all heaps in the current thread
+void _mi_heap_unsafe_destroy_all(mi_heap_t* heap) {
+  mi_assert_internal(heap != NULL);
+  if (heap == NULL) return;
+  mi_heap_t* curr = heap->tld->heaps;
+  while (curr != NULL) {
+    mi_heap_t* next = curr->next;
+    if (!curr->allow_page_reclaim) {
+      mi_heap_destroy(curr);
+    }
+    else {
+      _mi_heap_destroy_pages(curr);
+    }
+    curr = next;
+  }
+}
 
 /* -----------------------------------------------------------
   Safe Heap delete
 ----------------------------------------------------------- */
 
 // Transfer the pages from one heap to the other
-static void mi_heap_absorb(mi_heap_t* heap, mi_heap_t* from) {
-  mi_assert_internal(heap!=NULL);
-  if (from==NULL || from->page_count == 0) return;
-
-  // reduce the size of the delayed frees
-  _mi_heap_delayed_free_partial(from);
-  
-  // transfer all pages by appending the queues; this will set a new heap field 
-  // so threads may do delayed frees in either heap for a while.
-  // note: appending waits for each page to not be in the `MI_DELAYED_FREEING` state
-  // so after this only the new heap will get delayed frees
-  for (size_t i = 0; i <= MI_BIN_FULL; i++) {
-    mi_page_queue_t* pq = &heap->pages[i];
-    mi_page_queue_t* append = &from->pages[i];
-    size_t pcount = _mi_page_queue_append(heap, pq, append);
-    heap->page_count += pcount;
-    from->page_count -= pcount;
-  }
-  mi_assert_internal(from->page_count == 0);
-
-  // and do outstanding delayed frees in the `from` heap  
-  // note: be careful here as the `heap` field in all those pages no longer point to `from`,
-  // turns out to be ok as `_mi_heap_delayed_free` only visits the list and calls a 
-  // the regular `_mi_free_delayed_block` which is safe.
-  _mi_heap_delayed_free_all(from);  
-  #if !defined(_MSC_VER) || (_MSC_VER > 1900) // somehow the following line gives an error in VS2015, issue #353
-  mi_assert_internal(mi_atomic_load_ptr_relaxed(mi_block_t,&from->thread_delayed_free) == NULL);
-  #endif
-
-  // and reset the `from` heap
-  mi_heap_reset_pages(from);  
-}
+//static void mi_heap_absorb(mi_heap_t* heap, mi_heap_t* from) {
+//  mi_assert_internal(heap!=NULL);
+//  if (from==NULL || from->page_count == 0) return;
+//
+//  // transfer all pages by appending the queues; this will set a new heap field
+//  for (size_t i = 0; i <= MI_BIN_FULL; i++) {
+//    mi_page_queue_t* pq = &heap->pages[i];
+//    mi_page_queue_t* append = &from->pages[i];
+//    size_t pcount = _mi_page_queue_append(heap, pq, append);
+//    heap->page_count += pcount;
+//    from->page_count -= pcount;
+//  }
+//  mi_assert_internal(from->page_count == 0);
+//
+//  // and reset the `from` heap
+//  mi_heap_reset_pages(from);
+//}
+
+//// are two heaps compatible with respect to heap-tag, exclusive arena etc.
+//static bool mi_heaps_are_compatible(mi_heap_t* heap1, mi_heap_t* heap2) {
+//  return (heap1->tag == heap2->tag &&                   // store same kind of objects
+//          heap1->tld->subproc == heap2->tld->subproc && // same sub-process
+//          heap1->arena_id == heap2->arena_id);          // same arena preference
+//}
 
 // Safe delete a heap without freeing any still allocated blocks in that heap.
 void mi_heap_delete(mi_heap_t* heap)
@@ -395,16 +462,11 @@ void mi_heap_delete(mi_heap_t* heap)
   mi_assert_expensive(mi_heap_is_valid(heap));
   if (heap==NULL || !mi_heap_is_initialized(heap)) return;
 
-  if (!mi_heap_is_backing(heap)) {
-    // tranfer still used pages to the backing heap
-    mi_heap_absorb(heap->tld->heap_backing, heap);
-  }
-  else {
-    // the backing heap abandons its pages
-    _mi_heap_collect_abandon(heap);
-  }
+  // abandon all pages
+  _mi_heap_collect_abandon(heap);
+
   mi_assert_internal(heap->page_count==0);
-  mi_heap_free(heap);
+  mi_heap_free(heap,true);
 }
 
 mi_heap_t* mi_heap_set_default(mi_heap_t* heap) {
@@ -412,13 +474,69 @@ mi_heap_t* mi_heap_set_default(mi_heap_t* heap) {
   mi_assert(mi_heap_is_initialized(heap));
   if (heap==NULL || !mi_heap_is_initialized(heap)) return NULL;
   mi_assert_expensive(mi_heap_is_valid(heap));
-  mi_heap_t* old = mi_get_default_heap();
+  mi_heap_t* old = mi_prim_get_default_heap();
   _mi_heap_set_default_direct(heap);
   return old;
 }
 
 
+/* -----------------------------------------------------------
+  Load/unload heaps
+----------------------------------------------------------- */
+void mi_heap_unload(mi_heap_t* heap) {
+  mi_assert(mi_heap_is_initialized(heap));
+  mi_assert_expensive(mi_heap_is_valid(heap));
+  if (heap==NULL || !mi_heap_is_initialized(heap)) return;
+  if (heap->exclusive_arena == NULL) {
+    _mi_warning_message("cannot unload heaps that are not associated with an exclusive arena\n");
+    return;
+  }
 
+  // abandon all pages so all thread'id in the pages are cleared
+  _mi_heap_collect_abandon(heap);
+  mi_assert_internal(heap->page_count==0);
+
+  // remove from heap list
+  mi_heap_free(heap, false /* but don't actually free the memory */);
+
+  // disassociate from the current thread-local and static state
+  heap->tld = NULL;
+  return;
+}
+
+bool mi_heap_reload(mi_heap_t* heap, mi_arena_id_t arena_id) {
+  mi_assert(mi_heap_is_initialized(heap));
+  if (heap==NULL || !mi_heap_is_initialized(heap)) return false;
+  if (heap->exclusive_arena == NULL) {
+    _mi_warning_message("cannot reload heaps that were not associated with an exclusive arena\n");
+    return false;
+  }
+  if (heap->tld != NULL) {
+    _mi_warning_message("cannot reload heaps that were not unloaded first\n");
+    return false;
+  }
+  mi_arena_t* arena = _mi_arena_from_id(arena_id);
+  if (heap->exclusive_arena != arena) {
+    _mi_warning_message("trying to reload a heap at a different arena address: %p vs %p\n", heap->exclusive_arena, arena);
+    return false;
+  }
+
+  mi_assert_internal(heap->page_count==0);
+
+  // re-associate with the current thread-local and static state
+  heap->tld = mi_heap_get_default()->tld;
+
+  // reinit direct pages (as we may be in a different process)
+  mi_assert_internal(heap->page_count == 0);
+  for (size_t i = 0; i < MI_PAGES_DIRECT; i++) {
+    heap->pages_free_direct[i] = (mi_page_t*)&_mi_page_empty;
+  }
+
+  // push on the thread local heaps list
+  heap->next = heap->tld->heaps;
+  heap->tld->heaps = heap;
+  return true;
+}
 
 /* -----------------------------------------------------------
   Analysis
@@ -427,11 +545,8 @@ mi_heap_t* mi_heap_set_default(mi_heap_t* heap) {
 // static since it is not thread safe to access heaps from other threads.
 static mi_heap_t* mi_heap_of_block(const void* p) {
   if (p == NULL) return NULL;
-  mi_segment_t* segment = _mi_ptr_segment(p);
-  bool valid = (_mi_ptr_cookie(segment) == segment->cookie);
-  mi_assert_internal(valid);
-  if mi_unlikely(!valid) return NULL;
-  return mi_page_heap(_mi_segment_page_of(segment,p));
+  mi_page_t* page = _mi_ptr_page(p); // TODO: check pointer validity?
+  return mi_page_heap(page);
 }
 
 bool mi_heap_contains_block(mi_heap_t* heap, const void* p) {
@@ -445,8 +560,7 @@ static bool mi_heap_page_check_owned(mi_heap_t* heap, mi_page_queue_t* pq, mi_pa
   MI_UNUSED(heap);
   MI_UNUSED(pq);
   bool* found = (bool*)vfound;
-  mi_segment_t* segment = _mi_page_segment(page);
-  void* start = _mi_page_start(segment, page, NULL);
+  void* start = mi_page_start(page);
   void* end   = (uint8_t*)start + (page->capacity * mi_page_block_size(page));
   *found = (p >= start && p < end);
   return (!*found); // continue if not found
@@ -462,7 +576,7 @@ bool mi_heap_check_owned(mi_heap_t* heap, const void* p) {
 }
 
 bool mi_check_owned(const void* p) {
-  return mi_heap_check_owned(mi_get_default_heap(), p);
+  return mi_heap_check_owned(mi_prim_get_default_heap(), p);
 }
 
 /* -----------------------------------------------------------
@@ -471,90 +585,152 @@ bool mi_check_owned(const void* p) {
         enable visiting all blocks of all heaps across threads
 ----------------------------------------------------------- */
 
-// Separate struct to keep `mi_page_t` out of the public interface
-typedef struct mi_heap_area_ex_s {
-  mi_heap_area_t area;
-  mi_page_t*     page;
-} mi_heap_area_ex_t;
+void _mi_heap_area_init(mi_heap_area_t* area, mi_page_t* page) {
+  const size_t bsize = mi_page_block_size(page);
+  const size_t ubsize = mi_page_usable_block_size(page);
+  area->reserved = page->reserved * bsize;
+  area->committed = page->capacity * bsize;
+  area->blocks = mi_page_start(page);
+  area->used = page->used;   // number of blocks in use (#553)
+  area->block_size = ubsize;
+  area->full_block_size = bsize;
+  area->heap_tag = page->heap_tag;
+}
 
-static bool mi_heap_area_visit_blocks(const mi_heap_area_ex_t* xarea, mi_block_visit_fun* visitor, void* arg) {
-  mi_assert(xarea != NULL);
-  if (xarea==NULL) return true;
-  const mi_heap_area_t* area = &xarea->area;
-  mi_page_t* page = xarea->page;
+
+static void mi_get_fast_divisor(size_t divisor, uint64_t* magic, size_t* shift) {
+  mi_assert_internal(divisor > 0 && divisor <= UINT32_MAX);
+  *shift = MI_SIZE_BITS - mi_clz(divisor - 1);
+  *magic = ((((uint64_t)1 << 32) * (((uint64_t)1 << *shift) - divisor)) / divisor + 1);
+}
+
+static size_t mi_fast_divide(size_t n, uint64_t magic, size_t shift) {
+  mi_assert_internal(n <= UINT32_MAX);
+  const uint64_t hi = ((uint64_t)n * magic) >> 32;
+  return (size_t)((hi + n) >> shift);
+}
+
+bool _mi_heap_area_visit_blocks(const mi_heap_area_t* area, mi_page_t* page, mi_block_visit_fun* visitor, void* arg) {
+  mi_assert(area != NULL);
+  if (area==NULL) return true;
   mi_assert(page != NULL);
   if (page == NULL) return true;
 
-  _mi_page_free_collect(page,true);
+  _mi_page_free_collect(page,true);              // collect both thread_delayed and local_free
   mi_assert_internal(page->local_free == NULL);
   if (page->used == 0) return true;
 
-  const size_t bsize = mi_page_block_size(page);
-  const size_t ubsize = mi_page_usable_block_size(page); // without padding
-  size_t   psize;
-  uint8_t* pstart = _mi_page_start(_mi_page_segment(page), page, &psize);
+  size_t psize;
+  uint8_t* const pstart = mi_page_area(page, &psize);
+  mi_heap_t* const heap = mi_page_heap(page);
+  const size_t bsize    = mi_page_block_size(page);
+  const size_t ubsize   = mi_page_usable_block_size(page); // without padding
 
+  // optimize page with one block
   if (page->capacity == 1) {
-    // optimize page with one block
     mi_assert_internal(page->used == 1 && page->free == NULL);
     return visitor(mi_page_heap(page), area, pstart, ubsize, arg);
   }
+  mi_assert(bsize <= UINT32_MAX);
+
+  // optimize full pages
+  if (page->used == page->capacity) {
+    uint8_t* block = pstart;
+    for (size_t i = 0; i < page->capacity; i++) {
+      if (!visitor(heap, area, block, ubsize, arg)) return false;
+      block += bsize;
+    }
+    return true;
+  }
 
   // create a bitmap of free blocks.
   #define MI_MAX_BLOCKS   (MI_SMALL_PAGE_SIZE / sizeof(void*))
-  uintptr_t free_map[MI_MAX_BLOCKS / sizeof(uintptr_t)];
-  memset(free_map, 0, sizeof(free_map));
+  uintptr_t free_map[MI_MAX_BLOCKS / MI_INTPTR_BITS];
+  const uintptr_t bmapsize = _mi_divide_up(page->capacity, MI_INTPTR_BITS);
+  memset(free_map, 0, bmapsize * sizeof(intptr_t));
+  if (page->capacity % MI_INTPTR_BITS != 0) {
+    // mark left-over bits at the end as free
+    size_t shift   = (page->capacity % MI_INTPTR_BITS);
+    uintptr_t mask = (UINTPTR_MAX << shift);
+    free_map[bmapsize - 1] = mask;
+  }
+
+  // fast repeated division by the block size
+  uint64_t magic;
+  size_t   shift;
+  mi_get_fast_divisor(bsize, &magic, &shift);
 
+  #if MI_DEBUG>1
   size_t free_count = 0;
-  for (mi_block_t* block = page->free; block != NULL; block = mi_block_next(page,block)) {
+  #endif
+  for (mi_block_t* block = page->free; block != NULL; block = mi_block_next(page, block)) {
+    #if MI_DEBUG>1
     free_count++;
+    #endif
     mi_assert_internal((uint8_t*)block >= pstart && (uint8_t*)block < (pstart + psize));
     size_t offset = (uint8_t*)block - pstart;
     mi_assert_internal(offset % bsize == 0);
-    size_t blockidx = offset / bsize;  // Todo: avoid division?
-    mi_assert_internal( blockidx < MI_MAX_BLOCKS);
-    size_t bitidx = (blockidx / sizeof(uintptr_t));
-    size_t bit = blockidx - (bitidx * sizeof(uintptr_t));
+    mi_assert_internal(offset <= UINT32_MAX);
+    size_t blockidx = mi_fast_divide(offset, magic, shift);
+    mi_assert_internal(blockidx == offset / bsize);
+    mi_assert_internal(blockidx < MI_MAX_BLOCKS);
+    size_t bitidx = (blockidx / MI_INTPTR_BITS);
+    size_t bit = blockidx - (bitidx * MI_INTPTR_BITS);
     free_map[bitidx] |= ((uintptr_t)1 << bit);
   }
   mi_assert_internal(page->capacity == (free_count + page->used));
 
   // walk through all blocks skipping the free ones
+  #if MI_DEBUG>1
   size_t used_count = 0;
-  for (size_t i = 0; i < page->capacity; i++) {
-    size_t bitidx = (i / sizeof(uintptr_t));
-    size_t bit = i - (bitidx * sizeof(uintptr_t));
-    uintptr_t m = free_map[bitidx];
-    if (bit == 0 && m == UINTPTR_MAX) {
-      i += (sizeof(uintptr_t) - 1); // skip a run of free blocks
+  #endif
+  uint8_t* block = pstart;
+  for (size_t i = 0; i < bmapsize; i++) {
+    if (free_map[i] == 0) {
+      // every block is in use
+      for (size_t j = 0; j < MI_INTPTR_BITS; j++) {
+        #if MI_DEBUG>1
+        used_count++;
+        #endif
+        if (!visitor(heap, area, block, ubsize, arg)) return false;
+        block += bsize;
+      }
     }
-    else if ((m & ((uintptr_t)1 << bit)) == 0) {
-      used_count++;
-      uint8_t* block = pstart + (i * bsize);
-      if (!visitor(mi_page_heap(page), area, block, ubsize, arg)) return false;
+    else {
+      // visit the used blocks in the mask
+      uintptr_t m = ~free_map[i];
+      while (m != 0) {
+        #if MI_DEBUG>1
+        used_count++;
+        #endif
+        size_t bitidx = mi_ctz(m);
+        if (!visitor(heap, area, block + (bitidx * bsize), ubsize, arg)) return false;
+        m &= m - 1;  // clear least significant bit
+      }
+      block += bsize * MI_INTPTR_BITS;
     }
   }
   mi_assert_internal(page->used == used_count);
   return true;
 }
 
-typedef bool (mi_heap_area_visit_fun)(const mi_heap_t* heap, const mi_heap_area_ex_t* area, void* arg);
 
 
+// Separate struct to keep `mi_page_t` out of the public interface
+typedef struct mi_heap_area_ex_s {
+  mi_heap_area_t area;
+  mi_page_t* page;
+} mi_heap_area_ex_t;
+
+typedef bool (mi_heap_area_visit_fun)(const mi_heap_t* heap, const mi_heap_area_ex_t* area, void* arg);
+
 static bool mi_heap_visit_areas_page(mi_heap_t* heap, mi_page_queue_t* pq, mi_page_t* page, void* vfun, void* arg) {
   MI_UNUSED(heap);
   MI_UNUSED(pq);
   mi_heap_area_visit_fun* fun = (mi_heap_area_visit_fun*)vfun;
   mi_heap_area_ex_t xarea;
-  const size_t bsize = mi_page_block_size(page);
-  const size_t ubsize = mi_page_usable_block_size(page);
   xarea.page = page;
-  xarea.area.reserved = page->reserved * bsize;
-  xarea.area.committed = page->capacity * bsize;
-  xarea.area.blocks = _mi_page_start(_mi_page_segment(page), page, NULL);
-  xarea.area.used = page->used;   // number of blocks in use (#553)
-  xarea.area.block_size = ubsize;
-  xarea.area.full_block_size = bsize;
+  _mi_heap_area_init(&xarea.area, page);
   return fun(heap, &xarea, arg);
 }
 
@@ -575,7 +751,7 @@ static bool mi_heap_area_visitor(const mi_heap_t* heap, const mi_heap_area_ex_t*
   mi_visit_blocks_args_t* args = (mi_visit_blocks_args_t*)arg;
   if (!args->visitor(heap, &xarea->area, NULL, xarea->area.block_size, args->arg)) return false;
   if (args->visit_blocks) {
-    return mi_heap_area_visit_blocks(xarea, args->visitor, args->arg);
+    return _mi_heap_area_visit_blocks(&xarea->area, xarea->page, args->visitor, args->arg);
   }
   else {
     return true;
diff --git a/depends/mimalloc/src/init.c b/depends/mimalloc/src/init.c
index 4f37b71761b3..73847a4b6af1 100644
--- a/depends/mimalloc/src/init.c
+++ b/depends/mimalloc/src/init.c
@@ -5,32 +5,37 @@ terms of the MIT license. A copy of the license can be found in the file
 "LICENSE" at the root of this distribution.
 -----------------------------------------------------------------------------*/
 #include "mimalloc.h"
-#include "mimalloc-internal.h"
+#include "mimalloc/internal.h"
+#include "mimalloc/prim.h"
 
 #include <string.h>  // memcpy, memset
 #include <stdlib.h>  // atexit
 
+#define MI_MEMID_INIT(kind)   {{{NULL,0}}, kind, true /* pinned */, true /* committed */, false /* zero */ }
+#define MI_MEMID_STATIC       MI_MEMID_INIT(MI_MEM_STATIC)
+
 // Empty page used to initialize the small free pages array
 const mi_page_t _mi_page_empty = {
-  0, false, false, false, false,
-  0,       // capacity
-  0,       // reserved capacity
-  { 0 },   // flags
-  false,   // is_zero
-  0,       // retire_expire
-  NULL,    // free
-  #if MI_ENCODE_FREELIST
-  { 0, 0 },
-  #endif
-  0,       // used
-  0,       // xblock_size
-  NULL,    // local_free
-  MI_ATOMIC_VAR_INIT(0), // xthread_free
-  MI_ATOMIC_VAR_INIT(0), // xheap
-  NULL, NULL
-  #if MI_INTPTR_SIZE==8
-  , { 0 }  // padding
+  MI_ATOMIC_VAR_INIT(0),  // xthread_id
+  NULL,                   // free
+  0,                      // used
+  0,                      // capacity
+  0,                      // reserved capacity
+  0,                      // block size shift
+  0,                      // retire_expire
+  NULL,                   // local_free
+  MI_ATOMIC_VAR_INIT(0),  // xthread_free
+  0,                      // block_size
+  NULL,                   // page_start
+  0,                      // heap tag
+  false,                  // is_zero
+  #if (MI_PADDING || MI_ENCODE_FREELIST)
+  { 0, 0 },               // keys
   #endif
+  NULL,                   // xheap
+  NULL, NULL,             // next, prev
+  MI_ARENA_SLICE_SIZE,    // page_committed
+  MI_MEMID_STATIC         // memid
 };
 
 #define MI_PAGE_EMPTY() ((mi_page_t*)&_mi_page_empty)
@@ -45,7 +50,7 @@ const mi_page_t _mi_page_empty = {
 
 
 // Empty page queues for every bin
-#define QNULL(sz)  { NULL, NULL, (sz)*sizeof(uintptr_t) }
+#define QNULL(sz)  { NULL, NULL, 0, (sz)*sizeof(uintptr_t) }
 #define MI_PAGE_QUEUES_EMPTY \
   { QNULL(1), \
     QNULL(     1), QNULL(     2), QNULL(     3), QNULL(     4), QNULL(     5), QNULL(     6), QNULL(     7), QNULL(     8), /* 8 */ \
@@ -57,41 +62,29 @@ const mi_page_t _mi_page_empty = {
     QNULL( 10240), QNULL( 12288), QNULL( 14336), QNULL( 16384), QNULL( 20480), QNULL( 24576), QNULL( 28672), QNULL( 32768), /* 56 */ \
     QNULL( 40960), QNULL( 49152), QNULL( 57344), QNULL( 65536), QNULL( 81920), QNULL( 98304), QNULL(114688), QNULL(131072), /* 64 */ \
     QNULL(163840), QNULL(196608), QNULL(229376), QNULL(262144), QNULL(327680), QNULL(393216), QNULL(458752), QNULL(524288), /* 72 */ \
-    QNULL(MI_MEDIUM_OBJ_WSIZE_MAX + 1  /* 655360, Huge queue */), \
-    QNULL(MI_MEDIUM_OBJ_WSIZE_MAX + 2) /* Full queue */ }
+    QNULL(MI_LARGE_MAX_OBJ_WSIZE + 1  /* 655360, Huge queue */), \
+    QNULL(MI_LARGE_MAX_OBJ_WSIZE + 2) /* Full queue */ }
 
-#define MI_STAT_COUNT_NULL()  {0,0,0,0}
+#define MI_STAT_COUNT_NULL()  {0,0,0}
 
 // Empty statistics
-#if MI_STAT>1
-#define MI_STAT_COUNT_END_NULL()  , { MI_STAT_COUNT_NULL(), MI_INIT32(MI_STAT_COUNT_NULL) }
-#else
-#define MI_STAT_COUNT_END_NULL()
-#endif
-
 #define MI_STATS_NULL  \
-  MI_STAT_COUNT_NULL(), MI_STAT_COUNT_NULL(), \
-  MI_STAT_COUNT_NULL(), MI_STAT_COUNT_NULL(), \
-  MI_STAT_COUNT_NULL(), MI_STAT_COUNT_NULL(), \
-  MI_STAT_COUNT_NULL(), MI_STAT_COUNT_NULL(), \
-  MI_STAT_COUNT_NULL(), MI_STAT_COUNT_NULL(), \
-  MI_STAT_COUNT_NULL(), MI_STAT_COUNT_NULL(), \
-  MI_STAT_COUNT_NULL(), MI_STAT_COUNT_NULL(), \
-  { 0, 0 }, { 0, 0 }, { 0, 0 }, { 0, 0 },     \
-  { 0, 0 }, { 0, 0 }, { 0, 0 }, { 0, 0 } \
-  MI_STAT_COUNT_END_NULL()
-
-
-// Empty slice span queues for every bin
-#define SQNULL(sz)  { NULL, NULL, sz }
-#define MI_SEGMENT_SPAN_QUEUES_EMPTY \
-  { SQNULL(1), \
-    SQNULL(     1), SQNULL(     2), SQNULL(     3), SQNULL(     4), SQNULL(     5), SQNULL(     6), SQNULL(     7), SQNULL(    10), /*  8 */ \
-    SQNULL(    12), SQNULL(    14), SQNULL(    16), SQNULL(    20), SQNULL(    24), SQNULL(    28), SQNULL(    32), SQNULL(    40), /* 16 */ \
-    SQNULL(    48), SQNULL(    56), SQNULL(    64), SQNULL(    80), SQNULL(    96), SQNULL(   112), SQNULL(   128), SQNULL(   160), /* 24 */ \
-    SQNULL(   192), SQNULL(   224), SQNULL(   256), SQNULL(   320), SQNULL(   384), SQNULL(   448), SQNULL(   512), SQNULL(   640), /* 32 */ \
-    SQNULL(   768), SQNULL(   896), SQNULL(  1024) /* 35 */ }
-
+  MI_STAT_COUNT_NULL(), MI_STAT_COUNT_NULL(), MI_STAT_COUNT_NULL(), MI_STAT_COUNT_NULL(), \
+  MI_STAT_COUNT_NULL(), MI_STAT_COUNT_NULL(), MI_STAT_COUNT_NULL(), MI_STAT_COUNT_NULL(), \
+  MI_STAT_COUNT_NULL(), MI_STAT_COUNT_NULL(), MI_STAT_COUNT_NULL(), \
+  { 0 }, { 0 }, { 0 }, { 0 }, \
+  { 0 }, { 0 }, { 0 }, { 0 }, \
+  \
+  { 0 }, { 0 }, { 0 }, { 0 }, { 0 }, \
+  MI_INIT4(MI_STAT_COUNT_NULL), \
+  { 0 }, { 0 }, { 0 }, { 0 },  \
+  \
+  { MI_INIT4(MI_STAT_COUNT_NULL) }, \
+  { { 0 }, { 0 }, { 0 }, { 0 } }, \
+  \
+  { MI_INIT74(MI_STAT_COUNT_NULL) }, \
+  { MI_INIT74(MI_STAT_COUNT_NULL) }, \
+  { MI_INIT5(MI_STAT_COUNT_NULL) }
 
 // --------------------------------------------------------
 // Statically allocate an empty heap as the initial
@@ -102,198 +95,380 @@ const mi_page_t _mi_page_empty = {
 // may lead to allocation itself on some platforms)
 // --------------------------------------------------------
 
+static mi_decl_cache_align mi_subproc_t subproc_main
+#if __cplusplus
+= { };     // empty initializer to prevent running the constructor (with msvc)
+#else
+= { 0 };   // C zero initialize
+#endif
+
+static mi_decl_cache_align mi_tld_t tld_empty = {
+  0,                      // thread_id
+  0,                      // thread_seq
+  0,                      // default numa node
+  &subproc_main,          // subproc
+  NULL,                   // heap_backing
+  NULL,                   // heaps list
+  0,                      // heartbeat
+  false,                  // recurse
+  false,                  // is_in_threadpool
+  { MI_STAT_VERSION, MI_STATS_NULL },      // stats
+  MI_MEMID_STATIC         // memid
+};
+
 mi_decl_cache_align const mi_heap_t _mi_heap_empty = {
-  NULL,
+  &tld_empty,             // tld
+  NULL,                   // exclusive_arena
+  0,                      // preferred numa node
+  0,                      // cookie
+  //{ 0, 0 },               // keys
+  { {0}, {0}, 0, true },  // random
+  0,                      // page count
+  MI_BIN_FULL, 0,         // page retired min/max
+  0, 0,                   // generic count
+  NULL,                   // next
+  0,                      // full page retain
+  false,                  // can reclaim
+  true,                   // can eager abandon
+  0,                      // tag
+  #if MI_GUARDED
+  0, 0, 0, 1,          // count is 1 so we never write to it (see `internal.h:mi_heap_malloc_use_guarded`)
+  #endif
   MI_SMALL_PAGES_EMPTY,
   MI_PAGE_QUEUES_EMPTY,
-  MI_ATOMIC_VAR_INIT(NULL),
-  0,                // tid
-  0,                // cookie
-  0,                // arena id
-  { 0, 0 },         // keys
-  { {0}, {0}, 0 },
-  0,                // page count
-  MI_BIN_FULL, 0,   // page retired min/max
-  NULL,             // next
-  false
+  MI_MEMID_STATIC
 };
 
-#define tld_empty_stats  ((mi_stats_t*)((uint8_t*)&tld_empty + offsetof(mi_tld_t,stats)))
-#define tld_empty_os     ((mi_os_tld_t*)((uint8_t*)&tld_empty + offsetof(mi_tld_t,os)))
+extern mi_decl_hidden mi_decl_cache_align mi_heap_t heap_main;
+
+static mi_decl_cache_align mi_tld_t tld_main = {
+  0,                      // thread_id
+  0,                      // thread_seq
+  0,                      // numa node
+  &subproc_main,          // subproc
+  &heap_main,             // heap_backing
+  &heap_main,             // heaps list
+  0,                      // heartbeat
+  false,                  // recurse
+  false,                  // is_in_threadpool
+  { MI_STAT_VERSION, MI_STATS_NULL },      // stats
+  MI_MEMID_STATIC         // memid
+};
 
-mi_decl_cache_align static const mi_tld_t tld_empty = {
-  0,
-  false,
-  NULL, NULL,
-  { MI_SEGMENT_SPAN_QUEUES_EMPTY, 0, 0, 0, 0, tld_empty_stats, tld_empty_os }, // segments
-  { 0, tld_empty_stats }, // os
-  { MI_STATS_NULL }       // stats
+mi_decl_cache_align mi_heap_t heap_main = {
+  &tld_main,              // thread local data
+  NULL,                   // exclusive arena
+  0,                      // preferred numa node
+  0,                      // initial cookie
+  //{ 0, 0 },               // the key of the main heap can be fixed (unlike page keys that need to be secure!)
+  { {0x846ca68b}, {0}, 0, true },  // random
+  0,                      // page count
+  MI_BIN_FULL, 0,         // page retired min/max
+  0, 0,                   // generic count
+  NULL,                   // next heap
+  2,                      // full page retain
+  true,                   // allow page reclaim
+  true,                   // allow page abandon
+  0,                      // tag
+  #if MI_GUARDED
+  0, 0, 0, 0,
+  #endif
+  MI_SMALL_PAGES_EMPTY,
+  MI_PAGE_QUEUES_EMPTY,
+  MI_MEMID_STATIC
 };
 
+
+mi_threadid_t _mi_thread_id(void) mi_attr_noexcept {
+  return _mi_prim_thread_id();
+}
+
 // the thread-local default heap for allocation
 mi_decl_thread mi_heap_t* _mi_heap_default = (mi_heap_t*)&_mi_heap_empty;
 
-extern mi_heap_t _mi_heap_main;
 
-static mi_tld_t tld_main = {
-  0, false,
-  &_mi_heap_main, & _mi_heap_main,
-  { MI_SEGMENT_SPAN_QUEUES_EMPTY, 0, 0, 0, 0, &tld_main.stats, &tld_main.os }, // segments
-  { 0, &tld_main.stats },  // os
-  { MI_STATS_NULL }       // stats
-};
+bool _mi_process_is_initialized = false;  // set to `true` in `mi_process_init`.
 
-mi_heap_t _mi_heap_main = {
-  &tld_main,
-  MI_SMALL_PAGES_EMPTY,
-  MI_PAGE_QUEUES_EMPTY,
-  MI_ATOMIC_VAR_INIT(NULL),
-  0,                // thread id
-  0,                // initial cookie
-  0,                // arena id
-  { 0, 0 },         // the key of the main heap can be fixed (unlike page keys that need to be secure!)
-  { {0x846ca68b}, {0}, 0 },  // random
-  0,                // page count
-  MI_BIN_FULL, 0,   // page retired min/max
-  NULL,             // next heap
-  false             // can reclaim
-};
+mi_stats_t _mi_stats_main = { MI_STAT_VERSION, MI_STATS_NULL };
 
-bool _mi_process_is_initialized = false;  // set to `true` in `mi_process_init`.
+#if MI_GUARDED
+mi_decl_export void mi_heap_guarded_set_sample_rate(mi_heap_t* heap, size_t sample_rate, size_t seed) {
+  heap->guarded_sample_rate  = sample_rate;
+  heap->guarded_sample_count = sample_rate;  // count down samples
+  if (heap->guarded_sample_rate > 1) {
+    if (seed == 0) {
+      seed = _mi_heap_random_next(heap);
+    }
+    heap->guarded_sample_count = (seed % heap->guarded_sample_rate) + 1;  // start at random count between 1 and `sample_rate`
+  }
+}
+
+mi_decl_export void mi_heap_guarded_set_size_bound(mi_heap_t* heap, size_t min, size_t max) {
+  heap->guarded_size_min = min;
+  heap->guarded_size_max = (min > max ? min : max);
+}
+
+void _mi_heap_guarded_init(mi_heap_t* heap) {
+  mi_heap_guarded_set_sample_rate(heap,
+    (size_t)mi_option_get_clamp(mi_option_guarded_sample_rate, 0, LONG_MAX),
+    (size_t)mi_option_get(mi_option_guarded_sample_seed));
+  mi_heap_guarded_set_size_bound(heap,
+    (size_t)mi_option_get_clamp(mi_option_guarded_min, 0, LONG_MAX),
+    (size_t)mi_option_get_clamp(mi_option_guarded_max, 0, LONG_MAX) );
+}
+#else
+mi_decl_export void mi_heap_guarded_set_sample_rate(mi_heap_t* heap, size_t sample_rate, size_t seed) {
+  MI_UNUSED(heap); MI_UNUSED(sample_rate); MI_UNUSED(seed);
+}
+
+mi_decl_export void mi_heap_guarded_set_size_bound(mi_heap_t* heap, size_t min, size_t max) {
+  MI_UNUSED(heap); MI_UNUSED(min); MI_UNUSED(max);
+}
+void _mi_heap_guarded_init(mi_heap_t* heap) {
+  MI_UNUSED(heap);
+}
+#endif
 
-mi_stats_t _mi_stats_main = { MI_STATS_NULL };
+// Initialize main subproc
+static void mi_subproc_main_init(void) {
+  if (subproc_main.memid.memkind != MI_MEM_STATIC) {
+    subproc_main.memid = _mi_memid_create(MI_MEM_STATIC);
+    mi_lock_init(&subproc_main.os_abandoned_pages_lock);
+    mi_lock_init(&subproc_main.arena_reserve_lock);
+  }
+}
 
+// Initialize main tld
+static void mi_tld_main_init(void) {
+  if (tld_main.thread_id == 0) {
+    tld_main.thread_id = _mi_prim_thread_id();
+  }
+}
 
+// Initialization of the (statically allocated) main heap, and the main tld and subproc.
 static void mi_heap_main_init(void) {
-  if (_mi_heap_main.cookie == 0) {
-    _mi_heap_main.thread_id = _mi_thread_id();
-    _mi_heap_main.cookie = _mi_os_random_weak((uintptr_t)&mi_heap_main_init);
-    _mi_random_init(&_mi_heap_main.random);
-    _mi_heap_main.keys[0] = _mi_heap_random_next(&_mi_heap_main);
-    _mi_heap_main.keys[1] = _mi_heap_random_next(&_mi_heap_main);
+  if (heap_main.cookie == 0) {
+    // heap
+    heap_main.cookie = 1;
+    #if defined(__APPLE__) || defined(_WIN32) && !defined(MI_SHARED_LIB)
+      _mi_random_init_weak(&heap_main.random);    // prevent allocation failure during bcrypt dll initialization with static linking
+    #else
+      _mi_random_init(&heap_main.random);
+    #endif
+    heap_main.cookie  = _mi_heap_random_next(&heap_main);
+    //heap_main.keys[0] = _mi_heap_random_next(&heap_main);
+    //heap_main.keys[1] = _mi_heap_random_next(&heap_main);
+    _mi_heap_guarded_init(&heap_main);
+    heap_main.allow_page_reclaim = (mi_option_get(mi_option_page_reclaim_on_free) >= 0);
+    heap_main.allow_page_abandon = (mi_option_get(mi_option_page_full_retain) >= 0);
+    heap_main.page_full_retain   = mi_option_get_clamp(mi_option_page_full_retain, -1, 32);
+
+    mi_subproc_main_init();
+    mi_tld_main_init();
   }
 }
 
 mi_heap_t* _mi_heap_main_get(void) {
   mi_heap_main_init();
-  return &_mi_heap_main;
+  return &heap_main;
 }
 
 
 /* -----------------------------------------------------------
-  Initialization and freeing of the thread local heaps
+  Thread local data
 ----------------------------------------------------------- */
 
-// note: in x64 in release build `sizeof(mi_thread_data_t)` is under 4KiB (= OS page size).
-typedef struct mi_thread_data_s {
-  mi_heap_t  heap;  // must come first due to cast in `_mi_heap_done`
-  mi_tld_t   tld;
-} mi_thread_data_t;
-
-
-// Thread meta-data is allocated directly from the OS. For
-// some programs that do not use thread pools and allocate and
-// destroy many OS threads, this may causes too much overhead 
-// per thread so we maintain a small cache of recently freed metadata.
-
-#define TD_CACHE_SIZE (8)
-static _Atomic(mi_thread_data_t*) td_cache[TD_CACHE_SIZE];
-
-static mi_thread_data_t* mi_thread_data_alloc(void) {
-  // try to find thread metadata in the cache
-  mi_thread_data_t* td;
-  for (int i = 0; i < TD_CACHE_SIZE; i++) {
-    td = mi_atomic_load_ptr_relaxed(mi_thread_data_t, &td_cache[i]);
-    if (td != NULL) {
-      td = mi_atomic_exchange_ptr_acq_rel(mi_thread_data_t, &td_cache[i], NULL); 
-      if (td != NULL) {
-        return td;
-      }
-    }
+// Count current and total created threads
+static _Atomic(size_t)  thread_count = MI_ATOMIC_VAR_INIT(1);
+static _Atomic(size_t)  thread_total_count;
+
+size_t  _mi_current_thread_count(void) {
+  return mi_atomic_load_relaxed(&thread_count);
+}
+
+
+// The mimalloc thread local data
+mi_decl_thread mi_tld_t* thread_tld = &tld_empty;
+
+// Allocate fresh tld
+static mi_tld_t* mi_tld_alloc(void) {
+  mi_atomic_increment_relaxed(&thread_count);
+  if (_mi_is_main_thread()) {
+    return &tld_main;
   }
-  // if that fails, allocate directly from the OS
-  td = (mi_thread_data_t*)_mi_os_alloc(sizeof(mi_thread_data_t), &_mi_stats_main);
-  if (td == NULL) {
-    // if this fails, try once more. (issue #257)
-    td = (mi_thread_data_t*)_mi_os_alloc(sizeof(mi_thread_data_t), &_mi_stats_main);
-    if (td == NULL) {
-      // really out of memory
-      _mi_error_message(ENOMEM, "unable to allocate thread local heap metadata (%zu bytes)\n", sizeof(mi_thread_data_t));
+  else {
+    // allocate tld meta-data
+    // note: we need to be careful to not access the tld from `_mi_meta_zalloc`
+    // (and in turn from `_mi_arena_alloc_aligned` and `_mi_os_alloc_aligned`).
+    mi_memid_t memid;
+    mi_tld_t* tld = (mi_tld_t*)_mi_meta_zalloc(sizeof(mi_tld_t), &memid);
+    if (tld==NULL) {
+      _mi_error_message(ENOMEM, "unable to allocate memory for thread local data\n");
+      return NULL;
     }
+    tld->memid = memid;
+    tld->heap_backing = NULL;
+    tld->heaps = NULL;
+    tld->subproc = &subproc_main;
+    tld->numa_node = _mi_os_numa_node();
+    tld->thread_id = _mi_prim_thread_id();
+    tld->thread_seq = mi_atomic_add_acq_rel(&thread_total_count, 1);
+    tld->is_in_threadpool = _mi_prim_thread_is_in_threadpool();
+    return tld;
   }
-  return td;
-}
-
-static void mi_thread_data_free( mi_thread_data_t* tdfree ) {
-  // try to add the thread metadata to the cache
-  for (int i = 0; i < TD_CACHE_SIZE; i++) {
-    mi_thread_data_t* td = mi_atomic_load_ptr_relaxed(mi_thread_data_t, &td_cache[i]);
-    if (td == NULL) {
-      mi_thread_data_t* expected = NULL;
-      if (mi_atomic_cas_ptr_weak_acq_rel(mi_thread_data_t, &td_cache[i], &expected, tdfree)) {
-        return;
-      }
-    }
+}
+
+#define MI_TLD_INVALID  ((mi_tld_t*)1)
+
+mi_decl_noinline static void mi_tld_free(mi_tld_t* tld) {
+  if (tld != NULL && tld != MI_TLD_INVALID) {
+    _mi_stats_done(&tld->stats);
+    _mi_meta_free(tld, sizeof(mi_tld_t), tld->memid);
+  }
+  #if 0
+  // do not read/write to `thread_tld` on older macOS <= 14 as that will re-initialize the thread local storage
+  // (since we are calling this during pthread shutdown)
+  // (and this could happen on other systems as well, so let's never do it)
+  thread_tld = MI_TLD_INVALID;
+  #endif
+  mi_atomic_decrement_relaxed(&thread_count);
+}
+
+static mi_tld_t* mi_tld(void) {
+  mi_tld_t* tld = thread_tld;
+  if (tld == MI_TLD_INVALID) {
+    _mi_error_message(EFAULT, "internal error: tld is accessed after the thread terminated\n");
+    thread_tld = &tld_empty;
+  }
+  if (tld==&tld_empty) {
+    thread_tld = tld = mi_tld_alloc();
+  }
+  return tld;
+}
+
+mi_subproc_t* _mi_subproc(void) {
+  // should work without doing initialization (as it may be called from `_mi_tld -> mi_tld_alloc ... -> os_alloc -> _mi_subproc()`
+  // todo: this will still fail on OS systems where the first access to a thread-local causes allocation.
+  //       on such systems we can check for this with the _mi_prim_get_default_heap as those are protected (by being
+  //       stored in a TLS slot for example)
+  mi_heap_t* heap = mi_prim_get_default_heap();
+  if (heap == NULL) {
+    return _mi_subproc_main();
+  }
+  else {
+    return heap->tld->subproc;  // avoid using thread local storage (`thread_tld`)
+  }
+}
+
+
+mi_tld_t* _mi_thread_tld(void) mi_attr_noexcept {
+  // should work without doing initialization (as it may be called from `_mi_tld -> mi_tld_alloc ... -> os_alloc -> _mi_subproc()`
+  mi_heap_t* heap = mi_prim_get_default_heap();
+  if (heap == NULL) {
+    return &tld_empty;
+  }
+  else {
+    return heap->tld;
   }
-  // if that fails, just free it directly
-  _mi_os_free(tdfree, sizeof(mi_thread_data_t), &_mi_stats_main);
-}
-
-static void mi_thread_data_collect(void) {
-  // free all thread metadata from the cache
-  for (int i = 0; i < TD_CACHE_SIZE; i++) {
-    mi_thread_data_t* td = mi_atomic_load_ptr_relaxed(mi_thread_data_t, &td_cache[i]);
-    if (td != NULL) {
-      td = mi_atomic_exchange_ptr_acq_rel(mi_thread_data_t, &td_cache[i], NULL);
-      if (td != NULL) {
-        _mi_os_free( td, sizeof(mi_thread_data_t), &_mi_stats_main );
-      }
+}
+
+/* -----------------------------------------------------------
+  Sub process
+----------------------------------------------------------- */
+
+mi_subproc_t* _mi_subproc_main(void) {
+  return &subproc_main;
+}
+
+mi_subproc_id_t mi_subproc_main(void) {
+  return NULL;
+}
+
+mi_subproc_id_t mi_subproc_new(void) {
+  mi_memid_t memid;
+  mi_subproc_t* subproc = (mi_subproc_t*)_mi_meta_zalloc(sizeof(mi_subproc_t),&memid);
+  if (subproc == NULL) return NULL;
+  subproc->memid = memid;
+  mi_lock_init(&subproc->os_abandoned_pages_lock);
+  mi_lock_init(&subproc->arena_reserve_lock);
+  return subproc;
+}
+
+mi_subproc_t* _mi_subproc_from_id(mi_subproc_id_t subproc_id) {
+  return (subproc_id == NULL ? &subproc_main : (mi_subproc_t*)subproc_id);
+}
+
+void mi_subproc_delete(mi_subproc_id_t subproc_id) {
+  if (subproc_id == NULL) return;
+  mi_subproc_t* subproc = _mi_subproc_from_id(subproc_id);
+  // check if there are os pages still..
+  bool safe_to_delete = false;
+  mi_lock(&subproc->os_abandoned_pages_lock) {
+    if (subproc->os_abandoned_pages == NULL) {
+      safe_to_delete = true;
     }
   }
+  if (!safe_to_delete) return;
+
+  // merge stats back into the main subproc?
+  _mi_stats_merge_from(&_mi_subproc_main()->stats, &subproc->stats);
+
+  // safe to release
+  // todo: should we refcount subprocesses?
+  mi_lock_done(&subproc->os_abandoned_pages_lock);
+  mi_lock_done(&subproc->arena_reserve_lock);
+  _mi_meta_free(subproc, sizeof(mi_subproc_t), subproc->memid);
 }
 
+void mi_subproc_add_current_thread(mi_subproc_id_t subproc_id) {
+  mi_tld_t* tld = mi_tld();
+  if (tld == NULL) return;
+  mi_assert(tld->subproc == &subproc_main);
+  if (tld->subproc != &subproc_main) return;
+  tld->subproc = _mi_subproc_from_id(subproc_id);
+}
+
+
+/* -----------------------------------------------------------
+  Allocate heap data
+----------------------------------------------------------- */
+
 // Initialize the thread local default heap, called from `mi_thread_init`
-static bool _mi_heap_init(void) {
-  if (mi_heap_is_initialized(mi_get_default_heap())) return true;
+static bool _mi_thread_heap_init(void) {
+  if (mi_heap_is_initialized(mi_prim_get_default_heap())) return true;
   if (_mi_is_main_thread()) {
-    // mi_assert_internal(_mi_heap_main.thread_id != 0);  // can happen on freeBSD where alloc is called before any initialization
+    // mi_assert_internal(heap_main.thread_id != 0);  // can happen on freeBSD where alloc is called before any initialization
     // the main heap is statically allocated
     mi_heap_main_init();
-    _mi_heap_set_default_direct(&_mi_heap_main);
-    //mi_assert_internal(_mi_heap_default->tld->heap_backing == mi_get_default_heap());
+    _mi_heap_set_default_direct(&heap_main);
+    //mi_assert_internal(_mi_heap_default->tld->heap_backing == mi_prim_get_default_heap());
   }
   else {
-    // use `_mi_os_alloc` to allocate directly from the OS
-    mi_thread_data_t* td = mi_thread_data_alloc();
-    if (td == NULL) return false;
-
-    // OS allocated so already zero initialized
-    mi_tld_t*  tld = &td->tld;
-    mi_heap_t* heap = &td->heap;
-    _mi_memcpy_aligned(tld, &tld_empty, sizeof(*tld));
-    _mi_memcpy_aligned(heap, &_mi_heap_empty, sizeof(*heap));
-    heap->thread_id = _mi_thread_id();
-    _mi_random_init(&heap->random);
-    heap->cookie  = _mi_heap_random_next(heap) | 1;
-    heap->keys[0] = _mi_heap_random_next(heap);
-    heap->keys[1] = _mi_heap_random_next(heap);
-    heap->tld = tld;
-    tld->heap_backing = heap;
-    tld->heaps = heap;
-    tld->segments.stats = &tld->stats;
-    tld->segments.os = &tld->os;
-    tld->os.stats = &tld->stats;
-    _mi_heap_set_default_direct(heap);    
+    // allocates tld data
+    // note: we cannot access thread-locals yet as that can cause (recursive) allocation
+    // (on macOS <= 14 for example where the loader allocates thread-local data on demand).
+    mi_tld_t* tld = mi_tld_alloc();
+
+    // allocate and initialize the heap
+    mi_heap_t* heap = _mi_heap_create(0 /* default tag */, false /* allow destroy? */, _mi_arena_id_none(), tld);
+
+    // associate the heap with this thread
+    // (this is safe, on macOS for example, the heap is set in a dedicated TLS slot and thus does not cause recursive allocation)
+    _mi_heap_set_default_direct(heap);
+
+    // now that the heap is set for this thread, we can set the thread-local tld.
+    thread_tld = tld;
   }
   return false;
 }
 
+
 // Free the thread local default heap (called from `mi_thread_done`)
-static bool _mi_heap_done(mi_heap_t* heap) {
+static bool _mi_thread_heap_done(mi_heap_t* heap) {
   if (!mi_heap_is_initialized(heap)) return true;
 
   // reset default heap
-  _mi_heap_set_default_direct(_mi_is_main_thread() ? &_mi_heap_main : (mi_heap_t*)&_mi_heap_empty);
+  _mi_heap_set_default_direct(_mi_is_main_thread() ? &heap_main : (mi_heap_t*)&_mi_heap_empty);
 
   // switch to backing heap
   heap = heap->tld->heap_backing;
@@ -313,30 +488,22 @@ static bool _mi_heap_done(mi_heap_t* heap) {
   mi_assert_internal(mi_heap_is_backing(heap));
 
   // collect if not the main thread
-  if (heap != &_mi_heap_main) {
+  if (heap != &heap_main) {
     _mi_heap_collect_abandon(heap);
   }
-  
-  // merge stats
-  _mi_stats_done(&heap->tld->stats);  
-
-  // free if not the main thread
-  if (heap != &_mi_heap_main) {
-    // the following assertion does not always hold for huge segments as those are always treated
-    // as abondened: one may allocate it in one thread, but deallocate in another in which case
-    // the count can be too large or negative. todo: perhaps not count huge segments? see issue #363
-    // mi_assert_internal(heap->tld->segments.count == 0 || heap->thread_id != _mi_thread_id());
-    mi_thread_data_free((mi_thread_data_t*)heap);
-  }
-  else {
-    mi_thread_data_collect(); // free cached thread metadata  
-    #if 0  
+
+  // free heap meta data
+  _mi_meta_free(heap, sizeof(mi_heap_t), heap->memid);
+
+  if (heap == &heap_main) {
+    #if 0
     // never free the main thread even in debug mode; if a dll is linked statically with mimalloc,
     // there may still be delete/free calls after the mi_fls_done is called. Issue #207
     _mi_heap_destroy_pages(heap);
-    mi_assert_internal(heap->tld->heap_backing == &_mi_heap_main);
+    mi_assert_internal(heap->tld->heap_backing == &heap_main);
     #endif
   }
+
   return false;
 }
 
@@ -350,7 +517,7 @@ static bool _mi_heap_done(mi_heap_t* heap) {
 // 1. windows dynamic library:
 //     call from DllMain on DLL_THREAD_DETACH
 // 2. windows static library:
-//     use `FlsAlloc` to call a destructor when the thread is done
+//     use special linker section to call a destructor when the thread is done
 // 3. unix, pthreads:
 //     use a pthread key to call a destructor when a pthread is done
 //
@@ -358,101 +525,74 @@ static bool _mi_heap_done(mi_heap_t* heap) {
 // to set up the thread local keys.
 // --------------------------------------------------------
 
-static void _mi_thread_done(mi_heap_t* default_heap);
-
-#if defined(_WIN32) && defined(MI_SHARED_LIB)
-  // nothing to do as it is done in DllMain
-#elif defined(_WIN32) && !defined(MI_SHARED_LIB)
-  // use thread local storage keys to detect thread ending
-  #include <windows.h>
-  #include <fibersapi.h>
-  #if (_WIN32_WINNT < 0x600)  // before Windows Vista 
-  WINBASEAPI DWORD WINAPI FlsAlloc( _In_opt_ PFLS_CALLBACK_FUNCTION lpCallback );
-  WINBASEAPI PVOID WINAPI FlsGetValue( _In_ DWORD dwFlsIndex );
-  WINBASEAPI BOOL  WINAPI FlsSetValue( _In_ DWORD dwFlsIndex, _In_opt_ PVOID lpFlsData );
-  WINBASEAPI BOOL  WINAPI FlsFree(_In_ DWORD dwFlsIndex);
-  #endif
-  static DWORD mi_fls_key = (DWORD)(-1);
-  static void NTAPI mi_fls_done(PVOID value) {
-    if (value!=NULL) _mi_thread_done((mi_heap_t*)value);
-  }
-#elif defined(MI_USE_PTHREADS)
-  // use pthread local storage keys to detect thread ending
-  // (and used with MI_TLS_PTHREADS for the default heap)
-  pthread_key_t _mi_heap_default_key = (pthread_key_t)(-1);
-  static void mi_pthread_done(void* value) {
-    if (value!=NULL) _mi_thread_done((mi_heap_t*)value);
-  }
-#elif defined(__wasi__)
-// no pthreads in the WebAssembly Standard Interface
-#else
-  #pragma message("define a way to call mi_thread_done when a thread is done")
-#endif
-
 // Set up handlers so `mi_thread_done` is called automatically
 static void mi_process_setup_auto_thread_done(void) {
   static bool tls_initialized = false; // fine if it races
   if (tls_initialized) return;
   tls_initialized = true;
-  #if defined(_WIN32) && defined(MI_SHARED_LIB)
-    // nothing to do as it is done in DllMain
-  #elif defined(_WIN32) && !defined(MI_SHARED_LIB)
-    mi_fls_key = FlsAlloc(&mi_fls_done);
-  #elif defined(MI_USE_PTHREADS)
-    mi_assert_internal(_mi_heap_default_key == (pthread_key_t)(-1));
-    pthread_key_create(&_mi_heap_default_key, &mi_pthread_done);
-  #endif
-  _mi_heap_set_default_direct(&_mi_heap_main);
+  _mi_prim_thread_init_auto_done();
+  _mi_heap_set_default_direct(&heap_main);
 }
 
 
 bool _mi_is_main_thread(void) {
-  return (_mi_heap_main.thread_id==0 || _mi_heap_main.thread_id == _mi_thread_id());
+  return (tld_main.thread_id==0 || tld_main.thread_id == _mi_thread_id());
 }
 
-static _Atomic(size_t) thread_count = MI_ATOMIC_VAR_INIT(1);
-
-size_t  _mi_current_thread_count(void) {
-  return mi_atomic_load_relaxed(&thread_count);
-}
 
 // This is called from the `mi_malloc_generic`
 void mi_thread_init(void) mi_attr_noexcept
 {
   // ensure our process has started already
   mi_process_init();
-  
+
   // initialize the thread local default heap
   // (this will call `_mi_heap_set_default_direct` and thus set the
   //  fiber/pthread key to a non-zero value, ensuring `_mi_thread_done` is called)
-  if (_mi_heap_init()) return;  // returns true if already initialized
+  if (_mi_thread_heap_init()) return;  // returns true if already initialized
 
-  _mi_stat_increase(&_mi_stats_main.threads, 1);
-  mi_atomic_increment_relaxed(&thread_count);
+  mi_subproc_stat_increase(_mi_subproc_main(), threads, 1);
   //_mi_verbose_message("thread init: 0x%zx\n", _mi_thread_id());
 }
 
 void mi_thread_done(void) mi_attr_noexcept {
-  _mi_thread_done(mi_get_default_heap());
+  _mi_thread_done(NULL);
 }
 
-static void _mi_thread_done(mi_heap_t* heap) {
-  mi_atomic_decrement_relaxed(&thread_count);
-  _mi_stat_decrease(&_mi_stats_main.threads, 1);
+void _mi_thread_done(mi_heap_t* heap)
+{
+  // calling with NULL implies using the default heap
+  if (heap == NULL) {
+    heap = mi_prim_get_default_heap();
+    if (heap == NULL) return;
+  }
+
+  // prevent re-entrancy through heap_done/heap_set_default_direct (issue #699)
+  if (!mi_heap_is_initialized(heap)) {
+    return;
+  }
+
+  // adjust stats
+  mi_subproc_stat_decrease(_mi_subproc_main(), threads, 1);
 
   // check thread-id as on Windows shutdown with FLS the main (exit) thread may call this on thread-local heaps...
-  if (heap->thread_id != _mi_thread_id()) return;
-  
+  if (heap->tld->thread_id != _mi_prim_thread_id()) return;
+
   // abandon the thread local heap
-  if (_mi_heap_done(heap)) return;  // returns true if already ran
+  // note: we store the tld as we should avoid reading `thread_tld` at this point (to avoid reinitializing the thread local storage)
+  mi_tld_t* tld = heap->tld;
+  _mi_thread_heap_done(heap);  // returns true if already ran
+
+  // free thread local data
+  mi_tld_free(tld);
 }
 
 void _mi_heap_set_default_direct(mi_heap_t* heap)  {
   mi_assert_internal(heap != NULL);
   #if defined(MI_TLS_SLOT)
-  mi_tls_slot_set(MI_TLS_SLOT,heap);
+  mi_prim_tls_slot_set(MI_TLS_SLOT,heap);
   #elif defined(MI_TLS_PTHREAD_SLOT_OFS)
-  *mi_tls_pthread_heap_slot() = heap;
+  *mi_prim_tls_pthread_heap_slot() = heap;
   #elif defined(MI_TLS_PTHREAD)
   // we use _mi_heap_default_key
   #else
@@ -461,134 +601,133 @@ void _mi_heap_set_default_direct(mi_heap_t* heap)  {
 
   // ensure the default heap is passed to `_mi_thread_done`
   // setting to a non-NULL value also ensures `mi_thread_done` is called.
-  #if defined(_WIN32) && defined(MI_SHARED_LIB)
-    // nothing to do as it is done in DllMain
-  #elif defined(_WIN32) && !defined(MI_SHARED_LIB)
-    mi_assert_internal(mi_fls_key != 0);
-    FlsSetValue(mi_fls_key, heap);
-  #elif defined(MI_USE_PTHREADS)
-  if (_mi_heap_default_key != (pthread_key_t)(-1)) {  // can happen during recursive invocation on freeBSD
-    pthread_setspecific(_mi_heap_default_key, heap);
-  }
-  #endif
+  _mi_prim_thread_associate_default_heap(heap);
 }
 
+void mi_thread_set_in_threadpool(void) mi_attr_noexcept {
+  mi_tld_t* tld = mi_tld();
+  if (tld!=NULL) {
+    tld->is_in_threadpool = true;
+  }
+}
 
 // --------------------------------------------------------
 // Run functions on process init/done, and thread init/done
 // --------------------------------------------------------
-static void mi_cdecl mi_process_done(void);
-
 static bool os_preloading = true;    // true until this module is initialized
-static bool mi_redirected = false;   // true if malloc redirects to mi_malloc
 
 // Returns true if this module has not been initialized; Don't use C runtime routines until it returns false.
-bool _mi_preloading(void) {
+bool mi_decl_noinline _mi_preloading(void) {
   return os_preloading;
 }
 
+// Returns true if mimalloc was redirected
 mi_decl_nodiscard bool mi_is_redirected(void) mi_attr_noexcept {
-  return mi_redirected;
-}
-
-// Communicate with the redirection module on Windows
-#if defined(_WIN32) && defined(MI_SHARED_LIB) && !defined(MI_WIN_NOREDIRECT)
-#ifdef __cplusplus
-extern "C" {
-#endif
-mi_decl_export void _mi_redirect_entry(DWORD reason) {
-  // called on redirection; careful as this may be called before DllMain
-  if (reason == DLL_PROCESS_ATTACH) {
-    mi_redirected = true;
-  }
-  else if (reason == DLL_PROCESS_DETACH) {
-    mi_redirected = false;
-  }
-  else if (reason == DLL_THREAD_DETACH) {
-    mi_thread_done();
-  }
-}
-__declspec(dllimport) bool mi_cdecl mi_allocator_init(const char** message);
-__declspec(dllimport) void mi_cdecl mi_allocator_done(void);
-#ifdef __cplusplus
+  return _mi_is_redirected();
 }
-#endif
-#else
-static bool mi_allocator_init(const char** message) {
-  if (message != NULL) *message = NULL;
-  return true;
-}
-static void mi_allocator_done(void) {
-  // nothing to do
-}
-#endif
 
-// Called once by the process loader
-static void mi_process_load(void) {
+// Called once by the process loader from `src/prim/prim.c`
+void _mi_auto_process_init(void) {
   mi_heap_main_init();
-  #if defined(MI_TLS_RECURSE_GUARD)
+  #if defined(__APPLE__) || defined(MI_TLS_RECURSE_GUARD)
   volatile mi_heap_t* dummy = _mi_heap_default; // access TLS to allocate it before setting tls_initialized to true;
-  MI_UNUSED(dummy);
+  if (dummy == NULL) return;                    // use dummy or otherwise the access may get optimized away (issue #697)
   #endif
   os_preloading = false;
-  #if !(defined(_WIN32) && defined(MI_SHARED_LIB))  // use Dll process detach (see below) instead of atexit (issue #521)
-  atexit(&mi_process_done);  
-  #endif
+  mi_assert_internal(_mi_is_main_thread());
   _mi_options_init();
+  mi_process_setup_auto_thread_done();
   mi_process_init();
-  //mi_stats_reset();-
-  if (mi_redirected) _mi_verbose_message("malloc is redirected.\n");
+  if (_mi_is_redirected()) _mi_verbose_message("malloc is redirected.\n");
 
   // show message from the redirector (if present)
   const char* msg = NULL;
-  mi_allocator_init(&msg);
+  _mi_allocator_init(&msg);
   if (msg != NULL && (mi_option_is_enabled(mi_option_verbose) || mi_option_is_enabled(mi_option_show_errors))) {
     _mi_fputs(NULL,NULL,NULL,msg);
   }
+
+  // reseed random
+  _mi_random_reinit_if_weak(&heap_main.random);
 }
 
-#if defined(_WIN32) && (defined(_M_IX86) || defined(_M_X64))
-#include <intrin.h>
+// CPU features
 mi_decl_cache_align bool _mi_cpu_has_fsrm = false;
+mi_decl_cache_align bool _mi_cpu_has_erms = false;
+mi_decl_cache_align bool _mi_cpu_has_popcnt = false;
+
+#if (MI_ARCH_X64 || MI_ARCH_X86)
+#if defined(__GNUC__)
+#include <cpuid.h>
+static bool mi_cpuid(uint32_t* regs4, uint32_t level) {
+  return (__get_cpuid(level, &regs4[0], &regs4[1], &regs4[2], &regs4[3]) == 1);
+}
+
+#elif defined(_MSC_VER)
+static bool mi_cpuid(uint32_t* regs4, uint32_t level) {
+  __cpuid((int32_t*)regs4, (int32_t)level);
+  return true;
+}
+#else
+static bool mi_cpuid(uint32_t* regs4, uint32_t level) {
+  MI_UNUSED(regs4); MI_UNUSED(level);
+  return false;
+}
+#endif
 
 static void mi_detect_cpu_features(void) {
-  // FSRM for fast rep movsb support (AMD Zen3+ (~2020) or Intel Ice Lake+ (~2017))
-  int32_t cpu_info[4];
-  __cpuid(cpu_info, 7);
-  _mi_cpu_has_fsrm = ((cpu_info[3] & (1 << 4)) != 0); // bit 4 of EDX : see <https ://en.wikipedia.org/wiki/CPUID#EAX=7,_ECX=0:_Extended_Features>
+  // FSRM for fast short rep movsb/stosb support (AMD Zen3+ (~2020) or Intel Ice Lake+ (~2017))
+  // EMRS for fast enhanced rep movsb/stosb support
+  uint32_t cpu_info[4];
+  if (mi_cpuid(cpu_info, 7)) {
+    _mi_cpu_has_fsrm = ((cpu_info[3] & (1 << 4)) != 0); // bit 4 of EDX : see <https://en.wikipedia.org/wiki/CPUID#EAX=7,_ECX=0:_Extended_Features>
+    _mi_cpu_has_erms = ((cpu_info[1] & (1 << 9)) != 0); // bit 9 of EBX : see <https://en.wikipedia.org/wiki/CPUID#EAX=7,_ECX=0:_Extended_Features>
+  }
+  if (mi_cpuid(cpu_info, 1)) {
+    _mi_cpu_has_popcnt = ((cpu_info[2] & (1 << 23)) != 0); // bit 23 of ECX : see <https://en.wikipedia.org/wiki/CPUID#EAX=1:_Processor_Info_and_Feature_Bits>
+  }
 }
+
 #else
 static void mi_detect_cpu_features(void) {
-  // nothing
+  #if MI_ARCH_ARM64
+  _mi_cpu_has_popcnt = true;
+  #endif
 }
 #endif
 
+
 // Initialize the process; called by thread_init or the process loader
 void mi_process_init(void) mi_attr_noexcept {
   // ensure we are called once
-  if (_mi_process_is_initialized) return;
-  _mi_verbose_message("process init: 0x%zx\n", _mi_thread_id());
+  static mi_atomic_once_t process_init;
+	#if _MSC_VER < 1920
+	mi_heap_main_init(); // vs2017 can dynamically re-initialize heap_main
+	#endif
+  if (!mi_atomic_once(&process_init)) return;
   _mi_process_is_initialized = true;
-  mi_process_setup_auto_thread_done();
+  _mi_verbose_message("process init: 0x%zx\n", _mi_thread_id());
 
-  
   mi_detect_cpu_features();
+  _mi_stats_init();
   _mi_os_init();
+  _mi_page_map_init();
   mi_heap_main_init();
-  #if (MI_DEBUG)
-  _mi_verbose_message("debug level : %d\n", MI_DEBUG);
-  #endif
-  _mi_verbose_message("secure level: %d\n", MI_SECURE);
+  mi_tld_main_init();
+  // the following two can potentially allocate (on freeBSD for locks and thread keys)
+  mi_subproc_main_init();
+  mi_process_setup_auto_thread_done();
   mi_thread_init();
 
-  #if defined(_WIN32) && !defined(MI_SHARED_LIB)
-  // When building as a static lib the FLS cleanup happens to early for the main thread.
+  #if defined(_WIN32) && defined(MI_WIN_USE_FLS)
+  // On windows, when building as a static lib the FLS cleanup happens to early for the main thread.
   // To avoid this, set the FLS value for the main thread to NULL so the fls cleanup
   // will not call _mi_thread_done on the (still executing) main thread. See issue #508.
-  FlsSetValue(mi_fls_key, NULL);
+  _mi_prim_thread_associate_default_heap(NULL);
   #endif
 
-  mi_stats_reset();  // only call stat reset *after* thread init (or the heap tld == NULL)
+  // mi_stats_reset();  // only call stat reset *after* thread init (or the heap tld == NULL)
+  mi_track_init();
 
   if (mi_option_is_enabled(mi_option_reserve_huge_os_pages)) {
     size_t pages = mi_option_get_clamp(mi_option_reserve_huge_os_pages, 0, 128*1024);
@@ -598,17 +737,17 @@ void mi_process_init(void) mi_attr_noexcept {
     } else {
       mi_reserve_huge_os_pages_interleave(pages, 0, pages*500);
     }
-  } 
+  }
   if (mi_option_is_enabled(mi_option_reserve_os_memory)) {
     long ksize = mi_option_get(mi_option_reserve_os_memory);
     if (ksize > 0) {
-      mi_reserve_os_memory((size_t)ksize*MI_KiB, true /* commit? */, true /* allow large pages? */);
+      mi_reserve_os_memory((size_t)ksize*MI_KiB, true, true);
     }
   }
 }
 
-// Called when the process is done (through `at_exit`)
-static void mi_cdecl mi_process_done(void) {
+// Called when the process is done (cdecl as it is used with `at_exit` on some platforms)
+void mi_cdecl mi_process_done(void) mi_attr_noexcept {
   // only shutdown if we were initialized
   if (!_mi_process_is_initialized) return;
   // ensure we are called once
@@ -616,80 +755,43 @@ static void mi_cdecl mi_process_done(void) {
   if (process_done) return;
   process_done = true;
 
-  #if defined(_WIN32) && !defined(MI_SHARED_LIB)
-  FlsFree(mi_fls_key);  // call thread-done on all threads (except the main thread) to prevent dangling callback pointer if statically linked with a DLL; Issue #208
-  #endif
-  
+  // get the default heap so we don't need to acces thread locals anymore
+  mi_heap_t* heap = mi_prim_get_default_heap();  // use prim to not initialize any heap
+  mi_assert_internal(heap != NULL);
+
+  // release any thread specific resources and ensure _mi_thread_done is called on all but the main thread
+  _mi_prim_thread_done_auto_done();
+
+
   #ifndef MI_SKIP_COLLECT_ON_EXIT
-    #if (MI_DEBUG != 0) || !defined(MI_SHARED_LIB)  
+    #if (MI_DEBUG || !defined(MI_SHARED_LIB))
     // free all memory if possible on process exit. This is not needed for a stand-alone process
     // but should be done if mimalloc is statically linked into another shared library which
     // is repeatedly loaded/unloaded, see issue #281.
-    mi_collect(true /* force */ );
+    mi_heap_collect(heap, true /* force */ );
     #endif
   #endif
 
+  // Forcefully release all retained memory; this can be dangerous in general if overriding regular malloc/free
+  // since after process_done there might still be other code running that calls `free` (like at_exit routines,
+  // or C-runtime termination code.
+  if (mi_option_is_enabled(mi_option_destroy_on_exit)) {
+    mi_heap_collect(heap, true /* force */);
+    _mi_heap_unsafe_destroy_all(heap);     // forcefully release all memory held by all heaps (of this thread only!)
+    _mi_arenas_unsafe_destroy_all(heap->tld);
+    _mi_page_map_unsafe_destroy(_mi_subproc_main());
+  }
+  //_mi_page_map_unsafe_destroy(_mi_subproc_main());
+
   if (mi_option_is_enabled(mi_option_show_stats) || mi_option_is_enabled(mi_option_verbose)) {
-    mi_stats_print(NULL);
+    _mi_stats_print(&_mi_subproc_main()->stats, NULL, NULL);  // use always main subproc at process exit to avoid dereferencing the heap (as it may be destroyed by now)
   }
-  mi_allocator_done();  
-  _mi_verbose_message("process done: 0x%zx\n", _mi_heap_main.thread_id);
+  _mi_allocator_done();
+  _mi_verbose_message("process done: 0x%zx\n", tld_main.thread_id);
   os_preloading = true; // don't call the C runtime anymore
 }
 
-
-
-#if defined(_WIN32) && defined(MI_SHARED_LIB)
-  // Windows DLL: easy to hook into process_init and thread_done
-  __declspec(dllexport) BOOL WINAPI DllMain(HINSTANCE inst, DWORD reason, LPVOID reserved) {
-    MI_UNUSED(reserved);
-    MI_UNUSED(inst);
-    if (reason==DLL_PROCESS_ATTACH) {
-      mi_process_load();
-    }
-    else if (reason==DLL_PROCESS_DETACH) {
-      mi_process_done();
-    }
-    else if (reason==DLL_THREAD_DETACH) {
-      if (!mi_is_redirected()) {
-        mi_thread_done();
-      }
-    }    
-    return TRUE;
-  }
-
-#elif defined(_MSC_VER)
-  // MSVC: use data section magic for static libraries
-  // See <https://www.codeguru.com/cpp/misc/misc/applicationcontrol/article.php/c6945/Running-Code-Before-and-After-Main.htm>
-  static int _mi_process_init(void) {
-    mi_process_load();
-    return 0;
-  }
-  typedef int(*_mi_crt_callback_t)(void);
-  #if defined(_M_X64) || defined(_M_ARM64)
-    __pragma(comment(linker, "/include:" "_mi_msvc_initu"))
-    #pragma section(".CRT$XIU", long, read)
-  #else
-    __pragma(comment(linker, "/include:" "__mi_msvc_initu"))
-  #endif
-  #pragma data_seg(".CRT$XIU")
-  mi_decl_externc _mi_crt_callback_t _mi_msvc_initu[] = { &_mi_process_init };
-  #pragma data_seg()
-
-#elif defined(__cplusplus)
-  // C++: use static initialization to detect process start
-  static bool _mi_process_init(void) {
-    mi_process_load();
-    return (_mi_heap_main.thread_id != 0);
-  }
-  static bool mi_initialized = _mi_process_init();
-
-#elif defined(__GNUC__) || defined(__clang__)
-  // GCC,Clang: use the constructor attribute
-  static void __attribute__((constructor)) _mi_process_init(void) {
-    mi_process_load();
-  }
-
-#else
-#pragma message("define a way to call mi_process_load on your platform")
-#endif
+void mi_cdecl _mi_auto_process_done(void) mi_attr_noexcept {
+  if (_mi_option_get_fast(mi_option_destroy_on_exit)>1) return;
+  mi_process_done();
+}
diff --git a/depends/mimalloc/src/libc.c b/depends/mimalloc/src/libc.c
new file mode 100644
index 000000000000..b40d1204d3bb
--- /dev/null
+++ b/depends/mimalloc/src/libc.c
@@ -0,0 +1,417 @@
+/* ----------------------------------------------------------------------------
+Copyright (c) 2018-2024, Microsoft Research, Daan Leijen
+This is free software; you can redistribute it and/or modify it under the
+terms of the MIT license. A copy of the license can be found in the file
+"LICENSE" at the root of this distribution.
+-----------------------------------------------------------------------------*/
+
+// --------------------------------------------------------
+// This module defines various std libc functions to reduce
+// the dependency on libc, and also prevent errors caused
+// by some libc implementations when called before `main`
+// executes (due to malloc redirection)
+// --------------------------------------------------------
+
+#include "mimalloc.h"
+#include "mimalloc/internal.h"
+#include "mimalloc/prim.h"      // mi_prim_getenv
+
+char _mi_toupper(char c) {
+  if (c >= 'a' && c <= 'z') return (c - 'a' + 'A');
+                       else return c;
+}
+
+int _mi_strnicmp(const char* s, const char* t, size_t n) {
+  if (n == 0) return 0;
+  for (; *s != 0 && *t != 0 && n > 0; s++, t++, n--) {
+    if (_mi_toupper(*s) != _mi_toupper(*t)) break;
+  }
+  return (n == 0 ? 0 : *s - *t);
+}
+
+void _mi_strlcpy(char* dest, const char* src, size_t dest_size) {
+  if (dest==NULL || src==NULL || dest_size == 0) return;
+  // copy until end of src, or when dest is (almost) full
+  while (*src != 0 && dest_size > 1) {
+    *dest++ = *src++;
+    dest_size--;
+  }
+  // always zero terminate
+  *dest = 0;
+}
+
+void _mi_strlcat(char* dest, const char* src, size_t dest_size) {
+  if (dest==NULL || src==NULL || dest_size == 0) return;
+  // find end of string in the dest buffer
+  while (*dest != 0 && dest_size > 1) {
+    dest++;
+    dest_size--;
+  }
+  // and catenate
+  _mi_strlcpy(dest, src, dest_size);
+}
+
+size_t _mi_strlen(const char* s) {
+  if (s==NULL) return 0;
+  size_t len = 0;
+  while(s[len] != 0) { len++; }
+  return len;
+}
+
+size_t _mi_strnlen(const char* s, size_t max_len) {
+  if (s==NULL) return 0;
+  size_t len = 0;
+  while(s[len] != 0 && len < max_len) { len++; }
+  return len;
+}
+
+#ifdef MI_NO_GETENV
+bool _mi_getenv(const char* name, char* result, size_t result_size) {
+  MI_UNUSED(name);
+  MI_UNUSED(result);
+  MI_UNUSED(result_size);
+  return false;
+}
+#else
+bool _mi_getenv(const char* name, char* result, size_t result_size) {
+  if (name==NULL || result == NULL || result_size < 64) return false;
+  return _mi_prim_getenv(name,result,result_size);
+}
+#endif
+
+// --------------------------------------------------------
+// Define our own limited `_mi_vsnprintf` and `_mi_snprintf`
+// This is mostly to avoid calling these when libc is not yet
+// initialized (and to reduce dependencies)
+//
+// format:      d i, p x u, s
+// prec:        z l ll L
+// width:       10
+// align-left:  -
+// fill:        0
+// plus:        +
+// --------------------------------------------------------
+
+static void mi_outc(char c, char** out, char* end) {
+  char* p = *out;
+  if (p >= end) return;
+  *p = c;
+  *out = p + 1;
+}
+
+static void mi_outs(const char* s, char** out, char* end) {
+  if (s == NULL) return;
+  char* p = *out;
+  while (*s != 0 && p < end) {
+    *p++ = *s++;
+  }
+  *out = p;
+}
+
+static void mi_out_fill(char fill, size_t len, char** out, char* end) {
+  char* p = *out;
+  for (size_t i = 0; i < len && p < end; i++) {
+    *p++ = fill;
+  }
+  *out = p;
+}
+
+static void mi_out_alignright(char fill, char* start, size_t len, size_t extra, char* end) {
+  if (len == 0 || extra == 0) return;
+  if (start + len + extra >= end) return;
+  // move `len` characters to the right (in reverse since it can overlap)
+  for (size_t i = 1; i <= len; i++) {
+    start[len + extra - i] = start[len - i];
+  }
+  // and fill the start
+  for (size_t i = 0; i < extra; i++) {
+    start[i] = fill;
+  }
+}
+
+
+static void mi_out_num(uintmax_t x, size_t base, char prefix, char** out, char* end)
+{
+  if (x == 0 || base == 0 || base > 16) {
+    if (prefix != 0) { mi_outc(prefix, out, end); }
+    mi_outc('0',out,end);
+  }
+  else {
+    // output digits in reverse
+    char* start = *out;
+    while (x > 0) {
+      char digit = (char)(x % base);
+      mi_outc((digit <= 9 ? '0' + digit : 'A' + digit - 10),out,end);
+      x = x / base;
+    }
+    if (prefix != 0) {
+      mi_outc(prefix, out, end);
+    }
+    size_t len = *out - start;
+    // and reverse in-place
+    for (size_t i = 0; i < (len / 2); i++) {
+      char c = start[len - i - 1];
+      start[len - i - 1] = start[i];
+      start[i] = c;
+    }
+  }
+}
+
+
+#define MI_NEXTC()  c = *in; if (c==0) break; in++;
+
+int _mi_vsnprintf(char* buf, size_t bufsize, const char* fmt, va_list args) {
+  if (buf == NULL || bufsize == 0 || fmt == NULL) return 0;
+  buf[bufsize - 1] = 0;
+  char* const end = buf + (bufsize - 1);
+  const char* in = fmt;
+  char* out = buf;
+  while (true) {
+    if (out >= end) break;
+    char c;
+    MI_NEXTC();
+    if (c != '%') {
+      if (c == '\\') {
+        MI_NEXTC();
+        switch (c) {
+        case 'e': mi_outc('\x1B', &out, end); break;
+        case 't': mi_outc('\t', &out, end); break;
+        case 'n': mi_outc('\n', &out, end); break;
+        case 'r': mi_outc('\r', &out, end); break;
+        case '\\': mi_outc('\\', &out, end); break;
+        default: /* ignore */ break;
+        }
+      }
+      else if ((c >= ' ' && c <= '~') || c=='\n' || c=='\r' || c=='\t' || c=='\x1b') { // output visible ascii or standard control only
+        mi_outc(c, &out, end);
+      }
+    }
+    else {
+      MI_NEXTC();
+      char   fill = ' ';
+      size_t width = 0;
+      char   numtype = 'd';
+      char   numplus = 0;
+      bool   alignright = true;
+      if (c == '+' || c == ' ') { numplus = c; MI_NEXTC(); }
+      if (c == '-') { alignright = false; MI_NEXTC(); }
+      if (c == '0') { fill = '0'; MI_NEXTC(); }
+      if (c >= '1' && c <= '9') {
+        width = (c - '0'); MI_NEXTC();
+        while (c >= '0' && c <= '9') {
+          width = (10 * width) + (c - '0'); MI_NEXTC();
+        }
+        if (c == 0) break;  // extra check due to while
+      }
+      if (c == 'z' || c == 't' || c == 'L') { numtype = c; MI_NEXTC(); }
+      else if (c == 'l') {
+        numtype = c; MI_NEXTC();
+        if (c == 'l') { numtype = 'L'; MI_NEXTC(); }
+      }
+
+      char* start = out;
+      if (c == '%') {
+        mi_outc('%', &out, end);
+      }
+      else if (c == 's') {
+        // string
+        const char* s = va_arg(args, const char*);
+        mi_outs(s, &out, end);
+      }
+      else if (c == 'p' || c == 'x' || c == 'u') {
+        // unsigned
+        uintmax_t x = 0;
+        if (c == 'x' || c == 'u') {
+          if (numtype == 'z')       x = va_arg(args, size_t);
+          else if (numtype == 't')  x = va_arg(args, uintptr_t); // unsigned ptrdiff_t
+          else if (numtype == 'L')  x = va_arg(args, unsigned long long);
+          else if (numtype == 'l')  x = va_arg(args, unsigned long);
+                               else x = va_arg(args, unsigned int);
+        }
+        else if (c == 'p') {
+          x = va_arg(args, uintptr_t);
+          mi_outs("0x", &out, end);
+          start = out;
+          width = (width >= 2 ? width - 2 : 0);
+        }
+        if (width == 0 && (c == 'x' || c == 'p')) {
+          if (c == 'p')   { width = 2 * (x <= UINT32_MAX ? 4 : ((x >> 16) <= UINT32_MAX ? 6 : sizeof(void*))); }
+          if (width == 0) { width = 2; }
+          fill = '0';
+        }
+        mi_out_num(x, (c == 'x' || c == 'p' ? 16 : 10), numplus, &out, end);
+      }
+      else if (c == 'i' || c == 'd') {
+        // signed
+        intmax_t x = 0;
+        if (numtype == 'z')       x = va_arg(args, intptr_t );
+        else if (numtype == 't')  x = va_arg(args, ptrdiff_t);
+        else if (numtype == 'L')  x = va_arg(args, long long);
+        else if (numtype == 'l')  x = va_arg(args, long);
+                             else x = va_arg(args, int);
+        char pre = 0;
+        if (x < 0) {
+          pre = '-';
+          if (x > INTMAX_MIN) { x = -x; }
+        }
+        else if (numplus != 0) {
+          pre = numplus;
+        }
+        mi_out_num((uintmax_t)x, 10, pre, &out, end);
+      }
+      else if (c >= ' ' && c <= '~') {
+        // unknown format
+        mi_outc('%', &out, end);
+        mi_outc(c, &out, end);
+      }
+
+      // fill & align
+      mi_assert_internal(out <= end);
+      mi_assert_internal(out >= start);
+      const size_t len = out - start;
+      if (len < width) {
+        mi_out_fill(fill, width - len, &out, end);
+        if (alignright && out <= end) {
+          mi_out_alignright(fill, start, len, width - len, end);
+        }
+      }
+    }
+  }
+  mi_assert_internal(out <= end);
+  *out = 0;
+  return (int)(out - buf);
+}
+
+int _mi_snprintf(char* buf, size_t buflen, const char* fmt, ...) {
+  va_list args;
+  va_start(args, fmt);
+  const int written = _mi_vsnprintf(buf, buflen, fmt, args);
+  va_end(args);
+  return written;
+}
+
+
+
+// --------------------------------------------------------
+// generic trailing and leading zero count, and popcount
+// --------------------------------------------------------
+
+#if !MI_HAS_FAST_BITSCAN
+
+static size_t mi_ctz_generic32(uint32_t x) {
+  // de Bruijn multiplication, see <http://keithandkatie.com/keith/papers/debruijn.html>
+  static const uint8_t debruijn[32] = {
+    0, 1, 28, 2, 29, 14, 24, 3, 30, 22, 20, 15, 25, 17, 4, 8,
+    31, 27, 13, 23, 21, 19, 16, 7, 26, 12, 18, 6, 11, 5, 10, 9
+  };
+  if (x==0) return 32;
+  return debruijn[(uint32_t)((x & -(int32_t)x) * (uint32_t)(0x077CB531U)) >> 27];
+}
+
+static size_t mi_clz_generic32(uint32_t x) {
+  // de Bruijn multiplication, see <http://keithandkatie.com/keith/papers/debruijn.html>
+  static const uint8_t debruijn[32] = {
+    31, 22, 30, 21, 18, 10, 29, 2, 20, 17, 15, 13, 9, 6, 28, 1,
+    23, 19, 11, 3, 16, 14, 7, 24, 12, 4, 8, 25, 5, 26, 27, 0
+  };
+  if (x==0) return 32;
+  x |= x >> 1;
+  x |= x >> 2;
+  x |= x >> 4;
+  x |= x >> 8;
+  x |= x >> 16;
+  return debruijn[(uint32_t)(x * (uint32_t)(0x07C4ACDDU)) >> 27];
+}
+
+size_t _mi_ctz_generic(size_t x) {
+  if (x==0) return MI_SIZE_BITS;
+  #if (MI_SIZE_BITS <= 32)
+    return mi_ctz_generic32((uint32_t)x);
+  #else
+    const uint32_t lo = (uint32_t)x;
+    if (lo != 0) {
+      return mi_ctz_generic32(lo);
+    }
+    else {
+      return (32 + mi_ctz_generic32((uint32_t)(x>>32)));
+    }
+  #endif
+}
+
+size_t _mi_clz_generic(size_t x) {
+  if (x==0) return MI_SIZE_BITS;
+  #if (MI_SIZE_BITS <= 32)
+    return mi_clz_generic32((uint32_t)x);
+  #else
+    const uint32_t hi = (uint32_t)(x>>32);
+    if (hi != 0) {
+      return mi_clz_generic32(hi);
+    }
+    else {
+      return 32 + mi_clz_generic32((uint32_t)x);
+    }
+  #endif
+}
+
+#endif // bit scan
+
+
+#if MI_SIZE_SIZE == 4
+#define mi_mask_even_bits32      (0x55555555)
+#define mi_mask_even_pairs32     (0x33333333)
+#define mi_mask_even_nibbles32   (0x0F0F0F0F)
+
+// sum of all the bytes in `x` if it is guaranteed that the sum < 256!
+static size_t mi_byte_sum32(uint32_t x) {
+  // perform `x * 0x01010101`: the highest byte contains the sum of all bytes.
+  x += (x << 8);
+  x += (x << 16);
+  return (size_t)(x >> 24);
+}
+
+static size_t mi_popcount_generic32(uint32_t x) {
+  // first count each 2-bit group `a`, where: a==0b00 -> 00, a==0b01 -> 01, a==0b10 -> 01, a==0b11 -> 10
+  // in other words, `a - (a>>1)`; to do this in parallel, we need to mask to prevent spilling a bit pair
+  // into the lower bit-pair:
+  x = x - ((x >> 1) & mi_mask_even_bits32);
+  // add the 2-bit pair results
+  x = (x & mi_mask_even_pairs32) + ((x >> 2) & mi_mask_even_pairs32);
+  // add the 4-bit nibble results
+  x = (x + (x >> 4)) & mi_mask_even_nibbles32;
+  // each byte now has a count of its bits, we can sum them now:
+  return mi_byte_sum32(x);
+}
+
+mi_decl_noinline size_t _mi_popcount_generic(size_t x) {
+  if (x<=1) return x;
+  if (~x==0) return MI_SIZE_BITS;
+  return mi_popcount_generic32(x);
+}
+
+#else
+#define mi_mask_even_bits64      (0x5555555555555555)
+#define mi_mask_even_pairs64     (0x3333333333333333)
+#define mi_mask_even_nibbles64   (0x0F0F0F0F0F0F0F0F)
+
+// sum of all the bytes in `x` if it is guaranteed that the sum < 256!
+static size_t mi_byte_sum64(uint64_t x) {
+  x += (x << 8);
+  x += (x << 16);
+  x += (x << 32);
+  return (size_t)(x >> 56);
+}
+
+static size_t mi_popcount_generic64(uint64_t x) {
+  x = x - ((x >> 1) & mi_mask_even_bits64);
+  x = (x & mi_mask_even_pairs64) + ((x >> 2) & mi_mask_even_pairs64);
+  x = (x + (x >> 4)) & mi_mask_even_nibbles64;
+  return mi_byte_sum64(x);
+}
+
+mi_decl_noinline size_t _mi_popcount_generic(size_t x) {
+  if (x<=1) return x;
+  if (~x==0) return MI_SIZE_BITS;
+  return mi_popcount_generic64(x);
+}
+#endif
+
diff --git a/depends/mimalloc/src/options.c b/depends/mimalloc/src/options.c
index 367bc0d27784..540d9f36c271 100644
--- a/depends/mimalloc/src/options.c
+++ b/depends/mimalloc/src/options.c
@@ -5,19 +5,12 @@ terms of the MIT license. A copy of the license can be found in the file
 "LICENSE" at the root of this distribution.
 -----------------------------------------------------------------------------*/
 #include "mimalloc.h"
-#include "mimalloc-internal.h"
-#include "mimalloc-atomic.h"
-
-#include <stdio.h>
-#include <stdlib.h> // strtol
-#include <string.h> // strncpy, strncat, strlen, strstr
-#include <ctype.h>  // toupper
-#include <stdarg.h>
-
-#ifdef _MSC_VER
-#pragma warning(disable:4996)   // strncpy, strncat
-#endif
+#include "mimalloc/internal.h"
+#include "mimalloc/atomic.h"
+#include "mimalloc/prim.h"  // mi_prim_out_stderr
 
+#include <stdio.h>      // stdin/stdout
+#include <stdlib.h>     // abort
 
 static long mi_max_error_count   = 16; // stop outputting errors after this (use < 0 for no limit)
 static long mi_max_warning_count = 16; // stop outputting warnings after this (use < 0 for no limit)
@@ -28,9 +21,6 @@ int mi_version(void) mi_attr_noexcept {
   return MI_MALLOC_VERSION;
 }
 
-#ifdef _WIN32
-#include <conio.h>
-#endif
 
 // --------------------------------------------------------
 // Options
@@ -38,89 +28,238 @@ int mi_version(void) mi_attr_noexcept {
 // concurrently initialized, but an initializing data race
 // is ok since they resolve to the same value.
 // --------------------------------------------------------
-typedef enum mi_init_e {
-  UNINIT,       // not yet initialized
-  DEFAULTED,    // not found in the environment, use default value
-  INITIALIZED   // found in environment or set explicitly
-} mi_init_t;
-
-typedef struct mi_option_desc_s {
-  long        value;  // the value
-  mi_init_t   init;   // is it initialized yet? (from the environment)
-  mi_option_t option; // for debugging: the option index should match the option
-  const char* name;   // option name without `mimalloc_` prefix
-  const char* legacy_name; // potential legacy v1.x option name
-} mi_option_desc_t;
+
 
 #define MI_OPTION(opt)                  mi_option_##opt, #opt, NULL
 #define MI_OPTION_LEGACY(opt,legacy)    mi_option_##opt, #opt, #legacy
 
-static mi_option_desc_t options[_mi_option_last] =
+// Some options can be set at build time for statically linked libraries
+// (use `-DMI_EXTRA_CPPDEFS="opt1=val1;opt2=val2"`)
+//
+// This is useful if we cannot pass them as environment variables
+// (and setting them programmatically would be too late)
+
+#ifndef MI_DEFAULT_VERBOSE
+#define MI_DEFAULT_VERBOSE 0
+#endif
+
+#ifndef MI_DEFAULT_EAGER_COMMIT
+#define MI_DEFAULT_EAGER_COMMIT 1
+#endif
+
+#ifndef MI_DEFAULT_ARENA_EAGER_COMMIT
+#define MI_DEFAULT_ARENA_EAGER_COMMIT 2
+#endif
+
+// in KiB
+#ifndef MI_DEFAULT_ARENA_RESERVE
+ #if (MI_INTPTR_SIZE>4)
+  #define MI_DEFAULT_ARENA_RESERVE 1024L*1024L
+ #else
+  #define MI_DEFAULT_ARENA_RESERVE 128L*1024L
+ #endif
+#endif
+
+#ifndef MI_DEFAULT_DISALLOW_ARENA_ALLOC
+#define MI_DEFAULT_DISALLOW_ARENA_ALLOC 0
+#endif
+
+#ifndef MI_DEFAULT_ALLOW_LARGE_OS_PAGES
+#if defined(__linux__) && !defined(__ANDROID__)
+#define MI_DEFAULT_ALLOW_LARGE_OS_PAGES 2    // enabled, but only use transparent huge pages through madvise
+#else
+#define MI_DEFAULT_ALLOW_LARGE_OS_PAGES 0
+#endif
+#endif
+
+#ifndef MI_DEFAULT_RESERVE_HUGE_OS_PAGES
+#define MI_DEFAULT_RESERVE_HUGE_OS_PAGES 0
+#endif
+
+#ifndef MI_DEFAULT_RESERVE_OS_MEMORY
+#define MI_DEFAULT_RESERVE_OS_MEMORY 0
+#endif
+
+#ifndef MI_DEFAULT_GUARDED_SAMPLE_RATE
+#if MI_GUARDED
+#define MI_DEFAULT_GUARDED_SAMPLE_RATE 4000
+#else
+#define MI_DEFAULT_GUARDED_SAMPLE_RATE 0
+#endif
+#endif
+
+#ifndef MI_DEFAULT_PAGEMAP_COMMIT
+#if defined(__APPLE__)  // when overloading malloc, we still get mixed pointers sometimes on macOS; this avoids a bad access
+#define MI_DEFAULT_PAGEMAP_COMMIT 1
+#else
+#define MI_DEFAULT_PAGEMAP_COMMIT 0
+#endif
+#endif
+
+#ifndef MI_DEFAULT_PAGE_MAX_RECLAIM
+#define MI_DEFAULT_PAGE_MAX_RECLAIM  (-1)               // unlimited
+#endif
+
+#ifndef MI_DEFAULT_PAGE_CROSS_THREAD_MAX_RECLAIM
+#define MI_DEFAULT_PAGE_CROSS_THREAD_MAX_RECLAIM  32
+#endif
+
+// Static options
+static mi_option_desc_t mi_options[_mi_option_last] =
 {
   // stable options
-  #if MI_DEBUG || defined(MI_SHOW_ERRORS)
-  { 1, UNINIT, MI_OPTION(show_errors) },
-  #else
-  { 0, UNINIT, MI_OPTION(show_errors) },
-  #endif
-  { 0, UNINIT, MI_OPTION(show_stats) },
-  { 0, UNINIT, MI_OPTION(verbose) },
-
-  // Some of the following options are experimental and not all combinations are valid. Use with care.
-  { 1, UNINIT, MI_OPTION(eager_commit) },        // commit per segment directly (8MiB)  (but see also `eager_commit_delay`)
-  { 0, UNINIT, MI_OPTION(deprecated_eager_region_commit) },
-  { 0, UNINIT, MI_OPTION(deprecated_reset_decommits) },
-  { 0, UNINIT, MI_OPTION(large_os_pages) },      // use large OS pages, use only with eager commit to prevent fragmentation of VMA's
-  { 0, UNINIT, MI_OPTION(reserve_huge_os_pages) },  // per 1GiB huge pages
-  { -1, UNINIT, MI_OPTION(reserve_huge_os_pages_at) }, // reserve huge pages at node N
-  { 0, UNINIT, MI_OPTION(reserve_os_memory)     },
-  { 0, UNINIT, MI_OPTION(deprecated_segment_cache) },  // cache N segments per thread
-  { 0, UNINIT, MI_OPTION(page_reset) },          // reset page memory on free
-  { 0, UNINIT, MI_OPTION_LEGACY(abandoned_page_decommit, abandoned_page_reset) },// decommit free page memory when a thread terminates  
-  { 0, UNINIT, MI_OPTION(deprecated_segment_reset) },
-  #if defined(__NetBSD__)
-  { 0, UNINIT, MI_OPTION(eager_commit_delay) },  // the first N segments per thread are not eagerly committed
-  #elif defined(_WIN32)
-  { 4, UNINIT, MI_OPTION(eager_commit_delay) },  // the first N segments per thread are not eagerly committed (but per page in the segment on demand)
-  #else
-  { 1, UNINIT, MI_OPTION(eager_commit_delay) },  // the first N segments per thread are not eagerly committed (but per page in the segment on demand)
-  #endif
-  { 25,   UNINIT, MI_OPTION_LEGACY(decommit_delay, reset_delay) }, // page decommit delay in milli-seconds
-  { 0,    UNINIT, MI_OPTION(use_numa_nodes) },    // 0 = use available numa nodes, otherwise use at most N nodes. 
-  { 0,    UNINIT, MI_OPTION(limit_os_alloc) },    // 1 = do not use OS memory for allocation (but only reserved arenas)
-  { 100,  UNINIT, MI_OPTION(os_tag) },            // only apple specific for now but might serve more or less related purpose
-  { 16,   UNINIT, MI_OPTION(max_errors) },        // maximum errors that are output
-  { 16,   UNINIT, MI_OPTION(max_warnings) },      // maximum warnings that are output
-  { 8,    UNINIT, MI_OPTION(max_segment_reclaim)},// max. number of segment reclaims from the abandoned segments per try.  
-  { 1,    UNINIT, MI_OPTION(allow_decommit) },    // decommit slices when no longer used (after decommit_delay milli-seconds)
-  { 500,  UNINIT, MI_OPTION(segment_decommit_delay) }, // decommit delay in milli-seconds for freed segments
-  { 2,    UNINIT, MI_OPTION(decommit_extend_delay) }
+#if MI_DEBUG || defined(MI_SHOW_ERRORS)
+  { 1, MI_OPTION_UNINIT, MI_OPTION(show_errors) },
+#else
+  { 0, MI_OPTION_UNINIT, MI_OPTION(show_errors) },
+#endif
+  { 0, MI_OPTION_UNINIT, MI_OPTION(show_stats) },
+  { MI_DEFAULT_VERBOSE, MI_OPTION_UNINIT, MI_OPTION(verbose) },
+
+  // some of the following options are experimental and not all combinations are allowed.
+  { MI_DEFAULT_EAGER_COMMIT,
+       MI_OPTION_UNINIT, MI_OPTION(eager_commit) },               // commit per segment directly (4MiB)  (but see also `eager_commit_delay`)
+  { MI_DEFAULT_ARENA_EAGER_COMMIT,
+       MI_OPTION_UNINIT, MI_OPTION_LEGACY(arena_eager_commit,eager_region_commit) }, // eager commit arena's? 2 is used to enable this only on an OS that has overcommit (i.e. linux)
+  { 1, MI_OPTION_UNINIT, MI_OPTION_LEGACY(purge_decommits,reset_decommits) },        // purge decommits memory (instead of reset) (note: on linux this uses MADV_DONTNEED for decommit)
+  { MI_DEFAULT_ALLOW_LARGE_OS_PAGES,
+       MI_OPTION_UNINIT, MI_OPTION_LEGACY(allow_large_os_pages,large_os_pages) },    // use large OS pages, use only with eager commit to prevent fragmentation of VMA's
+  { MI_DEFAULT_RESERVE_HUGE_OS_PAGES,
+       MI_OPTION_UNINIT, MI_OPTION(reserve_huge_os_pages) },      // per 1GiB huge pages
+  {-1, MI_OPTION_UNINIT, MI_OPTION(reserve_huge_os_pages_at) },   // reserve huge pages at node N
+  { MI_DEFAULT_RESERVE_OS_MEMORY,
+       MI_OPTION_UNINIT, MI_OPTION(reserve_os_memory)     },      // reserve N KiB OS memory in advance (use `option_get_size`)
+  { 0, MI_OPTION_UNINIT, MI_OPTION(deprecated_segment_cache) },   // cache N segments per thread
+  { 0, MI_OPTION_UNINIT, MI_OPTION(deprecated_page_reset) },      // reset page memory on free
+  { 0, MI_OPTION_UNINIT, MI_OPTION(abandoned_page_purge) },       // purge free page memory when a thread terminates
+  { 0, MI_OPTION_UNINIT, MI_OPTION(deprecated_segment_reset) },   // reset segment memory on free (needs eager commit)
+#if defined(__NetBSD__)
+  { 0, MI_OPTION_UNINIT, MI_OPTION(eager_commit_delay) },         // the first N segments per thread are not eagerly committed
+#else
+  { 1, MI_OPTION_UNINIT, MI_OPTION(eager_commit_delay) },         // the first N segments per thread are not eagerly committed (but per page in the segment on demand)
+#endif
+  { 1000,MI_OPTION_UNINIT, MI_OPTION_LEGACY(purge_delay,reset_delay) },  // purge delay in milli-seconds
+  { 0,   MI_OPTION_UNINIT, MI_OPTION(use_numa_nodes) },           // 0 = use available numa nodes, otherwise use at most N nodes.
+  { 0,   MI_OPTION_UNINIT, MI_OPTION_LEGACY(disallow_os_alloc,limit_os_alloc) },           // 1 = do not use OS memory for allocation (but only reserved arenas)
+  { 100, MI_OPTION_UNINIT, MI_OPTION(os_tag) },                   // only apple specific for now but might serve more or less related purpose
+  { 32,  MI_OPTION_UNINIT, MI_OPTION(max_errors) },               // maximum errors that are output
+  { 32,  MI_OPTION_UNINIT, MI_OPTION(max_warnings) },             // maximum warnings that are output
+  { 10,  MI_OPTION_UNINIT, MI_OPTION(deprecated_max_segment_reclaim)},       // max. percentage of the abandoned segments to be reclaimed per try.
+  { 0,   MI_OPTION_UNINIT, MI_OPTION(destroy_on_exit)},           // release all OS memory on process exit; careful with dangling pointer or after-exit frees!
+  { MI_DEFAULT_ARENA_RESERVE, MI_OPTION_UNINIT, MI_OPTION(arena_reserve) }, // reserve memory N KiB at a time (=1GiB) (use `option_get_size`)
+  { 1,   MI_OPTION_UNINIT, MI_OPTION(arena_purge_mult) },         // purge delay multiplier for arena's
+  { 1,   MI_OPTION_UNINIT, MI_OPTION_LEGACY(deprecated_purge_extend_delay, decommit_extend_delay) },
+  { MI_DEFAULT_DISALLOW_ARENA_ALLOC,   MI_OPTION_UNINIT, MI_OPTION(disallow_arena_alloc) }, // 1 = do not use arena's for allocation (except if using specific arena id's)
+  { 400, MI_OPTION_UNINIT, MI_OPTION(retry_on_oom) },             // windows only: retry on out-of-memory for N milli seconds (=400), set to 0 to disable retries.
+#if defined(MI_VISIT_ABANDONED)
+  { 1,   MI_OPTION_INITIALIZED, MI_OPTION(visit_abandoned) },     // allow visiting heap blocks in abandoned segments; requires taking locks during reclaim.
+#else
+  { 0,   MI_OPTION_UNINIT, MI_OPTION(visit_abandoned) },
+#endif
+  { 0,   MI_OPTION_UNINIT, MI_OPTION(guarded_min) },              // only used when building with MI_GUARDED: minimal rounded object size for guarded objects
+  { MI_GiB, MI_OPTION_UNINIT, MI_OPTION(guarded_max) },           // only used when building with MI_GUARDED: maximal rounded object size for guarded objects
+  { 0,   MI_OPTION_UNINIT, MI_OPTION(guarded_precise) },          // disregard minimal alignment requirement to always place guarded blocks exactly in front of a guard page (=0)
+  { MI_DEFAULT_GUARDED_SAMPLE_RATE,
+         MI_OPTION_UNINIT, MI_OPTION(guarded_sample_rate)},       // 1 out of N allocations in the min/max range will be guarded (=4000)
+  { 0,   MI_OPTION_UNINIT, MI_OPTION(guarded_sample_seed)},
+  { 10000, MI_OPTION_UNINIT, MI_OPTION(generic_collect) },        // collect heaps every N (=10000) generic allocation calls
+  { 0,   MI_OPTION_UNINIT, MI_OPTION_LEGACY(page_reclaim_on_free, abandoned_reclaim_on_free) },// reclaim abandoned (small) pages on a free: -1 = disable completely, 0 = only reclaim into the originating heap, 1 = reclaim on free across heaps
+  { 2,   MI_OPTION_UNINIT, MI_OPTION(page_full_retain) },         // number of (small) pages to retain in the free page queues
+  { 4,   MI_OPTION_UNINIT, MI_OPTION(page_max_candidates) },      // max search to find a best page candidate
+  { 0,   MI_OPTION_UNINIT, MI_OPTION(max_vabits) },               // max virtual address space bits
+  { MI_DEFAULT_PAGEMAP_COMMIT,
+         MI_OPTION_UNINIT, MI_OPTION(pagemap_commit) },           // commit the full pagemap upfront?
+  { 0,   MI_OPTION_UNINIT, MI_OPTION(page_commit_on_demand) },    // commit pages on-demand (2 disables this only on overcommit systems (like Linux))
+  { MI_DEFAULT_PAGE_MAX_RECLAIM,
+         MI_OPTION_UNINIT, MI_OPTION(page_max_reclaim) },         // don't reclaim (small) pages of the same originating heap if we already own N pages in that size class
+  { MI_DEFAULT_PAGE_CROSS_THREAD_MAX_RECLAIM,
+         MI_OPTION_UNINIT, MI_OPTION(page_cross_thread_max_reclaim) }, // don't reclaim (small) pages across threads if we already own N pages in that size class
 };
 
 static void mi_option_init(mi_option_desc_t* desc);
 
+static bool mi_option_has_size_in_kib(mi_option_t option) {
+  return (option == mi_option_reserve_os_memory || option == mi_option_arena_reserve);
+}
+
 void _mi_options_init(void) {
-  // called on process load; should not be called before the CRT is initialized!
-  // (e.g. do not call this from process_init as that may run before CRT initialization)
+  // called on process load
   mi_add_stderr_output(); // now it safe to use stderr for output
   for(int i = 0; i < _mi_option_last; i++ ) {
     mi_option_t option = (mi_option_t)i;
     long l = mi_option_get(option); MI_UNUSED(l); // initialize
-    if (option != mi_option_verbose) {
-      mi_option_desc_t* desc = &options[option];
-      _mi_verbose_message("option '%s': %ld\n", desc->name, desc->value);
-    }
   }
   mi_max_error_count = mi_option_get(mi_option_max_errors);
   mi_max_warning_count = mi_option_get(mi_option_max_warnings);
+  #if MI_GUARDED
+  if (mi_option_get(mi_option_guarded_sample_rate) > 0) {
+    if (mi_option_is_enabled(mi_option_allow_large_os_pages)) {
+      mi_option_disable(mi_option_allow_large_os_pages);
+      _mi_warning_message("option 'allow_large_os_pages' is disabled to allow for guarded objects\n");
+    }
+  }
+  #endif
+  if (mi_option_is_enabled(mi_option_verbose)) { mi_options_print(); }
+}
+
+#define mi_stringifyx(str)  #str                // and stringify
+#define mi_stringify(str)   mi_stringifyx(str)  // expand
+
+void mi_options_print(void) mi_attr_noexcept
+{
+  // show version
+  const int vermajor = MI_MALLOC_VERSION/100;
+  const int verminor = (MI_MALLOC_VERSION%100)/10;
+  const int verpatch = (MI_MALLOC_VERSION%10);
+  _mi_message("v%i.%i.%i%s%s (built on %s, %s)\n", vermajor, verminor, verpatch,
+      #if defined(MI_CMAKE_BUILD_TYPE)
+      ", " mi_stringify(MI_CMAKE_BUILD_TYPE)
+      #else
+      ""
+      #endif
+      ,
+      #if defined(MI_GIT_DESCRIBE)
+      ", git " mi_stringify(MI_GIT_DESCRIBE)
+      #else
+      ""
+      #endif
+      , __DATE__, __TIME__);
+
+  // show options
+  for (int i = 0; i < _mi_option_last; i++) {
+    mi_option_t option = (mi_option_t)i;
+    long l = mi_option_get(option); MI_UNUSED(l); // possibly initialize
+    mi_option_desc_t* desc = &mi_options[option];
+    _mi_message("option '%s': %ld %s\n", desc->name, desc->value, (mi_option_has_size_in_kib(option) ? "KiB" : ""));
+  }
+
+  // show build configuration
+  _mi_message("debug level : %d\n", MI_DEBUG );
+  _mi_message("secure level: %d\n", MI_SECURE );
+  _mi_message("mem tracking: %s\n", MI_TRACK_TOOL);
+  #if MI_GUARDED
+  _mi_message("guarded build: %s\n", mi_option_get(mi_option_guarded_sample_rate) != 0 ? "enabled" : "disabled");
+  #endif
+  #if MI_TSAN
+  _mi_message("thread santizer enabled\n");
+  #endif
+}
+
+long _mi_option_get_fast(mi_option_t option) {
+  mi_assert(option >= 0 && option < _mi_option_last);
+  mi_option_desc_t* desc = &mi_options[option];
+  mi_assert(desc->option == option);  // index should match the option
+  //mi_assert(desc->init != MI_OPTION_UNINIT);
+  return desc->value;
 }
 
+
 mi_decl_nodiscard long mi_option_get(mi_option_t option) {
   mi_assert(option >= 0 && option < _mi_option_last);
   if (option < 0 || option >= _mi_option_last) return 0;
-  mi_option_desc_t* desc = &options[option];
+  mi_option_desc_t* desc = &mi_options[option];
   mi_assert(desc->option == option);  // index should match the option
-  if mi_unlikely(desc->init == UNINIT) {
+  if mi_unlikely(desc->init == MI_OPTION_UNINIT) {
     mi_option_init(desc);
   }
   return desc->value;
@@ -131,20 +270,36 @@ mi_decl_nodiscard long mi_option_get_clamp(mi_option_t option, long min, long ma
   return (x < min ? min : (x > max ? max : x));
 }
 
+mi_decl_nodiscard size_t mi_option_get_size(mi_option_t option) {
+  const long x = mi_option_get(option);
+  size_t size = (x < 0 ? 0 : (size_t)x);
+  if (mi_option_has_size_in_kib(option)) {
+    size *= MI_KiB;
+  }
+  return size;
+}
+
 void mi_option_set(mi_option_t option, long value) {
   mi_assert(option >= 0 && option < _mi_option_last);
   if (option < 0 || option >= _mi_option_last) return;
-  mi_option_desc_t* desc = &options[option];
+  mi_option_desc_t* desc = &mi_options[option];
   mi_assert(desc->option == option);  // index should match the option
   desc->value = value;
-  desc->init = INITIALIZED;
+  desc->init = MI_OPTION_INITIALIZED;
+  // ensure min/max range; be careful to not recurse.
+  if (desc->option == mi_option_guarded_min && _mi_option_get_fast(mi_option_guarded_max) < value) {
+    mi_option_set(mi_option_guarded_max, value);
+  }
+  else if (desc->option == mi_option_guarded_max && _mi_option_get_fast(mi_option_guarded_min) > value) {
+    mi_option_set(mi_option_guarded_min, value);
+  }
 }
 
 void mi_option_set_default(mi_option_t option, long value) {
   mi_assert(option >= 0 && option < _mi_option_last);
   if (option < 0 || option >= _mi_option_last) return;
-  mi_option_desc_t* desc = &options[option];
-  if (desc->init != INITIALIZED) {
+  mi_option_desc_t* desc = &mi_options[option];
+  if (desc->init != MI_OPTION_INITIALIZED) {
     desc->value = value;
   }
 }
@@ -169,28 +324,11 @@ void mi_option_disable(mi_option_t option) {
   mi_option_set_enabled(option,false);
 }
 
-
 static void mi_cdecl mi_out_stderr(const char* msg, void* arg) {
   MI_UNUSED(arg);
-  if (msg == NULL) return;
-  #ifdef _WIN32
-  // on windows with redirection, the C runtime cannot handle locale dependent output
-  // after the main thread closes so we use direct console output.
-  if (!_mi_preloading()) { 
-    // _cputs(msg);  // _cputs cannot be used at is aborts if it fails to lock the console
-    static HANDLE hcon = INVALID_HANDLE_VALUE;
-    if (hcon == INVALID_HANDLE_VALUE) {
-      hcon = GetStdHandle(STD_ERROR_HANDLE);
-    }
-    const size_t len = strlen(msg);
-    if (hcon != INVALID_HANDLE_VALUE && len > 0 && len < UINT32_MAX) {
-      DWORD written = 0;
-      WriteConsoleA(hcon, msg, (DWORD)len, &written, NULL);
-    }
+  if (msg != NULL && msg[0] != 0) {
+    _mi_prim_out_stderr(msg);
   }
-  #else
-  fputs(msg, stderr);
-  #endif
 }
 
 // Since an output function can be registered earliest in the `main`
@@ -198,16 +336,16 @@ static void mi_cdecl mi_out_stderr(const char* msg, void* arg) {
 // an output function is registered it is called immediately with
 // the output up to that point.
 #ifndef MI_MAX_DELAY_OUTPUT
-#define MI_MAX_DELAY_OUTPUT ((size_t)(32*1024))
+#define MI_MAX_DELAY_OUTPUT ((size_t)(16*1024))
 #endif
-static char out_buf[MI_MAX_DELAY_OUTPUT+1];
+static char mi_output_buffer[MI_MAX_DELAY_OUTPUT+1];
 static _Atomic(size_t) out_len;
 
 static void mi_cdecl mi_out_buf(const char* msg, void* arg) {
   MI_UNUSED(arg);
   if (msg==NULL) return;
   if (mi_atomic_load_relaxed(&out_len)>=MI_MAX_DELAY_OUTPUT) return;
-  size_t n = strlen(msg);
+  size_t n = _mi_strlen(msg);
   if (n==0) return;
   // claim space
   size_t start = mi_atomic_add_acq_rel(&out_len, n);
@@ -216,7 +354,8 @@ static void mi_cdecl mi_out_buf(const char* msg, void* arg) {
   if (start+n >= MI_MAX_DELAY_OUTPUT) {
     n = MI_MAX_DELAY_OUTPUT-start-1;
   }
-  _mi_memcpy(&out_buf[start], msg, n);
+  mi_assert_internal(start + n <= MI_MAX_DELAY_OUTPUT);
+  _mi_memcpy(&mi_output_buffer[start], msg, n);
 }
 
 static void mi_out_buf_flush(mi_output_fun* out, bool no_more_buf, void* arg) {
@@ -225,10 +364,10 @@ static void mi_out_buf_flush(mi_output_fun* out, bool no_more_buf, void* arg) {
   size_t count = mi_atomic_add_acq_rel(&out_len, (no_more_buf ? MI_MAX_DELAY_OUTPUT : 1));
   // and output the current contents
   if (count>MI_MAX_DELAY_OUTPUT) count = MI_MAX_DELAY_OUTPUT;
-  out_buf[count] = 0;
-  out(out_buf,arg);
+  mi_output_buffer[count] = 0;
+  out(mi_output_buffer,arg);
   if (!no_more_buf) {
-    out_buf[count] = '\n'; // if continue with the buffer, insert a newline
+    mi_output_buffer[count] = '\n'; // if continue with the buffer, insert a newline
   }
 }
 
@@ -264,10 +403,12 @@ void mi_register_output(mi_output_fun* out, void* arg) mi_attr_noexcept {
 }
 
 // add stderr to the delayed output after the module is loaded
-static void mi_add_stderr_output() {
+static void mi_add_stderr_output(void) {
   mi_assert_internal(mi_out_default == NULL);
-  mi_out_buf_flush(&mi_out_stderr, false, NULL); // flush current contents to stderr
-  mi_out_default = &mi_out_buf_stderr;           // and add stderr to the delayed output
+  if (mi_out_default==NULL) {
+    mi_out_buf_flush(&mi_out_stderr, false, NULL); // flush current contents to stderr
+    mi_out_default = &mi_out_buf_stderr;           // and add stderr to the delayed output
+  }
 }
 
 // --------------------------------------------------------
@@ -280,11 +421,11 @@ static _Atomic(size_t) warning_count; // = 0;  // when >= max_warning_count stop
 // inside the C runtime causes another message.
 // In some cases (like on macOS) the loader already allocates which
 // calls into mimalloc; if we then access thread locals (like `recurse`)
-// this may crash as the access may call _tlv_bootstrap that tries to 
+// this may crash as the access may call _tlv_bootstrap that tries to
 // (recursively) invoke malloc again to allocate space for the thread local
 // variables on demand. This is why we use a _mi_preloading test on such
 // platforms. However, C code generator may move the initial thread local address
-// load before the `if` and we therefore split it out in a separate funcion.
+// load before the `if` and we therefore split it out in a separate function.
 static mi_decl_thread bool recurse = false;
 
 static mi_decl_noinline bool mi_recurse_enter_prim(void) {
@@ -298,21 +439,21 @@ static mi_decl_noinline void mi_recurse_exit_prim(void) {
 }
 
 static bool mi_recurse_enter(void) {
-  #if defined(__APPLE__) || defined(MI_TLS_RECURSE_GUARD)
-  if (_mi_preloading()) return true;
+  #if defined(__APPLE__) || defined(__ANDROID__) || defined(MI_TLS_RECURSE_GUARD)
+  if (_mi_preloading()) return false;
   #endif
   return mi_recurse_enter_prim();
 }
 
 static void mi_recurse_exit(void) {
-  #if defined(__APPLE__) || defined(MI_TLS_RECURSE_GUARD)
+  #if defined(__APPLE__) || defined(__ANDROID__) || defined(MI_TLS_RECURSE_GUARD)
   if (_mi_preloading()) return;
   #endif
   mi_recurse_exit_prim();
 }
 
 void _mi_fputs(mi_output_fun* out, void* arg, const char* prefix, const char* message) {
-  if (out==NULL || (FILE*)out==stdout || (FILE*)out==stderr) { // TODO: use mi_out_stderr for stderr?
+  if (out==NULL || (void*)out==(void*)stdout || (void*)out==(void*)stderr) { // TODO: use mi_out_stderr for stderr?
     if (!mi_recurse_enter()) return;
     out = mi_out_get_default(&arg);
     if (prefix != NULL) out(prefix, arg);
@@ -326,12 +467,12 @@ void _mi_fputs(mi_output_fun* out, void* arg, const char* prefix, const char* me
 }
 
 // Define our own limited `fprintf` that avoids memory allocation.
-// We do this using `snprintf` with a limited buffer.
+// We do this using `_mi_vsnprintf` with a limited buffer.
 static void mi_vfprintf( mi_output_fun* out, void* arg, const char* prefix, const char* fmt, va_list args ) {
-  char buf[512];
+  char buf[992];
   if (fmt==NULL) return;
   if (!mi_recurse_enter()) return;
-  vsnprintf(buf,sizeof(buf)-1,fmt,args);
+  _mi_vsnprintf(buf, sizeof(buf)-1, fmt, args);
   mi_recurse_exit();
   _mi_fputs(out,arg,prefix,buf);
 }
@@ -344,9 +485,9 @@ void _mi_fprintf( mi_output_fun* out, void* arg, const char* fmt, ... ) {
 }
 
 static void mi_vfprintf_thread(mi_output_fun* out, void* arg, const char* prefix, const char* fmt, va_list args) {
-  if (prefix != NULL && strlen(prefix) <= 32 && !_mi_is_main_thread()) {
+  if (prefix != NULL && _mi_strnlen(prefix,33) <= 32 && !_mi_is_main_thread()) {
     char tprefix[64];
-    snprintf(tprefix, sizeof(tprefix), "%sthread 0x%zx: ", prefix, _mi_thread_id());
+    _mi_snprintf(tprefix, sizeof(tprefix), "%sthread 0x%tx: ", prefix, (uintptr_t)_mi_thread_id());
     mi_vfprintf(out, arg, tprefix, fmt, args);
   }
   else {
@@ -354,6 +495,20 @@ static void mi_vfprintf_thread(mi_output_fun* out, void* arg, const char* prefix
   }
 }
 
+void _mi_raw_message(const char* fmt, ...) {
+  va_list args;
+  va_start(args, fmt);
+  mi_vfprintf(NULL, NULL, NULL, fmt, args);
+  va_end(args);
+}
+
+void _mi_message(const char* fmt, ...) {
+  va_list args;
+  va_start(args, fmt);
+  mi_vfprintf_thread(NULL, NULL, "mimalloc: ", fmt, args);
+  va_end(args);
+}
+
 void _mi_trace_message(const char* fmt, ...) {
   if (mi_option_get(mi_option_verbose) <= 1) return;  // only with verbose level 2 or higher
   va_list args;
@@ -391,7 +546,7 @@ void _mi_warning_message(const char* fmt, ...) {
 
 
 #if MI_DEBUG
-void _mi_assert_fail(const char* assertion, const char* fname, unsigned line, const char* func ) {
+mi_decl_noreturn mi_decl_cold void _mi_assert_fail(const char* assertion, const char* fname, unsigned line, const char* func ) mi_attr_noexcept {
   _mi_fprintf(NULL, NULL, "mimalloc: assertion failed: at \"%s\":%u, %s\n  assertion: \"%s\"\n", fname, line, (func==NULL?"":func), assertion);
   abort();
 }
@@ -406,7 +561,7 @@ static _Atomic(void*) mi_error_arg;     // = NULL
 
 static void mi_error_default(int err) {
   MI_UNUSED(err);
-#if (MI_DEBUG>0) 
+#if (MI_DEBUG>0)
   if (err==EFAULT) {
     #ifdef _MSC_VER
     __debugbreak();
@@ -450,178 +605,80 @@ void _mi_error_message(int err, const char* fmt, ...) {
 // Initialize options by checking the environment
 // --------------------------------------------------------
 
-static void mi_strlcpy(char* dest, const char* src, size_t dest_size) {
-  if (dest==NULL || src==NULL || dest_size == 0) return;
-  // copy until end of src, or when dest is (almost) full
-  while (*src != 0 && dest_size > 1) {
-    *dest++ = *src++;
-    dest_size--;
-  }
-  // always zero terminate
-  *dest = 0;
-}
-
-static void mi_strlcat(char* dest, const char* src, size_t dest_size) {
-  if (dest==NULL || src==NULL || dest_size == 0) return;
-  // find end of string in the dest buffer
-  while (*dest != 0 && dest_size > 1) {
-    dest++;
-    dest_size--;
-  }
-  // and catenate
-  mi_strlcpy(dest, src, dest_size);
-}
+// TODO: implement ourselves to reduce dependencies on the C runtime
+#include <stdlib.h> // strtol
+#include <string.h> // strstr
 
-#ifdef MI_NO_GETENV
-static bool mi_getenv(const char* name, char* result, size_t result_size) {
-  MI_UNUSED(name);
-  MI_UNUSED(result);
-  MI_UNUSED(result_size);
-  return false;
-}
-#else
-static inline int mi_strnicmp(const char* s, const char* t, size_t n) {
-  if (n==0) return 0;
-  for (; *s != 0 && *t != 0 && n > 0; s++, t++, n--) {
-    if (toupper(*s) != toupper(*t)) break;
-  }
-  return (n==0 ? 0 : *s - *t);
-}
-#if defined _WIN32
-// On Windows use GetEnvironmentVariable instead of getenv to work
-// reliably even when this is invoked before the C runtime is initialized.
-// i.e. when `_mi_preloading() == true`.
-// Note: on windows, environment names are not case sensitive.
-#include <windows.h>
-static bool mi_getenv(const char* name, char* result, size_t result_size) {
-  result[0] = 0;
-  size_t len = GetEnvironmentVariableA(name, result, (DWORD)result_size);
-  return (len > 0 && len < result_size);
-}
-#elif !defined(MI_USE_ENVIRON) || (MI_USE_ENVIRON!=0)
-// On Posix systemsr use `environ` to acces environment variables 
-// even before the C runtime is initialized.
-#if defined(__APPLE__) && defined(__has_include) && __has_include(<crt_externs.h>)
-#include <crt_externs.h>
-static char** mi_get_environ(void) {
-  return (*_NSGetEnviron());
-}
-#else 
-extern char** environ;
-static char** mi_get_environ(void) {
-  return environ;
-}
-#endif
-static bool mi_getenv(const char* name, char* result, size_t result_size) {
-  if (name==NULL) return false;  
-  const size_t len = strlen(name);
-  if (len == 0) return false;  
-  char** env = mi_get_environ();
-  if (env == NULL) return false;
-  // compare up to 256 entries
-  for (int i = 0; i < 256 && env[i] != NULL; i++) {
-    const char* s = env[i];
-    if (mi_strnicmp(name, s, len) == 0 && s[len] == '=') { // case insensitive
-      // found it
-      mi_strlcpy(result, s + len + 1, result_size);
-      return true;
-    }
-  }
-  return false;
-}
-#else  
-// fallback: use standard C `getenv` but this cannot be used while initializing the C runtime
-static bool mi_getenv(const char* name, char* result, size_t result_size) {
-  // cannot call getenv() when still initializing the C runtime.
-  if (_mi_preloading()) return false;
-  const char* s = getenv(name);
-  if (s == NULL) {
-    // we check the upper case name too.
-    char buf[64+1];
-    size_t len = strlen(name);
-    if (len >= sizeof(buf)) len = sizeof(buf) - 1;
-    for (size_t i = 0; i < len; i++) {
-      buf[i] = toupper(name[i]);
-    }
-    buf[len] = 0;
-    s = getenv(buf);
-  }
-  if (s != NULL && strlen(s) < result_size) {
-    mi_strlcpy(result, s, result_size);
-    return true;
-  }
-  else {
-    return false;
-  }
-}
-#endif  // !MI_USE_ENVIRON
-#endif  // !MI_NO_GETENV
 
-static void mi_option_init(mi_option_desc_t* desc) {  
+static void mi_option_init(mi_option_desc_t* desc) {
   // Read option value from the environment
-  char s[64+1];
+  char s[64 + 1];
   char buf[64+1];
-  mi_strlcpy(buf, "mimalloc_", sizeof(buf));
-  mi_strlcat(buf, desc->name, sizeof(buf));
-  bool found = mi_getenv(buf,s,sizeof(s));
+  _mi_strlcpy(buf, "mimalloc_", sizeof(buf));
+  _mi_strlcat(buf, desc->name, sizeof(buf));
+  bool found = _mi_getenv(buf, s, sizeof(s));
   if (!found && desc->legacy_name != NULL) {
-    mi_strlcpy(buf, "mimalloc_", sizeof(buf));
-    mi_strlcat(buf, desc->legacy_name, sizeof(buf));
-    found = mi_getenv(buf,s,sizeof(s));
+    _mi_strlcpy(buf, "mimalloc_", sizeof(buf));
+    _mi_strlcat(buf, desc->legacy_name, sizeof(buf));
+    found = _mi_getenv(buf, s, sizeof(s));
     if (found) {
-      _mi_warning_message("environment option \"mimalloc_%s\" is deprecated -- use \"mimalloc_%s\" instead.\n", desc->legacy_name, desc->name );
-    }    
+      _mi_warning_message("environment option \"mimalloc_%s\" is deprecated -- use \"mimalloc_%s\" instead.\n", desc->legacy_name, desc->name);
+    }
   }
 
   if (found) {
-    size_t len = strlen(s);
-    if (len >= sizeof(buf)) len = sizeof(buf) - 1;
+    size_t len = _mi_strnlen(s, sizeof(buf) - 1);
     for (size_t i = 0; i < len; i++) {
-      buf[i] = (char)toupper(s[i]);
+      buf[i] = _mi_toupper(s[i]);
     }
     buf[len] = 0;
-    if (buf[0]==0 || strstr("1;TRUE;YES;ON", buf) != NULL) {
+    if (buf[0] == 0 || strstr("1;TRUE;YES;ON", buf) != NULL) {
       desc->value = 1;
-      desc->init = INITIALIZED;
+      desc->init = MI_OPTION_INITIALIZED;
     }
     else if (strstr("0;FALSE;NO;OFF", buf) != NULL) {
       desc->value = 0;
-      desc->init = INITIALIZED;
+      desc->init = MI_OPTION_INITIALIZED;
     }
     else {
       char* end = buf;
       long value = strtol(buf, &end, 10);
-      if (desc->option == mi_option_reserve_os_memory) {
-        // this option is interpreted in KiB to prevent overflow of `long`
+      if (mi_option_has_size_in_kib(desc->option)) {
+        // this option is interpreted in KiB to prevent overflow of `long` for large allocations
+        // (long is 32-bit on 64-bit windows, which allows for 4TiB max.)
+        size_t size = (value < 0 ? 0 : (size_t)value);
+        bool overflow = false;
         if (*end == 'K') { end++; }
-        else if (*end == 'M') { value *= MI_KiB; end++; }
-        else if (*end == 'G') { value *= MI_MiB; end++; }
-        else { value = (value + MI_KiB - 1) / MI_KiB; }
-        if (end[0] == 'I' && end[1] == 'B') { end += 2; }
-        else if (*end == 'B') { end++; }
+        else if (*end == 'M') { overflow = mi_mul_overflow(size,MI_KiB,&size); end++; }
+        else if (*end == 'G') { overflow = mi_mul_overflow(size,MI_MiB,&size); end++; }
+        else if (*end == 'T') { overflow = mi_mul_overflow(size,MI_GiB,&size); end++; }
+        else { size = (size + MI_KiB - 1) / MI_KiB; }
+        if (end[0] == 'I' && end[1] == 'B') { end += 2; } // KiB, MiB, GiB, TiB
+        else if (*end == 'B') { end++; }                  // Kb, Mb, Gb, Tb
+        if (overflow || size > MI_MAX_ALLOC_SIZE) { size = (MI_MAX_ALLOC_SIZE / MI_KiB); }
+        value = (size > LONG_MAX ? LONG_MAX : (long)size);
       }
       if (*end == 0) {
-        desc->value = value;
-        desc->init = INITIALIZED;
+        mi_option_set(desc->option, value);
       }
       else {
         // set `init` first to avoid recursion through _mi_warning_message on mimalloc_verbose.
-        desc->init = DEFAULTED;
+        desc->init = MI_OPTION_DEFAULTED;
         if (desc->option == mi_option_verbose && desc->value == 0) {
           // if the 'mimalloc_verbose' env var has a bogus value we'd never know
           // (since the value defaults to 'off') so in that case briefly enable verbose
           desc->value = 1;
-          _mi_warning_message("environment option mimalloc_%s has an invalid value.\n", desc->name );
+          _mi_warning_message("environment option mimalloc_%s has an invalid value.\n", desc->name);
           desc->value = 0;
         }
         else {
-          _mi_warning_message("environment option mimalloc_%s has an invalid value.\n", desc->name );
+          _mi_warning_message("environment option mimalloc_%s has an invalid value.\n", desc->name);
         }
       }
     }
-    mi_assert_internal(desc->init != UNINIT);
+    mi_assert_internal(desc->init != MI_OPTION_UNINIT);
   }
   else if (!_mi_preloading()) {
-    desc->init = DEFAULTED;
+    desc->init = MI_OPTION_DEFAULTED;
   }
 }
diff --git a/depends/mimalloc/src/os.c b/depends/mimalloc/src/os.c
index 6d72498730c9..0224bce62591 100644
--- a/depends/mimalloc/src/os.c
+++ b/depends/mimalloc/src/os.c
@@ -1,118 +1,80 @@
 /* ----------------------------------------------------------------------------
-Copyright (c) 2018-2021, Microsoft Research, Daan Leijen
+Copyright (c) 2018-2025, Microsoft Research, Daan Leijen
 This is free software; you can redistribute it and/or modify it under the
 terms of the MIT license. A copy of the license can be found in the file
 "LICENSE" at the root of this distribution.
 -----------------------------------------------------------------------------*/
-#ifndef _DEFAULT_SOURCE
-#define _DEFAULT_SOURCE   // ensure mmap flags are defined
-#endif
-
-#if defined(__sun)
-// illumos provides new mman.h api when any of these are defined
-// otherwise the old api based on caddr_t which predates the void pointers one.
-// stock solaris provides only the former, chose to atomically to discard those
-// flags only here rather than project wide tough.
-#undef _XOPEN_SOURCE
-#undef _POSIX_C_SOURCE
-#endif
 #include "mimalloc.h"
-#include "mimalloc-internal.h"
-#include "mimalloc-atomic.h"
+#include "mimalloc/internal.h"
+#include "mimalloc/atomic.h"
+#include "mimalloc/prim.h"
 
-#include <string.h>  // strerror
-
-#ifdef _MSC_VER
-#pragma warning(disable:4996)  // strerror
+/* -----------------------------------------------------------
+  Initialization.
+----------------------------------------------------------- */
+#ifndef MI_DEFAULT_PHYSICAL_MEMORY_IN_KIB
+#if MI_INTPTR_SIZE < 8
+#define MI_DEFAULT_PHYSICAL_MEMORY_IN_KIB   4*MI_MiB    // 4 GiB
+#else
+#define MI_DEFAULT_PHYSICAL_MEMORY_IN_KIB   32*MI_MiB   // 32 GiB
 #endif
-
-#if defined(__wasi__)
-#define MI_USE_SBRK
 #endif
 
-#if defined(_WIN32)
-#include <windows.h>
-#elif defined(__wasi__)
-#include <unistd.h>    // sbrk
+#if defined(__APPLE__) && defined(__aarch64__)
+#define MI_PLATFORM_PAGE_SIZE 16*MI_KiB // 16 KiB
+#elif defined(__EMSCRIPTEN__)
+#define MI_PLATFORM_PAGE_SIZE 64*MI_KiB // 64 KiB
 #else
-#include <sys/mman.h>  // mmap
-#include <unistd.h>    // sysconf
-#if defined(__linux__)
-#include <features.h>
-#include <fcntl.h>
-#if defined(__GLIBC__)
-#include <linux/mman.h> // linux mmap flags
-#else
-#include <sys/mman.h>
-#endif
-#endif
-#if defined(__APPLE__)
-#include <TargetConditionals.h>
-#if !TARGET_IOS_IPHONE && !TARGET_IOS_SIMULATOR
-#include <mach/vm_statistics.h>
-#endif
-#endif
-#if defined(__FreeBSD__) || defined(__DragonFly__)
-#include <sys/param.h>
-#if __FreeBSD_version >= 1200000
-#include <sys/cpuset.h>
-#include <sys/domainset.h>
-#endif
-#include <sys/sysctl.h>
-#endif
+#define MI_PLATFORM_PAGE_SIZE  4*MI_KiB //  4 KiB
 #endif
 
-/* -----------------------------------------------------------
-  Initialization.
-  On windows initializes support for aligned allocation and
-  large OS pages (if MIMALLOC_LARGE_OS_PAGES is true).
------------------------------------------------------------ */
-bool _mi_os_decommit(void* addr, size_t size, mi_stats_t* stats);
-bool _mi_os_commit(void* addr, size_t size, bool* is_zero, mi_stats_t* tld_stats);
+static mi_os_mem_config_t mi_os_mem_config = {
+  MI_PLATFORM_PAGE_SIZE, // page size
+  0,        // large page size (usually 2MiB)
+  MI_PLATFORM_PAGE_SIZE, // allocation granularity
+  MI_DEFAULT_PHYSICAL_MEMORY_IN_KIB,
+  MI_MAX_VABITS, // in `bits.h`
+  true,     // has overcommit?  (if true we use MAP_NORESERVE on mmap systems)
+  false,    // can we partially free allocated blocks? (on mmap systems we can free anywhere in a mapped range, but on Windows we must free the entire span)
+  true      // has virtual reserve? (if true we can reserve virtual address space without using commit or physical memory)
+};
 
-static void* mi_align_up_ptr(void* p, size_t alignment) {
-  return (void*)_mi_align_up((uintptr_t)p, alignment);
+bool _mi_os_has_overcommit(void) {
+  return mi_os_mem_config.has_overcommit;
 }
 
-static void* mi_align_down_ptr(void* p, size_t alignment) {
-  return (void*)_mi_align_down((uintptr_t)p, alignment);
+bool _mi_os_has_virtual_reserve(void) {
+  return mi_os_mem_config.has_virtual_reserve;
 }
 
 
-// page size (initialized properly in `os_init`)
-static size_t os_page_size = 4096;
-
-// minimal allocation granularity
-static size_t os_alloc_granularity = 4096;
-
-// if non-zero, use large page allocation
-static size_t large_os_page_size = 0;
-
-// is memory overcommit allowed? 
-// set dynamically in _mi_os_init (and if true we use MAP_NORESERVE)
-static bool os_overcommit = true;
-
-bool _mi_os_has_overcommit(void) {
-  return os_overcommit;
-}
-
 // OS (small) page size
 size_t _mi_os_page_size(void) {
-  return os_page_size;
+  return mi_os_mem_config.page_size;
 }
 
 // if large OS pages are supported (2 or 4MiB), then return the size, otherwise return the small page size (4KiB)
 size_t _mi_os_large_page_size(void) {
-  return (large_os_page_size != 0 ? large_os_page_size : _mi_os_page_size());
+  return (mi_os_mem_config.large_page_size != 0 ? mi_os_mem_config.large_page_size : _mi_os_page_size());
+}
+
+size_t _mi_os_guard_page_size(void) {
+  const size_t gsize = _mi_os_page_size();
+  mi_assert(gsize <= (MI_ARENA_SLICE_SIZE/8));
+  return gsize;
+}
+
+size_t _mi_os_virtual_address_bits(void) {
+  const size_t vbits = mi_os_mem_config.virtual_address_bits;
+  mi_assert(vbits <= MI_MAX_VABITS);
+  return vbits;
 }
 
-#if !defined(MI_USE_SBRK) && !defined(__wasi__)
-static bool use_large_os_page(size_t size, size_t alignment) {
+bool _mi_os_use_large_page(size_t size, size_t alignment) {
   // if we have access, check the size and alignment requirements
-  if (large_os_page_size == 0 || !mi_option_is_enabled(mi_option_large_os_pages)) return false;
-  return ((size % large_os_page_size) == 0 && (alignment % large_os_page_size) == 0);
+  if (mi_os_mem_config.large_page_size == 0 || !mi_option_is_enabled(mi_option_allow_large_os_pages)) return false;
+  return ((size % mi_os_mem_config.large_page_size) == 0 && (alignment % mi_os_mem_config.large_page_size) == 0);
 }
-#endif
 
 // round to a good OS allocation size (bounded by max 12.5% waste)
 size_t _mi_os_good_alloc_size(size_t size) {
@@ -126,575 +88,147 @@ size_t _mi_os_good_alloc_size(size_t size) {
   return _mi_align_up(size, align_size);
 }
 
-#if defined(_WIN32)
-// We use VirtualAlloc2 for aligned allocation, but it is only supported on Windows 10 and Windows Server 2016.
-// So, we need to look it up dynamically to run on older systems. (use __stdcall for 32-bit compatibility)
-// NtAllocateVirtualAllocEx is used for huge OS page allocation (1GiB)
-// We define a minimal MEM_EXTENDED_PARAMETER ourselves in order to be able to compile with older SDK's.
-typedef enum MI_MEM_EXTENDED_PARAMETER_TYPE_E {
-  MiMemExtendedParameterInvalidType = 0,
-  MiMemExtendedParameterAddressRequirements,
-  MiMemExtendedParameterNumaNode,
-  MiMemExtendedParameterPartitionHandle,
-  MiMemExtendedParameterUserPhysicalHandle,
-  MiMemExtendedParameterAttributeFlags,
-  MiMemExtendedParameterMax
-} MI_MEM_EXTENDED_PARAMETER_TYPE; 
-
-typedef struct DECLSPEC_ALIGN(8) MI_MEM_EXTENDED_PARAMETER_S {
-  struct { DWORD64 Type : 8; DWORD64 Reserved : 56; } Type;
-  union  { DWORD64 ULong64; PVOID Pointer; SIZE_T Size; HANDLE Handle; DWORD ULong; } Arg;
-} MI_MEM_EXTENDED_PARAMETER;
-
-typedef struct MI_MEM_ADDRESS_REQUIREMENTS_S {
-  PVOID  LowestStartingAddress;
-  PVOID  HighestEndingAddress;
-  SIZE_T Alignment;
-} MI_MEM_ADDRESS_REQUIREMENTS;
-
-#define MI_MEM_EXTENDED_PARAMETER_NONPAGED_HUGE   0x00000010
-
-#include <winternl.h>
-typedef PVOID    (__stdcall *PVirtualAlloc2)(HANDLE, PVOID, SIZE_T, ULONG, ULONG, MI_MEM_EXTENDED_PARAMETER*, ULONG);
-typedef NTSTATUS (__stdcall *PNtAllocateVirtualMemoryEx)(HANDLE, PVOID*, SIZE_T*, ULONG, ULONG, MI_MEM_EXTENDED_PARAMETER*, ULONG);
-static PVirtualAlloc2 pVirtualAlloc2 = NULL;
-static PNtAllocateVirtualMemoryEx pNtAllocateVirtualMemoryEx = NULL;
-
-// Similarly, GetNumaProcesorNodeEx is only supported since Windows 7
-typedef struct MI_PROCESSOR_NUMBER_S { WORD Group; BYTE Number; BYTE Reserved; } MI_PROCESSOR_NUMBER;
-
-typedef VOID (__stdcall *PGetCurrentProcessorNumberEx)(MI_PROCESSOR_NUMBER* ProcNumber);
-typedef BOOL (__stdcall *PGetNumaProcessorNodeEx)(MI_PROCESSOR_NUMBER* Processor, PUSHORT NodeNumber);
-typedef BOOL (__stdcall* PGetNumaNodeProcessorMaskEx)(USHORT Node, PGROUP_AFFINITY ProcessorMask);
-static PGetCurrentProcessorNumberEx pGetCurrentProcessorNumberEx = NULL;
-static PGetNumaProcessorNodeEx      pGetNumaProcessorNodeEx = NULL;
-static PGetNumaNodeProcessorMaskEx  pGetNumaNodeProcessorMaskEx = NULL;
-
-static bool mi_win_enable_large_os_pages(void)
-{
-  if (large_os_page_size > 0) return true;
-
-  // Try to see if large OS pages are supported
-  // To use large pages on Windows, we first need access permission
-  // Set "Lock pages in memory" permission in the group policy editor
-  // <https://devblogs.microsoft.com/oldnewthing/20110128-00/?p=11643>
-  unsigned long err = 0;
-  HANDLE token = NULL;
-  BOOL ok = OpenProcessToken(GetCurrentProcess(), TOKEN_ADJUST_PRIVILEGES | TOKEN_QUERY, &token);
-  if (ok) {
-    TOKEN_PRIVILEGES tp;
-    ok = LookupPrivilegeValue(NULL, TEXT("SeLockMemoryPrivilege"), &tp.Privileges[0].Luid);
-    if (ok) {
-      tp.PrivilegeCount = 1;
-      tp.Privileges[0].Attributes = SE_PRIVILEGE_ENABLED;
-      ok = AdjustTokenPrivileges(token, FALSE, &tp, 0, (PTOKEN_PRIVILEGES)NULL, 0);
-      if (ok) {
-        err = GetLastError();
-        ok = (err == ERROR_SUCCESS);
-        if (ok) {
-          large_os_page_size = GetLargePageMinimum();
-        }
-      }
-    }
-    CloseHandle(token);
-  }
-  if (!ok) {
-    if (err == 0) err = GetLastError();
-    _mi_warning_message("cannot enable large OS page support, error %lu\n", err);
-  }
-  return (ok!=0);
-}
-
-void _mi_os_init(void) 
-{
-  os_overcommit = false;
-  // get the page size
-  SYSTEM_INFO si;
-  GetSystemInfo(&si);
-  if (si.dwPageSize > 0) os_page_size = si.dwPageSize;
-  if (si.dwAllocationGranularity > 0) os_alloc_granularity = si.dwAllocationGranularity;
-  // get the VirtualAlloc2 function
-  HINSTANCE  hDll;
-  hDll = LoadLibrary(TEXT("kernelbase.dll"));
-  if (hDll != NULL) {
-    // use VirtualAlloc2FromApp if possible as it is available to Windows store apps
-    pVirtualAlloc2 = (PVirtualAlloc2)(void (*)(void))GetProcAddress(hDll, "VirtualAlloc2FromApp");
-    if (pVirtualAlloc2==NULL) pVirtualAlloc2 = (PVirtualAlloc2)(void (*)(void))GetProcAddress(hDll, "VirtualAlloc2");
-    FreeLibrary(hDll);
-  }
-  // NtAllocateVirtualMemoryEx is used for huge page allocation
-  hDll = LoadLibrary(TEXT("ntdll.dll"));
-  if (hDll != NULL) {
-    pNtAllocateVirtualMemoryEx = (PNtAllocateVirtualMemoryEx)(void (*)(void))GetProcAddress(hDll, "NtAllocateVirtualMemoryEx");
-    FreeLibrary(hDll);
-  }
-  // Try to use Win7+ numa API
-  hDll = LoadLibrary(TEXT("kernel32.dll"));
-  if (hDll != NULL) {
-    pGetCurrentProcessorNumberEx = (PGetCurrentProcessorNumberEx)(void (*)(void))GetProcAddress(hDll, "GetCurrentProcessorNumberEx");
-    pGetNumaProcessorNodeEx = (PGetNumaProcessorNodeEx)(void (*)(void))GetProcAddress(hDll, "GetNumaProcessorNodeEx");
-    pGetNumaNodeProcessorMaskEx = (PGetNumaNodeProcessorMaskEx)(void (*)(void))GetProcAddress(hDll, "GetNumaNodeProcessorMaskEx");
-    FreeLibrary(hDll);
-  }
-  if (mi_option_is_enabled(mi_option_large_os_pages) || mi_option_is_enabled(mi_option_reserve_huge_os_pages)) {
-    mi_win_enable_large_os_pages();
-  }
-}
-#elif defined(__wasi__)
-void _mi_os_init(void) {
-  os_overcommit = false;
-  os_page_size = 64*MI_KiB; // WebAssembly has a fixed page size: 64KiB
-  os_alloc_granularity = 16;
-}
-
-#else  // generic unix
-
-static void os_detect_overcommit(void) {
-#if defined(__linux__)
-  int fd = open("/proc/sys/vm/overcommit_memory", O_RDONLY);
-	if (fd < 0) return;
-  char buf[32];
-  ssize_t nread = read(fd, &buf, sizeof(buf));
-	close(fd);
-  // <https://www.kernel.org/doc/Documentation/vm/overcommit-accounting>
-  // 0: heuristic overcommit, 1: always overcommit, 2: never overcommit (ignore NORESERVE)
-  if (nread >= 1) {
-    os_overcommit = (buf[0] == '0' || buf[0] == '1');
-  }
-#elif defined(__FreeBSD__)
-  int val = 0;
-  size_t olen = sizeof(val);
-  if (sysctlbyname("vm.overcommit", &val, &olen, NULL, 0) == 0) {
-    os_overcommit = (val != 0);
-  }  
-#else
-  // default: overcommit is true  
-#endif
-}
-
 void _mi_os_init(void) {
-  // get the page size
-  long result = sysconf(_SC_PAGESIZE);
-  if (result > 0) {
-    os_page_size = (size_t)result;
-    os_alloc_granularity = os_page_size;
-  }
-  large_os_page_size = 2*MI_MiB; // TODO: can we query the OS for this?
-  os_detect_overcommit();
-}
-#endif
-
-
-#if defined(MADV_NORMAL)
-static int mi_madvise(void* addr, size_t length, int advice) {
-  #if defined(__sun)
-  return madvise((caddr_t)addr, length, advice);  // Solaris needs cast (issue #520)
-  #else
-  return madvise(addr, length, advice);
-  #endif
+  _mi_prim_mem_init(&mi_os_mem_config);
 }
-#endif
 
 
 /* -----------------------------------------------------------
-  aligned hinting
+  Util
 -------------------------------------------------------------- */
+bool _mi_os_decommit(void* addr, size_t size);
+bool _mi_os_commit(void* addr, size_t size, bool* is_zero);
 
-// On 64-bit systems, we can do efficient aligned allocation by using
-// the 2TiB to 30TiB area to allocate those.
-#if (MI_INTPTR_SIZE >= 8)
-static mi_decl_cache_align _Atomic(uintptr_t)aligned_base;
-
-// Return a MI_SEGMENT_SIZE aligned address that is probably available.
-// If this returns NULL, the OS will determine the address but on some OS's that may not be 
-// properly aligned which can be more costly as it needs to be adjusted afterwards.
-// For a size > 1GiB this always returns NULL in order to guarantee good ASLR randomization; 
-// (otherwise an initial large allocation of say 2TiB has a 50% chance to include (known) addresses 
-//  in the middle of the 2TiB - 6TiB address range (see issue #372))
-
-#define MI_HINT_BASE ((uintptr_t)2 << 40)  // 2TiB start
-#define MI_HINT_AREA ((uintptr_t)4 << 40)  // upto 6TiB   (since before win8 there is "only" 8TiB available to processes)
-#define MI_HINT_MAX  ((uintptr_t)30 << 40) // wrap after 30TiB (area after 32TiB is used for huge OS pages)
-
-static void* mi_os_get_aligned_hint(size_t try_alignment, size_t size)
-{
-  if (try_alignment <= 1 || try_alignment > MI_SEGMENT_SIZE) return NULL;
-  size = _mi_align_up(size, MI_SEGMENT_SIZE);
-  if (size > 1*MI_GiB) return NULL;  // guarantee the chance of fixed valid address is at most 1/(MI_HINT_AREA / 1<<30) = 1/4096.
-  #if (MI_SECURE>0)
-  size += MI_SEGMENT_SIZE;        // put in `MI_SEGMENT_SIZE` virtual gaps between hinted blocks; this splits VLA's but increases guarded areas.
-  #endif
-
-  uintptr_t hint = mi_atomic_add_acq_rel(&aligned_base, size);
-  if (hint == 0 || hint > MI_HINT_MAX) {   // wrap or initialize
-    uintptr_t init = MI_HINT_BASE;
-    #if (MI_SECURE>0 || MI_DEBUG==0)       // security: randomize start of aligned allocations unless in debug mode
-    uintptr_t r = _mi_heap_random_next(mi_get_default_heap());
-    init = init + ((MI_SEGMENT_SIZE * ((r>>17) & 0xFFFFF)) % MI_HINT_AREA);  // (randomly 20 bits)*4MiB == 0 to 4TiB
-    #endif
-    uintptr_t expected = hint + size;
-    mi_atomic_cas_strong_acq_rel(&aligned_base, &expected, init);
-    hint = mi_atomic_add_acq_rel(&aligned_base, size); // this may still give 0 or > MI_HINT_MAX but that is ok, it is a hint after all
-  }
-  if (hint%try_alignment != 0) return NULL;
-  return (void*)hint;
-}
-#else
-static void* mi_os_get_aligned_hint(size_t try_alignment, size_t size) {
+void* _mi_os_get_aligned_hint(size_t try_alignment, size_t size) {
   MI_UNUSED(try_alignment); MI_UNUSED(size);
   return NULL;
 }
-#endif
-
-/* -----------------------------------------------------------
-  Free memory
--------------------------------------------------------------- */
-
-static bool mi_os_mem_free(void* addr, size_t size, bool was_committed, mi_stats_t* stats)
-{
-  if (addr == NULL || size == 0) return true; // || _mi_os_is_huge_reserved(addr)
-  bool err = false;
-#if defined(_WIN32)
-  DWORD errcode = 0;
-  err = (VirtualFree(addr, 0, MEM_RELEASE) == 0);
-  if (err) { errcode = GetLastError(); }
-  if (errcode == ERROR_INVALID_ADDRESS) {
-    // In mi_os_mem_alloc_aligned the fallback path may have returned a pointer inside
-    // the memory region returned by VirtualAlloc; in that case we need to free using
-    // the start of the region.
-    MEMORY_BASIC_INFORMATION info = { 0 };
-    VirtualQuery(addr, &info, sizeof(info));
-    if (info.AllocationBase < addr && ((uint8_t*)addr - (uint8_t*)info.AllocationBase) < (ptrdiff_t)MI_SEGMENT_SIZE) {
-      errcode = 0;
-      err = (VirtualFree(info.AllocationBase, 0, MEM_RELEASE) == 0);
-      if (err) { errcode = GetLastError(); }
-    }
-  }
-  if (errcode != 0) {
-    _mi_warning_message("unable to release OS memory: error code 0x%x, addr: %p, size: %zu\n", errcode, addr, size);
-  }
-#elif defined(MI_USE_SBRK) || defined(__wasi__)
-  err = false; // sbrk heap cannot be shrunk
-#else
-  err = (munmap(addr, size) == -1);
-  if (err) {
-    _mi_warning_message("unable to release OS memory: %s, addr: %p, size: %zu\n", strerror(errno), addr, size);
-  }
-#endif
-  if (was_committed) { _mi_stat_decrease(&stats->committed, size); }
-  _mi_stat_decrease(&stats->reserved, size);
-  return !err;  
-}
 
 
 /* -----------------------------------------------------------
-  Raw allocation on Windows (VirtualAlloc) 
--------------------------------------------------------------- */
-
-#ifdef _WIN32
- 
-#define MEM_COMMIT_RESERVE  (MEM_COMMIT|MEM_RESERVE)
+  Guard page allocation
+----------------------------------------------------------- */
 
-static void* mi_win_virtual_allocx(void* addr, size_t size, size_t try_alignment, DWORD flags) {
-#if (MI_INTPTR_SIZE >= 8)
-  // on 64-bit systems, try to use the virtual address area after 2TiB for 4MiB aligned allocations
-  if (addr == NULL) {
-    void* hint = mi_os_get_aligned_hint(try_alignment,size);
-    if (hint != NULL) {
-      void* p = VirtualAlloc(hint, size, flags, PAGE_READWRITE);
-      if (p != NULL) return p;
-      _mi_verbose_message("warning: unable to allocate hinted aligned OS memory (%zu bytes, error code: 0x%x, address: %p, alignment: %zu, flags: 0x%x)\n", size, GetLastError(), hint, try_alignment, flags);
-      // fall through on error
-    }
-  } 
-#endif
-  // on modern Windows try use VirtualAlloc2 for aligned allocation
-  if (try_alignment > 1 && (try_alignment % _mi_os_page_size()) == 0 && pVirtualAlloc2 != NULL) {
-    MI_MEM_ADDRESS_REQUIREMENTS reqs = { 0, 0, 0 };
-    reqs.Alignment = try_alignment;
-    MI_MEM_EXTENDED_PARAMETER param = { {0, 0}, {0} };
-    param.Type.Type = MiMemExtendedParameterAddressRequirements;
-    param.Arg.Pointer = &reqs;
-    void* p = (*pVirtualAlloc2)(GetCurrentProcess(), addr, size, flags, PAGE_READWRITE, &param, 1);
-    if (p != NULL) return p;
-    _mi_warning_message("unable to allocate aligned OS memory (%zu bytes, error code: 0x%x, address: %p, alignment: %zu, flags: 0x%x)\n", size, GetLastError(), addr, try_alignment, flags);
-    // fall through on error
-  }
-  // last resort
-  return VirtualAlloc(addr, size, flags, PAGE_READWRITE);
+// In secure mode, return the size of a guard page, otherwise 0
+size_t _mi_os_secure_guard_page_size(void) {
+  #if MI_SECURE > 0
+  return _mi_os_guard_page_size();
+  #else
+  return 0;
+  #endif
 }
 
-static void* mi_win_virtual_alloc(void* addr, size_t size, size_t try_alignment, DWORD flags, bool large_only, bool allow_large, bool* is_large) {
-  mi_assert_internal(!(large_only && !allow_large));
-  static _Atomic(size_t) large_page_try_ok; // = 0;
-  void* p = NULL;
-  // Try to allocate large OS pages (2MiB) if allowed or required.
-  if ((large_only || use_large_os_page(size, try_alignment))
-      && allow_large && (flags&MEM_COMMIT)!=0 && (flags&MEM_RESERVE)!=0) {
-    size_t try_ok = mi_atomic_load_acquire(&large_page_try_ok);
-    if (!large_only && try_ok > 0) {
-      // if a large page allocation fails, it seems the calls to VirtualAlloc get very expensive.
-      // therefore, once a large page allocation failed, we don't try again for `large_page_try_ok` times.
-      mi_atomic_cas_strong_acq_rel(&large_page_try_ok, &try_ok, try_ok - 1);
+// In secure mode, try to decommit an area and output a warning if this fails.
+bool _mi_os_secure_guard_page_set_at(void* addr, mi_memid_t memid) {
+  if (addr == NULL) return true;
+  #if MI_SECURE > 0
+  bool ok = false;
+  if (!memid.is_pinned) {
+    mi_arena_t* const arena = mi_memid_arena(memid);
+    if (arena != NULL && arena->commit_fun != NULL) {
+      ok = (*(arena->commit_fun))(false /* decommit */, addr, _mi_os_secure_guard_page_size(), NULL, arena->commit_fun_arg);
     }
     else {
-      // large OS pages must always reserve and commit.
-      *is_large = true;
-      p = mi_win_virtual_allocx(addr, size, try_alignment, flags | MEM_LARGE_PAGES);
-      if (large_only) return p;
-      // fall back to non-large page allocation on error (`p == NULL`).
-      if (p == NULL) {
-        mi_atomic_store_release(&large_page_try_ok,10UL);  // on error, don't try again for the next N allocations
-      }
+      ok = _mi_os_decommit(addr, _mi_os_secure_guard_page_size());
     }
   }
-  // Fall back to regular page allocation
-  if (p == NULL) {
-    *is_large = ((flags&MEM_LARGE_PAGES) != 0);
-    p = mi_win_virtual_allocx(addr, size, try_alignment, flags);
-  }
-  if (p == NULL) {
-    _mi_warning_message("unable to allocate OS memory (%zu bytes, error code: 0x%x, address: %p, alignment: %zu, flags: 0x%x, large only: %d, allow large: %d)\n", size, GetLastError(), addr, try_alignment, flags, large_only, allow_large);
+  if (!ok) {
+    _mi_error_message(EINVAL, "secure level %d, but failed to commit guard page (at %p of size %zu)\n", MI_SECURE, addr, _mi_os_secure_guard_page_size());
   }
-  return p;
+  return ok;
+  #else
+  MI_UNUSED(memid);
+  return true;
+  #endif
 }
 
-/* -----------------------------------------------------------
-  Raw allocation using `sbrk` or `wasm_memory_grow`
--------------------------------------------------------------- */
-
-#elif defined(MI_USE_SBRK) || defined(__wasi__)
-#if defined(MI_USE_SBRK) 
-  static void* mi_memory_grow( size_t size ) {
-    void* p = sbrk(size);
-    if (p == (void*)(-1)) return NULL;
-    #if !defined(__wasi__) // on wasi this is always zero initialized already (?)
-    memset(p,0,size); 
-    #endif
-    return p;
-  }
-#elif defined(__wasi__)
-  static void* mi_memory_grow( size_t size ) {
-    size_t base = (size > 0 ? __builtin_wasm_memory_grow(0,_mi_divide_up(size, _mi_os_page_size()))
-                            : __builtin_wasm_memory_size(0));
-    if (base == SIZE_MAX) return NULL;     
-    return (void*)(base * _mi_os_page_size());    
-  }
-#endif
-
-#if defined(MI_USE_PTHREADS)
-static pthread_mutex_t mi_heap_grow_mutex = PTHREAD_MUTEX_INITIALIZER;
-#endif
+// In secure mode, try to decommit an area and output a warning if this fails.
+bool _mi_os_secure_guard_page_set_before(void* addr, mi_memid_t memid) {
+  return _mi_os_secure_guard_page_set_at((uint8_t*)addr - _mi_os_secure_guard_page_size(), memid);
+}
 
-static void* mi_heap_grow(size_t size, size_t try_alignment) {
-  void* p = NULL;
-  if (try_alignment <= 1) {
-    // `sbrk` is not thread safe in general so try to protect it (we could skip this on WASM but leave it in for now)
-    #if defined(MI_USE_PTHREADS) 
-    pthread_mutex_lock(&mi_heap_grow_mutex);
-    #endif
-    p = mi_memory_grow(size);
-    #if defined(MI_USE_PTHREADS)
-    pthread_mutex_unlock(&mi_heap_grow_mutex);
-    #endif
-  }
-  else {
-    void* base = NULL;
-    size_t alloc_size = 0;
-    // to allocate aligned use a lock to try to avoid thread interaction
-    // between getting the current size and actual allocation
-    // (also, `sbrk` is not thread safe in general)
-    #if defined(MI_USE_PTHREADS)
-    pthread_mutex_lock(&mi_heap_grow_mutex);
-    #endif
-    {
-      void* current = mi_memory_grow(0);  // get current size
-      if (current != NULL) {
-        void* aligned_current = mi_align_up_ptr(current, try_alignment);  // and align from there to minimize wasted space
-        alloc_size = _mi_align_up( ((uint8_t*)aligned_current - (uint8_t*)current) + size, _mi_os_page_size());
-        base = mi_memory_grow(alloc_size);        
-      }
+// In secure mode, try to recommit an area
+bool _mi_os_secure_guard_page_reset_at(void* addr, mi_memid_t memid) {
+  if (addr == NULL) return true;
+  #if MI_SECURE > 0
+  if (!memid.is_pinned) {
+    mi_arena_t* const arena = mi_memid_arena(memid);
+    if (arena != NULL && arena->commit_fun != NULL) {
+      return (*(arena->commit_fun))(true, addr, _mi_os_secure_guard_page_size(), NULL, arena->commit_fun_arg);
     }
-    #if defined(MI_USE_PTHREADS)
-    pthread_mutex_unlock(&mi_heap_grow_mutex);
-    #endif
-    if (base != NULL) {
-      p = mi_align_up_ptr(base, try_alignment);
-      if ((uint8_t*)p + size > (uint8_t*)base + alloc_size) {
-        // another thread used wasm_memory_grow/sbrk in-between and we do not have enough
-        // space after alignment. Give up (and waste the space as we cannot shrink :-( )
-        // (in `mi_os_mem_alloc_aligned` this will fall back to overallocation to align)
-        p = NULL;
-      }
+    else {
+      return _mi_os_commit(addr, _mi_os_secure_guard_page_size(), NULL);
     }
   }
-  if (p == NULL) {
-    _mi_warning_message("unable to allocate sbrk/wasm_memory_grow OS memory (%zu bytes, %zu alignment)\n", size, try_alignment);    
-    errno = ENOMEM;
-    return NULL;
-  }
-  mi_assert_internal( try_alignment == 0 || (uintptr_t)p % try_alignment == 0 );
-  return p;
+  #else
+  MI_UNUSED(memid);
+  #endif
+  return true;
+}
+
+// In secure mode, try to recommit an area
+bool _mi_os_secure_guard_page_reset_before(void* addr, mi_memid_t memid) {
+  return _mi_os_secure_guard_page_reset_at((uint8_t*)addr - _mi_os_secure_guard_page_size(), memid);
 }
 
+
 /* -----------------------------------------------------------
-  Raw allocation on Unix's (mmap)
+  Free memory
 -------------------------------------------------------------- */
-#else 
-#define MI_OS_USE_MMAP
-static void* mi_unix_mmapx(void* addr, size_t size, size_t try_alignment, int protect_flags, int flags, int fd) {
-  MI_UNUSED(try_alignment);  
-  #if defined(MAP_ALIGNED)  // BSD
-  if (addr == NULL && try_alignment > 1 && (try_alignment % _mi_os_page_size()) == 0) {
-    size_t n = mi_bsr(try_alignment);
-    if (((size_t)1 << n) == try_alignment && n >= 12 && n <= 30) {  // alignment is a power of 2 and 4096 <= alignment <= 1GiB
-      flags |= MAP_ALIGNED(n);
-      void* p = mmap(addr, size, protect_flags, flags | MAP_ALIGNED(n), fd, 0);
-      if (p!=MAP_FAILED) return p;
-      // fall back to regular mmap
-    }
-  }
-  #elif defined(MAP_ALIGN)  // Solaris
-  if (addr == NULL && try_alignment > 1 && (try_alignment % _mi_os_page_size()) == 0) {
-    void* p = mmap((void*)try_alignment, size, protect_flags, flags | MAP_ALIGN, fd, 0);  // addr parameter is the required alignment
-    if (p!=MAP_FAILED) return p;
-    // fall back to regular mmap
+
+static void mi_os_free_huge_os_pages(void* p, size_t size, mi_subproc_t* subproc);
+
+static void mi_os_prim_free(void* addr, size_t size, size_t commit_size, mi_subproc_t* subproc) {
+  mi_assert_internal((size % _mi_os_page_size()) == 0);
+  if (addr == NULL) return; // || _mi_os_is_huge_reserved(addr)
+  int err = _mi_prim_free(addr, size);  // allow size==0 (issue #1041)
+  if (err != 0) {
+    _mi_warning_message("unable to free OS memory (error: %d (0x%x), size: 0x%zx bytes, address: %p)\n", err, err, size, addr);
   }
-  #endif
-  #if (MI_INTPTR_SIZE >= 8) && !defined(MAP_ALIGNED)
-  // on 64-bit systems, use the virtual address area after 2TiB for 4MiB aligned allocations
-  if (addr == NULL) {
-    void* hint = mi_os_get_aligned_hint(try_alignment, size);
-    if (hint != NULL) {
-      void* p = mmap(hint, size, protect_flags, flags, fd, 0);
-      if (p!=MAP_FAILED) return p;
-      // fall back to regular mmap
-    }
+  if (subproc == NULL) { subproc = _mi_subproc(); } // from `mi_arenas_unsafe_destroy` we pass subproc_main explicitly as we can no longer use the heap pointer
+  if (commit_size > 0) {
+    mi_subproc_stat_decrease(subproc, committed, commit_size);
   }
-  #endif
-  // regular mmap
-  void* p = mmap(addr, size, protect_flags, flags, fd, 0);
-  if (p!=MAP_FAILED) return p;  
-  // failed to allocate
-  return NULL;
-}
-
-static int mi_unix_mmap_fd(void) {
-#if defined(VM_MAKE_TAG)
-  // macOS: tracking anonymous page with a specific ID. (All up to 98 are taken officially but LLVM sanitizers had taken 99)
-  int os_tag = (int)mi_option_get(mi_option_os_tag);
-  if (os_tag < 100 || os_tag > 255) os_tag = 100;
-  return VM_MAKE_TAG(os_tag);
-#else
-  return -1;
-#endif
+  mi_subproc_stat_decrease(subproc, reserved, size);
 }
 
-static void* mi_unix_mmap(void* addr, size_t size, size_t try_alignment, int protect_flags, bool large_only, bool allow_large, bool* is_large) {
-  void* p = NULL;
-  #if !defined(MAP_ANONYMOUS)
-  #define MAP_ANONYMOUS  MAP_ANON
-  #endif
-  #if !defined(MAP_NORESERVE)
-  #define MAP_NORESERVE  0
-  #endif
-  const int fd = mi_unix_mmap_fd();
-  int flags = MAP_PRIVATE | MAP_ANONYMOUS;
-  if (_mi_os_has_overcommit()) {
-    flags |= MAP_NORESERVE;
-  }  
-  #if defined(PROT_MAX)
-  protect_flags |= PROT_MAX(PROT_READ | PROT_WRITE); // BSD
-  #endif    
-  // huge page allocation
-  if ((large_only || use_large_os_page(size, try_alignment)) && allow_large) {
-    static _Atomic(size_t) large_page_try_ok; // = 0;
-    size_t try_ok = mi_atomic_load_acquire(&large_page_try_ok);
-    if (!large_only && try_ok > 0) {
-      // If the OS is not configured for large OS pages, or the user does not have
-      // enough permission, the `mmap` will always fail (but it might also fail for other reasons).
-      // Therefore, once a large page allocation failed, we don't try again for `large_page_try_ok` times
-      // to avoid too many failing calls to mmap.
-      mi_atomic_cas_strong_acq_rel(&large_page_try_ok, &try_ok, try_ok - 1);
-    }
-    else {
-      int lflags = flags & ~MAP_NORESERVE;  // using NORESERVE on huge pages seems to fail on Linux
-      int lfd = fd;
-      #ifdef MAP_ALIGNED_SUPER
-      lflags |= MAP_ALIGNED_SUPER;
-      #endif
-      #ifdef MAP_HUGETLB
-      lflags |= MAP_HUGETLB;
-      #endif
-      #ifdef MAP_HUGE_1GB
-      static bool mi_huge_pages_available = true;
-      if ((size % MI_GiB) == 0 && mi_huge_pages_available) {
-        lflags |= MAP_HUGE_1GB;
-      }
-      else
-      #endif
-      {
-        #ifdef MAP_HUGE_2MB
-        lflags |= MAP_HUGE_2MB;
-        #endif
+void _mi_os_free_ex(void* addr, size_t size, bool still_committed, mi_memid_t memid, mi_subproc_t* subproc /* can be NULL */) {
+  if (mi_memkind_is_os(memid.memkind)) {
+    size_t csize = memid.mem.os.size;
+    if (csize==0) { csize = _mi_os_good_alloc_size(size); }
+    mi_assert_internal(csize >= size);
+    size_t commit_size = (still_committed ? csize : 0);
+    void* base = addr;
+    // different base? (due to alignment)
+    if (memid.mem.os.base != base) {
+      mi_assert(memid.mem.os.base <= addr);
+      base = memid.mem.os.base;
+      const size_t diff = (uint8_t*)addr - (uint8_t*)memid.mem.os.base;
+      if (memid.mem.os.size==0) {
+        csize += diff;
       }
-      #ifdef VM_FLAGS_SUPERPAGE_SIZE_2MB
-      lfd |= VM_FLAGS_SUPERPAGE_SIZE_2MB;
-      #endif
-      if (large_only || lflags != flags) {
-        // try large OS page allocation
-        *is_large = true;
-        p = mi_unix_mmapx(addr, size, try_alignment, protect_flags, lflags, lfd);
-        #ifdef MAP_HUGE_1GB
-        if (p == NULL && (lflags & MAP_HUGE_1GB) != 0) {
-          mi_huge_pages_available = false; // don't try huge 1GiB pages again
-          _mi_warning_message("unable to allocate huge (1GiB) page, trying large (2MiB) pages instead (error %i)\n", errno);
-          lflags = ((lflags & ~MAP_HUGE_1GB) | MAP_HUGE_2MB);
-          p = mi_unix_mmapx(addr, size, try_alignment, protect_flags, lflags, lfd);
-        }
-        #endif
-        if (large_only) return p;
-        if (p == NULL) {
-          mi_atomic_store_release(&large_page_try_ok, (size_t)8);  // on error, don't try again for the next N allocations
-        }
+      if (still_committed) {
+        commit_size -= diff;  // the (addr-base) part was already un-committed
       }
     }
-  }
-  // regular allocation
-  if (p == NULL) {
-    *is_large = false;
-    p = mi_unix_mmapx(addr, size, try_alignment, protect_flags, flags, fd);
-    if (p != NULL) {
-      #if defined(MADV_HUGEPAGE)
-      // Many Linux systems don't allow MAP_HUGETLB but they support instead
-      // transparent huge pages (THP). Generally, it is not required to call `madvise` with MADV_HUGE
-      // though since properly aligned allocations will already use large pages if available
-      // in that case -- in particular for our large regions (in `memory.c`).
-      // However, some systems only allow THP if called with explicit `madvise`, so
-      // when large OS pages are enabled for mimalloc, we call `madvise` anyways.
-      if (allow_large && use_large_os_page(size, try_alignment)) {
-        if (mi_madvise(p, size, MADV_HUGEPAGE) == 0) {
-          *is_large = true; // possibly
-        };
-      }
-      #elif defined(__sun)
-      if (allow_large && use_large_os_page(size, try_alignment)) {
-        struct memcntl_mha cmd = {0};
-        cmd.mha_pagesize = large_os_page_size;
-        cmd.mha_cmd = MHA_MAPSIZE_VA;
-        if (memcntl((caddr_t)p, size, MC_HAT_ADVISE, (caddr_t)&cmd, 0, 0) == 0) {
-          *is_large = true;
-        }
-      }      
-      #endif
+    // free it
+    if (memid.memkind == MI_MEM_OS_HUGE) {
+      mi_assert(memid.is_pinned);
+      mi_os_free_huge_os_pages(base, csize, subproc);
+    }
+    else {
+      mi_os_prim_free(base, csize, (still_committed ? commit_size : 0), subproc);
     }
   }
-  if (p == NULL) {
-    _mi_warning_message("unable to allocate OS memory (%zu bytes, error code: %i, address: %p, large only: %d, allow large: %d)\n", size, errno, addr, large_only, allow_large);
+  else {
+    // nothing to do
+    mi_assert(memid.memkind < MI_MEM_OS);
   }
-  return p;
 }
-#endif
+
+void  _mi_os_free(void* p, size_t size, mi_memid_t memid) {
+  _mi_os_free_ex(p, size, true, memid, NULL);
+}
 
 
 /* -----------------------------------------------------------
@@ -702,148 +236,223 @@ static void* mi_unix_mmap(void* addr, size_t size, size_t try_alignment, int pro
 -------------------------------------------------------------- */
 
 // Note: the `try_alignment` is just a hint and the returned pointer is not guaranteed to be aligned.
-static void* mi_os_mem_alloc(size_t size, size_t try_alignment, bool commit, bool allow_large, bool* is_large, mi_stats_t* stats) {
+// Also `hint_addr` is a hint and may be ignored.
+static void* mi_os_prim_alloc_at(void* hint_addr, size_t size, size_t try_alignment, bool commit, bool allow_large, bool* is_large, bool* is_zero) {
   mi_assert_internal(size > 0 && (size % _mi_os_page_size()) == 0);
+  mi_assert_internal(is_zero != NULL);
+  mi_assert_internal(is_large != NULL);
   if (size == 0) return NULL;
-  if (!commit) allow_large = false;
-  if (try_alignment == 0) try_alignment = 1; // avoid 0 to ensure there will be no divide by zero when aligning
-
+  if (!commit) { allow_large = false; }
+  if (try_alignment == 0) { try_alignment = 1; } // avoid 0 to ensure there will be no divide by zero when aligning
+  *is_zero = false;
   void* p = NULL;
-  /*
-  if (commit && allow_large) {
-    p = _mi_os_try_alloc_from_huge_reserved(size, try_alignment);
-    if (p != NULL) {
-      *is_large = true;
-      return p;
-    }
+  int err = _mi_prim_alloc(hint_addr, size, try_alignment, commit, allow_large, is_large, is_zero, &p);
+  if (err != 0) {
+    _mi_warning_message("unable to allocate OS memory (error: %d (0x%x), addr: %p, size: 0x%zx bytes, align: 0x%zx, commit: %d, allow large: %d)\n", err, err, hint_addr, size, try_alignment, commit, allow_large);
   }
-  */
 
-  #if defined(_WIN32)
-    int flags = MEM_RESERVE;
-    if (commit) { flags |= MEM_COMMIT; }
-    p = mi_win_virtual_alloc(NULL, size, try_alignment, flags, false, allow_large, is_large);
-  #elif defined(MI_USE_SBRK) || defined(__wasi__)
-    MI_UNUSED(allow_large);
-    *is_large = false;
-    p = mi_heap_grow(size, try_alignment);
-  #else
-    int protect_flags = (commit ? (PROT_WRITE | PROT_READ) : PROT_NONE);
-    p = mi_unix_mmap(NULL, size, try_alignment, protect_flags, false, allow_large, is_large);
-  #endif
-  mi_stat_counter_increase(stats->mmap_calls, 1);
+  mi_os_stat_counter_increase(mmap_calls, 1);
   if (p != NULL) {
-    _mi_stat_increase(&stats->reserved, size);
-    if (commit) { _mi_stat_increase(&stats->committed, size); }
+    mi_os_stat_increase(reserved, size);
+    if (commit) {
+      mi_os_stat_increase(committed, size);
+      // seems needed for asan (or `mimalloc-test-api` fails)
+      #ifdef MI_TRACK_ASAN
+      if (*is_zero) { mi_track_mem_defined(p,size); }
+               else { mi_track_mem_undefined(p,size); }
+      #endif
+    }
   }
   return p;
 }
 
+static void* mi_os_prim_alloc(size_t size, size_t try_alignment, bool commit, bool allow_large, bool* is_large, bool* is_zero) {
+  return mi_os_prim_alloc_at(NULL, size, try_alignment, commit, allow_large, is_large, is_zero);
+}
+
 
 // Primitive aligned allocation from the OS.
 // This function guarantees the allocated memory is aligned.
-static void* mi_os_mem_alloc_aligned(size_t size, size_t alignment, bool commit, bool allow_large, bool* is_large, mi_stats_t* stats) {
+static void* mi_os_prim_alloc_aligned(size_t size, size_t alignment, bool commit, bool allow_large, bool* is_large, bool* is_zero, void** base) {
   mi_assert_internal(alignment >= _mi_os_page_size() && ((alignment & (alignment - 1)) == 0));
   mi_assert_internal(size > 0 && (size % _mi_os_page_size()) == 0);
   mi_assert_internal(is_large != NULL);
+  mi_assert_internal(is_zero != NULL);
+  mi_assert_internal(base != NULL);
   if (!commit) allow_large = false;
   if (!(alignment >= _mi_os_page_size() && ((alignment & (alignment - 1)) == 0))) return NULL;
   size = _mi_align_up(size, _mi_os_page_size());
 
-  // try first with a hint (this will be aligned directly on Win 10+ or BSD)
-  void* p = mi_os_mem_alloc(size, alignment, commit, allow_large, is_large, stats);
-  if (p == NULL) return NULL;
-  
-  // if not aligned, free it, overallocate, and unmap around it
-  if (((uintptr_t)p % alignment != 0)) {
-    mi_os_mem_free(p, size, commit, stats);
-    _mi_warning_message("unable to allocate aligned OS memory directly, fall back to over-allocation (%zu bytes, address: %p, alignment: %zu, commit: %d)\n", size, p, alignment, commit);
+  // try a direct allocation if the alignment is below the default, or if larger than 1/8 fraction of the size.
+  const bool try_direct_alloc = (alignment <= mi_os_mem_config.alloc_granularity || alignment > size/8);
+
+  void* p = NULL;
+  if (try_direct_alloc) {
+    p = mi_os_prim_alloc(size, alignment, commit, allow_large, is_large, is_zero);
+  }
+
+  // aligned already?
+  if (p != NULL && ((uintptr_t)p % alignment) == 0) {
+    *base = p;
+  }
+  else {
+    // if not aligned, free it, overallocate, and unmap around it
+    #if !MI_TRACK_ASAN
+    if (try_direct_alloc) {
+      _mi_warning_message("unable to allocate aligned OS memory directly, fall back to over-allocation (size: 0x%zx bytes, address: %p, alignment: 0x%zx, commit: %d)\n", size, p, alignment, commit);
+    }
+    #endif
+    if (p != NULL) { mi_os_prim_free(p, size, (commit ? size : 0), NULL); }
     if (size >= (SIZE_MAX - alignment)) return NULL; // overflow
     const size_t over_size = size + alignment;
 
-#if _WIN32
-    // over-allocate uncommitted (virtual) memory
-    p = mi_os_mem_alloc(over_size, 0 /*alignment*/, false /* commit? */, false /* allow_large */, is_large, stats);
-    if (p == NULL) return NULL;
-    
-    // set p to the aligned part in the full region
-    // note: this is dangerous on Windows as VirtualFree needs the actual region pointer
-    // but in mi_os_mem_free we handle this (hopefully exceptional) situation.
-    p = mi_align_up_ptr(p, alignment);
-
-    // explicitly commit only the aligned part
-    if (commit) {
-      _mi_os_commit(p, size, NULL, stats);
+    if (!mi_os_mem_config.has_partial_free) {  // win32 virtualAlloc cannot free parts of an allocated block
+      // over-allocate uncommitted (virtual) memory
+      p = mi_os_prim_alloc(over_size, 1 /*alignment*/, false /* commit? */, false /* allow_large */, is_large, is_zero);
+      if (p == NULL) return NULL;
+
+      // set p to the aligned part in the full region
+      // note: on Windows VirtualFree needs the actual base pointer
+      // this is handledby having the `base` field in the memid.
+      *base = p; // remember the base
+      p = _mi_align_up_ptr(p, alignment);
+
+      // explicitly commit only the aligned part
+      if (commit) {
+        if (!_mi_os_commit(p, size, NULL)) {
+          mi_os_prim_free(*base, over_size, 0, NULL);
+          return NULL;
+        }
+      }
+    }
+    else  { // mmap can free inside an allocation
+      // overallocate...
+      p = mi_os_prim_alloc(over_size, 1, commit, false, is_large, is_zero);
+      if (p == NULL) return NULL;
+
+      // and selectively unmap parts around the over-allocated area.
+      void* aligned_p = _mi_align_up_ptr(p, alignment);
+      size_t pre_size = (uint8_t*)aligned_p - (uint8_t*)p;
+      size_t mid_size = _mi_align_up(size, _mi_os_page_size());
+      size_t post_size = over_size - pre_size - mid_size;
+      mi_assert_internal(pre_size < over_size&& post_size < over_size&& mid_size >= size);
+      if (pre_size > 0)  { mi_os_prim_free(p, pre_size, (commit ? pre_size : 0), NULL); }
+      if (post_size > 0) { mi_os_prim_free((uint8_t*)aligned_p + mid_size, post_size, (commit ? post_size : 0), NULL); }
+      // we can return the aligned pointer on `mmap` systems
+      p = aligned_p;
+      *base = aligned_p; // since we freed the pre part, `*base == p`.
     }
-#else
-    // overallocate...
-    p = mi_os_mem_alloc(over_size, 1, commit, false, is_large, stats);
-    if (p == NULL) return NULL;
-    // and selectively unmap parts around the over-allocated area. (noop on sbrk)
-    void* aligned_p = mi_align_up_ptr(p, alignment);
-    size_t pre_size = (uint8_t*)aligned_p - (uint8_t*)p;
-    size_t mid_size = _mi_align_up(size, _mi_os_page_size());
-    size_t post_size = over_size - pre_size - mid_size;
-    mi_assert_internal(pre_size < over_size && post_size < over_size && mid_size >= size);
-    if (pre_size > 0)  mi_os_mem_free(p, pre_size, commit, stats);
-    if (post_size > 0) mi_os_mem_free((uint8_t*)aligned_p + mid_size, post_size, commit, stats);
-    // we can return the aligned pointer on `mmap` (and sbrk) systems
-    p = aligned_p;
-#endif
   }
 
-  mi_assert_internal(p == NULL || (p != NULL && ((uintptr_t)p % alignment) == 0));
+  mi_assert_internal(p == NULL || (p != NULL && *base != NULL && ((uintptr_t)p % alignment) == 0));
   return p;
 }
 
 
 /* -----------------------------------------------------------
-  OS API: alloc, free, alloc_aligned
+  OS API: alloc and alloc_aligned
 ----------------------------------------------------------- */
 
-void* _mi_os_alloc(size_t size, mi_stats_t* tld_stats) {
-  MI_UNUSED(tld_stats);
-  mi_stats_t* stats = &_mi_stats_main;
+void* _mi_os_alloc(size_t size, mi_memid_t* memid) {
+  *memid = _mi_memid_none();
   if (size == 0) return NULL;
   size = _mi_os_good_alloc_size(size);
-  bool is_large = false;
-  return mi_os_mem_alloc(size, 0, true, false, &is_large, stats);
-}
-
-void  _mi_os_free_ex(void* p, size_t size, bool was_committed, mi_stats_t* tld_stats) {
-  MI_UNUSED(tld_stats);
-  mi_stats_t* stats = &_mi_stats_main;
-  if (size == 0 || p == NULL) return;
-  size = _mi_os_good_alloc_size(size);
-  mi_os_mem_free(p, size, was_committed, stats);
-}
+  bool os_is_large = false;
+  bool os_is_zero  = false;
+  void* p = mi_os_prim_alloc(size, 0, true, false, &os_is_large, &os_is_zero);
+  if (p == NULL) return NULL;
 
-void  _mi_os_free(void* p, size_t size, mi_stats_t* stats) {
-  _mi_os_free_ex(p, size, true, stats);
+  *memid = _mi_memid_create_os(p, size, true, os_is_zero, os_is_large);  
+  mi_assert_internal(memid->mem.os.size >= size);
+  mi_assert_internal(memid->initially_committed);
+  return p;
 }
 
-void* _mi_os_alloc_aligned(size_t size, size_t alignment, bool commit, bool* large, mi_stats_t* tld_stats)
+void* _mi_os_alloc_aligned(size_t size, size_t alignment, bool commit, bool allow_large, mi_memid_t* memid)
 {
-  MI_UNUSED(&mi_os_get_aligned_hint); // suppress unused warnings
-  MI_UNUSED(tld_stats);
+  MI_UNUSED(&_mi_os_get_aligned_hint); // suppress unused warnings
+  *memid = _mi_memid_none();
   if (size == 0) return NULL;
   size = _mi_os_good_alloc_size(size);
   alignment = _mi_align_up(alignment, _mi_os_page_size());
-  bool allow_large = false;
-  if (large != NULL) {
-    allow_large = *large;
-    *large = false;
+
+  bool os_is_large = false;
+  bool os_is_zero  = false;
+  void* os_base = NULL;
+  void* p = mi_os_prim_alloc_aligned(size, alignment, commit, allow_large, &os_is_large, &os_is_zero, &os_base );
+  if (p == NULL) return NULL;
+
+  *memid = _mi_memid_create_os(p, size, commit, os_is_zero, os_is_large);
+  memid->mem.os.base = os_base;
+  memid->mem.os.size += ((uint8_t*)p - (uint8_t*)os_base);  // todo: return from prim_alloc_aligned?
+
+  mi_assert_internal(memid->mem.os.size >= size);
+  mi_assert_internal(_mi_is_aligned(p,alignment));
+  if (commit) { mi_assert_internal(memid->initially_committed); }  
+  return p;
+}
+
+
+mi_decl_nodiscard static void* mi_os_ensure_zero(void* p, size_t size, mi_memid_t* memid) {
+  if (p==NULL || size==0) return p;
+  // ensure committed
+  if (!memid->initially_committed) {
+    bool is_zero = false;
+    if (!_mi_os_commit(p, size, &is_zero)) {
+      _mi_os_free(p, size, *memid);
+      return NULL;
+    }
+    memid->initially_committed = true;
   }
-  return mi_os_mem_alloc_aligned(size, alignment, commit, allow_large, (large!=NULL?large:&allow_large), &_mi_stats_main /*tld->stats*/ );
+  // ensure zero'd
+  if (memid->initially_zero) return p;
+  _mi_memzero_aligned(p,size);
+  memid->initially_zero = true;
+  return p;
 }
 
+void*  _mi_os_zalloc(size_t size, mi_memid_t* memid) {
+  void* p = _mi_os_alloc(size,memid);
+  return mi_os_ensure_zero(p, size, memid);
+}
 
+/* -----------------------------------------------------------
+  OS aligned allocation with an offset. This is used
+  for large alignments > MI_BLOCK_ALIGNMENT_MAX. We use a large mimalloc
+  page where the object can be aligned at an offset from the start of the segment.
+  As we may need to overallocate, we need to free such pointers using `mi_free_aligned`
+  to use the actual start of the memory region.
+----------------------------------------------------------- */
+
+void* _mi_os_alloc_aligned_at_offset(size_t size, size_t alignment, size_t offset, bool commit, bool allow_large, mi_memid_t* memid) {
+  mi_assert(offset <= size);
+  mi_assert((alignment % _mi_os_page_size()) == 0);
+  *memid = _mi_memid_none();
+  if (offset == 0) {
+    // regular aligned allocation
+    return _mi_os_alloc_aligned(size, alignment, commit, allow_large, memid);
+  }
+  else {
+    // overallocate to align at an offset
+    const size_t extra = _mi_align_up(offset, alignment) - offset;
+    const size_t oversize = size + extra;
+    void* const start = _mi_os_alloc_aligned(oversize, alignment, commit, allow_large, memid);
+    if (start == NULL) return NULL;
+
+    void* const p = (uint8_t*)start + extra;
+    mi_assert(_mi_is_aligned((uint8_t*)p + offset, alignment));
+    // decommit the overallocation at the start
+    if (commit && extra > _mi_os_page_size()) {
+      _mi_os_decommit(start, extra);
+    }
+    return p;
+  }
+}
 
 /* -----------------------------------------------------------
   OS memory API: reset, commit, decommit, protect, unprotect.
 ----------------------------------------------------------- */
 
-
 // OS page align within a given area, either conservative (pages inside the area only),
 // or not (straddling pages outside the area is possible)
 static void* mi_os_page_align_areax(bool conservative, void* addr, size_t size, size_t* newsize) {
@@ -851,11 +460,11 @@ static void* mi_os_page_align_areax(bool conservative, void* addr, size_t size,
   if (newsize != NULL) *newsize = 0;
   if (size == 0 || addr == NULL) return NULL;
 
-  // page align conservatively within the range
-  void* start = (conservative ? mi_align_up_ptr(addr, _mi_os_page_size())
+  // page align conservatively within the range, or liberally straddling pages outside the range
+  void* start = (conservative ? _mi_align_up_ptr(addr, _mi_os_page_size())
     : mi_align_down_ptr(addr, _mi_os_page_size()));
   void* end = (conservative ? mi_align_down_ptr((uint8_t*)addr + size, _mi_os_page_size())
-    : mi_align_up_ptr((uint8_t*)addr + size, _mi_os_page_size()));
+    : _mi_align_up_ptr((uint8_t*)addr + size, _mi_os_page_size()));
   ptrdiff_t diff = (uint8_t*)end - (uint8_t*)start;
   if (diff <= 0) return NULL;
 
@@ -868,188 +477,132 @@ static void* mi_os_page_align_area_conservative(void* addr, size_t size, size_t*
   return mi_os_page_align_areax(true, addr, size, newsize);
 }
 
-static void mi_mprotect_hint(int err) {
-#if defined(MI_OS_USE_MMAP) && (MI_SECURE>=2) // guard page around every mimalloc page
-  if (err == ENOMEM) {
-    _mi_warning_message("the previous warning may have been caused by a low memory map limit.\n"
-                        "  On Linux this is controlled by the vm.max_map_count. For example:\n"
-                        "  > sudo sysctl -w vm.max_map_count=262144\n");
-  }
-#else
-  MI_UNUSED(err);
-#endif
-}
-
-// Commit/Decommit memory.
-// Usually commit is aligned liberal, while decommit is aligned conservative.
-// (but not for the reset version where we want commit to be conservative as well)
-static bool mi_os_commitx(void* addr, size_t size, bool commit, bool conservative, bool* is_zero, mi_stats_t* stats) {
-  // page align in the range, commit liberally, decommit conservative
+bool _mi_os_commit_ex(void* addr, size_t size, bool* is_zero, size_t stat_size) {
   if (is_zero != NULL) { *is_zero = false; }
+  mi_os_stat_counter_increase(commit_calls, 1);
+
+  // page align range
   size_t csize;
-  void* start = mi_os_page_align_areax(conservative, addr, size, &csize);
-  if (csize == 0) return true;  // || _mi_os_is_huge_reserved(addr))
-  int err = 0;
-  if (commit) {
-    _mi_stat_increase(&stats->committed, size);  // use size for precise commit vs. decommit
-    _mi_stat_counter_increase(&stats->commit_calls, 1);
-  }
-  else {
-    _mi_stat_decrease(&stats->committed, size);
-  }
+  void* start = mi_os_page_align_areax(false /* conservative? */, addr, size, &csize);
+  if (csize == 0) return true;
 
-  #if defined(_WIN32)
-  if (commit) {
-    // *is_zero = true;  // note: if the memory was already committed, the call succeeds but the memory is not zero'd
-    void* p = VirtualAlloc(start, csize, MEM_COMMIT, PAGE_READWRITE);
-    err = (p == start ? 0 : GetLastError());
-  }
-  else {
-    BOOL ok = VirtualFree(start, csize, MEM_DECOMMIT);
-    err = (ok ? 0 : GetLastError());
-  }
-  #elif defined(__wasi__)
-  // WebAssembly guests can't control memory protection
-  #elif 0 && defined(MAP_FIXED) && !defined(__APPLE__)
-  // Linux: disabled for now as mmap fixed seems much more expensive than MADV_DONTNEED (and splits VMA's?)
-  if (commit) {
-    // commit: just change the protection
-    err = mprotect(start, csize, (PROT_READ | PROT_WRITE));
-    if (err != 0) { err = errno; }
-  } 
-  else {
-    // decommit: use mmap with MAP_FIXED to discard the existing memory (and reduce rss)
-    const int fd = mi_unix_mmap_fd();
-    void* p = mmap(start, csize, PROT_NONE, (MAP_FIXED | MAP_PRIVATE | MAP_ANONYMOUS | MAP_NORESERVE), fd, 0);
-    if (p != start) { err = errno; }
+  // commit
+  bool os_is_zero = false;
+  int err = _mi_prim_commit(start, csize, &os_is_zero);
+  if (err != 0) {
+    _mi_warning_message("cannot commit OS memory (error: %d (0x%x), address: %p, size: 0x%zx bytes)\n", err, err, start, csize);
+    return false;
   }
-  #else
-  // Linux, macOSX and others.
-  if (commit) {
-    // commit: ensure we can access the area    
-    err = mprotect(start, csize, (PROT_READ | PROT_WRITE));
-    if (err != 0) { err = errno; }
-  } 
-  else {
-    #if defined(MADV_DONTNEED) && MI_DEBUG == 0 && MI_SECURE == 0
-    // decommit: use MADV_DONTNEED as it decreases rss immediately (unlike MADV_FREE)
-    // (on the other hand, MADV_FREE would be good enough.. it is just not reflected in the stats :-( )
-    err = madvise(start, csize, MADV_DONTNEED);
-    #else
-    // decommit: just disable access (also used in debug and secure mode to trap on illegal access)
-    err = mprotect(start, csize, PROT_NONE);
-    if (err != 0) { err = errno; }
-    #endif
-    //#if defined(MADV_FREE_REUSE)
-    //  while ((err = mi_madvise(start, csize, MADV_FREE_REUSE)) != 0 && errno == EAGAIN) { errno = 0; }
-    //#endif
+  if (os_is_zero && is_zero != NULL) {
+    *is_zero = true;
+    mi_assert_expensive(mi_mem_is_zero(start, csize));
   }
+  // note: the following seems required for asan (otherwise `mimalloc-test-stress` fails)
+  #ifdef MI_TRACK_ASAN
+  if (os_is_zero) { mi_track_mem_defined(start,csize); }
+             else { mi_track_mem_undefined(start,csize); }
   #endif
+  mi_os_stat_increase(committed, stat_size);  // use size for precise commit vs. decommit
+  return true;
+}
+
+bool _mi_os_commit(void* addr, size_t size, bool* is_zero) {
+  return _mi_os_commit_ex(addr, size, is_zero, size);
+}
+
+static bool mi_os_decommit_ex(void* addr, size_t size, bool* needs_recommit, size_t stat_size) {
+  mi_assert_internal(needs_recommit!=NULL);
+  mi_os_stat_decrease(committed, stat_size);
+
+  // page align
+  size_t csize;
+  void* start = mi_os_page_align_area_conservative(addr, size, &csize);
+  if (csize == 0) return true;
+
+  // decommit
+  *needs_recommit = true;
+  int err = _mi_prim_decommit(start,csize,needs_recommit);
   if (err != 0) {
-    _mi_warning_message("%s error: start: %p, csize: 0x%zx, err: %i\n", commit ? "commit" : "decommit", start, csize, err);
-    mi_mprotect_hint(err);
+    _mi_warning_message("cannot decommit OS memory (error: %d (0x%x), address: %p, size: 0x%zx bytes)\n", err, err, start, csize);
   }
   mi_assert_internal(err == 0);
   return (err == 0);
 }
 
-bool _mi_os_commit(void* addr, size_t size, bool* is_zero, mi_stats_t* tld_stats) {
-  MI_UNUSED(tld_stats);
-  mi_stats_t* stats = &_mi_stats_main;
-  return mi_os_commitx(addr, size, true, false /* liberal */, is_zero, stats);
+bool _mi_os_decommit(void* addr, size_t size) {
+  bool needs_recommit;
+  return mi_os_decommit_ex(addr, size, &needs_recommit, size);
 }
 
-bool _mi_os_decommit(void* addr, size_t size, mi_stats_t* tld_stats) {
-  MI_UNUSED(tld_stats);
-  mi_stats_t* stats = &_mi_stats_main;
-  bool is_zero;
-  return mi_os_commitx(addr, size, false, true /* conservative */, &is_zero, stats);
-}
-
-/*
-static bool mi_os_commit_unreset(void* addr, size_t size, bool* is_zero, mi_stats_t* stats) {  
-  return mi_os_commitx(addr, size, true, true // conservative
-                      , is_zero, stats);
-}
-*/
 
 // Signal to the OS that the address range is no longer in use
 // but may be used later again. This will release physical memory
 // pages and reduce swapping while keeping the memory committed.
 // We page align to a conservative area inside the range to reset.
-static bool mi_os_resetx(void* addr, size_t size, bool reset, mi_stats_t* stats) {
+bool _mi_os_reset(void* addr, size_t size) {
   // page align conservatively within the range
   size_t csize;
   void* start = mi_os_page_align_area_conservative(addr, size, &csize);
   if (csize == 0) return true;  // || _mi_os_is_huge_reserved(addr)
-  if (reset) _mi_stat_increase(&stats->reset, csize);
-        else _mi_stat_decrease(&stats->reset, csize);
-  if (!reset) return true; // nothing to do on unreset!
+  mi_os_stat_increase(reset, csize);
+  mi_os_stat_counter_increase(reset_calls, 1);
 
-  #if (MI_DEBUG>1) && !MI_TRACK_ENABLED
-  if (MI_SECURE==0) {
-    memset(start, 0, csize); // pretend it is eagerly reset
-  }
+  #if (MI_DEBUG>1) && !MI_SECURE && !MI_TRACK_ENABLED // && !MI_TSAN
+  memset(start, 0, csize); // pretend it is eagerly reset
   #endif
 
-#if defined(_WIN32)
-  // Testing shows that for us (on `malloc-large`) MEM_RESET is 2x faster than DiscardVirtualMemory
-  void* p = VirtualAlloc(start, csize, MEM_RESET, PAGE_READWRITE);
-  mi_assert_internal(p == start);
-  #if 1
-  if (p == start && start != NULL) {
-    VirtualUnlock(start,csize); // VirtualUnlock after MEM_RESET removes the memory from the working set
-  }
-  #endif
-  if (p != start) return false;
-#else
-#if defined(MADV_FREE)
-  static _Atomic(size_t) advice = MI_ATOMIC_VAR_INIT(MADV_FREE);
-  int oadvice = (int)mi_atomic_load_relaxed(&advice);
-  int err;
-  while ((err = mi_madvise(start, csize, oadvice)) != 0 && errno == EAGAIN) { errno = 0;  };
-  if (err != 0 && errno == EINVAL && oadvice == MADV_FREE) {  
-    // if MADV_FREE is not supported, fall back to MADV_DONTNEED from now on
-    mi_atomic_store_release(&advice, (size_t)MADV_DONTNEED);
-    err = mi_madvise(start, csize, MADV_DONTNEED);
-  }
-#elif defined(__wasi__)
-  int err = 0;
-#else
-  int err = mi_madvise(start, csize, MADV_DONTNEED);
-#endif
+  int err = _mi_prim_reset(start, csize);
   if (err != 0) {
-    _mi_warning_message("madvise reset error: start: %p, csize: 0x%zx, errno: %i\n", start, csize, errno);
+    _mi_warning_message("cannot reset OS memory (error: %d (0x%x), address: %p, size: 0x%zx bytes)\n", err, err, start, csize);
   }
-  //mi_assert(err == 0);
-  if (err != 0) return false;
-#endif
-  return true;
+  return (err == 0);
 }
 
-// Signal to the OS that the address range is no longer in use
-// but may be used later again. This will release physical memory
-// pages and reduce swapping while keeping the memory committed.
-// We page align to a conservative area inside the range to reset.
-bool _mi_os_reset(void* addr, size_t size, mi_stats_t* tld_stats) {
-  MI_UNUSED(tld_stats);
-  mi_stats_t* stats = &_mi_stats_main;
-  return mi_os_resetx(addr, size, true, stats);
+
+void _mi_os_reuse( void* addr, size_t size ) {
+  // page align conservatively within the range
+  size_t csize = 0;
+  void* const start = mi_os_page_align_area_conservative(addr, size, &csize);
+  if (csize == 0) return;
+  const int err = _mi_prim_reuse(start, csize);
+  if (err != 0) {
+    _mi_warning_message("cannot reuse OS memory (error: %d (0x%x), address: %p, size: 0x%zx bytes)\n", err, err, start, csize);
+  }
 }
 
-/*
-bool _mi_os_unreset(void* addr, size_t size, bool* is_zero, mi_stats_t* tld_stats) {
-  MI_UNUSED(tld_stats);
-  mi_stats_t* stats = &_mi_stats_main;
-  if (mi_option_is_enabled(mi_option_reset_decommits)) {
-    return mi_os_commit_unreset(addr, size, is_zero, stats);  // re-commit it (conservatively!)
+// either resets or decommits memory, returns true if the memory needs
+// to be recommitted if it is to be re-used later on.
+bool _mi_os_purge_ex(void* p, size_t size, bool allow_reset, size_t stat_size, mi_commit_fun_t* commit_fun, void* commit_fun_arg)
+{
+  if (mi_option_get(mi_option_purge_delay) < 0) return false;  // is purging allowed?
+  mi_os_stat_counter_increase(purge_calls, 1);
+  mi_os_stat_increase(purged, size);
+
+  if (commit_fun != NULL) {
+    bool decommitted = (*commit_fun)(false, p, size, NULL, commit_fun_arg);
+    return decommitted; // needs_recommit?
+  }
+  else if (mi_option_is_enabled(mi_option_purge_decommits) &&   // should decommit?
+           !_mi_preloading())                                   // don't decommit during preloading (unsafe)
+  {
+    bool needs_recommit = true;
+    mi_os_decommit_ex(p, size, &needs_recommit, stat_size);
+    return needs_recommit;
   }
   else {
-    *is_zero = false;
-    return mi_os_resetx(addr, size, false, stats);
+    if (allow_reset) {  // this can sometimes be not allowed if the range is not fully committed (on Windows, we cannot reset uncommitted memory)
+      _mi_os_reset(p, size);
+    }
+    return false;  // needs no recommit
   }
 }
-*/
+
+// either resets or decommits memory, returns true if the memory needs
+// to be recommitted if it is to be re-used later on.
+bool _mi_os_purge(void* p, size_t size) {
+  return _mi_os_purge_ex(p, size, true, size, NULL, NULL);
+}
+
 
 // Protect a region in memory to be not accessible.
 static  bool mi_os_protectx(void* addr, size_t size, bool protect) {
@@ -1062,20 +615,9 @@ static  bool mi_os_protectx(void* addr, size_t size, bool protect) {
 	  _mi_warning_message("cannot mprotect memory allocated in huge OS pages\n");
   }
   */
-  int err = 0;
-#ifdef _WIN32
-  DWORD oldprotect = 0;
-  BOOL ok = VirtualProtect(start, csize, protect ? PAGE_NOACCESS : PAGE_READWRITE, &oldprotect);
-  err = (ok ? 0 : GetLastError());
-#elif defined(__wasi__)
-  err = 0;
-#else
-  err = mprotect(start, csize, protect ? PROT_NONE : (PROT_READ | PROT_WRITE));
-  if (err != 0) { err = errno; }
-#endif
+  int err = _mi_prim_protect(start,csize,protect);
   if (err != 0) {
-    _mi_warning_message("mprotect error: start: %p, csize: 0x%zx, err: %i\n", start, csize, err);
-    mi_mprotect_hint(err);
+    _mi_warning_message("cannot %s OS memory (error: %d (0x%x), address: %p, size: 0x%zx bytes)\n", (protect ? "protect" : "unprotect"), err, err, start, csize);
   }
   return (err == 0);
 }
@@ -1090,115 +632,12 @@ bool _mi_os_unprotect(void* addr, size_t size) {
 
 
 
-bool _mi_os_shrink(void* p, size_t oldsize, size_t newsize, mi_stats_t* stats) {
-  // page align conservatively within the range
-  mi_assert_internal(oldsize > newsize && p != NULL);
-  if (oldsize < newsize || p == NULL) return false;
-  if (oldsize == newsize) return true;
-
-  // oldsize and newsize should be page aligned or we cannot shrink precisely
-  void* addr = (uint8_t*)p + newsize;
-  size_t size = 0;
-  void* start = mi_os_page_align_area_conservative(addr, oldsize - newsize, &size);
-  if (size == 0 || start != addr) return false;
-
-#ifdef _WIN32
-  // we cannot shrink on windows, but we can decommit
-  return _mi_os_decommit(start, size, stats);
-#else
-  return mi_os_mem_free(start, size, true, stats);
-#endif
-}
-
-
 /* ----------------------------------------------------------------------------
 Support for allocating huge OS pages (1Gib) that are reserved up-front
 and possibly associated with a specific NUMA node. (use `numa_node>=0`)
 -----------------------------------------------------------------------------*/
 #define MI_HUGE_OS_PAGE_SIZE  (MI_GiB)
 
-#if defined(_WIN32) && (MI_INTPTR_SIZE >= 8)
-static void* mi_os_alloc_huge_os_pagesx(void* addr, size_t size, int numa_node)
-{
-  mi_assert_internal(size%MI_GiB == 0);
-  mi_assert_internal(addr != NULL);
-  const DWORD flags = MEM_LARGE_PAGES | MEM_COMMIT | MEM_RESERVE;
-
-  mi_win_enable_large_os_pages();
-
-  MI_MEM_EXTENDED_PARAMETER params[3] = { {{0,0},{0}},{{0,0},{0}},{{0,0},{0}} };
-  // on modern Windows try use NtAllocateVirtualMemoryEx for 1GiB huge pages
-  static bool mi_huge_pages_available = true;
-  if (pNtAllocateVirtualMemoryEx != NULL && mi_huge_pages_available) {
-    params[0].Type.Type = MiMemExtendedParameterAttributeFlags;
-    params[0].Arg.ULong64 = MI_MEM_EXTENDED_PARAMETER_NONPAGED_HUGE;
-    ULONG param_count = 1;
-    if (numa_node >= 0) {
-      param_count++;
-      params[1].Type.Type = MiMemExtendedParameterNumaNode;
-      params[1].Arg.ULong = (unsigned)numa_node;
-    }
-    SIZE_T psize = size;
-    void* base = addr;
-    NTSTATUS err = (*pNtAllocateVirtualMemoryEx)(GetCurrentProcess(), &base, &psize, flags, PAGE_READWRITE, params, param_count);
-    if (err == 0 && base != NULL) {
-      return base;
-    }
-    else {
-      // fall back to regular large pages
-      mi_huge_pages_available = false; // don't try further huge pages
-      _mi_warning_message("unable to allocate using huge (1GiB) pages, trying large (2MiB) pages instead (status 0x%lx)\n", err);
-    }
-  }
-  // on modern Windows try use VirtualAlloc2 for numa aware large OS page allocation
-  if (pVirtualAlloc2 != NULL && numa_node >= 0) {
-    params[0].Type.Type = MiMemExtendedParameterNumaNode;
-    params[0].Arg.ULong = (unsigned)numa_node;
-    return (*pVirtualAlloc2)(GetCurrentProcess(), addr, size, flags, PAGE_READWRITE, params, 1);
-  }
-  
-  // otherwise use regular virtual alloc on older windows
-  return VirtualAlloc(addr, size, flags, PAGE_READWRITE);
-}
-
-#elif defined(MI_OS_USE_MMAP) && (MI_INTPTR_SIZE >= 8) && !defined(__HAIKU__)
-#include <sys/syscall.h>
-#ifndef MPOL_PREFERRED
-#define MPOL_PREFERRED 1
-#endif
-#if defined(SYS_mbind)
-static long mi_os_mbind(void* start, unsigned long len, unsigned long mode, const unsigned long* nmask, unsigned long maxnode, unsigned flags) {
-  return syscall(SYS_mbind, start, len, mode, nmask, maxnode, flags);
-}
-#else
-static long mi_os_mbind(void* start, unsigned long len, unsigned long mode, const unsigned long* nmask, unsigned long maxnode, unsigned flags) {
-  MI_UNUSED(start); MI_UNUSED(len); MI_UNUSED(mode); MI_UNUSED(nmask); MI_UNUSED(maxnode); MI_UNUSED(flags);
-  return 0;
-}
-#endif
-static void* mi_os_alloc_huge_os_pagesx(void* addr, size_t size, int numa_node) {
-  mi_assert_internal(size%MI_GiB == 0);
-  bool is_large = true;
-  void* p = mi_unix_mmap(addr, size, MI_SEGMENT_SIZE, PROT_READ | PROT_WRITE, true, true, &is_large);
-  if (p == NULL) return NULL;
-  if (numa_node >= 0 && numa_node < 8*MI_INTPTR_SIZE) { // at most 64 nodes
-    unsigned long numa_mask = (1UL << numa_node);
-    // TODO: does `mbind` work correctly for huge OS pages? should we
-    // use `set_mempolicy` before calling mmap instead?
-    // see: <https://lkml.org/lkml/2017/2/9/875>
-    long err = mi_os_mbind(p, size, MPOL_PREFERRED, &numa_mask, 8*MI_INTPTR_SIZE, 0);
-    if (err != 0) {
-      _mi_warning_message("failed to bind huge (1GiB) pages to numa node %d: %s\n", numa_node, strerror(errno));
-    }
-  }
-  return p;
-}
-#else
-static void* mi_os_alloc_huge_os_pagesx(void* addr, size_t size, int numa_node) {
-  MI_UNUSED(addr); MI_UNUSED(size); MI_UNUSED(numa_node);
-  return NULL;
-}
-#endif
 
 #if (MI_INTPTR_SIZE >= 8)
 // To ensure proper alignment, use our own area for huge OS pages
@@ -1216,15 +655,14 @@ static uint8_t* mi_os_claim_huge_pages(size_t pages, size_t* total_size) {
     start = huge_start;
     if (start == 0) {
       // Initialize the start address after the 32TiB area
-      start = ((uintptr_t)32 << 40);  // 32TiB virtual start address
-#if (MI_SECURE>0 || MI_DEBUG==0)      // security: randomize start of huge pages unless in debug mode
-      uintptr_t r = _mi_heap_random_next(mi_get_default_heap());
+      start = ((uintptr_t)8 << 40);   // 8TiB virtual start address
+    #if (MI_SECURE>0 || MI_DEBUG==0)  // security: randomize start of huge pages unless in debug mode
+      uintptr_t r = _mi_heap_random_next(mi_prim_get_default_heap());
       start = start + ((uintptr_t)MI_HUGE_OS_PAGE_SIZE * ((r>>17) & 0x0FFF));  // (randomly 12bits)*1GiB == between 0 to 4TiB
-#endif
+    #endif
     }
     end = start + size;
-    mi_assert_internal(end % MI_SEGMENT_SIZE == 0);
-  } while (!mi_atomic_cas_strong_acq_rel(&mi_huge_start, &huge_start, end));
+  } while (!mi_atomic_cas_weak_acq_rel(&mi_huge_start, &huge_start, end));
 
   if (total_size != NULL) *total_size = size;
   return (uint8_t*)start;
@@ -1237,37 +675,47 @@ static uint8_t* mi_os_claim_huge_pages(size_t pages, size_t* total_size) {
 }
 #endif
 
-// Allocate MI_SEGMENT_SIZE aligned huge pages
-void* _mi_os_alloc_huge_os_pages(size_t pages, int numa_node, mi_msecs_t max_msecs, size_t* pages_reserved, size_t* psize) {
+// Allocate MI_ARENA_SLICE_ALIGN aligned huge pages
+void* _mi_os_alloc_huge_os_pages(size_t pages, int numa_node, mi_msecs_t max_msecs, size_t* pages_reserved, size_t* psize, mi_memid_t* memid) {
+  *memid = _mi_memid_none();
   if (psize != NULL) *psize = 0;
   if (pages_reserved != NULL) *pages_reserved = 0;
   size_t size = 0;
-  uint8_t* start = mi_os_claim_huge_pages(pages, &size);
+  uint8_t* const start = mi_os_claim_huge_pages(pages, &size);
   if (start == NULL) return NULL; // or 32-bit systems
 
   // Allocate one page at the time but try to place them contiguously
   // We allocate one page at the time to be able to abort if it takes too long
   // or to at least allocate as many as available on the system.
   mi_msecs_t start_t = _mi_clock_start();
-  size_t page;
-  for (page = 0; page < pages; page++) {
+  size_t page = 0;
+  bool all_zero = true;
+  while (page < pages) {
     // allocate a page
+    bool is_zero = false;
     void* addr = start + (page * MI_HUGE_OS_PAGE_SIZE);
-    void* p = mi_os_alloc_huge_os_pagesx(addr, MI_HUGE_OS_PAGE_SIZE, numa_node);
+    void* p = NULL;
+    int err = _mi_prim_alloc_huge_os_pages(addr, MI_HUGE_OS_PAGE_SIZE, numa_node, &is_zero, &p);
+    if (!is_zero) { all_zero = false;  }
+    if (err != 0) {
+      _mi_warning_message("unable to allocate huge OS page (error: %d (0x%x), address: %p, size: %zx bytes)\n", err, err, addr, MI_HUGE_OS_PAGE_SIZE);
+      break;
+    }
 
     // Did we succeed at a contiguous address?
     if (p != addr) {
       // no success, issue a warning and break
       if (p != NULL) {
-        _mi_warning_message("could not allocate contiguous huge page %zu at %p\n", page, addr);
-        _mi_os_free(p, MI_HUGE_OS_PAGE_SIZE, &_mi_stats_main);
+        _mi_warning_message("could not allocate contiguous huge OS page %zu at %p\n", page, addr);
+        mi_os_prim_free(p, MI_HUGE_OS_PAGE_SIZE, MI_HUGE_OS_PAGE_SIZE, NULL);
       }
       break;
     }
 
     // success, record it
-    _mi_stat_increase(&_mi_stats_main.committed, MI_HUGE_OS_PAGE_SIZE);
-    _mi_stat_increase(&_mi_stats_main.reserved, MI_HUGE_OS_PAGE_SIZE);
+    page++;  // increase before timeout check (see issue #711)
+    mi_os_stat_increase(committed, MI_HUGE_OS_PAGE_SIZE);
+    mi_os_stat_increase(reserved, MI_HUGE_OS_PAGE_SIZE);
 
     // check for timeout
     if (max_msecs > 0) {
@@ -1279,7 +727,7 @@ void* _mi_os_alloc_huge_os_pages(size_t pages, int numa_node, mi_msecs_t max_mse
         }
       }
       if (elapsed > max_msecs) {
-        _mi_warning_message("huge page allocation timed out\n");
+        _mi_warning_message("huge OS page allocation timed out (after allocating %zu page(s))\n", page);
         break;
       }
     }
@@ -1287,157 +735,117 @@ void* _mi_os_alloc_huge_os_pages(size_t pages, int numa_node, mi_msecs_t max_mse
   mi_assert_internal(page*MI_HUGE_OS_PAGE_SIZE <= size);
   if (pages_reserved != NULL) { *pages_reserved = page; }
   if (psize != NULL) { *psize = page * MI_HUGE_OS_PAGE_SIZE; }
+  if (page != 0) {
+    mi_assert(start != NULL);
+    *memid = _mi_memid_create_os(start, size, true /* is committed */, all_zero, true /* is_large */);
+    memid->memkind = MI_MEM_OS_HUGE;
+    mi_assert(memid->is_pinned);
+    #ifdef MI_TRACK_ASAN
+    if (all_zero) { mi_track_mem_defined(start,size); }
+    #endif
+  }
   return (page == 0 ? NULL : start);
 }
 
 // free every huge page in a range individually (as we allocated per page)
 // note: needed with VirtualAlloc but could potentially be done in one go on mmap'd systems.
-void _mi_os_free_huge_pages(void* p, size_t size, mi_stats_t* stats) {
+static void mi_os_free_huge_os_pages(void* p, size_t size, mi_subproc_t* subproc) {
   if (p==NULL || size==0) return;
   uint8_t* base = (uint8_t*)p;
   while (size >= MI_HUGE_OS_PAGE_SIZE) {
-    _mi_os_free(base, MI_HUGE_OS_PAGE_SIZE, stats);
+    mi_os_prim_free(base, MI_HUGE_OS_PAGE_SIZE, MI_HUGE_OS_PAGE_SIZE, subproc);
     size -= MI_HUGE_OS_PAGE_SIZE;
     base += MI_HUGE_OS_PAGE_SIZE;
   }
 }
 
+
 /* ----------------------------------------------------------------------------
 Support NUMA aware allocation
 -----------------------------------------------------------------------------*/
-#ifdef _WIN32  
-static size_t mi_os_numa_nodex(void) {
-  USHORT numa_node = 0;
-  if (pGetCurrentProcessorNumberEx != NULL && pGetNumaProcessorNodeEx != NULL) {
-    // Extended API is supported
-    MI_PROCESSOR_NUMBER pnum;
-    (*pGetCurrentProcessorNumberEx)(&pnum);
-    USHORT nnode = 0;
-    BOOL ok = (*pGetNumaProcessorNodeEx)(&pnum, &nnode);
-    if (ok) numa_node = nnode;
-  }
-  else {
-    // Vista or earlier, use older API that is limited to 64 processors. Issue #277
-    DWORD pnum = GetCurrentProcessorNumber();
-    UCHAR nnode = 0;
-    BOOL ok = GetNumaProcessorNode((UCHAR)pnum, &nnode);
-    if (ok) numa_node = nnode;    
-  }
-  return numa_node;
-}
 
-static size_t mi_os_numa_node_countx(void) {
-  ULONG numa_max = 0;
-  GetNumaHighestNodeNumber(&numa_max);
-  // find the highest node number that has actual processors assigned to it. Issue #282
-  while(numa_max > 0) {
-    if (pGetNumaNodeProcessorMaskEx != NULL) {
-      // Extended API is supported
-      GROUP_AFFINITY affinity;
-      if ((*pGetNumaNodeProcessorMaskEx)((USHORT)numa_max, &affinity)) {
-        if (affinity.Mask != 0) break;  // found the maximum non-empty node
-      }
+static _Atomic(size_t) mi_numa_node_count; // = 0   // cache the node count
+
+int _mi_os_numa_node_count(void) {
+  size_t count = mi_atomic_load_acquire(&mi_numa_node_count);
+  if mi_unlikely(count == 0) {
+    long ncount = mi_option_get(mi_option_use_numa_nodes); // given explicitly?
+    if (ncount > 0 && ncount < INT_MAX) {
+      count = (size_t)ncount;
     }
     else {
-      // Vista or earlier, use older API that is limited to 64 processors.
-      ULONGLONG mask;
-      if (GetNumaNodeProcessorMask((UCHAR)numa_max, &mask)) {
-        if (mask != 0) break; // found the maximum non-empty node
-      };
+      const size_t n = _mi_prim_numa_node_count(); // or detect dynamically
+      if (n == 0 || n > INT_MAX) { count = 1; }
+                            else { count = n; }
     }
-    // max node was invalid or had no processor assigned, try again
-    numa_max--;
+    mi_atomic_store_release(&mi_numa_node_count, count); // save it
+    _mi_verbose_message("using %zd numa regions\n", count);
   }
-  return ((size_t)numa_max + 1);
+  mi_assert_internal(count > 0 && count <= INT_MAX);
+  return (int)count;
 }
-#elif defined(__linux__)
-#include <sys/syscall.h>  // getcpu
-#include <stdio.h>        // access
-
-static size_t mi_os_numa_nodex(void) {
-#ifdef SYS_getcpu
-  unsigned long node = 0;
-  unsigned long ncpu = 0;
-  long err = syscall(SYS_getcpu, &ncpu, &node, NULL);
-  if (err != 0) return 0;
-  return node;
-#else
-  return 0;
-#endif
+
+static int mi_os_numa_node_get(void) {
+  int numa_count = _mi_os_numa_node_count();
+  if (numa_count<=1) return 0; // optimize on single numa node systems: always node 0
+  // never more than the node count and >= 0
+  const size_t n = _mi_prim_numa_node();
+  int numa_node = (n < INT_MAX ? (int)n : 0);
+  if (numa_node >= numa_count) { numa_node = numa_node % numa_count; }
+  return numa_node;
 }
-static size_t mi_os_numa_node_countx(void) {
-  char buf[128];
-  unsigned node = 0;
-  for(node = 0; node < 256; node++) {
-    // enumerate node entries -- todo: it there a more efficient way to do this? (but ensure there is no allocation)
-    snprintf(buf, 127, "/sys/devices/system/node/node%u", node + 1);
-    if (access(buf,R_OK) != 0) break;
+
+int _mi_os_numa_node(void) {
+  if mi_likely(mi_atomic_load_relaxed(&mi_numa_node_count) == 1) {
+    return 0;
   }
-  return (node+1);
-}
-#elif defined(__FreeBSD__) && __FreeBSD_version >= 1200000
-static size_t mi_os_numa_nodex(void) {
-  domainset_t dom;
-  size_t node;
-  int policy;
-  if (cpuset_getdomain(CPU_LEVEL_CPUSET, CPU_WHICH_PID, -1, sizeof(dom), &dom, &policy) == -1) return 0ul;
-  for (node = 0; node < MAXMEMDOM; node++) {
-    if (DOMAINSET_ISSET(node, &dom)) return node;
+  else {
+    return mi_os_numa_node_get();
   }
-  return 0ul;
-}
-static size_t mi_os_numa_node_countx(void) {
-  size_t ndomains = 0;
-  size_t len = sizeof(ndomains);
-  if (sysctlbyname("vm.ndomains", &ndomains, &len, NULL, 0) == -1) return 0ul;
-  return ndomains;
 }
-#elif defined(__DragonFly__)
-static size_t mi_os_numa_nodex(void) {
-  // TODO: DragonFly does not seem to provide any userland means to get this information.
-  return 0ul;
-}
-static size_t mi_os_numa_node_countx(void) {
-  size_t ncpus = 0, nvirtcoresperphys = 0;
-  size_t len = sizeof(size_t);
-  if (sysctlbyname("hw.ncpu", &ncpus, &len, NULL, 0) == -1) return 0ul;
-  if (sysctlbyname("hw.cpu_topology_ht_ids", &nvirtcoresperphys, &len, NULL, 0) == -1) return 0ul;
-  return nvirtcoresperphys * ncpus;
+
+
+/* ----------------------------------------------------------------------------
+  Public API
+-----------------------------------------------------------------------------*/
+#if 0
+mi_decl_export void* mi_os_alloc(size_t size, bool commit, size_t* full_size) {
+  return mi_os_alloc_aligned(size, mi_os_mem_config.alloc_granularity, commit, NULL, full_size);
+}
+
+static void* mi_os_alloc_aligned_ex(size_t size, size_t alignment, bool commit, bool allow_large, bool* is_committed, bool* is_pinned, void** base, size_t* full_size) {
+  mi_memid_t memid = _mi_memid_none();
+  void* p = _mi_os_alloc_aligned(size, alignment, commit, allow_large, &memid);
+  if (p == NULL) return p;
+  if (is_committed != NULL) { *is_committed = memid.initially_committed;  }
+  if (is_pinned != NULL) { *is_pinned = memid.is_pinned;  }
+  if (base != NULL) { *base = memid.mem.os.base;  }
+  if (full_size != NULL) { *full_size = memid.mem.os.size;  }
+  if (!memid.initially_zero && memid.initially_committed) {
+    _mi_memzero_aligned(memid.mem.os.base, memid.mem.os.size);
+  }
+  return p;
 }
-#else
-static size_t mi_os_numa_nodex(void) {
-  return 0;
+
+mi_decl_export void* mi_os_alloc_aligned(size_t size, size_t alignment, bool commit, void** base, size_t* full_size) {
+  return mi_os_alloc_aligned_ex(size, alignment, commit, false, NULL, NULL, base, full_size);
 }
-static size_t mi_os_numa_node_countx(void) {
-  return 1;
+
+mi_decl_export void* mi_os_alloc_aligned_allow_large(size_t size, size_t alignment, bool commit, bool* is_committed, bool* is_pinned, void** base, size_t* full_size) {
+  return mi_os_alloc_aligned_ex(size, alignment, commit, true, is_committed, is_pinned, base, full_size);
 }
-#endif
 
-_Atomic(size_t)  _mi_numa_node_count; // = 0   // cache the node count
+mi_decl_export void  mi_os_free(void* p, size_t size) {
+  if (p==NULL || size == 0) return;
+  mi_memid_t memid = _mi_memid_create_os(p, size, true, false, false);
+  _mi_os_free(p, size, memid);
+}
 
-size_t _mi_os_numa_node_count_get(void) {
-  size_t count = mi_atomic_load_acquire(&_mi_numa_node_count);
-  if (count <= 0) {
-    long ncount = mi_option_get(mi_option_use_numa_nodes); // given explicitly?
-    if (ncount > 0) {
-      count = (size_t)ncount;
-    }
-    else {
-      count = mi_os_numa_node_countx(); // or detect dynamically
-      if (count == 0) count = 1;
-    }    
-    mi_atomic_store_release(&_mi_numa_node_count, count); // save it
-    _mi_verbose_message("using %zd numa regions\n", count);
-  }
-  return count;
+mi_decl_export void  mi_os_commit(void* p, size_t size) {
+  _mi_os_commit(p, size, NULL);
 }
 
-int _mi_os_numa_node_get(mi_os_tld_t* tld) {
-  MI_UNUSED(tld);
-  size_t numa_count = _mi_os_numa_node_count();
-  if (numa_count<=1) return 0; // optimize on single numa node systems: always node 0
-  // never more than the node count and >= 0
-  size_t numa_node = mi_os_numa_nodex();
-  if (numa_node >= numa_count) { numa_node = numa_node % numa_count; }
-  return (int)numa_node;
+mi_decl_export void  mi_os_decommit(void* p, size_t size) {
+  _mi_os_decommit(p, size);
 }
+#endif
diff --git a/depends/mimalloc/src/page-map.c b/depends/mimalloc/src/page-map.c
new file mode 100644
index 000000000000..ce70495b27de
--- /dev/null
+++ b/depends/mimalloc/src/page-map.c
@@ -0,0 +1,389 @@
+/*----------------------------------------------------------------------------
+Copyright (c) 2023-2024, Microsoft Research, Daan Leijen
+This is free software; you can redistribute it and/or modify it under the
+terms of the MIT license. A copy of the license can be found in the file
+"LICENSE" at the root of this distribution.
+-----------------------------------------------------------------------------*/
+
+#include "mimalloc.h"
+#include "mimalloc/internal.h"
+#include "bitmap.h"
+
+static void mi_page_map_cannot_commit(void) {
+  _mi_error_message(EFAULT,"unable to commit memory for the page address map\n");
+}
+
+#if MI_PAGE_MAP_FLAT
+
+// The page-map contains a byte for each 64kb slice in the address space.
+// For an address `a` where `ofs = _mi_page_map[a >> 16]`:
+// 0 = unused
+// 1 = the slice at `a & ~0xFFFF` is a mimalloc page.
+// 1 < ofs <= 127 = the slice is part of a page, starting at `(((a>>16) - ofs - 1) << 16)`.
+//
+// 1 byte per slice => 1 TiB address space needs a 2^14 * 2^16 = 16 MiB page map.
+// A full 256 TiB address space (48 bit) needs a 4 GiB page map.
+// A full 4 GiB address space (32 bit) needs only a 64 KiB page map.
+
+mi_decl_cache_align uint8_t* _mi_page_map = NULL;
+static void*        mi_page_map_max_address = NULL;
+static mi_memid_t   mi_page_map_memid;
+
+#define MI_PAGE_MAP_ENTRIES_PER_COMMIT_BIT   MI_ARENA_SLICE_SIZE
+static mi_bitmap_t* mi_page_map_commit; // one bit per committed 64 KiB entries
+
+static void mi_page_map_ensure_committed(size_t idx, size_t slice_count);
+
+bool _mi_page_map_init(void) {
+  size_t vbits = (size_t)mi_option_get_clamp(mi_option_max_vabits, 0, MI_SIZE_BITS);
+  if (vbits == 0) {
+    vbits = _mi_os_virtual_address_bits();
+    #if MI_ARCH_X64  // canonical address is limited to the first 128 TiB
+    if (vbits >= 48) { vbits = 47; }
+    #endif
+  }
+
+  // Allocate the page map and commit bits
+  mi_page_map_max_address = (void*)(vbits >= MI_SIZE_BITS ? (SIZE_MAX - MI_ARENA_SLICE_SIZE + 1) : (MI_PU(1) << vbits));
+  const size_t page_map_size = (MI_ZU(1) << (vbits - MI_ARENA_SLICE_SHIFT));
+  const bool commit = (page_map_size <= 1*MI_MiB || mi_option_is_enabled(mi_option_pagemap_commit)); // _mi_os_has_overcommit(); // commit on-access on Linux systems?
+  const size_t commit_bits = _mi_divide_up(page_map_size, MI_PAGE_MAP_ENTRIES_PER_COMMIT_BIT);
+  const size_t bitmap_size = (commit ? 0 : mi_bitmap_size(commit_bits, NULL));
+  const size_t reserve_size = bitmap_size + page_map_size;
+  uint8_t* const base = (uint8_t*)_mi_os_alloc_aligned(reserve_size, 1, commit, true /* allow large */, &mi_page_map_memid);
+  if (base==NULL) {
+    _mi_error_message(ENOMEM, "unable to reserve virtual memory for the page map (%zu KiB)\n", page_map_size / MI_KiB);
+    return false;
+  }
+  if (mi_page_map_memid.initially_committed && !mi_page_map_memid.initially_zero) {
+    _mi_warning_message("internal: the page map was committed but not zero initialized!\n");
+    _mi_memzero_aligned(base, reserve_size);
+  }
+  if (bitmap_size > 0) {
+    mi_page_map_commit = (mi_bitmap_t*)base;
+    if (!_mi_os_commit(mi_page_map_commit, bitmap_size, NULL)) {
+      mi_page_map_cannot_commit();
+      return false;
+    }
+    mi_bitmap_init(mi_page_map_commit, commit_bits, true);
+  }
+  _mi_page_map = base + bitmap_size;
+
+  // commit the first part so NULL pointers get resolved without an access violation
+  if (!commit) {
+    mi_page_map_ensure_committed(0, 1);
+  }
+  _mi_page_map[0] = 1; // so _mi_ptr_page(NULL) == NULL
+  mi_assert_internal(_mi_ptr_page(NULL)==NULL);
+  return true;
+}
+
+void _mi_page_map_unsafe_destroy(mi_subproc_t* subproc) {
+  mi_assert_internal(subproc != NULL);
+  mi_assert_internal(_mi_page_map != NULL);
+  if (_mi_page_map == NULL) return;
+  _mi_os_free_ex(mi_page_map_memid.mem.os.base, mi_page_map_memid.mem.os.size, true, mi_page_map_memid, subproc);
+  _mi_page_map = NULL;
+  mi_page_map_commit = NULL;
+  mi_page_map_max_address = NULL;
+  mi_page_map_memid = _mi_memid_none();
+}
+
+
+static void mi_page_map_ensure_committed(size_t idx, size_t slice_count) {
+  // is the page map area that contains the page address committed?
+  // we always set the commit bits so we can track what ranges are in-use.
+  // we only actually commit if the map wasn't committed fully already.
+  if (mi_page_map_commit != NULL) {
+    const size_t commit_idx = idx / MI_PAGE_MAP_ENTRIES_PER_COMMIT_BIT;
+    const size_t commit_idx_hi = (idx + slice_count - 1) / MI_PAGE_MAP_ENTRIES_PER_COMMIT_BIT;
+    for (size_t i = commit_idx; i <= commit_idx_hi; i++) {  // per bit to avoid crossing over bitmap chunks
+      if (mi_bitmap_is_clear(mi_page_map_commit, i)) {
+        // this may race, in which case we do multiple commits (which is ok)
+        bool is_zero;
+        uint8_t* const start = _mi_page_map + (i * MI_PAGE_MAP_ENTRIES_PER_COMMIT_BIT);
+        const size_t   size  = MI_PAGE_MAP_ENTRIES_PER_COMMIT_BIT;
+        if (!_mi_os_commit(start, size, &is_zero)) return;
+        if (!is_zero && !mi_page_map_memid.initially_zero) { _mi_memzero(start, size); }
+        mi_bitmap_set(mi_page_map_commit, i);
+      }
+    }
+  }
+  #if MI_DEBUG > 0
+  _mi_page_map[idx] = 0;
+  _mi_page_map[idx+slice_count-1] = 0;
+  #endif
+}
+
+
+static size_t mi_page_map_get_idx(mi_page_t* page, uint8_t** page_start, size_t* slice_count) {
+  size_t page_size;
+  *page_start = mi_page_area(page, &page_size);
+  if (page_size > MI_LARGE_PAGE_SIZE) { page_size = MI_LARGE_PAGE_SIZE - MI_ARENA_SLICE_SIZE; }  // furthest interior pointer
+  *slice_count = mi_slice_count_of_size(page_size) + (((uint8_t*)*page_start - (uint8_t*)page)/MI_ARENA_SLICE_SIZE); // add for large aligned blocks
+  return _mi_page_map_index(page);
+}
+
+void _mi_page_map_register(mi_page_t* page) {
+  mi_assert_internal(page != NULL);
+  mi_assert_internal(_mi_is_aligned(page, MI_PAGE_ALIGN));
+  mi_assert_internal(_mi_page_map != NULL);  // should be initialized before multi-thread access!
+  if mi_unlikely(_mi_page_map == NULL) {
+    if (!_mi_page_map_init()) return;
+  }
+  mi_assert(_mi_page_map!=NULL);
+  uint8_t* page_start;
+  size_t   slice_count;
+  const size_t idx = mi_page_map_get_idx(page, &page_start, &slice_count);
+
+  mi_page_map_ensure_committed(idx, slice_count);
+
+  // set the offsets
+  for (size_t i = 0; i < slice_count; i++) {
+    mi_assert_internal(i < 128);
+    _mi_page_map[idx + i] = (uint8_t)(i+1);
+  }
+}
+
+void _mi_page_map_unregister(mi_page_t* page) {
+  mi_assert_internal(_mi_page_map != NULL);
+  // get index and count
+  uint8_t* page_start;
+  size_t   slice_count;
+  const size_t idx = mi_page_map_get_idx(page, &page_start, &slice_count);
+  // unset the offsets
+  _mi_memzero(_mi_page_map + idx, slice_count);
+}
+
+void _mi_page_map_unregister_range(void* start, size_t size) {
+  const size_t slice_count = _mi_divide_up(size, MI_ARENA_SLICE_SIZE);
+  const uintptr_t index = _mi_page_map_index(start);
+  mi_page_map_ensure_committed(index, slice_count); // we commit the range in total; todo: scan the commit bits and clear only those ranges?
+  _mi_memzero(&_mi_page_map[index], slice_count);
+}
+
+
+mi_page_t* _mi_safe_ptr_page(const void* p) {
+  if mi_unlikely(p >= mi_page_map_max_address) return NULL;
+  const uintptr_t idx = _mi_page_map_index(p);
+  if mi_unlikely(mi_page_map_commit != NULL && !mi_bitmap_is_set(mi_page_map_commit, idx/MI_PAGE_MAP_ENTRIES_PER_COMMIT_BIT)) return NULL;
+  const uintptr_t ofs = _mi_page_map[idx];
+  if mi_unlikely(ofs == 0) return NULL;
+  return (mi_page_t*)((((uintptr_t)p >> MI_ARENA_SLICE_SHIFT) - ofs + 1) << MI_ARENA_SLICE_SHIFT);
+}
+
+mi_decl_nodiscard mi_decl_export bool mi_is_in_heap_region(const void* p) mi_attr_noexcept {
+  return (_mi_safe_ptr_page(p) != NULL);
+}
+
+#else
+
+// A 2-level page map
+#define MI_PAGE_MAP_SUB_SIZE    (MI_PAGE_MAP_SUB_COUNT * sizeof(mi_page_t*))
+
+mi_decl_cache_align _Atomic(mi_page_t**)* _mi_page_map;
+static size_t       mi_page_map_count;
+static void*        mi_page_map_max_address;
+static mi_memid_t   mi_page_map_memid;
+
+// divide the main map in 64 (`MI_BFIELD_BITS`) parts commit those parts on demand
+static _Atomic(mi_bfield_t)  mi_page_map_commit;
+
+#define MI_PAGE_MAP_ENTRIES_PER_CBIT  (MI_PAGE_MAP_COUNT / MI_BFIELD_BITS)
+
+static inline bool mi_page_map_is_committed(size_t idx, size_t* pbit_idx) {
+  mi_bfield_t commit = mi_atomic_load_relaxed(&mi_page_map_commit);
+  const size_t bit_idx = idx/MI_PAGE_MAP_ENTRIES_PER_CBIT;
+  mi_assert_internal(bit_idx < MI_BFIELD_BITS);
+  if (pbit_idx != NULL) { *pbit_idx = bit_idx; }
+  return ((commit & (MI_ZU(1) << bit_idx)) != 0);
+}
+
+static mi_page_t** mi_page_map_ensure_committed(size_t idx) {
+  size_t bit_idx;
+  if mi_unlikely(!mi_page_map_is_committed(idx, &bit_idx)) {
+    uint8_t* start = (uint8_t*)&_mi_page_map[bit_idx * MI_PAGE_MAP_ENTRIES_PER_CBIT];
+    if (!_mi_os_commit(start, MI_PAGE_MAP_ENTRIES_PER_CBIT * sizeof(mi_page_t**), NULL)) {
+      return NULL;
+    }
+    mi_atomic_or_acq_rel(&mi_page_map_commit, MI_ZU(1) << bit_idx);
+  }
+  return mi_atomic_load_ptr_acquire(mi_page_t*, &_mi_page_map[idx]); // _mi_page_map_at(idx);
+}
+
+// initialize the page map
+bool _mi_page_map_init(void) {
+  size_t vbits = (size_t)mi_option_get_clamp(mi_option_max_vabits, 0, MI_SIZE_BITS);
+  if (vbits == 0) {
+    vbits = _mi_os_virtual_address_bits();
+    #if MI_ARCH_X64  // canonical address is limited to the first 128 TiB
+    if (vbits >= 48) { vbits = 47; }
+    #endif
+  }
+
+  // Allocate the page map and commit bits
+  mi_assert(MI_MAX_VABITS >= vbits);
+  mi_page_map_max_address = (void*)(vbits >= MI_SIZE_BITS ? (SIZE_MAX - MI_ARENA_SLICE_SIZE + 1) : (MI_PU(1) << vbits));
+  mi_page_map_count = (MI_ZU(1) << (vbits - MI_PAGE_MAP_SUB_SHIFT - MI_ARENA_SLICE_SHIFT));
+  mi_assert(mi_page_map_count <= MI_PAGE_MAP_COUNT);
+  const size_t os_page_size = _mi_os_page_size();
+  const size_t page_map_size = _mi_align_up( mi_page_map_count * sizeof(mi_page_t**), os_page_size);
+  const size_t submap_size = MI_PAGE_MAP_SUB_SIZE;
+  const size_t reserve_size = page_map_size + submap_size;
+  #if MI_SECURE
+  const bool commit = true;  // the whole page map is valid and we can reliably check any pointer
+  #else
+  const bool commit = page_map_size <= 64*MI_KiB ||
+                      mi_option_is_enabled(mi_option_pagemap_commit) || _mi_os_has_overcommit();
+  #endif
+  _mi_page_map = (_Atomic(mi_page_t**)*)_mi_os_alloc_aligned(reserve_size, 1, commit, true /* allow large */, &mi_page_map_memid);
+  if (_mi_page_map==NULL) {
+    _mi_error_message(ENOMEM, "unable to reserve virtual memory for the page map (%zu KiB)\n", page_map_size / MI_KiB);
+    return false;
+  }
+  if (mi_page_map_memid.initially_committed && !mi_page_map_memid.initially_zero) {
+    _mi_warning_message("internal: the page map was committed but not zero initialized!\n");
+    _mi_memzero_aligned(_mi_page_map, page_map_size);
+  }
+  mi_atomic_store_release(&mi_page_map_commit, (mi_page_map_memid.initially_committed ? ~MI_ZU(0) : MI_ZU(0)));
+
+  // ensure there is a submap for the NULL address
+  mi_page_t** const sub0 = (mi_page_t**)((uint8_t*)_mi_page_map + page_map_size);  // we reserved a submap part at the end already
+  if (!mi_page_map_memid.initially_committed) {
+    if (!_mi_os_commit(sub0, submap_size, NULL)) {  // commit full submap (issue #1087)
+      mi_page_map_cannot_commit();
+      return false;
+    }
+  }
+  if (!mi_page_map_memid.initially_zero) {     // initialize low addresses with NULL
+    _mi_memzero_aligned(sub0, submap_size);
+  }
+  mi_page_map_ensure_committed(0);
+  mi_atomic_store_ptr_release(mi_page_t*, &_mi_page_map[0], sub0);
+
+  mi_assert_internal(_mi_ptr_page(NULL)==NULL);
+  return true;
+}
+
+
+void _mi_page_map_unsafe_destroy(mi_subproc_t* subproc) {
+  mi_assert_internal(subproc != NULL);
+  mi_assert_internal(_mi_page_map != NULL);
+  if (_mi_page_map == NULL) return;
+  for (size_t idx = 1; idx < mi_page_map_count; idx++) {  // skip entry 0 (as we allocate that submap at the end of the page_map)
+    // free all sub-maps
+    if (mi_page_map_is_committed(idx, NULL)) {
+      mi_page_t** sub = _mi_page_map_at(idx);
+      if (sub != NULL) {
+        mi_memid_t memid = _mi_memid_create_os(sub, MI_PAGE_MAP_SUB_SIZE, true, false, false);
+        _mi_os_free_ex(memid.mem.os.base, memid.mem.os.size, true, memid, subproc);  
+        mi_atomic_store_ptr_release(mi_page_t*, &_mi_page_map[idx], NULL);
+      }
+    }
+  }
+  _mi_os_free_ex(_mi_page_map, mi_page_map_memid.mem.os.size, true, mi_page_map_memid, subproc);
+  _mi_page_map = NULL;
+  mi_page_map_count = 0;
+  mi_page_map_memid = _mi_memid_none();
+  mi_page_map_max_address = NULL;
+  mi_atomic_store_release(&mi_page_map_commit, 0);
+}
+
+
+static mi_page_t** mi_page_map_ensure_submap_at(size_t idx) {
+  mi_page_t** sub = mi_page_map_ensure_committed(idx);
+  if mi_unlikely(sub == NULL) {
+    // sub map not yet allocated, alloc now
+    mi_memid_t memid;
+    mi_page_t** expect = sub;
+    const size_t submap_size = MI_PAGE_MAP_SUB_SIZE;
+    sub = (mi_page_t**)_mi_os_zalloc(submap_size, &memid);
+    if (sub == NULL) {
+      _mi_error_message(EFAULT, "internal error: unable to extend the page map\n");
+      return NULL;
+    }
+    if (!mi_atomic_cas_ptr_strong_acq_rel(mi_page_t*, &_mi_page_map[idx], &expect, sub)) {
+      // another thread already allocated it.. free and continue
+      _mi_os_free(sub, submap_size, memid);
+      sub = expect;
+      mi_assert_internal(sub!=NULL);
+    }
+  }
+  return sub;
+}
+
+static void mi_page_map_set_range(mi_page_t* page, size_t idx, size_t sub_idx, size_t slice_count) {
+  // is the page map area that contains the page address committed?
+  while (slice_count > 0) {
+    mi_page_t** sub = mi_page_map_ensure_submap_at(idx);
+    // set the offsets for the page
+    while (sub_idx < MI_PAGE_MAP_SUB_COUNT) {
+      sub[sub_idx] = page;
+      slice_count--; if (slice_count == 0) return;
+      sub_idx++;
+    }
+    idx++; // potentially wrap around to the next idx
+    sub_idx = 0;
+  }
+}
+
+static size_t mi_page_map_get_idx(mi_page_t* page, size_t* sub_idx, size_t* slice_count) {
+  size_t page_size;
+  uint8_t* page_start = mi_page_area(page, &page_size);
+  if (page_size > MI_LARGE_PAGE_SIZE) { page_size = MI_LARGE_PAGE_SIZE - MI_ARENA_SLICE_SIZE; }  // furthest interior pointer
+  *slice_count = mi_slice_count_of_size(page_size) + ((page_start - (uint8_t*)page)/MI_ARENA_SLICE_SIZE); // add for large aligned blocks
+  return _mi_page_map_index(page, sub_idx);
+}
+
+void _mi_page_map_register(mi_page_t* page) {
+  mi_assert_internal(page != NULL);
+  mi_assert_internal(_mi_is_aligned(page, MI_PAGE_ALIGN));
+  mi_assert_internal(_mi_page_map != NULL);  // should be initialized before multi-thread access!
+  if mi_unlikely(_mi_page_map == NULL) {
+    if (!_mi_page_map_init()) return;
+  }
+  mi_assert(_mi_page_map!=NULL);
+  size_t   slice_count;
+  size_t   sub_idx;
+  const size_t idx = mi_page_map_get_idx(page, &sub_idx, &slice_count);
+  mi_page_map_set_range(page, idx, sub_idx, slice_count);
+}
+
+void _mi_page_map_unregister(mi_page_t* page) {
+  mi_assert_internal(_mi_page_map != NULL);
+  mi_assert_internal(page != NULL);
+  mi_assert_internal(_mi_is_aligned(page, MI_PAGE_ALIGN));
+  if mi_unlikely(_mi_page_map == NULL) return;
+  // get index and count
+  size_t slice_count;
+  size_t sub_idx;
+  const size_t idx = mi_page_map_get_idx(page, &sub_idx, &slice_count);
+  // unset the offsets
+  mi_page_map_set_range(NULL, idx, sub_idx, slice_count);
+}
+
+void _mi_page_map_unregister_range(void* start, size_t size) {
+  if mi_unlikely(_mi_page_map == NULL) return;
+  const size_t slice_count = _mi_divide_up(size, MI_ARENA_SLICE_SIZE);
+  size_t sub_idx;
+  const uintptr_t idx = _mi_page_map_index(start, &sub_idx);
+  mi_page_map_set_range(NULL, idx, sub_idx, slice_count);  // todo: avoid committing if not already committed?
+}
+
+// Return NULL for invalid pointers
+mi_page_t* _mi_safe_ptr_page(const void* p) {
+  if (p==NULL) return NULL;
+  if mi_unlikely(p >= mi_page_map_max_address) return NULL;
+  size_t sub_idx;
+  const size_t idx = _mi_page_map_index(p,&sub_idx);
+  if mi_unlikely(!mi_page_map_is_committed(idx,NULL)) return NULL;
+  mi_page_t** const sub = _mi_page_map[idx];
+  if mi_unlikely(sub==NULL) return NULL;
+  return sub[sub_idx];
+}
+
+mi_decl_nodiscard mi_decl_export bool mi_is_in_heap_region(const void* p) mi_attr_noexcept {
+  return (_mi_safe_ptr_page(p) != NULL);
+}
+
+#endif
diff --git a/depends/mimalloc/src/page-queue.c b/depends/mimalloc/src/page-queue.c
index 92f933c2a0d7..91bb0ef9ddeb 100644
--- a/depends/mimalloc/src/page-queue.c
+++ b/depends/mimalloc/src/page-queue.c
@@ -1,5 +1,5 @@
 /*----------------------------------------------------------------------------
-Copyright (c) 2018-2020, Microsoft Research, Daan Leijen
+Copyright (c) 2018-2024, Microsoft Research, Daan Leijen
 This is free software; you can redistribute it and/or modify it under the
 terms of the MIT license. A copy of the license can be found in the file
 "LICENSE" at the root of this distribution.
@@ -11,6 +11,10 @@ terms of the MIT license. A copy of the license can be found in the file
 
 #ifndef MI_IN_PAGE_C
 #error "this file should be included from 'page.c'"
+// include to help an IDE
+#include "mimalloc.h"
+#include "mimalloc/internal.h"
+#include "mimalloc/atomic.h"
 #endif
 
 /* -----------------------------------------------------------
@@ -34,15 +38,19 @@ terms of the MIT license. A copy of the license can be found in the file
 
 
 static inline bool mi_page_queue_is_huge(const mi_page_queue_t* pq) {
-  return (pq->block_size == (MI_MEDIUM_OBJ_SIZE_MAX+sizeof(uintptr_t)));
+  return (pq->block_size == (MI_LARGE_MAX_OBJ_SIZE+sizeof(uintptr_t)));
 }
 
 static inline bool mi_page_queue_is_full(const mi_page_queue_t* pq) {
-  return (pq->block_size == (MI_MEDIUM_OBJ_SIZE_MAX+(2*sizeof(uintptr_t))));
+  return (pq->block_size == (MI_LARGE_MAX_OBJ_SIZE+(2*sizeof(uintptr_t))));
 }
 
 static inline bool mi_page_queue_is_special(const mi_page_queue_t* pq) {
-  return (pq->block_size > MI_MEDIUM_OBJ_SIZE_MAX);
+  return (pq->block_size > MI_LARGE_MAX_OBJ_SIZE);
+}
+
+static inline size_t mi_page_queue_count(const mi_page_queue_t* pq) {
+  return pq->count;
 }
 
 /* -----------------------------------------------------------
@@ -53,27 +61,23 @@ static inline bool mi_page_queue_is_special(const mi_page_queue_t* pq) {
 // Returns MI_BIN_HUGE if the size is too large.
 // We use `wsize` for the size in "machine word sizes",
 // i.e. byte size == `wsize*sizeof(void*)`.
-static inline uint8_t mi_bin(size_t size) {
+static mi_decl_noinline size_t mi_bin(size_t size) {
   size_t wsize = _mi_wsize_from_size(size);
-  uint8_t bin;
-  if (wsize <= 1) {
-    bin = 1;
-  }
-  #if defined(MI_ALIGN4W)
-  else if (wsize <= 4) {
-    bin = (uint8_t)((wsize+1)&~1); // round to double word sizes
+#if defined(MI_ALIGN4W)
+  if mi_likely(wsize <= 4) {
+    return (wsize <= 1 ? 1 : (wsize+1)&~1); // round to double word sizes
   }
-  #elif defined(MI_ALIGN2W)
-  else if (wsize <= 8) {
-    bin = (uint8_t)((wsize+1)&~1); // round to double word sizes
+#elif defined(MI_ALIGN2W)
+  if mi_likely(wsize <= 8) {
+    return (wsize <= 1 ? 1 : (wsize+1)&~1); // round to double word sizes
   }
-  #else
-  else if (wsize <= 8) {
-    bin = (uint8_t)wsize;
+#else
+  if mi_likely(wsize <= 8) {
+    return (wsize == 0 ? 1 : wsize);
   }
-  #endif
-  else if (wsize > MI_MEDIUM_OBJ_WSIZE_MAX) {
-    bin = MI_BIN_HUGE;
+#endif
+  else if mi_unlikely(wsize > MI_LARGE_MAX_OBJ_WSIZE) {
+    return MI_BIN_HUGE;
   }
   else {
     #if defined(MI_ALIGN4W)
@@ -81,15 +85,14 @@ static inline uint8_t mi_bin(size_t size) {
     #endif
     wsize--;
     // find the highest bit
-    uint8_t b = (uint8_t)mi_bsr(wsize);  // note: wsize != 0
+    const size_t b = (MI_SIZE_BITS - 1 - mi_clz(wsize));  // note: wsize != 0
     // and use the top 3 bits to determine the bin (~12.5% worst internal fragmentation).
     // - adjust with 3 because we use do not round the first 8 sizes
     //   which each get an exact bin
-    bin = ((b << 2) + (uint8_t)((wsize >> (b - 2)) & 0x03)) - 3;
-    mi_assert_internal(bin < MI_BIN_HUGE);
+    const size_t bin = ((b << 2) + ((wsize >> (b - 2)) & 0x03)) - 3;
+    mi_assert_internal(bin > 0 && bin < MI_BIN_HUGE);
+    return bin;
   }
-  mi_assert_internal(bin > 0 && bin <= MI_BIN_HUGE);
-  return bin;
 }
 
 
@@ -98,21 +101,22 @@ static inline uint8_t mi_bin(size_t size) {
   Queue of pages with free blocks
 ----------------------------------------------------------- */
 
-uint8_t _mi_bin(size_t size) {
+size_t _mi_bin(size_t size) {
   return mi_bin(size);
 }
 
-size_t _mi_bin_size(uint8_t bin) {
+size_t _mi_bin_size(size_t bin) {
+  mi_assert_internal(bin <= MI_BIN_HUGE);
   return _mi_heap_empty.pages[bin].block_size;
 }
 
 // Good size for allocation
-size_t mi_good_size(size_t size) mi_attr_noexcept {
-  if (size <= MI_MEDIUM_OBJ_SIZE_MAX) {
-    return _mi_bin_size(mi_bin(size));
+mi_decl_nodiscard mi_decl_export size_t mi_good_size(size_t size) mi_attr_noexcept {
+  if (size <= MI_LARGE_MAX_OBJ_SIZE) {
+    return _mi_bin_size(mi_bin(size + MI_PADDING_SIZE));
   }
   else {
-    return _mi_align_up(size,_mi_os_page_size());
+    return _mi_align_up(size + MI_PADDING_SIZE,_mi_os_page_size());
   }
 }
 
@@ -137,21 +141,53 @@ static bool mi_heap_contains_queue(const mi_heap_t* heap, const mi_page_queue_t*
 }
 #endif
 
-static mi_page_queue_t* mi_page_queue_of(const mi_page_t* page) {
-  uint8_t bin = (mi_page_is_in_full(page) ? MI_BIN_FULL : mi_bin(page->xblock_size));
-  mi_heap_t* heap = mi_page_heap(page);
-  mi_assert_internal(heap != NULL && bin <= MI_BIN_FULL);
-  mi_page_queue_t* pq = &heap->pages[bin];
-  mi_assert_internal(bin >= MI_BIN_HUGE || page->xblock_size == pq->block_size);
-  mi_assert_expensive(mi_page_queue_contains(pq, page));
-  return pq;
+bool _mi_page_queue_is_valid(mi_heap_t* heap, const mi_page_queue_t* pq) {
+  MI_UNUSED_RELEASE(heap);
+  if (pq==NULL) return false;
+  size_t count = 0; MI_UNUSED_RELEASE(count);
+  mi_page_t* prev = NULL; MI_UNUSED_RELEASE(prev);
+  for (mi_page_t* page = pq->first; page != NULL; page = page->next) {
+    mi_assert_internal(page->prev == prev);
+    if (mi_page_is_in_full(page)) {
+      mi_assert_internal(_mi_wsize_from_size(pq->block_size) == MI_LARGE_MAX_OBJ_WSIZE + 2);
+    }
+    else if (mi_page_is_huge(page)) {
+      mi_assert_internal(_mi_wsize_from_size(pq->block_size) == MI_LARGE_MAX_OBJ_WSIZE + 1);
+    }
+    else {
+      mi_assert_internal(mi_page_block_size(page) == pq->block_size);
+    }
+    mi_assert_internal(page->heap == heap);
+    if (page->next == NULL) {
+      mi_assert_internal(pq->last == page);
+    }
+    count++;
+    prev = page;
+  }
+  mi_assert_internal(pq->count == count);
+  return true;
 }
 
-static mi_page_queue_t* mi_heap_page_queue_of(mi_heap_t* heap, const mi_page_t* page) {
-  uint8_t bin = (mi_page_is_in_full(page) ? MI_BIN_FULL : mi_bin(page->xblock_size));
+size_t _mi_page_bin(const mi_page_t* page) {
+  const size_t bin = (mi_page_is_in_full(page) ? MI_BIN_FULL : (mi_page_is_huge(page) ? MI_BIN_HUGE : mi_bin(mi_page_block_size(page))));
   mi_assert_internal(bin <= MI_BIN_FULL);
+  return bin;
+}
+
+static mi_page_queue_t* mi_heap_page_queue_of(mi_heap_t* heap, const mi_page_t* page) {
+  mi_assert_internal(heap!=NULL);
+  const size_t bin = _mi_page_bin(page);
   mi_page_queue_t* pq = &heap->pages[bin];
-  mi_assert_internal(mi_page_is_in_full(page) || page->xblock_size == pq->block_size);
+  mi_assert_internal((mi_page_block_size(page) == pq->block_size) ||
+                       (mi_page_is_huge(page) && mi_page_queue_is_huge(pq)) ||
+                         (mi_page_is_in_full(page) && mi_page_queue_is_full(pq)));
+  return pq;
+}
+
+static mi_page_queue_t* mi_page_queue_of(const mi_page_t* page) {
+  mi_heap_t* heap = mi_page_heap(page);
+  mi_page_queue_t* pq = mi_heap_page_queue_of(heap, page);
+  mi_assert_expensive(mi_page_queue_contains(pq, page));
   return pq;
 }
 
@@ -181,7 +217,7 @@ static inline void mi_heap_queue_first_update(mi_heap_t* heap, const mi_page_que
   }
   else {
     // find previous size; due to minimal alignment upto 3 previous bins may need to be skipped
-    uint8_t bin = mi_bin(size);
+    size_t bin = mi_bin(size);
     const mi_page_queue_t* prev = pq - 1;
     while( bin == mi_bin(prev->block_size) && prev > &heap->pages[0]) {
       prev--;
@@ -206,9 +242,11 @@ static bool mi_page_queue_is_empty(mi_page_queue_t* queue) {
 static void mi_page_queue_remove(mi_page_queue_t* queue, mi_page_t* page) {
   mi_assert_internal(page != NULL);
   mi_assert_expensive(mi_page_queue_contains(queue, page));
-  mi_assert_internal(page->xblock_size == queue->block_size || (page->xblock_size > MI_MEDIUM_OBJ_SIZE_MAX && mi_page_queue_is_huge(queue))  || (mi_page_is_in_full(page) && mi_page_queue_is_full(queue)));
+  mi_assert_internal(queue->count >= 1);
+  mi_assert_internal(mi_page_block_size(page) == queue->block_size ||
+                      (mi_page_is_huge(page) && mi_page_queue_is_huge(queue)) ||
+                        (mi_page_is_in_full(page) && mi_page_queue_is_full(queue)));
   mi_heap_t* heap = mi_page_heap(page);
-
   if (page->prev != NULL) page->prev->next = page->next;
   if (page->next != NULL) page->next->prev = page->prev;
   if (page == queue->last)  queue->last = page->prev;
@@ -219,9 +257,9 @@ static void mi_page_queue_remove(mi_page_queue_t* queue, mi_page_t* page) {
     mi_heap_queue_first_update(heap,queue);
   }
   heap->page_count--;
+  queue->count--;
   page->next = NULL;
   page->prev = NULL;
-  // mi_atomic_store_ptr_release(mi_atomic_cast(void*, &page->heap), NULL);
   mi_page_set_in_full(page,false);
 }
 
@@ -229,14 +267,15 @@ static void mi_page_queue_remove(mi_page_queue_t* queue, mi_page_t* page) {
 static void mi_page_queue_push(mi_heap_t* heap, mi_page_queue_t* queue, mi_page_t* page) {
   mi_assert_internal(mi_page_heap(page) == heap);
   mi_assert_internal(!mi_page_queue_contains(queue, page));
-
-  mi_assert_internal(_mi_page_segment(page)->kind != MI_SEGMENT_HUGE);
-  mi_assert_internal(page->xblock_size == queue->block_size ||
-                      (page->xblock_size > MI_MEDIUM_OBJ_SIZE_MAX) ||
+  #if MI_HUGE_PAGE_ABANDON
+  mi_assert_internal(_mi_page_segment(page)->page_kind != MI_PAGE_HUGE);
+  #endif
+  mi_assert_internal(mi_page_block_size(page) == queue->block_size ||
+                      (mi_page_is_huge(page) && mi_page_queue_is_huge(queue)) ||
                         (mi_page_is_in_full(page) && mi_page_queue_is_full(queue)));
 
   mi_page_set_in_full(page, mi_page_queue_is_full(queue));
-  // mi_atomic_store_ptr_release(mi_atomic_cast(void*, &page->heap), heap);
+
   page->next = queue->first;
   page->prev = NULL;
   if (queue->first != NULL) {
@@ -247,25 +286,67 @@ static void mi_page_queue_push(mi_heap_t* heap, mi_page_queue_t* queue, mi_page_
   else {
     queue->first = queue->last = page;
   }
+  queue->count++;
 
   // update direct
   mi_heap_queue_first_update(heap, queue);
   heap->page_count++;
 }
 
+static void mi_page_queue_push_at_end(mi_heap_t* heap, mi_page_queue_t* queue, mi_page_t* page) {
+  mi_assert_internal(mi_page_heap(page) == heap);
+  mi_assert_internal(!mi_page_queue_contains(queue, page));
 
-static void mi_page_queue_enqueue_from(mi_page_queue_t* to, mi_page_queue_t* from, mi_page_t* page) {
+  mi_assert_internal(mi_page_block_size(page) == queue->block_size ||
+                      (mi_page_is_huge(page) && mi_page_queue_is_huge(queue)) ||
+                       (mi_page_is_in_full(page) && mi_page_queue_is_full(queue)));
+
+  mi_page_set_in_full(page, mi_page_queue_is_full(queue));
+
+  page->prev = queue->last;
+  page->next = NULL;
+  if (queue->last != NULL) {
+    mi_assert_internal(queue->last->next == NULL);
+    queue->last->next = page;
+    queue->last = page;
+  }
+  else {
+    queue->first = queue->last = page;
+  }
+  queue->count++;
+
+  // update direct
+  if (queue->first == page) {
+    mi_heap_queue_first_update(heap, queue);
+  }
+  heap->page_count++;
+}
+
+static void mi_page_queue_move_to_front(mi_heap_t* heap, mi_page_queue_t* queue, mi_page_t* page) {
+  mi_assert_internal(mi_page_heap(page) == heap);
+  mi_assert_internal(mi_page_queue_contains(queue, page));
+  if (queue->first == page) return;
+  mi_page_queue_remove(queue, page);
+  mi_page_queue_push(heap, queue, page);
+  mi_assert_internal(queue->first == page);
+}
+
+static void mi_page_queue_enqueue_from_ex(mi_page_queue_t* to, mi_page_queue_t* from, bool enqueue_at_end, mi_page_t* page) {
   mi_assert_internal(page != NULL);
+  mi_assert_internal(from->count >= 1);
   mi_assert_expensive(mi_page_queue_contains(from, page));
   mi_assert_expensive(!mi_page_queue_contains(to, page));
-
-  mi_assert_internal((page->xblock_size == to->block_size && page->xblock_size == from->block_size) ||
-                     (page->xblock_size == to->block_size && mi_page_queue_is_full(from)) ||
-                     (page->xblock_size == from->block_size && mi_page_queue_is_full(to)) ||
-                     (page->xblock_size > MI_LARGE_OBJ_SIZE_MAX && mi_page_queue_is_huge(to)) ||
-                     (page->xblock_size > MI_LARGE_OBJ_SIZE_MAX && mi_page_queue_is_full(to)));
+  const size_t bsize = mi_page_block_size(page);
+  MI_UNUSED(bsize);
+  mi_assert_internal((bsize == to->block_size && bsize == from->block_size) ||
+                     (bsize == to->block_size && mi_page_queue_is_full(from)) ||
+                     (bsize == from->block_size && mi_page_queue_is_full(to)) ||
+                     (mi_page_is_huge(page) && mi_page_queue_is_huge(to)) ||
+                     (mi_page_is_huge(page) && mi_page_queue_is_full(to)));
 
   mi_heap_t* heap = mi_page_heap(page);
+
+  // delete from `from`
   if (page->prev != NULL) page->prev->next = page->next;
   if (page->next != NULL) page->next->prev = page->prev;
   if (page == from->last)  from->last = page->prev;
@@ -275,23 +356,62 @@ static void mi_page_queue_enqueue_from(mi_page_queue_t* to, mi_page_queue_t* fro
     mi_assert_internal(mi_heap_contains_queue(heap, from));
     mi_heap_queue_first_update(heap, from);
   }
-
-  page->prev = to->last;
-  page->next = NULL;
-  if (to->last != NULL) {
-    mi_assert_internal(heap == mi_page_heap(to->last));
-    to->last->next = page;
-    to->last = page;
+  from->count--;
+
+  // insert into `to`
+  to->count++;
+  if (enqueue_at_end) {
+    // enqueue at the end
+    page->prev = to->last;
+    page->next = NULL;
+    if (to->last != NULL) {
+      mi_assert_internal(heap == mi_page_heap(to->last));
+      to->last->next = page;
+      to->last = page;
+    }
+    else {
+      to->first = page;
+      to->last = page;
+      mi_heap_queue_first_update(heap, to);
+    }
   }
   else {
-    to->first = page;
-    to->last = page;
-    mi_heap_queue_first_update(heap, to);
+    if (to->first != NULL) {
+      // enqueue at 2nd place
+      mi_assert_internal(heap == mi_page_heap(to->first));
+      mi_page_t* next = to->first->next;
+      page->prev = to->first;
+      page->next = next;
+      to->first->next = page;
+      if (next != NULL) {
+        next->prev = page;
+      }
+      else {
+        to->last = page;
+      }
+    }
+    else {
+      // enqueue at the head (singleton list)
+      page->prev = NULL;
+      page->next = NULL;
+      to->first = page;
+      to->last = page;
+      mi_heap_queue_first_update(heap, to);
+    }
   }
 
   mi_page_set_in_full(page, mi_page_queue_is_full(to));
 }
 
+static void mi_page_queue_enqueue_from(mi_page_queue_t* to, mi_page_queue_t* from, mi_page_t* page) {
+  mi_page_queue_enqueue_from_ex(to, from, true /* enqueue at the end */, page);
+}
+
+static void mi_page_queue_enqueue_from_full(mi_page_queue_t* to, mi_page_queue_t* from, mi_page_t* page) {
+  // note: we could insert at the front to increase reuse, but it slows down certain benchmarks (like `alloc-test`)
+  mi_page_queue_enqueue_from_ex(to, from, true /* enqueue at the end of the `to` queue? */, page);
+}
+
 // Only called from `mi_heap_absorb`.
 size_t _mi_page_queue_append(mi_heap_t* heap, mi_page_queue_t* pq, mi_page_queue_t* append) {
   mi_assert_internal(mi_heap_contains_queue(heap,pq));
@@ -302,15 +422,10 @@ size_t _mi_page_queue_append(mi_heap_t* heap, mi_page_queue_t* pq, mi_page_queue
   // set append pages to new heap and count
   size_t count = 0;
   for (mi_page_t* page = append->first; page != NULL; page = page->next) {
-    // inline `mi_page_set_heap` to avoid wrong assertion during absorption;
-    // in this case it is ok to be delayed freeing since both "to" and "from" heap are still alive.
-    mi_atomic_store_release(&page->xheap, (uintptr_t)heap); 
-    // set the flag to delayed free (not overriding NEVER_DELAYED_FREE) which has as a
-    // side effect that it spins until any DELAYED_FREEING is finished. This ensures
-    // that after appending only the new heap will be used for delayed free operations.
-    _mi_page_use_delayed_free(page, MI_USE_DELAYED_FREE, false);
+    mi_page_set_heap(page, heap);
     count++;
   }
+  mi_assert_internal(count == append->count);
 
   if (pq->last==NULL) {
     // take over afresh
@@ -327,5 +442,7 @@ size_t _mi_page_queue_append(mi_heap_t* heap, mi_page_queue_t* pq, mi_page_queue
     append->first->prev = pq->last;
     pq->last = append->last;
   }
+  pq->count += append->count;
+
   return count;
 }
diff --git a/depends/mimalloc/src/page.c b/depends/mimalloc/src/page.c
index 4b321156c6a4..b80b4463b354 100644
--- a/depends/mimalloc/src/page.c
+++ b/depends/mimalloc/src/page.c
@@ -1,5 +1,5 @@
 /*----------------------------------------------------------------------------
-Copyright (c) 2018-2020, Microsoft Research, Daan Leijen
+Copyright (c) 2018-2024, Microsoft Research, Daan Leijen
 This is free software; you can redistribute it and/or modify it under the
 terms of the MIT license. A copy of the license can be found in the file
 "LICENSE" at the root of this distribution.
@@ -12,8 +12,8 @@ terms of the MIT license. A copy of the license can be found in the file
 ----------------------------------------------------------- */
 
 #include "mimalloc.h"
-#include "mimalloc-internal.h"
-#include "mimalloc-atomic.h"
+#include "mimalloc/internal.h"
+#include "mimalloc/atomic.h"
 
 /* -----------------------------------------------------------
   Definition of page queues for each block size
@@ -36,14 +36,15 @@ static inline mi_block_t* mi_page_block_at(const mi_page_t* page, void* page_sta
   return (mi_block_t*)((uint8_t*)page_start + (i * block_size));
 }
 
-static void mi_page_init(mi_heap_t* heap, mi_page_t* page, size_t size, mi_tld_t* tld);
-static void mi_page_extend_free(mi_heap_t* heap, mi_page_t* page, mi_tld_t* tld);
+//static void mi_page_init(mi_heap_t* heap, mi_page_t* page, size_t size, mi_tld_t* tld);
+static bool mi_page_extend_free(mi_heap_t* heap, mi_page_t* page);
 
 #if (MI_DEBUG>=3)
 static size_t mi_page_list_count(mi_page_t* page, mi_block_t* head) {
+  mi_assert_internal(_mi_ptr_page(page) == page);
   size_t count = 0;
   while (head != NULL) {
-    mi_assert_internal(page == _mi_ptr_page(head));
+    mi_assert_internal((uint8_t*)head - (uint8_t*)page > (ptrdiff_t)MI_LARGE_PAGE_SIZE || page == _mi_ptr_page(head));
     count++;
     head = mi_block_next(page, head);
   }
@@ -59,32 +60,38 @@ static inline uint8_t* mi_page_area(const mi_page_t* page) {
 
 static bool mi_page_list_is_valid(mi_page_t* page, mi_block_t* p) {
   size_t psize;
-  uint8_t* page_area = _mi_page_start(_mi_page_segment(page), page, &psize);
+  uint8_t* page_area = mi_page_area(page, &psize);
   mi_block_t* start = (mi_block_t*)page_area;
   mi_block_t* end   = (mi_block_t*)(page_area + psize);
   while(p != NULL) {
     if (p < start || p >= end) return false;
     p = mi_block_next(page, p);
   }
+#if MI_DEBUG>3 // generally too expensive to check this
+  if (page->free_is_zero) {
+    const size_t ubsize = mi_page_usable_block_size(page);
+    for (mi_block_t* block = page->free; block != NULL; block = mi_block_next(page, block)) {
+      mi_assert_expensive(mi_mem_is_zero(block + 1, ubsize - sizeof(mi_block_t)));
+    }
+  }
+#endif
   return true;
 }
 
 static bool mi_page_is_valid_init(mi_page_t* page) {
-  mi_assert_internal(page->xblock_size > 0);
+  mi_assert_internal(mi_page_block_size(page) > 0);
   mi_assert_internal(page->used <= page->capacity);
   mi_assert_internal(page->capacity <= page->reserved);
 
-  mi_segment_t* segment = _mi_page_segment(page);
-  uint8_t* start = _mi_page_start(segment,page,NULL);
-  mi_assert_internal(start == _mi_segment_page_start(segment,page,NULL));
-  //const size_t bsize = mi_page_block_size(page);
+  // const size_t bsize = mi_page_block_size(page);
+  // uint8_t* start = mi_page_start(page);
   //mi_assert_internal(start + page->capacity*page->block_size == page->top);
 
   mi_assert_internal(mi_page_list_is_valid(page,page->free));
   mi_assert_internal(mi_page_list_is_valid(page,page->local_free));
 
   #if MI_DEBUG>3 // generally too expensive to check this
-  if (page->is_zero) {
+  if (page->free_is_zero) {
     const size_t ubsize = mi_page_usable_block_size(page);
     for(mi_block_t* block = page->free; block != NULL; block = mi_block_next(page,block)) {
       mi_assert_expensive(mi_mem_is_zero(block + 1, ubsize - sizeof(mi_block_t)));
@@ -92,10 +99,12 @@ static bool mi_page_is_valid_init(mi_page_t* page) {
   }
   #endif
 
+  #if !MI_TRACK_ENABLED && !MI_TSAN
   mi_block_t* tfree = mi_page_thread_free(page);
   mi_assert_internal(mi_page_list_is_valid(page, tfree));
   //size_t tfree_count = mi_page_list_count(page, tfree);
   //mi_assert_internal(tfree_count <= page->thread_freed + 1);
+  #endif
 
   size_t free_count = mi_page_list_count(page, page->free) + mi_page_list_count(page, page->local_free);
   mi_assert_internal(page->used + free_count == page->capacity);
@@ -103,89 +112,45 @@ static bool mi_page_is_valid_init(mi_page_t* page) {
   return true;
 }
 
+extern mi_decl_hidden bool _mi_process_is_initialized;             // has mi_process_init been called?
+
 bool _mi_page_is_valid(mi_page_t* page) {
   mi_assert_internal(mi_page_is_valid_init(page));
   #if MI_SECURE
   mi_assert_internal(page->keys[0] != 0);
   #endif
-  if (mi_page_heap(page)!=NULL) {
-    mi_segment_t* segment = _mi_page_segment(page);
-
-    mi_assert_internal(!_mi_process_is_initialized || segment->thread_id==0 || segment->thread_id == mi_page_heap(page)->thread_id);
-    if (segment->kind != MI_SEGMENT_HUGE) {
+  if (!mi_page_is_abandoned(page)) {
+    //mi_assert_internal(!_mi_process_is_initialized);
+    {
       mi_page_queue_t* pq = mi_page_queue_of(page);
       mi_assert_internal(mi_page_queue_contains(pq, page));
-      mi_assert_internal(pq->block_size==mi_page_block_size(page) || mi_page_block_size(page) > MI_MEDIUM_OBJ_SIZE_MAX || mi_page_is_in_full(page));
-      mi_assert_internal(mi_heap_contains_queue(mi_page_heap(page),pq));
+      mi_assert_internal(pq->block_size==mi_page_block_size(page) || mi_page_is_huge(page) || mi_page_is_in_full(page));
+      // mi_assert_internal(mi_heap_contains_queue(mi_page_heap(page),pq));
     }
   }
   return true;
 }
 #endif
 
-void _mi_page_use_delayed_free(mi_page_t* page, mi_delayed_t delay, bool override_never) {
-  while (!_mi_page_try_use_delayed_free(page, delay, override_never)) {
-    mi_atomic_yield();
-  }
-}
-
-bool _mi_page_try_use_delayed_free(mi_page_t* page, mi_delayed_t delay, bool override_never) {
-  mi_thread_free_t tfreex;
-  mi_delayed_t     old_delay;
-  mi_thread_free_t tfree;  
-  size_t yield_count = 0;
-  do {
-    tfree = mi_atomic_load_acquire(&page->xthread_free); // note: must acquire as we can break/repeat this loop and not do a CAS;
-    tfreex = mi_tf_set_delayed(tfree, delay);
-    old_delay = mi_tf_delayed(tfree);
-    if mi_unlikely(old_delay == MI_DELAYED_FREEING) {
-      if (yield_count >= 4) return false;  // give up after 4 tries
-      yield_count++;
-      mi_atomic_yield(); // delay until outstanding MI_DELAYED_FREEING are done.
-      // tfree = mi_tf_set_delayed(tfree, MI_NO_DELAYED_FREE); // will cause CAS to busy fail
-    }
-    else if (delay == old_delay) {
-      break; // avoid atomic operation if already equal
-    }
-    else if (!override_never && old_delay == MI_NEVER_DELAYED_FREE) {
-      break; // leave never-delayed flag set
-    }
-  } while ((old_delay == MI_DELAYED_FREEING) ||
-           !mi_atomic_cas_weak_release(&page->xthread_free, &tfree, tfreex));
-
-  return true; // success
-}
 
 /* -----------------------------------------------------------
   Page collect the `local_free` and `thread_free` lists
 ----------------------------------------------------------- */
 
-// Collect the local `thread_free` list using an atomic exchange.
-// Note: The exchange must be done atomically as this is used right after
-// moving to the full list in `mi_page_collect_ex` and we need to
-// ensure that there was no race where the page became unfull just before the move.
-static void _mi_page_thread_free_collect(mi_page_t* page)
+static void mi_page_thread_collect_to_local(mi_page_t* page, mi_block_t* head)
 {
-  mi_block_t* head;
-  mi_thread_free_t tfreex;
-  mi_thread_free_t tfree = mi_atomic_load_relaxed(&page->xthread_free);
-  do {
-    head = mi_tf_block(tfree);
-    tfreex = mi_tf_set_block(tfree,NULL);
-  } while (!mi_atomic_cas_weak_acq_rel(&page->xthread_free, &tfree, tfreex));
-
-  // return if the list is empty
   if (head == NULL) return;
 
-  // find the tail -- also to get a proper count (without data races)
-  uint32_t max_count = page->capacity; // cannot collect more than capacity
-  uint32_t count = 1;
-  mi_block_t* tail = head;
+  // find the last block in the list -- also to get a proper use count (without data races)
+  size_t max_count = page->capacity; // cannot collect more than capacity
+  size_t count = 1;
+  mi_block_t* last = head;
   mi_block_t* next;
-  while ((next = mi_block_next(page,tail)) != NULL && count <= max_count) {
+  while ((next = mi_block_next(page, last)) != NULL && count <= max_count) {
     count++;
-    tail = next;
+    last = next;
   }
+
   // if `count > max_count` there was a memory corruption (possibly infinite list due to double multi-threaded free)
   if (count > max_count) {
     _mi_error_message(EFAULT, "corrupted thread-free list\n");
@@ -193,20 +158,37 @@ static void _mi_page_thread_free_collect(mi_page_t* page)
   }
 
   // and append the current local free list
-  mi_block_set_next(page,tail, page->local_free);
+  mi_block_set_next(page, last, page->local_free);
   page->local_free = head;
 
   // update counts now
-  page->used -= count;
+  mi_assert_internal(count <= UINT16_MAX);
+  page->used = page->used - (uint16_t)count;
+}
+
+// Collect the local `thread_free` list using an atomic exchange.
+static void mi_page_thread_free_collect(mi_page_t* page)
+{
+  // atomically capture the thread free list
+  mi_block_t* head;
+  mi_thread_free_t tfreex;
+  mi_thread_free_t tfree = mi_atomic_load_relaxed(&page->xthread_free);
+  do {
+    head = mi_tf_block(tfree);
+    if mi_likely(head == NULL) return; // return if the list is empty
+    tfreex = mi_tf_create(NULL,mi_tf_is_owned(tfree));  // set the thread free list to NULL
+  } while (!mi_atomic_cas_weak_acq_rel(&page->xthread_free, &tfree, tfreex));  // release is enough?
+  mi_assert_internal(head != NULL);
+
+  // and move it to the local list
+  mi_page_thread_collect_to_local(page, head);
 }
 
 void _mi_page_free_collect(mi_page_t* page, bool force) {
   mi_assert_internal(page!=NULL);
 
   // collect the thread free list
-  if (force || mi_page_thread_free(page) != NULL) {  // quick test to avoid an atomic operation
-    _mi_page_thread_free_collect(page);
-  }
+  mi_page_thread_free_collect(page);
 
   // and the local free list
   if (page->local_free != NULL) {
@@ -214,7 +196,7 @@ void _mi_page_free_collect(mi_page_t* page, bool force) {
       // usual case
       page->free = page->local_free;
       page->local_free = NULL;
-      page->is_zero = false;
+      page->free_is_zero = false;
     }
     else if (force) {
       // append -- only on shutdown (force) as this is a linear operation
@@ -226,45 +208,121 @@ void _mi_page_free_collect(mi_page_t* page, bool force) {
       mi_block_set_next(page, tail, page->free);
       page->free = page->local_free;
       page->local_free = NULL;
-      page->is_zero = false;
+      page->free_is_zero = false;
     }
   }
 
   mi_assert_internal(!force || page->local_free == NULL);
 }
 
+// Collect elements in the thread-free list starting at `head`. This is an optimized
+// version of `_mi_page_free_collect` to be used from `free.c:_mi_free_collect_mt` that avoids atomic access to `xthread_free`.
+//
+// `head` must be in the `xthread_free` list. It will not collect `head` itself
+// so the `used` count is not fully updated in general. However, if the `head` is
+// the last remaining element, it will be collected and the used count will become `0` (so `mi_page_all_free` becomes true).
+void _mi_page_free_collect_partly(mi_page_t* page, mi_block_t* head) {
+  if (head == NULL) return;
+  mi_block_t* next = mi_block_next(page,head);  // we cannot collect the head element itself as `page->thread_free` may point to it (and we want to avoid atomic ops)
+  if (next != NULL) {
+    mi_block_set_next(page, head, NULL);
+    mi_page_thread_collect_to_local(page, next);
+    if (page->local_free != NULL && page->free == NULL) {
+      page->free = page->local_free;
+      page->local_free = NULL;
+      page->free_is_zero = false;
+    }
+  }
+  if (page->used == 1) {
+    // all elements are free'd since we skipped the `head` element itself
+    mi_assert_internal(mi_tf_block(mi_atomic_load_relaxed(&page->xthread_free)) == head);
+    mi_assert_internal(mi_block_next(page,head) == NULL);
+    _mi_page_free_collect(page, false);  // collect the final element
+  }
+}
 
 
 /* -----------------------------------------------------------
   Page fresh and retire
 ----------------------------------------------------------- */
 
+/*
 // called from segments when reclaiming abandoned pages
 void _mi_page_reclaim(mi_heap_t* heap, mi_page_t* page) {
+  // mi_page_set_heap(page, heap);
+  // _mi_page_use_delayed_free(page, MI_USE_DELAYED_FREE, true); // override never (after heap is set)
+  _mi_page_free_collect(page, false); // ensure used count is up to date
+
   mi_assert_expensive(mi_page_is_valid_init(page));
+  // mi_assert_internal(mi_page_heap(page) == heap);
+  // mi_assert_internal(mi_page_thread_free_flag(page) != MI_NEVER_DELAYED_FREE);
 
-  mi_assert_internal(mi_page_heap(page) == heap);
-  mi_assert_internal(mi_page_thread_free_flag(page) != MI_NEVER_DELAYED_FREE);
-  mi_assert_internal(_mi_page_segment(page)->kind != MI_SEGMENT_HUGE);
-  mi_assert_internal(!page->is_reset);
   // TODO: push on full queue immediately if it is full?
-  mi_page_queue_t* pq = mi_page_queue(heap, mi_page_block_size(page));
+  mi_page_queue_t* pq = mi_heap_page_queue_of(heap, page);
   mi_page_queue_push(heap, pq, page);
   mi_assert_expensive(_mi_page_is_valid(page));
 }
+*/
+
+// called from `mi_free` on a reclaim, and fresh_alloc if we get an abandoned page
+void _mi_heap_page_reclaim(mi_heap_t* heap, mi_page_t* page)
+{
+  mi_assert_internal(_mi_is_aligned(page, MI_PAGE_ALIGN));
+  mi_assert_internal(_mi_ptr_page(page)==page);
+  mi_assert_internal(mi_page_is_owned(page));
+  mi_assert_internal(mi_page_is_abandoned(page));
+
+  mi_page_set_heap(page,heap);
+  _mi_page_free_collect(page, false); // ensure used count is up to date
+  mi_page_queue_t* pq = mi_heap_page_queue_of(heap, page);
+  mi_page_queue_push_at_end(heap, pq, page);
+  mi_assert_expensive(_mi_page_is_valid(page));
+}
+
+void _mi_page_abandon(mi_page_t* page, mi_page_queue_t* pq) {
+  _mi_page_free_collect(page, false); // ensure used count is up to date
+  if (mi_page_all_free(page)) {
+    _mi_page_free(page, pq);
+  }
+  else {
+    mi_page_queue_remove(pq, page);
+    mi_heap_t* heap = page->heap;
+    mi_page_set_heap(page, NULL);
+    page->heap = heap; // dont set heap to NULL so we can reclaim_on_free within the same heap
+    _mi_arenas_page_abandon(page, heap->tld);
+    _mi_arenas_collect(false, false, heap->tld); // allow purging
+  }
+}
+
 
 // allocate a fresh page from a segment
-static mi_page_t* mi_page_fresh_alloc(mi_heap_t* heap, mi_page_queue_t* pq, size_t block_size) {
-  mi_assert_internal(pq==NULL||mi_heap_contains_queue(heap, pq));
-  mi_page_t* page = _mi_segment_page_alloc(heap, block_size, &heap->tld->segments, &heap->tld->os);
+static mi_page_t* mi_page_fresh_alloc(mi_heap_t* heap, mi_page_queue_t* pq, size_t block_size, size_t page_alignment) {
+  #if !MI_HUGE_PAGE_ABANDON
+  mi_assert_internal(pq != NULL);
+  mi_assert_internal(mi_heap_contains_queue(heap, pq));
+  mi_assert_internal(page_alignment > 0 || block_size > MI_LARGE_MAX_OBJ_SIZE || block_size == pq->block_size);
+  #endif
+  mi_page_t* page = _mi_arenas_page_alloc(heap, block_size, page_alignment);
   if (page == NULL) {
-    // this may be out-of-memory, or an abandoned page was reclaimed (and in our queue)
+    // out-of-memory
     return NULL;
   }
-  mi_assert_internal(pq==NULL || _mi_page_segment(page)->kind != MI_SEGMENT_HUGE);
-  mi_page_init(heap, page, block_size, heap->tld);
-  mi_heap_stat_increase(heap, pages, 1);
-  if (pq!=NULL) mi_page_queue_push(heap, pq, page); // huge pages use pq==NULL
+  if (mi_page_is_abandoned(page)) {
+    _mi_heap_page_reclaim(heap, page);
+    if (!mi_page_immediate_available(page)) {
+      if (mi_page_is_expandable(page)) {
+        mi_page_extend_free(heap, page);
+      }
+      else {
+        mi_assert(false); // should not happen?
+        return NULL;
+      }
+    }
+  }
+  else if (pq != NULL) {
+    mi_page_queue_push(heap, pq, page);
+  }
+  mi_assert_internal(pq!=NULL || mi_page_block_size(page) >= block_size);
   mi_assert_expensive(_mi_page_is_valid(page));
   return page;
 }
@@ -272,58 +330,24 @@ static mi_page_t* mi_page_fresh_alloc(mi_heap_t* heap, mi_page_queue_t* pq, size
 // Get a fresh page to use
 static mi_page_t* mi_page_fresh(mi_heap_t* heap, mi_page_queue_t* pq) {
   mi_assert_internal(mi_heap_contains_queue(heap, pq));
-  mi_page_t* page = mi_page_fresh_alloc(heap, pq, pq->block_size);
+  mi_page_t* page = mi_page_fresh_alloc(heap, pq, pq->block_size, 0);
   if (page==NULL) return NULL;
   mi_assert_internal(pq->block_size==mi_page_block_size(page));
-  mi_assert_internal(pq==mi_page_queue(heap, mi_page_block_size(page)));
+  mi_assert_internal(pq==mi_heap_page_queue_of(heap, page));
   return page;
 }
 
-/* -----------------------------------------------------------
-   Do any delayed frees
-   (put there by other threads if they deallocated in a full page)
------------------------------------------------------------ */
-void _mi_heap_delayed_free_all(mi_heap_t* heap) {
-  while (!_mi_heap_delayed_free_partial(heap)) {
-    mi_atomic_yield();
-  }
-}
-
-// returns true if all delayed frees were processed
-bool _mi_heap_delayed_free_partial(mi_heap_t* heap) {
-  // take over the list (note: no atomic exchange since it is often NULL)
-  mi_block_t* block = mi_atomic_load_ptr_relaxed(mi_block_t, &heap->thread_delayed_free);
-  while (block != NULL && !mi_atomic_cas_ptr_weak_acq_rel(mi_block_t, &heap->thread_delayed_free, &block, NULL)) { /* nothing */ };
-  bool all_freed = true;
-
-  // and free them all
-  while(block != NULL) {
-    mi_block_t* next = mi_block_nextx(heap,block, heap->keys);
-    // use internal free instead of regular one to keep stats etc correct
-    if (!_mi_free_delayed_block(block)) {
-      // we might already start delayed freeing while another thread has not yet
-      // reset the delayed_freeing flag; in that case delay it further by reinserting the current block
-      // into the delayed free list
-      all_freed = false;
-      mi_block_t* dfree = mi_atomic_load_ptr_relaxed(mi_block_t, &heap->thread_delayed_free);
-      do {
-        mi_block_set_nextx(heap, block, dfree, heap->keys);
-      } while (!mi_atomic_cas_ptr_weak_release(mi_block_t,&heap->thread_delayed_free, &dfree, block));
-    }
-    block = next;
-  }
-  return all_freed;
-}
 
 /* -----------------------------------------------------------
   Unfull, abandon, free and retire
 ----------------------------------------------------------- */
 
-// Move a page from the full list back to a regular list
+// Move a page from the full list back to a regular list (called from thread-local mi_free)
 void _mi_page_unfull(mi_page_t* page) {
   mi_assert_internal(page != NULL);
   mi_assert_expensive(_mi_page_is_valid(page));
   mi_assert_internal(mi_page_is_in_full(page));
+  mi_assert_internal(!mi_page_heap(page)->allow_page_abandon);
   if (!mi_page_is_in_full(page)) return;
 
   mi_heap_t* heap = mi_page_heap(page);
@@ -331,7 +355,7 @@ void _mi_page_unfull(mi_page_t* page) {
   mi_page_set_in_full(page, false); // to get the right queue
   mi_page_queue_t* pq = mi_heap_page_queue_of(heap, page);
   mi_page_set_in_full(page, true);
-  mi_page_queue_enqueue_from(pq, pqfull, page);
+  mi_page_queue_enqueue_from_full(pq, pqfull, page);
 }
 
 static void mi_page_to_full(mi_page_t* page, mi_page_queue_t* pq) {
@@ -339,71 +363,43 @@ static void mi_page_to_full(mi_page_t* page, mi_page_queue_t* pq) {
   mi_assert_internal(!mi_page_immediate_available(page));
   mi_assert_internal(!mi_page_is_in_full(page));
 
-  if (mi_page_is_in_full(page)) return;
-  mi_page_queue_enqueue_from(&mi_page_heap(page)->pages[MI_BIN_FULL], pq, page);
-  _mi_page_free_collect(page,false);  // try to collect right away in case another thread freed just before MI_USE_DELAYED_FREE was set
-}
-
-
-// Abandon a page with used blocks at the end of a thread.
-// Note: only call if it is ensured that no references exist from
-// the `page->heap->thread_delayed_free` into this page.
-// Currently only called through `mi_heap_collect_ex` which ensures this.
-void _mi_page_abandon(mi_page_t* page, mi_page_queue_t* pq) {
-  mi_assert_internal(page != NULL);
-  mi_assert_expensive(_mi_page_is_valid(page));
-  mi_assert_internal(pq == mi_page_queue_of(page));
-  mi_assert_internal(mi_page_heap(page) != NULL);
-
-  mi_heap_t* pheap = mi_page_heap(page);
-
-  // remove from our page list
-  mi_segments_tld_t* segments_tld = &pheap->tld->segments;
-  mi_page_queue_remove(pq, page);
-
-  // page is no longer associated with our heap
-  mi_assert_internal(mi_page_thread_free_flag(page)==MI_NEVER_DELAYED_FREE);
-  mi_page_set_heap(page, NULL);
-
-#if MI_DEBUG>1
-  // check there are no references left..
-  for (mi_block_t* block = (mi_block_t*)pheap->thread_delayed_free; block != NULL; block = mi_block_nextx(pheap, block, pheap->keys)) {
-    mi_assert_internal(_mi_ptr_page(block) != page);
+  mi_heap_t* heap = mi_page_heap(page);
+  if (heap->allow_page_abandon) {
+    // abandon full pages (this is the usual case in order to allow for sharing of memory between heaps)
+    _mi_page_abandon(page, pq);
+  }
+  else if (!mi_page_is_in_full(page)) {
+    // put full pages in a heap local queue (this is for heaps that cannot abandon, for example, if the heap can be destroyed)
+    mi_page_queue_enqueue_from(&mi_page_heap(page)->pages[MI_BIN_FULL], pq, page);
+    _mi_page_free_collect(page, false);  // try to collect right away in case another thread freed just before MI_USE_DELAYED_FREE was set
   }
-#endif
-
-  // and abandon it
-  mi_assert_internal(mi_page_heap(page) == NULL);
-  _mi_segment_page_abandon(page,segments_tld);
 }
 
 
 // Free a page with no more free blocks
-void _mi_page_free(mi_page_t* page, mi_page_queue_t* pq, bool force) {
+void _mi_page_free(mi_page_t* page, mi_page_queue_t* pq) {
   mi_assert_internal(page != NULL);
   mi_assert_expensive(_mi_page_is_valid(page));
   mi_assert_internal(pq == mi_page_queue_of(page));
   mi_assert_internal(mi_page_all_free(page));
-  mi_assert_internal(mi_page_thread_free_flag(page)!=MI_DELAYED_FREEING);
+  // mi_assert_internal(mi_page_thread_free_flag(page)!=MI_DELAYED_FREEING);
 
   // no more aligned blocks in here
   mi_page_set_has_aligned(page, false);
 
-  mi_heap_t* heap = mi_page_heap(page);
-
   // remove from the page list
   // (no need to do _mi_heap_delayed_free first as all blocks are already free)
-  mi_segments_tld_t* segments_tld = &heap->tld->segments;
   mi_page_queue_remove(pq, page);
 
   // and free it
+  mi_tld_t* const tld = page->heap->tld;
   mi_page_set_heap(page,NULL);
-  _mi_segment_page_free(page, force, segments_tld);
+  _mi_arenas_page_free(page,tld);
+  _mi_arenas_collect(false, false, tld);  // allow purging
 }
 
-// Retire parameters
-#define MI_MAX_RETIRE_SIZE    MI_MEDIUM_OBJ_SIZE_MAX  
-#define MI_RETIRE_CYCLES      (8)
+#define MI_MAX_RETIRE_SIZE    MI_LARGE_OBJ_SIZE_MAX   // should be less than size for MI_BIN_HUGE
+#define MI_RETIRE_CYCLES      (16)
 
 // Retire a page with no more used blocks
 // Important to not retire too quickly though as new
@@ -415,7 +411,7 @@ void _mi_page_retire(mi_page_t* page) mi_attr_noexcept {
   mi_assert_internal(page != NULL);
   mi_assert_expensive(_mi_page_is_valid(page));
   mi_assert_internal(mi_page_all_free(page));
-  
+
   mi_page_set_has_aligned(page, false);
 
   // don't retire too often..
@@ -425,21 +421,26 @@ void _mi_page_retire(mi_page_t* page) mi_attr_noexcept {
   // how to check this efficiently though...
   // for now, we don't retire if it is the only page left of this size class.
   mi_page_queue_t* pq = mi_page_queue_of(page);
-  if mi_likely(page->xblock_size <= MI_MAX_RETIRE_SIZE && !mi_page_is_in_full(page)) {
+  #if MI_RETIRE_CYCLES > 0
+  const size_t bsize = mi_page_block_size(page);
+  if mi_likely( /* bsize < MI_MAX_RETIRE_SIZE && */ !mi_page_queue_is_special(pq)) {  // not full or huge queue?
     if (pq->last==page && pq->first==page) { // the only page in the queue?
-      mi_stat_counter_increase(_mi_stats_main.page_no_retire,1);
-      page->retire_expire = 1 + (page->xblock_size <= MI_SMALL_OBJ_SIZE_MAX ? MI_RETIRE_CYCLES : MI_RETIRE_CYCLES/4);      
       mi_heap_t* heap = mi_page_heap(page);
+      #if MI_STAT>0
+      mi_heap_stat_counter_increase(heap, pages_retire, 1);
+      #endif
+      page->retire_expire = (bsize <= MI_SMALL_MAX_OBJ_SIZE ? MI_RETIRE_CYCLES : MI_RETIRE_CYCLES/4);
       mi_assert_internal(pq >= heap->pages);
       const size_t index = pq - heap->pages;
       mi_assert_internal(index < MI_BIN_FULL && index < MI_BIN_HUGE);
       if (index < heap->page_retired_min) heap->page_retired_min = index;
       if (index > heap->page_retired_max) heap->page_retired_max = index;
       mi_assert_internal(mi_page_all_free(page));
-      return; // dont't free after all
+      return; // don't free after all
     }
   }
-  _mi_page_free(page, pq, false);
+  #endif
+  _mi_page_free(page, pq);
 }
 
 // free retired pages: we don't need to look at the entire queues
@@ -454,7 +455,7 @@ void _mi_heap_collect_retired(mi_heap_t* heap, bool force) {
       if (mi_page_all_free(page)) {
         page->retire_expire--;
         if (force || page->retire_expire == 0) {
-          _mi_page_free(pq->first, pq, force);
+          _mi_page_free(pq->first, pq);
         }
         else {
           // keep retired, update min/max
@@ -471,6 +472,29 @@ void _mi_heap_collect_retired(mi_heap_t* heap, bool force) {
   heap->page_retired_max = max;
 }
 
+/*
+static void mi_heap_collect_full_pages(mi_heap_t* heap) {
+  // note: normally full pages get immediately abandoned and the full queue is always empty
+  // this path is only used if abandoning is disabled due to a destroy-able heap or options
+  // set by the user.
+  mi_page_queue_t* pq = &heap->pages[MI_BIN_FULL];
+  for (mi_page_t* page = pq->first; page != NULL; ) {
+    mi_page_t* next = page->next;         // get next in case we free the page
+    _mi_page_free_collect(page, false);   // register concurrent free's
+    // no longer full?
+    if (!mi_page_is_full(page)) {
+      if (mi_page_all_free(page)) {
+        _mi_page_free(page, pq);
+      }
+      else {
+        _mi_page_unfull(page);
+      }
+    }
+    page = next;
+  }
+}
+*/
+
 
 /* -----------------------------------------------------------
   Initialize the initial free list in a page.
@@ -484,13 +508,13 @@ void _mi_heap_collect_retired(mi_heap_t* heap, bool force) {
 
 static void mi_page_free_list_extend_secure(mi_heap_t* const heap, mi_page_t* const page, const size_t bsize, const size_t extend, mi_stats_t* const stats) {
   MI_UNUSED(stats);
-  #if (MI_SECURE<=2)
+  #if (MI_SECURE<3)
   mi_assert_internal(page->free == NULL);
   mi_assert_internal(page->local_free == NULL);
   #endif
   mi_assert_internal(page->capacity + extend <= page->reserved);
   mi_assert_internal(bsize == mi_page_block_size(page));
-  void* const page_area = _mi_page_start(_mi_page_segment(page), page, NULL);
+  void* const page_area = mi_page_start(page);
 
   // initialize a randomized free list
   // set up `slice_count` slices to alternate between
@@ -542,13 +566,13 @@ static void mi_page_free_list_extend_secure(mi_heap_t* const heap, mi_page_t* co
 static mi_decl_noinline void mi_page_free_list_extend( mi_page_t* const page, const size_t bsize, const size_t extend, mi_stats_t* const stats)
 {
   MI_UNUSED(stats);
-  #if (MI_SECURE <= 2)
+  #if (MI_SECURE<3)
   mi_assert_internal(page->free == NULL);
   mi_assert_internal(page->local_free == NULL);
   #endif
   mi_assert_internal(page->capacity + extend <= page->reserved);
   mi_assert_internal(bsize == mi_page_block_size(page));
-  void* const page_area = _mi_page_start(_mi_page_segment(page), page, NULL );
+  void* const page_area = mi_page_start(page);
 
   mi_block_t* const start = mi_page_block_at(page, page_area, bsize, page->capacity);
 
@@ -570,7 +594,7 @@ static mi_decl_noinline void mi_page_free_list_extend( mi_page_t* const page, co
 ----------------------------------------------------------- */
 
 #define MI_MAX_EXTEND_SIZE    (4*1024)      // heuristic, one OS page seems to work well.
-#if (MI_SECURE>0)
+#if (MI_SECURE>=3)
 #define MI_MIN_EXTEND         (8*MI_SECURE) // extend at least by this many
 #else
 #define MI_MIN_EXTEND         (1)
@@ -581,29 +605,31 @@ static mi_decl_noinline void mi_page_free_list_extend( mi_page_t* const page, co
 // Note: we also experimented with "bump" allocation on the first
 // allocations but this did not speed up any benchmark (due to an
 // extra test in malloc? or cache effects?)
-static void mi_page_extend_free(mi_heap_t* heap, mi_page_t* page, mi_tld_t* tld) {
-  MI_UNUSED(tld); 
+static bool mi_page_extend_free(mi_heap_t* heap, mi_page_t* page) {
   mi_assert_expensive(mi_page_is_valid_init(page));
-  #if (MI_SECURE<=2)
+  #if (MI_SECURE<3)
   mi_assert(page->free == NULL);
   mi_assert(page->local_free == NULL);
-  if (page->free != NULL) return;
+  if (page->free != NULL) return true;
   #endif
-  if (page->capacity >= page->reserved) return;
+  if (page->capacity >= page->reserved) return true;
 
   size_t page_size;
-  _mi_page_start(_mi_page_segment(page), page, &page_size);
-  mi_stat_counter_increase(tld->stats.pages_extended, 1);
+  //uint8_t* page_start =
+  mi_page_area(page, &page_size);
+  #if MI_STAT>0
+  mi_heap_stat_counter_increase(heap, pages_extended, 1);
+  #endif
 
   // calculate the extend count
-  const size_t bsize = (page->xblock_size < MI_HUGE_BLOCK_SIZE ? page->xblock_size : page_size);
-  size_t extend = page->reserved - page->capacity;
+  const size_t bsize = mi_page_block_size(page);
+  size_t extend = (size_t)page->reserved - page->capacity;
   mi_assert_internal(extend > 0);
 
-  size_t max_extend = (bsize >= MI_MAX_EXTEND_SIZE ? MI_MIN_EXTEND : MI_MAX_EXTEND_SIZE/(uint32_t)bsize);
+  size_t max_extend = (bsize >= MI_MAX_EXTEND_SIZE ? MI_MIN_EXTEND : MI_MAX_EXTEND_SIZE/bsize);
   if (max_extend < MI_MIN_EXTEND) { max_extend = MI_MIN_EXTEND; }
   mi_assert_internal(max_extend > 0);
-    
+
   if (extend > max_extend) {
     // ensure we don't touch memory beyond the page to reduce page commit.
     // the `lean` benchmark tests this. Going from 1 to 8 increases rss by 50%.
@@ -613,70 +639,76 @@ static void mi_page_extend_free(mi_heap_t* heap, mi_page_t* page, mi_tld_t* tld)
   mi_assert_internal(extend > 0 && extend + page->capacity <= page->reserved);
   mi_assert_internal(extend < (1UL<<16));
 
+  // commit on demand?
+  if (page->slice_committed > 0) {
+    const size_t needed_size = (page->capacity + extend)*bsize;
+    const size_t needed_commit = _mi_align_up( mi_page_slice_offset_of(page, needed_size), MI_PAGE_MIN_COMMIT_SIZE );
+    if (needed_commit > page->slice_committed) {
+      mi_assert_internal(((needed_commit - page->slice_committed) % _mi_os_page_size()) == 0);
+      if (!_mi_os_commit(mi_page_slice_start(page) + page->slice_committed, needed_commit - page->slice_committed, NULL)) {
+        return false;
+      }
+      page->slice_committed = needed_commit;
+    }
+  }
+
   // and append the extend the free list
-  if (extend < MI_MIN_SLICES || MI_SECURE==0) { //!mi_option_is_enabled(mi_option_secure)) {
-    mi_page_free_list_extend(page, bsize, extend, &tld->stats );
+  if (extend < MI_MIN_SLICES || MI_SECURE<3) { //!mi_option_is_enabled(mi_option_secure)) {
+    mi_page_free_list_extend(page, bsize, extend, &heap->tld->stats );
   }
   else {
-    mi_page_free_list_extend_secure(heap, page, bsize, extend, &tld->stats);
+    mi_page_free_list_extend_secure(heap, page, bsize, extend, &heap->tld->stats);
   }
   // enable the new free list
   page->capacity += (uint16_t)extend;
-  mi_stat_increase(tld->stats.page_committed, extend * bsize);
-
-  // extension into zero initialized memory preserves the zero'd free list
-  if (!page->is_zero_init) {
-    page->is_zero = false;
-  }
+  #if MI_STAT>0
+  mi_heap_stat_increase(heap, page_committed, extend * bsize);
+  #endif
   mi_assert_expensive(mi_page_is_valid_init(page));
+  return true;
 }
 
-// Initialize a fresh page
-static void mi_page_init(mi_heap_t* heap, mi_page_t* page, size_t block_size, mi_tld_t* tld) {
+// Initialize a fresh page (that is already partially initialized)
+mi_decl_nodiscard bool _mi_page_init(mi_heap_t* heap, mi_page_t* page) {
   mi_assert(page != NULL);
-  mi_segment_t* segment = _mi_page_segment(page);
-  mi_assert(segment != NULL);
-  mi_assert_internal(block_size > 0);
-  // set fields
   mi_page_set_heap(page, heap);
-  page->xblock_size = (block_size < MI_HUGE_BLOCK_SIZE ? (uint32_t)block_size : MI_HUGE_BLOCK_SIZE); // initialize before _mi_segment_page_start
+
   size_t page_size;
-  const void* page_start = _mi_segment_page_start(segment, page, &page_size);
-  MI_UNUSED(page_start);
+  uint8_t* page_start = mi_page_area(page, &page_size); MI_UNUSED(page_start);
   mi_track_mem_noaccess(page_start,page_size);
-  mi_assert_internal(mi_page_block_size(page) <= page_size);
-  mi_assert_internal(page_size <= page->slice_count*MI_SEGMENT_SLICE_SIZE);
-  mi_assert_internal(page_size / block_size < (1L<<16));
-  page->reserved = (uint16_t)(page_size / block_size);
-  #ifdef MI_ENCODE_FREELIST
+  mi_assert_internal(page_size / mi_page_block_size(page) < (1L<<16));
+  mi_assert_internal(page->reserved > 0);
+  #if (MI_PADDING || MI_ENCODE_FREELIST)
   page->keys[0] = _mi_heap_random_next(heap);
   page->keys[1] = _mi_heap_random_next(heap);
   #endif
-  #if MI_DEBUG > 0
-  page->is_zero = false; // ensure in debug mode we initialize with MI_DEBUG_UNINIT, see issue #501
-  #else
-  page->is_zero = page->is_zero_init;
+  #if MI_DEBUG>2
+  if (page->memid.initially_zero) {
+    mi_track_mem_defined(page->page_start, mi_page_committed(page));
+    mi_assert_expensive(mi_mem_is_zero(page_start, mi_page_committed(page)));
+  }
   #endif
 
-  mi_assert_internal(page->is_committed);
-  mi_assert_internal(!page->is_reset);
   mi_assert_internal(page->capacity == 0);
   mi_assert_internal(page->free == NULL);
   mi_assert_internal(page->used == 0);
-  mi_assert_internal(page->xthread_free == 0);
+  mi_assert_internal(mi_page_is_owned(page));
+  mi_assert_internal(page->xthread_free == 1);
   mi_assert_internal(page->next == NULL);
   mi_assert_internal(page->prev == NULL);
   mi_assert_internal(page->retire_expire == 0);
   mi_assert_internal(!mi_page_has_aligned(page));
-  #if (MI_ENCODE_FREELIST)
+  #if (MI_PADDING || MI_ENCODE_FREELIST)
   mi_assert_internal(page->keys[0] != 0);
   mi_assert_internal(page->keys[1] != 0);
   #endif
+  mi_assert_internal(page->block_size_shift == 0 || (mi_page_block_size(page) == ((size_t)1 << page->block_size_shift)));
   mi_assert_expensive(mi_page_is_valid_init(page));
 
   // initialize an initial free list
-  mi_page_extend_free(heap,page,tld);
+  if (!mi_page_extend_free(heap,page)) return false;
   mi_assert(mi_page_immediate_available(page));
+  return true;
 }
 
 
@@ -685,81 +717,139 @@ static void mi_page_init(mi_heap_t* heap, mi_page_t* page, size_t block_size, mi
 -------------------------------------------------------------*/
 
 // Find a page with free blocks of `page->block_size`.
-static mi_page_t* mi_page_queue_find_free_ex(mi_heap_t* heap, mi_page_queue_t* pq, bool first_try)
+static mi_decl_noinline mi_page_t* mi_page_queue_find_free_ex(mi_heap_t* heap, mi_page_queue_t* pq, bool first_try)
 {
   // search through the pages in "next fit" order
   size_t count = 0;
+  long candidate_limit = 0;          // we reset this on the first candidate to limit the search
+  long page_full_retain = (pq->block_size > MI_SMALL_MAX_OBJ_SIZE ? 0 : heap->page_full_retain); // only retain small pages
+  mi_page_t* page_candidate = NULL;  // a page with free space
   mi_page_t* page = pq->first;
+
   while (page != NULL)
   {
-    mi_page_t* next = page->next; // remember next
+    mi_page_t* next = page->next; // remember next (as this page can move to another queue)
     count++;
+    candidate_limit--;
 
-    // 0. collect freed blocks by us and other threads
-    _mi_page_free_collect(page, false);
+    // search up to N pages for a best candidate
 
-    // 1. if the page contains free blocks, we are done
-    if (mi_page_immediate_available(page)) {
-      break;  // pick this one
+    // is the local free list non-empty?
+    bool immediate_available = mi_page_immediate_available(page);
+    if (!immediate_available) {
+      // collect freed blocks by us and other threads to we get a proper use count
+      _mi_page_free_collect(page, false);
+      immediate_available = mi_page_immediate_available(page);
     }
 
-    // 2. Try to extend
-    if (page->capacity < page->reserved) {
-      mi_page_extend_free(heap, page, heap->tld);
-      mi_assert_internal(mi_page_immediate_available(page));
-      break;
+    // if the page is completely full, move it to the `mi_pages_full`
+    // queue so we don't visit long-lived pages too often.
+    if (!immediate_available && !mi_page_is_expandable(page)) {
+      page_full_retain--;
+      if (page_full_retain < 0) {
+        mi_assert_internal(!mi_page_is_in_full(page) && !mi_page_immediate_available(page));
+        mi_page_to_full(page, pq);
+      }
+    }
+    else {
+      // the page has free space, make it a candidate
+      // we prefer non-expandable pages with high usage as candidates (to reduce commit, and increase chances of free-ing up pages)
+      if (page_candidate == NULL) {
+        page_candidate = page;
+        candidate_limit = _mi_option_get_fast(mi_option_page_max_candidates);
+      }
+      else if (mi_page_all_free(page_candidate)) {
+        _mi_page_free(page_candidate, pq);
+        page_candidate = page;
+      }
+      // prefer to reuse fuller pages (in the hope the less used page gets freed)
+      else if (page->used >= page_candidate->used && !mi_page_is_mostly_used(page)) { // && !mi_page_is_expandable(page)) {
+        page_candidate = page;
+      }
+      // if we find a non-expandable candidate, or searched for N pages, return with the best candidate
+      if (immediate_available || candidate_limit <= 0) {
+        mi_assert_internal(page_candidate!=NULL);
+        break;
+      }
+    }
+
+  #if 0
+    // first-fit algorithm without candidates
+    // If the page contains free blocks, we are done
+    if (mi_page_immediate_available(page) || mi_page_is_expandable(page)) {
+      break;  // pick this one
     }
 
-    // 3. If the page is completely full, move it to the `mi_pages_full`
+    // If the page is completely full, move it to the `mi_pages_full`
     // queue so we don't visit long-lived pages too often.
     mi_assert_internal(!mi_page_is_in_full(page) && !mi_page_immediate_available(page));
     mi_page_to_full(page, pq);
+  #endif
 
     page = next;
   } // for each page
 
-  mi_heap_stat_counter_increase(heap, searches, count);
+  mi_heap_stat_counter_increase(heap, page_searches, count);
+
+  // set the page to the best candidate
+  if (page_candidate != NULL) {
+    page = page_candidate;
+  }
+  if (page != NULL) {
+    if (!mi_page_immediate_available(page)) {
+      mi_assert_internal(mi_page_is_expandable(page));
+      if (!mi_page_extend_free(heap, page)) {
+        page = NULL; // failed to extend
+      }
+    }
+    mi_assert_internal(page == NULL || mi_page_immediate_available(page));
+  }
 
   if (page == NULL) {
-    _mi_heap_collect_retired(heap, false); // perhaps make a page available?
+    _mi_heap_collect_retired(heap, false); // perhaps make a page available
     page = mi_page_fresh(heap, pq);
+    mi_assert_internal(page == NULL || mi_page_immediate_available(page));
     if (page == NULL && first_try) {
       // out-of-memory _or_ an abandoned page with free blocks was reclaimed, try once again
-      page = mi_page_queue_find_free_ex(heap, pq, false);      
+      page = mi_page_queue_find_free_ex(heap, pq, false);
+      mi_assert_internal(page == NULL || mi_page_immediate_available(page));
     }
   }
   else {
-    mi_assert(pq->first == page);
+    mi_assert_internal(page == NULL || mi_page_immediate_available(page));
+    // move the page to the front of the queue
+    mi_page_queue_move_to_front(heap, pq, page);
     page->retire_expire = 0;
+    // _mi_heap_collect_retired(heap, false); // update retire counts; note: increases rss on MemoryLoad bench so don't do this
   }
   mi_assert_internal(page == NULL || mi_page_immediate_available(page));
+
+
   return page;
 }
 
 
 
 // Find a page with free blocks of `size`.
-static inline mi_page_t* mi_find_free_page(mi_heap_t* heap, size_t size) {
-  mi_page_queue_t* pq = mi_page_queue(heap,size);
+static mi_page_t* mi_find_free_page(mi_heap_t* heap, mi_page_queue_t* pq) {
+  // mi_page_queue_t* pq = mi_page_queue(heap, size);
+  mi_assert_internal(!mi_page_queue_is_huge(pq));
+
+  // check the first page: we even do this with candidate search or otherwise we re-search every time
   mi_page_t* page = pq->first;
-  if (page != NULL) {
-   #if (MI_SECURE>=3) // in secure mode, we extend half the time to increase randomness      
+  if mi_likely(page != NULL && mi_page_immediate_available(page)) {
+    #if (MI_SECURE>=3) // in secure mode, we extend half the time to increase randomness
     if (page->capacity < page->reserved && ((_mi_heap_random_next(heap) & 1) == 1)) {
-      mi_page_extend_free(heap, page, heap->tld);
+      mi_page_extend_free(heap, page);
       mi_assert_internal(mi_page_immediate_available(page));
     }
-    else 
-   #endif
-    {
-      _mi_page_free_collect(page,false);
-    }
-    
-    if (mi_page_immediate_available(page)) {
-      page->retire_expire = 0;
-      return page; // fast path
-    }
+    #endif
+    page->retire_expire = 0;
+    return page; // fast path
+  }
+  else {
+    return mi_page_queue_find_free_ex(heap, pq, true);
   }
-  return mi_page_queue_find_free_ex(heap, pq, true);
 }
 
 
@@ -792,40 +882,30 @@ void mi_register_deferred_free(mi_deferred_free_fun* fn, void* arg) mi_attr_noex
   General allocation
 ----------------------------------------------------------- */
 
-// Large and huge page allocation.
-// Huge pages are allocated directly without being in a queue.
-// Because huge pages contain just one block, and the segment contains
-// just that page, we always treat them as abandoned and any thread
-// that frees the block can free the whole page and segment directly.
-static mi_page_t* mi_large_huge_page_alloc(mi_heap_t* heap, size_t size) {
-  size_t block_size = _mi_os_good_alloc_size(size);
-  mi_assert_internal(mi_bin(block_size) == MI_BIN_HUGE);
-  bool is_huge = (block_size > MI_LARGE_OBJ_SIZE_MAX);
-  mi_page_queue_t* pq = (is_huge ? NULL : mi_page_queue(heap, block_size));
-  mi_page_t* page = mi_page_fresh_alloc(heap, pq, block_size);
+// Huge pages contain just one block, and the segment contains just that page.
+// Huge pages are also use if the requested alignment is very large (> MI_BLOCK_ALIGNMENT_MAX)
+// so their size is not always `> MI_LARGE_OBJ_SIZE_MAX`.
+static mi_page_t* mi_huge_page_alloc(mi_heap_t* heap, size_t size, size_t page_alignment, mi_page_queue_t* pq) {
+  const size_t block_size = _mi_os_good_alloc_size(size);
+  // mi_assert_internal(mi_bin(block_size) == MI_BIN_HUGE || page_alignment > 0);
+  #if MI_HUGE_PAGE_ABANDON
+  #error todo.
+  #else
+  // mi_page_queue_t* pq = mi_page_queue(heap, MI_LARGE_MAX_OBJ_SIZE+1);  // always in the huge queue regardless of the block size
+  mi_assert_internal(mi_page_queue_is_huge(pq));
+  #endif
+  mi_page_t* page = mi_page_fresh_alloc(heap, pq, block_size, page_alignment);
   if (page != NULL) {
+    mi_assert_internal(mi_page_block_size(page) >= size);
     mi_assert_internal(mi_page_immediate_available(page));
-    
-    if (pq == NULL) {
-      // huge pages are directly abandoned
-      mi_assert_internal(_mi_page_segment(page)->kind == MI_SEGMENT_HUGE);
-      mi_assert_internal(_mi_page_segment(page)->used==1);
-      mi_assert_internal(_mi_page_segment(page)->thread_id==0); // abandoned, not in the huge queue
-      mi_page_set_heap(page, NULL);
-    }
-    else {
-      mi_assert_internal(_mi_page_segment(page)->kind != MI_SEGMENT_HUGE);
-    }
-    
-    const size_t bsize = mi_page_usable_block_size(page);  // note: not `mi_page_block_size` to account for padding
-    if (bsize <= MI_LARGE_OBJ_SIZE_MAX) {
-      mi_heap_stat_increase(heap, large, bsize);
-      mi_heap_stat_counter_increase(heap, large_count, 1);
-    }
-    else {
-      mi_heap_stat_increase(heap, huge, bsize);
-      mi_heap_stat_counter_increase(heap, huge_count, 1);
-    }
+    mi_assert_internal(mi_page_is_huge(page));
+    mi_assert_internal(mi_page_is_singleton(page));
+    #if MI_HUGE_PAGE_ABANDON
+    mi_assert_internal(mi_page_is_abandoned(page));
+    mi_page_set_heap(page, NULL);
+    #endif
+    mi_heap_stat_increase(heap, malloc_huge, mi_page_block_size(page));
+    mi_heap_stat_counter_increase(heap, malloc_huge_count, 1);
   }
   return page;
 }
@@ -833,70 +913,90 @@ static mi_page_t* mi_large_huge_page_alloc(mi_heap_t* heap, size_t size) {
 
 // Allocate a page
 // Note: in debug mode the size includes MI_PADDING_SIZE and might have overflowed.
-static mi_page_t* mi_find_page(mi_heap_t* heap, size_t size) mi_attr_noexcept {
+static mi_page_t* mi_find_page(mi_heap_t* heap, size_t size, size_t huge_alignment) mi_attr_noexcept {
+  const size_t req_size = size - MI_PADDING_SIZE;  // correct for padding_size in case of an overflow on `size`
+  if mi_unlikely(req_size > MI_MAX_ALLOC_SIZE) {
+    _mi_error_message(EOVERFLOW, "allocation request is too large (%zu bytes)\n", req_size);
+    return NULL;
+  }
+  mi_page_queue_t* pq = mi_page_queue(heap, (huge_alignment > 0 ? MI_LARGE_MAX_OBJ_SIZE+1 : size));
   // huge allocation?
-  const size_t req_size = size - MI_PADDING_SIZE;  // correct for padding_size in case of an overflow on `size`  
-  if mi_unlikely(req_size > (MI_MEDIUM_OBJ_SIZE_MAX - MI_PADDING_SIZE)) {
-    if mi_unlikely(req_size > PTRDIFF_MAX) {  // we don't allocate more than PTRDIFF_MAX (see <https://sourceware.org/ml/libc-announce/2019/msg00001.html>)
-      _mi_error_message(EOVERFLOW, "allocation request is too large (%zu bytes)\n", req_size);
-      return NULL;
-    }
-    else {
-      return mi_large_huge_page_alloc(heap,size);
-    }
+  if mi_unlikely(mi_page_queue_is_huge(pq) || req_size > MI_MAX_ALLOC_SIZE) {
+    return mi_huge_page_alloc(heap,size,huge_alignment,pq);
   }
   else {
     // otherwise find a page with free blocks in our size segregated queues
+    #if MI_PADDING
     mi_assert_internal(size >= MI_PADDING_SIZE);
-    return mi_find_free_page(heap, size);
+    #endif
+    return mi_find_free_page(heap, pq);
   }
 }
 
+
 // Generic allocation routine if the fast path (`alloc.c:mi_page_malloc`) does not succeed.
 // Note: in debug mode the size includes MI_PADDING_SIZE and might have overflowed.
-void* _mi_malloc_generic(mi_heap_t* heap, size_t size, bool zero) mi_attr_noexcept
+// The `huge_alignment` is normally 0 but is set to a multiple of MI_SLICE_SIZE for
+// very large requested alignments in which case we use a huge singleton page.
+void* _mi_malloc_generic(mi_heap_t* heap, size_t size, bool zero, size_t huge_alignment) mi_attr_noexcept
 {
   mi_assert_internal(heap != NULL);
 
   // initialize if necessary
   if mi_unlikely(!mi_heap_is_initialized(heap)) {
-    mi_thread_init(); // calls `_mi_heap_init` in turn
-    heap = mi_get_default_heap();
+    heap = mi_heap_get_default(); // calls mi_thread_init
     if mi_unlikely(!mi_heap_is_initialized(heap)) { return NULL; }
   }
   mi_assert_internal(mi_heap_is_initialized(heap));
 
-  // call potential deferred free routines
-  _mi_deferred_free(heap, false);
-
-  // free delayed frees from other threads (but skip contended ones)
-  _mi_heap_delayed_free_partial(heap);
+  // do administrative tasks every N generic mallocs
+  if mi_unlikely(++heap->generic_count >= 1000) {
+    heap->generic_collect_count += heap->generic_count;
+    heap->generic_count = 0;
+    // call potential deferred free routines
+    _mi_deferred_free(heap, false);
+
+    // collect every once in a while (10000 by default)
+    const long generic_collect = mi_option_get_clamp(mi_option_generic_collect, 1, 1000000L);
+    if (heap->generic_collect_count >= generic_collect) {
+      heap->generic_collect_count = 0;
+      mi_heap_collect(heap, false /* force? */);
+    }
+  }
 
   // find (or allocate) a page of the right size
-  mi_page_t* page = mi_find_page(heap, size);
+  mi_page_t* page = mi_find_page(heap, size, huge_alignment);
   if mi_unlikely(page == NULL) { // first time out of memory, try to collect and retry the allocation once more
-    mi_heap_collect(heap, true /* force */);
-    page = mi_find_page(heap, size);
+    mi_heap_collect(heap, true /* force? */);
+    page = mi_find_page(heap, size, huge_alignment);
   }
 
   if mi_unlikely(page == NULL) { // out of memory
-    const size_t req_size = size - MI_PADDING_SIZE;  // correct for padding_size in case of an overflow on `size`  
+    const size_t req_size = size - MI_PADDING_SIZE;  // correct for padding_size in case of an overflow on `size`
     _mi_error_message(ENOMEM, "unable to allocate memory (%zu bytes)\n", req_size);
     return NULL;
   }
 
   mi_assert_internal(mi_page_immediate_available(page));
   mi_assert_internal(mi_page_block_size(page) >= size);
+  mi_assert_internal(_mi_is_aligned(page, MI_PAGE_ALIGN));
+  mi_assert_internal(_mi_ptr_page(page)==page);
 
   // and try again, this time succeeding! (i.e. this should never recurse through _mi_page_malloc)
-  if mi_unlikely(zero && page->xblock_size == 0) {
+  void* p;
+  if mi_unlikely(zero && mi_page_is_huge(page)) {
     // note: we cannot call _mi_page_malloc with zeroing for huge blocks; we zero it afterwards in that case.
-    void* p = _mi_page_malloc(heap, page, size, false);
+    p = _mi_page_malloc(heap, page, size);
     mi_assert_internal(p != NULL);
     _mi_memzero_aligned(p, mi_page_usable_block_size(page));
-    return p;
   }
   else {
-    return _mi_page_malloc(heap, page, size, zero);
+    p = _mi_page_malloc_zero(heap, page, size, zero);
+    mi_assert_internal(p != NULL);
+  }
+  // move singleton pages to the full queue
+  if (page->reserved == page->used) {
+    mi_page_to_full(page, mi_page_queue_of(page));
   }
+  return p;
 }
diff --git a/depends/mimalloc/src/prim/emscripten/prim.c b/depends/mimalloc/src/prim/emscripten/prim.c
new file mode 100644
index 000000000000..9ddec5df5415
--- /dev/null
+++ b/depends/mimalloc/src/prim/emscripten/prim.c
@@ -0,0 +1,252 @@
+/* ----------------------------------------------------------------------------
+Copyright (c) 2018-2025, Microsoft Research, Daan Leijen, Alon Zakai
+This is free software; you can redistribute it and/or modify it under the
+terms of the MIT license. A copy of the license can be found in the file
+"LICENSE" at the root of this distribution.
+-----------------------------------------------------------------------------*/
+
+// This file is included in `src/prim/prim.c`
+
+#include "mimalloc.h"
+#include "mimalloc/internal.h"
+#include "mimalloc/atomic.h"
+#include "mimalloc/prim.h"
+
+// Design
+// ======
+//
+// mimalloc is built on top of emmalloc. emmalloc is a minimal allocator on top
+// of sbrk. The reason for having three layers here is that we want mimalloc to
+// be able to allocate and release system memory properly, the same way it would
+// when using VirtualAlloc on Windows or mmap on POSIX, and sbrk is too limited.
+// Specifically, sbrk can only go up and down, and not "skip" over regions, and
+// so we end up either never freeing memory to the system, or we can get stuck
+// with holes.
+//
+// Atm wasm generally does *not* free memory back the system: once grown, we do
+// not shrink back down (https://github.com/WebAssembly/design/issues/1397).
+// However, that is expected to improve
+// (https://github.com/WebAssembly/memory-control/blob/main/proposals/memory-control/Overview.md)
+// and so we do not want to bake those limitations in here.
+//
+// Even without that issue, we want our system allocator to handle holes, that
+// is, it should merge freed regions and allow allocating new content there of
+// the full size, etc., so that we do not waste space. That means that the
+// system allocator really does need to handle the general problem of allocating
+// and freeing variable-sized chunks of memory in a random order, like malloc/
+// free do. And so it makes sense to layer mimalloc on top of such an
+// implementation.
+//
+// emmalloc makes sense for the lower level because it is small and simple while
+// still fully handling merging of holes etc. It is not the most efficient
+// allocator, but our assumption is that mimalloc needs to be fast while the
+// system allocator underneath it is called much less frequently.
+//
+
+//---------------------------------------------
+// init
+//---------------------------------------------
+
+void _mi_prim_mem_init( mi_os_mem_config_t* config) {
+  config->page_size = 64*MI_KiB; // WebAssembly has a fixed page size: 64KiB
+  config->alloc_granularity = 16;
+  config->has_overcommit = false;
+  config->has_partial_free = false;
+  config->has_virtual_reserve = false;
+}
+
+extern void emmalloc_free(void*);
+
+int _mi_prim_free(void* addr, size_t size) {
+  if (size==0) return 0;
+  emmalloc_free(addr);
+  return 0;
+}
+
+
+//---------------------------------------------
+// Allocation
+//---------------------------------------------
+
+extern void* emmalloc_memalign(size_t alignment, size_t size);
+
+// Note: the `try_alignment` is just a hint and the returned pointer is not guaranteed to be aligned.
+int _mi_prim_alloc(void* hint_addr, size_t size, size_t try_alignment, bool commit, bool allow_large, bool* is_large, bool* is_zero, void** addr) {
+  MI_UNUSED(try_alignment); MI_UNUSED(allow_large); MI_UNUSED(commit); MI_UNUSED(hint_addr);
+  *is_large = false;
+  // TODO: Track the highest address ever seen; first uses of it are zeroes.
+  //       That assumes no one else uses sbrk but us (they could go up,
+  //       scribble, and then down), but we could assert on that perhaps.
+  *is_zero = false;
+  // emmalloc has a minimum alignment size.
+  #define MIN_EMMALLOC_ALIGN           8
+  if (try_alignment < MIN_EMMALLOC_ALIGN) {
+    try_alignment = MIN_EMMALLOC_ALIGN;
+  }
+  void* p = emmalloc_memalign(try_alignment, size);
+  *addr = p;
+  if (p == 0) {
+    return ENOMEM;
+  }
+  return 0;
+}
+
+
+//---------------------------------------------
+// Commit/Reset
+//---------------------------------------------
+
+int _mi_prim_commit(void* addr, size_t size, bool* is_zero) {
+  MI_UNUSED(addr); MI_UNUSED(size);
+  // See TODO above.
+  *is_zero = false;
+  return 0;
+}
+
+int _mi_prim_decommit(void* addr, size_t size, bool* needs_recommit) {
+  MI_UNUSED(addr); MI_UNUSED(size);
+  *needs_recommit = false;
+  return 0;
+}
+
+int _mi_prim_reset(void* addr, size_t size) {
+  MI_UNUSED(addr); MI_UNUSED(size);
+  return 0;
+}
+
+int _mi_prim_reuse(void* addr, size_t size) {
+  MI_UNUSED(addr); MI_UNUSED(size);
+  return 0;
+}
+
+int _mi_prim_protect(void* addr, size_t size, bool protect) {
+  MI_UNUSED(addr); MI_UNUSED(size); MI_UNUSED(protect);
+  return 0;
+}
+
+
+//---------------------------------------------
+// Huge pages and NUMA nodes
+//---------------------------------------------
+
+int _mi_prim_alloc_huge_os_pages(void* hint_addr, size_t size, int numa_node, bool* is_zero, void** addr) {
+  MI_UNUSED(hint_addr); MI_UNUSED(size); MI_UNUSED(numa_node);
+  *is_zero = true;
+  *addr = NULL;
+  return ENOSYS;
+}
+
+size_t _mi_prim_numa_node(void) {
+  return 0;
+}
+
+size_t _mi_prim_numa_node_count(void) {
+  return 1;
+}
+
+
+//----------------------------------------------------------------
+// Clock
+//----------------------------------------------------------------
+
+#include <emscripten/html5.h>
+
+mi_msecs_t _mi_prim_clock_now(void) {
+  return emscripten_date_now();
+}
+
+
+//----------------------------------------------------------------
+// Process info
+//----------------------------------------------------------------
+
+void _mi_prim_process_info(mi_process_info_t* pinfo)
+{
+  // use defaults
+  MI_UNUSED(pinfo);
+}
+
+
+//----------------------------------------------------------------
+// Output
+//----------------------------------------------------------------
+
+#include <emscripten/console.h>
+
+void _mi_prim_out_stderr( const char* msg) {
+  emscripten_console_error(msg);
+}
+
+
+//----------------------------------------------------------------
+// Environment
+//----------------------------------------------------------------
+
+bool _mi_prim_getenv(const char* name, char* result, size_t result_size) {
+  // For code size reasons, do not support environ customization for now.
+  MI_UNUSED(name);
+  MI_UNUSED(result);
+  MI_UNUSED(result_size);
+  return false;
+}
+
+
+//----------------------------------------------------------------
+// Random
+//----------------------------------------------------------------
+
+bool _mi_prim_random_buf(void* buf, size_t buf_len) {
+  int err = getentropy(buf, buf_len);
+  return !err;
+}
+
+
+//----------------------------------------------------------------
+// Thread init/done
+//----------------------------------------------------------------
+
+#if defined(MI_USE_PTHREADS)
+
+// use pthread local storage keys to detect thread ending
+// (and used with MI_TLS_PTHREADS for the default heap)
+pthread_key_t _mi_heap_default_key = (pthread_key_t)(-1);
+
+static void mi_pthread_done(void* value) {
+  if (value!=NULL) {
+    _mi_thread_done((mi_heap_t*)value);
+  }
+}
+
+void _mi_prim_thread_init_auto_done(void) {
+  mi_assert_internal(_mi_heap_default_key == (pthread_key_t)(-1));
+  pthread_key_create(&_mi_heap_default_key, &mi_pthread_done);
+}
+
+void _mi_prim_thread_done_auto_done(void) {
+  // nothing to do
+}
+
+void _mi_prim_thread_associate_default_heap(mi_heap_t* heap) {
+  if (_mi_heap_default_key != (pthread_key_t)(-1)) {  // can happen during recursive invocation on freeBSD
+    pthread_setspecific(_mi_heap_default_key, heap);
+  }
+}
+
+#else
+
+void _mi_prim_thread_init_auto_done(void) {
+  // nothing
+}
+
+void _mi_prim_thread_done_auto_done(void) {
+  // nothing
+}
+
+void _mi_prim_thread_associate_default_heap(mi_heap_t* heap) {
+  MI_UNUSED(heap);
+}
+#endif
+
+bool _mi_prim_thread_is_in_threadpool(void) {
+  return false;
+}
diff --git a/depends/mimalloc/src/alloc-override-osx.c b/depends/mimalloc/src/prim/osx/alloc-override-zone.c
similarity index 93%
rename from depends/mimalloc/src/alloc-override-osx.c
rename to depends/mimalloc/src/prim/osx/alloc-override-zone.c
index ba2313a2a06a..a8f5fbc68268 100644
--- a/depends/mimalloc/src/alloc-override-osx.c
+++ b/depends/mimalloc/src/prim/osx/alloc-override-zone.c
@@ -6,7 +6,7 @@ terms of the MIT license. A copy of the license can be found in the file
 -----------------------------------------------------------------------------*/
 
 #include "mimalloc.h"
-#include "mimalloc-internal.h"
+#include "mimalloc/internal.h"
 
 #if defined(MI_MALLOC_OVERRIDE)
 
@@ -19,8 +19,8 @@ terms of the MIT license. A copy of the license can be found in the file
    This is done through the malloc zone interface.
    It seems to be most robust in combination with interposing
    though or otherwise we may get zone errors as there are could
-   be allocations done by the time we take over the 
-   zone. 
+   be allocations done by the time we take over the
+   zone.
 ------------------------------------------------------ */
 
 #include <AvailabilityMacros.h>
@@ -64,7 +64,8 @@ static void* zone_valloc(malloc_zone_t* zone, size_t size) {
 
 static void zone_free(malloc_zone_t* zone, void* p) {
   MI_UNUSED(zone);
-  mi_cfree(p);
+  // mi_cfree(p);  // checked free as `zone_free` may be called with invalid pointers
+  mi_free(p); // with the page_map and pagemap_commit=1 we can use the regular free
 }
 
 static void* zone_realloc(malloc_zone_t* zone, void* p, size_t newsize) {
@@ -195,7 +196,7 @@ static malloc_introspection_t mi_introspect = {
   .log = &intro_log,
   .force_lock = &intro_force_lock,
   .force_unlock = &intro_force_unlock,
-#if defined(MAC_OS_X_VERSION_10_6) && (MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_6)
+#if defined(MAC_OS_X_VERSION_10_6) && (MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_6) && !defined(__ppc__)
   .statistics = &intro_statistics,
   .zone_locked = &intro_zone_locked,
 #endif
@@ -215,8 +216,8 @@ static malloc_zone_t mi_malloc_zone = {
   .zone_name = "mimalloc",
   .batch_malloc = &zone_batch_malloc,
   .batch_free = &zone_batch_free,
-  .introspect = &mi_introspect,  
-#if defined(MAC_OS_X_VERSION_10_6) && (MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_6)
+  .introspect = &mi_introspect,
+#if defined(MAC_OS_X_VERSION_10_6) && (MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_6) && !defined(__ppc__)
   #if defined(MAC_OS_X_VERSION_10_14) && (MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_14)
   .version = 10,
   #else
@@ -225,7 +226,9 @@ static malloc_zone_t mi_malloc_zone = {
   // switch to version 9+ on OSX 10.6 to support memalign.
   .memalign = &zone_memalign,
   .free_definite_size = &zone_free_definite_size,
+  #if defined(MAC_OS_X_VERSION_10_7) && (MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_7)
   .pressure_relief = &zone_pressure_relief,
+  #endif
   #if defined(MAC_OS_X_VERSION_10_14) && (MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_14)
   .claimed_address = &zone_claimed_address,
   #endif
@@ -242,7 +245,7 @@ static malloc_zone_t mi_malloc_zone = {
 #if defined(MI_OSX_INTERPOSE) && defined(MI_SHARED_LIB_EXPORT)
 
 // ------------------------------------------------------
-// Override malloc_xxx and malloc_zone_xxx api's to use only 
+// Override malloc_xxx and malloc_zone_xxx api's to use only
 // our mimalloc zone. Since even the loader uses malloc
 // on macOS, this ensures that all allocations go through
 // mimalloc (as all calls are interposed).
@@ -254,7 +257,7 @@ static malloc_zone_t mi_malloc_zone = {
 static inline malloc_zone_t* mi_get_default_zone(void)
 {
   static bool init;
-  if mi_unlikely(!init) { 
+  if mi_unlikely(!init) {
     init = true;
     malloc_zone_register(&mi_malloc_zone);  // by calling register we avoid a zone error on free (see <http://eatmyrandom.blogspot.com/2010/03/mallocfree-interception-on-mac-os-x.html>)
   }
@@ -272,7 +275,7 @@ static malloc_zone_t* mi_malloc_create_zone(vm_size_t size, unsigned flags) {
   return mi_get_default_zone();
 }
 
-static malloc_zone_t* mi_malloc_default_zone (void) {   
+static malloc_zone_t* mi_malloc_default_zone (void) {
   return mi_get_default_zone();
 }
 
@@ -292,11 +295,11 @@ static kern_return_t mi_malloc_get_all_zones (task_t task, memory_reader_t mr, v
   return KERN_SUCCESS;
 }
 
-static const char* mi_malloc_get_zone_name(malloc_zone_t* zone) {  
+static const char* mi_malloc_get_zone_name(malloc_zone_t* zone) {
   return (zone == NULL ? mi_malloc_zone.zone_name : zone->zone_name);
 }
 
-static void mi_malloc_set_zone_name(malloc_zone_t* zone, const char* name) {  
+static void mi_malloc_set_zone_name(malloc_zone_t* zone, const char* name) {
   MI_UNUSED(zone); MI_UNUSED(name);
 }
 
@@ -306,7 +309,7 @@ static int mi_malloc_jumpstart(uintptr_t cookie) {
 }
 
 static void mi__malloc_fork_prepare(void) {
-  // nothing  
+  // nothing
 }
 static void mi__malloc_fork_parent(void) {
   // nothing
@@ -367,13 +370,13 @@ __attribute__((used)) static const struct mi_interpose_s _mi_zone_interposes[]
   MI_INTERPOSE_MI(malloc_destroy_zone),
   MI_INTERPOSE_MI(malloc_get_all_zones),
   MI_INTERPOSE_MI(malloc_get_zone_name),
-  MI_INTERPOSE_MI(malloc_jumpstart),  
+  MI_INTERPOSE_MI(malloc_jumpstart),
   MI_INTERPOSE_MI(malloc_printf),
   MI_INTERPOSE_MI(malloc_set_zone_name),
   MI_INTERPOSE_MI(_malloc_fork_child),
   MI_INTERPOSE_MI(_malloc_fork_parent),
   MI_INTERPOSE_MI(_malloc_fork_prepare),
-  
+
   MI_INTERPOSE_ZONE(zone_batch_free),
   MI_INTERPOSE_ZONE(zone_batch_malloc),
   MI_INTERPOSE_ZONE(zone_calloc),
@@ -416,11 +419,12 @@ static inline malloc_zone_t* mi_get_default_zone(void)
 }
 
 #if defined(__clang__)
-__attribute__((constructor(0))) 
+__attribute__((constructor(101))) // highest priority
 #else
-__attribute__((constructor))      // seems not supported by g++-11 on the M1
+__attribute__((constructor))      // priority level is not supported by gcc
 #endif
-static void _mi_macos_override_malloc() {
+__attribute__((used))
+static void _mi_macos_override_malloc(void) {
   malloc_zone_t* purgeable_zone = NULL;
 
   #if defined(MAC_OS_X_VERSION_10_6) && (MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_6)
diff --git a/depends/mimalloc/src/prim/osx/prim.c b/depends/mimalloc/src/prim/osx/prim.c
new file mode 100644
index 000000000000..8a2f4e8aa473
--- /dev/null
+++ b/depends/mimalloc/src/prim/osx/prim.c
@@ -0,0 +1,9 @@
+/* ----------------------------------------------------------------------------
+Copyright (c) 2018-2023, Microsoft Research, Daan Leijen
+This is free software; you can redistribute it and/or modify it under the
+terms of the MIT license. A copy of the license can be found in the file
+"LICENSE" at the root of this distribution.
+-----------------------------------------------------------------------------*/
+
+// We use the unix/prim.c with the mmap API on macOSX
+#include "../unix/prim.c"
diff --git a/depends/mimalloc/src/prim/prim.c b/depends/mimalloc/src/prim/prim.c
new file mode 100644
index 000000000000..1864a3afcc1f
--- /dev/null
+++ b/depends/mimalloc/src/prim/prim.c
@@ -0,0 +1,76 @@
+/* ----------------------------------------------------------------------------
+Copyright (c) 2018-2023, Microsoft Research, Daan Leijen
+This is free software; you can redistribute it and/or modify it under the
+terms of the MIT license. A copy of the license can be found in the file
+"LICENSE" at the root of this distribution.
+-----------------------------------------------------------------------------*/
+
+// Select the implementation of the primitives
+// depending on the OS.
+
+#if defined(_WIN32)
+#include "windows/prim.c"  // VirtualAlloc (Windows)
+
+#elif defined(__APPLE__)
+#include "osx/prim.c"      // macOSX (actually defers to mmap in unix/prim.c)
+
+#elif defined(__EMSCRIPTEN__)
+#include "emscripten/prim.c" // emmalloc_*, + pthread support
+
+#elif defined(__wasi__)
+#define MI_USE_SBRK
+#include "wasi/prim.c"     // memory-grow or sbrk (Wasm)
+
+#else
+#include "unix/prim.c"     // mmap() (Linux, macOSX, BSD, Illumnos, Haiku, DragonFly, etc.)
+
+#endif
+
+// Generic process initialization
+#ifndef MI_PRIM_HAS_PROCESS_ATTACH
+#if defined(__GNUC__) || defined(__clang__)
+  // gcc,clang: use the constructor/destructor attribute
+  // which for both seem to run before regular constructors/destructors
+  #if defined(__clang__)
+    #define mi_attr_constructor __attribute__((constructor(101)))
+    #define mi_attr_destructor  __attribute__((destructor(101)))
+  #else
+    #define mi_attr_constructor __attribute__((constructor))
+    #define mi_attr_destructor  __attribute__((destructor))
+  #endif
+  static void mi_attr_constructor mi_process_attach(void) {
+    _mi_auto_process_init();
+  }
+  static void mi_attr_destructor mi_process_detach(void) {
+    _mi_auto_process_done();
+  }
+#elif defined(__cplusplus)
+  // C++: use static initialization to detect process start/end
+  // This is not guaranteed to be first/last but the best we can generally do?
+  struct mi_init_done_t {
+    mi_init_done_t() {
+      _mi_auto_process_init();
+    }
+    ~mi_init_done_t() {
+      _mi_auto_process_done();
+    }
+  };
+  static mi_init_done_t mi_init_done;
+ #else
+  #pragma message("define a way to call _mi_auto_process_init/done on your platform")
+#endif
+#endif
+
+// Generic allocator init/done callback
+#ifndef MI_PRIM_HAS_ALLOCATOR_INIT
+bool _mi_is_redirected(void) {
+  return false;
+}
+bool _mi_allocator_init(const char** message) {
+  if (message != NULL) { *message = NULL; }
+  return true;
+}
+void _mi_allocator_done(void) {
+  // nothing to do
+}
+#endif
diff --git a/depends/mimalloc/src/prim/readme.md b/depends/mimalloc/src/prim/readme.md
new file mode 100644
index 000000000000..380dd3a71784
--- /dev/null
+++ b/depends/mimalloc/src/prim/readme.md
@@ -0,0 +1,9 @@
+## Portability Primitives
+
+This is the portability layer where all primitives needed from the OS are defined.
+
+- `include/mimalloc/prim.h`: primitive portability API definition.
+- `prim.c`: Selects one of `unix/prim.c`, `wasi/prim.c`, or `windows/prim.c` depending on the host platform
+            (and on macOS, `osx/prim.c` defers to `unix/prim.c`).
+
+Note: still work in progress, there may still be places in the sources that still depend on OS ifdef's.
\ No newline at end of file
diff --git a/depends/mimalloc/src/prim/unix/prim.c b/depends/mimalloc/src/prim/unix/prim.c
new file mode 100644
index 000000000000..a25be2512ce1
--- /dev/null
+++ b/depends/mimalloc/src/prim/unix/prim.c
@@ -0,0 +1,973 @@
+/* ----------------------------------------------------------------------------
+Copyright (c) 2018-2025, Microsoft Research, Daan Leijen
+This is free software; you can redistribute it and/or modify it under the
+terms of the MIT license. A copy of the license can be found in the file
+"LICENSE" at the root of this distribution.
+-----------------------------------------------------------------------------*/
+
+// This file is included in `src/prim/prim.c`
+
+#ifndef _DEFAULT_SOURCE
+#define _DEFAULT_SOURCE   // ensure mmap flags and syscall are defined
+#endif
+
+#if defined(__sun)
+// illumos provides new mman.h api when any of these are defined
+// otherwise the old api based on caddr_t which predates the void pointers one.
+// stock solaris provides only the former, chose to atomically to discard those
+// flags only here rather than project wide tough.
+#undef _XOPEN_SOURCE
+#undef _POSIX_C_SOURCE
+#endif
+
+#include "mimalloc.h"
+#include "mimalloc/internal.h"
+#include "mimalloc/prim.h"
+
+#include <sys/mman.h>  // mmap
+#include <unistd.h>    // sysconf
+#include <fcntl.h>     // open, close, read, access
+#include <stdlib.h>    // getenv, arc4random_buf
+
+#if defined(__linux__)
+  #include <features.h>
+  #include <sys/prctl.h>    // THP disable, PR_SET_VMA
+  #include <sys/sysinfo.h>  // sysinfo
+  #if defined(__GLIBC__) && !defined(PR_SET_VMA)
+  #include <linux/prctl.h>
+  #endif
+  #if defined(__GLIBC__)
+  #include <linux/mman.h>   // linux mmap flags
+  #else
+  #include <sys/mman.h>
+  #endif
+#elif defined(__APPLE__)
+  #include <AvailabilityMacros.h>
+  #include <TargetConditionals.h>
+  #if !defined(TARGET_OS_OSX) || TARGET_OS_OSX   // see issue #879, used to be (!TARGET_IOS_IPHONE && !TARGET_IOS_SIMULATOR)
+  #include <mach/vm_statistics.h>    // VM_MAKE_TAG, VM_FLAGS_SUPERPAGE_SIZE_2MB, etc.
+  #endif
+  #if !defined(MAC_OS_X_VERSION_10_7)
+  #define MAC_OS_X_VERSION_10_7   1070
+  #endif
+  #include <sys/sysctl.h>
+#elif defined(__FreeBSD__) || defined(__DragonFly__)
+  #include <sys/param.h>
+  #if __FreeBSD_version >= 1200000
+  #include <sys/cpuset.h>
+  #include <sys/domainset.h>
+  #endif
+  #include <sys/sysctl.h>
+#endif
+
+#if (defined(__linux__) && !defined(__ANDROID__)) || defined(__FreeBSD__)
+  #define MI_HAS_SYSCALL_H
+  #include <sys/syscall.h>
+#endif
+
+#if !defined(MADV_DONTNEED) && defined(POSIX_MADV_DONTNEED)  // QNX
+#define MADV_DONTNEED  POSIX_MADV_DONTNEED
+#endif
+#if !defined(MADV_FREE) && defined(POSIX_MADV_FREE)  // QNX
+#define MADV_FREE  POSIX_MADV_FREE
+#endif
+
+#define MI_UNIX_LARGE_PAGE_SIZE (2*MI_MiB) // TODO: can we query the OS for this?
+
+//------------------------------------------------------------------------------------
+// Use syscalls for some primitives to allow for libraries that override open/read/close etc.
+// and do allocation themselves; using syscalls prevents recursion when mimalloc is
+// still initializing (issue #713)
+// Declare inline to avoid unused function warnings.
+//------------------------------------------------------------------------------------
+
+#if defined(MI_HAS_SYSCALL_H) && defined(SYS_open) && defined(SYS_close) && defined(SYS_read) && defined(SYS_access)
+
+static inline int mi_prim_open(const char* fpath, int open_flags) {
+  return syscall(SYS_open,fpath,open_flags,0);
+}
+static inline ssize_t mi_prim_read(int fd, void* buf, size_t bufsize) {
+  return syscall(SYS_read,fd,buf,bufsize);
+}
+static inline int mi_prim_close(int fd) {
+  return syscall(SYS_close,fd);
+}
+static inline int mi_prim_access(const char *fpath, int mode) {
+  return syscall(SYS_access,fpath,mode);
+}
+
+#else
+
+static inline int mi_prim_open(const char* fpath, int open_flags) {
+  return open(fpath,open_flags);
+}
+static inline ssize_t mi_prim_read(int fd, void* buf, size_t bufsize) {
+  return read(fd,buf,bufsize);
+}
+static inline int mi_prim_close(int fd) {
+  return close(fd);
+}
+static inline int mi_prim_access(const char *fpath, int mode) {
+  return access(fpath,mode);
+}
+
+#endif
+
+
+
+//---------------------------------------------
+// init
+//---------------------------------------------
+
+static bool unix_detect_overcommit(void) {
+  bool os_overcommit = true;
+  #if defined(__linux__)
+    int fd = mi_prim_open("/proc/sys/vm/overcommit_memory", O_RDONLY);
+    if (fd >= 0) {
+      char buf[32];
+      ssize_t nread = mi_prim_read(fd, &buf, sizeof(buf));
+      mi_prim_close(fd);
+      // <https://www.kernel.org/doc/Documentation/vm/overcommit-accounting>
+      // 0: heuristic overcommit, 1: always overcommit, 2: never overcommit (ignore NORESERVE)
+      if (nread >= 1) {
+        os_overcommit = (buf[0] == '0' || buf[0] == '1');
+      }
+    }
+  #elif defined(__FreeBSD__)
+    int val = 0;
+    size_t olen = sizeof(val);
+    if (sysctlbyname("vm.overcommit", &val, &olen, NULL, 0) == 0) {
+      os_overcommit = (val != 0);
+    }
+  #else
+    // default: overcommit is true
+  #endif
+  return os_overcommit;
+}
+
+// try to detect the physical memory dynamically (if possible)
+static void unix_detect_physical_memory( size_t page_size, size_t* physical_memory_in_kib ) {
+  #if defined(CTL_HW) && (defined(HW_PHYSMEM64) || defined(HW_MEMSIZE))  // freeBSD, macOS
+    MI_UNUSED(page_size);
+    int64_t physical_memory = 0;
+    size_t length = sizeof(int64_t);
+    #if defined(HW_PHYSMEM64)
+    int mib[2] = { CTL_HW, HW_PHYSMEM64 };
+    #else
+    int mib[2] = { CTL_HW, HW_MEMSIZE };
+    #endif
+    const int err = sysctl(mib, 2, &physical_memory, &length, NULL, 0);
+    if (err==0 && physical_memory > 0) {
+      const int64_t phys_in_kib = physical_memory / MI_KiB;
+      if (phys_in_kib > 0 && (uint64_t)phys_in_kib <= SIZE_MAX) {
+        *physical_memory_in_kib = (size_t)phys_in_kib;
+      }
+    }
+  #elif defined(__linux__)
+    MI_UNUSED(page_size);
+    struct sysinfo info; _mi_memzero_var(info);
+    const int err = sysinfo(&info);
+    if (err==0 && info.totalram > 0 && info.totalram <= SIZE_MAX) {
+      *physical_memory_in_kib = (size_t)info.totalram / MI_KiB;
+    }
+  #elif defined(_SC_PHYS_PAGES)  // do not use by default as it might cause allocation (by using `fopen` to parse /proc/meminfo) (issue #1100)
+    const long pphys = sysconf(_SC_PHYS_PAGES);
+    const size_t psize_in_kib = page_size / MI_KiB;
+    if (psize_in_kib > 0 && pphys > 0 && (unsigned long)pphys <= SIZE_MAX && (size_t)pphys <= (SIZE_MAX/psize_in_kib)) {
+      *physical_memory_in_kib = (size_t)pphys * psize_in_kib;
+    }
+  #endif
+}
+
+void _mi_prim_mem_init( mi_os_mem_config_t* config )
+{
+  long psize = sysconf(_SC_PAGESIZE);
+  if (psize > 0 && (unsigned long)psize < SIZE_MAX) {
+    config->page_size = (size_t)psize;
+    config->alloc_granularity = (size_t)psize;
+    unix_detect_physical_memory(config->page_size, &config->physical_memory_in_kib);
+  }
+  config->large_page_size = MI_UNIX_LARGE_PAGE_SIZE;
+  config->has_overcommit = unix_detect_overcommit();
+  config->has_partial_free = true;    // mmap can free in parts
+  config->has_virtual_reserve = true; // todo: check if this true for NetBSD?  (for anonymous mmap with PROT_NONE)
+
+  // disable transparent huge pages for this process?
+  #if (defined(__linux__) || defined(__ANDROID__)) && defined(PR_GET_THP_DISABLE)
+  #if defined(MI_NO_THP)
+  if (true)
+  #else
+  if (!mi_option_is_enabled(mi_option_allow_large_os_pages)) // disable THP also if large OS pages are not allowed in the options
+  #endif
+  {
+    int val = 0;
+    if (prctl(PR_GET_THP_DISABLE, &val, 0, 0, 0) != 0) {
+      // Most likely since distros often come with always/madvise settings.
+      val = 1;
+      // Disabling only for mimalloc process rather than touching system wide settings
+      (void)prctl(PR_SET_THP_DISABLE, &val, 0, 0, 0);
+    }
+  }
+  #endif
+}
+
+
+//---------------------------------------------
+// free
+//---------------------------------------------
+
+int _mi_prim_free(void* addr, size_t size ) {
+  if (size==0) return 0;
+  bool err = (munmap(addr, size) == -1);
+  return (err ? errno : 0);
+}
+
+
+//---------------------------------------------
+// mmap
+//---------------------------------------------
+
+static int unix_madvise(void* addr, size_t size, int advice) {
+  #if defined(__sun)
+  int res = madvise((caddr_t)addr, size, advice);  // Solaris needs cast (issue #520)
+  #elif defined(__QNX__)
+  int res = posix_madvise(addr, size, advice);
+  #else
+  int res = madvise(addr, size, advice);
+  #endif
+  return (res==0 ? 0 : errno);
+}
+
+static void* unix_mmap_prim(void* addr, size_t size, int protect_flags, int flags, int fd) {
+  void* p = mmap(addr, size, protect_flags, flags, fd, 0 /* offset */);
+  #if defined(__linux__) && defined(PR_SET_VMA)
+  if (p!=MAP_FAILED && p!=NULL) {
+    prctl(PR_SET_VMA, PR_SET_VMA_ANON_NAME, p, size, "mimalloc");
+  }
+  #endif
+  return p;
+}
+
+static void* unix_mmap_prim_aligned(void* addr, size_t size, size_t try_alignment, int protect_flags, int flags, int fd) {
+  MI_UNUSED(try_alignment);
+  void* p = NULL;
+  #if defined(MAP_ALIGNED)  // BSD
+  if (addr == NULL && try_alignment > 1 && (try_alignment % _mi_os_page_size()) == 0) {
+    size_t n = 0;
+    mi_bsr(try_alignment, &n);
+    if (((size_t)1 << n) == try_alignment && n >= 12 && n <= 30) {  // alignment is a power of 2 and 4096 <= alignment <= 1GiB
+      p = unix_mmap_prim(addr, size, protect_flags, flags | MAP_ALIGNED(n), fd);
+      if (p==MAP_FAILED || !_mi_is_aligned(p,try_alignment)) {
+        int err = errno;
+        _mi_trace_message("unable to directly request aligned OS memory (error: %d (0x%x), size: 0x%zx bytes, alignment: 0x%zx, hint address: %p)\n", err, err, size, try_alignment, addr);
+      }
+      if (p!=MAP_FAILED) return p;
+      // fall back to regular mmap
+    }
+  }
+  #elif defined(MAP_ALIGN)  // Solaris
+  if (addr == NULL && try_alignment > 1 && (try_alignment % _mi_os_page_size()) == 0) {
+    p = unix_mmap_prim((void*)try_alignment, size, protect_flags, flags | MAP_ALIGN, fd);  // addr parameter is the required alignment
+    if (p!=MAP_FAILED) return p;
+    // fall back to regular mmap
+  }
+  #endif
+  #if (MI_INTPTR_SIZE >= 8) && !defined(MAP_ALIGNED)
+  // on 64-bit systems, use the virtual address area after 2TiB for 4MiB aligned allocations
+  if (addr == NULL) {
+    void* hint = _mi_os_get_aligned_hint(try_alignment, size);
+    if (hint != NULL) {
+      p = unix_mmap_prim(hint, size, protect_flags, flags, fd);
+      if (p==MAP_FAILED || !_mi_is_aligned(p,try_alignment)) {
+        #if MI_TRACK_ENABLED  // asan sometimes does not instrument errno correctly?
+        int err = 0;
+        #else
+        int err = errno;
+        #endif
+        _mi_trace_message("unable to directly request hinted aligned OS memory (error: %d (0x%x), size: 0x%zx bytes, alignment: 0x%zx, hint address: %p)\n", err, err, size, try_alignment, hint);
+      }
+      if (p!=MAP_FAILED) return p;
+      // fall back to regular mmap
+    }
+  }
+  #endif
+  // regular mmap
+  p = unix_mmap_prim(addr, size, protect_flags, flags, fd);
+  if (p!=MAP_FAILED) return p;
+  // failed to allocate
+  return NULL;
+}
+
+static int unix_mmap_fd(void) {
+  #if defined(VM_MAKE_TAG)
+  // macOS: tracking anonymous page with a specific ID. (All up to 98 are taken officially but LLVM sanitizers had taken 99)
+  int os_tag = (int)mi_option_get(mi_option_os_tag);
+  if (os_tag < 100 || os_tag > 255) { os_tag = 254; }
+  return VM_MAKE_TAG(os_tag);
+  #else
+  return -1;
+  #endif
+}
+
+static void* unix_mmap(void* addr, size_t size, size_t try_alignment, int protect_flags, bool large_only, bool allow_large, bool* is_large) {
+  #if !defined(MAP_ANONYMOUS)
+  #define MAP_ANONYMOUS  MAP_ANON
+  #endif
+  #if !defined(MAP_NORESERVE)
+  #define MAP_NORESERVE  0
+  #endif
+  void* p = NULL;
+  const int fd = unix_mmap_fd();
+  int flags = MAP_PRIVATE | MAP_ANONYMOUS;
+  if (_mi_os_has_overcommit()) {
+    flags |= MAP_NORESERVE;
+  }
+  #if defined(PROT_MAX)
+  protect_flags |= PROT_MAX(PROT_READ | PROT_WRITE); // BSD
+  #endif
+  // huge page allocation
+  if (allow_large && (large_only || (_mi_os_use_large_page(size, try_alignment) && mi_option_get(mi_option_allow_large_os_pages) == 1))) {
+    static _Atomic(size_t) large_page_try_ok; // = 0;
+    size_t try_ok = mi_atomic_load_acquire(&large_page_try_ok);
+    if (!large_only && try_ok > 0) {
+      // If the OS is not configured for large OS pages, or the user does not have
+      // enough permission, the `mmap` will always fail (but it might also fail for other reasons).
+      // Therefore, once a large page allocation failed, we don't try again for `large_page_try_ok` times
+      // to avoid too many failing calls to mmap.
+      mi_atomic_cas_strong_acq_rel(&large_page_try_ok, &try_ok, try_ok - 1);
+    }
+    else {
+      int lflags = flags & ~MAP_NORESERVE;  // using NORESERVE on huge pages seems to fail on Linux
+      int lfd = fd;
+      #ifdef MAP_ALIGNED_SUPER
+      lflags |= MAP_ALIGNED_SUPER;
+      #endif
+      #ifdef MAP_HUGETLB
+      lflags |= MAP_HUGETLB;
+      #endif
+      #ifdef MAP_HUGE_1GB
+      static bool mi_huge_pages_available = true;
+      if (large_only && (size % MI_GiB) == 0 && mi_huge_pages_available) {
+        lflags |= MAP_HUGE_1GB;
+      }
+      else
+      #endif
+      {
+        #ifdef MAP_HUGE_2MB
+        lflags |= MAP_HUGE_2MB;
+        #endif
+      }
+      #ifdef VM_FLAGS_SUPERPAGE_SIZE_2MB
+      lfd |= VM_FLAGS_SUPERPAGE_SIZE_2MB;
+      #endif
+      if (large_only || lflags != flags) {
+        // try large OS page allocation
+        *is_large = true;
+        p = unix_mmap_prim_aligned(addr, size, try_alignment, protect_flags, lflags, lfd);
+        #ifdef MAP_HUGE_1GB
+        if (p == NULL && (lflags & MAP_HUGE_1GB) == MAP_HUGE_1GB) {
+          mi_huge_pages_available = false; // don't try huge 1GiB pages again
+          if (large_only) {
+            _mi_warning_message("unable to allocate huge (1GiB) page, trying large (2MiB) pages instead (errno: %i)\n", errno);
+          }
+          lflags = ((lflags & ~MAP_HUGE_1GB) | MAP_HUGE_2MB);
+          p = unix_mmap_prim_aligned(addr, size, try_alignment, protect_flags, lflags, lfd);
+        }
+        #endif
+        if (large_only) return p;
+        if (p == NULL) {
+          mi_atomic_store_release(&large_page_try_ok, (size_t)8);  // on error, don't try again for the next N allocations
+        }
+      }
+    }
+  }
+  // regular allocation
+  if (p == NULL) {
+    *is_large = false;
+    p = unix_mmap_prim_aligned(addr, size, try_alignment, protect_flags, flags, fd);
+    if (p != NULL) {
+      #if defined(MADV_HUGEPAGE)
+      // Many Linux systems don't allow MAP_HUGETLB but they support instead
+      // transparent huge pages (THP). Generally, it is not required to call `madvise` with MADV_HUGE
+      // though since properly aligned allocations will already use large pages if available
+      // in that case -- in particular for our large regions (in `memory.c`).
+      // However, some systems only allow THP if called with explicit `madvise`, so
+      // when large OS pages are enabled for mimalloc, we call `madvise` anyways.
+      if (allow_large && _mi_os_use_large_page(size, try_alignment)) {
+        if (unix_madvise(p, size, MADV_HUGEPAGE) == 0) {
+          // *is_large = true; // possibly
+        };
+      }
+      #elif defined(__sun)
+      if (allow_large && _mi_os_use_large_page(size, try_alignment)) {
+        struct memcntl_mha cmd = {0};
+        cmd.mha_pagesize = _mi_os_large_page_size();
+        cmd.mha_cmd = MHA_MAPSIZE_VA;
+        if (memcntl((caddr_t)p, size, MC_HAT_ADVISE, (caddr_t)&cmd, 0, 0) == 0) {
+          // *is_large = true; // possibly
+        }
+      }
+      #endif
+    }
+  }
+  return p;
+}
+
+// Note: the `try_alignment` is just a hint and the returned pointer is not guaranteed to be aligned.
+int _mi_prim_alloc(void* hint_addr, size_t size, size_t try_alignment, bool commit, bool allow_large, bool* is_large, bool* is_zero, void** addr) {
+  mi_assert_internal(size > 0 && (size % _mi_os_page_size()) == 0);
+  mi_assert_internal(commit || !allow_large);
+  mi_assert_internal(try_alignment > 0);
+  if (hint_addr == NULL && size >= 8*MI_UNIX_LARGE_PAGE_SIZE && try_alignment > 1 && _mi_is_power_of_two(try_alignment) && try_alignment < MI_UNIX_LARGE_PAGE_SIZE) {
+    try_alignment = MI_UNIX_LARGE_PAGE_SIZE; // try to align along large page size for larger allocations
+  }
+
+  *is_zero = true;
+  int protect_flags = (commit ? (PROT_WRITE | PROT_READ) : PROT_NONE);
+  *addr = unix_mmap(hint_addr, size, try_alignment, protect_flags, false, allow_large, is_large);
+  return (*addr != NULL ? 0 : errno);
+}
+
+
+//---------------------------------------------
+// Commit/Reset
+//---------------------------------------------
+
+static void unix_mprotect_hint(int err) {
+  #if defined(__linux__) && (MI_SECURE>=2) // guard page around every mimalloc page
+  if (err == ENOMEM) {
+    _mi_warning_message("The next warning may be caused by a low memory map limit.\n"
+                        "  On Linux this is controlled by the vm.max_map_count -- maybe increase it?\n"
+                        "  For example: sudo sysctl -w vm.max_map_count=262144\n");
+  }
+  #else
+  MI_UNUSED(err);
+  #endif
+}
+
+
+
+
+
+int _mi_prim_commit(void* start, size_t size, bool* is_zero) {
+  // commit: ensure we can access the area
+  // note: we may think that *is_zero can be true since the memory
+  // was either from mmap PROT_NONE, or from decommit MADV_DONTNEED, but
+  // we sometimes call commit on a range with still partially committed
+  // memory and `mprotect` does not zero the range.
+  *is_zero = false;
+  int err = mprotect(start, size, (PROT_READ | PROT_WRITE));
+  if (err != 0) {
+    err = errno;
+    unix_mprotect_hint(err);
+  }
+  return err;
+}
+
+int _mi_prim_reuse(void* start, size_t size) {
+  MI_UNUSED(start); MI_UNUSED(size);
+  #if defined(__APPLE__) && defined(MADV_FREE_REUSE)
+  return unix_madvise(start, size, MADV_FREE_REUSE);
+  #endif
+  return 0;
+}
+
+int _mi_prim_decommit(void* start, size_t size, bool* needs_recommit) {
+  int err = 0;
+  #if defined(__APPLE__) && defined(MADV_FREE_REUSABLE)
+    // decommit on macOS: use MADV_FREE_REUSABLE as it does immediate rss accounting (issue #1097)
+    err = unix_madvise(start, size, MADV_FREE_REUSABLE);
+    if (err) { err = unix_madvise(start, size, MADV_DONTNEED); }
+  #else
+    // decommit: use MADV_DONTNEED as it decreases rss immediately (unlike MADV_FREE)
+    err = unix_madvise(start, size, MADV_DONTNEED);
+  #endif
+  #if !MI_DEBUG && MI_SECURE<=2
+    *needs_recommit = false;
+  #else
+    *needs_recommit = true;
+    mprotect(start, size, PROT_NONE);
+  #endif
+  /*
+  // decommit: use mmap with MAP_FIXED and PROT_NONE to discard the existing memory (and reduce rss)
+  *needs_recommit = true;
+  const int fd = unix_mmap_fd();
+  void* p = mmap(start, size, PROT_NONE, (MAP_FIXED | MAP_PRIVATE | MAP_ANONYMOUS | MAP_NORESERVE), fd, 0);
+  if (p != start) { err = errno; }
+  */
+  return err;
+}
+
+int _mi_prim_reset(void* start, size_t size) {
+  int err = 0;
+
+  // on macOS can use MADV_FREE_REUSABLE (but we disable this for now as it seems slower)
+  #if 0 && defined(__APPLE__) && defined(MADV_FREE_REUSABLE)
+  err = unix_madvise(start, size, MADV_FREE_REUSABLE);
+  if (err==0) return 0;
+  // fall through
+  #endif
+
+  #if defined(MADV_FREE)
+  // Otherwise, we try to use `MADV_FREE` as that is the fastest. A drawback though is that it
+  // will not reduce the `rss` stats in tools like `top` even though the memory is available
+  // to other processes. With the default `MIMALLOC_PURGE_DECOMMITS=1` we ensure that by
+  // default `MADV_DONTNEED` is used though.
+  static _Atomic(size_t) advice = MI_ATOMIC_VAR_INIT(MADV_FREE);
+  int oadvice = (int)mi_atomic_load_relaxed(&advice);
+  while ((err = unix_madvise(start, size, oadvice)) != 0 && errno == EAGAIN) { errno = 0;  };
+  if (err != 0 && errno == EINVAL && oadvice == MADV_FREE) {
+    // if MADV_FREE is not supported, fall back to MADV_DONTNEED from now on
+    mi_atomic_store_release(&advice, (size_t)MADV_DONTNEED);
+    err = unix_madvise(start, size, MADV_DONTNEED);
+  }
+  #else
+  err = unix_madvise(start, size, MADV_DONTNEED);
+  #endif
+  return err;
+}
+
+int _mi_prim_protect(void* start, size_t size, bool protect) {
+  int err = mprotect(start, size, protect ? PROT_NONE : (PROT_READ | PROT_WRITE));
+  if (err != 0) { err = errno; }
+  unix_mprotect_hint(err);
+  return err;
+}
+
+
+
+//---------------------------------------------
+// Huge page allocation
+//---------------------------------------------
+
+#if (MI_INTPTR_SIZE >= 8) && !defined(__HAIKU__) && !defined(__CYGWIN__)
+
+#ifndef MPOL_PREFERRED
+#define MPOL_PREFERRED 1
+#endif
+
+#if defined(MI_HAS_SYSCALL_H) && defined(SYS_mbind)
+static long mi_prim_mbind(void* start, unsigned long len, unsigned long mode, const unsigned long* nmask, unsigned long maxnode, unsigned flags) {
+  return syscall(SYS_mbind, start, len, mode, nmask, maxnode, flags);
+}
+#else
+static long mi_prim_mbind(void* start, unsigned long len, unsigned long mode, const unsigned long* nmask, unsigned long maxnode, unsigned flags) {
+  MI_UNUSED(start); MI_UNUSED(len); MI_UNUSED(mode); MI_UNUSED(nmask); MI_UNUSED(maxnode); MI_UNUSED(flags);
+  return 0;
+}
+#endif
+
+int _mi_prim_alloc_huge_os_pages(void* hint_addr, size_t size, int numa_node, bool* is_zero, void** addr) {
+  bool is_large = true;
+  *is_zero = true;
+  *addr = unix_mmap(hint_addr, size, MI_ARENA_SLICE_ALIGN, PROT_READ | PROT_WRITE, true, true, &is_large);
+  if (*addr != NULL && numa_node >= 0 && numa_node < 8*MI_INTPTR_SIZE) { // at most 64 nodes
+    unsigned long numa_mask = (1UL << numa_node);
+    // TODO: does `mbind` work correctly for huge OS pages? should we
+    // use `set_mempolicy` before calling mmap instead?
+    // see: <https://lkml.org/lkml/2017/2/9/875>
+    long err = mi_prim_mbind(*addr, size, MPOL_PREFERRED, &numa_mask, 8*MI_INTPTR_SIZE, 0);
+    if (err != 0) {
+      err = errno;
+      _mi_warning_message("failed to bind huge (1GiB) pages to numa node %d (error: %d (0x%x))\n", numa_node, err, err);
+    }
+  }
+  return (*addr != NULL ? 0 : errno);
+}
+
+#else
+
+int _mi_prim_alloc_huge_os_pages(void* hint_addr, size_t size, int numa_node, bool* is_zero, void** addr) {
+  MI_UNUSED(hint_addr); MI_UNUSED(size); MI_UNUSED(numa_node);
+  *is_zero = false;
+  *addr = NULL;
+  return ENOMEM;
+}
+
+#endif
+
+//---------------------------------------------
+// NUMA nodes
+//---------------------------------------------
+
+#if defined(__linux__)
+
+size_t _mi_prim_numa_node(void) {
+  #if defined(MI_HAS_SYSCALL_H) && defined(SYS_getcpu)
+    unsigned long node = 0;
+    unsigned long ncpu = 0;
+    long err = syscall(SYS_getcpu, &ncpu, &node, NULL);
+    if (err != 0) return 0;
+    return node;
+  #else
+    return 0;
+  #endif
+}
+
+size_t _mi_prim_numa_node_count(void) {
+  char buf[128];
+  unsigned node = 0;
+  for(node = 0; node < 256; node++) {
+    // enumerate node entries -- todo: it there a more efficient way to do this? (but ensure there is no allocation)
+    _mi_snprintf(buf, 127, "/sys/devices/system/node/node%u", node + 1);
+    if (mi_prim_access(buf,R_OK) != 0) break;
+  }
+  return (node+1);
+}
+
+#elif defined(__FreeBSD__) && __FreeBSD_version >= 1200000
+
+size_t _mi_prim_numa_node(void) {
+  domainset_t dom;
+  size_t node;
+  int policy;
+  if (cpuset_getdomain(CPU_LEVEL_CPUSET, CPU_WHICH_PID, -1, sizeof(dom), &dom, &policy) == -1) return 0ul;
+  for (node = 0; node < MAXMEMDOM; node++) {
+    if (DOMAINSET_ISSET(node, &dom)) return node;
+  }
+  return 0ul;
+}
+
+size_t _mi_prim_numa_node_count(void) {
+  size_t ndomains = 0;
+  size_t len = sizeof(ndomains);
+  if (sysctlbyname("vm.ndomains", &ndomains, &len, NULL, 0) == -1) return 0ul;
+  return ndomains;
+}
+
+#elif defined(__DragonFly__)
+
+size_t _mi_prim_numa_node(void) {
+  // TODO: DragonFly does not seem to provide any userland means to get this information.
+  return 0ul;
+}
+
+size_t _mi_prim_numa_node_count(void) {
+  size_t ncpus = 0, nvirtcoresperphys = 0;
+  size_t len = sizeof(size_t);
+  if (sysctlbyname("hw.ncpu", &ncpus, &len, NULL, 0) == -1) return 0ul;
+  if (sysctlbyname("hw.cpu_topology_ht_ids", &nvirtcoresperphys, &len, NULL, 0) == -1) return 0ul;
+  return nvirtcoresperphys * ncpus;
+}
+
+#else
+
+size_t _mi_prim_numa_node(void) {
+  return 0;
+}
+
+size_t _mi_prim_numa_node_count(void) {
+  return 1;
+}
+
+#endif
+
+// ----------------------------------------------------------------
+// Clock
+// ----------------------------------------------------------------
+
+#include <time.h>
+
+#if defined(CLOCK_REALTIME) || defined(CLOCK_MONOTONIC)
+
+mi_msecs_t _mi_prim_clock_now(void) {
+  struct timespec t;
+  #ifdef CLOCK_MONOTONIC
+  clock_gettime(CLOCK_MONOTONIC, &t);
+  #else
+  clock_gettime(CLOCK_REALTIME, &t);
+  #endif
+  return ((mi_msecs_t)t.tv_sec * 1000) + ((mi_msecs_t)t.tv_nsec / 1000000);
+}
+
+#else
+
+// low resolution timer
+mi_msecs_t _mi_prim_clock_now(void) {
+  #if !defined(CLOCKS_PER_SEC) || (CLOCKS_PER_SEC == 1000) || (CLOCKS_PER_SEC == 0)
+  return (mi_msecs_t)clock();
+  #elif (CLOCKS_PER_SEC < 1000)
+  return (mi_msecs_t)clock() * (1000 / (mi_msecs_t)CLOCKS_PER_SEC);
+  #else
+  return (mi_msecs_t)clock() / ((mi_msecs_t)CLOCKS_PER_SEC / 1000);
+  #endif
+}
+
+#endif
+
+
+
+
+//----------------------------------------------------------------
+// Process info
+//----------------------------------------------------------------
+
+#if defined(__unix__) || defined(__unix) || defined(unix) || defined(__APPLE__) || defined(__HAIKU__)
+#include <stdio.h>
+#include <unistd.h>
+#include <sys/resource.h>
+
+#if defined(__APPLE__)
+#include <mach/mach.h>
+#endif
+
+#if defined(__HAIKU__)
+#include <kernel/OS.h>
+#endif
+
+static mi_msecs_t timeval_secs(const struct timeval* tv) {
+  return ((mi_msecs_t)tv->tv_sec * 1000L) + ((mi_msecs_t)tv->tv_usec / 1000L);
+}
+
+void _mi_prim_process_info(mi_process_info_t* pinfo)
+{
+  struct rusage rusage;
+  getrusage(RUSAGE_SELF, &rusage);
+  pinfo->utime = timeval_secs(&rusage.ru_utime);
+  pinfo->stime = timeval_secs(&rusage.ru_stime);
+#if !defined(__HAIKU__)
+  pinfo->page_faults = rusage.ru_majflt;
+#endif
+#if defined(__HAIKU__)
+  // Haiku does not have (yet?) a way to
+  // get these stats per process
+  thread_info tid;
+  area_info mem;
+  ssize_t c;
+  get_thread_info(find_thread(0), &tid);
+  while (get_next_area_info(tid.team, &c, &mem) == B_OK) {
+    pinfo->peak_rss += mem.ram_size;
+  }
+  pinfo->page_faults = 0;
+#elif defined(__APPLE__)
+  pinfo->peak_rss = rusage.ru_maxrss;         // macos reports in bytes
+  #ifdef MACH_TASK_BASIC_INFO
+  struct mach_task_basic_info info;
+  mach_msg_type_number_t infoCount = MACH_TASK_BASIC_INFO_COUNT;
+  if (task_info(mach_task_self(), MACH_TASK_BASIC_INFO, (task_info_t)&info, &infoCount) == KERN_SUCCESS) {
+    pinfo->current_rss = (size_t)info.resident_size;
+  }
+  #else
+  struct task_basic_info info;
+  mach_msg_type_number_t infoCount = TASK_BASIC_INFO_COUNT;
+  if (task_info(mach_task_self(), TASK_BASIC_INFO, (task_info_t)&info, &infoCount) == KERN_SUCCESS) {
+    pinfo->current_rss = (size_t)info.resident_size;
+  }
+  #endif
+#else
+  pinfo->peak_rss = rusage.ru_maxrss * 1024;  // Linux/BSD report in KiB
+#endif
+  // use defaults for commit
+}
+
+#else
+
+#ifndef __wasi__
+// WebAssembly instances are not processes
+#pragma message("define a way to get process info")
+#endif
+
+void _mi_prim_process_info(mi_process_info_t* pinfo)
+{
+  // use defaults
+  MI_UNUSED(pinfo);
+}
+
+#endif
+
+
+//----------------------------------------------------------------
+// Output
+//----------------------------------------------------------------
+
+void _mi_prim_out_stderr( const char* msg ) {
+  fputs(msg,stderr);
+}
+
+
+//----------------------------------------------------------------
+// Environment
+//----------------------------------------------------------------
+
+#if !defined(MI_USE_ENVIRON) || (MI_USE_ENVIRON!=0)
+// On Posix systemsr use `environ` to access environment variables
+// even before the C runtime is initialized.
+#if defined(__APPLE__) && defined(__has_include) && __has_include(<crt_externs.h>)
+#include <crt_externs.h>
+static char** mi_get_environ(void) {
+  return (*_NSGetEnviron());
+}
+#else
+extern char** environ;
+static char** mi_get_environ(void) {
+  return environ;
+}
+#endif
+bool _mi_prim_getenv(const char* name, char* result, size_t result_size) {
+  if (name==NULL) return false;
+  const size_t len = _mi_strlen(name);
+  if (len == 0) return false;
+  char** env = mi_get_environ();
+  if (env == NULL) return false;
+  // compare up to 10000 entries
+  for (int i = 0; i < 10000 && env[i] != NULL; i++) {
+    const char* s = env[i];
+    if (_mi_strnicmp(name, s, len) == 0 && s[len] == '=') { // case insensitive
+      // found it
+      _mi_strlcpy(result, s + len + 1, result_size);
+      return true;
+    }
+  }
+  return false;
+}
+#else
+// fallback: use standard C `getenv` but this cannot be used while initializing the C runtime
+bool _mi_prim_getenv(const char* name, char* result, size_t result_size) {
+  // cannot call getenv() when still initializing the C runtime.
+  if (_mi_preloading()) return false;
+  const char* s = getenv(name);
+  if (s == NULL) {
+    // we check the upper case name too.
+    char buf[64+1];
+    size_t len = _mi_strnlen(name,sizeof(buf)-1);
+    for (size_t i = 0; i < len; i++) {
+      buf[i] = _mi_toupper(name[i]);
+    }
+    buf[len] = 0;
+    s = getenv(buf);
+  }
+  if (s == NULL || _mi_strnlen(s,result_size) >= result_size)  return false;
+  _mi_strlcpy(result, s, result_size);
+  return true;
+}
+#endif  // !MI_USE_ENVIRON
+
+
+//----------------------------------------------------------------
+// Random
+//----------------------------------------------------------------
+
+#if defined(__APPLE__) && defined(MAC_OS_X_VERSION_10_15) && (MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_15)
+#include <CommonCrypto/CommonCryptoError.h>
+#include <CommonCrypto/CommonRandom.h>
+
+bool _mi_prim_random_buf(void* buf, size_t buf_len) {
+  // We prefer CCRandomGenerateBytes as it returns an error code while arc4random_buf
+  // may fail silently on macOS. See PR #390, and <https://opensource.apple.com/source/Libc/Libc-1439.40.11/gen/FreeBSD/arc4random.c.auto.html>
+  return (CCRandomGenerateBytes(buf, buf_len) == kCCSuccess);
+}
+
+#elif defined(__ANDROID__) || defined(__DragonFly__) || \
+      defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || \
+      defined(__sun) || \
+      (defined(__APPLE__) && (MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_7))
+
+bool _mi_prim_random_buf(void* buf, size_t buf_len) {
+  arc4random_buf(buf, buf_len);
+  return true;
+}
+
+#elif defined(__APPLE__) || defined(__linux__) || defined(__HAIKU__)   // also for old apple versions < 10.7 (issue #829)
+
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <errno.h>
+
+bool _mi_prim_random_buf(void* buf, size_t buf_len) {
+  // Modern Linux provides `getrandom` but different distributions either use `sys/random.h` or `linux/random.h`
+  // and for the latter the actual `getrandom` call is not always defined.
+  // (see <https://stackoverflow.com/questions/45237324/why-doesnt-getrandom-compile>)
+  // We therefore use a syscall directly and fall back dynamically to /dev/urandom when needed.
+  #if defined(MI_HAS_SYSCALL_H) && defined(SYS_getrandom)
+    #ifndef GRND_NONBLOCK
+    #define GRND_NONBLOCK (1)
+    #endif
+    static _Atomic(uintptr_t) no_getrandom; // = 0
+    if (mi_atomic_load_acquire(&no_getrandom)==0) {
+      ssize_t ret = syscall(SYS_getrandom, buf, buf_len, GRND_NONBLOCK);
+      if (ret >= 0) return (buf_len == (size_t)ret);
+      if (errno != ENOSYS) return false;
+      mi_atomic_store_release(&no_getrandom, (uintptr_t)1); // don't call again, and fall back to /dev/urandom
+    }
+  #endif
+  int flags = O_RDONLY;
+  #if defined(O_CLOEXEC)
+  flags |= O_CLOEXEC;
+  #endif
+  int fd = mi_prim_open("/dev/urandom", flags);
+  if (fd < 0) return false;
+  size_t count = 0;
+  while(count < buf_len) {
+    ssize_t ret = mi_prim_read(fd, (char*)buf + count, buf_len - count);
+    if (ret<=0) {
+      if (errno!=EAGAIN && errno!=EINTR) break;
+    }
+    else {
+      count += ret;
+    }
+  }
+  mi_prim_close(fd);
+  return (count==buf_len);
+}
+
+#else
+
+bool _mi_prim_random_buf(void* buf, size_t buf_len) {
+  return false;
+}
+
+#endif
+
+
+//----------------------------------------------------------------
+// Thread init/done
+//----------------------------------------------------------------
+
+#if defined(MI_USE_PTHREADS)
+
+// use pthread local storage keys to detect thread ending
+// (and used with MI_TLS_PTHREADS for the default heap)
+pthread_key_t _mi_heap_default_key = (pthread_key_t)(-1);
+
+static void mi_pthread_done(void* value) {
+  if (value!=NULL) {
+    _mi_thread_done((mi_heap_t*)value);
+  }
+}
+
+void _mi_prim_thread_init_auto_done(void) {
+  mi_assert_internal(_mi_heap_default_key == (pthread_key_t)(-1));
+  pthread_key_create(&_mi_heap_default_key, &mi_pthread_done);
+}
+
+void _mi_prim_thread_done_auto_done(void) {
+  if (_mi_heap_default_key != (pthread_key_t)(-1)) {  // do not leak the key, see issue #809
+    pthread_key_delete(_mi_heap_default_key);
+  }
+}
+
+void _mi_prim_thread_associate_default_heap(mi_heap_t* heap) {
+  if (_mi_heap_default_key != (pthread_key_t)(-1)) {  // can happen during recursive invocation on freeBSD
+    pthread_setspecific(_mi_heap_default_key, heap);
+  }
+}
+
+#else
+
+void _mi_prim_thread_init_auto_done(void) {
+  // nothing
+}
+
+void _mi_prim_thread_done_auto_done(void) {
+  // nothing
+}
+
+void _mi_prim_thread_associate_default_heap(mi_heap_t* heap) {
+  MI_UNUSED(heap);
+}
+
+#endif
+
+bool _mi_prim_thread_is_in_threadpool(void) {
+  return false;
+}
diff --git a/depends/mimalloc/src/prim/wasi/prim.c b/depends/mimalloc/src/prim/wasi/prim.c
new file mode 100644
index 000000000000..1855a7ab3ccf
--- /dev/null
+++ b/depends/mimalloc/src/prim/wasi/prim.c
@@ -0,0 +1,288 @@
+/* ----------------------------------------------------------------------------
+Copyright (c) 2018-2023, Microsoft Research, Daan Leijen
+This is free software; you can redistribute it and/or modify it under the
+terms of the MIT license. A copy of the license can be found in the file
+"LICENSE" at the root of this distribution.
+-----------------------------------------------------------------------------*/
+
+// This file is included in `src/prim/prim.c`
+
+#include "mimalloc.h"
+#include "mimalloc/internal.h"
+#include "mimalloc/prim.h"
+
+#include <stdio.h>   // fputs
+#include <stdlib.h>  // getenv
+
+//---------------------------------------------
+// Initialize
+//---------------------------------------------
+
+void _mi_prim_mem_init( mi_os_mem_config_t* config ) {
+  config->page_size = 64*MI_KiB; // WebAssembly has a fixed page size: 64KiB
+  config->alloc_granularity = 16;
+  config->has_overcommit = false;
+  config->has_partial_free = false;
+  config->has_virtual_reserve = false;
+}
+
+//---------------------------------------------
+// Free
+//---------------------------------------------
+
+int _mi_prim_free(void* addr, size_t size ) {
+  MI_UNUSED(addr); MI_UNUSED(size);
+  // wasi heap cannot be shrunk
+  return 0;
+}
+
+
+//---------------------------------------------
+// Allocation: sbrk or memory_grow
+//---------------------------------------------
+
+#if defined(MI_USE_SBRK)
+  #include <unistd.h>  // for sbrk
+
+  static void* mi_memory_grow( size_t size ) {
+    void* p = sbrk(size);
+    if (p == (void*)(-1)) return NULL;
+    #if !defined(__wasi__) // on wasi this is always zero initialized already (?)
+    memset(p,0,size);
+    #endif
+    return p;
+  }
+#elif defined(__wasi__)
+  static void* mi_memory_grow( size_t size ) {
+    size_t base = (size > 0 ? __builtin_wasm_memory_grow(0,_mi_divide_up(size, _mi_os_page_size()))
+                            : __builtin_wasm_memory_size(0));
+    if (base == SIZE_MAX) return NULL;
+    return (void*)(base * _mi_os_page_size());
+  }
+#endif
+
+#if defined(MI_USE_PTHREADS)
+static pthread_mutex_t mi_heap_grow_mutex = PTHREAD_MUTEX_INITIALIZER;
+#endif
+
+static void* mi_prim_mem_grow(size_t size, size_t try_alignment) {
+  void* p = NULL;
+  if (try_alignment <= 1) {
+    // `sbrk` is not thread safe in general so try to protect it (we could skip this on WASM but leave it in for now)
+    #if defined(MI_USE_PTHREADS)
+    pthread_mutex_lock(&mi_heap_grow_mutex);
+    #endif
+    p = mi_memory_grow(size);
+    #if defined(MI_USE_PTHREADS)
+    pthread_mutex_unlock(&mi_heap_grow_mutex);
+    #endif
+  }
+  else {
+    void* base = NULL;
+    size_t alloc_size = 0;
+    // to allocate aligned use a lock to try to avoid thread interaction
+    // between getting the current size and actual allocation
+    // (also, `sbrk` is not thread safe in general)
+    #if defined(MI_USE_PTHREADS)
+    pthread_mutex_lock(&mi_heap_grow_mutex);
+    #endif
+    {
+      void* current = mi_memory_grow(0);  // get current size
+      if (current != NULL) {
+        void* aligned_current = _mi_align_up_ptr(current, try_alignment);  // and align from there to minimize wasted space
+        alloc_size = _mi_align_up( ((uint8_t*)aligned_current - (uint8_t*)current) + size, _mi_os_page_size());
+        base = mi_memory_grow(alloc_size);
+      }
+    }
+    #if defined(MI_USE_PTHREADS)
+    pthread_mutex_unlock(&mi_heap_grow_mutex);
+    #endif
+    if (base != NULL) {
+      p = _mi_align_up_ptr(base, try_alignment);
+      if ((uint8_t*)p + size > (uint8_t*)base + alloc_size) {
+        // another thread used wasm_memory_grow/sbrk in-between and we do not have enough
+        // space after alignment. Give up (and waste the space as we cannot shrink :-( )
+        // (in `mi_os_mem_alloc_aligned` this will fall back to overallocation to align)
+        p = NULL;
+      }
+    }
+  }
+  /*
+  if (p == NULL) {
+    _mi_warning_message("unable to allocate sbrk/wasm_memory_grow OS memory (%zu bytes, %zu alignment)\n", size, try_alignment);
+    errno = ENOMEM;
+    return NULL;
+  }
+  */
+  mi_assert_internal( p == NULL || try_alignment == 0 || (uintptr_t)p % try_alignment == 0 );
+  return p;
+}
+
+// Note: the `try_alignment` is just a hint and the returned pointer is not guaranteed to be aligned.
+int _mi_prim_alloc(void* hint_addr, size_t size, size_t try_alignment, bool commit, bool allow_large, bool* is_large, bool* is_zero, void** addr) {
+  MI_UNUSED(allow_large); MI_UNUSED(commit); MI_UNUSED(hint_addr);
+  *is_large = false;
+  *is_zero = false;
+  *addr = mi_prim_mem_grow(size, try_alignment);
+  return (*addr != NULL ? 0 : ENOMEM);
+}
+
+
+//---------------------------------------------
+// Commit/Reset/Protect
+//---------------------------------------------
+
+int _mi_prim_commit(void* addr, size_t size, bool* is_zero) {
+  MI_UNUSED(addr); MI_UNUSED(size);
+  *is_zero = false;
+  return 0;
+}
+
+int _mi_prim_decommit(void* addr, size_t size, bool* needs_recommit) {
+  MI_UNUSED(addr); MI_UNUSED(size);
+  *needs_recommit = false;
+  return 0;
+}
+
+int _mi_prim_reset(void* addr, size_t size) {
+  MI_UNUSED(addr); MI_UNUSED(size);
+  return 0;
+}
+
+int _mi_prim_reuse(void* addr, size_t size) {
+  MI_UNUSED(addr); MI_UNUSED(size);
+  return 0;
+}
+
+int _mi_prim_protect(void* addr, size_t size, bool protect) {
+  MI_UNUSED(addr); MI_UNUSED(size); MI_UNUSED(protect);
+  return 0;
+}
+
+
+//---------------------------------------------
+// Huge pages and NUMA nodes
+//---------------------------------------------
+
+int _mi_prim_alloc_huge_os_pages(void* hint_addr, size_t size, int numa_node, bool* is_zero, void** addr) {
+  MI_UNUSED(hint_addr); MI_UNUSED(size); MI_UNUSED(numa_node);
+  *is_zero = true;
+  *addr = NULL;
+  return ENOSYS;
+}
+
+size_t _mi_prim_numa_node(void) {
+  return 0;
+}
+
+size_t _mi_prim_numa_node_count(void) {
+  return 1;
+}
+
+
+//----------------------------------------------------------------
+// Clock
+//----------------------------------------------------------------
+
+#include <time.h>
+
+#if defined(CLOCK_REALTIME) || defined(CLOCK_MONOTONIC)
+
+mi_msecs_t _mi_prim_clock_now(void) {
+  struct timespec t;
+  #ifdef CLOCK_MONOTONIC
+  clock_gettime(CLOCK_MONOTONIC, &t);
+  #else
+  clock_gettime(CLOCK_REALTIME, &t);
+  #endif
+  return ((mi_msecs_t)t.tv_sec * 1000) + ((mi_msecs_t)t.tv_nsec / 1000000);
+}
+
+#else
+
+// low resolution timer
+mi_msecs_t _mi_prim_clock_now(void) {
+  #if !defined(CLOCKS_PER_SEC) || (CLOCKS_PER_SEC == 1000) || (CLOCKS_PER_SEC == 0)
+  return (mi_msecs_t)clock();
+  #elif (CLOCKS_PER_SEC < 1000)
+  return (mi_msecs_t)clock() * (1000 / (mi_msecs_t)CLOCKS_PER_SEC);
+  #else
+  return (mi_msecs_t)clock() / ((mi_msecs_t)CLOCKS_PER_SEC / 1000);
+  #endif
+}
+
+#endif
+
+
+//----------------------------------------------------------------
+// Process info
+//----------------------------------------------------------------
+
+void _mi_prim_process_info(mi_process_info_t* pinfo)
+{
+  // use defaults
+  MI_UNUSED(pinfo);
+}
+
+
+//----------------------------------------------------------------
+// Output
+//----------------------------------------------------------------
+
+void _mi_prim_out_stderr( const char* msg ) {
+  fputs(msg,stderr);
+}
+
+
+//----------------------------------------------------------------
+// Environment
+//----------------------------------------------------------------
+
+bool _mi_prim_getenv(const char* name, char* result, size_t result_size) {
+  // cannot call getenv() when still initializing the C runtime.
+  if (_mi_preloading()) return false;
+  const char* s = getenv(name);
+  if (s == NULL) {
+    // we check the upper case name too.
+    char buf[64+1];
+    size_t len = _mi_strnlen(name,sizeof(buf)-1);
+    for (size_t i = 0; i < len; i++) {
+      buf[i] = _mi_toupper(name[i]);
+    }
+    buf[len] = 0;
+    s = getenv(buf);
+  }
+  if (s == NULL || _mi_strnlen(s,result_size) >= result_size)  return false;
+  _mi_strlcpy(result, s, result_size);
+  return true;
+}
+
+
+//----------------------------------------------------------------
+// Random
+//----------------------------------------------------------------
+
+bool _mi_prim_random_buf(void* buf, size_t buf_len) {
+  return false;
+}
+
+
+//----------------------------------------------------------------
+// Thread init/done
+//----------------------------------------------------------------
+
+void _mi_prim_thread_init_auto_done(void) {
+  // nothing
+}
+
+void _mi_prim_thread_done_auto_done(void) {
+  // nothing
+}
+
+void _mi_prim_thread_associate_default_heap(mi_heap_t* heap) {
+  MI_UNUSED(heap);
+}
+
+bool _mi_prim_thread_is_in_threadpool(void) {
+  return false;
+}
diff --git a/depends/mimalloc/src/prim/windows/etw-mimalloc.wprp b/depends/mimalloc/src/prim/windows/etw-mimalloc.wprp
new file mode 100644
index 000000000000..b00cd7adf228
--- /dev/null
+++ b/depends/mimalloc/src/prim/windows/etw-mimalloc.wprp
@@ -0,0 +1,61 @@
+<WindowsPerformanceRecorder Version="1.0">
+  <Profiles>
+    <SystemCollector Id="WPR_initiated_WprApp_WPR_System_Collector" Name="WPR_initiated_WprApp_WPR System Collector">
+      <BufferSize Value="1024" />
+      <Buffers Value="100" />
+    </SystemCollector>
+    <EventCollector Id="Mimalloc_Collector" Name="Mimalloc Collector">
+      <BufferSize Value="1024" />
+      <Buffers Value="100" />
+    </EventCollector>
+    <SystemProvider Id="WPR_initiated_WprApp_WPR_System_Collector_Provider">
+      <Keywords>
+        <Keyword Value="Loader" />
+      </Keywords>
+    </SystemProvider>
+    <EventProvider Id="MimallocEventProvider" Name="138f4dbb-ee04-4899-aa0a-572ad4475779" NonPagedMemory="true" Stack="true">
+      <EventFilters FilterIn="true">
+        <EventId Value="100" />
+        <EventId Value="101" />
+      </EventFilters>
+    </EventProvider>
+    <Profile Id="CustomHeap.Verbose.File" Name="CustomHeap" Description="RunningProfile:CustomHeap.Verbose.File" LoggingMode="File" DetailLevel="Verbose">
+      <ProblemCategories>
+        <ProblemCategory Value="Resource Analysis" />
+      </ProblemCategories>
+      <Collectors>
+        <SystemCollectorId Value="WPR_initiated_WprApp_WPR_System_Collector">
+          <SystemProviderId Value="WPR_initiated_WprApp_WPR_System_Collector_Provider" />
+        </SystemCollectorId>
+        <EventCollectorId Value="Mimalloc_Collector">
+          <EventProviders>
+            <EventProviderId Value="MimallocEventProvider" >
+              <Keywords>
+                <Keyword Value="100"/>
+                <Keyword Value="101"/>
+              </Keywords>
+            </EventProviderId>
+          </EventProviders>
+        </EventCollectorId>
+      </Collectors>
+      <TraceMergeProperties>
+        <TraceMergeProperty Id="BaseVerboseTraceMergeProperties" Name="BaseTraceMergeProperties">
+          <DeletePreMergedTraceFiles Value="true" />
+          <FileCompression Value="false" />
+          <InjectOnly Value="false" />
+          <SkipMerge Value="false" />
+          <CustomEvents>
+            <CustomEvent Value="ImageId" />
+            <CustomEvent Value="BuildInfo" />
+            <CustomEvent Value="VolumeMapping" />
+            <CustomEvent Value="EventMetadata" />
+            <CustomEvent Value="PerfTrackMetadata" />
+            <CustomEvent Value="WinSAT" />
+            <CustomEvent Value="NetworkInterface" />
+          </CustomEvents>
+        </TraceMergeProperty>
+      </TraceMergeProperties>
+    </Profile>
+  </Profiles>
+</WindowsPerformanceRecorder>
+
diff --git a/depends/mimalloc/src/prim/windows/etw.h b/depends/mimalloc/src/prim/windows/etw.h
new file mode 100644
index 000000000000..4e0a092a10f4
--- /dev/null
+++ b/depends/mimalloc/src/prim/windows/etw.h
@@ -0,0 +1,905 @@
+//**********************************************************************`
+//* This is an include file generated by Message Compiler.             *`
+//*                                                                    *`
+//* Copyright (c) Microsoft Corporation. All Rights Reserved.          *`
+//**********************************************************************`
+#pragma once
+
+//*****************************************************************************
+//
+// Notes on the ETW event code generated by MC:
+//
+// - Structures and arrays of structures are treated as an opaque binary blob.
+//   The caller is responsible for packing the data for the structure into a
+//   single region of memory, with no padding between values. The macro will
+//   have an extra parameter for the length of the blob.
+// - Arrays of nul-terminated strings must be packed by the caller into a
+//   single binary blob containing the correct number of strings, with a nul
+//   after each string. The size of the blob is specified in characters, and
+//   includes the final nul.
+// - Arrays of SID are treated as a single binary blob. The caller is
+//   responsible for packing the SID values into a single region of memory with
+//   no padding.
+// - The length attribute on the data element in the manifest is significant
+//   for values with intype win:UnicodeString, win:AnsiString, or win:Binary.
+//   The length attribute must be specified for win:Binary, and is optional for
+//   win:UnicodeString and win:AnsiString (if no length is given, the strings
+//   are assumed to be nul-terminated). For win:UnicodeString, the length is
+//   measured in characters, not bytes.
+// - For an array of win:UnicodeString, win:AnsiString, or win:Binary, the
+//   length attribute applies to every value in the array, so every value in
+//   the array must have the same length. The values in the array are provided
+//   to the macro via a single pointer -- the caller is responsible for packing
+//   all of the values into a single region of memory with no padding between
+//   values.
+// - Values of type win:CountedUnicodeString, win:CountedAnsiString, and
+//   win:CountedBinary can be generated and collected on Vista or later.
+//   However, they may not decode properly without the Windows 10 2018 Fall
+//   Update.
+// - Arrays of type win:CountedUnicodeString, win:CountedAnsiString, and
+//   win:CountedBinary must be packed by the caller into a single region of
+//   memory. The format for each item is a UINT16 byte-count followed by that
+//   many bytes of data. When providing the array to the generated macro, you
+//   must provide the total size of the packed array data, including the UINT16
+//   sizes for each item. In the case of win:CountedUnicodeString, the data
+//   size is specified in WCHAR (16-bit) units. In the case of
+//   win:CountedAnsiString and win:CountedBinary, the data size is specified in
+//   bytes.
+//
+//*****************************************************************************
+
+#include <wmistr.h>
+#include <evntrace.h>
+#include <evntprov.h>
+
+#ifndef ETW_INLINE
+  #ifdef _ETW_KM_
+    // In kernel mode, save stack space by never inlining templates.
+    #define ETW_INLINE DECLSPEC_NOINLINE __inline
+  #else
+    // In user mode, save code size by inlining templates as appropriate.
+    #define ETW_INLINE __inline
+  #endif
+#endif // ETW_INLINE
+
+#if defined(__cplusplus)
+extern "C" {
+#endif
+
+//
+// MCGEN_DISABLE_PROVIDER_CODE_GENERATION macro:
+// Define this macro to have the compiler skip the generated functions in this
+// header.
+//
+#ifndef MCGEN_DISABLE_PROVIDER_CODE_GENERATION
+
+//
+// MCGEN_USE_KERNEL_MODE_APIS macro:
+// Controls whether the generated code uses kernel-mode or user-mode APIs.
+// - Set to 0 to use Windows user-mode APIs such as EventRegister.
+// - Set to 1 to use Windows kernel-mode APIs such as EtwRegister.
+// Default is based on whether the _ETW_KM_ macro is defined (i.e. by wdm.h).
+// Note that the APIs can also be overridden directly, e.g. by setting the
+// MCGEN_EVENTWRITETRANSFER or MCGEN_EVENTREGISTER macros.
+//
+#ifndef MCGEN_USE_KERNEL_MODE_APIS
+  #ifdef _ETW_KM_
+    #define MCGEN_USE_KERNEL_MODE_APIS 1
+  #else
+    #define MCGEN_USE_KERNEL_MODE_APIS 0
+  #endif
+#endif // MCGEN_USE_KERNEL_MODE_APIS
+
+//
+// MCGEN_HAVE_EVENTSETINFORMATION macro:
+// Controls how McGenEventSetInformation uses the EventSetInformation API.
+// - Set to 0 to disable the use of EventSetInformation
+//   (McGenEventSetInformation will always return an error).
+// - Set to 1 to directly invoke MCGEN_EVENTSETINFORMATION.
+// - Set to 2 to to locate EventSetInformation at runtime via GetProcAddress
+//   (user-mode) or MmGetSystemRoutineAddress (kernel-mode).
+// Default is determined as follows:
+// - If MCGEN_EVENTSETINFORMATION has been customized, set to 1
+//   (i.e. use MCGEN_EVENTSETINFORMATION).
+// - Else if the target OS version has EventSetInformation, set to 1
+//   (i.e. use MCGEN_EVENTSETINFORMATION).
+// - Else set to 2 (i.e. try to dynamically locate EventSetInformation).
+// Note that an McGenEventSetInformation function will only be generated if one
+// or more provider in a manifest has provider traits.
+//
+#ifndef MCGEN_HAVE_EVENTSETINFORMATION
+  #ifdef MCGEN_EVENTSETINFORMATION             // if MCGEN_EVENTSETINFORMATION has been customized,
+    #define MCGEN_HAVE_EVENTSETINFORMATION   1 //   directly invoke MCGEN_EVENTSETINFORMATION(...).
+  #elif MCGEN_USE_KERNEL_MODE_APIS             // else if using kernel-mode APIs,
+    #if NTDDI_VERSION >= 0x06040000            //   if target OS is Windows 10 or later,
+      #define MCGEN_HAVE_EVENTSETINFORMATION 1 //     directly invoke MCGEN_EVENTSETINFORMATION(...).
+    #else                                      //   else
+      #define MCGEN_HAVE_EVENTSETINFORMATION 2 //     find "EtwSetInformation" via MmGetSystemRoutineAddress.
+    #endif                                     // else (using user-mode APIs)
+  #else                                        //   if target OS and SDK is Windows 8 or later,
+    #if WINVER >= 0x0602 && defined(EVENT_FILTER_TYPE_SCHEMATIZED)
+      #define MCGEN_HAVE_EVENTSETINFORMATION 1 //     directly invoke MCGEN_EVENTSETINFORMATION(...).
+    #else                                      //   else
+      #define MCGEN_HAVE_EVENTSETINFORMATION 2 //     find "EventSetInformation" via GetModuleHandleExW/GetProcAddress.
+    #endif
+  #endif
+#endif // MCGEN_HAVE_EVENTSETINFORMATION
+
+//
+// MCGEN Override Macros
+//
+// The following override macros may be defined before including this header
+// to control the APIs used by this header:
+//
+// - MCGEN_EVENTREGISTER
+// - MCGEN_EVENTUNREGISTER
+// - MCGEN_EVENTSETINFORMATION
+// - MCGEN_EVENTWRITETRANSFER
+//
+// If the the macro is undefined, the MC implementation will default to the
+// corresponding ETW APIs. For example, if the MCGEN_EVENTREGISTER macro is
+// undefined, the EventRegister[MyProviderName] macro will use EventRegister
+// in user mode and will use EtwRegister in kernel mode.
+//
+// To prevent issues from conflicting definitions of these macros, the value
+// of the override macro will be used as a suffix in certain internal function
+// names. Because of this, the override macros must follow certain rules:
+//
+// - The macro must be defined before any MC-generated header is included and
+//   must not be undefined or redefined after any MC-generated header is
+//   included. Different translation units (i.e. different .c or .cpp files)
+//   may set the macros to different values, but within a translation unit
+//   (within a single .c or .cpp file), the macro must be set once and not
+//   changed.
+// - The override must be an object-like macro, not a function-like macro
+//   (i.e. the override macro must not have a parameter list).
+// - The override macro's value must be a simple identifier, i.e. must be
+//   something that starts with a letter or '_' and contains only letters,
+//   numbers, and '_' characters.
+// - If the override macro's value is the name of a second object-like macro,
+//   the second object-like macro must follow the same rules. (The override
+//   macro's value can also be the name of a function-like macro, in which
+//   case the function-like macro does not need to follow the same rules.)
+//
+// For example, the following will cause compile errors:
+//
+//   #define MCGEN_EVENTWRITETRANSFER MyNamespace::MyClass::MyFunction // Value has non-identifier characters (colon).
+//   #define MCGEN_EVENTWRITETRANSFER GetEventWriteFunctionPointer(7)  // Value has non-identifier characters (parentheses).
+//   #define MCGEN_EVENTWRITETRANSFER(h,e,a,r,c,d) EventWrite(h,e,c,d) // Override is defined as a function-like macro.
+//   #define MY_OBJECT_LIKE_MACRO     MyNamespace::MyClass::MyEventWriteFunction
+//   #define MCGEN_EVENTWRITETRANSFER MY_OBJECT_LIKE_MACRO // Evaluates to something with non-identifier characters (colon).
+//
+// The following would be ok:
+//
+//   #define MCGEN_EVENTWRITETRANSFER  MyEventWriteFunction1  // OK, suffix will be "MyEventWriteFunction1".
+//   #define MY_OBJECT_LIKE_MACRO      MyEventWriteFunction2
+//   #define MCGEN_EVENTWRITETRANSFER  MY_OBJECT_LIKE_MACRO   // OK, suffix will be "MyEventWriteFunction2".
+//   #define MY_FUNCTION_LIKE_MACRO(h,e,a,r,c,d) MyNamespace::MyClass::MyEventWriteFunction3(h,e,c,d)
+//   #define MCGEN_EVENTWRITETRANSFER  MY_FUNCTION_LIKE_MACRO // OK, suffix will be "MY_FUNCTION_LIKE_MACRO".
+//
+#ifndef MCGEN_EVENTREGISTER
+  #if MCGEN_USE_KERNEL_MODE_APIS
+    #define MCGEN_EVENTREGISTER        EtwRegister
+  #else
+    #define MCGEN_EVENTREGISTER        EventRegister
+  #endif
+#endif // MCGEN_EVENTREGISTER
+#ifndef MCGEN_EVENTUNREGISTER
+  #if MCGEN_USE_KERNEL_MODE_APIS
+    #define MCGEN_EVENTUNREGISTER      EtwUnregister
+  #else
+    #define MCGEN_EVENTUNREGISTER      EventUnregister
+  #endif
+#endif // MCGEN_EVENTUNREGISTER
+#ifndef MCGEN_EVENTSETINFORMATION
+  #if MCGEN_USE_KERNEL_MODE_APIS
+    #define MCGEN_EVENTSETINFORMATION  EtwSetInformation
+  #else
+    #define MCGEN_EVENTSETINFORMATION  EventSetInformation
+  #endif
+#endif // MCGEN_EVENTSETINFORMATION
+#ifndef MCGEN_EVENTWRITETRANSFER
+  #if MCGEN_USE_KERNEL_MODE_APIS
+    #define MCGEN_EVENTWRITETRANSFER   EtwWriteTransfer
+  #else
+    #define MCGEN_EVENTWRITETRANSFER   EventWriteTransfer
+  #endif
+#endif // MCGEN_EVENTWRITETRANSFER
+
+//
+// MCGEN_EVENT_ENABLED macro:
+// Override to control how the EventWrite[EventName] macros determine whether
+// an event is enabled. The default behavior is for EventWrite[EventName] to
+// use the EventEnabled[EventName] macros.
+//
+#ifndef MCGEN_EVENT_ENABLED
+#define MCGEN_EVENT_ENABLED(EventName) EventEnabled##EventName()
+#endif
+
+//
+// MCGEN_EVENT_ENABLED_FORCONTEXT macro:
+// Override to control how the EventWrite[EventName]_ForContext macros
+// determine whether an event is enabled. The default behavior is for
+// EventWrite[EventName]_ForContext to use the
+// EventEnabled[EventName]_ForContext macros.
+//
+#ifndef MCGEN_EVENT_ENABLED_FORCONTEXT
+#define MCGEN_EVENT_ENABLED_FORCONTEXT(pContext, EventName) EventEnabled##EventName##_ForContext(pContext)
+#endif
+
+//
+// MCGEN_ENABLE_CHECK macro:
+// Determines whether the specified event would be considered as enabled
+// based on the state of the specified context. Slightly faster than calling
+// McGenEventEnabled directly.
+//
+#ifndef MCGEN_ENABLE_CHECK
+#define MCGEN_ENABLE_CHECK(Context, Descriptor) (Context.IsEnabled && McGenEventEnabled(&Context, &Descriptor))
+#endif
+
+#if !defined(MCGEN_TRACE_CONTEXT_DEF)
+#define MCGEN_TRACE_CONTEXT_DEF
+// This structure is for use by MC-generated code and should not be used directly.
+typedef struct _MCGEN_TRACE_CONTEXT
+{
+    TRACEHANDLE            RegistrationHandle;
+    TRACEHANDLE            Logger;      // Used as pointer to provider traits.
+    ULONGLONG              MatchAnyKeyword;
+    ULONGLONG              MatchAllKeyword;
+    ULONG                  Flags;
+    ULONG                  IsEnabled;
+    UCHAR                  Level;
+    UCHAR                  Reserve;
+    USHORT                 EnableBitsCount;
+    PULONG                 EnableBitMask;
+    const ULONGLONG*       EnableKeyWords;
+    const UCHAR*           EnableLevel;
+} MCGEN_TRACE_CONTEXT, *PMCGEN_TRACE_CONTEXT;
+#endif // MCGEN_TRACE_CONTEXT_DEF
+
+#if !defined(MCGEN_LEVEL_KEYWORD_ENABLED_DEF)
+#define MCGEN_LEVEL_KEYWORD_ENABLED_DEF
+//
+// Determines whether an event with a given Level and Keyword would be
+// considered as enabled based on the state of the specified context.
+// Note that you may want to use MCGEN_ENABLE_CHECK instead of calling this
+// function directly.
+//
+FORCEINLINE
+BOOLEAN
+McGenLevelKeywordEnabled(
+    _In_ PMCGEN_TRACE_CONTEXT EnableInfo,
+    _In_ UCHAR Level,
+    _In_ ULONGLONG Keyword
+    )
+{
+    //
+    // Check if the event Level is lower than the level at which
+    // the channel is enabled.
+    // If the event Level is 0 or the channel is enabled at level 0,
+    // all levels are enabled.
+    //
+
+    if ((Level <= EnableInfo->Level) || // This also covers the case of Level == 0.
+        (EnableInfo->Level == 0)) {
+
+        //
+        // Check if Keyword is enabled
+        //
+
+        if ((Keyword == (ULONGLONG)0) ||
+            ((Keyword & EnableInfo->MatchAnyKeyword) &&
+             ((Keyword & EnableInfo->MatchAllKeyword) == EnableInfo->MatchAllKeyword))) {
+            return TRUE;
+        }
+    }
+
+    return FALSE;
+}
+#endif // MCGEN_LEVEL_KEYWORD_ENABLED_DEF
+
+#if !defined(MCGEN_EVENT_ENABLED_DEF)
+#define MCGEN_EVENT_ENABLED_DEF
+//
+// Determines whether the specified event would be considered as enabled based
+// on the state of the specified context. Note that you may want to use
+// MCGEN_ENABLE_CHECK instead of calling this function directly.
+//
+FORCEINLINE
+BOOLEAN
+McGenEventEnabled(
+    _In_ PMCGEN_TRACE_CONTEXT EnableInfo,
+    _In_ PCEVENT_DESCRIPTOR EventDescriptor
+    )
+{
+    return McGenLevelKeywordEnabled(EnableInfo, EventDescriptor->Level, EventDescriptor->Keyword);
+}
+#endif // MCGEN_EVENT_ENABLED_DEF
+
+#if !defined(MCGEN_CONTROL_CALLBACK)
+#define MCGEN_CONTROL_CALLBACK
+
+// This function is for use by MC-generated code and should not be used directly.
+DECLSPEC_NOINLINE __inline
+VOID
+__stdcall
+McGenControlCallbackV2(
+    _In_ LPCGUID SourceId,
+    _In_ ULONG ControlCode,
+    _In_ UCHAR Level,
+    _In_ ULONGLONG MatchAnyKeyword,
+    _In_ ULONGLONG MatchAllKeyword,
+    _In_opt_ PEVENT_FILTER_DESCRIPTOR FilterData,
+    _Inout_opt_ PVOID CallbackContext
+    )
+/*++
+
+Routine Description:
+
+    This is the notification callback for Windows Vista and later.
+
+Arguments:
+
+    SourceId - The GUID that identifies the session that enabled the provider.
+
+    ControlCode - The parameter indicates whether the provider
+                  is being enabled or disabled.
+
+    Level - The level at which the event is enabled.
+
+    MatchAnyKeyword - The bitmask of keywords that the provider uses to
+                      determine the category of events that it writes.
+
+    MatchAllKeyword - This bitmask additionally restricts the category
+                      of events that the provider writes.
+
+    FilterData - The provider-defined data.
+
+    CallbackContext - The context of the callback that is defined when the provider
+                      called EtwRegister to register itself.
+
+Remarks:
+
+    ETW calls this function to notify provider of enable/disable
+
+--*/
+{
+    PMCGEN_TRACE_CONTEXT Ctx = (PMCGEN_TRACE_CONTEXT)CallbackContext;
+    ULONG Ix;
+#ifndef MCGEN_PRIVATE_ENABLE_CALLBACK_V2
+    UNREFERENCED_PARAMETER(SourceId);
+    UNREFERENCED_PARAMETER(FilterData);
+#endif
+
+    if (Ctx == NULL) {
+        return;
+    }
+
+    switch (ControlCode) {
+
+        case EVENT_CONTROL_CODE_ENABLE_PROVIDER:
+            Ctx->Level = Level;
+            Ctx->MatchAnyKeyword = MatchAnyKeyword;
+            Ctx->MatchAllKeyword = MatchAllKeyword;
+            Ctx->IsEnabled = EVENT_CONTROL_CODE_ENABLE_PROVIDER;
+
+            for (Ix = 0; Ix < Ctx->EnableBitsCount; Ix += 1) {
+                if (McGenLevelKeywordEnabled(Ctx, Ctx->EnableLevel[Ix], Ctx->EnableKeyWords[Ix]) != FALSE) {
+                    Ctx->EnableBitMask[Ix >> 5] |= (1 << (Ix % 32));
+                } else {
+                    Ctx->EnableBitMask[Ix >> 5] &= ~(1 << (Ix % 32));
+                }
+            }
+            break;
+
+        case EVENT_CONTROL_CODE_DISABLE_PROVIDER:
+            Ctx->IsEnabled = EVENT_CONTROL_CODE_DISABLE_PROVIDER;
+            Ctx->Level = 0;
+            Ctx->MatchAnyKeyword = 0;
+            Ctx->MatchAllKeyword = 0;
+            if (Ctx->EnableBitsCount > 0) {
+#pragma warning(suppress: 26451) // Arithmetic overflow cannot occur, no matter the value of EnableBitCount
+                RtlZeroMemory(Ctx->EnableBitMask, (((Ctx->EnableBitsCount - 1) / 32) + 1) * sizeof(ULONG));
+            }
+            break;
+
+        default:
+            break;
+    }
+
+#ifdef MCGEN_PRIVATE_ENABLE_CALLBACK_V2
+    //
+    // Call user defined callback
+    //
+    MCGEN_PRIVATE_ENABLE_CALLBACK_V2(
+        SourceId,
+        ControlCode,
+        Level,
+        MatchAnyKeyword,
+        MatchAllKeyword,
+        FilterData,
+        CallbackContext
+        );
+#endif // MCGEN_PRIVATE_ENABLE_CALLBACK_V2
+
+    return;
+}
+
+#endif // MCGEN_CONTROL_CALLBACK
+
+#ifndef _mcgen_PENABLECALLBACK
+  #if MCGEN_USE_KERNEL_MODE_APIS
+    #define _mcgen_PENABLECALLBACK      PETWENABLECALLBACK
+  #else
+    #define _mcgen_PENABLECALLBACK      PENABLECALLBACK
+  #endif
+#endif // _mcgen_PENABLECALLBACK
+
+#if !defined(_mcgen_PASTE2)
+// This macro is for use by MC-generated code and should not be used directly.
+#define _mcgen_PASTE2(a, b) _mcgen_PASTE2_imp(a, b)
+#define _mcgen_PASTE2_imp(a, b) a##b
+#endif // _mcgen_PASTE2
+
+#if !defined(_mcgen_PASTE3)
+// This macro is for use by MC-generated code and should not be used directly.
+#define _mcgen_PASTE3(a, b, c) _mcgen_PASTE3_imp(a, b, c)
+#define _mcgen_PASTE3_imp(a, b, c) a##b##_##c
+#endif // _mcgen_PASTE3
+
+//
+// Macro validation
+//
+
+// Validate MCGEN_EVENTREGISTER:
+
+// Trigger an error if MCGEN_EVENTREGISTER is not an unqualified (simple) identifier:
+struct _mcgen_PASTE2(MCGEN_EVENTREGISTER_definition_must_be_an_unqualified_identifier_, MCGEN_EVENTREGISTER);
+
+// Trigger an error if MCGEN_EVENTREGISTER is redefined:
+typedef struct _mcgen_PASTE2(MCGEN_EVENTREGISTER_definition_must_be_an_unqualified_identifier_, MCGEN_EVENTREGISTER)
+    MCGEN_EVENTREGISTER_must_not_be_redefined_between_headers;
+
+// Trigger an error if MCGEN_EVENTREGISTER is defined as a function-like macro:
+typedef void MCGEN_EVENTREGISTER_must_not_be_a_functionLike_macro_MCGEN_EVENTREGISTER;
+typedef int _mcgen_PASTE2(MCGEN_EVENTREGISTER_must_not_be_a_functionLike_macro_, MCGEN_EVENTREGISTER);
+
+// Validate MCGEN_EVENTUNREGISTER:
+
+// Trigger an error if MCGEN_EVENTUNREGISTER is not an unqualified (simple) identifier:
+struct _mcgen_PASTE2(MCGEN_EVENTUNREGISTER_definition_must_be_an_unqualified_identifier_, MCGEN_EVENTUNREGISTER);
+
+// Trigger an error if MCGEN_EVENTUNREGISTER is redefined:
+typedef struct _mcgen_PASTE2(MCGEN_EVENTUNREGISTER_definition_must_be_an_unqualified_identifier_, MCGEN_EVENTUNREGISTER)
+    MCGEN_EVENTUNREGISTER_must_not_be_redefined_between_headers;
+
+// Trigger an error if MCGEN_EVENTUNREGISTER is defined as a function-like macro:
+typedef void MCGEN_EVENTUNREGISTER_must_not_be_a_functionLike_macro_MCGEN_EVENTUNREGISTER;
+typedef int _mcgen_PASTE2(MCGEN_EVENTUNREGISTER_must_not_be_a_functionLike_macro_, MCGEN_EVENTUNREGISTER);
+
+// Validate MCGEN_EVENTSETINFORMATION:
+
+// Trigger an error if MCGEN_EVENTSETINFORMATION is not an unqualified (simple) identifier:
+struct _mcgen_PASTE2(MCGEN_EVENTSETINFORMATION_definition_must_be_an_unqualified_identifier_, MCGEN_EVENTSETINFORMATION);
+
+// Trigger an error if MCGEN_EVENTSETINFORMATION is redefined:
+typedef struct _mcgen_PASTE2(MCGEN_EVENTSETINFORMATION_definition_must_be_an_unqualified_identifier_, MCGEN_EVENTSETINFORMATION)
+    MCGEN_EVENTSETINFORMATION_must_not_be_redefined_between_headers;
+
+// Trigger an error if MCGEN_EVENTSETINFORMATION is defined as a function-like macro:
+typedef void MCGEN_EVENTSETINFORMATION_must_not_be_a_functionLike_macro_MCGEN_EVENTSETINFORMATION;
+typedef int _mcgen_PASTE2(MCGEN_EVENTSETINFORMATION_must_not_be_a_functionLike_macro_, MCGEN_EVENTSETINFORMATION);
+
+// Validate MCGEN_EVENTWRITETRANSFER:
+
+// Trigger an error if MCGEN_EVENTWRITETRANSFER is not an unqualified (simple) identifier:
+struct _mcgen_PASTE2(MCGEN_EVENTWRITETRANSFER_definition_must_be_an_unqualified_identifier_, MCGEN_EVENTWRITETRANSFER);
+
+// Trigger an error if MCGEN_EVENTWRITETRANSFER is redefined:
+typedef struct _mcgen_PASTE2(MCGEN_EVENTWRITETRANSFER_definition_must_be_an_unqualified_identifier_, MCGEN_EVENTWRITETRANSFER)
+    MCGEN_EVENTWRITETRANSFER_must_not_be_redefined_between_headers;;
+
+// Trigger an error if MCGEN_EVENTWRITETRANSFER is defined as a function-like macro:
+typedef void MCGEN_EVENTWRITETRANSFER_must_not_be_a_functionLike_macro_MCGEN_EVENTWRITETRANSFER;
+typedef int _mcgen_PASTE2(MCGEN_EVENTWRITETRANSFER_must_not_be_a_functionLike_macro_, MCGEN_EVENTWRITETRANSFER);
+
+#ifndef McGenEventWrite_def
+#define McGenEventWrite_def
+
+// This macro is for use by MC-generated code and should not be used directly.
+#define McGenEventWrite _mcgen_PASTE2(McGenEventWrite_, MCGEN_EVENTWRITETRANSFER)
+
+// This function is for use by MC-generated code and should not be used directly.
+DECLSPEC_NOINLINE __inline
+ULONG __stdcall
+McGenEventWrite(
+    _In_ PMCGEN_TRACE_CONTEXT Context,
+    _In_ PCEVENT_DESCRIPTOR Descriptor,
+    _In_opt_ LPCGUID ActivityId,
+    _In_range_(1, 128) ULONG EventDataCount,
+    _Pre_cap_(EventDataCount) EVENT_DATA_DESCRIPTOR* EventData
+    )
+{
+    const USHORT UNALIGNED* Traits;
+
+    // Some customized MCGEN_EVENTWRITETRANSFER macros might ignore ActivityId.
+    UNREFERENCED_PARAMETER(ActivityId);
+
+    Traits = (const USHORT UNALIGNED*)(UINT_PTR)Context->Logger;
+
+    if (Traits == NULL) {
+        EventData[0].Ptr = 0;
+        EventData[0].Size = 0;
+        EventData[0].Reserved = 0;
+    } else {
+        EventData[0].Ptr = (ULONG_PTR)Traits;
+        EventData[0].Size = *Traits;
+        EventData[0].Reserved = 2; // EVENT_DATA_DESCRIPTOR_TYPE_PROVIDER_METADATA
+    }
+
+    return MCGEN_EVENTWRITETRANSFER(
+        Context->RegistrationHandle,
+        Descriptor,
+        ActivityId,
+        NULL,
+        EventDataCount,
+        EventData);
+}
+#endif // McGenEventWrite_def
+
+#if !defined(McGenEventRegisterUnregister)
+#define McGenEventRegisterUnregister
+
+// This macro is for use by MC-generated code and should not be used directly.
+#define McGenEventRegister _mcgen_PASTE2(McGenEventRegister_, MCGEN_EVENTREGISTER)
+
+#pragma warning(push)
+#pragma warning(disable:6103)
+// This function is for use by MC-generated code and should not be used directly.
+DECLSPEC_NOINLINE __inline
+ULONG __stdcall
+McGenEventRegister(
+    _In_ LPCGUID ProviderId,
+    _In_opt_ _mcgen_PENABLECALLBACK EnableCallback,
+    _In_opt_ PVOID CallbackContext,
+    _Inout_ PREGHANDLE RegHandle
+    )
+/*++
+
+Routine Description:
+
+    This function registers the provider with ETW.
+
+Arguments:
+
+    ProviderId - Provider ID to register with ETW.
+
+    EnableCallback - Callback to be used.
+
+    CallbackContext - Context for the callback.
+
+    RegHandle - Pointer to registration handle.
+
+Remarks:
+
+    Should not be called if the provider is already registered (i.e. should not
+    be called if *RegHandle != 0). Repeatedly registering a provider is a bug
+    and may indicate a race condition. However, for compatibility with previous
+    behavior, this function will return SUCCESS in this case.
+
+--*/
+{
+    ULONG Error;
+
+    if (*RegHandle != 0)
+    {
+        Error = 0; // ERROR_SUCCESS
+    }
+    else
+    {
+        Error = MCGEN_EVENTREGISTER(ProviderId, EnableCallback, CallbackContext, RegHandle);
+    }
+
+    return Error;
+}
+#pragma warning(pop)
+
+// This macro is for use by MC-generated code and should not be used directly.
+#define McGenEventUnregister _mcgen_PASTE2(McGenEventUnregister_, MCGEN_EVENTUNREGISTER)
+
+// This function is for use by MC-generated code and should not be used directly.
+DECLSPEC_NOINLINE __inline
+ULONG __stdcall
+McGenEventUnregister(_Inout_ PREGHANDLE RegHandle)
+/*++
+
+Routine Description:
+
+    Unregister from ETW and set *RegHandle = 0.
+
+Arguments:
+
+    RegHandle - the pointer to the provider registration handle
+
+Remarks:
+
+    If provider has not been registered (i.e. if *RegHandle == 0),
+    return SUCCESS. It is safe to call McGenEventUnregister even if the
+    call to McGenEventRegister returned an error.
+
+--*/
+{
+    ULONG Error;
+
+    if(*RegHandle == 0)
+    {
+        Error = 0; // ERROR_SUCCESS
+    }
+    else
+    {
+        Error = MCGEN_EVENTUNREGISTER(*RegHandle);
+        *RegHandle = (REGHANDLE)0;
+    }
+
+    return Error;
+}
+
+#endif // McGenEventRegisterUnregister
+
+#ifndef _mcgen_EVENT_BIT_SET
+  #if defined(_M_IX86) || defined(_M_X64)
+    // This macro is for use by MC-generated code and should not be used directly.
+    #define _mcgen_EVENT_BIT_SET(EnableBits, BitPosition) ((((const unsigned char*)EnableBits)[BitPosition >> 3] & (1u << (BitPosition & 7))) != 0)
+  #else // CPU type
+    // This macro is for use by MC-generated code and should not be used directly.
+    #define _mcgen_EVENT_BIT_SET(EnableBits, BitPosition) ((EnableBits[BitPosition >> 5] & (1u << (BitPosition & 31))) != 0)
+  #endif // CPU type
+#endif // _mcgen_EVENT_BIT_SET
+
+#endif // MCGEN_DISABLE_PROVIDER_CODE_GENERATION
+
+//+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+// Provider "microsoft-windows-mimalloc" event count 2
+//+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+
+// Provider GUID = 138f4dbb-ee04-4899-aa0a-572ad4475779
+EXTERN_C __declspec(selectany) const GUID ETW_MI_Provider = {0x138f4dbb, 0xee04, 0x4899, {0xaa, 0x0a, 0x57, 0x2a, 0xd4, 0x47, 0x57, 0x79}};
+
+#ifndef ETW_MI_Provider_Traits
+#define ETW_MI_Provider_Traits NULL
+#endif // ETW_MI_Provider_Traits
+
+//
+// Event Descriptors
+//
+EXTERN_C __declspec(selectany) const EVENT_DESCRIPTOR ETW_MI_ALLOC = {0x64, 0x1, 0x0, 0x4, 0x0, 0x0, 0x0};
+#define ETW_MI_ALLOC_value 0x64
+EXTERN_C __declspec(selectany) const EVENT_DESCRIPTOR ETW_MI_FREE = {0x65, 0x1, 0x0, 0x4, 0x0, 0x0, 0x0};
+#define ETW_MI_FREE_value 0x65
+
+//
+// MCGEN_DISABLE_PROVIDER_CODE_GENERATION macro:
+// Define this macro to have the compiler skip the generated functions in this
+// header.
+//
+#ifndef MCGEN_DISABLE_PROVIDER_CODE_GENERATION
+
+//
+// Event Enablement Bits
+// These variables are for use by MC-generated code and should not be used directly.
+//
+EXTERN_C __declspec(selectany) DECLSPEC_CACHEALIGN ULONG microsoft_windows_mimallocEnableBits[1];
+EXTERN_C __declspec(selectany) const ULONGLONG microsoft_windows_mimallocKeywords[1] = {0x0};
+EXTERN_C __declspec(selectany) const unsigned char microsoft_windows_mimallocLevels[1] = {4};
+
+//
+// Provider context
+//
+EXTERN_C __declspec(selectany) MCGEN_TRACE_CONTEXT ETW_MI_Provider_Context = {0, (ULONG_PTR)ETW_MI_Provider_Traits, 0, 0, 0, 0, 0, 0, 1, microsoft_windows_mimallocEnableBits, microsoft_windows_mimallocKeywords, microsoft_windows_mimallocLevels};
+
+//
+// Provider REGHANDLE
+//
+#define microsoft_windows_mimallocHandle (ETW_MI_Provider_Context.RegistrationHandle)
+
+//
+// This macro is set to 0, indicating that the EventWrite[Name] macros do not
+// have an Activity parameter. This is controlled by the -km and -um options.
+//
+#define ETW_MI_Provider_EventWriteActivity 0
+
+//
+// Register with ETW using the control GUID specified in the manifest.
+// Invoke this macro during module initialization (i.e. program startup,
+// DLL process attach, or driver load) to initialize the provider.
+// Note that if this function returns an error, the error means that
+// will not work, but no action needs to be taken -- even if EventRegister
+// returns an error, it is generally safe to use EventWrite and
+// EventUnregister macros (they will be no-ops if EventRegister failed).
+//
+#ifndef EventRegistermicrosoft_windows_mimalloc
+#define EventRegistermicrosoft_windows_mimalloc() McGenEventRegister(&ETW_MI_Provider, McGenControlCallbackV2, &ETW_MI_Provider_Context, &microsoft_windows_mimallocHandle)
+#endif
+
+//
+// Register with ETW using a specific control GUID (i.e. a GUID other than what
+// is specified in the manifest). Advanced scenarios only.
+//
+#ifndef EventRegisterByGuidmicrosoft_windows_mimalloc
+#define EventRegisterByGuidmicrosoft_windows_mimalloc(Guid) McGenEventRegister(&(Guid), McGenControlCallbackV2, &ETW_MI_Provider_Context, &microsoft_windows_mimallocHandle)
+#endif
+
+//
+// Unregister with ETW and close the provider.
+// Invoke this macro during module shutdown (i.e. program exit, DLL process
+// detach, or driver unload) to unregister the provider.
+// Note that you MUST call EventUnregister before DLL or driver unload
+// (not optional): failure to unregister a provider before DLL or driver unload
+// will result in crashes.
+//
+#ifndef EventUnregistermicrosoft_windows_mimalloc
+#define EventUnregistermicrosoft_windows_mimalloc() McGenEventUnregister(&microsoft_windows_mimallocHandle)
+#endif
+
+//
+// MCGEN_ENABLE_FORCONTEXT_CODE_GENERATION macro:
+// Define this macro to enable support for caller-allocated provider context.
+//
+#ifdef MCGEN_ENABLE_FORCONTEXT_CODE_GENERATION
+
+//
+// Advanced scenarios: Caller-allocated provider context.
+// Use when multiple differently-configured provider handles are needed,
+// e.g. for container-aware drivers, one context per container.
+//
+// Usage:
+//
+// - Caller enables the feature before including this header, e.g.
+//   #define MCGEN_ENABLE_FORCONTEXT_CODE_GENERATION 1
+// - Caller allocates memory, e.g. pContext = malloc(sizeof(McGenContext_microsoft_windows_mimalloc));
+// - Caller registers the provider, e.g. EventRegistermicrosoft_windows_mimalloc_ForContext(pContext);
+// - Caller writes events, e.g. EventWriteMyEvent_ForContext(pContext, ...);
+// - Caller unregisters, e.g. EventUnregistermicrosoft_windows_mimalloc_ForContext(pContext);
+// - Caller frees memory, e.g. free(pContext);
+//
+
+typedef struct tagMcGenContext_microsoft_windows_mimalloc {
+    // The fields of this structure are subject to change and should
+    // not be accessed directly. To access the provider's REGHANDLE,
+    // use microsoft_windows_mimallocHandle_ForContext(pContext).
+    MCGEN_TRACE_CONTEXT Context;
+    ULONG EnableBits[1];
+} McGenContext_microsoft_windows_mimalloc;
+
+#define EventRegistermicrosoft_windows_mimalloc_ForContext(pContext)             _mcgen_PASTE2(_mcgen_RegisterForContext_microsoft_windows_mimalloc_, MCGEN_EVENTREGISTER)(&ETW_MI_Provider, pContext)
+#define EventRegisterByGuidmicrosoft_windows_mimalloc_ForContext(Guid, pContext) _mcgen_PASTE2(_mcgen_RegisterForContext_microsoft_windows_mimalloc_, MCGEN_EVENTREGISTER)(&(Guid), pContext)
+#define EventUnregistermicrosoft_windows_mimalloc_ForContext(pContext)           McGenEventUnregister(&(pContext)->Context.RegistrationHandle)
+
+//
+// Provider REGHANDLE for caller-allocated context.
+//
+#define microsoft_windows_mimallocHandle_ForContext(pContext) ((pContext)->Context.RegistrationHandle)
+
+// This function is for use by MC-generated code and should not be used directly.
+// Initialize and register the caller-allocated context.
+__inline
+ULONG __stdcall
+_mcgen_PASTE2(_mcgen_RegisterForContext_microsoft_windows_mimalloc_, MCGEN_EVENTREGISTER)(
+    _In_ LPCGUID pProviderId,
+    _Out_ McGenContext_microsoft_windows_mimalloc* pContext)
+{
+    RtlZeroMemory(pContext, sizeof(*pContext));
+    pContext->Context.Logger = (ULONG_PTR)ETW_MI_Provider_Traits;
+    pContext->Context.EnableBitsCount = 1;
+    pContext->Context.EnableBitMask = pContext->EnableBits;
+    pContext->Context.EnableKeyWords = microsoft_windows_mimallocKeywords;
+    pContext->Context.EnableLevel = microsoft_windows_mimallocLevels;
+    return McGenEventRegister(
+        pProviderId,
+        McGenControlCallbackV2,
+        &pContext->Context,
+        &pContext->Context.RegistrationHandle);
+}
+
+// This function is for use by MC-generated code and should not be used directly.
+// Trigger a compile error if called with the wrong parameter type.
+FORCEINLINE
+_Ret_ McGenContext_microsoft_windows_mimalloc*
+_mcgen_CheckContextType_microsoft_windows_mimalloc(_In_ McGenContext_microsoft_windows_mimalloc* pContext)
+{
+    return pContext;
+}
+
+#endif // MCGEN_ENABLE_FORCONTEXT_CODE_GENERATION
+
+//
+// Enablement check macro for event "ETW_MI_ALLOC"
+//
+#define EventEnabledETW_MI_ALLOC() _mcgen_EVENT_BIT_SET(microsoft_windows_mimallocEnableBits, 0)
+#define EventEnabledETW_MI_ALLOC_ForContext(pContext) _mcgen_EVENT_BIT_SET(_mcgen_CheckContextType_microsoft_windows_mimalloc(pContext)->EnableBits, 0)
+
+//
+// Event write macros for event "ETW_MI_ALLOC"
+//
+#define EventWriteETW_MI_ALLOC(Address, Size) \
+        MCGEN_EVENT_ENABLED(ETW_MI_ALLOC) \
+        ? _mcgen_TEMPLATE_FOR_ETW_MI_ALLOC(&ETW_MI_Provider_Context, &ETW_MI_ALLOC, Address, Size) : 0
+#define EventWriteETW_MI_ALLOC_AssumeEnabled(Address, Size) \
+        _mcgen_TEMPLATE_FOR_ETW_MI_ALLOC(&ETW_MI_Provider_Context, &ETW_MI_ALLOC, Address, Size)
+#define EventWriteETW_MI_ALLOC_ForContext(pContext, Address, Size) \
+        MCGEN_EVENT_ENABLED_FORCONTEXT(pContext, ETW_MI_ALLOC) \
+        ? _mcgen_TEMPLATE_FOR_ETW_MI_ALLOC(&(pContext)->Context, &ETW_MI_ALLOC, Address, Size) : 0
+#define EventWriteETW_MI_ALLOC_ForContextAssumeEnabled(pContext, Address, Size) \
+        _mcgen_TEMPLATE_FOR_ETW_MI_ALLOC(&_mcgen_CheckContextType_microsoft_windows_mimalloc(pContext)->Context, &ETW_MI_ALLOC, Address, Size)
+
+// This macro is for use by MC-generated code and should not be used directly.
+#define _mcgen_TEMPLATE_FOR_ETW_MI_ALLOC _mcgen_PASTE2(McTemplateU0xx_, MCGEN_EVENTWRITETRANSFER)
+
+//
+// Enablement check macro for event "ETW_MI_FREE"
+//
+#define EventEnabledETW_MI_FREE() _mcgen_EVENT_BIT_SET(microsoft_windows_mimallocEnableBits, 0)
+#define EventEnabledETW_MI_FREE_ForContext(pContext) _mcgen_EVENT_BIT_SET(_mcgen_CheckContextType_microsoft_windows_mimalloc(pContext)->EnableBits, 0)
+
+//
+// Event write macros for event "ETW_MI_FREE"
+//
+#define EventWriteETW_MI_FREE(Address, Size) \
+        MCGEN_EVENT_ENABLED(ETW_MI_FREE) \
+        ? _mcgen_TEMPLATE_FOR_ETW_MI_FREE(&ETW_MI_Provider_Context, &ETW_MI_FREE, Address, Size) : 0
+#define EventWriteETW_MI_FREE_AssumeEnabled(Address, Size) \
+        _mcgen_TEMPLATE_FOR_ETW_MI_FREE(&ETW_MI_Provider_Context, &ETW_MI_FREE, Address, Size)
+#define EventWriteETW_MI_FREE_ForContext(pContext, Address, Size) \
+        MCGEN_EVENT_ENABLED_FORCONTEXT(pContext, ETW_MI_FREE) \
+        ? _mcgen_TEMPLATE_FOR_ETW_MI_FREE(&(pContext)->Context, &ETW_MI_FREE, Address, Size) : 0
+#define EventWriteETW_MI_FREE_ForContextAssumeEnabled(pContext, Address, Size) \
+        _mcgen_TEMPLATE_FOR_ETW_MI_FREE(&_mcgen_CheckContextType_microsoft_windows_mimalloc(pContext)->Context, &ETW_MI_FREE, Address, Size)
+
+// This macro is for use by MC-generated code and should not be used directly.
+#define _mcgen_TEMPLATE_FOR_ETW_MI_FREE _mcgen_PASTE2(McTemplateU0xx_, MCGEN_EVENTWRITETRANSFER)
+
+#endif // MCGEN_DISABLE_PROVIDER_CODE_GENERATION
+
+//
+// MCGEN_DISABLE_PROVIDER_CODE_GENERATION macro:
+// Define this macro to have the compiler skip the generated functions in this
+// header.
+//
+#ifndef MCGEN_DISABLE_PROVIDER_CODE_GENERATION
+
+//
+// Template Functions
+//
+
+//
+// Function for template "ETW_CUSTOM_HEAP_ALLOC_DATA" (and possibly others).
+// This function is for use by MC-generated code and should not be used directly.
+//
+#ifndef McTemplateU0xx_def
+#define McTemplateU0xx_def
+ETW_INLINE
+ULONG
+_mcgen_PASTE2(McTemplateU0xx_, MCGEN_EVENTWRITETRANSFER)(
+    _In_ PMCGEN_TRACE_CONTEXT Context,
+    _In_ PCEVENT_DESCRIPTOR Descriptor,
+    _In_ const unsigned __int64  _Arg0,
+    _In_ const unsigned __int64  _Arg1
+    )
+{
+#define McTemplateU0xx_ARGCOUNT 2
+
+    EVENT_DATA_DESCRIPTOR EventData[McTemplateU0xx_ARGCOUNT + 1];
+
+    EventDataDescCreate(&EventData[1],&_Arg0, sizeof(const unsigned __int64)  );
+
+    EventDataDescCreate(&EventData[2],&_Arg1, sizeof(const unsigned __int64)  );
+
+    return McGenEventWrite(Context, Descriptor, NULL, McTemplateU0xx_ARGCOUNT + 1, EventData);
+}
+#endif // McTemplateU0xx_def
+
+#endif // MCGEN_DISABLE_PROVIDER_CODE_GENERATION
+
+#if defined(__cplusplus)
+}
+#endif
diff --git a/depends/mimalloc/src/prim/windows/etw.man b/depends/mimalloc/src/prim/windows/etw.man
new file mode 100644
index 0000000000000000000000000000000000000000..cfd1f8a9eaacd50af63f1e28f9540aa88c20f90c
GIT binary patch
literal 3926
zcmeH~T~8B16o${WiT`2c+NGc<*i;EYh$d8xl<0*CS-Mb~v<qPu>PP(R>hsQY*nU!q
z$b})3?##}d?{nTW+uy%xwr*doYaNU1!Vc}sa%<a(W%kk*Y}poVi8<mVvnKl~r<t|f
z>7F%g+hVAmL$hwL?4dodnmuAKhUXm0)X9|WHj>XRahh@~SWDIkbduX;B#u6^Q>@U=
zDO8U+KXa0*th&%f*z^Udh4ol@uE=Q&`emUsh_CA`FOXgI{i-`XZ9C#bR1yBm=PJ*p
z9kVN$J6O;h;8HY>p)RnhY8A#Hb?z)_!y(Iaen(I)@-9CrSSp(;_Jn9I*$S&ATjP1?
zVxB>pV@LVsy;^jZr7r$HNAm06TcUiI`l@~F$Mt$E%Shfd3O+h1vFhR9a8yQZ@wpne
zr3bI-p=VEdo{)#uWxSVJeYQF|-5tnq>~f+CP~A0&{v=(up=ngEDl>5!$EDwPRaNjW
zXj|wbG$OwmwaW-hMvBK%pbm3wpic7<iGe1}wLX@G{?G|Bd>1O^dzbxT%*13+SP9h-
zI~rA5hapTVnk|qmiIVYy{__+x9f7OV4j3`g4;{{8_SWnLBSu2PUc%~`t%Ae^>J`SS
zdtZg-r<0xAH*_ALtK;Nv(d9nbKK1jK=Ld)I(jQrKhBjgToR#Wm8{0a}@6ZuEO<gbQ
zB3m5V%^3-v%%-25hY;g1&y$zH6XrqQ2)nL|zy>(lvG=y=Jh{M!4!-$(E)!vYUrf47
z<hkOaGap-@>nf4W$e&QFOovV_$>J%X*KN>oXI@jt%BJms>IU}I$<7<wvJG;y&ofxL
zZ?Ac4@EfiF;Qh3@Hq?u*mxUl}o``PSN9^9363^xS{`lRzaEI{>Hr{PChchs%+mx{%
zt(fa_PM4r63?1h#YOk~;byc5`>%q>sLHA1gohNq{qOREhxu<<B25jv)bQOG~tvEXM
zsbYvycWRYgeO<KaNEs4R@T0H57CiG+erb6HDME8{V+nzO*!Nwm{Em&P|NqBp)%s}N
z&KLRG82>y~`}YVhGe0?R_ceQ8vt^BpSNp6kErj_0hUNFyWQ1IOZ|GEgWBPwYFLgFu
Oo!*uqEBu%Ae18C_t1cS=

literal 0
HcmV?d00001

diff --git a/depends/mimalloc/src/prim/windows/prim.c b/depends/mimalloc/src/prim/windows/prim.c
new file mode 100644
index 000000000000..6ac32cea09e4
--- /dev/null
+++ b/depends/mimalloc/src/prim/windows/prim.c
@@ -0,0 +1,915 @@
+/* ----------------------------------------------------------------------------
+Copyright (c) 2018-2023, Microsoft Research, Daan Leijen
+This is free software; you can redistribute it and/or modify it under the
+terms of the MIT license. A copy of the license can be found in the file
+"LICENSE" at the root of this distribution.
+-----------------------------------------------------------------------------*/
+
+// This file is included in `src/prim/prim.c`
+
+#include "mimalloc.h"
+#include "mimalloc/internal.h"
+#include "mimalloc/prim.h"
+#include <stdio.h>   // fputs, stderr
+
+// xbox has no console IO
+#if !defined(WINAPI_FAMILY_PARTITION) || WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_APP | WINAPI_PARTITION_SYSTEM)
+#define MI_HAS_CONSOLE_IO
+#endif
+
+//---------------------------------------------
+// Dynamically bind Windows API points for portability
+//---------------------------------------------
+
+#if defined(_MSC_VER)
+#pragma warning(disable:4996)   // don't use GetVersionExW
+#endif
+
+static DWORD win_major_version = 6;
+static DWORD win_minor_version = 0;
+
+// We use VirtualAlloc2 for aligned allocation, but it is only supported on Windows 10 and Windows Server 2016.
+// So, we need to look it up dynamically to run on older systems. (use __stdcall for 32-bit compatibility)
+// NtAllocateVirtualAllocEx is used for huge OS page allocation (1GiB)
+// We define a minimal MEM_EXTENDED_PARAMETER ourselves in order to be able to compile with older SDK's.
+typedef enum MI_MEM_EXTENDED_PARAMETER_TYPE_E {
+  MiMemExtendedParameterInvalidType = 0,
+  MiMemExtendedParameterAddressRequirements,
+  MiMemExtendedParameterNumaNode,
+  MiMemExtendedParameterPartitionHandle,
+  MiMemExtendedParameterUserPhysicalHandle,
+  MiMemExtendedParameterAttributeFlags,
+  MiMemExtendedParameterMax
+} MI_MEM_EXTENDED_PARAMETER_TYPE;
+
+typedef struct DECLSPEC_ALIGN(8) MI_MEM_EXTENDED_PARAMETER_S {
+  struct { DWORD64 Type : 8; DWORD64 Reserved : 56; } Type;
+  union  { DWORD64 ULong64; PVOID Pointer; SIZE_T Size; HANDLE Handle; DWORD ULong; } Arg;
+} MI_MEM_EXTENDED_PARAMETER;
+
+typedef struct MI_MEM_ADDRESS_REQUIREMENTS_S {
+  PVOID  LowestStartingAddress;
+  PVOID  HighestEndingAddress;
+  SIZE_T Alignment;
+} MI_MEM_ADDRESS_REQUIREMENTS;
+
+#define MI_MEM_EXTENDED_PARAMETER_NONPAGED_HUGE   0x00000010
+
+#include <winternl.h>
+typedef PVOID (__stdcall *PVirtualAlloc2)(HANDLE, PVOID, SIZE_T, ULONG, ULONG, MI_MEM_EXTENDED_PARAMETER*, ULONG);
+typedef LONG  (__stdcall *PNtAllocateVirtualMemoryEx)(HANDLE, PVOID*, SIZE_T*, ULONG, ULONG, MI_MEM_EXTENDED_PARAMETER*, ULONG);  // avoid NTSTATUS as it is not defined on xbox (pr #1084)
+static PVirtualAlloc2 pVirtualAlloc2 = NULL;
+static PNtAllocateVirtualMemoryEx pNtAllocateVirtualMemoryEx = NULL;
+
+// Similarly, GetNumaProcessorNodeEx is only supported since Windows 7  (and GetNumaNodeProcessorMask is not supported on xbox)
+typedef struct MI_PROCESSOR_NUMBER_S { WORD Group; BYTE Number; BYTE Reserved; } MI_PROCESSOR_NUMBER;
+
+typedef VOID (__stdcall *PGetCurrentProcessorNumberEx)(MI_PROCESSOR_NUMBER* ProcNumber);
+typedef BOOL (__stdcall *PGetNumaProcessorNodeEx)(MI_PROCESSOR_NUMBER* Processor, PUSHORT NodeNumber);
+typedef BOOL (__stdcall* PGetNumaNodeProcessorMaskEx)(USHORT Node, PGROUP_AFFINITY ProcessorMask);
+typedef BOOL (__stdcall *PGetNumaProcessorNode)(UCHAR Processor, PUCHAR NodeNumber);
+typedef BOOL (__stdcall* PGetNumaNodeProcessorMask)(UCHAR Node, PULONGLONG ProcessorMask);
+typedef BOOL (__stdcall* PGetNumaHighestNodeNumber)(PULONG Node);
+static PGetCurrentProcessorNumberEx pGetCurrentProcessorNumberEx = NULL;
+static PGetNumaProcessorNodeEx      pGetNumaProcessorNodeEx = NULL;
+static PGetNumaNodeProcessorMaskEx  pGetNumaNodeProcessorMaskEx = NULL;
+static PGetNumaProcessorNode        pGetNumaProcessorNode = NULL;
+static PGetNumaNodeProcessorMask    pGetNumaNodeProcessorMask = NULL;
+static PGetNumaHighestNodeNumber    pGetNumaHighestNodeNumber = NULL;
+
+// Not available on xbox
+typedef SIZE_T(__stdcall* PGetLargePageMinimum)(VOID);
+static PGetLargePageMinimum pGetLargePageMinimum = NULL;
+
+// Available after Windows XP
+typedef BOOL (__stdcall *PGetPhysicallyInstalledSystemMemory)( PULONGLONG TotalMemoryInKilobytes );
+typedef BOOL (__stdcall* PGetVersionExW)(LPOSVERSIONINFOW lpVersionInformation);
+
+
+//---------------------------------------------
+// Enable large page support dynamically (if possible)
+//---------------------------------------------
+
+static bool win_enable_large_os_pages(size_t* large_page_size)
+{
+  static bool large_initialized = false;
+  if (large_initialized) return (_mi_os_large_page_size() > 0);
+  large_initialized = true;
+  if (pGetLargePageMinimum==NULL) return false;  // no large page support (xbox etc.)
+
+  // Try to see if large OS pages are supported
+  // To use large pages on Windows, we first need access permission
+  // Set "Lock pages in memory" permission in the group policy editor
+  // <https://devblogs.microsoft.com/oldnewthing/20110128-00/?p=11643>
+  unsigned long err = 0;
+  HANDLE token = NULL;
+  BOOL ok = OpenProcessToken(GetCurrentProcess(), TOKEN_ADJUST_PRIVILEGES | TOKEN_QUERY, &token);
+  if (ok) {
+    TOKEN_PRIVILEGES tp;
+    ok = LookupPrivilegeValue(NULL, TEXT("SeLockMemoryPrivilege"), &tp.Privileges[0].Luid);
+    if (ok) {
+      tp.PrivilegeCount = 1;
+      tp.Privileges[0].Attributes = SE_PRIVILEGE_ENABLED;
+      ok = AdjustTokenPrivileges(token, FALSE, &tp, 0, (PTOKEN_PRIVILEGES)NULL, 0);
+      if (ok) {
+        err = GetLastError();
+        ok = (err == ERROR_SUCCESS);
+        if (ok && large_page_size != NULL && pGetLargePageMinimum != NULL) {
+          *large_page_size = (*pGetLargePageMinimum)();
+        }
+      }
+    }
+    CloseHandle(token);
+  }
+  if (!ok) {
+    if (err == 0) err = GetLastError();
+    _mi_warning_message("cannot enable large OS page support, error %lu\n", err);
+  }
+  return (ok!=0);
+}
+
+
+//---------------------------------------------
+// Initialize
+//---------------------------------------------
+
+static DWORD win_allocation_granularity = 64*MI_KiB;
+
+void _mi_prim_mem_init( mi_os_mem_config_t* config )
+{
+  config->has_overcommit = false;
+  config->has_partial_free = false;
+  config->has_virtual_reserve = true;
+  
+  // get the page size
+  SYSTEM_INFO si; _mi_memzero_var(si);
+  GetSystemInfo(&si);
+  if (si.dwPageSize > 0) { config->page_size = si.dwPageSize; }
+  if (si.dwAllocationGranularity > 0) {
+    config->alloc_granularity = si.dwAllocationGranularity;
+    win_allocation_granularity = si.dwAllocationGranularity;
+  }
+  // get virtual address bits
+  if ((uintptr_t)si.lpMaximumApplicationAddress > 0) {
+    const size_t vbits = MI_SIZE_BITS - mi_clz((uintptr_t)si.lpMaximumApplicationAddress);
+    config->virtual_address_bits = vbits;
+  }
+
+  // get the VirtualAlloc2 function
+  HINSTANCE hDll = LoadLibrary(TEXT("kernelbase.dll"));
+  if (hDll != NULL) {
+    // use VirtualAlloc2FromApp if possible as it is available to Windows store apps
+    pVirtualAlloc2 = (PVirtualAlloc2)(void (*)(void))GetProcAddress(hDll, "VirtualAlloc2FromApp");
+    if (pVirtualAlloc2==NULL) pVirtualAlloc2 = (PVirtualAlloc2)(void (*)(void))GetProcAddress(hDll, "VirtualAlloc2");
+    FreeLibrary(hDll);
+  }
+  // NtAllocateVirtualMemoryEx is used for huge page allocation
+  hDll = LoadLibrary(TEXT("ntdll.dll"));
+  if (hDll != NULL) {
+    pNtAllocateVirtualMemoryEx = (PNtAllocateVirtualMemoryEx)(void (*)(void))GetProcAddress(hDll, "NtAllocateVirtualMemoryEx");
+    FreeLibrary(hDll);
+  }
+  // Try to use Win7+ numa API
+  hDll = LoadLibrary(TEXT("kernel32.dll"));
+  if (hDll != NULL) {
+    pGetCurrentProcessorNumberEx = (PGetCurrentProcessorNumberEx)(void (*)(void))GetProcAddress(hDll, "GetCurrentProcessorNumberEx");
+    pGetNumaProcessorNodeEx = (PGetNumaProcessorNodeEx)(void (*)(void))GetProcAddress(hDll, "GetNumaProcessorNodeEx");
+    pGetNumaNodeProcessorMaskEx = (PGetNumaNodeProcessorMaskEx)(void (*)(void))GetProcAddress(hDll, "GetNumaNodeProcessorMaskEx");
+    pGetNumaProcessorNode = (PGetNumaProcessorNode)(void (*)(void))GetProcAddress(hDll, "GetNumaProcessorNode");
+    pGetNumaNodeProcessorMask = (PGetNumaNodeProcessorMask)(void (*)(void))GetProcAddress(hDll, "GetNumaNodeProcessorMask");
+    pGetNumaHighestNodeNumber = (PGetNumaHighestNodeNumber)(void (*)(void))GetProcAddress(hDll, "GetNumaHighestNodeNumber");
+    pGetLargePageMinimum = (PGetLargePageMinimum)(void (*)(void))GetProcAddress(hDll, "GetLargePageMinimum");
+    // Get physical memory (not available on XP, so check dynamically)
+    PGetPhysicallyInstalledSystemMemory pGetPhysicallyInstalledSystemMemory = (PGetPhysicallyInstalledSystemMemory)(void (*)(void))GetProcAddress(hDll,"GetPhysicallyInstalledSystemMemory");
+    if (pGetPhysicallyInstalledSystemMemory != NULL) {
+      ULONGLONG memInKiB = 0;
+      if ((*pGetPhysicallyInstalledSystemMemory)(&memInKiB)) {
+        if (memInKiB > 0 && memInKiB <= SIZE_MAX) {
+          config->physical_memory_in_kib = (size_t)memInKiB;
+        }
+      }
+    }
+    // Get Windows version
+    PGetVersionExW pGetVersionExW = (PGetVersionExW)(void (*)(void))GetProcAddress(hDll, "GetVersionExW");
+    if (pGetVersionExW != NULL) {
+      OSVERSIONINFOW version; _mi_memzero_var(version);
+      version.dwOSVersionInfoSize = sizeof(version);
+      if ((*pGetVersionExW)(&version)) {
+        win_major_version = version.dwMajorVersion;
+        win_minor_version = version.dwMinorVersion;
+      }
+    }
+    FreeLibrary(hDll);
+  }
+  // Enable large/huge OS page support?
+  if (mi_option_is_enabled(mi_option_allow_large_os_pages) || mi_option_is_enabled(mi_option_reserve_huge_os_pages)) {
+    win_enable_large_os_pages(&config->large_page_size);
+  }
+}
+
+
+//---------------------------------------------
+// Free
+//---------------------------------------------
+
+int _mi_prim_free(void* addr, size_t size ) {
+  MI_UNUSED(size);
+  DWORD errcode = 0;
+  bool err = (VirtualFree(addr, 0, MEM_RELEASE) == 0);
+  if (err) { errcode = GetLastError(); }
+  if (errcode == ERROR_INVALID_ADDRESS) {
+    // In mi_os_mem_alloc_aligned the fallback path may have returned a pointer inside
+    // the memory region returned by VirtualAlloc; in that case we need to free using
+    // the start of the region.
+    MEMORY_BASIC_INFORMATION info; _mi_memzero_var(info);
+    VirtualQuery(addr, &info, sizeof(info));
+    if (info.AllocationBase < addr && ((uint8_t*)addr - (uint8_t*)info.AllocationBase) < (ptrdiff_t)(4*MI_MiB)) {
+      errcode = 0;
+      err = (VirtualFree(info.AllocationBase, 0, MEM_RELEASE) == 0);
+      if (err) { errcode = GetLastError(); }
+    }
+  }
+  return (int)errcode;
+}
+
+
+//---------------------------------------------
+// VirtualAlloc
+//---------------------------------------------
+
+static void* win_virtual_alloc_prim_once(void* addr, size_t size, size_t try_alignment, DWORD flags) {
+  #if (MI_INTPTR_SIZE >= 8)
+  // on 64-bit systems, try to use the virtual address area after 2TiB for 4MiB aligned allocations
+  if (addr == NULL) {
+    void* hint = _mi_os_get_aligned_hint(try_alignment,size);
+    if (hint != NULL) {
+      void* p = VirtualAlloc(hint, size, flags, PAGE_READWRITE);
+      if (p != NULL) return p;
+      _mi_verbose_message("warning: unable to allocate hinted aligned OS memory (%zu bytes, error code: 0x%x, address: %p, alignment: %zu, flags: 0x%x)\n", size, GetLastError(), hint, try_alignment, flags);
+      // fall through on error
+    }
+  }
+  #endif
+  // on modern Windows try use VirtualAlloc2 for aligned allocation
+  if (addr == NULL && try_alignment > win_allocation_granularity && (try_alignment % _mi_os_page_size()) == 0 && pVirtualAlloc2 != NULL) {
+    MI_MEM_ADDRESS_REQUIREMENTS reqs = { 0, 0, 0 };
+    reqs.Alignment = try_alignment;
+    MI_MEM_EXTENDED_PARAMETER param = { {0, 0}, {0} };
+    param.Type.Type = MiMemExtendedParameterAddressRequirements;
+    param.Arg.Pointer = &reqs;
+    void* p = (*pVirtualAlloc2)(GetCurrentProcess(), addr, size, flags, PAGE_READWRITE, &param, 1);
+    if (p != NULL) return p;
+    _mi_warning_message("unable to allocate aligned OS memory (0x%zx bytes, error code: 0x%x, address: %p, alignment: 0x%zx, flags: 0x%x)\n", size, GetLastError(), addr, try_alignment, flags);
+    // fall through on error
+  }
+  // last resort
+  return VirtualAlloc(addr, size, flags, PAGE_READWRITE);
+}
+
+static bool win_is_out_of_memory_error(DWORD err) {
+  switch (err) {
+    case ERROR_COMMITMENT_MINIMUM:
+    case ERROR_COMMITMENT_LIMIT:
+    case ERROR_PAGEFILE_QUOTA:
+    case ERROR_NOT_ENOUGH_MEMORY:
+      return true;
+    default:
+      return false;
+  }
+}
+
+static void* win_virtual_alloc_prim(void* addr, size_t size, size_t try_alignment, DWORD flags) {
+  long max_retry_msecs = mi_option_get_clamp(mi_option_retry_on_oom, 0, 2000);  // at most 2 seconds
+  if (max_retry_msecs == 1) { max_retry_msecs = 100; }  // if one sets the option to "true"
+  for (long tries = 1; tries <= 10; tries++) {          // try at most 10 times (=2200ms)
+    void* p = win_virtual_alloc_prim_once(addr, size, try_alignment, flags);
+    if (p != NULL) {
+      // success, return the address
+      return p;
+    }
+    else if (max_retry_msecs > 0 && (try_alignment <= 8*MI_MiB) &&
+              (flags&MEM_COMMIT) != 0 && (flags&MEM_LARGE_PAGES) == 0 &&
+              win_is_out_of_memory_error(GetLastError())) {
+      // if committing regular memory and being out-of-memory,
+      // keep trying for a bit in case memory frees up after all. See issue #894
+      _mi_warning_message("out-of-memory on OS allocation, try again... (attempt %lu, 0x%zx bytes, error code: 0x%x, address: %p, alignment: 0x%zx, flags: 0x%x)\n", tries, size, GetLastError(), addr, try_alignment, flags);
+      long sleep_msecs = tries*40;  // increasing waits
+      if (sleep_msecs > max_retry_msecs) { sleep_msecs = max_retry_msecs; }
+      max_retry_msecs -= sleep_msecs;
+      Sleep(sleep_msecs);
+    }
+    else {
+      // otherwise return with an error
+      break;
+    }
+  }
+  return NULL;
+}
+
+static void* win_virtual_alloc(void* addr, size_t size, size_t try_alignment, DWORD flags, bool large_only, bool allow_large, bool* is_large) {
+  mi_assert_internal(!(large_only && !allow_large));
+  static _Atomic(size_t) large_page_try_ok; // = 0;
+  void* p = NULL;
+  // Try to allocate large OS pages (2MiB) if allowed or required.
+  if ((large_only || _mi_os_use_large_page(size, try_alignment))
+      && allow_large && (flags&MEM_COMMIT)!=0 && (flags&MEM_RESERVE)!=0) {
+    size_t try_ok = mi_atomic_load_acquire(&large_page_try_ok);
+    if (!large_only && try_ok > 0) {
+      // if a large page allocation fails, it seems the calls to VirtualAlloc get very expensive.
+      // therefore, once a large page allocation failed, we don't try again for `large_page_try_ok` times.
+      mi_atomic_cas_strong_acq_rel(&large_page_try_ok, &try_ok, try_ok - 1);
+    }
+    else {
+      // large OS pages must always reserve and commit.
+      *is_large = true;
+      p = win_virtual_alloc_prim(addr, size, try_alignment, flags | MEM_LARGE_PAGES);
+      if (large_only) return p;
+      // fall back to non-large page allocation on error (`p == NULL`).
+      if (p == NULL) {
+        mi_atomic_store_release(&large_page_try_ok,10UL);  // on error, don't try again for the next N allocations
+      }
+    }
+  }
+  // Fall back to regular page allocation
+  if (p == NULL) {
+    *is_large = ((flags&MEM_LARGE_PAGES) != 0);
+    p = win_virtual_alloc_prim(addr, size, try_alignment, flags);
+  }
+  //if (p == NULL) { _mi_warning_message("unable to allocate OS memory (%zu bytes, error code: 0x%x, address: %p, alignment: %zu, flags: 0x%x, large only: %d, allow large: %d)\n", size, GetLastError(), addr, try_alignment, flags, large_only, allow_large); }
+  return p;
+}
+
+int _mi_prim_alloc(void* hint_addr, size_t size, size_t try_alignment, bool commit, bool allow_large, bool* is_large, bool* is_zero, void** addr) {
+  mi_assert_internal(size > 0 && (size % _mi_os_page_size()) == 0);
+  mi_assert_internal(commit || !allow_large);
+  mi_assert_internal(try_alignment > 0);
+  *is_zero = true;
+  int flags = MEM_RESERVE;
+  if (commit) { flags |= MEM_COMMIT; }
+  *addr = win_virtual_alloc(hint_addr, size, try_alignment, flags, false, allow_large, is_large);
+  return (*addr != NULL ? 0 : (int)GetLastError());
+}
+
+
+//---------------------------------------------
+// Commit/Reset/Protect
+//---------------------------------------------
+#ifdef _MSC_VER
+#pragma warning(disable:6250)   // suppress warning calling VirtualFree without MEM_RELEASE (for decommit)
+#endif
+
+int _mi_prim_commit(void* addr, size_t size, bool* is_zero) {
+  *is_zero = false;
+  /*
+  // zero'ing only happens on an initial commit... but checking upfront seems expensive..
+  _MEMORY_BASIC_INFORMATION meminfo; _mi_memzero_var(meminfo);
+  if (VirtualQuery(addr, &meminfo, size) > 0) {
+    if ((meminfo.State & MEM_COMMIT) == 0) {
+      *is_zero = true;
+    }
+  }
+  */
+  // commit
+  void* p = VirtualAlloc(addr, size, MEM_COMMIT, PAGE_READWRITE);
+  if (p == NULL) return (int)GetLastError();
+  return 0;
+}
+
+int _mi_prim_decommit(void* addr, size_t size, bool* needs_recommit) {
+  BOOL ok = VirtualFree(addr, size, MEM_DECOMMIT);
+  *needs_recommit = true;  // for safety, assume always decommitted even in the case of an error.
+  return (ok ? 0 : (int)GetLastError());
+}
+
+int _mi_prim_reset(void* addr, size_t size) {
+  void* p = VirtualAlloc(addr, size, MEM_RESET, PAGE_READWRITE);
+  mi_assert_internal(p == addr);
+  #if 0
+  if (p != NULL) {
+    VirtualUnlock(addr,size); // VirtualUnlock after MEM_RESET removes the memory directly from the working set
+  }
+  #endif
+  return (p != NULL ? 0 : (int)GetLastError());
+}
+
+int _mi_prim_reuse(void* addr, size_t size) {
+  MI_UNUSED(addr); MI_UNUSED(size);
+  return 0;
+}
+
+int _mi_prim_protect(void* addr, size_t size, bool protect) {
+  DWORD oldprotect = 0;
+  BOOL ok = VirtualProtect(addr, size, protect ? PAGE_NOACCESS : PAGE_READWRITE, &oldprotect);
+  return (ok ? 0 : (int)GetLastError());
+}
+
+
+//---------------------------------------------
+// Huge page allocation
+//---------------------------------------------
+
+static void* _mi_prim_alloc_huge_os_pagesx(void* hint_addr, size_t size, int numa_node)
+{
+  const DWORD flags = MEM_LARGE_PAGES | MEM_COMMIT | MEM_RESERVE;
+
+  win_enable_large_os_pages(NULL);
+
+  MI_MEM_EXTENDED_PARAMETER params[3] = { {{0,0},{0}},{{0,0},{0}},{{0,0},{0}} };
+  // on modern Windows try use NtAllocateVirtualMemoryEx for 1GiB huge pages
+  static bool mi_huge_pages_available = true;
+  if (pNtAllocateVirtualMemoryEx != NULL && mi_huge_pages_available) {
+    params[0].Type.Type = MiMemExtendedParameterAttributeFlags;
+    params[0].Arg.ULong64 = MI_MEM_EXTENDED_PARAMETER_NONPAGED_HUGE;
+    ULONG param_count = 1;
+    if (numa_node >= 0) {
+      param_count++;
+      params[1].Type.Type = MiMemExtendedParameterNumaNode;
+      params[1].Arg.ULong = (unsigned)numa_node;
+    }
+    SIZE_T psize = size;
+    void* base = hint_addr;
+    LONG err = (*pNtAllocateVirtualMemoryEx)(GetCurrentProcess(), &base, &psize, flags, PAGE_READWRITE, params, param_count);
+    if (err == 0 && base != NULL) {
+      return base;
+    }
+    else {
+      // fall back to regular large pages
+      mi_huge_pages_available = false; // don't try further huge pages
+      _mi_warning_message("unable to allocate using huge (1GiB) pages, trying large (2MiB) pages instead (status 0x%lx)\n", err);
+    }
+  }
+  // on modern Windows try use VirtualAlloc2 for numa aware large OS page allocation
+  if (pVirtualAlloc2 != NULL && numa_node >= 0) {
+    params[0].Type.Type = MiMemExtendedParameterNumaNode;
+    params[0].Arg.ULong = (unsigned)numa_node;
+    return (*pVirtualAlloc2)(GetCurrentProcess(), hint_addr, size, flags, PAGE_READWRITE, params, 1);
+  }
+
+  // otherwise use regular virtual alloc on older windows
+  return VirtualAlloc(hint_addr, size, flags, PAGE_READWRITE);
+}
+
+int _mi_prim_alloc_huge_os_pages(void* hint_addr, size_t size, int numa_node, bool* is_zero, void** addr) {
+  *is_zero = true;
+  *addr = _mi_prim_alloc_huge_os_pagesx(hint_addr,size,numa_node);
+  return (*addr != NULL ? 0 : (int)GetLastError());
+}
+
+
+//---------------------------------------------
+// Numa nodes
+//---------------------------------------------
+
+size_t _mi_prim_numa_node(void) {
+  USHORT numa_node = 0;
+  if (pGetCurrentProcessorNumberEx != NULL && pGetNumaProcessorNodeEx != NULL) {
+    // Extended API is supported
+    MI_PROCESSOR_NUMBER pnum;
+    (*pGetCurrentProcessorNumberEx)(&pnum);
+    USHORT nnode = 0;
+    BOOL ok = (*pGetNumaProcessorNodeEx)(&pnum, &nnode);
+    if (ok) { numa_node = nnode; }
+  }
+  else if (pGetNumaProcessorNode != NULL) {
+    // Vista or earlier, use older API that is limited to 64 processors. Issue #277
+    DWORD pnum = GetCurrentProcessorNumber();
+    UCHAR nnode = 0;
+    BOOL ok = pGetNumaProcessorNode((UCHAR)pnum, &nnode);
+    if (ok) { numa_node = nnode; }
+  }
+  return numa_node;
+}
+
+size_t _mi_prim_numa_node_count(void) {
+  ULONG numa_max = 0;
+  if (pGetNumaHighestNodeNumber!=NULL) {
+    (*pGetNumaHighestNodeNumber)(&numa_max);
+  }
+  // find the highest node number that has actual processors assigned to it. Issue #282
+  while (numa_max > 0) {
+    if (pGetNumaNodeProcessorMaskEx != NULL) {
+      // Extended API is supported
+      GROUP_AFFINITY affinity;
+      if ((*pGetNumaNodeProcessorMaskEx)((USHORT)numa_max, &affinity)) {
+        if (affinity.Mask != 0) break;  // found the maximum non-empty node
+      }
+    }
+    else {
+      // Vista or earlier, use older API that is limited to 64 processors.
+      ULONGLONG mask;
+      if (pGetNumaNodeProcessorMask != NULL) {
+        if ((*pGetNumaNodeProcessorMask)((UCHAR)numa_max, &mask)) {
+          if (mask != 0) break; // found the maximum non-empty node
+        }
+      };
+    }
+    // max node was invalid or had no processor assigned, try again
+    numa_max--;
+  }
+  return ((size_t)numa_max + 1);
+}
+
+
+//----------------------------------------------------------------
+// Clock
+//----------------------------------------------------------------
+
+static mi_msecs_t mi_to_msecs(LARGE_INTEGER t) {
+  static LARGE_INTEGER mfreq; // = 0
+  if (mfreq.QuadPart == 0LL) {
+    LARGE_INTEGER f;
+    QueryPerformanceFrequency(&f);
+    mfreq.QuadPart = f.QuadPart/1000LL;
+    if (mfreq.QuadPart == 0) mfreq.QuadPart = 1;
+  }
+  return (mi_msecs_t)(t.QuadPart / mfreq.QuadPart);
+}
+
+mi_msecs_t _mi_prim_clock_now(void) {
+  LARGE_INTEGER t;
+  QueryPerformanceCounter(&t);
+  return mi_to_msecs(t);
+}
+
+
+//----------------------------------------------------------------
+// Process Info
+//----------------------------------------------------------------
+
+#include <psapi.h>
+
+static mi_msecs_t filetime_msecs(const FILETIME* ftime) {
+  ULARGE_INTEGER i;
+  i.LowPart = ftime->dwLowDateTime;
+  i.HighPart = ftime->dwHighDateTime;
+  mi_msecs_t msecs = (i.QuadPart / 10000); // FILETIME is in 100 nano seconds
+  return msecs;
+}
+
+typedef BOOL (WINAPI *PGetProcessMemoryInfo)(HANDLE, PPROCESS_MEMORY_COUNTERS, DWORD);
+static PGetProcessMemoryInfo pGetProcessMemoryInfo = NULL;
+
+void _mi_prim_process_info(mi_process_info_t* pinfo)
+{
+  FILETIME ct;
+  FILETIME ut;
+  FILETIME st;
+  FILETIME et;
+  GetProcessTimes(GetCurrentProcess(), &ct, &et, &st, &ut);
+  pinfo->utime = filetime_msecs(&ut);
+  pinfo->stime = filetime_msecs(&st);
+
+  // load psapi on demand
+  if (pGetProcessMemoryInfo == NULL) {
+    HINSTANCE hDll = LoadLibrary(TEXT("psapi.dll"));
+    if (hDll != NULL) {
+      pGetProcessMemoryInfo = (PGetProcessMemoryInfo)(void (*)(void))GetProcAddress(hDll, "GetProcessMemoryInfo");
+    }
+  }
+
+  // get process info
+  PROCESS_MEMORY_COUNTERS info; _mi_memzero_var(info);
+  if (pGetProcessMemoryInfo != NULL) {
+    pGetProcessMemoryInfo(GetCurrentProcess(), &info, sizeof(info));
+  }
+  pinfo->current_rss    = (size_t)info.WorkingSetSize;
+  pinfo->peak_rss       = (size_t)info.PeakWorkingSetSize;
+  pinfo->current_commit = (size_t)info.PagefileUsage;
+  pinfo->peak_commit    = (size_t)info.PeakPagefileUsage;
+  pinfo->page_faults    = (size_t)info.PageFaultCount;
+}
+
+//----------------------------------------------------------------
+// Output
+//----------------------------------------------------------------
+
+void _mi_prim_out_stderr( const char* msg )
+{
+  // on windows with redirection, the C runtime cannot handle locale dependent output
+  // after the main thread closes so we use direct console output.
+  if (!_mi_preloading()) {
+    // _cputs(msg);  // _cputs cannot be used as it aborts when failing to lock the console
+    static HANDLE hcon = INVALID_HANDLE_VALUE;
+    static bool hconIsConsole = false;
+    if (hcon == INVALID_HANDLE_VALUE) {
+      hcon = GetStdHandle(STD_ERROR_HANDLE);
+      #ifdef MI_HAS_CONSOLE_IO
+      CONSOLE_SCREEN_BUFFER_INFO sbi;
+      hconIsConsole = ((hcon != INVALID_HANDLE_VALUE) && GetConsoleScreenBufferInfo(hcon, &sbi));
+      #endif  
+    }
+    const size_t len = _mi_strlen(msg);
+    if (len > 0 && len < UINT32_MAX) {
+      DWORD written = 0;
+      if (hconIsConsole) {
+        #ifdef MI_HAS_CONSOLE_IO
+        WriteConsoleA(hcon, msg, (DWORD)len, &written, NULL);
+        #endif      
+      }
+      else if (hcon != INVALID_HANDLE_VALUE) {
+        // use direct write if stderr was redirected
+        WriteFile(hcon, msg, (DWORD)len, &written, NULL);
+      }
+      else {
+        // finally fall back to fputs after all
+        fputs(msg, stderr);
+      }
+    }
+  }
+}
+
+
+//----------------------------------------------------------------
+// Environment
+//----------------------------------------------------------------
+
+// On Windows use GetEnvironmentVariable instead of getenv to work
+// reliably even when this is invoked before the C runtime is initialized.
+// i.e. when `_mi_preloading() == true`.
+// Note: on windows, environment names are not case sensitive.
+bool _mi_prim_getenv(const char* name, char* result, size_t result_size) {
+  result[0] = 0;
+  size_t len = GetEnvironmentVariableA(name, result, (DWORD)result_size);
+  return (len > 0 && len < result_size);
+}
+
+
+//----------------------------------------------------------------
+// Random
+//----------------------------------------------------------------
+
+#if defined(MI_USE_RTLGENRANDOM) // || defined(__cplusplus)
+// We prefer to use BCryptGenRandom instead of (the unofficial) RtlGenRandom but when using
+// dynamic overriding, we observed it can raise an exception when compiled with C++, and
+// sometimes deadlocks when also running under the VS debugger.
+// In contrast, issue #623 implies that on Windows Server 2019 we need to use BCryptGenRandom.
+// To be continued..
+#pragma comment (lib,"advapi32.lib")
+#define RtlGenRandom  SystemFunction036
+mi_decl_externc BOOLEAN NTAPI RtlGenRandom(PVOID RandomBuffer, ULONG RandomBufferLength);
+
+bool _mi_prim_random_buf(void* buf, size_t buf_len) {
+  return (RtlGenRandom(buf, (ULONG)buf_len) != 0);
+}
+
+#else
+
+#ifndef BCRYPT_USE_SYSTEM_PREFERRED_RNG
+#define BCRYPT_USE_SYSTEM_PREFERRED_RNG 0x00000002
+#endif
+
+typedef LONG (NTAPI *PBCryptGenRandom)(HANDLE, PUCHAR, ULONG, ULONG);
+static  PBCryptGenRandom pBCryptGenRandom = NULL;
+
+bool _mi_prim_random_buf(void* buf, size_t buf_len) {
+  if (pBCryptGenRandom == NULL) {
+    HINSTANCE hDll = LoadLibrary(TEXT("bcrypt.dll"));
+    if (hDll != NULL) {
+      pBCryptGenRandom = (PBCryptGenRandom)(void (*)(void))GetProcAddress(hDll, "BCryptGenRandom");
+    }
+    if (pBCryptGenRandom == NULL) return false;
+  }
+  return (pBCryptGenRandom(NULL, (PUCHAR)buf, (ULONG)buf_len, BCRYPT_USE_SYSTEM_PREFERRED_RNG) >= 0);
+}
+
+#endif  // MI_USE_RTLGENRANDOM
+
+
+
+//----------------------------------------------------------------
+// Process & Thread Init/Done
+//----------------------------------------------------------------
+
+#if MI_WIN_USE_FIXED_TLS==1
+mi_decl_cache_align size_t _mi_win_tls_offset = 0;
+#endif
+
+//static void mi_debug_out(const char* s) {
+//  HANDLE h = GetStdHandle(STD_ERROR_HANDLE);
+//  WriteConsole(h, s, (DWORD)_mi_strlen(s), NULL, NULL);
+//}
+
+static void mi_win_tls_init(DWORD reason) {
+  if (reason==DLL_PROCESS_ATTACH || reason==DLL_THREAD_ATTACH) {
+    #if MI_WIN_USE_FIXED_TLS==1  // we must allocate a TLS slot dynamically
+    if (_mi_win_tls_offset == 0 && reason == DLL_PROCESS_ATTACH) {
+      const DWORD tls_slot = TlsAlloc();  // usually returns slot 1
+      if (tls_slot == TLS_OUT_OF_INDEXES) {
+        _mi_error_message(EFAULT, "unable to allocate the a TLS slot (rebuild without MI_WIN_USE_FIXED_TLS?)\n");
+      }
+      _mi_win_tls_offset = (size_t)tls_slot * sizeof(void*);
+    }
+    #endif
+    #if MI_HAS_TLS_SLOT >= 2  // we must initialize the TLS slot before any allocation
+    if (mi_prim_get_default_heap() == NULL) {
+      _mi_heap_set_default_direct((mi_heap_t*)&_mi_heap_empty);
+      #if MI_DEBUG && MI_WIN_USE_FIXED_TLS==1
+      void* const p = TlsGetValue((DWORD)(_mi_win_tls_offset / sizeof(void*)));
+      mi_assert_internal(p == (void*)&_mi_heap_empty);
+      #endif
+    }
+    #endif
+  }
+}
+
+static void NTAPI mi_win_main(PVOID module, DWORD reason, LPVOID reserved) {
+  MI_UNUSED(reserved);
+  MI_UNUSED(module);
+  mi_win_tls_init(reason);
+  if (reason==DLL_PROCESS_ATTACH) {
+    _mi_auto_process_init();
+  }
+  else if (reason==DLL_PROCESS_DETACH) {
+    _mi_auto_process_done();
+  }
+  else if (reason==DLL_THREAD_DETACH && !_mi_is_redirected()) {
+    _mi_thread_done(NULL);
+  }
+}
+
+
+#if defined(MI_SHARED_LIB)
+  #define MI_PRIM_HAS_PROCESS_ATTACH  1
+
+  // Windows DLL: easy to hook into process_init and thread_done
+  BOOL WINAPI DllMain(HINSTANCE inst, DWORD reason, LPVOID reserved) {
+    mi_win_main((PVOID)inst,reason,reserved);
+    return TRUE;
+  }
+
+  // nothing to do since `_mi_thread_done` is handled through the DLL_THREAD_DETACH event.
+  void _mi_prim_thread_init_auto_done(void) { }
+  void _mi_prim_thread_done_auto_done(void) { }
+  void _mi_prim_thread_associate_default_heap(mi_heap_t* heap) {
+    MI_UNUSED(heap);
+  }
+
+#elif !defined(MI_WIN_USE_FLS)
+  #define MI_PRIM_HAS_PROCESS_ATTACH  1
+
+  static void NTAPI mi_win_main_attach(PVOID module, DWORD reason, LPVOID reserved) {
+    if (reason == DLL_PROCESS_ATTACH || reason == DLL_THREAD_ATTACH) {
+      mi_win_main(module, reason, reserved);
+    }
+  }
+  static void NTAPI mi_win_main_detach(PVOID module, DWORD reason, LPVOID reserved) {
+    if (reason == DLL_PROCESS_DETACH || reason == DLL_THREAD_DETACH) {
+      mi_win_main(module, reason, reserved);
+    }
+  }
+
+  // Set up TLS callbacks in a statically linked library by using special data sections.
+  // See <https://stackoverflow.com/questions/14538159/tls-callback-in-windows>
+  // We use 2 entries to ensure we call attach events before constructors
+  // are called, and detach events after destructors are called.
+  #if defined(__cplusplus)
+  extern "C" {
+  #endif
+
+  #if defined(_WIN64)
+    #pragma comment(linker, "/INCLUDE:_tls_used")
+    #pragma comment(linker, "/INCLUDE:_mi_tls_callback_pre")
+    #pragma comment(linker, "/INCLUDE:_mi_tls_callback_post")
+    #pragma const_seg(".CRT$XLB")
+    extern const PIMAGE_TLS_CALLBACK _mi_tls_callback_pre[];
+    const PIMAGE_TLS_CALLBACK _mi_tls_callback_pre[] = { &mi_win_main_attach };
+    #pragma const_seg()
+    #pragma const_seg(".CRT$XLY")
+    extern const PIMAGE_TLS_CALLBACK _mi_tls_callback_post[];
+    const PIMAGE_TLS_CALLBACK _mi_tls_callback_post[] = { &mi_win_main_detach };
+    #pragma const_seg()
+  #else
+    #pragma comment(linker, "/INCLUDE:__tls_used")
+    #pragma comment(linker, "/INCLUDE:__mi_tls_callback_pre")
+    #pragma comment(linker, "/INCLUDE:__mi_tls_callback_post")
+    #pragma data_seg(".CRT$XLB")
+    PIMAGE_TLS_CALLBACK _mi_tls_callback_pre[] = { &mi_win_main_attach };
+    #pragma data_seg()
+    #pragma data_seg(".CRT$XLY")
+    PIMAGE_TLS_CALLBACK _mi_tls_callback_post[] = { &mi_win_main_detach };
+    #pragma data_seg()
+  #endif
+
+  #if defined(__cplusplus)
+  }
+  #endif
+
+  // nothing to do since `_mi_thread_done` is handled through the DLL_THREAD_DETACH event.
+  void _mi_prim_thread_init_auto_done(void) { }
+  void _mi_prim_thread_done_auto_done(void) { }
+  void _mi_prim_thread_associate_default_heap(mi_heap_t* heap) {
+    MI_UNUSED(heap);
+  }
+
+#else // deprecated: statically linked, use fiber api
+
+  #if defined(_MSC_VER) // on clang/gcc use the constructor attribute (in `src/prim/prim.c`)
+    // MSVC: use data section magic for static libraries
+    // See <https://www.codeguru.com/cpp/misc/misc/applicationcontrol/article.php/c6945/Running-Code-Before-and-After-Main.htm>
+    #define MI_PRIM_HAS_PROCESS_ATTACH 1
+
+    static int mi_process_attach(void) {
+      mi_win_main(NULL,DLL_PROCESS_ATTACH,NULL);
+      atexit(&_mi_auto_process_done);
+      return 0;
+    }
+    typedef int(*mi_crt_callback_t)(void);
+    #if defined(_WIN64)
+      #pragma comment(linker, "/INCLUDE:_mi_tls_callback")
+      #pragma section(".CRT$XIU", long, read)
+    #else
+      #pragma comment(linker, "/INCLUDE:__mi_tls_callback")
+    #endif
+    #pragma data_seg(".CRT$XIU")
+    mi_decl_externc mi_crt_callback_t _mi_tls_callback[] = { &mi_process_attach };
+    #pragma data_seg()
+  #endif
+
+  // use the fiber api for calling `_mi_thread_done`.
+  #include <fibersapi.h>
+  #if (_WIN32_WINNT < 0x600)  // before Windows Vista
+  WINBASEAPI DWORD WINAPI FlsAlloc( _In_opt_ PFLS_CALLBACK_FUNCTION lpCallback );
+  WINBASEAPI PVOID WINAPI FlsGetValue( _In_ DWORD dwFlsIndex );
+  WINBASEAPI BOOL  WINAPI FlsSetValue( _In_ DWORD dwFlsIndex, _In_opt_ PVOID lpFlsData );
+  WINBASEAPI BOOL  WINAPI FlsFree(_In_ DWORD dwFlsIndex);
+  #endif
+
+  static DWORD mi_fls_key = (DWORD)(-1);
+
+  static void NTAPI mi_fls_done(PVOID value) {
+    mi_heap_t* heap = (mi_heap_t*)value;
+    if (heap != NULL) {
+      _mi_thread_done(heap);
+      FlsSetValue(mi_fls_key, NULL);  // prevent recursion as _mi_thread_done may set it back to the main heap, issue #672
+    }
+  }
+
+  void _mi_prim_thread_init_auto_done(void) {
+    mi_fls_key = FlsAlloc(&mi_fls_done);
+  }
+
+  void _mi_prim_thread_done_auto_done(void) {
+    // call thread-done on all threads (except the main thread) to prevent
+    // dangling callback pointer if statically linked with a DLL; Issue #208
+    FlsFree(mi_fls_key);
+  }
+
+  void _mi_prim_thread_associate_default_heap(mi_heap_t* heap) {
+    mi_assert_internal(mi_fls_key != (DWORD)(-1));
+    FlsSetValue(mi_fls_key, heap);
+  }
+#endif
+
+// ----------------------------------------------------
+// Communicate with the redirection module on Windows
+// ----------------------------------------------------
+#if defined(MI_SHARED_LIB) && !defined(MI_WIN_NOREDIRECT)
+  #define MI_PRIM_HAS_ALLOCATOR_INIT 1
+
+  static bool mi_redirected = false;   // true if malloc redirects to mi_malloc
+
+  bool _mi_is_redirected(void) {
+    return mi_redirected;
+  }
+
+  #ifdef __cplusplus
+  extern "C" {
+  #endif
+  mi_decl_export void _mi_redirect_entry(DWORD reason) {
+    // called on redirection; careful as this may be called before DllMain
+    mi_win_tls_init(reason);
+    if (reason == DLL_PROCESS_ATTACH) {
+      mi_redirected = true;
+    }
+    else if (reason == DLL_PROCESS_DETACH) {
+      mi_redirected = false;
+    }
+    else if (reason == DLL_THREAD_DETACH) {
+      _mi_thread_done(NULL);
+    }
+  }
+  __declspec(dllimport) bool mi_cdecl mi_allocator_init(const char** message);
+  __declspec(dllimport) void mi_cdecl mi_allocator_done(void);
+  #ifdef __cplusplus
+  }
+  #endif
+  bool _mi_allocator_init(const char** message) {
+    return mi_allocator_init(message);
+  }
+  void _mi_allocator_done(void) {
+    mi_allocator_done();
+  }
+#endif
+
+bool _mi_prim_thread_is_in_threadpool(void) {
+  #if (MI_ARCH_X64 || MI_ARCH_X86 || MI_ARCH_ARM64)
+  if (win_major_version >= 6) {
+    // check if this thread belongs to a windows threadpool
+    // see: <https://www.geoffchappell.com/studies/windows/km/ntoskrnl/inc/api/pebteb/teb/index.htm>
+    struct _TEB* const teb = NtCurrentTeb();
+    void* const pool_data = *((void**)((uint8_t*)teb + (MI_SIZE_BITS == 32 ? 0x0F90 : 0x1778)));
+    return (pool_data != NULL);
+  }
+  #endif
+  return false;
+}
diff --git a/depends/mimalloc/src/prim/windows/readme.md b/depends/mimalloc/src/prim/windows/readme.md
new file mode 100644
index 000000000000..217c3d174db4
--- /dev/null
+++ b/depends/mimalloc/src/prim/windows/readme.md
@@ -0,0 +1,17 @@
+## Primitives:
+
+- `prim.c` contains Windows primitives for OS allocation.
+
+## Event Tracing for Windows (ETW)
+
+- `etw.h` is generated from `etw.man` which contains the manifest for mimalloc events.
+  (100 is an allocation, 101 is for a free)
+
+- `etw-mimalloc.wprp` is a profile for the Windows Performance Recorder (WPR).
+  In an admin prompt, you can use:
+  ```
+  > wpr -start src\prim\windows\etw-mimalloc.wprp -filemode
+  > <my mimalloc program>
+  > wpr -stop test.etl
+  ``` 
+  and then open `test.etl` in the Windows Performance Analyzer (WPA).
\ No newline at end of file
diff --git a/depends/mimalloc/src/random.c b/depends/mimalloc/src/random.c
index a5f5e6b829c3..990e4894f3be 100644
--- a/depends/mimalloc/src/random.c
+++ b/depends/mimalloc/src/random.c
@@ -4,14 +4,9 @@ This is free software; you can redistribute it and/or modify it under the
 terms of the MIT license. A copy of the license can be found in the file
 "LICENSE" at the root of this distribution.
 -----------------------------------------------------------------------------*/
-#ifndef _DEFAULT_SOURCE
-#define _DEFAULT_SOURCE   // for syscall() on Linux
-#endif
-
 #include "mimalloc.h"
-#include "mimalloc-internal.h"
-
-#include <string.h> // memset
+#include "mimalloc/internal.h"
+#include "mimalloc/prim.h"    // _mi_prim_random_buf
 
 /* ----------------------------------------------------------------------------
 We use our own PRNG to keep predictable performance of random number generation
@@ -37,15 +32,11 @@ The implementation uses regular C code which compiles very well on modern compil
 (gcc x64 has no register spills, and clang 6+ uses SSE instructions)
 -----------------------------------------------------------------------------*/
 
-static inline uint32_t rotl(uint32_t x, uint32_t shift) {
-  return (x << shift) | (x >> (32 - shift));
-}
-
 static inline void qround(uint32_t x[16], size_t a, size_t b, size_t c, size_t d) {
-  x[a] += x[b]; x[d] = rotl(x[d] ^ x[a], 16);
-  x[c] += x[d]; x[b] = rotl(x[b] ^ x[c], 12);
-  x[a] += x[b]; x[d] = rotl(x[d] ^ x[a], 8);
-  x[c] += x[d]; x[b] = rotl(x[b] ^ x[c], 7);
+  x[a] += x[b]; x[d] = mi_rotl32(x[d] ^ x[a], 16);
+  x[c] += x[d]; x[b] = mi_rotl32(x[b] ^ x[c], 12);
+  x[a] += x[b]; x[d] = mi_rotl32(x[d] ^ x[a], 8);
+  x[c] += x[d]; x[b] = mi_rotl32(x[b] ^ x[c], 7);
 }
 
 static void chacha_block(mi_random_ctx_t* ctx)
@@ -103,7 +94,7 @@ static void chacha_init(mi_random_ctx_t* ctx, const uint8_t key[32], uint64_t no
   // since we only use chacha for randomness (and not encryption) we
   // do not _need_ to read 32-bit values as little endian but we do anyways
   // just for being compatible :-)
-  memset(ctx, 0, sizeof(*ctx));
+  _mi_memzero(ctx, sizeof(*ctx));
   for (size_t i = 0; i < 4; i++) {
     const uint8_t* sigma = (uint8_t*)"expand 32-byte k";
     ctx->input[i] = read32(sigma,i);
@@ -118,7 +109,7 @@ static void chacha_init(mi_random_ctx_t* ctx, const uint8_t key[32], uint64_t no
 }
 
 static void chacha_split(mi_random_ctx_t* ctx, uint64_t nonce, mi_random_ctx_t* ctx_new) {
-  memset(ctx_new, 0, sizeof(*ctx_new));
+  _mi_memzero(ctx_new, sizeof(*ctx_new));
   _mi_memcpy(ctx_new->input, ctx->input, sizeof(ctx_new->input));
   ctx_new->input[12] = 0;
   ctx_new->input[13] = 0;
@@ -147,179 +138,72 @@ void _mi_random_split(mi_random_ctx_t* ctx, mi_random_ctx_t* ctx_new) {
 
 uintptr_t _mi_random_next(mi_random_ctx_t* ctx) {
   mi_assert_internal(mi_random_is_initialized(ctx));
-  #if MI_INTPTR_SIZE <= 4
-    return chacha_next32(ctx);
-  #elif MI_INTPTR_SIZE == 8
-    return (((uintptr_t)chacha_next32(ctx) << 32) | chacha_next32(ctx));
-  #else
-  # error "define mi_random_next for this platform"
-  #endif
+  uintptr_t r;
+  do {
+    #if MI_INTPTR_SIZE <= 4
+    r = chacha_next32(ctx);
+    #elif MI_INTPTR_SIZE == 8
+    r = (((uintptr_t)chacha_next32(ctx) << 32) | chacha_next32(ctx));
+    #else
+    # error "define mi_random_next for this platform"
+    #endif
+  } while (r==0);
+  return r;
 }
 
 
 /* ----------------------------------------------------------------------------
-To initialize a fresh random context we rely on the OS:
-- Windows     : BCryptGenRandom (or RtlGenRandom)
-- macOS       : CCRandomGenerateBytes, arc4random_buf
-- bsd,wasi    : arc4random_buf
-- Linux       : getrandom,/dev/urandom
+To initialize a fresh random context.
 If we cannot get good randomness, we fall back to weak randomness based on a timer and ASLR.
 -----------------------------------------------------------------------------*/
 
-#if defined(_WIN32)
-
-#if defined(MI_USE_RTLGENRANDOM) || defined(__cplusplus)
-// We prefer to use BCryptGenRandom instead of (the unofficial) RtlGenRandom but when using 
-// dynamic overriding, we observed it can raise an exception when compiled with C++, and 
-// sometimes deadlocks when also running under the VS debugger.
-// In contrast, issue #623 implies that on Windows Server 2019 we need to use BCryptGenRandom.
-// To be continued..
-#pragma comment (lib,"advapi32.lib")
-#define RtlGenRandom  SystemFunction036
-#ifdef __cplusplus
-extern "C" {
-#endif
-BOOLEAN NTAPI RtlGenRandom(PVOID RandomBuffer, ULONG RandomBufferLength);
-#ifdef __cplusplus
-}
-#endif
-static bool os_random_buf(void* buf, size_t buf_len) {
-  return (RtlGenRandom(buf, (ULONG)buf_len) != 0);
-}
-#else
-#pragma comment (lib,"bcrypt.lib")
-#include <bcrypt.h>
-static bool os_random_buf(void* buf, size_t buf_len) {
-  return (BCryptGenRandom(NULL, (PUCHAR)buf, (ULONG)buf_len, BCRYPT_USE_SYSTEM_PREFERRED_RNG) >= 0);
-}
-#endif
-
-#elif defined(__APPLE__)
-#include <AvailabilityMacros.h>
-#if defined(MAC_OS_X_VERSION_10_10) && MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_10
-#include <CommonCrypto/CommonCryptoError.h>
-#include <CommonCrypto/CommonRandom.h>
-#endif
-static bool os_random_buf(void* buf, size_t buf_len) {
-  #if defined(MAC_OS_X_VERSION_10_15) && MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_15
-    // We prefere CCRandomGenerateBytes as it returns an error code while arc4random_buf
-    // may fail silently on macOS. See PR #390, and <https://opensource.apple.com/source/Libc/Libc-1439.40.11/gen/FreeBSD/arc4random.c.auto.html>      
-    return (CCRandomGenerateBytes(buf, buf_len) == kCCSuccess);
-  #else
-    // fall back on older macOS
-    arc4random_buf(buf, buf_len);
-    return true;
-  #endif
-}
-
-#elif defined(__ANDROID__) || defined(__DragonFly__) || \
-      defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || \
-      defined(__sun) // todo: what to use with __wasi__?
-#include <stdlib.h>
-static bool os_random_buf(void* buf, size_t buf_len) {
-  arc4random_buf(buf, buf_len);
-  return true;
-}
-#elif defined(__linux__) || defined(__HAIKU__)
-#if defined(__linux__)
-#include <sys/syscall.h>
-#endif
-#include <unistd.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <fcntl.h>
-#include <errno.h>
-static bool os_random_buf(void* buf, size_t buf_len) {
-  // Modern Linux provides `getrandom` but different distributions either use `sys/random.h` or `linux/random.h`
-  // and for the latter the actual `getrandom` call is not always defined.
-  // (see <https://stackoverflow.com/questions/45237324/why-doesnt-getrandom-compile>)
-  // We therefore use a syscall directly and fall back dynamically to /dev/urandom when needed.
-#ifdef SYS_getrandom
-  #ifndef GRND_NONBLOCK
-  #define GRND_NONBLOCK (1)
-  #endif
-  static _Atomic(uintptr_t) no_getrandom; // = 0
-  if (mi_atomic_load_acquire(&no_getrandom)==0) {
-    ssize_t ret = syscall(SYS_getrandom, buf, buf_len, GRND_NONBLOCK);
-    if (ret >= 0) return (buf_len == (size_t)ret);
-    if (errno != ENOSYS) return false;
-    mi_atomic_store_release(&no_getrandom, 1UL); // don't call again, and fall back to /dev/urandom
-  }
-#endif
-  int flags = O_RDONLY;
-  #if defined(O_CLOEXEC)
-  flags |= O_CLOEXEC;
-  #endif
-  int fd = open("/dev/urandom", flags, 0);
-  if (fd < 0) return false;
-  size_t count = 0;
-  while(count < buf_len) {
-    ssize_t ret = read(fd, (char*)buf + count, buf_len - count);
-    if (ret<=0) {
-      if (errno!=EAGAIN && errno!=EINTR) break;
-    }
-    else {
-      count += ret;
-    }
-  }
-  close(fd);
-  return (count==buf_len);
-}
-#else
-static bool os_random_buf(void* buf, size_t buf_len) {
-  return false;
-}
-#endif
-
-#if defined(_WIN32)
-#include <windows.h>
-#elif defined(__APPLE__)
-#include <mach/mach_time.h>
-#else
-#include <time.h>
-#endif
-
 uintptr_t _mi_os_random_weak(uintptr_t extra_seed) {
   uintptr_t x = (uintptr_t)&_mi_os_random_weak ^ extra_seed; // ASLR makes the address random
-  
-  #if defined(_WIN32)
-    LARGE_INTEGER pcount;
-    QueryPerformanceCounter(&pcount);
-    x ^= (uintptr_t)(pcount.QuadPart);
-  #elif defined(__APPLE__)
-    x ^= (uintptr_t)mach_absolute_time();
-  #else
-    struct timespec time;
-    clock_gettime(CLOCK_MONOTONIC, &time);
-    x ^= (uintptr_t)time.tv_sec;
-    x ^= (uintptr_t)time.tv_nsec;
-  #endif
+  x ^= _mi_prim_clock_now();
   // and do a few randomization steps
   uintptr_t max = ((x ^ (x >> 17)) & 0x0F) + 1;
-  for (uintptr_t i = 0; i < max; i++) {
+  for (uintptr_t i = 0; i < max || x==0; i++, x++) {
     x = _mi_random_shuffle(x);
   }
   mi_assert_internal(x != 0);
   return x;
 }
 
-void _mi_random_init(mi_random_ctx_t* ctx) {
+static void mi_random_init_ex(mi_random_ctx_t* ctx, bool use_weak) {
   uint8_t key[32];
-  if (!os_random_buf(key, sizeof(key))) {
+  if (use_weak || !_mi_prim_random_buf(key, sizeof(key))) {
     // if we fail to get random data from the OS, we fall back to a
     // weak random source based on the current time
     #if !defined(__wasi__)
-    _mi_warning_message("unable to use secure randomness\n");
+    if (!use_weak) { _mi_warning_message("unable to use secure randomness\n"); }
     #endif
     uintptr_t x = _mi_os_random_weak(0);
-    for (size_t i = 0; i < 8; i++) {  // key is eight 32-bit words.
+    for (size_t i = 0; i < 8; i++, x++) {  // key is eight 32-bit words.
       x = _mi_random_shuffle(x);
       ((uint32_t*)key)[i] = (uint32_t)x;
     }
+    ctx->weak = true;
+  }
+  else {
+    ctx->weak = false;
   }
   chacha_init(ctx, key, (uintptr_t)ctx /*nonce*/ );
 }
 
+void _mi_random_init(mi_random_ctx_t* ctx) {
+  mi_random_init_ex(ctx, false);
+}
+
+void _mi_random_init_weak(mi_random_ctx_t * ctx) {
+  mi_random_init_ex(ctx, true);
+}
+
+void _mi_random_reinit_if_weak(mi_random_ctx_t * ctx) {
+  if (ctx->weak) {
+    _mi_random_init(ctx);
+  }
+}
+
 /* --------------------------------------------------------
 test vectors from <https://tools.ietf.org/html/rfc8439>
 ----------------------------------------------------------- */
diff --git a/depends/mimalloc/src/region.c b/depends/mimalloc/src/region.c
deleted file mode 100644
index 8b04387dfe08..000000000000
--- a/depends/mimalloc/src/region.c
+++ /dev/null
@@ -1,506 +0,0 @@
-/* ----------------------------------------------------------------------------
-Copyright (c) 2019-2020, Microsoft Research, Daan Leijen
-This is free software; you can redistribute it and/or modify it under the
-terms of the MIT license. A copy of the license can be found in the file
-"LICENSE" at the root of this distribution.
------------------------------------------------------------------------------*/
-
-/* ----------------------------------------------------------------------------
-This implements a layer between the raw OS memory (VirtualAlloc/mmap/sbrk/..)
-and the segment and huge object allocation by mimalloc. There may be multiple
-implementations of this (one could be the identity going directly to the OS,
-another could be a simple cache etc), but the current one uses large "regions".
-In contrast to the rest of mimalloc, the "regions" are shared between threads and
-need to be accessed using atomic operations.
-We need this memory layer between the raw OS calls because of:
-1. on `sbrk` like systems (like WebAssembly) we need our own memory maps in order
-   to reuse memory effectively.
-2. It turns out that for large objects, between 1MiB and 32MiB (?), the cost of
-   an OS allocation/free is still (much) too expensive relative to the accesses 
-   in that object :-( (`malloc-large` tests this). This means we need a cheaper 
-   way to reuse memory.
-3. This layer allows for NUMA aware allocation.
-
-Possible issues:
-- (2) can potentially be addressed too with a small cache per thread which is much
-  simpler. Generally though that requires shrinking of huge pages, and may overuse
-  memory per thread. (and is not compatible with `sbrk`).
-- Since the current regions are per-process, we need atomic operations to
-  claim blocks which may be contended
-- In the worst case, we need to search the whole region map (16KiB for 256GiB)
-  linearly. At what point will direct OS calls be faster? Is there a way to
-  do this better without adding too much complexity?
------------------------------------------------------------------------------*/
-#include "mimalloc.h"
-#include "mimalloc-internal.h"
-#include "mimalloc-atomic.h"
-
-#include <string.h>  // memset
-
-#include "bitmap.h"
-
-// Internal raw OS interface
-size_t  _mi_os_large_page_size(void);
-bool    _mi_os_protect(void* addr, size_t size);
-bool    _mi_os_unprotect(void* addr, size_t size);
-bool    _mi_os_commit(void* p, size_t size, bool* is_zero, mi_stats_t* stats);
-bool    _mi_os_decommit(void* p, size_t size, mi_stats_t* stats);
-bool    _mi_os_reset(void* p, size_t size, mi_stats_t* stats);
-bool    _mi_os_unreset(void* p, size_t size, bool* is_zero, mi_stats_t* stats);
-
-// arena.c
-mi_arena_id_t _mi_arena_id_none(void);
-void    _mi_arena_free(void* p, size_t size, size_t memid, bool all_committed, mi_stats_t* stats);
-void*   _mi_arena_alloc(size_t size, bool* commit, bool* large, bool* is_pinned, bool* is_zero, mi_arena_id_t req_arena_id, size_t* memid, mi_os_tld_t* tld);
-void*   _mi_arena_alloc_aligned(size_t size, size_t alignment, bool* commit, bool* large, bool* is_pinned, bool* is_zero, mi_arena_id_t req_arena_id, size_t* memid, mi_os_tld_t* tld);
-
-
-
-// Constants
-#if (MI_INTPTR_SIZE==8)
-#define MI_HEAP_REGION_MAX_SIZE    (256 * MI_GiB)  // 64KiB for the region map 
-#elif (MI_INTPTR_SIZE==4)
-#define MI_HEAP_REGION_MAX_SIZE    (3 * MI_GiB)    // ~ KiB for the region map
-#else
-#error "define the maximum heap space allowed for regions on this platform"
-#endif
-
-#define MI_SEGMENT_ALIGN          MI_SEGMENT_SIZE
-
-#define MI_REGION_MAX_BLOCKS      MI_BITMAP_FIELD_BITS
-#define MI_REGION_SIZE            (MI_SEGMENT_SIZE * MI_BITMAP_FIELD_BITS)    // 256MiB  (64MiB on 32 bits)
-#define MI_REGION_MAX             (MI_HEAP_REGION_MAX_SIZE / MI_REGION_SIZE)  // 1024  (48 on 32 bits)
-#define MI_REGION_MAX_OBJ_BLOCKS  (MI_REGION_MAX_BLOCKS/4)                    // 64MiB
-#define MI_REGION_MAX_OBJ_SIZE    (MI_REGION_MAX_OBJ_BLOCKS*MI_SEGMENT_SIZE)  
-
-// Region info 
-typedef union mi_region_info_u {
-  size_t value;      
-  struct {
-    bool  valid;        // initialized?
-    bool  is_large:1;   // allocated in fixed large/huge OS pages
-    bool  is_pinned:1;  // pinned memory cannot be decommitted
-    short numa_node;    // the associated NUMA node (where -1 means no associated node)
-  } x;
-} mi_region_info_t;
-
-
-// A region owns a chunk of REGION_SIZE (256MiB) (virtual) memory with
-// a bit map with one bit per MI_SEGMENT_SIZE (4MiB) block.
-typedef struct mem_region_s {
-  _Atomic(size_t)           info;        // mi_region_info_t.value
-  _Atomic(void*)            start;       // start of the memory area 
-  mi_bitmap_field_t         in_use;      // bit per in-use block
-  mi_bitmap_field_t         dirty;       // track if non-zero per block
-  mi_bitmap_field_t         commit;      // track if committed per block
-  mi_bitmap_field_t         reset;       // track if reset per block
-  _Atomic(size_t)           arena_memid; // if allocated from a (huge page) arena
-  _Atomic(size_t)           padding;     // round to 8 fields (needs to be atomic for msvc, see issue #508)
-} mem_region_t;
-
-// The region map
-static mem_region_t regions[MI_REGION_MAX];
-
-// Allocated regions
-static _Atomic(size_t) regions_count; // = 0;        
-
-
-/* ----------------------------------------------------------------------------
-Utility functions
------------------------------------------------------------------------------*/
-
-// Blocks (of 4MiB) needed for the given size.
-static size_t mi_region_block_count(size_t size) {
-  return _mi_divide_up(size, MI_SEGMENT_SIZE);
-}
-
-/*
-// Return a rounded commit/reset size such that we don't fragment large OS pages into small ones.
-static size_t mi_good_commit_size(size_t size) {
-  if (size > (SIZE_MAX - _mi_os_large_page_size())) return size;
-  return _mi_align_up(size, _mi_os_large_page_size());
-}
-*/
-
-// Return if a pointer points into a region reserved by us.
-mi_decl_nodiscard bool mi_is_in_heap_region(const void* p) mi_attr_noexcept {
-  if (p==NULL) return false;
-  size_t count = mi_atomic_load_relaxed(&regions_count);
-  for (size_t i = 0; i < count; i++) {
-    uint8_t* start = (uint8_t*)mi_atomic_load_ptr_relaxed(uint8_t, &regions[i].start);
-    if (start != NULL && (uint8_t*)p >= start && (uint8_t*)p < start + MI_REGION_SIZE) return true;
-  }
-  return false;
-}
-
-
-static void* mi_region_blocks_start(const mem_region_t* region, mi_bitmap_index_t bit_idx) {
-  uint8_t* start = (uint8_t*)mi_atomic_load_ptr_acquire(uint8_t, &((mem_region_t*)region)->start);
-  mi_assert_internal(start != NULL);
-  return (start + (bit_idx * MI_SEGMENT_SIZE));  
-}
-
-static size_t mi_memid_create(mem_region_t* region, mi_bitmap_index_t bit_idx) {
-  mi_assert_internal(bit_idx < MI_BITMAP_FIELD_BITS);
-  size_t idx = region - regions;
-  mi_assert_internal(&regions[idx] == region);
-  return (idx*MI_BITMAP_FIELD_BITS + bit_idx)<<1;
-}
-
-static size_t mi_memid_create_from_arena(size_t arena_memid) {
-  return (arena_memid << 1) | 1;
-}
-
-
-static bool mi_memid_is_arena(size_t id, mem_region_t** region, mi_bitmap_index_t* bit_idx, size_t* arena_memid) {
-  if ((id&1)==1) {
-    if (arena_memid != NULL) *arena_memid = (id>>1);
-    return true;
-  }
-  else {
-    size_t idx = (id >> 1) / MI_BITMAP_FIELD_BITS;
-    *bit_idx   = (mi_bitmap_index_t)(id>>1) % MI_BITMAP_FIELD_BITS;
-    *region    = &regions[idx];
-    return false;
-  }
-}
-
-
-/* ----------------------------------------------------------------------------
-  Allocate a region is allocated from the OS (or an arena)
------------------------------------------------------------------------------*/
-
-static bool mi_region_try_alloc_os(size_t blocks, bool commit, bool allow_large, mem_region_t** region, mi_bitmap_index_t* bit_idx, mi_os_tld_t* tld)
-{
-  // not out of regions yet?
-  if (mi_atomic_load_relaxed(&regions_count) >= MI_REGION_MAX - 1) return false;
-
-  // try to allocate a fresh region from the OS
-  bool region_commit = (commit && mi_option_is_enabled(mi_option_eager_region_commit));
-  bool region_large = (commit && allow_large);
-  bool is_zero = false;
-  bool is_pinned = false;
-  size_t arena_memid = 0;
-  void* const start = _mi_arena_alloc_aligned(MI_REGION_SIZE, MI_SEGMENT_ALIGN, &region_commit, &region_large, &is_pinned, &is_zero, _mi_arena_id_none(),  & arena_memid, tld);
-  if (start == NULL) return false;
-  mi_assert_internal(!(region_large && !allow_large));
-  mi_assert_internal(!region_large || region_commit);
-
-  // claim a fresh slot
-  const size_t idx = mi_atomic_increment_acq_rel(&regions_count);
-  if (idx >= MI_REGION_MAX) {
-    mi_atomic_decrement_acq_rel(&regions_count);
-    _mi_arena_free(start, MI_REGION_SIZE, arena_memid, region_commit, tld->stats);
-    _mi_warning_message("maximum regions used: %zu GiB (perhaps recompile with a larger setting for MI_HEAP_REGION_MAX_SIZE)", _mi_divide_up(MI_HEAP_REGION_MAX_SIZE, MI_GiB));
-    return false;
-  }
-
-  // allocated, initialize and claim the initial blocks
-  mem_region_t* r = &regions[idx];
-  r->arena_memid  = arena_memid;
-  mi_atomic_store_release(&r->in_use, (size_t)0);
-  mi_atomic_store_release(&r->dirty, (is_zero ? 0 : MI_BITMAP_FIELD_FULL));
-  mi_atomic_store_release(&r->commit, (region_commit ? MI_BITMAP_FIELD_FULL : 0));
-  mi_atomic_store_release(&r->reset, (size_t)0);
-  *bit_idx = 0;
-  _mi_bitmap_claim(&r->in_use, 1, blocks, *bit_idx, NULL);
-  mi_atomic_store_ptr_release(void,&r->start, start);
-
-  // and share it 
-  mi_region_info_t info;
-  info.value = 0;                        // initialize the full union to zero
-  info.x.valid = true;
-  info.x.is_large = region_large;
-  info.x.is_pinned = is_pinned;
-  info.x.numa_node = (short)_mi_os_numa_node(tld);
-  mi_atomic_store_release(&r->info, info.value); // now make it available to others
-  *region = r;
-  return true;
-}
-
-/* ----------------------------------------------------------------------------
-  Try to claim blocks in suitable regions
------------------------------------------------------------------------------*/
-
-static bool mi_region_is_suitable(const mem_region_t* region, int numa_node, bool allow_large ) {
-  // initialized at all?
-  mi_region_info_t info;
-  info.value = mi_atomic_load_relaxed(&((mem_region_t*)region)->info);
-  if (info.value==0) return false;
-
-  // numa correct
-  if (numa_node >= 0) {  // use negative numa node to always succeed
-    int rnode = info.x.numa_node;
-    if (rnode >= 0 && rnode != numa_node) return false;
-  }
-
-  // check allow-large
-  if (!allow_large && info.x.is_large) return false;
-
-  return true;
-}
-
-
-static bool mi_region_try_claim(int numa_node, size_t blocks, bool allow_large, mem_region_t** region, mi_bitmap_index_t* bit_idx, mi_os_tld_t* tld)
-{
-  // try all regions for a free slot  
-  const size_t count = mi_atomic_load_relaxed(&regions_count); // monotonic, so ok to be relaxed
-  size_t idx = tld->region_idx; // Or start at 0 to reuse low addresses? Starting at 0 seems to increase latency though
-  for (size_t visited = 0; visited < count; visited++, idx++) {
-    if (idx >= count) idx = 0;  // wrap around
-    mem_region_t* r = &regions[idx];
-    // if this region suits our demand (numa node matches, large OS page matches)
-    if (mi_region_is_suitable(r, numa_node, allow_large)) {
-      // then try to atomically claim a segment(s) in this region
-      if (_mi_bitmap_try_find_claim_field(&r->in_use, 0, blocks, bit_idx)) {
-        tld->region_idx = idx;    // remember the last found position
-        *region = r;
-        return true;
-      }
-    }
-  }
-  return false;
-}
-
-
-static void* mi_region_try_alloc(size_t blocks, bool* commit, bool* large, bool* is_pinned, bool* is_zero, size_t* memid, mi_os_tld_t* tld)
-{
-  mi_assert_internal(blocks <= MI_BITMAP_FIELD_BITS);
-  mem_region_t* region;
-  mi_bitmap_index_t bit_idx;
-  const int numa_node = (_mi_os_numa_node_count() <= 1 ? -1 : _mi_os_numa_node(tld));
-  // try to claim in existing regions
-  if (!mi_region_try_claim(numa_node, blocks, *large, &region, &bit_idx, tld)) {
-    // otherwise try to allocate a fresh region and claim in there
-    if (!mi_region_try_alloc_os(blocks, *commit, *large, &region, &bit_idx, tld)) {
-      // out of regions or memory
-      return NULL;
-    }
-  }
-  
-  // ------------------------------------------------
-  // found a region and claimed `blocks` at `bit_idx`, initialize them now
-  mi_assert_internal(region != NULL);
-  mi_assert_internal(_mi_bitmap_is_claimed(&region->in_use, 1, blocks, bit_idx));
-
-  mi_region_info_t info;
-  info.value = mi_atomic_load_acquire(&region->info);
-  uint8_t* start = (uint8_t*)mi_atomic_load_ptr_acquire(uint8_t,&region->start);
-  mi_assert_internal(!(info.x.is_large && !*large));
-  mi_assert_internal(start != NULL);
-
-  *is_zero   = _mi_bitmap_claim(&region->dirty, 1, blocks, bit_idx, NULL);  
-  *large     = info.x.is_large;
-  *is_pinned = info.x.is_pinned;
-  *memid     = mi_memid_create(region, bit_idx);
-  void* p = start + (mi_bitmap_index_bit_in_field(bit_idx) * MI_SEGMENT_SIZE);
-
-  // commit
-  if (*commit) {
-    // ensure commit
-    bool any_uncommitted;
-    _mi_bitmap_claim(&region->commit, 1, blocks, bit_idx, &any_uncommitted);
-    if (any_uncommitted) {
-      mi_assert_internal(!info.x.is_large && !info.x.is_pinned);
-      bool commit_zero = false;
-      if (!_mi_mem_commit(p, blocks * MI_SEGMENT_SIZE, &commit_zero, tld)) {
-        // failed to commit! unclaim and return
-        mi_bitmap_unclaim(&region->in_use, 1, blocks, bit_idx);
-        return NULL;
-      }
-      if (commit_zero) *is_zero = true;      
-    }
-  }
-  else {
-    // no need to commit, but check if already fully committed
-    *commit = _mi_bitmap_is_claimed(&region->commit, 1, blocks, bit_idx);
-  }  
-  mi_assert_internal(!*commit || _mi_bitmap_is_claimed(&region->commit, 1, blocks, bit_idx));
-
-  // unreset reset blocks
-  if (_mi_bitmap_is_any_claimed(&region->reset, 1, blocks, bit_idx)) {
-    // some blocks are still reset
-    mi_assert_internal(!info.x.is_large && !info.x.is_pinned);
-    mi_assert_internal(!mi_option_is_enabled(mi_option_eager_commit) || *commit || mi_option_get(mi_option_eager_commit_delay) > 0); 
-    mi_bitmap_unclaim(&region->reset, 1, blocks, bit_idx);
-    if (*commit || !mi_option_is_enabled(mi_option_reset_decommits)) { // only if needed
-      bool reset_zero = false;
-      _mi_mem_unreset(p, blocks * MI_SEGMENT_SIZE, &reset_zero, tld);
-      if (reset_zero) *is_zero = true;
-    }
-  }
-  mi_assert_internal(!_mi_bitmap_is_any_claimed(&region->reset, 1, blocks, bit_idx));
-  
-  #if (MI_DEBUG>=2) && !MI_TRACK_ENABLED
-  if (*commit) { ((uint8_t*)p)[0] = 0; }
-  #endif
-  
-  // and return the allocation  
-  mi_assert_internal(p != NULL);  
-  return p;
-}
-
-
-/* ----------------------------------------------------------------------------
- Allocation
------------------------------------------------------------------------------*/
-
-// Allocate `size` memory aligned at `alignment`. Return non NULL on success, with a given memory `id`.
-// (`id` is abstract, but `id = idx*MI_REGION_MAP_BITS + bitidx`)
-void* _mi_mem_alloc_aligned(size_t size, size_t alignment, bool* commit, bool* large, bool* is_pinned, bool* is_zero, size_t* memid, mi_os_tld_t* tld)
-{
-  mi_assert_internal(memid != NULL && tld != NULL);
-  mi_assert_internal(size > 0);
-  *memid = 0;
-  *is_zero = false;
-  *is_pinned = false;
-  bool default_large = false;
-  if (large==NULL) large = &default_large;  // ensure `large != NULL`  
-  if (size == 0) return NULL;
-  size = _mi_align_up(size, _mi_os_page_size());
-
-  // allocate from regions if possible
-  void* p = NULL;
-  size_t arena_memid;
-  const size_t blocks = mi_region_block_count(size);
-  if (blocks <= MI_REGION_MAX_OBJ_BLOCKS && alignment <= MI_SEGMENT_ALIGN) {
-    p = mi_region_try_alloc(blocks, commit, large, is_pinned, is_zero, memid, tld);    
-    if (p == NULL) {
-      _mi_warning_message("unable to allocate from region: size %zu\n", size);
-    }
-  }
-  if (p == NULL) {
-    // and otherwise fall back to the OS
-    p = _mi_arena_alloc_aligned(size, alignment, commit, large, is_pinned, is_zero, _mi_arena_id_none(),  & arena_memid, tld);
-    *memid = mi_memid_create_from_arena(arena_memid);
-  }
-
-  if (p != NULL) {
-    mi_assert_internal((uintptr_t)p % alignment == 0);
-    #if (MI_DEBUG>=2) && !MI_TRACK_ENABLED
-    if (*commit) { ((uint8_t*)p)[0] = 0; } // ensure the memory is committed
-    #endif
-  }
-  return p;
-}
-
-
-
-/* ----------------------------------------------------------------------------
-Free
------------------------------------------------------------------------------*/
-
-// Free previously allocated memory with a given id.
-void _mi_mem_free(void* p, size_t size, size_t id, bool full_commit, bool any_reset, mi_os_tld_t* tld) {
-  mi_assert_internal(size > 0 && tld != NULL);
-  if (p==NULL) return;
-  if (size==0) return;
-  size = _mi_align_up(size, _mi_os_page_size());
-
-  size_t arena_memid = 0;
-  mi_bitmap_index_t bit_idx;
-  mem_region_t* region;
-  if (mi_memid_is_arena(id,&region,&bit_idx,&arena_memid)) {
-   // was a direct arena allocation, pass through
-    _mi_arena_free(p, size, arena_memid, full_commit, tld->stats);
-  }
-  else {
-    // allocated in a region
-    mi_assert_internal(size <= MI_REGION_MAX_OBJ_SIZE); if (size > MI_REGION_MAX_OBJ_SIZE) return;
-    const size_t blocks = mi_region_block_count(size);
-    mi_assert_internal(blocks + bit_idx <= MI_BITMAP_FIELD_BITS);
-    mi_region_info_t info;
-    info.value = mi_atomic_load_acquire(&region->info);
-    mi_assert_internal(info.value != 0);
-    void* blocks_start = mi_region_blocks_start(region, bit_idx);
-    mi_assert_internal(blocks_start == p); // not a pointer in our area?
-    mi_assert_internal(bit_idx + blocks <= MI_BITMAP_FIELD_BITS);
-    if (blocks_start != p || bit_idx + blocks > MI_BITMAP_FIELD_BITS) return; // or `abort`?
-
-    // committed?
-    if (full_commit && (size % MI_SEGMENT_SIZE) == 0) {
-      _mi_bitmap_claim(&region->commit, 1, blocks, bit_idx, NULL);
-    }
-
-    if (any_reset) {
-      // set the is_reset bits if any pages were reset
-      _mi_bitmap_claim(&region->reset, 1, blocks, bit_idx, NULL);
-    }
-
-    // reset the blocks to reduce the working set.
-    if (!info.x.is_large && !info.x.is_pinned && mi_option_is_enabled(mi_option_segment_reset) 
-       && (mi_option_is_enabled(mi_option_eager_commit) ||
-           mi_option_is_enabled(mi_option_reset_decommits))) // cannot reset halfway committed segments, use only `option_page_reset` instead            
-    {
-      bool any_unreset;
-      _mi_bitmap_claim(&region->reset, 1, blocks, bit_idx, &any_unreset);
-      if (any_unreset) {
-        _mi_abandoned_await_readers(); // ensure no more pending write (in case reset = decommit)
-        _mi_mem_reset(p, blocks * MI_SEGMENT_SIZE, tld);
-      }
-    }    
-
-    // and unclaim
-    bool all_unclaimed = mi_bitmap_unclaim(&region->in_use, 1, blocks, bit_idx);
-    mi_assert_internal(all_unclaimed); MI_UNUSED(all_unclaimed);
-  }
-}
-
-
-/* ----------------------------------------------------------------------------
-  collection
------------------------------------------------------------------------------*/
-void _mi_mem_collect(mi_os_tld_t* tld) {
-  // free every region that has no segments in use.
-  size_t rcount = mi_atomic_load_relaxed(&regions_count);
-  for (size_t i = 0; i < rcount; i++) {
-    mem_region_t* region = &regions[i];
-    if (mi_atomic_load_relaxed(&region->info) != 0) {
-      // if no segments used, try to claim the whole region
-      size_t m = mi_atomic_load_relaxed(&region->in_use);
-      while (m == 0 && !mi_atomic_cas_weak_release(&region->in_use, &m, MI_BITMAP_FIELD_FULL)) { /* nothing */ };
-      if (m == 0) {
-        // on success, free the whole region
-        uint8_t* start = (uint8_t*)mi_atomic_load_ptr_acquire(uint8_t,&regions[i].start);
-        size_t arena_memid = mi_atomic_load_relaxed(&regions[i].arena_memid);
-        size_t commit = mi_atomic_load_relaxed(&regions[i].commit);
-        memset((void*)&regions[i], 0, sizeof(mem_region_t));  // cast to void* to avoid atomic warning
-        // and release the whole region
-        mi_atomic_store_release(&region->info, (size_t)0);
-        if (start != NULL) { // && !_mi_os_is_huge_reserved(start)) {         
-          _mi_abandoned_await_readers(); // ensure no pending reads
-          _mi_arena_free(start, MI_REGION_SIZE, arena_memid, (~commit == 0), tld->stats);
-        }
-      }
-    }
-  }
-}
-
-
-/* ----------------------------------------------------------------------------
-  Other
------------------------------------------------------------------------------*/
-
-bool _mi_mem_reset(void* p, size_t size, mi_os_tld_t* tld) {
-  return _mi_os_reset(p, size, tld->stats);
-}
-
-bool _mi_mem_unreset(void* p, size_t size, bool* is_zero, mi_os_tld_t* tld) {
-  return _mi_os_unreset(p, size, is_zero, tld->stats);
-}
-
-bool _mi_mem_commit(void* p, size_t size, bool* is_zero, mi_os_tld_t* tld) {
-  return _mi_os_commit(p, size, is_zero, tld->stats);
-}
-
-bool _mi_mem_decommit(void* p, size_t size, mi_os_tld_t* tld) {
-  return _mi_os_decommit(p, size, tld->stats);
-}
-
-bool _mi_mem_protect(void* p, size_t size) {
-  return _mi_os_protect(p, size);
-}
-
-bool _mi_mem_unprotect(void* p, size_t size) {
-  return _mi_os_unprotect(p, size);
-}
diff --git a/depends/mimalloc/src/segment-cache.c b/depends/mimalloc/src/segment-cache.c
deleted file mode 100644
index da726716a574..000000000000
--- a/depends/mimalloc/src/segment-cache.c
+++ /dev/null
@@ -1,368 +0,0 @@
-/* ----------------------------------------------------------------------------
-Copyright (c) 2020, Microsoft Research, Daan Leijen
-This is free software; you can redistribute it and/or modify it under the
-terms of the MIT license. A copy of the license can be found in the file
-"LICENSE" at the root of this distribution.
------------------------------------------------------------------------------*/
-
-/* ----------------------------------------------------------------------------
-  Implements a cache of segments to avoid expensive OS calls and to reuse
-  the commit_mask to optimize the commit/decommit calls.
-  The full memory map of all segments is also implemented here.
------------------------------------------------------------------------------*/
-#include "mimalloc.h"
-#include "mimalloc-internal.h"
-#include "mimalloc-atomic.h"
-
-#include "bitmap.h"  // atomic bitmap
-
-//#define MI_CACHE_DISABLE 1    // define to completely disable the segment cache
-
-#define MI_CACHE_FIELDS     (16)
-#define MI_CACHE_MAX        (MI_BITMAP_FIELD_BITS*MI_CACHE_FIELDS)       // 1024 on 64-bit
-
-#define BITS_SET()          MI_ATOMIC_VAR_INIT(UINTPTR_MAX)
-#define MI_CACHE_BITS_SET   MI_INIT16(BITS_SET)                          // note: update if MI_CACHE_FIELDS changes
-
-typedef struct mi_cache_slot_s {
-  void*               p;
-  size_t              memid;
-  bool                is_pinned;
-  mi_commit_mask_t    commit_mask;
-  mi_commit_mask_t    decommit_mask;
-  _Atomic(mi_msecs_t) expire;
-} mi_cache_slot_t;
-
-static mi_decl_cache_align mi_cache_slot_t cache[MI_CACHE_MAX];    // = 0
-
-static mi_decl_cache_align mi_bitmap_field_t cache_available[MI_CACHE_FIELDS] = { MI_CACHE_BITS_SET };        // zero bit = available!
-static mi_decl_cache_align mi_bitmap_field_t cache_available_large[MI_CACHE_FIELDS] = { MI_CACHE_BITS_SET };
-static mi_decl_cache_align mi_bitmap_field_t cache_inuse[MI_CACHE_FIELDS];   // zero bit = free
-
-static bool mi_cdecl mi_segment_cache_is_suitable(mi_bitmap_index_t bitidx, void* arg) {
-  mi_arena_id_t req_arena_id = *((mi_arena_id_t*)arg);
-  mi_cache_slot_t* slot = &cache[mi_bitmap_index_bit(bitidx)];
-  return _mi_arena_memid_is_suitable(slot->memid, req_arena_id);
-}
-
-mi_decl_noinline void* _mi_segment_cache_pop(size_t size, mi_commit_mask_t* commit_mask, mi_commit_mask_t* decommit_mask, bool* large, bool* is_pinned, bool* is_zero, mi_arena_id_t _req_arena_id, size_t* memid, mi_os_tld_t* tld)
-{
-#ifdef MI_CACHE_DISABLE
-  return NULL;
-#else
-
-  // only segment blocks
-  if (size != MI_SEGMENT_SIZE) return NULL;
-
-  // numa node determines start field
-  const int numa_node = _mi_os_numa_node(tld);
-  size_t start_field = 0;
-  if (numa_node > 0) {
-    start_field = (MI_CACHE_FIELDS / _mi_os_numa_node_count())*numa_node;
-    if (start_field >= MI_CACHE_FIELDS) start_field = 0;
-  }
-
-  // find an available slot
-  mi_bitmap_index_t bitidx = 0;
-  bool claimed = false;
-  mi_arena_id_t req_arena_id = _req_arena_id;
-  mi_bitmap_pred_fun_t pred_fun = &mi_segment_cache_is_suitable;  // cannot pass NULL as the arena may be exclusive itself; todo: do not put exclusive arenas in the cache?
-  
-  if (*large) {  // large allowed?
-    claimed = _mi_bitmap_try_find_from_claim_pred(cache_available_large, MI_CACHE_FIELDS, start_field, 1, pred_fun, &req_arena_id, &bitidx);
-    if (claimed) *large = true;
-  }
-  if (!claimed) {
-    claimed = _mi_bitmap_try_find_from_claim_pred (cache_available, MI_CACHE_FIELDS, start_field, 1, pred_fun, &req_arena_id, &bitidx);
-    if (claimed) *large = false;
-  }
-
-  if (!claimed) return NULL;
-
-  // found a slot
-  mi_cache_slot_t* slot = &cache[mi_bitmap_index_bit(bitidx)];
-  void* p = slot->p;
-  *memid = slot->memid;
-  *is_pinned = slot->is_pinned;
-  *is_zero = false;
-  *commit_mask = slot->commit_mask;     
-  *decommit_mask = slot->decommit_mask;
-  slot->p = NULL;
-  mi_atomic_storei64_release(&slot->expire,(mi_msecs_t)0);
-  
-  // mark the slot as free again
-  mi_assert_internal(_mi_bitmap_is_claimed(cache_inuse, MI_CACHE_FIELDS, 1, bitidx));
-  _mi_bitmap_unclaim(cache_inuse, MI_CACHE_FIELDS, 1, bitidx);
-  return p;
-#endif
-}
-
-static mi_decl_noinline void mi_commit_mask_decommit(mi_commit_mask_t* cmask, void* p, size_t total, mi_stats_t* stats)
-{
-  if (mi_commit_mask_is_empty(cmask)) {
-    // nothing
-  }
-  else if (mi_commit_mask_is_full(cmask)) {
-    _mi_os_decommit(p, total, stats);
-  }
-  else {
-    // todo: one call to decommit the whole at once?
-    mi_assert_internal((total%MI_COMMIT_MASK_BITS)==0);
-    size_t part = total/MI_COMMIT_MASK_BITS;
-    size_t idx;
-    size_t count;    
-    mi_commit_mask_foreach(cmask, idx, count) {
-      void*  start = (uint8_t*)p + (idx*part);
-      size_t size = count*part;
-      _mi_os_decommit(start, size, stats);
-    }
-    mi_commit_mask_foreach_end()
-  }
-  mi_commit_mask_create_empty(cmask);
-}
-
-#define MI_MAX_PURGE_PER_PUSH  (4)
-
-static mi_decl_noinline void mi_segment_cache_purge(bool force, mi_os_tld_t* tld)
-{
-  MI_UNUSED(tld);
-  if (!mi_option_is_enabled(mi_option_allow_decommit)) return;
-  mi_msecs_t now = _mi_clock_now();
-  size_t purged = 0;
-  const size_t max_visits = (force ? MI_CACHE_MAX /* visit all */ : MI_CACHE_FIELDS /* probe at most N (=16) slots */);
-  size_t idx              = (force ? 0 : _mi_random_shuffle((uintptr_t)now) % MI_CACHE_MAX /* random start */ );
-  for (size_t visited = 0; visited < max_visits; visited++,idx++) {  // visit N slots
-    if (idx >= MI_CACHE_MAX) idx = 0; // wrap
-    mi_cache_slot_t* slot = &cache[idx];
-    mi_msecs_t expire = mi_atomic_loadi64_relaxed(&slot->expire);
-    if (expire != 0 && (force || now >= expire)) {  // racy read
-      // seems expired, first claim it from available
-      purged++;
-      mi_bitmap_index_t bitidx = mi_bitmap_index_create_from_bit(idx);
-      if (_mi_bitmap_claim(cache_available, MI_CACHE_FIELDS, 1, bitidx, NULL)) {
-        // was available, we claimed it
-        expire = mi_atomic_loadi64_acquire(&slot->expire);
-        if (expire != 0 && (force || now >= expire)) {  // safe read
-          // still expired, decommit it
-          mi_atomic_storei64_relaxed(&slot->expire,(mi_msecs_t)0);
-          mi_assert_internal(!mi_commit_mask_is_empty(&slot->commit_mask) && _mi_bitmap_is_claimed(cache_available_large, MI_CACHE_FIELDS, 1, bitidx));
-          _mi_abandoned_await_readers();  // wait until safe to decommit
-          // decommit committed parts
-          // TODO: instead of decommit, we could also free to the OS?
-          mi_commit_mask_decommit(&slot->commit_mask, slot->p, MI_SEGMENT_SIZE, tld->stats);
-          mi_commit_mask_create_empty(&slot->decommit_mask);
-        }
-        _mi_bitmap_unclaim(cache_available, MI_CACHE_FIELDS, 1, bitidx); // make it available again for a pop
-      }
-      if (!force && purged > MI_MAX_PURGE_PER_PUSH) break;  // bound to no more than N purge tries per push
-    }
-  }
-}
-
-void _mi_segment_cache_collect(bool force, mi_os_tld_t* tld) {
-  mi_segment_cache_purge(force, tld );
-}
-
-mi_decl_noinline bool _mi_segment_cache_push(void* start, size_t size, size_t memid, const mi_commit_mask_t* commit_mask, const mi_commit_mask_t* decommit_mask, bool is_large, bool is_pinned, mi_os_tld_t* tld)
-{
-#ifdef MI_CACHE_DISABLE
-  return false;
-#else
-
-  // only for normal segment blocks
-  if (size != MI_SEGMENT_SIZE || ((uintptr_t)start % MI_SEGMENT_ALIGN) != 0) return false;
-
-  // numa node determines start field
-  int numa_node = _mi_os_numa_node(NULL);
-  size_t start_field = 0;
-  if (numa_node > 0) {
-    start_field = (MI_CACHE_FIELDS / _mi_os_numa_node_count())*numa_node;
-    if (start_field >= MI_CACHE_FIELDS) start_field = 0;
-  }
-
-  // purge expired entries
-  mi_segment_cache_purge(false /* force? */, tld);
-
-  // find an available slot
-  mi_bitmap_index_t bitidx;
-  bool claimed = _mi_bitmap_try_find_from_claim(cache_inuse, MI_CACHE_FIELDS, start_field, 1, &bitidx);
-  if (!claimed) return false;
-
-  mi_assert_internal(_mi_bitmap_is_claimed(cache_available, MI_CACHE_FIELDS, 1, bitidx));
-  mi_assert_internal(_mi_bitmap_is_claimed(cache_available_large, MI_CACHE_FIELDS, 1, bitidx));
-#if MI_DEBUG>1
-  if (is_pinned || is_large) {
-    mi_assert_internal(mi_commit_mask_is_full(commit_mask));
-  }
-#endif
-
-  // set the slot
-  mi_cache_slot_t* slot = &cache[mi_bitmap_index_bit(bitidx)];
-  slot->p = start;
-  slot->memid = memid;
-  slot->is_pinned = is_pinned;
-  mi_atomic_storei64_relaxed(&slot->expire,(mi_msecs_t)0);
-  slot->commit_mask = *commit_mask;
-  slot->decommit_mask = *decommit_mask;
-  if (!mi_commit_mask_is_empty(commit_mask) && !is_large && !is_pinned && mi_option_is_enabled(mi_option_allow_decommit)) {
-    long delay = mi_option_get(mi_option_segment_decommit_delay);
-    if (delay == 0) {
-      _mi_abandoned_await_readers(); // wait until safe to decommit
-      mi_commit_mask_decommit(&slot->commit_mask, start, MI_SEGMENT_SIZE, tld->stats);
-      mi_commit_mask_create_empty(&slot->decommit_mask);
-    }
-    else {
-      mi_atomic_storei64_release(&slot->expire, _mi_clock_now() + delay);
-    }
-  }
-
-  // make it available
-  _mi_bitmap_unclaim((is_large ? cache_available_large : cache_available), MI_CACHE_FIELDS, 1, bitidx);
-  return true;
-#endif
-}
-
-
-/* -----------------------------------------------------------
-  The following functions are to reliably find the segment or
-  block that encompasses any pointer p (or NULL if it is not
-  in any of our segments).
-  We maintain a bitmap of all memory with 1 bit per MI_SEGMENT_SIZE (64MiB)
-  set to 1 if it contains the segment meta data.
------------------------------------------------------------ */
-
-
-#if (MI_INTPTR_SIZE==8)
-#define MI_MAX_ADDRESS    ((size_t)20 << 40)  // 20TB
-#else
-#define MI_MAX_ADDRESS    ((size_t)2 << 30)   // 2Gb
-#endif
-
-#define MI_SEGMENT_MAP_BITS  (MI_MAX_ADDRESS / MI_SEGMENT_SIZE)
-#define MI_SEGMENT_MAP_SIZE  (MI_SEGMENT_MAP_BITS / 8)
-#define MI_SEGMENT_MAP_WSIZE (MI_SEGMENT_MAP_SIZE / MI_INTPTR_SIZE)
-
-static _Atomic(uintptr_t) mi_segment_map[MI_SEGMENT_MAP_WSIZE + 1];  // 2KiB per TB with 64MiB segments
-
-static size_t mi_segment_map_index_of(const mi_segment_t* segment, size_t* bitidx) {
-  mi_assert_internal(_mi_ptr_segment(segment) == segment); // is it aligned on MI_SEGMENT_SIZE?
-  if ((uintptr_t)segment >= MI_MAX_ADDRESS) {
-    *bitidx = 0;
-    return MI_SEGMENT_MAP_WSIZE;
-  }
-  else {
-    const uintptr_t segindex = ((uintptr_t)segment) / MI_SEGMENT_SIZE;
-    *bitidx = segindex % MI_INTPTR_BITS;
-    const size_t mapindex = segindex / MI_INTPTR_BITS;
-    mi_assert_internal(mapindex < MI_SEGMENT_MAP_WSIZE);
-    return mapindex;
-  }
-}
-
-void _mi_segment_map_allocated_at(const mi_segment_t* segment) {
-  size_t bitidx;
-  size_t index = mi_segment_map_index_of(segment, &bitidx);
-  mi_assert_internal(index <= MI_SEGMENT_MAP_WSIZE);
-  if (index==MI_SEGMENT_MAP_WSIZE) return;
-  uintptr_t mask = mi_atomic_load_relaxed(&mi_segment_map[index]);
-  uintptr_t newmask;
-  do {
-    newmask = (mask | ((uintptr_t)1 << bitidx));
-  } while (!mi_atomic_cas_weak_release(&mi_segment_map[index], &mask, newmask));
-}
-
-void _mi_segment_map_freed_at(const mi_segment_t* segment) {
-  size_t bitidx;
-  size_t index = mi_segment_map_index_of(segment, &bitidx);
-  mi_assert_internal(index <= MI_SEGMENT_MAP_WSIZE);
-  if (index == MI_SEGMENT_MAP_WSIZE) return;
-  uintptr_t mask = mi_atomic_load_relaxed(&mi_segment_map[index]);
-  uintptr_t newmask;
-  do {
-    newmask = (mask & ~((uintptr_t)1 << bitidx));
-  } while (!mi_atomic_cas_weak_release(&mi_segment_map[index], &mask, newmask));
-}
-
-// Determine the segment belonging to a pointer or NULL if it is not in a valid segment.
-static mi_segment_t* _mi_segment_of(const void* p) {
-  mi_segment_t* segment = _mi_ptr_segment(p);
-  if (segment == NULL) return NULL; 
-  size_t bitidx;
-  size_t index = mi_segment_map_index_of(segment, &bitidx);
-  // fast path: for any pointer to valid small/medium/large object or first MI_SEGMENT_SIZE in huge
-  const uintptr_t mask = mi_atomic_load_relaxed(&mi_segment_map[index]);
-  if mi_likely((mask & ((uintptr_t)1 << bitidx)) != 0) {
-    return segment; // yes, allocated by us
-  }
-  if (index==MI_SEGMENT_MAP_WSIZE) return NULL;
-
-  // TODO: maintain max/min allocated range for efficiency for more efficient rejection of invalid pointers?
-
-  // search downwards for the first segment in case it is an interior pointer
-  // could be slow but searches in MI_INTPTR_SIZE * MI_SEGMENT_SIZE (512MiB) steps trough
-  // valid huge objects
-  // note: we could maintain a lowest index to speed up the path for invalid pointers?
-  size_t lobitidx;
-  size_t loindex;
-  uintptr_t lobits = mask & (((uintptr_t)1 << bitidx) - 1);
-  if (lobits != 0) {
-    loindex = index;
-    lobitidx = mi_bsr(lobits);    // lobits != 0
-  }
-  else if (index == 0) {
-    return NULL;
-  }
-  else {
-    mi_assert_internal(index > 0);
-    uintptr_t lomask = mask;
-    loindex = index;
-    do {
-      loindex--;  
-      lomask = mi_atomic_load_relaxed(&mi_segment_map[loindex]);      
-    } while (lomask != 0 && loindex > 0);
-    if (lomask == 0) return NULL;
-    lobitidx = mi_bsr(lomask);    // lomask != 0
-  }
-  mi_assert_internal(loindex < MI_SEGMENT_MAP_WSIZE);
-  // take difference as the addresses could be larger than the MAX_ADDRESS space.
-  size_t diff = (((index - loindex) * (8*MI_INTPTR_SIZE)) + bitidx - lobitidx) * MI_SEGMENT_SIZE;
-  segment = (mi_segment_t*)((uint8_t*)segment - diff);
-
-  if (segment == NULL) return NULL;
-  mi_assert_internal((void*)segment < p);
-  bool cookie_ok = (_mi_ptr_cookie(segment) == segment->cookie);
-  mi_assert_internal(cookie_ok);
-  if mi_unlikely(!cookie_ok) return NULL;
-  if (((uint8_t*)segment + mi_segment_size(segment)) <= (uint8_t*)p) return NULL; // outside the range
-  mi_assert_internal(p >= (void*)segment && (uint8_t*)p < (uint8_t*)segment + mi_segment_size(segment));
-  return segment;
-}
-
-// Is this a valid pointer in our heap?
-static bool  mi_is_valid_pointer(const void* p) {
-  return (_mi_segment_of(p) != NULL);
-}
-
-mi_decl_nodiscard mi_decl_export bool mi_is_in_heap_region(const void* p) mi_attr_noexcept {
-  return mi_is_valid_pointer(p);
-}
-
-/*
-// Return the full segment range belonging to a pointer
-static void* mi_segment_range_of(const void* p, size_t* size) {
-  mi_segment_t* segment = _mi_segment_of(p);
-  if (segment == NULL) {
-    if (size != NULL) *size = 0;
-    return NULL;
-  }
-  else {
-    if (size != NULL) *size = segment->segment_size;
-    return segment;
-  }
-  mi_assert_expensive(page == NULL || mi_segment_is_valid(_mi_page_segment(page),tld));
-  mi_assert_internal(page == NULL || (mi_segment_page_size(_mi_page_segment(page)) - (MI_SECURE == 0 ? 0 : _mi_os_page_size())) >= block_size);
-  mi_reset_delayed(tld);
-  mi_assert_internal(page == NULL || mi_page_not_in_queue(page, tld));
-  return page;
-}
-*/
diff --git a/depends/mimalloc/src/segment.c b/depends/mimalloc/src/segment.c
deleted file mode 100644
index 2ae591fde880..000000000000
--- a/depends/mimalloc/src/segment.c
+++ /dev/null
@@ -1,1553 +0,0 @@
-/* ----------------------------------------------------------------------------
-Copyright (c) 2018-2020, Microsoft Research, Daan Leijen
-This is free software; you can redistribute it and/or modify it under the
-terms of the MIT license. A copy of the license can be found in the file
-"LICENSE" at the root of this distribution.
------------------------------------------------------------------------------*/
-#include "mimalloc.h"
-#include "mimalloc-internal.h"
-#include "mimalloc-atomic.h"
-
-#include <string.h>  // memset
-#include <stdio.h>
-
-#define MI_PAGE_HUGE_ALIGN  (256*1024)
-
-static void mi_segment_delayed_decommit(mi_segment_t* segment, bool force, mi_stats_t* stats);
-
-
-// -------------------------------------------------------------------
-// commit mask 
-// -------------------------------------------------------------------
-
-static bool mi_commit_mask_all_set(const mi_commit_mask_t* commit, const mi_commit_mask_t* cm) {
-  for (size_t i = 0; i < MI_COMMIT_MASK_FIELD_COUNT; i++) {
-    if ((commit->mask[i] & cm->mask[i]) != cm->mask[i]) return false;
-  }
-  return true;
-}
-
-static bool mi_commit_mask_any_set(const mi_commit_mask_t* commit, const mi_commit_mask_t* cm) {
-  for (size_t i = 0; i < MI_COMMIT_MASK_FIELD_COUNT; i++) {
-    if ((commit->mask[i] & cm->mask[i]) != 0) return true;
-  }
-  return false;
-}
-
-static void mi_commit_mask_create_intersect(const mi_commit_mask_t* commit, const mi_commit_mask_t* cm, mi_commit_mask_t* res) {
-  for (size_t i = 0; i < MI_COMMIT_MASK_FIELD_COUNT; i++) {
-    res->mask[i] = (commit->mask[i] & cm->mask[i]);
-  }
-}
-
-static void mi_commit_mask_clear(mi_commit_mask_t* res, const mi_commit_mask_t* cm) {
-  for (size_t i = 0; i < MI_COMMIT_MASK_FIELD_COUNT; i++) {
-    res->mask[i] &= ~(cm->mask[i]);
-  }
-}
-
-static void mi_commit_mask_set(mi_commit_mask_t* res, const mi_commit_mask_t* cm) {
-  for (size_t i = 0; i < MI_COMMIT_MASK_FIELD_COUNT; i++) {
-    res->mask[i] |= cm->mask[i];
-  }
-}
-
-static void mi_commit_mask_create(size_t bitidx, size_t bitcount, mi_commit_mask_t* cm) {
-  mi_assert_internal(bitidx < MI_COMMIT_MASK_BITS);
-  mi_assert_internal((bitidx + bitcount) <= MI_COMMIT_MASK_BITS);
-  if (bitcount == MI_COMMIT_MASK_BITS) {
-    mi_assert_internal(bitidx==0);
-    mi_commit_mask_create_full(cm);
-  }
-  else if (bitcount == 0) {
-    mi_commit_mask_create_empty(cm);
-  }
-  else {
-    mi_commit_mask_create_empty(cm);
-    size_t i = bitidx / MI_COMMIT_MASK_FIELD_BITS;
-    size_t ofs = bitidx % MI_COMMIT_MASK_FIELD_BITS;
-    while (bitcount > 0) {
-      mi_assert_internal(i < MI_COMMIT_MASK_FIELD_COUNT);
-      size_t avail = MI_COMMIT_MASK_FIELD_BITS - ofs;
-      size_t count = (bitcount > avail ? avail : bitcount);
-      size_t mask = (count >= MI_COMMIT_MASK_FIELD_BITS ? ~((size_t)0) : (((size_t)1 << count) - 1) << ofs);
-      cm->mask[i] = mask;
-      bitcount -= count;
-      ofs = 0;
-      i++;
-    }
-  }
-}
-
-size_t _mi_commit_mask_committed_size(const mi_commit_mask_t* cm, size_t total) {
-  mi_assert_internal((total%MI_COMMIT_MASK_BITS)==0);
-  size_t count = 0;
-  for (size_t i = 0; i < MI_COMMIT_MASK_FIELD_COUNT; i++) {
-    size_t mask = cm->mask[i];
-    if (~mask == 0) {
-      count += MI_COMMIT_MASK_FIELD_BITS;
-    }
-    else {
-      for (; mask != 0; mask >>= 1) {  // todo: use popcount
-        if ((mask&1)!=0) count++;
-      }
-    }
-  }
-  // we use total since for huge segments each commit bit may represent a larger size
-  return ((total / MI_COMMIT_MASK_BITS) * count);
-}
-
-
-size_t _mi_commit_mask_next_run(const mi_commit_mask_t* cm, size_t* idx) {
-  size_t i = (*idx) / MI_COMMIT_MASK_FIELD_BITS;
-  size_t ofs = (*idx) % MI_COMMIT_MASK_FIELD_BITS;
-  size_t mask = 0;
-  // find first ones
-  while (i < MI_COMMIT_MASK_FIELD_COUNT) {
-    mask = cm->mask[i];
-    mask >>= ofs;
-    if (mask != 0) {
-      while ((mask&1) == 0) {
-        mask >>= 1;
-        ofs++;
-      }
-      break;
-    }
-    i++;
-    ofs = 0;
-  }
-  if (i >= MI_COMMIT_MASK_FIELD_COUNT) {
-    // not found
-    *idx = MI_COMMIT_MASK_BITS;
-    return 0;
-  }
-  else {
-    // found, count ones
-    size_t count = 0;
-    *idx = (i*MI_COMMIT_MASK_FIELD_BITS) + ofs;
-    do {
-      mi_assert_internal(ofs < MI_COMMIT_MASK_FIELD_BITS && (mask&1) == 1);
-      do {
-        count++;
-        mask >>= 1;
-      } while ((mask&1) == 1);
-      if ((((*idx + count) % MI_COMMIT_MASK_FIELD_BITS) == 0)) {
-        i++;
-        if (i >= MI_COMMIT_MASK_FIELD_COUNT) break;
-        mask = cm->mask[i];
-        ofs = 0;
-      }
-    } while ((mask&1) == 1);
-    mi_assert_internal(count > 0);
-    return count;
-  }
-}
-
-
-/* --------------------------------------------------------------------------------
-  Segment allocation
-
-  If a  thread ends, it "abandons" pages with used blocks
-  and there is an abandoned segment list whose segments can
-  be reclaimed by still running threads, much like work-stealing.
--------------------------------------------------------------------------------- */
-
-
-/* -----------------------------------------------------------
-   Slices
------------------------------------------------------------ */
-
-
-static const mi_slice_t* mi_segment_slices_end(const mi_segment_t* segment) {
-  return &segment->slices[segment->slice_entries];
-}
-
-static uint8_t* mi_slice_start(const mi_slice_t* slice) {
-  mi_segment_t* segment = _mi_ptr_segment(slice);
-  mi_assert_internal(slice >= segment->slices && slice < mi_segment_slices_end(segment));
-  return ((uint8_t*)segment + ((slice - segment->slices)*MI_SEGMENT_SLICE_SIZE));
-}
-
-
-/* -----------------------------------------------------------
-   Bins
------------------------------------------------------------ */
-// Use bit scan forward to quickly find the first zero bit if it is available
-
-static inline size_t mi_slice_bin8(size_t slice_count) {
-  if (slice_count<=1) return slice_count;
-  mi_assert_internal(slice_count <= MI_SLICES_PER_SEGMENT);
-  slice_count--;
-  size_t s = mi_bsr(slice_count);  // slice_count > 1
-  if (s <= 2) return slice_count + 1;
-  size_t bin = ((s << 2) | ((slice_count >> (s - 2))&0x03)) - 4;
-  return bin;
-}
-
-static inline size_t mi_slice_bin(size_t slice_count) {
-  mi_assert_internal(slice_count*MI_SEGMENT_SLICE_SIZE <= MI_SEGMENT_SIZE);
-  mi_assert_internal(mi_slice_bin8(MI_SLICES_PER_SEGMENT) <= MI_SEGMENT_BIN_MAX);
-  size_t bin = mi_slice_bin8(slice_count);
-  mi_assert_internal(bin <= MI_SEGMENT_BIN_MAX);
-  return bin;
-}
-
-static inline size_t mi_slice_index(const mi_slice_t* slice) {
-  mi_segment_t* segment = _mi_ptr_segment(slice);
-  ptrdiff_t index = slice - segment->slices;
-  mi_assert_internal(index >= 0 && index < (ptrdiff_t)segment->slice_entries);
-  return index;
-}
-
-
-/* -----------------------------------------------------------
-   Slice span queues
------------------------------------------------------------ */
-
-static void mi_span_queue_push(mi_span_queue_t* sq, mi_slice_t* slice) {
-  // todo: or push to the end?
-  mi_assert_internal(slice->prev == NULL && slice->next==NULL);
-  slice->prev = NULL; // paranoia
-  slice->next = sq->first;
-  sq->first = slice;
-  if (slice->next != NULL) slice->next->prev = slice;
-                     else sq->last = slice;
-  slice->xblock_size = 0; // free
-}
-
-static mi_span_queue_t* mi_span_queue_for(size_t slice_count, mi_segments_tld_t* tld) {
-  size_t bin = mi_slice_bin(slice_count);
-  mi_span_queue_t* sq = &tld->spans[bin];
-  mi_assert_internal(sq->slice_count >= slice_count);
-  return sq;
-}
-
-static void mi_span_queue_delete(mi_span_queue_t* sq, mi_slice_t* slice) {
-  mi_assert_internal(slice->xblock_size==0 && slice->slice_count>0 && slice->slice_offset==0);
-  // should work too if the queue does not contain slice (which can happen during reclaim)
-  if (slice->prev != NULL) slice->prev->next = slice->next;
-  if (slice == sq->first) sq->first = slice->next;
-  if (slice->next != NULL) slice->next->prev = slice->prev;
-  if (slice == sq->last) sq->last = slice->prev;
-  slice->prev = NULL;
-  slice->next = NULL;
-  slice->xblock_size = 1; // no more free
-}
-
-
-/* -----------------------------------------------------------
- Invariant checking
------------------------------------------------------------ */
-
-static bool mi_slice_is_used(const mi_slice_t* slice) {
-  return (slice->xblock_size > 0);
-}
-
-
-#if (MI_DEBUG>=3)
-static bool mi_span_queue_contains(mi_span_queue_t* sq, mi_slice_t* slice) {
-  for (mi_slice_t* s = sq->first; s != NULL; s = s->next) {
-    if (s==slice) return true;
-  }
-  return false;
-}
-
-static bool mi_segment_is_valid(mi_segment_t* segment, mi_segments_tld_t* tld) {
-  mi_assert_internal(segment != NULL);
-  mi_assert_internal(_mi_ptr_cookie(segment) == segment->cookie);
-  mi_assert_internal(segment->abandoned <= segment->used);
-  mi_assert_internal(segment->thread_id == 0 || segment->thread_id == _mi_thread_id());
-  mi_assert_internal(mi_commit_mask_all_set(&segment->commit_mask, &segment->decommit_mask)); // can only decommit committed blocks
-  //mi_assert_internal(segment->segment_info_size % MI_SEGMENT_SLICE_SIZE == 0);
-  mi_slice_t* slice = &segment->slices[0];
-  const mi_slice_t* end = mi_segment_slices_end(segment);
-  size_t used_count = 0;
-  mi_span_queue_t* sq;
-  while(slice < end) {
-    mi_assert_internal(slice->slice_count > 0);
-    mi_assert_internal(slice->slice_offset == 0);
-    size_t index = mi_slice_index(slice);
-    size_t maxindex = (index + slice->slice_count >= segment->slice_entries ? segment->slice_entries : index + slice->slice_count) - 1;
-    if (mi_slice_is_used(slice)) { // a page in use, we need at least MAX_SLICE_OFFSET valid back offsets
-      used_count++;
-      for (size_t i = 0; i <= MI_MAX_SLICE_OFFSET && index + i <= maxindex; i++) {
-        mi_assert_internal(segment->slices[index + i].slice_offset == i*sizeof(mi_slice_t));
-        mi_assert_internal(i==0 || segment->slices[index + i].slice_count == 0);
-        mi_assert_internal(i==0 || segment->slices[index + i].xblock_size == 1);
-      }
-      // and the last entry as well (for coalescing)
-      const mi_slice_t* last = slice + slice->slice_count - 1;
-      if (last > slice && last < mi_segment_slices_end(segment)) {
-        mi_assert_internal(last->slice_offset == (slice->slice_count-1)*sizeof(mi_slice_t));
-        mi_assert_internal(last->slice_count == 0);
-        mi_assert_internal(last->xblock_size == 1);
-      }
-    }
-    else {  // free range of slices; only last slice needs a valid back offset
-      mi_slice_t* last = &segment->slices[maxindex];
-      if (segment->kind != MI_SEGMENT_HUGE || slice->slice_count <= (segment->slice_entries - segment->segment_info_slices)) {
-        mi_assert_internal((uint8_t*)slice == (uint8_t*)last - last->slice_offset);
-      }
-      mi_assert_internal(slice == last || last->slice_count == 0 );
-      mi_assert_internal(last->xblock_size == 0 || (segment->kind==MI_SEGMENT_HUGE && last->xblock_size==1));
-      if (segment->kind != MI_SEGMENT_HUGE && segment->thread_id != 0) { // segment is not huge or abandoned
-        sq = mi_span_queue_for(slice->slice_count,tld);
-        mi_assert_internal(mi_span_queue_contains(sq,slice));
-      }
-    }
-    slice = &segment->slices[maxindex+1];
-  }
-  mi_assert_internal(slice == end);
-  mi_assert_internal(used_count == segment->used + 1);
-  return true;
-}
-#endif
-
-/* -----------------------------------------------------------
- Segment size calculations
------------------------------------------------------------ */
-
-static size_t mi_segment_info_size(mi_segment_t* segment) {
-  return segment->segment_info_slices * MI_SEGMENT_SLICE_SIZE;
-}
-
-static uint8_t* _mi_segment_page_start_from_slice(const mi_segment_t* segment, const mi_slice_t* slice, size_t xblock_size, size_t* page_size)
-{
-  ptrdiff_t idx = slice - segment->slices;
-  size_t psize = (size_t)slice->slice_count * MI_SEGMENT_SLICE_SIZE;
-  // make the start not OS page aligned for smaller blocks to avoid page/cache effects
-  size_t start_offset = (xblock_size >= MI_INTPTR_SIZE && xblock_size <= 1024 ? MI_MAX_ALIGN_GUARANTEE : 0); 
-  if (page_size != NULL) { *page_size = psize - start_offset; }
-  return (uint8_t*)segment + ((idx*MI_SEGMENT_SLICE_SIZE) + start_offset);
-}
-
-// Start of the page available memory; can be used on uninitialized pages
-uint8_t* _mi_segment_page_start(const mi_segment_t* segment, const mi_page_t* page, size_t* page_size)
-{
-  const mi_slice_t* slice = mi_page_to_slice((mi_page_t*)page);
-  uint8_t* p = _mi_segment_page_start_from_slice(segment, slice, page->xblock_size, page_size);  
-  mi_assert_internal(page->xblock_size > 0 || _mi_ptr_page(p) == page);
-  mi_assert_internal(_mi_ptr_segment(p) == segment);
-  return p;
-}
-
-
-static size_t mi_segment_calculate_slices(size_t required, size_t* pre_size, size_t* info_slices) {
-  size_t page_size = _mi_os_page_size();
-  size_t isize     = _mi_align_up(sizeof(mi_segment_t), page_size);
-  size_t guardsize = 0;
-
-  if (MI_SECURE>0) {
-    // in secure mode, we set up a protected page in between the segment info
-    // and the page data (and one at the end of the segment)
-    guardsize =  page_size;
-    required  = _mi_align_up(required, page_size);
-  }
-
-  if (pre_size != NULL) *pre_size = isize;
-  isize = _mi_align_up(isize + guardsize, MI_SEGMENT_SLICE_SIZE);
-  if (info_slices != NULL) *info_slices = isize / MI_SEGMENT_SLICE_SIZE;
-  size_t segment_size = (required==0 ? MI_SEGMENT_SIZE : _mi_align_up( required + isize + guardsize, MI_SEGMENT_SLICE_SIZE) );  
-  mi_assert_internal(segment_size % MI_SEGMENT_SLICE_SIZE == 0);
-  return (segment_size / MI_SEGMENT_SLICE_SIZE);
-}
-
-
-/* ----------------------------------------------------------------------------
-Segment caches
-We keep a small segment cache per thread to increase local
-reuse and avoid setting/clearing guard pages in secure mode.
-------------------------------------------------------------------------------- */
-
-static void mi_segments_track_size(long segment_size, mi_segments_tld_t* tld) {
-  if (segment_size>=0) _mi_stat_increase(&tld->stats->segments,1);
-                  else _mi_stat_decrease(&tld->stats->segments,1);
-  tld->count += (segment_size >= 0 ? 1 : -1);
-  if (tld->count > tld->peak_count) tld->peak_count = tld->count;
-  tld->current_size += segment_size;
-  if (tld->current_size > tld->peak_size) tld->peak_size = tld->current_size;
-}
-
-static void mi_segment_os_free(mi_segment_t* segment, mi_segments_tld_t* tld) {
-  segment->thread_id = 0;
-  _mi_segment_map_freed_at(segment);
-  mi_segments_track_size(-((long)mi_segment_size(segment)),tld);
-  if (MI_SECURE>0) {
-    // _mi_os_unprotect(segment, mi_segment_size(segment)); // ensure no more guard pages are set
-    // unprotect the guard pages; we cannot just unprotect the whole segment size as part may be decommitted
-    size_t os_pagesize = _mi_os_page_size();
-    _mi_os_unprotect((uint8_t*)segment + mi_segment_info_size(segment) - os_pagesize, os_pagesize);
-    uint8_t* end = (uint8_t*)segment + mi_segment_size(segment) - os_pagesize;
-    _mi_os_unprotect(end, os_pagesize);
-  }
-
-  // purge delayed decommits now? (no, leave it to the cache)
-  // mi_segment_delayed_decommit(segment,true,tld->stats);
-  
-  // _mi_os_free(segment, mi_segment_size(segment), /*segment->memid,*/ tld->stats);
-  const size_t size = mi_segment_size(segment);
-  if (size != MI_SEGMENT_SIZE || !_mi_segment_cache_push(segment, size, segment->memid, &segment->commit_mask, &segment->decommit_mask, segment->mem_is_large, segment->mem_is_pinned, tld->os)) {
-    const size_t csize = _mi_commit_mask_committed_size(&segment->commit_mask, size);
-    if (csize > 0 && !segment->mem_is_pinned) _mi_stat_decrease(&_mi_stats_main.committed, csize);
-    _mi_abandoned_await_readers();  // wait until safe to free
-    _mi_arena_free(segment, mi_segment_size(segment), segment->memid, segment->mem_is_pinned /* pretend not committed to not double count decommits */, tld->os);
-  }
-}
-
-// called by threads that are terminating 
-void _mi_segment_thread_collect(mi_segments_tld_t* tld) {
-  MI_UNUSED(tld);
-  // nothing to do
-}
-
-
-/* -----------------------------------------------------------
-   Span management
------------------------------------------------------------ */
-
-static void mi_segment_commit_mask(mi_segment_t* segment, bool conservative, uint8_t* p, size_t size, uint8_t** start_p, size_t* full_size, mi_commit_mask_t* cm) {
-  mi_assert_internal(_mi_ptr_segment(p) == segment);
-  mi_assert_internal(segment->kind != MI_SEGMENT_HUGE);
-  mi_commit_mask_create_empty(cm);
-  if (size == 0 || size > MI_SEGMENT_SIZE || segment->kind == MI_SEGMENT_HUGE) return;
-  const size_t segstart = mi_segment_info_size(segment);
-  const size_t segsize = mi_segment_size(segment);
-  if (p >= (uint8_t*)segment + segsize) return;
-
-  size_t pstart = (p - (uint8_t*)segment);
-  mi_assert_internal(pstart + size <= segsize);
-
-  size_t start;
-  size_t end;
-  if (conservative) {
-    // decommit conservative
-    start = _mi_align_up(pstart, MI_COMMIT_SIZE);
-    end   = _mi_align_down(pstart + size, MI_COMMIT_SIZE);
-    mi_assert_internal(start >= segstart);
-    mi_assert_internal(end <= segsize);
-  }
-  else {
-    // commit liberal
-    start = _mi_align_down(pstart, MI_MINIMAL_COMMIT_SIZE);
-    end   = _mi_align_up(pstart + size, MI_MINIMAL_COMMIT_SIZE);
-  }
-  if (pstart >= segstart && start < segstart) {  // note: the mask is also calculated for an initial commit of the info area
-    start = segstart;
-  }
-  if (end > segsize) {
-    end = segsize;
-  }
-
-  mi_assert_internal(start <= pstart && (pstart + size) <= end);
-  mi_assert_internal(start % MI_COMMIT_SIZE==0 && end % MI_COMMIT_SIZE == 0);
-  *start_p   = (uint8_t*)segment + start;
-  *full_size = (end > start ? end - start : 0);
-  if (*full_size == 0) return;
-
-  size_t bitidx = start / MI_COMMIT_SIZE;
-  mi_assert_internal(bitidx < MI_COMMIT_MASK_BITS);
-  
-  size_t bitcount = *full_size / MI_COMMIT_SIZE; // can be 0
-  if (bitidx + bitcount > MI_COMMIT_MASK_BITS) {
-    _mi_warning_message("commit mask overflow: idx=%zu count=%zu start=%zx end=%zx p=0x%p size=%zu fullsize=%zu\n", bitidx, bitcount, start, end, p, size, *full_size);
-  }
-  mi_assert_internal((bitidx + bitcount) <= MI_COMMIT_MASK_BITS);
-  mi_commit_mask_create(bitidx, bitcount, cm);
-}
-
-
-static bool mi_segment_commitx(mi_segment_t* segment, bool commit, uint8_t* p, size_t size, mi_stats_t* stats) {    
-  mi_assert_internal(mi_commit_mask_all_set(&segment->commit_mask, &segment->decommit_mask));
-
-  // try to commit in at least MI_MINIMAL_COMMIT_SIZE sizes.
-  /*
-  if (commit && size > 0) {
-    const size_t csize = _mi_align_up(size, MI_MINIMAL_COMMIT_SIZE);
-    if (p + csize <= mi_segment_end(segment)) {
-      size = csize;
-    }
-  }
-  */
-  // commit liberal, but decommit conservative
-  uint8_t* start = NULL;
-  size_t   full_size = 0;
-  mi_commit_mask_t mask;
-  mi_segment_commit_mask(segment, !commit/*conservative*/, p, size, &start, &full_size, &mask);
-  if (mi_commit_mask_is_empty(&mask) || full_size==0) return true;
-
-  if (commit && !mi_commit_mask_all_set(&segment->commit_mask, &mask)) {
-    bool is_zero = false;
-    mi_commit_mask_t cmask;
-    mi_commit_mask_create_intersect(&segment->commit_mask, &mask, &cmask);
-    _mi_stat_decrease(&_mi_stats_main.committed, _mi_commit_mask_committed_size(&cmask, MI_SEGMENT_SIZE)); // adjust for overlap
-    if (!_mi_os_commit(start,full_size,&is_zero,stats)) return false;    
-    mi_commit_mask_set(&segment->commit_mask, &mask);     
-  }
-  else if (!commit && mi_commit_mask_any_set(&segment->commit_mask, &mask)) {
-    mi_assert_internal((void*)start != (void*)segment);
-    //mi_assert_internal(mi_commit_mask_all_set(&segment->commit_mask, &mask));
-
-    mi_commit_mask_t cmask;
-    mi_commit_mask_create_intersect(&segment->commit_mask, &mask, &cmask);
-    _mi_stat_increase(&_mi_stats_main.committed, full_size - _mi_commit_mask_committed_size(&cmask, MI_SEGMENT_SIZE)); // adjust for overlap
-    if (segment->allow_decommit) { 
-      _mi_os_decommit(start, full_size, stats); // ok if this fails
-    } 
-    mi_commit_mask_clear(&segment->commit_mask, &mask);
-  }
-  // increase expiration of reusing part of the delayed decommit
-  if (commit && mi_commit_mask_any_set(&segment->decommit_mask, &mask)) {
-    segment->decommit_expire = _mi_clock_now() + mi_option_get(mi_option_decommit_delay);
-  }
-  // always undo delayed decommits
-  mi_commit_mask_clear(&segment->decommit_mask, &mask);
-  return true;
-}
-
-static bool mi_segment_ensure_committed(mi_segment_t* segment, uint8_t* p, size_t size, mi_stats_t* stats) {
-  mi_assert_internal(mi_commit_mask_all_set(&segment->commit_mask, &segment->decommit_mask));
-  // note: assumes commit_mask is always full for huge segments as otherwise the commit mask bits can overflow
-  if (mi_commit_mask_is_full(&segment->commit_mask) && mi_commit_mask_is_empty(&segment->decommit_mask)) return true; // fully committed
-  return mi_segment_commitx(segment,true,p,size,stats);
-}
-
-static void mi_segment_perhaps_decommit(mi_segment_t* segment, uint8_t* p, size_t size, mi_stats_t* stats) {
-  if (!segment->allow_decommit) return;
-  if (mi_option_get(mi_option_decommit_delay) == 0) {
-    mi_segment_commitx(segment, false, p, size, stats);
-  }
-  else {
-    // register for future decommit in the decommit mask
-    uint8_t* start = NULL;
-    size_t   full_size = 0;
-    mi_commit_mask_t mask; 
-    mi_segment_commit_mask(segment, true /*conservative*/, p, size, &start, &full_size, &mask);
-    if (mi_commit_mask_is_empty(&mask) || full_size==0) return;
-    
-    // update delayed commit
-    mi_assert_internal(segment->decommit_expire > 0 || mi_commit_mask_is_empty(&segment->decommit_mask));      
-    mi_commit_mask_t cmask;
-    mi_commit_mask_create_intersect(&segment->commit_mask, &mask, &cmask);  // only decommit what is committed; span_free may try to decommit more
-    mi_commit_mask_set(&segment->decommit_mask, &cmask);
-    mi_msecs_t now = _mi_clock_now();    
-    if (segment->decommit_expire == 0) {
-      // no previous decommits, initialize now
-      segment->decommit_expire = now + mi_option_get(mi_option_decommit_delay);
-    }
-    else if (segment->decommit_expire <= now) {
-      // previous decommit mask already expired
-      // mi_segment_delayed_decommit(segment, true, stats);
-      segment->decommit_expire = now + mi_option_get(mi_option_decommit_extend_delay); // (mi_option_get(mi_option_decommit_delay) / 8); // wait a tiny bit longer in case there is a series of free's
-    }
-    else {
-      // previous decommit mask is not yet expired, increase the expiration by a bit.
-      segment->decommit_expire += mi_option_get(mi_option_decommit_extend_delay);
-    }
-  }  
-}
-
-static void mi_segment_delayed_decommit(mi_segment_t* segment, bool force, mi_stats_t* stats) {
-  if (!segment->allow_decommit || mi_commit_mask_is_empty(&segment->decommit_mask)) return;
-  mi_msecs_t now = _mi_clock_now();
-  if (!force && now < segment->decommit_expire) return;
-
-  mi_commit_mask_t mask = segment->decommit_mask;
-  segment->decommit_expire = 0;
-  mi_commit_mask_create_empty(&segment->decommit_mask);
-
-  size_t idx;
-  size_t count;
-  mi_commit_mask_foreach(&mask, idx, count) {
-    // if found, decommit that sequence
-    if (count > 0) {
-      uint8_t* p = (uint8_t*)segment + (idx*MI_COMMIT_SIZE);
-      size_t size = count * MI_COMMIT_SIZE;
-      mi_segment_commitx(segment, false, p, size, stats);
-    }
-  }
-  mi_commit_mask_foreach_end()
-  mi_assert_internal(mi_commit_mask_is_empty(&segment->decommit_mask));
-}
-
-
-static bool mi_segment_is_abandoned(mi_segment_t* segment) {
-  return (segment->thread_id == 0);
-}
-
-// note: can be called on abandoned segments
-static void mi_segment_span_free(mi_segment_t* segment, size_t slice_index, size_t slice_count, mi_segments_tld_t* tld) {
-  mi_assert_internal(slice_index < segment->slice_entries);
-  mi_span_queue_t* sq = (segment->kind == MI_SEGMENT_HUGE || mi_segment_is_abandoned(segment) 
-                          ? NULL : mi_span_queue_for(slice_count,tld));
-  if (slice_count==0) slice_count = 1;
-  mi_assert_internal(slice_index + slice_count - 1 < segment->slice_entries);
-
-  // set first and last slice (the intermediates can be undetermined)
-  mi_slice_t* slice = &segment->slices[slice_index];
-  slice->slice_count = (uint32_t)slice_count;
-  mi_assert_internal(slice->slice_count == slice_count); // no overflow?
-  slice->slice_offset = 0;
-  if (slice_count > 1) {
-    mi_slice_t* last = &segment->slices[slice_index + slice_count - 1];
-    last->slice_count = 0;
-    last->slice_offset = (uint32_t)(sizeof(mi_page_t)*(slice_count - 1));
-    last->xblock_size = 0;
-  }
-
-  // perhaps decommit
-  mi_segment_perhaps_decommit(segment,mi_slice_start(slice),slice_count*MI_SEGMENT_SLICE_SIZE,tld->stats);
-  
-  // and push it on the free page queue (if it was not a huge page)
-  if (sq != NULL) mi_span_queue_push( sq, slice );
-             else slice->xblock_size = 0; // mark huge page as free anyways
-}
-
-/*
-// called from reclaim to add existing free spans
-static void mi_segment_span_add_free(mi_slice_t* slice, mi_segments_tld_t* tld) {
-  mi_segment_t* segment = _mi_ptr_segment(slice);
-  mi_assert_internal(slice->xblock_size==0 && slice->slice_count>0 && slice->slice_offset==0);
-  size_t slice_index = mi_slice_index(slice);
-  mi_segment_span_free(segment,slice_index,slice->slice_count,tld);
-}
-*/
-
-static void mi_segment_span_remove_from_queue(mi_slice_t* slice, mi_segments_tld_t* tld) {
-  mi_assert_internal(slice->slice_count > 0 && slice->slice_offset==0 && slice->xblock_size==0);
-  mi_assert_internal(_mi_ptr_segment(slice)->kind != MI_SEGMENT_HUGE);
-  mi_span_queue_t* sq = mi_span_queue_for(slice->slice_count, tld);
-  mi_span_queue_delete(sq, slice);
-}
-
-// note: can be called on abandoned segments
-static mi_slice_t* mi_segment_span_free_coalesce(mi_slice_t* slice, mi_segments_tld_t* tld) {
-  mi_assert_internal(slice != NULL && slice->slice_count > 0 && slice->slice_offset == 0);
-  mi_segment_t* segment = _mi_ptr_segment(slice);
-  bool is_abandoned = mi_segment_is_abandoned(segment);
-
-  // for huge pages, just mark as free but don't add to the queues
-  if (segment->kind == MI_SEGMENT_HUGE) {
-    mi_assert_internal(segment->used == 1);  // decreased right after this call in `mi_segment_page_clear`
-    slice->xblock_size = 0;  // mark as free anyways
-    // we should mark the last slice `xblock_size=0` now to maintain invariants but we skip it to 
-    // avoid a possible cache miss (and the segment is about to be freed)
-    return slice;
-  }
-
-  // otherwise coalesce the span and add to the free span queues
-  size_t slice_count = slice->slice_count;
-  mi_slice_t* next = slice + slice->slice_count;
-  mi_assert_internal(next <= mi_segment_slices_end(segment));
-  if (next < mi_segment_slices_end(segment) && next->xblock_size==0) {
-    // free next block -- remove it from free and merge
-    mi_assert_internal(next->slice_count > 0 && next->slice_offset==0);
-    slice_count += next->slice_count; // extend
-    if (!is_abandoned) { mi_segment_span_remove_from_queue(next, tld); }
-  }
-  if (slice > segment->slices) {
-    mi_slice_t* prev = mi_slice_first(slice - 1);
-    mi_assert_internal(prev >= segment->slices);
-    if (prev->xblock_size==0) {
-      // free previous slice -- remove it from free and merge
-      mi_assert_internal(prev->slice_count > 0 && prev->slice_offset==0);
-      slice_count += prev->slice_count;
-      if (!is_abandoned) { mi_segment_span_remove_from_queue(prev, tld); }
-      slice = prev;
-    }
-  }
-
-  // and add the new free page
-  mi_segment_span_free(segment, mi_slice_index(slice), slice_count, tld);
-  return slice;
-}
-
-
-static void mi_segment_slice_split(mi_segment_t* segment, mi_slice_t* slice, size_t slice_count, mi_segments_tld_t* tld) {
-  mi_assert_internal(_mi_ptr_segment(slice)==segment);
-  mi_assert_internal(slice->slice_count >= slice_count);
-  mi_assert_internal(slice->xblock_size > 0); // no more in free queue
-  if (slice->slice_count <= slice_count) return;
-  mi_assert_internal(segment->kind != MI_SEGMENT_HUGE);
-  size_t next_index = mi_slice_index(slice) + slice_count;
-  size_t next_count = slice->slice_count - slice_count;
-  mi_segment_span_free(segment, next_index, next_count, tld);
-  slice->slice_count = (uint32_t)slice_count;
-}
-
-// Note: may still return NULL if committing the memory failed
-static mi_page_t* mi_segment_span_allocate(mi_segment_t* segment, size_t slice_index, size_t slice_count, mi_segments_tld_t* tld) {
-  mi_assert_internal(slice_index < segment->slice_entries);
-  mi_slice_t* slice = &segment->slices[slice_index];
-  mi_assert_internal(slice->xblock_size==0 || slice->xblock_size==1);
-
-  // commit before changing the slice data
-  if (!mi_segment_ensure_committed(segment, _mi_segment_page_start_from_slice(segment, slice, 0, NULL), slice_count * MI_SEGMENT_SLICE_SIZE, tld->stats)) {
-    return NULL;  // commit failed!
-  }
-
-  // convert the slices to a page
-  slice->slice_offset = 0;
-  slice->slice_count = (uint32_t)slice_count;
-  mi_assert_internal(slice->slice_count == slice_count);
-  const size_t bsize = slice_count * MI_SEGMENT_SLICE_SIZE;
-  slice->xblock_size = (uint32_t)(bsize >= MI_HUGE_BLOCK_SIZE ? MI_HUGE_BLOCK_SIZE : bsize);
-  mi_page_t*  page = mi_slice_to_page(slice);
-  mi_assert_internal(mi_page_block_size(page) == bsize);
-
-  // set slice back pointers for the first MI_MAX_SLICE_OFFSET entries
-  size_t extra = slice_count-1;
-  if (extra > MI_MAX_SLICE_OFFSET) extra = MI_MAX_SLICE_OFFSET;
-  if (slice_index + extra >= segment->slice_entries) extra = segment->slice_entries - slice_index - 1;  // huge objects may have more slices than avaiable entries in the segment->slices
-  slice++;
-  for (size_t i = 1; i <= extra; i++, slice++) {
-    slice->slice_offset = (uint32_t)(sizeof(mi_slice_t)*i);
-    slice->slice_count = 0;
-    slice->xblock_size = 1;
-  }
-
-  // and also for the last one (if not set already) (the last one is needed for coalescing)
-  // note: the cast is needed for ubsan since the index can be larger than MI_SLICES_PER_SEGMENT for huge allocations (see #543)
-  mi_slice_t* last = &((mi_slice_t*)segment->slices)[slice_index + slice_count - 1]; 
-  if (last < mi_segment_slices_end(segment) && last >= slice) {
-    last->slice_offset = (uint32_t)(sizeof(mi_slice_t)*(slice_count-1));
-    last->slice_count = 0;
-    last->xblock_size = 1;
-  }
-  
-  // and initialize the page
-  page->is_reset = false;
-  page->is_committed = true;
-  segment->used++;
-  return page;
-}
-
-static mi_page_t* mi_segments_page_find_and_allocate(size_t slice_count, mi_arena_id_t req_arena_id, mi_segments_tld_t* tld) {
-  mi_assert_internal(slice_count*MI_SEGMENT_SLICE_SIZE <= MI_LARGE_OBJ_SIZE_MAX);
-  // search from best fit up
-  mi_span_queue_t* sq = mi_span_queue_for(slice_count, tld);
-  if (slice_count == 0) slice_count = 1;
-  while (sq <= &tld->spans[MI_SEGMENT_BIN_MAX]) {
-    for (mi_slice_t* slice = sq->first; slice != NULL; slice = slice->next) {
-      if (slice->slice_count >= slice_count) {
-        // found one
-        mi_segment_t* segment = _mi_ptr_segment(slice);
-        if (_mi_arena_memid_is_suitable(segment->memid, req_arena_id)) {
-          // found a suitable page span
-          mi_span_queue_delete(sq, slice);
-
-          if (slice->slice_count > slice_count) {
-            mi_segment_slice_split(segment, slice, slice_count, tld);
-          }
-          mi_assert_internal(slice != NULL && slice->slice_count == slice_count && slice->xblock_size > 0);
-          mi_page_t* page = mi_segment_span_allocate(segment, mi_slice_index(slice), slice->slice_count, tld);
-          if (page == NULL) {
-            // commit failed; return NULL but first restore the slice
-            mi_segment_span_free_coalesce(slice, tld);
-            return NULL;
-          }
-          return page;
-        }
-      }
-    }
-    sq++;
-  }
-  // could not find a page..
-  return NULL;
-}
-
-
-/* -----------------------------------------------------------
-   Segment allocation
------------------------------------------------------------ */
-
-// Allocate a segment from the OS aligned to `MI_SEGMENT_SIZE` .
-static mi_segment_t* mi_segment_init(mi_segment_t* segment, size_t required, mi_arena_id_t req_arena_id, mi_segments_tld_t* tld, mi_os_tld_t* os_tld, mi_page_t** huge_page)
-{
-  mi_assert_internal((required==0 && huge_page==NULL) || (required>0 && huge_page != NULL));
-  mi_assert_internal((segment==NULL) || (segment!=NULL && required==0));
-  // calculate needed sizes first
-  size_t info_slices;
-  size_t pre_size;
-  const size_t segment_slices = mi_segment_calculate_slices(required, &pre_size, &info_slices);
-  const size_t slice_entries = (segment_slices > MI_SLICES_PER_SEGMENT ? MI_SLICES_PER_SEGMENT : segment_slices);
-  const size_t segment_size = segment_slices * MI_SEGMENT_SLICE_SIZE;
-
-  // Commit eagerly only if not the first N lazy segments (to reduce impact of many threads that allocate just a little)
-  const bool eager_delay = (// !_mi_os_has_overcommit() &&             // never delay on overcommit systems
-                            _mi_current_thread_count() > 1 &&       // do not delay for the first N threads
-                            tld->count < (size_t)mi_option_get(mi_option_eager_commit_delay));
-  const bool eager = !eager_delay && mi_option_is_enabled(mi_option_eager_commit);
-  bool commit = eager || (required > 0); 
-  
-  // Try to get from our cache first
-  bool is_zero = false;
-  const bool commit_info_still_good = (segment != NULL);
-  mi_commit_mask_t commit_mask;
-  mi_commit_mask_t decommit_mask;
-  if (segment != NULL) {
-    commit_mask = segment->commit_mask;
-    decommit_mask = segment->decommit_mask;
-  }
-  else {
-    mi_commit_mask_create_empty(&commit_mask);
-    mi_commit_mask_create_empty(&decommit_mask);
-  }
-  if (segment==NULL) {
-    // Allocate the segment from the OS
-    bool mem_large = (!eager_delay && (MI_SECURE==0)); // only allow large OS pages once we are no longer lazy    
-    bool is_pinned = false;
-    size_t memid = 0;
-    segment = (mi_segment_t*)_mi_segment_cache_pop(segment_size, &commit_mask, &decommit_mask, &mem_large, &is_pinned, &is_zero, req_arena_id, &memid, os_tld);
-    if (segment==NULL) {
-      segment = (mi_segment_t*)_mi_arena_alloc_aligned(segment_size, MI_SEGMENT_SIZE, &commit, &mem_large, &is_pinned, &is_zero, req_arena_id, &memid, os_tld);
-      if (segment == NULL) return NULL;  // failed to allocate
-      if (commit) {
-        mi_commit_mask_create_full(&commit_mask);
-      }
-      else {
-        mi_commit_mask_create_empty(&commit_mask);
-      }
-    }    
-    mi_assert_internal(segment != NULL && (uintptr_t)segment % MI_SEGMENT_SIZE == 0);
-
-    const size_t commit_needed = _mi_divide_up(info_slices*MI_SEGMENT_SLICE_SIZE, MI_COMMIT_SIZE);
-    mi_assert_internal(commit_needed>0);
-    mi_commit_mask_t commit_needed_mask;
-    mi_commit_mask_create(0, commit_needed, &commit_needed_mask);
-    if (!mi_commit_mask_all_set(&commit_mask, &commit_needed_mask)) {
-      // at least commit the info slices
-      mi_assert_internal(commit_needed*MI_COMMIT_SIZE >= info_slices*MI_SEGMENT_SLICE_SIZE);
-      bool ok = _mi_os_commit(segment, commit_needed*MI_COMMIT_SIZE, &is_zero, tld->stats);
-      if (!ok) return NULL; // failed to commit   
-      mi_commit_mask_set(&commit_mask, &commit_needed_mask); 
-    }
-    mi_track_mem_undefined(segment,commit_needed);
-    segment->memid = memid;
-    segment->mem_is_pinned = is_pinned;
-    segment->mem_is_large = mem_large;
-    segment->mem_is_committed = mi_commit_mask_is_full(&commit_mask);
-    mi_segments_track_size((long)(segment_size), tld);
-    _mi_segment_map_allocated_at(segment);
-  }
-
-  // zero the segment info? -- not always needed as it is zero initialized from the OS 
-  mi_atomic_store_ptr_release(mi_segment_t, &segment->abandoned_next, NULL);  // tsan
-  if (!is_zero) {
-    ptrdiff_t ofs = offsetof(mi_segment_t, next);
-    size_t    prefix = offsetof(mi_segment_t, slices) - ofs;
-    memset((uint8_t*)segment+ofs, 0, prefix + sizeof(mi_slice_t)*segment_slices);
-  }
-
-  if (!commit_info_still_good) {
-    segment->commit_mask = commit_mask; // on lazy commit, the initial part is always committed
-    segment->allow_decommit = (mi_option_is_enabled(mi_option_allow_decommit) && !segment->mem_is_pinned && !segment->mem_is_large);    
-    if (segment->allow_decommit) {
-      segment->decommit_expire = _mi_clock_now() + mi_option_get(mi_option_decommit_delay);
-      segment->decommit_mask = decommit_mask;
-      mi_assert_internal(mi_commit_mask_all_set(&segment->commit_mask, &segment->decommit_mask));
-      #if MI_DEBUG>2
-      const size_t commit_needed = _mi_divide_up(info_slices*MI_SEGMENT_SLICE_SIZE, MI_COMMIT_SIZE);
-      mi_commit_mask_t commit_needed_mask;
-      mi_commit_mask_create(0, commit_needed, &commit_needed_mask);
-      mi_assert_internal(!mi_commit_mask_any_set(&segment->decommit_mask, &commit_needed_mask));
-      #endif
-    }    
-    else {
-      mi_assert_internal(mi_commit_mask_is_empty(&decommit_mask));
-      segment->decommit_expire = 0;
-      mi_commit_mask_create_empty( &segment->decommit_mask );
-      mi_assert_internal(mi_commit_mask_is_empty(&segment->decommit_mask));
-    }
-  }
-  
-
-  // initialize segment info
-  segment->segment_slices = segment_slices;
-  segment->segment_info_slices = info_slices;
-  segment->thread_id = _mi_thread_id();
-  segment->cookie = _mi_ptr_cookie(segment);
-  segment->slice_entries = slice_entries;
-  segment->kind = (required == 0 ? MI_SEGMENT_NORMAL : MI_SEGMENT_HUGE);
-
-  // memset(segment->slices, 0, sizeof(mi_slice_t)*(info_slices+1));
-  _mi_stat_increase(&tld->stats->page_committed, mi_segment_info_size(segment));
-
-  // set up guard pages
-  size_t guard_slices = 0;
-  if (MI_SECURE>0) {
-    // in secure mode, we set up a protected page in between the segment info
-    // and the page data, and at the end of the segment.
-    size_t os_pagesize = _mi_os_page_size();    
-    mi_assert_internal(mi_segment_info_size(segment) - os_pagesize >= pre_size);
-    _mi_os_protect((uint8_t*)segment + mi_segment_info_size(segment) - os_pagesize, os_pagesize);
-    uint8_t* end = (uint8_t*)segment + mi_segment_size(segment) - os_pagesize;
-    mi_segment_ensure_committed(segment, end, os_pagesize, tld->stats);
-    _mi_os_protect(end, os_pagesize);
-    if (slice_entries == segment_slices) segment->slice_entries--; // don't use the last slice :-(
-    guard_slices = 1;
-  }
-
-  // reserve first slices for segment info
-  mi_page_t* page0 = mi_segment_span_allocate(segment, 0, info_slices, tld);
-  mi_assert_internal(page0!=NULL); if (page0==NULL) return NULL; // cannot fail as we always commit in advance  
-  mi_assert_internal(segment->used == 1);
-  segment->used = 0; // don't count our internal slices towards usage
-  
-  // initialize initial free pages
-  if (segment->kind == MI_SEGMENT_NORMAL) { // not a huge page
-    mi_assert_internal(huge_page==NULL);
-    mi_segment_span_free(segment, info_slices, segment->slice_entries - info_slices, tld);
-  }
-  else {
-    mi_assert_internal(huge_page!=NULL);
-    mi_assert_internal(mi_commit_mask_is_empty(&segment->decommit_mask));
-    mi_assert_internal(mi_commit_mask_is_full(&segment->commit_mask));
-    *huge_page = mi_segment_span_allocate(segment, info_slices, segment_slices - info_slices - guard_slices, tld);
-    mi_assert_internal(*huge_page != NULL); // cannot fail as we commit in advance 
-  }
-
-  mi_assert_expensive(mi_segment_is_valid(segment,tld));
-  return segment;
-}
-
-
-// Allocate a segment from the OS aligned to `MI_SEGMENT_SIZE` .
-static mi_segment_t* mi_segment_alloc(size_t required, mi_arena_id_t req_arena_id, mi_segments_tld_t* tld, mi_os_tld_t* os_tld, mi_page_t** huge_page) {
-  return mi_segment_init(NULL, required, req_arena_id, tld, os_tld, huge_page);
-}
-
-
-static void mi_segment_free(mi_segment_t* segment, bool force, mi_segments_tld_t* tld) {
-  MI_UNUSED(force);
-  mi_assert_internal(segment != NULL);
-  mi_assert_internal(segment->next == NULL);
-  mi_assert_internal(segment->used == 0);
-
-  // Remove the free pages
-  mi_slice_t* slice = &segment->slices[0];
-  const mi_slice_t* end = mi_segment_slices_end(segment);
-  size_t page_count = 0;
-  while (slice < end) {
-    mi_assert_internal(slice->slice_count > 0);
-    mi_assert_internal(slice->slice_offset == 0);
-    mi_assert_internal(mi_slice_index(slice)==0 || slice->xblock_size == 0); // no more used pages ..
-    if (slice->xblock_size == 0 && segment->kind != MI_SEGMENT_HUGE) {
-      mi_segment_span_remove_from_queue(slice, tld);
-    }
-    page_count++;
-    slice = slice + slice->slice_count;
-  }
-  mi_assert_internal(page_count == 2); // first page is allocated by the segment itself
-
-  // stats
-  _mi_stat_decrease(&tld->stats->page_committed, mi_segment_info_size(segment));
-
-  // return it to the OS
-  mi_segment_os_free(segment, tld);
-}
-
-
-/* -----------------------------------------------------------
-   Page Free
------------------------------------------------------------ */
-
-static void mi_segment_abandon(mi_segment_t* segment, mi_segments_tld_t* tld);
-
-// note: can be called on abandoned pages
-static mi_slice_t* mi_segment_page_clear(mi_page_t* page, mi_segments_tld_t* tld) {
-  mi_assert_internal(page->xblock_size > 0);
-  mi_assert_internal(mi_page_all_free(page));
-  mi_segment_t* segment = _mi_ptr_segment(page);
-  mi_assert_internal(segment->used > 0);
-  
-  size_t inuse = page->capacity * mi_page_block_size(page);
-  _mi_stat_decrease(&tld->stats->page_committed, inuse);
-  _mi_stat_decrease(&tld->stats->pages, 1);
-
-  // reset the page memory to reduce memory pressure?
-  if (!segment->mem_is_pinned && !page->is_reset && mi_option_is_enabled(mi_option_page_reset)) {
-    size_t psize;
-    uint8_t* start = _mi_page_start(segment, page, &psize);
-    page->is_reset = true;
-    _mi_os_reset(start, psize, tld->stats);
-  }
-
-  // zero the page data, but not the segment fields
-  page->is_zero_init = false;
-  ptrdiff_t ofs = offsetof(mi_page_t, capacity);
-  memset((uint8_t*)page + ofs, 0, sizeof(*page) - ofs);
-  page->xblock_size = 1;
-
-  // and free it
-  mi_slice_t* slice = mi_segment_span_free_coalesce(mi_page_to_slice(page), tld);  
-  segment->used--;
-  // cannot assert segment valid as it is called during reclaim
-  // mi_assert_expensive(mi_segment_is_valid(segment, tld));
-  return slice;
-}
-
-void _mi_segment_page_free(mi_page_t* page, bool force, mi_segments_tld_t* tld)
-{
-  mi_assert(page != NULL);
-
-  mi_segment_t* segment = _mi_page_segment(page);
-  mi_assert_expensive(mi_segment_is_valid(segment,tld));
-
-  // mark it as free now
-  mi_segment_page_clear(page, tld);
-  mi_assert_expensive(mi_segment_is_valid(segment, tld));
-
-  if (segment->used == 0) {
-    // no more used pages; remove from the free list and free the segment
-    mi_segment_free(segment, force, tld);
-  }
-  else if (segment->used == segment->abandoned) {
-    // only abandoned pages; remove from free list and abandon
-    mi_segment_abandon(segment,tld);
-  }
-}
-
-
-/* -----------------------------------------------------------
-Abandonment
-
-When threads terminate, they can leave segments with
-live blocks (reachable through other threads). Such segments
-are "abandoned" and will be reclaimed by other threads to
-reuse their pages and/or free them eventually
-
-We maintain a global list of abandoned segments that are
-reclaimed on demand. Since this is shared among threads
-the implementation needs to avoid the A-B-A problem on
-popping abandoned segments: <https://en.wikipedia.org/wiki/ABA_problem>
-We use tagged pointers to avoid accidentially identifying
-reused segments, much like stamped references in Java.
-Secondly, we maintain a reader counter to avoid resetting
-or decommitting segments that have a pending read operation.
-
-Note: the current implementation is one possible design;
-another way might be to keep track of abandoned segments
-in the arenas/segment_cache's. This would have the advantage of keeping
-all concurrent code in one place and not needing to deal
-with ABA issues. The drawback is that it is unclear how to
-scan abandoned segments efficiently in that case as they
-would be spread among all other segments in the arenas.
------------------------------------------------------------ */
-
-// Use the bottom 20-bits (on 64-bit) of the aligned segment pointers
-// to put in a tag that increments on update to avoid the A-B-A problem.
-#define MI_TAGGED_MASK   MI_SEGMENT_MASK
-typedef uintptr_t        mi_tagged_segment_t;
-
-static mi_segment_t* mi_tagged_segment_ptr(mi_tagged_segment_t ts) {
-  return (mi_segment_t*)(ts & ~MI_TAGGED_MASK);
-}
-
-static mi_tagged_segment_t mi_tagged_segment(mi_segment_t* segment, mi_tagged_segment_t ts) {
-  mi_assert_internal(((uintptr_t)segment & MI_TAGGED_MASK) == 0);
-  uintptr_t tag = ((ts & MI_TAGGED_MASK) + 1) & MI_TAGGED_MASK;
-  return ((uintptr_t)segment | tag);
-}
-
-// This is a list of visited abandoned pages that were full at the time.
-// this list migrates to `abandoned` when that becomes NULL. The use of
-// this list reduces contention and the rate at which segments are visited.
-static mi_decl_cache_align _Atomic(mi_segment_t*)       abandoned_visited; // = NULL
-
-// The abandoned page list (tagged as it supports pop)
-static mi_decl_cache_align _Atomic(mi_tagged_segment_t) abandoned;         // = NULL
-
-// Maintain these for debug purposes (these counts may be a bit off)
-static mi_decl_cache_align _Atomic(size_t)           abandoned_count; 
-static mi_decl_cache_align _Atomic(size_t)           abandoned_visited_count;
-
-// We also maintain a count of current readers of the abandoned list
-// in order to prevent resetting/decommitting segment memory if it might
-// still be read.
-static mi_decl_cache_align _Atomic(size_t)           abandoned_readers; // = 0
-
-// Push on the visited list
-static void mi_abandoned_visited_push(mi_segment_t* segment) {
-  mi_assert_internal(segment->thread_id == 0);
-  mi_assert_internal(mi_atomic_load_ptr_relaxed(mi_segment_t,&segment->abandoned_next) == NULL);
-  mi_assert_internal(segment->next == NULL);
-  mi_assert_internal(segment->used > 0);
-  mi_segment_t* anext = mi_atomic_load_ptr_relaxed(mi_segment_t, &abandoned_visited);
-  do {
-    mi_atomic_store_ptr_release(mi_segment_t, &segment->abandoned_next, anext);
-  } while (!mi_atomic_cas_ptr_weak_release(mi_segment_t, &abandoned_visited, &anext, segment));
-  mi_atomic_increment_relaxed(&abandoned_visited_count);
-}
-
-// Move the visited list to the abandoned list.
-static bool mi_abandoned_visited_revisit(void)
-{
-  // quick check if the visited list is empty
-  if (mi_atomic_load_ptr_relaxed(mi_segment_t, &abandoned_visited) == NULL) return false;
-
-  // grab the whole visited list
-  mi_segment_t* first = mi_atomic_exchange_ptr_acq_rel(mi_segment_t, &abandoned_visited, NULL);
-  if (first == NULL) return false;
-
-  // first try to swap directly if the abandoned list happens to be NULL
-  mi_tagged_segment_t afirst;
-  mi_tagged_segment_t ts = mi_atomic_load_relaxed(&abandoned);
-  if (mi_tagged_segment_ptr(ts)==NULL) {
-    size_t count = mi_atomic_load_relaxed(&abandoned_visited_count);
-    afirst = mi_tagged_segment(first, ts);
-    if (mi_atomic_cas_strong_acq_rel(&abandoned, &ts, afirst)) {
-      mi_atomic_add_relaxed(&abandoned_count, count);
-      mi_atomic_sub_relaxed(&abandoned_visited_count, count);
-      return true;
-    }
-  }
-
-  // find the last element of the visited list: O(n)
-  mi_segment_t* last = first;
-  mi_segment_t* next;
-  while ((next = mi_atomic_load_ptr_relaxed(mi_segment_t, &last->abandoned_next)) != NULL) {
-    last = next;
-  }
-
-  // and atomically prepend to the abandoned list
-  // (no need to increase the readers as we don't access the abandoned segments)
-  mi_tagged_segment_t anext = mi_atomic_load_relaxed(&abandoned);
-  size_t count;
-  do {
-    count = mi_atomic_load_relaxed(&abandoned_visited_count);
-    mi_atomic_store_ptr_release(mi_segment_t, &last->abandoned_next, mi_tagged_segment_ptr(anext));
-    afirst = mi_tagged_segment(first, anext);
-  } while (!mi_atomic_cas_weak_release(&abandoned, &anext, afirst));
-  mi_atomic_add_relaxed(&abandoned_count, count);
-  mi_atomic_sub_relaxed(&abandoned_visited_count, count);
-  return true;
-}
-
-// Push on the abandoned list.
-static void mi_abandoned_push(mi_segment_t* segment) {
-  mi_assert_internal(segment->thread_id == 0);
-  mi_assert_internal(mi_atomic_load_ptr_relaxed(mi_segment_t, &segment->abandoned_next) == NULL);
-  mi_assert_internal(segment->next == NULL);
-  mi_assert_internal(segment->used > 0);
-  mi_tagged_segment_t next;
-  mi_tagged_segment_t ts = mi_atomic_load_relaxed(&abandoned);
-  do {
-    mi_atomic_store_ptr_release(mi_segment_t, &segment->abandoned_next, mi_tagged_segment_ptr(ts));
-    next = mi_tagged_segment(segment, ts);
-  } while (!mi_atomic_cas_weak_release(&abandoned, &ts, next));
-  mi_atomic_increment_relaxed(&abandoned_count);
-}
-
-// Wait until there are no more pending reads on segments that used to be in the abandoned list
-// called for example from `arena.c` before decommitting
-void _mi_abandoned_await_readers(void) {
-  size_t n;
-  do {
-    n = mi_atomic_load_acquire(&abandoned_readers);
-    if (n != 0) mi_atomic_yield();
-  } while (n != 0);
-}
-
-// Pop from the abandoned list
-static mi_segment_t* mi_abandoned_pop(void) {
-  mi_segment_t* segment;
-  // Check efficiently if it is empty (or if the visited list needs to be moved)
-  mi_tagged_segment_t ts = mi_atomic_load_relaxed(&abandoned);
-  segment = mi_tagged_segment_ptr(ts);
-  if mi_likely(segment == NULL) {
-    if mi_likely(!mi_abandoned_visited_revisit()) { // try to swap in the visited list on NULL
-      return NULL;
-    }
-  }
-
-  // Do a pop. We use a reader count to prevent
-  // a segment to be decommitted while a read is still pending,
-  // and a tagged pointer to prevent A-B-A link corruption.
-  // (this is called from `region.c:_mi_mem_free` for example)
-  mi_atomic_increment_relaxed(&abandoned_readers);  // ensure no segment gets decommitted
-  mi_tagged_segment_t next = 0;
-  ts = mi_atomic_load_acquire(&abandoned);
-  do {
-    segment = mi_tagged_segment_ptr(ts);
-    if (segment != NULL) {
-      mi_segment_t* anext = mi_atomic_load_ptr_relaxed(mi_segment_t, &segment->abandoned_next);
-      next = mi_tagged_segment(anext, ts); // note: reads the segment's `abandoned_next` field so should not be decommitted
-    }
-  } while (segment != NULL && !mi_atomic_cas_weak_acq_rel(&abandoned, &ts, next));
-  mi_atomic_decrement_relaxed(&abandoned_readers);  // release reader lock
-  if (segment != NULL) {
-    mi_atomic_store_ptr_release(mi_segment_t, &segment->abandoned_next, NULL);
-    mi_atomic_decrement_relaxed(&abandoned_count);
-  }
-  return segment;
-}
-
-/* -----------------------------------------------------------
-   Abandon segment/page
------------------------------------------------------------ */
-
-static void mi_segment_abandon(mi_segment_t* segment, mi_segments_tld_t* tld) {
-  mi_assert_internal(segment->used == segment->abandoned);
-  mi_assert_internal(segment->used > 0);
-  mi_assert_internal(mi_atomic_load_ptr_relaxed(mi_segment_t, &segment->abandoned_next) == NULL);
-  mi_assert_internal(segment->abandoned_visits == 0);
-  mi_assert_expensive(mi_segment_is_valid(segment,tld));
-  
-  // remove the free pages from the free page queues
-  mi_slice_t* slice = &segment->slices[0];
-  const mi_slice_t* end = mi_segment_slices_end(segment);
-  while (slice < end) {
-    mi_assert_internal(slice->slice_count > 0);
-    mi_assert_internal(slice->slice_offset == 0);
-    if (slice->xblock_size == 0) { // a free page
-      mi_segment_span_remove_from_queue(slice,tld);
-      slice->xblock_size = 0; // but keep it free
-    }
-    slice = slice + slice->slice_count;
-  }
-
-  // perform delayed decommits
-  mi_segment_delayed_decommit(segment, mi_option_is_enabled(mi_option_abandoned_page_decommit) /* force? */, tld->stats);    
-  
-  // all pages in the segment are abandoned; add it to the abandoned list
-  _mi_stat_increase(&tld->stats->segments_abandoned, 1);
-  mi_segments_track_size(-((long)mi_segment_size(segment)), tld);
-  segment->thread_id = 0;
-  mi_atomic_store_ptr_release(mi_segment_t, &segment->abandoned_next, NULL);
-  segment->abandoned_visits = 1;   // from 0 to 1 to signify it is abandoned
-  mi_abandoned_push(segment);
-}
-
-void _mi_segment_page_abandon(mi_page_t* page, mi_segments_tld_t* tld) {
-  mi_assert(page != NULL);
-  mi_assert_internal(mi_page_thread_free_flag(page)==MI_NEVER_DELAYED_FREE);
-  mi_assert_internal(mi_page_heap(page) == NULL);
-  mi_segment_t* segment = _mi_page_segment(page);
-
-  mi_assert_expensive(mi_segment_is_valid(segment,tld));
-  segment->abandoned++;  
-
-  _mi_stat_increase(&tld->stats->pages_abandoned, 1);
-  mi_assert_internal(segment->abandoned <= segment->used);
-  if (segment->used == segment->abandoned) {
-    // all pages are abandoned, abandon the entire segment
-    mi_segment_abandon(segment, tld);
-  }
-}
-
-/* -----------------------------------------------------------
-  Reclaim abandoned pages
------------------------------------------------------------ */
-
-static mi_slice_t* mi_slices_start_iterate(mi_segment_t* segment, const mi_slice_t** end) {
-  mi_slice_t* slice = &segment->slices[0];
-  *end = mi_segment_slices_end(segment);
-  mi_assert_internal(slice->slice_count>0 && slice->xblock_size>0); // segment allocated page
-  slice = slice + slice->slice_count; // skip the first segment allocated page
-  return slice;
-}
-
-// Possibly free pages and check if free space is available
-static bool mi_segment_check_free(mi_segment_t* segment, size_t slices_needed, size_t block_size, mi_segments_tld_t* tld) 
-{
-  mi_assert_internal(block_size < MI_HUGE_BLOCK_SIZE);
-  mi_assert_internal(mi_segment_is_abandoned(segment));
-  bool has_page = false;
-  
-  // for all slices
-  const mi_slice_t* end;
-  mi_slice_t* slice = mi_slices_start_iterate(segment, &end);
-  while (slice < end) {
-    mi_assert_internal(slice->slice_count > 0);
-    mi_assert_internal(slice->slice_offset == 0);
-    if (mi_slice_is_used(slice)) { // used page
-      // ensure used count is up to date and collect potential concurrent frees
-      mi_page_t* const page = mi_slice_to_page(slice);
-      _mi_page_free_collect(page, false);
-      if (mi_page_all_free(page)) {
-        // if this page is all free now, free it without adding to any queues (yet) 
-        mi_assert_internal(page->next == NULL && page->prev==NULL);
-        _mi_stat_decrease(&tld->stats->pages_abandoned, 1);
-        segment->abandoned--;
-        slice = mi_segment_page_clear(page, tld); // re-assign slice due to coalesce!
-        mi_assert_internal(!mi_slice_is_used(slice));
-        if (slice->slice_count >= slices_needed) {
-          has_page = true;
-        }
-      }
-      else {
-        if (page->xblock_size == block_size && mi_page_has_any_available(page)) {
-          // a page has available free blocks of the right size
-          has_page = true;
-        }
-      }      
-    }
-    else {
-      // empty span
-      if (slice->slice_count >= slices_needed) {
-        has_page = true;
-      }
-    }
-    slice = slice + slice->slice_count;
-  }
-  return has_page;
-}
-
-// Reclaim an abandoned segment; returns NULL if the segment was freed
-// set `right_page_reclaimed` to `true` if it reclaimed a page of the right `block_size` that was not full.
-static mi_segment_t* mi_segment_reclaim(mi_segment_t* segment, mi_heap_t* heap, size_t requested_block_size, bool* right_page_reclaimed, mi_segments_tld_t* tld) {
-  mi_assert_internal(mi_atomic_load_ptr_relaxed(mi_segment_t, &segment->abandoned_next) == NULL);
-  mi_assert_expensive(mi_segment_is_valid(segment, tld));
-  if (right_page_reclaimed != NULL) { *right_page_reclaimed = false; }
-
-  segment->thread_id = _mi_thread_id();
-  segment->abandoned_visits = 0;
-  mi_segments_track_size((long)mi_segment_size(segment), tld);
-  mi_assert_internal(segment->next == NULL);
-  _mi_stat_decrease(&tld->stats->segments_abandoned, 1);
-  
-  // for all slices
-  const mi_slice_t* end;
-  mi_slice_t* slice = mi_slices_start_iterate(segment, &end);
-  while (slice < end) {
-    mi_assert_internal(slice->slice_count > 0);
-    mi_assert_internal(slice->slice_offset == 0);
-    if (mi_slice_is_used(slice)) {
-      // in use: reclaim the page in our heap
-      mi_page_t* page = mi_slice_to_page(slice);
-      mi_assert_internal(!page->is_reset);
-      mi_assert_internal(page->is_committed);
-      mi_assert_internal(mi_page_thread_free_flag(page)==MI_NEVER_DELAYED_FREE);
-      mi_assert_internal(mi_page_heap(page) == NULL);
-      mi_assert_internal(page->next == NULL && page->prev==NULL);
-      _mi_stat_decrease(&tld->stats->pages_abandoned, 1);
-      segment->abandoned--;
-      // set the heap again and allow delayed free again
-      mi_page_set_heap(page, heap);
-      _mi_page_use_delayed_free(page, MI_USE_DELAYED_FREE, true); // override never (after heap is set)
-      _mi_page_free_collect(page, false); // ensure used count is up to date
-      if (mi_page_all_free(page)) {
-        // if everything free by now, free the page
-        slice = mi_segment_page_clear(page, tld);   // set slice again due to coalesceing
-      }
-      else {
-        // otherwise reclaim it into the heap
-        _mi_page_reclaim(heap, page);
-        if (requested_block_size == page->xblock_size && mi_page_has_any_available(page)) {
-          if (right_page_reclaimed != NULL) { *right_page_reclaimed = true; }
-        }
-      }
-    }
-    else {
-      // the span is free, add it to our page queues
-      slice = mi_segment_span_free_coalesce(slice, tld); // set slice again due to coalesceing
-    }
-    mi_assert_internal(slice->slice_count>0 && slice->slice_offset==0);
-    slice = slice + slice->slice_count;
-  }
-
-  mi_assert(segment->abandoned == 0);
-  if (segment->used == 0) {  // due to page_clear
-    mi_assert_internal(right_page_reclaimed == NULL || !(*right_page_reclaimed));
-    mi_segment_free(segment, false, tld);
-    return NULL;
-  }
-  else {
-    return segment;
-  }
-}
-
-
-void _mi_abandoned_reclaim_all(mi_heap_t* heap, mi_segments_tld_t* tld) {
-  mi_segment_t* segment;
-  while ((segment = mi_abandoned_pop()) != NULL) {
-    mi_segment_reclaim(segment, heap, 0, NULL, tld);
-  }
-}
-
-static mi_segment_t* mi_segment_try_reclaim(mi_heap_t* heap, size_t needed_slices, size_t block_size, bool* reclaimed, mi_segments_tld_t* tld)
-{
-  *reclaimed = false;
-  mi_segment_t* segment;
-  long max_tries = mi_option_get_clamp(mi_option_max_segment_reclaim, 8, 1024);     // limit the work to bound allocation times  
-  while ((max_tries-- > 0) && ((segment = mi_abandoned_pop()) != NULL)) {
-    segment->abandoned_visits++;
-    // todo: an arena exclusive heap will potentially visit many abandoned unsuitable segments
-    // and push them into the visited list and use many tries. Perhaps we can skip non-suitable ones in a better way?
-    bool is_suitable = _mi_heap_memid_is_suitable(heap, segment->memid);
-    bool has_page = mi_segment_check_free(segment,needed_slices,block_size,tld); // try to free up pages (due to concurrent frees)
-    if (segment->used == 0) {
-      // free the segment (by forced reclaim) to make it available to other threads.
-      // note1: we prefer to free a segment as that might lead to reclaiming another
-      // segment that is still partially used.
-      // note2: we could in principle optimize this by skipping reclaim and directly
-      // freeing but that would violate some invariants temporarily)
-      mi_segment_reclaim(segment, heap, 0, NULL, tld);
-    }
-    else if (has_page && is_suitable) {
-      // found a large enough free span, or a page of the right block_size with free space 
-      // we return the result of reclaim (which is usually `segment`) as it might free
-      // the segment due to concurrent frees (in which case `NULL` is returned).
-      return mi_segment_reclaim(segment, heap, block_size, reclaimed, tld);
-    }
-    else if (segment->abandoned_visits > 3 && is_suitable) {  
-      // always reclaim on 3rd visit to limit the abandoned queue length.
-      mi_segment_reclaim(segment, heap, 0, NULL, tld);
-    }
-    else {
-      // otherwise, push on the visited list so it gets not looked at too quickly again
-      mi_segment_delayed_decommit(segment, true /* force? */, tld->stats); // forced decommit if needed as we may not visit soon again
-      mi_abandoned_visited_push(segment);
-    }
-  }
-  return NULL;
-}
-
-
-void _mi_abandoned_collect(mi_heap_t* heap, bool force, mi_segments_tld_t* tld)
-{
-  mi_segment_t* segment;
-  int max_tries = (force ? 16*1024 : 1024); // limit latency
-  if (force) {
-    mi_abandoned_visited_revisit(); 
-  }
-  while ((max_tries-- > 0) && ((segment = mi_abandoned_pop()) != NULL)) {
-    mi_segment_check_free(segment,0,0,tld); // try to free up pages (due to concurrent frees)
-    if (segment->used == 0) {
-      // free the segment (by forced reclaim) to make it available to other threads.
-      // note: we could in principle optimize this by skipping reclaim and directly
-      // freeing but that would violate some invariants temporarily)
-      mi_segment_reclaim(segment, heap, 0, NULL, tld);
-    }
-    else {
-      // otherwise, decommit if needed and push on the visited list 
-      // note: forced decommit can be expensive if many threads are destroyed/created as in mstress.
-      mi_segment_delayed_decommit(segment, force, tld->stats);
-      mi_abandoned_visited_push(segment);
-    }
-  }
-}
-
-/* -----------------------------------------------------------
-   Reclaim or allocate
------------------------------------------------------------ */
-
-static mi_segment_t* mi_segment_reclaim_or_alloc(mi_heap_t* heap, size_t needed_slices, size_t block_size, mi_segments_tld_t* tld, mi_os_tld_t* os_tld)
-{
-  mi_assert_internal(block_size < MI_HUGE_BLOCK_SIZE);
-  mi_assert_internal(block_size <= MI_LARGE_OBJ_SIZE_MAX);
-  
-  // 1. try to reclaim an abandoned segment
-  bool reclaimed;
-  mi_segment_t* segment = mi_segment_try_reclaim(heap, needed_slices, block_size, &reclaimed, tld);
-  if (reclaimed) {
-    // reclaimed the right page right into the heap
-    mi_assert_internal(segment != NULL);
-    return NULL; // pretend out-of-memory as the page will be in the page queue of the heap with available blocks
-  }
-  else if (segment != NULL) {
-    // reclaimed a segment with a large enough empty span in it
-    return segment;
-  }
-  // 2. otherwise allocate a fresh segment
-  return mi_segment_alloc(0, heap->arena_id, tld, os_tld, NULL);  
-}
-
-
-/* -----------------------------------------------------------
-   Page allocation
------------------------------------------------------------ */
-
-static mi_page_t* mi_segments_page_alloc(mi_heap_t* heap, mi_page_kind_t page_kind, size_t required, size_t block_size, mi_segments_tld_t* tld, mi_os_tld_t* os_tld)
-{
-  mi_assert_internal(required <= MI_LARGE_OBJ_SIZE_MAX && page_kind <= MI_PAGE_LARGE);
-
-  // find a free page
-  size_t page_size = _mi_align_up(required, (required > MI_MEDIUM_PAGE_SIZE ? MI_MEDIUM_PAGE_SIZE : MI_SEGMENT_SLICE_SIZE));
-  size_t slices_needed = page_size / MI_SEGMENT_SLICE_SIZE;
-  mi_assert_internal(slices_needed * MI_SEGMENT_SLICE_SIZE == page_size);
-  mi_page_t* page = mi_segments_page_find_and_allocate(slices_needed, heap->arena_id, tld); //(required <= MI_SMALL_SIZE_MAX ? 0 : slices_needed), tld);
-  if (page==NULL) {
-    // no free page, allocate a new segment and try again
-    if (mi_segment_reclaim_or_alloc(heap, slices_needed, block_size, tld, os_tld) == NULL) {
-      // OOM or reclaimed a good page in the heap
-      return NULL;  
-    }
-    else {
-      // otherwise try again
-      return mi_segments_page_alloc(heap, page_kind, required, block_size, tld, os_tld);
-    }
-  }
-  mi_assert_internal(page != NULL && page->slice_count*MI_SEGMENT_SLICE_SIZE == page_size);
-  mi_assert_internal(_mi_ptr_segment(page)->thread_id == _mi_thread_id());
-  mi_segment_delayed_decommit(_mi_ptr_segment(page), false, tld->stats);
-  return page;
-}
-
-
-
-/* -----------------------------------------------------------
-   Huge page allocation
------------------------------------------------------------ */
-
-static mi_page_t* mi_segment_huge_page_alloc(size_t size, mi_arena_id_t req_arena_id, mi_segments_tld_t* tld, mi_os_tld_t* os_tld)
-{
-  mi_page_t* page = NULL;
-  mi_segment_t* segment = mi_segment_alloc(size,req_arena_id,tld,os_tld,&page);
-  if (segment == NULL || page==NULL) return NULL;
-  mi_assert_internal(segment->used==1);
-  mi_assert_internal(mi_page_block_size(page) >= size);  
-  segment->thread_id = 0; // huge segments are immediately abandoned
-  return page;
-}
-
-// free huge block from another thread
-void _mi_segment_huge_page_free(mi_segment_t* segment, mi_page_t* page, mi_block_t* block) {
-  // huge page segments are always abandoned and can be freed immediately by any thread
-  mi_assert_internal(segment->kind==MI_SEGMENT_HUGE);
-  mi_assert_internal(segment == _mi_page_segment(page));
-  mi_assert_internal(mi_atomic_load_relaxed(&segment->thread_id)==0);
-
-  // claim it and free
-  mi_heap_t* heap = mi_heap_get_default(); // issue #221; don't use the internal get_default_heap as we need to ensure the thread is initialized.
-  // paranoia: if this it the last reference, the cas should always succeed
-  size_t expected_tid = 0;
-  if (mi_atomic_cas_strong_acq_rel(&segment->thread_id, &expected_tid, heap->thread_id)) {
-    mi_block_set_next(page, block, page->free);
-    page->free = block;
-    page->used--;
-    page->is_zero = false;
-    mi_assert(page->used == 0);
-    mi_tld_t* tld = heap->tld;
-    _mi_segment_page_free(page, true, &tld->segments);
-  }
-#if (MI_DEBUG!=0)
-  else {
-    mi_assert_internal(false);
-  }
-#endif
-}
-
-/* -----------------------------------------------------------
-   Page allocation and free
------------------------------------------------------------ */
-mi_page_t* _mi_segment_page_alloc(mi_heap_t* heap, size_t block_size, mi_segments_tld_t* tld, mi_os_tld_t* os_tld) {
-  mi_page_t* page;
-  if (block_size <= MI_SMALL_OBJ_SIZE_MAX) {
-    page = mi_segments_page_alloc(heap,MI_PAGE_SMALL,block_size,block_size,tld,os_tld);
-  }
-  else if (block_size <= MI_MEDIUM_OBJ_SIZE_MAX) {
-    page = mi_segments_page_alloc(heap,MI_PAGE_MEDIUM,MI_MEDIUM_PAGE_SIZE,block_size,tld, os_tld);
-  }
-  else if (block_size <= MI_LARGE_OBJ_SIZE_MAX) {
-    page = mi_segments_page_alloc(heap,MI_PAGE_LARGE,block_size,block_size,tld, os_tld);
-  }
-  else {
-    page = mi_segment_huge_page_alloc(block_size,heap->arena_id,tld,os_tld);    
-  }
-  mi_assert_internal(page == NULL || _mi_heap_memid_is_suitable(heap, _mi_page_segment(page)->memid));
-  mi_assert_expensive(page == NULL || mi_segment_is_valid(_mi_page_segment(page),tld));
-  return page;
-}
-
-
diff --git a/depends/mimalloc/src/static.c b/depends/mimalloc/src/static.c
index 5b34ddbb6ce0..dd874f1697c6 100644
--- a/depends/mimalloc/src/static.c
+++ b/depends/mimalloc/src/static.c
@@ -14,26 +14,28 @@ terms of the MIT license. A copy of the license can be found in the file
 #endif
 
 #include "mimalloc.h"
-#include "mimalloc-internal.h"
+#include "mimalloc/internal.h"
 
 // For a static override we create a single object file
 // containing the whole library. If it is linked first
 // it will override all the standard library allocation
 // functions (on Unix's).
-#include "stats.c"
-#include "random.c"
-#include "os.c"
-#include "bitmap.c"
-#include "arena.c"
-#include "segment-cache.c"
-#include "segment.c"
-#include "page.c"
-#include "heap.c"
-#include "alloc.c"
+#include "alloc.c"          // includes alloc-override.c and free.c
 #include "alloc-aligned.c"
 #include "alloc-posix.c"
-#if MI_OSX_ZONE
-#include "alloc-override-osx.c"
-#endif
+#include "arena.c"
+#include "arena-meta.c"
+#include "bitmap.c"
+#include "heap.c"
 #include "init.c"
+#include "libc.c"
 #include "options.c"
+#include "os.c"
+#include "page.c"           // includes page-queue.c
+#include "page-map.c"
+#include "random.c"
+#include "stats.c"
+#include "prim/prim.c"
+#if MI_OSX_ZONE
+#include "prim/osx/alloc-override-zone.c"
+#endif
diff --git a/depends/mimalloc/src/stats.c b/depends/mimalloc/src/stats.c
index f82c7c67f227..4eba519a44e3 100644
--- a/depends/mimalloc/src/stats.c
+++ b/depends/mimalloc/src/stats.c
@@ -5,10 +5,10 @@ terms of the MIT license. A copy of the license can be found in the file
 "LICENSE" at the root of this distribution.
 -----------------------------------------------------------------------------*/
 #include "mimalloc.h"
-#include "mimalloc-internal.h"
-#include "mimalloc-atomic.h"
+#include "mimalloc/internal.h"
+#include "mimalloc/atomic.h"
+#include "mimalloc/prim.h"
 
-#include <stdio.h>  // fputs, stderr
 #include <string.h> // memset
 
 #if defined(_MSC_VER) && (_MSC_VER < 1920)
@@ -19,121 +19,126 @@ terms of the MIT license. A copy of the license can be found in the file
   Statistics operations
 ----------------------------------------------------------- */
 
-static bool mi_is_in_main(void* stat) {
-  return ((uint8_t*)stat >= (uint8_t*)&_mi_stats_main
-         && (uint8_t*)stat < ((uint8_t*)&_mi_stats_main + sizeof(mi_stats_t)));  
+static void mi_stat_update_mt(mi_stat_count_t* stat, int64_t amount) {
+  if (amount == 0) return;
+  // add atomically
+  int64_t current = mi_atomic_addi64_relaxed(&stat->current, amount);
+  mi_atomic_maxi64_relaxed(&stat->peak, current + amount);
+  if (amount > 0) {
+    mi_atomic_addi64_relaxed(&stat->total, amount);
+  }
 }
 
 static void mi_stat_update(mi_stat_count_t* stat, int64_t amount) {
   if (amount == 0) return;
-  if (mi_is_in_main(stat))
-  {
-    // add atomically (for abandoned pages)
-    int64_t current = mi_atomic_addi64_relaxed(&stat->current, amount);
-    mi_atomic_maxi64_relaxed(&stat->peak, current + amount);
-    if (amount > 0) {
-      mi_atomic_addi64_relaxed(&stat->allocated,amount);
-    }
-    else {
-      mi_atomic_addi64_relaxed(&stat->freed, -amount);
-    }
-  }
-  else {
-    // add thread local
-    stat->current += amount;
-    if (stat->current > stat->peak) stat->peak = stat->current;
-    if (amount > 0) {
-      stat->allocated += amount;
-    }
-    else {
-      stat->freed += -amount;
-    }
-  }
+  // add thread local
+  stat->current += amount;
+  if (stat->current > stat->peak) { stat->peak = stat->current; }
+  if (amount > 0) { stat->total += amount; }
 }
 
-void _mi_stat_counter_increase(mi_stat_counter_t* stat, size_t amount) {  
-  if (mi_is_in_main(stat)) {
-    mi_atomic_addi64_relaxed( &stat->count, 1 );
-    mi_atomic_addi64_relaxed( &stat->total, (int64_t)amount );
-  }
-  else {
-    stat->count++;
-    stat->total += amount;
-  }
+
+void __mi_stat_counter_increase_mt(mi_stat_counter_t* stat, size_t amount) {
+  mi_atomic_addi64_relaxed(&stat->total, (int64_t)amount);
+}
+
+void __mi_stat_counter_increase(mi_stat_counter_t* stat, size_t amount) {
+  stat->total += amount;
 }
 
-void _mi_stat_increase(mi_stat_count_t* stat, size_t amount) {
+void __mi_stat_increase_mt(mi_stat_count_t* stat, size_t amount) {
+  mi_stat_update_mt(stat, (int64_t)amount);
+}
+void __mi_stat_increase(mi_stat_count_t* stat, size_t amount) {
   mi_stat_update(stat, (int64_t)amount);
 }
 
-void _mi_stat_decrease(mi_stat_count_t* stat, size_t amount) {
+void __mi_stat_decrease_mt(mi_stat_count_t* stat, size_t amount) {
+  mi_stat_update_mt(stat, -((int64_t)amount));
+}
+void __mi_stat_decrease(mi_stat_count_t* stat, size_t amount) {
   mi_stat_update(stat, -((int64_t)amount));
 }
 
+
+// Adjust stats to compensate; for example before committing a range,
+// first adjust downwards with parts that were already committed so
+// we avoid double counting.
+static void mi_stat_adjust_mt(mi_stat_count_t* stat, int64_t amount) {
+  if (amount == 0) return;
+  // adjust atomically
+  mi_atomic_addi64_relaxed(&stat->current, amount);
+  mi_atomic_addi64_relaxed(&stat->total, amount);
+}
+
+static void mi_stat_adjust(mi_stat_count_t* stat, int64_t amount) {
+  if (amount == 0) return;
+  stat->current += amount;
+  stat->total += amount;
+}
+
+void __mi_stat_adjust_increase_mt(mi_stat_count_t* stat, size_t amount) {
+  mi_stat_adjust_mt(stat, (int64_t)amount);
+}
+void __mi_stat_adjust_increase(mi_stat_count_t* stat, size_t amount) {
+  mi_stat_adjust(stat, (int64_t)amount);
+}
+void __mi_stat_adjust_decrease_mt(mi_stat_count_t* stat, size_t amount) {
+  mi_stat_adjust_mt(stat, -((int64_t)amount));
+}
+void __mi_stat_adjust_decrease(mi_stat_count_t* stat, size_t amount) {
+  mi_stat_adjust(stat, -((int64_t)amount));
+}
+
+
 // must be thread safe as it is called from stats_merge
-static void mi_stat_add(mi_stat_count_t* stat, const mi_stat_count_t* src, int64_t unit) {
+static void mi_stat_count_add_mt(mi_stat_count_t* stat, const mi_stat_count_t* src) {
   if (stat==src) return;
-  if (src->allocated==0 && src->freed==0) return;
-  mi_atomic_addi64_relaxed( &stat->allocated, src->allocated * unit);
-  mi_atomic_addi64_relaxed( &stat->current, src->current * unit);
-  mi_atomic_addi64_relaxed( &stat->freed, src->freed * unit);
-  // peak scores do not work across threads.. 
-  mi_atomic_addi64_relaxed( &stat->peak, src->peak * unit);
+  mi_atomic_void_addi64_relaxed(&stat->total, &src->total); 
+  mi_atomic_void_addi64_relaxed(&stat->current, &src->current); 
+  // peak scores do really not work across threads .. we just add them
+  mi_atomic_void_addi64_relaxed( &stat->peak, &src->peak);
+  // or, take the max?
+  // mi_atomic_maxi64_relaxed(&stat->peak, src->peak);
 }
 
-static void mi_stat_counter_add(mi_stat_counter_t* stat, const mi_stat_counter_t* src, int64_t unit) {
+static void mi_stat_counter_add_mt(mi_stat_counter_t* stat, const mi_stat_counter_t* src) {
   if (stat==src) return;
-  mi_atomic_addi64_relaxed( &stat->total, src->total * unit);
-  mi_atomic_addi64_relaxed( &stat->count, src->count * unit);
+  mi_atomic_void_addi64_relaxed(&stat->total, &src->total);
 }
 
+#define MI_STAT_COUNT(stat)    mi_stat_count_add_mt(&stats->stat, &src->stat);
+#define MI_STAT_COUNTER(stat)  mi_stat_counter_add_mt(&stats->stat, &src->stat);
+
 // must be thread safe as it is called from stats_merge
 static void mi_stats_add(mi_stats_t* stats, const mi_stats_t* src) {
   if (stats==src) return;
-  mi_stat_add(&stats->segments, &src->segments,1);
-  mi_stat_add(&stats->pages, &src->pages,1);
-  mi_stat_add(&stats->reserved, &src->reserved, 1);
-  mi_stat_add(&stats->committed, &src->committed, 1);
-  mi_stat_add(&stats->reset, &src->reset, 1);
-  mi_stat_add(&stats->page_committed, &src->page_committed, 1);
-
-  mi_stat_add(&stats->pages_abandoned, &src->pages_abandoned, 1);
-  mi_stat_add(&stats->segments_abandoned, &src->segments_abandoned, 1);
-  mi_stat_add(&stats->threads, &src->threads, 1);
-
-  mi_stat_add(&stats->malloc, &src->malloc, 1);
-  mi_stat_add(&stats->segments_cache, &src->segments_cache, 1);
-  mi_stat_add(&stats->normal, &src->normal, 1);
-  mi_stat_add(&stats->huge, &src->huge, 1);
-  mi_stat_add(&stats->large, &src->large, 1);
-
-  mi_stat_counter_add(&stats->pages_extended, &src->pages_extended, 1);
-  mi_stat_counter_add(&stats->mmap_calls, &src->mmap_calls, 1);
-  mi_stat_counter_add(&stats->commit_calls, &src->commit_calls, 1);
-
-  mi_stat_counter_add(&stats->page_no_retire, &src->page_no_retire, 1);
-  mi_stat_counter_add(&stats->searches, &src->searches, 1);
-  mi_stat_counter_add(&stats->normal_count, &src->normal_count, 1);
-  mi_stat_counter_add(&stats->huge_count, &src->huge_count, 1);
-  mi_stat_counter_add(&stats->large_count, &src->large_count, 1);
-#if MI_STAT>1
+
+  // copy all fields
+  MI_STAT_FIELDS()
+
+  #if MI_STAT>1
   for (size_t i = 0; i <= MI_BIN_HUGE; i++) {
-    if (src->normal_bins[i].allocated > 0 || src->normal_bins[i].freed > 0) {
-      mi_stat_add(&stats->normal_bins[i], &src->normal_bins[i], 1);
-    }
+    mi_stat_count_add_mt(&stats->malloc_bins[i], &src->malloc_bins[i]);
+  }
+  #endif
+  for (size_t i = 0; i <= MI_BIN_HUGE; i++) {
+    mi_stat_count_add_mt(&stats->page_bins[i], &src->page_bins[i]);
   }
-#endif
 }
 
+#undef MI_STAT_COUNT
+#undef MI_STAT_COUNTER
+
 /* -----------------------------------------------------------
   Display statistics
 ----------------------------------------------------------- */
 
-// unit > 0 : size in binary bytes 
+// unit > 0 : size in binary bytes
 // unit == 0: count as decimal
 // unit < 0 : count in binary
 static void mi_printf_amount(int64_t n, int64_t unit, mi_output_fun* out, void* arg, const char* fmt) {
-  char buf[32]; buf[0] = 0;  
+  char buf[32]; _mi_memzero_var(buf);
   int  len = 32;
   const char* suffix = (unit <= 0 ? " " : "B");
   const int64_t base = (unit == 0 ? 1000 : 1024);
@@ -142,11 +147,11 @@ static void mi_printf_amount(int64_t n, int64_t unit, mi_output_fun* out, void*
   const int64_t pos = (n < 0 ? -n : n);
   if (pos < base) {
     if (n!=1 || suffix[0] != 'B') {  // skip printing 1 B for the unit column
-      snprintf(buf, len, "%d %-3s", (int)n, (n==0 ? "" : suffix));
+      _mi_snprintf(buf, len, "%lld   %-3s", (long long)n, (n==0 ? "" : suffix));
     }
   }
   else {
-    int64_t divider = base;    
+    int64_t divider = base;
     const char* magnitude = "K";
     if (pos >= divider*base) { divider *= base; magnitude = "M"; }
     if (pos >= divider*base) { divider *= base; magnitude = "G"; }
@@ -154,10 +159,10 @@ static void mi_printf_amount(int64_t n, int64_t unit, mi_output_fun* out, void*
     const long whole = (long)(tens/10);
     const long frac1 = (long)(tens%10);
     char unitdesc[8];
-    snprintf(unitdesc, 8, "%s%s%s", magnitude, (base==1024 ? "i" : ""), suffix);
-    snprintf(buf, len, "%ld.%ld %-3s", whole, (frac1 < 0 ? -frac1 : frac1), unitdesc);
+    _mi_snprintf(unitdesc, 8, "%s%s%s", magnitude, (base==1024 ? "i" : ""), suffix);
+    _mi_snprintf(buf, len, "%ld.%ld %-3s", whole, (frac1 < 0 ? -frac1 : frac1), unitdesc);
   }
-  _mi_fprintf(out, arg, (fmt==NULL ? "%11s" : fmt), buf);
+  _mi_fprintf(out, arg, (fmt==NULL ? "%12s" : fmt), buf);
 }
 
 
@@ -166,58 +171,80 @@ static void mi_print_amount(int64_t n, int64_t unit, mi_output_fun* out, void* a
 }
 
 static void mi_print_count(int64_t n, int64_t unit, mi_output_fun* out, void* arg) {
-  if (unit==1) _mi_fprintf(out, arg, "%11s"," ");
+  if (unit==1) _mi_fprintf(out, arg, "%12s"," ");
           else mi_print_amount(n,0,out,arg);
 }
 
-static void mi_stat_print(const mi_stat_count_t* stat, const char* msg, int64_t unit, mi_output_fun* out, void* arg ) {
+static void mi_stat_print_ex(const mi_stat_count_t* stat, const char* msg, int64_t unit, mi_output_fun* out, void* arg, const char* notok ) {
   _mi_fprintf(out, arg,"%10s:", msg);
-  if (unit>0) {
-    mi_print_amount(stat->peak, unit, out, arg);
-    mi_print_amount(stat->allocated, unit, out, arg);
-    mi_print_amount(stat->freed, unit, out, arg);
-    mi_print_amount(stat->current, unit, out, arg);
-    mi_print_amount(unit, 1, out, arg);
-    mi_print_count(stat->allocated, unit, out, arg);
-    if (stat->allocated > stat->freed)
-      _mi_fprintf(out, arg, "  not all freed!\n");
-    else
-      _mi_fprintf(out, arg, "  ok\n");
-  }
-  else if (unit<0) {
-    mi_print_amount(stat->peak, -1, out, arg);
-    mi_print_amount(stat->allocated, -1, out, arg);
-    mi_print_amount(stat->freed, -1, out, arg);
-    mi_print_amount(stat->current, -1, out, arg);
-    if (unit==-1) {
-      _mi_fprintf(out, arg, "%22s", "");
+  if (unit != 0) {
+    if (unit > 0) {
+      mi_print_amount(stat->peak, unit, out, arg);
+      mi_print_amount(stat->total, unit, out, arg);
+      // mi_print_amount(stat->freed, unit, out, arg);
+      mi_print_amount(stat->current, unit, out, arg);
+      mi_print_amount(unit, 1, out, arg);
+      mi_print_count(stat->total, unit, out, arg);
     }
     else {
-      mi_print_amount(-unit, 1, out, arg);
-      mi_print_count((stat->allocated / -unit), 0, out, arg);
+      mi_print_amount(stat->peak, -1, out, arg);
+      mi_print_amount(stat->total, -1, out, arg);
+      // mi_print_amount(stat->freed, -1, out, arg);
+      mi_print_amount(stat->current, -1, out, arg);
+      if (unit == -1) {
+        _mi_fprintf(out, arg, "%24s", "");
+      }
+      else {
+        mi_print_amount(-unit, 1, out, arg);
+        mi_print_count((stat->total / -unit), 0, out, arg);
+      }
     }
-    if (stat->allocated > stat->freed)
-      _mi_fprintf(out, arg, "  not all freed!\n");
-    else
+    if (stat->current != 0) {
+      _mi_fprintf(out, arg, "  ");
+      _mi_fprintf(out, arg, (notok == NULL ? "not all freed" : notok));
+      _mi_fprintf(out, arg, "\n");
+    }
+    else {
       _mi_fprintf(out, arg, "  ok\n");
+    }
   }
   else {
     mi_print_amount(stat->peak, 1, out, arg);
-    mi_print_amount(stat->allocated, 1, out, arg);
-    _mi_fprintf(out, arg, "%11s", " ");  // no freed 
+    mi_print_amount(stat->total, 1, out, arg);
+    _mi_fprintf(out, arg, "%11s", " ");  // no freed
     mi_print_amount(stat->current, 1, out, arg);
     _mi_fprintf(out, arg, "\n");
   }
 }
 
+static void mi_stat_print(const mi_stat_count_t* stat, const char* msg, int64_t unit, mi_output_fun* out, void* arg) {
+  mi_stat_print_ex(stat, msg, unit, out, arg, NULL);
+}
+
+static void mi_stat_peak_print(const mi_stat_count_t* stat, const char* msg, int64_t unit, mi_output_fun* out, void* arg) {
+  _mi_fprintf(out, arg, "%10s:", msg);
+  mi_print_amount(stat->peak, unit, out, arg);
+  _mi_fprintf(out, arg, "\n");
+}
+
+#if MI_STAT>1
+static void mi_stat_total_print(const mi_stat_count_t* stat, const char* msg, int64_t unit, mi_output_fun* out, void* arg) {
+  _mi_fprintf(out, arg, "%10s:", msg);
+  _mi_fprintf(out, arg, "%12s", " ");  // no peak
+  mi_print_amount(stat->total, unit, out, arg);
+  _mi_fprintf(out, arg, "\n");
+}
+#endif
+
 static void mi_stat_counter_print(const mi_stat_counter_t* stat, const char* msg, mi_output_fun* out, void* arg ) {
   _mi_fprintf(out, arg, "%10s:", msg);
   mi_print_amount(stat->total, -1, out, arg);
   _mi_fprintf(out, arg, "\n");
 }
 
+
 static void mi_stat_counter_print_avg(const mi_stat_counter_t* stat, const char* msg, mi_output_fun* out, void* arg) {
-  const int64_t avg_tens = (stat->count == 0 ? 0 : (stat->total*10 / stat->count)); 
+  const int64_t avg_tens = (stat->total == 0 ? 0 : (stat->total*10 / stat->total));
   const long avg_whole = (long)(avg_tens/10);
   const long avg_frac1 = (long)(avg_tens%10);
   _mi_fprintf(out, arg, "%10s: %5ld.%ld avg\n", msg, avg_whole, avg_frac1);
@@ -225,7 +252,7 @@ static void mi_stat_counter_print_avg(const mi_stat_counter_t* stat, const char*
 
 
 static void mi_print_header(mi_output_fun* out, void* arg ) {
-  _mi_fprintf(out, arg, "%10s: %10s %10s %10s %10s %10s %10s\n", "heap stats", "peak   ", "total   ", "freed   ", "current   ", "unit   ", "count   ");
+  _mi_fprintf(out, arg, "%10s: %11s %11s %11s %11s %11s\n", "heap stats", "peak   ", "total   ", "current   ", "block   ", "total#   ");
 }
 
 #if MI_STAT>1
@@ -233,10 +260,10 @@ static void mi_stats_print_bins(const mi_stat_count_t* bins, size_t max, const c
   bool found = false;
   char buf[64];
   for (size_t i = 0; i <= max; i++) {
-    if (bins[i].allocated > 0) {
+    if (bins[i].total > 0) {
       found = true;
       int64_t unit = _mi_bin_size((uint8_t)i);
-      snprintf(buf, 64, "%s %3lu", fmt, (long)i);
+      _mi_snprintf(buf, 64, "%s %3lu", fmt, (long)i);
       mi_stat_print(&bins[i], buf, unit, out, arg);
     }
   }
@@ -257,7 +284,7 @@ typedef struct buffered_s {
   mi_output_fun* out;   // original output function
   void*          arg;   // and state
   char*          buf;   // local buffer of at least size `count+1`
-  size_t         used;  // currently used chars `used <= count`  
+  size_t         used;  // currently used chars `used <= count`
   size_t         count; // total chars available for output
 } buffered_t;
 
@@ -283,11 +310,9 @@ static void mi_cdecl mi_buffered_out(const char* msg, void* arg) {
 // Print statistics
 //------------------------------------------------------------
 
-static void mi_stat_process_info(mi_msecs_t* elapsed, mi_msecs_t* utime, mi_msecs_t* stime, size_t* current_rss, size_t* peak_rss, size_t* current_commit, size_t* peak_commit, size_t* page_faults);
-
-static void _mi_stats_print(mi_stats_t* stats, mi_output_fun* out0, void* arg0) mi_attr_noexcept {
+void _mi_stats_print(mi_stats_t* stats, mi_output_fun* out0, void* arg0) mi_attr_noexcept {
   // wrap the output function to be line buffered
-  char buf[256];
+  char buf[256]; _mi_memzero_var(buf);
   buffered_t buffer = { out0, arg0, NULL, 0, 255 };
   buffer.buf = buf;
   mi_output_fun* out = &mi_buffered_out;
@@ -296,91 +321,115 @@ static void _mi_stats_print(mi_stats_t* stats, mi_output_fun* out0, void* arg0)
   // and print using that
   mi_print_header(out,arg);
   #if MI_STAT>1
-  mi_stats_print_bins(stats->normal_bins, MI_BIN_HUGE, "normal",out,arg);
+  mi_stats_print_bins(stats->malloc_bins, MI_BIN_HUGE, "bin",out,arg);
   #endif
   #if MI_STAT
-  mi_stat_print(&stats->normal, "normal", (stats->normal_count.count == 0 ? 1 : -(stats->normal.allocated / stats->normal_count.count)), out, arg);
-  mi_stat_print(&stats->large, "large", (stats->large_count.count == 0 ? 1 : -(stats->large.allocated / stats->large_count.count)), out, arg);
-  mi_stat_print(&stats->huge, "huge", (stats->huge_count.count == 0 ? 1 : -(stats->huge.allocated / stats->huge_count.count)), out, arg);
-  mi_stat_count_t total = { 0,0,0,0 };
-  mi_stat_add(&total, &stats->normal, 1);
-  mi_stat_add(&total, &stats->large, 1);
-  mi_stat_add(&total, &stats->huge, 1);
-  mi_stat_print(&total, "total", 1, out, arg);
+  mi_stat_print(&stats->malloc_normal, "binned", (stats->malloc_normal_count.total == 0 ? 1 : -1), out, arg);
+  mi_stat_print(&stats->malloc_huge, "huge", (stats->malloc_huge_count.total == 0 ? 1 : -1), out, arg);
+  mi_stat_count_t total = { 0,0,0 };
+  mi_stat_count_add_mt(&total, &stats->malloc_normal);
+  mi_stat_count_add_mt(&total, &stats->malloc_huge);
+  mi_stat_print_ex(&total, "total", 1, out, arg, "");
   #endif
   #if MI_STAT>1
-  mi_stat_print(&stats->malloc, "malloc req", 1, out, arg);
+  mi_stat_total_print(&stats->malloc_requested, "malloc req", 1, out, arg);
   _mi_fprintf(out, arg, "\n");
   #endif
-  mi_stat_print(&stats->reserved, "reserved", 1, out, arg);
-  mi_stat_print(&stats->committed, "committed", 1, out, arg);
-  mi_stat_print(&stats->reset, "reset", 1, out, arg);
-  mi_stat_print(&stats->page_committed, "touched", 1, out, arg);
-  mi_stat_print(&stats->segments, "segments", -1, out, arg);
-  mi_stat_print(&stats->segments_abandoned, "-abandoned", -1, out, arg);
-  mi_stat_print(&stats->segments_cache, "-cached", -1, out, arg);
+  mi_stat_print_ex(&stats->reserved, "reserved", 1, out, arg, "");
+  mi_stat_print_ex(&stats->committed, "committed", 1, out, arg, "");
+  mi_stat_peak_print(&stats->reset, "reset", 1, out, arg );
+  mi_stat_peak_print(&stats->purged, "purged", 1, out, arg );
+  mi_stat_print_ex(&stats->page_committed, "touched", 1, out, arg, "");
+  // mi_stat_print(&stats->segments, "segments", -1, out, arg);
+  // mi_stat_print(&stats->segments_abandoned, "-abandoned", -1, out, arg);
+  // mi_stat_print(&stats->segments_cache, "-cached", -1, out, arg);
   mi_stat_print(&stats->pages, "pages", -1, out, arg);
   mi_stat_print(&stats->pages_abandoned, "-abandoned", -1, out, arg);
+  mi_stat_counter_print(&stats->pages_reclaim_on_alloc, "-reclaima", out, arg);
+  mi_stat_counter_print(&stats->pages_reclaim_on_free,  "-reclaimf", out, arg);
+  mi_stat_counter_print(&stats->pages_reabandon_full, "-reabandon", out, arg);
+  mi_stat_counter_print(&stats->pages_unabandon_busy_wait, "-waits", out, arg);
   mi_stat_counter_print(&stats->pages_extended, "-extended", out, arg);
-  mi_stat_counter_print(&stats->page_no_retire, "-noretire", out, arg);
+  mi_stat_counter_print(&stats->pages_retire, "-retire", out, arg);
+  mi_stat_counter_print(&stats->arena_count, "arenas", out, arg);
+  // mi_stat_counter_print(&stats->arena_crossover_count, "-crossover", out, arg);
+  // mi_stat_counter_print(&stats->arena_purges, "-purges", out, arg);
+  mi_stat_counter_print(&stats->arena_rollback_count, "-rollback", out, arg);
   mi_stat_counter_print(&stats->mmap_calls, "mmaps", out, arg);
   mi_stat_counter_print(&stats->commit_calls, "commits", out, arg);
+  mi_stat_counter_print(&stats->reset_calls, "resets", out, arg);
+  mi_stat_counter_print(&stats->purge_calls, "purges", out, arg);
+  mi_stat_counter_print(&stats->malloc_guarded_count, "guarded", out, arg);
   mi_stat_print(&stats->threads, "threads", -1, out, arg);
-  mi_stat_counter_print_avg(&stats->searches, "searches", out, arg);
-  _mi_fprintf(out, arg, "%10s: %7zu\n", "numa nodes", _mi_os_numa_node_count());
-  
-  mi_msecs_t elapsed;
-  mi_msecs_t user_time;
-  mi_msecs_t sys_time;
+  mi_stat_counter_print_avg(&stats->page_searches, "searches", out, arg);
+  _mi_fprintf(out, arg, "%10s: %5i\n", "numa nodes", _mi_os_numa_node_count());
+
+  size_t elapsed;
+  size_t user_time;
+  size_t sys_time;
   size_t current_rss;
   size_t peak_rss;
   size_t current_commit;
   size_t peak_commit;
   size_t page_faults;
-  mi_stat_process_info(&elapsed, &user_time, &sys_time, &current_rss, &peak_rss, &current_commit, &peak_commit, &page_faults);
-  _mi_fprintf(out, arg, "%10s: %7ld.%03ld s\n", "elapsed", elapsed/1000, elapsed%1000);
-  _mi_fprintf(out, arg, "%10s: user: %ld.%03ld s, system: %ld.%03ld s, faults: %lu, rss: ", "process",
-              user_time/1000, user_time%1000, sys_time/1000, sys_time%1000, (unsigned long)page_faults );
+  mi_process_info(&elapsed, &user_time, &sys_time, &current_rss, &peak_rss, &current_commit, &peak_commit, &page_faults);
+  _mi_fprintf(out, arg, "%10s: %5zu.%03zu s\n", "elapsed", elapsed/1000, elapsed%1000);
+  _mi_fprintf(out, arg, "%10s: user: %zu.%03zu s, system: %zu.%03zu s, faults: %zu, rss: ", "process",
+              user_time/1000, user_time%1000, sys_time/1000, sys_time%1000, page_faults );
   mi_printf_amount((int64_t)peak_rss, 1, out, arg, "%s");
   if (peak_commit > 0) {
     _mi_fprintf(out, arg, ", commit: ");
     mi_printf_amount((int64_t)peak_commit, 1, out, arg, "%s");
   }
-  _mi_fprintf(out, arg, "\n");  
+  _mi_fprintf(out, arg, "\n");
 }
 
 static mi_msecs_t mi_process_start; // = 0
 
-static mi_stats_t* mi_stats_get_default(void) {
-  mi_heap_t* heap = mi_heap_get_default();
-  return &heap->tld->stats;
+// called on process init
+void _mi_stats_init(void) {
+  if (mi_process_start == 0) { mi_process_start = _mi_clock_start(); };
 }
 
-static void mi_stats_merge_from(mi_stats_t* stats) {
-  if (stats != &_mi_stats_main) {
-    mi_stats_add(&_mi_stats_main, stats);
-    memset(stats, 0, sizeof(mi_stats_t));
-  }
+
+// return thread local stats
+static mi_stats_t* mi_get_tld_stats(void) {
+  return &_mi_thread_tld()->stats;
 }
 
 void mi_stats_reset(void) mi_attr_noexcept {
-  mi_stats_t* stats = mi_stats_get_default();
-  if (stats != &_mi_stats_main) { memset(stats, 0, sizeof(mi_stats_t)); }
-  memset(&_mi_stats_main, 0, sizeof(mi_stats_t));
-  if (mi_process_start == 0) { mi_process_start = _mi_clock_start(); };
+  mi_stats_t* stats = mi_get_tld_stats();
+  mi_subproc_t* subproc = _mi_subproc();
+  if (stats != &subproc->stats) { _mi_memzero(stats, sizeof(mi_stats_t)); }
+  _mi_memzero(&subproc->stats, sizeof(mi_stats_t));
+  _mi_stats_init();
 }
 
-void mi_stats_merge(void) mi_attr_noexcept {
-  mi_stats_merge_from( mi_stats_get_default() );
+
+void _mi_stats_merge_from(mi_stats_t* to, mi_stats_t* from) {
+  mi_assert_internal(to != NULL && from != NULL);
+  if (to != from) {
+    mi_stats_add(to, from);
+    _mi_memzero(from, sizeof(mi_stats_t));
+  }
 }
 
 void _mi_stats_done(mi_stats_t* stats) {  // called from `mi_thread_done`
-  mi_stats_merge_from(stats);
+  _mi_stats_merge_from(&_mi_subproc()->stats, stats);
+}
+
+void _mi_stats_merge_thread(mi_tld_t* tld) {
+  mi_assert_internal(tld != NULL && tld->subproc != NULL);
+  _mi_stats_merge_from( &tld->subproc->stats, &tld->stats );
+}
+
+void mi_stats_merge(void) mi_attr_noexcept {
+  _mi_stats_merge_thread( _mi_thread_tld() );
 }
 
 void mi_stats_print_out(mi_output_fun* out, void* arg) mi_attr_noexcept {
-  mi_stats_merge_from(mi_stats_get_default());
-  _mi_stats_print(&_mi_stats_main, out, arg);
+  mi_stats_merge();
+  _mi_stats_print(&_mi_subproc()->stats, out, arg);
 }
 
 void mi_stats_print(void* out) mi_attr_noexcept {
@@ -389,53 +438,19 @@ void mi_stats_print(void* out) mi_attr_noexcept {
 }
 
 void mi_thread_stats_print_out(mi_output_fun* out, void* arg) mi_attr_noexcept {
-  _mi_stats_print(mi_stats_get_default(), out, arg);
+  _mi_stats_print(mi_get_tld_stats(), out, arg);
 }
 
 
 // ----------------------------------------------------------------
 // Basic timer for convenience; use milli-seconds to avoid doubles
 // ----------------------------------------------------------------
-#ifdef _WIN32
-#include <windows.h>
-static mi_msecs_t mi_to_msecs(LARGE_INTEGER t) {
-  static LARGE_INTEGER mfreq; // = 0
-  if (mfreq.QuadPart == 0LL) {
-    LARGE_INTEGER f;
-    QueryPerformanceFrequency(&f);
-    mfreq.QuadPart = f.QuadPart/1000LL;
-    if (mfreq.QuadPart == 0) mfreq.QuadPart = 1;
-  }
-  return (mi_msecs_t)(t.QuadPart / mfreq.QuadPart);  
-}
+
+static mi_msecs_t mi_clock_diff;
 
 mi_msecs_t _mi_clock_now(void) {
-  LARGE_INTEGER t;
-  QueryPerformanceCounter(&t);
-  return mi_to_msecs(t);
-}
-#else
-#include <time.h>
-#if defined(CLOCK_REALTIME) || defined(CLOCK_MONOTONIC)
-mi_msecs_t _mi_clock_now(void) {
-  struct timespec t;
-  #ifdef CLOCK_MONOTONIC
-  clock_gettime(CLOCK_MONOTONIC, &t);
-  #else  
-  clock_gettime(CLOCK_REALTIME, &t);
-  #endif
-  return ((mi_msecs_t)t.tv_sec * 1000) + ((mi_msecs_t)t.tv_nsec / 1000000);
-}
-#else
-// low resolution timer
-mi_msecs_t _mi_clock_now(void) {
-  return ((mi_msecs_t)clock() / ((mi_msecs_t)CLOCKS_PER_SEC / 1000));
+  return _mi_prim_clock_now();
 }
-#endif
-#endif
-
-
-static mi_msecs_t mi_clock_diff;
 
 mi_msecs_t _mi_clock_start(void) {
   if (mi_clock_diff == 0.0) {
@@ -455,130 +470,210 @@ mi_msecs_t _mi_clock_end(mi_msecs_t start) {
 // Basic process statistics
 // --------------------------------------------------------
 
-#if defined(_WIN32)
-#include <windows.h>
-#include <psapi.h>
-#pragma comment(lib,"psapi.lib")
-
-static mi_msecs_t filetime_msecs(const FILETIME* ftime) {
-  ULARGE_INTEGER i;
-  i.LowPart = ftime->dwLowDateTime;
-  i.HighPart = ftime->dwHighDateTime;
-  mi_msecs_t msecs = (i.QuadPart / 10000); // FILETIME is in 100 nano seconds
-  return msecs;
+mi_decl_export void mi_process_info(size_t* elapsed_msecs, size_t* user_msecs, size_t* system_msecs, size_t* current_rss, size_t* peak_rss, size_t* current_commit, size_t* peak_commit, size_t* page_faults) mi_attr_noexcept
+{
+  mi_subproc_t* subproc = _mi_subproc();
+  mi_process_info_t pinfo;
+  _mi_memzero_var(pinfo);
+  pinfo.elapsed        = _mi_clock_end(mi_process_start);
+  pinfo.current_commit = (size_t)(mi_atomic_loadi64_relaxed((_Atomic(int64_t)*)(&subproc->stats.committed.current)));
+  pinfo.peak_commit    = (size_t)(mi_atomic_loadi64_relaxed((_Atomic(int64_t)*)(&subproc->stats.committed.peak)));
+  pinfo.current_rss    = pinfo.current_commit;
+  pinfo.peak_rss       = pinfo.peak_commit;
+  pinfo.utime          = 0;
+  pinfo.stime          = 0;
+  pinfo.page_faults    = 0;
+
+  _mi_prim_process_info(&pinfo);
+
+  if (elapsed_msecs!=NULL)  *elapsed_msecs  = (pinfo.elapsed < 0 ? 0 : (pinfo.elapsed < (mi_msecs_t)PTRDIFF_MAX ? (size_t)pinfo.elapsed : PTRDIFF_MAX));
+  if (user_msecs!=NULL)     *user_msecs     = (pinfo.utime < 0 ? 0 : (pinfo.utime < (mi_msecs_t)PTRDIFF_MAX ? (size_t)pinfo.utime : PTRDIFF_MAX));
+  if (system_msecs!=NULL)   *system_msecs   = (pinfo.stime < 0 ? 0 : (pinfo.stime < (mi_msecs_t)PTRDIFF_MAX ? (size_t)pinfo.stime : PTRDIFF_MAX));
+  if (current_rss!=NULL)    *current_rss    = pinfo.current_rss;
+  if (peak_rss!=NULL)       *peak_rss       = pinfo.peak_rss;
+  if (current_commit!=NULL) *current_commit = pinfo.current_commit;
+  if (peak_commit!=NULL)    *peak_commit    = pinfo.peak_commit;
+  if (page_faults!=NULL)    *page_faults    = pinfo.page_faults;
 }
 
-static void mi_stat_process_info(mi_msecs_t* elapsed, mi_msecs_t* utime, mi_msecs_t* stime, size_t* current_rss, size_t* peak_rss, size_t* current_commit, size_t* peak_commit, size_t* page_faults) 
-{
-  *elapsed = _mi_clock_end(mi_process_start);
-  FILETIME ct;
-  FILETIME ut;
-  FILETIME st;
-  FILETIME et;
-  GetProcessTimes(GetCurrentProcess(), &ct, &et, &st, &ut);
-  *utime = filetime_msecs(&ut);
-  *stime = filetime_msecs(&st);
-  PROCESS_MEMORY_COUNTERS info;
-  GetProcessMemoryInfo(GetCurrentProcess(), &info, sizeof(info));
-  *current_rss    = (size_t)info.WorkingSetSize;
-  *peak_rss       = (size_t)info.PeakWorkingSetSize;
-  *current_commit = (size_t)info.PagefileUsage;
-  *peak_commit    = (size_t)info.PeakPagefileUsage;
-  *page_faults    = (size_t)info.PageFaultCount;  
-}
-
-#elif !defined(__wasi__) && (defined(__unix__) || defined(__unix) || defined(unix) || defined(__APPLE__) || defined(__HAIKU__))
-#include <stdio.h>
-#include <unistd.h>
-#include <sys/resource.h>
-
-#if defined(__APPLE__)
-#include <mach/mach.h>
-#endif
 
-#if defined(__HAIKU__)
-#include <kernel/OS.h>
-#endif
+// --------------------------------------------------------
+// Return statistics
+// --------------------------------------------------------
 
-static mi_msecs_t timeval_secs(const struct timeval* tv) {
-  return ((mi_msecs_t)tv->tv_sec * 1000L) + ((mi_msecs_t)tv->tv_usec / 1000L);
+size_t mi_stats_get_bin_size(size_t bin) mi_attr_noexcept {
+  if (bin > MI_BIN_HUGE) return 0;
+  return _mi_bin_size(bin);
 }
 
-static void mi_stat_process_info(mi_msecs_t* elapsed, mi_msecs_t* utime, mi_msecs_t* stime, size_t* current_rss, size_t* peak_rss, size_t* current_commit, size_t* peak_commit, size_t* page_faults)
-{
-  *elapsed = _mi_clock_end(mi_process_start);
-  struct rusage rusage;
-  getrusage(RUSAGE_SELF, &rusage);
-  *utime = timeval_secs(&rusage.ru_utime);
-  *stime = timeval_secs(&rusage.ru_stime);
-#if !defined(__HAIKU__)
-  *page_faults = rusage.ru_majflt;
-#endif
-  // estimate commit using our stats
-  *peak_commit    = (size_t)(mi_atomic_loadi64_relaxed((_Atomic(int64_t)*)&_mi_stats_main.committed.peak));
-  *current_commit = (size_t)(mi_atomic_loadi64_relaxed((_Atomic(int64_t)*)&_mi_stats_main.committed.current));
-  *current_rss    = *current_commit;  // estimate 
-#if defined(__HAIKU__)
-  // Haiku does not have (yet?) a way to
-  // get these stats per process
-  thread_info tid;
-  area_info mem;
-  ssize_t c;
-  get_thread_info(find_thread(0), &tid);
-  while (get_next_area_info(tid.team, &c, &mem) == B_OK) {
-    *peak_rss += mem.ram_size;
+void mi_stats_get(size_t stats_size, mi_stats_t* stats) mi_attr_noexcept {
+  if (stats == NULL || stats_size == 0) return;
+  _mi_memzero(stats, stats_size);
+  const size_t size = (stats_size > sizeof(mi_stats_t) ? sizeof(mi_stats_t) : stats_size);
+  _mi_memcpy(stats, &_mi_subproc()->stats, size);
+  stats->version = MI_STAT_VERSION;
+}
+
+
+// --------------------------------------------------------
+// Statics in json format
+// --------------------------------------------------------
+
+typedef struct mi_heap_buf_s {
+  char*   buf;
+  size_t  size;
+  size_t  used;
+  bool    can_realloc;
+} mi_heap_buf_t;
+
+static bool mi_heap_buf_expand(mi_heap_buf_t* hbuf) {
+  if (hbuf==NULL) return false;
+  if (hbuf->buf != NULL && hbuf->size>0) {
+    hbuf->buf[hbuf->size-1] = 0;
+  }
+  if (hbuf->size > SIZE_MAX/2 || !hbuf->can_realloc) return false;
+  const size_t newsize = (hbuf->size == 0 ? mi_good_size(12*MI_KiB) : 2*hbuf->size);
+  char* const  newbuf  = (char*)mi_rezalloc(hbuf->buf, newsize);
+  if (newbuf == NULL) return false;
+  hbuf->buf = newbuf;
+  hbuf->size = newsize;
+  return true;
+}
+
+static void mi_heap_buf_print(mi_heap_buf_t* hbuf, const char* msg) {
+  if (msg==NULL || hbuf==NULL) return;
+  if (hbuf->used + 1 >= hbuf->size && !hbuf->can_realloc) return;
+  for (const char* src = msg; *src != 0; src++) {
+    char c = *src;
+    if (hbuf->used + 1 >= hbuf->size) {
+      if (!mi_heap_buf_expand(hbuf)) return;
+    }
+    mi_assert_internal(hbuf->used < hbuf->size);
+    hbuf->buf[hbuf->used++] = c;
   }
-  *page_faults = 0;
-#elif defined(__APPLE__)
-  *peak_rss = rusage.ru_maxrss;         // BSD reports in bytes
-  struct mach_task_basic_info info;
-  mach_msg_type_number_t infoCount = MACH_TASK_BASIC_INFO_COUNT;
-  if (task_info(mach_task_self(), MACH_TASK_BASIC_INFO, (task_info_t)&info, &infoCount) == KERN_SUCCESS) {
-    *current_rss = (size_t)info.resident_size;
+  mi_assert_internal(hbuf->used < hbuf->size);
+  hbuf->buf[hbuf->used] = 0;
+}
+
+static void mi_heap_buf_print_count_bin(mi_heap_buf_t* hbuf, const char* prefix, mi_stat_count_t* stat, size_t bin, bool add_comma) {
+  const size_t binsize = mi_stats_get_bin_size(bin);
+  const size_t pagesize = (binsize <= MI_SMALL_MAX_OBJ_SIZE ? MI_SMALL_PAGE_SIZE :
+                            (binsize <= MI_MEDIUM_MAX_OBJ_SIZE ? MI_MEDIUM_PAGE_SIZE :
+                              (binsize <= MI_LARGE_MAX_OBJ_SIZE ? MI_LARGE_PAGE_SIZE : 0)));
+  char buf[128];
+  _mi_snprintf(buf, 128, "%s{ \"total\": %lld, \"peak\": %lld, \"current\": %lld, \"block_size\": %zu, \"page_size\": %zu }%s\n", prefix, stat->total, stat->peak, stat->current, binsize, pagesize, (add_comma ? "," : ""));
+  buf[127] = 0;
+  mi_heap_buf_print(hbuf, buf);
+}
+
+static void mi_heap_buf_print_count_cbin(mi_heap_buf_t* hbuf, const char* prefix, mi_stat_count_t* stat, mi_chunkbin_t bin, bool add_comma) {
+  const char* cbin = " ";
+  switch(bin) {
+    case MI_CBIN_SMALL: cbin = "S"; break;
+    case MI_CBIN_MEDIUM: cbin = "M"; break;
+    case MI_CBIN_LARGE: cbin = "L"; break;
+    case MI_CBIN_OTHER: cbin = "X"; break;
+    default: cbin = " "; break;
   }
-#else
-  *peak_rss = rusage.ru_maxrss * 1024;  // Linux reports in KiB
-#endif  
+  char buf[128];
+  _mi_snprintf(buf, 128, "%s{ \"total\": %lld, \"peak\": %lld, \"current\": %lld, \"bin\": \"%s\" }%s\n", prefix, stat->total, stat->peak, stat->current, cbin, (add_comma ? "," : ""));
+  buf[127] = 0;
+  mi_heap_buf_print(hbuf, buf);
 }
 
-#else
-#ifndef __wasi__
-// WebAssembly instances are not processes
-#pragma message("define a way to get process info")
-#endif
+static void mi_heap_buf_print_count(mi_heap_buf_t* hbuf, const char* prefix, mi_stat_count_t* stat, bool add_comma) {
+  char buf[128];
+  _mi_snprintf(buf, 128, "%s{ \"total\": %lld, \"peak\": %lld, \"current\": %lld }%s\n", prefix, stat->total, stat->peak, stat->current, (add_comma ? "," : ""));
+  buf[127] = 0;
+  mi_heap_buf_print(hbuf, buf);
+}
 
-static void mi_stat_process_info(mi_msecs_t* elapsed, mi_msecs_t* utime, mi_msecs_t* stime, size_t* current_rss, size_t* peak_rss, size_t* current_commit, size_t* peak_commit, size_t* page_faults)
-{
-  *elapsed = _mi_clock_end(mi_process_start);
-  *peak_commit    = (size_t)(mi_atomic_loadi64_relaxed((_Atomic(int64_t)*)&_mi_stats_main.committed.peak));
-  *current_commit = (size_t)(mi_atomic_loadi64_relaxed((_Atomic(int64_t)*)&_mi_stats_main.committed.current));
-  *peak_rss    = *peak_commit;
-  *current_rss = *current_commit;
-  *page_faults = 0;
-  *utime = 0;
-  *stime = 0;
+static void mi_heap_buf_print_count_value(mi_heap_buf_t* hbuf, const char* name, mi_stat_count_t* stat) {
+  char buf[128];
+  _mi_snprintf(buf, 128, "  \"%s\": ", name);
+  buf[127] = 0;
+  mi_heap_buf_print(hbuf, buf);
+  mi_heap_buf_print_count(hbuf, "", stat, true);
 }
-#endif
 
+static void mi_heap_buf_print_value(mi_heap_buf_t* hbuf, const char* name, int64_t val) {
+  char buf[128];
+  _mi_snprintf(buf, 128, "  \"%s\": %lld,\n", name, val);
+  buf[127] = 0;
+  mi_heap_buf_print(hbuf, buf);
+}
 
-mi_decl_export void mi_process_info(size_t* elapsed_msecs, size_t* user_msecs, size_t* system_msecs, size_t* current_rss, size_t* peak_rss, size_t* current_commit, size_t* peak_commit, size_t* page_faults) mi_attr_noexcept
-{
-  mi_msecs_t elapsed = 0;
-  mi_msecs_t utime = 0;
-  mi_msecs_t stime = 0;
-  size_t current_rss0 = 0;
-  size_t peak_rss0 = 0;
-  size_t current_commit0 = 0;
-  size_t peak_commit0 = 0;
-  size_t page_faults0 = 0;  
-  mi_stat_process_info(&elapsed,&utime, &stime, &current_rss0, &peak_rss0, &current_commit0, &peak_commit0, &page_faults0);
-  if (elapsed_msecs!=NULL)  *elapsed_msecs = (elapsed < 0 ? 0 : (elapsed < (mi_msecs_t)PTRDIFF_MAX ? (size_t)elapsed : PTRDIFF_MAX));
-  if (user_msecs!=NULL)     *user_msecs     = (utime < 0 ? 0 : (utime < (mi_msecs_t)PTRDIFF_MAX ? (size_t)utime : PTRDIFF_MAX));
-  if (system_msecs!=NULL)   *system_msecs   = (stime < 0 ? 0 : (stime < (mi_msecs_t)PTRDIFF_MAX ? (size_t)stime : PTRDIFF_MAX));
-  if (current_rss!=NULL)    *current_rss    = current_rss0;
-  if (peak_rss!=NULL)       *peak_rss       = peak_rss0;
-  if (current_commit!=NULL) *current_commit = current_commit0;
-  if (peak_commit!=NULL)    *peak_commit    = peak_commit0;
-  if (page_faults!=NULL)    *page_faults    = page_faults0;
+static void mi_heap_buf_print_size(mi_heap_buf_t* hbuf, const char* name, size_t val, bool add_comma) {
+  char buf[128];
+  _mi_snprintf(buf, 128, "    \"%s\": %zu%s\n", name, val, (add_comma ? "," : ""));
+  buf[127] = 0;
+  mi_heap_buf_print(hbuf, buf);
 }
 
+static void mi_heap_buf_print_counter_value(mi_heap_buf_t* hbuf, const char* name, mi_stat_counter_t* stat) {
+  mi_heap_buf_print_value(hbuf, name, stat->total);
+}
+
+#define MI_STAT_COUNT(stat)    mi_heap_buf_print_count_value(&hbuf, #stat, &stats->stat);
+#define MI_STAT_COUNTER(stat)  mi_heap_buf_print_counter_value(&hbuf, #stat, &stats->stat);
+
+char* mi_stats_get_json(size_t output_size, char* output_buf) mi_attr_noexcept {
+  mi_stats_merge();
+  mi_heap_buf_t hbuf = { NULL, 0, 0, true };
+  if (output_size > 0 && output_buf != NULL) {
+    _mi_memzero(output_buf, output_size);
+    hbuf.buf = output_buf;
+    hbuf.size = output_size;
+    hbuf.can_realloc = false;
+  }
+  else {
+    if (!mi_heap_buf_expand(&hbuf)) return NULL;
+  }
+  mi_heap_buf_print(&hbuf, "{\n");
+  mi_heap_buf_print_value(&hbuf, "version", MI_STAT_VERSION);
+  mi_heap_buf_print_value(&hbuf, "mimalloc_version", MI_MALLOC_VERSION);
+
+  // process info
+  mi_heap_buf_print(&hbuf, "  \"process\": {\n");
+  size_t elapsed;
+  size_t user_time;
+  size_t sys_time;
+  size_t current_rss;
+  size_t peak_rss;
+  size_t current_commit;
+  size_t peak_commit;
+  size_t page_faults;
+  mi_process_info(&elapsed, &user_time, &sys_time, &current_rss, &peak_rss, &current_commit, &peak_commit, &page_faults);
+  mi_heap_buf_print_size(&hbuf, "elapsed_msecs", elapsed, true);
+  mi_heap_buf_print_size(&hbuf, "user_msecs", user_time, true);
+  mi_heap_buf_print_size(&hbuf, "system_msecs", sys_time, true);
+  mi_heap_buf_print_size(&hbuf, "page_faults", page_faults, true);
+  mi_heap_buf_print_size(&hbuf, "rss_current", current_rss, true);
+  mi_heap_buf_print_size(&hbuf, "rss_peak", peak_rss, true);
+  mi_heap_buf_print_size(&hbuf, "commit_current", current_commit, true);
+  mi_heap_buf_print_size(&hbuf, "commit_peak", peak_commit, false);
+  mi_heap_buf_print(&hbuf, "  },\n");
+
+  // statistics
+  mi_stats_t* stats = &_mi_subproc()->stats;
+  MI_STAT_FIELDS()
+
+  // size bins
+  mi_heap_buf_print(&hbuf, "  \"malloc_bins\": [\n");
+  for (size_t i = 0; i <= MI_BIN_HUGE; i++) {
+    mi_heap_buf_print_count_bin(&hbuf, "    ", &stats->malloc_bins[i], i, i!=MI_BIN_HUGE);
+  }
+  mi_heap_buf_print(&hbuf, "  ],\n");
+  mi_heap_buf_print(&hbuf, "  \"page_bins\": [\n");
+  for (size_t i = 0; i <= MI_BIN_HUGE; i++) {
+    mi_heap_buf_print_count_bin(&hbuf, "    ", &stats->page_bins[i], i, i!=MI_BIN_HUGE);
+  }
+  mi_heap_buf_print(&hbuf, "  ],\n");
+  mi_heap_buf_print(&hbuf, "  \"chunk_bins\": [\n");
+  for (size_t i = 0; i < MI_CBIN_COUNT; i++) {
+    mi_heap_buf_print_count_cbin(&hbuf, "    ", &stats->chunk_bins[i], (mi_chunkbin_t)i, i!=MI_CBIN_COUNT-1);
+  }
+  mi_heap_buf_print(&hbuf, "  ]\n");
+  mi_heap_buf_print(&hbuf, "}\n");
+  return hbuf.buf;
+}
diff --git a/depends/mimalloc/test/CMakeLists.txt b/depends/mimalloc/test/CMakeLists.txt
index fb4b48111f03..5905613c9717 100644
--- a/depends/mimalloc/test/CMakeLists.txt
+++ b/depends/mimalloc/test/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.14)
+cmake_minimum_required(VERSION 3.18)
 project(mimalloc-test C CXX)
 
 set(CMAKE_C_STANDARD 11)
@@ -16,10 +16,12 @@ if (NOT CMAKE_BUILD_TYPE)
 endif()
 
 # Import mimalloc (if installed)
-find_package(mimalloc 2.0 REQUIRED NO_SYSTEM_ENVIRONMENT_PATH)
+find_package(mimalloc 1.9 CONFIG REQUIRED)
 message(STATUS "Found mimalloc installed at: ${MIMALLOC_LIBRARY_DIR} (${MIMALLOC_VERSION_DIR})")
 
-# overriding with a dynamic library
+
+# link with a dynamic shared library
+# use `LD_PRELOAD` to actually override malloc/free at runtime with mimalloc
 add_executable(dynamic-override  main-override.c)
 target_link_libraries(dynamic-override PUBLIC mimalloc)
 
@@ -29,9 +31,9 @@ target_link_libraries(dynamic-override-cxx PUBLIC mimalloc)
 
 # overriding with a static object file works reliable as the symbols in the
 # object file have priority over those in library files
-add_executable(static-override-obj main-override.c ${MIMALLOC_OBJECT_DIR}/mimalloc.o)
+add_executable(static-override-obj main-override.c ${MIMALLOC_OBJECT_DIR}/mimalloc${CMAKE_C_OUTPUT_EXTENSION})
 target_include_directories(static-override-obj PUBLIC ${MIMALLOC_INCLUDE_DIR})
-target_link_libraries(static-override-obj PUBLIC pthread)
+target_link_libraries(static-override-obj PUBLIC mimalloc-static)
 
 
 # overriding with a static library works too if using the `mimalloc-override.h`
diff --git a/depends/mimalloc/test/main-override-dep.cpp b/depends/mimalloc/test/main-override-dep.cpp
new file mode 100644
index 000000000000..4f293e7b73be
--- /dev/null
+++ b/depends/mimalloc/test/main-override-dep.cpp
@@ -0,0 +1,60 @@
+// Issue #981: test overriding allocation in a DLL that is compiled independent of mimalloc.
+// This is imported by the `mimalloc-test-override` project.
+#include <string>
+#include <iostream>
+#include "main-override-dep.h"
+
+std::string TestAllocInDll::GetString()
+{
+	char* test = new char[128];
+	memset(test, 0, 128);
+	const char* t = "test";
+	memcpy(test, t, 4);
+	std::string r = test;
+  std::cout << "override-dep: GetString: " << r << "\n";
+	delete[] test;
+	return r;
+}
+
+#include <windows.h>
+
+void TestAllocInDll::TestHeapAlloc()
+{
+	HANDLE heap = GetProcessHeap();
+	int* p = (int*)HeapAlloc(heap, 0, sizeof(int));
+	*p = 42;
+	HeapFree(heap, 0, p);
+}
+
+class Static {
+private:
+  void* p;
+public:
+  Static() {
+    printf("override-dep: static constructor\n");
+    p = malloc(64);
+    return;
+  }
+  ~Static() {
+    free(p);
+    printf("override-dep: static destructor\n");
+    return;
+  }
+};
+
+static Static s = Static();
+
+
+#include <windows.h>
+
+BOOL WINAPI DllMain(HINSTANCE module, DWORD reason, LPVOID reserved) {
+  (void)(reserved);
+  (void)(module);
+  if (reason==DLL_PROCESS_ATTACH) {
+    printf("override-dep: dll attach\n");
+  }
+  else if (reason==DLL_PROCESS_DETACH) {
+    printf("override-dep: dll detach\n");
+  }
+  return TRUE;
+}
diff --git a/depends/mimalloc/test/main-override-dep.h b/depends/mimalloc/test/main-override-dep.h
new file mode 100644
index 000000000000..9d4aabfdb649
--- /dev/null
+++ b/depends/mimalloc/test/main-override-dep.h
@@ -0,0 +1,12 @@
+#pragma once
+// Issue #981: test overriding allocation in a DLL that is compiled independent of mimalloc. 
+// This is imported by the `mimalloc-test-override` project.
+
+#include <string>
+
+class TestAllocInDll
+{
+public:
+	__declspec(dllexport) std::string GetString();
+	__declspec(dllexport) void TestHeapAlloc();
+};
diff --git a/depends/mimalloc/test/main-override-static.c b/depends/mimalloc/test/main-override-static.c
index 70b6293ccc53..3e47874ecc36 100644
--- a/depends/mimalloc/test/main-override-static.c
+++ b/depends/mimalloc/test/main-override-static.c
@@ -1,3 +1,6 @@
+#if _WIN32
+#include <windows.h>
+#endif
 #include <stdlib.h>
 #include <stdio.h>
 #include <assert.h>
@@ -7,11 +10,13 @@
 #include <mimalloc.h>
 #include <mimalloc-override.h>  // redefines malloc etc.
 
+static void mi_bins(void);
 
 static void double_free1();
 static void double_free2();
 static void corrupt_free();
 static void block_overflow1();
+static void block_overflow2();
 static void invalid_free();
 static void test_aslr(void);
 static void test_process_info(void);
@@ -19,53 +24,67 @@ static void test_reserved(void);
 static void negative_stat(void);
 static void alloc_huge(void);
 static void test_heap_walk(void);
-static void test_heap_arena(void);
+static void test_canary_leak(void);
+static void test_manage_os_memory(void);
+// static void test_large_pages(void);
+
 
 int main() {
   mi_version();
   mi_stats_reset();
+
+  // mi_bins();
+
+  // test_manage_os_memory();
+  // test_large_pages();
   // detect double frees and heap corruption
   // double_free1();
   // double_free2();
   // corrupt_free();
   // block_overflow1();
+  // block_overflow2();
+  test_canary_leak();
   // test_aslr();
   // invalid_free();
   // test_reserved();
   // negative_stat();
-  // alloc_huge();
   // test_heap_walk();
-  test_heap_arena();
-  
+  // alloc_huge();
+
+
   void* p1 = malloc(78);
   void* p2 = malloc(24);
   free(p1);
   p1 = mi_malloc(8);
   char* s = strdup("hello\n");
   free(p2);
-  
+
+  mi_heap_t* h = mi_heap_new();
+  mi_heap_set_default(h);
+
   p2 = malloc(16);
   p1 = realloc(p1, 32);
   free(p1);
   free(p2);
   free(s);
-  
+
   /* now test if override worked by allocating/freeing across the api's*/
   //p1 = mi_malloc(32);
   //free(p1);
   //p2 = malloc(32);
   //mi_free(p2);
-  
+
   //mi_collect(true);
   //mi_stats_print(NULL);
-  
+
   // test_process_info();
+
   return 0;
 }
 
 static void invalid_free() {
   free((void*)0xBADBEEF);
-  realloc((void*)0xBADBEEF,10);
+  realloc((void*)0xBADBEEF, 10);
 }
 
 static void block_overflow1() {
@@ -74,6 +93,12 @@ static void block_overflow1() {
   free(p);
 }
 
+static void block_overflow2() {
+  uint8_t* p = (uint8_t*)mi_malloc(16);
+  p[17] = 0;
+  free(p);
+}
+
 // The double free samples come ArcHeap [1] by Insu Yun (issue #161)
 // [1]: https://arxiv.org/pdf/1903.00503.pdf
 
@@ -155,9 +180,9 @@ static void test_process_info(void) {
   size_t peak_rss = 0;
   size_t current_commit = 0;
   size_t peak_commit = 0;
-  size_t page_faults = 0;  
+  size_t page_faults = 0;
   for (int i = 0; i < 100000; i++) {
-    void* p = calloc(100,10);
+    void* p = calloc(100, 10);
     free(p);
   }
   mi_process_info(&elapsed, &user_msecs, &system_msecs, &current_rss, &peak_rss, &current_commit, &peak_commit, &page_faults);
@@ -168,7 +193,7 @@ static void test_reserved(void) {
 #define KiB 1024ULL
 #define MiB (KiB*KiB)
 #define GiB (MiB*KiB)
-  mi_reserve_os_memory(4*GiB, false, true);
+  mi_reserve_os_memory(3*GiB, false, true);
   void* p1 = malloc(100);
   void* p2 = malloc(100000);
   void* p3 = malloc(2*GiB);
@@ -187,7 +212,7 @@ static void negative_stat(void) {
   mi_stats_print_out(NULL, NULL);
   *p = 100;
   mi_free(p);
-  mi_stats_print_out(NULL, NULL);  
+  mi_stats_print_out(NULL, NULL);
 }
 
 static void alloc_huge(void) {
@@ -207,27 +232,85 @@ static bool test_visit(const mi_heap_t* heap, const mi_heap_area_t* area, void*
 
 static void test_heap_walk(void) {
   mi_heap_t* heap = mi_heap_new();
-  //mi_heap_malloc(heap, 2097152);
+  mi_heap_malloc(heap, 16*2097152);
   mi_heap_malloc(heap, 2067152);
   mi_heap_malloc(heap, 2097160);
   mi_heap_malloc(heap, 24576);
   mi_heap_visit_blocks(heap, true, &test_visit, NULL);
 }
 
-static void test_heap_arena(void) {
+static void test_canary_leak(void) {
+  char* p = mi_mallocn_tp(char, 22);
+  for (int i = 0; i < 22; i++) {
+    p[i] = '0'+i;
+  }
+  puts(p);
+  free(p);
+}
+
+#if _WIN32
+static void test_manage_os_memory(void) {
+  size_t size = 256 * 1024 * 1024;
+  void* ptr = VirtualAlloc(NULL, size, MEM_RESERVE | MEM_COMMIT, PAGE_READWRITE);
   mi_arena_id_t arena_id;
-  int err = mi_reserve_os_memory_ex(100 * 1024 * 1024, false /* commit */, false /* allow large */, true /* exclusive */, &arena_id);
-  if (err) abort();
-  mi_heap_t* heap = mi_heap_new_in_arena(arena_id);
-  for (int i = 0; i < 500000; i++) {
-    void* p = mi_heap_malloc(heap, 1024);
-    if (p == NULL) {
-      printf("out of memory after %d kb (expecting about 100_000kb)\n", i);
-      break;
-    }
+  mi_manage_os_memory_ex(ptr, size, true /* committed */, true /* pinned */, false /* is zero */, -1 /* numa node */, true /* exclusive */, &arena_id);
+  mi_heap_t* cuda_heap = mi_heap_new_in_arena(arena_id);    // you can do this in any thread
+
+  // now allocate only in the cuda arena
+  void* p1 = mi_heap_malloc(cuda_heap, 8);
+  int* p2 = mi_heap_malloc_tp(cuda_heap, int);
+  *p2 = 42;
+
+  // and maybe set the cuda heap as the default heap? (but careful as now `malloc` will allocate in the cuda heap as well)
+  {
+    mi_heap_t* prev_default_heap = mi_heap_set_default(cuda_heap);
+    void* p3 = mi_malloc(8);  // allocate in the cuda heap
+    mi_free(p3);
   }
+  mi_free(p1);
+  mi_free(p2);
+}
+#else
+static void test_manage_os_memory(void) {
+  // empty
+}
+#endif
+
+// Experiment with huge OS pages
+#if 0
+
+#include <mimalloc/types.h>
+#include <mimalloc/internal.h>
+#include <unistd.h>
+#include <sys/mman.h>
+
+static void test_large_pages(void) {
+  mi_memid_t memid;
+
+#if 0
+  size_t pages_reserved;
+  size_t page_size;
+  uint8_t* p = (uint8_t*)_mi_os_alloc_huge_os_pages(1, -1, 30000, &pages_reserved, &page_size, &memid);
+  const size_t req_size = pages_reserved * page_size;
+#else
+  const size_t req_size = 64*MI_MiB;
+  uint8_t* p = (uint8_t*)_mi_os_alloc(req_size, &memid, NULL);
+#endif
+
+  p[0] = 1;
+
+  //_mi_os_protect(p, _mi_os_page_size());
+  //_mi_os_unprotect(p, _mi_os_page_size());
+  //_mi_os_decommit(p, _mi_os_page_size(), NULL);
+  if (madvise(p, req_size, MADV_HUGEPAGE) == 0) {
+    printf("advised huge pages\n");
+    _mi_os_decommit(p, _mi_os_page_size(), NULL);
+  };
+  _mi_os_free(p, req_size, memid, NULL);
 }
 
+#endif
+
 // ----------------------------
 // bin size experiments
 // ------------------------------
@@ -235,8 +318,8 @@ static void test_heap_arena(void) {
 #if 0
 #include <stdint.h>
 #include <stdbool.h>
+#include <mimalloc/bits.h>
 
-#define MI_INTPTR_SIZE 8
 #define MI_LARGE_WSIZE_MAX (4*1024*1024 / MI_INTPTR_SIZE)
 
 #define MI_BIN_HUGE 100
@@ -246,11 +329,11 @@ static void test_heap_arena(void) {
 static inline uint8_t mi_bsr32(uint32_t x);
 
 #if defined(_MSC_VER)
-#include <windows.h>
+//#include <Windows.h>
 #include <intrin.h>
 static inline uint8_t mi_bsr32(uint32_t x) {
   uint32_t idx;
-  _BitScanReverse((DWORD*)&idx, x);
+  _BitScanReverse(&idx, x);
   return idx;
 }
 #elif defined(__GNUC__) || defined(__clang__)
@@ -274,7 +357,7 @@ static inline uint8_t mi_bsr32(uint32_t x) {
 }
 #endif
 
-/*
+
 // Bit scan reverse: return the index of the highest bit.
 uint8_t _mi_bsr(uintptr_t x) {
   if (x == 0) return 0;
@@ -287,38 +370,39 @@ uint8_t _mi_bsr(uintptr_t x) {
   # error "define bsr for non-32 or 64-bit platforms"
   #endif
 }
-*/
-
 
 static inline size_t _mi_wsize_from_size(size_t size) {
   return (size + sizeof(uintptr_t) - 1) / sizeof(uintptr_t);
 }
 
+// #define MI_ALIGN2W
+
 // Return the bin for a given field size.
 // Returns MI_BIN_HUGE if the size is too large.
 // We use `wsize` for the size in "machine word sizes",
 // i.e. byte size == `wsize*sizeof(void*)`.
-extern inline uint8_t _mi_bin8(size_t size) {
-  size_t wsize = _mi_wsize_from_size(size);
-  uint8_t bin;
-  if (wsize <= 1) {
+static inline size_t mi_bin(size_t wsize) {
+  // size_t wsize = _mi_wsize_from_size(size);
+  // size_t bin;
+  /*if (wsize <= 1) {
     bin = 1;
   }
+  */
 #if defined(MI_ALIGN4W)
-  else if (wsize <= 4) {
-    bin = (uint8_t)((wsize+1)&~1); // round to double word sizes
+  if (wsize <= 4) {
+    return (wsize <= 1 ? 1 : (wsize+1)&~1); // round to double word sizes
   }
 #elif defined(MI_ALIGN2W)
-  else if (wsize <= 8) {
-    bin = (uint8_t)((wsize+1)&~1); // round to double word sizes
+  if (wsize <= 8) {
+    return (wsize <= 1 ? 1 : (wsize+1)&~1); // round to double word sizes
   }
 #else
-  else if (wsize <= 8) {
-    bin = (uint8_t)wsize;
+  if (wsize <= 8) {
+    return (wsize == 0 ? 1 : wsize);
   }
 #endif
   else if (wsize > MI_LARGE_WSIZE_MAX) {
-    bin = MI_BIN_HUGE;
+    return MI_BIN_HUGE;
   }
   else {
 #if defined(MI_ALIGN4W)
@@ -326,15 +410,19 @@ extern inline uint8_t _mi_bin8(size_t size) {
 #endif
     wsize--;
     // find the highest bit
-    uint8_t b = mi_bsr32((uint32_t)wsize);
+    size_t idx;
+    mi_bsr(wsize, &idx);
+    uint8_t b = (uint8_t)idx;
     // and use the top 3 bits to determine the bin (~12.5% worst internal fragmentation).
     // - adjust with 3 because we use do not round the first 8 sizes
     //   which each get an exact bin
-    bin = ((b << 2) + (uint8_t)((wsize >> (b - 2)) & 0x03)) - 3;
+    const size_t bin = ((b << 2) + ((wsize >> (b - 2)) & 0x03)) - 3;
+    assert(bin > 0 && bin < MI_BIN_HUGE);
+    return bin;
   }
-  return bin;
 }
 
+
 static inline uint8_t _mi_bin4(size_t size) {
   size_t wsize = _mi_wsize_from_size(size);
   uint8_t bin;
@@ -358,44 +446,79 @@ static inline uint8_t _mi_bin4(size_t size) {
     bin = MI_BIN_HUGE;
   }
   else {
-    uint8_t b = mi_bsr32((uint32_t)wsize);
+    size_t idx;
+    mi_bsr(wsize, &idx);
+    uint8_t b = (uint8_t)idx;
     bin = ((b << 1) + (uint8_t)((wsize >> (b - 1)) & 0x01)) + 3;
   }
   return bin;
 }
 
-static size_t _mi_binx4(size_t bsize) {
-  if (bsize==0) return 0;
-  uint8_t b = mi_bsr32((uint32_t)bsize);
-  if (b <= 1) return bsize;
-  size_t bin = ((b << 1) | (bsize >> (b - 1))&0x01);
+static size_t _mi_binx4(size_t wsize) {
+  size_t bin;
+  if (wsize <= 1) {
+    bin = 1;
+  }
+  else if (wsize <= 8) {
+    // bin = (wsize+1)&~1; // round to double word sizes
+    bin = (uint8_t)wsize;
+  }
+  else {
+    size_t idx;
+    mi_bsr(wsize, &idx);
+    uint8_t b = (uint8_t)idx;
+    if (b <= 1) return wsize;
+    bin = ((b << 1) | (wsize >> (b - 1))&0x01) + 3;
+  }
   return bin;
 }
 
 static size_t _mi_binx8(size_t bsize) {
   if (bsize<=1) return bsize;
-  uint8_t b = mi_bsr32((uint32_t)bsize);
+  size_t idx;
+  mi_bsr(bsize, &idx);
+  uint8_t b = (uint8_t)idx;
   if (b <= 2) return bsize;
   size_t bin = ((b << 2) | (bsize >> (b - 2))&0x03) - 5;
   return bin;
 }
 
+
+static inline size_t mi_binx(size_t wsize) {
+  uint8_t bin;
+  if (wsize <= 1) {
+    bin = 1;
+  }
+  else if (wsize <= 8) {
+    // bin = (wsize+1)&~1; // round to double word sizes
+    bin = (uint8_t)wsize;
+  }
+  else {
+    wsize--;
+    assert(wsize>0);
+    // find the highest bit
+    uint8_t b = (uint8_t)(MI_SIZE_BITS - 1 - mi_clz(wsize));
+
+    // and use the top 3 bits to determine the bin (~12.5% worst internal fragmentation).
+    // - adjust with 3 because we use do not round the first 8 sizes
+    //   which each get an exact bin
+    bin = ((b << 2) + (uint8_t)((wsize >> (b - 2)) & 0x03)) - 3;
+  }
+  return bin;
+}
+
+
 static void mi_bins(void) {
   //printf("  QNULL(1), /* 0 */ \\\n  ");
   size_t last_bin = 0;
-  size_t min_bsize = 0;
-  size_t last_bsize = 0;
-  for (size_t bsize = 1; bsize < 2*1024; bsize++) {
-    size_t size = bsize * 64 * 1024;
-    size_t bin = _mi_binx8(bsize);
+  for (size_t wsize = 1; wsize <= (4*1024*1024) / 8 + 1024; wsize++) {
+    size_t bin = mi_bin(wsize);
     if (bin != last_bin) {
-      printf("min bsize: %6zd, max bsize: %6zd, bin: %6zd\n", min_bsize, last_bsize, last_bin);
-      //printf("QNULL(%6zd), ", wsize);
-      //if (last_bin%8 == 0) printf("/* %i */ \\\n  ", last_bin);
+      //printf("min bsize: %6zd, max bsize: %6zd, bin: %6zd\n", min_wsize, last_wsize, last_bin);
+      printf("QNULL(%6zd), ", wsize-1);
+      if (last_bin%8 == 0) printf("/* %zu */ \\\n  ", last_bin);
       last_bin = bin;
-      min_bsize = bsize;
     }
-    last_bsize = bsize;
   }
 }
 #endif
diff --git a/depends/mimalloc/test/main-override.cpp b/depends/mimalloc/test/main-override.cpp
index e0dba5a3d77f..408b5ee8f9e7 100644
--- a/depends/mimalloc/test/main-override.cpp
+++ b/depends/mimalloc/test/main-override.cpp
@@ -9,17 +9,12 @@
 #include <vector>
 #include <future>
 #include <iostream>
-
 #include <thread>
-#include <mimalloc.h>
 #include <assert.h>
 
 #ifdef _WIN32
 #include <mimalloc-new-delete.h>
-#endif
-
-#ifdef _WIN32
-#include <Windows.h>
+#include <windows.h>
 static void msleep(unsigned long msecs) { Sleep(msecs); }
 #else
 #include <unistd.h>
@@ -32,27 +27,47 @@ static void heap_late_free();         // issue #204
 static void padding_shrink();         // issue #209
 static void various_tests();
 static void test_mt_shutdown();
-static void large_alloc(void);        // issue #363
 static void fail_aslr();              // issue #372
 static void tsan_numa_test();         // issue #414
-static void strdup_test();            // issue #445 
-static void bench_alloc_large(void);  // issue #xxx
+static void strdup_test();            // issue #445
+static void heap_thread_free_huge();
+static void test_std_string();        // issue #697
+static void test_thread_local();      // issue #944
+// static void test_mixed0();             // issue #942
+static void test_mixed1();             // issue #942
+static void test_stl_allocators();
+
+#if _WIN32
+#include "main-override-dep.h"
+static void test_dep();               // issue #981: test overriding in another DLL
+#else
+static void test_dep() { };
+#endif
 
 int main() {
   mi_stats_reset();  // ignore earlier allocations
-
-   heap_thread_free_large();
-   heap_no_delete();
-   heap_late_free();
-   padding_shrink();
-   various_tests();
-   large_alloc();
-   tsan_numa_test();
-   strdup_test();
-
+  //various_tests();
+  //test_mixed1();
+
+  test_dep();
+
+  //test_std_string();
+  //test_thread_local();
+  // heap_thread_free_huge();
+  /*
+  heap_thread_free_large();
+  heap_no_delete();
+  heap_late_free();
+  padding_shrink();
+
+  tsan_numa_test();
+  */
+  /*
+  strdup_test();
+  test_stl_allocators();
   test_mt_shutdown();
+  */
   //fail_aslr();
-  bench_alloc_large();
   mi_stats_print(NULL);
   return 0;
 }
@@ -92,6 +107,15 @@ static void various_tests() {
   delete t;
   t = new (std::nothrow) Test(42);
   delete t;
+  auto tbuf = new unsigned char[sizeof(Test)];
+  t = new (tbuf) Test(42);
+  t->~Test();
+  delete[] tbuf;
+
+  #if _WIN32
+  const char* ptr = ::_Getdays();  // test _base overrid
+  free((void*)ptr);
+  #endif
 }
 
 class Static {
@@ -120,6 +144,18 @@ static bool test_stl_allocator1() {
 
 struct some_struct { int i; int j; double z; };
 
+
+#if _WIN32
+static void test_dep()
+{
+  TestAllocInDll t;
+  std::string s = t.GetString();
+  std::cout << "test_dep GetString: " << s << "\n";
+  t.TestHeapAlloc();
+}
+#endif
+
+
 static bool test_stl_allocator2() {
   std::vector<some_struct, mi_stl_allocator<some_struct> > vec;
   vec.push_back(some_struct());
@@ -127,6 +163,130 @@ static bool test_stl_allocator2() {
   return vec.size() == 0;
 }
 
+#if MI_HAS_HEAP_STL_ALLOCATOR
+static bool test_stl_allocator3() {
+  std::vector<int, mi_heap_stl_allocator<int> > vec;
+  vec.push_back(1);
+  vec.pop_back();
+  return vec.size() == 0;
+}
+
+static bool test_stl_allocator4() {
+  std::vector<some_struct, mi_heap_stl_allocator<some_struct> > vec;
+  vec.push_back(some_struct());
+  vec.pop_back();
+  return vec.size() == 0;
+}
+
+static bool test_stl_allocator5() {
+  std::vector<int, mi_heap_destroy_stl_allocator<int> > vec;
+  vec.push_back(1);
+  vec.pop_back();
+  return vec.size() == 0;
+}
+
+static bool test_stl_allocator6() {
+  std::vector<some_struct, mi_heap_destroy_stl_allocator<some_struct> > vec;
+  vec.push_back(some_struct());
+  vec.pop_back();
+  return vec.size() == 0;
+}
+#endif
+
+static void test_stl_allocators() {
+  test_stl_allocator1();
+  test_stl_allocator2();
+#if MI_HAS_HEAP_STL_ALLOCATOR
+  test_stl_allocator3();
+  test_stl_allocator4();
+  test_stl_allocator5();
+  test_stl_allocator6();
+#endif
+}
+
+#if 0
+#include <algorithm>
+#include <chrono>
+#include <functional>
+#include <iostream>
+#include <thread>
+#include <vector>
+
+static void test_mixed0() {
+    std::vector<std::unique_ptr<std::size_t>> numbers(1024 * 1024 * 100);
+    std::vector<std::thread> threads(1);
+
+    std::atomic<std::size_t> index{};
+
+    auto start = std::chrono::system_clock::now();
+
+    for (auto& thread : threads) {
+        thread = std::thread{[&index, &numbers]() {
+            while (true) {
+                auto i = index.fetch_add(1, std::memory_order_relaxed);
+                if (i >= numbers.size()) return;
+
+                numbers[i] = std::make_unique<std::size_t>(i);
+            }
+        }};
+    }
+
+    for (auto& thread : threads) thread.join();
+
+    auto end = std::chrono::system_clock::now();
+
+    auto duration =
+        std::chrono::duration_cast<std::chrono::milliseconds>(end - start);
+    std::cout << "Running on " << threads.size() << " threads took " << duration
+              << std::endl;
+}
+#endif
+
+void asd() {
+  void* p = malloc(128);
+  free(p);
+}
+static void test_mixed1() {
+    std::thread thread(asd);
+    thread.join();
+}
+
+#if 0
+// issue #691
+static char* cptr;
+
+static void* thread1_allocate()
+{
+  cptr = mi_calloc_tp(char,22085632);
+  return NULL;
+}
+
+static void* thread2_free()
+{
+  assert(cptr);
+  mi_free(cptr);
+  cptr = NULL;
+  return NULL;
+}
+
+static void test_large_migrate(void) {
+  auto t1 = std::thread(thread1_allocate);
+  t1.join();
+  auto t2 = std::thread(thread2_free);
+  t2.join();
+  /*
+  pthread_t thread1, thread2;
+
+  pthread_create(&thread1, NULL, &thread1_allocate, NULL);
+  pthread_join(thread1, NULL);
+
+  pthread_create(&thread2, NULL, &thread2_free, NULL);
+  pthread_join(thread2, NULL);
+  */
+  return;
+}
+#endif
+
 // issue 445
 static void strdup_test() {
 #ifdef _MSC_VER
@@ -142,7 +302,7 @@ static void strdup_test() {
 // Issue #202
 static void heap_no_delete_worker() {
   mi_heap_t* heap = mi_heap_new();
-  void* q = mi_heap_malloc(heap, 1024);
+  void* q = mi_heap_malloc(heap, 1024); (void)(q);
   // mi_heap_delete(heap); // uncomment to prevent assertion
 }
 
@@ -152,6 +312,13 @@ static void heap_no_delete() {
 }
 
 
+// Issue #697
+static void test_std_string() {
+  std::string path = "/Users/xxxx/Library/Developer/Xcode/DerivedData/xxxxxxxxxx/Build/Intermediates.noindex/xxxxxxxxxxx/arm64/XX_lto.o/0.arm64.lto.o";
+  std::string path1 = "/Users/xxxx/Library/Developer/Xcode/DerivedData/xxxxxxxxxx/Build/Intermediates.noindex/xxxxxxxxxxx/arm64/XX_lto.o/1.arm64.lto.o";
+  std::cout << path + "\n>>>            " + path1 + "\n>>>            " << std::endl;
+}
+
 // Issue #204
 static volatile void* global_p;
 
@@ -193,12 +360,23 @@ static void heap_thread_free_large_worker() {
 
 static void heap_thread_free_large() {
   for (int i = 0; i < 100; i++) {
-    shared_p = mi_malloc_aligned(2 * 1024 * 1024 + 1, 8);
+    shared_p = mi_malloc_aligned(2*1024*1024 + 1, 8);
     auto t1 = std::thread(heap_thread_free_large_worker);
     t1.join();
   }
 }
 
+static void heap_thread_free_huge_worker() {
+  mi_free(shared_p);
+}
+
+static void heap_thread_free_huge() {
+  for (int i = 0; i < 10; i++) {
+    shared_p = mi_malloc(1024 * 1024 * 1024);
+    auto t1 = std::thread(heap_thread_free_huge_worker);
+    t1.join();
+  }
+}
 
 
 static void test_mt_shutdown()
@@ -225,21 +403,9 @@ static void test_mt_shutdown()
   std::cout << "done" << std::endl;
 }
 
-// issue #363
-using namespace std;
-
-void large_alloc(void)
-{
-  char* a = new char[1ull << 25];
-  thread th([&] {
-    delete[] a;
-    });
-  th.join();
-}
-
 // issue #372
 static void fail_aslr() {
-  size_t sz = (4ULL << 40); // 4TiB
+  size_t sz = (size_t)(4ULL << 40); // 4TiB
   void* p = malloc(sz);
   printf("pointer p: %p: area up to %p\n", p, (uint8_t*)p + sz);
   *(int*)0x5FFFFFFF000 = 0;  // should segfault
@@ -257,33 +423,30 @@ static void tsan_numa_test() {
   t1.join();
 }
 
-// issue #?
-#include <chrono>
-#include <random>
-#include <iostream>
 
-static void bench_alloc_large(void) {
-  static constexpr int kNumBuffers = 20;
-  static constexpr size_t kMinBufferSize = 5 * 1024 * 1024;
-  static constexpr size_t kMaxBufferSize = 25 * 1024 * 1024;
-  std::unique_ptr<char[]> buffers[kNumBuffers];
-
-  std::random_device rd;
-  std::mt19937 gen(42); //rd());
-  std::uniform_int_distribution<> size_distribution(kMinBufferSize, kMaxBufferSize);
-  std::uniform_int_distribution<> buf_number_distribution(0, kNumBuffers - 1);
-
-  static constexpr int kNumIterations = 2000;
-  const auto start = std::chrono::steady_clock::now();
-  for (int i = 0; i < kNumIterations; ++i) {
-    int buffer_idx = buf_number_distribution(gen);
-    size_t new_size = size_distribution(gen);
-    buffers[buffer_idx] = std::make_unique<char[]>(new_size);
-  }
-  const auto end = std::chrono::steady_clock::now();
-  const auto num_ms = std::chrono::duration_cast<std::chrono::milliseconds>(end - start).count();
-  const auto us_per_allocation = std::chrono::duration_cast<std::chrono::microseconds>(end - start).count() / kNumIterations;
-  std::cout << kNumIterations << " allocations Done in " << num_ms << "ms." << std::endl;
-  std::cout << "Avg " << us_per_allocation << " us per allocation" << std::endl;
+class MTest
+{
+    char *data;
+public:
+    MTest() { data = (char*)malloc(1024); }
+    ~MTest() { free(data); };
+};
+
+thread_local MTest tlVariable;
+
+void threadFun( int i )
+{
+    printf( "Thread %d\n", i );
+    std::this_thread::sleep_for( std::chrono::milliseconds(100) );
 }
 
+void test_thread_local()
+{
+    for( int i=1; i < 100; ++i )
+    {
+        std::thread t( threadFun, i );
+        t.join();
+        mi_stats_print(NULL);
+    }
+    return;
+}
\ No newline at end of file
diff --git a/depends/mimalloc/test/test-api-fill.c b/depends/mimalloc/test/test-api-fill.c
index c205637c359c..eebbd394ef83 100644
--- a/depends/mimalloc/test/test-api-fill.c
+++ b/depends/mimalloc/test/test-api-fill.c
@@ -5,7 +5,7 @@ terms of the MIT license. A copy of the license can be found in the file
 "LICENSE" at the root of this distribution.
 -----------------------------------------------------------------------------*/
 #include "mimalloc.h"
-#include "mimalloc-types.h"
+#include "mimalloc/types.h"
 
 #include "testhelper.h"
 
@@ -164,7 +164,7 @@ int main(void) {
     mi_free(p);
   };
 
-#if MI_DEBUG >= 2
+#if (MI_DEBUG >= 2) && !MI_TSAN
   // ---------------------------------------------------
   // Debug filling
   // ---------------------------------------------------
@@ -271,7 +271,7 @@ int main(void) {
     mi_free(p);
   };
 
-
+  #if !(MI_TRACK_VALGRIND || MI_TRACK_ASAN || MI_GUARDED)
   CHECK_BODY("fill-freed-small") {
     size_t malloc_size = MI_SMALL_SIZE_MAX / 2;
     uint8_t* p = (uint8_t*)mi_malloc(malloc_size);
@@ -286,6 +286,7 @@ int main(void) {
     // First sizeof(void*) bytes will contain housekeeping data, skip these
     result = check_debug_fill_freed(p + sizeof(void*), malloc_size - sizeof(void*));
   };
+  #endif
 #endif
 
   // ---------------------------------------------------
@@ -309,7 +310,7 @@ bool check_zero_init(uint8_t* p, size_t size) {
 
 #if MI_DEBUG >= 2
 bool check_debug_fill_uninit(uint8_t* p, size_t size) {
-#if MI_VALGRIND
+#if MI_TRACK_VALGRIND || MI_TRACK_ASAN
   (void)p; (void)size;
   return true; // when compiled with valgrind we don't init on purpose
 #else
@@ -325,10 +326,10 @@ bool check_debug_fill_uninit(uint8_t* p, size_t size) {
 }
 
 bool check_debug_fill_freed(uint8_t* p, size_t size) {
-#if MI_VALGRIND
+#if MI_TRACK_VALGRIND
   (void)p; (void)size;
   return true; // when compiled with valgrind we don't fill on purpose
-#else  
+#else
   if(!p)
     return false;
 
@@ -337,6 +338,6 @@ bool check_debug_fill_freed(uint8_t* p, size_t size) {
     result &= p[i] == MI_DEBUG_FREED;
   }
   return result;
-#endif  
+#endif
 }
 #endif
diff --git a/depends/mimalloc/test/test-api.c b/depends/mimalloc/test/test-api.c
index 3c2ef7e43fdf..fa8fc3cd5271 100644
--- a/depends/mimalloc/test/test-api.c
+++ b/depends/mimalloc/test/test-api.c
@@ -33,8 +33,8 @@ we therefore test the API over various inputs. Please add more tests :-)
 #endif
 
 #include "mimalloc.h"
-// #include "mimalloc-internal.h"
-#include "mimalloc-types.h" // for MI_DEBUG
+// #include "mimalloc/internal.h"
+#include "mimalloc/types.h" // for MI_DEBUG and MI_PAGE_MAX_OVERALLOC_ALIGN
 
 #include "testhelper.h"
 
@@ -46,27 +46,54 @@ bool test_heap2(void);
 bool test_stl_allocator1(void);
 bool test_stl_allocator2(void);
 
+bool test_stl_heap_allocator1(void);
+bool test_stl_heap_allocator2(void);
+bool test_stl_heap_allocator3(void);
+bool test_stl_heap_allocator4(void);
+
+bool mem_is_zero(uint8_t* p, size_t size) {
+  if (p==NULL) return false;
+  for (size_t i = 0; i < size; ++i) {
+    if (p[i] != 0) return false;
+  }
+  return true;
+}
+
 // ---------------------------------------------------------------------------
 // Main testing
 // ---------------------------------------------------------------------------
 int main(void) {
   mi_option_disable(mi_option_verbose);
 
+  CHECK_BODY("malloc-aligned9a") { // test large alignments
+    void* p = mi_zalloc_aligned(1024 * 1024, 2);
+    mi_free(p);
+    p = mi_zalloc_aligned(1024 * 1024, 2);
+    mi_free(p);
+    result = true;
+  };
+  
+
   // ---------------------------------------------------
   // Malloc
   // ---------------------------------------------------
 
   CHECK_BODY("malloc-zero") {
-    void* p = mi_malloc(0); 
+    void* p = mi_malloc(0);
     result = (p != NULL);
     mi_free(p);
   };
   CHECK_BODY("malloc-nomem1") {
     result = (mi_malloc((size_t)PTRDIFF_MAX + (size_t)1) == NULL);
   };
-  CHECK_BODY("malloc-null") {
+  CHECK_BODY("malloc-free-null") {
     mi_free(NULL);
   };
+  #if MI_INTPTR_BITS > 32
+  CHECK_BODY("malloc-free-invalid-low") {
+    mi_free((void*)(MI_ZU(0x0000000003990080))); // issue #1087
+  };
+  #endif
   CHECK_BODY("calloc-overflow") {
     // use (size_t)&mi_calloc to get some number without triggering compiler warnings
     result = (mi_calloc((size_t)&mi_calloc,SIZE_MAX/1000) == NULL);
@@ -83,7 +110,7 @@ int main(void) {
 
   // ---------------------------------------------------
   // Extended
-  // ---------------------------------------------------  
+  // ---------------------------------------------------
   CHECK_BODY("posix_memalign1") {
     void* p = &p;
     int err = mi_posix_memalign(&p, sizeof(void*), 32);
@@ -122,7 +149,7 @@ int main(void) {
     void* p = mi_malloc_aligned(48,32); result = (p != NULL && (uintptr_t)(p) % 32 == 0); mi_free(p);
   };
   CHECK_BODY("malloc-aligned3") {
-    void* p1 = mi_malloc_aligned(48,32); bool result1 = (p1 != NULL && (uintptr_t)(p1) % 32 == 0); 
+    void* p1 = mi_malloc_aligned(48,32); bool result1 = (p1 != NULL && (uintptr_t)(p1) % 32 == 0);
     void* p2 = mi_malloc_aligned(48,32); bool result2 = (p2 != NULL && (uintptr_t)(p2) % 32 == 0);
     mi_free(p2);
     mi_free(p1);
@@ -138,18 +165,20 @@ int main(void) {
     result = ok;
   };
   CHECK_BODY("malloc-aligned5") {
-    void* p = mi_malloc_aligned(4097,4096); 
-    size_t usable = mi_usable_size(p); 
-    result = (usable >= 4097 && usable < 16000); 
-    printf("malloc_aligned5: usable size: %zi\n", usable);
+    void* p = mi_malloc_aligned(4097,4096);
+    size_t usable = mi_usable_size(p);
+    result = (usable >= 4097 && usable < 16000);
+    fprintf(stderr, "malloc_aligned5: usable size: %zi.  ", usable);
     mi_free(p);
   };
+  /*
   CHECK_BODY("malloc-aligned6") {
     bool ok = true;
-    for (size_t align = 1; align <= MI_ALIGNMENT_MAX && ok; align *= 2) {
+    for (size_t align = 1; align <= MI_PAGE_MAX_OVERALLOC_ALIGN && ok; align *= 2) {
       void* ps[8];
       for (int i = 0; i < 8 && ok; i++) {
-        ps[i] = mi_malloc_aligned(align*13 /*size*/, align);
+        ps[i] = mi_malloc_aligned(align*13  // size
+                                 , align);
         if (ps[i] == NULL || (uintptr_t)(ps[i]) % align != 0) {
           ok = false;
         }
@@ -160,18 +189,98 @@ int main(void) {
     }
     result = ok;
   };
+  */
   CHECK_BODY("malloc-aligned7") {
-    void* p = mi_malloc_aligned(1024,MI_ALIGNMENT_MAX); mi_free(p);
-    };
+    void* p = mi_malloc_aligned(1024,MI_PAGE_MAX_OVERALLOC_ALIGN);
+    mi_free(p);
+    result = ((uintptr_t)p % MI_PAGE_MAX_OVERALLOC_ALIGN) == 0;
+  };
   CHECK_BODY("malloc-aligned8") {
-    void* p = mi_malloc_aligned(1024,2*MI_ALIGNMENT_MAX); mi_free(p);
+    bool ok = true;
+    for (int i = 0; i < 5 && ok; i++) {
+      int n = (1 << i);
+      void* p = mi_malloc_aligned(1024, n * MI_PAGE_MAX_OVERALLOC_ALIGN);
+      ok = ((uintptr_t)p % (n*MI_PAGE_MAX_OVERALLOC_ALIGN)) == 0;
+      mi_free(p);
+    }
+    result = ok;
+  };
+  CHECK_BODY("malloc-aligned9") { // test large alignments
+    bool ok = true;
+    void* p[8];
+    const int max_align_shift = 
+      #if SIZE_MAX > UINT32_MAX
+      28
+      #else
+      20
+      #endif
+      ;
+    size_t sizes[8] = { 8, 512, 1024 * 1024, MI_PAGE_MAX_OVERALLOC_ALIGN, MI_PAGE_MAX_OVERALLOC_ALIGN + 1, 2 * MI_PAGE_MAX_OVERALLOC_ALIGN, 8 * MI_PAGE_MAX_OVERALLOC_ALIGN, 0 };
+    for (int i = 0; i < max_align_shift && ok; i++) {
+      int align = (1 << i);
+      for (int j = 0; j < 8 && ok; j++) {
+        p[j] = mi_zalloc_aligned(sizes[j], align);
+        ok = ((uintptr_t)p[j] % align) == 0;
+      }
+      for (int j = 0; j < 8; j++) {
+        mi_free(p[j]);
+      }
+    }
+    result = ok;
   };
+  CHECK_BODY("malloc-aligned10") {
+    bool ok = true;
+    void* p[10+1];
+    int align;
+    int j;
+    for(j = 0, align = 1; j <= 10 && ok; align *= 2, j++ ) {
+      p[j] = mi_malloc_aligned(43 + align, align);
+      ok = ((uintptr_t)p[j] % align) == 0;
+    }
+    for ( ; j > 0; j--) {
+      mi_free(p[j-1]);
+    }
+    result = ok;
+  }
+  CHECK_BODY("malloc_aligned11") {
+    mi_heap_t* heap = mi_heap_new();
+    void* p = mi_heap_malloc_aligned(heap, 33554426, 8);
+    result = mi_heap_contains_block(heap, p);
+    mi_heap_destroy(heap);
+  }
+  CHECK_BODY("mimalloc-aligned12") {
+    void* p = mi_malloc_aligned(0x100, 0x100);
+    result = (((uintptr_t)p % 0x100) == 0); // #602
+    mi_free(p);
+  }
+  CHECK_BODY("mimalloc-aligned13") {
+    bool ok = true;
+    for( size_t size = 1; size <= (MI_SMALL_SIZE_MAX * 2) && ok; size++ ) {
+      for(size_t align = 1; align <= size && ok; align *= 2 ) {
+        void* p[10];
+        for(int i = 0; i < 10 && ok; i++) {
+          p[i] = mi_malloc_aligned(size,align);;
+          ok = (p[i] != NULL && ((uintptr_t)(p[i]) % align) == 0);
+        }
+        for(int i = 0; i < 10 && ok; i++) {
+          mi_free(p[i]);
+        }       
+        /*
+        if (ok && align <= size && ((size + MI_PADDING_SIZE) & (align-1)) == 0) {
+          size_t bsize = mi_good_size(size);
+          ok = (align <= bsize && (bsize & (align-1)) == 0);
+        }
+        */
+      }
+    }
+    result = ok;
+  }
   CHECK_BODY("malloc-aligned-at1") {
     void* p = mi_malloc_aligned_at(48,32,0); result = (p != NULL && ((uintptr_t)(p) + 0) % 32 == 0); mi_free(p);
   };
   CHECK_BODY("malloc-aligned-at2") {
     void* p = mi_malloc_aligned_at(50,32,8); result = (p != NULL && ((uintptr_t)(p) + 8) % 32 == 0); mi_free(p);
-  };  
+  };
   CHECK_BODY("memalign1") {
     void* p;
     bool ok = true;
@@ -181,7 +290,22 @@ int main(void) {
     }
     result = ok;
   };
-  
+  CHECK_BODY("zalloc-aligned-small1") {
+    size_t zalloc_size = MI_SMALL_SIZE_MAX / 2;
+    uint8_t* p = (uint8_t*)mi_zalloc_aligned(zalloc_size, MI_MAX_ALIGN_SIZE * 2);
+    result = mem_is_zero(p, zalloc_size);
+    mi_free(p);
+  };
+  CHECK_BODY("rezalloc_aligned-small1") {
+    size_t zalloc_size = MI_SMALL_SIZE_MAX / 2;
+    uint8_t* p = (uint8_t*)mi_zalloc_aligned(zalloc_size, MI_MAX_ALIGN_SIZE * 2);
+    result = mem_is_zero(p, zalloc_size);
+    zalloc_size *= 3;
+    p = (uint8_t*)mi_rezalloc_aligned(p, zalloc_size, MI_MAX_ALIGN_SIZE * 2);
+    result = result && mem_is_zero(p, zalloc_size);
+    mi_free(p);
+  };
+
   // ---------------------------------------------------
   // Reallocation
   // ---------------------------------------------------
@@ -221,15 +345,22 @@ int main(void) {
   // ---------------------------------------------------
   // various
   // ---------------------------------------------------
+  #if !defined(MI_TRACK_ASAN)   // realpath may leak with ASAN enabled (as the ASAN allocator intercepts it)
   CHECK_BODY("realpath") {
     char* s = mi_realpath( ".", NULL );
     // printf("realpath: %s\n",s);
     mi_free(s);
   };
+  #endif
 
   CHECK("stl_allocator1", test_stl_allocator1());
   CHECK("stl_allocator2", test_stl_allocator2());
 
+	CHECK("stl_heap_allocator1", test_stl_heap_allocator1());
+	CHECK("stl_heap_allocator2", test_stl_heap_allocator2());
+	CHECK("stl_heap_allocator3", test_stl_heap_allocator3());
+	CHECK("stl_heap_allocator4", test_stl_heap_allocator4());
+
   // ---------------------------------------------------
   // Done
   // ---------------------------------------------------[]
@@ -240,7 +371,7 @@ int main(void) {
 // Larger test functions
 // ---------------------------------------------------
 
-bool test_heap1() {
+bool test_heap1(void) {
   mi_heap_t* heap = mi_heap_new();
   int* p1 = mi_heap_malloc_tp(heap,int);
   int* p2 = mi_heap_malloc_tp(heap,int);
@@ -249,7 +380,7 @@ bool test_heap1() {
   return true;
 }
 
-bool test_heap2() {
+bool test_heap2(void) {
   mi_heap_t* heap = mi_heap_new();
   int* p1 = mi_heap_malloc_tp(heap,int);
   int* p2 = mi_heap_malloc_tp(heap,int);
@@ -260,7 +391,7 @@ bool test_heap2() {
   return true;
 }
 
-bool test_stl_allocator1() {
+bool test_stl_allocator1(void) {
 #ifdef __cplusplus
   std::vector<int, mi_stl_allocator<int> > vec;
   vec.push_back(1);
@@ -273,7 +404,7 @@ bool test_stl_allocator1() {
 
 struct some_struct  { int i; int j; double z; };
 
-bool test_stl_allocator2() {
+bool test_stl_allocator2(void) {
 #ifdef __cplusplus
   std::vector<some_struct, mi_stl_allocator<some_struct> > vec;
   vec.push_back(some_struct());
@@ -283,3 +414,61 @@ bool test_stl_allocator2() {
   return true;
 #endif
 }
+
+bool test_stl_heap_allocator1(void) {
+#ifdef __cplusplus
+  std::vector<some_struct, mi_heap_stl_allocator<some_struct> > vec;
+  vec.push_back(some_struct());
+  vec.pop_back();
+  return vec.size() == 0;
+#else
+  return true;
+#endif
+}
+
+bool test_stl_heap_allocator2(void) {
+#ifdef __cplusplus
+  std::vector<some_struct, mi_heap_destroy_stl_allocator<some_struct> > vec;
+  vec.push_back(some_struct());
+  vec.pop_back();
+  return vec.size() == 0;
+#else
+  return true;
+#endif
+}
+
+bool test_stl_heap_allocator3(void) {
+#ifdef __cplusplus
+	mi_heap_t* heap = mi_heap_new();
+	bool good = false;
+	{
+		mi_heap_stl_allocator<some_struct> myAlloc(heap);
+		std::vector<some_struct, mi_heap_stl_allocator<some_struct> > vec(myAlloc);
+		vec.push_back(some_struct());
+		vec.pop_back();
+		good = vec.size() == 0;
+	}
+	mi_heap_delete(heap);
+  return good;
+#else
+  return true;
+#endif
+}
+
+bool test_stl_heap_allocator4(void) {
+#ifdef __cplusplus
+	mi_heap_t* heap = mi_heap_new();
+	bool good = false;
+	{
+		mi_heap_destroy_stl_allocator<some_struct> myAlloc(heap);
+		std::vector<some_struct, mi_heap_destroy_stl_allocator<some_struct> > vec(myAlloc);
+		vec.push_back(some_struct());
+		vec.pop_back();
+		good = vec.size() == 0;
+	}
+	mi_heap_destroy(heap);
+  return good;
+#else
+  return true;
+#endif
+}
diff --git a/depends/mimalloc/test/test-stress.c b/depends/mimalloc/test/test-stress.c
index 61171d0389b7..a2e2b3776f35 100644
--- a/depends/mimalloc/test/test-stress.c
+++ b/depends/mimalloc/test/test-stress.c
@@ -7,7 +7,7 @@ terms of the MIT license.
 /* This is a stress test for the allocator, using multiple threads and
    transferring objects between threads. It tries to reflect real-world workloads:
    - allocation size is distributed linearly in powers of two
-   - with some fraction extra large (and some extra extra large)
+   - with some fraction extra large (and some very large)
    - the allocations are initialized and read again at free
    - pointers transfer between threads
    - threads are terminated and recreated with some objects surviving in between
@@ -20,33 +20,73 @@ terms of the MIT license.
 #include <stdint.h>
 #include <stdbool.h>
 #include <string.h>
+#include <assert.h>
+
+// #define MI_GUARDED
+// #define USE_STD_MALLOC
 
 // > mimalloc-test-stress [THREADS] [SCALE] [ITER]
 //
 // argument defaults
+#if defined(MI_TSAN)          // with thread-sanitizer reduce the threads to test within the azure pipeline limits
+static int THREADS = 8;
+static int SCALE   = 25;
+static int ITER    = 400;
+#elif defined(MI_UBSAN)       // with undefined behavious sanitizer reduce parameters to stay within the azure pipeline limits
+static int THREADS = 8;
+static int SCALE   = 25;
+static int ITER    = 20;
+#elif defined(MI_GUARDED)     // with debug guard pages reduce parameters to stay within the azure pipeline limits
+static int THREADS = 8;
+static int SCALE   = 10;
+static int ITER    = 10;
+#elif 0
+static int THREADS = 4;
+static int SCALE   = 10;
+static int ITER    = 20;
+#elif 0
+static int THREADS = 32;
+static int SCALE   = 50;
+static int ITER    = 50;
+#elif 0
+static int THREADS = 32;
+static int SCALE   = 25;
+static int ITER    = 50;
+#define ALLOW_LARGE true
+#else
 static int THREADS = 32;      // more repeatable if THREADS <= #processors
-static int SCALE   = 25;      // scaling factor
+static int SCALE   = 50;      // scaling factor
 static int ITER    = 50;      // N full iterations destructing and re-creating all threads
+#endif
 
-// static int THREADS = 8;    // more repeatable if THREADS <= #processors
-// static int SCALE   = 100;  // scaling factor
 
-#define STRESS   // undefine for leak test
 
-static bool   allow_large_objects = true;    // allow very large objects?
-static size_t use_one_size = 0;              // use single object size of `N * sizeof(uintptr_t)`?
+#define STRESS                // undefine for leak test
 
+#ifndef ALLOW_LARGE
+#define ALLOW_LARGE  false
+#endif
+
+static bool   allow_large_objects = ALLOW_LARGE;    // allow very large objects? (set to `true` if SCALE>100)
+
+static size_t use_one_size = 0;               // use single object size of `N * sizeof(uintptr_t)`?
+
+static bool   main_participates = false;       // main thread participates as a worker too
 
-// #define USE_STD_MALLOC
 #ifdef USE_STD_MALLOC
-#define custom_calloc(n,s)    malloc(n*s)
+#define custom_calloc(n,s)    calloc(n,s)
 #define custom_realloc(p,s)   realloc(p,s)
 #define custom_free(p)        free(p)
 #else
 #include <mimalloc.h>
-#define custom_calloc(n,s)    mi_malloc(n*s)
+#include <mimalloc-stats.h>
+#define custom_calloc(n,s)    mi_calloc(n,s)
 #define custom_realloc(p,s)   mi_realloc(p,s)
 #define custom_free(p)        mi_free(p)
+
+#ifndef NDEBUG
+#define xHEAP_WALK             // walk the heap objects?
+#endif
 #endif
 
 // transfer pointer between threads
@@ -95,12 +135,13 @@ static void* alloc_items(size_t items, random_t r) {
     else if (chance(10, r) && allow_large_objects) items *= 1000;  // 0.1% huge
     else items *= 100;                                             // 1% large objects;
   }
-  if (items == 40) items++;              // pthreads uses that size for stack increases
+  if (items>=32 && items<=40) items*=2;              // pthreads uses 320b allocations (this shows that more clearly in the stats)
   if (use_one_size > 0) items = (use_one_size / sizeof(uintptr_t));
   if (items==0) items = 1;
   uintptr_t* p = (uintptr_t*)custom_calloc(items,sizeof(uintptr_t));
   if (p != NULL) {
     for (uintptr_t i = 0; i < items; i++) {
+      assert(p[i] == 0);
       p[i] = (items - i) ^ cookie;
     }
   }
@@ -121,6 +162,16 @@ static void free_items(void* p) {
   custom_free(p);
 }
 
+#ifdef HEAP_WALK
+static bool visit_blocks(const mi_heap_t* heap, const mi_heap_area_t* area, void* block, size_t block_size, void* arg) {
+  (void)(heap); (void)(area);
+  size_t* total = (size_t*)arg;
+  if (block != NULL) {
+    *total += block_size;
+  }
+  return true;
+}
+#endif
 
 static void stress(intptr_t tid) {
   //bench_start_thread();
@@ -165,6 +216,13 @@ static void stress(intptr_t tid) {
       data[data_idx] = q;
     }
   }
+
+  #ifdef HEAP_WALK
+  // walk the heap
+  size_t total = 0;
+  mi_heap_visit_blocks(mi_heap_get_default(), true, visit_blocks, &total);
+  #endif
+
   // free everything that is left
   for (size_t i = 0; i < retain_top; i++) {
     free_items(retained[i]);
@@ -182,7 +240,15 @@ static void run_os_threads(size_t nthreads, void (*entry)(intptr_t tid));
 static void test_stress(void) {
   uintptr_t r = rand();
   for (int n = 0; n < ITER; n++) {
-    run_os_threads(THREADS, &stress);    
+    run_os_threads(THREADS, &stress);
+    #if !defined(NDEBUG) && !defined(USE_STD_MALLOC)
+    // switch between arena and OS allocation for testing
+    // mi_option_set_enabled(mi_option_disallow_arena_alloc, (n%2)==1);
+    #endif
+    #ifdef HEAP_WALK
+    size_t total = 0;
+    mi_abandoned_visit_blocks(mi_subproc_main(), -1, true, visit_blocks, &total);
+    #endif
     for (int i = 0; i < TRANSFERS; i++) {
       if (chance(50, &r) || n + 1 == ITER) { // free all on last run, otherwise free half of the transfers
         void* p = atomic_exchange_ptr(&transfer[i], NULL);
@@ -191,12 +257,26 @@ static void test_stress(void) {
     }
     #ifndef NDEBUG
     //mi_collect(false);
-    //mi_debug_show_arenas();
-    #endif    
+    //mi_debug_show_arenas(true);
+    #endif
     #if !defined(NDEBUG) || defined(MI_TSAN)
-    if ((n + 1) % 10 == 0) { printf("- iterations left: %3d\n", ITER - (n + 1)); }
+    if ((n + 1) % 10 == 0) {
+      printf("- iterations left: %3d\n", ITER - (n + 1));
+      #ifndef USE_STD_MALLOC
+      mi_debug_show_arenas();
+      #endif
+      //mi_collect(true);
+      //mi_debug_show_arenas();
+    }
     #endif
   }
+  // clean up
+  for (int i = 0; i < TRANSFERS; i++) {
+    void* p = atomic_exchange_ptr(&transfer[i], NULL);
+    if (p != NULL) {
+      free_items(p);
+    }
+  }
 }
 
 #ifndef STRESS
@@ -221,7 +301,29 @@ static void test_leak(void) {
 }
 #endif
 
-int main(int argc, char** argv) {  
+#if defined(USE_STD_MALLOC) && defined(MI_LINK_VERSION)
+#ifdef __cplusplus
+extern "C"
+#endif
+int mi_version(void);
+#endif
+
+int main(int argc, char** argv) {
+  #ifdef MI_LINK_VERSION
+    mi_version();
+  #endif
+  #ifdef HEAP_WALK
+    mi_option_enable(mi_option_visit_abandoned);
+  #endif
+  #if !defined(NDEBUG) && !defined(USE_STD_MALLOC)
+    // mi_option_set(mi_option_arena_reserve, 32 * 1024 /* in kib = 32MiB */);
+    // mi_option_set(mi_option_purge_delay,1);
+  #endif
+  #if defined(NDEBUG) && !defined(USE_STD_MALLOC)
+    // mi_option_set(mi_option_purge_delay,-1);
+    mi_option_set(mi_option_page_reclaim_on_free, 0);
+  #endif
+
   // > mimalloc-test-stress [THREADS] [SCALE] [ITER]
   if (argc >= 2) {
     char* end;
@@ -238,7 +340,15 @@ int main(int argc, char** argv) {
     long n = (strtol(argv[3], &end, 10));
     if (n > 0) ITER = n;
   }
-  printf("Using %d threads with a %d%% load-per-thread and %d iterations\n", THREADS, SCALE, ITER);
+  if (SCALE > 100) {
+    allow_large_objects = true;
+  }
+  printf("Using %d threads with a %d%% load-per-thread and %d iterations %s\n", THREADS, SCALE, ITER, (allow_large_objects ? "(allow large objects)" : ""));
+
+  #if !defined(NDEBUG) && !defined(USE_STD_MALLOC)
+  mi_stats_reset();
+  #endif
+
   //mi_reserve_os_memory(1024*1024*1024ULL, false, true);
   //int res = mi_reserve_huge_os_pages(4,1);
   //printf("(reserve huge: %i\n)", res);
@@ -247,26 +357,26 @@ int main(int argc, char** argv) {
 
   // Run ITER full iterations where half the objects in the transfer buffer survive to the next round.
   srand(0x7feb352d);
-  
-  //mi_reserve_os_memory(512ULL << 20, true, true);
-
-#if !defined(NDEBUG) && !defined(USE_STD_MALLOC)
-  mi_stats_reset();
-#endif
-
+  // mi_stats_reset();
 #ifdef STRESS
-  test_stress();
+    test_stress();
 #else
-  test_leak();
+    test_leak();
 #endif
 
 #ifndef USE_STD_MALLOC
   #ifndef NDEBUG
+  mi_debug_show_arenas();
   mi_collect(true);
-  //mi_debug_show_arenas();
+  char* json = mi_stats_get_json(0, NULL);
+  if (json != NULL) {
+    fputs(json,stderr);
+    mi_free(json);
+  }
   #endif
+  mi_collect(true);
   mi_stats_print(NULL);
-#endif  
+#endif
   //bench_end_program();
   return 0;
 }
@@ -276,7 +386,7 @@ static void (*thread_entry_fun)(intptr_t) = &stress;
 
 #ifdef _WIN32
 
-#include <Windows.h>
+#include <windows.h>
 
 static DWORD WINAPI thread_entry(LPVOID param) {
   thread_entry_fun((intptr_t)param);
@@ -287,13 +397,16 @@ static void run_os_threads(size_t nthreads, void (*fun)(intptr_t)) {
   thread_entry_fun = fun;
   DWORD* tids = (DWORD*)custom_calloc(nthreads,sizeof(DWORD));
   HANDLE* thandles = (HANDLE*)custom_calloc(nthreads,sizeof(HANDLE));
-  for (uintptr_t i = 0; i < nthreads; i++) {
-    thandles[i] = CreateThread(0, 8*1024, &thread_entry, (void*)(i), 0, &tids[i]);
+  thandles[0] = GetCurrentThread(); // avoid lint warning
+  const size_t start = (main_participates ? 1 : 0);
+  for (size_t i = start; i < nthreads; i++) {
+    thandles[i] = CreateThread(0, 8*1024L, &thread_entry, (void*)(i), 0, &tids[i]);
   }
-  for (size_t i = 0; i < nthreads; i++) {
+  if (main_participates) fun(0); // run the main thread as well
+  for (size_t i = start; i < nthreads; i++) {
     WaitForSingleObject(thandles[i], INFINITE);
   }
-  for (size_t i = 0; i < nthreads; i++) {
+  for (size_t i = start; i < nthreads; i++) {
     CloseHandle(thandles[i]);
   }
   custom_free(tids);
@@ -320,11 +433,13 @@ static void run_os_threads(size_t nthreads, void (*fun)(intptr_t)) {
   thread_entry_fun = fun;
   pthread_t* threads = (pthread_t*)custom_calloc(nthreads,sizeof(pthread_t));
   memset(threads, 0, sizeof(pthread_t) * nthreads);
+  const size_t start = (main_participates ? 1 : 0);
   //pthread_setconcurrency(nthreads);
-  for (size_t i = 0; i < nthreads; i++) {
+  for (size_t i = start; i < nthreads; i++) {
     pthread_create(&threads[i], NULL, &thread_entry, (void*)i);
   }
-  for (size_t i = 0; i < nthreads; i++) {
+  if (main_participates) fun(0); // run the main thread as well
+  for (size_t i = start; i < nthreads; i++) {
     pthread_join(threads[i], NULL);
   }
   custom_free(threads);
diff --git a/depends/mimalloc/test/test-wrong.c b/depends/mimalloc/test/test-wrong.c
index 8bf7767edb4d..56a2339a7554 100644
--- a/depends/mimalloc/test/test-wrong.c
+++ b/depends/mimalloc/test/test-wrong.c
@@ -5,20 +5,42 @@ terms of the MIT license. A copy of the license can be found in the file
 "LICENSE" at the root of this distribution.
 -----------------------------------------------------------------------------*/
 
-/* test file for valgrind support.
+/* test file for valgrind/asan support.
+
+   VALGRIND:
+   ----------
    Compile in an "out/debug" folder:
 
    > cd out/debug
-   > cmake ../.. -DMI_VALGRIND=1
+   > cmake ../.. -DMI_TRACK_VALGRIND=1
    > make -j8
 
-   and then compile this file as: 
+   and then compile this file as:
 
    > gcc -g -o test-wrong -I../../include ../../test/test-wrong.c libmimalloc-valgrind-debug.a -lpthread
 
    and test as:
 
    > valgrind ./test-wrong
+
+   
+   ASAN
+   ----------
+   Compile in an "out/debug" folder:
+
+   > cd out/debug
+   > cmake ../.. -DMI_TRACK_ASAN=1
+   > make -j8
+
+   and then compile this file as:
+
+   > clang -g -o test-wrong -I../../include ../../test/test-wrong.c libmimalloc-asan-debug.a -lpthread -fsanitize=address -fsanitize-recover=address
+
+   and test as:
+
+   > ASAN_OPTIONS=verbosity=1:halt_on_error=0 ./test-wrong
+
+
 */
 #include <stdio.h>
 #include <stdlib.h>
@@ -31,9 +53,9 @@ terms of the MIT license. A copy of the license can be found in the file
 #endif
 
 int main(int argc, char** argv) {
-  int* p = mi(malloc)(3*sizeof(int));
-  
-  int* r = mi_malloc_aligned(8,16);
+  int* p = (int*)mi(malloc)(3*sizeof(int));
+
+  int* r = (int*)mi_malloc_aligned(8,16);
   mi_free(r);
 
   // illegal byte wise read
@@ -42,12 +64,12 @@ int main(int argc, char** argv) {
   mi(free)(c);
 
   // undefined access
-  int* q = mi(malloc)(sizeof(int));
+  int* q = (int*)mi(malloc)(sizeof(int));
   printf("undefined: %d\n", *q);
 
   // illegal int read
   printf("invalid: over: %d, under: %d\n", q[1], q[-1]);
-  
+
   *q = 42;
 
   // buffer overflow
@@ -55,7 +77,7 @@ int main(int argc, char** argv) {
 
   // buffer underflow
   q[-1] = 44;
-  
+
   mi(free)(q);
 
   // double free
@@ -66,5 +88,5 @@ int main(int argc, char** argv) {
 
   // leak p
   // mi_free(p)
-  return 0;  
+  return 0;
 }
\ No newline at end of file
diff --git a/depends/mimalloc/test/testhelper.h b/depends/mimalloc/test/testhelper.h
index 44776b74b337..a97275841177 100644
--- a/depends/mimalloc/test/testhelper.h
+++ b/depends/mimalloc/test/testhelper.h
@@ -19,12 +19,12 @@ static int failed = 0;
 
 static bool check_result(bool result, const char* testname, const char* fname, long lineno) {
   if (!(result)) {
-    failed++; 
+    failed++;
     fprintf(stderr,"\n  FAILED: %s: %s:%ld\n", testname, fname, lineno);
-    /* exit(1); */ 
-  } 
-  else {    
-    ok++;                               
+    /* exit(1); */
+  }
+  else {
+    ok++;
     fprintf(stderr, "ok.\n");
   }
   return true;
diff --git a/depends/relic/CMakeLists.txt b/depends/relic/CMakeLists.txt
index 58bf27a5a40f..db36c9bb7d46 100644
--- a/depends/relic/CMakeLists.txt
+++ b/depends/relic/CMakeLists.txt
@@ -1,7 +1,5 @@
-cmake_minimum_required(VERSION 3.14)
-if(NOT ${CMAKE_VERSION} VERSION_LESS "3.1")
-	cmake_policy(SET CMP0054 NEW)
-endif()
+cmake_minimum_required(VERSION 3.18)
+cmake_policy(SET CMP0054 NEW)
 
 project(RELIC C CXX)
 set(PROJECT_VERSION_MAJOR "0")
diff --git a/go-bindings/Makefile b/go-bindings/Makefile
index c7a57e7307d7..dcea3f24f2d3 100644
--- a/go-bindings/Makefile
+++ b/go-bindings/Makefile
@@ -1,29 +1,59 @@
-SRC_DIR=$(PWD)/../src
-BUILD_DIR=$(PWD)/../build
+export CGO_ENABLED := 1
+GO=go
 
-GO="go"
-COVERAGE_OUTPUT ?= coverage.out
-
-.PHONY: default vet test clean
+OS := $(shell uname -s)
+ARCH := $(shell uname -m)
 
-default: prepare vet test clean
+COVERAGE_OUTPUT ?= coverage.out
 
 MAKEFILE_PATH := $(abspath $(lastword $(MAKEFILE_LIST)))
+
+BUILD_DIR=$(CURDIR)/../build
 CURR_DIR := $(dir $(MAKEFILE_PATH))
+SRC_DIR=$(CURDIR)/../src
 
-CGO_ENABLED := 1
+GMP_PREFIX := /usr/local
 
-CGO_LDFLAGS ?= "\
--L$(CURR_DIR)../build/depends/mimalloc \
--L$(CURR_DIR)../build/depends/relic/lib \
--L$(CURR_DIR)../build/src \
--ldashbls -lrelic_s -lmimalloc-secure -lgmp"
+ifeq ("$(OS)", "Darwin")
+  ifneq ($(wildcard /opt/local/bin/port),)
+    GMP_PREFIX := /opt/local
+  endif
+  ifeq ("$(ARCH)", "arm64")
+    ifneq ($(wildcard /opt/homebrew/bin/brew),)
+      GMP_PREFIX := /opt/homebrew
+    endif
+  endif
+else ifeq ("$(OS)", "Linux")
+  ifneq ($(wildcard /home/linuxbrew/.linuxbrew/bin/brew),)
+    GMP_PREFIX := /home/linuxbrew/.linuxbrew
+  endif
+endif
+
+MIMALLOC_LIB := mimalloc-secure
+MIMALLOC_LIB_PATH := $(CURR_DIR)../build/depends/mimalloc
+
+ifneq ($(wildcard $(MIMALLOC_LIB_PATH)/libmimalloc-secure-debug.a),)
+  MIMALLOC_LIB := mimalloc-secure-debug
+endif
 
 CGO_CXXFLAGS ?= "\
 -I$(CURR_DIR)../build/depends/relic/include \
 -I$(CURR_DIR)../depends/mimalloc/include \
 -I$(CURR_DIR)../depends/relic/include \
--I$(CURR_DIR)../include"
+-I$(CURR_DIR)../include \
+-I$(GMP_PREFIX)/include"
+
+CGO_LDFLAGS ?= "\
+-L$(CURR_DIR)../build/src -ldashbls \
+-L$(MIMALLOC_LIB_PATH) -l$(MIMALLOC_LIB) \
+-L$(CURR_DIR)../build/depends/relic/lib -lrelic_s \
+-L$(GMP_PREFIX)/lib -lgmp"
+
+.PHONY: default prepare fmt test cover vet help clean config
+
+all: default
+
+default: prepare vet test clean
 
 prepare:
 	@mkdir -p ../build/src/dashbls
@@ -42,7 +72,7 @@ cover:  ## Run tests and generate test coverage file, output coverage results an
 	rm -f $(COVERAGE_OUTPUT)
 
 vet:  ## Go vet all project code
-	CGO_CXXFLAGS=$(CGO_CXXFLAGS) CGO_LDFLAGS=$(CGO_LDFLAGS) go vet ./...
+	CGO_CXXFLAGS=$(CGO_CXXFLAGS) CGO_LDFLAGS=$(CGO_LDFLAGS) $(GO) vet ./...
 
 help: ## Show This Help
 	@for line in $$(cat Makefile | grep "##" | grep -v "grep" | sed  "s/:.*##/:/g" | sed "s/\ /!/g"); do verb=$$(echo $$line | cut -d ":" -f 1); desc=$$(echo $$line | cut -d ":" -f 2 | sed "s/!/\ /g"); printf "%-30s--%s\n" "$$verb" "$$desc"; done
@@ -50,3 +80,18 @@ help: ## Show This Help
 clean: ## Clean up transient (generated) files
 	$(GO) clean
 	rm -f $(COVERAGE_OUTPUT)
+
+config: ## Display build configuration
+	@echo ""
+	@echo "OS:           $(OS)"
+	@echo "ARCH:         $(ARCH)"
+	@echo ""
+	@echo "CC:           $${CC:-<not set>}"
+	@echo "CXX:          $${CXX:-<not set>}"
+	@echo "GO:           $(GO)"
+	@echo ""
+	@echo "GOROOT:       $${GOROOT:-<not set>}"
+	@echo ""
+	@echo "CGO_CXXFLAGS: $(CGO_CXXFLAGS)"
+	@echo "CGO_LDFLAGS:  $(CGO_LDFLAGS)"
+	@echo ""
diff --git a/go-bindings/elements.cpp b/go-bindings/elements.cpp
index fda47b2e6237..eb30fcec88ec 100644
--- a/go-bindings/elements.cpp
+++ b/go-bindings/elements.cpp
@@ -23,11 +23,11 @@ int CG1ElementSize() {
     return bls::G1Element::SIZE;
 }
 
-CG1Element CG1ElementFromBytes(const void* data, bool* didErr) {
+CG1Element CG1ElementFromBytes(const void* data, size_t len, bool* didErr) {
     bls::G1Element* el = nullptr;
     try {
         el = new bls::G1Element(
-            bls::G1Element::FromBytes(bls::Bytes((uint8_t*)(data), bls::G1Element::SIZE))
+            bls::G1Element::FromBytes(bls::Bytes((uint8_t*)data, len))
         );
     } catch(const std::exception& ex) {
         gErrMsg = ex.what();
@@ -93,11 +93,11 @@ int CG2ElementSize() {
     return bls::G2Element::SIZE;
 }
 
-CG2Element CG2ElementFromBytes(const void* data, bool* didErr) {
+CG2Element CG2ElementFromBytes(const void* data, size_t len, bool* didErr) {
     bls::G2Element* el = nullptr;
     try {
         el = new bls::G2Element(
-            bls::G2Element::FromBytes(bls::Bytes((uint8_t*)data, bls::G2Element::SIZE))
+            bls::G2Element::FromBytes(bls::Bytes((uint8_t*)data, len))
         );
         *didErr = false;
     } catch(const std::exception& ex) {
diff --git a/go-bindings/elements.go b/go-bindings/elements.go
index 013127677c7f..84548c17e1dd 100644
--- a/go-bindings/elements.go
+++ b/go-bindings/elements.go
@@ -14,8 +14,6 @@
 
 package blschia
 
-// #cgo LDFLAGS: -ldashbls -lrelic_s -lmimalloc-secure -lgmp
-// #cgo CXXFLAGS: -std=c++14
 // #include <stdbool.h>
 // #include <stdlib.h>
 // #include "elements.h"
@@ -40,7 +38,7 @@ func G1ElementFromBytes(data []byte) (*G1Element, error) {
 	defer C.free(cBytesPtr)
 	var cDidErr C.bool
 	el := G1Element{
-		val: C.CG1ElementFromBytes(cBytesPtr, &cDidErr),
+		val: C.CG1ElementFromBytes(cBytesPtr, C.size_t(len(data)), &cDidErr),
 	}
 	if bool(cDidErr) {
 		return nil, errFromC()
@@ -131,7 +129,7 @@ func G2ElementFromBytes(data []byte) (*G2Element, error) {
 	defer C.free(cBytesPtr)
 	var cDidErr C.bool
 	el := G2Element{
-		val: C.CG2ElementFromBytes(cBytesPtr, &cDidErr),
+		val: C.CG2ElementFromBytes(cBytesPtr, C.size_t(len(data)), &cDidErr),
 	}
 	if bool(cDidErr) {
 		return nil, errFromC()
diff --git a/go-bindings/elements.h b/go-bindings/elements.h
index 2a4c6e544b8d..a391534dc55d 100644
--- a/go-bindings/elements.h
+++ b/go-bindings/elements.h
@@ -27,7 +27,7 @@ typedef void* CPrivateKey;
 
 // G1Element
 int CG1ElementSize();
-CG1Element CG1ElementFromBytes(const void* data, bool* didErr);
+CG1Element CG1ElementFromBytes(const void* data, size_t len, bool* didErr);
 CG1Element CG1ElementGenerator();
 bool CG1ElementIsValid(const CG1Element el);
 uint32_t CG1ElementGetFingerprint(const CG1Element el);
@@ -40,7 +40,7 @@ void CG1ElementFree(const CG1Element el);
 
 // G2Element
 int CG2ElementSize();
-CG2Element CG2ElementFromBytes(const void* data, bool* didErr);
+CG2Element CG2ElementFromBytes(const void* data, size_t len, bool* didErr);
 CG2Element CG2ElementGenerator();
 bool CG2ElementIsValid(const CG2Element el);
 bool CG2ElementIsEqual(const CG2Element el1, const CG2Element el2);
diff --git a/go-bindings/privatekey.cpp b/go-bindings/privatekey.cpp
index cbe5fddf3a74..90b7f0aab696 100644
--- a/go-bindings/privatekey.cpp
+++ b/go-bindings/privatekey.cpp
@@ -20,12 +20,12 @@
 #include "utils.hpp"
 
 // private key bindings implementation
-CPrivateKey CPrivateKeyFromBytes(const void* data, const bool modOrder, bool* didErr) {
+CPrivateKey CPrivateKeyFromBytes(const void* data, size_t len, const bool modOrder, bool* didErr) {
     bls::PrivateKey* skPtr = nullptr;
     try {
         skPtr = new bls::PrivateKey(
             bls::PrivateKey::FromBytes(
-                bls::Bytes((uint8_t*)data, bls::PrivateKey::PRIVATE_KEY_SIZE),
+                bls::Bytes((uint8_t*)data, len),
                 modOrder
             )
         );
diff --git a/go-bindings/privatekey.go b/go-bindings/privatekey.go
index 1a47454b26e0..155338e834cb 100644
--- a/go-bindings/privatekey.go
+++ b/go-bindings/privatekey.go
@@ -14,8 +14,6 @@
 
 package blschia
 
-// #cgo LDFLAGS: -ldashbls -lrelic_s -lmimalloc-secure -lgmp
-// #cgo CXXFLAGS: -std=c++14
 // #include <stdbool.h>
 // #include <stdlib.h>
 // #include "privatekey.h"
@@ -38,7 +36,7 @@ func PrivateKeyFromBytes(data []byte, modOrder bool) (*PrivateKey, error) {
 	defer C.SecFree(cBytesPtr)
 	var cDidErr C.bool
 	sk := PrivateKey{
-		val: C.CPrivateKeyFromBytes(cBytesPtr, C.bool(modOrder), &cDidErr),
+		val: C.CPrivateKeyFromBytes(cBytesPtr, C.size_t(len(data)), C.bool(modOrder), &cDidErr),
 	}
 	if bool(cDidErr) {
 		return nil, errFromC()
diff --git a/go-bindings/privatekey.h b/go-bindings/privatekey.h
index 55d1c86ea852..13f3c5d3dd14 100644
--- a/go-bindings/privatekey.h
+++ b/go-bindings/privatekey.h
@@ -23,7 +23,7 @@ extern "C" {
 
 typedef void* CPrivateKey;
 
-CPrivateKey CPrivateKeyFromBytes(const void* data, const bool modOrder, bool* didErr);
+CPrivateKey CPrivateKeyFromBytes(const void* data, size_t len, const bool modOrder, bool* didErr);
 CPrivateKey CPrivateKeyAggregate(void** sks, const size_t len);
 CG1Element CPrivateKeyGetG1Element(const CPrivateKey sk, bool* didErr);
 CG2Element CPrivateKeyGetG2Element(const CPrivateKey sk, bool* didErr);
diff --git a/go-bindings/schemes.go b/go-bindings/schemes.go
index 21126f91258a..2289b212bd7d 100644
--- a/go-bindings/schemes.go
+++ b/go-bindings/schemes.go
@@ -14,8 +14,6 @@
 
 package blschia
 
-// #cgo LDFLAGS: -ldashbls -lrelic_s -lmimalloc-secure -lgmp
-// #cgo CXXFLAGS: -std=c++14
 // #include <stdbool.h>
 // #include <stdlib.h>
 // #include "schemes.h"
diff --git a/go-bindings/threshold.go b/go-bindings/threshold.go
index 5d59b1743e4c..5f484cee8dc3 100644
--- a/go-bindings/threshold.go
+++ b/go-bindings/threshold.go
@@ -14,8 +14,6 @@
 
 package blschia
 
-// #cgo LDFLAGS: -ldashbls -lrelic_s -lmimalloc-secure -lgmp
-// #cgo CXXFLAGS: -std=c++14
 // #include <stdlib.h>
 // #include "threshold.h"
 // #include "blschia.h"
diff --git a/go-bindings/util.go b/go-bindings/util.go
index 39b91513c1b5..fbea18895a76 100644
--- a/go-bindings/util.go
+++ b/go-bindings/util.go
@@ -14,8 +14,6 @@
 
 package blschia
 
-// #cgo LDFLAGS: -ldashbls -lrelic_s -lmimalloc-secure -lgmp
-// #cgo CXXFLAGS: -std=c++14
 // #include "blschia.h"
 // #include <string.h>
 import "C"
diff --git a/include/dashbls/schemes.hpp b/include/dashbls/schemes.hpp
index 31e6b1a1b704..1aee61dd346d 100644
--- a/include/dashbls/schemes.hpp
+++ b/include/dashbls/schemes.hpp
@@ -15,6 +15,7 @@
 #ifndef SRC_BLSSCHEMES_HPP_
 #define SRC_BLSSCHEMES_HPP_
 
+#include <array>
 #include <iostream>
 #include <vector>
 
@@ -65,8 +66,8 @@ class CoreMPL {
 
     virtual bool Verify(const G1Element& pubkey, const Bytes& message, const G2Element& signature);
 
-    virtual vector<uint8_t> Aggregate(const vector<vector<uint8_t>> &signatures);
-    virtual vector<uint8_t> Aggregate(const vector<Bytes>& signatures);
+    virtual std::array<uint8_t, G2Element::SIZE> Aggregate(const vector<vector<uint8_t>> &signatures);
+    virtual std::array<uint8_t, G2Element::SIZE> Aggregate(const vector<Bytes>& signatures);
 
     virtual G2Element Aggregate(const vector<G2Element> &signatures);
 
@@ -243,7 +244,7 @@ class LegacySchemeMPL final : public CoreMPL {
     bool Verify(const Bytes& pubkey, const Bytes& message, const Bytes& signature) final { throw std::runtime_error("Not supported in LegacySchemeMPL"); }
     bool Verify(const G1Element &pubkey, const Bytes& message, const G2Element &signature) final;
 
-    vector<uint8_t> Aggregate(const vector<vector<uint8_t>> &signatures) final { throw std::runtime_error("Not supported in LegacySchemeMPL"); }
+    std::array<uint8_t, G2Element::SIZE> Aggregate(const vector<vector<uint8_t>> &signatures) final { throw std::runtime_error("Not supported in LegacySchemeMPL"); }
 
     G2Element AggregateSecure(const std::vector<G1Element>& vecPublicKeys,
                               const std::vector<G2Element>& vecSignatures,
diff --git a/js-bindings/CMakeLists.txt b/js-bindings/CMakeLists.txt
index 03da706af724..f053eb2ea05e 100644
--- a/js-bindings/CMakeLists.txt
+++ b/js-bindings/CMakeLists.txt
@@ -20,6 +20,20 @@ add_custom_target(install_npm_dependencies npm ci)
 add_dependencies(blsjstmp install_npm_dependencies)
 target_link_libraries(blsjstmp PRIVATE dashbls)
 
+target_link_options(blsjstmp PRIVATE
+    "SHELL:--bind"
+    "SHELL:-Oz"
+    "SHELL:--closure 1"
+    "SHELL:-s MODULARIZE=1"
+    "SHELL:-s MALLOC=emmalloc"
+    "SHELL:-s ALLOW_MEMORY_GROWTH=1"
+    "SHELL:-s INITIAL_MEMORY=134217728"
+)
+
+if(CMAKE_BUILD_TYPE MATCHES "Debug")
+    target_link_options(blsjstmp PRIVATE "SHELL:-s ASSERTIONS=2")
+endif()
+
 # Copy necessary files for the npm package
 configure_file(${CMAKE_CURRENT_SOURCE_DIR}/package.json package.json COPYONLY)
 configure_file(${CMAKE_CURRENT_SOURCE_DIR}/package-lock.json package-lock.json COPYONLY)
@@ -34,5 +48,4 @@ foreach(file ${JS_BINDINGS_TESTS})
     configure_file(${CMAKE_CURRENT_SOURCE_DIR}/tests/${file} tests/${file} COPYONLY)
 endforeach()
 
-set_target_properties(blsjstmp PROPERTIES LINK_FLAGS "--bind -Oz --closure 1 -s MODULARIZE=1")
 add_custom_command(TARGET blsjstmp POST_BUILD COMMAND npm run build:web)
diff --git a/python-bindings/pythonbindings.cpp b/python-bindings/pythonbindings.cpp
index 419588c24eb8..4ba2acb83a67 100644
--- a/python-bindings/pythonbindings.cpp
+++ b/python-bindings/pythonbindings.cpp
@@ -25,6 +25,16 @@
 namespace py = pybind11;
 using namespace bls;
 
+namespace {
+inline int PyLong_AsByteArray(PyLongObject* obj, uint8_t* buf, Py_ssize_t size, bool is_le, bool is_signed)
+{
+    return _PyLong_AsByteArray(obj, buf, size, is_le, is_signed
+#if PY_VERSION_HEX >= 0x030d0000
+                               , /*with_exceptions=*/true
+#endif // PY_VERSION_HEX >= 0x030d0000
+    );
+}
+} // anonymous namespace
 
 PYBIND11_MODULE(blspy, m)
 {
@@ -46,7 +56,7 @@ PYBIND11_MODULE(blspy, m)
                 }
                 auto data_ptr = reinterpret_cast<const uint8_t *>(info.ptr);
                 std::array<uint8_t, PrivateKey::PRIVATE_KEY_SIZE> data;
-                std::copy(data_ptr, data_ptr + PrivateKey::PRIVATE_KEY_SIZE, data.data());
+                std::copy(data_ptr, data_ptr + data.size(), data.data());
                 py::gil_scoped_release release;
                 return PrivateKey::FromBytes(data);
             })
@@ -357,10 +367,10 @@ PYBIND11_MODULE(blspy, m)
         .def(py::init(&G1Element::FromByteVector), py::call_guard<py::gil_scoped_release>())
         .def(py::init([](py::int_ pyint) {
             std::array<uint8_t, G1Element::SIZE> buffer{};
-            if (_PyLong_AsByteArray(
+            if (PyLong_AsByteArray(
                     (PyLongObject *)pyint.ptr(),
                     buffer.data(),
-                    G1Element::SIZE,
+                    buffer.size(),
                     0,
                     0) < 0) {
                 throw std::invalid_argument("Failed to cast int to G1Element");
@@ -380,7 +390,7 @@ PYBIND11_MODULE(blspy, m)
             }
             auto data_ptr = static_cast<uint8_t *>(info.ptr);
             std::array<uint8_t, G1Element::SIZE> data;
-            std::copy(data_ptr, data_ptr + G1Element::SIZE, data.data());
+            std::copy(data_ptr, data_ptr + data.size(), data.data());
             py::gil_scoped_release release;
             return G1Element::FromBytes(data);
         }))
@@ -398,7 +408,7 @@ PYBIND11_MODULE(blspy, m)
                 }
                 auto data_ptr = reinterpret_cast<const uint8_t *>(info.ptr);
                 std::array<uint8_t, G1Element::SIZE> data;
-                std::copy(data_ptr, data_ptr + G1Element::SIZE, data.data());
+                std::copy(data_ptr, data_ptr + data.size(), data.data());
                 py::gil_scoped_release release;
                 return G1Element::FromBytes(data);
             })
@@ -509,16 +519,16 @@ PYBIND11_MODULE(blspy, m)
             }
             auto data_ptr = static_cast<uint8_t *>(info.ptr);
             std::array<uint8_t, G2Element::SIZE> data;
-            std::copy(data_ptr, data_ptr + G2Element::SIZE, data.data());
+            std::copy(data_ptr, data_ptr + data.size(), data.data());
             py::gil_scoped_release release;
             return G2Element::FromBytes(data);
         }))
         .def(py::init([](py::int_ pyint) {
             std::array<uint8_t, G2Element::SIZE> buffer{};
-            if (_PyLong_AsByteArray(
+            if (PyLong_AsByteArray(
                     (PyLongObject *)pyint.ptr(),
                     buffer.data(),
-                    G2Element::SIZE,
+                    buffer.size(),
                     0,
                     0) < 0) {
                 throw std::invalid_argument("Failed to cast int to G2Element");
@@ -540,7 +550,7 @@ PYBIND11_MODULE(blspy, m)
                 }
                 auto data_ptr = reinterpret_cast<const uint8_t *>(info.ptr);
                 std::array<uint8_t, G2Element::SIZE> data;
-                std::copy(data_ptr, data_ptr + G2Element::SIZE, data.data());
+                std::copy(data_ptr, data_ptr + data.size(), data.data());
                 py::gil_scoped_release release;
                 return G2Element::FromBytes(data);
             })
@@ -637,20 +647,20 @@ PYBIND11_MODULE(blspy, m)
 
             if ((int)info.size != GTElement::SIZE) {
                 throw std::invalid_argument(
-                    "Length of bytes object not equal to G2Element::SIZE");
+                    "Length of bytes object not equal to GTElement::SIZE");
             }
             auto data_ptr = static_cast<uint8_t *>(info.ptr);
             std::array<uint8_t, GTElement::SIZE> data;
-            std::copy(data_ptr, data_ptr + GTElement::SIZE, data.data());
+            std::copy(data_ptr, data_ptr + data.size(), data.data());
             py::gil_scoped_release release;
             return GTElement::FromBytes(data);
         }))
         .def(py::init([](py::int_ pyint) {
-            std::array<uint8_t, G1Element::SIZE> buffer{};
-            if (_PyLong_AsByteArray(
+            std::array<uint8_t, GTElement::SIZE> buffer{};
+            if (PyLong_AsByteArray(
                     (PyLongObject *)pyint.ptr(),
                     buffer.data(),
-                    GTElement::SIZE,
+                    buffer.size(),
                     0,
                     0) < 0) {
                 throw std::invalid_argument("Failed to cast int to GTElement");
@@ -672,7 +682,7 @@ PYBIND11_MODULE(blspy, m)
                 }
                 auto data_ptr = reinterpret_cast<const uint8_t *>(info.ptr);
                 std::array<uint8_t, GTElement::SIZE> data;
-                std::copy(data_ptr, data_ptr + GTElement::SIZE, data.data());
+                std::copy(data_ptr, data_ptr + data.size(), data.data());
                 py::gil_scoped_release release;
                 return GTElement::FromBytes(data);
             })
@@ -690,7 +700,7 @@ PYBIND11_MODULE(blspy, m)
                 }
                 auto data_ptr = reinterpret_cast<const uint8_t *>(info.ptr);
                 std::array<uint8_t, GTElement::SIZE> data;
-                std::copy(data_ptr, data_ptr + GTElement::SIZE, data.data());
+                std::copy(data_ptr, data_ptr + data.size(), data.data());
                 py::gil_scoped_release release;
                 return GTElement::FromBytesUnchecked(data);
             })
diff --git a/rust-bindings/bls-dash-sys/bindings.rs b/rust-bindings/bls-dash-sys/bindings.rs
index b90527e85fa2..6d570a7f9321 100644
--- a/rust-bindings/bls-dash-sys/bindings.rs
+++ b/rust-bindings/bls-dash-sys/bindings.rs
@@ -15,6 +15,7 @@ extern "C" {
 
     pub fn G1ElementFromBytes(
         data: *const ::std::os::raw::c_void,
+        len: usize,
         legacy: bool,
         didErr: *mut bool,
     ) -> G1Element;
@@ -43,6 +44,7 @@ extern "C" {
 
     pub fn G2ElementFromBytes(
         data: *const ::std::os::raw::c_void,
+        len: usize,
         legacy: bool,
         didErr: *mut bool,
     ) -> G2Element;
@@ -67,6 +69,7 @@ extern "C" {
 
     pub fn PrivateKeyFromBytes(
         data: *const ::std::os::raw::c_void,
+        len: usize,
         modOrder: bool,
         didErr: *mut bool,
     ) -> PrivateKey;
@@ -355,6 +358,7 @@ extern "C" {
 
     pub fn BIP32ExtendedPublicKeyFromBytes(
         data: *const ::std::os::raw::c_void,
+        len: usize,
         legacy: bool,
         didErr: *mut bool,
     ) -> BIP32ExtendedPublicKey;
@@ -385,6 +389,7 @@ extern "C" {
 
     pub fn BIP32ExtendedPrivateKeyFromBytes(
         data: *const ::std::os::raw::c_void,
+        len: usize,
         didErr: *mut bool,
     ) -> BIP32ExtendedPrivateKey;
 
diff --git a/rust-bindings/bls-dash-sys/build.rs b/rust-bindings/bls-dash-sys/build.rs
index c5245e6c25a9..0570baaa89b0 100644
--- a/rust-bindings/bls-dash-sys/build.rs
+++ b/rust-bindings/bls-dash-sys/build.rs
@@ -201,12 +201,14 @@ fn main() {
 
     println!("cargo:rustc-link-lib=static=relic_s");
 
-    println!(
-        "cargo:rustc-link-search={}",
-        root_path.join("build/depends/mimalloc").display()
-    );
-
-    println!("cargo:rustc-link-lib=static=mimalloc-secure");
+    let mimalloc_dir = root_path.join("build/depends/mimalloc");
+    println!("cargo:rustc-link-search={}", mimalloc_dir.display());
+    let mimalloc_lib = if mimalloc_dir.join("libmimalloc-secure-debug.a").exists() {
+        "mimalloc-secure-debug"
+    } else {
+        "mimalloc-secure"
+    };
+    println!("cargo:rustc-link-lib=static={}", mimalloc_lib);
 
     println!(
         "cargo:rustc-link-search={}",
diff --git a/rust-bindings/bls-dash-sys/c-bindings/bip32/extendedprivatekey.cpp b/rust-bindings/bls-dash-sys/c-bindings/bip32/extendedprivatekey.cpp
index 541f5f992cf1..5e9efb8d81e2 100644
--- a/rust-bindings/bls-dash-sys/c-bindings/bip32/extendedprivatekey.cpp
+++ b/rust-bindings/bls-dash-sys/c-bindings/bip32/extendedprivatekey.cpp
@@ -6,12 +6,12 @@
 #include "../error.h"
 #include "bls.hpp"
 
-BIP32ExtendedPrivateKey BIP32ExtendedPrivateKeyFromBytes(const void* data, bool* didErr)
+BIP32ExtendedPrivateKey BIP32ExtendedPrivateKeyFromBytes(const void* data, size_t len, bool* didErr)
 {
     bls::ExtendedPrivateKey* el = nullptr;
     try {
         el = new bls::ExtendedPrivateKey(bls::ExtendedPrivateKey::FromBytes(
-            bls::Bytes((uint8_t*)(data), bls::ExtendedPrivateKey::SIZE)));
+            bls::Bytes((uint8_t*)data, len)));
     } catch (const std::exception& ex) {
         gErrMsg = ex.what();
         *didErr = true;
@@ -26,7 +26,7 @@ BIP32ExtendedPrivateKey BIP32ExtendedPrivateKeyFromSeed(const void* data, const
     bls::ExtendedPrivateKey* el = nullptr;
     try {
         el = new bls::ExtendedPrivateKey(bls::ExtendedPrivateKey::FromSeed(
-            bls::Bytes((uint8_t*)(data), len)));
+            bls::Bytes((uint8_t*)data, len)));
     } catch (const std::exception& ex) {
         gErrMsg = ex.what();
         *didErr = true;
diff --git a/rust-bindings/bls-dash-sys/c-bindings/bip32/extendedprivatekey.h b/rust-bindings/bls-dash-sys/c-bindings/bip32/extendedprivatekey.h
index 18ca3c28f301..8741737215d0 100644
--- a/rust-bindings/bls-dash-sys/c-bindings/bip32/extendedprivatekey.h
+++ b/rust-bindings/bls-dash-sys/c-bindings/bip32/extendedprivatekey.h
@@ -18,6 +18,7 @@ typedef void* BIP32ExtendedPrivateKey;
 // ExtendedPrivateKey
 BIP32ExtendedPrivateKey BIP32ExtendedPrivateKeyFromBytes(
     const void* data,
+    size_t len,
     bool* didErr);
 BIP32ExtendedPrivateKey BIP32ExtendedPrivateKeyFromSeed(const void* data, const size_t len, bool* didErr);
 BIP32ExtendedPrivateKey BIP32ExtendedPrivateKeyPrivateChild(
diff --git a/rust-bindings/bls-dash-sys/c-bindings/bip32/extendedpublickey.cpp b/rust-bindings/bls-dash-sys/c-bindings/bip32/extendedpublickey.cpp
index 703c32e0216f..a52bcabe5605 100644
--- a/rust-bindings/bls-dash-sys/c-bindings/bip32/extendedpublickey.cpp
+++ b/rust-bindings/bls-dash-sys/c-bindings/bip32/extendedpublickey.cpp
@@ -8,13 +8,14 @@
 
 BIP32ExtendedPublicKey BIP32ExtendedPublicKeyFromBytes(
     const void* data,
+    size_t len,
     const bool legacy,
     bool* didErr)
 {
     bls::ExtendedPublicKey* el = nullptr;
     try {
         el = new bls::ExtendedPublicKey(bls::ExtendedPublicKey::FromBytes(
-            bls::Bytes((uint8_t*)(data), bls::ExtendedPublicKey::SIZE),
+            bls::Bytes((uint8_t*)data, len),
             legacy));
     } catch (const std::exception& ex) {
         gErrMsg = ex.what();
diff --git a/rust-bindings/bls-dash-sys/c-bindings/bip32/extendedpublickey.h b/rust-bindings/bls-dash-sys/c-bindings/bip32/extendedpublickey.h
index 51465cae039c..420da3156001 100644
--- a/rust-bindings/bls-dash-sys/c-bindings/bip32/extendedpublickey.h
+++ b/rust-bindings/bls-dash-sys/c-bindings/bip32/extendedpublickey.h
@@ -16,6 +16,7 @@ typedef void* BIP32ExtendedPublicKey;
 // ExtendedPublicKey
 BIP32ExtendedPublicKey BIP32ExtendedPublicKeyFromBytes(
     const void* data,
+    size_t len,
     const bool legacy,
     bool* didErr);
 BIP32ExtendedPublicKey BIP32ExtendedPublicKeyPublicChild(
diff --git a/rust-bindings/bls-dash-sys/c-bindings/elements.cpp b/rust-bindings/bls-dash-sys/c-bindings/elements.cpp
index 5214bc4fc931..486ee32f4781 100644
--- a/rust-bindings/bls-dash-sys/c-bindings/elements.cpp
+++ b/rust-bindings/bls-dash-sys/c-bindings/elements.cpp
@@ -23,11 +23,11 @@ int G1ElementSize() {
     return bls::G1Element::SIZE;
 }
 
-G1Element G1ElementFromBytes(const void* data, bool legacy, bool* didErr) {
+G1Element G1ElementFromBytes(const void* data, size_t len, bool legacy, bool* didErr) {
     bls::G1Element* el = nullptr;
     try {
         el = new bls::G1Element(
-            bls::G1Element::FromBytes(bls::Bytes((uint8_t*)(data), bls::G1Element::SIZE), legacy)
+            bls::G1Element::FromBytes(bls::Bytes((uint8_t*)data, len), legacy)
         );
     } catch(const std::exception& ex) {
         gErrMsg = ex.what();
@@ -97,11 +97,11 @@ int G2ElementSize() {
     return bls::G2Element::SIZE;
 }
 
-G2Element G2ElementFromBytes(const void* data, const bool legacy, bool* didErr) {
+G2Element G2ElementFromBytes(const void* data, size_t len, const bool legacy, bool* didErr) {
     bls::G2Element* el = nullptr;
     try {
         el = new bls::G2Element(
-            bls::G2Element::FromBytes(bls::Bytes((uint8_t*)data, bls::G2Element::SIZE), legacy)
+            bls::G2Element::FromBytes(bls::Bytes((uint8_t*)data, len), legacy)
         );
         *didErr = false;
     } catch(const std::exception& ex) {
diff --git a/rust-bindings/bls-dash-sys/c-bindings/elements.h b/rust-bindings/bls-dash-sys/c-bindings/elements.h
index fa1b5ae58117..e6912125375a 100644
--- a/rust-bindings/bls-dash-sys/c-bindings/elements.h
+++ b/rust-bindings/bls-dash-sys/c-bindings/elements.h
@@ -27,7 +27,7 @@ typedef void* PrivateKey;
 
 // G1Element
 int G1ElementSize();
-G1Element G1ElementFromBytes(const void* data, const bool legacy, bool* didErr);
+G1Element G1ElementFromBytes(const void* data, size_t len, const bool legacy, bool* didErr);
 G1Element G1ElementGenerator();
 bool G1ElementIsValid(const G1Element el);
 uint32_t G1ElementGetFingerprint(const G1Element el, const bool legacy);
@@ -41,7 +41,7 @@ void G1ElementFree(const G1Element el);
 
 // G2Element
 int G2ElementSize();
-G2Element G2ElementFromBytes(const void* data, const bool legacy, bool* didErr);
+G2Element G2ElementFromBytes(const void* data, size_t len, const bool legacy, bool* didErr);
 G2Element G2ElementGenerator();
 bool G2ElementIsValid(const G2Element el);
 bool G2ElementIsEqual(const G2Element el1, const G2Element el2);
diff --git a/rust-bindings/bls-dash-sys/c-bindings/privatekey.cpp b/rust-bindings/bls-dash-sys/c-bindings/privatekey.cpp
index 4e1d0df34661..ca1b2bcde719 100644
--- a/rust-bindings/bls-dash-sys/c-bindings/privatekey.cpp
+++ b/rust-bindings/bls-dash-sys/c-bindings/privatekey.cpp
@@ -20,12 +20,12 @@
 #include "utils.hpp"
 
 // private key bindings implementation
-PrivateKey PrivateKeyFromBytes(const void* data, const bool modOrder, bool* didErr) {
+PrivateKey PrivateKeyFromBytes(const void* data, size_t len, const bool modOrder, bool* didErr) {
     bls::PrivateKey* skPtr = nullptr;
     try {
         skPtr = new bls::PrivateKey(
             bls::PrivateKey::FromBytes(
-                bls::Bytes((uint8_t*)data, bls::PrivateKey::PRIVATE_KEY_SIZE),
+                bls::Bytes((uint8_t*)data, len),
                 modOrder
             )
         );
diff --git a/rust-bindings/bls-dash-sys/c-bindings/privatekey.h b/rust-bindings/bls-dash-sys/c-bindings/privatekey.h
index 147e1a618f21..bba2837a1753 100644
--- a/rust-bindings/bls-dash-sys/c-bindings/privatekey.h
+++ b/rust-bindings/bls-dash-sys/c-bindings/privatekey.h
@@ -23,7 +23,7 @@ extern "C" {
 
 typedef void* PrivateKey;
 
-PrivateKey PrivateKeyFromBytes(const void* data, const bool modOrder, bool* didErr);
+PrivateKey PrivateKeyFromBytes(const void* data, size_t len, const bool modOrder, bool* didErr);
 PrivateKey PrivateKeyFromSeedBIP32(const void* data, const size_t len);
 PrivateKey PrivateKeyAggregate(void** sks, const size_t len);
 G1Element PrivateKeyGetG1Element(const PrivateKey sk, bool* didErr);
diff --git a/rust-bindings/bls-signatures/src/bip32/private_key.rs b/rust-bindings/bls-signatures/src/bip32/private_key.rs
index af4394f17979..08c217c2a881 100644
--- a/rust-bindings/bls-signatures/src/bip32/private_key.rs
+++ b/rust-bindings/bls-signatures/src/bip32/private_key.rs
@@ -47,7 +47,7 @@ impl ExtendedPrivateKey {
         }
         Ok(ExtendedPrivateKey {
             c_extended_private_key: c_err_to_result(|did_err| unsafe {
-                BIP32ExtendedPrivateKeyFromBytes(bytes.as_ptr() as *const _, did_err)
+                BIP32ExtendedPrivateKeyFromBytes(bytes.as_ptr() as *const _, bytes.len(), did_err)
             })?,
         })
     }
diff --git a/rust-bindings/bls-signatures/src/bip32/public_key.rs b/rust-bindings/bls-signatures/src/bip32/public_key.rs
index 43fa484f0cc2..38265939dca1 100644
--- a/rust-bindings/bls-signatures/src/bip32/public_key.rs
+++ b/rust-bindings/bls-signatures/src/bip32/public_key.rs
@@ -42,7 +42,7 @@ impl ExtendedPublicKey {
         }
         Ok(ExtendedPublicKey {
             c_extended_public_key: c_err_to_result(|did_err| unsafe {
-                BIP32ExtendedPublicKeyFromBytes(bytes.as_ptr() as *const _, legacy, did_err)
+                BIP32ExtendedPublicKeyFromBytes(bytes.as_ptr() as *const _, bytes.len(), legacy, did_err)
             })?,
         })
     }
diff --git a/rust-bindings/bls-signatures/src/elements.rs b/rust-bindings/bls-signatures/src/elements.rs
index b671bdf6b5c5..76de9a6e7bdf 100644
--- a/rust-bindings/bls-signatures/src/elements.rs
+++ b/rust-bindings/bls-signatures/src/elements.rs
@@ -75,7 +75,7 @@ impl G1Element {
         }
         Ok(G1Element {
             c_element: c_err_to_result(|did_err| unsafe {
-                G1ElementFromBytes(bytes.as_ptr() as *const _, legacy, did_err)
+                G1ElementFromBytes(bytes.as_ptr() as *const _, bytes.len(), legacy, did_err)
             })?,
         })
     }
@@ -234,7 +234,7 @@ impl G2Element {
         }
         Ok(G2Element {
             c_element: c_err_to_result(|did_err| unsafe {
-                G2ElementFromBytes(bytes.as_ptr() as *const _, legacy, did_err)
+                G2ElementFromBytes(bytes.as_ptr() as *const _, bytes.len(), legacy, did_err)
             })?,
         })
     }
diff --git a/rust-bindings/bls-signatures/src/private_key.rs b/rust-bindings/bls-signatures/src/private_key.rs
index ab129856cdd5..556c968ed2a7 100755
--- a/rust-bindings/bls-signatures/src/private_key.rs
+++ b/rust-bindings/bls-signatures/src/private_key.rs
@@ -137,7 +137,7 @@ impl PrivateKey {
         }
 
         let c_private_key = c_err_to_result(|did_err| unsafe {
-            PrivateKeyFromBytes(bytes.as_ptr() as *const c_void, mod_order, did_err)
+            PrivateKeyFromBytes(bytes.as_ptr() as *const c_void, bytes.len(), mod_order, did_err)
         })?;
 
         Ok(PrivateKey { c_private_key })
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index c3c1abd7593d..5802843a61ed 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -46,9 +46,23 @@ if(BUILD_BLS_TESTS)
   target_link_libraries(runtest
                         PRIVATE dashbls
                         PRIVATE catch2)
+
+  if(EMSCRIPTEN)
+    target_link_options(runtest PRIVATE "SHELL:-s MALLOC=emmalloc")
+    if(CMAKE_BUILD_TYPE MATCHES "Debug")
+      target_link_options(runtest PRIVATE "SHELL:-s ASSERTIONS=2")
+    endif()
+  endif()
 endif()
 
 if(BUILD_BLS_BENCHMARKS)
   add_executable(runbench test-bench.cpp)
   target_link_libraries(runbench PRIVATE dashbls)
+
+  if(EMSCRIPTEN)
+    target_link_options(runbench PRIVATE "SHELL:-s MALLOC=emmalloc")
+    if(CMAKE_BUILD_TYPE MATCHES "Debug")
+      target_link_options(runbench PRIVATE "SHELL:-s ASSERTIONS=2")
+    endif()
+  endif()
 endif()
diff --git a/src/privatekey.cpp b/src/privatekey.cpp
index d4dd32d11677..d07246d8575e 100644
--- a/src/privatekey.cpp
+++ b/src/privatekey.cpp
@@ -300,7 +300,9 @@ G2Element PrivateKey::SignG2(
 {
     CheckKeyData();
 
-    g2_st* pt = Util::SecAlloc<g2_st>(1);
+    g2_t pt;
+    g2_null(pt);
+    g2_new(pt);
 
     if (fLegacy) {
         ep2_map_legacy(pt, msg, BLS::MESSAGE_HASH_LEN);
@@ -310,7 +312,7 @@ G2Element PrivateKey::SignG2(
     
     g2_mul(pt, pt, keydata);
     G2Element ret = G2Element::FromNative(pt);
-    Util::SecFree(pt);
+    g2_free(pt);
     return ret;
 }
 
diff --git a/src/schemes.cpp b/src/schemes.cpp
index 003a44a46707..c0d7ad294c64 100644
--- a/src/schemes.cpp
+++ b/src/schemes.cpp
@@ -13,6 +13,7 @@
 // limitations under the License.
 
 #include <algorithm>
+#include <array>
 #include <cstring>
 #include <set>
 
@@ -26,21 +27,23 @@ using std::vector;
 
 namespace bls {
 
-static void HashPubKeys(bn_t* computedTs, std::vector<Bytes> vecPubKeyBytes)
+template <typename GetBytesFn>
+static void HashPubKeys(bn_t* computedTs, size_t nPubKeys, GetBytesFn getBytes)
 {
     bn_t order;
     bn_new(order);
     g2_get_ord(order);
 
-    std::vector<uint8_t> vecBuffer(vecPubKeyBytes.size() * G1Element::SIZE);
+    std::vector<uint8_t> vecBuffer(nPubKeys * G1Element::SIZE);
 
-    for (size_t i = 0; i < vecPubKeyBytes.size(); i++) {
-        memcpy(vecBuffer.data() + i * G1Element::SIZE, vecPubKeyBytes[i].begin(), G1Element::SIZE);
+    for (size_t i = 0; i < nPubKeys; i++) {
+        const uint8_t* pkBytes = getBytes(i);
+        memcpy(vecBuffer.data() + i * G1Element::SIZE, pkBytes, G1Element::SIZE);
     }
 
     uint8_t pkHash[32];
-    Util::Hash256(pkHash, vecBuffer.data(), vecPubKeyBytes.size() * G1Element::SIZE);
-    for (size_t i = 0; i < vecPubKeyBytes.size(); ++i) {
+    Util::Hash256(pkHash, vecBuffer.data(), nPubKeys * G1Element::SIZE);
+    for (size_t i = 0; i < nPubKeys; ++i) {
         uint8_t hash[32];
         uint8_t buffer[4 + 32];
         memset(buffer, 0, 4);
@@ -53,6 +56,7 @@ static void HashPubKeys(bn_t* computedTs, std::vector<Bytes> vecPubKeyBytes)
         bn_read_bin(computedTs[i], hash, 32);
         bn_mod_basic(computedTs[i], computedTs[i], order);
     }
+    bn_free(order);
 }
 
 enum InvariantResult { BAD=false, GOOD=true, CONTINUE };
@@ -133,39 +137,41 @@ bool CoreMPL::Verify(const G1Element& pubkey, const Bytes& message, const G2Elem
 {
     const G2Element hashedPoint = G2Element::FromMessage(message, (const uint8_t*)strCiphersuiteId.c_str(), strCiphersuiteId.length());
 
-    std::vector<g1_st> vecG1(2);
-    std::vector<g2_st> vecG2(2);
+    std::array<g1_t, 2> g1s;
+    std::array<g2_t, 2> g2s;
 
-    G1Element::Generator().Negate().ToNative(&vecG1[0]);
+    G1Element::Generator().Negate().ToNative(g1s[0]);
     if (!pubkey.IsValid()) {
         return false;
     }
     if (!signature.IsValid()) {
         return false;
     }
-    pubkey.ToNative(&vecG1[1]);
-    signature.ToNative(&vecG2[0]);
-    hashedPoint.ToNative(&vecG2[1]);
+    pubkey.ToNative(g1s[1]);
+    signature.ToNative(g2s[0]);
+    hashedPoint.ToNative(g2s[1]);
 
-    return CoreMPL::NativeVerify((g1_t*)vecG1.data(), (g2_t*)vecG2.data(), 2);
+    return CoreMPL::NativeVerify(g1s.data(), g2s.data(), 2);
 }
 
-vector<uint8_t> CoreMPL::Aggregate(const vector<vector<uint8_t>> &signatures)
+std::array<uint8_t, G2Element::SIZE> CoreMPL::Aggregate(const vector<vector<uint8_t>> &signatures)
 {
     vector<G2Element> elements;
+    elements.reserve(signatures.size());
     for (const vector<uint8_t>& signature : signatures) {
         elements.push_back(G2Element::FromByteVector(signature));
     }
-    return CoreMPL::Aggregate(elements).Serialize();
+    return CoreMPL::Aggregate(elements).SerializeToArray();
 }
 
-vector<uint8_t> CoreMPL::Aggregate(const vector<Bytes>& signatures)
+std::array<uint8_t, G2Element::SIZE> CoreMPL::Aggregate(const vector<Bytes>& signatures)
 {
     vector<G2Element> elements;
+    elements.reserve(signatures.size());
     for (const Bytes& signature : signatures) {
         elements.push_back(G2Element::FromBytes(signature));
     }
-    return CoreMPL::Aggregate(elements).Serialize();
+    return CoreMPL::Aggregate(elements).SerializeToArray();
 }
 
 G2Element CoreMPL::Aggregate(const vector<G2Element> &signatures)
@@ -195,22 +201,17 @@ G2Element CoreMPL::AggregateSecure(std::vector<G1Element> const &vecPublicKeys,
     }
 
     bn_t* computedTs = new bn_t[vecPublicKeys.size()];
-    std::vector<std::pair<vector<uint8_t>, const G2Element*>> vecSorted(vecPublicKeys.size());
+    std::vector<std::pair<std::array<uint8_t, G1Element::SIZE>, const G2Element*>> vecSorted(vecPublicKeys.size());
     for (size_t i = 0; i < vecPublicKeys.size(); i++) {
         bn_new(computedTs[i]);
-        vecSorted[i] = std::make_pair(vecPublicKeys[i].Serialize(fLegacy), &vecSignatures[i]);
+        vecSorted[i] = std::make_pair(vecPublicKeys[i].SerializeToArray(fLegacy), &vecSignatures[i]);
     }
     std::sort(vecSorted.begin(), vecSorted.end(), [](const auto& a, const auto& b) {
         return std::memcmp(a.first.data(), b.first.data(), G1Element::SIZE) < 0;
     });
 
-    std::vector<Bytes> vecPublicKeyBytes;
-    vecPublicKeyBytes.reserve(vecPublicKeys.size());
-    for (const auto& it : vecSorted) {
-        vecPublicKeyBytes.push_back(Bytes{it.first});
-    }
-
-    HashPubKeys(computedTs, vecPublicKeyBytes);
+    HashPubKeys(computedTs, vecSorted.size(),
+                [&](size_t i) { return vecSorted[i].first.data(); });
 
     // Raise all signatures to power of the corresponding t's and aggregate the results into aggSig
     // Also accumulates aggregation info for each signature
@@ -222,6 +223,9 @@ G2Element CoreMPL::AggregateSecure(std::vector<G1Element> const &vecPublicKeys,
 
     G2Element aggSig = CoreMPL::Aggregate(expSigs);
 
+    for (size_t i = 0; i < vecPublicKeys.size(); i++) {
+        bn_free(computedTs[i]);
+    }
     delete[] computedTs;
 
     return aggSig;
@@ -237,30 +241,28 @@ bool CoreMPL::VerifySecure(const std::vector<G1Element>& vecPublicKeys,
                            const G2Element& signature,
                            const Bytes& message,
                            const bool fLegacy) {
-    bn_t one;
-    bn_new(one);
-    bn_zero(one);
-    bn_set_dig(one, 1);
-
     bn_t* computedTs = new bn_t[vecPublicKeys.size()];
-    std::vector<vector<uint8_t>> vecSorted(vecPublicKeys.size());
+    std::vector<std::array<uint8_t, G1Element::SIZE>> vecSorted(vecPublicKeys.size());
     for (size_t i = 0; i < vecPublicKeys.size(); i++) {
         bn_new(computedTs[i]);
-        vecSorted[i] = vecPublicKeys[i].Serialize(fLegacy);
+        vecSorted[i] = vecPublicKeys[i].SerializeToArray(fLegacy);
     }
     std::sort(vecSorted.begin(), vecSorted.end(), [](const auto& a, const auto& b) -> bool {
         return std::memcmp(a.data(), b.data(), G1Element::SIZE) < 0;
     });
 
-    HashPubKeys(computedTs, {vecSorted.begin(), vecSorted.end()});
+    HashPubKeys(computedTs, vecSorted.size(),
+                [&](size_t i) { return vecSorted[i].data(); });
 
     G1Element publicKey;
     for (size_t i = 0; i < vecSorted.size(); ++i) {
         G1Element g1 = G1Element::FromBytes(Bytes(vecSorted[i]), fLegacy);
-        publicKey = CoreMPL::Aggregate({publicKey, g1 * computedTs[i]});
+        publicKey += g1 * computedTs[i];
     }
 
-    bn_free(one);
+    for (size_t i = 0; i < vecPublicKeys.size(); i++) {
+        bn_free(computedTs[i]);
+    }
     delete[] computedTs;
 
     return AggregateVerify({publicKey}, {message}, {signature});
@@ -293,6 +295,7 @@ bool CoreMPL::AggregateVerify(const vector<Bytes>& pubkeys,
     }
 
     vector<G1Element> pubkeyElements;
+    pubkeyElements.reserve(nPubKeys);
     for (size_t i = 0; i < nPubKeys; ++i) {
         pubkeyElements.push_back(G1Element::FromBytes(pubkeys[i]));
     }
@@ -573,14 +576,14 @@ bool AugSchemeMPL::AggregateVerify(const vector<G1Element>& pubkeys,
 G2Element PopSchemeMPL::PopProve(const PrivateKey &seckey)
 {
     const G1Element& pk = seckey.GetG1Element();
-    const G2Element hashedKey = G2Element::FromMessage(pk.Serialize(), (const uint8_t *)POP_CIPHERSUITE_ID.c_str(), POP_CIPHERSUITE_ID.length());
+    const G2Element hashedKey = G2Element::FromMessage(pk.SerializeToArray(), (const uint8_t *)POP_CIPHERSUITE_ID.c_str(), POP_CIPHERSUITE_ID.length());
     return seckey.GetG2Power(hashedKey);
 }
 
 
 bool PopSchemeMPL::PopVerify(const G1Element &pubkey, const G2Element &signature_proof)
 {
-    const G2Element hashedPoint = G2Element::FromMessage(pubkey.Serialize(), (const uint8_t*)POP_CIPHERSUITE_ID.c_str(), POP_CIPHERSUITE_ID.length());
+    const G2Element hashedPoint = G2Element::FromMessage(pubkey.SerializeToArray(), (const uint8_t*)POP_CIPHERSUITE_ID.c_str(), POP_CIPHERSUITE_ID.length());
 
     g1_t g1s[2];
     g2_t g2s[2];
diff --git a/src/test.cpp b/src/test.cpp
index 51d84706a83c..7e9d5280b3b5 100644
--- a/src/test.cpp
+++ b/src/test.cpp
@@ -1010,8 +1010,8 @@ TEST_CASE("Advanced") {
         vector<vector<uint8_t>> vecG2Vector = {g2BasicSignVector1.Serialize(), g2BasicSign3.Serialize()};
         vector<vector<uint8_t>> vecHashes = {vecHash, vecG2Element};
 
-        vector<uint8_t> aggVector = BasicSchemeMPL().Aggregate(vecG2Vector);
-        vector<uint8_t> aggBytes = BasicSchemeMPL().Aggregate(vector<Bytes>{vecG2Vector.begin(), vecG2Vector.end()});
+        auto aggVector = BasicSchemeMPL().Aggregate(vecG2Vector);
+        auto aggBytes = BasicSchemeMPL().Aggregate(vector<Bytes>{vecG2Vector.begin(), vecG2Vector.end()});
         REQUIRE(aggVector == aggBytes);
 
         REQUIRE(BasicSchemeMPL().AggregateVerify(vector<Bytes>{vecG1Vector.begin(), vecG1Vector.end()},
@@ -1019,7 +1019,7 @@ TEST_CASE("Advanced") {
                                                  Bytes(aggVector)));
         REQUIRE(BasicSchemeMPL().AggregateVerify({g1_1, g1_3},
                                                  vector<Bytes>{vecHashes.begin(), vecHashes.end()},
-                                                 G2Element::FromByteVector(aggVector)));
+                                                 G2Element::FromBytes(aggVector)));
 
         G2Element g2AugSignVector1 = AugSchemeMPL().Sign(pk1, vecHash);
         G2Element g2AugSignBytes1 = AugSchemeMPL().Sign(pk1, Bytes(vecHash));
@@ -1033,8 +1033,8 @@ TEST_CASE("Advanced") {
         vector<vector<uint8_t>> vecG1AugVector = {g1_1.Serialize(), g1_2.Serialize()};
         vector<vector<uint8_t>> vecG2AugVector = {g2AugSignVector1.Serialize(), g2AugSign2.Serialize()};
 
-        vector<uint8_t> aggAugVector = AugSchemeMPL().Aggregate(vecG2AugVector);
-        vector<uint8_t> aggAugBytes = AugSchemeMPL().Aggregate(vector<Bytes>{vecG2AugVector.begin(), vecG2AugVector.end()});
+        auto aggAugVector = AugSchemeMPL().Aggregate(vecG2AugVector);
+        auto aggAugBytes = AugSchemeMPL().Aggregate(vector<Bytes>{vecG2AugVector.begin(), vecG2AugVector.end()});
         REQUIRE(aggAugVector == aggAugBytes);
 
         REQUIRE(AugSchemeMPL().AggregateVerify(vector<Bytes>{vecG1AugVector.begin(), vecG1AugVector.end()},
@@ -1042,7 +1042,7 @@ TEST_CASE("Advanced") {
                                                  Bytes(aggAugVector)));
         REQUIRE(AugSchemeMPL().AggregateVerify({g1_1, g1_2},
                                                  vector<Bytes>{vecHashes.begin(), vecHashes.end()},
-                                                 G2Element::FromByteVector(aggAugVector)));
+                                                 G2Element::FromBytes(aggAugVector)));
 
         G2Element proof = PopSchemeMPL().PopProve(pk1);
         REQUIRE(PopSchemeMPL().PopVerify(g1_1, proof));
@@ -1063,9 +1063,9 @@ TEST_CASE("Schemes") {
     SECTION("Basic Scheme") {
         vector<uint8_t> seed1(32, 0x04);
         vector<uint8_t> seed2(32, 0x05);
-        vector<uint8_t> msg1 = {7, 8, 9};
-        vector<uint8_t> msg2 = {10, 11, 12};
-        vector<vector<uint8_t>> msgs = {msg1, msg2};
+        std::array<uint8_t, 3> msg1 = {7, 8, 9};
+        std::array<uint8_t, 3> msg2 = {10, 11, 12};
+        vector<Bytes> msgs = {Bytes{msg1}, Bytes{msg2}};
 
         PrivateKey sk1 = BasicSchemeMPL().KeyGen(seed1);
         G1Element pk1 = BasicSchemeMPL().SkToG1(sk1);
@@ -1093,7 +1093,7 @@ TEST_CASE("Schemes") {
         REQUIRE(BasicSchemeMPL().Verify(pk2v, msg1, sig1v) == false);
 
         G2Element aggsig = BasicSchemeMPL().Aggregate({sig1, sig2});
-        vector<uint8_t> aggsigv = BasicSchemeMPL().Aggregate(vector<vector<uint8_t>>{sig1v, sig2v});
+        auto aggsigv = BasicSchemeMPL().Aggregate(vector<vector<uint8_t>>{sig1v, sig2v});
         REQUIRE(BasicSchemeMPL().AggregateVerify({pk1, pk2}, msgs, aggsig));
         REQUIRE(BasicSchemeMPL().AggregateVerify({pk1v, pk2v}, msgs, aggsigv));
     }
@@ -1102,9 +1102,9 @@ TEST_CASE("Schemes") {
     {
         vector<uint8_t> seed1(32, 0x04);
         vector<uint8_t> seed2(32, 0x05);
-        vector<uint8_t> msg1 = {7, 8, 9};
-        vector<uint8_t> msg2 = {10, 11, 12};
-        vector<vector<uint8_t>> msgs = {msg1, msg2};
+        std::array<uint8_t, 3> msg1 = {7, 8, 9};
+        std::array<uint8_t, 3> msg2 = {10, 11, 12};
+        vector<Bytes> msgs = {Bytes{msg1}, Bytes{msg2}};
 
         PrivateKey sk1 = AugSchemeMPL().KeyGen(seed1);
         G1Element pk1 = AugSchemeMPL().SkToG1(sk1);
@@ -1132,18 +1132,18 @@ TEST_CASE("Schemes") {
         REQUIRE(AugSchemeMPL().Verify(pk2v, msg1, sig1v) == false);
 
         G2Element aggsig = AugSchemeMPL().Aggregate({sig1, sig2});
-        vector<uint8_t> aggsigv = AugSchemeMPL().Aggregate(vector<vector<uint8_t>>{sig1v, sig2v});
+        auto aggsigv = AugSchemeMPL().Aggregate(vector<vector<uint8_t>>{sig1v, sig2v});
         REQUIRE(AugSchemeMPL().AggregateVerify({pk1, pk2}, msgs, aggsig));
-        REQUIRE(AugSchemeMPL().AggregateVerify({pk1v, pk2v}, msgs, aggsigv));
+        REQUIRE(AugSchemeMPL().AggregateVerify({pk1v, pk2v}, msgs, Bytes(aggsigv.data(), aggsigv.size())));
     }
 
     SECTION("Pop Scheme")
     {
         vector<uint8_t> seed1(32, 0x06);
         vector<uint8_t> seed2(32, 0x07);
-        vector<uint8_t> msg1 = {7, 8, 9};
-        vector<uint8_t> msg2 = {10, 11, 12};
-        vector<vector<uint8_t>> msgs = {msg1, msg2};
+        std::array<uint8_t, 3> msg1 = {7, 8, 9};
+        std::array<uint8_t, 3> msg2 = {10, 11, 12};
+        vector<Bytes> msgs = {Bytes{msg1}, Bytes{msg2}};
 
         PrivateKey sk1 = PopSchemeMPL().KeyGen(seed1);
         G1Element pk1 = PopSchemeMPL().SkToG1(sk1);
@@ -1171,9 +1171,9 @@ TEST_CASE("Schemes") {
         REQUIRE(PopSchemeMPL().Verify(pk2v, msg1, sig1v) == false);
 
         G2Element aggsig = PopSchemeMPL().Aggregate({sig1, sig2});
-        vector<uint8_t> aggsigv = PopSchemeMPL().Aggregate(vector<vector<uint8_t>>{sig1v, sig2v});
+        auto aggsigv = PopSchemeMPL().Aggregate(vector<vector<uint8_t>>{sig1v, sig2v});
         REQUIRE(PopSchemeMPL().AggregateVerify({pk1, pk2}, msgs, aggsig));
-        REQUIRE(PopSchemeMPL().AggregateVerify({pk1v, pk2v}, msgs, aggsigv));
+        REQUIRE(PopSchemeMPL().AggregateVerify({pk1v, pk2v}, msgs, Bytes(aggsigv.data(), aggsigv.size())));
 
         // PopVerify
         G2Element proof1 = PopSchemeMPL().PopProve(sk1);
@@ -1186,7 +1186,7 @@ TEST_CASE("Schemes") {
         G2Element sig2_same = PopSchemeMPL().Sign(sk2, msg1);
         vector<uint8_t> sig2v_same = PopSchemeMPL().Sign(sk2, msg1).Serialize();
         G2Element aggsig_same = PopSchemeMPL().Aggregate({sig1, sig2_same});
-        vector<uint8_t> aggsigv_same =
+        auto aggsigv_same =
             PopSchemeMPL().Aggregate(vector<vector<uint8_t>>{sig1v, sig2v_same});
         REQUIRE(
             PopSchemeMPL().FastAggregateVerify({pk1, pk2}, msg1, aggsig_same));
diff --git a/src/threshold.cpp b/src/threshold.cpp
index 723b24410168..73a3023b28da 100644
--- a/src/threshold.cpp
+++ b/src/threshold.cpp
@@ -92,10 +92,17 @@ namespace bls {
 
     struct PolyOpsBase {
         bn_t order;
+        bn_t iv;
 
         PolyOpsBase() {
             bn_new(order);
             gt_get_ord(order);
+            bn_new(iv);
+        }
+
+        ~PolyOpsBase() {
+            bn_free(iv);
+            bn_free(order);
         }
 
         void MulFP(bn_t& r, const bn_t& a, const bn_t& b) {
@@ -114,8 +121,6 @@ namespace bls {
         }
 
         void DivFP(bn_t& r, const bn_t& a, const bn_t& b) {
-            bn_t iv;
-            bn_new(iv);
             fp_inv_exgcd_bn(iv, b, order);
             bn_mul(r, a, iv);
             ModOrder(r);
@@ -143,7 +148,7 @@ namespace bls {
     template<>
     struct PolyOps<G1Element> : PolyOpsBase {
         G1Element Add(const G1Element& a, const G1Element& b) {
-            return pThresholdScheme->Aggregate({a, b});
+            return a + b;
         }
 
         G1Element Mul(const G1Element& a, const bn_t& b) {
@@ -154,7 +159,7 @@ namespace bls {
     template<>
     struct PolyOps<G2Element> : PolyOpsBase {
         G2Element Add(const G2Element& a, const G2Element& b) {
-            return pThresholdScheme->Aggregate({a, b});
+            return a + b;
         }
 
         G2Element Mul(const G2Element& a, bn_t& b) {

From 0ff505cd1713570ca0d70613c3823de0663da8d8 Mon Sep 17 00:00:00 2001
From: Kittywhiskers Van Gogh <63189531+kwvg@users.noreply.github.com>
Date: Tue, 17 Dec 2024 04:34:08 +0000
Subject: [PATCH 539/656] build: stop tracking cmake dependency relic_conf.h.in

---
 .../depends/relic/include/relic_conf.h.in     | 717 ------------------
 1 file changed, 717 deletions(-)
 delete mode 100644 src/dashbls/depends/relic/include/relic_conf.h.in

diff --git a/src/dashbls/depends/relic/include/relic_conf.h.in b/src/dashbls/depends/relic/include/relic_conf.h.in
deleted file mode 100644
index 7db6f5b509c4..000000000000
--- a/src/dashbls/depends/relic/include/relic_conf.h.in
+++ /dev/null
@@ -1,717 +0,0 @@
-/*
- * RELIC is an Efficient LIbrary for Cryptography
- * Copyright (c) 2009 RELIC Authors
- *
- * This file is part of RELIC. RELIC is legal property of its developers,
- * whose names are not listed here. Please refer to the COPYRIGHT file
- * for contact information.
- *
- * RELIC is free software; you can redistribute it and/or modify it under the
- * terms of the version 2.1 (or later) of the GNU Lesser General Public License
- * as published by the Free Software Foundation; or version 2.0 of the Apache
- * License as published by the Apache Software Foundation. See the LICENSE files
- * for more details.
- *
- * RELIC is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the LICENSE files for more details.
- *
- * You should have received a copy of the GNU Lesser General Public or the
- * Apache License along with RELIC. If not, see <https://www.gnu.org/licenses/>
- * or <https://www.apache.org/licenses/>.
- */
-
-/**
- * @file
- *
- * Project configuration.
- *
- * @version $Id: relic_conf.h.in 45 2009-07-04 23:45:48Z dfaranha $
- * @ingroup relic
- */
-
-#ifndef RLC_CONF_H
-#define RLC_CONF_H
-
-/** Project version. */
-#define RLC_VERSION "@VERSION@"
-
-/** Debugging support. */
-#cmakedefine DEBUG
-/** Profiling support. */
-#cmakedefine PROFL
-/** Error handling support. */
-#cmakedefine CHECK
-/** Verbose error messages. */
-#cmakedefine VERBS
-/** Build with overhead estimation. */
-#cmakedefine OVERH
-/** Build documentation. */
-#cmakedefine DOCUM
-/** Build only the selected algorithms. */
-#cmakedefine STRIP
-/** Build with printing disabled. */
-#cmakedefine QUIET
-/** Build with colored output. */
-#cmakedefine COLOR
-/** Build with big-endian support. */
-#cmakedefine BIGED
-/** Build shared library. */
-#cmakedefine SHLIB
-/** Build static library. */
-#cmakedefine STLIB
-
-/** Number of times each test is ran. */
-#define TESTS    @TESTS@
-/** Number of times each benchmark is ran. */
-#define BENCH    @BENCH@
-/** Number of available cores. */
-#define CORES    @CORES@
-
-/** Atmel AVR ATMega128 8-bit architecture. */
-#define AVR      1
-/** MSP430 16-bit architecture. */
-#define MSP      2
-/** ARM 32-bit architecture. */
-#define ARM      3
-/** Intel x86-compatible 32-bit architecture. */
-#define X86      4
-/** AMD64-compatible 64-bit architecture. */
-#define X64      5
-/** Architecture. */
-#cmakedefine ARCH	 @ARCH@
-
-/** Size of word in this architecture. */
-#define WSIZE    @WSIZE@
-
-/** Byte boundary to align digit vectors. */
-#define ALIGN    @ALIGN@
-
-/** Build multiple precision integer module. */
-#cmakedefine WITH_BN
-/** Build prime field module. */
-#cmakedefine WITH_FP
-/** Build prime field extension module. */
-#cmakedefine WITH_FPX
-/** Build binary field module. */
-#cmakedefine WITH_FB
-/** Build prime elliptic curve module. */
-#cmakedefine WITH_EP
-/** Build prime field extension elliptic curve module. */
-#cmakedefine WITH_EPX
-/** Build binary elliptic curve module. */
-#cmakedefine WITH_EB
-/** Build elliptic Edwards curve module. */
-#cmakedefine WITH_ED
-/** Build elliptic curve cryptography module. */
-#cmakedefine WITH_EC
-/** Build pairings over prime curves module. */
-#cmakedefine WITH_PP
-/** Build pairing-based cryptography module. */
-#cmakedefine WITH_PC
-/** Build block ciphers. */
-#cmakedefine WITH_BC
-/** Build hash functions. */
-#cmakedefine WITH_MD
-/** Build cryptographic protocols. */
-#cmakedefine WITH_CP
-/** Build Multi-party computation primitives. */
-#cmakedefine WITH_MPC
-
-/** Easy C-only backend. */
-#define EASY	 1
-/** GMP backend. */
-#define GMP      2
-/** GMP constant-time backend. */
-#define GMP_SEC  3
-/** Arithmetic backend. */
-#define ARITH    @ARITH@
-
-/** Required precision in bits. */
-#define BN_PRECI @BN_PRECI@
-/** A multiple precision integer can store w words. */
-#define SINGLE	 0
-/** A multiple precision integer can store the result of an addition. */
-#define CARRY	 1
-/** A multiple precision integer can store the result of a multiplication. */
-#define DOUBLE	 2
-/** Effective size of a multiple precision integer. */
-#define BN_MAGNI @BN_MAGNI@
-/** Number of Karatsuba steps. */
-#define BN_KARAT @BN_KARAT@
-
-/** Schoolbook multiplication. */
-#define BASIC    1
-/** Comba multiplication. */
-#define COMBA    2
-/** Chosen multiple precision multiplication method. */
-#define BN_MUL   @BN_MUL@
-
-/** Schoolbook squaring. */
-#define BASIC    1
-/** Comba squaring. */
-#define COMBA    2
-/** Reuse multiplication for squaring. */
-#define MULTP    4
-/** Chosen multiple precision multiplication method. */
-#define BN_SQR   @BN_SQR@
-
-/** Division modular reduction. */
-#define BASIC    1
-/** Barrett modular reduction. */
-#define BARRT    2
-/** Montgomery modular reduction. */
-#define MONTY    3
-/** Pseudo-Mersenne modular reduction. */
-#define PMERS    4
-/** Chosen multiple precision modular reduction method. */
-#define BN_MOD   @BN_MOD@
-
-/** Binary modular exponentiation. */
-#define BASIC    1
-/** Sliding window modular exponentiation. */
-#define SLIDE    2
-/** Montgomery powering ladder. */
-#define MONTY    3
-/** Chosen multiple precision modular exponentiation method. */
-#define BN_MXP   @BN_MXP@
-
-/** Basic Euclidean GCD Algorithm. */
-#define BASIC    1
-/** Lehmer's fast GCD Algorithm. */
-#define LEHME    2
-/** Stein's binary GCD Algorithm. */
-#define STEIN    3
-/** Chosen multiple precision greatest common divisor method. */
-#define BN_GCD   @BN_GCD@
-
-/** Basic prime generation. */
-#define BASIC    1
-/** Safe prime generation. */
-#define SAFEP    2
-/** Strong prime generation. */
-#define STRON    3
-/** Chosen prime generation algorithm. */
-#define BN_GEN   @BN_GEN@
-
-/** Multiple precision arithmetic method */
-#define BN_METHD "@BN_METHD@"
-
-/** Prime field size in bits. */
-#define FP_PRIME @FP_PRIME@
-/** Number of Karatsuba steps. */
-#define FP_KARAT @FP_KARAT@
-/** Prefer Pseudo-Mersenne primes over random primes. */
-#cmakedefine FP_PMERS
-/** Use -1 as quadratic non-residue. */
-#cmakedefine FP_QNRES
-/** Width of window processing for exponentiation methods. */
-#define FP_WIDTH @FP_WIDTH@
-
-/** Schoolbook addition. */
-#define BASIC    1
-/** Integrated modular addtion. */
-#define INTEG    3
-/** Chosen prime field multiplication method. */
-#define FP_ADD   @FP_ADD@
-
-/** Schoolbook multiplication. */
-#define BASIC    1
-/** Comba multiplication. */
-#define COMBA    2
-/** Integrated modular multiplication. */
-#define INTEG    3
-/** Chosen prime field multiplication method. */
-#define FP_MUL   @FP_MUL@
-
-/** Schoolbook squaring. */
-#define BASIC    1
-/** Comba squaring. */
-#define COMBA    2
-/** Integrated modular squaring. */
-#define INTEG    3
-/** Reuse multiplication for squaring. */
-#define MULTP    4
-/** Chosen prime field multiplication method. */
-#define FP_SQR   @FP_SQR@
-
-/** Division-based reduction. */
-#define BASIC    1
-/** Fast reduction modulo special form prime. */
-#define QUICK    2
-/** Montgomery modular reduction. */
-#define MONTY    3
-/** Chosen prime field reduction method. */
-#define FP_RDC   @FP_RDC@
-
-/** Inversion by Fermat's Little Theorem. */
-#define BASIC    1
-/** Binary inversion. */
-#define BINAR    2
-/** Integrated modular multiplication. */
-#define MONTY    3
-/** Extended Euclidean algorithm. */
-#define EXGCD    4
-/** Constant-time inversion by Bernstein-Yang division steps. */
-#define DIVST    5
-/** Use implementation provided by the lower layer. */
-#define LOWER    8
-/** Chosen prime field inversion method. */
-#define FP_INV   @FP_INV@
-
-/** Binary modular exponentiation. */
-#define BASIC    1
-/** Sliding window modular exponentiation. */
-#define SLIDE    2
-/** Constant-time Montgomery powering ladder. */
-#define MONTY    3
-/** Chosen multiple precision modular exponentiation method. */
-#define FP_EXP   @FP_EXP@
-
-/** Prime field arithmetic method */
-#define FP_METHD "@FP_METHD@"
-
-/** Basic quadratic extension field arithmetic. */
-#define BASIC    1
-/** Integrated extension field arithmetic. */
-#define INTEG    3
-/* Chosen extension field arithmetic method. */
-#define FPX_QDR   @FPX_QDR@
-
-/** Basic cubic extension field arithmetic. */
-#define BASIC    1
-/** Integrated extension field arithmetic. */
-#define INTEG    3
-/* Chosen extension field arithmetic method. */
-#define FPX_CBC   @FPX_CBC@
-
-/** Basic quadratic extension field arithmetic. */
-#define BASIC    1
-/** Lazy-reduced extension field arithmetic. */
-#define LAZYR    2
-/* Chosen extension field arithmetic method. */
-#define FPX_RDC   @FPX_RDC@
-
-/** Prime extension field arithmetic method */
-#define FPX_METHD "@FPX_METHD@"
-
-/** Irreducible polynomial size in bits. */
-#define FB_POLYN @FB_POLYN@
-/** Number of Karatsuba steps. */
-#define FB_KARAT @FB_KARAT@
-/** Prefer trinomials over pentanomials. */
-#cmakedefine FB_TRINO
-/** Prefer square-root friendly polynomials. */
-#cmakedefine FB_SQRTF
-/** Precompute multiplication table for sqrt(z). */
-#cmakedefine FB_PRECO
-/** Width of window processing for exponentiation methods. */
-#define FB_WIDTH @FB_WIDTH@
-
-/** Shift-and-add multiplication. */
-#define BASIC    1
-/** Lopez-Dahab multiplication. */
-#define LODAH	 2
-/** Integrated modular multiplication. */
-#define INTEG	 3
-/** Chosen binary field multiplication method. */
-#define FB_MUL   @FB_MUL@
-
-/** Basic squaring. */
-#define BASIC    1
-/** Table-based squaring. */
-#define QUICK    2
-/** Integrated modular squaring. */
-#define INTEG	 3
-/** Chosen binary field squaring method. */
-#define FB_SQR   @FB_SQR@
-
-/** Shift-and-add modular reduction. */
-#define BASIC    1
-/** Fast reduction modulo a trinomial or pentanomial. */
-#define QUICK	 2
-/** Chosen binary field modular reduction method. */
-#define FB_RDC   @FB_RDC@
-
-/** Square root by repeated squaring. */
-#define BASIC    1
-/** Fast square root extraction. */
-#define QUICK	 2
-/** Chosen binary field modular reduction method. */
-#define FB_SRT   @FB_SRT@
-
-/** Trace by repeated squaring. */
-#define BASIC    1
-/** Fast trace computation. */
-#define QUICK	 2
-/** Chosen trace computation method. */
-#define FB_TRC   @FB_TRC@
-
-/** Solve by half-trace computation. */
-#define BASIC    1
-/** Solve with precomputed half-traces. */
-#define QUICK	 2
-/** Chosen method to solve a quadratic equation. */
-#define FB_SLV   @FB_SLV@
-
-/** Inversion by Fermat's Little Theorem. */
-#define BASIC    1
-/** Binary inversion. */
-#define BINAR    2
-/** Almost inverse algorithm. */
-#define ALMOS    3
-/** Extended Euclidean algorithm. */
-#define EXGCD    4
-/** Itoh-Tsuji inversion. */
-#define ITOHT    5
-/** Hardware-friendly inversion by Brunner-Curiger-Hofstetter.*/
-#define BRUCH    6
-/** Constant-time version of almost inverse. */
-#define CTAIA    7
-/** Use implementation provided by the lower layer. */
-#define LOWER    8
-/** Chosen binary field inversion method. */
-#define FB_INV   @FB_INV@
-
-/** Binary modular exponentiation. */
-#define BASIC    1
-/** Sliding window modular exponentiation. */
-#define SLIDE    2
-/** Constant-time Montgomery powering ladder. */
-#define MONTY    3
-/** Chosen multiple precision modular exponentiation method. */
-#define FB_EXP   @FB_EXP@
-
-/** Iterated squaring/square-root by consecutive squaring/square-root. */
-#define BASIC    1
-/** Iterated squaring/square-root by table-based method. */
-#define QUICK	 2
-/** Chosen method to solve a quadratic equation. */
-#define FB_ITR   @FB_ITR@
-
-/** Binary field arithmetic method */
-#define FB_METHD "@FB_METHD@"
-
-/** Support for ordinary curves. */
-#cmakedefine EP_PLAIN
-/** Support for supersingular curves. */
-#cmakedefine EP_SUPER
-/** Support for prime curves with efficient endormorphisms. */
-#cmakedefine EP_ENDOM
-/** Use mixed coordinates. */
-#cmakedefine EP_MIXED
-/** Build precomputation table for generator. */
-#cmakedefine EP_PRECO
-/** Enable isogeny map for SSWU map-to-curve. */
-#cmakedefine EP_CTMAP
-/** Width of precomputation table for fixed point methods. */
-#define EP_DEPTH @EP_DEPTH@
-/** Width of window processing for unknown point methods. */
-#define EP_WIDTH @EP_WIDTH@
-
-/** Affine coordinates. */
-#define BASIC	 1
-/** Projective coordinates. */
-#define PROJC	 2
-/** Jacobian coordinates. */
-#define JACOB	 3
-/** Chosen prime elliptic curve coordinate method. */
-#define EP_ADD	 @EP_ADD@
-
-/** Binary point multiplication. */
-#define BASIC	 1
-/** Sliding window. */
-#define SLIDE    2
-/** Montgomery powering ladder. */
-#define MONTY	 3
-/** Left-to-right Width-w NAF. */
-#define LWNAF	 4
-/** Left-to-right Width-w NAF. */
-#define LWREG	 5
-/** Chosen prime elliptic curve point multiplication method. */
-#define EP_MUL	 @EP_MUL@
-
-/** Binary point multiplication. */
-#define BASIC	 1
-/** Single-table comb method. */
-#define COMBS	 2
-/** Double-table comb method. */
-#define COMBD    3
-/** Left-to-right Width-w NAF. */
-#define LWNAF	 4
-/** Chosen prime elliptic curve point multiplication method. */
-#define EP_FIX	 @EP_FIX@
-
-/** Basic simultaneouns point multiplication. */
-#define BASIC    1
-/** Shamir's trick. */
-#define TRICK    2
-/** Interleaving of w-(T)NAFs. */
-#define INTER    3
-/** Joint sparse form. */
-#define JOINT    4
-/** Chosen prime elliptic curve simulteanous point multiplication method. */
-#define EP_SIM   @EP_SIM@
-
-/** Prime elliptic curve arithmetic method. */
-#define EP_METHD "@EP_METHD@"
-
-/** Support for ordinary curves without endormorphisms. */
-#cmakedefine EB_PLAIN
-/** Support for Koblitz anomalous binary curves. */
-#cmakedefine EB_KBLTZ
-/** Use mixed coordinates. */
-#cmakedefine EB_MIXED
-/** Build precomputation table for generator. */
-#cmakedefine EB_PRECO
-/** Width of precomputation table for fixed point methods. */
-#define EB_DEPTH @EB_DEPTH@
-/** Width of window processing for unknown point methods. */
-#define EB_WIDTH @EB_WIDTH@
-
-/** Binary elliptic curve arithmetic method. */
-#define EB_METHD "@EB_METHD@"
-
-/** Affine coordinates. */
-#define BASIC	 1
-/** López-Dahab Projective coordinates. */
-#define PROJC	 2
-/** Chosen binary elliptic curve coordinate method. */
-#define EB_ADD	 @EB_ADD@
-
-/** Binary point multiplication. */
-#define BASIC	 1
-/** L�pez-Dahab point multiplication. */
-#define LODAH	 2
-/** Halving. */
-#define HALVE    3
-/** Left-to-right width-w (T)NAF. */
-#define LWNAF	 4
-/** Right-to-left width-w (T)NAF. */
-#define RWNAF	 5
-/** Chosen binary elliptic curve point multiplication method. */
-#define EB_MUL	 @EB_MUL@
-
-/** Binary point multiplication. */
-#define BASIC	 1
-/** Single-table comb method. */
-#define COMBS	 2
-/** Double-table comb method. */
-#define COMBD    3
-/** Left-to-right Width-w NAF. */
-#define LWNAF	 4
-/** Chosen binary elliptic curve point multiplication method. */
-#define EB_FIX	 @EB_FIX@
-
-/** Basic simultaneouns point multiplication. */
-#define BASIC    1
-/** Shamir's trick. */
-#define TRICK    2
-/** Interleaving of w-(T)NAFs. */
-#define INTER    3
-/** Joint sparse form. */
-#define JOINT    4
-/** Chosen binary elliptic curve simulteanous point multiplication method. */
-#define EB_SIM   @EB_SIM@
-
-/** Build precomputation table for generator. */
-#cmakedefine ED_PRECO
-/** Width of precomputation table for fixed point methods. */
-#define ED_DEPTH @ED_DEPTH@
-/** Width of window processing for unknown point methods. */
-#define ED_WIDTH @ED_WIDTH@
-
-/** Edwards elliptic curve arithmetic method. */
-#define ED_METHD "@ED_METHD@"
-
-/** Affine coordinates. */
-#define BASIC    1
-/** Simple projective twisted Edwards coordinates */
-#define PROJC	 2
-/** Extended projective twisted Edwards coordinates */
-#define EXTND	 3
-/** Chosen binary elliptic curve coordinate method. */
-#define ED_ADD	 @ED_ADD@
-
-/** Binary point multiplication. */
-#define BASIC	 1
-/** Sliding window. */
-#define SLIDE    2
-/** Montgomery powering ladder. */
-#define MONTY	 3
-/** Left-to-right Width-w NAF. */
-#define LWNAF	 4
-/** Left-to-right Width-w NAF. */
-#define LWREG	 5
-/** Chosen prime elliptic twisted Edwards curve point multiplication method. */
-#define ED_MUL	 @ED_MUL@
-
-/** Binary point multiplication. */
-#define BASIC	 1
-/** Single-table comb method. */
-#define COMBS	 2
-/** Double-table comb method. */
-#define COMBD    3
-/** Left-to-right Width-w NAF. */
-#define LWNAF	 4
-/** Chosen prime elliptic twisted Edwards curve point multiplication method. */
-#define ED_FIX	 @ED_FIX@
-
-/** Basic simultaneouns point multiplication. */
-#define BASIC    1
-/** Shamir's trick. */
-#define TRICK    2
-/** Interleaving of w-(T)NAFs. */
-#define INTER    3
-/** Joint sparse form. */
-#define JOINT    4
-/** Chosen prime elliptic curve simulteanous point multiplication method. */
-#define ED_SIM   @ED_SIM@
-
-/** Prime curves. */
-#define PRIME    1
-/** Binary curves. */
-#define CHAR2    2
-/** Edwards curves */
-#define EDDIE    3
-/** Chosen elliptic curve type. */
-#define EC_CUR	 @EC_CUR@
-
-/** Chosen elliptic curve cryptography method. */
-#define EC_METHD "@EC_METHD@"
-/** Prefer curves with efficient endomorphisms. */
-#cmakedefine EC_ENDOM
-
-/** Basic quadratic extension field arithmetic. */
-#define BASIC    1
-/** Lazy-reduced extension field arithmetic. */
-#define LAZYR    2
-/* Chosen extension field arithmetic method. */
-#define PP_EXT   @PP_EXT@
-
-/** Bilinear pairing method. */
-#define PP_METHD "@PP_METHD@"
-
-/** Tate pairing. */
-#define TATEP    1
-/** Weil pairing. */
-#define WEILP    2
-/** Optimal ate pairing. */
-#define OATEP    3
-/** Chosen pairing method over prime elliptic curves. */
-#define PP_MAP   @PP_MAP@
-
-/** SHA-224 hash function. */
-#define SH224          2
-/** SHA-256 hash function. */
-#define SH256          3
-/** SHA-384 hash function. */
-#define SH384          4
-/** SHA-512 hash function. */
-#define SH512          5
-/** BLAKE2s-160 hash function. */
-#define B2S160         6
-/** BLAKE2s-256 hash function. */
-#define B2S256         7
-/** Chosen hash function. */
-#define MD_MAP   @MD_MAP@
-
-/** Choice of hash function. */
-#define MD_METHD "@MD_METHD@"
-
-/** Chosen RSA method. */
-#cmakedefine CP_CRT
-/** RSA without padding. */
-#define BASIC    1
-/** RSA PKCS#1 v1.5 padding. */
-#define PKCS1    2
-/** RSA PKCS#1 v2.1 padding. */
-#define PKCS2    3
-/** Chosen RSA padding method. */
-#define CP_RSAPD @CP_RSAPD@
-
-/** Automatic memory allocation. */
-#define AUTO     1
-/** Dynamic memory allocation. */
-#define DYNAMIC  2
-/** Chosen memory allocation policy. */
-#define ALLOC    @ALLOC@
-
-/** NIST HASH-DRBG generator. */
-#define HASHD    1
-/** Intel RdRand instruction. */
-#define RDRND    2
-/** Operating system underlying generator. */
-#define UDEV     3
-/** Override library generator with the callback. */
-#define CALL     4
-/** Chosen random generator. */
-#define RAND     @RAND@
-
-/** Standard C library generator. */
-#define LIBC     1
-/** Intel RdRand instruction. */
-#define RDRND    2
-/** Device node generator. */
-#define UDEV     3
-/** Use Windows' CryptGenRandom. */
-#define WCGR     4
-/** Chosen random generator seeder. */
-#cmakedefine SEED     @SEED@
-
-/** GNU/Linux operating system. */
-#define LINUX    1
-/** FreeBSD operating system. */
-#define FREEBSD  2
-/** Windows operating system. */
-#define MACOSX   3
-/** Windows operating system. */
-#define WINDOWS  4
-/** Android operating system. */
-#define DROID    5
-/** Arduino platform. */
-#define DUINO    6
-/** OpenBSD operating system. */
-#define OPENBSD  7
-/** Detected operation system. */
-#cmakedefine OPSYS    @OPSYS@
-
-/** OpenMP multithreading support. */
-#define OPENMP   1
-/** POSIX multithreading support. */
-#define PTHREAD  2
-/** Chosen multithreading API. */
-#cmakedefine MULTI    @MULTI@
-
-/** Per-process high-resolution timer. */
-#define HREAL    1
-/** Per-process high-resolution timer. */
-#define HPROC    2
-/** Per-thread high-resolution timer. */
-#define HTHRD    3
-/** POSIX-compatible timer. */
-#define POSIX    4
-/** ANSI-compatible timer. */
-#define ANSI     5
-/** Cycle-counting timer. */
-#define CYCLE    6
-/** Performance monitoring framework. */
-#define PERF     7
-/** Chosen timer. */
-#cmakedefine TIMER    @TIMER@
-
-/** Prefix to identity this build of the library. */
-#cmakedefine LABEL    @LABEL@
-
-#ifndef ASM
-
-#include "relic_label.h"
-
-/**
- * Prints the project options selected at build time.
- */
-void conf_print(void);
-
-#endif /* ASM */
-
-#endif /* !RLC_CONF_H */

From be7f51a27d51026001376821b9900f47f43532cd Mon Sep 17 00:00:00 2001
From: fanquake <fanquake@gmail.com>
Date: Tue, 23 May 2023 13:06:02 +0100
Subject: [PATCH 540/656] Merge bitcoin/bitcoin#27717: test: Make
 `util/test_runner.py` honor `BITCOINUTIL` and `BITCOINTX`

4f2f615d1362afe92cabe9eab50087f8bfe454fd test: Make `util/test_runner.py` honor `BITCOINUTIL` and `BITCOINTX` (Hennadii Stepanov)

Pull request description:

  This PR is a continuation of changes to our testing frameworks (https://github.com/bitcoin/bitcoin/pull/27554, https://github.com/bitcoin/bitcoin/pull/27561) that allow them to work correctly in a multi-config build environment that is possible for [upcoming](https://github.com/bitcoin/bitcoin/pull/25797) CMake-based build system. That means that built for different configurations binaries (e.g., "Debug" and "Release") can coexist in separated directories.

  The commit has been pulled from https://github.com/hebasto/bitcoin/pull/15 and it seems [useful](https://github.com/hebasto/bitcoin/pull/15#discussion_r1200251404) by itself as:
  > I believe the rationale for allowing to drop in the executables via env var is to allow to test the guix-produced, or other third-party-produced executables...

  The current implementation of the `test/functional/test_framework/test_framework.py` script uses the same approach: https://github.com/bitcoin/bitcoin/blob/09351f51d279612973ecd76811dc075dff08209f/test/functional/test_framework/test_framework.py#L231-L246

ACKs for top commit:
  MarcoFalke:
    lgtm ACK 4f2f615d1362afe92cabe9eab50087f8bfe454fd
  TheCharlatan:
    ACK 4f2f615d1362afe92cabe9eab50087f8bfe454fd
  stickies-v:
    ACK 4f2f615d1362afe92cabe9eab50087f8bfe454fd

Tree-SHA512: 99ee9a727b266700649d8f2ec528dfaeb04a1e48f0cb1d4eeaece65917165be647c10c4548429a9e8b30d094597f67e860c1db03ac689ebb409b223ce1b63aa9
---
 test/util/test_runner.py | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/test/util/test_runner.py b/test/util/test_runner.py
index d12f8cec31bd..f96a74629b1f 100755
--- a/test/util/test_runner.py
+++ b/test/util/test_runner.py
@@ -74,6 +74,11 @@ def bctest(testDir, testObj, buildenv):
     """
     # Get the exec names and arguments
     execprog = os.path.join(buildenv["BUILDDIR"], "src", testObj["exec"] + buildenv["EXEEXT"])
+    if testObj["exec"] == "./dash-util":
+        execprog = os.getenv("DASHUTIL", default=execprog)
+    elif testObj["exec"] == "./dash-tx":
+        execprog = os.getenv("DASHTX", default=execprog)
+
     execargs = testObj['args']
     execrun = [execprog] + execargs
 

From 5ee733eb3d23af710551a1dd3416a0cb2f970561 Mon Sep 17 00:00:00 2001
From: fanquake <fanquake@gmail.com>
Date: Wed, 26 Jul 2023 09:42:42 +0100
Subject: [PATCH 541/656] Merge bitcoin/bitcoin#28147: suppressions: note that
 `type:ClassName::MethodName` should be used

d0c6cc4abe42163aaf081a969d2c449785563ba2 suppressions: note that 'type:ClassName::MethodName' should be used (fanquake)

Pull request description:

  Now that the symbolizer is back in play, suppressions can once-again be targeted to functions, rather than file-wide.

ACKs for top commit:
  MarcoFalke:
    lgtm ACK d0c6cc4abe42163aaf081a969d2c449785563ba2
  hebasto:
    ACK d0c6cc4abe42163aaf081a969d2c449785563ba2

Tree-SHA512: fb65398eae18a6ebc5f8414275c568cf2664ab5357c2b3160f3bf285b67bc3af788225c5dba3c824c0e098627789450bec775375f52529d71c6ef700a9632d65
---
 test/sanitizer_suppressions/ubsan | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/test/sanitizer_suppressions/ubsan b/test/sanitizer_suppressions/ubsan
index 79507945434f..1d1f2ad352b5 100644
--- a/test/sanitizer_suppressions/ubsan
+++ b/test/sanitizer_suppressions/ubsan
@@ -1,9 +1,7 @@
+# Suppressions should use `sanitize-type:ClassName::MethodName`.
+
 # -fsanitize=undefined suppressions
 # =================================
-# The suppressions would be `sanitize-type:ClassName::MethodName`,
-# however due to a bug in clang the symbolizer is disabled and thus no symbol
-# names can be used.
-# See https://github.com/google/sanitizers/issues/1364
 
 # -fsanitize=integer suppressions
 # ===============================
@@ -11,8 +9,7 @@
 # ------------
 # Suppressions in dependencies that are developed outside this repository.
 unsigned-integer-overflow:*/include/c++/
-# unsigned-integer-overflow in FuzzedDataProvider's ConsumeIntegralInRange
-unsigned-integer-overflow:FuzzedDataProvider.h
+unsigned-integer-overflow:FuzzedDataProvider::ConsumeIntegralInRange
 unsigned-integer-overflow:leveldb/
 unsigned-integer-overflow:minisketch/
 unsigned-integer-overflow:secp256k1/

From 99e7997acaf2c74562028060174cebd47eda2015 Mon Sep 17 00:00:00 2001
From: pasta <pasta@dashboost.org>
Date: Wed, 19 Nov 2025 17:23:58 -0600
Subject: [PATCH 542/656] fix: skip ISDLOCK inv announcements for peers
 requesting recsigs

---
 src/net_processing.cpp | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/src/net_processing.cpp b/src/net_processing.cpp
index 392d1d41ef35..9778a0f638e2 100644
--- a/src/net_processing.cpp
+++ b/src/net_processing.cpp
@@ -1188,6 +1188,13 @@ static void PushInv(Peer& peer, const CInv& inv)
         return;
     }
 
+    // Skip ISDLOCK inv announcements for peers that want recsigs, as they can reconstruct
+    // the islock from the recsig
+    if (inv.type == MSG_ISDLOCK && peer.m_wants_recsigs) {
+        LogPrint(BCLog::NET, "%s -- skipping ISDLOCK inv (peer wants recsigs): %s peer=%d\n", __func__, inv.ToString(), peer.m_id);
+        return;
+    }
+
     LOCK(inv_relay->m_tx_inventory_mutex);
     if (inv_relay->m_tx_inventory_known_filter.contains(inv.hash)) {
         LogPrint(BCLog::NET, "%s -- skipping known inv: %s peer=%d\n", __func__, inv.ToString(), peer.m_id);
@@ -6258,7 +6265,11 @@ bool PeerManagerImpl::SendMessages(CNode* pto)
                     if (islock == nullptr) continue;
                     uint256 isLockHash{::SerializeHash(*islock)};
                     tx_relay->m_tx_inventory_known_filter.insert(isLockHash);
-                    queueAndMaybePushInv(CInv(MSG_ISDLOCK, isLockHash));
+                    // Skip ISDLOCK inv announcements for peers that want recsigs, as they can reconstruct
+                    // the islock from the recsig
+                    if (!peer->m_wants_recsigs) {
+                        queueAndMaybePushInv(CInv(MSG_ISDLOCK, isLockHash));
+                    }
                 }
 
                 // Send an inv for the best ChainLock we have

From 572bafd82cbbb2453ea2b5cb0df3685f67f8a752 Mon Sep 17 00:00:00 2001
From: Konstantin Akimov <knstqq@gmail.com>
Date: Thu, 20 Nov 2025 16:40:24 +0700
Subject: [PATCH 543/656] refactor: rename IsDsqOver to
 IsMixingThresholdExceeded

---
 src/coinjoin/client.cpp | 4 ++--
 src/coinjoin/server.cpp | 4 ++--
 src/masternode/meta.cpp | 2 +-
 src/masternode/meta.h   | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/coinjoin/client.cpp b/src/coinjoin/client.cpp
index b79671e65439..79651d64e428 100644
--- a/src/coinjoin/client.cpp
+++ b/src/coinjoin/client.cpp
@@ -124,7 +124,7 @@ MessageProcessingResult CCoinJoinClientQueueManager::ProcessMessage(NodeId from,
             LogPrint(BCLog::COINJOIN, "DSQUEUE -- CoinJoin queue is ready, masternode=%s, queue=%s\n", dmn->proTxHash.ToString(), dsq.ToString());
             return ret;
         } else {
-            if (m_mn_metaman.IsDsqOver(dmn->proTxHash, tip_mn_list.GetValidMNsCount())) {
+            if (m_mn_metaman.IsMixingThresholdExceeded(dmn->proTxHash, tip_mn_list.GetValidMNsCount())) {
                 LogPrint(BCLog::COINJOIN, "DSQUEUE -- Masternode %s is sending too many dsq messages\n",
                          dmn->proTxHash.ToString());
                 return ret;
@@ -1174,7 +1174,7 @@ bool CCoinJoinClientSession::StartNewQueue(CAmount nBalanceNeedsAnonymized, CCon
             continue;
         }
 
-        if (m_mn_metaman.IsDsqOver(dmn->proTxHash, nMnCount)) {
+        if (m_mn_metaman.IsMixingThresholdExceeded(dmn->proTxHash, nMnCount)) {
             WalletCJLogPrint(m_wallet, /* Continued */
                              "CCoinJoinClientSession::StartNewQueue -- too early to mix with node masternode=%s\n",
                              dmn->proTxHash.ToString());
diff --git a/src/coinjoin/server.cpp b/src/coinjoin/server.cpp
index c666e1df5e22..98069a79cf11 100644
--- a/src/coinjoin/server.cpp
+++ b/src/coinjoin/server.cpp
@@ -99,7 +99,7 @@ void CCoinJoinServer::ProcessDSACCEPT(CNode& peer, CDataStream& vRecv)
             }
         }
 
-        if (m_mn_metaman.IsDsqOver(dmn->proTxHash, mnList.GetValidMNsCount())) {
+        if (m_mn_metaman.IsMixingThresholdExceeded(dmn->proTxHash, mnList.GetValidMNsCount())) {
             if (fLogIPs) {
                 LogPrint(BCLog::COINJOIN, "DSACCEPT -- last dsq too recent, must wait: peer=%d, addr=%s\n",
                          peer.GetId(), peer.addr.ToStringAddrPort());
@@ -193,7 +193,7 @@ MessageProcessingResult CCoinJoinServer::ProcessDSQUEUE(NodeId from, CDataStream
 
     if (!dsq.fReady) {
         //don't allow a few nodes to dominate the queuing process
-        if (m_mn_metaman.IsDsqOver(dmn->proTxHash, tip_mn_list.GetValidMNsCount())) {
+        if (m_mn_metaman.IsMixingThresholdExceeded(dmn->proTxHash, tip_mn_list.GetValidMNsCount())) {
             LogPrint(BCLog::COINJOIN, "DSQUEUE -- node sending too many dsq messages, masternode=%s\n", dmn->proTxHash.ToString());
             return ret;
         }
diff --git a/src/masternode/meta.cpp b/src/masternode/meta.cpp
index a0b98b4d0591..226aefb59f63 100644
--- a/src/masternode/meta.cpp
+++ b/src/masternode/meta.cpp
@@ -90,7 +90,7 @@ CMasternodeMetaInfo& CMasternodeMetaMan::GetMetaInfo(const uint256& proTxHash)
     return it->second;
 }
 
-bool CMasternodeMetaMan::IsDsqOver(const uint256& protx_hash, int mn_count) const
+bool CMasternodeMetaMan::IsMixingThresholdExceeded(const uint256& protx_hash, int mn_count) const
 {
     LOCK(cs);
     auto it = metaInfos.find(protx_hash);
diff --git a/src/masternode/meta.h b/src/masternode/meta.h
index 273c433e1acc..5e7729a9390f 100644
--- a/src/masternode/meta.h
+++ b/src/masternode/meta.h
@@ -219,7 +219,7 @@ class CMasternodeMetaMan : public MasternodeMetaStore
     // MN's threshold is calculated as the last dsq count this specific masternode was used in a mixing
     // session plus a margin of 20% of masternode count. In other words we expect at least 20% of unique
     // masternodes before we ever see a masternode that we know already mixed someone's funds earlier.
-    bool IsDsqOver(const uint256& protx_hash, int mn_count) const EXCLUSIVE_LOCKS_REQUIRED(!cs);
+    bool IsMixingThresholdExceeded(const uint256& protx_hash, int mn_count) const EXCLUSIVE_LOCKS_REQUIRED(!cs);
 
     void AllowMixing(const uint256& proTxHash) EXCLUSIVE_LOCKS_REQUIRED(!cs);
     void DisallowMixing(const uint256& proTxHash) EXCLUSIVE_LOCKS_REQUIRED(!cs);

From de1b467f30ba554e7669d7f60800446ab57e5127 Mon Sep 17 00:00:00 2001
From: Kittywhiskers Van Gogh <63189531+kwvg@users.noreply.github.com>
Date: Tue, 20 Aug 2024 13:26:33 +0100
Subject: [PATCH 544/656] merge bitcoin#30730: Bump time machine to
 53396a22afc04536ddf75d8f82ad2eafa5082725

---
 contrib/guix/libexec/prelude.bash |  2 +-
 contrib/guix/manifest.scm         | 12 +-----------
 2 files changed, 2 insertions(+), 12 deletions(-)

diff --git a/contrib/guix/libexec/prelude.bash b/contrib/guix/libexec/prelude.bash
index 67c05cf90b6b..0c38c27e32de 100644
--- a/contrib/guix/libexec/prelude.bash
+++ b/contrib/guix/libexec/prelude.bash
@@ -71,7 +71,7 @@ fi
 time-machine() {
     # shellcheck disable=SC2086
     guix time-machine --url=https://codeberg.org/guix/guix.git \
-                      --commit=7bf1d7aeaffba15c4f680f93ae88fbef25427252 \
+                      --commit=53396a22afc04536ddf75d8f82ad2eafa5082725 \
                       --cores="$JOBS" \
                       --keep-failed \
                       --fallback \
diff --git a/contrib/guix/manifest.scm b/contrib/guix/manifest.scm
index 2f76f92167d5..0dcf6fbb2ca7 100644
--- a/contrib/guix/manifest.scm
+++ b/contrib/guix/manifest.scm
@@ -92,17 +92,7 @@ chain for " target " development."))
       (home-page (package-home-page xgcc))
       (license (package-license xgcc)))))
 
-(define base-gcc
-  (package
-    (inherit gcc-12) ;; 12.3.0
-    (version "12.4.0")
-    (source (origin
-              (method url-fetch)
-              (uri (string-append "mirror://gnu/gcc/gcc-"
-                                  version "/gcc-" version ".tar.xz"))
-              (sha256
-               (base32
-                "0xcida8l2wykvvzvpcrcn649gj0ijn64gwxbplacpg6c0hk6akvh"))))))
+(define base-gcc gcc-12) ;; 12.4.0
 
 (define base-linux-kernel-headers linux-libre-headers-6.1)
 

From 7fef63d6bb90b6ecfe2f6b4318401858f562666e Mon Sep 17 00:00:00 2001
From: Kittywhiskers Van Gogh <63189531+kwvg@users.noreply.github.com>
Date: Thu, 14 Nov 2024 11:02:15 +0000
Subject: [PATCH 545/656] merge bitcoin#31529: latest 2.31 glibc

---
 contrib/guix/manifest.scm | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/contrib/guix/manifest.scm b/contrib/guix/manifest.scm
index 0dcf6fbb2ca7..738c395aebdc 100644
--- a/contrib/guix/manifest.scm
+++ b/contrib/guix/manifest.scm
@@ -451,7 +451,7 @@ inspecting signatures in Mach-O binaries.")
                #t))))))))
 
 (define-public glibc-2.31
-  (let ((commit "8e30f03744837a85e33d84ccd34ed3abe30d37c3"))
+  (let ((commit "7b27c450c34563a28e634cccb399cd415e71ebfe"))
   (package
     (inherit glibc) ;; 2.35
     (version "2.31")
@@ -463,7 +463,7 @@ inspecting signatures in Mach-O binaries.")
               (file-name (git-file-name "glibc" commit))
               (sha256
                (base32
-                "1zi0s9yy5zkisw823vivn7zlj8w6g9p3mm7lmlqiixcxdkz4dbn6"))
+                "017qdpr5id7ddb4lpkzj2li1abvw916m3fc6n7nw28z4h5qbv2n0"))
               (patches (search-our-patches "glibc-guix-prefix.patch"))))
     (arguments
       (substitute-keyword-arguments (package-arguments glibc)
@@ -473,6 +473,8 @@ inspecting signatures in Mach-O binaries.")
             (list "--enable-stack-protector=all",
                   "--enable-bind-now",
                   "--disable-werror",
+                  "--disable-timezone-tools",
+                  "--disable-profile",
                   building-on)))
     ((#:phases phases)
         `(modify-phases ,phases

From 9c9e876d70dea19d3312fb40dfa91b3660bf5f76 Mon Sep 17 00:00:00 2001
From: Kittywhiskers Van Gogh <63189531+kwvg@users.noreply.github.com>
Date: Fri, 7 Feb 2025 10:02:54 +0000
Subject: [PATCH 546/656] partial bitcoin#33185: update time-machine to
 5cb84f2013c5b1e48a7d0e617032266f1e6059e2

excludes:
- 91b5cbaabbca49a8bd9df6da2506070b31482892
- 59c4898994bde3d86168075f0031c9d5a9ac5c8f
---
 contrib/devtools/symbol-check.py              |  2 +-
 contrib/guix/libexec/prelude.bash             |  2 +-
 contrib/guix/manifest.scm                     | 11 ++--
 .../guix/patches/glibc-riscv-jumptarget.patch | 57 +++++++++++++++++++
 4 files changed, 65 insertions(+), 7 deletions(-)
 create mode 100644 contrib/guix/patches/glibc-riscv-jumptarget.patch

diff --git a/contrib/devtools/symbol-check.py b/contrib/devtools/symbol-check.py
index 13d0a5d398b1..c296ad16fb9a 100755
--- a/contrib/devtools/symbol-check.py
+++ b/contrib/devtools/symbol-check.py
@@ -253,7 +253,7 @@ def check_MACHO_sdk(binary) -> bool:
     return False
 
 def check_MACHO_lld(binary) -> bool:
-    if binary.build_version.tools[0].version == [18, 1, 8]:
+    if binary.build_version.tools[0].version == [19, 1, 4]:
         return True
     return False
 
diff --git a/contrib/guix/libexec/prelude.bash b/contrib/guix/libexec/prelude.bash
index 0c38c27e32de..196a5e2c683a 100644
--- a/contrib/guix/libexec/prelude.bash
+++ b/contrib/guix/libexec/prelude.bash
@@ -71,7 +71,7 @@ fi
 time-machine() {
     # shellcheck disable=SC2086
     guix time-machine --url=https://codeberg.org/guix/guix.git \
-                      --commit=53396a22afc04536ddf75d8f82ad2eafa5082725 \
+                      --commit=5cb84f2013c5b1e48a7d0e617032266f1e6059e2 \
                       --cores="$JOBS" \
                       --keep-failed \
                       --fallback \
diff --git a/contrib/guix/manifest.scm b/contrib/guix/manifest.scm
index 738c395aebdc..35e678722a02 100644
--- a/contrib/guix/manifest.scm
+++ b/contrib/guix/manifest.scm
@@ -453,7 +453,7 @@ inspecting signatures in Mach-O binaries.")
 (define-public glibc-2.31
   (let ((commit "7b27c450c34563a28e634cccb399cd415e71ebfe"))
   (package
-    (inherit glibc) ;; 2.35
+    (inherit glibc) ;; 2.39
     (version "2.31")
     (source (origin
               (method git-fetch)
@@ -464,7 +464,8 @@ inspecting signatures in Mach-O binaries.")
               (sha256
                (base32
                 "017qdpr5id7ddb4lpkzj2li1abvw916m3fc6n7nw28z4h5qbv2n0"))
-              (patches (search-our-patches "glibc-guix-prefix.patch"))))
+              (patches (search-our-patches "glibc-guix-prefix.patch"
+                                           "glibc-riscv-jumptarget.patch"))))
     (arguments
       (substitute-keyword-arguments (package-arguments glibc)
         ((#:configure-flags flags)
@@ -537,9 +538,9 @@ inspecting signatures in Mach-O binaries.")
                  (list gcc-toolchain-12 "static")
                  (make-bitcoin-cross-toolchain target)))
           ((string-contains target "darwin")
-           (list clang-toolchain-18
-                 lld-18
-                 (make-lld-wrapper lld-18 #:lld-as-ld? #t)
+           (list clang-toolchain-19
+                 lld-19
+                 (make-lld-wrapper lld-19 #:lld-as-ld? #t)
                  python-signapple
                  zip))
           (else '())))))
diff --git a/contrib/guix/patches/glibc-riscv-jumptarget.patch b/contrib/guix/patches/glibc-riscv-jumptarget.patch
new file mode 100644
index 000000000000..702959433d86
--- /dev/null
+++ b/contrib/guix/patches/glibc-riscv-jumptarget.patch
@@ -0,0 +1,57 @@
+commit 68389203832ab39dd0dbaabbc4059e7fff51c29b
+Author: Fangrui Song <maskray@google.com>
+Date:   Thu Oct 28 11:39:49 2021 -0700
+
+    riscv: Fix incorrect jal with HIDDEN_JUMPTARGET
+    
+    A non-local STV_DEFAULT defined symbol is by default preemptible in a
+    shared object. j/jal cannot target a preemptible symbol. On other
+    architectures, such a jump instruction either causes PLT [BZ #18822], or
+    if short-ranged, sometimes rejected by the linker (but not by GNU ld's
+    riscv port [ld PR/28509]).
+    
+    Use HIDDEN_JUMPTARGET to target a non-preemptible symbol instead.
+    
+    With this patch, ld.so and libc.so can be linked with LLD if source
+    files are compiled/assembled with -mno-relax/-Wa,-mno-relax.
+    
+    Acked-by: Palmer Dabbelt <palmer@dabbelt.com>
+    Reviewed-by: Adhemerval Zanella  <adhemerval.zanella@linaro.org>
+
+Can be dropped when we are using glibc 2.35 or later.
+
+diff --git a/sysdeps/riscv/setjmp.S b/sysdeps/riscv/setjmp.S
+index 0b92016b31..bec7ff80f4 100644
+--- a/sysdeps/riscv/setjmp.S
++++ b/sysdeps/riscv/setjmp.S
+@@ -21,7 +21,7 @@
+ 
+ ENTRY (_setjmp)
+   li	a1, 0
+-  j	__sigsetjmp
++  j	HIDDEN_JUMPTARGET (__sigsetjmp)
+ END (_setjmp)
+ ENTRY (setjmp)
+   li	a1, 1
+diff --git a/sysdeps/unix/sysv/linux/riscv/setcontext.S b/sysdeps/unix/sysv/linux/riscv/setcontext.S
+index 9510518750..e44a68aad4 100644
+--- a/sysdeps/unix/sysv/linux/riscv/setcontext.S
++++ b/sysdeps/unix/sysv/linux/riscv/setcontext.S
+@@ -95,6 +95,7 @@ LEAF (__setcontext)
+ 99:	j	__syscall_error
+ 
+ END (__setcontext)
++libc_hidden_def (__setcontext)
+ weak_alias (__setcontext, setcontext)
+ 
+ LEAF (__start_context)
+@@ -108,7 +109,7 @@ LEAF (__start_context)
+ 	/* Invoke subsequent context if present, else exit(0).  */
+ 	mv	a0, s2
+ 	beqz	s2, 1f
+-	jal	__setcontext
+-1:	j	exit
++	jal	HIDDEN_JUMPTARGET (__setcontext)
++1:	j	HIDDEN_JUMPTARGET (exit)
+ 
+ END (__start_context)

From ce506bc6038d376bb47efd3abad54e8625684e82 Mon Sep 17 00:00:00 2001
From: UdjinM6 <UdjinM6@users.noreply.github.com>
Date: Thu, 20 Nov 2025 13:58:22 +0300
Subject: [PATCH 547/656] perf: reduce cs_main lock scope in evodb
 verify/repair operations

Previously, evodb_verify_or_repair_impl held cs_main for the entire
operation, which could take minutes when verifying/repairing large block
ranges. This caused significant lock contention and blocked other
operations requiring cs_main.

This commit reduces the cs_main lock scope to only the initial setup
phase where we resolve block indexes from the active chain. The actual
verification and repair work (applying diffs, rebuilding lists from
blocks, verifying snapshots) now runs without holding cs_main.

Changes:
- Wrap block index resolution in a scoped cs_main lock
- Remove AssertLockHeld(cs_main) from helper functions:
  * RecalculateAndRepairDiffs
  * CollectSnapshotBlocks
  * VerifySnapshotPair
  * RepairSnapshotPair
  * RebuildListFromBlock (CSpecialTxProcessor)
- Update function signatures to remove EXCLUSIVE_LOCKS_REQUIRED(cs_main)

This is safe because:
- CBlockIndex pointers remain valid after lock release (never deleted)
- Block parent relationships (pprev, GetAncestor) are immutable
- ReadBlockFromDisk takes cs_main internally when accessing nFile/nDataPos
- Helper functions only process already-loaded block data and snapshots
- ChainLocks prevent deep reorgs in Dash anyway
---
 src/evo/deterministicmns.cpp |  8 -----
 src/evo/deterministicmns.h   | 10 +++----
 src/evo/specialtxman.cpp     |  2 --
 src/evo/specialtxman.h       |  3 +-
 src/rpc/evo.cpp              | 58 ++++++++++++++++++------------------
 5 files changed, 34 insertions(+), 47 deletions(-)

diff --git a/src/evo/deterministicmns.cpp b/src/evo/deterministicmns.cpp
index 0b79a38e9521..b29622903c59 100644
--- a/src/evo/deterministicmns.cpp
+++ b/src/evo/deterministicmns.cpp
@@ -1586,8 +1586,6 @@ CDeterministicMNManager::RecalcDiffsResult CDeterministicMNManager::RecalculateA
     const CBlockIndex* start_index, const CBlockIndex* stop_index, ChainstateManager& chainman,
     BuildListFromBlockFunc build_list_func, bool repair)
 {
-    AssertLockHeld(::cs_main);
-
     RecalcDiffsResult result;
     result.start_height = start_index->nHeight;
     result.stop_height = stop_index->nHeight;
@@ -1696,8 +1694,6 @@ CDeterministicMNManager::RecalcDiffsResult CDeterministicMNManager::RecalculateA
 std::vector<const CBlockIndex*> CDeterministicMNManager::CollectSnapshotBlocks(
     const CBlockIndex* start_index, const CBlockIndex* stop_index, const Consensus::Params& consensus_params)
 {
-    AssertLockHeld(::cs_main);
-
     std::vector<const CBlockIndex*> snapshot_blocks;
 
     // Add the starting snapshot (find the snapshot at or before start)
@@ -1749,8 +1745,6 @@ bool CDeterministicMNManager::VerifySnapshotPair(
     const CBlockIndex* from_index, const CBlockIndex* to_index, const CDeterministicMNList& from_snapshot,
     const CDeterministicMNList& to_snapshot, RecalcDiffsResult& result)
 {
-    AssertLockHeld(::cs_main);
-
     // Verify this snapshot pair by applying all stored diffs sequentially
     CDeterministicMNList test_list = from_snapshot;
 
@@ -1795,8 +1789,6 @@ std::vector<std::pair<uint256, CDeterministicMNListDiff>> CDeterministicMNManage
     const CBlockIndex* from_index, const CBlockIndex* to_index, const CDeterministicMNList& from_snapshot,
     const CDeterministicMNList& to_snapshot, BuildListFromBlockFunc build_list_func, RecalcDiffsResult& result)
 {
-    AssertLockHeld(::cs_main);
-
     CDeterministicMNList current_list = from_snapshot;
     // Temporary storage for recalculated diffs (one per block in this snapshot interval)
     std::vector<std::pair<uint256, CDeterministicMNListDiff>> temp_diffs;
diff --git a/src/evo/deterministicmns.h b/src/evo/deterministicmns.h
index b01fbd5f8f7e..32888c40e8b9 100644
--- a/src/evo/deterministicmns.h
+++ b/src/evo/deterministicmns.h
@@ -743,7 +743,7 @@ class CDeterministicMNManager
     [[nodiscard]] RecalcDiffsResult RecalculateAndRepairDiffs(
         const CBlockIndex* start_index, const CBlockIndex* stop_index,
         ChainstateManager& chainman, BuildListFromBlockFunc build_list_func,
-        bool repair) EXCLUSIVE_LOCKS_REQUIRED(!cs, ::cs_main);
+        bool repair) EXCLUSIVE_LOCKS_REQUIRED(!cs);
 
     // Migration support for nVersion-first CDeterministicMNStateDiff format
     [[nodiscard]] bool IsMigrationRequired() const EXCLUSIVE_LOCKS_REQUIRED(!cs, ::cs_main);
@@ -755,14 +755,12 @@ class CDeterministicMNManager
 
     // Helper methods for RecalculateAndRepairDiffs
     std::vector<const CBlockIndex*> CollectSnapshotBlocks(const CBlockIndex* start_index, const CBlockIndex* stop_index,
-                                                           const Consensus::Params& consensus_params) EXCLUSIVE_LOCKS_REQUIRED(::cs_main);
+                                                           const Consensus::Params& consensus_params);
     bool VerifySnapshotPair(const CBlockIndex* from_index, const CBlockIndex* to_index, const CDeterministicMNList& from_snapshot,
-                            const CDeterministicMNList& to_snapshot, RecalcDiffsResult& result)
-        EXCLUSIVE_LOCKS_REQUIRED(::cs_main);
+                            const CDeterministicMNList& to_snapshot, RecalcDiffsResult& result);
     std::vector<std::pair<uint256, CDeterministicMNListDiff>> RepairSnapshotPair(
         const CBlockIndex* from_index, const CBlockIndex* to_index, const CDeterministicMNList& from_snapshot,
-        const CDeterministicMNList& to_snapshot, BuildListFromBlockFunc build_list_func, RecalcDiffsResult& result)
-        EXCLUSIVE_LOCKS_REQUIRED(::cs_main);
+        const CDeterministicMNList& to_snapshot, BuildListFromBlockFunc build_list_func, RecalcDiffsResult& result);
     void WriteRepairedDiffs(const std::vector<std::pair<uint256, CDeterministicMNListDiff>>& recalculated_diffs,
                             RecalcDiffsResult& result) EXCLUSIVE_LOCKS_REQUIRED(!cs);
 };
diff --git a/src/evo/specialtxman.cpp b/src/evo/specialtxman.cpp
index a788bc22437f..f5bd3f810117 100644
--- a/src/evo/specialtxman.cpp
+++ b/src/evo/specialtxman.cpp
@@ -185,8 +185,6 @@ bool CSpecialTxProcessor::RebuildListFromBlock(const CBlock& block, gsl::not_nul
                                                 bool debugLogs, BlockValidationState& state,
                                                 CDeterministicMNList& mnListRet)
 {
-    AssertLockHeld(cs_main);
-
     // Verify that prevList either represents an empty/initial state (default-constructed),
     // or it matches the previous block's hash.
     assert(prevList == CDeterministicMNList() || prevList.GetBlockHash() == pindexPrev->GetBlockHash());
diff --git a/src/evo/specialtxman.h b/src/evo/specialtxman.h
index 461fa8d222c1..9faa57dd02f4 100644
--- a/src/evo/specialtxman.h
+++ b/src/evo/specialtxman.h
@@ -83,8 +83,7 @@ class CSpecialTxProcessor
     // Used for rebuilding diffs from trusted snapshots
     bool RebuildListFromBlock(const CBlock& block, gsl::not_null<const CBlockIndex*> pindexPrev,
                                const CDeterministicMNList& prevList, const CCoinsViewCache& view, bool debugLogs,
-                               BlockValidationState& state, CDeterministicMNList& mnListRet)
-        EXCLUSIVE_LOCKS_REQUIRED(cs_main);
+                               BlockValidationState& state, CDeterministicMNList& mnListRet);
 
 private:
     bool CheckCreditPoolDiffForBlock(const CBlock& block, const CBlockIndex* pindex, const CCbTx& cbTx,
diff --git a/src/rpc/evo.cpp b/src/rpc/evo.cpp
index 12bd74cc79dd..7de013d32728 100644
--- a/src/rpc/evo.cpp
+++ b/src/rpc/evo.cpp
@@ -1760,37 +1760,38 @@ static UniValue evodb_verify_or_repair_impl(const JSONRPCRequest& request, bool
     CDeterministicMNManager& dmnman = *CHECK_NONFATAL(node.dmnman);
     CChainstateHelper& chain_helper = *CHECK_NONFATAL(node.chain_helper);
 
-    LOCK(::cs_main);
-
     const CBlockIndex* start_index;
     const CBlockIndex* stop_index;
 
-    // Default to DIP0003 activation height if startBlock not specified
-    if (request.params[0].isNull()) {
-        const auto& consensus_params = Params().GetConsensus();
-        start_index = chainman.ActiveChain()[consensus_params.DIP0003Height];
-        if (!start_index) {
-            throw JSONRPCError(RPC_INTERNAL_ERROR, "Cannot find DIP0003 activation block");
-        }
-    } else {
-        uint256 start_block_hash = ParseBlock(request.params[0], chainman, "startBlock");
-        start_index = chainman.m_blockman.LookupBlockIndex(start_block_hash);
-        if (!start_index) {
-            throw JSONRPCError(RPC_INVALID_PARAMETER, "Start block not found");
+    {
+        LOCK(::cs_main);
+        // Default to DIP0003 activation height if startBlock not specified
+        if (request.params[0].isNull()) {
+            const auto& consensus_params = Params().GetConsensus();
+            start_index = chainman.ActiveChain()[consensus_params.DIP0003Height];
+            if (!start_index) {
+                throw JSONRPCError(RPC_INTERNAL_ERROR, "Cannot find DIP0003 activation block");
+            }
+        } else {
+            uint256 start_block_hash = ParseBlock(request.params[0], chainman, "startBlock");
+            start_index = chainman.m_blockman.LookupBlockIndex(start_block_hash);
+            if (!start_index) {
+                throw JSONRPCError(RPC_INVALID_PARAMETER, "Start block not found");
+            }
         }
-    }
 
-    // Default to chain tip if stopBlock not specified
-    if (request.params[1].isNull()) {
-        stop_index = chainman.ActiveChain().Tip();
-        if (!stop_index) {
-            throw JSONRPCError(RPC_INTERNAL_ERROR, "Cannot find chain tip");
-        }
-    } else {
-        uint256 stop_block_hash = ParseBlock(request.params[1], chainman, "stopBlock");
-        stop_index = chainman.m_blockman.LookupBlockIndex(stop_block_hash);
-        if (!stop_index) {
-            throw JSONRPCError(RPC_INVALID_PARAMETER, "Stop block not found");
+        // Default to chain tip if stopBlock not specified
+        if (request.params[1].isNull()) {
+            stop_index = chainman.ActiveChain().Tip();
+            if (!stop_index) {
+                throw JSONRPCError(RPC_INTERNAL_ERROR, "Cannot find chain tip");
+            }
+        } else {
+            uint256 stop_block_hash = ParseBlock(request.params[1], chainman, "stopBlock");
+            stop_index = chainman.m_blockman.LookupBlockIndex(stop_block_hash);
+            if (!stop_index) {
+                throw JSONRPCError(RPC_INVALID_PARAMETER, "Stop block not found");
+            }
         }
     }
 
@@ -1802,12 +1803,11 @@ static UniValue evodb_verify_or_repair_impl(const JSONRPCRequest& request, bool
         throw JSONRPCError(RPC_INVALID_PARAMETER, "stopBlock must be >= startBlock");
     }
 
-    // Create a callback that wraps CSpecialTxProcessor::BuildNewListFromBlock
-    // NO_THREAD_SAFETY_ANALYSIS: cs_main is held by the calling function (evodb_verify_or_repair_impl)
+    // Create a callback that wraps CSpecialTxProcessor::RebuildListFromBlock
     auto build_list_func = [&chain_helper](const CBlock& block, gsl::not_null<const CBlockIndex*> pindexPrev,
                                            const CDeterministicMNList& prevList, const CCoinsViewCache& view,
                                            bool debugLogs, BlockValidationState& state,
-                                           CDeterministicMNList& mnListRet) NO_THREAD_SAFETY_ANALYSIS -> bool {
+                                           CDeterministicMNList& mnListRet) -> bool {
         return chain_helper.special_tx->RebuildListFromBlock(block, pindexPrev, prevList, view, debugLogs, state, mnListRet);
     };
 

From 084bb62307824e177ffdd3db401c5161a4dcebc2 Mon Sep 17 00:00:00 2001
From: UdjinM6 <UdjinM6@users.noreply.github.com>
Date: Thu, 20 Nov 2025 15:13:21 +0300
Subject: [PATCH 548/656] chore: clang-format

---
 src/evo/deterministicmns.h | 15 ++++++++-------
 src/evo/specialtxman.h     |  4 ++--
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/src/evo/deterministicmns.h b/src/evo/deterministicmns.h
index 32888c40e8b9..80aabbe113aa 100644
--- a/src/evo/deterministicmns.h
+++ b/src/evo/deterministicmns.h
@@ -740,10 +740,10 @@ class CDeterministicMNManager
         BlockValidationState& state,
         CDeterministicMNList& mnListRet)>;
 
-    [[nodiscard]] RecalcDiffsResult RecalculateAndRepairDiffs(
-        const CBlockIndex* start_index, const CBlockIndex* stop_index,
-        ChainstateManager& chainman, BuildListFromBlockFunc build_list_func,
-        bool repair) EXCLUSIVE_LOCKS_REQUIRED(!cs);
+    [[nodiscard]] RecalcDiffsResult RecalculateAndRepairDiffs(const CBlockIndex* start_index,
+                                                              const CBlockIndex* stop_index, ChainstateManager& chainman,
+                                                              BuildListFromBlockFunc build_list_func, bool repair)
+        EXCLUSIVE_LOCKS_REQUIRED(!cs);
 
     // Migration support for nVersion-first CDeterministicMNStateDiff format
     [[nodiscard]] bool IsMigrationRequired() const EXCLUSIVE_LOCKS_REQUIRED(!cs, ::cs_main);
@@ -755,9 +755,10 @@ class CDeterministicMNManager
 
     // Helper methods for RecalculateAndRepairDiffs
     std::vector<const CBlockIndex*> CollectSnapshotBlocks(const CBlockIndex* start_index, const CBlockIndex* stop_index,
-                                                           const Consensus::Params& consensus_params);
-    bool VerifySnapshotPair(const CBlockIndex* from_index, const CBlockIndex* to_index, const CDeterministicMNList& from_snapshot,
-                            const CDeterministicMNList& to_snapshot, RecalcDiffsResult& result);
+                                                          const Consensus::Params& consensus_params);
+    bool VerifySnapshotPair(const CBlockIndex* from_index, const CBlockIndex* to_index,
+                            const CDeterministicMNList& from_snapshot, const CDeterministicMNList& to_snapshot,
+                            RecalcDiffsResult& result);
     std::vector<std::pair<uint256, CDeterministicMNListDiff>> RepairSnapshotPair(
         const CBlockIndex* from_index, const CBlockIndex* to_index, const CDeterministicMNList& from_snapshot,
         const CDeterministicMNList& to_snapshot, BuildListFromBlockFunc build_list_func, RecalcDiffsResult& result);
diff --git a/src/evo/specialtxman.h b/src/evo/specialtxman.h
index 9faa57dd02f4..de293d0dfaba 100644
--- a/src/evo/specialtxman.h
+++ b/src/evo/specialtxman.h
@@ -82,8 +82,8 @@ class CSpecialTxProcessor
     // Variant that takes an explicit starting list instead of loading from GetListForBlock
     // Used for rebuilding diffs from trusted snapshots
     bool RebuildListFromBlock(const CBlock& block, gsl::not_null<const CBlockIndex*> pindexPrev,
-                               const CDeterministicMNList& prevList, const CCoinsViewCache& view, bool debugLogs,
-                               BlockValidationState& state, CDeterministicMNList& mnListRet);
+                              const CDeterministicMNList& prevList, const CCoinsViewCache& view, bool debugLogs,
+                              BlockValidationState& state, CDeterministicMNList& mnListRet);
 
 private:
     bool CheckCreditPoolDiffForBlock(const CBlock& block, const CBlockIndex* pindex, const CCbTx& cbTx,

From 6700ca9f15c5a8aa3106c9b40dc8b7fa4c4c1409 Mon Sep 17 00:00:00 2001
From: pasta <pasta@dashboost.org>
Date: Thu, 20 Nov 2025 12:36:35 -0600
Subject: [PATCH 549/656] fix: use proper host objcopy/readelf

---
 contrib/guix/libexec/build.sh | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/contrib/guix/libexec/build.sh b/contrib/guix/libexec/build.sh
index 6408234d89f9..88023e71c25f 100755
--- a/contrib/guix/libexec/build.sh
+++ b/contrib/guix/libexec/build.sh
@@ -345,7 +345,7 @@ mkdir -p "$DISTSRC"
                 case "$HOST" in
                     *linux*)
                         # Compress DWARF sections in debug files and set proper permissions
-                        find "${DISTNAME}" -name "*.dbg" -type f -print0 | xargs -0 -P"$JOBS" -I{} sh -c "objcopy --compress-debug-sections=zlib \"\$1\" \"\$1.tmp\" && mv \"\$1.tmp\" \"\$1\" && chmod 644 \"\$1\"" _ {}
+                        find "${DISTNAME}" -name "*.dbg" -type f -print0 | xargs -0 -P"$JOBS" -I{} sh -c "${HOST}-objcopy --compress-debug-sections=zlib \"\$1\" \"\$1.tmp\" && mv \"\$1.tmp\" \"\$1\" && chmod 644 \"\$1\"" _ {}
 
                         # Create .build-id tree for perf auto-discovery
                         mkdir -p "${DISTNAME}/usr/lib/debug/.build-id"
@@ -354,7 +354,7 @@ mkdir -p "$DISTSRC"
                             find "${DISTNAME}/lib" -type f -print0
                         } | while IFS= read -r -d '' elf; do
                             if file "$elf" | grep -q "ELF.*executable\|ELF.*shared object"; then
-                                build_id=$(readelf -n "$elf" 2>/dev/null | awk '/Build ID/ {print $3; exit}')
+                                build_id=$(${HOST}-readelf -n "$elf" 2>/dev/null | awk '/Build ID/ {print $3; exit}')
                                 if [ -n "$build_id" ] && [ -f "${elf}.dbg" ]; then
                                     dir="${DISTNAME}/usr/lib/debug/.build-id/${build_id:0:2}"
                                     mkdir -p "$dir"
@@ -374,13 +374,13 @@ mkdir -p "$DISTSRC"
                                 while IFS= read -r -d '' elf; do
                                     if file "$elf" | grep -q "ELF.*executable\|ELF.*shared object"; then
                                         # Check for build-id
-                                        if ! readelf -n "$elf" 2>/dev/null | grep -q "Build ID"; then
+                                        if ! ${HOST}-readelf -n "$elf" 2>/dev/null | grep -q "Build ID"; then
                                             echo "ERROR: No build-id found in $elf" >&2
                                             verification_failed=1
                                         fi
 
                                         # Check for .gnu_debuglink
-                                        if ! readelf --string-dump=.gnu_debuglink "$elf" >/dev/null 2>&1; then
+                                        if ! ${HOST}-readelf --string-dump=.gnu_debuglink "$elf" >/dev/null 2>&1; then
                                             echo "ERROR: No .gnu_debuglink found in $elf" >&2
                                             verification_failed=1
                                         fi

From 04ac20aebaabfe6d6d71de80115696976d2bd1da Mon Sep 17 00:00:00 2001
From: Kittywhiskers Van Gogh <63189531+kwvg@users.noreply.github.com>
Date: Thu, 25 Jul 2024 20:56:12 +0200
Subject: [PATCH 550/656] partial bitcoin#30527: Bump python minimum supported
 version to 3.10

---
 .python-version                          | 2 +-
 contrib/containers/ci/ci-slim.Dockerfile | 2 +-
 doc/dependencies.md                      | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.python-version b/.python-version
index 43077b246094..1445aee866ce 100644
--- a/.python-version
+++ b/.python-version
@@ -1 +1 @@
-3.9.18
+3.10.14
diff --git a/contrib/containers/ci/ci-slim.Dockerfile b/contrib/containers/ci/ci-slim.Dockerfile
index ae59495f3981..76c9bfdb4e85 100644
--- a/contrib/containers/ci/ci-slim.Dockerfile
+++ b/contrib/containers/ci/ci-slim.Dockerfile
@@ -55,7 +55,7 @@ COPY --from=ghcr.io/astral-sh/uv:latest /uv /uvx /bin/
 
 # Install Python to a system-wide location and set it as default
 # PYTHON_VERSION should match the value in .python-version
-ARG PYTHON_VERSION=3.9.18
+ARG PYTHON_VERSION=3.10.14
 ENV UV_PYTHON_INSTALL_DIR=/usr/local/python
 RUN uv python install ${PYTHON_VERSION}
 
diff --git a/doc/dependencies.md b/doc/dependencies.md
index 6a55eaba416e..2a2b7ec28370 100644
--- a/doc/dependencies.md
+++ b/doc/dependencies.md
@@ -10,7 +10,7 @@ You can find installation instructions in the `build-*.md` file for your platfor
 | [Automake](https://www.gnu.org/software/automake/) | [1.13](https://github.com/bitcoin/bitcoin/pull/18290) |
 | [Clang](https://clang.llvm.org) | [16.0](https://github.com/bitcoin/bitcoin/pull/30263) |
 | [GCC](https://gcc.gnu.org) | [11.1](https://github.com/bitcoin/bitcoin/pull/29091) |
-| [Python](https://www.python.org) (scripts, tests) | [3.9](https://github.com/bitcoin/bitcoin/pull/28211) |
+| [Python](https://www.python.org) (scripts, tests) | [3.10](https://github.com/bitcoin/bitcoin/pull/30527) |
 | [systemtap](https://sourceware.org/systemtap/) ([tracing](tracing.md))| N/A |
 
 ## Required

From 7b80dfbad6272d16ea9a685f0216d152f49723dc Mon Sep 17 00:00:00 2001
From: Kittywhiskers Van Gogh <63189531+kwvg@users.noreply.github.com>
Date: Fri, 25 Aug 2023 21:23:29 -0600
Subject: [PATCH 551/656] merge bitcoin#28347: replace deprecated pkg_resources
 with importlib.metadata

---
 test/lint/lint-python.py | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/test/lint/lint-python.py b/test/lint/lint-python.py
index 574cb65cc05e..fb6224b06e8a 100755
--- a/test/lint/lint-python.py
+++ b/test/lint/lint-python.py
@@ -9,10 +9,12 @@
 """
 
 import os
-import pkg_resources
 import subprocess
 import sys
 
+from importlib.metadata import metadata, PackageNotFoundError
+
+
 DEPS = ['flake8', 'lief', 'mypy', 'pyzmq']
 MYPY_CACHE_DIR = f"{os.getenv('BASE_ROOT_DIR', '')}/test/.mypy_cache"
 FILES_ARGS = ['git', 'ls-files', '--','test/functional/*.py', 'contrib/devtools/*.py', ':(exclude)contrib/devtools/github-merge.py']
@@ -95,10 +97,10 @@
 
 
 def check_dependencies():
-    working_set = {pkg.key for pkg in pkg_resources.working_set}
-
     for dep in DEPS:
-        if dep not in working_set:
+        try:
+            metadata(dep)
+        except PackageNotFoundError:
             print(f"Skipping Python linting since {dep} is not installed.")
             exit(0)
 

From 80a44e9b34c636a301920a67c42168cee10ad516 Mon Sep 17 00:00:00 2001
From: Kittywhiskers Van Gogh <63189531+kwvg@users.noreply.github.com>
Date: Mon, 17 Nov 2025 22:00:44 +0530
Subject: [PATCH 552/656] partial bitcoin#26257: python linter flake8 E275
 fixup, update dependencies

includes:
- 1e5e87cec3 (portions)
---
 ci/lint/04_install.sh                    | 6 +++---
 contrib/containers/ci/ci-slim.Dockerfile | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/ci/lint/04_install.sh b/ci/lint/04_install.sh
index f70ff2d2235e..4bdb44f8245a 100755
--- a/ci/lint/04_install.sh
+++ b/ci/lint/04_install.sh
@@ -36,9 +36,9 @@ fi
 ${CI_RETRY_EXE} pip3 install codespell==2.1.0
 ${CI_RETRY_EXE} pip3 install flake8==4.0.1
 ${CI_RETRY_EXE} pip3 install lief==0.13.1
-${CI_RETRY_EXE} pip3 install mypy==0.942
-${CI_RETRY_EXE} pip3 install pyzmq==22.3.0
-${CI_RETRY_EXE} pip3 install vulture==2.3
+${CI_RETRY_EXE} pip3 install mypy==0.971
+${CI_RETRY_EXE} pip3 install pyzmq==24.0.1
+${CI_RETRY_EXE} pip3 install vulture==2.6
 
 SHELLCHECK_VERSION=v0.8.0
 curl -sL "https://github.com/koalaman/shellcheck/releases/download/${SHELLCHECK_VERSION}/shellcheck-${SHELLCHECK_VERSION}.linux.x86_64.tar.xz" | \
diff --git a/contrib/containers/ci/ci-slim.Dockerfile b/contrib/containers/ci/ci-slim.Dockerfile
index 76c9bfdb4e85..c5f822a8d286 100644
--- a/contrib/containers/ci/ci-slim.Dockerfile
+++ b/contrib/containers/ci/ci-slim.Dockerfile
@@ -78,9 +78,9 @@ RUN uv pip install --system --break-system-packages \
     jinja2 \
     lief==0.13.2 \
     multiprocess \
-    mypy==0.942 \
-    pyzmq==22.3.0 \
-    vulture==2.3
+    mypy==0.971 \
+    pyzmq==24.0.1 \
+    vulture==2.6
 
 # Install packages relied on by tests
 ARG DASH_HASH_VERSION=1.4.0

From 4110ff38fc70a9df24d019848be57548c8490f6e Mon Sep 17 00:00:00 2001
From: Kittywhiskers Van Gogh <63189531+kwvg@users.noreply.github.com>
Date: Mon, 17 Nov 2025 22:01:52 +0530
Subject: [PATCH 553/656] lint: mypy 0.981

---
 ci/lint/04_install.sh                    | 2 +-
 contrib/containers/ci/ci-slim.Dockerfile | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ci/lint/04_install.sh b/ci/lint/04_install.sh
index 4bdb44f8245a..0453e9167488 100755
--- a/ci/lint/04_install.sh
+++ b/ci/lint/04_install.sh
@@ -36,7 +36,7 @@ fi
 ${CI_RETRY_EXE} pip3 install codespell==2.1.0
 ${CI_RETRY_EXE} pip3 install flake8==4.0.1
 ${CI_RETRY_EXE} pip3 install lief==0.13.1
-${CI_RETRY_EXE} pip3 install mypy==0.971
+${CI_RETRY_EXE} pip3 install mypy==0.981
 ${CI_RETRY_EXE} pip3 install pyzmq==24.0.1
 ${CI_RETRY_EXE} pip3 install vulture==2.6
 
diff --git a/contrib/containers/ci/ci-slim.Dockerfile b/contrib/containers/ci/ci-slim.Dockerfile
index c5f822a8d286..1738f0ab619a 100644
--- a/contrib/containers/ci/ci-slim.Dockerfile
+++ b/contrib/containers/ci/ci-slim.Dockerfile
@@ -78,7 +78,7 @@ RUN uv pip install --system --break-system-packages \
     jinja2 \
     lief==0.13.2 \
     multiprocess \
-    mypy==0.971 \
+    mypy==0.981 \
     pyzmq==24.0.1 \
     vulture==2.6
 

From d6489f00c7bf141dd5a6c1ba4d8b967e7a3d7cd5 Mon Sep 17 00:00:00 2001
From: Kittywhiskers Van Gogh <63189531+kwvg@users.noreply.github.com>
Date: Tue, 18 Nov 2025 10:16:29 +0530
Subject: [PATCH 554/656] fix: make copy of `skip` in `GetStackFrames` to avoid
 clobbering

---
 src/stacktraces.cpp | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/stacktraces.cpp b/src/stacktraces.cpp
index 26283eb23109..f1d68f27dbc2 100644
--- a/src/stacktraces.cpp
+++ b/src/stacktraces.cpp
@@ -167,6 +167,8 @@ static uint64_t ConvertAddress(uint64_t addr)
 static __attribute__((noinline)) std::vector<uint64_t> GetStackFrames(size_t skip, size_t max_frames, const CONTEXT* pContext = nullptr)
 {
 #ifdef ENABLE_STACKTRACES
+    volatile size_t skip_frames = skip;
+
     // We can't use libbacktrace for stack unwinding on Windows as it returns invalid addresses (like 0x1 or 0xffffffff)
     // dbghelp is not thread safe
     static StdMutex m;
@@ -205,7 +207,7 @@ static __attribute__((noinline)) std::vector<uint64_t> GetStackFrames(size_t ski
     stackframe.AddrStack.Offset = context.Rsp;
     stackframe.AddrStack.Mode = AddrModeFlat;
     if (!pContext) {
-        skip++; // skip this method
+        skip_frames = skip_frames + 1; // skip this method
     }
 #else
 #error unsupported architecture
@@ -223,7 +225,7 @@ static __attribute__((noinline)) std::vector<uint64_t> GetStackFrames(size_t ski
         if (!result) {
             break;
         }
-        if (i >= skip) {
+        if (i >= skip_frames) {
             uint64_t pc = ConvertAddress(stackframe.AddrPC.Offset);
             if (pc == 0) {
                 pc = stackframe.AddrPC.Offset;

From 6a1786cb1f0e145d8172b4e84e807d24446c0dcf Mon Sep 17 00:00:00 2001
From: Kittywhiskers Van Gogh <63189531+kwvg@users.noreply.github.com>
Date: Sun, 16 Nov 2025 08:16:42 +0530
Subject: [PATCH 555/656] fix: resolve `test: =: unary operator expected` error

---
 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/configure.ac b/configure.ac
index f4fa99953b1c..6eccd119c840 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1272,7 +1272,7 @@ if test "$enable_crashhooks" = "yes"; then
 fi
 
 AX_CHECK_LINK_FLAG([-Wl,-wrap=__cxa_allocate_exception], [LINK_WRAP_SUPPORTED=yes],,,)
-AM_CONDITIONAL([CRASH_HOOKS_WRAPPED_CXX_ABI],[test $LINK_WRAP_SUPPORTED = "yes"])
+AM_CONDITIONAL([CRASH_HOOKS_WRAPPED_CXX_ABI],[test "$LINK_WRAP_SUPPORTED" = "yes"])
 
 if test "$LINK_WRAP_SUPPORTED" = "yes"; then
   AC_DEFINE(CRASH_HOOKS_WRAPPED_CXX_ABI, 1, [Define this symbol to use wrapped CXX ABIs for exception stacktraces])

From 6ea897ac0024a3a2230fe63c23ea5d82e824fae9 Mon Sep 17 00:00:00 2001
From: Kittywhiskers Van Gogh <63189531+kwvg@users.noreply.github.com>
Date: Sun, 16 Nov 2025 08:24:01 +0530
Subject: [PATCH 556/656] chore: drop unmaintained Guix container

---
 contrib/guix/Dockerfile | 63 -----------------------------------------
 contrib/guix/INSTALL.md |  5 ++--
 2 files changed, 2 insertions(+), 66 deletions(-)
 delete mode 100644 contrib/guix/Dockerfile

diff --git a/contrib/guix/Dockerfile b/contrib/guix/Dockerfile
deleted file mode 100644
index bffb10f75c48..000000000000
--- a/contrib/guix/Dockerfile
+++ /dev/null
@@ -1,63 +0,0 @@
-FROM alpine:3.17
-
-RUN apk --no-cache --update add \
-      bash \
-      bzip2 \
-      ca-certificates \
-      curl \
-      git \
-      make \
-      shadow
-
-ARG guix_download_path=ftp://ftp.gnu.org/gnu/guix
-ARG guix_version=1.4.0
-ARG guix_checksum_aarch64=72d807392889919940b7ec9632c45a259555e6b0942ea7bfd131101e08ebfcf4
-ARG guix_checksum_x86_64=236ca7c9c5958b1f396c2924fcc5bc9d6fdebcb1b4cf3c7c6d46d4bf660ed9c9
-ARG builder_count=32
-
-ENV PATH="/root/.config/guix/current/bin:$PATH"
-
-# Application Setup
-# https://guix.gnu.org/manual/en/html_node/Application-Setup.html
-ENV GUIX_LOCPATH="/root/.guix-profile/lib/locale"
-ENV LC_ALL="en_US.UTF-8"
-
-RUN guix_file_name=guix-binary-${guix_version}.$(uname -m)-linux.tar.xz    && \
-    eval "guix_checksum=\${guix_checksum_$(uname -m)}"                     && \
-    cd /tmp                                                                && \
-    wget -q -O "$guix_file_name" "${guix_download_path}/${guix_file_name}" && \
-    echo "${guix_checksum}  ${guix_file_name}" | sha256sum -c              && \
-    tar xJf "$guix_file_name"                                              && \
-    mv var/guix /var/                                                      && \
-    mv gnu /                                                               && \
-    mkdir -p ~root/.config/guix                                            && \
-    ln -sf /var/guix/profiles/per-user/root/current-guix ~root/.config/guix/current && \
-    source ~root/.config/guix/current/etc/profile
-
-# Guix expects this file to exist
-RUN touch /etc/nsswitch.conf
-
-RUN guix archive --authorize < ~root/.config/guix/current/share/guix/ci.guix.gnu.org.pub
-
-# Build Environment Setup
-# https://guix.gnu.org/manual/en/html_node/Build-Environment-Setup.html
-
-RUN groupadd --system guixbuild
-RUN for i in $(seq -w 1 ${builder_count}); do    \
-      useradd -g guixbuild -G guixbuild          \
-              -d /var/empty -s $(which nologin)  \
-              -c "Guix build user ${i}" --system \
-              "guixbuilder${i}" ;                \
-    done
-
-ENTRYPOINT ["/root/.config/guix/current/bin/guix-daemon","--build-users-group=guixbuild"]
-
-RUN git clone https://github.com/dashpay/dash.git /dash
-
-RUN mkdir base_cache sources SDKs
-
-WORKDIR /dash
-
-RUN mkdir -p depends/SDKs && \
-    curl -L https://bitcoincore.org/depends-sources/sdks/Xcode-15.0-15A240d-extracted-SDK-with-libcxx-headers.tar.gz | tar -xz -C depends/SDKs
-
diff --git a/contrib/guix/INSTALL.md b/contrib/guix/INSTALL.md
index d96e71edf218..b347c8350858 100644
--- a/contrib/guix/INSTALL.md
+++ b/contrib/guix/INSTALL.md
@@ -19,7 +19,6 @@ Otherwise, you may choose from one of the following options to install Guix:
    - Installs any release
    - Binary installation only, requires high level of trust
 3. Using **Docker image** [↗︎ external instructions][install-docker]
-   - Maintained by pastapastapasta
    - Easy (automatically performs *some* setup)
    - Works wherever Docker images work
    - Installs any release
@@ -59,8 +58,8 @@ so you should log out and log back in.
 
 ## Option 3: Using Docker image
 
-Please refer to Docker's image
-[here](https://github.com/dashpay/dash/tree/master/contrib/guix/Dockerfile).
+Please refer to Docker image
+[here](https://github.com/dashpay/dash/tree/master/contrib/containers/guix/Dockerfile).
 
 ## Option 4: Using a distribution-maintained package
 

From 29e98e38c48dd0174f298d1ebbd5c3cf814cabbd Mon Sep 17 00:00:00 2001
From: Kittywhiskers Van Gogh <63189531+kwvg@users.noreply.github.com>
Date: Sun, 16 Nov 2025 08:26:32 +0530
Subject: [PATCH 557/656] chore: document `USER_ID` and `GROUP_ID` in
 `docker-compose.yml`

---
 contrib/containers/develop/docker-compose.yml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/contrib/containers/develop/docker-compose.yml b/contrib/containers/develop/docker-compose.yml
index 9238c97183e7..e513f4c4769c 100644
--- a/contrib/containers/develop/docker-compose.yml
+++ b/contrib/containers/develop/docker-compose.yml
@@ -4,6 +4,9 @@ services:
     build:
       context: '..'
       dockerfile: './develop/Dockerfile'
+      args:
+        USER_ID: 1000   # set this to $(id -u) of the host
+        GROUP_ID: 1000  # set this to $(id -g) of the host
     ports:
       - "9998:9998"           # Mainnet Ports
       - "9999:9999"

From 066d4094b1be2707ac8fe51c92b6ca8e613b5d52 Mon Sep 17 00:00:00 2001
From: Kittywhiskers Van Gogh <63189531+kwvg@users.noreply.github.com>
Date: Sun, 16 Nov 2025 08:27:23 +0530
Subject: [PATCH 558/656] chore: remove outdated `boot2docker` comment

---
 contrib/containers/develop/docker-compose.yml | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/contrib/containers/develop/docker-compose.yml b/contrib/containers/develop/docker-compose.yml
index e513f4c4769c..c6f2cea70424 100644
--- a/contrib/containers/develop/docker-compose.yml
+++ b/contrib/containers/develop/docker-compose.yml
@@ -16,19 +16,8 @@ services:
       - seccomp:unconfined
     stdin_open: true  # Equivalent to -i
     tty: true         # Equivalent to -t
-
-# A note about volumes:
-#
-# If Docker is interacting with your operating system directly
-# without an intermediate VM, then you do not need to change anything
-#
-# But if not, then you'll need to mount your system's root directory
-# (i.e. /) into the boot2docker instance if you want to mirror the exact
-# filesystem structure of your host.
-#
     volumes:
       - type: bind
-#        source: /host/$PWD # Workaround needed on non-Linux hosts
         source: ../../..
         target: /src/dash
 

From 82723dc788e287cbdacee303efe1e01f78dffd6c Mon Sep 17 00:00:00 2001
From: Kittywhiskers Van Gogh <63189531+kwvg@users.noreply.github.com>
Date: Fri, 21 Nov 2025 01:33:43 +0530
Subject: [PATCH 559/656] fix: don't forget to assign user to group if group
 exists

---
 contrib/containers/ci/ci-slim.Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/contrib/containers/ci/ci-slim.Dockerfile b/contrib/containers/ci/ci-slim.Dockerfile
index 1738f0ab619a..09843ccc34db 100644
--- a/contrib/containers/ci/ci-slim.Dockerfile
+++ b/contrib/containers/ci/ci-slim.Dockerfile
@@ -123,7 +123,7 @@ RUN set -ex; \
 ARG USER_ID=1000 \
     GROUP_ID=1000
 RUN set -ex; \
-    getent group ${GROUP_ID} || groupmod -g ${GROUP_ID} -n dash ubuntu; \
+    (getent group ${GROUP_ID} && usermod -g ${GROUP_ID} ubuntu) || groupmod -g ${GROUP_ID} -n dash ubuntu; \
     usermod -u ${USER_ID} -md /home/dash -l dash ubuntu; \
     chown ${USER_ID}:${GROUP_ID} -R /home/dash; \
     mkdir -p /src/dash && \

From 4d278c65744702d7fbf8bd836139bb14c74ed64e Mon Sep 17 00:00:00 2001
From: pasta <pasta@dashboost.org>
Date: Thu, 20 Nov 2025 14:16:43 -0600
Subject: [PATCH 560/656] fix: shellcheck

---
 contrib/guix/libexec/build.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/contrib/guix/libexec/build.sh b/contrib/guix/libexec/build.sh
index 88023e71c25f..4e378b000979 100755
--- a/contrib/guix/libexec/build.sh
+++ b/contrib/guix/libexec/build.sh
@@ -354,7 +354,7 @@ mkdir -p "$DISTSRC"
                             find "${DISTNAME}/lib" -type f -print0
                         } | while IFS= read -r -d '' elf; do
                             if file "$elf" | grep -q "ELF.*executable\|ELF.*shared object"; then
-                                build_id=$(${HOST}-readelf -n "$elf" 2>/dev/null | awk '/Build ID/ {print $3; exit}')
+                                build_id=$("${HOST}"-readelf -n "$elf" 2>/dev/null | awk '/Build ID/ {print $3; exit}')
                                 if [ -n "$build_id" ] && [ -f "${elf}.dbg" ]; then
                                     dir="${DISTNAME}/usr/lib/debug/.build-id/${build_id:0:2}"
                                     mkdir -p "$dir"
@@ -374,13 +374,13 @@ mkdir -p "$DISTSRC"
                                 while IFS= read -r -d '' elf; do
                                     if file "$elf" | grep -q "ELF.*executable\|ELF.*shared object"; then
                                         # Check for build-id
-                                        if ! ${HOST}-readelf -n "$elf" 2>/dev/null | grep -q "Build ID"; then
+                                        if ! "${HOST}"-readelf -n "$elf" 2>/dev/null | grep -q "Build ID"; then
                                             echo "ERROR: No build-id found in $elf" >&2
                                             verification_failed=1
                                         fi
 
                                         # Check for .gnu_debuglink
-                                        if ! ${HOST}-readelf --string-dump=.gnu_debuglink "$elf" >/dev/null 2>&1; then
+                                        if ! "${HOST}"-readelf --string-dump=.gnu_debuglink "$elf" >/dev/null 2>&1; then
                                             echo "ERROR: No .gnu_debuglink found in $elf" >&2
                                             verification_failed=1
                                         fi

From c359fb28904b91805270a01953ac54b708b7e940 Mon Sep 17 00:00:00 2001
From: Kittywhiskers Van Gogh <63189531+kwvg@users.noreply.github.com>
Date: Sun, 16 Nov 2025 08:48:34 +0530
Subject: [PATCH 561/656] ci: bump to Clang 19

---
 ci/test/00_setup_env_native_fuzz.sh               | 2 +-
 ci/test/00_setup_env_native_fuzz_with_valgrind.sh | 2 +-
 ci/test/00_setup_env_native_multiprocess.sh       | 4 ++--
 ci/test/00_setup_env_native_tsan.sh               | 6 +++---
 ci/test/00_setup_env_native_ubsan.sh              | 4 ++--
 ci/test/00_setup_env_native_valgrind.sh           | 2 +-
 contrib/containers/ci/ci-slim.Dockerfile          | 2 +-
 7 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/ci/test/00_setup_env_native_fuzz.sh b/ci/test/00_setup_env_native_fuzz.sh
index 18929cc2b2f0..586496215358 100755
--- a/ci/test/00_setup_env_native_fuzz.sh
+++ b/ci/test/00_setup_env_native_fuzz.sh
@@ -15,4 +15,4 @@ export RUN_UNIT_TESTS=false
 export RUN_FUNCTIONAL_TESTS=false
 export RUN_FUZZ_TESTS=true
 export GOAL="install"
-export BITCOIN_CONFIG="--enable-zmq --disable-ccache --enable-fuzz --with-sanitizers=fuzzer,address,undefined,integer CC='clang-18 -ftrivial-auto-var-init=pattern' CXX='clang++-18 -ftrivial-auto-var-init=pattern' --with-boost-process"
+export BITCOIN_CONFIG="--enable-zmq --disable-ccache --enable-fuzz --with-sanitizers=fuzzer,address,undefined,integer CC='clang-19 -ftrivial-auto-var-init=pattern' CXX='clang++-19 -ftrivial-auto-var-init=pattern' --with-boost-process"
diff --git a/ci/test/00_setup_env_native_fuzz_with_valgrind.sh b/ci/test/00_setup_env_native_fuzz_with_valgrind.sh
index f379d8ee7edc..59d921d54fc9 100755
--- a/ci/test/00_setup_env_native_fuzz_with_valgrind.sh
+++ b/ci/test/00_setup_env_native_fuzz_with_valgrind.sh
@@ -15,5 +15,5 @@ export RUN_FUZZ_TESTS=true
 export FUZZ_TESTS_CONFIG="--valgrind"
 export GOAL="install"
 # Temporarily pin dwarf 4, until valgrind can understand clang's dwarf 5
-export BITCOIN_CONFIG="--enable-fuzz --with-sanitizers=fuzzer CC=clang-18 CXX=clang++-18 CFLAGS='-gdwarf-4' CXXFLAGS='-gdwarf-4'"
+export BITCOIN_CONFIG="--enable-fuzz --with-sanitizers=fuzzer CC=clang-19 CXX=clang++-19 CFLAGS='-gdwarf-4' CXXFLAGS='-gdwarf-4'"
 export CCACHE_MAXSIZE=200M
diff --git a/ci/test/00_setup_env_native_multiprocess.sh b/ci/test/00_setup_env_native_multiprocess.sh
index 7ab95903d131..f0e6e532b162 100755
--- a/ci/test/00_setup_env_native_multiprocess.sh
+++ b/ci/test/00_setup_env_native_multiprocess.sh
@@ -9,11 +9,11 @@ export LC_ALL=C.UTF-8
 export CONTAINER_NAME=ci_native_multiprocess
 export HOST=x86_64-pc-linux-gnu
 export PACKAGES="cmake python3 llvm clang"
-export DEP_OPTS="MULTIPROCESS=1 CC=clang-18 CXX=clang++-18"
+export DEP_OPTS="MULTIPROCESS=1 CC=clang-19 CXX=clang++-19"
 export RUN_TIDY=true
 export GOAL="install"
 export TEST_RUNNER_EXTRA="--v2transport"
-export BITCOIN_CONFIG="--with-boost-process --enable-debug CC=clang-18 CXX=clang++-18" # Use clang to avoid OOM
+export BITCOIN_CONFIG="--with-boost-process --enable-debug CC=clang-19 CXX=clang++-19" # Use clang to avoid OOM
 # Additional flags for RUN_TIDY
 export BITCOIN_CONFIG="${BITCOIN_CONFIG} --disable-hardening CFLAGS='-O0 -g0' CXXFLAGS='-O0 -g0 -Wno-error=documentation'"
 export BITCOIND=dash-node  # Used in functional tests
diff --git a/ci/test/00_setup_env_native_tsan.sh b/ci/test/00_setup_env_native_tsan.sh
index 3820e469aa5f..2feddf269806 100755
--- a/ci/test/00_setup_env_native_tsan.sh
+++ b/ci/test/00_setup_env_native_tsan.sh
@@ -7,11 +7,11 @@
 export LC_ALL=C.UTF-8
 
 export CONTAINER_NAME=ci_native_tsan
-export PACKAGES="clang-18 llvm-18 libclang-rt-18-dev libc++abi-18-dev libc++-18-dev python3-zmq"
-export DEP_OPTS="CC=clang-18 CXX='clang++-18 -stdlib=libc++'"
+export PACKAGES="clang-19 llvm-19 libclang-rt-19-dev libc++abi-19-dev libc++-19-dev python3-zmq"
+export DEP_OPTS="CC=clang-19 CXX='clang++-19 -stdlib=libc++'"
 export TEST_RUNNER_EXTRA="--extended --exclude feature_pruning,feature_dbcrash,wallet_multiwallet.py" # Temporarily suppress ASan heap-use-after-free (see issue #14163)
 export TEST_RUNNER_EXTRA="${TEST_RUNNER_EXTRA} --timeout-factor=4"  # Increase timeout because sanitizers slow down
 export GOAL="install"
-export BITCOIN_CONFIG="--enable-zmq --with-sanitizers=thread CC=clang-18 CXX=clang++-18 CXXFLAGS='-g' --with-boost-process"
+export BITCOIN_CONFIG="--enable-zmq --with-sanitizers=thread CC=clang-19 CXX=clang++-19 CXXFLAGS='-g' --with-boost-process"
 export CPPFLAGS="-DARENA_DEBUG -DDEBUG_LOCKORDER -DDEBUG_LOCKCONTENTION"
 export PYZMQ=true
diff --git a/ci/test/00_setup_env_native_ubsan.sh b/ci/test/00_setup_env_native_ubsan.sh
index 9fb440dfd41e..f562bce0edbf 100755
--- a/ci/test/00_setup_env_native_ubsan.sh
+++ b/ci/test/00_setup_env_native_ubsan.sh
@@ -8,8 +8,8 @@
 export LC_ALL=C.UTF-8
 
 export CONTAINER_NAME=ci_native_ubsan
-export PACKAGES="clang-18 llvm-18 python3-zmq qtbase5-dev qttools5-dev-tools libevent-dev bsdmainutils libboost-dev libdb5.3++-dev libminiupnpc-dev libzmq3-dev libqrencode-dev"
+export PACKAGES="clang-19 llvm-19 python3-zmq qtbase5-dev qttools5-dev-tools libevent-dev bsdmainutils libboost-dev libdb5.3++-dev libminiupnpc-dev libzmq3-dev libqrencode-dev"
 export DEP_OPTS="NO_UPNP=1 DEBUG=1"
 export GOAL="install"
-export BITCOIN_CONFIG="--enable-zmq --enable-reduce-exports --enable-crash-hooks --with-sanitizers=undefined CC=clang-18 CXX=clang++-18"
+export BITCOIN_CONFIG="--enable-zmq --enable-reduce-exports --enable-crash-hooks --with-sanitizers=undefined CC=clang-19 CXX=clang++-19"
 export PYZMQ=true
diff --git a/ci/test/00_setup_env_native_valgrind.sh b/ci/test/00_setup_env_native_valgrind.sh
index d7bf8b2f3550..478a347d8c9d 100755
--- a/ci/test/00_setup_env_native_valgrind.sh
+++ b/ci/test/00_setup_env_native_valgrind.sh
@@ -12,4 +12,4 @@ export NO_DEPENDS=1
 export TEST_RUNNER_EXTRA="--exclude rpc_bind,feature_bind_extra --timeout-factor=4"  # Excluded for now, see https://github.com/bitcoin/bitcoin/issues/17765#issuecomment-602068547
 export GOAL="install"
 # Temporarily pin dwarf 4, until valgrind can understand clang's dwarf 5
-export BITCOIN_CONFIG="--enable-zmq --with-incompatible-bdb --with-gui=no CC=clang-18 CXX=clang++-18 CFLAGS='-gdwarf-4' CXXFLAGS='-gdwarf-4'"  # TODO enable GUI
+export BITCOIN_CONFIG="--enable-zmq --with-incompatible-bdb --with-gui=no CC=clang-19 CXX=clang++-19 CFLAGS='-gdwarf-4' CXXFLAGS='-gdwarf-4'"  # TODO enable GUI
diff --git a/contrib/containers/ci/ci-slim.Dockerfile b/contrib/containers/ci/ci-slim.Dockerfile
index ae59495f3981..fce0e5bc161b 100644
--- a/contrib/containers/ci/ci-slim.Dockerfile
+++ b/contrib/containers/ci/ci-slim.Dockerfile
@@ -110,7 +110,7 @@ RUN set -ex; \
 ENV PATH="/opt/shellcheck:${PATH}"
 
 # Packages needed to be able to run sanitizer builds
-ARG LLVM_VERSION=18
+ARG LLVM_VERSION=19
 RUN set -ex; \
     . /etc/os-release; \
     curl -fsSL https://apt.llvm.org/llvm-snapshot.gpg.key > /etc/apt/trusted.gpg.d/apt.llvm.org.asc; \

From 0029e6f5402c29871824aa5ea97c225c8bb3554e Mon Sep 17 00:00:00 2001
From: Andrew Chow <github@achow101.com>
Date: Fri, 1 Sep 2023 13:17:42 -0400
Subject: [PATCH 562/656] Merge bitcoin/bitcoin#28350: Log explicit error
 message when coindb is found in inconsistent state

df60de770d8e27c00eced29d8a4a4bce7c6e4b30 log: Print error message when coindb is in inconsistent state (Fabian Jahr)

Pull request description:

  While doing manual testing on assumeutxo this week I managed to put the coindb into an inconsistent state twice. For a normal user, this can also happen if their computer crashes during a flush or if they try to stop their node during a flush and then get tired of waiting and just shut their computer down or kill the process. It's an edge case but I wouldn't be surprised if this does happen more often when assumeutxo gets used more widely because there might be multiple flushes happening during loading of the UTXO set in the beginning and users may think something is going wrong because of the unexpected wait or they forgot some configs and want to start over quickly.

  The problem is, when this happens at first the node starts up normally until it's time to flush again and then it hits an assert that the user can not understand.

  ```
  2023-08-25T16:31:09Z [httpworker.0] [snapshot] 52000000 coins loaded (43.30%, 6768 MB)
  2023-08-25T16:31:16Z [httpworker.0] Cache size (7272532192) exceeds total space (7256510300)
  2023-08-25T16:31:16Z [httpworker.0] FlushSnapshotToDisk: flushing coins cache (7272 MB) started
  Assertion failed: (old_heads[0] == hashBlock), function BatchWrite, file txdb.cpp, line 126.
  Abort trap: 6
  ```

  We should at least log an error message that gives users a hint of what the problem is and what they can do to resolve it. I am keeping this separate from the assumeutxo project since this issue can also happen during any regular flush.

ACKs for top commit:
  jonatack:
    ACK df60de770d8e27c00eced29d8a4a4bce7c6e4b30
  achow101:
    ACK df60de770d8e27c00eced29d8a4a4bce7c6e4b30
  ryanofsky:
    Code review ACK df60de770d8e27c00eced29d8a4a4bce7c6e4b30
  jamesob:
    Code review ACK df60de770d8e27c00eced29d8a4a4bce7c6e4b30

Tree-SHA512: b546aa0b0323ece2962867a29c38e014ac83ae8f1ded090da2894b4ff2450c05229629c7e8892f7b550cf7def4038a0b4119812e548e11b00c60b1dc3d4276d2
---
 src/txdb.cpp | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/txdb.cpp b/src/txdb.cpp
index 6237b26a707a..73827a9a3e5f 100644
--- a/src/txdb.cpp
+++ b/src/txdb.cpp
@@ -114,6 +114,9 @@ bool CCoinsViewDB::BatchWrite(CCoinsMap &mapCoins, const uint256 &hashBlock, boo
         // We may be in the middle of replaying.
         std::vector<uint256> old_heads = GetHeadBlocks();
         if (old_heads.size() == 2) {
+            if (old_heads[0] != hashBlock) {
+                LogPrintLevel(BCLog::COINDB, BCLog::Level::Error, "The coins database detected an inconsistent state, likely due to a previous crash or shutdown. You will need to restart bitcoind with the -reindex-chainstate or -reindex configuration option.\n");
+            }
             assert(old_heads[0] == hashBlock);
             old_tip = old_heads[1];
         }

From 404230ca7634baa3e06cef050e257c9a043ba44c Mon Sep 17 00:00:00 2001
From: fanquake <fanquake@gmail.com>
Date: Tue, 5 Sep 2023 11:45:27 +0300
Subject: [PATCH 563/656] Merge bitcoin/bitcoin#28396: test: p2p: check that
 `getaddr` msgs are only responded once per connection

668aa6af8d5fbf047d43cf6f85f3335565637fb9 test: p2p: check that `getaddr` msgs are only responded once per connection (Sebastian Falbesoner)

Pull request description:

  This simple PR adds missing test coverage for ignoring repeated `getaddr` requests (introduced in #7856, commit 66b07247a7a9e48e082502338176cc06edf61474):
  https://github.com/bitcoin/bitcoin/blob/6f03c45f6bb5a6edaa3051968b6a1ca4f84d2ccb/src/net_processing.cpp#L4642-L4648

ACKs for top commit:
  MarcoFalke:
    lgtm ACK 668aa6af8d5fbf047d43cf6f85f3335565637fb9
  brunoerg:
    crACK 668aa6af8d5fbf047d43cf6f85f3335565637fb9

Tree-SHA512: edcdc6501c684fb41911e393f55ded9b044cd2f92918877eca152edd5a4287d1a9d57ae999f1cb42185eae00c3a0af411fcb9bcd5b990ef48849c3834b141584
---
 test/functional/p2p_addr_relay.py | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/test/functional/p2p_addr_relay.py b/test/functional/p2p_addr_relay.py
index da8d8e1895c2..978bf5e655ec 100755
--- a/test/functional/p2p_addr_relay.py
+++ b/test/functional/p2p_addr_relay.py
@@ -296,6 +296,15 @@ def getaddr_tests(self):
         assert_equal(block_relay_peer.num_ipv4_received, 0)
         assert inbound_peer.num_ipv4_received > 100
 
+        self.log.info('Check that we answer getaddr messages only once per connection')
+        received_addrs_before = inbound_peer.num_ipv4_received
+        with self.nodes[0].assert_debug_log(['Ignoring repeated "getaddr".']):
+            inbound_peer.send_and_ping(msg_getaddr())
+        self.bump_mocktime(10 * 60)
+        inbound_peer.sync_with_ping()
+        received_addrs_after = inbound_peer.num_ipv4_received
+        assert_equal(received_addrs_before, received_addrs_after)
+
         self.nodes[0].disconnect_p2ps()
 
     def blocksonly_mode_tests(self):

From 40f088814f221685d57f8adca642e19bc3463eb4 Mon Sep 17 00:00:00 2001
From: Andrew Chow <github@achow101.com>
Date: Tue, 17 Oct 2023 15:21:49 -0400
Subject: [PATCH 564/656] Merge bitcoin/bitcoin#28544: wallet: Add
 TxStateString function for debugging and logging

8a553c94098c96cb3679468c2b460be145a0eabf wallet: Add TxStateString function for debugging and logging (Ryan Ofsky)

Pull request description:

  I found this useful while debugging silent conflict between #10102 and #27469 recently

ACKs for top commit:
  ishaanam:
    utACK 8a553c94098c96cb3679468c2b460be145a0eabf
  achow101:
    ACK 8a553c94098c96cb3679468c2b460be145a0eabf
  furszy:
    Code ACK 8a553c9

Tree-SHA512: 87965c66bcb59a21e7639878bb567e583a0e624735721ff7ad1104eed6bb9fba60607d0e3de7be3304232b3a55f48bab7039ea9c26b0e81963e59f9acd94f666
---
 src/wallet/transaction.h | 11 +++++++++++
 src/wallet/wallet.cpp    |  2 +-
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/src/wallet/transaction.h b/src/wallet/transaction.h
index 0e7830b59e31..bac89c2f633f 100644
--- a/src/wallet/transaction.h
+++ b/src/wallet/transaction.h
@@ -28,10 +28,12 @@ struct TxStateConfirmed {
     int position_in_block;
 
     explicit TxStateConfirmed(const uint256& block_hash, int height, int index) : confirmed_block_hash(block_hash), confirmed_block_height(height), position_in_block(index) {}
+    std::string toString() const { return strprintf("Confirmed (block=%s, height=%i, index=%i)", confirmed_block_hash.ToString(), confirmed_block_height, position_in_block); }
 };
 
 //! State of transaction added to mempool.
 struct TxStateInMempool {
+    std::string toString() const { return strprintf("InMempool"); }
 };
 
 //! State of rejected transaction that conflicts with a confirmed block.
@@ -40,6 +42,7 @@ struct TxStateConflicted {
     int conflicting_block_height;
 
     explicit TxStateConflicted(const uint256& block_hash, int height) : conflicting_block_hash(block_hash), conflicting_block_height(height) {}
+    std::string toString() const { return strprintf("Conflicted (block=%s, height=%i)", conflicting_block_hash.ToString(), conflicting_block_height); }
 };
 
 //! State of transaction not confirmed or conflicting with a known block and
@@ -50,6 +53,7 @@ struct TxStateInactive {
     bool abandoned;
 
     explicit TxStateInactive(bool abandoned = false) : abandoned(abandoned) {}
+    std::string toString() const { return strprintf("Inactive (abandoned=%i)", abandoned); }
 };
 
 //! State of transaction loaded in an unrecognized state with unexpected hash or
@@ -61,6 +65,7 @@ struct TxStateUnrecognized {
     int index;
 
     TxStateUnrecognized(const uint256& block_hash, int index) : block_hash(block_hash), index(index) {}
+    std::string toString() const { return strprintf("Unrecognized (block=%s, index=%i)", block_hash.ToString(), index); }
 };
 
 //! All possible CWalletTx states
@@ -108,6 +113,12 @@ static inline int TxStateSerializedIndex(const TxState& state)
     }, state);
 }
 
+//! Return TxState or SyncTxState as a string for logging or debugging.
+template<typename T>
+std::string TxStateString(const T& state)
+{
+    return std::visit([](const auto& s) { return s.toString(); }, state);
+}
 
 typedef std::map<std::string, std::string> mapValue_t;
 
diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp
index 1caf30747a3b..24c4a2e5ff1d 100644
--- a/src/wallet/wallet.cpp
+++ b/src/wallet/wallet.cpp
@@ -965,7 +965,7 @@ CWalletTx* CWallet::AddToWallet(CTransactionRef tx, const TxState& state, const
     LockProTxCoins(candidates, &batch);
 
     //// debug print
-    WalletLogPrintf("AddToWallet %s  %s%s\n", hash.ToString(), (fInsertedNew ? "new" : ""), (fUpdated ? "update" : ""));
+    WalletLogPrintf("AddToWallet %s  %s%s %s\n", hash.ToString(), (fInsertedNew ? "new" : ""), (fUpdated ? "update" : ""), TxStateString(state));
 
     // Write to disk
     if (fInsertedNew || fUpdated)

From 59bb09989f6398debddc10e57730cd0d0fc2a2d7 Mon Sep 17 00:00:00 2001
From: Andrew Chow <github@achow101.com>
Date: Thu, 2 Nov 2023 15:19:26 -0400
Subject: [PATCH 565/656] Merge bitcoin/bitcoin#27852: test: add coverage to
 rpc_blockchain.py

376dc2cfb32806a8aa450589effe4d384e648398 test: add coverage to rpc_blockchain.py (kevkevin)

Pull request description:

  Included a test that checks the functionality of setting
  the first param of getnetworkhashps to negative value returns
  the average network hashes per second from the last difficulty change.

ACKs for top commit:
  jlopp:
    tACK https://github.com/bitcoin/bitcoin/commit/376dc2cfb32806a8aa450589effe4d384e648398
  achow101:
    ACK 376dc2cfb32806a8aa450589effe4d384e648398
  ismaelsadeeq:
    Tested ACK 376dc2cfb32806a8aa450589effe4d384e648398
  pablomartin4btc:
    tACK 376dc2cfb32806a8aa450589effe4d384e648398

Tree-SHA512: 02d52f622e9cb7a1240c5d124510dd75d03f696f119b2625b0befd60b004ec50ff1a2d5515e0e227601adeecd837e0778ed131ee2a8c5f75f1b824be711213a7
---
 test/functional/rpc_blockchain.py | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/test/functional/rpc_blockchain.py b/test/functional/rpc_blockchain.py
index ba74f84980f5..0f1381d47385 100755
--- a/test/functional/rpc_blockchain.py
+++ b/test/functional/rpc_blockchain.py
@@ -59,6 +59,7 @@
 TIME_RANGE_MTP = TIME_GENESIS_BLOCK + (HEIGHT - 6) * TIME_RANGE_STEP
 TIME_RANGE_TIP = TIME_GENESIS_BLOCK + (HEIGHT - 1) * TIME_RANGE_STEP
 TIME_RANGE_END = TIME_GENESIS_BLOCK + HEIGHT * TIME_RANGE_STEP
+DIFFICULTY_ADJUSTMENT_INTERVAL = 2016
 
 
 class BlockchainTest(BitcoinTestFramework):
@@ -431,6 +432,15 @@ def _test_getnetworkhashps(self):
         # This should be 2 hashes every 2.6 minutes (156 seconds) or 1/78
         assert abs(hashes_per_second * 78 - 1) < 0.0001
 
+        # Test setting the first param of getnetworkhashps to negative value returns the average network
+        # hashes per second from the last difficulty change.
+        current_block_height = self.nodes[0].getmininginfo()['blocks']
+        blocks_since_last_diff_change = current_block_height % DIFFICULTY_ADJUSTMENT_INTERVAL + 1
+        expected_hashes_per_second_since_diff_change = self.nodes[0].getnetworkhashps(blocks_since_last_diff_change)
+
+        assert_equal(self.nodes[0].getnetworkhashps(-1), expected_hashes_per_second_since_diff_change)
+        assert_equal(self.nodes[0].getnetworkhashps(-2), expected_hashes_per_second_since_diff_change)
+
     def _test_stopatheight(self):
         assert_equal(self.nodes[0].getblockcount(), HEIGHT)
         self.generate(self.wallet, 6)

From 7a3df4ed14f347c8ad855391c13f23ffbd013d3e Mon Sep 17 00:00:00 2001
From: fanquake <fanquake@gmail.com>
Date: Mon, 18 Dec 2023 13:46:39 +0000
Subject: [PATCH 566/656] Merge bitcoin/bitcoin#29064: fuzz: Improve fuzzing
 stability for minisketch harness

b2fc7a2eda103724ac8cbeaf99df3ce6f5b7d974 [fuzz] Improve fuzzing stability for minisketch harness (dergoegge)

Pull request description:

  The `minisketch` harness has low stability due to:
  * Rng internal to minisketch
  * Benchmarkning for the best minisketch impl

  Fix this by seeding the rng and letting the fuzzer choose the impl.

  Also see #29018.

ACKs for top commit:
  maflcko:
    review ACK b2fc7a2eda103724ac8cbeaf99df3ce6f5b7d974

Tree-SHA512: 3d81414299c6803c34e928a53bcf843722fa8c38e1d3676cde7fa80923f9058b1ad4b9a2941f718303a6641b17eeb28b4a22eda09678102e9fb7c4e31d06f8f2
---
 src/test/fuzz/minisketch.cpp | 26 +++++++++++++++++++++-----
 1 file changed, 21 insertions(+), 5 deletions(-)

diff --git a/src/test/fuzz/minisketch.cpp b/src/test/fuzz/minisketch.cpp
index a17be73f6c80..698cb15fc94b 100644
--- a/src/test/fuzz/minisketch.cpp
+++ b/src/test/fuzz/minisketch.cpp
@@ -12,14 +12,27 @@
 #include <map>
 #include <numeric>
 
-using node::MakeMinisketch32;
+namespace {
+
+Minisketch MakeFuzzMinisketch32(size_t capacity, uint32_t impl)
+{
+    return Assert(Minisketch(32, impl, capacity));
+}
+
+} // namespace
 
 FUZZ_TARGET(minisketch)
 {
     FuzzedDataProvider fuzzed_data_provider{buffer.data(), buffer.size()};
+
     const auto capacity{fuzzed_data_provider.ConsumeIntegralInRange<size_t>(1, 200)};
-    Minisketch sketch_a{Assert(MakeMinisketch32(capacity))};
-    Minisketch sketch_b{Assert(MakeMinisketch32(capacity))};
+    const uint32_t impl{fuzzed_data_provider.ConsumeIntegralInRange<uint32_t>(0, Minisketch::MaxImplementation())};
+    if (!Minisketch::ImplementationSupported(32, impl)) return;
+
+    Minisketch sketch_a{MakeFuzzMinisketch32(capacity, impl)};
+    Minisketch sketch_b{MakeFuzzMinisketch32(capacity, impl)};
+    sketch_a.SetSeed(fuzzed_data_provider.ConsumeIntegral<uint64_t>());
+    sketch_b.SetSeed(fuzzed_data_provider.ConsumeIntegral<uint64_t>());
 
     // Fill two sets and keep the difference in a map
     std::map<uint32_t, bool> diff;
@@ -47,8 +60,11 @@ FUZZ_TARGET(minisketch)
     }
     const auto num_diff{std::accumulate(diff.begin(), diff.end(), size_t{0}, [](auto n, const auto& e) { return n + e.second; })};
 
-    Minisketch sketch_ar{MakeMinisketch32(capacity)};
-    Minisketch sketch_br{MakeMinisketch32(capacity)};
+    Minisketch sketch_ar{MakeFuzzMinisketch32(capacity, impl)};
+    Minisketch sketch_br{MakeFuzzMinisketch32(capacity, impl)};
+    sketch_ar.SetSeed(fuzzed_data_provider.ConsumeIntegral<uint64_t>());
+    sketch_br.SetSeed(fuzzed_data_provider.ConsumeIntegral<uint64_t>());
+
     sketch_ar.Deserialize(sketch_a.Serialize());
     sketch_br.Deserialize(sketch_b.Serialize());
 

From 0fac60f23cd9da80e886df61347d548cd2131521 Mon Sep 17 00:00:00 2001
From: fanquake <fanquake@gmail.com>
Date: Tue, 16 Jan 2024 10:51:45 +0000
Subject: [PATCH 567/656] Merge bitcoin/bitcoin#29230: doc: update -loglevel
 help to add `info` to the always logged levels

ec779a2b8e4fcc00596ee8833be35ae9b326552c doc: add unconditional info loglevel following merge of PR 28318 (Jon Atack)

Pull request description:

  Commit ab34dc6012351e7b8aab871dd9d2b38ade1cd9b of #28318 was an incomplete version of [`118c756` (#25203)](https://github.com/bitcoin/bitcoin/pull/25203/commits/118c7567f62df2b882877590f232242d7c627a05) from the `Severity-based logging` parent PR.

  Add the missing text to update the `-loglevel` help doc.

  While here, make the help text a little easier to understand.

  Can be tested by running:

  ```
  ./src/bitcoind -regtest -help-debug | grep -A12 loglevel=
  ```

  before
  ```
    -loglevel=<level>|<category>:<level>
         Set the global or per-category severity level for logging categories
         enabled with the -debug configuration option or the logging RPC:
         info, debug, trace (default=debug); warning and error levels are
         always logged.
  ```

  after
  ```
    -loglevel=<level>|<category>:<level>
         Set the global or per-category severity level for logging categories
         enabled with the -debug configuration option or the logging RPC.
         Possible values are info, debug, trace (default=debug). The
         following levels are always logged: error, warning, info.
  ```

ACKs for top commit:
  stickies-v:
    ACK ec779a2b8e4fcc00596ee8833be35ae9b326552c

Tree-SHA512: 0c375e30a5a4c168ca7d97720e8c287f598216767afedae329824e09a480830faf8537b792c5c4bb647c68681c287fe3005c62093708ce85624e9a71c8245e42
---
 src/init/common.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/init/common.cpp b/src/init/common.cpp
index 0a1bff80d48d..d04764d0c73e 100644
--- a/src/init/common.cpp
+++ b/src/init/common.cpp
@@ -65,7 +65,7 @@ void AddLoggingArgs(ArgsManager& argsman)
         ArgsManager::ALLOW_ANY, OptionsCategory::DEBUG_TEST);
     argsman.AddArg("-debugexclude=<category>", "Exclude debug and trace logging for a category. Can be used in conjunction with -debug=1 to output debug and trace logging for all categories except the specified category. This option can be specified multiple times to exclude multiple categories.", ArgsManager::ALLOW_ANY, OptionsCategory::DEBUG_TEST);
     argsman.AddArg("-logips", strprintf("Include IP addresses in debug output (default: %u)", DEFAULT_LOGIPS), ArgsManager::ALLOW_ANY, OptionsCategory::DEBUG_TEST);
-    argsman.AddArg("-loglevel=<level>|<category>:<level>", strprintf("Set the global or per-category severity level for logging categories enabled with the -debug configuration option or the logging RPC: %s (default=%s); warning and error levels are always logged. If <category>:<level> is supplied, the setting will override the global one and may be specified multiple times to set multiple category-specific levels. <category> can be: %s.", LogInstance().LogLevelsString(), LogInstance().LogLevelToStr(BCLog::DEFAULT_LOG_LEVEL), LogInstance().LogCategoriesString()), ArgsManager::DISALLOW_NEGATION | ArgsManager::DISALLOW_ELISION | ArgsManager::DEBUG_ONLY, OptionsCategory::DEBUG_TEST);
+    argsman.AddArg("-loglevel=<level>|<category>:<level>", strprintf("Set the global or per-category severity level for logging categories enabled with the -debug configuration option or the logging RPC. Possible values are %s (default=%s). The following levels are always logged: error, warning, info. If <category>:<level> is supplied, the setting will override the global one and may be specified multiple times to set multiple category-specific levels. <category> can be: %s.", LogInstance().LogLevelsString(), LogInstance().LogLevelToStr(BCLog::DEFAULT_LOG_LEVEL), LogInstance().LogCategoriesString()), ArgsManager::DISALLOW_NEGATION | ArgsManager::DISALLOW_ELISION | ArgsManager::DEBUG_ONLY, OptionsCategory::DEBUG_TEST);
     argsman.AddArg("-logtimestamps", strprintf("Prepend debug output with timestamp (default: %u)", DEFAULT_LOGTIMESTAMPS), ArgsManager::ALLOW_ANY, OptionsCategory::DEBUG_TEST);
     argsman.AddArg("-logthreadnames", strprintf("Prepend debug output with name of the originating thread (only available on platforms supporting thread_local) (default: %u)", DEFAULT_LOGTHREADNAMES), ArgsManager::ALLOW_ANY | ArgsManager::DEBUG_ONLY, OptionsCategory::DEBUG_TEST);
     argsman.AddArg("-logsourcelocations", strprintf("Prepend debug output with name of the originating source location (source file, line number and function name) (default: %u)", DEFAULT_LOGSOURCELOCATIONS), ArgsManager::ALLOW_ANY, OptionsCategory::DEBUG_TEST);

From 39baa2388aec6aebef36207f39d241f129a6532b Mon Sep 17 00:00:00 2001
From: fanquake <fanquake@gmail.com>
Date: Mon, 26 Feb 2024 12:26:03 +0000
Subject: [PATCH 568/656] Merge bitcoin/bitcoin#29467: test: Fix intermittent
 issue in interface_rest.py

faeed91c0be6e5dda4790522d0dc999afd869d11 test: Fix intermittent issue in interface_rest.py (MarcoFalke)

Pull request description:

  Fixes:

  ```
   test  2024-02-22T16:15:37.465000Z TestFramework (ERROR): Assertion failed
    Traceback (most recent call last):
    File "/ci_container_base/ci/scratch/build/bitcoin-x86_64-pc-linux-gnu/test/functional/test_framework/test_framework.py", line 131, in main
     self.run_test()
    File "/ci_container_base/ci/scratch/build/bitcoin-x86_64-pc-linux-gnu/test/functional/interface_rest.py", line 340, in run_test
     assert_equal(json_obj, mempool_info)
    File "/ci_container_base/ci/scratch/build/bitcoin-x86_64-pc-linux-gnu/test/functional/test_framework/util.py", line 57, in assert_equal
     raise AssertionError("not(%s)" % " == ".join(str(arg) for arg in (thing1, thing2) + args))
   AssertionError: not({'loaded': True, 'size': 3, 'bytes': 312, 'usage': 3600, 'total_fee': Decimal('0.00093600'), 'maxmempool': 300000000, 'mempoolminfee': Decimal('0.00001000'), 'minrelaytxfee': Decimal('0.00001000'), 'incrementalrelayfee': Decimal('0.00001000'), 'unbroadcastcount': 1, 'fullrbf': False} == {'loaded': True, 'size': 3, 'bytes': 312, 'usage': 3600, 'total_fee': Decimal('0.00093600'), 'maxmempool': 300000000, 'mempoolminfee': Decimal('0.00001000'), 'minrelaytxfee': Decimal('0.00001000'), 'incrementalrelayfee': Decimal('0.00001000'), 'unbroadcastcount': 0, 'fullrbf': False})
  ```

  https://cirrus-ci.com/task/4852944378527744?logs=ci#L4436

ACKs for top commit:
  m3dwards:
    ACK https://github.com/bitcoin/bitcoin/pull/29467/commits/faeed91c0be6e5dda4790522d0dc999afd869d11
  mzumsande:
    ACK faeed91c0be6e5dda4790522d0dc999afd869d11

Tree-SHA512: 513422229db45d2586c554b9a466e86848bfcf5280b0f000718cbfc44d93dd1af69e19a56f6ac578f5d7aada74ab0c90d4a9e09a324062b6f9ed239e5e34f540
---
 test/functional/interface_rest.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/test/functional/interface_rest.py b/test/functional/interface_rest.py
index 5f63718c4bba..9ec1fe9bbece 100755
--- a/test/functional/interface_rest.py
+++ b/test/functional/interface_rest.py
@@ -336,6 +336,9 @@ def run_test(self):
         assert_greater_than(json_obj['bytes'], 240)
 
         mempool_info = self.nodes[0].getmempoolinfo()
+        # pop unstable unbroadcastcount before check
+        for obj in [json_obj, mempool_info]:
+            obj.pop("unbroadcastcount")
         assert_equal(json_obj, mempool_info)
 
         # Check that there are our submitted transactions in the TX memory pool

From b84939e03545b2613f0d17d2960c83b1892b2896 Mon Sep 17 00:00:00 2001
From: fanquake <fanquake@gmail.com>
Date: Fri, 1 Mar 2024 10:07:35 -0500
Subject: [PATCH 569/656] Merge bitcoin/bitcoin#29495: fuzz: add target for
 local address stuff

25eab523897e790f4f4d7b49cdbf19d13e3b0fcc fuzz: add target for local addresses (brunoerg)

Pull request description:

  This PR adds fuzz target for local address functions - (`AddLocal`, `RemoveLocal`, `SeenLocal`, `IsLocal`)

ACKs for top commit:
  dergoegge:
    ACK 25eab523897e790f4f4d7b49cdbf19d13e3b0fcc
  vasild:
    ACK 25eab523897e790f4f4d7b49cdbf19d13e3b0fcc

Tree-SHA512: 24faaab86dcd8835ba0e2d81fb6322a39a9266c7edf66415dbc4421754054f47efb6e0de4efdc7ea026b0686792658e86a526f7cf27cbc6cf9ed0c4aed376f97
---
 src/test/fuzz/net.cpp | 37 +++++++++++++++++++++++++++++++++++++
 1 file changed, 37 insertions(+)

diff --git a/src/test/fuzz/net.cpp b/src/test/fuzz/net.cpp
index 1de4877f94ae..0089d0f2e8a2 100644
--- a/src/test/fuzz/net.cpp
+++ b/src/test/fuzz/net.cpp
@@ -94,3 +94,40 @@ FUZZ_TARGET(net, .init = initialize_net)
     (void)node.HasPermission(net_permission_flags);
     (void)node.ConnectedThroughNetwork();
 }
+
+FUZZ_TARGET(local_address, .init = initialize_net)
+{
+    FuzzedDataProvider fuzzed_data_provider(buffer.data(), buffer.size());
+    CService service{ConsumeService(fuzzed_data_provider)};
+    CNode node{ConsumeNode(fuzzed_data_provider)};
+    {
+        LOCK(g_maplocalhost_mutex);
+        mapLocalHost.clear();
+    }
+    LIMITED_WHILE(fuzzed_data_provider.ConsumeBool(), 10000) {
+        CallOneOf(
+            fuzzed_data_provider,
+            [&] {
+                service = ConsumeService(fuzzed_data_provider);
+            },
+            [&] {
+                const bool added{AddLocal(service, fuzzed_data_provider.ConsumeIntegralInRange<int>(0, LOCAL_MAX - 1))};
+                if (!added) return;
+                assert(service.IsRoutable());
+                assert(IsLocal(service));
+                assert(SeenLocal(service));
+            },
+            [&] {
+                (void)RemoveLocal(service);
+            },
+            [&] {
+                (void)SeenLocal(service);
+            },
+            [&] {
+                (void)IsLocal(service);
+            },
+            [&] {
+                (void)GetLocalAddress(node);
+            });
+    }
+}

From eacb6b0327942345925ab966c4a90a13cf14c33c Mon Sep 17 00:00:00 2001
From: pasta <pasta@dashboost.org>
Date: Fri, 21 Nov 2025 12:14:40 -0600
Subject: [PATCH 570/656] refactor: optimize node disconnection logic to avoid
 unnecessary locks

---
 src/net.cpp | 25 +++++++++++++++++--------
 1 file changed, 17 insertions(+), 8 deletions(-)

diff --git a/src/net.cpp b/src/net.cpp
index 19f86ab39052..1a2032bfb784 100644
--- a/src/net.cpp
+++ b/src/net.cpp
@@ -2039,18 +2039,27 @@ void CConnman::DisconnectNodes()
     // m_reconnections_mutex while holding m_nodes_mutex.
     decltype(m_reconnections) reconnections_to_add;
 
+    bool has_to_disconnect = false;
     {
-        LOCK(m_nodes_mutex);
+        READ_LOCK(m_nodes_mutex);
 
-        if (!fNetworkActive) {
-            // Disconnect any connected nodes
-            for (CNode* pnode : m_nodes) {
-                if (!pnode->fDisconnect) {
-                    LogPrint(BCLog::NET_NETCONN, "Network not active, dropping peer=%d\n", pnode->GetId());
-                    pnode->fDisconnect = true;
-                }
+        for (CNode* pnode : m_nodes) {
+            // Disconnect any connected nodes, if network is not active
+            if (!fNetworkActive && !pnode->fDisconnect) {
+                LogPrint(BCLog::NET_NETCONN, "Network not active, dropping peer=%d\n", pnode->GetId());
+                pnode->fDisconnect = true;
+            }
+            if (!has_to_disconnect && pnode->fDisconnect) {
+                has_to_disconnect = true;
             }
         }
+    }
+
+    // Avoid taking locks if there's nothing to do
+    if (!has_to_disconnect) return;
+
+    {
+        LOCK(m_nodes_mutex);
 
         // Disconnect unused nodes
         for (auto it = m_nodes.begin(); it != m_nodes.end(); )

From f83a1355a8c87c5e9d70fc956a09b5fef4b95994 Mon Sep 17 00:00:00 2001
From: pasta <pasta@dashboost.org>
Date: Fri, 21 Nov 2025 12:47:48 -0600
Subject: [PATCH 571/656] refactor: segregate CreateSigShare for single member
 handling

---
 src/llmq/signing_shares.cpp | 62 +++++++++++++++++++++----------------
 src/llmq/signing_shares.h   |  2 ++
 2 files changed, 37 insertions(+), 27 deletions(-)

diff --git a/src/llmq/signing_shares.cpp b/src/llmq/signing_shares.cpp
index 43bc21af4af9..b6098e7b6f99 100644
--- a/src/llmq/signing_shares.cpp
+++ b/src/llmq/signing_shares.cpp
@@ -1645,46 +1645,54 @@ void CSigSharesManager::SignPendingSigShares()
     }
 }
 
-std::optional<CSigShare> CSigSharesManager::CreateSigShare(const CQuorum& quorum, const uint256& id, const uint256& msgHash) const
+std::optional<CSigShare> CSigSharesManager::CreateSigShareForSingleMember(const CQuorum& quorum, const uint256& id, const uint256& msgHash) const
 {
     cxxtimer::Timer t(true);
     auto activeMasterNodeProTxHash = m_mn_activeman.GetProTxHash();
 
-    if (!quorum.IsValidMember(activeMasterNodeProTxHash)) {
+    int memberIdx = quorum.GetMemberIndex(activeMasterNodeProTxHash);
+    if (memberIdx == -1) {
+        // this should really not happen (IsValidMember gave true)
         return std::nullopt;
     }
 
-    if (quorum.params.is_single_member()) {
-        int memberIdx = quorum.GetMemberIndex(activeMasterNodeProTxHash);
-        if (memberIdx == -1) {
-            // this should really not happen (IsValidMember gave true)
-            return std::nullopt;
-        }
+    CSigShare sigShare(quorum.params.type, quorum.qc->quorumHash, id, msgHash, uint16_t(memberIdx), {});
+    uint256 signHash = sigShare.buildSignHash().Get();
 
-        CSigShare sigShare(quorum.params.type, quorum.qc->quorumHash, id, msgHash, uint16_t(memberIdx), {});
-        uint256 signHash = sigShare.buildSignHash().Get();
+    // TODO: This one should be SIGN by QUORUM key, not by OPERATOR key
+    // see TODO in CDKGSession::FinalizeSingleCommitment for details
+    auto bls_scheme = bls::bls_legacy_scheme.load();
+    sigShare.sigShare.Set(m_mn_activeman.Sign(signHash, bls_scheme), bls_scheme);
 
-        // TODO: This one should be SIGN by QUORUM key, not by OPERATOR key
-        // see TODO in CDKGSession::FinalizeSingleCommitment for details
-        auto bls_scheme = bls::bls_legacy_scheme.load();
-        sigShare.sigShare.Set(m_mn_activeman.Sign(signHash, bls_scheme), bls_scheme);
+    if (!sigShare.sigShare.Get().IsValid()) {
+        LogPrintf("CSigSharesManager::%s -- failed to sign sigShare. signHash=%s, id=%s, msgHash=%s, time=%s\n",
+                  __func__, signHash.ToString(), sigShare.getId().ToString(), sigShare.getMsgHash().ToString(),
+                  t.count());
+        return std::nullopt;
+    }
 
-        if (!sigShare.sigShare.Get().IsValid()) {
-            LogPrintf("CSigSharesManager::%s -- failed to sign sigShare. signHash=%s, id=%s, msgHash=%s, time=%s\n",
-                      __func__, signHash.ToString(), sigShare.getId().ToString(), sigShare.getMsgHash().ToString(),
-                      t.count());
-            return std::nullopt;
-        }
+    sigShare.UpdateKey();
 
-        sigShare.UpdateKey();
+    LogPrint(BCLog::LLMQ_SIGS, /* Continued */
+             "CSigSharesManager::%s -- created sigShare. signHash=%s, id=%s, msgHash=%s, llmqType=%d, quorum=%s, "
+             "time=%s\n",
+             __func__, signHash.ToString(), sigShare.getId().ToString(), sigShare.getMsgHash().ToString(),
+             ToUnderlying(quorum.params.type), quorum.qc->quorumHash.ToString(), t.count());
 
-        LogPrint(BCLog::LLMQ_SIGS, /* Continued */
-                 "CSigSharesManager::%s -- created sigShare. signHash=%s, id=%s, msgHash=%s, llmqType=%d, quorum=%s, "
-                 "time=%s\n",
-                 __func__, signHash.ToString(), sigShare.getId().ToString(), sigShare.getMsgHash().ToString(),
-                 ToUnderlying(quorum.params.type), quorum.qc->quorumHash.ToString(), t.count());
+    return sigShare;
+}
 
-        return sigShare;
+std::optional<CSigShare> CSigSharesManager::CreateSigShare(const CQuorum& quorum, const uint256& id, const uint256& msgHash) const
+{
+    cxxtimer::Timer t(true);
+    auto activeMasterNodeProTxHash = m_mn_activeman.GetProTxHash();
+
+    if (!quorum.IsValidMember(activeMasterNodeProTxHash)) {
+        return std::nullopt;
+    }
+
+    if (quorum.params.is_single_member()) {
+        return CreateSigShareForSingleMember(quorum, id, msgHash);
     }
     const CBLSSecretKey& skShare = quorum.GetSkShare();
     if (!skShare.IsValid()) {
diff --git a/src/llmq/signing_shares.h b/src/llmq/signing_shares.h
index d729fe31f442..24865fec98a8 100644
--- a/src/llmq/signing_shares.h
+++ b/src/llmq/signing_shares.h
@@ -452,6 +452,8 @@ class CSigSharesManager : public CRecoveredSigsListener
     void NotifyRecoveredSig(const std::shared_ptr<const CRecoveredSig>& sig) const EXCLUSIVE_LOCKS_REQUIRED(!cs);
 
 private:
+    std::optional<CSigShare> CreateSigShareForSingleMember(const CQuorum& quorum, const uint256& id, const uint256& msgHash) const;
+
     // all of these return false when the currently processed message should be aborted (as each message actually contains multiple messages)
     bool ProcessMessageSigSesAnn(const CNode& pfrom, const CSigSesAnn& ann) EXCLUSIVE_LOCKS_REQUIRED(!cs);
     bool ProcessMessageSigSharesInv(const CNode& pfrom, const CSigSharesInv& inv) EXCLUSIVE_LOCKS_REQUIRED(!cs);

From b78bf3eed9a75cd6b183d454b746cd104628b8c0 Mon Sep 17 00:00:00 2001
From: MarcoFalke <falke.marco@gmail.com>
Date: Wed, 23 Feb 2022 09:05:57 +0100
Subject: [PATCH 572/656] Merge bitcoin/bitcoin#24419: lint: remove no-longer
 used exceptions from lint-format-strings.py

5b8f2484baad451b5c24725bf3387c79213b0695 lint: remove no-longer used exceptions from lint-format-strings.py (fanquake)

Pull request description:

ACKs for top commit:
  laanwj:
    ACK 5b8f2484baad451b5c24725bf3387c79213b0695 if it passes CI
  hebasto:
    ACK 5b8f2484baad451b5c24725bf3387c79213b0695, I've verified that all of the remained false positive cases are valid.

Tree-SHA512: 25c40714d271c57fb09c963a3372b62c7b4f2e9367517cdf5c73ea82527a9c4c477f8b7857e37adc7eb9feea1f0a37435059798ddf2195dee3522bed3a6eea44
---
 test/lint/run-lint-format-strings.py | 2 --
 1 file changed, 2 deletions(-)

diff --git a/test/lint/run-lint-format-strings.py b/test/lint/run-lint-format-strings.py
index 985a1c5b6fd9..4e06a93f44d3 100755
--- a/test/lint/run-lint-format-strings.py
+++ b/test/lint/run-lint-format-strings.py
@@ -28,8 +28,6 @@
     ("src/wallet/wallet.h", "LogPrintf((\"%s \" + fmt).c_str(), GetDisplayName(), parameters...)"),
     ("src/wallet/scriptpubkeyman.h",  "WalletLogPrintf(std::string fmt, Params... parameters)"),
     ("src/wallet/scriptpubkeyman.h", "LogPrintf((\"%s \" + fmt).c_str(), m_storage.GetDisplayName(), parameters...)"),
-    ("src/logging.h", "LogPrintf(const char* fmt, const Args&... args)"),
-    ("src/wallet/scriptpubkeyman.h", "WalletLogPrintf(const std::string& fmt, const Params&... parameters)"),
 ]
 
 def parse_function_calls(function_name, source_code):

From f89f8a1c61450d001669a6babcd949790b1a27a2 Mon Sep 17 00:00:00 2001
From: Andrew Chow <achow101-github@achow101.com>
Date: Mon, 18 Jul 2022 14:15:06 -0400
Subject: [PATCH 573/656] Merge bitcoin/bitcoin#25351: rpc, wallet: Scan
 mempool after import* - Second attempt
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

1be796418934ae7370cb0ed501877db59e738106 test, wallet: Add mempool rescan test for import RPCs (Fabian Jahr)
833ce76df712932c19e99737e87b5569e2bca34b rpc, wallet: Document mempool rescan after importdescriptor, importwallet (Fabian Jahr)
0e396d1ba701c9ac6280a98bf37f53352167e724 rpc, wallet: Document mempool scan after importmulti (Fabian Jahr)
e6d3ef85867545a5a66a211e35e818e8a1b166fa rpc, wallet: Document mempool scan after importpubkey (Fabian Jahr)
6d3db52e667474b6c0c2e4eeb9fb5b3ba4063205 rpc, wallet: Document and test mempool scan after importprivkey (João Barbosa)
3abdbbb90a4a8f2041fec37506268e66a0b3eb31 rpc, wallet: Document and test mempool scan after importaddress (João Barbosa)
236239bd40ae1175537fc932df5af27902326329 wallet: Rescan mempool for transactions as well (Fabian Jahr)

Pull request description:

  This PR picks up the work from #18964 and closes #18954.

  It should incorporate all the unaddressed feedback from the PR:
  - Mempool rescan now expanded to all relevant import* RPCs
  - Added documentation in the help of each RPC
  - More tests

ACKs for top commit:
  Sjors:
    re-utACK 1be796418934ae7370cb0ed501877db59e738106 (only a test change)
  achow101:
    ACK 1be796418934ae7370cb0ed501877db59e738106
  w0xlt:
    reACK https://github.com/bitcoin/bitcoin/pull/25351/commits/1be796418934ae7370cb0ed501877db59e738106

Tree-SHA512: b62fed5f97c6c242b2af417b41c9696a1f18878483d9e1c9429791f9c05257f57a00540a9a84df23c49faf6a61c3109c22972de81540083f38b506217804fcc5
---
 src/wallet/rpc/backup.cpp                   | 20 ++++---
 src/wallet/test/wallet_tests.cpp            |  8 +--
 src/wallet/wallet.cpp                       |  7 ++-
 test/functional/rpc_wipewallettxes.py       |  4 +-
 test/functional/wallet_balance.py           | 23 ++++++++
 test/functional/wallet_import_rescan.py     | 59 +++++++++++++++++----
 test/functional/wallet_importdescriptors.py |  6 ++-
 7 files changed, 103 insertions(+), 24 deletions(-)

diff --git a/src/wallet/rpc/backup.cpp b/src/wallet/rpc/backup.cpp
index 055aceff5ea7..080b0f1e3b2c 100644
--- a/src/wallet/rpc/backup.cpp
+++ b/src/wallet/rpc/backup.cpp
@@ -91,11 +91,13 @@ RPCHelpMan importprivkey()
         "Hint: use importmulti to import more than one private key.\n"
     "\nNote: This call can take over an hour to complete if rescan is true, during that time, other rpc calls\n"
     "may report that the imported key exists but related transactions are still missing, leading to temporarily incorrect/bogus balances and unspent outputs until rescan completes.\n"
+    "The rescan parameter can be set to false if the key was never used to create transactions. If it is set to false,\n"
+    "but the key was used to create transactions, rescanwallet needs to be called with the appropriate block range.\n"
     "Note: This command is only compatible with legacy wallets. Use \"importdescriptors\" with \"combo(X)\" for descriptor wallets.\n",
         {
             {"privkey", RPCArg::Type::STR, RPCArg::Optional::NO, "The private key (see dumpprivkey)"},
             {"label", RPCArg::Type::STR, RPCArg::DefaultHint{"current label if address exists, otherwise \"\""}, "An optional label"},
-            {"rescan", RPCArg::Type::BOOL, RPCArg::Default{true}, "Rescan the wallet for transactions"},
+            {"rescan", RPCArg::Type::BOOL, RPCArg::Default{true}, "Scan the chain and mempool for wallet transactions."},
         },
         RPCResult{RPCResult::Type::NONE, "", ""},
         RPCExamples{
@@ -208,6 +210,8 @@ RPCHelpMan importaddress()
     "\nAdds an address or script (in hex) that can be watched as if it were in your wallet but cannot be used to spend. Requires a new wallet backup.\n"
     "\nNote: This call can take over an hour to complete if rescan is true, during that time, other rpc calls\n"
     "may report that the imported address exists but related transactions are still missing, leading to temporarily incorrect/bogus balances and unspent outputs until rescan completes.\n"
+    "The rescan parameter can be set to false if the key was never used to create transactions. If it is set to false,\n"
+    "but the key was used to create transactions, rescanwallet needs to be called with the appropriate block range.\n"
     "If you have the full public key, you should call importpubkey instead of this.\n"
     "Hint: use importmulti to import more than one address.\n"
     "\nNote: If you import a non-standard raw script in hex form, outputs sending to it will be treated\n"
@@ -216,7 +220,7 @@ RPCHelpMan importaddress()
     {
             {"address", RPCArg::Type::STR, RPCArg::Optional::NO, "The Dash address (or hex-encoded script)"},
             {"label", RPCArg::Type::STR, RPCArg::Default{""}, "An optional label"},
-            {"rescan", RPCArg::Type::BOOL, RPCArg::Default{true}, "Rescan the wallet for transactions"},
+            {"rescan", RPCArg::Type::BOOL, RPCArg::Default{true}, "Scan the chain and mempool for wallet transactions."},
             {"p2sh", RPCArg::Type::BOOL, RPCArg::Default{false}, "Add the P2SH version of the script as well"},
         },
         RPCResult{RPCResult::Type::NONE, "", ""},
@@ -404,11 +408,13 @@ RPCHelpMan importpubkey()
         "Hint: use importmulti to import more than one public key.\n"
     "\nNote: This call can take over an hour to complete if rescan is true, during that time, other rpc calls\n"
     "may report that the imported pubkey exists but related transactions are still missing, leading to temporarily incorrect/bogus balances and unspent outputs until rescan completes.\n"
+    "The rescan parameter can be set to false if the key was never used to create transactions. If it is set to false,\n"
+    "but the key was used to create transactions, rescanwallet needs to be called with the appropriate block range.\n"
     "Note: This command is only compatible with legacy wallets. Use \"importdescriptors\" with \"combo(X)\" for descriptor wallets.\n",
         {
             {"pubkey", RPCArg::Type::STR, RPCArg::Optional::NO, "The hex-encoded public key"},
             {"label", RPCArg::Type::STR, RPCArg::Default{""}, "An optional label"},
-            {"rescan", RPCArg::Type::BOOL, RPCArg::Default{true}, "Rescan the wallet for transactions"},
+            {"rescan", RPCArg::Type::BOOL, RPCArg::Default{true}, "Scan the chain and mempool for wallet transactions."},
         },
         RPCResult{RPCResult::Type::NONE, "", ""},
         RPCExamples{
@@ -484,7 +490,7 @@ RPCHelpMan importwallet()
 {
     return RPCHelpMan{"importwallet",
         "\nImports keys from a wallet dump file (see dumpwallet). Requires a new wallet backup to include imported keys.\n"
-        "Note: Use \"getwalletinfo\" to query the scanning progress.\n"
+        "Note: Blockchain and Mempool will be rescanned after a successful import. Use \"getwalletinfo\" to query the scanning progress.\n"
         "Note: This command is only compatible with legacy wallets.\n",
         {
             {"filename", RPCArg::Type::STR, RPCArg::Optional::NO, "The wallet file"},
@@ -1475,6 +1481,8 @@ RPCHelpMan importmulti()
         "\nImport addresses/scripts (with private or public keys, redeem script (P2SH)), optionally rescanning the blockchain from the earliest creation time of the imported scripts. Requires a new wallet backup.\n"
         "If an address/script is imported without all of the private keys required to spend from that address, it will be watchonly. The 'watchonly' option must be set to true in this case or a warning will be returned.\n"
         "Conversely, if all the private keys are provided and the address/script is spendable, the watchonly option must be set to false, or a warning will be returned.\n"
+        "The rescan parameter can be set to false if the key was never used to create transactions. If it is set to false,\n"
+        "but the key was used to create transactions, rescanwallet needs to be called with the appropriate block range.\n"
         "\nNote: This call can take over an hour to complete if rescan is true, during that time, other rpc calls\n"
         "may report that the imported keys, addresses or scripts exists but related transactions are still missing.\n"
         "Note: This command is only compatible with legacy wallets. Use \"importdescriptors\" for descriptor wallets.\n",
@@ -1518,7 +1526,7 @@ RPCHelpMan importmulti()
                 "\"requests\""},
             {"options", RPCArg::Type::OBJ, RPCArg::Optional::OMITTED_NAMED_ARG, "",
                 {
-                    {"rescan", RPCArg::Type::BOOL, RPCArg::Default{true}, "Stating if should rescan the blockchain after all imports"},
+                    {"rescan", RPCArg::Type::BOOL, RPCArg::Default{true}, "Scan the chain and mempool for wallet transactions after all imports."},
                 },
                 "\"options\""},
         },
@@ -1830,7 +1838,7 @@ RPCHelpMan importdescriptors() {
         "                                                              Use the string \"now\" to substitute the current synced blockchain time.\n"
         "                                                              \"now\" can be specified to bypass scanning, for outputs which are known to never have been used, and\n"
         "                                                              0 can be specified to scan the entire blockchain. Blocks up to 2 hours before the earliest timestamp\n"
-        "                                                              of all descriptors being imported will be scanned.",
+        "                                                              of all descriptors being imported will be scanned as well as the mempool.",
                                         /*oneline_description=*/"", {"timestamp | \"now\"", "integer / string"}
                                     },
                                     {"internal", RPCArg::Type::BOOL, RPCArg::Default{false}, "Whether matching outputs should be treated as not incoming payments (e.g. change)"},
diff --git a/src/wallet/test/wallet_tests.cpp b/src/wallet/test/wallet_tests.cpp
index 46f5d3c20773..a6dfad77ce47 100644
--- a/src/wallet/test/wallet_tests.cpp
+++ b/src/wallet/test/wallet_tests.cpp
@@ -65,9 +65,6 @@ static std::shared_ptr<CWallet> TestLoadWallet(WalletContext& context)
         AddWallet(context, wallet);
     }
     NotifyWalletLoaded(context, wallet);
-    if (context.chain) {
-        wallet->postInitProcess();
-    }
     return wallet;
 }
 
@@ -784,6 +781,7 @@ BOOST_FIXTURE_TEST_CASE(CreateWallet, TestChain100Setup)
     // being blocked
     wallet = TestLoadWallet(context);
     BOOST_CHECK(rescan_completed);
+    // AddToWallet events for block_tx and mempool_tx
     BOOST_CHECK_EQUAL(addtx_count, 2);
     {
         LOCK(wallet->cs_wallet);
@@ -796,6 +794,8 @@ BOOST_FIXTURE_TEST_CASE(CreateWallet, TestChain100Setup)
     // transactionAddedToMempool events are processed
     promise.set_value();
     SyncWithValidationInterfaceQueue();
+    // AddToWallet events for block_tx and mempool_tx events are counted a
+    // second time as the notificaiton queue is processed
     BOOST_CHECK_EQUAL(addtx_count, 4);
 
     TestUnloadWallet(context, std::move(wallet));
@@ -818,7 +818,7 @@ BOOST_FIXTURE_TEST_CASE(CreateWallet, TestChain100Setup)
             SyncWithValidationInterfaceQueue();
         });
     wallet = TestLoadWallet(context);
-    BOOST_CHECK_EQUAL(addtx_count, 4);
+    BOOST_CHECK_EQUAL(addtx_count, 2);
     {
         LOCK(wallet->cs_wallet);
         BOOST_CHECK_EQUAL(wallet->mapWallet.count(block_tx.GetHash()), 1U);
diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp
index 24c4a2e5ff1d..583480930e9c 100644
--- a/src/wallet/wallet.cpp
+++ b/src/wallet/wallet.cpp
@@ -1685,7 +1685,8 @@ int64_t CWallet::RescanFromTime(int64_t startTime, const WalletRescanReserver& r
 /**
  * Scan the block chain (starting in start_block) for transactions
  * from or to us. If fUpdate is true, found transactions that already
- * exist in the wallet will be updated.
+ * exist in the wallet will be updated. If max_height is not set, the
+ * mempool will be scanned as well.
  *
  * @param[in] start_block Scan starting block. If block is not on the active
  *                        chain, the scan will return SUCCESS immediately.
@@ -1806,6 +1807,10 @@ CWallet::ScanResult CWallet::ScanForWalletTransactions(const uint256& start_bloc
             }
         }
     }
+    if (!max_height) {
+        WalletLogPrintf("Scanning current mempool transactions.\n");
+        WITH_LOCK(cs_wallet, chain().requestMempoolTransactions(*this));
+    }
     ShowProgress(strprintf("%s " + _("Rescanning…").translated, GetDisplayName()), 100); // hide progress dialog in GUI
     if (block_height && fAbortRescan) {
         WalletLogPrintf("Rescan aborted at block %d. Progress=%f\n", block_height, progress_current);
diff --git a/test/functional/rpc_wipewallettxes.py b/test/functional/rpc_wipewallettxes.py
index 5a6560bde07b..0a594f6288d7 100755
--- a/test/functional/rpc_wipewallettxes.py
+++ b/test/functional/rpc_wipewallettxes.py
@@ -32,9 +32,9 @@ def run_test(self):
         assert_equal(self.nodes[0].getwalletinfo()["txcount"], 104)
         self.nodes[0].wipewallettxes(True)
         assert_equal(self.nodes[0].getwalletinfo()["txcount"], 103)
-        self.nodes[0].rescanblockchain()
-        assert_equal(self.nodes[0].getwalletinfo()["txcount"], 103)
         assert_raises_rpc_error(-5, "Invalid or non-wallet transaction id", self.nodes[0].gettransaction, txid)
+        self.nodes[0].rescanblockchain()
+        assert_equal(self.nodes[0].getwalletinfo()["txcount"], 104)
 
 
 if __name__ == '__main__':
diff --git a/test/functional/wallet_balance.py b/test/functional/wallet_balance.py
index 0142f89158d0..ba9022bc7f7c 100755
--- a/test/functional/wallet_balance.py
+++ b/test/functional/wallet_balance.py
@@ -280,6 +280,29 @@ def test_balances(*, fee_node_1=0):
         self.generatetoaddress(self.nodes[1], 1, ADDRESS_WATCHONLY)
         assert_equal(self.nodes[0].getbalance(minconf=0), total_amount + 1)  # The reorg recovered our fee of 1 coin
 
+        if not self.options.descriptors:
+            self.log.info('Check if mempool is taken into account after import*')
+            address = self.nodes[0].getnewaddress()
+            privkey = self.nodes[0].dumpprivkey(address)
+            self.nodes[0].sendtoaddress(address, 0.1)
+            self.nodes[0].unloadwallet('')
+            # check importaddress on fresh wallet
+            self.nodes[0].createwallet('w1', False, True)
+            self.nodes[0].importaddress(address)
+            assert_equal(self.nodes[0].getbalances()['mine']['untrusted_pending'], 0)
+            assert_equal(self.nodes[0].getbalances()['watchonly']['untrusted_pending'], Decimal('0.1'))
+            self.nodes[0].importprivkey(privkey)
+            assert_equal(self.nodes[0].getbalances()['mine']['untrusted_pending'], Decimal('0.1'))
+            self.log.info(f"balance: {self.nodes[0].getbalances()}")
+            # TODO: this code is diversed with bitcoin core, because we don't add `watchonly` in this particular case for 0 balance
+            if 'watchonly' in self.nodes[0].getbalances():
+                assert_equal(self.nodes[0].getbalances()['watchonly']['untrusted_pending'], 0)
+            self.nodes[0].unloadwallet('w1')
+            # check importprivkey on fresh wallet
+            self.nodes[0].createwallet('w2', False, True)
+            self.nodes[0].importprivkey(privkey)
+            assert_equal(self.nodes[0].getbalances()['mine']['untrusted_pending'], Decimal('0.1'))
+
 
 if __name__ == '__main__':
     WalletTest().main()
diff --git a/test/functional/wallet_import_rescan.py b/test/functional/wallet_import_rescan.py
index 12424c4d7c7f..1a42a8611918 100755
--- a/test/functional/wallet_import_rescan.py
+++ b/test/functional/wallet_import_rescan.py
@@ -20,7 +20,6 @@
 """
 
 from test_framework.test_framework import BitcoinTestFramework
-from test_framework.governance import EXPECTED_STDERR_NO_GOV_PRUNE
 from test_framework.util import (
     assert_equal,
     set_node_times,
@@ -77,6 +76,7 @@ def check(self, txid=None, amount=None, confirmation_height=None):
         assert_equal(len(txs), self.expected_txs)
 
         addresses = self.node.listreceivedbyaddress(minconf=0, include_watchonly=True, address_filter=self.address['address'])
+
         if self.expected_txs:
             assert_equal(len(addresses[0]["txids"]), self.expected_txs)
 
@@ -88,13 +88,18 @@ def check(self, txid=None, amount=None, confirmation_height=None):
             assert_equal(tx["category"], "receive")
             assert_equal(tx["label"], self.label)
             assert_equal(tx["txid"], txid)
-            assert_equal(tx["confirmations"], 1 + current_height - confirmation_height)
-            assert "trusted" not in tx
+
+            # If no confirmation height is given, the tx is still in the
+            # mempool.
+            confirmations = (1 + current_height - confirmation_height) if confirmation_height else 0
+            assert_equal(tx["confirmations"], confirmations)
+            if confirmations:
+                assert "trusted" not in tx
 
             address, = [ad for ad in addresses if txid in ad["txids"]]
             assert_equal(address["address"], self.address["address"])
             assert_equal(address["amount"], self.expected_balance)
-            assert_equal(address["confirmations"], 1 + current_height - confirmation_height)
+            assert_equal(address["confirmations"], confirmations)
             # Verify the transaction is correctly marked watchonly depending on
             # whether the transaction pays to an imported public key or
             # imported private key. The test setup ensures that transaction
@@ -153,11 +158,12 @@ def setup_network(self):
         self.import_deterministic_coinbase_privkeys()
         self.stop_nodes()
 
-        self.start_nodes()
+        self.start_nodes(extra_args=[["-whitelist=noban@127.0.0.1"]] * self.num_nodes)
         for i in range(1, self.num_nodes):
             self.connect_nodes(i, 0)
 
     def run_test(self):
+
         # Create one transaction on node 0 with a unique amount for
         # each possible type of wallet import RPC.
         for i, variant in enumerate(IMPORT_VARIANTS):
@@ -195,7 +201,7 @@ def run_test(self):
                 variant.check()
 
         # Create new transactions sending to each address.
-        for i, variant in enumerate(IMPORT_VARIANTS):
+        for variant in IMPORT_VARIANTS:
             variant.sent_amount = get_rand_amount()
             variant.sent_txid = self.nodes[0].sendtoaddress(variant.address["address"], variant.sent_amount)
             self.generate(self.nodes[0], 1)  # Generate one block for each send
@@ -210,10 +216,45 @@ def run_test(self):
             variant.expected_balance += variant.sent_amount
             variant.expected_txs += 1
             variant.check(variant.sent_txid, variant.sent_amount, variant.confirmation_height)
-        for i, import_node in enumerate(IMPORT_NODES, 2):
-            if import_node.prune:
-                self.stop_node(i, expected_stderr=EXPECTED_STDERR_NO_GOV_PRUNE)
 
+        self.log.info('Test that the mempool is rescanned as well if the rescan parameter is set to true')
+
+        # The late timestamp and pruned variants are not necessary when testing mempool rescan
+        mempool_variants = [variant for variant in IMPORT_VARIANTS if variant.rescan != Rescan.late_timestamp and not variant.prune]
+        # No further blocks are mined so the timestamp will stay the same
+        timestamp = self.nodes[0].getblockheader(self.nodes[0].getbestblockhash())["time"]
+
+        # Create one transaction on node 0 with a unique amount for
+        # each possible type of wallet import RPC.
+        for i, variant in enumerate(mempool_variants):
+            variant.label = "mempool label {} {}".format(i, variant)
+            variant.address = self.nodes[1].getaddressinfo(self.nodes[1].getnewaddress(
+                label=variant.label,
+            ))
+            variant.key = self.nodes[1].dumpprivkey(variant.address["address"])
+            variant.initial_amount = get_rand_amount()
+            variant.initial_txid = self.nodes[0].sendtoaddress(variant.address["address"], variant.initial_amount)
+            variant.confirmation_height = 0
+            variant.timestamp = timestamp
+
+        assert_equal(len(self.nodes[0].getrawmempool()), len(mempool_variants))
+        self.sync_mempools()
+
+        # For each variation of wallet key import, invoke the import RPC and
+        # check the results from getbalance and listtransactions.
+        for variant in mempool_variants:
+            self.log.info('Run import for mempool variant {}'.format(variant))
+            expect_rescan = variant.rescan == Rescan.yes
+            variant.node = self.nodes[2 + IMPORT_NODES.index(ImportNode(variant.prune, expect_rescan))]
+            variant.do_import(variant.timestamp)
+            if expect_rescan:
+                variant.expected_balance = variant.initial_amount
+                variant.expected_txs = 1
+                variant.check(variant.initial_txid, variant.initial_amount)
+            else:
+                variant.expected_balance = 0
+                variant.expected_txs = 0
+                variant.check()
 
 
 if __name__ == "__main__":
diff --git a/test/functional/wallet_importdescriptors.py b/test/functional/wallet_importdescriptors.py
index 8c30b042ffb8..9d961c69885b 100755
--- a/test/functional/wallet_importdescriptors.py
+++ b/test/functional/wallet_importdescriptors.py
@@ -427,7 +427,7 @@ def run_test(self):
         assert_equal(wmulti_priv.getwalletinfo()['keypoolsize'], 1000)
         txid = w0.sendtoaddress(addr, 10)
         self.generate(self.nodes[0], 6)
-        wmulti_priv.sendtoaddress(w0.getnewaddress(), 8) # uses change 1
+        send_txid = wmulti_priv.sendtoaddress(w0.getnewaddress(), 8) # uses change 1
         self.sync_all()
 
         self.nodes[1].createwallet(wallet_name="wmulti_pub", disable_private_keys=True, blank=True, descriptors=True)
@@ -454,7 +454,9 @@ def run_test(self):
         addr = wmulti_pub.getnewaddress() # uses receive 1
         assert_equal(addr, '91cA4fLGaDCr6b9W2c5j1ph9PDpq9WbEhk') # Derived at m/84'/0'/0'/1
         change_addr = wmulti_pub.getrawchangeaddress() # uses receive 2
-        assert_equal(change_addr, '91WxMwg2NHD1PwHChhbAkeCN6nQ8ikdLEx')
+        assert_equal(change_addr, '8y2sLiPQnB81bAeiRvwbjozJXnCCNH2nHb')
+        assert(send_txid in self.nodes[0].getrawmempool(True))
+        assert(send_txid in (x['txid'] for x in wmulti_pub.listunspent(0)))
         assert_equal(wmulti_pub.getwalletinfo()['keypoolsize'], 999)
 
         # generate some utxos for next tests

From 3538700d65f4223130ee0a7103fb35ec24246923 Mon Sep 17 00:00:00 2001
From: MacroFake <falke.marco@gmail.com>
Date: Tue, 19 Jul 2022 09:15:55 +0200
Subject: [PATCH 574/656] Merge bitcoin/bitcoin#25466: ci: add
 unused-using-decls to clang-tidy

a02f3f19f52e628248f81acc2410e67f3d49baf5 tidy: use misc-unused-using-decls (fanquake)
d6787bc19b1032d3f46a60625105f30199c41b00 refactor: remove unused using directives (fanquake)
3617634324d647956c621db407db6d82a91b91ec validation: remove unused using directives (eugene)

Pull request description:

  Adds https://clang.llvm.org/extra/clang-tidy/checks/misc/unused-using-decls.html to our clang-tidy.
  PR'd after the discussion in #25433 (which it includes).

ACKs for top commit:
  jamesob:
    Github ACK https://github.com/bitcoin/bitcoin/pull/25466/commits/a02f3f19f52e628248f81acc2410e67f3d49baf5

Tree-SHA512: 2bb937c1cc90006e69054458d845fb54f287567f4309c773a3fc859f260558c32ff51fc1c2ce9b43207426f3547e7ce226c87186103d741d5efcca19cd355253
---
 src/.clang-tidy                   | 2 ++
 src/bench/wallet_loading.cpp      | 2 --
 src/qt/transactionrecord.cpp      | 1 -
 src/rpc/evo.cpp                   | 2 --
 src/rpc/masternode.cpp            | 1 -
 src/rpc/output_script.cpp         | 5 -----
 src/test/coinstatsindex_tests.cpp | 3 ---
 src/test/miniscript_tests.cpp     | 2 ++
 8 files changed, 4 insertions(+), 14 deletions(-)

diff --git a/src/.clang-tidy b/src/.clang-tidy
index 5ac571061309..cc4bb41710a8 100644
--- a/src/.clang-tidy
+++ b/src/.clang-tidy
@@ -1,6 +1,7 @@
 Checks: '
 -*,
 bugprone-argument-comment,
+misc-unused-using-decls,
 modernize-use-default-member-init,
 modernize-use-nullptr,
 readability-const-return-type,
@@ -9,6 +10,7 @@ readability-redundant-string-init,
 '
 WarningsAsErrors: '
 bugprone-argument-comment,
+misc-unused-using-decls,
 modernize-use-default-member-init,
 modernize-use-nullptr,
 readability-redundant-declaration,
diff --git a/src/bench/wallet_loading.cpp b/src/bench/wallet_loading.cpp
index 3d8700d5592b..1a2bd7eceb32 100644
--- a/src/bench/wallet_loading.cpp
+++ b/src/bench/wallet_loading.cpp
@@ -19,8 +19,6 @@
 using wallet::CWallet;
 using wallet::DatabaseFormat;
 using wallet::DatabaseOptions;
-using wallet::ISMINE_SPENDABLE;
-using wallet::MakeWalletDatabase;
 using wallet::TxStateInactive;
 using wallet::WALLET_FLAG_DESCRIPTORS;
 using wallet::WalletContext;
diff --git a/src/qt/transactionrecord.cpp b/src/qt/transactionrecord.cpp
index 0e550eb1bf9e..3814cd9c1999 100644
--- a/src/qt/transactionrecord.cpp
+++ b/src/qt/transactionrecord.cpp
@@ -13,7 +13,6 @@
 
 #include <cstdint>
 
-using wallet::ISMINE_ALL;
 using wallet::ISMINE_SPENDABLE;
 using wallet::ISMINE_WATCH_ONLY;
 using wallet::isminetype;
diff --git a/src/rpc/evo.cpp b/src/rpc/evo.cpp
index da14a2de4cac..44c6f4fda664 100644
--- a/src/rpc/evo.cpp
+++ b/src/rpc/evo.cpp
@@ -50,8 +50,6 @@ using node::NodeContext;
 using wallet::CWallet;
 #ifdef ENABLE_WALLET
 using wallet::CCoinControl;
-using wallet::CoinType;
-using wallet::COutput;
 using wallet::CRecipient;
 using wallet::DEFAULT_DISABLE_WALLET;
 using wallet::GetWalletForJSONRPCRequest;
diff --git a/src/rpc/masternode.cpp b/src/rpc/masternode.cpp
index 3ea189ebbc28..7a8537da3356 100644
--- a/src/rpc/masternode.cpp
+++ b/src/rpc/masternode.cpp
@@ -36,7 +36,6 @@ using node::ReadBlockFromDisk;
 #ifdef ENABLE_WALLET
 using wallet::CCoinControl;
 using wallet::CoinType;
-using wallet::COutput;
 using wallet::CWallet;
 using wallet::GetWalletForJSONRPCRequest;
 #endif // ENABLE_WALLET
diff --git a/src/rpc/output_script.cpp b/src/rpc/output_script.cpp
index ad26dd77c168..ca5beef1d0f7 100644
--- a/src/rpc/output_script.cpp
+++ b/src/rpc/output_script.cpp
@@ -23,11 +23,6 @@
 #include <string>
 #include <vector>
 
-namespace node {
-struct NodeContext;
-}
-using node::NodeContext;
-
 static RPCHelpMan validateaddress()
 {
     return RPCHelpMan{
diff --git a/src/test/coinstatsindex_tests.cpp b/src/test/coinstatsindex_tests.cpp
index e3335373231f..b8f5a2b4b9f0 100644
--- a/src/test/coinstatsindex_tests.cpp
+++ b/src/test/coinstatsindex_tests.cpp
@@ -12,9 +12,6 @@
 
 #include <boost/test/unit_test.hpp>
 
-using kernel::CCoinsStats;
-using kernel::CoinStatsHashType;
-
 BOOST_AUTO_TEST_SUITE(coinstatsindex_tests)
 
 BOOST_FIXTURE_TEST_CASE(coinstatsindex_initial_sync, TestChain100Setup)
diff --git a/src/test/miniscript_tests.cpp b/src/test/miniscript_tests.cpp
index 3877fea907e8..46ed47b1d480 100644
--- a/src/test/miniscript_tests.cpp
+++ b/src/test/miniscript_tests.cpp
@@ -116,6 +116,8 @@ struct KeyConverter {
 //! Singleton instance of KeyConverter.
 const KeyConverter CONVERTER{};
 
+// https://github.com/llvm/llvm-project/issues/53444
+// NOLINTNEXTLINE(misc-unused-using-decls)
 using miniscript::operator"" _mst;
 
 enum TestMode : int {

From 03a8a7e676041b066027c7f595155703e03f31ec Mon Sep 17 00:00:00 2001
From: MacroFake <falke.marco@gmail.com>
Date: Tue, 30 Aug 2022 20:04:13 +0200
Subject: [PATCH 575/656] Merge bitcoin/bitcoin#25733: tidy: enable
 bugprone-use-after-move

f345dc3960c2cf4d69ebbcc011e4e836205f0361 tidy: enable bugprone-use-after-move (fanquake)
94f2235f858bc4fdaf0ab0882599f6a228401cf5 test: work around bugprone-use-after-move warnings in util tests (fanquake)

Pull request description:

  Would have caught #25640.

  Currently `// NOLINT`s around:
  ```bash
  test/util_tests.cpp:2513:34: error: 't2' used after it was moved [bugprone-use-after-move,-warnings-as-errors]
      BOOST_CHECK(v2[0].origin == &t2);
                                   ^
  test/util_tests.cpp:2511:15: note: move occurred here
      auto v2 = Vector(std::move(t2));
                ^
  test/util_tests.cpp:2519:34: error: 't2' used after it was moved [bugprone-use-after-move,-warnings-as-errors]
      BOOST_CHECK(v3[1].origin == &t2);
                                   ^
  test/util_tests.cpp:2516:15: note: move occurred here
      auto v3 = Vector(t1, std::move(t2));
                ^
  test/util_tests.cpp:2527:34: error: 't3' used after it was moved [bugprone-use-after-move,-warnings-as-errors]
      BOOST_CHECK(v4[2].origin == &t3);
                                   ^
  test/util_tests.cpp:2523:15: note: move occurred here
      auto v4 = Vector(std::move(v3[0]), v3[1], std::move(t3));
  ```

  See: https://releases.llvm.org/14.0.0/tools/clang/tools/extra/docs/clang-tidy/checks/bugprone-use-after-move.html

ACKs for top commit:
  ryanofsky:
    Code review ACK f345dc3960c2cf4d69ebbcc011e4e836205f0361. Only change since last review is switching to NOLINT directives

Tree-SHA512: afadecbaf1069653f4be5d6e66a5800ffd975c0b1a960057abc6367b616c181cd518897a874a8f3fd5e5e1f45fcc165f7a9a3171136cd4deee641214c4b765b8
---
 src/.clang-tidy         | 2 ++
 src/test/util_tests.cpp | 6 +++---
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/.clang-tidy b/src/.clang-tidy
index cc4bb41710a8..3096da6737f7 100644
--- a/src/.clang-tidy
+++ b/src/.clang-tidy
@@ -1,6 +1,7 @@
 Checks: '
 -*,
 bugprone-argument-comment,
+bugprone-use-after-move,
 misc-unused-using-decls,
 modernize-use-default-member-init,
 modernize-use-nullptr,
@@ -10,6 +11,7 @@ readability-redundant-string-init,
 '
 WarningsAsErrors: '
 bugprone-argument-comment,
+bugprone-use-after-move,
 misc-unused-using-decls,
 modernize-use-default-member-init,
 modernize-use-nullptr,
diff --git a/src/test/util_tests.cpp b/src/test/util_tests.cpp
index ae2778ac5690..6d5c7be2c019 100644
--- a/src/test/util_tests.cpp
+++ b/src/test/util_tests.cpp
@@ -1304,13 +1304,13 @@ BOOST_AUTO_TEST_CASE(test_tracked_vector)
 
     auto v2 = Vector(std::move(t2));
     BOOST_CHECK_EQUAL(v2.size(), 1U);
-    BOOST_CHECK(v2[0].origin == &t2);
+    BOOST_CHECK(v2[0].origin == &t2); // NOLINT(*-use-after-move)
     BOOST_CHECK_EQUAL(v2[0].copies, 0);
 
     auto v3 = Vector(t1, std::move(t2));
     BOOST_CHECK_EQUAL(v3.size(), 2U);
     BOOST_CHECK(v3[0].origin == &t1);
-    BOOST_CHECK(v3[1].origin == &t2);
+    BOOST_CHECK(v3[1].origin == &t2); // NOLINT(*-use-after-move)
     BOOST_CHECK_EQUAL(v3[0].copies, 1);
     BOOST_CHECK_EQUAL(v3[1].copies, 0);
 
@@ -1318,7 +1318,7 @@ BOOST_AUTO_TEST_CASE(test_tracked_vector)
     BOOST_CHECK_EQUAL(v4.size(), 3U);
     BOOST_CHECK(v4[0].origin == &t1);
     BOOST_CHECK(v4[1].origin == &t2);
-    BOOST_CHECK(v4[2].origin == &t3);
+    BOOST_CHECK(v4[2].origin == &t3); // NOLINT(*-use-after-move)
     BOOST_CHECK_EQUAL(v4[0].copies, 1);
     BOOST_CHECK_EQUAL(v4[1].copies, 1);
     BOOST_CHECK_EQUAL(v4[2].copies, 0);

From 0e7d0e222043b9710587ceb0cc632ea602c3506d Mon Sep 17 00:00:00 2001
From: MacroFake <falke.marco@gmail.com>
Date: Fri, 19 Aug 2022 17:10:59 +0200
Subject: [PATCH 576/656] partial Merge bitcoin/bitcoin#25707: refactor: Make
 const references to avoid unnecessarily copying objects and enable two
 clang-tidy checks
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

BACKPORT NOTE:
Somehow there's multiple warnings that are for backported code, mostly related to mempool, such as:
     rpc/mempool.cpp:549:33: error: loop variable is copied but only used as const reference; consider making it a const reference [performance-for-range-copy,-warnings-as-errors]
      549 |         for (CTxMemPool::txiter descendantIt : setDescendants) {
          |                                 ^
          |              const             &

I can't find a way to fix it without big diversity of codebase, so, make as partial temporary

ae7ae36d311a869b3bda41d29dc0e47fade77d28 tidy: Enable two clang-tidy checks (Aurèle Oulès)
081b0e53e3adca7ea57d23e5fcd9db4b86415a72 refactor: Make const refs vars where applicable (Aurèle Oulès)

Pull request description:

  I added const references to some variables to avoid unnecessarily copying objects.

  Also added two clang-tidy checks : [performance-for-range-copy](https://releases.llvm.org/11.1.0/tools/clang/tools/extra/docs/clang-tidy/checks/performance-for-range-copy.html) and [performance-unnecessary-copy-initialization](https://releases.llvm.org/12.0.0/tools/clang/tools/extra/docs/clang-tidy/checks/performance-unnecessary-copy-initialization.html).

ACKs for top commit:
  vasild:
    ACK ae7ae36d311a869b3bda41d29dc0e47fade77d28
  MarcoFalke:
    review ACK ae7ae36d311a869b3bda41d29dc0e47fade77d28

Tree-SHA512: f6ac6b0cd0eee1e0c34d2f186484bc0f7ec6071451cccb33fa88a67d93d92b304e2fac378b88f087e94657745bca4e966dbc443759587400eb01b1f3061fde8c
---
 src/.clang-tidy                         |  3 +++
 src/bench/load_external.cpp             |  2 +-
 src/bitcoin-cli.cpp                     |  2 +-
 src/bitcoin-tx.cpp                      |  2 +-
 src/blockfilter.cpp                     |  2 +-
 src/bls/bls_worker.cpp                  |  2 +-
 src/coins.cpp                           |  2 +-
 src/core_read.cpp                       |  2 +-
 src/evo/creditpool.cpp                  |  2 +-
 src/evo/mnauth.cpp                      |  4 +---
 src/init.cpp                            |  2 +-
 src/logging.cpp                         |  2 +-
 src/netbase.cpp                         |  6 +++---
 src/node/blockstorage.cpp               |  2 +-
 src/qt/governancelist.cpp               | 10 +++++-----
 src/qt/splashscreen.cpp                 |  5 ++---
 src/rpc/coinjoin.cpp                    |  2 +-
 src/rpc/mining.cpp                      |  6 +++---
 src/rpc/rawtransaction_util.cpp         |  4 ++--
 src/rpc/util.cpp                        |  6 +++---
 src/test/base58_tests.cpp               |  4 ++--
 src/test/blockfilter_tests.cpp          |  2 +-
 src/test/evo_deterministicmns_tests.cpp |  3 ++-
 src/test/evo_trivialvalidation.cpp      |  2 +-
 src/test/key_io_tests.cpp               |  6 +++---
 src/test/script_tests.cpp               |  2 +-
 src/test/sighash_tests.cpp              |  2 +-
 src/test/transaction_tests.cpp          |  8 ++++----
 src/test/validation_block_tests.cpp     |  2 +-
 src/wallet/bdb.cpp                      |  2 +-
 src/wallet/receive.cpp                  |  2 +-
 src/wallet/scriptpubkeyman.cpp          |  2 +-
 src/wallet/test/bip39_tests.cpp         |  2 +-
 src/wallet/walletdb.cpp                 |  6 +++---
 34 files changed, 57 insertions(+), 56 deletions(-)

diff --git a/src/.clang-tidy b/src/.clang-tidy
index 3096da6737f7..42602b69749b 100644
--- a/src/.clang-tidy
+++ b/src/.clang-tidy
@@ -5,6 +5,8 @@ bugprone-use-after-move,
 misc-unused-using-decls,
 modernize-use-default-member-init,
 modernize-use-nullptr,
+performance-for-range-copy,
+performance-unnecessary-copy-initialization,
 readability-const-return-type,
 readability-redundant-declaration,
 readability-redundant-string-init,
@@ -15,6 +17,7 @@ bugprone-use-after-move,
 misc-unused-using-decls,
 modernize-use-default-member-init,
 modernize-use-nullptr,
+performance-unnecessary-copy-initialization,
 readability-redundant-declaration,
 readability-redundant-string-init,
 '
diff --git a/src/bench/load_external.cpp b/src/bench/load_external.cpp
index 68d7895f49b4..2d691484a3bd 100644
--- a/src/bench/load_external.cpp
+++ b/src/bench/load_external.cpp
@@ -28,7 +28,7 @@ static void LoadExternalBlockFile(benchmark::Bench& bench)
     // block data) as a stream object.
     const fs::path blkfile{testing_setup.get()->m_path_root / "blk.dat"};
     CDataStream ss(SER_DISK, 0);
-    auto params{Params()};
+    const auto& params{Params()};
     ss << params.MessageStart();
     ss << static_cast<uint32_t>(benchmark::data::block813851.size());
     // We can't use the streaming serialization (ss << benchmark::data::block813851)
diff --git a/src/bitcoin-cli.cpp b/src/bitcoin-cli.cpp
index 3e94ea5a2689..2f3b807131e9 100644
--- a/src/bitcoin-cli.cpp
+++ b/src/bitcoin-cli.cpp
@@ -948,7 +948,7 @@ static void GetWalletBalances(UniValue& result)
 
     UniValue balances(UniValue::VOBJ);
     for (const UniValue& wallet : wallets.getValues()) {
-        const std::string wallet_name = wallet.get_str();
+        const std::string& wallet_name = wallet.get_str();
         const UniValue getbalances = ConnectAndCallRPC(&rh, "getbalances", /* args=*/{}, wallet_name);
         const UniValue& balance = getbalances.find_value("result")["mine"]["trusted"];
         balances.pushKV(wallet_name, balance);
diff --git a/src/bitcoin-tx.cpp b/src/bitcoin-tx.cpp
index 9c9ccdae59dc..f256516e2c08 100644
--- a/src/bitcoin-tx.cpp
+++ b/src/bitcoin-tx.cpp
@@ -555,7 +555,7 @@ static void MutateTxSign(CMutableTransaction& tx, const std::string& flagStr)
     UniValue prevtxsObj = registers["prevtxs"];
     {
         for (unsigned int previdx = 0; previdx < prevtxsObj.size(); previdx++) {
-            UniValue prevOut = prevtxsObj[previdx];
+            const UniValue& prevOut = prevtxsObj[previdx];
             if (!prevOut.isObject())
                 throw std::runtime_error("expected prevtxs internal object");
 
diff --git a/src/blockfilter.cpp b/src/blockfilter.cpp
index f4638dabcc0d..364ed1c7ec72 100644
--- a/src/blockfilter.cpp
+++ b/src/blockfilter.cpp
@@ -170,7 +170,7 @@ const std::set<BlockFilterType>& AllBlockFilterTypes()
 
     static std::once_flag flag;
     std::call_once(flag, []() {
-            for (auto entry : g_filter_types) {
+            for (const auto& entry : g_filter_types) {
                 types.insert(entry.first);
             }
         });
diff --git a/src/bls/bls_worker.cpp b/src/bls/bls_worker.cpp
index 1a65899be450..44f15e46c22b 100644
--- a/src/bls/bls_worker.cpp
+++ b/src/bls/bls_worker.cpp
@@ -15,7 +15,7 @@ template <typename T>
 bool VerifyVectorHelper(Span<T> vec)
 {
     std::set<uint256> set;
-    for (auto item : vec) {
+    for (const auto& item : vec) {
         if (!item.IsValid())
             return false;
         // check duplicates
diff --git a/src/coins.cpp b/src/coins.cpp
index 0aa3bf708484..d43e886b7603 100644
--- a/src/coins.cpp
+++ b/src/coins.cpp
@@ -356,7 +356,7 @@ bool CCoinsViewErrorCatcher::GetCoin(const COutPoint &outpoint, Coin &coin) cons
     try {
         return CCoinsViewBacked::GetCoin(outpoint, coin);
     } catch(const std::runtime_error& e) {
-        for (auto f : m_err_callbacks) {
+        for (const auto& f : m_err_callbacks) {
             f();
         }
         LogPrintf("Error reading from database: %s\n", e.what());
diff --git a/src/core_read.cpp b/src/core_read.cpp
index 9f7c198d3f9e..a6e362603aac 100644
--- a/src/core_read.cpp
+++ b/src/core_read.cpp
@@ -189,7 +189,7 @@ int ParseSighashString(const UniValue& sighash)
             {std::string("SINGLE"), int(SIGHASH_SINGLE)},
             {std::string("SINGLE|ANYONECANPAY"), int(SIGHASH_SINGLE|SIGHASH_ANYONECANPAY)},
         };
-        std::string strHashType = sighash.get_str();
+        const std::string& strHashType = sighash.get_str();
         const auto& it = map_sighash_values.find(strHashType);
         if (it != map_sighash_values.end()) {
             hash_type = it->second;
diff --git a/src/evo/creditpool.cpp b/src/evo/creditpool.cpp
index 7a82653b4bc5..772ac70630ac 100644
--- a/src/evo/creditpool.cpp
+++ b/src/evo/creditpool.cpp
@@ -91,7 +91,7 @@ static std::optional<CreditPoolDataPerBlock> GetCreditDataFromBlock(const gsl::n
         LogPrintf("%s: WARNING: No valid CbTx at height=%d\n", __func__, block_index->nHeight);
         return std::nullopt;
     }
-    for (CTransactionRef tx : block.vtx) {
+    for (const CTransactionRef& tx : block.vtx) {
         if (!tx->IsSpecialTxVersion() || tx->nType != TRANSACTION_ASSET_UNLOCK) continue;
 
         CAmount unlocked{0};
diff --git a/src/evo/mnauth.cpp b/src/evo/mnauth.cpp
index 4d813ebbbf00..caba4172e567 100644
--- a/src/evo/mnauth.cpp
+++ b/src/evo/mnauth.cpp
@@ -36,9 +36,7 @@ void CMNAuth::PushMNAUTH(CNode& peer, CConnman& connman, const CActiveMasternode
     if (Params().NetworkIDString() != CBaseChainParams::MAIN && gArgs.IsArgSet("-pushversion")) {
         nOurNodeVersion = gArgs.GetIntArg("-pushversion", PROTOCOL_VERSION);
     }
-    auto pk = mn_activeman.GetPubKey();
-    const CBLSPublicKey pubKey(pk);
-    const uint256 signHash{::SerializeHash(std::make_tuple(pubKey, receivedMNAuthChallenge, peer.IsInboundConn(), nOurNodeVersion))};
+    const uint256 signHash{::SerializeHash(std::make_tuple(mn_activeman.GetPubKey(), receivedMNAuthChallenge, peer.IsInboundConn(), nOurNodeVersion))};
 
     mnauth.proRegTxHash = mn_activeman.GetProTxHash();
 
diff --git a/src/init.cpp b/src/init.cpp
index 642df953f34f..c831ed4986a8 100644
--- a/src/init.cpp
+++ b/src/init.cpp
@@ -1440,7 +1440,7 @@ bool AppInitParameterInteraction(const ArgsManager& args)
 static bool LockDataDirectory(bool probeOnly)
 {
     // Make sure only a single Dash Core process is using the data directory.
-    fs::path datadir = gArgs.GetDataDirNet();
+    const fs::path& datadir = gArgs.GetDataDirNet();
     if (!DirIsWritable(datadir)) {
         return InitError(strprintf(_("Cannot write to data directory '%s'; check permissions."), fs::PathToString(datadir)));
     }
diff --git a/src/logging.cpp b/src/logging.cpp
index 293ac4463d34..d59d1a86aa9b 100644
--- a/src/logging.cpp
+++ b/src/logging.cpp
@@ -462,7 +462,7 @@ void BCLog::Logger::LogPrintStr(const std::string& str, const std::string& loggi
     }
 
     if (m_log_threadnames && m_started_new_line) {
-        const auto threadname = util::ThreadGetInternalName();
+        const auto& threadname = util::ThreadGetInternalName();
         // 16 chars total, "dash-" is 5 of them and another 1 is a NUL terminator
         str_prefixed.insert(0, "[" + strprintf("%10s", (threadname.empty() ? "unknown" : threadname)) + "] ");
     }
diff --git a/src/netbase.cpp b/src/netbase.cpp
index 7ac84ad4e3d0..b1a4f7750076 100644
--- a/src/netbase.cpp
+++ b/src/netbase.cpp
@@ -390,7 +390,7 @@ bool Socks5(const std::string& strDest, uint16_t port, const ProxyCredentials* a
         return error("Error sending to proxy");
     }
     uint8_t pchRet1[2];
-    if ((recvr = InterruptibleRecv(pchRet1, 2, g_socks5_recv_timeout, sock)) != IntrRecvError::OK) {
+    if (InterruptibleRecv(pchRet1, 2, g_socks5_recv_timeout, sock) != IntrRecvError::OK) {
         LogPrintf("Socks5() connect to %s:%d failed: InterruptibleRecv() timeout or other failure\n", strDest, port);
         return false;
     }
@@ -413,7 +413,7 @@ bool Socks5(const std::string& strDest, uint16_t port, const ProxyCredentials* a
         }
         LogPrint(BCLog::PROXY, "SOCKS5 sending proxy authentication %s:%s\n", auth->username, auth->password);
         uint8_t pchRetA[2];
-        if ((recvr = InterruptibleRecv(pchRetA, 2, g_socks5_recv_timeout, sock)) != IntrRecvError::OK) {
+        if (InterruptibleRecv(pchRetA, 2, g_socks5_recv_timeout, sock) != IntrRecvError::OK) {
             return error("Error reading proxy authentication response");
         }
         if (pchRetA[0] != 0x01 || pchRetA[1] != 0x00) {
@@ -479,7 +479,7 @@ bool Socks5(const std::string& strDest, uint16_t port, const ProxyCredentials* a
     if (recvr != IntrRecvError::OK) {
         return error("Error reading from proxy");
     }
-    if ((recvr = InterruptibleRecv(pchRet3, 2, g_socks5_recv_timeout, sock)) != IntrRecvError::OK) {
+    if (InterruptibleRecv(pchRet3, 2, g_socks5_recv_timeout, sock) != IntrRecvError::OK) {
         return error("Error reading from proxy");
     }
     LogPrint(BCLog::NET, "SOCKS5 connected %s\n", strDest);
diff --git a/src/node/blockstorage.cpp b/src/node/blockstorage.cpp
index 707acd044c28..76fd09843ac7 100644
--- a/src/node/blockstorage.cpp
+++ b/src/node/blockstorage.cpp
@@ -448,7 +448,7 @@ void CleanupBlockRevFiles()
     // Remove the rev files immediately and insert the blk file paths into an
     // ordered map keyed by block file index.
     LogPrintf("Removing unusable blk?????.dat and rev?????.dat files for -reindex with -prune\n");
-    fs::path blocksdir = gArgs.GetBlocksDirPath();
+    const fs::path& blocksdir = gArgs.GetBlocksDirPath();
     for (fs::directory_iterator it(blocksdir); it != fs::directory_iterator(); it++) {
         const std::string path = fs::PathToString(it->path().filename());
         if (fs::is_regular_file(*it) &&
diff --git a/src/qt/governancelist.cpp b/src/qt/governancelist.cpp
index 49c6abe6e628..37f61fca4a06 100644
--- a/src/qt/governancelist.cpp
+++ b/src/qt/governancelist.cpp
@@ -43,23 +43,23 @@ Proposal::Proposal(ClientModel* _clientModel, const CGovernanceObject& _govObj,
 {
     UniValue prop_data;
     if (prop_data.read(govObj.GetDataAsPlainString())) {
-        if (UniValue titleValue = prop_data.find_value("name"); titleValue.isStr()) {
+        if (const UniValue& titleValue = prop_data.find_value("name"); titleValue.isStr()) {
             m_title = QString::fromStdString(titleValue.get_str());
         }
 
-        if (UniValue paymentStartValue = prop_data.find_value("start_epoch"); paymentStartValue.isNum()) {
+        if (const UniValue& paymentStartValue = prop_data.find_value("start_epoch"); paymentStartValue.isNum()) {
             m_startDate = QDateTime::fromSecsSinceEpoch(paymentStartValue.getInt<int64_t>());
         }
 
-        if (UniValue paymentEndValue = prop_data.find_value("end_epoch"); paymentEndValue.isNum()) {
+        if (const UniValue& paymentEndValue = prop_data.find_value("end_epoch"); paymentEndValue.isNum()) {
             m_endDate = QDateTime::fromSecsSinceEpoch(paymentEndValue.getInt<int64_t>());
         }
 
-        if (UniValue amountValue = prop_data.find_value("payment_amount"); amountValue.isNum()) {
+        if (const UniValue& amountValue = prop_data.find_value("payment_amount"); amountValue.isNum()) {
             m_paymentAmount = amountValue.get_real();
         }
 
-        if (UniValue urlValue = prop_data.find_value("url"); urlValue.isStr()) {
+        if (const UniValue& urlValue = prop_data.find_value("url"); urlValue.isStr()) {
             m_url = QString::fromStdString(urlValue.get_str());
         }
     }
diff --git a/src/qt/splashscreen.cpp b/src/qt/splashscreen.cpp
index cb92b6d9e2f5..f82f71c2c264 100644
--- a/src/qt/splashscreen.cpp
+++ b/src/qt/splashscreen.cpp
@@ -55,7 +55,7 @@ SplashScreen::SplashScreen(const NetworkStyle *networkStyle) :
     // define text to place
     QString titleText       = PACKAGE_NAME;
     QString versionText = QString::fromStdString(FormatFullVersion()).remove(0, 1);
-    QString titleAddText    = networkStyle->getTitleAddText();
+    const QString& titleAddText = networkStyle->getTitleAddText();
 
     QFont fontNormal = GUIUtil::getFontNormal();
     QFont fontBold = GUIUtil::getFontBold();
@@ -116,8 +116,7 @@ SplashScreen::SplashScreen(const NetworkStyle *networkStyle) :
         int titleAddTextWidth = GUIUtil::TextWidth(fm, titleAddText);
         // Draw the badge background with the network-specific color
         QRect badgeRect = QRect(width - titleAddTextWidth - 20, 5, width, fm.height() + 10);
-        QColor badgeColor = networkStyle->getBadgeColor();
-        pixPaint.fillRect(badgeRect, badgeColor);
+        pixPaint.fillRect(badgeRect, networkStyle->getBadgeColor());
         // Draw the text itself using white color, regardless of the current theme
         pixPaint.setPen(QColor(255, 255, 255));
         pixPaint.drawText(width - titleAddTextWidth - 10, paddingTop + 10, titleAddText);
diff --git a/src/rpc/coinjoin.cpp b/src/rpc/coinjoin.cpp
index 0c9b16bd634b..d3dd399dd35d 100644
--- a/src/rpc/coinjoin.cpp
+++ b/src/rpc/coinjoin.cpp
@@ -173,7 +173,7 @@ static RPCHelpMan coinjoin_status()
     }
 
     UniValue ret(UniValue::VARR);
-    for (auto str_status : cj_clientman->getSessionStatuses()) {
+    for (const auto& str_status : cj_clientman->getSessionStatuses()) {
         ret.push_back(str_status);
     }
     return ret;
diff --git a/src/rpc/mining.cpp b/src/rpc/mining.cpp
index 11e6cd906d45..6e372c75cea0 100644
--- a/src/rpc/mining.cpp
+++ b/src/rpc/mining.cpp
@@ -131,7 +131,7 @@ static bool GenerateBlock(ChainstateManager& chainman, CBlock& block, uint64_t&
     block_hash.SetNull();
     block.hashMerkleRoot = BlockMerkleRoot(block);
 
-    CChainParams chainparams(Params());
+    const CChainParams& chainparams(Params());
 
     while (max_tries > 0 && block.nNonce < std::numeric_limits<uint32_t>::max() && !CheckProofOfWork(block.GetHash(), block.nBits, chainparams.GetConsensus()) && !ShutdownRequested()) {
         ++block.nNonce;
@@ -356,7 +356,7 @@ static RPCHelpMan generateblock()
         }
     }
 
-    CChainParams chainparams(Params());
+    const CChainParams& chainparams(Params());
     const LLMQContext& llmq_ctx = EnsureLLMQContext(node);
 
     ChainstateManager& chainman = EnsureChainman(node);
@@ -755,7 +755,7 @@ static RPCHelpMan getblocktemplate()
         if (lpval.isStr())
         {
             // Format: <hashBestChain><nTransactionsUpdatedLast>
-            std::string lpstr = lpval.get_str();
+            const std::string& lpstr = lpval.get_str();
 
             hashWatchedChain = ParseHashV(lpstr.substr(0, 64), "longpollid");
             nTransactionsUpdatedLastLP = LocaleIndependentAtoi<int64_t>(lpstr.substr(64));
diff --git a/src/rpc/rawtransaction_util.cpp b/src/rpc/rawtransaction_util.cpp
index e66a5b2d3aa9..8ab727004650 100644
--- a/src/rpc/rawtransaction_util.cpp
+++ b/src/rpc/rawtransaction_util.cpp
@@ -146,14 +146,14 @@ static void TxInErrorToJSON(const CTxIn& txin, UniValue& vErrorsRet, const std::
 void ParsePrevouts(const UniValue& prevTxsUnival, FillableSigningProvider* keystore, std::map<COutPoint, Coin>& coins)
 {
     if (!prevTxsUnival.isNull()) {
-        UniValue prevTxs = prevTxsUnival.get_array();
+        const UniValue& prevTxs = prevTxsUnival.get_array();
         for (unsigned int idx = 0; idx < prevTxs.size(); ++idx) {
             const UniValue& p = prevTxs[idx];
             if (!p.isObject()) {
                 throw JSONRPCError(RPC_DESERIALIZATION_ERROR, "expected object with {\"txid'\",\"vout\",\"scriptPubKey\"}");
             }
 
-            UniValue prevOut = p.get_obj();
+            const UniValue& prevOut = p.get_obj();
 
             RPCTypeCheckObj(prevOut,
                 {
diff --git a/src/rpc/util.cpp b/src/rpc/util.cpp
index da552c410f5f..3f3b852422f1 100644
--- a/src/rpc/util.cpp
+++ b/src/rpc/util.cpp
@@ -99,7 +99,7 @@ CAmount AmountFromValue(const UniValue& value, int decimals)
 
 uint256 ParseHashV(const UniValue& v, std::string strName)
 {
-    std::string strHex{v.get_str()};
+    const std::string& strHex(v.get_str());
     if (64 != strHex.length())
         throw JSONRPCError(RPC_INVALID_PARAMETER, strprintf("%s must be of length %d (not %d, for '%s')", strName, 64, strHex.length(), strHex));
     if (!IsHex(strHex)) // Note: IsHex("") is false
@@ -126,7 +126,7 @@ std::vector<unsigned char> ParseHexO(const UniValue& o, std::string strKey)
 
 int32_t ParseInt32V(const UniValue& v, const std::string &strName)
 {
-    std::string strNum = v.getValStr();
+    const std::string& strNum = v.getValStr();
     int32_t num;
     if (!ParseInt32(strNum, &num))
         throw JSONRPCError(RPC_INVALID_PARAMETER, strName+" must be a 32bit integer (not '"+strNum+"')");
@@ -135,7 +135,7 @@ int32_t ParseInt32V(const UniValue& v, const std::string &strName)
 
 int64_t ParseInt64V(const UniValue& v, const std::string &strName)
 {
-    std::string strNum = v.getValStr();
+    const std::string& strNum = v.getValStr();
     int64_t num;
     if (!ParseInt64(strNum, &num))
         throw JSONRPCError(RPC_INVALID_PARAMETER, strName+" must be a 64bit integer (not '"+strNum+"')");
diff --git a/src/test/base58_tests.cpp b/src/test/base58_tests.cpp
index fbe873ef3237..2cd1ae9510d2 100644
--- a/src/test/base58_tests.cpp
+++ b/src/test/base58_tests.cpp
@@ -24,7 +24,7 @@ BOOST_AUTO_TEST_CASE(base58_EncodeBase58)
 {
     UniValue tests = read_json(std::string(json_tests::base58_encode_decode, json_tests::base58_encode_decode + sizeof(json_tests::base58_encode_decode)));
     for (unsigned int idx = 0; idx < tests.size(); idx++) {
-        UniValue test = tests[idx];
+        const UniValue& test = tests[idx];
         std::string strTest = test.write();
         if (test.size() < 2) // Allow for extra stuff (useful for comments)
         {
@@ -46,7 +46,7 @@ BOOST_AUTO_TEST_CASE(base58_DecodeBase58)
     std::vector<unsigned char> result;
 
     for (unsigned int idx = 0; idx < tests.size(); idx++) {
-        UniValue test = tests[idx];
+        const UniValue& test = tests[idx];
         std::string strTest = test.write();
         if (test.size() < 2) // Allow for extra stuff (useful for comments)
         {
diff --git a/src/test/blockfilter_tests.cpp b/src/test/blockfilter_tests.cpp
index 54ab568e7d3a..b33cca137738 100644
--- a/src/test/blockfilter_tests.cpp
+++ b/src/test/blockfilter_tests.cpp
@@ -144,7 +144,7 @@ BOOST_AUTO_TEST_CASE(blockfilters_json_test)
 
     const UniValue& tests = json.get_array();
     for (unsigned int i = 0; i < tests.size(); i++) {
-        UniValue test = tests[i];
+        const UniValue& test = tests[i];
         std::string strTest = test.write();
 
         if (test.size() == 1) {
diff --git a/src/test/evo_deterministicmns_tests.cpp b/src/test/evo_deterministicmns_tests.cpp
index c67d4dd40725..8d27e75aec0f 100644
--- a/src/test/evo_deterministicmns_tests.cpp
+++ b/src/test/evo_deterministicmns_tests.cpp
@@ -886,8 +886,9 @@ static void SmlCache(TestChainSetup& setup)
     CDeterministicMNList mn_list_1(emptyList);
     BOOST_CHECK(sml_empty == mn_list_1.to_sml());
 
+    CDeterministicMNList mn_list_2;
     // Assigning list should return the same cached object
-    CDeterministicMNList mn_list_2 = emptyList;
+    mn_list_2 = emptyList;
     BOOST_CHECK(sml_empty == mn_list_2.to_sml());
 
     auto dmn = create_mock_mn(1);
diff --git a/src/test/evo_trivialvalidation.cpp b/src/test/evo_trivialvalidation.cpp
index 55312417d9ef..df076eadca21 100644
--- a/src/test/evo_trivialvalidation.cpp
+++ b/src/test/evo_trivialvalidation.cpp
@@ -48,7 +48,7 @@ void trivialvalidation_runner(const CChain& active_chain, const std::string& jso
     const UniValue vectors = read_json(json);
 
     for (size_t idx = 1; idx < vectors.size(); idx++) {
-        UniValue test = vectors[idx];
+        const UniValue& test = vectors[idx];
         uint256 txHash;
         std::string txType;
         CMutableTransaction tx;
diff --git a/src/test/key_io_tests.cpp b/src/test/key_io_tests.cpp
index d01e4cb6fbe7..827c6cc71e18 100644
--- a/src/test/key_io_tests.cpp
+++ b/src/test/key_io_tests.cpp
@@ -28,7 +28,7 @@ BOOST_AUTO_TEST_CASE(key_io_valid_parse)
     SelectParams(CBaseChainParams::MAIN);
 
     for (unsigned int idx = 0; idx < tests.size(); idx++) {
-        UniValue test = tests[idx];
+        const UniValue& test = tests[idx];
         std::string strTest = test.write();
         if (test.size() < 3) { // Allow for extra stuff (useful for comments)
             BOOST_ERROR("Bad test: " << strTest);
@@ -86,7 +86,7 @@ BOOST_AUTO_TEST_CASE(key_io_valid_gen)
     UniValue tests = read_json(std::string(json_tests::key_io_valid, json_tests::key_io_valid + sizeof(json_tests::key_io_valid)));
 
     for (unsigned int idx = 0; idx < tests.size(); idx++) {
-        UniValue test = tests[idx];
+        const UniValue& test = tests[idx];
         std::string strTest = test.write();
         if (test.size() < 3) // Allow for extra stuff (useful for comments)
         {
@@ -126,7 +126,7 @@ BOOST_AUTO_TEST_CASE(key_io_invalid)
     CTxDestination destination;
 
     for (unsigned int idx = 0; idx < tests.size(); idx++) {
-        UniValue test = tests[idx];
+        const UniValue& test = tests[idx];
         std::string strTest = test.write();
         if (test.size() < 1) // Allow for extra stuff (useful for comments)
         {
diff --git a/src/test/script_tests.cpp b/src/test/script_tests.cpp
index 06968ae7c5fd..100f5300724c 100644
--- a/src/test/script_tests.cpp
+++ b/src/test/script_tests.cpp
@@ -881,7 +881,7 @@ BOOST_AUTO_TEST_CASE(script_json_test)
     UniValue tests = read_json(std::string(json_tests::script_tests, json_tests::script_tests + sizeof(json_tests::script_tests)));
 
     for (unsigned int idx = 0; idx < tests.size(); idx++) {
-        UniValue test = tests[idx];
+        const UniValue& test = tests[idx];
         std::string strTest = test.write();
         if (test.size() < 4) // Allow size > 3; extra stuff ignored (useful for comments)
         {
diff --git a/src/test/sighash_tests.cpp b/src/test/sighash_tests.cpp
index 2a62c16c90d4..f1d8e6d0ad90 100644
--- a/src/test/sighash_tests.cpp
+++ b/src/test/sighash_tests.cpp
@@ -161,7 +161,7 @@ BOOST_AUTO_TEST_CASE(sighash_from_data)
     UniValue tests = read_json(std::string(json_tests::sighash, json_tests::sighash + sizeof(json_tests::sighash)));
 
     for (unsigned int idx = 0; idx < tests.size(); idx++) {
-        UniValue test = tests[idx];
+        const UniValue& test = tests[idx];
         std::string strTest = test.write();
         if (test.size() < 1) // Allow for extra stuff (useful for comments)
         {
diff --git a/src/test/transaction_tests.cpp b/src/test/transaction_tests.cpp
index 5a61438d9dd0..6e117ad5117b 100644
--- a/src/test/transaction_tests.cpp
+++ b/src/test/transaction_tests.cpp
@@ -153,7 +153,7 @@ BOOST_AUTO_TEST_CASE(tx_valid)
     UniValue tests = read_json(std::string(json_tests::tx_valid, json_tests::tx_valid + sizeof(json_tests::tx_valid)));
 
     for (unsigned int idx = 0; idx < tests.size(); idx++) {
-        UniValue test = tests[idx];
+        const UniValue& test = tests[idx];
         std::string strTest = test.write();
         if (test[0].isArray())
         {
@@ -172,7 +172,7 @@ BOOST_AUTO_TEST_CASE(tx_valid)
                     fValid = false;
                     break;
                 }
-                UniValue vinput = input.get_array();
+                const UniValue& vinput = input.get_array();
                 if (vinput.size() != 3)
                 {
                     fValid = false;
@@ -237,7 +237,7 @@ BOOST_AUTO_TEST_CASE(tx_invalid)
     UniValue tests = read_json(std::string(json_tests::tx_invalid, json_tests::tx_invalid + sizeof(json_tests::tx_invalid)));
 
     for (unsigned int idx = 0; idx < tests.size(); idx++) {
-        UniValue test = tests[idx];
+        const UniValue& test = tests[idx];
         std::string strTest = test.write();
         if (test[0].isArray())
         {
@@ -256,7 +256,7 @@ BOOST_AUTO_TEST_CASE(tx_invalid)
                     fValid = false;
                     break;
                 }
-                UniValue vinput = input.get_array();
+                const UniValue& vinput = input.get_array();
                 if (vinput.size() != 3)
                 {
                     fValid = false;
diff --git a/src/test/validation_block_tests.cpp b/src/test/validation_block_tests.cpp
index 99a6109fee68..9e83bdf6d320 100644
--- a/src/test/validation_block_tests.cpp
+++ b/src/test/validation_block_tests.cpp
@@ -182,7 +182,7 @@ BOOST_AUTO_TEST_CASE(processnewblock_signals_ordering)
             }
 
             // to make sure that eventually we process the full chain - do it here
-            for (auto block : blocks) {
+            for (const auto& block : blocks) {
                 if (block->vtx.size() == 1) {
                     bool processed = Assert(m_node.chainman)->ProcessNewBlock(Params(), block, true, &ignored);
                     assert(processed);
diff --git a/src/wallet/bdb.cpp b/src/wallet/bdb.cpp
index 65fb838f655c..c5c3870fd6fa 100644
--- a/src/wallet/bdb.cpp
+++ b/src/wallet/bdb.cpp
@@ -443,7 +443,7 @@ void BerkeleyEnvironment::ReloadDbEnv()
     });
 
     std::vector<fs::path> filenames;
-    for (auto it : m_databases) {
+    for (const auto& it : m_databases) {
         filenames.push_back(it.first);
     }
     // Close the individual Db's
diff --git a/src/wallet/receive.cpp b/src/wallet/receive.cpp
index a5d0bcc59988..43bf3b633529 100644
--- a/src/wallet/receive.cpp
+++ b/src/wallet/receive.cpp
@@ -428,7 +428,7 @@ std::set< std::set<CTxDestination> > GetAddressGroupings(const CWallet& wallet)
 
     std::set< std::set<CTxDestination>* > uniqueGroupings; // a set of pointers to groups of addresses
     std::map< CTxDestination, std::set<CTxDestination>* > setmap;  // map addresses to the unique group containing it
-    for (std::set<CTxDestination> _grouping : groupings)
+    for (const std::set<CTxDestination>& _grouping : groupings)
     {
         // make a set of all the groups hit by this new group
         std::set< std::set<CTxDestination>* > hits;
diff --git a/src/wallet/scriptpubkeyman.cpp b/src/wallet/scriptpubkeyman.cpp
index 947efc82715c..f08852e3207f 100644
--- a/src/wallet/scriptpubkeyman.cpp
+++ b/src/wallet/scriptpubkeyman.cpp
@@ -1926,7 +1926,7 @@ std::map<CKeyID, CKey> DescriptorScriptPubKeyMan::GetKeys() const
     AssertLockHeld(cs_desc_man);
     if (m_storage.HasEncryptionKeys() && !m_storage.IsLocked(true)) {
         KeyMap keys;
-        for (auto key_pair : m_map_crypted_keys) {
+        for (const auto& key_pair : m_map_crypted_keys) {
             const CPubKey& pubkey = key_pair.second.first;
             const std::vector<unsigned char>& crypted_secret = key_pair.second.second;
             CKey key;
diff --git a/src/wallet/test/bip39_tests.cpp b/src/wallet/test/bip39_tests.cpp
index e15d30f8fc98..6c6ee703bcb8 100644
--- a/src/wallet/test/bip39_tests.cpp
+++ b/src/wallet/test/bip39_tests.cpp
@@ -25,7 +25,7 @@ BOOST_AUTO_TEST_CASE(bip39_vectors)
 
     for (unsigned int i = 0; i < tests.size(); i++) {
         // printf("%d\n", i);
-        UniValue test = tests[i];
+        const UniValue& test = tests[i];
         std::string strTest = test.write();
         if (test.size() < 4) // Allow for extra stuff (useful for comments)
         {
diff --git a/src/wallet/walletdb.cpp b/src/wallet/walletdb.cpp
index e2e4452d64da..a850b16d236c 100644
--- a/src/wallet/walletdb.cpp
+++ b/src/wallet/walletdb.cpp
@@ -884,14 +884,14 @@ DBErrors WalletBatch::LoadWallet(CWallet* pwallet)
     }
 
     // Set the descriptor caches
-    for (auto desc_cache_pair : wss.m_descriptor_caches) {
+    for (const auto& desc_cache_pair : wss.m_descriptor_caches) {
         auto spk_man = pwallet->GetScriptPubKeyMan(desc_cache_pair.first);
         assert(spk_man);
         ((DescriptorScriptPubKeyMan*)spk_man)->SetCache(desc_cache_pair.second);
     }
 
     // Set the descriptor keys
-    for (auto desc_key_pair : wss.m_descriptor_keys) {
+    for (const auto& desc_key_pair : wss.m_descriptor_keys) {
         auto spk_man = pwallet->GetScriptPubKeyMan(desc_key_pair.first.first);
         auto it = wss.mnemonics.find(desc_key_pair.first);
         if (it == wss.mnemonics.end()) {
@@ -901,7 +901,7 @@ DBErrors WalletBatch::LoadWallet(CWallet* pwallet)
         }
     }
 
-    for (auto desc_key_pair : wss.m_descriptor_crypt_keys) {
+    for (const auto& desc_key_pair : wss.m_descriptor_crypt_keys) {
         auto spk_man = pwallet->GetScriptPubKeyMan(desc_key_pair.first.first);
         auto it = wss.crypted_mnemonics.find(desc_key_pair.first);
         if (it == wss.crypted_mnemonics.end()) {

From 887d7b31d35bc2c5d97d3e87fe9ed007a8200813 Mon Sep 17 00:00:00 2001
From: fanquake <fanquake@gmail.com>
Date: Tue, 26 Jul 2022 10:03:58 +0100
Subject: [PATCH 577/656] Merge bitcoin/bitcoin#25701: fix comment spellings
 from the codespell lint

850b0850ccacc4e4f7e82ce2291a111132eae756 fix comment spellings from the codespell lint (Greg Weber)

Pull request description:

  test/lint/all-lint.py includes the codespell lint

ACKs for top commit:
  aureleoules:
    ACK 850b0850ccacc4e4f7e82ce2291a111132eae756.

Tree-SHA512: bf63690da2652886e705d6594903bab67ff0f35a0e5a5505f063827f5148ebce47681e541cbe0e52396baf1addb25d9fe50e5faa9176456f579a7cd2f1321c44
---
 src/test/fuzz/txorphan.cpp       | 2 +-
 src/wallet/test/wallet_tests.cpp | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/test/fuzz/txorphan.cpp b/src/test/fuzz/txorphan.cpp
index 25244771dfa9..d89c06ba0a14 100644
--- a/src/test/fuzz/txorphan.cpp
+++ b/src/test/fuzz/txorphan.cpp
@@ -69,7 +69,7 @@ FUZZ_TARGET(txorphan, .init = initialize_orphanage)
             for (uint32_t i = 0; i < num_out; i++) {
                 tx_mut.vout.emplace_back(CAmount{0}, CScript{});
             }
-            // restore previously poped outpoints
+            // restore previously popped outpoints
             for (auto& in : tx_mut.vin) {
                 outpoints.push_back(in.prevout);
             }
diff --git a/src/wallet/test/wallet_tests.cpp b/src/wallet/test/wallet_tests.cpp
index a6dfad77ce47..f219766a87bb 100644
--- a/src/wallet/test/wallet_tests.cpp
+++ b/src/wallet/test/wallet_tests.cpp
@@ -795,7 +795,7 @@ BOOST_FIXTURE_TEST_CASE(CreateWallet, TestChain100Setup)
     promise.set_value();
     SyncWithValidationInterfaceQueue();
     // AddToWallet events for block_tx and mempool_tx events are counted a
-    // second time as the notificaiton queue is processed
+    // second time as the notification queue is processed
     BOOST_CHECK_EQUAL(addtx_count, 4);
 
     TestUnloadWallet(context, std::move(wallet));

From fdddfc1fb0db6a1092936972000fe83ec31f5f81 Mon Sep 17 00:00:00 2001
From: fanquake <fanquake@gmail.com>
Date: Wed, 31 Aug 2022 08:32:25 +0100
Subject: [PATCH 578/656] Merge bitcoin/bitcoin#25872: Fix issues when calling
 std::move(const&)

BACKPORT NOTE:
Some missing changes for TRDescriptor and for mempool_args
But they will be caugth by linter
----

fa875349e22f2f0f9c2c98ee991372d08ff90318 Fix iwyu (MacroFake)
faad673716cfbad1e715f1bdf8ac00938a055aea Fix issues when calling std::move(const&) (MacroFake)

Pull request description:

  Passing a symbol to `std::move` that is marked `const` is a no-op, which can be fixed in two ways:

  * Remove the `const`, or
  * Remove the `std::move`

ACKs for top commit:
  ryanofsky:
    Code review ACK fa875349e22f2f0f9c2c98ee991372d08ff90318. Looks good. Good for univalue to support c++11 move optimizations

Tree-SHA512: 3dc5cad55b93cfa311abedfb811f35fc1b7f30a1c68561f15942438916c7de25e179c364be11881e01f844f9c2ccd71a3be55967ad5abd2f35b10bb7a882edea
---
 ci/dash/lint-tidy.sh            |  1 +
 src/.clang-tidy                 |  5 +++++
 src/evo/specialtxman.cpp        |  2 +-
 src/instantsend/instantsend.cpp |  2 +-
 src/llmq/blockprocessor.cpp     |  2 +-
 src/llmq/snapshot.cpp           |  5 ++---
 src/rpc/blockchain.cpp          |  2 +-
 src/script/descriptor.cpp       |  4 ++--
 src/test/fuzz/txorphan.cpp      |  1 -
 src/univalue/include/univalue.h |  8 ++++----
 src/univalue/lib/univalue.cpp   | 20 ++++++++++----------
 src/util/message.cpp            |  1 -
 src/util/strencodings.cpp       |  1 -
 src/util/string.cpp             |  3 +--
 src/util/string.h               |  1 -
 src/util/threadinterrupt.h      |  1 +
 src/wallet/spend.cpp            |  2 +-
 17 files changed, 31 insertions(+), 30 deletions(-)

diff --git a/ci/dash/lint-tidy.sh b/ci/dash/lint-tidy.sh
index b186650db63e..c4d9ab5ed431 100755
--- a/ci/dash/lint-tidy.sh
+++ b/ci/dash/lint-tidy.sh
@@ -44,6 +44,7 @@ iwyu_tool.py \
   "src/util/moneystr.cpp" \
   "src/util/serfloat.cpp" \
   "src/util/spanparsing.cpp" \
+  "src/util/string.cpp" \
   "src/util/strencodings.cpp" \
   "src/util/syserror.cpp" \
   "src/util/url.cpp" \
diff --git a/src/.clang-tidy b/src/.clang-tidy
index 42602b69749b..76978140ecd7 100644
--- a/src/.clang-tidy
+++ b/src/.clang-tidy
@@ -6,6 +6,7 @@ misc-unused-using-decls,
 modernize-use-default-member-init,
 modernize-use-nullptr,
 performance-for-range-copy,
+performance-move-const-arg,
 performance-unnecessary-copy-initialization,
 readability-const-return-type,
 readability-redundant-declaration,
@@ -17,7 +18,11 @@ bugprone-use-after-move,
 misc-unused-using-decls,
 modernize-use-default-member-init,
 modernize-use-nullptr,
+performance-move-const-arg,
 performance-unnecessary-copy-initialization,
 readability-redundant-declaration,
 readability-redundant-string-init,
 '
+CheckOptions:
+ - key: performance-move-const-arg.CheckTriviallyCopyableMove
+   value: false
diff --git a/src/evo/specialtxman.cpp b/src/evo/specialtxman.cpp
index f5bd3f810117..0852f97ce607 100644
--- a/src/evo/specialtxman.cpp
+++ b/src/evo/specialtxman.cpp
@@ -503,7 +503,7 @@ bool CSpecialTxProcessor::RebuildListFromBlock(const CBlock& block, gsl::not_nul
         newList.UpdateMN(dmn.proTxHash, newState);
     });
 
-    mnListRet = std::move(newList);
+    mnListRet = newList;
 
     return true;
 }
diff --git a/src/instantsend/instantsend.cpp b/src/instantsend/instantsend.cpp
index 68766bf0c71f..495eefd68119 100644
--- a/src/instantsend/instantsend.cpp
+++ b/src/instantsend/instantsend.cpp
@@ -101,7 +101,7 @@ instantsend::PendingState CInstantSendManager::FetchPendingLocks()
     std::vector<uint256> removed;
     removed.reserve(std::min(maxCount, pendingInstantSendLocks.size()));
 
-    for (const auto& [islockHash, nodeid_islptr_pair] : pendingInstantSendLocks) {
+    for (auto& [islockHash, nodeid_islptr_pair] : pendingInstantSendLocks) {
         // Check if we've reached max count
         if (ret.m_pending_is.size() >= maxCount) {
             ret.m_pending_work = true;
diff --git a/src/llmq/blockprocessor.cpp b/src/llmq/blockprocessor.cpp
index 0baf23fb9abf..4fc57aba77de 100644
--- a/src/llmq/blockprocessor.cpp
+++ b/src/llmq/blockprocessor.cpp
@@ -441,7 +441,7 @@ bool CQuorumBlockProcessor::GetCommitmentsFromBlock(const CBlock& block, gsl::no
 
     for (const auto& tx : block.vtx) {
         if (tx->nType == TRANSACTION_QUORUM_COMMITMENT) {
-            const auto opt_qc = GetTxPayload<CFinalCommitmentTxPayload>(*tx);
+            auto opt_qc = GetTxPayload<CFinalCommitmentTxPayload>(*tx);
             if (!opt_qc) {
                 // should not happen as it was verified before processing the block
                 LogPrint(BCLog::LLMQ, "CQuorumBlockProcessor::%s height=%d GetTxPayload fails\n", __func__, pindex->nHeight);
diff --git a/src/llmq/snapshot.cpp b/src/llmq/snapshot.cpp
index 123ad4c90194..cf744f6c781a 100644
--- a/src/llmq/snapshot.cpp
+++ b/src/llmq/snapshot.cpp
@@ -209,17 +209,16 @@ bool BuildQuorumRotationInfo(CDeterministicMNManager& dmnman, CQuorumSnapshotMan
             response.quorumSnapshotAtHMinus4C = std::move(snapshotHMinus4C.value());
         }
 
-        CSimplifiedMNListDiff mn4c;
         if (!BuildSimplifiedMNListDiff(dmnman, chainman, qblockman, qman,
                                        GetLastBaseBlockHash(baseBlockIndexes, pWorkBlockHMinus4CIndex,
                                                             use_legacy_construction),
-                                       pWorkBlockHMinus4CIndex->GetBlockHash(), mn4c, errorRet)) {
+                                       pWorkBlockHMinus4CIndex->GetBlockHash(), response.mnListDiffAtHMinus4C, errorRet)) {
+            response.mnListDiffAtHMinus4C = {};
             return false;
         }
         if (!use_legacy_construction) {
             baseBlockIndexes.push_back(pWorkBlockHMinus4CIndex);
         }
-        response.mnListDiffAtHMinus4C = std::move(mn4c);
     } else {
         response.extraShare = false;
     }
diff --git a/src/rpc/blockchain.cpp b/src/rpc/blockchain.cpp
index fbb893e637f2..8401e186c750 100644
--- a/src/rpc/blockchain.cpp
+++ b/src/rpc/blockchain.cpp
@@ -2527,7 +2527,7 @@ static RPCHelpMan scantxoutset()
         for (const UniValue& scanobject : request.params[1].get_array().getValues()) {
             FlatSigningProvider provider;
             auto scripts = EvalDescriptorStringOrObject(scanobject, provider);
-            for (const auto& script : scripts) {
+            for (CScript& script : scripts) {
                 std::string inferred = InferDescriptor(script, provider)->ToString();
                 needles.emplace(script);
                 descriptors.emplace(std::move(script), std::move(inferred));
diff --git a/src/script/descriptor.cpp b/src/script/descriptor.cpp
index 1b84c6f580e8..49d14db91562 100644
--- a/src/script/descriptor.cpp
+++ b/src/script/descriptor.cpp
@@ -547,7 +547,7 @@ class DescriptorImpl : public Descriptor
             if (pos++) ret += ",";
             std::string tmp;
             if (!scriptarg->ToStringHelper(arg, tmp, type, cache)) return false;
-            ret += std::move(tmp);
+            ret += tmp;
         }
         return true;
     }
@@ -571,7 +571,7 @@ class DescriptorImpl : public Descriptor
                     tmp = pubkey->ToString();
                     break;
             }
-            ret += std::move(tmp);
+            ret += tmp;
         }
         std::string subscript;
         if (!ToStringSubScriptHelper(arg, subscript, type, cache)) return false;
diff --git a/src/test/fuzz/txorphan.cpp b/src/test/fuzz/txorphan.cpp
index d89c06ba0a14..1a279b6bb74c 100644
--- a/src/test/fuzz/txorphan.cpp
+++ b/src/test/fuzz/txorphan.cpp
@@ -19,7 +19,6 @@
 #include <util/check.h>
 #include <util/time.h>
 
-#include <algorithm>
 #include <cstdint>
 #include <memory>
 #include <set>
diff --git a/src/univalue/include/univalue.h b/src/univalue/include/univalue.h
index 076fcfa43277..d895b26af988 100644
--- a/src/univalue/include/univalue.h
+++ b/src/univalue/include/univalue.h
@@ -77,14 +77,14 @@ class UniValue {
     bool isArray() const { return (typ == VARR); }
     bool isObject() const { return (typ == VOBJ); }
 
-    void push_back(const UniValue& val);
+    void push_back(UniValue val);
     void push_backV(const std::vector<UniValue>& vec);
     template <class It>
     void push_backV(It first, It last);
 
-    void __pushKV(const std::string& key, const UniValue& val);
-    void pushKV(const std::string& key, const UniValue& val);
-    void pushKVs(const UniValue& obj);
+    void __pushKV(std::string key, UniValue val);
+    void pushKV(std::string key, UniValue val);
+    void pushKVs(UniValue obj);
 
     std::string write(unsigned int prettyIndent = 0,
                       unsigned int indentLevel = 0) const;
diff --git a/src/univalue/lib/univalue.cpp b/src/univalue/lib/univalue.cpp
index 4c8066767a94..29660ceedc46 100644
--- a/src/univalue/lib/univalue.cpp
+++ b/src/univalue/lib/univalue.cpp
@@ -101,11 +101,11 @@ void UniValue::setObject()
     typ = VOBJ;
 }
 
-void UniValue::push_back(const UniValue& val_)
+void UniValue::push_back(UniValue val)
 {
     checkType(VARR);
 
-    values.push_back(val_);
+    values.push_back(std::move(val));
 }
 
 void UniValue::push_backV(const std::vector<UniValue>& vec)
@@ -115,32 +115,32 @@ void UniValue::push_backV(const std::vector<UniValue>& vec)
     values.insert(values.end(), vec.begin(), vec.end());
 }
 
-void UniValue::__pushKV(const std::string& key, const UniValue& val_)
+void UniValue::__pushKV(std::string key, UniValue val)
 {
     checkType(VOBJ);
 
-    keys.push_back(key);
-    values.push_back(val_);
+    keys.push_back(std::move(key));
+    values.push_back(std::move(val));
 }
 
-void UniValue::pushKV(const std::string& key, const UniValue& val_)
+void UniValue::pushKV(std::string key, UniValue val)
 {
     checkType(VOBJ);
 
     size_t idx;
     if (findKey(key, idx))
-        values[idx] = val_;
+        values[idx] = std::move(val);
     else
-        __pushKV(key, val_);
+        __pushKV(std::move(key), std::move(val));
 }
 
-void UniValue::pushKVs(const UniValue& obj)
+void UniValue::pushKVs(UniValue obj)
 {
     checkType(VOBJ);
     obj.checkType(VOBJ);
 
     for (size_t i = 0; i < obj.keys.size(); i++)
-        __pushKV(obj.keys[i], obj.values.at(i));
+        __pushKV(std::move(obj.keys.at(i)), std::move(obj.values.at(i)));
 }
 
 void UniValue::getObjMap(std::map<std::string,UniValue>& kv) const
diff --git a/src/util/message.cpp b/src/util/message.cpp
index 685093bb12da..2a723b3bf208 100644
--- a/src/util/message.cpp
+++ b/src/util/message.cpp
@@ -8,7 +8,6 @@
 #include <key_io.h>
 #include <pubkey.h>
 #include <script/standard.h>
-#include <serialize.h>
 #include <uint256.h>
 #include <util/message.h>
 #include <util/strencodings.h>
diff --git a/src/util/strencodings.cpp b/src/util/strencodings.cpp
index a69c770ac1b9..cbbbb5c9692b 100644
--- a/src/util/strencodings.cpp
+++ b/src/util/strencodings.cpp
@@ -6,7 +6,6 @@
 #include <span.h>
 #include <util/strencodings.h>
 
-#include <algorithm>
 #include <array>
 #include <cassert>
 #include <cstring>
diff --git a/src/util/string.cpp b/src/util/string.cpp
index db6dbe4135b9..e994c85f1c05 100644
--- a/src/util/string.cpp
+++ b/src/util/string.cpp
@@ -6,10 +6,9 @@
 
 #include <regex>
 #include <string>
-#include <utility>
 
 void ReplaceAll(std::string& in_out, const std::string& search, const std::string& substitute)
 {
     if (search.empty()) return;
-    in_out = std::regex_replace(in_out, std::regex(std::move(search)), substitute);
+    in_out = std::regex_replace(in_out, std::regex(search), substitute);
 }
diff --git a/src/util/string.h b/src/util/string.h
index e87d0a6e02ab..f9b5ff3d87c6 100644
--- a/src/util/string.h
+++ b/src/util/string.h
@@ -7,7 +7,6 @@
 
 #include <util/spanparsing.h>
 
-#include <algorithm>
 #include <array>
 #include <cstdint>
 #include <cstring>
diff --git a/src/util/threadinterrupt.h b/src/util/threadinterrupt.h
index 4805e14eb3fe..d95cbb9abadc 100644
--- a/src/util/threadinterrupt.h
+++ b/src/util/threadinterrupt.h
@@ -6,6 +6,7 @@
 #define BITCOIN_UTIL_THREADINTERRUPT_H
 
 #include <sync.h>
+#include <threadsafety.h>
 
 #include <atomic>
 #include <chrono>
diff --git a/src/wallet/spend.cpp b/src/wallet/spend.cpp
index 3692b7be1b6f..1de3acd1e16b 100644
--- a/src/wallet/spend.cpp
+++ b/src/wallet/spend.cpp
@@ -313,7 +313,7 @@ std::map<CTxDestination, std::vector<COutput>> ListCoins(const CWallet& wallet)
 
     std::map<CTxDestination, std::vector<COutput>> result;
 
-    for (const COutput& coin : AvailableCoinsListUnspent(wallet).all()) {
+    for (COutput& coin : AvailableCoinsListUnspent(wallet).all()) {
         CTxDestination address;
         if ((coin.spendable || (wallet.IsWalletFlagSet(WALLET_FLAG_DISABLE_PRIVATE_KEYS) && coin.solvable)) &&
             ExtractDestination(FindNonChangeParentOutput(wallet, coin.outpoint).scriptPubKey, address)) {

From 52f7caddf3d7d4a8da878020567b6a128da3d2cd Mon Sep 17 00:00:00 2001
From: Konstantin Akimov <knstqq@gmail.com>
Date: Mon, 20 Oct 2025 14:42:48 +0700
Subject: [PATCH 579/656] fix: missing dashification of rpc/backup.cpp

---
 src/wallet/rpc/backup.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/wallet/rpc/backup.cpp b/src/wallet/rpc/backup.cpp
index 055aceff5ea7..0802f0d46a17 100644
--- a/src/wallet/rpc/backup.cpp
+++ b/src/wallet/rpc/backup.cpp
@@ -1954,7 +1954,7 @@ RPCHelpMan importdescriptors() {
                                       "block from time %d, which is after or within %d seconds of key creation, and "
                                       "could contain transactions pertaining to the desc. As a result, transactions "
                                       "and coins using this desc may not appear in the wallet. This error could be "
-                                      "caused by pruning or data corruption (see bitcoind log for details) and could "
+                                      "caused by pruning or data corruption (see dashd log for details) and could "
                                       "be dealt with by downloading and rescanning the relevant blocks (see -reindex "
                                       "and -rescan options).",
                                 GetImportTimestamp(request, now), scanned_time - TIMESTAMP_WINDOW - 1, TIMESTAMP_WINDOW)));

From 4bb4981af2f7980a2aaa645caeba2a20752d313f Mon Sep 17 00:00:00 2001
From: Konstantin Akimov <knstqq@gmail.com>
Date: Sat, 1 Mar 2025 00:47:46 +0700
Subject: [PATCH 580/656] fix: remove nodiscard attribute as follow-up for
 bitcoin#18115

---
 src/wallet/wallet.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/wallet/wallet.h b/src/wallet/wallet.h
index 8e43ce6d63ba..600924940819 100644
--- a/src/wallet/wallet.h
+++ b/src/wallet/wallet.h
@@ -687,7 +687,7 @@ class CWallet final : public WalletStorage, public interfaces::Chain::Notificati
      * @param[in] finalize whether to create the final scriptSig
      * return error
      */
-    [[nodiscard]] TransactionError FillPSBT(PartiallySignedTransaction& psbtx,
+    TransactionError FillPSBT(PartiallySignedTransaction& psbtx,
                   bool& complete,
                   int sighash_type = 1 /* SIGHASH_ALL */,
                   bool sign = true,

From d49f0eb374575f2eff59965acf77e8d8cf7d861d Mon Sep 17 00:00:00 2001
From: "Wladimir J. van der Laan" <laanwj@protonmail.com>
Date: Tue, 23 Feb 2021 17:56:24 +0100
Subject: [PATCH 581/656] Merge #16546: External signer support - Wallet Box
 edition

f75e0c1edde39a91cc353b0102638e232def9476 doc: add external-signer.md (Sjors Provoost)
d4b0107d68a91ed4d1a5c78c8ca76251329d3f3c rpc: send: support external signer (Sjors Provoost)
245b4457cf9265190a05529a0a97e1cb258cca8a rpc: signerdisplayaddress (Sjors Provoost)
7ebc7c0215979c53b92a436acc8b5b607b8d735a wallet: ExternalSigner: add GetDescriptors method (Sjors Provoost)
fc5da520f5c72287f59823b8a6d748dda49c574a wallet: add GetExternalSigner() (Sjors Provoost)
259f52cc33817a00b91ec9c7d078c07b88db7ab4 test: external_signer wallet flag is immutable (Sjors Provoost)
2655197e1c2dea9536c32afe1482ced4a1f481e9 rpc: add external_signer option to createwallet (Sjors Provoost)
2700f09c4130af6167ce71f46960e92ca800e205 rpc: signer: add enumeratesigners to list external signers (Sjors Provoost)
07b7c940a7da138d55a484ef83fee19ebf58a867 rpc: add external signer RPC files (Sjors Provoost)
8ce7767071779a0170364e6426bd393ed71bf281 wallet: add ExternalSignerScriptPubKeyMan (Sjors Provoost)
157ea7c614950d61bfe405310e2aaabcee31f7a3 wallet: add external_signer flag (Sjors Provoost)
f3e6ce78fba2b31173fe7b606aa9edb5b615bff3 test: add external signer test (Sjors Provoost)
8cf543f96dcd6fdfac1367b9e2b1d7d51be8bb76 wallet: add -signer argument for external signer command (Sjors Provoost)
f7eb7ecc6750ab267a979d9268ce5b5d151c26de test: framework: add skip_if_no_external_signer (Sjors Provoost)
87a97941f667483bbf2ab00929e03a2199cb8a62 configure: add --enable-external-signer (Sjors Provoost)

Pull request description:

  Big picture overview in [this gist](https://gist.github.com/Sjors/29d06728c685e6182828c1ce9b74483d).

  This PR lets `bitcoind` call an arbitrary command `-signer=<cmd>`, e.g. a hardware wallet driver,  where it can fetch public keys, ask to display an address, and sign a transaction (using PSBT under the hood).

  It's design to work with https://github.com/bitcoin-core/HWI, which supports multiple hardware wallets. Any command with the same arguments and return values will work. It simplifies the manual procedure described [here](https://github.com/bitcoin-core/HWI/blob/master/docs/bitcoin-core-usage.md).

  Usage is documented in [doc/external-signer.md](
  https://github.com/Sjors/bitcoin/blob/2019/08/hww-box2/doc/external-signer.md), which also describes what protocol a different signer binary should conform to.

  Use `--enable-external-signer` to opt in, requires Boost::Process:

  ```
  Options used to compile and link:
    with wallet     = yes
    with gui / qt   = no
    external signer = yes
  ```

  It adds the following RPC methods:
  * `enumeratesigners`: asks <cmd> for a list of signers (e.g. devices) and their master key fingerprint
  * `signerdisplayaddress <address>`:  asks <cmd> to display an address

  It enhances the following RPC methods:
  * `createwallet`: takes an additional `external_signer` argument and fetches keys from device
  * `send`: automatically sends transaction to device and waits

  Usage TL&DR:
  * clone HWI repo somewhere and launch `bitcoind -signer=../HWI/hwi.py`
  * check if you can see your hardware device: `bitcoin-cli enumeratesigners`
  * create wallet and auto import keys `bitcoin-cli createwallet "hww" true true "" true true true`
  * display address on device: `bitcoin-cli signerdisplayaddress ...`
  * to spend, use `send` RPC and approve transaction on device

  Prerequisites:
  - [x] #21127 load wallet flags before everything else
  - [x] #21182 remove mostly pointless BOOST_PROCESS macro

  Potentially useful followups:
  - GUI support: bitcoin-core/gui#4
  - bumpfee support
  - (automatically) verify (a subset of) keys on the device after import, through message signing

ACKs for top commit:
  laanwj:
    re-ACK f75e0c1edde39a91cc353b0102638e232def9476

Tree-SHA512: 7db8afd54762295c1424c3f01d8c587ec256a72f34bd5256e04b21832dabd5dc212be8ab975ae3b67de75259fd569a561491945750492f417111dc7b6641e77f
---
 configure.ac                                  |  30 +--
 doc/Doxyfile.in                               |   2 +-
 doc/external-signer.md                        | 171 +++++++++++++++
 src/Makefile.am                               |   6 +
 src/dummywallet.cpp                           |   1 +
 src/rpc/client.cpp                            |   1 +
 src/test/system_tests.cpp                     |  10 +-
 src/util/error.cpp                            |   4 +
 src/util/error.h                              |   2 +
 src/util/system.cpp                           |   8 +-
 src/util/system.h                             |   4 +-
 src/wallet/external_signer.cpp                | 119 ++++++++++
 src/wallet/external_signer.h                  |  73 +++++++
 .../external_signer_scriptpubkeyman.cpp       |  83 +++++++
 src/wallet/external_signer_scriptpubkeyman.h  |  36 ++++
 src/wallet/init.cpp                           |   3 +
 src/wallet/interfaces.cpp                     |  12 ++
 src/wallet/rpc/spend.cpp                      |   6 +-
 src/wallet/rpc/wallet.cpp                     |   8 +
 src/wallet/rpcsigner.cpp                      | 108 ++++++++++
 src/wallet/rpcsigner.h                        |  26 +++
 src/wallet/scriptpubkeyman.cpp                |   1 +
 src/wallet/scriptpubkeyman.h                  |  10 +-
 src/wallet/wallet.cpp                         |  95 +++++++-
 src/wallet/wallet.h                           |  12 +-
 src/wallet/walletutil.h                       |   3 +
 test/config.ini.in                            |   1 +
 test/functional/mocks/signer.py               | 102 +++++++++
 test/functional/rpc_help.py                   |   5 +-
 .../test_framework/test_framework.py          |   9 +
 test/functional/test_framework/test_node.py   |   4 +-
 test/functional/test_runner.py                |   1 +
 test/functional/wallet_signer.py              | 203 ++++++++++++++++++
 33 files changed, 1123 insertions(+), 36 deletions(-)
 create mode 100644 doc/external-signer.md
 create mode 100644 src/wallet/external_signer.cpp
 create mode 100644 src/wallet/external_signer.h
 create mode 100644 src/wallet/external_signer_scriptpubkeyman.cpp
 create mode 100644 src/wallet/external_signer_scriptpubkeyman.h
 create mode 100644 src/wallet/rpcsigner.cpp
 create mode 100644 src/wallet/rpcsigner.h
 create mode 100755 test/functional/mocks/signer.py
 create mode 100755 test/functional/wallet_signer.py

diff --git a/configure.ac b/configure.ac
index 6eccd119c840..65c2be5ddb26 100644
--- a/configure.ac
+++ b/configure.ac
@@ -319,10 +319,10 @@ AC_ARG_ENABLE([werror],
     [enable_werror=$enableval],
     [enable_werror=no])
 
-AC_ARG_WITH([boost-process],
-    [AS_HELP_STRING([--with-boost-process],[Opt in to using Boost Process (default is no)])],
-    [boost_process=$withval],
-    [boost_process=no])
+AC_ARG_ENABLE([external-signer],
+    [AS_HELP_STRING([--enable-external-signer],[compile external signer support (default is no, requires Boost::Process)])],
+    [use_external_signer=$enableval],
+    [use_external_signer=no])
 
 AC_LANG_PUSH([C++])
 
@@ -1437,6 +1437,7 @@ if test "$enable_fuzz" = "yes"; then
   bitcoin_enable_qt_dbus=no
   use_bench=no
   use_tests=no
+  use_external_signer=no
   use_upnp=no
   use_natpmp=no
   use_zmq=no
@@ -1605,19 +1606,23 @@ dnl See: https://github.com/boostorg/config/pull/430.
 AX_CHECK_PREPROC_FLAG([-DBOOST_NO_CXX98_FUNCTION_BASE], [BOOST_CPPFLAGS="$BOOST_CPPFLAGS -DBOOST_NO_CXX98_FUNCTION_BASE"], [], [$CXXFLAG_WERROR],
                       [AC_LANG_PROGRAM([[#include <boost/config.hpp>]])])
 
-dnl Opt-in to Boost Process
-if test "$boost_process" != "no"; then
+dnl Opt-in to Boost Process if external signer support is requested
+if test "$use_external_signer" != "no"; then
 AC_MSG_CHECKING(for Boost Process)
 AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <boost/process.hpp>]],
  [[ boost::process::child* child = new boost::process::child; delete child; ]])],
- [ AC_MSG_RESULT(yes); AC_DEFINE([HAVE_BOOST_PROCESS],,[define if Boost::Process is available])],
- [ AC_MSG_ERROR([Boost::Process is not available!])]
+ [ AC_MSG_RESULT(yes)
+ AC_DEFINE([ENABLE_EXTERNAL_SIGNER],,[define if external signer support is enabled])
+ ],
+ [ AC_MSG_ERROR([Boost::Process is required for external signer support, but not available!])]
 )
 fi
 
+AM_CONDITIONAL([ENABLE_EXTERNAL_SIGNER], [test "$use_external_signer" = "yes"])
+
   if test "$suppress_external_warnings" != "no"; then
     BOOST_CPPFLAGS=SUPPRESS_WARNINGS($BOOST_CPPFLAGS)
-fi
+  fi
 fi
 
 dnl Check for reduced exports
@@ -2012,6 +2017,7 @@ AC_SUBST(ARM_SHANI_CXXFLAGS)
 AC_SUBST(LIBTOOL_APP_LDFLAGS)
 AC_SUBST(USE_SQLITE)
 AC_SUBST(USE_BDB)
+AC_SUBST(ENABLE_EXTERNAL_SIGNER)
 AC_SUBST(USE_UPNP)
 AC_SUBST(USE_QRCODE)
 AC_SUBST(TESTDEFS)
@@ -2079,7 +2085,7 @@ esac
 
 echo
 echo "Options used to compile and link:"
-echo "  boost process       = $with_boost_process"
+echo "  external signer     = $use_external_signer"
 echo "  multiprocess        = $build_multiprocess"
 echo "  with libs           = $build_bitcoin_libs"
 echo "  with wallet         = $enable_wallet"
@@ -2089,13 +2095,13 @@ if test "$enable_wallet" != "no"; then
 fi
 echo "  with gui / qt       = $bitcoin_enable_qt"
 if test $bitcoin_enable_qt != "no"; then
-    echo "    with qr           = $use_qr"
+    echo "    with qr       = $use_qr"
 fi
 echo "  with zmq            = $use_zmq"
 if test $enable_fuzz = "no"; then
     echo "  with test           = $use_tests"
 else
-    echo "  with test           = not building test_dash because fuzzing is enabled"
+    echo "  with test       = not building test_dash because fuzzing is enabled"
 fi
 echo "  with fuzz binary    = $enable_fuzz_binary"
 echo "  with bench          = $use_bench"
diff --git a/doc/Doxyfile.in b/doc/Doxyfile.in
index 8d54cb41ef7e..611e4941a07e 100644
--- a/doc/Doxyfile.in
+++ b/doc/Doxyfile.in
@@ -2093,7 +2093,7 @@ INCLUDE_FILE_PATTERNS  =
 # recursively expanded use the := operator instead of the = operator.
 # This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
 
-PREDEFINED             = HAVE_BOOST_PROCESS
+PREDEFINED             = ENABLE_EXTERNAL_SIGNER
 
 # If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then this
 # tag can be used to specify a list of macro names that should be expanded. The
diff --git a/doc/external-signer.md b/doc/external-signer.md
new file mode 100644
index 000000000000..053752ee2f16
--- /dev/null
+++ b/doc/external-signer.md
@@ -0,0 +1,171 @@
+# Support for signing transactions outside of Bitcoin Core
+
+Bitcoin Core can be launched with `-signer=<cmd>` where `<cmd>` is an external tool which can sign transactions and perform other functions. For example, it can be used to communicate with a hardware wallet.
+
+## Example usage
+
+The following example is based on the [HWI](https://github.com/bitcoin-core/HWI) tool. Although this tool is hosted under the Bitcoin Core GitHub organization and maintained by Bitcoin Core developers, it should be used with caution. It is considered experimental and has far less review than Bitcoin Core itself. Be particularly careful when running tools such as these on a computer with private keys on it.
+
+When using a hardware wallet, consult the manufacturer website for (alternative) software they recommend. As long as their software conforms to the standard below, it should be able to work with Bitcoin Core.
+
+Start Bitcoin Core:
+
+```sh
+$ bitcoind -signer=../HWI/hwi.py
+```
+
+### Device setup
+
+Follow the hardware manufacturers instructions for the initial device setup, as well as their instructions for creating a backup. Alternatively, for some devices, you can use the `setup`, `restore` and `backup` commands provided by [HWI](https://github.com/bitcoin-core/HWI).
+
+### Create wallet and import keys
+
+Get a list of signing devices / services:
+
+```
+$ bitcoin-cli enumeratesigners
+{
+  "signers": [
+    {
+      "fingerprint": "c8df832a"
+    }
+]
+```
+
+The master key fingerprint is used to identify a device.
+
+Create a wallet, this automatically imports the public keys:
+
+```sh
+$ bitcoin-cli createwallet "hww" true true "" true true true
+```
+
+### Verify an address
+
+Display an address on the device:
+
+```sh
+$ bitcoin-cli -rpcwallet=<wallet> getnewaddress
+$ bitcoin-cli -rpcwallet=<wallet> signerdisplayaddress <address>
+```
+
+Replace `<address>` with the result of `getnewaddress`.
+
+### Spending
+
+Under the hood this uses a [Partially Signed Bitcoin Transaction](psbt.md).
+
+```sh
+$ bitcoin-cli -rpcwallet=<wallet> sendtoaddress <address> <amount>
+```
+
+This prompts your hardware wallet to sign, and fail if it's not connected. If successful
+it automatically broadcasts the transaction.
+
+```sh
+{"complete": true, "txid": <txid>}
+```
+
+## Signer API
+
+In order to be compatible with Bitcoin Core any signer command should conform to the specification below. This specification is subject to change. Ideally a BIP should propose a standard so that other wallets can also make use of it.
+
+Prerequisite knowledge:
+* [Output Descriptors](descriptors.md)
+* Partially Signed Bitcoin Transaction ([PSBT](psbt.md))
+
+### `enumerate` (required)
+
+Usage:
+```
+$ <cmd> enumerate
+[
+    {
+        "fingerprint": "00000000"
+    }
+]
+```
+
+The command MUST return an (empty) array with at least a `fingerprint` field.
+
+A future extension could add an optional return field with device capabilities. Perhaps a descriptor with wildcards. For example: `["pkh("44'/0'/$'/{0,1}/*"), sh(wpkh("49'/0'/$'/{0,1}/*")), wpkh("84'/0'/$'/{0,1}/*")]`. This would indicate the device supports legacy, wrapped SegWit and native SegWit. In addition it restricts the derivation paths that can used for those, to maintain compatibility with other wallet software. It also indicates the device, or the driver, doesn't support multisig.
+
+A future extension could add an optional return field `reachable`, in case `<cmd>` knows a signer exists but can't currently reach it.
+
+### `signtransaction` (required)
+
+Usage:
+```
+$ <cmd> --fingerprint=<fingerprint> (--testnet) signtransaction <psbt>
+base64_encode_signed_psbt
+```
+
+The command returns a psbt with any signatures.
+
+The `psbt` SHOULD include bip32 derivations. The command SHOULD fail if none of the bip32 derivations match a key owned by the device.
+
+The command SHOULD fail if the user cancels.
+
+The command MAY complain if `--testnet` is set, but any of the BIP32 derivation paths contain a coin type other than `1h` (and vice versa).
+
+### `getdescriptors` (optional)
+
+Usage:
+
+```
+$ <cmd> --fingerprint=<fingerprint> (--testnet) getdescriptors <account>
+<xpub>
+```
+
+Returns descriptors supported by the device. Example:
+
+```
+$ <cmd> --fingerprint=00000000 --testnet getdescriptors
+{
+  "receive": [
+    "pkh([00000000/44h/0h/0h]xpub6C.../0/*)#fn95jwmg",
+    "sh(wpkh([00000000/49h/0h/0h]xpub6B..../0/*))#j4r9hntt",
+    "wpkh([00000000/84h/0h/0h]xpub6C.../0/*)#qw72dxa9"
+  ],
+  "internal": [
+    "pkh([00000000/44h/0h/0h]xpub6C.../1/*)#c8q40mts",
+    "sh(wpkh([00000000/49h/0h/0h]xpub6B..../1/*))#85dn0v75",
+    "wpkh([00000000/84h/0h/0h]xpub6C..../1/*)#36mtsnda"
+  ]
+}
+```
+
+### `displayaddress` (optional)
+
+Usage:
+```
+<cmd> --fingerprint=<fingerprint> (--testnet) displayaddress --desc descriptor
+```
+
+Example, display the first native SegWit receive address on Testnet:
+
+```
+<cmd> --fingerprint=00000000 --testnet displayaddress --desc "wpkh([00000000/84h/1h/0h]tpubDDUZ..../0/0)"
+```
+
+The command MUST be able to figure out the address type from the descriptor.
+
+If <descriptor> contains a master key fingerprint, the command MUST fail if it does not match the fingerprint known by the device.
+
+If <descriptor> contains an xpub, the command MUST fail if it does not match the xpub known by the device.
+
+The command MAY complain if `--testnet` is set, but the BIP32 coin type is not `1h` (and vice versa).
+
+## How Bitcoin Core uses the Signer API
+
+The `enumeratesigners` RPC simply calls `<cmd> enumerate`.
+
+The `createwallet` RPC calls:
+
+* `<cmd> --fingerprint=00000000 getdescriptors 0`
+
+It then imports descriptors for all support address types, in a BIP44/49/84 compatible manner.
+
+The `displayaddress` RPC reuses some code from `getaddressinfo` on the provided address and obtains the inferred descriptor. It then calls `<cmd> --fingerprint=00000000 displayaddress --desc=<descriptor>`.
+
+`sendtoaddress` and `sendmany` check `inputs->bip32_derivs` to see if any inputs have the same `master_fingerprint` as the signer. If so, it calls `<cmd> --fingerprint=00000000 signtransaction <psbt>`. It waits for the device to return a (partially) signed psbt, tries to finalize it and broadcasts the transation.
diff --git a/src/Makefile.am b/src/Makefile.am
index 9a3b18c65482..b8100c72d792 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -430,11 +430,14 @@ BITCOIN_CORE_H = \
   wallet/crypter.h \
   wallet/db.h \
   wallet/dump.h \
+  wallet/external_signer.h \
+  wallet/external_signer_scriptpubkeyman.h \
   wallet/fees.h \
   wallet/hdchain.h \
   wallet/ismine.h \
   wallet/load.h \
   wallet/receive.h \
+  wallet/rpcsigner.h \
   wallet/rpc/util.h \
   wallet/rpc/wallet.h \
   wallet/salvage.h \
@@ -643,6 +646,8 @@ libbitcoin_wallet_a_SOURCES = \
   wallet/crypter.cpp \
   wallet/db.cpp \
   wallet/dump.cpp \
+  wallet/external_signer_scriptpubkeyman.cpp \
+  wallet/external_signer.cpp \
   wallet/fees.cpp \
   wallet/hdchain.cpp \
   wallet/interfaces.cpp \
@@ -657,6 +662,7 @@ libbitcoin_wallet_a_SOURCES = \
   wallet/rpc/transactions.cpp \
   wallet/rpc/util.cpp \
   wallet/rpc/wallet.cpp \
+  wallet/rpcsigner.cpp \
   wallet/scriptpubkeyman.cpp \
   wallet/spend.cpp \
   wallet/transaction.cpp \
diff --git a/src/dummywallet.cpp b/src/dummywallet.cpp
index e02c4b505149..5ad3b2ee23ee 100644
--- a/src/dummywallet.cpp
+++ b/src/dummywallet.cpp
@@ -51,6 +51,7 @@ void DummyWalletInit::AddWalletOptions(ArgsManager& argsman) const
         "-maxtxfee=<amt>",
         "-rescan=<mode>",
         "-salvagewallet",
+        "-signer=<cmd>",
         "-spendzeroconfchange",
         "-wallet=<path>",
         "-walletbackupsdir=<dir>",
diff --git a/src/rpc/client.cpp b/src/rpc/client.cpp
index 9742b33fbc59..636ca29d6163 100644
--- a/src/rpc/client.cpp
+++ b/src/rpc/client.cpp
@@ -239,6 +239,7 @@ static const CRPCConvertParam vRPCConvertParams[] =
     { "createwallet", 4, "avoid_reuse"},
     { "createwallet", 5, "descriptors"},
     { "createwallet", 6, "load_on_startup"},
+    { "createwallet", 7, "external_signer"},
     { "restorewallet", 2, "load_on_startup"},
     { "loadwallet", 1, "load_on_startup"},
     { "unloadwallet", 1, "load_on_startup"},
diff --git a/src/test/system_tests.cpp b/src/test/system_tests.cpp
index ae8b23e4a734..b8df7a4b4c6d 100644
--- a/src/test/system_tests.cpp
+++ b/src/test/system_tests.cpp
@@ -6,22 +6,22 @@
 #include <util/system.h>
 #include <univalue.h>
 
-#ifdef HAVE_BOOST_PROCESS
+#ifdef ENABLE_EXTERNAL_SIGNER
 #include <boost/process.hpp>
-#endif // HAVE_BOOST_PROCESS
+#endif // ENABLE_EXTERNAL_SIGNER
 
 #include <boost/test/unit_test.hpp>
 
 BOOST_FIXTURE_TEST_SUITE(system_tests, BasicTestingSetup)
 
-// At least one test is required (in case HAVE_BOOST_PROCESS is not defined).
+// At least one test is required (in case ENABLE_EXTERNAL_SIGNER is not defined).
 // Workaround for https://github.com/bitcoin/bitcoin/issues/19128
 BOOST_AUTO_TEST_CASE(dummy)
 {
     BOOST_CHECK(true);
 }
 
-#ifdef HAVE_BOOST_PROCESS
+#ifdef ENABLE_EXTERNAL_SIGNER
 
 BOOST_AUTO_TEST_CASE(run_command)
 {
@@ -96,6 +96,6 @@ BOOST_AUTO_TEST_CASE(run_command)
     }
 #endif
 }
-#endif // HAVE_BOOST_PROCESS
+#endif // ENABLE_EXTERNAL_SIGNER
 
 BOOST_AUTO_TEST_SUITE_END()
diff --git a/src/util/error.cpp b/src/util/error.cpp
index 5dc2a89b30d1..9a6002209e3e 100644
--- a/src/util/error.cpp
+++ b/src/util/error.cpp
@@ -33,6 +33,10 @@ bilingual_str TransactionErrorString(const TransactionError err)
             return Untranslated("Specified sighash value does not match value stored in PSBT");
         case TransactionError::MAX_FEE_EXCEEDED:
             return Untranslated("Fee exceeds maximum configured by user (e.g. -maxtxfee, maxfeerate)");
+        case TransactionError::EXTERNAL_SIGNER_NOT_FOUND:
+            return Untranslated("External signer not found");
+        case TransactionError::EXTERNAL_SIGNER_FAILED:
+            return Untranslated("External signer failed to sign");
         // no default case, so the compiler can warn about missing cases
     }
     assert(false);
diff --git a/src/util/error.h b/src/util/error.h
index 4cb519adf193..42f19cf3cb21 100644
--- a/src/util/error.h
+++ b/src/util/error.h
@@ -30,6 +30,8 @@ enum class TransactionError {
     PSBT_MISMATCH,
     SIGHASH_MISMATCH,
     MAX_FEE_EXCEEDED,
+    EXTERNAL_SIGNER_NOT_FOUND,
+    EXTERNAL_SIGNER_FAILED,
 };
 
 bilingual_str TransactionErrorString(const TransactionError error);
diff --git a/src/util/system.cpp b/src/util/system.cpp
index 1b79ef2a1832..02d9c706e1f3 100644
--- a/src/util/system.cpp
+++ b/src/util/system.cpp
@@ -8,9 +8,9 @@
 
 #include <support/allocators/secure.h>
 
-#ifdef HAVE_BOOST_PROCESS
+#ifdef ENABLE_EXTERNAL_SIGNER
 #include <boost/process.hpp>
-#endif // HAVE_BOOST_PROCESS
+#endif // ENABLE_EXTERNAL_SIGNER
 
 #include <chainparamsbase.h>
 #include <ctpl_stl.h>
@@ -1416,7 +1416,7 @@ void RenameThreadPool(ctpl::thread_pool& tp, const char* baseName)
     }
 }
 
-#ifdef HAVE_BOOST_PROCESS
+#ifdef ENABLE_EXTERNAL_SIGNER
 UniValue RunCommandParseJSON(const std::string& str_command, const std::string& str_std_in)
 {
     namespace bp = boost::process;
@@ -1451,7 +1451,7 @@ UniValue RunCommandParseJSON(const std::string& str_command, const std::string&
 
     return result_json;
 }
-#endif // HAVE_BOOST_PROCESS
+#endif // ENABLE_EXTERNAL_SIGNER
 
 void SetupEnvironment()
 {
diff --git a/src/util/system.h b/src/util/system.h
index bcf9ba0865cf..b1a424df90a8 100644
--- a/src/util/system.h
+++ b/src/util/system.h
@@ -113,7 +113,7 @@ std::string ShellEscape(const std::string& arg);
 #if HAVE_SYSTEM
 void runCommand(const std::string& strCommand);
 #endif
-#ifdef HAVE_BOOST_PROCESS
+#ifdef ENABLE_EXTERNAL_SIGNER
 /**
  * Execute a command which returns JSON, and parse the result.
  *
@@ -122,7 +122,7 @@ void runCommand(const std::string& strCommand);
  * @return parsed JSON
  */
 UniValue RunCommandParseJSON(const std::string& str_command, const std::string& str_std_in="");
-#endif // HAVE_BOOST_PROCESS
+#endif // ENABLE_EXTERNAL_SIGNER
 
 /**
  * Most paths passed as configuration arguments are treated as relative to
diff --git a/src/wallet/external_signer.cpp b/src/wallet/external_signer.cpp
new file mode 100644
index 000000000000..61af489c379a
--- /dev/null
+++ b/src/wallet/external_signer.cpp
@@ -0,0 +1,119 @@
+// Copyright (c) 2018-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 <chainparams.h>
+#include <core_io.h>
+#include <psbt.h>
+#include <util/strencodings.h>
+#include <util/system.h>
+#include <wallet/external_signer.h>
+
+ExternalSigner::ExternalSigner(const std::string& command, const std::string& fingerprint, std::string chain, std::string name): m_command(command), m_fingerprint(fingerprint), m_chain(chain), m_name(name) {}
+
+std::string ExternalSigner::NetworkArg() const
+{
+    return " --chain " + m_chain;
+}
+
+#ifdef ENABLE_EXTERNAL_SIGNER
+
+bool ExternalSigner::Enumerate(const std::string& command, std::vector<ExternalSigner>& signers, std::string chain, bool ignore_errors)
+{
+    // Call <command> enumerate
+    const UniValue result = RunCommandParseJSON(command + " enumerate");
+    if (!result.isArray()) {
+        if (ignore_errors) return false;
+        throw ExternalSignerException(strprintf("'%s' received invalid response, expected array of signers", command));
+    }
+    for (UniValue signer : result.getValues()) {
+        // Check for error
+        const UniValue& error = signer.find_value("error");
+        if (!error.isNull()) {
+            if (ignore_errors) return false;
+            if (!error.isStr()) {
+                throw ExternalSignerException(strprintf("'%s' error", command));
+            }
+            throw ExternalSignerException(strprintf("'%s' error: %s", command, error.getValStr()));
+        }
+        // Check if fingerprint is present
+        const UniValue& fingerprint = signer.find_value("fingerprint");
+        if (fingerprint.isNull()) {
+            if (ignore_errors) return false;
+            throw ExternalSignerException(strprintf("'%s' received invalid response, missing signer fingerprint", command));
+        }
+        std::string fingerprintStr = fingerprint.get_str();
+        // Skip duplicate signer
+        bool duplicate = false;
+        for (ExternalSigner signer : signers) {
+            if (signer.m_fingerprint.compare(fingerprintStr) == 0) duplicate = true;
+        }
+        if (duplicate) break;
+        std::string name;
+        const UniValue& model_field = signer.find_value("model");
+        if (model_field.isStr() && model_field.getValStr() != "") {
+            name += model_field.getValStr();
+        }
+        signers.push_back(ExternalSigner(command, fingerprintStr, chain, name));
+    }
+    return true;
+}
+
+UniValue ExternalSigner::DisplayAddress(const std::string& descriptor) const
+{
+    return RunCommandParseJSON(m_command + " --fingerprint \"" + m_fingerprint + "\"" + NetworkArg() + " displayaddress --desc \"" + descriptor + "\"");
+}
+
+UniValue ExternalSigner::GetDescriptors(int account)
+{
+    return RunCommandParseJSON(m_command + " --fingerprint \"" + m_fingerprint + "\"" + NetworkArg() + " getdescriptors --account " + strprintf("%d", account));
+}
+
+bool ExternalSigner::SignTransaction(PartiallySignedTransaction& psbtx, std::string& error)
+{
+    // Serialize the PSBT
+    CDataStream ssTx(SER_NETWORK, PROTOCOL_VERSION);
+    ssTx << psbtx;
+
+    // Check if signer fingerprint matches any input master key fingerprint
+    bool match = false;
+    for (unsigned int i = 0; i < psbtx.inputs.size(); ++i) {
+        const PSBTInput& input = psbtx.inputs[i];
+        for (auto entry : input.hd_keypaths) {
+            if (m_fingerprint == strprintf("%08x", ReadBE32(entry.second.fingerprint))) match = true;
+        }
+    }
+
+    if (!match) {
+        error = "Signer fingerprint " + m_fingerprint + " does not match any of the inputs:\n" + EncodeBase64(ssTx.str());
+        return false;
+    }
+
+    std::string command = m_command + " --stdin --fingerprint \"" + m_fingerprint + "\"" + NetworkArg();
+    std::string stdinStr = "signtx \"" + EncodeBase64(ssTx.str()) + "\"";
+
+    const UniValue signer_result = RunCommandParseJSON(command, stdinStr);
+
+    if (signer_result.find_value("error").isStr()) {
+        error = signer_result.find_value("error").get_str();
+        return false;
+    }
+
+    if (!signer_result.find_value("psbt").isStr()) {
+        error = "Unexpected result from signer";
+        return false;
+    }
+
+    PartiallySignedTransaction signer_psbtx;
+    std::string signer_psbt_error;
+    if (!DecodeBase64PSBT(signer_psbtx, signer_result.find_value("psbt").get_str(), signer_psbt_error)) {
+        error = strprintf("TX decode failed %s", signer_psbt_error);
+        return false;
+    }
+
+    psbtx = signer_psbtx;
+
+    return true;
+}
+
+#endif
diff --git a/src/wallet/external_signer.h b/src/wallet/external_signer.h
new file mode 100644
index 000000000000..cc03d51cfcad
--- /dev/null
+++ b/src/wallet/external_signer.h
@@ -0,0 +1,73 @@
+// Copyright (c) 2018-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.
+
+#ifndef BITCOIN_WALLET_EXTERNAL_SIGNER_H
+#define BITCOIN_WALLET_EXTERNAL_SIGNER_H
+
+#include <stdexcept>
+#include <string>
+#include <univalue.h>
+#include <util/system.h>
+
+struct PartiallySignedTransaction;
+
+class ExternalSignerException : public std::runtime_error {
+public:
+    using std::runtime_error::runtime_error;
+};
+
+//! Enables interaction with an external signing device or service, such as
+//! a hardware wallet. See doc/external-signer.md
+class ExternalSigner
+{
+private:
+    //! The command which handles interaction with the external signer.
+    std::string m_command;
+
+public:
+    //! @param[in] command      the command which handles interaction with the external signer
+    //! @param[in] fingerprint  master key fingerprint of the signer
+    //! @param[in] chain        "main", "test", "regtest" or "signet"
+    //! @param[in] name         device name
+    ExternalSigner(const std::string& command, const std::string& fingerprint, std::string chain, std::string name);
+
+    //! Master key fingerprint of the signer
+    std::string m_fingerprint;
+
+    //! Dash mainnet, testnet, etc
+    std::string m_chain;
+
+    //! Name of signer
+    std::string m_name;
+
+    std::string NetworkArg() const;
+
+#ifdef ENABLE_EXTERNAL_SIGNER
+    //! Obtain a list of signers. Calls `<command> enumerate`.
+    //! @param[in]              command the command which handles interaction with the external signer
+    //! @param[in,out] signers  vector to which new signers (with a unique master key fingerprint) are added
+    //! @param chain            "main", "test", "regtest" or "signet"
+    //! @param[out] success     Boolean
+    static bool Enumerate(const std::string& command, std::vector<ExternalSigner>& signers, std::string chain, bool ignore_errors = false);
+
+    //! Display address on the device. Calls `<command> displayaddress --desc <descriptor>`.
+    //! @param[in] descriptor Descriptor specifying which address to display.
+    //!            Must include a public key or xpub, as well as key origin.
+    UniValue DisplayAddress(const std::string& descriptor) const;
+
+    //! Get receive and change Descriptor(s) from device for a given account.
+    //! Calls `<command> getdescriptors --account <account>`
+    //! @param[in] account  which BIP32 account to use (e.g. `m/44'/0'/account'`)
+    //! @param[out] UniValue see doc/external-signer.md
+    UniValue GetDescriptors(int account);
+
+    //! Sign PartiallySignedTransaction on the device.
+    //! Calls `<command> signtransaction` and passes the PSBT via stdin.
+    //! @param[in,out] psbt  PartiallySignedTransaction to be signed
+    bool SignTransaction(PartiallySignedTransaction& psbt, std::string& error);
+
+#endif
+};
+
+#endif // BITCOIN_WALLET_EXTERNAL_SIGNER_H
diff --git a/src/wallet/external_signer_scriptpubkeyman.cpp b/src/wallet/external_signer_scriptpubkeyman.cpp
new file mode 100644
index 000000000000..7e83485182df
--- /dev/null
+++ b/src/wallet/external_signer_scriptpubkeyman.cpp
@@ -0,0 +1,83 @@
+// Copyright (c) 2020 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 <chainparams.h>
+#include <wallet/external_signer.h>
+#include <wallet/external_signer_scriptpubkeyman.h>
+
+#ifdef ENABLE_EXTERNAL_SIGNER
+
+namespace wallet {
+bool ExternalSignerScriptPubKeyMan::SetupDescriptor(std::unique_ptr<Descriptor> desc)
+{
+    LOCK(cs_desc_man);
+    assert(m_storage.IsWalletFlagSet(WALLET_FLAG_DESCRIPTORS));
+    assert(m_storage.IsWalletFlagSet(WALLET_FLAG_EXTERNAL_SIGNER));
+
+    int64_t creation_time = GetTime();
+
+    // Make the descriptor
+    WalletDescriptor w_desc(std::move(desc), creation_time, 0, 0, 0);
+    m_wallet_descriptor = w_desc;
+
+    // Store the descriptor
+    WalletBatch batch(m_storage.GetDatabase());
+    if (!batch.WriteDescriptor(GetID(), m_wallet_descriptor)) {
+        throw std::runtime_error(std::string(__func__) + ": writing descriptor failed");
+    }
+
+    // TopUp
+    TopUp();
+
+    m_storage.UnsetBlankWalletFlag(batch);
+    return true;
+}
+
+ExternalSigner ExternalSignerScriptPubKeyMan::GetExternalSigner() {
+    const std::string command = gArgs.GetArg("-signer", "");
+    if (command == "") throw std::runtime_error(std::string(__func__) + ": restart dashd with -signer=<cmd>");
+    std::vector<ExternalSigner> signers;
+    ExternalSigner::Enumerate(command, signers, Params().NetworkIDString());
+    if (signers.empty()) throw std::runtime_error(std::string(__func__) + ": No external signers found");
+    // TODO: add fingerprint argument in case of multiple signers
+    return signers[0];
+}
+
+bool ExternalSignerScriptPubKeyMan::DisplayAddress(const CScript scriptPubKey, const ExternalSigner &signer) const
+{
+    // TODO: avoid the need to infer a descriptor from inside a descriptor wallet
+    auto provider = GetSolvingProvider(scriptPubKey);
+    auto descriptor = InferDescriptor(scriptPubKey, *provider);
+
+    signer.DisplayAddress(descriptor->ToString());
+    // TODO inspect result
+    return true;
+}
+
+// If sign is true, transaction must previously have been filled
+TransactionError ExternalSignerScriptPubKeyMan::FillPSBT(PartiallySignedTransaction& psbt, const PrecomputedTransactionData& txdata, int sighash_type, bool sign, bool bip32derivs, int* n_signed, bool finalize) const
+{
+    if (!sign) {
+        return DescriptorScriptPubKeyMan::FillPSBT(psbt, txdata, sighash_type, false, bip32derivs, n_signed, finalize);
+    }
+
+    // Already complete if every input is now signed
+    bool complete = true;
+    for (const auto& input : psbt.inputs) {
+        // TODO: for multisig wallets, we should only care if all _our_ inputs are signed
+        complete &= PSBTInputSigned(input);
+    }
+    if (complete) return TransactionError::OK;
+
+    std::string strFailReason;
+    if(!GetExternalSigner().SignTransaction(psbt, strFailReason)) {
+        tfm::format(std::cerr, "Failed to sign: %s\n", strFailReason);
+        return TransactionError::EXTERNAL_SIGNER_FAILED;
+    }
+    if (finalize) FinalizePSBT(psbt); // This won't work in a multisig setup
+    return TransactionError::OK;
+}
+} // namespace wallet
+
+#endif
diff --git a/src/wallet/external_signer_scriptpubkeyman.h b/src/wallet/external_signer_scriptpubkeyman.h
new file mode 100644
index 000000000000..ac3adaa45a37
--- /dev/null
+++ b/src/wallet/external_signer_scriptpubkeyman.h
@@ -0,0 +1,36 @@
+// Copyright (c) 2019-2020 The Bitcoin Core developers
+// Distributed under the MIT software license, see the accompanying
+// file COPYING or http://www.opensource.org/licenses/mit-license.php.
+
+#ifndef BITCOIN_WALLET_EXTERNAL_SIGNER_SCRIPTPUBKEYMAN_H
+#define BITCOIN_WALLET_EXTERNAL_SIGNER_SCRIPTPUBKEYMAN_H
+
+#ifdef ENABLE_EXTERNAL_SIGNER
+#include <wallet/scriptpubkeyman.h>
+
+namespace wallet {
+class ExternalSignerScriptPubKeyMan : public DescriptorScriptPubKeyMan
+{
+  public:
+  ExternalSignerScriptPubKeyMan(WalletStorage& storage, WalletDescriptor& descriptor)
+      :   DescriptorScriptPubKeyMan(storage, descriptor)
+      {}
+  ExternalSignerScriptPubKeyMan(WalletStorage& storage)
+      :   DescriptorScriptPubKeyMan(storage)
+      {}
+
+  /** Provide a descriptor at setup time
+  * Returns false if already setup or setup fails, true if setup is successful
+  */
+  bool SetupDescriptor(std::unique_ptr<Descriptor>desc);
+
+  static ExternalSigner GetExternalSigner();
+
+  bool DisplayAddress(const CScript scriptPubKey, const ExternalSigner &signer) const;
+
+  TransactionError FillPSBT(PartiallySignedTransaction& psbt, const PrecomputedTransactionData& txdata, int sighash_type = 1 /* SIGHASH_ALL */, bool sign = true, bool bip32derivs = false, int* n_signed = nullptr, bool finalize = true) const override;
+};
+} // namespace wallet
+#endif
+
+#endif // BITCOIN_WALLET_EXTERNAL_SIGNER_SCRIPTPUBKEYMAN_H
diff --git a/src/wallet/init.cpp b/src/wallet/init.cpp
index 4aa657beb8d3..9cebf2b2e43d 100644
--- a/src/wallet/init.cpp
+++ b/src/wallet/init.cpp
@@ -67,6 +67,9 @@ void WalletInit::AddWalletOptions(ArgsManager& argsman) const
     argsman.AddArg("-keypool=<n>", strprintf("Set key pool size to <n> (default: %u). Warning: Smaller sizes may increase the risk of losing funds when restoring from an old backup, if none of the addresses in the original keypool have been used.", DEFAULT_KEYPOOL_SIZE), ArgsManager::ALLOW_ANY, OptionsCategory::WALLET);
     argsman.AddArg("-rescan=<mode>", "Rescan the block chain for missing wallet transactions on startup"
                                             " (1 = start from wallet creation time, 2 = start from genesis block)", ArgsManager::ALLOW_ANY, OptionsCategory::WALLET);
+#ifdef ENABLE_EXTERNAL_SIGNER
+    argsman.AddArg("-signer=<cmd>", "External signing tool, see docs/external-signer.md", ArgsManager::ALLOW_ANY, OptionsCategory::WALLET);
+#endif
     argsman.AddArg("-spendzeroconfchange", strprintf("Spend unconfirmed change when sending transactions (default: %u)", DEFAULT_SPEND_ZEROCONF_CHANGE), ArgsManager::ALLOW_ANY, OptionsCategory::WALLET);
     argsman.AddArg("-wallet=<path>", "Specify wallet path to load at startup. Can be used multiple times to load multiple wallets. Path is to a directory containing wallet data and log files. If the path is not absolute, it is interpreted relative to <walletdir>. This only loads existing wallets and does not create new ones. For backwards compatibility this also accepts names of existing top-level data files in <walletdir>.", ArgsManager::ALLOW_ANY | ArgsManager::NETWORK_ONLY, OptionsCategory::WALLET);
     argsman.AddArg("-walletbackupsdir=<dir>", "Specify full path to directory for automatic wallet backups (must exist)", ArgsManager::ALLOW_ANY, OptionsCategory::WALLET);
diff --git a/src/wallet/interfaces.cpp b/src/wallet/interfaces.cpp
index a0f55c32fb2a..da7e45073b7c 100644
--- a/src/wallet/interfaces.cpp
+++ b/src/wallet/interfaces.cpp
@@ -29,6 +29,7 @@
 #include <wallet/receive.h>
 #include <wallet/rpc/wallet.h>
 #include <wallet/spend.h>
+#include <wallet/rpcsigner.h>
 #include <wallet/wallet.h>
 #include <wallet/hdchain.h>
 #include <wallet/scriptpubkeyman.h>
@@ -646,6 +647,17 @@ class WalletLoaderImpl : public WalletLoader
             }, command.argNames, command.unique_id);
             m_rpc_handlers.emplace_back(m_context.chain->handleRpc(m_rpc_commands.back()));
         }
+
+#ifdef ENABLE_EXTERNAL_SIGNER
+        for (const CRPCCommand& command : GetSignerRPCCommands()) {
+            m_rpc_commands.emplace_back(command.category, command.name, [this, &command](const JSONRPCRequest& request, UniValue& result, bool last_handler) {
+                JSONRPCRequest wallet_request = request;
+                wallet_request.context = m_context;
+                return command.actor(wallet_request, result, last_handler);
+            }, command.argNames, command.unique_id);
+            m_rpc_handlers.emplace_back(m_context.chain->handleRpc(m_rpc_commands.back()));
+        }
+#endif
     }
 
 public:
diff --git a/src/wallet/rpc/spend.cpp b/src/wallet/rpc/spend.cpp
index 746dfc4bcdb3..5feea820add2 100644
--- a/src/wallet/rpc/spend.cpp
+++ b/src/wallet/rpc/spend.cpp
@@ -904,8 +904,10 @@ RPCHelpMan send()
     // Make a blank psbt
     PartiallySignedTransaction psbtx(rawTx);
 
-    // Fill transaction with our data and sign
-    bool complete = true;
+    // First fill transaction with our data without signing,
+    // so external signers are not asked sign more than once.
+    bool complete;
+    (void)pwallet->FillPSBT(psbtx, complete, SIGHASH_ALL, false, true);
     const TransactionError err = pwallet->FillPSBT(psbtx, complete, SIGHASH_ALL, true, false);
     if (err != TransactionError::OK) {
         throw JSONRPCTransactionError(err);
diff --git a/src/wallet/rpc/wallet.cpp b/src/wallet/rpc/wallet.cpp
index cdc91d451913..73ff15a7373e 100644
--- a/src/wallet/rpc/wallet.cpp
+++ b/src/wallet/rpc/wallet.cpp
@@ -623,6 +623,7 @@ static RPCHelpMan createwallet()
             {"avoid_reuse", RPCArg::Type::BOOL, RPCArg::Default{false}, "Keep track of coin reuse, and treat dirty and clean coins differently with privacy considerations in mind."},
             {"descriptors", RPCArg::Type::BOOL, RPCArg::Default{false}, "Create a native descriptor wallet. The wallet will use descriptors internally to handle address creation. This feature is well-tested but still considered experimental."},
             {"load_on_startup", RPCArg::Type::BOOL, RPCArg::Optional::OMITTED_NAMED_ARG, "Save wallet name to persistent settings and load on startup. True to add wallet to startup list, false to remove, null to leave unchanged."},
+            {"external_signer", RPCArg::Type::BOOL, RPCArg::Default{false}, "Use an external signer such as a hardware wallet. Requires -signer to be configured. Wallet creation will fail if keys cannot be fetched. Requires disable_private_keys and descriptors set to true."},
         },
         RPCResult{
             RPCResult::Type::OBJ, "", "",
@@ -672,6 +673,13 @@ static RPCHelpMan createwallet()
         flags |= WALLET_FLAG_DESCRIPTORS;
         warnings.emplace_back(Untranslated("Wallet is an experimental descriptor wallet"));
     }
+    if (!request.params[7].isNull() && request.params[7].get_bool()) {
+#ifdef ENABLE_EXTERNAL_SIGNER
+        flags |= WALLET_FLAG_EXTERNAL_SIGNER;
+#else
+        throw JSONRPCError(RPC_WALLET_ERROR, "Configure with --enable-external-signer to use this");
+#endif
+    }
 
 #ifndef USE_BDB
     if (!(flags & WALLET_FLAG_DESCRIPTORS)) {
diff --git a/src/wallet/rpcsigner.cpp b/src/wallet/rpcsigner.cpp
new file mode 100644
index 000000000000..4f1a1bbe16c8
--- /dev/null
+++ b/src/wallet/rpcsigner.cpp
@@ -0,0 +1,108 @@
+// Copyright (c) 2018-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 <chainparamsbase.h>
+#include <key_io.h>
+#include <rpc/server.h>
+#include <util/strencodings.h>
+#include <wallet/rpcsigner.h>
+#include <wallet/rpc/wallet.h>
+#include <wallet/rpc/util.h>
+#include <wallet/wallet.h>
+
+#ifdef ENABLE_EXTERNAL_SIGNER
+
+namespace wallet {
+static RPCHelpMan enumeratesigners()
+{
+    return RPCHelpMan{
+        "enumeratesigners",
+        "Returns a list of external signers from -signer.",
+        {},
+        RPCResult{
+            RPCResult::Type::OBJ, "", "",
+            {
+                {RPCResult::Type::ARR, "signers", /*optional=*/false, "",
+                {
+                    {RPCResult::Type::STR_HEX, "masterkeyfingerprint", "Master key fingerprint"},
+                    {RPCResult::Type::STR, "name", "Device name"},
+                },
+                }
+            }
+        },
+        RPCExamples{""},
+        [](const RPCHelpMan& self, const JSONRPCRequest& request) -> UniValue {
+            std::shared_ptr<CWallet> const wallet = GetWalletForJSONRPCRequest(request);
+            if (!wallet) return NullUniValue;
+
+            const std::string command = gArgs.GetArg("-signer", "");
+            if (command == "") throw JSONRPCError(RPC_WALLET_ERROR, "Error: restart dashd with -signer=<cmd>");
+            std::string chain = gArgs.GetChainName();
+            UniValue signers_res = UniValue::VARR;
+            try {
+                std::vector<ExternalSigner> signers;
+                ExternalSigner::Enumerate(command, signers, chain);
+                for (ExternalSigner signer : signers) {
+                    UniValue signer_res = UniValue::VOBJ;
+                    signer_res.pushKV("fingerprint", signer.m_fingerprint);
+                    signer_res.pushKV("name", signer.m_name);
+                    signers_res.push_back(signer_res);
+                }
+            } catch (const ExternalSignerException& e) {
+                throw JSONRPCError(RPC_WALLET_ERROR, e.what());
+            }
+            UniValue result(UniValue::VOBJ);
+            result.pushKV("signers", signers_res);
+            return result;
+        }
+    };
+}
+
+static RPCHelpMan signerdisplayaddress()
+{
+    return RPCHelpMan{
+        "signerdisplayaddress",
+        "Display address on an external signer for verification.\n",
+        {
+            {"address", RPCArg::Type::STR, RPCArg::Optional::NO, "dash address to display"},
+        },
+        RPCResult{RPCResult::Type::NONE,"",""},
+        RPCExamples{""},
+        [](const RPCHelpMan& self, const JSONRPCRequest& request) -> UniValue {
+            std::shared_ptr<CWallet> const wallet = GetWalletForJSONRPCRequest(request);
+            if (!wallet) return NullUniValue;
+            CWallet* const pwallet = wallet.get();
+
+            LOCK(pwallet->cs_wallet);
+
+            CTxDestination dest = DecodeDestination(request.params[0].get_str());
+
+            // Make sure the destination is valid
+            if (!IsValidDestination(dest)) {
+                throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "Invalid address");
+            }
+
+            if (!pwallet->DisplayAddress(dest)) {
+                throw JSONRPCError(RPC_WALLET_ERROR, "Failed to display address");
+            }
+
+            UniValue result(UniValue::VOBJ);
+            result.pushKV("address", request.params[0].get_str());
+            return result;
+        }
+    };
+}
+
+Span<const CRPCCommand> GetSignerRPCCommands()
+{
+    static const CRPCCommand commands[]{
+        {"signer", &enumeratesigners},
+        {"signer", &signerdisplayaddress},
+    };
+    return commands;
+}
+} // namespace wallet
+
+
+#endif // ENABLE_EXTERNAL_SIGNER
diff --git a/src/wallet/rpcsigner.h b/src/wallet/rpcsigner.h
new file mode 100644
index 000000000000..ccd2e993a8d3
--- /dev/null
+++ b/src/wallet/rpcsigner.h
@@ -0,0 +1,26 @@
+// Copyright (c) 2018-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.
+
+#ifndef BITCOIN_WALLET_RPCSIGNER_H
+#define BITCOIN_WALLET_RPCSIGNER_H
+
+#include <span.h>
+#include <util/system.h>
+#include <vector>
+
+#ifdef ENABLE_EXTERNAL_SIGNER
+
+class CRPCCommand;
+
+namespace interfaces {
+class Chain;
+class Handler;
+}
+namespace wallet {
+Span<const CRPCCommand> GetSignerRPCCommands();
+} // namespace
+
+#endif // ENABLE_EXTERNAL_SIGNER
+
+#endif //BITCOIN_WALLET_RPCSIGNER_H
diff --git a/src/wallet/scriptpubkeyman.cpp b/src/wallet/scriptpubkeyman.cpp
index 947efc82715c..1e14989e4a7c 100644
--- a/src/wallet/scriptpubkeyman.cpp
+++ b/src/wallet/scriptpubkeyman.cpp
@@ -14,6 +14,7 @@
 #include <util/system.h>
 #include <util/translation.h>
 #include <wallet/bip39.h>
+#include <wallet/external_signer.h>
 #include <wallet/scriptpubkeyman.h>
 
 namespace wallet {
diff --git a/src/wallet/scriptpubkeyman.h b/src/wallet/scriptpubkeyman.h
index 7f4ee75c413b..b30b1bd6c554 100644
--- a/src/wallet/scriptpubkeyman.h
+++ b/src/wallet/scriptpubkeyman.h
@@ -512,8 +512,6 @@ class LegacySigningProvider : public SigningProvider
 class DescriptorScriptPubKeyMan : public ScriptPubKeyMan
 {
 private:
-    WalletDescriptor m_wallet_descriptor GUARDED_BY(cs_desc_man);
-
     using ScriptPubKeyMap = std::map<CScript, int32_t>; // Map of scripts to descriptor range index
     using PubKeyMap = std::map<CPubKey, int32_t>; // Map of pubkeys involved in scripts to descriptor range index
     using CryptedKeyMap = std::map<CKeyID, std::pair<CPubKey, std::vector<unsigned char>>>;
@@ -550,6 +548,9 @@ class DescriptorScriptPubKeyMan : public ScriptPubKeyMan
     // Fetch the SigningProvider for a given index and optionally include private keys. Called by the above functions.
     std::unique_ptr<FlatSigningProvider> GetSigningProvider(int32_t index, bool include_private = false) const EXCLUSIVE_LOCKS_REQUIRED(cs_desc_man);
 
+protected:
+  WalletDescriptor m_wallet_descriptor GUARDED_BY(cs_desc_man);
+
 public:
     DescriptorScriptPubKeyMan(WalletStorage& storage, WalletDescriptor& descriptor)
         :   ScriptPubKeyMan(storage),
@@ -584,6 +585,11 @@ class DescriptorScriptPubKeyMan : public ScriptPubKeyMan
     //! Setup descriptors based on the given CExtkey
     bool SetupDescriptorGeneration(const CExtKey& master_key, const SecureString& secure_mnemonic, const SecureString& secure_mnemonic_passphrase, PathDerivationType type);
 
+    /** Provide a descriptor at setup time
+    * Returns false if already setup or setup fails, true if setup is successful
+    */
+    bool SetupDescriptor(std::unique_ptr<Descriptor>desc);
+
     bool HavePrivateKeys() const override;
 
     std::optional<int64_t> GetOldestKeyPoolTime() const override;
diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp
index 24c4a2e5ff1d..dc885d3d6b15 100644
--- a/src/wallet/wallet.cpp
+++ b/src/wallet/wallet.cpp
@@ -20,6 +20,7 @@
 #include <policy/policy.h>
 #include <primitives/block.h>
 #include <primitives/transaction.h>
+#include <psbt.h>
 #include <script/descriptor.h>
 #include <script/script.h>
 #include <script/sign.h>
@@ -37,6 +38,7 @@
 #include <wallet/bip39.h> // TODO(refactor): move dependency it to scriptpubkeyman.cpp
 #include <wallet/coincontrol.h>
 #include <wallet/context.h>
+#include <wallet/external_signer_scriptpubkeyman.h>
 #include <warnings.h>
 
 #include <coinjoin/options.h>
@@ -309,6 +311,13 @@ std::shared_ptr<CWallet> CreateWallet(WalletContext& context, const std::string&
         wallet_creation_flags |= WALLET_FLAG_BLANK_WALLET;
     }
 
+    // Private keys must be disabled for an external signer wallet
+    if ((wallet_creation_flags & WALLET_FLAG_EXTERNAL_SIGNER) && !(wallet_creation_flags & WALLET_FLAG_DISABLE_PRIVATE_KEYS)) {
+        error = Untranslated("Private keys must be disabled when using an external signer");
+        status = DatabaseStatus::FAILED_CREATE;
+        return nullptr;
+    }
+
     // Do not allow a passphrase when private keys are disabled
     if (!passphrase.empty() && (wallet_creation_flags & WALLET_FLAG_DISABLE_PRIVATE_KEYS)) {
         error = Untranslated("Passphrase provided but private keys are disabled. A passphrase is only used to encrypt private keys, so cannot be used for wallets with private keys disabled.");
@@ -316,6 +325,13 @@ std::shared_ptr<CWallet> CreateWallet(WalletContext& context, const std::string&
         return nullptr;
     }
 
+    // Descriptor support must be enabled for an external signer wallet
+    if ((wallet_creation_flags & WALLET_FLAG_EXTERNAL_SIGNER) && !(wallet_creation_flags & WALLET_FLAG_DESCRIPTORS)) {
+        error = Untranslated("Descriptor support must be enabled when using an external signer");
+        status = DatabaseStatus::FAILED_CREATE;
+        return nullptr;
+    }
+
     // Wallet::Verify will check if we're trying to create a wallet with a duplicate name.
     std::unique_ptr<WalletDatabase> database = MakeWalletDatabase(name, options, status, error);
     if (!database) {
@@ -2485,6 +2501,38 @@ void ReserveDestination::ReturnDestination()
     address = CNoDestination();
 }
 
+#ifdef ENABLE_EXTERNAL_SIGNER
+ExternalSigner CWallet::GetExternalSigner()
+{
+    const std::string command = gArgs.GetArg("-signer", "");
+    if (command == "") throw std::runtime_error(std::string(__func__) + ": restart dashd with -signer=<cmd>");
+    std::vector<ExternalSigner> signers;
+    ExternalSigner::Enumerate(command, signers, Params().NetworkIDString());
+    if (signers.empty()) throw std::runtime_error(std::string(__func__) + ": No external signers found");
+    // TODO: add fingerprint argument in case of multiple signers
+    return signers[0];
+}
+#endif
+
+bool CWallet::DisplayAddress(const CTxDestination& dest)
+{
+#ifdef ENABLE_EXTERNAL_SIGNER
+    CScript scriptPubKey = GetScriptForDestination(dest);
+    const auto spk_man = GetScriptPubKeyMan(scriptPubKey);
+    if (spk_man == nullptr) {
+        return false;
+    }
+    auto signer_spk_man = dynamic_cast<ExternalSignerScriptPubKeyMan*>(spk_man);
+    if (signer_spk_man == nullptr) {
+        return false;
+    }
+    ExternalSigner signer = GetExternalSigner(); // TODO: move signer in spk_man
+    return signer_spk_man->DisplayAddress(scriptPubKey, signer);
+#else
+    return false;
+#endif
+}
+
 bool CWallet::LockCoin(const COutPoint& output, WalletBatch* batch)
 {
     AssertLockHeld(cs_wallet);
@@ -2840,7 +2888,7 @@ std::shared_ptr<CWallet> CWallet::Create(WalletContext& context, const std::stri
             walletInstance->SetupLegacyScriptPubKeyMan();
         }
 
-        if (!(wallet_creation_flags & (WALLET_FLAG_DISABLE_PRIVATE_KEYS | WALLET_FLAG_BLANK_WALLET))) {
+        if ((wallet_creation_flags & WALLET_FLAG_EXTERNAL_SIGNER) || !(wallet_creation_flags & (WALLET_FLAG_DISABLE_PRIVATE_KEYS | WALLET_FLAG_BLANK_WALLET))) {
             // Create new HD chain
             if (args.GetBoolArg("-usehd", DEFAULT_USE_HD_WALLET) && !walletInstance->IsHDEnabled()) {
                 std::string strSeed = args.GetArg("-hdseed", "not hex");
@@ -3766,14 +3814,24 @@ void CWallet::UpdateProgress(const std::string& title, int nProgress)
 
 void CWallet::LoadDescriptorScriptPubKeyMan(uint256 id, WalletDescriptor& desc)
 {
-    auto spk_manager = std::unique_ptr<ScriptPubKeyMan>(new DescriptorScriptPubKeyMan(*this, desc));
-    m_spk_managers[id] = std::move(spk_manager);
+    if (IsWalletFlagSet(WALLET_FLAG_EXTERNAL_SIGNER)) {
+#ifdef ENABLE_EXTERNAL_SIGNER
+        auto spk_manager = std::unique_ptr<ScriptPubKeyMan>(new ExternalSignerScriptPubKeyMan(*this, desc));
+        m_spk_managers[id] = std::move(spk_manager);
+#else
+        throw std::runtime_error(std::string(__func__) + ": Configure with --enable-external-signer to use external signer wallets");
+#endif
+    } else {
+        auto spk_manager = std::unique_ptr<ScriptPubKeyMan>(new DescriptorScriptPubKeyMan(*this, desc));
+        m_spk_managers[id] = std::move(spk_manager);
+    }
 }
 
 void CWallet::SetupDescriptorScriptPubKeyMans(const SecureString& mnemonic_arg, const SecureString mnemonic_passphrase)
 {
     AssertLockHeld(cs_wallet);
 
+    if (!IsWalletFlagSet(WALLET_FLAG_EXTERNAL_SIGNER)) {
     // Make a seed
     // TODO: remove duplicated code with CHDChain::SetMnemonic
     const SecureString mnemonic = mnemonic_arg.empty() ? CMnemonic::Generate(m_args.GetIntArg("-mnemonicbits", CHDChain::DEFAULT_MNEMONIC_BITS)) : mnemonic_arg;
@@ -3806,6 +3864,37 @@ void CWallet::SetupDescriptorScriptPubKeyMans(const SecureString& mnemonic_arg,
             }
         }
     }
+    } else {
+#ifdef ENABLE_EXTERNAL_SIGNER
+        ExternalSigner signer = ExternalSignerScriptPubKeyMan::GetExternalSigner();
+
+        // TODO: add account parameter
+        int account = 0;
+        UniValue signer_res = signer.GetDescriptors(account);
+
+        if (!signer_res.isObject()) throw std::runtime_error(std::string(__func__) + ": Unexpected result");
+        for (bool internal : {false, true}) {
+            const UniValue& descriptor_vals = signer_res.find_value(internal ? "internal" : "receive");
+            if (!descriptor_vals.isArray()) throw std::runtime_error(std::string(__func__) + ": Unexpected result");
+            for (const UniValue& desc_val : descriptor_vals.get_array().getValues()) {
+                std::string desc_str = desc_val.getValStr();
+                FlatSigningProvider keys;
+                std::string dummy_error;
+                std::unique_ptr<Descriptor> desc = Parse(desc_str, keys, dummy_error, false);
+                if (!desc->GetOutputType()) {
+                    continue;
+                }
+                auto spk_manager = std::unique_ptr<ExternalSignerScriptPubKeyMan>(new ExternalSignerScriptPubKeyMan(*this));
+                spk_manager->SetupDescriptor(std::move(desc));
+                uint256 id = spk_manager->GetID();
+                m_spk_managers[id] = std::move(spk_manager);
+                AddActiveScriptPubKeyMan(id, internal);
+            }
+        }
+#else
+        throw std::runtime_error(std::string(__func__) + ": Wallets with external signers require Boost::Process library.");
+#endif
+    }
 }
 
 void CWallet::AddActiveScriptPubKeyMan(uint256 id, bool internal)
diff --git a/src/wallet/wallet.h b/src/wallet/wallet.h
index 600924940819..74b34da96af7 100644
--- a/src/wallet/wallet.h
+++ b/src/wallet/wallet.h
@@ -27,6 +27,7 @@
 #include <validationinterface.h>
 #include <wallet/crypter.h>
 #include <wallet/coinselection.h>
+#include <wallet/external_signer.h>
 #include <wallet/scriptpubkeyman.h>
 #include <wallet/transaction.h>
 #include <wallet/walletdb.h>
@@ -116,7 +117,6 @@ static const CAmount HIGH_TX_FEE_PER_KB = COIN / 100;
 static const CAmount HIGH_MAX_TX_FEE = 100 * HIGH_TX_FEE_PER_KB;
 //! Pre-calculated constants for input size estimation in *virtual size*
 static constexpr size_t DUMMY_NESTED_P2PKH_INPUT_SIZE = 113;
-
 //! if set, all keys will be derived by using BIP39/BIP44
 static const bool DEFAULT_USE_HD_WALLET = true;
 
@@ -141,7 +141,8 @@ static constexpr uint64_t KNOWN_WALLET_FLAGS =
     |   WALLET_FLAG_KEY_ORIGIN_METADATA
     |   WALLET_FLAG_LAST_HARDENED_XPUB_CACHED
     |   WALLET_FLAG_DISABLE_PRIVATE_KEYS
-    |   WALLET_FLAG_DESCRIPTORS;
+    |   WALLET_FLAG_DESCRIPTORS
+    |   WALLET_FLAG_EXTERNAL_SIGNER;
 
 static constexpr uint64_t MUTABLE_WALLET_FLAGS =
         WALLET_FLAG_AVOID_REUSE;
@@ -153,6 +154,7 @@ static const std::map<std::string,WalletFlags> WALLET_FLAG_MAP{
     {"last_hardened_xpub_cached", WALLET_FLAG_LAST_HARDENED_XPUB_CACHED},
     {"disable_private_keys", WALLET_FLAG_DISABLE_PRIVATE_KEYS},
     {"descriptor_wallet", WALLET_FLAG_DESCRIPTORS},
+    {"external_signer", WALLET_FLAG_EXTERNAL_SIGNER}
 };
 
 extern const std::map<uint64_t,std::string> WALLET_FLAG_CAVEATS;
@@ -559,6 +561,12 @@ class CWallet final : public WalletStorage, public interfaces::Chain::Notificati
 
     void RecalculateMixedCredit(const uint256 hash) EXCLUSIVE_LOCKS_REQUIRED(cs_wallet);
 
+#ifdef ENABLE_EXTERNAL_SIGNER
+    ExternalSigner GetExternalSigner() EXCLUSIVE_LOCKS_REQUIRED(cs_wallet);
+#endif
+    /** Display address on an external signer. Returns false if external signer support is not compiled */
+    bool DisplayAddress(const CTxDestination& dest) EXCLUSIVE_LOCKS_REQUIRED(cs_wallet);
+
     bool IsLockedCoin(const COutPoint& output) const EXCLUSIVE_LOCKS_REQUIRED(cs_wallet);
     bool LockCoin(const COutPoint& output, WalletBatch* batch = nullptr) EXCLUSIVE_LOCKS_REQUIRED(cs_wallet);
     bool UnlockCoin(const COutPoint& output, WalletBatch* batch = nullptr) EXCLUSIVE_LOCKS_REQUIRED(cs_wallet);
diff --git a/src/wallet/walletutil.h b/src/wallet/walletutil.h
index 1bc841873862..42a22cd78cdf 100644
--- a/src/wallet/walletutil.h
+++ b/src/wallet/walletutil.h
@@ -58,6 +58,9 @@ enum WalletFlags : uint64_t {
 
     //! Indicate that this wallet supports DescriptorScriptPubKeyMan
     WALLET_FLAG_DESCRIPTORS = (1ULL << 34),
+
+    //! Indicates that the wallet needs an external signer
+    WALLET_FLAG_EXTERNAL_SIGNER = (1ULL << 35),
 };
 
 //! Get the path of the wallet directory.
diff --git a/test/config.ini.in b/test/config.ini.in
index 6359f28df290..38501c9b5bf1 100644
--- a/test/config.ini.in
+++ b/test/config.ini.in
@@ -23,4 +23,5 @@ RPCAUTH=@abs_top_srcdir@/share/rpcauth/rpcauth.py
 @BUILD_BITCOIND_TRUE@ENABLE_BITCOIND=true
 @ENABLE_FUZZ_TRUE@ENABLE_FUZZ=true
 @ENABLE_ZMQ_TRUE@ENABLE_ZMQ=true
+@ENABLE_EXTERNAL_SIGNER_TRUE@ENABLE_EXTERNAL_SIGNER=true
 @ENABLE_USDT_TRACEPOINTS_TRUE@ENABLE_USDT_TRACEPOINTS=true
diff --git a/test/functional/mocks/signer.py b/test/functional/mocks/signer.py
new file mode 100755
index 000000000000..0d5014a833b1
--- /dev/null
+++ b/test/functional/mocks/signer.py
@@ -0,0 +1,102 @@
+#!/usr/bin/env python3
+# Copyright (c) 2018 The Bitcoin Core developers
+# Distributed under the MIT software license, see the accompanying
+# file COPYING or http://www.opensource.org/licenses/mit-license.php.
+
+import os
+import sys
+import argparse
+import json
+
+def perform_pre_checks():
+    mock_result_path = os.path.join(os.getcwd(), "mock_result")
+    if(os.path.isfile(mock_result_path)):
+        with open(mock_result_path, "r", encoding="utf8") as f:
+            mock_result = f.read()
+        if mock_result[0]:
+            sys.stdout.write(mock_result[2:])
+            sys.exit(int(mock_result[0]))
+
+def enumerate(args):
+  sys.stdout.write(json.dumps([{"fingerprint": "00000001", "type": "trezor", "model": "trezor_t"}, {"fingerprint": "00000002"}]))
+
+def getdescriptors(args):
+    xpub = "tpubD6NzVbkrYhZ4WaWSyoBvQwbpLkojyoTZPRsgXELWz3Popb3qkjcJyJUGLnL4qHHoQvao8ESaAstxYSnhyswJ76uZPStJRJCTKvosUCJZL5B"
+
+    sys.stdout.write(json.dumps({
+        "receive": [
+            "pkh([00000001/44'/1'/" + args.account + "']" + xpub + "/0/*)#vt6w3l3j",
+            "sh(pkh([00000001/49'/1'/" + args.account + "']" + xpub + "/0/*))#az7uyg3n",
+            "pkh([00000001/84'/1'/" + args.account + "']" + xpub + "/0/*)#58ssc2nq"
+        ],
+        "internal": [
+            "pkh([00000001/44'/1'/" + args.account + "']" + xpub + "/1/*)#all0v2p2",
+            "sh(pkh([00000001/49'/1'/" + args.account + "']" + xpub + "/1/*))#mpkel968",
+            "pkh([00000001/84'/1'/" + args.account + "']" + xpub + "/1/*)#9n439lrc"
+        ]
+    }))
+
+
+def displayaddress(args):
+    # Several descriptor formats are acceptable, so allowing for potential
+    # changes to InferDescriptor:
+    if args.fingerprint != "00000001":
+        return sys.stdout.write(json.dumps({"error": "Unexpected fingerprint", "fingerprint": args.fingerprint}))
+
+    expected_desc = [
+        "pkh([00000001/84'/1'/0'/0/0]02c97dc3f4420402e01a113984311bf4a1b8de376cac0bdcfaf1b3ac81f13433c7)#0yneg42r"
+    ]
+    if args.desc not in expected_desc:
+        return sys.stdout.write(json.dumps({"error": "Unexpected descriptor", "desc": args.desc}))
+
+    return sys.stdout.write(json.dumps({"address": "yg8pCsowDbY7PbJMthTi4xkkmhNfcNNdHV"}))
+
+def signtx(args):
+    if args.fingerprint != "00000001":
+        return sys.stdout.write(json.dumps({"error": "Unexpected fingerprint", "fingerprint": args.fingerprint}))
+
+    with open(os.path.join(os.getcwd(), "mock_psbt"), "r", encoding="utf8") as f:
+        mock_psbt = f.read()
+
+    if args.fingerprint == "00000001" :
+        sys.stdout.write(json.dumps({
+            "psbt": mock_psbt,
+            "complete": True
+        }))
+    else:
+        sys.stdout.write(json.dumps({"psbt": args.psbt}))
+
+parser = argparse.ArgumentParser(prog='./signer.py', description='External signer mock')
+parser.add_argument('--fingerprint')
+parser.add_argument('--chain', default='main')
+parser.add_argument('--stdin', action='store_true')
+
+subparsers = parser.add_subparsers(description='Commands', dest='command')
+subparsers.required = True
+
+parser_enumerate = subparsers.add_parser('enumerate', help='list available signers')
+parser_enumerate.set_defaults(func=enumerate)
+
+parser_getdescriptors = subparsers.add_parser('getdescriptors')
+parser_getdescriptors.set_defaults(func=getdescriptors)
+parser_getdescriptors.add_argument('--account', metavar='account')
+
+parser_displayaddress = subparsers.add_parser('displayaddress', help='display address on signer')
+parser_displayaddress.add_argument('--desc', metavar='desc')
+parser_displayaddress.set_defaults(func=displayaddress)
+
+parser_signtx = subparsers.add_parser('signtx')
+parser_signtx.add_argument('psbt', metavar='psbt')
+
+parser_signtx.set_defaults(func=signtx)
+
+if not sys.stdin.isatty():
+    buffer = sys.stdin.read()
+    if buffer and buffer.rstrip() != "":
+       sys.argv.extend(buffer.rstrip().split(" "))
+
+args = parser.parse_args()
+
+perform_pre_checks()
+
+args.func(args)
diff --git a/test/functional/rpc_help.py b/test/functional/rpc_help.py
index 054e6a8b2e87..7c244e829550 100755
--- a/test/functional/rpc_help.py
+++ b/test/functional/rpc_help.py
@@ -107,10 +107,13 @@ def test_categories(self):
         if self.is_wallet_compiled():
             components.append('Wallet')
 
+        if self.is_external_signer_compiled():
+            components.append('Signer')
+
         if self.is_zmq_compiled():
             components.append('Zmq')
 
-        assert_equal(titles, components)
+        assert_equal(titles, sorted(components))
 
     def dump_help(self):
         dump_dir = os.path.join(self.options.tmpdir, 'rpc_help_dump')
diff --git a/test/functional/test_framework/test_framework.py b/test/functional/test_framework/test_framework.py
index 1f784b0962d0..9e54ab082e7e 100755
--- a/test/functional/test_framework/test_framework.py
+++ b/test/functional/test_framework/test_framework.py
@@ -1089,10 +1089,19 @@ def has_previous_releases(self):
                     self.options.previous_releases_path))
         return self.options.prev_releases
 
+    def skip_if_no_external_signer(self):
+        """Skip the running test if external signer support has not been compiled."""
+        if not self.is_external_signer_compiled():
+            raise SkipTest("external signer support has not been compiled.")
+
     def is_cli_compiled(self):
         """Checks whether dash-cli was compiled."""
         return self.config["components"].getboolean("ENABLE_CLI")
 
+    def is_external_signer_compiled(self):
+        """Checks whether external signer support was compiled."""
+        return self.config["components"].getboolean("ENABLE_EXTERNAL_SIGNER")
+
     def is_wallet_compiled(self):
         """Checks whether the wallet module was compiled."""
         return self.config["components"].getboolean("ENABLE_WALLET")
diff --git a/test/functional/test_framework/test_node.py b/test/functional/test_framework/test_node.py
index 46acff0d46b5..a93a05ffb66a 100755
--- a/test/functional/test_framework/test_node.py
+++ b/test/functional/test_framework/test_node.py
@@ -881,12 +881,12 @@ def __init__(self, rpc, cli=False, descriptors=False):
     def __getattr__(self, name):
         return getattr(self.rpc, name)
 
-    def createwallet(self, wallet_name, disable_private_keys=None, blank=None, passphrase='', avoid_reuse=None, descriptors=None, load_on_startup=None):
+    def createwallet(self, wallet_name, disable_private_keys=None, blank=None, passphrase='', avoid_reuse=None, descriptors=None, load_on_startup=None, external_signer=None):
         if descriptors is None:
             descriptors = self.descriptors
         if descriptors is not None and load_on_startup is None:
             load_on_startup = False
-        return self.__getattr__('createwallet')(wallet_name, disable_private_keys, blank, passphrase, avoid_reuse, descriptors, load_on_startup)
+        return self.__getattr__('createwallet')(wallet_name, disable_private_keys, blank, passphrase, avoid_reuse, descriptors, load_on_startup, external_signer)
 
     def importprivkey(self, privkey, label=None, rescan=None):
         wallet_info = self.getwalletinfo()
diff --git a/test/functional/test_runner.py b/test/functional/test_runner.py
index d63f866f4bca..5d82df9ed0b9 100755
--- a/test/functional/test_runner.py
+++ b/test/functional/test_runner.py
@@ -145,6 +145,7 @@
     'feature_governance_cl.py --descriptors',
     'rpc_verifyislock.py',
     'feature_notifications.py',
+    'wallet_signer.py --descriptors',
     # vv Tests less than 60s vv
     'p2p_platform_ban.py', # NOTE: needs dash_hash to pass
     'p2p_sendheaders.py', # NOTE: needs dash_hash to pass
diff --git a/test/functional/wallet_signer.py b/test/functional/wallet_signer.py
new file mode 100755
index 000000000000..6b9aad152e85
--- /dev/null
+++ b/test/functional/wallet_signer.py
@@ -0,0 +1,203 @@
+#!/usr/bin/env python3
+# Copyright (c) 2017-2018 The Bitcoin Core developers
+# Distributed under the MIT software license, see the accompanying
+# file COPYING or http://www.opensource.org/licenses/mit-license.php.
+"""Test external signer.
+
+Verify that a bitcoind node can use an external signer command
+"""
+import os
+import platform
+
+from test_framework.test_framework import BitcoinTestFramework
+from test_framework.util import (
+    assert_equal,
+    assert_raises_rpc_error,
+)
+
+
+class SignerTest(BitcoinTestFramework):
+    def mock_signer_path(self):
+        path = os.path.join(os.path.dirname(os.path.realpath(__file__)), 'mocks', 'signer.py')
+        if platform.system() == "Windows":
+            return "py " + path
+        else:
+            return path
+
+    def set_test_params(self):
+        self.num_nodes = 4
+
+        self.extra_args = [
+            [],
+            [f"-signer={self.mock_signer_path()}", '-keypool=10'],
+            [f"-signer={self.mock_signer_path()}", '-keypool=10'],
+            ["-signer=fake.py"],
+        ]
+
+    def skip_test_if_missing_module(self):
+        self.skip_if_no_wallet()
+        self.skip_if_no_external_signer()
+
+    def set_mock_result(self, node, res):
+        with open(os.path.join(node.cwd, "mock_result"), "w", encoding="utf8") as f:
+            f.write(res)
+
+    def clear_mock_result(self, node):
+        os.remove(os.path.join(node.cwd, "mock_result"))
+
+    def run_test(self):
+        self.log.debug(f"-signer={self.mock_signer_path()}")
+
+        assert_raises_rpc_error(-4, 'Error: restart dashd with -signer=<cmd>',
+            self.nodes[0].enumeratesigners
+        )
+
+        # Handle script missing:
+        assert_raises_rpc_error(-1, 'execve failed: No such file or directory',
+            self.nodes[3].enumeratesigners
+        )
+
+        # Handle error thrown by script
+        self.set_mock_result(self.nodes[1], "2")
+        assert_raises_rpc_error(-1, 'RunCommandParseJSON error',
+            self.nodes[1].enumeratesigners
+        )
+        self.clear_mock_result(self.nodes[1])
+
+        self.set_mock_result(self.nodes[1], '0 [{"type": "trezor", "model": "trezor_t", "error": "fingerprint not found"}]')
+        assert_raises_rpc_error(-4, 'fingerprint not found',
+            self.nodes[1].enumeratesigners
+        )
+        self.clear_mock_result(self.nodes[1])
+
+        # Create new wallets for an external signer.
+        # disable_private_keys and descriptors must be true:
+        assert_raises_rpc_error(-4, "Private keys must be disabled when using an external signer", self.nodes[1].createwallet, wallet_name='not_hww', disable_private_keys=False, descriptors=True, external_signer=True)
+        if self.is_bdb_compiled():
+            assert_raises_rpc_error(-4, "Descriptor support must be enabled when using an external signer", self.nodes[1].createwallet, wallet_name='not_hww', disable_private_keys=True, descriptors=False, external_signer=True)
+        else:
+            assert_raises_rpc_error(-4, "Compiled without bdb support (required for legacy wallets)", self.nodes[1].createwallet, wallet_name='not_hww', disable_private_keys=True, descriptors=False, external_signer=True)
+
+        self.nodes[1].createwallet(wallet_name='hww', disable_private_keys=True, descriptors=True, external_signer=True)
+        hww = self.nodes[1].get_wallet_rpc('hww')
+
+        result = hww.enumeratesigners()
+        assert_equal(len(result['signers']), 2)
+        assert_equal(result['signers'][0]["fingerprint"], "00000001")
+        assert_equal(result['signers'][0]["name"], "trezor_t")
+
+        # Flag can't be set afterwards (could be added later for non-blank descriptor based watch-only wallets)
+        self.nodes[1].createwallet(wallet_name='not_hww', disable_private_keys=True, descriptors=True, external_signer=False)
+        not_hww = self.nodes[1].get_wallet_rpc('not_hww')
+        assert_raises_rpc_error(-8, "Wallet flag is immutable: external_signer", not_hww.setwalletflag, "external_signer", True)
+
+        # assert_raises_rpc_error(-4, "Multiple signers found, please specify which to use", wallet_name='not_hww', disable_private_keys=True, descriptors=True, external_signer=True)
+
+        # TODO: Handle error thrown by script
+        # self.set_mock_result(self.nodes[1], "2")
+        # assert_raises_rpc_error(-1, 'Unable to parse JSON',
+        #     self.nodes[1].createwallet, wallet_name='not_hww2', disable_private_keys=True, descriptors=True, external_signer=False
+        # )
+        # self.clear_mock_result(self.nodes[1])
+
+        assert_equal(hww.getwalletinfo()["keypoolsize"], 10)
+
+        address3 = hww.getnewaddress()
+        assert_equal(address3, "yg8pCsowDbY7PbJMthTi4xkkmhNfcNNdHV")
+        address_info = hww.getaddressinfo(address3)
+        assert_equal(address_info['solvable'], True)
+        assert_equal(address_info['ismine'], True)
+        assert_equal(address_info['hdkeypath'], "m/44'/1'/0'/0/0")
+        address1 = address3
+
+        self.log.info('Test signerdisplayaddress')
+        result = hww.signerdisplayaddress(address1)
+        assert_equal(result, {"address": address1})
+
+        # Handle error thrown by script
+        self.set_mock_result(self.nodes[1], "2")
+        assert_raises_rpc_error(-1, 'RunCommandParseJSON error',
+            hww.signerdisplayaddress, address1
+        )
+        self.clear_mock_result(self.nodes[1])
+
+        self.log.info('Prepare mock PSBT')
+        self.nodes[0].sendtoaddress(address1, 1)
+        self.generate(self.nodes[0], 1)
+
+        # Load private key into wallet to generate a signed PSBT for the mock
+        self.nodes[1].createwallet(wallet_name="mock", disable_private_keys=False, blank=True, descriptors=True)
+        mock_wallet = self.nodes[1].get_wallet_rpc("mock")
+        assert mock_wallet.getwalletinfo()['private_keys_enabled']
+
+        result = mock_wallet.importdescriptors([{
+            "desc": "pkh([00000001/84'/1'/0']tprv8ZgxMBicQKsPd7Uf69XL1XwhmjHopUGep8GuEiJDZmbQz6o58LninorQAfcKZWARbtRtfnLcJ5MQ2AtHcQJCCRUcMRvmDUjyEmNUWwx8UbK/0/*)#6k3x80k9",
+            "timestamp": 0,
+            "range": [0,1],
+            "internal": False,
+            "active": True
+        },
+        {
+            "desc": "pkh([00000001/84'/1'/0']tprv8ZgxMBicQKsPd7Uf69XL1XwhmjHopUGep8GuEiJDZmbQz6o58LninorQAfcKZWARbtRtfnLcJ5MQ2AtHcQJCCRUcMRvmDUjyEmNUWwx8UbK/1/*)#tz5866xa",
+            "timestamp": 0,
+            "range": [0, 0],
+            "internal": True,
+            "active": True
+        }])
+        assert_equal(result[0], {'success': True})
+        assert_equal(result[1], {'success': True})
+        assert_equal(mock_wallet.getwalletinfo()["txcount"], 1)
+        dest = self.nodes[0].getnewaddress()
+        mock_psbt = mock_wallet.walletcreatefundedpsbt([], {dest:0.5}, 0, {}, True)['psbt']
+        mock_psbt_signed = mock_wallet.walletprocesspsbt(psbt=mock_psbt, sign=True, sighashtype="ALL", bip32derivs=True)
+        mock_psbt_final = mock_wallet.finalizepsbt(mock_psbt_signed["psbt"])
+        mock_tx = mock_psbt_final["hex"]
+        assert(mock_wallet.testmempoolaccept([mock_tx])[0]["allowed"])
+
+        # # Create a new wallet and populate with specific public keys, in order
+        # # to work with the mock signed PSBT.
+        # self.nodes[1].createwallet(wallet_name="hww4", disable_private_keys=True, descriptors=True, external_signer=True)
+        # hww4 = self.nodes[1].get_wallet_rpc("hww4")
+        #
+        # descriptors = [{
+        #     "desc": "wpkh([00000001/84'/1'/0']tpubD6NzVbkrYhZ4WaWSyoBvQwbpLkojyoTZPRsgXELWz3Popb3qkjcJyJUGLnL4qHHoQvao8ESaAstxYSnhyswJ76uZPStJRJCTKvosUCJZL5B/0/*)#x30uthjs",
+        #     "timestamp": "now",
+        #     "range": [0, 1],
+        #     "internal": False,
+        #     "watchonly": True,
+        #     "active": True
+        # },
+        # {
+        #     "desc": "wpkh([00000001/84'/1'/0']tpubD6NzVbkrYhZ4WaWSyoBvQwbpLkojyoTZPRsgXELWz3Popb3qkjcJyJUGLnL4qHHoQvao8ESaAstxYSnhyswJ76uZPStJRJCTKvosUCJZL5B/1/*)#h92akzzg",
+        #     "timestamp": "now",
+        #     "range": [0, 0],
+        #     "internal": True,
+        #     "watchonly": True,
+        #     "active": True
+        # }]
+
+        # result = hww4.importdescriptors(descriptors)
+        # assert_equal(result[0], {'success': True})
+        # assert_equal(result[1], {'success': True})
+        assert_equal(hww.getwalletinfo()["txcount"], 1)
+
+        assert(hww.testmempoolaccept([mock_tx])[0]["allowed"])
+
+        with open(os.path.join(self.nodes[1].cwd, "mock_psbt"), "w", encoding="utf8") as f:
+            f.write(mock_psbt_signed["psbt"])
+
+        self.log.info('Test send using hww1')
+
+        res = hww.send(outputs={dest:0.5},options={"add_to_wallet": False})
+        assert(res["complete"])
+        assert_equal(res["hex"], mock_tx)
+
+        # # Handle error thrown by script
+        # self.set_mock_result(self.nodes[4], "2")
+        # assert_raises_rpc_error(-1, 'Unable to parse JSON',
+        #     hww4.signerprocesspsbt, psbt_orig, "00000001"
+        # )
+        # self.clear_mock_result(self.nodes[4])
+
+if __name__ == '__main__':
+    SignerTest().main()

From a33222da8fc6893ef7aa4c9e54dfb94ea7d4cd2a Mon Sep 17 00:00:00 2001
From: Konstantin Akimov <knstqq@gmail.com>
Date: Thu, 9 May 2024 01:19:23 +0700
Subject: [PATCH 582/656] fix: alignment in configure.ac for debug output of
 options choice

---
 configure.ac | 48 ++++++++++++++++++++++++------------------------
 1 file changed, 24 insertions(+), 24 deletions(-)

diff --git a/configure.ac b/configure.ac
index 65c2be5ddb26..4872c4d06aeb 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2097,34 +2097,34 @@ echo "  with gui / qt       = $bitcoin_enable_qt"
 if test $bitcoin_enable_qt != "no"; then
     echo "    with qr       = $use_qr"
 fi
-echo "  with zmq            = $use_zmq"
+echo "  with zmq        = $use_zmq"
 if test $enable_fuzz = "no"; then
-    echo "  with test           = $use_tests"
+    echo "  with test       = $use_tests"
 else
     echo "  with test       = not building test_dash because fuzzing is enabled"
 fi
-echo "  with fuzz binary    = $enable_fuzz_binary"
-echo "  with bench          = $use_bench"
-echo "  with upnp           = $use_upnp"
-echo "  with natpmp         = $use_natpmp"
-echo "  USDT tracing        = $use_usdt"
-echo "  sanitizers          = $use_sanitizers"
-echo "  debug enabled       = $enable_debug"
-echo "  stacktraces enabled = $enable_stacktraces"
-echo "  crash hooks enabled = $enable_crashhooks"
-echo "  miner enabled       = $enable_miner"
-echo "  gprof enabled       = $enable_gprof"
-echo "  werror              = $enable_werror"
+echo "  with fuzz binary= $enable_fuzz_binary"
+echo "  with bench      = $use_bench"
+echo "  with upnp       = $use_upnp"
+echo "  with natpmp     = $use_natpmp"
+echo "  USDT tracing    = $use_usdt"
+echo "  sanitizers      = $use_sanitizers"
+echo "  debug enabled   = $enable_debug"
+echo "  stacktraces     = $enable_stacktraces"
+echo "  crash hooks     = $enable_crashhooks"
+echo "  miner enabled   = $enable_miner"
+echo "  gprof enabled   = $enable_gprof"
+echo "  werror          = $enable_werror"
 echo
-echo "  target os           = $host_os"
-echo "  build os            = $build_os"
+echo "  target os       = $host_os"
+echo "  build os        = $build_os"
 echo
-echo "  CC                  = $CC"
-echo "  CFLAGS              = $DEBUG_CFLAGS $PTHREAD_CFLAGS $BACKTRACE_FLAGS $CFLAGS"
-echo "  CPPFLAGS            = $DEBUG_CPPFLAGS $HARDENED_CPPFLAGS $CORE_CPPFLAGS $CPPFLAGS"
-echo "  CXX                 = $CXX"
-echo "  CXXFLAGS            = $DEBUG_CXXFLAGS $HARDENED_CXXFLAGS $WARN_CXXFLAGS $NOWARN_CXXFLAGS $ERROR_CXXFLAGS $GPROF_CXXFLAGS $CORE_CXXFLAGS $BACKTRACE_FLAGS $CXXFLAGS"
-echo "  LDFLAGS             = $PTHREAD_LIBS $HARDENED_LDFLAGS $GPROF_LDFLAGS $CORE_LDFLAGS $BACKTRACE_LDFLAGS $LDFLAGS"
-echo "  AR                  = $AR"
-echo "  ARFLAGS             = $ARFLAGS"
+echo "  CC              = $CC"
+echo "  CFLAGS          = $DEBUG_CFLAGS $PTHREAD_CFLAGS $BACKTRACE_FLAGS $CFLAGS"
+echo "  CPPFLAGS        = $DEBUG_CPPFLAGS $HARDENED_CPPFLAGS $CORE_CPPFLAGS $CPPFLAGS"
+echo "  CXX             = $CXX"
+echo "  CXXFLAGS        = $DEBUG_CXXFLAGS $HARDENED_CXXFLAGS $WARN_CXXFLAGS $NOWARN_CXXFLAGS $ERROR_CXXFLAGS $GPROF_CXXFLAGS $CORE_CXXFLAGS $BACKTRACE_FLAGS $CXXFLAGS"
+echo "  LDFLAGS         = $PTHREAD_LIBS $HARDENED_LDFLAGS $GPROF_LDFLAGS $CORE_LDFLAGS $BACKTRACE_LDFLAGS $LDFLAGS"
+echo "  AR              = $AR"
+echo "  ARFLAGS         = $ARFLAGS"
 echo

From 3a3dfa3241a46ea9857c223948c495e1d80a3f08 Mon Sep 17 00:00:00 2001
From: fanquake <fanquake@gmail.com>
Date: Wed, 24 Feb 2021 06:37:35 +0800
Subject: [PATCH 583/656] Merge #21285: wallet: fix doc typo in signer option

da30c1bb05b245e7b56c4bb5a6a060e100d407c5 wallet: fix doc typo in signer option (William Casarin)

Pull request description:

ACKs for top commit:
  0xB10C:
    ACK da30c1bb05b245e7b56c4bb5a6a060e100d407c5
  darosior:
    ACK da30c1bb05b245e7b56c4bb5a6a060e100d407c5

Tree-SHA512: 1f4ba501121101bbe94a18a0276df6a3592123548110ed5d1e4e1937b75c9a832bc3f0d6fa26bab69b3304526ef0548b2540d446e05a6402793321a34f508b09
---
 src/wallet/init.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/wallet/init.cpp b/src/wallet/init.cpp
index 9cebf2b2e43d..444e066b0021 100644
--- a/src/wallet/init.cpp
+++ b/src/wallet/init.cpp
@@ -68,7 +68,7 @@ void WalletInit::AddWalletOptions(ArgsManager& argsman) const
     argsman.AddArg("-rescan=<mode>", "Rescan the block chain for missing wallet transactions on startup"
                                             " (1 = start from wallet creation time, 2 = start from genesis block)", ArgsManager::ALLOW_ANY, OptionsCategory::WALLET);
 #ifdef ENABLE_EXTERNAL_SIGNER
-    argsman.AddArg("-signer=<cmd>", "External signing tool, see docs/external-signer.md", ArgsManager::ALLOW_ANY, OptionsCategory::WALLET);
+    argsman.AddArg("-signer=<cmd>", "External signing tool, see doc/external-signer.md", ArgsManager::ALLOW_ANY, OptionsCategory::WALLET);
 #endif
     argsman.AddArg("-spendzeroconfchange", strprintf("Spend unconfirmed change when sending transactions (default: %u)", DEFAULT_SPEND_ZEROCONF_CHANGE), ArgsManager::ALLOW_ANY, OptionsCategory::WALLET);
     argsman.AddArg("-wallet=<path>", "Specify wallet path to load at startup. Can be used multiple times to load multiple wallets. Path is to a directory containing wallet data and log files. If the path is not absolute, it is interpreted relative to <walletdir>. This only loads existing wallets and does not create new ones. For backwards compatibility this also accepts names of existing top-level data files in <walletdir>.", ArgsManager::ALLOW_ANY | ArgsManager::NETWORK_ONLY, OptionsCategory::WALLET);

From fac568ae866d0ac7d8af0bfbd88d65b903a792a3 Mon Sep 17 00:00:00 2001
From: MarcoFalke <falke.marco@gmail.com>
Date: Wed, 24 Feb 2021 15:30:58 +0100
Subject: [PATCH 584/656] Merge #21292: build, doc: Fix configure script output
 indentation and typos

8b08d0f2a5161296d809a154ccde403a33a0f3ea build, doc: Fix configure script output indentation and typos (Hennadii Stepanov)

Pull request description:

  This PR is follow up of #16546, that breaks the `configure` script output indentation for gui/qt/qr lines:
  ```
  Options used to compile and link:
    external signer = no
    multiprocess    = no
    with libs       = yes
    with wallet     = yes
      with sqlite   = yes
      with bdb      = yes
      with gui / qt = yes
    with qr         = yes
    with zmq        = yes
    with test       = yes
  ...
  ```

  With this PR:
  ```
  Options used to compile and link:
    external signer = no
    multiprocess    = no
    with libs       = yes
    with wallet     = yes
      with sqlite   = yes
      with bdb      = yes
    with gui / qt   = yes
      with qr       = yes
    with zmq        = yes
    with test       = yes
  ...
  ```

  Also typos are fixed.

ACKs for top commit:
  Sjors:
    utACK 8b08d0f2a5161296d809a154ccde403a33a0f3ea
  vasild:
    ACK 8b08d0f2a5161296d809a154ccde403a33a0f3ea

Tree-SHA512: 46dfcfb754192dbcc080348781327d1714e2f9a696f3ed9252746b426e3afc628d84adb197ba3b8080eacaa6053ccac07e670998930ae92cef8ed713dd457c10
---
 configure.ac           | 54 +++++++++++++++++++++---------------------
 doc/external-signer.md |  2 +-
 2 files changed, 28 insertions(+), 28 deletions(-)

diff --git a/configure.ac b/configure.ac
index 4872c4d06aeb..58bf19141bde 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1579,18 +1579,18 @@ if test "$use_natpmp" != "no"; then
 fi
 
 if test "$build_bitcoin_wallet$build_bitcoin_cli$build_bitcoin_tx$build_bitcoind$bitcoin_enable_qt$use_tests$use_bench$enable_fuzz_binary" = "nononononononono"; then
-    use_boost=no
+  use_boost=no
 else
-    use_boost=yes
+  use_boost=yes
 fi
 
 if test "$use_boost" = "yes"; then
 
-dnl Check for Boost headers
-AX_BOOST_BASE([1.73.0],[],[AC_MSG_ERROR([Boost is not available!])])
-if test "$want_boost" = "no"; then
-    AC_MSG_ERROR([[only libdashconsensus can be built without boost]])
-fi
+  dnl Check for Boost headers
+  AX_BOOST_BASE([1.73.0],[],[AC_MSG_ERROR([Boost is not available!])])
+  if test "$want_boost" = "no"; then
+      AC_MSG_ERROR([[only libdashconsensus can be built without boost]])
+  fi
 
   dnl we don't use multi_index serialization
   BOOST_CPPFLAGS="$BOOST_CPPFLAGS -DBOOST_MULTI_INDEX_DISABLE_SERIALIZATION"
@@ -1599,32 +1599,32 @@ fi
     BOOST_CPPFLAGS="$BOOST_CPPFLAGS -DBOOST_MULTI_INDEX_ENABLE_SAFE_MODE"
   fi
 
-dnl Prevent use of std::unary_function, which was removed in C++17,
-dnl and will generate warnings with newer compilers for Boost
-dnl older than 1.80.
-dnl See: https://github.com/boostorg/config/pull/430.
-AX_CHECK_PREPROC_FLAG([-DBOOST_NO_CXX98_FUNCTION_BASE], [BOOST_CPPFLAGS="$BOOST_CPPFLAGS -DBOOST_NO_CXX98_FUNCTION_BASE"], [], [$CXXFLAG_WERROR],
-                      [AC_LANG_PROGRAM([[#include <boost/config.hpp>]])])
-
-dnl Opt-in to Boost Process if external signer support is requested
-if test "$use_external_signer" != "no"; then
-AC_MSG_CHECKING(for Boost Process)
-AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <boost/process.hpp>]],
- [[ boost::process::child* child = new boost::process::child; delete child; ]])],
- [ AC_MSG_RESULT(yes)
- AC_DEFINE([ENABLE_EXTERNAL_SIGNER],,[define if external signer support is enabled])
- ],
- [ AC_MSG_ERROR([Boost::Process is required for external signer support, but not available!])]
-)
-fi
-
-AM_CONDITIONAL([ENABLE_EXTERNAL_SIGNER], [test "$use_external_signer" = "yes"])
+  dnl Prevent use of std::unary_function, which was removed in C++17,
+  dnl and will generate warnings with newer compilers for Boost
+  dnl older than 1.80.
+  dnl See: https://github.com/boostorg/config/pull/430.
+  AX_CHECK_PREPROC_FLAG([-DBOOST_NO_CXX98_FUNCTION_BASE], [BOOST_CPPFLAGS="$BOOST_CPPFLAGS -DBOOST_NO_CXX98_FUNCTION_BASE"], [], [$CXXFLAG_WERROR],
+                        [AC_LANG_PROGRAM([[#include <boost/config.hpp>]])])
+
+  dnl Opt-in to Boost Process if external signer support is requested
+  if test "$use_external_signer" != "no"; then
+    AC_MSG_CHECKING(for Boost Process)
+    AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <boost/process.hpp>]],
+     [[ boost::process::child* child = new boost::process::child; delete child; ]])],
+     [ AC_MSG_RESULT(yes)
+     AC_DEFINE([ENABLE_EXTERNAL_SIGNER],,[define if external signer support is enabled])
+     ],
+     [ AC_MSG_ERROR([Boost::Process is required for external signer support, but not available!])]
+    )
+  fi
 
   if test "$suppress_external_warnings" != "no"; then
     BOOST_CPPFLAGS=SUPPRESS_WARNINGS($BOOST_CPPFLAGS)
   fi
 fi
 
+AM_CONDITIONAL([ENABLE_EXTERNAL_SIGNER], [test "$use_external_signer" = "yes"])
+
 dnl Check for reduced exports
 if test "$use_reduce_exports" = "yes"; then
     AX_CHECK_COMPILE_FLAG([-fvisibility=hidden], [CORE_CXXFLAGS="$CORE_CXXFLAGS -fvisibility=hidden"],
diff --git a/doc/external-signer.md b/doc/external-signer.md
index 053752ee2f16..c91ea9bab7e5 100644
--- a/doc/external-signer.md
+++ b/doc/external-signer.md
@@ -168,4 +168,4 @@ It then imports descriptors for all support address types, in a BIP44/49/84 comp
 
 The `displayaddress` RPC reuses some code from `getaddressinfo` on the provided address and obtains the inferred descriptor. It then calls `<cmd> --fingerprint=00000000 displayaddress --desc=<descriptor>`.
 
-`sendtoaddress` and `sendmany` check `inputs->bip32_derivs` to see if any inputs have the same `master_fingerprint` as the signer. If so, it calls `<cmd> --fingerprint=00000000 signtransaction <psbt>`. It waits for the device to return a (partially) signed psbt, tries to finalize it and broadcasts the transation.
+`sendtoaddress` and `sendmany` check `inputs->bip32_derivs` to see if any inputs have the same `master_fingerprint` as the signer. If so, it calls `<cmd> --fingerprint=00000000 signtransaction <psbt>`. It waits for the device to return a (partially) signed psbt, tries to finalize it and broadcasts the transaction.

From 6373ba739bedc98202e3ed71dd4674aff2e1e52d Mon Sep 17 00:00:00 2001
From: fanquake <fanquake@gmail.com>
Date: Wed, 17 Mar 2021 09:39:05 +0800
Subject: [PATCH 585/656] Merge #21417: Misc external signer improvement and
 HWI 2 support

57ff5a42ab89c2774387b53248bbf5902de086b4 doc: specify minimum HWI version (Sjors Provoost)
03308b2bfaef5cdf2337a1e8f63edf043d98a7c0 rpc: don't require wallet for enumeratesigners (Sjors Provoost)

Pull request description:

  HWI just released 2.0. See https://github.com/bitcoin-core/HWI/releases/tag/2.0.0

  As of #16546 we already rely on features that are in 2.0 and not in the previous 1.* releases:
  * `--chain` param

  This shouldn't be a problem, because HWI 2.0 has been released before we release v22.

  Misc improvements:
  * document that HWI 2.0 is required
  * drop wallet requirement for `enumeratesigners`

ACKs for top commit:
  achow101:
    Code Review ACK 57ff5a42ab89c2774387b53248bbf5902de086b4

Tree-SHA512: 3fb6ba20894e52a116f89525a5f5a1f61d363ccd904e1cffd0e6d095640fc6d2edf0388cd6ae20f83bbc31e5f458255ec090b6e823798d426eba3e45b4336bf9
---
 doc/external-signer.md   | 2 +-
 src/wallet/rpcsigner.cpp | 3 ---
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/doc/external-signer.md b/doc/external-signer.md
index c91ea9bab7e5..2b3b378bee06 100644
--- a/doc/external-signer.md
+++ b/doc/external-signer.md
@@ -4,7 +4,7 @@ Bitcoin Core can be launched with `-signer=<cmd>` where `<cmd>` is an external t
 
 ## Example usage
 
-The following example is based on the [HWI](https://github.com/bitcoin-core/HWI) tool. Although this tool is hosted under the Bitcoin Core GitHub organization and maintained by Bitcoin Core developers, it should be used with caution. It is considered experimental and has far less review than Bitcoin Core itself. Be particularly careful when running tools such as these on a computer with private keys on it.
+The following example is based on the [HWI](https://github.com/bitcoin-core/HWI) tool. Version 2.0 or newer is required. Although this tool is hosted under the Bitcoin Core GitHub organization and maintained by Bitcoin Core developers, it should be used with caution. It is considered experimental and has far less review than Bitcoin Core itself. Be particularly careful when running tools such as these on a computer with private keys on it.
 
 When using a hardware wallet, consult the manufacturer website for (alternative) software they recommend. As long as their software conforms to the standard below, it should be able to work with Bitcoin Core.
 
diff --git a/src/wallet/rpcsigner.cpp b/src/wallet/rpcsigner.cpp
index 4f1a1bbe16c8..6b22cf0e3aa9 100644
--- a/src/wallet/rpcsigner.cpp
+++ b/src/wallet/rpcsigner.cpp
@@ -33,9 +33,6 @@ static RPCHelpMan enumeratesigners()
         },
         RPCExamples{""},
         [](const RPCHelpMan& self, const JSONRPCRequest& request) -> UniValue {
-            std::shared_ptr<CWallet> const wallet = GetWalletForJSONRPCRequest(request);
-            if (!wallet) return NullUniValue;
-
             const std::string command = gArgs.GetArg("-signer", "");
             if (command == "") throw JSONRPCError(RPC_WALLET_ERROR, "Error: restart dashd with -signer=<cmd>");
             std::string chain = gArgs.GetChainName();

From 7dbb4c1b05f7b3416cf543e46419de8d48943db5 Mon Sep 17 00:00:00 2001
From: fanquake <fanquake@gmail.com>
Date: Tue, 13 Apr 2021 12:52:45 +0800
Subject: [PATCH 586/656] Merge #21467: Move external signer out of wallet
 module

88d4d5ff2f5c71a9a2f4c78c2b2e2fd00568cfee rpc: add help for enumeratesigners and walletdisplayaddress (Sjors Provoost)
b0db187e5b30a491c9f95685430a82a1e35e921d ci: use --enable-external-signer instead of --with-boost-process (Sjors Provoost)
b54b2e7b1a171203404bd41853372c73f2c64532 Move external signer out of wallet module (Sjors Provoost)

Pull request description:

  In addition, this PR enables external signer testing on CI.

  This PR moves the ExternalSigner class and RPC methods out of the wallet module.

  The `enumeratesigners` RPC can be used without a wallet since #21417. With additional modifications external signers could be used without a wallet in general, e.g. via `signrawtransaction`.

  The `signerdisplayaddress` RPC is ranamed to `walletdisplayaddress` because it requires wallet context. A future `displayaddress` RPC call without wallet context could take a descriptor argument.

  This commit fixes a `rpc_help.py` failure when configured with `--disable-wallet`.

ACKs for top commit:
  ryanofsky:
    Code review ACK 88d4d5ff2f5c71a9a2f4c78c2b2e2fd00568cfee
  fanquake:
    ACK 88d4d5ff2f5c71a9a2f4c78c2b2e2fd00568cfee

Tree-SHA512: 3242a24e22313aed97eee32a520bfcb1c17495ba32a2b8e06a5e151e2611320e2da5ef35b572d84623af0a49a210d2f9377a2531250868d1a0ccf3e144352a97
---
 ci/test/00_setup_env_arm.sh                   |   2 +-
 ci/test/00_setup_env_mac.sh                   |   2 +-
 ci/test/00_setup_env_mac_native_x86_64.sh     |   2 +-
 ci/test/00_setup_env_native_asan.sh           |   2 +-
 ci/test/00_setup_env_native_fuzz.sh           |   2 +-
 ci/test/00_setup_env_native_multiprocess.sh   |   2 +-
 ci/test/00_setup_env_native_nowallet.sh       |   2 +-
 ci/test/00_setup_env_native_qt5.sh            |   2 +-
 ci/test/00_setup_env_native_tsan.sh           |   2 +-
 ci/test/00_setup_env_s390x.sh                 |   2 +-
 ci/test/00_setup_env_win64.sh                 |   2 +-
 doc/external-signer.md                        |   4 +-
 src/Makefile.am                               |   7 +-
 src/{wallet => }/external_signer.cpp          |   2 +-
 src/{wallet => }/external_signer.h            |  10 +-
 src/rpc/external_signer.cpp                   |  68 ++++++++++++
 src/rpc/register.h                            |   5 +
 .../external_signer_scriptpubkeyman.cpp       |   2 +-
 src/wallet/interfaces.cpp                     |  12 --
 src/wallet/rpc/addresses.cpp                  |  43 +++++++
 src/wallet/rpc/wallet.cpp                     |   6 +
 src/wallet/rpcsigner.cpp                      | 105 ------------------
 src/wallet/rpcsigner.h                        |  26 -----
 src/wallet/scriptpubkeyman.cpp                |   2 +-
 src/wallet/wallet.h                           |   2 +-
 test/functional/rpc_signer.py                 |  79 +++++++++++++
 test/functional/test_runner.py                |   1 +
 test/functional/wallet_signer.py              |  44 ++------
 28 files changed, 235 insertions(+), 205 deletions(-)
 rename src/{wallet => }/external_signer.cpp (99%)
 rename src/{wallet => }/external_signer.h (92%)
 create mode 100644 src/rpc/external_signer.cpp
 delete mode 100644 src/wallet/rpcsigner.cpp
 delete mode 100644 src/wallet/rpcsigner.h
 create mode 100755 test/functional/rpc_signer.py

diff --git a/ci/test/00_setup_env_arm.sh b/ci/test/00_setup_env_arm.sh
index af66a99b5111..1e2f23f8ca42 100755
--- a/ci/test/00_setup_env_arm.sh
+++ b/ci/test/00_setup_env_arm.sh
@@ -25,4 +25,4 @@ export RUN_FUNCTIONAL_TESTS=false
 export GOAL="install"
 # -Wno-psabi is to disable ABI warnings: "note: parameter passing for argument of type ... changed in GCC 7.1"
 # This could be removed once the ABI change warning does not show up by default
-export BITCOIN_CONFIG="--enable-reduce-exports CXXFLAGS=-Wno-psabi --with-boost-process"
+export BITCOIN_CONFIG="--enable-reduce-exports CXXFLAGS=-Wno-psabi --enable_external-signer"
diff --git a/ci/test/00_setup_env_mac.sh b/ci/test/00_setup_env_mac.sh
index aba312bf78af..5037bf76cd0f 100755
--- a/ci/test/00_setup_env_mac.sh
+++ b/ci/test/00_setup_env_mac.sh
@@ -14,4 +14,4 @@ export XCODE_BUILD_ID=15A240d
 export RUN_UNIT_TESTS=false
 export RUN_FUNCTIONAL_TESTS=false
 export GOAL="all deploy"
-export BITCOIN_CONFIG="--with-gui --enable-reduce-exports --disable-miner --with-boost-process"
+export BITCOIN_CONFIG="--with-gui --enable-reduce-exports --disable-miner --enable-external-signer"
diff --git a/ci/test/00_setup_env_mac_native_x86_64.sh b/ci/test/00_setup_env_mac_native_x86_64.sh
index 252b95c2178f..e73c3dbc7246 100755
--- a/ci/test/00_setup_env_mac_native_x86_64.sh
+++ b/ci/test/00_setup_env_mac_native_x86_64.sh
@@ -10,7 +10,7 @@ export CONTAINER_NAME=ci_macos
 export HOST=x86_64-apple-darwin
 export PIP_PACKAGES="zmq lief"
 export GOAL="install"
-export BITCOIN_CONFIG="--with-gui --enable-reduce-exports --disable-miner --with-boost-process"
+export BITCOIN_CONFIG="--with-gui --enable-reduce-exports --disable-miner --enable-external-signer"
 export CI_OS_NAME="macos"
 export NO_DEPENDS=1
 export OSX_SDK=""
diff --git a/ci/test/00_setup_env_native_asan.sh b/ci/test/00_setup_env_native_asan.sh
index 5f1507e5b7e2..f621847d5566 100755
--- a/ci/test/00_setup_env_native_asan.sh
+++ b/ci/test/00_setup_env_native_asan.sh
@@ -12,4 +12,4 @@ export TEST_RUNNER_EXTRA="--timeout-factor=4"  # Increase timeout because saniti
 export FUNCTIONAL_TESTS_CONFIG="--exclude wallet_multiwallet.py" # Temporarily suppress ASan heap-use-after-free (see issue #14163)
 export RUN_BENCH=true
 export GOAL="install"
-export BITCOIN_CONFIG="--enable-zmq --with-incompatible-bdb --with-gui=qt5 CPPFLAGS=-DDEBUG_LOCKORDER --with-sanitizers=address,integer,undefined CC=clang CXX=clang++ --with-boost-process"
+export BITCOIN_CONFIG="--enable-zmq --with-incompatible-bdb --with-gui=qt5 CPPFLAGS=-DDEBUG_LOCKORDER --with-sanitizers=address,integer,undefined CC=clang CXX=clang++ --enable-external-signer"
diff --git a/ci/test/00_setup_env_native_fuzz.sh b/ci/test/00_setup_env_native_fuzz.sh
index 586496215358..5d8c910c9df7 100755
--- a/ci/test/00_setup_env_native_fuzz.sh
+++ b/ci/test/00_setup_env_native_fuzz.sh
@@ -15,4 +15,4 @@ export RUN_UNIT_TESTS=false
 export RUN_FUNCTIONAL_TESTS=false
 export RUN_FUZZ_TESTS=true
 export GOAL="install"
-export BITCOIN_CONFIG="--enable-zmq --disable-ccache --enable-fuzz --with-sanitizers=fuzzer,address,undefined,integer CC='clang-19 -ftrivial-auto-var-init=pattern' CXX='clang++-19 -ftrivial-auto-var-init=pattern' --with-boost-process"
+export BITCOIN_CONFIG="--enable-zmq --disable-ccache --enable-fuzz --with-sanitizers=fuzzer,address,undefined,integer CC='clang-19 -ftrivial-auto-var-init=pattern' CXX='clang++-19 -ftrivial-auto-var-init=pattern' --enable-external-signer"
diff --git a/ci/test/00_setup_env_native_multiprocess.sh b/ci/test/00_setup_env_native_multiprocess.sh
index f0e6e532b162..e86f34ef9eae 100755
--- a/ci/test/00_setup_env_native_multiprocess.sh
+++ b/ci/test/00_setup_env_native_multiprocess.sh
@@ -13,7 +13,7 @@ export DEP_OPTS="MULTIPROCESS=1 CC=clang-19 CXX=clang++-19"
 export RUN_TIDY=true
 export GOAL="install"
 export TEST_RUNNER_EXTRA="--v2transport"
-export BITCOIN_CONFIG="--with-boost-process --enable-debug CC=clang-19 CXX=clang++-19" # Use clang to avoid OOM
+export BITCOIN_CONFIG="--enable-external-signer ---enable-debug CC=clang-19 CXX=clang++-19" # Use clang to avoid OOM
 # Additional flags for RUN_TIDY
 export BITCOIN_CONFIG="${BITCOIN_CONFIG} --disable-hardening CFLAGS='-O0 -g0' CXXFLAGS='-O0 -g0 -Wno-error=documentation'"
 export BITCOIND=dash-node  # Used in functional tests
diff --git a/ci/test/00_setup_env_native_nowallet.sh b/ci/test/00_setup_env_native_nowallet.sh
index 3637d3b8d0da..8d26f6b191de 100755
--- a/ci/test/00_setup_env_native_nowallet.sh
+++ b/ci/test/00_setup_env_native_nowallet.sh
@@ -11,4 +11,4 @@ export HOST=x86_64-pc-linux-gnu
 export PACKAGES="python3-zmq"
 export DEP_OPTS="NO_WALLET=1 CC=gcc-14 CXX=g++-14"
 export GOAL="install"
-export BITCOIN_CONFIG="--enable-reduce-exports --with-boost-process CC=gcc-14 CXX=g++-14"
+export BITCOIN_CONFIG="--enable-reduce-exports --enable_external-signer CC=gcc-14 CXX=g++-14"
diff --git a/ci/test/00_setup_env_native_qt5.sh b/ci/test/00_setup_env_native_qt5.sh
index a2ff43d07e02..50ce48f73d15 100755
--- a/ci/test/00_setup_env_native_qt5.sh
+++ b/ci/test/00_setup_env_native_qt5.sh
@@ -15,4 +15,4 @@ export RUN_UNIT_TESTS_SEQUENTIAL="true"
 export RUN_UNIT_TESTS="false"
 export GOAL="install"
 export DOWNLOAD_PREVIOUS_RELEASES="true"
-export BITCOIN_CONFIG="--enable-zmq --with-libs=no --enable-reduce-exports LDFLAGS=-static-libstdc++ --with-boost-process"
+export BITCOIN_CONFIG="--enable-zmq --with-libs=no --enable-reduce-exports LDFLAGS=-static-libstdc++ --enable_external-signer"
diff --git a/ci/test/00_setup_env_native_tsan.sh b/ci/test/00_setup_env_native_tsan.sh
index 2feddf269806..7775a5166b40 100755
--- a/ci/test/00_setup_env_native_tsan.sh
+++ b/ci/test/00_setup_env_native_tsan.sh
@@ -12,6 +12,6 @@ export DEP_OPTS="CC=clang-19 CXX='clang++-19 -stdlib=libc++'"
 export TEST_RUNNER_EXTRA="--extended --exclude feature_pruning,feature_dbcrash,wallet_multiwallet.py" # Temporarily suppress ASan heap-use-after-free (see issue #14163)
 export TEST_RUNNER_EXTRA="${TEST_RUNNER_EXTRA} --timeout-factor=4"  # Increase timeout because sanitizers slow down
 export GOAL="install"
-export BITCOIN_CONFIG="--enable-zmq --with-sanitizers=thread CC=clang-19 CXX=clang++-19 CXXFLAGS='-g' --with-boost-process"
+export BITCOIN_CONFIG="--enable-zmq --with-sanitizers=thread CC=clang-19 CXX=clang++-19 CXXFLAGS='-g' --enable-external-signer"
 export CPPFLAGS="-DARENA_DEBUG -DDEBUG_LOCKORDER -DDEBUG_LOCKCONTENTION"
 export PYZMQ=true
diff --git a/ci/test/00_setup_env_s390x.sh b/ci/test/00_setup_env_s390x.sh
index 5d95535daf92..3a104a796d5a 100755
--- a/ci/test/00_setup_env_s390x.sh
+++ b/ci/test/00_setup_env_s390x.sh
@@ -22,4 +22,4 @@ export RUN_UNIT_TESTS=true
 export TEST_RUNNER_EXTRA="--exclude rpc_bind,feature_bind_extra"  # Excluded for now, see https://github.com/bitcoin/bitcoin/issues/17765#issuecomment-602068547
 export RUN_FUNCTIONAL_TESTS=true
 export GOAL="install"
-export BITCOIN_CONFIG="--enable-reduce-exports --with-boost-process"
+export BITCOIN_CONFIG="--enable-reduce-exports --enable_external-signer"
diff --git a/ci/test/00_setup_env_win64.sh b/ci/test/00_setup_env_win64.sh
index fa39b532213e..215a2db8269b 100755
--- a/ci/test/00_setup_env_win64.sh
+++ b/ci/test/00_setup_env_win64.sh
@@ -16,5 +16,5 @@ export GOAL="deploy"
 # Prior to 11.0.0, the mingw-w64 headers were missing noreturn attributes, causing warnings when
 # cross-compiling for Windows. https://sourceforge.net/p/mingw-w64/bugs/306/
 # https://github.com/mingw-w64/mingw-w64/commit/1690994f515910a31b9fb7c7bd3a52d4ba987abe
-export BITCOIN_CONFIG="--enable-gui --enable-reduce-exports --disable-miner --without-boost-process CXXFLAGS='-Wno-return-type -Wno-error=maybe-uninitialized -Wno-error=array-bounds'"
+export BITCOIN_CONFIG="--enable-gui --enable-reduce-exports --disable-miner --disable-external-signer CXXFLAGS='-Wno-return-type -Wno-error=maybe-uninitialized -Wno-error=array-bounds'"
 export DIRECT_WINE_EXEC_TESTS=true
diff --git a/doc/external-signer.md b/doc/external-signer.md
index 2b3b378bee06..de44cdd88013 100644
--- a/doc/external-signer.md
+++ b/doc/external-signer.md
@@ -46,7 +46,7 @@ Display an address on the device:
 
 ```sh
 $ bitcoin-cli -rpcwallet=<wallet> getnewaddress
-$ bitcoin-cli -rpcwallet=<wallet> signerdisplayaddress <address>
+$ bitcoin-cli -rpcwallet=<wallet> walletdisplayaddress <address>
 ```
 
 Replace `<address>` with the result of `getnewaddress`.
@@ -166,6 +166,6 @@ The `createwallet` RPC calls:
 
 It then imports descriptors for all support address types, in a BIP44/49/84 compatible manner.
 
-The `displayaddress` RPC reuses some code from `getaddressinfo` on the provided address and obtains the inferred descriptor. It then calls `<cmd> --fingerprint=00000000 displayaddress --desc=<descriptor>`.
+The `walletdisplayaddress` RPC reuses some code from `getaddressinfo` on the provided address and obtains the inferred descriptor. It then calls `<cmd> --fingerprint=00000000 displayaddress --desc=<descriptor>`.
 
 `sendtoaddress` and `sendmany` check `inputs->bip32_derivs` to see if any inputs have the same `master_fingerprint` as the signer. If so, it calls `<cmd> --fingerprint=00000000 signtransaction <psbt>`. It waits for the device to return a (partially) signed psbt, tries to finalize it and broadcasts the transaction.
diff --git a/src/Makefile.am b/src/Makefile.am
index b8100c72d792..2ed2fb3a1943 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -215,6 +215,7 @@ BITCOIN_CORE_H = \
   evo/specialtx_filter.h \
   evo/specialtxman.h \
   evo/types.h \
+  external_signer.h \
   dsnotificationinterface.h \
   governance/classes.h \
   governance/common.h \
@@ -430,14 +431,12 @@ BITCOIN_CORE_H = \
   wallet/crypter.h \
   wallet/db.h \
   wallet/dump.h \
-  wallet/external_signer.h \
   wallet/external_signer_scriptpubkeyman.h \
   wallet/fees.h \
   wallet/hdchain.h \
   wallet/ismine.h \
   wallet/load.h \
   wallet/receive.h \
-  wallet/rpcsigner.h \
   wallet/rpc/util.h \
   wallet/rpc/wallet.h \
   wallet/salvage.h \
@@ -647,7 +646,6 @@ libbitcoin_wallet_a_SOURCES = \
   wallet/db.cpp \
   wallet/dump.cpp \
   wallet/external_signer_scriptpubkeyman.cpp \
-  wallet/external_signer.cpp \
   wallet/fees.cpp \
   wallet/hdchain.cpp \
   wallet/interfaces.cpp \
@@ -662,7 +660,6 @@ libbitcoin_wallet_a_SOURCES = \
   wallet/rpc/transactions.cpp \
   wallet/rpc/util.cpp \
   wallet/rpc/wallet.cpp \
-  wallet/rpcsigner.cpp \
   wallet/scriptpubkeyman.cpp \
   wallet/spend.cpp \
   wallet/transaction.cpp \
@@ -908,6 +905,7 @@ libbitcoin_common_a_SOURCES = \
   deploymentinfo.cpp \
   evo/core_write.cpp \
   evo/netinfo.cpp \
+  external_signer.cpp \
   governance/common.cpp \
   init/common.cpp \
   key.cpp \
@@ -925,6 +923,7 @@ libbitcoin_common_a_SOURCES = \
   psbt.cpp \
   rpc/evo_util.cpp \
   rpc/rawtransaction_util.cpp \
+  rpc/external_signer.cpp \
   rpc/util.cpp \
   saltedhasher.cpp \
   scheduler.cpp \
diff --git a/src/wallet/external_signer.cpp b/src/external_signer.cpp
similarity index 99%
rename from src/wallet/external_signer.cpp
rename to src/external_signer.cpp
index 61af489c379a..58bb124c087f 100644
--- a/src/wallet/external_signer.cpp
+++ b/src/external_signer.cpp
@@ -7,7 +7,7 @@
 #include <psbt.h>
 #include <util/strencodings.h>
 #include <util/system.h>
-#include <wallet/external_signer.h>
+#include <external_signer.h>
 
 ExternalSigner::ExternalSigner(const std::string& command, const std::string& fingerprint, std::string chain, std::string name): m_command(command), m_fingerprint(fingerprint), m_chain(chain), m_name(name) {}
 
diff --git a/src/wallet/external_signer.h b/src/external_signer.h
similarity index 92%
rename from src/wallet/external_signer.h
rename to src/external_signer.h
index cc03d51cfcad..ac978a515adf 100644
--- a/src/wallet/external_signer.h
+++ b/src/external_signer.h
@@ -2,8 +2,8 @@
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-#ifndef BITCOIN_WALLET_EXTERNAL_SIGNER_H
-#define BITCOIN_WALLET_EXTERNAL_SIGNER_H
+#ifndef BITCOIN_EXTERNAL_SIGNER_H
+#define BITCOIN_EXTERNAL_SIGNER_H
 
 #include <stdexcept>
 #include <string>
@@ -48,7 +48,7 @@ class ExternalSigner
     //! @param[in]              command the command which handles interaction with the external signer
     //! @param[in,out] signers  vector to which new signers (with a unique master key fingerprint) are added
     //! @param chain            "main", "test", "regtest" or "signet"
-    //! @param[out] success     Boolean
+    //! @returns success
     static bool Enumerate(const std::string& command, std::vector<ExternalSigner>& signers, std::string chain, bool ignore_errors = false);
 
     //! Display address on the device. Calls `<command> displayaddress --desc <descriptor>`.
@@ -59,7 +59,7 @@ class ExternalSigner
     //! Get receive and change Descriptor(s) from device for a given account.
     //! Calls `<command> getdescriptors --account <account>`
     //! @param[in] account  which BIP32 account to use (e.g. `m/44'/0'/account'`)
-    //! @param[out] UniValue see doc/external-signer.md
+    //! @returns see doc/external-signer.md
     UniValue GetDescriptors(int account);
 
     //! Sign PartiallySignedTransaction on the device.
@@ -70,4 +70,4 @@ class ExternalSigner
 #endif
 };
 
-#endif // BITCOIN_WALLET_EXTERNAL_SIGNER_H
+#endif // BITCOIN_EXTERNAL_SIGNER_H
diff --git a/src/rpc/external_signer.cpp b/src/rpc/external_signer.cpp
new file mode 100644
index 000000000000..1790baf71ea2
--- /dev/null
+++ b/src/rpc/external_signer.cpp
@@ -0,0 +1,68 @@
+// Copyright (c) 2018-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 <chainparamsbase.h>
+#include <external_signer.h>
+#include <rpc/server.h>
+#include <util/strencodings.h>
+#include <rpc/protocol.h>
+
+#ifdef ENABLE_EXTERNAL_SIGNER
+
+static RPCHelpMan enumeratesigners()
+{
+    return RPCHelpMan{"enumeratesigners",
+        "Returns a list of external signers from -signer.",
+        {},
+        RPCResult{
+            RPCResult::Type::OBJ, "", "",
+            {
+                {RPCResult::Type::ARR, "signers", /*optional=*/false, "",
+                {
+                    {RPCResult::Type::STR_HEX, "masterkeyfingerprint", "Master key fingerprint"},
+                    {RPCResult::Type::STR, "name", "Device name"},
+                },
+                }
+            }
+        },
+        RPCExamples{
+            HelpExampleCli("enumeratesigners", "")
+            + HelpExampleRpc("enumeratesigners", "")
+        },
+        [&](const RPCHelpMan& self, const JSONRPCRequest& request) -> UniValue
+        {
+            const std::string command = gArgs.GetArg("-signer", "");
+            if (command == "") throw JSONRPCError(RPC_MISC_ERROR, "Error: restart dashd with -signer=<cmd>");
+            std::string chain = gArgs.GetChainName();
+            UniValue signers_res = UniValue::VARR;
+            try {
+                std::vector<ExternalSigner> signers;
+                ExternalSigner::Enumerate(command, signers, chain);
+                for (ExternalSigner signer : signers) {
+                    UniValue signer_res = UniValue::VOBJ;
+                    signer_res.pushKV("fingerprint", signer.m_fingerprint);
+                    signer_res.pushKV("name", signer.m_name);
+                    signers_res.push_back(signer_res);
+                }
+            } catch (const ExternalSignerException& e) {
+                throw JSONRPCError(RPC_MISC_ERROR, e.what());
+            }
+            UniValue result(UniValue::VOBJ);
+            result.pushKV("signers", signers_res);
+            return result;
+        }
+    };
+}
+
+void RegisterSignerRPCCommands(CRPCTable& t)
+{
+    static const CRPCCommand commands[]{
+        {"signer", &enumeratesigners},
+    };
+    for (const auto& c : commands) {
+        t.appendCommand(c.name, &c);
+    }
+}
+
+#endif // ENABLE_EXTERNAL_SIGNER
diff --git a/src/rpc/register.h b/src/rpc/register.h
index f6bbd57a7c60..04aede8e16b2 100644
--- a/src/rpc/register.h
+++ b/src/rpc/register.h
@@ -22,6 +22,8 @@ void RegisterNetRPCCommands(CRPCTable&);
 void RegisterOutputScriptRPCCommands(CRPCTable&);
 void RegisterRawTransactionRPCCommands(CRPCTable &tableRPC);
 void RegisterSignMessageRPCCommands(CRPCTable&);
+/** Register raw transaction RPC commands */
+void RegisterSignerRPCCommands(CRPCTable &tableRPC);
 void RegisterTxoutProofRPCCommands(CRPCTable&);
 void RegisterMasternodeRPCCommands(CRPCTable &tableRPC);
 void RegisterCoinJoinRPCCommands(CRPCTable &tableRPC);
@@ -48,6 +50,9 @@ static inline void RegisterAllCoreRPCCommands(CRPCTable &t)
     RegisterOutputScriptRPCCommands(t);
     RegisterRawTransactionRPCCommands(t);
     RegisterSignMessageRPCCommands(t);
+#ifdef ENABLE_EXTERNAL_SIGNER
+    RegisterSignerRPCCommands(t);
+#endif // ENABLE_EXTERNAL_SIGNER
     RegisterTxoutProofRPCCommands(t);
     RegisterMasternodeRPCCommands(t);
     RegisterCoinJoinRPCCommands(t);
diff --git a/src/wallet/external_signer_scriptpubkeyman.cpp b/src/wallet/external_signer_scriptpubkeyman.cpp
index 7e83485182df..493c40ad4c72 100644
--- a/src/wallet/external_signer_scriptpubkeyman.cpp
+++ b/src/wallet/external_signer_scriptpubkeyman.cpp
@@ -3,7 +3,7 @@
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
 #include <chainparams.h>
-#include <wallet/external_signer.h>
+#include <external_signer.h>
 #include <wallet/external_signer_scriptpubkeyman.h>
 
 #ifdef ENABLE_EXTERNAL_SIGNER
diff --git a/src/wallet/interfaces.cpp b/src/wallet/interfaces.cpp
index da7e45073b7c..a0f55c32fb2a 100644
--- a/src/wallet/interfaces.cpp
+++ b/src/wallet/interfaces.cpp
@@ -29,7 +29,6 @@
 #include <wallet/receive.h>
 #include <wallet/rpc/wallet.h>
 #include <wallet/spend.h>
-#include <wallet/rpcsigner.h>
 #include <wallet/wallet.h>
 #include <wallet/hdchain.h>
 #include <wallet/scriptpubkeyman.h>
@@ -647,17 +646,6 @@ class WalletLoaderImpl : public WalletLoader
             }, command.argNames, command.unique_id);
             m_rpc_handlers.emplace_back(m_context.chain->handleRpc(m_rpc_commands.back()));
         }
-
-#ifdef ENABLE_EXTERNAL_SIGNER
-        for (const CRPCCommand& command : GetSignerRPCCommands()) {
-            m_rpc_commands.emplace_back(command.category, command.name, [this, &command](const JSONRPCRequest& request, UniValue& result, bool last_handler) {
-                JSONRPCRequest wallet_request = request;
-                wallet_request.context = m_context;
-                return command.actor(wallet_request, result, last_handler);
-            }, command.argNames, command.unique_id);
-            m_rpc_handlers.emplace_back(m_context.chain->handleRpc(m_rpc_commands.back()));
-        }
-#endif
     }
 
 public:
diff --git a/src/wallet/rpc/addresses.cpp b/src/wallet/rpc/addresses.cpp
index 6058e621aa6f..f4a95c0bf25a 100644
--- a/src/wallet/rpc/addresses.cpp
+++ b/src/wallet/rpc/addresses.cpp
@@ -665,4 +665,47 @@ RPCHelpMan listlabels()
 },
     };
 }
+
+#ifdef ENABLE_EXTERNAL_SIGNER
+RPCHelpMan walletdisplayaddress()
+{
+    return RPCHelpMan{"walletdisplayaddress",
+        "Display address on an external signer for verification.",
+        {
+            {"address", RPCArg::Type::STR, RPCArg::Optional::NO, "dash address to display"},
+        },
+        RPCResult{
+            RPCResult::Type::OBJ,"","",
+            {
+                {RPCResult::Type::STR, "address", "The address as confirmed by the signer"},
+            }
+        },
+        RPCExamples{""},
+        [&](const RPCHelpMan& self, const JSONRPCRequest& request) -> UniValue
+        {
+            std::shared_ptr<CWallet> const wallet = GetWalletForJSONRPCRequest(request);
+            if (!wallet) return NullUniValue;
+            CWallet* const pwallet = wallet.get();
+
+            LOCK(pwallet->cs_wallet);
+
+            CTxDestination dest = DecodeDestination(request.params[0].get_str());
+
+            // Make sure the destination is valid
+            if (!IsValidDestination(dest)) {
+                throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "Invalid address");
+            }
+
+            if (!pwallet->DisplayAddress(dest)) {
+                throw JSONRPCError(RPC_MISC_ERROR, "Failed to display address");
+            }
+
+            UniValue result(UniValue::VOBJ);
+            result.pushKV("address", request.params[0].get_str());
+            return result;
+        }
+    };
+}
+#endif // ENABLE_EXTERNAL_SIGNER
+
 } // namespace wallet
diff --git a/src/wallet/rpc/wallet.cpp b/src/wallet/rpc/wallet.cpp
index 73ff15a7373e..34620a5d9c81 100644
--- a/src/wallet/rpc/wallet.cpp
+++ b/src/wallet/rpc/wallet.cpp
@@ -1102,6 +1102,9 @@ RPCHelpMan keypoolrefill();
 RPCHelpMan newkeypool();
 RPCHelpMan getaddressesbylabel();
 RPCHelpMan listlabels();
+#ifdef ENABLE_EXTERNAL_SIGNER
+RPCHelpMan walletdisplayaddress();
+#endif // ENABLE_EXTERNAL_SIGNER
 
 // backup
 RPCHelpMan dumpprivkey();
@@ -1225,6 +1228,9 @@ Span<const CRPCCommand> GetWalletRPCCommands()
         {"wallet", &unloadwallet},
         {"wallet", &upgradewallet},
         {"wallet", &upgradetohd},
+#ifdef ENABLE_EXTERNAL_SIGNER
+        {"wallet", &walletdisplayaddress},
+#endif // ENABLE_EXTERNAL_SIGNER
         {"wallet", &walletlock},
         {"wallet", &walletpassphrasechange},
         {"wallet", &walletpassphrase},
diff --git a/src/wallet/rpcsigner.cpp b/src/wallet/rpcsigner.cpp
deleted file mode 100644
index 6b22cf0e3aa9..000000000000
--- a/src/wallet/rpcsigner.cpp
+++ /dev/null
@@ -1,105 +0,0 @@
-// Copyright (c) 2018-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 <chainparamsbase.h>
-#include <key_io.h>
-#include <rpc/server.h>
-#include <util/strencodings.h>
-#include <wallet/rpcsigner.h>
-#include <wallet/rpc/wallet.h>
-#include <wallet/rpc/util.h>
-#include <wallet/wallet.h>
-
-#ifdef ENABLE_EXTERNAL_SIGNER
-
-namespace wallet {
-static RPCHelpMan enumeratesigners()
-{
-    return RPCHelpMan{
-        "enumeratesigners",
-        "Returns a list of external signers from -signer.",
-        {},
-        RPCResult{
-            RPCResult::Type::OBJ, "", "",
-            {
-                {RPCResult::Type::ARR, "signers", /*optional=*/false, "",
-                {
-                    {RPCResult::Type::STR_HEX, "masterkeyfingerprint", "Master key fingerprint"},
-                    {RPCResult::Type::STR, "name", "Device name"},
-                },
-                }
-            }
-        },
-        RPCExamples{""},
-        [](const RPCHelpMan& self, const JSONRPCRequest& request) -> UniValue {
-            const std::string command = gArgs.GetArg("-signer", "");
-            if (command == "") throw JSONRPCError(RPC_WALLET_ERROR, "Error: restart dashd with -signer=<cmd>");
-            std::string chain = gArgs.GetChainName();
-            UniValue signers_res = UniValue::VARR;
-            try {
-                std::vector<ExternalSigner> signers;
-                ExternalSigner::Enumerate(command, signers, chain);
-                for (ExternalSigner signer : signers) {
-                    UniValue signer_res = UniValue::VOBJ;
-                    signer_res.pushKV("fingerprint", signer.m_fingerprint);
-                    signer_res.pushKV("name", signer.m_name);
-                    signers_res.push_back(signer_res);
-                }
-            } catch (const ExternalSignerException& e) {
-                throw JSONRPCError(RPC_WALLET_ERROR, e.what());
-            }
-            UniValue result(UniValue::VOBJ);
-            result.pushKV("signers", signers_res);
-            return result;
-        }
-    };
-}
-
-static RPCHelpMan signerdisplayaddress()
-{
-    return RPCHelpMan{
-        "signerdisplayaddress",
-        "Display address on an external signer for verification.\n",
-        {
-            {"address", RPCArg::Type::STR, RPCArg::Optional::NO, "dash address to display"},
-        },
-        RPCResult{RPCResult::Type::NONE,"",""},
-        RPCExamples{""},
-        [](const RPCHelpMan& self, const JSONRPCRequest& request) -> UniValue {
-            std::shared_ptr<CWallet> const wallet = GetWalletForJSONRPCRequest(request);
-            if (!wallet) return NullUniValue;
-            CWallet* const pwallet = wallet.get();
-
-            LOCK(pwallet->cs_wallet);
-
-            CTxDestination dest = DecodeDestination(request.params[0].get_str());
-
-            // Make sure the destination is valid
-            if (!IsValidDestination(dest)) {
-                throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "Invalid address");
-            }
-
-            if (!pwallet->DisplayAddress(dest)) {
-                throw JSONRPCError(RPC_WALLET_ERROR, "Failed to display address");
-            }
-
-            UniValue result(UniValue::VOBJ);
-            result.pushKV("address", request.params[0].get_str());
-            return result;
-        }
-    };
-}
-
-Span<const CRPCCommand> GetSignerRPCCommands()
-{
-    static const CRPCCommand commands[]{
-        {"signer", &enumeratesigners},
-        {"signer", &signerdisplayaddress},
-    };
-    return commands;
-}
-} // namespace wallet
-
-
-#endif // ENABLE_EXTERNAL_SIGNER
diff --git a/src/wallet/rpcsigner.h b/src/wallet/rpcsigner.h
deleted file mode 100644
index ccd2e993a8d3..000000000000
--- a/src/wallet/rpcsigner.h
+++ /dev/null
@@ -1,26 +0,0 @@
-// Copyright (c) 2018-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.
-
-#ifndef BITCOIN_WALLET_RPCSIGNER_H
-#define BITCOIN_WALLET_RPCSIGNER_H
-
-#include <span.h>
-#include <util/system.h>
-#include <vector>
-
-#ifdef ENABLE_EXTERNAL_SIGNER
-
-class CRPCCommand;
-
-namespace interfaces {
-class Chain;
-class Handler;
-}
-namespace wallet {
-Span<const CRPCCommand> GetSignerRPCCommands();
-} // namespace
-
-#endif // ENABLE_EXTERNAL_SIGNER
-
-#endif //BITCOIN_WALLET_RPCSIGNER_H
diff --git a/src/wallet/scriptpubkeyman.cpp b/src/wallet/scriptpubkeyman.cpp
index 1e14989e4a7c..910b4b1eaf3e 100644
--- a/src/wallet/scriptpubkeyman.cpp
+++ b/src/wallet/scriptpubkeyman.cpp
@@ -14,7 +14,7 @@
 #include <util/system.h>
 #include <util/translation.h>
 #include <wallet/bip39.h>
-#include <wallet/external_signer.h>
+#include <external_signer.h>
 #include <wallet/scriptpubkeyman.h>
 
 namespace wallet {
diff --git a/src/wallet/wallet.h b/src/wallet/wallet.h
index 74b34da96af7..db770a488d0f 100644
--- a/src/wallet/wallet.h
+++ b/src/wallet/wallet.h
@@ -27,7 +27,7 @@
 #include <validationinterface.h>
 #include <wallet/crypter.h>
 #include <wallet/coinselection.h>
-#include <wallet/external_signer.h>
+#include <external_signer.h>
 #include <wallet/scriptpubkeyman.h>
 #include <wallet/transaction.h>
 #include <wallet/walletdb.h>
diff --git a/test/functional/rpc_signer.py b/test/functional/rpc_signer.py
new file mode 100755
index 000000000000..2c17bc6a16e3
--- /dev/null
+++ b/test/functional/rpc_signer.py
@@ -0,0 +1,79 @@
+#!/usr/bin/env python3
+# Copyright (c) 2017-2018 The Bitcoin Core developers
+# Distributed under the MIT software license, see the accompanying
+# file COPYING or http://www.opensource.org/licenses/mit-license.php.
+"""Test external signer.
+
+Verify that a bitcoind node can use an external signer command.
+See also wallet_signer.py for tests that require wallet context.
+"""
+import os
+import platform
+
+from test_framework.test_framework import BitcoinTestFramework
+from test_framework.util import (
+    assert_equal,
+    assert_raises_rpc_error,
+)
+
+
+class RPCSignerTest(BitcoinTestFramework):
+    def mock_signer_path(self):
+        path = os.path.join(os.path.dirname(os.path.realpath(__file__)), 'mocks', 'signer.py')
+        if platform.system() == "Windows":
+            return "py " + path
+        else:
+            return path
+
+    def set_test_params(self):
+        self.num_nodes = 4
+
+        self.extra_args = [
+            [],
+            [f"-signer={self.mock_signer_path()}", '-keypool=10'],
+            [f"-signer={self.mock_signer_path()}", '-keypool=10'],
+            ["-signer=fake.py"],
+        ]
+
+    def skip_test_if_missing_module(self):
+        self.skip_if_no_external_signer()
+
+    def set_mock_result(self, node, res):
+        with open(os.path.join(node.cwd, "mock_result"), "w", encoding="utf8") as f:
+            f.write(res)
+
+    def clear_mock_result(self, node):
+        os.remove(os.path.join(node.cwd, "mock_result"))
+
+    def run_test(self):
+        self.log.debug(f"-signer={self.mock_signer_path()}")
+
+        assert_raises_rpc_error(-1, 'Error: restart dashd with -signer=<cmd>',
+            self.nodes[0].enumeratesigners
+        )
+
+        # Handle script missing:
+        assert_raises_rpc_error(-1, 'execve failed: No such file or directory',
+            self.nodes[3].enumeratesigners
+        )
+
+        # Handle error thrown by script
+        self.set_mock_result(self.nodes[1], "2")
+        assert_raises_rpc_error(-1, 'RunCommandParseJSON error',
+            self.nodes[1].enumeratesigners
+        )
+        self.clear_mock_result(self.nodes[1])
+
+        self.set_mock_result(self.nodes[1], '0 [{"type": "trezor", "model": "trezor_t", "error": "fingerprint not found"}]')
+        assert_raises_rpc_error(-1, 'fingerprint not found',
+            self.nodes[1].enumeratesigners
+        )
+        self.clear_mock_result(self.nodes[1])
+
+        result = self.nodes[1].enumeratesigners()
+        assert_equal(len(result['signers']), 2)
+        assert_equal(result['signers'][0]["fingerprint"], "00000001")
+        assert_equal(result['signers'][0]["name"], "trezor_t")
+
+if __name__ == '__main__':
+    RPCSignerTest().main()
diff --git a/test/functional/test_runner.py b/test/functional/test_runner.py
index 5d82df9ed0b9..ae34b32819c6 100755
--- a/test/functional/test_runner.py
+++ b/test/functional/test_runner.py
@@ -145,6 +145,7 @@
     'feature_governance_cl.py --descriptors',
     'rpc_verifyislock.py',
     'feature_notifications.py',
+    'rpc_signer.py',
     'wallet_signer.py --descriptors',
     # vv Tests less than 60s vv
     'p2p_platform_ban.py', # NOTE: needs dash_hash to pass
diff --git a/test/functional/wallet_signer.py b/test/functional/wallet_signer.py
index 6b9aad152e85..84eb409f609a 100755
--- a/test/functional/wallet_signer.py
+++ b/test/functional/wallet_signer.py
@@ -5,6 +5,7 @@
 """Test external signer.
 
 Verify that a bitcoind node can use an external signer command
+See also rpc_signer.py for tests without wallet context.
 """
 import os
 import platform
@@ -16,7 +17,7 @@
 )
 
 
-class SignerTest(BitcoinTestFramework):
+class WalletSignerTest(BitcoinTestFramework):
     def mock_signer_path(self):
         path = os.path.join(os.path.dirname(os.path.realpath(__file__)), 'mocks', 'signer.py')
         if platform.system() == "Windows":
@@ -25,18 +26,16 @@ def mock_signer_path(self):
             return path
 
     def set_test_params(self):
-        self.num_nodes = 4
+        self.num_nodes = 2
 
         self.extra_args = [
             [],
             [f"-signer={self.mock_signer_path()}", '-keypool=10'],
-            [f"-signer={self.mock_signer_path()}", '-keypool=10'],
-            ["-signer=fake.py"],
         ]
 
     def skip_test_if_missing_module(self):
-        self.skip_if_no_wallet()
         self.skip_if_no_external_signer()
+        self.skip_if_no_wallet()
 
     def set_mock_result(self, node, res):
         with open(os.path.join(node.cwd, "mock_result"), "w", encoding="utf8") as f:
@@ -48,28 +47,6 @@ def clear_mock_result(self, node):
     def run_test(self):
         self.log.debug(f"-signer={self.mock_signer_path()}")
 
-        assert_raises_rpc_error(-4, 'Error: restart dashd with -signer=<cmd>',
-            self.nodes[0].enumeratesigners
-        )
-
-        # Handle script missing:
-        assert_raises_rpc_error(-1, 'execve failed: No such file or directory',
-            self.nodes[3].enumeratesigners
-        )
-
-        # Handle error thrown by script
-        self.set_mock_result(self.nodes[1], "2")
-        assert_raises_rpc_error(-1, 'RunCommandParseJSON error',
-            self.nodes[1].enumeratesigners
-        )
-        self.clear_mock_result(self.nodes[1])
-
-        self.set_mock_result(self.nodes[1], '0 [{"type": "trezor", "model": "trezor_t", "error": "fingerprint not found"}]')
-        assert_raises_rpc_error(-4, 'fingerprint not found',
-            self.nodes[1].enumeratesigners
-        )
-        self.clear_mock_result(self.nodes[1])
-
         # Create new wallets for an external signer.
         # disable_private_keys and descriptors must be true:
         assert_raises_rpc_error(-4, "Private keys must be disabled when using an external signer", self.nodes[1].createwallet, wallet_name='not_hww', disable_private_keys=False, descriptors=True, external_signer=True)
@@ -81,11 +58,6 @@ def run_test(self):
         self.nodes[1].createwallet(wallet_name='hww', disable_private_keys=True, descriptors=True, external_signer=True)
         hww = self.nodes[1].get_wallet_rpc('hww')
 
-        result = hww.enumeratesigners()
-        assert_equal(len(result['signers']), 2)
-        assert_equal(result['signers'][0]["fingerprint"], "00000001")
-        assert_equal(result['signers'][0]["name"], "trezor_t")
-
         # Flag can't be set afterwards (could be added later for non-blank descriptor based watch-only wallets)
         self.nodes[1].createwallet(wallet_name='not_hww', disable_private_keys=True, descriptors=True, external_signer=False)
         not_hww = self.nodes[1].get_wallet_rpc('not_hww')
@@ -110,14 +82,14 @@ def run_test(self):
         assert_equal(address_info['hdkeypath'], "m/44'/1'/0'/0/0")
         address1 = address3
 
-        self.log.info('Test signerdisplayaddress')
-        result = hww.signerdisplayaddress(address1)
+        self.log.info('Test walletdisplayaddress')
+        result = hww.walletdisplayaddress(address1)
         assert_equal(result, {"address": address1})
 
         # Handle error thrown by script
         self.set_mock_result(self.nodes[1], "2")
         assert_raises_rpc_error(-1, 'RunCommandParseJSON error',
-            hww.signerdisplayaddress, address1
+            hww.walletdisplayaddress, address1
         )
         self.clear_mock_result(self.nodes[1])
 
@@ -200,4 +172,4 @@ def run_test(self):
         # self.clear_mock_result(self.nodes[4])
 
 if __name__ == '__main__':
-    SignerTest().main()
+    WalletSignerTest().main()

From 2ebf7ca8438174c079391ab0e5526705eaad47ab Mon Sep 17 00:00:00 2001
From: fanquake <fanquake@gmail.com>
Date: Wed, 14 Apr 2021 09:36:41 +0800
Subject: [PATCH 587/656] Merge #21666: Miscellaneous external signer changes

c8f469c6d50a8db6d92f0aed47a5d1cc82f30f7f external_signer: remove ExternalSignerException (fanquake)
9e0b199b976617edeb1c58d4203df5f83a26c1e3 external_signer: use const where appropriate (fanquake)
aaa4e5a45bd9ec5563ffa7b9e0d46d2de3cb9242 wallet: remove CWallet::GetExternalSigner() (fanquake)
06a0673351282fff1673f3679a7cad9a7faaf987 external_signer: remove ignore_errors from Enumerate() (fanquake)
8fdbb899b84a2be85e632e45f08b222db02395d9 refactor: unify external wallet runtime errors (fanquake)
f4652bf1259d5c52ff0d500c732f40ba41256817 refactor: add missing includes to external signer code (fanquake)
54569cc6d6f54788169061004026e62e1c08440e refactor: move all signer code inside ENABLE_EXTERNAL_SIGNER #ifdefs (fanquake)

Pull request description:

  These are a few followups after #21467.

ACKs for top commit:
  Sjors:
    tACK c8f469c6d50a8db6d92f0aed47a5d1cc82f30f7f
  instagibbs:
    utACK https://github.com/bitcoin/bitcoin/pull/21666/commits/c8f469c6d50a8db6d92f0aed47a5d1cc82f30f7f

Tree-SHA512: 3d5ac5df81680075e71e0e4a7595c520d746c3e37f016cf168c1e10da15541ebb1595aecaf2c08575636e9ff77d499644cae53180232b7049cfae0b923106e4e
---
 src/external_signer.cpp                       | 37 ++++++++++---------
 src/external_signer.h                         | 23 +++++-------
 src/rpc/external_signer.cpp                   |  9 +++--
 .../external_signer_scriptpubkeyman.cpp       |  7 ++++
 src/wallet/external_signer_scriptpubkeyman.h  |  2 +
 src/wallet/rpc/wallet.cpp                     |  2 +-
 src/wallet/wallet.cpp                         | 21 ++---------
 src/wallet/wallet.h                           |  3 --
 8 files changed, 49 insertions(+), 55 deletions(-)

diff --git a/src/external_signer.cpp b/src/external_signer.cpp
index 58bb124c087f..6ef913e80783 100644
--- a/src/external_signer.cpp
+++ b/src/external_signer.cpp
@@ -9,43 +9,44 @@
 #include <util/system.h>
 #include <external_signer.h>
 
-ExternalSigner::ExternalSigner(const std::string& command, const std::string& fingerprint, std::string chain, std::string name): m_command(command), m_fingerprint(fingerprint), m_chain(chain), m_name(name) {}
+#include <stdexcept>
+#include <string>
+#include <vector>
+
+#ifdef ENABLE_EXTERNAL_SIGNER
+
+ExternalSigner::ExternalSigner(const std::string& command, const std::string& fingerprint, const std::string chain, const std::string name): m_command(command), m_fingerprint(fingerprint), m_chain(chain), m_name(name) {}
 
 std::string ExternalSigner::NetworkArg() const
 {
     return " --chain " + m_chain;
 }
 
-#ifdef ENABLE_EXTERNAL_SIGNER
-
-bool ExternalSigner::Enumerate(const std::string& command, std::vector<ExternalSigner>& signers, std::string chain, bool ignore_errors)
+bool ExternalSigner::Enumerate(const std::string& command, std::vector<ExternalSigner>& signers, const std::string chain)
 {
     // Call <command> enumerate
     const UniValue result = RunCommandParseJSON(command + " enumerate");
     if (!result.isArray()) {
-        if (ignore_errors) return false;
-        throw ExternalSignerException(strprintf("'%s' received invalid response, expected array of signers", command));
+        throw std::runtime_error(strprintf("'%s' received invalid response, expected array of signers", command));
     }
     for (UniValue signer : result.getValues()) {
         // Check for error
         const UniValue& error = signer.find_value("error");
         if (!error.isNull()) {
-            if (ignore_errors) return false;
             if (!error.isStr()) {
-                throw ExternalSignerException(strprintf("'%s' error", command));
+                throw std::runtime_error(strprintf("'%s' error", command));
             }
-            throw ExternalSignerException(strprintf("'%s' error: %s", command, error.getValStr()));
+            throw std::runtime_error(strprintf("'%s' error: %s", command, error.getValStr()));
         }
         // Check if fingerprint is present
         const UniValue& fingerprint = signer.find_value("fingerprint");
         if (fingerprint.isNull()) {
-            if (ignore_errors) return false;
-            throw ExternalSignerException(strprintf("'%s' received invalid response, missing signer fingerprint", command));
+            throw std::runtime_error(strprintf("'%s' received invalid response, missing signer fingerprint", command));
         }
-        std::string fingerprintStr = fingerprint.get_str();
+        const std::string fingerprintStr = fingerprint.get_str();
         // Skip duplicate signer
         bool duplicate = false;
-        for (ExternalSigner signer : signers) {
+        for (const ExternalSigner& signer : signers) {
             if (signer.m_fingerprint.compare(fingerprintStr) == 0) duplicate = true;
         }
         if (duplicate) break;
@@ -64,7 +65,7 @@ UniValue ExternalSigner::DisplayAddress(const std::string& descriptor) const
     return RunCommandParseJSON(m_command + " --fingerprint \"" + m_fingerprint + "\"" + NetworkArg() + " displayaddress --desc \"" + descriptor + "\"");
 }
 
-UniValue ExternalSigner::GetDescriptors(int account)
+UniValue ExternalSigner::GetDescriptors(const int account)
 {
     return RunCommandParseJSON(m_command + " --fingerprint \"" + m_fingerprint + "\"" + NetworkArg() + " getdescriptors --account " + strprintf("%d", account));
 }
@@ -79,7 +80,7 @@ bool ExternalSigner::SignTransaction(PartiallySignedTransaction& psbtx, std::str
     bool match = false;
     for (unsigned int i = 0; i < psbtx.inputs.size(); ++i) {
         const PSBTInput& input = psbtx.inputs[i];
-        for (auto entry : input.hd_keypaths) {
+        for (const auto& entry : input.hd_keypaths) {
             if (m_fingerprint == strprintf("%08x", ReadBE32(entry.second.fingerprint))) match = true;
         }
     }
@@ -89,8 +90,8 @@ bool ExternalSigner::SignTransaction(PartiallySignedTransaction& psbtx, std::str
         return false;
     }
 
-    std::string command = m_command + " --stdin --fingerprint \"" + m_fingerprint + "\"" + NetworkArg();
-    std::string stdinStr = "signtx \"" + EncodeBase64(ssTx.str()) + "\"";
+    const std::string command = m_command + " --stdin --fingerprint \"" + m_fingerprint + "\"" + NetworkArg();
+    const std::string stdinStr = "signtx \"" + EncodeBase64(ssTx.str()) + "\"";
 
     const UniValue signer_result = RunCommandParseJSON(command, stdinStr);
 
@@ -116,4 +117,4 @@ bool ExternalSigner::SignTransaction(PartiallySignedTransaction& psbtx, std::str
     return true;
 }
 
-#endif
+#endif // ENABLE_EXTERNAL_SIGNER
diff --git a/src/external_signer.h b/src/external_signer.h
index ac978a515adf..4138a36f428d 100644
--- a/src/external_signer.h
+++ b/src/external_signer.h
@@ -5,17 +5,15 @@
 #ifndef BITCOIN_EXTERNAL_SIGNER_H
 #define BITCOIN_EXTERNAL_SIGNER_H
 
-#include <stdexcept>
-#include <string>
 #include <univalue.h>
 #include <util/system.h>
 
-struct PartiallySignedTransaction;
+#include <string>
+#include <vector>
 
-class ExternalSignerException : public std::runtime_error {
-public:
-    using std::runtime_error::runtime_error;
-};
+#ifdef ENABLE_EXTERNAL_SIGNER
+
+struct PartiallySignedTransaction;
 
 //! Enables interaction with an external signing device or service, such as
 //! a hardware wallet. See doc/external-signer.md
@@ -30,7 +28,7 @@ class ExternalSigner
     //! @param[in] fingerprint  master key fingerprint of the signer
     //! @param[in] chain        "main", "test", "regtest" or "signet"
     //! @param[in] name         device name
-    ExternalSigner(const std::string& command, const std::string& fingerprint, std::string chain, std::string name);
+    ExternalSigner(const std::string& command, const std::string& fingerprint, const std::string chain, const std::string name);
 
     //! Master key fingerprint of the signer
     std::string m_fingerprint;
@@ -43,13 +41,12 @@ class ExternalSigner
 
     std::string NetworkArg() const;
 
-#ifdef ENABLE_EXTERNAL_SIGNER
     //! Obtain a list of signers. Calls `<command> enumerate`.
     //! @param[in]              command the command which handles interaction with the external signer
     //! @param[in,out] signers  vector to which new signers (with a unique master key fingerprint) are added
     //! @param chain            "main", "test", "regtest" or "signet"
     //! @returns success
-    static bool Enumerate(const std::string& command, std::vector<ExternalSigner>& signers, std::string chain, bool ignore_errors = false);
+    static bool Enumerate(const std::string& command, std::vector<ExternalSigner>& signers, const std::string chain);
 
     //! Display address on the device. Calls `<command> displayaddress --desc <descriptor>`.
     //! @param[in] descriptor Descriptor specifying which address to display.
@@ -60,14 +57,14 @@ class ExternalSigner
     //! Calls `<command> getdescriptors --account <account>`
     //! @param[in] account  which BIP32 account to use (e.g. `m/44'/0'/account'`)
     //! @returns see doc/external-signer.md
-    UniValue GetDescriptors(int account);
+    UniValue GetDescriptors(const int account);
 
     //! Sign PartiallySignedTransaction on the device.
     //! Calls `<command> signtransaction` and passes the PSBT via stdin.
     //! @param[in,out] psbt  PartiallySignedTransaction to be signed
     bool SignTransaction(PartiallySignedTransaction& psbt, std::string& error);
-
-#endif
 };
 
+#endif // ENABLE_EXTERNAL_SIGNER
+
 #endif // BITCOIN_EXTERNAL_SIGNER_H
diff --git a/src/rpc/external_signer.cpp b/src/rpc/external_signer.cpp
index 1790baf71ea2..91a21f4e4d5b 100644
--- a/src/rpc/external_signer.cpp
+++ b/src/rpc/external_signer.cpp
@@ -8,6 +8,9 @@
 #include <util/strencodings.h>
 #include <rpc/protocol.h>
 
+#include <string>
+#include <vector>
+
 #ifdef ENABLE_EXTERNAL_SIGNER
 
 static RPCHelpMan enumeratesigners()
@@ -34,18 +37,18 @@ static RPCHelpMan enumeratesigners()
         {
             const std::string command = gArgs.GetArg("-signer", "");
             if (command == "") throw JSONRPCError(RPC_MISC_ERROR, "Error: restart dashd with -signer=<cmd>");
-            std::string chain = gArgs.GetChainName();
+            const std::string chain = gArgs.GetChainName();
             UniValue signers_res = UniValue::VARR;
             try {
                 std::vector<ExternalSigner> signers;
                 ExternalSigner::Enumerate(command, signers, chain);
-                for (ExternalSigner signer : signers) {
+                for (const ExternalSigner& signer : signers) {
                     UniValue signer_res = UniValue::VOBJ;
                     signer_res.pushKV("fingerprint", signer.m_fingerprint);
                     signer_res.pushKV("name", signer.m_name);
                     signers_res.push_back(signer_res);
                 }
-            } catch (const ExternalSignerException& e) {
+            } catch (const std::exception& e) {
                 throw JSONRPCError(RPC_MISC_ERROR, e.what());
             }
             UniValue result(UniValue::VOBJ);
diff --git a/src/wallet/external_signer_scriptpubkeyman.cpp b/src/wallet/external_signer_scriptpubkeyman.cpp
index 493c40ad4c72..cec9b47ff1d4 100644
--- a/src/wallet/external_signer_scriptpubkeyman.cpp
+++ b/src/wallet/external_signer_scriptpubkeyman.cpp
@@ -6,6 +6,13 @@
 #include <external_signer.h>
 #include <wallet/external_signer_scriptpubkeyman.h>
 
+#include <iostream>
+#include <memory>
+#include <stdexcept>
+#include <string>
+#include <utility>
+#include <vector>
+
 #ifdef ENABLE_EXTERNAL_SIGNER
 
 namespace wallet {
diff --git a/src/wallet/external_signer_scriptpubkeyman.h b/src/wallet/external_signer_scriptpubkeyman.h
index ac3adaa45a37..1f31f0238589 100644
--- a/src/wallet/external_signer_scriptpubkeyman.h
+++ b/src/wallet/external_signer_scriptpubkeyman.h
@@ -8,6 +8,8 @@
 #ifdef ENABLE_EXTERNAL_SIGNER
 #include <wallet/scriptpubkeyman.h>
 
+#include <memory>
+
 namespace wallet {
 class ExternalSignerScriptPubKeyMan : public DescriptorScriptPubKeyMan
 {
diff --git a/src/wallet/rpc/wallet.cpp b/src/wallet/rpc/wallet.cpp
index 34620a5d9c81..eca4d456a869 100644
--- a/src/wallet/rpc/wallet.cpp
+++ b/src/wallet/rpc/wallet.cpp
@@ -677,7 +677,7 @@ static RPCHelpMan createwallet()
 #ifdef ENABLE_EXTERNAL_SIGNER
         flags |= WALLET_FLAG_EXTERNAL_SIGNER;
 #else
-        throw JSONRPCError(RPC_WALLET_ERROR, "Configure with --enable-external-signer to use this");
+        throw JSONRPCError(RPC_WALLET_ERROR, "Compiled without external signing support (required for external signing)");
 #endif
     }
 
diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp
index dc885d3d6b15..6636d273ef25 100644
--- a/src/wallet/wallet.cpp
+++ b/src/wallet/wallet.cpp
@@ -2501,19 +2501,6 @@ void ReserveDestination::ReturnDestination()
     address = CNoDestination();
 }
 
-#ifdef ENABLE_EXTERNAL_SIGNER
-ExternalSigner CWallet::GetExternalSigner()
-{
-    const std::string command = gArgs.GetArg("-signer", "");
-    if (command == "") throw std::runtime_error(std::string(__func__) + ": restart dashd with -signer=<cmd>");
-    std::vector<ExternalSigner> signers;
-    ExternalSigner::Enumerate(command, signers, Params().NetworkIDString());
-    if (signers.empty()) throw std::runtime_error(std::string(__func__) + ": No external signers found");
-    // TODO: add fingerprint argument in case of multiple signers
-    return signers[0];
-}
-#endif
-
 bool CWallet::DisplayAddress(const CTxDestination& dest)
 {
 #ifdef ENABLE_EXTERNAL_SIGNER
@@ -2526,7 +2513,7 @@ bool CWallet::DisplayAddress(const CTxDestination& dest)
     if (signer_spk_man == nullptr) {
         return false;
     }
-    ExternalSigner signer = GetExternalSigner(); // TODO: move signer in spk_man
+    ExternalSigner signer = ExternalSignerScriptPubKeyMan::GetExternalSigner();
     return signer_spk_man->DisplayAddress(scriptPubKey, signer);
 #else
     return false;
@@ -3819,7 +3806,7 @@ void CWallet::LoadDescriptorScriptPubKeyMan(uint256 id, WalletDescriptor& desc)
         auto spk_manager = std::unique_ptr<ScriptPubKeyMan>(new ExternalSignerScriptPubKeyMan(*this, desc));
         m_spk_managers[id] = std::move(spk_manager);
 #else
-        throw std::runtime_error(std::string(__func__) + ": Configure with --enable-external-signer to use external signer wallets");
+        throw std::runtime_error(std::string(__func__) + ": Compiled without external signing support (required for external signing)");
 #endif
     } else {
         auto spk_manager = std::unique_ptr<ScriptPubKeyMan>(new DescriptorScriptPubKeyMan(*this, desc));
@@ -3892,8 +3879,8 @@ void CWallet::SetupDescriptorScriptPubKeyMans(const SecureString& mnemonic_arg,
             }
         }
 #else
-        throw std::runtime_error(std::string(__func__) + ": Wallets with external signers require Boost::Process library.");
-#endif
+        throw std::runtime_error(std::string(__func__) + ": Compiled without external signing support (required for external signing)");
+#endif // ENABLE_EXTERNAL_SIGNER
     }
 }
 
diff --git a/src/wallet/wallet.h b/src/wallet/wallet.h
index db770a488d0f..bf427dd1b16a 100644
--- a/src/wallet/wallet.h
+++ b/src/wallet/wallet.h
@@ -561,9 +561,6 @@ class CWallet final : public WalletStorage, public interfaces::Chain::Notificati
 
     void RecalculateMixedCredit(const uint256 hash) EXCLUSIVE_LOCKS_REQUIRED(cs_wallet);
 
-#ifdef ENABLE_EXTERNAL_SIGNER
-    ExternalSigner GetExternalSigner() EXCLUSIVE_LOCKS_REQUIRED(cs_wallet);
-#endif
     /** Display address on an external signer. Returns false if external signer support is not compiled */
     bool DisplayAddress(const CTxDestination& dest) EXCLUSIVE_LOCKS_REQUIRED(cs_wallet);
 

From 38911c726bd9a69df3090023bd2a187247f76264 Mon Sep 17 00:00:00 2001
From: Samuel Dobson <dobsonsa68@gmail.com>
Date: Wed, 9 Jun 2021 18:17:26 +1200
Subject: [PATCH 588/656] Merge bitcoin-core/gui#4: UI external signer support
 (e.g. hardware wallet)

1c4b456e1a0ccf0397d652f8c18201c3224c5c21 gui: send using external signer (Sjors Provoost)
24815c6309431cb0797defaf7add1150bcf4b567 gui: wallet creation detects external signer (Sjors Provoost)
3f845ea2994f53e29abeb3fa158c35f1ee56e7e8 node: add externalSigners to interface (Sjors Provoost)
62ac119f919ae1160ed67af796f24b78025fa8e3 gui: display address on external signer (Sjors Provoost)
450cb40a344605dda3bcc39495c35869580b9fc2 wallet: add displayAddress to interface (Sjors Provoost)
eef8d6452962cd4a8956d9ad268164715365b9ab gui: create wallet with external signer (Sjors Provoost)
6cdbc83e9341d1552faee4ccd8c190babc63e8d1 gui: add external signer path to options dialog (Sjors Provoost)

Pull request description:

  Big picture overview in [this gist](https://gist.github.com/Sjors/29d06728c685e6182828c1ce9b74483d).

  This PR adds GUI support for external signers, based on the since merged bitcoin/bitcoin#16546 (RPC).

  The UX isn't amazing - especially the blocking calls - but it works.

  First we adds a GUI setting for the signer script (e.g. path to HWI):

  <img width="625" alt="Schermafbeelding 2019-08-05 om 19 32 59" src="https://user-images.githubusercontent.com/10217/62483415-e1ff1680-b7b7-11e9-97ca-8d2ce54ca1cb.png">

  Then we add an external signer checkbox to the wallet creation dialog:

  <img width="374" alt="Schermafbeelding 2019-11-07 om 19 17 23" src="https://user-images.githubusercontent.com/10217/68416387-b57ee000-0194-11ea-9730-127d60273008.png">

  It's checked by default if HWI detects a device. It also grabs the name. It then creates a fresh wallet and imports the keys.

  You can verify an address on the device (blocking...):
  <img width="673" alt="Schermafbeelding 2019-08-05 om 19 29 22" src="https://user-images.githubusercontent.com/10217/62483560-43bf8080-b7b8-11e9-9902-8a036116dc4b.png">

  Sending, including coin selection, Just Works(tm) as long the device is present.

  ~External signer support is enabled by default when the GUI is configured and Boost::Process is present.~

  External signer support remains disabled by default, see https://github.com/bitcoin/bitcoin/pull/21935.

ACKs for top commit:
  achow101:
    Code Review ACK 1c4b456e1a0ccf0397d652f8c18201c3224c5c21
  hebasto:
    ACK 1c4b456e1a0ccf0397d652f8c18201c3224c5c21, tested on Linux Mint 20.1 (Qt 5.12.8) with HWW `2.0.2-rc.1`.
  promag:
    Tested ACK 1c4b456e1a0ccf0397d652f8c18201c3224c5c21 but rebased with e033ca1379, with HWI 2.0.2, with Nano S and Nano X.
  meshcollider:
    re-code-review ACK 1c4b456e1a0ccf0397d652f8c18201c3224c5c21

Tree-SHA512: 3503113c5c69d40adb6ce364d8e7cae23ce82d032a00474ba9aeb6202eb70f496ef4a6bf2e623e5171e524ad31ade7941a4e0e89539c64518aaec74f4562d86b
---
 src/interfaces/node.h                |  6 +++
 src/interfaces/wallet.h              |  6 +++
 src/node/interfaces.cpp              | 10 ++++
 src/qt/createwalletdialog.cpp        | 66 +++++++++++++++++++++++-
 src/qt/createwalletdialog.h          |  9 ++++
 src/qt/forms/createwalletdialog.ui   | 11 ++++
 src/qt/forms/optionsdialog.ui        | 30 +++++++++++
 src/qt/forms/receiverequestdialog.ui | 13 +++++
 src/qt/optionsdialog.cpp             |  2 +
 src/qt/optionsmodel.cpp              | 15 ++++++
 src/qt/optionsmodel.h                |  1 +
 src/qt/receiverequestdialog.cpp      |  6 +++
 src/qt/sendcoinsdialog.cpp           | 75 +++++++++++++++++++++++-----
 src/qt/walletcontroller.cpp          | 15 ++++++
 src/qt/walletmodel.cpp               | 13 +++++
 src/qt/walletmodel.h                 |  2 +
 src/qt/walletmodeltransaction.cpp    |  5 ++
 src/qt/walletmodeltransaction.h      |  2 +
 src/wallet/interfaces.cpp            |  6 +++
 19 files changed, 280 insertions(+), 13 deletions(-)

diff --git a/src/interfaces/node.h b/src/interfaces/node.h
index 7646fc7f1ea1..73ca5a16a9be 100644
--- a/src/interfaces/node.h
+++ b/src/interfaces/node.h
@@ -6,6 +6,7 @@
 #define BITCOIN_INTERFACES_NODE_H
 
 #include <consensus/amount.h>          // For CAmount
+#include <external_signer.h>
 #include <net.h>                       // For NodeId
 #include <net_types.h>                 // For banmap_t
 #include <netaddress.h>                // For Network
@@ -240,6 +241,11 @@ class Node
     //! Disconnect node by id.
     virtual bool disconnectById(NodeId id) = 0;
 
+#ifdef ENABLE_EXTERNAL_SIGNER
+    //! List external signers
+    virtual std::vector<ExternalSigner> externalSigners() = 0;
+#endif
+
     //! Get total bytes recv.
     virtual int64_t getTotalBytesRecv() = 0;
 
diff --git a/src/interfaces/wallet.h b/src/interfaces/wallet.h
index 56a2f595e666..e9f209df28f4 100644
--- a/src/interfaces/wallet.h
+++ b/src/interfaces/wallet.h
@@ -151,6 +151,9 @@ class Wallet
     //! Save or remove receive request.
     virtual bool setAddressReceiveRequest(const CTxDestination& dest, const std::string& id, const std::string& value) = 0;
 
+    //! Display address on external signer
+    virtual bool displayAddress(const CTxDestination& dest) = 0;
+
     //! Lock coin.
     virtual bool lockCoin(const COutPoint& output, const bool write_to_db) = 0;
 
@@ -288,6 +291,9 @@ class Wallet
     // Return whether private keys enabled.
     virtual bool privateKeysDisabled() = 0;
 
+    // Return whether wallet uses an external signer.
+    virtual bool hasExternalSigner() = 0;
+
     //! Get max tx fee.
     virtual CAmount getDefaultMaxTxFee() = 0;
 
diff --git a/src/node/interfaces.cpp b/src/node/interfaces.cpp
index 8d8579b62e2f..b0c0fb7a8cb6 100644
--- a/src/node/interfaces.cpp
+++ b/src/node/interfaces.cpp
@@ -555,6 +555,16 @@ class NodeImpl : public Node
         }
         return false;
     }
+#ifdef ENABLE_EXTERNAL_SIGNER
+    std::vector<ExternalSigner> externalSigners() override
+    {
+        std::vector<ExternalSigner> signers = {};
+        const std::string command = gArgs.GetArg("-signer", "");
+        if (command == "") return signers;
+        ExternalSigner::Enumerate(command, signers, Params().NetworkIDString());
+        return signers;
+    }
+#endif
     int64_t getTotalBytesRecv() override { return m_context->connman ? m_context->connman->GetTotalBytesRecv() : 0; }
     int64_t getTotalBytesSent() override { return m_context->connman ? m_context->connman->GetTotalBytesSent() : 0; }
     size_t getMempoolSize() override { return m_context->mempool ? m_context->mempool->size() : 0; }
diff --git a/src/qt/createwalletdialog.cpp b/src/qt/createwalletdialog.cpp
index e10eacfa3d5e..8ad0eb427d3f 100644
--- a/src/qt/createwalletdialog.cpp
+++ b/src/qt/createwalletdialog.cpp
@@ -6,6 +6,7 @@
 #include <config/bitcoin-config.h>
 #endif
 
+#include <external_signer.h>
 #include <qt/createwalletdialog.h>
 #include <qt/forms/ui_createwalletdialog.h>
 
@@ -39,14 +40,39 @@ CreateWalletDialog::CreateWalletDialog(QWidget* parent) :
     });
 
     connect(ui->encrypt_wallet_checkbox, &QCheckBox::toggled, [this](bool checked) {
-        // Disable the disable_privkeys_checkbox when isEncryptWalletChecked is
+        // Disable the disable_privkeys_checkbox and external_signer_checkbox when isEncryptWalletChecked is
         // set to true, enable it when isEncryptWalletChecked is false.
         ui->disable_privkeys_checkbox->setEnabled(!checked);
+        ui->external_signer_checkbox->setEnabled(!checked);
 
         // When the disable_privkeys_checkbox is disabled, uncheck it.
         if (!ui->disable_privkeys_checkbox->isEnabled()) {
             ui->disable_privkeys_checkbox->setChecked(false);
         }
+
+        // When the external_signer_checkbox box is disabled, uncheck it.
+        if (!ui->external_signer_checkbox->isEnabled()) {
+            ui->external_signer_checkbox->setChecked(false);
+        }
+
+    });
+
+    connect(ui->external_signer_checkbox, &QCheckBox::toggled, [this](bool checked) {
+        ui->encrypt_wallet_checkbox->setEnabled(!checked);
+        ui->blank_wallet_checkbox->setEnabled(!checked);
+        ui->disable_privkeys_checkbox->setEnabled(!checked);
+        ui->descriptor_checkbox->setEnabled(!checked);
+
+        // The external signer checkbox is only enabled when a device is detected.
+        // In that case it is checked by default. Toggling it restores the other
+        // options to their default.
+        ui->descriptor_checkbox->setChecked(checked);
+        ui->encrypt_wallet_checkbox->setChecked(false);
+        ui->disable_privkeys_checkbox->setChecked(checked);
+        // The blank check box is ambiguous. This flag is always true for a
+        // watch-only wallet, even though we immedidately fetch keys from the
+        // external signer.
+        ui->blank_wallet_checkbox->setChecked(checked);
     });
     connect(ui->disable_privkeys_checkbox, &QCheckBox::toggled, [this](bool checked) {
         // Disable the encrypt_wallet_checkbox when isDisablePrivateKeysChecked is
@@ -74,11 +100,22 @@ CreateWalletDialog::CreateWalletDialog(QWidget* parent) :
     ui->descriptor_checkbox->setToolTip(tr("Compiled without sqlite support (required for descriptor wallets)"));
     ui->descriptor_checkbox->setEnabled(false);
     ui->descriptor_checkbox->setChecked(false);
+    ui->external_signer_checkbox->setEnabled(false);
+    ui->external_signer_checkbox->setChecked(false);
 #endif
+
 #ifndef USE_BDB
     ui->descriptor_checkbox->setEnabled(false);
     ui->descriptor_checkbox->setChecked(true);
 #endif
+
+#ifndef ENABLE_EXTERNAL_SIGNER
+        //: "External signing" means using devices such as hardware wallets.
+        ui->external_signer_checkbox->setToolTip(tr("Compiled without external signing support (required for external signing)"));
+        ui->external_signer_checkbox->setEnabled(false);
+        ui->external_signer_checkbox->setChecked(false);
+#endif
+
 }
 
 CreateWalletDialog::~CreateWalletDialog()
@@ -86,6 +123,28 @@ CreateWalletDialog::~CreateWalletDialog()
     delete ui;
 }
 
+#ifdef ENABLE_EXTERNAL_SIGNER
+void CreateWalletDialog::setSigners(std::vector<ExternalSigner>& signers)
+{
+    if (!signers.empty()) {
+        ui->external_signer_checkbox->setEnabled(true);
+        ui->external_signer_checkbox->setChecked(true);
+        ui->encrypt_wallet_checkbox->setEnabled(false);
+        ui->encrypt_wallet_checkbox->setChecked(false);
+        // The order matters, because connect() is called when toggling a checkbox:
+        ui->blank_wallet_checkbox->setEnabled(false);
+        ui->blank_wallet_checkbox->setChecked(false);
+        ui->disable_privkeys_checkbox->setEnabled(false);
+        ui->disable_privkeys_checkbox->setChecked(true);
+        const std::string label = signers[0].m_name;
+        ui->wallet_name_line_edit->setText(QString::fromStdString(label));
+        ui->buttonBox->button(QDialogButtonBox::Ok)->setEnabled(true);
+    } else {
+        ui->external_signer_checkbox->setEnabled(false);
+    }
+}
+#endif
+
 QString CreateWalletDialog::walletName() const
 {
     return ui->wallet_name_line_edit->text();
@@ -110,3 +169,8 @@ bool CreateWalletDialog::isDescriptorWalletChecked() const
 {
     return ui->descriptor_checkbox->isChecked();
 }
+
+bool CreateWalletDialog::isExternalSignerChecked() const
+{
+    return ui->external_signer_checkbox->isChecked();
+}
diff --git a/src/qt/createwalletdialog.h b/src/qt/createwalletdialog.h
index 5fca441eba47..da3a83784674 100644
--- a/src/qt/createwalletdialog.h
+++ b/src/qt/createwalletdialog.h
@@ -9,6 +9,10 @@
 
 class WalletModel;
 
+#ifdef ENABLE_EXTERNAL_SIGNER
+class ExternalSigner;
+#endif
+
 namespace Ui {
     class CreateWalletDialog;
 }
@@ -23,11 +27,16 @@ class CreateWalletDialog : public QDialog
     explicit CreateWalletDialog(QWidget* parent);
     virtual ~CreateWalletDialog();
 
+#ifdef ENABLE_EXTERNAL_SIGNER
+    void setSigners(std::vector<ExternalSigner>& signers);
+#endif
+
     QString walletName() const;
     bool isEncryptWalletChecked() const;
     bool isDisablePrivateKeysChecked() const;
     bool isMakeBlankWalletChecked() const;
     bool isDescriptorWalletChecked() const;
+    bool isExternalSignerChecked() const;
 
 private:
     Ui::CreateWalletDialog *ui;
diff --git a/src/qt/forms/createwalletdialog.ui b/src/qt/forms/createwalletdialog.ui
index 26c93d861838..48310006fc36 100644
--- a/src/qt/forms/createwalletdialog.ui
+++ b/src/qt/forms/createwalletdialog.ui
@@ -155,6 +155,16 @@
         </property>
        </widget>
       </item>
+      <item>
+       <widget class="QCheckBox" name="external_signer_checkbox">
+        <property name="toolTip">
+         <string>Use an external signing device such as a hardware wallet. Configure the external signer script in wallet preferences first.</string>
+        </property>
+        <property name="text">
+         <string>External signer</string>
+        </property>
+       </widget>
+      </item>
      </layout>
     </widget>
    </item>
@@ -188,6 +198,7 @@
   <tabstop>encrypt_wallet_checkbox</tabstop>
   <tabstop>disable_privkeys_checkbox</tabstop>
   <tabstop>blank_wallet_checkbox</tabstop>
+  <tabstop>external_signer_checkbox</tabstop>
  </tabstops>
  <resources/>
  <connections>
diff --git a/src/qt/forms/optionsdialog.ui b/src/qt/forms/optionsdialog.ui
index bca7379c75f5..b46cf51b7ce1 100644
--- a/src/qt/forms/optionsdialog.ui
+++ b/src/qt/forms/optionsdialog.ui
@@ -409,6 +409,36 @@
          </item>
         </layout>
        </item>
+       <item>
+        <widget class="QGroupBox" name="groupBoxHww">
+         <property name="title">
+          <string>External Signer (e.g. hardware wallet)</string>
+         </property>
+         <layout class="QVBoxLayout" name="verticalLayoutHww">
+           <item>
+            <layout class="QHBoxLayout" name="horizontalLayoutHww">
+             <item>
+              <widget class="QLabel" name="externalSignerPathLabel">
+               <property name="text">
+                <string>&amp;External signer script path</string>
+               </property>
+               <property name="buddy">
+                <cstring>externalSignerPath</cstring>
+               </property>
+              </widget>
+             </item>
+             <item>
+              <widget class="QLineEdit" name="externalSignerPath">
+                <property name="toolTip">
+                  <string>Full path to a Dash Core compatible script (e.g. C:\Downloads\hwi.exe or /Users/you/Downloads/hwi.py). Beware: malware can steal your coins!</string>
+                </property>
+              </widget>
+             </item>
+            </layout>
+           </item>
+         </layout>
+        </widget>
+       </item>
        <item>
         <spacer name="verticalSpacer_Wallet">
          <property name="orientation">
diff --git a/src/qt/forms/receiverequestdialog.ui b/src/qt/forms/receiverequestdialog.ui
index 7d95a8bc907c..70a7cf71de9b 100644
--- a/src/qt/forms/receiverequestdialog.ui
+++ b/src/qt/forms/receiverequestdialog.ui
@@ -254,6 +254,19 @@
        </property>
       </widget>
      </item>
+     <item>
+      <widget class="QPushButton" name="btnVerify">
+       <property name="text">
+        <string>&amp;Verify</string>
+       </property>
+       <property name="toolTip">
+        <string>Verify this address on e.g. a hardware wallet screen</string>
+       </property>
+       <property name="autoDefault">
+        <bool>false</bool>
+       </property>
+      </widget>
+     </item>
      <item>
       <widget class="QPushButton" name="btnSaveAs">
        <property name="text">
diff --git a/src/qt/optionsdialog.cpp b/src/qt/optionsdialog.cpp
index 32ace0a1a275..51ae24e81f67 100644
--- a/src/qt/optionsdialog.cpp
+++ b/src/qt/optionsdialog.cpp
@@ -270,6 +270,7 @@ void OptionsDialog::setModel(OptionsModel *_model)
     connect(ui->prune, &QCheckBox::clicked, this, &OptionsDialog::togglePruneWarning);
     connect(ui->pruneSize, qOverload<int>(&QSpinBox::valueChanged), this, &OptionsDialog::showRestartWarning);
     connect(ui->databaseCache, qOverload<int>(&QSpinBox::valueChanged), this, &OptionsDialog::showRestartWarning);
+    connect(ui->externalSignerPath, &QLineEdit::textChanged, [this]{ showRestartWarning(); });
     connect(ui->threadsScriptVerif, qOverload<int>(&QSpinBox::valueChanged), this, &OptionsDialog::showRestartWarning);
     /* Wallet */
     connect(ui->showMasternodesTab, &QCheckBox::clicked, this, &OptionsDialog::showRestartWarning);
@@ -336,6 +337,7 @@ void OptionsDialog::setMapper()
 
     /* Wallet */
     mapper->addMapping(ui->coinControlFeatures, OptionsModel::CoinControlFeatures);
+    mapper->addMapping(ui->externalSignerPath, OptionsModel::ExternalSignerPath);
     mapper->addMapping(ui->subFeeFromAmount, OptionsModel::SubFeeFromAmount);
     mapper->addMapping(ui->m_enable_psbt_controls, OptionsModel::EnablePSBTControls);
     mapper->addMapping(ui->keepChangeAddress, OptionsModel::KeepChangeAddress);
diff --git a/src/qt/optionsmodel.cpp b/src/qt/optionsmodel.cpp
index 719df0456b76..5fcf94edb9e7 100644
--- a/src/qt/optionsmodel.cpp
+++ b/src/qt/optionsmodel.cpp
@@ -223,6 +223,13 @@ void OptionsModel::Init(bool resetSettings)
     if (!gArgs.SoftSetBoolArg("-spendzeroconfchange", settings.value("bSpendZeroConfChange").toBool()))
         addOverriddenOption("-spendzeroconfchange");
 
+    if (!settings.contains("external_signer_path"))
+        settings.setValue("external_signer_path", "");
+
+    if (!gArgs.SoftSetArg("-signer", settings.value("external_signer_path").toString().toStdString())) {
+        addOverriddenOption("-signer");
+    }
+
     if (!settings.contains("SubFeeFromAmount")) {
         settings.setValue("SubFeeFromAmount", false);
     }
@@ -496,6 +503,8 @@ QVariant OptionsModel::data(const QModelIndex & index, int role) const
 #ifdef ENABLE_WALLET
         case SpendZeroConfChange:
             return settings.value("bSpendZeroConfChange");
+        case ExternalSignerPath:
+            return settings.value("external_signer_path");
         case SubFeeFromAmount:
             return m_sub_fee_from_amount;
         case ShowMasternodesTab:
@@ -671,6 +680,12 @@ bool OptionsModel::setData(const QModelIndex & index, const QVariant & value, in
                 setRestartRequired(true);
             }
             break;
+        case ExternalSignerPath:
+            if (settings.value("external_signer_path") != value.toString()) {
+                settings.setValue("external_signer_path", value.toString());
+                setRestartRequired(true);
+            }
+            break;
         case ShowMasternodesTab:
             if (settings.value("fShowMasternodesTab") != value) {
                 settings.setValue("fShowMasternodesTab", value);
diff --git a/src/qt/optionsmodel.h b/src/qt/optionsmodel.h
index 290ff3bd3dba..8d6d3c2c73f3 100644
--- a/src/qt/optionsmodel.h
+++ b/src/qt/optionsmodel.h
@@ -73,6 +73,7 @@ class OptionsModel : public QAbstractListModel
         Prune,                  // bool
         PruneSize,              // int
         DatabaseCache,          // int
+        ExternalSignerPath,     // QString
         SpendZeroConfChange,    // bool
         ShowMasternodesTab,     // bool
         ShowGovernanceTab,      // bool
diff --git a/src/qt/receiverequestdialog.cpp b/src/qt/receiverequestdialog.cpp
index 2961084f3714..fef2d28080bf 100644
--- a/src/qt/receiverequestdialog.cpp
+++ b/src/qt/receiverequestdialog.cpp
@@ -93,6 +93,12 @@ void ReceiveRequestDialog::setInfo(const SendCoinsRecipient &_info)
         ui->wallet_tag->hide();
         ui->wallet_content->hide();
     }
+
+    ui->btnVerify->setVisible(this->model->wallet().hasExternalSigner());
+
+    connect(ui->btnVerify, &QPushButton::clicked, [this] {
+        model->displayAddress(info.address.toStdString());
+    });
 }
 
 void ReceiveRequestDialog::updateDisplayUnit()
diff --git a/src/qt/sendcoinsdialog.cpp b/src/qt/sendcoinsdialog.cpp
index 26ffc2309a3d..44bd678f3f3c 100644
--- a/src/qt/sendcoinsdialog.cpp
+++ b/src/qt/sendcoinsdialog.cpp
@@ -226,7 +226,16 @@ void SendCoinsDialog::setModel(WalletModel *_model)
         updateFeeSectionControls();
         updateSmartFeeLabel();
 
-        if (model->wallet().privateKeysDisabled()) {
+        if (model->wallet().hasExternalSigner()) {
+            ui->sendButton->setText(tr("Sign on device"));
+            if (gArgs.GetArg("-signer", "") != "") {
+                ui->sendButton->setEnabled(true);
+                ui->sendButton->setToolTip(tr("Connect your hardware wallet first."));
+            } else {
+                ui->sendButton->setEnabled(false);
+                ui->sendButton->setToolTip(tr("Set external signer script path in Options -> Wallet"));
+            }
+        } else if (model->wallet().privateKeysDisabled()) {
             ui->sendButton->setText(tr("Cr&eate Unsigned"));
             ui->sendButton->setToolTip(tr("Creates a Partially Signed Blockchain Transaction (PSBT) for use with e.g. an offline %1 wallet, or a PSBT-compatible hardware wallet.").arg(PACKAGE_NAME));
         }
@@ -369,10 +378,8 @@ bool SendCoinsDialog::send(const QList<SendCoinsRecipient>& recipients, QString&
         that the displayed transaction details represent the transaction the user intends to create. */
     question_string.append(tr("Do you want to create this transaction?"));
     question_string.append("<br /><span style='font-size:10pt;'>");
-    // TODO: re-enable it when external signer will be backported
-    // if (model->wallet().privateKeysDisabled() && !model->wallet().hasExternalSigner()) {
-    const bool external_signer_available{false};
-    if (external_signer_available) {
+    if (model->wallet().privateKeysDisabled() && !model->wallet().hasExternalSigner()) {
+        question_string.append(tr("Do you want to draft this transaction?"));
         /*: Text to inform a user attempting to create a transaction of their current options. At this stage,
             a user can only create a PSBT. This string is displayed when private keys are disabled and an external
             signer is not available. */
@@ -486,8 +493,9 @@ void SendCoinsDialog::sendButtonClicked([[maybe_unused]] bool checked)
     if (!PrepareSendText(question_string, informative_text, detailed_text)) return;
     assert(m_current_transaction);
 
-    const QString confirmation = tr("Confirm send coins");
-    auto confirmationDialog = new SendConfirmationDialog(confirmation, question_string, informative_text, detailed_text, SEND_CONFIRM_DELAY, !model->wallet().privateKeysDisabled(), model->getOptionsModel()->getEnablePSBTControls(), this);
+    const QString confirmation = model->wallet().privateKeysDisabled() && !model->wallet().hasExternalSigner() ? tr("Confirm transaction proposal") : tr("Confirm send coins");
+    const QString confirmButtonText = model->wallet().privateKeysDisabled() && !model->wallet().hasExternalSigner() ? tr("Create Unsigned") : tr("Send");
+    auto confirmationDialog = new SendConfirmationDialog(confirmation, question_string, informative_text, detailed_text, SEND_CONFIRM_DELAY, confirmButtonText, this);
     confirmationDialog->setAttribute(Qt::WA_DeleteOnClose);
     // TODO: Replace QDialog::exec() with safer QDialog::show().
     const auto retval = static_cast<QMessageBox::StandardButton>(confirmationDialog->exec());
@@ -503,9 +511,50 @@ void SendCoinsDialog::sendButtonClicked([[maybe_unused]] bool checked)
         CMutableTransaction mtx = CMutableTransaction{*(m_current_transaction->getWtx())};
         PartiallySignedTransaction psbtx(mtx);
         bool complete = false;
-        const TransactionError err = model->wallet().fillPSBT(SIGHASH_ALL, false /* sign */, true /* bip32derivs */, nullptr, psbtx, complete);
+        // Always fill without signing first. This prevents an external signer
+        // from being called prematurely and is not expensive.
+        TransactionError err = model->wallet().fillPSBT(SIGHASH_ALL, false /* sign */, true /* bip32derivs */, nullptr, psbtx, complete);
         assert(!complete);
         assert(err == TransactionError::OK);
+        if (model->wallet().hasExternalSigner()) {
+            try {
+                err = model->wallet().fillPSBT(SIGHASH_ALL, true /* sign */, true /* bip32derivs */, nullptr, psbtx, complete);
+            } catch (const std::runtime_error& e) {
+                QMessageBox::critical(nullptr, tr("Sign failed"), e.what());
+                send_failure = true;
+                return;
+            }
+            if (err == TransactionError::EXTERNAL_SIGNER_NOT_FOUND) {
+                QMessageBox::critical(nullptr, tr("External signer not found"), "External signer not found");
+                send_failure = true;
+                return;
+            }
+            if (err == TransactionError::EXTERNAL_SIGNER_FAILED) {
+                QMessageBox::critical(nullptr, tr("External signer failure"), "External signer failure");
+                send_failure = true;
+                return;
+            }
+            if (err != TransactionError::OK) {
+                tfm::format(std::cerr, "Failed to sign PSBT");
+                processSendCoinsReturn(WalletModel::TransactionCreationFailed);
+                send_failure = true;
+                return;
+            }
+            // fillPSBT does not always properly finalize
+            complete = FinalizeAndExtractPSBT(psbtx, mtx);
+        }
+
+        // Broadcast transaction if complete (even with an external signer this
+        // is not always the case, e.g. in a multisig wallet).
+        if (complete) {
+            const CTransactionRef tx = MakeTransactionRef(mtx);
+            m_current_transaction->setWtx(tx);
+            model->sendCoins(*m_current_transaction, m_coin_control->IsUsingCoinJoin());
+            return;
+        }
+
+        // Copy PSBT to clipboard and offer to save
+        assert(!complete);
         // Serialize the PSBT
         CDataStream ssTx(SER_NETWORK, PROTOCOL_VERSION);
         ssTx << psbtx;
@@ -547,7 +596,7 @@ void SendCoinsDialog::sendButtonClicked([[maybe_unused]] bool checked)
             break;
         default:
             assert(false);
-        }
+        } // msgBox.exec()
     } else {
         assert(!model->wallet().privateKeysDisabled());
         // now send the prepared transaction
@@ -715,7 +764,9 @@ void SendCoinsDialog::setBalance(const interfaces::WalletBalances& balances)
     if(model && model->getOptionsModel())
     {
         CAmount balance = 0;
-        if (model->wallet().privateKeysDisabled()) {
+        if (model->wallet().hasExternalSigner()) {
+            ui->labelBalanceName->setText(tr("External balance:"));
+        } else if (model->wallet().privateKeysDisabled()) {
             balance = balances.watch_only_balance;
             ui->labelBalanceName->setText(tr("Watch-only balance:"));
         } else if (m_coin_control->IsUsingCoinJoin()) {
@@ -801,7 +852,7 @@ void SendCoinsDialog::on_buttonMinimizeFee_clicked()
 void SendCoinsDialog::useAvailableBalance(SendCoinsEntry* entry)
 {
     // Include watch-only for wallets without private key
-    m_coin_control->fAllowWatchOnly = model->wallet().privateKeysDisabled();
+    m_coin_control->fAllowWatchOnly = model->wallet().privateKeysDisabled() && !model->wallet().hasExternalSigner();
 
     // Calculate available amount to send.
     CAmount amount = model->wallet().getAvailableBalance(*m_coin_control);
@@ -855,7 +906,7 @@ void SendCoinsDialog::updateCoinControlState()
     // Either custom fee will be used or if not selected, the confirmation target from dropdown box
     m_coin_control->m_confirm_target = getConfTargetForIndex(ui->confTargetSelector->currentIndex());
     // Include watch-only for wallets without private key
-    m_coin_control->fAllowWatchOnly = model->wallet().privateKeysDisabled();
+    m_coin_control->fAllowWatchOnly = model->wallet().privateKeysDisabled() && !model->wallet().hasExternalSigner();
 }
 
 void SendCoinsDialog::updateNumberOfBlocks(int count, const QDateTime& blockDate, const QString& blockHash, double nVerificationProgress, bool header, SynchronizationState sync_state) {
diff --git a/src/qt/walletcontroller.cpp b/src/qt/walletcontroller.cpp
index 79df868be617..7a54e8fbcb0a 100644
--- a/src/qt/walletcontroller.cpp
+++ b/src/qt/walletcontroller.cpp
@@ -35,6 +35,7 @@
 
 using wallet::WALLET_FLAG_BLANK_WALLET;
 using wallet::WALLET_FLAG_DESCRIPTORS;
+using wallet::WALLET_FLAG_EXTERNAL_SIGNER;
 using wallet::WALLET_FLAG_DISABLE_PRIVATE_KEYS;
 
 WalletController::WalletController(ClientModel& client_model, QObject* parent)
@@ -258,6 +259,9 @@ void CreateWalletActivity::createWallet()
     if (m_create_wallet_dialog->isDescriptorWalletChecked()) {
         flags |= WALLET_FLAG_DESCRIPTORS;
     }
+    if (m_create_wallet_dialog->isExternalSignerChecked()) {
+        flags |= WALLET_FLAG_EXTERNAL_SIGNER;
+    }
 
     QTimer::singleShot(500ms, worker(), [this, name, flags] {
         auto wallet{node().walletLoader().createWallet(name, m_passphrase, flags, m_warning_message)};
@@ -364,6 +368,17 @@ void CreateWalletActivity::finish()
 void CreateWalletActivity::create()
 {
     m_create_wallet_dialog = new CreateWalletDialog(m_parent_widget);
+
+#ifdef ENABLE_EXTERNAL_SIGNER
+    std::vector<ExternalSigner> signers;
+    try {
+        signers = node().externalSigners();
+    } catch (const std::runtime_error& e) {
+        QMessageBox::critical(nullptr, tr("Can't list signers"), e.what());
+    }
+    m_create_wallet_dialog->setSigners(signers);
+#endif
+
     m_create_wallet_dialog->setWindowModality(Qt::ApplicationModal);
     m_create_wallet_dialog->show();
 
diff --git a/src/qt/walletmodel.cpp b/src/qt/walletmodel.cpp
index 0d448689c297..9b03c9cf9d5c 100644
--- a/src/qt/walletmodel.cpp
+++ b/src/qt/walletmodel.cpp
@@ -35,6 +35,7 @@
 #include <functional>
 
 #include <QDebug>
+#include <QMessageBox>
 #include <QSet>
 #include <QTimer>
 
@@ -578,6 +579,18 @@ WalletModel::UnlockContext::~UnlockContext()
     }
 }
 
+bool WalletModel::displayAddress(std::string sAddress)
+{
+    CTxDestination dest = DecodeDestination(sAddress);
+    bool res = false;
+    try {
+        res = m_wallet->displayAddress(dest);
+    } catch (const std::runtime_error& e) {
+        QMessageBox::critical(nullptr, tr("Can't display address"), e.what());
+    }
+    return res;
+}
+
 bool WalletModel::isWalletEnabled()
 {
    return !gArgs.GetBoolArg("-disablewallet", DEFAULT_DISABLE_WALLET);
diff --git a/src/qt/walletmodel.h b/src/qt/walletmodel.h
index 523c07ad91b9..b33e74a43ada 100644
--- a/src/qt/walletmodel.h
+++ b/src/qt/walletmodel.h
@@ -141,6 +141,8 @@ class WalletModel : public QObject
 
     UnlockContext requestUnlock(bool fForMixingOnly = false);
 
+    bool displayAddress(std::string sAddress);
+
     static bool isWalletEnabled();
 
     int getNumISLocks() const;
diff --git a/src/qt/walletmodeltransaction.cpp b/src/qt/walletmodeltransaction.cpp
index aed16d919262..c3dc38fa27c9 100644
--- a/src/qt/walletmodeltransaction.cpp
+++ b/src/qt/walletmodeltransaction.cpp
@@ -26,6 +26,11 @@ CTransactionRef& WalletModelTransaction::getWtx()
     return wtx;
 }
 
+void WalletModelTransaction::setWtx(const CTransactionRef& newTx)
+{
+    wtx = newTx;
+}
+
 unsigned int WalletModelTransaction::getTransactionSize()
 {
     return wtx != nullptr ? ::GetSerializeSize(*wtx, PROTOCOL_VERSION) : 0;
diff --git a/src/qt/walletmodeltransaction.h b/src/qt/walletmodeltransaction.h
index 05973f621e34..67effb8e2908 100644
--- a/src/qt/walletmodeltransaction.h
+++ b/src/qt/walletmodeltransaction.h
@@ -27,6 +27,8 @@ class WalletModelTransaction
     QList<SendCoinsRecipient> getRecipients() const;
 
     CTransactionRef& getWtx();
+    void setWtx(const CTransactionRef&);
+
     unsigned int getTransactionSize();
 
     void setTransactionFee(const CAmount& newFee);
diff --git a/src/wallet/interfaces.cpp b/src/wallet/interfaces.cpp
index a0f55c32fb2a..6d087a276594 100644
--- a/src/wallet/interfaces.cpp
+++ b/src/wallet/interfaces.cpp
@@ -267,6 +267,11 @@ class WalletImpl : public Wallet
         WalletBatch batch{m_wallet->GetDatabase()};
         return m_wallet->SetAddressReceiveRequest(batch, dest, id, value);
     }
+    bool displayAddress(const CTxDestination& dest) override
+    {
+        LOCK(m_wallet->cs_wallet);
+        return m_wallet->DisplayAddress(dest);
+    }
     bool lockCoin(const COutPoint& output, const bool write_to_db) override
     {
         LOCK(m_wallet->cs_wallet);
@@ -518,6 +523,7 @@ class WalletImpl : public Wallet
     unsigned int getConfirmTarget() override { return m_wallet->m_confirm_target; }
     bool hdEnabled() override { return m_wallet->IsHDEnabled(); }
     bool canGetAddresses() override { return m_wallet->CanGetAddresses(); }
+    bool hasExternalSigner() override { return m_wallet->IsWalletFlagSet(WALLET_FLAG_EXTERNAL_SIGNER); }
     bool privateKeysDisabled() override { return m_wallet->IsWalletFlagSet(WALLET_FLAG_DISABLE_PRIVATE_KEYS); }
     CAmount getDefaultMaxTxFee() override { return m_wallet->m_default_max_tx_fee; }
     void remove() override

From 9c30a2e7c60fd1bf5ee00095914db1198e0bb062 Mon Sep 17 00:00:00 2001
From: Samuel Dobson <dobsonsa68@gmail.com>
Date: Wed, 9 Jun 2021 22:54:54 +1200
Subject: [PATCH 589/656] Merge bitcoin/bitcoin#22173: wallet: Do not load
 external signers wallets when unsupported

e60cd26ad46559770ad84d2959c9a1742ae8b7a6 Do not load external signers wallets when unsupported (Andrew Chow)

Pull request description:

  When external signer support is not compiled, do not load external signer wallets.

  Alternative to #22168.

ACKs for top commit:
  promag:
    Tested ACK e60cd26ad46559770ad84d2959c9a1742ae8b7a6.
  meshcollider:
    Code review ACK e60cd26ad46559770ad84d2959c9a1742ae8b7a6

Tree-SHA512: aed2d0038f448c2f89c6b48f412b106e63c9ed20e748e69aae21fb58c33fc7e4fa73375a52372c73788669eb2b968a8da6b022c65658fa4484f5bbcf205b1b15
---
 src/wallet/walletdb.cpp | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/src/wallet/walletdb.cpp b/src/wallet/walletdb.cpp
index e2e4452d64da..234269b9ddea 100644
--- a/src/wallet/walletdb.cpp
+++ b/src/wallet/walletdb.cpp
@@ -819,6 +819,13 @@ DBErrors WalletBatch::LoadWallet(CWallet* pwallet)
             }
         }
 
+#ifndef ENABLE_EXTERNAL_SIGNER
+        if (pwallet->IsWalletFlagSet(WALLET_FLAG_EXTERNAL_SIGNER)) {
+            pwallet->WalletLogPrintf("Error: External signer wallet being loaded without external signer support compiled\n");
+            return DBErrors::TOO_NEW;
+        }
+#endif
+
         // Get cursor
         if (!m_batch->StartCursor())
         {

From 1b9b7c78b73570753b70a4ac876aeff1e7875c94 Mon Sep 17 00:00:00 2001
From: fanquake <fanquake@gmail.com>
Date: Thu, 17 Jun 2021 12:15:29 +0800
Subject: [PATCH 590/656] Merge bitcoin/bitcoin#21935: Enable external signer
 support by default, reduce #ifdef

2f5bdcbc31a2eeb7c11226a9e51c56f02ac807dd gui: misc external signer fixes and translation hints (Sjors Provoost)
d672404466204444a1d9f2d3498de4448f53d2be refactor: make ExternalSigner NetworkArg() and m_chain private (Sjors Provoost)
4455145e266450397b45acd7286686966edd072b refactor: reduce #ifdef ENABLE_EXTERNAL_SIGNER usage (Sjors Provoost)
5be90c907eba0a38019c7d9826623d5d5f567c66 build: enable external signer by default (Sjors Provoost)
7d9453041b827bafbdfc1ac0b01c7b7e1ee2bd4f refactor: clean up external_signer.h includes (Sjors Provoost)
fc0eca31b33f87882e2aa329a3746d4e08af1985 fuzz: fix fuzz binary linking order (Sjors Provoost)

Pull request description:

  This follows the introduction of GUI support in https://github.com/bitcoin-core/gui/pull/4

  I don't think we should expect GUI users to self compile. This also enables external signer support by default for RPC users.

  In addition this PR reduces the number of `#ifdef ENABLE_EXTERNAL_SIGNER`, which also fixes #21919. When compiled with `--disable-external-signer` such wallets can't be created in RPC or GUI, but they can be loaded. Attempting any action that calls HWI will trigger an error.

  Side-note: this PR may or may not (currently) break CI for the GUI repository, as explained here: https://github.com/bitcoin-core/gui/pull/4#issuecomment-769859001

ACKs for top commit:
  achow101:
    ACK 2f5bdcbc31a2eeb7c11226a9e51c56f02ac807dd
  hebasto:
    re-ACK 2f5bdcbc31a2eeb7c11226a9e51c56f02ac807dd

Tree-SHA512: 1b71c5a8bea2be077ee9fa33a01130c957a0cf90951d4b7b04d3d0ef826bb77e474c3963abddfef2e2c1ea99d9c72cd2302d1eb9b5fcb7ba0bd2a625f006aa05
---
 ci/test/00_setup_env_arm.sh                    |  2 +-
 ci/test/00_setup_env_mac.sh                    |  2 +-
 ci/test/00_setup_env_mac_native_x86_64.sh      |  2 +-
 ci/test/00_setup_env_native_asan.sh            |  2 +-
 ci/test/00_setup_env_native_fuzz.sh            |  2 +-
 ci/test/00_setup_env_native_multiprocess.sh    |  2 +-
 ci/test/00_setup_env_native_nowallet.sh        |  2 +-
 ci/test/00_setup_env_native_qt5.sh             |  2 +-
 ci/test/00_setup_env_native_tsan.sh            |  2 +-
 ci/test/00_setup_env_s390x.sh                  |  2 +-
 configure.ac                                   |  4 ++--
 src/Makefile.test.include                      |  3 +--
 src/external_signer.cpp                        |  8 ++------
 src/external_signer.h                          | 16 ++++++----------
 src/interfaces/node.h                          |  2 --
 src/node/interfaces.cpp                        | 13 +++++++++++--
 src/qt/createwalletdialog.cpp                  |  7 +++----
 src/qt/createwalletdialog.h                    |  9 ++-------
 src/qt/optionsdialog.cpp                       |  5 +++++
 src/qt/receiverequestdialog.cpp                |  2 +-
 src/qt/sendcoinsdialog.cpp                     |  4 ++++
 src/qt/walletcontroller.cpp                    |  3 +--
 src/util/system.cpp                            |  6 ++++--
 src/util/system.h                              |  2 --
 src/wallet/external_signer_scriptpubkeyman.cpp |  4 ----
 src/wallet/external_signer_scriptpubkeyman.h   |  2 --
 src/wallet/scriptpubkeyman.cpp                 |  1 -
 src/wallet/wallet.cpp                          | 13 +------------
 28 files changed, 53 insertions(+), 71 deletions(-)

diff --git a/ci/test/00_setup_env_arm.sh b/ci/test/00_setup_env_arm.sh
index 1e2f23f8ca42..edbc9334928f 100755
--- a/ci/test/00_setup_env_arm.sh
+++ b/ci/test/00_setup_env_arm.sh
@@ -25,4 +25,4 @@ export RUN_FUNCTIONAL_TESTS=false
 export GOAL="install"
 # -Wno-psabi is to disable ABI warnings: "note: parameter passing for argument of type ... changed in GCC 7.1"
 # This could be removed once the ABI change warning does not show up by default
-export BITCOIN_CONFIG="--enable-reduce-exports CXXFLAGS=-Wno-psabi --enable_external-signer"
+export BITCOIN_CONFIG="--enable-reduce-exports CXXFLAGS=-Wno-psabi"
diff --git a/ci/test/00_setup_env_mac.sh b/ci/test/00_setup_env_mac.sh
index 5037bf76cd0f..ca04e916fc2a 100755
--- a/ci/test/00_setup_env_mac.sh
+++ b/ci/test/00_setup_env_mac.sh
@@ -14,4 +14,4 @@ export XCODE_BUILD_ID=15A240d
 export RUN_UNIT_TESTS=false
 export RUN_FUNCTIONAL_TESTS=false
 export GOAL="all deploy"
-export BITCOIN_CONFIG="--with-gui --enable-reduce-exports --disable-miner --enable-external-signer"
+export BITCOIN_CONFIG="--with-gui --enable-reduce-exports --disable-miner"
diff --git a/ci/test/00_setup_env_mac_native_x86_64.sh b/ci/test/00_setup_env_mac_native_x86_64.sh
index e73c3dbc7246..b20efb2bde37 100755
--- a/ci/test/00_setup_env_mac_native_x86_64.sh
+++ b/ci/test/00_setup_env_mac_native_x86_64.sh
@@ -10,7 +10,7 @@ export CONTAINER_NAME=ci_macos
 export HOST=x86_64-apple-darwin
 export PIP_PACKAGES="zmq lief"
 export GOAL="install"
-export BITCOIN_CONFIG="--with-gui --enable-reduce-exports --disable-miner --enable-external-signer"
+export BITCOIN_CONFIG="--with-gui --enable-reduce-exports --disable-miner"
 export CI_OS_NAME="macos"
 export NO_DEPENDS=1
 export OSX_SDK=""
diff --git a/ci/test/00_setup_env_native_asan.sh b/ci/test/00_setup_env_native_asan.sh
index f621847d5566..ac78c511139e 100755
--- a/ci/test/00_setup_env_native_asan.sh
+++ b/ci/test/00_setup_env_native_asan.sh
@@ -12,4 +12,4 @@ export TEST_RUNNER_EXTRA="--timeout-factor=4"  # Increase timeout because saniti
 export FUNCTIONAL_TESTS_CONFIG="--exclude wallet_multiwallet.py" # Temporarily suppress ASan heap-use-after-free (see issue #14163)
 export RUN_BENCH=true
 export GOAL="install"
-export BITCOIN_CONFIG="--enable-zmq --with-incompatible-bdb --with-gui=qt5 CPPFLAGS=-DDEBUG_LOCKORDER --with-sanitizers=address,integer,undefined CC=clang CXX=clang++ --enable-external-signer"
+export BITCOIN_CONFIG="--enable-zmq --with-incompatible-bdb --with-gui=qt5 CPPFLAGS=-DDEBUG_LOCKORDER --with-sanitizers=address,integer,undefined CC=clang CXX=clang++"
diff --git a/ci/test/00_setup_env_native_fuzz.sh b/ci/test/00_setup_env_native_fuzz.sh
index 5d8c910c9df7..71356f213582 100755
--- a/ci/test/00_setup_env_native_fuzz.sh
+++ b/ci/test/00_setup_env_native_fuzz.sh
@@ -15,4 +15,4 @@ export RUN_UNIT_TESTS=false
 export RUN_FUNCTIONAL_TESTS=false
 export RUN_FUZZ_TESTS=true
 export GOAL="install"
-export BITCOIN_CONFIG="--enable-zmq --disable-ccache --enable-fuzz --with-sanitizers=fuzzer,address,undefined,integer CC='clang-19 -ftrivial-auto-var-init=pattern' CXX='clang++-19 -ftrivial-auto-var-init=pattern' --enable-external-signer"
+export BITCOIN_CONFIG="--enable-zmq --disable-ccache --enable-fuzz --with-sanitizers=fuzzer,address,undefined,integer CC='clang-19 -ftrivial-auto-var-init=pattern' CXX='clang++-19 -ftrivial-auto-var-init=pattern'"
diff --git a/ci/test/00_setup_env_native_multiprocess.sh b/ci/test/00_setup_env_native_multiprocess.sh
index e86f34ef9eae..4583a86737a0 100755
--- a/ci/test/00_setup_env_native_multiprocess.sh
+++ b/ci/test/00_setup_env_native_multiprocess.sh
@@ -13,7 +13,7 @@ export DEP_OPTS="MULTIPROCESS=1 CC=clang-19 CXX=clang++-19"
 export RUN_TIDY=true
 export GOAL="install"
 export TEST_RUNNER_EXTRA="--v2transport"
-export BITCOIN_CONFIG="--enable-external-signer ---enable-debug CC=clang-19 CXX=clang++-19" # Use clang to avoid OOM
+export BITCOIN_CONFIG="--enable-debug CC=clang-19 CXX=clang++-19" # Use clang to avoid OOM
 # Additional flags for RUN_TIDY
 export BITCOIN_CONFIG="${BITCOIN_CONFIG} --disable-hardening CFLAGS='-O0 -g0' CXXFLAGS='-O0 -g0 -Wno-error=documentation'"
 export BITCOIND=dash-node  # Used in functional tests
diff --git a/ci/test/00_setup_env_native_nowallet.sh b/ci/test/00_setup_env_native_nowallet.sh
index 8d26f6b191de..3e083c3d4d62 100755
--- a/ci/test/00_setup_env_native_nowallet.sh
+++ b/ci/test/00_setup_env_native_nowallet.sh
@@ -11,4 +11,4 @@ export HOST=x86_64-pc-linux-gnu
 export PACKAGES="python3-zmq"
 export DEP_OPTS="NO_WALLET=1 CC=gcc-14 CXX=g++-14"
 export GOAL="install"
-export BITCOIN_CONFIG="--enable-reduce-exports --enable_external-signer CC=gcc-14 CXX=g++-14"
+export BITCOIN_CONFIG="--enable-reduce-exports CC=gcc-14 CXX=g++-14"
diff --git a/ci/test/00_setup_env_native_qt5.sh b/ci/test/00_setup_env_native_qt5.sh
index 50ce48f73d15..1b41c7d4644e 100755
--- a/ci/test/00_setup_env_native_qt5.sh
+++ b/ci/test/00_setup_env_native_qt5.sh
@@ -15,4 +15,4 @@ export RUN_UNIT_TESTS_SEQUENTIAL="true"
 export RUN_UNIT_TESTS="false"
 export GOAL="install"
 export DOWNLOAD_PREVIOUS_RELEASES="true"
-export BITCOIN_CONFIG="--enable-zmq --with-libs=no --enable-reduce-exports LDFLAGS=-static-libstdc++ --enable_external-signer"
+export BITCOIN_CONFIG="--enable-zmq --with-libs=no --enable-reduce-exports LDFLAGS=-static-libstdc++"
diff --git a/ci/test/00_setup_env_native_tsan.sh b/ci/test/00_setup_env_native_tsan.sh
index 7775a5166b40..798ded8afd16 100755
--- a/ci/test/00_setup_env_native_tsan.sh
+++ b/ci/test/00_setup_env_native_tsan.sh
@@ -12,6 +12,6 @@ export DEP_OPTS="CC=clang-19 CXX='clang++-19 -stdlib=libc++'"
 export TEST_RUNNER_EXTRA="--extended --exclude feature_pruning,feature_dbcrash,wallet_multiwallet.py" # Temporarily suppress ASan heap-use-after-free (see issue #14163)
 export TEST_RUNNER_EXTRA="${TEST_RUNNER_EXTRA} --timeout-factor=4"  # Increase timeout because sanitizers slow down
 export GOAL="install"
-export BITCOIN_CONFIG="--enable-zmq --with-sanitizers=thread CC=clang-19 CXX=clang++-19 CXXFLAGS='-g' --enable-external-signer"
+export BITCOIN_CONFIG="--enable-zmq --with-sanitizers=thread CC=clang-19 CXX=clang++-19 CXXFLAGS='-g'"
 export CPPFLAGS="-DARENA_DEBUG -DDEBUG_LOCKORDER -DDEBUG_LOCKCONTENTION"
 export PYZMQ=true
diff --git a/ci/test/00_setup_env_s390x.sh b/ci/test/00_setup_env_s390x.sh
index 3a104a796d5a..2bb4d5e57562 100755
--- a/ci/test/00_setup_env_s390x.sh
+++ b/ci/test/00_setup_env_s390x.sh
@@ -22,4 +22,4 @@ export RUN_UNIT_TESTS=true
 export TEST_RUNNER_EXTRA="--exclude rpc_bind,feature_bind_extra"  # Excluded for now, see https://github.com/bitcoin/bitcoin/issues/17765#issuecomment-602068547
 export RUN_FUNCTIONAL_TESTS=true
 export GOAL="install"
-export BITCOIN_CONFIG="--enable-reduce-exports --enable_external-signer"
+export BITCOIN_CONFIG="--enable-reduce-exports"
diff --git a/configure.ac b/configure.ac
index 58bf19141bde..3eab070d4f31 100644
--- a/configure.ac
+++ b/configure.ac
@@ -320,9 +320,9 @@ AC_ARG_ENABLE([werror],
     [enable_werror=no])
 
 AC_ARG_ENABLE([external-signer],
-    [AS_HELP_STRING([--enable-external-signer],[compile external signer support (default is no, requires Boost::Process)])],
+    [AS_HELP_STRING([--enable-external-signer],[compile external signer support (default is yes, requires Boost::Process)])],
     [use_external_signer=$enableval],
-    [use_external_signer=no])
+    [use_external_signer=yes])
 
 AC_LANG_PUSH([C++])
 
diff --git a/src/Makefile.test.include b/src/Makefile.test.include
index 194957d28f2b..a6cc2ce79318 100644
--- a/src/Makefile.test.include
+++ b/src/Makefile.test.include
@@ -43,10 +43,10 @@ FUZZ_SUITE_LD_COMMON = \
  $(LIBTEST_FUZZ) \
  $(LIBTEST_UTIL) \
  $(LIBBITCOIN_NODE) \
+ $(LIBBITCOIN_WALLET) \
  $(LIBBITCOIN_COMMON) \
  $(LIBBITCOIN_UTIL) \
  $(LIBBITCOIN_CONSENSUS) \
- $(LIBBITCOIN_WALLET) \
  $(LIBBITCOIN_CRYPTO) \
  $(LIBBITCOIN_CLI) \
  $(LIBDASHBLS) \
@@ -222,7 +222,6 @@ BITCOIN_TESTS += \
   wallet/test/scriptpubkeyman_tests.cpp
 
 FUZZ_SUITE_LD_COMMON +=\
- $(LIBBITCOIN_WALLET) \
  $(SQLITE_LIBS) \
  $(BDB_LIBS)
 
diff --git a/src/external_signer.cpp b/src/external_signer.cpp
index 6ef913e80783..c54563b2d329 100644
--- a/src/external_signer.cpp
+++ b/src/external_signer.cpp
@@ -13,9 +13,7 @@
 #include <string>
 #include <vector>
 
-#ifdef ENABLE_EXTERNAL_SIGNER
-
-ExternalSigner::ExternalSigner(const std::string& command, const std::string& fingerprint, const std::string chain, const std::string name): m_command(command), m_fingerprint(fingerprint), m_chain(chain), m_name(name) {}
+ExternalSigner::ExternalSigner(const std::string& command, const std::string chain, const std::string& fingerprint, const std::string name): m_command(command), m_chain(chain), m_fingerprint(fingerprint), m_name(name) {}
 
 std::string ExternalSigner::NetworkArg() const
 {
@@ -55,7 +53,7 @@ bool ExternalSigner::Enumerate(const std::string& command, std::vector<ExternalS
         if (model_field.isStr() && model_field.getValStr() != "") {
             name += model_field.getValStr();
         }
-        signers.push_back(ExternalSigner(command, fingerprintStr, chain, name));
+        signers.push_back(ExternalSigner(command, chain, fingerprintStr, name));
     }
     return true;
 }
@@ -116,5 +114,3 @@ bool ExternalSigner::SignTransaction(PartiallySignedTransaction& psbtx, std::str
 
     return true;
 }
-
-#endif // ENABLE_EXTERNAL_SIGNER
diff --git a/src/external_signer.h b/src/external_signer.h
index 4138a36f428d..cf301d2780bc 100644
--- a/src/external_signer.h
+++ b/src/external_signer.h
@@ -11,8 +11,6 @@
 #include <string>
 #include <vector>
 
-#ifdef ENABLE_EXTERNAL_SIGNER
-
 struct PartiallySignedTransaction;
 
 //! Enables interaction with an external signing device or service, such as
@@ -23,24 +21,24 @@ class ExternalSigner
     //! The command which handles interaction with the external signer.
     std::string m_command;
 
+    //! Dash mainnet, testnet, etc
+    std::string m_chain;
+
+    std::string NetworkArg() const;
+
 public:
     //! @param[in] command      the command which handles interaction with the external signer
     //! @param[in] fingerprint  master key fingerprint of the signer
     //! @param[in] chain        "main", "test", "regtest" or "signet"
     //! @param[in] name         device name
-    ExternalSigner(const std::string& command, const std::string& fingerprint, const std::string chain, const std::string name);
+    ExternalSigner(const std::string& command, const std::string chain, const std::string& fingerprint, const std::string name);
 
     //! Master key fingerprint of the signer
     std::string m_fingerprint;
 
-    //! Dash mainnet, testnet, etc
-    std::string m_chain;
-
     //! Name of signer
     std::string m_name;
 
-    std::string NetworkArg() const;
-
     //! Obtain a list of signers. Calls `<command> enumerate`.
     //! @param[in]              command the command which handles interaction with the external signer
     //! @param[in,out] signers  vector to which new signers (with a unique master key fingerprint) are added
@@ -65,6 +63,4 @@ class ExternalSigner
     bool SignTransaction(PartiallySignedTransaction& psbt, std::string& error);
 };
 
-#endif // ENABLE_EXTERNAL_SIGNER
-
 #endif // BITCOIN_EXTERNAL_SIGNER_H
diff --git a/src/interfaces/node.h b/src/interfaces/node.h
index 73ca5a16a9be..3f3a2066a755 100644
--- a/src/interfaces/node.h
+++ b/src/interfaces/node.h
@@ -241,10 +241,8 @@ class Node
     //! Disconnect node by id.
     virtual bool disconnectById(NodeId id) = 0;
 
-#ifdef ENABLE_EXTERNAL_SIGNER
     //! List external signers
     virtual std::vector<ExternalSigner> externalSigners() = 0;
-#endif
 
     //! Get total bytes recv.
     virtual int64_t getTotalBytesRecv() = 0;
diff --git a/src/node/interfaces.cpp b/src/node/interfaces.cpp
index b0c0fb7a8cb6..61dfef2328da 100644
--- a/src/node/interfaces.cpp
+++ b/src/node/interfaces.cpp
@@ -14,6 +14,7 @@
 #include <evo/deterministicmns.h>
 #include <governance/classes.h>
 #include <governance/exceptions.h>
+#include <external_signer.h>
 #include <governance/governance.h>
 #include <governance/object.h>
 #include <governance/vote.h>
@@ -555,16 +556,24 @@ class NodeImpl : public Node
         }
         return false;
     }
-#ifdef ENABLE_EXTERNAL_SIGNER
     std::vector<ExternalSigner> externalSigners() override
     {
+#ifdef ENABLE_EXTERNAL_SIGNER
         std::vector<ExternalSigner> signers = {};
         const std::string command = gArgs.GetArg("-signer", "");
         if (command == "") return signers;
         ExternalSigner::Enumerate(command, signers, Params().NetworkIDString());
         return signers;
+#else
+        // This result is undistinguisable from a succesful call that returns
+        // no signers. For the current GUI this doesn't matter, because the wallet
+        // creation dialog disables the external signer checkbox in both
+        // cases. The return type could be changed to std::optional<std::vector>
+        // (or something that also includes error messages) if this distinction
+        // becomes important.
+        return {};
+#endif // ENABLE_EXTERNAL_SIGNER
     }
-#endif
     int64_t getTotalBytesRecv() override { return m_context->connman ? m_context->connman->GetTotalBytesRecv() : 0; }
     int64_t getTotalBytesSent() override { return m_context->connman ? m_context->connman->GetTotalBytesSent() : 0; }
     size_t getMempoolSize() override { return m_context->mempool ? m_context->mempool->size() : 0; }
diff --git a/src/qt/createwalletdialog.cpp b/src/qt/createwalletdialog.cpp
index 8ad0eb427d3f..eac8f30444f3 100644
--- a/src/qt/createwalletdialog.cpp
+++ b/src/qt/createwalletdialog.cpp
@@ -43,8 +43,9 @@ CreateWalletDialog::CreateWalletDialog(QWidget* parent) :
         // Disable the disable_privkeys_checkbox and external_signer_checkbox when isEncryptWalletChecked is
         // set to true, enable it when isEncryptWalletChecked is false.
         ui->disable_privkeys_checkbox->setEnabled(!checked);
+#ifdef ENABLE_EXTERNAL_SIGNER
         ui->external_signer_checkbox->setEnabled(!checked);
-
+#endif
         // When the disable_privkeys_checkbox is disabled, uncheck it.
         if (!ui->disable_privkeys_checkbox->isEnabled()) {
             ui->disable_privkeys_checkbox->setChecked(false);
@@ -123,8 +124,7 @@ CreateWalletDialog::~CreateWalletDialog()
     delete ui;
 }
 
-#ifdef ENABLE_EXTERNAL_SIGNER
-void CreateWalletDialog::setSigners(std::vector<ExternalSigner>& signers)
+void CreateWalletDialog::setSigners(const std::vector<ExternalSigner>& signers)
 {
     if (!signers.empty()) {
         ui->external_signer_checkbox->setEnabled(true);
@@ -143,7 +143,6 @@ void CreateWalletDialog::setSigners(std::vector<ExternalSigner>& signers)
         ui->external_signer_checkbox->setEnabled(false);
     }
 }
-#endif
 
 QString CreateWalletDialog::walletName() const
 {
diff --git a/src/qt/createwalletdialog.h b/src/qt/createwalletdialog.h
index da3a83784674..5ba05cc2b8ae 100644
--- a/src/qt/createwalletdialog.h
+++ b/src/qt/createwalletdialog.h
@@ -7,11 +7,8 @@
 
 #include <QDialog>
 
-class WalletModel;
-
-#ifdef ENABLE_EXTERNAL_SIGNER
 class ExternalSigner;
-#endif
+class WalletModel;
 
 namespace Ui {
     class CreateWalletDialog;
@@ -27,9 +24,7 @@ class CreateWalletDialog : public QDialog
     explicit CreateWalletDialog(QWidget* parent);
     virtual ~CreateWalletDialog();
 
-#ifdef ENABLE_EXTERNAL_SIGNER
-    void setSigners(std::vector<ExternalSigner>& signers);
-#endif
+    void setSigners(const std::vector<ExternalSigner>& signers);
 
     QString walletName() const;
     bool isEncryptWalletChecked() const;
diff --git a/src/qt/optionsdialog.cpp b/src/qt/optionsdialog.cpp
index 51ae24e81f67..da72b71b0675 100644
--- a/src/qt/optionsdialog.cpp
+++ b/src/qt/optionsdialog.cpp
@@ -139,6 +139,11 @@ OptionsDialog::OptionsDialog(QWidget *parent, bool enableWallet) :
 
     showPage(0);
 
+#ifndef ENABLE_EXTERNAL_SIGNER
+    //: "External signing" means using devices such as hardware wallets.
+    ui->externalSignerPath->setToolTip(tr("Compiled without external signing support (required for external signing)"));
+    ui->externalSignerPath->setEnabled(false);
+#endif
     /* Display elements init */
 
     /* Number of displayed decimal digits selector */
diff --git a/src/qt/receiverequestdialog.cpp b/src/qt/receiverequestdialog.cpp
index fef2d28080bf..bb1a90d45c26 100644
--- a/src/qt/receiverequestdialog.cpp
+++ b/src/qt/receiverequestdialog.cpp
@@ -94,7 +94,7 @@ void ReceiveRequestDialog::setInfo(const SendCoinsRecipient &_info)
         ui->wallet_content->hide();
     }
 
-    ui->btnVerify->setVisible(this->model->wallet().hasExternalSigner());
+    ui->btnVerify->setVisible(model->wallet().hasExternalSigner());
 
     connect(ui->btnVerify, &QPushButton::clicked, [this] {
         model->displayAddress(info.address.toStdString());
diff --git a/src/qt/sendcoinsdialog.cpp b/src/qt/sendcoinsdialog.cpp
index 44bd678f3f3c..e858d6a803e2 100644
--- a/src/qt/sendcoinsdialog.cpp
+++ b/src/qt/sendcoinsdialog.cpp
@@ -227,12 +227,14 @@ void SendCoinsDialog::setModel(WalletModel *_model)
         updateSmartFeeLabel();
 
         if (model->wallet().hasExternalSigner()) {
+            //: "device" usually means a hardware wallet
             ui->sendButton->setText(tr("Sign on device"));
             if (gArgs.GetArg("-signer", "") != "") {
                 ui->sendButton->setEnabled(true);
                 ui->sendButton->setToolTip(tr("Connect your hardware wallet first."));
             } else {
                 ui->sendButton->setEnabled(false);
+                //: "External signer" means using devices such as hardware wallets.
                 ui->sendButton->setToolTip(tr("Set external signer script path in Options -> Wallet"));
             }
         } else if (model->wallet().privateKeysDisabled()) {
@@ -525,11 +527,13 @@ void SendCoinsDialog::sendButtonClicked([[maybe_unused]] bool checked)
                 return;
             }
             if (err == TransactionError::EXTERNAL_SIGNER_NOT_FOUND) {
+                //: "External signer" means using devices such as hardware wallets.
                 QMessageBox::critical(nullptr, tr("External signer not found"), "External signer not found");
                 send_failure = true;
                 return;
             }
             if (err == TransactionError::EXTERNAL_SIGNER_FAILED) {
+                //: "External signer" means using devices such as hardware wallets.
                 QMessageBox::critical(nullptr, tr("External signer failure"), "External signer failure");
                 send_failure = true;
                 return;
diff --git a/src/qt/walletcontroller.cpp b/src/qt/walletcontroller.cpp
index 7a54e8fbcb0a..6e8ff701602b 100644
--- a/src/qt/walletcontroller.cpp
+++ b/src/qt/walletcontroller.cpp
@@ -14,6 +14,7 @@
 
 #include <coinjoin/client.h>
 #include <node/context.h>
+#include <external_signer.h>
 #include <interfaces/handler.h>
 #include <interfaces/node.h>
 #include <util/string.h>
@@ -369,7 +370,6 @@ void CreateWalletActivity::create()
 {
     m_create_wallet_dialog = new CreateWalletDialog(m_parent_widget);
 
-#ifdef ENABLE_EXTERNAL_SIGNER
     std::vector<ExternalSigner> signers;
     try {
         signers = node().externalSigners();
@@ -377,7 +377,6 @@ void CreateWalletActivity::create()
         QMessageBox::critical(nullptr, tr("Can't list signers"), e.what());
     }
     m_create_wallet_dialog->setSigners(signers);
-#endif
 
     m_create_wallet_dialog->setWindowModality(Qt::ApplicationModal);
     m_create_wallet_dialog->show();
diff --git a/src/util/system.cpp b/src/util/system.cpp
index 02d9c706e1f3..50c761b8418a 100644
--- a/src/util/system.cpp
+++ b/src/util/system.cpp
@@ -1416,9 +1416,9 @@ void RenameThreadPool(ctpl::thread_pool& tp, const char* baseName)
     }
 }
 
-#ifdef ENABLE_EXTERNAL_SIGNER
 UniValue RunCommandParseJSON(const std::string& str_command, const std::string& str_std_in)
 {
+#ifdef ENABLE_EXTERNAL_SIGNER
     namespace bp = boost::process;
 
     UniValue result_json;
@@ -1450,8 +1450,10 @@ UniValue RunCommandParseJSON(const std::string& str_command, const std::string&
     if (!result_json.read(result)) throw std::runtime_error("Unable to parse JSON: " + result);
 
     return result_json;
-}
+#else
+    throw std::runtime_error("Compiled without external signing support (required for external signing).");
 #endif // ENABLE_EXTERNAL_SIGNER
+}
 
 void SetupEnvironment()
 {
diff --git a/src/util/system.h b/src/util/system.h
index b1a424df90a8..51bae62d70fe 100644
--- a/src/util/system.h
+++ b/src/util/system.h
@@ -113,7 +113,6 @@ std::string ShellEscape(const std::string& arg);
 #if HAVE_SYSTEM
 void runCommand(const std::string& strCommand);
 #endif
-#ifdef ENABLE_EXTERNAL_SIGNER
 /**
  * Execute a command which returns JSON, and parse the result.
  *
@@ -122,7 +121,6 @@ void runCommand(const std::string& strCommand);
  * @return parsed JSON
  */
 UniValue RunCommandParseJSON(const std::string& str_command, const std::string& str_std_in="");
-#endif // ENABLE_EXTERNAL_SIGNER
 
 /**
  * Most paths passed as configuration arguments are treated as relative to
diff --git a/src/wallet/external_signer_scriptpubkeyman.cpp b/src/wallet/external_signer_scriptpubkeyman.cpp
index cec9b47ff1d4..2d50c09b3574 100644
--- a/src/wallet/external_signer_scriptpubkeyman.cpp
+++ b/src/wallet/external_signer_scriptpubkeyman.cpp
@@ -13,8 +13,6 @@
 #include <utility>
 #include <vector>
 
-#ifdef ENABLE_EXTERNAL_SIGNER
-
 namespace wallet {
 bool ExternalSignerScriptPubKeyMan::SetupDescriptor(std::unique_ptr<Descriptor> desc)
 {
@@ -86,5 +84,3 @@ TransactionError ExternalSignerScriptPubKeyMan::FillPSBT(PartiallySignedTransact
     return TransactionError::OK;
 }
 } // namespace wallet
-
-#endif
diff --git a/src/wallet/external_signer_scriptpubkeyman.h b/src/wallet/external_signer_scriptpubkeyman.h
index 1f31f0238589..efb1b797f137 100644
--- a/src/wallet/external_signer_scriptpubkeyman.h
+++ b/src/wallet/external_signer_scriptpubkeyman.h
@@ -5,7 +5,6 @@
 #ifndef BITCOIN_WALLET_EXTERNAL_SIGNER_SCRIPTPUBKEYMAN_H
 #define BITCOIN_WALLET_EXTERNAL_SIGNER_SCRIPTPUBKEYMAN_H
 
-#ifdef ENABLE_EXTERNAL_SIGNER
 #include <wallet/scriptpubkeyman.h>
 
 #include <memory>
@@ -33,6 +32,5 @@ class ExternalSignerScriptPubKeyMan : public DescriptorScriptPubKeyMan
   TransactionError FillPSBT(PartiallySignedTransaction& psbt, const PrecomputedTransactionData& txdata, int sighash_type = 1 /* SIGHASH_ALL */, bool sign = true, bool bip32derivs = false, int* n_signed = nullptr, bool finalize = true) const override;
 };
 } // namespace wallet
-#endif
 
 #endif // BITCOIN_WALLET_EXTERNAL_SIGNER_SCRIPTPUBKEYMAN_H
diff --git a/src/wallet/scriptpubkeyman.cpp b/src/wallet/scriptpubkeyman.cpp
index 910b4b1eaf3e..947efc82715c 100644
--- a/src/wallet/scriptpubkeyman.cpp
+++ b/src/wallet/scriptpubkeyman.cpp
@@ -14,7 +14,6 @@
 #include <util/system.h>
 #include <util/translation.h>
 #include <wallet/bip39.h>
-#include <external_signer.h>
 #include <wallet/scriptpubkeyman.h>
 
 namespace wallet {
diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp
index 6636d273ef25..4f553114c5cd 100644
--- a/src/wallet/wallet.cpp
+++ b/src/wallet/wallet.cpp
@@ -11,6 +11,7 @@
 #include <consensus/amount.h>
 #include <consensus/consensus.h>
 #include <crypto/common.h>
+#include <external_signer.h>
 #include <fs.h>
 #include <interfaces/chain.h>
 #include <interfaces/wallet.h>
@@ -2503,7 +2504,6 @@ void ReserveDestination::ReturnDestination()
 
 bool CWallet::DisplayAddress(const CTxDestination& dest)
 {
-#ifdef ENABLE_EXTERNAL_SIGNER
     CScript scriptPubKey = GetScriptForDestination(dest);
     const auto spk_man = GetScriptPubKeyMan(scriptPubKey);
     if (spk_man == nullptr) {
@@ -2515,9 +2515,6 @@ bool CWallet::DisplayAddress(const CTxDestination& dest)
     }
     ExternalSigner signer = ExternalSignerScriptPubKeyMan::GetExternalSigner();
     return signer_spk_man->DisplayAddress(scriptPubKey, signer);
-#else
-    return false;
-#endif
 }
 
 bool CWallet::LockCoin(const COutPoint& output, WalletBatch* batch)
@@ -3802,12 +3799,8 @@ void CWallet::UpdateProgress(const std::string& title, int nProgress)
 void CWallet::LoadDescriptorScriptPubKeyMan(uint256 id, WalletDescriptor& desc)
 {
     if (IsWalletFlagSet(WALLET_FLAG_EXTERNAL_SIGNER)) {
-#ifdef ENABLE_EXTERNAL_SIGNER
         auto spk_manager = std::unique_ptr<ScriptPubKeyMan>(new ExternalSignerScriptPubKeyMan(*this, desc));
         m_spk_managers[id] = std::move(spk_manager);
-#else
-        throw std::runtime_error(std::string(__func__) + ": Compiled without external signing support (required for external signing)");
-#endif
     } else {
         auto spk_manager = std::unique_ptr<ScriptPubKeyMan>(new DescriptorScriptPubKeyMan(*this, desc));
         m_spk_managers[id] = std::move(spk_manager);
@@ -3852,7 +3845,6 @@ void CWallet::SetupDescriptorScriptPubKeyMans(const SecureString& mnemonic_arg,
         }
     }
     } else {
-#ifdef ENABLE_EXTERNAL_SIGNER
         ExternalSigner signer = ExternalSignerScriptPubKeyMan::GetExternalSigner();
 
         // TODO: add account parameter
@@ -3878,9 +3870,6 @@ void CWallet::SetupDescriptorScriptPubKeyMans(const SecureString& mnemonic_arg,
                 AddActiveScriptPubKeyMan(id, internal);
             }
         }
-#else
-        throw std::runtime_error(std::string(__func__) + ": Compiled without external signing support (required for external signing)");
-#endif // ENABLE_EXTERNAL_SIGNER
     }
 }
 

From 6d07721d0041e4430cbd42a837f0d74464174460 Mon Sep 17 00:00:00 2001
From: fanquake <fanquake@gmail.com>
Date: Thu, 1 Jul 2021 20:16:10 +0800
Subject: [PATCH 591/656] Merge bitcoin/bitcoin#22348: build: Fix cross build
 for Windows with Boost Process
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

67669ab425b52a2b6be3d2f3b3b7e3939b676a2c build: Fix Boost Process compatibility with mingw-w64 compiler (Hennadii Stepanov)

Pull request description:

  On master (9c3751a0c940228c46461c4191f1a57153cb9037) the cross build for Win64 is broken if configured with `--enable-external-signer`:
  ```
  ...
    CXX      crypto/libbitcoin_crypto_base_a-chacha_poly_aead.o
  In file included from /home/hebasto/GitHub/bitcoin/depends/x86_64-w64-mingw32/include/boost/process/detail/windows/handles.hpp:11,
                   from /home/hebasto/GitHub/bitcoin/depends/x86_64-w64-mingw32/include/boost/process/detail/used_handles.hpp:17,
                   from /home/hebasto/GitHub/bitcoin/depends/x86_64-w64-mingw32/include/boost/process/detail/windows/async_in.hpp:20,
                   from /home/hebasto/GitHub/bitcoin/depends/x86_64-w64-mingw32/include/boost/process/async.hpp:49,
                   from /home/hebasto/GitHub/bitcoin/depends/x86_64-w64-mingw32/include/boost/process.hpp:23,
                   from util/system.cpp:9:
  /home/hebasto/GitHub/bitcoin/depends/x86_64-w64-mingw32/include/boost/process/detail/windows/handle_workaround.hpp:208:51: error: expected ‘)’ before ‘*’ token
    208 | typedef ::boost::winapi::NTSTATUS_ (__kernel_entry *nt_system_query_information_p )(
        |                                    ~              ^~
        |                                                   )
  /home/hebasto/GitHub/bitcoin/depends/x86_64-w64-mingw32/include/boost/process/detail/windows/handle_workaround.hpp:223:51: error: expected ‘)’ before ‘*’ token
    223 | typedef ::boost::winapi::NTSTATUS_ (__kernel_entry *nt_query_object_p )(
        |                                    ~              ^~
        |                                                   )
  /home/hebasto/GitHub/bitcoin/depends/x86_64-w64-mingw32/include/boost/process/detail/windows/handle_workaround.hpp: In function ‘boost::winapi::NTSTATUS_ boost::process::detail::windows::workaround::nt_system_query_information(boost::process::detail::windows::workaround::SYSTEM_INFORMATION_CLASS_, void*, boost::winapi::ULONG_, boost::winapi::PULONG_)’:
  /home/hebasto/GitHub/bitcoin/depends/x86_64-w64-mingw32/include/boost/process/detail/windows/handle_workaround.hpp:239:12: error: ‘nt_system_query_information_p’ does not name a type; did you mean ‘nt_system_query_information’?
    239 |     static nt_system_query_information_p f = reinterpret_cast<nt_system_query_information_p>(::boost::winapi::get_proc_address(h, "NtQuerySystemInformation"));
        |            ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~
        |            nt_system_query_information
  In file included from /home/hebasto/GitHub/bitcoin/depends/x86_64-w64-mingw32/include/boost/process/detail/windows/handles.hpp:11,
                   from /home/hebasto/GitHub/bitcoin/depends/x86_64-w64-mingw32/include/boost/process/detail/used_handles.hpp:17,
                   from /home/hebasto/GitHub/bitcoin/depends/x86_64-w64-mingw32/include/boost/process/detail/windows/async_in.hpp:20,
                   from /home/hebasto/GitHub/bitcoin/depends/x86_64-w64-mingw32/include/boost/process/async.hpp:49,
                   from /home/hebasto/GitHub/bitcoin/depends/x86_64-w64-mingw32/include/boost/process.hpp:23,
                   from util/system.cpp:9:
  /home/hebasto/GitHub/bitcoin/depends/x86_64-w64-mingw32/include/boost/process/detail/windows/handle_workaround.hpp:241:14: error: ‘f’ was not declared in this scope
    241 |     return (*f)(SystemInformationClass, SystemInformation, SystemInformationLength, ReturnLength);
        |              ^
  /home/hebasto/GitHub/bitcoin/depends/x86_64-w64-mingw32/include/boost/process/detail/windows/handle_workaround.hpp: In function ‘boost::winapi::BOOL_ boost::process::detail::windows::workaround::nt_query_object(boost::winapi::HANDLE_, boost::process::detail::windows::workaround::OBJECT_INFORMATION_CLASS_, void*, boost::winapi::ULONG_, boost::winapi::PULONG_)’:
  /home/hebasto/GitHub/bitcoin/depends/x86_64-w64-mingw32/include/boost/process/detail/windows/handle_workaround.hpp:253:12: error: ‘nt_query_object_p’ does not name a type; did you mean ‘nt_query_object’?
    253 |     static nt_query_object_p f = reinterpret_cast<nt_query_object_p>(::boost::winapi::get_proc_address(h, "NtQueryObject"));
        |            ^~~~~~~~~~~~~~~~~
        |            nt_query_object
  /home/hebasto/GitHub/bitcoin/depends/x86_64-w64-mingw32/include/boost/process/detail/windows/handle_workaround.hpp:255:14: error: ‘f’ was not declared in this scope
    255 |     return (*f)(Handle, ObjectInformationClass, ObjectInformation, ObjectInformationLength, ReturnLength);
        |              ^
  make[2]: *** [Makefile:9906: util/libbitcoin_util_a-system.o] Error 1
  make[2]: *** Waiting for unfinished jobs....
    CXX      crypto/libbitcoin_crypto_base_a-chacha20.o
  make[2]: Leaving directory '/home/hebasto/GitHub/bitcoin/src'
  make[1]: *** [Makefile:16141: all-recursive] Error 1
  make[1]: Leaving directory '/home/hebasto/GitHub/bitcoin/src'
  make: *** [Makefile:820: all-recursive] Error 1
  ```

  The upstream bug: https://github.com/boostorg/process/issues/96
  Also see: https://stackoverflow.com/a/59338759

  https://github.com/bitcoin/bitcoin/pull/22348#issuecomment-871061160:
  > [This commit](https://github.com/boostorg/process/commit/7fc41b2815822b632d524d5c17897abbdf0c4653), containing the `__kernel_entry` [SAL annotations](https://docs.microsoft.com/en-us/cpp/code-quality/using-sal-annotations-to-reduce-c-cpp-code-defects?view=msvc-160) was included in Boost Process as part of the `1.71.0` release, which broke support for compiling with mingw-w64 because it doesn't define the `__kernel_entry` SAL annotation (but it does define some others, i.e see [`sal.h`](https://github.com/mirror/mingw-w64/blob/master/mingw-w64-headers/include/sal.h)).
  >
  > A [commit was made](https://github.com/boostorg/process/pull/171/commits/d7a721ee0d6859847947f60911259e2c34b0d066) to remove the annotations, however, it hasn't made it into either of the two Boost releases that have happened since (1.75.0 & 1.76.0). Meaning that this is currently needed for all versions of Boost process from 1.71.0 onwards.

ACKs for top commit:
  fanquake:
    ACK 67669ab425b52a2b6be3d2f3b3b7e3939b676a2c - thanks for updating this.

Tree-SHA512: 5931ca1fb77ce38c042cf5a7556add024ea2386c208bf26c792a8ca4a771d97fac9802c32fa8aa2e3de1ad35f3362d8c066f0a83ee675859d226c602fd0bcf93
---
 src/test/system_tests.cpp | 5 +++++
 src/util/system.cpp       | 5 +++++
 2 files changed, 10 insertions(+)

diff --git a/src/test/system_tests.cpp b/src/test/system_tests.cpp
index b8df7a4b4c6d..c2e7a77e73a8 100644
--- a/src/test/system_tests.cpp
+++ b/src/test/system_tests.cpp
@@ -7,6 +7,11 @@
 #include <univalue.h>
 
 #ifdef ENABLE_EXTERNAL_SIGNER
+#if defined(WIN32) && !defined(__kernel_entry)
+// A workaround for boost 1.71 incompatibility with mingw-w64 compiler.
+// For details see https://github.com/bitcoin/bitcoin/pull/22348.
+#define __kernel_entry
+#endif
 #include <boost/process.hpp>
 #endif // ENABLE_EXTERNAL_SIGNER
 
diff --git a/src/util/system.cpp b/src/util/system.cpp
index 50c761b8418a..1ba6700ba2fe 100644
--- a/src/util/system.cpp
+++ b/src/util/system.cpp
@@ -9,6 +9,11 @@
 #include <support/allocators/secure.h>
 
 #ifdef ENABLE_EXTERNAL_SIGNER
+#if defined(WIN32) && !defined(__kernel_entry)
+// A workaround for boost 1.71 incompatibility with mingw-w64 compiler.
+// For details see https://github.com/bitcoin/bitcoin/pull/22348.
+#define __kernel_entry
+#endif
 #include <boost/process.hpp>
 #endif // ENABLE_EXTERNAL_SIGNER
 

From 8e5f62472fb704eb02f050ba15903ad16e3b6337 Mon Sep 17 00:00:00 2001
From: Hennadii Stepanov <32963518+hebasto@users.noreply.github.com>
Date: Fri, 6 Aug 2021 19:14:51 +0300
Subject: [PATCH 592/656] Merge bitcoin-core/gui#396: Ensure external signer
 option remains disabled without signers

a9b9ca82daefc77ee3c884d3f250460d7cf734a5 gui: ensure external signer option remains disabled without signers (Andrew Chow)

Pull request description:

  When no external signers are available, the option to enable external signers should always be disabled. However the encrypt wallet checkbox can erroneously re-enable the external signer checkbox. To avoid this, CreateWalletDialog now stores whether signers were available during setSigners so that future calls to external_signer_checkbox->setEnabled can account for whether signers are available.

  Fixes #395

ACKs for top commit:
  hebasto:
    ACK a9b9ca82daefc77ee3c884d3f250460d7cf734a5, tested on Linux Mint 20.2 (Qt 5.12.8).
  Sjors:
    tACK a9b9ca82daefc77ee3c884d3f250460d7cf734a5
  jarolrod:
    ACK a9b9ca82daefc77ee3c884d3f250460d7cf734a5

Tree-SHA512: 98951bcadc23fce99a66ea2d367c44360989e888c253845a767e1f7085c594562d0f099de4130f4a078c5072aa7806294097d976ee6407291f3d3c5a4a608b44
---
 src/qt/createwalletdialog.cpp | 5 +++--
 src/qt/createwalletdialog.h   | 1 +
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/qt/createwalletdialog.cpp b/src/qt/createwalletdialog.cpp
index eac8f30444f3..2aba62c97e76 100644
--- a/src/qt/createwalletdialog.cpp
+++ b/src/qt/createwalletdialog.cpp
@@ -44,7 +44,7 @@ CreateWalletDialog::CreateWalletDialog(QWidget* parent) :
         // set to true, enable it when isEncryptWalletChecked is false.
         ui->disable_privkeys_checkbox->setEnabled(!checked);
 #ifdef ENABLE_EXTERNAL_SIGNER
-        ui->external_signer_checkbox->setEnabled(!checked);
+        ui->external_signer_checkbox->setEnabled(m_has_signers && !checked);
 #endif
         // When the disable_privkeys_checkbox is disabled, uncheck it.
         if (!ui->disable_privkeys_checkbox->isEnabled()) {
@@ -126,7 +126,8 @@ CreateWalletDialog::~CreateWalletDialog()
 
 void CreateWalletDialog::setSigners(const std::vector<ExternalSigner>& signers)
 {
-    if (!signers.empty()) {
+    m_has_signers = !signers.empty();
+    if (m_has_signers) {
         ui->external_signer_checkbox->setEnabled(true);
         ui->external_signer_checkbox->setChecked(true);
         ui->encrypt_wallet_checkbox->setEnabled(false);
diff --git a/src/qt/createwalletdialog.h b/src/qt/createwalletdialog.h
index 5ba05cc2b8ae..f93790c4dded 100644
--- a/src/qt/createwalletdialog.h
+++ b/src/qt/createwalletdialog.h
@@ -35,6 +35,7 @@ class CreateWalletDialog : public QDialog
 
 private:
     Ui::CreateWalletDialog *ui;
+    bool m_has_signers = false;
 };
 
 #endif // BITCOIN_QT_CREATEWALLETDIALOG_H

From 6a73d310a100ce892790b9f7f305473d21fdfbed Mon Sep 17 00:00:00 2001
From: "W. J. van der Laan" <laanwj@protonmail.com>
Date: Fri, 22 Oct 2021 16:10:25 +0200
Subject: [PATCH 593/656] Merge bitcoin/bitcoin#22789: external_signer: improve
 fingerprint matching logic (stop on first match)

d047ed729f1d4732d23324fc76849f3c657cdbe4 external_signer: improve fingerprint matching logic (stop on first match) (Sebastian Falbesoner)

Pull request description:

  The fingerprint matching logic in `ExternalSigner::SignTransaction` currently always iterates all inputs of a PSBT, even after a match has already been found. I guess the reason for that is not that it was not thought of, but rather the fact that breaking out of a nested loop is simply not possible (at least not without adding ugly constructs like gotos or extra state variables).
  This PR fixes this by using `std::any_of` from C++'s standard library, see http://www.cplusplus.com/reference/algorithm/any_of/

ACKs for top commit:
  lsilva01:
    Code Review ACK https://github.com/bitcoin/bitcoin/pull/22789/commits/d047ed729f1d4732d23324fc76849f3c657cdbe4
  Sjors:
    utACK d047ed7
  Zero-1729:
    crACK d047ed729f1d4732d23324fc76849f3c657cdbe4
  mjdietzx:
    Code review ACK d047ed729f1d4732d23324fc76849f3c657cdbe4
  hebasto:
    ACK d047ed729f1d4732d23324fc76849f3c657cdbe4, I have reviewed the code and it looks OK, I agree it can be merged.

Tree-SHA512: 447e7c0c6a5b5549a2c09d52e55ba4146302c1a06e4d96de11f6945d09f98c89129cba221202dff7e0718e01a83dd173b9f19b1f02b6be228978f3f6e35d8096
---
 src/external_signer.cpp | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/external_signer.cpp b/src/external_signer.cpp
index c54563b2d329..97cc6146b072 100644
--- a/src/external_signer.cpp
+++ b/src/external_signer.cpp
@@ -9,6 +9,7 @@
 #include <util/system.h>
 #include <external_signer.h>
 
+#include <algorithm>
 #include <stdexcept>
 #include <string>
 #include <vector>
@@ -75,15 +76,14 @@ bool ExternalSigner::SignTransaction(PartiallySignedTransaction& psbtx, std::str
     ssTx << psbtx;
 
     // Check if signer fingerprint matches any input master key fingerprint
-    bool match = false;
-    for (unsigned int i = 0; i < psbtx.inputs.size(); ++i) {
-        const PSBTInput& input = psbtx.inputs[i];
+    auto matches_signer_fingerprint = [&](const PSBTInput& input) {
         for (const auto& entry : input.hd_keypaths) {
-            if (m_fingerprint == strprintf("%08x", ReadBE32(entry.second.fingerprint))) match = true;
+            if (m_fingerprint == strprintf("%08x", ReadBE32(entry.second.fingerprint))) return true;
         }
-    }
+        return false;
+    };
 
-    if (!match) {
+    if (!std::any_of(psbtx.inputs.begin(), psbtx.inputs.end(), matches_signer_fingerprint)) {
         error = "Signer fingerprint " + m_fingerprint + " does not match any of the inputs:\n" + EncodeBase64(ssTx.str());
         return false;
     }

From 8c559bede6a18cc83cd584d990afe2f9691f42da Mon Sep 17 00:00:00 2001
From: "W. J. van der Laan" <laanwj@protonmail.com>
Date: Mon, 15 Nov 2021 17:12:05 +0100
Subject: [PATCH 594/656] Merge bitcoin/bitcoin#23004: multiprocess: add
 interfaces::ExternalSigner class

a032fa30d282fa69c304e0afd1f95f67c55d22e3 multiprocess: add interfaces::ExternalSigner class (Russell Yanofsky)

Pull request description:

  Add `interfaces::ExternalSigner` class to let signer objects be passed between processes and let signer code run in the original process where the object was created.

  ---

  This PR is part of the [process separation project](https://github.com/bitcoin/bitcoin/projects/10).

ACKs for top commit:
  laanwj:
    Concept and code review ACK a032fa30d282fa69c304e0afd1f95f67c55d22e3
  hebasto:
    re-ACK a032fa30d282fa69c304e0afd1f95f67c55d22e3

Tree-SHA512: 99a729fb3a64d010e142cc778a9f1f358e58345b77faaf2664de7d2277715d59df3352326e8f0f2a6628038670eaa4556310a549079fb28af6d2eeb05aea1460
---
 src/interfaces/node.h         | 15 ++++++++++++---
 src/node/interfaces.cpp       | 21 ++++++++++++++++++---
 src/qt/createwalletdialog.cpp |  6 +++---
 src/qt/createwalletdialog.h   |  7 ++++++-
 src/qt/walletcontroller.cpp   |  4 ++--
 5 files changed, 41 insertions(+), 12 deletions(-)

diff --git a/src/interfaces/node.h b/src/interfaces/node.h
index 3f3a2066a755..e3429afcd888 100644
--- a/src/interfaces/node.h
+++ b/src/interfaces/node.h
@@ -6,7 +6,6 @@
 #define BITCOIN_INTERFACES_NODE_H
 
 #include <consensus/amount.h>          // For CAmount
-#include <external_signer.h>
 #include <net.h>                       // For NodeId
 #include <net_types.h>                 // For banmap_t
 #include <netaddress.h>                // For Network
@@ -159,6 +158,16 @@ struct BlockAndHeaderTipInfo
     double verification_progress;
 };
 
+//! External signer interface used by the GUI.
+class ExternalSigner
+{
+public:
+    virtual ~ExternalSigner() {};
+
+    //! Get signer display name
+    virtual std::string getName() = 0;
+};
+
 //! Top-level interface for a dash node (dashd process).
 class Node
 {
@@ -241,8 +250,8 @@ class Node
     //! Disconnect node by id.
     virtual bool disconnectById(NodeId id) = 0;
 
-    //! List external signers
-    virtual std::vector<ExternalSigner> externalSigners() = 0;
+    //! Return list of external signers (attached devices which can sign transactions).
+    virtual std::vector<std::unique_ptr<ExternalSigner>> listExternalSigners() = 0;
 
     //! Get total bytes recv.
     virtual int64_t getTotalBytesRecv() = 0;
diff --git a/src/node/interfaces.cpp b/src/node/interfaces.cpp
index 61dfef2328da..f2fc6401e329 100644
--- a/src/node/interfaces.cpp
+++ b/src/node/interfaces.cpp
@@ -399,6 +399,17 @@ class CoinJoinOptionsImpl : public CoinJoin::Options
     }
 };
 
+#ifdef ENABLE_EXTERNAL_SIGNER
+class ExternalSignerImpl : public interfaces::ExternalSigner
+{
+public:
+    ExternalSignerImpl(::ExternalSigner signer) : m_signer(std::move(signer)) {}
+    std::string getName() override { return m_signer.m_name; }
+private:
+    ::ExternalSigner m_signer;
+};
+#endif
+
 class NodeImpl : public Node
 {
 private:
@@ -556,14 +567,18 @@ class NodeImpl : public Node
         }
         return false;
     }
-    std::vector<ExternalSigner> externalSigners() override
+    std::vector<std::unique_ptr<interfaces::ExternalSigner>> listExternalSigners() override
     {
 #ifdef ENABLE_EXTERNAL_SIGNER
         std::vector<ExternalSigner> signers = {};
         const std::string command = gArgs.GetArg("-signer", "");
-        if (command == "") return signers;
+        if (command == "") return {};
         ExternalSigner::Enumerate(command, signers, Params().NetworkIDString());
-        return signers;
+        std::vector<std::unique_ptr<interfaces::ExternalSigner>> result;
+        for (auto& signer : signers) {
+            result.emplace_back(std::make_unique<ExternalSignerImpl>(std::move(signer)));
+        }
+        return result;
 #else
         // This result is undistinguisable from a succesful call that returns
         // no signers. For the current GUI this doesn't matter, because the wallet
diff --git a/src/qt/createwalletdialog.cpp b/src/qt/createwalletdialog.cpp
index 2aba62c97e76..8b19e927ba72 100644
--- a/src/qt/createwalletdialog.cpp
+++ b/src/qt/createwalletdialog.cpp
@@ -6,7 +6,7 @@
 #include <config/bitcoin-config.h>
 #endif
 
-#include <external_signer.h>
+#include <interfaces/node.h>
 #include <qt/createwalletdialog.h>
 #include <qt/forms/ui_createwalletdialog.h>
 
@@ -124,7 +124,7 @@ CreateWalletDialog::~CreateWalletDialog()
     delete ui;
 }
 
-void CreateWalletDialog::setSigners(const std::vector<ExternalSigner>& signers)
+void CreateWalletDialog::setSigners(const std::vector<std::unique_ptr<interfaces::ExternalSigner>>& signers)
 {
     m_has_signers = !signers.empty();
     if (m_has_signers) {
@@ -137,7 +137,7 @@ void CreateWalletDialog::setSigners(const std::vector<ExternalSigner>& signers)
         ui->blank_wallet_checkbox->setChecked(false);
         ui->disable_privkeys_checkbox->setEnabled(false);
         ui->disable_privkeys_checkbox->setChecked(true);
-        const std::string label = signers[0].m_name;
+        const std::string label = signers[0]->getName();
         ui->wallet_name_line_edit->setText(QString::fromStdString(label));
         ui->buttonBox->button(QDialogButtonBox::Ok)->setEnabled(true);
     } else {
diff --git a/src/qt/createwalletdialog.h b/src/qt/createwalletdialog.h
index f93790c4dded..939b82ff78c4 100644
--- a/src/qt/createwalletdialog.h
+++ b/src/qt/createwalletdialog.h
@@ -7,7 +7,12 @@
 
 #include <QDialog>
 
+#include <memory>
+
+namespace interfaces {
 class ExternalSigner;
+} // namespace interfaces
+
 class WalletModel;
 
 namespace Ui {
@@ -24,7 +29,7 @@ class CreateWalletDialog : public QDialog
     explicit CreateWalletDialog(QWidget* parent);
     virtual ~CreateWalletDialog();
 
-    void setSigners(const std::vector<ExternalSigner>& signers);
+    void setSigners(const std::vector<std::unique_ptr<interfaces::ExternalSigner>>& signers);
 
     QString walletName() const;
     bool isEncryptWalletChecked() const;
diff --git a/src/qt/walletcontroller.cpp b/src/qt/walletcontroller.cpp
index 6e8ff701602b..a6b071ef1b2f 100644
--- a/src/qt/walletcontroller.cpp
+++ b/src/qt/walletcontroller.cpp
@@ -370,9 +370,9 @@ void CreateWalletActivity::create()
 {
     m_create_wallet_dialog = new CreateWalletDialog(m_parent_widget);
 
-    std::vector<ExternalSigner> signers;
+    std::vector<std::unique_ptr<interfaces::ExternalSigner>> signers;
     try {
-        signers = node().externalSigners();
+        signers = node().listExternalSigners();
     } catch (const std::runtime_error& e) {
         QMessageBox::critical(nullptr, tr("Can't list signers"), e.what());
     }

From 65bb4614a497b471e3f1347bfac2dabfabb46fa6 Mon Sep 17 00:00:00 2001
From: fanquake <fanquake@gmail.com>
Date: Fri, 10 Dec 2021 08:44:41 +0800
Subject: [PATCH 595/656] Merge bitcoin/bitcoin#23628: Check descriptors
 returned by external signers

5493e925013245d5ad0f7ea8784fe07f531803d0 Check descriptors returned by external signers (sstone)

Pull request description:

  Check that descriptors returned by external signers have been parsed properly when creating a new wallet.
  See https://github.com/bitcoin/bitcoin/issues/23627 for context.

  The problem is that parsing an invalid descriptor will return `null` which is not checked for in `CWallet::SetupDescriptorScriptPubKeyMans()`.

  I'm not completely sure what the best fix is since there several strategies for dealing with errors in the current codebase but the proposed fix is very simple and consistent with other validation checks in `CWallet::SetupDescriptorScriptPubKeyMans()`.

ACKs for top commit:
  jamesob:
    Code review ACK https://github.com/bitcoin/bitcoin/pull/23628/commits/5493e925013245d5ad0f7ea8784fe07f531803d0
  achow101:
    ACK 5493e925013245d5ad0f7ea8784fe07f531803d0

Tree-SHA512: 63259f4aa519405a86c554b6813efdb741314bdaa18bf005b70ea8bb92a27abc6e2b65f7c584641dc257fc78a6499f42b51b5310c243e611c4663430dccf3d04
---
 src/wallet/wallet.cpp                   |  7 ++-
 test/functional/mocks/invalid_signer.py | 65 +++++++++++++++++++++++++
 test/functional/wallet_signer.py        | 17 +++++++
 3 files changed, 87 insertions(+), 2 deletions(-)
 create mode 100755 test/functional/mocks/invalid_signer.py

diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp
index 4f553114c5cd..45c4859660d6 100644
--- a/src/wallet/wallet.cpp
+++ b/src/wallet/wallet.cpp
@@ -3858,8 +3858,11 @@ void CWallet::SetupDescriptorScriptPubKeyMans(const SecureString& mnemonic_arg,
             for (const UniValue& desc_val : descriptor_vals.get_array().getValues()) {
                 std::string desc_str = desc_val.getValStr();
                 FlatSigningProvider keys;
-                std::string dummy_error;
-                std::unique_ptr<Descriptor> desc = Parse(desc_str, keys, dummy_error, false);
+                std::string desc_error;
+                std::unique_ptr<Descriptor> desc = Parse(desc_str, keys, desc_error, false);
+                if (desc == nullptr) {
+                    throw std::runtime_error(std::string(__func__) + ": Invalid descriptor \"" + desc_str + "\" (" + desc_error + ")");
+                }
                 if (!desc->GetOutputType()) {
                     continue;
                 }
diff --git a/test/functional/mocks/invalid_signer.py b/test/functional/mocks/invalid_signer.py
new file mode 100755
index 000000000000..4dd213cc3c0b
--- /dev/null
+++ b/test/functional/mocks/invalid_signer.py
@@ -0,0 +1,65 @@
+#!/usr/bin/env python3
+# Copyright (c) 2018-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.
+
+import os
+import sys
+import argparse
+import json
+
+def perform_pre_checks():
+    mock_result_path = os.path.join(os.getcwd(), "mock_result")
+    if(os.path.isfile(mock_result_path)):
+        with open(mock_result_path, "r", encoding="utf8") as f:
+            mock_result = f.read()
+        if mock_result[0]:
+            sys.stdout.write(mock_result[2:])
+            sys.exit(int(mock_result[0]))
+
+def enumerate(args):
+    sys.stdout.write(json.dumps([{"fingerprint": "b3c19bfc", "type": "trezor", "model": "trezor_t"}, {"fingerprint": "00000002"}]))
+
+def getdescriptors(args):
+    xpub_pkh = "xpub6CRhJvXV8x2AKWvqi1ZSMFU6cbxzQiYrv3dxSUXCawjMJ1JzpqVsveH4way1yCmJm29KzH1zrVZmVwes4Qo6oXVE1HFn4fdiKrYJngqFFc6"
+    xpub_sh = "xpub6CoNoq3Tg4tGSpom2BSwL42gy864KHo3TXkHxLxBbhvCkgmdVXADQmiHbLZhX3Me1cYhRx7s25Lpm4LnT5zu395ANHsXB2QvT9tqJDAibTN"
+    xpub_pkh = "xpub6DUcLgY1DfgDy2RV6q4djwwsLitaoZDumbribqrR8mP78fEtgZa1XEsqT5MWQ7gwLwKsTQPT28XLoVE5A97rDNTwMXjmzPaNijoCApCbWvp"
+
+    sys.stdout.write(json.dumps({
+        "receive": [
+            "pkh([b3c19bfc/44'/1'/" + args.account + "']" + xpub_pkh + "/0/*)#h26nxtl9",
+            "sh(pkh([b3c19bfc/49'/1'/" + args.account + "']" + xpub_sh + "/0/*))#32ry02yp",
+            "pkh([b3c19bfc/84'/1'/" + args.account + "']" + xpub_pkh + "/0/*)#jftn8ppv"
+        ],
+        "internal": [
+            "pkh([b3c19bfc/44'/1'/" + args.account + "']" + xpub_pkh + "/1/*)#x7ljm70a",
+            "sh(pkh([b3c19bfc/49'/1'/" + args.account + "']" + xpub_sh + "/1/*))#ytdjh437",
+            "pkh([b3c19bfc/84'/1'/" + args.account + "']" + xpub_pkh + "/1/*)#rawj6535"
+        ]
+    }))
+
+parser = argparse.ArgumentParser(prog='./invalid_signer.py', description='External invalid signer mock')
+parser.add_argument('--fingerprint')
+parser.add_argument('--chain', default='main')
+parser.add_argument('--stdin', action='store_true')
+
+subparsers = parser.add_subparsers(description='Commands', dest='command')
+subparsers.required = True
+
+parser_enumerate = subparsers.add_parser('enumerate', help='list available signers')
+parser_enumerate.set_defaults(func=enumerate)
+
+parser_getdescriptors = subparsers.add_parser('getdescriptors')
+parser_getdescriptors.set_defaults(func=getdescriptors)
+parser_getdescriptors.add_argument('--account', metavar='account')
+
+if not sys.stdin.isatty():
+    buffer = sys.stdin.read()
+    if buffer and buffer.rstrip() != "":
+        sys.argv.extend(buffer.rstrip().split(" "))
+
+args = parser.parse_args()
+
+perform_pre_checks()
+
+args.func(args)
diff --git a/test/functional/wallet_signer.py b/test/functional/wallet_signer.py
index 84eb409f609a..5951f40e2a50 100755
--- a/test/functional/wallet_signer.py
+++ b/test/functional/wallet_signer.py
@@ -25,6 +25,13 @@ def mock_signer_path(self):
         else:
             return path
 
+    def mock_invalid_signer_path(self):
+        path = os.path.join(os.path.dirname(os.path.realpath(__file__)), 'mocks', 'invalid_signer.py')
+        if platform.system() == "Windows":
+            return "py " + path
+        else:
+            return path
+
     def set_test_params(self):
         self.num_nodes = 2
 
@@ -45,6 +52,11 @@ def clear_mock_result(self, node):
         os.remove(os.path.join(node.cwd, "mock_result"))
 
     def run_test(self):
+        self.test_valid_signer()
+        self.restart_node(1, [f"-signer={self.mock_invalid_signer_path()}", "-keypool=10"])
+        self.test_invalid_signer()
+
+    def test_valid_signer(self):
         self.log.debug(f"-signer={self.mock_signer_path()}")
 
         # Create new wallets for an external signer.
@@ -171,5 +183,10 @@ def run_test(self):
         # )
         # self.clear_mock_result(self.nodes[4])
 
+    def test_invalid_signer(self):
+        self.log.debug(f"-signer={self.mock_invalid_signer_path()}")
+        self.log.info('Test invalid external signer')
+        assert_raises_rpc_error(-1, "Invalid descriptor", self.nodes[1].createwallet, wallet_name='hww_invalid', disable_private_keys=True, descriptors=True, external_signer=True)
+
 if __name__ == '__main__':
     WalletSignerTest().main()

From a6f7e73add70d30e4dbf4b716672512d52a9385a Mon Sep 17 00:00:00 2001
From: Andrew Chow <achow101-github@achow101.com>
Date: Fri, 11 Feb 2022 12:20:13 -0500
Subject: [PATCH 596/656] Merge bitcoin/bitcoin#24307: RPC: Return
 external_signer in getwalletinfo

b75f4c89ec4d33a3014ccd5151964881b5e0aa1c RPC: Return external_signer in getwalletinfo (Kristaps Kaupe)

Pull request description:

  Add `external_signer` to the result object of `getwalletinfo` RPC which indicates whether `WALLET_FLAG_EXTERNAL_SIGNER` flag is set for the wallet.

ACKs for top commit:
  S3RK:
    utACK b75f4c89ec4d33a3014ccd5151964881b5e0aa1c
  achow101:
    ACK b75f4c89ec4d33a3014ccd5151964881b5e0aa1c
  prayank23:
    utACK https://github.com/bitcoin/bitcoin/pull/24307/commits/b75f4c89ec4d33a3014ccd5151964881b5e0aa1c
  brunoerg:
    utACK b75f4c89ec4d33a3014ccd5151964881b5e0aa1c

Tree-SHA512: 066ccb97541fd4dc3d9728834645db714a3c8c93ccf29142811af4d79cfb9440a97bbb6c845434a909bc6e1775ef3737fcbb368c1f0582bc63973f6deb17a45f
---
 src/wallet/rpc/wallet.cpp        | 2 ++
 test/functional/wallet_signer.py | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/src/wallet/rpc/wallet.cpp b/src/wallet/rpc/wallet.cpp
index eca4d456a869..df765bd52ed4 100644
--- a/src/wallet/rpc/wallet.cpp
+++ b/src/wallet/rpc/wallet.cpp
@@ -191,6 +191,7 @@ static RPCHelpMan getwalletinfo()
                                      {RPCResult::Type::NUM, "progress", "scanning progress percentage [0.0, 1.0]"},
                                 }},
                             {RPCResult::Type::BOOL, "descriptors", "whether this wallet uses descriptors for scriptPubKey management"},
+                            {RPCResult::Type::BOOL, "external_signer", "whether this wallet is configured to use an external signer such as a hardware wallet"},
                         },
                 },
                 RPCExamples{
@@ -268,6 +269,7 @@ static RPCHelpMan getwalletinfo()
         obj.pushKV("scanning", false);
     }
     obj.pushKV("descriptors", pwallet->IsWalletFlagSet(WALLET_FLAG_DESCRIPTORS));
+    obj.pushKV("external_signer", pwallet->IsWalletFlagSet(WALLET_FLAG_EXTERNAL_SIGNER));
     return obj;
 },
     };
diff --git a/test/functional/wallet_signer.py b/test/functional/wallet_signer.py
index 5951f40e2a50..19ac88527ef1 100755
--- a/test/functional/wallet_signer.py
+++ b/test/functional/wallet_signer.py
@@ -69,10 +69,12 @@ def test_valid_signer(self):
 
         self.nodes[1].createwallet(wallet_name='hww', disable_private_keys=True, descriptors=True, external_signer=True)
         hww = self.nodes[1].get_wallet_rpc('hww')
+        assert_equal(hww.getwalletinfo()["external_signer"], True)
 
         # Flag can't be set afterwards (could be added later for non-blank descriptor based watch-only wallets)
         self.nodes[1].createwallet(wallet_name='not_hww', disable_private_keys=True, descriptors=True, external_signer=False)
         not_hww = self.nodes[1].get_wallet_rpc('not_hww')
+        assert_equal(not_hww.getwalletinfo()["external_signer"], False)
         assert_raises_rpc_error(-8, "Wallet flag is immutable: external_signer", not_hww.setwalletflag, "external_signer", True)
 
         # assert_raises_rpc_error(-4, "Multiple signers found, please specify which to use", wallet_name='not_hww', disable_private_keys=True, descriptors=True, external_signer=True)

From e852bdf627c57c68c9ce3ad3711178f8b443fc16 Mon Sep 17 00:00:00 2001
From: Andrew Chow <achow101-github@achow101.com>
Date: Wed, 23 Feb 2022 17:19:19 -0500
Subject: [PATCH 597/656] Merge bitcoin/bitcoin#24401: wallet: Add
 external-signer-support specific error message
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

7f3a6a9495fafbf77f221297615fa56dc3ecc64a wallet: Add external-signer-support specific error message (Hennadii Stepanov)

Pull request description:

  On master (5f44c5c428b696af4214b2519cb2bbeb0e4a1027) an attempt to load an external signer wallet using Bitcoin Core compiled without external signer support fails with the following log messages:
  ```
  2022-02-20T19:01:11Z [qt-walletctrl] Using SQLite Version 3.31.1
  2022-02-20T19:01:11Z [qt-walletctrl] Using wallet /home/hebasto/.bitcoin/testnet3/wallets/coldcard-0220
  2022-02-20T19:01:11Z [qt-walletctrl] init message: Loading wallet…
  2022-02-20T19:01:11Z [qt-walletctrl] [coldcard-0220] Error: External signer wallet being loaded without external signer support compiled
  2022-02-20T19:01:11Z [qt-walletctrl] [coldcard-0220] Releasing wallet
  ```

  While log messages are good, a message in the GUI window is completely misleading:

  ![Screenshot from 2022-02-20 20-43-46](https://user-images.githubusercontent.com/32963518/154859854-b87032e0-c428-4e11-8009-39e38200482c.png)

  This PR fixes this issue:

  ![Screenshot from 2022-02-20 21-01-18](https://user-images.githubusercontent.com/32963518/154859868-e3a2c89d-4f0f-424e-96cb-7accaa48acc0.png)

ACKs for top commit:
  achow101:
    ACK 7f3a6a9495fafbf77f221297615fa56dc3ecc64a
  kristapsk:
    ACK 7f3a6a9495fafbf77f221297615fa56dc3ecc64a
  brunoerg:
    crACK 7f3a6a9495fafbf77f221297615fa56dc3ecc64a

Tree-SHA512: a4842751c0ca8a37ccc3ea00503678f6b712a7f53d6cbdc07ce02dcb85ca8a94890d1c2da20307be043faa347747abeba29185c88ba12edd5253bfca56531585
---
 src/wallet/wallet.cpp   | 4 ++++
 src/wallet/walletdb.cpp | 2 +-
 src/wallet/walletdb.h   | 1 +
 3 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp
index 45c4859660d6..20a1376e0b51 100644
--- a/src/wallet/wallet.cpp
+++ b/src/wallet/wallet.cpp
@@ -2846,6 +2846,10 @@ std::shared_ptr<CWallet> CWallet::Create(WalletContext& context, const std::stri
             error = strprintf(_("Error loading %s: Wallet requires newer version of %s"), walletFile, PACKAGE_NAME);
             return nullptr;
         }
+        else if (nLoadWalletRet == DBErrors::EXTERNAL_SIGNER_SUPPORT_REQUIRED) {
+            error = strprintf(_("Error loading %s: External signer wallet being loaded without external signer support compiled"), walletFile);
+            return nullptr;
+        }
         else if (nLoadWalletRet == DBErrors::NEED_REWRITE)
         {
             error = strprintf(_("Wallet needed to be rewritten: restart %s to complete"), PACKAGE_NAME);
diff --git a/src/wallet/walletdb.cpp b/src/wallet/walletdb.cpp
index 234269b9ddea..3b9237dcc435 100644
--- a/src/wallet/walletdb.cpp
+++ b/src/wallet/walletdb.cpp
@@ -822,7 +822,7 @@ DBErrors WalletBatch::LoadWallet(CWallet* pwallet)
 #ifndef ENABLE_EXTERNAL_SIGNER
         if (pwallet->IsWalletFlagSet(WALLET_FLAG_EXTERNAL_SIGNER)) {
             pwallet->WalletLogPrintf("Error: External signer wallet being loaded without external signer support compiled\n");
-            return DBErrors::TOO_NEW;
+            return DBErrors::EXTERNAL_SIGNER_SUPPORT_REQUIRED;
         }
 #endif
 
diff --git a/src/wallet/walletdb.h b/src/wallet/walletdb.h
index 9d31bbbe2128..44aaa0145a30 100644
--- a/src/wallet/walletdb.h
+++ b/src/wallet/walletdb.h
@@ -53,6 +53,7 @@ enum class DBErrors
     CORRUPT,
     NONCRITICAL_ERROR,
     TOO_NEW,
+    EXTERNAL_SIGNER_SUPPORT_REQUIRED,
     LOAD_FAIL,
     NEED_REWRITE
 };

From 8fae18971cff368f8eb815f960d1edde4a6ad0a8 Mon Sep 17 00:00:00 2001
From: Andrew Chow <achow101-github@achow101.com>
Date: Mon, 16 May 2022 15:49:54 -0400
Subject: [PATCH 598/656] Merge bitcoin/bitcoin#25019: parse external signer
 master fp as bytes in ExternalSigner::SignTransaction

2a22f034ca3298c9f86d1edd4283a0bea18dfbbe parsing external signer master fingerprint string as bytes instead of caring for lower/upper case in ExternalSigner::SignTransaction (avirgovi)

Pull request description:

  Some external signers scripts may provide master fingerprint in uppercase format. In that case core will fail with `Signer fingerprint 00000000 does not match any of the inputs` as it only works with lowercase format. Even if the fingerprints match, yet one is lowercase the other uppercase.

  ExternalSigner::SignTransaction is the only place where it is needed IMO, as changing it in other places may break the communication with the external signer (i.e. enumerating with lowercase may not find the device).

ACKs for top commit:
  achow101:
    ACK 2a22f034ca3298c9f86d1edd4283a0bea18dfbbe
  theStack:
    Code-review ACK 2a22f034ca3298c9f86d1edd4283a0bea18dfbbe
  Sjors:
    utACK 2a22f034ca3298c9f86d1edd4283a0bea18dfbbe

Tree-SHA512: f3d84b83fb0b5e06c405eaf9bf20a2fa864bf4172fd4de113b80b9b9a525a76f2f8cf63031b480358b3a7666023a2aef131fb89ff50448c66df3ed541da10f99
---
 src/external_signer.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/external_signer.cpp b/src/external_signer.cpp
index 97cc6146b072..3057fa687e0c 100644
--- a/src/external_signer.cpp
+++ b/src/external_signer.cpp
@@ -74,11 +74,12 @@ bool ExternalSigner::SignTransaction(PartiallySignedTransaction& psbtx, std::str
     // Serialize the PSBT
     CDataStream ssTx(SER_NETWORK, PROTOCOL_VERSION);
     ssTx << psbtx;
-
+    // parse ExternalSigner master fingerprint
+    std::vector<unsigned char> parsed_m_fingerprint = ParseHex(m_fingerprint);
     // Check if signer fingerprint matches any input master key fingerprint
     auto matches_signer_fingerprint = [&](const PSBTInput& input) {
         for (const auto& entry : input.hd_keypaths) {
-            if (m_fingerprint == strprintf("%08x", ReadBE32(entry.second.fingerprint))) return true;
+            if (parsed_m_fingerprint == MakeUCharSpan(entry.second.fingerprint)) return true;
         }
         return false;
     };

From 6c4ba3429985ed658cc80e6d10275d1c4ffb32d1 Mon Sep 17 00:00:00 2001
From: fanquake <fanquake@gmail.com>
Date: Thu, 4 Aug 2022 09:06:58 +0100
Subject: [PATCH 599/656] Merge bitcoin/bitcoin#25770: build: Fix help string
 for `--enable-external-signer` configure option

8df063e53712b69a346a83c599ca9cb83905b70b build: Fix help string for `--enable-external-signer` configure option (Hennadii Stepanov)

Pull request description:

  This PR is a follow up of bitcoin/bitcoin#24065 and fixes the help string according to the actual default value https://github.com/bitcoin/bitcoin/blob/816ca01650f4cc66a61ac2f9b0f8b74cd9cd0cf8/configure.ac#L324-L327

ACKs for top commit:
  kristapsk:
    cr utACK 8df063e53712b69a346a83c599ca9cb83905b70b
  jarolrod:
    ACK 8df063e53712b69a346a83c599ca9cb83905b70b

Tree-SHA512: ad3f457a53c9238ddd8ded9efd1224e564e6cb9da8b7ff7733a11e32a7daad5c0f6c6223509218f44944a874470cb0d2447897662eaf4e78c763b30785717c50
---
 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/configure.ac b/configure.ac
index 3eab070d4f31..cce2c5f074c7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -320,7 +320,7 @@ AC_ARG_ENABLE([werror],
     [enable_werror=no])
 
 AC_ARG_ENABLE([external-signer],
-    [AS_HELP_STRING([--enable-external-signer],[compile external signer support (default is yes, requires Boost::Process)])],
+    [AS_HELP_STRING([--enable-external-signer],[compile external signer support (default is auto, requires Boost::Process)])],
     [use_external_signer=$enableval],
     [use_external_signer=yes])
 

From f6410f37cff3b1c0927cc7c2152203d3d3516707 Mon Sep 17 00:00:00 2001
From: Konstantin Akimov <knstqq@gmail.com>
Date: Mon, 13 May 2024 23:55:10 +0700
Subject: [PATCH 600/656] fix: dashify doc/external-signer.md

---
 doc/external-signer.md | 32 ++++++++++++++++----------------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/doc/external-signer.md b/doc/external-signer.md
index de44cdd88013..fc69fb4391b2 100644
--- a/doc/external-signer.md
+++ b/doc/external-signer.md
@@ -1,29 +1,29 @@
-# Support for signing transactions outside of Bitcoin Core
+# Support for signing transactions outside of Dash Core
 
-Bitcoin Core can be launched with `-signer=<cmd>` where `<cmd>` is an external tool which can sign transactions and perform other functions. For example, it can be used to communicate with a hardware wallet.
+Dash Core can be launched with `-signer=<cmd>` where `<cmd>` is an external tool which can sign transactions and perform other functions. For example, it can be used to communicate with a hardware wallet.
 
 ## Example usage
 
-The following example is based on the [HWI](https://github.com/bitcoin-core/HWI) tool. Version 2.0 or newer is required. Although this tool is hosted under the Bitcoin Core GitHub organization and maintained by Bitcoin Core developers, it should be used with caution. It is considered experimental and has far less review than Bitcoin Core itself. Be particularly careful when running tools such as these on a computer with private keys on it.
+The following example is based on the [HWI](https://github.com/dashpay/HWI) tool. Version 2.0 or newer is required. Although this tool is hosted under the Dash Core GitHub organization and maintained by Dash Core developers, it should be used with caution. It is considered experimental and has far less review than Dash Core itself. Be particularly careful when running tools such as these on a computer with private keys on it.
 
-When using a hardware wallet, consult the manufacturer website for (alternative) software they recommend. As long as their software conforms to the standard below, it should be able to work with Bitcoin Core.
+When using a hardware wallet, consult the manufacturer website for (alternative) software they recommend. As long as their software conforms to the standard below, it should be able to work with Dash Core.
 
-Start Bitcoin Core:
+Start Dash Core:
 
 ```sh
-$ bitcoind -signer=../HWI/hwi.py
+$ dashd -signer=../HWI/hwi.py
 ```
 
 ### Device setup
 
-Follow the hardware manufacturers instructions for the initial device setup, as well as their instructions for creating a backup. Alternatively, for some devices, you can use the `setup`, `restore` and `backup` commands provided by [HWI](https://github.com/bitcoin-core/HWI).
+Follow the hardware manufacturers instructions for the initial device setup, as well as their instructions for creating a backup. Alternatively, for some devices, you can use the `setup`, `restore` and `backup` commands provided by [HWI](https://github.com/dashpay/HWI).
 
 ### Create wallet and import keys
 
 Get a list of signing devices / services:
 
 ```
-$ bitcoin-cli enumeratesigners
+$ dash-cli enumeratesigners
 {
   "signers": [
     {
@@ -37,7 +37,7 @@ The master key fingerprint is used to identify a device.
 Create a wallet, this automatically imports the public keys:
 
 ```sh
-$ bitcoin-cli createwallet "hww" true true "" true true true
+$ dash-cli createwallet "hww" true true "" true true true
 ```
 
 ### Verify an address
@@ -45,18 +45,18 @@ $ bitcoin-cli createwallet "hww" true true "" true true true
 Display an address on the device:
 
 ```sh
-$ bitcoin-cli -rpcwallet=<wallet> getnewaddress
-$ bitcoin-cli -rpcwallet=<wallet> walletdisplayaddress <address>
+$ dash-cli -rpcwallet=<wallet> getnewaddress
+$ dash-cli -rpcwallet=<wallet> walletdisplayaddress <address>
 ```
 
 Replace `<address>` with the result of `getnewaddress`.
 
 ### Spending
 
-Under the hood this uses a [Partially Signed Bitcoin Transaction](psbt.md).
+Under the hood this uses a [Partially Signed Blockchain Transaction](psbt.md).
 
 ```sh
-$ bitcoin-cli -rpcwallet=<wallet> sendtoaddress <address> <amount>
+$ dash-cli -rpcwallet=<wallet> sendtoaddress <address> <amount>
 ```
 
 This prompts your hardware wallet to sign, and fail if it's not connected. If successful
@@ -68,11 +68,11 @@ it automatically broadcasts the transaction.
 
 ## Signer API
 
-In order to be compatible with Bitcoin Core any signer command should conform to the specification below. This specification is subject to change. Ideally a BIP should propose a standard so that other wallets can also make use of it.
+In order to be compatible with Dash Core any signer command should conform to the specification below. This specification is subject to change. Ideally a BIP should propose a standard so that other wallets can also make use of it.
 
 Prerequisite knowledge:
 * [Output Descriptors](descriptors.md)
-* Partially Signed Bitcoin Transaction ([PSBT](psbt.md))
+* Partially Signed Blockchain Transaction ([PSBT](psbt.md))
 
 ### `enumerate` (required)
 
@@ -156,7 +156,7 @@ If <descriptor> contains an xpub, the command MUST fail if it does not match the
 
 The command MAY complain if `--testnet` is set, but the BIP32 coin type is not `1h` (and vice versa).
 
-## How Bitcoin Core uses the Signer API
+## How Dash Core uses the Signer API
 
 The `enumeratesigners` RPC simply calls `<cmd> enumerate`.
 

From 2718bbdf41ddd17c770b22921ed6ded411b37b9c Mon Sep 17 00:00:00 2001
From: Hennadii Stepanov <32963518+hebasto@users.noreply.github.com>
Date: Sun, 9 Jan 2022 17:39:31 +0200
Subject: [PATCH 601/656] Merge bitcoin-core/gui#441: Add Create Unsigned
 button to SendConfirmationDialog

742918c8ef353993a07c060f476a160e8272a9ef qt: hide Create Unsigned button behind an expert mode option (Andrew Chow)
5c3b800acd3ceb75ff6bbac8d0e2e1aaa95b0728 qt: Add Create Unsigned button to SendConfirmationDialog (Andrew Chow)

Pull request description:

  Instead of having different buttons or changing button behavior for making a PSBT, just have SendConfirmationDialog return whether the user wants a PSBT or a broadcasted transaction. Since this dialog is used by both the bumpFeeAction and the SendCoinsDialog, changes to both to support the different behavior is needed. They will check the return value of the SendConfirmationDialog for whether a PSBT needs to be created instead of checking whether private keys are disabled.

  Strings used in this dialog are being slightly modified to work with both private keys enabled and disabled wallets.

  Moved from https://github.com/bitcoin/bitcoin/pull/18789

ACKs for top commit:
  jarolrod:
    ACK 742918c
  ryanofsky:
    Code review ACK 742918c8ef353993a07c060f476a160e8272a9ef. Just suggested changes since last review. Looks great!
  hebasto:
    ACK 742918c8ef353993a07c060f476a160e8272a9ef, tested on Linux Mint 20.2 (Qt 5.12.8).

Tree-SHA512: dd29f4364c7b4f15befe8fe63257b26187918786b005e0f8336183270b1a162680b93f6ced60f0285c6e607c084cc0d24950fc68a8f9c056521ede614041be66
---
 src/qt/sendcoinsdialog.cpp | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/qt/sendcoinsdialog.cpp b/src/qt/sendcoinsdialog.cpp
index e858d6a803e2..146ed5cefe8c 100644
--- a/src/qt/sendcoinsdialog.cpp
+++ b/src/qt/sendcoinsdialog.cpp
@@ -495,9 +495,8 @@ void SendCoinsDialog::sendButtonClicked([[maybe_unused]] bool checked)
     if (!PrepareSendText(question_string, informative_text, detailed_text)) return;
     assert(m_current_transaction);
 
-    const QString confirmation = model->wallet().privateKeysDisabled() && !model->wallet().hasExternalSigner() ? tr("Confirm transaction proposal") : tr("Confirm send coins");
-    const QString confirmButtonText = model->wallet().privateKeysDisabled() && !model->wallet().hasExternalSigner() ? tr("Create Unsigned") : tr("Send");
-    auto confirmationDialog = new SendConfirmationDialog(confirmation, question_string, informative_text, detailed_text, SEND_CONFIRM_DELAY, confirmButtonText, this);
+    const QString confirmation = tr("Confirm send coins");
+    auto confirmationDialog = new SendConfirmationDialog(confirmation, question_string, informative_text, detailed_text, SEND_CONFIRM_DELAY, !model->wallet().privateKeysDisabled(), model->getOptionsModel()->getEnablePSBTControls(), this);
     confirmationDialog->setAttribute(Qt::WA_DeleteOnClose);
     // TODO: Replace QDialog::exec() with safer QDialog::show().
     const auto retval = static_cast<QMessageBox::StandardButton>(confirmationDialog->exec());

From d1ce9741a71d673bf655f560b53f7775390ff92f Mon Sep 17 00:00:00 2001
From: Konstantin Akimov <knstqq@gmail.com>
Date: Thu, 24 Jun 2021 18:35:10 +0800
Subject: [PATCH 602/656] fix: missing changes from bitcoin/bitcoin#22320 for
 external signer

---
 configure.ac | 15 +++------------
 1 file changed, 3 insertions(+), 12 deletions(-)

diff --git a/configure.ac b/configure.ac
index cce2c5f074c7..eed6f48c40a1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1606,23 +1606,14 @@ if test "$use_boost" = "yes"; then
   AX_CHECK_PREPROC_FLAG([-DBOOST_NO_CXX98_FUNCTION_BASE], [BOOST_CPPFLAGS="$BOOST_CPPFLAGS -DBOOST_NO_CXX98_FUNCTION_BASE"], [], [$CXXFLAG_WERROR],
                         [AC_LANG_PROGRAM([[#include <boost/config.hpp>]])])
 
-  dnl Opt-in to Boost Process if external signer support is requested
-  if test "$use_external_signer" != "no"; then
-    AC_MSG_CHECKING(for Boost Process)
-    AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <boost/process.hpp>]],
-     [[ boost::process::child* child = new boost::process::child; delete child; ]])],
-     [ AC_MSG_RESULT(yes)
-     AC_DEFINE([ENABLE_EXTERNAL_SIGNER],,[define if external signer support is enabled])
-     ],
-     [ AC_MSG_ERROR([Boost::Process is required for external signer support, but not available!])]
-    )
-  fi
-
   if test "$suppress_external_warnings" != "no"; then
     BOOST_CPPFLAGS=SUPPRESS_WARNINGS($BOOST_CPPFLAGS)
   fi
 fi
 
+if test "$use_external_signer" != no; then
+  AC_DEFINE([ENABLE_EXTERNAL_SIGNER],,[define if external signer support is enabled])
+fi
 AM_CONDITIONAL([ENABLE_EXTERNAL_SIGNER], [test "$use_external_signer" = "yes"])
 
 dnl Check for reduced exports

From 013953b9240ab55dcf846934ff20c9326b895231 Mon Sep 17 00:00:00 2001
From: fanquake <fanquake@gmail.com>
Date: Thu, 20 Jan 2022 13:06:48 +0800
Subject: [PATCH 603/656] Merge bitcoin/bitcoin#24065: build: explicitly
 disable support for external signing on Windows

e2ab9f83f8655bf09ea392beeee36b2bbe29769b build: disable external signer on Windows (fanquake)

Pull request description:

  This change explicitly disables support for external signing when targeting Windows and OpenBSD. The driver for this is that Boost Process uses boost::filesystem internally, when targeting Windows, which gets in the way of removing our usage of it (#20744). While we could adjust #20744 to still link against the Boost libs when building for Windows, that would be disappointing, as we wouldn't have cleanly removed the Boost usage we're trying too (including the build infrastructure), and, we'd be in a position where we would be building releases differently depending on the platform, which is something I want to avoid.

  After discussion with Sjors, Achow and Hebasto, this seemed like a reasonable step to move #20744 forward (as-is). Note that support for external signing ([while already being experimental](https://github.com/bitcoin/bitcoin/blob/master/doc/external-signer.md#example-usage)), could be considered even more experimental on Windows. Also, oddly, we have external-signing [explicitly disabled in our Windows (cross-compile) CI](https://github.com/bitcoin/bitcoin/blob/807169e10b4a18324356ed6ee4d69587b96a7c70/ci/test/00_setup_env_win64.sh#L16), it's not clear why this is the case, as, if it's a feature being built into releases, it should be being built and tested in the CI which is most-like the release process.

  There is an [issue open upstream](https://github.com/boostorg/process/issues/207), in regards to migrating Boost Process to std::filesystem, or having an option to use it. However there hasn't been much discussion since it was opened ~9 months ago. There is another related issue here: https://github.com/klemens-morgenstern/boost-process/issues/164.

  Resolves #24036.

ACKs for top commit:
  Sjors:
    utACK e2ab9f8
  achow101:
    ACK e2ab9f83f8655bf09ea392beeee36b2bbe29769b
  kallewoof:
    utACK e2ab9f83f8655bf09ea392beeee36b2bbe29769b
  hebasto:
    ACK e2ab9f83f8655bf09ea392beeee36b2bbe29769b, tested on Linux Mint 20.2 (x86_64).

Tree-SHA512: 36fcfc0e1a008a8271dc76b8e12e93d3e1d1e528bf668e95a559e9f6fd7d5f031bd7a6a6bc8b9fa9d057b2cd56f9ec8838c7f74e87899bf9a6aeb787afbd112c
---
 ci/test/00_setup_env_win64.sh |  2 +-
 configure.ac                  | 20 +++++++++++++++++---
 src/util/system.cpp           |  5 -----
 3 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/ci/test/00_setup_env_win64.sh b/ci/test/00_setup_env_win64.sh
index 215a2db8269b..2010c111818d 100755
--- a/ci/test/00_setup_env_win64.sh
+++ b/ci/test/00_setup_env_win64.sh
@@ -16,5 +16,5 @@ export GOAL="deploy"
 # Prior to 11.0.0, the mingw-w64 headers were missing noreturn attributes, causing warnings when
 # cross-compiling for Windows. https://sourceforge.net/p/mingw-w64/bugs/306/
 # https://github.com/mingw-w64/mingw-w64/commit/1690994f515910a31b9fb7c7bd3a52d4ba987abe
-export BITCOIN_CONFIG="--enable-gui --enable-reduce-exports --disable-miner --disable-external-signer CXXFLAGS='-Wno-return-type -Wno-error=maybe-uninitialized -Wno-error=array-bounds'"
+export BITCOIN_CONFIG="--enable-gui --enable-reduce-exports --disable-miner CXXFLAGS='-Wno-return-type -Wno-error=maybe-uninitialized -Wno-error=array-bounds'"
 export DIRECT_WINE_EXEC_TESTS=true
diff --git a/configure.ac b/configure.ac
index eed6f48c40a1..c2723841e083 100644
--- a/configure.ac
+++ b/configure.ac
@@ -322,7 +322,7 @@ AC_ARG_ENABLE([werror],
 AC_ARG_ENABLE([external-signer],
     [AS_HELP_STRING([--enable-external-signer],[compile external signer support (default is auto, requires Boost::Process)])],
     [use_external_signer=$enableval],
-    [use_external_signer=yes])
+    [use_external_signer=auto])
 
 AC_LANG_PUSH([C++])
 
@@ -1611,8 +1611,22 @@ if test "$use_boost" = "yes"; then
   fi
 fi
 
-if test "$use_external_signer" != no; then
-  AC_DEFINE([ENABLE_EXTERNAL_SIGNER],,[define if external signer support is enabled])
+if test "$use_external_signer" != "no"; then
+  case $host in
+    *mingw*)
+      dnl Boost Process uses Boost Filesystem when targeting Windows. Also,
+      dnl since Boost 1.71.0, Process does not work with mingw-w64 without
+      dnl workarounds. See 67669ab425b52a2b6be3d2f3b3b7e3939b676a2c.
+      if test "$use_external_signer" = "yes"; then
+        AC_MSG_ERROR([External signing is not supported on Windows])
+      fi
+      use_external_signer="no";
+    ;;
+    *)
+      use_external_signer="yes"
+      AC_DEFINE([ENABLE_EXTERNAL_SIGNER], [1], [Define if external signer support is enabled])
+    ;;
+  esac
 fi
 AM_CONDITIONAL([ENABLE_EXTERNAL_SIGNER], [test "$use_external_signer" = "yes"])
 
diff --git a/src/util/system.cpp b/src/util/system.cpp
index 1ba6700ba2fe..50c761b8418a 100644
--- a/src/util/system.cpp
+++ b/src/util/system.cpp
@@ -9,11 +9,6 @@
 #include <support/allocators/secure.h>
 
 #ifdef ENABLE_EXTERNAL_SIGNER
-#if defined(WIN32) && !defined(__kernel_entry)
-// A workaround for boost 1.71 incompatibility with mingw-w64 compiler.
-// For details see https://github.com/bitcoin/bitcoin/pull/22348.
-#define __kernel_entry
-#endif
 #include <boost/process.hpp>
 #endif // ENABLE_EXTERNAL_SIGNER
 

From f93b153f6eb8410b9ca9159aac8ee0c81b02629f Mon Sep 17 00:00:00 2001
From: pasta <pasta@dashboost.org>
Date: Sat, 22 Nov 2025 10:04:05 -0600
Subject: [PATCH 604/656] fix: always try to process m_nodes_disconnected

---
 src/net.cpp | 45 +++++++++++++++++++++++++++++----------------
 1 file changed, 29 insertions(+), 16 deletions(-)

diff --git a/src/net.cpp b/src/net.cpp
index 1a2032bfb784..fd10006fb121 100644
--- a/src/net.cpp
+++ b/src/net.cpp
@@ -2039,29 +2039,42 @@ void CConnman::DisconnectNodes()
     // m_reconnections_mutex while holding m_nodes_mutex.
     decltype(m_reconnections) reconnections_to_add;
 
+    // Quick check without exclusive lock to avoid unnecessary locking
+    // Note: This is a best-effort optimization. If network is active and no nodes
+    // are marked for disconnect, we can skip the expensive exclusive lock.
+    // If network is inactive or nodes need cleanup, we must take the lock.
     bool has_to_disconnect = false;
-    {
-        READ_LOCK(m_nodes_mutex);
-
-        for (CNode* pnode : m_nodes) {
-            // Disconnect any connected nodes, if network is not active
-            if (!fNetworkActive && !pnode->fDisconnect) {
-                LogPrint(BCLog::NET_NETCONN, "Network not active, dropping peer=%d\n", pnode->GetId());
-                pnode->fDisconnect = true;
-            }
-            if (!has_to_disconnect && pnode->fDisconnect) {
-                has_to_disconnect = true;
+    if (fNetworkActive) {
+        {
+            READ_LOCK(m_nodes_mutex);
+            for (CNode* pnode : m_nodes) {
+                if (pnode->fDisconnect) {
+                    has_to_disconnect = true;
+                    break;
+                }
             }
         }
+        // Only return early if network is active AND no nodes need disconnection
+        // AND no disconnected nodes need cleanup (checked below)
+        if (!has_to_disconnect && m_nodes_disconnected.empty()) {
+            return;
+        }
     }
 
-    // Avoid taking locks if there's nothing to do
-    if (!has_to_disconnect) return;
-
-    {
+    if (has_to_disconnect || !fNetworkActive) {
         LOCK(m_nodes_mutex);
 
-        // Disconnect unused nodes
+        if (!fNetworkActive) {
+            // Disconnect any connected nodes
+            for (CNode* pnode : m_nodes) {
+                if (!pnode->fDisconnect) {
+                    LogPrint(BCLog::NET_NETCONN, "Network not active, dropping peer=%d\n", pnode->GetId());
+                    pnode->fDisconnect = true;
+                }
+            }
+        }
+
+        // Disconnect unused nodes, if we have any
         for (auto it = m_nodes.begin(); it != m_nodes.end(); )
         {
             CNode* pnode = *it;

From 0fce90a0f81e8a595c0766ac80cb04f7c0ec69bd Mon Sep 17 00:00:00 2001
From: UdjinM6 <UdjinM6@users.noreply.github.com>
Date: Sun, 16 Nov 2025 20:44:26 +0300
Subject: [PATCH 605/656] fix: correctly detect and skip disconnecting pending
 quorum masternodes

---
 src/net.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/net.cpp b/src/net.cpp
index 19f86ab39052..7547ce76dbe7 100644
--- a/src/net.cpp
+++ b/src/net.cpp
@@ -3382,9 +3382,9 @@ void CConnman::ThreadOpenMasternodeConnections(CDeterministicMNManager& dmnman,
                         continue;
                     }
                     const auto addr2 = dmn->pdmnState->netInfo->GetPrimary();
-                    CNode* pnode = FindNodeMutable(addr2);
-                    if (pnode && pnode->m_masternode_connection) {
-                        // node is masternode, skip it
+                    CNode* pnode = FindNodeMutable(addr2, /*fExcludeDisconnecting=*/false);
+                    if (pnode && (pnode->m_masternode_connection || pnode->fDisconnect)) {
+                        // node is either a masternode or disconnecting, skip it
                         continue;
                     }
                     if (connectedNodes.count(addr2)) {

From 723f52012a22bb68ea3b3ddff2c8695472500aee Mon Sep 17 00:00:00 2001
From: UdjinM6 <UdjinM6@users.noreply.github.com>
Date: Tue, 28 Oct 2025 16:15:24 +0300
Subject: [PATCH 606/656] test: improve trigger creation check

---
 test/functional/feature_governance_cl.py | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/test/functional/feature_governance_cl.py b/test/functional/feature_governance_cl.py
index accd731a83e3..5a366683d705 100755
--- a/test/functional/feature_governance_cl.py
+++ b/test/functional/feature_governance_cl.py
@@ -99,16 +99,24 @@ def run_test(self):
 
         assert_equal(len(self.nodes[0].gobject("list", "valid", "triggers")), 0)
 
-        self.log.info("Move 1 block into sb maturity window")
+        self.log.info("Move into sb maturity window")
         n = sb_immaturity_window - self.nodes[0].getblockcount() % sb_cycle
         assert n >= 0
-        for _ in range(n + 1):
+        for _ in range(n):
             self.bump_mocktime(156)
             self.generate(self.nodes[0], 1, sync_fun=lambda: self.sync_blocks(self.nodes[0:5]))
 
         self.log.info("Wait for new trigger and votes on non-isolated nodes")
         sb_block_height = self.nodes[0].getblockcount() // sb_cycle * sb_cycle + sb_cycle
         assert_equal(sb_block_height % sb_cycle, 0)
+
+        assert_equal(self.mninfo[4].nodeIdx, 5)
+        isolated_lastpaid_height = self.nodes[0].protx("info", self.mninfo[4].proTxHash)["state"]["lastPaidHeight"]
+        if isolated_lastpaid_height == self.nodes[0].getblockcount() - self.mn_count + 1:
+            # Isolated node is the one that should create new trigger at this height,
+            # mine a block to pick another node
+            self.bump_mocktime(156)
+            self.generate(self.nodes[0], 1, sync_fun=lambda: self.sync_blocks(self.nodes[0:5]))
         self.wait_until(lambda: have_trigger_for_height(self.nodes[0:5], sb_block_height), timeout=5)
 
         n = sb_cycle - self.nodes[0].getblockcount() % sb_cycle

From af0ffdfcf7064e74f5620d600f67281b124aa82b Mon Sep 17 00:00:00 2001
From: UdjinM6 <UdjinM6@users.noreply.github.com>
Date: Tue, 28 Oct 2025 00:45:30 +0300
Subject: [PATCH 607/656] test: improve trigger cleanup check

---
 test/functional/feature_governance_cl.py | 23 +++++++++++++++--------
 1 file changed, 15 insertions(+), 8 deletions(-)

diff --git a/test/functional/feature_governance_cl.py b/test/functional/feature_governance_cl.py
index 5a366683d705..d0ccef82ab10 100755
--- a/test/functional/feature_governance_cl.py
+++ b/test/functional/feature_governance_cl.py
@@ -5,7 +5,6 @@
 """Tests governance checks can be skipped for blocks covered by the best chainlock."""
 
 import json
-import time
 
 from test_framework.governance import have_trigger_for_height
 from test_framework.messages import uint256_to_string
@@ -144,13 +143,21 @@ def run_test(self):
         assert not have_trigger_for_height(self.nodes[0:5], sb_block_height + sb_cycle)
         self.bump_mocktime(156)
         self.generate(self.nodes[0], 1, sync_fun=lambda: self.sync_blocks(self.nodes[0:5]))
-        # Trigger scheduler to mark old triggers for deletion
-        self.bump_mocktime(5 * 60)
-        # Let it do the job
-        time.sleep(1)
-        # Move forward to satisfy GOVERNANCE_DELETION_DELAY, should actually remove old triggers now
-        self.bump_mocktime(10 * 60)
-        self.wait_until(lambda: len(self.nodes[0].gobject("list", "valid", "triggers")) == 0, timeout=5)
+
+        self.log.info("Bump mocktime to trigger governance cleanup")
+        for delta, expected in (
+            (5 * 60, ['UpdateCachesAndClean -- Governance Objects:']),  # mark old triggers for deletion
+            (10 * 60, ['UpdateCachesAndClean -- Governance Objects: 0']),  # deletion after delay
+        ):
+            self.mocktime += delta
+            for node in self.nodes:
+                with node.assert_debug_log(expected_msgs=expected):
+                    node.setmocktime(self.mocktime)
+                    node.mockscheduler(delta)
+
+        # Confirm in RPC
+        for node in self.nodes:
+            assert_equal(len(node.gobject("list", "valid", "triggers")), 0)
 
         self.log.info("Reconnect isolated node and confirm the next ChainLock will let it sync")
         self.reconnect_isolated_node(5, 0)

From 8c68d9bf7ca0d31341e7fe4dd213d99354efad82 Mon Sep 17 00:00:00 2001
From: Konstantin Akimov <knstqq@gmail.com>
Date: Tue, 18 Nov 2025 17:45:22 +0700
Subject: [PATCH 608/656] test: generate blocks by batches to improve
 performance of feature_governance_cl.py

---
 test/functional/feature_governance_cl.py | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/test/functional/feature_governance_cl.py b/test/functional/feature_governance_cl.py
index d0ccef82ab10..67ef21e21ec8 100755
--- a/test/functional/feature_governance_cl.py
+++ b/test/functional/feature_governance_cl.py
@@ -57,9 +57,9 @@ def run_test(self):
 
         # Move to the superblock cycle start block
         n = sb_cycle - self.nodes[0].getblockcount() % sb_cycle
-        for _ in range(n):
-            self.bump_mocktime(156)
-            self.generate(self.nodes[0], 1, sync_fun=lambda: self.sync_blocks())
+        if n > 0:
+            self.bump_mocktime(156 * n)
+            self.generate(self.nodes[0], n, sync_fun=lambda: self.sync_blocks())
 
         self.log.info("Prepare proposals")
 
@@ -101,9 +101,8 @@ def run_test(self):
         self.log.info("Move into sb maturity window")
         n = sb_immaturity_window - self.nodes[0].getblockcount() % sb_cycle
         assert n >= 0
-        for _ in range(n):
-            self.bump_mocktime(156)
-            self.generate(self.nodes[0], 1, sync_fun=lambda: self.sync_blocks(self.nodes[0:5]))
+        self.bump_mocktime(156 * n)
+        self.generate(self.nodes[0], n, sync_fun=lambda: self.sync_blocks(self.nodes[0:5]))
 
         self.log.info("Wait for new trigger and votes on non-isolated nodes")
         sb_block_height = self.nodes[0].getblockcount() // sb_cycle * sb_cycle + sb_cycle
@@ -122,9 +121,8 @@ def run_test(self):
         assert n > 1
 
         self.log.info("Move remaining n blocks until the next Superblock")
-        for _ in range(n - 1):
-            self.bump_mocktime(156)
-            self.generate(self.nodes[0], 1, sync_fun=lambda: self.sync_blocks(self.nodes[0:5]))
+        self.bump_mocktime(156 * (n-1))
+        self.generate(self.nodes[0], n-1, sync_fun=lambda: self.sync_blocks(self.nodes[0:5]))
 
         # Confirm all is good
         self.wait_until(lambda: have_trigger_for_height(self.nodes[0:5], sb_block_height), timeout=5)

From b9310be7bc7a90d8b3cc796eee76bc922bd3076a Mon Sep 17 00:00:00 2001
From: UdjinM6 <UdjinM6@users.noreply.github.com>
Date: Sun, 16 Nov 2025 19:09:42 +0300
Subject: [PATCH 609/656] fix: adjust condition to detect suitable pending
 masternodes

---
 src/net.cpp | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/src/net.cpp b/src/net.cpp
index 19f86ab39052..0fbe73b05648 100644
--- a/src/net.cpp
+++ b/src/net.cpp
@@ -3454,13 +3454,12 @@ void CConnman::ThreadOpenMasternodeConnections(CDeterministicMNManager& dmnman,
                 // Check if we should connect to this masternode
                 // We already hold m_nodes_mutex here, so check m_masternode_connection directly
                 if (dmn && !connectedNodes.count(dmn->pdmnState->netInfo->GetPrimary())) {
-                    if (const CNode* pnode = FindNode(dmn->pdmnState->netInfo->GetPrimary())) {
-                        if (!pnode->m_masternode_connection) {
-                            LogPrint(BCLog::NET_NETCONN, "CConnman::%s -- opening pending masternode connection to %s, service=%s\n",
-                                                         _func_, dmn->proTxHash.ToString(),
-                                                         dmn->pdmnState->netInfo->GetPrimary().ToStringAddrPort());
-                            return dmn;
-                        }
+                    const CNode* pnode = FindNode(dmn->pdmnState->netInfo->GetPrimary(), /*fExcludeDisconnecting=*/false);
+                    if (pnode == nullptr || (!pnode->m_masternode_connection && !pnode->fDisconnect)) {
+                        LogPrint(BCLog::NET_NETCONN, "CConnman::%s -- opening pending masternode connection to %s, service=%s\n",
+                                                     _func_, dmn->proTxHash.ToString(),
+                                                     dmn->pdmnState->netInfo->GetPrimary().ToStringAddrPort());
+                        return dmn;
                     }
                 }
             }

From 7fa5660c0fb0d3143abc2c351f3f5db0c2167a6b Mon Sep 17 00:00:00 2001
From: pasta <pasta@dashboost.org>
Date: Wed, 23 Oct 2024 09:18:25 -0500
Subject: [PATCH 610/656] chore: add metainfo.xml for flatpak / flathub

---
 .../flatpak/org.dash.dash-core.metainfo.xml   | 30 +++++++++++++++++++
 1 file changed, 30 insertions(+)
 create mode 100644 contrib/flatpak/org.dash.dash-core.metainfo.xml

diff --git a/contrib/flatpak/org.dash.dash-core.metainfo.xml b/contrib/flatpak/org.dash.dash-core.metainfo.xml
new file mode 100644
index 000000000000..df14a1fdcb27
--- /dev/null
+++ b/contrib/flatpak/org.dash.dash-core.metainfo.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<component type="desktop-application">
+  <id>org.dash.dash-core</id>
+  <name>Dash Core</name>
+  <project_license>MIT</project_license>
+  <metadata_license>CC0-1.0</metadata_license>
+  <summary>Fully validating Dash peer-to-peer network node, wallet and GUI</summary>
+  <url type="homepage">https://dash.org/</url>
+  <url type="bugtracker">https://github.com/dashpay/dash/issues/new?title=[flatpak]</url>
+  <launchable type="desktop-id">org.dash.dash-core.desktop</launchable>
+  <description>
+    <p>
+    Dash Core connects to the Dash peer-to-peer network to download and
+    fully validate blocks and transactions. It also includes a wallet and
+    graphical user interface.
+    </p>
+  </description>
+  <screenshots>
+    <screenshot type="default">
+      <image type="source">https://docs.dash.org/en/stable/_images/overview.png</image>
+    </screenshot>
+  </screenshots>
+  <releases>
+    <release date="2024-10-22" version="21.1.1"/>
+  </releases>
+  <content_rating type="oars-1.1"/>
+  <developer id="org.dash">
+    <name>Dash Core Group</name>
+  </developer>
+</component>

From 9835031b52577ebd02fa03fdbbf3b4884558ca2b Mon Sep 17 00:00:00 2001
From: pasta <pasta@dashboost.org>
Date: Wed, 23 Oct 2024 09:32:44 -0500
Subject: [PATCH 611/656] chore: add money-purchasing attribute to .xml in
 response flatpak discussion

see: https://github.com/flathub/flathub/pull/5747\#discussion_r1812535188
---
 contrib/flatpak/org.dash.dash-core.metainfo.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/contrib/flatpak/org.dash.dash-core.metainfo.xml b/contrib/flatpak/org.dash.dash-core.metainfo.xml
index df14a1fdcb27..0d9c7194d767 100644
--- a/contrib/flatpak/org.dash.dash-core.metainfo.xml
+++ b/contrib/flatpak/org.dash.dash-core.metainfo.xml
@@ -24,6 +24,7 @@
     <release date="2024-10-22" version="21.1.1"/>
   </releases>
   <content_rating type="oars-1.1"/>
+  <content_attribute id="money-purchasing">intense</content_attribute>
   <developer id="org.dash">
     <name>Dash Core Group</name>
   </developer>

From 5f637106d011736bbec2a4f795bf0c8a7dc83726 Mon Sep 17 00:00:00 2001
From: fanquake <fanquake@gmail.com>
Date: Fri, 1 Dec 2023 14:28:03 -0600
Subject: [PATCH 612/656] fix: content_attribute does not exist, include in
 content_rating

---
 contrib/flatpak/org.dash.dash-core.metainfo.xml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/contrib/flatpak/org.dash.dash-core.metainfo.xml b/contrib/flatpak/org.dash.dash-core.metainfo.xml
index 0d9c7194d767..4551120bf93e 100644
--- a/contrib/flatpak/org.dash.dash-core.metainfo.xml
+++ b/contrib/flatpak/org.dash.dash-core.metainfo.xml
@@ -23,8 +23,7 @@
   <releases>
     <release date="2024-10-22" version="21.1.1"/>
   </releases>
-  <content_rating type="oars-1.1"/>
-  <content_attribute id="money-purchasing">intense</content_attribute>
+  <content_rating type="oars-1.1" id="money-purchasing">intense</content_rating>
   <developer id="org.dash">
     <name>Dash Core Group</name>
   </developer>

From 81d751184c53a9196c81b21f6862ae246a884cc1 Mon Sep 17 00:00:00 2001
From: Pasta <pasta@dashboost.org>
Date: Tue, 24 Dec 2024 12:50:50 -0600
Subject: [PATCH 613/656] chore: bump org.dash.dash-core.metainfo.xml for
 v22.0.0

---
 contrib/flatpak/org.dash.dash-core.metainfo.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/contrib/flatpak/org.dash.dash-core.metainfo.xml b/contrib/flatpak/org.dash.dash-core.metainfo.xml
index 4551120bf93e..7890893157c6 100644
--- a/contrib/flatpak/org.dash.dash-core.metainfo.xml
+++ b/contrib/flatpak/org.dash.dash-core.metainfo.xml
@@ -22,6 +22,7 @@
   </screenshots>
   <releases>
     <release date="2024-10-22" version="21.1.1"/>
+    <release date="2024-12-12" version="22.0.0"/>
   </releases>
   <content_rating type="oars-1.1" id="money-purchasing">intense</content_rating>
   <developer id="org.dash">

From dcf846a9bc82d6047b044806f9bf4973ed62f234 Mon Sep 17 00:00:00 2001
From: Pasta <pasta@dashboost.org>
Date: Tue, 24 Dec 2024 13:17:58 -0600
Subject: [PATCH 614/656] fix: improper order of releases

---
 contrib/flatpak/org.dash.dash-core.metainfo.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/contrib/flatpak/org.dash.dash-core.metainfo.xml b/contrib/flatpak/org.dash.dash-core.metainfo.xml
index 7890893157c6..9076eb8d2cba 100644
--- a/contrib/flatpak/org.dash.dash-core.metainfo.xml
+++ b/contrib/flatpak/org.dash.dash-core.metainfo.xml
@@ -21,8 +21,8 @@
     </screenshot>
   </screenshots>
   <releases>
-    <release date="2024-10-22" version="21.1.1"/>
     <release date="2024-12-12" version="22.0.0"/>
+    <release date="2024-10-22" version="21.1.1"/>
   </releases>
   <content_rating type="oars-1.1" id="money-purchasing">intense</content_rating>
   <developer id="org.dash">

From cdeb056803a440cb6ad321334a3bae53defd4dd5 Mon Sep 17 00:00:00 2001
From: pasta <pasta@dashboost.org>
Date: Sun, 23 Nov 2025 09:02:28 -0600
Subject: [PATCH 615/656] chore: add v23 release to flatpak metainfo

---
 contrib/flatpak/org.dash.dash-core.metainfo.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/contrib/flatpak/org.dash.dash-core.metainfo.xml b/contrib/flatpak/org.dash.dash-core.metainfo.xml
index 9076eb8d2cba..7a5ef72f9cf4 100644
--- a/contrib/flatpak/org.dash.dash-core.metainfo.xml
+++ b/contrib/flatpak/org.dash.dash-core.metainfo.xml
@@ -21,6 +21,7 @@
     </screenshot>
   </screenshots>
   <releases>
+    <release date="2024-11-10" version="23.0.0"/>
     <release date="2024-12-12" version="22.0.0"/>
     <release date="2024-10-22" version="21.1.1"/>
   </releases>

From fbe15447af63828c9d5864b4a76411bb182583ad Mon Sep 17 00:00:00 2001
From: pasta <pasta@dashboost.org>
Date: Sun, 23 Nov 2025 09:04:32 -0600
Subject: [PATCH 616/656] docs: add flatpak metainfo to release process

---
 doc/release-process.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/doc/release-process.md b/doc/release-process.md
index 846086929194..22dc685363b3 100644
--- a/doc/release-process.md
+++ b/doc/release-process.md
@@ -11,6 +11,7 @@ Before every minor and major release:
 * [ ] Update DIPs with any changes introduced by this release (see [this pull request](https://github.com/dashpay/dips/pull/142) for an example)
 * [ ] Update version in `configure.ac` (don't forget to set `CLIENT_VERSION_IS_RELEASE` to `true`)
 * [ ] Write release notes (see below). To clear the release notes: `cp doc/release-notes-empty-template.md doc/release-notes.md`
+* [ ] Update flatpak [metainfo file](contrib/flatpak/org.dash.dash-core.metainfo.xml) with latest release tag and estimated release data 
 * [ ] Update `src/chainparams.cpp` `nMinimumChainWork` with information from the `getblockchaininfo` rpc.
 * [ ] Update `src/chainparams.cpp` `defaultAssumeValid` with information from the `getblockhash` rpc.
   - The selected value must not be orphaned so it may be useful to set the value two blocks back from the tip.

From f38b088fef9cd4e935793e460f2e38c92d634a72 Mon Sep 17 00:00:00 2001
From: pasta <pasta@dashboost.org>
Date: Sun, 23 Nov 2025 19:36:40 -0600
Subject: [PATCH 617/656] fix: proper date, trailing space

---
 contrib/flatpak/org.dash.dash-core.metainfo.xml | 2 +-
 doc/release-process.md                          | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/contrib/flatpak/org.dash.dash-core.metainfo.xml b/contrib/flatpak/org.dash.dash-core.metainfo.xml
index 7a5ef72f9cf4..bda73eec6ef2 100644
--- a/contrib/flatpak/org.dash.dash-core.metainfo.xml
+++ b/contrib/flatpak/org.dash.dash-core.metainfo.xml
@@ -21,7 +21,7 @@
     </screenshot>
   </screenshots>
   <releases>
-    <release date="2024-11-10" version="23.0.0"/>
+    <release date="2025-11-10" version="23.0.0"/>
     <release date="2024-12-12" version="22.0.0"/>
     <release date="2024-10-22" version="21.1.1"/>
   </releases>
diff --git a/doc/release-process.md b/doc/release-process.md
index 22dc685363b3..7b07a64a1a4a 100644
--- a/doc/release-process.md
+++ b/doc/release-process.md
@@ -11,7 +11,7 @@ Before every minor and major release:
 * [ ] Update DIPs with any changes introduced by this release (see [this pull request](https://github.com/dashpay/dips/pull/142) for an example)
 * [ ] Update version in `configure.ac` (don't forget to set `CLIENT_VERSION_IS_RELEASE` to `true`)
 * [ ] Write release notes (see below). To clear the release notes: `cp doc/release-notes-empty-template.md doc/release-notes.md`
-* [ ] Update flatpak [metainfo file](contrib/flatpak/org.dash.dash-core.metainfo.xml) with latest release tag and estimated release data 
+* [ ] Update flatpak [metainfo file](contrib/flatpak/org.dash.dash-core.metainfo.xml) with latest release tag and estimated release data
 * [ ] Update `src/chainparams.cpp` `nMinimumChainWork` with information from the `getblockchaininfo` rpc.
 * [ ] Update `src/chainparams.cpp` `defaultAssumeValid` with information from the `getblockhash` rpc.
   - The selected value must not be orphaned so it may be useful to set the value two blocks back from the tip.

From b21644657f4649610571916c08e60f81691db148 Mon Sep 17 00:00:00 2001
From: PastaPastaPasta <6443210+PastaPastaPasta@users.noreply.github.com>
Date: Mon, 24 Nov 2025 08:51:04 -0600
Subject: [PATCH 618/656] fix: avoid two timers

Co-authored-by: Konstantin Akimov <knstqq@gmail.com>
---
 src/llmq/signing_shares.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/llmq/signing_shares.cpp b/src/llmq/signing_shares.cpp
index b6098e7b6f99..90c9ea3a95ed 100644
--- a/src/llmq/signing_shares.cpp
+++ b/src/llmq/signing_shares.cpp
@@ -1684,7 +1684,6 @@ std::optional<CSigShare> CSigSharesManager::CreateSigShareForSingleMember(const
 
 std::optional<CSigShare> CSigSharesManager::CreateSigShare(const CQuorum& quorum, const uint256& id, const uint256& msgHash) const
 {
-    cxxtimer::Timer t(true);
     auto activeMasterNodeProTxHash = m_mn_activeman.GetProTxHash();
 
     if (!quorum.IsValidMember(activeMasterNodeProTxHash)) {
@@ -1694,6 +1693,7 @@ std::optional<CSigShare> CSigSharesManager::CreateSigShare(const CQuorum& quorum
     if (quorum.params.is_single_member()) {
         return CreateSigShareForSingleMember(quorum, id, msgHash);
     }
+    cxxtimer::Timer t(true);
     const CBLSSecretKey& skShare = quorum.GetSkShare();
     if (!skShare.IsValid()) {
         LogPrint(BCLog::LLMQ_SIGS, "CSigSharesManager::%s -- we don't have our skShare for quorum %s\n", __func__, quorum.qc->quorumHash.ToString());

From 3308bc5fe73c5af66eeefa5890efd022a537777c Mon Sep 17 00:00:00 2001
From: pasta <pasta@dashboost.org>
Date: Thu, 20 Nov 2025 18:29:32 -0600
Subject: [PATCH 619/656] fix(llmq): retain signHash marker on recSig
 truncation and drop late sigShares
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

  - Problem: After we process a recovered signature, TruncateRecoveredSig removes the id/signHash indexes (rs_r/rs_s). A very late sigShare for
    that session then sees HasRecoveredSigForId as false, recreates a session, and eventually times out, even though we already finished the
    session.
  - Behavior change: Keep the rs_s entry (signHash -> 1) when truncating recovered sigs so HasRecoveredSigForSession(signHash) stays true after
    truncation. Cleanup still removes the remaining keys when appropriate.
  - Handling late shares: CSigSharesManager::ProcessMessageSigShare now also checks HasRecoveredSigForSession and logs/drops sigShares for sessions
    already completed, preventing “zombie” sessions/timeouts.
  - Notes: This leaves the recSig hash path (rs_h) unchanged; full deletions (conflict/cleanup) still remove all indexes. No extra caching
    insertions to keep behavior parallel to rs_h.
---
 src/llmq/signing.cpp        |  4 ++--
 src/llmq/signing.h          |  4 ++--
 src/llmq/signing_shares.cpp | 15 ++++++++++++---
 3 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/src/llmq/signing.cpp b/src/llmq/signing.cpp
index cd9bb07758b4..e735577c8d27 100644
--- a/src/llmq/signing.cpp
+++ b/src/llmq/signing.cpp
@@ -183,8 +183,8 @@ void CRecoveredSigsDb::RemoveRecoveredSig(CDBBatch& batch, Consensus::LLMQType l
     batch.Erase(k2);
     if (deleteHashKey) {
         batch.Erase(k3);
+        batch.Erase(k4);
     }
-    batch.Erase(k4);
 
     if (deleteTimeKey) {
         CDataStream writeTimeDs(SER_DISK, CLIENT_VERSION);
@@ -199,8 +199,8 @@ void CRecoveredSigsDb::RemoveRecoveredSig(CDBBatch& batch, Consensus::LLMQType l
 
     LOCK(cs_cache);
     hasSigForIdCache.erase(std::make_pair(recSig.getLlmqType(), recSig.getId()));
-    hasSigForSessionCache.erase(signHash.Get());
     if (deleteHashKey) {
+        hasSigForSessionCache.erase(signHash.Get());
         hasSigForHashCache.erase(recSig.GetHash());
     }
 }
diff --git a/src/llmq/signing.h b/src/llmq/signing.h
index 7e03fd89d613..d4149314c011 100644
--- a/src/llmq/signing.h
+++ b/src/llmq/signing.h
@@ -204,8 +204,8 @@ class CSigningManager
 
     // This is called when a recovered signature can be safely removed from the DB. This is only safe when some other
     // mechanism prevents possible conflicts. As an example, ChainLocks prevent conflicts in confirmed TXs InstantSend votes
-    // This won't completely remove all traces of the recovered sig but instead leave the hash entry in the DB. This
-    // allows AlreadyHave to keep returning true. Cleanup will later remove the remains
+    // This won't completely remove all traces of the recovered sig but instead leave the hash and signHash entries in the
+    // DB. This allows AlreadyHave/late-share filtering to keep returning true. Cleanup will later remove the remains
     void TruncateRecoveredSig(Consensus::LLMQType llmqType, const uint256& id);
 
 private:
diff --git a/src/llmq/signing_shares.cpp b/src/llmq/signing_shares.cpp
index 43bc21af4af9..868db9fec5bc 100644
--- a/src/llmq/signing_shares.cpp
+++ b/src/llmq/signing_shares.cpp
@@ -503,14 +503,23 @@ void CSigSharesManager::ProcessMessageSigShare(NodeId fromId, const CSigShare& s
         return;
     }
 
+    const auto signHash = sigShare.GetSignHash();
+    const bool alreadyRecovered = sigman.HasRecoveredSigForId(sigShare.getLlmqType(), sigShare.getId()) ||
+                                  sigman.HasRecoveredSigForSession(signHash);
+
     {
         LOCK(cs);
 
-        if (sigShares.Has(sigShare.GetKey())) {
+        if (alreadyRecovered) {
+            LogPrint(BCLog::LLMQ_SIGS, /* Continued */
+                     "CSigSharesManager::%s -- dropping sigShare for recovered session. signHash=%s, id=%s, "
+                     "msgHash=%s, member=%d, node=%d\n",
+                     __func__, signHash.ToString(), sigShare.getId().ToString(), sigShare.getMsgHash().ToString(),
+                     sigShare.getQuorumMember(), fromId);
             return;
         }
 
-        if (sigman.HasRecoveredSigForId(sigShare.getLlmqType(), sigShare.getId())) {
+        if (sigShares.Has(sigShare.GetKey())) {
             return;
         }
 
@@ -519,7 +528,7 @@ void CSigSharesManager::ProcessMessageSigShare(NodeId fromId, const CSigShare& s
     }
 
     LogPrint(BCLog::LLMQ_SIGS, "CSigSharesManager::%s -- signHash=%s, id=%s, msgHash=%s, member=%d, node=%d\n", __func__,
-             sigShare.GetSignHash().ToString(), sigShare.getId().ToString(), sigShare.getMsgHash().ToString(), sigShare.getQuorumMember(), fromId);
+             signHash.ToString(), sigShare.getId().ToString(), sigShare.getMsgHash().ToString(), sigShare.getQuorumMember(), fromId);
 }
 
 bool CSigSharesManager::PreVerifyBatchedSigShares(const CActiveMasternodeManager& mn_activeman, const CQuorumManager& quorum_manager,

From 0261990f4b797bc6d452e2609fd2870c5f982d2c Mon Sep 17 00:00:00 2001
From: pasta <pasta@dashboost.org>
Date: Mon, 24 Nov 2025 09:29:04 -0600
Subject: [PATCH 620/656] docs: update comment in cpp to match new logic

---
 src/llmq/signing.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/llmq/signing.cpp b/src/llmq/signing.cpp
index e735577c8d27..4a1ac7a6b528 100644
--- a/src/llmq/signing.cpp
+++ b/src/llmq/signing.cpp
@@ -206,7 +206,8 @@ void CRecoveredSigsDb::RemoveRecoveredSig(CDBBatch& batch, Consensus::LLMQType l
 }
 
 // Remove the recovered sig itself and all keys required to get from id -> recSig
-// This will leave the byHash key in-place so that HasRecoveredSigForHash still returns true
+// This will leave the byHash and signHash key in-place so that HasRecoveredSigForHash /
+// late-share filtering still returns true
 void CRecoveredSigsDb::TruncateRecoveredSig(Consensus::LLMQType llmqType, const uint256& id)
 {
     CDBBatch batch(*db);

From 117ce7e89f2dc9b29ae185fc38ee7a007d3c2ae7 Mon Sep 17 00:00:00 2001
From: PastaPastaPasta <6443210+PastaPastaPasta@users.noreply.github.com>
Date: Mon, 24 Nov 2025 09:55:57 -0600
Subject: [PATCH 621/656] docs: release data -> date

Co-authored-by: UdjinM6 <UdjinM6@users.noreply.github.com>
---
 doc/release-process.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/release-process.md b/doc/release-process.md
index 7b07a64a1a4a..a86ae7684e07 100644
--- a/doc/release-process.md
+++ b/doc/release-process.md
@@ -11,7 +11,7 @@ Before every minor and major release:
 * [ ] Update DIPs with any changes introduced by this release (see [this pull request](https://github.com/dashpay/dips/pull/142) for an example)
 * [ ] Update version in `configure.ac` (don't forget to set `CLIENT_VERSION_IS_RELEASE` to `true`)
 * [ ] Write release notes (see below). To clear the release notes: `cp doc/release-notes-empty-template.md doc/release-notes.md`
-* [ ] Update flatpak [metainfo file](contrib/flatpak/org.dash.dash-core.metainfo.xml) with latest release tag and estimated release data
+* [ ] Update flatpak [metainfo file](contrib/flatpak/org.dash.dash-core.metainfo.xml) with latest release tag and estimated release date
 * [ ] Update `src/chainparams.cpp` `nMinimumChainWork` with information from the `getblockchaininfo` rpc.
 * [ ] Update `src/chainparams.cpp` `defaultAssumeValid` with information from the `getblockhash` rpc.
   - The selected value must not be orphaned so it may be useful to set the value two blocks back from the tip.

From d978ba7027310cd47299fc452a008be38261992b Mon Sep 17 00:00:00 2001
From: PastaPastaPasta <6443210+PastaPastaPasta@users.noreply.github.com>
Date: Mon, 24 Nov 2025 09:59:58 -0600
Subject: [PATCH 622/656] refactor: dedicated content_attribute tag inside
 content_rating

Co-authored-by: UdjinM6 <UdjinM6@users.noreply.github.com>
---
 contrib/flatpak/org.dash.dash-core.metainfo.xml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/contrib/flatpak/org.dash.dash-core.metainfo.xml b/contrib/flatpak/org.dash.dash-core.metainfo.xml
index bda73eec6ef2..5302b44b2b5a 100644
--- a/contrib/flatpak/org.dash.dash-core.metainfo.xml
+++ b/contrib/flatpak/org.dash.dash-core.metainfo.xml
@@ -25,7 +25,9 @@
     <release date="2024-12-12" version="22.0.0"/>
     <release date="2024-10-22" version="21.1.1"/>
   </releases>
-  <content_rating type="oars-1.1" id="money-purchasing">intense</content_rating>
+  <content_rating type="oars-1.1">
+    <content_attribute id="money-purchasing">intense</content_attribute>
+  </content_rating>
   <developer id="org.dash">
     <name>Dash Core Group</name>
   </developer>

From bc8f9d7fec9e6279293870de9586006bcd290d49 Mon Sep 17 00:00:00 2001
From: pasta <pasta@dashboost.org>
Date: Mon, 10 Nov 2025 10:04:59 -0600
Subject: [PATCH 623/656] Update guix-build workflow to only run on PRs with
 guix-build label and tag pushes

---
 .github/workflows/guix-build.yml | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/guix-build.yml b/.github/workflows/guix-build.yml
index 880e39d164a1..220371bfdd96 100644
--- a/.github/workflows/guix-build.yml
+++ b/.github/workflows/guix-build.yml
@@ -7,11 +7,17 @@ permissions:
 
 on:
   pull_request_target:
+  pull_request:
+    types: [labeled]
   push:
+    tags:
 
 jobs:
   build-image:
     runs-on: ubuntu-24.04-arm
+    if: |
+      (github.event_name == 'push' && startsWith(github.ref, 'refs/tags/')) ||
+      contains(github.event.pull_request.labels.*.name, 'guix-build')
     outputs:
       image-tag: ${{ steps.prepare.outputs.image-tag }}
       repo-name: ${{ steps.prepare.outputs.repo-name }}
@@ -19,7 +25,7 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v4
         with:
-          ref: ${{ github.event.pull_request.head.sha }}
+          ref: ${{ github.event.pull_request.head.sha != '' && github.event.pull_request.head.sha || github.sha }}
           path: dash
           fetch-depth: 0
 
@@ -65,7 +71,9 @@ jobs:
     needs: build-image
     # runs-on: [ "self-hosted", "linux", "x64", "ubuntu-core" ]
     runs-on: ubuntu-24.04-arm
-#    if: ${{ contains(github.event.pull_request.labels.*.name, 'guix-build') }}
+    if: |
+      (github.event_name == 'push' && startsWith(github.ref, 'refs/tags/')) ||
+      contains(github.event.pull_request.labels.*.name, 'guix-build')
     strategy:
       matrix:
         build_target: [x86_64-linux-gnu, arm-linux-gnueabihf, aarch64-linux-gnu, riscv64-linux-gnu, powerpc64-linux-gnu, x86_64-w64-mingw32, x86_64-apple-darwin, arm64-apple-darwin]
@@ -79,7 +87,7 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v4
         with:
-          ref: ${{ github.event.pull_request.head.sha }}
+          ref: ${{ github.event.pull_request.head.sha != '' && github.event.pull_request.head.sha || github.sha }}
           path: dash
           fetch-depth: 0
 

From dd06c3d15a4dcdd43087fa046cbd095aed449480 Mon Sep 17 00:00:00 2001
From: pasta <pasta@dashboost.org>
Date: Mon, 10 Nov 2025 10:06:35 -0600
Subject: [PATCH 624/656] Add RUN_GUIX_ON_ALL_PUSH variable to enable builds on
 all pushes

---
 .github/workflows/guix-build.yml | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/guix-build.yml b/.github/workflows/guix-build.yml
index 220371bfdd96..d18337e408b7 100644
--- a/.github/workflows/guix-build.yml
+++ b/.github/workflows/guix-build.yml
@@ -10,13 +10,12 @@ on:
   pull_request:
     types: [labeled]
   push:
-    tags:
 
 jobs:
   build-image:
     runs-on: ubuntu-24.04-arm
     if: |
-      (github.event_name == 'push' && startsWith(github.ref, 'refs/tags/')) ||
+      (github.event_name == 'push' && (startsWith(github.ref, 'refs/tags/') || vars.RUN_GUIX_ON_ALL_PUSH == 'true')) ||
       contains(github.event.pull_request.labels.*.name, 'guix-build')
     outputs:
       image-tag: ${{ steps.prepare.outputs.image-tag }}
@@ -72,7 +71,7 @@ jobs:
     # runs-on: [ "self-hosted", "linux", "x64", "ubuntu-core" ]
     runs-on: ubuntu-24.04-arm
     if: |
-      (github.event_name == 'push' && startsWith(github.ref, 'refs/tags/')) ||
+      (github.event_name == 'push' && (startsWith(github.ref, 'refs/tags/') || vars.RUN_GUIX_ON_ALL_PUSH == 'true')) ||
       contains(github.event.pull_request.labels.*.name, 'guix-build')
     strategy:
       matrix:

From 669882976fb7dc5b77b5bfaa0afd0c5d5eefe55f Mon Sep 17 00:00:00 2001
From: pasta <pasta@dashboost.org>
Date: Mon, 24 Nov 2025 09:51:56 -0600
Subject: [PATCH 625/656] fix: simplify conditions

---
 .github/workflows/guix-build.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/guix-build.yml b/.github/workflows/guix-build.yml
index d18337e408b7..f2fcfce522db 100644
--- a/.github/workflows/guix-build.yml
+++ b/.github/workflows/guix-build.yml
@@ -24,7 +24,7 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v4
         with:
-          ref: ${{ github.event.pull_request.head.sha != '' && github.event.pull_request.head.sha || github.sha }}
+          ref: ${{ github.event.pull_request.head.sha || github.sha }}
           path: dash
           fetch-depth: 0
 
@@ -86,7 +86,7 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v4
         with:
-          ref: ${{ github.event.pull_request.head.sha != '' && github.event.pull_request.head.sha || github.sha }}
+          ref: ${{ github.event.pull_request.head.sha || github.sha }}
           path: dash
           fetch-depth: 0
 

From 145fe8bc39a182b8dad44cbf28fcd650fad6260a Mon Sep 17 00:00:00 2001
From: pasta <pasta@dashboost.org>
Date: Mon, 24 Nov 2025 11:23:52 -0600
Subject: [PATCH 626/656] ci: don't fetch tags when not needed

---
 .github/workflows/build-src.yml         | 2 +-
 .github/workflows/clang-diff-format.yml | 2 +-
 .github/workflows/lint.yml              | 2 +-
 .github/workflows/merge-check.yml       | 4 ++--
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/build-src.yml b/.github/workflows/build-src.yml
index 6f9d3279b845..87a667fbabf4 100644
--- a/.github/workflows/build-src.yml
+++ b/.github/workflows/build-src.yml
@@ -40,7 +40,7 @@ jobs:
         id: setup
         run: |
           git config --global --add safe.directory "$PWD"
-          git fetch -fu origin develop:develop
+          git fetch --no-tags -fu origin develop:develop
           BUILD_TARGET="${{ inputs.build-target }}"
           source ./ci/dash/matrix.sh
           echo "HOST=${HOST}" >> $GITHUB_OUTPUT
diff --git a/.github/workflows/clang-diff-format.yml b/.github/workflows/clang-diff-format.yml
index 7a32ea455816..5f43bb4f792c 100644
--- a/.github/workflows/clang-diff-format.yml
+++ b/.github/workflows/clang-diff-format.yml
@@ -11,7 +11,7 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v3
       - name: Fetch git
-        run: git fetch -fu origin develop:develop
+        run: git fetch --no-tags -fu origin develop:develop
       - name: Run Clang-Format-Diff.py
         run: |
           git diff -U0 origin/develop -- $(git ls-files -- $(cat test/util/data/non-backported.txt)) | ./contrib/devtools/clang-format-diff.py -p1 > diff_output.txt
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
index 585d263c8e2d..78b825aa8254 100644
--- a/.github/workflows/lint.yml
+++ b/.github/workflows/lint.yml
@@ -25,7 +25,7 @@ jobs:
       - name: Initial setup
         run: |
           git config --global --add safe.directory "$PWD"
-          git fetch -fu origin develop:develop
+          git fetch --no-tags -fu origin develop:develop
         shell: bash
 
       - name: Run linters
diff --git a/.github/workflows/merge-check.yml b/.github/workflows/merge-check.yml
index f70500e8ca22..7fc2e22a8705 100644
--- a/.github/workflows/merge-check.yml
+++ b/.github/workflows/merge-check.yml
@@ -28,9 +28,9 @@ jobs:
           if [[ "${{ github.ref_name }}" == "master" ]]; then
             echo "Already on master, no need to check --ff-only"
           else
-            git fetch origin master:master
+            git fetch --no-tags origin master:master
             if [[ "${{ github.event_name }}" == "pull_request"* ]]; then
-              git fetch origin ${{ github.event.pull_request.base.ref }}:base_branch
+              git fetch --no-tags origin ${{ github.event.pull_request.base.ref }}:base_branch
               git checkout base_branch
               git pull --rebase=false origin pull/${{ github.event.pull_request.number }}/head
               git checkout master

From 98d7a6b4f521a4c4011dcdc2d3c25ac2197f623c Mon Sep 17 00:00:00 2001
From: UdjinM6 <UdjinM6@users.noreply.github.com>
Date: Wed, 5 Nov 2025 22:20:30 +0300
Subject: [PATCH 627/656] fix: improve wallet encryption robustness

Add defensive checks to prevent double-encryption of HD chains and improve wallet encryption robustness:

- Check IsCrypted() status to prevent re-encryption attempts
- Add TOCTOU protection by re-checking IsCrypted() under lock
- Validate decryption keys before TopUp operations
- Only decrypt HD chains when actually encrypted
- Remove irrelevant HasEncryptionKeys() checks (keys passed as parameters)
- Log warning when db rewrite fails after encryption
---
 src/wallet/scriptpubkeyman.cpp | 54 +++++++++++++++++++---------------
 src/wallet/wallet.cpp          | 15 ++++++++--
 2 files changed, 44 insertions(+), 25 deletions(-)

diff --git a/src/wallet/scriptpubkeyman.cpp b/src/wallet/scriptpubkeyman.cpp
index ecca89a16e68..e55077c0faf1 100644
--- a/src/wallet/scriptpubkeyman.cpp
+++ b/src/wallet/scriptpubkeyman.cpp
@@ -244,10 +244,14 @@ bool LegacyScriptPubKeyMan::Encrypt(const CKeyingMaterial& master_key, WalletBat
         return false;
     }
 
-    // must get current HD chain before EncryptKeys
     CHDChain hdChainCurrent;
     GetHDChain(hdChainCurrent);
 
+    if (!hdChainCurrent.IsNull() && hdChainCurrent.IsCrypted()) {
+        encrypted_batch = nullptr;
+        return false;
+    }
+
     KeyMap keys_to_encrypt;
     keys_to_encrypt.swap(mapKeys); // Clear mapKeys so AddCryptedKeyInner will succeed.
     for (const KeyMap::value_type& mKey : keys_to_encrypt)
@@ -340,10 +344,13 @@ void LegacyScriptPubKeyMan::UpgradeKeyMetadata()
     CHDChain hdChainCurrent;
     if (!GetHDChain(hdChainCurrent))
         throw std::runtime_error(std::string(__func__) + ": GetHDChain failed");
-    if (!m_storage.WithEncryptionKey([&](const CKeyingMaterial& encryption_key) {
-            return DecryptHDChain(encryption_key, hdChainCurrent);
-        })) {
-        throw std::runtime_error(std::string(__func__) + ": DecryptHDChain failed");
+
+    if (!hdChainCurrent.IsNull() && hdChainCurrent.IsCrypted()) {
+        if (!m_storage.WithEncryptionKey([&](const CKeyingMaterial& encryption_key) {
+                return DecryptHDChain(encryption_key, hdChainCurrent);
+            })) {
+            throw std::runtime_error(std::string(__func__) + ": DecryptHDChain failed");
+        }
     }
 
     CExtKey masterKey;
@@ -475,10 +482,12 @@ bool LegacyScriptPubKeyMan::GetDecryptedHDChain(CHDChain& hdChainRet) const
         return false;
     }
 
-    if (!m_storage.WithEncryptionKey([&](const CKeyingMaterial& encryption_key) {
-            return DecryptHDChain(encryption_key, hdChainTmp);
-        })) {
-        return false;
+    if (!hdChainTmp.IsNull() && hdChainTmp.IsCrypted()) {
+        if (!m_storage.WithEncryptionKey([&](const CKeyingMaterial& encryption_key) {
+                return DecryptHDChain(encryption_key, hdChainTmp);
+            })) {
+            return false;
+        }
     }
 
     // make sure seed matches this chain
@@ -493,12 +502,9 @@ bool LegacyScriptPubKeyMan::GetDecryptedHDChain(CHDChain& hdChainRet) const
 bool LegacyScriptPubKeyMan::EncryptHDChain(const CKeyingMaterial& vMasterKeyIn, CHDChain& chain)
 {
     LOCK(cs_KeyStore);
-    // should call EncryptKeys first
-    if (!m_storage.HasEncryptionKeys())
-        return false;
 
     if (chain.IsCrypted())
-        return true;
+        return false;
 
     // make sure seed matches this chain
     if (chain.GetID() != chain.GetSeedHash())
@@ -541,8 +547,6 @@ bool LegacyScriptPubKeyMan::EncryptHDChain(const CKeyingMaterial& vMasterKeyIn,
 bool LegacyScriptPubKeyMan::DecryptHDChain(const CKeyingMaterial& vMasterKeyIn, CHDChain& hdChainRet) const
 {
     LOCK(cs_KeyStore);
-    if (!m_storage.HasEncryptionKeys())
-        return true;
 
     if (m_hd_chain.IsNull()) {
         WalletLogPrintf("%s: ERROR: no HD chain\n", __func__);
@@ -1188,10 +1192,12 @@ bool LegacyScriptPubKeyMan::GetKey(const CKeyID &address, CKey& keyOut) const
         CHDChain hdChainCurrent;
         if (!GetHDChain(hdChainCurrent))
             throw std::runtime_error(std::string(__func__) + ": GetHDChain failed");
-        if (!m_storage.WithEncryptionKey([&](const CKeyingMaterial& encryption_key) {
-                return DecryptHDChain(encryption_key, hdChainCurrent);
-            })) {
-            throw std::runtime_error(std::string(__func__) + ": DecryptHDChain failed");
+        if (!hdChainCurrent.IsNull() && hdChainCurrent.IsCrypted()) {
+            if (!m_storage.WithEncryptionKey([&](const CKeyingMaterial& encryption_key) {
+                    return DecryptHDChain(encryption_key, hdChainCurrent);
+                })) {
+                throw std::runtime_error(std::string(__func__) + ": DecryptHDChain failed");
+            }
         }
         // make sure seed matches this chain
         if (hdChainCurrent.GetID() != hdChainCurrent.GetSeedHash())
@@ -1303,10 +1309,12 @@ void LegacyScriptPubKeyMan::DeriveNewChildKey(WalletBatch &batch, CKeyMetadata&
         throw std::runtime_error(std::string(__func__) + ": GetHDChain failed");
     }
 
-    if (!m_storage.WithEncryptionKey([&](const CKeyingMaterial& encryption_key) {
-            return DecryptHDChain(encryption_key, hdChainTmp);
-        })) {
-        throw std::runtime_error(std::string(__func__) + ": DecryptHDChain failed");
+    if (!hdChainTmp.IsNull() && hdChainTmp.IsCrypted()) {
+        if (!m_storage.WithEncryptionKey([&](const CKeyingMaterial& encryption_key) {
+                return DecryptHDChain(encryption_key, hdChainTmp);
+            })) {
+            throw std::runtime_error(std::string(__func__) + ": DecryptHDChain failed");
+        }
     }
     // make sure seed matches this chain
     if (hdChainTmp.GetID() != hdChainTmp.GetSeedHash())
diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp
index 24c4a2e5ff1d..ee27c3553ec2 100644
--- a/src/wallet/wallet.cpp
+++ b/src/wallet/wallet.cpp
@@ -720,6 +720,12 @@ bool CWallet::EncryptWallet(const SecureString& strWalletPassphrase)
 
     {
         LOCK(cs_wallet);
+
+        if (IsCrypted()) {
+            // verify again now that cs_wallet lock is held
+            return false;
+        }
+
         mapMasterKeys[++nMasterKeyMaxID] = kMasterKey;
         WalletBatch* encrypted_batch = new WalletBatch(GetDatabase());
         if (!encrypted_batch->TxnBegin()) {
@@ -766,6 +772,10 @@ bool CWallet::EncryptWallet(const SecureString& strWalletPassphrase)
         } else if (auto spk_man = GetLegacyScriptPubKeyMan()) {
             // if we are not using HD, generate new keypool
             if (spk_man->IsHDEnabled()) {
+                // NOTE: using internal master key which should be populated on Unlock()
+                if (!spk_man->CheckDecryptionKey(vMasterKey)) {
+                    return false;
+                }
                 if (!spk_man->TopUp()) {
                     return false;
                 }
@@ -779,8 +789,9 @@ bool CWallet::EncryptWallet(const SecureString& strWalletPassphrase)
 
         // Need to completely rewrite the wallet file; if we don't, bdb might keep
         // bits of the unencrypted private key in slack space in the database file.
-        GetDatabase().Rewrite();
-
+        if (!GetDatabase().Rewrite()) {
+            WalletLogPrintf("WARNING: Rewrite failed - wallet is in dangerous state!\n");
+        }
         // BDB seems to have a bad habit of writing old data into
         // slack space in .dat files; that is bad if the old data is
         // unencrypted private keys. So:

From 24670c7c1b6815ed14b29b7eecd68da2f3f34919 Mon Sep 17 00:00:00 2001
From: UdjinM6 <UdjinM6@users.noreply.github.com>
Date: Mon, 24 Nov 2025 21:08:37 +0300
Subject: [PATCH 628/656] fix: return encryption failure when database rewrite
 fails

---
 src/wallet/wallet.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp
index ee27c3553ec2..8ff5ae931a57 100644
--- a/src/wallet/wallet.cpp
+++ b/src/wallet/wallet.cpp
@@ -790,7 +790,8 @@ bool CWallet::EncryptWallet(const SecureString& strWalletPassphrase)
         // Need to completely rewrite the wallet file; if we don't, bdb might keep
         // bits of the unencrypted private key in slack space in the database file.
         if (!GetDatabase().Rewrite()) {
-            WalletLogPrintf("WARNING: Rewrite failed - wallet is in dangerous state!\n");
+            WalletLogPrintf("ERROR: Rewrite failed - wallet is in dangerous state!\n");
+            return false;
         }
         // BDB seems to have a bad habit of writing old data into
         // slack space in .dat files; that is bad if the old data is

From 116fca6ab80b56f7b2c18978355d1025b54b3ac6 Mon Sep 17 00:00:00 2001
From: UdjinM6 <UdjinM6@users.noreply.github.com>
Date: Mon, 24 Nov 2025 22:22:18 +0300
Subject: [PATCH 629/656] refactor: drop redundant `!hdchain.IsNull()` checks

`GetHDChain` should catch this already
---
 src/wallet/scriptpubkeyman.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/wallet/scriptpubkeyman.cpp b/src/wallet/scriptpubkeyman.cpp
index e55077c0faf1..3f984b930722 100644
--- a/src/wallet/scriptpubkeyman.cpp
+++ b/src/wallet/scriptpubkeyman.cpp
@@ -345,7 +345,7 @@ void LegacyScriptPubKeyMan::UpgradeKeyMetadata()
     if (!GetHDChain(hdChainCurrent))
         throw std::runtime_error(std::string(__func__) + ": GetHDChain failed");
 
-    if (!hdChainCurrent.IsNull() && hdChainCurrent.IsCrypted()) {
+    if (hdChainCurrent.IsCrypted()) {
         if (!m_storage.WithEncryptionKey([&](const CKeyingMaterial& encryption_key) {
                 return DecryptHDChain(encryption_key, hdChainCurrent);
             })) {
@@ -482,7 +482,7 @@ bool LegacyScriptPubKeyMan::GetDecryptedHDChain(CHDChain& hdChainRet) const
         return false;
     }
 
-    if (!hdChainTmp.IsNull() && hdChainTmp.IsCrypted()) {
+    if (hdChainTmp.IsCrypted()) {
         if (!m_storage.WithEncryptionKey([&](const CKeyingMaterial& encryption_key) {
                 return DecryptHDChain(encryption_key, hdChainTmp);
             })) {
@@ -1192,7 +1192,7 @@ bool LegacyScriptPubKeyMan::GetKey(const CKeyID &address, CKey& keyOut) const
         CHDChain hdChainCurrent;
         if (!GetHDChain(hdChainCurrent))
             throw std::runtime_error(std::string(__func__) + ": GetHDChain failed");
-        if (!hdChainCurrent.IsNull() && hdChainCurrent.IsCrypted()) {
+        if (hdChainCurrent.IsCrypted()) {
             if (!m_storage.WithEncryptionKey([&](const CKeyingMaterial& encryption_key) {
                     return DecryptHDChain(encryption_key, hdChainCurrent);
                 })) {
@@ -1309,7 +1309,7 @@ void LegacyScriptPubKeyMan::DeriveNewChildKey(WalletBatch &batch, CKeyMetadata&
         throw std::runtime_error(std::string(__func__) + ": GetHDChain failed");
     }
 
-    if (!hdChainTmp.IsNull() && hdChainTmp.IsCrypted()) {
+    if (hdChainTmp.IsCrypted()) {
         if (!m_storage.WithEncryptionKey([&](const CKeyingMaterial& encryption_key) {
                 return DecryptHDChain(encryption_key, hdChainTmp);
             })) {

From 4734a59212ba972c80d3d8f1eb57b3a3417cbb07 Mon Sep 17 00:00:00 2001
From: Ava Chow <github@achow101.com>
Date: Tue, 26 Nov 2024 17:00:01 -0500
Subject: [PATCH 630/656] Merge bitcoin/bitcoin#31364: refactor: Fix remaining
 clang-tidy performance-unnecessary-copy-initialization errors
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

3305972f7bfd78181566e4297891c2dd7cae0f2b refactor: Fix remaining clang-tidy performance-unnecessary-copy-initialization errors (Lőrinc)

Pull request description:

  A follow-up of https://github.com/bitcoin/bitcoin/pull/31305.

  The `clang-tidy` check can be run via:
  ```bash
  cmake -B build -DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++ -DCMAKE_EXPORT_COMPILE_COMMANDS=ON -DBUILD_BENCH=ON -DBUILD_FUZZ_BINARY=ON -DBUILD_FOR_FUZZING=ON && cmake --build build -j$(nproc)

  run-clang-tidy -quiet -p build -j $(nproc) -checks='-*,performance-unnecessary-copy-initialization' | grep -v 'clang-tidy'
  ```

ACKs for top commit:
  maflcko:
    review ACK 3305972f7bfd78181566e4297891c2dd7cae0f2 🏀
  achow101:
    ACK 3305972f7bfd78181566e4297891c2dd7cae0f2b
  theuni:
    ACK the much more constrained 3305972f7bfd78181566e4297891c2dd7cae0f2b.
  hebasto:
    ACK 3305972f7bfd78181566e4297891c2dd7cae0f2b, tested with clang 19.1.5 + clang-tidy.

Tree-SHA512: 64dc3b35f33b7ac064ebf9e56e9f0ceca5d26681a1379dcd2168987960020fe1a282ec4de8c353c82ddf0a534a4866b607fc691e690010c6cea78887045897fb
---
 src/bitcoin-tx.cpp                  | 10 +++++-----
 src/qt/bitcoinunits.cpp             |  2 +-
 src/test/validation_block_tests.cpp |  2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/bitcoin-tx.cpp b/src/bitcoin-tx.cpp
index f256516e2c08..9951ca31a50f 100644
--- a/src/bitcoin-tx.cpp
+++ b/src/bitcoin-tx.cpp
@@ -279,7 +279,7 @@ static void MutateTxAddOutAddr(CMutableTransaction& tx, const std::string& strIn
     CAmount value = ExtractAndValidateValue(vStrInputParts[0]);
 
     // extract and validate ADDRESS
-    std::string strAddr = vStrInputParts[1];
+    const std::string& strAddr = vStrInputParts[1];
     CTxDestination destination = DecodeDestination(strAddr);
     if (!IsValidDestination(destination)) {
         throw std::runtime_error("invalid TX output address");
@@ -311,7 +311,7 @@ static void MutateTxAddOutPubKey(CMutableTransaction& tx, const std::string& str
     // Extract and validate FLAGS
     bool bScriptHash = false;
     if (vStrInputParts.size() == 3) {
-        std::string flags = vStrInputParts[2];
+        const std::string& flags = vStrInputParts[2];
         bScriptHash = (flags.find('S') != std::string::npos);
     }
 
@@ -363,7 +363,7 @@ static void MutateTxAddOutMultiSig(CMutableTransaction& tx, const std::string& s
     // Extract FLAGS
     bool bScriptHash = false;
     if (vStrInputParts.size() == numkeys + 4) {
-        std::string flags = vStrInputParts.back();
+        const std::string& flags = vStrInputParts.back();
         bScriptHash = (flags.find('S') != std::string::npos);
     }
     else if (vStrInputParts.size() > numkeys + 4) {
@@ -428,13 +428,13 @@ static void MutateTxAddOutScript(CMutableTransaction& tx, const std::string& str
     CAmount value = ExtractAndValidateValue(vStrInputParts[0]);
 
     // extract and validate script
-    std::string strScript = vStrInputParts[1];
+    const std::string& strScript = vStrInputParts[1];
     CScript scriptPubKey = ParseScript(strScript);
 
     // Extract FLAGS
     bool bScriptHash = false;
     if (vStrInputParts.size() == 3) {
-        std::string flags = vStrInputParts.back();
+        const std::string& flags = vStrInputParts.back();
         bScriptHash = (flags.find('S') != std::string::npos);
     }
 
diff --git a/src/qt/bitcoinunits.cpp b/src/qt/bitcoinunits.cpp
index 2d5d6d265f62..65ddc1bda5f8 100644
--- a/src/qt/bitcoinunits.cpp
+++ b/src/qt/bitcoinunits.cpp
@@ -182,7 +182,7 @@ bool BitcoinUnits::parse(Unit unit, const QString& value, CAmount* val_out)
     {
         return false; // More than one dot
     }
-    QString whole = parts[0];
+    const QString& whole = parts[0];
     QString decimals;
 
     if(parts.size() > 1)
diff --git a/src/test/validation_block_tests.cpp b/src/test/validation_block_tests.cpp
index 9e83bdf6d320..280908c8d558 100644
--- a/src/test/validation_block_tests.cpp
+++ b/src/test/validation_block_tests.cpp
@@ -177,7 +177,7 @@ BOOST_AUTO_TEST_CASE(processnewblock_signals_ordering)
             bool ignored;
             FastRandomContext insecure;
             for (int i = 0; i < 1000; i++) {
-                auto block = blocks[insecure.randrange(blocks.size() - 1)];
+                const auto& block = blocks[insecure.randrange(blocks.size() - 1)];
                 Assert(m_node.chainman)->ProcessNewBlock(Params(), block, true, &ignored);
             }
 

From b33214cfced3c68a381b9256e1198a8e82914456 Mon Sep 17 00:00:00 2001
From: Ava Chow <github@achow101.com>
Date: Tue, 26 Nov 2024 14:58:44 -0500
Subject: [PATCH 631/656] Merge bitcoin/bitcoin#31305: refactor: Fix remaining
 clang-tidy performance-inefficient-vector errors
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

11f3bc229ccd4b20191855fb1df882cfa6145264 refactor: Reserve vectors in fuzz tests (Lőrinc)
152fefe7a22b7da3cfe2815083634bece9c5654e refactor: Preallocate PrevectorFillVector(In)Direct without vector resize (Lőrinc)
a774c7a339c26b1409c9a9572d2b52810ee64062 refactor: Fix remaining clang-tidy performance-inefficient-vector errors (Lőrinc)

Pull request description:

  PR inspired by https://github.com/bitcoin/bitcoin/pull/29608#issuecomment-2437847307 (and https://github.com/bitcoin/bitcoin/pull/29458, https://github.com/bitcoin/bitcoin/pull/29606, https://github.com/bitcoin/bitcoin/pull/29607, https://github.com/bitcoin/bitcoin/pull/30093).

  The `clang-tidy` check can be run via:
  ```bash
  cmake -B build -DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++ -DCMAKE_EXPORT_COMPILE_COMMANDS=ON -DBUILD_BENCH=ON -DBUILD_FUZZ_BINARY=ON -DBUILD_FOR_FUZZING=ON && cmake --build build -j$(nproc)

  run-clang-tidy -quiet -p build -j $(nproc) -checks='-*,performance-inefficient-vector-operation' | grep -v 'clang-tidy'
  ```
  which revealed 3 tests and 1 prod warning (+ fuzz and benching, found by hebasto).
  Even though the tests aren't performance critical, getting rid of these warnings (for which the checks were already enabled via https://github.com/bitcoin/bitcoin/blob/master/src/.clang-tidy#L18, see below), the fix was quite simple.

  <details>
  <summary>clang-tidy -list-checks</summary>

  ```bash
  cd src && clang-tidy -list-checks | grep 'vector'
      performance-inefficient-vector-operation
  ```

  </details>

  <details>
  <summary>Output before the change</summary>

  ```
  src/test/rpc_tests.cpp:434:9: error: 'emplace_back' is called inside a loop; consider pre-allocating the container capacity before the loop [performance-inefficient-vector-operation,-warnings-as-errors]
    433 |     for (int64_t i = 0; i < 100; i++) {
    434 |         feerates.emplace_back(1 ,1);
        |         ^

  src/test/checkqueue_tests.cpp:366:13: error: 'emplace_back' is called inside a loop; consider pre-allocating the container capacity before the loop [performance-inefficient-vector-operation,-warnings-as-errors]
    365 |         for (size_t i = 0; i < 3; ++i) {
    366 |             tg.emplace_back(
        |             ^

  src/test/cuckoocache_tests.cpp:231:9: error: 'emplace_back' is called inside a loop; consider pre-allocating the container capacity before the loop [performance-inefficient-vector-operation,-warnings-as-errors]
    228 |     for (uint32_t x = 0; x < 3; ++x)
    229 |         /** Each thread is emplaced with x copy-by-value
    230 |         */
    231 |         threads.emplace_back([&, x] {
        |         ^

  src/rpc/output_script.cpp:127:17: error: 'push_back' is called inside a loop; consider pre-allocating the container capacity before the loop [performance-inefficient-vector-operation,-warnings-as-errors]
    126 |             for (unsigned int i = 0; i < keys.size(); ++i) {
    127 |                 pubkeys.push_back(HexToPubKey(keys[i].get_str()));
        |                 ^
  ```

  And the fuzz and benchmarks, noticed by hebasto: https://github.com/bitcoin/bitcoin/pull/31305#issuecomment-2483124499

  </details>

ACKs for top commit:
  maflcko:
    review ACK 11f3bc229ccd4b20191855fb1df882cfa6145264 🎦
  achow101:
    ACK 11f3bc229ccd4b20191855fb1df882cfa6145264
  theuni:
    ACK 11f3bc229ccd4b20191855fb1df882cfa6145264
  hebasto:
    ACK 11f3bc229ccd4b20191855fb1df882cfa6145264, tested with clang 19.1.5 + clang-tidy.

Tree-SHA512: 41691c19f35c63b922a95407617a54f9bff1af3f95f99d15642064f321df038aeb1ae5f061f854ed913f69036807cc28fa6222b2ff4c24ef43b909027fa0f9b3
---
 src/bench/prevector.cpp        | 2 ++
 src/test/checkqueue_tests.cpp  | 1 +
 src/test/cuckoocache_tests.cpp | 1 +
 src/test/fuzz/txorphan.cpp     | 1 +
 src/test/fuzz/util.h           | 2 ++
 src/test/rpc_tests.cpp         | 1 +
 6 files changed, 8 insertions(+)

diff --git a/src/bench/prevector.cpp b/src/bench/prevector.cpp
index 9ff4629741b3..8de8e05c067f 100644
--- a/src/bench/prevector.cpp
+++ b/src/bench/prevector.cpp
@@ -112,6 +112,7 @@ static void PrevectorFillVectorDirect(benchmark::Bench& bench)
 {
     bench.run([&] {
         std::vector<prevector<28, T>> vec;
+        vec.reserve(260);
         for (size_t i = 0; i < 260; ++i) {
             vec.emplace_back();
         }
@@ -124,6 +125,7 @@ static void PrevectorFillVectorIndirect(benchmark::Bench& bench)
 {
     bench.run([&] {
         std::vector<prevector<28, T>> vec;
+        vec.reserve(260);
         for (size_t i = 0; i < 260; ++i) {
             // force allocation
             vec.emplace_back(29, T{});
diff --git a/src/test/checkqueue_tests.cpp b/src/test/checkqueue_tests.cpp
index cd816f943c4d..a73b4c252642 100644
--- a/src/test/checkqueue_tests.cpp
+++ b/src/test/checkqueue_tests.cpp
@@ -384,6 +384,7 @@ BOOST_AUTO_TEST_CASE(test_CheckQueueControl_Locks)
     auto queue = std::make_unique<Standard_Queue>(QUEUE_BATCH_SIZE);
     {
         std::vector<std::thread> tg;
+        tg.reserve(3);
         std::atomic<int> nThreads {0};
         std::atomic<int> fails {0};
         for (size_t i = 0; i < 3; ++i) {
diff --git a/src/test/cuckoocache_tests.cpp b/src/test/cuckoocache_tests.cpp
index c9d1202b58fe..ea5c81a3bcc8 100644
--- a/src/test/cuckoocache_tests.cpp
+++ b/src/test/cuckoocache_tests.cpp
@@ -219,6 +219,7 @@ static void test_cache_erase_parallel(size_t megabytes)
     /** Spin up 3 threads to run contains with erase.
      */
     std::vector<std::thread> threads;
+    threads.reserve(3);
     /** Erase the first quarter */
     for (uint32_t x = 0; x < 3; ++x)
         /** Each thread is emplaced with x copy-by-value
diff --git a/src/test/fuzz/txorphan.cpp b/src/test/fuzz/txorphan.cpp
index 1a279b6bb74c..f4d12c41fce4 100644
--- a/src/test/fuzz/txorphan.cpp
+++ b/src/test/fuzz/txorphan.cpp
@@ -65,6 +65,7 @@ FUZZ_TARGET(txorphan, .init = initialize_orphanage)
                 }
             }
             // output amount will not affect txorphanage
+            tx_mut.vout.reserve(num_out);
             for (uint32_t i = 0; i < num_out; i++) {
                 tx_mut.vout.emplace_back(CAmount{0}, CScript{});
             }
diff --git a/src/test/fuzz/util.h b/src/test/fuzz/util.h
index 0f505cc79439..ea008b8f50ff 100644
--- a/src/test/fuzz/util.h
+++ b/src/test/fuzz/util.h
@@ -147,6 +147,7 @@ template<typename B = uint8_t>
 {
     const size_t n_elements = fuzzed_data_provider.ConsumeIntegralInRange<size_t>(0, max_vector_size);
     std::vector<std::string> r;
+    r.reserve(n_elements);
     for (size_t i = 0; i < n_elements; ++i) {
         r.push_back(fuzzed_data_provider.ConsumeRandomLengthString(max_string_length));
     }
@@ -158,6 +159,7 @@ template <typename T>
 {
     const size_t n_elements = fuzzed_data_provider.ConsumeIntegralInRange<size_t>(0, max_vector_size);
     std::vector<T> r;
+    r.reserve(n_elements);
     for (size_t i = 0; i < n_elements; ++i) {
         r.push_back(fuzzed_data_provider.ConsumeIntegral<T>());
     }
diff --git a/src/test/rpc_tests.cpp b/src/test/rpc_tests.cpp
index 4809b859bee6..6ebc56e250e1 100644
--- a/src/test/rpc_tests.cpp
+++ b/src/test/rpc_tests.cpp
@@ -441,6 +441,7 @@ BOOST_AUTO_TEST_CASE(rpc_getblockstats_calculate_percentiles_by_size)
 {
     int64_t total_size = 200;
     std::vector<std::pair<CAmount, int64_t>> feerates;
+    feerates.reserve(200);
     CAmount result[NUM_GETBLOCKSTATS_PERCENTILES] = { 0 };
 
     for (int64_t i = 0; i < 100; i++) {

From 828b9bc8d5034b38909fb2533b46cb483cbaa5a5 Mon Sep 17 00:00:00 2001
From: merge-script <fanquake@gmail.com>
Date: Tue, 8 Oct 2024 15:22:25 +0100
Subject: [PATCH 632/656] Merge bitcoin/bitcoin#31051: test: remove unused code
 from `script_tests`

e0287bc4b2d83cefb7af48aef457153d0729bcd4 test: remove unused code from script_tests (fanquake)

Pull request description:

  This has been unused since #29648. Noticed while running a newer version of clang-tidy (19.1.1):
  ```bash
  [127/391][6.2s] /opt/homebrew/opt/llvm/bin/clang-tidy -p=build -quiet --config-file=/bitcoin/src/.clang-tidy /bitcoin/src/test/script_tests.cpp
  bitcoin/src/test/script_tests.cpp:126:25: error: local copy 'tx2' of the variable 'tx' is never modified and never used; consider removing the statement [performance-unnecessary-copy-initialization,-warnings-as-errors]
    126 |     CMutableTransaction tx2 = tx;
        |     ~~~~~~~~~~~~~~~~~~~~^~~~~~~~~
    127 |     BOOST_CHECK_MESSAGE(VerifyScript(scriptSig, scriptPubKey, &scriptWitness, flags, MutableTransactionSignatureChecker(&tx, 0, txCredit.vout[0].nValue, MissingDataBehavior::ASSERT_FAIL), &err) == expect, message);
  512 warnings generated.
  ```

ACKs for top commit:
  maflcko:
    review ACK e0287bc4b2d83cefb7af48aef457153d0729bcd4
  BrandonOdiwuor:
    ACK e0287bc4b2d83cefb7af48aef457153d0729bcd4

Tree-SHA512: f69513d0b898e0e9afad047bcec200707b057e3718a3d35bd479a788a1973e49ee7e5f48feadb8731ab5fdbd12a2b53b0bcf65296701e2296c3fdb67cdcabfb5
---
 src/test/script_tests.cpp | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/test/script_tests.cpp b/src/test/script_tests.cpp
index 100f5300724c..4924c26e0af0 100644
--- a/src/test/script_tests.cpp
+++ b/src/test/script_tests.cpp
@@ -113,8 +113,7 @@ void DoTest(const CScript& scriptPubKey, const CScript& scriptSig, uint32_t flag
     bool expect = (scriptError == SCRIPT_ERR_OK);
     ScriptError err;
     const CTransaction txCredit{BuildCreditingTransaction(scriptPubKey)};
-    CMutableTransaction tx = BuildSpendingTransaction(scriptSig, txCredit);
-    CMutableTransaction tx2 = tx;
+    const CMutableTransaction tx = BuildSpendingTransaction(scriptSig, txCredit);
     BOOST_CHECK_MESSAGE(VerifyScript(scriptSig, scriptPubKey, flags, MutableTransactionSignatureChecker(&tx, 0, txCredit.vout[0].nValue, MissingDataBehavior::ASSERT_FAIL), &err) == expect, message);
     BOOST_CHECK_MESSAGE(err == scriptError, FormatScriptError(err) + " where " + FormatScriptError((ScriptError_t)scriptError) + " expected: " + message);
 
@@ -129,7 +128,7 @@ void DoTest(const CScript& scriptPubKey, const CScript& scriptSig, uint32_t flag
 
 #if defined(HAVE_CONSENSUS_LIB)
     CDataStream stream(SER_NETWORK, PROTOCOL_VERSION);
-    stream << tx2;
+    stream << tx;
     uint32_t libconsensus_flags{flags & dashconsensus_SCRIPT_FLAGS_VERIFY_ALL};
     if (libconsensus_flags == flags) {
         int expectedSuccessCode = expect ? 1 : 0;

From 0ffa05a5d4ee5f1854a8fd92364e0070cd67809a Mon Sep 17 00:00:00 2001
From: PastaPastaPasta <6443210+PastaPastaPasta@users.noreply.github.com>
Date: Tue, 25 Nov 2025 07:51:29 -0600
Subject: [PATCH 633/656] fix: redundant check

Co-authored-by: UdjinM6 <UdjinM6@users.noreply.github.com>
---
 .github/workflows/guix-build.yml | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/.github/workflows/guix-build.yml b/.github/workflows/guix-build.yml
index f2fcfce522db..48ab032f40bf 100644
--- a/.github/workflows/guix-build.yml
+++ b/.github/workflows/guix-build.yml
@@ -70,9 +70,6 @@ jobs:
     needs: build-image
     # runs-on: [ "self-hosted", "linux", "x64", "ubuntu-core" ]
     runs-on: ubuntu-24.04-arm
-    if: |
-      (github.event_name == 'push' && (startsWith(github.ref, 'refs/tags/') || vars.RUN_GUIX_ON_ALL_PUSH == 'true')) ||
-      contains(github.event.pull_request.labels.*.name, 'guix-build')
     strategy:
       matrix:
         build_target: [x86_64-linux-gnu, arm-linux-gnueabihf, aarch64-linux-gnu, riscv64-linux-gnu, powerpc64-linux-gnu, x86_64-w64-mingw32, x86_64-apple-darwin, arm64-apple-darwin]

From 815f7c4f5e56945f3049942c8517d38cd79a4309 Mon Sep 17 00:00:00 2001
From: PastaPastaPasta <6443210+PastaPastaPasta@users.noreply.github.com>
Date: Tue, 25 Nov 2025 08:06:51 -0600
Subject: [PATCH 634/656] fix: fetch tags in building source stage

Co-authored-by: UdjinM6 <UdjinM6@users.noreply.github.com>
---
 .github/workflows/build-src.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build-src.yml b/.github/workflows/build-src.yml
index 87a667fbabf4..6f9d3279b845 100644
--- a/.github/workflows/build-src.yml
+++ b/.github/workflows/build-src.yml
@@ -40,7 +40,7 @@ jobs:
         id: setup
         run: |
           git config --global --add safe.directory "$PWD"
-          git fetch --no-tags -fu origin develop:develop
+          git fetch -fu origin develop:develop
           BUILD_TARGET="${{ inputs.build-target }}"
           source ./ci/dash/matrix.sh
           echo "HOST=${HOST}" >> $GITHUB_OUTPUT

From 3cce090935783fa6e65dcbba16a375328c53c08d Mon Sep 17 00:00:00 2001
From: pasta <pasta@dashboost.org>
Date: Tue, 25 Nov 2025 09:21:06 -0600
Subject: [PATCH 635/656] fix: include QDebug directly

---
 src/qt/bitcoin.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/qt/bitcoin.cpp b/src/qt/bitcoin.cpp
index 394d1d97165c..e78adbb79884 100644
--- a/src/qt/bitcoin.cpp
+++ b/src/qt/bitcoin.cpp
@@ -49,6 +49,7 @@
 #include <memory>
 
 #include <QApplication>
+#include <QDebug>
 #include <QLatin1String>
 #include <QLibraryInfo>
 #include <QLocale>

From 36d589a29db5e178595e644b6dea8a3ef5fbbd70 Mon Sep 17 00:00:00 2001
From: merge-script <fanquake@gmail.com>
Date: Sun, 8 Dec 2024 16:30:38 +0000
Subject: [PATCH 636/656] partial Merge bitcoin/bitcoin#31306: ci: Update Clang
 in "tidy" job

BACKPORT NOTE:
This file is missing to be backported: ci/test/00_setup_env_native_tidy.sh
Missing changes from contrib/devtools/iwyu/bitcoin.core.imp

31e59d94c67b58f24dd701fc7ccfee7d79f311cb iwyu: Drop backported mapping (Hennadii Stepanov)
fe9bc5abef3dcbe0f6395c3233f9d122579cd1f0 ci: Update Clang in "tidy" job (Hennadii Stepanov)

Pull request description:

  This PR switches to the latest [IWYU 0.23](https://github.com/include-what-you-use/include-what-you-use/releases/tag/0.23), which is compatible with Clang 19.

  New "bugprone-use-after-move" and "modernize-use-starts-ends-with" warnings that emerged have been addressed.

ACKs for top commit:
  maflcko:
    lgtm ACK 31e59d94c67b58f24dd701fc7ccfee7d79f311cb
  l0rinc:
    ACK 31e59d94c67b58f24dd701fc7ccfee7d79f311cb
  theuni:
    ACK 31e59d94c67b58f24dd701fc7ccfee7d79f311cb

Tree-SHA512: ae0ca150673e1bfa78664f2ef35dbc965094b32374cafeeae390c6d368c28169a7f7790debe9a6eeb5efc39c9a468f5032d92f30cc4032b09d8265f6a75de882
---
 contrib/devtools/iwyu/bitcoin.core.imp | 2 +-
 src/core_read.cpp                      | 2 +-
 src/test/result_tests.cpp              | 3 ++-
 src/torcontrol.cpp                     | 4 ++--
 4 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/contrib/devtools/iwyu/bitcoin.core.imp b/contrib/devtools/iwyu/bitcoin.core.imp
index 1f31229e0a48..c4c4ba4cebd8 100644
--- a/contrib/devtools/iwyu/bitcoin.core.imp
+++ b/contrib/devtools/iwyu/bitcoin.core.imp
@@ -1,3 +1,3 @@
-# Fixups / upstreamed changes
+# Nothing for now.
 [
 ]
diff --git a/src/core_read.cpp b/src/core_read.cpp
index a6e362603aac..b6753f9c1248 100644
--- a/src/core_read.cpp
+++ b/src/core_read.cpp
@@ -39,7 +39,7 @@ class OpCodeParser
             }
             mapOpNames[strName] = static_cast<opcodetype>(op);
             // Convenience: OP_ADD and just ADD are both recognized:
-            if (strName.compare(0, 3, "OP_") == 0) { // strName starts with "OP_"
+            if (strName.starts_with("OP_")) {
                 mapOpNames[strName.substr(3)] = static_cast<opcodetype>(op);
             }
         }
diff --git a/src/test/result_tests.cpp b/src/test/result_tests.cpp
index 6a23a7b8950a..2df756992b05 100644
--- a/src/test/result_tests.cpp
+++ b/src/test/result_tests.cpp
@@ -63,7 +63,8 @@ void ExpectSuccess(const util::Result<T>& result, const bilingual_str& str, Args
 {
     ExpectResult(result, true, str);
     BOOST_CHECK_EQUAL(result.has_value(), true);
-    BOOST_CHECK_EQUAL(result.value(), T{std::forward<Args>(args)...});
+    T expected{std::forward<Args>(args)...};
+    BOOST_CHECK_EQUAL(result.value(), expected);
     BOOST_CHECK_EQUAL(&result.value(), &*result);
 }
 
diff --git a/src/torcontrol.cpp b/src/torcontrol.cpp
index 50c01a4d718a..67958c521596 100644
--- a/src/torcontrol.cpp
+++ b/src/torcontrol.cpp
@@ -350,7 +350,7 @@ void TorController::get_socks_cb(TorControlConnection& _conn, const TorControlRe
     std::string socks_location;
     if (reply.code == 250) {
         for (const auto& line : reply.lines) {
-            if (0 == line.compare(0, 20, "net/listeners/socks=")) {
+            if (line.starts_with("net/listeners/socks=")) {
                 const std::string port_list_str = line.substr(20);
                 std::vector<std::string> port_list = SplitString(port_list_str, ' ');
 
@@ -361,7 +361,7 @@ void TorController::get_socks_cb(TorControlConnection& _conn, const TorControlRe
                         if (portstr.empty()) continue;
                     }
                     socks_location = portstr;
-                    if (0 == portstr.compare(0, 10, "127.0.0.1:")) {
+                    if (portstr.starts_with("127.0.0.1:")) {
                         // Prefer localhost - ignore other ports
                         break;
                     }

From 022896e925db96397ac07a6a393a26d74935257b Mon Sep 17 00:00:00 2001
From: Konstantin Akimov <knstqq@gmail.com>
Date: Tue, 25 Nov 2025 18:19:23 +0700
Subject: [PATCH 637/656] fix: more fixes for
 performance-unnecessary-copy-initialization due to newer clang 19

---
 src/evo/specialtxman.cpp       | 9 ++++-----
 src/governance/object.cpp      | 4 ++--
 src/llmq/signing_shares.cpp    | 4 ++--
 src/validation.cpp             | 4 ++--
 src/wallet/scriptpubkeyman.cpp | 2 +-
 5 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/src/evo/specialtxman.cpp b/src/evo/specialtxman.cpp
index 0852f97ce607..33e1493331fa 100644
--- a/src/evo/specialtxman.cpp
+++ b/src/evo/specialtxman.cpp
@@ -191,17 +191,16 @@ bool CSpecialTxProcessor::RebuildListFromBlock(const CBlock& block, gsl::not_nul
 
     int nHeight = pindexPrev->nHeight + 1;
 
-    CDeterministicMNList oldList = prevList;
-    CDeterministicMNList newList = oldList;
+    CDeterministicMNList newList = prevList;
     newList.SetBlockHash(uint256()); // we can't know the final block hash, so better not return a (invalid) block hash
     newList.SetHeight(nHeight);
 
-    auto payee = oldList.GetMNPayee(pindexPrev);
+    auto payee = prevList.GetMNPayee(pindexPrev);
 
-    // we iterate the oldList here and update the newList
+    // we iterate the prevList here and update the newList
     // this is only valid as long these have not diverged at this point, which is the case as long as we don't add
     // code above this loop that modifies newList
-    oldList.ForEachMN(false, [&pindexPrev, &newList, this](auto& dmn) {
+    prevList.ForEachMN(false, [&pindexPrev, &newList, this](auto& dmn) {
         if (!dmn.pdmnState->confirmedHash.IsNull()) {
             // already confirmed
             return;
diff --git a/src/governance/object.cpp b/src/governance/object.cpp
index 01b9135d34c6..173d2ab8db88 100644
--- a/src/governance/object.cpp
+++ b/src/governance/object.cpp
@@ -270,8 +270,8 @@ UniValue CGovernanceObject::GetJSONObject() const
     if (objResult.isObject()) {
         obj = objResult;
     } else {
-        std::vector<UniValue> arr1 = objResult.getValues();
-        std::vector<UniValue> arr2 = arr1.at(0).getValues();
+        const std::vector<UniValue>& arr1 = objResult.getValues();
+        const std::vector<UniValue>& arr2 = arr1.at(0).getValues();
         obj = arr2.at(1);
     }
 
diff --git a/src/llmq/signing_shares.cpp b/src/llmq/signing_shares.cpp
index 43bc21af4af9..ff07837fafe6 100644
--- a/src/llmq/signing_shares.cpp
+++ b/src/llmq/signing_shares.cpp
@@ -1630,13 +1630,13 @@ void CSigSharesManager::SignPendingSigShares()
         auto opt_sigShare = CreateSigShare(*pQuorum, id, msgHash);
 
         if (opt_sigShare.has_value() && opt_sigShare->sigShare.Get().IsValid()) {
-            auto sigShare = *opt_sigShare;
+            auto& sigShare = *opt_sigShare;
             ProcessSigShare(sigShare, pQuorum);
 
             if (IsAllMembersConnectedEnabled(pQuorum->params.type, m_sporkman)) {
                 LOCK(cs);
                 auto& session = signedSessions[sigShare.GetSignHash()];
-                session.sigShare = sigShare;
+                session.sigShare = std::move(sigShare);
                 session.quorum = pQuorum;
                 session.nextAttemptTime = 0;
                 session.attempt = 0;
diff --git a/src/validation.cpp b/src/validation.cpp
index cb6214facd03..bbb9a5b5c6fc 100644
--- a/src/validation.cpp
+++ b/src/validation.cpp
@@ -2155,7 +2155,7 @@ DisconnectResult CChainState::DisconnectBlock(const CBlock& block, const CBlockI
     m_evoDb.WriteBestBlock(pindex->pprev->GetBlockHash());
 
     if (mnlist_updates_opt.has_value()) {
-        auto mnlu = mnlist_updates_opt.value();
+        auto& mnlu = mnlist_updates_opt.value();
         GetMainSignals().NotifyMasternodeListChanged(true, mnlu.old_list, mnlu.diff);
         uiInterface.NotifyMasternodeListChanged(mnlu.new_list, pindex->pprev);
     }
@@ -2706,7 +2706,7 @@ bool CChainState::ConnectBlock(const CBlock& block, BlockValidationState& state,
     m_evoDb.WriteBestBlock(pindex->GetBlockHash());
 
     if (mnlist_updates_opt.has_value()) {
-        auto mnlu = mnlist_updates_opt.value();
+        const auto& mnlu = mnlist_updates_opt.value();
         GetMainSignals().NotifyMasternodeListChanged(false, mnlu.old_list, mnlu.diff);
         uiInterface.NotifyMasternodeListChanged(mnlu.new_list, pindex);
     }
diff --git a/src/wallet/scriptpubkeyman.cpp b/src/wallet/scriptpubkeyman.cpp
index f08852e3207f..775c101a2d36 100644
--- a/src/wallet/scriptpubkeyman.cpp
+++ b/src/wallet/scriptpubkeyman.cpp
@@ -398,7 +398,7 @@ void LegacyScriptPubKeyMan::GenerateNewHDChain(const SecureString& secureMnemoni
 
     // Encryption routine if vMasterKey has been supplied
     if (vMasterKeyOpt.has_value()) {
-        auto vMasterKey = vMasterKeyOpt.value();
+        const auto& vMasterKey = vMasterKeyOpt.value();
         if (vMasterKey.size() != WALLET_CRYPTO_KEY_SIZE) {
             throw std::runtime_error(strprintf("%s : invalid vMasterKey size, got %zd (expected %lld)", __func__, vMasterKey.size(), WALLET_CRYPTO_KEY_SIZE));
         }

From 245d1b17c744aaf068b72e4f279848d6cefbb3cc Mon Sep 17 00:00:00 2001
From: Konstantin Akimov <knstqq@gmail.com>
Date: Tue, 25 Nov 2025 22:02:54 +0700
Subject: [PATCH 638/656] fix: more fixes for bugprone-use-after-move
 clang-tidy

---
 src/test/coins_tests.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/test/coins_tests.cpp b/src/test/coins_tests.cpp
index c11a0b57538e..793c2d84a179 100644
--- a/src/test/coins_tests.cpp
+++ b/src/test/coins_tests.cpp
@@ -761,10 +761,10 @@ static void CheckAddCoinBase(CAmount base_value, CAmount cache_value, CAmount mo
 // while still verifying that the CoinsViewCache::AddCoin implementation
 // ignores base values.
 template <typename... Args>
-static void CheckAddCoin(Args&&... args)
+static void CheckAddCoin(const Args&... args)
 {
     for (const CAmount base_value : {ABSENT, SPENT, VALUE1})
-        CheckAddCoinBase(base_value, std::forward<Args>(args)...);
+        CheckAddCoinBase(base_value, args...);
 }
 
 BOOST_AUTO_TEST_CASE(ccoins_add)

From a67a9b6ae6823a98b96f08d592ee49b2c623931f Mon Sep 17 00:00:00 2001
From: fanquake <fanquake@gmail.com>
Date: Mon, 14 Feb 2022 20:20:21 +0000
Subject: [PATCH 639/656] Merge bitcoin/bitcoin#24254: build: Add Boost.Process
 usage check

abc057c6030b2a0ddab46835a7801054da677781 build: Add Boost.Process usage check (Hennadii Stepanov)

Pull request description:

  This PR adds a check that Boost.Process can be used without linking any libraries (header-only).
  Disable the functionality if that is not the case.

  Fixes bitcoin/bitcoin#24314.

ACKs for top commit:
  fanquake:
    ACK abc057c6030b2a0ddab46835a7801054da677781

Tree-SHA512: ed2a32b1f751ec6f88cc7220766edd4cdab93c1d0515c892aa3094ee8d5b13ef569830d6e7a7a00c0197b117585dc526d00d943cc99a1f8c8a66ac4e20fe2061
---
 configure.ac | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/configure.ac b/configure.ac
index c2723841e083..eb61af751acf 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1623,8 +1623,20 @@ if test "$use_external_signer" != "no"; then
       use_external_signer="no";
     ;;
     *)
-      use_external_signer="yes"
-      AC_DEFINE([ENABLE_EXTERNAL_SIGNER], [1], [Define if external signer support is enabled])
+      AC_MSG_CHECKING([whether Boost.Process can be used])
+      AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <boost/process.hpp>]])],
+        [have_boost_process="yes"],
+        [have_boost_process="no"])
+      AC_MSG_RESULT([$have_boost_process])
+      if test "$have_boost_process" == "yes"; then
+        use_external_signer="yes"
+        AC_DEFINE([ENABLE_EXTERNAL_SIGNER], [1], [Define if external signer support is enabled])
+      else
+        if test "$use_external_signer" = "yes"; then
+          AC_MSG_ERROR([External signing is not supported for this Boost version])
+        fi
+        use_external_signer="no";
+      fi
     ;;
   esac
 fi

From 8abdbcb3c888e682fee2ee2d82b98b54122476a1 Mon Sep 17 00:00:00 2001
From: laanwj <126646+laanwj@users.noreply.github.com>
Date: Mon, 28 Feb 2022 13:47:14 +0100
Subject: [PATCH 640/656] Merge bitcoin/bitcoin#24397: build: Fix Boost.Process
 check for Boost 1.73 and older

774323e378acea998069980edf50e1a26f4b6b9e ci: Force `--enable-external-signer` to prevent future regressions (Hennadii Stepanov)
69978858a4d8a9c34070f96133b8f95737a6505b build: Fix Boost.Process check for Boost 1.73 and older (Hennadii Stepanov)
2199ef79cba865af7949c3a55938ad54519ca5b8 build: Fix a non-portable use of `test` (Hennadii Stepanov)
d436c488d4216298016b09f8f97e10eada489bda build, refactor: Replace tabs with spaces (Hennadii Stepanov)

Pull request description:

  On master (5f44c5c428b696af4214b2519cb2bbeb0e4a1027) Boost.Process check false fails without the `-lpthread` flag.

  ```
  $ grep -C 2 pthread_detach config.log
  /usr/bin/ld: /tmp/cczCQfQv.o: in function `boost::asio::detail::posix_global_impl<boost::asio::system_context>::~posix_global_impl()':
  conftest.cpp:(.text._ZN5boost4asio6detail17posix_global_implINS0_14system_contextEED2Ev[_ZN5boost4asio6detail17posix_global_implINS0_14system_contextEED5Ev]+0xa3): undefined reference to `pthread_join'
  /usr/bin/ld: conftest.cpp:(.text._ZN5boost4asio6detail17posix_global_implINS0_14system_contextEED2Ev[_ZN5boost4asio6detail17posix_global_implINS0_14system_contextEED5Ev]+0xc4): undefined reference to `pthread_detach'
  collect2: error: ld returned 1 exit status
  configure:26674: $? = 1
  ```

  Not required for Boost 1.74+.

ACKs for top commit:
  laanwj:
    Code review ACK 774323e378acea998069980edf50e1a26f4b6b9e, is a bugfix/workaround, seems fine to merge last minute for 23.0.

Tree-SHA512: 2a9d4b67fd8910e107af972d8c223286b7c933bc310616f86c8b6d8c903438916980fc76bd7e37f2698f6ce5361dc706cbf2933d1ac2c081bcabe1b83ca7d6b6
---
 ci/dash/build_src.sh          | 2 +-
 ci/test/00_setup_env_win64.sh | 2 +-
 configure.ac                  | 8 ++++++--
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/ci/dash/build_src.sh b/ci/dash/build_src.sh
index ad1201e4599d..7014d51328d0 100755
--- a/ci/dash/build_src.sh
+++ b/ci/dash/build_src.sh
@@ -33,7 +33,7 @@ if [ -n "$CONFIG_SHELL" ]; then
   export CONFIG_SHELL="$CONFIG_SHELL"
 fi
 
-BITCOIN_CONFIG_ALL="--disable-dependency-tracking --prefix=$DEPENDS_DIR/$HOST --bindir=$BASE_OUTDIR/bin --libdir=$BASE_OUTDIR/lib"
+BITCOIN_CONFIG_ALL="--enable-external-signer --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
diff --git a/ci/test/00_setup_env_win64.sh b/ci/test/00_setup_env_win64.sh
index 2010c111818d..215a2db8269b 100755
--- a/ci/test/00_setup_env_win64.sh
+++ b/ci/test/00_setup_env_win64.sh
@@ -16,5 +16,5 @@ export GOAL="deploy"
 # Prior to 11.0.0, the mingw-w64 headers were missing noreturn attributes, causing warnings when
 # cross-compiling for Windows. https://sourceforge.net/p/mingw-w64/bugs/306/
 # https://github.com/mingw-w64/mingw-w64/commit/1690994f515910a31b9fb7c7bd3a52d4ba987abe
-export BITCOIN_CONFIG="--enable-gui --enable-reduce-exports --disable-miner CXXFLAGS='-Wno-return-type -Wno-error=maybe-uninitialized -Wno-error=array-bounds'"
+export BITCOIN_CONFIG="--enable-gui --enable-reduce-exports --disable-miner --disable-external-signer CXXFLAGS='-Wno-return-type -Wno-error=maybe-uninitialized -Wno-error=array-bounds'"
 export DIRECT_WINE_EXEC_TESTS=true
diff --git a/configure.ac b/configure.ac
index eb61af751acf..f7cfdff52f4a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -354,7 +354,7 @@ if test "$enable_debug" = "yes"; then
   dnl them, to prevent autoconfs "-g -O2" being added. Otherwise we'd end up
   dnl with "-O0 -g3 -g -O2".
   if test "$CXXFLAGS_overridden" = "no"; then
-	CXXFLAGS=""
+  CXXFLAGS=""
   fi
 
   dnl Disable all optimizations
@@ -1624,11 +1624,15 @@ if test "$use_external_signer" != "no"; then
     ;;
     *)
       AC_MSG_CHECKING([whether Boost.Process can be used])
+      TEMP_LDFLAGS="$LDFLAGS"
+      dnl Boost 1.73 and older require the following workaround.
+      LDFLAGS="$LDFLAGS $PTHREAD_CFLAGS"
       AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <boost/process.hpp>]])],
         [have_boost_process="yes"],
         [have_boost_process="no"])
+      LDFLAGS="$TEMP_LDFLAGS"
       AC_MSG_RESULT([$have_boost_process])
-      if test "$have_boost_process" == "yes"; then
+      if test "$have_boost_process" = "yes"; then
         use_external_signer="yes"
         AC_DEFINE([ENABLE_EXTERNAL_SIGNER], [1], [Define if external signer support is enabled])
       else

From db6f85dd8b90bef4486313cad6abf4904bc883fe Mon Sep 17 00:00:00 2001
From: fanquake <fanquake@gmail.com>
Date: Fri, 11 Mar 2022 10:23:20 +0000
Subject: [PATCH 641/656] Merge bitcoin/bitcoin#24521: build: Fix Boost.Process
 detection on macOS arm64

1d4157a42b77411579eb721b5c6fb533a357959d build: Fix Boost.Process detection on macOS arm64 (Hennadii Stepanov)

Pull request description:

  Could be tested as follows:
  ```
  % brew install boost@1.76
  % ./autogen.sh
  % ./configure --with-boost='/opt/homebrew/opt/boost@1.76'
  ```

ACKs for top commit:
  promag:
    Tested ACK on 1d4157a42b77411579eb721b5c6fb533a357959d with boost 1.76 on macOS arm64. #24523 is required for boost 1.78.

Tree-SHA512: 7abd39a78e970ecc051e53b5923dfc31d3f0576cf4ff7fcfb9c8708c857c46a7a595ec36238def83f41158970eeee209980da4b8b70f0ff68f940a38ac9a0471
---
 configure.ac | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/configure.ac b/configure.ac
index f7cfdff52f4a..87d3cdcda612 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1624,6 +1624,8 @@ if test "$use_external_signer" != "no"; then
     ;;
     *)
       AC_MSG_CHECKING([whether Boost.Process can be used])
+      TEMP_CPPFLAGS="$CPPFLAGS"
+      CPPFLAGS="$CPPFLAGS $BOOST_CPPFLAGS"
       TEMP_LDFLAGS="$LDFLAGS"
       dnl Boost 1.73 and older require the following workaround.
       LDFLAGS="$LDFLAGS $PTHREAD_CFLAGS"
@@ -1631,6 +1633,7 @@ if test "$use_external_signer" != "no"; then
         [have_boost_process="yes"],
         [have_boost_process="no"])
       LDFLAGS="$TEMP_LDFLAGS"
+      CPPFLAGS="$TEMP_CPPFLAGS"
       AC_MSG_RESULT([$have_boost_process])
       if test "$have_boost_process" = "yes"; then
         use_external_signer="yes"

From 6f34964a45c75041e1a6bcb36d7632afcf422f7a Mon Sep 17 00:00:00 2001
From: laanwj <126646+laanwj@users.noreply.github.com>
Date: Tue, 29 Mar 2022 13:31:44 +0200
Subject: [PATCH 642/656] Merge bitcoin/bitcoin#24523: build: Fix Boost.Process
 test for Boost 1.78

532c64a7264dd3c7329e8839547837c57da7dbe8 build: Fix Boost.Process test for Boost 1.78 (Hennadii Stepanov)

Pull request description:

  Rebased #24415 with Luke's suggestion.

  Fixes #24413.

ACKs for top commit:
  hebasto:
    ACK 532c64a7264dd3c7329e8839547837c57da7dbe8, tested on Mac mini (M1, 2020) + macOS Monterey 12.3 (21E230).

Tree-SHA512: 74f779695f6bbc45a2b7341a1402f747cc0d433d74825c7196cb9f156db0c0299895365f01665bd0bff12a8ebb5ea33a29b9a52f5eac0007ec35d1dca6544705
---
 configure.ac              | 5 +++++
 src/test/system_tests.cpp | 9 +++++++++
 src/util/system.cpp       | 9 +++++++++
 3 files changed, 23 insertions(+)

diff --git a/configure.ac b/configure.ac
index 87d3cdcda612..08d26d2727d3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1624,6 +1624,10 @@ if test "$use_external_signer" != "no"; then
     ;;
     *)
       AC_MSG_CHECKING([whether Boost.Process can be used])
+      TEMP_CXXFLAGS="$CXXFLAGS"
+      dnl Boost 1.78 requires the following workaround.
+      dnl See: https://github.com/boostorg/process/issues/235
+      CXXFLAGS="$CXXFLAGS -Wno-error=narrowing"
       TEMP_CPPFLAGS="$CPPFLAGS"
       CPPFLAGS="$CPPFLAGS $BOOST_CPPFLAGS"
       TEMP_LDFLAGS="$LDFLAGS"
@@ -1634,6 +1638,7 @@ if test "$use_external_signer" != "no"; then
         [have_boost_process="no"])
       LDFLAGS="$TEMP_LDFLAGS"
       CPPFLAGS="$TEMP_CPPFLAGS"
+      CXXFLAGS="$TEMP_CXXFLAGS"
       AC_MSG_RESULT([$have_boost_process])
       if test "$have_boost_process" = "yes"; then
         use_external_signer="yes"
diff --git a/src/test/system_tests.cpp b/src/test/system_tests.cpp
index c2e7a77e73a8..f5f94d442626 100644
--- a/src/test/system_tests.cpp
+++ b/src/test/system_tests.cpp
@@ -12,7 +12,16 @@
 // For details see https://github.com/bitcoin/bitcoin/pull/22348.
 #define __kernel_entry
 #endif
+#if defined(__GNUC__)
+// Boost 1.78 requires the following workaround.
+// See: https://github.com/boostorg/process/issues/235
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wnarrowing"
+#endif
 #include <boost/process.hpp>
+#if defined(__GNUC__)
+#pragma GCC diagnostic pop
+#endif
 #endif // ENABLE_EXTERNAL_SIGNER
 
 #include <boost/test/unit_test.hpp>
diff --git a/src/util/system.cpp b/src/util/system.cpp
index 50c761b8418a..5fca3e24bd2e 100644
--- a/src/util/system.cpp
+++ b/src/util/system.cpp
@@ -9,7 +9,16 @@
 #include <support/allocators/secure.h>
 
 #ifdef ENABLE_EXTERNAL_SIGNER
+#if defined(__GNUC__)
+// Boost 1.78 requires the following workaround.
+// See: https://github.com/boostorg/process/issues/235
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wnarrowing"
+#endif
 #include <boost/process.hpp>
+#if defined(__GNUC__)
+#pragma GCC diagnostic pop
+#endif
 #endif // ENABLE_EXTERNAL_SIGNER
 
 #include <chainparamsbase.h>

From 096612988ba3257d7d262b0b13107982a6d434ba Mon Sep 17 00:00:00 2001
From: fanquake <fanquake@gmail.com>
Date: Thu, 28 Jul 2022 11:02:04 +0100
Subject: [PATCH 643/656] Merge bitcoin/bitcoin#25723: test: Drop unused boost
 workaround

ba9a8e6cc1d1e9746f74e8c75af5c6c0a49f25c3 test: Drop unused boost workaround (Hennadii Stepanov)

Pull request description:

  This PR is a follow up of bitcoin/bitcoin#24065 and removes the workaround which has already been removed in other [places](https://github.com/bitcoin/bitcoin/pull/24065/files#diff-19427b0dd1a791adc728c82e88f267751ba4f1c751e19262cac03cccd2822216).

  Moreover, this workaround won't be required even if bitcoin/bitcoin#25696 is ever merged.

ACKs for top commit:
  fanquake:
    ACK ba9a8e6cc1d1e9746f74e8c75af5c6c0a49f25c3

Tree-SHA512: db19fc1550252d7a82a08f388ff6078c78452365e74b41e7bc36cbbc4d0fed9342636e8f2371bb8e78c9d11ee721d6363bcc21d11787f3aac967a6c4a9cc346f
---
 src/test/system_tests.cpp | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/src/test/system_tests.cpp b/src/test/system_tests.cpp
index f5f94d442626..383a6496938c 100644
--- a/src/test/system_tests.cpp
+++ b/src/test/system_tests.cpp
@@ -7,11 +7,6 @@
 #include <univalue.h>
 
 #ifdef ENABLE_EXTERNAL_SIGNER
-#if defined(WIN32) && !defined(__kernel_entry)
-// A workaround for boost 1.71 incompatibility with mingw-w64 compiler.
-// For details see https://github.com/bitcoin/bitcoin/pull/22348.
-#define __kernel_entry
-#endif
 #if defined(__GNUC__)
 // Boost 1.78 requires the following workaround.
 // See: https://github.com/boostorg/process/issues/235

From e5497458966a25deda926f1aa1f2a4b429772290 Mon Sep 17 00:00:00 2001
From: fanquake <fanquake@gmail.com>
Date: Sat, 13 Aug 2022 16:04:59 +0100
Subject: [PATCH 644/656] Merge bitcoin/bitcoin#25235: GetExternalSigner():
 fail if multiple signers are found

292b1a3e9c98b9ba74b28d149df8554d4ad8e5c0 GetExternalSigner(): fail if multiple signers are found (amadeuszpawlik)

Pull request description:

  If there are multiple external signers, `GetExternalSigner()` will
  just pick the first one in the list. If the user has two or more
  hardware wallets connected at the same time, he might not notice this.

  This PR adds a check and fails with suitable message, forcing the user to disconnect all but one external signer, so that there is no ambiguity as to which external signer was used.

ACKs for top commit:
  Sjors:
    tACK 292b1a3e9c98b9ba74b28d149df8554d4ad8e5c0
  achow101:
    ACK 292b1a3e9c98b9ba74b28d149df8554d4ad8e5c0

Tree-SHA512: e2a41d3eecc607d4f94e708614bed0f3545f7abba85f300c5a5f0d3d17d72c815259734accc5ca370953eacd290f27894ba2c18016f5e9584cd50fa1ec2fbb0b
---
 src/qt/walletcontroller.cpp                   |  4 +++
 .../external_signer_scriptpubkeyman.cpp       |  3 +-
 test/functional/mocks/invalid_signer.py       |  2 +-
 test/functional/mocks/multi_signers.py        | 30 +++++++++++++++++++
 test/functional/mocks/signer.py               |  2 +-
 test/functional/rpc_signer.py                 |  5 +---
 test/functional/wallet_signer.py              | 15 ++++++++++
 7 files changed, 54 insertions(+), 7 deletions(-)
 create mode 100755 test/functional/mocks/multi_signers.py

diff --git a/src/qt/walletcontroller.cpp b/src/qt/walletcontroller.cpp
index a6b071ef1b2f..f694dbfde523 100644
--- a/src/qt/walletcontroller.cpp
+++ b/src/qt/walletcontroller.cpp
@@ -376,6 +376,10 @@ void CreateWalletActivity::create()
     } catch (const std::runtime_error& e) {
         QMessageBox::critical(nullptr, tr("Can't list signers"), e.what());
     }
+    if (signers.size() > 1) {
+        QMessageBox::critical(nullptr, tr("Too many external signers found"), QString::fromStdString("More than one external signer found. Please connect only one at a time."));
+        signers.clear();
+    }
     m_create_wallet_dialog->setSigners(signers);
 
     m_create_wallet_dialog->setWindowModality(Qt::ApplicationModal);
diff --git a/src/wallet/external_signer_scriptpubkeyman.cpp b/src/wallet/external_signer_scriptpubkeyman.cpp
index 2d50c09b3574..14523eb87f59 100644
--- a/src/wallet/external_signer_scriptpubkeyman.cpp
+++ b/src/wallet/external_signer_scriptpubkeyman.cpp
@@ -45,7 +45,8 @@ ExternalSigner ExternalSignerScriptPubKeyMan::GetExternalSigner() {
     std::vector<ExternalSigner> signers;
     ExternalSigner::Enumerate(command, signers, Params().NetworkIDString());
     if (signers.empty()) throw std::runtime_error(std::string(__func__) + ": No external signers found");
-    // TODO: add fingerprint argument in case of multiple signers
+    // TODO: add fingerprint argument instead of failing in case of multiple signers.
+    if (signers.size() > 1) throw std::runtime_error(std::string(__func__) + ": More than one external signer found. Please connect only one at a time.");
     return signers[0];
 }
 
diff --git a/test/functional/mocks/invalid_signer.py b/test/functional/mocks/invalid_signer.py
index 4dd213cc3c0b..d99f33b297d9 100755
--- a/test/functional/mocks/invalid_signer.py
+++ b/test/functional/mocks/invalid_signer.py
@@ -18,7 +18,7 @@ def perform_pre_checks():
             sys.exit(int(mock_result[0]))
 
 def enumerate(args):
-    sys.stdout.write(json.dumps([{"fingerprint": "b3c19bfc", "type": "trezor", "model": "trezor_t"}, {"fingerprint": "00000002"}]))
+    sys.stdout.write(json.dumps([{"fingerprint": "b3c19bfc", "type": "trezor", "model": "trezor_t"}]))
 
 def getdescriptors(args):
     xpub_pkh = "xpub6CRhJvXV8x2AKWvqi1ZSMFU6cbxzQiYrv3dxSUXCawjMJ1JzpqVsveH4way1yCmJm29KzH1zrVZmVwes4Qo6oXVE1HFn4fdiKrYJngqFFc6"
diff --git a/test/functional/mocks/multi_signers.py b/test/functional/mocks/multi_signers.py
new file mode 100755
index 000000000000..88f93e23dea0
--- /dev/null
+++ b/test/functional/mocks/multi_signers.py
@@ -0,0 +1,30 @@
+#!/usr/bin/env python3
+# Copyright (c) 2022 The Bitcoin Core developers
+# Distributed under the MIT software license, see the accompanying
+# file COPYING or http://www.opensource.org/licenses/mit-license.php.
+
+import argparse
+import json
+import sys
+
+def enumerate(args):
+    sys.stdout.write(json.dumps([{"fingerprint": "00000001", "type": "trezor", "model": "trezor_t"},
+        {"fingerprint": "00000002", "type": "trezor", "model": "trezor_one"}]))
+
+parser = argparse.ArgumentParser(prog='./multi_signers.py', description='External multi-signer mock')
+
+subparsers = parser.add_subparsers(description='Commands', dest='command')
+subparsers.required = True
+
+parser_enumerate = subparsers.add_parser('enumerate', help='list available signers')
+parser_enumerate.set_defaults(func=enumerate)
+
+
+if not sys.stdin.isatty():
+    buffer = sys.stdin.read()
+    if buffer and buffer.rstrip() != "":
+        sys.argv.extend(buffer.rstrip().split(" "))
+
+args = parser.parse_args()
+
+args.func(args)
diff --git a/test/functional/mocks/signer.py b/test/functional/mocks/signer.py
index 0d5014a833b1..432de515c88d 100755
--- a/test/functional/mocks/signer.py
+++ b/test/functional/mocks/signer.py
@@ -18,7 +18,7 @@ def perform_pre_checks():
             sys.exit(int(mock_result[0]))
 
 def enumerate(args):
-  sys.stdout.write(json.dumps([{"fingerprint": "00000001", "type": "trezor", "model": "trezor_t"}, {"fingerprint": "00000002"}]))
+    sys.stdout.write(json.dumps([{"fingerprint": "00000001", "type": "trezor", "model": "trezor_t"}]))
 
 def getdescriptors(args):
     xpub = "tpubD6NzVbkrYhZ4WaWSyoBvQwbpLkojyoTZPRsgXELWz3Popb3qkjcJyJUGLnL4qHHoQvao8ESaAstxYSnhyswJ76uZPStJRJCTKvosUCJZL5B"
diff --git a/test/functional/rpc_signer.py b/test/functional/rpc_signer.py
index 2c17bc6a16e3..2d8ae0426652 100755
--- a/test/functional/rpc_signer.py
+++ b/test/functional/rpc_signer.py
@@ -70,10 +70,7 @@ def run_test(self):
         )
         self.clear_mock_result(self.nodes[1])
 
-        result = self.nodes[1].enumeratesigners()
-        assert_equal(len(result['signers']), 2)
-        assert_equal(result['signers'][0]["fingerprint"], "00000001")
-        assert_equal(result['signers'][0]["name"], "trezor_t")
+        assert_equal({'fingerprint': '00000001', 'name': 'trezor_t'} in self.nodes[1].enumeratesigners()['signers'], True)
 
 if __name__ == '__main__':
     RPCSignerTest().main()
diff --git a/test/functional/wallet_signer.py b/test/functional/wallet_signer.py
index 19ac88527ef1..cbb59bede125 100755
--- a/test/functional/wallet_signer.py
+++ b/test/functional/wallet_signer.py
@@ -32,6 +32,13 @@ def mock_invalid_signer_path(self):
         else:
             return path
 
+    def mock_multi_signers_path(self):
+        path = os.path.join(os.path.dirname(os.path.realpath(__file__)), 'mocks', 'multi_signers.py')
+        if platform.system() == "Windows":
+            return "py " + path
+        else:
+            return path
+
     def set_test_params(self):
         self.num_nodes = 2
 
@@ -55,6 +62,8 @@ def run_test(self):
         self.test_valid_signer()
         self.restart_node(1, [f"-signer={self.mock_invalid_signer_path()}", "-keypool=10"])
         self.test_invalid_signer()
+        self.restart_node(1, [f"-signer={self.mock_multi_signers_path()}", "-keypool=10"])
+        self.test_multiple_signers()
 
     def test_valid_signer(self):
         self.log.debug(f"-signer={self.mock_signer_path()}")
@@ -190,5 +199,11 @@ def test_invalid_signer(self):
         self.log.info('Test invalid external signer')
         assert_raises_rpc_error(-1, "Invalid descriptor", self.nodes[1].createwallet, wallet_name='hww_invalid', disable_private_keys=True, descriptors=True, external_signer=True)
 
+    def test_multiple_signers(self):
+        self.log.debug(f"-signer={self.mock_multi_signers_path()}")
+        self.log.info('Test multiple external signers')
+
+        assert_raises_rpc_error(-1, "GetExternalSigner: More than one external signer found", self.nodes[1].createwallet, wallet_name='multi_hww', disable_private_keys=True, descriptors=True, external_signer=True)
+
 if __name__ == '__main__':
     WalletSignerTest().main()

From bf70ffbd31a6680c4ffced8246633a5252741a8c Mon Sep 17 00:00:00 2001
From: Andrew Chow <github@achow101.com>
Date: Wed, 8 Mar 2023 21:00:14 -0500
Subject: [PATCH 645/656] Merge bitcoin/bitcoin#25696: build: Re-enable
 external signer on Windows

1a0d8e178c7b9a3e94d14f94b77305802ebdc93b build: Re-enable external signer on Windows (Hennadii Stepanov)
989451d0689543b25ee6bf1d5b82c863d583597b configure: Detect compatibility of Boost.Process rather than hardcode non-Windows (Luke Dashjr)

Pull request description:

  As https://github.com/boostorg/process/issues/207 has been resolved, it is possible now to re-enable external signer on Windows when cross-compiling.

  Guix build hashes:
  ```
  78f69ea7e0dbc8338981a92c0352220ccd7c2272d8cbff6a3b082a1412a935c5  guix-build-1a0d8e178c7b/output/aarch64-linux-gnu/SHA256SUMS.part
  ee17456ec818ddf5a175182508966e622573ccb518807cca43a40fa1dceda092  guix-build-1a0d8e178c7b/output/aarch64-linux-gnu/bitcoin-1a0d8e178c7b-aarch64-linux-gnu-debug.tar.gz
  5080551bde379c746cc67b10429aef33b9f9e49d2d4e21ee1c3bfd9c1c845d46  guix-build-1a0d8e178c7b/output/aarch64-linux-gnu/bitcoin-1a0d8e178c7b-aarch64-linux-gnu.tar.gz
  dfab220ce76a40bf7dcf07aab352a616a91b516503639455fe7e1b137bad3e85  guix-build-1a0d8e178c7b/output/arm-linux-gnueabihf/SHA256SUMS.part
  516ceb822571a8bd88fe107dca434ef596b1e4328ccbda1d51e1d482d3050396  guix-build-1a0d8e178c7b/output/arm-linux-gnueabihf/bitcoin-1a0d8e178c7b-arm-linux-gnueabihf-debug.tar.gz
  21325380638f817107c203b9a1aedb808d1a4a2b4041493753ca4cbf19aa4f2c  guix-build-1a0d8e178c7b/output/arm-linux-gnueabihf/bitcoin-1a0d8e178c7b-arm-linux-gnueabihf.tar.gz
  cf48ed78fcfceaeb3610ccf22326d735a129dcbf9d50b557b3de359169aefdfd  guix-build-1a0d8e178c7b/output/arm64-apple-darwin/SHA256SUMS.part
  d4d51e136148bac6a20bb3adb402c499967647736acb420bfdeb71603aba57da  guix-build-1a0d8e178c7b/output/arm64-apple-darwin/bitcoin-1a0d8e178c7b-arm64-apple-darwin-unsigned.dmg
  95bb62d24f860e08a392ddb74d5860ccf27e8baa183e6749af877d26a3bd6b0b  guix-build-1a0d8e178c7b/output/arm64-apple-darwin/bitcoin-1a0d8e178c7b-arm64-apple-darwin-unsigned.tar.gz
  68da4c92f37bb802df37141af194f47c16da1d84f77a0fbb1016013ae0338502  guix-build-1a0d8e178c7b/output/arm64-apple-darwin/bitcoin-1a0d8e178c7b-arm64-apple-darwin.tar.gz
  6704e38c2d3f11321403797598d05f062648fec6f2d76900ba250dab481e29da  guix-build-1a0d8e178c7b/output/dist-archive/bitcoin-1a0d8e178c7b.tar.gz
  64b936bc90d1e01fe8f276511edc9bb945dcebe70332aa37d3a786348443b8e7  guix-build-1a0d8e178c7b/output/powerpc64-linux-gnu/SHA256SUMS.part
  3d03532e54b6e42498ea240c86b8567e94fd462f56087b869c3d6f09e2dde878  guix-build-1a0d8e178c7b/output/powerpc64-linux-gnu/bitcoin-1a0d8e178c7b-powerpc64-linux-gnu-debug.tar.gz
  c5843d79a58b0a864fe723458dab4eee54ad11f4b1f7960975b086eeedc0d541  guix-build-1a0d8e178c7b/output/powerpc64-linux-gnu/bitcoin-1a0d8e178c7b-powerpc64-linux-gnu.tar.gz
  f861ff519bd5e3d6d5ce1646ee0a06bcef1288ddb804a4a600e4dbfe5d5be521  guix-build-1a0d8e178c7b/output/powerpc64le-linux-gnu/SHA256SUMS.part
  5f477da21980dbcf9696081903dc1ba8a3f79ce3579641d208e69a6f598c8eb9  guix-build-1a0d8e178c7b/output/powerpc64le-linux-gnu/bitcoin-1a0d8e178c7b-powerpc64le-linux-gnu-debug.tar.gz
  b3757b11c614136934158acea5139e8abd0c5c9cdfda72ae44db436f21716b33  guix-build-1a0d8e178c7b/output/powerpc64le-linux-gnu/bitcoin-1a0d8e178c7b-powerpc64le-linux-gnu.tar.gz
  1c21bdb17fe3436e685e88c62423e630fe2b3c41dd00025a99fd80d97817ac2f  guix-build-1a0d8e178c7b/output/riscv64-linux-gnu/SHA256SUMS.part
  f36ae98473f086ae8f0dc66223b5ec407d57dc4d8d45ae284401520ff5c0b273  guix-build-1a0d8e178c7b/output/riscv64-linux-gnu/bitcoin-1a0d8e178c7b-riscv64-linux-gnu-debug.tar.gz
  1603e4d0e869eb47a1dc2d26b67772d0016d90f7ba5e50d2009365cc02cb8169  guix-build-1a0d8e178c7b/output/riscv64-linux-gnu/bitcoin-1a0d8e178c7b-riscv64-linux-gnu.tar.gz
  f86ef652102f022827b70477bffa0a44008c6300cf62ca7b3595146cf2ed91ba  guix-build-1a0d8e178c7b/output/x86_64-apple-darwin/SHA256SUMS.part
  f84d435d8e4709bf29bc7ac7ed8dc6b8af4077cef05e520b468b2896ce10876a  guix-build-1a0d8e178c7b/output/x86_64-apple-darwin/bitcoin-1a0d8e178c7b-x86_64-apple-darwin-unsigned.dmg
  af2aab969b7ed7aeea0e02adbcc9e3b438086bf76b6bfc36146c53e05a27bd57  guix-build-1a0d8e178c7b/output/x86_64-apple-darwin/bitcoin-1a0d8e178c7b-x86_64-apple-darwin-unsigned.tar.gz
  32a5109ba28ab74ff66238e6a8f8a04e455ebce382a3be287df92a227818fe72  guix-build-1a0d8e178c7b/output/x86_64-apple-darwin/bitcoin-1a0d8e178c7b-x86_64-apple-darwin.tar.gz
  377462e9a96f4aba72c915dd5df5159a4301a1fa8ed0ee48faa6c71573de80c3  guix-build-1a0d8e178c7b/output/x86_64-linux-gnu/SHA256SUMS.part
  a3bf62e828d2350a483b2d16205014f66e8884597b0b72e178042a958c548336  guix-build-1a0d8e178c7b/output/x86_64-linux-gnu/bitcoin-1a0d8e178c7b-x86_64-linux-gnu-debug.tar.gz
  66cda980188ea1941a7d66c8b03c447580af33db55abe3bbe3581823ae0534a3  guix-build-1a0d8e178c7b/output/x86_64-linux-gnu/bitcoin-1a0d8e178c7b-x86_64-linux-gnu.tar.gz
  2117f0dd9baeb4d585f841592e94c088f4487bf2008b8f281d0c3ceee92ff6cc  guix-build-1a0d8e178c7b/output/x86_64-w64-mingw32/SHA256SUMS.part
  d40d5dec3287f467c42232c05d82f7fb538cda34bd2e63ff7e1876f471c3a790  guix-build-1a0d8e178c7b/output/x86_64-w64-mingw32/bitcoin-1a0d8e178c7b-win64-debug.zip
  92dcc92765fbc07b1cc8258bfa69280541e1b4553cc41fed18672c2c6931d5c0  guix-build-1a0d8e178c7b/output/x86_64-w64-mingw32/bitcoin-1a0d8e178c7b-win64-setup-unsigned.exe
  a6dd9b4d29f21d3a18cf64556cb03446ef17bf801eb6ac257b65d27cbd95080f  guix-build-1a0d8e178c7b/output/x86_64-w64-mingw32/bitcoin-1a0d8e178c7b-win64-unsigned.tar.gz
  a4022e595d955198f73530473ef8e90a708746089ee2dd27de794176873330c1  guix-build-1a0d8e178c7b/output/x86_64-w64-mingw32/bitcoin-1a0d8e178c7b-win64.zip
  ```

ACKs for top commit:
  Sjors:
    tACK 1a0d8e178c7b9a3e94d14f94b77305802ebdc93b
  achow101:
    ACK 1a0d8e178c7b9a3e94d14f94b77305802ebdc93b

Tree-SHA512: db7319259b1e1571cfab4bb3b99ae10a2f744e62757cae5059fd6f4dd6d5586eb09feb63a0c4bb07f7128b283f1dc281ed435224bc8e40da577fd4f04cde489a
---
 ci/test/00_setup_env_win64.sh |  2 +-
 configure.ac                  | 78 +++++++++++++++++------------------
 src/test/system_tests.cpp     | 21 ++++++++--
 3 files changed, 57 insertions(+), 44 deletions(-)

diff --git a/ci/test/00_setup_env_win64.sh b/ci/test/00_setup_env_win64.sh
index 215a2db8269b..1fa7fce5a8db 100755
--- a/ci/test/00_setup_env_win64.sh
+++ b/ci/test/00_setup_env_win64.sh
@@ -16,5 +16,5 @@ export GOAL="deploy"
 # Prior to 11.0.0, the mingw-w64 headers were missing noreturn attributes, causing warnings when
 # cross-compiling for Windows. https://sourceforge.net/p/mingw-w64/bugs/306/
 # https://github.com/mingw-w64/mingw-w64/commit/1690994f515910a31b9fb7c7bd3a52d4ba987abe
-export BITCOIN_CONFIG="--enable-gui --enable-reduce-exports --disable-miner --disable-external-signer CXXFLAGS='-Wno-return-type -Wno-error=maybe-uninitialized -Wno-error=array-bounds'"
+export BITCOIN_CONFIG="--enable-gui --enable-reduce-exports --disable-miner --enable-external-signer CXXFLAGS='-Wno-return-type -Wno-error=maybe-uninitialized -Wno-error=array-bounds'"
 export DIRECT_WINE_EXEC_TESTS=true
diff --git a/configure.ac b/configure.ac
index 08d26d2727d3..78ae9308679b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1612,45 +1612,45 @@ if test "$use_boost" = "yes"; then
 fi
 
 if test "$use_external_signer" != "no"; then
-  case $host in
-    *mingw*)
-      dnl Boost Process uses Boost Filesystem when targeting Windows. Also,
-      dnl since Boost 1.71.0, Process does not work with mingw-w64 without
-      dnl workarounds. See 67669ab425b52a2b6be3d2f3b3b7e3939b676a2c.
-      if test "$use_external_signer" = "yes"; then
-        AC_MSG_ERROR([External signing is not supported on Windows])
-      fi
-      use_external_signer="no";
-    ;;
-    *)
-      AC_MSG_CHECKING([whether Boost.Process can be used])
-      TEMP_CXXFLAGS="$CXXFLAGS"
-      dnl Boost 1.78 requires the following workaround.
-      dnl See: https://github.com/boostorg/process/issues/235
-      CXXFLAGS="$CXXFLAGS -Wno-error=narrowing"
-      TEMP_CPPFLAGS="$CPPFLAGS"
-      CPPFLAGS="$CPPFLAGS $BOOST_CPPFLAGS"
-      TEMP_LDFLAGS="$LDFLAGS"
-      dnl Boost 1.73 and older require the following workaround.
-      LDFLAGS="$LDFLAGS $PTHREAD_CFLAGS"
-      AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <boost/process.hpp>]])],
-        [have_boost_process="yes"],
-        [have_boost_process="no"])
-      LDFLAGS="$TEMP_LDFLAGS"
-      CPPFLAGS="$TEMP_CPPFLAGS"
-      CXXFLAGS="$TEMP_CXXFLAGS"
-      AC_MSG_RESULT([$have_boost_process])
-      if test "$have_boost_process" = "yes"; then
-        use_external_signer="yes"
-        AC_DEFINE([ENABLE_EXTERNAL_SIGNER], [1], [Define if external signer support is enabled])
-      else
-        if test "$use_external_signer" = "yes"; then
-          AC_MSG_ERROR([External signing is not supported for this Boost version])
-        fi
-        use_external_signer="no";
-      fi
-    ;;
-  esac
+  AC_MSG_CHECKING([whether Boost.Process can be used])
+  TEMP_CXXFLAGS="$CXXFLAGS"
+  dnl Boost 1.78 requires the following workaround.
+  dnl See: https://github.com/boostorg/process/issues/235
+  CXXFLAGS="$CXXFLAGS -Wno-error=narrowing"
+  TEMP_CPPFLAGS="$CPPFLAGS"
+  CPPFLAGS="$CPPFLAGS $BOOST_CPPFLAGS"
+  TEMP_LDFLAGS="$LDFLAGS"
+  dnl Boost 1.73 and older require the following workaround.
+  LDFLAGS="$LDFLAGS $PTHREAD_CFLAGS"
+  AC_LINK_IFELSE([AC_LANG_PROGRAM([[
+    #define BOOST_PROCESS_USE_STD_FS
+    #include <boost/process.hpp>
+  ]],[[
+    namespace bp = boost::process;
+    bp::opstream stdin_stream;
+    bp::ipstream stdout_stream;
+    bp::child c("dummy", bp::std_out > stdout_stream, bp::std_err > stdout_stream, bp::std_in < stdin_stream);
+    stdin_stream << std::string{"test"} << std::endl;
+    if (c.running()) c.terminate();
+    c.wait();
+    c.exit_code();
+  ]])],
+    [have_boost_process="yes"],
+    [have_boost_process="no"])
+  LDFLAGS="$TEMP_LDFLAGS"
+  CPPFLAGS="$TEMP_CPPFLAGS"
+  CXXFLAGS="$TEMP_CXXFLAGS"
+  AC_MSG_RESULT([$have_boost_process])
+  if test "$have_boost_process" = "yes"; then
+    use_external_signer="yes"
+    AC_DEFINE([ENABLE_EXTERNAL_SIGNER], [1], [Define if external signer support is enabled])
+    AC_DEFINE([BOOST_PROCESS_USE_STD_FS], [1], [Defined to avoid Boost::Process trying to use Boost Filesystem])
+  else
+    if test "$use_external_signer" = "yes"; then
+      AC_MSG_ERROR([External signing is not supported for this Boost version])
+    fi
+    use_external_signer="no";
+  fi
 fi
 AM_CONDITIONAL([ENABLE_EXTERNAL_SIGNER], [test "$use_external_signer" = "yes"])
 
diff --git a/src/test/system_tests.cpp b/src/test/system_tests.cpp
index 383a6496938c..735aa93874e8 100644
--- a/src/test/system_tests.cpp
+++ b/src/test/system_tests.cpp
@@ -34,6 +34,13 @@ BOOST_AUTO_TEST_CASE(dummy)
 
 BOOST_AUTO_TEST_CASE(run_command)
 {
+#ifdef WIN32
+    // https://www.winehq.org/pipermail/wine-devel/2008-September/069387.html
+    auto hntdll = GetModuleHandleA("ntdll.dll");
+    assert(hntdll);
+    const bool wine_runtime = GetProcAddress(hntdll, "wine_get_version");
+#endif
+
     {
         const UniValue result = RunCommandParseJSON("");
         BOOST_CHECK(result.isNull());
@@ -51,21 +58,27 @@ BOOST_AUTO_TEST_CASE(run_command)
     }
     {
         // An invalid command is handled by Boost
+#ifdef WIN32
+        const int expected_error{wine_runtime ? 6 : 2};
+#else
+        const int expected_error{2};
+#endif
         BOOST_CHECK_EXCEPTION(RunCommandParseJSON("invalid_command"), boost::process::process_error, [&](const boost::process::process_error& e) {
             BOOST_CHECK(std::string(e.what()).find("RunCommandParseJSON error:") == std::string::npos);
-            BOOST_CHECK_EQUAL(e.code().value(), 2);
+            BOOST_CHECK_EQUAL(e.code().value(), expected_error);
             return true;
         });
     }
     {
         // Return non-zero exit code, no output to stderr
 #ifdef WIN32
-        const std::string command{"cmd.exe /c call"};
+        const std::string command{"cmd.exe /c exit 1"};
 #else
         const std::string command{"false"};
 #endif
         BOOST_CHECK_EXCEPTION(RunCommandParseJSON(command), std::runtime_error, [&](const std::runtime_error& e) {
-            BOOST_CHECK(std::string(e.what()).find(strprintf("RunCommandParseJSON error: process(%s) returned 1: \n", command)) != std::string::npos);
+            const std::string what{e.what()};
+            BOOST_CHECK(what.find(strprintf("RunCommandParseJSON error: process(%s) returned 1: \n", command)) != std::string::npos);
             return true;
         });
     }
@@ -73,7 +86,7 @@ BOOST_AUTO_TEST_CASE(run_command)
         // Return non-zero exit code, with error message for stderr
 #ifdef WIN32
         const std::string command{"cmd.exe /c dir nosuchfile"};
-        const std::string expected{"File Not Found"};
+        const std::string expected{wine_runtime ? "File not found." : "File Not Found"};
 #else
         const std::string command{"ls nosuchfile"};
         const std::string expected{"No such file or directory"};

From e8888d782e2324c2905e47ee39bdfa3ebb22eb1b Mon Sep 17 00:00:00 2001
From: fanquake <fanquake@gmail.com>
Date: Wed, 12 Apr 2023 15:49:47 +0100
Subject: [PATCH 646/656] Merge bitcoin/bitcoin#27449: doc: update OpenBSD
 build docs for 7.3 (external signer support available)

6b17994ede6fe1961667d2e96127291b2a8b4f9d doc: update OpenBSD build docs for 7.3 (external signer support available) (Sebastian Falbesoner)

Pull request description:

  With OpenBSD 7.3, the waitid(2) system call is implemented (see https://github.com/openbsd/src/commit/8112871f19bbd25e86c93d0f901071ca2335a352, first mentioned kernel improvement at https://www.openbsd.org/73.html).

  This means Boost.Process finally doesn't fail to compile anymore and we can remove the build hint about missing external signer support. Tested on my amd64 machine by reconfiguring / rebuilding master branch and successfully running the functional test wallet_signer.py. :heavy_check_mark:

ACKs for top commit:
  fanquake:
    ACK 6b17994ede6fe1961667d2e96127291b2a8b4f9d - haven't tested, but looks good to me.

Tree-SHA512: 5bbcecce4ced38d8221f2c906a54667e50317e9ded182554cf73bb7f2fce55a38e53730eca25f813cff1d2d65c94141eb158d40f83228d12dcf859c16a1798b9
---
 doc/build-openbsd.md | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/doc/build-openbsd.md b/doc/build-openbsd.md
index dfdff14e6f93..8b0ee196eb46 100644
--- a/doc/build-openbsd.md
+++ b/doc/build-openbsd.md
@@ -1,6 +1,6 @@
 # OpenBSD Build Guide
 
-**Updated for OpenBSD [7.1](https://www.openbsd.org/71.html)**
+**Updated for OpenBSD [7.3](https://www.openbsd.org/73.html)**
 
 This guide describes how to build dashd, command-line utilities, and GUI on OpenBSD.
 
@@ -82,10 +82,6 @@ export AUTOMAKE_VERSION=1.16
 
 ### 1. Configuration
 
-Note that external signer support is currently not available on OpenBSD, since
-the used header-only library Boost.Process fails to compile (certain system
-calls and preprocessor defines like `waitid()` and `WEXITED` are missing).
-
 There are many ways to configure Dash Core, here are a few common examples:
 
 ##### Descriptor Wallet and GUI:

From 001493a11453fca2fae427a78ffa10fb8e670a28 Mon Sep 17 00:00:00 2001
From: Konstantin Akimov <knstqq@gmail.com>
Date: Tue, 25 Nov 2025 22:06:54 +0700
Subject: [PATCH 647/656] fix: more fixes for performance-move-const-arg
 clang-tidy

---
 src/evo/deterministicmns.cpp        | 2 +-
 src/instantsend/net_instantsend.cpp | 4 ++--
 src/masternode/meta.cpp             | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/evo/deterministicmns.cpp b/src/evo/deterministicmns.cpp
index cca3bb82b2b0..8ac189b8a612 100644
--- a/src/evo/deterministicmns.cpp
+++ b/src/evo/deterministicmns.cpp
@@ -1836,7 +1836,7 @@ std::vector<std::pair<uint256, CDeterministicMNListDiff>> CDeterministicMNManage
             temp_diffs.emplace_back(pIndex->GetBlockHash(), recalc_diff);
 
             // Move forward
-            current_list = std::move(next_list);
+            current_list = next_list; // TODO: make CDeterministicMNList moveable
         }
 
         // Verify that applying all diffs results in the target snapshot
diff --git a/src/instantsend/net_instantsend.cpp b/src/instantsend/net_instantsend.cpp
index 0e4b4b38caf5..efd217c10d51 100644
--- a/src/instantsend/net_instantsend.cpp
+++ b/src/instantsend/net_instantsend.cpp
@@ -237,11 +237,11 @@ void NetInstantSend::ProcessPendingISLocks(std::vector<std::pair<uint256, instan
         still_pending.reserve(bad_is_locks.size());
         for (auto& p : locks_to_process) {
             if (bad_is_locks.contains(p.first)) {
-                still_pending.push_back(std::move(p));
+                still_pending.emplace_back(std::move(p));
             }
         }
         // Now check against the previous active set and perform banning if this fails
-        ProcessPendingInstantSendLocks(llmq_params, dkgInterval, /*ban=*/true, std::move(still_pending));
+        ProcessPendingInstantSendLocks(llmq_params, dkgInterval, /*ban=*/true, still_pending);
     }
 }
 
diff --git a/src/masternode/meta.cpp b/src/masternode/meta.cpp
index 226aefb59f63..48d106b968da 100644
--- a/src/masternode/meta.cpp
+++ b/src/masternode/meta.cpp
@@ -202,7 +202,7 @@ bool CMasternodeMetaMan::SetPlatformBan(const uint256& inv_hash, PlatformBanMess
 
     bool ret = GetMetaInfo(protx_hash).SetPlatformBan(true, ban_msg.m_requested_height);
     if (ret) {
-        m_seen_platform_bans.insert(inv_hash, std::move(ban_msg));
+        m_seen_platform_bans.emplace(inv_hash, std::move(ban_msg));
     }
     return ret;
 }

From b881735ab2476a312bad91c99ad718183be40688 Mon Sep 17 00:00:00 2001
From: fanquake <fanquake@gmail.com>
Date: Wed, 13 Dec 2023 11:27:02 +0000
Subject: [PATCH 648/656] Merge bitcoin/bitcoin#28967: build: disable
 external-signer for Windows

308aec3e5655327d98e0428d8205d246f24d6af5 build: disable external-signer for Windows (fanquake)
35537318a19360ddf1ea8f0c1e6d8ad49e635516 ci: remove --enable-external-signer from win64 job (fanquake)

Pull request description:

  It's come to light that Boost ASIO (a Boost Process sub dep) has in some
  instances, been quietly  initialising our network stack on Windows (see
  PR https://github.com/bitcoin/bitcoin/pull/28486 and discussion in https://github.com/bitcoin/bitcoin/issues/28940).

  This has been shielding a bug in our own code, but the larger issue
  is that Boost Process/ASIO is running code before main, and doing things
  like setting up networking. This undermines our own assumptions about
  how our binary works, happens before we run any sanity checks,
  and before we call our own code to setup networking. Note that ASIO also
  calls WSAStartup with version `2.0`, whereas we call with `2.2`.

  It's also not clear why a feature like external signer would have a
  dependency that would be doing anything network/socket related,
  given it only exists to spawn a local process.

  See also the discussion in https://github.com/bitcoin/bitcoin/issues/24907. Note that the maintaince of Boost Process in general,
  has not really improved. For example, rather than fixing bugs like https://github.com/boostorg/process/issues/111,
  i.e, https://github.com/boostorg/process/pull/317, the maintainer chooses to just wrap exception causing overflows
  in try-catch blocks: https://github.com/boostorg/process/commit/0c42a58eacab6a96b19196e399307bad8a938a27. These changes get merged in large,
  unreviewed PRs, i.e https://github.com/boostorg/process/pull/319.

  This PR disables external-signer on Windows for now. If, in future, someone
  changes how Boost Process works, or replaces it entirely with some
  properly reviewed and maintained code, we could reenable this feature on
  Windows.

ACKs for top commit:
  hebasto:
    re-ACK 308aec3e5655327d98e0428d8205d246f24d6af5.
  TheCharlatan:
    ACK 308aec3e5655327d98e0428d8205d246f24d6af5

Tree-SHA512: 7405f7fc9833eeaacd6836c4e5b1c1a7845a40c1fdd55c1060152f8d8189e4777464fde650e11eb1539556a75dddf49667105987078b1457493ee772945da66e
---
 ci/test/00_setup_env_win64.sh |  2 +-
 configure.ac                  | 16 +++++++++++++---
 2 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/ci/test/00_setup_env_win64.sh b/ci/test/00_setup_env_win64.sh
index 1fa7fce5a8db..2010c111818d 100755
--- a/ci/test/00_setup_env_win64.sh
+++ b/ci/test/00_setup_env_win64.sh
@@ -16,5 +16,5 @@ export GOAL="deploy"
 # Prior to 11.0.0, the mingw-w64 headers were missing noreturn attributes, causing warnings when
 # cross-compiling for Windows. https://sourceforge.net/p/mingw-w64/bugs/306/
 # https://github.com/mingw-w64/mingw-w64/commit/1690994f515910a31b9fb7c7bd3a52d4ba987abe
-export BITCOIN_CONFIG="--enable-gui --enable-reduce-exports --disable-miner --enable-external-signer CXXFLAGS='-Wno-return-type -Wno-error=maybe-uninitialized -Wno-error=array-bounds'"
+export BITCOIN_CONFIG="--enable-gui --enable-reduce-exports --disable-miner CXXFLAGS='-Wno-return-type -Wno-error=maybe-uninitialized -Wno-error=array-bounds'"
 export DIRECT_WINE_EXEC_TESTS=true
diff --git a/configure.ac b/configure.ac
index 78ae9308679b..ff4184f1a94d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1642,9 +1642,19 @@ if test "$use_external_signer" != "no"; then
   CXXFLAGS="$TEMP_CXXFLAGS"
   AC_MSG_RESULT([$have_boost_process])
   if test "$have_boost_process" = "yes"; then
-    use_external_signer="yes"
-    AC_DEFINE([ENABLE_EXTERNAL_SIGNER], [1], [Define if external signer support is enabled])
-    AC_DEFINE([BOOST_PROCESS_USE_STD_FS], [1], [Defined to avoid Boost::Process trying to use Boost Filesystem])
+    case $host in
+      dnl Boost Process for Windows uses Boost ASIO. Boost ASIO performs
+      dnl pre-main init of Windows networking libraries, which we do not
+      dnl want.
+      *mingw*)
+        use_external_signer="no"
+      ;;
+      *)
+        use_external_signer="yes"
+        AC_DEFINE([ENABLE_EXTERNAL_SIGNER], [1], [Define if external signer support is enabled])
+        AC_DEFINE([BOOST_PROCESS_USE_STD_FS], [1], [Defined to avoid Boost::Process trying to use Boost Filesystem])
+      ;;
+    esac
   else
     if test "$use_external_signer" = "yes"; then
       AC_MSG_ERROR([External signing is not supported for this Boost version])

From 81f21fde127e342b3524ade5a3e8429986a59e00 Mon Sep 17 00:00:00 2001
From: fanquake <fanquake@gmail.com>
Date: Wed, 28 Feb 2024 17:24:11 -0500
Subject: [PATCH 649/656] Merge bitcoin/bitcoin#29489: test: Remove
 Windows-specific code from `system_tests/run_command`

51bc1c7126d6e130bc40c529fb71ae6486da0492 test: Remove Windows-specific code from `system_tests/run_command` (Hennadii Stepanov)

Pull request description:

  The removed code has been dead since https://github.com/bitcoin/bitcoin/pull/28967.

  Required as a precondition for replacing Boost.Process with [cpp-subprocess](https://github.com/bitcoin/bitcoin/pull/28981) to make diff for this code meaningful and reviewable.

  The plan is to reintroduce Windows-specific code in this test simultaneously with enabling Windows support in cpp-subprocess.

ACKs for top commit:
  Sjors:
    utACK 51bc1c7126d6e130bc40c529fb71ae6486da0492
  theStack:
    Code-review ACK 51bc1c7126d6e130bc40c529fb71ae6486da0492

Tree-SHA512: 0e3875c4dc20564332555633daf2227223b10dc3d052557635eced2734575d1e0252fb19e46ea6e6c47a15c51c345f70b6d437e33435abcd0e4fcf29edb50887
---
 src/test/system_tests.cpp | 32 +-------------------------------
 1 file changed, 1 insertion(+), 31 deletions(-)

diff --git a/src/test/system_tests.cpp b/src/test/system_tests.cpp
index 735aa93874e8..4111aa8488b0 100644
--- a/src/test/system_tests.cpp
+++ b/src/test/system_tests.cpp
@@ -34,23 +34,12 @@ BOOST_AUTO_TEST_CASE(dummy)
 
 BOOST_AUTO_TEST_CASE(run_command)
 {
-#ifdef WIN32
-    // https://www.winehq.org/pipermail/wine-devel/2008-September/069387.html
-    auto hntdll = GetModuleHandleA("ntdll.dll");
-    assert(hntdll);
-    const bool wine_runtime = GetProcAddress(hntdll, "wine_get_version");
-#endif
-
     {
         const UniValue result = RunCommandParseJSON("");
         BOOST_CHECK(result.isNull());
     }
     {
-#ifdef WIN32
-        const UniValue result = RunCommandParseJSON("cmd.exe /c echo {\"success\": true}");
-#else
         const UniValue result = RunCommandParseJSON("echo \"{\"success\": true}\"");
-#endif
         BOOST_CHECK(result.isObject());
         const UniValue& success = result.find_value("success");
         BOOST_CHECK(!success.isNull());
@@ -58,11 +47,7 @@ BOOST_AUTO_TEST_CASE(run_command)
     }
     {
         // An invalid command is handled by Boost
-#ifdef WIN32
-        const int expected_error{wine_runtime ? 6 : 2};
-#else
         const int expected_error{2};
-#endif
         BOOST_CHECK_EXCEPTION(RunCommandParseJSON("invalid_command"), boost::process::process_error, [&](const boost::process::process_error& e) {
             BOOST_CHECK(std::string(e.what()).find("RunCommandParseJSON error:") == std::string::npos);
             BOOST_CHECK_EQUAL(e.code().value(), expected_error);
@@ -71,11 +56,7 @@ BOOST_AUTO_TEST_CASE(run_command)
     }
     {
         // Return non-zero exit code, no output to stderr
-#ifdef WIN32
-        const std::string command{"cmd.exe /c exit 1"};
-#else
         const std::string command{"false"};
-#endif
         BOOST_CHECK_EXCEPTION(RunCommandParseJSON(command), std::runtime_error, [&](const std::runtime_error& e) {
             const std::string what{e.what()};
             BOOST_CHECK(what.find(strprintf("RunCommandParseJSON error: process(%s) returned 1: \n", command)) != std::string::npos);
@@ -84,13 +65,8 @@ BOOST_AUTO_TEST_CASE(run_command)
     }
     {
         // Return non-zero exit code, with error message for stderr
-#ifdef WIN32
-        const std::string command{"cmd.exe /c dir nosuchfile"};
-        const std::string expected{wine_runtime ? "File not found." : "File Not Found"};
-#else
         const std::string command{"ls nosuchfile"};
         const std::string expected{"No such file or directory"};
-#endif
         BOOST_CHECK_EXCEPTION(RunCommandParseJSON(command), std::runtime_error, [&](const std::runtime_error& e) {
             const std::string what(e.what());
             BOOST_CHECK(what.find(strprintf("RunCommandParseJSON error: process(%s) returned", command)) != std::string::npos);
@@ -100,15 +76,10 @@ BOOST_AUTO_TEST_CASE(run_command)
     }
     {
         // Unable to parse JSON
-#ifdef WIN32
-        const std::string command{"cmd.exe /c echo {"};
-#else
         const std::string command{"echo {"};
-#endif
         BOOST_CHECK_EXCEPTION(RunCommandParseJSON(command), std::runtime_error, HasReason("Unable to parse JSON: {"));
     }
-    // Test std::in, except for Windows
-#ifndef WIN32
+    // Test std::in
     {
         const UniValue result = RunCommandParseJSON("cat", "{\"success\": true}");
         BOOST_CHECK(result.isObject());
@@ -116,7 +87,6 @@ BOOST_AUTO_TEST_CASE(run_command)
         BOOST_CHECK(!success.isNull());
         BOOST_CHECK_EQUAL(success.get_bool(), true);
     }
-#endif
 }
 #endif // ENABLE_EXTERNAL_SIGNER
 

From 5a34a79428cec653de16834fb8b3aef6b8e676d7 Mon Sep 17 00:00:00 2001
From: fanquake <fanquake@gmail.com>
Date: Mon, 10 Oct 2022 17:41:29 +0800
Subject: [PATCH 650/656] Merge bitcoin/bitcoin#26196: kernel: move
 RunCommandParseJSON to its own file

43b8777dc3e63f4a1b20a3cb23e44c1b9e32862b refactor: move run_command from util to common (Cory Fields)
192325a77d593e404e74ef5e204aed8801b4e66f kernel: move RunCommandParseJSON to its own file (Cory Fields)

Pull request description:

  Because libbitcoinkernel does not include this new object, this has the side-effect of eliminating its unnecessary `boost::process` dependency.

  This leaves libbitcoinkernel with 3 remaining boost dependencies:
  - `boost::date_time` for `util/time.cpp`, which I'll separate out next. Exactly like this PR.
  - `boost::signals2` for which I have a POC re-implementation here: https://github.com/theuni/bitcoin/commits/replace-boost-signals
  - `boost::multi_index` which I'm not sure about yet.

ACKs for top commit:
  ryanofsky:
    Code review ACK 43b8777dc3e63f4a1b20a3cb23e44c1b9e32862b. Could consider squashing the two commits, so the code just moves once instead of twice.
  fanquake:
    ACK 43b8777dc3e63f4a1b20a3cb23e44c1b9e32862b

Tree-SHA512: f2a46cac34aaadfb8a1442316152ad354f6990021b82c78d80cae9fd43cd026209ffd62132eaa99d5d0f8cf34e996b6737d318a9d9a3f1d2ff8d17d697abf26d
---
 src/Makefile.am            |  2 ++
 src/common/run_command.cpp | 64 ++++++++++++++++++++++++++++++++++++++
 src/common/run_command.h   | 21 +++++++++++++
 src/external_signer.cpp    |  2 +-
 src/test/system_tests.cpp  |  2 +-
 src/util/system.cpp        | 52 -------------------------------
 src/util/system.h          |  8 -----
 7 files changed, 89 insertions(+), 62 deletions(-)
 create mode 100644 src/common/run_command.cpp
 create mode 100644 src/common/run_command.h

diff --git a/src/Makefile.am b/src/Makefile.am
index 2ed2fb3a1943..f939980fabf2 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -179,6 +179,7 @@ BITCOIN_CORE_H = \
   coinjoin/walletman.h \
   coins.h \
   common/bloom.h \
+  common/run_command.h \
   compat/assumptions.h \
   compat/byteswap.h \
   compat/compat.h \
@@ -899,6 +900,7 @@ libbitcoin_common_a_SOURCES = \
   chainparams.cpp \
   coins.cpp \
   common/bloom.cpp \
+  common/run_command.cpp \
   compressor.cpp \
   core_read.cpp \
   core_write.cpp \
diff --git a/src/common/run_command.cpp b/src/common/run_command.cpp
new file mode 100644
index 000000000000..6ad9f75b5d99
--- /dev/null
+++ b/src/common/run_command.cpp
@@ -0,0 +1,64 @@
+// Copyright (c) 2022 The Bitcoin Core developers
+// Distributed under the MIT software license, see the accompanying
+// file COPYING or http://www.opensource.org/licenses/mit-license.php.
+
+#if defined(HAVE_CONFIG_H)
+#include <config/bitcoin-config.h>
+#endif
+
+#include <common/run_command.h>
+
+#include <tinyformat.h>
+#include <univalue.h>
+
+#ifdef ENABLE_EXTERNAL_SIGNER
+#if defined(__GNUC__)
+// Boost 1.78 requires the following workaround.
+// See: https://github.com/boostorg/process/issues/235
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wnarrowing"
+#endif
+#include <boost/process.hpp>
+#if defined(__GNUC__)
+#pragma GCC diagnostic pop
+#endif
+#endif // ENABLE_EXTERNAL_SIGNER
+
+UniValue RunCommandParseJSON(const std::string& str_command, const std::string& str_std_in)
+{
+#ifdef ENABLE_EXTERNAL_SIGNER
+    namespace bp = boost::process;
+
+    UniValue result_json;
+    bp::opstream stdin_stream;
+    bp::ipstream stdout_stream;
+    bp::ipstream stderr_stream;
+
+    if (str_command.empty()) return UniValue::VNULL;
+
+    bp::child c(
+        str_command,
+        bp::std_out > stdout_stream,
+        bp::std_err > stderr_stream,
+        bp::std_in < stdin_stream
+    );
+    if (!str_std_in.empty()) {
+        stdin_stream << str_std_in << std::endl;
+    }
+    stdin_stream.pipe().close();
+
+    std::string result;
+    std::string error;
+    std::getline(stdout_stream, result);
+    std::getline(stderr_stream, error);
+
+    c.wait();
+    const int n_error = c.exit_code();
+    if (n_error) throw std::runtime_error(strprintf("RunCommandParseJSON error: process(%s) returned %d: %s\n", str_command, n_error, error));
+    if (!result_json.read(result)) throw std::runtime_error("Unable to parse JSON: " + result);
+
+    return result_json;
+#else
+    throw std::runtime_error("Compiled without external signing support (required for external signing).");
+#endif // ENABLE_EXTERNAL_SIGNER
+}
diff --git a/src/common/run_command.h b/src/common/run_command.h
new file mode 100644
index 000000000000..2fbdc071eeca
--- /dev/null
+++ b/src/common/run_command.h
@@ -0,0 +1,21 @@
+// Copyright (c) 2022 The Bitcoin Core developers
+// Distributed under the MIT software license, see the accompanying
+// file COPYING or http://www.opensource.org/licenses/mit-license.php.
+
+#ifndef BITCOIN_COMMON_RUN_COMMAND_H
+#define BITCOIN_COMMON_RUN_COMMAND_H
+
+#include <string>
+
+class UniValue;
+
+/**
+ * Execute a command which returns JSON, and parse the result.
+ *
+ * @param str_command The command to execute, including any arguments
+ * @param str_std_in string to pass to stdin
+ * @return parsed JSON
+ */
+UniValue RunCommandParseJSON(const std::string& str_command, const std::string& str_std_in="");
+
+#endif // BITCOIN_COMMON_RUN_COMMAND_H
diff --git a/src/external_signer.cpp b/src/external_signer.cpp
index 3057fa687e0c..8f2d6601879c 100644
--- a/src/external_signer.cpp
+++ b/src/external_signer.cpp
@@ -3,10 +3,10 @@
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
 #include <chainparams.h>
+#include <common/run_command.h>
 #include <core_io.h>
 #include <psbt.h>
 #include <util/strencodings.h>
-#include <util/system.h>
 #include <external_signer.h>
 
 #include <algorithm>
diff --git a/src/test/system_tests.cpp b/src/test/system_tests.cpp
index 4111aa8488b0..6757f477a385 100644
--- a/src/test/system_tests.cpp
+++ b/src/test/system_tests.cpp
@@ -3,7 +3,7 @@
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 //
 #include <test/util/setup_common.h>
-#include <util/system.h>
+#include <common/run_command.h>
 #include <univalue.h>
 
 #ifdef ENABLE_EXTERNAL_SIGNER
diff --git a/src/util/system.cpp b/src/util/system.cpp
index 5fca3e24bd2e..c9e849b69229 100644
--- a/src/util/system.cpp
+++ b/src/util/system.cpp
@@ -8,19 +8,6 @@
 
 #include <support/allocators/secure.h>
 
-#ifdef ENABLE_EXTERNAL_SIGNER
-#if defined(__GNUC__)
-// Boost 1.78 requires the following workaround.
-// See: https://github.com/boostorg/process/issues/235
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wnarrowing"
-#endif
-#include <boost/process.hpp>
-#if defined(__GNUC__)
-#pragma GCC diagnostic pop
-#endif
-#endif // ENABLE_EXTERNAL_SIGNER
-
 #include <chainparamsbase.h>
 #include <ctpl_stl.h>
 #include <fs.h>
@@ -1425,45 +1412,6 @@ void RenameThreadPool(ctpl::thread_pool& tp, const char* baseName)
     }
 }
 
-UniValue RunCommandParseJSON(const std::string& str_command, const std::string& str_std_in)
-{
-#ifdef ENABLE_EXTERNAL_SIGNER
-    namespace bp = boost::process;
-
-    UniValue result_json;
-    bp::opstream stdin_stream;
-    bp::ipstream stdout_stream;
-    bp::ipstream stderr_stream;
-
-    if (str_command.empty()) return UniValue::VNULL;
-
-    bp::child c(
-        str_command,
-        bp::std_out > stdout_stream,
-        bp::std_err > stderr_stream,
-        bp::std_in < stdin_stream
-    );
-    if (!str_std_in.empty()) {
-        stdin_stream << str_std_in << std::endl;
-    }
-    stdin_stream.pipe().close();
-
-    std::string result;
-    std::string error;
-    std::getline(stdout_stream, result);
-    std::getline(stderr_stream, error);
-
-    c.wait();
-    const int n_error = c.exit_code();
-    if (n_error) throw std::runtime_error(strprintf("RunCommandParseJSON error: process(%s) returned %d: %s\n", str_command, n_error, error));
-    if (!result_json.read(result)) throw std::runtime_error("Unable to parse JSON: " + result);
-
-    return result_json;
-#else
-    throw std::runtime_error("Compiled without external signing support (required for external signing).");
-#endif // ENABLE_EXTERNAL_SIGNER
-}
-
 void SetupEnvironment()
 {
 #ifdef HAVE_MALLOPT_ARENA_MAX
diff --git a/src/util/system.h b/src/util/system.h
index 51bae62d70fe..0b228858047f 100644
--- a/src/util/system.h
+++ b/src/util/system.h
@@ -113,14 +113,6 @@ std::string ShellEscape(const std::string& arg);
 #if HAVE_SYSTEM
 void runCommand(const std::string& strCommand);
 #endif
-/**
- * Execute a command which returns JSON, and parse the result.
- *
- * @param str_command The command to execute, including any arguments
- * @param str_std_in string to pass to stdin
- * @return parsed JSON
- */
-UniValue RunCommandParseJSON(const std::string& str_command, const std::string& str_std_in="");
 
 /**
  * Most paths passed as configuration arguments are treated as relative to

From 00e66c7c279289beec84ca92bcaf1bfe3c352383 Mon Sep 17 00:00:00 2001
From: fanquake <fanquake@gmail.com>
Date: Fri, 30 Jun 2023 09:27:14 +0100
Subject: [PATCH 651/656] Merge bitcoin/bitcoin#28002: refactor: remove in-code
 warning suppression

3210f224dbeaf0f9de09d4e83c3e6666128a6717 refactor: remove in-code warning suppression (fanquake)

Pull request description:

  Should no-longer be needed post #27872. If it is, then suppress-external-warnings should be fixed.

ACKs for top commit:
  hebasto:
    ACK 3210f224dbeaf0f9de09d4e83c3e6666128a6717

Tree-SHA512: 2405250b7308779d576f13ce9144944abd5b2293499a0c0fe940398dae951cb871246a55c0e644a038ee238f9510b5845c3e39f9658d9f10225a076d8122f078
---
 src/common/run_command.cpp | 9 ---------
 src/test/system_tests.cpp  | 9 ---------
 src/wallet/bdb.h           | 7 -------
 3 files changed, 25 deletions(-)

diff --git a/src/common/run_command.cpp b/src/common/run_command.cpp
index 6ad9f75b5d99..8bd5febd5386 100644
--- a/src/common/run_command.cpp
+++ b/src/common/run_command.cpp
@@ -12,16 +12,7 @@
 #include <univalue.h>
 
 #ifdef ENABLE_EXTERNAL_SIGNER
-#if defined(__GNUC__)
-// Boost 1.78 requires the following workaround.
-// See: https://github.com/boostorg/process/issues/235
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wnarrowing"
-#endif
 #include <boost/process.hpp>
-#if defined(__GNUC__)
-#pragma GCC diagnostic pop
-#endif
 #endif // ENABLE_EXTERNAL_SIGNER
 
 UniValue RunCommandParseJSON(const std::string& str_command, const std::string& str_std_in)
diff --git a/src/test/system_tests.cpp b/src/test/system_tests.cpp
index 6757f477a385..55cbe3fe64a8 100644
--- a/src/test/system_tests.cpp
+++ b/src/test/system_tests.cpp
@@ -7,16 +7,7 @@
 #include <univalue.h>
 
 #ifdef ENABLE_EXTERNAL_SIGNER
-#if defined(__GNUC__)
-// Boost 1.78 requires the following workaround.
-// See: https://github.com/boostorg/process/issues/235
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wnarrowing"
-#endif
 #include <boost/process.hpp>
-#if defined(__GNUC__)
-#pragma GCC diagnostic pop
-#endif
 #endif // ENABLE_EXTERNAL_SIGNER
 
 #include <boost/test/unit_test.hpp>
diff --git a/src/wallet/bdb.h b/src/wallet/bdb.h
index 8a4feb696bc8..1d5f21e88d23 100644
--- a/src/wallet/bdb.h
+++ b/src/wallet/bdb.h
@@ -21,14 +21,7 @@
 
 struct bilingual_str;
 
-#if defined(__GNUC__) && !defined(__clang__)
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wsuggest-override"
-#endif
 #include <db_cxx.h>
-#if defined(__GNUC__) && !defined(__clang__)
-#pragma GCC diagnostic pop
-#endif
 
 namespace wallet {
 struct WalletDatabaseFileId {

From b7fe867177437c664f140010ee87a608a3bb8bca Mon Sep 17 00:00:00 2001
From: merge-script <fanquake@gmail.com>
Date: Wed, 10 Apr 2024 12:03:06 +0200
Subject: [PATCH 652/656] Merge bitcoin/bitcoin#28981: Replace Boost.Process
 with cpp-subprocess

d5a715536e497c160a2520f81334aab6c7490213 build: remove boost::process dependency for building external signer support (Sebastian Falbesoner)
70434b1c443d9251a880d0193af771f574c40617 external_signer: replace boost::process with cpp-subprocess (Sebastian Falbesoner)
cc8b9875b104c31f0a5b5e4195a8278ec55f35f7 Add `cpp-subprocess` header-only library (Hennadii Stepanov)

Pull request description:

  Closes https://github.com/bitcoin/bitcoin/issues/24907.

  This PR is based on **theStack**'s [work](https://github.com/bitcoin/bitcoin/issues/24907#issuecomment-1466087049).

  The `subprocess.hpp` header has been sourced from the [upstream repo](https://github.com/arun11299/cpp-subprocess) with the only modification being the removal of convenience functions, which are not utilized in our codebase.

  Windows-related changes will be addressed in subsequent follow-ups.

ACKs for top commit:
  achow101:
    reACK d5a715536e497c160a2520f81334aab6c7490213
  Sjors:
    re-tACK d5a715536e497c160a2520f81334aab6c7490213
  theStack:
    Light re-ACK d5a715536e497c160a2520f81334aab6c7490213
  fanquake:
    ACK d5a715536e497c160a2520f81334aab6c7490213 - with the expectation that this code is going to be maintained as our own. Next PRs should:

Tree-SHA512: d7fb6fecc3f5792496204190afb7d85b3e207b858fb1a75efe483c05260843b81b27d14b299323bb667c990e87a07197059afea3796cf218ed8b614086bd3611
---
 configure.ac               |   62 +-
 src/Makefile.am            |    1 +
 src/common/run_command.cpp |   25 +-
 src/external_signer.cpp    |    8 +-
 src/test/system_tests.cpp  |   14 +-
 src/util/subprocess.hpp    | 1986 ++++++++++++++++++++++++++++++++++++
 test/lint/lint-includes.py |    1 -
 test/lint/lint-spelling.py |    2 +-
 8 files changed, 2017 insertions(+), 82 deletions(-)
 create mode 100644 src/util/subprocess.hpp

diff --git a/configure.ac b/configure.ac
index ff4184f1a94d..d88e4cdd5d4b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -320,9 +320,9 @@ AC_ARG_ENABLE([werror],
     [enable_werror=no])
 
 AC_ARG_ENABLE([external-signer],
-    [AS_HELP_STRING([--enable-external-signer],[compile external signer support (default is auto, requires Boost::Process)])],
+    [AS_HELP_STRING([--enable-external-signer],[compile external signer support (default is yes)])],
     [use_external_signer=$enableval],
-    [use_external_signer=auto])
+    [use_external_signer=yes])
 
 AC_LANG_PUSH([C++])
 
@@ -1611,56 +1611,14 @@ if test "$use_boost" = "yes"; then
   fi
 fi
 
-if test "$use_external_signer" != "no"; then
-  AC_MSG_CHECKING([whether Boost.Process can be used])
-  TEMP_CXXFLAGS="$CXXFLAGS"
-  dnl Boost 1.78 requires the following workaround.
-  dnl See: https://github.com/boostorg/process/issues/235
-  CXXFLAGS="$CXXFLAGS -Wno-error=narrowing"
-  TEMP_CPPFLAGS="$CPPFLAGS"
-  CPPFLAGS="$CPPFLAGS $BOOST_CPPFLAGS"
-  TEMP_LDFLAGS="$LDFLAGS"
-  dnl Boost 1.73 and older require the following workaround.
-  LDFLAGS="$LDFLAGS $PTHREAD_CFLAGS"
-  AC_LINK_IFELSE([AC_LANG_PROGRAM([[
-    #define BOOST_PROCESS_USE_STD_FS
-    #include <boost/process.hpp>
-  ]],[[
-    namespace bp = boost::process;
-    bp::opstream stdin_stream;
-    bp::ipstream stdout_stream;
-    bp::child c("dummy", bp::std_out > stdout_stream, bp::std_err > stdout_stream, bp::std_in < stdin_stream);
-    stdin_stream << std::string{"test"} << std::endl;
-    if (c.running()) c.terminate();
-    c.wait();
-    c.exit_code();
-  ]])],
-    [have_boost_process="yes"],
-    [have_boost_process="no"])
-  LDFLAGS="$TEMP_LDFLAGS"
-  CPPFLAGS="$TEMP_CPPFLAGS"
-  CXXFLAGS="$TEMP_CXXFLAGS"
-  AC_MSG_RESULT([$have_boost_process])
-  if test "$have_boost_process" = "yes"; then
-    case $host in
-      dnl Boost Process for Windows uses Boost ASIO. Boost ASIO performs
-      dnl pre-main init of Windows networking libraries, which we do not
-      dnl want.
-      *mingw*)
-        use_external_signer="no"
-      ;;
-      *)
-        use_external_signer="yes"
-        AC_DEFINE([ENABLE_EXTERNAL_SIGNER], [1], [Define if external signer support is enabled])
-        AC_DEFINE([BOOST_PROCESS_USE_STD_FS], [1], [Defined to avoid Boost::Process trying to use Boost Filesystem])
-      ;;
-    esac
-  else
-    if test "$use_external_signer" = "yes"; then
-      AC_MSG_ERROR([External signing is not supported for this Boost version])
-    fi
-    use_external_signer="no";
-  fi
+case $host in
+  dnl Re-enable it after enabling Windows support in cpp-subprocess.
+  *mingw*)
+    use_external_signer="no"
+  ;;
+esac
+if test "$use_external_signer" = "yes"; then
+  AC_DEFINE([ENABLE_EXTERNAL_SIGNER], [1], [Define if external signer support is enabled])
 fi
 AM_CONDITIONAL([ENABLE_EXTERNAL_SIGNER], [test "$use_external_signer" = "yes"])
 
diff --git a/src/Makefile.am b/src/Makefile.am
index f939980fabf2..f76c844973a4 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -405,6 +405,7 @@ BITCOIN_CORE_H = \
   util/sock.h \
   util/string.h \
   util/spanparsing.h \
+  util/subprocess.hpp \
   util/syserror.h \
   util/system.h \
   util/time.h \
diff --git a/src/common/run_command.cpp b/src/common/run_command.cpp
index 8bd5febd5386..e5356490ef7f 100644
--- a/src/common/run_command.cpp
+++ b/src/common/run_command.cpp
@@ -12,39 +12,34 @@
 #include <univalue.h>
 
 #ifdef ENABLE_EXTERNAL_SIGNER
-#include <boost/process.hpp>
+#include <util/subprocess.hpp>
 #endif // ENABLE_EXTERNAL_SIGNER
 
 UniValue RunCommandParseJSON(const std::string& str_command, const std::string& str_std_in)
 {
 #ifdef ENABLE_EXTERNAL_SIGNER
-    namespace bp = boost::process;
+    namespace sp = subprocess;
 
     UniValue result_json;
-    bp::opstream stdin_stream;
-    bp::ipstream stdout_stream;
-    bp::ipstream stderr_stream;
+    std::istringstream stdout_stream;
+    std::istringstream stderr_stream;
 
     if (str_command.empty()) return UniValue::VNULL;
 
-    bp::child c(
-        str_command,
-        bp::std_out > stdout_stream,
-        bp::std_err > stderr_stream,
-        bp::std_in < stdin_stream
-    );
+    auto c = sp::Popen(str_command, sp::input{sp::PIPE}, sp::output{sp::PIPE}, sp::error{sp::PIPE});
     if (!str_std_in.empty()) {
-        stdin_stream << str_std_in << std::endl;
+        c.send(str_std_in);
     }
-    stdin_stream.pipe().close();
+    auto [out_res, err_res] = c.communicate();
+    stdout_stream.str(std::string{out_res.buf.begin(), out_res.buf.end()});
+    stderr_stream.str(std::string{err_res.buf.begin(), err_res.buf.end()});
 
     std::string result;
     std::string error;
     std::getline(stdout_stream, result);
     std::getline(stderr_stream, error);
 
-    c.wait();
-    const int n_error = c.exit_code();
+    const int n_error = c.retcode();
     if (n_error) throw std::runtime_error(strprintf("RunCommandParseJSON error: process(%s) returned %d: %s\n", str_command, n_error, error));
     if (!result_json.read(result)) throw std::runtime_error("Unable to parse JSON: " + result);
 
diff --git a/src/external_signer.cpp b/src/external_signer.cpp
index 8f2d6601879c..9602335eea16 100644
--- a/src/external_signer.cpp
+++ b/src/external_signer.cpp
@@ -61,12 +61,12 @@ bool ExternalSigner::Enumerate(const std::string& command, std::vector<ExternalS
 
 UniValue ExternalSigner::DisplayAddress(const std::string& descriptor) const
 {
-    return RunCommandParseJSON(m_command + " --fingerprint \"" + m_fingerprint + "\"" + NetworkArg() + " displayaddress --desc \"" + descriptor + "\"");
+    return RunCommandParseJSON(m_command + " --fingerprint " + m_fingerprint + NetworkArg() + " displayaddress --desc " + descriptor);
 }
 
 UniValue ExternalSigner::GetDescriptors(const int account)
 {
-    return RunCommandParseJSON(m_command + " --fingerprint \"" + m_fingerprint + "\"" + NetworkArg() + " getdescriptors --account " + strprintf("%d", account));
+    return RunCommandParseJSON(m_command + " --fingerprint " + m_fingerprint + NetworkArg() + " getdescriptors --account " + strprintf("%d", account));
 }
 
 bool ExternalSigner::SignTransaction(PartiallySignedTransaction& psbtx, std::string& error)
@@ -89,8 +89,8 @@ bool ExternalSigner::SignTransaction(PartiallySignedTransaction& psbtx, std::str
         return false;
     }
 
-    const std::string command = m_command + " --stdin --fingerprint \"" + m_fingerprint + "\"" + NetworkArg();
-    const std::string stdinStr = "signtx \"" + EncodeBase64(ssTx.str()) + "\"";
+    const std::string command = m_command + " --stdin --fingerprint " + m_fingerprint + NetworkArg();
+    const std::string stdinStr = "signtx " + EncodeBase64(ssTx.str());
 
     const UniValue signer_result = RunCommandParseJSON(command, stdinStr);
 
diff --git a/src/test/system_tests.cpp b/src/test/system_tests.cpp
index 55cbe3fe64a8..ce7ed3912c79 100644
--- a/src/test/system_tests.cpp
+++ b/src/test/system_tests.cpp
@@ -7,7 +7,7 @@
 #include <univalue.h>
 
 #ifdef ENABLE_EXTERNAL_SIGNER
-#include <boost/process.hpp>
+#include <util/subprocess.hpp>
 #endif // ENABLE_EXTERNAL_SIGNER
 
 #include <boost/test/unit_test.hpp>
@@ -30,20 +30,16 @@ BOOST_AUTO_TEST_CASE(run_command)
         BOOST_CHECK(result.isNull());
     }
     {
-        const UniValue result = RunCommandParseJSON("echo \"{\"success\": true}\"");
+        const UniValue result = RunCommandParseJSON("echo {\"success\": true}");
         BOOST_CHECK(result.isObject());
         const UniValue& success = result.find_value("success");
         BOOST_CHECK(!success.isNull());
         BOOST_CHECK_EQUAL(success.get_bool(), true);
     }
     {
-        // An invalid command is handled by Boost
-        const int expected_error{2};
-        BOOST_CHECK_EXCEPTION(RunCommandParseJSON("invalid_command"), boost::process::process_error, [&](const boost::process::process_error& e) {
-            BOOST_CHECK(std::string(e.what()).find("RunCommandParseJSON error:") == std::string::npos);
-            BOOST_CHECK_EQUAL(e.code().value(), expected_error);
-            return true;
-        });
+        // An invalid command is handled by cpp-subprocess
+        const std::string expected{"execve failed: "};
+        BOOST_CHECK_EXCEPTION(RunCommandParseJSON("invalid_command"), subprocess::CalledProcessError, HasReason(expected));
     }
     {
         // Return non-zero exit code, no output to stderr
diff --git a/src/util/subprocess.hpp b/src/util/subprocess.hpp
new file mode 100644
index 000000000000..dd53a8fbb4fb
--- /dev/null
+++ b/src/util/subprocess.hpp
@@ -0,0 +1,1986 @@
+/*!
+
+Documentation for C++ subprocessing libraray.
+
+@copyright The code is licensed under the [MIT
+  License](http://opensource.org/licenses/MIT):
+  <br>
+  Copyright &copy; 2016-2018 Arun Muralidharan.
+  <br>
+  Permission is hereby granted, free of charge, to any person obtaining a copy
+  of this software and associated documentation files (the "Software"), to deal
+  in the Software without restriction, including without limitation the rights
+  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+  copies of the Software, and to permit persons to whom the Software is
+  furnished to do so, subject to the following conditions:
+  <br>
+  The above copyright notice and this permission notice shall be included in
+  all copies or substantial portions of the Software.
+  <br>
+  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+  SOFTWARE.
+
+@author [Arun Muralidharan]
+@see https://github.com/arun11299/cpp-subprocess to download the source code
+
+@version 1.0.0
+*/
+
+#ifndef SUBPROCESS_HPP
+#define SUBPROCESS_HPP
+
+#include <algorithm>
+#include <cassert>
+#include <csignal>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
+#include <exception>
+#include <future>
+#include <initializer_list>
+#include <iostream>
+#include <locale>
+#include <map>
+#include <memory>
+#include <sstream>
+#include <string>
+#include <vector>
+
+#if (defined _MSC_VER) || (defined __MINGW32__)
+  #define __USING_WINDOWS__
+#endif
+
+#ifdef __USING_WINDOWS__
+  #include <codecvt>
+#endif
+
+extern "C" {
+#ifdef __USING_WINDOWS__
+  #include <Windows.h>
+  #include <io.h>
+  #include <cwchar>
+
+  #define close _close
+  #define open _open
+  #define fileno _fileno
+#else
+  #include <sys/wait.h>
+  #include <unistd.h>
+#endif
+  #include <csignal>
+  #include <fcntl.h>
+  #include <sys/types.h>
+}
+
+/*!
+ * Getting started with reading this source code.
+ * The source is mainly divided into four parts:
+ * 1. Exception Classes:
+ *    These are very basic exception classes derived from
+ *    runtime_error exception.
+ *    There are two types of exception thrown from subprocess
+ *    library: OSError and CalledProcessError
+ *
+ * 2. Popen Class
+ *    This is the main class the users will deal with. It
+ *    provides with all the API's to deal with processes.
+ *
+ * 3. Util namespace
+ *    It includes some helper functions to split/join a string,
+ *    reading from file descriptors, waiting on a process, fcntl
+ *    options on file descriptors etc.
+ *
+ * 4. Detail namespace
+ *    This includes some metaprogramming and helper classes.
+ */
+
+
+namespace subprocess {
+
+// Max buffer size allocated on stack for read error
+// from pipe
+static const size_t SP_MAX_ERR_BUF_SIZ = 1024;
+
+// Default buffer capcity for OutBuffer and ErrBuffer.
+// If the data exceeds this capacity, the buffer size is grown
+// by 1.5 times its previous capacity
+static const size_t DEFAULT_BUF_CAP_BYTES = 8192;
+
+
+/*-----------------------------------------------
+ *    EXCEPTION CLASSES
+ *-----------------------------------------------
+ */
+
+/*!
+ * class: CalledProcessError
+ * Thrown when there was error executing the command.
+ * Check Popen class API's to know when this exception
+ * can be thrown.
+ *
+ */
+class CalledProcessError: public std::runtime_error
+{
+public:
+  int retcode;
+  CalledProcessError(const std::string& error_msg, int retcode):
+    std::runtime_error(error_msg), retcode(retcode)
+  {}
+};
+
+
+/*!
+ * class: OSError
+ * Thrown when some system call fails to execute or give result.
+ * The exception message contains the name of the failed system call
+ * with the stringisized errno code.
+ * Check Popen class API's to know when this exception would be
+ * thrown.
+ * Its usual that the API exception specification would have
+ * this exception together with CalledProcessError.
+ */
+class OSError: public std::runtime_error
+{
+public:
+  OSError(const std::string& err_msg, int err_code):
+    std::runtime_error( err_msg + ": " + std::strerror(err_code) )
+  {}
+};
+
+//--------------------------------------------------------------------
+
+//Environment Variable types
+#ifndef _MSC_VER
+	using env_string_t = std::string;
+	using env_char_t = char;
+#else
+	using env_string_t = std::wstring;
+	using env_char_t = wchar_t;
+#endif
+using env_map_t = std::map<env_string_t, env_string_t>;
+using env_vector_t = std::vector<env_char_t>;
+
+//--------------------------------------------------------------------
+namespace util
+{
+  template <typename R>
+  inline bool is_ready(std::shared_future<R> const &f)
+  {
+    return f.wait_for(std::chrono::seconds(0)) == std::future_status::ready;
+  }
+
+  inline void quote_argument(const std::wstring &argument, std::wstring &command_line,
+                      bool force)
+  {
+    //
+    // Unless we're told otherwise, don't quote unless we actually
+    // need to do so --- hopefully avoid problems if programs won't
+    // parse quotes properly
+    //
+
+    if (force == false && argument.empty() == false &&
+        argument.find_first_of(L" \t\n\v\"") == argument.npos) {
+      command_line.append(argument);
+    }
+    else {
+      command_line.push_back(L'"');
+
+      for (auto it = argument.begin();; ++it) {
+        unsigned number_backslashes = 0;
+
+        while (it != argument.end() && *it == L'\\') {
+          ++it;
+          ++number_backslashes;
+        }
+
+        if (it == argument.end()) {
+
+          //
+          // Escape all backslashes, but let the terminating
+          // double quotation mark we add below be interpreted
+          // as a metacharacter.
+          //
+
+          command_line.append(number_backslashes * 2, L'\\');
+          break;
+        }
+        else if (*it == L'"') {
+
+          //
+          // Escape all backslashes and the following
+          // double quotation mark.
+          //
+
+          command_line.append(number_backslashes * 2 + 1, L'\\');
+          command_line.push_back(*it);
+        }
+        else {
+
+          //
+          // Backslashes aren't special here.
+          //
+
+          command_line.append(number_backslashes, L'\\');
+          command_line.push_back(*it);
+        }
+      }
+
+      command_line.push_back(L'"');
+    }
+  }
+
+#ifdef __USING_WINDOWS__
+  inline std::string get_last_error(DWORD errorMessageID)
+  {
+    if (errorMessageID == 0)
+      return std::string();
+
+    LPSTR messageBuffer = nullptr;
+    size_t size = FormatMessageA(
+        FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM |
+            FORMAT_MESSAGE_IGNORE_INSERTS | FORMAT_MESSAGE_MAX_WIDTH_MASK,
+        NULL, errorMessageID, MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT),
+        (LPSTR)&messageBuffer, 0, NULL);
+
+    std::string message(messageBuffer, size);
+
+    LocalFree(messageBuffer);
+
+    return message;
+  }
+
+  inline FILE *file_from_handle(HANDLE h, const char *mode)
+  {
+    int md;
+    if (!mode) {
+      throw OSError("invalid_mode", 0);
+    }
+
+    if (mode[0] == 'w') {
+      md = _O_WRONLY;
+    }
+    else if (mode[0] == 'r') {
+      md = _O_RDONLY;
+    }
+    else {
+      throw OSError("file_from_handle", 0);
+    }
+
+    int os_fhandle = _open_osfhandle((intptr_t)h, md);
+    if (os_fhandle == -1) {
+      CloseHandle(h);
+      throw OSError("_open_osfhandle", 0);
+    }
+
+    FILE *fp = _fdopen(os_fhandle, mode);
+    if (fp == 0) {
+      _close(os_fhandle);
+      throw OSError("_fdopen", 0);
+    }
+
+    return fp;
+  }
+
+  inline void configure_pipe(HANDLE* read_handle, HANDLE* write_handle, HANDLE* child_handle)
+  {
+    SECURITY_ATTRIBUTES saAttr;
+
+    // Set the bInheritHandle flag so pipe handles are inherited.
+    saAttr.nLength = sizeof(SECURITY_ATTRIBUTES);
+    saAttr.bInheritHandle = TRUE;
+    saAttr.lpSecurityDescriptor = NULL;
+
+    // Create a pipe for the child process's STDIN.
+    if (!CreatePipe(read_handle, write_handle, &saAttr,0))
+      throw OSError("CreatePipe", 0);
+
+    // Ensure the write handle to the pipe for STDIN is not inherited.
+    if (!SetHandleInformation(*child_handle, HANDLE_FLAG_INHERIT, 0))
+      throw OSError("SetHandleInformation", 0);
+  }
+
+  // env_map_t MapFromWindowsEnvironment()
+  // * Imports current Environment in a C-string table
+  // * Parses the strings by splitting on the first "=" per line
+  // * Creates a map of the variables
+  // * Returns the map
+  inline env_map_t MapFromWindowsEnvironment(){
+      wchar_t *variable_strings_ptr;
+      wchar_t *environment_strings_ptr;
+      std::wstring delimeter(L"=");
+      int del_len = delimeter.length();
+      env_map_t mapped_environment;
+
+      // Get a pointer to the environment block.
+      environment_strings_ptr = GetEnvironmentStringsW();
+      // If the returned pointer is NULL, exit.
+      if (environment_strings_ptr == NULL)
+      {
+          throw OSError("GetEnvironmentStringsW", 0);
+      }
+
+      // Variable strings are separated by NULL byte, and the block is
+      // terminated by a NULL byte.
+
+      variable_strings_ptr = (wchar_t *) environment_strings_ptr;
+
+      //Since the environment map ends with a null, we can loop until we find it.
+      while (*variable_strings_ptr)
+      {
+          // Create a string from Variable String
+          env_string_t current_line(variable_strings_ptr);
+          // Find the first "equals" sign.
+          auto pos = current_line.find(delimeter);
+          // Assuming it's not missing ...
+          if(pos!=std::wstring::npos){
+              // ... parse the key and value.
+              env_string_t key = current_line.substr(0, pos);
+              env_string_t value = current_line.substr(pos + del_len);
+              // Map the entry.
+              mapped_environment[key] = value;
+          }
+          // Jump to next line in the environment map.
+          variable_strings_ptr += std::wcslen(variable_strings_ptr) + 1;
+      }
+      // We're done with the old environment map buffer.
+      FreeEnvironmentStringsW(environment_strings_ptr);
+
+      // Return the map.
+      return mapped_environment;
+  }
+
+  // env_vector_t WindowsEnvironmentVectorFromMap(const env_map_t &source_map)
+  // * Creates a vector buffer for the new environment string table
+  // * Copies in the mapped variables
+  // * Returns the vector
+  inline env_vector_t WindowsEnvironmentVectorFromMap(const env_map_t &source_map)
+  {
+	// Make a new environment map buffer.
+	env_vector_t environment_map_buffer;
+	// Give it some space.
+	environment_map_buffer.reserve(4096);
+
+	// And fill'er up.
+	for(auto kv: source_map){
+	  // Create the line
+	  env_string_t current_line(kv.first); current_line += L"="; current_line += kv.second;
+	  // Add the line to the buffer.
+	  std::copy(current_line.begin(), current_line.end(), std::back_inserter(environment_map_buffer));
+	  // Append a null
+	  environment_map_buffer.push_back(0);
+	}
+	// Append one last null because of how Windows does it's environment maps.
+	environment_map_buffer.push_back(0);
+
+	return environment_map_buffer;
+  }
+
+  // env_vector_t CreateUpdatedWindowsEnvironmentVector(const env_map_t &changes_map)
+  // * Merges host environment with new mapped variables
+  // * Creates and returns string vector based on map
+  inline env_vector_t CreateUpdatedWindowsEnvironmentVector(const env_map_t &changes_map){
+	// Import the environment map
+	env_map_t environment_map = MapFromWindowsEnvironment();
+    // Merge in the changes with overwrite
+	for(auto& it: changes_map)
+	{
+		environment_map[it.first] = it.second;
+	}
+    // Create a Windows-usable Environment Map Buffer
+    env_vector_t environment_map_strings_vector = WindowsEnvironmentVectorFromMap(environment_map);
+
+	return environment_map_strings_vector;
+  }
+
+#endif
+
+  /*!
+   * Function: split
+   * Parameters:
+   * [in] str : Input string which needs to be split based upon the
+   *            delimiters provided.
+   * [in] deleims : Delimiter characters based upon which the string needs
+   *                to be split. Default constructed to ' '(space) and '\t'(tab)
+   * [out] vector<string> : Vector of strings split at deleimiter.
+   */
+  static inline std::vector<std::string>
+  split(const std::string& str, const std::string& delims=" \t")
+  {
+    std::vector<std::string> res;
+    size_t init = 0;
+
+    while (true) {
+      auto pos = str.find_first_of(delims, init);
+      if (pos == std::string::npos) {
+        res.emplace_back(str.substr(init, str.length()));
+        break;
+      }
+      res.emplace_back(str.substr(init, pos - init));
+      pos++;
+      init = pos;
+    }
+
+    return res;
+  }
+
+
+  /*!
+   * Function: join
+   * Parameters:
+   * [in] vec : Vector of strings which needs to be joined to form
+   *            a single string with words seperated by a seperator char.
+   *  [in] sep : String used to seperate 2 words in the joined string.
+   *             Default constructed to ' ' (space).
+   *  [out] string: Joined string.
+   */
+  static inline
+  std::string join(const std::vector<std::string>& vec,
+                   const std::string& sep = " ")
+  {
+    std::string res;
+    for (auto& elem : vec) res.append(elem + sep);
+    res.erase(--res.end());
+    return res;
+  }
+
+
+#ifndef __USING_WINDOWS__
+  /*!
+   * Function: set_clo_on_exec
+   * Sets/Resets the FD_CLOEXEC flag on the provided file descriptor
+   * based upon the `set` parameter.
+   * Parameters:
+   * [in] fd : The descriptor on which FD_CLOEXEC needs to be set/reset.
+   * [in] set : If 'true', set FD_CLOEXEC.
+   *            If 'false' unset FD_CLOEXEC.
+   */
+  static inline
+  void set_clo_on_exec(int fd, bool set = true)
+  {
+    int flags = fcntl(fd, F_GETFD, 0);
+    if (set) flags |= FD_CLOEXEC;
+    else flags &= ~FD_CLOEXEC;
+    //TODO: should check for errors
+    fcntl(fd, F_SETFD, flags);
+  }
+
+
+  /*!
+   * Function: pipe_cloexec
+   * Creates a pipe and sets FD_CLOEXEC flag on both
+   * read and write descriptors of the pipe.
+   * Parameters:
+   * [out] : A pair of file descriptors.
+   *         First element of pair is the read descriptor of pipe.
+   *         Second element is the write descriptor of pipe.
+   */
+  static inline
+  std::pair<int, int> pipe_cloexec() noexcept(false)
+  {
+    int pipe_fds[2];
+    int res = pipe(pipe_fds);
+    if (res) {
+      throw OSError("pipe failure", errno);
+    }
+
+    set_clo_on_exec(pipe_fds[0]);
+    set_clo_on_exec(pipe_fds[1]);
+
+    return std::make_pair(pipe_fds[0], pipe_fds[1]);
+  }
+#endif
+
+
+  /*!
+   * Function: write_n
+   * Writes `length` bytes to the file descriptor `fd`
+   * from the buffer `buf`.
+   * Parameters:
+   * [in] fd : The file descriptotr to write to.
+   * [in] buf: Buffer from which data needs to be written to fd.
+   * [in] length: The number of bytes that needs to be written from
+   *              `buf` to `fd`.
+   * [out] int : Number of bytes written or -1 in case of failure.
+   */
+  static inline
+  int write_n(int fd, const char* buf, size_t length)
+  {
+    size_t nwritten = 0;
+    while (nwritten < length) {
+      int written = write(fd, buf + nwritten, length - nwritten);
+      if (written == -1) return -1;
+      nwritten += written;
+    }
+    return nwritten;
+  }
+
+
+  /*!
+   * Function: read_atmost_n
+   * Reads at the most `read_upto` bytes from the
+   * file object `fp` before returning.
+   * Parameters:
+   * [in] fp : The file object from which it needs to read.
+   * [in] buf : The buffer into which it needs to write the data.
+   * [in] read_upto: Max number of bytes which must be read from `fd`.
+   * [out] int : Number of bytes written to `buf` or read from `fd`
+   *             OR -1 in case of error.
+   *  NOTE: In case of EINTR while reading from socket, this API
+   *  will retry to read from `fd`, but only till the EINTR counter
+   *  reaches 50 after which it will return with whatever data it read.
+   */
+  static inline
+  int read_atmost_n(FILE* fp, char* buf, size_t read_upto)
+  {
+#ifdef __USING_WINDOWS__
+    return (int)fread(buf, 1, read_upto, fp);
+#else
+    int fd = fileno(fp);
+    int rbytes = 0;
+    int eintr_cnter = 0;
+
+    while (1) {
+      int read_bytes = read(fd, buf + rbytes, read_upto - rbytes);
+      if (read_bytes == -1) {
+        if (errno == EINTR) {
+          if (eintr_cnter >= 50) return -1;
+          eintr_cnter++;
+          continue;
+        }
+        return -1;
+      }
+      if (read_bytes == 0) return rbytes;
+
+      rbytes += read_bytes;
+    }
+    return rbytes;
+#endif
+  }
+
+
+  /*!
+   * Function: read_all
+   * Reads all the available data from `fp` into
+   * `buf`. Internally calls read_atmost_n.
+   * Parameters:
+   * [in] fp : The file object from which to read from.
+   * [in] buf : The buffer of type `class Buffer` into which
+   *            the read data is written to.
+   * [out] int: Number of bytes read OR -1 in case of failure.
+   *
+   * NOTE: `class Buffer` is a exposed public class. See below.
+   */
+
+  static inline int read_all(FILE* fp, std::vector<char>& buf)
+  {
+    auto buffer = buf.data();
+    int total_bytes_read = 0;
+    int fill_sz = buf.size();
+
+    while (1) {
+      const int rd_bytes = read_atmost_n(fp, buffer, fill_sz);
+
+      if (rd_bytes == -1) { // Read finished
+        if (total_bytes_read == 0) return -1;
+        break;
+
+      } else if (rd_bytes == fill_sz) { // Buffer full
+        const auto orig_sz = buf.size();
+        const auto new_sz = orig_sz * 2;
+        buf.resize(new_sz);
+        fill_sz = new_sz - orig_sz;
+
+        //update the buffer pointer
+        buffer = buf.data();
+        total_bytes_read += rd_bytes;
+        buffer += total_bytes_read;
+
+      } else { // Partial data ? Continue reading
+        total_bytes_read += rd_bytes;
+        fill_sz -= rd_bytes;
+        break;
+      }
+    }
+    buf.erase(buf.begin()+total_bytes_read, buf.end()); // remove extra nulls
+    return total_bytes_read;
+  }
+
+#ifndef __USING_WINDOWS__
+  /*!
+   * Function: wait_for_child_exit
+   * Waits for the process with pid `pid` to exit
+   * and returns its status.
+   * Parameters:
+   * [in] pid : The pid of the process.
+   * [out] pair<int, int>:
+   *    pair.first : Return code of the waitpid call.
+   *    pair.second : Exit status of the process.
+   *
+   *  NOTE: This is a blocking call as in, it will loop
+   *  till the child is exited.
+   */
+  static inline
+  std::pair<int, int> wait_for_child_exit(int pid)
+  {
+    int status = 0;
+    int ret = -1;
+    while (1) {
+      ret = waitpid(pid, &status, 0);
+      if (ret == -1) break;
+      if (ret == 0) continue;
+      return std::make_pair(ret, status);
+    }
+
+    return std::make_pair(ret, status);
+  }
+#endif
+
+} // end namespace util
+
+
+
+/* -------------------------------
+ *     Popen Arguments
+ * -------------------------------
+ */
+
+/*!
+ * The buffer size of the stdin/stdout/stderr
+ * streams of the child process.
+ * Default value is 0.
+ */
+struct bufsize {
+  explicit bufsize(int siz): bufsiz(siz) {}
+  int  bufsiz = 0;
+};
+
+/*!
+ * Option to defer spawning of the child process
+ * till `Popen::start_process` API is called.
+ * Default value is false.
+ */
+struct defer_spawn {
+  explicit defer_spawn(bool d): defer(d) {}
+  bool defer  = false;
+};
+
+/*!
+ * Option to close all file descriptors
+ * when the child process is spawned.
+ * The close fd list does not include
+ * input/output/error if they are explicitly
+ * set as part of the Popen arguments.
+ *
+ * Default value is false.
+ */
+struct close_fds {
+  explicit close_fds(bool c): close_all(c) {}
+  bool close_all = false;
+};
+
+/*!
+ * Option to make the child process as the
+ * session leader and thus the process
+ * group leader.
+ * Default value is false.
+ */
+struct session_leader {
+  explicit session_leader(bool sl): leader_(sl) {}
+  bool leader_ = false;
+};
+
+struct shell {
+  explicit shell(bool s): shell_(s) {}
+  bool shell_ = false;
+};
+
+/*!
+ * Base class for all arguments involving string value.
+ */
+struct string_arg
+{
+  string_arg(const char* arg): arg_value(arg) {}
+  string_arg(std::string&& arg): arg_value(std::move(arg)) {}
+  string_arg(std::string arg): arg_value(std::move(arg)) {}
+  std::string arg_value;
+};
+
+/*!
+ * Option to specify the executable name seperately
+ * from the args sequence.
+ * In this case the cmd args must only contain the
+ * options required for this executable.
+ *
+ * Eg: executable{"ls"}
+ */
+struct executable: string_arg
+{
+  template <typename T>
+  executable(T&& arg): string_arg(std::forward<T>(arg)) {}
+};
+
+/*!
+ * Option to set the current working directory
+ * of the spawned process.
+ *
+ * Eg: cwd{"/som/path/x"}
+ */
+struct cwd: string_arg
+{
+  template <typename T>
+  cwd(T&& arg): string_arg(std::forward<T>(arg)) {}
+};
+
+/*!
+ * Option to specify environment variables required by
+ * the spawned process.
+ *
+ * Eg: environment{{ {"K1", "V1"}, {"K2", "V2"},... }}
+ */
+struct environment
+{
+  environment(env_map_t&& env):
+    env_(std::move(env)) {}
+  explicit environment(const env_map_t& env):
+    env_(env) {}
+  env_map_t env_;
+};
+
+
+/*!
+ * Used for redirecting input/output/error
+ */
+enum IOTYPE {
+  STDOUT = 1,
+  STDERR,
+  PIPE,
+};
+
+//TODO: A common base/interface for below stream structures ??
+
+/*!
+ * Option to specify the input channel for the child
+ * process. It can be:
+ * 1. An already open file descriptor.
+ * 2. A file name.
+ * 3. IOTYPE. Usual a PIPE
+ *
+ * Eg: input{PIPE}
+ * OR in case of redirection, output of another Popen
+ * input{popen.output()}
+ */
+struct input
+{
+  // For an already existing file descriptor.
+  explicit input(int fd): rd_ch_(fd) {}
+
+  // FILE pointer.
+  explicit input (FILE* fp):input(fileno(fp)) { assert(fp); }
+
+  explicit input(const char* filename) {
+    int fd = open(filename, O_RDONLY);
+    if (fd == -1) throw OSError("File not found: ", errno);
+    rd_ch_ = fd;
+  }
+  explicit input(IOTYPE typ) {
+    assert (typ == PIPE && "STDOUT/STDERR not allowed");
+#ifndef __USING_WINDOWS__
+    std::tie(rd_ch_, wr_ch_) = util::pipe_cloexec();
+#endif
+  }
+
+  int rd_ch_ = -1;
+  int wr_ch_ = -1;
+};
+
+
+/*!
+ * Option to specify the output channel for the child
+ * process. It can be:
+ * 1. An already open file descriptor.
+ * 2. A file name.
+ * 3. IOTYPE. Usually a PIPE.
+ *
+ * Eg: output{PIPE}
+ * OR output{"output.txt"}
+ */
+struct output
+{
+  explicit output(int fd): wr_ch_(fd) {}
+
+  explicit output (FILE* fp):output(fileno(fp)) { assert(fp); }
+
+  explicit output(const char* filename) {
+    int fd = open(filename, O_APPEND | O_CREAT | O_RDWR, 0640);
+    if (fd == -1) throw OSError("File not found: ", errno);
+    wr_ch_ = fd;
+  }
+  explicit output(IOTYPE typ) {
+    assert (typ == PIPE && "STDOUT/STDERR not allowed");
+#ifndef __USING_WINDOWS__
+    std::tie(rd_ch_, wr_ch_) = util::pipe_cloexec();
+#endif
+  }
+
+  int rd_ch_ = -1;
+  int wr_ch_ = -1;
+};
+
+
+/*!
+ * Option to specify the error channel for the child
+ * process. It can be:
+ * 1. An already open file descriptor.
+ * 2. A file name.
+ * 3. IOTYPE. Usually a PIPE or STDOUT
+ *
+ */
+struct error
+{
+  explicit error(int fd): wr_ch_(fd) {}
+
+  explicit error(FILE* fp):error(fileno(fp)) { assert(fp); }
+
+  explicit error(const char* filename) {
+    int fd = open(filename, O_APPEND | O_CREAT | O_RDWR, 0640);
+    if (fd == -1) throw OSError("File not found: ", errno);
+    wr_ch_ = fd;
+  }
+  explicit error(IOTYPE typ) {
+    assert ((typ == PIPE || typ == STDOUT) && "STDERR not aloowed");
+    if (typ == PIPE) {
+#ifndef __USING_WINDOWS__
+      std::tie(rd_ch_, wr_ch_) = util::pipe_cloexec();
+#endif
+    } else {
+      // Need to defer it till we have checked all arguments
+      deferred_ = true;
+    }
+  }
+
+  bool deferred_ = false;
+  int rd_ch_ = -1;
+  int wr_ch_ = -1;
+};
+
+// Impoverished, meager, needy, truly needy
+// version of type erasure to store function pointers
+// needed to provide the functionality of preexec_func
+// ATTN: Can be used only to execute functions with no
+// arguments and returning void.
+// Could have used more efficient methods, ofcourse, but
+// that wont yield me the consistent syntax which I am
+// aiming for. If you know, then please do let me know.
+
+class preexec_func
+{
+public:
+  preexec_func() {}
+
+  template <typename Func>
+  explicit preexec_func(Func f): holder_(new FuncHolder<Func>(std::move(f)))
+  {}
+
+  void operator()() {
+    (*holder_)();
+  }
+
+private:
+  struct HolderBase {
+    virtual void operator()() const = 0;
+    virtual ~HolderBase(){};
+  };
+  template <typename T>
+  struct FuncHolder: HolderBase {
+    FuncHolder(T func): func_(std::move(func)) {}
+    void operator()() const override { func_(); }
+    // The function pointer/reference
+    T func_;
+  };
+
+  std::unique_ptr<HolderBase> holder_ = nullptr;
+};
+
+// ~~~~ End Popen Args ~~~~
+
+
+/*!
+ * class: Buffer
+ * This class is a very thin wrapper around std::vector<char>
+ * This is basically used to determine the length of the actual
+ * data stored inside the dynamically resized vector.
+ *
+ * This is what is returned as the output to communicate and check_output
+ * functions, so, users must know about this class.
+ *
+ * OutBuffer and ErrBuffer are just different typedefs to this class.
+ */
+class Buffer
+{
+public:
+  Buffer() {}
+  explicit Buffer(size_t cap) { buf.resize(cap); }
+  void add_cap(size_t cap) { buf.resize(cap); }
+
+#if 0
+  Buffer(const Buffer& other):
+    buf(other.buf),
+    length(other.length)
+  {
+    std::cout << "COPY" << std::endl;
+  }
+
+  Buffer(Buffer&& other):
+    buf(std::move(other.buf)),
+    length(other.length)
+  {
+    std::cout << "MOVE" << std::endl;
+  }
+#endif
+
+public:
+  std::vector<char> buf;
+  size_t length = 0;
+};
+
+// Buffer for storing output written to output fd
+using OutBuffer = Buffer;
+// Buffer for storing output written to error fd
+using ErrBuffer = Buffer;
+
+
+// Fwd Decl.
+class Popen;
+
+/*---------------------------------------------------
+ *      DETAIL NAMESPACE
+ *---------------------------------------------------
+ */
+
+namespace detail {
+
+// Metaprogram for searching a type within
+// a variadic parameter pack
+// This is particularly required to do a compile time
+// checking of the arguments provided to 'check_ouput' function
+// wherein the user is not expected to provide an 'ouput' option.
+
+template <typename... T> struct param_pack{};
+
+template <typename F, typename T> struct has_type;
+
+template <typename F>
+struct has_type<F, param_pack<>> {
+  static constexpr bool value = false;
+};
+
+template <typename F, typename... T>
+struct has_type<F, param_pack<F, T...>> {
+  static constexpr bool value = true;
+};
+
+template <typename F, typename H, typename... T>
+struct has_type<F, param_pack<H,T...>> {
+  static constexpr bool value =
+    std::is_same<F, typename std::decay<H>::type>::value ? true : has_type<F, param_pack<T...>>::value;
+};
+
+//----
+
+/*!
+ * A helper class to Popen class for setting
+ * options as provided in the Popen constructor
+ * or in check_ouput arguments.
+ * This design allows us to _not_ have any fixed position
+ * to any arguments and specify them in a way similar to what
+ * can be done in python.
+ */
+struct ArgumentDeducer
+{
+  ArgumentDeducer(Popen* p): popen_(p) {}
+
+  void set_option(executable&& exe);
+  void set_option(cwd&& cwdir);
+  void set_option(bufsize&& bsiz);
+  void set_option(environment&& env);
+  void set_option(defer_spawn&& defer);
+  void set_option(shell&& sh);
+  void set_option(input&& inp);
+  void set_option(output&& out);
+  void set_option(error&& err);
+  void set_option(close_fds&& cfds);
+  void set_option(preexec_func&& prefunc);
+  void set_option(session_leader&& sleader);
+
+private:
+  Popen* popen_ = nullptr;
+};
+
+/*!
+ * A helper class to Popen.
+ * This takes care of all the fork-exec logic
+ * in the execute_child API.
+ */
+class Child
+{
+public:
+  Child(Popen* p, int err_wr_pipe):
+    parent_(p),
+    err_wr_pipe_(err_wr_pipe)
+  {}
+
+  void execute_child();
+
+private:
+  // Lets call it parent even though
+  // technically a bit incorrect
+  Popen* parent_ = nullptr;
+  int err_wr_pipe_ = -1;
+};
+
+// Fwd Decl.
+class Streams;
+
+/*!
+ * A helper class to Streams.
+ * This takes care of management of communicating
+ * with the child process with the means of the correct
+ * file descriptor.
+ */
+class Communication
+{
+public:
+  Communication(Streams* stream): stream_(stream)
+  {}
+  void operator=(const Communication&) = delete;
+public:
+  int send(const char* msg, size_t length);
+  int send(const std::vector<char>& msg);
+
+  std::pair<OutBuffer, ErrBuffer> communicate(const char* msg, size_t length);
+  std::pair<OutBuffer, ErrBuffer> communicate(const std::vector<char>& msg)
+  { return communicate(msg.data(), msg.size()); }
+
+  void set_out_buf_cap(size_t cap) { out_buf_cap_ = cap; }
+  void set_err_buf_cap(size_t cap) { err_buf_cap_ = cap; }
+
+private:
+  std::pair<OutBuffer, ErrBuffer> communicate_threaded(
+      const char* msg, size_t length);
+
+private:
+  Streams* stream_;
+  size_t out_buf_cap_ = DEFAULT_BUF_CAP_BYTES;
+  size_t err_buf_cap_ = DEFAULT_BUF_CAP_BYTES;
+};
+
+
+
+/*!
+ * This is a helper class to Popen.
+ * It takes care of management of all the file descriptors
+ * and file pointers.
+ * It dispatches of the communication aspects to the
+ * Communication class.
+ * Read through the data members to understand about the
+ * various file descriptors used.
+ */
+class Streams
+{
+public:
+  Streams():comm_(this) {}
+  void operator=(const Streams&) = delete;
+
+public:
+  void setup_comm_channels();
+
+  void cleanup_fds()
+  {
+    if (write_to_child_ != -1 && read_from_parent_ != -1) {
+      close(write_to_child_);
+    }
+    if (write_to_parent_ != -1 && read_from_child_ != -1) {
+      close(read_from_child_);
+    }
+    if (err_write_ != -1 && err_read_ != -1) {
+      close(err_read_);
+    }
+  }
+
+  void close_parent_fds()
+  {
+    if (write_to_child_ != -1)  close(write_to_child_);
+    if (read_from_child_ != -1) close(read_from_child_);
+    if (err_read_ != -1)        close(err_read_);
+  }
+
+  void close_child_fds()
+  {
+    if (write_to_parent_ != -1)  close(write_to_parent_);
+    if (read_from_parent_ != -1) close(read_from_parent_);
+    if (err_write_ != -1)        close(err_write_);
+  }
+
+  FILE* input()  { return input_.get(); }
+  FILE* output() { return output_.get(); }
+  FILE* error()  { return error_.get(); }
+
+  void input(FILE* fp)  { input_.reset(fp, fclose); }
+  void output(FILE* fp) { output_.reset(fp, fclose); }
+  void error(FILE* fp)  { error_.reset(fp, fclose); }
+
+  void set_out_buf_cap(size_t cap) { comm_.set_out_buf_cap(cap); }
+  void set_err_buf_cap(size_t cap) { comm_.set_err_buf_cap(cap); }
+
+public: /* Communication forwarding API's */
+  int send(const char* msg, size_t length)
+  { return comm_.send(msg, length); }
+
+  int send(const std::vector<char>& msg)
+  { return comm_.send(msg); }
+
+  std::pair<OutBuffer, ErrBuffer> communicate(const char* msg, size_t length)
+  { return comm_.communicate(msg, length); }
+
+  std::pair<OutBuffer, ErrBuffer> communicate(const std::vector<char>& msg)
+  { return comm_.communicate(msg); }
+
+
+public:// Yes they are public
+
+  std::shared_ptr<FILE> input_  = nullptr;
+  std::shared_ptr<FILE> output_ = nullptr;
+  std::shared_ptr<FILE> error_  = nullptr;
+
+#ifdef __USING_WINDOWS__
+  HANDLE g_hChildStd_IN_Rd = nullptr;
+  HANDLE g_hChildStd_IN_Wr = nullptr;
+  HANDLE g_hChildStd_OUT_Rd = nullptr;
+  HANDLE g_hChildStd_OUT_Wr = nullptr;
+  HANDLE g_hChildStd_ERR_Rd = nullptr;
+  HANDLE g_hChildStd_ERR_Wr = nullptr;
+#endif
+
+  // Buffer size for the IO streams
+  int bufsiz_ = 0;
+
+  // Pipes for communicating with child
+
+  // Emulates stdin
+  int write_to_child_   = -1; // Parent owned descriptor
+  int read_from_parent_ = -1; // Child owned descriptor
+
+  // Emulates stdout
+  int write_to_parent_ = -1; // Child owned descriptor
+  int read_from_child_ = -1; // Parent owned descriptor
+
+  // Emulates stderr
+  int err_write_ = -1; // Write error to parent (Child owned)
+  int err_read_  = -1; // Read error from child (Parent owned)
+
+private:
+  Communication comm_;
+};
+
+} // end namespace detail
+
+
+
+/*!
+ * class: Popen
+ * This is the single most important class in the whole library
+ * and glues together all the helper classes to provide a common
+ * interface to the client.
+ *
+ * API's provided by the class:
+ * 1. Popen({"cmd"}, output{..}, error{..}, cwd{..}, ....)
+ *    Command provided as a sequence.
+ * 2. Popen("cmd arg1"m output{..}, error{..}, cwd{..}, ....)
+ *    Command provided in a single string.
+ * 3. wait()             - Wait for the child to exit.
+ * 4. retcode()          - The return code of the exited child.
+ * 5. pid()              - PID of the spawned child.
+ * 6. poll()             - Check the status of the running child.
+ * 7. kill(sig_num)      - Kill the child. SIGTERM used by default.
+ * 8. send(...)          - Send input to the input channel of the child.
+ * 9. communicate(...)   - Get the output/error from the child and close the channels
+ *                         from the parent side.
+ *10. input()            - Get the input channel/File pointer. Can be used for
+ *                         cutomizing the way of sending input to child.
+ *11. output()           - Get the output channel/File pointer. Usually used
+                           in case of redirection. See piping examples.
+ *12. error()            - Get the error channel/File poiner. Usually used
+                           in case of redirection.
+ *13. start_process()    - Start the child process. Only to be used when
+ *                         `defer_spawn` option was provided in Popen constructor.
+ */
+class Popen
+{
+public:
+  friend struct detail::ArgumentDeducer;
+  friend class detail::Child;
+
+  template <typename... Args>
+  Popen(const std::string& cmd_args, Args&& ...args):
+    args_(cmd_args)
+  {
+    vargs_ = util::split(cmd_args);
+    init_args(std::forward<Args>(args)...);
+
+    // Setup the communication channels of the Popen class
+    stream_.setup_comm_channels();
+
+    if (!defer_process_start_) execute_process();
+  }
+
+  template <typename... Args>
+  Popen(std::initializer_list<const char*> cmd_args, Args&& ...args)
+  {
+    vargs_.insert(vargs_.end(), cmd_args.begin(), cmd_args.end());
+    init_args(std::forward<Args>(args)...);
+
+    // Setup the communication channels of the Popen class
+    stream_.setup_comm_channels();
+
+    if (!defer_process_start_) execute_process();
+  }
+
+  template <typename... Args>
+  Popen(std::vector<std::string> vargs_, Args &&... args) : vargs_(vargs_)
+  {
+    init_args(std::forward<Args>(args)...);
+
+    // Setup the communication channels of the Popen class
+    stream_.setup_comm_channels();
+
+    if (!defer_process_start_) execute_process();
+  }
+
+/*
+  ~Popen()
+  {
+#ifdef __USING_WINDOWS__
+    CloseHandle(this->process_handle_);
+#endif
+  }
+*/
+
+  void start_process() noexcept(false);
+
+  int pid() const noexcept { return child_pid_; }
+
+  int retcode() const noexcept { return retcode_; }
+
+  int wait() noexcept(false);
+
+  int poll() noexcept(false);
+
+  // Does not fail, Caller is expected to recheck the
+  // status with a call to poll()
+  void kill(int sig_num = 9);
+
+  void set_out_buf_cap(size_t cap) { stream_.set_out_buf_cap(cap); }
+
+  void set_err_buf_cap(size_t cap) { stream_.set_err_buf_cap(cap); }
+
+  int send(const char* msg, size_t length)
+  { return stream_.send(msg, length); }
+
+  int send(const std::string& msg)
+  { return send(msg.c_str(), msg.size()); }
+
+  int send(const std::vector<char>& msg)
+  { return stream_.send(msg); }
+
+  std::pair<OutBuffer, ErrBuffer> communicate(const char* msg, size_t length)
+  {
+    auto res = stream_.communicate(msg, length);
+    retcode_ = wait();
+    return res;
+  }
+
+  std::pair<OutBuffer, ErrBuffer> communicate(const std::string& msg)
+  {
+    return communicate(msg.c_str(), msg.size());
+  }
+
+  std::pair<OutBuffer, ErrBuffer> communicate(const std::vector<char>& msg)
+  {
+    auto res = stream_.communicate(msg);
+    retcode_ = wait();
+    return res;
+  }
+
+  std::pair<OutBuffer, ErrBuffer> communicate()
+  {
+    return communicate(nullptr, 0);
+  }
+
+  FILE* input()  { return stream_.input(); }
+  FILE* output() { return stream_.output();}
+  FILE* error()  { return stream_.error(); }
+
+  /// Stream close APIs
+  void close_input()  { stream_.input_.reset();  }
+  void close_output() { stream_.output_.reset(); }
+  void close_error()  { stream_.error_.reset();  }
+
+private:
+  template <typename F, typename... Args>
+  void init_args(F&& farg, Args&&... args);
+  void init_args();
+  void populate_c_argv();
+  void execute_process() noexcept(false);
+
+private:
+  detail::Streams stream_;
+
+#ifdef __USING_WINDOWS__
+  HANDLE process_handle_;
+  std::future<void> cleanup_future_;
+#endif
+
+  bool defer_process_start_ = false;
+  bool close_fds_ = false;
+  bool has_preexec_fn_ = false;
+  bool shell_ = false;
+  bool session_leader_ = false;
+
+  std::string exe_name_;
+  std::string cwd_;
+  env_map_t env_;
+  preexec_func preexec_fn_;
+
+  // Command in string format
+  std::string args_;
+  // Comamnd provided as sequence
+  std::vector<std::string> vargs_;
+  std::vector<char*> cargv_;
+
+  bool child_created_ = false;
+  // Pid of the child process
+  int child_pid_ = -1;
+
+  int retcode_ = -1;
+};
+
+inline void Popen::init_args() {
+  populate_c_argv();
+}
+
+template <typename F, typename... Args>
+inline void Popen::init_args(F&& farg, Args&&... args)
+{
+  detail::ArgumentDeducer argd(this);
+  argd.set_option(std::forward<F>(farg));
+  init_args(std::forward<Args>(args)...);
+}
+
+inline void Popen::populate_c_argv()
+{
+  cargv_.clear();
+  cargv_.reserve(vargs_.size() + 1);
+  for (auto& arg : vargs_) cargv_.push_back(&arg[0]);
+  cargv_.push_back(nullptr);
+}
+
+inline void Popen::start_process() noexcept(false)
+{
+  // The process was started/tried to be started
+  // in the constructor itself.
+  // For explicitly calling this API to start the
+  // process, 'defer_spawn' argument must be set to
+  // true in the constructor.
+  if (!defer_process_start_) {
+    assert (0);
+    return;
+  }
+  execute_process();
+}
+
+inline int Popen::wait() noexcept(false)
+{
+#ifdef __USING_WINDOWS__
+  int ret = WaitForSingleObject(process_handle_, INFINITE);
+
+  return 0;
+#else
+  int ret, status;
+  std::tie(ret, status) = util::wait_for_child_exit(pid());
+  if (ret == -1) {
+    if (errno != ECHILD) throw OSError("waitpid failed", errno);
+    return 0;
+  }
+  if (WIFEXITED(status)) return WEXITSTATUS(status);
+  if (WIFSIGNALED(status)) return WTERMSIG(status);
+  else return 255;
+
+  return 0;
+#endif
+}
+
+inline int Popen::poll() noexcept(false)
+{
+#ifdef __USING_WINDOWS__
+  int ret = WaitForSingleObject(process_handle_, 0);
+  if (ret != WAIT_OBJECT_0) return -1;
+
+  DWORD dretcode_;
+  if (FALSE == GetExitCodeProcess(process_handle_, &dretcode_))
+      throw OSError("GetExitCodeProcess", 0);
+
+  retcode_ = (int)dretcode_;
+  CloseHandle(process_handle_);
+
+  return retcode_;
+#else
+  if (!child_created_) return -1; // TODO: ??
+
+  int status;
+
+  // Returns zero if child is still running
+  int ret = waitpid(child_pid_, &status, WNOHANG);
+  if (ret == 0) return -1;
+
+  if (ret == child_pid_) {
+    if (WIFSIGNALED(status)) {
+      retcode_ = WTERMSIG(status);
+    } else if (WIFEXITED(status)) {
+      retcode_ = WEXITSTATUS(status);
+    } else {
+      retcode_ = 255;
+    }
+    return retcode_;
+  }
+
+  if (ret == -1) {
+    // From subprocess.py
+    // This happens if SIGCHLD is set to be ignored
+    // or waiting for child process has otherwise been disabled
+    // for our process. This child is dead, we cannot get the
+    // status.
+    if (errno == ECHILD) retcode_ = 0;
+    else throw OSError("waitpid failed", errno);
+  } else {
+    retcode_ = ret;
+  }
+
+  return retcode_;
+#endif
+}
+
+inline void Popen::kill(int sig_num)
+{
+#ifdef __USING_WINDOWS__
+  if (!TerminateProcess(this->process_handle_, (UINT)sig_num)) {
+    throw OSError("TerminateProcess", 0);
+  }
+#else
+  if (session_leader_) killpg(child_pid_, sig_num);
+  else ::kill(child_pid_, sig_num);
+#endif
+}
+
+
+inline void Popen::execute_process() noexcept(false)
+{
+#ifdef __USING_WINDOWS__
+  if (this->shell_) {
+    throw OSError("shell not currently supported on windows", 0);
+  }
+
+  void* environment_string_table_ptr = nullptr;
+  env_vector_t environment_string_vector;
+  if(this->env_.size()){
+	  environment_string_vector = util::CreateUpdatedWindowsEnvironmentVector(env_);
+	  environment_string_table_ptr = (void*)environment_string_vector.data();
+  }
+
+  if (exe_name_.length()) {
+    this->vargs_.insert(this->vargs_.begin(), this->exe_name_);
+    this->populate_c_argv();
+  }
+  this->exe_name_ = vargs_[0];
+
+  std::wstring_convert<std::codecvt_utf8_utf16<wchar_t>> converter;
+  std::wstring argument;
+  std::wstring command_line;
+
+  for (auto arg : this->vargs_) {
+    argument = converter.from_bytes(arg);
+    util::quote_argument(argument, command_line, false);
+    command_line += L" ";
+  }
+
+  // CreateProcessW can modify szCmdLine so we allocate needed memory
+  wchar_t *szCmdline = new wchar_t[command_line.size() + 1];
+  wcscpy_s(szCmdline, command_line.size() + 1, command_line.c_str());
+  PROCESS_INFORMATION piProcInfo;
+  STARTUPINFOW siStartInfo;
+  BOOL bSuccess = FALSE;
+  DWORD creation_flags = CREATE_UNICODE_ENVIRONMENT | CREATE_NO_WINDOW;
+
+  // Set up members of the PROCESS_INFORMATION structure.
+  ZeroMemory(&piProcInfo, sizeof(PROCESS_INFORMATION));
+
+  // Set up members of the STARTUPINFOW structure.
+  // This structure specifies the STDIN and STDOUT handles for redirection.
+
+  ZeroMemory(&siStartInfo, sizeof(STARTUPINFOW));
+  siStartInfo.cb = sizeof(STARTUPINFOW);
+
+  siStartInfo.hStdError = this->stream_.g_hChildStd_ERR_Wr;
+  siStartInfo.hStdOutput = this->stream_.g_hChildStd_OUT_Wr;
+  siStartInfo.hStdInput = this->stream_.g_hChildStd_IN_Rd;
+
+  siStartInfo.dwFlags |= STARTF_USESTDHANDLES;
+
+  // Create the child process.
+  bSuccess = CreateProcessW(NULL,
+                            szCmdline,    // command line
+                            NULL,         // process security attributes
+                            NULL,         // primary thread security attributes
+                            TRUE,         // handles are inherited
+                            creation_flags,	// creation flags
+                            environment_string_table_ptr,  // use provided environment
+                            NULL,         // use parent's current directory
+                            &siStartInfo, // STARTUPINFOW pointer
+                            &piProcInfo); // receives PROCESS_INFORMATION
+
+  // If an error occurs, exit the application.
+  if (!bSuccess) {
+    DWORD errorMessageID = ::GetLastError();
+    throw CalledProcessError("CreateProcess failed: " + util::get_last_error(errorMessageID), errorMessageID);
+  }
+
+  CloseHandle(piProcInfo.hThread);
+
+  /*
+    TODO: use common apis to close linux handles
+  */
+
+  this->process_handle_ = piProcInfo.hProcess;
+
+  this->cleanup_future_ = std::async(std::launch::async, [this] {
+    WaitForSingleObject(this->process_handle_, INFINITE);
+
+    CloseHandle(this->stream_.g_hChildStd_ERR_Wr);
+    CloseHandle(this->stream_.g_hChildStd_OUT_Wr);
+    CloseHandle(this->stream_.g_hChildStd_IN_Rd);
+  });
+
+/*
+  NOTE: In the linux version, there is a check to make sure that the process
+        has been started. Here, we do nothing because CreateProcess will throw
+        if we fail to create the process.
+*/
+
+
+#else
+
+  int err_rd_pipe, err_wr_pipe;
+  std::tie(err_rd_pipe, err_wr_pipe) = util::pipe_cloexec();
+
+  if (shell_) {
+    auto new_cmd = util::join(vargs_);
+    vargs_.clear();
+    vargs_.insert(vargs_.begin(), {"/bin/sh", "-c"});
+    vargs_.push_back(new_cmd);
+    populate_c_argv();
+  }
+
+  if (exe_name_.length()) {
+    vargs_.insert(vargs_.begin(), exe_name_);
+    populate_c_argv();
+  }
+  exe_name_ = vargs_[0];
+
+  child_pid_ = fork();
+
+  if (child_pid_ < 0) {
+    close(err_rd_pipe);
+    close(err_wr_pipe);
+    throw OSError("fork failed", errno);
+  }
+
+  child_created_ = true;
+
+  if (child_pid_ == 0)
+  {
+    // Close descriptors belonging to parent
+    stream_.close_parent_fds();
+
+    //Close the read end of the error pipe
+    close(err_rd_pipe);
+
+    detail::Child chld(this, err_wr_pipe);
+    chld.execute_child();
+  }
+  else
+  {
+    close (err_wr_pipe);// close child side of pipe, else get stuck in read below
+
+    stream_.close_child_fds();
+
+    try {
+      char err_buf[SP_MAX_ERR_BUF_SIZ] = {0,};
+
+      int read_bytes = util::read_atmost_n(
+                                  fdopen(err_rd_pipe, "r"),
+                                  err_buf,
+                                  SP_MAX_ERR_BUF_SIZ);
+      close(err_rd_pipe);
+
+      if (read_bytes || strlen(err_buf)) {
+        // Call waitpid to reap the child process
+        // waitpid suspends the calling process until the
+        // child terminates.
+        int retcode = wait();
+
+        // Throw whatever information we have about child failure
+        throw CalledProcessError(err_buf, retcode);
+      }
+    } catch (std::exception& exp) {
+      stream_.cleanup_fds();
+      throw;
+    }
+
+  }
+#endif
+}
+
+namespace detail {
+
+  inline void ArgumentDeducer::set_option(executable&& exe) {
+    popen_->exe_name_ = std::move(exe.arg_value);
+  }
+
+  inline void ArgumentDeducer::set_option(cwd&& cwdir) {
+    popen_->cwd_ = std::move(cwdir.arg_value);
+  }
+
+  inline void ArgumentDeducer::set_option(bufsize&& bsiz) {
+    popen_->stream_.bufsiz_ = bsiz.bufsiz;
+  }
+
+  inline void ArgumentDeducer::set_option(environment&& env) {
+    popen_->env_ = std::move(env.env_);
+  }
+
+  inline void ArgumentDeducer::set_option(defer_spawn&& defer) {
+    popen_->defer_process_start_ = defer.defer;
+  }
+
+  inline void ArgumentDeducer::set_option(shell&& sh) {
+    popen_->shell_ = sh.shell_;
+  }
+
+  inline void ArgumentDeducer::set_option(session_leader&& sleader) {
+    popen_->session_leader_ = sleader.leader_;
+  }
+
+  inline void ArgumentDeducer::set_option(input&& inp) {
+    if (inp.rd_ch_ != -1) popen_->stream_.read_from_parent_ = inp.rd_ch_;
+    if (inp.wr_ch_ != -1) popen_->stream_.write_to_child_ = inp.wr_ch_;
+  }
+
+  inline void ArgumentDeducer::set_option(output&& out) {
+    if (out.wr_ch_ != -1) popen_->stream_.write_to_parent_ = out.wr_ch_;
+    if (out.rd_ch_ != -1) popen_->stream_.read_from_child_ = out.rd_ch_;
+  }
+
+  inline void ArgumentDeducer::set_option(error&& err) {
+    if (err.deferred_) {
+      if (popen_->stream_.write_to_parent_) {
+        popen_->stream_.err_write_ = popen_->stream_.write_to_parent_;
+      } else {
+        throw std::runtime_error("Set output before redirecting error to output");
+      }
+    }
+    if (err.wr_ch_ != -1) popen_->stream_.err_write_ = err.wr_ch_;
+    if (err.rd_ch_ != -1) popen_->stream_.err_read_ = err.rd_ch_;
+  }
+
+  inline void ArgumentDeducer::set_option(close_fds&& cfds) {
+    popen_->close_fds_ = cfds.close_all;
+  }
+
+  inline void ArgumentDeducer::set_option(preexec_func&& prefunc) {
+    popen_->preexec_fn_ = std::move(prefunc);
+    popen_->has_preexec_fn_ = true;
+  }
+
+
+  inline void Child::execute_child() {
+#ifndef __USING_WINDOWS__
+    int sys_ret = -1;
+    auto& stream = parent_->stream_;
+
+    try {
+      if (stream.write_to_parent_ == 0)
+        stream.write_to_parent_ = dup(stream.write_to_parent_);
+
+      if (stream.err_write_ == 0 || stream.err_write_ == 1)
+        stream.err_write_ = dup(stream.err_write_);
+
+      // Make the child owned descriptors as the
+      // stdin, stdout and stderr for the child process
+      auto _dup2_ = [](int fd, int to_fd) {
+        if (fd == to_fd) {
+          // dup2 syscall does not reset the
+          // CLOEXEC flag if the descriptors
+          // provided to it are same.
+          // But, we need to reset the CLOEXEC
+          // flag as the provided descriptors
+          // are now going to be the standard
+          // input, output and error
+          util::set_clo_on_exec(fd, false);
+        } else if(fd != -1) {
+          int res = dup2(fd, to_fd);
+          if (res == -1) throw OSError("dup2 failed", errno);
+        }
+      };
+
+      // Create the standard streams
+      _dup2_(stream.read_from_parent_, 0); // Input stream
+      _dup2_(stream.write_to_parent_,  1); // Output stream
+      _dup2_(stream.err_write_,        2); // Error stream
+
+      // Close the duped descriptors
+      if (stream.read_from_parent_ != -1 && stream.read_from_parent_ > 2)
+        close(stream.read_from_parent_);
+
+      if (stream.write_to_parent_ != -1 && stream.write_to_parent_ > 2)
+        close(stream.write_to_parent_);
+
+      if (stream.err_write_ != -1 && stream.err_write_ > 2)
+        close(stream.err_write_);
+
+      // Close all the inherited fd's except the error write pipe
+      if (parent_->close_fds_) {
+        int max_fd = sysconf(_SC_OPEN_MAX);
+        if (max_fd == -1) throw OSError("sysconf failed", errno);
+
+        for (int i = 3; i < max_fd; i++) {
+          if (i == err_wr_pipe_) continue;
+          close(i);
+        }
+      }
+
+      // Change the working directory if provided
+      if (parent_->cwd_.length()) {
+        sys_ret = chdir(parent_->cwd_.c_str());
+        if (sys_ret == -1) throw OSError("chdir failed", errno);
+      }
+
+      if (parent_->has_preexec_fn_) {
+        parent_->preexec_fn_();
+      }
+
+      if (parent_->session_leader_) {
+        sys_ret = setsid();
+        if (sys_ret == -1) throw OSError("setsid failed", errno);
+      }
+
+      // Replace the current image with the executable
+      if (parent_->env_.size()) {
+        for (auto& kv : parent_->env_) {
+          setenv(kv.first.c_str(), kv.second.c_str(), 1);
+        }
+        sys_ret = execvp(parent_->exe_name_.c_str(), parent_->cargv_.data());
+      } else {
+        sys_ret = execvp(parent_->exe_name_.c_str(), parent_->cargv_.data());
+      }
+
+      if (sys_ret == -1) throw OSError("execve failed", errno);
+
+    } catch (const OSError& exp) {
+      // Just write the exception message
+      // TODO: Give back stack trace ?
+      std::string err_msg(exp.what());
+      //ATTN: Can we do something on error here ?
+      util::write_n(err_wr_pipe_, err_msg.c_str(), err_msg.length());
+    }
+
+    // Calling application would not get this
+    // exit failure
+    _exit (EXIT_FAILURE);
+#endif
+  }
+
+
+  inline void Streams::setup_comm_channels()
+  {
+#ifdef __USING_WINDOWS__
+    util::configure_pipe(&this->g_hChildStd_IN_Rd, &this->g_hChildStd_IN_Wr, &this->g_hChildStd_IN_Wr);
+    this->input(util::file_from_handle(this->g_hChildStd_IN_Wr, "w"));
+    this->write_to_child_ = _fileno(this->input());
+
+    util::configure_pipe(&this->g_hChildStd_OUT_Rd, &this->g_hChildStd_OUT_Wr, &this->g_hChildStd_OUT_Rd);
+    this->output(util::file_from_handle(this->g_hChildStd_OUT_Rd, "r"));
+    this->read_from_child_ = _fileno(this->output());
+
+    util::configure_pipe(&this->g_hChildStd_ERR_Rd, &this->g_hChildStd_ERR_Wr, &this->g_hChildStd_ERR_Rd);
+    this->error(util::file_from_handle(this->g_hChildStd_ERR_Rd, "r"));
+    this->err_read_ = _fileno(this->error());
+#else
+
+    if (write_to_child_ != -1)  input(fdopen(write_to_child_, "wb"));
+    if (read_from_child_ != -1) output(fdopen(read_from_child_, "rb"));
+    if (err_read_ != -1)        error(fdopen(err_read_, "rb"));
+
+    auto handles = {input(), output(), error()};
+
+    for (auto& h : handles) {
+      if (h == nullptr) continue;
+      switch (bufsiz_) {
+      case 0:
+        setvbuf(h, nullptr, _IONBF, BUFSIZ);
+        break;
+      case 1:
+        setvbuf(h, nullptr, _IONBF, BUFSIZ);
+        break;
+      default:
+        setvbuf(h, nullptr, _IOFBF, bufsiz_);
+      };
+    }
+  #endif
+  }
+
+  inline int Communication::send(const char* msg, size_t length)
+  {
+    if (stream_->input() == nullptr) return -1;
+    return std::fwrite(msg, sizeof(char), length, stream_->input());
+  }
+
+  inline int Communication::send(const std::vector<char>& msg)
+  {
+    return send(msg.data(), msg.size());
+  }
+
+  inline std::pair<OutBuffer, ErrBuffer>
+  Communication::communicate(const char* msg, size_t length)
+  {
+    // Optimization from subprocess.py
+    // If we are using one pipe, or no pipe
+    // at all, using select() or threads is unnecessary.
+    auto hndls = {stream_->input(), stream_->output(), stream_->error()};
+    int count = std::count(std::begin(hndls), std::end(hndls), nullptr);
+    const int len_conv = length;
+
+    if (count >= 2) {
+      OutBuffer obuf;
+      ErrBuffer ebuf;
+      if (stream_->input()) {
+        if (msg) {
+          int wbytes = std::fwrite(msg, sizeof(char), length, stream_->input());
+          if (wbytes < len_conv) {
+            if (errno != EPIPE && errno != EINVAL) {
+              throw OSError("fwrite error", errno);
+            }
+          }
+        }
+        // Close the input stream
+        stream_->input_.reset();
+      } else if (stream_->output()) {
+        // Read till EOF
+        // ATTN: This could be blocking, if the process
+        // at the other end screws up, we get screwed as well
+        obuf.add_cap(out_buf_cap_);
+
+        int rbytes = util::read_all(
+                            stream_->output(),
+                            obuf.buf);
+
+        if (rbytes == -1) {
+          throw OSError("read to obuf failed", errno);
+        }
+
+        obuf.length = rbytes;
+        // Close the output stream
+        stream_->output_.reset();
+
+      } else if (stream_->error()) {
+        // Same screwness applies here as well
+        ebuf.add_cap(err_buf_cap_);
+
+        int rbytes = util::read_atmost_n(
+                                  stream_->error(),
+                                  ebuf.buf.data(),
+                                  ebuf.buf.size());
+
+        if (rbytes == -1) {
+          throw OSError("read to ebuf failed", errno);
+        }
+
+        ebuf.length = rbytes;
+        // Close the error stream
+        stream_->error_.reset();
+      }
+      return std::make_pair(std::move(obuf), std::move(ebuf));
+    }
+
+    return communicate_threaded(msg, length);
+  }
+
+
+  inline std::pair<OutBuffer, ErrBuffer>
+  Communication::communicate_threaded(const char* msg, size_t length)
+  {
+    OutBuffer obuf;
+    ErrBuffer ebuf;
+    std::future<int> out_fut, err_fut;
+    const int length_conv = length;
+
+    if (stream_->output()) {
+      obuf.add_cap(out_buf_cap_);
+
+      out_fut = std::async(std::launch::async,
+                          [&obuf, this] {
+                            return util::read_all(this->stream_->output(), obuf.buf);
+                          });
+    }
+    if (stream_->error()) {
+      ebuf.add_cap(err_buf_cap_);
+
+      err_fut = std::async(std::launch::async,
+                          [&ebuf, this] {
+                            return util::read_all(this->stream_->error(), ebuf.buf);
+                          });
+    }
+    if (stream_->input()) {
+      if (msg) {
+        int wbytes = std::fwrite(msg, sizeof(char), length, stream_->input());
+        if (wbytes < length_conv) {
+          if (errno != EPIPE && errno != EINVAL) {
+            throw OSError("fwrite error", errno);
+          }
+        }
+      }
+      stream_->input_.reset();
+    }
+
+    if (out_fut.valid()) {
+      int res = out_fut.get();
+      if (res != -1) obuf.length = res;
+      else obuf.length = 0;
+    }
+    if (err_fut.valid()) {
+      int res = err_fut.get();
+      if (res != -1) ebuf.length = res;
+      else ebuf.length = 0;
+    }
+
+    return std::make_pair(std::move(obuf), std::move(ebuf));
+  }
+
+} // end namespace detail
+
+}
+
+#endif // SUBPROCESS_HPP
diff --git a/test/lint/lint-includes.py b/test/lint/lint-includes.py
index 4a2ef0a88fad..5169f5fc685f 100755
--- a/test/lint/lint-includes.py
+++ b/test/lint/lint-includes.py
@@ -34,7 +34,6 @@
                            "boost/multi_index/tag.hpp",
                            "boost/multi_index_container.hpp",
                            "boost/pool/pool_alloc.hpp",
-                           "boost/process.hpp",
                            "boost/signals2/connection.hpp",
                            "boost/signals2/optional_last_value.hpp",
                            "boost/signals2/signal.hpp",
diff --git a/test/lint/lint-spelling.py b/test/lint/lint-spelling.py
index 204d297cedf0..1acc5998d34a 100755
--- a/test/lint/lint-spelling.py
+++ b/test/lint/lint-spelling.py
@@ -12,7 +12,7 @@
 from subprocess import check_output, STDOUT, CalledProcessError
 
 IGNORE_WORDS_FILE = 'test/lint/spelling.ignore-words.txt'
-FILES_ARGS = ['git', 'ls-files', '--', ":(exclude)build-aux/m4/", ":(exclude)contrib/seeds/*.txt", ":(exclude)depends/", ":(exclude)doc/release-notes/", ":(exclude)src/bip39_english.h", ":(exclude)src/dashbls/", ":(exclude)src/crc32c/", ":(exclude)src/crypto/", ":(exclude)src/ctpl_stl.h", ":(exclude)src/cxxtimer.hpp", ":(exclude)src/immer/", ":(exclude)src/leveldb/", ":(exclude)src/qt/locale/", ":(exclude)src/qt/*.qrc", ":(exclude)src/secp256k1/", ":(exclude)src/minisketch/", ":(exclude)contrib/builder-keys/", ":(exclude)contrib/guix/patches"]
+FILES_ARGS = ['git', 'ls-files', '--', ":(exclude)build-aux/m4/", ":(exclude)contrib/seeds/*.txt", ":(exclude)depends/", ":(exclude)doc/release-notes/", ":(exclude)src/bip39_english.h", ":(exclude)src/dashbls/", ":(exclude)src/crc32c/", ":(exclude)src/crypto/", ":(exclude)src/ctpl_stl.h", ":(exclude)src/cxxtimer.hpp", ":(exclude)src/immer/", ":(exclude)src/leveldb/", ":(exclude)src/qt/locale/", ":(exclude)src/qt/*.qrc", ":(exclude)src/secp256k1/", ":(exclude)src/minisketch/", ":(exclude)contrib/builder-keys/", ":(exclude)contrib/guix/patches", ":(exclude)src/util/subprocess.hpp"]
 
 
 def check_codespell_install():

From b220dec43a8c378daf9ded017dfe8d8e2d85d773 Mon Sep 17 00:00:00 2001
From: pasta <pasta@dashboost.org>
Date: Wed, 26 Nov 2025 14:35:30 -0600
Subject: [PATCH 653/656] fix: update BuildTestVectors call to adjust batch
 size based on output flag

---
 src/bench/bls.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/bench/bls.cpp b/src/bench/bls.cpp
index 9199f1f33360..e6206d241d9f 100644
--- a/src/bench/bls.cpp
+++ b/src/bench/bls.cpp
@@ -255,7 +255,7 @@ static void BLS_Verify_Batched(benchmark::Bench& bench)
     std::vector<CBLSSignature> sigs;
     std::vector<uint256> msgHashes;
     std::vector<bool> invalid;
-    BuildTestVectors(bench.output() ? 1000 : 1, 10, pubKeys, secKeys, sigs, msgHashes, invalid);
+    BuildTestVectors(bench.output() ? 1000 : 1, bench.output() ? 10 : 1, pubKeys, secKeys, sigs, msgHashes, invalid);
 
     // Benchmark.
     size_t i = 0;
@@ -311,7 +311,7 @@ static void BLS_Verify_BatchedParallel(benchmark::Bench& bench)
     std::vector<CBLSSignature> sigs;
     std::vector<uint256> msgHashes;
     std::vector<bool> invalid;
-    BuildTestVectors(bench.output() ? 1000 : 1, 10, pubKeys, secKeys, sigs, msgHashes, invalid);
+    BuildTestVectors(bench.output() ? 1000 : 1, bench.output() ? 10 : 1, pubKeys, secKeys, sigs, msgHashes, invalid);
 
     std::list<std::pair<size_t, std::future<bool>>> futures;
 

From 01336d8b8c1eabb60b7a71d3154adb2ed37410b3 Mon Sep 17 00:00:00 2001
From: UdjinM6 <UdjinM6@users.noreply.github.com>
Date: Thu, 27 Nov 2025 13:03:50 +0300
Subject: [PATCH 654/656] ci: don't use pull_request in guix-build.yml

---
 .github/workflows/guix-build.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.github/workflows/guix-build.yml b/.github/workflows/guix-build.yml
index 48ab032f40bf..7d996a432e55 100644
--- a/.github/workflows/guix-build.yml
+++ b/.github/workflows/guix-build.yml
@@ -7,7 +7,6 @@ permissions:
 
 on:
   pull_request_target:
-  pull_request:
     types: [labeled]
   push:
 

From 851697fd98f592c15193f59ba3cd54385ea3962a Mon Sep 17 00:00:00 2001
From: UdjinM6 <UdjinM6@users.noreply.github.com>
Date: Fri, 28 Nov 2025 17:47:19 +0300
Subject: [PATCH 655/656] fix: make clang-tidy happy

---
 src/external_signer.cpp | 4 ++--
 src/wallet/wallet.cpp   | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/external_signer.cpp b/src/external_signer.cpp
index 9602335eea16..9659cc1a06dc 100644
--- a/src/external_signer.cpp
+++ b/src/external_signer.cpp
@@ -28,7 +28,7 @@ bool ExternalSigner::Enumerate(const std::string& command, std::vector<ExternalS
     if (!result.isArray()) {
         throw std::runtime_error(strprintf("'%s' received invalid response, expected array of signers", command));
     }
-    for (UniValue signer : result.getValues()) {
+    for (const UniValue& signer : result.getValues()) {
         // Check for error
         const UniValue& error = signer.find_value("error");
         if (!error.isNull()) {
@@ -42,7 +42,7 @@ bool ExternalSigner::Enumerate(const std::string& command, std::vector<ExternalS
         if (fingerprint.isNull()) {
             throw std::runtime_error(strprintf("'%s' received invalid response, missing signer fingerprint", command));
         }
-        const std::string fingerprintStr = fingerprint.get_str();
+        const std::string& fingerprintStr = fingerprint.get_str();
         // Skip duplicate signer
         bool duplicate = false;
         for (const ExternalSigner& signer : signers) {
diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp
index 6acb0ef177d0..a2de0adf5ecf 100644
--- a/src/wallet/wallet.cpp
+++ b/src/wallet/wallet.cpp
@@ -3877,7 +3877,7 @@ void CWallet::SetupDescriptorScriptPubKeyMans(const SecureString& mnemonic_arg,
             const UniValue& descriptor_vals = signer_res.find_value(internal ? "internal" : "receive");
             if (!descriptor_vals.isArray()) throw std::runtime_error(std::string(__func__) + ": Unexpected result");
             for (const UniValue& desc_val : descriptor_vals.get_array().getValues()) {
-                std::string desc_str = desc_val.getValStr();
+                const std::string& desc_str = desc_val.getValStr();
                 FlatSigningProvider keys;
                 std::string desc_error;
                 std::unique_ptr<Descriptor> desc = Parse(desc_str, keys, desc_error, false);

From 1176d3a8a8abaa487fd113aacd32a7b39c1c2429 Mon Sep 17 00:00:00 2001
From: backport <backport@local>
Date: Sat, 29 Nov 2025 11:20:48 -0600
Subject: [PATCH 656/656] validation: cherry-pick bugfix from PR #27468 to fix
 test failures

This PR (#27477) adds regression tests for invalid URI handling, but the
underlying C++ bugfix from PR #27468 was not included in the batch base branch.

This commit adds the bugfix which:
- Checks for nullptr from evhttp_uri_parse() before passing to evhttp_uri_get_query()
- Prevents segfaults when REST endpoints receive invalid URIs (e.g., containing %)
- Adds C++ unit tests for the fix

Without this bugfix, the regression tests fail because dashd crashes instead
of returning HTTP 400 error as expected.

Cherry-picked from: 3a26b19df25ca99a9a58ae5398f6f423ac074368

Files modified:
- src/httpserver.cpp: Add nullptr check in GetQueryParameterFromUri()
- src/rest.cpp: Handle URI parsing failures gracefully
- src/test/httpserver_tests.cpp: Add unit tests for invalid URI handling
- test/functional/interface_rest.py: Keep all 3 regression tests from PR #27477
---
 src/httpserver.cpp            |  3 +++
 src/rest.cpp                  | 12 ++++++++++--
 src/test/httpserver_tests.cpp |  4 ++++
 3 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/src/httpserver.cpp b/src/httpserver.cpp
index fe8c8879ea43..36ac7c49672d 100644
--- a/src/httpserver.cpp
+++ b/src/httpserver.cpp
@@ -684,6 +684,9 @@ std::optional<std::string> HTTPRequest::GetQueryParameter(const std::string& key
 std::optional<std::string> GetQueryParameterFromUri(const char* uri, const std::string& key)
 {
     evhttp_uri* uri_parsed{evhttp_uri_parse(uri)};
+    if (!uri_parsed) {
+        throw std::runtime_error("URI parsing failed, it likely contained RFC 3986 invalid characters");
+    }
     const char* query{evhttp_uri_get_query(uri_parsed)};
     std::optional<std::string> result;
 
diff --git a/src/rest.cpp b/src/rest.cpp
index e58a650689f6..51a6f5305397 100644
--- a/src/rest.cpp
+++ b/src/rest.cpp
@@ -223,7 +223,11 @@ static bool rest_headers(const CoreContext& context,
     } else if (path.size() == 1) {
         // new path with query parameter: /rest/headers/<hash>?count=<count>
         hashStr = path[0];
-        raw_count = req->GetQueryParameter("count").value_or("5");
+        try {
+            raw_count = req->GetQueryParameter("count").value_or("5");
+        } catch (const std::runtime_error& e) {
+            return RESTERR(req, HTTP_BAD_REQUEST, e.what());
+        }
     } else {
         return RESTERR(req, HTTP_BAD_REQUEST, "Invalid URI format. Expected /rest/headers/<hash>.<ext>?count=<count>");
     }
@@ -399,7 +403,11 @@ static bool rest_filter_header(const CoreContext& context, HTTPRequest* req, con
     } else if (uri_parts.size() == 2) {
         // new path with query parameter: /rest/blockfilterheaders/<filtertype>/<blockhash>?count=<count>
         raw_blockhash = uri_parts[1];
-        raw_count = req->GetQueryParameter("count").value_or("5");
+        try {
+            raw_count = req->GetQueryParameter("count").value_or("5");
+        } catch (const std::runtime_error& e) {
+            return RESTERR(req, HTTP_BAD_REQUEST, e.what());
+        }
     } else {
         return RESTERR(req, HTTP_BAD_REQUEST, "Invalid URI format. Expected /rest/blockfilterheaders/<filtertype>/<blockhash>.<ext>?count=<count>");
     }
diff --git a/src/test/httpserver_tests.cpp b/src/test/httpserver_tests.cpp
index ee59ec6967fc..c95a777e80c1 100644
--- a/src/test/httpserver_tests.cpp
+++ b/src/test/httpserver_tests.cpp
@@ -34,5 +34,9 @@ BOOST_AUTO_TEST_CASE(test_query_parameters)
     // Invalid query string syntax is the same as not having parameters
     uri = "/rest/endpoint/someresource.json&p1=v1&p2=v2";
     BOOST_CHECK(!GetQueryParameterFromUri(uri.c_str(), "p1").has_value());
+
+    // URI with invalid characters (%) raises a runtime error regardless of which query parameter is queried
+    uri = "/rest/endpoint/someresource.json&p1=v1&p2=v2%";
+    BOOST_CHECK_EXCEPTION(GetQueryParameterFromUri(uri.c_str(), "p1"), std::runtime_error, HasReason("URI parsing failed, it likely contained RFC 3986 invalid characters"));
 }
 BOOST_AUTO_TEST_SUITE_END()